diff --git a/.dependency-cruiser.cjs b/.dependency-cruiser.cjs
index 25f7b64ce85..b7de80a70de 100644
--- a/.dependency-cruiser.cjs
+++ b/.dependency-cruiser.cjs
@@ -2,92 +2,86 @@
 module.exports = {
   forbidden: [
     {
-      name: 'no-circular-at-runtime',
-      severity: 'warn',
+      name: "no-circular-at-runtime",
+      severity: "warn",
       comment:
-        'This dependency is part of a circular relationship. You might want to revise ' +
-        'your solution (i.e. use dependency inversion, make sure the modules have a single responsibility) ',
+        "This dependency is part of a circular relationship. You might want to revise " +
+        "your solution (i.e. use dependency inversion, make sure the modules have a single responsibility) ",
       from: {},
       to: {
         circular: true,
         viaOnly: {
-          dependencyTypesNot: [
-            'type-only'
-          ]
-        }
-      }
+          dependencyTypesNot: ["type-only"],
+        },
+      },
     },
     {
-      name: 'no-orphans',
+      name: "no-orphans",
       comment:
         "This is an orphan module - it's likely not used (anymore?). Either use it or " +
         "remove it. If it's logical this module is an orphan (i.e. it's a config file), " +
         "add an exception for it in your dependency-cruiser configuration. By default " +
         "this rule does not scrutinize dot-files (e.g. .eslintrc.js), TypeScript declaration " +
         "files (.d.ts), tsconfig.json and some of the babel and webpack configs.",
-      severity: 'warn',
+      severity: "warn",
       from: {
         orphan: true,
         pathNot: [
-          '(^|/)[.][^/]+[.](?:js|cjs|mjs|ts|cts|mts|json)$',                  // dot files
-          '[.]d[.]ts$',                                                       // TypeScript declaration files
-          '(^|/)tsconfig[.]json$',                                            // TypeScript config
-          '(^|/)(?:babel|webpack)[.]config[.](?:js|cjs|mjs|ts|cts|mts|json)$' // other configs
-        ]
+          "(^|/)[.][^/]+[.](?:js|cjs|mjs|ts|cts|mts|json)$", // dot files
+          "[.]d[.]ts$", // TypeScript declaration files
+          "(^|/)tsconfig[.]json$", // TypeScript config
+          "(^|/)(?:babel|webpack)[.]config[.](?:js|cjs|mjs|ts|cts|mts|json)$", // other configs
+        ],
       },
       to: {},
     },
     {
-      name: 'no-deprecated-core',
+      name: "no-deprecated-core",
       comment:
-        'A module depends on a node core module that has been deprecated. Find an alternative - these are ' +
+        "A module depends on a node core module that has been deprecated. Find an alternative - these are " +
         "bound to exist - node doesn't deprecate lightly.",
-      severity: 'warn',
+      severity: "warn",
       from: {},
       to: {
-        dependencyTypes: [
-          'core'
-        ],
+        dependencyTypes: ["core"],
         path: [
-          '^v8/tools/codemap$',
-          '^v8/tools/consarray$',
-          '^v8/tools/csvparser$',
-          '^v8/tools/logreader$',
-          '^v8/tools/profile_view$',
-          '^v8/tools/profile$',
-          '^v8/tools/SourceMap$',
-          '^v8/tools/splaytree$',
-          '^v8/tools/tickprocessor-driver$',
-          '^v8/tools/tickprocessor$',
-          '^node-inspect/lib/_inspect$',
-          '^node-inspect/lib/internal/inspect_client$',
-          '^node-inspect/lib/internal/inspect_repl$',
-          '^async_hooks$',
-          '^punycode$',
-          '^domain$',
-          '^constants$',
-          '^sys$',
-          '^_linklist$',
-          '^_stream_wrap$'
+          "^v8/tools/codemap$",
+          "^v8/tools/consarray$",
+          "^v8/tools/csvparser$",
+          "^v8/tools/logreader$",
+          "^v8/tools/profile_view$",
+          "^v8/tools/profile$",
+          "^v8/tools/SourceMap$",
+          "^v8/tools/splaytree$",
+          "^v8/tools/tickprocessor-driver$",
+          "^v8/tools/tickprocessor$",
+          "^node-inspect/lib/_inspect$",
+          "^node-inspect/lib/internal/inspect_client$",
+          "^node-inspect/lib/internal/inspect_repl$",
+          "^async_hooks$",
+          "^punycode$",
+          "^domain$",
+          "^constants$",
+          "^sys$",
+          "^_linklist$",
+          "^_stream_wrap$",
         ],
-      }
+      },
     },
     {
-      name: 'not-to-deprecated',
+      name: "not-to-deprecated",
       comment:
-        'This module uses a (version of an) npm module that has been deprecated. Either upgrade to a later ' +
-        'version of that module, or find an alternative. Deprecated modules are a security risk.',
-      severity: 'warn',
+        "This module uses a (version of an) npm module that has been deprecated. Either upgrade to a later " +
+        "version of that module, or find an alternative. Deprecated modules are a security risk.",
+      severity: "warn",
       from: {},
       to: {
-        dependencyTypes: [
-          'deprecated'
-        ]
-      }
+        dependencyTypes: ["deprecated"],
+      },
     },
     {
-      name: 'no-non-package-json',
-      severity: 'error',
+      name: "no-non-package-json",
+      severity: "error",
       comment:
         "This module depends on an npm package that isn't in the 'dependencies' section of your package.json. " +
         "That's problematic as the package either (1) won't be available on live (2 - worse) will be " +
@@ -95,87 +89,75 @@ module.exports = {
         "in your package.json.",
       from: {},
       to: {
-        dependencyTypes: [
-          'npm-no-pkg',
-          'npm-unknown'
-        ]
-      }
+        dependencyTypes: ["npm-no-pkg", "npm-unknown"],
+      },
     },
     {
-      name: 'not-to-unresolvable',
+      name: "not-to-unresolvable",
       comment:
         "This module depends on a module that cannot be found ('resolved to disk'). If it's an npm " +
-        'module: add it to your package.json. In all other cases you likely already know what to do.',
-      severity: 'error',
+        "module: add it to your package.json. In all other cases you likely already know what to do.",
+      severity: "error",
       from: {},
       to: {
-        couldNotResolve: true
-      }
+        couldNotResolve: true,
+      },
     },
     {
-      name: 'no-duplicate-dep-types',
+      name: "no-duplicate-dep-types",
       comment:
         "Likely this module depends on an external ('npm') package that occurs more than once " +
         "in your package.json i.e. bot as a devDependencies and in dependencies. This will cause " +
         "maintenance problems later on.",
-      severity: 'warn',
+      severity: "warn",
       from: {},
       to: {
         moreThanOneDependencyType: true,
-        // as it's pretty common to have a type import be a type only import 
+        // as it's pretty common to have a type import be a type only import
         // _and_ (e.g.) a devDependency - don't consider type-only dependency
         // types for this rule
-        dependencyTypesNot: ["type-only"]
-      }
+        dependencyTypesNot: ["type-only"],
+      },
     },
 
     /* rules you might want to tweak for your specific situation: */
 
     {
-      name: 'not-to-spec',
+      name: "not-to-spec",
       comment:
-        'This module depends on a spec (test) file. The sole responsibility of a spec file is to test code. ' +
+        "This module depends on a spec (test) file. The sole responsibility of a spec file is to test code. " +
         "If there's something in a spec that's of use to other modules, it doesn't have that single " +
-        'responsibility anymore. Factor it out into (e.g.) a separate utility/ helper or a mock.',
-      severity: 'error',
+        "responsibility anymore. Factor it out into (e.g.) a separate utility/ helper or a mock.",
+      severity: "error",
       from: {},
       to: {
-        path: '[.](?:spec|test)[.](?:js|mjs|cjs|jsx|ts|mts|cts|tsx)$'
-      }
+        path: "[.](?:spec|test)[.](?:js|mjs|cjs|jsx|ts|mts|cts|tsx)$",
+      },
     },
     {
-      name: 'not-to-dev-dep',
-      severity: 'error',
+      name: "not-to-dev-dep",
+      severity: "error",
       comment:
         "This module depends on an npm package from the 'devDependencies' section of your " +
-        'package.json. It looks like something that ships to production, though. To prevent problems ' +
+        "package.json. It looks like something that ships to production, though. To prevent problems " +
         "with npm packages that aren't there on production declare it (only!) in the 'dependencies'" +
-        'section of your package.json. If this module is development only - add it to the ' +
-        'from.pathNot re of the not-to-dev-dep rule in the dependency-cruiser configuration',
+        "section of your package.json. If this module is development only - add it to the " +
+        "from.pathNot re of the not-to-dev-dep rule in the dependency-cruiser configuration",
       from: {
-        path: '^(src)',
-        pathNot: [
-          '[.](?:spec|test|setup|script)[.](?:js|mjs|cjs|jsx|ts|mts|cts|tsx)$',
-          'src/test'
-        ]
+        path: "^(src)",
+        pathNot: ["[.](?:spec|test|setup|script)[.](?:js|mjs|cjs|jsx|ts|mts|cts|tsx)$", "./test"],
       },
       to: {
-        dependencyTypes: [
-          'npm-dev',
-        ],
+        dependencyTypes: ["npm-dev"],
         // type only dependencies are not a problem as they don't end up in the
         // production code or are ignored by the runtime.
-        dependencyTypesNot: [
-          'type-only'
-        ],
-        pathNot: [
-          'node_modules/@types/'
-        ]
-      }
+        dependencyTypesNot: ["type-only"],
+        pathNot: ["node_modules/@types/"],
+      },
     },
     {
-      name: 'optional-deps-used',
-      severity: 'info',
+      name: "optional-deps-used",
+      severity: "info",
       comment:
         "This module depends on an npm package that is declared as an optional dependency " +
         "in your package.json. As this makes sense in limited situations only, it's flagged here. " +
@@ -183,33 +165,28 @@ module.exports = {
         "dependency-cruiser configuration.",
       from: {},
       to: {
-        dependencyTypes: [
-          'npm-optional'
-        ]
-      }
+        dependencyTypes: ["npm-optional"],
+      },
     },
     {
-      name: 'peer-deps-used',
+      name: "peer-deps-used",
       comment:
         "This module depends on an npm package that is declared as a peer dependency " +
         "in your package.json. This makes sense if your package is e.g. a plugin, but in " +
         "other cases - maybe not so much. If the use of a peer dependency is intentional " +
         "add an exception to your dependency-cruiser configuration.",
-      severity: 'warn',
+      severity: "warn",
       from: {},
       to: {
-        dependencyTypes: [
-          'npm-peer'
-        ]
-      }
-    }
+        dependencyTypes: ["npm-peer"],
+      },
+    },
   ],
   options: {
-
     /* Which modules not to follow further when encountered */
     doNotFollow: {
       /* path: an array of regular expressions in strings to match against */
-      path: ['node_modules']
+      path: ["node_modules"],
     },
 
     /* Which modules to exclude */
@@ -271,7 +248,7 @@ module.exports = {
        defaults to './tsconfig.json'.
      */
     tsConfig: {
-      fileName: 'tsconfig.json'
+      fileName: "tsconfig.json",
     },
 
     /* Webpack configuration to use to get resolve options from.
@@ -345,7 +322,7 @@ module.exports = {
            collapses everything in node_modules to one folder deep so you see
            the external modules, but their innards.
          */
-        collapsePattern: 'node_modules/(?:@[^/]+/[^/]+|[^/]+)',
+        collapsePattern: "node_modules/(?:@[^/]+/[^/]+|[^/]+)",
 
         /* Options to tweak the appearance of your graph.See
            https://github.com/sverweij/dependency-cruiser/blob/main/doc/options-reference.md#reporteroptions
@@ -367,7 +344,8 @@ module.exports = {
           dependency graph reporter (`archi`) you probably want to tweak
           this collapsePattern to your situation.
         */
-        collapsePattern: '^(?:packages|src|lib(s?)|app(s?)|bin|test(s?)|spec(s?))/[^/]+|node_modules/(?:@[^/]+/[^/]+|[^/]+)',
+        collapsePattern:
+          "^(?:packages|src|lib(s?)|app(s?)|bin|test(s?)|spec(s?))/[^/]+|node_modules/(?:@[^/]+/[^/]+|[^/]+)",
 
         /* Options to tweak the appearance of your graph. If you don't specify a
            theme for 'archi' dependency-cruiser will use the one specified in the
@@ -375,10 +353,10 @@ module.exports = {
          */
         // theme: { },
       },
-      "text": {
-        "highlightFocused": true
+      text: {
+        highlightFocused: true,
       },
-    }
-  }
+    },
+  },
 };
 // generated: dependency-cruiser@16.3.3 on 2024-06-13T23:26:36.169Z
diff --git a/.gitattributes b/.gitattributes
index dfe0770424b..a6bfb838587 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1,3 @@
 # Auto detect text files and perform LF normalization
 * text=auto
+* -crlf
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 8e7606f0a48..79ab1bdc38a 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -4,4 +4,19 @@
 * @pagefaultgames/junior-dev-team
 
 # github actions/templates etc. - Dev Leads
-/.github @pagefaultgames/dev-leads
+/.github @pagefaultgames/senior-dev-team
+
+# Art Team
+/public/**/*.png @pagefaultgames/art-team
+/public/**/*.json @pagefaultgames/art-team  
+/public/images @pagefaultgames/art-team
+/public/battle-anims @pagefaultgames/art-team
+
+# Audio files
+*.mp3 @pagefaultgames/composer-team
+*.wav @pagefaultgames/composer-team
+*.ogg @pagefaultgames/composer-team
+/public/audio @pagefaultgames/composer-team
+
+# Balance Files; contain actual code logic and must also be owned by dev team
+/src/data/balance @pagefaultgames/balance-team @pagefaultgames/junior-dev-team
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index eb270dc8f80..81d8427b5db 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -1,6 +1,7 @@
 name: Bug Report
 description: Create a report to help us improve
 title: "[Bug] "
+type: bug
 labels: ["Bug", "Triage"]
 body:
   - type: markdown
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
index 29a79b38158..08d720aea7b 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -1,6 +1,7 @@
 name: Feature Request
 description: Suggest an idea for this project
 title: "[Feature] "
+type: 'feature'
 labels: ["Enhancement", "Triage"]
 body:
   - type: markdown
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 032e1fee69c..a25a2f807f3 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -65,7 +65,7 @@ Do the reviewers need to do something special in order to test your changes?
 - [ ] The PR is self-contained and cannot be split into smaller PRs?
 - [ ] Have I provided a clear explanation of the changes?
 - [ ] Have I tested the changes manually?
-- [ ] Are all unit tests still passing? (`npm run test`)
+- [ ] Are all unit tests still passing? (`npm run test:silent`)
   - [ ] 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)?
diff --git a/.github/test-filters.yml b/.github/test-filters.yml
new file mode 100644
index 00000000000..89f4322adea
--- /dev/null
+++ b/.github/test-filters.yml
@@ -0,0 +1,19 @@
+all:
+  - "src/**"
+  - "test/**"
+  - "public/**"
+  # Workflows that can impact tests
+  - ".github/workflows/test*.yml"
+  - ".github/test-filters.yml"
+  # top-level files
+  - "package*.json"
+  - ".nvrmc" # Updates to node version can break tests
+  - "vite*" # vite.config.ts, vite.vitest.config.ts, vitest.workspace.ts
+  - "tsconfig*.json" # tsconfig.json tweaking can impact compilation
+  - "global.d.ts"
+  - ".env*"
+  # Blanket negations for files that cannot impact tests
+  - "!**/*.py" # No .py files
+  - "!**/*.sh" # No .sh files
+  - "!**/*.md" # No .md files
+  - "!**/.git*" # .gitkeep and family
diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml
new file mode 100644
index 00000000000..35a31f6b4d1
--- /dev/null
+++ b/.github/workflows/create-release.yml
@@ -0,0 +1,73 @@
+name: Create Release Branch
+on:
+  workflow_dispatch:
+    inputs:
+      versionName:
+        description: "Name of version (i.e. 1.9.0)"
+        type: string
+        required: true
+      confirmVersion:
+        type: string
+        required: true
+        description: "Confirm version name"
+
+# explicitly specify the necessary scopes
+permissions:
+  pull-requests: write
+  actions: write
+  contents: write
+
+jobs:
+  create-release:
+    if: github.repository == 'pagefaultgames/pokerogue' && (vars.BETA_DEPLOY_BRANCH == '' || ! startsWith(vars.BETA_DEPLOY_BRANCH, 'release'))
+    env:
+      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed for github cli commands
+    runs-on: ubuntu-latest
+    steps:
+      - name: Validate provided version
+        # Ensure version matches confirmation and conforms to expected pattern.
+        run: |
+          if [[ "${{ github.event.inputs.versionName }}" != "${{ github.event.inputs.confirmVersion }}" ]]; then
+            echo "Version name does not match confirmation. Exiting."
+            exit 1
+          fi
+          if [[ ! "${{ github.event.inputs.versionName }}" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
+            echo "Version name must follow the format X.Y.Z where X, Y, and Z are all numbers. Exiting..."
+            exit 1
+          fi
+        shell: bash
+      - name: Check out code
+        uses: actions/checkout@v4
+        with:
+          submodules: "recursive"
+          # Always base off of beta branch, regardless of the branch the workflow was triggered from.
+          ref: beta
+      - name: Create release branch
+        run: git checkout -b release
+      # In order to be able to open a PR into beta, we need the branch to have at least one change.
+      - name: Overwrite RELEASE file
+        run: |
+          git config --local user.name "github-actions[bot]"
+          git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com"
+          echo "Release v${{ github.event.inputs.versionName }}" > RELEASE
+          git add RELEASE
+          git commit -m "Stage release v${{ github.event.inputs.versionName }}"
+      - name: Push new branch
+        run: git push origin release
+      # The repository variable is used by the deploy-beta workflow to determine whether to deploy from beta or release.
+      - name: Set repository variable
+        run: GITHUB_TOKEN="${{ secrets.RW_VARS_PAT }}" gh variable set BETA_DEPLOY_BRANCH --body "release"
+      - name: Create pull request to main
+        run: |
+          gh pr create --base main \
+                       --head release \
+                       --title "Release v${{ github.event.inputs.versionName }} to main" \
+                       --body "This PR is for the release of v${{ github.event.inputs.versionName }}, and was created automatically by the GitHub Actions workflow invoked by ${{ github.actor }}" \
+                       --draft
+      - name: Create pull request to beta
+        run: |
+          gh pr create --base beta \
+                       --head release \
+                       --title "Release v${{ github.event.inputs.versionName }} to beta" \
+                       --body "This PR is for the release of v${{ github.event.inputs.versionName }}, and was created automatically by the GitHub Actions workflow invoked by ${{ github.actor }}" \
+                       --draft
diff --git a/.github/workflows/deploy-beta.yml b/.github/workflows/deploy-beta.yml
index d8d8126193d..90b3008c8e9 100644
--- a/.github/workflows/deploy-beta.yml
+++ b/.github/workflows/deploy-beta.yml
@@ -4,18 +4,23 @@ on:
   push:
     branches:
       - beta
+      - release
+  workflow_run:
+    types: completed
+    workflows: ["Post Release Deleted"]
 
 jobs:
   deploy:
-    if: github.repository == 'pagefaultgames/pokerogue'
+    if: github.repository == 'pagefaultgames/pokerogue' && github.ref_name == ${{ vars.BETA_DEPLOY_BRANCH || 'beta' }}
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
         with:
-          submodules: 'recursive'
+          submodules: "recursive"
+          ref: ${{ vars.BETA_DEPLOY_BRANCH || 'beta'}}
       - uses: actions/setup-node@v4
         with:
-          node-version: "20"
+          node-version-file: ".nvmrc"
       - name: Install dependencies
         run: npm ci
       - name: Build
@@ -30,5 +35,5 @@ jobs:
           chmod 600 ~/.ssh/*
           ssh-keyscan -H ${{ secrets.BETA_SSH_HOST }} >> ~/.ssh/known_hosts
       - name: Deploy build on server
-        run: | 
-          rsync --del --no-times --checksum -vrm dist/* ${{ secrets.BETA_SSH_USER }}@${{ secrets.BETA_SSH_HOST }}:${{ secrets.BETA_DESTINATION_DIR }}
\ No newline at end of file
+        run: |
+          rsync --del --no-times --checksum -vrm dist/* ${{ secrets.BETA_SSH_USER }}@${{ secrets.BETA_SSH_HOST }}:${{ secrets.BETA_DESTINATION_DIR }}
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index e40b18eb69b..00190e477d5 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -18,7 +18,7 @@ jobs:
           submodules: 'recursive'
       - uses: actions/setup-node@v4
         with:
-          node-version: "20"
+          node-version-file: '.nvmrc'
       - name: Install dependencies
         run: npm ci
       - name: Build
diff --git a/.github/workflows/github-pages.yml b/.github/workflows/github-pages.yml
index 58067ac81ac..ce7c17e2db9 100644
--- a/.github/workflows/github-pages.yml
+++ b/.github/workflows/github-pages.yml
@@ -24,7 +24,7 @@ jobs:
 
     steps:
       - name: Checkout repository for Typedoc
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: 'recursive'
           path: pokerogue_docs
@@ -34,14 +34,14 @@ jobs:
           sudo apt update
           sudo apt install -y git openssh-client
 
-      - name: Setup Node 20.13.1
-        uses: actions/setup-node@v1
+      - name: Setup Node 22.14.1
+        uses: actions/setup-node@v4
         with:
-          node-version: 20
+          node-version-file: "pokerogue_docs/.nvmrc"
 
       - name: Checkout repository for Github Pages
         if: github.event_name == 'push'
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           path: pokerogue_gh
           ref: gh-pages
diff --git a/.github/workflows/post-release-deleted.yml b/.github/workflows/post-release-deleted.yml
new file mode 100644
index 00000000000..65447e7826b
--- /dev/null
+++ b/.github/workflows/post-release-deleted.yml
@@ -0,0 +1,12 @@
+name: Post Release Deleted
+on:
+  delete:
+
+jobs:
+  # Set the BETA_DEPLOY_BRANCH variable to beta when a release branch is deleted
+  update-release-var:
+    if: github.repository == 'pagefaultgames/pokerogue' && github.event.ref_type == 'branch' && github.event.ref == 'release'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Set BETA_DEPLOY_BRANCH to beta
+        run: GITHUB_TOKEN="${{ secrets.RW_VARS_PAT }}" gh variable set BETA_DEPLOY_BRANCH --body "beta" --repo "pagefaultgames/pokerogue"
\ No newline at end of file
diff --git a/.github/workflows/eslint.yml b/.github/workflows/quality.yml
similarity index 87%
rename from .github/workflows/eslint.yml
rename to .github/workflows/quality.yml
index d863c96a643..d9592662998 100644
--- a/.github/workflows/eslint.yml
+++ b/.github/workflows/quality.yml
@@ -1,4 +1,4 @@
-name: ESLint
+name: Biome Code Quality
 
 on:
   # Trigger the workflow on push or pull request,
@@ -28,10 +28,14 @@ jobs:
       - name: Set up Node.js  # Step to set up Node.js environment
         uses: actions/setup-node@v4  # Use the setup-node action version 4
         with:
-          node-version: 20  # Specify Node.js version 20
+          node-version-file: '.nvmrc'
+          cache: 'npm'
 
       - name: Install Node.js dependencies  # Step to install Node.js dependencies
         run: npm ci  # Use 'npm ci' to install dependencies
-
+      
       - name: eslint  # Step to run linters
         run: npm run eslint-ci
+
+      - name: Lint with Biome  # Step to run linters
+        run: npm run biome-ci
\ No newline at end of file
diff --git a/.github/workflows/test-shard-template.yml b/.github/workflows/test-shard-template.yml
index 185764c86a8..a1146cb3497 100644
--- a/.github/workflows/test-shard-template.yml
+++ b/.github/workflows/test-shard-template.yml
@@ -12,21 +12,27 @@ on:
       totalShards:
         required: true
         type: number
+      skip:
+        required: true
+        type: boolean
+        default: false
 
 jobs:
   test:
     name: Shard ${{ inputs.shard }} of ${{ inputs.totalShards }}
     runs-on: ubuntu-latest
+    if: ${{ !inputs.skip }}
     steps:
       - name: Check out Git repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v4.2.2
         with:
           submodules: 'recursive'
       - name: Set up Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: 20
+          node-version-file: '.nvmrc'
+          cache: 'npm'
       - name: Install Node.js dependencies
         run: npm ci
       - name: Run tests
-        run: npx vitest --project ${{ inputs.project }} --shard=${{ inputs.shard }}/${{ inputs.totalShards }} ${{ !runner.debug && '--silent' || '' }}
+        run: npx vitest --project ${{ inputs.project }} --no-isolate --shard=${{ inputs.shard }}/${{ inputs.totalShards }} ${{ !runner.debug && '--silent' || '' }}
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index d30d8adba38..f04a1987eff 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -5,39 +5,32 @@ on:
   # but only for the main branch
   push:
     branches:
-      - main  # Trigger on push events to the main branch
+      - 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
+      - main # Trigger on pull request events targeting the main branch
       - beta # Trigger on pull request events targeting the beta branch
   merge_group:
     types: [checks_requested]
 
 jobs:
-  pre-test:
-    name: Run Pre-test
+  check-path-change-filter:
     runs-on: ubuntu-latest
+    permissions:
+      pull-requests: read
+    outputs:
+      all: ${{ steps.filter.outputs.all }}
     steps:
-      - name: Check out Git repository
+      - name: checkout
         uses: actions/checkout@v4
+      - uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36
         with:
-          submodules: 'recursive'
-          path: tests-action
-      - name: Set up Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: 20
-      - name: Install Node.js dependencies
-        working-directory: tests-action
-        run: npm ci
-      - name: Run Pre-test
-        working-directory: tests-action
-        run: npx vitest run --project pre ${{ !runner.debug && '--silent' || '' }}
+          filters: .github/test-filters.yml
 
   run-tests:
-    name: Run Tests 
-    needs: [pre-test]
+    name: Run Tests
+    needs: check-path-change-filter
     strategy:
       matrix:
         shard: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
@@ -45,4 +38,5 @@ jobs:
     with:
       project: main
       shard: ${{ matrix.shard }}
-      totalShards: 10
\ No newline at end of file
+      totalShards: 10
+      skip: ${{ needs.check-path-change-filter.outputs.all == 'false'}}
diff --git a/.gitignore b/.gitignore
index c22d0b2ce4c..00df0002e01 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,7 +13,8 @@ dist-ssr
 *.local
 
 # Editor directories and files
-.vscode/*
+.vscode
+*.code-workspace
 .idea
 .DS_Store
 *.suo
@@ -41,3 +42,7 @@ coverage
 
 /dependency-graph.svg
 /.vs
+
+
+# Script outputs
+./*.csv
\ No newline at end of file
diff --git a/.nvmrc b/.nvmrc
index 9bcccb9439d..517f38666b4 100644
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-v20.13.1
+v22.14.0
diff --git a/CREDITS.md b/CREDITS.md
index 099d410417e..6d884c8fd60 100644
--- a/CREDITS.md
+++ b/CREDITS.md
@@ -364,11 +364,13 @@ In addition to the lists below, please check [the PokéRogue wiki](https://wiki.
 - Opaquer
 - OrangeRed
 - Sam aka Flashfyre (initial developer, started PokéRogue)
+- SirzBenjie
 - sirzento
 - SN34KZ
 - Swain aka torranx
 - Temp aka Tempo-anon
 - Walker
+- Wlowscha (aka Curbio)
 - Xavion
 
 ## Bug/Issue Managers
diff --git a/README.md b/README.md
index 607a42e5125..56392808b3c 100644
--- a/README.md
+++ b/README.md
@@ -3,23 +3,30 @@
 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.
 
 ### 💻 Environment Setup
+
 #### Prerequisites
-- node: 20.13.1
+
+- node: 22.14.0
 - npm: [how to install](https://docs.npmjs.com/downloading-and-installing-node-js-and-npm)
 
 #### Running Locally
+
 1. Clone the repo and in the root directory run `npm install`
     - *if you run into any errors, reach out in the **#dev-corner** channel in discord*
 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. To view the complete rules, check out the [eslint.config.js](./eslint.config.js) file.
+
+We're using Biome 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 biome` script. To view the complete rules, check out the [biome.jsonc](./biome.jsonc) file.
 
 ### 📚 Documentation
+
 You can find the auto-generated documentation [here](https://pagefaultgames.github.io/pokerogue/main/index.html).
 For information on enemy AI, check out the [enemy-ai.md](./docs/enemy-ai.md) file.
 For detailed guidelines on documenting your code, refer to the [comments.md](./docs/comments.md) file.
@@ -27,16 +34,20 @@ For detailed guidelines on documenting your code, refer to the [comments.md](./d
 ### ❔ 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
 
 **How do I retrieve the translations?**
+
 - The translations were moved to the [dedicated translation repository](https://github.com/pagefaultgames/pokerogue-locales) and are now applied as a submodule in this project.
 - The command to retrieve the translations is `git submodule update --init --recursive`. If you still struggle to get it working, please reach out to #dev-corner channel in Discord.
 
 ## 🪧 To Do
+
 Check out [Github Issues](https://github.com/pagefaultgames/pokerogue/issues) to see how can you help us!
 
 # 📝 Credits
+>
 > If this project contains assets you have produced and you do not see your name, **please** reach out, either [here on GitHub](https://github.com/pagefaultgames/pokerogue/issues/new) or via [Discord](https://discord.gg/pokerogue).
 
 Thank you to all the wonderful people that have contributed to the PokéRogue project! You can find the credits [here](./CREDITS.md).
diff --git a/biome.jsonc b/biome.jsonc
new file mode 100644
index 00000000000..3385614635c
--- /dev/null
+++ b/biome.jsonc
@@ -0,0 +1,117 @@
+{
+  "$schema": "https://biomejs.dev/schemas/1.9.4/schema.json",
+  "vcs": {
+    "enabled": false,
+    "clientKind": "git",
+    "useIgnoreFile": true,
+    "defaultBranch": "beta"
+  },
+  "formatter": {
+    "enabled": true,
+    "useEditorconfig": true,
+    "indentStyle": "space",
+    "ignore": ["src/enums/*", "src/data/balance/*"],
+    "lineWidth": 120
+  },
+  "files": {
+    "ignoreUnknown": true,
+    // Adding folders to the ignore list is GREAT for performance because it prevents biome from descending into them
+    // and having to verify whether each individual file is ignored
+    "ignore": [
+      "**/*.d.ts",
+      "dist/*",
+      "build/*",
+      "coverage/*",
+      "public/*",
+      ".github/*",
+      "node_modules/*",
+      ".vscode/*",
+      "*.css", // TODO?
+      "*.html", // TODO?
+      "src/overrides.ts",
+      // TODO: these files are too big and complex, ignore them until their respective refactors
+      "src/data/moves/move.ts",
+      "src/data/abilities/ability.ts",
+      "src/field/pokemon.ts",
+
+      // this file is just too big:
+      "src/data/balance/tms.ts"
+    ]
+  },
+
+  // While it'd be nice to enable consistent sorting, enabling this causes issues due to circular import resolution order
+  // TODO: Remove if we ever get down to 0 circular imports
+  "organizeImports": { "enabled": false },
+  "linter": {
+    "ignore": [
+      "src/phases/move-effect-phase.ts" // TODO: unignore after move-effect-phase refactor
+    ],
+    "enabled": true,
+    "rules": {
+      "recommended": true,
+      "correctness": {
+        "noUndeclaredVariables": "off",
+        "noUnusedVariables": "error",
+        "noSwitchDeclarations": "warn", // TODO: refactor and make this an error
+        "noVoidTypeReturn": "warn", // TODO: Refactor and make this an error
+        "noUnusedImports": "error"
+      },
+      "style": {
+        "noVar": "error",
+        "useEnumInitializers": "off", // large enums like Moves/Species would make this cumbersome 
+        "useBlockStatements": "error",
+        "useConst": "error",
+        "useImportType": "error",
+        "noNonNullAssertion": "off", // TODO: Turn this on ASAP and fix all non-null assertions in non-test files
+        "noParameterAssign": "off",
+        "useExponentiationOperator": "off", // Too typo-prone and easy to mixup with standard multiplication (* vs **)
+        "useDefaultParameterLast": "off", // TODO: Fix spots in the codebase where this flag would be triggered, and then enable
+        "useSingleVarDeclarator": "off",
+        "useNodejsImportProtocol": "off",
+        "useTemplate": "off", // string concatenation is faster: https://stackoverflow.com/questions/29055518/are-es6-template-literals-faster-than-string-concatenation
+        "noNamespaceImport": "error"
+      },
+      "suspicious": {
+        "noDoubleEquals": "error",
+        // While this would be a nice rule to enable, the current structure of the codebase makes this infeasible 
+        // due to being used for move/ability `args` params and save data-related code.
+        // This can likely be enabled for all non-utils files once these are eventually reworked, but until then we leave it off.  
+        "noExplicitAny": "off",
+        "noAssignInExpressions": "off",
+        "noPrototypeBuiltins": "off",
+        "noFallthroughSwitchClause": "error", // Prevents accidental automatic fallthroughs in switch cases (use disable comment if needed)
+        "noImplicitAnyLet": "warn", // TODO: Refactor and make this an error
+        "noRedeclare": "info", // TODO: Refactor and make this an error
+        "noGlobalIsNan": "off",
+        "noAsyncPromiseExecutor": "warn" // TODO: Refactor and make this an error
+      },
+      "complexity": {
+        "noExcessiveCognitiveComplexity": "warn", // TODO: Refactor and make this an error
+        "useLiteralKeys": "off",
+        "noForEach": "off", // Foreach vs for of is not that simple.
+        "noUselessSwitchCase": "off", // Explicit > Implicit
+        "noUselessConstructor": "warn", // TODO: Refactor and make this an error
+        "noBannedTypes": "warn" // TODO: Refactor and make this an error
+      }
+    }
+  },
+  "javascript": {
+    "formatter": { "quoteStyle": "double", "arrowParentheses": "asNeeded" }
+  },
+  "overrides": [
+    {
+      "include": ["test/**/*.test.ts"],
+      "javascript": { "globals": [] },
+      "linter": {
+        "rules": {
+          "performance": {
+            "noDelete": "off" // TODO: evaluate if this is necessary for the test(s) to function
+          },
+          "style": {
+            "noNamespaceImport": "off" // this is required for `vi.spyOn` to work in some tests
+          }
+        }
+      }
+    }
+  ]
+}
diff --git a/create-test-boilerplate.js b/create-test-boilerplate.js
index a365999c623..d47b7c4afeb 100644
--- a/create-test-boilerplate.js
+++ b/create-test-boilerplate.js
@@ -1,5 +1,5 @@
 /**
- * This script creates a test boilerplate file in the appropriate 
+ * This script creates a test boilerplate file in the appropriate
  * directory based on the type selected.
  * @example npm run create-test
  */
@@ -31,7 +31,8 @@ async function promptTestType() {
   if (typeAnswer.selectedOption === "EXIT") {
     console.log("Exiting...");
     return process.exit();
-  } else if (!typeChoices.includes(typeAnswer.selectedOption)) {
+  }
+  if (!typeChoices.includes(typeAnswer.selectedOption)) {
     console.error(`Please provide a valid type (${typeChoices.join(", ")})!`);
     return await promptTestType();
   }
@@ -74,29 +75,29 @@ async function runInteractive() {
   const fileName = fileNameAnswer.userInput
     .replace(/-+/g, "_") // Convert kebab-case (dashes) to underscores
     .replace(/([a-z])([A-Z])/g, "$1_$2") // Convert camelCase to snake_case
-    .replace(/\s+/g, '_') // Replace spaces with underscores
+    .replace(/\s+/g, "_") // Replace spaces with underscores
     .toLowerCase(); // Ensure all lowercase
   // Format the description for the test case
 
-  const formattedName = fileName.replace(/_/g, " ").replace(/\b\w/g, (char) => char.toUpperCase());
+  const formattedName = fileName.replace(/_/g, " ").replace(/\b\w/g, char => char.toUpperCase());
   // Determine the directory based on the type
   let dir;
   let description;
   switch (type) {
     case "move":
-      dir = path.join(__dirname, "src", "test", "moves");
+      dir = path.join(__dirname, "test", "moves");
       description = `Moves - ${formattedName}`;
       break;
     case "ability":
-      dir = path.join(__dirname, "src", "test", "abilities");
+      dir = path.join(__dirname, "test", "abilities");
       description = `Abilities - ${formattedName}`;
       break;
     case "item":
-      dir = path.join(__dirname, "src", "test", "items");
+      dir = path.join(__dirname, "test", "items");
       description = `Items - ${formattedName}`;
       break;
     case "mystery encounter":
-      dir = path.join(__dirname, "src", "test", "mystery-encounter", "encounters");
+      dir = path.join(__dirname, "test", "mystery-encounter", "encounters");
       description = `Mystery Encounter - ${formattedName}`;
       break;
     default:
@@ -108,7 +109,7 @@ async function runInteractive() {
   const content = `import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/dependency-graph.js b/dependency-graph.js
index 627aa3dcf13..dff960d8781 100644
--- a/dependency-graph.js
+++ b/dependency-graph.js
@@ -10,4 +10,4 @@ for await (const chunk of process.stdin) {
 const file = Buffer.concat(inputFile).toString("utf-8");
 
 const svg = graphviz.dot(file, "svg");
-process.stdout.write(svg);
\ No newline at end of file
+process.stdout.write(svg);
diff --git a/docs/comments.md b/docs/comments.md
index 9610052adf2..ba6c9929625 100644
--- a/docs/comments.md
+++ b/docs/comments.md
@@ -1,64 +1,107 @@
-## How do I comment my code?
+# Commenting code
 
-### While we're not enforcing a strict standard, there are some things to keep in mind:
+People spend more time reading code than writing it (sometimes substantially more so). As such, comments and documentation are **vital** for any large codebase like this.
+
+## General Guidelines
+While we're not enforcing a strict standard, here are some things to keep in mind:
 - Make comments meaningful
- - Comments should be explaining why a line or block of code exists and what the reason behind it is
- - Comments should not be repeating chunks of code or explaining what 'true' and 'false' means in typescript
+  - Comments should **NOT** repeat _what_ code _does_[^1] or explain concepts obvious to someone with a basic understanding of the language at hand. Instead, focus on explaining _why_ a line or block of code exists.
+    - Anyone with basic reading comprehension and a good IDE can figure out what code does; gaining a _post hoc_ understanding of the _reasons_ behind its existence takes a lot more digging, effort and bloodshed.
+- Keep comments readable
+  - A comment's verbosity should roughly scale with the complexity of its subject matter. Some people naturally write shorter or longer comments as a personal style, but summarizing a 300 line function with "does a thing" is about as good as writing nothing. Conversely, writing a paragraph-level response where a basic one-liner would suffice is no less undesirable.
+  - Long comments should ideally be broken into multiple lines at around the 100-120 character mark. This isn't _mandatory_, but avoids unnecessary scrolling in terminals and IDEs.
 - Make sure comments exist on Functions, Classes, Methods, and Properties
- - This may be the most important things to comment. When someone goes to use a function/class/method/etc., having a comment reduces the need to flip back and forth between files to figure out how something works. Peek Definition is great until you're three nested functions deep.
- - The best example of this is JSDoc-style comments as seen below:
-   - When formatted this way, the comment gets shown by intellisense in VS Code or similar IDEs just by hovering over the text!
-   - Functions also show each the comment for parameter as you type them, making keeping track of what each one does in lengthy functions much more clear
-```js
-/**
- * Changes the type-based weather modifier if this move's power would be reduced by it
- * @param user {@linkcode Pokemon} using this move
- * @param target {@linkcode Pokemon} target of this move
- * @param move {@linkcode Move} being used
- * @param args [0] {@linkcode Utils.NumberHolder} for arenaAttackTypeMultiplier
- * @returns true if the function succeeds
- */
-apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
-}
+  - These may be the most important things to comment. When someone goes to use a function/class/method/etc., having a comment reduces the need to flip back and forth between files to figure out what XYZ does. Peek Definition is great until you're three nested levels deep.
 
-/** Set to true when experimental animated sprites from Gen6+ are used */
-public experimentalSprites: boolean = false;
+[^1]: With exceptions for extremely long, convoluted or unintuitive methods (though an over-dependency on said comments is likely a symptom of poorly structured code).
 
+# TSDoc
+The codebase makes extensive use of [TSDoc](https://tsdoc.org), which is a TypeScript-specific version of [JSDoc](https://jsdoc.app/about-getting-started)
+that uses similar syntax and attaches to functions, classes, etc.
+
+When formatted correctly, these comments are shown within VS Code or similar IDEs just by hovering over the function or object.
+- Functions also show the comment for each parameter as you type them, making keeping track of arguments inside lengthy functions much more clear.
+
+They can also be used to generate a commentated overview of the codebase. There is a GitHub action that automatically updates [this docs site](https://pagefaultgames.github.io/pokerogue/main/index.html)
+and you can generate it locally as well via `npm run docs` which will generate into the `typedoc/` directory.
+
+## Syntax
+For an example of how TSDoc comments work, here are some TSDoc comments taken from `src/data/moves/move.ts`:
+```ts
 /**
- * Cures the user's party of non-volatile status conditions, ie. Heal Bell, Aromatherapy
- * @extends MoveAttr
- * @see {@linkcode apply}
+ * Attribute to put in a {@link https://bulbapedia.bulbagarden.net/wiki/Substitute_(doll) | Substitute Doll} for the user.
  */
-export class DontHealThePartyPlsAttr extends MoveAttr {
+export class AddSubstituteAttr extends MoveEffectAttr {
+  /** The ratio of the user's max HP that is required to apply this effect */
+  private hpCost: number;
+  /** Whether the damage taken should be rounded up (Shed Tail rounds up) */
+  private roundUp: boolean;
+
+  constructor(hpCost: number, roundUp: boolean) {
+    // code removed
+  }
+
+  /**
+   * Removes 1/4 of the user's maximum HP (rounded down) to create a substitute for the user
+   * @param user - The {@linkcode Pokemon} that used the move.
+   * @param target - n/a
+   * @param move - The {@linkcode Move} with this attribute.
+   * @param args - n/a
+   * @returns `true` if the attribute successfully applies, `false` otherwise
+   */
+  apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
+    // code removed
+  }
+
+  getUserBenefitScore(user: Pokemon, target: Pokemon, move: Move): number {
+    // code removed
+  }
+
+  getCondition(): MoveConditionFunc {
+    // code removed
+  }
+
+  /**
+   * Get the substitute-specific failure message if one should be displayed.
+   * @param user - The pokemon using the move.
+   * @returns The substitute-specific failure message if the conditions apply, otherwise `undefined`
+   */
+  getFailedText(user: Pokemon, _target: Pokemon, _move: Move): string | undefined {
+    // code removed
+  }
 }
 ```
-You'll notice this contains an `{@linkcode Object}` tag for each parameter. This provides an easy type denomination and hyperlink to that type using VS Code's Intellisense. `@linkcode` is used instead of `@link` so that the text appears in monospace which is more obviously a `type` rather than a random hyperlink.
 
-If you're interested in going more in depth, you can find a reference guide for how comments like these work [here](https://jsdoc.app)
+Looking at the example given, you'll notice this contains an `{@linkcode XYZ}` tag in some of the parameters. This provides a clickable hyperlink to that type or object in most modern IDEs. (`@linkcode` is used here instead of `@link` so that the text appears in monospace which is more obviously a `type` rather than a random hyperlink.) \
+Also note the dashes (` - `) between the parameter names and descriptions - these are **mandatory** under the TSDoc spec[^2].
+
+If you're interested in going more in depth, you can find a reference guide for how comments like these work [on the TSDoc website](https://tsdoc.org).
+The [playground page](https://tsdoc.org/play/) there can also be used for live testing of examples.
+
+[^2]: Incidentally, this is also the only place dashes are explicitly _required_.
 
 ### What not to do:
 - Don't leave comments for code you don't understand
- - Incorrect information is worse than no information. If you aren't sure how something works, don't make something up to explain it. Ask for help instead.
+  - Incorrect information is worse than no information. If you aren't sure how something works, don't make something up to explain it - ask for help and/or mark it as TODO.
 - Don't over-comment
- - Not everything needs an explanation. Try to summarize blocks of code instead of singular lines where possible. Single line comments should call out specific oddities.
+  - Not everything needs a comment. Try to summarize blocks of code instead of singular lines where possible, always preferring giving a reason over stating a fact. Single line comments should call out specific oddities or features.
 
 ## How do Abilities and Moves differ from other classes?
 While other classes should be fully documented, Abilities and Moves heavily incoperate inheritance (i.e. the `extends` keyword). Because of this, much of the functionality in these classes is duplicated or only slightly changed between classes.
 ### With this in mind, there's a few more things to keep in mind for these:
 - Do not document any parameters if the function mirrors the one they extend.
-  - Keep this in mind for functions that are not the `apply` function as they are usually sparce and mostly reused
-- The class itself must be documented
-  - This must include the `@extends BaseClass` and `@see {@linkcode apply}` tags
+  - Keep this in mind for functions that are not the `apply` function as they are usually sparse and mostly reused
 - Class member variables must be documented
   - You can use a single line documentation comment for these `/** i.e. a comment like this */`
 - `args` parameters must be documented if used
-  - This should look something like this when there are multiple:
+  - This should look something vaguely like this when there are multiple:
 ```ts
 /**
 ...
- * @param args [0] {@linkcode Utils.NumberHolder} of arenaAttackTypeMultiplier
- *             [1] {@linkcode Utils.BooleanHolder} of cancelled
- *             [2] {@linkcode Utils.BooleanHolder} of rWeDoneYet
+ * @param args -
+ * `[0]` The {@linkcode Move} being used
+ * `[1]` A {@linkcode BooleanHolder} used to track XYZ
+ * `[2]` {@linkcode BooleanHolder} `paramC` - paramC description here
 ...
 */
-```
\ No newline at end of file
+```
diff --git a/docs/enemy-ai.md b/docs/enemy-ai.md
index 8edf5a3f10e..d73b0af980e 100644
--- a/docs/enemy-ai.md
+++ b/docs/enemy-ai.md
@@ -37,12 +37,12 @@ The `EnemyCommandPhase` follows this process to determine whether or not an enem
 1. If the Pokémon has a move already queued (e.g. they are recharging after using Hyper Beam), or they are trapped (e.g. by Bind or Arena Trap), skip to resolving a `FIGHT` command (see next section).
 2. For each Pokémon in the enemy's party, [compute their matchup scores](#calculating-matchup-scores) against the active player Pokémon. If there are two active player Pokémon in the battle, add their matchup scores together.
 3. Take the party member with the highest matchup score and apply a multiplier to the score that reduces the score based on how frequently the enemy trainer has switched Pokémon in the current battle.
-   - The multiplier scales off of a counter that increments when the enemy trainer chooses to switch a Pokémon and decrements when they choose to use a move.
+  - The multiplier scales off of a counter that increments when the enemy trainer chooses to switch a Pokémon and decrements when they choose to use a move.
 4. Compare the result of Step 3 with the active enemy Pokémon's matchup score. If the party member's matchup score is at least three times that of the active Pokémon, switch to that party member.
-   - "Boss" trainers only require the party member's matchup score to be at least two times that of the active Pokémon, so they are more likely to switch than other trainers. The full list of boss trainers in the game is as follows:
-     - All gym leaders, Elite 4 members, and Champions
-     - All Evil Team leaders
-     - The last three Rival Fights (on waves 95, 145, and 195)
+  - "Boss" trainers only require the party member's matchup score to be at least two times that of the active Pokémon, so they are more likely to switch than other trainers. The full list of boss trainers in the game is as follows:
+    - All gym leaders, Elite 4 members, and Champions
+    - All Evil Team leaders
+    - The last three Rival Fights (on waves 95, 145, and 195)
 5. If the enemy decided to switch, send a switch `turnCommand` and end this `EnemyCommandPhase`; otherwise, move on to resolving a `FIGHT` enemy command.
 
 ## Step 2: Selecting a Move
@@ -54,28 +54,35 @@ At this point, the enemy (a wild or trainer Pokémon) has decided against switch
 In `getNextMove()`, the enemy Pokémon chooses a move to use in the following steps:
 1. If the Pokémon has a move in its Move Queue (e.g. the second turn of a charging move), and the queued move is still usable, use that move against the given target.
 2. Filter out any moves it can't use within its moveset. The remaining moves make up the enemy's **move pool** for the turn.
-   1. A move can be unusable if it has no PP left or it has been disabled by another move or effect
-   2. If the enemy's move pool is empty, use Struggle.
+  1. A move can be unusable if it has no PP left or it has been disabled by another move or effect.
+  2. If the enemy's move pool is empty, use Struggle.
 3. Calculate the **move score** of each move in the enemy's move pool.
-   1. A move's move score is equivalent to the move's maximum **target score** among all of the move's possible targets on the field ([more on this later](#calculating-move-and-target-scores)).
-   2. A move's move score is set to -20 if at least one of these conditions are met:
-      - The move is unimplemented (or, more precisely, the move's name ends with " (N)").
-      - Conditions for the move to succeed are not met (unless the move is Sucker Punch, Upper Hand, or Thunderclap, as those moves' conditions can't be resolved before the turn starts).
-      - The move's target scores are 0 or `NaN` for each target. In this case, the game assumes the target score calculation for that move is unimplemented.
+  1. A move's move score is equivalent to the move's maximum **target score** among all of the move's possible targets on the field ([more on this later](#calculating-move-and-target-scores)).
+  2. A move's move score is set to -20 if at least one of these conditions are met:
+    - The move is unimplemented (or, more precisely, the move's name ends with "(N)").
+    - Conditions for the move to succeed are not met (unless the move is Sucker Punch, Upper Hand or Thunderclap, as those moves' conditions can't be resolved until after the turn starts).
+    - The move's target scores are 0 or `NaN` for each target. In this case, the game assumes the target score calculation for that move is unimplemented.
 4. Sort the move pool in descending order of move scores.
 5. From here, the enemy's move selection varies based on its `aiType`. If the enemy is a Boss Pokémon or has a Trainer, it uses the `SMART` AI type; otherwise, it uses the `SMART_RANDOM` AI type.
-   1. Let $m_i$ be the *i*-th move in the sorted move pool $M$:
-      - If `aiType === SMART_RANDOM`, the enemy has a 5/8 chance of selecting $m_0$ and a 3/8 chance of advancing to the next best move $m_1$, where it then repeats this roll. This process stops when a move is selected or the last move in the move pool is reached.
-      - If `aiType === SMART`, a similar loop is used to decide between selecting the move $m_i$ and advancing to the next iteration with the move $m_{i+1}$. However, instead of using a flat probability, the following conditions need to be met to advance from selecting $m_i$ to $m_{i+1}$:
-        - $\text{sign}(s_i) = \text{sign}(s_{i+1})$, where $s_i$ is the move score of $m_i$.
-        - $\text{randInt}(0, 100) < \text{round}(\frac{s_{i+1}}{s_i}\times 50)$. In other words: if the scores of $m_i$ and $m_{i+1}$ have the same sign, the chance to advance to the next iteration with $m_{i+1}$ is proportional to how close the scores are to each other. The probability to advance to the next iteration is at most 50 percent (when $s_i$ and $s_{i+1}$ are equal).
+  1. Let $m_i$ be the *i*-th move in the sorted move pool $M$:
+    - If `aiType === SMART_RANDOM`, the enemy has a 5/8 chance of selecting $m_0$ and a 3/8 chance of advancing to the next best move $m_1$, where it then repeats this roll. This process stops when a move is selected or the last move in the move pool is reached.
+    - If `aiType === SMART`, a similar loop is used to decide between selecting the move $m_i$ and advancing to the next iteration with the move $m_{i+1}$. However, instead of using a flat probability, the following conditions need to be met to advance from selecting $m_i$ to $m_{i+1}$:
+      - $\text{sign}(s_i) = \text{sign}(s_{i+1})$, where $s_i$ is the move score of $m_i$.
+      - $\text{randInt}(0, 100) < \text{round}(\frac{s_{i+1}}{s_i}\times 50)$. In other words: if the scores of $m_i$ and $m_{i+1}$ have the same sign, the chance to advance to the next iteration with $m_{i+1}$ is proportional to how close the scores are to each other. The probability to advance to the next iteration is at most 50 percent (when $s_i$ and $s_{i+1}$ are equal).
 6. The enemy will use the move selected in Step 5 against the target(s) with the highest [**target selection score (TSS)**](#choosing-targets-with-getnexttargets)
 
 ### Calculating Move and Target Scores
 
-As part of the move selection process, the enemy Pokémon must compute a **target score (TS)** for each legal target for each move in its move pool. The base target score for all moves is a combination of the move's **user benefit score (UBS)** and **target benefit score (TBS)**.
+As part of the move selection process, the enemy Pokémon must compute a **target score (TS)** for each legal target for each move in its move pool. The base target score is a combination of the move's **user benefit score (UBS)** and **target benefit score (TBS)**, representing how much the move helps or hinders the user and/or its target(s).
 
-![equation](https://latex.codecogs.com/png.image?%5Cinline%20%5Cdpi%7B100%7D%5Cbg%7Bwhite%7D%5Ctext%7BTS%7D=%5Ctext%7BUBS%7D&plus;%5Ctext%7BTBS%7D%5Ctimes%5Cleft%5C%7B%5Cbegin%7Bmatrix%7D-1&%5Ctext%7Bif%20target%20is%20an%20opponent%7D%5C%5C1&%5Ctext%7Botherwise%7D%5C%5C%5Cend%7Bmatrix%7D%5Cright.)
+$$
+\text{TS} = \text{UBS} + \left( \text{TBS} \times
+\begin{cases}
+-1 & \text{if target is an opponent} \\
+1 & \text{otherwise}
+\end{cases}
+\right)
+$$
 
 A move's UBS and TBS are computed with the respective functions in the `Move` class:
 
@@ -96,19 +103,38 @@ In addition to the base score from `Move.getTargetBenefitScore()`, attack moves
 - The move's category (Physical/Special), and whether the user has a higher Attack or Special Attack stat.
 
 More specifically, the following steps are taken to compute the move's `attackScore`:
-1. Compute a multiplier based on the move's type effectiveness: 
+1. Compute a multiplier based on the move's type effectiveness:
 
-   ![typeMultEqn](https://latex.codecogs.com/png.image?%5Cdpi%7B110%7D%5Cbg%7Bwhite%7D%5Ctext%7BtypeMult%7D=%5Cleft%5C%7B%5Cbegin%7Bmatrix%7D2&&%5Ctext%7Bif%20move%20is%20super%20effective(or%20better)%7D%5C%5C-2&&%5Ctext%7Botherwise%7D%5C%5C%5Cend%7Bmatrix%7D%5Cright.)
+  $$
+  \text{typeMult} =
+  \begin{cases}
+  2 & \text{if move is super effective (or better)} \\
+  -2 & \text{otherwise}
+  \end{cases}
+  $$
 2. Compute a multiplier based on the move's category and the user's offensive stats:
-   1. Compute the user's offensive stat ratio:
-      
-      ![statRatioEqn](https://latex.codecogs.com/png.image?%5Cinline%20%5Cdpi%7B100%7D%5Cbg%7Bwhite%7D%5Ctext%7BstatRatio%7D=%5Cleft%5C%7B%5Cbegin%7Bmatrix%7D%5Cfrac%7B%5Ctext%7BuserSpAtk%7D%7D%7B%5Ctext%7BuserAtk%7D%7D&%5Ctext%7Bif%20move%20is%20physical%7D%5C%5C%5Cfrac%7B%5Ctext%7BuserAtk%7D%7D%7B%5Ctext%7BuserSpAtk%7D%7D&%5Ctext%7Botherwise%7D%5C%5C%5Cend%7Bmatrix%7D%5Cright.)
-   2. Compute the stat-based multiplier:
+  1. Compute the user's offensive stat ratio:
 
-      ![statMultEqn](https://latex.codecogs.com/png.image?%5Cinline%20%5Cdpi%7B100%7D%5Cbg%7Bwhite%7D%5Ctext%7BstatMult%7D=%5Cleft%5C%7B%5Cbegin%7Bmatrix%7D2&%5Ctext%7Bif%20statRatio%7D%5Cle%200.75%5C%5C1.5&%5Ctext%7Bif%5C;%7D0.75%5Cle%5Ctext%7BstatRatio%7D%5Cle%200.875%5C%5C1&%5Ctext%7Botherwise%7D%5C%5C%5Cend%7Bmatrix%7D%5Cright.)
+    $$
+    \text{statRatio} =
+    \begin{cases}
+    \frac{\text{userSpAtk}}{\text{userAtk}} & \text{if move is physical} \\
+    \frac{\text{userAtk}}{\text{userSpAtk}} & \text{otherwise}
+    \end{cases}
+    $$
+  2. Compute the stat-based multiplier:
+
+      $$
+      \text{statMult} =
+      \begin{cases}
+      2 & \text{if statRatio} \leq 0.75 \\
+      1.5 & \text{if } 0.75 \leq \text{statRatio} \leq 0.875 \\
+      1 & \text{otherwise}
+      \end{cases}
+      $$
 3. Calculate the move's `attackScore`:
 
-   $\text{attackScore} = (\text{typeMult}\times \text{statMult})+\lfloor \frac{\text{power}}{5} \rfloor$
+  $\text{attackScore} = (\text{typeMult}\times \text{statMult})+\lfloor \frac{\text{power}}{5} \rfloor$
 
 The maximum total multiplier in `attackScore` ($\text{typeMult}\times \text{statMult}$) is 4, which occurs for attacks that are super effective against the target and are categorically aligned with the user's offensive stats (e.g. the move is physical, and the user has much higher Attack than Sp. Atk). The minimum total multiplier of -4 occurs (somewhat confusingly) for attacks that are not super effective but are categorically aligned with the user's offensive stats.
 
@@ -125,18 +151,31 @@ The final step to calculate an attack move's target score (TS) is to multiply th
 
 The enemy's target selection for single-target moves works in a very similar way to its move selection. Each potential target is given a **target selection score (TSS)** which is based on the move's [target benefit score](#calculating-move-and-target-scores) for that target:
 
-![TSSEqn](https://latex.codecogs.com/png.image?%5Cinline%20%5Cdpi%7B100%7D%5Cbg%7Bwhite%7D%5Ctext%7BTSS%7D=%5Ctext%7BTBS%7D%5Ctimes%5Cleft%5C%7B%5Cbegin%7Bmatrix%7D-1&%5Ctext%7Bif%20target%20is%20an%20opponent%7D%5C%5C1&%5Ctext%7Botherwise%7D%5C%5C%5Cend%7Bmatrix%7D%5Cright.)
+$$
+\text{TSS} = \text{TBS} \times
+\begin{cases}
+-1 & \text{if target is an opponent} \\
+1 & \text{otherwise}
+\end{cases}
+$$
 
 Once the TSS is calculated for each target, the target is selected as follows:
 1. Sort the targets (indexes) in decreasing order of their target selection scores (or weights). Let $t_i$ be the index of the *i*-th target in the sorted list, and let $w_i$ be that target's corresponding TSS.
 2. Normalize the weights. Let $w_n$ be the lowest-weighted target in the sorted list, then:
-   
-   ![normWeightEqn](https://latex.codecogs.com/png.image?%5Cinline%20%5Cdpi%7B100%7D%5Cbg%7Bwhite%7DW_i=%5Cleft%5C%7B%5Cbegin%7Bmatrix%7Dw_i&plus;%7Cw_n%7C&%5Ctext%7Bif%5C;%7Dw_n%5C;%5Ctext%7Bis%20negative%7D%5C%5Cw_i&%5Ctext%7Botherwise%7D%5C%5C%5Cend%7Bmatrix%7D%5Cright.)
+
+  $$
+  W_i =
+  \begin{cases}
+  w_i + |w_n| & \text{if } w_n \text{ is negative} \\
+  w_i & \text{otherwise}
+  \end{cases}
+  $$
+
 3. Remove all weights from the list such that $W_i < \frac{W_0}{2}$
 4. Generate a random integer $R=\text{rand}(0, W_{\text{total}})$ where $W_{\text{total}}$ is the sum of all the remaining weights after Step 3.
 5. For each target $(t_i, W_i)$,
-   1. if $R \le \sum_{j=0}^{i} W_i$, or if $t_i$ is the last target in the list, **return** $t_i$
-   2. otherwise, advance to the next target $t_{i+1}$ and repeat this check.
+  1. if $R \le \sum_{j=0}^{i} W_i$, or if $t_i$ is the last target in the list, **return** $t_i$
+  2. otherwise, advance to the next target $t_{i+1}$ and repeat this check.
 
 Once the target is selected, the enemy has successfully determined its next action for the turn, and its corresponding `EnemyCommandPhase` ends. From here, the `TurnStartPhase` processes the enemy's commands alongside the player's commands and begins to resolve the turn.
 
@@ -145,15 +184,15 @@ Once the target is selected, the enemy has successfully determined its next acti
 Suppose you enter a single battle against an enemy trainer with the following Pokémon in their party:
 
 1. An [Excadrill](https://bulbapedia.bulbagarden.net/wiki/Excadrill_(Pok%C3%A9mon)) with the Ability Sand Force and the following moveset
-   1. Earthquake
-   2. Iron Head
-   3. Crush Claw
-   4. Swords Dance
+  1. Earthquake
+  2. Iron Head
+  3. Crush Claw
+  4. Swords Dance
 2. A [Heatmor](https://bulbapedia.bulbagarden.net/wiki/Heatmor_(Pok%C3%A9mon)) with the Ability Flash Fire and the following moveset
-   1. Fire Lash
-   2. Inferno
-   3. Hone Claws
-   4. Shadow Claw
+  1. Fire Lash
+  2. Inferno
+  3. Hone Claws
+  4. Shadow Claw
 
 The enemy trainer leads with their Heatmor, and you lead with a [Dachsbun](https://bulbapedia.bulbagarden.net/wiki/Dachsbun_(Pok%C3%A9mon)) with the Ability Well-Baked Body. We'll cover the enemy's behavior over the next two turns.
 
@@ -172,13 +211,13 @@ Based on the enemy party's matchup scores, whether or not the trainer switches o
 Now that the enemy Pokémon with the best matchup score is on the field (assuming it survives Dachsbun's attack on the last turn), the enemy will now decide to have Excadrill use one of its moves. Assuming all of its moves are usable, we'll go through the target score calculations for each move:
 
 - **Earthquake**: In a single battle, this move is just a 100-power Ground-type physical attack with no additional effects. With no additional benefit score from attributes, the move's base target score against the player's Dachsbun is just the `attackScore` from `AttackMove.getTargetBenefitScore()`. In this case, Earthquake's `attackScore` is given by
-  
+
   $\text{attackScore}=(\text{typeMult}\times \text{statMult}) + \lfloor \frac{\text{power}}{5} \rfloor = -2\times 2 + 20 = 16$
 
   Here, `typeMult` is -2 because the move is not super effective, and `statMult` is 2 because Excadrill's Attack is significantly higher than its Sp. Atk. Accounting for STAB thanks to Excadrill's typing, the final target score for this move is **24**
 
 - **Iron Head**: This move is an 80-power Steel-type physical attack with an additional chance to cause the target to flinch. With these properties, Iron Head has a user benefit score of 0 and a target benefit score given by
-  
+
   $\text{TBS}=\text{getTargetBenefitScore(FlinchAttr)}-\text{attackScore}$
 
   Under its current implementation, the target benefit score of `FlinchAttr` is -5. Calculating the move's `attackScore`, we get:
@@ -198,7 +237,7 @@ Now that the enemy Pokémon with the best matchup score is on the field (assumin
   where `levels` is the number of stat stages added by the attribute (in this case, +2). The final score for this move is **6** (Note: because this move is self-targeted, we don't flip the sign of TBS when computing the target score).
 
 - **Crush Claw**: This move is a 75-power Normal-type physical attack with a 50 percent chance to lower the target's Defense by one stage. The additional effect is implemented by the same `StatStageChangeAttr` as Swords Dance, so we can use the same formulas from before to compute the total TBS and base target score.
-  
+
   $\text{TBS}=\text{getTargetBenefitScore(StatStageChangeAttr)}-\text{attackScore}$
 
   $\text{TBS}=(-4 + 2)-(-2\times 2 + \lfloor \frac{75}{5} \rfloor)=-2-11=-13$
diff --git a/docs/linting.md b/docs/linting.md
index 39b30b7a1c0..d3b4e47675f 100644
--- a/docs/linting.md
+++ b/docs/linting.md
@@ -1,40 +1,65 @@
-# ESLint
-## Key Features
+# Linting & Formatting
 
-1. **Automation**:
-   - A pre-commit hook has been added to automatically run ESLint on the added or modified files, ensuring code quality before commits.
+> "Any fool can write code that a computer can understand. Good programmers write code that humans can understand."
+>
+> — Martin Fowler
 
-2. **Manual Usage**:
-   - If you prefer not to use the pre-commit hook, you can manually run ESLint to automatically fix issues using the command:
-     ```sh
-     npx eslint --fix . or npm run eslint
-     ```
-   - Running this command will lint all files in the repository.
+Writing clean, readable code is important, and linters and formatters are an integral part of ensuring code quality and readability.
+It is for this reason we are using [Biome](https://biomejs.dev), an opinionated linter/formatter (akin to Prettier) with a heavy focus on speed and performance.
 
-3. **GitHub Action**:
-   - A GitHub Action has been added to automatically run ESLint on every push and pull request, ensuring code quality in the CI/CD pipeline.
+### Installation
+You probably installed Biome already without noticing it - it's included inside `package.json` and should've been downloaded when you ran `npm install` after cloning the repo (assuming you followed proper instructions, that is). If you haven't done that yet, go do it.
 
-## Summary of ESLint Rules
+# Using Biome
 
-1. **General Rules**:
-   - **Equality**: Use `===` and `!==` instead of `==` and `!=` (`eqeqeq`).
-   - **Indentation**: Enforce 2-space indentation (`indent`).
-   - **Quotes**: Use doublequotes for strings (`quotes`).
-   - **Variable Declarations**: 
-     - Disallow `var`; use `let` or `const` (`no-var`).
-     - Prefer `const` for variables that are never reassigned (`prefer-const`).
-   - **Unused Variables**: Allow unused function parameters but enforce error for other unused variables (`@typescript-eslint/no-unused-vars`).
-   - **End of Line**: Ensure at least one newline at the end of files (`eol-last`).
-   - **Curly Braces**: Enforce the use of curly braces for all control statements (`curly`).
-   - **Brace Style**: Use one true brace style (`1tbs`) for TypeScript-specific syntax (`@typescript-eslint/brace-style`).
+For the most part, Biome attempts to stay "out of your hair", letting you write code while enforcing a consistent formatting standard and only notifying for errors it can't automatically fix.\
+On the other hand, if Biome complains about a piece of code, **there's probably a good reason why**. Disable comments should be used sparingly or when readabilty demands it - your first instinct should be to fix the code in question, not disable the rule.
 
-2. **TypeScript-Specific Rules**:
-   - **Semicolons**:
-     - Enforce semicolons for TypeScript-specific syntax (`@typescript-eslint/semi`).
-     - Disallow unnecessary semicolons (`@typescript-eslint/no-extra-semi`).
+## Editor Integration
+Biome has integration with many popular code editors. See [these](https://biomejs.dev/guides/editors/first-party-extensions/) [pages](https://biomejs.dev/guides/editors/third-party-extensions/) for information about enabling Biome in your editor of choice.
 
-## Benefits
+## Automated Runs
+Generally speaking, most users shouldn't need to run Biome directly; in addition to editor integration, [pre-commit hook](../lefthook.yml) will periodically run Biome before each commit.
+You will **not** be able to push code with `error`-level linting problems - fix them beforehand.
 
-- **Consistency**: Ensures consistent coding style across the project.
-- **Code Quality**: Helps catch potential errors and improve overall code quality.
-- **Readability**: Makes the codebase easier to read and maintain.
\ No newline at end of file
+We also have a [Github Action](../.github/workflows/quality.yml) to verify code quality each time a PR is updated, preventing bad code from inadvertently making its way upstream.
+
+### Why am I getting errors for code I didn't write?
+<!-- TODO: Remove this if/when we perform a project wide linting spree -->
+To save time and minimize friction with existing code, both the pre-commit hook and workflow run will only check files **directly changed** by a given PR or commit.
+As a result, changes to files not updated since Biome's introduction can cause any _prior_ linting errors in them to resurface and get flagged.
+This should occur less and less often as time passes and more files are updated to the new standard.
+
+## Running Biome via CLI
+If you want Biome to check your files manually, you can run it from the command line like so:
+
+```sh
+npx biome check --[flags]
+```
+
+A full list of flags and options can be found on [their website](https://biomejs.dev/reference/cli/), but here's a few useful ones to keep in mind:
+
+- `--write` will cause Biome to write all "safe" fixes and formatting changes directly to your files (rather than just complaining and doing nothing).
+- `--changed` and `--staged` will only perform checks on all changed or staged files respectively. Biome sources this info from the relevant version control system (in this case Git).
+- `diagnostic-level=XXX` will only show diagnostics with at least the given severity level (`info/warn/error`). Useful to only focus on errors causing a failed workflow run or similar.
+
+## Linting Rules
+
+We primarily use Biome's [recommended ruleset](https://biomejs.dev/linter/rules/) for linting JS/TS, with some customizations to better suit our project's needs[^1].
+
+Some things to consider:
+
+- We have disabled rules that prioritize style over performance, such as `useTemplate`.
+- Some rules are currently disabled or marked as warnings (`warn`) to allow for gradual refactoring without blocking development. **Do not write new code that triggers these warnings.**
+- The linter is configured to ignore specific files and folders (such as excessively large files or ones in need of refactoring) to improve performance and focus on actionable areas.
+
+Any questions about linting rules should be brought up in the `#dev-corner` channel in the discord.
+
+[^1]: A complete list of rules can be found in the `biome.jsonc` file in the project root.
+
+## What about ESLint?
+
+<!-- Remove if/when we finally ditch eslint for good -->
+Our project migrated away from ESLint around March 2025 due to it simply not scaling well enough with the codebase's ever-growing size. The [existing eslint rules](../eslint.config.js) are considered _deprecated_, only kept due to Biome lacking the corresponding rules in its current ruleset.
+
+No additional ESLint rules should be added under any circumstances - even the few currently in circulation take longer to run than the entire Biome formatting/linting suite combined.
\ No newline at end of file
diff --git a/eslint.config.js b/eslint.config.js
index 1cea5563a78..aebcab7feae 100644
--- a/eslint.config.js
+++ b/eslint.config.js
@@ -1,52 +1,43 @@
-import tseslint from '@typescript-eslint/eslint-plugin';
-import stylisticTs from '@stylistic/eslint-plugin-ts';
-import parser from '@typescript-eslint/parser';
-import importX from 'eslint-plugin-import-x';
+/** @ts-check */
+import tseslint from "typescript-eslint";
+import stylisticTs from "@stylistic/eslint-plugin-ts";
+import parser from "@typescript-eslint/parser";
+import importX from "eslint-plugin-import-x";
 
-export default [ 
-    {
-        files: ["src/**/*.{ts,tsx,js,jsx}"],
-        ignores: ["dist/*", "build/*", "coverage/*", "public/*", ".github/*", "node_modules/*", ".vscode/*"],
-        languageOptions: {
-            parser: parser
-        },
-        plugins: {
-            "import-x": importX,
-            '@stylistic/ts': stylisticTs,
-            '@typescript-eslint': tseslint
-        },
-        rules: {
-            "eqeqeq": ["error", "always"], // Enforces the use of `===` and `!==` instead of `==` and `!=`
-            "indent": ["error", 2, { "SwitchCase": 1 }], // Enforces a 2-space indentation, enforces indentation of `case ...:` statements
-            "quotes": ["error", "double"], // Enforces the use of double quotes for strings
-            "no-var": "error", // Disallows the use of `var`, enforcing `let` or `const` instead
-            "prefer-const": "error", // Enforces the use of `const` for variables that are never reassigned
-            "no-undef": "off", // Disables the rule that disallows the use of undeclared variables (TypeScript handles this)
-            "@typescript-eslint/no-unused-vars": [ "error", {
-                "args": "none", // Allows unused function parameters. Useful for functions with specific signatures where not all parameters are always used.
-                "ignoreRestSiblings": true // Allows unused variables that are part of a rest property in object destructuring. Useful for excluding certain properties from an object while using the others.
-            }],
-            "eol-last": ["error", "always"], // Enforces at least one newline at the end of files
-            "@stylistic/ts/semi": ["error", "always"], // Requires semicolons for TypeScript-specific syntax
-            "semi": "off", // Disables the general semi rule for TypeScript files
-            "no-extra-semi": ["error"], // Disallows unnecessary semicolons for TypeScript-specific syntax
-            "brace-style": "off", // Note: you must disable the base rule as it can report incorrect errors
-            "curly": ["error", "all"], // Enforces the use of curly braces for all control statements
-            "@stylistic/ts/brace-style": ["error", "1tbs"], // Enforces the following brace style: https://eslint.style/rules/js/brace-style#_1tbs
-            "no-trailing-spaces": ["error", { // Disallows trailing whitespace at the end of lines
-                "skipBlankLines": false, // Enforces the rule even on blank lines
-                "ignoreComments": false // Enforces the rule on lines containing comments
-            }],
-            "space-before-blocks": ["error", "always"], // Enforces a space before blocks
-            "keyword-spacing": ["error", { "before": true, "after": true }], // Enforces spacing before and after keywords
-            "comma-spacing": ["error", { "before": false, "after": true }], // Enforces spacing after commas
-            "import-x/extensions": ["error", "never", { "json": "always" }], // Enforces no extension for imports unless json
-            "array-bracket-spacing": ["error", "always", { "objectsInArrays": false, "arraysInArrays": false }], // Enforces consistent spacing inside array brackets
-            "object-curly-spacing": ["error", "always", { "arraysInObjects": false, "objectsInObjects": false }], // Enforces consistent spacing inside braces of object literals, destructuring assignments, and import/export specifiers
-            "computed-property-spacing": ["error", "never" ], // Enforces consistent spacing inside computed property brackets
-            "space-infix-ops": ["error", { "int32Hint": false }], // Enforces spacing around infix operators
-            "no-multiple-empty-lines": ["error", { "max": 2, "maxEOF": 1, "maxBOF": 0 }], // Disallows multiple empty lines
-            "@typescript-eslint/consistent-type-imports": "error", // Enforces type-only imports wherever possible
-        }
-    }
-]
+export default tseslint.config(
+  {
+    name: "eslint-config",
+    files: ["src/**/*.{ts,tsx,js,jsx}", "test/**/*.{ts,tsx,js,jsx}"],
+    ignores: ["dist/*", "build/*", "coverage/*", "public/*", ".github/*", "node_modules/*", ".vscode/*"],
+    languageOptions: {
+      parser: parser,
+    },
+    plugins: {
+      "import-x": importX,
+      "@stylistic/ts": stylisticTs,
+      "@typescript-eslint": tseslint.plugin,
+    },
+    rules: {
+      "no-undef": "off", // Disables the rule that disallows the use of undeclared variables (TypeScript handles this)
+      "no-extra-semi": "error", // Disallows unnecessary semicolons for TypeScript-specific syntax
+      "import-x/extensions": ["error", "never", { json: "always" }], // Enforces no extension for imports unless json
+    },
+  },
+  {
+    name: "eslint-tests",
+    files: ["test/**/**.test.ts"],
+    languageOptions: {
+      parser: parser,
+      parserOptions: {
+        project: ["./tsconfig.json"],
+      },
+    },
+    plugins: {
+      "@typescript-eslint": tseslint.plugin,
+    },
+    rules: {
+      "@typescript-eslint/no-floating-promises": "error", // Require Promise-like statements to be handled appropriately. - https://typescript-eslint.io/rules/no-floating-promises/
+      "@typescript-eslint/no-misused-promises": "error", // Disallow Promises in places not designed to handle them. - https://typescript-eslint.io/rules/no-misused-promises/
+    },
+  },
+);
diff --git a/index.css b/index.css
index 2ec106516d2..62ad6266d30 100644
--- a/index.css
+++ b/index.css
@@ -11,7 +11,7 @@ html {
 
 body {
   margin: 0;
-  display:flex;
+  display: flex;
   flex-direction: column;
   align-items: center;
   background: #484050;
@@ -49,16 +49,17 @@ body {
 
 @media (pointer: coarse) {
   /* hasTouchscreen() && !isTouchControlsEnabled */
-  body:has(> #touchControls[class=visible]) #app {
+  body:has(> #touchControls[class="visible"]) #app {
     align-items: start;
   }
 
-  body:has(> #touchControls[class=visible]) #app > div:first-child {
+  body:has(> #touchControls[class="visible"]) #app > div:first-child {
     transform-origin: top !important;
   }
 }
 
-#layout:fullscreen #dpad, #layout:fullscreen {
+#layout:fullscreen #dpad,
+#layout:fullscreen {
   bottom: 6rem;
 }
 
@@ -67,6 +68,10 @@ input:-internal-autofill-selected {
   background-clip: text;
 }
 
+input:-webkit-autofill {
+  -webkit-text-fill-color: #a1a1a1;
+}
+
 /* Need adjust input font-size */
 input {
   font-size: 3.2rem;
@@ -76,7 +81,6 @@ input {
   display: none !important;
 }
 
-
 input:-internal-autofill-selected {
   -webkit-background-clip: text;
   background-clip: text;
@@ -91,18 +95,33 @@ input:-internal-autofill-selected {
 
   --controls-padding: 1rem;
 
-  --controls-size-with-padding: calc(var(--controls-size) + var(--controls-padding));
-  --controls-size-with-wide-padding: calc(var(--controls-size) *1.2 + var(--controls-padding));
+  --controls-size-with-padding: calc(
+    var(--controls-size) +
+    var(--controls-padding)
+  );
+  --controls-size-with-wide-padding: calc(
+    var(--controls-size) *
+    1.2 +
+    var(--controls-padding)
+  );
   --control-group-extra-size: calc(var(--controls-size) * 0.8);
   --control-group-extra-wide-size: calc(var(--controls-size) * 1.2);
 
-  --control-group-extra-2-offset: calc(var(--controls-size-with-padding) + (var(--controls-size) - var(--control-group-extra-size)) / 2);
-  --control-group-extra-1-offset: calc(var(--controls-padding) + (var(--controls-size) - var(--control-group-extra-size)) / 2);
+  --control-group-extra-2-offset: calc(
+    var(--controls-size-with-padding) +
+    (var(--controls-size) - var(--control-group-extra-size)) /
+    2
+  );
+  --control-group-extra-1-offset: calc(
+    var(--controls-padding) +
+    (var(--controls-size) - var(--control-group-extra-size)) /
+    2
+  );
 
   --small-control-size: calc(var(--controls-size) / 3);
   --rect-control-size: calc(var(--controls-size) * 0.74);
 
-  font-family: 'emerald';
+  font-family: "emerald";
   font-size: var(--controls-size);
   text-shadow: var(--color-dark) var(--text-shadow-size) var(--text-shadow-size);
   color: var(--color-light);
@@ -146,32 +165,69 @@ input:-internal-autofill-selected {
 /* Hide buttons on specific UIs */
 
 /* Show #apadPreviousTab and #apadNextTab only in settings, except in touch configuration panel */
-#touchControls:not([data-ui-mode^='SETTINGS']) #apadPreviousTab,
-#touchControls:not([data-ui-mode^='SETTINGS']) #apadNextTab,
+#touchControls:not([data-ui-mode^="SETTINGS"]) #apadPreviousTab,
+#touchControls:not([data-ui-mode^="SETTINGS"]) #apadNextTab,
 #touchControls:is(.config-mode) #apadPreviousTab,
 #touchControls:is(.config-mode) #apadNextTab {
   display: none;
 }
 
 /* Show #apadInfo only in battle */
-#touchControls:not([data-ui-mode='COMMAND']):not([data-ui-mode='FIGHT']):not([data-ui-mode='BALL']):not([data-ui-mode='TARGET_SELECT']) #apadInfo {
+#touchControls:not([data-ui-mode="COMMAND"]):not([data-ui-mode="FIGHT"]):not(
+    [data-ui-mode="BALL"]
+  ):not([data-ui-mode="TARGET_SELECT"])
+  #apadInfo {
   display: none;
 }
 
 /* Show #apadStats only in battle and shop */
-#touchControls:not([data-ui-mode='COMMAND']):not([data-ui-mode='FIGHT']):not([data-ui-mode='BALL']):not([data-ui-mode='TARGET_SELECT']):not([data-ui-mode='MODIFIER_SELECT']) #apadStats {
+#touchControls:not([data-ui-mode="COMMAND"]):not([data-ui-mode="FIGHT"]):not(
+    [data-ui-mode="BALL"]
+  ):not([data-ui-mode="TARGET_SELECT"]):not([data-ui-mode="MODIFIER_SELECT"])
+  #apadStats {
   display: none;
 }
 
 /* Show cycle buttons only on STARTER_SELECT and on touch configuration panel */
-#touchControls:not(.config-mode):not([data-ui-mode='STARTER_SELECT']) #apadOpenFilters,
-#touchControls:not(.config-mode):not([data-ui-mode='STARTER_SELECT'], [data-ui-mode='RUN_INFO']) #apadCycleForm,
-#touchControls:not(.config-mode):not([data-ui-mode='STARTER_SELECT'], [data-ui-mode='RUN_INFO']) #apadCycleShiny,
-#touchControls:not(.config-mode):not([data-ui-mode='STARTER_SELECT']) #apadCycleNature,
-#touchControls:not(.config-mode):not([data-ui-mode='STARTER_SELECT'], [data-ui-mode='RUN_INFO']) #apadCycleAbility,
-#touchControls:not(.config-mode):not([data-ui-mode='STARTER_SELECT']) #apadCycleGender,
-#touchControls:not(.config-mode):not([data-ui-mode='STARTER_SELECT']) #apadCycleVariant {
- display: none;
+#touchControls:not(.config-mode):not(
+    [data-ui-mode="STARTER_SELECT"],
+    [data-ui-mode="POKEDEX"],
+    [data-ui-mode="POKEDEX_PAGE"]
+  )
+  #apadOpenFilters,
+#touchControls:not(.config-mode):not(
+    [data-ui-mode="STARTER_SELECT"],
+    [data-ui-mode="POKEDEX"],
+    [data-ui-mode="POKEDEX_PAGE"],
+    [data-ui-mode="RUN_INFO"]
+  )
+  #apadCycleForm,
+#touchControls:not(.config-mode):not(
+    [data-ui-mode="STARTER_SELECT"],
+    [data-ui-mode="POKEDEX"],
+    [data-ui-mode="POKEDEX_PAGE"],
+    [data-ui-mode="RUN_INFO"]
+  )
+  #apadCycleShiny,
+#touchControls:not(.config-mode):not([data-ui-mode="STARTER_SELECT"])
+  #apadCycleNature,
+#touchControls:not(.config-mode):not(
+    [data-ui-mode="STARTER_SELECT"],
+    [data-ui-mode="POKEDEX_PAGE"],
+    [data-ui-mode="RUN_INFO"]
+  )
+  #apadCycleAbility,
+#touchControls:not(.config-mode):not(
+    [data-ui-mode="STARTER_SELECT"],
+    [data-ui-mode="POKEDEX_PAGE"]
+  )
+  #apadCycleGender,
+#touchControls:not(.config-mode):not(
+    [data-ui-mode="STARTER_SELECT"],
+    [data-ui-mode="POKEDEX"]
+  )
+  #apadCycleTera {
+  display: none;
 }
 
 /* Configuration toolbar */
@@ -217,16 +273,18 @@ input:-internal-autofill-selected {
   font-size: var(--small-control-size);
   border-radius: 8px;
   padding: 2px 8px;
-  text-shadow: var(--color-dark) calc(var(--text-shadow-size) / 3) calc(var(--text-shadow-size) / 3);
+  text-shadow: var(--color-dark) calc(var(--text-shadow-size) / 3)
+    calc(var(--text-shadow-size) / 3);
 }
 
 #configToolbar .button:active {
-  opacity: var(--touch-control-opacity)
+  opacity: var(--touch-control-opacity);
 }
 
 #configToolbar .orientation-label {
   font-size: var(--small-control-size);
-  text-shadow: var(--color-dark) calc(var(--text-shadow-size) / 3) calc(var(--text-shadow-size) / 3);
+  text-shadow: var(--color-dark) calc(var(--text-shadow-size) / 3)
+    calc(var(--text-shadow-size) / 3);
 }
 
 /* dpad */
@@ -270,7 +328,8 @@ input:-internal-autofill-selected {
 
 .apad-small > .apad-label {
   font-size: var(--small-control-size);
-  text-shadow: var(--color-dark) calc(var(--text-shadow-size) / 3) calc(var(--text-shadow-size) / 3);
+  text-shadow: var(--color-dark) calc(var(--text-shadow-size) / 3)
+    calc(var(--text-shadow-size) / 3);
 }
 
 .apad-rectangle {
@@ -320,7 +379,8 @@ input:-internal-autofill-selected {
 
 /* Layout */
 
-#layout:fullscreen #dpad, #layout:fullscreen #apad {
+#layout:fullscreen #dpad,
+#layout:fullscreen #apad {
   bottom: 6rem;
 }
 
@@ -353,55 +413,55 @@ a {
 
 /* Firefox old*/
 @-moz-keyframes blink {
-    0% {
-        opacity:1;
-    }
-    50% {
-        opacity:0;
-    }
-    100% {
-        opacity:1;
-    }
+  0% {
+    opacity: 1;
+  }
+  50% {
+    opacity: 0;
+  }
+  100% {
+    opacity: 1;
+  }
 }
 
 @-webkit-keyframes blink {
-    0% {
-        opacity:1;
-    }
-    50% {
-        opacity:0;
-    }
-    100% {
-        opacity:1;
-    }
+  0% {
+    opacity: 1;
+  }
+  50% {
+    opacity: 0;
+  }
+  100% {
+    opacity: 1;
+  }
 }
 /* IE */
 @-ms-keyframes blink {
-    0% {
-        opacity:1;
-    }
-    50% {
-        opacity:0;
-    }
-    100% {
-        opacity:1;
-    }
+  0% {
+    opacity: 1;
+  }
+  50% {
+    opacity: 0;
+  }
+  100% {
+    opacity: 1;
+  }
 }
 /* Opera and prob css3 final iteration */
 @keyframes blink {
-    0% {
-        opacity:1;
-    }
-    50% {
-        opacity:0;
-    }
-    100% {
-        opacity:1;
-    }
+  0% {
+    opacity: 1;
+  }
+  50% {
+    opacity: 0;
+  }
+  100% {
+    opacity: 1;
+  }
 }
 .blink-image {
-    -moz-animation: blink normal 4s infinite ease-in-out; /* Firefox */
-    -webkit-animation: blink normal 4s infinite ease-in-out; /* Webkit */
-    -ms-animation: blink normal 4s infinite ease-in-out; /* IE */
-    animation: blink normal 4s infinite ease-in-out; /* Opera and prob css3 final iteration */
+  -moz-animation: blink normal 4s infinite ease-in-out; /* Firefox */
+  -webkit-animation: blink normal 4s infinite ease-in-out; /* Webkit */
+  -ms-animation: blink normal 4s infinite ease-in-out; /* IE */
+  animation: blink normal 4s infinite ease-in-out; /* Opera and prob css3 final iteration */
 }
diff --git a/index.html b/index.html
index 390a29fb365..111464b5e5c 100644
--- a/index.html
+++ b/index.html
@@ -129,11 +129,11 @@
 				<div id="apadCycleNature" class="apad-button apad-square apad-small" data-key="CYCLE_NATURE">
 					<span class="apad-label">N</span>
 				</div>
-				<div id="apadCycleVariant" class="apad-button apad-square apad-small" data-key="V">
+				<div id="apadCycleTera" class="apad-button apad-square apad-small" data-key="CYCLE_TERA">
 					<span class="apad-label">V</span>
 				</div>
 				<!-- buttons to display battle-specific information -->
-				<div id="apadInfo" class="apad-button apad-rectangle apad-small" data-key="V">
+				<div id="apadInfo" class="apad-button apad-rectangle apad-small" data-key="CYCLE_TERA">
 					<span class="apad-label">V</span>
 				</div>
 				<div id="apadStats" class="apad-button apad-rectangle apad-small" data-key="STATS">
diff --git a/lefthook.yml b/lefthook.yml
index 06eb0446ee5..ff0ac00f9e5 100644
--- a/lefthook.yml
+++ b/lefthook.yml
@@ -1,20 +1,13 @@
 pre-commit:
   parallel: true
   commands:
-    eslint:
-      glob: "*.{js,jsx,ts,tsx}"
-      run: npx eslint --fix {staged_files}
+    biome-lint:
+      run: npx biome check --write --reporter=summary --staged --no-errors-on-unmatched
       stage_fixed: true
       skip:
         - merge
         - rebase
 
-pre-push:
-  commands:
-    eslint:
-      glob: "*.{js,ts,jsx,tsx}"
-      run: npx eslint --fix {push_files}
-      
 post-merge:
   commands:
     update-submodules:
diff --git a/package-lock.json b/package-lock.json
index 4398037822a..66400b14459 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,7014 +1,8029 @@
 {
-	"name": "pokemon-rogue-battle",
-	"version": "1.5.4",
-	"lockfileVersion": 3,
-	"requires": true,
-	"packages": {
-		"": {
-			"name": "pokemon-rogue-battle",
-			"version": "1.5.4",
-			"hasInstallScript": true,
-			"dependencies": {
-				"@material/material-color-utilities": "^0.2.7",
-				"crypto-js": "^4.2.0",
-				"i18next": "^23.11.1",
-				"i18next-browser-languagedetector": "^7.2.1",
-				"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"
-			},
-			"devDependencies": {
-				"@eslint/js": "^9.3.0",
-				"@hpcc-js/wasm": "^2.18.0",
-				"@stylistic/eslint-plugin-ts": "^2.6.0-beta.0",
-				"@types/jsdom": "^21.1.7",
-				"@types/node": "^20.12.13",
-				"@typescript-eslint/eslint-plugin": "^8.0.0-alpha.54",
-				"@typescript-eslint/parser": "^8.0.0-alpha.54",
-				"@vitest/coverage-istanbul": "^2.1.9",
-				"dependency-cruiser": "^16.3.10",
-				"eslint": "^9.7.0",
-				"eslint-plugin-import-x": "^4.2.1",
-				"inquirer": "^11.0.2",
-				"jsdom": "^24.0.0",
-				"lefthook": "^1.6.12",
-				"msw": "^2.4.9",
-				"phaser3spectorjs": "^0.0.8",
-				"typedoc": "^0.26.4",
-				"typescript": "^5.5.3",
-				"typescript-eslint": "^8.0.0-alpha.54",
-				"vite": "^5.4.14",
-				"vite-tsconfig-paths": "^4.3.2",
-				"vitest": "^2.1.9",
-				"vitest-canvas-mock": "^0.3.3"
-			},
-			"engines": {
-				"node": ">=20.0.0"
-			}
-		},
-		"node_modules/@ampproject/remapping": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz",
-			"integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==",
-			"dev": true,
-			"license": "Apache-2.0",
-			"dependencies": {
-				"@jridgewell/gen-mapping": "^0.3.5",
-				"@jridgewell/trace-mapping": "^0.3.24"
-			},
-			"engines": {
-				"node": ">=6.0.0"
-			}
-		},
-		"node_modules/@babel/code-frame": {
-			"version": "7.24.7",
-			"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.7.tgz",
-			"integrity": "sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@babel/highlight": "^7.24.7",
-				"picocolors": "^1.0.0"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@babel/compat-data": {
-			"version": "7.24.9",
-			"resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.24.9.tgz",
-			"integrity": "sha512-e701mcfApCJqMMueQI0Fb68Amflj83+dvAvHawoBpAz+GDjCIyGHzNwnefjsWJ3xiYAqqiQFoWbspGYBdb2/ng==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@babel/core": {
-			"version": "7.24.9",
-			"resolved": "https://registry.npmjs.org/@babel/core/-/core-7.24.9.tgz",
-			"integrity": "sha512-5e3FI4Q3M3Pbr21+5xJwCv6ZT6KmGkI0vw3Tozy5ODAQFTIWe37iT8Cr7Ice2Ntb+M3iSKCEWMB1MBgKrW3whg==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@ampproject/remapping": "^2.2.0",
-				"@babel/code-frame": "^7.24.7",
-				"@babel/generator": "^7.24.9",
-				"@babel/helper-compilation-targets": "^7.24.8",
-				"@babel/helper-module-transforms": "^7.24.9",
-				"@babel/helpers": "^7.24.8",
-				"@babel/parser": "^7.24.8",
-				"@babel/template": "^7.24.7",
-				"@babel/traverse": "^7.24.8",
-				"@babel/types": "^7.24.9",
-				"convert-source-map": "^2.0.0",
-				"debug": "^4.1.0",
-				"gensync": "^1.0.0-beta.2",
-				"json5": "^2.2.3",
-				"semver": "^6.3.1"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/babel"
-			}
-		},
-		"node_modules/@babel/core/node_modules/semver": {
-			"version": "6.3.1",
-			"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-			"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-			"dev": true,
-			"license": "ISC",
-			"bin": {
-				"semver": "bin/semver.js"
-			}
-		},
-		"node_modules/@babel/generator": {
-			"version": "7.24.10",
-			"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.24.10.tgz",
-			"integrity": "sha512-o9HBZL1G2129luEUlG1hB4N/nlYNWHnpwlND9eOMclRqqu1YDy2sSYVCFUZwl8I1Gxh+QSRrP2vD7EpUmFVXxg==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@babel/types": "^7.24.9",
-				"@jridgewell/gen-mapping": "^0.3.5",
-				"@jridgewell/trace-mapping": "^0.3.25",
-				"jsesc": "^2.5.1"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@babel/helper-compilation-targets": {
-			"version": "7.24.8",
-			"resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.24.8.tgz",
-			"integrity": "sha512-oU+UoqCHdp+nWVDkpldqIQL/i/bvAv53tRqLG/s+cOXxe66zOYLU7ar/Xs3LdmBihrUMEUhwu6dMZwbNOYDwvw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@babel/compat-data": "^7.24.8",
-				"@babel/helper-validator-option": "^7.24.8",
-				"browserslist": "^4.23.1",
-				"lru-cache": "^5.1.1",
-				"semver": "^6.3.1"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@babel/helper-compilation-targets/node_modules/semver": {
-			"version": "6.3.1",
-			"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-			"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-			"dev": true,
-			"license": "ISC",
-			"bin": {
-				"semver": "bin/semver.js"
-			}
-		},
-		"node_modules/@babel/helper-environment-visitor": {
-			"version": "7.24.7",
-			"resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.24.7.tgz",
-			"integrity": "sha512-DoiN84+4Gnd0ncbBOM9AZENV4a5ZiL39HYMyZJGZ/AZEykHYdJw0wW3kdcsh9/Kn+BRXHLkkklZ51ecPKmI1CQ==",
-			"dev": true,
-			"dependencies": {
-				"@babel/types": "^7.24.7"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@babel/helper-function-name": {
-			"version": "7.24.7",
-			"resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.24.7.tgz",
-			"integrity": "sha512-FyoJTsj/PEUWu1/TYRiXTIHc8lbw+TDYkZuoE43opPS5TrI7MyONBE1oNvfguEXAD9yhQRrVBnXdXzSLQl9XnA==",
-			"dev": true,
-			"dependencies": {
-				"@babel/template": "^7.24.7",
-				"@babel/types": "^7.24.7"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@babel/helper-hoist-variables": {
-			"version": "7.24.7",
-			"resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.24.7.tgz",
-			"integrity": "sha512-MJJwhkoGy5c4ehfoRyrJ/owKeMl19U54h27YYftT0o2teQ3FJ3nQUf/I3LlJsX4l3qlw7WRXUmiyajvHXoTubQ==",
-			"dev": true,
-			"dependencies": {
-				"@babel/types": "^7.24.7"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@babel/helper-module-imports": {
-			"version": "7.24.7",
-			"resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.24.7.tgz",
-			"integrity": "sha512-8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@babel/traverse": "^7.24.7",
-				"@babel/types": "^7.24.7"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@babel/helper-module-transforms": {
-			"version": "7.24.9",
-			"resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.24.9.tgz",
-			"integrity": "sha512-oYbh+rtFKj/HwBQkFlUzvcybzklmVdVV3UU+mN7n2t/q3yGHbuVdNxyFvSBO1tfvjyArpHNcWMAzsSPdyI46hw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@babel/helper-environment-visitor": "^7.24.7",
-				"@babel/helper-module-imports": "^7.24.7",
-				"@babel/helper-simple-access": "^7.24.7",
-				"@babel/helper-split-export-declaration": "^7.24.7",
-				"@babel/helper-validator-identifier": "^7.24.7"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.0.0"
-			}
-		},
-		"node_modules/@babel/helper-simple-access": {
-			"version": "7.24.7",
-			"resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.24.7.tgz",
-			"integrity": "sha512-zBAIvbCMh5Ts+b86r/CjU+4XGYIs+R1j951gxI3KmmxBMhCg4oQMsv6ZXQ64XOm/cvzfU1FmoCyt6+owc5QMYg==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@babel/traverse": "^7.24.7",
-				"@babel/types": "^7.24.7"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@babel/helper-split-export-declaration": {
-			"version": "7.24.7",
-			"resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.24.7.tgz",
-			"integrity": "sha512-oy5V7pD+UvfkEATUKvIjvIAH/xCzfsFVw7ygW2SI6NClZzquT+mwdTfgfdbUiceh6iQO0CHtCPsyze/MZ2YbAA==",
-			"dev": true,
-			"dependencies": {
-				"@babel/types": "^7.24.7"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@babel/helper-string-parser": {
-			"version": "7.25.9",
-			"resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz",
-			"integrity": "sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@babel/helper-validator-identifier": {
-			"version": "7.25.9",
-			"resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz",
-			"integrity": "sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@babel/helper-validator-option": {
-			"version": "7.24.8",
-			"resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.24.8.tgz",
-			"integrity": "sha512-xb8t9tD1MHLungh/AIoWYN+gVHaB9kwlu8gffXGSt3FFEIT7RjS+xWbc2vUD1UTZdIpKj/ab3rdqJ7ufngyi2Q==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@babel/helpers": {
-			"version": "7.24.8",
-			"resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.24.8.tgz",
-			"integrity": "sha512-gV2265Nkcz7weJJfvDoAEVzC1e2OTDpkGbEsebse8koXUJUXPsCMi7sRo/+SPMuMZ9MtUPnGwITTnQnU5YjyaQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@babel/template": "^7.24.7",
-				"@babel/types": "^7.24.8"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@babel/highlight": {
-			"version": "7.24.7",
-			"resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.7.tgz",
-			"integrity": "sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@babel/helper-validator-identifier": "^7.24.7",
-				"chalk": "^2.4.2",
-				"js-tokens": "^4.0.0",
-				"picocolors": "^1.0.0"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@babel/highlight/node_modules/ansi-styles": {
-			"version": "3.2.1",
-			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-			"integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-			"dev": true,
-			"dependencies": {
-				"color-convert": "^1.9.0"
-			},
-			"engines": {
-				"node": ">=4"
-			}
-		},
-		"node_modules/@babel/highlight/node_modules/chalk": {
-			"version": "2.4.2",
-			"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-			"integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"ansi-styles": "^3.2.1",
-				"escape-string-regexp": "^1.0.5",
-				"supports-color": "^5.3.0"
-			},
-			"engines": {
-				"node": ">=4"
-			}
-		},
-		"node_modules/@babel/highlight/node_modules/color-convert": {
-			"version": "1.9.3",
-			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-			"integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"color-name": "1.1.3"
-			}
-		},
-		"node_modules/@babel/highlight/node_modules/color-name": {
-			"version": "1.1.3",
-			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-			"integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/@babel/highlight/node_modules/escape-string-regexp": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-			"integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=0.8.0"
-			}
-		},
-		"node_modules/@babel/highlight/node_modules/has-flag": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-			"integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=4"
-			}
-		},
-		"node_modules/@babel/highlight/node_modules/supports-color": {
-			"version": "5.5.0",
-			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-			"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"has-flag": "^3.0.0"
-			},
-			"engines": {
-				"node": ">=4"
-			}
-		},
-		"node_modules/@babel/parser": {
-			"version": "7.26.8",
-			"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.8.tgz",
-			"integrity": "sha512-TZIQ25pkSoaKEYYaHbbxkfL36GNsQ6iFiBbeuzAkLnXayKR1yP1zFe+NxuZWWsUyvt8icPU9CCq0sgWGXR1GEw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@babel/types": "^7.26.8"
-			},
-			"bin": {
-				"parser": "bin/babel-parser.js"
-			},
-			"engines": {
-				"node": ">=6.0.0"
-			}
-		},
-		"node_modules/@babel/runtime": {
-			"version": "7.24.8",
-			"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.24.8.tgz",
-			"integrity": "sha512-5F7SDGs1T72ZczbRwbGO9lQi0NLjQxzl6i4lJxLxfW9U5UluCSyEJeniWvnhl3/euNiqQVbo8zruhsDfid0esA==",
-			"dependencies": {
-				"regenerator-runtime": "^0.14.0"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@babel/template": {
-			"version": "7.24.7",
-			"resolved": "https://registry.npmjs.org/@babel/template/-/template-7.24.7.tgz",
-			"integrity": "sha512-jYqfPrU9JTF0PmPy1tLYHW4Mp4KlgxJD9l2nP9fD6yT/ICi554DmrWBAEYpIelzjHf1msDP3PxJIRt/nFNfBig==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@babel/code-frame": "^7.24.7",
-				"@babel/parser": "^7.24.7",
-				"@babel/types": "^7.24.7"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@babel/traverse": {
-			"version": "7.24.8",
-			"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.24.8.tgz",
-			"integrity": "sha512-t0P1xxAPzEDcEPmjprAQq19NWum4K0EQPjMwZQZbHt+GiZqvjCHjj755Weq1YRPVzBI+3zSfvScfpnuIecVFJQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@babel/code-frame": "^7.24.7",
-				"@babel/generator": "^7.24.8",
-				"@babel/helper-environment-visitor": "^7.24.7",
-				"@babel/helper-function-name": "^7.24.7",
-				"@babel/helper-hoist-variables": "^7.24.7",
-				"@babel/helper-split-export-declaration": "^7.24.7",
-				"@babel/parser": "^7.24.8",
-				"@babel/types": "^7.24.8",
-				"debug": "^4.3.1",
-				"globals": "^11.1.0"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@babel/traverse/node_modules/globals": {
-			"version": "11.12.0",
-			"resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-			"integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-			"dev": true,
-			"engines": {
-				"node": ">=4"
-			}
-		},
-		"node_modules/@babel/types": {
-			"version": "7.26.8",
-			"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.8.tgz",
-			"integrity": "sha512-eUuWapzEGWFEpHFxgEaBG8e3n6S8L3MSu0oda755rOfabWPnh0Our1AozNFVUxGFIhbKgd1ksprsoDGMinTOTA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@babel/helper-string-parser": "^7.25.9",
-				"@babel/helper-validator-identifier": "^7.25.9"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@bundled-es-modules/cookie": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/@bundled-es-modules/cookie/-/cookie-2.0.0.tgz",
-			"integrity": "sha512-Or6YHg/kamKHpxULAdSqhGqnWFneIXu1NKvvfBBzKGwpVsYuFIQ5aBPHDnnoR3ghW1nvSkALd+EF9iMtY7Vjxw==",
-			"dev": true,
-			"license": "ISC",
-			"dependencies": {
-				"cookie": "^0.5.0"
-			}
-		},
-		"node_modules/@bundled-es-modules/statuses": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/@bundled-es-modules/statuses/-/statuses-1.0.1.tgz",
-			"integrity": "sha512-yn7BklA5acgcBr+7w064fGV+SGIFySjCKpqjcWgBAIfrAkY+4GQTJJHQMeT3V/sgz23VTEVV8TtOmkvJAhFVfg==",
-			"dev": true,
-			"license": "ISC",
-			"dependencies": {
-				"statuses": "^2.0.1"
-			}
-		},
-		"node_modules/@bundled-es-modules/tough-cookie": {
-			"version": "0.1.6",
-			"resolved": "https://registry.npmjs.org/@bundled-es-modules/tough-cookie/-/tough-cookie-0.1.6.tgz",
-			"integrity": "sha512-dvMHbL464C0zI+Yqxbz6kZ5TOEp7GLW+pry/RWndAR8MJQAXZ2rPmIs8tziTZjeIyhSNZgZbCePtfSbdWqStJw==",
-			"dev": true,
-			"license": "ISC",
-			"dependencies": {
-				"@types/tough-cookie": "^4.0.5",
-				"tough-cookie": "^4.1.4"
-			}
-		},
-		"node_modules/@esbuild/aix-ppc64": {
-			"version": "0.21.5",
-			"resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz",
-			"integrity": "sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==",
-			"cpu": [
-				"ppc64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"aix"
-			],
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/@esbuild/android-arm": {
-			"version": "0.21.5",
-			"resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.21.5.tgz",
-			"integrity": "sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==",
-			"cpu": [
-				"arm"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"android"
-			],
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/@esbuild/android-arm64": {
-			"version": "0.21.5",
-			"resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.21.5.tgz",
-			"integrity": "sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==",
-			"cpu": [
-				"arm64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"android"
-			],
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/@esbuild/android-x64": {
-			"version": "0.21.5",
-			"resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.21.5.tgz",
-			"integrity": "sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==",
-			"cpu": [
-				"x64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"android"
-			],
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/@esbuild/darwin-arm64": {
-			"version": "0.21.5",
-			"resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.21.5.tgz",
-			"integrity": "sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==",
-			"cpu": [
-				"arm64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"darwin"
-			],
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/@esbuild/darwin-x64": {
-			"version": "0.21.5",
-			"resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.21.5.tgz",
-			"integrity": "sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==",
-			"cpu": [
-				"x64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"darwin"
-			],
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/@esbuild/freebsd-arm64": {
-			"version": "0.21.5",
-			"resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.21.5.tgz",
-			"integrity": "sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==",
-			"cpu": [
-				"arm64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"freebsd"
-			],
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/@esbuild/freebsd-x64": {
-			"version": "0.21.5",
-			"resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.21.5.tgz",
-			"integrity": "sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==",
-			"cpu": [
-				"x64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"freebsd"
-			],
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/@esbuild/linux-arm": {
-			"version": "0.21.5",
-			"resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.21.5.tgz",
-			"integrity": "sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==",
-			"cpu": [
-				"arm"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"linux"
-			],
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/@esbuild/linux-arm64": {
-			"version": "0.21.5",
-			"resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.21.5.tgz",
-			"integrity": "sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==",
-			"cpu": [
-				"arm64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"linux"
-			],
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/@esbuild/linux-ia32": {
-			"version": "0.21.5",
-			"resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.21.5.tgz",
-			"integrity": "sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==",
-			"cpu": [
-				"ia32"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"linux"
-			],
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/@esbuild/linux-loong64": {
-			"version": "0.21.5",
-			"resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.21.5.tgz",
-			"integrity": "sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==",
-			"cpu": [
-				"loong64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"linux"
-			],
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/@esbuild/linux-mips64el": {
-			"version": "0.21.5",
-			"resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.21.5.tgz",
-			"integrity": "sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==",
-			"cpu": [
-				"mips64el"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"linux"
-			],
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/@esbuild/linux-ppc64": {
-			"version": "0.21.5",
-			"resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.21.5.tgz",
-			"integrity": "sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==",
-			"cpu": [
-				"ppc64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"linux"
-			],
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/@esbuild/linux-riscv64": {
-			"version": "0.21.5",
-			"resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.21.5.tgz",
-			"integrity": "sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==",
-			"cpu": [
-				"riscv64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"linux"
-			],
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/@esbuild/linux-s390x": {
-			"version": "0.21.5",
-			"resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.21.5.tgz",
-			"integrity": "sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==",
-			"cpu": [
-				"s390x"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"linux"
-			],
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/@esbuild/linux-x64": {
-			"version": "0.21.5",
-			"resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.21.5.tgz",
-			"integrity": "sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==",
-			"cpu": [
-				"x64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"linux"
-			],
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/@esbuild/netbsd-x64": {
-			"version": "0.21.5",
-			"resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.21.5.tgz",
-			"integrity": "sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==",
-			"cpu": [
-				"x64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"netbsd"
-			],
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/@esbuild/openbsd-x64": {
-			"version": "0.21.5",
-			"resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.21.5.tgz",
-			"integrity": "sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==",
-			"cpu": [
-				"x64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"openbsd"
-			],
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/@esbuild/sunos-x64": {
-			"version": "0.21.5",
-			"resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.21.5.tgz",
-			"integrity": "sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==",
-			"cpu": [
-				"x64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"sunos"
-			],
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/@esbuild/win32-arm64": {
-			"version": "0.21.5",
-			"resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.21.5.tgz",
-			"integrity": "sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==",
-			"cpu": [
-				"arm64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"win32"
-			],
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/@esbuild/win32-ia32": {
-			"version": "0.21.5",
-			"resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.21.5.tgz",
-			"integrity": "sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==",
-			"cpu": [
-				"ia32"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"win32"
-			],
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/@esbuild/win32-x64": {
-			"version": "0.21.5",
-			"resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.21.5.tgz",
-			"integrity": "sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==",
-			"cpu": [
-				"x64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"win32"
-			],
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/@eslint-community/eslint-utils": {
-			"version": "4.4.0",
-			"resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
-			"integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"eslint-visitor-keys": "^3.3.0"
-			},
-			"engines": {
-				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-			},
-			"peerDependencies": {
-				"eslint": "^6.0.0 || ^7.0.0 || >=8.0.0"
-			}
-		},
-		"node_modules/@eslint-community/regexpp": {
-			"version": "4.11.0",
-			"resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.11.0.tgz",
-			"integrity": "sha512-G/M/tIiMrTAxEWRfLfQJMmGNX28IxBg4PBz8XqQhqUHLFI6TL2htpIB1iQCj144V5ee/JaKyT9/WZ0MGZWfA7A==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": "^12.0.0 || ^14.0.0 || >=16.0.0"
-			}
-		},
-		"node_modules/@eslint/config-array": {
-			"version": "0.17.1",
-			"resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.17.1.tgz",
-			"integrity": "sha512-BlYOpej8AQ8Ev9xVqroV7a02JK3SkBAaN9GfMMH9W6Ch8FlQlkjGw4Ir7+FgYwfirivAf4t+GtzuAxqfukmISA==",
-			"dev": true,
-			"license": "Apache-2.0",
-			"dependencies": {
-				"@eslint/object-schema": "^2.1.4",
-				"debug": "^4.3.1",
-				"minimatch": "^3.1.2"
-			},
-			"engines": {
-				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-			}
-		},
-		"node_modules/@eslint/config-array/node_modules/brace-expansion": {
-			"version": "1.1.11",
-			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-			"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"balanced-match": "^1.0.0",
-				"concat-map": "0.0.1"
-			}
-		},
-		"node_modules/@eslint/config-array/node_modules/minimatch": {
-			"version": "3.1.2",
-			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-			"integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-			"dev": true,
-			"license": "ISC",
-			"dependencies": {
-				"brace-expansion": "^1.1.7"
-			},
-			"engines": {
-				"node": "*"
-			}
-		},
-		"node_modules/@eslint/eslintrc": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.1.0.tgz",
-			"integrity": "sha512-4Bfj15dVJdoy3RfZmmo86RK1Fwzn6SstsvK9JS+BaVKqC6QQQQyXekNaC+g+LKNgkQ+2VhGAzm6hO40AhMR3zQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"ajv": "^6.12.4",
-				"debug": "^4.3.2",
-				"espree": "^10.0.1",
-				"globals": "^14.0.0",
-				"ignore": "^5.2.0",
-				"import-fresh": "^3.2.1",
-				"js-yaml": "^4.1.0",
-				"minimatch": "^3.1.2",
-				"strip-json-comments": "^3.1.1"
-			},
-			"engines": {
-				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-			},
-			"funding": {
-				"url": "https://opencollective.com/eslint"
-			}
-		},
-		"node_modules/@eslint/eslintrc/node_modules/ajv": {
-			"version": "6.12.6",
-			"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-			"integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"fast-deep-equal": "^3.1.1",
-				"fast-json-stable-stringify": "^2.0.0",
-				"json-schema-traverse": "^0.4.1",
-				"uri-js": "^4.2.2"
-			},
-			"funding": {
-				"type": "github",
-				"url": "https://github.com/sponsors/epoberezkin"
-			}
-		},
-		"node_modules/@eslint/eslintrc/node_modules/brace-expansion": {
-			"version": "1.1.11",
-			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-			"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-			"dev": true,
-			"dependencies": {
-				"balanced-match": "^1.0.0",
-				"concat-map": "0.0.1"
-			}
-		},
-		"node_modules/@eslint/eslintrc/node_modules/json-schema-traverse": {
-			"version": "0.4.1",
-			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-			"integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-			"dev": true
-		},
-		"node_modules/@eslint/eslintrc/node_modules/minimatch": {
-			"version": "3.1.2",
-			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-			"integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-			"dev": true,
-			"dependencies": {
-				"brace-expansion": "^1.1.7"
-			},
-			"engines": {
-				"node": "*"
-			}
-		},
-		"node_modules/@eslint/js": {
-			"version": "9.7.0",
-			"resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.7.0.tgz",
-			"integrity": "sha512-ChuWDQenef8OSFnvuxv0TCVxEwmu3+hPNKvM9B34qpM0rDRbjL8t5QkQeHHeAfsKQjuH9wS82WeCi1J/owatng==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-			}
-		},
-		"node_modules/@eslint/object-schema": {
-			"version": "2.1.4",
-			"resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.4.tgz",
-			"integrity": "sha512-BsWiH1yFGjXXS2yvrf5LyuoSIIbPrGUWob917o+BTKuZ7qJdxX8aJLRxs1fS9n6r7vESrq1OUqb68dANcFXuQQ==",
-			"dev": true,
-			"license": "Apache-2.0",
-			"engines": {
-				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-			}
-		},
-		"node_modules/@hpcc-js/wasm": {
-			"version": "2.18.0",
-			"resolved": "https://registry.npmjs.org/@hpcc-js/wasm/-/wasm-2.18.0.tgz",
-			"integrity": "sha512-M9XVIvAXGH4Xcyb5UoiohWcn6fil89pcos/gClNdBZG2v+W48xSf2bjcA8BW131X/AFHUerVY28n1P1Jw81/9A==",
-			"dev": true,
-			"dependencies": {
-				"yargs": "17.7.2"
-			},
-			"bin": {
-				"dot-wasm": "bin/dot-wasm.js"
-			}
-		},
-		"node_modules/@humanwhocodes/module-importer": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
-			"integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==",
-			"dev": true,
-			"license": "Apache-2.0",
-			"engines": {
-				"node": ">=12.22"
-			},
-			"funding": {
-				"type": "github",
-				"url": "https://github.com/sponsors/nzakas"
-			}
-		},
-		"node_modules/@humanwhocodes/retry": {
-			"version": "0.3.0",
-			"resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.3.0.tgz",
-			"integrity": "sha512-d2CGZR2o7fS6sWB7DG/3a95bGKQyHMACZ5aW8qGkkqQpUoZV6C0X7Pc7l4ZNMZkfNBf4VWNe9E1jRsf0G146Ew==",
-			"dev": true,
-			"license": "Apache-2.0",
-			"engines": {
-				"node": ">=18.18"
-			},
-			"funding": {
-				"type": "github",
-				"url": "https://github.com/sponsors/nzakas"
-			}
-		},
-		"node_modules/@inquirer/checkbox": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/@inquirer/checkbox/-/checkbox-3.0.1.tgz",
-			"integrity": "sha512-0hm2nrToWUdD6/UHnel/UKGdk1//ke5zGUpHIvk5ZWmaKezlGxZkOJXNSWsdxO/rEqTkbB3lNC2J6nBElV2aAQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@inquirer/core": "^9.2.1",
-				"@inquirer/figures": "^1.0.6",
-				"@inquirer/type": "^2.0.0",
-				"ansi-escapes": "^4.3.2",
-				"yoctocolors-cjs": "^2.1.2"
-			},
-			"engines": {
-				"node": ">=18"
-			}
-		},
-		"node_modules/@inquirer/confirm": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/@inquirer/confirm/-/confirm-4.0.1.tgz",
-			"integrity": "sha512-46yL28o2NJ9doViqOy0VDcoTzng7rAb6yPQKU7VDLqkmbCaH4JqK4yk4XqlzNWy9PVC5pG1ZUXPBQv+VqnYs2w==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@inquirer/core": "^9.2.1",
-				"@inquirer/type": "^2.0.0"
-			},
-			"engines": {
-				"node": ">=18"
-			}
-		},
-		"node_modules/@inquirer/core": {
-			"version": "9.2.1",
-			"resolved": "https://registry.npmjs.org/@inquirer/core/-/core-9.2.1.tgz",
-			"integrity": "sha512-F2VBt7W/mwqEU4bL0RnHNZmC/OxzNx9cOYxHqnXX3MP6ruYvZUZAW9imgN9+h/uBT/oP8Gh888J2OZSbjSeWcg==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@inquirer/figures": "^1.0.6",
-				"@inquirer/type": "^2.0.0",
-				"@types/mute-stream": "^0.0.4",
-				"@types/node": "^22.5.5",
-				"@types/wrap-ansi": "^3.0.0",
-				"ansi-escapes": "^4.3.2",
-				"cli-width": "^4.1.0",
-				"mute-stream": "^1.0.0",
-				"signal-exit": "^4.1.0",
-				"strip-ansi": "^6.0.1",
-				"wrap-ansi": "^6.2.0",
-				"yoctocolors-cjs": "^2.1.2"
-			},
-			"engines": {
-				"node": ">=18"
-			}
-		},
-		"node_modules/@inquirer/core/node_modules/@types/node": {
-			"version": "22.5.5",
-			"resolved": "https://registry.npmjs.org/@types/node/-/node-22.5.5.tgz",
-			"integrity": "sha512-Xjs4y5UPO/CLdzpgR6GirZJx36yScjh73+2NlLlkFRSoQN8B0DpfXPdZGnvVmLRLOsqDpOfTNv7D9trgGhmOIA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"undici-types": "~6.19.2"
-			}
-		},
-		"node_modules/@inquirer/core/node_modules/emoji-regex": {
-			"version": "8.0.0",
-			"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-			"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/@inquirer/core/node_modules/string-width": {
-			"version": "4.2.3",
-			"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-			"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"emoji-regex": "^8.0.0",
-				"is-fullwidth-code-point": "^3.0.0",
-				"strip-ansi": "^6.0.1"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/@inquirer/core/node_modules/undici-types": {
-			"version": "6.19.8",
-			"resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz",
-			"integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/@inquirer/core/node_modules/wrap-ansi": {
-			"version": "6.2.0",
-			"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
-			"integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"ansi-styles": "^4.0.0",
-				"string-width": "^4.1.0",
-				"strip-ansi": "^6.0.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/@inquirer/editor": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/@inquirer/editor/-/editor-3.0.1.tgz",
-			"integrity": "sha512-VA96GPFaSOVudjKFraokEEmUQg/Lub6OXvbIEZU1SDCmBzRkHGhxoFAVaF30nyiB4m5cEbDgiI2QRacXZ2hw9Q==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@inquirer/core": "^9.2.1",
-				"@inquirer/type": "^2.0.0",
-				"external-editor": "^3.1.0"
-			},
-			"engines": {
-				"node": ">=18"
-			}
-		},
-		"node_modules/@inquirer/expand": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/@inquirer/expand/-/expand-3.0.1.tgz",
-			"integrity": "sha512-ToG8d6RIbnVpbdPdiN7BCxZGiHOTomOX94C2FaT5KOHupV40tKEDozp12res6cMIfRKrXLJyexAZhWVHgbALSQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@inquirer/core": "^9.2.1",
-				"@inquirer/type": "^2.0.0",
-				"yoctocolors-cjs": "^2.1.2"
-			},
-			"engines": {
-				"node": ">=18"
-			}
-		},
-		"node_modules/@inquirer/figures": {
-			"version": "1.0.6",
-			"resolved": "https://registry.npmjs.org/@inquirer/figures/-/figures-1.0.6.tgz",
-			"integrity": "sha512-yfZzps3Cso2UbM7WlxKwZQh2Hs6plrbjs1QnzQDZhK2DgyCo6D8AaHps9olkNcUFlcYERMqU3uJSp1gmy3s/qQ==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=18"
-			}
-		},
-		"node_modules/@inquirer/input": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/@inquirer/input/-/input-3.0.1.tgz",
-			"integrity": "sha512-BDuPBmpvi8eMCxqC5iacloWqv+5tQSJlUafYWUe31ow1BVXjW2a5qe3dh4X/Z25Wp22RwvcaLCc2siHobEOfzg==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@inquirer/core": "^9.2.1",
-				"@inquirer/type": "^2.0.0"
-			},
-			"engines": {
-				"node": ">=18"
-			}
-		},
-		"node_modules/@inquirer/number": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/@inquirer/number/-/number-2.0.1.tgz",
-			"integrity": "sha512-QpR8jPhRjSmlr/mD2cw3IR8HRO7lSVOnqUvQa8scv1Lsr3xoAMMworcYW3J13z3ppjBFBD2ef1Ci6AE5Qn8goQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@inquirer/core": "^9.2.1",
-				"@inquirer/type": "^2.0.0"
-			},
-			"engines": {
-				"node": ">=18"
-			}
-		},
-		"node_modules/@inquirer/password": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/@inquirer/password/-/password-3.0.1.tgz",
-			"integrity": "sha512-haoeEPUisD1NeE2IanLOiFr4wcTXGWrBOyAyPZi1FfLJuXOzNmxCJPgUrGYKVh+Y8hfGJenIfz5Wb/DkE9KkMQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@inquirer/core": "^9.2.1",
-				"@inquirer/type": "^2.0.0",
-				"ansi-escapes": "^4.3.2"
-			},
-			"engines": {
-				"node": ">=18"
-			}
-		},
-		"node_modules/@inquirer/prompts": {
-			"version": "6.0.1",
-			"resolved": "https://registry.npmjs.org/@inquirer/prompts/-/prompts-6.0.1.tgz",
-			"integrity": "sha512-yl43JD/86CIj3Mz5mvvLJqAOfIup7ncxfJ0Btnl0/v5TouVUyeEdcpknfgc+yMevS/48oH9WAkkw93m7otLb/A==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@inquirer/checkbox": "^3.0.1",
-				"@inquirer/confirm": "^4.0.1",
-				"@inquirer/editor": "^3.0.1",
-				"@inquirer/expand": "^3.0.1",
-				"@inquirer/input": "^3.0.1",
-				"@inquirer/number": "^2.0.1",
-				"@inquirer/password": "^3.0.1",
-				"@inquirer/rawlist": "^3.0.1",
-				"@inquirer/search": "^2.0.1",
-				"@inquirer/select": "^3.0.1"
-			},
-			"engines": {
-				"node": ">=18"
-			}
-		},
-		"node_modules/@inquirer/rawlist": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/@inquirer/rawlist/-/rawlist-3.0.1.tgz",
-			"integrity": "sha512-VgRtFIwZInUzTiPLSfDXK5jLrnpkuSOh1ctfaoygKAdPqjcjKYmGh6sCY1pb0aGnCGsmhUxoqLDUAU0ud+lGXQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@inquirer/core": "^9.2.1",
-				"@inquirer/type": "^2.0.0",
-				"yoctocolors-cjs": "^2.1.2"
-			},
-			"engines": {
-				"node": ">=18"
-			}
-		},
-		"node_modules/@inquirer/search": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/@inquirer/search/-/search-2.0.1.tgz",
-			"integrity": "sha512-r5hBKZk3g5MkIzLVoSgE4evypGqtOannnB3PKTG9NRZxyFRKcfzrdxXXPcoJQsxJPzvdSU2Rn7pB7lw0GCmGAg==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@inquirer/core": "^9.2.1",
-				"@inquirer/figures": "^1.0.6",
-				"@inquirer/type": "^2.0.0",
-				"yoctocolors-cjs": "^2.1.2"
-			},
-			"engines": {
-				"node": ">=18"
-			}
-		},
-		"node_modules/@inquirer/select": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/@inquirer/select/-/select-3.0.1.tgz",
-			"integrity": "sha512-lUDGUxPhdWMkN/fHy1Lk7pF3nK1fh/gqeyWXmctefhxLYxlDsc7vsPBEpxrfVGDsVdyYJsiJoD4bJ1b623cV1Q==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@inquirer/core": "^9.2.1",
-				"@inquirer/figures": "^1.0.6",
-				"@inquirer/type": "^2.0.0",
-				"ansi-escapes": "^4.3.2",
-				"yoctocolors-cjs": "^2.1.2"
-			},
-			"engines": {
-				"node": ">=18"
-			}
-		},
-		"node_modules/@inquirer/type": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/@inquirer/type/-/type-2.0.0.tgz",
-			"integrity": "sha512-XvJRx+2KR3YXyYtPUUy+qd9i7p+GO9Ko6VIIpWlBrpWwXDv8WLFeHTxz35CfQFUiBMLXlGHhGzys7lqit9gWag==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"mute-stream": "^1.0.0"
-			},
-			"engines": {
-				"node": ">=18"
-			}
-		},
-		"node_modules/@isaacs/cliui": {
-			"version": "8.0.2",
-			"resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
-			"integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==",
-			"dev": true,
-			"license": "ISC",
-			"dependencies": {
-				"string-width": "^5.1.2",
-				"string-width-cjs": "npm:string-width@^4.2.0",
-				"strip-ansi": "^7.0.1",
-				"strip-ansi-cjs": "npm:strip-ansi@^6.0.1",
-				"wrap-ansi": "^8.1.0",
-				"wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0"
-			},
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/@isaacs/cliui/node_modules/ansi-regex": {
-			"version": "6.0.1",
-			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
-			"integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=12"
-			},
-			"funding": {
-				"url": "https://github.com/chalk/ansi-regex?sponsor=1"
-			}
-		},
-		"node_modules/@isaacs/cliui/node_modules/strip-ansi": {
-			"version": "7.1.0",
-			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
-			"integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"ansi-regex": "^6.0.1"
-			},
-			"engines": {
-				"node": ">=12"
-			},
-			"funding": {
-				"url": "https://github.com/chalk/strip-ansi?sponsor=1"
-			}
-		},
-		"node_modules/@istanbuljs/schema": {
-			"version": "0.1.3",
-			"resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
-			"integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/@jridgewell/gen-mapping": {
-			"version": "0.3.5",
-			"resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
-			"integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jridgewell/set-array": "^1.2.1",
-				"@jridgewell/sourcemap-codec": "^1.4.10",
-				"@jridgewell/trace-mapping": "^0.3.24"
-			},
-			"engines": {
-				"node": ">=6.0.0"
-			}
-		},
-		"node_modules/@jridgewell/resolve-uri": {
-			"version": "3.1.2",
-			"resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
-			"integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=6.0.0"
-			}
-		},
-		"node_modules/@jridgewell/set-array": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz",
-			"integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=6.0.0"
-			}
-		},
-		"node_modules/@jridgewell/sourcemap-codec": {
-			"version": "1.5.0",
-			"resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz",
-			"integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==",
-			"dev": true
-		},
-		"node_modules/@jridgewell/trace-mapping": {
-			"version": "0.3.25",
-			"resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
-			"integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jridgewell/resolve-uri": "^3.1.0",
-				"@jridgewell/sourcemap-codec": "^1.4.14"
-			}
-		},
-		"node_modules/@material/material-color-utilities": {
-			"version": "0.2.7",
-			"resolved": "https://registry.npmjs.org/@material/material-color-utilities/-/material-color-utilities-0.2.7.tgz",
-			"integrity": "sha512-0FCeqG6WvK4/Cc06F/xXMd/pv4FeisI0c1tUpBbfhA2n9Y8eZEv4Karjbmf2ZqQCPUWMrGp8A571tCjizxoTiQ==",
-			"license": "Apache-2.0"
-		},
-		"node_modules/@mswjs/interceptors": {
-			"version": "0.35.8",
-			"resolved": "https://registry.npmjs.org/@mswjs/interceptors/-/interceptors-0.35.8.tgz",
-			"integrity": "sha512-PFfqpHplKa7KMdoQdj5td03uG05VK2Ng1dG0sP4pT9h0dGSX2v9txYt/AnrzPb/vAmfyBBC0NQV7VaBEX+efgQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@open-draft/deferred-promise": "^2.2.0",
-				"@open-draft/logger": "^0.3.0",
-				"@open-draft/until": "^2.0.0",
-				"is-node-process": "^1.2.0",
-				"outvariant": "^1.4.3",
-				"strict-event-emitter": "^0.5.1"
-			},
-			"engines": {
-				"node": ">=18"
-			}
-		},
-		"node_modules/@nodelib/fs.scandir": {
-			"version": "2.1.5",
-			"resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
-			"integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@nodelib/fs.stat": "2.0.5",
-				"run-parallel": "^1.1.9"
-			},
-			"engines": {
-				"node": ">= 8"
-			}
-		},
-		"node_modules/@nodelib/fs.stat": {
-			"version": "2.0.5",
-			"resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
-			"integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">= 8"
-			}
-		},
-		"node_modules/@nodelib/fs.walk": {
-			"version": "1.2.8",
-			"resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
-			"integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@nodelib/fs.scandir": "2.1.5",
-				"fastq": "^1.6.0"
-			},
-			"engines": {
-				"node": ">= 8"
-			}
-		},
-		"node_modules/@open-draft/deferred-promise": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/@open-draft/deferred-promise/-/deferred-promise-2.2.0.tgz",
-			"integrity": "sha512-CecwLWx3rhxVQF6V4bAgPS5t+So2sTbPgAzafKkVizyi7tlwpcFpdFqq+wqF2OwNBmqFuu6tOyouTuxgpMfzmA==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/@open-draft/logger": {
-			"version": "0.3.0",
-			"resolved": "https://registry.npmjs.org/@open-draft/logger/-/logger-0.3.0.tgz",
-			"integrity": "sha512-X2g45fzhxH238HKO4xbSr7+wBS8Fvw6ixhTDuvLd5mqh6bJJCFAPwU9mPDxbcrRtfxv4u5IHCEH77BmxvXmmxQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"is-node-process": "^1.2.0",
-				"outvariant": "^1.4.0"
-			}
-		},
-		"node_modules/@open-draft/until": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/@open-draft/until/-/until-2.1.0.tgz",
-			"integrity": "sha512-U69T3ItWHvLwGg5eJ0n3I62nWuE6ilHlmz7zM0npLBRvPRd7e6NYmg54vvRtP5mZG7kZqZCFVdsTWo7BPtBujg==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/@pkgjs/parseargs": {
-			"version": "0.11.0",
-			"resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
-			"integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==",
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"engines": {
-				"node": ">=14"
-			}
-		},
-		"node_modules/@rollup/rollup-android-arm-eabi": {
-			"version": "4.22.4",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.22.4.tgz",
-			"integrity": "sha512-Fxamp4aEZnfPOcGA8KSNEohV8hX7zVHOemC8jVBoBUHu5zpJK/Eu3uJwt6BMgy9fkvzxDaurgj96F/NiLukF2w==",
-			"cpu": [
-				"arm"
-			],
-			"dev": true,
-			"optional": true,
-			"os": [
-				"android"
-			]
-		},
-		"node_modules/@rollup/rollup-android-arm64": {
-			"version": "4.22.4",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.22.4.tgz",
-			"integrity": "sha512-VXoK5UMrgECLYaMuGuVTOx5kcuap1Jm8g/M83RnCHBKOqvPPmROFJGQaZhGccnsFtfXQ3XYa4/jMCJvZnbJBdA==",
-			"cpu": [
-				"arm64"
-			],
-			"dev": true,
-			"optional": true,
-			"os": [
-				"android"
-			]
-		},
-		"node_modules/@rollup/rollup-darwin-arm64": {
-			"version": "4.22.4",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.22.4.tgz",
-			"integrity": "sha512-xMM9ORBqu81jyMKCDP+SZDhnX2QEVQzTcC6G18KlTQEzWK8r/oNZtKuZaCcHhnsa6fEeOBionoyl5JsAbE/36Q==",
-			"cpu": [
-				"arm64"
-			],
-			"dev": true,
-			"optional": true,
-			"os": [
-				"darwin"
-			]
-		},
-		"node_modules/@rollup/rollup-darwin-x64": {
-			"version": "4.22.4",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.22.4.tgz",
-			"integrity": "sha512-aJJyYKQwbHuhTUrjWjxEvGnNNBCnmpHDvrb8JFDbeSH3m2XdHcxDd3jthAzvmoI8w/kSjd2y0udT+4okADsZIw==",
-			"cpu": [
-				"x64"
-			],
-			"dev": true,
-			"optional": true,
-			"os": [
-				"darwin"
-			]
-		},
-		"node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-			"version": "4.22.4",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.22.4.tgz",
-			"integrity": "sha512-j63YtCIRAzbO+gC2L9dWXRh5BFetsv0j0va0Wi9epXDgU/XUi5dJKo4USTttVyK7fGw2nPWK0PbAvyliz50SCQ==",
-			"cpu": [
-				"arm"
-			],
-			"dev": true,
-			"optional": true,
-			"os": [
-				"linux"
-			]
-		},
-		"node_modules/@rollup/rollup-linux-arm-musleabihf": {
-			"version": "4.22.4",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.22.4.tgz",
-			"integrity": "sha512-dJnWUgwWBX1YBRsuKKMOlXCzh2Wu1mlHzv20TpqEsfdZLb3WoJW2kIEsGwLkroYf24IrPAvOT/ZQ2OYMV6vlrg==",
-			"cpu": [
-				"arm"
-			],
-			"dev": true,
-			"optional": true,
-			"os": [
-				"linux"
-			]
-		},
-		"node_modules/@rollup/rollup-linux-arm64-gnu": {
-			"version": "4.22.4",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.22.4.tgz",
-			"integrity": "sha512-AdPRoNi3NKVLolCN/Sp4F4N1d98c4SBnHMKoLuiG6RXgoZ4sllseuGioszumnPGmPM2O7qaAX/IJdeDU8f26Aw==",
-			"cpu": [
-				"arm64"
-			],
-			"dev": true,
-			"optional": true,
-			"os": [
-				"linux"
-			]
-		},
-		"node_modules/@rollup/rollup-linux-arm64-musl": {
-			"version": "4.22.4",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.22.4.tgz",
-			"integrity": "sha512-Gl0AxBtDg8uoAn5CCqQDMqAx22Wx22pjDOjBdmG0VIWX3qUBHzYmOKh8KXHL4UpogfJ14G4wk16EQogF+v8hmA==",
-			"cpu": [
-				"arm64"
-			],
-			"dev": true,
-			"optional": true,
-			"os": [
-				"linux"
-			]
-		},
-		"node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
-			"version": "4.22.4",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.22.4.tgz",
-			"integrity": "sha512-3aVCK9xfWW1oGQpTsYJJPF6bfpWfhbRnhdlyhak2ZiyFLDaayz0EP5j9V1RVLAAxlmWKTDfS9wyRyY3hvhPoOg==",
-			"cpu": [
-				"ppc64"
-			],
-			"dev": true,
-			"optional": true,
-			"os": [
-				"linux"
-			]
-		},
-		"node_modules/@rollup/rollup-linux-riscv64-gnu": {
-			"version": "4.22.4",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.22.4.tgz",
-			"integrity": "sha512-ePYIir6VYnhgv2C5Xe9u+ico4t8sZWXschR6fMgoPUK31yQu7hTEJb7bCqivHECwIClJfKgE7zYsh1qTP3WHUA==",
-			"cpu": [
-				"riscv64"
-			],
-			"dev": true,
-			"optional": true,
-			"os": [
-				"linux"
-			]
-		},
-		"node_modules/@rollup/rollup-linux-s390x-gnu": {
-			"version": "4.22.4",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.22.4.tgz",
-			"integrity": "sha512-GqFJ9wLlbB9daxhVlrTe61vJtEY99/xB3C8e4ULVsVfflcpmR6c8UZXjtkMA6FhNONhj2eA5Tk9uAVw5orEs4Q==",
-			"cpu": [
-				"s390x"
-			],
-			"dev": true,
-			"optional": true,
-			"os": [
-				"linux"
-			]
-		},
-		"node_modules/@rollup/rollup-linux-x64-gnu": {
-			"version": "4.22.4",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.22.4.tgz",
-			"integrity": "sha512-87v0ol2sH9GE3cLQLNEy0K/R0pz1nvg76o8M5nhMR0+Q+BBGLnb35P0fVz4CQxHYXaAOhE8HhlkaZfsdUOlHwg==",
-			"cpu": [
-				"x64"
-			],
-			"dev": true,
-			"optional": true,
-			"os": [
-				"linux"
-			]
-		},
-		"node_modules/@rollup/rollup-linux-x64-musl": {
-			"version": "4.22.4",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.22.4.tgz",
-			"integrity": "sha512-UV6FZMUgePDZrFjrNGIWzDo/vABebuXBhJEqrHxrGiU6HikPy0Z3LfdtciIttEUQfuDdCn8fqh7wiFJjCNwO+g==",
-			"cpu": [
-				"x64"
-			],
-			"dev": true,
-			"optional": true,
-			"os": [
-				"linux"
-			]
-		},
-		"node_modules/@rollup/rollup-win32-arm64-msvc": {
-			"version": "4.22.4",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.22.4.tgz",
-			"integrity": "sha512-BjI+NVVEGAXjGWYHz/vv0pBqfGoUH0IGZ0cICTn7kB9PyjrATSkX+8WkguNjWoj2qSr1im/+tTGRaY+4/PdcQw==",
-			"cpu": [
-				"arm64"
-			],
-			"dev": true,
-			"optional": true,
-			"os": [
-				"win32"
-			]
-		},
-		"node_modules/@rollup/rollup-win32-ia32-msvc": {
-			"version": "4.22.4",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.22.4.tgz",
-			"integrity": "sha512-SiWG/1TuUdPvYmzmYnmd3IEifzR61Tragkbx9D3+R8mzQqDBz8v+BvZNDlkiTtI9T15KYZhP0ehn3Dld4n9J5g==",
-			"cpu": [
-				"ia32"
-			],
-			"dev": true,
-			"optional": true,
-			"os": [
-				"win32"
-			]
-		},
-		"node_modules/@rollup/rollup-win32-x64-msvc": {
-			"version": "4.22.4",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.22.4.tgz",
-			"integrity": "sha512-j8pPKp53/lq9lMXN57S8cFz0MynJk8OWNuUnXct/9KCpKU7DgU3bYMJhwWmcqC0UU29p8Lr0/7KEVcaM6bf47Q==",
-			"cpu": [
-				"x64"
-			],
-			"dev": true,
-			"optional": true,
-			"os": [
-				"win32"
-			]
-		},
-		"node_modules/@shikijs/core": {
-			"version": "1.12.0",
-			"resolved": "https://registry.npmjs.org/@shikijs/core/-/core-1.12.0.tgz",
-			"integrity": "sha512-mc1cLbm6UQ8RxLc0dZES7v5rkH+99LxQp/ZvTqV3NLyYsO/fD6JhEflP1H5b2SDq9gI0+0G36AVZWxvounfR9w==",
-			"dev": true,
-			"dependencies": {
-				"@types/hast": "^3.0.4"
-			}
-		},
-		"node_modules/@stylistic/eslint-plugin-js": {
-			"version": "2.6.0-beta.0",
-			"resolved": "https://registry.npmjs.org/@stylistic/eslint-plugin-js/-/eslint-plugin-js-2.6.0-beta.0.tgz",
-			"integrity": "sha512-KQiNvzNzvl9AmMs1MiIBszLIy/Xy1bTExnyaVy5dSzOF9c+yT64JQfH0p0jP6XpGwoCnZsrPUNflwP30G42QBQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@types/eslint": "^8.56.10",
-				"acorn": "^8.12.0",
-				"eslint-visitor-keys": "^4.0.0",
-				"espree": "^10.1.0"
-			},
-			"engines": {
-				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-			},
-			"peerDependencies": {
-				"eslint": ">=8.40.0"
-			}
-		},
-		"node_modules/@stylistic/eslint-plugin-js/node_modules/eslint-visitor-keys": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.0.0.tgz",
-			"integrity": "sha512-OtIRv/2GyiF6o/d8K7MYKKbXrOUBIK6SfkIRM4Z0dY3w+LiQ0vy3F57m0Z71bjbyeiWFiHJ8brqnmE6H6/jEuw==",
-			"dev": true,
-			"license": "Apache-2.0",
-			"engines": {
-				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-			},
-			"funding": {
-				"url": "https://opencollective.com/eslint"
-			}
-		},
-		"node_modules/@stylistic/eslint-plugin-ts": {
-			"version": "2.6.0-beta.0",
-			"resolved": "https://registry.npmjs.org/@stylistic/eslint-plugin-ts/-/eslint-plugin-ts-2.6.0-beta.0.tgz",
-			"integrity": "sha512-WMz1zgmMC3bvg1L/tiYt5ygvDbTDKlbezoHoX2lV9MnUCAEQZUP4xJ9Wj3jmIKxb4mUuK5+vFZJVcOygvbbqow==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@stylistic/eslint-plugin-js": "2.6.0-beta.0",
-				"@types/eslint": "^8.56.10",
-				"@typescript-eslint/utils": "^8.0.0-alpha.34"
-			},
-			"engines": {
-				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-			},
-			"peerDependencies": {
-				"eslint": ">=8.40.0"
-			}
-		},
-		"node_modules/@types/cookie": {
-			"version": "0.6.0",
-			"resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.6.0.tgz",
-			"integrity": "sha512-4Kh9a6B2bQciAhf7FSuMRRkUWecJgJu9nPnx3yzpsfXX/c50REIqpHY4C82bXP90qrLtXtkDxTZosYO3UpOwlA==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/@types/eslint": {
-			"version": "8.56.11",
-			"resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.56.11.tgz",
-			"integrity": "sha512-sVBpJMf7UPo/wGecYOpk2aQya2VUGeHhe38WG7/mN5FufNSubf5VT9Uh9Uyp8/eLJpu1/tuhJ/qTo4mhSB4V4Q==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@types/estree": "*",
-				"@types/json-schema": "*"
-			}
-		},
-		"node_modules/@types/estree": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz",
-			"integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"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,
-			"dependencies": {
-				"@types/unist": "*"
-			}
-		},
-		"node_modules/@types/jsdom": {
-			"version": "21.1.7",
-			"resolved": "https://registry.npmjs.org/@types/jsdom/-/jsdom-21.1.7.tgz",
-			"integrity": "sha512-yOriVnggzrnQ3a9OKOCxaVuSug3w3/SbOj5i7VwXWZEyUNl3bLF9V3MfxGbZKuwqJOQyRfqXyROBB1CoZLFWzA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@types/node": "*",
-				"@types/tough-cookie": "*",
-				"parse5": "^7.0.0"
-			}
-		},
-		"node_modules/@types/json-schema": {
-			"version": "7.0.15",
-			"resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
-			"integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/@types/mute-stream": {
-			"version": "0.0.4",
-			"resolved": "https://registry.npmjs.org/@types/mute-stream/-/mute-stream-0.0.4.tgz",
-			"integrity": "sha512-CPM9nzrCPPJHQNA9keH9CVkVI+WR5kMa+7XEs5jcGQ0VoAGnLv242w8lIVgwAEfmE4oufJRaTc9PNLQl0ioAow==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@types/node": "*"
-			}
-		},
-		"node_modules/@types/node": {
-			"version": "20.14.11",
-			"resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.11.tgz",
-			"integrity": "sha512-kprQpL8MMeszbz6ojB5/tU8PLN4kesnN8Gjzw349rDlNgsSzg90lAVj3llK99Dh7JON+t9AuscPPFW6mPbTnSA==",
-			"dev": true,
-			"dependencies": {
-				"undici-types": "~5.26.4"
-			}
-		},
-		"node_modules/@types/statuses": {
-			"version": "2.0.5",
-			"resolved": "https://registry.npmjs.org/@types/statuses/-/statuses-2.0.5.tgz",
-			"integrity": "sha512-jmIUGWrAiwu3dZpxntxieC+1n/5c3mjrImkmOSQ2NC5uP6cYO4aAZDdSmRcI5C1oiTmqlZGHC+/NmJrKogbP5A==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/@types/tough-cookie": {
-			"version": "4.0.5",
-			"resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.5.tgz",
-			"integrity": "sha512-/Ad8+nIOV7Rl++6f1BdKxFSMgmoqEoYbHRpPcx3JEfv8VRsQe9Z4mCXeJBzxs7mbHY/XOZZuXlRNfhpVPbs6ZA==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"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
-		},
-		"node_modules/@types/wrap-ansi": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/@types/wrap-ansi/-/wrap-ansi-3.0.0.tgz",
-			"integrity": "sha512-ltIpx+kM7g/MLRZfkbL7EsCEjfzCcScLpkg37eXEtx5kmrAKBkTJwd1GIAjDSL8wTpM6Hzn5YO4pSb91BEwu1g==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/@typescript-eslint/eslint-plugin": {
-			"version": "8.0.0-alpha.58",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.0.0-alpha.58.tgz",
-			"integrity": "sha512-5G9oIj8jvosj8RTa0VDFXvRmUg1U6FxXJu7ZEfyJYMvFkdMJoY5YnzFvgAvHbYsXOj+YgXZu81fNOTRWQzwk5A==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@eslint-community/regexpp": "^4.10.0",
-				"@typescript-eslint/scope-manager": "8.0.0-alpha.58",
-				"@typescript-eslint/type-utils": "8.0.0-alpha.58",
-				"@typescript-eslint/utils": "8.0.0-alpha.58",
-				"@typescript-eslint/visitor-keys": "8.0.0-alpha.58",
-				"graphemer": "^1.4.0",
-				"ignore": "^5.3.1",
-				"natural-compare": "^1.4.0",
-				"ts-api-utils": "^1.3.0"
-			},
-			"engines": {
-				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/typescript-eslint"
-			},
-			"peerDependencies": {
-				"@typescript-eslint/parser": "^8.0.0 || ^8.0.0-alpha.0",
-				"eslint": "^8.57.0 || ^9.0.0"
-			},
-			"peerDependenciesMeta": {
-				"typescript": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/@typescript-eslint/parser": {
-			"version": "8.0.0-alpha.58",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.0.0-alpha.58.tgz",
-			"integrity": "sha512-/RpgxIejBui6WXJgV9ukwzxmvbZt5TlfHUGGLB/BsNLj+NRZEbXVtWT9rKuxVOqsGb1Dn9c5gxvBI/XzyuIsMQ==",
-			"dev": true,
-			"license": "BSD-2-Clause",
-			"dependencies": {
-				"@typescript-eslint/scope-manager": "8.0.0-alpha.58",
-				"@typescript-eslint/types": "8.0.0-alpha.58",
-				"@typescript-eslint/typescript-estree": "8.0.0-alpha.58",
-				"@typescript-eslint/visitor-keys": "8.0.0-alpha.58",
-				"debug": "^4.3.4"
-			},
-			"engines": {
-				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/typescript-eslint"
-			},
-			"peerDependencies": {
-				"eslint": "^8.57.0 || ^9.0.0"
-			},
-			"peerDependenciesMeta": {
-				"typescript": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/@typescript-eslint/scope-manager": {
-			"version": "8.0.0-alpha.58",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.0.0-alpha.58.tgz",
-			"integrity": "sha512-bGgJXn8B3Pf3mzEOUQTPxEqhux54MOJSqw4HcgBReuP7dudz/hsN4TH9GqHbMXkFv8N4Ed1iqVRfgGeC8b1mGw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@typescript-eslint/types": "8.0.0-alpha.58",
-				"@typescript-eslint/visitor-keys": "8.0.0-alpha.58"
-			},
-			"engines": {
-				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/typescript-eslint"
-			}
-		},
-		"node_modules/@typescript-eslint/type-utils": {
-			"version": "8.0.0-alpha.58",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.0.0-alpha.58.tgz",
-			"integrity": "sha512-spW/I/UAY6HM0lKj+/333Zb9arOvUoi8+H0cVNYHELPhOti9re9NjyyJFhck84PNiwi8WmpkEf3GXe7/h+Cquw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@typescript-eslint/typescript-estree": "8.0.0-alpha.58",
-				"@typescript-eslint/utils": "8.0.0-alpha.58",
-				"debug": "^4.3.4",
-				"ts-api-utils": "^1.3.0"
-			},
-			"engines": {
-				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/typescript-eslint"
-			},
-			"peerDependenciesMeta": {
-				"typescript": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/@typescript-eslint/types": {
-			"version": "8.0.0-alpha.58",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.0.0-alpha.58.tgz",
-			"integrity": "sha512-6+jM4y31a6pwKeV3MVQuVXPZl6d3I1ySMvP5WjZdZ+n57uovMvasZ3ZJstXngoRpa7JtkjVZ7NrMhQ1J8dxKCQ==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/typescript-eslint"
-			}
-		},
-		"node_modules/@typescript-eslint/typescript-estree": {
-			"version": "8.0.0-alpha.58",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.0.0-alpha.58.tgz",
-			"integrity": "sha512-hm4nsoJnQcA7axMopUJrH7CD0MJhAMtE2zQt65uMFCy+U2YDdKPwE0g6qEAUBoKn6UBLQJWthJgUmwDbWrnwZg==",
-			"dev": true,
-			"license": "BSD-2-Clause",
-			"dependencies": {
-				"@typescript-eslint/types": "8.0.0-alpha.58",
-				"@typescript-eslint/visitor-keys": "8.0.0-alpha.58",
-				"debug": "^4.3.4",
-				"globby": "^11.1.0",
-				"is-glob": "^4.0.3",
-				"minimatch": "^9.0.4",
-				"semver": "^7.6.0",
-				"ts-api-utils": "^1.3.0"
-			},
-			"engines": {
-				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/typescript-eslint"
-			},
-			"peerDependenciesMeta": {
-				"typescript": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/@typescript-eslint/utils": {
-			"version": "8.0.0-alpha.58",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.0.0-alpha.58.tgz",
-			"integrity": "sha512-lZuGnpK23jr3huebgY4/qqrOKsWJ8dX0Q1Fo4oVYcyAy+sK6p+6nObK4VEPJG098gUmrriiavRiDKIhPDFm4Ig==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@eslint-community/eslint-utils": "^4.4.0",
-				"@typescript-eslint/scope-manager": "8.0.0-alpha.58",
-				"@typescript-eslint/types": "8.0.0-alpha.58",
-				"@typescript-eslint/typescript-estree": "8.0.0-alpha.58"
-			},
-			"engines": {
-				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/typescript-eslint"
-			},
-			"peerDependencies": {
-				"eslint": "^8.57.0 || ^9.0.0"
-			}
-		},
-		"node_modules/@typescript-eslint/visitor-keys": {
-			"version": "8.0.0-alpha.58",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.0.0-alpha.58.tgz",
-			"integrity": "sha512-V//E9PRY2216kh9fN/ihRvTtjpobAXEtmrsr3utlVUwHa2iklcofq1J12yl3KOjx9QBRfBrtfQnYaeruF7L0Fw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@typescript-eslint/types": "8.0.0-alpha.58",
-				"eslint-visitor-keys": "^3.4.3"
-			},
-			"engines": {
-				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/typescript-eslint"
-			}
-		},
-		"node_modules/@vitest/coverage-istanbul": {
-			"version": "2.1.9",
-			"resolved": "https://registry.npmjs.org/@vitest/coverage-istanbul/-/coverage-istanbul-2.1.9.tgz",
-			"integrity": "sha512-vdYE4FkC/y2lxcN3Dcj54Bw+ericmDwiex0B8LV5F/YNYEYP1mgVwhPnHwWGAXu38qizkjOuyczKbFTALfzFKw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@istanbuljs/schema": "^0.1.3",
-				"debug": "^4.3.7",
-				"istanbul-lib-coverage": "^3.2.2",
-				"istanbul-lib-instrument": "^6.0.3",
-				"istanbul-lib-report": "^3.0.1",
-				"istanbul-lib-source-maps": "^5.0.6",
-				"istanbul-reports": "^3.1.7",
-				"magicast": "^0.3.5",
-				"test-exclude": "^7.0.1",
-				"tinyrainbow": "^1.2.0"
-			},
-			"funding": {
-				"url": "https://opencollective.com/vitest"
-			},
-			"peerDependencies": {
-				"vitest": "2.1.9"
-			}
-		},
-		"node_modules/@vitest/expect": {
-			"version": "2.1.9",
-			"resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-2.1.9.tgz",
-			"integrity": "sha512-UJCIkTBenHeKT1TTlKMJWy1laZewsRIzYighyYiJKZreqtdxSos/S1t+ktRMQWu2CKqaarrkeszJx1cgC5tGZw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@vitest/spy": "2.1.9",
-				"@vitest/utils": "2.1.9",
-				"chai": "^5.1.2",
-				"tinyrainbow": "^1.2.0"
-			},
-			"funding": {
-				"url": "https://opencollective.com/vitest"
-			}
-		},
-		"node_modules/@vitest/mocker": {
-			"version": "2.1.9",
-			"resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-2.1.9.tgz",
-			"integrity": "sha512-tVL6uJgoUdi6icpxmdrn5YNo3g3Dxv+IHJBr0GXHaEdTcw3F+cPKnsXFhli6nO+f/6SDKPHEK1UN+k+TQv0Ehg==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@vitest/spy": "2.1.9",
-				"estree-walker": "^3.0.3",
-				"magic-string": "^0.30.12"
-			},
-			"funding": {
-				"url": "https://opencollective.com/vitest"
-			},
-			"peerDependencies": {
-				"msw": "^2.4.9",
-				"vite": "^5.0.0"
-			},
-			"peerDependenciesMeta": {
-				"msw": {
-					"optional": true
-				},
-				"vite": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/@vitest/pretty-format": {
-			"version": "2.1.9",
-			"resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-2.1.9.tgz",
-			"integrity": "sha512-KhRIdGV2U9HOUzxfiHmY8IFHTdqtOhIzCpd8WRdJiE7D/HUcZVD0EgQCVjm+Q9gkUXWgBvMmTtZgIG48wq7sOQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"tinyrainbow": "^1.2.0"
-			},
-			"funding": {
-				"url": "https://opencollective.com/vitest"
-			}
-		},
-		"node_modules/@vitest/runner": {
-			"version": "2.1.9",
-			"resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-2.1.9.tgz",
-			"integrity": "sha512-ZXSSqTFIrzduD63btIfEyOmNcBmQvgOVsPNPe0jYtESiXkhd8u2erDLnMxmGrDCwHCCHE7hxwRDCT3pt0esT4g==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@vitest/utils": "2.1.9",
-				"pathe": "^1.1.2"
-			},
-			"funding": {
-				"url": "https://opencollective.com/vitest"
-			}
-		},
-		"node_modules/@vitest/snapshot": {
-			"version": "2.1.9",
-			"resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-2.1.9.tgz",
-			"integrity": "sha512-oBO82rEjsxLNJincVhLhaxxZdEtV0EFHMK5Kmx5sJ6H9L183dHECjiefOAdnqpIgT5eZwT04PoggUnW88vOBNQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@vitest/pretty-format": "2.1.9",
-				"magic-string": "^0.30.12",
-				"pathe": "^1.1.2"
-			},
-			"funding": {
-				"url": "https://opencollective.com/vitest"
-			}
-		},
-		"node_modules/@vitest/spy": {
-			"version": "2.1.9",
-			"resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-2.1.9.tgz",
-			"integrity": "sha512-E1B35FwzXXTs9FHNK6bDszs7mtydNi5MIfUWpceJ8Xbfb1gBMscAnwLbEu+B44ed6W3XjL9/ehLPHR1fkf1KLQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"tinyspy": "^3.0.2"
-			},
-			"funding": {
-				"url": "https://opencollective.com/vitest"
-			}
-		},
-		"node_modules/@vitest/utils": {
-			"version": "2.1.9",
-			"resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-2.1.9.tgz",
-			"integrity": "sha512-v0psaMSkNJ3A2NMrUEHFRzJtDPFn+/VWZ5WxImB21T9fjucJRmS7xCS3ppEnARb9y11OAzaD+P2Ps+b+BGX5iQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@vitest/pretty-format": "2.1.9",
-				"loupe": "^3.1.2",
-				"tinyrainbow": "^1.2.0"
-			},
-			"funding": {
-				"url": "https://opencollective.com/vitest"
-			}
-		},
-		"node_modules/acorn": {
-			"version": "8.12.1",
-			"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz",
-			"integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==",
-			"dev": true,
-			"bin": {
-				"acorn": "bin/acorn"
-			},
-			"engines": {
-				"node": ">=0.4.0"
-			}
-		},
-		"node_modules/acorn-jsx": {
-			"version": "5.3.2",
-			"resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
-			"integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
-			"dev": true,
-			"license": "MIT",
-			"peerDependencies": {
-				"acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
-			}
-		},
-		"node_modules/acorn-jsx-walk": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/acorn-jsx-walk/-/acorn-jsx-walk-2.0.0.tgz",
-			"integrity": "sha512-uuo6iJj4D4ygkdzd6jPtcxs8vZgDX9YFIkqczGImoypX2fQ4dVImmu3UzA4ynixCIMTrEOWW+95M2HuBaCEOVA==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/acorn-loose": {
-			"version": "8.4.0",
-			"resolved": "https://registry.npmjs.org/acorn-loose/-/acorn-loose-8.4.0.tgz",
-			"integrity": "sha512-M0EUka6rb+QC4l9Z3T0nJEzNOO7JcoJlYMrBlyBCiFSXRyxjLKayd4TbQs2FDRWQU1h9FR7QVNHt+PEaoNL5rQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"acorn": "^8.11.0"
-			},
-			"engines": {
-				"node": ">=0.4.0"
-			}
-		},
-		"node_modules/acorn-walk": {
-			"version": "8.3.3",
-			"resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.3.tgz",
-			"integrity": "sha512-MxXdReSRhGO7VlFe1bRG/oI7/mdLV9B9JJT0N8vZOhF7gFRR5l3M8W9G8JxmKV+JC5mGqJ0QvqfSOLsCPa4nUw==",
-			"dev": true,
-			"dependencies": {
-				"acorn": "^8.11.0"
-			},
-			"engines": {
-				"node": ">=0.4.0"
-			}
-		},
-		"node_modules/agent-base": {
-			"version": "7.1.1",
-			"resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz",
-			"integrity": "sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"debug": "^4.3.4"
-			},
-			"engines": {
-				"node": ">= 14"
-			}
-		},
-		"node_modules/ajv": {
-			"version": "8.17.1",
-			"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
-			"integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
-			"dev": true,
-			"dependencies": {
-				"fast-deep-equal": "^3.1.3",
-				"fast-uri": "^3.0.1",
-				"json-schema-traverse": "^1.0.0",
-				"require-from-string": "^2.0.2"
-			},
-			"funding": {
-				"type": "github",
-				"url": "https://github.com/sponsors/epoberezkin"
-			}
-		},
-		"node_modules/ansi-escapes": {
-			"version": "4.3.2",
-			"resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
-			"integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"type-fest": "^0.21.3"
-			},
-			"engines": {
-				"node": ">=8"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/ansi-regex": {
-			"version": "5.0.1",
-			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-			"integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/ansi-styles": {
-			"version": "4.3.0",
-			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-			"dev": true,
-			"dependencies": {
-				"color-convert": "^2.0.1"
-			},
-			"engines": {
-				"node": ">=8"
-			},
-			"funding": {
-				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
-			}
-		},
-		"node_modules/argparse": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-			"integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-			"license": "Python-2.0"
-		},
-		"node_modules/array-union": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
-			"integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/assertion-error": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-2.0.1.tgz",
-			"integrity": "sha512-Izi8RQcffqCeNVgFigKli1ssklIbpHnCYc6AknXGYoB6grJqyeby7jv12JUQgmTAnIDnbck1uxksT4dzN3PWBA==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/asynckit": {
-			"version": "0.4.0",
-			"resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-			"integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
-			"dev": true,
-			"dependencies": {
-				"possible-typed-array-names": "^1.0.0"
-			},
-			"engines": {
-				"node": ">= 0.4"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/ljharb"
-			}
-		},
-		"node_modules/balanced-match": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-			"integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/brace-expansion": {
-			"version": "2.0.1",
-			"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/braces": {
-			"version": "3.0.3",
-			"resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
-			"integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"fill-range": "^7.1.1"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/browserslist": {
-			"version": "4.23.2",
-			"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.2.tgz",
-			"integrity": "sha512-qkqSyistMYdxAcw+CzbZwlBy8AGmS/eEWs+sEV5TnLRGDOL+C5M2EnH6tlZyg0YoAxGJAFKh61En9BR941GnHA==",
-			"dev": true,
-			"funding": [
-				{
-					"type": "opencollective",
-					"url": "https://opencollective.com/browserslist"
-				},
-				{
-					"type": "tidelift",
-					"url": "https://tidelift.com/funding/github/npm/browserslist"
-				},
-				{
-					"type": "github",
-					"url": "https://github.com/sponsors/ai"
-				}
-			],
-			"license": "MIT",
-			"dependencies": {
-				"caniuse-lite": "^1.0.30001640",
-				"electron-to-chromium": "^1.4.820",
-				"node-releases": "^2.0.14",
-				"update-browserslist-db": "^1.1.0"
-			},
-			"bin": {
-				"browserslist": "cli.js"
-			},
-			"engines": {
-				"node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
-			}
-		},
-		"node_modules/cac": {
-			"version": "6.7.14",
-			"resolved": "https://registry.npmjs.org/cac/-/cac-6.7.14.tgz",
-			"integrity": "sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/call-bind": {
-			"version": "1.0.7",
-			"resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz",
-			"integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==",
-			"license": "MIT",
-			"dependencies": {
-				"es-define-property": "^1.0.0",
-				"es-errors": "^1.3.0",
-				"function-bind": "^1.1.2",
-				"get-intrinsic": "^1.2.4",
-				"set-function-length": "^1.2.1"
-			},
-			"engines": {
-				"node": ">= 0.4"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/ljharb"
-			}
-		},
-		"node_modules/callsites": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-			"integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=6"
-			}
-		},
-		"node_modules/caniuse-lite": {
-			"version": "1.0.30001642",
-			"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001642.tgz",
-			"integrity": "sha512-3XQ0DoRgLijXJErLSl+bLnJ+Et4KqV1PY6JJBGAFlsNsz31zeAIncyeZfLCabHK/jtSh+671RM9YMldxjUPZtA==",
-			"dev": true,
-			"funding": [
-				{
-					"type": "opencollective",
-					"url": "https://opencollective.com/browserslist"
-				},
-				{
-					"type": "tidelift",
-					"url": "https://tidelift.com/funding/github/npm/caniuse-lite"
-				},
-				{
-					"type": "github",
-					"url": "https://github.com/sponsors/ai"
-				}
-			],
-			"license": "CC-BY-4.0"
-		},
-		"node_modules/chai": {
-			"version": "5.1.2",
-			"resolved": "https://registry.npmjs.org/chai/-/chai-5.1.2.tgz",
-			"integrity": "sha512-aGtmf24DW6MLHHG5gCx4zaI3uBq3KRtxeVs0DjFH6Z0rDNbsvTxFASFvdj79pxjxZ8/5u3PIiN3IwEIQkiiuPw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"assertion-error": "^2.0.1",
-				"check-error": "^2.1.1",
-				"deep-eql": "^5.0.1",
-				"loupe": "^3.1.0",
-				"pathval": "^2.0.0"
-			},
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/chalk": {
-			"version": "4.1.2",
-			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-			"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-			"dev": true,
-			"dependencies": {
-				"ansi-styles": "^4.1.0",
-				"supports-color": "^7.1.0"
-			},
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/chalk/chalk?sponsor=1"
-			}
-		},
-		"node_modules/chardet": {
-			"version": "0.7.0",
-			"resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz",
-			"integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/check-error": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/check-error/-/check-error-2.1.1.tgz",
-			"integrity": "sha512-OAlb+T7V4Op9OwdkjmguYRqncdlx5JiofwOAUkmTF+jNdHwzTaTs4sRAGpzLF3oOz5xAyDGrPgeIDFQmDOTiJw==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">= 16"
-			}
-		},
-		"node_modules/cli-width": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/cli-width/-/cli-width-4.1.0.tgz",
-			"integrity": "sha512-ouuZd4/dm2Sw5Gmqy6bGyNNNe1qt9RpmxveLSO7KcgsTnU7RXfsw+/bukWGo1abgBiMAic068rclZsO4IWmmxQ==",
-			"dev": true,
-			"license": "ISC",
-			"engines": {
-				"node": ">= 12"
-			}
-		},
-		"node_modules/cliui": {
-			"version": "8.0.1",
-			"resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
-			"integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
-			"dev": true,
-			"license": "ISC",
-			"dependencies": {
-				"string-width": "^4.2.0",
-				"strip-ansi": "^6.0.1",
-				"wrap-ansi": "^7.0.0"
-			},
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/cliui/node_modules/emoji-regex": {
-			"version": "8.0.0",
-			"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-			"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/cliui/node_modules/string-width": {
-			"version": "4.2.3",
-			"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-			"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"emoji-regex": "^8.0.0",
-				"is-fullwidth-code-point": "^3.0.0",
-				"strip-ansi": "^6.0.1"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/cliui/node_modules/wrap-ansi": {
-			"version": "7.0.0",
-			"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-			"integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"ansi-styles": "^4.0.0",
-				"string-width": "^4.1.0",
-				"strip-ansi": "^6.0.0"
-			},
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/chalk/wrap-ansi?sponsor=1"
-			}
-		},
-		"node_modules/color-convert": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-			"dev": true,
-			"dependencies": {
-				"color-name": "~1.1.4"
-			},
-			"engines": {
-				"node": ">=7.0.0"
-			}
-		},
-		"node_modules/color-name": {
-			"version": "1.1.4",
-			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-			"dev": true
-		},
-		"node_modules/combined-stream": {
-			"version": "1.0.8",
-			"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
-			"integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"delayed-stream": "~1.0.0"
-			},
-			"engines": {
-				"node": ">= 0.8"
-			}
-		},
-		"node_modules/commander": {
-			"version": "12.1.0",
-			"resolved": "https://registry.npmjs.org/commander/-/commander-12.1.0.tgz",
-			"integrity": "sha512-Vw8qHK3bZM9y/P10u3Vib8o/DdkvA2OtPtZvD871QKjy74Wj1WSKFILMPRPSdUSx5RFK1arlJzEtA4PkFgnbuA==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=18"
-			}
-		},
-		"node_modules/concat-map": {
-			"version": "0.0.1",
-			"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-			"integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/convert-source-map": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
-			"integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/cookie": {
-			"version": "0.5.0",
-			"resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
-			"integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"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",
-			"integrity": "sha512-e4a5N8lVvuLgAWgnCrLr2PP0YyDOTHa9H/Rj54dirp61qXnNq46m82bRhNqIA5VccJtWBvPTFRV3TtvHUKPB1g==",
-			"license": "MIT",
-			"dependencies": {
-				"node-fetch": "^2.6.12"
-			}
-		},
-		"node_modules/cross-spawn": {
-			"version": "7.0.3",
-			"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-			"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"path-key": "^3.1.0",
-				"shebang-command": "^2.0.0",
-				"which": "^2.0.1"
-			},
-			"engines": {
-				"node": ">= 8"
-			}
-		},
-		"node_modules/crypto-js": {
-			"version": "4.2.0",
-			"resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-4.2.0.tgz",
-			"integrity": "sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q==",
-			"license": "MIT"
-		},
-		"node_modules/cssfontparser": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/cssfontparser/-/cssfontparser-1.2.1.tgz",
-			"integrity": "sha512-6tun4LoZnj7VN6YeegOVb67KBX/7JJsqvj+pv3ZA7F878/eN33AbGa5b/S/wXxS/tcp8nc40xRUrsPlxIyNUPg==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/cssstyle": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-4.0.1.tgz",
-			"integrity": "sha512-8ZYiJ3A/3OkDd093CBT/0UKDWry7ak4BdPTFP2+QEP7cmhouyq/Up709ASSj2cK02BbZiMgk7kYjZNS4QP5qrQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"rrweb-cssom": "^0.6.0"
-			},
-			"engines": {
-				"node": ">=18"
-			}
-		},
-		"node_modules/cssstyle/node_modules/rrweb-cssom": {
-			"version": "0.6.0",
-			"resolved": "https://registry.npmjs.org/rrweb-cssom/-/rrweb-cssom-0.6.0.tgz",
-			"integrity": "sha512-APM0Gt1KoXBz0iIkkdB/kfvGOwC4UuJFeG/c+yV7wSc7q96cG/kJ0HiYCnzivD9SB53cLV1MlHFNfOuPaadYSw==",
-			"dev": true
-		},
-		"node_modules/data-urls": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/data-urls/-/data-urls-5.0.0.tgz",
-			"integrity": "sha512-ZYP5VBHshaDAiVZxjbRVcFJpc+4xGgT0bK3vzy1HLN8jTO975HEbuYzZJcHoQEY5K1a0z8YayJkyVETa08eNTg==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"whatwg-mimetype": "^4.0.0",
-				"whatwg-url": "^14.0.0"
-			},
-			"engines": {
-				"node": ">=18"
-			}
-		},
-		"node_modules/debug": {
-			"version": "4.4.0",
-			"resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
-			"integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"ms": "^2.1.3"
-			},
-			"engines": {
-				"node": ">=6.0"
-			},
-			"peerDependenciesMeta": {
-				"supports-color": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/decimal.js": {
-			"version": "10.4.3",
-			"resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.4.3.tgz",
-			"integrity": "sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/deep-eql": {
-			"version": "5.0.2",
-			"resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-5.0.2.tgz",
-			"integrity": "sha512-h5k/5U50IJJFpzfL6nO9jaaumfjO/f2NjK/oYB2Djzm4p9L+3T9qWpZqZ2hAbLPuuYq9wrU08WQyBTL5GbPk5Q==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=6"
-			}
-		},
-		"node_modules/deep-is": {
-			"version": "0.1.4",
-			"resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
-			"integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/define-data-property": {
-			"version": "1.1.4",
-			"resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
-			"integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
-			"license": "MIT",
-			"dependencies": {
-				"es-define-property": "^1.0.0",
-				"es-errors": "^1.3.0",
-				"gopd": "^1.0.1"
-			},
-			"engines": {
-				"node": ">= 0.4"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/ljharb"
-			}
-		},
-		"node_modules/delayed-stream": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-			"integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=0.4.0"
-			}
-		},
-		"node_modules/dependency-cruiser": {
-			"version": "16.3.10",
-			"resolved": "https://registry.npmjs.org/dependency-cruiser/-/dependency-cruiser-16.3.10.tgz",
-			"integrity": "sha512-WkCnibHBfvaiaQ+S46LZ6h4AR6oj42Vsf5/0Vgtrwdwn7ZekMJdZ/ALoTwNp/RaGlKW+MbV/fhSZOvmhAWVWzQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"acorn": "8.12.1",
-				"acorn-jsx": "5.3.2",
-				"acorn-jsx-walk": "2.0.0",
-				"acorn-loose": "8.4.0",
-				"acorn-walk": "8.3.3",
-				"ajv": "8.17.1",
-				"commander": "12.1.0",
-				"enhanced-resolve": "5.17.1",
-				"ignore": "5.3.1",
-				"interpret": "^3.1.1",
-				"is-installed-globally": "1.0.0",
-				"json5": "2.2.3",
-				"memoize": "10.0.0",
-				"picocolors": "1.0.1",
-				"picomatch": "4.0.2",
-				"prompts": "2.4.2",
-				"rechoir": "^0.8.0",
-				"safe-regex": "2.1.1",
-				"semver": "^7.6.3",
-				"teamcity-service-messages": "0.1.14",
-				"tsconfig-paths-webpack-plugin": "4.1.0",
-				"watskeburt": "4.1.0"
-			},
-			"bin": {
-				"depcruise": "bin/dependency-cruise.mjs",
-				"depcruise-baseline": "bin/depcruise-baseline.mjs",
-				"depcruise-fmt": "bin/depcruise-fmt.mjs",
-				"depcruise-wrap-stream-in-html": "bin/wrap-stream-in-html.mjs",
-				"dependency-cruise": "bin/dependency-cruise.mjs",
-				"dependency-cruiser": "bin/dependency-cruise.mjs"
-			},
-			"engines": {
-				"node": "^18.17||>=20"
-			}
-		},
-		"node_modules/dir-glob": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
-			"integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"path-type": "^4.0.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/doctrine": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
-			"integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
-			"dev": true,
-			"license": "Apache-2.0",
-			"dependencies": {
-				"esutils": "^2.0.2"
-			},
-			"engines": {
-				"node": ">=6.0.0"
-			}
-		},
-		"node_modules/eastasianwidth": {
-			"version": "0.2.0",
-			"resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
-			"integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/electron-to-chromium": {
-			"version": "1.4.830",
-			"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.830.tgz",
-			"integrity": "sha512-TrPKKH20HeN0J1LHzsYLs2qwXrp8TF4nHdu4sq61ozGbzMpWhI7iIOPYPPkxeq1azMT9PZ8enPFcftbs/Npcjg==",
-			"dev": true
-		},
-		"node_modules/emoji-regex": {
-			"version": "9.2.2",
-			"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
-			"integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/enhanced-resolve": {
-			"version": "5.17.1",
-			"resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz",
-			"integrity": "sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"graceful-fs": "^4.2.4",
-				"tapable": "^2.2.0"
-			},
-			"engines": {
-				"node": ">=10.13.0"
-			}
-		},
-		"node_modules/entities": {
-			"version": "4.5.0",
-			"resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
-			"integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
-			"dev": true,
-			"license": "BSD-2-Clause",
-			"engines": {
-				"node": ">=0.12"
-			},
-			"funding": {
-				"url": "https://github.com/fb55/entities?sponsor=1"
-			}
-		},
-		"node_modules/es-define-property": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz",
-			"integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==",
-			"license": "MIT",
-			"dependencies": {
-				"get-intrinsic": "^1.2.4"
-			},
-			"engines": {
-				"node": ">= 0.4"
-			}
-		},
-		"node_modules/es-errors": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
-			"integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
-			"license": "MIT",
-			"engines": {
-				"node": ">= 0.4"
-			}
-		},
-		"node_modules/es-module-lexer": {
-			"version": "1.6.0",
-			"resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.6.0.tgz",
-			"integrity": "sha512-qqnD1yMU6tk/jnaMosogGySTZP8YtUgAffA9nMN+E/rjxcfRQ6IEk7IiozUjgxKoFHBGjTLnrHB/YC45r/59EQ==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/esbuild": {
-			"version": "0.21.5",
-			"resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.21.5.tgz",
-			"integrity": "sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==",
-			"dev": true,
-			"hasInstallScript": true,
-			"license": "MIT",
-			"bin": {
-				"esbuild": "bin/esbuild"
-			},
-			"engines": {
-				"node": ">=12"
-			},
-			"optionalDependencies": {
-				"@esbuild/aix-ppc64": "0.21.5",
-				"@esbuild/android-arm": "0.21.5",
-				"@esbuild/android-arm64": "0.21.5",
-				"@esbuild/android-x64": "0.21.5",
-				"@esbuild/darwin-arm64": "0.21.5",
-				"@esbuild/darwin-x64": "0.21.5",
-				"@esbuild/freebsd-arm64": "0.21.5",
-				"@esbuild/freebsd-x64": "0.21.5",
-				"@esbuild/linux-arm": "0.21.5",
-				"@esbuild/linux-arm64": "0.21.5",
-				"@esbuild/linux-ia32": "0.21.5",
-				"@esbuild/linux-loong64": "0.21.5",
-				"@esbuild/linux-mips64el": "0.21.5",
-				"@esbuild/linux-ppc64": "0.21.5",
-				"@esbuild/linux-riscv64": "0.21.5",
-				"@esbuild/linux-s390x": "0.21.5",
-				"@esbuild/linux-x64": "0.21.5",
-				"@esbuild/netbsd-x64": "0.21.5",
-				"@esbuild/openbsd-x64": "0.21.5",
-				"@esbuild/sunos-x64": "0.21.5",
-				"@esbuild/win32-arm64": "0.21.5",
-				"@esbuild/win32-ia32": "0.21.5",
-				"@esbuild/win32-x64": "0.21.5"
-			}
-		},
-		"node_modules/escalade": {
-			"version": "3.1.2",
-			"resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz",
-			"integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=6"
-			}
-		},
-		"node_modules/escape-string-regexp": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-			"integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/eslint": {
-			"version": "9.7.0",
-			"resolved": "https://registry.npmjs.org/eslint/-/eslint-9.7.0.tgz",
-			"integrity": "sha512-FzJ9D/0nGiCGBf8UXO/IGLTgLVzIxze1zpfA8Ton2mjLovXdAPlYDv+MQDcqj3TmrhAGYfOpz9RfR+ent0AgAw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@eslint-community/eslint-utils": "^4.2.0",
-				"@eslint-community/regexpp": "^4.11.0",
-				"@eslint/config-array": "^0.17.0",
-				"@eslint/eslintrc": "^3.1.0",
-				"@eslint/js": "9.7.0",
-				"@humanwhocodes/module-importer": "^1.0.1",
-				"@humanwhocodes/retry": "^0.3.0",
-				"@nodelib/fs.walk": "^1.2.8",
-				"ajv": "^6.12.4",
-				"chalk": "^4.0.0",
-				"cross-spawn": "^7.0.2",
-				"debug": "^4.3.2",
-				"escape-string-regexp": "^4.0.0",
-				"eslint-scope": "^8.0.2",
-				"eslint-visitor-keys": "^4.0.0",
-				"espree": "^10.1.0",
-				"esquery": "^1.5.0",
-				"esutils": "^2.0.2",
-				"fast-deep-equal": "^3.1.3",
-				"file-entry-cache": "^8.0.0",
-				"find-up": "^5.0.0",
-				"glob-parent": "^6.0.2",
-				"ignore": "^5.2.0",
-				"imurmurhash": "^0.1.4",
-				"is-glob": "^4.0.0",
-				"is-path-inside": "^3.0.3",
-				"json-stable-stringify-without-jsonify": "^1.0.1",
-				"levn": "^0.4.1",
-				"lodash.merge": "^4.6.2",
-				"minimatch": "^3.1.2",
-				"natural-compare": "^1.4.0",
-				"optionator": "^0.9.3",
-				"strip-ansi": "^6.0.1",
-				"text-table": "^0.2.0"
-			},
-			"bin": {
-				"eslint": "bin/eslint.js"
-			},
-			"engines": {
-				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-			},
-			"funding": {
-				"url": "https://opencollective.com/eslint"
-			}
-		},
-		"node_modules/eslint-import-resolver-node": {
-			"version": "0.3.9",
-			"resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz",
-			"integrity": "sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"debug": "^3.2.7",
-				"is-core-module": "^2.13.0",
-				"resolve": "^1.22.4"
-			}
-		},
-		"node_modules/eslint-import-resolver-node/node_modules/debug": {
-			"version": "3.2.7",
-			"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-			"integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"ms": "^2.1.1"
-			}
-		},
-		"node_modules/eslint-plugin-import-x": {
-			"version": "4.2.1",
-			"resolved": "https://registry.npmjs.org/eslint-plugin-import-x/-/eslint-plugin-import-x-4.2.1.tgz",
-			"integrity": "sha512-WWi2GedccIJa0zXxx3WDnTgouGQTtdYK1nhXMwywbqqAgB0Ov+p1pYBsWh3VaB0bvBOwLse6OfVII7jZD9xo5Q==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@typescript-eslint/utils": "^8.1.0",
-				"debug": "^4.3.4",
-				"doctrine": "^3.0.0",
-				"eslint-import-resolver-node": "^0.3.9",
-				"get-tsconfig": "^4.7.3",
-				"is-glob": "^4.0.3",
-				"minimatch": "^9.0.3",
-				"semver": "^7.6.3",
-				"stable-hash": "^0.0.4",
-				"tslib": "^2.6.3"
-			},
-			"engines": {
-				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-			},
-			"peerDependencies": {
-				"eslint": "^8.57.0 || ^9.0.0"
-			}
-		},
-		"node_modules/eslint-plugin-import-x/node_modules/@typescript-eslint/scope-manager": {
-			"version": "8.5.0",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.5.0.tgz",
-			"integrity": "sha512-06JOQ9Qgj33yvBEx6tpC8ecP9o860rsR22hWMEd12WcTRrfaFgHr2RB/CA/B+7BMhHkXT4chg2MyboGdFGawYg==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@typescript-eslint/types": "8.5.0",
-				"@typescript-eslint/visitor-keys": "8.5.0"
-			},
-			"engines": {
-				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/typescript-eslint"
-			}
-		},
-		"node_modules/eslint-plugin-import-x/node_modules/@typescript-eslint/types": {
-			"version": "8.5.0",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.5.0.tgz",
-			"integrity": "sha512-qjkormnQS5wF9pjSi6q60bKUHH44j2APxfh9TQRXK8wbYVeDYYdYJGIROL87LGZZ2gz3Rbmjc736qyL8deVtdw==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/typescript-eslint"
-			}
-		},
-		"node_modules/eslint-plugin-import-x/node_modules/@typescript-eslint/typescript-estree": {
-			"version": "8.5.0",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.5.0.tgz",
-			"integrity": "sha512-vEG2Sf9P8BPQ+d0pxdfndw3xIXaoSjliG0/Ejk7UggByZPKXmJmw3GW5jV2gHNQNawBUyfahoSiCFVov0Ruf7Q==",
-			"dev": true,
-			"license": "BSD-2-Clause",
-			"dependencies": {
-				"@typescript-eslint/types": "8.5.0",
-				"@typescript-eslint/visitor-keys": "8.5.0",
-				"debug": "^4.3.4",
-				"fast-glob": "^3.3.2",
-				"is-glob": "^4.0.3",
-				"minimatch": "^9.0.4",
-				"semver": "^7.6.0",
-				"ts-api-utils": "^1.3.0"
-			},
-			"engines": {
-				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/typescript-eslint"
-			},
-			"peerDependenciesMeta": {
-				"typescript": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/eslint-plugin-import-x/node_modules/@typescript-eslint/utils": {
-			"version": "8.5.0",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.5.0.tgz",
-			"integrity": "sha512-6yyGYVL0e+VzGYp60wvkBHiqDWOpT63pdMV2CVG4LVDd5uR6q1qQN/7LafBZtAtNIn/mqXjsSeS5ggv/P0iECw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@eslint-community/eslint-utils": "^4.4.0",
-				"@typescript-eslint/scope-manager": "8.5.0",
-				"@typescript-eslint/types": "8.5.0",
-				"@typescript-eslint/typescript-estree": "8.5.0"
-			},
-			"engines": {
-				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/typescript-eslint"
-			},
-			"peerDependencies": {
-				"eslint": "^8.57.0 || ^9.0.0"
-			}
-		},
-		"node_modules/eslint-plugin-import-x/node_modules/@typescript-eslint/visitor-keys": {
-			"version": "8.5.0",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.5.0.tgz",
-			"integrity": "sha512-yTPqMnbAZJNy2Xq2XU8AdtOW9tJIr+UQb64aXB9f3B1498Zx9JorVgFJcZpEc9UBuCCrdzKID2RGAMkYcDtZOw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@typescript-eslint/types": "8.5.0",
-				"eslint-visitor-keys": "^3.4.3"
-			},
-			"engines": {
-				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/typescript-eslint"
-			}
-		},
-		"node_modules/eslint-scope": {
-			"version": "8.0.2",
-			"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.0.2.tgz",
-			"integrity": "sha512-6E4xmrTw5wtxnLA5wYL3WDfhZ/1bUBGOXV0zQvVRDOtrR8D0p6W7fs3JweNYhwRYeGvd/1CKX2se0/2s7Q/nJA==",
-			"dev": true,
-			"license": "BSD-2-Clause",
-			"dependencies": {
-				"esrecurse": "^4.3.0",
-				"estraverse": "^5.2.0"
-			},
-			"engines": {
-				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-			},
-			"funding": {
-				"url": "https://opencollective.com/eslint"
-			}
-		},
-		"node_modules/eslint-visitor-keys": {
-			"version": "3.4.3",
-			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
-			"integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
-			"dev": true,
-			"license": "Apache-2.0",
-			"engines": {
-				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-			},
-			"funding": {
-				"url": "https://opencollective.com/eslint"
-			}
-		},
-		"node_modules/eslint/node_modules/ajv": {
-			"version": "6.12.6",
-			"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-			"integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"fast-deep-equal": "^3.1.1",
-				"fast-json-stable-stringify": "^2.0.0",
-				"json-schema-traverse": "^0.4.1",
-				"uri-js": "^4.2.2"
-			},
-			"funding": {
-				"type": "github",
-				"url": "https://github.com/sponsors/epoberezkin"
-			}
-		},
-		"node_modules/eslint/node_modules/brace-expansion": {
-			"version": "1.1.11",
-			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-			"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"balanced-match": "^1.0.0",
-				"concat-map": "0.0.1"
-			}
-		},
-		"node_modules/eslint/node_modules/eslint-visitor-keys": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.0.0.tgz",
-			"integrity": "sha512-OtIRv/2GyiF6o/d8K7MYKKbXrOUBIK6SfkIRM4Z0dY3w+LiQ0vy3F57m0Z71bjbyeiWFiHJ8brqnmE6H6/jEuw==",
-			"dev": true,
-			"license": "Apache-2.0",
-			"engines": {
-				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-			},
-			"funding": {
-				"url": "https://opencollective.com/eslint"
-			}
-		},
-		"node_modules/eslint/node_modules/json-schema-traverse": {
-			"version": "0.4.1",
-			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-			"integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-			"dev": true
-		},
-		"node_modules/eslint/node_modules/minimatch": {
-			"version": "3.1.2",
-			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-			"integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-			"dev": true,
-			"license": "ISC",
-			"dependencies": {
-				"brace-expansion": "^1.1.7"
-			},
-			"engines": {
-				"node": "*"
-			}
-		},
-		"node_modules/espree": {
-			"version": "10.1.0",
-			"resolved": "https://registry.npmjs.org/espree/-/espree-10.1.0.tgz",
-			"integrity": "sha512-M1M6CpiE6ffoigIOWYO9UDP8TMUw9kqb21tf+08IgDYjCsOvCuDt4jQcZmoYxx+w7zlKw9/N0KXfto+I8/FrXA==",
-			"dev": true,
-			"license": "BSD-2-Clause",
-			"dependencies": {
-				"acorn": "^8.12.0",
-				"acorn-jsx": "^5.3.2",
-				"eslint-visitor-keys": "^4.0.0"
-			},
-			"engines": {
-				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-			},
-			"funding": {
-				"url": "https://opencollective.com/eslint"
-			}
-		},
-		"node_modules/espree/node_modules/eslint-visitor-keys": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.0.0.tgz",
-			"integrity": "sha512-OtIRv/2GyiF6o/d8K7MYKKbXrOUBIK6SfkIRM4Z0dY3w+LiQ0vy3F57m0Z71bjbyeiWFiHJ8brqnmE6H6/jEuw==",
-			"dev": true,
-			"license": "Apache-2.0",
-			"engines": {
-				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-			},
-			"funding": {
-				"url": "https://opencollective.com/eslint"
-			}
-		},
-		"node_modules/esquery": {
-			"version": "1.6.0",
-			"resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz",
-			"integrity": "sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==",
-			"dev": true,
-			"license": "BSD-3-Clause",
-			"dependencies": {
-				"estraverse": "^5.1.0"
-			},
-			"engines": {
-				"node": ">=0.10"
-			}
-		},
-		"node_modules/esrecurse": {
-			"version": "4.3.0",
-			"resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
-			"integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
-			"dev": true,
-			"license": "BSD-2-Clause",
-			"dependencies": {
-				"estraverse": "^5.2.0"
-			},
-			"engines": {
-				"node": ">=4.0"
-			}
-		},
-		"node_modules/estraverse": {
-			"version": "5.3.0",
-			"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-			"integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-			"dev": true,
-			"license": "BSD-2-Clause",
-			"engines": {
-				"node": ">=4.0"
-			}
-		},
-		"node_modules/estree-walker": {
-			"version": "3.0.3",
-			"resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-3.0.3.tgz",
-			"integrity": "sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@types/estree": "^1.0.0"
-			}
-		},
-		"node_modules/esutils": {
-			"version": "2.0.3",
-			"resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
-			"integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
-			"dev": true,
-			"license": "BSD-2-Clause",
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/eventemitter3": {
-			"version": "5.0.1",
-			"resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.1.tgz",
-			"integrity": "sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA==",
-			"license": "MIT"
-		},
-		"node_modules/expect-type": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/expect-type/-/expect-type-1.1.0.tgz",
-			"integrity": "sha512-bFi65yM+xZgk+u/KRIpekdSYkTB5W1pEf0Lt8Q8Msh7b+eQ7LXVtIB1Bkm4fvclDEL1b2CZkMhv2mOeF8tMdkA==",
-			"dev": true,
-			"license": "Apache-2.0",
-			"engines": {
-				"node": ">=12.0.0"
-			}
-		},
-		"node_modules/external-editor": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz",
-			"integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"chardet": "^0.7.0",
-				"iconv-lite": "^0.4.24",
-				"tmp": "^0.0.33"
-			},
-			"engines": {
-				"node": ">=4"
-			}
-		},
-		"node_modules/fast-deep-equal": {
-			"version": "3.1.3",
-			"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-			"integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/fast-glob": {
-			"version": "3.3.2",
-			"resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz",
-			"integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@nodelib/fs.stat": "^2.0.2",
-				"@nodelib/fs.walk": "^1.2.3",
-				"glob-parent": "^5.1.2",
-				"merge2": "^1.3.0",
-				"micromatch": "^4.0.4"
-			},
-			"engines": {
-				"node": ">=8.6.0"
-			}
-		},
-		"node_modules/fast-glob/node_modules/glob-parent": {
-			"version": "5.1.2",
-			"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-			"integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-			"dev": true,
-			"license": "ISC",
-			"dependencies": {
-				"is-glob": "^4.0.1"
-			},
-			"engines": {
-				"node": ">= 6"
-			}
-		},
-		"node_modules/fast-json-stable-stringify": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-			"integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/fast-levenshtein": {
-			"version": "2.0.6",
-			"resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-			"integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/fast-uri": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.1.tgz",
-			"integrity": "sha512-MWipKbbYiYI0UC7cl8m/i/IWTqfC8YXsqjzybjddLsFjStroQzsHXkc73JutMvBiXmOvapk+axIl79ig5t55Bw==",
-			"dev": true
-		},
-		"node_modules/fastq": {
-			"version": "1.17.1",
-			"resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz",
-			"integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==",
-			"dev": true,
-			"license": "ISC",
-			"dependencies": {
-				"reusify": "^1.0.4"
-			}
-		},
-		"node_modules/file-entry-cache": {
-			"version": "8.0.0",
-			"resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-8.0.0.tgz",
-			"integrity": "sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"flat-cache": "^4.0.0"
-			},
-			"engines": {
-				"node": ">=16.0.0"
-			}
-		},
-		"node_modules/fill-range": {
-			"version": "7.1.1",
-			"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
-			"integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"to-regex-range": "^5.0.1"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/find-up": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
-			"integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"locate-path": "^6.0.0",
-				"path-exists": "^4.0.0"
-			},
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/flat-cache": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-4.0.1.tgz",
-			"integrity": "sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"flatted": "^3.2.9",
-				"keyv": "^4.5.4"
-			},
-			"engines": {
-				"node": ">=16"
-			}
-		},
-		"node_modules/flatted": {
-			"version": "3.3.1",
-			"resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.1.tgz",
-			"integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==",
-			"dev": true,
-			"license": "ISC"
-		},
-		"node_modules/foreground-child": {
-			"version": "3.2.1",
-			"resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.2.1.tgz",
-			"integrity": "sha512-PXUUyLqrR2XCWICfv6ukppP96sdFwWbNEnfEMt7jNsISjMsvaLNinAHNDYyvkyU+SZG2BTSbT5NjG+vZslfGTA==",
-			"dev": true,
-			"license": "ISC",
-			"dependencies": {
-				"cross-spawn": "^7.0.0",
-				"signal-exit": "^4.0.1"
-			},
-			"engines": {
-				"node": ">=14"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/isaacs"
-			}
-		},
-		"node_modules/form-data": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
-			"integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"asynckit": "^0.4.0",
-				"combined-stream": "^1.0.8",
-				"mime-types": "^2.1.12"
-			},
-			"engines": {
-				"node": ">= 6"
-			}
-		},
-		"node_modules/fsevents": {
-			"version": "2.3.3",
-			"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
-			"integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
-			"dev": true,
-			"hasInstallScript": true,
-			"optional": true,
-			"os": [
-				"darwin"
-			],
-			"engines": {
-				"node": "^8.16.0 || ^10.6.0 || >=11.0.0"
-			}
-		},
-		"node_modules/function-bind": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
-			"integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
-			"license": "MIT",
-			"funding": {
-				"url": "https://github.com/sponsors/ljharb"
-			}
-		},
-		"node_modules/gensync": {
-			"version": "1.0.0-beta.2",
-			"resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
-			"integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/get-caller-file": {
-			"version": "2.0.5",
-			"resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
-			"integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
-			"dev": true,
-			"license": "ISC",
-			"engines": {
-				"node": "6.* || 8.* || >= 10.*"
-			}
-		},
-		"node_modules/get-intrinsic": {
-			"version": "1.2.4",
-			"resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
-			"integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==",
-			"license": "MIT",
-			"dependencies": {
-				"es-errors": "^1.3.0",
-				"function-bind": "^1.1.2",
-				"has-proto": "^1.0.1",
-				"has-symbols": "^1.0.3",
-				"hasown": "^2.0.0"
-			},
-			"engines": {
-				"node": ">= 0.4"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/ljharb"
-			}
-		},
-		"node_modules/get-tsconfig": {
-			"version": "4.8.0",
-			"resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.8.0.tgz",
-			"integrity": "sha512-Pgba6TExTZ0FJAn1qkJAjIeKoDJ3CsI2ChuLohJnZl/tTU8MVrq3b+2t5UOPfRa4RMsorClBjJALkJUMjG1PAw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"resolve-pkg-maps": "^1.0.0"
-			},
-			"funding": {
-				"url": "https://github.com/privatenumber/get-tsconfig?sponsor=1"
-			}
-		},
-		"node_modules/glob-parent": {
-			"version": "6.0.2",
-			"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
-			"integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
-			"dev": true,
-			"license": "ISC",
-			"dependencies": {
-				"is-glob": "^4.0.3"
-			},
-			"engines": {
-				"node": ">=10.13.0"
-			}
-		},
-		"node_modules/global-directory": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/global-directory/-/global-directory-4.0.1.tgz",
-			"integrity": "sha512-wHTUcDUoZ1H5/0iVqEudYW4/kAlN5cZ3j/bXn0Dpbizl9iaUVeWSHqiOjsgk6OW2bkLclbBjzewBz6weQ1zA2Q==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"ini": "4.1.1"
-			},
-			"engines": {
-				"node": ">=18"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/globals": {
-			"version": "14.0.0",
-			"resolved": "https://registry.npmjs.org/globals/-/globals-14.0.0.tgz",
-			"integrity": "sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=18"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/globby": {
-			"version": "11.1.0",
-			"resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
-			"integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"array-union": "^2.1.0",
-				"dir-glob": "^3.0.1",
-				"fast-glob": "^3.2.9",
-				"ignore": "^5.2.0",
-				"merge2": "^1.4.1",
-				"slash": "^3.0.0"
-			},
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/globrex": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/globrex/-/globrex-0.1.2.tgz",
-			"integrity": "sha512-uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/gopd": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
-			"integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
-			"license": "MIT",
-			"dependencies": {
-				"get-intrinsic": "^1.1.3"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/ljharb"
-			}
-		},
-		"node_modules/graceful-fs": {
-			"version": "4.2.11",
-			"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
-			"integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
-			"dev": true,
-			"license": "ISC"
-		},
-		"node_modules/graphemer": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
-			"integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/graphql": {
-			"version": "16.9.0",
-			"resolved": "https://registry.npmjs.org/graphql/-/graphql-16.9.0.tgz",
-			"integrity": "sha512-GGTKBX4SD7Wdb8mqeDLni2oaRGYQWjWHGKPQ24ZMnUtKfcsVoiv4uX8+LJr1K6U5VW2Lu1BwJnj7uiori0YtRw==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": "^12.22.0 || ^14.16.0 || ^16.0.0 || >=17.0.0"
-			}
-		},
-		"node_modules/has-flag": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-			"dev": true,
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/has-property-descriptors": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
-			"integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
-			"license": "MIT",
-			"dependencies": {
-				"es-define-property": "^1.0.0"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/ljharb"
-			}
-		},
-		"node_modules/has-proto": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz",
-			"integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==",
-			"license": "MIT",
-			"engines": {
-				"node": ">= 0.4"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/ljharb"
-			}
-		},
-		"node_modules/has-symbols": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-			"integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
-			"license": "MIT",
-			"engines": {
-				"node": ">= 0.4"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/ljharb"
-			}
-		},
-		"node_modules/hasown": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
-			"integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
-			"license": "MIT",
-			"dependencies": {
-				"function-bind": "^1.1.2"
-			},
-			"engines": {
-				"node": ">= 0.4"
-			}
-		},
-		"node_modules/headers-polyfill": {
-			"version": "4.0.3",
-			"resolved": "https://registry.npmjs.org/headers-polyfill/-/headers-polyfill-4.0.3.tgz",
-			"integrity": "sha512-IScLbePpkvO846sIwOtOTDjutRMWdXdJmXdMvk6gCBHxFO8d+QKOQedyZSxFTTFYRSmlgSTDtXqqq4pcenBXLQ==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/html-encoding-sniffer": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-4.0.0.tgz",
-			"integrity": "sha512-Y22oTqIU4uuPgEemfz7NDJz6OeKf12Lsu+QC+s3BVpda64lTiMYCyGwg5ki4vFxkMwQdeZDl2adZoqUgdFuTgQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"whatwg-encoding": "^3.1.1"
-			},
-			"engines": {
-				"node": ">=18"
-			}
-		},
-		"node_modules/html-escaper": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
-			"integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/http-proxy-agent": {
-			"version": "7.0.2",
-			"resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz",
-			"integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"agent-base": "^7.1.0",
-				"debug": "^4.3.4"
-			},
-			"engines": {
-				"node": ">= 14"
-			}
-		},
-		"node_modules/https-proxy-agent": {
-			"version": "7.0.5",
-			"resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz",
-			"integrity": "sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"agent-base": "^7.0.2",
-				"debug": "4"
-			},
-			"engines": {
-				"node": ">= 14"
-			}
-		},
-		"node_modules/i18next": {
-			"version": "23.12.2",
-			"resolved": "https://registry.npmjs.org/i18next/-/i18next-23.12.2.tgz",
-			"integrity": "sha512-XIeh5V+bi8SJSWGL3jqbTEBW5oD6rbP5L+E7dVQh1MNTxxYef0x15rhJVcRb7oiuq4jLtgy2SD8eFlf6P2cmqg==",
-			"funding": [
-				{
-					"type": "individual",
-					"url": "https://locize.com"
-				},
-				{
-					"type": "individual",
-					"url": "https://locize.com/i18next.html"
-				},
-				{
-					"type": "individual",
-					"url": "https://www.i18next.com/how-to/faq#i18next-is-awesome.-how-can-i-support-the-project"
-				}
-			],
-			"license": "MIT",
-			"dependencies": {
-				"@babel/runtime": "^7.23.2"
-			}
-		},
-		"node_modules/i18next-browser-languagedetector": {
-			"version": "7.2.1",
-			"resolved": "https://registry.npmjs.org/i18next-browser-languagedetector/-/i18next-browser-languagedetector-7.2.1.tgz",
-			"integrity": "sha512-h/pM34bcH6tbz8WgGXcmWauNpQupCGr25XPp9cZwZInR9XHSjIFDYp1SIok7zSPsTOMxdvuLyu86V+g2Kycnfw==",
-			"license": "MIT",
-			"dependencies": {
-				"@babel/runtime": "^7.23.2"
-			}
-		},
-		"node_modules/i18next-http-backend": {
-			"version": "2.6.1",
-			"resolved": "https://registry.npmjs.org/i18next-http-backend/-/i18next-http-backend-2.6.1.tgz",
-			"integrity": "sha512-rCilMAnlEQNeKOZY1+x8wLM5IpYOj10guGvEpeC59tNjj6MMreLIjIW8D1RclhD3ifLwn6d/Y9HEM1RUE6DSog==",
-			"license": "MIT",
-			"dependencies": {
-				"cross-fetch": "4.0.0"
-			}
-		},
-		"node_modules/i18next-korean-postposition-processor": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/i18next-korean-postposition-processor/-/i18next-korean-postposition-processor-1.0.0.tgz",
-			"integrity": "sha512-ruNXjI9awsFK6Ie+F9gYaMW8ciLMuCkeRjH9QkSv2Wb8xI0mnm773v3M9eua8dtvAXudIUk4p6Ho7hNkEASXDg==",
-			"license": "MIT",
-			"peerDependencies": {
-				"i18next": ">=8.4.0"
-			}
-		},
-		"node_modules/iconv-lite": {
-			"version": "0.4.24",
-			"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-			"integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"safer-buffer": ">= 2.1.2 < 3"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/ignore": {
-			"version": "5.3.1",
-			"resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.1.tgz",
-			"integrity": "sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"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",
-			"integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"parent-module": "^1.0.0",
-				"resolve-from": "^4.0.0"
-			},
-			"engines": {
-				"node": ">=6"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/imurmurhash": {
-			"version": "0.1.4",
-			"resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-			"integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"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",
-			"integrity": "sha512-QQnnxNyfvmHFIsj7gkPcYymR8Jdw/o7mp5ZFihxn6h8Ci6fh3Dx4E1gPjpQEpIuPo9XVNY/ZUwh4BPMjGyL01g==",
-			"dev": true,
-			"license": "ISC",
-			"engines": {
-				"node": "^14.17.0 || ^16.13.0 || >=18.0.0"
-			}
-		},
-		"node_modules/inquirer": {
-			"version": "11.0.2",
-			"resolved": "https://registry.npmjs.org/inquirer/-/inquirer-11.0.2.tgz",
-			"integrity": "sha512-pnbn3nL+JFrTw/pLhzyE/IQ3+gA3n5JxTAZQDjB6qu4gbjOaiTnpZbxT6HY2DDCT7bzDjTTsd3snRP+B6N//Pg==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@inquirer/core": "^9.2.1",
-				"@inquirer/prompts": "^6.0.1",
-				"@inquirer/type": "^2.0.0",
-				"@types/mute-stream": "^0.0.4",
-				"ansi-escapes": "^4.3.2",
-				"mute-stream": "^1.0.0",
-				"run-async": "^3.0.0",
-				"rxjs": "^7.8.1"
-			},
-			"engines": {
-				"node": ">=18"
-			}
-		},
-		"node_modules/interpret": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/interpret/-/interpret-3.1.1.tgz",
-			"integrity": "sha512-6xwYfHbajpoF0xLW+iwLkhwgvLoZDfjYfoFNu8ftMoXINzwuymNLd9u/KmwtdT2GbR+/Cz66otEGEVVUHX9QLQ==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=10.13.0"
-			}
-		},
-		"node_modules/is-core-module": {
-			"version": "2.15.0",
-			"resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.15.0.tgz",
-			"integrity": "sha512-Dd+Lb2/zvk9SKy1TGCt1wFJFo/MWBPMX5x7KcvLajWTGuomczdQX61PvY5yK6SVACwpoexWo81IfFyoKY2QnTA==",
-			"dev": true,
-			"dependencies": {
-				"hasown": "^2.0.2"
-			},
-			"engines": {
-				"node": ">= 0.4"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/ljharb"
-			}
-		},
-		"node_modules/is-extglob": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-			"integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/is-fullwidth-code-point": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-			"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/is-glob": {
-			"version": "4.0.3",
-			"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-			"integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"is-extglob": "^2.1.1"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/is-installed-globally": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-1.0.0.tgz",
-			"integrity": "sha512-K55T22lfpQ63N4KEN57jZUAaAYqYHEe8veb/TycJRk9DdSCLLcovXz/mL6mOnhQaZsQGwPhuFopdQIlqGSEjiQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"global-directory": "^4.0.1",
-				"is-path-inside": "^4.0.0"
-			},
-			"engines": {
-				"node": ">=18"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/is-installed-globally/node_modules/is-path-inside": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-4.0.0.tgz",
-			"integrity": "sha512-lJJV/5dYS+RcL8uQdBDW9c9uWFLLBNRyFhnAKXw5tVqLlKZ4RMGZKv+YQ/IA3OhD+RpbJa1LLFM1FQPGyIXvOA==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=12"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/is-node-process": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/is-node-process/-/is-node-process-1.2.0.tgz",
-			"integrity": "sha512-Vg4o6/fqPxIjtxgUH5QLJhwZ7gW5diGCVlXpuUfELC62CuxM1iHcRe51f2W1FDy04Ai4KJkagKjx3XaqyfRKXw==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/is-number": {
-			"version": "7.0.0",
-			"resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-			"integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=0.12.0"
-			}
-		},
-		"node_modules/is-path-inside": {
-			"version": "3.0.3",
-			"resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
-			"integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/is-potential-custom-element-name": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz",
-			"integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/isarray": {
-			"version": "2.0.5",
-			"resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
-			"integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
-			"license": "MIT"
-		},
-		"node_modules/isexe": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-			"integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
-			"dev": true,
-			"license": "ISC"
-		},
-		"node_modules/istanbul-lib-coverage": {
-			"version": "3.2.2",
-			"resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz",
-			"integrity": "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==",
-			"dev": true,
-			"license": "BSD-3-Clause",
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/istanbul-lib-instrument": {
-			"version": "6.0.3",
-			"resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.3.tgz",
-			"integrity": "sha512-Vtgk7L/R2JHyyGW07spoFlB8/lpjiOLTjMdms6AFMraYt3BaJauod/NGrfnVG/y4Ix1JEuMRPDPEj2ua+zz1/Q==",
-			"dev": true,
-			"license": "BSD-3-Clause",
-			"dependencies": {
-				"@babel/core": "^7.23.9",
-				"@babel/parser": "^7.23.9",
-				"@istanbuljs/schema": "^0.1.3",
-				"istanbul-lib-coverage": "^3.2.0",
-				"semver": "^7.5.4"
-			},
-			"engines": {
-				"node": ">=10"
-			}
-		},
-		"node_modules/istanbul-lib-report": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz",
-			"integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==",
-			"dev": true,
-			"license": "BSD-3-Clause",
-			"dependencies": {
-				"istanbul-lib-coverage": "^3.0.0",
-				"make-dir": "^4.0.0",
-				"supports-color": "^7.1.0"
-			},
-			"engines": {
-				"node": ">=10"
-			}
-		},
-		"node_modules/istanbul-lib-source-maps": {
-			"version": "5.0.6",
-			"resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-5.0.6.tgz",
-			"integrity": "sha512-yg2d+Em4KizZC5niWhQaIomgf5WlL4vOOjZ5xGCmF8SnPE/mDWWXgvRExdcpCgh9lLRRa1/fSYp2ymmbJ1pI+A==",
-			"dev": true,
-			"license": "BSD-3-Clause",
-			"dependencies": {
-				"@jridgewell/trace-mapping": "^0.3.23",
-				"debug": "^4.1.1",
-				"istanbul-lib-coverage": "^3.0.0"
-			},
-			"engines": {
-				"node": ">=10"
-			}
-		},
-		"node_modules/istanbul-reports": {
-			"version": "3.1.7",
-			"resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.7.tgz",
-			"integrity": "sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g==",
-			"dev": true,
-			"license": "BSD-3-Clause",
-			"dependencies": {
-				"html-escaper": "^2.0.0",
-				"istanbul-lib-report": "^3.0.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/jackspeak": {
-			"version": "3.4.3",
-			"resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz",
-			"integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==",
-			"dev": true,
-			"license": "BlueOak-1.0.0",
-			"dependencies": {
-				"@isaacs/cliui": "^8.0.2"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/isaacs"
-			},
-			"optionalDependencies": {
-				"@pkgjs/parseargs": "^0.11.0"
-			}
-		},
-		"node_modules/jest-canvas-mock": {
-			"version": "2.5.2",
-			"resolved": "https://registry.npmjs.org/jest-canvas-mock/-/jest-canvas-mock-2.5.2.tgz",
-			"integrity": "sha512-vgnpPupjOL6+L5oJXzxTxFrlGEIbHdZqFU+LFNdtLxZ3lRDCl17FlTMM7IatoRQkrcyOTMlDinjUguqmQ6bR2A==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"cssfontparser": "^1.2.1",
-				"moo-color": "^1.0.2"
-			}
-		},
-		"node_modules/js-tokens": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-			"integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/js-yaml": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-			"integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
-			"license": "MIT",
-			"dependencies": {
-				"argparse": "^2.0.1"
-			},
-			"bin": {
-				"js-yaml": "bin/js-yaml.js"
-			}
-		},
-		"node_modules/jsdom": {
-			"version": "24.1.0",
-			"resolved": "https://registry.npmjs.org/jsdom/-/jsdom-24.1.0.tgz",
-			"integrity": "sha512-6gpM7pRXCwIOKxX47cgOyvyQDN/Eh0f1MeKySBV2xGdKtqJBLj8P25eY3EVCWo2mglDDzozR2r2MW4T+JiNUZA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"cssstyle": "^4.0.1",
-				"data-urls": "^5.0.0",
-				"decimal.js": "^10.4.3",
-				"form-data": "^4.0.0",
-				"html-encoding-sniffer": "^4.0.0",
-				"http-proxy-agent": "^7.0.2",
-				"https-proxy-agent": "^7.0.4",
-				"is-potential-custom-element-name": "^1.0.1",
-				"nwsapi": "^2.2.10",
-				"parse5": "^7.1.2",
-				"rrweb-cssom": "^0.7.0",
-				"saxes": "^6.0.0",
-				"symbol-tree": "^3.2.4",
-				"tough-cookie": "^4.1.4",
-				"w3c-xmlserializer": "^5.0.0",
-				"webidl-conversions": "^7.0.0",
-				"whatwg-encoding": "^3.1.1",
-				"whatwg-mimetype": "^4.0.0",
-				"whatwg-url": "^14.0.0",
-				"ws": "^8.17.0",
-				"xml-name-validator": "^5.0.0"
-			},
-			"engines": {
-				"node": ">=18"
-			},
-			"peerDependencies": {
-				"canvas": "^2.11.2"
-			},
-			"peerDependenciesMeta": {
-				"canvas": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/jsesc": {
-			"version": "2.5.2",
-			"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-			"integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
-			"dev": true,
-			"license": "MIT",
-			"bin": {
-				"jsesc": "bin/jsesc"
-			},
-			"engines": {
-				"node": ">=4"
-			}
-		},
-		"node_modules/json-buffer": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
-			"integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/json-schema-traverse": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-			"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-			"dev": true
-		},
-		"node_modules/json-stable-stringify": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.1.1.tgz",
-			"integrity": "sha512-SU/971Kt5qVQfJpyDveVhQ/vya+5hvrjClFOcr8c0Fq5aODJjMwutrOfCU+eCnVD5gpx1Q3fEqkyom77zH1iIg==",
-			"license": "MIT",
-			"dependencies": {
-				"call-bind": "^1.0.5",
-				"isarray": "^2.0.5",
-				"jsonify": "^0.0.1",
-				"object-keys": "^1.1.1"
-			},
-			"engines": {
-				"node": ">= 0.4"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/ljharb"
-			}
-		},
-		"node_modules/json-stable-stringify-without-jsonify": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-			"integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/json5": {
-			"version": "2.2.3",
-			"resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
-			"integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
-			"dev": true,
-			"license": "MIT",
-			"bin": {
-				"json5": "lib/cli.js"
-			},
-			"engines": {
-				"node": ">=6"
-			}
-		},
-		"node_modules/jsonify": {
-			"version": "0.0.1",
-			"resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.1.tgz",
-			"integrity": "sha512-2/Ki0GcmuqSrgFyelQq9M05y7PS0mEwuIzrf3f1fPqkVDVRvZrPZtVSMHxdgo8Aq0sxAOb/cr2aqqA3LeWHVPg==",
-			"license": "Public Domain",
-			"funding": {
-				"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",
-			"integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"json-buffer": "3.0.1"
-			}
-		},
-		"node_modules/kleur": {
-			"version": "3.0.3",
-			"resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
-			"integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=6"
-			}
-		},
-		"node_modules/lefthook": {
-			"version": "1.7.4",
-			"resolved": "https://registry.npmjs.org/lefthook/-/lefthook-1.7.4.tgz",
-			"integrity": "sha512-lVv3nKH9l3KMDS3bySROvWJSw1+AsBHUO7xaA0rg1IEBZrj3+ePmM+a8elX+GU3Go1OzsZEYjo5AOOeLoZ7FQg==",
-			"dev": true,
-			"hasInstallScript": true,
-			"license": "MIT",
-			"bin": {
-				"lefthook": "bin/index.js"
-			},
-			"optionalDependencies": {
-				"lefthook-darwin-arm64": "1.7.4",
-				"lefthook-darwin-x64": "1.7.4",
-				"lefthook-freebsd-arm64": "1.7.4",
-				"lefthook-freebsd-x64": "1.7.4",
-				"lefthook-linux-arm64": "1.7.4",
-				"lefthook-linux-x64": "1.7.4",
-				"lefthook-windows-arm64": "1.7.4",
-				"lefthook-windows-x64": "1.7.4"
-			}
-		},
-		"node_modules/lefthook-darwin-arm64": {
-			"version": "1.7.4",
-			"resolved": "https://registry.npmjs.org/lefthook-darwin-arm64/-/lefthook-darwin-arm64-1.7.4.tgz",
-			"integrity": "sha512-6XpenaP0W7ZYA3lhHey/C1U+KmYz6eCq2cGswQsrTX+xdtHdWW3NbbOKngxATRTF8+CtF6m9UB2afP7qqkCghQ==",
-			"cpu": [
-				"arm64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"darwin"
-			]
-		},
-		"node_modules/lefthook-darwin-x64": {
-			"version": "1.7.4",
-			"resolved": "https://registry.npmjs.org/lefthook-darwin-x64/-/lefthook-darwin-x64-1.7.4.tgz",
-			"integrity": "sha512-lpQXbPMHiaWE7+9fV+spjuMKiZ3J/+oI6hY1/l48MO3LmSpIv6DNy0VHho1fZVQnHdBU4bDh5c1G0r1f5T0irg==",
-			"cpu": [
-				"x64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"darwin"
-			]
-		},
-		"node_modules/lefthook-freebsd-arm64": {
-			"version": "1.7.4",
-			"resolved": "https://registry.npmjs.org/lefthook-freebsd-arm64/-/lefthook-freebsd-arm64-1.7.4.tgz",
-			"integrity": "sha512-wv+JZgkD1/wi4X5aKKNodvxNcFcYmvL7uyzKkbtd/LgX5ssh9r5pO9J/71ULGtEuTXH4kqORRtez7u/ygqMEew==",
-			"cpu": [
-				"arm64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"freebsd"
-			]
-		},
-		"node_modules/lefthook-freebsd-x64": {
-			"version": "1.7.4",
-			"resolved": "https://registry.npmjs.org/lefthook-freebsd-x64/-/lefthook-freebsd-x64-1.7.4.tgz",
-			"integrity": "sha512-xoYR0Ay8pbyY9W9mI+iI9VDkkCVYSXhMf9XyOChSlu2XmjKiqi23hjCXvSOpvHQ7jphGvAVpE3Byijr6Xjuihw==",
-			"cpu": [
-				"x64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"freebsd"
-			]
-		},
-		"node_modules/lefthook-linux-arm64": {
-			"version": "1.7.4",
-			"resolved": "https://registry.npmjs.org/lefthook-linux-arm64/-/lefthook-linux-arm64-1.7.4.tgz",
-			"integrity": "sha512-WvXWzSM/e08n2f5lcC8j+pUMS0RzZftJK4zuBQ36TstSYXfBjWiw+FMnKCVZk6Q8Zc0icyF8sTmKQAyKCgX+UA==",
-			"cpu": [
-				"arm64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"linux"
-			]
-		},
-		"node_modules/lefthook-linux-x64": {
-			"version": "1.7.4",
-			"resolved": "https://registry.npmjs.org/lefthook-linux-x64/-/lefthook-linux-x64-1.7.4.tgz",
-			"integrity": "sha512-eR5NxGzqPJm3wDTm4HStwGxOZ8Omb0ooodyuQdEOxtYidLrd4U18N14huwCEFd3BAOrjIWYV8plH+ReTZE56eg==",
-			"cpu": [
-				"x64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"linux"
-			]
-		},
-		"node_modules/lefthook-windows-arm64": {
-			"version": "1.7.4",
-			"resolved": "https://registry.npmjs.org/lefthook-windows-arm64/-/lefthook-windows-arm64-1.7.4.tgz",
-			"integrity": "sha512-C+MdHH+0ylermetMHwfHsYYNI5HI6QEOx7N4Iw4Ea6c3Yuj3eG3LsAzrhsup7KLSSBmDgIHOCJUx/Mfh2z+ATw==",
-			"cpu": [
-				"arm64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"win32"
-			]
-		},
-		"node_modules/lefthook-windows-x64": {
-			"version": "1.7.4",
-			"resolved": "https://registry.npmjs.org/lefthook-windows-x64/-/lefthook-windows-x64-1.7.4.tgz",
-			"integrity": "sha512-BDQhiRzmMYPFQFtVtkRfUfeZuSlemG1oJfGKYXlCGFskvK9Jm1nGFnG0Ig63FAQaFdW33DFoLdr9ZKFTUQeSwQ==",
-			"cpu": [
-				"x64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"win32"
-			]
-		},
-		"node_modules/levn": {
-			"version": "0.4.1",
-			"resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
-			"integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"prelude-ls": "^1.2.1",
-				"type-check": "~0.4.0"
-			},
-			"engines": {
-				"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",
-			"integrity": "sha512-5aHCbzQRADcdP+ATqnDuhhJ/MRIqDkZX5pyjFHRRysS8vZ5AbqGEoFIb6pYHPZ+L/OC2Lc+xT8uHVVR5CAK/wQ==",
-			"dev": true,
-			"dependencies": {
-				"uc.micro": "^2.0.0"
-			}
-		},
-		"node_modules/locate-path": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
-			"integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"p-locate": "^5.0.0"
-			},
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/lodash.merge": {
-			"version": "4.6.2",
-			"resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
-			"integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/loupe": {
-			"version": "3.1.3",
-			"resolved": "https://registry.npmjs.org/loupe/-/loupe-3.1.3.tgz",
-			"integrity": "sha512-kkIp7XSkP78ZxJEsSxW3712C6teJVoeHHwgo9zJ380de7IYyJ2ISlxojcH2pC5OFLewESmnRi/+XCDIEEVyoug==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/lru-cache": {
-			"version": "5.1.1",
-			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
-			"integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
-			"dev": true,
-			"license": "ISC",
-			"dependencies": {
-				"yallist": "^3.0.2"
-			}
-		},
-		"node_modules/lunr": {
-			"version": "2.3.9",
-			"resolved": "https://registry.npmjs.org/lunr/-/lunr-2.3.9.tgz",
-			"integrity": "sha512-zTU3DaZaF3Rt9rhN3uBMGQD3dD2/vFQqnvZCDv4dl5iOzq2IZQqTxu90r4E5J+nP70J3ilqVCrbho2eWaeW8Ow==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/magic-string": {
-			"version": "0.30.17",
-			"resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.17.tgz",
-			"integrity": "sha512-sNPKHvyjVf7gyjwS4xGTaW/mCnF8wnjtifKBEhxfZ7E/S8tQ0rssrwGNn6q8JH/ohItJfSQp9mBtQYuTlH5QnA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jridgewell/sourcemap-codec": "^1.5.0"
-			}
-		},
-		"node_modules/magicast": {
-			"version": "0.3.5",
-			"resolved": "https://registry.npmjs.org/magicast/-/magicast-0.3.5.tgz",
-			"integrity": "sha512-L0WhttDl+2BOsybvEOLK7fW3UA0OQ0IQ2d6Zl2x/a6vVRs3bAY0ECOSHHeL5jD+SbOpOCUEi0y1DgHEn9Qn1AQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@babel/parser": "^7.25.4",
-				"@babel/types": "^7.25.4",
-				"source-map-js": "^1.2.0"
-			}
-		},
-		"node_modules/make-dir": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz",
-			"integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"semver": "^7.5.3"
-			},
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"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,
-			"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"
-			},
-			"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
-		},
-		"node_modules/memoize": {
-			"version": "10.0.0",
-			"resolved": "https://registry.npmjs.org/memoize/-/memoize-10.0.0.tgz",
-			"integrity": "sha512-H6cBLgsi6vMWOcCpvVCdFFnl3kerEXbrYh9q+lY6VXvQSmM6CkmV08VOwT+WE2tzIEqRPFfAq3fm4v/UIW6mSA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"mimic-function": "^5.0.0"
-			},
-			"engines": {
-				"node": ">=18"
-			},
-			"funding": {
-				"url": "https://github.com/sindresorhus/memoize?sponsor=1"
-			}
-		},
-		"node_modules/merge2": {
-			"version": "1.4.1",
-			"resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
-			"integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">= 8"
-			}
-		},
-		"node_modules/micromatch": {
-			"version": "4.0.7",
-			"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.7.tgz",
-			"integrity": "sha512-LPP/3KorzCwBxfeUuZmaR6bG2kdeHSbe0P2tY3FLRU4vYrjYz5hI4QZwV0njUx3jeuKe67YukQ1LSPZBKDqO/Q==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"braces": "^3.0.3",
-				"picomatch": "^2.3.1"
-			},
-			"engines": {
-				"node": ">=8.6"
-			}
-		},
-		"node_modules/micromatch/node_modules/picomatch": {
-			"version": "2.3.1",
-			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-			"integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=8.6"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/jonschlinkert"
-			}
-		},
-		"node_modules/mime-db": {
-			"version": "1.52.0",
-			"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
-			"integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">= 0.6"
-			}
-		},
-		"node_modules/mime-types": {
-			"version": "2.1.35",
-			"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
-			"integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"mime-db": "1.52.0"
-			},
-			"engines": {
-				"node": ">= 0.6"
-			}
-		},
-		"node_modules/mimic-function": {
-			"version": "5.0.1",
-			"resolved": "https://registry.npmjs.org/mimic-function/-/mimic-function-5.0.1.tgz",
-			"integrity": "sha512-VP79XUPxV2CigYP3jWwAUFSku2aKqBH7uTAapFWCBqutsbmDo96KY5o8uh6U+/YSIn5OxJnXp73beVkpqMIGhA==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=18"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/minimatch": {
-			"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"
-			},
-			"engines": {
-				"node": ">=16 || 14 >=14.17"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/isaacs"
-			}
-		},
-		"node_modules/minimist": {
-			"version": "1.2.8",
-			"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
-			"integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
-			"dev": true,
-			"license": "MIT",
-			"funding": {
-				"url": "https://github.com/sponsors/ljharb"
-			}
-		},
-		"node_modules/minipass": {
-			"version": "7.1.2",
-			"resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
-			"integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
-			"dev": true,
-			"license": "ISC",
-			"engines": {
-				"node": ">=16 || 14 >=14.17"
-			}
-		},
-		"node_modules/moo-color": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/moo-color/-/moo-color-1.0.3.tgz",
-			"integrity": "sha512-i/+ZKXMDf6aqYtBhuOcej71YSlbjT3wCO/4H1j8rPvxDJEifdwgg5MaFyu6iYAT8GBZJg2z0dkgK4YMzvURALQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"color-name": "^1.1.4"
-			}
-		},
-		"node_modules/ms": {
-			"version": "2.1.3",
-			"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-			"integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/msw": {
-			"version": "2.4.9",
-			"resolved": "https://registry.npmjs.org/msw/-/msw-2.4.9.tgz",
-			"integrity": "sha512-1m8xccT6ipN4PTqLinPwmzhxQREuxaEJYdx4nIbggxP8aM7r1e71vE7RtOUSQoAm1LydjGfZKy7370XD/tsuYg==",
-			"dev": true,
-			"hasInstallScript": true,
-			"license": "MIT",
-			"dependencies": {
-				"@bundled-es-modules/cookie": "^2.0.0",
-				"@bundled-es-modules/statuses": "^1.0.1",
-				"@bundled-es-modules/tough-cookie": "^0.1.6",
-				"@inquirer/confirm": "^3.0.0",
-				"@mswjs/interceptors": "^0.35.8",
-				"@open-draft/until": "^2.1.0",
-				"@types/cookie": "^0.6.0",
-				"@types/statuses": "^2.0.4",
-				"chalk": "^4.1.2",
-				"graphql": "^16.8.1",
-				"headers-polyfill": "^4.0.2",
-				"is-node-process": "^1.2.0",
-				"outvariant": "^1.4.2",
-				"path-to-regexp": "^6.3.0",
-				"strict-event-emitter": "^0.5.1",
-				"type-fest": "^4.9.0",
-				"yargs": "^17.7.2"
-			},
-			"bin": {
-				"msw": "cli/index.js"
-			},
-			"engines": {
-				"node": ">=18"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/mswjs"
-			},
-			"peerDependencies": {
-				"typescript": ">= 4.8.x"
-			},
-			"peerDependenciesMeta": {
-				"typescript": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/msw/node_modules/@inquirer/confirm": {
-			"version": "3.2.0",
-			"resolved": "https://registry.npmjs.org/@inquirer/confirm/-/confirm-3.2.0.tgz",
-			"integrity": "sha512-oOIwPs0Dvq5220Z8lGL/6LHRTEr9TgLHmiI99Rj1PJ1p1czTys+olrgBqZk4E2qC0YTzeHprxSQmoHioVdJ7Lw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@inquirer/core": "^9.1.0",
-				"@inquirer/type": "^1.5.3"
-			},
-			"engines": {
-				"node": ">=18"
-			}
-		},
-		"node_modules/msw/node_modules/@inquirer/type": {
-			"version": "1.5.5",
-			"resolved": "https://registry.npmjs.org/@inquirer/type/-/type-1.5.5.tgz",
-			"integrity": "sha512-MzICLu4yS7V8AA61sANROZ9vT1H3ooca5dSmI1FjZkzq7o/koMsRfQSzRtFo+F3Ao4Sf1C0bpLKejpKB/+j6MA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"mute-stream": "^1.0.0"
-			},
-			"engines": {
-				"node": ">=18"
-			}
-		},
-		"node_modules/msw/node_modules/type-fest": {
-			"version": "4.26.1",
-			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.26.1.tgz",
-			"integrity": "sha512-yOGpmOAL7CkKe/91I5O3gPICmJNLJ1G4zFYVAsRHg7M64biSnPtRj0WNQt++bRkjYOqjWXrhnUw1utzmVErAdg==",
-			"dev": true,
-			"license": "(MIT OR CC0-1.0)",
-			"engines": {
-				"node": ">=16"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/mustache": {
-			"version": "4.2.0",
-			"resolved": "https://registry.npmjs.org/mustache/-/mustache-4.2.0.tgz",
-			"integrity": "sha512-71ippSywq5Yb7/tVYyGbkBggbU8H3u5Rz56fH60jGFgr8uHwxs+aSKeqmluIVzM0m0kB7xQjKS6qPfd0b2ZoqQ==",
-			"license": "MIT",
-			"bin": {
-				"mustache": "bin/mustache"
-			}
-		},
-		"node_modules/mute-stream": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-1.0.0.tgz",
-			"integrity": "sha512-avsJQhyd+680gKXyG/sQc0nXaC6rBkPOfyHYcFb9+hdkqQkR9bdnkJ0AMZhke0oesPqIO+mFFJ+IdBc7mst4IA==",
-			"dev": true,
-			"license": "ISC",
-			"engines": {
-				"node": "^14.17.0 || ^16.13.0 || >=18.0.0"
-			}
-		},
-		"node_modules/nanoid": {
-			"version": "3.3.7",
-			"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz",
-			"integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==",
-			"dev": true,
-			"funding": [
-				{
-					"type": "github",
-					"url": "https://github.com/sponsors/ai"
-				}
-			],
-			"bin": {
-				"nanoid": "bin/nanoid.cjs"
-			},
-			"engines": {
-				"node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
-			}
-		},
-		"node_modules/natural-compare": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-			"integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/node-fetch": {
-			"version": "2.7.0",
-			"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
-			"integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==",
-			"license": "MIT",
-			"dependencies": {
-				"whatwg-url": "^5.0.0"
-			},
-			"engines": {
-				"node": "4.x || >=6.0.0"
-			},
-			"peerDependencies": {
-				"encoding": "^0.1.0"
-			},
-			"peerDependenciesMeta": {
-				"encoding": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/node-fetch/node_modules/tr46": {
-			"version": "0.0.3",
-			"resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
-			"integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
-		},
-		"node_modules/node-fetch/node_modules/webidl-conversions": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
-			"integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
-		},
-		"node_modules/node-fetch/node_modules/whatwg-url": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
-			"integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
-			"dependencies": {
-				"tr46": "~0.0.3",
-				"webidl-conversions": "^3.0.0"
-			}
-		},
-		"node_modules/node-releases": {
-			"version": "2.0.17",
-			"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.17.tgz",
-			"integrity": "sha512-Ww6ZlOiEQfPfXM45v17oabk77Z7mg5bOt7AjDyzy7RjK9OrLrLC8dyZQoAPEOtFX9SaNf1Tdvr5gRJWdTJj7GA==",
-			"dev": true
-		},
-		"node_modules/nwsapi": {
-			"version": "2.2.12",
-			"resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.12.tgz",
-			"integrity": "sha512-qXDmcVlZV4XRtKFzddidpfVP4oMSGhga+xdMc25mv8kaLUHtgzCDhUxkrN8exkGdTlLNaXj7CV3GtON7zuGZ+w==",
-			"dev": true
-		},
-		"node_modules/object-keys": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-			"integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
-			"license": "MIT",
-			"engines": {
-				"node": ">= 0.4"
-			}
-		},
-		"node_modules/optionator": {
-			"version": "0.9.4",
-			"resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz",
-			"integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"deep-is": "^0.1.3",
-				"fast-levenshtein": "^2.0.6",
-				"levn": "^0.4.1",
-				"prelude-ls": "^1.2.1",
-				"type-check": "^0.4.0",
-				"word-wrap": "^1.2.5"
-			},
-			"engines": {
-				"node": ">= 0.8.0"
-			}
-		},
-		"node_modules/os-tmpdir": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-			"integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/outvariant": {
-			"version": "1.4.3",
-			"resolved": "https://registry.npmjs.org/outvariant/-/outvariant-1.4.3.tgz",
-			"integrity": "sha512-+Sl2UErvtsoajRDKCE5/dBz4DIvHXQQnAxtQTF04OJxY0+DyZXSo5P5Bb7XYWOh81syohlYL24hbDwxedPUJCA==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/p-limit": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
-			"integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"yocto-queue": "^0.1.0"
-			},
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/p-locate": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
-			"integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"p-limit": "^3.0.2"
-			},
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/package-json-from-dist": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.0.tgz",
-			"integrity": "sha512-dATvCeZN/8wQsGywez1mzHtTlP22H8OEfPrVMLNr4/eGa+ijtLn/6M5f0dY8UKNrC2O9UCU6SSoG3qRKnt7STw==",
-			"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",
-			"integrity": "sha512-HipMsgJkZu8br23pW15uvo6sib6wne/4woLZPlFf3rpDyMe9ywEXUsuD7+6K9PRkJlVT51j/sCOYDKGGS3ZJrw==",
-			"license": "MIT"
-		},
-		"node_modules/parent-module": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
-			"integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"callsites": "^3.0.0"
-			},
-			"engines": {
-				"node": ">=6"
-			}
-		},
-		"node_modules/parse5": {
-			"version": "7.1.2",
-			"resolved": "https://registry.npmjs.org/parse5/-/parse5-7.1.2.tgz",
-			"integrity": "sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"entities": "^4.4.0"
-			},
-			"funding": {
-				"url": "https://github.com/inikulin/parse5?sponsor=1"
-			}
-		},
-		"node_modules/path-exists": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-			"integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/path-key": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-			"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/path-parse": {
-			"version": "1.0.7",
-			"resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
-			"integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/path-scurry": {
-			"version": "1.11.1",
-			"resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz",
-			"integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==",
-			"dev": true,
-			"license": "BlueOak-1.0.0",
-			"dependencies": {
-				"lru-cache": "^10.2.0",
-				"minipass": "^5.0.0 || ^6.0.2 || ^7.0.0"
-			},
-			"engines": {
-				"node": ">=16 || 14 >=14.18"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/isaacs"
-			}
-		},
-		"node_modules/path-scurry/node_modules/lru-cache": {
-			"version": "10.4.3",
-			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
-			"integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
-			"dev": true,
-			"license": "ISC"
-		},
-		"node_modules/path-to-regexp": {
-			"version": "6.3.0",
-			"resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.3.0.tgz",
-			"integrity": "sha512-Yhpw4T9C6hPpgPeA28us07OJeqZ5EzQTkbfwuhsUg0c237RomFoETJgmp2sa3F/41gfLE6G5cqcYwznmeEeOlQ==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/path-type": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-			"integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/pathe": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/pathe/-/pathe-1.1.2.tgz",
-			"integrity": "sha512-whLdWMYL2TwI08hn8/ZqAbrVemu0LNaNNJZX73O6qaIdCTfXutsLhMkjdENX0qhsQ9uIimo4/aQOmXkoon2nDQ==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/pathval": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/pathval/-/pathval-2.0.0.tgz",
-			"integrity": "sha512-vE7JKRyES09KiunauX7nd2Q9/L7lhok4smP9RZTDeD4MVs72Dp2qNFVz39Nz5a0FVEW0BJR6C0DYrq6unoziZA==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">= 14.16"
-			}
-		},
-		"node_modules/phaser": {
-			"version": "3.80.1",
-			"resolved": "https://registry.npmjs.org/phaser/-/phaser-3.80.1.tgz",
-			"integrity": "sha512-VQGAWoDOkEpAWYkI+PUADv5Ql+SM0xpLuAMBJHz9tBcOLqjJ2wd8bUhxJgOqclQlLTg97NmMd9MhS75w16x1Cw==",
-			"license": "MIT",
-			"dependencies": {
-				"eventemitter3": "^5.0.1"
-			}
-		},
-		"node_modules/phaser3-rex-plugins": {
-			"version": "1.80.5",
-			"resolved": "https://registry.npmjs.org/phaser3-rex-plugins/-/phaser3-rex-plugins-1.80.5.tgz",
-			"integrity": "sha512-hdL3Cm6dK72w6phQdGnEiqqntlwT8SvjU0yit7DkdqiPy/Io1g3KnsRFqndtY+Hu69zaMEuckpIVeQK6yVwx4A==",
-			"dependencies": {
-				"eventemitter3": "^3.1.2",
-				"i18next": "^22.5.1",
-				"i18next-http-backend": "^2.5.2",
-				"js-yaml": "^4.1.0",
-				"mustache": "^4.2.0",
-				"papaparse": "^5.4.1",
-				"webfontloader": "^1.6.28"
-			}
-		},
-		"node_modules/phaser3-rex-plugins/node_modules/eventemitter3": {
-			"version": "3.1.2",
-			"resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.2.tgz",
-			"integrity": "sha512-tvtQIeLVHjDkJYnzf2dgVMxfuSGJeM/7UCG17TT4EumTfNtF+0nebF/4zWOIkCreAbtNqhGEboB6BWrwqNaw4Q==",
-			"license": "MIT"
-		},
-		"node_modules/phaser3-rex-plugins/node_modules/i18next": {
-			"version": "22.5.1",
-			"resolved": "https://registry.npmjs.org/i18next/-/i18next-22.5.1.tgz",
-			"integrity": "sha512-8TGPgM3pAD+VRsMtUMNknRz3kzqwp/gPALrWMsDnmC1mKqJwpWyooQRLMcbTwq8z8YwSmuj+ZYvc+xCuEpkssA==",
-			"funding": [
-				{
-					"type": "individual",
-					"url": "https://locize.com"
-				},
-				{
-					"type": "individual",
-					"url": "https://locize.com/i18next.html"
-				},
-				{
-					"type": "individual",
-					"url": "https://www.i18next.com/how-to/faq#i18next-is-awesome.-how-can-i-support-the-project"
-				}
-			],
-			"license": "MIT",
-			"dependencies": {
-				"@babel/runtime": "^7.20.6"
-			}
-		},
-		"node_modules/phaser3spectorjs": {
-			"version": "0.0.8",
-			"resolved": "https://registry.npmjs.org/phaser3spectorjs/-/phaser3spectorjs-0.0.8.tgz",
-			"integrity": "sha512-0dSO7/aMjEUPrp5EcjRvRRsEf+jXDbmzalPeJ6VtTB2Pn1PeaKc+qlL/DmO3l1Dvc5lkzc+Sil1Ta+Hkyi5cbA==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/picocolors": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.1.tgz",
-			"integrity": "sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==",
-			"dev": true
-		},
-		"node_modules/picomatch": {
-			"version": "4.0.2",
-			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz",
-			"integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=12"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/jonschlinkert"
-			}
-		},
-		"node_modules/possible-typed-array-names": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz",
-			"integrity": "sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==",
-			"dev": true,
-			"engines": {
-				"node": ">= 0.4"
-			}
-		},
-		"node_modules/postcss": {
-			"version": "8.4.47",
-			"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.47.tgz",
-			"integrity": "sha512-56rxCq7G/XfB4EkXq9Egn5GCqugWvDFjafDOThIdMBsI15iqPqR5r15TfSr1YPYeEI19YeaXMCbY6u88Y76GLQ==",
-			"dev": true,
-			"funding": [
-				{
-					"type": "opencollective",
-					"url": "https://opencollective.com/postcss/"
-				},
-				{
-					"type": "tidelift",
-					"url": "https://tidelift.com/funding/github/npm/postcss"
-				},
-				{
-					"type": "github",
-					"url": "https://github.com/sponsors/ai"
-				}
-			],
-			"dependencies": {
-				"nanoid": "^3.3.7",
-				"picocolors": "^1.1.0",
-				"source-map-js": "^1.2.1"
-			},
-			"engines": {
-				"node": "^10 || ^12 || >=14"
-			}
-		},
-		"node_modules/postcss/node_modules/picocolors": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.0.tgz",
-			"integrity": "sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw==",
-			"dev": true
-		},
-		"node_modules/prelude-ls": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
-			"integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"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",
-			"integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"kleur": "^3.0.3",
-				"sisteransi": "^1.0.5"
-			},
-			"engines": {
-				"node": ">= 6"
-			}
-		},
-		"node_modules/psl": {
-			"version": "1.9.0",
-			"resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz",
-			"integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/punycode": {
-			"version": "2.3.1",
-			"resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
-			"integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
-			"dev": true,
-			"engines": {
-				"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,
-			"engines": {
-				"node": ">=6"
-			}
-		},
-		"node_modules/querystringify": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
-			"integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/queue-microtask": {
-			"version": "1.2.3",
-			"resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
-			"integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
-			"dev": true,
-			"funding": [
-				{
-					"type": "github",
-					"url": "https://github.com/sponsors/feross"
-				},
-				{
-					"type": "patreon",
-					"url": "https://www.patreon.com/feross"
-				},
-				{
-					"type": "consulting",
-					"url": "https://feross.org/support"
-				}
-			]
-		},
-		"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",
-			"integrity": "sha512-/vxpCXddiX8NGfGO/mTafwjq4aFa/71pvamip0++IQk3zG8cbCj0fifNPrjjF1XMXUne91jL9OoxmdykoEtifQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"resolve": "^1.20.0"
-			},
-			"engines": {
-				"node": ">= 10.13.0"
-			}
-		},
-		"node_modules/regenerator-runtime": {
-			"version": "0.14.1",
-			"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz",
-			"integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==",
-			"license": "MIT"
-		},
-		"node_modules/regexp-tree": {
-			"version": "0.1.27",
-			"resolved": "https://registry.npmjs.org/regexp-tree/-/regexp-tree-0.1.27.tgz",
-			"integrity": "sha512-iETxpjK6YoRWJG5o6hXLwvjYAoW+FEZn9os0PD/b6AP6xQwsa/Y7lCVgIixBbUPMfhu+i2LtdeAqVTgGlQarfA==",
-			"dev": true,
-			"license": "MIT",
-			"bin": {
-				"regexp-tree": "bin/regexp-tree"
-			}
-		},
-		"node_modules/require-directory": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-			"integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/require-from-string": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
-			"integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/requires-port": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
-			"integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/resolve": {
-			"version": "1.22.8",
-			"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz",
-			"integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"is-core-module": "^2.13.0",
-				"path-parse": "^1.0.7",
-				"supports-preserve-symlinks-flag": "^1.0.0"
-			},
-			"bin": {
-				"resolve": "bin/resolve"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/ljharb"
-			}
-		},
-		"node_modules/resolve-from": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
-			"integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=4"
-			}
-		},
-		"node_modules/resolve-pkg-maps": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz",
-			"integrity": "sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==",
-			"dev": true,
-			"license": "MIT",
-			"funding": {
-				"url": "https://github.com/privatenumber/resolve-pkg-maps?sponsor=1"
-			}
-		},
-		"node_modules/reusify": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
-			"integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"iojs": ">=1.0.0",
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/rollup": {
-			"version": "4.22.4",
-			"resolved": "https://registry.npmjs.org/rollup/-/rollup-4.22.4.tgz",
-			"integrity": "sha512-vD8HJ5raRcWOyymsR6Z3o6+RzfEPCnVLMFJ6vRslO1jt4LO6dUo5Qnpg7y4RkZFM2DMe3WUirkI5c16onjrc6A==",
-			"dev": true,
-			"dependencies": {
-				"@types/estree": "1.0.5"
-			},
-			"bin": {
-				"rollup": "dist/bin/rollup"
-			},
-			"engines": {
-				"node": ">=18.0.0",
-				"npm": ">=8.0.0"
-			},
-			"optionalDependencies": {
-				"@rollup/rollup-android-arm-eabi": "4.22.4",
-				"@rollup/rollup-android-arm64": "4.22.4",
-				"@rollup/rollup-darwin-arm64": "4.22.4",
-				"@rollup/rollup-darwin-x64": "4.22.4",
-				"@rollup/rollup-linux-arm-gnueabihf": "4.22.4",
-				"@rollup/rollup-linux-arm-musleabihf": "4.22.4",
-				"@rollup/rollup-linux-arm64-gnu": "4.22.4",
-				"@rollup/rollup-linux-arm64-musl": "4.22.4",
-				"@rollup/rollup-linux-powerpc64le-gnu": "4.22.4",
-				"@rollup/rollup-linux-riscv64-gnu": "4.22.4",
-				"@rollup/rollup-linux-s390x-gnu": "4.22.4",
-				"@rollup/rollup-linux-x64-gnu": "4.22.4",
-				"@rollup/rollup-linux-x64-musl": "4.22.4",
-				"@rollup/rollup-win32-arm64-msvc": "4.22.4",
-				"@rollup/rollup-win32-ia32-msvc": "4.22.4",
-				"@rollup/rollup-win32-x64-msvc": "4.22.4",
-				"fsevents": "~2.3.2"
-			}
-		},
-		"node_modules/rrweb-cssom": {
-			"version": "0.7.1",
-			"resolved": "https://registry.npmjs.org/rrweb-cssom/-/rrweb-cssom-0.7.1.tgz",
-			"integrity": "sha512-TrEMa7JGdVm0UThDJSx7ddw5nVm3UJS9o9CCIZ72B1vSyEZoziDqBYP3XIoi/12lKrJR8rE3jeFHMok2F/Mnsg==",
-			"dev": true
-		},
-		"node_modules/run-async": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/run-async/-/run-async-3.0.0.tgz",
-			"integrity": "sha512-540WwVDOMxA6dN6We19EcT9sc3hkXPw5mzRNGM3FkdN/vtE9NFvj5lFAPNwUDmJjXidm3v7TC1cTE7t17Ulm1Q==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=0.12.0"
-			}
-		},
-		"node_modules/run-parallel": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
-			"integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
-			"dev": true,
-			"funding": [
-				{
-					"type": "github",
-					"url": "https://github.com/sponsors/feross"
-				},
-				{
-					"type": "patreon",
-					"url": "https://www.patreon.com/feross"
-				},
-				{
-					"type": "consulting",
-					"url": "https://feross.org/support"
-				}
-			],
-			"license": "MIT",
-			"dependencies": {
-				"queue-microtask": "^1.2.2"
-			}
-		},
-		"node_modules/rxjs": {
-			"version": "7.8.1",
-			"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz",
-			"integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==",
-			"dev": true,
-			"license": "Apache-2.0",
-			"dependencies": {
-				"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",
-			"integrity": "sha512-rx+x8AMzKb5Q5lQ95Zoi6ZbJqwCLkqi3XuJXp5P3rT8OEc6sZCJG5AE5dU3lsgRr/F4Bs31jSlVN+j5KrsGu9A==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"regexp-tree": "~0.1.1"
-			}
-		},
-		"node_modules/safer-buffer": {
-			"version": "2.1.2",
-			"resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-			"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/saxes": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/saxes/-/saxes-6.0.0.tgz",
-			"integrity": "sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==",
-			"dev": true,
-			"license": "ISC",
-			"dependencies": {
-				"xmlchars": "^2.2.0"
-			},
-			"engines": {
-				"node": ">=v12.22.7"
-			}
-		},
-		"node_modules/semver": {
-			"version": "7.6.3",
-			"resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
-			"integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
-			"dev": true,
-			"bin": {
-				"semver": "bin/semver.js"
-			},
-			"engines": {
-				"node": ">=10"
-			}
-		},
-		"node_modules/set-function-length": {
-			"version": "1.2.2",
-			"resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
-			"integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==",
-			"license": "MIT",
-			"dependencies": {
-				"define-data-property": "^1.1.4",
-				"es-errors": "^1.3.0",
-				"function-bind": "^1.1.2",
-				"get-intrinsic": "^1.2.4",
-				"gopd": "^1.0.1",
-				"has-property-descriptors": "^1.0.2"
-			},
-			"engines": {
-				"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",
-			"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"shebang-regex": "^3.0.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/shebang-regex": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-			"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/shiki": {
-			"version": "1.12.0",
-			"resolved": "https://registry.npmjs.org/shiki/-/shiki-1.12.0.tgz",
-			"integrity": "sha512-BuAxWOm5JhRcbSOl7XCei8wGjgJJonnV0oipUupPY58iULxUGyHhW5CF+9FRMuM1pcJ5cGEJGll1LusX6FwpPA==",
-			"dev": true,
-			"dependencies": {
-				"@shikijs/core": "1.12.0",
-				"@types/hast": "^3.0.4"
-			}
-		},
-		"node_modules/siginfo": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/siginfo/-/siginfo-2.0.0.tgz",
-			"integrity": "sha512-ybx0WO1/8bSBLEWXZvEd7gMW3Sn3JFlW3TvX1nREbDLRNQNaeNN8WK0meBwPdAaOI7TtRRRJn/Es1zhrrCHu7g==",
-			"dev": true,
-			"license": "ISC"
-		},
-		"node_modules/signal-exit": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
-			"integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
-			"dev": true,
-			"license": "ISC",
-			"engines": {
-				"node": ">=14"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/isaacs"
-			}
-		},
-		"node_modules/sisteransi": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
-			"integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/slash": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-			"integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/source-map-js": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
-			"integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
-			"dev": true,
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/stable-hash": {
-			"version": "0.0.4",
-			"resolved": "https://registry.npmjs.org/stable-hash/-/stable-hash-0.0.4.tgz",
-			"integrity": "sha512-LjdcbuBeLcdETCrPn9i8AYAZ1eCtu4ECAWtP7UleOiZ9LzVxRzzUZEoZ8zB24nhkQnDWyET0I+3sWokSDS3E7g==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/stackback": {
-			"version": "0.0.2",
-			"resolved": "https://registry.npmjs.org/stackback/-/stackback-0.0.2.tgz",
-			"integrity": "sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/statuses": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
-			"integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">= 0.8"
-			}
-		},
-		"node_modules/std-env": {
-			"version": "3.8.0",
-			"resolved": "https://registry.npmjs.org/std-env/-/std-env-3.8.0.tgz",
-			"integrity": "sha512-Bc3YwwCB+OzldMxOXJIIvC6cPRWr/LxOp48CdQTOkPyk/t4JWWJbrilwBd7RJzKV8QW7tJkcgAmeuLLJugl5/w==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/strict-event-emitter": {
-			"version": "0.5.1",
-			"resolved": "https://registry.npmjs.org/strict-event-emitter/-/strict-event-emitter-0.5.1.tgz",
-			"integrity": "sha512-vMgjE/GGEPEFnhFub6pa4FmJBRBVOLpIII2hvCZ8Kzb7K0hlHo7mQv6xYrBvCL2LtAIBwFUK8wvuJgTVSQ5MFQ==",
-			"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",
-			"integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"eastasianwidth": "^0.2.0",
-				"emoji-regex": "^9.2.2",
-				"strip-ansi": "^7.0.1"
-			},
-			"engines": {
-				"node": ">=12"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/string-width-cjs": {
-			"name": "string-width",
-			"version": "4.2.3",
-			"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-			"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"emoji-regex": "^8.0.0",
-				"is-fullwidth-code-point": "^3.0.0",
-				"strip-ansi": "^6.0.1"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/string-width-cjs/node_modules/emoji-regex": {
-			"version": "8.0.0",
-			"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-			"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/string-width/node_modules/ansi-regex": {
-			"version": "6.0.1",
-			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
-			"integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=12"
-			},
-			"funding": {
-				"url": "https://github.com/chalk/ansi-regex?sponsor=1"
-			}
-		},
-		"node_modules/string-width/node_modules/strip-ansi": {
-			"version": "7.1.0",
-			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
-			"integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"ansi-regex": "^6.0.1"
-			},
-			"engines": {
-				"node": ">=12"
-			},
-			"funding": {
-				"url": "https://github.com/chalk/strip-ansi?sponsor=1"
-			}
-		},
-		"node_modules/strip-ansi": {
-			"version": "6.0.1",
-			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-			"integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"ansi-regex": "^5.0.1"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/strip-ansi-cjs": {
-			"name": "strip-ansi",
-			"version": "6.0.1",
-			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-			"integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"ansi-regex": "^5.0.1"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/strip-bom": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-			"integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=4"
-			}
-		},
-		"node_modules/strip-json-comments": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-			"integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=8"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/supports-color": {
-			"version": "7.2.0",
-			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-			"dev": true,
-			"dependencies": {
-				"has-flag": "^4.0.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/supports-preserve-symlinks-flag": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
-			"integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">= 0.4"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/ljharb"
-			}
-		},
-		"node_modules/symbol-tree": {
-			"version": "3.2.4",
-			"resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
-			"integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/tapable": {
-			"version": "2.2.1",
-			"resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
-			"integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=6"
-			}
-		},
-		"node_modules/teamcity-service-messages": {
-			"version": "0.1.14",
-			"resolved": "https://registry.npmjs.org/teamcity-service-messages/-/teamcity-service-messages-0.1.14.tgz",
-			"integrity": "sha512-29aQwaHqm8RMX74u2o/h1KbMLP89FjNiMxD9wbF2BbWOnbM+q+d1sCEC+MqCc4QW3NJykn77OMpTFw/xTHIc0w==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/test-exclude": {
-			"version": "7.0.1",
-			"resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-7.0.1.tgz",
-			"integrity": "sha512-pFYqmTw68LXVjeWJMST4+borgQP2AyMNbg1BpZh9LbyhUeNkeaPF9gzfPGUAnSMV3qPYdWUwDIjjCLiSDOl7vg==",
-			"dev": true,
-			"license": "ISC",
-			"dependencies": {
-				"@istanbuljs/schema": "^0.1.2",
-				"glob": "^10.4.1",
-				"minimatch": "^9.0.4"
-			},
-			"engines": {
-				"node": ">=18"
-			}
-		},
-		"node_modules/test-exclude/node_modules/glob": {
-			"version": "10.4.5",
-			"resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
-			"integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
-			"dev": true,
-			"license": "ISC",
-			"dependencies": {
-				"foreground-child": "^3.1.0",
-				"jackspeak": "^3.1.2",
-				"minimatch": "^9.0.4",
-				"minipass": "^7.1.2",
-				"package-json-from-dist": "^1.0.0",
-				"path-scurry": "^1.11.1"
-			},
-			"bin": {
-				"glob": "dist/esm/bin.mjs"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/isaacs"
-			}
-		},
-		"node_modules/text-table": {
-			"version": "0.2.0",
-			"resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-			"integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/tinybench": {
-			"version": "2.9.0",
-			"resolved": "https://registry.npmjs.org/tinybench/-/tinybench-2.9.0.tgz",
-			"integrity": "sha512-0+DUvqWMValLmha6lr4kD8iAMK1HzV0/aKnCtWb9v9641TnP/MFb7Pc2bxoxQjTXAErryXVgUOfv2YqNllqGeg==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/tinyexec": {
-			"version": "0.3.2",
-			"resolved": "https://registry.npmjs.org/tinyexec/-/tinyexec-0.3.2.tgz",
-			"integrity": "sha512-KQQR9yN7R5+OSwaK0XQoj22pwHoTlgYqmUscPYoknOoWCWfj/5/ABTMRi69FrKU5ffPVh5QcFikpWJI/P1ocHA==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/tinypool": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/tinypool/-/tinypool-1.0.2.tgz",
-			"integrity": "sha512-al6n+QEANGFOMf/dmUMsuS5/r9B06uwlyNjZZql/zv8J7ybHCgoihBNORZCY2mzUuAnomQa2JdhyHKzZxPCrFA==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": "^18.0.0 || >=20.0.0"
-			}
-		},
-		"node_modules/tinyrainbow": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/tinyrainbow/-/tinyrainbow-1.2.0.tgz",
-			"integrity": "sha512-weEDEq7Z5eTHPDh4xjX789+fHfF+P8boiFB+0vbWzpbnbsEr/GRaohi/uMKxg8RZMXnl1ItAi/IUHWMsjDV7kQ==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=14.0.0"
-			}
-		},
-		"node_modules/tinyspy": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/tinyspy/-/tinyspy-3.0.2.tgz",
-			"integrity": "sha512-n1cw8k1k0x4pgA2+9XrOkFydTerNcJ1zWCO5Nn9scWHTD+5tp8dghT2x1uduQePZTZgd3Tupf+x9BxJjeJi77Q==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=14.0.0"
-			}
-		},
-		"node_modules/tmp": {
-			"version": "0.0.33",
-			"resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
-			"integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"os-tmpdir": "~1.0.2"
-			},
-			"engines": {
-				"node": ">=0.6.0"
-			}
-		},
-		"node_modules/to-regex-range": {
-			"version": "5.0.1",
-			"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-			"integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"is-number": "^7.0.0"
-			},
-			"engines": {
-				"node": ">=8.0"
-			}
-		},
-		"node_modules/tough-cookie": {
-			"version": "4.1.4",
-			"resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.4.tgz",
-			"integrity": "sha512-Loo5UUvLD9ScZ6jh8beX1T6sO1w2/MpCRpEP7V280GKMVUQ0Jzar2U3UJPsrdbziLEMMhu3Ujnq//rhiFuIeag==",
-			"dev": true,
-			"license": "BSD-3-Clause",
-			"dependencies": {
-				"psl": "^1.1.33",
-				"punycode": "^2.1.1",
-				"universalify": "^0.2.0",
-				"url-parse": "^1.5.3"
-			},
-			"engines": {
-				"node": ">=6"
-			}
-		},
-		"node_modules/tr46": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/tr46/-/tr46-5.0.0.tgz",
-			"integrity": "sha512-tk2G5R2KRwBd+ZN0zaEXpmzdKyOYksXwywulIX95MBODjSzMIuQnQ3m8JxgbhnL1LeVo7lqQKsYa1O3Htl7K5g==",
-			"dev": true,
-			"dependencies": {
-				"punycode": "^2.3.1"
-			},
-			"engines": {
-				"node": ">=18"
-			}
-		},
-		"node_modules/ts-api-utils": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.3.0.tgz",
-			"integrity": "sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=16"
-			},
-			"peerDependencies": {
-				"typescript": ">=4.2.0"
-			}
-		},
-		"node_modules/tsconfck": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/tsconfck/-/tsconfck-3.1.1.tgz",
-			"integrity": "sha512-00eoI6WY57SvZEVjm13stEVE90VkEdJAFGgpFLTsZbJyW/LwFQ7uQxJHWpZ2hzSWgCPKc9AnBnNP+0X7o3hAmQ==",
-			"dev": true,
-			"license": "MIT",
-			"bin": {
-				"tsconfck": "bin/tsconfck.js"
-			},
-			"engines": {
-				"node": "^18 || >=20"
-			},
-			"peerDependencies": {
-				"typescript": "^5.0.0"
-			},
-			"peerDependenciesMeta": {
-				"typescript": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/tsconfig-paths-webpack-plugin": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/tsconfig-paths-webpack-plugin/-/tsconfig-paths-webpack-plugin-4.1.0.tgz",
-			"integrity": "sha512-xWFISjviPydmtmgeUAuXp4N1fky+VCtfhOkDUFIv5ea7p4wuTomI4QTrXvFBX2S4jZsmyTSrStQl+E+4w+RzxA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"chalk": "^4.1.0",
-				"enhanced-resolve": "^5.7.0",
-				"tsconfig-paths": "^4.1.2"
-			},
-			"engines": {
-				"node": ">=10.13.0"
-			}
-		},
-		"node_modules/tsconfig-paths-webpack-plugin/node_modules/tsconfig-paths": {
-			"version": "4.2.0",
-			"resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-4.2.0.tgz",
-			"integrity": "sha512-NoZ4roiN7LnbKn9QqE1amc9DJfzvZXxF4xDavcOWt1BPkdx+m+0gJuPM+S0vCe7zTJMYUP0R8pO2XMr+Y8oLIg==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"json5": "^2.2.2",
-				"minimist": "^1.2.6",
-				"strip-bom": "^3.0.0"
-			},
-			"engines": {
-				"node": ">=6"
-			}
-		},
-		"node_modules/tslib": {
-			"version": "2.7.0",
-			"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
-			"integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
-			"dev": true,
-			"license": "0BSD"
-		},
-		"node_modules/type-check": {
-			"version": "0.4.0",
-			"resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
-			"integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"prelude-ls": "^1.2.1"
-			},
-			"engines": {
-				"node": ">= 0.8.0"
-			}
-		},
-		"node_modules/type-fest": {
-			"version": "0.21.3",
-			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
-			"integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
-			"dev": true,
-			"license": "(MIT OR CC0-1.0)",
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/typedoc": {
-			"version": "0.26.5",
-			"resolved": "https://registry.npmjs.org/typedoc/-/typedoc-0.26.5.tgz",
-			"integrity": "sha512-Vn9YKdjKtDZqSk+by7beZ+xzkkr8T8CYoiasqyt4TTRFy5+UHzL/mF/o4wGBjRF+rlWQHDb0t6xCpA3JNL5phg==",
-			"dev": true,
-			"dependencies": {
-				"lunr": "^2.3.9",
-				"markdown-it": "^14.1.0",
-				"minimatch": "^9.0.5",
-				"shiki": "^1.9.1",
-				"yaml": "^2.4.5"
-			},
-			"bin": {
-				"typedoc": "bin/typedoc"
-			},
-			"engines": {
-				"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 || 5.5.x"
-			}
-		},
-		"node_modules/typescript": {
-			"version": "5.5.4",
-			"resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.4.tgz",
-			"integrity": "sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==",
-			"dev": true,
-			"bin": {
-				"tsc": "bin/tsc",
-				"tsserver": "bin/tsserver"
-			},
-			"engines": {
-				"node": ">=14.17"
-			}
-		},
-		"node_modules/typescript-eslint": {
-			"version": "8.0.0-alpha.58",
-			"resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.0.0-alpha.58.tgz",
-			"integrity": "sha512-0mvrodNhExpkWns+5RaZP8YqsAfPyjmPVVM1p+kaJkvApMH58/VFcQ0iSQuun0bFRNCMvW0ZUdulS9AsHqVXkg==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@typescript-eslint/eslint-plugin": "8.0.0-alpha.58",
-				"@typescript-eslint/parser": "8.0.0-alpha.58",
-				"@typescript-eslint/utils": "8.0.0-alpha.58"
-			},
-			"engines": {
-				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/typescript-eslint"
-			},
-			"peerDependenciesMeta": {
-				"typescript": {
-					"optional": true
-				}
-			}
-		},
-		"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
-		},
-		"node_modules/undici-types": {
-			"version": "5.26.5",
-			"resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
-			"integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/universalify": {
-			"version": "0.2.0",
-			"resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz",
-			"integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">= 4.0.0"
-			}
-		},
-		"node_modules/update-browserslist-db": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.0.tgz",
-			"integrity": "sha512-EdRAaAyk2cUE1wOf2DkEhzxqOQvFOoRJFNS6NeyJ01Gp2beMRpBAINjM2iDXE3KCuKhwnvHIQCJm6ThL2Z+HzQ==",
-			"dev": true,
-			"funding": [
-				{
-					"type": "opencollective",
-					"url": "https://opencollective.com/browserslist"
-				},
-				{
-					"type": "tidelift",
-					"url": "https://tidelift.com/funding/github/npm/browserslist"
-				},
-				{
-					"type": "github",
-					"url": "https://github.com/sponsors/ai"
-				}
-			],
-			"license": "MIT",
-			"dependencies": {
-				"escalade": "^3.1.2",
-				"picocolors": "^1.0.1"
-			},
-			"bin": {
-				"update-browserslist-db": "cli.js"
-			},
-			"peerDependencies": {
-				"browserslist": ">= 4.21.0"
-			}
-		},
-		"node_modules/uri-js": {
-			"version": "4.4.1",
-			"resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
-			"integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
-			"dev": true,
-			"dependencies": {
-				"punycode": "^2.1.0"
-			}
-		},
-		"node_modules/url-parse": {
-			"version": "1.5.10",
-			"resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
-			"integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"querystringify": "^2.1.1",
-				"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.14",
-			"resolved": "https://registry.npmjs.org/vite/-/vite-5.4.14.tgz",
-			"integrity": "sha512-EK5cY7Q1D8JNhSaPKVK4pwBFvaTmZxEnoKXLG/U9gmdDcihQGNzFlgIvaxezFR4glP1LsuiedwMBqCXH3wZccA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"esbuild": "^0.21.3",
-				"postcss": "^8.4.43",
-				"rollup": "^4.20.0"
-			},
-			"bin": {
-				"vite": "bin/vite.js"
-			},
-			"engines": {
-				"node": "^18.0.0 || >=20.0.0"
-			},
-			"funding": {
-				"url": "https://github.com/vitejs/vite?sponsor=1"
-			},
-			"optionalDependencies": {
-				"fsevents": "~2.3.3"
-			},
-			"peerDependencies": {
-				"@types/node": "^18.0.0 || >=20.0.0",
-				"less": "*",
-				"lightningcss": "^1.21.0",
-				"sass": "*",
-				"sass-embedded": "*",
-				"stylus": "*",
-				"sugarss": "*",
-				"terser": "^5.4.0"
-			},
-			"peerDependenciesMeta": {
-				"@types/node": {
-					"optional": true
-				},
-				"less": {
-					"optional": true
-				},
-				"lightningcss": {
-					"optional": true
-				},
-				"sass": {
-					"optional": true
-				},
-				"sass-embedded": {
-					"optional": true
-				},
-				"stylus": {
-					"optional": true
-				},
-				"sugarss": {
-					"optional": true
-				},
-				"terser": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/vite-node": {
-			"version": "2.1.9",
-			"resolved": "https://registry.npmjs.org/vite-node/-/vite-node-2.1.9.tgz",
-			"integrity": "sha512-AM9aQ/IPrW/6ENLQg3AGY4K1N2TGZdR5e4gu/MmmR2xR3Ll1+dib+nook92g4TV3PXVyeyxdWwtaCAiUL0hMxA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"cac": "^6.7.14",
-				"debug": "^4.3.7",
-				"es-module-lexer": "^1.5.4",
-				"pathe": "^1.1.2",
-				"vite": "^5.0.0"
-			},
-			"bin": {
-				"vite-node": "vite-node.mjs"
-			},
-			"engines": {
-				"node": "^18.0.0 || >=20.0.0"
-			},
-			"funding": {
-				"url": "https://opencollective.com/vitest"
-			}
-		},
-		"node_modules/vite-tsconfig-paths": {
-			"version": "4.3.2",
-			"resolved": "https://registry.npmjs.org/vite-tsconfig-paths/-/vite-tsconfig-paths-4.3.2.tgz",
-			"integrity": "sha512-0Vd/a6po6Q+86rPlntHye7F31zA2URZMbH8M3saAZ/xR9QoGN/L21bxEGfXdWmFdNkqPpRdxFT7nmNe12e9/uA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"debug": "^4.1.1",
-				"globrex": "^0.1.2",
-				"tsconfck": "^3.0.3"
-			},
-			"peerDependencies": {
-				"vite": "*"
-			},
-			"peerDependenciesMeta": {
-				"vite": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/vitest": {
-			"version": "2.1.9",
-			"resolved": "https://registry.npmjs.org/vitest/-/vitest-2.1.9.tgz",
-			"integrity": "sha512-MSmPM9REYqDGBI8439mA4mWhV5sKmDlBKWIYbA3lRb2PTHACE0mgKwA8yQ2xq9vxDTuk4iPrECBAEW2aoFXY0Q==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@vitest/expect": "2.1.9",
-				"@vitest/mocker": "2.1.9",
-				"@vitest/pretty-format": "^2.1.9",
-				"@vitest/runner": "2.1.9",
-				"@vitest/snapshot": "2.1.9",
-				"@vitest/spy": "2.1.9",
-				"@vitest/utils": "2.1.9",
-				"chai": "^5.1.2",
-				"debug": "^4.3.7",
-				"expect-type": "^1.1.0",
-				"magic-string": "^0.30.12",
-				"pathe": "^1.1.2",
-				"std-env": "^3.8.0",
-				"tinybench": "^2.9.0",
-				"tinyexec": "^0.3.1",
-				"tinypool": "^1.0.1",
-				"tinyrainbow": "^1.2.0",
-				"vite": "^5.0.0",
-				"vite-node": "2.1.9",
-				"why-is-node-running": "^2.3.0"
-			},
-			"bin": {
-				"vitest": "vitest.mjs"
-			},
-			"engines": {
-				"node": "^18.0.0 || >=20.0.0"
-			},
-			"funding": {
-				"url": "https://opencollective.com/vitest"
-			},
-			"peerDependencies": {
-				"@edge-runtime/vm": "*",
-				"@types/node": "^18.0.0 || >=20.0.0",
-				"@vitest/browser": "2.1.9",
-				"@vitest/ui": "2.1.9",
-				"happy-dom": "*",
-				"jsdom": "*"
-			},
-			"peerDependenciesMeta": {
-				"@edge-runtime/vm": {
-					"optional": true
-				},
-				"@types/node": {
-					"optional": true
-				},
-				"@vitest/browser": {
-					"optional": true
-				},
-				"@vitest/ui": {
-					"optional": true
-				},
-				"happy-dom": {
-					"optional": true
-				},
-				"jsdom": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/vitest-canvas-mock": {
-			"version": "0.3.3",
-			"resolved": "https://registry.npmjs.org/vitest-canvas-mock/-/vitest-canvas-mock-0.3.3.tgz",
-			"integrity": "sha512-3P968tYBpqYyzzOaVtqnmYjqbe13576/fkjbDEJSfQAkHtC5/UjuRHOhFEN/ZV5HVZIkaROBUWgazDKJ+Ibw+Q==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"jest-canvas-mock": "~2.5.2"
-			},
-			"peerDependencies": {
-				"vitest": "*"
-			}
-		},
-		"node_modules/w3c-xmlserializer": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-5.0.0.tgz",
-			"integrity": "sha512-o8qghlI8NZHU1lLPrpi2+Uq7abh4GGPpYANlalzWxyWteJOCsr/P+oPBA49TOLu5FTZO4d3F9MnWJfiMo4BkmA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"xml-name-validator": "^5.0.0"
-			},
-			"engines": {
-				"node": ">=18"
-			}
-		},
-		"node_modules/watskeburt": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/watskeburt/-/watskeburt-4.1.0.tgz",
-			"integrity": "sha512-KkY5H51ajqy9HYYI+u9SIURcWnqeVVhdH0I+ab6aXPGHfZYxgRCwnR6Lm3+TYB6jJVt5jFqw4GAKmwf1zHmGQw==",
-			"dev": true,
-			"bin": {
-				"watskeburt": "dist/run-cli.js"
-			},
-			"engines": {
-				"node": "^18||>=20"
-			}
-		},
-		"node_modules/webfontloader": {
-			"version": "1.6.28",
-			"resolved": "https://registry.npmjs.org/webfontloader/-/webfontloader-1.6.28.tgz",
-			"integrity": "sha512-Egb0oFEga6f+nSgasH3E0M405Pzn6y3/9tOVanv/DLfa1YBIgcv90L18YyWnvXkRbIM17v5Kv6IT2N6g1x5tvQ==",
-			"license": "Apache-2.0"
-		},
-		"node_modules/webidl-conversions": {
-			"version": "7.0.0",
-			"resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz",
-			"integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==",
-			"dev": true,
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/whatwg-encoding": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-3.1.1.tgz",
-			"integrity": "sha512-6qN4hJdMwfYBtE3YBTTHhoeuUrDBPZmbQaxWAqSALV/MeEnR5z1xd8UKud2RAkFoPkmB+hli1TZSnyi84xz1vQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"iconv-lite": "0.6.3"
-			},
-			"engines": {
-				"node": ">=18"
-			}
-		},
-		"node_modules/whatwg-encoding/node_modules/iconv-lite": {
-			"version": "0.6.3",
-			"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
-			"integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
-			"dev": true,
-			"dependencies": {
-				"safer-buffer": ">= 2.1.2 < 3.0.0"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/whatwg-mimetype": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-4.0.0.tgz",
-			"integrity": "sha512-QaKxh0eNIi2mE9p2vEdzfagOKHCcj1pJ56EEHGQOVxp8r9/iszLUUV7v89x9O1p/T+NlTM5W7jW6+cz4Fq1YVg==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=18"
-			}
-		},
-		"node_modules/whatwg-url": {
-			"version": "14.0.0",
-			"resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-14.0.0.tgz",
-			"integrity": "sha512-1lfMEm2IEr7RIV+f4lUNPOqfFL+pO+Xw3fJSqmjX9AbXcXcYOkCe1P6+9VBZB6n94af16NfZf+sSk0JCBZC9aw==",
-			"dev": true,
-			"dependencies": {
-				"tr46": "^5.0.0",
-				"webidl-conversions": "^7.0.0"
-			},
-			"engines": {
-				"node": ">=18"
-			}
-		},
-		"node_modules/which": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-			"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-			"dev": true,
-			"license": "ISC",
-			"dependencies": {
-				"isexe": "^2.0.0"
-			},
-			"bin": {
-				"node-which": "bin/node-which"
-			},
-			"engines": {
-				"node": ">= 8"
-			}
-		},
-		"node_modules/why-is-node-running": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/why-is-node-running/-/why-is-node-running-2.3.0.tgz",
-			"integrity": "sha512-hUrmaWBdVDcxvYqnyh09zunKzROWjbZTiNy8dBEjkS7ehEDQibXJ7XvlmtbwuTclUiIyN+CyXQD4Vmko8fNm8w==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"siginfo": "^2.0.0",
-				"stackback": "0.0.2"
-			},
-			"bin": {
-				"why-is-node-running": "cli.js"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/word-wrap": {
-			"version": "1.2.5",
-			"resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz",
-			"integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/wrap-ansi": {
-			"version": "8.1.0",
-			"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz",
-			"integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"ansi-styles": "^6.1.0",
-				"string-width": "^5.0.1",
-				"strip-ansi": "^7.0.1"
-			},
-			"engines": {
-				"node": ">=12"
-			},
-			"funding": {
-				"url": "https://github.com/chalk/wrap-ansi?sponsor=1"
-			}
-		},
-		"node_modules/wrap-ansi-cjs": {
-			"name": "wrap-ansi",
-			"version": "7.0.0",
-			"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-			"integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"ansi-styles": "^4.0.0",
-				"string-width": "^4.1.0",
-				"strip-ansi": "^6.0.0"
-			},
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/chalk/wrap-ansi?sponsor=1"
-			}
-		},
-		"node_modules/wrap-ansi-cjs/node_modules/emoji-regex": {
-			"version": "8.0.0",
-			"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-			"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/wrap-ansi-cjs/node_modules/string-width": {
-			"version": "4.2.3",
-			"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-			"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"emoji-regex": "^8.0.0",
-				"is-fullwidth-code-point": "^3.0.0",
-				"strip-ansi": "^6.0.1"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/wrap-ansi/node_modules/ansi-regex": {
-			"version": "6.0.1",
-			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
-			"integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=12"
-			},
-			"funding": {
-				"url": "https://github.com/chalk/ansi-regex?sponsor=1"
-			}
-		},
-		"node_modules/wrap-ansi/node_modules/ansi-styles": {
-			"version": "6.2.1",
-			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
-			"integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=12"
-			},
-			"funding": {
-				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
-			}
-		},
-		"node_modules/wrap-ansi/node_modules/strip-ansi": {
-			"version": "7.1.0",
-			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
-			"integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"ansi-regex": "^6.0.1"
-			},
-			"engines": {
-				"node": ">=12"
-			},
-			"funding": {
-				"url": "https://github.com/chalk/strip-ansi?sponsor=1"
-			}
-		},
-		"node_modules/ws": {
-			"version": "8.18.0",
-			"resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz",
-			"integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=10.0.0"
-			},
-			"peerDependencies": {
-				"bufferutil": "^4.0.1",
-				"utf-8-validate": ">=5.0.2"
-			},
-			"peerDependenciesMeta": {
-				"bufferutil": {
-					"optional": true
-				},
-				"utf-8-validate": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/xml-name-validator": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-5.0.0.tgz",
-			"integrity": "sha512-EvGK8EJ3DhaHfbRlETOWAS5pO9MZITeauHKJyb8wyajUfQUenkIg2MvLDTZ4T/TgIcm3HU0TFBgWWboAZ30UHg==",
-			"dev": true,
-			"license": "Apache-2.0",
-			"engines": {
-				"node": ">=18"
-			}
-		},
-		"node_modules/xmlchars": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
-			"integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/y18n": {
-			"version": "5.0.8",
-			"resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
-			"integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
-			"dev": true,
-			"license": "ISC",
-			"engines": {
-				"node": ">=10"
-			}
-		},
-		"node_modules/yallist": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
-			"integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
-			"dev": true,
-			"license": "ISC"
-		},
-		"node_modules/yaml": {
-			"version": "2.5.0",
-			"resolved": "https://registry.npmjs.org/yaml/-/yaml-2.5.0.tgz",
-			"integrity": "sha512-2wWLbGbYDiSqqIKoPjar3MPgB94ErzCtrNE1FdqGuaO0pi2JGjmE8aW8TDZwzU7vuxcGRdL/4gPQwQ7hD5AMSw==",
-			"dev": true,
-			"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",
-			"integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"cliui": "^8.0.1",
-				"escalade": "^3.1.1",
-				"get-caller-file": "^2.0.5",
-				"require-directory": "^2.1.1",
-				"string-width": "^4.2.3",
-				"y18n": "^5.0.5",
-				"yargs-parser": "^21.1.1"
-			},
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/yargs-parser": {
-			"version": "21.1.1",
-			"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
-			"integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
-			"dev": true,
-			"license": "ISC",
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/yargs/node_modules/emoji-regex": {
-			"version": "8.0.0",
-			"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-			"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/yargs/node_modules/string-width": {
-			"version": "4.2.3",
-			"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-			"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"emoji-regex": "^8.0.0",
-				"is-fullwidth-code-point": "^3.0.0",
-				"strip-ansi": "^6.0.1"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/yocto-queue": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
-			"integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/yoctocolors-cjs": {
-			"version": "2.1.2",
-			"resolved": "https://registry.npmjs.org/yoctocolors-cjs/-/yoctocolors-cjs-2.1.2.tgz",
-			"integrity": "sha512-cYVsTjKl8b+FrnidjibDWskAv7UKOfcwaVZdp/it9n1s9fU3IkgDbhdIRKCW4JDsAlECJY0ytoVPT3sK6kideA==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=18"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		}
-	}
+  "name": "pokemon-rogue-battle",
+  "version": "1.9.4",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "pokemon-rogue-battle",
+      "version": "1.9.4",
+      "hasInstallScript": true,
+      "dependencies": {
+        "@material/material-color-utilities": "^0.2.7",
+        "compare-versions": "^6.1.1",
+        "crypto-js": "^4.2.0",
+        "i18next": "^24.2.2",
+        "i18next-browser-languagedetector": "^8.0.4",
+        "i18next-http-backend": "^3.0.2",
+        "i18next-korean-postposition-processor": "^1.0.0",
+        "json-stable-stringify": "^1.2.0",
+        "jszip": "^3.10.1",
+        "phaser": "^3.88.2",
+        "phaser3-rex-plugins": "^1.80.15"
+      },
+      "devDependencies": {
+        "@biomejs/biome": "1.9.4",
+        "@eslint/js": "^9.23.0",
+        "@hpcc-js/wasm": "^2.22.4",
+        "@stylistic/eslint-plugin-ts": "^4.1.0",
+        "@types/jsdom": "^21.1.7",
+        "@types/node": "^22.13.14",
+        "@typescript-eslint/eslint-plugin": "^8.28.0",
+        "@typescript-eslint/parser": "^8.28.0",
+        "@vitest/coverage-istanbul": "^3.0.9",
+        "dependency-cruiser": "^16.3.10",
+        "eslint": "^9.23.0",
+        "eslint-plugin-import-x": "^4.9.4",
+        "inquirer": "^12.4.2",
+        "jsdom": "^26.0.0",
+        "lefthook": "^1.11.5",
+        "msw": "^2.7.3",
+        "phaser3spectorjs": "^0.0.8",
+        "rollup": "^4.40.1",
+        "typedoc": "^0.28.1",
+        "typescript": "^5.8.2",
+        "typescript-eslint": "^8.28.0",
+        "vite": "^6.3.4",
+        "vite-tsconfig-paths": "^5.1.4",
+        "vitest": "^3.0.9",
+        "vitest-canvas-mock": "^0.3.3"
+      },
+      "engines": {
+        "node": ">=22.0.0"
+      }
+    },
+    "node_modules/@ampproject/remapping": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz",
+      "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@jridgewell/gen-mapping": "^0.3.5",
+        "@jridgewell/trace-mapping": "^0.3.24"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@asamuzakjp/css-color": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@asamuzakjp/css-color/-/css-color-3.1.1.tgz",
+      "integrity": "sha512-hpRD68SV2OMcZCsrbdkccTw5FXjNDLo5OuqSHyHZfwweGsDWZwDJ2+gONyNAbazZclobMirACLw0lk8WVxIqxA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@csstools/css-calc": "^2.1.2",
+        "@csstools/css-color-parser": "^3.0.8",
+        "@csstools/css-parser-algorithms": "^3.0.4",
+        "@csstools/css-tokenizer": "^3.0.3",
+        "lru-cache": "^10.4.3"
+      }
+    },
+    "node_modules/@asamuzakjp/css-color/node_modules/lru-cache": {
+      "version": "10.4.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
+      "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/@babel/code-frame": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.7.tgz",
+      "integrity": "sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/highlight": "^7.24.7",
+        "picocolors": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/compat-data": {
+      "version": "7.24.9",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.24.9.tgz",
+      "integrity": "sha512-e701mcfApCJqMMueQI0Fb68Amflj83+dvAvHawoBpAz+GDjCIyGHzNwnefjsWJ3xiYAqqiQFoWbspGYBdb2/ng==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/core": {
+      "version": "7.24.9",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.24.9.tgz",
+      "integrity": "sha512-5e3FI4Q3M3Pbr21+5xJwCv6ZT6KmGkI0vw3Tozy5ODAQFTIWe37iT8Cr7Ice2Ntb+M3iSKCEWMB1MBgKrW3whg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@ampproject/remapping": "^2.2.0",
+        "@babel/code-frame": "^7.24.7",
+        "@babel/generator": "^7.24.9",
+        "@babel/helper-compilation-targets": "^7.24.8",
+        "@babel/helper-module-transforms": "^7.24.9",
+        "@babel/helpers": "^7.24.8",
+        "@babel/parser": "^7.24.8",
+        "@babel/template": "^7.24.7",
+        "@babel/traverse": "^7.24.8",
+        "@babel/types": "^7.24.9",
+        "convert-source-map": "^2.0.0",
+        "debug": "^4.1.0",
+        "gensync": "^1.0.0-beta.2",
+        "json5": "^2.2.3",
+        "semver": "^6.3.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/babel"
+      }
+    },
+    "node_modules/@babel/core/node_modules/semver": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/@babel/generator": {
+      "version": "7.24.10",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.24.10.tgz",
+      "integrity": "sha512-o9HBZL1G2129luEUlG1hB4N/nlYNWHnpwlND9eOMclRqqu1YDy2sSYVCFUZwl8I1Gxh+QSRrP2vD7EpUmFVXxg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/types": "^7.24.9",
+        "@jridgewell/gen-mapping": "^0.3.5",
+        "@jridgewell/trace-mapping": "^0.3.25",
+        "jsesc": "^2.5.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-compilation-targets": {
+      "version": "7.24.8",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.24.8.tgz",
+      "integrity": "sha512-oU+UoqCHdp+nWVDkpldqIQL/i/bvAv53tRqLG/s+cOXxe66zOYLU7ar/Xs3LdmBihrUMEUhwu6dMZwbNOYDwvw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/compat-data": "^7.24.8",
+        "@babel/helper-validator-option": "^7.24.8",
+        "browserslist": "^4.23.1",
+        "lru-cache": "^5.1.1",
+        "semver": "^6.3.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-compilation-targets/node_modules/semver": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/@babel/helper-environment-visitor": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.24.7.tgz",
+      "integrity": "sha512-DoiN84+4Gnd0ncbBOM9AZENV4a5ZiL39HYMyZJGZ/AZEykHYdJw0wW3kdcsh9/Kn+BRXHLkkklZ51ecPKmI1CQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.24.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-function-name": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.24.7.tgz",
+      "integrity": "sha512-FyoJTsj/PEUWu1/TYRiXTIHc8lbw+TDYkZuoE43opPS5TrI7MyONBE1oNvfguEXAD9yhQRrVBnXdXzSLQl9XnA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/template": "^7.24.7",
+        "@babel/types": "^7.24.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-hoist-variables": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.24.7.tgz",
+      "integrity": "sha512-MJJwhkoGy5c4ehfoRyrJ/owKeMl19U54h27YYftT0o2teQ3FJ3nQUf/I3LlJsX4l3qlw7WRXUmiyajvHXoTubQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.24.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-module-imports": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.24.7.tgz",
+      "integrity": "sha512-8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/traverse": "^7.24.7",
+        "@babel/types": "^7.24.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-module-transforms": {
+      "version": "7.24.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.24.9.tgz",
+      "integrity": "sha512-oYbh+rtFKj/HwBQkFlUzvcybzklmVdVV3UU+mN7n2t/q3yGHbuVdNxyFvSBO1tfvjyArpHNcWMAzsSPdyI46hw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-environment-visitor": "^7.24.7",
+        "@babel/helper-module-imports": "^7.24.7",
+        "@babel/helper-simple-access": "^7.24.7",
+        "@babel/helper-split-export-declaration": "^7.24.7",
+        "@babel/helper-validator-identifier": "^7.24.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/helper-simple-access": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.24.7.tgz",
+      "integrity": "sha512-zBAIvbCMh5Ts+b86r/CjU+4XGYIs+R1j951gxI3KmmxBMhCg4oQMsv6ZXQ64XOm/cvzfU1FmoCyt6+owc5QMYg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/traverse": "^7.24.7",
+        "@babel/types": "^7.24.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-split-export-declaration": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.24.7.tgz",
+      "integrity": "sha512-oy5V7pD+UvfkEATUKvIjvIAH/xCzfsFVw7ygW2SI6NClZzquT+mwdTfgfdbUiceh6iQO0CHtCPsyze/MZ2YbAA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.24.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-string-parser": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz",
+      "integrity": "sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-validator-identifier": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz",
+      "integrity": "sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-validator-option": {
+      "version": "7.24.8",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.24.8.tgz",
+      "integrity": "sha512-xb8t9tD1MHLungh/AIoWYN+gVHaB9kwlu8gffXGSt3FFEIT7RjS+xWbc2vUD1UTZdIpKj/ab3rdqJ7ufngyi2Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helpers": {
+      "version": "7.24.8",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.24.8.tgz",
+      "integrity": "sha512-gV2265Nkcz7weJJfvDoAEVzC1e2OTDpkGbEsebse8koXUJUXPsCMi7sRo/+SPMuMZ9MtUPnGwITTnQnU5YjyaQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/template": "^7.24.7",
+        "@babel/types": "^7.24.8"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/highlight": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.7.tgz",
+      "integrity": "sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-validator-identifier": "^7.24.7",
+        "chalk": "^2.4.2",
+        "js-tokens": "^4.0.0",
+        "picocolors": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@babel/highlight/node_modules/escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/parser": {
+      "version": "7.26.8",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.8.tgz",
+      "integrity": "sha512-TZIQ25pkSoaKEYYaHbbxkfL36GNsQ6iFiBbeuzAkLnXayKR1yP1zFe+NxuZWWsUyvt8icPU9CCq0sgWGXR1GEw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/types": "^7.26.8"
+      },
+      "bin": {
+        "parser": "bin/babel-parser.js"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@babel/runtime": {
+      "version": "7.27.0",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.27.0.tgz",
+      "integrity": "sha512-VtPOkrdPHZsKc/clNqyi9WUA8TINkZ4cGk63UUE3u4pmB2k+ZMQRDuIOagv8UVd6j7k0T3+RRIb7beKTebNbcw==",
+      "license": "MIT",
+      "dependencies": {
+        "regenerator-runtime": "^0.14.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/template": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.24.7.tgz",
+      "integrity": "sha512-jYqfPrU9JTF0PmPy1tLYHW4Mp4KlgxJD9l2nP9fD6yT/ICi554DmrWBAEYpIelzjHf1msDP3PxJIRt/nFNfBig==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/code-frame": "^7.24.7",
+        "@babel/parser": "^7.24.7",
+        "@babel/types": "^7.24.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/traverse": {
+      "version": "7.24.8",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.24.8.tgz",
+      "integrity": "sha512-t0P1xxAPzEDcEPmjprAQq19NWum4K0EQPjMwZQZbHt+GiZqvjCHjj755Weq1YRPVzBI+3zSfvScfpnuIecVFJQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/code-frame": "^7.24.7",
+        "@babel/generator": "^7.24.8",
+        "@babel/helper-environment-visitor": "^7.24.7",
+        "@babel/helper-function-name": "^7.24.7",
+        "@babel/helper-hoist-variables": "^7.24.7",
+        "@babel/helper-split-export-declaration": "^7.24.7",
+        "@babel/parser": "^7.24.8",
+        "@babel/types": "^7.24.8",
+        "debug": "^4.3.1",
+        "globals": "^11.1.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/traverse/node_modules/globals": {
+      "version": "11.12.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/types": {
+      "version": "7.26.8",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.8.tgz",
+      "integrity": "sha512-eUuWapzEGWFEpHFxgEaBG8e3n6S8L3MSu0oda755rOfabWPnh0Our1AozNFVUxGFIhbKgd1ksprsoDGMinTOTA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-string-parser": "^7.25.9",
+        "@babel/helper-validator-identifier": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@biomejs/biome": {
+      "version": "1.9.4",
+      "resolved": "https://registry.npmjs.org/@biomejs/biome/-/biome-1.9.4.tgz",
+      "integrity": "sha512-1rkd7G70+o9KkTn5KLmDYXihGoTaIGO9PIIN2ZB7UJxFrWw04CZHPYiMRjYsaDvVV7hP1dYNRLxSANLaBFGpog==",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "MIT OR Apache-2.0",
+      "bin": {
+        "biome": "bin/biome"
+      },
+      "engines": {
+        "node": ">=14.21.3"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/biome"
+      },
+      "optionalDependencies": {
+        "@biomejs/cli-darwin-arm64": "1.9.4",
+        "@biomejs/cli-darwin-x64": "1.9.4",
+        "@biomejs/cli-linux-arm64": "1.9.4",
+        "@biomejs/cli-linux-arm64-musl": "1.9.4",
+        "@biomejs/cli-linux-x64": "1.9.4",
+        "@biomejs/cli-linux-x64-musl": "1.9.4",
+        "@biomejs/cli-win32-arm64": "1.9.4",
+        "@biomejs/cli-win32-x64": "1.9.4"
+      }
+    },
+    "node_modules/@biomejs/cli-darwin-arm64": {
+      "version": "1.9.4",
+      "resolved": "https://registry.npmjs.org/@biomejs/cli-darwin-arm64/-/cli-darwin-arm64-1.9.4.tgz",
+      "integrity": "sha512-bFBsPWrNvkdKrNCYeAp+xo2HecOGPAy9WyNyB/jKnnedgzl4W4Hb9ZMzYNbf8dMCGmUdSavlYHiR01QaYR58cw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT OR Apache-2.0",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=14.21.3"
+      }
+    },
+    "node_modules/@biomejs/cli-darwin-x64": {
+      "version": "1.9.4",
+      "resolved": "https://registry.npmjs.org/@biomejs/cli-darwin-x64/-/cli-darwin-x64-1.9.4.tgz",
+      "integrity": "sha512-ngYBh/+bEedqkSevPVhLP4QfVPCpb+4BBe2p7Xs32dBgs7rh9nY2AIYUL6BgLw1JVXV8GlpKmb/hNiuIxfPfZg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT OR Apache-2.0",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=14.21.3"
+      }
+    },
+    "node_modules/@biomejs/cli-linux-arm64": {
+      "version": "1.9.4",
+      "resolved": "https://registry.npmjs.org/@biomejs/cli-linux-arm64/-/cli-linux-arm64-1.9.4.tgz",
+      "integrity": "sha512-fJIW0+LYujdjUgJJuwesP4EjIBl/N/TcOX3IvIHJQNsAqvV2CHIogsmA94BPG6jZATS4Hi+xv4SkBBQSt1N4/g==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT OR Apache-2.0",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=14.21.3"
+      }
+    },
+    "node_modules/@biomejs/cli-linux-arm64-musl": {
+      "version": "1.9.4",
+      "resolved": "https://registry.npmjs.org/@biomejs/cli-linux-arm64-musl/-/cli-linux-arm64-musl-1.9.4.tgz",
+      "integrity": "sha512-v665Ct9WCRjGa8+kTr0CzApU0+XXtRgwmzIf1SeKSGAv+2scAlW6JR5PMFo6FzqqZ64Po79cKODKf3/AAmECqA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT OR Apache-2.0",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=14.21.3"
+      }
+    },
+    "node_modules/@biomejs/cli-linux-x64": {
+      "version": "1.9.4",
+      "resolved": "https://registry.npmjs.org/@biomejs/cli-linux-x64/-/cli-linux-x64-1.9.4.tgz",
+      "integrity": "sha512-lRCJv/Vi3Vlwmbd6K+oQ0KhLHMAysN8lXoCI7XeHlxaajk06u7G+UsFSO01NAs5iYuWKmVZjmiOzJ0OJmGsMwg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT OR Apache-2.0",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=14.21.3"
+      }
+    },
+    "node_modules/@biomejs/cli-linux-x64-musl": {
+      "version": "1.9.4",
+      "resolved": "https://registry.npmjs.org/@biomejs/cli-linux-x64-musl/-/cli-linux-x64-musl-1.9.4.tgz",
+      "integrity": "sha512-gEhi/jSBhZ2m6wjV530Yy8+fNqG8PAinM3oV7CyO+6c3CEh16Eizm21uHVsyVBEB6RIM8JHIl6AGYCv6Q6Q9Tg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT OR Apache-2.0",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=14.21.3"
+      }
+    },
+    "node_modules/@biomejs/cli-win32-arm64": {
+      "version": "1.9.4",
+      "resolved": "https://registry.npmjs.org/@biomejs/cli-win32-arm64/-/cli-win32-arm64-1.9.4.tgz",
+      "integrity": "sha512-tlbhLk+WXZmgwoIKwHIHEBZUwxml7bRJgk0X2sPyNR3S93cdRq6XulAZRQJ17FYGGzWne0fgrXBKpl7l4M87Hg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT OR Apache-2.0",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=14.21.3"
+      }
+    },
+    "node_modules/@biomejs/cli-win32-x64": {
+      "version": "1.9.4",
+      "resolved": "https://registry.npmjs.org/@biomejs/cli-win32-x64/-/cli-win32-x64-1.9.4.tgz",
+      "integrity": "sha512-8Y5wMhVIPaWe6jw2H+KlEm4wP/f7EW3810ZLmDlrEEy5KvBsb9ECEfu/kMWD484ijfQ8+nIi0giMgu9g1UAuuA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT OR Apache-2.0",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=14.21.3"
+      }
+    },
+    "node_modules/@bundled-es-modules/cookie": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@bundled-es-modules/cookie/-/cookie-2.0.1.tgz",
+      "integrity": "sha512-8o+5fRPLNbjbdGRRmJj3h6Hh1AQJf2dk3qQ/5ZFb+PXkRNiSoMGGUKlsgLfrxneb72axVJyIYji64E2+nNfYyw==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "cookie": "^0.7.2"
+      }
+    },
+    "node_modules/@bundled-es-modules/statuses": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@bundled-es-modules/statuses/-/statuses-1.0.1.tgz",
+      "integrity": "sha512-yn7BklA5acgcBr+7w064fGV+SGIFySjCKpqjcWgBAIfrAkY+4GQTJJHQMeT3V/sgz23VTEVV8TtOmkvJAhFVfg==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "statuses": "^2.0.1"
+      }
+    },
+    "node_modules/@bundled-es-modules/tough-cookie": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/@bundled-es-modules/tough-cookie/-/tough-cookie-0.1.6.tgz",
+      "integrity": "sha512-dvMHbL464C0zI+Yqxbz6kZ5TOEp7GLW+pry/RWndAR8MJQAXZ2rPmIs8tziTZjeIyhSNZgZbCePtfSbdWqStJw==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "@types/tough-cookie": "^4.0.5",
+        "tough-cookie": "^4.1.4"
+      }
+    },
+    "node_modules/@csstools/color-helpers": {
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/@csstools/color-helpers/-/color-helpers-5.0.2.tgz",
+      "integrity": "sha512-JqWH1vsgdGcw2RR6VliXXdA0/59LttzlU8UlRT/iUUsEeWfYq8I+K0yhihEUTTHLRm1EXvpsCx3083EU15ecsA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT-0",
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@csstools/css-calc": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/@csstools/css-calc/-/css-calc-2.1.2.tgz",
+      "integrity": "sha512-TklMyb3uBB28b5uQdxjReG4L80NxAqgrECqLZFQbyLekwwlcDDS8r3f07DKqeo8C4926Br0gf/ZDe17Zv4wIuw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "@csstools/css-parser-algorithms": "^3.0.4",
+        "@csstools/css-tokenizer": "^3.0.3"
+      }
+    },
+    "node_modules/@csstools/css-color-parser": {
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/@csstools/css-color-parser/-/css-color-parser-3.0.8.tgz",
+      "integrity": "sha512-pdwotQjCCnRPuNi06jFuP68cykU1f3ZWExLe/8MQ1LOs8Xq+fTkYgd+2V8mWUWMrOn9iS2HftPVaMZDaXzGbhQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "@csstools/color-helpers": "^5.0.2",
+        "@csstools/css-calc": "^2.1.2"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "@csstools/css-parser-algorithms": "^3.0.4",
+        "@csstools/css-tokenizer": "^3.0.3"
+      }
+    },
+    "node_modules/@csstools/css-parser-algorithms": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@csstools/css-parser-algorithms/-/css-parser-algorithms-3.0.4.tgz",
+      "integrity": "sha512-Up7rBoV77rv29d3uKHUIVubz1BTcgyUK72IvCQAbfbMv584xHcGKCKbWh7i8hPrRJ7qU4Y8IO3IY9m+iTB7P3A==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "@csstools/css-tokenizer": "^3.0.3"
+      }
+    },
+    "node_modules/@csstools/css-tokenizer": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@csstools/css-tokenizer/-/css-tokenizer-3.0.3.tgz",
+      "integrity": "sha512-UJnjoFsmxfKUdNYdWgOB0mWUypuLvAfQPH1+pyvRJs6euowbFkFC6P13w1l8mJyi3vxYMxc9kld5jZEGRQs6bw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@emnapi/core": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.4.0.tgz",
+      "integrity": "sha512-H+N/FqT07NmLmt6OFFtDfwe8PNygprzBikrEMyQfgqSmT0vzE515Pz7R8izwB9q/zsH/MA64AKoul3sA6/CzVg==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "@emnapi/wasi-threads": "1.0.1",
+        "tslib": "^2.4.0"
+      }
+    },
+    "node_modules/@emnapi/runtime": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.4.0.tgz",
+      "integrity": "sha512-64WYIf4UYcdLnbKn/umDlNjQDSS8AgZrI/R9+x5ilkUVFxXcA1Ebl+gQLc/6mERA4407Xof0R7wEyEuj091CVw==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "tslib": "^2.4.0"
+      }
+    },
+    "node_modules/@emnapi/wasi-threads": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.0.1.tgz",
+      "integrity": "sha512-iIBu7mwkq4UQGeMEM8bLwNK962nXdhodeScX4slfQnRhEMMzvYivHhutCIk8uojvmASXXPC2WNEjwxFWk72Oqw==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "tslib": "^2.4.0"
+      }
+    },
+    "node_modules/@esbuild/aix-ppc64": {
+      "version": "0.25.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.2.tgz",
+      "integrity": "sha512-wCIboOL2yXZym2cgm6mlA742s9QeJ8DjGVaL39dLN4rRwrOgOyYSnOaFPhKZGLb2ngj4EyfAFjsNJwPXZvseag==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "aix"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/android-arm": {
+      "version": "0.25.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.2.tgz",
+      "integrity": "sha512-NQhH7jFstVY5x8CKbcfa166GoV0EFkaPkCKBQkdPJFvo5u+nGXLEH/ooniLb3QI8Fk58YAx7nsPLozUWfCBOJA==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/android-arm64": {
+      "version": "0.25.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.2.tgz",
+      "integrity": "sha512-5ZAX5xOmTligeBaeNEPnPaeEuah53Id2tX4c2CVP3JaROTH+j4fnfHCkr1PjXMd78hMst+TlkfKcW/DlTq0i4w==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/android-x64": {
+      "version": "0.25.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.2.tgz",
+      "integrity": "sha512-Ffcx+nnma8Sge4jzddPHCZVRvIfQ0kMsUsCMcJRHkGJ1cDmhe4SsrYIjLUKn1xpHZybmOqCWwB0zQvsjdEHtkg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/darwin-arm64": {
+      "version": "0.25.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.2.tgz",
+      "integrity": "sha512-MpM6LUVTXAzOvN4KbjzU/q5smzryuoNjlriAIx+06RpecwCkL9JpenNzpKd2YMzLJFOdPqBpuub6eVRP5IgiSA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/darwin-x64": {
+      "version": "0.25.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.2.tgz",
+      "integrity": "sha512-5eRPrTX7wFyuWe8FqEFPG2cU0+butQQVNcT4sVipqjLYQjjh8a8+vUTfgBKM88ObB85ahsnTwF7PSIt6PG+QkA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/freebsd-arm64": {
+      "version": "0.25.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.2.tgz",
+      "integrity": "sha512-mLwm4vXKiQ2UTSX4+ImyiPdiHjiZhIaE9QvC7sw0tZ6HoNMjYAqQpGyui5VRIi5sGd+uWq940gdCbY3VLvsO1w==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/freebsd-x64": {
+      "version": "0.25.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.2.tgz",
+      "integrity": "sha512-6qyyn6TjayJSwGpm8J9QYYGQcRgc90nmfdUb0O7pp1s4lTY+9D0H9O02v5JqGApUyiHOtkz6+1hZNvNtEhbwRQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-arm": {
+      "version": "0.25.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.2.tgz",
+      "integrity": "sha512-UHBRgJcmjJv5oeQF8EpTRZs/1knq6loLxTsjc3nxO9eXAPDLcWW55flrMVc97qFPbmZP31ta1AZVUKQzKTzb0g==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-arm64": {
+      "version": "0.25.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.2.tgz",
+      "integrity": "sha512-gq/sjLsOyMT19I8obBISvhoYiZIAaGF8JpeXu1u8yPv8BE5HlWYobmlsfijFIZ9hIVGYkbdFhEqC0NvM4kNO0g==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-ia32": {
+      "version": "0.25.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.2.tgz",
+      "integrity": "sha512-bBYCv9obgW2cBP+2ZWfjYTU+f5cxRoGGQ5SeDbYdFCAZpYWrfjjfYwvUpP8MlKbP0nwZ5gyOU/0aUzZ5HWPuvQ==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-loong64": {
+      "version": "0.25.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.2.tgz",
+      "integrity": "sha512-SHNGiKtvnU2dBlM5D8CXRFdd+6etgZ9dXfaPCeJtz+37PIUlixvlIhI23L5khKXs3DIzAn9V8v+qb1TRKrgT5w==",
+      "cpu": [
+        "loong64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-mips64el": {
+      "version": "0.25.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.2.tgz",
+      "integrity": "sha512-hDDRlzE6rPeoj+5fsADqdUZl1OzqDYow4TB4Y/3PlKBD0ph1e6uPHzIQcv2Z65u2K0kpeByIyAjCmjn1hJgG0Q==",
+      "cpu": [
+        "mips64el"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-ppc64": {
+      "version": "0.25.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.2.tgz",
+      "integrity": "sha512-tsHu2RRSWzipmUi9UBDEzc0nLc4HtpZEI5Ba+Omms5456x5WaNuiG3u7xh5AO6sipnJ9r4cRWQB2tUjPyIkc6g==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-riscv64": {
+      "version": "0.25.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.2.tgz",
+      "integrity": "sha512-k4LtpgV7NJQOml/10uPU0s4SAXGnowi5qBSjaLWMojNCUICNu7TshqHLAEbkBdAszL5TabfvQ48kK84hyFzjnw==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-s390x": {
+      "version": "0.25.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.2.tgz",
+      "integrity": "sha512-GRa4IshOdvKY7M/rDpRR3gkiTNp34M0eLTaC1a08gNrh4u488aPhuZOCpkF6+2wl3zAN7L7XIpOFBhnaE3/Q8Q==",
+      "cpu": [
+        "s390x"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-x64": {
+      "version": "0.25.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.2.tgz",
+      "integrity": "sha512-QInHERlqpTTZ4FRB0fROQWXcYRD64lAoiegezDunLpalZMjcUcld3YzZmVJ2H/Cp0wJRZ8Xtjtj0cEHhYc/uUg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/netbsd-arm64": {
+      "version": "0.25.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.2.tgz",
+      "integrity": "sha512-talAIBoY5M8vHc6EeI2WW9d/CkiO9MQJ0IOWX8hrLhxGbro/vBXJvaQXefW2cP0z0nQVTdQ/eNyGFV1GSKrxfw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "netbsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/netbsd-x64": {
+      "version": "0.25.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.2.tgz",
+      "integrity": "sha512-voZT9Z+tpOxrvfKFyfDYPc4DO4rk06qamv1a/fkuzHpiVBMOhpjK+vBmWM8J1eiB3OLSMFYNaOaBNLXGChf5tg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "netbsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/openbsd-arm64": {
+      "version": "0.25.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.2.tgz",
+      "integrity": "sha512-dcXYOC6NXOqcykeDlwId9kB6OkPUxOEqU+rkrYVqJbK2hagWOMrsTGsMr8+rW02M+d5Op5NNlgMmjzecaRf7Tg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/openbsd-x64": {
+      "version": "0.25.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.2.tgz",
+      "integrity": "sha512-t/TkWwahkH0Tsgoq1Ju7QfgGhArkGLkF1uYz8nQS/PPFlXbP5YgRpqQR3ARRiC2iXoLTWFxc6DJMSK10dVXluw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/sunos-x64": {
+      "version": "0.25.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.2.tgz",
+      "integrity": "sha512-cfZH1co2+imVdWCjd+D1gf9NjkchVhhdpgb1q5y6Hcv9TP6Zi9ZG/beI3ig8TvwT9lH9dlxLq5MQBBgwuj4xvA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "sunos"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/win32-arm64": {
+      "version": "0.25.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.2.tgz",
+      "integrity": "sha512-7Loyjh+D/Nx/sOTzV8vfbB3GJuHdOQyrOryFdZvPHLf42Tk9ivBU5Aedi7iyX+x6rbn2Mh68T4qq1SDqJBQO5Q==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/win32-ia32": {
+      "version": "0.25.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.2.tgz",
+      "integrity": "sha512-WRJgsz9un0nqZJ4MfhabxaD9Ft8KioqU3JMinOTvobbX6MOSUigSBlogP8QB3uxpJDsFS6yN+3FDBdqE5lg9kg==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/win32-x64": {
+      "version": "0.25.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.2.tgz",
+      "integrity": "sha512-kM3HKb16VIXZyIeVrM1ygYmZBKybX8N4p754bw390wGO3Tf2j4L2/WYL+4suWujpgf6GBYs3jv7TyUivdd05JA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@eslint-community/eslint-utils": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
+      "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "eslint-visitor-keys": "^3.3.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "peerDependencies": {
+        "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0"
+      }
+    },
+    "node_modules/@eslint-community/regexpp": {
+      "version": "4.12.1",
+      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.1.tgz",
+      "integrity": "sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
+      }
+    },
+    "node_modules/@eslint/config-array": {
+      "version": "0.19.2",
+      "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.19.2.tgz",
+      "integrity": "sha512-GNKqxfHG2ySmJOBSHg7LxeUx4xpuCoFjacmlCoYWEbaPXLwvfIjixRI12xCQZeULksQb23uiA8F40w5TojpV7w==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@eslint/object-schema": "^2.1.6",
+        "debug": "^4.3.1",
+        "minimatch": "^3.1.2"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      }
+    },
+    "node_modules/@eslint/config-array/node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/@eslint/config-array/node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/@eslint/config-helpers": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.2.0.tgz",
+      "integrity": "sha512-yJLLmLexii32mGrhW29qvU3QBVTu0GUmEf/J4XsBtVhp4JkIUFN/BjWqTF63yRvGApIDpZm5fa97LtYtINmfeQ==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      }
+    },
+    "node_modules/@eslint/core": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.12.0.tgz",
+      "integrity": "sha512-cmrR6pytBuSMTaBweKoGMwu3EiHiEC+DoyupPmlZ0HxBJBtIxwe+j/E4XPIKNx+Q74c8lXKPwYawBf5glsTkHg==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@types/json-schema": "^7.0.15"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      }
+    },
+    "node_modules/@eslint/eslintrc": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.3.1.tgz",
+      "integrity": "sha512-gtF186CXhIl1p4pJNGZw8Yc6RlshoePRvE0X91oPGb3vZ8pM3qOS9W9NGPat9LziaBV7XrJWGylNQXkGcnM3IQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ajv": "^6.12.4",
+        "debug": "^4.3.2",
+        "espree": "^10.0.1",
+        "globals": "^14.0.0",
+        "ignore": "^5.2.0",
+        "import-fresh": "^3.2.1",
+        "js-yaml": "^4.1.0",
+        "minimatch": "^3.1.2",
+        "strip-json-comments": "^3.1.1"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/@eslint/eslintrc/node_modules/ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/@eslint/eslintrc/node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/@eslint/eslintrc/node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@eslint/eslintrc/node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/@eslint/js": {
+      "version": "9.23.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.23.0.tgz",
+      "integrity": "sha512-35MJ8vCPU0ZMxo7zfev2pypqTwWTofFZO6m4KAtdoFhRpLJUpHTZZ+KB3C7Hb1d7bULYwO4lJXGCi5Se+8OMbw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      }
+    },
+    "node_modules/@eslint/object-schema": {
+      "version": "2.1.6",
+      "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.6.tgz",
+      "integrity": "sha512-RBMg5FRL0I0gs51M/guSAj5/e14VQ4tpZnQNWwuDT66P14I43ItmPfIZRhO9fUVIPOAQXU47atlywZ/czoqFPA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      }
+    },
+    "node_modules/@eslint/plugin-kit": {
+      "version": "0.2.7",
+      "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.7.tgz",
+      "integrity": "sha512-JubJ5B2pJ4k4yGxaNLdbjrnk9d/iDz6/q8wOilpIowd6PJPgaxCuHBnBszq7Ce2TyMrywm5r4PnKm6V3iiZF+g==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@eslint/core": "^0.12.0",
+        "levn": "^0.4.1"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      }
+    },
+    "node_modules/@gerrit0/mini-shiki": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/@gerrit0/mini-shiki/-/mini-shiki-3.2.2.tgz",
+      "integrity": "sha512-vaZNGhGLKMY14HbF53xxHNgFO9Wz+t5lTlGNpl2N9xFiKQ0I5oIe0vKjU9dh7Nb3Dw6lZ7wqUE0ri+zcdpnK+Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@shikijs/engine-oniguruma": "^3.2.1",
+        "@shikijs/langs": "^3.2.1",
+        "@shikijs/themes": "^3.2.1",
+        "@shikijs/types": "^3.2.1",
+        "@shikijs/vscode-textmate": "^10.0.2"
+      }
+    },
+    "node_modules/@hpcc-js/wasm": {
+      "version": "2.22.4",
+      "resolved": "https://registry.npmjs.org/@hpcc-js/wasm/-/wasm-2.22.4.tgz",
+      "integrity": "sha512-58JkRkxZffiBAbZhc7z+9iaaAOmn1cyxLL3rRwsUvco/I0Wwb7uVAlHM9HiU6XASe2k11jrIjCFff1t9QKjlqg==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "yargs": "17.7.2"
+      },
+      "bin": {
+        "dot-wasm": "node ./node_modules/@hpcc-js/wasm-graphviz-cli/bin/index.js"
+      }
+    },
+    "node_modules/@humanfs/core": {
+      "version": "0.19.1",
+      "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.1.tgz",
+      "integrity": "sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=18.18.0"
+      }
+    },
+    "node_modules/@humanfs/node": {
+      "version": "0.16.6",
+      "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.6.tgz",
+      "integrity": "sha512-YuI2ZHQL78Q5HbhDiBA1X4LmYdXCKCMQIfw0pw7piHJwyREFebJUvrQN4cMssyES6x+vfUbx1CIpaQUKYdQZOw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@humanfs/core": "^0.19.1",
+        "@humanwhocodes/retry": "^0.3.0"
+      },
+      "engines": {
+        "node": ">=18.18.0"
+      }
+    },
+    "node_modules/@humanfs/node/node_modules/@humanwhocodes/retry": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.3.1.tgz",
+      "integrity": "sha512-JBxkERygn7Bv/GbN5Rv8Ul6LVknS+5Bp6RgDC/O8gEBU/yeH5Ui5C/OlWrTb6qct7LjjfT6Re2NxB0ln0yYybA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=18.18"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/nzakas"
+      }
+    },
+    "node_modules/@humanwhocodes/module-importer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
+      "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=12.22"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/nzakas"
+      }
+    },
+    "node_modules/@humanwhocodes/retry": {
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.4.2.tgz",
+      "integrity": "sha512-xeO57FpIu4p1Ri3Jq/EXq4ClRm86dVF2z/+kvFnyqVYRavTZmaFaUBbWCOuuTh0o/g7DSsk6kc2vrS4Vl5oPOQ==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=18.18"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/nzakas"
+      }
+    },
+    "node_modules/@inquirer/checkbox": {
+      "version": "4.1.4",
+      "resolved": "https://registry.npmjs.org/@inquirer/checkbox/-/checkbox-4.1.4.tgz",
+      "integrity": "sha512-d30576EZdApjAMceijXA5jDzRQHT/MygbC+J8I7EqA6f/FRpYxlRtRJbHF8gHeWYeSdOuTEJqonn7QLB1ELezA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@inquirer/core": "^10.1.9",
+        "@inquirer/figures": "^1.0.11",
+        "@inquirer/type": "^3.0.5",
+        "ansi-escapes": "^4.3.2",
+        "yoctocolors-cjs": "^2.1.2"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "@types/node": ">=18"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@inquirer/confirm": {
+      "version": "5.1.8",
+      "resolved": "https://registry.npmjs.org/@inquirer/confirm/-/confirm-5.1.8.tgz",
+      "integrity": "sha512-dNLWCYZvXDjO3rnQfk2iuJNL4Ivwz/T2+C3+WnNfJKsNGSuOs3wAo2F6e0p946gtSAk31nZMfW+MRmYaplPKsg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@inquirer/core": "^10.1.9",
+        "@inquirer/type": "^3.0.5"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "@types/node": ">=18"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@inquirer/core": {
+      "version": "10.1.9",
+      "resolved": "https://registry.npmjs.org/@inquirer/core/-/core-10.1.9.tgz",
+      "integrity": "sha512-sXhVB8n20NYkUBfDYgizGHlpRVaCRjtuzNZA6xpALIUbkgfd2Hjz+DfEN6+h1BRnuxw0/P4jCIMjMsEOAMwAJw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@inquirer/figures": "^1.0.11",
+        "@inquirer/type": "^3.0.5",
+        "ansi-escapes": "^4.3.2",
+        "cli-width": "^4.1.0",
+        "mute-stream": "^2.0.0",
+        "signal-exit": "^4.1.0",
+        "wrap-ansi": "^6.2.0",
+        "yoctocolors-cjs": "^2.1.2"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "@types/node": ">=18"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@inquirer/core/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@inquirer/core/node_modules/string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@inquirer/core/node_modules/wrap-ansi": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
+      "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@inquirer/editor": {
+      "version": "4.2.9",
+      "resolved": "https://registry.npmjs.org/@inquirer/editor/-/editor-4.2.9.tgz",
+      "integrity": "sha512-8HjOppAxO7O4wV1ETUlJFg6NDjp/W2NP5FB9ZPAcinAlNT4ZIWOLe2pUVwmmPRSV0NMdI5r/+lflN55AwZOKSw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@inquirer/core": "^10.1.9",
+        "@inquirer/type": "^3.0.5",
+        "external-editor": "^3.1.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "@types/node": ">=18"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@inquirer/expand": {
+      "version": "4.0.11",
+      "resolved": "https://registry.npmjs.org/@inquirer/expand/-/expand-4.0.11.tgz",
+      "integrity": "sha512-OZSUW4hFMW2TYvX/Sv+NnOZgO8CHT2TU1roUCUIF2T+wfw60XFRRp9MRUPCT06cRnKL+aemt2YmTWwt7rOrNEA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@inquirer/core": "^10.1.9",
+        "@inquirer/type": "^3.0.5",
+        "yoctocolors-cjs": "^2.1.2"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "@types/node": ">=18"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@inquirer/figures": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/@inquirer/figures/-/figures-1.0.11.tgz",
+      "integrity": "sha512-eOg92lvrn/aRUqbxRyvpEWnrvRuTYRifixHkYVpJiygTgVSBIHDqLh0SrMQXkafvULg3ck11V7xvR+zcgvpHFw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@inquirer/input": {
+      "version": "4.1.8",
+      "resolved": "https://registry.npmjs.org/@inquirer/input/-/input-4.1.8.tgz",
+      "integrity": "sha512-WXJI16oOZ3/LiENCAxe8joniNp8MQxF6Wi5V+EBbVA0ZIOpFcL4I9e7f7cXse0HJeIPCWO8Lcgnk98juItCi7Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@inquirer/core": "^10.1.9",
+        "@inquirer/type": "^3.0.5"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "@types/node": ">=18"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@inquirer/number": {
+      "version": "3.0.11",
+      "resolved": "https://registry.npmjs.org/@inquirer/number/-/number-3.0.11.tgz",
+      "integrity": "sha512-pQK68CsKOgwvU2eA53AG/4npRTH2pvs/pZ2bFvzpBhrznh8Mcwt19c+nMO7LHRr3Vreu1KPhNBF3vQAKrjIulw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@inquirer/core": "^10.1.9",
+        "@inquirer/type": "^3.0.5"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "@types/node": ">=18"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@inquirer/password": {
+      "version": "4.0.11",
+      "resolved": "https://registry.npmjs.org/@inquirer/password/-/password-4.0.11.tgz",
+      "integrity": "sha512-dH6zLdv+HEv1nBs96Case6eppkRggMe8LoOTl30+Gq5Wf27AO/vHFgStTVz4aoevLdNXqwE23++IXGw4eiOXTg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@inquirer/core": "^10.1.9",
+        "@inquirer/type": "^3.0.5",
+        "ansi-escapes": "^4.3.2"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "@types/node": ">=18"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@inquirer/prompts": {
+      "version": "7.4.0",
+      "resolved": "https://registry.npmjs.org/@inquirer/prompts/-/prompts-7.4.0.tgz",
+      "integrity": "sha512-EZiJidQOT4O5PYtqnu1JbF0clv36oW2CviR66c7ma4LsupmmQlUwmdReGKRp456OWPWMz3PdrPiYg3aCk3op2w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@inquirer/checkbox": "^4.1.4",
+        "@inquirer/confirm": "^5.1.8",
+        "@inquirer/editor": "^4.2.9",
+        "@inquirer/expand": "^4.0.11",
+        "@inquirer/input": "^4.1.8",
+        "@inquirer/number": "^3.0.11",
+        "@inquirer/password": "^4.0.11",
+        "@inquirer/rawlist": "^4.0.11",
+        "@inquirer/search": "^3.0.11",
+        "@inquirer/select": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "@types/node": ">=18"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@inquirer/rawlist": {
+      "version": "4.0.11",
+      "resolved": "https://registry.npmjs.org/@inquirer/rawlist/-/rawlist-4.0.11.tgz",
+      "integrity": "sha512-uAYtTx0IF/PqUAvsRrF3xvnxJV516wmR6YVONOmCWJbbt87HcDHLfL9wmBQFbNJRv5kCjdYKrZcavDkH3sVJPg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@inquirer/core": "^10.1.9",
+        "@inquirer/type": "^3.0.5",
+        "yoctocolors-cjs": "^2.1.2"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "@types/node": ">=18"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@inquirer/search": {
+      "version": "3.0.11",
+      "resolved": "https://registry.npmjs.org/@inquirer/search/-/search-3.0.11.tgz",
+      "integrity": "sha512-9CWQT0ikYcg6Ls3TOa7jljsD7PgjcsYEM0bYE+Gkz+uoW9u8eaJCRHJKkucpRE5+xKtaaDbrND+nPDoxzjYyew==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@inquirer/core": "^10.1.9",
+        "@inquirer/figures": "^1.0.11",
+        "@inquirer/type": "^3.0.5",
+        "yoctocolors-cjs": "^2.1.2"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "@types/node": ">=18"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@inquirer/select": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/@inquirer/select/-/select-4.1.0.tgz",
+      "integrity": "sha512-z0a2fmgTSRN+YBuiK1ROfJ2Nvrpij5lVN3gPDkQGhavdvIVGHGW29LwYZfM/j42Ai2hUghTI/uoBuTbrJk42bA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@inquirer/core": "^10.1.9",
+        "@inquirer/figures": "^1.0.11",
+        "@inquirer/type": "^3.0.5",
+        "ansi-escapes": "^4.3.2",
+        "yoctocolors-cjs": "^2.1.2"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "@types/node": ">=18"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@inquirer/type": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/@inquirer/type/-/type-3.0.5.tgz",
+      "integrity": "sha512-ZJpeIYYueOz/i/ONzrfof8g89kNdO2hjGuvULROo3O8rlB2CRtSseE5KeirnyE4t/thAn/EwvS/vuQeJCn+NZg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "@types/node": ">=18"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@isaacs/cliui": {
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
+      "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "string-width": "^5.1.2",
+        "string-width-cjs": "npm:string-width@^4.2.0",
+        "strip-ansi": "^7.0.1",
+        "strip-ansi-cjs": "npm:strip-ansi@^6.0.1",
+        "wrap-ansi": "^8.1.0",
+        "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@isaacs/cliui/node_modules/ansi-regex": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
+      "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+      }
+    },
+    "node_modules/@isaacs/cliui/node_modules/strip-ansi": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
+      "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+      }
+    },
+    "node_modules/@istanbuljs/schema": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
+      "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@jridgewell/gen-mapping": {
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
+      "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jridgewell/set-array": "^1.2.1",
+        "@jridgewell/sourcemap-codec": "^1.4.10",
+        "@jridgewell/trace-mapping": "^0.3.24"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/resolve-uri": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
+      "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/set-array": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz",
+      "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/sourcemap-codec": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz",
+      "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==",
+      "dev": true
+    },
+    "node_modules/@jridgewell/trace-mapping": {
+      "version": "0.3.25",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
+      "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jridgewell/resolve-uri": "^3.1.0",
+        "@jridgewell/sourcemap-codec": "^1.4.14"
+      }
+    },
+    "node_modules/@material/material-color-utilities": {
+      "version": "0.2.7",
+      "resolved": "https://registry.npmjs.org/@material/material-color-utilities/-/material-color-utilities-0.2.7.tgz",
+      "integrity": "sha512-0FCeqG6WvK4/Cc06F/xXMd/pv4FeisI0c1tUpBbfhA2n9Y8eZEv4Karjbmf2ZqQCPUWMrGp8A571tCjizxoTiQ==",
+      "license": "Apache-2.0"
+    },
+    "node_modules/@mswjs/interceptors": {
+      "version": "0.37.6",
+      "resolved": "https://registry.npmjs.org/@mswjs/interceptors/-/interceptors-0.37.6.tgz",
+      "integrity": "sha512-wK+5pLK5XFmgtH3aQ2YVvA3HohS3xqV/OxuVOdNx9Wpnz7VE/fnC+e1A7ln6LFYeck7gOJ/dsZV6OLplOtAJ2w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@open-draft/deferred-promise": "^2.2.0",
+        "@open-draft/logger": "^0.3.0",
+        "@open-draft/until": "^2.0.0",
+        "is-node-process": "^1.2.0",
+        "outvariant": "^1.4.3",
+        "strict-event-emitter": "^0.5.1"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@napi-rs/wasm-runtime": {
+      "version": "0.2.7",
+      "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-0.2.7.tgz",
+      "integrity": "sha512-5yximcFK5FNompXfJFoWanu5l8v1hNGqNHh9du1xETp9HWk/B/PzvchX55WYOPaIeNglG8++68AAiauBAtbnzw==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "@emnapi/core": "^1.3.1",
+        "@emnapi/runtime": "^1.3.1",
+        "@tybys/wasm-util": "^0.9.0"
+      }
+    },
+    "node_modules/@nodelib/fs.scandir": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
+      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@nodelib/fs.stat": "2.0.5",
+        "run-parallel": "^1.1.9"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@nodelib/fs.stat": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
+      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@nodelib/fs.walk": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
+      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@nodelib/fs.scandir": "2.1.5",
+        "fastq": "^1.6.0"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@open-draft/deferred-promise": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/@open-draft/deferred-promise/-/deferred-promise-2.2.0.tgz",
+      "integrity": "sha512-CecwLWx3rhxVQF6V4bAgPS5t+So2sTbPgAzafKkVizyi7tlwpcFpdFqq+wqF2OwNBmqFuu6tOyouTuxgpMfzmA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@open-draft/logger": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/@open-draft/logger/-/logger-0.3.0.tgz",
+      "integrity": "sha512-X2g45fzhxH238HKO4xbSr7+wBS8Fvw6ixhTDuvLd5mqh6bJJCFAPwU9mPDxbcrRtfxv4u5IHCEH77BmxvXmmxQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-node-process": "^1.2.0",
+        "outvariant": "^1.4.0"
+      }
+    },
+    "node_modules/@open-draft/until": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@open-draft/until/-/until-2.1.0.tgz",
+      "integrity": "sha512-U69T3ItWHvLwGg5eJ0n3I62nWuE6ilHlmz7zM0npLBRvPRd7e6NYmg54vvRtP5mZG7kZqZCFVdsTWo7BPtBujg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@pkgjs/parseargs": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
+      "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/@pkgr/core": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/@pkgr/core/-/core-0.2.0.tgz",
+      "integrity": "sha512-vsJDAkYR6qCPu+ioGScGiMYR7LvZYIXh/dlQeviqoTWNCVfKTLYD/LkNWH4Mxsv2a5vpIRc77FN5DnmK1eBggQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^12.20.0 || ^14.18.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/unts"
+      }
+    },
+    "node_modules/@rollup/rollup-android-arm-eabi": {
+      "version": "4.40.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.40.1.tgz",
+      "integrity": "sha512-kxz0YeeCrRUHz3zyqvd7n+TVRlNyTifBsmnmNPtk3hQURUyG9eAB+usz6DAwagMusjx/zb3AjvDUvhFGDAexGw==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ]
+    },
+    "node_modules/@rollup/rollup-android-arm64": {
+      "version": "4.40.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.40.1.tgz",
+      "integrity": "sha512-PPkxTOisoNC6TpnDKatjKkjRMsdaWIhyuMkA4UsBXT9WEZY4uHezBTjs6Vl4PbqQQeu6oION1w2voYZv9yquCw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ]
+    },
+    "node_modules/@rollup/rollup-darwin-arm64": {
+      "version": "4.40.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.40.1.tgz",
+      "integrity": "sha512-VWXGISWFY18v/0JyNUy4A46KCFCb9NVsH+1100XP31lud+TzlezBbz24CYzbnA4x6w4hx+NYCXDfnvDVO6lcAA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/@rollup/rollup-darwin-x64": {
+      "version": "4.40.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.40.1.tgz",
+      "integrity": "sha512-nIwkXafAI1/QCS7pxSpv/ZtFW6TXcNUEHAIA9EIyw5OzxJZQ1YDrX+CL6JAIQgZ33CInl1R6mHet9Y/UZTg2Bw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/@rollup/rollup-freebsd-arm64": {
+      "version": "4.40.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.40.1.tgz",
+      "integrity": "sha512-BdrLJ2mHTrIYdaS2I99mriyJfGGenSaP+UwGi1kB9BLOCu9SR8ZpbkmmalKIALnRw24kM7qCN0IOm6L0S44iWw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ]
+    },
+    "node_modules/@rollup/rollup-freebsd-x64": {
+      "version": "4.40.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.40.1.tgz",
+      "integrity": "sha512-VXeo/puqvCG8JBPNZXZf5Dqq7BzElNJzHRRw3vjBE27WujdzuOPecDPc/+1DcdcTptNBep3861jNq0mYkT8Z6Q==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
+      "version": "4.40.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.40.1.tgz",
+      "integrity": "sha512-ehSKrewwsESPt1TgSE/na9nIhWCosfGSFqv7vwEtjyAqZcvbGIg4JAcV7ZEh2tfj/IlfBeZjgOXm35iOOjadcg==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm-musleabihf": {
+      "version": "4.40.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.40.1.tgz",
+      "integrity": "sha512-m39iO/aaurh5FVIu/F4/Zsl8xppd76S4qoID8E+dSRQvTyZTOI2gVk3T4oqzfq1PtcvOfAVlwLMK3KRQMaR8lg==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm64-gnu": {
+      "version": "4.40.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.40.1.tgz",
+      "integrity": "sha512-Y+GHnGaku4aVLSgrT0uWe2o2Rq8te9hi+MwqGF9r9ORgXhmHK5Q71N757u0F8yU1OIwUIFy6YiJtKjtyktk5hg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm64-musl": {
+      "version": "4.40.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.40.1.tgz",
+      "integrity": "sha512-jEwjn3jCA+tQGswK3aEWcD09/7M5wGwc6+flhva7dsQNRZZTe30vkalgIzV4tjkopsTS9Jd7Y1Bsj6a4lzz8gQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-loongarch64-gnu": {
+      "version": "4.40.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.40.1.tgz",
+      "integrity": "sha512-ySyWikVhNzv+BV/IDCsrraOAZ3UaC8SZB67FZlqVwXwnFhPihOso9rPOxzZbjp81suB1O2Topw+6Ug3JNegejQ==",
+      "cpu": [
+        "loong64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
+      "version": "4.40.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.40.1.tgz",
+      "integrity": "sha512-BvvA64QxZlh7WZWqDPPdt0GH4bznuL6uOO1pmgPnnv86rpUpc8ZxgZwcEgXvo02GRIZX1hQ0j0pAnhwkhwPqWg==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-riscv64-gnu": {
+      "version": "4.40.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.40.1.tgz",
+      "integrity": "sha512-EQSP+8+1VuSulm9RKSMKitTav89fKbHymTf25n5+Yr6gAPZxYWpj3DzAsQqoaHAk9YX2lwEyAf9S4W8F4l3VBQ==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-riscv64-musl": {
+      "version": "4.40.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.40.1.tgz",
+      "integrity": "sha512-n/vQ4xRZXKuIpqukkMXZt9RWdl+2zgGNx7Uda8NtmLJ06NL8jiHxUawbwC+hdSq1rrw/9CghCpEONor+l1e2gA==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-s390x-gnu": {
+      "version": "4.40.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.40.1.tgz",
+      "integrity": "sha512-h8d28xzYb98fMQKUz0w2fMc1XuGzLLjdyxVIbhbil4ELfk5/orZlSTpF/xdI9C8K0I8lCkq+1En2RJsawZekkg==",
+      "cpu": [
+        "s390x"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-x64-gnu": {
+      "version": "4.40.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.40.1.tgz",
+      "integrity": "sha512-XiK5z70PEFEFqcNj3/zRSz/qX4bp4QIraTy9QjwJAb/Z8GM7kVUsD0Uk8maIPeTyPCP03ChdI+VVmJriKYbRHQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-x64-musl": {
+      "version": "4.40.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.40.1.tgz",
+      "integrity": "sha512-2BRORitq5rQ4Da9blVovzNCMaUlyKrzMSvkVR0D4qPuOy/+pMCrh1d7o01RATwVy+6Fa1WBw+da7QPeLWU/1mQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-win32-arm64-msvc": {
+      "version": "4.40.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.40.1.tgz",
+      "integrity": "sha512-b2bcNm9Kbde03H+q+Jjw9tSfhYkzrDUf2d5MAd1bOJuVplXvFhWz7tRtWvD8/ORZi7qSCy0idW6tf2HgxSXQSg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@rollup/rollup-win32-ia32-msvc": {
+      "version": "4.40.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.40.1.tgz",
+      "integrity": "sha512-DfcogW8N7Zg7llVEfpqWMZcaErKfsj9VvmfSyRjCyo4BI3wPEfrzTtJkZG6gKP/Z92wFm6rz2aDO7/JfiR/whA==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@rollup/rollup-win32-x64-msvc": {
+      "version": "4.40.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.40.1.tgz",
+      "integrity": "sha512-ECyOuDeH3C1I8jH2MK1RtBJW+YPMvSfT0a5NN0nHfQYnDSJ6tUiZH3gzwVP5/Kfh/+Tt7tpWVF9LXNTnhTJ3kA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@shikijs/engine-oniguruma": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/@shikijs/engine-oniguruma/-/engine-oniguruma-3.2.1.tgz",
+      "integrity": "sha512-wZZAkayEn6qu2+YjenEoFqj0OyQI64EWsNR6/71d1EkG4sxEOFooowKivsWPpaWNBu3sxAG+zPz5kzBL/SsreQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@shikijs/types": "3.2.1",
+        "@shikijs/vscode-textmate": "^10.0.2"
+      }
+    },
+    "node_modules/@shikijs/langs": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/@shikijs/langs/-/langs-3.2.1.tgz",
+      "integrity": "sha512-If0iDHYRSGbihiA8+7uRsgb1er1Yj11pwpX1c6HLYnizDsKAw5iaT3JXj5ZpaimXSWky/IhxTm7C6nkiYVym+A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@shikijs/types": "3.2.1"
+      }
+    },
+    "node_modules/@shikijs/themes": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/@shikijs/themes/-/themes-3.2.1.tgz",
+      "integrity": "sha512-k5DKJUT8IldBvAm8WcrDT5+7GA7se6lLksR+2E3SvyqGTyFMzU2F9Gb7rmD+t+Pga1MKrYFxDIeyWjMZWM6uBQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@shikijs/types": "3.2.1"
+      }
+    },
+    "node_modules/@shikijs/types": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/@shikijs/types/-/types-3.2.1.tgz",
+      "integrity": "sha512-/NTWAk4KE2M8uac0RhOsIhYQf4pdU0OywQuYDGIGAJ6Mjunxl2cGiuLkvu4HLCMn+OTTLRWkjZITp+aYJv60yA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@shikijs/vscode-textmate": "^10.0.2",
+        "@types/hast": "^3.0.4"
+      }
+    },
+    "node_modules/@shikijs/vscode-textmate": {
+      "version": "10.0.2",
+      "resolved": "https://registry.npmjs.org/@shikijs/vscode-textmate/-/vscode-textmate-10.0.2.tgz",
+      "integrity": "sha512-83yeghZ2xxin3Nj8z1NMd/NCuca+gsYXswywDy5bHvwlWL8tpTQmzGeUuHd9FC3E/SBEMvzJRwWEOz5gGes9Qg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@stylistic/eslint-plugin-ts": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/@stylistic/eslint-plugin-ts/-/eslint-plugin-ts-4.2.0.tgz",
+      "integrity": "sha512-j2o2GvOx9v66x8hmp/HJ+0T+nOppiO5ycGsCkifh7JPGgjxEhpkGmIGx3RWsoxpWbad3VCX8e8/T8n3+7ze1Zg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/utils": "^8.23.0",
+        "eslint-visitor-keys": "^4.2.0",
+        "espree": "^10.3.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "peerDependencies": {
+        "eslint": ">=9.0.0"
+      }
+    },
+    "node_modules/@stylistic/eslint-plugin-ts/node_modules/eslint-visitor-keys": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz",
+      "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/@tybys/wasm-util": {
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.9.0.tgz",
+      "integrity": "sha512-6+7nlbMVX/PVDCwaIQ8nTOPveOcFLSt8GcXdx8hD0bt39uWxYT88uXzqTd4fTvqta7oeUJqudepapKNt2DYJFw==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "tslib": "^2.4.0"
+      }
+    },
+    "node_modules/@types/cookie": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.6.0.tgz",
+      "integrity": "sha512-4Kh9a6B2bQciAhf7FSuMRRkUWecJgJu9nPnx3yzpsfXX/c50REIqpHY4C82bXP90qrLtXtkDxTZosYO3UpOwlA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/doctrine": {
+      "version": "0.0.9",
+      "resolved": "https://registry.npmjs.org/@types/doctrine/-/doctrine-0.0.9.tgz",
+      "integrity": "sha512-eOIHzCUSH7SMfonMG1LsC2f8vxBFtho6NGBznK41R84YzPuvSBzrhEps33IsQiOW9+VL6NQ9DbjQJznk/S4uRA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/estree": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.7.tgz",
+      "integrity": "sha512-w28IoSUCJpidD/TGviZwwMJckNESJZXFu7NBZ5YJ4mEUnNraUn9Pm8HSZm/jDF1pDWYKspWE7oVphigUPRakIQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "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",
+      "integrity": "sha512-yOriVnggzrnQ3a9OKOCxaVuSug3w3/SbOj5i7VwXWZEyUNl3bLF9V3MfxGbZKuwqJOQyRfqXyROBB1CoZLFWzA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*",
+        "@types/tough-cookie": "*",
+        "parse5": "^7.0.0"
+      }
+    },
+    "node_modules/@types/json-schema": {
+      "version": "7.0.15",
+      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
+      "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/node": {
+      "version": "22.13.14",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.13.14.tgz",
+      "integrity": "sha512-Zs/Ollc1SJ8nKUAgc7ivOEdIBM8JAKgrqqUYi2J997JuKO7/tpQC+WCetQ1sypiKCQWHdvdg9wBNpUPEWZae7w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "undici-types": "~6.20.0"
+      }
+    },
+    "node_modules/@types/statuses": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@types/statuses/-/statuses-2.0.5.tgz",
+      "integrity": "sha512-jmIUGWrAiwu3dZpxntxieC+1n/5c3mjrImkmOSQ2NC5uP6cYO4aAZDdSmRcI5C1oiTmqlZGHC+/NmJrKogbP5A==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/tough-cookie": {
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.5.tgz",
+      "integrity": "sha512-/Ad8+nIOV7Rl++6f1BdKxFSMgmoqEoYbHRpPcx3JEfv8VRsQe9Z4mCXeJBzxs7mbHY/XOZZuXlRNfhpVPbs6ZA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/unist": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.3.tgz",
+      "integrity": "sha512-ko/gIFJRv177XgZsZcBwnqJN5x/Gien8qNOn0D5bQU/zAzVf9Zt3BlcUiLqhV9y4ARk0GbT3tnUiPNgnTXzc/Q==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@typescript-eslint/eslint-plugin": {
+      "version": "8.29.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.29.0.tgz",
+      "integrity": "sha512-PAIpk/U7NIS6H7TEtN45SPGLQaHNgB7wSjsQV/8+KYokAb2T/gloOA/Bee2yd4/yKVhPKe5LlaUGhAZk5zmSaQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@eslint-community/regexpp": "^4.10.0",
+        "@typescript-eslint/scope-manager": "8.29.0",
+        "@typescript-eslint/type-utils": "8.29.0",
+        "@typescript-eslint/utils": "8.29.0",
+        "@typescript-eslint/visitor-keys": "8.29.0",
+        "graphemer": "^1.4.0",
+        "ignore": "^5.3.1",
+        "natural-compare": "^1.4.0",
+        "ts-api-utils": "^2.0.1"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "@typescript-eslint/parser": "^8.0.0 || ^8.0.0-alpha.0",
+        "eslint": "^8.57.0 || ^9.0.0",
+        "typescript": ">=4.8.4 <5.9.0"
+      }
+    },
+    "node_modules/@typescript-eslint/parser": {
+      "version": "8.29.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.29.0.tgz",
+      "integrity": "sha512-8C0+jlNJOwQso2GapCVWWfW/rzaq7Lbme+vGUFKE31djwNncIpgXD7Cd4weEsDdkoZDjH0lwwr3QDQFuyrMg9g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/scope-manager": "8.29.0",
+        "@typescript-eslint/types": "8.29.0",
+        "@typescript-eslint/typescript-estree": "8.29.0",
+        "@typescript-eslint/visitor-keys": "8.29.0",
+        "debug": "^4.3.4"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^8.57.0 || ^9.0.0",
+        "typescript": ">=4.8.4 <5.9.0"
+      }
+    },
+    "node_modules/@typescript-eslint/scope-manager": {
+      "version": "8.29.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.29.0.tgz",
+      "integrity": "sha512-aO1PVsq7Gm+tcghabUpzEnVSFMCU4/nYIgC2GOatJcllvWfnhrgW0ZEbnTxm36QsikmCN1K/6ZgM7fok2I7xNw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/types": "8.29.0",
+        "@typescript-eslint/visitor-keys": "8.29.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/type-utils": {
+      "version": "8.29.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.29.0.tgz",
+      "integrity": "sha512-ahaWQ42JAOx+NKEf5++WC/ua17q5l+j1GFrbbpVKzFL/tKVc0aYY8rVSYUpUvt2hUP1YBr7mwXzx+E/DfUWI9Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/typescript-estree": "8.29.0",
+        "@typescript-eslint/utils": "8.29.0",
+        "debug": "^4.3.4",
+        "ts-api-utils": "^2.0.1"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^8.57.0 || ^9.0.0",
+        "typescript": ">=4.8.4 <5.9.0"
+      }
+    },
+    "node_modules/@typescript-eslint/types": {
+      "version": "8.29.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.29.0.tgz",
+      "integrity": "sha512-wcJL/+cOXV+RE3gjCyl/V2G877+2faqvlgtso/ZRbTCnZazh0gXhe+7gbAnfubzN2bNsBtZjDvlh7ero8uIbzg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/typescript-estree": {
+      "version": "8.29.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.29.0.tgz",
+      "integrity": "sha512-yOfen3jE9ISZR/hHpU/bmNvTtBW1NjRbkSFdZOksL1N+ybPEE7UVGMwqvS6CP022Rp00Sb0tdiIkhSCe6NI8ow==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/types": "8.29.0",
+        "@typescript-eslint/visitor-keys": "8.29.0",
+        "debug": "^4.3.4",
+        "fast-glob": "^3.3.2",
+        "is-glob": "^4.0.3",
+        "minimatch": "^9.0.4",
+        "semver": "^7.6.0",
+        "ts-api-utils": "^2.0.1"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.8.4 <5.9.0"
+      }
+    },
+    "node_modules/@typescript-eslint/utils": {
+      "version": "8.29.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.29.0.tgz",
+      "integrity": "sha512-gX/A0Mz9Bskm8avSWFcK0gP7cZpbY4AIo6B0hWYFCaIsz750oaiWR4Jr2CI+PQhfW1CpcQr9OlfPS+kMFegjXA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@eslint-community/eslint-utils": "^4.4.0",
+        "@typescript-eslint/scope-manager": "8.29.0",
+        "@typescript-eslint/types": "8.29.0",
+        "@typescript-eslint/typescript-estree": "8.29.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^8.57.0 || ^9.0.0",
+        "typescript": ">=4.8.4 <5.9.0"
+      }
+    },
+    "node_modules/@typescript-eslint/visitor-keys": {
+      "version": "8.29.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.29.0.tgz",
+      "integrity": "sha512-Sne/pVz8ryR03NFK21VpN88dZ2FdQXOlq3VIklbrTYEt8yXtRFr9tvUhqvCeKjqYk5FSim37sHbooT6vzBTZcg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/types": "8.29.0",
+        "eslint-visitor-keys": "^4.2.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/visitor-keys/node_modules/eslint-visitor-keys": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz",
+      "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/@unrs/resolver-binding-darwin-arm64": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-darwin-arm64/-/resolver-binding-darwin-arm64-1.3.3.tgz",
+      "integrity": "sha512-EpRILdWr3/xDa/7MoyfO7JuBIJqpBMphtu4+80BK1bRfFcniVT74h3Z7q1+WOc92FuIAYatB1vn9TJR67sORGw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/@unrs/resolver-binding-darwin-x64": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-darwin-x64/-/resolver-binding-darwin-x64-1.3.3.tgz",
+      "integrity": "sha512-ntj/g7lPyqwinMJWZ+DKHBse8HhVxswGTmNgFKJtdgGub3M3zp5BSZ3bvMP+kBT6dnYJLSVlDqdwOq1P8i0+/g==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/@unrs/resolver-binding-freebsd-x64": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-freebsd-x64/-/resolver-binding-freebsd-x64-1.3.3.tgz",
+      "integrity": "sha512-l6BT8f2CU821EW7U8hSUK8XPq4bmyTlt9Mn4ERrfjJNoCw0/JoHAh9amZZtV3cwC3bwwIat+GUnrcHTG9+qixw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ]
+    },
+    "node_modules/@unrs/resolver-binding-linux-arm-gnueabihf": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm-gnueabihf/-/resolver-binding-linux-arm-gnueabihf-1.3.3.tgz",
+      "integrity": "sha512-8ScEc5a4y7oE2BonRvzJ+2GSkBaYWyh0/Ko4Q25e/ix6ANpJNhwEPZvCR6GVRmsQAYMIfQvYLdM6YEN+qRjnAQ==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@unrs/resolver-binding-linux-arm-musleabihf": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm-musleabihf/-/resolver-binding-linux-arm-musleabihf-1.3.3.tgz",
+      "integrity": "sha512-8qQ6l1VTzLNd3xb2IEXISOKwMGXDCzY/UNy/7SovFW2Sp0K3YbL7Ao7R18v6SQkLqQlhhqSBIFRk+u6+qu5R5A==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@unrs/resolver-binding-linux-arm64-gnu": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm64-gnu/-/resolver-binding-linux-arm64-gnu-1.3.3.tgz",
+      "integrity": "sha512-v81R2wjqcWXJlQY23byqYHt9221h4anQ6wwN64oMD/WAE+FmxPHFZee5bhRkNVtzqO/q7wki33VFWlhiADwUeQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@unrs/resolver-binding-linux-arm64-musl": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm64-musl/-/resolver-binding-linux-arm64-musl-1.3.3.tgz",
+      "integrity": "sha512-cAOx/j0u5coMg4oct/BwMzvWJdVciVauUvsd+GQB/1FZYKQZmqPy0EjJzJGbVzFc6gbnfEcSqvQE6gvbGf2N8Q==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@unrs/resolver-binding-linux-ppc64-gnu": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-ppc64-gnu/-/resolver-binding-linux-ppc64-gnu-1.3.3.tgz",
+      "integrity": "sha512-mq2blqwErgDJD4gtFDlTX/HZ7lNP8YCHYFij2gkXPtMzrXxPW1hOtxL6xg4NWxvnj4bppppb0W3s/buvM55yfg==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@unrs/resolver-binding-linux-s390x-gnu": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-s390x-gnu/-/resolver-binding-linux-s390x-gnu-1.3.3.tgz",
+      "integrity": "sha512-u0VRzfFYysarYHnztj2k2xr+eu9rmgoTUUgCCIT37Nr+j0A05Xk2c3RY8Mh5+DhCl2aYibihnaAEJHeR0UOFIQ==",
+      "cpu": [
+        "s390x"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@unrs/resolver-binding-linux-x64-gnu": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-x64-gnu/-/resolver-binding-linux-x64-gnu-1.3.3.tgz",
+      "integrity": "sha512-OrVo5ZsG29kBF0Ug95a2KidS16PqAMmQNozM6InbquOfW/udouk063e25JVLqIBhHLB2WyBnixOQ19tmeC/hIg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@unrs/resolver-binding-linux-x64-musl": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-x64-musl/-/resolver-binding-linux-x64-musl-1.3.3.tgz",
+      "integrity": "sha512-PYnmrwZ4HMp9SkrOhqPghY/aoL+Rtd4CQbr93GlrRTjK6kDzfMfgz3UH3jt6elrQAfupa1qyr1uXzeVmoEAxUA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@unrs/resolver-binding-wasm32-wasi": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-wasm32-wasi/-/resolver-binding-wasm32-wasi-1.3.3.tgz",
+      "integrity": "sha512-81AnQY6fShmktQw4hWDUIilsKSdvr/acdJ5azAreu2IWNlaJOKphJSsUVWE+yCk6kBMoQyG9ZHCb/krb5K0PEA==",
+      "cpu": [
+        "wasm32"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "@napi-rs/wasm-runtime": "^0.2.7"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/@unrs/resolver-binding-win32-arm64-msvc": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-win32-arm64-msvc/-/resolver-binding-win32-arm64-msvc-1.3.3.tgz",
+      "integrity": "sha512-X/42BMNw7cW6xrB9syuP5RusRnWGoq+IqvJO8IDpp/BZg64J1uuIW6qA/1Cl13Y4LyLXbJVYbYNSKwR/FiHEng==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@unrs/resolver-binding-win32-ia32-msvc": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-win32-ia32-msvc/-/resolver-binding-win32-ia32-msvc-1.3.3.tgz",
+      "integrity": "sha512-EGNnNGQxMU5aTN7js3ETYvuw882zcO+dsVjs+DwO2j/fRVKth87C8e2GzxW1L3+iWAXMyJhvFBKRavk9Og1Z6A==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@unrs/resolver-binding-win32-x64-msvc": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-win32-x64-msvc/-/resolver-binding-win32-x64-msvc-1.3.3.tgz",
+      "integrity": "sha512-GraLbYqOJcmW1qY3osB+2YIiD62nVf2/bVLHZmrb4t/YSUwE03l7TwcDJl08T/Tm3SVhepX8RQkpzWbag/Sb4w==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@vitest/coverage-istanbul": {
+      "version": "3.0.9",
+      "resolved": "https://registry.npmjs.org/@vitest/coverage-istanbul/-/coverage-istanbul-3.0.9.tgz",
+      "integrity": "sha512-/TXh2qmOhclmVPjOnPTpIO4Xr6l2P5EwyXQygenwq4/ZQ/vPsrz+GCRZF9kBeQi6xrGcHv368Si9PGImWQawVg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@istanbuljs/schema": "^0.1.3",
+        "debug": "^4.4.0",
+        "istanbul-lib-coverage": "^3.2.2",
+        "istanbul-lib-instrument": "^6.0.3",
+        "istanbul-lib-report": "^3.0.1",
+        "istanbul-lib-source-maps": "^5.0.6",
+        "istanbul-reports": "^3.1.7",
+        "magicast": "^0.3.5",
+        "test-exclude": "^7.0.1",
+        "tinyrainbow": "^2.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/vitest"
+      },
+      "peerDependencies": {
+        "vitest": "3.0.9"
+      }
+    },
+    "node_modules/@vitest/expect": {
+      "version": "3.0.9",
+      "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-3.0.9.tgz",
+      "integrity": "sha512-5eCqRItYgIML7NNVgJj6TVCmdzE7ZVgJhruW0ziSQV4V7PvLkDL1bBkBdcTs/VuIz0IxPb5da1IDSqc1TR9eig==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@vitest/spy": "3.0.9",
+        "@vitest/utils": "3.0.9",
+        "chai": "^5.2.0",
+        "tinyrainbow": "^2.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/vitest"
+      }
+    },
+    "node_modules/@vitest/mocker": {
+      "version": "3.0.9",
+      "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-3.0.9.tgz",
+      "integrity": "sha512-ryERPIBOnvevAkTq+L1lD+DTFBRcjueL9lOUfXsLfwP92h4e+Heb+PjiqS3/OURWPtywfafK0kj++yDFjWUmrA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@vitest/spy": "3.0.9",
+        "estree-walker": "^3.0.3",
+        "magic-string": "^0.30.17"
+      },
+      "funding": {
+        "url": "https://opencollective.com/vitest"
+      },
+      "peerDependencies": {
+        "msw": "^2.4.9",
+        "vite": "^5.0.0 || ^6.0.0"
+      },
+      "peerDependenciesMeta": {
+        "msw": {
+          "optional": true
+        },
+        "vite": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@vitest/pretty-format": {
+      "version": "3.0.9",
+      "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-3.0.9.tgz",
+      "integrity": "sha512-OW9F8t2J3AwFEwENg3yMyKWweF7oRJlMyHOMIhO5F3n0+cgQAJZBjNgrF8dLwFTEXl5jUqBLXd9QyyKv8zEcmA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "tinyrainbow": "^2.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/vitest"
+      }
+    },
+    "node_modules/@vitest/runner": {
+      "version": "3.0.9",
+      "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-3.0.9.tgz",
+      "integrity": "sha512-NX9oUXgF9HPfJSwl8tUZCMP1oGx2+Sf+ru6d05QjzQz4OwWg0psEzwY6VexP2tTHWdOkhKHUIZH+fS6nA7jfOw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@vitest/utils": "3.0.9",
+        "pathe": "^2.0.3"
+      },
+      "funding": {
+        "url": "https://opencollective.com/vitest"
+      }
+    },
+    "node_modules/@vitest/snapshot": {
+      "version": "3.0.9",
+      "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-3.0.9.tgz",
+      "integrity": "sha512-AiLUiuZ0FuA+/8i19mTYd+re5jqjEc2jZbgJ2up0VY0Ddyyxg/uUtBDpIFAy4uzKaQxOW8gMgBdAJJ2ydhu39A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@vitest/pretty-format": "3.0.9",
+        "magic-string": "^0.30.17",
+        "pathe": "^2.0.3"
+      },
+      "funding": {
+        "url": "https://opencollective.com/vitest"
+      }
+    },
+    "node_modules/@vitest/spy": {
+      "version": "3.0.9",
+      "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-3.0.9.tgz",
+      "integrity": "sha512-/CcK2UDl0aQ2wtkp3YVWldrpLRNCfVcIOFGlVGKO4R5eajsH393Z1yiXLVQ7vWsj26JOEjeZI0x5sm5P4OGUNQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "tinyspy": "^3.0.2"
+      },
+      "funding": {
+        "url": "https://opencollective.com/vitest"
+      }
+    },
+    "node_modules/@vitest/utils": {
+      "version": "3.0.9",
+      "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-3.0.9.tgz",
+      "integrity": "sha512-ilHM5fHhZ89MCp5aAaM9uhfl1c2JdxVxl3McqsdVyVNN6JffnEen8UMCdRTzOhGXNQGo5GNL9QugHrz727Wnng==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@vitest/pretty-format": "3.0.9",
+        "loupe": "^3.1.3",
+        "tinyrainbow": "^2.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/vitest"
+      }
+    },
+    "node_modules/acorn": {
+      "version": "8.12.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz",
+      "integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==",
+      "dev": true,
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/acorn-jsx": {
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
+      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
+      "dev": true,
+      "license": "MIT",
+      "peerDependencies": {
+        "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
+      }
+    },
+    "node_modules/acorn-jsx-walk": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/acorn-jsx-walk/-/acorn-jsx-walk-2.0.0.tgz",
+      "integrity": "sha512-uuo6iJj4D4ygkdzd6jPtcxs8vZgDX9YFIkqczGImoypX2fQ4dVImmu3UzA4ynixCIMTrEOWW+95M2HuBaCEOVA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/acorn-loose": {
+      "version": "8.4.0",
+      "resolved": "https://registry.npmjs.org/acorn-loose/-/acorn-loose-8.4.0.tgz",
+      "integrity": "sha512-M0EUka6rb+QC4l9Z3T0nJEzNOO7JcoJlYMrBlyBCiFSXRyxjLKayd4TbQs2FDRWQU1h9FR7QVNHt+PEaoNL5rQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "acorn": "^8.11.0"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/acorn-walk": {
+      "version": "8.3.3",
+      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.3.tgz",
+      "integrity": "sha512-MxXdReSRhGO7VlFe1bRG/oI7/mdLV9B9JJT0N8vZOhF7gFRR5l3M8W9G8JxmKV+JC5mGqJ0QvqfSOLsCPa4nUw==",
+      "dev": true,
+      "dependencies": {
+        "acorn": "^8.11.0"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/agent-base": {
+      "version": "7.1.3",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.3.tgz",
+      "integrity": "sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/ajv": {
+      "version": "8.17.1",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
+      "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.3",
+        "fast-uri": "^3.0.1",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/ansi-escapes": {
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
+      "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "type-fest": "^0.21.3"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/argparse": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+      "license": "Python-2.0"
+    },
+    "node_modules/assertion-error": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-2.0.1.tgz",
+      "integrity": "sha512-Izi8RQcffqCeNVgFigKli1ssklIbpHnCYc6AknXGYoB6grJqyeby7jv12JUQgmTAnIDnbck1uxksT4dzN3PWBA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/asynckit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/balanced-match": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "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/braces": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fill-range": "^7.1.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/browserslist": {
+      "version": "4.23.2",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.2.tgz",
+      "integrity": "sha512-qkqSyistMYdxAcw+CzbZwlBy8AGmS/eEWs+sEV5TnLRGDOL+C5M2EnH6tlZyg0YoAxGJAFKh61En9BR941GnHA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/browserslist"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "caniuse-lite": "^1.0.30001640",
+        "electron-to-chromium": "^1.4.820",
+        "node-releases": "^2.0.14",
+        "update-browserslist-db": "^1.1.0"
+      },
+      "bin": {
+        "browserslist": "cli.js"
+      },
+      "engines": {
+        "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
+      }
+    },
+    "node_modules/cac": {
+      "version": "6.7.14",
+      "resolved": "https://registry.npmjs.org/cac/-/cac-6.7.14.tgz",
+      "integrity": "sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/call-bind": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.8.tgz",
+      "integrity": "sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==",
+      "license": "MIT",
+      "dependencies": {
+        "call-bind-apply-helpers": "^1.0.0",
+        "es-define-property": "^1.0.0",
+        "get-intrinsic": "^1.2.4",
+        "set-function-length": "^1.2.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/call-bind-apply-helpers": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz",
+      "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==",
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/call-bound": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.4.tgz",
+      "integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==",
+      "license": "MIT",
+      "dependencies": {
+        "call-bind-apply-helpers": "^1.0.2",
+        "get-intrinsic": "^1.3.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/callsites": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/caniuse-lite": {
+      "version": "1.0.30001642",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001642.tgz",
+      "integrity": "sha512-3XQ0DoRgLijXJErLSl+bLnJ+Et4KqV1PY6JJBGAFlsNsz31zeAIncyeZfLCabHK/jtSh+671RM9YMldxjUPZtA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/caniuse-lite"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "CC-BY-4.0"
+    },
+    "node_modules/chai": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/chai/-/chai-5.2.0.tgz",
+      "integrity": "sha512-mCuXncKXk5iCLhfhwTc0izo0gtEmpz5CtG2y8GiOINBlMVS6v8TMRc5TaLWKS6692m9+dVVfzgeVxR5UxWHTYw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "assertion-error": "^2.0.1",
+        "check-error": "^2.1.1",
+        "deep-eql": "^5.0.1",
+        "loupe": "^3.1.0",
+        "pathval": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/chardet": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz",
+      "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/check-error": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/check-error/-/check-error-2.1.1.tgz",
+      "integrity": "sha512-OAlb+T7V4Op9OwdkjmguYRqncdlx5JiofwOAUkmTF+jNdHwzTaTs4sRAGpzLF3oOz5xAyDGrPgeIDFQmDOTiJw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 16"
+      }
+    },
+    "node_modules/cli-width": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-4.1.0.tgz",
+      "integrity": "sha512-ouuZd4/dm2Sw5Gmqy6bGyNNNe1qt9RpmxveLSO7KcgsTnU7RXfsw+/bukWGo1abgBiMAic068rclZsO4IWmmxQ==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">= 12"
+      }
+    },
+    "node_modules/cliui": {
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
+      "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.1",
+        "wrap-ansi": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/cliui/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/cliui/node_modules/string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/cliui/node_modules/wrap-ansi": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
+    "node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/combined-stream": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "delayed-stream": "~1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/commander": {
+      "version": "12.1.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-12.1.0.tgz",
+      "integrity": "sha512-Vw8qHK3bZM9y/P10u3Vib8o/DdkvA2OtPtZvD871QKjy74Wj1WSKFILMPRPSdUSx5RFK1arlJzEtA4PkFgnbuA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/compare-versions": {
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/compare-versions/-/compare-versions-6.1.1.tgz",
+      "integrity": "sha512-4hm4VPpIecmlg59CHXnRDnqGplJFrbLG4aFEl5vl6cK1u76ws3LLvX7ikFnTDl5vo39sjWD6AaDPYodJp/NNHg==",
+      "license": "MIT"
+    },
+    "node_modules/concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/convert-source-map": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
+      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/cookie": {
+      "version": "0.7.2",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.2.tgz",
+      "integrity": "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "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",
+      "integrity": "sha512-e4a5N8lVvuLgAWgnCrLr2PP0YyDOTHa9H/Rj54dirp61qXnNq46m82bRhNqIA5VccJtWBvPTFRV3TtvHUKPB1g==",
+      "license": "MIT",
+      "dependencies": {
+        "node-fetch": "^2.6.12"
+      }
+    },
+    "node_modules/cross-spawn": {
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
+      "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/crypto-js": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-4.2.0.tgz",
+      "integrity": "sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q==",
+      "license": "MIT"
+    },
+    "node_modules/cssfontparser": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/cssfontparser/-/cssfontparser-1.2.1.tgz",
+      "integrity": "sha512-6tun4LoZnj7VN6YeegOVb67KBX/7JJsqvj+pv3ZA7F878/eN33AbGa5b/S/wXxS/tcp8nc40xRUrsPlxIyNUPg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/cssstyle": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-4.3.0.tgz",
+      "integrity": "sha512-6r0NiY0xizYqfBvWp1G7WXJ06/bZyrk7Dc6PHql82C/pKGUTKu4yAX4Y8JPamb1ob9nBKuxWzCGTRuGwU3yxJQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@asamuzakjp/css-color": "^3.1.1",
+        "rrweb-cssom": "^0.8.0"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/dagre": {
+      "version": "0.8.5",
+      "resolved": "https://registry.npmjs.org/dagre/-/dagre-0.8.5.tgz",
+      "integrity": "sha512-/aTqmnRta7x7MCCpExk7HQL2O4owCT2h8NT//9I1OQ9vt29Pa0BzSAkR5lwFUcQ7491yVi/3CXU9jQ5o0Mn2Sw==",
+      "license": "MIT",
+      "dependencies": {
+        "graphlib": "^2.1.8",
+        "lodash": "^4.17.15"
+      }
+    },
+    "node_modules/data-urls": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-5.0.0.tgz",
+      "integrity": "sha512-ZYP5VBHshaDAiVZxjbRVcFJpc+4xGgT0bK3vzy1HLN8jTO975HEbuYzZJcHoQEY5K1a0z8YayJkyVETa08eNTg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "whatwg-mimetype": "^4.0.0",
+        "whatwg-url": "^14.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/debug": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
+      "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ms": "^2.1.3"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/decimal.js": {
+      "version": "10.4.3",
+      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.4.3.tgz",
+      "integrity": "sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/deep-eql": {
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-5.0.2.tgz",
+      "integrity": "sha512-h5k/5U50IJJFpzfL6nO9jaaumfjO/f2NjK/oYB2Djzm4p9L+3T9qWpZqZ2hAbLPuuYq9wrU08WQyBTL5GbPk5Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/deep-is": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
+      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/define-data-property": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
+      "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
+      "license": "MIT",
+      "dependencies": {
+        "es-define-property": "^1.0.0",
+        "es-errors": "^1.3.0",
+        "gopd": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/delayed-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/dependency-cruiser": {
+      "version": "16.3.10",
+      "resolved": "https://registry.npmjs.org/dependency-cruiser/-/dependency-cruiser-16.3.10.tgz",
+      "integrity": "sha512-WkCnibHBfvaiaQ+S46LZ6h4AR6oj42Vsf5/0Vgtrwdwn7ZekMJdZ/ALoTwNp/RaGlKW+MbV/fhSZOvmhAWVWzQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "acorn": "8.12.1",
+        "acorn-jsx": "5.3.2",
+        "acorn-jsx-walk": "2.0.0",
+        "acorn-loose": "8.4.0",
+        "acorn-walk": "8.3.3",
+        "ajv": "8.17.1",
+        "commander": "12.1.0",
+        "enhanced-resolve": "5.17.1",
+        "ignore": "5.3.1",
+        "interpret": "^3.1.1",
+        "is-installed-globally": "1.0.0",
+        "json5": "2.2.3",
+        "memoize": "10.0.0",
+        "picocolors": "1.0.1",
+        "picomatch": "4.0.2",
+        "prompts": "2.4.2",
+        "rechoir": "^0.8.0",
+        "safe-regex": "2.1.1",
+        "semver": "^7.6.3",
+        "teamcity-service-messages": "0.1.14",
+        "tsconfig-paths-webpack-plugin": "4.1.0",
+        "watskeburt": "4.1.0"
+      },
+      "bin": {
+        "depcruise": "bin/dependency-cruise.mjs",
+        "depcruise-baseline": "bin/depcruise-baseline.mjs",
+        "depcruise-fmt": "bin/depcruise-fmt.mjs",
+        "depcruise-wrap-stream-in-html": "bin/wrap-stream-in-html.mjs",
+        "dependency-cruise": "bin/dependency-cruise.mjs",
+        "dependency-cruiser": "bin/dependency-cruise.mjs"
+      },
+      "engines": {
+        "node": "^18.17||>=20"
+      }
+    },
+    "node_modules/doctrine": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
+      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "esutils": "^2.0.2"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/dunder-proto": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",
+      "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==",
+      "license": "MIT",
+      "dependencies": {
+        "call-bind-apply-helpers": "^1.0.1",
+        "es-errors": "^1.3.0",
+        "gopd": "^1.2.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/eastasianwidth": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
+      "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/electron-to-chromium": {
+      "version": "1.4.830",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.830.tgz",
+      "integrity": "sha512-TrPKKH20HeN0J1LHzsYLs2qwXrp8TF4nHdu4sq61ozGbzMpWhI7iIOPYPPkxeq1azMT9PZ8enPFcftbs/Npcjg==",
+      "dev": true
+    },
+    "node_modules/emoji-regex": {
+      "version": "9.2.2",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
+      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/enhanced-resolve": {
+      "version": "5.17.1",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz",
+      "integrity": "sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "graceful-fs": "^4.2.4",
+        "tapable": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/entities": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
+      "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "engines": {
+        "node": ">=0.12"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/entities?sponsor=1"
+      }
+    },
+    "node_modules/es-define-property": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz",
+      "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-errors": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
+      "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-module-lexer": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.6.0.tgz",
+      "integrity": "sha512-qqnD1yMU6tk/jnaMosogGySTZP8YtUgAffA9nMN+E/rjxcfRQ6IEk7IiozUjgxKoFHBGjTLnrHB/YC45r/59EQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/es-object-atoms": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz",
+      "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==",
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-set-tostringtag": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz",
+      "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.6",
+        "has-tostringtag": "^1.0.2",
+        "hasown": "^2.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/esbuild": {
+      "version": "0.25.2",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.2.tgz",
+      "integrity": "sha512-16854zccKPnC+toMywC+uKNeYSv+/eXkevRAfwRD/G9Cleq66m8XFIrigkbvauLLlCfDL45Q2cWegSg53gGBnQ==",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "MIT",
+      "bin": {
+        "esbuild": "bin/esbuild"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "optionalDependencies": {
+        "@esbuild/aix-ppc64": "0.25.2",
+        "@esbuild/android-arm": "0.25.2",
+        "@esbuild/android-arm64": "0.25.2",
+        "@esbuild/android-x64": "0.25.2",
+        "@esbuild/darwin-arm64": "0.25.2",
+        "@esbuild/darwin-x64": "0.25.2",
+        "@esbuild/freebsd-arm64": "0.25.2",
+        "@esbuild/freebsd-x64": "0.25.2",
+        "@esbuild/linux-arm": "0.25.2",
+        "@esbuild/linux-arm64": "0.25.2",
+        "@esbuild/linux-ia32": "0.25.2",
+        "@esbuild/linux-loong64": "0.25.2",
+        "@esbuild/linux-mips64el": "0.25.2",
+        "@esbuild/linux-ppc64": "0.25.2",
+        "@esbuild/linux-riscv64": "0.25.2",
+        "@esbuild/linux-s390x": "0.25.2",
+        "@esbuild/linux-x64": "0.25.2",
+        "@esbuild/netbsd-arm64": "0.25.2",
+        "@esbuild/netbsd-x64": "0.25.2",
+        "@esbuild/openbsd-arm64": "0.25.2",
+        "@esbuild/openbsd-x64": "0.25.2",
+        "@esbuild/sunos-x64": "0.25.2",
+        "@esbuild/win32-arm64": "0.25.2",
+        "@esbuild/win32-ia32": "0.25.2",
+        "@esbuild/win32-x64": "0.25.2"
+      }
+    },
+    "node_modules/escalade": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz",
+      "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/escape-string-regexp": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/eslint": {
+      "version": "9.23.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.23.0.tgz",
+      "integrity": "sha512-jV7AbNoFPAY1EkFYpLq5bslU9NLNO8xnEeQXwErNibVryjk67wHVmddTBilc5srIttJDBrB0eMHKZBFbSIABCw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@eslint-community/eslint-utils": "^4.2.0",
+        "@eslint-community/regexpp": "^4.12.1",
+        "@eslint/config-array": "^0.19.2",
+        "@eslint/config-helpers": "^0.2.0",
+        "@eslint/core": "^0.12.0",
+        "@eslint/eslintrc": "^3.3.1",
+        "@eslint/js": "9.23.0",
+        "@eslint/plugin-kit": "^0.2.7",
+        "@humanfs/node": "^0.16.6",
+        "@humanwhocodes/module-importer": "^1.0.1",
+        "@humanwhocodes/retry": "^0.4.2",
+        "@types/estree": "^1.0.6",
+        "@types/json-schema": "^7.0.15",
+        "ajv": "^6.12.4",
+        "chalk": "^4.0.0",
+        "cross-spawn": "^7.0.6",
+        "debug": "^4.3.2",
+        "escape-string-regexp": "^4.0.0",
+        "eslint-scope": "^8.3.0",
+        "eslint-visitor-keys": "^4.2.0",
+        "espree": "^10.3.0",
+        "esquery": "^1.5.0",
+        "esutils": "^2.0.2",
+        "fast-deep-equal": "^3.1.3",
+        "file-entry-cache": "^8.0.0",
+        "find-up": "^5.0.0",
+        "glob-parent": "^6.0.2",
+        "ignore": "^5.2.0",
+        "imurmurhash": "^0.1.4",
+        "is-glob": "^4.0.0",
+        "json-stable-stringify-without-jsonify": "^1.0.1",
+        "lodash.merge": "^4.6.2",
+        "minimatch": "^3.1.2",
+        "natural-compare": "^1.4.0",
+        "optionator": "^0.9.3"
+      },
+      "bin": {
+        "eslint": "bin/eslint.js"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "url": "https://eslint.org/donate"
+      },
+      "peerDependencies": {
+        "jiti": "*"
+      },
+      "peerDependenciesMeta": {
+        "jiti": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/eslint-import-resolver-node": {
+      "version": "0.3.9",
+      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz",
+      "integrity": "sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "debug": "^3.2.7",
+        "is-core-module": "^2.13.0",
+        "resolve": "^1.22.4"
+      }
+    },
+    "node_modules/eslint-import-resolver-node/node_modules/debug": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/eslint-plugin-import-x": {
+      "version": "4.10.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import-x/-/eslint-plugin-import-x-4.10.0.tgz",
+      "integrity": "sha512-5ej+0WILhX3D6wkcdsyYmPp10SUIK6fmuZ6KS8nf9MD8CJ6/S/3Dl7m21g+MLeaTMsvcEXo3JunNAbgHwXxs/g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@pkgr/core": "^0.2.0",
+        "@types/doctrine": "^0.0.9",
+        "@typescript-eslint/utils": "^8.28.0",
+        "debug": "^4.4.0",
+        "doctrine": "^3.0.0",
+        "eslint-import-resolver-node": "^0.3.9",
+        "get-tsconfig": "^4.10.0",
+        "is-glob": "^4.0.3",
+        "minimatch": "^9.0.3 || ^10.0.1",
+        "semver": "^7.7.1",
+        "stable-hash": "^0.0.5",
+        "tslib": "^2.8.1",
+        "unrs-resolver": "^1.3.3"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "peerDependencies": {
+        "eslint": "^8.57.0 || ^9.0.0"
+      }
+    },
+    "node_modules/eslint-scope": {
+      "version": "8.3.0",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.3.0.tgz",
+      "integrity": "sha512-pUNxi75F8MJ/GdeKtVLSbYg4ZI34J6C0C7sbL4YOp2exGwen7ZsuBqKzUhXd0qMQ362yET3z+uPwKeg/0C2XCQ==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^5.2.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/eslint-visitor-keys": {
+      "version": "3.4.3",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
+      "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/eslint/node_modules/ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/eslint/node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/eslint/node_modules/eslint-visitor-keys": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz",
+      "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/eslint/node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
+    },
+    "node_modules/eslint/node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/espree": {
+      "version": "10.3.0",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-10.3.0.tgz",
+      "integrity": "sha512-0QYC8b24HWY8zjRnDTL6RiHfDbAWn63qb4LMj1Z4b076A4une81+z03Kg7l7mn/48PUTqoLptSXez8oknU8Clg==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "acorn": "^8.14.0",
+        "acorn-jsx": "^5.3.2",
+        "eslint-visitor-keys": "^4.2.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/espree/node_modules/acorn": {
+      "version": "8.14.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.1.tgz",
+      "integrity": "sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/espree/node_modules/eslint-visitor-keys": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz",
+      "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/esquery": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz",
+      "integrity": "sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "estraverse": "^5.1.0"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/esrecurse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
+      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "estraverse": "^5.2.0"
+      },
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/estraverse": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/estree-walker": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-3.0.3.tgz",
+      "integrity": "sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/estree": "^1.0.0"
+      }
+    },
+    "node_modules/esutils": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/eventemitter3": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.1.tgz",
+      "integrity": "sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA==",
+      "license": "MIT"
+    },
+    "node_modules/events": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
+      "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.8.x"
+      }
+    },
+    "node_modules/expect-type": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/expect-type/-/expect-type-1.1.0.tgz",
+      "integrity": "sha512-bFi65yM+xZgk+u/KRIpekdSYkTB5W1pEf0Lt8Q8Msh7b+eQ7LXVtIB1Bkm4fvclDEL1b2CZkMhv2mOeF8tMdkA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/external-editor": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz",
+      "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "chardet": "^0.7.0",
+        "iconv-lite": "^0.4.24",
+        "tmp": "^0.0.33"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/fast-deep-equal": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/fast-glob": {
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.3.tgz",
+      "integrity": "sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@nodelib/fs.stat": "^2.0.2",
+        "@nodelib/fs.walk": "^1.2.3",
+        "glob-parent": "^5.1.2",
+        "merge2": "^1.3.0",
+        "micromatch": "^4.0.8"
+      },
+      "engines": {
+        "node": ">=8.6.0"
+      }
+    },
+    "node_modules/fast-glob/node_modules/glob-parent": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "is-glob": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/fast-json-stable-stringify": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/fast-levenshtein": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+      "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/fast-uri": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.1.tgz",
+      "integrity": "sha512-MWipKbbYiYI0UC7cl8m/i/IWTqfC8YXsqjzybjddLsFjStroQzsHXkc73JutMvBiXmOvapk+axIl79ig5t55Bw==",
+      "dev": true
+    },
+    "node_modules/fastq": {
+      "version": "1.19.1",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.19.1.tgz",
+      "integrity": "sha512-GwLTyxkCXjXbxqIhTsMI2Nui8huMPtnxg7krajPJAjnEG/iiOS7i+zCtWGZR9G0NBKbXKh6X9m9UIsYX/N6vvQ==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "reusify": "^1.0.4"
+      }
+    },
+    "node_modules/fdir": {
+      "version": "6.4.4",
+      "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.4.tgz",
+      "integrity": "sha512-1NZP+GK4GfuAv3PqKvxQRDMjdSRZjnkq7KfhlNrCNNlZ0ygQFpebfrnfnq/W7fpUnAv9aGWmY1zKx7FYL3gwhg==",
+      "dev": true,
+      "license": "MIT",
+      "peerDependencies": {
+        "picomatch": "^3 || ^4"
+      },
+      "peerDependenciesMeta": {
+        "picomatch": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/file-entry-cache": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-8.0.0.tgz",
+      "integrity": "sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "flat-cache": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/fill-range": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "to-regex-range": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/find-up": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
+      "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "locate-path": "^6.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/flat-cache": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-4.0.1.tgz",
+      "integrity": "sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "flatted": "^3.2.9",
+        "keyv": "^4.5.4"
+      },
+      "engines": {
+        "node": ">=16"
+      }
+    },
+    "node_modules/flatted": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.1.tgz",
+      "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/foreground-child": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.2.1.tgz",
+      "integrity": "sha512-PXUUyLqrR2XCWICfv6ukppP96sdFwWbNEnfEMt7jNsISjMsvaLNinAHNDYyvkyU+SZG2BTSbT5NjG+vZslfGTA==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "cross-spawn": "^7.0.0",
+        "signal-exit": "^4.0.1"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/form-data": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.2.tgz",
+      "integrity": "sha512-hGfm/slu0ZabnNt4oaRZ6uREyfCj6P4fT/n6A1rGV+Z0VdGXjfOhVUpkn6qVQONHGIFwmveGXyDs75+nr6FM8w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.8",
+        "es-set-tostringtag": "^2.1.0",
+        "mime-types": "^2.1.12"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/fsevents": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
+    "node_modules/function-bind": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/gensync": {
+      "version": "1.0.0-beta.2",
+      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
+      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/get-caller-file": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": "6.* || 8.* || >= 10.*"
+      }
+    },
+    "node_modules/get-intrinsic": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz",
+      "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==",
+      "license": "MIT",
+      "dependencies": {
+        "call-bind-apply-helpers": "^1.0.2",
+        "es-define-property": "^1.0.1",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.1.1",
+        "function-bind": "^1.1.2",
+        "get-proto": "^1.0.1",
+        "gopd": "^1.2.0",
+        "has-symbols": "^1.1.0",
+        "hasown": "^2.0.2",
+        "math-intrinsics": "^1.1.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/get-proto": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz",
+      "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==",
+      "license": "MIT",
+      "dependencies": {
+        "dunder-proto": "^1.0.1",
+        "es-object-atoms": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/get-tsconfig": {
+      "version": "4.10.0",
+      "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.10.0.tgz",
+      "integrity": "sha512-kGzZ3LWWQcGIAmg6iWvXn0ei6WDtV26wzHRMwDSzmAbcXrTEXxHy6IehI6/4eT6VRKyMP1eF1VqwrVUmE/LR7A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "resolve-pkg-maps": "^1.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/privatenumber/get-tsconfig?sponsor=1"
+      }
+    },
+    "node_modules/glob-parent": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
+      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "is-glob": "^4.0.3"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/global-directory": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/global-directory/-/global-directory-4.0.1.tgz",
+      "integrity": "sha512-wHTUcDUoZ1H5/0iVqEudYW4/kAlN5cZ3j/bXn0Dpbizl9iaUVeWSHqiOjsgk6OW2bkLclbBjzewBz6weQ1zA2Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ini": "4.1.1"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/globals": {
+      "version": "14.0.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-14.0.0.tgz",
+      "integrity": "sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/globrex": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/globrex/-/globrex-0.1.2.tgz",
+      "integrity": "sha512-uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/gopd": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
+      "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/graceful-fs": {
+      "version": "4.2.11",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
+      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/graphemer": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
+      "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/graphlib": {
+      "version": "2.1.8",
+      "resolved": "https://registry.npmjs.org/graphlib/-/graphlib-2.1.8.tgz",
+      "integrity": "sha512-jcLLfkpoVGmH7/InMC/1hIvOPSUh38oJtGhvrOFGzioE1DZ+0YW16RgmOJhHiuWTvGiJQ9Z1Ik43JvkRPRvE+A==",
+      "license": "MIT",
+      "dependencies": {
+        "lodash": "^4.17.15"
+      }
+    },
+    "node_modules/graphology": {
+      "version": "0.25.4",
+      "resolved": "https://registry.npmjs.org/graphology/-/graphology-0.25.4.tgz",
+      "integrity": "sha512-33g0Ol9nkWdD6ulw687viS8YJQBxqG5LWII6FI6nul0pq6iM2t5EKquOTFDbyTblRB3O9I+7KX4xI8u5ffekAQ==",
+      "license": "MIT",
+      "dependencies": {
+        "events": "^3.3.0",
+        "obliterator": "^2.0.2"
+      },
+      "peerDependencies": {
+        "graphology-types": ">=0.24.0"
+      }
+    },
+    "node_modules/graphology-types": {
+      "version": "0.24.8",
+      "resolved": "https://registry.npmjs.org/graphology-types/-/graphology-types-0.24.8.tgz",
+      "integrity": "sha512-hDRKYXa8TsoZHjgEaysSRyPdT6uB78Ci8WnjgbStlQysz7xR52PInxNsmnB7IBOM1BhikxkNyCVEFgmPKnpx3Q==",
+      "license": "MIT",
+      "peer": true
+    },
+    "node_modules/graphql": {
+      "version": "16.9.0",
+      "resolved": "https://registry.npmjs.org/graphql/-/graphql-16.9.0.tgz",
+      "integrity": "sha512-GGTKBX4SD7Wdb8mqeDLni2oaRGYQWjWHGKPQ24ZMnUtKfcsVoiv4uX8+LJr1K6U5VW2Lu1BwJnj7uiori0YtRw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^12.22.0 || ^14.16.0 || ^16.0.0 || >=17.0.0"
+      }
+    },
+    "node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/has-property-descriptors": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
+      "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
+      "license": "MIT",
+      "dependencies": {
+        "es-define-property": "^1.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-symbols": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz",
+      "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-tostringtag": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz",
+      "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "has-symbols": "^1.0.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/hasown": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
+      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
+      "license": "MIT",
+      "dependencies": {
+        "function-bind": "^1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/headers-polyfill": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/headers-polyfill/-/headers-polyfill-4.0.3.tgz",
+      "integrity": "sha512-IScLbePpkvO846sIwOtOTDjutRMWdXdJmXdMvk6gCBHxFO8d+QKOQedyZSxFTTFYRSmlgSTDtXqqq4pcenBXLQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/html-encoding-sniffer": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-4.0.0.tgz",
+      "integrity": "sha512-Y22oTqIU4uuPgEemfz7NDJz6OeKf12Lsu+QC+s3BVpda64lTiMYCyGwg5ki4vFxkMwQdeZDl2adZoqUgdFuTgQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "whatwg-encoding": "^3.1.1"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/html-escaper": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
+      "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/http-proxy-agent": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz",
+      "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "agent-base": "^7.1.0",
+        "debug": "^4.3.4"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/https-proxy-agent": {
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz",
+      "integrity": "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "agent-base": "^7.1.2",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/i18next": {
+      "version": "24.2.3",
+      "resolved": "https://registry.npmjs.org/i18next/-/i18next-24.2.3.tgz",
+      "integrity": "sha512-lfbf80OzkocvX7nmZtu7nSTNbrTYR52sLWxPtlXX1zAhVw8WEnFk4puUkCR4B1dNQwbSpEHHHemcZu//7EcB7A==",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://locize.com"
+        },
+        {
+          "type": "individual",
+          "url": "https://locize.com/i18next.html"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.i18next.com/how-to/faq#i18next-is-awesome.-how-can-i-support-the-project"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "@babel/runtime": "^7.26.10"
+      },
+      "peerDependencies": {
+        "typescript": "^5"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/i18next-browser-languagedetector": {
+      "version": "8.0.4",
+      "resolved": "https://registry.npmjs.org/i18next-browser-languagedetector/-/i18next-browser-languagedetector-8.0.4.tgz",
+      "integrity": "sha512-f3frU3pIxD50/Tz20zx9TD9HobKYg47fmAETb117GKGPrhwcSSPJDoCposXlVycVebQ9GQohC3Efbpq7/nnJ5w==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/runtime": "^7.23.2"
+      }
+    },
+    "node_modules/i18next-http-backend": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/i18next-http-backend/-/i18next-http-backend-3.0.2.tgz",
+      "integrity": "sha512-PdlvPnvIp4E1sYi46Ik4tBYh/v/NbYfFFgTjkwFl0is8A18s7/bx9aXqsrOax9WUbeNS6mD2oix7Z0yGGf6m5g==",
+      "license": "MIT",
+      "dependencies": {
+        "cross-fetch": "4.0.0"
+      }
+    },
+    "node_modules/i18next-korean-postposition-processor": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/i18next-korean-postposition-processor/-/i18next-korean-postposition-processor-1.0.0.tgz",
+      "integrity": "sha512-ruNXjI9awsFK6Ie+F9gYaMW8ciLMuCkeRjH9QkSv2Wb8xI0mnm773v3M9eua8dtvAXudIUk4p6Ho7hNkEASXDg==",
+      "license": "MIT",
+      "peerDependencies": {
+        "i18next": ">=8.4.0"
+      }
+    },
+    "node_modules/iconv-lite": {
+      "version": "0.4.24",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "safer-buffer": ">= 2.1.2 < 3"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ignore": {
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.1.tgz",
+      "integrity": "sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "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.1",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.1.tgz",
+      "integrity": "sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "parent-module": "^1.0.0",
+        "resolve-from": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "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",
+      "integrity": "sha512-QQnnxNyfvmHFIsj7gkPcYymR8Jdw/o7mp5ZFihxn6h8Ci6fh3Dx4E1gPjpQEpIuPo9XVNY/ZUwh4BPMjGyL01g==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/inquirer": {
+      "version": "12.5.0",
+      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-12.5.0.tgz",
+      "integrity": "sha512-aiBBq5aKF1k87MTxXDylLfwpRwToShiHrSv4EmB07EYyLgmnjEz5B3rn0aGw1X3JA/64Ngf2T54oGwc+BCsPIQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@inquirer/core": "^10.1.9",
+        "@inquirer/prompts": "^7.4.0",
+        "@inquirer/type": "^3.0.5",
+        "ansi-escapes": "^4.3.2",
+        "mute-stream": "^2.0.0",
+        "run-async": "^3.0.0",
+        "rxjs": "^7.8.2"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "@types/node": ">=18"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/interpret": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/interpret/-/interpret-3.1.1.tgz",
+      "integrity": "sha512-6xwYfHbajpoF0xLW+iwLkhwgvLoZDfjYfoFNu8ftMoXINzwuymNLd9u/KmwtdT2GbR+/Cz66otEGEVVUHX9QLQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/is-core-module": {
+      "version": "2.15.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.15.0.tgz",
+      "integrity": "sha512-Dd+Lb2/zvk9SKy1TGCt1wFJFo/MWBPMX5x7KcvLajWTGuomczdQX61PvY5yK6SVACwpoexWo81IfFyoKY2QnTA==",
+      "dev": true,
+      "dependencies": {
+        "hasown": "^2.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-glob": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-extglob": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-installed-globally": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-1.0.0.tgz",
+      "integrity": "sha512-K55T22lfpQ63N4KEN57jZUAaAYqYHEe8veb/TycJRk9DdSCLLcovXz/mL6mOnhQaZsQGwPhuFopdQIlqGSEjiQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "global-directory": "^4.0.1",
+        "is-path-inside": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/is-installed-globally/node_modules/is-path-inside": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-4.0.0.tgz",
+      "integrity": "sha512-lJJV/5dYS+RcL8uQdBDW9c9uWFLLBNRyFhnAKXw5tVqLlKZ4RMGZKv+YQ/IA3OhD+RpbJa1LLFM1FQPGyIXvOA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/is-node-process": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/is-node-process/-/is-node-process-1.2.0.tgz",
+      "integrity": "sha512-Vg4o6/fqPxIjtxgUH5QLJhwZ7gW5diGCVlXpuUfELC62CuxM1iHcRe51f2W1FDy04Ai4KJkagKjx3XaqyfRKXw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/is-number": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.12.0"
+      }
+    },
+    "node_modules/is-potential-custom-element-name": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz",
+      "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/isarray": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
+      "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
+      "license": "MIT"
+    },
+    "node_modules/isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/istanbul-lib-coverage": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz",
+      "integrity": "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/istanbul-lib-instrument": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.3.tgz",
+      "integrity": "sha512-Vtgk7L/R2JHyyGW07spoFlB8/lpjiOLTjMdms6AFMraYt3BaJauod/NGrfnVG/y4Ix1JEuMRPDPEj2ua+zz1/Q==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "@babel/core": "^7.23.9",
+        "@babel/parser": "^7.23.9",
+        "@istanbuljs/schema": "^0.1.3",
+        "istanbul-lib-coverage": "^3.2.0",
+        "semver": "^7.5.4"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/istanbul-lib-report": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz",
+      "integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "istanbul-lib-coverage": "^3.0.0",
+        "make-dir": "^4.0.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/istanbul-lib-source-maps": {
+      "version": "5.0.6",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-5.0.6.tgz",
+      "integrity": "sha512-yg2d+Em4KizZC5niWhQaIomgf5WlL4vOOjZ5xGCmF8SnPE/mDWWXgvRExdcpCgh9lLRRa1/fSYp2ymmbJ1pI+A==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "@jridgewell/trace-mapping": "^0.3.23",
+        "debug": "^4.1.1",
+        "istanbul-lib-coverage": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/istanbul-reports": {
+      "version": "3.1.7",
+      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.7.tgz",
+      "integrity": "sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "html-escaper": "^2.0.0",
+        "istanbul-lib-report": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jackspeak": {
+      "version": "3.4.3",
+      "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz",
+      "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==",
+      "dev": true,
+      "license": "BlueOak-1.0.0",
+      "dependencies": {
+        "@isaacs/cliui": "^8.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      },
+      "optionalDependencies": {
+        "@pkgjs/parseargs": "^0.11.0"
+      }
+    },
+    "node_modules/jest-canvas-mock": {
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/jest-canvas-mock/-/jest-canvas-mock-2.5.2.tgz",
+      "integrity": "sha512-vgnpPupjOL6+L5oJXzxTxFrlGEIbHdZqFU+LFNdtLxZ3lRDCl17FlTMM7IatoRQkrcyOTMlDinjUguqmQ6bR2A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cssfontparser": "^1.2.1",
+        "moo-color": "^1.0.2"
+      }
+    },
+    "node_modules/js-tokens": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/js-yaml": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+      "license": "MIT",
+      "dependencies": {
+        "argparse": "^2.0.1"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
+    "node_modules/jsdom": {
+      "version": "26.0.0",
+      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-26.0.0.tgz",
+      "integrity": "sha512-BZYDGVAIriBWTpIxYzrXjv3E/4u8+/pSG5bQdIYCbNCGOvsPkDQfTVLAIXAf9ETdCpduCVTkDe2NNZ8NIwUVzw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cssstyle": "^4.2.1",
+        "data-urls": "^5.0.0",
+        "decimal.js": "^10.4.3",
+        "form-data": "^4.0.1",
+        "html-encoding-sniffer": "^4.0.0",
+        "http-proxy-agent": "^7.0.2",
+        "https-proxy-agent": "^7.0.6",
+        "is-potential-custom-element-name": "^1.0.1",
+        "nwsapi": "^2.2.16",
+        "parse5": "^7.2.1",
+        "rrweb-cssom": "^0.8.0",
+        "saxes": "^6.0.0",
+        "symbol-tree": "^3.2.4",
+        "tough-cookie": "^5.0.0",
+        "w3c-xmlserializer": "^5.0.0",
+        "webidl-conversions": "^7.0.0",
+        "whatwg-encoding": "^3.1.1",
+        "whatwg-mimetype": "^4.0.0",
+        "whatwg-url": "^14.1.0",
+        "ws": "^8.18.0",
+        "xml-name-validator": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "canvas": "^3.0.0"
+      },
+      "peerDependenciesMeta": {
+        "canvas": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/jsdom/node_modules/tough-cookie": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-5.1.2.tgz",
+      "integrity": "sha512-FVDYdxtnj0G6Qm/DhNPSb8Ju59ULcup3tuJxkFb5K8Bv2pUXILbf0xZWU8PX8Ov19OXljbUyveOFwRMwkXzO+A==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "tldts": "^6.1.32"
+      },
+      "engines": {
+        "node": ">=16"
+      }
+    },
+    "node_modules/jsesc": {
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
+      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "jsesc": "bin/jsesc"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/json-buffer": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
+      "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/json-schema-traverse": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+      "dev": true
+    },
+    "node_modules/json-stable-stringify": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.2.1.tgz",
+      "integrity": "sha512-Lp6HbbBgosLmJbjx0pBLbgvx68FaFU1sdkmBuckmhhJ88kL13OA51CDtR2yJB50eCNMH9wRqtQNNiAqQH4YXnA==",
+      "license": "MIT",
+      "dependencies": {
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.3",
+        "isarray": "^2.0.5",
+        "jsonify": "^0.0.1",
+        "object-keys": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/json-stable-stringify-without-jsonify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
+      "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/json5": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
+      "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "json5": "lib/cli.js"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/jsonify": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.1.tgz",
+      "integrity": "sha512-2/Ki0GcmuqSrgFyelQq9M05y7PS0mEwuIzrf3f1fPqkVDVRvZrPZtVSMHxdgo8Aq0sxAOb/cr2aqqA3LeWHVPg==",
+      "license": "Public Domain",
+      "funding": {
+        "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",
+      "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "json-buffer": "3.0.1"
+      }
+    },
+    "node_modules/kleur": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
+      "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/lefthook": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/lefthook/-/lefthook-1.11.6.tgz",
+      "integrity": "sha512-j0VmMM50WlPDassmgvapRum9po29Tv1BXzBNFpzGkk9E91CEG9jKik/OHyH/r/na+q8qNIUUyPL6QQuTN/UhQQ==",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "MIT",
+      "bin": {
+        "lefthook": "bin/index.js"
+      },
+      "optionalDependencies": {
+        "lefthook-darwin-arm64": "1.11.6",
+        "lefthook-darwin-x64": "1.11.6",
+        "lefthook-freebsd-arm64": "1.11.6",
+        "lefthook-freebsd-x64": "1.11.6",
+        "lefthook-linux-arm64": "1.11.6",
+        "lefthook-linux-x64": "1.11.6",
+        "lefthook-openbsd-arm64": "1.11.6",
+        "lefthook-openbsd-x64": "1.11.6",
+        "lefthook-windows-arm64": "1.11.6",
+        "lefthook-windows-x64": "1.11.6"
+      }
+    },
+    "node_modules/lefthook-darwin-arm64": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/lefthook-darwin-arm64/-/lefthook-darwin-arm64-1.11.6.tgz",
+      "integrity": "sha512-gWgdWrKgZgX+bKc6Vs/x7JkO+58lLOpRzpteLx//82D0MKVPlNZwjd4zz4AbIBXtM4Hcj+6gSsOzQ7QDXxjVvQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/lefthook-darwin-x64": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/lefthook-darwin-x64/-/lefthook-darwin-x64-1.11.6.tgz",
+      "integrity": "sha512-Ia0TjTKuYcSaDTuoCnbWtpPZ2VEoKzgn33OB90VjNaSVs4ooE0PIdpO+w00x1elqIaf1pbrpq6HgeB26Du8KbQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/lefthook-freebsd-arm64": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/lefthook-freebsd-arm64/-/lefthook-freebsd-arm64-1.11.6.tgz",
+      "integrity": "sha512-PxIwj+hmjLahyzEmcIfalIBDhgklAQCavwM4sGCgbzDi4/+VQX+4aEs4pQqtd7v3aohmjtO/4n2emzTI8donww==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ]
+    },
+    "node_modules/lefthook-freebsd-x64": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/lefthook-freebsd-x64/-/lefthook-freebsd-x64-1.11.6.tgz",
+      "integrity": "sha512-3o1lMKxz1VtWaP/o117wgUn3ZOpefMoSf+8LuiTzI3/PDprIuzgyw2nXKlBZAMDpNPHMNnJeQNts9XLMRmkldg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ]
+    },
+    "node_modules/lefthook-linux-arm64": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/lefthook-linux-arm64/-/lefthook-linux-arm64-1.11.6.tgz",
+      "integrity": "sha512-nKPFZ5cA9f5tVn0ybDVqcXXlpTHZqo05N4KQRhWTj5Nem+JoD2YzJIlvZhdJhUrldERqj6deDMXChH5T3z4Rrw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/lefthook-linux-x64": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/lefthook-linux-x64/-/lefthook-linux-x64-1.11.6.tgz",
+      "integrity": "sha512-naN8dllLCOEeP+wznLnq+oXrs1dvt/iMLkcl+pOPWLqFccPfDiHzr8V8GslaTa+rSFsAnvjR7SJIOi5C29xedA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/lefthook-openbsd-arm64": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/lefthook-openbsd-arm64/-/lefthook-openbsd-arm64-1.11.6.tgz",
+      "integrity": "sha512-dPxhJfYQ667T+U3pz1+O3mTRNHzXH/BvPlXSH+oy8uiSry4AtVNRXkVvXPUcpLlrAy6HuFYodsrpCIlWFeYwiQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openbsd"
+      ]
+    },
+    "node_modules/lefthook-openbsd-x64": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/lefthook-openbsd-x64/-/lefthook-openbsd-x64-1.11.6.tgz",
+      "integrity": "sha512-9D26kcSsjiW4D0AuVDdi+0ZqrsOzRWOpMS/kcUbLfrU99yCvma0rMTqKbbDMkVur/znS7qL53oGahXCXDNA+IQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openbsd"
+      ]
+    },
+    "node_modules/lefthook-windows-arm64": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/lefthook-windows-arm64/-/lefthook-windows-arm64-1.11.6.tgz",
+      "integrity": "sha512-xdCenr4+BFnfBEhiXj6GJp02EPmcwTAGa7NYm6hVTfDwGXw24tuLv7lpnGjgK3kovN6EukgLH1FYkeyDOBEMnA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/lefthook-windows-x64": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/lefthook-windows-x64/-/lefthook-windows-x64-1.11.6.tgz",
+      "integrity": "sha512-Fg2GzLhzeDV/GX8+ydrI0wBOytQWpPkNdngx+a8B/feCDbwjAiFklDG5oV4ytuWrtg1JPEEWLJd6nHefj4wtHA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/levn": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
+      "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "prelude-ls": "^1.2.1",
+        "type-check": "~0.4.0"
+      },
+      "engines": {
+        "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",
+      "integrity": "sha512-5aHCbzQRADcdP+ATqnDuhhJ/MRIqDkZX5pyjFHRRysS8vZ5AbqGEoFIb6pYHPZ+L/OC2Lc+xT8uHVVR5CAK/wQ==",
+      "dev": true,
+      "dependencies": {
+        "uc.micro": "^2.0.0"
+      }
+    },
+    "node_modules/locate-path": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
+      "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "p-locate": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/lodash": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+      "license": "MIT"
+    },
+    "node_modules/lodash.merge": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
+      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/loupe": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/loupe/-/loupe-3.1.3.tgz",
+      "integrity": "sha512-kkIp7XSkP78ZxJEsSxW3712C6teJVoeHHwgo9zJ380de7IYyJ2ISlxojcH2pC5OFLewESmnRi/+XCDIEEVyoug==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/lru-cache": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "yallist": "^3.0.2"
+      }
+    },
+    "node_modules/lunr": {
+      "version": "2.3.9",
+      "resolved": "https://registry.npmjs.org/lunr/-/lunr-2.3.9.tgz",
+      "integrity": "sha512-zTU3DaZaF3Rt9rhN3uBMGQD3dD2/vFQqnvZCDv4dl5iOzq2IZQqTxu90r4E5J+nP70J3ilqVCrbho2eWaeW8Ow==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/magic-string": {
+      "version": "0.30.17",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.17.tgz",
+      "integrity": "sha512-sNPKHvyjVf7gyjwS4xGTaW/mCnF8wnjtifKBEhxfZ7E/S8tQ0rssrwGNn6q8JH/ohItJfSQp9mBtQYuTlH5QnA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jridgewell/sourcemap-codec": "^1.5.0"
+      }
+    },
+    "node_modules/magicast": {
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/magicast/-/magicast-0.3.5.tgz",
+      "integrity": "sha512-L0WhttDl+2BOsybvEOLK7fW3UA0OQ0IQ2d6Zl2x/a6vVRs3bAY0ECOSHHeL5jD+SbOpOCUEi0y1DgHEn9Qn1AQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/parser": "^7.25.4",
+        "@babel/types": "^7.25.4",
+        "source-map-js": "^1.2.0"
+      }
+    },
+    "node_modules/make-dir": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz",
+      "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "semver": "^7.5.3"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "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,
+      "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"
+      },
+      "bin": {
+        "markdown-it": "bin/markdown-it.mjs"
+      }
+    },
+    "node_modules/math-intrinsics": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
+      "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "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
+    },
+    "node_modules/memoize": {
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/memoize/-/memoize-10.0.0.tgz",
+      "integrity": "sha512-H6cBLgsi6vMWOcCpvVCdFFnl3kerEXbrYh9q+lY6VXvQSmM6CkmV08VOwT+WE2tzIEqRPFfAq3fm4v/UIW6mSA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "mimic-function": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/memoize?sponsor=1"
+      }
+    },
+    "node_modules/merge2": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
+      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/micromatch": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
+      "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "braces": "^3.0.3",
+        "picomatch": "^2.3.1"
+      },
+      "engines": {
+        "node": ">=8.6"
+      }
+    },
+    "node_modules/micromatch/node_modules/picomatch": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "node_modules/mime-db": {
+      "version": "1.52.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/mime-types": {
+      "version": "2.1.35",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "mime-db": "1.52.0"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/mimic-function": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/mimic-function/-/mimic-function-5.0.1.tgz",
+      "integrity": "sha512-VP79XUPxV2CigYP3jWwAUFSku2aKqBH7uTAapFWCBqutsbmDo96KY5o8uh6U+/YSIn5OxJnXp73beVkpqMIGhA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/minimatch": {
+      "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"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/minimist": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
+      "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/minipass": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
+      "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      }
+    },
+    "node_modules/moo-color": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/moo-color/-/moo-color-1.0.3.tgz",
+      "integrity": "sha512-i/+ZKXMDf6aqYtBhuOcej71YSlbjT3wCO/4H1j8rPvxDJEifdwgg5MaFyu6iYAT8GBZJg2z0dkgK4YMzvURALQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "color-name": "^1.1.4"
+      }
+    },
+    "node_modules/ms": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/msw": {
+      "version": "2.7.3",
+      "resolved": "https://registry.npmjs.org/msw/-/msw-2.7.3.tgz",
+      "integrity": "sha512-+mycXv8l2fEAjFZ5sjrtjJDmm2ceKGjrNbBr1durRg6VkU9fNUE/gsmQ51hWbHqs+l35W1iM+ZsmOD9Fd6lspw==",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "MIT",
+      "dependencies": {
+        "@bundled-es-modules/cookie": "^2.0.1",
+        "@bundled-es-modules/statuses": "^1.0.1",
+        "@bundled-es-modules/tough-cookie": "^0.1.6",
+        "@inquirer/confirm": "^5.0.0",
+        "@mswjs/interceptors": "^0.37.0",
+        "@open-draft/deferred-promise": "^2.2.0",
+        "@open-draft/until": "^2.1.0",
+        "@types/cookie": "^0.6.0",
+        "@types/statuses": "^2.0.4",
+        "graphql": "^16.8.1",
+        "headers-polyfill": "^4.0.2",
+        "is-node-process": "^1.2.0",
+        "outvariant": "^1.4.3",
+        "path-to-regexp": "^6.3.0",
+        "picocolors": "^1.1.1",
+        "strict-event-emitter": "^0.5.1",
+        "type-fest": "^4.26.1",
+        "yargs": "^17.7.2"
+      },
+      "bin": {
+        "msw": "cli/index.js"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/mswjs"
+      },
+      "peerDependencies": {
+        "typescript": ">= 4.8.x"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/msw/node_modules/picocolors": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
+      "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/msw/node_modules/type-fest": {
+      "version": "4.26.1",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.26.1.tgz",
+      "integrity": "sha512-yOGpmOAL7CkKe/91I5O3gPICmJNLJ1G4zFYVAsRHg7M64biSnPtRj0WNQt++bRkjYOqjWXrhnUw1utzmVErAdg==",
+      "dev": true,
+      "license": "(MIT OR CC0-1.0)",
+      "engines": {
+        "node": ">=16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/mustache": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/mustache/-/mustache-4.2.0.tgz",
+      "integrity": "sha512-71ippSywq5Yb7/tVYyGbkBggbU8H3u5Rz56fH60jGFgr8uHwxs+aSKeqmluIVzM0m0kB7xQjKS6qPfd0b2ZoqQ==",
+      "license": "MIT",
+      "bin": {
+        "mustache": "bin/mustache"
+      }
+    },
+    "node_modules/mute-stream": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-2.0.0.tgz",
+      "integrity": "sha512-WWdIxpyjEn+FhQJQQv9aQAYlHoNVdzIzUySNV1gHUPDSdZJ3yZn7pAAbQcV7B56Mvu881q9FZV+0Vx2xC44VWA==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/nanoid": {
+      "version": "3.3.11",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.11.tgz",
+      "integrity": "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "MIT",
+      "bin": {
+        "nanoid": "bin/nanoid.cjs"
+      },
+      "engines": {
+        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+      }
+    },
+    "node_modules/natural-compare": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/node-fetch": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
+      "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==",
+      "license": "MIT",
+      "dependencies": {
+        "whatwg-url": "^5.0.0"
+      },
+      "engines": {
+        "node": "4.x || >=6.0.0"
+      },
+      "peerDependencies": {
+        "encoding": "^0.1.0"
+      },
+      "peerDependenciesMeta": {
+        "encoding": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/node-fetch/node_modules/tr46": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
+    },
+    "node_modules/node-fetch/node_modules/webidl-conversions": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
+    },
+    "node_modules/node-fetch/node_modules/whatwg-url": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
+      "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
+      "dependencies": {
+        "tr46": "~0.0.3",
+        "webidl-conversions": "^3.0.0"
+      }
+    },
+    "node_modules/node-releases": {
+      "version": "2.0.17",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.17.tgz",
+      "integrity": "sha512-Ww6ZlOiEQfPfXM45v17oabk77Z7mg5bOt7AjDyzy7RjK9OrLrLC8dyZQoAPEOtFX9SaNf1Tdvr5gRJWdTJj7GA==",
+      "dev": true
+    },
+    "node_modules/nwsapi": {
+      "version": "2.2.20",
+      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.20.tgz",
+      "integrity": "sha512-/ieB+mDe4MrrKMT8z+mQL8klXydZWGR5Dowt4RAGKbJ3kIGEx3X4ljUo+6V73IXtUPWgfOlU5B9MlGxFO5T+cA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/object-keys": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/obliterator": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/obliterator/-/obliterator-2.0.5.tgz",
+      "integrity": "sha512-42CPE9AhahZRsMNslczq0ctAEtqk8Eka26QofnqC346BZdHDySk3LWka23LI7ULIw11NmltpiLagIq8gBozxTw==",
+      "license": "MIT"
+    },
+    "node_modules/optionator": {
+      "version": "0.9.4",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz",
+      "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "deep-is": "^0.1.3",
+        "fast-levenshtein": "^2.0.6",
+        "levn": "^0.4.1",
+        "prelude-ls": "^1.2.1",
+        "type-check": "^0.4.0",
+        "word-wrap": "^1.2.5"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/os-tmpdir": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+      "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/outvariant": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/outvariant/-/outvariant-1.4.3.tgz",
+      "integrity": "sha512-+Sl2UErvtsoajRDKCE5/dBz4DIvHXQQnAxtQTF04OJxY0+DyZXSo5P5Bb7XYWOh81syohlYL24hbDwxedPUJCA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/p-limit": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "yocto-queue": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/p-locate": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
+      "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "p-limit": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/package-json-from-dist": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.0.tgz",
+      "integrity": "sha512-dATvCeZN/8wQsGywez1mzHtTlP22H8OEfPrVMLNr4/eGa+ijtLn/6M5f0dY8UKNrC2O9UCU6SSoG3qRKnt7STw==",
+      "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",
+      "integrity": "sha512-HipMsgJkZu8br23pW15uvo6sib6wne/4woLZPlFf3rpDyMe9ywEXUsuD7+6K9PRkJlVT51j/sCOYDKGGS3ZJrw==",
+      "license": "MIT"
+    },
+    "node_modules/parent-module": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
+      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "callsites": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/parse5": {
+      "version": "7.2.1",
+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.2.1.tgz",
+      "integrity": "sha512-BuBYQYlv1ckiPdQi/ohiivi9Sagc9JG+Ozs0r7b/0iK3sKmrb0b9FdWdBbOdx6hBCM/F9Ir82ofnBhtZOjCRPQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "entities": "^4.5.0"
+      },
+      "funding": {
+        "url": "https://github.com/inikulin/parse5?sponsor=1"
+      }
+    },
+    "node_modules/path-exists": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/path-key": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/path-parse": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/path-scurry": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz",
+      "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==",
+      "dev": true,
+      "license": "BlueOak-1.0.0",
+      "dependencies": {
+        "lru-cache": "^10.2.0",
+        "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/path-scurry/node_modules/lru-cache": {
+      "version": "10.4.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
+      "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/path-to-regexp": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.3.0.tgz",
+      "integrity": "sha512-Yhpw4T9C6hPpgPeA28us07OJeqZ5EzQTkbfwuhsUg0c237RomFoETJgmp2sa3F/41gfLE6G5cqcYwznmeEeOlQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/pathe": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/pathe/-/pathe-2.0.3.tgz",
+      "integrity": "sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/pathval": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/pathval/-/pathval-2.0.0.tgz",
+      "integrity": "sha512-vE7JKRyES09KiunauX7nd2Q9/L7lhok4smP9RZTDeD4MVs72Dp2qNFVz39Nz5a0FVEW0BJR6C0DYrq6unoziZA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 14.16"
+      }
+    },
+    "node_modules/phaser": {
+      "version": "3.88.2",
+      "resolved": "https://registry.npmjs.org/phaser/-/phaser-3.88.2.tgz",
+      "integrity": "sha512-UBgd2sAFuRJbF2xKaQ5jpMWB8oETncChLnymLGHcrnT53vaqiGrQWbUKUDBawKLm24sghjKo4Bf+/xfv8espZQ==",
+      "license": "MIT",
+      "dependencies": {
+        "eventemitter3": "^5.0.1"
+      }
+    },
+    "node_modules/phaser3-rex-plugins": {
+      "version": "1.80.15",
+      "resolved": "https://registry.npmjs.org/phaser3-rex-plugins/-/phaser3-rex-plugins-1.80.15.tgz",
+      "integrity": "sha512-Ur973N1W5st6XEYBcJko8eTcEbdDHMM+m7VqvT3j/EJeJwYyJ3bVb33JJDsFgefk3A2iAz2itP/UY7CzxJOJVA==",
+      "license": "MIT",
+      "dependencies": {
+        "dagre": "^0.8.5",
+        "eventemitter3": "^3.1.2",
+        "graphology": "^0.25.4",
+        "i18next": "^22.5.1",
+        "i18next-http-backend": "^2.5.2",
+        "js-yaml": "^4.1.0",
+        "mustache": "^4.2.0",
+        "papaparse": "^5.4.1",
+        "webfontloader": "^1.6.28"
+      }
+    },
+    "node_modules/phaser3-rex-plugins/node_modules/eventemitter3": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.2.tgz",
+      "integrity": "sha512-tvtQIeLVHjDkJYnzf2dgVMxfuSGJeM/7UCG17TT4EumTfNtF+0nebF/4zWOIkCreAbtNqhGEboB6BWrwqNaw4Q==",
+      "license": "MIT"
+    },
+    "node_modules/phaser3-rex-plugins/node_modules/i18next": {
+      "version": "22.5.1",
+      "resolved": "https://registry.npmjs.org/i18next/-/i18next-22.5.1.tgz",
+      "integrity": "sha512-8TGPgM3pAD+VRsMtUMNknRz3kzqwp/gPALrWMsDnmC1mKqJwpWyooQRLMcbTwq8z8YwSmuj+ZYvc+xCuEpkssA==",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://locize.com"
+        },
+        {
+          "type": "individual",
+          "url": "https://locize.com/i18next.html"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.i18next.com/how-to/faq#i18next-is-awesome.-how-can-i-support-the-project"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "@babel/runtime": "^7.20.6"
+      }
+    },
+    "node_modules/phaser3-rex-plugins/node_modules/i18next-http-backend": {
+      "version": "2.7.3",
+      "resolved": "https://registry.npmjs.org/i18next-http-backend/-/i18next-http-backend-2.7.3.tgz",
+      "integrity": "sha512-FgZxrXdRA5u44xfYsJlEBL4/KH3f2IluBpgV/7riW0YW2VEyM8FzVt2XHAOi6id0Ppj7vZvCZVpp5LrGXnc8Ig==",
+      "license": "MIT",
+      "dependencies": {
+        "cross-fetch": "4.0.0"
+      }
+    },
+    "node_modules/phaser3spectorjs": {
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/phaser3spectorjs/-/phaser3spectorjs-0.0.8.tgz",
+      "integrity": "sha512-0dSO7/aMjEUPrp5EcjRvRRsEf+jXDbmzalPeJ6VtTB2Pn1PeaKc+qlL/DmO3l1Dvc5lkzc+Sil1Ta+Hkyi5cbA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/picocolors": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.1.tgz",
+      "integrity": "sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==",
+      "dev": true
+    },
+    "node_modules/picomatch": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz",
+      "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "node_modules/postcss": {
+      "version": "8.5.3",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.3.tgz",
+      "integrity": "sha512-dle9A3yYxlBSrt8Fu+IpjGT8SY8hN0mlaA6GY8t0P5PjIOZemULz/E2Bnm/2dcUOena75OTNkHI76uZBNUUq3A==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/postcss/"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/postcss"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "nanoid": "^3.3.8",
+        "picocolors": "^1.1.1",
+        "source-map-js": "^1.2.1"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >=14"
+      }
+    },
+    "node_modules/postcss/node_modules/picocolors": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
+      "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/prelude-ls": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
+      "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "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",
+      "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "kleur": "^3.0.3",
+        "sisteransi": "^1.0.5"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/psl": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz",
+      "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/punycode": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
+      "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
+      "dev": true,
+      "engines": {
+        "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,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/querystringify": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
+      "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/queue-microtask": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
+      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "license": "MIT"
+    },
+    "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",
+      "integrity": "sha512-/vxpCXddiX8NGfGO/mTafwjq4aFa/71pvamip0++IQk3zG8cbCj0fifNPrjjF1XMXUne91jL9OoxmdykoEtifQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "resolve": "^1.20.0"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      }
+    },
+    "node_modules/regenerator-runtime": {
+      "version": "0.14.1",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz",
+      "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==",
+      "license": "MIT"
+    },
+    "node_modules/regexp-tree": {
+      "version": "0.1.27",
+      "resolved": "https://registry.npmjs.org/regexp-tree/-/regexp-tree-0.1.27.tgz",
+      "integrity": "sha512-iETxpjK6YoRWJG5o6hXLwvjYAoW+FEZn9os0PD/b6AP6xQwsa/Y7lCVgIixBbUPMfhu+i2LtdeAqVTgGlQarfA==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "regexp-tree": "bin/regexp-tree"
+      }
+    },
+    "node_modules/require-directory": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+      "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/require-from-string": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
+      "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/requires-port": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
+      "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/resolve": {
+      "version": "1.22.8",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz",
+      "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-core-module": "^2.13.0",
+        "path-parse": "^1.0.7",
+        "supports-preserve-symlinks-flag": "^1.0.0"
+      },
+      "bin": {
+        "resolve": "bin/resolve"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/resolve-from": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/resolve-pkg-maps": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz",
+      "integrity": "sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/privatenumber/resolve-pkg-maps?sponsor=1"
+      }
+    },
+    "node_modules/reusify": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.1.0.tgz",
+      "integrity": "sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "iojs": ">=1.0.0",
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/rollup": {
+      "version": "4.40.1",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.40.1.tgz",
+      "integrity": "sha512-C5VvvgCCyfyotVITIAv+4efVytl5F7wt+/I2i9q9GZcEXW9BP52YYOXC58igUi+LFZVHukErIIqQSWwv/M3WRw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/estree": "1.0.7"
+      },
+      "bin": {
+        "rollup": "dist/bin/rollup"
+      },
+      "engines": {
+        "node": ">=18.0.0",
+        "npm": ">=8.0.0"
+      },
+      "optionalDependencies": {
+        "@rollup/rollup-android-arm-eabi": "4.40.1",
+        "@rollup/rollup-android-arm64": "4.40.1",
+        "@rollup/rollup-darwin-arm64": "4.40.1",
+        "@rollup/rollup-darwin-x64": "4.40.1",
+        "@rollup/rollup-freebsd-arm64": "4.40.1",
+        "@rollup/rollup-freebsd-x64": "4.40.1",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.40.1",
+        "@rollup/rollup-linux-arm-musleabihf": "4.40.1",
+        "@rollup/rollup-linux-arm64-gnu": "4.40.1",
+        "@rollup/rollup-linux-arm64-musl": "4.40.1",
+        "@rollup/rollup-linux-loongarch64-gnu": "4.40.1",
+        "@rollup/rollup-linux-powerpc64le-gnu": "4.40.1",
+        "@rollup/rollup-linux-riscv64-gnu": "4.40.1",
+        "@rollup/rollup-linux-riscv64-musl": "4.40.1",
+        "@rollup/rollup-linux-s390x-gnu": "4.40.1",
+        "@rollup/rollup-linux-x64-gnu": "4.40.1",
+        "@rollup/rollup-linux-x64-musl": "4.40.1",
+        "@rollup/rollup-win32-arm64-msvc": "4.40.1",
+        "@rollup/rollup-win32-ia32-msvc": "4.40.1",
+        "@rollup/rollup-win32-x64-msvc": "4.40.1",
+        "fsevents": "~2.3.2"
+      }
+    },
+    "node_modules/rrweb-cssom": {
+      "version": "0.8.0",
+      "resolved": "https://registry.npmjs.org/rrweb-cssom/-/rrweb-cssom-0.8.0.tgz",
+      "integrity": "sha512-guoltQEx+9aMf2gDZ0s62EcV8lsXR+0w8915TC3ITdn2YueuNjdAYh/levpU9nFaoChh9RUS5ZdQMrKfVEN9tw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/run-async": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/run-async/-/run-async-3.0.0.tgz",
+      "integrity": "sha512-540WwVDOMxA6dN6We19EcT9sc3hkXPw5mzRNGM3FkdN/vtE9NFvj5lFAPNwUDmJjXidm3v7TC1cTE7t17Ulm1Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.12.0"
+      }
+    },
+    "node_modules/run-parallel": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
+      "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "queue-microtask": "^1.2.2"
+      }
+    },
+    "node_modules/rxjs": {
+      "version": "7.8.2",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.2.tgz",
+      "integrity": "sha512-dhKf903U/PQZY6boNNtAGdWbG85WAbjT/1xYoZIC7FAY0yWapOBQVsVrDl58W86//e1VpMNBtRV4MaXfdMySFA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "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",
+      "integrity": "sha512-rx+x8AMzKb5Q5lQ95Zoi6ZbJqwCLkqi3XuJXp5P3rT8OEc6sZCJG5AE5dU3lsgRr/F4Bs31jSlVN+j5KrsGu9A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "regexp-tree": "~0.1.1"
+      }
+    },
+    "node_modules/safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/saxes": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/saxes/-/saxes-6.0.0.tgz",
+      "integrity": "sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "xmlchars": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=v12.22.7"
+      }
+    },
+    "node_modules/semver": {
+      "version": "7.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
+      "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/set-function-length": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
+      "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==",
+      "license": "MIT",
+      "dependencies": {
+        "define-data-property": "^1.1.4",
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2",
+        "get-intrinsic": "^1.2.4",
+        "gopd": "^1.0.1",
+        "has-property-descriptors": "^1.0.2"
+      },
+      "engines": {
+        "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",
+      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "shebang-regex": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/shebang-regex": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/siginfo": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/siginfo/-/siginfo-2.0.0.tgz",
+      "integrity": "sha512-ybx0WO1/8bSBLEWXZvEd7gMW3Sn3JFlW3TvX1nREbDLRNQNaeNN8WK0meBwPdAaOI7TtRRRJn/Es1zhrrCHu7g==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/signal-exit": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
+      "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/sisteransi": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
+      "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/source-map-js": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
+      "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/stable-hash": {
+      "version": "0.0.5",
+      "resolved": "https://registry.npmjs.org/stable-hash/-/stable-hash-0.0.5.tgz",
+      "integrity": "sha512-+L3ccpzibovGXFK+Ap/f8LOS0ahMrHTf3xu7mMLSpEGU0EO9ucaysSylKo9eRDFNhWve/y275iPmIZ4z39a9iA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/stackback": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/stackback/-/stackback-0.0.2.tgz",
+      "integrity": "sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/statuses": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/std-env": {
+      "version": "3.8.0",
+      "resolved": "https://registry.npmjs.org/std-env/-/std-env-3.8.0.tgz",
+      "integrity": "sha512-Bc3YwwCB+OzldMxOXJIIvC6cPRWr/LxOp48CdQTOkPyk/t4JWWJbrilwBd7RJzKV8QW7tJkcgAmeuLLJugl5/w==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/strict-event-emitter": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/strict-event-emitter/-/strict-event-emitter-0.5.1.tgz",
+      "integrity": "sha512-vMgjE/GGEPEFnhFub6pa4FmJBRBVOLpIII2hvCZ8Kzb7K0hlHo7mQv6xYrBvCL2LtAIBwFUK8wvuJgTVSQ5MFQ==",
+      "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",
+      "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "eastasianwidth": "^0.2.0",
+        "emoji-regex": "^9.2.2",
+        "strip-ansi": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/string-width-cjs": {
+      "name": "string-width",
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/string-width-cjs/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/string-width/node_modules/ansi-regex": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
+      "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+      }
+    },
+    "node_modules/string-width/node_modules/strip-ansi": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
+      "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+      }
+    },
+    "node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-ansi-cjs": {
+      "name": "strip-ansi",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-bom": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+      "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/strip-json-comments": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/supports-preserve-symlinks-flag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
+      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/symbol-tree": {
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
+      "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/tapable": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
+      "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/teamcity-service-messages": {
+      "version": "0.1.14",
+      "resolved": "https://registry.npmjs.org/teamcity-service-messages/-/teamcity-service-messages-0.1.14.tgz",
+      "integrity": "sha512-29aQwaHqm8RMX74u2o/h1KbMLP89FjNiMxD9wbF2BbWOnbM+q+d1sCEC+MqCc4QW3NJykn77OMpTFw/xTHIc0w==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/test-exclude": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-7.0.1.tgz",
+      "integrity": "sha512-pFYqmTw68LXVjeWJMST4+borgQP2AyMNbg1BpZh9LbyhUeNkeaPF9gzfPGUAnSMV3qPYdWUwDIjjCLiSDOl7vg==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "@istanbuljs/schema": "^0.1.2",
+        "glob": "^10.4.1",
+        "minimatch": "^9.0.4"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/test-exclude/node_modules/glob": {
+      "version": "10.4.5",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
+      "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "foreground-child": "^3.1.0",
+        "jackspeak": "^3.1.2",
+        "minimatch": "^9.0.4",
+        "minipass": "^7.1.2",
+        "package-json-from-dist": "^1.0.0",
+        "path-scurry": "^1.11.1"
+      },
+      "bin": {
+        "glob": "dist/esm/bin.mjs"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/tinybench": {
+      "version": "2.9.0",
+      "resolved": "https://registry.npmjs.org/tinybench/-/tinybench-2.9.0.tgz",
+      "integrity": "sha512-0+DUvqWMValLmha6lr4kD8iAMK1HzV0/aKnCtWb9v9641TnP/MFb7Pc2bxoxQjTXAErryXVgUOfv2YqNllqGeg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/tinyexec": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/tinyexec/-/tinyexec-0.3.2.tgz",
+      "integrity": "sha512-KQQR9yN7R5+OSwaK0XQoj22pwHoTlgYqmUscPYoknOoWCWfj/5/ABTMRi69FrKU5ffPVh5QcFikpWJI/P1ocHA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/tinyglobby": {
+      "version": "0.2.13",
+      "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.13.tgz",
+      "integrity": "sha512-mEwzpUgrLySlveBwEVDMKk5B57bhLPYovRfPAXD5gA/98Opn0rCDj3GtLwFvCvH5RK9uPCExUROW5NjDwvqkxw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fdir": "^6.4.4",
+        "picomatch": "^4.0.2"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/SuperchupuDev"
+      }
+    },
+    "node_modules/tinypool": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/tinypool/-/tinypool-1.0.2.tgz",
+      "integrity": "sha512-al6n+QEANGFOMf/dmUMsuS5/r9B06uwlyNjZZql/zv8J7ybHCgoihBNORZCY2mzUuAnomQa2JdhyHKzZxPCrFA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^18.0.0 || >=20.0.0"
+      }
+    },
+    "node_modules/tinyrainbow": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/tinyrainbow/-/tinyrainbow-2.0.0.tgz",
+      "integrity": "sha512-op4nsTR47R6p0vMUUoYl/a+ljLFVtlfaXkLQmqfLR1qHma1h/ysYk4hEXZ880bf2CYgTskvTa/e196Vd5dDQXw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/tinyspy": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/tinyspy/-/tinyspy-3.0.2.tgz",
+      "integrity": "sha512-n1cw8k1k0x4pgA2+9XrOkFydTerNcJ1zWCO5Nn9scWHTD+5tp8dghT2x1uduQePZTZgd3Tupf+x9BxJjeJi77Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/tldts": {
+      "version": "6.1.85",
+      "resolved": "https://registry.npmjs.org/tldts/-/tldts-6.1.85.tgz",
+      "integrity": "sha512-gBdZ1RjCSevRPFix/hpaUWeak2/RNUZB4/8frF1r5uYMHjFptkiT0JXIebWvgI/0ZHXvxaUDDJshiA0j6GdL3w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "tldts-core": "^6.1.85"
+      },
+      "bin": {
+        "tldts": "bin/cli.js"
+      }
+    },
+    "node_modules/tldts-core": {
+      "version": "6.1.85",
+      "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-6.1.85.tgz",
+      "integrity": "sha512-DTjUVvxckL1fIoPSb3KE7ISNtkWSawZdpfxGxwiIrZoO6EbHVDXXUIlIuWympPaeS+BLGyggozX/HTMsRAdsoA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/tmp": {
+      "version": "0.0.33",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
+      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "os-tmpdir": "~1.0.2"
+      },
+      "engines": {
+        "node": ">=0.6.0"
+      }
+    },
+    "node_modules/to-regex-range": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-number": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=8.0"
+      }
+    },
+    "node_modules/tough-cookie": {
+      "version": "4.1.4",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.4.tgz",
+      "integrity": "sha512-Loo5UUvLD9ScZ6jh8beX1T6sO1w2/MpCRpEP7V280GKMVUQ0Jzar2U3UJPsrdbziLEMMhu3Ujnq//rhiFuIeag==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "psl": "^1.1.33",
+        "punycode": "^2.1.1",
+        "universalify": "^0.2.0",
+        "url-parse": "^1.5.3"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/tr46": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-5.1.0.tgz",
+      "integrity": "sha512-IUWnUK7ADYR5Sl1fZlO1INDUhVhatWl7BtJWsIhwJ0UAK7ilzzIa8uIqOO/aYVWHZPJkKbEL+362wrzoeRF7bw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "punycode": "^2.3.1"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/ts-api-utils": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.1.0.tgz",
+      "integrity": "sha512-CUgTZL1irw8u29bzrOD/nH85jqyc74D6SshFgujOIA7osm2Rz7dYH77agkx7H4FBNxDq7Cjf+IjaX/8zwFW+ZQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18.12"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.8.4"
+      }
+    },
+    "node_modules/tsconfck": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/tsconfck/-/tsconfck-3.1.1.tgz",
+      "integrity": "sha512-00eoI6WY57SvZEVjm13stEVE90VkEdJAFGgpFLTsZbJyW/LwFQ7uQxJHWpZ2hzSWgCPKc9AnBnNP+0X7o3hAmQ==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "tsconfck": "bin/tsconfck.js"
+      },
+      "engines": {
+        "node": "^18 || >=20"
+      },
+      "peerDependencies": {
+        "typescript": "^5.0.0"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/tsconfig-paths-webpack-plugin": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/tsconfig-paths-webpack-plugin/-/tsconfig-paths-webpack-plugin-4.1.0.tgz",
+      "integrity": "sha512-xWFISjviPydmtmgeUAuXp4N1fky+VCtfhOkDUFIv5ea7p4wuTomI4QTrXvFBX2S4jZsmyTSrStQl+E+4w+RzxA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "chalk": "^4.1.0",
+        "enhanced-resolve": "^5.7.0",
+        "tsconfig-paths": "^4.1.2"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/tsconfig-paths-webpack-plugin/node_modules/tsconfig-paths": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-4.2.0.tgz",
+      "integrity": "sha512-NoZ4roiN7LnbKn9QqE1amc9DJfzvZXxF4xDavcOWt1BPkdx+m+0gJuPM+S0vCe7zTJMYUP0R8pO2XMr+Y8oLIg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "json5": "^2.2.2",
+        "minimist": "^1.2.6",
+        "strip-bom": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/tslib": {
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+      "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+      "dev": true,
+      "license": "0BSD"
+    },
+    "node_modules/type-check": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
+      "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "prelude-ls": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/type-fest": {
+      "version": "0.21.3",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
+      "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
+      "dev": true,
+      "license": "(MIT OR CC0-1.0)",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/typedoc": {
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/typedoc/-/typedoc-0.28.1.tgz",
+      "integrity": "sha512-Mn2VPNMaxoe/hlBiLriG4U55oyAa3Xo+8HbtEwV7F5WEOPXqtxzGuMZhJYHaqFJpajeQ6ZDUC2c990NAtTbdgw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@gerrit0/mini-shiki": "^3.2.1",
+        "lunr": "^2.3.9",
+        "markdown-it": "^14.1.0",
+        "minimatch": "^9.0.5",
+        "yaml": "^2.7.0 "
+      },
+      "bin": {
+        "typedoc": "bin/typedoc"
+      },
+      "engines": {
+        "node": ">= 18",
+        "pnpm": ">= 10"
+      },
+      "peerDependencies": {
+        "typescript": "5.0.x || 5.1.x || 5.2.x || 5.3.x || 5.4.x || 5.5.x || 5.6.x || 5.7.x || 5.8.x"
+      }
+    },
+    "node_modules/typescript": {
+      "version": "5.8.2",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.8.2.tgz",
+      "integrity": "sha512-aJn6wq13/afZp/jT9QZmwEjDqqvSGp1VT5GVg+f/t6/oVyrgXM6BY1h9BRh/O5p3PlUPAe+WuiEZOmb/49RqoQ==",
+      "devOptional": true,
+      "license": "Apache-2.0",
+      "bin": {
+        "tsc": "bin/tsc",
+        "tsserver": "bin/tsserver"
+      },
+      "engines": {
+        "node": ">=14.17"
+      }
+    },
+    "node_modules/typescript-eslint": {
+      "version": "8.29.0",
+      "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.29.0.tgz",
+      "integrity": "sha512-ep9rVd9B4kQsZ7ZnWCVxUE/xDLUUUsRzE0poAeNu+4CkFErLfuvPt/qtm2EpnSyfvsR0S6QzDFSrPCFBwf64fg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/eslint-plugin": "8.29.0",
+        "@typescript-eslint/parser": "8.29.0",
+        "@typescript-eslint/utils": "8.29.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^8.57.0 || ^9.0.0",
+        "typescript": ">=4.8.4 <5.9.0"
+      }
+    },
+    "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
+    },
+    "node_modules/undici-types": {
+      "version": "6.20.0",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz",
+      "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/universalify": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz",
+      "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 4.0.0"
+      }
+    },
+    "node_modules/unrs-resolver": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/unrs-resolver/-/unrs-resolver-1.3.3.tgz",
+      "integrity": "sha512-PFLAGQzYlyjniXdbmQ3dnGMZJXX5yrl2YS4DLRfR3BhgUsE1zpRIrccp9XMOGRfIHpdFvCn/nr5N1KMVda4x3A==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/JounQin"
+      },
+      "optionalDependencies": {
+        "@unrs/resolver-binding-darwin-arm64": "1.3.3",
+        "@unrs/resolver-binding-darwin-x64": "1.3.3",
+        "@unrs/resolver-binding-freebsd-x64": "1.3.3",
+        "@unrs/resolver-binding-linux-arm-gnueabihf": "1.3.3",
+        "@unrs/resolver-binding-linux-arm-musleabihf": "1.3.3",
+        "@unrs/resolver-binding-linux-arm64-gnu": "1.3.3",
+        "@unrs/resolver-binding-linux-arm64-musl": "1.3.3",
+        "@unrs/resolver-binding-linux-ppc64-gnu": "1.3.3",
+        "@unrs/resolver-binding-linux-s390x-gnu": "1.3.3",
+        "@unrs/resolver-binding-linux-x64-gnu": "1.3.3",
+        "@unrs/resolver-binding-linux-x64-musl": "1.3.3",
+        "@unrs/resolver-binding-wasm32-wasi": "1.3.3",
+        "@unrs/resolver-binding-win32-arm64-msvc": "1.3.3",
+        "@unrs/resolver-binding-win32-ia32-msvc": "1.3.3",
+        "@unrs/resolver-binding-win32-x64-msvc": "1.3.3"
+      }
+    },
+    "node_modules/update-browserslist-db": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.0.tgz",
+      "integrity": "sha512-EdRAaAyk2cUE1wOf2DkEhzxqOQvFOoRJFNS6NeyJ01Gp2beMRpBAINjM2iDXE3KCuKhwnvHIQCJm6ThL2Z+HzQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/browserslist"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "escalade": "^3.1.2",
+        "picocolors": "^1.0.1"
+      },
+      "bin": {
+        "update-browserslist-db": "cli.js"
+      },
+      "peerDependencies": {
+        "browserslist": ">= 4.21.0"
+      }
+    },
+    "node_modules/uri-js": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
+      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
+      "dev": true,
+      "dependencies": {
+        "punycode": "^2.1.0"
+      }
+    },
+    "node_modules/url-parse": {
+      "version": "1.5.10",
+      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
+      "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "querystringify": "^2.1.1",
+        "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": "6.3.4",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-6.3.4.tgz",
+      "integrity": "sha512-BiReIiMS2fyFqbqNT/Qqt4CVITDU9M9vE+DKcVAsB+ZV0wvTKd+3hMbkpxz1b+NmEDMegpVbisKiAZOnvO92Sw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "esbuild": "^0.25.0",
+        "fdir": "^6.4.4",
+        "picomatch": "^4.0.2",
+        "postcss": "^8.5.3",
+        "rollup": "^4.34.9",
+        "tinyglobby": "^0.2.13"
+      },
+      "bin": {
+        "vite": "bin/vite.js"
+      },
+      "engines": {
+        "node": "^18.0.0 || ^20.0.0 || >=22.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/vitejs/vite?sponsor=1"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.3.3"
+      },
+      "peerDependencies": {
+        "@types/node": "^18.0.0 || ^20.0.0 || >=22.0.0",
+        "jiti": ">=1.21.0",
+        "less": "*",
+        "lightningcss": "^1.21.0",
+        "sass": "*",
+        "sass-embedded": "*",
+        "stylus": "*",
+        "sugarss": "*",
+        "terser": "^5.16.0",
+        "tsx": "^4.8.1",
+        "yaml": "^2.4.2"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        },
+        "jiti": {
+          "optional": true
+        },
+        "less": {
+          "optional": true
+        },
+        "lightningcss": {
+          "optional": true
+        },
+        "sass": {
+          "optional": true
+        },
+        "sass-embedded": {
+          "optional": true
+        },
+        "stylus": {
+          "optional": true
+        },
+        "sugarss": {
+          "optional": true
+        },
+        "terser": {
+          "optional": true
+        },
+        "tsx": {
+          "optional": true
+        },
+        "yaml": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/vite-node": {
+      "version": "3.0.9",
+      "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-3.0.9.tgz",
+      "integrity": "sha512-w3Gdx7jDcuT9cNn9jExXgOyKmf5UOTb6WMHz8LGAm54eS1Elf5OuBhCxl6zJxGhEeIkgsE1WbHuoL0mj/UXqXg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cac": "^6.7.14",
+        "debug": "^4.4.0",
+        "es-module-lexer": "^1.6.0",
+        "pathe": "^2.0.3",
+        "vite": "^5.0.0 || ^6.0.0"
+      },
+      "bin": {
+        "vite-node": "vite-node.mjs"
+      },
+      "engines": {
+        "node": "^18.0.0 || ^20.0.0 || >=22.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/vitest"
+      }
+    },
+    "node_modules/vite-tsconfig-paths": {
+      "version": "5.1.4",
+      "resolved": "https://registry.npmjs.org/vite-tsconfig-paths/-/vite-tsconfig-paths-5.1.4.tgz",
+      "integrity": "sha512-cYj0LRuLV2c2sMqhqhGpaO3LretdtMn/BVX4cPLanIZuwwrkVl+lK84E/miEXkCHWXuq65rhNN4rXsBcOB3S4w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "debug": "^4.1.1",
+        "globrex": "^0.1.2",
+        "tsconfck": "^3.0.3"
+      },
+      "peerDependencies": {
+        "vite": "*"
+      },
+      "peerDependenciesMeta": {
+        "vite": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/vitest": {
+      "version": "3.0.9",
+      "resolved": "https://registry.npmjs.org/vitest/-/vitest-3.0.9.tgz",
+      "integrity": "sha512-BbcFDqNyBlfSpATmTtXOAOj71RNKDDvjBM/uPfnxxVGrG+FSH2RQIwgeEngTaTkuU/h0ScFvf+tRcKfYXzBybQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@vitest/expect": "3.0.9",
+        "@vitest/mocker": "3.0.9",
+        "@vitest/pretty-format": "^3.0.9",
+        "@vitest/runner": "3.0.9",
+        "@vitest/snapshot": "3.0.9",
+        "@vitest/spy": "3.0.9",
+        "@vitest/utils": "3.0.9",
+        "chai": "^5.2.0",
+        "debug": "^4.4.0",
+        "expect-type": "^1.1.0",
+        "magic-string": "^0.30.17",
+        "pathe": "^2.0.3",
+        "std-env": "^3.8.0",
+        "tinybench": "^2.9.0",
+        "tinyexec": "^0.3.2",
+        "tinypool": "^1.0.2",
+        "tinyrainbow": "^2.0.0",
+        "vite": "^5.0.0 || ^6.0.0",
+        "vite-node": "3.0.9",
+        "why-is-node-running": "^2.3.0"
+      },
+      "bin": {
+        "vitest": "vitest.mjs"
+      },
+      "engines": {
+        "node": "^18.0.0 || ^20.0.0 || >=22.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/vitest"
+      },
+      "peerDependencies": {
+        "@edge-runtime/vm": "*",
+        "@types/debug": "^4.1.12",
+        "@types/node": "^18.0.0 || ^20.0.0 || >=22.0.0",
+        "@vitest/browser": "3.0.9",
+        "@vitest/ui": "3.0.9",
+        "happy-dom": "*",
+        "jsdom": "*"
+      },
+      "peerDependenciesMeta": {
+        "@edge-runtime/vm": {
+          "optional": true
+        },
+        "@types/debug": {
+          "optional": true
+        },
+        "@types/node": {
+          "optional": true
+        },
+        "@vitest/browser": {
+          "optional": true
+        },
+        "@vitest/ui": {
+          "optional": true
+        },
+        "happy-dom": {
+          "optional": true
+        },
+        "jsdom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/vitest-canvas-mock": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/vitest-canvas-mock/-/vitest-canvas-mock-0.3.3.tgz",
+      "integrity": "sha512-3P968tYBpqYyzzOaVtqnmYjqbe13576/fkjbDEJSfQAkHtC5/UjuRHOhFEN/ZV5HVZIkaROBUWgazDKJ+Ibw+Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "jest-canvas-mock": "~2.5.2"
+      },
+      "peerDependencies": {
+        "vitest": "*"
+      }
+    },
+    "node_modules/w3c-xmlserializer": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-5.0.0.tgz",
+      "integrity": "sha512-o8qghlI8NZHU1lLPrpi2+Uq7abh4GGPpYANlalzWxyWteJOCsr/P+oPBA49TOLu5FTZO4d3F9MnWJfiMo4BkmA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "xml-name-validator": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/watskeburt": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/watskeburt/-/watskeburt-4.1.0.tgz",
+      "integrity": "sha512-KkY5H51ajqy9HYYI+u9SIURcWnqeVVhdH0I+ab6aXPGHfZYxgRCwnR6Lm3+TYB6jJVt5jFqw4GAKmwf1zHmGQw==",
+      "dev": true,
+      "bin": {
+        "watskeburt": "dist/run-cli.js"
+      },
+      "engines": {
+        "node": "^18||>=20"
+      }
+    },
+    "node_modules/webfontloader": {
+      "version": "1.6.28",
+      "resolved": "https://registry.npmjs.org/webfontloader/-/webfontloader-1.6.28.tgz",
+      "integrity": "sha512-Egb0oFEga6f+nSgasH3E0M405Pzn6y3/9tOVanv/DLfa1YBIgcv90L18YyWnvXkRbIM17v5Kv6IT2N6g1x5tvQ==",
+      "license": "Apache-2.0"
+    },
+    "node_modules/webidl-conversions": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz",
+      "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/whatwg-encoding": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-3.1.1.tgz",
+      "integrity": "sha512-6qN4hJdMwfYBtE3YBTTHhoeuUrDBPZmbQaxWAqSALV/MeEnR5z1xd8UKud2RAkFoPkmB+hli1TZSnyi84xz1vQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "iconv-lite": "0.6.3"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/whatwg-encoding/node_modules/iconv-lite": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
+      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
+      "dev": true,
+      "dependencies": {
+        "safer-buffer": ">= 2.1.2 < 3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/whatwg-mimetype": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-4.0.0.tgz",
+      "integrity": "sha512-QaKxh0eNIi2mE9p2vEdzfagOKHCcj1pJ56EEHGQOVxp8r9/iszLUUV7v89x9O1p/T+NlTM5W7jW6+cz4Fq1YVg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/whatwg-url": {
+      "version": "14.2.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-14.2.0.tgz",
+      "integrity": "sha512-De72GdQZzNTUBBChsXueQUnPKDkg/5A5zp7pFDuQAj5UFoENpiACU0wlCvzpAGnTkj++ihpKwKyYewn/XNUbKw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "tr46": "^5.1.0",
+        "webidl-conversions": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/which": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "node-which": "bin/node-which"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/why-is-node-running": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/why-is-node-running/-/why-is-node-running-2.3.0.tgz",
+      "integrity": "sha512-hUrmaWBdVDcxvYqnyh09zunKzROWjbZTiNy8dBEjkS7ehEDQibXJ7XvlmtbwuTclUiIyN+CyXQD4Vmko8fNm8w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "siginfo": "^2.0.0",
+        "stackback": "0.0.2"
+      },
+      "bin": {
+        "why-is-node-running": "cli.js"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/word-wrap": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz",
+      "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/wrap-ansi": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz",
+      "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^6.1.0",
+        "string-width": "^5.0.1",
+        "strip-ansi": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
+    "node_modules/wrap-ansi-cjs": {
+      "name": "wrap-ansi",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
+    "node_modules/wrap-ansi-cjs/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/wrap-ansi-cjs/node_modules/string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/ansi-regex": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
+      "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/ansi-styles": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
+      "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/strip-ansi": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
+      "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+      }
+    },
+    "node_modules/ws": {
+      "version": "8.18.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz",
+      "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10.0.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": ">=5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/xml-name-validator": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-5.0.0.tgz",
+      "integrity": "sha512-EvGK8EJ3DhaHfbRlETOWAS5pO9MZITeauHKJyb8wyajUfQUenkIg2MvLDTZ4T/TgIcm3HU0TFBgWWboAZ30UHg==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/xmlchars": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
+      "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/y18n": {
+      "version": "5.0.8",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
+      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/yallist": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/yaml": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.7.1.tgz",
+      "integrity": "sha512-10ULxpnOCQXxJvBgxsn9ptjq6uviG/htZKk9veJGhlqn3w/DxQ631zFF+nlQXLwmImeS5amR2dl2U8sg6U9jsQ==",
+      "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",
+      "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cliui": "^8.0.1",
+        "escalade": "^3.1.1",
+        "get-caller-file": "^2.0.5",
+        "require-directory": "^2.1.1",
+        "string-width": "^4.2.3",
+        "y18n": "^5.0.5",
+        "yargs-parser": "^21.1.1"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/yargs-parser": {
+      "version": "21.1.1",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
+      "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/yargs/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/yargs/node_modules/string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/yocto-queue": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
+      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/yoctocolors-cjs": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/yoctocolors-cjs/-/yoctocolors-cjs-2.1.2.tgz",
+      "integrity": "sha512-cYVsTjKl8b+FrnidjibDWskAv7UKOfcwaVZdp/it9n1s9fU3IkgDbhdIRKCW4JDsAlECJY0ytoVPT3sK6kideA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    }
+  }
 }
diff --git a/package.json b/package.json
index 94d580a3ec9..7d1ba35154a 100644
--- a/package.json
+++ b/package.json
@@ -1,68 +1,72 @@
 {
-	"name": "pokemon-rogue-battle",
-	"private": true,
-	"version": "1.5.4",
-	"type": "module",
-	"scripts": {
-		"start": "vite",
-		"start:dev": "vite --mode development",
-		"build": "vite build",
-		"build:beta": "vite build --mode beta",
-		"preview": "vite preview",
-		"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",
-		"typecheck": "tsc --noEmit",
-		"eslint": "eslint --fix .",
-		"eslint-ci": "eslint .",
-		"docs": "typedoc",
-		"depcruise": "depcruise src",
-		"depcruise:graph": "depcruise src --output-type dot | node dependency-graph.js > dependency-graph.svg",
-		"create-test": "node ./create-test-boilerplate.js",
-		"postinstall": "npx lefthook install && npx lefthook run post-merge",
-		"update-version:patch": "npm version patch --force --no-git-tag-version",
-		"update-version:minor": "npm version minor --force --no-git-tag-version",
-		"update-locales:remote": "git submodule update --progress --init --recursive --force --remote"
-	},
-	"devDependencies": {
-		"@eslint/js": "^9.3.0",
-		"@hpcc-js/wasm": "^2.18.0",
-		"@stylistic/eslint-plugin-ts": "^2.6.0-beta.0",
-		"@types/jsdom": "^21.1.7",
-		"@types/node": "^20.12.13",
-		"@typescript-eslint/eslint-plugin": "^8.0.0-alpha.54",
-		"@typescript-eslint/parser": "^8.0.0-alpha.54",
-		"@vitest/coverage-istanbul": "^2.1.9",
-		"dependency-cruiser": "^16.3.10",
-		"eslint": "^9.7.0",
-		"eslint-plugin-import-x": "^4.2.1",
-		"inquirer": "^11.0.2",
-		"jsdom": "^24.0.0",
-		"lefthook": "^1.6.12",
-		"msw": "^2.4.9",
-		"phaser3spectorjs": "^0.0.8",
-		"typedoc": "^0.26.4",
-		"typescript": "^5.5.3",
-		"typescript-eslint": "^8.0.0-alpha.54",
-		"vite": "^5.4.14",
-		"vite-tsconfig-paths": "^4.3.2",
-		"vitest": "^2.1.9",
-		"vitest-canvas-mock": "^0.3.3"
-	},
-	"dependencies": {
-		"@material/material-color-utilities": "^0.2.7",
-		"crypto-js": "^4.2.0",
-		"i18next": "^23.11.1",
-		"i18next-browser-languagedetector": "^7.2.1",
-		"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"
-	},
-	"engines": {
-		"node": ">=20.0.0"
-	}
+  "name": "pokemon-rogue-battle",
+  "private": true,
+  "version": "1.9.4",
+  "type": "module",
+  "scripts": {
+    "start": "vite",
+    "start:dev": "vite --mode development",
+    "build": "vite build",
+    "build:beta": "vite build --mode beta",
+    "preview": "vite preview",
+    "test": "vitest run --no-isolate",
+    "test:cov": "vitest run --coverage --no-isolate",
+    "test:watch": "vitest watch --coverage --no-isolate",
+    "test:silent": "vitest run --silent --no-isolate",
+    "typecheck": "tsc --noEmit",
+    "eslint": "eslint --fix .",
+    "eslint-ci": "eslint .",
+    "biome": "biome check --write --changed --no-errors-on-unmatched",
+    "biome-ci": "biome ci --diagnostic-level=error --reporter=github --changed --no-errors-on-unmatched",
+    "docs": "typedoc",
+    "depcruise": "depcruise src",
+    "depcruise:graph": "depcruise src --output-type dot | node dependency-graph.js > dependency-graph.svg",
+    "create-test": "node ./create-test-boilerplate.js",
+    "postinstall": "npx lefthook install && npx lefthook run post-merge",
+    "update-version:patch": "npm version patch --force --no-git-tag-version",
+    "update-version:minor": "npm version minor --force --no-git-tag-version",
+    "update-locales:remote": "git submodule update --progress --init --recursive --force --remote"
+  },
+  "devDependencies": {
+    "@biomejs/biome": "1.9.4",
+    "@eslint/js": "^9.23.0",
+    "@hpcc-js/wasm": "^2.22.4",
+    "@stylistic/eslint-plugin-ts": "^4.1.0",
+    "@types/jsdom": "^21.1.7",
+    "@types/node": "^22.13.14",
+    "@typescript-eslint/eslint-plugin": "^8.28.0",
+    "@typescript-eslint/parser": "^8.28.0",
+    "@vitest/coverage-istanbul": "^3.0.9",
+    "dependency-cruiser": "^16.3.10",
+    "eslint": "^9.23.0",
+    "eslint-plugin-import-x": "^4.9.4",
+    "inquirer": "^12.4.2",
+    "jsdom": "^26.0.0",
+    "lefthook": "^1.11.5",
+    "msw": "^2.7.3",
+    "phaser3spectorjs": "^0.0.8",
+    "typedoc": "^0.28.1",
+    "typescript": "^5.8.2",
+    "typescript-eslint": "^8.28.0",
+    "vite": "^6.3.4",
+    "vite-tsconfig-paths": "^5.1.4",
+    "vitest": "^3.0.9",
+    "vitest-canvas-mock": "^0.3.3"
+  },
+  "dependencies": {
+    "@material/material-color-utilities": "^0.2.7",
+    "compare-versions": "^6.1.1",
+    "crypto-js": "^4.2.0",
+    "i18next": "^24.2.2",
+    "i18next-browser-languagedetector": "^8.0.4",
+    "i18next-http-backend": "^3.0.2",
+    "i18next-korean-postposition-processor": "^1.0.0",
+    "json-stable-stringify": "^1.2.0",
+    "jszip": "^3.10.1",
+    "phaser": "^3.88.2",
+    "phaser3-rex-plugins": "^1.80.15"
+  },
+  "engines": {
+    "node": ">=22.0.0"
+  }
 }
diff --git a/public/audio/bgm/battle_rival_3_afd.mp3 b/public/audio/bgm/battle_rival_3_afd.mp3
new file mode 100644
index 00000000000..6dec5c861c6
Binary files /dev/null and b/public/audio/bgm/battle_rival_3_afd.mp3 differ
diff --git a/public/audio/bgm/title_afd.mp3 b/public/audio/bgm/title_afd.mp3
new file mode 100644
index 00000000000..c427d86b397
Binary files /dev/null and b/public/audio/bgm/title_afd.mp3 differ
diff --git a/public/battle-anims/common-sandstorm.json b/public/battle-anims/common-sandstorm.json
index b5b2d29f54c..fba90a08645 100644
--- a/public/battle-anims/common-sandstorm.json
+++ b/public/battle-anims/common-sandstorm.json
@@ -542,6 +542,79 @@
         "volume": 100,
         "pitch": 55,
         "eventType": "AnimTimedSoundEvent"
+      },
+      {
+        "frameIndex": 0,
+        "resourceName": "PRAS- Sandstorm",
+        "bgX": -50,
+        "bgY": 0,
+        "opacity": 0,
+        "duration": 5,
+        "eventType": "AnimTimedAddBgEvent"
+      },
+      {
+        "frameIndex": 0,
+        "resourceName": "",
+        "bgX": -50,
+        "bgY": 0,
+        "opacity": 96,
+        "duration": 3,
+        "eventType": "AnimTimedUpdateBgEvent"
+      }
+    ],
+    "3": [
+      {
+        "frameIndex": 3,
+        "resourceName": "",
+        "bgX": -25,
+        "bgY": 0,
+        "opacity": 128,
+        "duration": 3,
+        "eventType": "AnimTimedUpdateBgEvent"
+      }
+    ],
+    "6": [
+      {
+        "frameIndex": 6,
+        "resourceName": "",
+        "bgX": 0,
+        "bgY": 0,
+        "opacity": 192,
+        "duration": 3,
+        "eventType": "AnimTimedUpdateBgEvent"
+      }
+    ],
+    "9": [
+      {
+        "frameIndex": 9,
+        "resourceName": "",
+        "bgX": 25,
+        "bgY": 0,
+        "opacity": 128,
+        "duration": 3,
+        "eventType": "AnimTimedUpdateBgEvent"
+      }
+    ],
+    "12": [
+      {
+        "frameIndex": 12,
+        "resourceName": "",
+        "bgX": 50,
+        "bgY": 0,
+        "opacity": 96,
+        "duration": 3,
+        "eventType": "AnimTimedUpdateBgEvent"
+      }
+    ],
+    "15": [
+      {
+        "frameIndex": 15,
+        "resourceName": "",
+        "bgX": 50,
+        "bgY": 0,
+        "opacity": 0,
+        "duration": 3,
+        "eventType": "AnimTimedUpdateBgEvent"
       }
     ]
   },
diff --git a/public/battle-anims/common-terastallize.json b/public/battle-anims/common-terastallize.json
new file mode 100644
index 00000000000..3843464dbde
--- /dev/null
+++ b/public/battle-anims/common-terastallize.json
@@ -0,0 +1,774 @@
+{
+  "graphic": "terastallize",
+  "frames": [
+    [
+      {
+        "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": -20,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 0,
+        "opacity": 150,
+        "priority": 1,
+        "focus": 2
+      }
+    ],
+    [
+      {
+        "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": -20,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 0,
+        "opacity": 225,
+        "priority": 1,
+        "focus": 2
+      }
+    ],
+    [
+      {
+        "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": -20,
+        "zoomX": 70,
+        "zoomY": 70,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 1,
+        "opacity": 255,
+        "priority": 1,
+        "focus": 2
+      }
+    ],
+    [
+      {
+        "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": -20,
+        "zoomX": 70,
+        "zoomY": 70,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 1,
+        "opacity": 255,
+        "priority": 1,
+        "focus": 2
+      }
+    ],
+    [
+      {
+        "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": -20,
+        "zoomX": 90,
+        "zoomY": 90,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 1,
+        "opacity": 255,
+        "priority": 1,
+        "focus": 2
+      }
+    ],
+    [
+      {
+        "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": -20,
+        "zoomX": 90,
+        "zoomY": 90,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 1,
+        "opacity": 255,
+        "priority": 1,
+        "focus": 2
+      }
+    ],
+    [
+      {
+        "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": -20,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 1,
+        "opacity": 255,
+        "priority": 1,
+        "focus": 2
+      }
+    ],
+    [
+      {
+        "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": -20,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 1,
+        "opacity": 255,
+        "priority": 1,
+        "focus": 2
+      }
+    ],
+    [
+      {
+        "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": -20,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 1,
+        "opacity": 255,
+        "priority": 1,
+        "focus": 2
+      }
+    ],
+    [
+      {
+        "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": -20,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 1,
+        "opacity": 200,
+        "priority": 1,
+        "focus": 2
+      }
+    ],
+    [
+      {
+        "x": 0,
+        "y": 0,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 0,
+        "graphicFrame": 0,
+        "opacity": 255,
+        "tone": [
+          100,
+          100,
+          100,
+          0
+        ],
+        "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": -20,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 1,
+        "opacity": 100,
+        "priority": 1,
+        "focus": 2
+      }
+    ],
+    [
+      {
+        "x": 0,
+        "y": 0,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 0,
+        "graphicFrame": 0,
+        "opacity": 255,
+        "tone": [
+          100,
+          100,
+          100,
+          0
+        ],
+        "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": -20,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 1,
+        "opacity": 100,
+        "priority": 1,
+        "focus": 2
+      }
+    ],
+    [
+      {
+        "x": 0,
+        "y": 0,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 0,
+        "graphicFrame": 0,
+        "opacity": 255,
+        "tone": [
+          100,
+          100,
+          100,
+          0
+        ],
+        "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": -20,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 1,
+        "opacity": 60,
+        "priority": 1,
+        "focus": 2
+      }
+    ],
+    [
+      {
+        "x": 0,
+        "y": 0,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 0,
+        "graphicFrame": 0,
+        "opacity": 255,
+        "tone": [
+          100,
+          100,
+          100,
+          0
+        ],
+        "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": -20,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 1,
+        "opacity": 60,
+        "priority": 1,
+        "focus": 2
+      }
+    ],
+    [
+      {
+        "x": 0,
+        "y": 0,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 0,
+        "graphicFrame": 0,
+        "opacity": 255,
+        "tone": [
+          100,
+          100,
+          100,
+          0
+        ],
+        "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": -20,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 1,
+        "opacity": 60,
+        "priority": 1,
+        "focus": 2
+      }
+    ],
+    [
+      {
+        "x": 0,
+        "y": 0,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 0,
+        "graphicFrame": 0,
+        "opacity": 255,
+        "tone": [
+          100,
+          100,
+          100,
+          0
+        ],
+        "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,
+        "tone": [
+          255,
+          255,
+          255,
+          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,
+        "tone": [
+          255,
+          255,
+          255,
+          0
+        ],
+        "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,
+        "tone": [
+          255,
+          255,
+          255,
+          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
+      }
+    ]
+  ],
+  "frameTimedEvents": {},
+  "position": 4,
+  "hue": 0
+}
\ No newline at end of file
diff --git a/public/battle-anims/psychic.json b/public/battle-anims/psychic.json
index 5ad4898de5a..72161ff9aff 100644
--- a/public/battle-anims/psychic.json
+++ b/public/battle-anims/psychic.json
@@ -1,6 +1,6 @@
 {
   "id": 94,
-  "graphic": "PRAS- PsychicBG",
+  "graphic": "PRAS- Psychic BG",
   "frames": [
     [
       {
diff --git a/public/exp-sprites.json b/public/exp-sprites.json
index 947bffd399d..5580bb5cb7d 100644
--- a/public/exp-sprites.json
+++ b/public/exp-sprites.json
@@ -13,10 +13,10 @@
     "1005",
     "1006",
     "1006",
-    "1007-apex",
-    "1007-apex",
-    "1008-ultimate",
-    "1008-ultimate",
+    "1007-apex-build-Disabled",
+    "1007-apex-build-Disabled",
+    "1008-ultimate-mode-Disabled",
+    "1008-ultimate-mode-Disabled",
     "115-mega",
     "115-mega",
     "127-mega",
@@ -179,13 +179,13 @@
     "483-origin",
     "484-origin",
     "484-origin",
-    "487-origin",
-    "487-origin",
     "531-mega",
     "531-mega",
-    "6-mega",
-    "6-mega",
+    "569-gigantamax",
+    "569-gigantamax",
     "6-mega-x",
+    "6-mega-x",
+    "6-mega-y",
     "6-mega-y",
     "6058",
     "6058",
@@ -201,6 +201,8 @@
     "6211",
     "6215",
     "6215",
+    "6215f",
+    "6215f",
     "65-mega",
     "65-mega",
     "650",
@@ -259,10 +261,10 @@
     "666-fancy",
     "666-garden",
     "666-garden",
-    "666-high",
-    "666-high",
-    "666-icy",
-    "666-icy",
+    "666-high-plains",
+    "666-high-plains",
+    "666-icy-snow",
+    "666-icy-snow",
     "666-jungle",
     "666-jungle",
     "666-marine",
@@ -275,8 +277,8 @@
     "666-monsoon",
     "666-ocean",
     "666-ocean",
-    "666-poke",
-    "666-poke",
+    "666-poke-ball",
+    "666-poke-ball",
     "666-polar",
     "666-polar",
     "666-river",
@@ -291,8 +293,8 @@
     "666-tundra",
     "667",
     "667",
-    "668-female",
-    "668-female",
+    "668f",
+    "668f",
     "668",
     "668",
     "669-blue",
@@ -337,8 +339,6 @@
     "6724",
     "673",
     "673",
-    "674",
-    "674",
     "675",
     "675",
     "676",
@@ -381,16 +381,12 @@
     "692",
     "693",
     "693",
-    "694",
-    "694",
     "695",
     "695",
     "696",
     "696",
     "697",
     "697",
-    "698",
-    "698",
     "699",
     "699",
     "700",
@@ -399,18 +395,12 @@
     "701",
     "702",
     "702",
-    "703",
-    "703",
     "704",
     "704",
     "705",
     "705",
     "706",
     "706",
-    "707",
-    "707",
-    "708",
-    "708",
     "709",
     "709",
     "710",
@@ -421,8 +411,6 @@
     "712",
     "713",
     "713",
-    "714",
-    "714",
     "715",
     "715",
     "716-active",
@@ -431,16 +419,10 @@
     "716-neutral",
     "717",
     "717",
-    "718-10",
-    "718-10",
     "718-complete",
     "718-complete",
-    "718",
-    "718",
     "719-mega",
     "719-mega",
-    "719",
-    "719",
     "720-unbound",
     "720-unbound",
     "720",
@@ -629,12 +611,6 @@
     "780",
     "781",
     "781",
-    "782",
-    "782",
-    "783",
-    "783",
-    "784",
-    "784",
     "785",
     "785",
     "786",
@@ -711,6 +687,8 @@
     "814",
     "815",
     "815",
+    "815-gigantamax",
+    "815-gigantamax",
     "816",
     "816",
     "817",
@@ -761,6 +739,8 @@
     "838",
     "839",
     "839",
+    "839-gigantamax",
+    "839-gigantamax",
     "840",
     "840",
     "841",
@@ -837,8 +817,8 @@
     "873",
     "874",
     "874",
-    "875-no",
-    "875-no",
+    "875-no-ice",
+    "875-no-ice",
     "875",
     "875",
     "876-female",
@@ -975,26 +955,26 @@
     "929",
     "930",
     "930",
-    "931-blue",
-    "931-blue",
-    "931-green",
-    "931-green",
-    "931-white",
-    "931-white",
-    "931-yellow",
-    "931-yellow",
+    "931-blue-plumage-Disabled",
+    "931-blue-plumage-Disabled",
+    "931-green-plumage-Disabled",
+    "931-green-plumage-Disabled",
+    "931-white-plumage-Disabled",
+    "931-white-plumage-Disabled",
+    "931-yellow-plumage-Disabled",
+    "931-yellow-plumage-Disabled",
     "932",
     "932",
     "933",
     "933",
     "934",
     "934",
-    "935",
-    "935",
-    "936",
-    "936",
-    "937",
-    "937",
+    "935-Disabled",
+    "935-Disabled",
+    "936-Disabled",
+    "936-Disabled",
+    "937-Disabled",
+    "937-Disabled",
     "938",
     "938",
     "939",
@@ -1085,8 +1065,8 @@
     "978-droopy",
     "978-stretchy",
     "978-stretchy",
-    "979",
-    "979",
+    "979-Disabled",
+    "979-Disabled",
     "980",
     "980",
     "981",
@@ -1145,10 +1125,10 @@
     "1005b",
     "1006b",
     "1006b",
-    "1007b-apex",
-    "1007b-apex",
-    "1008b-ultimate",
-    "1008b-ultimate",
+    "1007b-apex-build-Disabled",
+    "1007b-apex-build-Disabled",
+    "1008b-ultimate-mode-Disabled",
+    "1008b-ultimate-mode-Disabled",
     "115b-mega",
     "115b-mega",
     "127b-mega",
@@ -1311,13 +1291,13 @@
     "483b-origin",
     "484b-origin",
     "484b-origin",
-    "487b-origin",
-    "487b-origin",
     "531b-mega",
     "531b-mega",
-    "6b-mega",
-    "6b-mega",
+    "569b-gigantamax",
+    "569b-gigantamax",
     "6b-mega-x",
+    "6b-mega-x",
+    "6b-mega-y",
     "6b-mega-y",
     "6058b",
     "6058b",
@@ -1333,6 +1313,8 @@
     "6211b",
     "6215b",
     "6215b",
+    "6215bf",
+    "6215bf",
     "65b-mega",
     "65b-mega",
     "650b",
@@ -1391,10 +1373,10 @@
     "666b-fancy",
     "666b-garden",
     "666b-garden",
-    "666b-high",
-    "666b-high",
-    "666b-icy",
-    "666b-icy",
+    "666b-high-plains",
+    "666b-high-plains",
+    "666b-icy-snow",
+    "666b-icy-snow",
     "666b-jungle",
     "666b-jungle",
     "666b-marine",
@@ -1407,8 +1389,8 @@
     "666b-monsoon",
     "666b-ocean",
     "666b-ocean",
-    "666b-poke",
-    "666b-poke",
+    "666b-poke-ball",
+    "666b-poke-ball",
     "666b-polar",
     "666b-polar",
     "666b-river",
@@ -1423,8 +1405,8 @@
     "666b-tundra",
     "667b",
     "667b",
-    "668b-female",
-    "668b-female",
+    "668bf",
+    "668bf",
     "668b",
     "668b",
     "669b-blue",
@@ -1469,8 +1451,6 @@
     "6724b",
     "673b",
     "673b",
-    "674b",
-    "674b",
     "675b",
     "675b",
     "676b",
@@ -1513,16 +1493,12 @@
     "692b",
     "693b",
     "693b",
-    "694b",
-    "694b",
     "695b",
     "695b",
     "696b",
     "696b",
     "697b",
     "697b",
-    "698b",
-    "698b",
     "699b",
     "699b",
     "700b",
@@ -1531,18 +1507,12 @@
     "701b",
     "702b",
     "702b",
-    "703b",
-    "703b",
     "704b",
     "704b",
     "705b",
     "705b",
     "706b",
     "706b",
-    "707b",
-    "707b",
-    "708b",
-    "708b",
     "709b",
     "709b",
     "710b",
@@ -1553,8 +1523,6 @@
     "712b",
     "713b",
     "713b",
-    "714b",
-    "714b",
     "715b",
     "715b",
     "716b-active",
@@ -1563,16 +1531,10 @@
     "716b-neutral",
     "717b",
     "717b",
-    "718b-10",
-    "718b-10",
     "718b-complete",
     "718b-complete",
-    "718b",
-    "718b",
     "719b-mega",
     "719b-mega",
-    "719b",
-    "719b",
     "720b-unbound",
     "720b-unbound",
     "720b",
@@ -1761,12 +1723,6 @@
     "780b",
     "781b",
     "781b",
-    "782b",
-    "782b",
-    "783b",
-    "783b",
-    "784b",
-    "784b",
     "785b",
     "785b",
     "786b",
@@ -1843,6 +1799,8 @@
     "814b",
     "815b",
     "815b",
+    "815b-gigantamax",
+    "815b-gigantamax",
     "816b",
     "816b",
     "817b",
@@ -1893,6 +1851,8 @@
     "838b",
     "839b",
     "839b",
+    "839b-gigantamax",
+    "839b-gigantamax",
     "840b",
     "840b",
     "841b",
@@ -1969,8 +1929,8 @@
     "873b",
     "874b",
     "874b",
-    "875b-no",
-    "875b-no",
+    "875b-no-ice",
+    "875b-no-ice",
     "875b",
     "875b",
     "876b-female",
@@ -2109,26 +2069,26 @@
     "929b",
     "930b",
     "930b",
-    "931b-blue",
-    "931b-blue",
-    "931b-green",
-    "931b-green",
-    "931b-white",
-    "931b-white",
-    "931b-yellow",
-    "931b-yellow",
+    "931b-blue-plumage-Disabled",
+    "931b-blue-plumage-Disabled",
+    "931b-green-plumage-Disabled",
+    "931b-green-plumage-Disabled",
+    "931b-white-plumage-Disabled",
+    "931b-white-plumage-Disabled",
+    "931b-yellow-plumage-Disabled",
+    "931b-yellow-plumage-Disabled",
     "932b",
     "932b",
     "933b",
     "933b",
     "934b",
     "934b",
-    "935b",
-    "935b",
-    "936b",
-    "936b",
-    "937b",
-    "937b",
+    "935b-Disabled",
+    "935b-Disabled",
+    "936b-Disabled",
+    "936b-Disabled",
+    "937b-Disabled",
+    "937b-Disabled",
     "938b",
     "938b",
     "939b",
@@ -2219,8 +2179,6 @@
     "978b-droopy",
     "978b-stretchy",
     "978b-stretchy",
-    "979b",
-    "979b",
     "980b",
     "980b",
     "981b",
@@ -2279,10 +2237,10 @@
     "1005sb",
     "1006sb",
     "1006sb",
-    "1007sb-apex",
-    "1007sb-apex",
-    "1008sb-ultimate",
-    "1008sb-ultimate",
+    "1007sb-apex-build-Disabled",
+    "1007sb-apex-build-Disabled",
+    "1008sb-ultimate-mode-Disabled",
+    "1008sb-ultimate-mode-Disabled",
     "115sb-mega",
     "115sb-mega",
     "127sb-mega",
@@ -2445,10 +2403,10 @@
     "483sb-origin",
     "484sb-origin",
     "484sb-origin",
-    "487sb-origin",
-    "487sb-origin",
     "531sb-mega",
     "531sb-mega",
+    "569sb-gigantamax",
+    "569sb-gigantamax",
     "6sb-mega",
     "6sb-mega",
     "6sb-mega-x",
@@ -2467,6 +2425,8 @@
     "6211sb",
     "6215sb",
     "6215sb",
+    "6215sbf",
+    "6215sbf",
     "65sb-mega",
     "65sb-mega",
     "650sb",
@@ -2525,10 +2485,10 @@
     "666sb-fancy",
     "666sb-garden",
     "666sb-garden",
-    "666sb-high",
-    "666sb-high",
-    "666sb-icy",
-    "666sb-icy",
+    "666sb-high-plains",
+    "666sb-high-plains",
+    "666sb-icy-snow",
+    "666sb-icy-snow",
     "666sb-jungle",
     "666sb-jungle",
     "666sb-marine",
@@ -2541,8 +2501,8 @@
     "666sb-monsoon",
     "666sb-ocean",
     "666sb-ocean",
-    "666sb-poke",
-    "666sb-poke",
+    "666sb-poke-ball",
+    "666sb-poke-ball",
     "666sb-polar",
     "666sb-polar",
     "666sb-river",
@@ -2559,6 +2519,8 @@
     "667sb",
     "668sb",
     "668sb",
+    "668sbf",
+    "668sbf",
     "669sb-blue",
     "669sb-blue",
     "669sb-orange",
@@ -2601,8 +2563,6 @@
     "6724sb",
     "673sb",
     "673sb",
-    "674sb",
-    "674sb",
     "675sb",
     "675sb",
     "676sb",
@@ -2645,16 +2605,12 @@
     "692sb",
     "693sb",
     "693sb",
-    "694sb",
-    "694sb",
     "695sb",
     "695sb",
     "696sb",
     "696sb",
     "697sb",
     "697sb",
-    "698sb",
-    "698sb",
     "699sb",
     "699sb",
     "700sb",
@@ -2663,18 +2619,12 @@
     "701sb",
     "702sb",
     "702sb",
-    "703sb",
-    "703sb",
     "704sb",
     "704sb",
     "705sb",
     "705sb",
     "706sb",
     "706sb",
-    "707sb",
-    "707sb",
-    "708sb",
-    "708sb",
     "709sb",
     "709sb",
     "710sb",
@@ -2685,8 +2635,6 @@
     "712sb",
     "713sb",
     "713sb",
-    "714sb",
-    "714sb",
     "715sb",
     "715sb",
     "716sb-active",
@@ -2695,16 +2643,10 @@
     "716sb-neutral",
     "717sb",
     "717sb",
-    "718sb-10",
-    "718sb-10",
     "718sb-complete",
     "718sb-complete",
-    "718sb",
-    "718sb",
     "719sb-mega",
     "719sb-mega",
-    "719sb",
-    "719sb",
     "720sb-unbound",
     "720sb-unbound",
     "720sb",
@@ -2893,12 +2835,6 @@
     "780sb",
     "781sb",
     "781sb",
-    "782sb",
-    "782sb",
-    "783sb",
-    "783sb",
-    "784sb",
-    "784sb",
     "785sb",
     "785sb",
     "786sb",
@@ -2975,6 +2911,8 @@
     "814sb",
     "815sb",
     "815sb",
+    "815sb-gigantamax",
+    "815sb-gigantamax",
     "816sb",
     "816sb",
     "817sb",
@@ -3025,6 +2963,8 @@
     "838sb",
     "839sb",
     "839sb",
+    "839sb-gigantamax",
+    "839sb-gigantamax",
     "840sb",
     "840sb",
     "841sb",
@@ -3101,8 +3041,8 @@
     "873sb",
     "874sb",
     "874sb",
-    "875sb-no",
-    "875sb-no",
+    "875sb-no-ice",
+    "875sb-no-ice",
     "875sb",
     "875sb",
     "876sb-female",
@@ -3241,26 +3181,26 @@
     "929sb",
     "930sb",
     "930sb",
-    "931sb-blue",
-    "931sb-blue",
-    "931sb-green",
-    "931sb-green",
-    "931sb-white",
-    "931sb-white",
-    "931sb-yellow",
-    "931sb-yellow",
+    "931sb-blue-plumage-Disabled",
+    "931sb-blue-plumage-Disabled",
+    "931sb-green-plumage-Disabled",
+    "931sb-green-plumage-Disabled",
+    "931sb-white-plumage-Disabled",
+    "931sb-white-plumage-Disabled",
+    "931sb-yellow-plumage-Disabled",
+    "931sb-yellow-plumage-Disabled",
     "932sb",
     "932sb",
     "933sb",
     "933sb",
     "934sb",
     "934sb",
-    "935sb",
-    "935sb",
-    "936sb",
-    "936sb",
-    "937sb",
-    "937sb",
+    "935sb-Disabled",
+    "935sb-Disabled",
+    "936sb-Disabled",
+    "936sb-Disabled",
+    "937sb-Disabled",
+    "937sb-Disabled",
     "938sb",
     "938sb",
     "939sb",
@@ -3351,8 +3291,6 @@
     "978sb-droopy",
     "978sb-stretchy",
     "978sb-stretchy",
-    "979sb",
-    "979sb",
     "980sb",
     "980sb",
     "981sb",
@@ -3416,10 +3354,10 @@
     "1005s",
     "1006s",
     "1006s",
-    "1007s-apex",
-    "1007s-apex",
-    "1008s-ultimate",
-    "1008s-ultimate",
+    "1007s-apex-build-Disabled",
+    "1007s-apex-build-Disabled",
+    "1008s-ultimate-mode-Disabled",
+    "1008s-ultimate-mode-Disabled",
     "115s-mega",
     "115s-mega",
     "127s-mega",
@@ -3582,10 +3520,10 @@
     "483s-origin",
     "484s-origin",
     "484s-origin",
-    "487s-origin",
-    "487s-origin",
     "531s-mega",
     "531s-mega",
+    "569s-gigantamax",
+    "569s-gigantamax",
     "6s-mega",
     "6s-mega",
     "6s-mega-x",
@@ -3604,6 +3542,8 @@
     "6211s",
     "6215s",
     "6215s",
+    "6215sf",
+    "6215sf",
     "65s-mega",
     "65s-mega",
     "650s",
@@ -3662,10 +3602,10 @@
     "666s-fancy",
     "666s-garden",
     "666s-garden",
-    "666s-high",
-    "666s-high",
-    "666s-icy",
-    "666s-icy",
+    "666s-high-plains",
+    "666s-high-plains",
+    "666s-icy-snow",
+    "666s-icy-snow",
     "666s-jungle",
     "666s-jungle",
     "666s-marine",
@@ -3678,8 +3618,8 @@
     "666s-monsoon",
     "666s-ocean",
     "666s-ocean",
-    "666s-poke",
-    "666s-poke",
+    "666s-poke-ball",
+    "666s-poke-ball",
     "666s-polar",
     "666s-polar",
     "666s-river",
@@ -3694,8 +3634,8 @@
     "666s-tundra",
     "667s",
     "667s",
-    "668s-female",
-    "668s-female",
+    "668sf",
+    "668sf",
     "668s",
     "668s",
     "669s-blue",
@@ -3740,8 +3680,6 @@
     "6724s",
     "673s",
     "673s",
-    "674s",
-    "674s",
     "675s",
     "675s",
     "676s",
@@ -3784,16 +3722,12 @@
     "692s",
     "693s",
     "693s",
-    "694s",
-    "694s",
     "695s",
     "695s",
     "696s",
     "696s",
     "697s",
     "697s",
-    "698s",
-    "698s",
     "699s",
     "699s",
     "700s",
@@ -3802,18 +3736,12 @@
     "701s",
     "702s",
     "702s",
-    "703s",
-    "703s",
     "704s",
     "704s",
     "705s",
     "705s",
     "706s",
     "706s",
-    "707s",
-    "707s",
-    "708s",
-    "708s",
     "709s",
     "709s",
     "710s",
@@ -3824,8 +3752,6 @@
     "712s",
     "713s",
     "713s",
-    "714s",
-    "714s",
     "715s",
     "715s",
     "716s-active",
@@ -3834,16 +3760,10 @@
     "716s-neutral",
     "717s",
     "717s",
-    "718s-10",
-    "718s-10",
     "718s-complete",
     "718s-complete",
-    "718s",
-    "718s",
     "719s-mega",
     "719s-mega",
-    "719s",
-    "719s",
     "720s-unbound",
     "720s-unbound",
     "720s",
@@ -4032,12 +3952,6 @@
     "780s",
     "781s",
     "781s",
-    "782s",
-    "782s",
-    "783s",
-    "783s",
-    "784s",
-    "784s",
     "785s",
     "785s",
     "786s",
@@ -4114,6 +4028,8 @@
     "814s",
     "815s",
     "815s",
+    "815s-gigantamax",
+    "815s-gigantamax",
     "816s",
     "816s",
     "817s",
@@ -4164,6 +4080,8 @@
     "838s",
     "839s",
     "839s",
+    "839s-gigantamax",
+    "839s-gigantamax",
     "840s",
     "840s",
     "841s",
@@ -4240,8 +4158,8 @@
     "873s",
     "874s",
     "874s",
-    "875s-no",
-    "875s-no",
+    "875s-no-ice",
+    "875s-no-ice",
     "875s",
     "875s",
     "876s-female",
@@ -4380,26 +4298,26 @@
     "929s",
     "930s",
     "930s",
-    "931s-blue",
-    "931s-blue",
-    "931s-green",
-    "931s-green",
-    "931s-white",
-    "931s-white",
-    "931s-yellow",
-    "931s-yellow",
+    "931s-blue-plumage-Disabled",
+    "931s-blue-plumage-Disabled",
+    "931s-green-plumage-Disabled",
+    "931s-green-plumage-Disabled",
+    "931s-white-plumage-Disabled",
+    "931s-white-plumage-Disabled",
+    "931s-yellow-plumage-Disabled",
+    "931s-yellow-plumage-Disabled",
     "932s",
     "932s",
     "933s",
     "933s",
     "934s",
     "934s",
-    "935s",
-    "935s",
-    "936s",
-    "936s",
-    "937s",
-    "937s",
+    "935s-Disabled",
+    "935s-Disabled",
+    "936s-Disabled",
+    "936s-Disabled",
+    "937s-Disabled",
+    "937s-Disabled",
     "938s",
     "938s",
     "939s",
@@ -4490,8 +4408,8 @@
     "978s-droopy",
     "978s-stretchy",
     "978s-stretchy",
-    "979s",
-    "979s",
+    "979s-Disabled",
+    "979s-Disabled",
     "980s",
     "980s",
     "981s",
@@ -4539,11 +4457,10 @@
     "1000",
     "1001",
     "1004",
-    "1007-apex",
-    "1007-apex",
-    "1007-apex",
-    "1007-apex",
-    "1008-ultimate",
+    "1007-apex-build-Disabled",
+    "1007-apex-build-Disabled",
+    "1008-ultimate-mode-Disabled",
+    "1008-ultimate-mode-Disabled",
     "127-mega",
     "142-mega",
     "150-mega",
@@ -4587,6 +4504,7 @@
     "475-mega_3",
     "475-mega_3",
     "6215",
+    "6215f",
     "653",
     "654",
     "6549",
@@ -4598,19 +4516,15 @@
     "666-archipelago",
     "666-continental",
     "666-elegant",
-    "666-fancy_2",
-    "666-fancy_2",
-    "666-fancy_3",
-    "666-fancy_3",
+    "666-fancy",
+    "666-fancy",
     "666-garden",
     "666-high",
-    "666-icy",
+    "666-icy-snow",
     "666-jungle",
     "666-marine",
-    "666-meadow_2",
-    "666-meadow_2",
-    "666-meadow_3",
-    "666-meadow_3",
+    "666-meadow",
+    "666-meadow",
     "666-modern",
     "666-monsoon",
     "666-ocean",
@@ -4619,8 +4533,6 @@
     "666-poke",
     "666-polar",
     "666-river",
-    "666-river_2",
-    "666-river_2",
     "666-sandstorm",
     "666-savanna",
     "666-sun",
@@ -4641,7 +4553,6 @@
     "705_3",
     "705_3",
     "706",
-    "708",
     "709",
     "710",
     "711",
@@ -4656,8 +4567,6 @@
     "728",
     "729",
     "730",
-    "730_2",
-    "730_2",
     "747",
     "748",
     "753",
@@ -4758,21 +4667,21 @@
     "933_3",
     "933_3",
     "934",
-    "935",
-    "935_3",
-    "935_3",
-    "936_1",
-    "936_1",
-    "936_2",
-    "936_2",
-    "936_3",
-    "936_3",
-    "937_1",
-    "937_1",
-    "937_2",
-    "937_2",
-    "937_3",
-    "937_3",
+    "935-Disabled",
+    "935_3-Disabled",
+    "935_3-Disabled",
+    "936_1-Disabled",
+    "936_1-Disabled",
+    "936_2-Disabled",
+    "936_2-Disabled",
+    "936_3-Disabled",
+    "936_3-Disabled",
+    "937_1-Disabled",
+    "937_1-Disabled",
+    "937_2-Disabled",
+    "937_2-Disabled",
+    "937_3-Disabled",
+    "937_3-Disabled",
     "94-mega_1",
     "94-mega_1",
     "94-mega_2",
@@ -4815,17 +4724,20 @@
     "1000b",
     "1001b",
     "1004b",
-    "1007b-apex",
-    "1007b-apex",
-    "1007b-apex",
-    "1007b-apex",
-    "1008b-ultimate",
+    "1007b-apex-build-Disabled",
+    "1007b-apex-build-Disabled",
+    "1008b-ultimate-mode-Disabled",
+    "1008b-ultimate-mode-Disabled",
     "127b-mega",
     "142b-mega",
     "150b-mega",
     "150b-mega",
     "181b-mega",
     "212b-mega",
+    "248b-mega",
+    "248b-mega",
+    "257b-mega",
+    "257b-mega",
     "282b-mega",
     "3b-mega_2",
     "3b-mega_2",
@@ -4856,6 +4768,7 @@
     "475b-mega_3",
     "475b-mega_3",
     "6215b",
+    "6215bf",
     "653b",
     "654b",
     "6549b",
@@ -4866,86 +4779,46 @@
     "665b",
     "665_2b",
     "665_2b",
-    "666b-archipelago_2",
-    "666b-archipelago_2",
-    "666b-archipelago_3",
-    "666b-archipelago_3",
-    "666b-continental_2",
-    "666b-continental_2",
-    "666b-continental_3",
-    "666b-continental_3",
-    "666b-elegant_2",
-    "666b-elegant_2",
-    "666b-elegant_3",
-    "666b-elegant_3",
-    "666b-fancy_2",
-    "666b-fancy_2",
-    "666b-fancy_3",
-    "666b-fancy_3",
-    "666b-garden_2",
-    "666b-garden_2",
-    "666b-garden_3",
-    "666b-garden_3",
-    "666b-high",
-    "666b-high",
-    "666b-high",
-    "666b-high",
-    "666b-icy",
-    "666b-icy",
-    "666b-icy",
-    "666b-icy",
-    "666b-jungle_2",
-    "666b-jungle_2",
-    "666b-jungle_3",
-    "666b-jungle_3",
-    "666b-marine_2",
-    "666b-marine_2",
-    "666b-marine_3",
-    "666b-marine_3",
-    "666b-meadow_2",
-    "666b-meadow_2",
-    "666b-meadow_3",
-    "666b-meadow_3",
-    "666b-modern_2",
-    "666b-modern_2",
-    "666b-modern_3",
-    "666b-modern_3",
-    "666b-monsoon_2",
-    "666b-monsoon_2",
-    "666b-monsoon_3",
-    "666b-monsoon_3",
-    "666b-ocean_2",
-    "666b-ocean_2",
-    "666b-ocean_3",
-    "666b-ocean_3",
-    "666b-poke",
-    "666b-poke",
-    "666b-poke",
-    "666b-poke",
-    "666b-polar_2",
-    "666b-polar_2",
-    "666b-polar_3",
-    "666b-polar_3",
-    "666b-river_2",
-    "666b-river_2",
-    "666b-river_3",
-    "666b-river_3",
-    "666b-sandstorm_2",
-    "666b-sandstorm_2",
-    "666b-sandstorm_3",
-    "666b-sandstorm_3",
-    "666b-savanna_2",
-    "666b-savanna_2",
-    "666b-savanna_3",
-    "666b-savanna_3",
-    "666b-sun_2",
-    "666b-sun_2",
-    "666b-sun_3",
-    "666b-sun_3",
-    "666b-tundra_2",
-    "666b-tundra_2",
-    "666b-tundra_3",
-    "666b-tundra_3",
+    "666b-archipelago",
+    "666b-archipelago",
+    "666b-continental",
+    "666b-continental",
+    "666b-elegant",
+    "666b-elegant",
+    "666b-fancy",
+    "666b-fancy",
+    "666b-garden",
+    "666b-garden",
+    "666b-high-plains",
+    "666b-high-plains",
+    "666b-icy-snow",
+    "666b-icy-snow",
+    "666b-jungle",
+    "666b-jungle",
+    "666b-marine",
+    "666b-marine",
+    "666b-meadow",
+    "666b-meadow",
+    "666b-modern",
+    "666b-modern",
+    "666b-monsoon",
+    "666b-monsoon",
+    "666b-ocean",
+    "666b-ocean",
+    "666b-poke-ball",
+    "666b-poke-ball",
+    "666b-polar",
+    "666b-polar",
+    "666b-river",
+    "666b-river",
+    "666b-sandstorm",
+    "666b-sandstorm",
+    "666b-savanna",
+    "666b-savanna",
+    "666b-sun",
+    "666b-sun",
+    "666b-tundra",
+    "666b-tundra",
     "6705b",
     "6706_2b",
     "6706_2b",
@@ -4957,7 +4830,6 @@
     "704b",
     "705b",
     "706b",
-    "708b",
     "709b",
     "710b",
     "711b",
@@ -5016,24 +4888,24 @@
     "932b",
     "933b",
     "934b",
-    "935_1b",
-    "935_1b",
-    "935_2b",
-    "935_2b",
-    "935_3b",
-    "935_3b",
-    "936_1b",
-    "936_1b",
-    "936_2b",
-    "936_2b",
-    "936_3b",
-    "936_3b",
-    "937_1b",
-    "937_1b",
-    "937_2b",
-    "937_2b",
-    "937_3b",
-    "937_3b",
+    "935_1b-Disabled",
+    "935_1b-Disabled",
+    "935_2b-Disabled",
+    "935_2b-Disabled",
+    "935_3b-Disabled",
+    "935_3b-Disabled",
+    "936_1b-Disabled",
+    "936_1b-Disabled",
+    "936_2b-Disabled",
+    "936_2b-Disabled",
+    "936_3b-Disabled",
+    "936_3b-Disabled",
+    "937_1b-Disabled",
+    "937_1b-Disabled",
+    "937_2b-Disabled",
+    "937_2b-Disabled",
+    "937_3b-Disabled",
+    "937_3b-Disabled",
     "94b-mega",
     "948b",
     "949b",
diff --git a/public/images/battle_anims/terastallize.png b/public/images/battle_anims/terastallize.png
new file mode 100644
index 00000000000..78fbb7ec335
Binary files /dev/null and b/public/images/battle_anims/terastallize.png differ
diff --git a/public/images/events/aprf25-de.png b/public/images/events/aprf25-de.png
new file mode 100644
index 00000000000..d4bb7ebdc50
Binary files /dev/null and b/public/images/events/aprf25-de.png differ
diff --git a/public/images/events/aprf25-en.png b/public/images/events/aprf25-en.png
new file mode 100644
index 00000000000..8f7268b01b6
Binary files /dev/null and b/public/images/events/aprf25-en.png differ
diff --git a/public/images/events/aprf25-es-ES.png b/public/images/events/aprf25-es-ES.png
new file mode 100644
index 00000000000..a6136a2c8de
Binary files /dev/null and b/public/images/events/aprf25-es-ES.png differ
diff --git a/public/images/events/aprf25-es-MX.png b/public/images/events/aprf25-es-MX.png
new file mode 100644
index 00000000000..a6136a2c8de
Binary files /dev/null and b/public/images/events/aprf25-es-MX.png differ
diff --git a/public/images/events/aprf25-fr.png b/public/images/events/aprf25-fr.png
new file mode 100644
index 00000000000..c68264c75dd
Binary files /dev/null and b/public/images/events/aprf25-fr.png differ
diff --git a/public/images/events/aprf25-it.png b/public/images/events/aprf25-it.png
new file mode 100644
index 00000000000..01bc0d2a1f0
Binary files /dev/null and b/public/images/events/aprf25-it.png differ
diff --git a/public/images/events/aprf25-ja.png b/public/images/events/aprf25-ja.png
new file mode 100644
index 00000000000..c6b62a3672e
Binary files /dev/null and b/public/images/events/aprf25-ja.png differ
diff --git a/public/images/events/aprf25-ko.png b/public/images/events/aprf25-ko.png
new file mode 100644
index 00000000000..bcc87e33ac1
Binary files /dev/null and b/public/images/events/aprf25-ko.png differ
diff --git a/public/images/events/aprf25-pt-BR.png b/public/images/events/aprf25-pt-BR.png
new file mode 100644
index 00000000000..f56f5b5c1e9
Binary files /dev/null and b/public/images/events/aprf25-pt-BR.png differ
diff --git a/public/images/events/aprf25-zh-CN.png b/public/images/events/aprf25-zh-CN.png
new file mode 100644
index 00000000000..57b2c3ec5be
Binary files /dev/null and b/public/images/events/aprf25-zh-CN.png differ
diff --git a/public/images/events/pkmnday2025event-de.png b/public/images/events/pkmnday2025event-de.png
new file mode 100644
index 00000000000..4cc53546752
Binary files /dev/null and b/public/images/events/pkmnday2025event-de.png differ
diff --git a/public/images/events/pkmnday2025event-en.png b/public/images/events/pkmnday2025event-en.png
new file mode 100644
index 00000000000..e9caa9e19d6
Binary files /dev/null and b/public/images/events/pkmnday2025event-en.png differ
diff --git a/public/images/events/pkmnday2025event-es-ES.png b/public/images/events/pkmnday2025event-es-ES.png
new file mode 100644
index 00000000000..e1ab096dffc
Binary files /dev/null and b/public/images/events/pkmnday2025event-es-ES.png differ
diff --git a/public/images/events/pkmnday2025event-fr.png b/public/images/events/pkmnday2025event-fr.png
new file mode 100644
index 00000000000..037d1e06e61
Binary files /dev/null and b/public/images/events/pkmnday2025event-fr.png differ
diff --git a/public/images/events/pkmnday2025event-it.png b/public/images/events/pkmnday2025event-it.png
new file mode 100644
index 00000000000..f38a60330fa
Binary files /dev/null and b/public/images/events/pkmnday2025event-it.png differ
diff --git a/public/images/events/pkmnday2025event-ja.png b/public/images/events/pkmnday2025event-ja.png
new file mode 100644
index 00000000000..94b02ad93a0
Binary files /dev/null and b/public/images/events/pkmnday2025event-ja.png differ
diff --git a/public/images/events/pkmnday2025event-ko.png b/public/images/events/pkmnday2025event-ko.png
new file mode 100644
index 00000000000..aed9ee3fb28
Binary files /dev/null and b/public/images/events/pkmnday2025event-ko.png differ
diff --git a/public/images/events/pkmnday2025event-pt-BR.png b/public/images/events/pkmnday2025event-pt-BR.png
new file mode 100644
index 00000000000..2190bbac535
Binary files /dev/null and b/public/images/events/pkmnday2025event-pt-BR.png differ
diff --git a/public/images/events/pkmnday2025event-zh-CN.png b/public/images/events/pkmnday2025event-zh-CN.png
new file mode 100644
index 00000000000..a3430482dd0
Binary files /dev/null and b/public/images/events/pkmnday2025event-zh-CN.png differ
diff --git a/public/images/events/spr25event-de.png b/public/images/events/spr25event-de.png
new file mode 100644
index 00000000000..1ccd9557460
Binary files /dev/null and b/public/images/events/spr25event-de.png differ
diff --git a/public/images/events/spr25event-en.png b/public/images/events/spr25event-en.png
new file mode 100644
index 00000000000..0e73f9247e3
Binary files /dev/null and b/public/images/events/spr25event-en.png differ
diff --git a/public/images/events/spr25event-es-ES.png b/public/images/events/spr25event-es-ES.png
new file mode 100644
index 00000000000..137f1c6e743
Binary files /dev/null and b/public/images/events/spr25event-es-ES.png differ
diff --git a/public/images/events/spr25event-es-MX.png b/public/images/events/spr25event-es-MX.png
new file mode 100644
index 00000000000..137f1c6e743
Binary files /dev/null and b/public/images/events/spr25event-es-MX.png differ
diff --git a/public/images/events/spr25event-fr.png b/public/images/events/spr25event-fr.png
new file mode 100644
index 00000000000..7730e16d4a3
Binary files /dev/null and b/public/images/events/spr25event-fr.png differ
diff --git a/public/images/events/spr25event-it.png b/public/images/events/spr25event-it.png
new file mode 100644
index 00000000000..2664b4367cc
Binary files /dev/null and b/public/images/events/spr25event-it.png differ
diff --git a/public/images/events/spr25event-ja.png b/public/images/events/spr25event-ja.png
new file mode 100644
index 00000000000..90b02af8050
Binary files /dev/null and b/public/images/events/spr25event-ja.png differ
diff --git a/public/images/events/spr25event-ko.png b/public/images/events/spr25event-ko.png
new file mode 100644
index 00000000000..a8fe279617a
Binary files /dev/null and b/public/images/events/spr25event-ko.png differ
diff --git a/public/images/events/spr25event-pt-BR.png b/public/images/events/spr25event-pt-BR.png
new file mode 100644
index 00000000000..ae195fecc97
Binary files /dev/null and b/public/images/events/spr25event-pt-BR.png differ
diff --git a/public/images/events/spr25event-zh-CN.png b/public/images/events/spr25event-zh-CN.png
new file mode 100644
index 00000000000..1d8ad35c166
Binary files /dev/null and b/public/images/events/spr25event-zh-CN.png differ
diff --git a/public/images/events/valentines2025event-de.png b/public/images/events/valentines2025event-de.png
new file mode 100644
index 00000000000..8dd41924a77
Binary files /dev/null and b/public/images/events/valentines2025event-de.png differ
diff --git a/public/images/events/valentines2025event-en.png b/public/images/events/valentines2025event-en.png
new file mode 100644
index 00000000000..dc36dad3394
Binary files /dev/null and b/public/images/events/valentines2025event-en.png differ
diff --git a/public/images/events/valentines2025event-es-ES.png b/public/images/events/valentines2025event-es-ES.png
new file mode 100644
index 00000000000..0915299b7bd
Binary files /dev/null and b/public/images/events/valentines2025event-es-ES.png differ
diff --git a/public/images/events/valentines2025event-fr.png b/public/images/events/valentines2025event-fr.png
new file mode 100644
index 00000000000..dbaf23101ed
Binary files /dev/null and b/public/images/events/valentines2025event-fr.png differ
diff --git a/public/images/events/valentines2025event-it.png b/public/images/events/valentines2025event-it.png
new file mode 100644
index 00000000000..b10eb8083be
Binary files /dev/null and b/public/images/events/valentines2025event-it.png differ
diff --git a/public/images/events/valentines2025event-ja.png b/public/images/events/valentines2025event-ja.png
new file mode 100644
index 00000000000..7e9fe5ad3d4
Binary files /dev/null and b/public/images/events/valentines2025event-ja.png differ
diff --git a/public/images/events/valentines2025event-ko.png b/public/images/events/valentines2025event-ko.png
new file mode 100644
index 00000000000..558a402fc77
Binary files /dev/null and b/public/images/events/valentines2025event-ko.png differ
diff --git a/public/images/events/valentines2025event-pt-BR.png b/public/images/events/valentines2025event-pt-BR.png
new file mode 100644
index 00000000000..45fa40f30fc
Binary files /dev/null and b/public/images/events/valentines2025event-pt-BR.png differ
diff --git a/public/images/events/valentines2025event-zh-CN.png b/public/images/events/valentines2025event-zh-CN.png
new file mode 100644
index 00000000000..13256da720c
Binary files /dev/null and b/public/images/events/valentines2025event-zh-CN.png differ
diff --git a/public/images/inputs/keyboard.json b/public/images/inputs/keyboard.json
index c9b3c79fbfb..1e8e415b72f 100644
--- a/public/images/inputs/keyboard.json
+++ b/public/images/inputs/keyboard.json
@@ -516,8 +516,36 @@
     "trimmed": true,
     "spriteSourceSize": { "x": 0, "y": 0, "w": 28, "h": 11 },
     "sourceSize": { "w": 28, "h": 11 }
+   },
+   "BACK_SLASH.png": {
+    "frame": { "x": 147, "y": 66, "w": 12, "h": 11 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 12, "h": 11 },
+    "sourceSize": { "w": 12, "h": 11 }
+   },
+   "FORWARD_SLASH.png": {
+    "frame": { "x": 144, "y": 55, "w": 12, "h": 11 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 12, "h": 11 },
+    "sourceSize": { "w": 12, "h": 11 }
+   },
+   "COMMA.png": {
+    "frame": { "x": 144, "y": 44, "w": 12, "h": 11 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 12, "h": 11 },
+    "sourceSize": { "w": 12, "h": 11 }
+   },
+   "PERIOD.png": {
+    "frame": { "x": 143, "y": 22, "w": 11, "h": 11 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 11, "h": 11 },
+    "sourceSize": { "w": 11, "h": 11 }
    }
- },
+  },
  "meta": {
   "app": "https://www.aseprite.org/",
   "version": "1.3.7-dev",
diff --git a/public/images/inputs/keyboard.png b/public/images/inputs/keyboard.png
index e4d849be0fb..0c33e579006 100644
Binary files a/public/images/inputs/keyboard.png and b/public/images/inputs/keyboard.png differ
diff --git a/public/images/items.json b/public/images/items.json
index 9d84476a8a0..4312f2a58c4 100644
--- a/public/images/items.json
+++ b/public/images/items.json
@@ -4,8 +4,8 @@
 			"image": "items.png",
 			"format": "RGBA8888",
 			"size": {
-				"w": 431,
-				"h": 431
+				"w": 432,
+				"h": 432
 			},
 			"scale": 1,
 			"frames": [
@@ -409,7 +409,7 @@
 					}
 				},
 				{
-					"filename": "black_glasses",
+					"filename": "choice_specs",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -419,14 +419,14 @@
 					"spriteSourceSize": {
 						"x": 4,
 						"y": 8,
-						"w": 23,
-						"h": 17
+						"w": 24,
+						"h": 18
 					},
 					"frame": {
 						"x": 0,
 						"y": 414,
-						"w": 23,
-						"h": 17
+						"w": 24,
+						"h": 18
 					}
 				},
 				{
@@ -661,7 +661,7 @@
 					}
 				},
 				{
-					"filename": "ribbon_gen6",
+					"filename": "big_root",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -669,16 +669,16 @@
 						"h": 32
 					},
 					"spriteSourceSize": {
-						"x": 5,
-						"y": 2,
-						"w": 22,
-						"h": 28
+						"x": 4,
+						"y": 4,
+						"w": 23,
+						"h": 24
 					},
 					"frame": {
 						"x": 409,
 						"y": 0,
-						"w": 22,
-						"h": 28
+						"w": 23,
+						"h": 24
 					}
 				},
 				{
@@ -766,7 +766,7 @@
 					}
 				},
 				{
-					"filename": "ribbon_gen8",
+					"filename": "ribbon_gen6",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -786,6 +786,27 @@
 						"h": 28
 					}
 				},
+				{
+					"filename": "ribbon_gen8",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 2,
+						"w": 22,
+						"h": 28
+					},
+					"frame": {
+						"x": 22,
+						"y": 237,
+						"w": 22,
+						"h": 28
+					}
+				},
 				{
 					"filename": "black_augurite",
 					"rotated": false,
@@ -802,32 +823,11 @@
 					},
 					"frame": {
 						"x": 22,
-						"y": 237,
+						"y": 265,
 						"w": 22,
 						"h": 25
 					}
 				},
-				{
-					"filename": "big_root",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 4,
-						"w": 23,
-						"h": 24
-					},
-					"frame": {
-						"x": 22,
-						"y": 262,
-						"w": 23,
-						"h": 24
-					}
-				},
 				{
 					"filename": "blank_plate",
 					"rotated": false,
@@ -844,7 +844,7 @@
 					},
 					"frame": {
 						"x": 22,
-						"y": 286,
+						"y": 290,
 						"w": 24,
 						"h": 24
 					}
@@ -865,7 +865,7 @@
 					},
 					"frame": {
 						"x": 22,
-						"y": 310,
+						"y": 314,
 						"w": 24,
 						"h": 24
 					}
@@ -886,7 +886,7 @@
 					},
 					"frame": {
 						"x": 22,
-						"y": 334,
+						"y": 338,
 						"w": 24,
 						"h": 24
 					}
@@ -907,7 +907,7 @@
 					},
 					"frame": {
 						"x": 22,
-						"y": 358,
+						"y": 362,
 						"w": 24,
 						"h": 24
 					}
@@ -928,13 +928,13 @@
 					},
 					"frame": {
 						"x": 22,
-						"y": 382,
+						"y": 386,
 						"w": 24,
 						"h": 24
 					}
 				},
 				{
-					"filename": "fist_plate",
+					"filename": "exp_balance",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -943,15 +943,15 @@
 					},
 					"spriteSourceSize": {
 						"x": 4,
-						"y": 4,
+						"y": 5,
 						"w": 24,
-						"h": 24
+						"h": 22
 					},
 					"frame": {
-						"x": 23,
-						"y": 406,
+						"x": 24,
+						"y": 410,
 						"w": 24,
-						"h": 24
+						"h": 22
 					}
 				},
 				{
@@ -997,7 +997,7 @@
 					}
 				},
 				{
-					"filename": "choice_specs",
+					"filename": "mystical_rock",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -1006,15 +1006,15 @@
 					},
 					"spriteSourceSize": {
 						"x": 4,
-						"y": 8,
-						"w": 24,
-						"h": 18
+						"y": 5,
+						"w": 25,
+						"h": 23
 					},
 					"frame": {
 						"x": 59,
 						"y": 53,
-						"w": 24,
-						"h": 18
+						"w": 25,
+						"h": 23
 					}
 				},
 				{
@@ -1081,7 +1081,7 @@
 					}
 				},
 				{
-					"filename": "flame_plate",
+					"filename": "fist_plate",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -1102,7 +1102,7 @@
 					}
 				},
 				{
-					"filename": "focus_band",
+					"filename": "flame_plate",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -1123,7 +1123,7 @@
 					}
 				},
 				{
-					"filename": "golden_punch",
+					"filename": "focus_band",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -1144,7 +1144,7 @@
 					}
 				},
 				{
-					"filename": "gracidea",
+					"filename": "golden_punch",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -1164,6 +1164,27 @@
 						"h": 24
 					}
 				},
+				{
+					"filename": "gracidea",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 4,
+						"w": 24,
+						"h": 24
+					},
+					"frame": {
+						"x": 44,
+						"y": 254,
+						"w": 24,
+						"h": 24
+					}
+				},
 				{
 					"filename": "grip_claw",
 					"rotated": false,
@@ -1179,8 +1200,8 @@
 						"h": 24
 					},
 					"frame": {
-						"x": 45,
-						"y": 254,
+						"x": 55,
+						"y": 76,
 						"w": 24,
 						"h": 24
 					}
@@ -1200,8 +1221,8 @@
 						"h": 24
 					},
 					"frame": {
-						"x": 46,
-						"y": 278,
+						"x": 55,
+						"y": 100,
 						"w": 24,
 						"h": 24
 					}
@@ -1222,7 +1243,7 @@
 					},
 					"frame": {
 						"x": 46,
-						"y": 302,
+						"y": 278,
 						"w": 24,
 						"h": 24
 					}
@@ -1243,7 +1264,7 @@
 					},
 					"frame": {
 						"x": 46,
-						"y": 326,
+						"y": 302,
 						"w": 24,
 						"h": 24
 					}
@@ -1264,7 +1285,7 @@
 					},
 					"frame": {
 						"x": 46,
-						"y": 350,
+						"y": 326,
 						"w": 24,
 						"h": 24
 					}
@@ -1283,6 +1304,27 @@
 						"w": 24,
 						"h": 24
 					},
+					"frame": {
+						"x": 46,
+						"y": 350,
+						"w": 24,
+						"h": 24
+					}
+				},
+				{
+					"filename": "lucky_punch_master",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 4,
+						"w": 24,
+						"h": 24
+					},
 					"frame": {
 						"x": 46,
 						"y": 374,
@@ -1305,159 +1347,12 @@
 						"h": 24
 					},
 					"frame": {
-						"x": 47,
+						"x": 48,
 						"y": 398,
 						"w": 23,
 						"h": 24
 					}
 				},
-				{
-					"filename": "silver_powder",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 11,
-						"w": 24,
-						"h": 15
-					},
-					"frame": {
-						"x": 48,
-						"y": 71,
-						"w": 24,
-						"h": 15
-					}
-				},
-				{
-					"filename": "elixir",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 4,
-						"w": 18,
-						"h": 24
-					},
-					"frame": {
-						"x": 55,
-						"y": 86,
-						"w": 18,
-						"h": 24
-					}
-				},
-				{
-					"filename": "ether",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 4,
-						"w": 18,
-						"h": 24
-					},
-					"frame": {
-						"x": 55,
-						"y": 110,
-						"w": 18,
-						"h": 24
-					}
-				},
-				{
-					"filename": "full_restore",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 4,
-						"w": 18,
-						"h": 24
-					},
-					"frame": {
-						"x": 60,
-						"y": 134,
-						"w": 18,
-						"h": 24
-					}
-				},
-				{
-					"filename": "hp_up",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 4,
-						"w": 16,
-						"h": 24
-					},
-					"frame": {
-						"x": 63,
-						"y": 158,
-						"w": 16,
-						"h": 24
-					}
-				},
-				{
-					"filename": "iron",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 4,
-						"w": 16,
-						"h": 24
-					},
-					"frame": {
-						"x": 63,
-						"y": 182,
-						"w": 16,
-						"h": 24
-					}
-				},
-				{
-					"filename": "lucky_punch_master",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 4,
-						"w": 24,
-						"h": 24
-					},
-					"frame": {
-						"x": 68,
-						"y": 206,
-						"w": 24,
-						"h": 24
-					}
-				},
 				{
 					"filename": "lucky_punch_ultra",
 					"rotated": false,
@@ -1473,8 +1368,8 @@
 						"h": 24
 					},
 					"frame": {
-						"x": 68,
-						"y": 230,
+						"x": 60,
+						"y": 124,
 						"w": 24,
 						"h": 24
 					}
@@ -1494,8 +1389,8 @@
 						"h": 24
 					},
 					"frame": {
-						"x": 69,
-						"y": 254,
+						"x": 63,
+						"y": 148,
 						"w": 24,
 						"h": 24
 					}
@@ -1515,12 +1410,33 @@
 						"h": 24
 					},
 					"frame": {
-						"x": 70,
-						"y": 278,
+						"x": 63,
+						"y": 172,
 						"w": 24,
 						"h": 24
 					}
 				},
+				{
+					"filename": "max_revive",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 4,
+						"w": 22,
+						"h": 24
+					},
+					"frame": {
+						"x": 68,
+						"y": 196,
+						"w": 22,
+						"h": 24
+					}
+				},
 				{
 					"filename": "mind_plate",
 					"rotated": false,
@@ -1536,8 +1452,8 @@
 						"h": 24
 					},
 					"frame": {
-						"x": 70,
-						"y": 302,
+						"x": 68,
+						"y": 220,
 						"w": 24,
 						"h": 24
 					}
@@ -1557,8 +1473,8 @@
 						"h": 24
 					},
 					"frame": {
-						"x": 70,
-						"y": 326,
+						"x": 68,
+						"y": 244,
 						"w": 24,
 						"h": 24
 					}
@@ -1579,7 +1495,7 @@
 					},
 					"frame": {
 						"x": 70,
-						"y": 350,
+						"y": 268,
 						"w": 24,
 						"h": 24
 					}
@@ -1600,7 +1516,7 @@
 					},
 					"frame": {
 						"x": 70,
-						"y": 374,
+						"y": 292,
 						"w": 24,
 						"h": 24
 					}
@@ -1621,11 +1537,767 @@
 					},
 					"frame": {
 						"x": 70,
-						"y": 398,
+						"y": 316,
 						"w": 24,
 						"h": 24
 					}
 				},
+				{
+					"filename": "silk_scarf",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 4,
+						"w": 24,
+						"h": 24
+					},
+					"frame": {
+						"x": 70,
+						"y": 340,
+						"w": 24,
+						"h": 24
+					}
+				},
+				{
+					"filename": "sky_plate",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 4,
+						"w": 24,
+						"h": 24
+					},
+					"frame": {
+						"x": 70,
+						"y": 364,
+						"w": 24,
+						"h": 24
+					}
+				},
+				{
+					"filename": "reveal_glass",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 4,
+						"w": 23,
+						"h": 24
+					},
+					"frame": {
+						"x": 71,
+						"y": 388,
+						"w": 23,
+						"h": 24
+					}
+				},
+				{
+					"filename": "icy_reins_of_unity",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 7,
+						"w": 24,
+						"h": 20
+					},
+					"frame": {
+						"x": 71,
+						"y": 412,
+						"w": 24,
+						"h": 20
+					}
+				},
+				{
+					"filename": "elixir",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 4,
+						"w": 18,
+						"h": 24
+					},
+					"frame": {
+						"x": 79,
+						"y": 76,
+						"w": 18,
+						"h": 24
+					}
+				},
+				{
+					"filename": "ether",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 4,
+						"w": 18,
+						"h": 24
+					},
+					"frame": {
+						"x": 79,
+						"y": 100,
+						"w": 18,
+						"h": 24
+					}
+				},
+				{
+					"filename": "full_restore",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 4,
+						"w": 18,
+						"h": 24
+					},
+					"frame": {
+						"x": 84,
+						"y": 124,
+						"w": 18,
+						"h": 24
+					}
+				},
+				{
+					"filename": "hp_up",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 4,
+						"w": 16,
+						"h": 24
+					},
+					"frame": {
+						"x": 87,
+						"y": 148,
+						"w": 16,
+						"h": 24
+					}
+				},
+				{
+					"filename": "iron",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 4,
+						"w": 16,
+						"h": 24
+					},
+					"frame": {
+						"x": 87,
+						"y": 172,
+						"w": 16,
+						"h": 24
+					}
+				},
+				{
+					"filename": "lure",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 4,
+						"w": 17,
+						"h": 24
+					},
+					"frame": {
+						"x": 90,
+						"y": 196,
+						"w": 17,
+						"h": 24
+					}
+				},
+				{
+					"filename": "max_elixir",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 4,
+						"w": 18,
+						"h": 24
+					},
+					"frame": {
+						"x": 92,
+						"y": 220,
+						"w": 18,
+						"h": 24
+					}
+				},
+				{
+					"filename": "max_ether",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 4,
+						"w": 18,
+						"h": 24
+					},
+					"frame": {
+						"x": 92,
+						"y": 244,
+						"w": 18,
+						"h": 24
+					}
+				},
+				{
+					"filename": "max_lure",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 4,
+						"w": 17,
+						"h": 24
+					},
+					"frame": {
+						"x": 94,
+						"y": 268,
+						"w": 17,
+						"h": 24
+					}
+				},
+				{
+					"filename": "max_potion",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 4,
+						"w": 18,
+						"h": 24
+					},
+					"frame": {
+						"x": 94,
+						"y": 292,
+						"w": 18,
+						"h": 24
+					}
+				},
+				{
+					"filename": "oval_charm",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 4,
+						"w": 21,
+						"h": 24
+					},
+					"frame": {
+						"x": 94,
+						"y": 316,
+						"w": 21,
+						"h": 24
+					}
+				},
+				{
+					"filename": "shiny_charm",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 4,
+						"w": 21,
+						"h": 24
+					},
+					"frame": {
+						"x": 94,
+						"y": 340,
+						"w": 21,
+						"h": 24
+					}
+				},
+				{
+					"filename": "splash_plate",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 4,
+						"w": 24,
+						"h": 24
+					},
+					"frame": {
+						"x": 94,
+						"y": 364,
+						"w": 24,
+						"h": 24
+					}
+				},
+				{
+					"filename": "spooky_plate",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 4,
+						"w": 24,
+						"h": 24
+					},
+					"frame": {
+						"x": 94,
+						"y": 388,
+						"w": 24,
+						"h": 24
+					}
+				},
+				{
+					"filename": "metal_powder",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 6,
+						"w": 24,
+						"h": 20
+					},
+					"frame": {
+						"x": 95,
+						"y": 412,
+						"w": 24,
+						"h": 20
+					}
+				},
+				{
+					"filename": "berry_pouch",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 5,
+						"w": 23,
+						"h": 23
+					},
+					"frame": {
+						"x": 84,
+						"y": 53,
+						"w": 23,
+						"h": 23
+					}
+				},
+				{
+					"filename": "max_repel",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 4,
+						"w": 16,
+						"h": 24
+					},
+					"frame": {
+						"x": 97,
+						"y": 76,
+						"w": 16,
+						"h": 24
+					}
+				},
+				{
+					"filename": "pp_max",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 4,
+						"w": 16,
+						"h": 24
+					},
+					"frame": {
+						"x": 97,
+						"y": 100,
+						"w": 16,
+						"h": 24
+					}
+				},
+				{
+					"filename": "pp_up",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 4,
+						"w": 16,
+						"h": 24
+					},
+					"frame": {
+						"x": 102,
+						"y": 124,
+						"w": 16,
+						"h": 24
+					}
+				},
+				{
+					"filename": "protein",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 4,
+						"w": 16,
+						"h": 24
+					},
+					"frame": {
+						"x": 103,
+						"y": 148,
+						"w": 16,
+						"h": 24
+					}
+				},
+				{
+					"filename": "red_orb",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 4,
+						"w": 20,
+						"h": 24
+					},
+					"frame": {
+						"x": 103,
+						"y": 172,
+						"w": 20,
+						"h": 24
+					}
+				},
+				{
+					"filename": "repel",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 4,
+						"w": 16,
+						"h": 24
+					},
+					"frame": {
+						"x": 107,
+						"y": 196,
+						"w": 16,
+						"h": 24
+					}
+				},
+				{
+					"filename": "stone_plate",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 4,
+						"w": 24,
+						"h": 24
+					},
+					"frame": {
+						"x": 110,
+						"y": 220,
+						"w": 24,
+						"h": 24
+					}
+				},
+				{
+					"filename": "sun_stone",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 4,
+						"w": 24,
+						"h": 24
+					},
+					"frame": {
+						"x": 110,
+						"y": 244,
+						"w": 24,
+						"h": 24
+					}
+				},
+				{
+					"filename": "toxic_plate",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 4,
+						"w": 24,
+						"h": 24
+					},
+					"frame": {
+						"x": 111,
+						"y": 268,
+						"w": 24,
+						"h": 24
+					}
+				},
+				{
+					"filename": "zap_plate",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 4,
+						"w": 24,
+						"h": 24
+					},
+					"frame": {
+						"x": 112,
+						"y": 292,
+						"w": 24,
+						"h": 24
+					}
+				},
+				{
+					"filename": "black_belt",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 4,
+						"w": 22,
+						"h": 23
+					},
+					"frame": {
+						"x": 115,
+						"y": 316,
+						"w": 22,
+						"h": 23
+					}
+				},
+				{
+					"filename": "bug_tera_shard",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 4,
+						"w": 22,
+						"h": 23
+					},
+					"frame": {
+						"x": 115,
+						"y": 339,
+						"w": 22,
+						"h": 23
+					}
+				},
+				{
+					"filename": "clefairy_doll",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 5,
+						"w": 24,
+						"h": 23
+					},
+					"frame": {
+						"x": 118,
+						"y": 362,
+						"w": 24,
+						"h": 23
+					}
+				},
+				{
+					"filename": "coin_case",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 5,
+						"w": 24,
+						"h": 23
+					},
+					"frame": {
+						"x": 118,
+						"y": 385,
+						"w": 24,
+						"h": 23
+					}
+				},
+				{
+					"filename": "super_lure",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 4,
+						"w": 17,
+						"h": 24
+					},
+					"frame": {
+						"x": 119,
+						"y": 408,
+						"w": 17,
+						"h": 24
+					}
+				},
+				{
+					"filename": "super_repel",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 4,
+						"w": 16,
+						"h": 24
+					},
+					"frame": {
+						"x": 136,
+						"y": 408,
+						"w": 16,
+						"h": 24
+					}
+				},
 				{
 					"filename": "ability_capsule",
 					"rotated": false,
@@ -1648,112 +2320,7 @@
 					}
 				},
 				{
-					"filename": "lure",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 4,
-						"w": 17,
-						"h": 24
-					},
-					"frame": {
-						"x": 86,
-						"y": 27,
-						"w": 17,
-						"h": 24
-					}
-				},
-				{
-					"filename": "silk_scarf",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 4,
-						"w": 24,
-						"h": 24
-					},
-					"frame": {
-						"x": 103,
-						"y": 26,
-						"w": 24,
-						"h": 24
-					}
-				},
-				{
-					"filename": "clefairy_doll",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 5,
-						"w": 24,
-						"h": 23
-					},
-					"frame": {
-						"x": 127,
-						"y": 36,
-						"w": 24,
-						"h": 23
-					}
-				},
-				{
-					"filename": "coin_case",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 5,
-						"w": 24,
-						"h": 23
-					},
-					"frame": {
-						"x": 103,
-						"y": 50,
-						"w": 24,
-						"h": 23
-					}
-				},
-				{
-					"filename": "big_nugget",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 6,
-						"w": 20,
-						"h": 20
-					},
-					"frame": {
-						"x": 83,
-						"y": 53,
-						"w": 20,
-						"h": 20
-					}
-				},
-				{
-					"filename": "dragon_scale",
+					"filename": "black_glasses",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -1763,224 +2330,14 @@
 					"spriteSourceSize": {
 						"x": 4,
 						"y": 8,
-						"w": 24,
-						"h": 18
+						"w": 23,
+						"h": 17
 					},
 					"frame": {
-						"x": 127,
-						"y": 59,
-						"w": 24,
-						"h": 18
-					}
-				},
-				{
-					"filename": "max_elixir",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 4,
-						"w": 18,
-						"h": 24
-					},
-					"frame": {
-						"x": 151,
+						"x": 86,
 						"y": 36,
-						"w": 18,
-						"h": 24
-					}
-				},
-				{
-					"filename": "adamant_crystal",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 6,
 						"w": 23,
-						"h": 21
-					},
-					"frame": {
-						"x": 151,
-						"y": 60,
-						"w": 23,
-						"h": 21
-					}
-				},
-				{
-					"filename": "sky_plate",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 4,
-						"w": 24,
-						"h": 24
-					},
-					"frame": {
-						"x": 169,
-						"y": 21,
-						"w": 24,
-						"h": 24
-					}
-				},
-				{
-					"filename": "splash_plate",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 4,
-						"w": 24,
-						"h": 24
-					},
-					"frame": {
-						"x": 193,
-						"y": 21,
-						"w": 24,
-						"h": 24
-					}
-				},
-				{
-					"filename": "spooky_plate",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 4,
-						"w": 24,
-						"h": 24
-					},
-					"frame": {
-						"x": 217,
-						"y": 21,
-						"w": 24,
-						"h": 24
-					}
-				},
-				{
-					"filename": "stone_plate",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 4,
-						"w": 24,
-						"h": 24
-					},
-					"frame": {
-						"x": 241,
-						"y": 21,
-						"w": 24,
-						"h": 24
-					}
-				},
-				{
-					"filename": "sun_stone",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 4,
-						"w": 24,
-						"h": 24
-					},
-					"frame": {
-						"x": 265,
-						"y": 21,
-						"w": 24,
-						"h": 24
-					}
-				},
-				{
-					"filename": "toxic_plate",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 4,
-						"w": 24,
-						"h": 24
-					},
-					"frame": {
-						"x": 289,
-						"y": 21,
-						"w": 24,
-						"h": 24
-					}
-				},
-				{
-					"filename": "max_revive",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 4,
-						"w": 22,
-						"h": 24
-					},
-					"frame": {
-						"x": 313,
-						"y": 21,
-						"w": 22,
-						"h": 24
-					}
-				},
-				{
-					"filename": "zap_plate",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 4,
-						"w": 24,
-						"h": 24
-					},
-					"frame": {
-						"x": 335,
-						"y": 20,
-						"w": 24,
-						"h": 24
+						"h": 17
 					}
 				},
 				{
@@ -1998,12 +2355,159 @@
 						"h": 23
 					},
 					"frame": {
-						"x": 359,
-						"y": 20,
+						"x": 109,
+						"y": 26,
 						"w": 24,
 						"h": 23
 					}
 				},
+				{
+					"filename": "dragon_scale",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 8,
+						"w": 24,
+						"h": 18
+					},
+					"frame": {
+						"x": 133,
+						"y": 36,
+						"w": 24,
+						"h": 18
+					}
+				},
+				{
+					"filename": "exp_share",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 5,
+						"w": 24,
+						"h": 22
+					},
+					"frame": {
+						"x": 109,
+						"y": 49,
+						"w": 24,
+						"h": 22
+					}
+				},
+				{
+					"filename": "golden_net",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 5,
+						"w": 24,
+						"h": 21
+					},
+					"frame": {
+						"x": 133,
+						"y": 54,
+						"w": 24,
+						"h": 21
+					}
+				},
+				{
+					"filename": "mystic_water",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 5,
+						"w": 20,
+						"h": 23
+					},
+					"frame": {
+						"x": 113,
+						"y": 71,
+						"w": 20,
+						"h": 23
+					}
+				},
+				{
+					"filename": "dark_tera_shard",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 4,
+						"w": 22,
+						"h": 23
+					},
+					"frame": {
+						"x": 113,
+						"y": 94,
+						"w": 22,
+						"h": 23
+					}
+				},
+				{
+					"filename": "coupon",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 7,
+						"w": 23,
+						"h": 19
+					},
+					"frame": {
+						"x": 133,
+						"y": 75,
+						"w": 23,
+						"h": 19
+					}
+				},
+				{
+					"filename": "dragon_fang",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 5,
+						"w": 21,
+						"h": 23
+					},
+					"frame": {
+						"x": 135,
+						"y": 94,
+						"w": 21,
+						"h": 23
+					}
+				},
 				{
 					"filename": "hearthflame_mask",
 					"rotated": false,
@@ -2019,12 +2523,75 @@
 						"h": 23
 					},
 					"frame": {
-						"x": 383,
-						"y": 20,
+						"x": 118,
+						"y": 117,
 						"w": 24,
 						"h": 23
 					}
 				},
+				{
+					"filename": "dynamax_band",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 4,
+						"w": 23,
+						"h": 23
+					},
+					"frame": {
+						"x": 119,
+						"y": 140,
+						"w": 23,
+						"h": 23
+					}
+				},
+				{
+					"filename": "unknown",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 4,
+						"w": 16,
+						"h": 24
+					},
+					"frame": {
+						"x": 142,
+						"y": 117,
+						"w": 16,
+						"h": 24
+					}
+				},
+				{
+					"filename": "berry_pot",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 5,
+						"w": 18,
+						"h": 22
+					},
+					"frame": {
+						"x": 142,
+						"y": 141,
+						"w": 18,
+						"h": 22
+					}
+				},
 				{
 					"filename": "leppa_berry",
 					"rotated": false,
@@ -2040,14 +2607,56 @@
 						"h": 23
 					},
 					"frame": {
-						"x": 407,
-						"y": 28,
+						"x": 123,
+						"y": 163,
 						"w": 24,
 						"h": 23
 					}
 				},
 				{
-					"filename": "candy_overlay",
+					"filename": "scope_lens",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 5,
+						"w": 24,
+						"h": 23
+					},
+					"frame": {
+						"x": 123,
+						"y": 186,
+						"w": 24,
+						"h": 23
+					}
+				},
+				{
+					"filename": "relic_gold",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 9,
+						"y": 11,
+						"w": 15,
+						"h": 11
+					},
+					"frame": {
+						"x": 123,
+						"y": 209,
+						"w": 15,
+						"h": 11
+					}
+				},
+				{
+					"filename": "zinc",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -2056,19 +2665,19 @@
 					},
 					"spriteSourceSize": {
 						"x": 8,
-						"y": 12,
+						"y": 4,
 						"w": 16,
-						"h": 15
+						"h": 24
 					},
 					"frame": {
-						"x": 169,
-						"y": 45,
+						"x": 147,
+						"y": 163,
 						"w": 16,
-						"h": 15
+						"h": 24
 					}
 				},
 				{
-					"filename": "exp_balance",
+					"filename": "bug_memory",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -2076,36 +2685,15 @@
 						"h": 32
 					},
 					"spriteSourceSize": {
-						"x": 4,
+						"x": 5,
 						"y": 5,
-						"w": 24,
+						"w": 22,
 						"h": 22
 					},
 					"frame": {
-						"x": 185,
-						"y": 45,
-						"w": 24,
-						"h": 22
-					}
-				},
-				{
-					"filename": "exp_share",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 5,
-						"w": 24,
-						"h": 22
-					},
-					"frame": {
-						"x": 209,
-						"y": 45,
-						"w": 24,
+						"x": 147,
+						"y": 187,
+						"w": 22,
 						"h": 22
 					}
 				},
@@ -2124,33 +2712,12 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 233,
-						"y": 45,
+						"x": 138,
+						"y": 209,
 						"w": 24,
 						"h": 22
 					}
 				},
-				{
-					"filename": "scope_lens",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 5,
-						"w": 24,
-						"h": 23
-					},
-					"frame": {
-						"x": 257,
-						"y": 45,
-						"w": 24,
-						"h": 23
-					}
-				},
 				{
 					"filename": "twisted_spoon",
 					"rotated": false,
@@ -2166,600 +2733,12 @@
 						"h": 23
 					},
 					"frame": {
-						"x": 281,
-						"y": 45,
+						"x": 134,
+						"y": 231,
 						"w": 24,
 						"h": 23
 					}
 				},
-				{
-					"filename": "berry_pouch",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 5,
-						"w": 23,
-						"h": 23
-					},
-					"frame": {
-						"x": 305,
-						"y": 45,
-						"w": 23,
-						"h": 23
-					}
-				},
-				{
-					"filename": "black_belt",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 4,
-						"w": 22,
-						"h": 23
-					},
-					"frame": {
-						"x": 328,
-						"y": 45,
-						"w": 22,
-						"h": 23
-					}
-				},
-				{
-					"filename": "max_ether",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 4,
-						"w": 18,
-						"h": 24
-					},
-					"frame": {
-						"x": 350,
-						"y": 44,
-						"w": 18,
-						"h": 24
-					}
-				},
-				{
-					"filename": "reveal_glass",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 4,
-						"w": 23,
-						"h": 24
-					},
-					"frame": {
-						"x": 368,
-						"y": 43,
-						"w": 23,
-						"h": 24
-					}
-				},
-				{
-					"filename": "max_repel",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 4,
-						"w": 16,
-						"h": 24
-					},
-					"frame": {
-						"x": 391,
-						"y": 43,
-						"w": 16,
-						"h": 24
-					}
-				},
-				{
-					"filename": "golden_net",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 5,
-						"w": 24,
-						"h": 21
-					},
-					"frame": {
-						"x": 407,
-						"y": 51,
-						"w": 24,
-						"h": 21
-					}
-				},
-				{
-					"filename": "icy_reins_of_unity",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 7,
-						"w": 24,
-						"h": 20
-					},
-					"frame": {
-						"x": 174,
-						"y": 67,
-						"w": 24,
-						"h": 20
-					}
-				},
-				{
-					"filename": "metal_powder",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 6,
-						"w": 24,
-						"h": 20
-					},
-					"frame": {
-						"x": 198,
-						"y": 67,
-						"w": 24,
-						"h": 20
-					}
-				},
-				{
-					"filename": "quick_powder",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 6,
-						"w": 24,
-						"h": 20
-					},
-					"frame": {
-						"x": 222,
-						"y": 67,
-						"w": 24,
-						"h": 20
-					}
-				},
-				{
-					"filename": "rusted_shield",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 6,
-						"w": 24,
-						"h": 20
-					},
-					"frame": {
-						"x": 246,
-						"y": 68,
-						"w": 24,
-						"h": 20
-					}
-				},
-				{
-					"filename": "sacred_ash",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 7,
-						"w": 24,
-						"h": 20
-					},
-					"frame": {
-						"x": 270,
-						"y": 68,
-						"w": 24,
-						"h": 20
-					}
-				},
-				{
-					"filename": "shadow_reins_of_unity",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 7,
-						"w": 24,
-						"h": 20
-					},
-					"frame": {
-						"x": 294,
-						"y": 68,
-						"w": 24,
-						"h": 20
-					}
-				},
-				{
-					"filename": "soft_sand",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 7,
-						"w": 24,
-						"h": 20
-					},
-					"frame": {
-						"x": 318,
-						"y": 68,
-						"w": 24,
-						"h": 20
-					}
-				},
-				{
-					"filename": "amulet_coin",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 5,
-						"w": 23,
-						"h": 21
-					},
-					"frame": {
-						"x": 342,
-						"y": 68,
-						"w": 23,
-						"h": 21
-					}
-				},
-				{
-					"filename": "auspicious_armor",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 5,
-						"w": 23,
-						"h": 21
-					},
-					"frame": {
-						"x": 368,
-						"y": 67,
-						"w": 23,
-						"h": 21
-					}
-				},
-				{
-					"filename": "pp_max",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 4,
-						"w": 16,
-						"h": 24
-					},
-					"frame": {
-						"x": 391,
-						"y": 67,
-						"w": 16,
-						"h": 24
-					}
-				},
-				{
-					"filename": "binding_band",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 6,
-						"w": 23,
-						"h": 20
-					},
-					"frame": {
-						"x": 407,
-						"y": 72,
-						"w": 23,
-						"h": 20
-					}
-				},
-				{
-					"filename": "max_lure",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 4,
-						"w": 17,
-						"h": 24
-					},
-					"frame": {
-						"x": 73,
-						"y": 87,
-						"w": 17,
-						"h": 24
-					}
-				},
-				{
-					"filename": "bug_tera_shard",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 4,
-						"w": 22,
-						"h": 23
-					},
-					"frame": {
-						"x": 73,
-						"y": 111,
-						"w": 22,
-						"h": 23
-					}
-				},
-				{
-					"filename": "max_potion",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 4,
-						"w": 18,
-						"h": 24
-					},
-					"frame": {
-						"x": 78,
-						"y": 134,
-						"w": 18,
-						"h": 24
-					}
-				},
-				{
-					"filename": "oval_charm",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 4,
-						"w": 21,
-						"h": 24
-					},
-					"frame": {
-						"x": 79,
-						"y": 158,
-						"w": 21,
-						"h": 24
-					}
-				},
-				{
-					"filename": "shiny_charm",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 4,
-						"w": 21,
-						"h": 24
-					},
-					"frame": {
-						"x": 79,
-						"y": 182,
-						"w": 21,
-						"h": 24
-					}
-				},
-				{
-					"filename": "dynamax_band",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 4,
-						"w": 23,
-						"h": 23
-					},
-					"frame": {
-						"x": 90,
-						"y": 73,
-						"w": 23,
-						"h": 23
-					}
-				},
-				{
-					"filename": "eviolite",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 8,
-						"w": 15,
-						"h": 15
-					},
-					"frame": {
-						"x": 90,
-						"y": 96,
-						"w": 15,
-						"h": 15
-					}
-				},
-				{
-					"filename": "dark_tera_shard",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 4,
-						"w": 22,
-						"h": 23
-					},
-					"frame": {
-						"x": 95,
-						"y": 111,
-						"w": 22,
-						"h": 23
-					}
-				},
-				{
-					"filename": "red_orb",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 4,
-						"w": 20,
-						"h": 24
-					},
-					"frame": {
-						"x": 96,
-						"y": 134,
-						"w": 20,
-						"h": 24
-					}
-				},
-				{
-					"filename": "pp_up",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 4,
-						"w": 16,
-						"h": 24
-					},
-					"frame": {
-						"x": 100,
-						"y": 158,
-						"w": 16,
-						"h": 24
-					}
-				},
-				{
-					"filename": "protein",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 4,
-						"w": 16,
-						"h": 24
-					},
-					"frame": {
-						"x": 100,
-						"y": 182,
-						"w": 16,
-						"h": 24
-					}
-				},
 				{
 					"filename": "griseous_core",
 					"rotated": false,
@@ -2775,12 +2754,33 @@
 						"h": 23
 					},
 					"frame": {
-						"x": 92,
-						"y": 206,
+						"x": 135,
+						"y": 254,
 						"w": 23,
 						"h": 23
 					}
 				},
+				{
+					"filename": "silver_powder",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 11,
+						"w": 24,
+						"h": 15
+					},
+					"frame": {
+						"x": 135,
+						"y": 277,
+						"w": 24,
+						"h": 15
+					}
+				},
 				{
 					"filename": "leek",
 					"rotated": false,
@@ -2796,8 +2796,8 @@
 						"h": 23
 					},
 					"frame": {
-						"x": 92,
-						"y": 229,
+						"x": 136,
+						"y": 292,
 						"w": 23,
 						"h": 23
 					}
@@ -2817,33 +2817,12 @@
 						"h": 23
 					},
 					"frame": {
-						"x": 93,
-						"y": 252,
+						"x": 137,
+						"y": 315,
 						"w": 22,
 						"h": 23
 					}
 				},
-				{
-					"filename": "dragon_fang",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 21,
-						"h": 23
-					},
-					"frame": {
-						"x": 94,
-						"y": 275,
-						"w": 21,
-						"h": 23
-					}
-				},
 				{
 					"filename": "electric_tera_shard",
 					"rotated": false,
@@ -2859,8 +2838,8 @@
 						"h": 23
 					},
 					"frame": {
-						"x": 94,
-						"y": 298,
+						"x": 137,
+						"y": 338,
 						"w": 22,
 						"h": 23
 					}
@@ -2880,8 +2859,8 @@
 						"h": 23
 					},
 					"frame": {
-						"x": 94,
-						"y": 321,
+						"x": 142,
+						"y": 361,
 						"w": 22,
 						"h": 23
 					}
@@ -2901,8 +2880,8 @@
 						"h": 23
 					},
 					"frame": {
-						"x": 94,
-						"y": 344,
+						"x": 142,
+						"y": 384,
 						"w": 22,
 						"h": 23
 					}
@@ -2922,203 +2901,14 @@
 						"h": 23
 					},
 					"frame": {
-						"x": 94,
-						"y": 367,
+						"x": 152,
+						"y": 407,
 						"w": 22,
 						"h": 23
 					}
 				},
 				{
-					"filename": "fire_tera_shard",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 4,
-						"w": 22,
-						"h": 23
-					},
-					"frame": {
-						"x": 94,
-						"y": 390,
-						"w": 22,
-						"h": 23
-					}
-				},
-				{
-					"filename": "relic_crown",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 7,
-						"w": 23,
-						"h": 18
-					},
-					"frame": {
-						"x": 94,
-						"y": 413,
-						"w": 23,
-						"h": 18
-					}
-				},
-				{
-					"filename": "prism_scale",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 8,
-						"w": 15,
-						"h": 15
-					},
-					"frame": {
-						"x": 105,
-						"y": 96,
-						"w": 15,
-						"h": 15
-					}
-				},
-				{
-					"filename": "coupon",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 7,
-						"w": 23,
-						"h": 19
-					},
-					"frame": {
-						"x": 113,
-						"y": 77,
-						"w": 23,
-						"h": 19
-					}
-				},
-				{
-					"filename": "full_heal",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 4,
-						"w": 15,
-						"h": 23
-					},
-					"frame": {
-						"x": 136,
-						"y": 77,
-						"w": 15,
-						"h": 23
-					}
-				},
-				{
-					"filename": "golden_mystic_ticket",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 7,
-						"w": 23,
-						"h": 19
-					},
-					"frame": {
-						"x": 151,
-						"y": 81,
-						"w": 23,
-						"h": 19
-					}
-				},
-				{
-					"filename": "burn_drive",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 8,
-						"w": 23,
-						"h": 17
-					},
-					"frame": {
-						"x": 174,
-						"y": 87,
-						"w": 23,
-						"h": 17
-					}
-				},
-				{
-					"filename": "chill_drive",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 8,
-						"w": 23,
-						"h": 17
-					},
-					"frame": {
-						"x": 197,
-						"y": 87,
-						"w": 23,
-						"h": 17
-					}
-				},
-				{
-					"filename": "douse_drive",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 8,
-						"w": 23,
-						"h": 17
-					},
-					"frame": {
-						"x": 220,
-						"y": 87,
-						"w": 23,
-						"h": 17
-					}
-				},
-				{
-					"filename": "healing_charm",
+					"filename": "charcoal",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -3128,13 +2918,13 @@
 					"spriteSourceSize": {
 						"x": 5,
 						"y": 5,
-						"w": 23,
+						"w": 22,
 						"h": 22
 					},
 					"frame": {
-						"x": 243,
-						"y": 88,
-						"w": 23,
+						"x": 162,
+						"y": 209,
+						"w": 22,
 						"h": 22
 					}
 				},
@@ -3153,8 +2943,8 @@
 						"h": 23
 					},
 					"frame": {
-						"x": 266,
-						"y": 88,
+						"x": 158,
+						"y": 231,
 						"w": 23,
 						"h": 23
 					}
@@ -3174,98 +2964,14 @@
 						"h": 23
 					},
 					"frame": {
-						"x": 289,
-						"y": 88,
+						"x": 158,
+						"y": 254,
 						"w": 23,
 						"h": 23
 					}
 				},
 				{
-					"filename": "rarer_candy",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 5,
-						"w": 23,
-						"h": 23
-					},
-					"frame": {
-						"x": 312,
-						"y": 88,
-						"w": 23,
-						"h": 23
-					}
-				},
-				{
-					"filename": "rusted_sword",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 5,
-						"w": 23,
-						"h": 22
-					},
-					"frame": {
-						"x": 335,
-						"y": 89,
-						"w": 23,
-						"h": 22
-					}
-				},
-				{
-					"filename": "abomasite",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 8,
-						"w": 16,
-						"h": 16
-					},
-					"frame": {
-						"x": 120,
-						"y": 96,
-						"w": 16,
-						"h": 16
-					}
-				},
-				{
-					"filename": "bug_memory",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 22,
-						"h": 22
-					},
-					"frame": {
-						"x": 117,
-						"y": 112,
-						"w": 22,
-						"h": 22
-					}
-				},
-				{
-					"filename": "flying_tera_shard",
+					"filename": "fire_tera_shard",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -3279,8 +2985,8 @@
 						"h": 23
 					},
 					"frame": {
-						"x": 116,
-						"y": 134,
+						"x": 159,
+						"y": 277,
 						"w": 22,
 						"h": 23
 					}
@@ -3300,8 +3006,8 @@
 						"h": 23
 					},
 					"frame": {
-						"x": 116,
-						"y": 157,
+						"x": 159,
+						"y": 300,
 						"w": 22,
 						"h": 23
 					}
@@ -3321,12 +3027,54 @@
 						"h": 23
 					},
 					"frame": {
-						"x": 116,
-						"y": 180,
+						"x": 159,
+						"y": 323,
 						"w": 22,
 						"h": 23
 					}
 				},
+				{
+					"filename": "candy_overlay",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 12,
+						"w": 16,
+						"h": 15
+					},
+					"frame": {
+						"x": 159,
+						"y": 346,
+						"w": 16,
+						"h": 15
+					}
+				},
+				{
+					"filename": "full_heal",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 9,
+						"y": 4,
+						"w": 15,
+						"h": 23
+					},
+					"frame": {
+						"x": 164,
+						"y": 361,
+						"w": 15,
+						"h": 23
+					}
+				},
 				{
 					"filename": "grass_tera_shard",
 					"rotated": false,
@@ -3342,33 +3090,12 @@
 						"h": 23
 					},
 					"frame": {
-						"x": 139,
-						"y": 100,
+						"x": 164,
+						"y": 384,
 						"w": 22,
 						"h": 23
 					}
 				},
-				{
-					"filename": "berry_juice",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 22,
-						"h": 21
-					},
-					"frame": {
-						"x": 139,
-						"y": 123,
-						"w": 22,
-						"h": 21
-					}
-				},
 				{
 					"filename": "ground_tera_shard",
 					"rotated": false,
@@ -3384,119 +3111,14 @@
 						"h": 23
 					},
 					"frame": {
-						"x": 138,
-						"y": 144,
+						"x": 174,
+						"y": 407,
 						"w": 22,
 						"h": 23
 					}
 				},
 				{
-					"filename": "ice_tera_shard",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 4,
-						"w": 22,
-						"h": 23
-					},
-					"frame": {
-						"x": 138,
-						"y": 167,
-						"w": 22,
-						"h": 23
-					}
-				},
-				{
-					"filename": "black_sludge",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 7,
-						"w": 22,
-						"h": 19
-					},
-					"frame": {
-						"x": 138,
-						"y": 190,
-						"w": 22,
-						"h": 19
-					}
-				},
-				{
-					"filename": "never_melt_ice",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 22,
-						"h": 23
-					},
-					"frame": {
-						"x": 161,
-						"y": 104,
-						"w": 22,
-						"h": 23
-					}
-				},
-				{
-					"filename": "normal_tera_shard",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 4,
-						"w": 22,
-						"h": 23
-					},
-					"frame": {
-						"x": 183,
-						"y": 104,
-						"w": 22,
-						"h": 23
-					}
-				},
-				{
-					"filename": "petaya_berry",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 22,
-						"h": 23
-					},
-					"frame": {
-						"x": 205,
-						"y": 104,
-						"w": 22,
-						"h": 23
-					}
-				},
-				{
-					"filename": "repel",
+					"filename": "hyper_potion",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -3505,15 +3127,141 @@
 					},
 					"spriteSourceSize": {
 						"x": 8,
-						"y": 4,
-						"w": 16,
-						"h": 24
+						"y": 5,
+						"w": 17,
+						"h": 23
 					},
 					"frame": {
-						"x": 227,
-						"y": 104,
-						"w": 16,
-						"h": 24
+						"x": 157,
+						"y": 36,
+						"w": 17,
+						"h": 23
+					}
+				},
+				{
+					"filename": "adamant_crystal",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 6,
+						"w": 23,
+						"h": 21
+					},
+					"frame": {
+						"x": 157,
+						"y": 59,
+						"w": 23,
+						"h": 21
+					}
+				},
+				{
+					"filename": "rarer_candy",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 5,
+						"w": 23,
+						"h": 23
+					},
+					"frame": {
+						"x": 156,
+						"y": 80,
+						"w": 23,
+						"h": 23
+					}
+				},
+				{
+					"filename": "healing_charm",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 5,
+						"w": 23,
+						"h": 22
+					},
+					"frame": {
+						"x": 174,
+						"y": 21,
+						"w": 23,
+						"h": 22
+					}
+				},
+				{
+					"filename": "rusted_sword",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 5,
+						"w": 23,
+						"h": 22
+					},
+					"frame": {
+						"x": 197,
+						"y": 21,
+						"w": 23,
+						"h": 22
+					}
+				},
+				{
+					"filename": "amulet_coin",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 5,
+						"w": 23,
+						"h": 21
+					},
+					"frame": {
+						"x": 220,
+						"y": 21,
+						"w": 23,
+						"h": 21
+					}
+				},
+				{
+					"filename": "auspicious_armor",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 5,
+						"w": 23,
+						"h": 21
+					},
+					"frame": {
+						"x": 243,
+						"y": 21,
+						"w": 23,
+						"h": 21
 					}
 				},
 				{
@@ -3531,8 +3279,8 @@
 						"h": 21
 					},
 					"frame": {
-						"x": 243,
-						"y": 110,
+						"x": 266,
+						"y": 21,
 						"w": 23,
 						"h": 21
 					}
@@ -3551,36 +3299,15 @@
 						"w": 23,
 						"h": 21
 					},
-					"frame": {
-						"x": 266,
-						"y": 111,
-						"w": 23,
-						"h": 21
-					}
-				},
-				{
-					"filename": "n_solarizer",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 6,
-						"w": 23,
-						"h": 21
-					},
 					"frame": {
 						"x": 289,
-						"y": 111,
+						"y": 21,
 						"w": 23,
 						"h": 21
 					}
 				},
 				{
-					"filename": "wellspring_mask",
+					"filename": "berry_juice",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -3588,207 +3315,18 @@
 						"h": 32
 					},
 					"spriteSourceSize": {
-						"x": 4,
+						"x": 5,
 						"y": 5,
-						"w": 23,
+						"w": 22,
 						"h": 21
 					},
 					"frame": {
 						"x": 312,
-						"y": 111,
-						"w": 23,
+						"y": 21,
+						"w": 22,
 						"h": 21
 					}
 				},
-				{
-					"filename": "charcoal",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 22,
-						"h": 22
-					},
-					"frame": {
-						"x": 335,
-						"y": 111,
-						"w": 22,
-						"h": 22
-					}
-				},
-				{
-					"filename": "mystic_ticket",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 7,
-						"w": 23,
-						"h": 19
-					},
-					"frame": {
-						"x": 161,
-						"y": 127,
-						"w": 23,
-						"h": 19
-					}
-				},
-				{
-					"filename": "poison_tera_shard",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 4,
-						"w": 22,
-						"h": 23
-					},
-					"frame": {
-						"x": 160,
-						"y": 146,
-						"w": 22,
-						"h": 23
-					}
-				},
-				{
-					"filename": "psychic_tera_shard",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 4,
-						"w": 22,
-						"h": 23
-					},
-					"frame": {
-						"x": 160,
-						"y": 169,
-						"w": 22,
-						"h": 23
-					}
-				},
-				{
-					"filename": "pair_of_tickets",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 7,
-						"w": 23,
-						"h": 19
-					},
-					"frame": {
-						"x": 184,
-						"y": 127,
-						"w": 23,
-						"h": 19
-					}
-				},
-				{
-					"filename": "reaper_cloth",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 22,
-						"h": 23
-					},
-					"frame": {
-						"x": 182,
-						"y": 146,
-						"w": 22,
-						"h": 23
-					}
-				},
-				{
-					"filename": "rock_tera_shard",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 4,
-						"w": 22,
-						"h": 23
-					},
-					"frame": {
-						"x": 182,
-						"y": 169,
-						"w": 22,
-						"h": 23
-					}
-				},
-				{
-					"filename": "blue_orb",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 6,
-						"w": 20,
-						"h": 20
-					},
-					"frame": {
-						"x": 207,
-						"y": 127,
-						"w": 20,
-						"h": 20
-					}
-				},
-				{
-					"filename": "steel_tera_shard",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 4,
-						"w": 22,
-						"h": 23
-					},
-					"frame": {
-						"x": 204,
-						"y": 147,
-						"w": 22,
-						"h": 23
-					}
-				},
 				{
 					"filename": "dark_memory",
 					"rotated": false,
@@ -3804,201 +3342,12 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 204,
-						"y": 170,
+						"x": 334,
+						"y": 20,
 						"w": 22,
 						"h": 22
 					}
 				},
-				{
-					"filename": "reviver_seed",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 8,
-						"w": 23,
-						"h": 20
-					},
-					"frame": {
-						"x": 160,
-						"y": 192,
-						"w": 23,
-						"h": 20
-					}
-				},
-				{
-					"filename": "shell_bell",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 7,
-						"w": 23,
-						"h": 20
-					},
-					"frame": {
-						"x": 183,
-						"y": 192,
-						"w": 23,
-						"h": 20
-					}
-				},
-				{
-					"filename": "dawn_stone",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 6,
-						"w": 20,
-						"h": 21
-					},
-					"frame": {
-						"x": 206,
-						"y": 192,
-						"w": 20,
-						"h": 21
-					}
-				},
-				{
-					"filename": "super_repel",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 4,
-						"w": 16,
-						"h": 24
-					},
-					"frame": {
-						"x": 227,
-						"y": 128,
-						"w": 16,
-						"h": 24
-					}
-				},
-				{
-					"filename": "deep_sea_tooth",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 6,
-						"w": 22,
-						"h": 21
-					},
-					"frame": {
-						"x": 243,
-						"y": 131,
-						"w": 22,
-						"h": 21
-					}
-				},
-				{
-					"filename": "stellar_tera_shard",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 4,
-						"w": 22,
-						"h": 23
-					},
-					"frame": {
-						"x": 226,
-						"y": 152,
-						"w": 22,
-						"h": 23
-					}
-				},
-				{
-					"filename": "water_tera_shard",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 4,
-						"w": 22,
-						"h": 23
-					},
-					"frame": {
-						"x": 226,
-						"y": 175,
-						"w": 22,
-						"h": 23
-					}
-				},
-				{
-					"filename": "deep_sea_scale",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 6,
-						"w": 22,
-						"h": 20
-					},
-					"frame": {
-						"x": 265,
-						"y": 132,
-						"w": 22,
-						"h": 20
-					}
-				},
-				{
-					"filename": "wide_lens",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 4,
-						"w": 22,
-						"h": 23
-					},
-					"frame": {
-						"x": 248,
-						"y": 152,
-						"w": 22,
-						"h": 23
-					}
-				},
 				{
 					"filename": "dire_hit",
 					"rotated": false,
@@ -4014,8 +3363,8 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 248,
-						"y": 175,
+						"x": 356,
+						"y": 20,
 						"w": 22,
 						"h": 22
 					}
@@ -4035,12 +3384,117 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 287,
-						"y": 132,
+						"x": 378,
+						"y": 20,
 						"w": 22,
 						"h": 22
 					}
 				},
+				{
+					"filename": "relic_band",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 9,
+						"w": 17,
+						"h": 16
+					},
+					"frame": {
+						"x": 174,
+						"y": 43,
+						"w": 17,
+						"h": 16
+					}
+				},
+				{
+					"filename": "quick_powder",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 6,
+						"w": 24,
+						"h": 20
+					},
+					"frame": {
+						"x": 191,
+						"y": 43,
+						"w": 24,
+						"h": 20
+					}
+				},
+				{
+					"filename": "rusted_shield",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 6,
+						"w": 24,
+						"h": 20
+					},
+					"frame": {
+						"x": 400,
+						"y": 24,
+						"w": 24,
+						"h": 20
+					}
+				},
+				{
+					"filename": "ice_tera_shard",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 4,
+						"w": 22,
+						"h": 23
+					},
+					"frame": {
+						"x": 158,
+						"y": 103,
+						"w": 22,
+						"h": 23
+					}
+				},
+				{
+					"filename": "eviolite",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 8,
+						"w": 15,
+						"h": 15
+					},
+					"frame": {
+						"x": 158,
+						"y": 126,
+						"w": 15,
+						"h": 15
+					}
+				},
 				{
 					"filename": "dragon_memory",
 					"rotated": false,
@@ -4056,428 +3510,8 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 309,
-						"y": 132,
-						"w": 22,
-						"h": 22
-					}
-				},
-				{
-					"filename": "super_lure",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 4,
-						"w": 17,
-						"h": 24
-					},
-					"frame": {
-						"x": 270,
-						"y": 152,
-						"w": 17,
-						"h": 24
-					}
-				},
-				{
-					"filename": "electirizer",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 22,
-						"h": 22
-					},
-					"frame": {
-						"x": 287,
-						"y": 154,
-						"w": 22,
-						"h": 22
-					}
-				},
-				{
-					"filename": "electric_memory",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 22,
-						"h": 22
-					},
-					"frame": {
-						"x": 309,
-						"y": 154,
-						"w": 22,
-						"h": 22
-					}
-				},
-				{
-					"filename": "enigma_berry",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 22,
-						"h": 22
-					},
-					"frame": {
-						"x": 270,
-						"y": 176,
-						"w": 22,
-						"h": 22
-					}
-				},
-				{
-					"filename": "fairy_memory",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 22,
-						"h": 22
-					},
-					"frame": {
-						"x": 292,
-						"y": 176,
-						"w": 22,
-						"h": 22
-					}
-				},
-				{
-					"filename": "fighting_memory",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 22,
-						"h": 22
-					},
-					"frame": {
-						"x": 331,
-						"y": 133,
-						"w": 22,
-						"h": 22
-					}
-				},
-				{
-					"filename": "fire_memory",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 22,
-						"h": 22
-					},
-					"frame": {
-						"x": 331,
-						"y": 155,
-						"w": 22,
-						"h": 22
-					}
-				},
-				{
-					"filename": "hyper_potion",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 5,
-						"w": 17,
-						"h": 23
-					},
-					"frame": {
-						"x": 314,
-						"y": 176,
-						"w": 17,
-						"h": 23
-					}
-				},
-				{
-					"filename": "flying_memory",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 22,
-						"h": 22
-					},
-					"frame": {
-						"x": 331,
-						"y": 177,
-						"w": 22,
-						"h": 22
-					}
-				},
-				{
-					"filename": "blunder_policy",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 6,
-						"w": 22,
-						"h": 19
-					},
-					"frame": {
-						"x": 226,
-						"y": 198,
-						"w": 22,
-						"h": 19
-					}
-				},
-				{
-					"filename": "fairy_feather",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 7,
-						"w": 22,
-						"h": 20
-					},
-					"frame": {
-						"x": 248,
-						"y": 197,
-						"w": 22,
-						"h": 20
-					}
-				},
-				{
-					"filename": "dubious_disc",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 7,
-						"w": 22,
-						"h": 19
-					},
-					"frame": {
-						"x": 270,
-						"y": 198,
-						"w": 22,
-						"h": 19
-					}
-				},
-				{
-					"filename": "ganlon_berry",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 22,
-						"h": 22
-					},
-					"frame": {
-						"x": 292,
-						"y": 198,
-						"w": 22,
-						"h": 22
-					}
-				},
-				{
-					"filename": "ghost_memory",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 22,
-						"h": 22
-					},
-					"frame": {
-						"x": 314,
-						"y": 199,
-						"w": 22,
-						"h": 22
-					}
-				},
-				{
-					"filename": "berry_pot",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 5,
-						"w": 18,
-						"h": 22
-					},
-					"frame": {
-						"x": 336,
-						"y": 199,
-						"w": 18,
-						"h": 22
-					}
-				},
-				{
-					"filename": "grass_memory",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 22,
-						"h": 22
-					},
-					"frame": {
-						"x": 116,
-						"y": 203,
-						"w": 22,
-						"h": 22
-					}
-				},
-				{
-					"filename": "ground_memory",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 22,
-						"h": 22
-					},
-					"frame": {
-						"x": 115,
-						"y": 225,
-						"w": 22,
-						"h": 22
-					}
-				},
-				{
-					"filename": "guard_spec",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 22,
-						"h": 22
-					},
-					"frame": {
-						"x": 115,
-						"y": 247,
-						"w": 22,
-						"h": 22
-					}
-				},
-				{
-					"filename": "ice_memory",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 22,
-						"h": 22
-					},
-					"frame": {
-						"x": 115,
-						"y": 269,
-						"w": 22,
-						"h": 22
-					}
-				},
-				{
-					"filename": "ice_stone",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 22,
-						"h": 22
-					},
-					"frame": {
-						"x": 138,
-						"y": 209,
+						"x": 160,
+						"y": 141,
 						"w": 22,
 						"h": 22
 					}
@@ -4497,8 +3531,8 @@
 						"h": 23
 					},
 					"frame": {
-						"x": 137,
-						"y": 231,
+						"x": 163,
+						"y": 163,
 						"w": 21,
 						"h": 23
 					}
@@ -4518,14 +3552,14 @@
 						"h": 23
 					},
 					"frame": {
-						"x": 137,
-						"y": 254,
+						"x": 169,
+						"y": 186,
 						"w": 21,
 						"h": 23
 					}
 				},
 				{
-					"filename": "liechi_berry",
+					"filename": "prism_scale",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -4533,20 +3567,20 @@
 						"h": 32
 					},
 					"spriteSourceSize": {
-						"x": 5,
-						"y": 6,
-						"w": 22,
-						"h": 21
+						"x": 9,
+						"y": 8,
+						"w": 15,
+						"h": 15
 					},
 					"frame": {
-						"x": 160,
-						"y": 212,
-						"w": 22,
-						"h": 21
+						"x": 173,
+						"y": 126,
+						"w": 15,
+						"h": 15
 					}
 				},
 				{
-					"filename": "magmarizer",
+					"filename": "electirizer",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -4561,13 +3595,55 @@
 					},
 					"frame": {
 						"x": 182,
-						"y": 212,
+						"y": 141,
 						"w": 22,
 						"h": 22
 					}
 				},
 				{
-					"filename": "mini_black_hole",
+					"filename": "never_melt_ice",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 5,
+						"w": 22,
+						"h": 23
+					},
+					"frame": {
+						"x": 184,
+						"y": 163,
+						"w": 22,
+						"h": 23
+					}
+				},
+				{
+					"filename": "normal_tera_shard",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 4,
+						"w": 22,
+						"h": 23
+					},
+					"frame": {
+						"x": 190,
+						"y": 186,
+						"w": 22,
+						"h": 23
+					}
+				},
+				{
+					"filename": "electric_memory",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -4580,15 +3656,204 @@
 						"w": 22,
 						"h": 22
 					},
+					"frame": {
+						"x": 184,
+						"y": 209,
+						"w": 22,
+						"h": 22
+					}
+				},
+				{
+					"filename": "petaya_berry",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 5,
+						"w": 22,
+						"h": 23
+					},
+					"frame": {
+						"x": 181,
+						"y": 231,
+						"w": 22,
+						"h": 23
+					}
+				},
+				{
+					"filename": "poison_tera_shard",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 4,
+						"w": 22,
+						"h": 23
+					},
+					"frame": {
+						"x": 181,
+						"y": 254,
+						"w": 22,
+						"h": 23
+					}
+				},
+				{
+					"filename": "psychic_tera_shard",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 4,
+						"w": 22,
+						"h": 23
+					},
+					"frame": {
+						"x": 181,
+						"y": 277,
+						"w": 22,
+						"h": 23
+					}
+				},
+				{
+					"filename": "reaper_cloth",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 5,
+						"w": 22,
+						"h": 23
+					},
+					"frame": {
+						"x": 181,
+						"y": 300,
+						"w": 22,
+						"h": 23
+					}
+				},
+				{
+					"filename": "rock_tera_shard",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 4,
+						"w": 22,
+						"h": 23
+					},
+					"frame": {
+						"x": 181,
+						"y": 323,
+						"w": 22,
+						"h": 23
+					}
+				},
+				{
+					"filename": "sacred_ash",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 7,
+						"w": 24,
+						"h": 20
+					},
+					"frame": {
+						"x": 180,
+						"y": 63,
+						"w": 24,
+						"h": 20
+					}
+				},
+				{
+					"filename": "shadow_reins_of_unity",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 7,
+						"w": 24,
+						"h": 20
+					},
+					"frame": {
+						"x": 179,
+						"y": 83,
+						"w": 24,
+						"h": 20
+					}
+				},
+				{
+					"filename": "steel_tera_shard",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 4,
+						"w": 22,
+						"h": 23
+					},
+					"frame": {
+						"x": 180,
+						"y": 103,
+						"w": 22,
+						"h": 23
+					}
+				},
+				{
+					"filename": "apicot_berry",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 6,
+						"w": 19,
+						"h": 20
+					},
 					"frame": {
 						"x": 204,
-						"y": 213,
-						"w": 22,
-						"h": 22
+						"y": 63,
+						"w": 19,
+						"h": 20
 					}
 				},
 				{
-					"filename": "moon_flute",
+					"filename": "big_nugget",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -4596,186 +3861,18 @@
 						"h": 32
 					},
 					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 22,
-						"h": 22
-					},
-					"frame": {
-						"x": 158,
-						"y": 233,
-						"w": 22,
-						"h": 22
-					}
-				},
-				{
-					"filename": "normal_memory",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 22,
-						"h": 22
-					},
-					"frame": {
-						"x": 158,
-						"y": 255,
-						"w": 22,
-						"h": 22
-					}
-				},
-				{
-					"filename": "poison_memory",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 22,
-						"h": 22
-					},
-					"frame": {
-						"x": 180,
-						"y": 234,
-						"w": 22,
-						"h": 22
-					}
-				},
-				{
-					"filename": "protector",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 22,
-						"h": 22
-					},
-					"frame": {
-						"x": 180,
-						"y": 256,
-						"w": 22,
-						"h": 22
-					}
-				},
-				{
-					"filename": "psychic_memory",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 22,
-						"h": 22
-					},
-					"frame": {
-						"x": 202,
-						"y": 235,
-						"w": 22,
-						"h": 22
-					}
-				},
-				{
-					"filename": "rock_memory",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 22,
-						"h": 22
-					},
-					"frame": {
-						"x": 202,
-						"y": 257,
-						"w": 22,
-						"h": 22
-					}
-				},
-				{
-					"filename": "malicious_armor",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
+						"x": 6,
 						"y": 6,
-						"w": 22,
+						"w": 20,
 						"h": 20
 					},
 					"frame": {
-						"x": 226,
-						"y": 217,
-						"w": 22,
+						"x": 203,
+						"y": 83,
+						"w": 20,
 						"h": 20
 					}
 				},
-				{
-					"filename": "scroll_of_darkness",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 22,
-						"h": 22
-					},
-					"frame": {
-						"x": 248,
-						"y": 217,
-						"w": 22,
-						"h": 22
-					}
-				},
-				{
-					"filename": "scroll_of_waters",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 22,
-						"h": 22
-					},
-					"frame": {
-						"x": 270,
-						"y": 217,
-						"w": 22,
-						"h": 22
-					}
-				},
 				{
 					"filename": "sharp_beak",
 					"rotated": false,
@@ -4791,119 +3888,14 @@
 						"h": 23
 					},
 					"frame": {
-						"x": 224,
-						"y": 237,
+						"x": 202,
+						"y": 103,
 						"w": 21,
 						"h": 23
 					}
 				},
 				{
-					"filename": "shed_shell",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 22,
-						"h": 22
-					},
-					"frame": {
-						"x": 292,
-						"y": 220,
-						"w": 22,
-						"h": 22
-					}
-				},
-				{
-					"filename": "starf_berry",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 22,
-						"h": 22
-					},
-					"frame": {
-						"x": 314,
-						"y": 221,
-						"w": 22,
-						"h": 22
-					}
-				},
-				{
-					"filename": "dusk_stone",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 6,
-						"w": 21,
-						"h": 21
-					},
-					"frame": {
-						"x": 224,
-						"y": 260,
-						"w": 21,
-						"h": 21
-					}
-				},
-				{
-					"filename": "steel_memory",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 22,
-						"h": 22
-					},
-					"frame": {
-						"x": 245,
-						"y": 239,
-						"w": 22,
-						"h": 22
-					}
-				},
-				{
-					"filename": "sun_flute",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 22,
-						"h": 22
-					},
-					"frame": {
-						"x": 267,
-						"y": 239,
-						"w": 22,
-						"h": 22
-					}
-				},
-				{
-					"filename": "sweet_apple",
+					"filename": "binding_band",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -4913,186 +3905,18 @@
 					"spriteSourceSize": {
 						"x": 5,
 						"y": 6,
-						"w": 22,
-						"h": 21
-					},
-					"frame": {
-						"x": 245,
-						"y": 261,
-						"w": 22,
-						"h": 21
-					}
-				},
-				{
-					"filename": "syrupy_apple",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 6,
-						"w": 22,
-						"h": 21
-					},
-					"frame": {
-						"x": 267,
-						"y": 261,
-						"w": 22,
-						"h": 21
-					}
-				},
-				{
-					"filename": "thick_club",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 22,
-						"h": 22
-					},
-					"frame": {
-						"x": 289,
-						"y": 242,
-						"w": 22,
-						"h": 22
-					}
-				},
-				{
-					"filename": "hard_meteorite",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 5,
-						"w": 20,
-						"h": 22
-					},
-					"frame": {
-						"x": 336,
-						"y": 221,
-						"w": 20,
-						"h": 22
-					}
-				},
-				{
-					"filename": "tart_apple",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 6,
-						"w": 22,
-						"h": 21
-					},
-					"frame": {
-						"x": 289,
-						"y": 264,
-						"w": 22,
-						"h": 21
-					}
-				},
-				{
-					"filename": "thunder_stone",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 22,
-						"h": 22
-					},
-					"frame": {
-						"x": 311,
-						"y": 243,
-						"w": 22,
-						"h": 22
-					}
-				},
-				{
-					"filename": "tm_bug",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 22,
-						"h": 22
-					},
-					"frame": {
-						"x": 333,
-						"y": 243,
-						"w": 22,
-						"h": 22
-					}
-				},
-				{
-					"filename": "tera_orb",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 6,
-						"w": 22,
+						"w": 23,
 						"h": 20
 					},
 					"frame": {
-						"x": 311,
-						"y": 265,
-						"w": 22,
+						"x": 215,
+						"y": 43,
+						"w": 23,
 						"h": 20
 					}
 				},
 				{
-					"filename": "tm_dark",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 22,
-						"h": 22
-					},
-					"frame": {
-						"x": 333,
-						"y": 265,
-						"w": 22,
-						"h": 22
-					}
-				},
-				{
-					"filename": "shock_drive",
+					"filename": "n_solarizer",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -5101,19 +3925,250 @@
 					},
 					"spriteSourceSize": {
 						"x": 4,
-						"y": 8,
+						"y": 6,
 						"w": 23,
-						"h": 17
+						"h": 21
 					},
 					"frame": {
-						"x": 137,
-						"y": 277,
+						"x": 238,
+						"y": 42,
 						"w": 23,
-						"h": 17
+						"h": 21
 					}
 				},
 				{
-					"filename": "whipped_dream",
+					"filename": "stellar_tera_shard",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 4,
+						"w": 22,
+						"h": 23
+					},
+					"frame": {
+						"x": 223,
+						"y": 63,
+						"w": 22,
+						"h": 23
+					}
+				},
+				{
+					"filename": "water_tera_shard",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 4,
+						"w": 22,
+						"h": 23
+					},
+					"frame": {
+						"x": 223,
+						"y": 86,
+						"w": 22,
+						"h": 23
+					}
+				},
+				{
+					"filename": "soft_sand",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 7,
+						"w": 24,
+						"h": 20
+					},
+					"frame": {
+						"x": 261,
+						"y": 42,
+						"w": 24,
+						"h": 20
+					}
+				},
+				{
+					"filename": "reviver_seed",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 8,
+						"w": 23,
+						"h": 20
+					},
+					"frame": {
+						"x": 285,
+						"y": 42,
+						"w": 23,
+						"h": 20
+					}
+				},
+				{
+					"filename": "shell_bell",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 7,
+						"w": 23,
+						"h": 20
+					},
+					"frame": {
+						"x": 308,
+						"y": 42,
+						"w": 23,
+						"h": 20
+					}
+				},
+				{
+					"filename": "wellspring_mask",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 5,
+						"w": 23,
+						"h": 21
+					},
+					"frame": {
+						"x": 331,
+						"y": 42,
+						"w": 23,
+						"h": 21
+					}
+				},
+				{
+					"filename": "deep_sea_tooth",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 6,
+						"w": 22,
+						"h": 21
+					},
+					"frame": {
+						"x": 354,
+						"y": 42,
+						"w": 22,
+						"h": 21
+					}
+				},
+				{
+					"filename": "enigma_berry",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 5,
+						"w": 22,
+						"h": 22
+					},
+					"frame": {
+						"x": 376,
+						"y": 42,
+						"w": 22,
+						"h": 22
+					}
+				},
+				{
+					"filename": "deep_sea_scale",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 6,
+						"w": 22,
+						"h": 20
+					},
+					"frame": {
+						"x": 398,
+						"y": 44,
+						"w": 22,
+						"h": 20
+					}
+				},
+				{
+					"filename": "black_sludge",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 7,
+						"w": 22,
+						"h": 19
+					},
+					"frame": {
+						"x": 223,
+						"y": 109,
+						"w": 22,
+						"h": 19
+					}
+				},
+				{
+					"filename": "potion",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 5,
+						"w": 17,
+						"h": 23
+					},
+					"frame": {
+						"x": 245,
+						"y": 63,
+						"w": 17,
+						"h": 23
+					}
+				},
+				{
+					"filename": "wide_lens",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -5123,60 +4178,18 @@
 					"spriteSourceSize": {
 						"x": 5,
 						"y": 4,
-						"w": 21,
+						"w": 22,
 						"h": 23
 					},
 					"frame": {
-						"x": 116,
-						"y": 291,
-						"w": 21,
+						"x": 262,
+						"y": 62,
+						"w": 22,
 						"h": 23
 					}
 				},
 				{
-					"filename": "mystic_water",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 5,
-						"w": 20,
-						"h": 23
-					},
-					"frame": {
-						"x": 116,
-						"y": 314,
-						"w": 20,
-						"h": 23
-					}
-				},
-				{
-					"filename": "sitrus_berry",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 5,
-						"w": 20,
-						"h": 22
-					},
-					"frame": {
-						"x": 116,
-						"y": 337,
-						"w": 20,
-						"h": 22
-					}
-				},
-				{
-					"filename": "tm_dragon",
+					"filename": "fairy_memory",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -5190,14 +4203,14 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 137,
-						"y": 294,
+						"x": 284,
+						"y": 62,
 						"w": 22,
 						"h": 22
 					}
 				},
 				{
-					"filename": "tm_electric",
+					"filename": "fighting_memory",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -5211,14 +4224,14 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 136,
-						"y": 316,
+						"x": 306,
+						"y": 62,
 						"w": 22,
 						"h": 22
 					}
 				},
 				{
-					"filename": "tm_fairy",
+					"filename": "fire_memory",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -5232,35 +4245,14 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 136,
-						"y": 338,
+						"x": 328,
+						"y": 63,
 						"w": 22,
 						"h": 22
 					}
 				},
 				{
-					"filename": "gb",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 6,
-						"w": 20,
-						"h": 20
-					},
-					"frame": {
-						"x": 116,
-						"y": 359,
-						"w": 20,
-						"h": 20
-					}
-				},
-				{
-					"filename": "tm_fighting",
+					"filename": "flying_memory",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -5274,344 +4266,8 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 116,
-						"y": 379,
-						"w": 22,
-						"h": 22
-					}
-				},
-				{
-					"filename": "upgrade",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 7,
-						"w": 22,
-						"h": 19
-					},
-					"frame": {
-						"x": 136,
-						"y": 360,
-						"w": 22,
-						"h": 19
-					}
-				},
-				{
-					"filename": "tm_fire",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 22,
-						"h": 22
-					},
-					"frame": {
-						"x": 138,
-						"y": 379,
-						"w": 22,
-						"h": 22
-					}
-				},
-				{
-					"filename": "everstone",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 8,
-						"w": 20,
-						"h": 17
-					},
-					"frame": {
-						"x": 160,
-						"y": 277,
-						"w": 20,
-						"h": 17
-					}
-				},
-				{
-					"filename": "tm_flying",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 22,
-						"h": 22
-					},
-					"frame": {
-						"x": 159,
-						"y": 294,
-						"w": 22,
-						"h": 22
-					}
-				},
-				{
-					"filename": "tm_ghost",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 22,
-						"h": 22
-					},
-					"frame": {
-						"x": 158,
-						"y": 316,
-						"w": 22,
-						"h": 22
-					}
-				},
-				{
-					"filename": "tm_grass",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 22,
-						"h": 22
-					},
-					"frame": {
-						"x": 158,
-						"y": 338,
-						"w": 22,
-						"h": 22
-					}
-				},
-				{
-					"filename": "metal_alloy",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 7,
-						"w": 21,
-						"h": 19
-					},
-					"frame": {
-						"x": 158,
-						"y": 360,
-						"w": 21,
-						"h": 19
-					}
-				},
-				{
-					"filename": "lock_capsule",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 5,
-						"w": 19,
-						"h": 22
-					},
-					"frame": {
-						"x": 160,
-						"y": 379,
-						"w": 19,
-						"h": 22
-					}
-				},
-				{
-					"filename": "relic_band",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 9,
-						"w": 17,
-						"h": 16
-					},
-					"frame": {
-						"x": 180,
-						"y": 278,
-						"w": 17,
-						"h": 16
-					}
-				},
-				{
-					"filename": "metal_coat",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 5,
-						"w": 19,
-						"h": 22
-					},
-					"frame": {
-						"x": 181,
-						"y": 294,
-						"w": 19,
-						"h": 22
-					}
-				},
-				{
-					"filename": "tm_ground",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 22,
-						"h": 22
-					},
-					"frame": {
-						"x": 180,
-						"y": 316,
-						"w": 22,
-						"h": 22
-					}
-				},
-				{
-					"filename": "tm_ice",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 22,
-						"h": 22
-					},
-					"frame": {
-						"x": 180,
-						"y": 338,
-						"w": 22,
-						"h": 22
-					}
-				},
-				{
-					"filename": "tm_normal",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 22,
-						"h": 22
-					},
-					"frame": {
-						"x": 179,
-						"y": 360,
-						"w": 22,
-						"h": 22
-					}
-				},
-				{
-					"filename": "tm_poison",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 22,
-						"h": 22
-					},
-					"frame": {
-						"x": 179,
-						"y": 382,
-						"w": 22,
-						"h": 22
-					}
-				},
-				{
-					"filename": "tm_psychic",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 22,
-						"h": 22
-					},
-					"frame": {
-						"x": 117,
-						"y": 401,
-						"w": 22,
-						"h": 22
-					}
-				},
-				{
-					"filename": "tm_rock",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 22,
-						"h": 22
-					},
-					"frame": {
-						"x": 139,
-						"y": 401,
+						"x": 350,
+						"y": 63,
 						"w": 22,
 						"h": 22
 					}
@@ -5631,14 +4287,476 @@
 						"h": 23
 					},
 					"frame": {
-						"x": 161,
-						"y": 401,
+						"x": 245,
+						"y": 86,
 						"w": 18,
 						"h": 23
 					}
 				},
 				{
-					"filename": "tm_steel",
+					"filename": "whipped_dream",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 4,
+						"w": 21,
+						"h": 23
+					},
+					"frame": {
+						"x": 263,
+						"y": 85,
+						"w": 21,
+						"h": 23
+					}
+				},
+				{
+					"filename": "ganlon_berry",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 5,
+						"w": 22,
+						"h": 22
+					},
+					"frame": {
+						"x": 284,
+						"y": 84,
+						"w": 22,
+						"h": 22
+					}
+				},
+				{
+					"filename": "ghost_memory",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 5,
+						"w": 22,
+						"h": 22
+					},
+					"frame": {
+						"x": 306,
+						"y": 84,
+						"w": 22,
+						"h": 22
+					}
+				},
+				{
+					"filename": "grass_memory",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 5,
+						"w": 22,
+						"h": 22
+					},
+					"frame": {
+						"x": 328,
+						"y": 85,
+						"w": 22,
+						"h": 22
+					}
+				},
+				{
+					"filename": "ground_memory",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 5,
+						"w": 22,
+						"h": 22
+					},
+					"frame": {
+						"x": 350,
+						"y": 85,
+						"w": 22,
+						"h": 22
+					}
+				},
+				{
+					"filename": "guard_spec",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 5,
+						"w": 22,
+						"h": 22
+					},
+					"frame": {
+						"x": 372,
+						"y": 64,
+						"w": 22,
+						"h": 22
+					}
+				},
+				{
+					"filename": "ice_memory",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 5,
+						"w": 22,
+						"h": 22
+					},
+					"frame": {
+						"x": 394,
+						"y": 64,
+						"w": 22,
+						"h": 22
+					}
+				},
+				{
+					"filename": "ice_stone",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 5,
+						"w": 22,
+						"h": 22
+					},
+					"frame": {
+						"x": 372,
+						"y": 86,
+						"w": 22,
+						"h": 22
+					}
+				},
+				{
+					"filename": "magmarizer",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 5,
+						"w": 22,
+						"h": 22
+					},
+					"frame": {
+						"x": 394,
+						"y": 86,
+						"w": 22,
+						"h": 22
+					}
+				},
+				{
+					"filename": "mystery_egg",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 8,
+						"w": 16,
+						"h": 18
+					},
+					"frame": {
+						"x": 416,
+						"y": 64,
+						"w": 16,
+						"h": 18
+					}
+				},
+				{
+					"filename": "abomasite",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 8,
+						"w": 16,
+						"h": 16
+					},
+					"frame": {
+						"x": 416,
+						"y": 82,
+						"w": 16,
+						"h": 16
+					}
+				},
+				{
+					"filename": "absolite",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 8,
+						"w": 16,
+						"h": 16
+					},
+					"frame": {
+						"x": 416,
+						"y": 98,
+						"w": 16,
+						"h": 16
+					}
+				},
+				{
+					"filename": "revive",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 10,
+						"y": 8,
+						"w": 12,
+						"h": 17
+					},
+					"frame": {
+						"x": 420,
+						"y": 44,
+						"w": 12,
+						"h": 17
+					}
+				},
+				{
+					"filename": "big_mushroom",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 6,
+						"w": 19,
+						"h": 19
+					},
+					"frame": {
+						"x": 245,
+						"y": 109,
+						"w": 19,
+						"h": 19
+					}
+				},
+				{
+					"filename": "blue_orb",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 6,
+						"w": 20,
+						"h": 20
+					},
+					"frame": {
+						"x": 264,
+						"y": 108,
+						"w": 20,
+						"h": 20
+					}
+				},
+				{
+					"filename": "mini_black_hole",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 5,
+						"w": 22,
+						"h": 22
+					},
+					"frame": {
+						"x": 284,
+						"y": 106,
+						"w": 22,
+						"h": 22
+					}
+				},
+				{
+					"filename": "moon_flute",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 5,
+						"w": 22,
+						"h": 22
+					},
+					"frame": {
+						"x": 306,
+						"y": 106,
+						"w": 22,
+						"h": 22
+					}
+				},
+				{
+					"filename": "liechi_berry",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 6,
+						"w": 22,
+						"h": 21
+					},
+					"frame": {
+						"x": 328,
+						"y": 107,
+						"w": 22,
+						"h": 21
+					}
+				},
+				{
+					"filename": "normal_memory",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 5,
+						"w": 22,
+						"h": 22
+					},
+					"frame": {
+						"x": 350,
+						"y": 107,
+						"w": 22,
+						"h": 22
+					}
+				},
+				{
+					"filename": "poison_memory",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 5,
+						"w": 22,
+						"h": 22
+					},
+					"frame": {
+						"x": 372,
+						"y": 108,
+						"w": 22,
+						"h": 22
+					}
+				},
+				{
+					"filename": "protector",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 5,
+						"w": 22,
+						"h": 22
+					},
+					"frame": {
+						"x": 394,
+						"y": 108,
+						"w": 22,
+						"h": 22
+					}
+				},
+				{
+					"filename": "aerodactylite",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 8,
+						"w": 16,
+						"h": 16
+					},
+					"frame": {
+						"x": 416,
+						"y": 114,
+						"w": 16,
+						"h": 16
+					}
+				},
+				{
+					"filename": "psychic_memory",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -5653,11 +4771,95 @@
 					},
 					"frame": {
 						"x": 179,
-						"y": 404,
+						"y": 346,
 						"w": 22,
 						"h": 22
 					}
 				},
+				{
+					"filename": "aggronite",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 8,
+						"w": 16,
+						"h": 16
+					},
+					"frame": {
+						"x": 179,
+						"y": 368,
+						"w": 16,
+						"h": 16
+					}
+				},
+				{
+					"filename": "super_potion",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 5,
+						"w": 17,
+						"h": 23
+					},
+					"frame": {
+						"x": 186,
+						"y": 384,
+						"w": 17,
+						"h": 23
+					}
+				},
+				{
+					"filename": "alakazite",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 8,
+						"w": 16,
+						"h": 16
+					},
+					"frame": {
+						"x": 195,
+						"y": 368,
+						"w": 16,
+						"h": 16
+					}
+				},
+				{
+					"filename": "hard_meteorite",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 5,
+						"w": 20,
+						"h": 22
+					},
+					"frame": {
+						"x": 201,
+						"y": 346,
+						"w": 20,
+						"h": 22
+					}
+				},
 				{
 					"filename": "leftovers",
 					"rotated": false,
@@ -5673,14 +4875,35 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 358,
-						"y": 89,
+						"x": 203,
+						"y": 384,
 						"w": 15,
 						"h": 22
 					}
 				},
 				{
-					"filename": "razor_fang",
+					"filename": "altarianite",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 8,
+						"w": 16,
+						"h": 16
+					},
+					"frame": {
+						"x": 211,
+						"y": 368,
+						"w": 16,
+						"h": 16
+					}
+				},
+				{
+					"filename": "lock_capsule",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -5689,15 +4912,57 @@
 					},
 					"spriteSourceSize": {
 						"x": 7,
-						"y": 6,
-						"w": 18,
-						"h": 20
+						"y": 5,
+						"w": 19,
+						"h": 22
 					},
 					"frame": {
-						"x": 373,
-						"y": 88,
-						"w": 18,
-						"h": 20
+						"x": 218,
+						"y": 384,
+						"w": 19,
+						"h": 22
+					}
+				},
+				{
+					"filename": "metal_coat",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 5,
+						"w": 19,
+						"h": 22
+					},
+					"frame": {
+						"x": 196,
+						"y": 407,
+						"w": 19,
+						"h": 22
+					}
+				},
+				{
+					"filename": "rock_memory",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 5,
+						"w": 22,
+						"h": 22
+					},
+					"frame": {
+						"x": 215,
+						"y": 406,
+						"w": 22,
+						"h": 22
 					}
 				},
 				{
@@ -5715,12 +4980,852 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 357,
-						"y": 111,
+						"x": 206,
+						"y": 209,
 						"w": 17,
 						"h": 22
 					}
 				},
+				{
+					"filename": "scroll_of_darkness",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 5,
+						"w": 22,
+						"h": 22
+					},
+					"frame": {
+						"x": 203,
+						"y": 231,
+						"w": 22,
+						"h": 22
+					}
+				},
+				{
+					"filename": "scroll_of_waters",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 5,
+						"w": 22,
+						"h": 22
+					},
+					"frame": {
+						"x": 203,
+						"y": 253,
+						"w": 22,
+						"h": 22
+					}
+				},
+				{
+					"filename": "shed_shell",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 5,
+						"w": 22,
+						"h": 22
+					},
+					"frame": {
+						"x": 203,
+						"y": 275,
+						"w": 22,
+						"h": 22
+					}
+				},
+				{
+					"filename": "starf_berry",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 5,
+						"w": 22,
+						"h": 22
+					},
+					"frame": {
+						"x": 203,
+						"y": 297,
+						"w": 22,
+						"h": 22
+					}
+				},
+				{
+					"filename": "steel_memory",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 5,
+						"w": 22,
+						"h": 22
+					},
+					"frame": {
+						"x": 203,
+						"y": 319,
+						"w": 22,
+						"h": 22
+					}
+				},
+				{
+					"filename": "quick_claw",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 6,
+						"w": 19,
+						"h": 21
+					},
+					"frame": {
+						"x": 204,
+						"y": 126,
+						"w": 19,
+						"h": 21
+					}
+				},
+				{
+					"filename": "golden_mystic_ticket",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 7,
+						"w": 23,
+						"h": 19
+					},
+					"frame": {
+						"x": 223,
+						"y": 128,
+						"w": 23,
+						"h": 19
+					}
+				},
+				{
+					"filename": "mystic_ticket",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 7,
+						"w": 23,
+						"h": 19
+					},
+					"frame": {
+						"x": 246,
+						"y": 128,
+						"w": 23,
+						"h": 19
+					}
+				},
+				{
+					"filename": "pair_of_tickets",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 7,
+						"w": 23,
+						"h": 19
+					},
+					"frame": {
+						"x": 269,
+						"y": 128,
+						"w": 23,
+						"h": 19
+					}
+				},
+				{
+					"filename": "blunder_policy",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 6,
+						"w": 22,
+						"h": 19
+					},
+					"frame": {
+						"x": 292,
+						"y": 128,
+						"w": 22,
+						"h": 19
+					}
+				},
+				{
+					"filename": "dubious_disc",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 7,
+						"w": 22,
+						"h": 19
+					},
+					"frame": {
+						"x": 314,
+						"y": 128,
+						"w": 22,
+						"h": 19
+					}
+				},
+				{
+					"filename": "ampharosite",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 8,
+						"w": 16,
+						"h": 16
+					},
+					"frame": {
+						"x": 204,
+						"y": 147,
+						"w": 16,
+						"h": 16
+					}
+				},
+				{
+					"filename": "burn_drive",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 8,
+						"w": 23,
+						"h": 17
+					},
+					"frame": {
+						"x": 220,
+						"y": 147,
+						"w": 23,
+						"h": 17
+					}
+				},
+				{
+					"filename": "chill_drive",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 8,
+						"w": 23,
+						"h": 17
+					},
+					"frame": {
+						"x": 243,
+						"y": 147,
+						"w": 23,
+						"h": 17
+					}
+				},
+				{
+					"filename": "douse_drive",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 8,
+						"w": 23,
+						"h": 17
+					},
+					"frame": {
+						"x": 266,
+						"y": 147,
+						"w": 23,
+						"h": 17
+					}
+				},
+				{
+					"filename": "relic_crown",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 7,
+						"w": 23,
+						"h": 18
+					},
+					"frame": {
+						"x": 289,
+						"y": 147,
+						"w": 23,
+						"h": 18
+					}
+				},
+				{
+					"filename": "fairy_feather",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 7,
+						"w": 22,
+						"h": 20
+					},
+					"frame": {
+						"x": 312,
+						"y": 147,
+						"w": 22,
+						"h": 20
+					}
+				},
+				{
+					"filename": "sun_flute",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 5,
+						"w": 22,
+						"h": 22
+					},
+					"frame": {
+						"x": 206,
+						"y": 164,
+						"w": 22,
+						"h": 22
+					}
+				},
+				{
+					"filename": "thick_club",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 5,
+						"w": 22,
+						"h": 22
+					},
+					"frame": {
+						"x": 228,
+						"y": 164,
+						"w": 22,
+						"h": 22
+					}
+				},
+				{
+					"filename": "thunder_stone",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 5,
+						"w": 22,
+						"h": 22
+					},
+					"frame": {
+						"x": 212,
+						"y": 186,
+						"w": 22,
+						"h": 22
+					}
+				},
+				{
+					"filename": "tm_bug",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 5,
+						"w": 22,
+						"h": 22
+					},
+					"frame": {
+						"x": 250,
+						"y": 164,
+						"w": 22,
+						"h": 22
+					}
+				},
+				{
+					"filename": "tm_dark",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 5,
+						"w": 22,
+						"h": 22
+					},
+					"frame": {
+						"x": 234,
+						"y": 186,
+						"w": 22,
+						"h": 22
+					}
+				},
+				{
+					"filename": "tm_dragon",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 5,
+						"w": 22,
+						"h": 22
+					},
+					"frame": {
+						"x": 223,
+						"y": 208,
+						"w": 22,
+						"h": 22
+					}
+				},
+				{
+					"filename": "sitrus_berry",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 5,
+						"w": 20,
+						"h": 22
+					},
+					"frame": {
+						"x": 225,
+						"y": 230,
+						"w": 20,
+						"h": 22
+					}
+				},
+				{
+					"filename": "tm_electric",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 5,
+						"w": 22,
+						"h": 22
+					},
+					"frame": {
+						"x": 225,
+						"y": 252,
+						"w": 22,
+						"h": 22
+					}
+				},
+				{
+					"filename": "tm_fairy",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 5,
+						"w": 22,
+						"h": 22
+					},
+					"frame": {
+						"x": 225,
+						"y": 274,
+						"w": 22,
+						"h": 22
+					}
+				},
+				{
+					"filename": "tm_fighting",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 5,
+						"w": 22,
+						"h": 22
+					},
+					"frame": {
+						"x": 225,
+						"y": 296,
+						"w": 22,
+						"h": 22
+					}
+				},
+				{
+					"filename": "tm_fire",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 5,
+						"w": 22,
+						"h": 22
+					},
+					"frame": {
+						"x": 225,
+						"y": 318,
+						"w": 22,
+						"h": 22
+					}
+				},
+				{
+					"filename": "soothe_bell",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 5,
+						"w": 17,
+						"h": 22
+					},
+					"frame": {
+						"x": 272,
+						"y": 164,
+						"w": 17,
+						"h": 22
+					}
+				},
+				{
+					"filename": "tm_flying",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 5,
+						"w": 22,
+						"h": 22
+					},
+					"frame": {
+						"x": 256,
+						"y": 186,
+						"w": 22,
+						"h": 22
+					}
+				},
+				{
+					"filename": "tm_ghost",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 5,
+						"w": 22,
+						"h": 22
+					},
+					"frame": {
+						"x": 245,
+						"y": 208,
+						"w": 22,
+						"h": 22
+					}
+				},
+				{
+					"filename": "tm_grass",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 5,
+						"w": 22,
+						"h": 22
+					},
+					"frame": {
+						"x": 245,
+						"y": 230,
+						"w": 22,
+						"h": 22
+					}
+				},
+				{
+					"filename": "sweet_apple",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 6,
+						"w": 22,
+						"h": 21
+					},
+					"frame": {
+						"x": 289,
+						"y": 165,
+						"w": 22,
+						"h": 21
+					}
+				},
+				{
+					"filename": "tm_ground",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 5,
+						"w": 22,
+						"h": 22
+					},
+					"frame": {
+						"x": 278,
+						"y": 186,
+						"w": 22,
+						"h": 22
+					}
+				},
+				{
+					"filename": "tm_ice",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 5,
+						"w": 22,
+						"h": 22
+					},
+					"frame": {
+						"x": 267,
+						"y": 208,
+						"w": 22,
+						"h": 22
+					}
+				},
+				{
+					"filename": "tm_normal",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 5,
+						"w": 22,
+						"h": 22
+					},
+					"frame": {
+						"x": 267,
+						"y": 230,
+						"w": 22,
+						"h": 22
+					}
+				},
+				{
+					"filename": "tm_poison",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 5,
+						"w": 22,
+						"h": 22
+					},
+					"frame": {
+						"x": 247,
+						"y": 252,
+						"w": 22,
+						"h": 22
+					}
+				},
+				{
+					"filename": "tm_psychic",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 5,
+						"w": 22,
+						"h": 22
+					},
+					"frame": {
+						"x": 247,
+						"y": 274,
+						"w": 22,
+						"h": 22
+					}
+				},
+				{
+					"filename": "tm_rock",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 5,
+						"w": 22,
+						"h": 22
+					},
+					"frame": {
+						"x": 247,
+						"y": 296,
+						"w": 22,
+						"h": 22
+					}
+				},
+				{
+					"filename": "tm_steel",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 5,
+						"w": 22,
+						"h": 22
+					},
+					"frame": {
+						"x": 247,
+						"y": 318,
+						"w": 22,
+						"h": 22
+					}
+				},
 				{
 					"filename": "tm_water",
 					"rotated": false,
@@ -5736,8 +5841,8 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 353,
-						"y": 133,
+						"x": 269,
+						"y": 252,
 						"w": 22,
 						"h": 22
 					}
@@ -5757,8 +5862,8 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 353,
-						"y": 155,
+						"x": 269,
+						"y": 274,
 						"w": 22,
 						"h": 22
 					}
@@ -5778,8 +5883,8 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 353,
-						"y": 177,
+						"x": 269,
+						"y": 296,
 						"w": 22,
 						"h": 22
 					}
@@ -5799,12 +5904,33 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 354,
-						"y": 199,
+						"x": 269,
+						"y": 318,
 						"w": 22,
 						"h": 22
 					}
 				},
+				{
+					"filename": "malicious_armor",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 6,
+						"w": 22,
+						"h": 20
+					},
+					"frame": {
+						"x": 311,
+						"y": 167,
+						"w": 22,
+						"h": 20
+					}
+				},
 				{
 					"filename": "x_attack",
 					"rotated": false,
@@ -5820,8 +5946,8 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 356,
-						"y": 221,
+						"x": 289,
+						"y": 208,
 						"w": 22,
 						"h": 22
 					}
@@ -5841,12 +5967,33 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 355,
-						"y": 243,
+						"x": 289,
+						"y": 230,
 						"w": 22,
 						"h": 22
 					}
 				},
+				{
+					"filename": "syrupy_apple",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 6,
+						"w": 22,
+						"h": 21
+					},
+					"frame": {
+						"x": 300,
+						"y": 187,
+						"w": 22,
+						"h": 21
+					}
+				},
 				{
 					"filename": "x_sp_atk",
 					"rotated": false,
@@ -5862,54 +6009,12 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 355,
-						"y": 265,
+						"x": 291,
+						"y": 252,
 						"w": 22,
 						"h": 22
 					}
 				},
-				{
-					"filename": "potion",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 5,
-						"w": 17,
-						"h": 23
-					},
-					"frame": {
-						"x": 374,
-						"y": 108,
-						"w": 17,
-						"h": 23
-					}
-				},
-				{
-					"filename": "unknown",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 4,
-						"w": 16,
-						"h": 24
-					},
-					"frame": {
-						"x": 391,
-						"y": 91,
-						"w": 16,
-						"h": 24
-					}
-				},
 				{
 					"filename": "x_sp_def",
 					"rotated": false,
@@ -5925,96 +6030,12 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 407,
-						"y": 92,
+						"x": 291,
+						"y": 274,
 						"w": 22,
 						"h": 22
 					}
 				},
-				{
-					"filename": "zinc",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 4,
-						"w": 16,
-						"h": 24
-					},
-					"frame": {
-						"x": 375,
-						"y": 131,
-						"w": 16,
-						"h": 24
-					}
-				},
-				{
-					"filename": "super_potion",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 5,
-						"w": 17,
-						"h": 23
-					},
-					"frame": {
-						"x": 391,
-						"y": 115,
-						"w": 17,
-						"h": 23
-					}
-				},
-				{
-					"filename": "wise_glasses",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 8,
-						"w": 23,
-						"h": 17
-					},
-					"frame": {
-						"x": 408,
-						"y": 114,
-						"w": 23,
-						"h": 17
-					}
-				},
-				{
-					"filename": "soothe_bell",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 5,
-						"w": 17,
-						"h": 22
-					},
-					"frame": {
-						"x": 375,
-						"y": 155,
-						"w": 17,
-						"h": 22
-					}
-				},
 				{
 					"filename": "x_speed",
 					"rotated": false,
@@ -6030,12 +6051,75 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 375,
-						"y": 177,
+						"x": 291,
+						"y": 296,
 						"w": 22,
 						"h": 22
 					}
 				},
+				{
+					"filename": "tart_apple",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 6,
+						"w": 22,
+						"h": 21
+					},
+					"frame": {
+						"x": 291,
+						"y": 318,
+						"w": 22,
+						"h": 21
+					}
+				},
+				{
+					"filename": "dawn_stone",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 6,
+						"w": 20,
+						"h": 21
+					},
+					"frame": {
+						"x": 322,
+						"y": 187,
+						"w": 20,
+						"h": 21
+					}
+				},
+				{
+					"filename": "dusk_stone",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 6,
+						"w": 21,
+						"h": 21
+					},
+					"frame": {
+						"x": 311,
+						"y": 208,
+						"w": 21,
+						"h": 21
+					}
+				},
 				{
 					"filename": "poison_barb",
 					"rotated": false,
@@ -6051,14 +6135,14 @@
 						"h": 21
 					},
 					"frame": {
-						"x": 376,
-						"y": 199,
+						"x": 311,
+						"y": 229,
 						"w": 21,
 						"h": 21
 					}
 				},
 				{
-					"filename": "quick_claw",
+					"filename": "flying_tera_shard",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -6066,39 +6150,18 @@
 						"h": 32
 					},
 					"spriteSourceSize": {
-						"x": 6,
-						"y": 6,
-						"w": 19,
+						"x": 7,
+						"y": 5,
+						"w": 20,
 						"h": 21
 					},
 					"frame": {
-						"x": 378,
-						"y": 220,
-						"w": 19,
+						"x": 313,
+						"y": 250,
+						"w": 20,
 						"h": 21
 					}
 				},
-				{
-					"filename": "absolite",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 8,
-						"w": 16,
-						"h": 16
-					},
-					"frame": {
-						"x": 391,
-						"y": 138,
-						"w": 16,
-						"h": 16
-					}
-				},
 				{
 					"filename": "shiny_stone",
 					"rotated": false,
@@ -6114,243 +6177,12 @@
 						"h": 21
 					},
 					"frame": {
-						"x": 392,
-						"y": 154,
+						"x": 313,
+						"y": 271,
 						"w": 21,
 						"h": 21
 					}
 				},
-				{
-					"filename": "oval_stone",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 7,
-						"w": 18,
-						"h": 19
-					},
-					"frame": {
-						"x": 413,
-						"y": 131,
-						"w": 18,
-						"h": 19
-					}
-				},
-				{
-					"filename": "baton",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 7,
-						"w": 18,
-						"h": 18
-					},
-					"frame": {
-						"x": 413,
-						"y": 150,
-						"w": 18,
-						"h": 18
-					}
-				},
-				{
-					"filename": "candy",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 11,
-						"w": 18,
-						"h": 18
-					},
-					"frame": {
-						"x": 413,
-						"y": 168,
-						"w": 18,
-						"h": 18
-					}
-				},
-				{
-					"filename": "mystery_egg",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 8,
-						"w": 16,
-						"h": 18
-					},
-					"frame": {
-						"x": 397,
-						"y": 175,
-						"w": 16,
-						"h": 18
-					}
-				},
-				{
-					"filename": "dark_stone",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 7,
-						"w": 18,
-						"h": 18
-					},
-					"frame": {
-						"x": 413,
-						"y": 186,
-						"w": 18,
-						"h": 18
-					}
-				},
-				{
-					"filename": "aerodactylite",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 8,
-						"w": 16,
-						"h": 16
-					},
-					"frame": {
-						"x": 397,
-						"y": 193,
-						"w": 16,
-						"h": 16
-					}
-				},
-				{
-					"filename": "flame_orb",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 7,
-						"w": 18,
-						"h": 18
-					},
-					"frame": {
-						"x": 413,
-						"y": 204,
-						"w": 18,
-						"h": 18
-					}
-				},
-				{
-					"filename": "aggronite",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 8,
-						"w": 16,
-						"h": 16
-					},
-					"frame": {
-						"x": 397,
-						"y": 209,
-						"w": 16,
-						"h": 16
-					}
-				},
-				{
-					"filename": "light_ball",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 7,
-						"w": 18,
-						"h": 18
-					},
-					"frame": {
-						"x": 413,
-						"y": 222,
-						"w": 18,
-						"h": 18
-					}
-				},
-				{
-					"filename": "alakazite",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 8,
-						"w": 16,
-						"h": 16
-					},
-					"frame": {
-						"x": 397,
-						"y": 225,
-						"w": 16,
-						"h": 16
-					}
-				},
-				{
-					"filename": "light_stone",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 7,
-						"w": 18,
-						"h": 18
-					},
-					"frame": {
-						"x": 413,
-						"y": 240,
-						"w": 18,
-						"h": 18
-					}
-				},
 				{
 					"filename": "zoom_lens",
 					"rotated": false,
@@ -6366,35 +6198,14 @@
 						"h": 21
 					},
 					"frame": {
-						"x": 200,
-						"y": 279,
+						"x": 313,
+						"y": 292,
 						"w": 21,
 						"h": 21
 					}
 				},
 				{
-					"filename": "lum_berry",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 7,
-						"w": 20,
-						"h": 19
-					},
-					"frame": {
-						"x": 221,
-						"y": 281,
-						"w": 20,
-						"h": 19
-					}
-				},
-				{
-					"filename": "masterpiece_teacup",
+					"filename": "tera_orb",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -6403,19 +6214,40 @@
 					},
 					"spriteSourceSize": {
 						"x": 5,
-						"y": 7,
-						"w": 21,
-						"h": 18
+						"y": 6,
+						"w": 22,
+						"h": 20
 					},
 					"frame": {
-						"x": 241,
-						"y": 282,
-						"w": 21,
-						"h": 18
+						"x": 313,
+						"y": 313,
+						"w": 22,
+						"h": 20
 					}
 				},
 				{
-					"filename": "old_gateau",
+					"filename": "spell_tag",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 6,
+						"w": 19,
+						"h": 21
+					},
+					"frame": {
+						"x": 332,
+						"y": 208,
+						"w": 19,
+						"h": 21
+					}
+				},
+				{
+					"filename": "candy_jar",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -6424,40 +6256,19 @@
 					},
 					"spriteSourceSize": {
 						"x": 6,
-						"y": 8,
-						"w": 21,
-						"h": 18
+						"y": 6,
+						"w": 19,
+						"h": 20
 					},
 					"frame": {
-						"x": 262,
-						"y": 282,
-						"w": 21,
-						"h": 18
+						"x": 332,
+						"y": 229,
+						"w": 19,
+						"h": 20
 					}
 				},
 				{
-					"filename": "altarianite",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 8,
-						"w": 16,
-						"h": 16
-					},
-					"frame": {
-						"x": 200,
-						"y": 300,
-						"w": 16,
-						"h": 16
-					}
-				},
-				{
-					"filename": "sharp_meteorite",
+					"filename": "gb",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -6466,19 +6277,19 @@
 					},
 					"spriteSourceSize": {
 						"x": 6,
-						"y": 8,
-						"w": 21,
-						"h": 18
+						"y": 6,
+						"w": 20,
+						"h": 20
 					},
 					"frame": {
-						"x": 216,
-						"y": 300,
-						"w": 21,
-						"h": 18
+						"x": 333,
+						"y": 249,
+						"w": 20,
+						"h": 20
 					}
 				},
 				{
-					"filename": "unremarkable_teacup",
+					"filename": "hard_stone",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -6486,16 +6297,16 @@
 						"h": 32
 					},
 					"spriteSourceSize": {
-						"x": 5,
-						"y": 7,
-						"w": 21,
-						"h": 18
+						"x": 6,
+						"y": 6,
+						"w": 19,
+						"h": 20
 					},
 					"frame": {
-						"x": 237,
-						"y": 300,
-						"w": 21,
-						"h": 18
+						"x": 334,
+						"y": 269,
+						"w": 19,
+						"h": 20
 					}
 				},
 				{
@@ -6513,8 +6324,8 @@
 						"h": 20
 					},
 					"frame": {
-						"x": 258,
-						"y": 300,
+						"x": 334,
+						"y": 289,
 						"w": 20,
 						"h": 20
 					}
@@ -6534,12 +6345,75 @@
 						"h": 20
 					},
 					"frame": {
-						"x": 283,
-						"y": 285,
+						"x": 335,
+						"y": 309,
 						"w": 20,
 						"h": 20
 					}
 				},
+				{
+					"filename": "golden_egg",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 6,
+						"w": 17,
+						"h": 20
+					},
+					"frame": {
+						"x": 333,
+						"y": 167,
+						"w": 17,
+						"h": 20
+					}
+				},
+				{
+					"filename": "lucky_egg",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 6,
+						"w": 17,
+						"h": 20
+					},
+					"frame": {
+						"x": 334,
+						"y": 147,
+						"w": 17,
+						"h": 20
+					}
+				},
+				{
+					"filename": "masterpiece_teacup",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 7,
+						"w": 21,
+						"h": 18
+					},
+					"frame": {
+						"x": 336,
+						"y": 129,
+						"w": 21,
+						"h": 18
+					}
+				},
 				{
 					"filename": "pb",
 					"rotated": false,
@@ -6555,8 +6429,8 @@
 						"h": 20
 					},
 					"frame": {
-						"x": 303,
-						"y": 285,
+						"x": 342,
+						"y": 187,
 						"w": 20,
 						"h": 20
 					}
@@ -6576,8 +6450,8 @@
 						"h": 20
 					},
 					"frame": {
-						"x": 278,
-						"y": 305,
+						"x": 350,
+						"y": 167,
 						"w": 20,
 						"h": 20
 					}
@@ -6597,14 +6471,14 @@
 						"h": 20
 					},
 					"frame": {
-						"x": 298,
-						"y": 305,
+						"x": 351,
+						"y": 147,
 						"w": 20,
 						"h": 20
 					}
 				},
 				{
-					"filename": "revive",
+					"filename": "shock_drive",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -6612,20 +6486,62 @@
 						"h": 32
 					},
 					"spriteSourceSize": {
-						"x": 10,
+						"x": 4,
 						"y": 8,
-						"w": 12,
+						"w": 23,
 						"h": 17
 					},
 					"frame": {
-						"x": 202,
-						"y": 316,
-						"w": 12,
+						"x": 357,
+						"y": 130,
+						"w": 23,
 						"h": 17
 					}
 				},
 				{
-					"filename": "power_herb",
+					"filename": "wise_glasses",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 8,
+						"w": 23,
+						"h": 17
+					},
+					"frame": {
+						"x": 380,
+						"y": 130,
+						"w": 23,
+						"h": 17
+					}
+				},
+				{
+					"filename": "upgrade",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 7,
+						"w": 22,
+						"h": 19
+					},
+					"frame": {
+						"x": 371,
+						"y": 147,
+						"w": 22,
+						"h": 19
+					}
+				},
+				{
+					"filename": "metal_alloy",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -6635,18 +6551,18 @@
 					"spriteSourceSize": {
 						"x": 6,
 						"y": 7,
-						"w": 20,
+						"w": 21,
 						"h": 19
 					},
 					"frame": {
-						"x": 214,
-						"y": 318,
-						"w": 20,
+						"x": 403,
+						"y": 130,
+						"w": 21,
 						"h": 19
 					}
 				},
 				{
-					"filename": "razor_claw",
+					"filename": "razor_fang",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -6654,16 +6570,16 @@
 						"h": 32
 					},
 					"spriteSourceSize": {
-						"x": 6,
-						"y": 7,
-						"w": 20,
-						"h": 19
+						"x": 7,
+						"y": 6,
+						"w": 18,
+						"h": 20
 					},
 					"frame": {
-						"x": 234,
-						"y": 318,
-						"w": 20,
-						"h": 19
+						"x": 351,
+						"y": 207,
+						"w": 18,
+						"h": 20
 					}
 				},
 				{
@@ -6681,8 +6597,8 @@
 						"h": 20
 					},
 					"frame": {
-						"x": 254,
-						"y": 320,
+						"x": 351,
+						"y": 227,
 						"w": 20,
 						"h": 20
 					}
@@ -6702,8 +6618,8 @@
 						"h": 20
 					},
 					"frame": {
-						"x": 274,
-						"y": 325,
+						"x": 353,
+						"y": 247,
 						"w": 20,
 						"h": 20
 					}
@@ -6723,33 +6639,12 @@
 						"h": 20
 					},
 					"frame": {
-						"x": 294,
-						"y": 325,
+						"x": 353,
+						"y": 267,
 						"w": 20,
 						"h": 20
 					}
 				},
-				{
-					"filename": "spell_tag",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 6,
-						"w": 19,
-						"h": 21
-					},
-					"frame": {
-						"x": 202,
-						"y": 337,
-						"w": 19,
-						"h": 21
-					}
-				},
 				{
 					"filename": "ub",
 					"rotated": false,
@@ -6765,14 +6660,14 @@
 						"h": 20
 					},
 					"frame": {
-						"x": 221,
-						"y": 337,
+						"x": 354,
+						"y": 287,
 						"w": 20,
 						"h": 20
 					}
 				},
 				{
-					"filename": "white_herb",
+					"filename": "lum_berry",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -6786,98 +6681,14 @@
 						"h": 19
 					},
 					"frame": {
-						"x": 323,
-						"y": 287,
+						"x": 355,
+						"y": 307,
 						"w": 20,
 						"h": 19
 					}
 				},
 				{
-					"filename": "apicot_berry",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 6,
-						"w": 19,
-						"h": 20
-					},
-					"frame": {
-						"x": 343,
-						"y": 287,
-						"w": 19,
-						"h": 20
-					}
-				},
-				{
-					"filename": "candy_jar",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 6,
-						"w": 19,
-						"h": 20
-					},
-					"frame": {
-						"x": 362,
-						"y": 287,
-						"w": 19,
-						"h": 20
-					}
-				},
-				{
-					"filename": "big_mushroom",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 6,
-						"w": 19,
-						"h": 19
-					},
-					"frame": {
-						"x": 318,
-						"y": 306,
-						"w": 19,
-						"h": 19
-					}
-				},
-				{
-					"filename": "hard_stone",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 6,
-						"w": 19,
-						"h": 20
-					},
-					"frame": {
-						"x": 314,
-						"y": 325,
-						"w": 19,
-						"h": 20
-					}
-				},
-				{
-					"filename": "wl_ability_urge",
+					"filename": "old_gateau",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -6887,16 +6698,37 @@
 					"spriteSourceSize": {
 						"x": 6,
 						"y": 8,
-						"w": 20,
+						"w": 21,
 						"h": 18
 					},
 					"frame": {
-						"x": 337,
-						"y": 307,
-						"w": 20,
+						"x": 393,
+						"y": 149,
+						"w": 21,
 						"h": 18
 					}
 				},
+				{
+					"filename": "oval_stone",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 7,
+						"w": 18,
+						"h": 19
+					},
+					"frame": {
+						"x": 414,
+						"y": 149,
+						"w": 18,
+						"h": 19
+					}
+				},
 				{
 					"filename": "miracle_seed",
 					"rotated": false,
@@ -6912,12 +6744,159 @@
 						"h": 19
 					},
 					"frame": {
-						"x": 333,
-						"y": 325,
+						"x": 362,
+						"y": 187,
 						"w": 19,
 						"h": 19
 					}
 				},
+				{
+					"filename": "power_herb",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 7,
+						"w": 20,
+						"h": 19
+					},
+					"frame": {
+						"x": 369,
+						"y": 206,
+						"w": 20,
+						"h": 19
+					}
+				},
+				{
+					"filename": "razor_claw",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 7,
+						"w": 20,
+						"h": 19
+					},
+					"frame": {
+						"x": 371,
+						"y": 225,
+						"w": 20,
+						"h": 19
+					}
+				},
+				{
+					"filename": "white_herb",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 7,
+						"w": 20,
+						"h": 19
+					},
+					"frame": {
+						"x": 373,
+						"y": 244,
+						"w": 20,
+						"h": 19
+					}
+				},
+				{
+					"filename": "sharp_meteorite",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 8,
+						"w": 21,
+						"h": 18
+					},
+					"frame": {
+						"x": 373,
+						"y": 263,
+						"w": 21,
+						"h": 18
+					}
+				},
+				{
+					"filename": "unremarkable_teacup",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 7,
+						"w": 21,
+						"h": 18
+					},
+					"frame": {
+						"x": 374,
+						"y": 281,
+						"w": 21,
+						"h": 18
+					}
+				},
+				{
+					"filename": "wl_ability_urge",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 8,
+						"w": 20,
+						"h": 18
+					},
+					"frame": {
+						"x": 375,
+						"y": 299,
+						"w": 20,
+						"h": 18
+					}
+				},
+				{
+					"filename": "everstone",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 8,
+						"w": 20,
+						"h": 17
+					},
+					"frame": {
+						"x": 375,
+						"y": 317,
+						"w": 20,
+						"h": 17
+					}
+				},
 				{
 					"filename": "wl_antidote",
 					"rotated": false,
@@ -6933,8 +6912,8 @@
 						"h": 18
 					},
 					"frame": {
-						"x": 357,
-						"y": 307,
+						"x": 355,
+						"y": 326,
 						"w": 20,
 						"h": 18
 					}
@@ -6954,8 +6933,8 @@
 						"h": 18
 					},
 					"frame": {
-						"x": 352,
-						"y": 325,
+						"x": 335,
+						"y": 329,
 						"w": 20,
 						"h": 18
 					}
@@ -6975,75 +6954,12 @@
 						"h": 18
 					},
 					"frame": {
-						"x": 241,
-						"y": 340,
+						"x": 375,
+						"y": 334,
 						"w": 20,
 						"h": 18
 					}
 				},
-				{
-					"filename": "golden_egg",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 6,
-						"w": 17,
-						"h": 20
-					},
-					"frame": {
-						"x": 372,
-						"y": 325,
-						"w": 17,
-						"h": 20
-					}
-				},
-				{
-					"filename": "toxic_orb",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 7,
-						"w": 18,
-						"h": 18
-					},
-					"frame": {
-						"x": 377,
-						"y": 307,
-						"w": 18,
-						"h": 18
-					}
-				},
-				{
-					"filename": "lucky_egg",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 6,
-						"w": 17,
-						"h": 20
-					},
-					"frame": {
-						"x": 389,
-						"y": 325,
-						"w": 17,
-						"h": 20
-					}
-				},
 				{
 					"filename": "wl_custom_spliced",
 					"rotated": false,
@@ -7059,8 +6975,8 @@
 						"h": 18
 					},
 					"frame": {
-						"x": 352,
-						"y": 343,
+						"x": 355,
+						"y": 344,
 						"w": 20,
 						"h": 18
 					}
@@ -7080,8 +6996,8 @@
 						"h": 18
 					},
 					"frame": {
-						"x": 372,
-						"y": 345,
+						"x": 375,
+						"y": 352,
 						"w": 20,
 						"h": 18
 					}
@@ -7101,8 +7017,8 @@
 						"h": 18
 					},
 					"frame": {
-						"x": 392,
-						"y": 345,
+						"x": 313,
+						"y": 333,
 						"w": 20,
 						"h": 18
 					}
@@ -7122,33 +7038,12 @@
 						"h": 18
 					},
 					"frame": {
-						"x": 378,
-						"y": 241,
+						"x": 333,
+						"y": 347,
 						"w": 20,
 						"h": 18
 					}
 				},
-				{
-					"filename": "relic_gold",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 11,
-						"w": 15,
-						"h": 11
-					},
-					"frame": {
-						"x": 398,
-						"y": 241,
-						"w": 15,
-						"h": 11
-					}
-				},
 				{
 					"filename": "wl_full_heal",
 					"rotated": false,
@@ -7164,8 +7059,8 @@
 						"h": 18
 					},
 					"frame": {
-						"x": 377,
-						"y": 259,
+						"x": 371,
+						"y": 166,
 						"w": 20,
 						"h": 18
 					}
@@ -7185,8 +7080,8 @@
 						"h": 18
 					},
 					"frame": {
-						"x": 381,
-						"y": 277,
+						"x": 391,
+						"y": 167,
 						"w": 20,
 						"h": 18
 					}
@@ -7206,8 +7101,8 @@
 						"h": 18
 					},
 					"frame": {
-						"x": 397,
-						"y": 259,
+						"x": 411,
+						"y": 168,
 						"w": 20,
 						"h": 18
 					}
@@ -7227,12 +7122,96 @@
 						"h": 18
 					},
 					"frame": {
-						"x": 401,
-						"y": 277,
+						"x": 381,
+						"y": 185,
 						"w": 20,
 						"h": 18
 					}
 				},
+				{
+					"filename": "baton",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 7,
+						"w": 18,
+						"h": 18
+					},
+					"frame": {
+						"x": 389,
+						"y": 203,
+						"w": 18,
+						"h": 18
+					}
+				},
+				{
+					"filename": "candy",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 11,
+						"w": 18,
+						"h": 18
+					},
+					"frame": {
+						"x": 391,
+						"y": 221,
+						"w": 18,
+						"h": 18
+					}
+				},
+				{
+					"filename": "dark_stone",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 7,
+						"w": 18,
+						"h": 18
+					},
+					"frame": {
+						"x": 393,
+						"y": 239,
+						"w": 18,
+						"h": 18
+					}
+				},
+				{
+					"filename": "flame_orb",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 7,
+						"w": 18,
+						"h": 18
+					},
+					"frame": {
+						"x": 394,
+						"y": 257,
+						"w": 18,
+						"h": 18
+					}
+				},
 				{
 					"filename": "wl_ice_heal",
 					"rotated": false,
@@ -7248,54 +7227,12 @@
 						"h": 18
 					},
 					"frame": {
-						"x": 395,
-						"y": 295,
+						"x": 412,
+						"y": 186,
 						"w": 20,
 						"h": 18
 					}
 				},
-				{
-					"filename": "ampharosite",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 8,
-						"w": 16,
-						"h": 16
-					},
-					"frame": {
-						"x": 415,
-						"y": 295,
-						"w": 16,
-						"h": 16
-					}
-				},
-				{
-					"filename": "audinite",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 8,
-						"w": 16,
-						"h": 16
-					},
-					"frame": {
-						"x": 415,
-						"y": 311,
-						"w": 16,
-						"h": 16
-					}
-				},
 				{
 					"filename": "wl_item_drop",
 					"rotated": false,
@@ -7311,33 +7248,12 @@
 						"h": 18
 					},
 					"frame": {
-						"x": 406,
-						"y": 327,
+						"x": 412,
+						"y": 204,
 						"w": 20,
 						"h": 18
 					}
 				},
-				{
-					"filename": "banettite",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 8,
-						"w": 16,
-						"h": 16
-					},
-					"frame": {
-						"x": 412,
-						"y": 345,
-						"w": 16,
-						"h": 16
-					}
-				},
 				{
 					"filename": "wl_item_urge",
 					"rotated": false,
@@ -7353,8 +7269,8 @@
 						"h": 18
 					},
 					"frame": {
-						"x": 221,
-						"y": 357,
+						"x": 412,
+						"y": 222,
 						"w": 20,
 						"h": 18
 					}
@@ -7374,8 +7290,8 @@
 						"h": 18
 					},
 					"frame": {
-						"x": 241,
-						"y": 358,
+						"x": 412,
+						"y": 240,
 						"w": 20,
 						"h": 18
 					}
@@ -7395,12 +7311,96 @@
 						"h": 18
 					},
 					"frame": {
-						"x": 201,
-						"y": 360,
+						"x": 412,
+						"y": 258,
 						"w": 20,
 						"h": 18
 					}
 				},
+				{
+					"filename": "audinite",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 8,
+						"w": 16,
+						"h": 16
+					},
+					"frame": {
+						"x": 395,
+						"y": 275,
+						"w": 16,
+						"h": 16
+					}
+				},
+				{
+					"filename": "light_ball",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 7,
+						"w": 18,
+						"h": 18
+					},
+					"frame": {
+						"x": 395,
+						"y": 291,
+						"w": 18,
+						"h": 18
+					}
+				},
+				{
+					"filename": "light_stone",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 7,
+						"w": 18,
+						"h": 18
+					},
+					"frame": {
+						"x": 395,
+						"y": 309,
+						"w": 18,
+						"h": 18
+					}
+				},
+				{
+					"filename": "toxic_orb",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 7,
+						"w": 18,
+						"h": 18
+					},
+					"frame": {
+						"x": 395,
+						"y": 327,
+						"w": 18,
+						"h": 18
+					}
+				},
 				{
 					"filename": "wl_max_potion",
 					"rotated": false,
@@ -7416,8 +7416,8 @@
 						"h": 18
 					},
 					"frame": {
-						"x": 201,
-						"y": 378,
+						"x": 395,
+						"y": 345,
 						"w": 20,
 						"h": 18
 					}
@@ -7437,8 +7437,8 @@
 						"h": 18
 					},
 					"frame": {
-						"x": 221,
-						"y": 375,
+						"x": 395,
+						"y": 363,
 						"w": 20,
 						"h": 18
 					}
@@ -7458,8 +7458,8 @@
 						"h": 18
 					},
 					"frame": {
-						"x": 201,
-						"y": 396,
+						"x": 225,
+						"y": 340,
 						"w": 20,
 						"h": 18
 					}
@@ -7479,8 +7479,8 @@
 						"h": 18
 					},
 					"frame": {
-						"x": 221,
-						"y": 393,
+						"x": 245,
+						"y": 340,
 						"w": 20,
 						"h": 18
 					}
@@ -7500,8 +7500,8 @@
 						"h": 18
 					},
 					"frame": {
-						"x": 241,
-						"y": 376,
+						"x": 265,
+						"y": 340,
 						"w": 20,
 						"h": 18
 					}
@@ -7521,33 +7521,12 @@
 						"h": 18
 					},
 					"frame": {
-						"x": 241,
-						"y": 394,
+						"x": 227,
+						"y": 358,
 						"w": 20,
 						"h": 18
 					}
 				},
-				{
-					"filename": "beedrillite",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 8,
-						"w": 16,
-						"h": 16
-					},
-					"frame": {
-						"x": 201,
-						"y": 414,
-						"w": 16,
-						"h": 16
-					}
-				},
 				{
 					"filename": "wl_super_potion",
 					"rotated": false,
@@ -7563,12 +7542,54 @@
 						"h": 18
 					},
 					"frame": {
-						"x": 261,
-						"y": 345,
+						"x": 247,
+						"y": 358,
 						"w": 20,
 						"h": 18
 					}
 				},
+				{
+					"filename": "banettite",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 8,
+						"w": 16,
+						"h": 16
+					},
+					"frame": {
+						"x": 267,
+						"y": 358,
+						"w": 16,
+						"h": 16
+					}
+				},
+				{
+					"filename": "beedrillite",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 8,
+						"w": 16,
+						"h": 16
+					},
+					"frame": {
+						"x": 237,
+						"y": 376,
+						"w": 16,
+						"h": 16
+					}
+				},
 				{
 					"filename": "blastoisinite",
 					"rotated": false,
@@ -7584,8 +7605,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 261,
-						"y": 363,
+						"x": 237,
+						"y": 392,
 						"w": 16,
 						"h": 16
 					}
@@ -7605,8 +7626,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 281,
-						"y": 345,
+						"x": 237,
+						"y": 408,
 						"w": 16,
 						"h": 16
 					}
@@ -7626,8 +7647,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 261,
-						"y": 379,
+						"x": 253,
+						"y": 376,
 						"w": 16,
 						"h": 16
 					}
@@ -7647,8 +7668,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 297,
-						"y": 345,
+						"x": 253,
+						"y": 392,
 						"w": 16,
 						"h": 16
 					}
@@ -7668,8 +7689,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 261,
-						"y": 395,
+						"x": 253,
+						"y": 408,
 						"w": 16,
 						"h": 16
 					}
@@ -7689,8 +7710,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 313,
-						"y": 345,
+						"x": 269,
+						"y": 374,
 						"w": 16,
 						"h": 16
 					}
@@ -7710,8 +7731,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 217,
-						"y": 414,
+						"x": 269,
+						"y": 390,
 						"w": 16,
 						"h": 16
 					}
@@ -7731,8 +7752,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 233,
-						"y": 412,
+						"x": 269,
+						"y": 406,
 						"w": 16,
 						"h": 16
 					}
@@ -7752,8 +7773,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 249,
-						"y": 412,
+						"x": 285,
+						"y": 340,
 						"w": 16,
 						"h": 16
 					}
@@ -7773,8 +7794,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 265,
-						"y": 411,
+						"x": 283,
+						"y": 358,
 						"w": 16,
 						"h": 16
 					}
@@ -7794,8 +7815,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 329,
-						"y": 345,
+						"x": 285,
+						"y": 374,
 						"w": 16,
 						"h": 16
 					}
@@ -7815,8 +7836,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 277,
-						"y": 363,
+						"x": 285,
+						"y": 390,
 						"w": 16,
 						"h": 16
 					}
@@ -7836,8 +7857,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 277,
-						"y": 379,
+						"x": 285,
+						"y": 406,
 						"w": 16,
 						"h": 16
 					}
@@ -7857,8 +7878,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 277,
-						"y": 395,
+						"x": 353,
+						"y": 362,
 						"w": 16,
 						"h": 16
 					}
@@ -7878,8 +7899,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 293,
-						"y": 361,
+						"x": 369,
+						"y": 370,
 						"w": 16,
 						"h": 16
 					}
@@ -7899,8 +7920,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 309,
-						"y": 361,
+						"x": 413,
+						"y": 276,
 						"w": 16,
 						"h": 16
 					}
@@ -7920,8 +7941,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 293,
-						"y": 377,
+						"x": 413,
+						"y": 292,
 						"w": 16,
 						"h": 16
 					}
@@ -7941,8 +7962,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 325,
-						"y": 361,
+						"x": 413,
+						"y": 308,
 						"w": 16,
 						"h": 16
 					}
@@ -7962,8 +7983,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 293,
-						"y": 393,
+						"x": 413,
+						"y": 324,
 						"w": 16,
 						"h": 16
 					}
@@ -7983,8 +8004,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 309,
-						"y": 377,
+						"x": 415,
+						"y": 340,
 						"w": 16,
 						"h": 16
 					}
@@ -8004,8 +8025,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 309,
-						"y": 393,
+						"x": 415,
+						"y": 356,
 						"w": 16,
 						"h": 16
 					}
@@ -8025,8 +8046,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 325,
-						"y": 377,
+						"x": 415,
+						"y": 372,
 						"w": 16,
 						"h": 16
 					}
@@ -8046,8 +8067,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 325,
-						"y": 393,
+						"x": 299,
+						"y": 356,
 						"w": 16,
 						"h": 16
 					}
@@ -8067,8 +8088,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 281,
-						"y": 411,
+						"x": 301,
+						"y": 372,
 						"w": 16,
 						"h": 16
 					}
@@ -8088,8 +8109,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 297,
-						"y": 409,
+						"x": 301,
+						"y": 388,
 						"w": 16,
 						"h": 16
 					}
@@ -8109,8 +8130,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 313,
-						"y": 409,
+						"x": 301,
+						"y": 404,
 						"w": 16,
 						"h": 16
 					}
@@ -8130,8 +8151,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 329,
-						"y": 409,
+						"x": 317,
+						"y": 351,
 						"w": 16,
 						"h": 16
 					}
@@ -8151,8 +8172,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 341,
-						"y": 361,
+						"x": 317,
+						"y": 367,
 						"w": 16,
 						"h": 16
 					}
@@ -8172,8 +8193,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 341,
-						"y": 377,
+						"x": 333,
+						"y": 365,
 						"w": 16,
 						"h": 16
 					}
@@ -8193,8 +8214,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 341,
-						"y": 393,
+						"x": 317,
+						"y": 383,
 						"w": 16,
 						"h": 16
 					}
@@ -8214,8 +8235,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 345,
-						"y": 409,
+						"x": 333,
+						"y": 381,
 						"w": 16,
 						"h": 16
 					}
@@ -8235,8 +8256,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 412,
-						"y": 361,
+						"x": 317,
+						"y": 399,
 						"w": 16,
 						"h": 16
 					}
@@ -8256,8 +8277,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 357,
-						"y": 363,
+						"x": 333,
+						"y": 397,
 						"w": 16,
 						"h": 16
 					}
@@ -8277,8 +8298,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 357,
-						"y": 379,
+						"x": 349,
+						"y": 378,
 						"w": 16,
 						"h": 16
 					}
@@ -8298,8 +8319,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 373,
-						"y": 363,
+						"x": 349,
+						"y": 394,
 						"w": 16,
 						"h": 16
 					}
@@ -8319,8 +8340,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 373,
-						"y": 379,
+						"x": 365,
+						"y": 386,
 						"w": 16,
 						"h": 16
 					}
@@ -8340,8 +8361,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 389,
-						"y": 363,
+						"x": 365,
+						"y": 402,
 						"w": 16,
 						"h": 16
 					}
@@ -8361,8 +8382,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 389,
-						"y": 379,
+						"x": 349,
+						"y": 410,
 						"w": 16,
 						"h": 16
 					}
@@ -8382,8 +8403,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 405,
-						"y": 377,
+						"x": 333,
+						"y": 413,
 						"w": 16,
 						"h": 16
 					}
@@ -8403,8 +8424,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 361,
-						"y": 395,
+						"x": 317,
+						"y": 415,
 						"w": 16,
 						"h": 16
 					}
@@ -8424,8 +8445,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 377,
-						"y": 395,
+						"x": 381,
+						"y": 386,
 						"w": 16,
 						"h": 16
 					}
@@ -8436,6 +8457,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:d91a46c431ace3f09f5ca68916a2171e:1e84369d9a13e1416fa58028d629d116:110e074689c9edd2c54833ce2e4d9270$"
+		"smartupdate": "$TexturePacker:SmartUpdate:c228145ca625236e53edc95aac265d56:86524cdf0e3043482141d77259bc4d47:110e074689c9edd2c54833ce2e4d9270$"
 	}
 }
diff --git a/public/images/items.png b/public/images/items.png
index 191766f520e..eb9878a5bfc 100644
Binary files a/public/images/items.png and b/public/images/items.png differ
diff --git a/public/images/items/ability_capsule.png b/public/images/items/ability_capsule.png
index 06b6b3e173d..ee8aec6b346 100644
Binary files a/public/images/items/ability_capsule.png and b/public/images/items/ability_capsule.png differ
diff --git a/public/images/items/ability_charm.png b/public/images/items/ability_charm.png
index 943783ba348..2e9e0368667 100644
Binary files a/public/images/items/ability_charm.png and b/public/images/items/ability_charm.png differ
diff --git a/public/images/items/abomasite.png b/public/images/items/abomasite.png
index 09177d97a44..0758786bb0f 100644
Binary files a/public/images/items/abomasite.png and b/public/images/items/abomasite.png differ
diff --git a/public/images/items/absolite.png b/public/images/items/absolite.png
index 617969f6037..f7fe8b7ac12 100644
Binary files a/public/images/items/absolite.png and b/public/images/items/absolite.png differ
diff --git a/public/images/items/adamant_crystal.png b/public/images/items/adamant_crystal.png
index d729c40ce25..eb35af1540e 100644
Binary files a/public/images/items/adamant_crystal.png and b/public/images/items/adamant_crystal.png differ
diff --git a/public/images/items/aerodactylite.png b/public/images/items/aerodactylite.png
index 1cf5e028d6f..4feb04f3702 100644
Binary files a/public/images/items/aerodactylite.png and b/public/images/items/aerodactylite.png differ
diff --git a/public/images/items/aggronite.png b/public/images/items/aggronite.png
index 18eb9d86270..8feb64633ec 100644
Binary files a/public/images/items/aggronite.png and b/public/images/items/aggronite.png differ
diff --git a/public/images/items/alakazite.png b/public/images/items/alakazite.png
index 02d8ff580f4..ed6acab02ca 100644
Binary files a/public/images/items/alakazite.png and b/public/images/items/alakazite.png differ
diff --git a/public/images/items/altarianite.png b/public/images/items/altarianite.png
index 8d2436bc24a..0bb6be23819 100644
Binary files a/public/images/items/altarianite.png and b/public/images/items/altarianite.png differ
diff --git a/public/images/items/ampharosite.png b/public/images/items/ampharosite.png
index 5ff26217d23..3084c05c1a9 100644
Binary files a/public/images/items/ampharosite.png and b/public/images/items/ampharosite.png differ
diff --git a/public/images/items/amulet_coin.png b/public/images/items/amulet_coin.png
index 88ce369def5..3cda2b2a53b 100644
Binary files a/public/images/items/amulet_coin.png and b/public/images/items/amulet_coin.png differ
diff --git a/public/images/items/apicot_berry.png b/public/images/items/apicot_berry.png
index 2cfa66acdfa..4719671eaf3 100644
Binary files a/public/images/items/apicot_berry.png and b/public/images/items/apicot_berry.png differ
diff --git a/public/images/items/audinite.png b/public/images/items/audinite.png
index 51fdc9310b0..f7c21bf8e3b 100644
Binary files a/public/images/items/audinite.png and b/public/images/items/audinite.png differ
diff --git a/public/images/items/auspicious_armor.png b/public/images/items/auspicious_armor.png
index e3620bb6054..27c40ae0bd0 100644
Binary files a/public/images/items/auspicious_armor.png and b/public/images/items/auspicious_armor.png differ
diff --git a/public/images/items/banettite.png b/public/images/items/banettite.png
index 20704d624c2..b6bcadd72fc 100644
Binary files a/public/images/items/banettite.png and b/public/images/items/banettite.png differ
diff --git a/public/images/items/baton.png b/public/images/items/baton.png
index 8e9ebfae06d..ece81f82b2f 100644
Binary files a/public/images/items/baton.png and b/public/images/items/baton.png differ
diff --git a/public/images/items/beedrillite.png b/public/images/items/beedrillite.png
index 3dd1444bf76..99e516446d7 100644
Binary files a/public/images/items/beedrillite.png and b/public/images/items/beedrillite.png differ
diff --git a/public/images/items/berry_juice.png b/public/images/items/berry_juice.png
index 127fa458906..2f6272eca7c 100644
Binary files a/public/images/items/berry_juice.png and b/public/images/items/berry_juice.png differ
diff --git a/public/images/items/berry_pot.png b/public/images/items/berry_pot.png
index 5841ef1c324..3cb9b90dc53 100644
Binary files a/public/images/items/berry_pot.png and b/public/images/items/berry_pot.png differ
diff --git a/public/images/items/berry_pouch.png b/public/images/items/berry_pouch.png
index 878ef600239..d14d71358a9 100644
Binary files a/public/images/items/berry_pouch.png and b/public/images/items/berry_pouch.png differ
diff --git a/public/images/items/big_mushroom.png b/public/images/items/big_mushroom.png
index 4384c7933b3..eb203a7374c 100644
Binary files a/public/images/items/big_mushroom.png and b/public/images/items/big_mushroom.png differ
diff --git a/public/images/items/big_nugget.png b/public/images/items/big_nugget.png
index 54a5456ad60..e8839daa0b6 100644
Binary files a/public/images/items/big_nugget.png and b/public/images/items/big_nugget.png differ
diff --git a/public/images/items/big_root.png b/public/images/items/big_root.png
index 37eeb5c2f93..24b863ee238 100644
Binary files a/public/images/items/big_root.png and b/public/images/items/big_root.png differ
diff --git a/public/images/items/binding_band.png b/public/images/items/binding_band.png
index f634b02053d..b33256b7b8c 100644
Binary files a/public/images/items/binding_band.png and b/public/images/items/binding_band.png differ
diff --git a/public/images/items/black_augurite.png b/public/images/items/black_augurite.png
index e8531a1a8cf..b34127e2942 100644
Binary files a/public/images/items/black_augurite.png and b/public/images/items/black_augurite.png differ
diff --git a/public/images/items/black_belt.png b/public/images/items/black_belt.png
index 70d13097882..9dde3ff83cd 100644
Binary files a/public/images/items/black_belt.png and b/public/images/items/black_belt.png differ
diff --git a/public/images/items/black_glasses.png b/public/images/items/black_glasses.png
index 52fe0e60a1e..4b18d828964 100644
Binary files a/public/images/items/black_glasses.png and b/public/images/items/black_glasses.png differ
diff --git a/public/images/items/black_sludge.png b/public/images/items/black_sludge.png
index 37aa31de43e..fe308586dd3 100644
Binary files a/public/images/items/black_sludge.png and b/public/images/items/black_sludge.png differ
diff --git a/public/images/items/blank_plate.png b/public/images/items/blank_plate.png
index ec82203340c..c08d25aa3c3 100644
Binary files a/public/images/items/blank_plate.png and b/public/images/items/blank_plate.png differ
diff --git a/public/images/items/blastoisinite.png b/public/images/items/blastoisinite.png
index 6b8310610e8..ea2ddef0640 100644
Binary files a/public/images/items/blastoisinite.png and b/public/images/items/blastoisinite.png differ
diff --git a/public/images/items/blazikenite.png b/public/images/items/blazikenite.png
index f14b108de60..9b6e9e59212 100644
Binary files a/public/images/items/blazikenite.png and b/public/images/items/blazikenite.png differ
diff --git a/public/images/items/blue_orb.png b/public/images/items/blue_orb.png
index 91094d82147..34c19c8aea8 100644
Binary files a/public/images/items/blue_orb.png and b/public/images/items/blue_orb.png differ
diff --git a/public/images/items/blunder_policy.png b/public/images/items/blunder_policy.png
index c1e2e380648..8d5b11cb3f6 100644
Binary files a/public/images/items/blunder_policy.png and b/public/images/items/blunder_policy.png differ
diff --git a/public/images/items/bronze_ribbon.png b/public/images/items/bronze_ribbon.png
index eb9b926c50c..cab218e09f5 100644
Binary files a/public/images/items/bronze_ribbon.png and b/public/images/items/bronze_ribbon.png differ
diff --git a/public/images/items/bug_memory.png b/public/images/items/bug_memory.png
index e166636c780..004b499ba7a 100644
Binary files a/public/images/items/bug_memory.png and b/public/images/items/bug_memory.png differ
diff --git a/public/images/items/bug_tera_shard.png b/public/images/items/bug_tera_shard.png
index c08a3f29ffd..5711fe193bd 100644
Binary files a/public/images/items/bug_tera_shard.png and b/public/images/items/bug_tera_shard.png differ
diff --git a/public/images/items/burn_drive.png b/public/images/items/burn_drive.png
index 47ad9cc8f38..02ee18c02bd 100644
Binary files a/public/images/items/burn_drive.png and b/public/images/items/burn_drive.png differ
diff --git a/public/images/items/calcium.png b/public/images/items/calcium.png
index e98416f6280..4c42228d724 100644
Binary files a/public/images/items/calcium.png and b/public/images/items/calcium.png differ
diff --git a/public/images/items/cameruptite.png b/public/images/items/cameruptite.png
index 5410fc85a39..9eda37e14e1 100644
Binary files a/public/images/items/cameruptite.png and b/public/images/items/cameruptite.png differ
diff --git a/public/images/items/candy.png b/public/images/items/candy.png
index 9a68bdab606..81cf5e19ee2 100644
Binary files a/public/images/items/candy.png and b/public/images/items/candy.png differ
diff --git a/public/images/items/candy_jar.png b/public/images/items/candy_jar.png
index 2718b9fa083..0338b64a86d 100644
Binary files a/public/images/items/candy_jar.png and b/public/images/items/candy_jar.png differ
diff --git a/public/images/items/candy_overlay.png b/public/images/items/candy_overlay.png
index 67df546a633..a1cb428cdee 100644
Binary files a/public/images/items/candy_overlay.png and b/public/images/items/candy_overlay.png differ
diff --git a/public/images/items/carbos.png b/public/images/items/carbos.png
index beb31dcea9e..7dd09f2ec12 100644
Binary files a/public/images/items/carbos.png and b/public/images/items/carbos.png differ
diff --git a/public/images/items/catching_charm.png b/public/images/items/catching_charm.png
index c220ff70c03..57545622131 100644
Binary files a/public/images/items/catching_charm.png and b/public/images/items/catching_charm.png differ
diff --git a/public/images/items/charcoal.png b/public/images/items/charcoal.png
index 4d2511773ef..e10f8f20fd6 100644
Binary files a/public/images/items/charcoal.png and b/public/images/items/charcoal.png differ
diff --git a/public/images/items/charizardite_x.png b/public/images/items/charizardite_x.png
index 81590bb86da..d238a77a9e2 100644
Binary files a/public/images/items/charizardite_x.png and b/public/images/items/charizardite_x.png differ
diff --git a/public/images/items/charizardite_y.png b/public/images/items/charizardite_y.png
index 784eed51ace..5a3ea59d091 100644
Binary files a/public/images/items/charizardite_y.png and b/public/images/items/charizardite_y.png differ
diff --git a/public/images/items/chill_drive.png b/public/images/items/chill_drive.png
index d5ef99b1686..fbf7462479a 100644
Binary files a/public/images/items/chill_drive.png and b/public/images/items/chill_drive.png differ
diff --git a/public/images/items/chipped_pot.png b/public/images/items/chipped_pot.png
index a2f35f9aed9..969c3dc3c16 100644
Binary files a/public/images/items/chipped_pot.png and b/public/images/items/chipped_pot.png differ
diff --git a/public/images/items/choice_scarf.png b/public/images/items/choice_scarf.png
index a83fd1f4b30..2ddf7d3be16 100644
Binary files a/public/images/items/choice_scarf.png and b/public/images/items/choice_scarf.png differ
diff --git a/public/images/items/choice_specs.png b/public/images/items/choice_specs.png
index 513986c524e..09b58f64381 100644
Binary files a/public/images/items/choice_specs.png and b/public/images/items/choice_specs.png differ
diff --git a/public/images/items/clefairy_doll.png b/public/images/items/clefairy_doll.png
index 8e1691dddfa..3b54c83df47 100644
Binary files a/public/images/items/clefairy_doll.png and b/public/images/items/clefairy_doll.png differ
diff --git a/public/images/items/coin_case.png b/public/images/items/coin_case.png
index 14f9878e5c4..3c17c2b13f8 100644
Binary files a/public/images/items/coin_case.png and b/public/images/items/coin_case.png differ
diff --git a/public/images/items/cornerstone_mask.png b/public/images/items/cornerstone_mask.png
index 441af6607a5..205bdef9805 100644
Binary files a/public/images/items/cornerstone_mask.png and b/public/images/items/cornerstone_mask.png differ
diff --git a/public/images/items/coupon.png b/public/images/items/coupon.png
index b1e8089b485..b08fa65fecc 100644
Binary files a/public/images/items/coupon.png and b/public/images/items/coupon.png differ
diff --git a/public/images/items/cracked_pot.png b/public/images/items/cracked_pot.png
index 61cad0d85b7..4afc2caf2c8 100644
Binary files a/public/images/items/cracked_pot.png and b/public/images/items/cracked_pot.png differ
diff --git a/public/images/items/dark_memory.png b/public/images/items/dark_memory.png
index 4349ba8f8cd..e1e503bd036 100644
Binary files a/public/images/items/dark_memory.png and b/public/images/items/dark_memory.png differ
diff --git a/public/images/items/dark_stone.png b/public/images/items/dark_stone.png
index eb8eaa13ba8..c28a93ecabc 100644
Binary files a/public/images/items/dark_stone.png and b/public/images/items/dark_stone.png differ
diff --git a/public/images/items/dark_tera_shard.png b/public/images/items/dark_tera_shard.png
index 4060f9142f6..ca24664b74e 100644
Binary files a/public/images/items/dark_tera_shard.png and b/public/images/items/dark_tera_shard.png differ
diff --git a/public/images/items/dawn_stone.png b/public/images/items/dawn_stone.png
index 0e3da086649..b29d2016a56 100644
Binary files a/public/images/items/dawn_stone.png and b/public/images/items/dawn_stone.png differ
diff --git a/public/images/items/deep_sea_scale.png b/public/images/items/deep_sea_scale.png
index 6a84b01c99e..cf40e652319 100644
Binary files a/public/images/items/deep_sea_scale.png and b/public/images/items/deep_sea_scale.png differ
diff --git a/public/images/items/deep_sea_tooth.png b/public/images/items/deep_sea_tooth.png
index 448c8406867..2cd1980aeb4 100644
Binary files a/public/images/items/deep_sea_tooth.png and b/public/images/items/deep_sea_tooth.png differ
diff --git a/public/images/items/diancite.png b/public/images/items/diancite.png
index 6fff5008673..293d327524e 100644
Binary files a/public/images/items/diancite.png and b/public/images/items/diancite.png differ
diff --git a/public/images/items/dire_hit.png b/public/images/items/dire_hit.png
index 5917fd02d99..0c060710ff2 100644
Binary files a/public/images/items/dire_hit.png and b/public/images/items/dire_hit.png differ
diff --git a/public/images/items/dna_splicers.png b/public/images/items/dna_splicers.png
index 5a3c7fed75b..51c1524076e 100644
Binary files a/public/images/items/dna_splicers.png and b/public/images/items/dna_splicers.png differ
diff --git a/public/images/items/douse_drive.png b/public/images/items/douse_drive.png
index 0f9f780e5cb..fb8e7623184 100644
Binary files a/public/images/items/douse_drive.png and b/public/images/items/douse_drive.png differ
diff --git a/public/images/items/draco_plate.png b/public/images/items/draco_plate.png
index b25df530171..b4702aadba3 100644
Binary files a/public/images/items/draco_plate.png and b/public/images/items/draco_plate.png differ
diff --git a/public/images/items/dragon_fang.png b/public/images/items/dragon_fang.png
index 33659e50307..4a9904e0ef3 100644
Binary files a/public/images/items/dragon_fang.png and b/public/images/items/dragon_fang.png differ
diff --git a/public/images/items/dragon_memory.png b/public/images/items/dragon_memory.png
index 15a3cd170cd..01a14cadf3e 100644
Binary files a/public/images/items/dragon_memory.png and b/public/images/items/dragon_memory.png differ
diff --git a/public/images/items/dragon_scale.png b/public/images/items/dragon_scale.png
index bb8bb028db7..9cec39b22f6 100644
Binary files a/public/images/items/dragon_scale.png and b/public/images/items/dragon_scale.png differ
diff --git a/public/images/items/dragon_tera_shard.png b/public/images/items/dragon_tera_shard.png
index 8c16e2f8eb6..51f20d9f5cb 100644
Binary files a/public/images/items/dragon_tera_shard.png and b/public/images/items/dragon_tera_shard.png differ
diff --git a/public/images/items/dread_plate.png b/public/images/items/dread_plate.png
index 4cdbb76f180..6537320bc0a 100644
Binary files a/public/images/items/dread_plate.png and b/public/images/items/dread_plate.png differ
diff --git a/public/images/items/dubious_disc.png b/public/images/items/dubious_disc.png
index 8bb23497462..122958f9550 100644
Binary files a/public/images/items/dubious_disc.png and b/public/images/items/dubious_disc.png differ
diff --git a/public/images/items/dusk_stone.png b/public/images/items/dusk_stone.png
index 12ad19505d0..e2cf73d04f3 100644
Binary files a/public/images/items/dusk_stone.png and b/public/images/items/dusk_stone.png differ
diff --git a/public/images/items/dynamax_band.png b/public/images/items/dynamax_band.png
index 633da7bdc90..57b9a0caef5 100644
Binary files a/public/images/items/dynamax_band.png and b/public/images/items/dynamax_band.png differ
diff --git a/public/images/items/earth_plate.png b/public/images/items/earth_plate.png
index d40da06f6b6..79fbbad5a84 100644
Binary files a/public/images/items/earth_plate.png and b/public/images/items/earth_plate.png differ
diff --git a/public/images/items/electirizer.png b/public/images/items/electirizer.png
index 7d4488d0ff3..a5589a27e42 100644
Binary files a/public/images/items/electirizer.png and b/public/images/items/electirizer.png differ
diff --git a/public/images/items/electric_memory.png b/public/images/items/electric_memory.png
index 494b0d0d653..d0595356482 100644
Binary files a/public/images/items/electric_memory.png and b/public/images/items/electric_memory.png differ
diff --git a/public/images/items/electric_tera_shard.png b/public/images/items/electric_tera_shard.png
index e4e1003edbc..2195be32929 100644
Binary files a/public/images/items/electric_tera_shard.png and b/public/images/items/electric_tera_shard.png differ
diff --git a/public/images/items/elixir.png b/public/images/items/elixir.png
index 694b07f34b6..b4bf7834e17 100644
Binary files a/public/images/items/elixir.png and b/public/images/items/elixir.png differ
diff --git a/public/images/items/enigma_berry.png b/public/images/items/enigma_berry.png
index 26c7f11ee9c..1a1a20854ed 100644
Binary files a/public/images/items/enigma_berry.png and b/public/images/items/enigma_berry.png differ
diff --git a/public/images/items/ether.png b/public/images/items/ether.png
index 970c9a27778..44a6e79de8e 100644
Binary files a/public/images/items/ether.png and b/public/images/items/ether.png differ
diff --git a/public/images/items/everstone.png b/public/images/items/everstone.png
index 07b32e8850e..194f7b63baf 100644
Binary files a/public/images/items/everstone.png and b/public/images/items/everstone.png differ
diff --git a/public/images/items/eviolite.png b/public/images/items/eviolite.png
index 8eb195ece2a..8591791a5a1 100644
Binary files a/public/images/items/eviolite.png and b/public/images/items/eviolite.png differ
diff --git a/public/images/items/exp_balance.png b/public/images/items/exp_balance.png
index 56c645b70fc..6a03556a3a2 100644
Binary files a/public/images/items/exp_balance.png and b/public/images/items/exp_balance.png differ
diff --git a/public/images/items/exp_charm.png b/public/images/items/exp_charm.png
index b42da73301e..2635e4d8020 100644
Binary files a/public/images/items/exp_charm.png and b/public/images/items/exp_charm.png differ
diff --git a/public/images/items/exp_share.png b/public/images/items/exp_share.png
index d7f4e4d04fb..6b866c63427 100644
Binary files a/public/images/items/exp_share.png and b/public/images/items/exp_share.png differ
diff --git a/public/images/items/expert_belt.png b/public/images/items/expert_belt.png
index 225756626da..86cfd7170de 100644
Binary files a/public/images/items/expert_belt.png and b/public/images/items/expert_belt.png differ
diff --git a/public/images/items/fairy_feather.png b/public/images/items/fairy_feather.png
index 64cabec7500..44923a1db94 100644
Binary files a/public/images/items/fairy_feather.png and b/public/images/items/fairy_feather.png differ
diff --git a/public/images/items/fairy_memory.png b/public/images/items/fairy_memory.png
index 598f3c804ce..b5d0b32ff95 100644
Binary files a/public/images/items/fairy_memory.png and b/public/images/items/fairy_memory.png differ
diff --git a/public/images/items/fairy_tera_shard.png b/public/images/items/fairy_tera_shard.png
index 83e19aeaeba..36fb5e88f1c 100644
Binary files a/public/images/items/fairy_tera_shard.png and b/public/images/items/fairy_tera_shard.png differ
diff --git a/public/images/items/fighting_memory.png b/public/images/items/fighting_memory.png
index 3c152f43900..13789836880 100644
Binary files a/public/images/items/fighting_memory.png and b/public/images/items/fighting_memory.png differ
diff --git a/public/images/items/fighting_tera_shard.png b/public/images/items/fighting_tera_shard.png
index 4241a901902..8423a41cbe8 100644
Binary files a/public/images/items/fighting_tera_shard.png and b/public/images/items/fighting_tera_shard.png differ
diff --git a/public/images/items/fire_memory.png b/public/images/items/fire_memory.png
index 8778baa5f56..4f341417b6e 100644
Binary files a/public/images/items/fire_memory.png and b/public/images/items/fire_memory.png differ
diff --git a/public/images/items/fire_stone.png b/public/images/items/fire_stone.png
index 7fc77cd5975..3db1942dfed 100644
Binary files a/public/images/items/fire_stone.png and b/public/images/items/fire_stone.png differ
diff --git a/public/images/items/fire_tera_shard.png b/public/images/items/fire_tera_shard.png
index 74a04df1680..5783a5e9720 100644
Binary files a/public/images/items/fire_tera_shard.png and b/public/images/items/fire_tera_shard.png differ
diff --git a/public/images/items/fist_plate.png b/public/images/items/fist_plate.png
index 6892d821da6..d992e4ab1c2 100644
Binary files a/public/images/items/fist_plate.png and b/public/images/items/fist_plate.png differ
diff --git a/public/images/items/flame_orb.png b/public/images/items/flame_orb.png
index 32f11719a5d..5132bbb6153 100644
Binary files a/public/images/items/flame_orb.png and b/public/images/items/flame_orb.png differ
diff --git a/public/images/items/flame_plate.png b/public/images/items/flame_plate.png
index 26a56f18462..7633773eee1 100644
Binary files a/public/images/items/flame_plate.png and b/public/images/items/flame_plate.png differ
diff --git a/public/images/items/flying_memory.png b/public/images/items/flying_memory.png
index d4b31e2c240..8d3efbf1401 100644
Binary files a/public/images/items/flying_memory.png and b/public/images/items/flying_memory.png differ
diff --git a/public/images/items/flying_tera_shard.png b/public/images/items/flying_tera_shard.png
index bee18637918..97d3013f70b 100644
Binary files a/public/images/items/flying_tera_shard.png and b/public/images/items/flying_tera_shard.png differ
diff --git a/public/images/items/focus_band.png b/public/images/items/focus_band.png
index 830e1294213..3a04ae17023 100644
Binary files a/public/images/items/focus_band.png and b/public/images/items/focus_band.png differ
diff --git a/public/images/items/focus_sash.png b/public/images/items/focus_sash.png
index 6dcd0f2f146..7700ceecf6b 100644
Binary files a/public/images/items/focus_sash.png and b/public/images/items/focus_sash.png differ
diff --git a/public/images/items/full_heal.png b/public/images/items/full_heal.png
index 61663fd5e2d..4e59dcf44fa 100644
Binary files a/public/images/items/full_heal.png and b/public/images/items/full_heal.png differ
diff --git a/public/images/items/full_restore.png b/public/images/items/full_restore.png
index bd3ebfd3022..ba64f2edad8 100644
Binary files a/public/images/items/full_restore.png and b/public/images/items/full_restore.png differ
diff --git a/public/images/items/galarica_cuff.png b/public/images/items/galarica_cuff.png
index 1b3f9c69296..56523da5230 100644
Binary files a/public/images/items/galarica_cuff.png and b/public/images/items/galarica_cuff.png differ
diff --git a/public/images/items/galarica_wreath.png b/public/images/items/galarica_wreath.png
index 7fe319f20cf..20356bafd8a 100644
Binary files a/public/images/items/galarica_wreath.png and b/public/images/items/galarica_wreath.png differ
diff --git a/public/images/items/galladite.png b/public/images/items/galladite.png
index b204209a91c..15c93cd9c7e 100644
Binary files a/public/images/items/galladite.png and b/public/images/items/galladite.png differ
diff --git a/public/images/items/ganlon_berry.png b/public/images/items/ganlon_berry.png
index 81aecd83011..f9b88fc563a 100644
Binary files a/public/images/items/ganlon_berry.png and b/public/images/items/ganlon_berry.png differ
diff --git a/public/images/items/garchompite.png b/public/images/items/garchompite.png
index 045fc815b27..4276146a858 100644
Binary files a/public/images/items/garchompite.png and b/public/images/items/garchompite.png differ
diff --git a/public/images/items/gardevoirite.png b/public/images/items/gardevoirite.png
index d29ee3eab03..66a90b93bce 100644
Binary files a/public/images/items/gardevoirite.png and b/public/images/items/gardevoirite.png differ
diff --git a/public/images/items/gb.png b/public/images/items/gb.png
index 5a69585f5cd..4b437277849 100644
Binary files a/public/images/items/gb.png and b/public/images/items/gb.png differ
diff --git a/public/images/items/gengarite.png b/public/images/items/gengarite.png
index dcbaf4bf13a..4ccaae6ee8d 100644
Binary files a/public/images/items/gengarite.png and b/public/images/items/gengarite.png differ
diff --git a/public/images/items/ghost_memory.png b/public/images/items/ghost_memory.png
index d3f174de758..cb3c31ea4de 100644
Binary files a/public/images/items/ghost_memory.png and b/public/images/items/ghost_memory.png differ
diff --git a/public/images/items/ghost_tera_shard.png b/public/images/items/ghost_tera_shard.png
index fd3557e5534..8b9c6e750a9 100644
Binary files a/public/images/items/ghost_tera_shard.png and b/public/images/items/ghost_tera_shard.png differ
diff --git a/public/images/items/glalitite.png b/public/images/items/glalitite.png
index 83e05f132fa..ed7858c631c 100644
Binary files a/public/images/items/glalitite.png and b/public/images/items/glalitite.png differ
diff --git a/public/images/items/golden_egg.png b/public/images/items/golden_egg.png
index bfc517c6632..5727b4cb513 100644
Binary files a/public/images/items/golden_egg.png and b/public/images/items/golden_egg.png differ
diff --git a/public/images/items/golden_exp_charm.png b/public/images/items/golden_exp_charm.png
index 199832159d6..1895bfaa6b9 100644
Binary files a/public/images/items/golden_exp_charm.png and b/public/images/items/golden_exp_charm.png differ
diff --git a/public/images/items/golden_mystic_ticket.png b/public/images/items/golden_mystic_ticket.png
index ff44d3307b6..57f5b9efca6 100644
Binary files a/public/images/items/golden_mystic_ticket.png and b/public/images/items/golden_mystic_ticket.png differ
diff --git a/public/images/items/golden_net.png b/public/images/items/golden_net.png
index 5fea1ee7dba..3205d545e27 100644
Binary files a/public/images/items/golden_net.png and b/public/images/items/golden_net.png differ
diff --git a/public/images/items/golden_punch.png b/public/images/items/golden_punch.png
index 25c2233e714..291ff7e248f 100644
Binary files a/public/images/items/golden_punch.png and b/public/images/items/golden_punch.png differ
diff --git a/public/images/items/gracidea.png b/public/images/items/gracidea.png
index 0552d11b01b..6e464390f17 100644
Binary files a/public/images/items/gracidea.png and b/public/images/items/gracidea.png differ
diff --git a/public/images/items/grass_memory.png b/public/images/items/grass_memory.png
index 28ffc343c66..9d7d27de770 100644
Binary files a/public/images/items/grass_memory.png and b/public/images/items/grass_memory.png differ
diff --git a/public/images/items/grass_tera_shard.png b/public/images/items/grass_tera_shard.png
index 01bf4bde640..30e8762b5b6 100644
Binary files a/public/images/items/grass_tera_shard.png and b/public/images/items/grass_tera_shard.png differ
diff --git a/public/images/items/great_ribbon.png b/public/images/items/great_ribbon.png
index 720c0d85366..e7d7e452122 100644
Binary files a/public/images/items/great_ribbon.png and b/public/images/items/great_ribbon.png differ
diff --git a/public/images/items/grip_claw.png b/public/images/items/grip_claw.png
index e37e2a2eaf3..61cbb89e9b2 100644
Binary files a/public/images/items/grip_claw.png and b/public/images/items/grip_claw.png differ
diff --git a/public/images/items/griseous_core.png b/public/images/items/griseous_core.png
index fa131cccfda..7f3f683eda8 100644
Binary files a/public/images/items/griseous_core.png and b/public/images/items/griseous_core.png differ
diff --git a/public/images/items/ground_memory.png b/public/images/items/ground_memory.png
index 8ab042c02ff..808a4e13eeb 100644
Binary files a/public/images/items/ground_memory.png and b/public/images/items/ground_memory.png differ
diff --git a/public/images/items/ground_tera_shard.png b/public/images/items/ground_tera_shard.png
index 153bbd9058c..d7760f7dc1b 100644
Binary files a/public/images/items/ground_tera_shard.png and b/public/images/items/ground_tera_shard.png differ
diff --git a/public/images/items/guard_spec.png b/public/images/items/guard_spec.png
index 3efc9448404..95a37d0d28e 100644
Binary files a/public/images/items/guard_spec.png and b/public/images/items/guard_spec.png differ
diff --git a/public/images/items/gyaradosite.png b/public/images/items/gyaradosite.png
index bc8e6d6b115..e4cae1366ab 100644
Binary files a/public/images/items/gyaradosite.png and b/public/images/items/gyaradosite.png differ
diff --git a/public/images/items/hard_meteorite.png b/public/images/items/hard_meteorite.png
index d8f3490c581..8e8a2b5688b 100644
Binary files a/public/images/items/hard_meteorite.png and b/public/images/items/hard_meteorite.png differ
diff --git a/public/images/items/hard_stone.png b/public/images/items/hard_stone.png
index 604b44f9915..571d96afaa8 100644
Binary files a/public/images/items/hard_stone.png and b/public/images/items/hard_stone.png differ
diff --git a/public/images/items/healing_charm.png b/public/images/items/healing_charm.png
index b6f4c593c53..4601eeef593 100644
Binary files a/public/images/items/healing_charm.png and b/public/images/items/healing_charm.png differ
diff --git a/public/images/items/hearthflame_mask.png b/public/images/items/hearthflame_mask.png
index cd2ecdf1949..deed3d0cde8 100644
Binary files a/public/images/items/hearthflame_mask.png and b/public/images/items/hearthflame_mask.png differ
diff --git a/public/images/items/heracronite.png b/public/images/items/heracronite.png
index 164da1c9d30..ffcfc440c19 100644
Binary files a/public/images/items/heracronite.png and b/public/images/items/heracronite.png differ
diff --git a/public/images/items/houndoominite.png b/public/images/items/houndoominite.png
index 9e2e5f2eacd..c9ea1954dfa 100644
Binary files a/public/images/items/houndoominite.png and b/public/images/items/houndoominite.png differ
diff --git a/public/images/items/hp_up.png b/public/images/items/hp_up.png
index ff456d25289..5c6baff0673 100644
Binary files a/public/images/items/hp_up.png and b/public/images/items/hp_up.png differ
diff --git a/public/images/items/hyper_potion.png b/public/images/items/hyper_potion.png
index fa1c1432795..197aaac690c 100644
Binary files a/public/images/items/hyper_potion.png and b/public/images/items/hyper_potion.png differ
diff --git a/public/images/items/ice_memory.png b/public/images/items/ice_memory.png
index 01e68c08f82..812548cf36c 100644
Binary files a/public/images/items/ice_memory.png and b/public/images/items/ice_memory.png differ
diff --git a/public/images/items/ice_stone.png b/public/images/items/ice_stone.png
index a0fc0c12c5d..945714b759c 100644
Binary files a/public/images/items/ice_stone.png and b/public/images/items/ice_stone.png differ
diff --git a/public/images/items/ice_tera_shard.png b/public/images/items/ice_tera_shard.png
index 3e07acee397..5644d647c2b 100644
Binary files a/public/images/items/ice_tera_shard.png and b/public/images/items/ice_tera_shard.png differ
diff --git a/public/images/items/icicle_plate.png b/public/images/items/icicle_plate.png
index 67b5138e3e6..f9797d91f6a 100644
Binary files a/public/images/items/icicle_plate.png and b/public/images/items/icicle_plate.png differ
diff --git a/public/images/items/icy_reins_of_unity.png b/public/images/items/icy_reins_of_unity.png
index 84ec94a1d87..b7af48d6a81 100644
Binary files a/public/images/items/icy_reins_of_unity.png and b/public/images/items/icy_reins_of_unity.png differ
diff --git a/public/images/items/insect_plate.png b/public/images/items/insect_plate.png
index 75b44640a1b..5bcc0eebaf5 100644
Binary files a/public/images/items/insect_plate.png and b/public/images/items/insect_plate.png differ
diff --git a/public/images/items/inverse.png b/public/images/items/inverse.png
index b1ad5d2c00e..0d77ce77dde 100644
Binary files a/public/images/items/inverse.png and b/public/images/items/inverse.png differ
diff --git a/public/images/items/iron.png b/public/images/items/iron.png
index 3bb8ab15a8f..5cfff11b059 100644
Binary files a/public/images/items/iron.png and b/public/images/items/iron.png differ
diff --git a/public/images/items/iron_plate.png b/public/images/items/iron_plate.png
index ee892755660..65d660e34eb 100644
Binary files a/public/images/items/iron_plate.png and b/public/images/items/iron_plate.png differ
diff --git a/public/images/items/kangaskhanite.png b/public/images/items/kangaskhanite.png
index b7eb6849729..3d65d2cc5ca 100644
Binary files a/public/images/items/kangaskhanite.png and b/public/images/items/kangaskhanite.png differ
diff --git a/public/images/items/kings_rock.png b/public/images/items/kings_rock.png
index 0ea43c267bc..bfda9d559d3 100644
Binary files a/public/images/items/kings_rock.png and b/public/images/items/kings_rock.png differ
diff --git a/public/images/items/lansat_berry.png b/public/images/items/lansat_berry.png
index 6b2a8fb4760..223bff3eb26 100644
Binary files a/public/images/items/lansat_berry.png and b/public/images/items/lansat_berry.png differ
diff --git a/public/images/items/latiasite.png b/public/images/items/latiasite.png
index 6b92d1851cc..486a542576f 100644
Binary files a/public/images/items/latiasite.png and b/public/images/items/latiasite.png differ
diff --git a/public/images/items/latiosite.png b/public/images/items/latiosite.png
index 0d2af34781f..69708835c7b 100644
Binary files a/public/images/items/latiosite.png and b/public/images/items/latiosite.png differ
diff --git a/public/images/items/leaders_crest.png b/public/images/items/leaders_crest.png
index 45cf1656374..86b71f1eb6d 100644
Binary files a/public/images/items/leaders_crest.png and b/public/images/items/leaders_crest.png differ
diff --git a/public/images/items/leaf_stone.png b/public/images/items/leaf_stone.png
index a384af2a9c7..dc68e916bcf 100644
Binary files a/public/images/items/leaf_stone.png and b/public/images/items/leaf_stone.png differ
diff --git a/public/images/items/leek.png b/public/images/items/leek.png
index 7ef3fb989a4..1cb136aa78c 100644
Binary files a/public/images/items/leek.png and b/public/images/items/leek.png differ
diff --git a/public/images/items/leftovers.png b/public/images/items/leftovers.png
index 48ff07fbed3..4732d149b64 100644
Binary files a/public/images/items/leftovers.png and b/public/images/items/leftovers.png differ
diff --git a/public/images/items/legend_plate.png b/public/images/items/legend_plate.png
index 5b8681ebfe7..e96f12b45f5 100644
Binary files a/public/images/items/legend_plate.png and b/public/images/items/legend_plate.png differ
diff --git a/public/images/items/leppa_berry.png b/public/images/items/leppa_berry.png
index 4bc1349fe94..7a0f13b5199 100644
Binary files a/public/images/items/leppa_berry.png and b/public/images/items/leppa_berry.png differ
diff --git a/public/images/items/liechi_berry.png b/public/images/items/liechi_berry.png
index 492ef7e86f1..192d8f001ef 100644
Binary files a/public/images/items/liechi_berry.png and b/public/images/items/liechi_berry.png differ
diff --git a/public/images/items/light_ball.png b/public/images/items/light_ball.png
index cd421446608..7748f735d37 100644
Binary files a/public/images/items/light_ball.png and b/public/images/items/light_ball.png differ
diff --git a/public/images/items/light_stone.png b/public/images/items/light_stone.png
index 2b2be824020..97258cf3970 100644
Binary files a/public/images/items/light_stone.png and b/public/images/items/light_stone.png differ
diff --git a/public/images/items/linking_cord.png b/public/images/items/linking_cord.png
index ab695ae1fc8..4cde9da3f14 100644
Binary files a/public/images/items/linking_cord.png and b/public/images/items/linking_cord.png differ
diff --git a/public/images/items/lock_capsule.png b/public/images/items/lock_capsule.png
index b2e64dfdbfd..25d0cc14cff 100644
Binary files a/public/images/items/lock_capsule.png and b/public/images/items/lock_capsule.png differ
diff --git a/public/images/items/lopunnite.png b/public/images/items/lopunnite.png
index 416807c0c81..bd67cf159ed 100644
Binary files a/public/images/items/lopunnite.png and b/public/images/items/lopunnite.png differ
diff --git a/public/images/items/lucarionite.png b/public/images/items/lucarionite.png
index 82d3b19129d..b97161df68c 100644
Binary files a/public/images/items/lucarionite.png and b/public/images/items/lucarionite.png differ
diff --git a/public/images/items/lucky_egg.png b/public/images/items/lucky_egg.png
index 2760c303d37..fa9a1e4b390 100644
Binary files a/public/images/items/lucky_egg.png and b/public/images/items/lucky_egg.png differ
diff --git a/public/images/items/lucky_punch.png b/public/images/items/lucky_punch.png
index ed783c43e9a..97887631d9a 100644
Binary files a/public/images/items/lucky_punch.png and b/public/images/items/lucky_punch.png differ
diff --git a/public/images/items/lucky_punch_great.png b/public/images/items/lucky_punch_great.png
index c66df778210..77c77daf535 100644
Binary files a/public/images/items/lucky_punch_great.png and b/public/images/items/lucky_punch_great.png differ
diff --git a/public/images/items/lucky_punch_master.png b/public/images/items/lucky_punch_master.png
index d48fdf04bae..89fc1b67cf4 100644
Binary files a/public/images/items/lucky_punch_master.png and b/public/images/items/lucky_punch_master.png differ
diff --git a/public/images/items/lucky_punch_ultra.png b/public/images/items/lucky_punch_ultra.png
index aee27600f5c..a95c23666bb 100644
Binary files a/public/images/items/lucky_punch_ultra.png and b/public/images/items/lucky_punch_ultra.png differ
diff --git a/public/images/items/lum_berry.png b/public/images/items/lum_berry.png
index 8feb811e411..d19c4fba583 100644
Binary files a/public/images/items/lum_berry.png and b/public/images/items/lum_berry.png differ
diff --git a/public/images/items/lure.png b/public/images/items/lure.png
index a148aa70db9..1c3ea6cc8e8 100644
Binary files a/public/images/items/lure.png and b/public/images/items/lure.png differ
diff --git a/public/images/items/lustrous_globe.png b/public/images/items/lustrous_globe.png
index a16cf80c350..2a854db742b 100644
Binary files a/public/images/items/lustrous_globe.png and b/public/images/items/lustrous_globe.png differ
diff --git a/public/images/items/macho_brace.png b/public/images/items/macho_brace.png
index 2085829e1ce..760139cf7f8 100644
Binary files a/public/images/items/macho_brace.png and b/public/images/items/macho_brace.png differ
diff --git a/public/images/items/magmarizer.png b/public/images/items/magmarizer.png
index 0fca34c1e28..4f4d5f45851 100644
Binary files a/public/images/items/magmarizer.png and b/public/images/items/magmarizer.png differ
diff --git a/public/images/items/magnet.png b/public/images/items/magnet.png
index 7a07f557ec4..9ce8b686e9f 100644
Binary files a/public/images/items/magnet.png and b/public/images/items/magnet.png differ
diff --git a/public/images/items/malicious_armor.png b/public/images/items/malicious_armor.png
index 495024ced20..b7bfb55195b 100644
Binary files a/public/images/items/malicious_armor.png and b/public/images/items/malicious_armor.png differ
diff --git a/public/images/items/manectite.png b/public/images/items/manectite.png
index 0dd7406cdc4..c9df61669bc 100644
Binary files a/public/images/items/manectite.png and b/public/images/items/manectite.png differ
diff --git a/public/images/items/map.png b/public/images/items/map.png
index a641a7e8a69..dc2fc6b95d8 100644
Binary files a/public/images/items/map.png and b/public/images/items/map.png differ
diff --git a/public/images/items/master_ribbon.png b/public/images/items/master_ribbon.png
index 86be493b74a..0443215c1f9 100644
Binary files a/public/images/items/master_ribbon.png and b/public/images/items/master_ribbon.png differ
diff --git a/public/images/items/masterpiece_teacup.png b/public/images/items/masterpiece_teacup.png
index 36b8c39dcc7..ec2455c0763 100644
Binary files a/public/images/items/masterpiece_teacup.png and b/public/images/items/masterpiece_teacup.png differ
diff --git a/public/images/items/mawilite.png b/public/images/items/mawilite.png
index 95ddf987f12..60ea4017f56 100644
Binary files a/public/images/items/mawilite.png and b/public/images/items/mawilite.png differ
diff --git a/public/images/items/max_elixir.png b/public/images/items/max_elixir.png
index a4f134dd13c..1f528c2bb61 100644
Binary files a/public/images/items/max_elixir.png and b/public/images/items/max_elixir.png differ
diff --git a/public/images/items/max_ether.png b/public/images/items/max_ether.png
index 0ecdf09397a..8cee7152a86 100644
Binary files a/public/images/items/max_ether.png and b/public/images/items/max_ether.png differ
diff --git a/public/images/items/max_lure.png b/public/images/items/max_lure.png
index 384db7d7df8..812229d140a 100644
Binary files a/public/images/items/max_lure.png and b/public/images/items/max_lure.png differ
diff --git a/public/images/items/max_mushrooms.png b/public/images/items/max_mushrooms.png
index 443f1d5c369..8d5c015c963 100644
Binary files a/public/images/items/max_mushrooms.png and b/public/images/items/max_mushrooms.png differ
diff --git a/public/images/items/max_potion.png b/public/images/items/max_potion.png
index f51e7bde976..d8fadc9cb93 100644
Binary files a/public/images/items/max_potion.png and b/public/images/items/max_potion.png differ
diff --git a/public/images/items/max_repel.png b/public/images/items/max_repel.png
index d8bef707913..4d88ae6d0b5 100644
Binary files a/public/images/items/max_repel.png and b/public/images/items/max_repel.png differ
diff --git a/public/images/items/max_revive.png b/public/images/items/max_revive.png
index 25849a3b940..609fd17c3b9 100644
Binary files a/public/images/items/max_revive.png and b/public/images/items/max_revive.png differ
diff --git a/public/images/items/mb.png b/public/images/items/mb.png
index cfa421d6219..d80b3b89108 100644
Binary files a/public/images/items/mb.png and b/public/images/items/mb.png differ
diff --git a/public/images/items/meadow_plate.png b/public/images/items/meadow_plate.png
index a687cb7920d..e2b991776ba 100644
Binary files a/public/images/items/meadow_plate.png and b/public/images/items/meadow_plate.png differ
diff --git a/public/images/items/medichamite.png b/public/images/items/medichamite.png
index 4dd57f10bed..42f22ed6cd6 100644
Binary files a/public/images/items/medichamite.png and b/public/images/items/medichamite.png differ
diff --git a/public/images/items/mega_bracelet.png b/public/images/items/mega_bracelet.png
index e593b907631..5e8ff02be8c 100644
Binary files a/public/images/items/mega_bracelet.png and b/public/images/items/mega_bracelet.png differ
diff --git a/public/images/items/metagrossite.png b/public/images/items/metagrossite.png
index 445deff40c1..c245368758d 100644
Binary files a/public/images/items/metagrossite.png and b/public/images/items/metagrossite.png differ
diff --git a/public/images/items/metal_alloy.png b/public/images/items/metal_alloy.png
index 1201f58b463..41f22df4254 100644
Binary files a/public/images/items/metal_alloy.png and b/public/images/items/metal_alloy.png differ
diff --git a/public/images/items/metal_coat.png b/public/images/items/metal_coat.png
index f016d48bd2e..88f055c3fb3 100644
Binary files a/public/images/items/metal_coat.png and b/public/images/items/metal_coat.png differ
diff --git a/public/images/items/metal_powder.png b/public/images/items/metal_powder.png
index 11c3a39314c..64af0b144fe 100644
Binary files a/public/images/items/metal_powder.png and b/public/images/items/metal_powder.png differ
diff --git a/public/images/items/metronome.png b/public/images/items/metronome.png
index dfde7e365eb..837d75b4c03 100644
Binary files a/public/images/items/metronome.png and b/public/images/items/metronome.png differ
diff --git a/public/images/items/mewtwonite_x.png b/public/images/items/mewtwonite_x.png
index 3ec18a1c683..507d17e54e8 100644
Binary files a/public/images/items/mewtwonite_x.png and b/public/images/items/mewtwonite_x.png differ
diff --git a/public/images/items/mewtwonite_y.png b/public/images/items/mewtwonite_y.png
index eb9b1d0dc55..ff0c53396d2 100644
Binary files a/public/images/items/mewtwonite_y.png and b/public/images/items/mewtwonite_y.png differ
diff --git a/public/images/items/mind_plate.png b/public/images/items/mind_plate.png
index 04001796831..ff6fcc4f3af 100644
Binary files a/public/images/items/mind_plate.png and b/public/images/items/mind_plate.png differ
diff --git a/public/images/items/mini_black_hole.png b/public/images/items/mini_black_hole.png
index dd7458b8b2a..6edcaad16e3 100644
Binary files a/public/images/items/mini_black_hole.png and b/public/images/items/mini_black_hole.png differ
diff --git a/public/images/items/mint_atk.png b/public/images/items/mint_atk.png
index 727a7b3f792..88315c0cd07 100644
Binary files a/public/images/items/mint_atk.png and b/public/images/items/mint_atk.png differ
diff --git a/public/images/items/mint_def.png b/public/images/items/mint_def.png
index 9cd92eac07e..584c610ffd7 100644
Binary files a/public/images/items/mint_def.png and b/public/images/items/mint_def.png differ
diff --git a/public/images/items/mint_neutral.png b/public/images/items/mint_neutral.png
index e2e556d475b..f5287539e78 100644
Binary files a/public/images/items/mint_neutral.png and b/public/images/items/mint_neutral.png differ
diff --git a/public/images/items/mint_spatk.png b/public/images/items/mint_spatk.png
index 191ba6c4a1a..90a57c5608b 100644
Binary files a/public/images/items/mint_spatk.png and b/public/images/items/mint_spatk.png differ
diff --git a/public/images/items/mint_spd.png b/public/images/items/mint_spd.png
index 687119f2502..5420b0997b3 100644
Binary files a/public/images/items/mint_spd.png and b/public/images/items/mint_spd.png differ
diff --git a/public/images/items/mint_spdef.png b/public/images/items/mint_spdef.png
index cd902ce0984..54a1b4ed21d 100644
Binary files a/public/images/items/mint_spdef.png and b/public/images/items/mint_spdef.png differ
diff --git a/public/images/items/miracle_seed.png b/public/images/items/miracle_seed.png
index f5bc766545a..8be7ba72d33 100644
Binary files a/public/images/items/miracle_seed.png and b/public/images/items/miracle_seed.png differ
diff --git a/public/images/items/moon_flute.png b/public/images/items/moon_flute.png
index 893cb6a7579..5d3c0caf5f2 100644
Binary files a/public/images/items/moon_flute.png and b/public/images/items/moon_flute.png differ
diff --git a/public/images/items/moon_stone.png b/public/images/items/moon_stone.png
index b4af61969a2..f002fb18073 100644
Binary files a/public/images/items/moon_stone.png and b/public/images/items/moon_stone.png differ
diff --git a/public/images/items/muscle_band.png b/public/images/items/muscle_band.png
index 011716e7124..0be9d010767 100644
Binary files a/public/images/items/muscle_band.png and b/public/images/items/muscle_band.png differ
diff --git a/public/images/items/mystery_egg.png b/public/images/items/mystery_egg.png
index bb117a137b0..ac631cec7c8 100644
Binary files a/public/images/items/mystery_egg.png and b/public/images/items/mystery_egg.png differ
diff --git a/public/images/items/mystic_ticket.png b/public/images/items/mystic_ticket.png
index bd206998fed..cab03fa5470 100644
Binary files a/public/images/items/mystic_ticket.png and b/public/images/items/mystic_ticket.png differ
diff --git a/public/images/items/mystic_water.png b/public/images/items/mystic_water.png
index f944fac1a9c..2128895b385 100644
Binary files a/public/images/items/mystic_water.png and b/public/images/items/mystic_water.png differ
diff --git a/public/images/items/mystical_rock.png b/public/images/items/mystical_rock.png
new file mode 100644
index 00000000000..81a397e4c2d
Binary files /dev/null and b/public/images/items/mystical_rock.png differ
diff --git a/public/images/items/n_lunarizer.png b/public/images/items/n_lunarizer.png
index e45fb8ecf8d..a03b48ad387 100644
Binary files a/public/images/items/n_lunarizer.png and b/public/images/items/n_lunarizer.png differ
diff --git a/public/images/items/n_solarizer.png b/public/images/items/n_solarizer.png
index e706a42c973..69153fd38dd 100644
Binary files a/public/images/items/n_solarizer.png and b/public/images/items/n_solarizer.png differ
diff --git a/public/images/items/never_melt_ice.png b/public/images/items/never_melt_ice.png
index bec7cc0e5d4..35b1ada771d 100644
Binary files a/public/images/items/never_melt_ice.png and b/public/images/items/never_melt_ice.png differ
diff --git a/public/images/items/normal_memory.png b/public/images/items/normal_memory.png
index ddc22d1d4ab..e1ff89a9993 100644
Binary files a/public/images/items/normal_memory.png and b/public/images/items/normal_memory.png differ
diff --git a/public/images/items/normal_tera_shard.png b/public/images/items/normal_tera_shard.png
index fe2b9b93fd6..1c7a41ea0ec 100644
Binary files a/public/images/items/normal_tera_shard.png and b/public/images/items/normal_tera_shard.png differ
diff --git a/public/images/items/nugget.png b/public/images/items/nugget.png
index e8d39912349..0340f5d4000 100644
Binary files a/public/images/items/nugget.png and b/public/images/items/nugget.png differ
diff --git a/public/images/items/old_gateau.png b/public/images/items/old_gateau.png
index c910e90f101..dd5f0e05a94 100644
Binary files a/public/images/items/old_gateau.png and b/public/images/items/old_gateau.png differ
diff --git a/public/images/items/oval_charm.png b/public/images/items/oval_charm.png
index dc791175588..fcdb914ec22 100644
Binary files a/public/images/items/oval_charm.png and b/public/images/items/oval_charm.png differ
diff --git a/public/images/items/oval_stone.png b/public/images/items/oval_stone.png
index d48b0688821..d58ffde18e3 100644
Binary files a/public/images/items/oval_stone.png and b/public/images/items/oval_stone.png differ
diff --git a/public/images/items/pair_of_tickets.png b/public/images/items/pair_of_tickets.png
index b4b6ececbd2..b06c9a8727f 100644
Binary files a/public/images/items/pair_of_tickets.png and b/public/images/items/pair_of_tickets.png differ
diff --git a/public/images/items/pb.png b/public/images/items/pb.png
index ec4fe69c86f..37c37edb8c1 100644
Binary files a/public/images/items/pb.png and b/public/images/items/pb.png differ
diff --git a/public/images/items/pb_gold.png b/public/images/items/pb_gold.png
index fd71feb8e55..6dff6824158 100644
Binary files a/public/images/items/pb_gold.png and b/public/images/items/pb_gold.png differ
diff --git a/public/images/items/pb_silver.png b/public/images/items/pb_silver.png
index f60a8348a94..9528517a77a 100644
Binary files a/public/images/items/pb_silver.png and b/public/images/items/pb_silver.png differ
diff --git a/public/images/items/peat_block.png b/public/images/items/peat_block.png
index b62e94d523f..f3c65449b87 100644
Binary files a/public/images/items/peat_block.png and b/public/images/items/peat_block.png differ
diff --git a/public/images/items/petaya_berry.png b/public/images/items/petaya_berry.png
index e1dae467187..0fba884c2e2 100644
Binary files a/public/images/items/petaya_berry.png and b/public/images/items/petaya_berry.png differ
diff --git a/public/images/items/pidgeotite.png b/public/images/items/pidgeotite.png
index 86d1b23558c..52cb40852d6 100644
Binary files a/public/images/items/pidgeotite.png and b/public/images/items/pidgeotite.png differ
diff --git a/public/images/items/pinsirite.png b/public/images/items/pinsirite.png
index 2616cf6dfe1..88ecc8e9ea9 100644
Binary files a/public/images/items/pinsirite.png and b/public/images/items/pinsirite.png differ
diff --git a/public/images/items/pixie_plate.png b/public/images/items/pixie_plate.png
index dcc829c107f..e123ae6a49a 100644
Binary files a/public/images/items/pixie_plate.png and b/public/images/items/pixie_plate.png differ
diff --git a/public/images/items/poison_barb.png b/public/images/items/poison_barb.png
index 913ede4d819..3f9d714b08c 100644
Binary files a/public/images/items/poison_barb.png and b/public/images/items/poison_barb.png differ
diff --git a/public/images/items/poison_memory.png b/public/images/items/poison_memory.png
index 2b0036201d9..6c2b0aea77b 100644
Binary files a/public/images/items/poison_memory.png and b/public/images/items/poison_memory.png differ
diff --git a/public/images/items/poison_tera_shard.png b/public/images/items/poison_tera_shard.png
index b124fa051b9..4f21d158a41 100644
Binary files a/public/images/items/poison_tera_shard.png and b/public/images/items/poison_tera_shard.png differ
diff --git a/public/images/items/potion.png b/public/images/items/potion.png
index 10a7d5848db..f69c3210f03 100644
Binary files a/public/images/items/potion.png and b/public/images/items/potion.png differ
diff --git a/public/images/items/power_herb.png b/public/images/items/power_herb.png
index 15a581490a0..ba156c62122 100644
Binary files a/public/images/items/power_herb.png and b/public/images/items/power_herb.png differ
diff --git a/public/images/items/pp_max.png b/public/images/items/pp_max.png
index 48752829557..787641e26ac 100644
Binary files a/public/images/items/pp_max.png and b/public/images/items/pp_max.png differ
diff --git a/public/images/items/pp_up.png b/public/images/items/pp_up.png
index 1334d228bc3..463c3a0578d 100644
Binary files a/public/images/items/pp_up.png and b/public/images/items/pp_up.png differ
diff --git a/public/images/items/prism_scale.png b/public/images/items/prism_scale.png
index 5a0d45c686b..2436e96bf73 100644
Binary files a/public/images/items/prism_scale.png and b/public/images/items/prism_scale.png differ
diff --git a/public/images/items/prison_bottle.png b/public/images/items/prison_bottle.png
index da733bb14bb..06217988364 100644
Binary files a/public/images/items/prison_bottle.png and b/public/images/items/prison_bottle.png differ
diff --git a/public/images/items/protector.png b/public/images/items/protector.png
index a7b01a8c53d..8f65be09b2f 100644
Binary files a/public/images/items/protector.png and b/public/images/items/protector.png differ
diff --git a/public/images/items/protein.png b/public/images/items/protein.png
index b3386a8841b..54df13c6753 100644
Binary files a/public/images/items/protein.png and b/public/images/items/protein.png differ
diff --git a/public/images/items/psychic_memory.png b/public/images/items/psychic_memory.png
index a17afa4a617..21d62daa483 100644
Binary files a/public/images/items/psychic_memory.png and b/public/images/items/psychic_memory.png differ
diff --git a/public/images/items/psychic_tera_shard.png b/public/images/items/psychic_tera_shard.png
index 0a5656ccea1..f4b1cf7b259 100644
Binary files a/public/images/items/psychic_tera_shard.png and b/public/images/items/psychic_tera_shard.png differ
diff --git a/public/images/items/quick_claw.png b/public/images/items/quick_claw.png
index e6317898e2a..ff4f76d0576 100644
Binary files a/public/images/items/quick_claw.png and b/public/images/items/quick_claw.png differ
diff --git a/public/images/items/quick_powder.png b/public/images/items/quick_powder.png
index c73ec09eb05..58a8a1187a9 100644
Binary files a/public/images/items/quick_powder.png and b/public/images/items/quick_powder.png differ
diff --git a/public/images/items/rare_candy.png b/public/images/items/rare_candy.png
index d81e7ad0844..a860a116905 100644
Binary files a/public/images/items/rare_candy.png and b/public/images/items/rare_candy.png differ
diff --git a/public/images/items/rarer_candy.png b/public/images/items/rarer_candy.png
index b8432bd8216..4424caa659a 100644
Binary files a/public/images/items/rarer_candy.png and b/public/images/items/rarer_candy.png differ
diff --git a/public/images/items/rayquazite.png b/public/images/items/rayquazite.png
index 068f02936be..b39957b857d 100644
Binary files a/public/images/items/rayquazite.png and b/public/images/items/rayquazite.png differ
diff --git a/public/images/items/razor_claw.png b/public/images/items/razor_claw.png
index a9541c4d251..0ba506e8706 100644
Binary files a/public/images/items/razor_claw.png and b/public/images/items/razor_claw.png differ
diff --git a/public/images/items/razor_fang.png b/public/images/items/razor_fang.png
index 77c3da44c92..75306db5c4c 100644
Binary files a/public/images/items/razor_fang.png and b/public/images/items/razor_fang.png differ
diff --git a/public/images/items/rb.png b/public/images/items/rb.png
index 440ab8bf1b4..020f2ff878b 100644
Binary files a/public/images/items/rb.png and b/public/images/items/rb.png differ
diff --git a/public/images/items/reaper_cloth.png b/public/images/items/reaper_cloth.png
index a86714bfc4f..9caf7665e95 100644
Binary files a/public/images/items/reaper_cloth.png and b/public/images/items/reaper_cloth.png differ
diff --git a/public/images/items/red_orb.png b/public/images/items/red_orb.png
index b982649c9b3..cee83740ca5 100644
Binary files a/public/images/items/red_orb.png and b/public/images/items/red_orb.png differ
diff --git a/public/images/items/relic_band.png b/public/images/items/relic_band.png
index 634b91e41b3..adbd73bc46b 100644
Binary files a/public/images/items/relic_band.png and b/public/images/items/relic_band.png differ
diff --git a/public/images/items/relic_crown.png b/public/images/items/relic_crown.png
index d8c4552ea3c..de090041c1c 100644
Binary files a/public/images/items/relic_crown.png and b/public/images/items/relic_crown.png differ
diff --git a/public/images/items/relic_gold.png b/public/images/items/relic_gold.png
index da3f33fdfa1..af5b1797938 100644
Binary files a/public/images/items/relic_gold.png and b/public/images/items/relic_gold.png differ
diff --git a/public/images/items/repel.png b/public/images/items/repel.png
index 3d1359e688e..80c7738e9ff 100644
Binary files a/public/images/items/repel.png and b/public/images/items/repel.png differ
diff --git a/public/images/items/reveal_glass.png b/public/images/items/reveal_glass.png
index 3fae3bdf934..469d20a2752 100644
Binary files a/public/images/items/reveal_glass.png and b/public/images/items/reveal_glass.png differ
diff --git a/public/images/items/revive.png b/public/images/items/revive.png
index d7952b7653f..e84659867d8 100644
Binary files a/public/images/items/revive.png and b/public/images/items/revive.png differ
diff --git a/public/images/items/reviver_seed.png b/public/images/items/reviver_seed.png
index 31cfae46f94..10bc5c32451 100644
Binary files a/public/images/items/reviver_seed.png and b/public/images/items/reviver_seed.png differ
diff --git a/public/images/items/ribbon_gen1.png b/public/images/items/ribbon_gen1.png
index a9774d18ad0..1d731cf2e98 100644
Binary files a/public/images/items/ribbon_gen1.png and b/public/images/items/ribbon_gen1.png differ
diff --git a/public/images/items/ribbon_gen2.png b/public/images/items/ribbon_gen2.png
index a04f6a32a62..2ff54112105 100644
Binary files a/public/images/items/ribbon_gen2.png and b/public/images/items/ribbon_gen2.png differ
diff --git a/public/images/items/ribbon_gen3.png b/public/images/items/ribbon_gen3.png
index 0cf20ed92ee..14a5eb09f7d 100644
Binary files a/public/images/items/ribbon_gen3.png and b/public/images/items/ribbon_gen3.png differ
diff --git a/public/images/items/ribbon_gen4.png b/public/images/items/ribbon_gen4.png
index aa24433b71b..c482ac1d04a 100644
Binary files a/public/images/items/ribbon_gen4.png and b/public/images/items/ribbon_gen4.png differ
diff --git a/public/images/items/ribbon_gen5.png b/public/images/items/ribbon_gen5.png
index 7bb7800671f..52560cde636 100644
Binary files a/public/images/items/ribbon_gen5.png and b/public/images/items/ribbon_gen5.png differ
diff --git a/public/images/items/ribbon_gen6.png b/public/images/items/ribbon_gen6.png
index e466eb78842..3dd04927acd 100644
Binary files a/public/images/items/ribbon_gen6.png and b/public/images/items/ribbon_gen6.png differ
diff --git a/public/images/items/ribbon_gen7.png b/public/images/items/ribbon_gen7.png
index 9c156ebd1c6..225b40da419 100644
Binary files a/public/images/items/ribbon_gen7.png and b/public/images/items/ribbon_gen7.png differ
diff --git a/public/images/items/ribbon_gen8.png b/public/images/items/ribbon_gen8.png
index 86b3748e348..32aaa803699 100644
Binary files a/public/images/items/ribbon_gen8.png and b/public/images/items/ribbon_gen8.png differ
diff --git a/public/images/items/ribbon_gen9.png b/public/images/items/ribbon_gen9.png
index e9609daf3cd..ad489005e23 100644
Binary files a/public/images/items/ribbon_gen9.png and b/public/images/items/ribbon_gen9.png differ
diff --git a/public/images/items/rock_memory.png b/public/images/items/rock_memory.png
index 01f436dd461..cfa71c851c0 100644
Binary files a/public/images/items/rock_memory.png and b/public/images/items/rock_memory.png differ
diff --git a/public/images/items/rock_tera_shard.png b/public/images/items/rock_tera_shard.png
index b4e6f8a29cf..a07ca7955a4 100644
Binary files a/public/images/items/rock_tera_shard.png and b/public/images/items/rock_tera_shard.png differ
diff --git a/public/images/items/rogue_ribbon.png b/public/images/items/rogue_ribbon.png
index 85986d93c8a..c3cfdcd85f3 100644
Binary files a/public/images/items/rogue_ribbon.png and b/public/images/items/rogue_ribbon.png differ
diff --git a/public/images/items/rusted_shield.png b/public/images/items/rusted_shield.png
index 569f86c15c7..3748f13dc4b 100644
Binary files a/public/images/items/rusted_shield.png and b/public/images/items/rusted_shield.png differ
diff --git a/public/images/items/rusted_sword.png b/public/images/items/rusted_sword.png
index c42e669441c..249233374e0 100644
Binary files a/public/images/items/rusted_sword.png and b/public/images/items/rusted_sword.png differ
diff --git a/public/images/items/sablenite.png b/public/images/items/sablenite.png
index 904abea5ce4..48eac2d5875 100644
Binary files a/public/images/items/sablenite.png and b/public/images/items/sablenite.png differ
diff --git a/public/images/items/sachet.png b/public/images/items/sachet.png
index 1ec6010f1af..6d91fa210fc 100644
Binary files a/public/images/items/sachet.png and b/public/images/items/sachet.png differ
diff --git a/public/images/items/sacred_ash.png b/public/images/items/sacred_ash.png
index 389b2605b93..4fab9dc0dc7 100644
Binary files a/public/images/items/sacred_ash.png and b/public/images/items/sacred_ash.png differ
diff --git a/public/images/items/salac_berry.png b/public/images/items/salac_berry.png
index ac0d29f2159..846dbb4f160 100644
Binary files a/public/images/items/salac_berry.png and b/public/images/items/salac_berry.png differ
diff --git a/public/images/items/salamencite.png b/public/images/items/salamencite.png
index 1a0096b4de5..f175f39d351 100644
Binary files a/public/images/items/salamencite.png and b/public/images/items/salamencite.png differ
diff --git a/public/images/items/scanner.png b/public/images/items/scanner.png
index 27a67484f19..a291d3f43f8 100644
Binary files a/public/images/items/scanner.png and b/public/images/items/scanner.png differ
diff --git a/public/images/items/sceptilite.png b/public/images/items/sceptilite.png
index 123e79d9893..ff81c4a55fe 100644
Binary files a/public/images/items/sceptilite.png and b/public/images/items/sceptilite.png differ
diff --git a/public/images/items/scizorite.png b/public/images/items/scizorite.png
index ce86b80701c..8ffca143835 100644
Binary files a/public/images/items/scizorite.png and b/public/images/items/scizorite.png differ
diff --git a/public/images/items/scope_lens.png b/public/images/items/scope_lens.png
index 57ec2c4148e..d3b1f354313 100644
Binary files a/public/images/items/scope_lens.png and b/public/images/items/scope_lens.png differ
diff --git a/public/images/items/scroll_of_darkness.png b/public/images/items/scroll_of_darkness.png
index 19be0feb6dc..ff6a6065e40 100644
Binary files a/public/images/items/scroll_of_darkness.png and b/public/images/items/scroll_of_darkness.png differ
diff --git a/public/images/items/scroll_of_waters.png b/public/images/items/scroll_of_waters.png
index d1e6a0388b6..e4a0cb725eb 100644
Binary files a/public/images/items/scroll_of_waters.png and b/public/images/items/scroll_of_waters.png differ
diff --git a/public/images/items/shadow_reins_of_unity.png b/public/images/items/shadow_reins_of_unity.png
index 929aeac6fb4..85cbc446851 100644
Binary files a/public/images/items/shadow_reins_of_unity.png and b/public/images/items/shadow_reins_of_unity.png differ
diff --git a/public/images/items/sharp_beak.png b/public/images/items/sharp_beak.png
index 3ce8d83e3aa..f22019e658b 100644
Binary files a/public/images/items/sharp_beak.png and b/public/images/items/sharp_beak.png differ
diff --git a/public/images/items/sharp_meteorite.png b/public/images/items/sharp_meteorite.png
index 1a135b64980..61a139fab05 100644
Binary files a/public/images/items/sharp_meteorite.png and b/public/images/items/sharp_meteorite.png differ
diff --git a/public/images/items/sharpedonite.png b/public/images/items/sharpedonite.png
index 3a71f7258ce..b3eabd5650f 100644
Binary files a/public/images/items/sharpedonite.png and b/public/images/items/sharpedonite.png differ
diff --git a/public/images/items/shed_shell.png b/public/images/items/shed_shell.png
index a0570cf29c4..17981864897 100644
Binary files a/public/images/items/shed_shell.png and b/public/images/items/shed_shell.png differ
diff --git a/public/images/items/shell_bell.png b/public/images/items/shell_bell.png
index a185be50188..6367d134672 100644
Binary files a/public/images/items/shell_bell.png and b/public/images/items/shell_bell.png differ
diff --git a/public/images/items/shiny_charm.png b/public/images/items/shiny_charm.png
index d0c8197f7c4..9f692828d04 100644
Binary files a/public/images/items/shiny_charm.png and b/public/images/items/shiny_charm.png differ
diff --git a/public/images/items/shiny_stone.png b/public/images/items/shiny_stone.png
index d9d1e8b77ca..d2fabe6ec8b 100644
Binary files a/public/images/items/shiny_stone.png and b/public/images/items/shiny_stone.png differ
diff --git a/public/images/items/shock_drive.png b/public/images/items/shock_drive.png
index e0bcc66f202..592b0085a8f 100644
Binary files a/public/images/items/shock_drive.png and b/public/images/items/shock_drive.png differ
diff --git a/public/images/items/silk_scarf.png b/public/images/items/silk_scarf.png
index 2eaea7aa435..83f056c8b41 100644
Binary files a/public/images/items/silk_scarf.png and b/public/images/items/silk_scarf.png differ
diff --git a/public/images/items/silver_powder.png b/public/images/items/silver_powder.png
index 03f62b45250..eb717fc6776 100644
Binary files a/public/images/items/silver_powder.png and b/public/images/items/silver_powder.png differ
diff --git a/public/images/items/sitrus_berry.png b/public/images/items/sitrus_berry.png
index 8e9463a80c2..703657ad8dd 100644
Binary files a/public/images/items/sitrus_berry.png and b/public/images/items/sitrus_berry.png differ
diff --git a/public/images/items/sky_plate.png b/public/images/items/sky_plate.png
index 1fed973142b..293bb8f5dc2 100644
Binary files a/public/images/items/sky_plate.png and b/public/images/items/sky_plate.png differ
diff --git a/public/images/items/slowbronite.png b/public/images/items/slowbronite.png
index 7eac1fb82d5..3dc21ffb550 100644
Binary files a/public/images/items/slowbronite.png and b/public/images/items/slowbronite.png differ
diff --git a/public/images/items/smooth_meteorite.png b/public/images/items/smooth_meteorite.png
index 4c2e5e07978..059e8e91a30 100644
Binary files a/public/images/items/smooth_meteorite.png and b/public/images/items/smooth_meteorite.png differ
diff --git a/public/images/items/soft_sand.png b/public/images/items/soft_sand.png
index c627bc10a8e..feda8cd3858 100644
Binary files a/public/images/items/soft_sand.png and b/public/images/items/soft_sand.png differ
diff --git a/public/images/items/soothe_bell.png b/public/images/items/soothe_bell.png
index 62fd6ff26c5..fbceb808c56 100644
Binary files a/public/images/items/soothe_bell.png and b/public/images/items/soothe_bell.png differ
diff --git a/public/images/items/soul_dew.png b/public/images/items/soul_dew.png
index 9c0abfdef9a..56b9655714b 100644
Binary files a/public/images/items/soul_dew.png and b/public/images/items/soul_dew.png differ
diff --git a/public/images/items/spell_tag.png b/public/images/items/spell_tag.png
index ccf071e122d..f9270c6e0a6 100644
Binary files a/public/images/items/spell_tag.png and b/public/images/items/spell_tag.png differ
diff --git a/public/images/items/splash_plate.png b/public/images/items/splash_plate.png
index a832f3dbf8a..d86ae5eab57 100644
Binary files a/public/images/items/splash_plate.png and b/public/images/items/splash_plate.png differ
diff --git a/public/images/items/spooky_plate.png b/public/images/items/spooky_plate.png
index b5794713d0d..d7df7d25e32 100644
Binary files a/public/images/items/spooky_plate.png and b/public/images/items/spooky_plate.png differ
diff --git a/public/images/items/starf_berry.png b/public/images/items/starf_berry.png
index 71fe1ac116f..cbf423e8343 100644
Binary files a/public/images/items/starf_berry.png and b/public/images/items/starf_berry.png differ
diff --git a/public/images/items/steel_memory.png b/public/images/items/steel_memory.png
index fbc13016c00..8c45bc8b640 100644
Binary files a/public/images/items/steel_memory.png and b/public/images/items/steel_memory.png differ
diff --git a/public/images/items/steel_tera_shard.png b/public/images/items/steel_tera_shard.png
index b0b2ccb1737..c93f8c52f60 100644
Binary files a/public/images/items/steel_tera_shard.png and b/public/images/items/steel_tera_shard.png differ
diff --git a/public/images/items/steelixite.png b/public/images/items/steelixite.png
index 62f688f0842..429c668e656 100644
Binary files a/public/images/items/steelixite.png and b/public/images/items/steelixite.png differ
diff --git a/public/images/items/stellar_tera_shard.png b/public/images/items/stellar_tera_shard.png
index b6625066e16..1d5982f5b94 100644
Binary files a/public/images/items/stellar_tera_shard.png and b/public/images/items/stellar_tera_shard.png differ
diff --git a/public/images/items/stone_plate.png b/public/images/items/stone_plate.png
index 44653583e60..dfc3a0cd132 100644
Binary files a/public/images/items/stone_plate.png and b/public/images/items/stone_plate.png differ
diff --git a/public/images/items/strange_ball.png b/public/images/items/strange_ball.png
index 64246f031ee..2ddce33d7ac 100644
Binary files a/public/images/items/strange_ball.png and b/public/images/items/strange_ball.png differ
diff --git a/public/images/items/strawberry_sweet.png b/public/images/items/strawberry_sweet.png
index b08fece34cc..5df6e1cd8be 100644
Binary files a/public/images/items/strawberry_sweet.png and b/public/images/items/strawberry_sweet.png differ
diff --git a/public/images/items/sun_flute.png b/public/images/items/sun_flute.png
index 7010c9fefbd..f81d35fde9c 100644
Binary files a/public/images/items/sun_flute.png and b/public/images/items/sun_flute.png differ
diff --git a/public/images/items/sun_stone.png b/public/images/items/sun_stone.png
index d22b24792fb..33a7e8f8387 100644
Binary files a/public/images/items/sun_stone.png and b/public/images/items/sun_stone.png differ
diff --git a/public/images/items/super_exp_charm.png b/public/images/items/super_exp_charm.png
index 8697edf4be6..ccd73f558cc 100644
Binary files a/public/images/items/super_exp_charm.png and b/public/images/items/super_exp_charm.png differ
diff --git a/public/images/items/super_lure.png b/public/images/items/super_lure.png
index 1a80c8ea309..9c2213cd964 100644
Binary files a/public/images/items/super_lure.png and b/public/images/items/super_lure.png differ
diff --git a/public/images/items/super_potion.png b/public/images/items/super_potion.png
index bfd1868b545..16205cb0fff 100644
Binary files a/public/images/items/super_potion.png and b/public/images/items/super_potion.png differ
diff --git a/public/images/items/super_repel.png b/public/images/items/super_repel.png
index db09ded8a26..628cdbc5c1d 100644
Binary files a/public/images/items/super_repel.png and b/public/images/items/super_repel.png differ
diff --git a/public/images/items/swampertite.png b/public/images/items/swampertite.png
index bfcdd99606b..d4d6415f6f4 100644
Binary files a/public/images/items/swampertite.png and b/public/images/items/swampertite.png differ
diff --git a/public/images/items/sweet_apple.png b/public/images/items/sweet_apple.png
index 5070af6ae64..cfdf79a9eac 100644
Binary files a/public/images/items/sweet_apple.png and b/public/images/items/sweet_apple.png differ
diff --git a/public/images/items/syrupy_apple.png b/public/images/items/syrupy_apple.png
index 99a0b7b5627..9c9d05e2e0a 100644
Binary files a/public/images/items/syrupy_apple.png and b/public/images/items/syrupy_apple.png differ
diff --git a/public/images/items/tart_apple.png b/public/images/items/tart_apple.png
index 8f9cf89da9f..ad9a1728bb5 100644
Binary files a/public/images/items/tart_apple.png and b/public/images/items/tart_apple.png differ
diff --git a/public/images/items/tera_orb.png b/public/images/items/tera_orb.png
index f4b6e47398e..d8720e41669 100644
Binary files a/public/images/items/tera_orb.png and b/public/images/items/tera_orb.png differ
diff --git a/public/images/items/thick_club.png b/public/images/items/thick_club.png
index a4459aa7701..f15885f0190 100644
Binary files a/public/images/items/thick_club.png and b/public/images/items/thick_club.png differ
diff --git a/public/images/items/thunder_stone.png b/public/images/items/thunder_stone.png
index 8b853b2f758..9e87909516b 100644
Binary files a/public/images/items/thunder_stone.png and b/public/images/items/thunder_stone.png differ
diff --git a/public/images/items/tm_bug.png b/public/images/items/tm_bug.png
index 56278cf2f66..229230198c4 100644
Binary files a/public/images/items/tm_bug.png and b/public/images/items/tm_bug.png differ
diff --git a/public/images/items/tm_dark.png b/public/images/items/tm_dark.png
index 6168cd2f070..6856b1d5444 100644
Binary files a/public/images/items/tm_dark.png and b/public/images/items/tm_dark.png differ
diff --git a/public/images/items/tm_dragon.png b/public/images/items/tm_dragon.png
index 9e1866cc2d6..62405519132 100644
Binary files a/public/images/items/tm_dragon.png and b/public/images/items/tm_dragon.png differ
diff --git a/public/images/items/tm_electric.png b/public/images/items/tm_electric.png
index 0610c3f3337..34e4fe8de7b 100644
Binary files a/public/images/items/tm_electric.png and b/public/images/items/tm_electric.png differ
diff --git a/public/images/items/tm_fairy.png b/public/images/items/tm_fairy.png
index de6335acbc8..056783a8d63 100644
Binary files a/public/images/items/tm_fairy.png and b/public/images/items/tm_fairy.png differ
diff --git a/public/images/items/tm_fighting.png b/public/images/items/tm_fighting.png
index b9f812767e3..144d75826cd 100644
Binary files a/public/images/items/tm_fighting.png and b/public/images/items/tm_fighting.png differ
diff --git a/public/images/items/tm_fire.png b/public/images/items/tm_fire.png
index 1de4b7a4a64..ae19e381873 100644
Binary files a/public/images/items/tm_fire.png and b/public/images/items/tm_fire.png differ
diff --git a/public/images/items/tm_flying.png b/public/images/items/tm_flying.png
index 4d738edb57f..3db06a69e68 100644
Binary files a/public/images/items/tm_flying.png and b/public/images/items/tm_flying.png differ
diff --git a/public/images/items/tm_ghost.png b/public/images/items/tm_ghost.png
index 71a6b558fae..a7e8928aa7e 100644
Binary files a/public/images/items/tm_ghost.png and b/public/images/items/tm_ghost.png differ
diff --git a/public/images/items/tm_grass.png b/public/images/items/tm_grass.png
index 6811d354fd9..42f11f590eb 100644
Binary files a/public/images/items/tm_grass.png and b/public/images/items/tm_grass.png differ
diff --git a/public/images/items/tm_ground.png b/public/images/items/tm_ground.png
index 0408eb71125..ff9dc7c7384 100644
Binary files a/public/images/items/tm_ground.png and b/public/images/items/tm_ground.png differ
diff --git a/public/images/items/tm_ice.png b/public/images/items/tm_ice.png
index b628d39f801..4edbb447a3e 100644
Binary files a/public/images/items/tm_ice.png and b/public/images/items/tm_ice.png differ
diff --git a/public/images/items/tm_normal.png b/public/images/items/tm_normal.png
index ab6e5e82729..19afe85d442 100644
Binary files a/public/images/items/tm_normal.png and b/public/images/items/tm_normal.png differ
diff --git a/public/images/items/tm_poison.png b/public/images/items/tm_poison.png
index f9f31b015dc..83cb4488f33 100644
Binary files a/public/images/items/tm_poison.png and b/public/images/items/tm_poison.png differ
diff --git a/public/images/items/tm_psychic.png b/public/images/items/tm_psychic.png
index 3c3becc0af2..4296914eda2 100644
Binary files a/public/images/items/tm_psychic.png and b/public/images/items/tm_psychic.png differ
diff --git a/public/images/items/tm_rock.png b/public/images/items/tm_rock.png
index d05ee8c1a7c..6e13a1835e7 100644
Binary files a/public/images/items/tm_rock.png and b/public/images/items/tm_rock.png differ
diff --git a/public/images/items/tm_steel.png b/public/images/items/tm_steel.png
index 840caff9ace..32071b0843b 100644
Binary files a/public/images/items/tm_steel.png and b/public/images/items/tm_steel.png differ
diff --git a/public/images/items/tm_water.png b/public/images/items/tm_water.png
index 2082766777d..85403f20be7 100644
Binary files a/public/images/items/tm_water.png and b/public/images/items/tm_water.png differ
diff --git a/public/images/items/toxic_orb.png b/public/images/items/toxic_orb.png
index 7fb36db516e..3483c13ba2b 100644
Binary files a/public/images/items/toxic_orb.png and b/public/images/items/toxic_orb.png differ
diff --git a/public/images/items/toxic_plate.png b/public/images/items/toxic_plate.png
index 8538e9fce2a..efb2cff129c 100644
Binary files a/public/images/items/toxic_plate.png and b/public/images/items/toxic_plate.png differ
diff --git a/public/images/items/twisted_spoon.png b/public/images/items/twisted_spoon.png
index 54a96de7d03..9bb23b04386 100644
Binary files a/public/images/items/twisted_spoon.png and b/public/images/items/twisted_spoon.png differ
diff --git a/public/images/items/tyranitarite.png b/public/images/items/tyranitarite.png
index 3d94f05c35f..691f8c6123d 100644
Binary files a/public/images/items/tyranitarite.png and b/public/images/items/tyranitarite.png differ
diff --git a/public/images/items/ub.png b/public/images/items/ub.png
index 964fb6b25c3..6ad0702223a 100644
Binary files a/public/images/items/ub.png and b/public/images/items/ub.png differ
diff --git a/public/images/items/ultra_ribbon.png b/public/images/items/ultra_ribbon.png
index 69dc7365bb4..a63ec63e394 100644
Binary files a/public/images/items/ultra_ribbon.png and b/public/images/items/ultra_ribbon.png differ
diff --git a/public/images/items/ultranecrozium_z.png b/public/images/items/ultranecrozium_z.png
index 208f3fb173d..cdcb29e6c26 100644
Binary files a/public/images/items/ultranecrozium_z.png and b/public/images/items/ultranecrozium_z.png differ
diff --git a/public/images/items/unknown.png b/public/images/items/unknown.png
index 4e01608daed..2d0637048ae 100644
Binary files a/public/images/items/unknown.png and b/public/images/items/unknown.png differ
diff --git a/public/images/items/unremarkable_teacup.png b/public/images/items/unremarkable_teacup.png
index fd4298b6a59..340214b6a5c 100644
Binary files a/public/images/items/unremarkable_teacup.png and b/public/images/items/unremarkable_teacup.png differ
diff --git a/public/images/items/upgrade.png b/public/images/items/upgrade.png
index 38db96a1792..11a7ade4d6a 100644
Binary files a/public/images/items/upgrade.png and b/public/images/items/upgrade.png differ
diff --git a/public/images/items/venusaurite.png b/public/images/items/venusaurite.png
index b8118a6c02d..845d1cef75a 100644
Binary files a/public/images/items/venusaurite.png and b/public/images/items/venusaurite.png differ
diff --git a/public/images/items/water_memory.png b/public/images/items/water_memory.png
index 4586a618836..a0cf8b3c5c9 100644
Binary files a/public/images/items/water_memory.png and b/public/images/items/water_memory.png differ
diff --git a/public/images/items/water_stone.png b/public/images/items/water_stone.png
index ab4543ee61a..fa3d924960b 100644
Binary files a/public/images/items/water_stone.png and b/public/images/items/water_stone.png differ
diff --git a/public/images/items/water_tera_shard.png b/public/images/items/water_tera_shard.png
index c00c1b5c1cb..eec8caf1245 100644
Binary files a/public/images/items/water_tera_shard.png and b/public/images/items/water_tera_shard.png differ
diff --git a/public/images/items/wellspring_mask.png b/public/images/items/wellspring_mask.png
index d5546cdb8da..921c71e1493 100644
Binary files a/public/images/items/wellspring_mask.png and b/public/images/items/wellspring_mask.png differ
diff --git a/public/images/items/whipped_dream.png b/public/images/items/whipped_dream.png
index 94628a443d1..16090ccaac0 100644
Binary files a/public/images/items/whipped_dream.png and b/public/images/items/whipped_dream.png differ
diff --git a/public/images/items/white_herb.png b/public/images/items/white_herb.png
index 56ca7c6aeb2..829c64f188e 100644
Binary files a/public/images/items/white_herb.png and b/public/images/items/white_herb.png differ
diff --git a/public/images/items/wide_lens.png b/public/images/items/wide_lens.png
index bf622521a9a..f7dbe9843fa 100644
Binary files a/public/images/items/wide_lens.png and b/public/images/items/wide_lens.png differ
diff --git a/public/images/items/wise_glasses.png b/public/images/items/wise_glasses.png
index 49a95761afd..b48d2cb3ffd 100644
Binary files a/public/images/items/wise_glasses.png and b/public/images/items/wise_glasses.png differ
diff --git a/public/images/items/wl_ability_urge.png b/public/images/items/wl_ability_urge.png
index a9eaa834313..b6b2c8bd398 100644
Binary files a/public/images/items/wl_ability_urge.png and b/public/images/items/wl_ability_urge.png differ
diff --git a/public/images/items/wl_antidote.png b/public/images/items/wl_antidote.png
index dbe0d5b94ea..93e4757938b 100644
Binary files a/public/images/items/wl_antidote.png and b/public/images/items/wl_antidote.png differ
diff --git a/public/images/items/wl_awakening.png b/public/images/items/wl_awakening.png
index 9a0adcda904..57e83b30cda 100644
Binary files a/public/images/items/wl_awakening.png and b/public/images/items/wl_awakening.png differ
diff --git a/public/images/items/wl_burn_heal.png b/public/images/items/wl_burn_heal.png
index d2f65e7da4c..3565af12d62 100644
Binary files a/public/images/items/wl_burn_heal.png and b/public/images/items/wl_burn_heal.png differ
diff --git a/public/images/items/wl_custom_spliced.png b/public/images/items/wl_custom_spliced.png
index 6a0ad4f8349..8aef30edb27 100644
Binary files a/public/images/items/wl_custom_spliced.png and b/public/images/items/wl_custom_spliced.png differ
diff --git a/public/images/items/wl_custom_thief.png b/public/images/items/wl_custom_thief.png
index cc1302ffb35..de6d62a48bc 100644
Binary files a/public/images/items/wl_custom_thief.png and b/public/images/items/wl_custom_thief.png differ
diff --git a/public/images/items/wl_elixir.png b/public/images/items/wl_elixir.png
index 29e413aa634..05eb590c484 100644
Binary files a/public/images/items/wl_elixir.png and b/public/images/items/wl_elixir.png differ
diff --git a/public/images/items/wl_ether.png b/public/images/items/wl_ether.png
index d3c0fe85918..114e8ffc941 100644
Binary files a/public/images/items/wl_ether.png and b/public/images/items/wl_ether.png differ
diff --git a/public/images/items/wl_full_heal.png b/public/images/items/wl_full_heal.png
index 68b8272c08f..215f9801d65 100644
Binary files a/public/images/items/wl_full_heal.png and b/public/images/items/wl_full_heal.png differ
diff --git a/public/images/items/wl_guard_spec.png b/public/images/items/wl_guard_spec.png
index b494123e92e..9d22029e927 100644
Binary files a/public/images/items/wl_guard_spec.png and b/public/images/items/wl_guard_spec.png differ
diff --git a/public/images/items/wl_hyper_potion.png b/public/images/items/wl_hyper_potion.png
index 51e81461da9..1eb075445e4 100644
Binary files a/public/images/items/wl_hyper_potion.png and b/public/images/items/wl_hyper_potion.png differ
diff --git a/public/images/items/wl_ice_heal.png b/public/images/items/wl_ice_heal.png
index e28f3205a80..9ac297c0e7c 100644
Binary files a/public/images/items/wl_ice_heal.png and b/public/images/items/wl_ice_heal.png differ
diff --git a/public/images/items/wl_item_drop.png b/public/images/items/wl_item_drop.png
index fe7ffdbdc1f..73425749670 100644
Binary files a/public/images/items/wl_item_drop.png and b/public/images/items/wl_item_drop.png differ
diff --git a/public/images/items/wl_item_urge.png b/public/images/items/wl_item_urge.png
index 5c291188dee..17a6343058f 100644
Binary files a/public/images/items/wl_item_urge.png and b/public/images/items/wl_item_urge.png differ
diff --git a/public/images/items/wl_max_elixir.png b/public/images/items/wl_max_elixir.png
index ba900bc2e97..4a33dc853fd 100644
Binary files a/public/images/items/wl_max_elixir.png and b/public/images/items/wl_max_elixir.png differ
diff --git a/public/images/items/wl_max_ether.png b/public/images/items/wl_max_ether.png
index 3cd58498fa7..d3f69ce053d 100644
Binary files a/public/images/items/wl_max_ether.png and b/public/images/items/wl_max_ether.png differ
diff --git a/public/images/items/wl_max_potion.png b/public/images/items/wl_max_potion.png
index cf92810943c..6b58c07e86a 100644
Binary files a/public/images/items/wl_max_potion.png and b/public/images/items/wl_max_potion.png differ
diff --git a/public/images/items/wl_max_revive.png b/public/images/items/wl_max_revive.png
index 12e3b263c21..f2eabaa8d5b 100644
Binary files a/public/images/items/wl_max_revive.png and b/public/images/items/wl_max_revive.png differ
diff --git a/public/images/items/wl_paralyze_heal.png b/public/images/items/wl_paralyze_heal.png
index 9a741c705d4..8e89e54c156 100644
Binary files a/public/images/items/wl_paralyze_heal.png and b/public/images/items/wl_paralyze_heal.png differ
diff --git a/public/images/items/wl_potion.png b/public/images/items/wl_potion.png
index 42086fc20ba..619c5d2b014 100644
Binary files a/public/images/items/wl_potion.png and b/public/images/items/wl_potion.png differ
diff --git a/public/images/items/wl_reset_urge.png b/public/images/items/wl_reset_urge.png
index 25ba0dfcdb9..0d2f94504f0 100644
Binary files a/public/images/items/wl_reset_urge.png and b/public/images/items/wl_reset_urge.png differ
diff --git a/public/images/items/wl_revive.png b/public/images/items/wl_revive.png
index c0881125c52..c01b5f68853 100644
Binary files a/public/images/items/wl_revive.png and b/public/images/items/wl_revive.png differ
diff --git a/public/images/items/wl_super_potion.png b/public/images/items/wl_super_potion.png
index da9ccec78ce..eaf60d6c882 100644
Binary files a/public/images/items/wl_super_potion.png and b/public/images/items/wl_super_potion.png differ
diff --git a/public/images/items/x_accuracy.png b/public/images/items/x_accuracy.png
index d119a75f1bb..e7af52fc684 100644
Binary files a/public/images/items/x_accuracy.png and b/public/images/items/x_accuracy.png differ
diff --git a/public/images/items/x_attack.png b/public/images/items/x_attack.png
index 36c76da9486..711aca7269c 100644
Binary files a/public/images/items/x_attack.png and b/public/images/items/x_attack.png differ
diff --git a/public/images/items/x_defense.png b/public/images/items/x_defense.png
index 2eb14b06ffb..ee8d3fa5e2d 100644
Binary files a/public/images/items/x_defense.png and b/public/images/items/x_defense.png differ
diff --git a/public/images/items/x_sp_atk.png b/public/images/items/x_sp_atk.png
index 772f9fe3315..f0e674e4d45 100644
Binary files a/public/images/items/x_sp_atk.png and b/public/images/items/x_sp_atk.png differ
diff --git a/public/images/items/x_sp_def.png b/public/images/items/x_sp_def.png
index 8c9baf03a4c..2ab43574af9 100644
Binary files a/public/images/items/x_sp_def.png and b/public/images/items/x_sp_def.png differ
diff --git a/public/images/items/x_speed.png b/public/images/items/x_speed.png
index cbd1747142f..daebb295d77 100644
Binary files a/public/images/items/x_speed.png and b/public/images/items/x_speed.png differ
diff --git a/public/images/items/zap_plate.png b/public/images/items/zap_plate.png
index e582b41937f..a966fb76cd3 100644
Binary files a/public/images/items/zap_plate.png and b/public/images/items/zap_plate.png differ
diff --git a/public/images/items/zinc.png b/public/images/items/zinc.png
index d2602f43328..c1dfd47a9fc 100644
Binary files a/public/images/items/zinc.png and b/public/images/items/zinc.png differ
diff --git a/public/images/items/zoom_lens.png b/public/images/items/zoom_lens.png
index f46855135bf..30b3ed55bdf 100644
Binary files a/public/images/items/zoom_lens.png and b/public/images/items/zoom_lens.png differ
diff --git a/public/images/pokemon/1011.png b/public/images/pokemon/1011.png
index 39ed4c0d519..035ea0aca44 100644
Binary files a/public/images/pokemon/1011.png and b/public/images/pokemon/1011.png differ
diff --git a/public/images/pokemon/1019.png b/public/images/pokemon/1019.png
index 9c11ccecb89..f29e2df2fcf 100644
Binary files a/public/images/pokemon/1019.png and b/public/images/pokemon/1019.png differ
diff --git a/public/images/pokemon/143-gigantamax.png b/public/images/pokemon/143-gigantamax.png
index aa775df6164..3adc2c148cd 100644
Binary files a/public/images/pokemon/143-gigantamax.png and b/public/images/pokemon/143-gigantamax.png differ
diff --git a/public/images/pokemon/143.png b/public/images/pokemon/143.png
index 8050627a9a1..a09d0533fce 100644
Binary files a/public/images/pokemon/143.png and b/public/images/pokemon/143.png differ
diff --git a/public/images/pokemon/189.png b/public/images/pokemon/189.png
index fb7f53ced67..632366956bb 100644
Binary files a/public/images/pokemon/189.png and b/public/images/pokemon/189.png differ
diff --git a/public/images/pokemon/2038.png b/public/images/pokemon/2038.png
index 71cedc8af13..7e8fd0ea1b2 100644
Binary files a/public/images/pokemon/2038.png and b/public/images/pokemon/2038.png differ
diff --git a/public/images/pokemon/207.png b/public/images/pokemon/207.png
index ec2f862a139..115c41b0673 100644
Binary files a/public/images/pokemon/207.png and b/public/images/pokemon/207.png differ
diff --git a/public/images/pokemon/261.png b/public/images/pokemon/261.png
index 9e47128a545..da22d88806f 100644
Binary files a/public/images/pokemon/261.png and b/public/images/pokemon/261.png differ
diff --git a/public/images/pokemon/313.png b/public/images/pokemon/313.png
index 0a6336ec37b..fb0dd07c924 100644
Binary files a/public/images/pokemon/313.png and b/public/images/pokemon/313.png differ
diff --git a/public/images/pokemon/314.png b/public/images/pokemon/314.png
index 575b962093a..7252a7fb840 100644
Binary files a/public/images/pokemon/314.png and b/public/images/pokemon/314.png differ
diff --git a/public/images/pokemon/332.png b/public/images/pokemon/332.png
index f320ab4c331..a9979480673 100644
Binary files a/public/images/pokemon/332.png and b/public/images/pokemon/332.png differ
diff --git a/public/images/pokemon/335.json b/public/images/pokemon/335.json
index 0279e0fba5a..a9313fcec5d 100644
--- a/public/images/pokemon/335.json
+++ b/public/images/pokemon/335.json
@@ -1,1910 +1,547 @@
-{
-	"textures": [
-		{
-			"image": "335.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 366,
-				"h": 366
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 68,
-						"h": 63
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 68,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 68,
-						"h": 63
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 68,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0035.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 68,
-						"h": 63
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 68,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0056.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 68,
-						"h": 63
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 68,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0079.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 0,
-						"w": 65,
-						"h": 66
-					},
-					"frame": {
-						"x": 0,
-						"y": 63,
-						"w": 65,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0077.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 3,
-						"w": 67,
-						"h": 63
-					},
-					"frame": {
-						"x": 68,
-						"y": 0,
-						"w": 67,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0078.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 3,
-						"w": 67,
-						"h": 63
-					},
-					"frame": {
-						"x": 68,
-						"y": 0,
-						"w": 67,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 5,
-						"w": 68,
-						"h": 61
-					},
-					"frame": {
-						"x": 65,
-						"y": 63,
-						"w": 68,
-						"h": 61
-					}
-				},
-				{
-					"filename": "0033.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 5,
-						"w": 68,
-						"h": 61
-					},
-					"frame": {
-						"x": 65,
-						"y": 63,
-						"w": 68,
-						"h": 61
-					}
-				},
-				{
-					"filename": "0034.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 5,
-						"w": 68,
-						"h": 61
-					},
-					"frame": {
-						"x": 65,
-						"y": 63,
-						"w": 68,
-						"h": 61
-					}
-				},
-				{
-					"filename": "0055.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 5,
-						"w": 68,
-						"h": 61
-					},
-					"frame": {
-						"x": 65,
-						"y": 63,
-						"w": 68,
-						"h": 61
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 64,
-						"h": 63
-					},
-					"frame": {
-						"x": 0,
-						"y": 129,
-						"w": 64,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0036.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 64,
-						"h": 63
-					},
-					"frame": {
-						"x": 0,
-						"y": 129,
-						"w": 64,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0057.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 64,
-						"h": 63
-					},
-					"frame": {
-						"x": 0,
-						"y": 129,
-						"w": 64,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0058.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 64,
-						"h": 63
-					},
-					"frame": {
-						"x": 0,
-						"y": 129,
-						"w": 64,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0080.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 61,
-						"h": 66
-					},
-					"frame": {
-						"x": 0,
-						"y": 192,
-						"w": 61,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0085.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 0,
-						"w": 61,
-						"h": 66
-					},
-					"frame": {
-						"x": 0,
-						"y": 258,
-						"w": 61,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0086.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 0,
-						"w": 61,
-						"h": 66
-					},
-					"frame": {
-						"x": 0,
-						"y": 258,
-						"w": 61,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0069.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 64,
-						"h": 62
-					},
-					"frame": {
-						"x": 135,
-						"y": 0,
-						"w": 64,
-						"h": 62
-					}
-				},
-				{
-					"filename": "0070.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 64,
-						"h": 62
-					},
-					"frame": {
-						"x": 135,
-						"y": 0,
-						"w": 64,
-						"h": 62
-					}
-				},
-				{
-					"filename": "0076.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 5,
-						"w": 65,
-						"h": 61
-					},
-					"frame": {
-						"x": 199,
-						"y": 0,
-						"w": 65,
-						"h": 61
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 8,
-						"w": 67,
-						"h": 58
-					},
-					"frame": {
-						"x": 264,
-						"y": 0,
-						"w": 67,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0032.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 8,
-						"w": 67,
-						"h": 58
-					},
-					"frame": {
-						"x": 264,
-						"y": 0,
-						"w": 67,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0053.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 8,
-						"w": 67,
-						"h": 58
-					},
-					"frame": {
-						"x": 264,
-						"y": 0,
-						"w": 67,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0054.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 8,
-						"w": 67,
-						"h": 58
-					},
-					"frame": {
-						"x": 264,
-						"y": 0,
-						"w": 67,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 7,
-						"w": 64,
-						"h": 59
-					},
-					"frame": {
-						"x": 65,
-						"y": 124,
-						"w": 64,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 7,
-						"w": 64,
-						"h": 59
-					},
-					"frame": {
-						"x": 65,
-						"y": 124,
-						"w": 64,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0031.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 7,
-						"w": 64,
-						"h": 59
-					},
-					"frame": {
-						"x": 65,
-						"y": 124,
-						"w": 64,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0052.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 7,
-						"w": 64,
-						"h": 59
-					},
-					"frame": {
-						"x": 65,
-						"y": 124,
-						"w": 64,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0071.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 64,
-						"h": 61
-					},
-					"frame": {
-						"x": 64,
-						"y": 183,
-						"w": 64,
-						"h": 61
-					}
-				},
-				{
-					"filename": "0087.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 62,
-						"h": 65
-					},
-					"frame": {
-						"x": 61,
-						"y": 244,
-						"w": 62,
-						"h": 65
-					}
-				},
-				{
-					"filename": "0075.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 9,
-						"w": 63,
-						"h": 57
-					},
-					"frame": {
-						"x": 61,
-						"y": 309,
-						"w": 63,
-						"h": 57
-					}
-				},
-				{
-					"filename": "0088.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 61,
-						"h": 64
-					},
-					"frame": {
-						"x": 123,
-						"y": 244,
-						"w": 61,
-						"h": 64
-					}
-				},
-				{
-					"filename": "0072.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 8,
-						"w": 63,
-						"h": 58
-					},
-					"frame": {
-						"x": 124,
-						"y": 308,
-						"w": 63,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 5,
-						"w": 61,
-						"h": 61
-					},
-					"frame": {
-						"x": 128,
-						"y": 183,
-						"w": 61,
-						"h": 61
-					}
-				},
-				{
-					"filename": "0029.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 5,
-						"w": 61,
-						"h": 61
-					},
-					"frame": {
-						"x": 128,
-						"y": 183,
-						"w": 61,
-						"h": 61
-					}
-				},
-				{
-					"filename": "0030.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 5,
-						"w": 61,
-						"h": 61
-					},
-					"frame": {
-						"x": 128,
-						"y": 183,
-						"w": 61,
-						"h": 61
-					}
-				},
-				{
-					"filename": "0051.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 5,
-						"w": 61,
-						"h": 61
-					},
-					"frame": {
-						"x": 128,
-						"y": 183,
-						"w": 61,
-						"h": 61
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 60,
-						"h": 63
-					},
-					"frame": {
-						"x": 184,
-						"y": 244,
-						"w": 60,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 60,
-						"h": 63
-					},
-					"frame": {
-						"x": 184,
-						"y": 244,
-						"w": 60,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 60,
-						"h": 63
-					},
-					"frame": {
-						"x": 184,
-						"y": 244,
-						"w": 60,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 60,
-						"h": 63
-					},
-					"frame": {
-						"x": 184,
-						"y": 244,
-						"w": 60,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 60,
-						"h": 63
-					},
-					"frame": {
-						"x": 184,
-						"y": 244,
-						"w": 60,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 60,
-						"h": 63
-					},
-					"frame": {
-						"x": 184,
-						"y": 244,
-						"w": 60,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 60,
-						"h": 63
-					},
-					"frame": {
-						"x": 184,
-						"y": 244,
-						"w": 60,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 60,
-						"h": 63
-					},
-					"frame": {
-						"x": 184,
-						"y": 244,
-						"w": 60,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 60,
-						"h": 63
-					},
-					"frame": {
-						"x": 184,
-						"y": 244,
-						"w": 60,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 60,
-						"h": 63
-					},
-					"frame": {
-						"x": 184,
-						"y": 244,
-						"w": 60,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 60,
-						"h": 63
-					},
-					"frame": {
-						"x": 184,
-						"y": 244,
-						"w": 60,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 60,
-						"h": 63
-					},
-					"frame": {
-						"x": 184,
-						"y": 244,
-						"w": 60,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0025.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 60,
-						"h": 63
-					},
-					"frame": {
-						"x": 184,
-						"y": 244,
-						"w": 60,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0026.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 60,
-						"h": 63
-					},
-					"frame": {
-						"x": 184,
-						"y": 244,
-						"w": 60,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0027.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 60,
-						"h": 63
-					},
-					"frame": {
-						"x": 184,
-						"y": 244,
-						"w": 60,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0028.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 60,
-						"h": 63
-					},
-					"frame": {
-						"x": 184,
-						"y": 244,
-						"w": 60,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0037.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 60,
-						"h": 63
-					},
-					"frame": {
-						"x": 184,
-						"y": 244,
-						"w": 60,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0038.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 60,
-						"h": 63
-					},
-					"frame": {
-						"x": 184,
-						"y": 244,
-						"w": 60,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0043.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 60,
-						"h": 63
-					},
-					"frame": {
-						"x": 184,
-						"y": 244,
-						"w": 60,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0044.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 60,
-						"h": 63
-					},
-					"frame": {
-						"x": 184,
-						"y": 244,
-						"w": 60,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0045.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 60,
-						"h": 63
-					},
-					"frame": {
-						"x": 184,
-						"y": 244,
-						"w": 60,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0046.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 60,
-						"h": 63
-					},
-					"frame": {
-						"x": 184,
-						"y": 244,
-						"w": 60,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0047.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 60,
-						"h": 63
-					},
-					"frame": {
-						"x": 184,
-						"y": 244,
-						"w": 60,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0048.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 60,
-						"h": 63
-					},
-					"frame": {
-						"x": 184,
-						"y": 244,
-						"w": 60,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0049.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 60,
-						"h": 63
-					},
-					"frame": {
-						"x": 184,
-						"y": 244,
-						"w": 60,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0050.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 60,
-						"h": 63
-					},
-					"frame": {
-						"x": 184,
-						"y": 244,
-						"w": 60,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0059.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 60,
-						"h": 63
-					},
-					"frame": {
-						"x": 184,
-						"y": 244,
-						"w": 60,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0064.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 60,
-						"h": 63
-					},
-					"frame": {
-						"x": 184,
-						"y": 244,
-						"w": 60,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0073.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 9,
-						"w": 62,
-						"h": 57
-					},
-					"frame": {
-						"x": 187,
-						"y": 307,
-						"w": 62,
-						"h": 57
-					}
-				},
-				{
-					"filename": "0074.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 9,
-						"w": 62,
-						"h": 57
-					},
-					"frame": {
-						"x": 187,
-						"y": 307,
-						"w": 62,
-						"h": 57
-					}
-				},
-				{
-					"filename": "0068.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 62,
-						"h": 63
-					},
-					"frame": {
-						"x": 264,
-						"y": 58,
-						"w": 62,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 55,
-						"h": 63
-					},
-					"frame": {
-						"x": 133,
-						"y": 63,
-						"w": 55,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 55,
-						"h": 63
-					},
-					"frame": {
-						"x": 133,
-						"y": 63,
-						"w": 55,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0039.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 55,
-						"h": 63
-					},
-					"frame": {
-						"x": 133,
-						"y": 63,
-						"w": 55,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0060.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 55,
-						"h": 63
-					},
-					"frame": {
-						"x": 133,
-						"y": 63,
-						"w": 55,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0081.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 0,
-						"w": 55,
-						"h": 66
-					},
-					"frame": {
-						"x": 188,
-						"y": 62,
-						"w": 55,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0082.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 0,
-						"w": 55,
-						"h": 66
-					},
-					"frame": {
-						"x": 188,
-						"y": 62,
-						"w": 55,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0083.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 0,
-						"w": 58,
-						"h": 66
-					},
-					"frame": {
-						"x": 189,
-						"y": 128,
-						"w": 58,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0084.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 0,
-						"w": 60,
-						"h": 66
-					},
-					"frame": {
-						"x": 247,
-						"y": 121,
-						"w": 60,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 59,
-						"h": 63
-					},
-					"frame": {
-						"x": 307,
-						"y": 121,
-						"w": 59,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0041.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 59,
-						"h": 63
-					},
-					"frame": {
-						"x": 307,
-						"y": 121,
-						"w": 59,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0042.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 59,
-						"h": 63
-					},
-					"frame": {
-						"x": 307,
-						"y": 121,
-						"w": 59,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0063.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 59,
-						"h": 63
-					},
-					"frame": {
-						"x": 307,
-						"y": 121,
-						"w": 59,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0065.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 60,
-						"h": 63
-					},
-					"frame": {
-						"x": 247,
-						"y": 187,
-						"w": 60,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0066.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 60,
-						"h": 63
-					},
-					"frame": {
-						"x": 247,
-						"y": 187,
-						"w": 60,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0089.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 60,
-						"h": 63
-					},
-					"frame": {
-						"x": 247,
-						"y": 187,
-						"w": 60,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0090.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 60,
-						"h": 63
-					},
-					"frame": {
-						"x": 247,
-						"y": 187,
-						"w": 60,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 58,
-						"h": 63
-					},
-					"frame": {
-						"x": 307,
-						"y": 184,
-						"w": 58,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0040.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 58,
-						"h": 63
-					},
-					"frame": {
-						"x": 307,
-						"y": 184,
-						"w": 58,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0061.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 58,
-						"h": 63
-					},
-					"frame": {
-						"x": 307,
-						"y": 184,
-						"w": 58,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0062.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 58,
-						"h": 63
-					},
-					"frame": {
-						"x": 307,
-						"y": 184,
-						"w": 58,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0067.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 60,
-						"h": 63
-					},
-					"frame": {
-						"x": 249,
-						"y": 250,
-						"w": 60,
-						"h": 63
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:9c4e9647cd30b406386dcfa45795951c:b817a280fcd689ce74ea32e378a31e74:40bb9f4809624b12bf79bbfe664bea73$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 314, "y": 126, "w": 58, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 58, "h": 61 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 314, "y": 126, "w": 58, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 58, "h": 61 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 314, "y": 126, "w": 58, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 58, "h": 61 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 314, "y": 126, "w": 58, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 58, "h": 61 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 314, "y": 126, "w": 58, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 58, "h": 61 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 0, "y": 185, "w": 59, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 7, "w": 59, "h": 59 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 119, "y": 182, "w": 62, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 9, "w": 62, "h": 57 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 119, "y": 125, "w": 64, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 10, "w": 64, "h": 57 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 195, "y": 0, "w": 66, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 7, "w": 66, "h": 60 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 129, "y": 0, "w": 66, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 66, "h": 61 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 320, "y": 0, "w": 62, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 62, "h": 61 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 314, "y": 126, "w": 58, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 58, "h": 61 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 0, "y": 244, "w": 53, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 53, "h": 61 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 59, "y": 188, "w": 56, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 56, "h": 61 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 306, "y": 187, "w": 57, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 57, "h": 61 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 314, "y": 126, "w": 58, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 58, "h": 61 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 314, "y": 126, "w": 58, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 58, "h": 61 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 314, "y": 126, "w": 58, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 58, "h": 61 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 314, "y": 126, "w": 58, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 58, "h": 61 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 314, "y": 126, "w": 58, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 58, "h": 61 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 0, "y": 185, "w": 59, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 7, "w": 59, "h": 59 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 119, "y": 182, "w": 62, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 9, "w": 62, "h": 57 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 119, "y": 125, "w": 64, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 10, "w": 64, "h": 57 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 195, "y": 0, "w": 66, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 7, "w": 66, "h": 60 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 129, "y": 0, "w": 66, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 66, "h": 61 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 320, "y": 0, "w": 62, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 62, "h": 61 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 314, "y": 126, "w": 58, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 58, "h": 61 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 0, "y": 244, "w": 53, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 53, "h": 61 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 59, "y": 188, "w": 56, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 56, "h": 61 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 306, "y": 187, "w": 57, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 57, "h": 61 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 314, "y": 126, "w": 58, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 58, "h": 61 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 314, "y": 126, "w": 58, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 58, "h": 61 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 314, "y": 126, "w": 58, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 58, "h": 61 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 314, "y": 126, "w": 58, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 58, "h": 61 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 314, "y": 126, "w": 58, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 58, "h": 61 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 0, "y": 185, "w": 59, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 7, "w": 59, "h": 59 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 119, "y": 182, "w": 62, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 9, "w": 62, "h": 57 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 119, "y": 125, "w": 64, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 10, "w": 64, "h": 57 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 195, "y": 0, "w": 66, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 7, "w": 66, "h": 60 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 129, "y": 0, "w": 66, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 66, "h": 61 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 320, "y": 0, "w": 62, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 62, "h": 61 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 314, "y": 126, "w": 58, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 58, "h": 61 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 0, "y": 244, "w": 53, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 53, "h": 61 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 59, "y": 188, "w": 56, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 56, "h": 61 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 306, "y": 187, "w": 57, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 57, "h": 61 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 314, "y": 126, "w": 58, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 58, "h": 61 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 314, "y": 126, "w": 58, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 58, "h": 61 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 314, "y": 126, "w": 58, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 58, "h": 61 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 314, "y": 126, "w": 58, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 58, "h": 61 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 314, "y": 126, "w": 58, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 58, "h": 61 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 248, "y": 129, "w": 58, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 58, "h": 61 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 188, "y": 123, "w": 60, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 60, "h": 61 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 0, "y": 125, "w": 61, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 6, "w": 61, "h": 60 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 0, "y": 66, "w": 63, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 63, "h": 59 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 234, "y": 190, "w": 61, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 10, "w": 61, "h": 56 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 234, "y": 246, "w": 60, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 11, "w": 60, "h": 55 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 115, "y": 239, "w": 61, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 11, "w": 61, "h": 56 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 63, "y": 62, "w": 62, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 7, "w": 62, "h": 60 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 63, "y": 0, "w": 66, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 4, "w": 66, "h": 62 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 0, "y": 0, "w": 63, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 63, "h": 66 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 261, "y": 0, "w": 59, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 59, "h": 66 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 181, "y": 184, "w": 53, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 0, "w": 53, "h": 66 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 63, "y": 122, "w": 56, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 0, "w": 56, "h": 66 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 320, "y": 61, "w": 58, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 1, "w": 58, "h": 65 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 129, "y": 61, "w": 59, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 59, "h": 64 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 195, "y": 60, "w": 60, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 60, "h": 63 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 255, "y": 66, "w": 59, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 59, "h": 63 },
+    "sourceSize": { "w": 74, "h": 67 }
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.9.2-x64",
+  "image": "335.png",
+  "format": "I8",
+  "size": { "w": 382, "h": 305 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/335.png b/public/images/pokemon/335.png
index e5d051dd850..65b56582339 100644
Binary files a/public/images/pokemon/335.png and b/public/images/pokemon/335.png differ
diff --git a/public/images/pokemon/34.png b/public/images/pokemon/34.png
index 3eec3a66805..e697a987354 100644
Binary files a/public/images/pokemon/34.png and b/public/images/pokemon/34.png differ
diff --git a/public/images/pokemon/396.png b/public/images/pokemon/396.png
index 5f42fc90461..34033368ac6 100644
Binary files a/public/images/pokemon/396.png and b/public/images/pokemon/396.png differ
diff --git a/public/images/pokemon/397.png b/public/images/pokemon/397.png
index 0197ee7182e..e9d14db7eab 100644
Binary files a/public/images/pokemon/397.png and b/public/images/pokemon/397.png differ
diff --git a/public/images/pokemon/398.png b/public/images/pokemon/398.png
index 55f8c7c09a3..d1adb74b7ca 100644
Binary files a/public/images/pokemon/398.png and b/public/images/pokemon/398.png differ
diff --git a/public/images/pokemon/404.png b/public/images/pokemon/404.png
index 50038f7a17c..c3c77be70db 100644
Binary files a/public/images/pokemon/404.png and b/public/images/pokemon/404.png differ
diff --git a/public/images/pokemon/417.png b/public/images/pokemon/417.png
index 6d7100f66fe..02cffd1c73f 100644
Binary files a/public/images/pokemon/417.png and b/public/images/pokemon/417.png differ
diff --git a/public/images/pokemon/420.png b/public/images/pokemon/420.png
index 4b76cdfcd21..8cf4dfd0bfc 100644
Binary files a/public/images/pokemon/420.png and b/public/images/pokemon/420.png differ
diff --git a/public/images/pokemon/421-overcast.png b/public/images/pokemon/421-overcast.png
index fb91ea937f1..82b66fd07f9 100644
Binary files a/public/images/pokemon/421-overcast.png and b/public/images/pokemon/421-overcast.png differ
diff --git a/public/images/pokemon/421-sunshine.png b/public/images/pokemon/421-sunshine.png
index 3ab91a47ca6..9da091ae12a 100644
Binary files a/public/images/pokemon/421-sunshine.png and b/public/images/pokemon/421-sunshine.png differ
diff --git a/public/images/pokemon/446.png b/public/images/pokemon/446.png
index 40795f6cd17..523d790a89c 100644
Binary files a/public/images/pokemon/446.png and b/public/images/pokemon/446.png differ
diff --git a/public/images/pokemon/472.png b/public/images/pokemon/472.png
index cc13377bd53..eefd055ffc3 100644
Binary files a/public/images/pokemon/472.png and b/public/images/pokemon/472.png differ
diff --git a/public/images/pokemon/477.png b/public/images/pokemon/477.png
index de140bf6ba9..1013ca3d0dd 100644
Binary files a/public/images/pokemon/477.png and b/public/images/pokemon/477.png differ
diff --git a/public/images/pokemon/498.png b/public/images/pokemon/498.png
index d45f8988cc0..f019a1f38b3 100644
Binary files a/public/images/pokemon/498.png and b/public/images/pokemon/498.png differ
diff --git a/public/images/pokemon/499.png b/public/images/pokemon/499.png
index c8232f9bb34..8f2f76ca6bb 100644
Binary files a/public/images/pokemon/499.png and b/public/images/pokemon/499.png differ
diff --git a/public/images/pokemon/500.png b/public/images/pokemon/500.png
index 9d388d33640..ae842c38bcd 100644
Binary files a/public/images/pokemon/500.png and b/public/images/pokemon/500.png differ
diff --git a/public/images/pokemon/511.png b/public/images/pokemon/511.png
index ebf4b069b23..77ba327fd12 100644
Binary files a/public/images/pokemon/511.png and b/public/images/pokemon/511.png differ
diff --git a/public/images/pokemon/512.png b/public/images/pokemon/512.png
index 94ae881fdb2..58870d253cb 100644
Binary files a/public/images/pokemon/512.png and b/public/images/pokemon/512.png differ
diff --git a/public/images/pokemon/513.png b/public/images/pokemon/513.png
index f8d6e6017de..99f2fccc23e 100644
Binary files a/public/images/pokemon/513.png and b/public/images/pokemon/513.png differ
diff --git a/public/images/pokemon/514.png b/public/images/pokemon/514.png
index 87a2ece7f6d..57216c76e08 100644
Binary files a/public/images/pokemon/514.png and b/public/images/pokemon/514.png differ
diff --git a/public/images/pokemon/515.png b/public/images/pokemon/515.png
index 3dc40ff122d..e6187568544 100644
Binary files a/public/images/pokemon/515.png and b/public/images/pokemon/515.png differ
diff --git a/public/images/pokemon/516.png b/public/images/pokemon/516.png
index c13615fa119..cd4d5d64392 100644
Binary files a/public/images/pokemon/516.png and b/public/images/pokemon/516.png differ
diff --git a/public/images/pokemon/522.png b/public/images/pokemon/522.png
index 3e545afc925..64ca1253304 100644
Binary files a/public/images/pokemon/522.png and b/public/images/pokemon/522.png differ
diff --git a/public/images/pokemon/523.png b/public/images/pokemon/523.png
index 49674e2ee8b..3c491927a02 100644
Binary files a/public/images/pokemon/523.png and b/public/images/pokemon/523.png differ
diff --git a/public/images/pokemon/535.png b/public/images/pokemon/535.png
index afa9cfb10ee..b8a82d204c5 100644
Binary files a/public/images/pokemon/535.png and b/public/images/pokemon/535.png differ
diff --git a/public/images/pokemon/536.png b/public/images/pokemon/536.png
index bbc6d6b548c..90202df0339 100644
Binary files a/public/images/pokemon/536.png and b/public/images/pokemon/536.png differ
diff --git a/public/images/pokemon/537.png b/public/images/pokemon/537.png
index 9b70ea2eafe..906b546cf42 100644
Binary files a/public/images/pokemon/537.png and b/public/images/pokemon/537.png differ
diff --git a/public/images/pokemon/554.png b/public/images/pokemon/554.png
index d2483d4cec7..b0c4bb10335 100644
Binary files a/public/images/pokemon/554.png and b/public/images/pokemon/554.png differ
diff --git a/public/images/pokemon/555-zen.png b/public/images/pokemon/555-zen.png
index e94c779abce..48cbf58a17a 100644
Binary files a/public/images/pokemon/555-zen.png and b/public/images/pokemon/555-zen.png differ
diff --git a/public/images/pokemon/555.png b/public/images/pokemon/555.png
index 0843ef0026b..0ec02846a6a 100644
Binary files a/public/images/pokemon/555.png and b/public/images/pokemon/555.png differ
diff --git a/public/images/pokemon/566.png b/public/images/pokemon/566.png
index 67b5f09c056..e54a8680298 100644
Binary files a/public/images/pokemon/566.png and b/public/images/pokemon/566.png differ
diff --git a/public/images/pokemon/572.png b/public/images/pokemon/572.png
index ba9446aa9d2..32f01341e2f 100644
Binary files a/public/images/pokemon/572.png and b/public/images/pokemon/572.png differ
diff --git a/public/images/pokemon/573.png b/public/images/pokemon/573.png
index b827c23d78e..a33172fe8d3 100644
Binary files a/public/images/pokemon/573.png and b/public/images/pokemon/573.png differ
diff --git a/public/images/pokemon/626.png b/public/images/pokemon/626.png
index 281119efdc2..542cefe41bb 100644
Binary files a/public/images/pokemon/626.png and b/public/images/pokemon/626.png differ
diff --git a/public/images/pokemon/643.png b/public/images/pokemon/643.png
index b7c21248166..30d993791ab 100644
Binary files a/public/images/pokemon/643.png and b/public/images/pokemon/643.png differ
diff --git a/public/images/pokemon/644.png b/public/images/pokemon/644.png
index 4ccbb7700d5..14fce7e0bab 100644
Binary files a/public/images/pokemon/644.png and b/public/images/pokemon/644.png differ
diff --git a/public/images/pokemon/646-black.png b/public/images/pokemon/646-black.png
index 4c45fcf2a03..f5ad11ddcac 100644
Binary files a/public/images/pokemon/646-black.png and b/public/images/pokemon/646-black.png differ
diff --git a/public/images/pokemon/646-white.png b/public/images/pokemon/646-white.png
index 0de658c5a39..9907f8e278c 100644
Binary files a/public/images/pokemon/646-white.png and b/public/images/pokemon/646-white.png differ
diff --git a/public/images/pokemon/656.json b/public/images/pokemon/656.json
index 9f2483c56b9..3776b4ed7e5 100644
--- a/public/images/pokemon/656.json
+++ b/public/images/pokemon/656.json
@@ -1,41 +1,20 @@
-{
-	"textures": [
-		{
-			"image": "656.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 35,
-				"h": 35
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:25355f0b039f39b6231cb75c6f8a0200:2e119e5dd64fab6d996ea751c24a38e0:9c4d208e6c2f857bfb0b23b8eea3326c$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 1, "y": 1, "w": 32, "h": 35 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 32, "h": 35 },
+    "sourceSize": { "w": 32, "h": 35 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "656.png",
+  "format": "I8",
+  "size": { "w": 34, "h": 37 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/656.png b/public/images/pokemon/656.png
index b653616955d..06a9cd58268 100644
Binary files a/public/images/pokemon/656.png and b/public/images/pokemon/656.png differ
diff --git a/public/images/pokemon/666-continental.png b/public/images/pokemon/666-continental.png
index 1bd15dbb70d..b45f5c4e76d 100644
Binary files a/public/images/pokemon/666-continental.png and b/public/images/pokemon/666-continental.png differ
diff --git a/public/images/pokemon/666-fancy.png b/public/images/pokemon/666-fancy.png
index ec5e8a5f6e8..9e40deb3568 100644
Binary files a/public/images/pokemon/666-fancy.png and b/public/images/pokemon/666-fancy.png differ
diff --git a/public/images/pokemon/666-high-plains.png b/public/images/pokemon/666-high-plains.png
index c294984e469..45cb22fc592 100644
Binary files a/public/images/pokemon/666-high-plains.png and b/public/images/pokemon/666-high-plains.png differ
diff --git a/public/images/pokemon/666-river.png b/public/images/pokemon/666-river.png
index eeabeecb069..ca93fd612b7 100644
Binary files a/public/images/pokemon/666-river.png and b/public/images/pokemon/666-river.png differ
diff --git a/public/images/pokemon/668-female.json b/public/images/pokemon/668-female.json
deleted file mode 100644
index 13d67c90194..00000000000
--- a/public/images/pokemon/668-female.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "668-female.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 72,
-				"h": 72
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 63,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 63,
-						"h": 72
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 63,
-						"h": 72
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:3f88e039152d4a967a218cb721938610:e6991ce9c3bad348cbc05ebf9b440302:d99ed0e84a0695b54e479aa98271aba1$"
-	}
-}
diff --git a/public/images/pokemon/668-female.png b/public/images/pokemon/668-female.png
deleted file mode 100644
index c8f4e205491..00000000000
Binary files a/public/images/pokemon/668-female.png and /dev/null differ
diff --git a/public/images/pokemon/674.json b/public/images/pokemon/674.json
index 9534a585c64..9954c30188d 100644
--- a/public/images/pokemon/674.json
+++ b/public/images/pokemon/674.json
@@ -1,41 +1,506 @@
-{
-	"textures": [
-		{
-			"image": "674.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 42,
-				"h": 42
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 28,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 28,
-						"h": 42
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 28,
-						"h": 42
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:17675dc9d79a224d5cfe26d4ea11594d:afc8db52143597fb62ac44c9a1600a80:b823d10f1c9b4d501296982088ba63d6$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 0, "y": 0, "w": 29, "h": 42 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 29, "y": 0, "w": 29, "h": 42 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 70
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 58, "y": 0, "w": 29, "h": 42 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 87, "y": 0, "w": 29, "h": 42 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 210
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 58, "y": 0, "w": 29, "h": 42 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 29, "y": 0, "w": 29, "h": 42 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 0, "y": 0, "w": 29, "h": 42 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 29, "y": 0, "w": 29, "h": 42 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 70
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 58, "y": 0, "w": 29, "h": 42 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 87, "y": 0, "w": 29, "h": 42 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 210
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 58, "y": 0, "w": 29, "h": 42 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 29, "y": 0, "w": 29, "h": 42 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 0, "y": 0, "w": 29, "h": 42 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 29, "y": 0, "w": 29, "h": 42 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 70
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 58, "y": 0, "w": 29, "h": 42 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 87, "y": 0, "w": 29, "h": 42 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 210
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 58, "y": 0, "w": 29, "h": 42 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 29, "y": 0, "w": 29, "h": 42 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 0, "y": 0, "w": 29, "h": 42 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 29, "y": 0, "w": 29, "h": 42 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 70
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 58, "y": 0, "w": 29, "h": 42 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 87, "y": 0, "w": 29, "h": 42 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 210
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 58, "y": 0, "w": 29, "h": 42 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 29, "y": 0, "w": 29, "h": 42 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 0, "y": 0, "w": 29, "h": 42 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 29, "y": 0, "w": 29, "h": 42 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 70
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 58, "y": 0, "w": 29, "h": 42 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 87, "y": 0, "w": 29, "h": 42 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 210
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 58, "y": 0, "w": 29, "h": 42 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 29, "y": 0, "w": 29, "h": 42 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 0, "y": 42, "w": 29, "h": 42 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 29, "y": 42, "w": 29, "h": 42 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 70
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 58, "y": 42, "w": 29, "h": 42 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 87, "y": 42, "w": 29, "h": 42 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 210
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 58, "y": 42, "w": 29, "h": 42 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 0, "y": 84, "w": 29, "h": 42 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 29, "y": 84, "w": 29, "h": 42 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 58, "y": 84, "w": 29, "h": 42 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 70
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 87, "y": 84, "w": 29, "h": 42 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 0, "y": 126, "w": 29, "h": 42 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 210
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 87, "y": 84, "w": 29, "h": 42 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 58, "y": 84, "w": 29, "h": 42 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 29, "y": 84, "w": 29, "h": 42 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 58, "y": 84, "w": 29, "h": 42 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 70
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 87, "y": 84, "w": 29, "h": 42 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 0, "y": 126, "w": 29, "h": 42 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 210
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 87, "y": 84, "w": 29, "h": 42 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 58, "y": 84, "w": 29, "h": 42 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 29, "y": 84, "w": 29, "h": 42 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 0, "y": 84, "w": 29, "h": 42 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 70
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 58, "y": 42, "w": 29, "h": 42 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 87, "y": 42, "w": 29, "h": 42 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 210
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 29, "y": 126, "w": 29, "h": 42 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 70
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 29, "y": 0, "w": 29, "h": 42 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 58, "y": 126, "w": 29, "h": 42 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 70
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.11-x64",
+  "image": "674.png",
+  "format": "I8",
+  "size": { "w": 116, "h": 168 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/674.png b/public/images/pokemon/674.png
index 3161096bb29..85b2fafb91b 100644
Binary files a/public/images/pokemon/674.png and b/public/images/pokemon/674.png differ
diff --git a/public/images/pokemon/692.json b/public/images/pokemon/692.json
index a06bb0c77b7..125642a01f1 100644
--- a/public/images/pokemon/692.json
+++ b/public/images/pokemon/692.json
@@ -1,41 +1,20 @@
-{
-	"textures": [
-		{
-			"image": "692.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 56,
-				"h": 56
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 56,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 56,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 56,
-						"h": 35
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:031fb8fbcf9162adb44c0a90fd2cc110:44a2bd195c730b2d35c3ad898e1b3672:2880def858c84cd859bedf13b0b49a33$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 121, "y": 36, "w": 56, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "692.png",
+  "format": "I8",
+  "size": { "w": 239, "h": 106 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/692.png b/public/images/pokemon/692.png
index ce0cb4d3243..a22655931a8 100644
Binary files a/public/images/pokemon/692.png and b/public/images/pokemon/692.png differ
diff --git a/public/images/pokemon/694.json b/public/images/pokemon/694.json
index c770e137915..48e9623d7f4 100644
--- a/public/images/pokemon/694.json
+++ b/public/images/pokemon/694.json
@@ -1,41 +1,767 @@
-{
-	"textures": [
-		{
-			"image": "694.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 41,
-				"h": 41
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 41,
-						"h": 38
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 38
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 38
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:a121458917a5069ac5fcf0438e46af2b:afcd331d4ef231f539d602827ea66e55:b0990f9650cfe63b836cbed33f0b44d8$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 41, "y": 176, "w": 41, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 12, "w": 41, "h": 38 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 158, "y": 137, "w": 42, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 12, "w": 42, "h": 38 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 0, "y": 133, "w": 43, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 12, "w": 43, "h": 38 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 114, "y": 132, "w": 44, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 12, "w": 44, "h": 38 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 0, "y": 95, "w": 45, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 12, "w": 45, "h": 38 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 227, "y": 131, "w": 46, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 13, "w": 46, "h": 37 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 273, "y": 136, "w": 44, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 13, "w": 44, "h": 37 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 82, "y": 208, "w": 41, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 13, "w": 41, "h": 37 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 246, "y": 211, "w": 39, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 13, "w": 39, "h": 37 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 207, "y": 211, "w": 39, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 13, "w": 39, "h": 37 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 285, "y": 211, "w": 38, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 13, "w": 38, "h": 37 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 123, "y": 213, "w": 39, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 14, "w": 39, "h": 36 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 0, "y": 209, "w": 40, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 13, "w": 40, "h": 37 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 167, "y": 206, "w": 40, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 12, "w": 40, "h": 38 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 200, "y": 168, "w": 41, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 12, "w": 41, "h": 38 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 41, "y": 176, "w": 41, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 12, "w": 41, "h": 38 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 158, "y": 137, "w": 42, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 12, "w": 42, "h": 38 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 0, "y": 133, "w": 43, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 12, "w": 43, "h": 38 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 114, "y": 132, "w": 44, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 12, "w": 44, "h": 38 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 0, "y": 95, "w": 45, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 12, "w": 45, "h": 38 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 227, "y": 131, "w": 46, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 13, "w": 46, "h": 37 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 273, "y": 136, "w": 44, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 13, "w": 44, "h": 37 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 82, "y": 208, "w": 41, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 13, "w": 41, "h": 37 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 246, "y": 211, "w": 39, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 13, "w": 39, "h": 37 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 207, "y": 211, "w": 39, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 13, "w": 39, "h": 37 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 285, "y": 211, "w": 38, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 13, "w": 38, "h": 37 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 123, "y": 213, "w": 39, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 14, "w": 39, "h": 36 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 0, "y": 209, "w": 40, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 13, "w": 40, "h": 37 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 167, "y": 206, "w": 40, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 12, "w": 40, "h": 38 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 200, "y": 168, "w": 41, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 12, "w": 41, "h": 38 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 41, "y": 176, "w": 41, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 12, "w": 41, "h": 38 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 158, "y": 137, "w": 42, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 12, "w": 42, "h": 38 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 0, "y": 133, "w": 43, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 12, "w": 43, "h": 38 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 114, "y": 132, "w": 44, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 12, "w": 44, "h": 38 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 0, "y": 95, "w": 45, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 12, "w": 45, "h": 38 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 227, "y": 131, "w": 46, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 13, "w": 46, "h": 37 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 273, "y": 136, "w": 44, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 13, "w": 44, "h": 37 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 82, "y": 208, "w": 41, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 13, "w": 41, "h": 37 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 246, "y": 211, "w": 39, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 13, "w": 39, "h": 37 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 207, "y": 211, "w": 39, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 13, "w": 39, "h": 37 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 285, "y": 211, "w": 38, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 13, "w": 38, "h": 37 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 123, "y": 213, "w": 39, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 14, "w": 39, "h": 36 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 0, "y": 209, "w": 40, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 13, "w": 40, "h": 37 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 167, "y": 206, "w": 40, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 12, "w": 40, "h": 38 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 200, "y": 168, "w": 41, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 12, "w": 41, "h": 38 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 41, "y": 176, "w": 41, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 12, "w": 41, "h": 38 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 158, "y": 137, "w": 42, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 12, "w": 42, "h": 38 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 0, "y": 133, "w": 43, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 12, "w": 43, "h": 38 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 114, "y": 132, "w": 44, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 12, "w": 44, "h": 38 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 0, "y": 95, "w": 45, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 12, "w": 45, "h": 38 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 227, "y": 131, "w": 46, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 13, "w": 46, "h": 37 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 273, "y": 136, "w": 44, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 13, "w": 44, "h": 37 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 82, "y": 208, "w": 41, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 13, "w": 41, "h": 37 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 246, "y": 211, "w": 39, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 13, "w": 39, "h": 37 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 207, "y": 211, "w": 39, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 13, "w": 39, "h": 37 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 285, "y": 211, "w": 38, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 13, "w": 38, "h": 37 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 123, "y": 213, "w": 39, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 14, "w": 39, "h": 36 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 0, "y": 209, "w": 40, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 13, "w": 40, "h": 37 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 167, "y": 206, "w": 40, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 12, "w": 40, "h": 38 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 200, "y": 168, "w": 41, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 12, "w": 41, "h": 38 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 41, "y": 176, "w": 41, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 12, "w": 41, "h": 38 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 282, "y": 173, "w": 41, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 12, "w": 41, "h": 38 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 241, "y": 173, "w": 41, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 12, "w": 41, "h": 38 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 0, "y": 171, "w": 41, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 12, "w": 41, "h": 38 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 85, "y": 170, "w": 41, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 12, "w": 41, "h": 38 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 227, "y": 93, "w": 52, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 12, "w": 52, "h": 38 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 57, "y": 50, "w": 55, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 11, "w": 55, "h": 39 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 56, "y": 0, "w": 56, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 56, "h": 50 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 112, "y": 0, "w": 56, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 56, "h": 49 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 0, "y": 0, "w": 56, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 56, "h": 50 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 224, "y": 47, "w": 57, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 281, "y": 46, "w": 57, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 57, "h": 46 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 168, "y": 0, "w": 56, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 2, "w": 56, "h": 48 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 281, "y": 0, "w": 57, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 57, "h": 46 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 170, "y": 93, "w": 57, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 57, "h": 44 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 224, "y": 0, "w": 57, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 57, "h": 47 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 0, "y": 50, "w": 57, "h": 45 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 57, "h": 45 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 281, "y": 92, "w": 57, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 6, "w": 57, "h": 44 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 57, "y": 94, "w": 57, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 6, "w": 57, "h": 44 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 112, "y": 49, "w": 58, "h": 45 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 58, "h": 45 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 114, "y": 94, "w": 56, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 12, "w": 56, "h": 38 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 170, "y": 48, "w": 53, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 12, "w": 53, "h": 38 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 126, "y": 175, "w": 41, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 12, "w": 41, "h": 38 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 43, "y": 138, "w": 42, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 12, "w": 42, "h": 38 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.11-x64",
+  "image": "694.png",
+  "format": "I8",
+  "size": { "w": 338, "h": 249 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/694.png b/public/images/pokemon/694.png
index 2659476db8a..fbd210e7d89 100644
Binary files a/public/images/pokemon/694.png and b/public/images/pokemon/694.png differ
diff --git a/public/images/pokemon/698.json b/public/images/pokemon/698.json
index 34938139984..6baf41b0ce7 100644
--- a/public/images/pokemon/698.json
+++ b/public/images/pokemon/698.json
@@ -1,41 +1,1415 @@
-{
-	"textures": [
-		{
-			"image": "698.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 57,
-				"h": 57
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 57
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 57
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 57
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:563dc7193ff897a6bf95dc8334febb0f:0dc4e9f203f0efed6323a93621a24f2c:198087d69fed44d4a642fa3ba5c077d6$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 93, "y": 56, "w": 32, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 93, "y": 56, "w": 32, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 30, "y": 114, "w": 31, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 31, "h": 57 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 30, "y": 114, "w": 31, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 31, "h": 57 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 123, "y": 113, "w": 29, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 4, "w": 29, "h": 56 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 123, "y": 113, "w": 29, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 4, "w": 29, "h": 56 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 123, "y": 169, "w": 28, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 28, "h": 55 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 123, "y": 169, "w": 28, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 28, "h": 55 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 125, "y": 56, "w": 27, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 6, "w": 27, "h": 54 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 125, "y": 56, "w": 27, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 6, "w": 27, "h": 54 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 125, "y": 56, "w": 27, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 6, "w": 27, "h": 54 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 123, "y": 169, "w": 28, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 28, "h": 55 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 123, "y": 169, "w": 28, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 28, "h": 55 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 123, "y": 113, "w": 29, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 4, "w": 29, "h": 56 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 123, "y": 113, "w": 29, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 4, "w": 29, "h": 56 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 30, "y": 114, "w": 31, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 31, "h": 57 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 30, "y": 114, "w": 31, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 31, "h": 57 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 93, "y": 56, "w": 32, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 93, "y": 56, "w": 32, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 93, "y": 56, "w": 32, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 93, "y": 56, "w": 32, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 93, "y": 56, "w": 32, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 111, "y": 0, "w": 34, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 34, "h": 56 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 111, "y": 0, "w": 34, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 34, "h": 56 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 75, "y": 0, "w": 36, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 36, "h": 55 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 75, "y": 0, "w": 36, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 36, "h": 55 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 38, "y": 0, "w": 37, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 37, "h": 54 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 38, "y": 0, "w": 37, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 37, "h": 54 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 0, "y": 0, "w": 38, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 38, "h": 53 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 0, "y": 0, "w": 38, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 38, "h": 53 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 0, "y": 0, "w": 38, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 38, "h": 53 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 38, "y": 0, "w": 37, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 37, "h": 54 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 38, "y": 0, "w": 37, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 37, "h": 54 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 75, "y": 0, "w": 36, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 36, "h": 55 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 75, "y": 0, "w": 36, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 36, "h": 55 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 111, "y": 0, "w": 34, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 34, "h": 56 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 111, "y": 0, "w": 34, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 34, "h": 56 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 93, "y": 56, "w": 32, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 93, "y": 56, "w": 32, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 93, "y": 56, "w": 32, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 93, "y": 56, "w": 32, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 93, "y": 56, "w": 32, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 30, "y": 114, "w": 31, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 31, "h": 57 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 30, "y": 114, "w": 31, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 31, "h": 57 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 123, "y": 113, "w": 29, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 4, "w": 29, "h": 56 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 123, "y": 113, "w": 29, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 4, "w": 29, "h": 56 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 123, "y": 169, "w": 28, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 28, "h": 55 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 123, "y": 169, "w": 28, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 28, "h": 55 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 125, "y": 56, "w": 27, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 6, "w": 27, "h": 54 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 125, "y": 56, "w": 27, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 6, "w": 27, "h": 54 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 125, "y": 56, "w": 27, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 6, "w": 27, "h": 54 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 123, "y": 169, "w": 28, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 28, "h": 55 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 123, "y": 169, "w": 28, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 28, "h": 55 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 123, "y": 113, "w": 29, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 4, "w": 29, "h": 56 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 123, "y": 113, "w": 29, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 4, "w": 29, "h": 56 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 30, "y": 114, "w": 31, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 31, "h": 57 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 30, "y": 114, "w": 31, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 31, "h": 57 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 93, "y": 56, "w": 32, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 93, "y": 56, "w": 32, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 93, "y": 56, "w": 32, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 93, "y": 56, "w": 32, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 93, "y": 56, "w": 32, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 111, "y": 0, "w": 34, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 34, "h": 56 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 111, "y": 0, "w": 34, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 34, "h": 56 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 75, "y": 0, "w": 36, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 36, "h": 55 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 75, "y": 0, "w": 36, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 36, "h": 55 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 38, "y": 0, "w": 37, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 37, "h": 54 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 38, "y": 0, "w": 37, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 37, "h": 54 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 0, "y": 0, "w": 38, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 38, "h": 53 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 0, "y": 0, "w": 38, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 38, "h": 53 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 0, "y": 0, "w": 38, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 38, "h": 53 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 38, "y": 0, "w": 37, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 37, "h": 54 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 38, "y": 0, "w": 37, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 37, "h": 54 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 75, "y": 0, "w": 36, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 36, "h": 55 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 75, "y": 0, "w": 36, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 36, "h": 55 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 111, "y": 0, "w": 34, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 34, "h": 56 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 111, "y": 0, "w": 34, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 34, "h": 56 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 93, "y": 56, "w": 32, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 93, "y": 56, "w": 32, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 93, "y": 56, "w": 32, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 93, "y": 56, "w": 32, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 93, "y": 56, "w": 32, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 30, "y": 114, "w": 31, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 31, "h": 57 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 30, "y": 114, "w": 31, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 31, "h": 57 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 123, "y": 113, "w": 29, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 4, "w": 29, "h": 56 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 123, "y": 113, "w": 29, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 4, "w": 29, "h": 56 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 123, "y": 169, "w": 28, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 28, "h": 55 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0088.png",
+    "frame": { "x": 123, "y": 169, "w": 28, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 28, "h": 55 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0089.png",
+    "frame": { "x": 125, "y": 56, "w": 27, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 6, "w": 27, "h": 54 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0090.png",
+    "frame": { "x": 125, "y": 56, "w": 27, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 6, "w": 27, "h": 54 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0091.png",
+    "frame": { "x": 125, "y": 56, "w": 27, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 6, "w": 27, "h": 54 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0092.png",
+    "frame": { "x": 123, "y": 169, "w": 28, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 28, "h": 55 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0093.png",
+    "frame": { "x": 123, "y": 169, "w": 28, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 28, "h": 55 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0094.png",
+    "frame": { "x": 123, "y": 113, "w": 29, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 4, "w": 29, "h": 56 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0095.png",
+    "frame": { "x": 123, "y": 113, "w": 29, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 4, "w": 29, "h": 56 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0096.png",
+    "frame": { "x": 30, "y": 114, "w": 31, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 31, "h": 57 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0097.png",
+    "frame": { "x": 30, "y": 114, "w": 31, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 31, "h": 57 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0098.png",
+    "frame": { "x": 93, "y": 56, "w": 32, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0099.png",
+    "frame": { "x": 93, "y": 56, "w": 32, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0100.png",
+    "frame": { "x": 93, "y": 56, "w": 32, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0101.png",
+    "frame": { "x": 93, "y": 56, "w": 32, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0102.png",
+    "frame": { "x": 93, "y": 56, "w": 32, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0103.png",
+    "frame": { "x": 111, "y": 0, "w": 34, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 34, "h": 56 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0104.png",
+    "frame": { "x": 111, "y": 0, "w": 34, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 34, "h": 56 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0105.png",
+    "frame": { "x": 75, "y": 0, "w": 36, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 36, "h": 55 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0106.png",
+    "frame": { "x": 75, "y": 0, "w": 36, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 36, "h": 55 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0107.png",
+    "frame": { "x": 38, "y": 0, "w": 37, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 37, "h": 54 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0108.png",
+    "frame": { "x": 38, "y": 0, "w": 37, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 37, "h": 54 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0109.png",
+    "frame": { "x": 0, "y": 0, "w": 38, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 38, "h": 53 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0110.png",
+    "frame": { "x": 0, "y": 0, "w": 38, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 38, "h": 53 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0111.png",
+    "frame": { "x": 0, "y": 0, "w": 38, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 38, "h": 53 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0112.png",
+    "frame": { "x": 38, "y": 0, "w": 37, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 37, "h": 54 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0113.png",
+    "frame": { "x": 38, "y": 0, "w": 37, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 37, "h": 54 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0114.png",
+    "frame": { "x": 75, "y": 0, "w": 36, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 36, "h": 55 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0115.png",
+    "frame": { "x": 75, "y": 0, "w": 36, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 36, "h": 55 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0116.png",
+    "frame": { "x": 111, "y": 0, "w": 34, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 34, "h": 56 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0117.png",
+    "frame": { "x": 111, "y": 0, "w": 34, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 34, "h": 56 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0118.png",
+    "frame": { "x": 93, "y": 56, "w": 32, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0119.png",
+    "frame": { "x": 93, "y": 56, "w": 32, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0120.png",
+    "frame": { "x": 93, "y": 56, "w": 32, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0121.png",
+    "frame": { "x": 93, "y": 56, "w": 32, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0122.png",
+    "frame": { "x": 93, "y": 56, "w": 32, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0123.png",
+    "frame": { "x": 61, "y": 115, "w": 30, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 30, "h": 58 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0124.png",
+    "frame": { "x": 61, "y": 115, "w": 30, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 30, "h": 58 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0125.png",
+    "frame": { "x": 93, "y": 113, "w": 30, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 1, "w": 30, "h": 59 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0126.png",
+    "frame": { "x": 93, "y": 113, "w": 30, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 1, "w": 30, "h": 59 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0127.png",
+    "frame": { "x": 0, "y": 113, "w": 30, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 30, "h": 60 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0128.png",
+    "frame": { "x": 0, "y": 113, "w": 30, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 30, "h": 60 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0129.png",
+    "frame": { "x": 0, "y": 53, "w": 31, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 31, "h": 60 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0130.png",
+    "frame": { "x": 0, "y": 53, "w": 31, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 31, "h": 60 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0131.png",
+    "frame": { "x": 31, "y": 54, "w": 31, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 31, "h": 60 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0132.png",
+    "frame": { "x": 31, "y": 54, "w": 31, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 31, "h": 60 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0133.png",
+    "frame": { "x": 62, "y": 55, "w": 31, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 31, "h": 60 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0134.png",
+    "frame": { "x": 62, "y": 55, "w": 31, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 31, "h": 60 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0135.png",
+    "frame": { "x": 0, "y": 53, "w": 31, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 31, "h": 60 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0136.png",
+    "frame": { "x": 0, "y": 53, "w": 31, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 31, "h": 60 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0137.png",
+    "frame": { "x": 31, "y": 54, "w": 31, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 31, "h": 60 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0138.png",
+    "frame": { "x": 31, "y": 54, "w": 31, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 31, "h": 60 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0139.png",
+    "frame": { "x": 62, "y": 55, "w": 31, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 31, "h": 60 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0140.png",
+    "frame": { "x": 62, "y": 55, "w": 31, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 31, "h": 60 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0141.png",
+    "frame": { "x": 0, "y": 53, "w": 31, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 31, "h": 60 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0142.png",
+    "frame": { "x": 0, "y": 53, "w": 31, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 31, "h": 60 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0143.png",
+    "frame": { "x": 31, "y": 54, "w": 31, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 31, "h": 60 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0144.png",
+    "frame": { "x": 31, "y": 54, "w": 31, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 31, "h": 60 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0145.png",
+    "frame": { "x": 62, "y": 55, "w": 31, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 31, "h": 60 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0146.png",
+    "frame": { "x": 62, "y": 55, "w": 31, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 31, "h": 60 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0147.png",
+    "frame": { "x": 0, "y": 53, "w": 31, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 31, "h": 60 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0148.png",
+    "frame": { "x": 0, "y": 53, "w": 31, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 31, "h": 60 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0149.png",
+    "frame": { "x": 31, "y": 54, "w": 31, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 31, "h": 60 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0150.png",
+    "frame": { "x": 31, "y": 54, "w": 31, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 31, "h": 60 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0151.png",
+    "frame": { "x": 93, "y": 113, "w": 30, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 1, "w": 30, "h": 59 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0152.png",
+    "frame": { "x": 93, "y": 113, "w": 30, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 1, "w": 30, "h": 59 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0153.png",
+    "frame": { "x": 61, "y": 115, "w": 30, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 30, "h": 58 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0154.png",
+    "frame": { "x": 61, "y": 115, "w": 30, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 30, "h": 58 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0155.png",
+    "frame": { "x": 93, "y": 56, "w": 32, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0156.png",
+    "frame": { "x": 93, "y": 56, "w": 32, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.11-x64",
+  "image": "698.png",
+  "format": "I8",
+  "size": { "w": 152, "h": 224 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/698.png b/public/images/pokemon/698.png
index 2e00f5693a6..d9e638561d1 100644
Binary files a/public/images/pokemon/698.png and b/public/images/pokemon/698.png differ
diff --git a/public/images/pokemon/703.json b/public/images/pokemon/703.json
index e160dd32d25..5c0a6230108 100644
--- a/public/images/pokemon/703.json
+++ b/public/images/pokemon/703.json
@@ -1,41 +1,569 @@
-{
-	"textures": [
-		{
-			"image": "703.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 38,
-				"h": 38
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 37,
-						"h": 38
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 38
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 38
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:5da3bf1b2b82712da609c628fc886d69:7a2dc2f1f3b5fa2ee6b04cdf4c952277:721af8c322ff60159262e9b3017c784d$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 0, "y": 0, "w": 37, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 37, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 37, "y": 0, "w": 37, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 37, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 35, "y": 38, "w": 36, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 36, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 71, "y": 38, "w": 36, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 36, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 107, "y": 38, "w": 36, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 8, "w": 36, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 0, "y": 78, "w": 35, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 9, "w": 35, "h": 39 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 148, "y": 0, "w": 35, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 9, "w": 35, "h": 40 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 0, "y": 38, "w": 35, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 8, "w": 35, "h": 40 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 143, "y": 78, "w": 35, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 7, "w": 35, "h": 39 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 143, "y": 40, "w": 36, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 36, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 35, "y": 76, "w": 36, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 36, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 71, "y": 76, "w": 36, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 0, "y": 0, "w": 37, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 37, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 37, "y": 0, "w": 37, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 37, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 35, "y": 38, "w": 36, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 36, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 71, "y": 38, "w": 36, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 36, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 107, "y": 38, "w": 36, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 8, "w": 36, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 0, "y": 78, "w": 35, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 9, "w": 35, "h": 39 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 148, "y": 0, "w": 35, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 9, "w": 35, "h": 40 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 0, "y": 38, "w": 35, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 8, "w": 35, "h": 40 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 143, "y": 78, "w": 35, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 7, "w": 35, "h": 39 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 143, "y": 40, "w": 36, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 36, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 35, "y": 76, "w": 36, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 36, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 71, "y": 76, "w": 36, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 0, "y": 0, "w": 37, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 37, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 37, "y": 0, "w": 37, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 37, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 35, "y": 38, "w": 36, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 36, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 71, "y": 38, "w": 36, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 36, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 107, "y": 38, "w": 36, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 8, "w": 36, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 0, "y": 78, "w": 35, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 9, "w": 35, "h": 39 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 148, "y": 0, "w": 35, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 9, "w": 35, "h": 40 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 0, "y": 38, "w": 35, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 8, "w": 35, "h": 40 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 143, "y": 78, "w": 35, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 7, "w": 35, "h": 39 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 143, "y": 40, "w": 36, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 36, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 35, "y": 76, "w": 36, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 36, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 71, "y": 76, "w": 36, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 0, "y": 0, "w": 37, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 37, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 37, "y": 0, "w": 37, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 37, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 35, "y": 38, "w": 36, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 36, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 71, "y": 38, "w": 36, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 36, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 107, "y": 38, "w": 36, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 8, "w": 36, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 0, "y": 78, "w": 35, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 9, "w": 35, "h": 39 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 148, "y": 0, "w": 35, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 9, "w": 35, "h": 40 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 0, "y": 38, "w": 35, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 8, "w": 35, "h": 40 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 143, "y": 78, "w": 35, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 7, "w": 35, "h": 39 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 143, "y": 40, "w": 36, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 36, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 35, "y": 76, "w": 36, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 36, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 71, "y": 76, "w": 36, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 0, "y": 0, "w": 37, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 37, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 74, "y": 0, "w": 37, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 37, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 35, "y": 114, "w": 35, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 35, "h": 39 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 70, "y": 114, "w": 35, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 7, "w": 35, "h": 39 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 105, "y": 114, "w": 35, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 35, "h": 39 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 0, "y": 117, "w": 35, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 6, "w": 35, "h": 39 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 140, "y": 117, "w": 35, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 35, "h": 39 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 0, "y": 117, "w": 35, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 6, "w": 35, "h": 39 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 0, "y": 117, "w": 35, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 35, "h": 39 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 0, "y": 117, "w": 35, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 6, "w": 35, "h": 39 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 35, "y": 153, "w": 35, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 35, "h": 39 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 111, "y": 0, "w": 37, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 37, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 107, "y": 76, "w": 36, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 36, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 107, "y": 76, "w": 36, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 36, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.11-x64",
+  "image": "703.png",
+  "format": "I8",
+  "size": { "w": 183, "h": 192 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/703.png b/public/images/pokemon/703.png
index 3f3767fbc6c..ea231fc6c09 100644
Binary files a/public/images/pokemon/703.png and b/public/images/pokemon/703.png differ
diff --git a/public/images/pokemon/707.json b/public/images/pokemon/707.json
index b37a090ddb5..ee5036fb541 100644
--- a/public/images/pokemon/707.json
+++ b/public/images/pokemon/707.json
@@ -1,41 +1,1559 @@
-{
-	"textures": [
-		{
-			"image": "707.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 77,
-				"h": 77
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 43,
-						"h": 77
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 43,
-						"h": 77
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 43,
-						"h": 77
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:56a3742632a462544b501f22a2cb2e57:5315127216c0bad2620a5352c4e424ba:8e96b9056ea81e44ced99c97f472a528$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 335, "y": 370, "w": 43, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 36, "y": 18, "w": 43, "h": 77 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 88, "y": 429, "w": 42, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 35, "y": 17, "w": 42, "h": 77 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 532, "y": 448, "w": 41, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 33, "y": 16, "w": 41, "h": 76 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 490, "y": 432, "w": 42, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 31, "y": 16, "w": 42, "h": 76 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 566, "y": 373, "w": 44, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 15, "w": 44, "h": 75 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 652, "y": 426, "w": 44, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 15, "w": 44, "h": 74 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 289, "y": 330, "w": 46, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 13, "w": 46, "h": 74 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 49, "y": 354, "w": 47, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 14, "w": 47, "h": 72 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 195, "y": 280, "w": 49, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 17, "y": 13, "w": 49, "h": 72 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 629, "y": 153, "w": 53, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 12, "w": 53, "h": 71 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 692, "y": 151, "w": 54, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 13, "w": 54, "h": 70 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 195, "y": 209, "w": 52, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 14, "w": 52, "h": 71 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 247, "y": 215, "w": 51, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 13, "w": 51, "h": 72 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 522, "y": 219, "w": 50, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 15, "w": 50, "h": 72 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 618, "y": 224, "w": 49, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 15, "w": 49, "h": 73 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 352, "y": 296, "w": 47, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 16, "w": 47, "h": 74 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 96, "y": 354, "w": 45, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 29, "y": 16, "w": 45, "h": 75 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 378, "y": 372, "w": 44, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 32, "y": 17, "w": 44, "h": 75 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 276, "y": 404, "w": 43, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 34, "y": 18, "w": 43, "h": 76 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 361, "y": 447, "w": 41, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 37, "y": 17, "w": 41, "h": 76 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 233, "y": 365, "w": 43, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 38, "y": 16, "w": 43, "h": 77 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 618, "y": 297, "w": 44, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 41, "y": 16, "w": 44, "h": 78 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 144, "y": 282, "w": 45, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 42, "y": 15, "w": 45, "h": 78 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 378, "y": 218, "w": 47, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 43, "y": 14, "w": 47, "h": 78 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 100, "y": 199, "w": 48, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 45, "y": 13, "w": 48, "h": 78 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 474, "y": 141, "w": 50, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 47, "y": 13, "w": 50, "h": 78 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 422, "y": 69, "w": 52, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 48, "y": 12, "w": 52, "h": 78 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 707, "y": 2, "w": 54, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 50, "y": 11, "w": 54, "h": 78 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 651, "y": 2, "w": 56, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 48, "y": 12, "w": 56, "h": 77 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 2, "y": 65, "w": 54, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 47, "y": 13, "w": 54, "h": 77 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 273, "y": 69, "w": 53, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 45, "y": 13, "w": 53, "h": 78 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 586, "y": 71, "w": 52, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 43, "y": 14, "w": 52, "h": 78 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 2, "y": 142, "w": 50, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 42, "y": 15, "w": 50, "h": 78 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 52, "y": 199, "w": 48, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 41, "y": 16, "w": 48, "h": 78 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 98, "y": 277, "w": 46, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 39, "y": 16, "w": 46, "h": 77 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 712, "y": 296, "w": 45, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 37, "y": 17, "w": 45, "h": 77 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 335, "y": 370, "w": 43, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 36, "y": 18, "w": 43, "h": 77 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 88, "y": 429, "w": 42, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 35, "y": 17, "w": 42, "h": 77 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 532, "y": 448, "w": 41, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 33, "y": 16, "w": 41, "h": 76 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 490, "y": 432, "w": 42, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 31, "y": 16, "w": 42, "h": 76 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 566, "y": 373, "w": 44, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 15, "w": 44, "h": 75 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 652, "y": 426, "w": 44, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 15, "w": 44, "h": 74 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 289, "y": 330, "w": 46, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 13, "w": 46, "h": 74 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 49, "y": 354, "w": 47, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 14, "w": 47, "h": 72 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 195, "y": 280, "w": 49, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 17, "y": 13, "w": 49, "h": 72 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 629, "y": 153, "w": 53, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 12, "w": 53, "h": 71 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 692, "y": 151, "w": 54, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 13, "w": 54, "h": 70 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 195, "y": 209, "w": 52, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 14, "w": 52, "h": 71 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 247, "y": 215, "w": 51, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 13, "w": 51, "h": 72 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 522, "y": 219, "w": 50, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 15, "w": 50, "h": 72 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 618, "y": 224, "w": 49, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 15, "w": 49, "h": 73 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 352, "y": 296, "w": 47, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 16, "w": 47, "h": 74 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 96, "y": 354, "w": 45, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 29, "y": 16, "w": 45, "h": 75 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 378, "y": 372, "w": 44, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 32, "y": 17, "w": 44, "h": 75 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 276, "y": 404, "w": 43, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 34, "y": 18, "w": 43, "h": 76 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 361, "y": 447, "w": 41, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 37, "y": 17, "w": 41, "h": 76 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 233, "y": 365, "w": 43, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 38, "y": 16, "w": 43, "h": 77 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 618, "y": 297, "w": 44, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 41, "y": 16, "w": 44, "h": 78 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 144, "y": 282, "w": 45, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 42, "y": 15, "w": 45, "h": 78 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 378, "y": 218, "w": 47, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 43, "y": 14, "w": 47, "h": 78 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 100, "y": 199, "w": 48, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 45, "y": 13, "w": 48, "h": 78 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 474, "y": 141, "w": 50, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 47, "y": 13, "w": 50, "h": 78 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 422, "y": 69, "w": 52, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 48, "y": 12, "w": 52, "h": 78 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 707, "y": 2, "w": 54, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 50, "y": 11, "w": 54, "h": 78 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 651, "y": 2, "w": 56, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 48, "y": 12, "w": 56, "h": 77 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 2, "y": 65, "w": 54, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 47, "y": 13, "w": 54, "h": 77 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 273, "y": 69, "w": 53, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 45, "y": 13, "w": 53, "h": 78 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 586, "y": 71, "w": 52, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 43, "y": 14, "w": 52, "h": 78 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 2, "y": 142, "w": 50, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 42, "y": 15, "w": 50, "h": 78 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 52, "y": 199, "w": 48, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 41, "y": 16, "w": 48, "h": 78 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 98, "y": 277, "w": 46, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 39, "y": 16, "w": 46, "h": 77 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 712, "y": 296, "w": 45, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 37, "y": 17, "w": 45, "h": 77 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 335, "y": 370, "w": 43, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 36, "y": 18, "w": 43, "h": 77 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 88, "y": 429, "w": 42, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 35, "y": 17, "w": 42, "h": 77 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 532, "y": 448, "w": 41, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 33, "y": 16, "w": 41, "h": 76 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 490, "y": 432, "w": 42, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 31, "y": 16, "w": 42, "h": 76 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 566, "y": 373, "w": 44, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 15, "w": 44, "h": 75 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 652, "y": 426, "w": 44, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 15, "w": 44, "h": 74 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 289, "y": 330, "w": 46, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 13, "w": 46, "h": 74 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 49, "y": 354, "w": 47, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 14, "w": 47, "h": 72 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 195, "y": 280, "w": 49, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 17, "y": 13, "w": 49, "h": 72 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 629, "y": 153, "w": 53, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 12, "w": 53, "h": 71 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 692, "y": 151, "w": 54, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 13, "w": 54, "h": 70 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 195, "y": 209, "w": 52, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 14, "w": 52, "h": 71 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 247, "y": 215, "w": 51, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 13, "w": 51, "h": 72 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 522, "y": 219, "w": 50, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 15, "w": 50, "h": 72 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 618, "y": 224, "w": 49, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 15, "w": 49, "h": 73 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0088.png",
+    "frame": { "x": 352, "y": 296, "w": 47, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 16, "w": 47, "h": 74 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0089.png",
+    "frame": { "x": 96, "y": 354, "w": 45, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 29, "y": 16, "w": 45, "h": 75 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0090.png",
+    "frame": { "x": 378, "y": 372, "w": 44, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 32, "y": 17, "w": 44, "h": 75 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0091.png",
+    "frame": { "x": 276, "y": 404, "w": 43, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 34, "y": 18, "w": 43, "h": 76 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0092.png",
+    "frame": { "x": 361, "y": 447, "w": 41, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 37, "y": 17, "w": 41, "h": 76 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0093.png",
+    "frame": { "x": 233, "y": 365, "w": 43, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 38, "y": 16, "w": 43, "h": 77 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0094.png",
+    "frame": { "x": 618, "y": 297, "w": 44, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 41, "y": 16, "w": 44, "h": 78 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0095.png",
+    "frame": { "x": 144, "y": 282, "w": 45, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 42, "y": 15, "w": 45, "h": 78 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0096.png",
+    "frame": { "x": 378, "y": 218, "w": 47, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 43, "y": 14, "w": 47, "h": 78 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0097.png",
+    "frame": { "x": 100, "y": 199, "w": 48, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 45, "y": 13, "w": 48, "h": 78 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0098.png",
+    "frame": { "x": 474, "y": 141, "w": 50, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 47, "y": 13, "w": 50, "h": 78 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0099.png",
+    "frame": { "x": 422, "y": 69, "w": 52, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 48, "y": 12, "w": 52, "h": 78 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0100.png",
+    "frame": { "x": 707, "y": 2, "w": 54, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 50, "y": 11, "w": 54, "h": 78 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0101.png",
+    "frame": { "x": 651, "y": 2, "w": 56, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 48, "y": 12, "w": 56, "h": 77 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0102.png",
+    "frame": { "x": 2, "y": 65, "w": 54, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 47, "y": 13, "w": 54, "h": 77 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0103.png",
+    "frame": { "x": 273, "y": 69, "w": 53, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 45, "y": 13, "w": 53, "h": 78 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0104.png",
+    "frame": { "x": 586, "y": 71, "w": 52, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 43, "y": 14, "w": 52, "h": 78 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0105.png",
+    "frame": { "x": 2, "y": 142, "w": 50, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 42, "y": 15, "w": 50, "h": 78 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0106.png",
+    "frame": { "x": 52, "y": 199, "w": 48, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 41, "y": 16, "w": 48, "h": 78 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0107.png",
+    "frame": { "x": 98, "y": 277, "w": 46, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 39, "y": 16, "w": 46, "h": 77 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0108.png",
+    "frame": { "x": 712, "y": 296, "w": 45, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 37, "y": 17, "w": 45, "h": 77 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0109.png",
+    "frame": { "x": 335, "y": 370, "w": 43, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 36, "y": 18, "w": 43, "h": 77 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0110.png",
+    "frame": { "x": 578, "y": 149, "w": 51, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 32, "y": 17, "w": 51, "h": 75 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0111.png",
+    "frame": { "x": 95, "y": 62, "w": 59, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 27, "y": 14, "w": 59, "h": 73 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0112.png",
+    "frame": { "x": 519, "y": 2, "w": 67, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 11, "w": 67, "h": 71 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0113.png",
+    "frame": { "x": 280, "y": 2, "w": 82, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 6, "w": 82, "h": 67 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0114.png",
+    "frame": { "x": 2, "y": 2, "w": 93, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 93, "h": 63 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0115.png",
+    "frame": { "x": 95, "y": 2, "w": 95, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 95, "h": 60 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0116.png",
+    "frame": { "x": 190, "y": 2, "w": 90, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 90, "h": 62 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0117.png",
+    "frame": { "x": 362, "y": 2, "w": 83, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 83, "h": 65 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0118.png",
+    "frame": { "x": 445, "y": 2, "w": 74, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 1, "w": 74, "h": 67 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0119.png",
+    "frame": { "x": 586, "y": 2, "w": 65, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 19, "y": 2, "w": 65, "h": 69 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0120.png",
+    "frame": { "x": 2, "y": 220, "w": 50, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 27, "y": 4, "w": 50, "h": 72 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0121.png",
+    "frame": { "x": 319, "y": 447, "w": 42, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 34, "y": 5, "w": 42, "h": 75 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0122.png",
+    "frame": { "x": 447, "y": 489, "w": 41, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 35, "y": 7, "w": 41, "h": 75 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0123.png",
+    "frame": { "x": 614, "y": 500, "w": 41, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 35, "y": 10, "w": 41, "h": 75 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0124.png",
+    "frame": { "x": 573, "y": 453, "w": 41, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 35, "y": 11, "w": 41, "h": 76 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0125.png",
+    "frame": { "x": 267, "y": 480, "w": 41, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 35, "y": 14, "w": 41, "h": 76 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0126.png",
+    "frame": { "x": 184, "y": 429, "w": 42, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 35, "y": 14, "w": 42, "h": 77 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0127.png",
+    "frame": { "x": 2, "y": 443, "w": 41, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 36, "y": 16, "w": 41, "h": 77 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0128.png",
+    "frame": { "x": 226, "y": 442, "w": 41, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 36, "y": 17, "w": 41, "h": 77 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0129.png",
+    "frame": { "x": 130, "y": 438, "w": 41, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 36, "y": 18, "w": 41, "h": 77 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0130.png",
+    "frame": { "x": 2, "y": 366, "w": 43, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 36, "y": 18, "w": 43, "h": 77 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0131.png",
+    "frame": { "x": 52, "y": 277, "w": 46, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 36, "y": 18, "w": 46, "h": 77 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0132.png",
+    "frame": { "x": 682, "y": 221, "w": 48, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 35, "y": 18, "w": 48, "h": 75 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0133.png",
+    "frame": { "x": 519, "y": 361, "w": 47, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 32, "y": 19, "w": 47, "h": 71 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0134.png",
+    "frame": { "x": 43, "y": 502, "w": 44, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 30, "y": 20, "w": 44, "h": 66 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0135.png",
+    "frame": { "x": 714, "y": 505, "w": 41, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 29, "y": 20, "w": 41, "h": 67 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0136.png",
+    "frame": { "x": 402, "y": 489, "w": 45, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 20, "w": 45, "h": 69 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0137.png",
+    "frame": { "x": 471, "y": 219, "w": 51, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 19, "w": 51, "h": 71 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0138.png",
+    "frame": { "x": 692, "y": 80, "w": 56, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 19, "w": 56, "h": 71 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0139.png",
+    "frame": { "x": 389, "y": 147, "w": 54, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 18, "w": 54, "h": 71 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0140.png",
+    "frame": { "x": 399, "y": 297, "w": 46, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 31, "y": 18, "w": 46, "h": 75 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0141.png",
+    "frame": { "x": 610, "y": 375, "w": 42, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 37, "y": 18, "w": 42, "h": 78 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0142.png",
+    "frame": { "x": 141, "y": 360, "w": 43, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 39, "y": 18, "w": 43, "h": 78 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0143.png",
+    "frame": { "x": 638, "y": 79, "w": 54, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 41, "y": 19, "w": 54, "h": 74 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0144.png",
+    "frame": { "x": 362, "y": 67, "w": 60, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 42, "y": 19, "w": 60, "h": 69 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0145.png",
+    "frame": { "x": 474, "y": 73, "w": 59, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 41, "y": 19, "w": 59, "h": 68 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0146.png",
+    "frame": { "x": 264, "y": 147, "w": 57, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 39, "y": 18, "w": 57, "h": 68 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0147.png",
+    "frame": { "x": 298, "y": 264, "w": 54, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 37, "y": 18, "w": 54, "h": 66 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0148.png",
+    "frame": { "x": 524, "y": 148, "w": 54, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 36, "y": 18, "w": 54, "h": 71 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0149.png",
+    "frame": { "x": 211, "y": 135, "w": 53, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 34, "y": 18, "w": 53, "h": 74 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0150.png",
+    "frame": { "x": 471, "y": 290, "w": 48, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 32, "y": 19, "w": 48, "h": 73 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0151.png",
+    "frame": { "x": 569, "y": 302, "w": 48, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 19, "w": 48, "h": 71 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0152.png",
+    "frame": { "x": 154, "y": 134, "w": 57, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 20, "w": 57, "h": 69 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0153.png",
+    "frame": { "x": 154, "y": 64, "w": 60, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 20, "w": 60, "h": 70 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0154.png",
+    "frame": { "x": 214, "y": 64, "w": 59, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 19, "w": 59, "h": 71 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0155.png",
+    "frame": { "x": 2, "y": 292, "w": 47, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 29, "y": 18, "w": 47, "h": 74 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0156.png",
+    "frame": { "x": 696, "y": 426, "w": 41, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 39, "y": 18, "w": 41, "h": 79 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0157.png",
+    "frame": { "x": 533, "y": 73, "w": 53, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 42, "y": 19, "w": 53, "h": 75 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0158.png",
+    "frame": { "x": 56, "y": 135, "w": 62, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 45, "y": 21, "w": 62, "h": 64 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0159.png",
+    "frame": { "x": 662, "y": 373, "w": 62, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 45, "y": 22, "w": 62, "h": 53 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0160.png",
+    "frame": { "x": 655, "y": 505, "w": 59, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 44, "y": 22, "w": 59, "h": 47 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0161.png",
+    "frame": { "x": 422, "y": 437, "w": 61, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 45, "y": 22, "w": 61, "h": 52 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0162.png",
+    "frame": { "x": 326, "y": 136, "w": 63, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 45, "y": 21, "w": 63, "h": 62 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0163.png",
+    "frame": { "x": 321, "y": 198, "w": 57, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 45, "y": 21, "w": 57, "h": 66 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0164.png",
+    "frame": { "x": 519, "y": 291, "w": 50, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 44, "y": 20, "w": 50, "h": 70 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0165.png",
+    "frame": { "x": 445, "y": 363, "w": 45, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 43, "y": 20, "w": 45, "h": 74 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0166.png",
+    "frame": { "x": 45, "y": 426, "w": 43, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 42, "y": 19, "w": 43, "h": 76 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0167.png",
+    "frame": { "x": 189, "y": 352, "w": 44, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 41, "y": 19, "w": 44, "h": 77 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0168.png",
+    "frame": { "x": 667, "y": 296, "w": 45, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 41, "y": 19, "w": 45, "h": 77 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0169.png",
+    "frame": { "x": 425, "y": 218, "w": 46, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 40, "y": 18, "w": 46, "h": 79 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0170.png",
+    "frame": { "x": 148, "y": 203, "w": 47, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 39, "y": 18, "w": 47, "h": 79 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0171.png",
+    "frame": { "x": 572, "y": 224, "w": 46, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 38, "y": 18, "w": 46, "h": 78 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0172.png",
+    "frame": { "x": 244, "y": 287, "w": 45, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 37, "y": 18, "w": 45, "h": 78 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "707.png",
+  "format": "I8",
+  "size": { "w": 763, "h": 577 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/707.png b/public/images/pokemon/707.png
index e96c81bb953..899ab995926 100644
Binary files a/public/images/pokemon/707.png and b/public/images/pokemon/707.png differ
diff --git a/public/images/pokemon/708.json b/public/images/pokemon/708.json
index 99aa2cffcb4..abc8d24db2b 100644
--- a/public/images/pokemon/708.json
+++ b/public/images/pokemon/708.json
@@ -1,41 +1,1091 @@
-{
-	"textures": [
-		{
-			"image": "708.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 44,
-				"h": 44
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 44,
-						"h": 40
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 44,
-						"h": 40
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 44,
-						"h": 40
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:c7204472319329328505da257ec6edec:b1ef9ba3c80855e31831f718036043ff:796c82c5076b122f2663381836c65843$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 270, "y": 124, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 4, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 45, "y": 166, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 6, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 0, "y": 207, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 7, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 0, "y": 84, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 8, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 45, "y": 84, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 8, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 180, "y": 42, "w": 45, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 45, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 226, "y": 42, "w": 45, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 45, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 90, "y": 84, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 135, "y": 84, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 180, "y": 124, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 225, "y": 124, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 45, "y": 42, "w": 44, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 0, "w": 44, "h": 41 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 90, "y": 42, "w": 44, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 2, "w": 44, "h": 41 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 135, "y": 42, "w": 44, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 4, "w": 44, "h": 41 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 0, "y": 0, "w": 44, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 6, "w": 44, "h": 41 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 45, "y": 0, "w": 44, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 16, "y": 7, "w": 44, "h": 41 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 90, "y": 0, "w": 44, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 8, "w": 44, "h": 41 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 272, "y": 42, "w": 43, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 8, "w": 43, "h": 41 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 180, "y": 0, "w": 44, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 8, "w": 44, "h": 41 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 225, "y": 0, "w": 44, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 5, "w": 44, "h": 41 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 270, "y": 0, "w": 44, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 3, "w": 44, "h": 41 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 0, "y": 42, "w": 44, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 0, "w": 44, "h": 41 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 135, "y": 0, "w": 44, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 0, "w": 44, "h": 41 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 0, "y": 125, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 17, "y": 0, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 45, "y": 125, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 2, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 270, "y": 124, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 4, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 45, "y": 166, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 6, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 0, "y": 207, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 7, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 0, "y": 84, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 8, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 45, "y": 84, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 8, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 180, "y": 42, "w": 45, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 45, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 226, "y": 42, "w": 45, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 45, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 90, "y": 84, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 135, "y": 84, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 180, "y": 124, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 225, "y": 124, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 45, "y": 42, "w": 44, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 0, "w": 44, "h": 41 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 90, "y": 42, "w": 44, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 2, "w": 44, "h": 41 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 135, "y": 42, "w": 44, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 4, "w": 44, "h": 41 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 0, "y": 0, "w": 44, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 6, "w": 44, "h": 41 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 45, "y": 0, "w": 44, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 16, "y": 7, "w": 44, "h": 41 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 90, "y": 0, "w": 44, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 8, "w": 44, "h": 41 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 272, "y": 42, "w": 43, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 8, "w": 43, "h": 41 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 180, "y": 0, "w": 44, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 8, "w": 44, "h": 41 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 225, "y": 0, "w": 44, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 5, "w": 44, "h": 41 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 270, "y": 0, "w": 44, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 3, "w": 44, "h": 41 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 0, "y": 42, "w": 44, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 0, "w": 44, "h": 41 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 135, "y": 0, "w": 44, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 0, "w": 44, "h": 41 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 0, "y": 125, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 17, "y": 0, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 45, "y": 125, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 2, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 270, "y": 124, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 4, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 45, "y": 166, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 6, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 0, "y": 207, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 7, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 0, "y": 84, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 8, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 45, "y": 84, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 8, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 180, "y": 42, "w": 45, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 45, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 226, "y": 42, "w": 45, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 45, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 90, "y": 84, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 135, "y": 84, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 180, "y": 124, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 225, "y": 124, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 45, "y": 42, "w": 44, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 0, "w": 44, "h": 41 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 90, "y": 42, "w": 44, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 2, "w": 44, "h": 41 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 135, "y": 42, "w": 44, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 4, "w": 44, "h": 41 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 0, "y": 0, "w": 44, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 6, "w": 44, "h": 41 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 45, "y": 0, "w": 44, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 16, "y": 7, "w": 44, "h": 41 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 90, "y": 0, "w": 44, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 8, "w": 44, "h": 41 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 272, "y": 42, "w": 43, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 8, "w": 43, "h": 41 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 180, "y": 0, "w": 44, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 8, "w": 44, "h": 41 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 225, "y": 0, "w": 44, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 5, "w": 44, "h": 41 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 270, "y": 0, "w": 44, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 3, "w": 44, "h": 41 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 0, "y": 42, "w": 44, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 0, "w": 44, "h": 41 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 135, "y": 0, "w": 44, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 0, "w": 44, "h": 41 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 0, "y": 125, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 17, "y": 0, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 45, "y": 125, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 2, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 270, "y": 124, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 4, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 45, "y": 166, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 6, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 0, "y": 207, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 7, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 0, "y": 84, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 8, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 45, "y": 84, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 8, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 180, "y": 42, "w": 45, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 45, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 226, "y": 42, "w": 45, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 45, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 90, "y": 84, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 135, "y": 84, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 180, "y": 124, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 225, "y": 124, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 45, "y": 42, "w": 44, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 0, "w": 44, "h": 41 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0088.png",
+    "frame": { "x": 90, "y": 42, "w": 44, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 2, "w": 44, "h": 41 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0089.png",
+    "frame": { "x": 135, "y": 42, "w": 44, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 4, "w": 44, "h": 41 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0090.png",
+    "frame": { "x": 0, "y": 0, "w": 44, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 6, "w": 44, "h": 41 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0091.png",
+    "frame": { "x": 45, "y": 0, "w": 44, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 16, "y": 7, "w": 44, "h": 41 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0092.png",
+    "frame": { "x": 90, "y": 0, "w": 44, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 8, "w": 44, "h": 41 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0093.png",
+    "frame": { "x": 272, "y": 42, "w": 43, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 8, "w": 43, "h": 41 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0094.png",
+    "frame": { "x": 180, "y": 0, "w": 44, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 8, "w": 44, "h": 41 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0095.png",
+    "frame": { "x": 225, "y": 0, "w": 44, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 5, "w": 44, "h": 41 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0096.png",
+    "frame": { "x": 270, "y": 0, "w": 44, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 3, "w": 44, "h": 41 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0097.png",
+    "frame": { "x": 0, "y": 42, "w": 44, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 0, "w": 44, "h": 41 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0098.png",
+    "frame": { "x": 135, "y": 0, "w": 44, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 0, "w": 44, "h": 41 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0099.png",
+    "frame": { "x": 0, "y": 125, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 17, "y": 0, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0100.png",
+    "frame": { "x": 45, "y": 125, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 2, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0101.png",
+    "frame": { "x": 270, "y": 124, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 4, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0102.png",
+    "frame": { "x": 90, "y": 125, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 6, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0103.png",
+    "frame": { "x": 135, "y": 125, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 8, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0104.png",
+    "frame": { "x": 90, "y": 207, "w": 43, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 10, "w": 43, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0105.png",
+    "frame": { "x": 134, "y": 207, "w": 43, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 12, "w": 43, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0106.png",
+    "frame": { "x": 180, "y": 165, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 14, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0107.png",
+    "frame": { "x": 225, "y": 165, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 15, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0108.png",
+    "frame": { "x": 270, "y": 165, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 17, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0109.png",
+    "frame": { "x": 0, "y": 166, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 19, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0110.png",
+    "frame": { "x": 270, "y": 206, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 21, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0111.png",
+    "frame": { "x": 90, "y": 166, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 23, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0112.png",
+    "frame": { "x": 135, "y": 166, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 21, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0113.png",
+    "frame": { "x": 180, "y": 206, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 16, "y": 20, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0114.png",
+    "frame": { "x": 225, "y": 206, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 16, "y": 18, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0115.png",
+    "frame": { "x": 268, "y": 247, "w": 44, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 16, "y": 16, "w": 44, "h": 39 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0116.png",
+    "frame": { "x": 178, "y": 247, "w": 44, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 16, "y": 15, "w": 44, "h": 39 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0117.png",
+    "frame": { "x": 223, "y": 247, "w": 44, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 13, "w": 44, "h": 39 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0118.png",
+    "frame": { "x": 226, "y": 83, "w": 45, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 10, "w": 45, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0119.png",
+    "frame": { "x": 45, "y": 207, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 8, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0120.png",
+    "frame": { "x": 180, "y": 83, "w": 45, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 6, "w": 45, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "708.png",
+  "format": "I8",
+  "size": { "w": 315, "h": 286 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/708.png b/public/images/pokemon/708.png
index a51533e592b..0b612280028 100644
Binary files a/public/images/pokemon/708.png and b/public/images/pokemon/708.png differ
diff --git a/public/images/pokemon/714.json b/public/images/pokemon/714.json
index 84c1183e47b..b43aebd68a1 100644
--- a/public/images/pokemon/714.json
+++ b/public/images/pokemon/714.json
@@ -1,41 +1,263 @@
-{
-	"textures": [
-		{
-			"image": "714.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 64,
-				"h": 64
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 64,
-						"h": 57
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 64,
-						"h": 57
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 64,
-						"h": 57
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:acf096b1d2c6d9730a18ff797fb5ae47:ea434d000e9983cb42ecd03220d247c4:1a07d46e710b0568ec824f54fbc4fe6a$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 1, "y": 1, "w": 64, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 64, "h": 57 },
+    "sourceSize": { "w": 66, "h": 70 },
+    "duration": 50
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 133, "y": 1, "w": 64, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 6, "w": 64, "h": 56 },
+    "sourceSize": { "w": 66, "h": 70 },
+    "duration": 50
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 1, "y": 60, "w": 61, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 8, "w": 61, "h": 55 },
+    "sourceSize": { "w": 66, "h": 70 },
+    "duration": 50
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 184, "y": 117, "w": 32, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 3, "w": 32, "h": 67 },
+    "sourceSize": { "w": 66, "h": 70 },
+    "duration": 50
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 50, "y": 119, "w": 33, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 3, "w": 33, "h": 63 },
+    "sourceSize": { "w": 66, "h": 70 },
+    "duration": 50
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 199, "y": 1, "w": 47, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 1, "w": 47, "h": 56 },
+    "sourceSize": { "w": 66, "h": 70 },
+    "duration": 50
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 64, "y": 60, "w": 47, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 0, "w": 47, "h": 57 },
+    "sourceSize": { "w": 66, "h": 70 },
+    "duration": 50
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 1, "y": 1, "w": 64, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 64, "h": 57 },
+    "sourceSize": { "w": 66, "h": 70 },
+    "duration": 50
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 133, "y": 1, "w": 64, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 6, "w": 64, "h": 56 },
+    "sourceSize": { "w": 66, "h": 70 },
+    "duration": 50
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 1, "y": 60, "w": 61, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 8, "w": 61, "h": 55 },
+    "sourceSize": { "w": 66, "h": 70 },
+    "duration": 50
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 184, "y": 117, "w": 32, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 16, "y": 3, "w": 32, "h": 67 },
+    "sourceSize": { "w": 66, "h": 70 },
+    "duration": 50
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 50, "y": 119, "w": 33, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 3, "w": 33, "h": 63 },
+    "sourceSize": { "w": 66, "h": 70 },
+    "duration": 50
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 199, "y": 1, "w": 47, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 1, "w": 47, "h": 56 },
+    "sourceSize": { "w": 66, "h": 70 },
+    "duration": 50
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 64, "y": 60, "w": 47, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 0, "w": 47, "h": 57 },
+    "sourceSize": { "w": 66, "h": 70 },
+    "duration": 50
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 1, "y": 1, "w": 64, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 64, "h": 57 },
+    "sourceSize": { "w": 66, "h": 70 },
+    "duration": 50
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 133, "y": 1, "w": 64, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 6, "w": 64, "h": 56 },
+    "sourceSize": { "w": 66, "h": 70 },
+    "duration": 50
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 133, "y": 59, "w": 61, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 61, "h": 56 },
+    "sourceSize": { "w": 66, "h": 70 },
+    "duration": 50
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 113, "y": 117, "w": 33, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 33, "h": 68 },
+    "sourceSize": { "w": 66, "h": 70 },
+    "duration": 50
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 148, "y": 117, "w": 34, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 34, "h": 64 },
+    "sourceSize": { "w": 66, "h": 70 },
+    "duration": 50
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 1, "y": 117, "w": 47, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 0, "w": 47, "h": 57 },
+    "sourceSize": { "w": 66, "h": 70 },
+    "duration": 50
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 64, "y": 60, "w": 47, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 0, "w": 47, "h": 57 },
+    "sourceSize": { "w": 66, "h": 70 },
+    "duration": 50
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 1, "y": 1, "w": 64, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 64, "h": 57 },
+    "sourceSize": { "w": 66, "h": 70 },
+    "duration": 50
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 67, "y": 1, "w": 64, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 64, "h": 57 },
+    "sourceSize": { "w": 66, "h": 70 },
+    "duration": 50
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 196, "y": 59, "w": 61, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 7, "w": 61, "h": 56 },
+    "sourceSize": { "w": 66, "h": 70 },
+    "duration": 50
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 113, "y": 117, "w": 33, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 16, "y": 2, "w": 33, "h": 68 },
+    "sourceSize": { "w": 66, "h": 70 },
+    "duration": 50
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 218, "y": 117, "w": 33, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 2, "w": 33, "h": 64 },
+    "sourceSize": { "w": 66, "h": 70 },
+    "duration": 50
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 199, "y": 1, "w": 47, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 1, "w": 47, "h": 56 },
+    "sourceSize": { "w": 66, "h": 70 },
+    "duration": 50
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 64, "y": 60, "w": 47, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 0, "w": 47, "h": 57 },
+    "sourceSize": { "w": 66, "h": 70 },
+    "duration": 50
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "714.png",
+  "format": "I8",
+  "size": { "w": 258, "h": 186 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/714.png b/public/images/pokemon/714.png
index c79f9b83b82..4572eada3f3 100644
Binary files a/public/images/pokemon/714.png and b/public/images/pokemon/714.png differ
diff --git a/public/images/pokemon/715.png b/public/images/pokemon/715.png
index e173bfe25ff..08d9c985776 100644
Binary files a/public/images/pokemon/715.png and b/public/images/pokemon/715.png differ
diff --git a/public/images/pokemon/718-10.json b/public/images/pokemon/718-10.json
index 479c069fe0a..ad273c9ea79 100644
--- a/public/images/pokemon/718-10.json
+++ b/public/images/pokemon/718-10.json
@@ -1,41 +1,686 @@
-{
-	"textures": [
-		{
-			"image": "718-10.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 66,
-				"h": 66
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 56,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 56,
-						"h": 66
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 56,
-						"h": 66
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:a1845dc28b51b657957628d4b4d7af94:87a4c3e6fcac562963f6331abb3d962c:82195cf2a6db620c5643b8162d6e8c5c$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 0, "y": 0, "w": 57, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 57, "h": 67 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 173, "y": 0, "w": 57, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 57, "h": 66 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 230, "y": 0, "w": 57, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 57, "h": 66 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 57, "y": 0, "w": 58, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 58, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 115, "y": 0, "w": 58, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 58, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 171, "y": 66, "w": 58, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 58, "h": 64 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 229, "y": 66, "w": 58, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 58, "h": 64 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 287, "y": 66, "w": 58, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 58, "h": 64 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 171, "y": 130, "w": 58, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 58, "h": 64 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 229, "y": 130, "w": 58, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 58, "h": 64 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 0, "y": 67, "w": 57, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 57, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 287, "y": 0, "w": 57, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 57, "h": 66 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 57, "y": 65, "w": 57, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 57, "h": 66 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 114, "y": 65, "w": 57, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 57, "h": 66 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 0, "y": 0, "w": 57, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 57, "h": 67 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 173, "y": 0, "w": 57, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 57, "h": 66 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 230, "y": 0, "w": 57, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 57, "h": 66 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 57, "y": 0, "w": 58, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 58, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 115, "y": 0, "w": 58, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 58, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 171, "y": 66, "w": 58, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 58, "h": 64 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 229, "y": 66, "w": 58, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 58, "h": 64 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 287, "y": 66, "w": 58, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 58, "h": 64 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 171, "y": 130, "w": 58, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 58, "h": 64 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 229, "y": 130, "w": 58, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 58, "h": 64 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 0, "y": 67, "w": 57, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 57, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 287, "y": 0, "w": 57, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 57, "h": 66 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 57, "y": 65, "w": 57, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 57, "h": 66 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 114, "y": 65, "w": 57, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 57, "h": 66 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 0, "y": 0, "w": 57, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 57, "h": 67 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 173, "y": 0, "w": 57, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 57, "h": 66 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 230, "y": 0, "w": 57, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 57, "h": 66 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 57, "y": 0, "w": 58, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 58, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 115, "y": 0, "w": 58, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 58, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 171, "y": 66, "w": 58, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 58, "h": 64 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 229, "y": 66, "w": 58, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 58, "h": 64 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 287, "y": 66, "w": 58, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 58, "h": 64 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 171, "y": 130, "w": 58, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 58, "h": 64 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 229, "y": 130, "w": 58, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 58, "h": 64 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 0, "y": 67, "w": 57, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 57, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 287, "y": 0, "w": 57, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 57, "h": 66 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 57, "y": 65, "w": 57, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 57, "h": 66 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 114, "y": 65, "w": 57, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 57, "h": 66 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 0, "y": 0, "w": 57, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 57, "h": 67 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 173, "y": 0, "w": 57, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 57, "h": 66 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 230, "y": 0, "w": 57, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 57, "h": 66 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 57, "y": 0, "w": 58, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 58, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 115, "y": 0, "w": 58, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 58, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 171, "y": 66, "w": 58, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 58, "h": 64 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 229, "y": 66, "w": 58, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 58, "h": 64 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 287, "y": 66, "w": 58, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 58, "h": 64 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 171, "y": 130, "w": 58, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 58, "h": 64 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 229, "y": 130, "w": 58, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 58, "h": 64 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 0, "y": 67, "w": 57, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 57, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 287, "y": 0, "w": 57, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 57, "h": 66 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 57, "y": 65, "w": 57, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 57, "h": 66 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 114, "y": 65, "w": 57, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 57, "h": 66 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 287, "y": 130, "w": 56, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 56, "h": 66 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 57, "y": 131, "w": 56, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 56, "h": 66 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 164, "y": 261, "w": 56, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 56, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 0, "y": 327, "w": 56, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 56, "h": 64 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 56, "y": 327, "w": 56, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 56, "h": 63 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 169, "y": 329, "w": 57, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 5, "w": 57, "h": 62 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 112, "y": 326, "w": 57, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 57, "h": 63 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 54, "y": 265, "w": 58, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 58, "h": 62 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 226, "y": 332, "w": 56, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 56, "h": 63 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 220, "y": 261, "w": 53, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 53, "h": 68 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 273, "y": 264, "w": 53, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 53, "h": 68 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 279, "y": 196, "w": 54, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 54, "h": 68 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 56, "y": 197, "w": 54, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 54, "h": 68 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 110, "y": 197, "w": 54, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 54, "h": 68 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 0, "y": 198, "w": 54, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 54, "h": 68 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 169, "y": 194, "w": 55, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 1, "w": 55, "h": 67 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 224, "y": 194, "w": 55, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 55, "h": 67 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 0, "y": 132, "w": 56, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 56, "h": 66 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 113, "y": 131, "w": 56, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 56, "h": 66 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "718-10.png",
+  "format": "I8",
+  "size": { "w": 345, "h": 395 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/718-10.png b/public/images/pokemon/718-10.png
index a2acc542c68..4d15f78dd83 100644
Binary files a/public/images/pokemon/718-10.png and b/public/images/pokemon/718-10.png differ
diff --git a/public/images/pokemon/718.json b/public/images/pokemon/718.json
index b86c5362079..98053a226cb 100644
--- a/public/images/pokemon/718.json
+++ b/public/images/pokemon/718.json
@@ -1,41 +1,803 @@
-{
-	"textures": [
-		{
-			"image": "718.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 88,
-				"h": 88
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 72,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 72,
-						"h": 88
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 72,
-						"h": 88
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:c521b0d088429d6fd0d1d291823b7881:a063fa0268f5006b3587b06e3245db2a:7b4a06b06cbac24b3f39727b0238661b$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 294, "y": 438, "w": 72, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 3, "w": 72, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 0, "y": 442, "w": 71, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 3, "w": 71, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 437, "y": 441, "w": 71, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 71, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 145, "y": 441, "w": 71, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 71, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 366, "y": 440, "w": 71, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 71, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 223, "y": 267, "w": 73, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 73, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 296, "y": 350, "w": 73, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 73, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 384, "y": 177, "w": 75, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 75, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 459, "y": 177, "w": 75, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 75, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 452, "y": 265, "w": 74, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 74, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 76, "y": 178, "w": 75, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 75, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 233, "y": 90, "w": 75, "h": 89 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 75, "h": 89 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 151, "y": 178, "w": 75, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 75, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 0, "y": 179, "w": 75, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 75, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 75, "y": 266, "w": 74, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 74, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 369, "y": 352, "w": 73, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 3, "w": 73, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 294, "y": 438, "w": 72, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 3, "w": 72, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 0, "y": 442, "w": 71, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 3, "w": 71, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 437, "y": 441, "w": 71, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 71, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 145, "y": 441, "w": 71, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 71, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 366, "y": 440, "w": 71, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 71, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 223, "y": 267, "w": 73, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 73, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 296, "y": 350, "w": 73, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 73, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 384, "y": 177, "w": 75, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 75, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 459, "y": 177, "w": 75, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 75, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 452, "y": 265, "w": 74, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 74, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 76, "y": 178, "w": 75, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 75, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 233, "y": 90, "w": 75, "h": 89 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 75, "h": 89 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 151, "y": 178, "w": 75, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 75, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 0, "y": 179, "w": 75, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 75, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 75, "y": 266, "w": 74, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 74, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 369, "y": 352, "w": 73, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 3, "w": 73, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 294, "y": 438, "w": 72, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 3, "w": 72, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 0, "y": 442, "w": 71, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 3, "w": 71, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 437, "y": 441, "w": 71, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 71, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 145, "y": 441, "w": 71, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 71, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 366, "y": 440, "w": 71, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 71, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 223, "y": 267, "w": 73, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 73, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 296, "y": 350, "w": 73, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 73, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 384, "y": 177, "w": 75, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 75, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 459, "y": 177, "w": 75, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 75, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 452, "y": 265, "w": 74, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 74, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 76, "y": 178, "w": 75, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 75, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 233, "y": 90, "w": 75, "h": 89 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 75, "h": 89 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 151, "y": 178, "w": 75, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 75, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 0, "y": 179, "w": 75, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 75, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 75, "y": 266, "w": 74, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 74, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 369, "y": 352, "w": 73, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 3, "w": 73, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 294, "y": 438, "w": 72, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 3, "w": 72, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 0, "y": 442, "w": 71, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 3, "w": 71, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 437, "y": 441, "w": 71, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 71, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 145, "y": 441, "w": 71, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 71, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 366, "y": 440, "w": 71, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 71, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 223, "y": 267, "w": 73, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 73, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 296, "y": 350, "w": 73, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 73, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 384, "y": 177, "w": 75, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 75, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 459, "y": 177, "w": 75, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 75, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 452, "y": 265, "w": 74, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 74, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 76, "y": 178, "w": 75, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 75, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 233, "y": 90, "w": 75, "h": 89 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 75, "h": 89 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 151, "y": 178, "w": 75, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 75, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 0, "y": 179, "w": 75, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 75, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 75, "y": 266, "w": 74, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 74, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 369, "y": 352, "w": 73, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 3, "w": 73, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 222, "y": 355, "w": 72, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 3, "w": 72, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 73, "y": 354, "w": 72, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 3, "w": 72, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 149, "y": 353, "w": 73, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 73, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 442, "y": 353, "w": 73, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 73, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 149, "y": 266, "w": 74, "h": 87 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 74, "h": 87 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 377, "y": 265, "w": 75, "h": 87 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 75, "h": 87 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 308, "y": 177, "w": 76, "h": 87 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 76, "h": 87 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 76, "y": 91, "w": 76, "h": 87 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 76, "h": 87 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 301, "y": 264, "w": 76, "h": 86 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 76, "h": 86 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 0, "y": 267, "w": 74, "h": 87 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 4, "w": 74, "h": 87 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 0, "y": 90, "w": 76, "h": 89 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 2, "w": 76, "h": 89 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 391, "y": 88, "w": 77, "h": 89 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 2, "w": 77, "h": 89 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 79, "y": 0, "w": 78, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 0, "w": 78, "h": 91 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 468, "y": 88, "w": 77, "h": 89 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 77, "h": 89 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 157, "y": 0, "w": 78, "h": 90 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 1, "w": 78, "h": 90 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 313, "y": 0, "w": 78, "h": 89 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 78, "h": 89 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 0, "y": 0, "w": 79, "h": 90 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 1, "w": 79, "h": 90 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 391, "y": 0, "w": 78, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 3, "w": 78, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 235, "y": 0, "w": 78, "h": 90 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 1, "w": 78, "h": 90 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 469, "y": 0, "w": 78, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 3, "w": 78, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 313, "y": 89, "w": 77, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 3, "w": 77, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 157, "y": 90, "w": 76, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 3, "w": 76, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 226, "y": 179, "w": 75, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 75, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0088.png",
+    "frame": { "x": 0, "y": 354, "w": 73, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 73, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "718.png",
+  "format": "I8",
+  "size": { "w": 547, "h": 530 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/718.png b/public/images/pokemon/718.png
index 0c65ebefb31..07319fd6de0 100644
Binary files a/public/images/pokemon/718.png and b/public/images/pokemon/718.png differ
diff --git a/public/images/pokemon/719.json b/public/images/pokemon/719.json
index 4503b576777..29716341ffd 100644
--- a/public/images/pokemon/719.json
+++ b/public/images/pokemon/719.json
@@ -1,41 +1,875 @@
-{
-	"textures": [
-		{
-			"image": "719.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 70,
-				"h": 70
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 41,
-						"h": 70
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 70
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 70
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:2444999ec5c861d795baf2a948bfbf12:226dba2be6e002f00cb5559f02986b41:17a705bb924916761be2495822a53735$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 0, "y": 0, "w": 41, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 11, "w": 41, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 43, "y": 0, "w": 41, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 10, "w": 41, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 86, "y": 0, "w": 41, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 8, "w": 41, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 129, "y": 0, "w": 41, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 7, "w": 41, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 172, "y": 0, "w": 41, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 6, "w": 41, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 42, "y": 144, "w": 39, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 4, "w": 39, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 0, "y": 216, "w": 38, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 3, "w": 38, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 40, "y": 216, "w": 38, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 4, "w": 38, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 83, "y": 144, "w": 39, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 5, "w": 39, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 124, "y": 144, "w": 39, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 7, "w": 39, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 86, "y": 72, "w": 40, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 9, "w": 40, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 215, "y": 0, "w": 41, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 10, "w": 41, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 0, "y": 0, "w": 41, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 11, "w": 41, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 43, "y": 0, "w": 41, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 10, "w": 41, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 86, "y": 0, "w": 41, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 8, "w": 41, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 129, "y": 0, "w": 41, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 7, "w": 41, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 172, "y": 0, "w": 41, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 6, "w": 41, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 42, "y": 144, "w": 39, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 4, "w": 39, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 0, "y": 216, "w": 38, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 3, "w": 38, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 40, "y": 216, "w": 38, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 4, "w": 38, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 83, "y": 144, "w": 39, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 5, "w": 39, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 124, "y": 144, "w": 39, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 7, "w": 39, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 86, "y": 72, "w": 40, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 9, "w": 40, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 215, "y": 0, "w": 41, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 10, "w": 41, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 0, "y": 0, "w": 41, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 11, "w": 41, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 43, "y": 0, "w": 41, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 10, "w": 41, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 86, "y": 0, "w": 41, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 8, "w": 41, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 129, "y": 0, "w": 41, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 7, "w": 41, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 172, "y": 0, "w": 41, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 6, "w": 41, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 42, "y": 144, "w": 39, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 4, "w": 39, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 0, "y": 216, "w": 38, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 3, "w": 38, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 40, "y": 216, "w": 38, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 4, "w": 38, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 83, "y": 144, "w": 39, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 5, "w": 39, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 124, "y": 144, "w": 39, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 7, "w": 39, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 86, "y": 72, "w": 40, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 9, "w": 40, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 215, "y": 0, "w": 41, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 10, "w": 41, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 0, "y": 0, "w": 41, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 11, "w": 41, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 43, "y": 0, "w": 41, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 10, "w": 41, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 86, "y": 0, "w": 41, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 8, "w": 41, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 129, "y": 0, "w": 41, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 7, "w": 41, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 172, "y": 0, "w": 41, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 6, "w": 41, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 42, "y": 144, "w": 39, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 4, "w": 39, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 0, "y": 216, "w": 38, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 3, "w": 38, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 40, "y": 216, "w": 38, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 4, "w": 38, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 83, "y": 144, "w": 39, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 5, "w": 39, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 124, "y": 144, "w": 39, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 7, "w": 39, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 86, "y": 72, "w": 40, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 9, "w": 40, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 215, "y": 0, "w": 41, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 10, "w": 41, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 0, "y": 0, "w": 41, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 11, "w": 41, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 128, "y": 72, "w": 40, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 9, "w": 40, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 170, "y": 72, "w": 40, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 7, "w": 40, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 80, "y": 216, "w": 38, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 6, "w": 38, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 120, "y": 216, "w": 38, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 38, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 237, "y": 288, "w": 37, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 37, "h": 69 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 198, "y": 288, "w": 37, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 37, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 237, "y": 359, "w": 35, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 35, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 120, "y": 288, "w": 37, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 160, "y": 216, "w": 38, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 38, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 165, "y": 144, "w": 39, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 8, "w": 39, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 212, "y": 72, "w": 40, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 10, "w": 40, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 0, "y": 0, "w": 41, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 11, "w": 41, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 0, "y": 72, "w": 41, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 10, "w": 41, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 0, "y": 144, "w": 40, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 9, "w": 40, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 206, "y": 144, "w": 39, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 16, "y": 8, "w": 39, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 200, "y": 216, "w": 38, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 6, "w": 38, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 240, "y": 216, "w": 38, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 5, "w": 38, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 0, "y": 288, "w": 38, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 4, "w": 38, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 159, "y": 288, "w": 37, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 4, "w": 37, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 40, "y": 288, "w": 38, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 6, "w": 38, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 80, "y": 288, "w": 38, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 7, "w": 38, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 248, "y": 144, "w": 39, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 9, "w": 39, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 43, "y": 72, "w": 41, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 11, "w": 41, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 0, "y": 0, "w": 41, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 11, "w": 41, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 128, "y": 72, "w": 40, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 9, "w": 40, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 170, "y": 72, "w": 40, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 7, "w": 40, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 80, "y": 216, "w": 38, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 6, "w": 38, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 120, "y": 216, "w": 38, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 38, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 237, "y": 288, "w": 37, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 37, "h": 69 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 198, "y": 288, "w": 37, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 37, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 237, "y": 359, "w": 35, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 35, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 120, "y": 288, "w": 37, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 160, "y": 216, "w": 38, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 38, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 165, "y": 144, "w": 39, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 8, "w": 39, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 212, "y": 72, "w": 40, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 10, "w": 40, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 0, "y": 0, "w": 41, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 11, "w": 41, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 0, "y": 72, "w": 41, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 10, "w": 41, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 0, "y": 144, "w": 40, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 9, "w": 40, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0088.png",
+    "frame": { "x": 206, "y": 144, "w": 39, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 16, "y": 8, "w": 39, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0089.png",
+    "frame": { "x": 200, "y": 216, "w": 38, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 6, "w": 38, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0090.png",
+    "frame": { "x": 240, "y": 216, "w": 38, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 5, "w": 38, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0091.png",
+    "frame": { "x": 0, "y": 288, "w": 38, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 4, "w": 38, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0092.png",
+    "frame": { "x": 159, "y": 288, "w": 37, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 4, "w": 37, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0093.png",
+    "frame": { "x": 40, "y": 288, "w": 38, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 6, "w": 38, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0094.png",
+    "frame": { "x": 80, "y": 288, "w": 38, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 7, "w": 38, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0095.png",
+    "frame": { "x": 248, "y": 144, "w": 39, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 9, "w": 39, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0096.png",
+    "frame": { "x": 43, "y": 72, "w": 41, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 11, "w": 41, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "719.png",
+  "format": "I8",
+  "size": { "w": 287, "h": 429 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/719.png b/public/images/pokemon/719.png
index 287bfb9fd27..536e999a3d6 100644
Binary files a/public/images/pokemon/719.png and b/public/images/pokemon/719.png differ
diff --git a/public/images/pokemon/728.png b/public/images/pokemon/728.png
index 414ccd7b0b8..4c7f3f94f27 100644
Binary files a/public/images/pokemon/728.png and b/public/images/pokemon/728.png differ
diff --git a/public/images/pokemon/730.png b/public/images/pokemon/730.png
index 3438d9fc63f..92090460124 100644
Binary files a/public/images/pokemon/730.png and b/public/images/pokemon/730.png differ
diff --git a/public/images/pokemon/746-school.png b/public/images/pokemon/746-school.png
index e9d8bdbd944..c592b71a66a 100644
Binary files a/public/images/pokemon/746-school.png and b/public/images/pokemon/746-school.png differ
diff --git a/public/images/pokemon/746.png b/public/images/pokemon/746.png
index 22f4ec2fd6f..3de01770ee6 100644
Binary files a/public/images/pokemon/746.png and b/public/images/pokemon/746.png differ
diff --git a/public/images/pokemon/749.png b/public/images/pokemon/749.png
index 5e51f2f017a..28c2f5ce4e3 100644
Binary files a/public/images/pokemon/749.png and b/public/images/pokemon/749.png differ
diff --git a/public/images/pokemon/750.png b/public/images/pokemon/750.png
index bfd7e20743d..f0ca7b407dd 100644
Binary files a/public/images/pokemon/750.png and b/public/images/pokemon/750.png differ
diff --git a/public/images/pokemon/782.json b/public/images/pokemon/782.json
index 9b8f8e93d39..938568ed74a 100644
--- a/public/images/pokemon/782.json
+++ b/public/images/pokemon/782.json
@@ -1,41 +1,1010 @@
-{
-	"textures": [
-		{
-			"image": "782.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 50,
-				"h": 50
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 46,
-						"h": 50
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 46,
-						"h": 50
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 46,
-						"h": 50
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:350889f3e7d7ba0c8471435ab283acd5:fde1ef9d118b98abfede0d4980b8ef8d:d07862436676aa228a148ee1f1d82a8f$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 50, "y": 109, "w": 46, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 24, "w": 46, "h": 50 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 50, "y": 109, "w": 46, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 24, "w": 46, "h": 50 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 98, "y": 109, "w": 45, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 24, "w": 45, "h": 50 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 98, "y": 109, "w": 45, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 24, "w": 45, "h": 50 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 49, "y": 161, "w": 46, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 27, "y": 25, "w": 46, "h": 49 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 49, "y": 161, "w": 46, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 27, "y": 25, "w": 46, "h": 49 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 146, "y": 162, "w": 46, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 27, "y": 27, "w": 46, "h": 47 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 146, "y": 162, "w": 46, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 27, "y": 27, "w": 46, "h": 47 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 97, "y": 162, "w": 47, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 27, "w": 47, "h": 47 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 97, "y": 162, "w": 47, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 27, "w": 47, "h": 47 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 194, "y": 162, "w": 46, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 27, "y": 27, "w": 46, "h": 47 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 194, "y": 162, "w": 46, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 27, "y": 27, "w": 46, "h": 47 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 1, "y": 109, "w": 47, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 27, "y": 25, "w": 47, "h": 49 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 1, "y": 109, "w": 47, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 27, "y": 25, "w": 47, "h": 49 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 1, "y": 160, "w": 46, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 24, "w": 46, "h": 50 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 1, "y": 160, "w": 46, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 24, "w": 46, "h": 50 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 50, "y": 109, "w": 46, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 24, "w": 46, "h": 50 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 50, "y": 109, "w": 46, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 24, "w": 46, "h": 50 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 98, "y": 109, "w": 45, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 24, "w": 45, "h": 50 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 98, "y": 109, "w": 45, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 24, "w": 45, "h": 50 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 49, "y": 161, "w": 46, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 27, "y": 25, "w": 46, "h": 49 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 49, "y": 161, "w": 46, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 27, "y": 25, "w": 46, "h": 49 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 146, "y": 162, "w": 46, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 27, "y": 27, "w": 46, "h": 47 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 146, "y": 162, "w": 46, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 27, "y": 27, "w": 46, "h": 47 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 97, "y": 162, "w": 47, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 27, "w": 47, "h": 47 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 97, "y": 162, "w": 47, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 27, "w": 47, "h": 47 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 194, "y": 162, "w": 46, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 27, "y": 27, "w": 46, "h": 47 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 194, "y": 162, "w": 46, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 27, "y": 27, "w": 46, "h": 47 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 1, "y": 109, "w": 47, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 27, "y": 25, "w": 47, "h": 49 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 1, "y": 109, "w": 47, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 27, "y": 25, "w": 47, "h": 49 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 1, "y": 160, "w": 46, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 24, "w": 46, "h": 50 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 1, "y": 160, "w": 46, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 24, "w": 46, "h": 50 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 50, "y": 109, "w": 46, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 24, "w": 46, "h": 50 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 50, "y": 109, "w": 46, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 24, "w": 46, "h": 50 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 98, "y": 109, "w": 45, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 24, "w": 45, "h": 50 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 98, "y": 109, "w": 45, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 24, "w": 45, "h": 50 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 49, "y": 161, "w": 46, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 27, "y": 25, "w": 46, "h": 49 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 49, "y": 161, "w": 46, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 27, "y": 25, "w": 46, "h": 49 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 146, "y": 162, "w": 46, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 27, "y": 27, "w": 46, "h": 47 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 146, "y": 162, "w": 46, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 27, "y": 27, "w": 46, "h": 47 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 97, "y": 162, "w": 47, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 27, "w": 47, "h": 47 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 97, "y": 162, "w": 47, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 27, "w": 47, "h": 47 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 194, "y": 162, "w": 46, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 27, "y": 27, "w": 46, "h": 47 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 194, "y": 162, "w": 46, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 27, "y": 27, "w": 46, "h": 47 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 1, "y": 109, "w": 47, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 27, "y": 25, "w": 47, "h": 49 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 1, "y": 109, "w": 47, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 27, "y": 25, "w": 47, "h": 49 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 1, "y": 160, "w": 46, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 24, "w": 46, "h": 50 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 1, "y": 160, "w": 46, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 24, "w": 46, "h": 50 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 50, "y": 109, "w": 46, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 24, "w": 46, "h": 50 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 50, "y": 109, "w": 46, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 24, "w": 46, "h": 50 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 98, "y": 109, "w": 45, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 24, "w": 45, "h": 50 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 98, "y": 109, "w": 45, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 24, "w": 45, "h": 50 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 49, "y": 161, "w": 46, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 27, "y": 25, "w": 46, "h": 49 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 49, "y": 161, "w": 46, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 27, "y": 25, "w": 46, "h": 49 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 146, "y": 162, "w": 46, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 27, "y": 27, "w": 46, "h": 47 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 146, "y": 162, "w": 46, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 27, "y": 27, "w": 46, "h": 47 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 97, "y": 162, "w": 47, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 27, "w": 47, "h": 47 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 97, "y": 162, "w": 47, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 27, "w": 47, "h": 47 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 194, "y": 162, "w": 46, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 27, "y": 27, "w": 46, "h": 47 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 194, "y": 162, "w": 46, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 27, "y": 27, "w": 46, "h": 47 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 1, "y": 109, "w": 47, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 27, "y": 25, "w": 47, "h": 49 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 1, "y": 109, "w": 47, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 27, "y": 25, "w": 47, "h": 49 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 1, "y": 160, "w": 46, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 24, "w": 46, "h": 50 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 1, "y": 160, "w": 46, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 24, "w": 46, "h": 50 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 50, "y": 109, "w": 46, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 24, "w": 46, "h": 50 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 50, "y": 109, "w": 46, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 24, "w": 46, "h": 50 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 98, "y": 109, "w": 45, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 24, "w": 45, "h": 50 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 98, "y": 109, "w": 45, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 24, "w": 45, "h": 50 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 49, "y": 161, "w": 46, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 27, "y": 25, "w": 46, "h": 49 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 49, "y": 161, "w": 46, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 27, "y": 25, "w": 46, "h": 49 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 146, "y": 162, "w": 46, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 27, "y": 27, "w": 46, "h": 47 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 146, "y": 162, "w": 46, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 27, "y": 27, "w": 46, "h": 47 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 97, "y": 162, "w": 47, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 27, "w": 47, "h": 47 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 97, "y": 162, "w": 47, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 27, "w": 47, "h": 47 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 194, "y": 162, "w": 46, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 27, "y": 27, "w": 46, "h": 47 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 194, "y": 162, "w": 46, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 27, "y": 27, "w": 46, "h": 47 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 1, "y": 109, "w": 47, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 27, "y": 25, "w": 47, "h": 49 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 1, "y": 109, "w": 47, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 27, "y": 25, "w": 47, "h": 49 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 1, "y": 160, "w": 46, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 24, "w": 46, "h": 50 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 1, "y": 160, "w": 46, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 24, "w": 46, "h": 50 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 50, "y": 109, "w": 46, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 24, "w": 46, "h": 50 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 50, "y": 109, "w": 46, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 24, "w": 46, "h": 50 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 148, "y": 1, "w": 47, "h": 51 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 23, "w": 47, "h": 51 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 197, "y": 1, "w": 47, "h": 51 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 23, "w": 47, "h": 51 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 1, "y": 1, "w": 47, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 22, "w": 47, "h": 52 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 50, "y": 1, "w": 47, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 22, "w": 47, "h": 52 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 193, "y": 108, "w": 45, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 22, "w": 45, "h": 52 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0088.png",
+    "frame": { "x": 193, "y": 108, "w": 45, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 22, "w": 45, "h": 52 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0089.png",
+    "frame": { "x": 148, "y": 54, "w": 46, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 22, "w": 46, "h": 52 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0090.png",
+    "frame": { "x": 196, "y": 54, "w": 46, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 22, "w": 46, "h": 52 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0091.png",
+    "frame": { "x": 1, "y": 55, "w": 46, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 22, "w": 46, "h": 52 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0092.png",
+    "frame": { "x": 49, "y": 55, "w": 46, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 22, "w": 46, "h": 52 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0093.png",
+    "frame": { "x": 99, "y": 1, "w": 47, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 22, "w": 47, "h": 52 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0094.png",
+    "frame": { "x": 99, "y": 1, "w": 47, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 22, "w": 47, "h": 52 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0095.png",
+    "frame": { "x": 193, "y": 108, "w": 45, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 22, "w": 45, "h": 52 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0096.png",
+    "frame": { "x": 193, "y": 108, "w": 45, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 22, "w": 45, "h": 52 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0097.png",
+    "frame": { "x": 97, "y": 55, "w": 46, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 22, "w": 46, "h": 52 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0098.png",
+    "frame": { "x": 97, "y": 55, "w": 46, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 22, "w": 46, "h": 52 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0099.png",
+    "frame": { "x": 49, "y": 55, "w": 46, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 22, "w": 46, "h": 52 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0100.png",
+    "frame": { "x": 49, "y": 55, "w": 46, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 22, "w": 46, "h": 52 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0101.png",
+    "frame": { "x": 99, "y": 1, "w": 47, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 22, "w": 47, "h": 52 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0102.png",
+    "frame": { "x": 99, "y": 1, "w": 47, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 22, "w": 47, "h": 52 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0103.png",
+    "frame": { "x": 99, "y": 1, "w": 47, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 22, "w": 47, "h": 52 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0104.png",
+    "frame": { "x": 193, "y": 108, "w": 45, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 22, "w": 45, "h": 52 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0105.png",
+    "frame": { "x": 193, "y": 108, "w": 45, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 22, "w": 45, "h": 52 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0106.png",
+    "frame": { "x": 97, "y": 55, "w": 46, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 22, "w": 46, "h": 52 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0107.png",
+    "frame": { "x": 97, "y": 55, "w": 46, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 22, "w": 46, "h": 52 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0108.png",
+    "frame": { "x": 1, "y": 55, "w": 46, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 22, "w": 46, "h": 52 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0109.png",
+    "frame": { "x": 145, "y": 108, "w": 46, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 22, "w": 46, "h": 52 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0110.png",
+    "frame": { "x": 197, "y": 1, "w": 47, "h": 51 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 23, "w": 47, "h": 51 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0111.png",
+    "frame": { "x": 148, "y": 1, "w": 47, "h": 51 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 23, "w": 47, "h": 51 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.13-x64",
+  "image": "782.png",
+  "format": "I8",
+  "size": { "w": 245, "h": 211 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/782.png b/public/images/pokemon/782.png
index ad461fe00ae..093d0189535 100644
Binary files a/public/images/pokemon/782.png and b/public/images/pokemon/782.png differ
diff --git a/public/images/pokemon/783.json b/public/images/pokemon/783.json
index ff018d3f04a..df0c084fa38 100644
--- a/public/images/pokemon/783.json
+++ b/public/images/pokemon/783.json
@@ -1,41 +1,965 @@
-{
-	"textures": [
-		{
-			"image": "783.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 69,
-				"h": 69
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 61,
-						"h": 69
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 61,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 61,
-						"h": 69
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:a352518568888797dbb97bf40e2075df:76c85cf57217dd8c084dd2b2591b9bef:aab166e28c744865a0296041224dd01b$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 66, "y": 214, "w": 61, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 61, "h": 69 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 336, "y": 146, "w": 62, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 2, "w": 62, "h": 69 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 1, "y": 73, "w": 64, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 1, "w": 64, "h": 70 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 424, "y": 73, "w": 64, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 1, "w": 64, "h": 70 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 284, "y": 70, "w": 64, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 0, "w": 64, "h": 71 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 350, "y": 74, "w": 63, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 1, "w": 63, "h": 70 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 490, "y": 141, "w": 63, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 1, "w": 63, "h": 70 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 415, "y": 145, "w": 62, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 2, "w": 62, "h": 69 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 318, "y": 217, "w": 60, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 60, "h": 69 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 442, "y": 353, "w": 59, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 59, "h": 68 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 59, "y": 425, "w": 56, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 56, "h": 67 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 1, "y": 425, "w": 56, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 56, "h": 67 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 117, "y": 426, "w": 56, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 56, "h": 66 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 486, "y": 424, "w": 56, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 56, "h": 67 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 298, "y": 358, "w": 57, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 57, "h": 67 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 63, "y": 285, "w": 60, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 60, "h": 68 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 66, "y": 214, "w": 61, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 61, "h": 69 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 336, "y": 146, "w": 62, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 2, "w": 62, "h": 69 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 1, "y": 73, "w": 64, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 1, "w": 64, "h": 70 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 424, "y": 73, "w": 64, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 1, "w": 64, "h": 70 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 284, "y": 70, "w": 64, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 0, "w": 64, "h": 71 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 350, "y": 74, "w": 63, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 1, "w": 63, "h": 70 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 490, "y": 141, "w": 63, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 1, "w": 63, "h": 70 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 415, "y": 145, "w": 62, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 2, "w": 62, "h": 69 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 318, "y": 217, "w": 60, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 60, "h": 69 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 442, "y": 353, "w": 59, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 59, "h": 68 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 59, "y": 425, "w": 56, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 56, "h": 67 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 1, "y": 425, "w": 56, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 56, "h": 67 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 117, "y": 426, "w": 56, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 56, "h": 66 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 486, "y": 424, "w": 56, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 56, "h": 67 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 298, "y": 358, "w": 57, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 57, "h": 67 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 63, "y": 285, "w": 60, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 60, "h": 68 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 66, "y": 214, "w": 61, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 61, "h": 69 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 336, "y": 146, "w": 62, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 2, "w": 62, "h": 69 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 1, "y": 73, "w": 64, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 1, "w": 64, "h": 70 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 424, "y": 73, "w": 64, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 1, "w": 64, "h": 70 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 284, "y": 70, "w": 64, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 0, "w": 64, "h": 71 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 350, "y": 74, "w": 63, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 1, "w": 63, "h": 70 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 490, "y": 141, "w": 63, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 1, "w": 63, "h": 70 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 415, "y": 145, "w": 62, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 2, "w": 62, "h": 69 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 318, "y": 217, "w": 60, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 60, "h": 69 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 442, "y": 353, "w": 59, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 59, "h": 68 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 59, "y": 425, "w": 56, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 56, "h": 67 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 1, "y": 425, "w": 56, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 56, "h": 67 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 117, "y": 426, "w": 56, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 56, "h": 66 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 486, "y": 424, "w": 56, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 56, "h": 67 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 298, "y": 358, "w": 57, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 57, "h": 67 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 63, "y": 285, "w": 60, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 60, "h": 68 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 66, "y": 214, "w": 61, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 61, "h": 69 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 336, "y": 146, "w": 62, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 2, "w": 62, "h": 69 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 1, "y": 73, "w": 64, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 1, "w": 64, "h": 70 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 424, "y": 73, "w": 64, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 1, "w": 64, "h": 70 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 284, "y": 70, "w": 64, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 0, "w": 64, "h": 71 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 350, "y": 74, "w": 63, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 1, "w": 63, "h": 70 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 490, "y": 141, "w": 63, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 1, "w": 63, "h": 70 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 415, "y": 145, "w": 62, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 2, "w": 62, "h": 69 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 318, "y": 217, "w": 60, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 60, "h": 69 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 442, "y": 353, "w": 59, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 59, "h": 68 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 59, "y": 425, "w": 56, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 56, "h": 67 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 1, "y": 425, "w": 56, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 56, "h": 67 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 117, "y": 426, "w": 56, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 56, "h": 66 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 486, "y": 424, "w": 56, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 56, "h": 67 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 298, "y": 358, "w": 57, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 57, "h": 67 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 63, "y": 285, "w": 60, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 60, "h": 68 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 255, "y": 214, "w": 61, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 61, "h": 69 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 462, "y": 283, "w": 60, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 60, "h": 68 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 309, "y": 288, "w": 59, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 59, "h": 68 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 370, "y": 356, "w": 57, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 57, "h": 67 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 380, "y": 287, "w": 60, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 60, "h": 67 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 1, "y": 215, "w": 63, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 63, "h": 66 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 492, "y": 1, "w": 68, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 68, "h": 67 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 284, "y": 1, "w": 70, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 70, "h": 67 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 72, "y": 1, "w": 71, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 71, "h": 68 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 214, "y": 1, "w": 68, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 68, "h": 69 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 214, "y": 72, "w": 65, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 65, "h": 69 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 66, "y": 214, "w": 61, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 61, "h": 69 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 67, "y": 142, "w": 63, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 1, "w": 63, "h": 70 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 424, "y": 1, "w": 66, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 66, "h": 70 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 1, "y": 1, "w": 69, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 69, "h": 70 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 145, "y": 1, "w": 67, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 67, "h": 71 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 356, "y": 1, "w": 66, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 66, "h": 71 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 121, "y": 355, "w": 57, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 57, "h": 69 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 239, "y": 426, "w": 54, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 54, "h": 67 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 357, "y": 425, "w": 55, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 55, "h": 68 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 429, "y": 423, "w": 55, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 55, "h": 69 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 180, "y": 356, "w": 57, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 57, "h": 69 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 66, "y": 214, "w": 61, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 61, "h": 69 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0088.png",
+    "frame": { "x": 271, "y": 143, "w": 63, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 63, "h": 69 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0089.png",
+    "frame": { "x": 72, "y": 71, "w": 65, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 65, "h": 69 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0090.png",
+    "frame": { "x": 187, "y": 285, "w": 59, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 59, "h": 69 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0091.png",
+    "frame": { "x": 192, "y": 214, "w": 61, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 61, "h": 69 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0092.png",
+    "frame": { "x": 206, "y": 143, "w": 63, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 63, "h": 69 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0093.png",
+    "frame": { "x": 492, "y": 70, "w": 65, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 65, "h": 69 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0094.png",
+    "frame": { "x": 503, "y": 353, "w": 58, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 58, "h": 69 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0095.png",
+    "frame": { "x": 129, "y": 214, "w": 61, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 61, "h": 69 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0096.png",
+    "frame": { "x": 132, "y": 144, "w": 63, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 63, "h": 68 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0097.png",
+    "frame": { "x": 139, "y": 74, "w": 65, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 65, "h": 68 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0098.png",
+    "frame": { "x": 61, "y": 355, "w": 58, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 58, "h": 68 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0099.png",
+    "frame": { "x": 125, "y": 285, "w": 60, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 60, "h": 68 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0100.png",
+    "frame": { "x": 479, "y": 213, "w": 62, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 62, "h": 68 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0101.png",
+    "frame": { "x": 1, "y": 145, "w": 63, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 63, "h": 68 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0102.png",
+    "frame": { "x": 239, "y": 356, "w": 57, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 57, "h": 68 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0103.png",
+    "frame": { "x": 1, "y": 354, "w": 58, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 58, "h": 69 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0104.png",
+    "frame": { "x": 248, "y": 285, "w": 59, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 59, "h": 69 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0105.png",
+    "frame": { "x": 1, "y": 283, "w": 60, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 60, "h": 69 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0106.png",
+    "frame": { "x": 400, "y": 216, "w": 60, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 60, "h": 69 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.13-x64",
+  "image": "783.png",
+  "format": "I8",
+  "size": { "w": 562, "h": 494 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/783.png b/public/images/pokemon/783.png
index 3ec37265afe..9396392b588 100644
Binary files a/public/images/pokemon/783.png and b/public/images/pokemon/783.png differ
diff --git a/public/images/pokemon/784.json b/public/images/pokemon/784.json
index 93433997311..7899177cfc7 100644
--- a/public/images/pokemon/784.json
+++ b/public/images/pokemon/784.json
@@ -1,41 +1,812 @@
-{
-	"textures": [
-		{
-			"image": "784.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 81,
-				"h": 81
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 79,
-						"h": 81
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 79,
-						"h": 81
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 79,
-						"h": 81
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:dcfcb88e42dad35e57b259d31fbc6143:26fe93636d2b2e8c3da41c05f0648a08:c2f7ca3ab1075b8c824730653d891244$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 260, "y": 244, "w": 80, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 4, "w": 80, "h": 81 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 381, "y": 166, "w": 84, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 4, "w": 84, "h": 81 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 291, "y": 161, "w": 88, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 4, "w": 88, "h": 81 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 106, "y": 80, "w": 94, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 5, "w": 94, "h": 80 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 422, "y": 1, "w": 99, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 6, "w": 99, "h": 79 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 1, "y": 1, "w": 103, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 7, "w": 103, "h": 78 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 106, "y": 1, "w": 104, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 104, "h": 77 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 212, "y": 1, "w": 102, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 102, "h": 78 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 316, "y": 79, "w": 96, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 5, "w": 96, "h": 80 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 414, "y": 82, "w": 89, "h": 82 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 89, "h": 82 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 505, "y": 165, "w": 82, "h": 83 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 82, "h": 83 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 325, "y": 333, "w": 77, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 77, "h": 81 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 237, "y": 410, "w": 76, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 6, "w": 76, "h": 79 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 483, "y": 333, "w": 77, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 5, "w": 77, "h": 80 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 585, "y": 332, "w": 78, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 78, "h": 80 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 165, "y": 252, "w": 78, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 4, "w": 78, "h": 81 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 260, "y": 244, "w": 80, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 4, "w": 80, "h": 81 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 381, "y": 166, "w": 84, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 4, "w": 84, "h": 81 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 291, "y": 161, "w": 88, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 4, "w": 88, "h": 81 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 106, "y": 80, "w": 94, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 5, "w": 94, "h": 80 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 422, "y": 1, "w": 99, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 6, "w": 99, "h": 79 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 1, "y": 1, "w": 103, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 7, "w": 103, "h": 78 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 106, "y": 1, "w": 104, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 104, "h": 77 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 212, "y": 1, "w": 102, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 102, "h": 78 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 316, "y": 79, "w": 96, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 5, "w": 96, "h": 80 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 414, "y": 82, "w": 89, "h": 82 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 89, "h": 82 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 505, "y": 165, "w": 82, "h": 83 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 82, "h": 83 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 325, "y": 333, "w": 77, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 77, "h": 81 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 237, "y": 410, "w": 76, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 6, "w": 76, "h": 79 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 483, "y": 333, "w": 77, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 5, "w": 77, "h": 80 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 585, "y": 332, "w": 78, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 78, "h": 80 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 165, "y": 252, "w": 78, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 4, "w": 78, "h": 81 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 260, "y": 244, "w": 80, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 4, "w": 80, "h": 81 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 381, "y": 166, "w": 84, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 4, "w": 84, "h": 81 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 291, "y": 161, "w": 88, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 4, "w": 88, "h": 81 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 106, "y": 80, "w": 94, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 5, "w": 94, "h": 80 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 422, "y": 1, "w": 99, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 6, "w": 99, "h": 79 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 1, "y": 1, "w": 103, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 7, "w": 103, "h": 78 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 106, "y": 1, "w": 104, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 104, "h": 77 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 212, "y": 1, "w": 102, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 102, "h": 78 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 316, "y": 79, "w": 96, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 5, "w": 96, "h": 80 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 414, "y": 82, "w": 89, "h": 82 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 89, "h": 82 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 505, "y": 165, "w": 82, "h": 83 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 82, "h": 83 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 325, "y": 333, "w": 77, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 77, "h": 81 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 237, "y": 410, "w": 76, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 6, "w": 76, "h": 79 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 483, "y": 333, "w": 77, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 5, "w": 77, "h": 80 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 585, "y": 332, "w": 78, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 78, "h": 80 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 165, "y": 252, "w": 78, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 4, "w": 78, "h": 81 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 260, "y": 244, "w": 80, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 4, "w": 80, "h": 81 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 381, "y": 166, "w": 84, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 4, "w": 84, "h": 81 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 291, "y": 161, "w": 88, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 4, "w": 88, "h": 81 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 106, "y": 80, "w": 94, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 5, "w": 94, "h": 80 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 422, "y": 1, "w": 99, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 6, "w": 99, "h": 79 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 1, "y": 1, "w": 103, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 7, "w": 103, "h": 78 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 106, "y": 1, "w": 104, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 104, "h": 77 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 212, "y": 1, "w": 102, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 102, "h": 78 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 316, "y": 79, "w": 96, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 5, "w": 96, "h": 80 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 414, "y": 82, "w": 89, "h": 82 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 89, "h": 82 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 505, "y": 165, "w": 82, "h": 83 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 82, "h": 83 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 325, "y": 333, "w": 77, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 77, "h": 81 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 237, "y": 410, "w": 76, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 6, "w": 76, "h": 79 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 483, "y": 333, "w": 77, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 5, "w": 77, "h": 80 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 585, "y": 332, "w": 78, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 78, "h": 80 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 165, "y": 252, "w": 78, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 4, "w": 78, "h": 81 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 83, "y": 246, "w": 80, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 4, "w": 80, "h": 81 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 589, "y": 166, "w": 83, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 4, "w": 83, "h": 81 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 1, "y": 162, "w": 89, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 89, "h": 80 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 1, "y": 81, "w": 95, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 6, "w": 95, "h": 79 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 624, "y": 1, "w": 100, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 7, "w": 100, "h": 78 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 316, "y": 1, "w": 104, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 9, "w": 104, "h": 76 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 523, "y": 1, "w": 99, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 6, "w": 99, "h": 79 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 505, "y": 82, "w": 90, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 4, "w": 90, "h": 81 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 624, "y": 81, "w": 88, "h": 83 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 2, "w": 88, "h": 83 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 202, "y": 81, "w": 87, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 0, "w": 87, "h": 85 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 92, "y": 162, "w": 84, "h": 82 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 84, "h": 82 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 159, "y": 335, "w": 76, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 76, "h": 80 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 562, "y": 414, "w": 75, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 14, "w": 75, "h": 74 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 1, "y": 412, "w": 75, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 7, "w": 75, "h": 80 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 78, "y": 413, "w": 76, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 9, "w": 76, "h": 77 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 404, "y": 333, "w": 77, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 6, "w": 77, "h": 80 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 245, "y": 327, "w": 78, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 78, "h": 81 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 178, "y": 168, "w": 80, "h": 82 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 80, "h": 82 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 1, "y": 244, "w": 80, "h": 82 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 80, "h": 82 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 342, "y": 249, "w": 79, "h": 82 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 3, "w": 79, "h": 82 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 1, "y": 328, "w": 77, "h": 82 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 3, "w": 77, "h": 82 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 80, "y": 329, "w": 77, "h": 82 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 3, "w": 77, "h": 82 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 423, "y": 249, "w": 79, "h": 82 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 3, "w": 79, "h": 82 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0088.png",
+    "frame": { "x": 589, "y": 249, "w": 79, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 4, "w": 79, "h": 81 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0089.png",
+    "frame": { "x": 504, "y": 250, "w": 79, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 4, "w": 79, "h": 81 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.13-x64",
+  "image": "784.png",
+  "format": "I8",
+  "size": { "w": 725, "h": 493 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/784.png b/public/images/pokemon/784.png
index 7bca9f0794a..6d37807b8a0 100644
Binary files a/public/images/pokemon/784.png and b/public/images/pokemon/784.png differ
diff --git a/public/images/pokemon/840.png b/public/images/pokemon/840.png
index f0d1f83bd93..1a263e3ee19 100644
Binary files a/public/images/pokemon/840.png and b/public/images/pokemon/840.png differ
diff --git a/public/images/pokemon/841-gigantamax.png b/public/images/pokemon/841-gigantamax.png
index 69c53677722..07121b9c12f 100644
Binary files a/public/images/pokemon/841-gigantamax.png and b/public/images/pokemon/841-gigantamax.png differ
diff --git a/public/images/pokemon/841.png b/public/images/pokemon/841.png
index 5e665960df4..e7329f2eb97 100644
Binary files a/public/images/pokemon/841.png and b/public/images/pokemon/841.png differ
diff --git a/public/images/pokemon/842-gigantamax.png b/public/images/pokemon/842-gigantamax.png
index 69c53677722..aee95b7b881 100644
Binary files a/public/images/pokemon/842-gigantamax.png and b/public/images/pokemon/842-gigantamax.png differ
diff --git a/public/images/pokemon/842.png b/public/images/pokemon/842.png
index 468ca88562e..4e3fec8ef1b 100644
Binary files a/public/images/pokemon/842.png and b/public/images/pokemon/842.png differ
diff --git a/public/images/pokemon/871.png b/public/images/pokemon/871.png
index bdcedb9d90a..af53b0275e6 100644
Binary files a/public/images/pokemon/871.png and b/public/images/pokemon/871.png differ
diff --git a/public/images/pokemon/back/1011.png b/public/images/pokemon/back/1011.png
index 3e23fc1ebe3..ab3cc75482d 100644
Binary files a/public/images/pokemon/back/1011.png and b/public/images/pokemon/back/1011.png differ
diff --git a/public/images/pokemon/back/1019.png b/public/images/pokemon/back/1019.png
index ece50558c8c..d80a0930192 100644
Binary files a/public/images/pokemon/back/1019.png and b/public/images/pokemon/back/1019.png differ
diff --git a/public/images/pokemon/back/143-gigantamax.png b/public/images/pokemon/back/143-gigantamax.png
index 3ebb6f16483..cd251a515e6 100644
Binary files a/public/images/pokemon/back/143-gigantamax.png and b/public/images/pokemon/back/143-gigantamax.png differ
diff --git a/public/images/pokemon/back/2038.png b/public/images/pokemon/back/2038.png
index 68a9cfb2d6e..957b2d31714 100644
Binary files a/public/images/pokemon/back/2038.png and b/public/images/pokemon/back/2038.png differ
diff --git a/public/images/pokemon/back/2075.json b/public/images/pokemon/back/2075.json
index 4c8365eeddb..3dd46debe2f 100644
--- a/public/images/pokemon/back/2075.json
+++ b/public/images/pokemon/back/2075.json
@@ -1,41 +1,812 @@
-{
-	"textures": [
-		{
-			"image": "2075.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 71,
-				"h": 71
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 71,
-						"h": 43
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 71,
-						"h": 43
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 71,
-						"h": 43
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:0f1bcbf28a4b69c4dc92a48c8faf81da:0130dd5f38c7e72cc16e62dd634dc3a2:732805cb123f88b2d403da0dec709706$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 147, "y": 1, "w": 71, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 0, "w": 71, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 219, "y": 1, "w": 71, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 0, "w": 71, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 418, "y": 90, "w": 69, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 69, "h": 42 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 213, "y": 215, "w": 67, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 67, "h": 42 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 1, "y": 256, "w": 65, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 65, "h": 42 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 213, "y": 215, "w": 67, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 67, "h": 42 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 418, "y": 90, "w": 69, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 69, "h": 42 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 219, "y": 1, "w": 71, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 0, "w": 71, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 147, "y": 1, "w": 71, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 0, "w": 71, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 435, "y": 1, "w": 71, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 71, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 74, "y": 1, "w": 72, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 72, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 1, "y": 1, "w": 72, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 72, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 291, "y": 1, "w": 71, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 71, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 1, "y": 1, "w": 72, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 72, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 74, "y": 1, "w": 72, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 72, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 435, "y": 1, "w": 71, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 71, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 147, "y": 1, "w": 71, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 0, "w": 71, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 219, "y": 1, "w": 71, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 0, "w": 71, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 418, "y": 90, "w": 69, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 69, "h": 42 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 213, "y": 215, "w": 67, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 67, "h": 42 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 1, "y": 256, "w": 65, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 65, "h": 42 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 213, "y": 215, "w": 67, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 67, "h": 42 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 418, "y": 90, "w": 69, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 69, "h": 42 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 219, "y": 1, "w": 71, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 0, "w": 71, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 147, "y": 1, "w": 71, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 0, "w": 71, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 435, "y": 1, "w": 71, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 71, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 74, "y": 1, "w": 72, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 72, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 1, "y": 1, "w": 72, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 72, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 291, "y": 1, "w": 71, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 71, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 1, "y": 1, "w": 72, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 72, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 74, "y": 1, "w": 72, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 72, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 435, "y": 1, "w": 71, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 71, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 147, "y": 1, "w": 71, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 0, "w": 71, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 219, "y": 1, "w": 71, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 0, "w": 71, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 418, "y": 90, "w": 69, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 69, "h": 42 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 213, "y": 215, "w": 67, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 67, "h": 42 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 1, "y": 256, "w": 65, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 65, "h": 42 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 213, "y": 215, "w": 67, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 67, "h": 42 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 418, "y": 90, "w": 69, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 69, "h": 42 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 219, "y": 1, "w": 71, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 0, "w": 71, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 147, "y": 1, "w": 71, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 0, "w": 71, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 435, "y": 1, "w": 71, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 71, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 74, "y": 1, "w": 72, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 72, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 1, "y": 1, "w": 72, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 72, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 291, "y": 1, "w": 71, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 71, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 1, "y": 1, "w": 72, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 72, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 74, "y": 1, "w": 72, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 72, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 435, "y": 1, "w": 71, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 71, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 147, "y": 1, "w": 71, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 0, "w": 71, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 346, "y": 89, "w": 71, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 1, "w": 71, "h": 41 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 425, "y": 133, "w": 71, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 71, "h": 40 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 425, "y": 133, "w": 71, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 1, "w": 71, "h": 40 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 425, "y": 133, "w": 71, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 71, "h": 40 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 289, "y": 175, "w": 71, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 71, "h": 40 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 497, "y": 174, "w": 71, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 2, "w": 71, "h": 40 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 1, "y": 174, "w": 71, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 2, "w": 71, "h": 40 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 497, "y": 133, "w": 71, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 2, "w": 71, "h": 40 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 503, "y": 215, "w": 70, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 70, "h": 40 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 73, "y": 215, "w": 69, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 2, "w": 69, "h": 41 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 486, "y": 46, "w": 68, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 2, "w": 68, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 210, "y": 45, "w": 67, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 2, "w": 67, "h": 44 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 1, "y": 45, "w": 66, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 1, "w": 66, "h": 46 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 278, "y": 45, "w": 67, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 2, "w": 67, "h": 44 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 284, "y": 131, "w": 69, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 2, "w": 69, "h": 42 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 143, "y": 215, "w": 69, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 2, "w": 69, "h": 41 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 281, "y": 216, "w": 70, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 70, "h": 40 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 432, "y": 215, "w": 70, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 70, "h": 40 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 361, "y": 215, "w": 70, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 2, "w": 70, "h": 40 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 73, "y": 174, "w": 71, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 2, "w": 71, "h": 40 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 1, "y": 215, "w": 71, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 71, "h": 40 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 145, "y": 174, "w": 71, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 71, "h": 40 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 71, "y": 132, "w": 70, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 70, "h": 41 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 140, "y": 90, "w": 71, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 71, "h": 41 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 68, "y": 88, "w": 71, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 71, "h": 41 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 346, "y": 45, "w": 70, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 70, "h": 42 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 1, "y": 130, "w": 69, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 69, "h": 42 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 417, "y": 45, "w": 68, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 68, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 507, "y": 1, "w": 69, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 69, "h": 44 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 140, "y": 45, "w": 69, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 69, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 488, "y": 90, "w": 69, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 69, "h": 42 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 142, "y": 132, "w": 70, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 70, "h": 41 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 213, "y": 132, "w": 70, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 70, "h": 41 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 354, "y": 133, "w": 70, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 70, "h": 41 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 217, "y": 174, "w": 71, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 71, "h": 40 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 425, "y": 174, "w": 71, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 71, "h": 40 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 212, "y": 90, "w": 71, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 71, "h": 41 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 346, "y": 89, "w": 71, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 71, "h": 41 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0088.png",
+    "frame": { "x": 68, "y": 45, "w": 71, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 1, "w": 71, "h": 42 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0089.png",
+    "frame": { "x": 363, "y": 1, "w": 71, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 0, "w": 71, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.13-x64",
+  "image": "2075.png",
+  "format": "I8",
+  "size": { "w": 577, "h": 299 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/back/2075.png b/public/images/pokemon/back/2075.png
index 98e86ccfe81..6c11c18bd1d 100644
Binary files a/public/images/pokemon/back/2075.png and b/public/images/pokemon/back/2075.png differ
diff --git a/public/images/pokemon/back/332.png b/public/images/pokemon/back/332.png
index a6940fbaba6..a432b1af4b2 100644
Binary files a/public/images/pokemon/back/332.png and b/public/images/pokemon/back/332.png differ
diff --git a/public/images/pokemon/back/34.png b/public/images/pokemon/back/34.png
index 40827a68879..bb0ad630d1a 100644
Binary files a/public/images/pokemon/back/34.png and b/public/images/pokemon/back/34.png differ
diff --git a/public/images/pokemon/back/396.png b/public/images/pokemon/back/396.png
index 141103a25ad..843c9dca1e4 100644
Binary files a/public/images/pokemon/back/396.png and b/public/images/pokemon/back/396.png differ
diff --git a/public/images/pokemon/back/397.png b/public/images/pokemon/back/397.png
index 96a5d4f161a..236fc18ea44 100644
Binary files a/public/images/pokemon/back/397.png and b/public/images/pokemon/back/397.png differ
diff --git a/public/images/pokemon/back/398.png b/public/images/pokemon/back/398.png
index 57fbb92e12f..63ed37bfd15 100644
Binary files a/public/images/pokemon/back/398.png and b/public/images/pokemon/back/398.png differ
diff --git a/public/images/pokemon/back/403.png b/public/images/pokemon/back/403.png
index c8f49d37d96..303c4b57cbd 100644
Binary files a/public/images/pokemon/back/403.png and b/public/images/pokemon/back/403.png differ
diff --git a/public/images/pokemon/back/404.png b/public/images/pokemon/back/404.png
index eb1a04e4d1b..6592f80c58d 100644
Binary files a/public/images/pokemon/back/404.png and b/public/images/pokemon/back/404.png differ
diff --git a/public/images/pokemon/back/405.png b/public/images/pokemon/back/405.png
index b6c6f12a0fb..0afe5b3036d 100644
Binary files a/public/images/pokemon/back/405.png and b/public/images/pokemon/back/405.png differ
diff --git a/public/images/pokemon/back/477.png b/public/images/pokemon/back/477.png
index 40142d042b9..02b662fbd74 100644
Binary files a/public/images/pokemon/back/477.png and b/public/images/pokemon/back/477.png differ
diff --git a/public/images/pokemon/back/498.png b/public/images/pokemon/back/498.png
index 8ea4900e8f3..c14fb4561e7 100644
Binary files a/public/images/pokemon/back/498.png and b/public/images/pokemon/back/498.png differ
diff --git a/public/images/pokemon/back/500.png b/public/images/pokemon/back/500.png
index de1b556bede..082f0460ff2 100644
Binary files a/public/images/pokemon/back/500.png and b/public/images/pokemon/back/500.png differ
diff --git a/public/images/pokemon/back/522.png b/public/images/pokemon/back/522.png
index 54c706d1455..ff5bbafb915 100644
Binary files a/public/images/pokemon/back/522.png and b/public/images/pokemon/back/522.png differ
diff --git a/public/images/pokemon/back/523.png b/public/images/pokemon/back/523.png
index 6f25fd9cc74..023afbd1008 100644
Binary files a/public/images/pokemon/back/523.png and b/public/images/pokemon/back/523.png differ
diff --git a/public/images/pokemon/back/535.png b/public/images/pokemon/back/535.png
index ac477600b72..2556d646aa6 100644
Binary files a/public/images/pokemon/back/535.png and b/public/images/pokemon/back/535.png differ
diff --git a/public/images/pokemon/back/536.png b/public/images/pokemon/back/536.png
index 32e48b10c85..393006e83b9 100644
Binary files a/public/images/pokemon/back/536.png and b/public/images/pokemon/back/536.png differ
diff --git a/public/images/pokemon/back/554.png b/public/images/pokemon/back/554.png
index 4ed9c06f0ee..f6423a5e66e 100644
Binary files a/public/images/pokemon/back/554.png and b/public/images/pokemon/back/554.png differ
diff --git a/public/images/pokemon/back/555-zen.png b/public/images/pokemon/back/555-zen.png
index 48ef6beb7c4..8fe0e672a3a 100644
Binary files a/public/images/pokemon/back/555-zen.png and b/public/images/pokemon/back/555-zen.png differ
diff --git a/public/images/pokemon/back/555.png b/public/images/pokemon/back/555.png
index 8f1a709c5f4..77c04139079 100644
Binary files a/public/images/pokemon/back/555.png and b/public/images/pokemon/back/555.png differ
diff --git a/public/images/pokemon/back/567.png b/public/images/pokemon/back/567.png
index ca9432a3e71..ec4197fbb92 100644
Binary files a/public/images/pokemon/back/567.png and b/public/images/pokemon/back/567.png differ
diff --git a/public/images/pokemon/back/572.png b/public/images/pokemon/back/572.png
index d7ddaf62136..4d081564b50 100644
Binary files a/public/images/pokemon/back/572.png and b/public/images/pokemon/back/572.png differ
diff --git a/public/images/pokemon/back/573.png b/public/images/pokemon/back/573.png
index 03a0093d70d..ef4a8bc14ab 100644
Binary files a/public/images/pokemon/back/573.png and b/public/images/pokemon/back/573.png differ
diff --git a/public/images/pokemon/back/626.png b/public/images/pokemon/back/626.png
index 05b6514878d..a3098a1c1d3 100644
Binary files a/public/images/pokemon/back/626.png and b/public/images/pokemon/back/626.png differ
diff --git a/public/images/pokemon/back/643.png b/public/images/pokemon/back/643.png
index 30b32e7902d..597b4bcb189 100644
Binary files a/public/images/pokemon/back/643.png and b/public/images/pokemon/back/643.png differ
diff --git a/public/images/pokemon/back/644.png b/public/images/pokemon/back/644.png
index ab17e62c2e6..39a4d3499bd 100644
Binary files a/public/images/pokemon/back/644.png and b/public/images/pokemon/back/644.png differ
diff --git a/public/images/pokemon/back/645-incarnate.png b/public/images/pokemon/back/645-incarnate.png
index 8be36f692f9..d47e03c718b 100644
Binary files a/public/images/pokemon/back/645-incarnate.png and b/public/images/pokemon/back/645-incarnate.png differ
diff --git a/public/images/pokemon/back/645-therian.png b/public/images/pokemon/back/645-therian.png
index 2e5e6e03e05..127a759f89a 100644
Binary files a/public/images/pokemon/back/645-therian.png and b/public/images/pokemon/back/645-therian.png differ
diff --git a/public/images/pokemon/back/646-black.png b/public/images/pokemon/back/646-black.png
index aeeb90f147e..7783e4c8cd5 100644
Binary files a/public/images/pokemon/back/646-black.png and b/public/images/pokemon/back/646-black.png differ
diff --git a/public/images/pokemon/back/646-white.png b/public/images/pokemon/back/646-white.png
index f5db6867e94..1dc659ed6ac 100644
Binary files a/public/images/pokemon/back/646-white.png and b/public/images/pokemon/back/646-white.png differ
diff --git a/public/images/pokemon/back/646.png b/public/images/pokemon/back/646.png
index 3a36013adec..6ca7f51f01d 100644
Binary files a/public/images/pokemon/back/646.png and b/public/images/pokemon/back/646.png differ
diff --git a/public/images/pokemon/back/658.json b/public/images/pokemon/back/658.json
index 050b63e3592..1d8893e2d5d 100644
--- a/public/images/pokemon/back/658.json
+++ b/public/images/pokemon/back/658.json
@@ -1,19 +1,19 @@
 { "frames": [
    {
     "filename": "0001.png",
-    "frame": { "x": 0, "y": 0, "w": 77, "h": 77 },
+    "frame": { "x": 0, "y": 0, "w": 77, "h": 65 },
     "rotated": false,
     "trimmed": false,
-    "spriteSourceSize": { "x": 0, "y": 0, "w": 77, "h": 77 },
-    "sourceSize": { "w": 77, "h": 77 },
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 77, "h": 65 },
+    "sourceSize": { "w": 77, "h": 65 },
     "duration": 100
    }
  ],
  "meta": {
   "app": "https://www.aseprite.org/",
-  "version": "1.3.7-x64",
+  "version": "1.3.9.2-x64",
   "format": "I8",
-  "size": { "w": 77, "h": 77 },
+  "size": { "w": 77, "h": 65 },
   "scale": "1"
  }
 }
diff --git a/public/images/pokemon/back/658.png b/public/images/pokemon/back/658.png
index ea24d9a6336..be286b88666 100644
Binary files a/public/images/pokemon/back/658.png and b/public/images/pokemon/back/658.png differ
diff --git a/public/images/pokemon/back/666-fancy.png b/public/images/pokemon/back/666-fancy.png
index 35ed4317d8e..b56daf08a52 100644
Binary files a/public/images/pokemon/back/666-fancy.png and b/public/images/pokemon/back/666-fancy.png differ
diff --git a/public/images/pokemon/back/666-high-plains.png b/public/images/pokemon/back/666-high-plains.png
index 22f676d8f49..d6cca9c2413 100644
Binary files a/public/images/pokemon/back/666-high-plains.png and b/public/images/pokemon/back/666-high-plains.png differ
diff --git a/public/images/pokemon/back/666-river.png b/public/images/pokemon/back/666-river.png
index 0d7d7a65d1e..effabe7fa2d 100644
Binary files a/public/images/pokemon/back/666-river.png and b/public/images/pokemon/back/666-river.png differ
diff --git a/public/images/pokemon/back/668-female.json b/public/images/pokemon/back/668-female.json
deleted file mode 100644
index dc3fc99ba58..00000000000
--- a/public/images/pokemon/back/668-female.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "668-female.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 74,
-				"h": 74
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 74,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 74,
-						"h": 72
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 74,
-						"h": 72
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:3b22b1fc8fabd22888048f909287acba:10bec1e42fb1d39868a624d00345818d:d99ed0e84a0695b54e479aa98271aba1$"
-	}
-}
diff --git a/public/images/pokemon/back/668-female.png b/public/images/pokemon/back/668-female.png
deleted file mode 100644
index 6f28278630a..00000000000
Binary files a/public/images/pokemon/back/668-female.png and /dev/null differ
diff --git a/public/images/pokemon/back/674.json b/public/images/pokemon/back/674.json
index e280c324a0a..cc0ead50962 100644
--- a/public/images/pokemon/back/674.json
+++ b/public/images/pokemon/back/674.json
@@ -1,41 +1,506 @@
-{
-	"textures": [
-		{
-			"image": "674.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 42,
-				"h": 42
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 27,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 27,
-						"h": 42
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 27,
-						"h": 42
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:1fb0fb4f4e63f6114c7490a9d4d536dc:9830bfa81d721fc889ca0580935f03e3:b823d10f1c9b4d501296982088ba63d6$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 58, "y": 40, "w": 27, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 27, "h": 42 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 85, "y": 41, "w": 27, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 27, "h": 41 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 70
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 27, "y": 80, "w": 27, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 27, "h": 40 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 81, "y": 82, "w": 27, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 27, "h": 39 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 210
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 27, "y": 80, "w": 27, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 27, "h": 40 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 85, "y": 41, "w": 27, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 27, "h": 41 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 58, "y": 40, "w": 27, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 27, "h": 42 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 85, "y": 41, "w": 27, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 27, "h": 41 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 70
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 27, "y": 80, "w": 27, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 27, "h": 40 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 81, "y": 82, "w": 27, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 27, "h": 39 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 210
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 27, "y": 80, "w": 27, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 27, "h": 40 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 85, "y": 41, "w": 27, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 27, "h": 41 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 58, "y": 40, "w": 27, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 27, "h": 42 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 85, "y": 41, "w": 27, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 27, "h": 41 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 70
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 27, "y": 80, "w": 27, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 27, "h": 40 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 81, "y": 82, "w": 27, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 27, "h": 39 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 210
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 27, "y": 80, "w": 27, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 27, "h": 40 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 85, "y": 41, "w": 27, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 27, "h": 41 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 58, "y": 40, "w": 27, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 27, "h": 42 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 85, "y": 41, "w": 27, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 27, "h": 41 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 70
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 27, "y": 80, "w": 27, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 27, "h": 40 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 81, "y": 82, "w": 27, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 27, "h": 39 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 210
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 27, "y": 80, "w": 27, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 27, "h": 40 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 85, "y": 41, "w": 27, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 27, "h": 41 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 58, "y": 40, "w": 27, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 27, "h": 42 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 85, "y": 41, "w": 27, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 27, "h": 41 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 70
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 27, "y": 80, "w": 27, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 27, "h": 40 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 81, "y": 82, "w": 27, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 27, "h": 39 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 210
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 27, "y": 80, "w": 27, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 27, "h": 40 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 85, "y": 41, "w": 27, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 27, "h": 41 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 58, "y": 40, "w": 27, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 27, "h": 42 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 0, "y": 42, "w": 27, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 27, "h": 41 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 70
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 54, "y": 82, "w": 27, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 27, "h": 40 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 0, "y": 83, "w": 27, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 27, "h": 39 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 210
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 54, "y": 82, "w": 27, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 27, "h": 40 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 87, "y": 0, "w": 28, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 28, "h": 41 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 0, "y": 0, "w": 29, "h": 42 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 29, "y": 0, "w": 29, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 29, "h": 41 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 70
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 58, "y": 0, "w": 29, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 29, "h": 40 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 29, "y": 41, "w": 29, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 29, "h": 39 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 210
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 58, "y": 0, "w": 29, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 29, "h": 40 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 29, "y": 0, "w": 29, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 29, "h": 41 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 0, "y": 0, "w": 29, "h": 42 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 29, "y": 0, "w": 29, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 29, "h": 41 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 70
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 58, "y": 0, "w": 29, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 29, "h": 40 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 29, "y": 41, "w": 29, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 29, "h": 39 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 210
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 58, "y": 0, "w": 29, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 29, "h": 40 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 29, "y": 0, "w": 29, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 29, "h": 41 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 0, "y": 0, "w": 29, "h": 42 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 87, "y": 0, "w": 28, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 28, "h": 41 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 70
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 54, "y": 82, "w": 27, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 27, "h": 40 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 81, "y": 82, "w": 27, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 27, "h": 39 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 210
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 27, "y": 80, "w": 27, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 27, "h": 40 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 70
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 85, "y": 41, "w": 27, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 27, "h": 41 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 58, "y": 40, "w": 27, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 27, "h": 42 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 70
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.11-x64",
+  "image": "674.png",
+  "format": "I8",
+  "size": { "w": 115, "h": 122 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/back/674.png b/public/images/pokemon/back/674.png
index be77e6e1598..9a9d0ec59dd 100644
Binary files a/public/images/pokemon/back/674.png and b/public/images/pokemon/back/674.png differ
diff --git a/public/images/pokemon/back/692.json b/public/images/pokemon/back/692.json
index bce3c7e1b49..e83252f8486 100644
--- a/public/images/pokemon/back/692.json
+++ b/public/images/pokemon/back/692.json
@@ -1,41 +1,20 @@
-{
-	"textures": [
-		{
-			"image": "692.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 56,
-				"h": 56
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 56,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 56,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 56,
-						"h": 35
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:0a35aa3345ff8a4432ecda2feb4d64c0:d3698e869432ff55b6d6cefbe02ef068:2880def858c84cd859bedf13b0b49a33$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 121, "y": 36, "w": 56, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "692.png",
+  "format": "I8",
+  "size": { "w": 181, "h": 106 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/back/692.png b/public/images/pokemon/back/692.png
index c61c905353f..33059d53c05 100644
Binary files a/public/images/pokemon/back/692.png and b/public/images/pokemon/back/692.png differ
diff --git a/public/images/pokemon/back/694.json b/public/images/pokemon/back/694.json
index afdb992784d..76c88067e7e 100644
--- a/public/images/pokemon/back/694.json
+++ b/public/images/pokemon/back/694.json
@@ -1,41 +1,767 @@
-{
-	"textures": [
-		{
-			"image": "694.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 44,
-				"h": 44
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 44,
-						"h": 37
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 44,
-						"h": 37
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 44,
-						"h": 37
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:b35211eb8a79aa76e67039dd27e0e5a6:1905f4c2a0828a1c7c274f51d78b7e21:b0990f9650cfe63b836cbed33f0b44d8$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 102, "y": 163, "w": 44, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 44, "h": 37 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 57, "y": 129, "w": 45, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 45, "h": 37 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 162, "y": 127, "w": 47, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 47, "h": 37 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 114, "y": 126, "w": 48, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 48, "h": 37 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 283, "y": 90, "w": 49, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 49, "h": 37 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 227, "y": 126, "w": 49, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 12, "w": 49, "h": 36 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 276, "y": 127, "w": 47, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 11, "w": 47, "h": 37 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 0, "y": 132, "w": 45, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 45, "h": 37 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 132, "y": 201, "w": 43, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 43, "h": 37 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 234, "y": 201, "w": 42, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 42, "h": 37 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 0, "y": 206, "w": 42, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 12, "w": 42, "h": 36 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 44, "y": 203, "w": 43, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 12, "w": 43, "h": 36 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 276, "y": 201, "w": 43, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 12, "w": 43, "h": 36 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 89, "y": 200, "w": 43, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 43, "h": 37 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 146, "y": 164, "w": 44, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 44, "h": 37 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 102, "y": 163, "w": 44, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 44, "h": 37 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 57, "y": 129, "w": 45, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 45, "h": 37 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 162, "y": 127, "w": 47, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 47, "h": 37 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 114, "y": 126, "w": 48, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 48, "h": 37 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 283, "y": 90, "w": 49, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 49, "h": 37 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 227, "y": 126, "w": 49, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 12, "w": 49, "h": 36 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 276, "y": 127, "w": 47, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 11, "w": 47, "h": 37 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 0, "y": 132, "w": 45, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 45, "h": 37 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 132, "y": 201, "w": 43, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 43, "h": 37 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 234, "y": 201, "w": 42, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 42, "h": 37 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 0, "y": 206, "w": 42, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 12, "w": 42, "h": 36 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 44, "y": 203, "w": 43, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 12, "w": 43, "h": 36 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 276, "y": 201, "w": 43, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 12, "w": 43, "h": 36 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 89, "y": 200, "w": 43, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 43, "h": 37 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 146, "y": 164, "w": 44, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 44, "h": 37 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 102, "y": 163, "w": 44, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 44, "h": 37 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 57, "y": 129, "w": 45, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 45, "h": 37 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 162, "y": 127, "w": 47, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 47, "h": 37 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 114, "y": 126, "w": 48, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 48, "h": 37 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 283, "y": 90, "w": 49, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 49, "h": 37 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 227, "y": 126, "w": 49, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 12, "w": 49, "h": 36 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 276, "y": 127, "w": 47, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 11, "w": 47, "h": 37 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 0, "y": 132, "w": 45, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 45, "h": 37 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 132, "y": 201, "w": 43, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 43, "h": 37 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 234, "y": 201, "w": 42, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 42, "h": 37 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 0, "y": 206, "w": 42, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 12, "w": 42, "h": 36 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 44, "y": 203, "w": 43, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 12, "w": 43, "h": 36 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 276, "y": 201, "w": 43, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 12, "w": 43, "h": 36 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 89, "y": 200, "w": 43, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 43, "h": 37 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 146, "y": 164, "w": 44, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 44, "h": 37 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 102, "y": 163, "w": 44, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 44, "h": 37 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 57, "y": 129, "w": 45, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 45, "h": 37 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 162, "y": 127, "w": 47, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 47, "h": 37 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 114, "y": 126, "w": 48, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 48, "h": 37 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 283, "y": 90, "w": 49, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 49, "h": 37 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 227, "y": 126, "w": 49, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 12, "w": 49, "h": 36 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 276, "y": 127, "w": 47, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 11, "w": 47, "h": 37 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 0, "y": 132, "w": 45, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 45, "h": 37 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 132, "y": 201, "w": 43, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 43, "h": 37 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 234, "y": 201, "w": 42, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 42, "h": 37 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 0, "y": 206, "w": 42, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 12, "w": 42, "h": 36 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 44, "y": 203, "w": 43, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 12, "w": 43, "h": 36 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 276, "y": 201, "w": 43, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 12, "w": 43, "h": 36 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 89, "y": 200, "w": 43, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 43, "h": 37 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 146, "y": 164, "w": 44, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 44, "h": 37 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 102, "y": 163, "w": 44, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 44, "h": 37 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 253, "y": 164, "w": 44, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 44, "h": 37 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 297, "y": 164, "w": 44, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 44, "h": 37 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 45, "y": 166, "w": 44, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 44, "h": 37 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 209, "y": 162, "w": 44, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 44, "h": 37 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 172, "y": 90, "w": 55, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 11, "w": 55, "h": 37 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 57, "y": 90, "w": 57, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 9, "w": 57, "h": 39 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 117, "y": 0, "w": 58, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 58, "h": 47 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 59, "y": 0, "w": 58, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 58, "h": 48 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 0, "y": 0, "w": 59, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 59, "h": 48 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 232, "y": 0, "w": 58, "h": 45 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 58, "h": 45 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 232, "y": 45, "w": 57, "h": 45 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 57, "h": 45 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 175, "y": 0, "w": 57, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 57, "h": 47 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 289, "y": 45, "w": 57, "h": 45 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 57, "h": 45 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 117, "y": 47, "w": 57, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 57, "h": 43 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 290, "y": 0, "w": 58, "h": 45 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 58, "h": 45 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 174, "y": 47, "w": 57, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 57, "h": 43 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 58, "y": 48, "w": 57, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 57, "h": 42 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 0, "y": 90, "w": 57, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 57, "h": 42 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 0, "y": 48, "w": 58, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 58, "h": 42 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 114, "y": 90, "w": 58, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 12, "w": 58, "h": 36 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 227, "y": 90, "w": 56, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 12, "w": 56, "h": 36 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 0, "y": 169, "w": 44, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 11, "w": 44, "h": 37 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 190, "y": 199, "w": 44, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 44, "h": 37 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.11-x64",
+  "image": "694.png",
+  "format": "I8",
+  "size": { "w": 348, "h": 242 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/back/694.png b/public/images/pokemon/back/694.png
index 5c5b107960c..d5f2f5f9563 100644
Binary files a/public/images/pokemon/back/694.png and b/public/images/pokemon/back/694.png differ
diff --git a/public/images/pokemon/back/698.json b/public/images/pokemon/back/698.json
index 5cfdd360d26..0da697e1f4e 100644
--- a/public/images/pokemon/back/698.json
+++ b/public/images/pokemon/back/698.json
@@ -1,41 +1,1415 @@
-{
-	"textures": [
-		{
-			"image": "698.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 55,
-				"h": 55
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 37,
-						"h": 55
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 55
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 55
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:18b6430a6c7f4e62e682eee0f5b03c01:4297c6c0129460df1d8cf73dd3393a43:198087d69fed44d4a642fa3ba5c077d6$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 0, "y": 52, "w": 37, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 0, "y": 52, "w": 37, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 0, "y": 107, "w": 35, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 35, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 0, "y": 107, "w": 35, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 35, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 139, "y": 111, "w": 33, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 33, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 139, "y": 111, "w": 33, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 33, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 68, "y": 112, "w": 31, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 31, "h": 54 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 68, "y": 112, "w": 31, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 31, "h": 54 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 99, "y": 113, "w": 31, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 31, "h": 53 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 99, "y": 113, "w": 31, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 31, "h": 53 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 68, "y": 112, "w": 31, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 31, "h": 54 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 68, "y": 112, "w": 31, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 31, "h": 54 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 139, "y": 111, "w": 33, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 33, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 139, "y": 111, "w": 33, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 33, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 0, "y": 107, "w": 35, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 35, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 0, "y": 107, "w": 35, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 35, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 0, "y": 52, "w": 37, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 0, "y": 52, "w": 37, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 0, "y": 52, "w": 37, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 0, "y": 52, "w": 37, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 0, "y": 52, "w": 37, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 0, "y": 52, "w": 37, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 0, "y": 52, "w": 37, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 0, "y": 52, "w": 37, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 130, "y": 0, "w": 39, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 39, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 130, "y": 0, "w": 39, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 39, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 89, "y": 0, "w": 41, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 41, "h": 54 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 89, "y": 0, "w": 41, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 41, "h": 54 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 45, "y": 0, "w": 44, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 44, "h": 53 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 45, "y": 0, "w": 44, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 44, "h": 53 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 0, "y": 0, "w": 45, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 6, "w": 45, "h": 52 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 0, "y": 0, "w": 45, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 6, "w": 45, "h": 52 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 45, "y": 0, "w": 44, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 44, "h": 53 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 45, "y": 0, "w": 44, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 44, "h": 53 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 89, "y": 0, "w": 41, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 41, "h": 54 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 89, "y": 0, "w": 41, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 41, "h": 54 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 130, "y": 0, "w": 39, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 39, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 130, "y": 0, "w": 39, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 39, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 130, "y": 0, "w": 39, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 39, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 130, "y": 0, "w": 39, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 39, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 0, "y": 52, "w": 37, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 0, "y": 52, "w": 37, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 0, "y": 107, "w": 35, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 35, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 0, "y": 107, "w": 35, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 35, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 139, "y": 111, "w": 33, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 33, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 139, "y": 111, "w": 33, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 33, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 68, "y": 112, "w": 31, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 31, "h": 54 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 68, "y": 112, "w": 31, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 31, "h": 54 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 99, "y": 113, "w": 31, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 31, "h": 53 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 99, "y": 113, "w": 31, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 31, "h": 53 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 68, "y": 112, "w": 31, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 31, "h": 54 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 68, "y": 112, "w": 31, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 31, "h": 54 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 139, "y": 111, "w": 33, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 33, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 139, "y": 111, "w": 33, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 33, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 0, "y": 107, "w": 35, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 35, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 0, "y": 107, "w": 35, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 35, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 0, "y": 52, "w": 37, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 0, "y": 52, "w": 37, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 0, "y": 52, "w": 37, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 0, "y": 52, "w": 37, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 0, "y": 52, "w": 37, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 0, "y": 52, "w": 37, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 0, "y": 52, "w": 37, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 0, "y": 52, "w": 37, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 130, "y": 0, "w": 39, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 39, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 130, "y": 0, "w": 39, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 39, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 89, "y": 0, "w": 41, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 41, "h": 54 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 89, "y": 0, "w": 41, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 41, "h": 54 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 45, "y": 0, "w": 44, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 44, "h": 53 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 45, "y": 0, "w": 44, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 44, "h": 53 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 0, "y": 0, "w": 45, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 6, "w": 45, "h": 52 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 0, "y": 0, "w": 45, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 6, "w": 45, "h": 52 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 45, "y": 0, "w": 44, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 44, "h": 53 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 45, "y": 0, "w": 44, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 44, "h": 53 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 89, "y": 0, "w": 41, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 41, "h": 54 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 89, "y": 0, "w": 41, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 41, "h": 54 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 130, "y": 0, "w": 39, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 39, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 130, "y": 0, "w": 39, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 39, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 130, "y": 0, "w": 39, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 39, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 130, "y": 0, "w": 39, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 39, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 0, "y": 52, "w": 37, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 0, "y": 52, "w": 37, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 0, "y": 107, "w": 35, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 35, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 0, "y": 107, "w": 35, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 35, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 139, "y": 111, "w": 33, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 33, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 139, "y": 111, "w": 33, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 33, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 68, "y": 112, "w": 31, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 31, "h": 54 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0088.png",
+    "frame": { "x": 68, "y": 112, "w": 31, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 31, "h": 54 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0089.png",
+    "frame": { "x": 99, "y": 113, "w": 31, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 31, "h": 53 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0090.png",
+    "frame": { "x": 99, "y": 113, "w": 31, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 31, "h": 53 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0091.png",
+    "frame": { "x": 68, "y": 112, "w": 31, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 31, "h": 54 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0092.png",
+    "frame": { "x": 68, "y": 112, "w": 31, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 31, "h": 54 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0093.png",
+    "frame": { "x": 139, "y": 111, "w": 33, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 33, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0094.png",
+    "frame": { "x": 139, "y": 111, "w": 33, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 33, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0095.png",
+    "frame": { "x": 0, "y": 107, "w": 35, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 35, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0096.png",
+    "frame": { "x": 0, "y": 107, "w": 35, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 35, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0097.png",
+    "frame": { "x": 0, "y": 52, "w": 37, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0098.png",
+    "frame": { "x": 0, "y": 52, "w": 37, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0099.png",
+    "frame": { "x": 0, "y": 52, "w": 37, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0100.png",
+    "frame": { "x": 0, "y": 52, "w": 37, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0101.png",
+    "frame": { "x": 0, "y": 52, "w": 37, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0102.png",
+    "frame": { "x": 0, "y": 52, "w": 37, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0103.png",
+    "frame": { "x": 0, "y": 52, "w": 37, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0104.png",
+    "frame": { "x": 0, "y": 52, "w": 37, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0105.png",
+    "frame": { "x": 130, "y": 0, "w": 39, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 39, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0106.png",
+    "frame": { "x": 130, "y": 0, "w": 39, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 39, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0107.png",
+    "frame": { "x": 89, "y": 0, "w": 41, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 41, "h": 54 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0108.png",
+    "frame": { "x": 89, "y": 0, "w": 41, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 41, "h": 54 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0109.png",
+    "frame": { "x": 45, "y": 0, "w": 44, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 44, "h": 53 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0110.png",
+    "frame": { "x": 45, "y": 0, "w": 44, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 44, "h": 53 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0111.png",
+    "frame": { "x": 0, "y": 0, "w": 45, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 6, "w": 45, "h": 52 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0112.png",
+    "frame": { "x": 0, "y": 0, "w": 45, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 6, "w": 45, "h": 52 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0113.png",
+    "frame": { "x": 45, "y": 0, "w": 44, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 44, "h": 53 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0114.png",
+    "frame": { "x": 45, "y": 0, "w": 44, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 44, "h": 53 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0115.png",
+    "frame": { "x": 89, "y": 0, "w": 41, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 41, "h": 54 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0116.png",
+    "frame": { "x": 89, "y": 0, "w": 41, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 41, "h": 54 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0117.png",
+    "frame": { "x": 130, "y": 0, "w": 39, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 39, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0118.png",
+    "frame": { "x": 130, "y": 0, "w": 39, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 39, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0119.png",
+    "frame": { "x": 130, "y": 0, "w": 39, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 39, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0120.png",
+    "frame": { "x": 130, "y": 0, "w": 39, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 39, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0121.png",
+    "frame": { "x": 0, "y": 52, "w": 37, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0122.png",
+    "frame": { "x": 0, "y": 52, "w": 37, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0123.png",
+    "frame": { "x": 139, "y": 55, "w": 35, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 35, "h": 56 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0124.png",
+    "frame": { "x": 139, "y": 55, "w": 35, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 35, "h": 56 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0125.png",
+    "frame": { "x": 35, "y": 111, "w": 33, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 33, "h": 58 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0126.png",
+    "frame": { "x": 35, "y": 111, "w": 33, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 33, "h": 58 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0127.png",
+    "frame": { "x": 37, "y": 53, "w": 34, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 34, "h": 58 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0128.png",
+    "frame": { "x": 37, "y": 53, "w": 34, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 34, "h": 58 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0129.png",
+    "frame": { "x": 71, "y": 54, "w": 34, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 34, "h": 58 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0130.png",
+    "frame": { "x": 71, "y": 54, "w": 34, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 34, "h": 58 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0131.png",
+    "frame": { "x": 105, "y": 55, "w": 34, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 34, "h": 58 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0132.png",
+    "frame": { "x": 105, "y": 55, "w": 34, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 34, "h": 58 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0133.png",
+    "frame": { "x": 37, "y": 53, "w": 34, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 34, "h": 58 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0134.png",
+    "frame": { "x": 37, "y": 53, "w": 34, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 34, "h": 58 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0135.png",
+    "frame": { "x": 71, "y": 54, "w": 34, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 34, "h": 58 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0136.png",
+    "frame": { "x": 71, "y": 54, "w": 34, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 34, "h": 58 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0137.png",
+    "frame": { "x": 105, "y": 55, "w": 34, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 34, "h": 58 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0138.png",
+    "frame": { "x": 105, "y": 55, "w": 34, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 34, "h": 58 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0139.png",
+    "frame": { "x": 37, "y": 53, "w": 34, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 34, "h": 58 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0140.png",
+    "frame": { "x": 37, "y": 53, "w": 34, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 34, "h": 58 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0141.png",
+    "frame": { "x": 71, "y": 54, "w": 34, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 34, "h": 58 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0142.png",
+    "frame": { "x": 71, "y": 54, "w": 34, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 34, "h": 58 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0143.png",
+    "frame": { "x": 105, "y": 55, "w": 34, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 34, "h": 58 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0144.png",
+    "frame": { "x": 105, "y": 55, "w": 34, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 34, "h": 58 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0145.png",
+    "frame": { "x": 37, "y": 53, "w": 34, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 34, "h": 58 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0146.png",
+    "frame": { "x": 37, "y": 53, "w": 34, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 34, "h": 58 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0147.png",
+    "frame": { "x": 71, "y": 54, "w": 34, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 34, "h": 58 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0148.png",
+    "frame": { "x": 71, "y": 54, "w": 34, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 34, "h": 58 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0149.png",
+    "frame": { "x": 105, "y": 55, "w": 34, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 34, "h": 58 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0150.png",
+    "frame": { "x": 105, "y": 55, "w": 34, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 34, "h": 58 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0151.png",
+    "frame": { "x": 35, "y": 111, "w": 33, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 33, "h": 58 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0152.png",
+    "frame": { "x": 35, "y": 111, "w": 33, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 33, "h": 58 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0153.png",
+    "frame": { "x": 139, "y": 55, "w": 35, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 35, "h": 56 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0154.png",
+    "frame": { "x": 139, "y": 55, "w": 35, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 35, "h": 56 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0155.png",
+    "frame": { "x": 0, "y": 52, "w": 37, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0156.png",
+    "frame": { "x": 0, "y": 52, "w": 37, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.11-x64",
+  "image": "698.png",
+  "format": "I8",
+  "size": { "w": 174, "h": 169 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/back/698.png b/public/images/pokemon/back/698.png
index 7326005d6f1..cd49968a7cd 100644
Binary files a/public/images/pokemon/back/698.png and b/public/images/pokemon/back/698.png differ
diff --git a/public/images/pokemon/back/703.json b/public/images/pokemon/back/703.json
index 4afe5c3a14d..d6752e6f7ff 100644
--- a/public/images/pokemon/back/703.json
+++ b/public/images/pokemon/back/703.json
@@ -1,41 +1,569 @@
-{
-	"textures": [
-		{
-			"image": "703.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 38,
-				"h": 38
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 37,
-						"h": 38
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 38
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 38
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:32e6c2d8721f80aa2afd20f97c5e4cf1:2c61f7a426cd2d739241c87d6ab5ea99:721af8c322ff60159262e9b3017c784d$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 36, "y": 0, "w": 37, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 37, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 73, "y": 0, "w": 37, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 37, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 73, "y": 38, "w": 36, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 36, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 0, "y": 40, "w": 36, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 36, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 36, "y": 76, "w": 36, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 8, "w": 36, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 0, "y": 78, "w": 35, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 9, "w": 35, "h": 39 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 0, "y": 0, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 9, "w": 36, "h": 40 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 0, "y": 0, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 8, "w": 36, "h": 40 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 0, "y": 78, "w": 35, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 7, "w": 35, "h": 39 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 36, "y": 76, "w": 36, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 36, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 0, "y": 40, "w": 36, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 36, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 72, "y": 76, "w": 36, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 36, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 36, "y": 0, "w": 37, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 37, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 73, "y": 0, "w": 37, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 37, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 73, "y": 38, "w": 36, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 36, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 0, "y": 40, "w": 36, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 36, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 36, "y": 76, "w": 36, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 8, "w": 36, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 0, "y": 78, "w": 35, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 9, "w": 35, "h": 39 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 0, "y": 0, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 9, "w": 36, "h": 40 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 0, "y": 0, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 8, "w": 36, "h": 40 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 0, "y": 78, "w": 35, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 7, "w": 35, "h": 39 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 36, "y": 76, "w": 36, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 36, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 0, "y": 40, "w": 36, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 36, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 72, "y": 76, "w": 36, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 36, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 36, "y": 0, "w": 37, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 37, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 73, "y": 0, "w": 37, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 37, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 73, "y": 38, "w": 36, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 36, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 0, "y": 40, "w": 36, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 36, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 36, "y": 76, "w": 36, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 8, "w": 36, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 0, "y": 78, "w": 35, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 9, "w": 35, "h": 39 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 0, "y": 0, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 9, "w": 36, "h": 40 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 0, "y": 0, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 8, "w": 36, "h": 40 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 0, "y": 78, "w": 35, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 7, "w": 35, "h": 39 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 36, "y": 76, "w": 36, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 36, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 0, "y": 40, "w": 36, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 36, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 72, "y": 76, "w": 36, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 36, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 36, "y": 0, "w": 37, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 37, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 73, "y": 0, "w": 37, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 37, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 73, "y": 38, "w": 36, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 36, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 0, "y": 40, "w": 36, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 36, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 36, "y": 76, "w": 36, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 8, "w": 36, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 0, "y": 78, "w": 35, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 9, "w": 35, "h": 39 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 0, "y": 0, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 9, "w": 36, "h": 40 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 0, "y": 0, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 8, "w": 36, "h": 40 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 0, "y": 78, "w": 35, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 7, "w": 35, "h": 39 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 36, "y": 76, "w": 36, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 36, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 0, "y": 40, "w": 36, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 36, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 72, "y": 76, "w": 36, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 36, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 36, "y": 0, "w": 37, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 37, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 36, "y": 38, "w": 37, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 0, "y": 78, "w": 35, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 35, "h": 39 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 0, "y": 78, "w": 35, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 7, "w": 35, "h": 39 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 0, "y": 78, "w": 35, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 35, "h": 39 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 0, "y": 78, "w": 35, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 6, "w": 35, "h": 39 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 0, "y": 78, "w": 35, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 35, "h": 39 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 0, "y": 78, "w": 35, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 6, "w": 35, "h": 39 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 0, "y": 78, "w": 35, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 35, "h": 39 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 0, "y": 78, "w": 35, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 6, "w": 35, "h": 39 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 0, "y": 78, "w": 35, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 35, "h": 39 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 36, "y": 38, "w": 37, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 37, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 73, "y": 38, "w": 36, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 36, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 72, "y": 76, "w": 36, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 36, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.11-x64",
+  "image": "703.png",
+  "format": "I8",
+  "size": { "w": 110, "h": 117 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/back/703.png b/public/images/pokemon/back/703.png
index 1f52ddd3afe..b5b35e07027 100644
Binary files a/public/images/pokemon/back/703.png and b/public/images/pokemon/back/703.png differ
diff --git a/public/images/pokemon/back/707.json b/public/images/pokemon/back/707.json
index cf372e6a60f..b92e1983efc 100644
--- a/public/images/pokemon/back/707.json
+++ b/public/images/pokemon/back/707.json
@@ -1,41 +1,1559 @@
-{
-	"textures": [
-		{
-			"image": "707.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 77,
-				"h": 77
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 43,
-						"h": 77
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 43,
-						"h": 77
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 43,
-						"h": 77
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:8e9f9a53c8e85bade8027fc978f717a4:3280efd867363be1c2e5a01411ad5bd5:8e96b9056ea81e44ced99c97f472a528$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 2, "y": 358, "w": 43, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 18, "w": 43, "h": 77 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 190, "y": 373, "w": 42, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 30, "y": 17, "w": 42, "h": 77 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 391, "y": 440, "w": 41, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 33, "y": 16, "w": 41, "h": 76 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 443, "y": 377, "w": 42, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 35, "y": 16, "w": 42, "h": 76 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 715, "y": 359, "w": 44, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 36, "y": 15, "w": 44, "h": 75 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 45, "y": 363, "w": 44, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 38, "y": 14, "w": 44, "h": 75 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 520, "y": 352, "w": 45, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 39, "y": 13, "w": 45, "h": 74 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 306, "y": 291, "w": 48, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 41, "y": 14, "w": 48, "h": 72 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 527, "y": 213, "w": 51, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 43, "y": 13, "w": 51, "h": 72 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 372, "y": 139, "w": 56, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 44, "y": 12, "w": 56, "h": 71 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 404, "y": 69, "w": 59, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 43, "y": 13, "w": 59, "h": 70 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 658, "y": 73, "w": 57, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 41, "y": 14, "w": 57, "h": 71 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 570, "y": 141, "w": 55, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 39, "y": 13, "w": 55, "h": 72 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 161, "y": 145, "w": 53, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 38, "y": 14, "w": 53, "h": 72 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 2, "y": 208, "w": 51, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 36, "y": 15, "w": 51, "h": 73 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 475, "y": 229, "w": 49, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 35, "y": 16, "w": 49, "h": 73 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 623, "y": 300, "w": 46, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 33, "y": 16, "w": 46, "h": 74 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 475, "y": 302, "w": 45, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 31, "y": 17, "w": 45, "h": 75 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 232, "y": 414, "w": 42, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 30, "y": 18, "w": 42, "h": 76 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 607, "y": 374, "w": 42, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 17, "w": 42, "h": 77 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 147, "y": 351, "w": 43, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 16, "w": 43, "h": 78 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 206, "y": 295, "w": 44, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 16, "w": 44, "h": 78 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 326, "y": 213, "w": 46, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 15, "w": 46, "h": 78 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 479, "y": 151, "w": 48, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 17, "y": 14, "w": 48, "h": 78 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 112, "y": 145, "w": 49, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 13, "w": 49, "h": 78 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 321, "y": 135, "w": 51, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 13, "w": 51, "h": 78 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 269, "y": 134, "w": 52, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 12, "w": 52, "h": 77 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 214, "y": 69, "w": 55, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 11, "w": 55, "h": 76 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 463, "y": 69, "w": 55, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 12, "w": 55, "h": 74 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 159, "y": 69, "w": 55, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 13, "w": 55, "h": 76 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 715, "y": 73, "w": 53, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 13, "w": 53, "h": 76 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 518, "y": 74, "w": 52, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 14, "w": 52, "h": 77 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 61, "y": 136, "w": 51, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 15, "w": 51, "h": 78 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 625, "y": 144, "w": 49, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 16, "w": 49, "h": 78 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 625, "y": 222, "w": 46, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 16, "w": 46, "h": 78 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 430, "y": 287, "w": 45, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 17, "w": 45, "h": 77 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 2, "y": 358, "w": 43, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 18, "w": 43, "h": 77 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 190, "y": 373, "w": 42, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 30, "y": 17, "w": 42, "h": 77 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 391, "y": 440, "w": 41, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 33, "y": 16, "w": 41, "h": 76 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 443, "y": 377, "w": 42, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 35, "y": 16, "w": 42, "h": 76 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 715, "y": 359, "w": 44, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 36, "y": 15, "w": 44, "h": 75 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 45, "y": 363, "w": 44, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 38, "y": 14, "w": 44, "h": 75 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 520, "y": 352, "w": 45, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 39, "y": 13, "w": 45, "h": 74 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 306, "y": 291, "w": 48, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 41, "y": 14, "w": 48, "h": 72 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 527, "y": 213, "w": 51, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 43, "y": 13, "w": 51, "h": 72 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 372, "y": 139, "w": 56, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 44, "y": 12, "w": 56, "h": 71 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 404, "y": 69, "w": 59, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 43, "y": 13, "w": 59, "h": 70 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 658, "y": 73, "w": 57, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 41, "y": 14, "w": 57, "h": 71 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 570, "y": 141, "w": 55, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 39, "y": 13, "w": 55, "h": 72 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 161, "y": 145, "w": 53, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 38, "y": 14, "w": 53, "h": 72 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 2, "y": 208, "w": 51, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 36, "y": 15, "w": 51, "h": 73 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 475, "y": 229, "w": 49, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 35, "y": 16, "w": 49, "h": 73 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 623, "y": 300, "w": 46, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 33, "y": 16, "w": 46, "h": 74 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 475, "y": 302, "w": 45, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 31, "y": 17, "w": 45, "h": 75 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 232, "y": 414, "w": 42, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 30, "y": 18, "w": 42, "h": 76 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 607, "y": 374, "w": 42, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 17, "w": 42, "h": 77 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 147, "y": 351, "w": 43, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 16, "w": 43, "h": 78 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 206, "y": 295, "w": 44, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 16, "w": 44, "h": 78 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 326, "y": 213, "w": 46, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 15, "w": 46, "h": 78 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 479, "y": 151, "w": 48, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 17, "y": 14, "w": 48, "h": 78 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 112, "y": 145, "w": 49, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 13, "w": 49, "h": 78 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 321, "y": 135, "w": 51, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 13, "w": 51, "h": 78 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 269, "y": 134, "w": 52, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 12, "w": 52, "h": 77 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 214, "y": 69, "w": 55, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 11, "w": 55, "h": 76 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 463, "y": 69, "w": 55, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 12, "w": 55, "h": 74 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 159, "y": 69, "w": 55, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 13, "w": 55, "h": 76 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 715, "y": 73, "w": 53, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 13, "w": 53, "h": 76 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 518, "y": 74, "w": 52, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 14, "w": 52, "h": 77 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 61, "y": 136, "w": 51, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 15, "w": 51, "h": 78 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 625, "y": 144, "w": 49, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 16, "w": 49, "h": 78 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 625, "y": 222, "w": 46, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 16, "w": 46, "h": 78 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 430, "y": 287, "w": 45, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 17, "w": 45, "h": 77 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 2, "y": 358, "w": 43, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 18, "w": 43, "h": 77 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 190, "y": 373, "w": 42, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 30, "y": 17, "w": 42, "h": 77 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 391, "y": 440, "w": 41, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 33, "y": 16, "w": 41, "h": 76 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 443, "y": 377, "w": 42, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 35, "y": 16, "w": 42, "h": 76 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 715, "y": 359, "w": 44, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 36, "y": 15, "w": 44, "h": 75 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 45, "y": 363, "w": 44, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 38, "y": 14, "w": 44, "h": 75 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 520, "y": 352, "w": 45, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 39, "y": 13, "w": 45, "h": 74 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 306, "y": 291, "w": 48, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 41, "y": 14, "w": 48, "h": 72 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 527, "y": 213, "w": 51, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 43, "y": 13, "w": 51, "h": 72 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 372, "y": 139, "w": 56, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 44, "y": 12, "w": 56, "h": 71 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 404, "y": 69, "w": 59, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 43, "y": 13, "w": 59, "h": 70 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 658, "y": 73, "w": 57, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 41, "y": 14, "w": 57, "h": 71 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 570, "y": 141, "w": 55, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 39, "y": 13, "w": 55, "h": 72 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 161, "y": 145, "w": 53, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 38, "y": 14, "w": 53, "h": 72 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 2, "y": 208, "w": 51, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 36, "y": 15, "w": 51, "h": 73 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0088.png",
+    "frame": { "x": 475, "y": 229, "w": 49, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 35, "y": 16, "w": 49, "h": 73 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0089.png",
+    "frame": { "x": 623, "y": 300, "w": 46, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 33, "y": 16, "w": 46, "h": 74 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0090.png",
+    "frame": { "x": 475, "y": 302, "w": 45, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 31, "y": 17, "w": 45, "h": 75 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0091.png",
+    "frame": { "x": 232, "y": 414, "w": 42, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 30, "y": 18, "w": 42, "h": 76 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0092.png",
+    "frame": { "x": 607, "y": 374, "w": 42, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 17, "w": 42, "h": 77 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0093.png",
+    "frame": { "x": 147, "y": 351, "w": 43, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 16, "w": 43, "h": 78 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0094.png",
+    "frame": { "x": 206, "y": 295, "w": 44, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 16, "w": 44, "h": 78 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0095.png",
+    "frame": { "x": 326, "y": 213, "w": 46, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 15, "w": 46, "h": 78 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0096.png",
+    "frame": { "x": 479, "y": 151, "w": 48, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 17, "y": 14, "w": 48, "h": 78 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0097.png",
+    "frame": { "x": 112, "y": 145, "w": 49, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 13, "w": 49, "h": 78 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0098.png",
+    "frame": { "x": 321, "y": 135, "w": 51, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 13, "w": 51, "h": 78 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0099.png",
+    "frame": { "x": 269, "y": 134, "w": 52, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 12, "w": 52, "h": 77 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0100.png",
+    "frame": { "x": 214, "y": 69, "w": 55, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 11, "w": 55, "h": 76 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0101.png",
+    "frame": { "x": 463, "y": 69, "w": 55, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 12, "w": 55, "h": 74 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0102.png",
+    "frame": { "x": 159, "y": 69, "w": 55, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 13, "w": 55, "h": 76 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0103.png",
+    "frame": { "x": 715, "y": 73, "w": 53, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 13, "w": 53, "h": 76 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0104.png",
+    "frame": { "x": 518, "y": 74, "w": 52, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 14, "w": 52, "h": 77 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0105.png",
+    "frame": { "x": 61, "y": 136, "w": 51, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 15, "w": 51, "h": 78 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0106.png",
+    "frame": { "x": 625, "y": 144, "w": 49, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 16, "w": 49, "h": 78 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0107.png",
+    "frame": { "x": 625, "y": 222, "w": 46, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 16, "w": 46, "h": 78 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0108.png",
+    "frame": { "x": 430, "y": 287, "w": 45, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 17, "w": 45, "h": 77 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0109.png",
+    "frame": { "x": 2, "y": 358, "w": 43, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 18, "w": 43, "h": 77 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0110.png",
+    "frame": { "x": 428, "y": 143, "w": 51, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 17, "w": 51, "h": 75 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0111.png",
+    "frame": { "x": 98, "y": 62, "w": 61, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 14, "w": 61, "h": 74 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0112.png",
+    "frame": { "x": 530, "y": 2, "w": 70, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 19, "y": 11, "w": 70, "h": 72 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0113.png",
+    "frame": { "x": 194, "y": 2, "w": 85, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 6, "w": 85, "h": 67 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0114.png",
+    "frame": { "x": 2, "y": 2, "w": 96, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 3, "w": 96, "h": 63 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0115.png",
+    "frame": { "x": 98, "y": 2, "w": 96, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 1, "w": 96, "h": 60 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0116.png",
+    "frame": { "x": 279, "y": 2, "w": 91, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 0, "w": 91, "h": 62 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0117.png",
+    "frame": { "x": 370, "y": 2, "w": 84, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 17, "y": 0, "w": 84, "h": 64 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0118.png",
+    "frame": { "x": 454, "y": 2, "w": 76, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 1, "w": 76, "h": 67 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0119.png",
+    "frame": { "x": 600, "y": 2, "w": 67, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 2, "w": 67, "h": 69 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0120.png",
+    "frame": { "x": 372, "y": 210, "w": 51, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 30, "y": 4, "w": 51, "h": 72 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0121.png",
+    "frame": { "x": 172, "y": 450, "w": 41, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 31, "y": 5, "w": 41, "h": 75 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0122.png",
+    "frame": { "x": 526, "y": 443, "w": 41, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 31, "y": 7, "w": 41, "h": 75 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0123.png",
+    "frame": { "x": 432, "y": 453, "w": 41, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 31, "y": 10, "w": 41, "h": 74 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0124.png",
+    "frame": { "x": 43, "y": 438, "w": 41, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 31, "y": 11, "w": 41, "h": 76 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0125.png",
+    "frame": { "x": 2, "y": 435, "w": 41, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 31, "y": 13, "w": 41, "h": 76 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0126.png",
+    "frame": { "x": 565, "y": 366, "w": 42, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 30, "y": 14, "w": 42, "h": 77 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0127.png",
+    "frame": { "x": 131, "y": 429, "w": 41, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 30, "y": 16, "w": 41, "h": 77 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0128.png",
+    "frame": { "x": 485, "y": 426, "w": 41, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 30, "y": 17, "w": 41, "h": 77 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0129.png",
+    "frame": { "x": 649, "y": 421, "w": 41, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 30, "y": 18, "w": 41, "h": 77 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0130.png",
+    "frame": { "x": 2, "y": 358, "w": 43, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 18, "w": 43, "h": 77 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0131.png",
+    "frame": { "x": 2, "y": 281, "w": 46, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 18, "w": 46, "h": 77 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0132.png",
+    "frame": { "x": 53, "y": 214, "w": 48, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 18, "w": 48, "h": 76 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0133.png",
+    "frame": { "x": 354, "y": 348, "w": 46, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 19, "w": 46, "h": 73 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0134.png",
+    "frame": { "x": 345, "y": 421, "w": 46, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 32, "y": 20, "w": 46, "h": 69 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0135.png",
+    "frame": { "x": 567, "y": 451, "w": 45, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 36, "y": 20, "w": 45, "h": 68 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0136.png",
+    "frame": { "x": 423, "y": 218, "w": 52, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 36, "y": 20, "w": 52, "h": 69 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0137.png",
+    "frame": { "x": 2, "y": 137, "w": 56, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 35, "y": 19, "w": 56, "h": 71 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0138.png",
+    "frame": { "x": 2, "y": 65, "w": 59, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 33, "y": 19, "w": 59, "h": 72 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0139.png",
+    "frame": { "x": 600, "y": 71, "w": 58, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 31, "y": 19, "w": 58, "h": 70 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0140.png",
+    "frame": { "x": 577, "y": 291, "w": 46, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 30, "y": 18, "w": 46, "h": 75 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0141.png",
+    "frame": { "x": 303, "y": 363, "w": 42, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 18, "w": 42, "h": 78 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0142.png",
+    "frame": { "x": 400, "y": 364, "w": 43, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 18, "w": 43, "h": 76 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0143.png",
+    "frame": { "x": 524, "y": 285, "w": 53, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 19, "w": 53, "h": 67 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0144.png",
+    "frame": { "x": 266, "y": 213, "w": 60, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 19, "w": 60, "h": 62 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0145.png",
+    "frame": { "x": 674, "y": 219, "w": 58, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 19, "w": 58, "h": 62 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0146.png",
+    "frame": { "x": 150, "y": 288, "w": 56, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 18, "w": 56, "h": 63 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0147.png",
+    "frame": { "x": 250, "y": 351, "w": 53, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 17, "y": 18, "w": 53, "h": 63 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0148.png",
+    "frame": { "x": 674, "y": 149, "w": 54, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 17, "y": 18, "w": 54, "h": 70 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0149.png",
+    "frame": { "x": 214, "y": 145, "w": 52, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 19, "w": 52, "h": 73 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0150.png",
+    "frame": { "x": 48, "y": 290, "w": 48, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 27, "y": 19, "w": 48, "h": 73 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0151.png",
+    "frame": { "x": 161, "y": 217, "w": 51, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 35, "y": 19, "w": 51, "h": 71 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0152.png",
+    "frame": { "x": 343, "y": 66, "w": 61, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 36, "y": 20, "w": 61, "h": 69 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0153.png",
+    "frame": { "x": 279, "y": 64, "w": 64, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 36, "y": 20, "w": 64, "h": 70 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0154.png",
+    "frame": { "x": 667, "y": 2, "w": 64, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 34, "y": 19, "w": 64, "h": 71 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0155.png",
+    "frame": { "x": 101, "y": 223, "w": 49, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 31, "y": 18, "w": 49, "h": 73 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0156.png",
+    "frame": { "x": 89, "y": 363, "w": 42, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 27, "y": 18, "w": 42, "h": 78 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0157.png",
+    "frame": { "x": 671, "y": 281, "w": 53, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 19, "w": 53, "h": 67 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0158.png",
+    "frame": { "x": 274, "y": 441, "w": 62, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 21, "w": 62, "h": 50 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0159.png",
+    "frame": { "x": 275, "y": 491, "w": 62, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 22, "w": 62, "h": 43 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0160.png",
+    "frame": { "x": 674, "y": 505, "w": 59, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 23, "w": 59, "h": 42 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0161.png",
+    "frame": { "x": 612, "y": 498, "w": 62, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 22, "w": 62, "h": 43 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0162.png",
+    "frame": { "x": 213, "y": 491, "w": 62, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 22, "w": 62, "h": 49 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0163.png",
+    "frame": { "x": 372, "y": 287, "w": 58, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 21, "w": 58, "h": 61 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0164.png",
+    "frame": { "x": 96, "y": 296, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 20, "w": 51, "h": 67 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0165.png",
+    "frame": { "x": 84, "y": 441, "w": 45, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 19, "y": 20, "w": 45, "h": 69 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0166.png",
+    "frame": { "x": 728, "y": 149, "w": 42, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 19, "w": 42, "h": 70 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0167.png",
+    "frame": { "x": 690, "y": 434, "w": 44, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 19, "w": 44, "h": 71 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0168.png",
+    "frame": { "x": 669, "y": 348, "w": 46, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 19, "w": 46, "h": 73 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0169.png",
+    "frame": { "x": 259, "y": 275, "w": 47, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 18, "w": 47, "h": 76 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0170.png",
+    "frame": { "x": 212, "y": 218, "w": 47, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 18, "w": 47, "h": 77 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0171.png",
+    "frame": { "x": 578, "y": 213, "w": 47, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 18, "w": 47, "h": 78 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0172.png",
+    "frame": { "x": 724, "y": 281, "w": 45, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 18, "w": 45, "h": 78 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "707.png",
+  "format": "I8",
+  "size": { "w": 772, "h": 549 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/back/707.png b/public/images/pokemon/back/707.png
index 78aa7077f90..83ca7298f45 100644
Binary files a/public/images/pokemon/back/707.png and b/public/images/pokemon/back/707.png differ
diff --git a/public/images/pokemon/back/708.json b/public/images/pokemon/back/708.json
index 33edc5748bd..22aa1885edb 100644
--- a/public/images/pokemon/back/708.json
+++ b/public/images/pokemon/back/708.json
@@ -1,41 +1,1091 @@
-{
-	"textures": [
-		{
-			"image": "708.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 43,
-				"h": 43
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 43,
-						"h": 40
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 43,
-						"h": 40
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 43,
-						"h": 40
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:baaaa3a73da00bbc954269f5f5228420:171d77a039e525f9a3a332d9e2d5d82c:796c82c5076b122f2663381836c65843$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 132, "y": 83, "w": 43, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 4, "w": 43, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 132, "y": 42, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 6, "w": 44, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 176, "y": 83, "w": 43, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 7, "w": 43, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 218, "y": 206, "w": 43, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 9, "w": 43, "h": 39 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 262, "y": 206, "w": 43, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 19, "y": 9, "w": 43, "h": 39 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 44, "y": 207, "w": 43, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 8, "w": 43, "h": 39 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 131, "y": 247, "w": 42, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 6, "w": 42, "h": 39 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 0, "y": 208, "w": 43, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 4, "w": 43, "h": 39 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 0, "y": 85, "w": 43, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 1, "w": 43, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 130, "y": 124, "w": 43, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 0, "w": 43, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 86, "y": 84, "w": 43, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 0, "w": 43, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 174, "y": 124, "w": 43, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 0, "w": 43, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 218, "y": 124, "w": 43, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 2, "w": 43, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 88, "y": 0, "w": 43, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 4, "w": 43, "h": 41 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 132, "y": 0, "w": 43, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 6, "w": 43, "h": 41 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 0, "y": 43, "w": 42, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 7, "w": 42, "h": 41 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 43, "y": 43, "w": 42, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 8, "w": 42, "h": 41 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 132, "y": 206, "w": 42, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 9, "w": 42, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 0, "y": 0, "w": 43, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 6, "w": 43, "h": 42 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 44, "y": 0, "w": 43, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 43, "h": 42 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 264, "y": 0, "w": 43, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 43, "h": 41 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 88, "y": 42, "w": 43, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 43, "h": 41 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 176, "y": 0, "w": 43, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 1, "w": 43, "h": 41 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 220, "y": 0, "w": 43, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 0, "w": 43, "h": 41 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 44, "y": 125, "w": 43, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 43, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 132, "y": 83, "w": 43, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 4, "w": 43, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 132, "y": 42, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 6, "w": 44, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 176, "y": 83, "w": 43, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 7, "w": 43, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 218, "y": 206, "w": 43, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 9, "w": 43, "h": 39 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 262, "y": 206, "w": 43, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 19, "y": 9, "w": 43, "h": 39 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 44, "y": 207, "w": 43, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 8, "w": 43, "h": 39 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 131, "y": 247, "w": 42, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 6, "w": 42, "h": 39 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 0, "y": 208, "w": 43, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 4, "w": 43, "h": 39 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 0, "y": 85, "w": 43, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 1, "w": 43, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 130, "y": 124, "w": 43, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 0, "w": 43, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 86, "y": 84, "w": 43, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 0, "w": 43, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 174, "y": 124, "w": 43, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 0, "w": 43, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 218, "y": 124, "w": 43, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 2, "w": 43, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 88, "y": 0, "w": 43, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 4, "w": 43, "h": 41 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 132, "y": 0, "w": 43, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 6, "w": 43, "h": 41 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 0, "y": 43, "w": 42, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 7, "w": 42, "h": 41 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 43, "y": 43, "w": 42, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 8, "w": 42, "h": 41 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 132, "y": 206, "w": 42, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 9, "w": 42, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 0, "y": 0, "w": 43, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 6, "w": 43, "h": 42 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 44, "y": 0, "w": 43, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 43, "h": 42 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 264, "y": 0, "w": 43, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 43, "h": 41 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 88, "y": 42, "w": 43, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 43, "h": 41 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 176, "y": 0, "w": 43, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 1, "w": 43, "h": 41 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 220, "y": 0, "w": 43, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 0, "w": 43, "h": 41 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 44, "y": 125, "w": 43, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 43, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 132, "y": 83, "w": 43, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 4, "w": 43, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 132, "y": 42, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 6, "w": 44, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 176, "y": 83, "w": 43, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 7, "w": 43, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 218, "y": 206, "w": 43, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 9, "w": 43, "h": 39 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 262, "y": 206, "w": 43, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 19, "y": 9, "w": 43, "h": 39 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 44, "y": 207, "w": 43, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 8, "w": 43, "h": 39 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 131, "y": 247, "w": 42, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 6, "w": 42, "h": 39 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 0, "y": 208, "w": 43, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 4, "w": 43, "h": 39 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 0, "y": 85, "w": 43, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 1, "w": 43, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 130, "y": 124, "w": 43, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 0, "w": 43, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 86, "y": 84, "w": 43, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 0, "w": 43, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 174, "y": 124, "w": 43, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 0, "w": 43, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 218, "y": 124, "w": 43, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 2, "w": 43, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 88, "y": 0, "w": 43, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 4, "w": 43, "h": 41 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 132, "y": 0, "w": 43, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 6, "w": 43, "h": 41 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 0, "y": 43, "w": 42, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 7, "w": 42, "h": 41 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 43, "y": 43, "w": 42, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 8, "w": 42, "h": 41 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 132, "y": 206, "w": 42, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 9, "w": 42, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 0, "y": 0, "w": 43, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 6, "w": 43, "h": 42 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 44, "y": 0, "w": 43, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 43, "h": 42 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 264, "y": 0, "w": 43, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 43, "h": 41 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 88, "y": 42, "w": 43, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 43, "h": 41 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 176, "y": 0, "w": 43, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 1, "w": 43, "h": 41 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 220, "y": 0, "w": 43, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 0, "w": 43, "h": 41 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 44, "y": 125, "w": 43, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 43, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 132, "y": 83, "w": 43, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 4, "w": 43, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 132, "y": 42, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 6, "w": 44, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 176, "y": 83, "w": 43, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 7, "w": 43, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 218, "y": 206, "w": 43, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 9, "w": 43, "h": 39 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 262, "y": 206, "w": 43, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 19, "y": 9, "w": 43, "h": 39 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 44, "y": 207, "w": 43, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 8, "w": 43, "h": 39 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 131, "y": 247, "w": 42, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 6, "w": 42, "h": 39 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 0, "y": 208, "w": 43, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 4, "w": 43, "h": 39 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 0, "y": 85, "w": 43, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 1, "w": 43, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 130, "y": 124, "w": 43, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 0, "w": 43, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 86, "y": 84, "w": 43, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 0, "w": 43, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 174, "y": 124, "w": 43, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 0, "w": 43, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0088.png",
+    "frame": { "x": 218, "y": 124, "w": 43, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 2, "w": 43, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0089.png",
+    "frame": { "x": 88, "y": 0, "w": 43, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 4, "w": 43, "h": 41 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0090.png",
+    "frame": { "x": 132, "y": 0, "w": 43, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 6, "w": 43, "h": 41 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0091.png",
+    "frame": { "x": 0, "y": 43, "w": 42, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 7, "w": 42, "h": 41 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0092.png",
+    "frame": { "x": 43, "y": 43, "w": 42, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 8, "w": 42, "h": 41 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0093.png",
+    "frame": { "x": 132, "y": 206, "w": 42, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 9, "w": 42, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0094.png",
+    "frame": { "x": 0, "y": 0, "w": 43, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 6, "w": 43, "h": 42 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0095.png",
+    "frame": { "x": 44, "y": 0, "w": 43, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 43, "h": 42 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0096.png",
+    "frame": { "x": 264, "y": 0, "w": 43, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 43, "h": 41 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0097.png",
+    "frame": { "x": 88, "y": 42, "w": 43, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 43, "h": 41 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0098.png",
+    "frame": { "x": 176, "y": 0, "w": 43, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 1, "w": 43, "h": 41 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0099.png",
+    "frame": { "x": 220, "y": 0, "w": 43, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 0, "w": 43, "h": 41 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0100.png",
+    "frame": { "x": 44, "y": 125, "w": 43, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 43, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0101.png",
+    "frame": { "x": 132, "y": 83, "w": 43, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 4, "w": 43, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0102.png",
+    "frame": { "x": 0, "y": 126, "w": 43, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 6, "w": 43, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0103.png",
+    "frame": { "x": 88, "y": 165, "w": 43, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 8, "w": 43, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0104.png",
+    "frame": { "x": 175, "y": 206, "w": 42, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 10, "w": 42, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0105.png",
+    "frame": { "x": 88, "y": 247, "w": 42, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 16, "y": 13, "w": 42, "h": 39 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0106.png",
+    "frame": { "x": 132, "y": 165, "w": 43, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 16, "y": 14, "w": 43, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0107.png",
+    "frame": { "x": 176, "y": 165, "w": 43, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 15, "w": 43, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0108.png",
+    "frame": { "x": 220, "y": 165, "w": 43, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 17, "w": 43, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0109.png",
+    "frame": { "x": 264, "y": 165, "w": 43, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 19, "w": 43, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0110.png",
+    "frame": { "x": 262, "y": 124, "w": 43, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 21, "w": 43, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0111.png",
+    "frame": { "x": 44, "y": 166, "w": 43, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 23, "w": 43, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0112.png",
+    "frame": { "x": 0, "y": 167, "w": 43, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 21, "w": 43, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0113.png",
+    "frame": { "x": 88, "y": 206, "w": 43, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 20, "w": 43, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0114.png",
+    "frame": { "x": 220, "y": 83, "w": 43, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 18, "w": 43, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0115.png",
+    "frame": { "x": 44, "y": 247, "w": 43, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 16, "w": 43, "h": 39 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0116.png",
+    "frame": { "x": 218, "y": 246, "w": 43, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 15, "w": 43, "h": 39 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0117.png",
+    "frame": { "x": 262, "y": 246, "w": 43, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 13, "w": 43, "h": 39 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0118.png",
+    "frame": { "x": 177, "y": 42, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 10, "w": 44, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0119.png",
+    "frame": { "x": 264, "y": 83, "w": 43, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 8, "w": 43, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0120.png",
+    "frame": { "x": 222, "y": 42, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 6, "w": 44, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "708.png",
+  "format": "I8",
+  "size": { "w": 307, "h": 286 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/back/708.png b/public/images/pokemon/back/708.png
index d6ba8dd838c..9e094aa7122 100644
Binary files a/public/images/pokemon/back/708.png and b/public/images/pokemon/back/708.png differ
diff --git a/public/images/pokemon/back/714.json b/public/images/pokemon/back/714.json
index e4e3740603e..abcb8902edd 100644
--- a/public/images/pokemon/back/714.json
+++ b/public/images/pokemon/back/714.json
@@ -1,41 +1,263 @@
-{
-	"textures": [
-		{
-			"image": "714.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 63,
-				"h": 63
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 63,
-						"h": 57
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 63,
-						"h": 57
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 63,
-						"h": 57
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:8ffbc9c4153869b318391be0e5f3743c:6e53f3ebf638d13b0d9b325c9e1c6198:1a07d46e710b0568ec824f54fbc4fe6a$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 1, "y": 61, "w": 63, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 63, "h": 57 },
+    "sourceSize": { "w": 68, "h": 68 },
+    "duration": 50
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 66, "y": 61, "w": 63, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 6, "w": 63, "h": 57 },
+    "sourceSize": { "w": 68, "h": 68 },
+    "duration": 50
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 198, "y": 1, "w": 64, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 8, "w": 64, "h": 57 },
+    "sourceSize": { "w": 68, "h": 68 },
+    "duration": 50
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 124, "y": 120, "w": 34, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 19, "y": 3, "w": 34, "h": 65 },
+    "sourceSize": { "w": 68, "h": 68 },
+    "duration": 50
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 1, "y": 178, "w": 34, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 3, "w": 34, "h": 60 },
+    "sourceSize": { "w": 68, "h": 68 },
+    "duration": 50
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 264, "y": 61, "w": 47, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 1, "w": 47, "h": 57 },
+    "sourceSize": { "w": 68, "h": 68 },
+    "duration": 50
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 196, "y": 119, "w": 47, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 0, "w": 47, "h": 57 },
+    "sourceSize": { "w": 68, "h": 68 },
+    "duration": 50
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 1, "y": 61, "w": 63, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 63, "h": 57 },
+    "sourceSize": { "w": 68, "h": 68 },
+    "duration": 50
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 131, "y": 61, "w": 63, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 6, "w": 63, "h": 57 },
+    "sourceSize": { "w": 68, "h": 68 },
+    "duration": 50
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 198, "y": 60, "w": 64, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 8, "w": 64, "h": 57 },
+    "sourceSize": { "w": 68, "h": 68 },
+    "duration": 50
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 160, "y": 120, "w": 34, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 3, "w": 34, "h": 65 },
+    "sourceSize": { "w": 68, "h": 68 },
+    "duration": 50
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 196, "y": 178, "w": 34, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 3, "w": 34, "h": 60 },
+    "sourceSize": { "w": 68, "h": 68 },
+    "duration": 50
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 1, "y": 120, "w": 47, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 1, "w": 47, "h": 56 },
+    "sourceSize": { "w": 68, "h": 68 },
+    "duration": 50
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 196, "y": 119, "w": 47, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 0, "w": 47, "h": 57 },
+    "sourceSize": { "w": 68, "h": 68 },
+    "duration": 50
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 1, "y": 61, "w": 63, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 63, "h": 57 },
+    "sourceSize": { "w": 68, "h": 68 },
+    "duration": 50
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 66, "y": 61, "w": 63, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 6, "w": 63, "h": 57 },
+    "sourceSize": { "w": 68, "h": 68 },
+    "duration": 50
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 1, "y": 1, "w": 64, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 7, "w": 64, "h": 58 },
+    "sourceSize": { "w": 68, "h": 68 },
+    "duration": 50
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 50, "y": 120, "w": 35, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 2, "w": 35, "h": 66 },
+    "sourceSize": { "w": 68, "h": 68 },
+    "duration": 50
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 245, "y": 120, "w": 35, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 17, "y": 2, "w": 35, "h": 61 },
+    "sourceSize": { "w": 68, "h": 68 },
+    "duration": 50
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 264, "y": 1, "w": 47, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 0, "w": 47, "h": 58 },
+    "sourceSize": { "w": 68, "h": 68 },
+    "duration": 50
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 196, "y": 119, "w": 47, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 0, "w": 47, "h": 57 },
+    "sourceSize": { "w": 68, "h": 68 },
+    "duration": 50
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 1, "y": 61, "w": 63, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 63, "h": 57 },
+    "sourceSize": { "w": 68, "h": 68 },
+    "duration": 50
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 133, "y": 1, "w": 63, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 63, "h": 58 },
+    "sourceSize": { "w": 68, "h": 68 },
+    "duration": 50
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 67, "y": 1, "w": 64, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 64, "h": 58 },
+    "sourceSize": { "w": 68, "h": 68 },
+    "duration": 50
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 87, "y": 120, "w": 35, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 2, "w": 35, "h": 66 },
+    "sourceSize": { "w": 68, "h": 68 },
+    "duration": 50
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 282, "y": 120, "w": 34, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 2, "w": 34, "h": 61 },
+    "sourceSize": { "w": 68, "h": 68 },
+    "duration": 50
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 1, "y": 120, "w": 47, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 1, "w": 47, "h": 56 },
+    "sourceSize": { "w": 68, "h": 68 },
+    "duration": 50
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 196, "y": 119, "w": 47, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 0, "w": 47, "h": 57 },
+    "sourceSize": { "w": 68, "h": 68 },
+    "duration": 50
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "714.png",
+  "format": "I8",
+  "size": { "w": 317, "h": 239 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/back/714.png b/public/images/pokemon/back/714.png
index b9724fe6a63..afe2bce45a4 100644
Binary files a/public/images/pokemon/back/714.png and b/public/images/pokemon/back/714.png differ
diff --git a/public/images/pokemon/back/715.png b/public/images/pokemon/back/715.png
index edcb84dbd2a..624780ff0c6 100644
Binary files a/public/images/pokemon/back/715.png and b/public/images/pokemon/back/715.png differ
diff --git a/public/images/pokemon/back/718-10.json b/public/images/pokemon/back/718-10.json
index 74c29a2514f..75053d61900 100644
--- a/public/images/pokemon/back/718-10.json
+++ b/public/images/pokemon/back/718-10.json
@@ -1,41 +1,686 @@
-{
-	"textures": [
-		{
-			"image": "718-10.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 65,
-				"h": 65
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 59,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 59,
-						"h": 65
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 59,
-						"h": 65
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:e9f4b2c69d996349a8e35598e7ddec9c:06067c7cf2cde81fd4d1f42fe319185e:82195cf2a6db620c5643b8162d6e8c5c$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 120, "y": 63, "w": 59, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 59, "h": 65 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 179, "y": 63, "w": 59, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 59, "h": 65 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 0, "y": 0, "w": 60, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 60, "h": 65 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 293, "y": 128, "w": 60, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 60, "h": 63 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 0, "y": 131, "w": 60, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 60, "h": 63 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 120, "y": 0, "w": 61, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 61, "h": 63 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 181, "y": 0, "w": 61, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 61, "h": 63 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 242, "y": 0, "w": 61, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 61, "h": 63 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 303, "y": 0, "w": 61, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 61, "h": 63 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 232, "y": 190, "w": 60, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 60, "h": 63 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 292, "y": 191, "w": 60, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 60, "h": 63 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 60, "y": 0, "w": 60, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 60, "h": 65 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 238, "y": 63, "w": 59, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 59, "h": 65 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 297, "y": 63, "w": 59, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 59, "h": 65 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 120, "y": 63, "w": 59, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 59, "h": 65 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 179, "y": 63, "w": 59, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 59, "h": 65 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 0, "y": 0, "w": 60, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 60, "h": 65 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 293, "y": 128, "w": 60, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 60, "h": 63 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 0, "y": 131, "w": 60, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 60, "h": 63 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 120, "y": 0, "w": 61, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 61, "h": 63 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 181, "y": 0, "w": 61, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 61, "h": 63 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 242, "y": 0, "w": 61, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 61, "h": 63 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 303, "y": 0, "w": 61, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 61, "h": 63 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 232, "y": 190, "w": 60, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 60, "h": 63 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 292, "y": 191, "w": 60, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 60, "h": 63 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 60, "y": 0, "w": 60, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 60, "h": 65 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 238, "y": 63, "w": 59, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 59, "h": 65 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 297, "y": 63, "w": 59, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 59, "h": 65 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 120, "y": 63, "w": 59, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 59, "h": 65 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 179, "y": 63, "w": 59, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 59, "h": 65 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 0, "y": 0, "w": 60, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 60, "h": 65 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 293, "y": 128, "w": 60, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 60, "h": 63 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 0, "y": 131, "w": 60, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 60, "h": 63 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 120, "y": 0, "w": 61, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 61, "h": 63 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 181, "y": 0, "w": 61, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 61, "h": 63 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 242, "y": 0, "w": 61, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 61, "h": 63 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 303, "y": 0, "w": 61, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 61, "h": 63 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 232, "y": 190, "w": 60, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 60, "h": 63 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 292, "y": 191, "w": 60, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 60, "h": 63 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 60, "y": 0, "w": 60, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 60, "h": 65 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 238, "y": 63, "w": 59, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 59, "h": 65 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 297, "y": 63, "w": 59, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 59, "h": 65 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 120, "y": 63, "w": 59, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 59, "h": 65 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 179, "y": 63, "w": 59, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 59, "h": 65 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 0, "y": 0, "w": 60, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 60, "h": 65 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 293, "y": 128, "w": 60, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 60, "h": 63 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 0, "y": 131, "w": 60, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 60, "h": 63 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 120, "y": 0, "w": 61, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 61, "h": 63 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 181, "y": 0, "w": 61, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 61, "h": 63 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 242, "y": 0, "w": 61, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 61, "h": 63 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 303, "y": 0, "w": 61, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 61, "h": 63 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 232, "y": 190, "w": 60, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 60, "h": 63 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 292, "y": 191, "w": 60, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 60, "h": 63 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 60, "y": 0, "w": 60, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 60, "h": 65 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 238, "y": 63, "w": 59, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 59, "h": 65 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 297, "y": 63, "w": 59, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 59, "h": 65 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 120, "y": 63, "w": 59, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 59, "h": 65 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 0, "y": 194, "w": 59, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 59, "h": 64 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 59, "y": 194, "w": 59, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 59, "h": 64 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 56, "y": 319, "w": 59, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 59, "h": 63 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 117, "y": 259, "w": 60, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 60, "h": 62 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 177, "y": 320, "w": 60, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 60, "h": 61 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 232, "y": 128, "w": 61, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 61, "h": 62 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 56, "y": 258, "w": 61, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 61, "h": 61 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 118, "y": 195, "w": 59, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 59, "h": 64 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 115, "y": 321, "w": 55, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 55, "h": 66 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 237, "y": 321, "w": 55, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 55, "h": 66 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 234, "y": 253, "w": 56, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 56, "h": 67 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 290, "y": 254, "w": 56, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 56, "h": 67 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 0, "y": 258, "w": 56, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 56, "h": 67 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 175, "y": 128, "w": 57, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 57, "h": 67 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 177, "y": 253, "w": 57, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 57, "h": 66 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 59, "y": 65, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 58, "h": 66 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 117, "y": 128, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 58, "h": 66 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 0, "y": 65, "w": 59, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 59, "h": 65 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "718-10.png",
+  "format": "I8",
+  "size": { "w": 364, "h": 387 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/back/718-10.png b/public/images/pokemon/back/718-10.png
index 351da7fa3b3..2f3b211e9a6 100644
Binary files a/public/images/pokemon/back/718-10.png and b/public/images/pokemon/back/718-10.png differ
diff --git a/public/images/pokemon/back/718.json b/public/images/pokemon/back/718.json
index ef727edcb5c..1a835e26b08 100644
--- a/public/images/pokemon/back/718.json
+++ b/public/images/pokemon/back/718.json
@@ -1,41 +1,803 @@
-{
-	"textures": [
-		{
-			"image": "718.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 88,
-				"h": 88
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 72,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 72,
-						"h": 88
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 72,
-						"h": 88
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:3aa5b45708c79b806af72f343f73edbc:0b68b84d5671a020b28cd5a19650bf44:7b4a06b06cbac24b3f39727b0238661b$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 224, "y": 443, "w": 72, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 2, "w": 72, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 148, "y": 445, "w": 71, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 71, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 445, "y": 445, "w": 70, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 70, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 72, "y": 446, "w": 70, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 70, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 373, "y": 360, "w": 72, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 72, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 226, "y": 355, "w": 74, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 74, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 0, "y": 184, "w": 75, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 75, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 150, "y": 269, "w": 76, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 76, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 304, "y": 269, "w": 76, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 2, "w": 76, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 459, "y": 269, "w": 76, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 2, "w": 76, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 308, "y": 180, "w": 76, "h": 89 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 76, "h": 89 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 462, "y": 180, "w": 76, "h": 89 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 76, "h": 89 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 386, "y": 91, "w": 76, "h": 90 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 2, "w": 76, "h": 90 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 75, "y": 270, "w": 75, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 2, "w": 75, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 150, "y": 357, "w": 74, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 2, "w": 74, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 75, "y": 358, "w": 73, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 2, "w": 73, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 224, "y": 443, "w": 72, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 2, "w": 72, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 148, "y": 445, "w": 71, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 71, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 445, "y": 445, "w": 70, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 70, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 72, "y": 446, "w": 70, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 70, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 373, "y": 360, "w": 72, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 72, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 226, "y": 355, "w": 74, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 74, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 0, "y": 184, "w": 75, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 75, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 150, "y": 269, "w": 76, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 76, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 304, "y": 269, "w": 76, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 2, "w": 76, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 459, "y": 269, "w": 76, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 2, "w": 76, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 308, "y": 180, "w": 76, "h": 89 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 76, "h": 89 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 462, "y": 180, "w": 76, "h": 89 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 76, "h": 89 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 386, "y": 91, "w": 76, "h": 90 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 2, "w": 76, "h": 90 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 75, "y": 270, "w": 75, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 2, "w": 75, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 150, "y": 357, "w": 74, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 2, "w": 74, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 75, "y": 358, "w": 73, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 2, "w": 73, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 224, "y": 443, "w": 72, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 2, "w": 72, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 148, "y": 445, "w": 71, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 71, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 445, "y": 445, "w": 70, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 70, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 72, "y": 446, "w": 70, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 70, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 373, "y": 360, "w": 72, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 72, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 226, "y": 355, "w": 74, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 74, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 0, "y": 184, "w": 75, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 75, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 150, "y": 269, "w": 76, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 76, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 304, "y": 269, "w": 76, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 2, "w": 76, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 459, "y": 269, "w": 76, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 2, "w": 76, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 308, "y": 180, "w": 76, "h": 89 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 76, "h": 89 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 462, "y": 180, "w": 76, "h": 89 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 76, "h": 89 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 386, "y": 91, "w": 76, "h": 90 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 2, "w": 76, "h": 90 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 75, "y": 270, "w": 75, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 2, "w": 75, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 150, "y": 357, "w": 74, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 2, "w": 74, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 75, "y": 358, "w": 73, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 2, "w": 73, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 224, "y": 443, "w": 72, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 2, "w": 72, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 148, "y": 445, "w": 71, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 71, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 445, "y": 445, "w": 70, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 70, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 72, "y": 446, "w": 70, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 70, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 373, "y": 360, "w": 72, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 72, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 226, "y": 355, "w": 74, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 74, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 0, "y": 184, "w": 75, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 75, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 150, "y": 269, "w": 76, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 76, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 304, "y": 269, "w": 76, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 2, "w": 76, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 459, "y": 269, "w": 76, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 2, "w": 76, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 308, "y": 180, "w": 76, "h": 89 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 76, "h": 89 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 462, "y": 180, "w": 76, "h": 89 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 76, "h": 89 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 386, "y": 91, "w": 76, "h": 90 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 2, "w": 76, "h": 90 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 75, "y": 270, "w": 75, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 2, "w": 75, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 150, "y": 357, "w": 74, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 2, "w": 74, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 75, "y": 358, "w": 73, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 2, "w": 73, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 224, "y": 443, "w": 72, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 2, "w": 72, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 0, "y": 359, "w": 72, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 2, "w": 72, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 300, "y": 357, "w": 73, "h": 89 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 2, "w": 73, "h": 89 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 380, "y": 271, "w": 74, "h": 89 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 74, "h": 89 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 384, "y": 181, "w": 75, "h": 90 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 2, "w": 75, "h": 90 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 155, "y": 92, "w": 76, "h": 90 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 2, "w": 76, "h": 90 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 309, "y": 91, "w": 77, "h": 89 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 77, "h": 89 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 227, "y": 268, "w": 77, "h": 87 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 77, "h": 87 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 150, "y": 182, "w": 77, "h": 87 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 77, "h": 87 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 0, "y": 272, "w": 75, "h": 87 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 3, "w": 75, "h": 87 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 310, "y": 0, "w": 77, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 77, "h": 91 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 387, "y": 0, "w": 77, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 77, "h": 91 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 155, "y": 0, "w": 77, "h": 92 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 77, "h": 92 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 77, "y": 0, "w": 78, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 78, "h": 91 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 0, "y": 0, "w": 77, "h": 93 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 77, "h": 93 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 231, "y": 180, "w": 77, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 77, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 232, "y": 0, "w": 78, "h": 90 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 78, "h": 90 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 77, "y": 91, "w": 78, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 78, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 464, "y": 0, "w": 77, "h": 90 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 77, "h": 90 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 232, "y": 90, "w": 77, "h": 90 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 77, "h": 90 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 464, "y": 90, "w": 77, "h": 90 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 77, "h": 90 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 0, "y": 93, "w": 75, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 75, "h": 91 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 75, "y": 179, "w": 75, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 75, "h": 91 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0088.png",
+    "frame": { "x": 454, "y": 357, "w": 73, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 2, "w": 73, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "718.png",
+  "format": "I8",
+  "size": { "w": 541, "h": 534 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/back/718.png b/public/images/pokemon/back/718.png
index 8e3966b1f79..ce48ca205b4 100644
Binary files a/public/images/pokemon/back/718.png and b/public/images/pokemon/back/718.png differ
diff --git a/public/images/pokemon/back/719.json b/public/images/pokemon/back/719.json
index ea7fd0f3213..440e23718de 100644
--- a/public/images/pokemon/back/719.json
+++ b/public/images/pokemon/back/719.json
@@ -1,41 +1,875 @@
-{
-	"textures": [
-		{
-			"image": "719.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 70,
-				"h": 70
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 42,
-						"h": 70
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 42,
-						"h": 70
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 42,
-						"h": 70
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:fd235f556d7919416a78362d72f6badd:d250eac977fb7684257a27d4f4c11bea:17a705bb924916761be2495822a53735$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 0, "y": 0, "w": 42, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 10, "w": 42, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 44, "y": 0, "w": 42, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 42, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 88, "y": 0, "w": 42, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 7, "w": 42, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 132, "y": 0, "w": 42, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 6, "w": 42, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 176, "y": 0, "w": 42, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 5, "w": 42, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 0, "y": 144, "w": 40, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 3, "w": 40, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 42, "y": 216, "w": 39, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 39, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 83, "y": 216, "w": 39, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 3, "w": 39, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 42, "y": 144, "w": 40, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 5, "w": 40, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 84, "y": 144, "w": 40, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 6, "w": 40, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 131, "y": 72, "w": 41, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 7, "w": 41, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 220, "y": 0, "w": 42, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 42, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 0, "y": 0, "w": 42, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 10, "w": 42, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 44, "y": 0, "w": 42, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 42, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 88, "y": 0, "w": 42, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 7, "w": 42, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 132, "y": 0, "w": 42, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 6, "w": 42, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 176, "y": 0, "w": 42, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 5, "w": 42, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 0, "y": 144, "w": 40, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 3, "w": 40, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 42, "y": 216, "w": 39, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 39, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 83, "y": 216, "w": 39, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 3, "w": 39, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 42, "y": 144, "w": 40, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 5, "w": 40, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 84, "y": 144, "w": 40, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 6, "w": 40, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 131, "y": 72, "w": 41, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 7, "w": 41, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 220, "y": 0, "w": 42, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 42, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 0, "y": 0, "w": 42, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 10, "w": 42, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 44, "y": 0, "w": 42, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 42, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 88, "y": 0, "w": 42, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 7, "w": 42, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 132, "y": 0, "w": 42, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 6, "w": 42, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 176, "y": 0, "w": 42, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 5, "w": 42, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 0, "y": 144, "w": 40, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 3, "w": 40, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 42, "y": 216, "w": 39, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 39, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 83, "y": 216, "w": 39, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 3, "w": 39, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 42, "y": 144, "w": 40, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 5, "w": 40, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 84, "y": 144, "w": 40, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 6, "w": 40, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 131, "y": 72, "w": 41, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 7, "w": 41, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 220, "y": 0, "w": 42, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 42, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 0, "y": 0, "w": 42, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 10, "w": 42, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 44, "y": 0, "w": 42, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 42, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 88, "y": 0, "w": 42, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 7, "w": 42, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 132, "y": 0, "w": 42, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 6, "w": 42, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 176, "y": 0, "w": 42, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 5, "w": 42, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 0, "y": 144, "w": 40, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 3, "w": 40, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 42, "y": 216, "w": 39, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 39, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 83, "y": 216, "w": 39, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 3, "w": 39, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 42, "y": 144, "w": 40, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 5, "w": 40, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 84, "y": 144, "w": 40, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 6, "w": 40, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 131, "y": 72, "w": 41, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 7, "w": 41, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 220, "y": 0, "w": 42, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 42, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 0, "y": 0, "w": 42, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 10, "w": 42, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 0, "y": 72, "w": 42, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 8, "w": 42, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 126, "y": 144, "w": 40, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 7, "w": 40, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 168, "y": 144, "w": 40, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 16, "y": 5, "w": 40, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 124, "y": 216, "w": 39, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 19, "y": 3, "w": 39, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 206, "y": 216, "w": 39, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 2, "w": 39, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 162, "y": 359, "w": 37, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 0, "w": 37, "h": 69 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 202, "y": 288, "w": 37, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 1, "w": 37, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 82, "y": 288, "w": 38, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 3, "w": 38, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 165, "y": 216, "w": 39, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 17, "y": 5, "w": 39, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 210, "y": 144, "w": 40, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 7, "w": 40, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 217, "y": 72, "w": 41, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 9, "w": 41, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 0, "y": 0, "w": 42, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 10, "w": 42, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 44, "y": 72, "w": 42, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 8, "w": 42, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 88, "y": 72, "w": 41, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 7, "w": 41, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 252, "y": 144, "w": 40, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 40, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 247, "y": 216, "w": 39, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 39, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 0, "y": 288, "w": 39, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 39, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 162, "y": 288, "w": 38, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 38, "h": 69 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 241, "y": 288, "w": 37, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 37, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 122, "y": 288, "w": 38, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 38, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 41, "y": 288, "w": 39, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 39, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 0, "y": 216, "w": 40, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 8, "w": 40, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 174, "y": 72, "w": 41, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 9, "w": 41, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 0, "y": 0, "w": 42, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 10, "w": 42, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 0, "y": 72, "w": 42, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 8, "w": 42, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 126, "y": 144, "w": 40, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 7, "w": 40, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 168, "y": 144, "w": 40, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 16, "y": 5, "w": 40, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 124, "y": 216, "w": 39, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 19, "y": 3, "w": 39, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 206, "y": 216, "w": 39, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 2, "w": 39, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 162, "y": 359, "w": 37, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 0, "w": 37, "h": 69 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 202, "y": 288, "w": 37, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 1, "w": 37, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 82, "y": 288, "w": 38, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 3, "w": 38, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 165, "y": 216, "w": 39, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 17, "y": 5, "w": 39, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 210, "y": 144, "w": 40, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 7, "w": 40, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 217, "y": 72, "w": 41, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 9, "w": 41, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 0, "y": 0, "w": 42, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 10, "w": 42, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 44, "y": 72, "w": 42, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 8, "w": 42, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 88, "y": 72, "w": 41, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 7, "w": 41, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0088.png",
+    "frame": { "x": 252, "y": 144, "w": 40, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 40, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0089.png",
+    "frame": { "x": 247, "y": 216, "w": 39, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 39, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0090.png",
+    "frame": { "x": 0, "y": 288, "w": 39, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 39, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0091.png",
+    "frame": { "x": 162, "y": 288, "w": 38, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 38, "h": 69 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0092.png",
+    "frame": { "x": 241, "y": 288, "w": 37, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 37, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0093.png",
+    "frame": { "x": 122, "y": 288, "w": 38, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 38, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0094.png",
+    "frame": { "x": 41, "y": 288, "w": 39, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 39, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0095.png",
+    "frame": { "x": 0, "y": 216, "w": 40, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 8, "w": 40, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0096.png",
+    "frame": { "x": 174, "y": 72, "w": 41, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 9, "w": 41, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "719.png",
+  "format": "I8",
+  "size": { "w": 292, "h": 428 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/back/719.png b/public/images/pokemon/back/719.png
index 14ff62742f7..1c275f3241d 100644
Binary files a/public/images/pokemon/back/719.png and b/public/images/pokemon/back/719.png differ
diff --git a/public/images/pokemon/back/728.png b/public/images/pokemon/back/728.png
index 36633bf4174..fa04ca2bdbb 100644
Binary files a/public/images/pokemon/back/728.png and b/public/images/pokemon/back/728.png differ
diff --git a/public/images/pokemon/back/730.png b/public/images/pokemon/back/730.png
index 75499065e47..5c150efb08c 100644
Binary files a/public/images/pokemon/back/730.png and b/public/images/pokemon/back/730.png differ
diff --git a/public/images/pokemon/back/746-school.png b/public/images/pokemon/back/746-school.png
index 55b8f33929b..1884123d82e 100644
Binary files a/public/images/pokemon/back/746-school.png and b/public/images/pokemon/back/746-school.png differ
diff --git a/public/images/pokemon/back/746.png b/public/images/pokemon/back/746.png
index 3b1b4438f15..cb424c9fbe1 100644
Binary files a/public/images/pokemon/back/746.png and b/public/images/pokemon/back/746.png differ
diff --git a/public/images/pokemon/back/749.png b/public/images/pokemon/back/749.png
index 8a14933a52e..0f28ee107c9 100644
Binary files a/public/images/pokemon/back/749.png and b/public/images/pokemon/back/749.png differ
diff --git a/public/images/pokemon/back/750.png b/public/images/pokemon/back/750.png
index caa6b0c4eef..62015e8714e 100644
Binary files a/public/images/pokemon/back/750.png and b/public/images/pokemon/back/750.png differ
diff --git a/public/images/pokemon/back/782.json b/public/images/pokemon/back/782.json
index 64036da7750..6cefb281b7b 100644
--- a/public/images/pokemon/back/782.json
+++ b/public/images/pokemon/back/782.json
@@ -1,41 +1,1010 @@
-{
-	"textures": [
-		{
-			"image": "782.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 50,
-				"h": 50
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 46,
-						"h": 50
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 46,
-						"h": 50
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 46,
-						"h": 50
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:03129fcf647a44654eebf65e3131032f:56b06453c435e6f8d3648a6836f20d5d:d07862436676aa228a148ee1f1d82a8f$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 50, "y": 111, "w": 46, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 24, "w": 46, "h": 50 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 50, "y": 111, "w": 46, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 24, "w": 46, "h": 50 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 99, "y": 111, "w": 46, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 24, "w": 46, "h": 50 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 99, "y": 111, "w": 46, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 24, "w": 46, "h": 50 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 148, "y": 111, "w": 46, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 24, "w": 46, "h": 50 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 148, "y": 111, "w": 46, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 24, "w": 46, "h": 50 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 195, "y": 164, "w": 45, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 25, "w": 45, "h": 49 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 195, "y": 164, "w": 45, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 25, "w": 45, "h": 49 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 146, "y": 164, "w": 46, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 26, "w": 46, "h": 48 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 146, "y": 164, "w": 46, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 26, "w": 46, "h": 48 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 1, "y": 166, "w": 45, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 25, "w": 45, "h": 49 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 1, "y": 166, "w": 45, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 25, "w": 45, "h": 49 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 50, "y": 164, "w": 45, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 24, "w": 45, "h": 50 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 50, "y": 164, "w": 45, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 24, "w": 45, "h": 50 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 98, "y": 164, "w": 45, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 24, "w": 45, "h": 50 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 98, "y": 164, "w": 45, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 24, "w": 45, "h": 50 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 50, "y": 111, "w": 46, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 24, "w": 46, "h": 50 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 50, "y": 111, "w": 46, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 24, "w": 46, "h": 50 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 99, "y": 111, "w": 46, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 24, "w": 46, "h": 50 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 99, "y": 111, "w": 46, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 24, "w": 46, "h": 50 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 148, "y": 111, "w": 46, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 24, "w": 46, "h": 50 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 148, "y": 111, "w": 46, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 24, "w": 46, "h": 50 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 195, "y": 164, "w": 45, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 25, "w": 45, "h": 49 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 195, "y": 164, "w": 45, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 25, "w": 45, "h": 49 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 146, "y": 164, "w": 46, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 26, "w": 46, "h": 48 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 146, "y": 164, "w": 46, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 26, "w": 46, "h": 48 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 1, "y": 166, "w": 45, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 25, "w": 45, "h": 49 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 1, "y": 166, "w": 45, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 25, "w": 45, "h": 49 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 50, "y": 164, "w": 45, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 24, "w": 45, "h": 50 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 50, "y": 164, "w": 45, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 24, "w": 45, "h": 50 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 98, "y": 164, "w": 45, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 24, "w": 45, "h": 50 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 98, "y": 164, "w": 45, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 24, "w": 45, "h": 50 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 50, "y": 111, "w": 46, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 24, "w": 46, "h": 50 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 50, "y": 111, "w": 46, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 24, "w": 46, "h": 50 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 99, "y": 111, "w": 46, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 24, "w": 46, "h": 50 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 99, "y": 111, "w": 46, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 24, "w": 46, "h": 50 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 148, "y": 111, "w": 46, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 24, "w": 46, "h": 50 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 148, "y": 111, "w": 46, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 24, "w": 46, "h": 50 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 195, "y": 164, "w": 45, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 25, "w": 45, "h": 49 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 195, "y": 164, "w": 45, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 25, "w": 45, "h": 49 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 146, "y": 164, "w": 46, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 26, "w": 46, "h": 48 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 146, "y": 164, "w": 46, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 26, "w": 46, "h": 48 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 1, "y": 166, "w": 45, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 25, "w": 45, "h": 49 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 1, "y": 166, "w": 45, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 25, "w": 45, "h": 49 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 50, "y": 164, "w": 45, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 24, "w": 45, "h": 50 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 50, "y": 164, "w": 45, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 24, "w": 45, "h": 50 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 98, "y": 164, "w": 45, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 24, "w": 45, "h": 50 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 98, "y": 164, "w": 45, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 24, "w": 45, "h": 50 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 50, "y": 111, "w": 46, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 24, "w": 46, "h": 50 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 50, "y": 111, "w": 46, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 24, "w": 46, "h": 50 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 99, "y": 111, "w": 46, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 24, "w": 46, "h": 50 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 99, "y": 111, "w": 46, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 24, "w": 46, "h": 50 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 148, "y": 111, "w": 46, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 24, "w": 46, "h": 50 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 148, "y": 111, "w": 46, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 24, "w": 46, "h": 50 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 195, "y": 164, "w": 45, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 25, "w": 45, "h": 49 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 195, "y": 164, "w": 45, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 25, "w": 45, "h": 49 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 146, "y": 164, "w": 46, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 26, "w": 46, "h": 48 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 146, "y": 164, "w": 46, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 26, "w": 46, "h": 48 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 1, "y": 166, "w": 45, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 25, "w": 45, "h": 49 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 1, "y": 166, "w": 45, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 25, "w": 45, "h": 49 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 50, "y": 164, "w": 45, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 24, "w": 45, "h": 50 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 50, "y": 164, "w": 45, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 24, "w": 45, "h": 50 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 98, "y": 164, "w": 45, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 24, "w": 45, "h": 50 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 98, "y": 164, "w": 45, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 24, "w": 45, "h": 50 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 50, "y": 111, "w": 46, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 24, "w": 46, "h": 50 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 50, "y": 111, "w": 46, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 24, "w": 46, "h": 50 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 99, "y": 111, "w": 46, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 24, "w": 46, "h": 50 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 99, "y": 111, "w": 46, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 24, "w": 46, "h": 50 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 148, "y": 111, "w": 46, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 24, "w": 46, "h": 50 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 148, "y": 111, "w": 46, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 24, "w": 46, "h": 50 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 195, "y": 164, "w": 45, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 25, "w": 45, "h": 49 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 195, "y": 164, "w": 45, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 25, "w": 45, "h": 49 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 146, "y": 164, "w": 46, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 26, "w": 46, "h": 48 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 146, "y": 164, "w": 46, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 26, "w": 46, "h": 48 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 1, "y": 166, "w": 45, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 25, "w": 45, "h": 49 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 1, "y": 166, "w": 45, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 25, "w": 45, "h": 49 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 50, "y": 164, "w": 45, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 24, "w": 45, "h": 50 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 50, "y": 164, "w": 45, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 24, "w": 45, "h": 50 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 98, "y": 164, "w": 45, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 24, "w": 45, "h": 50 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 98, "y": 164, "w": 45, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 24, "w": 45, "h": 50 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 50, "y": 111, "w": 46, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 24, "w": 46, "h": 50 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 50, "y": 111, "w": 46, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 24, "w": 46, "h": 50 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 201, "y": 1, "w": 47, "h": 51 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 23, "w": 47, "h": 51 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 201, "y": 55, "w": 47, "h": 51 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 23, "w": 47, "h": 51 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 1, "y": 1, "w": 47, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 22, "w": 47, "h": 52 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 51, "y": 1, "w": 47, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 22, "w": 47, "h": 52 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 101, "y": 1, "w": 47, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 22, "w": 47, "h": 52 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0088.png",
+    "frame": { "x": 101, "y": 1, "w": 47, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 22, "w": 47, "h": 52 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0089.png",
+    "frame": { "x": 1, "y": 56, "w": 46, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 22, "w": 46, "h": 52 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0090.png",
+    "frame": { "x": 50, "y": 56, "w": 46, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 22, "w": 46, "h": 52 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0091.png",
+    "frame": { "x": 99, "y": 56, "w": 46, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 22, "w": 46, "h": 52 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0092.png",
+    "frame": { "x": 148, "y": 56, "w": 46, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 22, "w": 46, "h": 52 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0093.png",
+    "frame": { "x": 151, "y": 1, "w": 47, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 22, "w": 47, "h": 52 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0094.png",
+    "frame": { "x": 151, "y": 1, "w": 47, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 22, "w": 47, "h": 52 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0095.png",
+    "frame": { "x": 101, "y": 1, "w": 47, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 22, "w": 47, "h": 52 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0096.png",
+    "frame": { "x": 101, "y": 1, "w": 47, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 22, "w": 47, "h": 52 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0097.png",
+    "frame": { "x": 197, "y": 109, "w": 46, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 22, "w": 46, "h": 52 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0098.png",
+    "frame": { "x": 197, "y": 109, "w": 46, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 22, "w": 46, "h": 52 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0099.png",
+    "frame": { "x": 148, "y": 56, "w": 46, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 22, "w": 46, "h": 52 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0100.png",
+    "frame": { "x": 148, "y": 56, "w": 46, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 22, "w": 46, "h": 52 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0101.png",
+    "frame": { "x": 151, "y": 1, "w": 47, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 22, "w": 47, "h": 52 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0102.png",
+    "frame": { "x": 151, "y": 1, "w": 47, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 22, "w": 47, "h": 52 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0103.png",
+    "frame": { "x": 151, "y": 1, "w": 47, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 22, "w": 47, "h": 52 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0104.png",
+    "frame": { "x": 101, "y": 1, "w": 47, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 22, "w": 47, "h": 52 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0105.png",
+    "frame": { "x": 101, "y": 1, "w": 47, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 22, "w": 47, "h": 52 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0106.png",
+    "frame": { "x": 197, "y": 109, "w": 46, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 22, "w": 46, "h": 52 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0107.png",
+    "frame": { "x": 197, "y": 109, "w": 46, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 22, "w": 46, "h": 52 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0108.png",
+    "frame": { "x": 99, "y": 56, "w": 46, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 22, "w": 46, "h": 52 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0109.png",
+    "frame": { "x": 1, "y": 111, "w": 46, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 22, "w": 46, "h": 52 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0110.png",
+    "frame": { "x": 201, "y": 55, "w": 47, "h": 51 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 23, "w": 47, "h": 51 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   },
+   {
+    "filename": "0111.png",
+    "frame": { "x": 201, "y": 1, "w": 47, "h": 51 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 23, "w": 47, "h": 51 },
+    "sourceSize": { "w": 96, "h": 76 },
+    "duration": 50
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.13-x64",
+  "image": "782.png",
+  "format": "I8",
+  "size": { "w": 249, "h": 216 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/back/782.png b/public/images/pokemon/back/782.png
index aa3e05416a2..eb222077d81 100644
Binary files a/public/images/pokemon/back/782.png and b/public/images/pokemon/back/782.png differ
diff --git a/public/images/pokemon/back/783.json b/public/images/pokemon/back/783.json
index dbdf0832c04..d8f4119f161 100644
--- a/public/images/pokemon/back/783.json
+++ b/public/images/pokemon/back/783.json
@@ -1,41 +1,965 @@
-{
-	"textures": [
-		{
-			"image": "783.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 69,
-				"h": 69
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 66,
-						"h": 69
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 66,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 66,
-						"h": 69
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:7d62b0df753b06fca02f434512c11d99:8e8a5ac9c7d2fc25a02a4d24d5c5b640:aab166e28c744865a0296041224dd01b$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 420, "y": 277, "w": 66, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 66, "h": 69 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 272, "y": 280, "w": 65, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 65, "h": 69 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 487, "y": 277, "w": 65, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 65, "h": 70 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 1, "y": 347, "w": 64, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 64, "h": 70 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 266, "y": 350, "w": 62, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 62, "h": 71 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 66, "y": 349, "w": 63, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 63, "h": 70 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 347, "y": 279, "w": 65, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 65, "h": 70 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 134, "y": 282, "w": 65, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 65, "h": 69 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 1, "y": 277, "w": 66, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 66, "h": 69 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 200, "y": 347, "w": 65, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 65, "h": 68 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 329, "y": 350, "w": 64, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 64, "h": 68 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 1, "y": 418, "w": 62, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 4, "w": 62, "h": 67 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 519, "y": 418, "w": 61, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 4, "w": 61, "h": 67 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 456, "y": 418, "w": 62, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 4, "w": 62, "h": 67 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 130, "y": 352, "w": 64, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 64, "h": 68 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 413, "y": 347, "w": 65, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 65, "h": 68 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 420, "y": 277, "w": 66, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 66, "h": 69 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 272, "y": 280, "w": 65, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 65, "h": 69 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 487, "y": 277, "w": 65, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 65, "h": 70 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 1, "y": 347, "w": 64, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 64, "h": 70 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 266, "y": 350, "w": 62, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 62, "h": 71 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 66, "y": 349, "w": 63, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 63, "h": 70 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 347, "y": 279, "w": 65, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 65, "h": 70 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 134, "y": 282, "w": 65, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 65, "h": 69 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 1, "y": 277, "w": 66, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 66, "h": 69 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 200, "y": 347, "w": 65, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 65, "h": 68 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 329, "y": 350, "w": 64, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 64, "h": 68 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 1, "y": 418, "w": 62, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 4, "w": 62, "h": 67 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 519, "y": 418, "w": 61, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 4, "w": 61, "h": 67 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 456, "y": 418, "w": 62, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 4, "w": 62, "h": 67 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 130, "y": 352, "w": 64, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 64, "h": 68 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 413, "y": 347, "w": 65, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 65, "h": 68 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 420, "y": 277, "w": 66, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 66, "h": 69 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 272, "y": 280, "w": 65, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 65, "h": 69 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 487, "y": 277, "w": 65, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 65, "h": 70 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 1, "y": 347, "w": 64, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 64, "h": 70 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 266, "y": 350, "w": 62, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 62, "h": 71 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 66, "y": 349, "w": 63, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 63, "h": 70 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 347, "y": 279, "w": 65, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 65, "h": 70 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 134, "y": 282, "w": 65, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 65, "h": 69 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 1, "y": 277, "w": 66, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 66, "h": 69 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 200, "y": 347, "w": 65, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 65, "h": 68 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 329, "y": 350, "w": 64, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 64, "h": 68 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 1, "y": 418, "w": 62, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 4, "w": 62, "h": 67 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 519, "y": 418, "w": 61, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 4, "w": 61, "h": 67 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 456, "y": 418, "w": 62, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 4, "w": 62, "h": 67 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 130, "y": 352, "w": 64, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 64, "h": 68 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 413, "y": 347, "w": 65, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 65, "h": 68 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 420, "y": 277, "w": 66, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 66, "h": 69 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 272, "y": 280, "w": 65, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 65, "h": 69 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 487, "y": 277, "w": 65, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 65, "h": 70 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 1, "y": 347, "w": 64, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 64, "h": 70 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 266, "y": 350, "w": 62, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 62, "h": 71 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 66, "y": 349, "w": 63, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 63, "h": 70 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 347, "y": 279, "w": 65, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 65, "h": 70 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 134, "y": 282, "w": 65, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 65, "h": 69 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 1, "y": 277, "w": 66, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 66, "h": 69 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 200, "y": 347, "w": 65, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 65, "h": 68 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 329, "y": 350, "w": 64, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 64, "h": 68 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 1, "y": 418, "w": 62, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 4, "w": 62, "h": 67 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 519, "y": 418, "w": 61, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 4, "w": 61, "h": 67 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 456, "y": 418, "w": 62, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 4, "w": 62, "h": 67 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 130, "y": 352, "w": 64, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 64, "h": 68 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 413, "y": 347, "w": 65, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 65, "h": 68 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 420, "y": 277, "w": 66, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 66, "h": 69 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 205, "y": 277, "w": 66, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 66, "h": 69 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 138, "y": 211, "w": 66, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 1, "w": 66, "h": 70 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 68, "y": 278, "w": 65, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 1, "w": 65, "h": 70 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 141, "y": 140, "w": 67, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 1, "w": 67, "h": 70 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 294, "y": 1, "w": 69, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 1, "w": 69, "h": 70 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 149, "y": 1, "w": 71, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 71, "h": 69 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 490, "y": 209, "w": 69, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 69, "h": 67 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 143, "y": 71, "w": 70, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 70, "h": 68 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 506, "y": 1, "w": 69, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 69, "h": 69 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 361, "y": 139, "w": 68, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 68, "h": 69 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 420, "y": 277, "w": 66, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 66, "h": 69 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 430, "y": 140, "w": 68, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 68, "h": 68 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 436, "y": 1, "w": 69, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 69, "h": 69 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 505, "y": 71, "w": 69, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 69, "h": 68 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 209, "y": 209, "w": 69, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 69, "h": 67 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 420, "y": 209, "w": 69, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 69, "h": 67 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 195, "y": 416, "w": 63, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 2, "w": 63, "h": 68 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 329, "y": 419, "w": 59, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 4, "w": 59, "h": 67 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 64, "y": 420, "w": 58, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 3, "w": 58, "h": 68 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 394, "y": 416, "w": 61, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 61, "h": 69 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 479, "y": 348, "w": 64, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 2, "w": 64, "h": 69 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 420, "y": 277, "w": 66, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 66, "h": 69 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0088.png",
+    "frame": { "x": 292, "y": 72, "w": 68, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 68, "h": 69 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0089.png",
+    "frame": { "x": 221, "y": 1, "w": 72, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 72, "h": 68 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0090.png",
+    "frame": { "x": 1, "y": 139, "w": 69, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 69, "h": 68 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0091.png",
+    "frame": { "x": 364, "y": 70, "w": 70, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 70, "h": 68 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0092.png",
+    "frame": { "x": 221, "y": 70, "w": 70, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 70, "h": 68 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0093.png",
+    "frame": { "x": 75, "y": 1, "w": 73, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 73, "h": 68 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0094.png",
+    "frame": { "x": 71, "y": 139, "w": 69, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 69, "h": 68 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0095.png",
+    "frame": { "x": 72, "y": 70, "w": 70, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 70, "h": 68 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0096.png",
+    "frame": { "x": 1, "y": 70, "w": 70, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 70, "h": 68 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0097.png",
+    "frame": { "x": 1, "y": 1, "w": 73, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 73, "h": 68 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0098.png",
+    "frame": { "x": 283, "y": 142, "w": 68, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 3, "w": 68, "h": 68 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0099.png",
+    "frame": { "x": 499, "y": 140, "w": 68, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 68, "h": 68 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0100.png",
+    "frame": { "x": 435, "y": 71, "w": 69, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 69, "h": 68 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0101.png",
+    "frame": { "x": 364, "y": 1, "w": 71, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 71, "h": 68 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0102.png",
+    "frame": { "x": 1, "y": 208, "w": 68, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 68, "h": 68 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0103.png",
+    "frame": { "x": 279, "y": 211, "w": 67, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 67, "h": 68 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0104.png",
+    "frame": { "x": 214, "y": 139, "w": 68, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 68, "h": 69 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0105.png",
+    "frame": { "x": 70, "y": 208, "w": 67, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 67, "h": 69 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0106.png",
+    "frame": { "x": 352, "y": 209, "w": 67, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 67, "h": 69 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.13-x64",
+  "image": "783.png",
+  "format": "I8",
+  "size": { "w": 581, "h": 489 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/back/783.png b/public/images/pokemon/back/783.png
index 80b07db3466..ff8c7ca052f 100644
Binary files a/public/images/pokemon/back/783.png and b/public/images/pokemon/back/783.png differ
diff --git a/public/images/pokemon/back/784.json b/public/images/pokemon/back/784.json
index 8a31743fa63..2be405d5d06 100644
--- a/public/images/pokemon/back/784.json
+++ b/public/images/pokemon/back/784.json
@@ -1,41 +1,812 @@
-{
-	"textures": [
-		{
-			"image": "784.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 92,
-				"h": 92
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 92,
-						"h": 81
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 92,
-						"h": 81
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 92,
-						"h": 81
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:f20be28706ee0de7538fc5feaf80d0ee:599492666e3be0e6a26e56f7fe23eebd:c2f7ca3ab1075b8c824730653d891244$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 189, "y": 242, "w": 90, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 4, "w": 90, "h": 81 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 1, "y": 166, "w": 94, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 4, "w": 94, "h": 81 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 545, "y": 84, "w": 98, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 4, "w": 98, "h": 81 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 545, "y": 1, "w": 103, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 103, "h": 80 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 333, "y": 1, "w": 106, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 106, "h": 80 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 1, "y": 1, "w": 110, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 6, "w": 110, "h": 79 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 220, "y": 1, "w": 110, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 110, "h": 78 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 651, "y": 1, "w": 106, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 8, "w": 106, "h": 77 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 204, "y": 162, "w": 102, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 8, "w": 102, "h": 77 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 309, "y": 165, "w": 97, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 5, "w": 97, "h": 80 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 98, "y": 172, "w": 88, "h": 83 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 2, "w": 88, "h": 83 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 461, "y": 251, "w": 83, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 4, "w": 83, "h": 81 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 341, "y": 332, "w": 81, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 6, "w": 81, "h": 79 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 176, "y": 326, "w": 82, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 5, "w": 82, "h": 80 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 89, "y": 258, "w": 84, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 5, "w": 84, "h": 80 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 1, "y": 250, "w": 85, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 4, "w": 85, "h": 81 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 189, "y": 242, "w": 90, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 4, "w": 90, "h": 81 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 1, "y": 166, "w": 94, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 4, "w": 94, "h": 81 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 545, "y": 84, "w": 98, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 4, "w": 98, "h": 81 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 545, "y": 1, "w": 103, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 103, "h": 80 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 333, "y": 1, "w": 106, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 106, "h": 80 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 1, "y": 1, "w": 110, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 6, "w": 110, "h": 79 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 220, "y": 1, "w": 110, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 110, "h": 78 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 651, "y": 1, "w": 106, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 8, "w": 106, "h": 77 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 204, "y": 162, "w": 102, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 8, "w": 102, "h": 77 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 309, "y": 165, "w": 97, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 5, "w": 97, "h": 80 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 98, "y": 172, "w": 88, "h": 83 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 2, "w": 88, "h": 83 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 461, "y": 251, "w": 83, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 4, "w": 83, "h": 81 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 341, "y": 332, "w": 81, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 6, "w": 81, "h": 79 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 176, "y": 326, "w": 82, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 5, "w": 82, "h": 80 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 89, "y": 258, "w": 84, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 5, "w": 84, "h": 80 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 1, "y": 250, "w": 85, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 4, "w": 85, "h": 81 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 189, "y": 242, "w": 90, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 4, "w": 90, "h": 81 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 1, "y": 166, "w": 94, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 4, "w": 94, "h": 81 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 545, "y": 84, "w": 98, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 4, "w": 98, "h": 81 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 545, "y": 1, "w": 103, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 103, "h": 80 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 333, "y": 1, "w": 106, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 106, "h": 80 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 1, "y": 1, "w": 110, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 6, "w": 110, "h": 79 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 220, "y": 1, "w": 110, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 110, "h": 78 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 651, "y": 1, "w": 106, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 8, "w": 106, "h": 77 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 204, "y": 162, "w": 102, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 8, "w": 102, "h": 77 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 309, "y": 165, "w": 97, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 5, "w": 97, "h": 80 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 98, "y": 172, "w": 88, "h": 83 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 2, "w": 88, "h": 83 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 461, "y": 251, "w": 83, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 4, "w": 83, "h": 81 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 341, "y": 332, "w": 81, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 6, "w": 81, "h": 79 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 176, "y": 326, "w": 82, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 5, "w": 82, "h": 80 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 89, "y": 258, "w": 84, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 5, "w": 84, "h": 80 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 1, "y": 250, "w": 85, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 4, "w": 85, "h": 81 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 189, "y": 242, "w": 90, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 4, "w": 90, "h": 81 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 1, "y": 166, "w": 94, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 4, "w": 94, "h": 81 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 545, "y": 84, "w": 98, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 4, "w": 98, "h": 81 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 545, "y": 1, "w": 103, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 103, "h": 80 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 333, "y": 1, "w": 106, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 106, "h": 80 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 1, "y": 1, "w": 110, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 6, "w": 110, "h": 79 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 220, "y": 1, "w": 110, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 110, "h": 78 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 651, "y": 1, "w": 106, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 8, "w": 106, "h": 77 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 204, "y": 162, "w": 102, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 8, "w": 102, "h": 77 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 309, "y": 165, "w": 97, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 5, "w": 97, "h": 80 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 98, "y": 172, "w": 88, "h": 83 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 2, "w": 88, "h": 83 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 461, "y": 251, "w": 83, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 4, "w": 83, "h": 81 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 341, "y": 332, "w": 81, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 6, "w": 81, "h": 79 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 176, "y": 326, "w": 82, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 5, "w": 82, "h": 80 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 89, "y": 258, "w": 84, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 5, "w": 84, "h": 80 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 1, "y": 250, "w": 85, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 4, "w": 85, "h": 81 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 409, "y": 166, "w": 93, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 4, "w": 93, "h": 81 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 104, "y": 88, "w": 97, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 4, "w": 97, "h": 81 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 1, "y": 83, "w": 100, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 100, "h": 80 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 651, "y": 81, "w": 102, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 6, "w": 102, "h": 79 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 220, "y": 82, "w": 104, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 8, "w": 104, "h": 77 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 432, "y": 87, "w": 104, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 9, "w": 104, "h": 76 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 327, "y": 84, "w": 102, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 7, "w": 102, "h": 78 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 646, "y": 163, "w": 96, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 96, "h": 81 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 442, "y": 1, "w": 100, "h": 83 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 100, "h": 83 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 114, "y": 1, "w": 103, "h": 84 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 103, "h": 84 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 505, "y": 168, "w": 92, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 5, "w": 92, "h": 80 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 83, "y": 341, "w": 75, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 33, "y": 0, "w": 75, "h": 85 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 579, "y": 415, "w": 72, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 36, "y": 12, "w": 72, "h": 74 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 504, "y": 413, "w": 72, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 36, "y": 5, "w": 72, "h": 80 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 341, "y": 414, "w": 72, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 36, "y": 10, "w": 72, "h": 75 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 693, "y": 247, "w": 73, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 35, "y": 5, "w": 73, "h": 80 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 161, "y": 409, "w": 74, "h": 82 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 34, "y": 3, "w": 74, "h": 82 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 425, "y": 335, "w": 76, "h": 84 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 31, "y": 1, "w": 76, "h": 84 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 261, "y": 331, "w": 77, "h": 84 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 29, "y": 1, "w": 77, "h": 84 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 632, "y": 330, "w": 79, "h": 82 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 3, "w": 79, "h": 82 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 1, "y": 334, "w": 79, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 4, "w": 79, "h": 81 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 547, "y": 330, "w": 82, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 5, "w": 82, "h": 80 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 372, "y": 250, "w": 86, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 17, "y": 6, "w": 86, "h": 79 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0088.png",
+    "frame": { "x": 282, "y": 248, "w": 87, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 5, "w": 87, "h": 80 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0089.png",
+    "frame": { "x": 600, "y": 247, "w": 90, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 5, "w": 90, "h": 80 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.13-x64",
+  "image": "784.png",
+  "format": "I8",
+  "size": { "w": 767, "h": 494 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/back/784.png b/public/images/pokemon/back/784.png
index 365f0d0610d..08b953b3351 100644
Binary files a/public/images/pokemon/back/784.png and b/public/images/pokemon/back/784.png differ
diff --git a/public/images/pokemon/back/840.png b/public/images/pokemon/back/840.png
index f9ff9f11790..a247dc33939 100644
Binary files a/public/images/pokemon/back/840.png and b/public/images/pokemon/back/840.png differ
diff --git a/public/images/pokemon/back/841-gigantamax.png b/public/images/pokemon/back/841-gigantamax.png
index af30e475002..7c7e9e442b5 100644
Binary files a/public/images/pokemon/back/841-gigantamax.png and b/public/images/pokemon/back/841-gigantamax.png differ
diff --git a/public/images/pokemon/back/841.png b/public/images/pokemon/back/841.png
index 705b651521b..7b083594ab0 100644
Binary files a/public/images/pokemon/back/841.png and b/public/images/pokemon/back/841.png differ
diff --git a/public/images/pokemon/back/842-gigantamax.png b/public/images/pokemon/back/842-gigantamax.png
index af30e475002..7c7e9e442b5 100644
Binary files a/public/images/pokemon/back/842-gigantamax.png and b/public/images/pokemon/back/842-gigantamax.png differ
diff --git a/public/images/pokemon/back/842.png b/public/images/pokemon/back/842.png
index d3f9ff8e12b..f6f72d57b06 100644
Binary files a/public/images/pokemon/back/842.png and b/public/images/pokemon/back/842.png differ
diff --git a/public/images/pokemon/back/871.png b/public/images/pokemon/back/871.png
index 657da7f864f..73eb65ab089 100644
Binary files a/public/images/pokemon/back/871.png and b/public/images/pokemon/back/871.png differ
diff --git a/public/images/pokemon/back/881.png b/public/images/pokemon/back/881.png
index 2f77327cfd0..60ab60a9aa1 100644
Binary files a/public/images/pokemon/back/881.png and b/public/images/pokemon/back/881.png differ
diff --git a/public/images/pokemon/back/female/332.png b/public/images/pokemon/back/female/332.png
index a6940fbaba6..a432b1af4b2 100644
Binary files a/public/images/pokemon/back/female/332.png and b/public/images/pokemon/back/female/332.png differ
diff --git a/public/images/pokemon/back/female/396.png b/public/images/pokemon/back/female/396.png
index 0222da73920..d18d4c1a99a 100644
Binary files a/public/images/pokemon/back/female/396.png and b/public/images/pokemon/back/female/396.png differ
diff --git a/public/images/pokemon/back/female/397.png b/public/images/pokemon/back/female/397.png
index a1f7f52a0e4..32768daead2 100644
Binary files a/public/images/pokemon/back/female/397.png and b/public/images/pokemon/back/female/397.png differ
diff --git a/public/images/pokemon/back/female/398.png b/public/images/pokemon/back/female/398.png
index 57fbb92e12f..bf296c54b91 100644
Binary files a/public/images/pokemon/back/female/398.png and b/public/images/pokemon/back/female/398.png differ
diff --git a/public/images/pokemon/back/female/403.png b/public/images/pokemon/back/female/403.png
index 68ed4a12507..b730b32f6ee 100644
Binary files a/public/images/pokemon/back/female/403.png and b/public/images/pokemon/back/female/403.png differ
diff --git a/public/images/pokemon/back/female/404.png b/public/images/pokemon/back/female/404.png
index d6fdef26c83..27602ee0439 100644
Binary files a/public/images/pokemon/back/female/404.png and b/public/images/pokemon/back/female/404.png differ
diff --git a/public/images/pokemon/back/female/405.png b/public/images/pokemon/back/female/405.png
index 21d28b1fede..1aa669e1fbd 100644
Binary files a/public/images/pokemon/back/female/405.png and b/public/images/pokemon/back/female/405.png differ
diff --git a/public/images/pokemon/back/shiny/477.png b/public/images/pokemon/back/shiny/477.png
index 45879a61d11..e7630e58e07 100644
Binary files a/public/images/pokemon/back/shiny/477.png and b/public/images/pokemon/back/shiny/477.png differ
diff --git a/public/images/pokemon/back/shiny/658.json b/public/images/pokemon/back/shiny/658.json
index 050b63e3592..867e1d2d3d2 100644
--- a/public/images/pokemon/back/shiny/658.json
+++ b/public/images/pokemon/back/shiny/658.json
@@ -1,11 +1,11 @@
 { "frames": [
    {
     "filename": "0001.png",
-    "frame": { "x": 0, "y": 0, "w": 77, "h": 77 },
+    "frame": { "x": 0, "y": 0, "w": 77, "h": 65 },
     "rotated": false,
     "trimmed": false,
-    "spriteSourceSize": { "x": 0, "y": 0, "w": 77, "h": 77 },
-    "sourceSize": { "w": 77, "h": 77 },
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 77, "h": 65 },
+    "sourceSize": { "w": 77, "h": 65 },
     "duration": 100
    }
  ],
@@ -13,7 +13,7 @@
   "app": "https://www.aseprite.org/",
   "version": "1.3.7-x64",
   "format": "I8",
-  "size": { "w": 77, "h": 77 },
+  "size": { "w": 77, "h": 65 },
   "scale": "1"
  }
 }
diff --git a/public/images/pokemon/back/shiny/658.png b/public/images/pokemon/back/shiny/658.png
index 21519b6a145..239aaafb6ce 100644
Binary files a/public/images/pokemon/back/shiny/658.png and b/public/images/pokemon/back/shiny/658.png differ
diff --git a/public/images/pokemon/back/shiny/668-female.json b/public/images/pokemon/back/shiny/668-female.json
deleted file mode 100644
index 7b4adc1a94d..00000000000
--- a/public/images/pokemon/back/shiny/668-female.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "668-female.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 74,
-				"h": 74
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 74,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 74,
-						"h": 72
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 74,
-						"h": 72
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:a3f814ea1f5b062df0ecc4e7c343d89b:769178f31dc2505ae0e67b72b1319828:d99ed0e84a0695b54e479aa98271aba1$"
-	}
-}
diff --git a/public/images/pokemon/back/shiny/668-female.png b/public/images/pokemon/back/shiny/668-female.png
deleted file mode 100644
index caf8bed99ac..00000000000
Binary files a/public/images/pokemon/back/shiny/668-female.png and /dev/null differ
diff --git a/public/images/pokemon/back/shiny/674.json b/public/images/pokemon/back/shiny/674.json
index eac9372c5d4..cc0ead50962 100644
--- a/public/images/pokemon/back/shiny/674.json
+++ b/public/images/pokemon/back/shiny/674.json
@@ -1,41 +1,506 @@
-{
-	"textures": [
-		{
-			"image": "674.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 42,
-				"h": 42
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 27,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 27,
-						"h": 42
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 27,
-						"h": 42
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:efc4d9ff714ef5249d5ea29e541766f9:c21489bea9a10b1521844e4efb4735d5:b823d10f1c9b4d501296982088ba63d6$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 58, "y": 40, "w": 27, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 27, "h": 42 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 85, "y": 41, "w": 27, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 27, "h": 41 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 70
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 27, "y": 80, "w": 27, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 27, "h": 40 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 81, "y": 82, "w": 27, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 27, "h": 39 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 210
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 27, "y": 80, "w": 27, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 27, "h": 40 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 85, "y": 41, "w": 27, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 27, "h": 41 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 58, "y": 40, "w": 27, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 27, "h": 42 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 85, "y": 41, "w": 27, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 27, "h": 41 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 70
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 27, "y": 80, "w": 27, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 27, "h": 40 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 81, "y": 82, "w": 27, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 27, "h": 39 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 210
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 27, "y": 80, "w": 27, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 27, "h": 40 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 85, "y": 41, "w": 27, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 27, "h": 41 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 58, "y": 40, "w": 27, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 27, "h": 42 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 85, "y": 41, "w": 27, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 27, "h": 41 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 70
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 27, "y": 80, "w": 27, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 27, "h": 40 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 81, "y": 82, "w": 27, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 27, "h": 39 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 210
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 27, "y": 80, "w": 27, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 27, "h": 40 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 85, "y": 41, "w": 27, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 27, "h": 41 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 58, "y": 40, "w": 27, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 27, "h": 42 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 85, "y": 41, "w": 27, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 27, "h": 41 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 70
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 27, "y": 80, "w": 27, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 27, "h": 40 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 81, "y": 82, "w": 27, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 27, "h": 39 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 210
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 27, "y": 80, "w": 27, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 27, "h": 40 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 85, "y": 41, "w": 27, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 27, "h": 41 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 58, "y": 40, "w": 27, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 27, "h": 42 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 85, "y": 41, "w": 27, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 27, "h": 41 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 70
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 27, "y": 80, "w": 27, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 27, "h": 40 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 81, "y": 82, "w": 27, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 27, "h": 39 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 210
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 27, "y": 80, "w": 27, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 27, "h": 40 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 85, "y": 41, "w": 27, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 27, "h": 41 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 58, "y": 40, "w": 27, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 27, "h": 42 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 0, "y": 42, "w": 27, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 27, "h": 41 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 70
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 54, "y": 82, "w": 27, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 27, "h": 40 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 0, "y": 83, "w": 27, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 27, "h": 39 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 210
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 54, "y": 82, "w": 27, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 27, "h": 40 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 87, "y": 0, "w": 28, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 28, "h": 41 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 0, "y": 0, "w": 29, "h": 42 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 29, "y": 0, "w": 29, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 29, "h": 41 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 70
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 58, "y": 0, "w": 29, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 29, "h": 40 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 29, "y": 41, "w": 29, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 29, "h": 39 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 210
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 58, "y": 0, "w": 29, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 29, "h": 40 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 29, "y": 0, "w": 29, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 29, "h": 41 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 0, "y": 0, "w": 29, "h": 42 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 29, "y": 0, "w": 29, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 29, "h": 41 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 70
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 58, "y": 0, "w": 29, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 29, "h": 40 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 29, "y": 41, "w": 29, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 29, "h": 39 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 210
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 58, "y": 0, "w": 29, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 29, "h": 40 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 29, "y": 0, "w": 29, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 29, "h": 41 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 0, "y": 0, "w": 29, "h": 42 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 87, "y": 0, "w": 28, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 28, "h": 41 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 70
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 54, "y": 82, "w": 27, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 27, "h": 40 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 81, "y": 82, "w": 27, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 27, "h": 39 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 210
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 27, "y": 80, "w": 27, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 27, "h": 40 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 70
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 85, "y": 41, "w": 27, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 27, "h": 41 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 58, "y": 40, "w": 27, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 27, "h": 42 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 70
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.11-x64",
+  "image": "674.png",
+  "format": "I8",
+  "size": { "w": 115, "h": 122 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/back/shiny/674.png b/public/images/pokemon/back/shiny/674.png
index 96734feb3f7..4617b03c6eb 100644
Binary files a/public/images/pokemon/back/shiny/674.png and b/public/images/pokemon/back/shiny/674.png differ
diff --git a/public/images/pokemon/back/shiny/694.json b/public/images/pokemon/back/shiny/694.json
index ae617f4876f..76c88067e7e 100644
--- a/public/images/pokemon/back/shiny/694.json
+++ b/public/images/pokemon/back/shiny/694.json
@@ -1,41 +1,767 @@
-{
-	"textures": [
-		{
-			"image": "694.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 44,
-				"h": 44
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 44,
-						"h": 37
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 44,
-						"h": 37
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 44,
-						"h": 37
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:136b476d55eb513322e6355dbd903c97:982afbb162c554e6193d6fe06bccb61d:b0990f9650cfe63b836cbed33f0b44d8$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 102, "y": 163, "w": 44, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 44, "h": 37 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 57, "y": 129, "w": 45, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 45, "h": 37 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 162, "y": 127, "w": 47, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 47, "h": 37 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 114, "y": 126, "w": 48, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 48, "h": 37 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 283, "y": 90, "w": 49, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 49, "h": 37 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 227, "y": 126, "w": 49, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 12, "w": 49, "h": 36 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 276, "y": 127, "w": 47, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 11, "w": 47, "h": 37 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 0, "y": 132, "w": 45, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 45, "h": 37 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 132, "y": 201, "w": 43, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 43, "h": 37 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 234, "y": 201, "w": 42, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 42, "h": 37 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 0, "y": 206, "w": 42, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 12, "w": 42, "h": 36 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 44, "y": 203, "w": 43, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 12, "w": 43, "h": 36 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 276, "y": 201, "w": 43, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 12, "w": 43, "h": 36 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 89, "y": 200, "w": 43, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 43, "h": 37 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 146, "y": 164, "w": 44, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 44, "h": 37 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 102, "y": 163, "w": 44, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 44, "h": 37 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 57, "y": 129, "w": 45, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 45, "h": 37 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 162, "y": 127, "w": 47, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 47, "h": 37 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 114, "y": 126, "w": 48, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 48, "h": 37 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 283, "y": 90, "w": 49, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 49, "h": 37 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 227, "y": 126, "w": 49, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 12, "w": 49, "h": 36 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 276, "y": 127, "w": 47, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 11, "w": 47, "h": 37 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 0, "y": 132, "w": 45, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 45, "h": 37 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 132, "y": 201, "w": 43, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 43, "h": 37 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 234, "y": 201, "w": 42, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 42, "h": 37 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 0, "y": 206, "w": 42, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 12, "w": 42, "h": 36 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 44, "y": 203, "w": 43, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 12, "w": 43, "h": 36 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 276, "y": 201, "w": 43, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 12, "w": 43, "h": 36 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 89, "y": 200, "w": 43, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 43, "h": 37 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 146, "y": 164, "w": 44, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 44, "h": 37 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 102, "y": 163, "w": 44, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 44, "h": 37 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 57, "y": 129, "w": 45, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 45, "h": 37 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 162, "y": 127, "w": 47, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 47, "h": 37 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 114, "y": 126, "w": 48, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 48, "h": 37 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 283, "y": 90, "w": 49, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 49, "h": 37 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 227, "y": 126, "w": 49, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 12, "w": 49, "h": 36 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 276, "y": 127, "w": 47, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 11, "w": 47, "h": 37 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 0, "y": 132, "w": 45, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 45, "h": 37 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 132, "y": 201, "w": 43, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 43, "h": 37 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 234, "y": 201, "w": 42, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 42, "h": 37 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 0, "y": 206, "w": 42, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 12, "w": 42, "h": 36 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 44, "y": 203, "w": 43, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 12, "w": 43, "h": 36 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 276, "y": 201, "w": 43, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 12, "w": 43, "h": 36 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 89, "y": 200, "w": 43, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 43, "h": 37 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 146, "y": 164, "w": 44, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 44, "h": 37 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 102, "y": 163, "w": 44, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 44, "h": 37 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 57, "y": 129, "w": 45, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 45, "h": 37 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 162, "y": 127, "w": 47, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 47, "h": 37 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 114, "y": 126, "w": 48, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 48, "h": 37 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 283, "y": 90, "w": 49, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 49, "h": 37 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 227, "y": 126, "w": 49, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 12, "w": 49, "h": 36 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 276, "y": 127, "w": 47, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 11, "w": 47, "h": 37 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 0, "y": 132, "w": 45, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 45, "h": 37 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 132, "y": 201, "w": 43, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 43, "h": 37 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 234, "y": 201, "w": 42, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 42, "h": 37 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 0, "y": 206, "w": 42, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 12, "w": 42, "h": 36 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 44, "y": 203, "w": 43, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 12, "w": 43, "h": 36 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 276, "y": 201, "w": 43, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 12, "w": 43, "h": 36 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 89, "y": 200, "w": 43, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 43, "h": 37 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 146, "y": 164, "w": 44, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 44, "h": 37 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 102, "y": 163, "w": 44, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 44, "h": 37 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 253, "y": 164, "w": 44, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 44, "h": 37 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 297, "y": 164, "w": 44, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 44, "h": 37 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 45, "y": 166, "w": 44, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 44, "h": 37 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 209, "y": 162, "w": 44, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 44, "h": 37 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 172, "y": 90, "w": 55, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 11, "w": 55, "h": 37 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 57, "y": 90, "w": 57, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 9, "w": 57, "h": 39 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 117, "y": 0, "w": 58, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 58, "h": 47 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 59, "y": 0, "w": 58, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 58, "h": 48 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 0, "y": 0, "w": 59, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 59, "h": 48 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 232, "y": 0, "w": 58, "h": 45 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 58, "h": 45 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 232, "y": 45, "w": 57, "h": 45 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 57, "h": 45 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 175, "y": 0, "w": 57, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 57, "h": 47 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 289, "y": 45, "w": 57, "h": 45 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 57, "h": 45 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 117, "y": 47, "w": 57, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 57, "h": 43 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 290, "y": 0, "w": 58, "h": 45 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 58, "h": 45 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 174, "y": 47, "w": 57, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 57, "h": 43 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 58, "y": 48, "w": 57, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 57, "h": 42 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 0, "y": 90, "w": 57, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 57, "h": 42 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 0, "y": 48, "w": 58, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 58, "h": 42 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 114, "y": 90, "w": 58, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 12, "w": 58, "h": 36 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 227, "y": 90, "w": 56, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 12, "w": 56, "h": 36 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 0, "y": 169, "w": 44, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 11, "w": 44, "h": 37 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 190, "y": 199, "w": 44, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 44, "h": 37 },
+    "sourceSize": { "w": 61, "h": 48 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.11-x64",
+  "image": "694.png",
+  "format": "I8",
+  "size": { "w": 348, "h": 242 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/back/shiny/694.png b/public/images/pokemon/back/shiny/694.png
index 1c6444e450a..b4d451678ef 100644
Binary files a/public/images/pokemon/back/shiny/694.png and b/public/images/pokemon/back/shiny/694.png differ
diff --git a/public/images/pokemon/back/shiny/698.json b/public/images/pokemon/back/shiny/698.json
index fba1db6d11d..0da697e1f4e 100644
--- a/public/images/pokemon/back/shiny/698.json
+++ b/public/images/pokemon/back/shiny/698.json
@@ -1,41 +1,1415 @@
-{
-	"textures": [
-		{
-			"image": "698.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 55,
-				"h": 55
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 37,
-						"h": 55
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 55
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 55
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:2d3467f0abbe6bec820c8196bd88983a:3a8331cf2af48202898ef3b9681f4110:198087d69fed44d4a642fa3ba5c077d6$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 0, "y": 52, "w": 37, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 0, "y": 52, "w": 37, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 0, "y": 107, "w": 35, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 35, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 0, "y": 107, "w": 35, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 35, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 139, "y": 111, "w": 33, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 33, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 139, "y": 111, "w": 33, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 33, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 68, "y": 112, "w": 31, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 31, "h": 54 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 68, "y": 112, "w": 31, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 31, "h": 54 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 99, "y": 113, "w": 31, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 31, "h": 53 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 99, "y": 113, "w": 31, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 31, "h": 53 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 68, "y": 112, "w": 31, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 31, "h": 54 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 68, "y": 112, "w": 31, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 31, "h": 54 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 139, "y": 111, "w": 33, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 33, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 139, "y": 111, "w": 33, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 33, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 0, "y": 107, "w": 35, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 35, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 0, "y": 107, "w": 35, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 35, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 0, "y": 52, "w": 37, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 0, "y": 52, "w": 37, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 0, "y": 52, "w": 37, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 0, "y": 52, "w": 37, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 0, "y": 52, "w": 37, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 0, "y": 52, "w": 37, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 0, "y": 52, "w": 37, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 0, "y": 52, "w": 37, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 130, "y": 0, "w": 39, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 39, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 130, "y": 0, "w": 39, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 39, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 89, "y": 0, "w": 41, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 41, "h": 54 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 89, "y": 0, "w": 41, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 41, "h": 54 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 45, "y": 0, "w": 44, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 44, "h": 53 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 45, "y": 0, "w": 44, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 44, "h": 53 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 0, "y": 0, "w": 45, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 6, "w": 45, "h": 52 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 0, "y": 0, "w": 45, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 6, "w": 45, "h": 52 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 45, "y": 0, "w": 44, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 44, "h": 53 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 45, "y": 0, "w": 44, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 44, "h": 53 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 89, "y": 0, "w": 41, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 41, "h": 54 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 89, "y": 0, "w": 41, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 41, "h": 54 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 130, "y": 0, "w": 39, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 39, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 130, "y": 0, "w": 39, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 39, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 130, "y": 0, "w": 39, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 39, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 130, "y": 0, "w": 39, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 39, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 0, "y": 52, "w": 37, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 0, "y": 52, "w": 37, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 0, "y": 107, "w": 35, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 35, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 0, "y": 107, "w": 35, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 35, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 139, "y": 111, "w": 33, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 33, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 139, "y": 111, "w": 33, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 33, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 68, "y": 112, "w": 31, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 31, "h": 54 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 68, "y": 112, "w": 31, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 31, "h": 54 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 99, "y": 113, "w": 31, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 31, "h": 53 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 99, "y": 113, "w": 31, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 31, "h": 53 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 68, "y": 112, "w": 31, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 31, "h": 54 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 68, "y": 112, "w": 31, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 31, "h": 54 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 139, "y": 111, "w": 33, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 33, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 139, "y": 111, "w": 33, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 33, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 0, "y": 107, "w": 35, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 35, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 0, "y": 107, "w": 35, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 35, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 0, "y": 52, "w": 37, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 0, "y": 52, "w": 37, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 0, "y": 52, "w": 37, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 0, "y": 52, "w": 37, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 0, "y": 52, "w": 37, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 0, "y": 52, "w": 37, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 0, "y": 52, "w": 37, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 0, "y": 52, "w": 37, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 130, "y": 0, "w": 39, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 39, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 130, "y": 0, "w": 39, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 39, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 89, "y": 0, "w": 41, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 41, "h": 54 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 89, "y": 0, "w": 41, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 41, "h": 54 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 45, "y": 0, "w": 44, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 44, "h": 53 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 45, "y": 0, "w": 44, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 44, "h": 53 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 0, "y": 0, "w": 45, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 6, "w": 45, "h": 52 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 0, "y": 0, "w": 45, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 6, "w": 45, "h": 52 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 45, "y": 0, "w": 44, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 44, "h": 53 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 45, "y": 0, "w": 44, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 44, "h": 53 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 89, "y": 0, "w": 41, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 41, "h": 54 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 89, "y": 0, "w": 41, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 41, "h": 54 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 130, "y": 0, "w": 39, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 39, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 130, "y": 0, "w": 39, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 39, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 130, "y": 0, "w": 39, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 39, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 130, "y": 0, "w": 39, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 39, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 0, "y": 52, "w": 37, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 0, "y": 52, "w": 37, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 0, "y": 107, "w": 35, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 35, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 0, "y": 107, "w": 35, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 35, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 139, "y": 111, "w": 33, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 33, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 139, "y": 111, "w": 33, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 33, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 68, "y": 112, "w": 31, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 31, "h": 54 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0088.png",
+    "frame": { "x": 68, "y": 112, "w": 31, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 31, "h": 54 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0089.png",
+    "frame": { "x": 99, "y": 113, "w": 31, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 31, "h": 53 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0090.png",
+    "frame": { "x": 99, "y": 113, "w": 31, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 31, "h": 53 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0091.png",
+    "frame": { "x": 68, "y": 112, "w": 31, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 31, "h": 54 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0092.png",
+    "frame": { "x": 68, "y": 112, "w": 31, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 31, "h": 54 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0093.png",
+    "frame": { "x": 139, "y": 111, "w": 33, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 33, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0094.png",
+    "frame": { "x": 139, "y": 111, "w": 33, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 33, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0095.png",
+    "frame": { "x": 0, "y": 107, "w": 35, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 35, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0096.png",
+    "frame": { "x": 0, "y": 107, "w": 35, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 35, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0097.png",
+    "frame": { "x": 0, "y": 52, "w": 37, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0098.png",
+    "frame": { "x": 0, "y": 52, "w": 37, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0099.png",
+    "frame": { "x": 0, "y": 52, "w": 37, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0100.png",
+    "frame": { "x": 0, "y": 52, "w": 37, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0101.png",
+    "frame": { "x": 0, "y": 52, "w": 37, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0102.png",
+    "frame": { "x": 0, "y": 52, "w": 37, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0103.png",
+    "frame": { "x": 0, "y": 52, "w": 37, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0104.png",
+    "frame": { "x": 0, "y": 52, "w": 37, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0105.png",
+    "frame": { "x": 130, "y": 0, "w": 39, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 39, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0106.png",
+    "frame": { "x": 130, "y": 0, "w": 39, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 39, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0107.png",
+    "frame": { "x": 89, "y": 0, "w": 41, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 41, "h": 54 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0108.png",
+    "frame": { "x": 89, "y": 0, "w": 41, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 41, "h": 54 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0109.png",
+    "frame": { "x": 45, "y": 0, "w": 44, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 44, "h": 53 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0110.png",
+    "frame": { "x": 45, "y": 0, "w": 44, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 44, "h": 53 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0111.png",
+    "frame": { "x": 0, "y": 0, "w": 45, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 6, "w": 45, "h": 52 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0112.png",
+    "frame": { "x": 0, "y": 0, "w": 45, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 6, "w": 45, "h": 52 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0113.png",
+    "frame": { "x": 45, "y": 0, "w": 44, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 44, "h": 53 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0114.png",
+    "frame": { "x": 45, "y": 0, "w": 44, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 44, "h": 53 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0115.png",
+    "frame": { "x": 89, "y": 0, "w": 41, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 41, "h": 54 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0116.png",
+    "frame": { "x": 89, "y": 0, "w": 41, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 41, "h": 54 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0117.png",
+    "frame": { "x": 130, "y": 0, "w": 39, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 39, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0118.png",
+    "frame": { "x": 130, "y": 0, "w": 39, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 39, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0119.png",
+    "frame": { "x": 130, "y": 0, "w": 39, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 39, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0120.png",
+    "frame": { "x": 130, "y": 0, "w": 39, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 39, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0121.png",
+    "frame": { "x": 0, "y": 52, "w": 37, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0122.png",
+    "frame": { "x": 0, "y": 52, "w": 37, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0123.png",
+    "frame": { "x": 139, "y": 55, "w": 35, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 35, "h": 56 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0124.png",
+    "frame": { "x": 139, "y": 55, "w": 35, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 35, "h": 56 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0125.png",
+    "frame": { "x": 35, "y": 111, "w": 33, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 33, "h": 58 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0126.png",
+    "frame": { "x": 35, "y": 111, "w": 33, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 33, "h": 58 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0127.png",
+    "frame": { "x": 37, "y": 53, "w": 34, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 34, "h": 58 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0128.png",
+    "frame": { "x": 37, "y": 53, "w": 34, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 34, "h": 58 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0129.png",
+    "frame": { "x": 71, "y": 54, "w": 34, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 34, "h": 58 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0130.png",
+    "frame": { "x": 71, "y": 54, "w": 34, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 34, "h": 58 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0131.png",
+    "frame": { "x": 105, "y": 55, "w": 34, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 34, "h": 58 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0132.png",
+    "frame": { "x": 105, "y": 55, "w": 34, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 34, "h": 58 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0133.png",
+    "frame": { "x": 37, "y": 53, "w": 34, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 34, "h": 58 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0134.png",
+    "frame": { "x": 37, "y": 53, "w": 34, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 34, "h": 58 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0135.png",
+    "frame": { "x": 71, "y": 54, "w": 34, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 34, "h": 58 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0136.png",
+    "frame": { "x": 71, "y": 54, "w": 34, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 34, "h": 58 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0137.png",
+    "frame": { "x": 105, "y": 55, "w": 34, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 34, "h": 58 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0138.png",
+    "frame": { "x": 105, "y": 55, "w": 34, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 34, "h": 58 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0139.png",
+    "frame": { "x": 37, "y": 53, "w": 34, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 34, "h": 58 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0140.png",
+    "frame": { "x": 37, "y": 53, "w": 34, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 34, "h": 58 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0141.png",
+    "frame": { "x": 71, "y": 54, "w": 34, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 34, "h": 58 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0142.png",
+    "frame": { "x": 71, "y": 54, "w": 34, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 34, "h": 58 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0143.png",
+    "frame": { "x": 105, "y": 55, "w": 34, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 34, "h": 58 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0144.png",
+    "frame": { "x": 105, "y": 55, "w": 34, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 34, "h": 58 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0145.png",
+    "frame": { "x": 37, "y": 53, "w": 34, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 34, "h": 58 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0146.png",
+    "frame": { "x": 37, "y": 53, "w": 34, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 34, "h": 58 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0147.png",
+    "frame": { "x": 71, "y": 54, "w": 34, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 34, "h": 58 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0148.png",
+    "frame": { "x": 71, "y": 54, "w": 34, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 34, "h": 58 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0149.png",
+    "frame": { "x": 105, "y": 55, "w": 34, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 34, "h": 58 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0150.png",
+    "frame": { "x": 105, "y": 55, "w": 34, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 34, "h": 58 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0151.png",
+    "frame": { "x": 35, "y": 111, "w": 33, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 33, "h": 58 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0152.png",
+    "frame": { "x": 35, "y": 111, "w": 33, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 33, "h": 58 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0153.png",
+    "frame": { "x": 139, "y": 55, "w": 35, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 35, "h": 56 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0154.png",
+    "frame": { "x": 139, "y": 55, "w": 35, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 35, "h": 56 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0155.png",
+    "frame": { "x": 0, "y": 52, "w": 37, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   },
+   {
+    "filename": "0156.png",
+    "frame": { "x": 0, "y": 52, "w": 37, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 55 },
+    "sourceSize": { "w": 45, "h": 58 },
+    "duration": 50
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.11-x64",
+  "image": "698.png",
+  "format": "I8",
+  "size": { "w": 174, "h": 169 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/back/shiny/698.png b/public/images/pokemon/back/shiny/698.png
index 3daad1fd4ab..bc96912bd46 100644
Binary files a/public/images/pokemon/back/shiny/698.png and b/public/images/pokemon/back/shiny/698.png differ
diff --git a/public/images/pokemon/back/shiny/703.json b/public/images/pokemon/back/shiny/703.json
index ee6074b20ca..d6752e6f7ff 100644
--- a/public/images/pokemon/back/shiny/703.json
+++ b/public/images/pokemon/back/shiny/703.json
@@ -1,41 +1,569 @@
-{
-	"textures": [
-		{
-			"image": "703.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 38,
-				"h": 38
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 37,
-						"h": 38
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 38
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 38
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:d9d865fef42b5a28e45d32fccd741f98:96057dceb7fdf650f54901c6be0f386f:721af8c322ff60159262e9b3017c784d$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 36, "y": 0, "w": 37, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 37, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 73, "y": 0, "w": 37, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 37, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 73, "y": 38, "w": 36, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 36, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 0, "y": 40, "w": 36, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 36, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 36, "y": 76, "w": 36, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 8, "w": 36, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 0, "y": 78, "w": 35, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 9, "w": 35, "h": 39 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 0, "y": 0, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 9, "w": 36, "h": 40 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 0, "y": 0, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 8, "w": 36, "h": 40 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 0, "y": 78, "w": 35, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 7, "w": 35, "h": 39 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 36, "y": 76, "w": 36, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 36, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 0, "y": 40, "w": 36, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 36, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 72, "y": 76, "w": 36, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 36, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 36, "y": 0, "w": 37, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 37, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 73, "y": 0, "w": 37, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 37, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 73, "y": 38, "w": 36, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 36, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 0, "y": 40, "w": 36, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 36, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 36, "y": 76, "w": 36, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 8, "w": 36, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 0, "y": 78, "w": 35, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 9, "w": 35, "h": 39 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 0, "y": 0, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 9, "w": 36, "h": 40 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 0, "y": 0, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 8, "w": 36, "h": 40 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 0, "y": 78, "w": 35, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 7, "w": 35, "h": 39 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 36, "y": 76, "w": 36, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 36, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 0, "y": 40, "w": 36, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 36, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 72, "y": 76, "w": 36, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 36, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 36, "y": 0, "w": 37, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 37, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 73, "y": 0, "w": 37, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 37, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 73, "y": 38, "w": 36, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 36, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 0, "y": 40, "w": 36, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 36, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 36, "y": 76, "w": 36, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 8, "w": 36, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 0, "y": 78, "w": 35, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 9, "w": 35, "h": 39 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 0, "y": 0, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 9, "w": 36, "h": 40 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 0, "y": 0, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 8, "w": 36, "h": 40 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 0, "y": 78, "w": 35, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 7, "w": 35, "h": 39 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 36, "y": 76, "w": 36, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 36, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 0, "y": 40, "w": 36, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 36, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 72, "y": 76, "w": 36, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 36, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 36, "y": 0, "w": 37, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 37, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 73, "y": 0, "w": 37, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 37, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 73, "y": 38, "w": 36, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 36, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 0, "y": 40, "w": 36, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 36, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 36, "y": 76, "w": 36, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 8, "w": 36, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 0, "y": 78, "w": 35, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 9, "w": 35, "h": 39 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 0, "y": 0, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 9, "w": 36, "h": 40 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 0, "y": 0, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 8, "w": 36, "h": 40 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 0, "y": 78, "w": 35, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 7, "w": 35, "h": 39 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 36, "y": 76, "w": 36, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 36, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 0, "y": 40, "w": 36, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 36, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 72, "y": 76, "w": 36, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 36, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 36, "y": 0, "w": 37, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 37, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 36, "y": 38, "w": 37, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 0, "y": 78, "w": 35, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 35, "h": 39 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 0, "y": 78, "w": 35, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 7, "w": 35, "h": 39 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 0, "y": 78, "w": 35, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 35, "h": 39 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 0, "y": 78, "w": 35, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 6, "w": 35, "h": 39 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 0, "y": 78, "w": 35, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 35, "h": 39 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 0, "y": 78, "w": 35, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 6, "w": 35, "h": 39 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 0, "y": 78, "w": 35, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 35, "h": 39 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 0, "y": 78, "w": 35, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 6, "w": 35, "h": 39 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 0, "y": 78, "w": 35, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 35, "h": 39 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 36, "y": 38, "w": 37, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 37, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 73, "y": 38, "w": 36, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 36, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 72, "y": 76, "w": 36, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 36, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.11-x64",
+  "image": "703.png",
+  "format": "I8",
+  "size": { "w": 110, "h": 117 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/back/shiny/703.png b/public/images/pokemon/back/shiny/703.png
index ea22e4ad5d4..635d930e674 100644
Binary files a/public/images/pokemon/back/shiny/703.png and b/public/images/pokemon/back/shiny/703.png differ
diff --git a/public/images/pokemon/back/shiny/707.json b/public/images/pokemon/back/shiny/707.json
index 8151fd60f08..b92e1983efc 100644
--- a/public/images/pokemon/back/shiny/707.json
+++ b/public/images/pokemon/back/shiny/707.json
@@ -1,41 +1,1559 @@
-{
-	"textures": [
-		{
-			"image": "707.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 77,
-				"h": 77
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 43,
-						"h": 77
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 43,
-						"h": 77
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 43,
-						"h": 77
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:c2d2cb3b868498a2b93c8233ad35af4a:09ee133b9c655c6135da1abf1c9b6ddf:8e96b9056ea81e44ced99c97f472a528$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 2, "y": 358, "w": 43, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 18, "w": 43, "h": 77 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 190, "y": 373, "w": 42, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 30, "y": 17, "w": 42, "h": 77 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 391, "y": 440, "w": 41, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 33, "y": 16, "w": 41, "h": 76 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 443, "y": 377, "w": 42, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 35, "y": 16, "w": 42, "h": 76 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 715, "y": 359, "w": 44, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 36, "y": 15, "w": 44, "h": 75 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 45, "y": 363, "w": 44, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 38, "y": 14, "w": 44, "h": 75 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 520, "y": 352, "w": 45, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 39, "y": 13, "w": 45, "h": 74 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 306, "y": 291, "w": 48, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 41, "y": 14, "w": 48, "h": 72 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 527, "y": 213, "w": 51, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 43, "y": 13, "w": 51, "h": 72 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 372, "y": 139, "w": 56, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 44, "y": 12, "w": 56, "h": 71 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 404, "y": 69, "w": 59, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 43, "y": 13, "w": 59, "h": 70 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 658, "y": 73, "w": 57, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 41, "y": 14, "w": 57, "h": 71 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 570, "y": 141, "w": 55, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 39, "y": 13, "w": 55, "h": 72 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 161, "y": 145, "w": 53, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 38, "y": 14, "w": 53, "h": 72 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 2, "y": 208, "w": 51, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 36, "y": 15, "w": 51, "h": 73 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 475, "y": 229, "w": 49, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 35, "y": 16, "w": 49, "h": 73 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 623, "y": 300, "w": 46, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 33, "y": 16, "w": 46, "h": 74 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 475, "y": 302, "w": 45, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 31, "y": 17, "w": 45, "h": 75 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 232, "y": 414, "w": 42, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 30, "y": 18, "w": 42, "h": 76 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 607, "y": 374, "w": 42, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 17, "w": 42, "h": 77 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 147, "y": 351, "w": 43, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 16, "w": 43, "h": 78 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 206, "y": 295, "w": 44, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 16, "w": 44, "h": 78 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 326, "y": 213, "w": 46, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 15, "w": 46, "h": 78 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 479, "y": 151, "w": 48, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 17, "y": 14, "w": 48, "h": 78 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 112, "y": 145, "w": 49, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 13, "w": 49, "h": 78 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 321, "y": 135, "w": 51, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 13, "w": 51, "h": 78 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 269, "y": 134, "w": 52, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 12, "w": 52, "h": 77 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 214, "y": 69, "w": 55, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 11, "w": 55, "h": 76 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 463, "y": 69, "w": 55, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 12, "w": 55, "h": 74 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 159, "y": 69, "w": 55, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 13, "w": 55, "h": 76 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 715, "y": 73, "w": 53, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 13, "w": 53, "h": 76 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 518, "y": 74, "w": 52, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 14, "w": 52, "h": 77 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 61, "y": 136, "w": 51, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 15, "w": 51, "h": 78 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 625, "y": 144, "w": 49, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 16, "w": 49, "h": 78 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 625, "y": 222, "w": 46, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 16, "w": 46, "h": 78 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 430, "y": 287, "w": 45, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 17, "w": 45, "h": 77 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 2, "y": 358, "w": 43, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 18, "w": 43, "h": 77 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 190, "y": 373, "w": 42, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 30, "y": 17, "w": 42, "h": 77 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 391, "y": 440, "w": 41, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 33, "y": 16, "w": 41, "h": 76 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 443, "y": 377, "w": 42, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 35, "y": 16, "w": 42, "h": 76 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 715, "y": 359, "w": 44, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 36, "y": 15, "w": 44, "h": 75 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 45, "y": 363, "w": 44, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 38, "y": 14, "w": 44, "h": 75 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 520, "y": 352, "w": 45, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 39, "y": 13, "w": 45, "h": 74 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 306, "y": 291, "w": 48, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 41, "y": 14, "w": 48, "h": 72 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 527, "y": 213, "w": 51, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 43, "y": 13, "w": 51, "h": 72 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 372, "y": 139, "w": 56, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 44, "y": 12, "w": 56, "h": 71 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 404, "y": 69, "w": 59, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 43, "y": 13, "w": 59, "h": 70 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 658, "y": 73, "w": 57, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 41, "y": 14, "w": 57, "h": 71 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 570, "y": 141, "w": 55, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 39, "y": 13, "w": 55, "h": 72 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 161, "y": 145, "w": 53, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 38, "y": 14, "w": 53, "h": 72 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 2, "y": 208, "w": 51, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 36, "y": 15, "w": 51, "h": 73 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 475, "y": 229, "w": 49, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 35, "y": 16, "w": 49, "h": 73 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 623, "y": 300, "w": 46, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 33, "y": 16, "w": 46, "h": 74 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 475, "y": 302, "w": 45, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 31, "y": 17, "w": 45, "h": 75 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 232, "y": 414, "w": 42, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 30, "y": 18, "w": 42, "h": 76 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 607, "y": 374, "w": 42, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 17, "w": 42, "h": 77 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 147, "y": 351, "w": 43, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 16, "w": 43, "h": 78 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 206, "y": 295, "w": 44, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 16, "w": 44, "h": 78 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 326, "y": 213, "w": 46, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 15, "w": 46, "h": 78 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 479, "y": 151, "w": 48, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 17, "y": 14, "w": 48, "h": 78 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 112, "y": 145, "w": 49, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 13, "w": 49, "h": 78 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 321, "y": 135, "w": 51, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 13, "w": 51, "h": 78 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 269, "y": 134, "w": 52, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 12, "w": 52, "h": 77 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 214, "y": 69, "w": 55, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 11, "w": 55, "h": 76 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 463, "y": 69, "w": 55, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 12, "w": 55, "h": 74 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 159, "y": 69, "w": 55, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 13, "w": 55, "h": 76 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 715, "y": 73, "w": 53, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 13, "w": 53, "h": 76 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 518, "y": 74, "w": 52, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 14, "w": 52, "h": 77 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 61, "y": 136, "w": 51, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 15, "w": 51, "h": 78 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 625, "y": 144, "w": 49, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 16, "w": 49, "h": 78 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 625, "y": 222, "w": 46, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 16, "w": 46, "h": 78 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 430, "y": 287, "w": 45, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 17, "w": 45, "h": 77 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 2, "y": 358, "w": 43, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 18, "w": 43, "h": 77 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 190, "y": 373, "w": 42, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 30, "y": 17, "w": 42, "h": 77 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 391, "y": 440, "w": 41, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 33, "y": 16, "w": 41, "h": 76 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 443, "y": 377, "w": 42, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 35, "y": 16, "w": 42, "h": 76 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 715, "y": 359, "w": 44, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 36, "y": 15, "w": 44, "h": 75 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 45, "y": 363, "w": 44, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 38, "y": 14, "w": 44, "h": 75 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 520, "y": 352, "w": 45, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 39, "y": 13, "w": 45, "h": 74 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 306, "y": 291, "w": 48, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 41, "y": 14, "w": 48, "h": 72 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 527, "y": 213, "w": 51, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 43, "y": 13, "w": 51, "h": 72 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 372, "y": 139, "w": 56, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 44, "y": 12, "w": 56, "h": 71 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 404, "y": 69, "w": 59, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 43, "y": 13, "w": 59, "h": 70 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 658, "y": 73, "w": 57, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 41, "y": 14, "w": 57, "h": 71 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 570, "y": 141, "w": 55, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 39, "y": 13, "w": 55, "h": 72 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 161, "y": 145, "w": 53, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 38, "y": 14, "w": 53, "h": 72 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 2, "y": 208, "w": 51, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 36, "y": 15, "w": 51, "h": 73 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0088.png",
+    "frame": { "x": 475, "y": 229, "w": 49, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 35, "y": 16, "w": 49, "h": 73 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0089.png",
+    "frame": { "x": 623, "y": 300, "w": 46, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 33, "y": 16, "w": 46, "h": 74 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0090.png",
+    "frame": { "x": 475, "y": 302, "w": 45, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 31, "y": 17, "w": 45, "h": 75 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0091.png",
+    "frame": { "x": 232, "y": 414, "w": 42, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 30, "y": 18, "w": 42, "h": 76 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0092.png",
+    "frame": { "x": 607, "y": 374, "w": 42, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 17, "w": 42, "h": 77 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0093.png",
+    "frame": { "x": 147, "y": 351, "w": 43, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 16, "w": 43, "h": 78 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0094.png",
+    "frame": { "x": 206, "y": 295, "w": 44, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 16, "w": 44, "h": 78 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0095.png",
+    "frame": { "x": 326, "y": 213, "w": 46, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 15, "w": 46, "h": 78 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0096.png",
+    "frame": { "x": 479, "y": 151, "w": 48, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 17, "y": 14, "w": 48, "h": 78 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0097.png",
+    "frame": { "x": 112, "y": 145, "w": 49, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 13, "w": 49, "h": 78 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0098.png",
+    "frame": { "x": 321, "y": 135, "w": 51, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 13, "w": 51, "h": 78 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0099.png",
+    "frame": { "x": 269, "y": 134, "w": 52, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 12, "w": 52, "h": 77 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0100.png",
+    "frame": { "x": 214, "y": 69, "w": 55, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 11, "w": 55, "h": 76 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0101.png",
+    "frame": { "x": 463, "y": 69, "w": 55, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 12, "w": 55, "h": 74 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0102.png",
+    "frame": { "x": 159, "y": 69, "w": 55, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 13, "w": 55, "h": 76 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0103.png",
+    "frame": { "x": 715, "y": 73, "w": 53, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 13, "w": 53, "h": 76 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0104.png",
+    "frame": { "x": 518, "y": 74, "w": 52, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 14, "w": 52, "h": 77 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0105.png",
+    "frame": { "x": 61, "y": 136, "w": 51, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 15, "w": 51, "h": 78 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0106.png",
+    "frame": { "x": 625, "y": 144, "w": 49, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 16, "w": 49, "h": 78 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0107.png",
+    "frame": { "x": 625, "y": 222, "w": 46, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 16, "w": 46, "h": 78 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0108.png",
+    "frame": { "x": 430, "y": 287, "w": 45, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 17, "w": 45, "h": 77 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0109.png",
+    "frame": { "x": 2, "y": 358, "w": 43, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 18, "w": 43, "h": 77 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0110.png",
+    "frame": { "x": 428, "y": 143, "w": 51, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 17, "w": 51, "h": 75 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0111.png",
+    "frame": { "x": 98, "y": 62, "w": 61, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 14, "w": 61, "h": 74 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0112.png",
+    "frame": { "x": 530, "y": 2, "w": 70, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 19, "y": 11, "w": 70, "h": 72 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0113.png",
+    "frame": { "x": 194, "y": 2, "w": 85, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 6, "w": 85, "h": 67 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0114.png",
+    "frame": { "x": 2, "y": 2, "w": 96, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 3, "w": 96, "h": 63 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0115.png",
+    "frame": { "x": 98, "y": 2, "w": 96, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 1, "w": 96, "h": 60 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0116.png",
+    "frame": { "x": 279, "y": 2, "w": 91, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 0, "w": 91, "h": 62 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0117.png",
+    "frame": { "x": 370, "y": 2, "w": 84, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 17, "y": 0, "w": 84, "h": 64 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0118.png",
+    "frame": { "x": 454, "y": 2, "w": 76, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 1, "w": 76, "h": 67 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0119.png",
+    "frame": { "x": 600, "y": 2, "w": 67, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 2, "w": 67, "h": 69 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0120.png",
+    "frame": { "x": 372, "y": 210, "w": 51, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 30, "y": 4, "w": 51, "h": 72 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0121.png",
+    "frame": { "x": 172, "y": 450, "w": 41, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 31, "y": 5, "w": 41, "h": 75 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0122.png",
+    "frame": { "x": 526, "y": 443, "w": 41, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 31, "y": 7, "w": 41, "h": 75 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0123.png",
+    "frame": { "x": 432, "y": 453, "w": 41, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 31, "y": 10, "w": 41, "h": 74 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0124.png",
+    "frame": { "x": 43, "y": 438, "w": 41, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 31, "y": 11, "w": 41, "h": 76 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0125.png",
+    "frame": { "x": 2, "y": 435, "w": 41, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 31, "y": 13, "w": 41, "h": 76 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0126.png",
+    "frame": { "x": 565, "y": 366, "w": 42, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 30, "y": 14, "w": 42, "h": 77 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0127.png",
+    "frame": { "x": 131, "y": 429, "w": 41, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 30, "y": 16, "w": 41, "h": 77 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0128.png",
+    "frame": { "x": 485, "y": 426, "w": 41, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 30, "y": 17, "w": 41, "h": 77 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0129.png",
+    "frame": { "x": 649, "y": 421, "w": 41, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 30, "y": 18, "w": 41, "h": 77 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0130.png",
+    "frame": { "x": 2, "y": 358, "w": 43, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 18, "w": 43, "h": 77 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0131.png",
+    "frame": { "x": 2, "y": 281, "w": 46, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 18, "w": 46, "h": 77 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0132.png",
+    "frame": { "x": 53, "y": 214, "w": 48, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 18, "w": 48, "h": 76 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0133.png",
+    "frame": { "x": 354, "y": 348, "w": 46, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 19, "w": 46, "h": 73 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0134.png",
+    "frame": { "x": 345, "y": 421, "w": 46, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 32, "y": 20, "w": 46, "h": 69 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0135.png",
+    "frame": { "x": 567, "y": 451, "w": 45, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 36, "y": 20, "w": 45, "h": 68 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0136.png",
+    "frame": { "x": 423, "y": 218, "w": 52, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 36, "y": 20, "w": 52, "h": 69 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0137.png",
+    "frame": { "x": 2, "y": 137, "w": 56, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 35, "y": 19, "w": 56, "h": 71 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0138.png",
+    "frame": { "x": 2, "y": 65, "w": 59, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 33, "y": 19, "w": 59, "h": 72 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0139.png",
+    "frame": { "x": 600, "y": 71, "w": 58, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 31, "y": 19, "w": 58, "h": 70 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0140.png",
+    "frame": { "x": 577, "y": 291, "w": 46, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 30, "y": 18, "w": 46, "h": 75 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0141.png",
+    "frame": { "x": 303, "y": 363, "w": 42, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 18, "w": 42, "h": 78 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0142.png",
+    "frame": { "x": 400, "y": 364, "w": 43, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 18, "w": 43, "h": 76 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0143.png",
+    "frame": { "x": 524, "y": 285, "w": 53, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 19, "w": 53, "h": 67 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0144.png",
+    "frame": { "x": 266, "y": 213, "w": 60, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 19, "w": 60, "h": 62 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0145.png",
+    "frame": { "x": 674, "y": 219, "w": 58, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 19, "w": 58, "h": 62 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0146.png",
+    "frame": { "x": 150, "y": 288, "w": 56, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 18, "w": 56, "h": 63 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0147.png",
+    "frame": { "x": 250, "y": 351, "w": 53, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 17, "y": 18, "w": 53, "h": 63 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0148.png",
+    "frame": { "x": 674, "y": 149, "w": 54, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 17, "y": 18, "w": 54, "h": 70 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0149.png",
+    "frame": { "x": 214, "y": 145, "w": 52, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 19, "w": 52, "h": 73 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0150.png",
+    "frame": { "x": 48, "y": 290, "w": 48, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 27, "y": 19, "w": 48, "h": 73 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0151.png",
+    "frame": { "x": 161, "y": 217, "w": 51, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 35, "y": 19, "w": 51, "h": 71 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0152.png",
+    "frame": { "x": 343, "y": 66, "w": 61, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 36, "y": 20, "w": 61, "h": 69 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0153.png",
+    "frame": { "x": 279, "y": 64, "w": 64, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 36, "y": 20, "w": 64, "h": 70 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0154.png",
+    "frame": { "x": 667, "y": 2, "w": 64, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 34, "y": 19, "w": 64, "h": 71 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0155.png",
+    "frame": { "x": 101, "y": 223, "w": 49, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 31, "y": 18, "w": 49, "h": 73 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0156.png",
+    "frame": { "x": 89, "y": 363, "w": 42, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 27, "y": 18, "w": 42, "h": 78 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0157.png",
+    "frame": { "x": 671, "y": 281, "w": 53, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 19, "w": 53, "h": 67 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0158.png",
+    "frame": { "x": 274, "y": 441, "w": 62, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 21, "w": 62, "h": 50 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0159.png",
+    "frame": { "x": 275, "y": 491, "w": 62, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 22, "w": 62, "h": 43 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0160.png",
+    "frame": { "x": 674, "y": 505, "w": 59, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 23, "w": 59, "h": 42 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0161.png",
+    "frame": { "x": 612, "y": 498, "w": 62, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 22, "w": 62, "h": 43 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0162.png",
+    "frame": { "x": 213, "y": 491, "w": 62, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 22, "w": 62, "h": 49 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0163.png",
+    "frame": { "x": 372, "y": 287, "w": 58, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 21, "w": 58, "h": 61 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0164.png",
+    "frame": { "x": 96, "y": 296, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 20, "w": 51, "h": 67 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0165.png",
+    "frame": { "x": 84, "y": 441, "w": 45, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 19, "y": 20, "w": 45, "h": 69 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0166.png",
+    "frame": { "x": 728, "y": 149, "w": 42, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 19, "w": 42, "h": 70 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0167.png",
+    "frame": { "x": 690, "y": 434, "w": 44, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 19, "w": 44, "h": 71 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0168.png",
+    "frame": { "x": 669, "y": 348, "w": 46, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 19, "w": 46, "h": 73 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0169.png",
+    "frame": { "x": 259, "y": 275, "w": 47, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 18, "w": 47, "h": 76 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0170.png",
+    "frame": { "x": 212, "y": 218, "w": 47, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 18, "w": 47, "h": 77 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0171.png",
+    "frame": { "x": 578, "y": 213, "w": 47, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 18, "w": 47, "h": 78 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0172.png",
+    "frame": { "x": 724, "y": 281, "w": 45, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 18, "w": 45, "h": 78 },
+    "sourceSize": { "w": 108, "h": 96 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "707.png",
+  "format": "I8",
+  "size": { "w": 772, "h": 549 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/back/shiny/707.png b/public/images/pokemon/back/shiny/707.png
index da84624a35c..8d7e5922091 100644
Binary files a/public/images/pokemon/back/shiny/707.png and b/public/images/pokemon/back/shiny/707.png differ
diff --git a/public/images/pokemon/back/shiny/708.json b/public/images/pokemon/back/shiny/708.json
index 1433d1f3954..22aa1885edb 100644
--- a/public/images/pokemon/back/shiny/708.json
+++ b/public/images/pokemon/back/shiny/708.json
@@ -1,41 +1,1091 @@
-{
-	"textures": [
-		{
-			"image": "708.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 43,
-				"h": 43
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 43,
-						"h": 40
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 43,
-						"h": 40
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 43,
-						"h": 40
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:ab46d1202eb640c4a791f5c8d9bd36ec:04314281a1a95837e11d92d38c448507:796c82c5076b122f2663381836c65843$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 132, "y": 83, "w": 43, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 4, "w": 43, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 132, "y": 42, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 6, "w": 44, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 176, "y": 83, "w": 43, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 7, "w": 43, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 218, "y": 206, "w": 43, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 9, "w": 43, "h": 39 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 262, "y": 206, "w": 43, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 19, "y": 9, "w": 43, "h": 39 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 44, "y": 207, "w": 43, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 8, "w": 43, "h": 39 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 131, "y": 247, "w": 42, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 6, "w": 42, "h": 39 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 0, "y": 208, "w": 43, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 4, "w": 43, "h": 39 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 0, "y": 85, "w": 43, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 1, "w": 43, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 130, "y": 124, "w": 43, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 0, "w": 43, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 86, "y": 84, "w": 43, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 0, "w": 43, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 174, "y": 124, "w": 43, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 0, "w": 43, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 218, "y": 124, "w": 43, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 2, "w": 43, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 88, "y": 0, "w": 43, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 4, "w": 43, "h": 41 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 132, "y": 0, "w": 43, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 6, "w": 43, "h": 41 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 0, "y": 43, "w": 42, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 7, "w": 42, "h": 41 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 43, "y": 43, "w": 42, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 8, "w": 42, "h": 41 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 132, "y": 206, "w": 42, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 9, "w": 42, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 0, "y": 0, "w": 43, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 6, "w": 43, "h": 42 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 44, "y": 0, "w": 43, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 43, "h": 42 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 264, "y": 0, "w": 43, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 43, "h": 41 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 88, "y": 42, "w": 43, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 43, "h": 41 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 176, "y": 0, "w": 43, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 1, "w": 43, "h": 41 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 220, "y": 0, "w": 43, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 0, "w": 43, "h": 41 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 44, "y": 125, "w": 43, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 43, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 132, "y": 83, "w": 43, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 4, "w": 43, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 132, "y": 42, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 6, "w": 44, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 176, "y": 83, "w": 43, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 7, "w": 43, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 218, "y": 206, "w": 43, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 9, "w": 43, "h": 39 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 262, "y": 206, "w": 43, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 19, "y": 9, "w": 43, "h": 39 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 44, "y": 207, "w": 43, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 8, "w": 43, "h": 39 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 131, "y": 247, "w": 42, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 6, "w": 42, "h": 39 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 0, "y": 208, "w": 43, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 4, "w": 43, "h": 39 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 0, "y": 85, "w": 43, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 1, "w": 43, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 130, "y": 124, "w": 43, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 0, "w": 43, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 86, "y": 84, "w": 43, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 0, "w": 43, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 174, "y": 124, "w": 43, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 0, "w": 43, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 218, "y": 124, "w": 43, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 2, "w": 43, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 88, "y": 0, "w": 43, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 4, "w": 43, "h": 41 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 132, "y": 0, "w": 43, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 6, "w": 43, "h": 41 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 0, "y": 43, "w": 42, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 7, "w": 42, "h": 41 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 43, "y": 43, "w": 42, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 8, "w": 42, "h": 41 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 132, "y": 206, "w": 42, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 9, "w": 42, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 0, "y": 0, "w": 43, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 6, "w": 43, "h": 42 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 44, "y": 0, "w": 43, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 43, "h": 42 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 264, "y": 0, "w": 43, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 43, "h": 41 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 88, "y": 42, "w": 43, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 43, "h": 41 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 176, "y": 0, "w": 43, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 1, "w": 43, "h": 41 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 220, "y": 0, "w": 43, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 0, "w": 43, "h": 41 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 44, "y": 125, "w": 43, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 43, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 132, "y": 83, "w": 43, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 4, "w": 43, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 132, "y": 42, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 6, "w": 44, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 176, "y": 83, "w": 43, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 7, "w": 43, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 218, "y": 206, "w": 43, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 9, "w": 43, "h": 39 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 262, "y": 206, "w": 43, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 19, "y": 9, "w": 43, "h": 39 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 44, "y": 207, "w": 43, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 8, "w": 43, "h": 39 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 131, "y": 247, "w": 42, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 6, "w": 42, "h": 39 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 0, "y": 208, "w": 43, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 4, "w": 43, "h": 39 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 0, "y": 85, "w": 43, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 1, "w": 43, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 130, "y": 124, "w": 43, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 0, "w": 43, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 86, "y": 84, "w": 43, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 0, "w": 43, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 174, "y": 124, "w": 43, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 0, "w": 43, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 218, "y": 124, "w": 43, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 2, "w": 43, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 88, "y": 0, "w": 43, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 4, "w": 43, "h": 41 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 132, "y": 0, "w": 43, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 6, "w": 43, "h": 41 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 0, "y": 43, "w": 42, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 7, "w": 42, "h": 41 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 43, "y": 43, "w": 42, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 8, "w": 42, "h": 41 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 132, "y": 206, "w": 42, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 9, "w": 42, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 0, "y": 0, "w": 43, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 6, "w": 43, "h": 42 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 44, "y": 0, "w": 43, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 43, "h": 42 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 264, "y": 0, "w": 43, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 43, "h": 41 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 88, "y": 42, "w": 43, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 43, "h": 41 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 176, "y": 0, "w": 43, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 1, "w": 43, "h": 41 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 220, "y": 0, "w": 43, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 0, "w": 43, "h": 41 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 44, "y": 125, "w": 43, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 43, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 132, "y": 83, "w": 43, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 4, "w": 43, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 132, "y": 42, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 6, "w": 44, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 176, "y": 83, "w": 43, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 7, "w": 43, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 218, "y": 206, "w": 43, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 9, "w": 43, "h": 39 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 262, "y": 206, "w": 43, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 19, "y": 9, "w": 43, "h": 39 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 44, "y": 207, "w": 43, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 8, "w": 43, "h": 39 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 131, "y": 247, "w": 42, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 6, "w": 42, "h": 39 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 0, "y": 208, "w": 43, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 4, "w": 43, "h": 39 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 0, "y": 85, "w": 43, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 1, "w": 43, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 130, "y": 124, "w": 43, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 0, "w": 43, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 86, "y": 84, "w": 43, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 0, "w": 43, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 174, "y": 124, "w": 43, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 0, "w": 43, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0088.png",
+    "frame": { "x": 218, "y": 124, "w": 43, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 2, "w": 43, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0089.png",
+    "frame": { "x": 88, "y": 0, "w": 43, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 4, "w": 43, "h": 41 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0090.png",
+    "frame": { "x": 132, "y": 0, "w": 43, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 6, "w": 43, "h": 41 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0091.png",
+    "frame": { "x": 0, "y": 43, "w": 42, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 7, "w": 42, "h": 41 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0092.png",
+    "frame": { "x": 43, "y": 43, "w": 42, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 8, "w": 42, "h": 41 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0093.png",
+    "frame": { "x": 132, "y": 206, "w": 42, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 9, "w": 42, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0094.png",
+    "frame": { "x": 0, "y": 0, "w": 43, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 6, "w": 43, "h": 42 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0095.png",
+    "frame": { "x": 44, "y": 0, "w": 43, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 43, "h": 42 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0096.png",
+    "frame": { "x": 264, "y": 0, "w": 43, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 43, "h": 41 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0097.png",
+    "frame": { "x": 88, "y": 42, "w": 43, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 43, "h": 41 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0098.png",
+    "frame": { "x": 176, "y": 0, "w": 43, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 1, "w": 43, "h": 41 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0099.png",
+    "frame": { "x": 220, "y": 0, "w": 43, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 0, "w": 43, "h": 41 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0100.png",
+    "frame": { "x": 44, "y": 125, "w": 43, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 43, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0101.png",
+    "frame": { "x": 132, "y": 83, "w": 43, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 4, "w": 43, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0102.png",
+    "frame": { "x": 0, "y": 126, "w": 43, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 6, "w": 43, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0103.png",
+    "frame": { "x": 88, "y": 165, "w": 43, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 8, "w": 43, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0104.png",
+    "frame": { "x": 175, "y": 206, "w": 42, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 10, "w": 42, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0105.png",
+    "frame": { "x": 88, "y": 247, "w": 42, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 16, "y": 13, "w": 42, "h": 39 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0106.png",
+    "frame": { "x": 132, "y": 165, "w": 43, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 16, "y": 14, "w": 43, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0107.png",
+    "frame": { "x": 176, "y": 165, "w": 43, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 15, "w": 43, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0108.png",
+    "frame": { "x": 220, "y": 165, "w": 43, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 17, "w": 43, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0109.png",
+    "frame": { "x": 264, "y": 165, "w": 43, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 19, "w": 43, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0110.png",
+    "frame": { "x": 262, "y": 124, "w": 43, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 21, "w": 43, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0111.png",
+    "frame": { "x": 44, "y": 166, "w": 43, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 23, "w": 43, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0112.png",
+    "frame": { "x": 0, "y": 167, "w": 43, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 21, "w": 43, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0113.png",
+    "frame": { "x": 88, "y": 206, "w": 43, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 20, "w": 43, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0114.png",
+    "frame": { "x": 220, "y": 83, "w": 43, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 18, "w": 43, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0115.png",
+    "frame": { "x": 44, "y": 247, "w": 43, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 16, "w": 43, "h": 39 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0116.png",
+    "frame": { "x": 218, "y": 246, "w": 43, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 15, "w": 43, "h": 39 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0117.png",
+    "frame": { "x": 262, "y": 246, "w": 43, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 13, "w": 43, "h": 39 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0118.png",
+    "frame": { "x": 177, "y": 42, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 10, "w": 44, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0119.png",
+    "frame": { "x": 264, "y": 83, "w": 43, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 8, "w": 43, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0120.png",
+    "frame": { "x": 222, "y": 42, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 6, "w": 44, "h": 40 },
+    "sourceSize": { "w": 67, "h": 63 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "708.png",
+  "format": "I8",
+  "size": { "w": 307, "h": 286 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/back/shiny/708.png b/public/images/pokemon/back/shiny/708.png
index 51462cccc15..8a9ff2cb9ee 100644
Binary files a/public/images/pokemon/back/shiny/708.png and b/public/images/pokemon/back/shiny/708.png differ
diff --git a/public/images/pokemon/back/shiny/714.json b/public/images/pokemon/back/shiny/714.json
index 135bc02dbd5..abcb8902edd 100644
--- a/public/images/pokemon/back/shiny/714.json
+++ b/public/images/pokemon/back/shiny/714.json
@@ -1,41 +1,263 @@
-{
-	"textures": [
-		{
-			"image": "714.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 63,
-				"h": 63
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 63,
-						"h": 57
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 63,
-						"h": 57
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 63,
-						"h": 57
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:11292bc220f23110a419628bee722abd:b42c1c416a6792bd1666ba41005a2f4d:1a07d46e710b0568ec824f54fbc4fe6a$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 1, "y": 61, "w": 63, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 63, "h": 57 },
+    "sourceSize": { "w": 68, "h": 68 },
+    "duration": 50
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 66, "y": 61, "w": 63, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 6, "w": 63, "h": 57 },
+    "sourceSize": { "w": 68, "h": 68 },
+    "duration": 50
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 198, "y": 1, "w": 64, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 8, "w": 64, "h": 57 },
+    "sourceSize": { "w": 68, "h": 68 },
+    "duration": 50
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 124, "y": 120, "w": 34, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 19, "y": 3, "w": 34, "h": 65 },
+    "sourceSize": { "w": 68, "h": 68 },
+    "duration": 50
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 1, "y": 178, "w": 34, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 3, "w": 34, "h": 60 },
+    "sourceSize": { "w": 68, "h": 68 },
+    "duration": 50
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 264, "y": 61, "w": 47, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 1, "w": 47, "h": 57 },
+    "sourceSize": { "w": 68, "h": 68 },
+    "duration": 50
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 196, "y": 119, "w": 47, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 0, "w": 47, "h": 57 },
+    "sourceSize": { "w": 68, "h": 68 },
+    "duration": 50
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 1, "y": 61, "w": 63, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 63, "h": 57 },
+    "sourceSize": { "w": 68, "h": 68 },
+    "duration": 50
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 131, "y": 61, "w": 63, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 6, "w": 63, "h": 57 },
+    "sourceSize": { "w": 68, "h": 68 },
+    "duration": 50
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 198, "y": 60, "w": 64, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 8, "w": 64, "h": 57 },
+    "sourceSize": { "w": 68, "h": 68 },
+    "duration": 50
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 160, "y": 120, "w": 34, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 3, "w": 34, "h": 65 },
+    "sourceSize": { "w": 68, "h": 68 },
+    "duration": 50
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 196, "y": 178, "w": 34, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 3, "w": 34, "h": 60 },
+    "sourceSize": { "w": 68, "h": 68 },
+    "duration": 50
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 1, "y": 120, "w": 47, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 1, "w": 47, "h": 56 },
+    "sourceSize": { "w": 68, "h": 68 },
+    "duration": 50
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 196, "y": 119, "w": 47, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 0, "w": 47, "h": 57 },
+    "sourceSize": { "w": 68, "h": 68 },
+    "duration": 50
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 1, "y": 61, "w": 63, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 63, "h": 57 },
+    "sourceSize": { "w": 68, "h": 68 },
+    "duration": 50
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 66, "y": 61, "w": 63, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 6, "w": 63, "h": 57 },
+    "sourceSize": { "w": 68, "h": 68 },
+    "duration": 50
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 1, "y": 1, "w": 64, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 7, "w": 64, "h": 58 },
+    "sourceSize": { "w": 68, "h": 68 },
+    "duration": 50
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 50, "y": 120, "w": 35, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 2, "w": 35, "h": 66 },
+    "sourceSize": { "w": 68, "h": 68 },
+    "duration": 50
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 245, "y": 120, "w": 35, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 17, "y": 2, "w": 35, "h": 61 },
+    "sourceSize": { "w": 68, "h": 68 },
+    "duration": 50
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 264, "y": 1, "w": 47, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 0, "w": 47, "h": 58 },
+    "sourceSize": { "w": 68, "h": 68 },
+    "duration": 50
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 196, "y": 119, "w": 47, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 0, "w": 47, "h": 57 },
+    "sourceSize": { "w": 68, "h": 68 },
+    "duration": 50
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 1, "y": 61, "w": 63, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 63, "h": 57 },
+    "sourceSize": { "w": 68, "h": 68 },
+    "duration": 50
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 133, "y": 1, "w": 63, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 63, "h": 58 },
+    "sourceSize": { "w": 68, "h": 68 },
+    "duration": 50
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 67, "y": 1, "w": 64, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 64, "h": 58 },
+    "sourceSize": { "w": 68, "h": 68 },
+    "duration": 50
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 87, "y": 120, "w": 35, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 2, "w": 35, "h": 66 },
+    "sourceSize": { "w": 68, "h": 68 },
+    "duration": 50
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 282, "y": 120, "w": 34, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 2, "w": 34, "h": 61 },
+    "sourceSize": { "w": 68, "h": 68 },
+    "duration": 50
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 1, "y": 120, "w": 47, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 1, "w": 47, "h": 56 },
+    "sourceSize": { "w": 68, "h": 68 },
+    "duration": 50
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 196, "y": 119, "w": 47, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 0, "w": 47, "h": 57 },
+    "sourceSize": { "w": 68, "h": 68 },
+    "duration": 50
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "714.png",
+  "format": "I8",
+  "size": { "w": 317, "h": 239 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/back/shiny/714.png b/public/images/pokemon/back/shiny/714.png
index 65433cec665..e1e5d5dbec7 100644
Binary files a/public/images/pokemon/back/shiny/714.png and b/public/images/pokemon/back/shiny/714.png differ
diff --git a/public/images/pokemon/back/shiny/718-10.json b/public/images/pokemon/back/shiny/718-10.json
index 032783b5555..75053d61900 100644
--- a/public/images/pokemon/back/shiny/718-10.json
+++ b/public/images/pokemon/back/shiny/718-10.json
@@ -1,41 +1,686 @@
-{
-	"textures": [
-		{
-			"image": "718-10.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 65,
-				"h": 65
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 59,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 59,
-						"h": 65
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 59,
-						"h": 65
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:c99dd53bf67561425f9faac1002806d0:277725239a09766c1d58b4a0f8c45775:82195cf2a6db620c5643b8162d6e8c5c$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 120, "y": 63, "w": 59, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 59, "h": 65 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 179, "y": 63, "w": 59, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 59, "h": 65 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 0, "y": 0, "w": 60, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 60, "h": 65 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 293, "y": 128, "w": 60, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 60, "h": 63 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 0, "y": 131, "w": 60, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 60, "h": 63 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 120, "y": 0, "w": 61, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 61, "h": 63 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 181, "y": 0, "w": 61, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 61, "h": 63 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 242, "y": 0, "w": 61, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 61, "h": 63 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 303, "y": 0, "w": 61, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 61, "h": 63 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 232, "y": 190, "w": 60, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 60, "h": 63 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 292, "y": 191, "w": 60, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 60, "h": 63 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 60, "y": 0, "w": 60, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 60, "h": 65 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 238, "y": 63, "w": 59, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 59, "h": 65 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 297, "y": 63, "w": 59, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 59, "h": 65 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 120, "y": 63, "w": 59, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 59, "h": 65 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 179, "y": 63, "w": 59, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 59, "h": 65 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 0, "y": 0, "w": 60, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 60, "h": 65 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 293, "y": 128, "w": 60, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 60, "h": 63 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 0, "y": 131, "w": 60, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 60, "h": 63 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 120, "y": 0, "w": 61, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 61, "h": 63 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 181, "y": 0, "w": 61, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 61, "h": 63 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 242, "y": 0, "w": 61, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 61, "h": 63 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 303, "y": 0, "w": 61, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 61, "h": 63 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 232, "y": 190, "w": 60, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 60, "h": 63 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 292, "y": 191, "w": 60, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 60, "h": 63 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 60, "y": 0, "w": 60, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 60, "h": 65 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 238, "y": 63, "w": 59, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 59, "h": 65 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 297, "y": 63, "w": 59, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 59, "h": 65 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 120, "y": 63, "w": 59, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 59, "h": 65 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 179, "y": 63, "w": 59, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 59, "h": 65 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 0, "y": 0, "w": 60, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 60, "h": 65 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 293, "y": 128, "w": 60, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 60, "h": 63 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 0, "y": 131, "w": 60, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 60, "h": 63 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 120, "y": 0, "w": 61, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 61, "h": 63 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 181, "y": 0, "w": 61, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 61, "h": 63 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 242, "y": 0, "w": 61, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 61, "h": 63 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 303, "y": 0, "w": 61, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 61, "h": 63 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 232, "y": 190, "w": 60, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 60, "h": 63 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 292, "y": 191, "w": 60, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 60, "h": 63 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 60, "y": 0, "w": 60, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 60, "h": 65 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 238, "y": 63, "w": 59, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 59, "h": 65 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 297, "y": 63, "w": 59, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 59, "h": 65 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 120, "y": 63, "w": 59, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 59, "h": 65 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 179, "y": 63, "w": 59, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 59, "h": 65 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 0, "y": 0, "w": 60, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 60, "h": 65 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 293, "y": 128, "w": 60, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 60, "h": 63 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 0, "y": 131, "w": 60, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 60, "h": 63 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 120, "y": 0, "w": 61, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 61, "h": 63 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 181, "y": 0, "w": 61, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 61, "h": 63 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 242, "y": 0, "w": 61, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 61, "h": 63 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 303, "y": 0, "w": 61, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 61, "h": 63 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 232, "y": 190, "w": 60, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 60, "h": 63 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 292, "y": 191, "w": 60, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 60, "h": 63 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 60, "y": 0, "w": 60, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 60, "h": 65 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 238, "y": 63, "w": 59, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 59, "h": 65 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 297, "y": 63, "w": 59, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 59, "h": 65 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 120, "y": 63, "w": 59, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 59, "h": 65 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 0, "y": 194, "w": 59, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 59, "h": 64 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 59, "y": 194, "w": 59, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 59, "h": 64 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 56, "y": 319, "w": 59, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 59, "h": 63 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 117, "y": 259, "w": 60, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 60, "h": 62 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 177, "y": 320, "w": 60, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 60, "h": 61 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 232, "y": 128, "w": 61, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 61, "h": 62 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 56, "y": 258, "w": 61, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 61, "h": 61 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 118, "y": 195, "w": 59, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 59, "h": 64 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 115, "y": 321, "w": 55, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 55, "h": 66 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 237, "y": 321, "w": 55, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 55, "h": 66 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 234, "y": 253, "w": 56, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 56, "h": 67 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 290, "y": 254, "w": 56, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 56, "h": 67 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 0, "y": 258, "w": 56, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 56, "h": 67 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 175, "y": 128, "w": 57, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 57, "h": 67 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 177, "y": 253, "w": 57, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 57, "h": 66 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 59, "y": 65, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 58, "h": 66 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 117, "y": 128, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 58, "h": 66 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 0, "y": 65, "w": 59, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 59, "h": 65 },
+    "sourceSize": { "w": 64, "h": 67 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "718-10.png",
+  "format": "I8",
+  "size": { "w": 364, "h": 387 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/back/shiny/718-10.png b/public/images/pokemon/back/shiny/718-10.png
index 0479543fc7a..7998912c001 100644
Binary files a/public/images/pokemon/back/shiny/718-10.png and b/public/images/pokemon/back/shiny/718-10.png differ
diff --git a/public/images/pokemon/back/shiny/718.json b/public/images/pokemon/back/shiny/718.json
index 4badc82d015..1a835e26b08 100644
--- a/public/images/pokemon/back/shiny/718.json
+++ b/public/images/pokemon/back/shiny/718.json
@@ -1,41 +1,803 @@
-{
-	"textures": [
-		{
-			"image": "718.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 88,
-				"h": 88
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 72,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 72,
-						"h": 88
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 72,
-						"h": 88
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:f2bba9e481cf6dfcc460f398fd1af964:386098c871ad5fe384af5f85559e7551:7b4a06b06cbac24b3f39727b0238661b$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 224, "y": 443, "w": 72, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 2, "w": 72, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 148, "y": 445, "w": 71, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 71, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 445, "y": 445, "w": 70, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 70, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 72, "y": 446, "w": 70, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 70, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 373, "y": 360, "w": 72, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 72, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 226, "y": 355, "w": 74, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 74, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 0, "y": 184, "w": 75, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 75, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 150, "y": 269, "w": 76, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 76, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 304, "y": 269, "w": 76, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 2, "w": 76, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 459, "y": 269, "w": 76, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 2, "w": 76, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 308, "y": 180, "w": 76, "h": 89 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 76, "h": 89 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 462, "y": 180, "w": 76, "h": 89 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 76, "h": 89 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 386, "y": 91, "w": 76, "h": 90 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 2, "w": 76, "h": 90 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 75, "y": 270, "w": 75, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 2, "w": 75, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 150, "y": 357, "w": 74, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 2, "w": 74, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 75, "y": 358, "w": 73, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 2, "w": 73, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 224, "y": 443, "w": 72, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 2, "w": 72, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 148, "y": 445, "w": 71, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 71, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 445, "y": 445, "w": 70, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 70, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 72, "y": 446, "w": 70, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 70, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 373, "y": 360, "w": 72, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 72, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 226, "y": 355, "w": 74, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 74, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 0, "y": 184, "w": 75, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 75, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 150, "y": 269, "w": 76, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 76, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 304, "y": 269, "w": 76, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 2, "w": 76, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 459, "y": 269, "w": 76, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 2, "w": 76, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 308, "y": 180, "w": 76, "h": 89 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 76, "h": 89 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 462, "y": 180, "w": 76, "h": 89 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 76, "h": 89 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 386, "y": 91, "w": 76, "h": 90 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 2, "w": 76, "h": 90 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 75, "y": 270, "w": 75, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 2, "w": 75, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 150, "y": 357, "w": 74, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 2, "w": 74, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 75, "y": 358, "w": 73, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 2, "w": 73, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 224, "y": 443, "w": 72, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 2, "w": 72, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 148, "y": 445, "w": 71, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 71, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 445, "y": 445, "w": 70, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 70, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 72, "y": 446, "w": 70, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 70, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 373, "y": 360, "w": 72, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 72, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 226, "y": 355, "w": 74, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 74, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 0, "y": 184, "w": 75, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 75, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 150, "y": 269, "w": 76, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 76, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 304, "y": 269, "w": 76, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 2, "w": 76, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 459, "y": 269, "w": 76, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 2, "w": 76, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 308, "y": 180, "w": 76, "h": 89 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 76, "h": 89 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 462, "y": 180, "w": 76, "h": 89 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 76, "h": 89 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 386, "y": 91, "w": 76, "h": 90 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 2, "w": 76, "h": 90 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 75, "y": 270, "w": 75, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 2, "w": 75, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 150, "y": 357, "w": 74, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 2, "w": 74, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 75, "y": 358, "w": 73, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 2, "w": 73, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 224, "y": 443, "w": 72, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 2, "w": 72, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 148, "y": 445, "w": 71, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 71, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 445, "y": 445, "w": 70, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 70, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 72, "y": 446, "w": 70, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 70, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 373, "y": 360, "w": 72, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 72, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 226, "y": 355, "w": 74, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 74, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 0, "y": 184, "w": 75, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 75, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 150, "y": 269, "w": 76, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 76, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 304, "y": 269, "w": 76, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 2, "w": 76, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 459, "y": 269, "w": 76, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 2, "w": 76, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 308, "y": 180, "w": 76, "h": 89 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 76, "h": 89 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 462, "y": 180, "w": 76, "h": 89 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 76, "h": 89 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 386, "y": 91, "w": 76, "h": 90 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 2, "w": 76, "h": 90 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 75, "y": 270, "w": 75, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 2, "w": 75, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 150, "y": 357, "w": 74, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 2, "w": 74, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 75, "y": 358, "w": 73, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 2, "w": 73, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 224, "y": 443, "w": 72, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 2, "w": 72, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 0, "y": 359, "w": 72, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 2, "w": 72, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 300, "y": 357, "w": 73, "h": 89 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 2, "w": 73, "h": 89 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 380, "y": 271, "w": 74, "h": 89 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 74, "h": 89 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 384, "y": 181, "w": 75, "h": 90 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 2, "w": 75, "h": 90 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 155, "y": 92, "w": 76, "h": 90 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 2, "w": 76, "h": 90 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 309, "y": 91, "w": 77, "h": 89 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 77, "h": 89 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 227, "y": 268, "w": 77, "h": 87 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 77, "h": 87 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 150, "y": 182, "w": 77, "h": 87 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 77, "h": 87 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 0, "y": 272, "w": 75, "h": 87 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 3, "w": 75, "h": 87 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 310, "y": 0, "w": 77, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 77, "h": 91 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 387, "y": 0, "w": 77, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 77, "h": 91 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 155, "y": 0, "w": 77, "h": 92 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 77, "h": 92 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 77, "y": 0, "w": 78, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 78, "h": 91 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 0, "y": 0, "w": 77, "h": 93 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 77, "h": 93 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 231, "y": 180, "w": 77, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 77, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 232, "y": 0, "w": 78, "h": 90 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 78, "h": 90 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 77, "y": 91, "w": 78, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 78, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 464, "y": 0, "w": 77, "h": 90 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 77, "h": 90 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 232, "y": 90, "w": 77, "h": 90 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 77, "h": 90 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 464, "y": 90, "w": 77, "h": 90 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 77, "h": 90 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 0, "y": 93, "w": 75, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 75, "h": 91 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 75, "y": 179, "w": 75, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 75, "h": 91 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   },
+   {
+    "filename": "0088.png",
+    "frame": { "x": 454, "y": 357, "w": 73, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 2, "w": 73, "h": 88 },
+    "sourceSize": { "w": 87, "h": 93 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "718.png",
+  "format": "I8",
+  "size": { "w": 541, "h": 534 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/back/shiny/718.png b/public/images/pokemon/back/shiny/718.png
index 4492fbd3b22..bb8d4179347 100644
Binary files a/public/images/pokemon/back/shiny/718.png and b/public/images/pokemon/back/shiny/718.png differ
diff --git a/public/images/pokemon/back/shiny/719.json b/public/images/pokemon/back/shiny/719.json
index 8cb7bee25c3..f7fa0ccb512 100644
--- a/public/images/pokemon/back/shiny/719.json
+++ b/public/images/pokemon/back/shiny/719.json
@@ -1,41 +1,875 @@
-{
-	"textures": [
-		{
-			"image": "719.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 65,
-				"h": 65
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 38,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 38,
-						"h": 65
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 38,
-						"h": 65
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:0340084a126284b9d4aa16b7bbdc9616:f699a390d9b5db64f5f03e684cf77f66:17a705bb924916761be2495822a53735$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 0, "y": 0, "w": 42, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 10, "w": 42, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 42, "y": 0, "w": 42, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 42, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 84, "y": 0, "w": 42, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 7, "w": 42, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 126, "y": 0, "w": 42, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 6, "w": 42, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 168, "y": 0, "w": 42, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 5, "w": 42, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 0, "y": 140, "w": 40, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 3, "w": 40, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 80, "y": 210, "w": 39, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 39, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 119, "y": 210, "w": 39, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 3, "w": 39, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 40, "y": 140, "w": 40, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 5, "w": 40, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 80, "y": 140, "w": 40, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 6, "w": 40, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 125, "y": 70, "w": 41, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 7, "w": 41, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 210, "y": 0, "w": 42, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 42, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 0, "y": 0, "w": 42, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 10, "w": 42, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 42, "y": 0, "w": 42, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 42, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 84, "y": 0, "w": 42, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 7, "w": 42, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 126, "y": 0, "w": 42, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 6, "w": 42, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 168, "y": 0, "w": 42, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 5, "w": 42, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 0, "y": 140, "w": 40, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 3, "w": 40, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 80, "y": 210, "w": 39, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 39, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 119, "y": 210, "w": 39, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 3, "w": 39, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 40, "y": 140, "w": 40, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 5, "w": 40, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 80, "y": 140, "w": 40, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 6, "w": 40, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 125, "y": 70, "w": 41, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 7, "w": 41, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 210, "y": 0, "w": 42, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 42, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 0, "y": 0, "w": 42, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 10, "w": 42, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 42, "y": 0, "w": 42, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 42, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 84, "y": 0, "w": 42, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 7, "w": 42, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 126, "y": 0, "w": 42, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 6, "w": 42, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 168, "y": 0, "w": 42, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 5, "w": 42, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 0, "y": 140, "w": 40, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 3, "w": 40, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 80, "y": 210, "w": 39, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 39, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 119, "y": 210, "w": 39, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 3, "w": 39, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 40, "y": 140, "w": 40, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 5, "w": 40, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 80, "y": 140, "w": 40, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 6, "w": 40, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 125, "y": 70, "w": 41, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 7, "w": 41, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 210, "y": 0, "w": 42, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 42, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 0, "y": 0, "w": 42, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 10, "w": 42, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 42, "y": 0, "w": 42, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 42, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 84, "y": 0, "w": 42, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 7, "w": 42, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 126, "y": 0, "w": 42, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 6, "w": 42, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 168, "y": 0, "w": 42, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 5, "w": 42, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 0, "y": 140, "w": 40, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 3, "w": 40, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 80, "y": 210, "w": 39, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 39, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 119, "y": 210, "w": 39, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 3, "w": 39, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 40, "y": 140, "w": 40, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 5, "w": 40, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 80, "y": 140, "w": 40, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 6, "w": 40, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 125, "y": 70, "w": 41, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 7, "w": 41, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 210, "y": 0, "w": 42, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 42, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 0, "y": 0, "w": 42, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 10, "w": 42, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 0, "y": 70, "w": 42, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 8, "w": 42, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 120, "y": 140, "w": 40, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 7, "w": 40, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 160, "y": 140, "w": 40, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 16, "y": 5, "w": 40, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 158, "y": 210, "w": 39, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 19, "y": 3, "w": 39, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 0, "y": 280, "w": 39, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 2, "w": 39, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 112, "y": 350, "w": 37, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 0, "w": 37, "h": 69 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 38, "y": 350, "w": 37, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 1, "w": 37, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 156, "y": 280, "w": 38, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 3, "w": 38, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 197, "y": 210, "w": 39, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 17, "y": 5, "w": 39, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 200, "y": 140, "w": 40, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 7, "w": 40, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 207, "y": 70, "w": 41, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 9, "w": 41, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 0, "y": 0, "w": 42, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 10, "w": 42, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 42, "y": 70, "w": 42, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 8, "w": 42, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 84, "y": 70, "w": 41, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 7, "w": 41, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 0, "y": 210, "w": 40, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 40, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 39, "y": 280, "w": 39, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 39, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 78, "y": 280, "w": 39, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 39, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 0, "y": 350, "w": 38, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 38, "h": 69 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 75, "y": 350, "w": 37, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 37, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 194, "y": 280, "w": 38, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 38, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 117, "y": 280, "w": 39, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 39, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 40, "y": 210, "w": 40, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 8, "w": 40, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 166, "y": 70, "w": 41, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 9, "w": 41, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 0, "y": 0, "w": 42, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 10, "w": 42, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 0, "y": 70, "w": 42, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 8, "w": 42, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 120, "y": 140, "w": 40, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 7, "w": 40, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 160, "y": 140, "w": 40, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 16, "y": 5, "w": 40, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 158, "y": 210, "w": 39, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 19, "y": 3, "w": 39, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 0, "y": 280, "w": 39, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 2, "w": 39, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 112, "y": 350, "w": 37, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 0, "w": 37, "h": 69 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 38, "y": 350, "w": 37, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 1, "w": 37, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 156, "y": 280, "w": 38, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 3, "w": 38, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 197, "y": 210, "w": 39, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 17, "y": 5, "w": 39, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 200, "y": 140, "w": 40, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 7, "w": 40, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 207, "y": 70, "w": 41, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 9, "w": 41, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 0, "y": 0, "w": 42, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 10, "w": 42, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 42, "y": 70, "w": 42, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 8, "w": 42, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 84, "y": 70, "w": 41, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 7, "w": 41, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0088.png",
+    "frame": { "x": 0, "y": 210, "w": 40, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 40, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0089.png",
+    "frame": { "x": 39, "y": 280, "w": 39, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 39, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0090.png",
+    "frame": { "x": 78, "y": 280, "w": 39, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 39, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0091.png",
+    "frame": { "x": 0, "y": 350, "w": 38, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 38, "h": 69 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0092.png",
+    "frame": { "x": 75, "y": 350, "w": 37, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 37, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0093.png",
+    "frame": { "x": 194, "y": 280, "w": 38, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 38, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0094.png",
+    "frame": { "x": 117, "y": 280, "w": 39, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 39, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0095.png",
+    "frame": { "x": 40, "y": 210, "w": 40, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 8, "w": 40, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0096.png",
+    "frame": { "x": 166, "y": 70, "w": 41, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 9, "w": 41, "h": 70 },
+    "sourceSize": { "w": 61, "h": 80 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "719.png",
+  "format": "I8",
+  "size": { "w": 252, "h": 420 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/back/shiny/719.png b/public/images/pokemon/back/shiny/719.png
index a0b34f5bcca..6e76d35bc93 100644
Binary files a/public/images/pokemon/back/shiny/719.png and b/public/images/pokemon/back/shiny/719.png differ
diff --git a/public/images/pokemon/back/shiny/730.png b/public/images/pokemon/back/shiny/730.png
index 1a988baaa92..7a6c4d4fc73 100644
Binary files a/public/images/pokemon/back/shiny/730.png and b/public/images/pokemon/back/shiny/730.png differ
diff --git a/public/images/pokemon/back/shiny/782.json b/public/images/pokemon/back/shiny/782.json
index 326e8fa09de..ed58485e3bd 100644
--- a/public/images/pokemon/back/shiny/782.json
+++ b/public/images/pokemon/back/shiny/782.json
@@ -1,41 +1,1010 @@
-{
-	"textures": [
-		{
-			"image": "782.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 50,
-				"h": 50
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 46,
-						"h": 50
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 46,
-						"h": 50
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 46,
-						"h": 50
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:ab84568c98e2c8417dfbab0b26bf5b7a:bf5226700592a08e6818638b6aca1b1a:d07862436676aa228a148ee1f1d82a8f$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 47, "y": 105, "w": 46, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 24, "w": 46, "h": 50 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 47, "y": 105, "w": 46, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 24, "w": 46, "h": 50 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 93, "y": 105, "w": 46, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 24, "w": 46, "h": 50 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 93, "y": 105, "w": 46, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 24, "w": 46, "h": 50 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 139, "y": 105, "w": 46, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 24, "w": 46, "h": 50 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 139, "y": 105, "w": 46, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 24, "w": 46, "h": 50 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 183, "y": 155, "w": 45, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 25, "w": 45, "h": 49 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 183, "y": 155, "w": 45, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 25, "w": 45, "h": 49 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 137, "y": 155, "w": 46, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 26, "w": 46, "h": 48 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 137, "y": 155, "w": 46, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 26, "w": 46, "h": 48 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 1, "y": 157, "w": 45, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 25, "w": 45, "h": 49 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 1, "y": 157, "w": 45, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 25, "w": 45, "h": 49 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 47, "y": 155, "w": 45, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 24, "w": 45, "h": 50 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 47, "y": 155, "w": 45, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 24, "w": 45, "h": 50 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 92, "y": 155, "w": 45, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 24, "w": 45, "h": 50 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 92, "y": 155, "w": 45, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 24, "w": 45, "h": 50 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 47, "y": 105, "w": 46, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 24, "w": 46, "h": 50 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 47, "y": 105, "w": 46, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 24, "w": 46, "h": 50 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 93, "y": 105, "w": 46, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 24, "w": 46, "h": 50 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 93, "y": 105, "w": 46, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 24, "w": 46, "h": 50 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 139, "y": 105, "w": 46, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 24, "w": 46, "h": 50 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 139, "y": 105, "w": 46, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 24, "w": 46, "h": 50 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 183, "y": 155, "w": 45, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 25, "w": 45, "h": 49 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 183, "y": 155, "w": 45, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 25, "w": 45, "h": 49 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 137, "y": 155, "w": 46, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 26, "w": 46, "h": 48 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 137, "y": 155, "w": 46, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 26, "w": 46, "h": 48 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 1, "y": 157, "w": 45, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 25, "w": 45, "h": 49 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 1, "y": 157, "w": 45, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 25, "w": 45, "h": 49 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 47, "y": 155, "w": 45, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 24, "w": 45, "h": 50 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 47, "y": 155, "w": 45, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 24, "w": 45, "h": 50 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 92, "y": 155, "w": 45, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 24, "w": 45, "h": 50 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 92, "y": 155, "w": 45, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 24, "w": 45, "h": 50 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 47, "y": 105, "w": 46, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 24, "w": 46, "h": 50 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 47, "y": 105, "w": 46, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 24, "w": 46, "h": 50 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 93, "y": 105, "w": 46, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 24, "w": 46, "h": 50 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 93, "y": 105, "w": 46, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 24, "w": 46, "h": 50 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 139, "y": 105, "w": 46, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 24, "w": 46, "h": 50 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 139, "y": 105, "w": 46, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 24, "w": 46, "h": 50 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 183, "y": 155, "w": 45, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 25, "w": 45, "h": 49 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 183, "y": 155, "w": 45, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 25, "w": 45, "h": 49 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 137, "y": 155, "w": 46, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 26, "w": 46, "h": 48 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 137, "y": 155, "w": 46, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 26, "w": 46, "h": 48 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 1, "y": 157, "w": 45, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 25, "w": 45, "h": 49 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 1, "y": 157, "w": 45, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 25, "w": 45, "h": 49 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 47, "y": 155, "w": 45, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 24, "w": 45, "h": 50 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 47, "y": 155, "w": 45, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 24, "w": 45, "h": 50 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 92, "y": 155, "w": 45, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 24, "w": 45, "h": 50 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 92, "y": 155, "w": 45, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 24, "w": 45, "h": 50 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 47, "y": 105, "w": 46, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 24, "w": 46, "h": 50 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 47, "y": 105, "w": 46, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 24, "w": 46, "h": 50 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 93, "y": 105, "w": 46, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 24, "w": 46, "h": 50 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 93, "y": 105, "w": 46, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 24, "w": 46, "h": 50 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 139, "y": 105, "w": 46, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 24, "w": 46, "h": 50 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 139, "y": 105, "w": 46, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 24, "w": 46, "h": 50 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 183, "y": 155, "w": 45, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 25, "w": 45, "h": 49 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 183, "y": 155, "w": 45, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 25, "w": 45, "h": 49 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 137, "y": 155, "w": 46, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 26, "w": 46, "h": 48 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 137, "y": 155, "w": 46, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 26, "w": 46, "h": 48 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 1, "y": 157, "w": 45, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 25, "w": 45, "h": 49 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 1, "y": 157, "w": 45, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 25, "w": 45, "h": 49 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 47, "y": 155, "w": 45, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 24, "w": 45, "h": 50 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 47, "y": 155, "w": 45, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 24, "w": 45, "h": 50 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 92, "y": 155, "w": 45, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 24, "w": 45, "h": 50 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 92, "y": 155, "w": 45, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 24, "w": 45, "h": 50 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 47, "y": 105, "w": 46, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 24, "w": 46, "h": 50 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 47, "y": 105, "w": 46, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 24, "w": 46, "h": 50 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 93, "y": 105, "w": 46, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 24, "w": 46, "h": 50 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 93, "y": 105, "w": 46, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 24, "w": 46, "h": 50 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 139, "y": 105, "w": 46, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 24, "w": 46, "h": 50 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 139, "y": 105, "w": 46, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 24, "w": 46, "h": 50 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 183, "y": 155, "w": 45, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 25, "w": 45, "h": 49 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 183, "y": 155, "w": 45, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 25, "w": 45, "h": 49 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 137, "y": 155, "w": 46, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 26, "w": 46, "h": 48 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 137, "y": 155, "w": 46, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 26, "w": 46, "h": 48 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 1, "y": 157, "w": 45, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 25, "w": 45, "h": 49 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 1, "y": 157, "w": 45, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 25, "w": 45, "h": 49 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 47, "y": 155, "w": 45, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 24, "w": 45, "h": 50 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 47, "y": 155, "w": 45, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 24, "w": 45, "h": 50 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 92, "y": 155, "w": 45, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 24, "w": 45, "h": 50 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 92, "y": 155, "w": 45, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 24, "w": 45, "h": 50 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 47, "y": 105, "w": 46, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 24, "w": 46, "h": 50 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 47, "y": 105, "w": 46, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 24, "w": 46, "h": 50 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 189, "y": 1, "w": 47, "h": 51 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 23, "w": 47, "h": 51 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 189, "y": 52, "w": 47, "h": 51 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 23, "w": 47, "h": 51 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 1, "y": 1, "w": 47, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 22, "w": 47, "h": 52 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 48, "y": 1, "w": 47, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 22, "w": 47, "h": 52 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 95, "y": 1, "w": 47, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 22, "w": 47, "h": 52 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0088.png",
+    "frame": { "x": 95, "y": 1, "w": 47, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 22, "w": 47, "h": 52 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0089.png",
+    "frame": { "x": 1, "y": 53, "w": 46, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 22, "w": 46, "h": 52 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0090.png",
+    "frame": { "x": 47, "y": 53, "w": 46, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 22, "w": 46, "h": 52 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0091.png",
+    "frame": { "x": 93, "y": 53, "w": 46, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 22, "w": 46, "h": 52 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0092.png",
+    "frame": { "x": 139, "y": 53, "w": 46, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 22, "w": 46, "h": 52 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0093.png",
+    "frame": { "x": 142, "y": 1, "w": 47, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 22, "w": 47, "h": 52 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0094.png",
+    "frame": { "x": 142, "y": 1, "w": 47, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 22, "w": 47, "h": 52 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0095.png",
+    "frame": { "x": 95, "y": 1, "w": 47, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 22, "w": 47, "h": 52 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0096.png",
+    "frame": { "x": 95, "y": 1, "w": 47, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 22, "w": 47, "h": 52 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0097.png",
+    "frame": { "x": 185, "y": 103, "w": 46, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 22, "w": 46, "h": 52 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0098.png",
+    "frame": { "x": 185, "y": 103, "w": 46, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 22, "w": 46, "h": 52 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0099.png",
+    "frame": { "x": 139, "y": 53, "w": 46, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 22, "w": 46, "h": 52 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0100.png",
+    "frame": { "x": 139, "y": 53, "w": 46, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 22, "w": 46, "h": 52 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0101.png",
+    "frame": { "x": 142, "y": 1, "w": 47, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 22, "w": 47, "h": 52 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0102.png",
+    "frame": { "x": 142, "y": 1, "w": 47, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 22, "w": 47, "h": 52 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0103.png",
+    "frame": { "x": 142, "y": 1, "w": 47, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 22, "w": 47, "h": 52 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0104.png",
+    "frame": { "x": 95, "y": 1, "w": 47, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 22, "w": 47, "h": 52 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0105.png",
+    "frame": { "x": 95, "y": 1, "w": 47, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 22, "w": 47, "h": 52 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0106.png",
+    "frame": { "x": 185, "y": 103, "w": 46, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 22, "w": 46, "h": 52 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0107.png",
+    "frame": { "x": 185, "y": 103, "w": 46, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 22, "w": 46, "h": 52 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0108.png",
+    "frame": { "x": 93, "y": 53, "w": 46, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 22, "w": 46, "h": 52 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0109.png",
+    "frame": { "x": 1, "y": 105, "w": 46, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 22, "w": 46, "h": 52 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0110.png",
+    "frame": { "x": 189, "y": 52, "w": 47, "h": 51 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 23, "w": 47, "h": 51 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0111.png",
+    "frame": { "x": 189, "y": 1, "w": 47, "h": 51 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 23, "w": 47, "h": 51 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.13-x64",
+  "image": "782.png",
+  "format": "I8",
+  "size": { "w": 237, "h": 207 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/back/shiny/782.png b/public/images/pokemon/back/shiny/782.png
index a775abe8bf4..e5bed3d1642 100644
Binary files a/public/images/pokemon/back/shiny/782.png and b/public/images/pokemon/back/shiny/782.png differ
diff --git a/public/images/pokemon/back/shiny/783.json b/public/images/pokemon/back/shiny/783.json
index 253da2ab9a8..17ec3df99a0 100644
--- a/public/images/pokemon/back/shiny/783.json
+++ b/public/images/pokemon/back/shiny/783.json
@@ -1,41 +1,965 @@
-{
-	"textures": [
-		{
-			"image": "783.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 69,
-				"h": 69
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 66,
-						"h": 69
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 66,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 66,
-						"h": 69
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:e5544237a4fd9ef3e516be84f3a24a8a:dd780189298088c8e8eb741377c46b07:aab166e28c744865a0296041224dd01b$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 414, "y": 273, "w": 66, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 66, "h": 69 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 268, "y": 276, "w": 65, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 65, "h": 69 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 480, "y": 273, "w": 65, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 65, "h": 70 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 1, "y": 342, "w": 64, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 64, "h": 70 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 262, "y": 345, "w": 62, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 62, "h": 71 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 65, "y": 344, "w": 63, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 63, "h": 70 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 342, "y": 275, "w": 65, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 65, "h": 70 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 132, "y": 278, "w": 65, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 65, "h": 69 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 1, "y": 273, "w": 66, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 66, "h": 69 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 197, "y": 342, "w": 65, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 65, "h": 68 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 324, "y": 345, "w": 64, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 64, "h": 68 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 1, "y": 412, "w": 62, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 4, "w": 62, "h": 67 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 511, "y": 412, "w": 61, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 4, "w": 61, "h": 67 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 449, "y": 412, "w": 62, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 4, "w": 62, "h": 67 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 128, "y": 347, "w": 64, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 64, "h": 68 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 407, "y": 342, "w": 65, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 65, "h": 68 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 414, "y": 273, "w": 66, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 66, "h": 69 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 268, "y": 276, "w": 65, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 65, "h": 69 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 480, "y": 273, "w": 65, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 65, "h": 70 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 1, "y": 342, "w": 64, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 64, "h": 70 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 262, "y": 345, "w": 62, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 62, "h": 71 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 65, "y": 344, "w": 63, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 63, "h": 70 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 342, "y": 275, "w": 65, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 65, "h": 70 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 132, "y": 278, "w": 65, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 65, "h": 69 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 1, "y": 273, "w": 66, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 66, "h": 69 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 197, "y": 342, "w": 65, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 65, "h": 68 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 324, "y": 345, "w": 64, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 64, "h": 68 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 1, "y": 412, "w": 62, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 4, "w": 62, "h": 67 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 511, "y": 412, "w": 61, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 4, "w": 61, "h": 67 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 449, "y": 412, "w": 62, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 4, "w": 62, "h": 67 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 128, "y": 347, "w": 64, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 64, "h": 68 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 407, "y": 342, "w": 65, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 65, "h": 68 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 414, "y": 273, "w": 66, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 66, "h": 69 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 268, "y": 276, "w": 65, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 65, "h": 69 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 480, "y": 273, "w": 65, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 65, "h": 70 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 1, "y": 342, "w": 64, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 64, "h": 70 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 262, "y": 345, "w": 62, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 62, "h": 71 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 65, "y": 344, "w": 63, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 63, "h": 70 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 342, "y": 275, "w": 65, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 65, "h": 70 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 132, "y": 278, "w": 65, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 65, "h": 69 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 1, "y": 273, "w": 66, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 66, "h": 69 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 197, "y": 342, "w": 65, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 65, "h": 68 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 324, "y": 345, "w": 64, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 64, "h": 68 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 1, "y": 412, "w": 62, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 4, "w": 62, "h": 67 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 511, "y": 412, "w": 61, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 4, "w": 61, "h": 67 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 449, "y": 412, "w": 62, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 4, "w": 62, "h": 67 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 128, "y": 347, "w": 64, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 64, "h": 68 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 407, "y": 342, "w": 65, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 65, "h": 68 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 414, "y": 273, "w": 66, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 66, "h": 69 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 268, "y": 276, "w": 65, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 65, "h": 69 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 480, "y": 273, "w": 65, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 65, "h": 70 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 1, "y": 342, "w": 64, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 64, "h": 70 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 262, "y": 345, "w": 62, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 62, "h": 71 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 65, "y": 344, "w": 63, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 63, "h": 70 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 342, "y": 275, "w": 65, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 65, "h": 70 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 132, "y": 278, "w": 65, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 65, "h": 69 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 1, "y": 273, "w": 66, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 66, "h": 69 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 197, "y": 342, "w": 65, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 65, "h": 68 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 324, "y": 345, "w": 64, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 64, "h": 68 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 1, "y": 412, "w": 62, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 4, "w": 62, "h": 67 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 511, "y": 412, "w": 61, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 4, "w": 61, "h": 67 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 449, "y": 412, "w": 62, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 4, "w": 62, "h": 67 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 128, "y": 347, "w": 64, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 64, "h": 68 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 407, "y": 342, "w": 65, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 65, "h": 68 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 414, "y": 273, "w": 66, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 66, "h": 69 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 202, "y": 273, "w": 66, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 66, "h": 69 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 136, "y": 208, "w": 66, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 1, "w": 66, "h": 70 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 67, "y": 274, "w": 65, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 1, "w": 65, "h": 70 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 139, "y": 138, "w": 67, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 1, "w": 67, "h": 70 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 290, "y": 1, "w": 69, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 1, "w": 69, "h": 70 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 147, "y": 1, "w": 71, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 71, "h": 69 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 483, "y": 206, "w": 69, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 69, "h": 67 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 141, "y": 70, "w": 70, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 70, "h": 68 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 499, "y": 1, "w": 69, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 69, "h": 69 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 356, "y": 137, "w": 68, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 68, "h": 69 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 414, "y": 273, "w": 66, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 66, "h": 69 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 424, "y": 138, "w": 68, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 68, "h": 68 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 430, "y": 1, "w": 69, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 69, "h": 69 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 498, "y": 70, "w": 69, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 69, "h": 68 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 206, "y": 206, "w": 69, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 69, "h": 67 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 414, "y": 206, "w": 69, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 69, "h": 67 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 192, "y": 410, "w": 63, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 2, "w": 63, "h": 68 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 324, "y": 413, "w": 59, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 4, "w": 59, "h": 67 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 63, "y": 414, "w": 58, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 3, "w": 58, "h": 68 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 388, "y": 410, "w": 61, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 61, "h": 69 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 472, "y": 343, "w": 64, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 2, "w": 64, "h": 69 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 414, "y": 273, "w": 66, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 66, "h": 69 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0088.png",
+    "frame": { "x": 288, "y": 71, "w": 68, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 68, "h": 69 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0089.png",
+    "frame": { "x": 218, "y": 1, "w": 72, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 72, "h": 68 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0090.png",
+    "frame": { "x": 1, "y": 137, "w": 69, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 69, "h": 68 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0091.png",
+    "frame": { "x": 359, "y": 69, "w": 70, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 70, "h": 68 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0092.png",
+    "frame": { "x": 218, "y": 69, "w": 70, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 70, "h": 68 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0093.png",
+    "frame": { "x": 74, "y": 1, "w": 73, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 73, "h": 68 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0094.png",
+    "frame": { "x": 70, "y": 137, "w": 69, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 69, "h": 68 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0095.png",
+    "frame": { "x": 71, "y": 69, "w": 70, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 70, "h": 68 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0096.png",
+    "frame": { "x": 1, "y": 69, "w": 70, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 70, "h": 68 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0097.png",
+    "frame": { "x": 1, "y": 1, "w": 73, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 73, "h": 68 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0098.png",
+    "frame": { "x": 279, "y": 140, "w": 68, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 3, "w": 68, "h": 68 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0099.png",
+    "frame": { "x": 492, "y": 138, "w": 68, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 68, "h": 68 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0100.png",
+    "frame": { "x": 429, "y": 70, "w": 69, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 69, "h": 68 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0101.png",
+    "frame": { "x": 359, "y": 1, "w": 71, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 71, "h": 68 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0102.png",
+    "frame": { "x": 1, "y": 205, "w": 68, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 68, "h": 68 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0103.png",
+    "frame": { "x": 275, "y": 208, "w": 67, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 67, "h": 68 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0104.png",
+    "frame": { "x": 211, "y": 137, "w": 68, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 68, "h": 69 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0105.png",
+    "frame": { "x": 69, "y": 205, "w": 67, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 67, "h": 69 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0106.png",
+    "frame": { "x": 347, "y": 206, "w": 67, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 67, "h": 69 },
+    "sourceSize": { "w": 75, "h": 71 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.13-x64",
+  "image": "783.png",
+  "format": "I8",
+  "size": { "w": 573, "h": 483 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/back/shiny/783.png b/public/images/pokemon/back/shiny/783.png
index 6ba2506ecc8..30d6c49f5e0 100644
Binary files a/public/images/pokemon/back/shiny/783.png and b/public/images/pokemon/back/shiny/783.png differ
diff --git a/public/images/pokemon/back/shiny/784.json b/public/images/pokemon/back/shiny/784.json
index 552fb3c9595..87ddecc06fb 100644
--- a/public/images/pokemon/back/shiny/784.json
+++ b/public/images/pokemon/back/shiny/784.json
@@ -1,41 +1,812 @@
-{
-	"textures": [
-		{
-			"image": "784.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 92,
-				"h": 92
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 92,
-						"h": 81
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 92,
-						"h": 81
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 92,
-						"h": 81
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:3e83e25b8e7e32a8993a48c7e36af553:6ed75435976e4481fad74457807089c7:c2f7ca3ab1075b8c824730653d891244$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 183, "y": 233, "w": 90, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 4, "w": 90, "h": 81 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 1, "y": 160, "w": 94, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 4, "w": 94, "h": 81 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 530, "y": 81, "w": 98, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 4, "w": 98, "h": 81 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 530, "y": 1, "w": 103, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 103, "h": 80 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 324, "y": 1, "w": 106, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 106, "h": 80 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 1, "y": 1, "w": 110, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 6, "w": 110, "h": 79 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 214, "y": 1, "w": 110, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 110, "h": 78 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 633, "y": 1, "w": 106, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 8, "w": 106, "h": 77 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 198, "y": 156, "w": 102, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 8, "w": 102, "h": 77 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 300, "y": 159, "w": 97, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 5, "w": 97, "h": 80 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 95, "y": 166, "w": 88, "h": 83 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 2, "w": 88, "h": 83 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 358, "y": 241, "w": 83, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 4, "w": 83, "h": 81 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 681, "y": 318, "w": 81, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 6, "w": 81, "h": 79 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 87, "y": 249, "w": 82, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 5, "w": 82, "h": 80 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 441, "y": 242, "w": 84, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 5, "w": 84, "h": 80 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 273, "y": 239, "w": 85, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 4, "w": 85, "h": 81 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 183, "y": 233, "w": 90, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 4, "w": 90, "h": 81 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 1, "y": 160, "w": 94, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 4, "w": 94, "h": 81 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 530, "y": 81, "w": 98, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 4, "w": 98, "h": 81 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 530, "y": 1, "w": 103, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 103, "h": 80 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 324, "y": 1, "w": 106, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 106, "h": 80 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 1, "y": 1, "w": 110, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 6, "w": 110, "h": 79 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 214, "y": 1, "w": 110, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 110, "h": 78 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 633, "y": 1, "w": 106, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 8, "w": 106, "h": 77 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 198, "y": 156, "w": 102, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 8, "w": 102, "h": 77 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 300, "y": 159, "w": 97, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 5, "w": 97, "h": 80 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 95, "y": 166, "w": 88, "h": 83 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 2, "w": 88, "h": 83 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 358, "y": 241, "w": 83, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 4, "w": 83, "h": 81 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 681, "y": 318, "w": 81, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 6, "w": 81, "h": 79 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 87, "y": 249, "w": 82, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 5, "w": 82, "h": 80 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 441, "y": 242, "w": 84, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 5, "w": 84, "h": 80 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 273, "y": 239, "w": 85, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 4, "w": 85, "h": 81 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 183, "y": 233, "w": 90, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 4, "w": 90, "h": 81 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 1, "y": 160, "w": 94, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 4, "w": 94, "h": 81 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 530, "y": 81, "w": 98, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 4, "w": 98, "h": 81 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 530, "y": 1, "w": 103, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 103, "h": 80 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 324, "y": 1, "w": 106, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 106, "h": 80 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 1, "y": 1, "w": 110, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 6, "w": 110, "h": 79 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 214, "y": 1, "w": 110, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 110, "h": 78 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 633, "y": 1, "w": 106, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 8, "w": 106, "h": 77 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 198, "y": 156, "w": 102, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 8, "w": 102, "h": 77 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 300, "y": 159, "w": 97, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 5, "w": 97, "h": 80 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 95, "y": 166, "w": 88, "h": 83 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 2, "w": 88, "h": 83 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 358, "y": 241, "w": 83, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 4, "w": 83, "h": 81 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 681, "y": 318, "w": 81, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 6, "w": 81, "h": 79 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 87, "y": 249, "w": 82, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 5, "w": 82, "h": 80 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 441, "y": 242, "w": 84, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 5, "w": 84, "h": 80 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 273, "y": 239, "w": 85, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 4, "w": 85, "h": 81 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 183, "y": 233, "w": 90, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 4, "w": 90, "h": 81 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 1, "y": 160, "w": 94, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 4, "w": 94, "h": 81 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 530, "y": 81, "w": 98, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 4, "w": 98, "h": 81 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 530, "y": 1, "w": 103, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 103, "h": 80 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 324, "y": 1, "w": 106, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 106, "h": 80 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 1, "y": 1, "w": 110, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 6, "w": 110, "h": 79 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 214, "y": 1, "w": 110, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 110, "h": 78 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 633, "y": 1, "w": 106, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 8, "w": 106, "h": 77 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 198, "y": 156, "w": 102, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 8, "w": 102, "h": 77 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 300, "y": 159, "w": 97, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 5, "w": 97, "h": 80 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 95, "y": 166, "w": 88, "h": 83 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 2, "w": 88, "h": 83 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 358, "y": 241, "w": 83, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 4, "w": 83, "h": 81 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 681, "y": 318, "w": 81, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 6, "w": 81, "h": 79 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 87, "y": 249, "w": 82, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 5, "w": 82, "h": 80 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 441, "y": 242, "w": 84, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 5, "w": 84, "h": 80 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 273, "y": 239, "w": 85, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 4, "w": 85, "h": 81 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 397, "y": 160, "w": 93, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 4, "w": 93, "h": 81 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 101, "y": 85, "w": 97, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 4, "w": 97, "h": 81 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 1, "y": 80, "w": 100, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 100, "h": 80 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 633, "y": 78, "w": 102, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 6, "w": 102, "h": 79 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 214, "y": 79, "w": 104, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 8, "w": 104, "h": 77 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 420, "y": 84, "w": 104, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 9, "w": 104, "h": 76 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 318, "y": 81, "w": 102, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 7, "w": 102, "h": 78 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 628, "y": 157, "w": 96, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 96, "h": 81 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 430, "y": 1, "w": 100, "h": 83 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 100, "h": 83 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 111, "y": 1, "w": 103, "h": 84 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 103, "h": 84 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 490, "y": 162, "w": 92, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 5, "w": 92, "h": 80 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 327, "y": 322, "w": 75, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 33, "y": 0, "w": 75, "h": 85 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 476, "y": 400, "w": 72, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 36, "y": 12, "w": 72, "h": 74 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 153, "y": 394, "w": 72, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 36, "y": 5, "w": 72, "h": 80 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 681, "y": 397, "w": 72, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 36, "y": 10, "w": 72, "h": 75 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 80, "y": 329, "w": 73, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 35, "y": 5, "w": 73, "h": 80 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 402, "y": 322, "w": 74, "h": 82 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 34, "y": 3, "w": 74, "h": 82 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 251, "y": 320, "w": 76, "h": 84 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 31, "y": 1, "w": 76, "h": 84 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 604, "y": 318, "w": 77, "h": 84 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 29, "y": 1, "w": 77, "h": 84 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 525, "y": 318, "w": 79, "h": 82 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 3, "w": 79, "h": 82 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 1, "y": 320, "w": 79, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 4, "w": 79, "h": 81 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 169, "y": 314, "w": 82, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 5, "w": 82, "h": 80 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 1, "y": 241, "w": 86, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 17, "y": 6, "w": 86, "h": 79 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0088.png",
+    "frame": { "x": 672, "y": 238, "w": 87, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 5, "w": 87, "h": 80 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0089.png",
+    "frame": { "x": 582, "y": 238, "w": 90, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 5, "w": 90, "h": 80 },
+    "sourceSize": { "w": 112, "h": 86 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.13-x64",
+  "image": "784.png",
+  "format": "I8",
+  "size": { "w": 763, "h": 475 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/back/shiny/784.png b/public/images/pokemon/back/shiny/784.png
index c32690792ac..51a3962a6ea 100644
Binary files a/public/images/pokemon/back/shiny/784.png and b/public/images/pokemon/back/shiny/784.png differ
diff --git a/public/images/pokemon/back/shiny/881.png b/public/images/pokemon/back/shiny/881.png
index 3686b34dd99..4dc11742548 100644
Binary files a/public/images/pokemon/back/shiny/881.png and b/public/images/pokemon/back/shiny/881.png differ
diff --git a/public/images/pokemon/exp/2037.json b/public/images/pokemon/exp/2037.json
index 2e3362314c9..201e8eaa174 100644
--- a/public/images/pokemon/exp/2037.json
+++ b/public/images/pokemon/exp/2037.json
@@ -1,1112 +1,101 @@
-{
-	"textures": [
-		{
-			"image": "2037.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 224,
-				"h": 224
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0040.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 52,
-						"h": 47
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 52,
-						"h": 47
-					}
-				},
-				{
-					"filename": "0041.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 52,
-						"h": 47
-					},
-					"frame": {
-						"x": 0,
-						"y": 47,
-						"w": 52,
-						"h": 47
-					}
-				},
-				{
-					"filename": "0042.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 52,
-						"h": 47
-					},
-					"frame": {
-						"x": 52,
-						"y": 0,
-						"w": 52,
-						"h": 47
-					}
-				},
-				{
-					"filename": "0044.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 53,
-						"h": 46
-					},
-					"frame": {
-						"x": 104,
-						"y": 0,
-						"w": 53,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0045.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 53,
-						"h": 46
-					},
-					"frame": {
-						"x": 157,
-						"y": 0,
-						"w": 53,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0039.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 52,
-						"h": 46
-					},
-					"frame": {
-						"x": 0,
-						"y": 94,
-						"w": 52,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0043.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 52,
-						"h": 46
-					},
-					"frame": {
-						"x": 52,
-						"y": 47,
-						"w": 52,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 53,
-						"h": 45
-					},
-					"frame": {
-						"x": 104,
-						"y": 46,
-						"w": 53,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 53,
-						"h": 45
-					},
-					"frame": {
-						"x": 104,
-						"y": 46,
-						"w": 53,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 53,
-						"h": 45
-					},
-					"frame": {
-						"x": 104,
-						"y": 46,
-						"w": 53,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 53,
-						"h": 45
-					},
-					"frame": {
-						"x": 104,
-						"y": 46,
-						"w": 53,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0026.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 53,
-						"h": 45
-					},
-					"frame": {
-						"x": 104,
-						"y": 46,
-						"w": 53,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0036.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 53,
-						"h": 45
-					},
-					"frame": {
-						"x": 104,
-						"y": 46,
-						"w": 53,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0047.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 52,
-						"h": 46
-					},
-					"frame": {
-						"x": 0,
-						"y": 140,
-						"w": 52,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0048.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 53,
-						"h": 45
-					},
-					"frame": {
-						"x": 157,
-						"y": 46,
-						"w": 53,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 52,
-						"h": 45
-					},
-					"frame": {
-						"x": 52,
-						"y": 93,
-						"w": 52,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 52,
-						"h": 45
-					},
-					"frame": {
-						"x": 52,
-						"y": 93,
-						"w": 52,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0025.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 52,
-						"h": 45
-					},
-					"frame": {
-						"x": 52,
-						"y": 93,
-						"w": 52,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0037.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 52,
-						"h": 45
-					},
-					"frame": {
-						"x": 52,
-						"y": 93,
-						"w": 52,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0046.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 52,
-						"h": 45
-					},
-					"frame": {
-						"x": 52,
-						"y": 93,
-						"w": 52,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0051.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 52,
-						"h": 45
-					},
-					"frame": {
-						"x": 52,
-						"y": 93,
-						"w": 52,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0052.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 52,
-						"h": 45
-					},
-					"frame": {
-						"x": 52,
-						"y": 93,
-						"w": 52,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0049.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 53,
-						"h": 45
-					},
-					"frame": {
-						"x": 104,
-						"y": 91,
-						"w": 53,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 53,
-						"h": 44
-					},
-					"frame": {
-						"x": 157,
-						"y": 91,
-						"w": 53,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 53,
-						"h": 44
-					},
-					"frame": {
-						"x": 157,
-						"y": 91,
-						"w": 53,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 53,
-						"h": 44
-					},
-					"frame": {
-						"x": 157,
-						"y": 91,
-						"w": 53,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 53,
-						"h": 44
-					},
-					"frame": {
-						"x": 157,
-						"y": 91,
-						"w": 53,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0027.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 53,
-						"h": 44
-					},
-					"frame": {
-						"x": 157,
-						"y": 91,
-						"w": 53,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0035.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 53,
-						"h": 44
-					},
-					"frame": {
-						"x": 157,
-						"y": 91,
-						"w": 53,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0038.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 52,
-						"h": 45
-					},
-					"frame": {
-						"x": 52,
-						"y": 138,
-						"w": 52,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 54,
-						"h": 41
-					},
-					"frame": {
-						"x": 52,
-						"y": 183,
-						"w": 54,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 54,
-						"h": 41
-					},
-					"frame": {
-						"x": 52,
-						"y": 183,
-						"w": 54,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 54,
-						"h": 41
-					},
-					"frame": {
-						"x": 52,
-						"y": 183,
-						"w": 54,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 54,
-						"h": 41
-					},
-					"frame": {
-						"x": 52,
-						"y": 183,
-						"w": 54,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0030.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 54,
-						"h": 41
-					},
-					"frame": {
-						"x": 52,
-						"y": 183,
-						"w": 54,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0032.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 54,
-						"h": 41
-					},
-					"frame": {
-						"x": 52,
-						"y": 183,
-						"w": 54,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 53,
-						"h": 44
-					},
-					"frame": {
-						"x": 104,
-						"y": 136,
-						"w": 53,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 53,
-						"h": 44
-					},
-					"frame": {
-						"x": 104,
-						"y": 136,
-						"w": 53,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 53,
-						"h": 44
-					},
-					"frame": {
-						"x": 104,
-						"y": 136,
-						"w": 53,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 53,
-						"h": 44
-					},
-					"frame": {
-						"x": 104,
-						"y": 136,
-						"w": 53,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0028.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 53,
-						"h": 44
-					},
-					"frame": {
-						"x": 104,
-						"y": 136,
-						"w": 53,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0034.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 53,
-						"h": 44
-					},
-					"frame": {
-						"x": 104,
-						"y": 136,
-						"w": 53,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0050.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 52,
-						"h": 45
-					},
-					"frame": {
-						"x": 157,
-						"y": 135,
-						"w": 52,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 54,
-						"h": 42
-					},
-					"frame": {
-						"x": 106,
-						"y": 180,
-						"w": 54,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 54,
-						"h": 42
-					},
-					"frame": {
-						"x": 106,
-						"y": 180,
-						"w": 54,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 54,
-						"h": 42
-					},
-					"frame": {
-						"x": 106,
-						"y": 180,
-						"w": 54,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 54,
-						"h": 42
-					},
-					"frame": {
-						"x": 106,
-						"y": 180,
-						"w": 54,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0029.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 54,
-						"h": 42
-					},
-					"frame": {
-						"x": 106,
-						"y": 180,
-						"w": 54,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0033.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 54,
-						"h": 42
-					},
-					"frame": {
-						"x": 106,
-						"y": 180,
-						"w": 54,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 54,
-						"h": 42
-					},
-					"frame": {
-						"x": 160,
-						"y": 180,
-						"w": 54,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 54,
-						"h": 42
-					},
-					"frame": {
-						"x": 160,
-						"y": 180,
-						"w": 54,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0031.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 54,
-						"h": 42
-					},
-					"frame": {
-						"x": 160,
-						"y": 180,
-						"w": 54,
-						"h": 42
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:cb371bc4c4d65115dbfd5277a8b37fae:f235d22648ca7d0f60ca039b1e3915e7:c679847d1c2ddf91caeaa5ebb76a6664$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 0, "y": 45, "w": 55, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 55, "h": 46 },
+    "sourceSize": { "w": 59, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 173, "y": 45, "w": 54, "h": 45 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 54, "h": 45 },
+    "sourceSize": { "w": 59, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 112, "y": 46, "w": 54, "h": 45 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 54, "h": 45 },
+    "sourceSize": { "w": 59, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 55, "y": 89, "w": 54, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 54, "h": 44 },
+    "sourceSize": { "w": 59, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 166, "y": 90, "w": 54, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 54, "h": 44 },
+    "sourceSize": { "w": 59, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 55, "y": 45, "w": 57, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 57, "h": 44 },
+    "sourceSize": { "w": 59, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 0, "y": 0, "w": 59, "h": 45 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 59, "h": 45 },
+    "sourceSize": { "w": 59, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 59, "y": 0, "w": 58, "h": 45 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 58, "h": 45 },
+    "sourceSize": { "w": 59, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 173, "y": 0, "w": 57, "h": 45 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 57, "h": 45 },
+    "sourceSize": { "w": 59, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 117, "y": 0, "w": 56, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 56, "h": 46 },
+    "sourceSize": { "w": 59, "h": 46 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.13-x64",
+  "image": "2037.png",
+  "format": "I8",
+  "size": { "w": 230, "h": 134 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/2037.png b/public/images/pokemon/exp/2037.png
index a892d43c70b..b1ebd401e5f 100644
Binary files a/public/images/pokemon/exp/2037.png and b/public/images/pokemon/exp/2037.png differ
diff --git a/public/images/pokemon/exp/2038.json b/public/images/pokemon/exp/2038.json
index b7d26753f24..90b36cbc795 100644
--- a/public/images/pokemon/exp/2038.json
+++ b/public/images/pokemon/exp/2038.json
@@ -1,692 +1,155 @@
-{
-	"textures": [
-		{
-			"image": "2038.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 516,
-				"h": 516
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 94,
-						"h": 87
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 9,
-						"w": 86,
-						"h": 74
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 86,
-						"h": 74
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 94,
-						"h": 87
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 8,
-						"w": 84,
-						"h": 75
-					},
-					"frame": {
-						"x": 86,
-						"y": 0,
-						"w": 84,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 94,
-						"h": 87
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 8,
-						"w": 85,
-						"h": 75
-					},
-					"frame": {
-						"x": 170,
-						"y": 0,
-						"w": 85,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 94,
-						"h": 87
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 8,
-						"w": 85,
-						"h": 75
-					},
-					"frame": {
-						"x": 255,
-						"y": 0,
-						"w": 85,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 94,
-						"h": 87
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 8,
-						"w": 86,
-						"h": 75
-					},
-					"frame": {
-						"x": 340,
-						"y": 0,
-						"w": 86,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 94,
-						"h": 87
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 8,
-						"w": 86,
-						"h": 75
-					},
-					"frame": {
-						"x": 426,
-						"y": 0,
-						"w": 86,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0031.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 94,
-						"h": 87
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 8,
-						"w": 88,
-						"h": 75
-					},
-					"frame": {
-						"x": 0,
-						"y": 75,
-						"w": 88,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0032.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 94,
-						"h": 87
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 8,
-						"w": 87,
-						"h": 75
-					},
-					"frame": {
-						"x": 88,
-						"y": 75,
-						"w": 87,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0030.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 94,
-						"h": 87
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 7,
-						"w": 89,
-						"h": 76
-					},
-					"frame": {
-						"x": 175,
-						"y": 75,
-						"w": 89,
-						"h": 76
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 94,
-						"h": 87
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 8,
-						"w": 87,
-						"h": 77
-					},
-					"frame": {
-						"x": 264,
-						"y": 75,
-						"w": 87,
-						"h": 77
-					}
-				},
-				{
-					"filename": "0029.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 94,
-						"h": 87
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 6,
-						"w": 90,
-						"h": 77
-					},
-					"frame": {
-						"x": 351,
-						"y": 75,
-						"w": 90,
-						"h": 77
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 94,
-						"h": 87
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 8,
-						"w": 86,
-						"h": 78
-					},
-					"frame": {
-						"x": 0,
-						"y": 150,
-						"w": 86,
-						"h": 78
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 94,
-						"h": 87
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 9,
-						"w": 85,
-						"h": 78
-					},
-					"frame": {
-						"x": 86,
-						"y": 150,
-						"w": 85,
-						"h": 78
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 94,
-						"h": 87
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 9,
-						"w": 85,
-						"h": 78
-					},
-					"frame": {
-						"x": 171,
-						"y": 151,
-						"w": 85,
-						"h": 78
-					}
-				},
-				{
-					"filename": "0028.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 94,
-						"h": 87
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 5,
-						"w": 91,
-						"h": 78
-					},
-					"frame": {
-						"x": 256,
-						"y": 152,
-						"w": 91,
-						"h": 78
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 94,
-						"h": 87
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 8,
-						"w": 86,
-						"h": 79
-					},
-					"frame": {
-						"x": 347,
-						"y": 152,
-						"w": 86,
-						"h": 79
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 94,
-						"h": 87
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 8,
-						"w": 86,
-						"h": 79
-					},
-					"frame": {
-						"x": 0,
-						"y": 228,
-						"w": 86,
-						"h": 79
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 94,
-						"h": 87
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 8,
-						"w": 85,
-						"h": 79
-					},
-					"frame": {
-						"x": 86,
-						"y": 228,
-						"w": 85,
-						"h": 79
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 94,
-						"h": 87
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 8,
-						"w": 85,
-						"h": 79
-					},
-					"frame": {
-						"x": 171,
-						"y": 229,
-						"w": 85,
-						"h": 79
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 94,
-						"h": 87
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 85,
-						"h": 79
-					},
-					"frame": {
-						"x": 256,
-						"y": 230,
-						"w": 85,
-						"h": 79
-					}
-				},
-				{
-					"filename": "0027.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 94,
-						"h": 87
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 4,
-						"w": 90,
-						"h": 79
-					},
-					"frame": {
-						"x": 341,
-						"y": 231,
-						"w": 90,
-						"h": 79
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 94,
-						"h": 87
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 85,
-						"h": 80
-					},
-					"frame": {
-						"x": 431,
-						"y": 231,
-						"w": 85,
-						"h": 80
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 94,
-						"h": 87
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 86,
-						"h": 80
-					},
-					"frame": {
-						"x": 0,
-						"y": 307,
-						"w": 86,
-						"h": 80
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 94,
-						"h": 87
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 87,
-						"h": 81
-					},
-					"frame": {
-						"x": 86,
-						"y": 308,
-						"w": 87,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0026.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 94,
-						"h": 87
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 90,
-						"h": 81
-					},
-					"frame": {
-						"x": 173,
-						"y": 309,
-						"w": 90,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 94,
-						"h": 87
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 88,
-						"h": 82
-					},
-					"frame": {
-						"x": 263,
-						"y": 310,
-						"w": 88,
-						"h": 82
-					}
-				},
-				{
-					"filename": "0025.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 94,
-						"h": 87
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 90,
-						"h": 82
-					},
-					"frame": {
-						"x": 351,
-						"y": 311,
-						"w": 90,
-						"h": 82
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 94,
-						"h": 87
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 88,
-						"h": 83
-					},
-					"frame": {
-						"x": 0,
-						"y": 389,
-						"w": 88,
-						"h": 83
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 94,
-						"h": 87
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 89,
-						"h": 83
-					},
-					"frame": {
-						"x": 88,
-						"y": 390,
-						"w": 89,
-						"h": 83
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 94,
-						"h": 87
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 89,
-						"h": 83
-					},
-					"frame": {
-						"x": 177,
-						"y": 392,
-						"w": 89,
-						"h": 83
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 94,
-						"h": 87
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 89,
-						"h": 83
-					},
-					"frame": {
-						"x": 266,
-						"y": 393,
-						"w": 89,
-						"h": 83
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 94,
-						"h": 87
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 90,
-						"h": 83
-					},
-					"frame": {
-						"x": 355,
-						"y": 393,
-						"w": 90,
-						"h": 83
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:3548b7394d2a2d4370b938ffb12dbe96:5ccdea89bf7be09a529efae090aea261:51bcdbb4fa6a1a9e90a83c2a4132ee1b$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 157, "y": 194, "w": 76, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 76, "h": 65 },
+    "sourceSize": { "w": 86, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 164, "y": 128, "w": 80, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 80, "h": 66 },
+    "sourceSize": { "w": 86, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 244, "y": 128, "w": 80, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 80, "h": 64 },
+    "sourceSize": { "w": 86, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 0, "y": 130, "w": 80, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 80, "h": 64 },
+    "sourceSize": { "w": 86, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 78, "y": 194, "w": 79, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 79, "h": 64 },
+    "sourceSize": { "w": 86, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 170, "y": 0, "w": 84, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 84, "h": 64 },
+    "sourceSize": { "w": 86, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 254, "y": 0, "w": 84, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 84, "h": 64 },
+    "sourceSize": { "w": 86, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 86, "y": 0, "w": 84, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 84, "h": 65 },
+    "sourceSize": { "w": 86, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 170, "y": 64, "w": 84, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 84, "h": 64 },
+    "sourceSize": { "w": 86, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 0, "y": 0, "w": 86, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 86, "h": 65 },
+    "sourceSize": { "w": 86, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 254, "y": 64, "w": 84, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 84, "h": 64 },
+    "sourceSize": { "w": 86, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 0, "y": 65, "w": 82, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 82, "h": 65 },
+    "sourceSize": { "w": 86, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 80, "y": 130, "w": 80, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 80, "h": 64 },
+    "sourceSize": { "w": 86, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 82, "y": 65, "w": 82, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 82, "h": 65 },
+    "sourceSize": { "w": 86, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 244, "y": 192, "w": 80, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 80, "h": 64 },
+    "sourceSize": { "w": 86, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 0, "y": 194, "w": 78, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 78, "h": 65 },
+    "sourceSize": { "w": 86, "h": 67 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.13-x64",
+  "image": "2038.png",
+  "format": "I8",
+  "size": { "w": 338, "h": 259 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/2038.png b/public/images/pokemon/exp/2038.png
index 8e2e9435eee..f6295093fcc 100644
Binary files a/public/images/pokemon/exp/2038.png and b/public/images/pokemon/exp/2038.png differ
diff --git a/public/images/pokemon/exp/2074.json b/public/images/pokemon/exp/2074.json
index 7ee41553243..7512afe50ac 100644
--- a/public/images/pokemon/exp/2074.json
+++ b/public/images/pokemon/exp/2074.json
@@ -1,272 +1,425 @@
-{
-	"textures": [
-		{
-			"image": "2074.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 142,
-				"h": 142
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 16,
-						"w": 63,
-						"h": 28
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 63,
-						"h": 28
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 12,
-						"w": 61,
-						"h": 30
-					},
-					"frame": {
-						"x": 63,
-						"y": 0,
-						"w": 61,
-						"h": 30
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 12,
-						"w": 61,
-						"h": 30
-					},
-					"frame": {
-						"x": 63,
-						"y": 0,
-						"w": 61,
-						"h": 30
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 8,
-						"w": 57,
-						"h": 32
-					},
-					"frame": {
-						"x": 0,
-						"y": 28,
-						"w": 57,
-						"h": 32
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 8,
-						"w": 57,
-						"h": 32
-					},
-					"frame": {
-						"x": 0,
-						"y": 28,
-						"w": 57,
-						"h": 32
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 56,
-						"h": 35
-					},
-					"frame": {
-						"x": 57,
-						"y": 30,
-						"w": 56,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 56,
-						"h": 35
-					},
-					"frame": {
-						"x": 57,
-						"y": 30,
-						"w": 56,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 0,
-						"w": 52,
-						"h": 37
-					},
-					"frame": {
-						"x": 0,
-						"y": 60,
-						"w": 52,
-						"h": 37
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 0,
-						"w": 52,
-						"h": 37
-					},
-					"frame": {
-						"x": 0,
-						"y": 60,
-						"w": 52,
-						"h": 37
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 0,
-						"w": 47,
-						"h": 40
-					},
-					"frame": {
-						"x": 0,
-						"y": 97,
-						"w": 47,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 0,
-						"w": 48,
-						"h": 39
-					},
-					"frame": {
-						"x": 47,
-						"y": 97,
-						"w": 48,
-						"h": 39
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 0,
-						"w": 47,
-						"h": 39
-					},
-					"frame": {
-						"x": 95,
-						"y": 65,
-						"w": 47,
-						"h": 39
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:17eb999510749cb5bf44945ce0e6af23:03e8369dbf7ea1c1898cee8cc1b989b3:ad137687a877f55f096b7447bfdfe295$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 120, "y": 124, "w": 55, "h": 30 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 4, "w": 55, "h": 30 },
+    "sourceSize": { "w": 70, "h": 42 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 65, "y": 94, "w": 58, "h": 29 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 7, "w": 58, "h": 29 },
+    "sourceSize": { "w": 70, "h": 42 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 124, "y": 95, "w": 60, "h": 28 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 11, "w": 60, "h": 28 },
+    "sourceSize": { "w": 70, "h": 42 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 1, "y": 93, "w": 63, "h": 28 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 14, "w": 63, "h": 28 },
+    "sourceSize": { "w": 70, "h": 42 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 255, "y": 33, "w": 65, "h": 29 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 13, "w": 65, "h": 29 },
+    "sourceSize": { "w": 70, "h": 42 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 1, "y": 33, "w": 67, "h": 30 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 12, "w": 67, "h": 30 },
+    "sourceSize": { "w": 70, "h": 42 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 255, "y": 63, "w": 65, "h": 29 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 65, "h": 29 },
+    "sourceSize": { "w": 70, "h": 42 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 135, "y": 66, "w": 64, "h": 28 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 11, "w": 64, "h": 28 },
+    "sourceSize": { "w": 70, "h": 42 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 260, "y": 122, "w": 62, "h": 27 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 10, "w": 62, "h": 27 },
+    "sourceSize": { "w": 70, "h": 42 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 1, "y": 122, "w": 60, "h": 28 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 8, "w": 60, "h": 28 },
+    "sourceSize": { "w": 70, "h": 42 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 62, "y": 124, "w": 57, "h": 29 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 6, "w": 57, "h": 29 },
+    "sourceSize": { "w": 70, "h": 42 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 120, "y": 124, "w": 55, "h": 30 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 4, "w": 55, "h": 30 },
+    "sourceSize": { "w": 70, "h": 42 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 65, "y": 94, "w": 58, "h": 29 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 7, "w": 58, "h": 29 },
+    "sourceSize": { "w": 70, "h": 42 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 124, "y": 95, "w": 60, "h": 28 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 11, "w": 60, "h": 28 },
+    "sourceSize": { "w": 70, "h": 42 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 1, "y": 93, "w": 63, "h": 28 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 14, "w": 63, "h": 28 },
+    "sourceSize": { "w": 70, "h": 42 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 255, "y": 33, "w": 65, "h": 29 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 13, "w": 65, "h": 29 },
+    "sourceSize": { "w": 70, "h": 42 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 1, "y": 33, "w": 67, "h": 30 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 12, "w": 67, "h": 30 },
+    "sourceSize": { "w": 70, "h": 42 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 255, "y": 63, "w": 65, "h": 29 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 65, "h": 29 },
+    "sourceSize": { "w": 70, "h": 42 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 135, "y": 66, "w": 64, "h": 28 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 11, "w": 64, "h": 28 },
+    "sourceSize": { "w": 70, "h": 42 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 185, "y": 123, "w": 62, "h": 27 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 10, "w": 62, "h": 27 },
+    "sourceSize": { "w": 70, "h": 42 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 1, "y": 122, "w": 60, "h": 28 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 8, "w": 60, "h": 28 },
+    "sourceSize": { "w": 70, "h": 42 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 62, "y": 124, "w": 57, "h": 29 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 6, "w": 57, "h": 29 },
+    "sourceSize": { "w": 70, "h": 42 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 120, "y": 124, "w": 55, "h": 30 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 4, "w": 55, "h": 30 },
+    "sourceSize": { "w": 70, "h": 42 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 65, "y": 94, "w": 58, "h": 29 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 7, "w": 58, "h": 29 },
+    "sourceSize": { "w": 70, "h": 42 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 124, "y": 95, "w": 60, "h": 28 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 11, "w": 60, "h": 28 },
+    "sourceSize": { "w": 70, "h": 42 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 1, "y": 93, "w": 63, "h": 28 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 14, "w": 63, "h": 28 },
+    "sourceSize": { "w": 70, "h": 42 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 255, "y": 33, "w": 65, "h": 29 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 13, "w": 65, "h": 29 },
+    "sourceSize": { "w": 70, "h": 42 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 1, "y": 33, "w": 67, "h": 30 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 12, "w": 67, "h": 30 },
+    "sourceSize": { "w": 70, "h": 42 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 255, "y": 63, "w": 65, "h": 29 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 65, "h": 29 },
+    "sourceSize": { "w": 70, "h": 42 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 135, "y": 66, "w": 64, "h": 28 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 11, "w": 64, "h": 28 },
+    "sourceSize": { "w": 70, "h": 42 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 185, "y": 123, "w": 62, "h": 27 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 10, "w": 62, "h": 27 },
+    "sourceSize": { "w": 70, "h": 42 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 1, "y": 122, "w": 60, "h": 28 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 8, "w": 60, "h": 28 },
+    "sourceSize": { "w": 70, "h": 42 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 62, "y": 124, "w": 57, "h": 29 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 6, "w": 57, "h": 29 },
+    "sourceSize": { "w": 70, "h": 42 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 120, "y": 124, "w": 55, "h": 30 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 4, "w": 55, "h": 30 },
+    "sourceSize": { "w": 70, "h": 42 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 200, "y": 93, "w": 59, "h": 29 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 8, "w": 59, "h": 29 },
+    "sourceSize": { "w": 70, "h": 42 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 260, "y": 93, "w": 61, "h": 28 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 11, "w": 61, "h": 28 },
+    "sourceSize": { "w": 70, "h": 42 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 69, "y": 65, "w": 65, "h": 28 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 11, "w": 65, "h": 28 },
+    "sourceSize": { "w": 70, "h": 42 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 1, "y": 64, "w": 67, "h": 28 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 67, "h": 28 },
+    "sourceSize": { "w": 70, "h": 42 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 72, "y": 1, "w": 69, "h": 31 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 69, "h": 31 },
+    "sourceSize": { "w": 70, "h": 42 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 1, "y": 1, "w": 70, "h": 31 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 70, "h": 31 },
+    "sourceSize": { "w": 70, "h": 42 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 142, "y": 1, "w": 69, "h": 31 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 69, "h": 31 },
+    "sourceSize": { "w": 70, "h": 42 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 212, "y": 1, "w": 67, "h": 31 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 67, "h": 31 },
+    "sourceSize": { "w": 70, "h": 42 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 280, "y": 1, "w": 65, "h": 31 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 65, "h": 31 },
+    "sourceSize": { "w": 70, "h": 42 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 131, "y": 33, "w": 63, "h": 30 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 63, "h": 30 },
+    "sourceSize": { "w": 70, "h": 42 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 69, "y": 33, "w": 61, "h": 31 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 61, "h": 31 },
+    "sourceSize": { "w": 70, "h": 42 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 195, "y": 33, "w": 59, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 59, "h": 32 },
+    "sourceSize": { "w": 70, "h": 42 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.13-x64",
+  "image": "2074.png",
+  "format": "I8",
+  "size": { "w": 346, "h": 155 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/2074.png b/public/images/pokemon/exp/2074.png
index 6544f5aeb17..158120ac79f 100644
Binary files a/public/images/pokemon/exp/2074.png and b/public/images/pokemon/exp/2074.png differ
diff --git a/public/images/pokemon/exp/2075.json b/public/images/pokemon/exp/2075.json
index f9619dcf315..e3d08f5fae1 100644
--- a/public/images/pokemon/exp/2075.json
+++ b/public/images/pokemon/exp/2075.json
@@ -1,272 +1,812 @@
-{
-	"textures": [
-		{
-			"image": "2075.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 184,
-				"h": 184
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 87,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 84,
-						"h": 50
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 84,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 87,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 84,
-						"h": 50
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 84,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 87,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 83,
-						"h": 50
-					},
-					"frame": {
-						"x": 84,
-						"y": 0,
-						"w": 83,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 87,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 83,
-						"h": 50
-					},
-					"frame": {
-						"x": 84,
-						"y": 0,
-						"w": 83,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 87,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 0,
-						"w": 82,
-						"h": 51
-					},
-					"frame": {
-						"x": 0,
-						"y": 50,
-						"w": 82,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 87,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 0,
-						"w": 82,
-						"h": 51
-					},
-					"frame": {
-						"x": 0,
-						"y": 50,
-						"w": 82,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 87,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 83,
-						"h": 46
-					},
-					"frame": {
-						"x": 82,
-						"y": 50,
-						"w": 83,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 87,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 83,
-						"h": 46
-					},
-					"frame": {
-						"x": 82,
-						"y": 50,
-						"w": 83,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 87,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 7,
-						"w": 81,
-						"h": 45
-					},
-					"frame": {
-						"x": 82,
-						"y": 96,
-						"w": 81,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 87,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 7,
-						"w": 81,
-						"h": 45
-					},
-					"frame": {
-						"x": 82,
-						"y": 96,
-						"w": 81,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 87,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 80,
-						"h": 51
-					},
-					"frame": {
-						"x": 0,
-						"y": 101,
-						"w": 80,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 87,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 9,
-						"w": 78,
-						"h": 43
-					},
-					"frame": {
-						"x": 80,
-						"y": 141,
-						"w": 78,
-						"h": 43
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:f5372b99c8b100650a10a4e8cc6e059e:c743748b938ba16e4c5253d5c5444252:732805cb123f88b2d403da0dec709706$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 228, "y": 1, "w": 73, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 2, "w": 73, "h": 44 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 448, "y": 1, "w": 72, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 72, "h": 44 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 146, "y": 90, "w": 71, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 71, "h": 43 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 363, "y": 91, "w": 69, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 1, "w": 69, "h": 44 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 147, "y": 223, "w": 65, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 0, "w": 65, "h": 44 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 363, "y": 91, "w": 69, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 1, "w": 69, "h": 44 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 146, "y": 90, "w": 71, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 71, "h": 43 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 448, "y": 1, "w": 72, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 72, "h": 44 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 228, "y": 1, "w": 73, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 2, "w": 73, "h": 44 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 1, "y": 1, "w": 75, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 2, "w": 75, "h": 44 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 77, "y": 1, "w": 75, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 75, "h": 44 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 153, "y": 1, "w": 74, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 74, "h": 44 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 302, "y": 1, "w": 73, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 73, "h": 44 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 153, "y": 1, "w": 74, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 74, "h": 44 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 77, "y": 1, "w": 75, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 75, "h": 44 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 1, "y": 1, "w": 75, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 2, "w": 75, "h": 44 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 228, "y": 1, "w": 73, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 2, "w": 73, "h": 44 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 448, "y": 1, "w": 72, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 72, "h": 44 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 146, "y": 90, "w": 71, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 71, "h": 43 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 363, "y": 91, "w": 69, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 1, "w": 69, "h": 44 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 147, "y": 223, "w": 65, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 0, "w": 65, "h": 44 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 363, "y": 91, "w": 69, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 1, "w": 69, "h": 44 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 146, "y": 90, "w": 71, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 71, "h": 43 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 448, "y": 1, "w": 72, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 72, "h": 44 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 228, "y": 1, "w": 73, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 2, "w": 73, "h": 44 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 1, "y": 1, "w": 75, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 2, "w": 75, "h": 44 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 77, "y": 1, "w": 75, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 75, "h": 44 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 153, "y": 1, "w": 74, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 74, "h": 44 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 302, "y": 1, "w": 73, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 73, "h": 44 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 153, "y": 1, "w": 74, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 74, "h": 44 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 77, "y": 1, "w": 75, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 75, "h": 44 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 1, "y": 1, "w": 75, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 2, "w": 75, "h": 44 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 228, "y": 1, "w": 73, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 2, "w": 73, "h": 44 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 448, "y": 1, "w": 72, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 72, "h": 44 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 146, "y": 90, "w": 71, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 71, "h": 43 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 363, "y": 91, "w": 69, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 1, "w": 69, "h": 44 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 147, "y": 223, "w": 65, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 0, "w": 65, "h": 44 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 363, "y": 91, "w": 69, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 1, "w": 69, "h": 44 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 146, "y": 90, "w": 71, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 71, "h": 43 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 448, "y": 1, "w": 72, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 72, "h": 44 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 228, "y": 1, "w": 73, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 2, "w": 73, "h": 44 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 1, "y": 1, "w": 75, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 2, "w": 75, "h": 44 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 77, "y": 1, "w": 75, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 75, "h": 44 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 153, "y": 1, "w": 74, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 74, "h": 44 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 302, "y": 1, "w": 73, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 73, "h": 44 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 153, "y": 1, "w": 74, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 74, "h": 44 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 77, "y": 1, "w": 75, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 75, "h": 44 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 1, "y": 1, "w": 75, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 2, "w": 75, "h": 44 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 228, "y": 1, "w": 73, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 2, "w": 73, "h": 44 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 440, "y": 89, "w": 73, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 73, "h": 42 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 363, "y": 173, "w": 73, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 4, "w": 73, "h": 40 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 363, "y": 173, "w": 73, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 73, "h": 40 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 363, "y": 173, "w": 73, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 4, "w": 73, "h": 40 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 437, "y": 173, "w": 73, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 4, "w": 73, "h": 40 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 1, "y": 174, "w": 73, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 4, "w": 73, "h": 40 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 433, "y": 132, "w": 74, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 4, "w": 74, "h": 40 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 75, "y": 176, "w": 73, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 73, "h": 40 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 448, "y": 46, "w": 74, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 74, "h": 42 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 367, "y": 47, "w": 72, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 72, "h": 43 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 220, "y": 46, "w": 71, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 71, "h": 44 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 376, "y": 1, "w": 71, "h": 45 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 71, "h": 45 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 1, "y": 46, "w": 70, "h": 45 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 70, "h": 45 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 292, "y": 89, "w": 70, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 70, "h": 44 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 218, "y": 91, "w": 71, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 71, "h": 43 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 146, "y": 46, "w": 73, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 73, "h": 43 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 292, "y": 46, "w": 74, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 74, "h": 42 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 218, "y": 176, "w": 73, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 73, "h": 40 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 1, "y": 133, "w": 74, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 74, "h": 40 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 292, "y": 214, "w": 73, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 4, "w": 73, "h": 40 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 366, "y": 214, "w": 73, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 4, "w": 73, "h": 40 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 1, "y": 215, "w": 72, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 4, "w": 72, "h": 40 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 1, "y": 256, "w": 72, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 4, "w": 72, "h": 39 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 213, "y": 259, "w": 71, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 4, "w": 71, "h": 39 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 218, "y": 135, "w": 71, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 4, "w": 71, "h": 40 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 353, "y": 255, "w": 69, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 3, "w": 69, "h": 41 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 149, "y": 134, "w": 68, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 16, "y": 2, "w": 68, "h": 43 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 149, "y": 178, "w": 66, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 1, "w": 66, "h": 44 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 287, "y": 255, "w": 65, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 19, "y": 1, "w": 65, "h": 44 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 440, "y": 214, "w": 67, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 17, "y": 2, "w": 67, "h": 43 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 423, "y": 258, "w": 68, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 3, "w": 68, "h": 41 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 216, "y": 217, "w": 70, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 3, "w": 70, "h": 41 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 1, "y": 92, "w": 70, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 4, "w": 70, "h": 39 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 74, "y": 258, "w": 72, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 4, "w": 72, "h": 39 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 74, "y": 217, "w": 72, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 4, "w": 72, "h": 40 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 76, "y": 134, "w": 72, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 4, "w": 72, "h": 41 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 290, "y": 134, "w": 72, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 4, "w": 72, "h": 41 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 72, "y": 90, "w": 73, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 4, "w": 73, "h": 42 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0088.png",
+    "frame": { "x": 72, "y": 46, "w": 73, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 73, "h": 43 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0089.png",
+    "frame": { "x": 228, "y": 1, "w": 73, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 2, "w": 73, "h": 44 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.13-x64",
+  "image": "2075.png",
+  "format": "I8",
+  "size": { "w": 523, "h": 300 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/2075.png b/public/images/pokemon/exp/2075.png
index b3d72062e64..243be9bb7b0 100644
Binary files a/public/images/pokemon/exp/2075.png and b/public/images/pokemon/exp/2075.png differ
diff --git a/public/images/pokemon/exp/2076.json b/public/images/pokemon/exp/2076.json
index 7a69b66c3e0..c0f495bcca0 100644
--- a/public/images/pokemon/exp/2076.json
+++ b/public/images/pokemon/exp/2076.json
@@ -1,272 +1,965 @@
-{
-	"textures": [
-		{
-			"image": "2076.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 204,
-				"h": 204
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 62,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 60,
-						"h": 73
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 60,
-						"h": 73
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 62,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 60,
-						"h": 73
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 60,
-						"h": 73
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 62,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 58,
-						"h": 73
-					},
-					"frame": {
-						"x": 0,
-						"y": 73,
-						"w": 58,
-						"h": 73
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 62,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 58,
-						"h": 73
-					},
-					"frame": {
-						"x": 0,
-						"y": 73,
-						"w": 58,
-						"h": 73
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 62,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 0,
-						"w": 58,
-						"h": 73
-					},
-					"frame": {
-						"x": 58,
-						"y": 73,
-						"w": 58,
-						"h": 73
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 62,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 0,
-						"w": 58,
-						"h": 73
-					},
-					"frame": {
-						"x": 58,
-						"y": 73,
-						"w": 58,
-						"h": 73
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 62,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 0,
-						"w": 57,
-						"h": 73
-					},
-					"frame": {
-						"x": 60,
-						"y": 0,
-						"w": 57,
-						"h": 73
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 62,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 56,
-						"h": 70
-					},
-					"frame": {
-						"x": 117,
-						"y": 0,
-						"w": 56,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 62,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 56,
-						"h": 70
-					},
-					"frame": {
-						"x": 117,
-						"y": 0,
-						"w": 56,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 62,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 56,
-						"h": 68
-					},
-					"frame": {
-						"x": 117,
-						"y": 70,
-						"w": 56,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 62,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 56,
-						"h": 68
-					},
-					"frame": {
-						"x": 117,
-						"y": 70,
-						"w": 56,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 62,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 56,
-						"h": 66
-					},
-					"frame": {
-						"x": 116,
-						"y": 138,
-						"w": 56,
-						"h": 66
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:66d4eb31967e6cdb8dd33a8c1e1b838e:7d44749d00b35e3fbdae08d5a062828f:719cdf7324091edbb7b1d6e2d7254a1a$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 341, "y": 346, "w": 54, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 54, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 411, "y": 71, "w": 54, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 54, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 410, "y": 207, "w": 55, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 55, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 353, "y": 207, "w": 56, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 56, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 118, "y": 208, "w": 56, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 56, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 177, "y": 70, "w": 57, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 57, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 235, "y": 70, "w": 57, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 57, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 60, "y": 207, "w": 57, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 57, "h": 68 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 237, "y": 207, "w": 57, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 57, "h": 68 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 237, "y": 1, "w": 58, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 58, "h": 68 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 119, "y": 1, "w": 58, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 58, "h": 68 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 354, "y": 1, "w": 57, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 57, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 119, "y": 70, "w": 57, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 57, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 403, "y": 277, "w": 55, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 55, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 117, "y": 278, "w": 55, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 55, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 396, "y": 347, "w": 54, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 54, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 341, "y": 346, "w": 54, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 54, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 411, "y": 71, "w": 54, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 54, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 410, "y": 207, "w": 55, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 55, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 353, "y": 207, "w": 56, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 56, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 118, "y": 208, "w": 56, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 56, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 177, "y": 70, "w": 57, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 57, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 235, "y": 70, "w": 57, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 57, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 60, "y": 207, "w": 57, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 57, "h": 68 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 237, "y": 207, "w": 57, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 57, "h": 68 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 237, "y": 1, "w": 58, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 58, "h": 68 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 119, "y": 1, "w": 58, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 58, "h": 68 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 354, "y": 1, "w": 57, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 57, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 119, "y": 70, "w": 57, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 57, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 403, "y": 277, "w": 55, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 55, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 117, "y": 278, "w": 55, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 55, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 396, "y": 347, "w": 54, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 54, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 341, "y": 346, "w": 54, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 54, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 411, "y": 71, "w": 54, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 54, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 410, "y": 207, "w": 55, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 55, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 353, "y": 207, "w": 56, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 56, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 118, "y": 208, "w": 56, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 56, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 177, "y": 70, "w": 57, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 57, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 235, "y": 70, "w": 57, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 57, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 60, "y": 207, "w": 57, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 57, "h": 68 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 237, "y": 207, "w": 57, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 57, "h": 68 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 237, "y": 1, "w": 58, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 58, "h": 68 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 119, "y": 1, "w": 58, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 58, "h": 68 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 354, "y": 1, "w": 57, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 57, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 119, "y": 70, "w": 57, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 57, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 403, "y": 277, "w": 55, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 55, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 117, "y": 278, "w": 55, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 55, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 396, "y": 347, "w": 54, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 54, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 341, "y": 346, "w": 54, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 54, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 411, "y": 71, "w": 54, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 54, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 410, "y": 207, "w": 55, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 55, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 353, "y": 207, "w": 56, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 56, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 118, "y": 208, "w": 56, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 56, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 177, "y": 70, "w": 57, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 57, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 235, "y": 70, "w": 57, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 57, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 60, "y": 207, "w": 57, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 57, "h": 68 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 237, "y": 207, "w": 57, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 57, "h": 68 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 237, "y": 1, "w": 58, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 58, "h": 68 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 119, "y": 1, "w": 58, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 58, "h": 68 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 354, "y": 1, "w": 57, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 57, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 119, "y": 70, "w": 57, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 57, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 403, "y": 277, "w": 55, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 55, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 117, "y": 278, "w": 55, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 55, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 396, "y": 347, "w": 54, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 54, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 114, "y": 348, "w": 54, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 54, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 175, "y": 208, "w": 56, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 56, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 293, "y": 71, "w": 58, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 58, "h": 67 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 60, "y": 1, "w": 58, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 58, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 57, "y": 344, "w": 56, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 56, "h": 67 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 412, "y": 1, "w": 53, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 7, "w": 53, "h": 67 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 169, "y": 348, "w": 54, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 54, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 1, "y": 343, "w": 55, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 55, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 173, "y": 278, "w": 55, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 55, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 296, "y": 1, "w": 57, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 57, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 1, "y": 1, "w": 58, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 58, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 295, "y": 207, "w": 57, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 6, "w": 57, "h": 68 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 178, "y": 1, "w": 58, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 58, "h": 68 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 352, "y": 71, "w": 58, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 58, "h": 67 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 352, "y": 71, "w": 58, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 58, "h": 67 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 1, "y": 139, "w": 58, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 58, "h": 67 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 1, "y": 139, "w": 58, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 58, "h": 67 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 60, "y": 139, "w": 58, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 58, "h": 67 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 60, "y": 139, "w": 58, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 58, "h": 67 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 293, "y": 139, "w": 58, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 58, "h": 67 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 293, "y": 139, "w": 58, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 58, "h": 67 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 352, "y": 139, "w": 58, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 58, "h": 67 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 352, "y": 139, "w": 58, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 58, "h": 67 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0088.png",
+    "frame": { "x": 352, "y": 139, "w": 58, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 58, "h": 67 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0089.png",
+    "frame": { "x": 119, "y": 140, "w": 58, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 58, "h": 67 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0090.png",
+    "frame": { "x": 178, "y": 140, "w": 58, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 58, "h": 67 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0091.png",
+    "frame": { "x": 1, "y": 207, "w": 58, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 58, "h": 67 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0092.png",
+    "frame": { "x": 1, "y": 71, "w": 58, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 58, "h": 67 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0093.png",
+    "frame": { "x": 1, "y": 207, "w": 58, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 58, "h": 67 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0094.png",
+    "frame": { "x": 1, "y": 71, "w": 58, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 58, "h": 67 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0095.png",
+    "frame": { "x": 1, "y": 207, "w": 58, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 58, "h": 67 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0096.png",
+    "frame": { "x": 1, "y": 71, "w": 58, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 58, "h": 67 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0097.png",
+    "frame": { "x": 1, "y": 207, "w": 58, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 58, "h": 67 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0098.png",
+    "frame": { "x": 60, "y": 71, "w": 58, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 58, "h": 67 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0099.png",
+    "frame": { "x": 1, "y": 275, "w": 57, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 57, "h": 67 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0100.png",
+    "frame": { "x": 59, "y": 276, "w": 57, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 57, "h": 67 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0101.png",
+    "frame": { "x": 232, "y": 276, "w": 56, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 6, "w": 56, "h": 68 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0102.png",
+    "frame": { "x": 289, "y": 276, "w": 56, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 6, "w": 56, "h": 68 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0103.png",
+    "frame": { "x": 346, "y": 277, "w": 56, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 6, "w": 56, "h": 68 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0104.png",
+    "frame": { "x": 229, "y": 345, "w": 55, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 55, "h": 68 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0105.png",
+    "frame": { "x": 285, "y": 345, "w": 55, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 55, "h": 68 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0106.png",
+    "frame": { "x": 57, "y": 412, "w": 54, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 6, "w": 54, "h": 68 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.13-x64",
+  "image": "2076.png",
+  "format": "I8",
+  "size": { "w": 466, "h": 481 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/2076.png b/public/images/pokemon/exp/2076.png
index 5bd0c466464..f1fcda5113f 100644
Binary files a/public/images/pokemon/exp/2076.png and b/public/images/pokemon/exp/2076.png differ
diff --git a/public/images/pokemon/exp/2088.json b/public/images/pokemon/exp/2088.json
index e209e005822..3dc69f1024c 100644
--- a/public/images/pokemon/exp/2088.json
+++ b/public/images/pokemon/exp/2088.json
@@ -1,272 +1,173 @@
-{
-	"textures": [
-		{
-			"image": "2088.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 114,
-				"h": 114
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 60,
-						"h": 37
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 60,
-						"h": 36
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 60,
-						"h": 36
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 60,
-						"h": 37
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 60,
-						"h": 36
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 60,
-						"h": 36
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 60,
-						"h": 37
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 60,
-						"h": 36
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 60,
-						"h": 36
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 60,
-						"h": 37
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 60,
-						"h": 36
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 60,
-						"h": 36
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 60,
-						"h": 37
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 58,
-						"h": 37
-					},
-					"frame": {
-						"x": 0,
-						"y": 36,
-						"w": 58,
-						"h": 37
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 60,
-						"h": 37
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 58,
-						"h": 37
-					},
-					"frame": {
-						"x": 0,
-						"y": 36,
-						"w": 58,
-						"h": 37
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 60,
-						"h": 37
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 58,
-						"h": 37
-					},
-					"frame": {
-						"x": 0,
-						"y": 36,
-						"w": 58,
-						"h": 37
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 60,
-						"h": 37
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 58,
-						"h": 37
-					},
-					"frame": {
-						"x": 0,
-						"y": 36,
-						"w": 58,
-						"h": 37
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 60,
-						"h": 37
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 56,
-						"h": 37
-					},
-					"frame": {
-						"x": 58,
-						"y": 36,
-						"w": 56,
-						"h": 37
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 60,
-						"h": 37
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 56,
-						"h": 37
-					},
-					"frame": {
-						"x": 58,
-						"y": 36,
-						"w": 56,
-						"h": 37
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 60,
-						"h": 37
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 60,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 73,
-						"w": 60,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 60,
-						"h": 37
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 60,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 73,
-						"w": 60,
-						"h": 35
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:7d65358280b6fd8fd0351d1933aec389:4371ea558d78deb87b5511996f658c0c:b8df8f168871505f42fdc6d3c5b106f0$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 53, "y": 114, "w": 51, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 51, "h": 40 },
+    "sourceSize": { "w": 61, "h": 40 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 231, "y": 75, "w": 52, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 52, "h": 40 },
+    "sourceSize": { "w": 61, "h": 40 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 111, "y": 79, "w": 53, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 53, "h": 39 },
+    "sourceSize": { "w": 61, "h": 40 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 57, "y": 75, "w": 54, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 54, "h": 39 },
+    "sourceSize": { "w": 61, "h": 40 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 234, "y": 36, "w": 56, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 56, "h": 39 },
+    "sourceSize": { "w": 61, "h": 40 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 0, "y": 75, "w": 57, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 57, "h": 37 },
+    "sourceSize": { "w": 61, "h": 40 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 59, "y": 38, "w": 58, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 58, "h": 37 },
+    "sourceSize": { "w": 61, "h": 40 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 0, "y": 38, "w": 59, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 59, "h": 37 },
+    "sourceSize": { "w": 61, "h": 40 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 234, "y": 0, "w": 61, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 61, "h": 36 },
+    "sourceSize": { "w": 61, "h": 40 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 0, "y": 0, "w": 60, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 60, "h": 38 },
+    "sourceSize": { "w": 61, "h": 40 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 60, "y": 0, "w": 59, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 59, "h": 38 },
+    "sourceSize": { "w": 61, "h": 40 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 176, "y": 0, "w": 58, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 58, "h": 38 },
+    "sourceSize": { "w": 61, "h": 40 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 119, "y": 0, "w": 57, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 57, "h": 39 },
+    "sourceSize": { "w": 61, "h": 40 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 176, "y": 38, "w": 55, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 55, "h": 39 },
+    "sourceSize": { "w": 61, "h": 40 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 0, "y": 112, "w": 53, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 53, "h": 39 },
+    "sourceSize": { "w": 61, "h": 40 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 117, "y": 39, "w": 53, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 53, "h": 40 },
+    "sourceSize": { "w": 61, "h": 40 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 170, "y": 77, "w": 52, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 52, "h": 40 },
+    "sourceSize": { "w": 61, "h": 40 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 222, "y": 115, "w": 51, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 51, "h": 40 },
+    "sourceSize": { "w": 61, "h": 40 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.13-x64",
+  "image": "2088.png",
+  "format": "I8",
+  "size": { "w": 295, "h": 155 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/2088.png b/public/images/pokemon/exp/2088.png
index 1f40127c1c7..71ddd8a7e15 100644
Binary files a/public/images/pokemon/exp/2088.png and b/public/images/pokemon/exp/2088.png differ
diff --git a/public/images/pokemon/exp/2089.json b/public/images/pokemon/exp/2089.json
index 363c17843e8..3f8b618af75 100644
--- a/public/images/pokemon/exp/2089.json
+++ b/public/images/pokemon/exp/2089.json
@@ -1,1343 +1,1091 @@
-{
-	"textures": [
-		{
-			"image": "2089.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 349,
-				"h": 349
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 8,
-						"w": 94,
-						"h": 58
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 94,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 8,
-						"w": 94,
-						"h": 58
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 94,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0030.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 8,
-						"w": 94,
-						"h": 58
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 94,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0043.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 8,
-						"w": 94,
-						"h": 58
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 94,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 6,
-						"w": 92,
-						"h": 60
-					},
-					"frame": {
-						"x": 94,
-						"y": 0,
-						"w": 92,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 6,
-						"w": 92,
-						"h": 60
-					},
-					"frame": {
-						"x": 94,
-						"y": 0,
-						"w": 92,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0029.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 6,
-						"w": 92,
-						"h": 60
-					},
-					"frame": {
-						"x": 94,
-						"y": 0,
-						"w": 92,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0042.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 6,
-						"w": 92,
-						"h": 60
-					},
-					"frame": {
-						"x": 94,
-						"y": 0,
-						"w": 92,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 5,
-						"w": 91,
-						"h": 61
-					},
-					"frame": {
-						"x": 0,
-						"y": 58,
-						"w": 91,
-						"h": 61
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 5,
-						"w": 91,
-						"h": 61
-					},
-					"frame": {
-						"x": 0,
-						"y": 58,
-						"w": 91,
-						"h": 61
-					}
-				},
-				{
-					"filename": "0031.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 5,
-						"w": 91,
-						"h": 61
-					},
-					"frame": {
-						"x": 0,
-						"y": 58,
-						"w": 91,
-						"h": 61
-					}
-				},
-				{
-					"filename": "0044.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 5,
-						"w": 91,
-						"h": 61
-					},
-					"frame": {
-						"x": 0,
-						"y": 58,
-						"w": 91,
-						"h": 61
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 4,
-						"w": 90,
-						"h": 63
-					},
-					"frame": {
-						"x": 186,
-						"y": 0,
-						"w": 90,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 4,
-						"w": 90,
-						"h": 63
-					},
-					"frame": {
-						"x": 186,
-						"y": 0,
-						"w": 90,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0032.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 4,
-						"w": 90,
-						"h": 63
-					},
-					"frame": {
-						"x": 186,
-						"y": 0,
-						"w": 90,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0045.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 4,
-						"w": 90,
-						"h": 63
-					},
-					"frame": {
-						"x": 186,
-						"y": 0,
-						"w": 90,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 5,
-						"w": 90,
-						"h": 61
-					},
-					"frame": {
-						"x": 91,
-						"y": 60,
-						"w": 90,
-						"h": 61
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 5,
-						"w": 90,
-						"h": 61
-					},
-					"frame": {
-						"x": 91,
-						"y": 60,
-						"w": 90,
-						"h": 61
-					}
-				},
-				{
-					"filename": "0028.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 5,
-						"w": 90,
-						"h": 61
-					},
-					"frame": {
-						"x": 91,
-						"y": 60,
-						"w": 90,
-						"h": 61
-					}
-				},
-				{
-					"filename": "0041.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 5,
-						"w": 90,
-						"h": 61
-					},
-					"frame": {
-						"x": 91,
-						"y": 60,
-						"w": 90,
-						"h": 61
-					}
-				},
-				{
-					"filename": "0058.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 89,
-						"h": 60
-					},
-					"frame": {
-						"x": 0,
-						"y": 119,
-						"w": 89,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0057.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 89,
-						"h": 59
-					},
-					"frame": {
-						"x": 181,
-						"y": 63,
-						"w": 89,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0059.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 89,
-						"h": 59
-					},
-					"frame": {
-						"x": 181,
-						"y": 63,
-						"w": 89,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0055.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 8,
-						"w": 89,
-						"h": 58
-					},
-					"frame": {
-						"x": 89,
-						"y": 121,
-						"w": 89,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0061.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 8,
-						"w": 89,
-						"h": 58
-					},
-					"frame": {
-						"x": 89,
-						"y": 121,
-						"w": 89,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0056.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 8,
-						"w": 89,
-						"h": 58
-					},
-					"frame": {
-						"x": 178,
-						"y": 122,
-						"w": 89,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0060.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 8,
-						"w": 89,
-						"h": 58
-					},
-					"frame": {
-						"x": 178,
-						"y": 122,
-						"w": 89,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 2,
-						"w": 82,
-						"h": 64
-					},
-					"frame": {
-						"x": 267,
-						"y": 122,
-						"w": 82,
-						"h": 64
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 2,
-						"w": 82,
-						"h": 64
-					},
-					"frame": {
-						"x": 267,
-						"y": 122,
-						"w": 82,
-						"h": 64
-					}
-				},
-				{
-					"filename": "0037.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 2,
-						"w": 82,
-						"h": 64
-					},
-					"frame": {
-						"x": 267,
-						"y": 122,
-						"w": 82,
-						"h": 64
-					}
-				},
-				{
-					"filename": "0050.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 2,
-						"w": 82,
-						"h": 64
-					},
-					"frame": {
-						"x": 267,
-						"y": 122,
-						"w": 82,
-						"h": 64
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 2,
-						"w": 88,
-						"h": 65
-					},
-					"frame": {
-						"x": 0,
-						"y": 179,
-						"w": 88,
-						"h": 65
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 2,
-						"w": 88,
-						"h": 65
-					},
-					"frame": {
-						"x": 0,
-						"y": 179,
-						"w": 88,
-						"h": 65
-					}
-				},
-				{
-					"filename": "0033.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 2,
-						"w": 88,
-						"h": 65
-					},
-					"frame": {
-						"x": 0,
-						"y": 179,
-						"w": 88,
-						"h": 65
-					}
-				},
-				{
-					"filename": "0046.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 2,
-						"w": 88,
-						"h": 65
-					},
-					"frame": {
-						"x": 0,
-						"y": 179,
-						"w": 88,
-						"h": 65
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 5,
-						"w": 88,
-						"h": 61
-					},
-					"frame": {
-						"x": 88,
-						"y": 179,
-						"w": 88,
-						"h": 61
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 5,
-						"w": 88,
-						"h": 61
-					},
-					"frame": {
-						"x": 88,
-						"y": 179,
-						"w": 88,
-						"h": 61
-					}
-				},
-				{
-					"filename": "0027.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 5,
-						"w": 88,
-						"h": 61
-					},
-					"frame": {
-						"x": 88,
-						"y": 179,
-						"w": 88,
-						"h": 61
-					}
-				},
-				{
-					"filename": "0040.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 5,
-						"w": 88,
-						"h": 61
-					},
-					"frame": {
-						"x": 88,
-						"y": 179,
-						"w": 88,
-						"h": 61
-					}
-				},
-				{
-					"filename": "0053.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 5,
-						"w": 88,
-						"h": 61
-					},
-					"frame": {
-						"x": 88,
-						"y": 179,
-						"w": 88,
-						"h": 61
-					}
-				},
-				{
-					"filename": "0063.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 5,
-						"w": 88,
-						"h": 61
-					},
-					"frame": {
-						"x": 88,
-						"y": 179,
-						"w": 88,
-						"h": 61
-					}
-				},
-				{
-					"filename": "0054.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 6,
-						"w": 88,
-						"h": 60
-					},
-					"frame": {
-						"x": 176,
-						"y": 180,
-						"w": 88,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0062.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 6,
-						"w": 88,
-						"h": 60
-					},
-					"frame": {
-						"x": 176,
-						"y": 180,
-						"w": 88,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 85,
-						"h": 67
-					},
-					"frame": {
-						"x": 264,
-						"y": 186,
-						"w": 85,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 85,
-						"h": 67
-					},
-					"frame": {
-						"x": 264,
-						"y": 186,
-						"w": 85,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0034.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 85,
-						"h": 67
-					},
-					"frame": {
-						"x": 264,
-						"y": 186,
-						"w": 85,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0047.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 85,
-						"h": 67
-					},
-					"frame": {
-						"x": 264,
-						"y": 186,
-						"w": 85,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 83,
-						"h": 66
-					},
-					"frame": {
-						"x": 0,
-						"y": 253,
-						"w": 83,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 83,
-						"h": 66
-					},
-					"frame": {
-						"x": 0,
-						"y": 253,
-						"w": 83,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0035.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 83,
-						"h": 66
-					},
-					"frame": {
-						"x": 0,
-						"y": 253,
-						"w": 83,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0048.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 83,
-						"h": 66
-					},
-					"frame": {
-						"x": 0,
-						"y": 253,
-						"w": 83,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 83,
-						"h": 66
-					},
-					"frame": {
-						"x": 83,
-						"y": 253,
-						"w": 83,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 83,
-						"h": 66
-					},
-					"frame": {
-						"x": 83,
-						"y": 253,
-						"w": 83,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0036.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 83,
-						"h": 66
-					},
-					"frame": {
-						"x": 83,
-						"y": 253,
-						"w": 83,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0049.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 83,
-						"h": 66
-					},
-					"frame": {
-						"x": 83,
-						"y": 253,
-						"w": 83,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 86,
-						"h": 62
-					},
-					"frame": {
-						"x": 166,
-						"y": 240,
-						"w": 86,
-						"h": 62
-					}
-				},
-				{
-					"filename": "0026.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 86,
-						"h": 62
-					},
-					"frame": {
-						"x": 166,
-						"y": 240,
-						"w": 86,
-						"h": 62
-					}
-				},
-				{
-					"filename": "0039.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 86,
-						"h": 62
-					},
-					"frame": {
-						"x": 166,
-						"y": 240,
-						"w": 86,
-						"h": 62
-					}
-				},
-				{
-					"filename": "0052.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 86,
-						"h": 62
-					},
-					"frame": {
-						"x": 166,
-						"y": 240,
-						"w": 86,
-						"h": 62
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 84,
-						"h": 63
-					},
-					"frame": {
-						"x": 252,
-						"y": 253,
-						"w": 84,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0025.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 84,
-						"h": 63
-					},
-					"frame": {
-						"x": 252,
-						"y": 253,
-						"w": 84,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0038.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 84,
-						"h": 63
-					},
-					"frame": {
-						"x": 252,
-						"y": 253,
-						"w": 84,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0051.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 84,
-						"h": 63
-					},
-					"frame": {
-						"x": 252,
-						"y": 253,
-						"w": 84,
-						"h": 63
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:4b0a68b63523081f6420f4bbdbf7eb38:c61a79944d0322548ea0e1b404a63e40:49ee9ed0dd32c5ba33977741b45fc3f4$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 463, "y": 58, "w": 73, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 73, "h": 64 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 536, "y": 58, "w": 73, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 73, "h": 64 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 151, "y": 61, "w": 73, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 73, "h": 64 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 370, "y": 61, "w": 75, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 75, "h": 62 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 236, "y": 125, "w": 76, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 76, "h": 61 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 1, "y": 183, "w": 77, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 77, "h": 60 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 151, "y": 1, "w": 78, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 78, "h": 60 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 76, "y": 125, "w": 80, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 80, "h": 58 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 540, "y": 238, "w": 81, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 81, "h": 57 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 463, "y": 1, "w": 82, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 82, "h": 57 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 445, "y": 122, "w": 83, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 8, "w": 83, "h": 56 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 499, "y": 295, "w": 83, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 9, "w": 83, "h": 55 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 333, "y": 295, "w": 83, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 9, "w": 83, "h": 55 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 250, "y": 295, "w": 83, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 9, "w": 83, "h": 55 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 167, "y": 243, "w": 83, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 9, "w": 83, "h": 55 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 84, "y": 243, "w": 83, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 9, "w": 83, "h": 55 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 1, "y": 243, "w": 83, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 9, "w": 83, "h": 55 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 321, "y": 239, "w": 82, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 8, "w": 82, "h": 56 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 78, "y": 183, "w": 81, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 81, "h": 57 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 250, "y": 350, "w": 80, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 80, "h": 57 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 488, "y": 350, "w": 78, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 6, "w": 78, "h": 58 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 385, "y": 1, "w": 78, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 78, "h": 60 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 312, "y": 125, "w": 76, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 76, "h": 61 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 76, "y": 1, "w": 75, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 75, "h": 63 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 463, "y": 58, "w": 73, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 73, "h": 64 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 536, "y": 58, "w": 73, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 73, "h": 64 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 151, "y": 61, "w": 73, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 73, "h": 64 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 370, "y": 61, "w": 75, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 75, "h": 62 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 236, "y": 125, "w": 76, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 76, "h": 61 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 1, "y": 183, "w": 77, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 77, "h": 60 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 151, "y": 1, "w": 78, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 78, "h": 60 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 76, "y": 125, "w": 80, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 80, "h": 58 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 540, "y": 238, "w": 81, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 81, "h": 57 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 463, "y": 1, "w": 82, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 82, "h": 57 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 445, "y": 122, "w": 83, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 8, "w": 83, "h": 56 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 499, "y": 295, "w": 83, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 9, "w": 83, "h": 55 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 333, "y": 295, "w": 83, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 9, "w": 83, "h": 55 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 250, "y": 295, "w": 83, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 9, "w": 83, "h": 55 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 167, "y": 243, "w": 83, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 9, "w": 83, "h": 55 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 84, "y": 243, "w": 83, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 9, "w": 83, "h": 55 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 1, "y": 243, "w": 83, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 9, "w": 83, "h": 55 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 321, "y": 239, "w": 82, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 8, "w": 82, "h": 56 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 78, "y": 183, "w": 81, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 81, "h": 57 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 250, "y": 350, "w": 80, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 80, "h": 57 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 488, "y": 350, "w": 78, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 6, "w": 78, "h": 58 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 385, "y": 1, "w": 78, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 78, "h": 60 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 312, "y": 125, "w": 76, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 76, "h": 61 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 76, "y": 1, "w": 75, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 75, "h": 63 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 463, "y": 58, "w": 73, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 73, "h": 64 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 536, "y": 58, "w": 73, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 73, "h": 64 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 151, "y": 61, "w": 73, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 73, "h": 64 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 370, "y": 61, "w": 75, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 75, "h": 62 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 236, "y": 125, "w": 76, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 76, "h": 61 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 1, "y": 183, "w": 77, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 77, "h": 60 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 151, "y": 1, "w": 78, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 78, "h": 60 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 76, "y": 125, "w": 80, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 80, "h": 58 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 540, "y": 238, "w": 81, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 81, "h": 57 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 463, "y": 1, "w": 82, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 82, "h": 57 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 445, "y": 122, "w": 83, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 8, "w": 83, "h": 56 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 499, "y": 295, "w": 83, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 9, "w": 83, "h": 55 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 333, "y": 295, "w": 83, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 9, "w": 83, "h": 55 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 250, "y": 295, "w": 83, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 9, "w": 83, "h": 55 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 167, "y": 243, "w": 83, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 9, "w": 83, "h": 55 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 84, "y": 243, "w": 83, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 9, "w": 83, "h": 55 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 1, "y": 243, "w": 83, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 9, "w": 83, "h": 55 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 321, "y": 239, "w": 82, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 8, "w": 82, "h": 56 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 78, "y": 183, "w": 81, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 81, "h": 57 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 250, "y": 350, "w": 80, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 80, "h": 57 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 488, "y": 350, "w": 78, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 6, "w": 78, "h": 58 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 385, "y": 1, "w": 78, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 78, "h": 60 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 312, "y": 125, "w": 76, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 76, "h": 61 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 76, "y": 1, "w": 75, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 75, "h": 63 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 463, "y": 58, "w": 73, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 73, "h": 64 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 536, "y": 58, "w": 73, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 73, "h": 64 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 151, "y": 61, "w": 73, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 73, "h": 64 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 370, "y": 61, "w": 75, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 75, "h": 62 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 236, "y": 125, "w": 76, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 76, "h": 61 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 1, "y": 183, "w": 77, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 77, "h": 60 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 151, "y": 1, "w": 78, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 78, "h": 60 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 76, "y": 125, "w": 80, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 80, "h": 58 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 540, "y": 238, "w": 81, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 81, "h": 57 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 463, "y": 1, "w": 82, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 82, "h": 57 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 445, "y": 122, "w": 83, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 8, "w": 83, "h": 56 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 499, "y": 295, "w": 83, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 9, "w": 83, "h": 55 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 333, "y": 295, "w": 83, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 9, "w": 83, "h": 55 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 250, "y": 295, "w": 83, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 9, "w": 83, "h": 55 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 167, "y": 243, "w": 83, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 9, "w": 83, "h": 55 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0088.png",
+    "frame": { "x": 84, "y": 243, "w": 83, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 9, "w": 83, "h": 55 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0089.png",
+    "frame": { "x": 1, "y": 243, "w": 83, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 9, "w": 83, "h": 55 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0090.png",
+    "frame": { "x": 321, "y": 239, "w": 82, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 8, "w": 82, "h": 56 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0091.png",
+    "frame": { "x": 78, "y": 183, "w": 81, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 81, "h": 57 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0092.png",
+    "frame": { "x": 250, "y": 350, "w": 80, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 80, "h": 57 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0093.png",
+    "frame": { "x": 488, "y": 350, "w": 78, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 6, "w": 78, "h": 58 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0094.png",
+    "frame": { "x": 385, "y": 1, "w": 78, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 78, "h": 60 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0095.png",
+    "frame": { "x": 312, "y": 125, "w": 76, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 76, "h": 61 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0096.png",
+    "frame": { "x": 76, "y": 1, "w": 75, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 75, "h": 63 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0097.png",
+    "frame": { "x": 463, "y": 58, "w": 73, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 73, "h": 64 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0098.png",
+    "frame": { "x": 297, "y": 61, "w": 73, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 73, "h": 64 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0099.png",
+    "frame": { "x": 224, "y": 61, "w": 73, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 73, "h": 64 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0100.png",
+    "frame": { "x": 1, "y": 64, "w": 75, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 75, "h": 62 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0101.png",
+    "frame": { "x": 388, "y": 178, "w": 76, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 76, "h": 61 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0102.png",
+    "frame": { "x": 540, "y": 178, "w": 77, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 77, "h": 60 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0103.png",
+    "frame": { "x": 307, "y": 1, "w": 78, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 78, "h": 60 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0104.png",
+    "frame": { "x": 156, "y": 125, "w": 80, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 80, "h": 58 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0105.png",
+    "frame": { "x": 159, "y": 186, "w": 81, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 81, "h": 57 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0106.png",
+    "frame": { "x": 545, "y": 1, "w": 82, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 82, "h": 57 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0107.png",
+    "frame": { "x": 528, "y": 122, "w": 83, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 8, "w": 83, "h": 56 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0108.png",
+    "frame": { "x": 416, "y": 295, "w": 83, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 9, "w": 83, "h": 55 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0109.png",
+    "frame": { "x": 333, "y": 295, "w": 83, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 9, "w": 83, "h": 55 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0110.png",
+    "frame": { "x": 167, "y": 298, "w": 83, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 9, "w": 83, "h": 55 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0111.png",
+    "frame": { "x": 582, "y": 295, "w": 83, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 9, "w": 83, "h": 55 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0112.png",
+    "frame": { "x": 1, "y": 298, "w": 83, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 9, "w": 83, "h": 55 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0113.png",
+    "frame": { "x": 84, "y": 298, "w": 83, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 9, "w": 83, "h": 55 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0114.png",
+    "frame": { "x": 403, "y": 239, "w": 82, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 8, "w": 82, "h": 56 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0115.png",
+    "frame": { "x": 240, "y": 186, "w": 81, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 81, "h": 57 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0116.png",
+    "frame": { "x": 330, "y": 350, "w": 80, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 80, "h": 57 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0117.png",
+    "frame": { "x": 410, "y": 350, "w": 78, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 6, "w": 78, "h": 58 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0118.png",
+    "frame": { "x": 229, "y": 1, "w": 78, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 78, "h": 60 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0119.png",
+    "frame": { "x": 464, "y": 178, "w": 76, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 76, "h": 61 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0120.png",
+    "frame": { "x": 1, "y": 1, "w": 75, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 75, "h": 63 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.13-x64",
+  "image": "2089.png",
+  "format": "I8",
+  "size": { "w": 666, "h": 409 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/2089.png b/public/images/pokemon/exp/2089.png
index 380e517136c..fc4f2d2a353 100644
Binary files a/public/images/pokemon/exp/2089.png and b/public/images/pokemon/exp/2089.png differ
diff --git a/public/images/pokemon/exp/248-mega.json b/public/images/pokemon/exp/248-mega.json
index 42e7e9f7d6d..2c9370cbeee 100644
--- a/public/images/pokemon/exp/248-mega.json
+++ b/public/images/pokemon/exp/248-mega.json
@@ -1,272 +1,929 @@
-{
-	"textures": [
-		{
-			"image": "248-mega.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 271,
-				"h": 271
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 91,
-						"h": 85
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 91,
-						"h": 85
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 91,
-						"h": 85
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 91,
-						"h": 85
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 91,
-						"h": 85
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 91,
-						"h": 85
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 91,
-						"h": 85
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 91,
-						"h": 85
-					},
-					"frame": {
-						"x": 91,
-						"y": 0,
-						"w": 91,
-						"h": 85
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 91,
-						"h": 85
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 91,
-						"h": 85
-					},
-					"frame": {
-						"x": 91,
-						"y": 0,
-						"w": 91,
-						"h": 85
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 91,
-						"h": 85
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 91,
-						"h": 85
-					},
-					"frame": {
-						"x": 0,
-						"y": 85,
-						"w": 91,
-						"h": 85
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 91,
-						"h": 85
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 91,
-						"h": 85
-					},
-					"frame": {
-						"x": 0,
-						"y": 85,
-						"w": 91,
-						"h": 85
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 91,
-						"h": 85
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 91,
-						"h": 85
-					},
-					"frame": {
-						"x": 0,
-						"y": 170,
-						"w": 91,
-						"h": 85
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 91,
-						"h": 85
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 91,
-						"h": 85
-					},
-					"frame": {
-						"x": 0,
-						"y": 170,
-						"w": 91,
-						"h": 85
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 91,
-						"h": 85
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 90,
-						"h": 85
-					},
-					"frame": {
-						"x": 91,
-						"y": 85,
-						"w": 90,
-						"h": 85
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 91,
-						"h": 85
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 90,
-						"h": 85
-					},
-					"frame": {
-						"x": 91,
-						"y": 85,
-						"w": 90,
-						"h": 85
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 91,
-						"h": 85
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 90,
-						"h": 85
-					},
-					"frame": {
-						"x": 181,
-						"y": 85,
-						"w": 90,
-						"h": 85
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 91,
-						"h": 85
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 90,
-						"h": 84
-					},
-					"frame": {
-						"x": 91,
-						"y": 170,
-						"w": 90,
-						"h": 84
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:cde8b160e19f5e22098d0c8712fe3e26:5bade20a2d91d5c0e3de833bedccd3cb:90df97eb431b7162252516cb937a0b9e$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 467, "y": 175, "w": 90, "h": 84 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 90, "h": 84 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 559, "y": 175, "w": 90, "h": 84 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 90, "h": 84 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 184, "y": 176, "w": 91, "h": 83 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 91, "h": 83 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 184, "y": 261, "w": 92, "h": 82 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 5, "w": 92, "h": 82 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 374, "y": 261, "w": 92, "h": 82 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 5, "w": 92, "h": 82 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 182, "y": 430, "w": 90, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 7, "w": 90, "h": 80 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 549, "y": 430, "w": 90, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 7, "w": 90, "h": 80 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 89, "y": 513, "w": 88, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 7, "w": 88, "h": 80 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 182, "y": 512, "w": 89, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 7, "w": 89, "h": 80 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 273, "y": 513, "w": 87, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 7, "w": 87, "h": 80 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 456, "y": 433, "w": 89, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 7, "w": 89, "h": 80 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 547, "y": 512, "w": 88, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 7, "w": 88, "h": 80 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 274, "y": 431, "w": 89, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 7, "w": 89, "h": 80 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 91, "y": 430, "w": 89, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 89, "h": 81 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 275, "y": 348, "w": 90, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 90, "h": 81 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 91, "y": 347, "w": 90, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 90, "h": 81 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 369, "y": 345, "w": 90, "h": 82 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 90, "h": 82 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 561, "y": 261, "w": 90, "h": 83 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 90, "h": 83 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 0, "y": 262, "w": 90, "h": 83 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 90, "h": 83 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 467, "y": 175, "w": 90, "h": 84 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 90, "h": 84 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 559, "y": 175, "w": 90, "h": 84 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 90, "h": 84 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 184, "y": 176, "w": 91, "h": 83 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 91, "h": 83 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 184, "y": 261, "w": 92, "h": 82 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 5, "w": 92, "h": 82 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 374, "y": 261, "w": 92, "h": 82 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 5, "w": 92, "h": 82 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 182, "y": 430, "w": 90, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 7, "w": 90, "h": 80 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 549, "y": 430, "w": 90, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 7, "w": 90, "h": 80 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 89, "y": 513, "w": 88, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 7, "w": 88, "h": 80 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 182, "y": 512, "w": 89, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 7, "w": 89, "h": 80 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 273, "y": 513, "w": 87, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 7, "w": 87, "h": 80 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 456, "y": 433, "w": 89, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 7, "w": 89, "h": 80 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 547, "y": 512, "w": 88, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 7, "w": 88, "h": 80 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 274, "y": 431, "w": 89, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 7, "w": 89, "h": 80 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 91, "y": 430, "w": 89, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 89, "h": 81 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 275, "y": 348, "w": 90, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 90, "h": 81 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 91, "y": 347, "w": 90, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 90, "h": 81 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 369, "y": 345, "w": 90, "h": 82 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 90, "h": 82 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 561, "y": 261, "w": 90, "h": 83 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 90, "h": 83 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 0, "y": 262, "w": 90, "h": 83 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 90, "h": 83 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 467, "y": 175, "w": 90, "h": 84 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 90, "h": 84 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 559, "y": 175, "w": 90, "h": 84 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 90, "h": 84 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 184, "y": 176, "w": 91, "h": 83 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 91, "h": 83 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 184, "y": 261, "w": 92, "h": 82 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 5, "w": 92, "h": 82 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 374, "y": 261, "w": 92, "h": 82 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 5, "w": 92, "h": 82 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 182, "y": 430, "w": 90, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 7, "w": 90, "h": 80 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 549, "y": 430, "w": 90, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 7, "w": 90, "h": 80 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 89, "y": 513, "w": 88, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 7, "w": 88, "h": 80 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 182, "y": 512, "w": 89, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 7, "w": 89, "h": 80 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 273, "y": 513, "w": 87, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 7, "w": 87, "h": 80 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 456, "y": 433, "w": 89, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 7, "w": 89, "h": 80 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 547, "y": 512, "w": 88, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 7, "w": 88, "h": 80 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 274, "y": 431, "w": 89, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 7, "w": 89, "h": 80 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 91, "y": 430, "w": 89, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 89, "h": 81 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 275, "y": 348, "w": 90, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 90, "h": 81 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 91, "y": 347, "w": 90, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 90, "h": 81 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 369, "y": 345, "w": 90, "h": 82 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 90, "h": 82 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 561, "y": 261, "w": 90, "h": 83 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 90, "h": 83 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 0, "y": 262, "w": 90, "h": 83 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 90, "h": 83 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 467, "y": 175, "w": 90, "h": 84 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 90, "h": 84 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 559, "y": 175, "w": 90, "h": 84 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 90, "h": 84 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 184, "y": 176, "w": 91, "h": 83 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 91, "h": 83 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 184, "y": 261, "w": 92, "h": 82 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 5, "w": 92, "h": 82 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 374, "y": 261, "w": 92, "h": 82 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 5, "w": 92, "h": 82 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 182, "y": 430, "w": 90, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 7, "w": 90, "h": 80 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 549, "y": 430, "w": 90, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 7, "w": 90, "h": 80 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 89, "y": 513, "w": 88, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 7, "w": 88, "h": 80 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 182, "y": 512, "w": 89, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 7, "w": 89, "h": 80 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 273, "y": 513, "w": 87, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 7, "w": 87, "h": 80 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 456, "y": 433, "w": 89, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 7, "w": 89, "h": 80 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 547, "y": 512, "w": 88, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 7, "w": 88, "h": 80 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 274, "y": 431, "w": 89, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 7, "w": 89, "h": 80 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 91, "y": 430, "w": 89, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 89, "h": 81 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 275, "y": 348, "w": 90, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 90, "h": 81 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 91, "y": 347, "w": 90, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 90, "h": 81 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 369, "y": 345, "w": 90, "h": 82 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 90, "h": 82 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 561, "y": 261, "w": 90, "h": 83 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 90, "h": 83 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 0, "y": 262, "w": 90, "h": 83 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 90, "h": 83 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 467, "y": 175, "w": 90, "h": 84 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 90, "h": 84 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 0, "y": 176, "w": 90, "h": 84 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 90, "h": 84 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 92, "y": 176, "w": 90, "h": 84 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 90, "h": 84 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 92, "y": 262, "w": 90, "h": 83 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 90, "h": 83 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 184, "y": 345, "w": 89, "h": 83 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 89, "h": 83 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 278, "y": 263, "w": 89, "h": 83 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 89, "h": 83 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 468, "y": 261, "w": 90, "h": 83 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 90, "h": 83 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 549, "y": 346, "w": 89, "h": 82 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 89, "h": 82 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 0, "y": 347, "w": 89, "h": 82 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 89, "h": 82 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 0, "y": 431, "w": 87, "h": 82 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 87, "h": 82 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 367, "y": 429, "w": 87, "h": 83 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 87, "h": 83 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0088.png",
+    "frame": { "x": 461, "y": 346, "w": 86, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 86, "h": 85 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0089.png",
+    "frame": { "x": 283, "y": 175, "w": 89, "h": 86 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 89, "h": 86 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0090.png",
+    "frame": { "x": 189, "y": 88, "w": 92, "h": 86 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 92, "h": 86 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0091.png",
+    "frame": { "x": 0, "y": 0, "w": 93, "h": 87 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 93, "h": 87 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0092.png",
+    "frame": { "x": 380, "y": 0, "w": 92, "h": 86 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 92, "h": 86 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0093.png",
+    "frame": { "x": 95, "y": 88, "w": 92, "h": 86 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 92, "h": 86 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0094.png",
+    "frame": { "x": 474, "y": 0, "w": 92, "h": 86 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 92, "h": 86 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0095.png",
+    "frame": { "x": 190, "y": 0, "w": 93, "h": 86 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 93, "h": 86 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0096.png",
+    "frame": { "x": 95, "y": 0, "w": 93, "h": 86 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 93, "h": 86 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0097.png",
+    "frame": { "x": 285, "y": 0, "w": 93, "h": 86 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 93, "h": 86 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0098.png",
+    "frame": { "x": 378, "y": 88, "w": 93, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 93, "h": 85 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0099.png",
+    "frame": { "x": 283, "y": 88, "w": 93, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 93, "h": 85 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0100.png",
+    "frame": { "x": 473, "y": 88, "w": 93, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 93, "h": 85 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0101.png",
+    "frame": { "x": 0, "y": 89, "w": 93, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 93, "h": 85 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0102.png",
+    "frame": { "x": 374, "y": 175, "w": 91, "h": 84 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 91, "h": 84 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "248-mega.png",
+  "format": "I8",
+  "size": { "w": 651, "h": 593 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/248-mega.png b/public/images/pokemon/exp/248-mega.png
index b7563738d3d..167b88b09e5 100644
Binary files a/public/images/pokemon/exp/248-mega.png and b/public/images/pokemon/exp/248-mega.png differ
diff --git a/public/images/pokemon/exp/362-mega.json b/public/images/pokemon/exp/362-mega.json
index 05497f4ce7e..c69ecfb1903 100644
--- a/public/images/pokemon/exp/362-mega.json
+++ b/public/images/pokemon/exp/362-mega.json
@@ -1,272 +1,551 @@
-{
-	"textures": [
-		{
-			"image": "362-mega.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 174,
-				"h": 174
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 58,
-						"h": 72
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 58,
-						"h": 72
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 58,
-						"h": 72
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 58,
-						"h": 72
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 58,
-						"h": 72
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 58,
-						"h": 72
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 58,
-						"h": 72
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 58,
-						"h": 72
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 58,
-						"h": 71
-					},
-					"frame": {
-						"x": 0,
-						"y": 72,
-						"w": 58,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 58,
-						"h": 71
-					},
-					"frame": {
-						"x": 0,
-						"y": 72,
-						"w": 58,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 58,
-						"h": 71
-					},
-					"frame": {
-						"x": 0,
-						"y": 72,
-						"w": 58,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 58,
-						"h": 71
-					},
-					"frame": {
-						"x": 58,
-						"y": 0,
-						"w": 58,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 58,
-						"h": 71
-					},
-					"frame": {
-						"x": 58,
-						"y": 0,
-						"w": 58,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 58,
-						"h": 71
-					},
-					"frame": {
-						"x": 116,
-						"y": 0,
-						"w": 58,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 58,
-						"h": 70
-					},
-					"frame": {
-						"x": 58,
-						"y": 71,
-						"w": 58,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 58,
-						"h": 70
-					},
-					"frame": {
-						"x": 58,
-						"y": 71,
-						"w": 58,
-						"h": 70
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:06afd89cf806f88f8f27098b432ad2cd:96be21e5293fd792149dc4962c63b26d:8a7271a5423838c97ddeb1e6dc343255$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 64, "y": 0, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 7, "w": 58, "h": 66 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 64, "y": 0, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 9, "w": 58, "h": 66 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 64, "y": 0, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 11, "w": 58, "h": 66 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 64, "y": 0, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 14, "w": 58, "h": 66 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 64, "y": 0, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 16, "w": 58, "h": 66 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 64, "y": 0, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 18, "w": 58, "h": 66 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 64, "y": 0, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 15, "w": 58, "h": 66 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 64, "y": 0, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 13, "w": 58, "h": 66 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 64, "y": 0, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 10, "w": 58, "h": 66 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 64, "y": 0, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 8, "w": 58, "h": 66 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 64, "y": 0, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 58, "h": 66 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 64, "y": 0, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 58, "h": 66 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 64, "y": 0, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 58, "h": 66 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 64, "y": 0, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 58, "h": 66 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 64, "y": 0, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 58, "h": 66 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 64, "y": 0, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 7, "w": 58, "h": 66 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 64, "y": 0, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 9, "w": 58, "h": 66 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 64, "y": 0, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 11, "w": 58, "h": 66 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 64, "y": 0, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 14, "w": 58, "h": 66 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 64, "y": 0, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 16, "w": 58, "h": 66 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 64, "y": 0, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 18, "w": 58, "h": 66 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 64, "y": 0, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 15, "w": 58, "h": 66 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 64, "y": 0, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 13, "w": 58, "h": 66 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 64, "y": 0, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 10, "w": 58, "h": 66 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 64, "y": 0, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 8, "w": 58, "h": 66 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 64, "y": 0, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 58, "h": 66 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 64, "y": 0, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 58, "h": 66 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 64, "y": 0, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 58, "h": 66 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 64, "y": 0, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 58, "h": 66 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 64, "y": 0, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 58, "h": 66 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 64, "y": 0, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 7, "w": 58, "h": 66 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 64, "y": 0, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 9, "w": 58, "h": 66 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 64, "y": 0, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 11, "w": 58, "h": 66 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 64, "y": 0, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 14, "w": 58, "h": 66 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 64, "y": 0, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 16, "w": 58, "h": 66 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 64, "y": 0, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 18, "w": 58, "h": 66 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 64, "y": 0, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 15, "w": 58, "h": 66 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 64, "y": 0, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 13, "w": 58, "h": 66 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 64, "y": 0, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 10, "w": 58, "h": 66 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 64, "y": 0, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 8, "w": 58, "h": 66 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 64, "y": 0, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 58, "h": 66 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 64, "y": 0, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 58, "h": 66 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 64, "y": 0, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 58, "h": 66 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 64, "y": 0, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 58, "h": 66 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 64, "y": 0, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 58, "h": 66 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 64, "y": 0, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 58, "h": 66 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 0, "y": 0, "w": 62, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 62, "h": 67 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 0, "y": 69, "w": 55, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 6, "w": 55, "h": 65 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 0, "y": 0, "w": 62, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 62, "h": 67 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 0, "y": 69, "w": 55, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 6, "w": 55, "h": 65 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 0, "y": 0, "w": 62, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 62, "h": 67 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 0, "y": 69, "w": 55, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 6, "w": 55, "h": 65 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 0, "y": 0, "w": 62, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 62, "h": 67 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 0, "y": 69, "w": 55, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 6, "w": 55, "h": 65 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 0, "y": 0, "w": 62, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 62, "h": 67 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 0, "y": 69, "w": 55, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 6, "w": 55, "h": 65 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 0, "y": 0, "w": 62, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 62, "h": 67 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 0, "y": 69, "w": 55, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 6, "w": 55, "h": 65 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 64, "y": 0, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 58, "h": 66 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 64, "y": 0, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 58, "h": 66 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "362-mega.png",
+  "format": "I8",
+  "size": { "w": 122, "h": 134 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/362-mega.png b/public/images/pokemon/exp/362-mega.png
index 76464e38a4c..be87d172e8e 100644
Binary files a/public/images/pokemon/exp/362-mega.png and b/public/images/pokemon/exp/362-mega.png differ
diff --git a/public/images/pokemon/exp/484-origin.json b/public/images/pokemon/exp/484-origin.json
index f52359c264a..2b63fdd6785 100644
--- a/public/images/pokemon/exp/484-origin.json
+++ b/public/images/pokemon/exp/484-origin.json
@@ -4,8 +4,8 @@
 			"image": "484-origin.png",
 			"format": "RGBA8888",
 			"size": {
-				"w": 426,
-				"h": 426
+				"w": 274,
+				"h": 274
 			},
 			"scale": 1,
 			"frames": [
@@ -14,20 +14,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 5,
+						"x": 0,
 						"y": 0,
-						"w": 91,
-						"h": 97
+						"w": 90,
+						"h": 95
 					},
 					"frame": {
 						"x": 0,
 						"y": 0,
-						"w": 91,
-						"h": 97
+						"w": 90,
+						"h": 95
 					}
 				},
 				{
@@ -35,20 +35,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 5,
+						"x": 0,
 						"y": 0,
-						"w": 91,
-						"h": 97
+						"w": 90,
+						"h": 95
 					},
 					"frame": {
 						"x": 0,
 						"y": 0,
-						"w": 91,
-						"h": 97
+						"w": 90,
+						"h": 95
 					}
 				},
 				{
@@ -56,20 +56,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 5,
+						"x": 0,
 						"y": 0,
-						"w": 91,
-						"h": 97
+						"w": 90,
+						"h": 95
 					},
 					"frame": {
 						"x": 0,
 						"y": 0,
-						"w": 91,
-						"h": 97
+						"w": 90,
+						"h": 95
 					}
 				},
 				{
@@ -77,20 +77,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 5,
+						"x": 0,
 						"y": 0,
-						"w": 91,
-						"h": 97
+						"w": 90,
+						"h": 95
 					},
 					"frame": {
 						"x": 0,
 						"y": 0,
-						"w": 91,
-						"h": 97
+						"w": 90,
+						"h": 95
 					}
 				},
 				{
@@ -98,20 +98,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 5,
+						"x": 0,
 						"y": 0,
-						"w": 91,
-						"h": 97
+						"w": 90,
+						"h": 95
 					},
 					"frame": {
 						"x": 0,
 						"y": 0,
-						"w": 91,
-						"h": 97
+						"w": 90,
+						"h": 95
 					}
 				},
 				{
@@ -119,146 +119,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 0,
 						"w": 91,
-						"h": 97
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 91,
-						"h": 97
-					}
-				},
-				{
-					"filename": "0081.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"h": 95
 					},
 					"spriteSourceSize": {
 						"x": 0,
-						"y": 5,
-						"w": 92,
-						"h": 96
-					},
-					"frame": {
-						"x": 91,
-						"y": 0,
-						"w": 92,
-						"h": 96
-					}
-				},
-				{
-					"filename": "0082.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 92,
-						"h": 96
-					},
-					"frame": {
-						"x": 91,
-						"y": 0,
-						"w": 92,
-						"h": 96
-					}
-				},
-				{
-					"filename": "0073.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 5,
 						"y": 0,
 						"w": 90,
-						"h": 97
+						"h": 95
 					},
 					"frame": {
 						"x": 0,
-						"y": 97,
-						"w": 90,
-						"h": 97
-					}
-				},
-				{
-					"filename": "0074.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 5,
 						"y": 0,
 						"w": 90,
-						"h": 97
-					},
-					"frame": {
-						"x": 0,
-						"y": 97,
-						"w": 90,
-						"h": 97
-					}
-				},
-				{
-					"filename": "0083.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 5,
-						"w": 96,
-						"h": 90
-					},
-					"frame": {
-						"x": 183,
-						"y": 0,
-						"w": 96,
-						"h": 90
-					}
-				},
-				{
-					"filename": "0084.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 5,
-						"w": 96,
-						"h": 90
-					},
-					"frame": {
-						"x": 183,
-						"y": 0,
-						"w": 96,
-						"h": 90
+						"h": 95
 					}
 				},
 				{
@@ -266,20 +140,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 6,
-						"y": 2,
+						"x": 0,
+						"y": 1,
 						"w": 90,
-						"h": 95
+						"h": 94
 					},
 					"frame": {
 						"x": 0,
-						"y": 194,
+						"y": 95,
 						"w": 90,
-						"h": 95
+						"h": 94
 					}
 				},
 				{
@@ -287,20 +161,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 6,
-						"y": 2,
+						"x": 0,
+						"y": 1,
 						"w": 90,
-						"h": 95
+						"h": 94
 					},
 					"frame": {
 						"x": 0,
-						"y": 194,
+						"y": 95,
 						"w": 90,
-						"h": 95
+						"h": 94
 					}
 				},
 				{
@@ -308,20 +182,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 6,
-						"y": 2,
+						"x": 0,
+						"y": 1,
 						"w": 90,
-						"h": 95
+						"h": 94
 					},
 					"frame": {
 						"x": 0,
-						"y": 194,
+						"y": 95,
 						"w": 90,
-						"h": 95
+						"h": 94
 					}
 				},
 				{
@@ -329,20 +203,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 6,
-						"y": 2,
+						"x": 0,
+						"y": 1,
 						"w": 90,
-						"h": 95
+						"h": 94
 					},
 					"frame": {
 						"x": 0,
-						"y": 194,
+						"y": 95,
 						"w": 90,
-						"h": 95
+						"h": 94
 					}
 				},
 				{
@@ -350,20 +224,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 6,
-						"y": 2,
+						"x": 0,
+						"y": 1,
 						"w": 90,
-						"h": 95
+						"h": 94
 					},
 					"frame": {
 						"x": 0,
-						"y": 194,
+						"y": 95,
 						"w": 90,
-						"h": 95
+						"h": 94
 					}
 				},
 				{
@@ -371,20 +245,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 6,
-						"y": 2,
+						"x": 0,
+						"y": 1,
 						"w": 90,
-						"h": 95
+						"h": 94
 					},
 					"frame": {
 						"x": 0,
-						"y": 194,
+						"y": 95,
 						"w": 90,
-						"h": 95
+						"h": 94
 					}
 				},
 				{
@@ -392,20 +266,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 6,
-						"y": 2,
+						"x": 0,
+						"y": 1,
 						"w": 90,
-						"h": 95
+						"h": 94
 					},
 					"frame": {
 						"x": 0,
-						"y": 194,
+						"y": 95,
 						"w": 90,
-						"h": 95
+						"h": 94
 					}
 				},
 				{
@@ -413,20 +287,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 6,
-						"y": 2,
+						"x": 0,
+						"y": 1,
 						"w": 90,
-						"h": 95
+						"h": 94
 					},
 					"frame": {
 						"x": 0,
-						"y": 194,
+						"y": 95,
 						"w": 90,
-						"h": 95
+						"h": 94
 					}
 				},
 				{
@@ -434,20 +308,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 6,
-						"y": 2,
+						"x": 0,
+						"y": 1,
 						"w": 90,
-						"h": 95
+						"h": 94
 					},
 					"frame": {
 						"x": 0,
-						"y": 194,
+						"y": 95,
 						"w": 90,
-						"h": 95
+						"h": 94
 					}
 				},
 				{
@@ -455,20 +329,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 6,
-						"y": 2,
+						"x": 0,
+						"y": 1,
 						"w": 90,
-						"h": 95
+						"h": 94
 					},
 					"frame": {
 						"x": 0,
-						"y": 194,
+						"y": 95,
 						"w": 90,
-						"h": 95
+						"h": 94
 					}
 				},
 				{
@@ -476,20 +350,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 6,
-						"y": 2,
+						"x": 0,
+						"y": 1,
 						"w": 90,
-						"h": 95
+						"h": 94
 					},
 					"frame": {
 						"x": 0,
-						"y": 194,
+						"y": 95,
 						"w": 90,
-						"h": 95
+						"h": 94
 					}
 				},
 				{
@@ -497,272 +371,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 2,
-						"w": 90,
+						"w": 91,
 						"h": 95
 					},
-					"frame": {
+					"spriteSourceSize": {
 						"x": 0,
-						"y": 194,
-						"w": 90,
-						"h": 95
-					}
-				},
-				{
-					"filename": "0120.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 2,
-						"w": 90,
-						"h": 95
-					},
-					"frame": {
-						"x": 0,
-						"y": 194,
-						"w": 90,
-						"h": 95
-					}
-				},
-				{
-					"filename": "0075.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 7,
 						"y": 1,
-						"w": 89,
-						"h": 95
+						"w": 90,
+						"h": 94
 					},
 					"frame": {
 						"x": 0,
-						"y": 289,
-						"w": 89,
-						"h": 95
-					}
-				},
-				{
-					"filename": "0076.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 1,
-						"w": 89,
-						"h": 95
-					},
-					"frame": {
-						"x": 0,
-						"y": 289,
-						"w": 89,
-						"h": 95
-					}
-				},
-				{
-					"filename": "0079.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 4,
-						"w": 92,
-						"h": 92
-					},
-					"frame": {
-						"x": 279,
-						"y": 0,
-						"w": 92,
-						"h": 92
-					}
-				},
-				{
-					"filename": "0080.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 4,
-						"w": 92,
-						"h": 92
-					},
-					"frame": {
-						"x": 279,
-						"y": 0,
-						"w": 92,
-						"h": 92
-					}
-				},
-				{
-					"filename": "0089.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 24,
-						"y": 16,
-						"w": 50,
-						"h": 54
-					},
-					"frame": {
-						"x": 371,
-						"y": 0,
-						"w": 50,
-						"h": 54
-					}
-				},
-				{
-					"filename": "0090.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 24,
-						"y": 16,
-						"w": 50,
-						"h": 54
-					},
-					"frame": {
-						"x": 371,
-						"y": 0,
-						"w": 50,
-						"h": 54
-					}
-				},
-				{
-					"filename": "0111.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 24,
-						"y": 16,
-						"w": 50,
-						"h": 54
-					},
-					"frame": {
-						"x": 371,
-						"y": 0,
-						"w": 50,
-						"h": 54
-					}
-				},
-				{
-					"filename": "0112.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 24,
-						"y": 16,
-						"w": 50,
-						"h": 54
-					},
-					"frame": {
-						"x": 371,
-						"y": 0,
-						"w": 50,
-						"h": 54
-					}
-				},
-				{
-					"filename": "0117.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 92,
-						"h": 92
-					},
-					"frame": {
-						"x": 183,
-						"y": 90,
-						"w": 92,
-						"h": 92
-					}
-				},
-				{
-					"filename": "0118.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 92,
-						"h": 92
-					},
-					"frame": {
-						"x": 183,
-						"y": 90,
-						"w": 92,
-						"h": 92
-					}
-				},
-				{
-					"filename": "0119.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 92,
-						"h": 92
-					},
-					"frame": {
-						"x": 183,
-						"y": 90,
-						"w": 92,
-						"h": 92
+						"y": 95,
+						"w": 90,
+						"h": 94
 					}
 				},
 				{
@@ -770,20 +392,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 6,
-						"y": 5,
+						"x": 0,
+						"y": 4,
 						"w": 91,
-						"h": 92
+						"h": 91
 					},
 					"frame": {
-						"x": 275,
-						"y": 92,
+						"x": 90,
+						"y": 0,
 						"w": 91,
-						"h": 92
+						"h": 91
 					}
 				},
 				{
@@ -791,20 +413,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 6,
-						"y": 5,
+						"x": 0,
+						"y": 4,
 						"w": 91,
-						"h": 92
+						"h": 91
 					},
 					"frame": {
-						"x": 275,
-						"y": 92,
+						"x": 90,
+						"y": 0,
 						"w": 91,
-						"h": 92
+						"h": 91
 					}
 				},
 				{
@@ -812,20 +434,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 6,
-						"y": 5,
+						"x": 0,
+						"y": 4,
 						"w": 91,
-						"h": 92
+						"h": 91
 					},
 					"frame": {
-						"x": 275,
-						"y": 92,
+						"x": 90,
+						"y": 0,
 						"w": 91,
-						"h": 92
+						"h": 91
 					}
 				},
 				{
@@ -833,20 +455,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 6,
-						"y": 5,
+						"x": 0,
+						"y": 4,
 						"w": 91,
-						"h": 92
+						"h": 91
 					},
 					"frame": {
-						"x": 275,
-						"y": 92,
+						"x": 90,
+						"y": 0,
 						"w": 91,
-						"h": 92
+						"h": 91
 					}
 				},
 				{
@@ -854,20 +476,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 6,
-						"y": 5,
+						"x": 0,
+						"y": 4,
 						"w": 91,
-						"h": 92
+						"h": 91
 					},
 					"frame": {
-						"x": 275,
-						"y": 92,
+						"x": 90,
+						"y": 0,
 						"w": 91,
-						"h": 92
+						"h": 91
 					}
 				},
 				{
@@ -875,20 +497,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 6,
-						"y": 5,
+						"x": 0,
+						"y": 4,
 						"w": 91,
-						"h": 92
+						"h": 91
 					},
 					"frame": {
-						"x": 275,
-						"y": 92,
+						"x": 90,
+						"y": 0,
 						"w": 91,
-						"h": 92
+						"h": 91
 					}
 				},
 				{
@@ -896,20 +518,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 6,
-						"y": 5,
+						"x": 0,
+						"y": 4,
 						"w": 91,
-						"h": 92
+						"h": 91
 					},
 					"frame": {
-						"x": 275,
-						"y": 92,
+						"x": 90,
+						"y": 0,
 						"w": 91,
-						"h": 92
+						"h": 91
 					}
 				},
 				{
@@ -917,20 +539,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 6,
-						"y": 5,
+						"x": 0,
+						"y": 4,
 						"w": 91,
-						"h": 92
+						"h": 91
 					},
 					"frame": {
-						"x": 275,
-						"y": 92,
+						"x": 90,
+						"y": 0,
 						"w": 91,
-						"h": 92
+						"h": 91
 					}
 				},
 				{
@@ -938,20 +560,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 6,
-						"y": 5,
+						"x": 0,
+						"y": 4,
 						"w": 91,
-						"h": 92
+						"h": 91
 					},
 					"frame": {
-						"x": 275,
-						"y": 92,
+						"x": 90,
+						"y": 0,
 						"w": 91,
-						"h": 92
+						"h": 91
 					}
 				},
 				{
@@ -959,20 +581,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 6,
-						"y": 5,
+						"x": 0,
+						"y": 4,
 						"w": 91,
-						"h": 92
+						"h": 91
 					},
 					"frame": {
-						"x": 275,
-						"y": 92,
+						"x": 90,
+						"y": 0,
 						"w": 91,
-						"h": 92
+						"h": 91
 					}
 				},
 				{
@@ -980,20 +602,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 6,
-						"y": 5,
+						"x": 0,
+						"y": 4,
 						"w": 91,
-						"h": 92
+						"h": 91
 					},
 					"frame": {
-						"x": 275,
-						"y": 92,
+						"x": 90,
+						"y": 0,
 						"w": 91,
-						"h": 92
+						"h": 91
 					}
 				},
 				{
@@ -1001,272 +623,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 5,
 						"w": 91,
-						"h": 92
+						"h": 95
 					},
-					"frame": {
-						"x": 275,
-						"y": 92,
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 4,
 						"w": 91,
-						"h": 92
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 4,
-						"w": 89,
-						"h": 93
-					},
-					"frame": {
-						"x": 89,
-						"y": 289,
-						"w": 89,
-						"h": 93
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 4,
-						"w": 89,
-						"h": 93
-					},
-					"frame": {
-						"x": 89,
-						"y": 289,
-						"w": 89,
-						"h": 93
-					}
-				},
-				{
-					"filename": "0035.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 4,
-						"w": 89,
-						"h": 93
-					},
-					"frame": {
-						"x": 89,
-						"y": 289,
-						"w": 89,
-						"h": 93
-					}
-				},
-				{
-					"filename": "0036.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 4,
-						"w": 89,
-						"h": 93
-					},
-					"frame": {
-						"x": 89,
-						"y": 289,
-						"w": 89,
-						"h": 93
-					}
-				},
-				{
-					"filename": "0039.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 4,
-						"w": 89,
-						"h": 93
-					},
-					"frame": {
-						"x": 89,
-						"y": 289,
-						"w": 89,
-						"h": 93
-					}
-				},
-				{
-					"filename": "0040.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 4,
-						"w": 89,
-						"h": 93
-					},
-					"frame": {
-						"x": 89,
-						"y": 289,
-						"w": 89,
-						"h": 93
-					}
-				},
-				{
-					"filename": "0059.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 4,
-						"w": 89,
-						"h": 93
-					},
-					"frame": {
-						"x": 89,
-						"y": 289,
-						"w": 89,
-						"h": 93
-					}
-				},
-				{
-					"filename": "0060.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 4,
-						"w": 89,
-						"h": 93
-					},
-					"frame": {
-						"x": 89,
-						"y": 289,
-						"w": 89,
-						"h": 93
-					}
-				},
-				{
-					"filename": "0063.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 4,
-						"w": 89,
-						"h": 93
-					},
-					"frame": {
-						"x": 89,
-						"y": 289,
-						"w": 89,
-						"h": 93
-					}
-				},
-				{
-					"filename": "0064.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 4,
-						"w": 89,
-						"h": 93
-					},
-					"frame": {
-						"x": 89,
-						"y": 289,
-						"w": 89,
-						"h": 93
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 4,
-						"w": 89,
-						"h": 93
+						"h": 91
 					},
 					"frame": {
 						"x": 90,
-						"y": 97,
-						"w": 89,
-						"h": 93
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 4,
-						"w": 89,
-						"h": 93
-					},
-					"frame": {
-						"x": 90,
-						"y": 97,
-						"w": 89,
-						"h": 93
+						"y": 0,
+						"w": 91,
+						"h": 91
 					}
 				},
 				{
@@ -1274,20 +644,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 6,
-						"y": 5,
+						"x": 0,
+						"y": 4,
 						"w": 90,
-						"h": 92
+						"h": 91
 					},
 					"frame": {
-						"x": 90,
-						"y": 190,
+						"x": 181,
+						"y": 0,
 						"w": 90,
-						"h": 92
+						"h": 91
 					}
 				},
 				{
@@ -1295,20 +665,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 6,
-						"y": 5,
+						"x": 0,
+						"y": 4,
 						"w": 90,
-						"h": 92
+						"h": 91
 					},
 					"frame": {
-						"x": 90,
-						"y": 190,
+						"x": 181,
+						"y": 0,
 						"w": 90,
-						"h": 92
+						"h": 91
 					}
 				},
 				{
@@ -1316,20 +686,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 6,
-						"y": 5,
+						"x": 0,
+						"y": 4,
 						"w": 90,
-						"h": 92
+						"h": 91
 					},
 					"frame": {
-						"x": 90,
-						"y": 190,
+						"x": 181,
+						"y": 0,
 						"w": 90,
-						"h": 92
+						"h": 91
 					}
 				},
 				{
@@ -1337,20 +707,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 6,
-						"y": 5,
+						"x": 0,
+						"y": 4,
 						"w": 90,
-						"h": 92
+						"h": 91
 					},
 					"frame": {
-						"x": 90,
-						"y": 190,
+						"x": 181,
+						"y": 0,
 						"w": 90,
-						"h": 92
+						"h": 91
 					}
 				},
 				{
@@ -1358,20 +728,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 6,
-						"y": 5,
+						"x": 0,
+						"y": 4,
 						"w": 90,
-						"h": 92
+						"h": 91
 					},
 					"frame": {
-						"x": 90,
-						"y": 190,
+						"x": 181,
+						"y": 0,
 						"w": 90,
-						"h": 92
+						"h": 91
 					}
 				},
 				{
@@ -1379,20 +749,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 6,
-						"y": 5,
+						"x": 0,
+						"y": 4,
 						"w": 90,
-						"h": 92
+						"h": 91
 					},
 					"frame": {
-						"x": 90,
-						"y": 190,
+						"x": 181,
+						"y": 0,
 						"w": 90,
-						"h": 92
+						"h": 91
 					}
 				},
 				{
@@ -1400,20 +770,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 6,
-						"y": 5,
+						"x": 0,
+						"y": 4,
 						"w": 90,
-						"h": 92
+						"h": 91
 					},
 					"frame": {
-						"x": 90,
-						"y": 190,
+						"x": 181,
+						"y": 0,
 						"w": 90,
-						"h": 92
+						"h": 91
 					}
 				},
 				{
@@ -1421,20 +791,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 6,
-						"y": 5,
+						"x": 0,
+						"y": 4,
 						"w": 90,
-						"h": 92
+						"h": 91
 					},
 					"frame": {
-						"x": 90,
-						"y": 190,
+						"x": 181,
+						"y": 0,
 						"w": 90,
-						"h": 92
+						"h": 91
 					}
 				},
 				{
@@ -1442,20 +812,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 6,
-						"y": 5,
+						"x": 0,
+						"y": 4,
 						"w": 90,
-						"h": 92
+						"h": 91
 					},
 					"frame": {
-						"x": 90,
-						"y": 190,
+						"x": 181,
+						"y": 0,
 						"w": 90,
-						"h": 92
+						"h": 91
 					}
 				},
 				{
@@ -1463,20 +833,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 6,
-						"y": 5,
+						"x": 0,
+						"y": 4,
 						"w": 90,
-						"h": 92
+						"h": 91
 					},
 					"frame": {
-						"x": 90,
-						"y": 190,
+						"x": 181,
+						"y": 0,
 						"w": 90,
-						"h": 92
+						"h": 91
 					}
 				},
 				{
@@ -1484,20 +854,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 6,
-						"y": 5,
+						"x": 0,
+						"y": 4,
 						"w": 90,
-						"h": 92
+						"h": 91
 					},
 					"frame": {
-						"x": 90,
-						"y": 190,
+						"x": 181,
+						"y": 0,
 						"w": 90,
-						"h": 92
+						"h": 91
 					}
 				},
 				{
@@ -1505,19 +875,229 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 6,
-						"y": 5,
+						"x": 0,
+						"y": 4,
 						"w": 90,
+						"h": 91
+					},
+					"frame": {
+						"x": 181,
+						"y": 0,
+						"w": 90,
+						"h": 91
+					}
+				},
+				{
+					"filename": "0011.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 91,
+						"h": 95
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 3,
+						"w": 89,
 						"h": 92
 					},
 					"frame": {
 						"x": 90,
-						"y": 190,
-						"w": 90,
+						"y": 91,
+						"w": 89,
+						"h": 92
+					}
+				},
+				{
+					"filename": "0012.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 91,
+						"h": 95
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 3,
+						"w": 89,
+						"h": 92
+					},
+					"frame": {
+						"x": 90,
+						"y": 91,
+						"w": 89,
+						"h": 92
+					}
+				},
+				{
+					"filename": "0035.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 91,
+						"h": 95
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 3,
+						"w": 89,
+						"h": 92
+					},
+					"frame": {
+						"x": 90,
+						"y": 91,
+						"w": 89,
+						"h": 92
+					}
+				},
+				{
+					"filename": "0036.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 91,
+						"h": 95
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 3,
+						"w": 89,
+						"h": 92
+					},
+					"frame": {
+						"x": 90,
+						"y": 91,
+						"w": 89,
+						"h": 92
+					}
+				},
+				{
+					"filename": "0039.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 91,
+						"h": 95
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 3,
+						"w": 89,
+						"h": 92
+					},
+					"frame": {
+						"x": 90,
+						"y": 91,
+						"w": 89,
+						"h": 92
+					}
+				},
+				{
+					"filename": "0040.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 91,
+						"h": 95
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 3,
+						"w": 89,
+						"h": 92
+					},
+					"frame": {
+						"x": 90,
+						"y": 91,
+						"w": 89,
+						"h": 92
+					}
+				},
+				{
+					"filename": "0059.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 91,
+						"h": 95
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 3,
+						"w": 89,
+						"h": 92
+					},
+					"frame": {
+						"x": 90,
+						"y": 91,
+						"w": 89,
+						"h": 92
+					}
+				},
+				{
+					"filename": "0060.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 91,
+						"h": 95
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 3,
+						"w": 89,
+						"h": 92
+					},
+					"frame": {
+						"x": 90,
+						"y": 91,
+						"w": 89,
+						"h": 92
+					}
+				},
+				{
+					"filename": "0063.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 91,
+						"h": 95
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 3,
+						"w": 89,
+						"h": 92
+					},
+					"frame": {
+						"x": 90,
+						"y": 91,
+						"w": 89,
+						"h": 92
+					}
+				},
+				{
+					"filename": "0064.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 91,
+						"h": 95
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 3,
+						"w": 89,
+						"h": 92
+					},
+					"frame": {
+						"x": 90,
+						"y": 91,
+						"w": 89,
 						"h": 92
 					}
 				},
@@ -1526,20 +1106,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 7,
-						"y": 5,
+						"x": 1,
+						"y": 4,
 						"w": 89,
-						"h": 92
+						"h": 91
 					},
 					"frame": {
-						"x": 180,
-						"y": 182,
+						"x": 90,
+						"y": 183,
 						"w": 89,
-						"h": 92
+						"h": 91
 					}
 				},
 				{
@@ -1547,20 +1127,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 7,
-						"y": 5,
+						"x": 1,
+						"y": 4,
 						"w": 89,
-						"h": 92
+						"h": 91
 					},
 					"frame": {
-						"x": 180,
-						"y": 182,
+						"x": 90,
+						"y": 183,
 						"w": 89,
-						"h": 92
+						"h": 91
 					}
 				},
 				{
@@ -1568,20 +1148,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 7,
-						"y": 5,
+						"x": 1,
+						"y": 4,
 						"w": 89,
-						"h": 92
+						"h": 91
 					},
 					"frame": {
-						"x": 180,
-						"y": 182,
+						"x": 90,
+						"y": 183,
 						"w": 89,
-						"h": 92
+						"h": 91
 					}
 				},
 				{
@@ -1589,20 +1169,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 7,
-						"y": 5,
+						"x": 1,
+						"y": 4,
 						"w": 89,
-						"h": 92
+						"h": 91
 					},
 					"frame": {
-						"x": 180,
-						"y": 182,
+						"x": 90,
+						"y": 183,
 						"w": 89,
-						"h": 92
+						"h": 91
 					}
 				},
 				{
@@ -1610,20 +1190,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 7,
-						"y": 5,
+						"x": 1,
+						"y": 4,
 						"w": 89,
-						"h": 92
+						"h": 91
 					},
 					"frame": {
-						"x": 180,
-						"y": 182,
+						"x": 90,
+						"y": 183,
 						"w": 89,
-						"h": 92
+						"h": 91
 					}
 				},
 				{
@@ -1631,20 +1211,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 7,
-						"y": 5,
+						"x": 1,
+						"y": 4,
 						"w": 89,
-						"h": 92
+						"h": 91
 					},
 					"frame": {
-						"x": 180,
-						"y": 182,
+						"x": 90,
+						"y": 183,
 						"w": 89,
-						"h": 92
+						"h": 91
 					}
 				},
 				{
@@ -1652,20 +1232,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 7,
-						"y": 5,
+						"x": 1,
+						"y": 4,
 						"w": 89,
-						"h": 92
+						"h": 91
 					},
 					"frame": {
-						"x": 180,
-						"y": 182,
+						"x": 90,
+						"y": 183,
 						"w": 89,
-						"h": 92
+						"h": 91
 					}
 				},
 				{
@@ -1673,20 +1253,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 7,
-						"y": 5,
+						"x": 1,
+						"y": 4,
 						"w": 89,
-						"h": 92
+						"h": 91
 					},
 					"frame": {
-						"x": 180,
-						"y": 182,
+						"x": 90,
+						"y": 183,
 						"w": 89,
-						"h": 92
+						"h": 91
 					}
 				},
 				{
@@ -1694,20 +1274,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 7,
-						"y": 5,
+						"x": 1,
+						"y": 4,
 						"w": 89,
-						"h": 92
+						"h": 91
 					},
 					"frame": {
-						"x": 180,
-						"y": 182,
+						"x": 90,
+						"y": 183,
 						"w": 89,
-						"h": 92
+						"h": 91
 					}
 				},
 				{
@@ -1715,20 +1295,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 7,
-						"y": 5,
+						"x": 1,
+						"y": 4,
 						"w": 89,
-						"h": 92
+						"h": 91
 					},
 					"frame": {
-						"x": 180,
-						"y": 182,
+						"x": 90,
+						"y": 183,
 						"w": 89,
-						"h": 92
+						"h": 91
 					}
 				},
 				{
@@ -1736,20 +1316,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 7,
-						"y": 5,
+						"x": 1,
+						"y": 4,
 						"w": 89,
-						"h": 92
+						"h": 91
 					},
 					"frame": {
-						"x": 180,
-						"y": 182,
+						"x": 90,
+						"y": 183,
 						"w": 89,
-						"h": 92
+						"h": 91
 					}
 				},
 				{
@@ -1757,62 +1337,62 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 7,
-						"y": 5,
+						"x": 1,
+						"y": 4,
+						"w": 89,
+						"h": 91
+					},
+					"frame": {
+						"x": 90,
+						"y": 183,
+						"w": 89,
+						"h": 91
+					}
+				},
+				{
+					"filename": "0015.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 91,
+						"h": 95
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 3,
 						"w": 89,
 						"h": 92
 					},
 					"frame": {
-						"x": 180,
-						"y": 182,
+						"x": 179,
+						"y": 91,
 						"w": 89,
 						"h": 92
 					}
 				},
 				{
-					"filename": "0077.png",
+					"filename": "0016.png",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 90,
-						"h": 90
+						"x": 2,
+						"y": 3,
+						"w": 89,
+						"h": 92
 					},
 					"frame": {
-						"x": 269,
-						"y": 184,
-						"w": 90,
-						"h": 90
-					}
-				},
-				{
-					"filename": "0078.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 90,
-						"h": 90
-					},
-					"frame": {
-						"x": 269,
-						"y": 184,
-						"w": 90,
-						"h": 90
+						"x": 179,
+						"y": 91,
+						"w": 89,
+						"h": 92
 					}
 				},
 				{
@@ -1820,20 +1400,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 10,
-						"y": 5,
-						"w": 88,
-						"h": 92
+						"x": 4,
+						"y": 4,
+						"w": 87,
+						"h": 91
 					},
 					"frame": {
-						"x": 180,
-						"y": 274,
-						"w": 88,
-						"h": 92
+						"x": 179,
+						"y": 183,
+						"w": 87,
+						"h": 91
 					}
 				},
 				{
@@ -1841,20 +1421,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 10,
-						"y": 5,
-						"w": 88,
-						"h": 92
+						"x": 4,
+						"y": 4,
+						"w": 87,
+						"h": 91
 					},
 					"frame": {
-						"x": 180,
-						"y": 274,
-						"w": 88,
-						"h": 92
+						"x": 179,
+						"y": 183,
+						"w": 87,
+						"h": 91
 					}
 				},
 				{
@@ -1862,20 +1442,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 10,
-						"y": 5,
-						"w": 88,
-						"h": 92
+						"x": 4,
+						"y": 4,
+						"w": 87,
+						"h": 91
 					},
 					"frame": {
-						"x": 180,
-						"y": 274,
-						"w": 88,
-						"h": 92
+						"x": 179,
+						"y": 183,
+						"w": 87,
+						"h": 91
 					}
 				},
 				{
@@ -1883,20 +1463,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 10,
-						"y": 5,
-						"w": 88,
-						"h": 92
+						"x": 4,
+						"y": 4,
+						"w": 87,
+						"h": 91
 					},
 					"frame": {
-						"x": 180,
-						"y": 274,
-						"w": 88,
-						"h": 92
+						"x": 179,
+						"y": 183,
+						"w": 87,
+						"h": 91
 					}
 				},
 				{
@@ -1904,20 +1484,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 10,
-						"y": 5,
-						"w": 88,
-						"h": 92
+						"x": 4,
+						"y": 4,
+						"w": 87,
+						"h": 91
 					},
 					"frame": {
-						"x": 180,
-						"y": 274,
-						"w": 88,
-						"h": 92
+						"x": 179,
+						"y": 183,
+						"w": 87,
+						"h": 91
 					}
 				},
 				{
@@ -1925,608 +1505,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 10,
-						"y": 5,
-						"w": 88,
-						"h": 92
+						"x": 4,
+						"y": 4,
+						"w": 87,
+						"h": 91
 					},
 					"frame": {
-						"x": 180,
-						"y": 274,
-						"w": 88,
-						"h": 92
-					}
-				},
-				{
-					"filename": "0085.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 15,
-						"y": 7,
-						"w": 79,
-						"h": 86
-					},
-					"frame": {
-						"x": 268,
-						"y": 274,
-						"w": 79,
-						"h": 86
-					}
-				},
-				{
-					"filename": "0086.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 15,
-						"y": 7,
-						"w": 79,
-						"h": 86
-					},
-					"frame": {
-						"x": 268,
-						"y": 274,
-						"w": 79,
-						"h": 86
-					}
-				},
-				{
-					"filename": "0116.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 13,
-						"y": 10,
-						"w": 79,
-						"h": 83
-					},
-					"frame": {
-						"x": 347,
-						"y": 274,
-						"w": 79,
-						"h": 83
-					}
-				},
-				{
-					"filename": "0113.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 20,
-						"y": 11,
-						"w": 71,
-						"h": 69
-					},
-					"frame": {
-						"x": 347,
-						"y": 357,
-						"w": 71,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0114.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 20,
-						"y": 11,
-						"w": 71,
-						"h": 69
-					},
-					"frame": {
-						"x": 347,
-						"y": 357,
-						"w": 71,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0115.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 20,
-						"y": 11,
-						"w": 71,
-						"h": 69
-					},
-					"frame": {
-						"x": 347,
-						"y": 357,
-						"w": 71,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0087.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 20,
-						"y": 12,
-						"w": 59,
-						"h": 70
-					},
-					"frame": {
-						"x": 359,
-						"y": 184,
-						"w": 59,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0088.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 20,
-						"y": 12,
-						"w": 59,
-						"h": 70
-					},
-					"frame": {
-						"x": 359,
-						"y": 184,
-						"w": 59,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0091.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 35,
-						"y": 23,
-						"w": 27,
-						"h": 33
-					},
-					"frame": {
-						"x": 0,
-						"y": 384,
-						"w": 27,
-						"h": 33
-					}
-				},
-				{
-					"filename": "0092.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 35,
-						"y": 23,
-						"w": 27,
-						"h": 33
-					},
-					"frame": {
-						"x": 371,
-						"y": 54,
-						"w": 27,
-						"h": 33
-					}
-				},
-				{
-					"filename": "0093.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 42,
-						"y": 26,
-						"w": 19,
-						"h": 23
-					},
-					"frame": {
-						"x": 27,
-						"y": 384,
-						"w": 19,
-						"h": 23
-					}
-				},
-				{
-					"filename": "0094.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 42,
-						"y": 26,
-						"w": 19,
-						"h": 23
-					},
-					"frame": {
-						"x": 27,
-						"y": 384,
-						"w": 19,
-						"h": 23
-					}
-				},
-				{
-					"filename": "0095.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 42,
-						"y": 35,
-						"w": 14,
-						"h": 10
-					},
-					"frame": {
-						"x": 359,
-						"y": 254,
-						"w": 14,
-						"h": 10
-					}
-				},
-				{
-					"filename": "0096.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 42,
-						"y": 35,
-						"w": 14,
-						"h": 10
-					},
-					"frame": {
-						"x": 359,
-						"y": 254,
-						"w": 14,
-						"h": 10
-					}
-				},
-				{
-					"filename": "0097.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 3,
-						"h": 3
-					},
-					"frame": {
-						"x": 90,
-						"y": 282,
-						"w": 3,
-						"h": 3
-					}
-				},
-				{
-					"filename": "0098.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 3,
-						"h": 3
-					},
-					"frame": {
-						"x": 90,
-						"y": 282,
-						"w": 3,
-						"h": 3
-					}
-				},
-				{
-					"filename": "0099.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 3,
-						"h": 3
-					},
-					"frame": {
-						"x": 90,
-						"y": 282,
-						"w": 3,
-						"h": 3
-					}
-				},
-				{
-					"filename": "0100.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 3,
-						"h": 3
-					},
-					"frame": {
-						"x": 90,
-						"y": 282,
-						"w": 3,
-						"h": 3
-					}
-				},
-				{
-					"filename": "0101.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 3,
-						"h": 3
-					},
-					"frame": {
-						"x": 90,
-						"y": 282,
-						"w": 3,
-						"h": 3
-					}
-				},
-				{
-					"filename": "0102.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 3,
-						"h": 3
-					},
-					"frame": {
-						"x": 90,
-						"y": 282,
-						"w": 3,
-						"h": 3
-					}
-				},
-				{
-					"filename": "0103.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 3,
-						"h": 3
-					},
-					"frame": {
-						"x": 90,
-						"y": 282,
-						"w": 3,
-						"h": 3
-					}
-				},
-				{
-					"filename": "0104.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 3,
-						"h": 3
-					},
-					"frame": {
-						"x": 90,
-						"y": 282,
-						"w": 3,
-						"h": 3
-					}
-				},
-				{
-					"filename": "0105.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 3,
-						"h": 3
-					},
-					"frame": {
-						"x": 90,
-						"y": 282,
-						"w": 3,
-						"h": 3
-					}
-				},
-				{
-					"filename": "0106.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 3,
-						"h": 3
-					},
-					"frame": {
-						"x": 90,
-						"y": 282,
-						"w": 3,
-						"h": 3
-					}
-				},
-				{
-					"filename": "0107.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 3,
-						"h": 3
-					},
-					"frame": {
-						"x": 90,
-						"y": 282,
-						"w": 3,
-						"h": 3
-					}
-				},
-				{
-					"filename": "0108.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 3,
-						"h": 3
-					},
-					"frame": {
-						"x": 90,
-						"y": 282,
-						"w": 3,
-						"h": 3
-					}
-				},
-				{
-					"filename": "0109.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 3,
-						"h": 3
-					},
-					"frame": {
-						"x": 90,
-						"y": 282,
-						"w": 3,
-						"h": 3
-					}
-				},
-				{
-					"filename": "0110.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 3,
-						"h": 3
-					},
-					"frame": {
-						"x": 90,
-						"y": 282,
-						"w": 3,
-						"h": 3
+						"x": 179,
+						"y": 183,
+						"w": 87,
+						"h": 91
 					}
 				}
 			]
@@ -2535,6 +1527,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:52f94c22e7d6d2608638048866c1910a:045ab453153e084bad1f17ca61076c30:5ea3e660bc9c2624f846675d5196db82$"
+		"smartupdate": "$TexturePacker:SmartUpdate:4eec21f441df8c5ce7313596a1672a9e:bec666304c4bb8072e19fa13a830a7c8:5ea3e660bc9c2624f846675d5196db82$"
 	}
 }
diff --git a/public/images/pokemon/exp/484-origin.png b/public/images/pokemon/exp/484-origin.png
index dbd6db55f78..2d8d0fde472 100644
Binary files a/public/images/pokemon/exp/484-origin.png and b/public/images/pokemon/exp/484-origin.png differ
diff --git a/public/images/pokemon/exp/487-origin.json b/public/images/pokemon/exp/487-origin.json
deleted file mode 100644
index a146f68d70d..00000000000
--- a/public/images/pokemon/exp/487-origin.json
+++ /dev/null
@@ -1,566 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "487-origin.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 318,
-				"h": 318
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 91,
-						"h": 87
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 8,
-						"w": 91,
-						"h": 77
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 91,
-						"h": 77
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 91,
-						"h": 87
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 8,
-						"w": 91,
-						"h": 77
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 91,
-						"h": 77
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 91,
-						"h": 87
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 9,
-						"w": 91,
-						"h": 74
-					},
-					"frame": {
-						"x": 91,
-						"y": 0,
-						"w": 91,
-						"h": 74
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 91,
-						"h": 87
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 10,
-						"w": 91,
-						"h": 74
-					},
-					"frame": {
-						"x": 91,
-						"y": 0,
-						"w": 91,
-						"h": 74
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 91,
-						"h": 87
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 10,
-						"w": 91,
-						"h": 74
-					},
-					"frame": {
-						"x": 91,
-						"y": 0,
-						"w": 91,
-						"h": 74
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 91,
-						"h": 87
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 89,
-						"h": 75
-					},
-					"frame": {
-						"x": 182,
-						"y": 0,
-						"w": 89,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 91,
-						"h": 87
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 89,
-						"h": 75
-					},
-					"frame": {
-						"x": 182,
-						"y": 0,
-						"w": 89,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 91,
-						"h": 87
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 89,
-						"h": 75
-					},
-					"frame": {
-						"x": 182,
-						"y": 0,
-						"w": 89,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0025.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 91,
-						"h": 87
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 7,
-						"w": 86,
-						"h": 79
-					},
-					"frame": {
-						"x": 91,
-						"y": 74,
-						"w": 86,
-						"h": 79
-					}
-				},
-				{
-					"filename": "0026.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 91,
-						"h": 87
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 8,
-						"w": 86,
-						"h": 79
-					},
-					"frame": {
-						"x": 91,
-						"y": 74,
-						"w": 86,
-						"h": 79
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 91,
-						"h": 87
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 85,
-						"h": 83
-					},
-					"frame": {
-						"x": 0,
-						"y": 77,
-						"w": 85,
-						"h": 83
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 91,
-						"h": 87
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 85,
-						"h": 83
-					},
-					"frame": {
-						"x": 0,
-						"y": 77,
-						"w": 85,
-						"h": 83
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 91,
-						"h": 87
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 85,
-						"h": 82
-					},
-					"frame": {
-						"x": 177,
-						"y": 75,
-						"w": 85,
-						"h": 82
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 91,
-						"h": 87
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 83,
-						"h": 83
-					},
-					"frame": {
-						"x": 85,
-						"y": 153,
-						"w": 83,
-						"h": 83
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 91,
-						"h": 87
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 83,
-						"h": 83
-					},
-					"frame": {
-						"x": 85,
-						"y": 153,
-						"w": 83,
-						"h": 83
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 91,
-						"h": 87
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 5,
-						"w": 80,
-						"h": 82
-					},
-					"frame": {
-						"x": 0,
-						"y": 236,
-						"w": 80,
-						"h": 82
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 91,
-						"h": 87
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 4,
-						"w": 80,
-						"h": 82
-					},
-					"frame": {
-						"x": 0,
-						"y": 236,
-						"w": 80,
-						"h": 82
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 91,
-						"h": 87
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 3,
-						"w": 80,
-						"h": 82
-					},
-					"frame": {
-						"x": 0,
-						"y": 236,
-						"w": 80,
-						"h": 82
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 91,
-						"h": 87
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 4,
-						"w": 83,
-						"h": 76
-					},
-					"frame": {
-						"x": 0,
-						"y": 160,
-						"w": 83,
-						"h": 76
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 91,
-						"h": 87
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 5,
-						"w": 83,
-						"h": 76
-					},
-					"frame": {
-						"x": 0,
-						"y": 160,
-						"w": 83,
-						"h": 76
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 91,
-						"h": 87
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 6,
-						"w": 81,
-						"h": 81
-					},
-					"frame": {
-						"x": 80,
-						"y": 236,
-						"w": 81,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 91,
-						"h": 87
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 7,
-						"w": 81,
-						"h": 80
-					},
-					"frame": {
-						"x": 161,
-						"y": 236,
-						"w": 81,
-						"h": 80
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 91,
-						"h": 87
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 7,
-						"w": 81,
-						"h": 80
-					},
-					"frame": {
-						"x": 161,
-						"y": 236,
-						"w": 81,
-						"h": 80
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 91,
-						"h": 87
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 3,
-						"w": 81,
-						"h": 79
-					},
-					"frame": {
-						"x": 168,
-						"y": 157,
-						"w": 81,
-						"h": 79
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 91,
-						"h": 87
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 2,
-						"w": 81,
-						"h": 79
-					},
-					"frame": {
-						"x": 168,
-						"y": 157,
-						"w": 81,
-						"h": 79
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 91,
-						"h": 87
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 2,
-						"w": 81,
-						"h": 79
-					},
-					"frame": {
-						"x": 168,
-						"y": 157,
-						"w": 81,
-						"h": 79
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:f669baef18fc6ae83124ad81c9b726f9:b705ee5bfe7dc7d92c348ffa4a4d6ce2:5d19509f6557fe13b0b6311434ba7e2d$"
-	}
-}
diff --git a/public/images/pokemon/exp/487-origin.png b/public/images/pokemon/exp/487-origin.png
deleted file mode 100644
index 370ddf89173..00000000000
Binary files a/public/images/pokemon/exp/487-origin.png and /dev/null differ
diff --git a/public/images/pokemon/exp/569-gigantamax.json b/public/images/pokemon/exp/569-gigantamax.json
new file mode 100644
index 00000000000..6cda2b0d79a
--- /dev/null
+++ b/public/images/pokemon/exp/569-gigantamax.json
@@ -0,0 +1,1478 @@
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 0, "y": 170, "w": 96, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 0, "y": 170, "w": 96, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 0, "y": 170, "w": 96, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 0, "y": 170, "w": 96, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 0, "y": 170, "w": 96, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 0, "y": 170, "w": 96, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 0, "y": 170, "w": 96, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 106, "y": 88, "w": 100, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 100, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 106, "y": 88, "w": 100, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 100, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 314, "y": 86, "w": 103, "h": 87 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 103, "h": 87 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 314, "y": 86, "w": 103, "h": 87 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 103, "h": 87 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 314, "y": 86, "w": 103, "h": 87 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 103, "h": 87 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 314, "y": 86, "w": 103, "h": 87 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 103, "h": 87 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 314, "y": 0, "w": 105, "h": 86 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 105, "h": 86 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 314, "y": 0, "w": 105, "h": 86 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 105, "h": 86 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 0, "y": 85, "w": 106, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 106, "h": 85 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 0, "y": 85, "w": 106, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 106, "h": 85 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 0, "y": 85, "w": 106, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 106, "h": 85 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 0, "y": 85, "w": 106, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 106, "h": 85 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 0, "y": 0, "w": 108, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 108, "h": 85 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 0, "y": 0, "w": 108, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 108, "h": 85 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 0, "y": 0, "w": 108, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 108, "h": 85 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 0, "y": 85, "w": 106, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 106, "h": 85 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 0, "y": 85, "w": 106, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 106, "h": 85 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 0, "y": 85, "w": 106, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 106, "h": 85 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 0, "y": 85, "w": 106, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 106, "h": 85 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 314, "y": 0, "w": 105, "h": 86 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 105, "h": 86 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 314, "y": 0, "w": 105, "h": 86 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 105, "h": 86 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 314, "y": 0, "w": 105, "h": 86 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 105, "h": 86 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 314, "y": 86, "w": 103, "h": 87 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 103, "h": 87 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 314, "y": 86, "w": 103, "h": 87 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 103, "h": 87 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 314, "y": 86, "w": 103, "h": 87 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 103, "h": 87 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 106, "y": 88, "w": 100, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 100, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 106, "y": 88, "w": 100, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 100, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 0, "y": 170, "w": 96, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 0, "y": 170, "w": 96, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 0, "y": 170, "w": 96, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 0, "y": 170, "w": 96, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 0, "y": 170, "w": 96, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 0, "y": 170, "w": 96, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 0, "y": 170, "w": 96, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 0, "y": 170, "w": 96, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 106, "y": 88, "w": 100, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 100, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 106, "y": 88, "w": 100, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 100, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 106, "y": 88, "w": 100, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 100, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 314, "y": 86, "w": 103, "h": 87 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 103, "h": 87 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 314, "y": 86, "w": 103, "h": 87 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 103, "h": 87 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 314, "y": 86, "w": 103, "h": 87 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 103, "h": 87 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 314, "y": 0, "w": 105, "h": 86 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 105, "h": 86 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 314, "y": 0, "w": 105, "h": 86 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 105, "h": 86 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 314, "y": 0, "w": 105, "h": 86 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 105, "h": 86 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 0, "y": 85, "w": 106, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 106, "h": 85 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 0, "y": 85, "w": 106, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 106, "h": 85 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 0, "y": 85, "w": 106, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 106, "h": 85 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 0, "y": 0, "w": 108, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 108, "h": 85 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 0, "y": 0, "w": 108, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 108, "h": 85 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 0, "y": 0, "w": 108, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 108, "h": 85 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 0, "y": 85, "w": 106, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 106, "h": 85 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 0, "y": 85, "w": 106, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 106, "h": 85 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 0, "y": 85, "w": 106, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 106, "h": 85 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 314, "y": 0, "w": 105, "h": 86 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 105, "h": 86 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 314, "y": 0, "w": 105, "h": 86 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 105, "h": 86 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 314, "y": 0, "w": 105, "h": 86 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 105, "h": 86 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 314, "y": 86, "w": 103, "h": 87 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 103, "h": 87 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 314, "y": 86, "w": 103, "h": 87 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 103, "h": 87 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 314, "y": 86, "w": 103, "h": 87 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 103, "h": 87 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 106, "y": 88, "w": 100, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 100, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 106, "y": 88, "w": 100, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 100, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 106, "y": 88, "w": 100, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 100, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 0, "y": 170, "w": 96, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 0, "y": 170, "w": 96, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 0, "y": 170, "w": 96, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 305, "y": 173, "w": 96, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 305, "y": 173, "w": 96, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 305, "y": 173, "w": 96, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 206, "y": 88, "w": 99, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 99, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 206, "y": 88, "w": 99, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 99, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 108, "y": 0, "w": 103, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 0, "w": 103, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 108, "y": 0, "w": 103, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 0, "w": 103, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 108, "y": 0, "w": 103, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 0, "w": 103, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 211, "y": 0, "w": 103, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 0, "w": 103, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 211, "y": 0, "w": 103, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 0, "w": 103, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 211, "y": 0, "w": 103, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 0, "w": 103, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 211, "y": 0, "w": 103, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 0, "w": 103, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 211, "y": 0, "w": 103, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 0, "w": 103, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 211, "y": 0, "w": 103, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 0, "w": 103, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 108, "y": 0, "w": 103, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 0, "w": 103, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0088.png",
+    "frame": { "x": 108, "y": 0, "w": 103, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 0, "w": 103, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0089.png",
+    "frame": { "x": 108, "y": 0, "w": 103, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 0, "w": 103, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0090.png",
+    "frame": { "x": 108, "y": 0, "w": 103, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 0, "w": 103, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0091.png",
+    "frame": { "x": 206, "y": 88, "w": 99, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 99, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0092.png",
+    "frame": { "x": 206, "y": 88, "w": 99, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 99, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0093.png",
+    "frame": { "x": 206, "y": 88, "w": 99, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 99, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0094.png",
+    "frame": { "x": 305, "y": 173, "w": 96, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0095.png",
+    "frame": { "x": 0, "y": 170, "w": 96, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0096.png",
+    "frame": { "x": 0, "y": 170, "w": 96, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0097.png",
+    "frame": { "x": 0, "y": 170, "w": 96, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0098.png",
+    "frame": { "x": 0, "y": 170, "w": 96, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0099.png",
+    "frame": { "x": 0, "y": 170, "w": 96, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0100.png",
+    "frame": { "x": 0, "y": 170, "w": 96, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0101.png",
+    "frame": { "x": 0, "y": 170, "w": 96, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0102.png",
+    "frame": { "x": 0, "y": 170, "w": 96, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0103.png",
+    "frame": { "x": 106, "y": 88, "w": 100, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 100, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0104.png",
+    "frame": { "x": 106, "y": 88, "w": 100, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 100, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0105.png",
+    "frame": { "x": 106, "y": 88, "w": 100, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 100, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0106.png",
+    "frame": { "x": 314, "y": 86, "w": 103, "h": 87 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 103, "h": 87 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0107.png",
+    "frame": { "x": 314, "y": 86, "w": 103, "h": 87 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 103, "h": 87 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0108.png",
+    "frame": { "x": 314, "y": 86, "w": 103, "h": 87 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 103, "h": 87 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0109.png",
+    "frame": { "x": 314, "y": 0, "w": 105, "h": 86 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 105, "h": 86 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0110.png",
+    "frame": { "x": 314, "y": 0, "w": 105, "h": 86 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 105, "h": 86 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0111.png",
+    "frame": { "x": 314, "y": 0, "w": 105, "h": 86 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 105, "h": 86 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0112.png",
+    "frame": { "x": 0, "y": 85, "w": 106, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 106, "h": 85 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0113.png",
+    "frame": { "x": 0, "y": 85, "w": 106, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 106, "h": 85 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0114.png",
+    "frame": { "x": 0, "y": 85, "w": 106, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 106, "h": 85 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0115.png",
+    "frame": { "x": 0, "y": 0, "w": 108, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 108, "h": 85 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0116.png",
+    "frame": { "x": 0, "y": 0, "w": 108, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 108, "h": 85 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0117.png",
+    "frame": { "x": 0, "y": 0, "w": 108, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 108, "h": 85 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0118.png",
+    "frame": { "x": 0, "y": 85, "w": 106, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 106, "h": 85 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0119.png",
+    "frame": { "x": 0, "y": 85, "w": 106, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 106, "h": 85 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0120.png",
+    "frame": { "x": 0, "y": 85, "w": 106, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 106, "h": 85 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0121.png",
+    "frame": { "x": 314, "y": 0, "w": 105, "h": 86 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 105, "h": 86 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0122.png",
+    "frame": { "x": 314, "y": 0, "w": 105, "h": 86 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 105, "h": 86 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0123.png",
+    "frame": { "x": 314, "y": 0, "w": 105, "h": 86 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 105, "h": 86 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0124.png",
+    "frame": { "x": 314, "y": 86, "w": 103, "h": 87 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 103, "h": 87 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0125.png",
+    "frame": { "x": 314, "y": 86, "w": 103, "h": 87 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 103, "h": 87 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0126.png",
+    "frame": { "x": 106, "y": 88, "w": 100, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 100, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0127.png",
+    "frame": { "x": 106, "y": 88, "w": 100, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 100, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0128.png",
+    "frame": { "x": 106, "y": 88, "w": 100, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 100, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0129.png",
+    "frame": { "x": 106, "y": 88, "w": 100, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 100, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0130.png",
+    "frame": { "x": 0, "y": 170, "w": 96, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0131.png",
+    "frame": { "x": 0, "y": 170, "w": 96, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0132.png",
+    "frame": { "x": 0, "y": 170, "w": 96, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0133.png",
+    "frame": { "x": 0, "y": 170, "w": 96, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0134.png",
+    "frame": { "x": 0, "y": 170, "w": 96, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0135.png",
+    "frame": { "x": 0, "y": 170, "w": 96, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0136.png",
+    "frame": { "x": 0, "y": 170, "w": 96, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0137.png",
+    "frame": { "x": 0, "y": 170, "w": 96, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0138.png",
+    "frame": { "x": 106, "y": 88, "w": 100, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 100, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0139.png",
+    "frame": { "x": 106, "y": 88, "w": 100, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 100, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0140.png",
+    "frame": { "x": 314, "y": 86, "w": 103, "h": 87 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 103, "h": 87 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0141.png",
+    "frame": { "x": 314, "y": 86, "w": 103, "h": 87 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 103, "h": 87 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0142.png",
+    "frame": { "x": 314, "y": 86, "w": 103, "h": 87 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 103, "h": 87 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0143.png",
+    "frame": { "x": 314, "y": 0, "w": 105, "h": 86 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 105, "h": 86 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0144.png",
+    "frame": { "x": 314, "y": 0, "w": 105, "h": 86 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 105, "h": 86 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0145.png",
+    "frame": { "x": 314, "y": 0, "w": 105, "h": 86 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 105, "h": 86 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0146.png",
+    "frame": { "x": 0, "y": 85, "w": 106, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 106, "h": 85 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0147.png",
+    "frame": { "x": 0, "y": 85, "w": 106, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 106, "h": 85 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0148.png",
+    "frame": { "x": 0, "y": 85, "w": 106, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 106, "h": 85 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0149.png",
+    "frame": { "x": 0, "y": 85, "w": 106, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 106, "h": 85 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0150.png",
+    "frame": { "x": 0, "y": 0, "w": 108, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 108, "h": 85 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0151.png",
+    "frame": { "x": 0, "y": 0, "w": 108, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 108, "h": 85 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0152.png",
+    "frame": { "x": 0, "y": 85, "w": 106, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 106, "h": 85 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0153.png",
+    "frame": { "x": 0, "y": 85, "w": 106, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 106, "h": 85 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0154.png",
+    "frame": { "x": 0, "y": 85, "w": 106, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 106, "h": 85 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0155.png",
+    "frame": { "x": 314, "y": 0, "w": 105, "h": 86 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 105, "h": 86 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0156.png",
+    "frame": { "x": 314, "y": 0, "w": 105, "h": 86 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 105, "h": 86 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0157.png",
+    "frame": { "x": 314, "y": 0, "w": 105, "h": 86 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 105, "h": 86 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0158.png",
+    "frame": { "x": 314, "y": 86, "w": 103, "h": 87 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 103, "h": 87 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0159.png",
+    "frame": { "x": 314, "y": 86, "w": 103, "h": 87 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 103, "h": 87 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0160.png",
+    "frame": { "x": 314, "y": 86, "w": 103, "h": 87 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 103, "h": 87 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0161.png",
+    "frame": { "x": 314, "y": 86, "w": 103, "h": 87 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 103, "h": 87 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0162.png",
+    "frame": { "x": 106, "y": 88, "w": 100, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 100, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0163.png",
+    "frame": { "x": 106, "y": 88, "w": 100, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 100, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.13-x64",
+  "image": "569-gigantamax.png",
+  "format": "I8",
+  "size": { "w": 419, "h": 261 },
+  "scale": "1"
+ }
+}
diff --git a/public/images/pokemon/exp/569-gigantamax.png b/public/images/pokemon/exp/569-gigantamax.png
new file mode 100644
index 00000000000..90decc0ad84
Binary files /dev/null and b/public/images/pokemon/exp/569-gigantamax.png differ
diff --git a/public/images/pokemon/exp/651.json b/public/images/pokemon/exp/651.json
index 5db25b75d8e..20bdccd5bd4 100644
--- a/public/images/pokemon/exp/651.json
+++ b/public/images/pokemon/exp/651.json
@@ -1,188 +1,713 @@
-{
-	"textures": [
-		{
-			"image": "651.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 116,
-				"h": 116
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 58,
-						"h": 53
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 58,
-						"h": 53
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 58,
-						"h": 53
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 58,
-						"h": 53
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 58,
-						"h": 53
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 58,
-						"h": 53
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 58,
-						"h": 53
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 58,
-						"h": 53
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 58,
-						"h": 53
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 58,
-						"h": 53
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 58,
-						"h": 53
-					},
-					"frame": {
-						"x": 58,
-						"y": 0,
-						"w": 58,
-						"h": 53
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 58,
-						"h": 53
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 58,
-						"h": 53
-					},
-					"frame": {
-						"x": 58,
-						"y": 0,
-						"w": 58,
-						"h": 53
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 58,
-						"h": 53
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 58,
-						"h": 53
-					},
-					"frame": {
-						"x": 0,
-						"y": 53,
-						"w": 58,
-						"h": 53
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 53
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 58,
-						"h": 52
-					},
-					"frame": {
-						"x": 58,
-						"y": 53,
-						"w": 58,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 53
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 58,
-						"h": 52
-					},
-					"frame": {
-						"x": 58,
-						"y": 53,
-						"w": 58,
-						"h": 52
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:d110ead01ff70d3da8dfb432dfe00ac0:207046ea51a1627a342c2b30f969868e:a93e5fa02e10bf11e3ed8bf6571835ca$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 119, "y": 49, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 55, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 175, "y": 49, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 55, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 355, "y": 49, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 55, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 278, "y": 101, "w": 54, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 54, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 110, "y": 151, "w": 54, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 54, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 56, "y": 101, "w": 53, "h": 51 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 53, "h": 51 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 165, "y": 151, "w": 54, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 54, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 333, "y": 151, "w": 54, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 54, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 287, "y": 50, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 55, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 112, "y": 100, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 55, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 168, "y": 100, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 55, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 0, "y": 152, "w": 54, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 54, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 278, "y": 152, "w": 54, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 54, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 56, "y": 50, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 55, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 231, "y": 50, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 55, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 224, "y": 101, "w": 53, "h": 51 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 53, "h": 51 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 343, "y": 100, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 55, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 0, "y": 50, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 55, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 55, "y": 153, "w": 54, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 54, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 220, "y": 153, "w": 54, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 54, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 119, "y": 49, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 55, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 175, "y": 49, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 55, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 355, "y": 49, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 55, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 278, "y": 101, "w": 54, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 54, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 110, "y": 151, "w": 54, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 54, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 56, "y": 101, "w": 53, "h": 51 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 53, "h": 51 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 165, "y": 151, "w": 54, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 54, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 333, "y": 151, "w": 54, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 54, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 287, "y": 50, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 55, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 112, "y": 100, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 55, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 168, "y": 100, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 55, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 0, "y": 152, "w": 54, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 54, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 278, "y": 152, "w": 54, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 54, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 56, "y": 50, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 55, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 231, "y": 50, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 55, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 224, "y": 101, "w": 53, "h": 51 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 53, "h": 51 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 343, "y": 100, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 55, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 0, "y": 50, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 55, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 55, "y": 153, "w": 54, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 54, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 220, "y": 153, "w": 54, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 54, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 119, "y": 49, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 55, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 175, "y": 49, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 55, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 355, "y": 49, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 55, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 278, "y": 101, "w": 54, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 54, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 110, "y": 151, "w": 54, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 54, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 56, "y": 101, "w": 53, "h": 51 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 53, "h": 51 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 165, "y": 151, "w": 54, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 54, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 333, "y": 151, "w": 54, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 54, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 287, "y": 50, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 55, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 112, "y": 100, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 55, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 168, "y": 100, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 55, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 0, "y": 152, "w": 54, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 54, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 278, "y": 152, "w": 54, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 54, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 56, "y": 50, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 55, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 231, "y": 50, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 55, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 224, "y": 101, "w": 53, "h": 51 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 53, "h": 51 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 343, "y": 100, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 55, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 0, "y": 50, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 55, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 55, "y": 153, "w": 54, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 54, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 220, "y": 153, "w": 54, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 54, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 119, "y": 49, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 55, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 239, "y": 0, "w": 57, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 49 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 60, "y": 0, "w": 58, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 58, "h": 49 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 355, "y": 0, "w": 58, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 58, "h": 48 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 0, "y": 0, "w": 59, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 59, "h": 49 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 119, "y": 0, "w": 59, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 59, "h": 48 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 179, "y": 0, "w": 59, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 5, "w": 59, "h": 48 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 297, "y": 0, "w": 57, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 49 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 0, "y": 101, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 55, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 0, "y": 203, "w": 53, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 53, "h": 49 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 329, "y": 252, "w": 51, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 2, "w": 51, "h": 47 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 109, "y": 252, "w": 51, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 51, "h": 48 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 219, "y": 204, "w": 52, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 2, "w": 52, "h": 49 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 166, "y": 202, "w": 52, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 52, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 275, "y": 203, "w": 53, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 4, "w": 53, "h": 49 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 54, "y": 204, "w": 54, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 54, "h": 48 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 333, "y": 202, "w": 54, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 54, "h": 49 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 110, "y": 202, "w": 55, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 55, "h": 49 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.11-x64",
+  "image": "651.png",
+  "format": "I8",
+  "size": { "w": 413, "h": 300 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/651.png b/public/images/pokemon/exp/651.png
index 42a1af8184d..633a3cc0c75 100644
Binary files a/public/images/pokemon/exp/651.png and b/public/images/pokemon/exp/651.png differ
diff --git a/public/images/pokemon/exp/653.json b/public/images/pokemon/exp/653.json
index 19654fbb3cb..a08242f32cf 100644
--- a/public/images/pokemon/exp/653.json
+++ b/public/images/pokemon/exp/653.json
@@ -1,1553 +1,947 @@
-{
-	"textures": [
-		{
-			"image": "653.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 180,
-				"h": 180
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 47,
-						"h": 45
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 47,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 47,
-						"h": 45
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 47,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0027.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 47,
-						"h": 45
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 47,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0037.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 47,
-						"h": 45
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 47,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0047.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 47,
-						"h": 45
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 47,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0057.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 47,
-						"h": 45
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 47,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 47,
-						"h": 45
-					},
-					"frame": {
-						"x": 47,
-						"y": 0,
-						"w": 47,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 47,
-						"h": 45
-					},
-					"frame": {
-						"x": 47,
-						"y": 0,
-						"w": 47,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0028.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 47,
-						"h": 45
-					},
-					"frame": {
-						"x": 47,
-						"y": 0,
-						"w": 47,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0038.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 47,
-						"h": 45
-					},
-					"frame": {
-						"x": 47,
-						"y": 0,
-						"w": 47,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0048.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 47,
-						"h": 45
-					},
-					"frame": {
-						"x": 47,
-						"y": 0,
-						"w": 47,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0058.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 47,
-						"h": 45
-					},
-					"frame": {
-						"x": 47,
-						"y": 0,
-						"w": 47,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 43,
-						"h": 49
-					},
-					"frame": {
-						"x": 94,
-						"y": 0,
-						"w": 43,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 43,
-						"h": 49
-					},
-					"frame": {
-						"x": 94,
-						"y": 0,
-						"w": 43,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 43,
-						"h": 49
-					},
-					"frame": {
-						"x": 94,
-						"y": 0,
-						"w": 43,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 43,
-						"h": 49
-					},
-					"frame": {
-						"x": 94,
-						"y": 0,
-						"w": 43,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 43,
-						"h": 49
-					},
-					"frame": {
-						"x": 94,
-						"y": 0,
-						"w": 43,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0029.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 43,
-						"h": 49
-					},
-					"frame": {
-						"x": 94,
-						"y": 0,
-						"w": 43,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0033.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 43,
-						"h": 49
-					},
-					"frame": {
-						"x": 94,
-						"y": 0,
-						"w": 43,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0039.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 43,
-						"h": 49
-					},
-					"frame": {
-						"x": 94,
-						"y": 0,
-						"w": 43,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0043.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 43,
-						"h": 49
-					},
-					"frame": {
-						"x": 94,
-						"y": 0,
-						"w": 43,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0049.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 43,
-						"h": 49
-					},
-					"frame": {
-						"x": 94,
-						"y": 0,
-						"w": 43,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0053.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 43,
-						"h": 49
-					},
-					"frame": {
-						"x": 94,
-						"y": 0,
-						"w": 43,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0059.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 43,
-						"h": 49
-					},
-					"frame": {
-						"x": 94,
-						"y": 0,
-						"w": 43,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 42,
-						"h": 49
-					},
-					"frame": {
-						"x": 137,
-						"y": 0,
-						"w": 42,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 42,
-						"h": 49
-					},
-					"frame": {
-						"x": 137,
-						"y": 0,
-						"w": 42,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 42,
-						"h": 49
-					},
-					"frame": {
-						"x": 137,
-						"y": 0,
-						"w": 42,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0031.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 42,
-						"h": 49
-					},
-					"frame": {
-						"x": 137,
-						"y": 0,
-						"w": 42,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0041.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 42,
-						"h": 49
-					},
-					"frame": {
-						"x": 137,
-						"y": 0,
-						"w": 42,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0051.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 42,
-						"h": 49
-					},
-					"frame": {
-						"x": 137,
-						"y": 0,
-						"w": 42,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 47,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 45,
-						"w": 47,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 47,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 45,
-						"w": 47,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0025.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 47,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 45,
-						"w": 47,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0035.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 47,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 45,
-						"w": 47,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0045.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 47,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 45,
-						"w": 47,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0055.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 47,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 45,
-						"w": 47,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 2,
-						"w": 44,
-						"h": 47
-					},
-					"frame": {
-						"x": 47,
-						"y": 45,
-						"w": 44,
-						"h": 47
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 2,
-						"w": 44,
-						"h": 47
-					},
-					"frame": {
-						"x": 47,
-						"y": 45,
-						"w": 44,
-						"h": 47
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 2,
-						"w": 44,
-						"h": 47
-					},
-					"frame": {
-						"x": 47,
-						"y": 45,
-						"w": 44,
-						"h": 47
-					}
-				},
-				{
-					"filename": "0034.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 2,
-						"w": 44,
-						"h": 47
-					},
-					"frame": {
-						"x": 47,
-						"y": 45,
-						"w": 44,
-						"h": 47
-					}
-				},
-				{
-					"filename": "0044.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 2,
-						"w": 44,
-						"h": 47
-					},
-					"frame": {
-						"x": 47,
-						"y": 45,
-						"w": 44,
-						"h": 47
-					}
-				},
-				{
-					"filename": "0054.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 2,
-						"w": 44,
-						"h": 47
-					},
-					"frame": {
-						"x": 47,
-						"y": 45,
-						"w": 44,
-						"h": 47
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 42,
-						"h": 49
-					},
-					"frame": {
-						"x": 0,
-						"y": 89,
-						"w": 42,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 42,
-						"h": 49
-					},
-					"frame": {
-						"x": 0,
-						"y": 89,
-						"w": 42,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 42,
-						"h": 49
-					},
-					"frame": {
-						"x": 0,
-						"y": 89,
-						"w": 42,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0032.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 42,
-						"h": 49
-					},
-					"frame": {
-						"x": 0,
-						"y": 89,
-						"w": 42,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0042.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 42,
-						"h": 49
-					},
-					"frame": {
-						"x": 0,
-						"y": 89,
-						"w": 42,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0052.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 42,
-						"h": 49
-					},
-					"frame": {
-						"x": 0,
-						"y": 89,
-						"w": 42,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 47,
-						"h": 42
-					},
-					"frame": {
-						"x": 0,
-						"y": 138,
-						"w": 47,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 47,
-						"h": 42
-					},
-					"frame": {
-						"x": 0,
-						"y": 138,
-						"w": 47,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0026.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 47,
-						"h": 42
-					},
-					"frame": {
-						"x": 0,
-						"y": 138,
-						"w": 47,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0036.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 47,
-						"h": 42
-					},
-					"frame": {
-						"x": 0,
-						"y": 138,
-						"w": 47,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0046.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 47,
-						"h": 42
-					},
-					"frame": {
-						"x": 0,
-						"y": 138,
-						"w": 47,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0056.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 47,
-						"h": 42
-					},
-					"frame": {
-						"x": 0,
-						"y": 138,
-						"w": 47,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0063.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 46,
-						"h": 44
-					},
-					"frame": {
-						"x": 42,
-						"y": 92,
-						"w": 46,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0065.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 46,
-						"h": 44
-					},
-					"frame": {
-						"x": 42,
-						"y": 92,
-						"w": 46,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0067.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 46,
-						"h": 44
-					},
-					"frame": {
-						"x": 42,
-						"y": 92,
-						"w": 46,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0069.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 46,
-						"h": 44
-					},
-					"frame": {
-						"x": 42,
-						"y": 92,
-						"w": 46,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0071.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 46,
-						"h": 44
-					},
-					"frame": {
-						"x": 42,
-						"y": 92,
-						"w": 46,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0064.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 47,
-						"h": 42
-					},
-					"frame": {
-						"x": 47,
-						"y": 136,
-						"w": 47,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 42,
-						"h": 49
-					},
-					"frame": {
-						"x": 91,
-						"y": 49,
-						"w": 42,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 42,
-						"h": 49
-					},
-					"frame": {
-						"x": 91,
-						"y": 49,
-						"w": 42,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0030.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 42,
-						"h": 49
-					},
-					"frame": {
-						"x": 91,
-						"y": 49,
-						"w": 42,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0040.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 42,
-						"h": 49
-					},
-					"frame": {
-						"x": 91,
-						"y": 49,
-						"w": 42,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0050.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 42,
-						"h": 49
-					},
-					"frame": {
-						"x": 91,
-						"y": 49,
-						"w": 42,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0060.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 42,
-						"h": 49
-					},
-					"frame": {
-						"x": 91,
-						"y": 49,
-						"w": 42,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0061.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 42,
-						"h": 49
-					},
-					"frame": {
-						"x": 133,
-						"y": 49,
-						"w": 42,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0073.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 42,
-						"h": 49
-					},
-					"frame": {
-						"x": 133,
-						"y": 49,
-						"w": 42,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0062.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 2,
-						"w": 43,
-						"h": 47
-					},
-					"frame": {
-						"x": 94,
-						"y": 98,
-						"w": 43,
-						"h": 47
-					}
-				},
-				{
-					"filename": "0072.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 2,
-						"w": 43,
-						"h": 47
-					},
-					"frame": {
-						"x": 94,
-						"y": 98,
-						"w": 43,
-						"h": 47
-					}
-				},
-				{
-					"filename": "0066.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 43,
-						"h": 46
-					},
-					"frame": {
-						"x": 137,
-						"y": 98,
-						"w": 43,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0068.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 43,
-						"h": 46
-					},
-					"frame": {
-						"x": 137,
-						"y": 98,
-						"w": 43,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0070.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 43,
-						"h": 46
-					},
-					"frame": {
-						"x": 137,
-						"y": 98,
-						"w": 43,
-						"h": 46
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:3f19f65b0cc7eac6c736e7e4bd91d830:87ecb6f1ef5612019ef73bbf8249079d:a7be961d0230f568aff23d95e7ff0036$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 83, "y": 132, "w": 38, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 38, "h": 43 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 83, "y": 132, "w": 38, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 38, "h": 43 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 83, "y": 132, "w": 38, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 38, "h": 43 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 40, "y": 88, "w": 40, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 40, "y": 88, "w": 40, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 0, "y": 130, "w": 41, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 41, "h": 40 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 0, "y": 130, "w": 41, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 41, "h": 40 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 41, "y": 130, "w": 42, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 6, "w": 42, "h": 39 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 41, "y": 130, "w": 42, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 6, "w": 42, "h": 39 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 0, "y": 130, "w": 41, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 41, "h": 40 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 0, "y": 130, "w": 41, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 41, "h": 40 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 40, "y": 88, "w": 40, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 40, "y": 88, "w": 40, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 80, "y": 88, "w": 40, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 80, "y": 88, "w": 40, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 83, "y": 132, "w": 38, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 38, "h": 43 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 83, "y": 132, "w": 38, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 38, "h": 43 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 83, "y": 132, "w": 38, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 38, "h": 43 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 40, "y": 88, "w": 40, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 40, "y": 88, "w": 40, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 0, "y": 130, "w": 41, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 41, "h": 40 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 0, "y": 130, "w": 41, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 41, "h": 40 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 41, "y": 130, "w": 42, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 6, "w": 42, "h": 39 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 41, "y": 130, "w": 42, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 6, "w": 42, "h": 39 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 0, "y": 130, "w": 41, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 41, "h": 40 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 0, "y": 130, "w": 41, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 41, "h": 40 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 40, "y": 88, "w": 40, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 40, "y": 88, "w": 40, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 80, "y": 88, "w": 40, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 80, "y": 88, "w": 40, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 83, "y": 132, "w": 38, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 38, "h": 43 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 83, "y": 132, "w": 38, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 38, "h": 43 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 83, "y": 132, "w": 38, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 38, "h": 43 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 40, "y": 88, "w": 40, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 40, "y": 88, "w": 40, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 0, "y": 130, "w": 41, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 41, "h": 40 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 0, "y": 130, "w": 41, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 41, "h": 40 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 41, "y": 130, "w": 42, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 6, "w": 42, "h": 39 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 41, "y": 130, "w": 42, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 6, "w": 42, "h": 39 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 0, "y": 130, "w": 41, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 41, "h": 40 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 0, "y": 130, "w": 41, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 41, "h": 40 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 40, "y": 88, "w": 40, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 40, "y": 88, "w": 40, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 80, "y": 88, "w": 40, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 80, "y": 88, "w": 40, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 83, "y": 132, "w": 38, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 38, "h": 43 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 83, "y": 132, "w": 38, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 38, "h": 43 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 83, "y": 132, "w": 38, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 38, "h": 43 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 40, "y": 88, "w": 40, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 40, "y": 88, "w": 40, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 0, "y": 130, "w": 41, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 41, "h": 40 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 0, "y": 130, "w": 41, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 41, "h": 40 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 41, "y": 130, "w": 42, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 6, "w": 42, "h": 39 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 41, "y": 130, "w": 42, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 6, "w": 42, "h": 39 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 0, "y": 130, "w": 41, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 41, "h": 40 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 0, "y": 130, "w": 41, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 41, "h": 40 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 40, "y": 88, "w": 40, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 40, "y": 88, "w": 40, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 80, "y": 88, "w": 40, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 80, "y": 88, "w": 40, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 83, "y": 132, "w": 38, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 38, "h": 43 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 83, "y": 132, "w": 38, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 38, "h": 43 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 83, "y": 132, "w": 38, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 38, "h": 43 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 40, "y": 88, "w": 40, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 40, "y": 88, "w": 40, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 0, "y": 130, "w": 41, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 41, "h": 40 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 0, "y": 130, "w": 41, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 41, "h": 40 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 41, "y": 130, "w": 42, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 6, "w": 42, "h": 39 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 41, "y": 130, "w": 42, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 6, "w": 42, "h": 39 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 0, "y": 130, "w": 41, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 41, "h": 40 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 0, "y": 130, "w": 41, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 41, "h": 40 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 40, "y": 88, "w": 40, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 40, "y": 88, "w": 40, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 80, "y": 88, "w": 40, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 80, "y": 88, "w": 40, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 83, "y": 132, "w": 38, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 38, "h": 43 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 83, "y": 132, "w": 38, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 38, "h": 43 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 83, "y": 132, "w": 38, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 38, "h": 43 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 120, "y": 88, "w": 38, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 38, "h": 44 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 120, "y": 88, "w": 38, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 38, "h": 44 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 0, "y": 45, "w": 40, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 40, "h": 44 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 0, "y": 45, "w": 40, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 40, "h": 44 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 0, "y": 0, "w": 42, "h": 45 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 42, "h": 45 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 0, "y": 0, "w": 42, "h": 45 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 42, "h": 45 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 42, "y": 0, "w": 42, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 42, "h": 44 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 42, "y": 0, "w": 42, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 42, "h": 44 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 42, "y": 0, "w": 42, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 42, "h": 44 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0088.png",
+    "frame": { "x": 42, "y": 44, "w": 41, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 41, "h": 44 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0089.png",
+    "frame": { "x": 42, "y": 44, "w": 41, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 41, "h": 44 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0090.png",
+    "frame": { "x": 84, "y": 0, "w": 42, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 42, "h": 44 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0091.png",
+    "frame": { "x": 84, "y": 0, "w": 42, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 42, "h": 44 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0092.png",
+    "frame": { "x": 83, "y": 44, "w": 41, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 41, "h": 44 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0093.png",
+    "frame": { "x": 83, "y": 44, "w": 41, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 41, "h": 44 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0094.png",
+    "frame": { "x": 84, "y": 0, "w": 42, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 42, "h": 44 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0095.png",
+    "frame": { "x": 124, "y": 44, "w": 41, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 41, "h": 44 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0096.png",
+    "frame": { "x": 124, "y": 44, "w": 41, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 41, "h": 44 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0097.png",
+    "frame": { "x": 126, "y": 0, "w": 42, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 42, "h": 44 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0098.png",
+    "frame": { "x": 126, "y": 0, "w": 42, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 42, "h": 44 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0099.png",
+    "frame": { "x": 0, "y": 0, "w": 42, "h": 45 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 42, "h": 45 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0100.png",
+    "frame": { "x": 0, "y": 0, "w": 42, "h": 45 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 42, "h": 45 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0101.png",
+    "frame": { "x": 0, "y": 45, "w": 40, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 40, "h": 44 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0102.png",
+    "frame": { "x": 0, "y": 45, "w": 40, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 40, "h": 44 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0103.png",
+    "frame": { "x": 120, "y": 88, "w": 38, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 38, "h": 44 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0104.png",
+    "frame": { "x": 120, "y": 88, "w": 38, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 38, "h": 44 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "653.png",
+  "format": "I8",
+  "size": { "w": 168, "h": 175 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/653.png b/public/images/pokemon/exp/653.png
index cf42c8754bc..66e359173aa 100644
Binary files a/public/images/pokemon/exp/653.png and b/public/images/pokemon/exp/653.png differ
diff --git a/public/images/pokemon/exp/654.json b/public/images/pokemon/exp/654.json
index a7f07f56864..74019f665ec 100644
--- a/public/images/pokemon/exp/654.json
+++ b/public/images/pokemon/exp/654.json
@@ -1,818 +1,695 @@
-{
-	"textures": [
-		{
-			"image": "654.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 390,
-				"h": 390
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 81
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 47,
-						"h": 81
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 47,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 81
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 47,
-						"h": 81
-					},
-					"frame": {
-						"x": 0,
-						"y": 81,
-						"w": 47,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0038.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 81
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 47,
-						"h": 81
-					},
-					"frame": {
-						"x": 0,
-						"y": 162,
-						"w": 47,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0037.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 81
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 47,
-						"h": 80
-					},
-					"frame": {
-						"x": 0,
-						"y": 243,
-						"w": 47,
-						"h": 80
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 81
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 46,
-						"h": 81
-					},
-					"frame": {
-						"x": 47,
-						"y": 0,
-						"w": 46,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 81
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 46,
-						"h": 81
-					},
-					"frame": {
-						"x": 47,
-						"y": 81,
-						"w": 46,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 81
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 46,
-						"h": 81
-					},
-					"frame": {
-						"x": 47,
-						"y": 162,
-						"w": 46,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 81
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 46,
-						"h": 80
-					},
-					"frame": {
-						"x": 47,
-						"y": 243,
-						"w": 46,
-						"h": 80
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 81
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 46,
-						"h": 79
-					},
-					"frame": {
-						"x": 93,
-						"y": 0,
-						"w": 46,
-						"h": 79
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 81
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 46,
-						"h": 79
-					},
-					"frame": {
-						"x": 93,
-						"y": 79,
-						"w": 46,
-						"h": 79
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 81
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 2,
-						"w": 46,
-						"h": 79
-					},
-					"frame": {
-						"x": 93,
-						"y": 158,
-						"w": 46,
-						"h": 79
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 81
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 2,
-						"w": 46,
-						"h": 79
-					},
-					"frame": {
-						"x": 93,
-						"y": 237,
-						"w": 46,
-						"h": 79
-					}
-				},
-				{
-					"filename": "0029.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 81
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 7,
-						"w": 46,
-						"h": 74
-					},
-					"frame": {
-						"x": 93,
-						"y": 316,
-						"w": 46,
-						"h": 74
-					}
-				},
-				{
-					"filename": "0036.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 81
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 2,
-						"w": 46,
-						"h": 79
-					},
-					"frame": {
-						"x": 139,
-						"y": 0,
-						"w": 46,
-						"h": 79
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 81
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 45,
-						"h": 80
-					},
-					"frame": {
-						"x": 139,
-						"y": 79,
-						"w": 45,
-						"h": 80
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 81
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 45,
-						"h": 80
-					},
-					"frame": {
-						"x": 139,
-						"y": 159,
-						"w": 45,
-						"h": 80
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 81
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 3,
-						"w": 46,
-						"h": 78
-					},
-					"frame": {
-						"x": 139,
-						"y": 239,
-						"w": 46,
-						"h": 78
-					}
-				},
-				{
-					"filename": "0031.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 81
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 8,
-						"w": 46,
-						"h": 73
-					},
-					"frame": {
-						"x": 139,
-						"y": 317,
-						"w": 46,
-						"h": 73
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 81
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 45,
-						"h": 79
-					},
-					"frame": {
-						"x": 184,
-						"y": 79,
-						"w": 45,
-						"h": 79
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 81
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 45,
-						"h": 79
-					},
-					"frame": {
-						"x": 185,
-						"y": 0,
-						"w": 45,
-						"h": 79
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 81
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 45,
-						"h": 79
-					},
-					"frame": {
-						"x": 184,
-						"y": 158,
-						"w": 45,
-						"h": 79
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 81
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 45,
-						"h": 79
-					},
-					"frame": {
-						"x": 185,
-						"y": 237,
-						"w": 45,
-						"h": 79
-					}
-				},
-				{
-					"filename": "0030.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 81
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 7,
-						"w": 46,
-						"h": 74
-					},
-					"frame": {
-						"x": 185,
-						"y": 316,
-						"w": 46,
-						"h": 74
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 81
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 45,
-						"h": 79
-					},
-					"frame": {
-						"x": 229,
-						"y": 79,
-						"w": 45,
-						"h": 79
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 81
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 2,
-						"w": 45,
-						"h": 79
-					},
-					"frame": {
-						"x": 230,
-						"y": 0,
-						"w": 45,
-						"h": 79
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 81
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 2,
-						"w": 45,
-						"h": 79
-					},
-					"frame": {
-						"x": 229,
-						"y": 158,
-						"w": 45,
-						"h": 79
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 81
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 45,
-						"h": 79
-					},
-					"frame": {
-						"x": 230,
-						"y": 237,
-						"w": 45,
-						"h": 79
-					}
-				},
-				{
-					"filename": "0032.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 81
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 8,
-						"w": 46,
-						"h": 73
-					},
-					"frame": {
-						"x": 231,
-						"y": 316,
-						"w": 46,
-						"h": 73
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 81
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 4,
-						"w": 46,
-						"h": 77
-					},
-					"frame": {
-						"x": 274,
-						"y": 79,
-						"w": 46,
-						"h": 77
-					}
-				},
-				{
-					"filename": "0028.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 81
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 6,
-						"w": 47,
-						"h": 75
-					},
-					"frame": {
-						"x": 275,
-						"y": 0,
-						"w": 47,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 81
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 3,
-						"w": 45,
-						"h": 78
-					},
-					"frame": {
-						"x": 274,
-						"y": 156,
-						"w": 45,
-						"h": 78
-					}
-				},
-				{
-					"filename": "0035.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 81
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 3,
-						"w": 45,
-						"h": 78
-					},
-					"frame": {
-						"x": 275,
-						"y": 234,
-						"w": 45,
-						"h": 78
-					}
-				},
-				{
-					"filename": "0026.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 81
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 5,
-						"w": 46,
-						"h": 76
-					},
-					"frame": {
-						"x": 319,
-						"y": 156,
-						"w": 46,
-						"h": 76
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 81
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 4,
-						"w": 45,
-						"h": 77
-					},
-					"frame": {
-						"x": 320,
-						"y": 75,
-						"w": 45,
-						"h": 77
-					}
-				},
-				{
-					"filename": "0027.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 81
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 6,
-						"w": 46,
-						"h": 75
-					},
-					"frame": {
-						"x": 322,
-						"y": 0,
-						"w": 46,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0033.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 81
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 6,
-						"w": 46,
-						"h": 75
-					},
-					"frame": {
-						"x": 277,
-						"y": 312,
-						"w": 46,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0025.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 81
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 5,
-						"w": 45,
-						"h": 76
-					},
-					"frame": {
-						"x": 320,
-						"y": 232,
-						"w": 45,
-						"h": 76
-					}
-				},
-				{
-					"filename": "0034.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 81
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 5,
-						"w": 45,
-						"h": 76
-					},
-					"frame": {
-						"x": 323,
-						"y": 308,
-						"w": 45,
-						"h": 76
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:6cb9cd08a225d9ce5a32640f2a1a4760:ab52583219972dae47f87bdaf152d0c0:1977f50e1ab8a3304ceeb59ee1aa2ba9$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 102, "y": 326, "w": 50, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 2, "w": 50, "h": 67 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 107, "y": 261, "w": 53, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 4, "w": 53, "h": 65 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 0, "y": 196, "w": 54, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 54, "h": 65 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 282, "y": 0, "w": 55, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 55, "h": 66 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 117, "y": 0, "w": 56, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 56, "h": 66 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 60, "y": 0, "w": 57, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 1, "w": 57, "h": 68 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 229, "y": 0, "w": 53, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 53, "h": 69 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 0, "y": 261, "w": 51, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 1, "w": 51, "h": 68 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 102, "y": 326, "w": 50, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 2, "w": 50, "h": 67 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 160, "y": 261, "w": 53, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 4, "w": 53, "h": 65 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 110, "y": 196, "w": 54, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 54, "h": 65 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 0, "y": 65, "w": 55, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 55, "h": 66 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 117, "y": 0, "w": 56, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 56, "h": 66 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 60, "y": 0, "w": 57, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 1, "w": 57, "h": 68 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 229, "y": 0, "w": 53, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 53, "h": 69 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 0, "y": 261, "w": 51, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 1, "w": 51, "h": 68 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 102, "y": 326, "w": 50, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 2, "w": 50, "h": 67 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 107, "y": 261, "w": 53, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 4, "w": 53, "h": 65 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 0, "y": 196, "w": 54, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 54, "h": 65 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 282, "y": 0, "w": 55, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 55, "h": 66 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 117, "y": 0, "w": 56, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 56, "h": 66 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 60, "y": 0, "w": 57, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 1, "w": 57, "h": 68 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 229, "y": 0, "w": 53, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 53, "h": 69 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 0, "y": 261, "w": 51, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 1, "w": 51, "h": 68 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 102, "y": 326, "w": 50, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 2, "w": 50, "h": 67 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 160, "y": 261, "w": 53, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 4, "w": 53, "h": 65 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 110, "y": 196, "w": 54, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 54, "h": 65 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 0, "y": 65, "w": 55, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 55, "h": 66 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 117, "y": 0, "w": 56, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 56, "h": 66 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 60, "y": 0, "w": 57, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 1, "w": 57, "h": 68 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 229, "y": 0, "w": 53, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 53, "h": 69 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 0, "y": 261, "w": 51, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 1, "w": 51, "h": 68 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 102, "y": 326, "w": 50, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 2, "w": 50, "h": 67 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 107, "y": 261, "w": 53, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 4, "w": 53, "h": 65 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 0, "y": 196, "w": 54, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 54, "h": 65 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 282, "y": 0, "w": 55, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 55, "h": 66 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 117, "y": 0, "w": 56, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 56, "h": 66 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 60, "y": 0, "w": 57, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 1, "w": 57, "h": 68 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 229, "y": 0, "w": 53, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 53, "h": 69 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 0, "y": 261, "w": 51, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 1, "w": 51, "h": 68 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 102, "y": 326, "w": 50, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 2, "w": 50, "h": 67 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 160, "y": 261, "w": 53, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 4, "w": 53, "h": 65 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 110, "y": 196, "w": 54, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 54, "h": 65 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 0, "y": 65, "w": 55, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 55, "h": 66 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 117, "y": 0, "w": 56, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 56, "h": 66 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 60, "y": 0, "w": 57, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 1, "w": 57, "h": 68 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 229, "y": 0, "w": 53, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 53, "h": 69 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 0, "y": 261, "w": 51, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 1, "w": 51, "h": 68 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 152, "y": 326, "w": 50, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 2, "w": 50, "h": 67 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 164, "y": 196, "w": 54, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 54, "h": 65 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 117, "y": 66, "w": 55, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 55, "h": 65 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 172, "y": 66, "w": 55, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 55, "h": 65 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 213, "y": 265, "w": 51, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 66 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 282, "y": 66, "w": 55, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 55, "h": 65 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 173, "y": 0, "w": 56, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 56, "h": 66 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 0, "y": 0, "w": 60, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 60, "h": 65 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 55, "y": 68, "w": 55, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 55, "h": 65 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 227, "y": 69, "w": 55, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 55, "h": 65 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 275, "y": 196, "w": 54, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 4, "w": 54, "h": 65 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 55, "y": 68, "w": 55, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 55, "h": 65 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 227, "y": 69, "w": 55, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 55, "h": 65 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 275, "y": 196, "w": 54, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 4, "w": 54, "h": 65 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 55, "y": 68, "w": 55, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 55, "h": 65 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 227, "y": 69, "w": 55, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 55, "h": 65 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 275, "y": 196, "w": 54, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 4, "w": 54, "h": 65 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 55, "y": 68, "w": 55, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 55, "h": 65 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 0, "y": 131, "w": 55, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 55, "h": 65 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 110, "y": 131, "w": 55, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 55, "h": 65 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 165, "y": 131, "w": 55, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 55, "h": 65 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 282, "y": 131, "w": 55, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 55, "h": 65 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 55, "y": 133, "w": 55, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 55, "h": 65 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 220, "y": 134, "w": 55, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 55, "h": 65 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 54, "y": 198, "w": 53, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 53, "h": 66 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 218, "y": 199, "w": 53, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 53, "h": 66 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 271, "y": 261, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 2, "w": 51, "h": 67 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 51, "y": 264, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 2, "w": 51, "h": 67 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "654.png",
+  "format": "I8",
+  "size": { "w": 337, "h": 393 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/654.png b/public/images/pokemon/exp/654.png
index 31d16e68e48..b1101648416 100644
Binary files a/public/images/pokemon/exp/654.png and b/public/images/pokemon/exp/654.png differ
diff --git a/public/images/pokemon/exp/656.json b/public/images/pokemon/exp/656.json
index 71ebaea1efb..3c2051bfe3a 100644
--- a/public/images/pokemon/exp/656.json
+++ b/public/images/pokemon/exp/656.json
@@ -1,671 +1,713 @@
-{
-	"textures": [
-		{
-			"image": "656.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 96,
-				"h": 96
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0025.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0026.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 35,
-						"w": 32,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 35,
-						"w": 32,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 35,
-						"w": 32,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 35,
-						"w": 32,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 35,
-						"w": 32,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 35,
-						"w": 32,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 35,
-						"w": 32,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 35,
-						"w": 32,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 35,
-						"w": 32,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 35,
-						"w": 32,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0031.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 35,
-						"w": 32,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					},
-					"frame": {
-						"x": 32,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					},
-					"frame": {
-						"x": 32,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0027.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					},
-					"frame": {
-						"x": 32,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0028.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					},
-					"frame": {
-						"x": 32,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 32,
-						"h": 34
-					},
-					"frame": {
-						"x": 64,
-						"y": 0,
-						"w": 32,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 32,
-						"h": 34
-					},
-					"frame": {
-						"x": 64,
-						"y": 0,
-						"w": 32,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 32,
-						"h": 34
-					},
-					"frame": {
-						"x": 64,
-						"y": 0,
-						"w": 32,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 32,
-						"h": 34
-					},
-					"frame": {
-						"x": 64,
-						"y": 0,
-						"w": 32,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 32,
-						"h": 34
-					},
-					"frame": {
-						"x": 64,
-						"y": 34,
-						"w": 32,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 32,
-						"h": 34
-					},
-					"frame": {
-						"x": 64,
-						"y": 34,
-						"w": 32,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0029.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 32,
-						"h": 34
-					},
-					"frame": {
-						"x": 64,
-						"y": 34,
-						"w": 32,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0030.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 32,
-						"h": 34
-					},
-					"frame": {
-						"x": 64,
-						"y": 34,
-						"w": 32,
-						"h": 34
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:5f39528f34681b7e85d5ea8d96776a2d:75313d84bbb64652e1825fbfbea72872:9c4d208e6c2f857bfb0b23b8eea3326c$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 129, "y": 42, "w": 32, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 35 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 194, "y": 1, "w": 32, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 35 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 194, "y": 38, "w": 32, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 35 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 172, "y": 112, "w": 32, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 13, "w": 32, "h": 34 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 207, "y": 112, "w": 32, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 13, "w": 32, "h": 34 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 195, "y": 148, "w": 32, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 14, "w": 32, "h": 33 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 195, "y": 183, "w": 32, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 14, "w": 32, "h": 32 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 163, "y": 75, "w": 32, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 11, "w": 32, "h": 35 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 197, "y": 75, "w": 32, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 11, "w": 32, "h": 35 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 98, "y": 116, "w": 32, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 34 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 1, "y": 81, "w": 32, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 35 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 129, "y": 42, "w": 32, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 35 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 194, "y": 1, "w": 32, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 35 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 194, "y": 38, "w": 32, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 35 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 172, "y": 112, "w": 32, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 13, "w": 32, "h": 34 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 207, "y": 112, "w": 32, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 13, "w": 32, "h": 34 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 195, "y": 148, "w": 32, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 14, "w": 32, "h": 33 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 195, "y": 183, "w": 32, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 14, "w": 32, "h": 32 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 163, "y": 75, "w": 32, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 11, "w": 32, "h": 35 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 197, "y": 75, "w": 32, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 11, "w": 32, "h": 35 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 1, "y": 118, "w": 32, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 34 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 1, "y": 81, "w": 32, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 35 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 129, "y": 42, "w": 32, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 35 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 194, "y": 1, "w": 32, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 35 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 194, "y": 38, "w": 32, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 35 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 172, "y": 112, "w": 32, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 13, "w": 32, "h": 34 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 207, "y": 112, "w": 32, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 13, "w": 32, "h": 34 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 195, "y": 148, "w": 32, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 14, "w": 32, "h": 33 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 195, "y": 183, "w": 32, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 14, "w": 32, "h": 32 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 163, "y": 75, "w": 32, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 11, "w": 32, "h": 35 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 197, "y": 75, "w": 32, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 11, "w": 32, "h": 35 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 1, "y": 118, "w": 32, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 34 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 1, "y": 81, "w": 32, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 35 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 129, "y": 42, "w": 32, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 35 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 194, "y": 1, "w": 32, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 35 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 194, "y": 38, "w": 32, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 35 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 172, "y": 112, "w": 32, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 13, "w": 32, "h": 34 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 207, "y": 112, "w": 32, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 13, "w": 32, "h": 34 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 195, "y": 148, "w": 32, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 14, "w": 32, "h": 33 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 195, "y": 183, "w": 32, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 14, "w": 32, "h": 32 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 163, "y": 75, "w": 32, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 11, "w": 32, "h": 35 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 197, "y": 75, "w": 32, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 11, "w": 32, "h": 35 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 1, "y": 118, "w": 32, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 34 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 1, "y": 81, "w": 32, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 35 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 129, "y": 42, "w": 32, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 35 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 194, "y": 1, "w": 32, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 35 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 194, "y": 38, "w": 32, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 35 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 172, "y": 112, "w": 32, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 13, "w": 32, "h": 34 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 207, "y": 112, "w": 32, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 13, "w": 32, "h": 34 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 195, "y": 148, "w": 32, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 14, "w": 32, "h": 33 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 195, "y": 183, "w": 32, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 14, "w": 32, "h": 32 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 163, "y": 75, "w": 32, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 11, "w": 32, "h": 35 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 197, "y": 75, "w": 32, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 11, "w": 32, "h": 35 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 1, "y": 118, "w": 32, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 34 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 1, "y": 81, "w": 32, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 35 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 129, "y": 42, "w": 32, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 35 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 200
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 129, "y": 1, "w": 31, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 31, "h": 38 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 1, "y": 1, "w": 30, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 30, "h": 41 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 33, "y": 1, "w": 30, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 30, "h": 41 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 50
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 65, "y": 1, "w": 30, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 30, "h": 41 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 50
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 97, "y": 1, "w": 30, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 30, "h": 40 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 50
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 162, "y": 1, "w": 30, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 30, "h": 39 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 67, "y": 81, "w": 29, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 29, "h": 38 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 50
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 164, "y": 148, "w": 29, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 29, "h": 37 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 50
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 35, "y": 81, "w": 30, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 7, "w": 30, "h": 37 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 50
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 69, "y": 152, "w": 33, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 14, "w": 33, "h": 32 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 50
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 104, "y": 185, "w": 34, "h": 30 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 16, "w": 34, "h": 30 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 50
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 68, "y": 186, "w": 34, "h": 29 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 17, "w": 34, "h": 29 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 50
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 1, "y": 157, "w": 33, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 14, "w": 33, "h": 32 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 137, "y": 112, "w": 33, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 13, "w": 33, "h": 33 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 750
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 1, "y": 44, "w": 32, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 11, "w": 32, "h": 35 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 132, "y": 147, "w": 30, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 10, "w": 30, "h": 36 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 36, "y": 157, "w": 30, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 10, "w": 30, "h": 35 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 35, "y": 121, "w": 32, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 11, "w": 32, "h": 34 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 35, "y": 44, "w": 32, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 11, "w": 32, "h": 35 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 69, "y": 44, "w": 32, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 35 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 103, "y": 79, "w": 32, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 35 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 129, "y": 42, "w": 32, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 35 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "656.png",
+  "format": "I8",
+  "size": { "w": 240, "h": 216 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/656.png b/public/images/pokemon/exp/656.png
index 7afec8b08ee..cc85a92ecbb 100644
Binary files a/public/images/pokemon/exp/656.png and b/public/images/pokemon/exp/656.png differ
diff --git a/public/images/pokemon/exp/661.json b/public/images/pokemon/exp/661.json
index f01755ccdc0..74bcbcb06a0 100644
--- a/public/images/pokemon/exp/661.json
+++ b/public/images/pokemon/exp/661.json
@@ -1,356 +1,397 @@
-{
-	"textures": [
-		{
-			"image": "661.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 70,
-				"h": 70
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 35,
-						"w": 32,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 35,
-						"w": 32,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 35,
-						"w": 32,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 35,
-						"w": 32,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 35,
-						"w": 32,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 35,
-						"w": 32,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					},
-					"frame": {
-						"x": 32,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					},
-					"frame": {
-						"x": 32,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					},
-					"frame": {
-						"x": 32,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					},
-					"frame": {
-						"x": 32,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					},
-					"frame": {
-						"x": 32,
-						"y": 35,
-						"w": 32,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					},
-					"frame": {
-						"x": 32,
-						"y": 35,
-						"w": 32,
-						"h": 35
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:7dcd93b1058cdbc2640b9885ceb2e854:a2e65850e27a715b371214cfcc8954f8:186d621a544ea0e0e2e0bd57975a29b1$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 0, "y": 38, "w": 32, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 32, "h": 38 },
+    "sourceSize": { "w": 37, "h": 39 },
+    "duration": 120
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 32, "y": 113, "w": 31, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 31, "h": 39 },
+    "sourceSize": { "w": 37, "h": 39 },
+    "duration": 120
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 34, "y": 36, "w": 32, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 32, "h": 39 },
+    "sourceSize": { "w": 37, "h": 39 },
+    "duration": 120
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 0, "y": 0, "w": 34, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 34, "h": 38 },
+    "sourceSize": { "w": 37, "h": 39 },
+    "duration": 120
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 32, "y": 75, "w": 32, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 32, "h": 38 },
+    "sourceSize": { "w": 37, "h": 39 },
+    "duration": 120
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 0, "y": 38, "w": 32, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 32, "h": 38 },
+    "sourceSize": { "w": 37, "h": 39 },
+    "duration": 120
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 0, "y": 114, "w": 31, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 31, "h": 38 },
+    "sourceSize": { "w": 37, "h": 39 },
+    "duration": 120
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 0, "y": 76, "w": 32, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 32, "h": 38 },
+    "sourceSize": { "w": 37, "h": 39 },
+    "duration": 120
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 69, "y": 0, "w": 34, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 34, "h": 37 },
+    "sourceSize": { "w": 37, "h": 39 },
+    "duration": 120
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 64, "y": 76, "w": 32, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 32, "h": 38 },
+    "sourceSize": { "w": 37, "h": 39 },
+    "duration": 120
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 0, "y": 38, "w": 32, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 32, "h": 38 },
+    "sourceSize": { "w": 37, "h": 39 },
+    "duration": 120
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 32, "y": 113, "w": 31, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 31, "h": 39 },
+    "sourceSize": { "w": 37, "h": 39 },
+    "duration": 120
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 34, "y": 36, "w": 32, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 32, "h": 39 },
+    "sourceSize": { "w": 37, "h": 39 },
+    "duration": 120
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 0, "y": 0, "w": 34, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 34, "h": 38 },
+    "sourceSize": { "w": 37, "h": 39 },
+    "duration": 120
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 32, "y": 75, "w": 32, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 32, "h": 38 },
+    "sourceSize": { "w": 37, "h": 39 },
+    "duration": 120
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 0, "y": 38, "w": 32, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 32, "h": 38 },
+    "sourceSize": { "w": 37, "h": 39 },
+    "duration": 120
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 0, "y": 114, "w": 31, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 31, "h": 38 },
+    "sourceSize": { "w": 37, "h": 39 },
+    "duration": 120
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 0, "y": 76, "w": 32, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 32, "h": 38 },
+    "sourceSize": { "w": 37, "h": 39 },
+    "duration": 120
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 69, "y": 0, "w": 34, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 34, "h": 37 },
+    "sourceSize": { "w": 37, "h": 39 },
+    "duration": 120
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 64, "y": 76, "w": 32, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 32, "h": 38 },
+    "sourceSize": { "w": 37, "h": 39 },
+    "duration": 120
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 0, "y": 38, "w": 32, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 32, "h": 38 },
+    "sourceSize": { "w": 37, "h": 39 },
+    "duration": 120
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 32, "y": 113, "w": 31, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 31, "h": 39 },
+    "sourceSize": { "w": 37, "h": 39 },
+    "duration": 120
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 34, "y": 36, "w": 32, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 32, "h": 39 },
+    "sourceSize": { "w": 37, "h": 39 },
+    "duration": 120
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 0, "y": 0, "w": 34, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 34, "h": 38 },
+    "sourceSize": { "w": 37, "h": 39 },
+    "duration": 120
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 32, "y": 75, "w": 32, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 32, "h": 38 },
+    "sourceSize": { "w": 37, "h": 39 },
+    "duration": 120
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 0, "y": 38, "w": 32, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 32, "h": 38 },
+    "sourceSize": { "w": 37, "h": 39 },
+    "duration": 120
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 0, "y": 114, "w": 31, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 31, "h": 38 },
+    "sourceSize": { "w": 37, "h": 39 },
+    "duration": 120
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 0, "y": 76, "w": 32, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 32, "h": 38 },
+    "sourceSize": { "w": 37, "h": 39 },
+    "duration": 120
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 69, "y": 0, "w": 34, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 34, "h": 37 },
+    "sourceSize": { "w": 37, "h": 39 },
+    "duration": 120
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 64, "y": 76, "w": 32, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 32, "h": 38 },
+    "sourceSize": { "w": 37, "h": 39 },
+    "duration": 120
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 0, "y": 38, "w": 32, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 32, "h": 38 },
+    "sourceSize": { "w": 37, "h": 39 },
+    "duration": 120
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 66, "y": 37, "w": 32, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 32, "h": 39 },
+    "sourceSize": { "w": 37, "h": 39 },
+    "duration": 120
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 66, "y": 37, "w": 32, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 32, "h": 39 },
+    "sourceSize": { "w": 37, "h": 39 },
+    "duration": 120
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 96, "y": 76, "w": 32, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 32, "h": 38 },
+    "sourceSize": { "w": 37, "h": 39 },
+    "duration": 120
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 103, "y": 0, "w": 34, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 34, "h": 37 },
+    "sourceSize": { "w": 37, "h": 39 },
+    "duration": 120
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 34, "y": 0, "w": 35, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 35, "h": 36 },
+    "sourceSize": { "w": 37, "h": 39 },
+    "duration": 120
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 103, "y": 0, "w": 34, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 34, "h": 37 },
+    "sourceSize": { "w": 37, "h": 39 },
+    "duration": 120
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 34, "y": 0, "w": 35, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 35, "h": 36 },
+    "sourceSize": { "w": 37, "h": 39 },
+    "duration": 120
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 103, "y": 0, "w": 34, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 34, "h": 37 },
+    "sourceSize": { "w": 37, "h": 39 },
+    "duration": 120
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 34, "y": 0, "w": 35, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 35, "h": 36 },
+    "sourceSize": { "w": 37, "h": 39 },
+    "duration": 120
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 103, "y": 0, "w": 34, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 34, "h": 37 },
+    "sourceSize": { "w": 37, "h": 39 },
+    "duration": 120
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 98, "y": 37, "w": 32, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 32, "h": 39 },
+    "sourceSize": { "w": 37, "h": 39 },
+    "duration": 120
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 66, "y": 37, "w": 32, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 32, "h": 39 },
+    "sourceSize": { "w": 37, "h": 39 },
+    "duration": 120
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.11-x64",
+  "format": "I8",
+  "size": { "w": 137, "h": 152 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/661.png b/public/images/pokemon/exp/661.png
index 52e31c9ec73..ebc25efa895 100644
Binary files a/public/images/pokemon/exp/661.png and b/public/images/pokemon/exp/661.png differ
diff --git a/public/images/pokemon/exp/662.json b/public/images/pokemon/exp/662.json
index a5fb9d1a87c..3600bbcd38d 100644
--- a/public/images/pokemon/exp/662.json
+++ b/public/images/pokemon/exp/662.json
@@ -1,776 +1,254 @@
-{
-	"textures": [
-		{
-			"image": "662.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 167,
-				"h": 167
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 56,
-						"h": 61
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 56,
-						"h": 52
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 56,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 56,
-						"h": 61
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 56,
-						"h": 52
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 56,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 56,
-						"h": 61
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 56,
-						"h": 52
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 56,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 56,
-						"h": 61
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 56,
-						"h": 52
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 56,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 56,
-						"h": 61
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 56,
-						"h": 52
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 56,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 56,
-						"h": 61
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 56,
-						"h": 52
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 56,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 56,
-						"h": 61
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 56,
-						"h": 52
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 56,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 56,
-						"h": 61
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 56,
-						"h": 52
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 56,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 56,
-						"h": 61
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 56,
-						"h": 52
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 56,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 56,
-						"h": 61
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 56,
-						"h": 52
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 56,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0027.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 56,
-						"h": 61
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 56,
-						"h": 52
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 56,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0028.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 56,
-						"h": 61
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 56,
-						"h": 52
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 56,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0033.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 56,
-						"h": 61
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 56,
-						"h": 52
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 56,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0034.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 56,
-						"h": 61
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 56,
-						"h": 52
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 56,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0035.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 56,
-						"h": 61
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 56,
-						"h": 52
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 56,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0036.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 56,
-						"h": 61
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 56,
-						"h": 52
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 56,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 56,
-						"h": 61
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 56,
-						"h": 52
-					},
-					"frame": {
-						"x": 56,
-						"y": 0,
-						"w": 56,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 56,
-						"h": 61
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 56,
-						"h": 52
-					},
-					"frame": {
-						"x": 56,
-						"y": 0,
-						"w": 56,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 56,
-						"h": 61
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 56,
-						"h": 52
-					},
-					"frame": {
-						"x": 56,
-						"y": 0,
-						"w": 56,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 56,
-						"h": 61
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 56,
-						"h": 52
-					},
-					"frame": {
-						"x": 56,
-						"y": 0,
-						"w": 56,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 56,
-						"h": 61
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 16,
-						"w": 55,
-						"h": 37
-					},
-					"frame": {
-						"x": 112,
-						"y": 0,
-						"w": 55,
-						"h": 37
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 56,
-						"h": 61
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 16,
-						"w": 55,
-						"h": 37
-					},
-					"frame": {
-						"x": 112,
-						"y": 0,
-						"w": 55,
-						"h": 37
-					}
-				},
-				{
-					"filename": "0025.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 56,
-						"h": 61
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 16,
-						"w": 55,
-						"h": 37
-					},
-					"frame": {
-						"x": 112,
-						"y": 0,
-						"w": 55,
-						"h": 37
-					}
-				},
-				{
-					"filename": "0026.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 56,
-						"h": 61
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 16,
-						"w": 55,
-						"h": 37
-					},
-					"frame": {
-						"x": 112,
-						"y": 0,
-						"w": 55,
-						"h": 37
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 56,
-						"h": 61
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 56,
-						"h": 51
-					},
-					"frame": {
-						"x": 0,
-						"y": 52,
-						"w": 56,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 56,
-						"h": 61
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 56,
-						"h": 51
-					},
-					"frame": {
-						"x": 0,
-						"y": 52,
-						"w": 56,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0031.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 56,
-						"h": 61
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 56,
-						"h": 51
-					},
-					"frame": {
-						"x": 0,
-						"y": 52,
-						"w": 56,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0032.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 56,
-						"h": 61
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 56,
-						"h": 51
-					},
-					"frame": {
-						"x": 0,
-						"y": 52,
-						"w": 56,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 56,
-						"h": 61
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 56,
-						"h": 50
-					},
-					"frame": {
-						"x": 0,
-						"y": 103,
-						"w": 56,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 56,
-						"h": 61
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 56,
-						"h": 50
-					},
-					"frame": {
-						"x": 0,
-						"y": 103,
-						"w": 56,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0029.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 56,
-						"h": 61
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 56,
-						"h": 50
-					},
-					"frame": {
-						"x": 0,
-						"y": 103,
-						"w": 56,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0030.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 56,
-						"h": 61
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 56,
-						"h": 50
-					},
-					"frame": {
-						"x": 0,
-						"y": 103,
-						"w": 56,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 56,
-						"h": 61
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 17,
-						"w": 56,
-						"h": 44
-					},
-					"frame": {
-						"x": 56,
-						"y": 52,
-						"w": 56,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 56,
-						"h": 61
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 17,
-						"w": 56,
-						"h": 44
-					},
-					"frame": {
-						"x": 56,
-						"y": 52,
-						"w": 56,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 56,
-						"h": 61
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 17,
-						"w": 56,
-						"h": 44
-					},
-					"frame": {
-						"x": 56,
-						"y": 96,
-						"w": 56,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 56,
-						"h": 61
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 17,
-						"w": 56,
-						"h": 44
-					},
-					"frame": {
-						"x": 56,
-						"y": 96,
-						"w": 56,
-						"h": 44
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:fdd7a1bbdeb9b06a84c6e230eaa36b6e:73c8c872230bd4fc874bce8a02ada9b0:e3da2dd0277c18bcc713dc6dd2460c87$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 221, "y": 131, "w": 57, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 17, "w": 57, "h": 61 },
+    "sourceSize": { "w": 75, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 113, "y": 70, "w": 56, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 19, "w": 56, "h": 63 },
+    "sourceSize": { "w": 75, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 335, "y": 136, "w": 49, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 36, "w": 49, "h": 50 },
+    "sourceSize": { "w": 75, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 105, "y": 197, "w": 63, "h": 51 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 33, "w": 63, "h": 51 },
+    "sourceSize": { "w": 75, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 1, "y": 1, "w": 59, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 16, "w": 59, "h": 66 },
+    "sourceSize": { "w": 75, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 119, "y": 1, "w": 56, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 17, "y": 11, "w": 56, "h": 68 },
+    "sourceSize": { "w": 75, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 233, "y": 1, "w": 54, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 7, "w": 54, "h": 70 },
+    "sourceSize": { "w": 75, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 176, "y": 1, "w": 56, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 17, "y": 13, "w": 56, "h": 68 },
+    "sourceSize": { "w": 75, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 288, "y": 1, "w": 59, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 16, "y": 20, "w": 59, "h": 64 },
+    "sourceSize": { "w": 75, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 338, "y": 187, "w": 47, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 30, "w": 47, "h": 48 },
+    "sourceSize": { "w": 75, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 66, "y": 249, "w": 62, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 26, "w": 62, "h": 49 },
+    "sourceSize": { "w": 75, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 1, "y": 68, "w": 58, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 6, "w": 58, "h": 64 },
+    "sourceSize": { "w": 75, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 169, "y": 141, "w": 47, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 19, "y": 17, "w": 47, "h": 49 },
+    "sourceSize": { "w": 75, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 275, "y": 198, "w": 62, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 12, "w": 62, "h": 50 },
+    "sourceSize": { "w": 75, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 61, "y": 1, "w": 57, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 57, "h": 67 },
+    "sourceSize": { "w": 75, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 288, "y": 66, "w": 54, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 2, "w": 54, "h": 69 },
+    "sourceSize": { "w": 75, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 60, "y": 69, "w": 52, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 5, "w": 52, "h": 71 },
+    "sourceSize": { "w": 75, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 170, "y": 70, "w": 50, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 10, "w": 50, "h": 70 },
+    "sourceSize": { "w": 75, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 1, "y": 133, "w": 49, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 13, "w": 49, "h": 70 },
+    "sourceSize": { "w": 75, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 275, "y": 249, "w": 56, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 30, "w": 56, "h": 49 },
+    "sourceSize": { "w": 75, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 1, "y": 205, "w": 64, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 27, "w": 64, "h": 48 },
+    "sourceSize": { "w": 75, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 221, "y": 72, "w": 60, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 13, "w": 60, "h": 58 },
+    "sourceSize": { "w": 75, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 113, "y": 134, "w": 55, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 7, "w": 55, "h": 62 },
+    "sourceSize": { "w": 75, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 223, "y": 193, "w": 51, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 3, "w": 51, "h": 64 },
+    "sourceSize": { "w": 75, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 51, "y": 141, "w": 53, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 7, "w": 53, "h": 63 },
+    "sourceSize": { "w": 75, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 169, "y": 193, "w": 53, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 10, "w": 53, "h": 63 },
+    "sourceSize": { "w": 75, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 279, "y": 136, "w": 55, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 14, "w": 55, "h": 61 },
+    "sourceSize": { "w": 75, "h": 86 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.11-x64",
+  "image": "662.png",
+  "format": "I8",
+  "size": { "w": 386, "h": 299 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/662.png b/public/images/pokemon/exp/662.png
index e47863f724b..be3e0170e73 100644
Binary files a/public/images/pokemon/exp/662.png and b/public/images/pokemon/exp/662.png differ
diff --git a/public/images/pokemon/exp/663.json b/public/images/pokemon/exp/663.json
index 7d61c15fd97..8c4ef182132 100644
--- a/public/images/pokemon/exp/663.json
+++ b/public/images/pokemon/exp/663.json
@@ -1,1700 +1,731 @@
-{
-	"textures": [
-		{
-			"image": "663.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 295,
-				"h": 295
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 27,
-						"w": 121,
-						"h": 58
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 121,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 27,
-						"w": 121,
-						"h": 58
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 121,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 27,
-						"w": 121,
-						"h": 58
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 121,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0034.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 27,
-						"w": 121,
-						"h": 58
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 121,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0044.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 27,
-						"w": 121,
-						"h": 58
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 121,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0054.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 27,
-						"w": 121,
-						"h": 58
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 121,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 27,
-						"w": 116,
-						"h": 64
-					},
-					"frame": {
-						"x": 121,
-						"y": 0,
-						"w": 116,
-						"h": 64
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 27,
-						"w": 116,
-						"h": 64
-					},
-					"frame": {
-						"x": 121,
-						"y": 0,
-						"w": 116,
-						"h": 64
-					}
-				},
-				{
-					"filename": "0025.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 27,
-						"w": 116,
-						"h": 64
-					},
-					"frame": {
-						"x": 121,
-						"y": 0,
-						"w": 116,
-						"h": 64
-					}
-				},
-				{
-					"filename": "0035.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 27,
-						"w": 116,
-						"h": 64
-					},
-					"frame": {
-						"x": 121,
-						"y": 0,
-						"w": 116,
-						"h": 64
-					}
-				},
-				{
-					"filename": "0045.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 27,
-						"w": 116,
-						"h": 64
-					},
-					"frame": {
-						"x": 121,
-						"y": 0,
-						"w": 116,
-						"h": 64
-					}
-				},
-				{
-					"filename": "0055.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 27,
-						"w": 116,
-						"h": 64
-					},
-					"frame": {
-						"x": 121,
-						"y": 0,
-						"w": 116,
-						"h": 64
-					}
-				},
-				{
-					"filename": "0063.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 27,
-						"w": 116,
-						"h": 64
-					},
-					"frame": {
-						"x": 121,
-						"y": 0,
-						"w": 116,
-						"h": 64
-					}
-				},
-				{
-					"filename": "0068.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 27,
-						"w": 116,
-						"h": 64
-					},
-					"frame": {
-						"x": 121,
-						"y": 0,
-						"w": 116,
-						"h": 64
-					}
-				},
-				{
-					"filename": "0073.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 27,
-						"w": 116,
-						"h": 64
-					},
-					"frame": {
-						"x": 121,
-						"y": 0,
-						"w": 116,
-						"h": 64
-					}
-				},
-				{
-					"filename": "0078.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 27,
-						"w": 116,
-						"h": 64
-					},
-					"frame": {
-						"x": 121,
-						"y": 0,
-						"w": 116,
-						"h": 64
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 2,
-						"w": 108,
-						"h": 88
-					},
-					"frame": {
-						"x": 0,
-						"y": 58,
-						"w": 108,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 2,
-						"w": 108,
-						"h": 88
-					},
-					"frame": {
-						"x": 0,
-						"y": 58,
-						"w": 108,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0028.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 2,
-						"w": 108,
-						"h": 88
-					},
-					"frame": {
-						"x": 0,
-						"y": 58,
-						"w": 108,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0038.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 2,
-						"w": 108,
-						"h": 88
-					},
-					"frame": {
-						"x": 0,
-						"y": 58,
-						"w": 108,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0048.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 2,
-						"w": 108,
-						"h": 88
-					},
-					"frame": {
-						"x": 0,
-						"y": 58,
-						"w": 108,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0058.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 2,
-						"w": 108,
-						"h": 88
-					},
-					"frame": {
-						"x": 0,
-						"y": 58,
-						"w": 108,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 19,
-						"y": 0,
-						"w": 87,
-						"h": 92
-					},
-					"frame": {
-						"x": 0,
-						"y": 146,
-						"w": 87,
-						"h": 92
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 19,
-						"y": 0,
-						"w": 87,
-						"h": 92
-					},
-					"frame": {
-						"x": 0,
-						"y": 146,
-						"w": 87,
-						"h": 92
-					}
-				},
-				{
-					"filename": "0030.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 19,
-						"y": 0,
-						"w": 87,
-						"h": 92
-					},
-					"frame": {
-						"x": 0,
-						"y": 146,
-						"w": 87,
-						"h": 92
-					}
-				},
-				{
-					"filename": "0040.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 19,
-						"y": 0,
-						"w": 87,
-						"h": 92
-					},
-					"frame": {
-						"x": 0,
-						"y": 146,
-						"w": 87,
-						"h": 92
-					}
-				},
-				{
-					"filename": "0050.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 19,
-						"y": 0,
-						"w": 87,
-						"h": 92
-					},
-					"frame": {
-						"x": 0,
-						"y": 146,
-						"w": 87,
-						"h": 92
-					}
-				},
-				{
-					"filename": "0060.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 19,
-						"y": 0,
-						"w": 87,
-						"h": 92
-					},
-					"frame": {
-						"x": 0,
-						"y": 146,
-						"w": 87,
-						"h": 92
-					}
-				},
-				{
-					"filename": "0065.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 19,
-						"y": 0,
-						"w": 87,
-						"h": 92
-					},
-					"frame": {
-						"x": 0,
-						"y": 146,
-						"w": 87,
-						"h": 92
-					}
-				},
-				{
-					"filename": "0070.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 19,
-						"y": 0,
-						"w": 87,
-						"h": 92
-					},
-					"frame": {
-						"x": 0,
-						"y": 146,
-						"w": 87,
-						"h": 92
-					}
-				},
-				{
-					"filename": "0075.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 19,
-						"y": 0,
-						"w": 87,
-						"h": 92
-					},
-					"frame": {
-						"x": 0,
-						"y": 146,
-						"w": 87,
-						"h": 92
-					}
-				},
-				{
-					"filename": "0080.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 19,
-						"y": 0,
-						"w": 87,
-						"h": 92
-					},
-					"frame": {
-						"x": 0,
-						"y": 146,
-						"w": 87,
-						"h": 92
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 17,
-						"y": 0,
-						"w": 92,
-						"h": 91
-					},
-					"frame": {
-						"x": 87,
-						"y": 146,
-						"w": 92,
-						"h": 91
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 17,
-						"y": 0,
-						"w": 92,
-						"h": 91
-					},
-					"frame": {
-						"x": 87,
-						"y": 146,
-						"w": 92,
-						"h": 91
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 17,
-						"y": 0,
-						"w": 92,
-						"h": 91
-					},
-					"frame": {
-						"x": 87,
-						"y": 146,
-						"w": 92,
-						"h": 91
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 17,
-						"y": 0,
-						"w": 92,
-						"h": 91
-					},
-					"frame": {
-						"x": 87,
-						"y": 146,
-						"w": 92,
-						"h": 91
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 17,
-						"y": 0,
-						"w": 92,
-						"h": 91
-					},
-					"frame": {
-						"x": 87,
-						"y": 146,
-						"w": 92,
-						"h": 91
-					}
-				},
-				{
-					"filename": "0029.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 17,
-						"y": 0,
-						"w": 92,
-						"h": 91
-					},
-					"frame": {
-						"x": 87,
-						"y": 146,
-						"w": 92,
-						"h": 91
-					}
-				},
-				{
-					"filename": "0031.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 17,
-						"y": 0,
-						"w": 92,
-						"h": 91
-					},
-					"frame": {
-						"x": 87,
-						"y": 146,
-						"w": 92,
-						"h": 91
-					}
-				},
-				{
-					"filename": "0039.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 17,
-						"y": 0,
-						"w": 92,
-						"h": 91
-					},
-					"frame": {
-						"x": 87,
-						"y": 146,
-						"w": 92,
-						"h": 91
-					}
-				},
-				{
-					"filename": "0041.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 17,
-						"y": 0,
-						"w": 92,
-						"h": 91
-					},
-					"frame": {
-						"x": 87,
-						"y": 146,
-						"w": 92,
-						"h": 91
-					}
-				},
-				{
-					"filename": "0049.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 17,
-						"y": 0,
-						"w": 92,
-						"h": 91
-					},
-					"frame": {
-						"x": 87,
-						"y": 146,
-						"w": 92,
-						"h": 91
-					}
-				},
-				{
-					"filename": "0051.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 17,
-						"y": 0,
-						"w": 92,
-						"h": 91
-					},
-					"frame": {
-						"x": 87,
-						"y": 146,
-						"w": 92,
-						"h": 91
-					}
-				},
-				{
-					"filename": "0059.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 17,
-						"y": 0,
-						"w": 92,
-						"h": 91
-					},
-					"frame": {
-						"x": 87,
-						"y": 146,
-						"w": 92,
-						"h": 91
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 33,
-						"w": 99,
-						"h": 58
-					},
-					"frame": {
-						"x": 87,
-						"y": 237,
-						"w": 99,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 33,
-						"w": 99,
-						"h": 58
-					},
-					"frame": {
-						"x": 87,
-						"y": 237,
-						"w": 99,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0027.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 33,
-						"w": 99,
-						"h": 58
-					},
-					"frame": {
-						"x": 87,
-						"y": 237,
-						"w": 99,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0037.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 33,
-						"w": 99,
-						"h": 58
-					},
-					"frame": {
-						"x": 87,
-						"y": 237,
-						"w": 99,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0047.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 33,
-						"w": 99,
-						"h": 58
-					},
-					"frame": {
-						"x": 87,
-						"y": 237,
-						"w": 99,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0057.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 33,
-						"w": 99,
-						"h": 58
-					},
-					"frame": {
-						"x": 87,
-						"y": 237,
-						"w": 99,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0064.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 33,
-						"w": 99,
-						"h": 58
-					},
-					"frame": {
-						"x": 87,
-						"y": 237,
-						"w": 99,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0069.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 33,
-						"w": 99,
-						"h": 58
-					},
-					"frame": {
-						"x": 87,
-						"y": 237,
-						"w": 99,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0074.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 33,
-						"w": 99,
-						"h": 58
-					},
-					"frame": {
-						"x": 87,
-						"y": 237,
-						"w": 99,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0079.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 33,
-						"w": 99,
-						"h": 58
-					},
-					"frame": {
-						"x": 87,
-						"y": 237,
-						"w": 99,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 13,
-						"w": 104,
-						"h": 76
-					},
-					"frame": {
-						"x": 186,
-						"y": 64,
-						"w": 104,
-						"h": 76
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 13,
-						"w": 104,
-						"h": 76
-					},
-					"frame": {
-						"x": 186,
-						"y": 64,
-						"w": 104,
-						"h": 76
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 13,
-						"w": 104,
-						"h": 76
-					},
-					"frame": {
-						"x": 186,
-						"y": 64,
-						"w": 104,
-						"h": 76
-					}
-				},
-				{
-					"filename": "0033.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 13,
-						"w": 104,
-						"h": 76
-					},
-					"frame": {
-						"x": 186,
-						"y": 64,
-						"w": 104,
-						"h": 76
-					}
-				},
-				{
-					"filename": "0043.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 13,
-						"w": 104,
-						"h": 76
-					},
-					"frame": {
-						"x": 186,
-						"y": 64,
-						"w": 104,
-						"h": 76
-					}
-				},
-				{
-					"filename": "0053.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 13,
-						"w": 104,
-						"h": 76
-					},
-					"frame": {
-						"x": 186,
-						"y": 64,
-						"w": 104,
-						"h": 76
-					}
-				},
-				{
-					"filename": "0062.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 13,
-						"w": 104,
-						"h": 76
-					},
-					"frame": {
-						"x": 186,
-						"y": 64,
-						"w": 104,
-						"h": 76
-					}
-				},
-				{
-					"filename": "0067.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 13,
-						"w": 104,
-						"h": 76
-					},
-					"frame": {
-						"x": 186,
-						"y": 64,
-						"w": 104,
-						"h": 76
-					}
-				},
-				{
-					"filename": "0072.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 13,
-						"w": 104,
-						"h": 76
-					},
-					"frame": {
-						"x": 186,
-						"y": 64,
-						"w": 104,
-						"h": 76
-					}
-				},
-				{
-					"filename": "0077.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 13,
-						"w": 104,
-						"h": 76
-					},
-					"frame": {
-						"x": 186,
-						"y": 64,
-						"w": 104,
-						"h": 76
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 29,
-						"w": 103,
-						"h": 64
-					},
-					"frame": {
-						"x": 186,
-						"y": 140,
-						"w": 103,
-						"h": 64
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 29,
-						"w": 103,
-						"h": 64
-					},
-					"frame": {
-						"x": 186,
-						"y": 140,
-						"w": 103,
-						"h": 64
-					}
-				},
-				{
-					"filename": "0026.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 29,
-						"w": 103,
-						"h": 64
-					},
-					"frame": {
-						"x": 186,
-						"y": 140,
-						"w": 103,
-						"h": 64
-					}
-				},
-				{
-					"filename": "0036.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 29,
-						"w": 103,
-						"h": 64
-					},
-					"frame": {
-						"x": 186,
-						"y": 140,
-						"w": 103,
-						"h": 64
-					}
-				},
-				{
-					"filename": "0046.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 29,
-						"w": 103,
-						"h": 64
-					},
-					"frame": {
-						"x": 186,
-						"y": 140,
-						"w": 103,
-						"h": 64
-					}
-				},
-				{
-					"filename": "0056.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 29,
-						"w": 103,
-						"h": 64
-					},
-					"frame": {
-						"x": 186,
-						"y": 140,
-						"w": 103,
-						"h": 64
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 16,
-						"y": 3,
-						"w": 95,
-						"h": 87
-					},
-					"frame": {
-						"x": 186,
-						"y": 204,
-						"w": 95,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 16,
-						"y": 3,
-						"w": 95,
-						"h": 87
-					},
-					"frame": {
-						"x": 186,
-						"y": 204,
-						"w": 95,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 16,
-						"y": 3,
-						"w": 95,
-						"h": 87
-					},
-					"frame": {
-						"x": 186,
-						"y": 204,
-						"w": 95,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0032.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 16,
-						"y": 3,
-						"w": 95,
-						"h": 87
-					},
-					"frame": {
-						"x": 186,
-						"y": 204,
-						"w": 95,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0042.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 16,
-						"y": 3,
-						"w": 95,
-						"h": 87
-					},
-					"frame": {
-						"x": 186,
-						"y": 204,
-						"w": 95,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0052.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 16,
-						"y": 3,
-						"w": 95,
-						"h": 87
-					},
-					"frame": {
-						"x": 186,
-						"y": 204,
-						"w": 95,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0061.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 16,
-						"y": 3,
-						"w": 95,
-						"h": 87
-					},
-					"frame": {
-						"x": 186,
-						"y": 204,
-						"w": 95,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0066.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 16,
-						"y": 3,
-						"w": 95,
-						"h": 87
-					},
-					"frame": {
-						"x": 186,
-						"y": 204,
-						"w": 95,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0071.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 16,
-						"y": 3,
-						"w": 95,
-						"h": 87
-					},
-					"frame": {
-						"x": 186,
-						"y": 204,
-						"w": 95,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0076.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 16,
-						"y": 3,
-						"w": 95,
-						"h": 87
-					},
-					"frame": {
-						"x": 186,
-						"y": 204,
-						"w": 95,
-						"h": 87
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:df66b59e88a0e2316e65cc2931e2d45a:38fe3e789df33d7d1b51b40128b5adaa:3790d8d72a704a789cc594688d98802e$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 107, "y": 0, "w": 90, "h": 89 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 19, "y": 3, "w": 90, "h": 89 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 198, "y": 0, "w": 93, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 6, "w": 93, "h": 85 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 378, "y": 0, "w": 102, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 16, "w": 102, "h": 74 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 115, "y": 90, "w": 121, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 30, "w": 121, "h": 56 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 0, "y": 90, "w": 114, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 30, "w": 114, "h": 62 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 378, "y": 75, "w": 101, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 32, "w": 101, "h": 63 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 237, "y": 92, "w": 97, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 36, "w": 97, "h": 56 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 0, "y": 0, "w": 106, "h": 86 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 106, "h": 86 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 107, "y": 0, "w": 90, "h": 89 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 19, "y": 3, "w": 90, "h": 89 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 292, "y": 0, "w": 85, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 2, "w": 85, "h": 91 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 107, "y": 0, "w": 90, "h": 89 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 19, "y": 3, "w": 90, "h": 89 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 198, "y": 0, "w": 93, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 6, "w": 93, "h": 85 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 378, "y": 0, "w": 102, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 16, "w": 102, "h": 74 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 115, "y": 90, "w": 121, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 30, "w": 121, "h": 56 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 0, "y": 90, "w": 114, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 30, "w": 114, "h": 62 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 378, "y": 75, "w": 101, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 32, "w": 101, "h": 63 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 237, "y": 92, "w": 97, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 36, "w": 97, "h": 56 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 0, "y": 0, "w": 106, "h": 86 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 106, "h": 86 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 107, "y": 0, "w": 90, "h": 89 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 19, "y": 3, "w": 90, "h": 89 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 292, "y": 0, "w": 85, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 2, "w": 85, "h": 91 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 107, "y": 0, "w": 90, "h": 89 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 19, "y": 3, "w": 90, "h": 89 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 198, "y": 0, "w": 93, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 6, "w": 93, "h": 85 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 378, "y": 0, "w": 102, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 16, "w": 102, "h": 74 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 115, "y": 90, "w": 121, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 30, "w": 121, "h": 56 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 0, "y": 90, "w": 114, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 30, "w": 114, "h": 62 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 378, "y": 75, "w": 101, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 32, "w": 101, "h": 63 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 237, "y": 92, "w": 97, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 36, "w": 97, "h": 56 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 0, "y": 0, "w": 106, "h": 86 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 106, "h": 86 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 107, "y": 0, "w": 90, "h": 89 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 19, "y": 3, "w": 90, "h": 89 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 292, "y": 0, "w": 85, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 2, "w": 85, "h": 91 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 107, "y": 0, "w": 90, "h": 89 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 19, "y": 3, "w": 90, "h": 89 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 198, "y": 0, "w": 93, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 6, "w": 93, "h": 85 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 378, "y": 0, "w": 102, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 16, "w": 102, "h": 74 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 115, "y": 90, "w": 121, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 30, "w": 121, "h": 56 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 0, "y": 90, "w": 114, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 30, "w": 114, "h": 62 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 378, "y": 75, "w": 101, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 32, "w": 101, "h": 63 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 237, "y": 92, "w": 97, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 36, "w": 97, "h": 56 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 0, "y": 0, "w": 106, "h": 86 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 106, "h": 86 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 107, "y": 0, "w": 90, "h": 89 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 19, "y": 3, "w": 90, "h": 89 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 292, "y": 0, "w": 85, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 2, "w": 85, "h": 91 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 107, "y": 0, "w": 90, "h": 89 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 19, "y": 3, "w": 90, "h": 89 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 198, "y": 0, "w": 93, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 6, "w": 93, "h": 85 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 378, "y": 0, "w": 102, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 16, "w": 102, "h": 74 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 115, "y": 90, "w": 121, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 30, "w": 121, "h": 56 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 0, "y": 90, "w": 114, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 30, "w": 114, "h": 62 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 378, "y": 75, "w": 101, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 32, "w": 101, "h": 63 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 237, "y": 92, "w": 97, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 36, "w": 97, "h": 56 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 0, "y": 0, "w": 106, "h": 86 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 106, "h": 86 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 107, "y": 0, "w": 90, "h": 89 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 19, "y": 3, "w": 90, "h": 89 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 292, "y": 0, "w": 85, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 2, "w": 85, "h": 91 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 107, "y": 0, "w": 90, "h": 89 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 19, "y": 3, "w": 90, "h": 89 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 198, "y": 0, "w": 93, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 6, "w": 93, "h": 85 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 378, "y": 0, "w": 102, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 16, "w": 102, "h": 74 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 115, "y": 90, "w": 121, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 30, "w": 121, "h": 56 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 0, "y": 90, "w": 114, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 30, "w": 114, "h": 62 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 378, "y": 75, "w": 101, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 32, "w": 101, "h": 63 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 237, "y": 92, "w": 97, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 36, "w": 97, "h": 56 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 0, "y": 0, "w": 106, "h": 86 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 106, "h": 86 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 107, "y": 0, "w": 90, "h": 89 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 19, "y": 3, "w": 90, "h": 89 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 292, "y": 0, "w": 85, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 2, "w": 85, "h": 91 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 198, "y": 0, "w": 93, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 6, "w": 93, "h": 85 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 378, "y": 0, "w": 102, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 16, "w": 102, "h": 74 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 0, "y": 90, "w": 114, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 30, "w": 114, "h": 62 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 237, "y": 92, "w": 97, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 36, "w": 97, "h": 56 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 292, "y": 0, "w": 85, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 2, "w": 85, "h": 91 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 198, "y": 0, "w": 93, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 6, "w": 93, "h": 85 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 378, "y": 0, "w": 102, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 16, "w": 102, "h": 74 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 0, "y": 90, "w": 114, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 30, "w": 114, "h": 62 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 237, "y": 92, "w": 97, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 36, "w": 97, "h": 56 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 292, "y": 0, "w": 85, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 2, "w": 85, "h": 91 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 198, "y": 0, "w": 93, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 6, "w": 93, "h": 85 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 378, "y": 0, "w": 102, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 16, "w": 102, "h": 74 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 0, "y": 90, "w": 114, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 30, "w": 114, "h": 62 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 237, "y": 92, "w": 97, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 36, "w": 97, "h": 56 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 292, "y": 0, "w": 85, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 2, "w": 85, "h": 91 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 198, "y": 0, "w": 93, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 6, "w": 93, "h": 85 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 378, "y": 0, "w": 102, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 16, "w": 102, "h": 74 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 0, "y": 90, "w": 114, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 30, "w": 114, "h": 62 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 237, "y": 92, "w": 97, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 36, "w": 97, "h": 56 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 292, "y": 0, "w": 85, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 2, "w": 85, "h": 91 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "663.png",
+  "format": "I8",
+  "size": { "w": 480, "h": 152 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/663.png b/public/images/pokemon/exp/663.png
index e3f83f2594b..394cec2e0ee 100644
Binary files a/public/images/pokemon/exp/663.png and b/public/images/pokemon/exp/663.png differ
diff --git a/public/images/pokemon/exp/664.json b/public/images/pokemon/exp/664.json
index b44e028830f..5036fe74b0b 100644
--- a/public/images/pokemon/exp/664.json
+++ b/public/images/pokemon/exp/664.json
@@ -1,188 +1,110 @@
-{
-	"textures": [
-		{
-			"image": "664.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 84,
-				"h": 84
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 25,
-						"h": 43
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 25,
-						"h": 43
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 25,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 25,
-						"h": 43
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 25,
-						"h": 43
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 25,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 25,
-						"h": 43
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 25,
-						"h": 43
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 25,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 25,
-						"h": 43
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 25,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 43,
-						"w": 25,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 25,
-						"h": 43
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 25,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 43,
-						"w": 25,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 25,
-						"h": 43
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 25,
-						"h": 43
-					},
-					"frame": {
-						"x": 25,
-						"y": 0,
-						"w": 25,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 25,
-						"h": 43
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 25,
-						"h": 43
-					},
-					"frame": {
-						"x": 25,
-						"y": 0,
-						"w": 25,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 25,
-						"h": 43
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 25,
-						"h": 43
-					},
-					"frame": {
-						"x": 50,
-						"y": 0,
-						"w": 25,
-						"h": 43
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:463885b13604daf56d9395607b6a199b:02b6779c8edc4d65f396242ab67065d7:596e7d5b15b1bf041c4d7f6707c8ff49$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 0, "y": 46, "w": 26, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 26, "h": 46 },
+    "sourceSize": { "w": 28, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 83, "y": 46, "w": 26, "h": 45 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 26, "h": 45 },
+    "sourceSize": { "w": 28, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 26, "y": 90, "w": 26, "h": 45 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 26, "h": 45 },
+    "sourceSize": { "w": 28, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 52, "y": 91, "w": 26, "h": 45 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 26, "h": 45 },
+    "sourceSize": { "w": 28, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 26, "y": 46, "w": 27, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 27, "h": 44 },
+    "sourceSize": { "w": 28, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 78, "y": 91, "w": 26, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 26, "h": 44 },
+    "sourceSize": { "w": 28, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 56, "y": 0, "w": 28, "h": 45 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 28, "h": 45 },
+    "sourceSize": { "w": 28, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 0, "y": 0, "w": 28, "h": 46 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 28, "h": 46 },
+    "sourceSize": { "w": 28, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 28, "y": 0, "w": 28, "h": 46 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 28, "h": 46 },
+    "sourceSize": { "w": 28, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 84, "y": 0, "w": 27, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 27, "h": 46 },
+    "sourceSize": { "w": 28, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 56, "y": 45, "w": 27, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 27, "h": 46 },
+    "sourceSize": { "w": 28, "h": 46 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "664.png",
+  "format": "I8",
+  "size": { "w": 111, "h": 136 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/664.png b/public/images/pokemon/exp/664.png
index 5f7ee7f426e..d626085b5a1 100644
Binary files a/public/images/pokemon/exp/664.png and b/public/images/pokemon/exp/664.png differ
diff --git a/public/images/pokemon/exp/665.json b/public/images/pokemon/exp/665.json
index 69d1dfa05e2..a06b1d10ad0 100644
--- a/public/images/pokemon/exp/665.json
+++ b/public/images/pokemon/exp/665.json
@@ -1,188 +1,596 @@
-{
-	"textures": [
-		{
-			"image": "665.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 76,
-				"h": 76
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 38,
-						"h": 36
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 38,
-						"h": 36
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 38,
-						"h": 36
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 38,
-						"h": 36
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 38,
-						"h": 36
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 38,
-						"h": 36
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 38,
-						"h": 36
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 38,
-						"h": 36
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 38,
-						"h": 36
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 38,
-						"h": 36
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 38,
-						"h": 36
-					},
-					"frame": {
-						"x": 38,
-						"y": 0,
-						"w": 38,
-						"h": 36
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 36
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 36,
-						"h": 36
-					},
-					"frame": {
-						"x": 0,
-						"y": 36,
-						"w": 36,
-						"h": 36
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 36
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 36,
-						"h": 36
-					},
-					"frame": {
-						"x": 0,
-						"y": 36,
-						"w": 36,
-						"h": 36
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 36
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 38,
-						"h": 35
-					},
-					"frame": {
-						"x": 36,
-						"y": 36,
-						"w": 38,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 36
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 38,
-						"h": 35
-					},
-					"frame": {
-						"x": 36,
-						"y": 36,
-						"w": 38,
-						"h": 35
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:359a2e5553846e1cd19ec4ff9a207cd7:96f598328847d5f090f229788215db91:a72e6c94514c750d7462eab6b08ee591$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 125, "y": 68, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 3, "w": 34, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 36, "y": 76, "w": 34, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 4, "w": 34, "h": 34 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 79, "y": 73, "w": 36, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 5, "w": 36, "h": 33 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 0, "y": 76, "w": 36, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 5, "w": 36, "h": 33 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 115, "y": 103, "w": 36, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 6, "w": 36, "h": 32 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 151, "y": 103, "w": 36, "h": 31 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 7, "w": 36, "h": 31 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 115, "y": 103, "w": 36, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 6, "w": 36, "h": 32 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 0, "y": 76, "w": 36, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 5, "w": 36, "h": 33 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 79, "y": 73, "w": 36, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 5, "w": 36, "h": 33 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 36, "y": 76, "w": 34, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 4, "w": 34, "h": 34 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 125, "y": 68, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 3, "w": 34, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 125, "y": 68, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 3, "w": 34, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 125, "y": 68, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 3, "w": 34, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 125, "y": 68, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 3, "w": 34, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 125, "y": 68, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 3, "w": 34, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 36, "y": 76, "w": 34, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 4, "w": 34, "h": 34 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 79, "y": 73, "w": 36, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 5, "w": 36, "h": 33 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 0, "y": 76, "w": 36, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 5, "w": 36, "h": 33 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 115, "y": 103, "w": 36, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 6, "w": 36, "h": 32 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 151, "y": 103, "w": 36, "h": 31 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 7, "w": 36, "h": 31 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 115, "y": 103, "w": 36, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 6, "w": 36, "h": 32 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 0, "y": 76, "w": 36, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 5, "w": 36, "h": 33 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 79, "y": 73, "w": 36, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 5, "w": 36, "h": 33 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 36, "y": 76, "w": 34, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 4, "w": 34, "h": 34 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 125, "y": 68, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 3, "w": 34, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 125, "y": 68, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 3, "w": 34, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 125, "y": 68, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 3, "w": 34, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 125, "y": 68, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 3, "w": 34, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 125, "y": 68, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 3, "w": 34, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 36, "y": 76, "w": 34, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 4, "w": 34, "h": 34 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 79, "y": 73, "w": 36, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 5, "w": 36, "h": 33 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 0, "y": 76, "w": 36, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 5, "w": 36, "h": 33 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 115, "y": 103, "w": 36, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 6, "w": 36, "h": 32 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 151, "y": 103, "w": 36, "h": 31 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 7, "w": 36, "h": 31 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 115, "y": 103, "w": 36, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 6, "w": 36, "h": 32 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 0, "y": 76, "w": 36, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 5, "w": 36, "h": 33 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 79, "y": 73, "w": 36, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 5, "w": 36, "h": 33 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 36, "y": 76, "w": 34, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 4, "w": 34, "h": 34 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 125, "y": 68, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 3, "w": 34, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 125, "y": 68, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 3, "w": 34, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 125, "y": 68, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 3, "w": 34, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 125, "y": 68, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 3, "w": 34, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 125, "y": 68, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 3, "w": 34, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 159, "y": 68, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 3, "w": 34, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 193, "y": 68, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 3, "w": 34, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 159, "y": 68, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 3, "w": 34, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 125, "y": 68, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 3, "w": 34, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 40, "y": 41, "w": 39, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 3, "w": 39, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 80, "y": 38, "w": 45, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 3, "w": 45, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 227, "y": 34, "w": 63, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 4, "w": 63, "h": 34 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 80, "y": 0, "w": 74, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 74, "h": 38 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 154, "y": 0, "w": 81, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 81, "h": 34 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 235, "y": 0, "w": 81, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 81, "h": 34 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 0, "y": 0, "w": 80, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 80, "h": 41 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 154, "y": 34, "w": 73, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 4, "w": 73, "h": 34 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 316, "y": 0, "w": 73, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 4, "w": 73, "h": 37 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 290, "y": 37, "w": 53, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 17, "y": 4, "w": 53, "h": 34 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 343, "y": 37, "w": 46, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 3, "w": 46, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 0, "y": 41, "w": 40, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 3, "w": 40, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 227, "y": 68, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 3, "w": 34, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 261, "y": 71, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 3, "w": 34, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 295, "y": 71, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 3, "w": 34, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 329, "y": 72, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 3, "w": 34, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 363, "y": 72, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 3, "w": 34, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 125, "y": 68, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 3, "w": 34, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "665.png",
+  "format": "I8",
+  "size": { "w": 397, "h": 135 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/665.png b/public/images/pokemon/exp/665.png
index 05b0370d0c6..88dc208300f 100644
Binary files a/public/images/pokemon/exp/665.png and b/public/images/pokemon/exp/665.png differ
diff --git a/public/images/pokemon/exp/666-fancy.png b/public/images/pokemon/exp/666-fancy.png
index 6c23274c5e0..92da507a61f 100644
Binary files a/public/images/pokemon/exp/666-fancy.png and b/public/images/pokemon/exp/666-fancy.png differ
diff --git a/public/images/pokemon/exp/666-high-plains.png b/public/images/pokemon/exp/666-high-plains.png
index 9d6527bf091..a34b2fd8254 100644
Binary files a/public/images/pokemon/exp/666-high-plains.png and b/public/images/pokemon/exp/666-high-plains.png differ
diff --git a/public/images/pokemon/exp/666-meadow.json b/public/images/pokemon/exp/666-meadow.json
index ee4f6d31bc0..77158992e59 100644
--- a/public/images/pokemon/exp/666-meadow.json
+++ b/public/images/pokemon/exp/666-meadow.json
@@ -1,314 +1,551 @@
-{
-	"textures": [
-		{
-			"image": "666-meadow.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 243,
-				"h": 243
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 84,
-						"h": 88
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 84,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 77,
-						"h": 89
-					},
-					"frame": {
-						"x": 0,
-						"y": 88,
-						"w": 77,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 77,
-						"h": 89
-					},
-					"frame": {
-						"x": 0,
-						"y": 88,
-						"w": 77,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 3,
-						"w": 69,
-						"h": 89
-					},
-					"frame": {
-						"x": 77,
-						"y": 88,
-						"w": 69,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 3,
-						"w": 69,
-						"h": 89
-					},
-					"frame": {
-						"x": 77,
-						"y": 88,
-						"w": 69,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 3,
-						"w": 62,
-						"h": 87
-					},
-					"frame": {
-						"x": 84,
-						"y": 0,
-						"w": 62,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 3,
-						"w": 62,
-						"h": 87
-					},
-					"frame": {
-						"x": 84,
-						"y": 0,
-						"w": 62,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 13,
-						"y": 2,
-						"w": 56,
-						"h": 86
-					},
-					"frame": {
-						"x": 146,
-						"y": 0,
-						"w": 56,
-						"h": 86
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 13,
-						"y": 2,
-						"w": 56,
-						"h": 86
-					},
-					"frame": {
-						"x": 146,
-						"y": 0,
-						"w": 56,
-						"h": 86
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 19,
-						"y": 0,
-						"w": 41,
-						"h": 85
-					},
-					"frame": {
-						"x": 202,
-						"y": 0,
-						"w": 41,
-						"h": 85
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 15,
-						"y": 1,
-						"w": 51,
-						"h": 86
-					},
-					"frame": {
-						"x": 146,
-						"y": 86,
-						"w": 51,
-						"h": 86
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 15,
-						"y": 1,
-						"w": 51,
-						"h": 86
-					},
-					"frame": {
-						"x": 146,
-						"y": 86,
-						"w": 51,
-						"h": 86
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 17,
-						"y": 0,
-						"w": 46,
-						"h": 86
-					},
-					"frame": {
-						"x": 197,
-						"y": 86,
-						"w": 46,
-						"h": 86
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 17,
-						"y": 0,
-						"w": 46,
-						"h": 86
-					},
-					"frame": {
-						"x": 197,
-						"y": 86,
-						"w": 46,
-						"h": 86
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:223ce33721ef8da9ff40286099c20de4:b82acd304c2a8b8cebeda2043a3e1f96:f8ac4807b4d6eef2256fa1b93e0f89ba$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 2, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 14, "w": 67, "h": 67 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 347, "y": 2, "w": 49, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 15, "w": 49, "h": 67 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 71, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 16, "w": 67, "h": 67 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 347, "y": 71, "w": 49, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 17, "w": 49, "h": 67 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 140, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 18, "w": 67, "h": 67 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 347, "y": 140, "w": 49, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 20, "w": 49, "h": 67 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 209, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 21, "w": 67, "h": 67 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 347, "y": 140, "w": 49, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 20, "w": 49, "h": 67 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 140, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 18, "w": 67, "h": 67 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 347, "y": 71, "w": 49, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 17, "w": 49, "h": 67 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 71, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 16, "w": 67, "h": 67 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 347, "y": 2, "w": 49, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 15, "w": 49, "h": 67 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 2, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 14, "w": 67, "h": 67 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 347, "y": 2, "w": 49, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 15, "w": 49, "h": 67 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 71, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 16, "w": 67, "h": 67 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 347, "y": 71, "w": 49, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 17, "w": 49, "h": 67 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 140, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 18, "w": 67, "h": 67 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 347, "y": 140, "w": 49, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 20, "w": 49, "h": 67 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 209, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 21, "w": 67, "h": 67 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 347, "y": 140, "w": 49, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 20, "w": 49, "h": 67 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 140, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 18, "w": 67, "h": 67 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 347, "y": 71, "w": 49, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 17, "w": 49, "h": 67 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 71, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 16, "w": 67, "h": 67 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 347, "y": 2, "w": 49, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 15, "w": 49, "h": 67 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 2, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 14, "w": 67, "h": 67 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 347, "y": 2, "w": 49, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 15, "w": 49, "h": 67 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 71, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 16, "w": 67, "h": 67 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 347, "y": 71, "w": 49, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 17, "w": 49, "h": 67 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 140, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 18, "w": 67, "h": 67 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 347, "y": 140, "w": 49, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 20, "w": 49, "h": 67 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 209, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 21, "w": 67, "h": 67 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 347, "y": 140, "w": 49, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 20, "w": 49, "h": 67 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 140, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 18, "w": 67, "h": 67 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 347, "y": 71, "w": 49, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 17, "w": 49, "h": 67 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 71, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 16, "w": 67, "h": 67 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 347, "y": 2, "w": 49, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 15, "w": 49, "h": 67 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 2, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 14, "w": 67, "h": 67 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 2, "y": 209, "w": 49, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 15, "w": 49, "h": 67 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 278, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 16, "w": 67, "h": 67 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 53, "y": 209, "w": 49, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 17, "w": 49, "h": 67 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 2, "y": 71, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 18, "w": 67, "h": 67 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 104, "y": 209, "w": 49, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 19, "w": 49, "h": 67 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 71, "y": 71, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 20, "w": 67, "h": 67 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 155, "y": 209, "w": 49, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 19, "w": 49, "h": 67 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 140, "y": 71, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 18, "w": 67, "h": 67 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 206, "y": 209, "w": 49, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 17, "w": 49, "h": 67 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 209, "y": 71, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 16, "w": 67, "h": 67 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 257, "y": 209, "w": 49, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 15, "w": 49, "h": 67 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 278, "y": 71, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 14, "w": 67, "h": 67 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 308, "y": 209, "w": 49, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 15, "w": 49, "h": 67 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 2, "y": 140, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 16, "w": 67, "h": 67 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 53, "y": 209, "w": 49, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 17, "w": 49, "h": 67 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 71, "y": 140, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 18, "w": 67, "h": 67 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 104, "y": 209, "w": 49, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 19, "w": 49, "h": 67 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 140, "y": 140, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 20, "w": 67, "h": 67 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 2, "y": 278, "w": 49, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 19, "w": 49, "h": 67 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 209, "y": 140, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 18, "w": 67, "h": 67 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 53, "y": 278, "w": 49, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 17, "w": 49, "h": 67 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 278, "y": 140, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 16, "w": 67, "h": 67 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 104, "y": 278, "w": 49, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 15, "w": 49, "h": 67 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "666-meadow.png",
+  "format": "I8",
+  "size": { "w": 398, "h": 347 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/666-meadow.png b/public/images/pokemon/exp/666-meadow.png
index 3f9f758ad1f..6912a8d8174 100644
Binary files a/public/images/pokemon/exp/666-meadow.png and b/public/images/pokemon/exp/666-meadow.png differ
diff --git a/public/images/pokemon/exp/666-poke-ball.png b/public/images/pokemon/exp/666-poke-ball.png
index e33fe6e8c5a..58cae8e2aaa 100644
Binary files a/public/images/pokemon/exp/666-poke-ball.png and b/public/images/pokemon/exp/666-poke-ball.png differ
diff --git a/public/images/pokemon/exp/666-river.png b/public/images/pokemon/exp/666-river.png
index 1e908ff89b6..433b2c39254 100644
Binary files a/public/images/pokemon/exp/666-river.png and b/public/images/pokemon/exp/666-river.png differ
diff --git a/public/images/pokemon/exp/667.json b/public/images/pokemon/exp/667.json
index 3667bc80aa0..3fba95afcf9 100644
--- a/public/images/pokemon/exp/667.json
+++ b/public/images/pokemon/exp/667.json
@@ -1,272 +1,659 @@
-{
-	"textures": [
-		{
-			"image": "667.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 160,
-				"h": 160
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 40,
-						"h": 46
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 40,
-						"h": 46
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 40,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 40,
-						"h": 46
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 40,
-						"h": 46
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 40,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 40,
-						"h": 46
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 40,
-						"h": 46
-					},
-					"frame": {
-						"x": 0,
-						"y": 46,
-						"w": 40,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 40,
-						"h": 46
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 40,
-						"h": 46
-					},
-					"frame": {
-						"x": 0,
-						"y": 92,
-						"w": 40,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 40,
-						"h": 46
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 40,
-						"h": 46
-					},
-					"frame": {
-						"x": 40,
-						"y": 0,
-						"w": 40,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 40,
-						"h": 46
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 40,
-						"h": 46
-					},
-					"frame": {
-						"x": 80,
-						"y": 0,
-						"w": 40,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 46
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 40,
-						"h": 45
-					},
-					"frame": {
-						"x": 120,
-						"y": 0,
-						"w": 40,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 46
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 40,
-						"h": 45
-					},
-					"frame": {
-						"x": 120,
-						"y": 0,
-						"w": 40,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 46
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 40,
-						"h": 45
-					},
-					"frame": {
-						"x": 120,
-						"y": 45,
-						"w": 40,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 46
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 40,
-						"h": 45
-					},
-					"frame": {
-						"x": 40,
-						"y": 90,
-						"w": 40,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 46
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 40,
-						"h": 44
-					},
-					"frame": {
-						"x": 40,
-						"y": 46,
-						"w": 40,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 46
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 40,
-						"h": 44
-					},
-					"frame": {
-						"x": 80,
-						"y": 46,
-						"w": 40,
-						"h": 44
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:0c78c1973ebb266716d5a3a4557bca98:3ab4a906b1847f4048e828e5410eae40:02171d511e760c8a3e1b623ad6bf93f5$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 127, "y": 0, "w": 40, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 40, "h": 47 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 127, "y": 48, "w": 40, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 40, "h": 47 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 0, "y": 50, "w": 39, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 39, "h": 46 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 40, "y": 50, "w": 39, "h": 45 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 39, "h": 45 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 120, "y": 96, "w": 38, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 38, "h": 44 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 80, "y": 96, "w": 39, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 39, "h": 44 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 40, "y": 96, "w": 39, "h": 45 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 39, "h": 45 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 85, "y": 49, "w": 40, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 40, "h": 46 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 127, "y": 0, "w": 40, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 40, "h": 47 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 127, "y": 0, "w": 40, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 40, "h": 47 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 127, "y": 48, "w": 40, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 40, "h": 47 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 0, "y": 50, "w": 39, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 39, "h": 46 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 40, "y": 50, "w": 39, "h": 45 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 39, "h": 45 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 120, "y": 96, "w": 38, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 38, "h": 44 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 80, "y": 96, "w": 39, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 39, "h": 44 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 40, "y": 96, "w": 39, "h": 45 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 39, "h": 45 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 85, "y": 49, "w": 40, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 40, "h": 46 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 127, "y": 0, "w": 40, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 40, "h": 47 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 127, "y": 0, "w": 40, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 40, "h": 47 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 127, "y": 48, "w": 40, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 40, "h": 47 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 0, "y": 50, "w": 39, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 39, "h": 46 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 40, "y": 50, "w": 39, "h": 45 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 39, "h": 45 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 120, "y": 96, "w": 38, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 38, "h": 44 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 80, "y": 96, "w": 39, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 39, "h": 44 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 40, "y": 96, "w": 39, "h": 45 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 39, "h": 45 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 85, "y": 49, "w": 40, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 40, "h": 46 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 127, "y": 0, "w": 40, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 40, "h": 47 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 127, "y": 0, "w": 40, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 40, "h": 47 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 127, "y": 48, "w": 40, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 40, "h": 47 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 0, "y": 50, "w": 39, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 39, "h": 46 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 40, "y": 50, "w": 39, "h": 45 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 39, "h": 45 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 120, "y": 96, "w": 38, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 38, "h": 44 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 80, "y": 96, "w": 39, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 39, "h": 44 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 40, "y": 96, "w": 39, "h": 45 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 39, "h": 45 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 85, "y": 49, "w": 40, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 40, "h": 46 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 127, "y": 0, "w": 40, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 40, "h": 47 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 127, "y": 0, "w": 40, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 40, "h": 47 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 127, "y": 48, "w": 40, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 40, "h": 47 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 0, "y": 50, "w": 39, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 39, "h": 46 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 40, "y": 50, "w": 39, "h": 45 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 39, "h": 45 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 120, "y": 96, "w": 38, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 38, "h": 44 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 80, "y": 96, "w": 39, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 39, "h": 44 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 40, "y": 96, "w": 39, "h": 45 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 39, "h": 45 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 85, "y": 49, "w": 40, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 40, "h": 46 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 127, "y": 0, "w": 40, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 40, "h": 47 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 127, "y": 0, "w": 40, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 40, "h": 47 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 127, "y": 48, "w": 40, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 40, "h": 47 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 0, "y": 50, "w": 39, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 39, "h": 46 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 40, "y": 50, "w": 39, "h": 45 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 39, "h": 45 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 120, "y": 96, "w": 38, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 38, "h": 44 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 80, "y": 96, "w": 39, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 39, "h": 44 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 40, "y": 96, "w": 39, "h": 45 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 39, "h": 45 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 85, "y": 49, "w": 40, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 40, "h": 46 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 127, "y": 0, "w": 40, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 40, "h": 47 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 127, "y": 0, "w": 40, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 40, "h": 47 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 85, "y": 0, "w": 41, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 41, "h": 48 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 0, "y": 0, "w": 42, "h": 49 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 42, "h": 49 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 43, "y": 0, "w": 41, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 41, "h": 49 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 0, "y": 0, "w": 42, "h": 49 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 42, "h": 49 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 43, "y": 0, "w": 41, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 41, "h": 49 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 0, "y": 0, "w": 42, "h": 49 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 42, "h": 49 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 43, "y": 0, "w": 41, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 41, "h": 49 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 0, "y": 0, "w": 42, "h": 49 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 42, "h": 49 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 43, "y": 0, "w": 41, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 41, "h": 49 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 0, "y": 0, "w": 42, "h": 49 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 42, "h": 49 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 43, "y": 0, "w": 41, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 41, "h": 49 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 0, "y": 0, "w": 42, "h": 49 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 42, "h": 49 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 43, "y": 0, "w": 41, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 41, "h": 49 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 0, "y": 0, "w": 42, "h": 49 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 42, "h": 49 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 43, "y": 0, "w": 41, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 41, "h": 49 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 85, "y": 0, "w": 41, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 41, "h": 48 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 127, "y": 0, "w": 40, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 40, "h": 47 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.11-x64",
+  "image": "667.png",
+  "format": "I8",
+  "size": { "w": 167, "h": 141 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/667.png b/public/images/pokemon/exp/667.png
index 21bbfcc0d68..3ae931300c5 100644
Binary files a/public/images/pokemon/exp/667.png and b/public/images/pokemon/exp/667.png differ
diff --git a/public/images/pokemon/exp/668.json b/public/images/pokemon/exp/668.json
index 083fdcfb598..63671a548a2 100644
--- a/public/images/pokemon/exp/668.json
+++ b/public/images/pokemon/exp/668.json
@@ -1,272 +1,821 @@
-{
-	"textures": [
-		{
-			"image": "668.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 205,
-				"h": 205
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 70,
-						"h": 70
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 70,
-						"h": 68
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 70,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 70,
-						"h": 70
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 70,
-						"h": 68
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 70,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 70,
-						"h": 70
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 70,
-						"h": 69
-					},
-					"frame": {
-						"x": 70,
-						"y": 0,
-						"w": 70,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 70,
-						"h": 70
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 70,
-						"h": 69
-					},
-					"frame": {
-						"x": 70,
-						"y": 0,
-						"w": 70,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 70,
-						"h": 70
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 70,
-						"h": 69
-					},
-					"frame": {
-						"x": 70,
-						"y": 0,
-						"w": 70,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 70,
-						"h": 70
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 70,
-						"h": 69
-					},
-					"frame": {
-						"x": 70,
-						"y": 0,
-						"w": 70,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 70,
-						"h": 70
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 70
-					},
-					"frame": {
-						"x": 0,
-						"y": 68,
-						"w": 67,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 70,
-						"h": 70
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 70
-					},
-					"frame": {
-						"x": 0,
-						"y": 68,
-						"w": 67,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 70,
-						"h": 70
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 69,
-						"h": 70
-					},
-					"frame": {
-						"x": 67,
-						"y": 69,
-						"w": 69,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 70,
-						"h": 70
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 69,
-						"h": 70
-					},
-					"frame": {
-						"x": 67,
-						"y": 69,
-						"w": 69,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 70,
-						"h": 70
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 69,
-						"h": 70
-					},
-					"frame": {
-						"x": 67,
-						"y": 69,
-						"w": 69,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 70,
-						"h": 70
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 69,
-						"h": 70
-					},
-					"frame": {
-						"x": 136,
-						"y": 69,
-						"w": 69,
-						"h": 70
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:a0374d38386b4719d8b0a8fcc11d003d:7a4ba7ff9050ba3dee8c8340200f12c2:947bf84d1af493c62e2cef45bb6c19ad$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 67, "y": 222, "w": 70, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 70, "h": 73 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 0, "y": 295, "w": 68, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 68, "h": 73 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 414, "y": 297, "w": 67, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 67, "h": 72 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 196, "y": 367, "w": 65, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 6, "w": 65, "h": 71 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 414, "y": 369, "w": 62, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 5, "w": 62, "h": 72 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 320, "y": 372, "w": 60, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 60, "h": 73 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 380, "y": 441, "w": 58, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 58, "h": 73 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 196, "y": 438, "w": 58, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 58, "h": 73 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 61, "y": 370, "w": 60, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 60, "h": 74 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 350, "y": 296, "w": 64, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 64, "h": 76 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 0, "y": 151, "w": 67, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 0, "w": 67, "h": 77 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 283, "y": 149, "w": 68, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 1, "w": 68, "h": 76 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 434, "y": 149, "w": 68, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 1, "w": 68, "h": 76 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 214, "y": 149, "w": 69, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 69, "h": 75 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 282, "y": 225, "w": 68, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 68, "h": 74 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 67, "y": 222, "w": 70, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 70, "h": 73 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 0, "y": 295, "w": 68, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 68, "h": 73 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 414, "y": 297, "w": 67, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 67, "h": 72 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 196, "y": 367, "w": 65, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 6, "w": 65, "h": 71 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 414, "y": 369, "w": 62, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 5, "w": 62, "h": 72 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 320, "y": 372, "w": 60, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 60, "h": 73 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 380, "y": 441, "w": 58, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 58, "h": 73 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 196, "y": 438, "w": 58, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 58, "h": 73 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 61, "y": 370, "w": 60, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 60, "h": 74 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 350, "y": 296, "w": 64, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 64, "h": 76 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 0, "y": 151, "w": 67, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 0, "w": 67, "h": 77 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 283, "y": 149, "w": 68, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 1, "w": 68, "h": 76 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 434, "y": 149, "w": 68, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 1, "w": 68, "h": 76 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 214, "y": 149, "w": 69, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 69, "h": 75 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 282, "y": 225, "w": 68, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 68, "h": 74 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 67, "y": 222, "w": 70, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 70, "h": 73 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 0, "y": 295, "w": 68, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 68, "h": 73 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 414, "y": 297, "w": 67, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 67, "h": 72 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 196, "y": 367, "w": 65, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 6, "w": 65, "h": 71 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 414, "y": 369, "w": 62, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 5, "w": 62, "h": 72 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 320, "y": 372, "w": 60, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 60, "h": 73 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 380, "y": 441, "w": 58, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 58, "h": 73 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 196, "y": 438, "w": 58, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 58, "h": 73 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 61, "y": 370, "w": 60, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 60, "h": 74 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 350, "y": 296, "w": 64, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 64, "h": 76 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 0, "y": 151, "w": 67, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 0, "w": 67, "h": 77 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 283, "y": 149, "w": 68, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 1, "w": 68, "h": 76 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 434, "y": 149, "w": 68, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 1, "w": 68, "h": 76 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 214, "y": 149, "w": 69, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 69, "h": 75 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 282, "y": 225, "w": 68, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 68, "h": 74 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 67, "y": 222, "w": 70, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 70, "h": 73 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 0, "y": 295, "w": 68, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 68, "h": 73 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 414, "y": 297, "w": 67, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 67, "h": 72 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 196, "y": 367, "w": 65, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 6, "w": 65, "h": 71 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 414, "y": 369, "w": 62, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 5, "w": 62, "h": 72 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 320, "y": 372, "w": 60, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 60, "h": 73 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 380, "y": 441, "w": 58, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 58, "h": 73 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 196, "y": 438, "w": 58, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 58, "h": 73 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 61, "y": 370, "w": 60, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 60, "h": 74 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 350, "y": 296, "w": 64, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 64, "h": 76 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 0, "y": 151, "w": 67, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 0, "w": 67, "h": 77 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 283, "y": 149, "w": 68, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 1, "w": 68, "h": 76 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 434, "y": 149, "w": 68, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 1, "w": 68, "h": 76 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 214, "y": 149, "w": 69, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 69, "h": 75 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 282, "y": 225, "w": 68, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 68, "h": 74 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 351, "y": 151, "w": 70, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 70, "h": 73 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 142, "y": 221, "w": 70, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 70, "h": 73 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 351, "y": 224, "w": 70, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 70, "h": 72 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 421, "y": 225, "w": 69, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 69, "h": 72 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 205, "y": 296, "w": 69, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 69, "h": 71 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 212, "y": 224, "w": 70, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 70, "h": 72 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 137, "y": 294, "w": 68, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 68, "h": 73 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 274, "y": 299, "w": 64, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 64, "h": 73 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 0, "y": 368, "w": 61, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 61, "h": 74 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 0, "y": 442, "w": 55, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 55, "h": 74 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 438, "y": 441, "w": 55, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 55, "h": 75 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 261, "y": 372, "w": 59, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 59, "h": 75 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 134, "y": 367, "w": 62, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 62, "h": 75 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 68, "y": 295, "w": 66, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 66, "h": 75 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 365, "y": 75, "w": 69, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 69, "h": 76 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 0, "y": 75, "w": 71, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 71, "h": 76 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 442, "y": 74, "w": 72, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 72, "h": 75 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 221, "y": 74, "w": 72, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 72, "h": 75 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 369, "y": 0, "w": 73, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 73, "h": 75 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 296, "y": 0, "w": 73, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 73, "h": 75 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 74, "y": 0, "w": 74, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 74, "h": 75 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 0, "y": 0, "w": 74, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 74, "h": 75 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 148, "y": 0, "w": 74, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 74, "h": 74 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 148, "y": 74, "w": 73, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 73, "h": 74 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 222, "y": 0, "w": 74, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 74, "h": 74 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 442, "y": 0, "w": 73, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 73, "h": 74 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 293, "y": 75, "w": 72, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 72, "h": 74 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0088.png",
+    "frame": { "x": 71, "y": 75, "w": 72, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 72, "h": 74 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0089.png",
+    "frame": { "x": 71, "y": 149, "w": 71, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 71, "h": 73 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0090.png",
+    "frame": { "x": 143, "y": 148, "w": 71, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 71, "h": 73 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.11-x64",
+  "image": "668.png",
+  "format": "I8",
+  "size": { "w": 515, "h": 516 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/668.png b/public/images/pokemon/exp/668.png
index 36acb70a20f..85be1a55032 100644
Binary files a/public/images/pokemon/exp/668.png and b/public/images/pokemon/exp/668.png differ
diff --git a/public/images/pokemon/exp/672.json b/public/images/pokemon/exp/672.json
index 7062ea01ab3..f337bef7d29 100644
--- a/public/images/pokemon/exp/672.json
+++ b/public/images/pokemon/exp/672.json
@@ -1,965 +1,479 @@
-{
-	"textures": [
-		{
-			"image": "672.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 250,
-				"h": 250
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0033.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 38,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 38,
-						"h": 42
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 38,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0034.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 38,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 38,
-						"h": 42
-					},
-					"frame": {
-						"x": 38,
-						"y": 0,
-						"w": 38,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0035.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 38,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 38,
-						"h": 42
-					},
-					"frame": {
-						"x": 76,
-						"y": 0,
-						"w": 38,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0036.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 38,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 38,
-						"h": 42
-					},
-					"frame": {
-						"x": 114,
-						"y": 0,
-						"w": 38,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0037.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 38,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 38,
-						"h": 42
-					},
-					"frame": {
-						"x": 152,
-						"y": 0,
-						"w": 38,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0038.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 38,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 38,
-						"h": 42
-					},
-					"frame": {
-						"x": 190,
-						"y": 0,
-						"w": 38,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0039.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 38,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 38,
-						"h": 42
-					},
-					"frame": {
-						"x": 0,
-						"y": 42,
-						"w": 38,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0040.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 38,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 38,
-						"h": 42
-					},
-					"frame": {
-						"x": 38,
-						"y": 42,
-						"w": 38,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0041.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 38,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 38,
-						"h": 42
-					},
-					"frame": {
-						"x": 76,
-						"y": 42,
-						"w": 38,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0030.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 42
-					},
-					"frame": {
-						"x": 114,
-						"y": 42,
-						"w": 37,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0031.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 42
-					},
-					"frame": {
-						"x": 151,
-						"y": 42,
-						"w": 37,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0032.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 42
-					},
-					"frame": {
-						"x": 188,
-						"y": 42,
-						"w": 37,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0042.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 37,
-						"h": 42
-					},
-					"frame": {
-						"x": 0,
-						"y": 84,
-						"w": 37,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 36,
-						"h": 42
-					},
-					"frame": {
-						"x": 37,
-						"y": 84,
-						"w": 36,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 36,
-						"h": 42
-					},
-					"frame": {
-						"x": 37,
-						"y": 84,
-						"w": 36,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 36,
-						"h": 42
-					},
-					"frame": {
-						"x": 37,
-						"y": 84,
-						"w": 36,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 36,
-						"h": 42
-					},
-					"frame": {
-						"x": 37,
-						"y": 84,
-						"w": 36,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 36,
-						"h": 42
-					},
-					"frame": {
-						"x": 37,
-						"y": 84,
-						"w": 36,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 36,
-						"h": 42
-					},
-					"frame": {
-						"x": 37,
-						"y": 84,
-						"w": 36,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0045.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 36,
-						"h": 42
-					},
-					"frame": {
-						"x": 37,
-						"y": 84,
-						"w": 36,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 36,
-						"h": 42
-					},
-					"frame": {
-						"x": 73,
-						"y": 84,
-						"w": 36,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 36,
-						"h": 42
-					},
-					"frame": {
-						"x": 73,
-						"y": 84,
-						"w": 36,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 36,
-						"h": 42
-					},
-					"frame": {
-						"x": 73,
-						"y": 84,
-						"w": 36,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 36,
-						"h": 42
-					},
-					"frame": {
-						"x": 109,
-						"y": 84,
-						"w": 36,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 36,
-						"h": 42
-					},
-					"frame": {
-						"x": 109,
-						"y": 84,
-						"w": 36,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 36,
-						"h": 42
-					},
-					"frame": {
-						"x": 145,
-						"y": 84,
-						"w": 36,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 36,
-						"h": 42
-					},
-					"frame": {
-						"x": 181,
-						"y": 84,
-						"w": 36,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0025.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 36,
-						"h": 42
-					},
-					"frame": {
-						"x": 0,
-						"y": 126,
-						"w": 36,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0027.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 36,
-						"h": 42
-					},
-					"frame": {
-						"x": 36,
-						"y": 126,
-						"w": 36,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0028.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 36,
-						"h": 42
-					},
-					"frame": {
-						"x": 72,
-						"y": 126,
-						"w": 36,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0029.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 36,
-						"h": 42
-					},
-					"frame": {
-						"x": 108,
-						"y": 126,
-						"w": 36,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0043.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 36,
-						"h": 42
-					},
-					"frame": {
-						"x": 144,
-						"y": 126,
-						"w": 36,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0044.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 36,
-						"h": 42
-					},
-					"frame": {
-						"x": 180,
-						"y": 126,
-						"w": 36,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 36,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 168,
-						"w": 36,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 36,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 168,
-						"w": 36,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 36,
-						"h": 41
-					},
-					"frame": {
-						"x": 36,
-						"y": 168,
-						"w": 36,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 36,
-						"h": 41
-					},
-					"frame": {
-						"x": 72,
-						"y": 168,
-						"w": 36,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 36,
-						"h": 41
-					},
-					"frame": {
-						"x": 108,
-						"y": 168,
-						"w": 36,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 36,
-						"h": 41
-					},
-					"frame": {
-						"x": 108,
-						"y": 168,
-						"w": 36,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 36,
-						"h": 41
-					},
-					"frame": {
-						"x": 144,
-						"y": 168,
-						"w": 36,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 35,
-						"h": 42
-					},
-					"frame": {
-						"x": 180,
-						"y": 168,
-						"w": 35,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 35,
-						"h": 42
-					},
-					"frame": {
-						"x": 180,
-						"y": 168,
-						"w": 35,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0026.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 35,
-						"h": 42
-					},
-					"frame": {
-						"x": 215,
-						"y": 168,
-						"w": 35,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 36,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 209,
-						"w": 36,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 36,
-						"h": 41
-					},
-					"frame": {
-						"x": 36,
-						"y": 209,
-						"w": 36,
-						"h": 41
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:38e639fec858918eeed4df6a97e5793c:1f05d1f362d84566f20c17270128fcef:2e4767b7cd134fc0ab1bb6e9eee82bc7$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 86, "y": 0, "w": 42, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 42, "h": 50 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 127, "y": 50, "w": 42, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 9, "w": 42, "h": 49 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 0, "y": 54, "w": 42, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 10, "w": 42, "h": 48 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 43, "y": 53, "w": 43, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 11, "w": 43, "h": 47 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 124, "y": 148, "w": 43, "h": 45 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 13, "w": 43, "h": 45 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 0, "y": 102, "w": 42, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 11, "w": 42, "h": 47 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 0, "y": 54, "w": 42, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 10, "w": 42, "h": 48 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 127, "y": 99, "w": 41, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 9, "w": 41, "h": 49 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 128, "y": 0, "w": 42, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 42, "h": 50 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 86, "y": 0, "w": 42, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 42, "h": 50 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 86, "y": 0, "w": 42, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 42, "h": 50 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 127, "y": 50, "w": 42, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 9, "w": 42, "h": 49 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 0, "y": 54, "w": 42, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 10, "w": 42, "h": 48 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 43, "y": 53, "w": 43, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 11, "w": 43, "h": 47 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 124, "y": 148, "w": 43, "h": 45 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 13, "w": 43, "h": 45 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 0, "y": 102, "w": 42, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 11, "w": 42, "h": 47 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 0, "y": 54, "w": 42, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 10, "w": 42, "h": 48 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 127, "y": 99, "w": 41, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 9, "w": 41, "h": 49 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 128, "y": 0, "w": 42, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 42, "h": 50 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 86, "y": 0, "w": 42, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 42, "h": 50 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 86, "y": 0, "w": 42, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 42, "h": 50 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 127, "y": 50, "w": 42, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 9, "w": 42, "h": 49 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 0, "y": 54, "w": 42, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 10, "w": 42, "h": 48 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 43, "y": 53, "w": 43, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 11, "w": 43, "h": 47 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 124, "y": 148, "w": 43, "h": 45 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 13, "w": 43, "h": 45 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 0, "y": 102, "w": 42, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 11, "w": 42, "h": 47 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 0, "y": 54, "w": 42, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 10, "w": 42, "h": 48 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 127, "y": 99, "w": 41, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 9, "w": 41, "h": 49 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 128, "y": 0, "w": 42, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 42, "h": 50 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 86, "y": 0, "w": 42, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 42, "h": 50 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 86, "y": 0, "w": 42, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 42, "h": 50 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 127, "y": 50, "w": 42, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 9, "w": 42, "h": 49 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 0, "y": 54, "w": 42, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 10, "w": 42, "h": 48 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 43, "y": 53, "w": 43, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 11, "w": 43, "h": 47 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 124, "y": 148, "w": 43, "h": 45 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 13, "w": 43, "h": 45 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 0, "y": 102, "w": 42, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 11, "w": 42, "h": 47 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 0, "y": 54, "w": 42, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 10, "w": 42, "h": 48 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 127, "y": 99, "w": 41, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 9, "w": 41, "h": 49 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 128, "y": 0, "w": 42, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 42, "h": 50 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 86, "y": 0, "w": 42, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 42, "h": 50 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 86, "y": 0, "w": 42, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 42, "h": 50 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 43, "y": 0, "w": 43, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 43, "h": 53 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 0, "y": 0, "w": 43, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 43, "h": 54 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 42, "y": 100, "w": 41, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 9, "w": 41, "h": 49 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 86, "y": 50, "w": 41, "h": 51 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 41, "h": 51 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 86, "y": 0, "w": 42, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 42, "h": 50 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 86, "y": 0, "w": 42, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 42, "h": 50 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 43, "y": 0, "w": 43, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 43, "h": 53 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 0, "y": 0, "w": 43, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 43, "h": 54 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 83, "y": 101, "w": 41, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 9, "w": 41, "h": 49 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 86, "y": 50, "w": 41, "h": 51 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 41, "h": 51 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 86, "y": 0, "w": 42, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 42, "h": 50 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.11-x64",
+  "image": "672.png",
+  "format": "I8",
+  "size": { "w": 170, "h": 193 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/672.png b/public/images/pokemon/exp/672.png
index 1af5c35d308..1c261d8d51a 100644
Binary files a/public/images/pokemon/exp/672.png and b/public/images/pokemon/exp/672.png differ
diff --git a/public/images/pokemon/exp/674.json b/public/images/pokemon/exp/674.json
deleted file mode 100644
index ab275feb366..00000000000
--- a/public/images/pokemon/exp/674.json
+++ /dev/null
@@ -1,524 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "674.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 90,
-				"h": 90
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 30,
-						"h": 40
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 30,
-						"h": 40
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 30,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 30,
-						"h": 40
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 30,
-						"h": 40
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 30,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 30,
-						"h": 40
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 30,
-						"h": 40
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 30,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 30,
-						"h": 40
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 30,
-						"h": 40
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 30,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 30,
-						"h": 40
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 30,
-						"h": 40
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 30,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 30,
-						"h": 40
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 30,
-						"h": 40
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 30,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 30,
-						"h": 40
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 30,
-						"h": 39
-					},
-					"frame": {
-						"x": 0,
-						"y": 40,
-						"w": 30,
-						"h": 39
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 30,
-						"h": 40
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 30,
-						"h": 39
-					},
-					"frame": {
-						"x": 0,
-						"y": 40,
-						"w": 30,
-						"h": 39
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 30,
-						"h": 40
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 30,
-						"h": 39
-					},
-					"frame": {
-						"x": 0,
-						"y": 40,
-						"w": 30,
-						"h": 39
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 30,
-						"h": 40
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 30,
-						"h": 39
-					},
-					"frame": {
-						"x": 0,
-						"y": 40,
-						"w": 30,
-						"h": 39
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 30,
-						"h": 40
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 30,
-						"h": 39
-					},
-					"frame": {
-						"x": 0,
-						"y": 40,
-						"w": 30,
-						"h": 39
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 30,
-						"h": 40
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 30,
-						"h": 39
-					},
-					"frame": {
-						"x": 0,
-						"y": 40,
-						"w": 30,
-						"h": 39
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 30,
-						"h": 40
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 30,
-						"h": 39
-					},
-					"frame": {
-						"x": 0,
-						"y": 40,
-						"w": 30,
-						"h": 39
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 30,
-						"h": 40
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 30,
-						"h": 39
-					},
-					"frame": {
-						"x": 0,
-						"y": 40,
-						"w": 30,
-						"h": 39
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 30,
-						"h": 40
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 30,
-						"h": 39
-					},
-					"frame": {
-						"x": 0,
-						"y": 40,
-						"w": 30,
-						"h": 39
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 30,
-						"h": 40
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 30,
-						"h": 39
-					},
-					"frame": {
-						"x": 0,
-						"y": 40,
-						"w": 30,
-						"h": 39
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 30,
-						"h": 40
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 30,
-						"h": 39
-					},
-					"frame": {
-						"x": 30,
-						"y": 0,
-						"w": 30,
-						"h": 39
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 30,
-						"h": 40
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 30,
-						"h": 39
-					},
-					"frame": {
-						"x": 30,
-						"y": 0,
-						"w": 30,
-						"h": 39
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 30,
-						"h": 40
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 30,
-						"h": 37
-					},
-					"frame": {
-						"x": 60,
-						"y": 0,
-						"w": 30,
-						"h": 37
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 30,
-						"h": 40
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 30,
-						"h": 37
-					},
-					"frame": {
-						"x": 60,
-						"y": 0,
-						"w": 30,
-						"h": 37
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 30,
-						"h": 40
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 30,
-						"h": 37
-					},
-					"frame": {
-						"x": 60,
-						"y": 0,
-						"w": 30,
-						"h": 37
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 30,
-						"h": 40
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 30,
-						"h": 37
-					},
-					"frame": {
-						"x": 60,
-						"y": 0,
-						"w": 30,
-						"h": 37
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 30,
-						"h": 40
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 30,
-						"h": 37
-					},
-					"frame": {
-						"x": 60,
-						"y": 37,
-						"w": 30,
-						"h": 37
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 30,
-						"h": 40
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 30,
-						"h": 37
-					},
-					"frame": {
-						"x": 60,
-						"y": 37,
-						"w": 30,
-						"h": 37
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:8a56731ba1ddcc58654c5fd4c09d4b6c:7feee6e8d94135fbc956d541853811cb:b823d10f1c9b4d501296982088ba63d6$"
-	}
-}
diff --git a/public/images/pokemon/exp/674.png b/public/images/pokemon/exp/674.png
deleted file mode 100644
index 68fd635ed4f..00000000000
Binary files a/public/images/pokemon/exp/674.png and /dev/null differ
diff --git a/public/images/pokemon/exp/692.json b/public/images/pokemon/exp/692.json
index 935f67c3daa..86b535260ae 100644
--- a/public/images/pokemon/exp/692.json
+++ b/public/images/pokemon/exp/692.json
@@ -1,356 +1,794 @@
-{
-	"textures": [
-		{
-			"image": "692.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 162,
-				"h": 162
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 60,
-						"h": 41
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 60,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 60,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 60,
-						"h": 41
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 60,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 60,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 60,
-						"h": 41
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 60,
-						"h": 41
-					},
-					"frame": {
-						"x": 60,
-						"y": 0,
-						"w": 60,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 60,
-						"h": 41
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 60,
-						"h": 41
-					},
-					"frame": {
-						"x": 60,
-						"y": 0,
-						"w": 60,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 60,
-						"h": 41
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 60,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 41,
-						"w": 60,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 60,
-						"h": 41
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 60,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 41,
-						"w": 60,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 60,
-						"h": 41
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 60,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 82,
-						"w": 60,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 60,
-						"h": 41
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 60,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 82,
-						"w": 60,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 60,
-						"h": 41
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 60,
-						"h": 39
-					},
-					"frame": {
-						"x": 0,
-						"y": 123,
-						"w": 60,
-						"h": 39
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 60,
-						"h": 41
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 60,
-						"h": 39
-					},
-					"frame": {
-						"x": 0,
-						"y": 123,
-						"w": 60,
-						"h": 39
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 60,
-						"h": 41
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 60,
-						"h": 39
-					},
-					"frame": {
-						"x": 60,
-						"y": 41,
-						"w": 60,
-						"h": 39
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 60,
-						"h": 41
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 60,
-						"h": 39
-					},
-					"frame": {
-						"x": 60,
-						"y": 41,
-						"w": 60,
-						"h": 39
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 60,
-						"h": 41
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 60,
-						"h": 39
-					},
-					"frame": {
-						"x": 60,
-						"y": 41,
-						"w": 60,
-						"h": 39
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 60,
-						"h": 41
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 60,
-						"h": 39
-					},
-					"frame": {
-						"x": 60,
-						"y": 41,
-						"w": 60,
-						"h": 39
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 60,
-						"h": 41
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 59,
-						"h": 41
-					},
-					"frame": {
-						"x": 60,
-						"y": 80,
-						"w": 59,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 60,
-						"h": 41
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 59,
-						"h": 41
-					},
-					"frame": {
-						"x": 60,
-						"y": 121,
-						"w": 59,
-						"h": 41
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:770fa5fad1cc8a443ce0a20fecd29c87:eb7f111f1bbee8cd3438d375d4fb00f7:2880def858c84cd859bedf13b0b49a33$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 121, "y": 36, "w": 56, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 121, "y": 36, "w": 56, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 60, "y": 37, "w": 56, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 181, "y": 1, "w": 57, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 57, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 181, "y": 1, "w": 57, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 57, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 1, "y": 36, "w": 58, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 58, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 1, "y": 36, "w": 58, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 58, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 121, "y": 1, "w": 59, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 59, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 121, "y": 1, "w": 59, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 59, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 1, "y": 36, "w": 58, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 58, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 1, "y": 36, "w": 58, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 58, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 181, "y": 1, "w": 57, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 57, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 181, "y": 1, "w": 57, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 57, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 60, "y": 37, "w": 56, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 121, "y": 36, "w": 56, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 121, "y": 36, "w": 56, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 121, "y": 36, "w": 56, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 121, "y": 36, "w": 56, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 60, "y": 37, "w": 56, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 181, "y": 1, "w": 57, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 57, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 181, "y": 1, "w": 57, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 57, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 1, "y": 36, "w": 58, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 58, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 1, "y": 36, "w": 58, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 58, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 121, "y": 1, "w": 59, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 59, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 121, "y": 1, "w": 59, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 59, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 1, "y": 36, "w": 58, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 58, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 1, "y": 36, "w": 58, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 58, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 181, "y": 1, "w": 57, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 57, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 181, "y": 1, "w": 57, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 57, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 60, "y": 37, "w": 56, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 121, "y": 36, "w": 56, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 121, "y": 36, "w": 56, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 121, "y": 36, "w": 56, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 121, "y": 36, "w": 56, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 60, "y": 37, "w": 56, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 181, "y": 1, "w": 57, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 57, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 181, "y": 1, "w": 57, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 57, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 1, "y": 36, "w": 58, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 58, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 1, "y": 36, "w": 58, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 58, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 121, "y": 1, "w": 59, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 59, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 121, "y": 1, "w": 59, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 59, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 1, "y": 36, "w": 58, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 58, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 1, "y": 36, "w": 58, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 58, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 181, "y": 1, "w": 57, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 57, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 181, "y": 1, "w": 57, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 57, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 60, "y": 37, "w": 56, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 121, "y": 36, "w": 56, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 121, "y": 36, "w": 56, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 121, "y": 36, "w": 56, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 121, "y": 36, "w": 56, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 60, "y": 37, "w": 56, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 181, "y": 1, "w": 57, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 57, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 181, "y": 1, "w": 57, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 57, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 1, "y": 36, "w": 58, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 58, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 1, "y": 36, "w": 58, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 58, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 121, "y": 1, "w": 59, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 59, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 121, "y": 1, "w": 59, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 59, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 1, "y": 36, "w": 58, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 58, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 1, "y": 36, "w": 58, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 58, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 181, "y": 1, "w": 57, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 57, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 181, "y": 1, "w": 57, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 57, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 60, "y": 37, "w": 56, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 121, "y": 36, "w": 56, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 121, "y": 36, "w": 56, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 178, "y": 37, "w": 56, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 178, "y": 37, "w": 56, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 62, "y": 1, "w": 58, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 58, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 62, "y": 1, "w": 58, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 58, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 1, "y": 1, "w": 60, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 60, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 1, "y": 1, "w": 60, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 60, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 1, "y": 1, "w": 60, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 60, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 1, "y": 1, "w": 60, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 60, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 1, "y": 1, "w": 60, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 60, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 1, "y": 71, "w": 57, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 2, "w": 57, "h": 33 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 1, "y": 71, "w": 57, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 2, "w": 57, "h": 33 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 117, "y": 72, "w": 59, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 59, "h": 33 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 1, "y": 1, "w": 60, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 60, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 1, "y": 1, "w": 60, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 60, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 1, "y": 1, "w": 60, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 60, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 1, "y": 1, "w": 60, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 60, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 1, "y": 1, "w": 60, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 60, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 1, "y": 1, "w": 60, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 60, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 1, "y": 1, "w": 60, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 60, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 62, "y": 1, "w": 58, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 58, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 62, "y": 1, "w": 58, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 58, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 178, "y": 37, "w": 56, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 178, "y": 37, "w": 56, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "692.png",
+  "format": "I8",
+  "size": { "w": 239, "h": 106 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/692.png b/public/images/pokemon/exp/692.png
index 976faaf76a4..a22655931a8 100644
Binary files a/public/images/pokemon/exp/692.png and b/public/images/pokemon/exp/692.png differ
diff --git a/public/images/pokemon/exp/693.json b/public/images/pokemon/exp/693.json
index b5b81735f10..c8f7763de1d 100644
--- a/public/images/pokemon/exp/693.json
+++ b/public/images/pokemon/exp/693.json
@@ -1,272 +1,902 @@
-{
-	"textures": [
-		{
-			"image": "693.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 259,
-				"h": 259
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 92,
-						"h": 89
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 86,
-						"h": 89
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 86,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 92,
-						"h": 89
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 86,
-						"h": 89
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 86,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 92,
-						"h": 89
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 85,
-						"h": 89
-					},
-					"frame": {
-						"x": 0,
-						"y": 89,
-						"w": 85,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 92,
-						"h": 89
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 85,
-						"h": 89
-					},
-					"frame": {
-						"x": 0,
-						"y": 89,
-						"w": 85,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 92,
-						"h": 89
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 85,
-						"h": 89
-					},
-					"frame": {
-						"x": 86,
-						"y": 0,
-						"w": 85,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 92,
-						"h": 89
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 85,
-						"h": 89
-					},
-					"frame": {
-						"x": 86,
-						"y": 0,
-						"w": 85,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 92,
-						"h": 89
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 85,
-						"h": 89
-					},
-					"frame": {
-						"x": 85,
-						"y": 89,
-						"w": 85,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 92,
-						"h": 89
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 85,
-						"h": 88
-					},
-					"frame": {
-						"x": 171,
-						"y": 0,
-						"w": 85,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 92,
-						"h": 89
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 85,
-						"h": 88
-					},
-					"frame": {
-						"x": 171,
-						"y": 0,
-						"w": 85,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 92,
-						"h": 89
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 8,
-						"w": 91,
-						"h": 80
-					},
-					"frame": {
-						"x": 0,
-						"y": 178,
-						"w": 91,
-						"h": 80
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 92,
-						"h": 89
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 5,
-						"w": 89,
-						"h": 83
-					},
-					"frame": {
-						"x": 170,
-						"y": 89,
-						"w": 89,
-						"h": 83
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 92,
-						"h": 89
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 5,
-						"w": 89,
-						"h": 83
-					},
-					"frame": {
-						"x": 170,
-						"y": 89,
-						"w": 89,
-						"h": 83
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:8606ef5d207ca2100dda49cb1d79599e:d3c4f159e863b497f7925b3a24df9e4b:9c1f9147e693c05eb4655590e9099679$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 208, "y": 78, "w": 95, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 95, "h": 76 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 416, "y": 214, "w": 91, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 1, "w": 91, "h": 76 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 405, "y": 145, "w": 103, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 9, "w": 103, "h": 69 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 207, "y": 344, "w": 105, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 17, "w": 105, "h": 62 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 507, "y": 285, "w": 105, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 18, "w": 105, "h": 63 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 412, "y": 1, "w": 104, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 13, "w": 104, "h": 71 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 1, "y": 145, "w": 99, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 14, "w": 99, "h": 72 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 1, "y": 76, "w": 105, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 21, "w": 105, "h": 69 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 507, "y": 219, "w": 104, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 24, "w": 104, "h": 66 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 1, "y": 283, "w": 102, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 23, "w": 102, "h": 66 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 207, "y": 1, "w": 99, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 10, "w": 99, "h": 77 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 517, "y": 74, "w": 93, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 7, "w": 93, "h": 78 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 106, "y": 78, "w": 102, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 12, "w": 102, "h": 71 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 421, "y": 348, "w": 102, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 19, "w": 102, "h": 63 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 312, "y": 354, "w": 100, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 18, "w": 100, "h": 61 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 208, "y": 78, "w": 95, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 95, "h": 76 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 416, "y": 214, "w": 91, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 1, "w": 91, "h": 76 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 405, "y": 145, "w": 103, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 9, "w": 103, "h": 69 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 207, "y": 344, "w": 105, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 17, "w": 105, "h": 62 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 507, "y": 285, "w": 105, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 18, "w": 105, "h": 63 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 412, "y": 1, "w": 104, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 13, "w": 104, "h": 71 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 1, "y": 145, "w": 99, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 14, "w": 99, "h": 72 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 1, "y": 76, "w": 105, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 21, "w": 105, "h": 69 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 507, "y": 219, "w": 104, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 24, "w": 104, "h": 66 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 1, "y": 283, "w": 102, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 23, "w": 102, "h": 66 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 207, "y": 1, "w": 99, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 10, "w": 99, "h": 77 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 517, "y": 74, "w": 93, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 7, "w": 93, "h": 78 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 106, "y": 78, "w": 102, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 12, "w": 102, "h": 71 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 421, "y": 348, "w": 102, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 19, "w": 102, "h": 63 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 312, "y": 354, "w": 100, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 18, "w": 100, "h": 61 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 208, "y": 78, "w": 95, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 95, "h": 76 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 416, "y": 214, "w": 91, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 1, "w": 91, "h": 76 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 405, "y": 145, "w": 103, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 9, "w": 103, "h": 69 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 207, "y": 344, "w": 105, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 17, "w": 105, "h": 62 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 507, "y": 285, "w": 105, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 18, "w": 105, "h": 63 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 412, "y": 1, "w": 104, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 13, "w": 104, "h": 71 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 1, "y": 145, "w": 99, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 14, "w": 99, "h": 72 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 1, "y": 76, "w": 105, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 21, "w": 105, "h": 69 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 507, "y": 219, "w": 104, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 24, "w": 104, "h": 66 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 1, "y": 283, "w": 102, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 23, "w": 102, "h": 66 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 207, "y": 1, "w": 99, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 10, "w": 99, "h": 77 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 517, "y": 74, "w": 93, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 7, "w": 93, "h": 78 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 106, "y": 78, "w": 102, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 12, "w": 102, "h": 71 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 421, "y": 348, "w": 102, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 19, "w": 102, "h": 63 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 312, "y": 354, "w": 100, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 18, "w": 100, "h": 61 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 208, "y": 78, "w": 95, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 95, "h": 76 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 416, "y": 214, "w": 91, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 1, "w": 91, "h": 76 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 405, "y": 145, "w": 103, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 9, "w": 103, "h": 69 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 207, "y": 344, "w": 105, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 17, "w": 105, "h": 62 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 507, "y": 285, "w": 105, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 18, "w": 105, "h": 63 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 412, "y": 1, "w": 104, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 13, "w": 104, "h": 71 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 1, "y": 145, "w": 99, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 14, "w": 99, "h": 72 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 1, "y": 76, "w": 105, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 21, "w": 105, "h": 69 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 507, "y": 219, "w": 104, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 24, "w": 104, "h": 66 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 1, "y": 283, "w": 102, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 23, "w": 102, "h": 66 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 207, "y": 1, "w": 99, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 10, "w": 99, "h": 77 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 517, "y": 74, "w": 93, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 7, "w": 93, "h": 78 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 106, "y": 78, "w": 102, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 12, "w": 102, "h": 71 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 421, "y": 348, "w": 102, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 19, "w": 102, "h": 63 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 312, "y": 354, "w": 100, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 18, "w": 100, "h": 61 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 208, "y": 78, "w": 95, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 95, "h": 76 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 416, "y": 214, "w": 91, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 1, "w": 91, "h": 76 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 405, "y": 145, "w": 103, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 9, "w": 103, "h": 69 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 207, "y": 344, "w": 105, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 17, "w": 105, "h": 62 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 507, "y": 285, "w": 105, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 18, "w": 105, "h": 63 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 412, "y": 1, "w": 104, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 13, "w": 104, "h": 71 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 1, "y": 145, "w": 99, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 14, "w": 99, "h": 72 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 1, "y": 76, "w": 105, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 21, "w": 105, "h": 69 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 507, "y": 219, "w": 104, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 24, "w": 104, "h": 66 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 1, "y": 283, "w": 102, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 23, "w": 102, "h": 66 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 207, "y": 1, "w": 99, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 10, "w": 99, "h": 77 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 517, "y": 74, "w": 93, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 7, "w": 93, "h": 78 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 106, "y": 78, "w": 102, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 12, "w": 102, "h": 71 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 421, "y": 348, "w": 102, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 19, "w": 102, "h": 63 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 312, "y": 354, "w": 100, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 18, "w": 100, "h": 61 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 208, "y": 78, "w": 95, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 95, "h": 76 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 303, "y": 140, "w": 102, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 5, "w": 102, "h": 70 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 523, "y": 348, "w": 102, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 11, "w": 102, "h": 63 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 318, "y": 290, "w": 103, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 7, "w": 103, "h": 64 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 105, "y": 1, "w": 102, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 0, "w": 102, "h": 75 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 306, "y": 72, "w": 108, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 14, "w": 108, "h": 68 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 108, "y": 276, "w": 105, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 14, "w": 105, "h": 65 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 1, "y": 1, "w": 104, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 8, "w": 104, "h": 74 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 203, "y": 210, "w": 106, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 13, "w": 106, "h": 66 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 508, "y": 152, "w": 106, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 15, "w": 106, "h": 67 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 414, "y": 74, "w": 103, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 8, "w": 103, "h": 71 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 306, "y": 72, "w": 108, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 14, "w": 108, "h": 68 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0088.png",
+    "frame": { "x": 108, "y": 276, "w": 105, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 14, "w": 105, "h": 65 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0089.png",
+    "frame": { "x": 1, "y": 1, "w": 104, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 8, "w": 104, "h": 74 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0090.png",
+    "frame": { "x": 203, "y": 210, "w": 106, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 13, "w": 106, "h": 66 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0091.png",
+    "frame": { "x": 309, "y": 214, "w": 107, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 14, "w": 107, "h": 65 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0092.png",
+    "frame": { "x": 306, "y": 1, "w": 106, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 9, "w": 106, "h": 70 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0093.png",
+    "frame": { "x": 1, "y": 218, "w": 107, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 14, "w": 107, "h": 65 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0094.png",
+    "frame": { "x": 213, "y": 279, "w": 105, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 14, "w": 105, "h": 65 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0095.png",
+    "frame": { "x": 103, "y": 341, "w": 104, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 15, "w": 104, "h": 63 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0096.png",
+    "frame": { "x": 516, "y": 1, "w": 101, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 5, "w": 101, "h": 73 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0097.png",
+    "frame": { "x": 100, "y": 149, "w": 103, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 9, "w": 103, "h": 69 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0098.png",
+    "frame": { "x": 1, "y": 349, "w": 102, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 16, "w": 102, "h": 62 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0099.png",
+    "frame": { "x": 103, "y": 404, "w": 100, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 16, "w": 100, "h": 61 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "693.png",
+  "format": "I8",
+  "size": { "w": 626, "h": 466 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/693.png b/public/images/pokemon/exp/693.png
index 538f2f11f73..2e8f1ccd05c 100644
Binary files a/public/images/pokemon/exp/693.png and b/public/images/pokemon/exp/693.png differ
diff --git a/public/images/pokemon/exp/694.json b/public/images/pokemon/exp/694.json
deleted file mode 100644
index 12cc0369cc2..00000000000
--- a/public/images/pokemon/exp/694.json
+++ /dev/null
@@ -1,272 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "694.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 140,
-				"h": 140
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 44,
-						"h": 37
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 44,
-						"h": 34
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 44,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 44,
-						"h": 37
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 43,
-						"h": 34
-					},
-					"frame": {
-						"x": 0,
-						"y": 34,
-						"w": 43,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 44,
-						"h": 37
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 43,
-						"h": 34
-					},
-					"frame": {
-						"x": 44,
-						"y": 0,
-						"w": 43,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 44,
-						"h": 37
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 2,
-						"w": 41,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 68,
-						"w": 41,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 44,
-						"h": 37
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 0,
-						"w": 36,
-						"h": 37
-					},
-					"frame": {
-						"x": 0,
-						"y": 103,
-						"w": 36,
-						"h": 37
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 44,
-						"h": 37
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 0,
-						"w": 36,
-						"h": 37
-					},
-					"frame": {
-						"x": 0,
-						"y": 103,
-						"w": 36,
-						"h": 37
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 44,
-						"h": 37
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 0,
-						"w": 34,
-						"h": 37
-					},
-					"frame": {
-						"x": 36,
-						"y": 103,
-						"w": 34,
-						"h": 37
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 44,
-						"h": 37
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 2,
-						"w": 41,
-						"h": 35
-					},
-					"frame": {
-						"x": 87,
-						"y": 0,
-						"w": 41,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 44,
-						"h": 37
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 39,
-						"h": 36
-					},
-					"frame": {
-						"x": 43,
-						"y": 34,
-						"w": 39,
-						"h": 36
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 44,
-						"h": 37
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 39,
-						"h": 36
-					},
-					"frame": {
-						"x": 82,
-						"y": 35,
-						"w": 39,
-						"h": 36
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 44,
-						"h": 37
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 0,
-						"w": 33,
-						"h": 37
-					},
-					"frame": {
-						"x": 70,
-						"y": 71,
-						"w": 33,
-						"h": 37
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 44,
-						"h": 37
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 31,
-						"h": 37
-					},
-					"frame": {
-						"x": 103,
-						"y": 71,
-						"w": 31,
-						"h": 37
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:c6f790c1c7c7e284eb98dfeaad75e635:7e95f5e91c561cc43d0e8ef8188f18b3:b0990f9650cfe63b836cbed33f0b44d8$"
-	}
-}
diff --git a/public/images/pokemon/exp/694.png b/public/images/pokemon/exp/694.png
deleted file mode 100644
index 671d9517e4c..00000000000
Binary files a/public/images/pokemon/exp/694.png and /dev/null differ
diff --git a/public/images/pokemon/exp/696.json b/public/images/pokemon/exp/696.json
index 3bc9dae1999..f95124e3f31 100644
--- a/public/images/pokemon/exp/696.json
+++ b/public/images/pokemon/exp/696.json
@@ -1,692 +1,1054 @@
-{
-	"textures": [
-		{
-			"image": "696.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 135,
-				"h": 135
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 53,
-						"h": 46
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 53,
-						"h": 46
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 53,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 53,
-						"h": 46
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 53,
-						"h": 46
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 53,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 53,
-						"h": 46
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 53,
-						"h": 46
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 53,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 53,
-						"h": 46
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 53,
-						"h": 46
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 53,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 53,
-						"h": 46
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 53,
-						"h": 46
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 53,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 53,
-						"h": 46
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 53,
-						"h": 46
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 53,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 53,
-						"h": 46
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 53,
-						"h": 46
-					},
-					"frame": {
-						"x": 53,
-						"y": 0,
-						"w": 53,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 53,
-						"h": 46
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 53,
-						"h": 46
-					},
-					"frame": {
-						"x": 53,
-						"y": 0,
-						"w": 53,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 53,
-						"h": 46
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 53,
-						"h": 46
-					},
-					"frame": {
-						"x": 53,
-						"y": 0,
-						"w": 53,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 53,
-						"h": 46
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 53,
-						"h": 46
-					},
-					"frame": {
-						"x": 53,
-						"y": 0,
-						"w": 53,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 53,
-						"h": 46
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 53,
-						"h": 46
-					},
-					"frame": {
-						"x": 53,
-						"y": 0,
-						"w": 53,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 53,
-						"h": 46
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 53,
-						"h": 46
-					},
-					"frame": {
-						"x": 53,
-						"y": 0,
-						"w": 53,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 53,
-						"h": 46
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 53,
-						"h": 46
-					},
-					"frame": {
-						"x": 53,
-						"y": 0,
-						"w": 53,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 53,
-						"h": 46
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 53,
-						"h": 46
-					},
-					"frame": {
-						"x": 53,
-						"y": 0,
-						"w": 53,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0031.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 53,
-						"h": 46
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 53,
-						"h": 46
-					},
-					"frame": {
-						"x": 53,
-						"y": 0,
-						"w": 53,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0032.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 53,
-						"h": 46
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 53,
-						"h": 46
-					},
-					"frame": {
-						"x": 53,
-						"y": 0,
-						"w": 53,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 53,
-						"h": 46
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 53,
-						"h": 46
-					},
-					"frame": {
-						"x": 0,
-						"y": 46,
-						"w": 53,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 53,
-						"h": 46
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 53,
-						"h": 46
-					},
-					"frame": {
-						"x": 0,
-						"y": 46,
-						"w": 53,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0025.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 46
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 53,
-						"h": 43
-					},
-					"frame": {
-						"x": 0,
-						"y": 92,
-						"w": 53,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0026.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 46
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 53,
-						"h": 43
-					},
-					"frame": {
-						"x": 0,
-						"y": 92,
-						"w": 53,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 46
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 53,
-						"h": 45
-					},
-					"frame": {
-						"x": 53,
-						"y": 46,
-						"w": 53,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 46
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 53,
-						"h": 45
-					},
-					"frame": {
-						"x": 53,
-						"y": 46,
-						"w": 53,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 46
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 53,
-						"h": 45
-					},
-					"frame": {
-						"x": 53,
-						"y": 46,
-						"w": 53,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 46
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 53,
-						"h": 45
-					},
-					"frame": {
-						"x": 53,
-						"y": 46,
-						"w": 53,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 46
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 53,
-						"h": 45
-					},
-					"frame": {
-						"x": 53,
-						"y": 46,
-						"w": 53,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 46
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 53,
-						"h": 45
-					},
-					"frame": {
-						"x": 53,
-						"y": 46,
-						"w": 53,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0029.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 46
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 53,
-						"h": 45
-					},
-					"frame": {
-						"x": 53,
-						"y": 46,
-						"w": 53,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0030.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 46
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 53,
-						"h": 45
-					},
-					"frame": {
-						"x": 53,
-						"y": 46,
-						"w": 53,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 46
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 53,
-						"h": 44
-					},
-					"frame": {
-						"x": 53,
-						"y": 91,
-						"w": 53,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 46
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 53,
-						"h": 44
-					},
-					"frame": {
-						"x": 53,
-						"y": 91,
-						"w": 53,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0027.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 46
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 53,
-						"h": 44
-					},
-					"frame": {
-						"x": 53,
-						"y": 91,
-						"w": 53,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0028.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 46
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 53,
-						"h": 44
-					},
-					"frame": {
-						"x": 53,
-						"y": 91,
-						"w": 53,
-						"h": 44
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:f6c90e8287d3ce2aa68c9fef98f6e12f:24cf84ba4764bd88b4e751ca1911a8d5:58b7763fb9abdd043e9bfa400cfafdef$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 229, "y": 0, "w": 57, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 229, "y": 0, "w": 57, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 114, "y": 0, "w": 57, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 57, "h": 47 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 114, "y": 0, "w": 57, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 57, "h": 47 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 57, "y": 0, "w": 57, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 57, "h": 48 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 57, "y": 0, "w": 57, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 57, "h": 48 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 0, "y": 0, "w": 57, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 57, "h": 50 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 0, "y": 0, "w": 57, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 57, "h": 50 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 114, "y": 0, "w": 57, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 57, "h": 47 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 113, "y": 93, "w": 57, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 57, "h": 44 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 170, "y": 92, "w": 57, "h": 45 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 57, "h": 45 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 229, "y": 0, "w": 57, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 229, "y": 0, "w": 57, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 229, "y": 0, "w": 57, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 56, "y": 94, "w": 57, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 57, "h": 44 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 56, "y": 94, "w": 57, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 57, "h": 44 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 113, "y": 137, "w": 58, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 58, "h": 42 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 113, "y": 137, "w": 58, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 58, "h": 42 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 0, "y": 138, "w": 58, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 58, "h": 40 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 0, "y": 138, "w": 58, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 58, "h": 40 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 56, "y": 94, "w": 57, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 57, "h": 44 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 113, "y": 93, "w": 57, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 57, "h": 44 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 170, "y": 92, "w": 57, "h": 45 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 57, "h": 45 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 229, "y": 0, "w": 57, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 229, "y": 0, "w": 57, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 229, "y": 0, "w": 57, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 229, "y": 0, "w": 57, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 229, "y": 0, "w": 57, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 229, "y": 0, "w": 57, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 229, "y": 0, "w": 57, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 114, "y": 0, "w": 57, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 57, "h": 47 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 114, "y": 0, "w": 57, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 57, "h": 47 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 57, "y": 0, "w": 57, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 57, "h": 48 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 57, "y": 0, "w": 57, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 57, "h": 48 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 0, "y": 0, "w": 57, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 57, "h": 50 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 0, "y": 0, "w": 57, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 57, "h": 50 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 114, "y": 0, "w": 57, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 57, "h": 47 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 113, "y": 93, "w": 57, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 57, "h": 44 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 170, "y": 92, "w": 57, "h": 45 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 57, "h": 45 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 229, "y": 0, "w": 57, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 229, "y": 0, "w": 57, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 229, "y": 0, "w": 57, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 56, "y": 94, "w": 57, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 57, "h": 44 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 56, "y": 94, "w": 57, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 57, "h": 44 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 113, "y": 137, "w": 58, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 58, "h": 42 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 113, "y": 137, "w": 58, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 58, "h": 42 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 0, "y": 138, "w": 58, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 58, "h": 40 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 0, "y": 138, "w": 58, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 58, "h": 40 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 56, "y": 94, "w": 57, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 57, "h": 44 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 113, "y": 93, "w": 57, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 57, "h": 44 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 170, "y": 92, "w": 57, "h": 45 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 57, "h": 45 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 229, "y": 0, "w": 57, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 229, "y": 0, "w": 57, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 229, "y": 0, "w": 57, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 229, "y": 0, "w": 57, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 229, "y": 0, "w": 57, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 229, "y": 0, "w": 57, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 229, "y": 0, "w": 57, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 114, "y": 0, "w": 57, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 57, "h": 47 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 114, "y": 0, "w": 57, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 57, "h": 47 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 57, "y": 0, "w": 57, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 57, "h": 48 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 57, "y": 0, "w": 57, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 57, "h": 48 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 0, "y": 0, "w": 57, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 57, "h": 50 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 0, "y": 0, "w": 57, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 57, "h": 50 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 114, "y": 0, "w": 57, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 57, "h": 47 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 113, "y": 93, "w": 57, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 57, "h": 44 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 170, "y": 92, "w": 57, "h": 45 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 57, "h": 45 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 229, "y": 0, "w": 57, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 229, "y": 0, "w": 57, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 229, "y": 0, "w": 57, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 56, "y": 94, "w": 57, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 57, "h": 44 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 56, "y": 94, "w": 57, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 57, "h": 44 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 113, "y": 137, "w": 58, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 58, "h": 42 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 113, "y": 137, "w": 58, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 58, "h": 42 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 0, "y": 138, "w": 58, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 58, "h": 40 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 0, "y": 138, "w": 58, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 58, "h": 40 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 56, "y": 94, "w": 57, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 57, "h": 44 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 113, "y": 93, "w": 57, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 57, "h": 44 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 170, "y": 92, "w": 57, "h": 45 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 57, "h": 45 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 229, "y": 0, "w": 57, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 229, "y": 0, "w": 57, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 229, "y": 0, "w": 57, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 229, "y": 0, "w": 57, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 229, "y": 0, "w": 57, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 229, "y": 0, "w": 57, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 229, "y": 0, "w": 57, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 227, "y": 92, "w": 55, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 55, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0088.png",
+    "frame": { "x": 227, "y": 92, "w": 55, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 55, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0089.png",
+    "frame": { "x": 228, "y": 46, "w": 56, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 56, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0090.png",
+    "frame": { "x": 228, "y": 46, "w": 56, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 56, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0091.png",
+    "frame": { "x": 114, "y": 47, "w": 56, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 56, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0092.png",
+    "frame": { "x": 114, "y": 47, "w": 56, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 56, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0093.png",
+    "frame": { "x": 171, "y": 0, "w": 58, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 58, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0094.png",
+    "frame": { "x": 171, "y": 0, "w": 58, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 58, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0095.png",
+    "frame": { "x": 171, "y": 46, "w": 57, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 57, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0096.png",
+    "frame": { "x": 57, "y": 48, "w": 56, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 56, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0097.png",
+    "frame": { "x": 57, "y": 48, "w": 56, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 56, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0098.png",
+    "frame": { "x": 0, "y": 50, "w": 56, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 56, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0099.png",
+    "frame": { "x": 0, "y": 50, "w": 56, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 56, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0100.png",
+    "frame": { "x": 229, "y": 0, "w": 57, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0101.png",
+    "frame": { "x": 229, "y": 0, "w": 57, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0102.png",
+    "frame": { "x": 227, "y": 92, "w": 55, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 55, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0103.png",
+    "frame": { "x": 227, "y": 92, "w": 55, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 55, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0104.png",
+    "frame": { "x": 228, "y": 46, "w": 56, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 56, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0105.png",
+    "frame": { "x": 228, "y": 46, "w": 56, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 56, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0106.png",
+    "frame": { "x": 114, "y": 47, "w": 56, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 56, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0107.png",
+    "frame": { "x": 114, "y": 47, "w": 56, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 56, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0108.png",
+    "frame": { "x": 171, "y": 0, "w": 58, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 58, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0109.png",
+    "frame": { "x": 171, "y": 0, "w": 58, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 58, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0110.png",
+    "frame": { "x": 171, "y": 46, "w": 57, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 57, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0111.png",
+    "frame": { "x": 57, "y": 48, "w": 56, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 56, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0112.png",
+    "frame": { "x": 57, "y": 48, "w": 56, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 56, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0113.png",
+    "frame": { "x": 0, "y": 50, "w": 56, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 56, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0114.png",
+    "frame": { "x": 0, "y": 50, "w": 56, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 56, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0115.png",
+    "frame": { "x": 229, "y": 0, "w": 57, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0116.png",
+    "frame": { "x": 229, "y": 0, "w": 57, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.11-x64",
+  "format": "I8",
+  "size": { "w": 286, "h": 179 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/696.png b/public/images/pokemon/exp/696.png
index 8dd6b2cf6c7..7892c40e52b 100644
Binary files a/public/images/pokemon/exp/696.png and b/public/images/pokemon/exp/696.png differ
diff --git a/public/images/pokemon/exp/697.json b/public/images/pokemon/exp/697.json
index 9120976bb53..c56de41946c 100644
--- a/public/images/pokemon/exp/697.json
+++ b/public/images/pokemon/exp/697.json
@@ -1,1175 +1,983 @@
-{
-	"textures": [
-		{
-			"image": "697.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 378,
-				"h": 378
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 76,
-						"h": 76
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 76,
-						"h": 76
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 76,
-						"h": 76
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 76,
-						"h": 76
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 76,
-						"h": 76
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 76,
-						"h": 76
-					}
-				},
-				{
-					"filename": "0033.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 76,
-						"h": 76
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 76,
-						"h": 76
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 76,
-						"h": 76
-					},
-					"frame": {
-						"x": 0,
-						"y": 76,
-						"w": 76,
-						"h": 76
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 76,
-						"h": 76
-					},
-					"frame": {
-						"x": 0,
-						"y": 76,
-						"w": 76,
-						"h": 76
-					}
-				},
-				{
-					"filename": "0025.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 76,
-						"h": 76
-					},
-					"frame": {
-						"x": 0,
-						"y": 76,
-						"w": 76,
-						"h": 76
-					}
-				},
-				{
-					"filename": "0034.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 76,
-						"h": 76
-					},
-					"frame": {
-						"x": 0,
-						"y": 76,
-						"w": 76,
-						"h": 76
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 76,
-						"h": 75
-					},
-					"frame": {
-						"x": 76,
-						"y": 0,
-						"w": 76,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 76,
-						"h": 75
-					},
-					"frame": {
-						"x": 76,
-						"y": 0,
-						"w": 76,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 76,
-						"h": 75
-					},
-					"frame": {
-						"x": 76,
-						"y": 0,
-						"w": 76,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0032.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 76,
-						"h": 75
-					},
-					"frame": {
-						"x": 76,
-						"y": 0,
-						"w": 76,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 75,
-						"h": 75
-					},
-					"frame": {
-						"x": 0,
-						"y": 152,
-						"w": 75,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 75,
-						"h": 75
-					},
-					"frame": {
-						"x": 0,
-						"y": 152,
-						"w": 75,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0026.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 75,
-						"h": 75
-					},
-					"frame": {
-						"x": 0,
-						"y": 152,
-						"w": 75,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0035.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 75,
-						"h": 75
-					},
-					"frame": {
-						"x": 0,
-						"y": 152,
-						"w": 75,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0051.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 76,
-						"h": 74
-					},
-					"frame": {
-						"x": 76,
-						"y": 75,
-						"w": 76,
-						"h": 74
-					}
-				},
-				{
-					"filename": "0052.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 75,
-						"h": 75
-					},
-					"frame": {
-						"x": 152,
-						"y": 0,
-						"w": 75,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0053.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 76,
-						"h": 74
-					},
-					"frame": {
-						"x": 227,
-						"y": 0,
-						"w": 76,
-						"h": 74
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 74,
-						"h": 75
-					},
-					"frame": {
-						"x": 0,
-						"y": 227,
-						"w": 74,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 74,
-						"h": 75
-					},
-					"frame": {
-						"x": 0,
-						"y": 227,
-						"w": 74,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0027.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 74,
-						"h": 75
-					},
-					"frame": {
-						"x": 0,
-						"y": 227,
-						"w": 74,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0036.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 74,
-						"h": 75
-					},
-					"frame": {
-						"x": 0,
-						"y": 227,
-						"w": 74,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0037.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 69,
-						"h": 76
-					},
-					"frame": {
-						"x": 0,
-						"y": 302,
-						"w": 69,
-						"h": 76
-					}
-				},
-				{
-					"filename": "0047.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 69,
-						"h": 76
-					},
-					"frame": {
-						"x": 0,
-						"y": 302,
-						"w": 69,
-						"h": 76
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 5,
-						"w": 74,
-						"h": 74
-					},
-					"frame": {
-						"x": 152,
-						"y": 75,
-						"w": 74,
-						"h": 74
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 5,
-						"w": 74,
-						"h": 74
-					},
-					"frame": {
-						"x": 152,
-						"y": 75,
-						"w": 74,
-						"h": 74
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 5,
-						"w": 74,
-						"h": 74
-					},
-					"frame": {
-						"x": 152,
-						"y": 75,
-						"w": 74,
-						"h": 74
-					}
-				},
-				{
-					"filename": "0031.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 5,
-						"w": 74,
-						"h": 74
-					},
-					"frame": {
-						"x": 152,
-						"y": 75,
-						"w": 74,
-						"h": 74
-					}
-				},
-				{
-					"filename": "0049.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 74,
-						"h": 74
-					},
-					"frame": {
-						"x": 303,
-						"y": 0,
-						"w": 74,
-						"h": 74
-					}
-				},
-				{
-					"filename": "0055.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 74,
-						"h": 74
-					},
-					"frame": {
-						"x": 303,
-						"y": 0,
-						"w": 74,
-						"h": 74
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 72,
-						"h": 75
-					},
-					"frame": {
-						"x": 69,
-						"y": 302,
-						"w": 72,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 72,
-						"h": 75
-					},
-					"frame": {
-						"x": 69,
-						"y": 302,
-						"w": 72,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 72,
-						"h": 75
-					},
-					"frame": {
-						"x": 69,
-						"y": 302,
-						"w": 72,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0028.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 72,
-						"h": 75
-					},
-					"frame": {
-						"x": 69,
-						"y": 302,
-						"w": 72,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 71,
-						"h": 75
-					},
-					"frame": {
-						"x": 74,
-						"y": 227,
-						"w": 71,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 71,
-						"h": 75
-					},
-					"frame": {
-						"x": 74,
-						"y": 227,
-						"w": 71,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 71,
-						"h": 75
-					},
-					"frame": {
-						"x": 74,
-						"y": 227,
-						"w": 71,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0029.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 71,
-						"h": 75
-					},
-					"frame": {
-						"x": 74,
-						"y": 227,
-						"w": 71,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 73,
-						"h": 75
-					},
-					"frame": {
-						"x": 75,
-						"y": 152,
-						"w": 73,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 73,
-						"h": 75
-					},
-					"frame": {
-						"x": 75,
-						"y": 152,
-						"w": 73,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 73,
-						"h": 75
-					},
-					"frame": {
-						"x": 75,
-						"y": 152,
-						"w": 73,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0030.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 73,
-						"h": 75
-					},
-					"frame": {
-						"x": 75,
-						"y": 152,
-						"w": 73,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0050.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 74,
-						"h": 75
-					},
-					"frame": {
-						"x": 148,
-						"y": 149,
-						"w": 74,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0054.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 74,
-						"h": 75
-					},
-					"frame": {
-						"x": 148,
-						"y": 149,
-						"w": 74,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0038.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 2,
-						"w": 67,
-						"h": 77
-					},
-					"frame": {
-						"x": 222,
-						"y": 149,
-						"w": 67,
-						"h": 77
-					}
-				},
-				{
-					"filename": "0048.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 72,
-						"h": 75
-					},
-					"frame": {
-						"x": 227,
-						"y": 74,
-						"w": 72,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0046.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 2,
-						"w": 67,
-						"h": 77
-					},
-					"frame": {
-						"x": 299,
-						"y": 74,
-						"w": 67,
-						"h": 77
-					}
-				},
-				{
-					"filename": "0039.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 65,
-						"h": 78
-					},
-					"frame": {
-						"x": 289,
-						"y": 151,
-						"w": 65,
-						"h": 78
-					}
-				},
-				{
-					"filename": "0045.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 65,
-						"h": 78
-					},
-					"frame": {
-						"x": 289,
-						"y": 151,
-						"w": 65,
-						"h": 78
-					}
-				},
-				{
-					"filename": "0040.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 0,
-						"w": 63,
-						"h": 79
-					},
-					"frame": {
-						"x": 145,
-						"y": 227,
-						"w": 63,
-						"h": 79
-					}
-				},
-				{
-					"filename": "0044.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 0,
-						"w": 63,
-						"h": 79
-					},
-					"frame": {
-						"x": 145,
-						"y": 227,
-						"w": 63,
-						"h": 79
-					}
-				},
-				{
-					"filename": "0041.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 0,
-						"w": 61,
-						"h": 79
-					},
-					"frame": {
-						"x": 208,
-						"y": 226,
-						"w": 61,
-						"h": 79
-					}
-				},
-				{
-					"filename": "0043.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 0,
-						"w": 61,
-						"h": 79
-					},
-					"frame": {
-						"x": 208,
-						"y": 226,
-						"w": 61,
-						"h": 79
-					}
-				},
-				{
-					"filename": "0042.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 0,
-						"w": 60,
-						"h": 79
-					},
-					"frame": {
-						"x": 269,
-						"y": 229,
-						"w": 60,
-						"h": 79
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:768a260ef504838ad6b945525f4ed05f:3b115b0ef560b516c93f6aa5f1423cd9:f4fdd87d2fc1483d8e0a185c2654e3d9$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 384, "y": 77, "w": 92, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 3, "w": 92, "h": 79 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 476, "y": 77, "w": 92, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 3, "w": 92, "h": 79 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 661, "y": 232, "w": 91, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 3, "w": 91, "h": 79 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 281, "y": 312, "w": 91, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 4, "w": 91, "h": 78 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 556, "y": 462, "w": 91, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 5, "w": 91, "h": 77 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 181, "y": 462, "w": 90, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 4, "w": 90, "h": 78 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 88, "y": 464, "w": 90, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 6, "w": 90, "h": 76 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 0, "y": 540, "w": 90, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 6, "w": 90, "h": 76 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 90, "y": 540, "w": 89, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 7, "w": 89, "h": 75 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 179, "y": 540, "w": 89, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 7, "w": 89, "h": 75 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 647, "y": 468, "w": 90, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 6, "w": 90, "h": 76 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 271, "y": 470, "w": 90, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 6, "w": 90, "h": 76 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 536, "y": 539, "w": 90, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 6, "w": 90, "h": 76 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 90, "y": 386, "w": 91, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 4, "w": 91, "h": 78 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 366, "y": 234, "w": 92, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 4, "w": 92, "h": 78 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 275, "y": 233, "w": 91, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 3, "w": 91, "h": 79 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 384, "y": 77, "w": 92, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 3, "w": 92, "h": 79 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 476, "y": 77, "w": 92, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 3, "w": 92, "h": 79 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 661, "y": 232, "w": 91, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 3, "w": 91, "h": 79 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 281, "y": 312, "w": 91, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 4, "w": 91, "h": 78 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 556, "y": 462, "w": 91, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 5, "w": 91, "h": 77 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 181, "y": 462, "w": 90, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 4, "w": 90, "h": 78 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 88, "y": 464, "w": 90, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 6, "w": 90, "h": 76 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 0, "y": 540, "w": 90, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 6, "w": 90, "h": 76 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 90, "y": 540, "w": 89, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 7, "w": 89, "h": 75 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 179, "y": 540, "w": 89, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 7, "w": 89, "h": 75 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 647, "y": 468, "w": 90, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 6, "w": 90, "h": 76 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 271, "y": 470, "w": 90, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 6, "w": 90, "h": 76 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 536, "y": 539, "w": 90, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 6, "w": 90, "h": 76 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 90, "y": 386, "w": 91, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 4, "w": 91, "h": 78 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 366, "y": 234, "w": 92, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 4, "w": 92, "h": 78 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 275, "y": 233, "w": 91, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 3, "w": 91, "h": 79 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 384, "y": 77, "w": 92, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 3, "w": 92, "h": 79 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 476, "y": 77, "w": 92, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 3, "w": 92, "h": 79 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 661, "y": 232, "w": 91, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 3, "w": 91, "h": 79 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 281, "y": 312, "w": 91, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 4, "w": 91, "h": 78 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 556, "y": 462, "w": 91, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 5, "w": 91, "h": 77 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 181, "y": 462, "w": 90, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 4, "w": 90, "h": 78 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 88, "y": 464, "w": 90, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 6, "w": 90, "h": 76 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 0, "y": 540, "w": 90, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 6, "w": 90, "h": 76 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 90, "y": 540, "w": 89, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 7, "w": 89, "h": 75 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 179, "y": 540, "w": 89, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 7, "w": 89, "h": 75 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 647, "y": 468, "w": 90, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 6, "w": 90, "h": 76 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 271, "y": 470, "w": 90, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 6, "w": 90, "h": 76 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 536, "y": 539, "w": 90, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 6, "w": 90, "h": 76 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 90, "y": 386, "w": 91, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 4, "w": 91, "h": 78 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 366, "y": 234, "w": 92, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 4, "w": 92, "h": 78 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 275, "y": 233, "w": 91, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 3, "w": 91, "h": 79 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 384, "y": 77, "w": 92, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 3, "w": 92, "h": 79 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 476, "y": 77, "w": 92, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 3, "w": 92, "h": 79 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 661, "y": 232, "w": 91, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 3, "w": 91, "h": 79 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 281, "y": 312, "w": 91, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 4, "w": 91, "h": 78 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 556, "y": 462, "w": 91, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 5, "w": 91, "h": 77 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 181, "y": 462, "w": 90, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 4, "w": 90, "h": 78 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 88, "y": 464, "w": 90, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 6, "w": 90, "h": 76 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 0, "y": 540, "w": 90, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 6, "w": 90, "h": 76 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 90, "y": 540, "w": 89, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 7, "w": 89, "h": 75 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 179, "y": 540, "w": 89, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 7, "w": 89, "h": 75 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 647, "y": 468, "w": 90, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 6, "w": 90, "h": 76 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 271, "y": 470, "w": 90, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 6, "w": 90, "h": 76 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 536, "y": 539, "w": 90, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 6, "w": 90, "h": 76 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 90, "y": 386, "w": 91, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 4, "w": 91, "h": 78 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 366, "y": 234, "w": 92, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 4, "w": 92, "h": 78 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 275, "y": 233, "w": 91, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 3, "w": 91, "h": 79 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 0, "y": 78, "w": 92, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 3, "w": 92, "h": 79 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 184, "y": 231, "w": 91, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 91, "h": 79 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 94, "y": 157, "w": 90, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 2, "w": 90, "h": 80 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 0, "y": 391, "w": 88, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 88, "h": 80 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 275, "y": 390, "w": 88, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 88, "h": 80 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 363, "y": 463, "w": 86, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 1, "w": 86, "h": 81 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 649, "y": 386, "w": 86, "h": 82 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 0, "w": 86, "h": 82 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 449, "y": 463, "w": 87, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 87, "h": 80 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 0, "y": 312, "w": 90, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 3, "w": 90, "h": 79 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 372, "y": 386, "w": 92, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 5, "w": 92, "h": 77 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 566, "y": 233, "w": 92, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 4, "w": 92, "h": 78 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 566, "y": 233, "w": 92, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 4, "w": 92, "h": 78 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 92, "y": 78, "w": 92, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 3, "w": 92, "h": 79 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 473, "y": 156, "w": 93, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 93, "h": 78 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 556, "y": 386, "w": 93, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 93, "h": 76 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 181, "y": 387, "w": 94, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 94, "h": 75 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 648, "y": 311, "w": 95, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 95, "h": 75 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 186, "y": 312, "w": 95, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 95, "h": 75 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 661, "y": 157, "w": 96, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 96, "h": 75 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 458, "y": 311, "w": 95, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 95, "h": 75 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 669, "y": 0, "w": 93, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 3, "w": 93, "h": 79 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 464, "y": 386, "w": 92, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 5, "w": 92, "h": 77 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 0, "y": 234, "w": 92, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 4, "w": 92, "h": 78 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0088.png",
+    "frame": { "x": 0, "y": 234, "w": 92, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 4, "w": 92, "h": 78 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0089.png",
+    "frame": { "x": 384, "y": 77, "w": 92, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 3, "w": 92, "h": 79 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0090.png",
+    "frame": { "x": 568, "y": 79, "w": 93, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 4, "w": 93, "h": 78 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0091.png",
+    "frame": { "x": 661, "y": 79, "w": 93, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 4, "w": 93, "h": 78 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0092.png",
+    "frame": { "x": 289, "y": 0, "w": 95, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 95, "h": 78 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0093.png",
+    "frame": { "x": 0, "y": 0, "w": 96, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 96, "h": 78 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0094.png",
+    "frame": { "x": 96, "y": 0, "w": 96, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 96, "h": 78 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0095.png",
+    "frame": { "x": 192, "y": 0, "w": 97, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 97, "h": 77 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0096.png",
+    "frame": { "x": 480, "y": 0, "w": 96, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 96, "h": 77 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0097.png",
+    "frame": { "x": 384, "y": 0, "w": 96, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 96, "h": 77 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0098.png",
+    "frame": { "x": 192, "y": 77, "w": 96, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 96, "h": 76 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0099.png",
+    "frame": { "x": 566, "y": 157, "w": 95, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 95, "h": 76 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0100.png",
+    "frame": { "x": 553, "y": 311, "w": 95, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 95, "h": 75 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0101.png",
+    "frame": { "x": 277, "y": 157, "w": 95, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 6, "w": 95, "h": 76 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0102.png",
+    "frame": { "x": 92, "y": 310, "w": 94, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 94, "h": 76 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0103.png",
+    "frame": { "x": 0, "y": 157, "w": 94, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 94, "h": 77 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0104.png",
+    "frame": { "x": 458, "y": 234, "w": 93, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 93, "h": 77 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0105.png",
+    "frame": { "x": 184, "y": 153, "w": 93, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 93, "h": 78 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0106.png",
+    "frame": { "x": 380, "y": 156, "w": 93, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 93, "h": 78 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0107.png",
+    "frame": { "x": 576, "y": 0, "w": 93, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 93, "h": 79 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0108.png",
+    "frame": { "x": 288, "y": 78, "w": 92, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 3, "w": 92, "h": 79 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.11-x64",
+  "image": "697.png",
+  "format": "I8",
+  "size": { "w": 762, "h": 616 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/697.png b/public/images/pokemon/exp/697.png
index 136007c2892..808dd14eabd 100644
Binary files a/public/images/pokemon/exp/697.png and b/public/images/pokemon/exp/697.png differ
diff --git a/public/images/pokemon/exp/698.json b/public/images/pokemon/exp/698.json
deleted file mode 100644
index e0096ec0ecf..00000000000
--- a/public/images/pokemon/exp/698.json
+++ /dev/null
@@ -1,3296 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "698.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 175,
-				"h": 175
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0125.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 0,
-						"w": 32,
-						"h": 60
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0126.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 0,
-						"w": 32,
-						"h": 60
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0151.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 0,
-						"w": 32,
-						"h": 60
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0152.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 0,
-						"w": 32,
-						"h": 60
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0127.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 0,
-						"w": 32,
-						"h": 60
-					},
-					"frame": {
-						"x": 0,
-						"y": 60,
-						"w": 32,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0128.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 0,
-						"w": 32,
-						"h": 60
-					},
-					"frame": {
-						"x": 0,
-						"y": 60,
-						"w": 32,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0027.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 38,
-						"h": 55
-					},
-					"frame": {
-						"x": 0,
-						"y": 120,
-						"w": 38,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0028.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 38,
-						"h": 55
-					},
-					"frame": {
-						"x": 0,
-						"y": 120,
-						"w": 38,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0032.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 38,
-						"h": 55
-					},
-					"frame": {
-						"x": 0,
-						"y": 120,
-						"w": 38,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0033.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 38,
-						"h": 55
-					},
-					"frame": {
-						"x": 0,
-						"y": 120,
-						"w": 38,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0067.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 38,
-						"h": 55
-					},
-					"frame": {
-						"x": 0,
-						"y": 120,
-						"w": 38,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0068.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 38,
-						"h": 55
-					},
-					"frame": {
-						"x": 0,
-						"y": 120,
-						"w": 38,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0072.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 38,
-						"h": 55
-					},
-					"frame": {
-						"x": 0,
-						"y": 120,
-						"w": 38,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0073.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 38,
-						"h": 55
-					},
-					"frame": {
-						"x": 0,
-						"y": 120,
-						"w": 38,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0107.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 38,
-						"h": 55
-					},
-					"frame": {
-						"x": 0,
-						"y": 120,
-						"w": 38,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0108.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 38,
-						"h": 55
-					},
-					"frame": {
-						"x": 0,
-						"y": 120,
-						"w": 38,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0112.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 38,
-						"h": 55
-					},
-					"frame": {
-						"x": 0,
-						"y": 120,
-						"w": 38,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0113.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 38,
-						"h": 55
-					},
-					"frame": {
-						"x": 0,
-						"y": 120,
-						"w": 38,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0129.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 0,
-						"w": 32,
-						"h": 60
-					},
-					"frame": {
-						"x": 32,
-						"y": 0,
-						"w": 32,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0130.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 0,
-						"w": 32,
-						"h": 60
-					},
-					"frame": {
-						"x": 32,
-						"y": 0,
-						"w": 32,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0135.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 0,
-						"w": 32,
-						"h": 60
-					},
-					"frame": {
-						"x": 32,
-						"y": 0,
-						"w": 32,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0136.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 0,
-						"w": 32,
-						"h": 60
-					},
-					"frame": {
-						"x": 32,
-						"y": 0,
-						"w": 32,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0141.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 0,
-						"w": 32,
-						"h": 60
-					},
-					"frame": {
-						"x": 32,
-						"y": 0,
-						"w": 32,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0142.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 0,
-						"w": 32,
-						"h": 60
-					},
-					"frame": {
-						"x": 32,
-						"y": 0,
-						"w": 32,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0147.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 0,
-						"w": 32,
-						"h": 60
-					},
-					"frame": {
-						"x": 32,
-						"y": 0,
-						"w": 32,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0148.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 0,
-						"w": 32,
-						"h": 60
-					},
-					"frame": {
-						"x": 32,
-						"y": 0,
-						"w": 32,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0131.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 0,
-						"w": 32,
-						"h": 60
-					},
-					"frame": {
-						"x": 32,
-						"y": 60,
-						"w": 32,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0132.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 0,
-						"w": 32,
-						"h": 60
-					},
-					"frame": {
-						"x": 32,
-						"y": 60,
-						"w": 32,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0137.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 0,
-						"w": 32,
-						"h": 60
-					},
-					"frame": {
-						"x": 32,
-						"y": 60,
-						"w": 32,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0138.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 0,
-						"w": 32,
-						"h": 60
-					},
-					"frame": {
-						"x": 32,
-						"y": 60,
-						"w": 32,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0143.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 0,
-						"w": 32,
-						"h": 60
-					},
-					"frame": {
-						"x": 32,
-						"y": 60,
-						"w": 32,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0144.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 0,
-						"w": 32,
-						"h": 60
-					},
-					"frame": {
-						"x": 32,
-						"y": 60,
-						"w": 32,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0149.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 0,
-						"w": 32,
-						"h": 60
-					},
-					"frame": {
-						"x": 32,
-						"y": 60,
-						"w": 32,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0150.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 0,
-						"w": 32,
-						"h": 60
-					},
-					"frame": {
-						"x": 32,
-						"y": 60,
-						"w": 32,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 5,
-						"w": 29,
-						"h": 55
-					},
-					"frame": {
-						"x": 38,
-						"y": 120,
-						"w": 29,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 5,
-						"w": 29,
-						"h": 55
-					},
-					"frame": {
-						"x": 38,
-						"y": 120,
-						"w": 29,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 5,
-						"w": 29,
-						"h": 55
-					},
-					"frame": {
-						"x": 38,
-						"y": 120,
-						"w": 29,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0049.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 5,
-						"w": 29,
-						"h": 55
-					},
-					"frame": {
-						"x": 38,
-						"y": 120,
-						"w": 29,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0050.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 5,
-						"w": 29,
-						"h": 55
-					},
-					"frame": {
-						"x": 38,
-						"y": 120,
-						"w": 29,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0051.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 5,
-						"w": 29,
-						"h": 55
-					},
-					"frame": {
-						"x": 38,
-						"y": 120,
-						"w": 29,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0089.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 5,
-						"w": 29,
-						"h": 55
-					},
-					"frame": {
-						"x": 38,
-						"y": 120,
-						"w": 29,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0090.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 5,
-						"w": 29,
-						"h": 55
-					},
-					"frame": {
-						"x": 38,
-						"y": 120,
-						"w": 29,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0091.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 5,
-						"w": 29,
-						"h": 55
-					},
-					"frame": {
-						"x": 38,
-						"y": 120,
-						"w": 29,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0133.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 0,
-						"w": 32,
-						"h": 60
-					},
-					"frame": {
-						"x": 64,
-						"y": 0,
-						"w": 32,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0134.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 0,
-						"w": 32,
-						"h": 60
-					},
-					"frame": {
-						"x": 64,
-						"y": 0,
-						"w": 32,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0139.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 0,
-						"w": 32,
-						"h": 60
-					},
-					"frame": {
-						"x": 64,
-						"y": 0,
-						"w": 32,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0140.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 0,
-						"w": 32,
-						"h": 60
-					},
-					"frame": {
-						"x": 64,
-						"y": 0,
-						"w": 32,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0145.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 0,
-						"w": 32,
-						"h": 60
-					},
-					"frame": {
-						"x": 64,
-						"y": 0,
-						"w": 32,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0146.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 0,
-						"w": 32,
-						"h": 60
-					},
-					"frame": {
-						"x": 64,
-						"y": 0,
-						"w": 32,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0123.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 32,
-						"h": 59
-					},
-					"frame": {
-						"x": 64,
-						"y": 60,
-						"w": 32,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0124.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 32,
-						"h": 59
-					},
-					"frame": {
-						"x": 64,
-						"y": 60,
-						"w": 32,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0153.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 32,
-						"h": 59
-					},
-					"frame": {
-						"x": 64,
-						"y": 60,
-						"w": 32,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0154.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 32,
-						"h": 59
-					},
-					"frame": {
-						"x": 64,
-						"y": 60,
-						"w": 32,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0025.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 37,
-						"h": 56
-					},
-					"frame": {
-						"x": 67,
-						"y": 119,
-						"w": 37,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0026.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 37,
-						"h": 56
-					},
-					"frame": {
-						"x": 67,
-						"y": 119,
-						"w": 37,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0034.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 37,
-						"h": 56
-					},
-					"frame": {
-						"x": 67,
-						"y": 119,
-						"w": 37,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0035.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 37,
-						"h": 56
-					},
-					"frame": {
-						"x": 67,
-						"y": 119,
-						"w": 37,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0065.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 37,
-						"h": 56
-					},
-					"frame": {
-						"x": 67,
-						"y": 119,
-						"w": 37,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0066.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 37,
-						"h": 56
-					},
-					"frame": {
-						"x": 67,
-						"y": 119,
-						"w": 37,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0074.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 37,
-						"h": 56
-					},
-					"frame": {
-						"x": 67,
-						"y": 119,
-						"w": 37,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0075.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 37,
-						"h": 56
-					},
-					"frame": {
-						"x": 67,
-						"y": 119,
-						"w": 37,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0105.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 37,
-						"h": 56
-					},
-					"frame": {
-						"x": 67,
-						"y": 119,
-						"w": 37,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0106.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 37,
-						"h": 56
-					},
-					"frame": {
-						"x": 67,
-						"y": 119,
-						"w": 37,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0114.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 37,
-						"h": 56
-					},
-					"frame": {
-						"x": 67,
-						"y": 119,
-						"w": 37,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0115.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 37,
-						"h": 56
-					},
-					"frame": {
-						"x": 67,
-						"y": 119,
-						"w": 37,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0029.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 38,
-						"h": 54
-					},
-					"frame": {
-						"x": 104,
-						"y": 0,
-						"w": 38,
-						"h": 54
-					}
-				},
-				{
-					"filename": "0030.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 38,
-						"h": 54
-					},
-					"frame": {
-						"x": 104,
-						"y": 0,
-						"w": 38,
-						"h": 54
-					}
-				},
-				{
-					"filename": "0031.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 38,
-						"h": 54
-					},
-					"frame": {
-						"x": 104,
-						"y": 0,
-						"w": 38,
-						"h": 54
-					}
-				},
-				{
-					"filename": "0069.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 38,
-						"h": 54
-					},
-					"frame": {
-						"x": 104,
-						"y": 0,
-						"w": 38,
-						"h": 54
-					}
-				},
-				{
-					"filename": "0070.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 38,
-						"h": 54
-					},
-					"frame": {
-						"x": 104,
-						"y": 0,
-						"w": 38,
-						"h": 54
-					}
-				},
-				{
-					"filename": "0071.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 38,
-						"h": 54
-					},
-					"frame": {
-						"x": 104,
-						"y": 0,
-						"w": 38,
-						"h": 54
-					}
-				},
-				{
-					"filename": "0109.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 38,
-						"h": 54
-					},
-					"frame": {
-						"x": 104,
-						"y": 0,
-						"w": 38,
-						"h": 54
-					}
-				},
-				{
-					"filename": "0110.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 38,
-						"h": 54
-					},
-					"frame": {
-						"x": 104,
-						"y": 0,
-						"w": 38,
-						"h": 54
-					}
-				},
-				{
-					"filename": "0111.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 38,
-						"h": 54
-					},
-					"frame": {
-						"x": 104,
-						"y": 0,
-						"w": 38,
-						"h": 54
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 2,
-						"w": 33,
-						"h": 58
-					},
-					"frame": {
-						"x": 142,
-						"y": 0,
-						"w": 33,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 2,
-						"w": 33,
-						"h": 58
-					},
-					"frame": {
-						"x": 142,
-						"y": 0,
-						"w": 33,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 2,
-						"w": 33,
-						"h": 58
-					},
-					"frame": {
-						"x": 142,
-						"y": 0,
-						"w": 33,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 2,
-						"w": 33,
-						"h": 58
-					},
-					"frame": {
-						"x": 142,
-						"y": 0,
-						"w": 33,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0043.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 2,
-						"w": 33,
-						"h": 58
-					},
-					"frame": {
-						"x": 142,
-						"y": 0,
-						"w": 33,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0044.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 2,
-						"w": 33,
-						"h": 58
-					},
-					"frame": {
-						"x": 142,
-						"y": 0,
-						"w": 33,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0056.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 2,
-						"w": 33,
-						"h": 58
-					},
-					"frame": {
-						"x": 142,
-						"y": 0,
-						"w": 33,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0057.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 2,
-						"w": 33,
-						"h": 58
-					},
-					"frame": {
-						"x": 142,
-						"y": 0,
-						"w": 33,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0083.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 2,
-						"w": 33,
-						"h": 58
-					},
-					"frame": {
-						"x": 142,
-						"y": 0,
-						"w": 33,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0084.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 2,
-						"w": 33,
-						"h": 58
-					},
-					"frame": {
-						"x": 142,
-						"y": 0,
-						"w": 33,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0096.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 2,
-						"w": 33,
-						"h": 58
-					},
-					"frame": {
-						"x": 142,
-						"y": 0,
-						"w": 33,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0097.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 2,
-						"w": 33,
-						"h": 58
-					},
-					"frame": {
-						"x": 142,
-						"y": 0,
-						"w": 33,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 36,
-						"h": 57
-					},
-					"frame": {
-						"x": 104,
-						"y": 54,
-						"w": 36,
-						"h": 57
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 36,
-						"h": 57
-					},
-					"frame": {
-						"x": 104,
-						"y": 54,
-						"w": 36,
-						"h": 57
-					}
-				},
-				{
-					"filename": "0036.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 36,
-						"h": 57
-					},
-					"frame": {
-						"x": 104,
-						"y": 54,
-						"w": 36,
-						"h": 57
-					}
-				},
-				{
-					"filename": "0037.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 36,
-						"h": 57
-					},
-					"frame": {
-						"x": 104,
-						"y": 54,
-						"w": 36,
-						"h": 57
-					}
-				},
-				{
-					"filename": "0063.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 36,
-						"h": 57
-					},
-					"frame": {
-						"x": 104,
-						"y": 54,
-						"w": 36,
-						"h": 57
-					}
-				},
-				{
-					"filename": "0064.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 36,
-						"h": 57
-					},
-					"frame": {
-						"x": 104,
-						"y": 54,
-						"w": 36,
-						"h": 57
-					}
-				},
-				{
-					"filename": "0076.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 36,
-						"h": 57
-					},
-					"frame": {
-						"x": 104,
-						"y": 54,
-						"w": 36,
-						"h": 57
-					}
-				},
-				{
-					"filename": "0077.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 36,
-						"h": 57
-					},
-					"frame": {
-						"x": 104,
-						"y": 54,
-						"w": 36,
-						"h": 57
-					}
-				},
-				{
-					"filename": "0103.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 36,
-						"h": 57
-					},
-					"frame": {
-						"x": 104,
-						"y": 54,
-						"w": 36,
-						"h": 57
-					}
-				},
-				{
-					"filename": "0104.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 36,
-						"h": 57
-					},
-					"frame": {
-						"x": 104,
-						"y": 54,
-						"w": 36,
-						"h": 57
-					}
-				},
-				{
-					"filename": "0116.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 36,
-						"h": 57
-					},
-					"frame": {
-						"x": 104,
-						"y": 54,
-						"w": 36,
-						"h": 57
-					}
-				},
-				{
-					"filename": "0117.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 36,
-						"h": 57
-					},
-					"frame": {
-						"x": 104,
-						"y": 54,
-						"w": 36,
-						"h": 57
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 34,
-						"h": 58
-					},
-					"frame": {
-						"x": 140,
-						"y": 58,
-						"w": 34,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 34,
-						"h": 58
-					},
-					"frame": {
-						"x": 140,
-						"y": 58,
-						"w": 34,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 34,
-						"h": 58
-					},
-					"frame": {
-						"x": 140,
-						"y": 58,
-						"w": 34,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 34,
-						"h": 58
-					},
-					"frame": {
-						"x": 140,
-						"y": 58,
-						"w": 34,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 34,
-						"h": 58
-					},
-					"frame": {
-						"x": 140,
-						"y": 58,
-						"w": 34,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 34,
-						"h": 58
-					},
-					"frame": {
-						"x": 140,
-						"y": 58,
-						"w": 34,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 34,
-						"h": 58
-					},
-					"frame": {
-						"x": 140,
-						"y": 58,
-						"w": 34,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0038.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 34,
-						"h": 58
-					},
-					"frame": {
-						"x": 140,
-						"y": 58,
-						"w": 34,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0039.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 34,
-						"h": 58
-					},
-					"frame": {
-						"x": 140,
-						"y": 58,
-						"w": 34,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0040.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 34,
-						"h": 58
-					},
-					"frame": {
-						"x": 140,
-						"y": 58,
-						"w": 34,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0041.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 34,
-						"h": 58
-					},
-					"frame": {
-						"x": 140,
-						"y": 58,
-						"w": 34,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0042.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 34,
-						"h": 58
-					},
-					"frame": {
-						"x": 140,
-						"y": 58,
-						"w": 34,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0058.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 34,
-						"h": 58
-					},
-					"frame": {
-						"x": 140,
-						"y": 58,
-						"w": 34,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0059.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 34,
-						"h": 58
-					},
-					"frame": {
-						"x": 140,
-						"y": 58,
-						"w": 34,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0060.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 34,
-						"h": 58
-					},
-					"frame": {
-						"x": 140,
-						"y": 58,
-						"w": 34,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0061.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 34,
-						"h": 58
-					},
-					"frame": {
-						"x": 140,
-						"y": 58,
-						"w": 34,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0062.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 34,
-						"h": 58
-					},
-					"frame": {
-						"x": 140,
-						"y": 58,
-						"w": 34,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0078.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 34,
-						"h": 58
-					},
-					"frame": {
-						"x": 140,
-						"y": 58,
-						"w": 34,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0079.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 34,
-						"h": 58
-					},
-					"frame": {
-						"x": 140,
-						"y": 58,
-						"w": 34,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0080.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 34,
-						"h": 58
-					},
-					"frame": {
-						"x": 140,
-						"y": 58,
-						"w": 34,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0081.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 34,
-						"h": 58
-					},
-					"frame": {
-						"x": 140,
-						"y": 58,
-						"w": 34,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0082.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 34,
-						"h": 58
-					},
-					"frame": {
-						"x": 140,
-						"y": 58,
-						"w": 34,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0098.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 34,
-						"h": 58
-					},
-					"frame": {
-						"x": 140,
-						"y": 58,
-						"w": 34,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0099.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 34,
-						"h": 58
-					},
-					"frame": {
-						"x": 140,
-						"y": 58,
-						"w": 34,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0100.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 34,
-						"h": 58
-					},
-					"frame": {
-						"x": 140,
-						"y": 58,
-						"w": 34,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0101.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 34,
-						"h": 58
-					},
-					"frame": {
-						"x": 140,
-						"y": 58,
-						"w": 34,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0102.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 34,
-						"h": 58
-					},
-					"frame": {
-						"x": 140,
-						"y": 58,
-						"w": 34,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0118.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 34,
-						"h": 58
-					},
-					"frame": {
-						"x": 140,
-						"y": 58,
-						"w": 34,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0119.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 34,
-						"h": 58
-					},
-					"frame": {
-						"x": 140,
-						"y": 58,
-						"w": 34,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0120.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 34,
-						"h": 58
-					},
-					"frame": {
-						"x": 140,
-						"y": 58,
-						"w": 34,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0121.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 34,
-						"h": 58
-					},
-					"frame": {
-						"x": 140,
-						"y": 58,
-						"w": 34,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0122.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 34,
-						"h": 58
-					},
-					"frame": {
-						"x": 140,
-						"y": 58,
-						"w": 34,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0155.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 34,
-						"h": 58
-					},
-					"frame": {
-						"x": 140,
-						"y": 58,
-						"w": 34,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0156.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 34,
-						"h": 58
-					},
-					"frame": {
-						"x": 140,
-						"y": 58,
-						"w": 34,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 3,
-						"w": 31,
-						"h": 57
-					},
-					"frame": {
-						"x": 104,
-						"y": 116,
-						"w": 31,
-						"h": 57
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 3,
-						"w": 31,
-						"h": 57
-					},
-					"frame": {
-						"x": 104,
-						"y": 116,
-						"w": 31,
-						"h": 57
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 3,
-						"w": 31,
-						"h": 57
-					},
-					"frame": {
-						"x": 104,
-						"y": 116,
-						"w": 31,
-						"h": 57
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 3,
-						"w": 31,
-						"h": 57
-					},
-					"frame": {
-						"x": 104,
-						"y": 116,
-						"w": 31,
-						"h": 57
-					}
-				},
-				{
-					"filename": "0045.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 3,
-						"w": 31,
-						"h": 57
-					},
-					"frame": {
-						"x": 104,
-						"y": 116,
-						"w": 31,
-						"h": 57
-					}
-				},
-				{
-					"filename": "0046.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 3,
-						"w": 31,
-						"h": 57
-					},
-					"frame": {
-						"x": 104,
-						"y": 116,
-						"w": 31,
-						"h": 57
-					}
-				},
-				{
-					"filename": "0054.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 3,
-						"w": 31,
-						"h": 57
-					},
-					"frame": {
-						"x": 104,
-						"y": 116,
-						"w": 31,
-						"h": 57
-					}
-				},
-				{
-					"filename": "0055.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 3,
-						"w": 31,
-						"h": 57
-					},
-					"frame": {
-						"x": 104,
-						"y": 116,
-						"w": 31,
-						"h": 57
-					}
-				},
-				{
-					"filename": "0085.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 3,
-						"w": 31,
-						"h": 57
-					},
-					"frame": {
-						"x": 104,
-						"y": 116,
-						"w": 31,
-						"h": 57
-					}
-				},
-				{
-					"filename": "0086.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 3,
-						"w": 31,
-						"h": 57
-					},
-					"frame": {
-						"x": 104,
-						"y": 116,
-						"w": 31,
-						"h": 57
-					}
-				},
-				{
-					"filename": "0094.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 3,
-						"w": 31,
-						"h": 57
-					},
-					"frame": {
-						"x": 104,
-						"y": 116,
-						"w": 31,
-						"h": 57
-					}
-				},
-				{
-					"filename": "0095.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 3,
-						"w": 31,
-						"h": 57
-					},
-					"frame": {
-						"x": 104,
-						"y": 116,
-						"w": 31,
-						"h": 57
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 4,
-						"w": 30,
-						"h": 56
-					},
-					"frame": {
-						"x": 135,
-						"y": 116,
-						"w": 30,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 4,
-						"w": 30,
-						"h": 56
-					},
-					"frame": {
-						"x": 135,
-						"y": 116,
-						"w": 30,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 4,
-						"w": 30,
-						"h": 56
-					},
-					"frame": {
-						"x": 135,
-						"y": 116,
-						"w": 30,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 4,
-						"w": 30,
-						"h": 56
-					},
-					"frame": {
-						"x": 135,
-						"y": 116,
-						"w": 30,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0047.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 4,
-						"w": 30,
-						"h": 56
-					},
-					"frame": {
-						"x": 135,
-						"y": 116,
-						"w": 30,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0048.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 4,
-						"w": 30,
-						"h": 56
-					},
-					"frame": {
-						"x": 135,
-						"y": 116,
-						"w": 30,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0052.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 4,
-						"w": 30,
-						"h": 56
-					},
-					"frame": {
-						"x": 135,
-						"y": 116,
-						"w": 30,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0053.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 4,
-						"w": 30,
-						"h": 56
-					},
-					"frame": {
-						"x": 135,
-						"y": 116,
-						"w": 30,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0087.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 4,
-						"w": 30,
-						"h": 56
-					},
-					"frame": {
-						"x": 135,
-						"y": 116,
-						"w": 30,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0088.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 4,
-						"w": 30,
-						"h": 56
-					},
-					"frame": {
-						"x": 135,
-						"y": 116,
-						"w": 30,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0092.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 4,
-						"w": 30,
-						"h": 56
-					},
-					"frame": {
-						"x": 135,
-						"y": 116,
-						"w": 30,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0093.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 4,
-						"w": 30,
-						"h": 56
-					},
-					"frame": {
-						"x": 135,
-						"y": 116,
-						"w": 30,
-						"h": 56
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:2dce35b74cbe50cf08e71af3768cef4c:e4d5ff1dbd47865af99315586fe42981:198087d69fed44d4a642fa3ba5c077d6$"
-	}
-}
diff --git a/public/images/pokemon/exp/698.png b/public/images/pokemon/exp/698.png
deleted file mode 100644
index 6d8ca555881..00000000000
Binary files a/public/images/pokemon/exp/698.png and /dev/null differ
diff --git a/public/images/pokemon/exp/700.json b/public/images/pokemon/exp/700.json
index fbcefcf3561..2ed26d79228 100644
--- a/public/images/pokemon/exp/700.json
+++ b/public/images/pokemon/exp/700.json
@@ -1,1070 +1,587 @@
-{
-	"textures": [
-		{
-			"image": "700.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 233,
-				"h": 233
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 53,
-						"h": 58
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 53,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 53,
-						"h": 58
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 53,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0027.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 53,
-						"h": 58
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 53,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0038.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 53,
-						"h": 58
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 53,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 52,
-						"h": 58
-					},
-					"frame": {
-						"x": 0,
-						"y": 58,
-						"w": 52,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 52,
-						"h": 58
-					},
-					"frame": {
-						"x": 0,
-						"y": 58,
-						"w": 52,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0026.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 52,
-						"h": 58
-					},
-					"frame": {
-						"x": 0,
-						"y": 58,
-						"w": 52,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0037.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 52,
-						"h": 58
-					},
-					"frame": {
-						"x": 0,
-						"y": 58,
-						"w": 52,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 52,
-						"h": 58
-					},
-					"frame": {
-						"x": 53,
-						"y": 0,
-						"w": 52,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 52,
-						"h": 58
-					},
-					"frame": {
-						"x": 53,
-						"y": 0,
-						"w": 52,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0028.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 52,
-						"h": 58
-					},
-					"frame": {
-						"x": 53,
-						"y": 0,
-						"w": 52,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0039.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 52,
-						"h": 58
-					},
-					"frame": {
-						"x": 53,
-						"y": 0,
-						"w": 52,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 51,
-						"h": 59
-					},
-					"frame": {
-						"x": 0,
-						"y": 116,
-						"w": 51,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 51,
-						"h": 59
-					},
-					"frame": {
-						"x": 0,
-						"y": 116,
-						"w": 51,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0029.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 51,
-						"h": 59
-					},
-					"frame": {
-						"x": 0,
-						"y": 116,
-						"w": 51,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0040.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 51,
-						"h": 59
-					},
-					"frame": {
-						"x": 0,
-						"y": 116,
-						"w": 51,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0045.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 1,
-						"w": 45,
-						"h": 58
-					},
-					"frame": {
-						"x": 0,
-						"y": 175,
-						"w": 45,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0047.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 1,
-						"w": 45,
-						"h": 58
-					},
-					"frame": {
-						"x": 0,
-						"y": 175,
-						"w": 45,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 50,
-						"h": 59
-					},
-					"frame": {
-						"x": 52,
-						"y": 58,
-						"w": 50,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 50,
-						"h": 59
-					},
-					"frame": {
-						"x": 52,
-						"y": 58,
-						"w": 50,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 50,
-						"h": 59
-					},
-					"frame": {
-						"x": 52,
-						"y": 58,
-						"w": 50,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0034.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 50,
-						"h": 59
-					},
-					"frame": {
-						"x": 52,
-						"y": 58,
-						"w": 50,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0048.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 50,
-						"h": 59
-					},
-					"frame": {
-						"x": 52,
-						"y": 58,
-						"w": 50,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0050.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 50,
-						"h": 59
-					},
-					"frame": {
-						"x": 52,
-						"y": 58,
-						"w": 50,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 50,
-						"h": 59
-					},
-					"frame": {
-						"x": 105,
-						"y": 0,
-						"w": 50,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 50,
-						"h": 59
-					},
-					"frame": {
-						"x": 105,
-						"y": 0,
-						"w": 50,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 50,
-						"h": 59
-					},
-					"frame": {
-						"x": 105,
-						"y": 0,
-						"w": 50,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0035.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 50,
-						"h": 59
-					},
-					"frame": {
-						"x": 105,
-						"y": 0,
-						"w": 50,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 50,
-						"h": 59
-					},
-					"frame": {
-						"x": 155,
-						"y": 0,
-						"w": 50,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 50,
-						"h": 59
-					},
-					"frame": {
-						"x": 155,
-						"y": 0,
-						"w": 50,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0025.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 50,
-						"h": 59
-					},
-					"frame": {
-						"x": 155,
-						"y": 0,
-						"w": 50,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0036.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 50,
-						"h": 59
-					},
-					"frame": {
-						"x": 155,
-						"y": 0,
-						"w": 50,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 50,
-						"h": 59
-					},
-					"frame": {
-						"x": 51,
-						"y": 117,
-						"w": 50,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 50,
-						"h": 59
-					},
-					"frame": {
-						"x": 51,
-						"y": 117,
-						"w": 50,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0031.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 50,
-						"h": 59
-					},
-					"frame": {
-						"x": 51,
-						"y": 117,
-						"w": 50,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0042.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 50,
-						"h": 59
-					},
-					"frame": {
-						"x": 51,
-						"y": 117,
-						"w": 50,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0046.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 2,
-						"w": 42,
-						"h": 57
-					},
-					"frame": {
-						"x": 45,
-						"y": 176,
-						"w": 42,
-						"h": 57
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 50,
-						"h": 59
-					},
-					"frame": {
-						"x": 102,
-						"y": 59,
-						"w": 50,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 50,
-						"h": 59
-					},
-					"frame": {
-						"x": 102,
-						"y": 59,
-						"w": 50,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0032.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 50,
-						"h": 59
-					},
-					"frame": {
-						"x": 102,
-						"y": 59,
-						"w": 50,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0043.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 50,
-						"h": 59
-					},
-					"frame": {
-						"x": 102,
-						"y": 59,
-						"w": 50,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 50,
-						"h": 59
-					},
-					"frame": {
-						"x": 152,
-						"y": 59,
-						"w": 50,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 50,
-						"h": 59
-					},
-					"frame": {
-						"x": 152,
-						"y": 59,
-						"w": 50,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0033.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 50,
-						"h": 59
-					},
-					"frame": {
-						"x": 152,
-						"y": 59,
-						"w": 50,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0044.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 50,
-						"h": 59
-					},
-					"frame": {
-						"x": 152,
-						"y": 59,
-						"w": 50,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0049.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 50,
-						"h": 59
-					},
-					"frame": {
-						"x": 101,
-						"y": 118,
-						"w": 50,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 49,
-						"h": 59
-					},
-					"frame": {
-						"x": 151,
-						"y": 118,
-						"w": 49,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 49,
-						"h": 59
-					},
-					"frame": {
-						"x": 151,
-						"y": 118,
-						"w": 49,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0030.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 49,
-						"h": 59
-					},
-					"frame": {
-						"x": 151,
-						"y": 118,
-						"w": 49,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0041.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 49,
-						"h": 59
-					},
-					"frame": {
-						"x": 151,
-						"y": 118,
-						"w": 49,
-						"h": 59
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:8ebe248133b590a1727583e2ee69cc50:c2481ba04831dcd949e63454034488e2:2e4bf5ef1f19e475073f7da10c60b540$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 180, "y": 183, "w": 43, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 43, "h": 58 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 136, "y": 238, "w": 43, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 43, "h": 58 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 44, "y": 181, "w": 44, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 44, "h": 57 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 88, "y": 239, "w": 44, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 6, "w": 44, "h": 56 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 180, "y": 242, "w": 43, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 6, "w": 43, "h": 56 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 93, "y": 119, "w": 45, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 45, "h": 58 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 99, "y": 60, "w": 46, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 46, "h": 58 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 139, "y": 119, "w": 45, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 45, "h": 58 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 180, "y": 183, "w": 43, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 43, "h": 58 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 136, "y": 238, "w": 43, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 43, "h": 58 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 44, "y": 181, "w": 44, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 44, "h": 57 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 88, "y": 239, "w": 44, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 6, "w": 44, "h": 56 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 180, "y": 242, "w": 43, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 6, "w": 43, "h": 56 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 0, "y": 120, "w": 45, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 45, "h": 58 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 146, "y": 60, "w": 46, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 46, "h": 58 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 46, "y": 122, "w": 45, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 45, "h": 58 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 180, "y": 183, "w": 43, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 43, "h": 58 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 136, "y": 238, "w": 43, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 43, "h": 58 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 44, "y": 181, "w": 44, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 44, "h": 57 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 88, "y": 239, "w": 44, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 6, "w": 44, "h": 56 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 180, "y": 242, "w": 43, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 6, "w": 43, "h": 56 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 93, "y": 119, "w": 45, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 45, "h": 58 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 99, "y": 60, "w": 46, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 46, "h": 58 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 139, "y": 119, "w": 45, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 45, "h": 58 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 180, "y": 183, "w": 43, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 43, "h": 58 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 136, "y": 238, "w": 43, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 43, "h": 58 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 44, "y": 181, "w": 44, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 44, "h": 57 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 88, "y": 239, "w": 44, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 6, "w": 44, "h": 56 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 180, "y": 242, "w": 43, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 6, "w": 43, "h": 56 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 0, "y": 120, "w": 45, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 45, "h": 58 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 146, "y": 60, "w": 46, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 46, "h": 58 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 46, "y": 122, "w": 45, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 45, "h": 58 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 180, "y": 183, "w": 43, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 43, "h": 58 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 136, "y": 238, "w": 43, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 43, "h": 58 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 44, "y": 181, "w": 44, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 44, "h": 57 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 88, "y": 239, "w": 44, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 6, "w": 44, "h": 56 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 180, "y": 242, "w": 43, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 6, "w": 43, "h": 56 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 93, "y": 119, "w": 45, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 45, "h": 58 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 99, "y": 60, "w": 46, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 46, "h": 58 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 139, "y": 119, "w": 45, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 45, "h": 58 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 180, "y": 183, "w": 43, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 43, "h": 58 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 136, "y": 238, "w": 43, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 43, "h": 58 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 44, "y": 181, "w": 44, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 44, "h": 57 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 88, "y": 239, "w": 44, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 6, "w": 44, "h": 56 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 180, "y": 242, "w": 43, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 6, "w": 43, "h": 56 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 0, "y": 120, "w": 45, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 45, "h": 58 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 146, "y": 60, "w": 46, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 46, "h": 58 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 46, "y": 122, "w": 45, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 45, "h": 58 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 0, "y": 239, "w": 43, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 43, "h": 58 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 193, "y": 60, "w": 43, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 43, "h": 62 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 99, "y": 0, "w": 47, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 47, "h": 59 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 147, "y": 0, "w": 47, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 47, "h": 59 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 0, "y": 0, "w": 51, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 51, "h": 59 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 0, "y": 60, "w": 46, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 46, "h": 59 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 92, "y": 178, "w": 43, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 43, "h": 60 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 195, "y": 0, "w": 47, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 47, "h": 59 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 52, "y": 0, "w": 46, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 46, "h": 61 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 136, "y": 178, "w": 43, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 43, "h": 59 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 195, "y": 0, "w": 47, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 47, "h": 59 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 52, "y": 0, "w": 46, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 46, "h": 61 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 0, "y": 179, "w": 43, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 43, "h": 59 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 185, "y": 123, "w": 44, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 44, "h": 59 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 47, "y": 62, "w": 45, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 45, "h": 59 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 44, "y": 239, "w": 43, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 43, "h": 58 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.11-x64",
+  "image": "700.png",
+  "format": "I8",
+  "size": { "w": 242, "h": 298 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/700.png b/public/images/pokemon/exp/700.png
index 997328d323d..4d3e64fab03 100644
Binary files a/public/images/pokemon/exp/700.png and b/public/images/pokemon/exp/700.png differ
diff --git a/public/images/pokemon/exp/702.json b/public/images/pokemon/exp/702.json
index bf5cfbccec0..0ab95b58c7a 100644
--- a/public/images/pokemon/exp/702.json
+++ b/public/images/pokemon/exp/702.json
@@ -1,671 +1,443 @@
-{
-	"textures": [
-		{
-			"image": "702.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 138,
-				"h": 138
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 48,
-						"h": 36
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 48,
-						"h": 36
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 48,
-						"h": 36
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 48,
-						"h": 36
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 48,
-						"h": 36
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 48,
-						"h": 36
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 48,
-						"h": 36
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 48,
-						"h": 36
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 48,
-						"h": 36
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 48,
-						"h": 36
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 48,
-						"h": 36
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 48,
-						"h": 36
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 48,
-						"h": 36
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 48,
-						"h": 36
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 48,
-						"h": 36
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 48,
-						"h": 36
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 48,
-						"h": 36
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 48,
-						"h": 36
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 48,
-						"h": 36
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 48,
-						"h": 36
-					},
-					"frame": {
-						"x": 48,
-						"y": 0,
-						"w": 48,
-						"h": 36
-					}
-				},
-				{
-					"filename": "0031.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 48,
-						"h": 36
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 48,
-						"h": 36
-					},
-					"frame": {
-						"x": 48,
-						"y": 0,
-						"w": 48,
-						"h": 36
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 36
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 47,
-						"h": 36
-					},
-					"frame": {
-						"x": 0,
-						"y": 36,
-						"w": 47,
-						"h": 36
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 36
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 47,
-						"h": 36
-					},
-					"frame": {
-						"x": 0,
-						"y": 36,
-						"w": 47,
-						"h": 36
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 36
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 47,
-						"h": 36
-					},
-					"frame": {
-						"x": 0,
-						"y": 36,
-						"w": 47,
-						"h": 36
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 36
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 47,
-						"h": 36
-					},
-					"frame": {
-						"x": 0,
-						"y": 36,
-						"w": 47,
-						"h": 36
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 36
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 47,
-						"h": 36
-					},
-					"frame": {
-						"x": 0,
-						"y": 36,
-						"w": 47,
-						"h": 36
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 36
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 47,
-						"h": 36
-					},
-					"frame": {
-						"x": 0,
-						"y": 36,
-						"w": 47,
-						"h": 36
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 36
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 45,
-						"h": 36
-					},
-					"frame": {
-						"x": 0,
-						"y": 72,
-						"w": 45,
-						"h": 36
-					}
-				},
-				{
-					"filename": "0030.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 36
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 45,
-						"h": 36
-					},
-					"frame": {
-						"x": 0,
-						"y": 72,
-						"w": 45,
-						"h": 36
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 36
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 48,
-						"h": 35
-					},
-					"frame": {
-						"x": 45,
-						"y": 72,
-						"w": 48,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 36
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 48,
-						"h": 35
-					},
-					"frame": {
-						"x": 45,
-						"y": 72,
-						"w": 48,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 36
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 48,
-						"h": 35
-					},
-					"frame": {
-						"x": 45,
-						"y": 72,
-						"w": 48,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 36
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 48,
-						"h": 35
-					},
-					"frame": {
-						"x": 45,
-						"y": 72,
-						"w": 48,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 36
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 48,
-						"h": 35
-					},
-					"frame": {
-						"x": 45,
-						"y": 72,
-						"w": 48,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 36
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 48,
-						"h": 35
-					},
-					"frame": {
-						"x": 45,
-						"y": 72,
-						"w": 48,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 36
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 44,
-						"h": 35
-					},
-					"frame": {
-						"x": 47,
-						"y": 36,
-						"w": 44,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0026.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 36
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 44,
-						"h": 35
-					},
-					"frame": {
-						"x": 47,
-						"y": 36,
-						"w": 44,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0028.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 36
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 44,
-						"h": 35
-					},
-					"frame": {
-						"x": 47,
-						"y": 36,
-						"w": 44,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 36
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 47,
-						"h": 33
-					},
-					"frame": {
-						"x": 91,
-						"y": 36,
-						"w": 47,
-						"h": 33
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 36
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 47,
-						"h": 33
-					},
-					"frame": {
-						"x": 91,
-						"y": 36,
-						"w": 47,
-						"h": 33
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 36
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 47,
-						"h": 33
-					},
-					"frame": {
-						"x": 91,
-						"y": 36,
-						"w": 47,
-						"h": 33
-					}
-				},
-				{
-					"filename": "0025.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 36
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 44,
-						"h": 35
-					},
-					"frame": {
-						"x": 93,
-						"y": 69,
-						"w": 44,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0027.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 36
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 44,
-						"h": 35
-					},
-					"frame": {
-						"x": 93,
-						"y": 69,
-						"w": 44,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0029.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 36
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 44,
-						"h": 35
-					},
-					"frame": {
-						"x": 93,
-						"y": 69,
-						"w": 44,
-						"h": 35
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:be64539a559c97720b84c9b5cd8151b7:e7db40381441319d37a93d8698db35c7:ba8fdab405d5efab99c4aa1084328e6b$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 144, "y": 0, "w": 46, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 46, "h": 36 },
+    "sourceSize": { "w": 47, "h": 36 },
+    "duration": 110
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 0, "y": 0, "w": 47, "h": 36 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 47, "h": 36 },
+    "sourceSize": { "w": 47, "h": 36 },
+    "duration": 110
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 0, "y": 37, "w": 46, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 46, "h": 36 },
+    "sourceSize": { "w": 47, "h": 36 },
+    "duration": 110
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 0, "y": 111, "w": 46, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 46, "h": 33 },
+    "sourceSize": { "w": 47, "h": 36 },
+    "duration": 110
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 47, "y": 111, "w": 46, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 46, "h": 33 },
+    "sourceSize": { "w": 47, "h": 36 },
+    "duration": 110
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 47, "y": 37, "w": 46, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 46, "h": 36 },
+    "sourceSize": { "w": 47, "h": 36 },
+    "duration": 110
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 94, "y": 37, "w": 46, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 46, "h": 36 },
+    "sourceSize": { "w": 47, "h": 36 },
+    "duration": 110
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 141, "y": 74, "w": 45, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 45, "h": 36 },
+    "sourceSize": { "w": 47, "h": 36 },
+    "duration": 110
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 144, "y": 0, "w": 46, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 46, "h": 36 },
+    "sourceSize": { "w": 47, "h": 36 },
+    "duration": 110
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 0, "y": 0, "w": 47, "h": 36 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 47, "h": 36 },
+    "sourceSize": { "w": 47, "h": 36 },
+    "duration": 110
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 0, "y": 37, "w": 46, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 46, "h": 36 },
+    "sourceSize": { "w": 47, "h": 36 },
+    "duration": 110
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 0, "y": 111, "w": 46, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 46, "h": 33 },
+    "sourceSize": { "w": 47, "h": 36 },
+    "duration": 110
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 47, "y": 111, "w": 46, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 46, "h": 33 },
+    "sourceSize": { "w": 47, "h": 36 },
+    "duration": 110
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 47, "y": 37, "w": 46, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 46, "h": 36 },
+    "sourceSize": { "w": 47, "h": 36 },
+    "duration": 110
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 94, "y": 37, "w": 46, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 46, "h": 36 },
+    "sourceSize": { "w": 47, "h": 36 },
+    "duration": 110
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 141, "y": 74, "w": 45, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 45, "h": 36 },
+    "sourceSize": { "w": 47, "h": 36 },
+    "duration": 110
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 144, "y": 0, "w": 46, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 46, "h": 36 },
+    "sourceSize": { "w": 47, "h": 36 },
+    "duration": 110
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 0, "y": 0, "w": 47, "h": 36 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 47, "h": 36 },
+    "sourceSize": { "w": 47, "h": 36 },
+    "duration": 110
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 0, "y": 37, "w": 46, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 46, "h": 36 },
+    "sourceSize": { "w": 47, "h": 36 },
+    "duration": 110
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 0, "y": 111, "w": 46, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 46, "h": 33 },
+    "sourceSize": { "w": 47, "h": 36 },
+    "duration": 110
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 47, "y": 111, "w": 46, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 46, "h": 33 },
+    "sourceSize": { "w": 47, "h": 36 },
+    "duration": 110
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 47, "y": 37, "w": 46, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 46, "h": 36 },
+    "sourceSize": { "w": 47, "h": 36 },
+    "duration": 110
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 94, "y": 37, "w": 46, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 46, "h": 36 },
+    "sourceSize": { "w": 47, "h": 36 },
+    "duration": 110
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 141, "y": 74, "w": 45, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 45, "h": 36 },
+    "sourceSize": { "w": 47, "h": 36 },
+    "duration": 110
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 144, "y": 0, "w": 46, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 46, "h": 36 },
+    "sourceSize": { "w": 47, "h": 36 },
+    "duration": 110
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 0, "y": 0, "w": 47, "h": 36 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 47, "h": 36 },
+    "sourceSize": { "w": 47, "h": 36 },
+    "duration": 110
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 0, "y": 37, "w": 46, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 46, "h": 36 },
+    "sourceSize": { "w": 47, "h": 36 },
+    "duration": 110
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 0, "y": 111, "w": 46, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 46, "h": 33 },
+    "sourceSize": { "w": 47, "h": 36 },
+    "duration": 110
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 47, "y": 111, "w": 46, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 46, "h": 33 },
+    "sourceSize": { "w": 47, "h": 36 },
+    "duration": 110
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 47, "y": 37, "w": 46, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 46, "h": 36 },
+    "sourceSize": { "w": 47, "h": 36 },
+    "duration": 110
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 94, "y": 37, "w": 46, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 46, "h": 36 },
+    "sourceSize": { "w": 47, "h": 36 },
+    "duration": 110
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 141, "y": 74, "w": 45, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 45, "h": 36 },
+    "sourceSize": { "w": 47, "h": 36 },
+    "duration": 110
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 144, "y": 0, "w": 46, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 46, "h": 36 },
+    "sourceSize": { "w": 47, "h": 36 },
+    "duration": 110
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 0, "y": 0, "w": 47, "h": 36 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 47, "h": 36 },
+    "sourceSize": { "w": 47, "h": 36 },
+    "duration": 110
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 0, "y": 37, "w": 46, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 46, "h": 36 },
+    "sourceSize": { "w": 47, "h": 36 },
+    "duration": 110
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 94, "y": 111, "w": 46, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 46, "h": 33 },
+    "sourceSize": { "w": 47, "h": 36 },
+    "duration": 110
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 141, "y": 111, "w": 46, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 46, "h": 33 },
+    "sourceSize": { "w": 47, "h": 36 },
+    "duration": 110
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 141, "y": 37, "w": 46, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 46, "h": 36 },
+    "sourceSize": { "w": 47, "h": 36 },
+    "duration": 110
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 188, "y": 37, "w": 46, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 46, "h": 36 },
+    "sourceSize": { "w": 47, "h": 36 },
+    "duration": 110
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 144, "y": 0, "w": 46, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 46, "h": 36 },
+    "sourceSize": { "w": 47, "h": 36 },
+    "duration": 110
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 48, "y": 0, "w": 47, "h": 36 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 47, "h": 36 },
+    "sourceSize": { "w": 47, "h": 36 },
+    "duration": 110
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 0, "y": 74, "w": 46, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 46, "h": 36 },
+    "sourceSize": { "w": 47, "h": 36 },
+    "duration": 110
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 188, "y": 111, "w": 46, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 46, "h": 33 },
+    "sourceSize": { "w": 47, "h": 36 },
+    "duration": 110
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 0, "y": 145, "w": 45, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 45, "h": 33 },
+    "sourceSize": { "w": 47, "h": 36 },
+    "duration": 110
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 96, "y": 0, "w": 47, "h": 36 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 47, "h": 36 },
+    "sourceSize": { "w": 47, "h": 36 },
+    "duration": 110
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 47, "y": 74, "w": 46, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 46, "h": 36 },
+    "sourceSize": { "w": 47, "h": 36 },
+    "duration": 110
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 94, "y": 74, "w": 46, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 46, "h": 36 },
+    "sourceSize": { "w": 47, "h": 36 },
+    "duration": 110
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 187, "y": 74, "w": 45, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 45, "h": 36 },
+    "sourceSize": { "w": 47, "h": 36 },
+    "duration": 110
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.11-x64",
+  "image": "702.png",
+  "format": "I8",
+  "size": { "w": 234, "h": 178 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/702.png b/public/images/pokemon/exp/702.png
index 9d042fd8293..1f1bd6b524f 100644
Binary files a/public/images/pokemon/exp/702.png and b/public/images/pokemon/exp/702.png differ
diff --git a/public/images/pokemon/exp/703.json b/public/images/pokemon/exp/703.json
deleted file mode 100644
index 75e52fdc904..00000000000
--- a/public/images/pokemon/exp/703.json
+++ /dev/null
@@ -1,356 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "703.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 120,
-				"h": 120
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 37,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 37,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 37,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 41,
-						"w": 37,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 37,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 37,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 41,
-						"w": 37,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 37,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 37,
-						"h": 40
-					},
-					"frame": {
-						"x": 37,
-						"y": 0,
-						"w": 37,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 37,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 37,
-						"h": 40
-					},
-					"frame": {
-						"x": 37,
-						"y": 0,
-						"w": 37,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 37,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 37,
-						"h": 40
-					},
-					"frame": {
-						"x": 37,
-						"y": 0,
-						"w": 37,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 37,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 37,
-						"h": 40
-					},
-					"frame": {
-						"x": 37,
-						"y": 0,
-						"w": 37,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 37,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 8,
-						"w": 37,
-						"h": 40
-					},
-					"frame": {
-						"x": 37,
-						"y": 0,
-						"w": 37,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 37,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 8,
-						"w": 37,
-						"h": 40
-					},
-					"frame": {
-						"x": 37,
-						"y": 0,
-						"w": 37,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 37,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 10,
-						"w": 37,
-						"h": 40
-					},
-					"frame": {
-						"x": 37,
-						"y": 0,
-						"w": 37,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 37,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 11,
-						"w": 37,
-						"h": 40
-					},
-					"frame": {
-						"x": 74,
-						"y": 0,
-						"w": 37,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 37,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 35,
-						"h": 41
-					},
-					"frame": {
-						"x": 37,
-						"y": 40,
-						"w": 35,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 37,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 35,
-						"h": 41
-					},
-					"frame": {
-						"x": 37,
-						"y": 40,
-						"w": 35,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 37,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 12,
-						"w": 35,
-						"h": 39
-					},
-					"frame": {
-						"x": 37,
-						"y": 81,
-						"w": 35,
-						"h": 39
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 37,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 40
-					},
-					"frame": {
-						"x": 72,
-						"y": 40,
-						"w": 37,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 37,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 7,
-						"w": 35,
-						"h": 40
-					},
-					"frame": {
-						"x": 72,
-						"y": 80,
-						"w": 35,
-						"h": 40
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:01a847d167639aeeb160ddd9a360a558:5e33077f4810fe91d17064ff7dd6bf4d:721af8c322ff60159262e9b3017c784d$"
-	}
-}
diff --git a/public/images/pokemon/exp/703.png b/public/images/pokemon/exp/703.png
deleted file mode 100644
index 5a0c63154ef..00000000000
Binary files a/public/images/pokemon/exp/703.png and /dev/null differ
diff --git a/public/images/pokemon/exp/704.json b/public/images/pokemon/exp/704.json
index 440a41ebbc5..8b429c0639e 100644
--- a/public/images/pokemon/exp/704.json
+++ b/public/images/pokemon/exp/704.json
@@ -1,1784 +1,371 @@
-{
-	"textures": [
-		{
-			"image": "704.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 288,
-				"h": 288
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0040.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 43,
-						"h": 48
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 43,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0045.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 43,
-						"h": 48
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 43,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0041.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 43,
-						"h": 48
-					},
-					"frame": {
-						"x": 0,
-						"y": 48,
-						"w": 43,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0044.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 43,
-						"h": 48
-					},
-					"frame": {
-						"x": 0,
-						"y": 48,
-						"w": 43,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0042.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 43,
-						"h": 48
-					},
-					"frame": {
-						"x": 0,
-						"y": 96,
-						"w": 43,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0043.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 43,
-						"h": 48
-					},
-					"frame": {
-						"x": 0,
-						"y": 96,
-						"w": 43,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0039.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 43,
-						"h": 47
-					},
-					"frame": {
-						"x": 0,
-						"y": 144,
-						"w": 43,
-						"h": 47
-					}
-				},
-				{
-					"filename": "0046.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 43,
-						"h": 47
-					},
-					"frame": {
-						"x": 0,
-						"y": 144,
-						"w": 43,
-						"h": 47
-					}
-				},
-				{
-					"filename": "0038.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 41,
-						"h": 46
-					},
-					"frame": {
-						"x": 0,
-						"y": 191,
-						"w": 41,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0047.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 41,
-						"h": 46
-					},
-					"frame": {
-						"x": 0,
-						"y": 191,
-						"w": 41,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0037.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 39,
-						"h": 45
-					},
-					"frame": {
-						"x": 0,
-						"y": 237,
-						"w": 39,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0048.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 39,
-						"h": 45
-					},
-					"frame": {
-						"x": 0,
-						"y": 237,
-						"w": 39,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 41,
-						"h": 44
-					},
-					"frame": {
-						"x": 39,
-						"y": 237,
-						"w": 41,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 41,
-						"h": 44
-					},
-					"frame": {
-						"x": 39,
-						"y": 237,
-						"w": 41,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0055.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 41,
-						"h": 44
-					},
-					"frame": {
-						"x": 39,
-						"y": 237,
-						"w": 41,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0072.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 41,
-						"h": 44
-					},
-					"frame": {
-						"x": 39,
-						"y": 237,
-						"w": 41,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 41,
-						"h": 44
-					},
-					"frame": {
-						"x": 41,
-						"y": 191,
-						"w": 41,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0080.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 41,
-						"h": 44
-					},
-					"frame": {
-						"x": 41,
-						"y": 191,
-						"w": 41,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0030.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 41,
-						"h": 44
-					},
-					"frame": {
-						"x": 80,
-						"y": 235,
-						"w": 41,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 42,
-						"h": 43
-					},
-					"frame": {
-						"x": 121,
-						"y": 0,
-						"w": 42,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0056.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 42,
-						"h": 43
-					},
-					"frame": {
-						"x": 121,
-						"y": 0,
-						"w": 42,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 4,
-						"w": 39,
-						"h": 44
-					},
-					"frame": {
-						"x": 82,
-						"y": 0,
-						"w": 39,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 4,
-						"w": 39,
-						"h": 44
-					},
-					"frame": {
-						"x": 82,
-						"y": 0,
-						"w": 39,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0071.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 4,
-						"w": 39,
-						"h": 44
-					},
-					"frame": {
-						"x": 82,
-						"y": 0,
-						"w": 39,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 4,
-						"w": 39,
-						"h": 44
-					},
-					"frame": {
-						"x": 43,
-						"y": 0,
-						"w": 39,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 42,
-						"h": 43
-					},
-					"frame": {
-						"x": 163,
-						"y": 0,
-						"w": 42,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 42,
-						"h": 43
-					},
-					"frame": {
-						"x": 163,
-						"y": 0,
-						"w": 42,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0029.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 42,
-						"h": 43
-					},
-					"frame": {
-						"x": 163,
-						"y": 0,
-						"w": 42,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0062.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 42,
-						"h": 43
-					},
-					"frame": {
-						"x": 163,
-						"y": 0,
-						"w": 42,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0079.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 42,
-						"h": 43
-					},
-					"frame": {
-						"x": 163,
-						"y": 0,
-						"w": 42,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0073.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 42,
-						"h": 43
-					},
-					"frame": {
-						"x": 205,
-						"y": 0,
-						"w": 42,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0063.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 41,
-						"h": 44
-					},
-					"frame": {
-						"x": 247,
-						"y": 0,
-						"w": 41,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 42,
-						"h": 42
-					},
-					"frame": {
-						"x": 121,
-						"y": 43,
-						"w": 42,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 42,
-						"h": 42
-					},
-					"frame": {
-						"x": 121,
-						"y": 43,
-						"w": 42,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 42,
-						"h": 42
-					},
-					"frame": {
-						"x": 121,
-						"y": 43,
-						"w": 42,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0028.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 42,
-						"h": 42
-					},
-					"frame": {
-						"x": 121,
-						"y": 43,
-						"w": 42,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0057.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 42,
-						"h": 42
-					},
-					"frame": {
-						"x": 121,
-						"y": 43,
-						"w": 42,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0061.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 42,
-						"h": 42
-					},
-					"frame": {
-						"x": 121,
-						"y": 43,
-						"w": 42,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0078.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 42,
-						"h": 42
-					},
-					"frame": {
-						"x": 121,
-						"y": 43,
-						"w": 42,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0031.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 4,
-						"w": 39,
-						"h": 44
-					},
-					"frame": {
-						"x": 82,
-						"y": 44,
-						"w": 39,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0054.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 4,
-						"w": 39,
-						"h": 44
-					},
-					"frame": {
-						"x": 82,
-						"y": 44,
-						"w": 39,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0064.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 4,
-						"w": 39,
-						"h": 44
-					},
-					"frame": {
-						"x": 43,
-						"y": 44,
-						"w": 39,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0081.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 4,
-						"w": 39,
-						"h": 44
-					},
-					"frame": {
-						"x": 43,
-						"y": 44,
-						"w": 39,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0074.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 42,
-						"h": 42
-					},
-					"frame": {
-						"x": 163,
-						"y": 43,
-						"w": 42,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 42,
-						"h": 41
-					},
-					"frame": {
-						"x": 205,
-						"y": 43,
-						"w": 42,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 42,
-						"h": 41
-					},
-					"frame": {
-						"x": 205,
-						"y": 43,
-						"w": 42,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0025.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 42,
-						"h": 41
-					},
-					"frame": {
-						"x": 205,
-						"y": 43,
-						"w": 42,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0027.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 42,
-						"h": 41
-					},
-					"frame": {
-						"x": 205,
-						"y": 43,
-						"w": 42,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0058.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 42,
-						"h": 41
-					},
-					"frame": {
-						"x": 205,
-						"y": 43,
-						"w": 42,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0060.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 42,
-						"h": 41
-					},
-					"frame": {
-						"x": 205,
-						"y": 43,
-						"w": 42,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0075.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 42,
-						"h": 41
-					},
-					"frame": {
-						"x": 205,
-						"y": 43,
-						"w": 42,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0077.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 42,
-						"h": 41
-					},
-					"frame": {
-						"x": 205,
-						"y": 43,
-						"w": 42,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 4,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 247,
-						"y": 44,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 8,
-						"w": 42,
-						"h": 40
-					},
-					"frame": {
-						"x": 205,
-						"y": 84,
-						"w": 42,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0026.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 8,
-						"w": 42,
-						"h": 40
-					},
-					"frame": {
-						"x": 205,
-						"y": 84,
-						"w": 42,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0059.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 8,
-						"w": 42,
-						"h": 40
-					},
-					"frame": {
-						"x": 205,
-						"y": 84,
-						"w": 42,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0032.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 4,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 247,
-						"y": 88,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0053.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 4,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 247,
-						"y": 88,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0049.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 4,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 43,
-						"y": 132,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0065.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 4,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 43,
-						"y": 88,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0082.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 4,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 43,
-						"y": 88,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 81,
-						"y": 132,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 81,
-						"y": 132,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0070.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 81,
-						"y": 132,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0036.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 81,
-						"y": 88,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 36,
-						"h": 44
-					},
-					"frame": {
-						"x": 82,
-						"y": 176,
-						"w": 36,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0069.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 36,
-						"h": 44
-					},
-					"frame": {
-						"x": 82,
-						"y": 176,
-						"w": 36,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0076.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 8,
-						"w": 42,
-						"h": 40
-					},
-					"frame": {
-						"x": 121,
-						"y": 85,
-						"w": 42,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 36,
-						"h": 44
-					},
-					"frame": {
-						"x": 163,
-						"y": 85,
-						"w": 36,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 36,
-						"h": 44
-					},
-					"frame": {
-						"x": 121,
-						"y": 125,
-						"w": 36,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0033.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 36,
-						"h": 44
-					},
-					"frame": {
-						"x": 199,
-						"y": 124,
-						"w": 36,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0052.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 36,
-						"h": 44
-					},
-					"frame": {
-						"x": 199,
-						"y": 124,
-						"w": 36,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0066.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 36,
-						"h": 44
-					},
-					"frame": {
-						"x": 157,
-						"y": 129,
-						"w": 36,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0083.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 36,
-						"h": 44
-					},
-					"frame": {
-						"x": 121,
-						"y": 169,
-						"w": 36,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 5,
-						"w": 36,
-						"h": 43
-					},
-					"frame": {
-						"x": 235,
-						"y": 132,
-						"w": 36,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0068.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 5,
-						"w": 36,
-						"h": 43
-					},
-					"frame": {
-						"x": 235,
-						"y": 132,
-						"w": 36,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 5,
-						"w": 36,
-						"h": 43
-					},
-					"frame": {
-						"x": 193,
-						"y": 168,
-						"w": 36,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 5,
-						"w": 36,
-						"h": 43
-					},
-					"frame": {
-						"x": 157,
-						"y": 173,
-						"w": 36,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0034.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 5,
-						"w": 36,
-						"h": 43
-					},
-					"frame": {
-						"x": 121,
-						"y": 213,
-						"w": 36,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0035.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 5,
-						"w": 36,
-						"h": 43
-					},
-					"frame": {
-						"x": 229,
-						"y": 175,
-						"w": 36,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0050.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 5,
-						"w": 36,
-						"h": 43
-					},
-					"frame": {
-						"x": 193,
-						"y": 211,
-						"w": 36,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0051.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 5,
-						"w": 36,
-						"h": 43
-					},
-					"frame": {
-						"x": 157,
-						"y": 216,
-						"w": 36,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0067.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 5,
-						"w": 36,
-						"h": 43
-					},
-					"frame": {
-						"x": 229,
-						"y": 218,
-						"w": 36,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0084.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 5,
-						"w": 36,
-						"h": 43
-					},
-					"frame": {
-						"x": 229,
-						"y": 218,
-						"w": 36,
-						"h": 43
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:695bd0c4059d0b12112a2e7a99e1d237:1f0a27b4d1a84460990b54c833ed8007:45bb13be23ae6e2a6654a2a00c450d62$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 0, "y": 0, "w": 26, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 26, "h": 34 },
+    "sourceSize": { "w": 28, "h": 34 },
+    "duration": 150
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 0, "y": 34, "w": 26, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 26, "h": 33 },
+    "sourceSize": { "w": 28, "h": 34 },
+    "duration": 150
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 78, "y": 0, "w": 28, "h": 31 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 28, "h": 31 },
+    "sourceSize": { "w": 28, "h": 34 },
+    "duration": 150
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 0, "y": 34, "w": 26, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 26, "h": 33 },
+    "sourceSize": { "w": 28, "h": 34 },
+    "duration": 150
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 0, "y": 0, "w": 26, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 26, "h": 34 },
+    "sourceSize": { "w": 28, "h": 34 },
+    "duration": 150
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 0, "y": 0, "w": 26, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 26, "h": 34 },
+    "sourceSize": { "w": 28, "h": 34 },
+    "duration": 150
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 78, "y": 62, "w": 26, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 26, "h": 32 },
+    "sourceSize": { "w": 28, "h": 34 },
+    "duration": 150
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 52, "y": 94, "w": 28, "h": 29 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 28, "h": 29 },
+    "sourceSize": { "w": 28, "h": 34 },
+    "duration": 150
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 78, "y": 62, "w": 26, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 26, "h": 32 },
+    "sourceSize": { "w": 28, "h": 34 },
+    "duration": 150
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 0, "y": 0, "w": 26, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 26, "h": 34 },
+    "sourceSize": { "w": 28, "h": 34 },
+    "duration": 150
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 0, "y": 0, "w": 26, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 26, "h": 34 },
+    "sourceSize": { "w": 28, "h": 34 },
+    "duration": 150
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 0, "y": 34, "w": 26, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 26, "h": 33 },
+    "sourceSize": { "w": 28, "h": 34 },
+    "duration": 150
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 78, "y": 0, "w": 28, "h": 31 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 28, "h": 31 },
+    "sourceSize": { "w": 28, "h": 34 },
+    "duration": 150
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 0, "y": 34, "w": 26, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 26, "h": 33 },
+    "sourceSize": { "w": 28, "h": 34 },
+    "duration": 150
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 0, "y": 0, "w": 26, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 26, "h": 34 },
+    "sourceSize": { "w": 28, "h": 34 },
+    "duration": 150
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 0, "y": 0, "w": 26, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 26, "h": 34 },
+    "sourceSize": { "w": 28, "h": 34 },
+    "duration": 150
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 78, "y": 62, "w": 26, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 26, "h": 32 },
+    "sourceSize": { "w": 28, "h": 34 },
+    "duration": 150
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 52, "y": 94, "w": 28, "h": 29 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 28, "h": 29 },
+    "sourceSize": { "w": 28, "h": 34 },
+    "duration": 150
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 78, "y": 62, "w": 26, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 26, "h": 32 },
+    "sourceSize": { "w": 28, "h": 34 },
+    "duration": 150
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 0, "y": 0, "w": 26, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 26, "h": 34 },
+    "sourceSize": { "w": 28, "h": 34 },
+    "duration": 150
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 0, "y": 0, "w": 26, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 26, "h": 34 },
+    "sourceSize": { "w": 28, "h": 34 },
+    "duration": 150
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 0, "y": 34, "w": 26, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 26, "h": 33 },
+    "sourceSize": { "w": 28, "h": 34 },
+    "duration": 150
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 78, "y": 0, "w": 28, "h": 31 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 28, "h": 31 },
+    "sourceSize": { "w": 28, "h": 34 },
+    "duration": 150
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 0, "y": 34, "w": 26, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 26, "h": 33 },
+    "sourceSize": { "w": 28, "h": 34 },
+    "duration": 150
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 0, "y": 0, "w": 26, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 26, "h": 34 },
+    "sourceSize": { "w": 28, "h": 34 },
+    "duration": 150
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 26, "y": 0, "w": 26, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 26, "h": 34 },
+    "sourceSize": { "w": 28, "h": 34 },
+    "duration": 150
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 0, "y": 67, "w": 26, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 26, "h": 32 },
+    "sourceSize": { "w": 28, "h": 34 },
+    "duration": 150
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 80, "y": 94, "w": 28, "h": 29 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 28, "h": 29 },
+    "sourceSize": { "w": 28, "h": 34 },
+    "duration": 150
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 78, "y": 62, "w": 26, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 26, "h": 32 },
+    "sourceSize": { "w": 28, "h": 34 },
+    "duration": 150
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 0, "y": 0, "w": 26, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 26, "h": 34 },
+    "sourceSize": { "w": 28, "h": 34 },
+    "duration": 150
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 0, "y": 0, "w": 26, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 26, "h": 34 },
+    "sourceSize": { "w": 28, "h": 34 },
+    "duration": 150
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 26, "y": 34, "w": 26, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 26, "h": 33 },
+    "sourceSize": { "w": 28, "h": 34 },
+    "duration": 150
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 78, "y": 31, "w": 28, "h": 31 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 28, "h": 31 },
+    "sourceSize": { "w": 28, "h": 34 },
+    "duration": 150
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 52, "y": 34, "w": 26, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 26, "h": 33 },
+    "sourceSize": { "w": 28, "h": 34 },
+    "duration": 150
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 52, "y": 0, "w": 26, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 26, "h": 34 },
+    "sourceSize": { "w": 28, "h": 34 },
+    "duration": 150
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 52, "y": 0, "w": 26, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 26, "h": 34 },
+    "sourceSize": { "w": 28, "h": 34 },
+    "duration": 150
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 26, "y": 67, "w": 26, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 26, "h": 32 },
+    "sourceSize": { "w": 28, "h": 34 },
+    "duration": 150
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 0, "y": 99, "w": 28, "h": 29 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 28, "h": 29 },
+    "sourceSize": { "w": 28, "h": 34 },
+    "duration": 150
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 78, "y": 62, "w": 26, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 26, "h": 32 },
+    "sourceSize": { "w": 28, "h": 34 },
+    "duration": 150
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 0, "y": 0, "w": 26, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 26, "h": 34 },
+    "sourceSize": { "w": 28, "h": 34 },
+    "duration": 150
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "704.png",
+  "format": "I8",
+  "size": { "w": 108, "h": 128 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/704.png b/public/images/pokemon/exp/704.png
index 2490591adf2..b85d8dfc3c0 100644
Binary files a/public/images/pokemon/exp/704.png and b/public/images/pokemon/exp/704.png differ
diff --git a/public/images/pokemon/exp/705.json b/public/images/pokemon/exp/705.json
index d710ef9e5eb..eecb83af45a 100644
--- a/public/images/pokemon/exp/705.json
+++ b/public/images/pokemon/exp/705.json
@@ -1,272 +1,596 @@
-{
-	"textures": [
-		{
-			"image": "705.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 154,
-				"h": 154
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 46,
-						"h": 58
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 46,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 46,
-						"h": 58
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 46,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 45,
-						"h": 58
-					},
-					"frame": {
-						"x": 46,
-						"y": 0,
-						"w": 45,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 45,
-						"h": 58
-					},
-					"frame": {
-						"x": 46,
-						"y": 0,
-						"w": 45,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 45,
-						"h": 58
-					},
-					"frame": {
-						"x": 91,
-						"y": 0,
-						"w": 45,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 42,
-						"h": 58
-					},
-					"frame": {
-						"x": 0,
-						"y": 58,
-						"w": 42,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 42,
-						"h": 58
-					},
-					"frame": {
-						"x": 0,
-						"y": 58,
-						"w": 42,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 58
-					},
-					"frame": {
-						"x": 42,
-						"y": 58,
-						"w": 41,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 58
-					},
-					"frame": {
-						"x": 42,
-						"y": 58,
-						"w": 41,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 36,
-						"h": 58
-					},
-					"frame": {
-						"x": 83,
-						"y": 58,
-						"w": 36,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 36,
-						"h": 58
-					},
-					"frame": {
-						"x": 83,
-						"y": 58,
-						"w": 36,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 58
-					},
-					"frame": {
-						"x": 119,
-						"y": 58,
-						"w": 35,
-						"h": 58
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:4bf155254b23c88780e7eee282256589:82bb727988054c3064e203b6908ff464:6b57e983626c7fc9144ab67f30c66814$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 38, "y": 186, "w": 40, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 40, "h": 60 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 78, "y": 189, "w": 40, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 40, "h": 59 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 77, "y": 304, "w": 39, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 7, "w": 39, "h": 57 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 197, "y": 246, "w": 41, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 8, "w": 41, "h": 56 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 158, "y": 302, "w": 41, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 9, "w": 41, "h": 55 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 155, "y": 246, "w": 42, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 9, "w": 42, "h": 55 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 199, "y": 302, "w": 41, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 9, "w": 41, "h": 55 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 77, "y": 248, "w": 41, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 41, "h": 56 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 118, "y": 301, "w": 40, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 40, "h": 57 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 38, "y": 246, "w": 39, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 5, "w": 39, "h": 59 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 0, "y": 253, "w": 37, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 37, "h": 60 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 0, "y": 191, "w": 38, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 38, "h": 62 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 118, "y": 189, "w": 37, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 37, "h": 63 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 0, "y": 64, "w": 39, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 39, "h": 63 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 194, "y": 184, "w": 39, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 39, "h": 62 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 156, "y": 120, "w": 40, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 61 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 38, "y": 186, "w": 40, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 40, "h": 60 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 78, "y": 189, "w": 40, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 40, "h": 59 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 77, "y": 304, "w": 39, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 7, "w": 39, "h": 57 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 197, "y": 246, "w": 41, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 8, "w": 41, "h": 56 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 158, "y": 302, "w": 41, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 9, "w": 41, "h": 55 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 155, "y": 246, "w": 42, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 9, "w": 42, "h": 55 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 199, "y": 302, "w": 41, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 9, "w": 41, "h": 55 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 77, "y": 248, "w": 41, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 41, "h": 56 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 118, "y": 301, "w": 40, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 40, "h": 57 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 38, "y": 246, "w": 39, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 5, "w": 39, "h": 59 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 0, "y": 253, "w": 37, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 37, "h": 60 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 0, "y": 191, "w": 38, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 38, "h": 62 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 118, "y": 189, "w": 37, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 37, "h": 63 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 0, "y": 64, "w": 39, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 39, "h": 63 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 194, "y": 184, "w": 39, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 39, "h": 62 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 156, "y": 120, "w": 40, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 61 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 38, "y": 186, "w": 40, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 40, "h": 60 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 78, "y": 189, "w": 40, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 40, "h": 59 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 77, "y": 304, "w": 39, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 7, "w": 39, "h": 57 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 197, "y": 246, "w": 41, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 8, "w": 41, "h": 56 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 158, "y": 302, "w": 41, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 9, "w": 41, "h": 55 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 155, "y": 246, "w": 42, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 9, "w": 42, "h": 55 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 199, "y": 302, "w": 41, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 9, "w": 41, "h": 55 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 77, "y": 248, "w": 41, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 41, "h": 56 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 118, "y": 301, "w": 40, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 40, "h": 57 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 38, "y": 246, "w": 39, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 5, "w": 39, "h": 59 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 0, "y": 253, "w": 37, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 37, "h": 60 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 0, "y": 191, "w": 38, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 38, "h": 62 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 118, "y": 189, "w": 37, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 37, "h": 63 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 0, "y": 64, "w": 39, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 39, "h": 63 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 194, "y": 184, "w": 39, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 39, "h": 62 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 156, "y": 120, "w": 40, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 61 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 159, "y": 0, "w": 41, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 41, "h": 60 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 39, "y": 125, "w": 40, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 61 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 200, "y": 60, "w": 39, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 39, "h": 63 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 39, "y": 62, "w": 39, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 39, "h": 63 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 79, "y": 125, "w": 38, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 38, "h": 64 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 117, "y": 125, "w": 38, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 38, "h": 64 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 0, "y": 127, "w": 38, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 38, "h": 64 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 0, "y": 0, "w": 39, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 39, "h": 64 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 78, "y": 62, "w": 39, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 39, "h": 63 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 117, "y": 62, "w": 39, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 39, "h": 63 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 155, "y": 181, "w": 39, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 39, "h": 62 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 119, "y": 0, "w": 40, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 40, "h": 62 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 79, "y": 0, "w": 40, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 40, "h": 62 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 39, "y": 0, "w": 40, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 40, "h": 62 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 196, "y": 123, "w": 40, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 61 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 200, "y": 0, "w": 41, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 41, "h": 60 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 159, "y": 60, "w": 41, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 41, "h": 60 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "705.png",
+  "format": "RGBA8888",
+  "size": { "w": 241, "h": 361 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/705.png b/public/images/pokemon/exp/705.png
index 670e8be5d51..0bd8323bcb4 100644
Binary files a/public/images/pokemon/exp/705.png and b/public/images/pokemon/exp/705.png differ
diff --git a/public/images/pokemon/exp/707.json b/public/images/pokemon/exp/707.json
deleted file mode 100644
index 253d37ed70a..00000000000
--- a/public/images/pokemon/exp/707.json
+++ /dev/null
@@ -1,1931 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "707.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 283,
-				"h": 283
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0033.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0059.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 39,
-						"h": 69
-					},
-					"frame": {
-						"x": 41,
-						"y": 0,
-						"w": 39,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0034.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 39,
-						"h": 69
-					},
-					"frame": {
-						"x": 41,
-						"y": 0,
-						"w": 39,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0060.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 39,
-						"h": 69
-					},
-					"frame": {
-						"x": 41,
-						"y": 0,
-						"w": 39,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 69
-					},
-					"frame": {
-						"x": 80,
-						"y": 0,
-						"w": 37,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0035.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 69
-					},
-					"frame": {
-						"x": 80,
-						"y": 0,
-						"w": 37,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0061.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 69
-					},
-					"frame": {
-						"x": 80,
-						"y": 0,
-						"w": 37,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 3,
-						"w": 42,
-						"h": 70
-					},
-					"frame": {
-						"x": 117,
-						"y": 0,
-						"w": 42,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0027.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 3,
-						"w": 42,
-						"h": 70
-					},
-					"frame": {
-						"x": 117,
-						"y": 0,
-						"w": 42,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0053.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 3,
-						"w": 42,
-						"h": 70
-					},
-					"frame": {
-						"x": 117,
-						"y": 0,
-						"w": 42,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0079.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 3,
-						"w": 42,
-						"h": 70
-					},
-					"frame": {
-						"x": 117,
-						"y": 0,
-						"w": 42,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 42,
-						"h": 70
-					},
-					"frame": {
-						"x": 159,
-						"y": 0,
-						"w": 42,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0028.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 42,
-						"h": 70
-					},
-					"frame": {
-						"x": 159,
-						"y": 0,
-						"w": 42,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0054.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 42,
-						"h": 70
-					},
-					"frame": {
-						"x": 159,
-						"y": 0,
-						"w": 42,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0080.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 3,
-						"w": 42,
-						"h": 70
-					},
-					"frame": {
-						"x": 159,
-						"y": 0,
-						"w": 42,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 44,
-						"h": 70
-					},
-					"frame": {
-						"x": 201,
-						"y": 0,
-						"w": 44,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0029.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 44,
-						"h": 70
-					},
-					"frame": {
-						"x": 201,
-						"y": 0,
-						"w": 44,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0055.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 44,
-						"h": 70
-					},
-					"frame": {
-						"x": 201,
-						"y": 0,
-						"w": 44,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 38,
-						"h": 70
-					},
-					"frame": {
-						"x": 245,
-						"y": 0,
-						"w": 38,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 3,
-						"w": 38,
-						"h": 70
-					},
-					"frame": {
-						"x": 245,
-						"y": 0,
-						"w": 38,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0039.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 38,
-						"h": 70
-					},
-					"frame": {
-						"x": 245,
-						"y": 0,
-						"w": 38,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0043.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 3,
-						"w": 38,
-						"h": 70
-					},
-					"frame": {
-						"x": 245,
-						"y": 0,
-						"w": 38,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0065.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 38,
-						"h": 70
-					},
-					"frame": {
-						"x": 245,
-						"y": 0,
-						"w": 38,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0069.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 3,
-						"w": 38,
-						"h": 70
-					},
-					"frame": {
-						"x": 245,
-						"y": 0,
-						"w": 38,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 44,
-						"h": 70
-					},
-					"frame": {
-						"x": 0,
-						"y": 69,
-						"w": 44,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0030.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 44,
-						"h": 70
-					},
-					"frame": {
-						"x": 0,
-						"y": 69,
-						"w": 44,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0056.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 44,
-						"h": 70
-					},
-					"frame": {
-						"x": 0,
-						"y": 69,
-						"w": 44,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 44,
-						"h": 70
-					},
-					"frame": {
-						"x": 44,
-						"y": 69,
-						"w": 44,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0032.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 44,
-						"h": 70
-					},
-					"frame": {
-						"x": 44,
-						"y": 69,
-						"w": 44,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0058.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 44,
-						"h": 70
-					},
-					"frame": {
-						"x": 44,
-						"y": 69,
-						"w": 44,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 38,
-						"h": 70
-					},
-					"frame": {
-						"x": 88,
-						"y": 70,
-						"w": 38,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 3,
-						"w": 38,
-						"h": 70
-					},
-					"frame": {
-						"x": 88,
-						"y": 70,
-						"w": 38,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0040.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 38,
-						"h": 70
-					},
-					"frame": {
-						"x": 88,
-						"y": 70,
-						"w": 38,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0042.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 3,
-						"w": 38,
-						"h": 70
-					},
-					"frame": {
-						"x": 88,
-						"y": 70,
-						"w": 38,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0066.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 38,
-						"h": 70
-					},
-					"frame": {
-						"x": 88,
-						"y": 70,
-						"w": 38,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0068.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 3,
-						"w": 38,
-						"h": 70
-					},
-					"frame": {
-						"x": 88,
-						"y": 70,
-						"w": 38,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 38,
-						"h": 70
-					},
-					"frame": {
-						"x": 126,
-						"y": 70,
-						"w": 38,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0041.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 38,
-						"h": 70
-					},
-					"frame": {
-						"x": 126,
-						"y": 70,
-						"w": 38,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0067.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 38,
-						"h": 70
-					},
-					"frame": {
-						"x": 126,
-						"y": 70,
-						"w": 38,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 0,
-						"w": 38,
-						"h": 70
-					},
-					"frame": {
-						"x": 164,
-						"y": 70,
-						"w": 38,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0047.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 0,
-						"w": 38,
-						"h": 70
-					},
-					"frame": {
-						"x": 164,
-						"y": 70,
-						"w": 38,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0073.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 0,
-						"w": 38,
-						"h": 70
-					},
-					"frame": {
-						"x": 164,
-						"y": 70,
-						"w": 38,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 0,
-						"w": 38,
-						"h": 70
-					},
-					"frame": {
-						"x": 202,
-						"y": 70,
-						"w": 38,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0048.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 0,
-						"w": 38,
-						"h": 70
-					},
-					"frame": {
-						"x": 202,
-						"y": 70,
-						"w": 38,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0074.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 0,
-						"w": 38,
-						"h": 70
-					},
-					"frame": {
-						"x": 202,
-						"y": 70,
-						"w": 38,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 0,
-						"w": 38,
-						"h": 70
-					},
-					"frame": {
-						"x": 240,
-						"y": 70,
-						"w": 38,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0049.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 0,
-						"w": 38,
-						"h": 70
-					},
-					"frame": {
-						"x": 240,
-						"y": 70,
-						"w": 38,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0075.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 0,
-						"w": 38,
-						"h": 70
-					},
-					"frame": {
-						"x": 240,
-						"y": 70,
-						"w": 38,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 0,
-						"w": 38,
-						"h": 70
-					},
-					"frame": {
-						"x": 0,
-						"y": 139,
-						"w": 38,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0050.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 0,
-						"w": 38,
-						"h": 70
-					},
-					"frame": {
-						"x": 0,
-						"y": 139,
-						"w": 38,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0076.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 0,
-						"w": 38,
-						"h": 70
-					},
-					"frame": {
-						"x": 0,
-						"y": 139,
-						"w": 38,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0025.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 1,
-						"w": 40,
-						"h": 70
-					},
-					"frame": {
-						"x": 38,
-						"y": 139,
-						"w": 40,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0051.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 1,
-						"w": 40,
-						"h": 70
-					},
-					"frame": {
-						"x": 38,
-						"y": 139,
-						"w": 40,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0077.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 1,
-						"w": 40,
-						"h": 70
-					},
-					"frame": {
-						"x": 38,
-						"y": 139,
-						"w": 40,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0026.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 2,
-						"w": 42,
-						"h": 70
-					},
-					"frame": {
-						"x": 78,
-						"y": 140,
-						"w": 42,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0052.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 2,
-						"w": 42,
-						"h": 70
-					},
-					"frame": {
-						"x": 78,
-						"y": 140,
-						"w": 42,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0078.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 2,
-						"w": 42,
-						"h": 70
-					},
-					"frame": {
-						"x": 78,
-						"y": 140,
-						"w": 42,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0084.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 1,
-						"w": 42,
-						"h": 70
-					},
-					"frame": {
-						"x": 78,
-						"y": 140,
-						"w": 42,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0086.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 1,
-						"w": 42,
-						"h": 70
-					},
-					"frame": {
-						"x": 78,
-						"y": 140,
-						"w": 42,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0088.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 1,
-						"w": 42,
-						"h": 70
-					},
-					"frame": {
-						"x": 78,
-						"y": 140,
-						"w": 42,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0090.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 1,
-						"w": 42,
-						"h": 70
-					},
-					"frame": {
-						"x": 78,
-						"y": 140,
-						"w": 42,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0082.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 1,
-						"w": 45,
-						"h": 70
-					},
-					"frame": {
-						"x": 120,
-						"y": 140,
-						"w": 45,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0083.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 1,
-						"w": 43,
-						"h": 70
-					},
-					"frame": {
-						"x": 165,
-						"y": 140,
-						"w": 43,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0087.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 1,
-						"w": 43,
-						"h": 70
-					},
-					"frame": {
-						"x": 165,
-						"y": 140,
-						"w": 43,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 45,
-						"h": 71
-					},
-					"frame": {
-						"x": 208,
-						"y": 140,
-						"w": 45,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0031.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 45,
-						"h": 71
-					},
-					"frame": {
-						"x": 208,
-						"y": 140,
-						"w": 45,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0057.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 45,
-						"h": 71
-					},
-					"frame": {
-						"x": 208,
-						"y": 140,
-						"w": 45,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 71
-					},
-					"frame": {
-						"x": 0,
-						"y": 209,
-						"w": 37,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0036.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 71
-					},
-					"frame": {
-						"x": 0,
-						"y": 209,
-						"w": 37,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0062.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 71
-					},
-					"frame": {
-						"x": 0,
-						"y": 209,
-						"w": 37,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 37,
-						"y": 209,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0037.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 37,
-						"y": 209,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0063.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 37,
-						"y": 209,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 75,
-						"y": 210,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0038.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 75,
-						"y": 210,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0064.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 75,
-						"y": 210,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 2,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 113,
-						"y": 210,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 1,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 113,
-						"y": 210,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 0,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 113,
-						"y": 210,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0044.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 2,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 113,
-						"y": 210,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0045.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 1,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 113,
-						"y": 210,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0046.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 0,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 113,
-						"y": 210,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0070.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 2,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 113,
-						"y": 210,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0071.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 1,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 113,
-						"y": 210,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0072.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 0,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 113,
-						"y": 210,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0081.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 2,
-						"w": 45,
-						"h": 71
-					},
-					"frame": {
-						"x": 151,
-						"y": 210,
-						"w": 45,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0085.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 1,
-						"w": 39,
-						"h": 71
-					},
-					"frame": {
-						"x": 196,
-						"y": 211,
-						"w": 39,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0089.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 1,
-						"w": 39,
-						"h": 71
-					},
-					"frame": {
-						"x": 196,
-						"y": 211,
-						"w": 39,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0091.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 2,
-						"w": 44,
-						"h": 71
-					},
-					"frame": {
-						"x": 235,
-						"y": 211,
-						"w": 44,
-						"h": 71
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:a13ec2d124f7e95263b088a395e9d780:8c9f0ed432d15fda1ebbfa6ff4063d39:8e96b9056ea81e44ced99c97f472a528$"
-	}
-}
diff --git a/public/images/pokemon/exp/707.png b/public/images/pokemon/exp/707.png
deleted file mode 100644
index 294d6e35e70..00000000000
Binary files a/public/images/pokemon/exp/707.png and /dev/null differ
diff --git a/public/images/pokemon/exp/708.png b/public/images/pokemon/exp/708.png
deleted file mode 100644
index f71cbaa535d..00000000000
Binary files a/public/images/pokemon/exp/708.png and /dev/null differ
diff --git a/public/images/pokemon/exp/712.json b/public/images/pokemon/exp/712.json
index 0e49da4d806..859fa54fc5c 100644
--- a/public/images/pokemon/exp/712.json
+++ b/public/images/pokemon/exp/712.json
@@ -1,2771 +1,1433 @@
-{
-	"textures": [
-		{
-			"image": "712.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 209,
-				"h": 209
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0037.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0038.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0055.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0056.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0073.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0074.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0091.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0092.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 44,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 44,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 44,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 44,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0039.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 44,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0040.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 44,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0057.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 44,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0058.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 44,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0075.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 44,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0076.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 44,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 88,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 88,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0031.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 88,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0032.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 88,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0049.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 88,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0050.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 88,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0067.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 88,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0068.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 88,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0085.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 88,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0086.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 88,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 132,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 132,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0033.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 132,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0034.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 132,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0051.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 132,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0052.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 132,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0069.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 132,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0070.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 132,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0087.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 132,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0088.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 132,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 38,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 38,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0035.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 38,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0036.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 38,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0053.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 38,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0054.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 38,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0071.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 38,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0072.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 38,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0089.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 38,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0090.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 38,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 38,
-						"h": 43
-					},
-					"frame": {
-						"x": 76,
-						"y": 0,
-						"w": 38,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 38,
-						"h": 43
-					},
-					"frame": {
-						"x": 76,
-						"y": 0,
-						"w": 38,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 38,
-						"h": 43
-					},
-					"frame": {
-						"x": 76,
-						"y": 0,
-						"w": 38,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 38,
-						"h": 43
-					},
-					"frame": {
-						"x": 76,
-						"y": 0,
-						"w": 38,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0041.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 38,
-						"h": 43
-					},
-					"frame": {
-						"x": 76,
-						"y": 0,
-						"w": 38,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0042.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 38,
-						"h": 43
-					},
-					"frame": {
-						"x": 76,
-						"y": 0,
-						"w": 38,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0059.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 38,
-						"h": 43
-					},
-					"frame": {
-						"x": 76,
-						"y": 0,
-						"w": 38,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0060.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 38,
-						"h": 43
-					},
-					"frame": {
-						"x": 76,
-						"y": 0,
-						"w": 38,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0077.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 38,
-						"h": 43
-					},
-					"frame": {
-						"x": 76,
-						"y": 0,
-						"w": 38,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0078.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 38,
-						"h": 43
-					},
-					"frame": {
-						"x": 76,
-						"y": 0,
-						"w": 38,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 38,
-						"h": 43
-					},
-					"frame": {
-						"x": 114,
-						"y": 0,
-						"w": 38,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 38,
-						"h": 43
-					},
-					"frame": {
-						"x": 114,
-						"y": 0,
-						"w": 38,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0025.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 38,
-						"h": 43
-					},
-					"frame": {
-						"x": 114,
-						"y": 0,
-						"w": 38,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0026.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 38,
-						"h": 43
-					},
-					"frame": {
-						"x": 114,
-						"y": 0,
-						"w": 38,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0043.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 38,
-						"h": 43
-					},
-					"frame": {
-						"x": 114,
-						"y": 0,
-						"w": 38,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0044.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 38,
-						"h": 43
-					},
-					"frame": {
-						"x": 114,
-						"y": 0,
-						"w": 38,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0061.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 38,
-						"h": 43
-					},
-					"frame": {
-						"x": 114,
-						"y": 0,
-						"w": 38,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0062.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 38,
-						"h": 43
-					},
-					"frame": {
-						"x": 114,
-						"y": 0,
-						"w": 38,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0079.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 38,
-						"h": 43
-					},
-					"frame": {
-						"x": 114,
-						"y": 0,
-						"w": 38,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0080.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 38,
-						"h": 43
-					},
-					"frame": {
-						"x": 114,
-						"y": 0,
-						"w": 38,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 38,
-						"h": 43
-					},
-					"frame": {
-						"x": 152,
-						"y": 0,
-						"w": 38,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 38,
-						"h": 43
-					},
-					"frame": {
-						"x": 152,
-						"y": 0,
-						"w": 38,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0027.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 38,
-						"h": 43
-					},
-					"frame": {
-						"x": 152,
-						"y": 0,
-						"w": 38,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0028.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 38,
-						"h": 43
-					},
-					"frame": {
-						"x": 152,
-						"y": 0,
-						"w": 38,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0045.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 38,
-						"h": 43
-					},
-					"frame": {
-						"x": 152,
-						"y": 0,
-						"w": 38,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0046.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 38,
-						"h": 43
-					},
-					"frame": {
-						"x": 152,
-						"y": 0,
-						"w": 38,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0063.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 38,
-						"h": 43
-					},
-					"frame": {
-						"x": 152,
-						"y": 0,
-						"w": 38,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0064.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 38,
-						"h": 43
-					},
-					"frame": {
-						"x": 152,
-						"y": 0,
-						"w": 38,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0081.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 38,
-						"h": 43
-					},
-					"frame": {
-						"x": 152,
-						"y": 0,
-						"w": 38,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0082.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 38,
-						"h": 43
-					},
-					"frame": {
-						"x": 152,
-						"y": 0,
-						"w": 38,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0093.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 38,
-						"h": 43
-					},
-					"frame": {
-						"x": 76,
-						"y": 43,
-						"w": 38,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0094.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 38,
-						"h": 43
-					},
-					"frame": {
-						"x": 76,
-						"y": 43,
-						"w": 38,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0131.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 38,
-						"h": 43
-					},
-					"frame": {
-						"x": 76,
-						"y": 43,
-						"w": 38,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 2,
-						"w": 38,
-						"h": 42
-					},
-					"frame": {
-						"x": 38,
-						"y": 44,
-						"w": 38,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 2,
-						"w": 38,
-						"h": 42
-					},
-					"frame": {
-						"x": 38,
-						"y": 44,
-						"w": 38,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0029.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 2,
-						"w": 38,
-						"h": 42
-					},
-					"frame": {
-						"x": 38,
-						"y": 44,
-						"w": 38,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0030.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 2,
-						"w": 38,
-						"h": 42
-					},
-					"frame": {
-						"x": 38,
-						"y": 44,
-						"w": 38,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0047.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 2,
-						"w": 38,
-						"h": 42
-					},
-					"frame": {
-						"x": 38,
-						"y": 44,
-						"w": 38,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0048.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 2,
-						"w": 38,
-						"h": 42
-					},
-					"frame": {
-						"x": 38,
-						"y": 44,
-						"w": 38,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0065.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 2,
-						"w": 38,
-						"h": 42
-					},
-					"frame": {
-						"x": 38,
-						"y": 44,
-						"w": 38,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0066.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 2,
-						"w": 38,
-						"h": 42
-					},
-					"frame": {
-						"x": 38,
-						"y": 44,
-						"w": 38,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0083.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 2,
-						"w": 38,
-						"h": 42
-					},
-					"frame": {
-						"x": 38,
-						"y": 44,
-						"w": 38,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0084.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 2,
-						"w": 38,
-						"h": 42
-					},
-					"frame": {
-						"x": 38,
-						"y": 44,
-						"w": 38,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0095.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 2,
-						"w": 38,
-						"h": 42
-					},
-					"frame": {
-						"x": 114,
-						"y": 43,
-						"w": 38,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0096.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 2,
-						"w": 38,
-						"h": 42
-					},
-					"frame": {
-						"x": 114,
-						"y": 43,
-						"w": 38,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0129.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 2,
-						"w": 38,
-						"h": 42
-					},
-					"frame": {
-						"x": 114,
-						"y": 43,
-						"w": 38,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0130.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 2,
-						"w": 38,
-						"h": 42
-					},
-					"frame": {
-						"x": 114,
-						"y": 43,
-						"w": 38,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0124.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 38,
-						"h": 42
-					},
-					"frame": {
-						"x": 152,
-						"y": 43,
-						"w": 38,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0125.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 38,
-						"h": 42
-					},
-					"frame": {
-						"x": 152,
-						"y": 43,
-						"w": 38,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0097.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 38,
-						"h": 41
-					},
-					"frame": {
-						"x": 114,
-						"y": 85,
-						"w": 38,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0127.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 38,
-						"h": 41
-					},
-					"frame": {
-						"x": 114,
-						"y": 85,
-						"w": 38,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0128.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 38,
-						"h": 41
-					},
-					"frame": {
-						"x": 114,
-						"y": 85,
-						"w": 38,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0098.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 38,
-						"h": 41
-					},
-					"frame": {
-						"x": 152,
-						"y": 85,
-						"w": 38,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0099.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 38,
-						"h": 41
-					},
-					"frame": {
-						"x": 152,
-						"y": 85,
-						"w": 38,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0126.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 38,
-						"h": 41
-					},
-					"frame": {
-						"x": 152,
-						"y": 85,
-						"w": 38,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0100.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 38,
-						"h": 41
-					},
-					"frame": {
-						"x": 38,
-						"y": 86,
-						"w": 38,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0101.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 38,
-						"h": 41
-					},
-					"frame": {
-						"x": 38,
-						"y": 86,
-						"w": 38,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0112.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 38,
-						"h": 41
-					},
-					"frame": {
-						"x": 38,
-						"y": 86,
-						"w": 38,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0113.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 38,
-						"h": 41
-					},
-					"frame": {
-						"x": 38,
-						"y": 86,
-						"w": 38,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0102.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 38,
-						"h": 41
-					},
-					"frame": {
-						"x": 76,
-						"y": 86,
-						"w": 38,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0103.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 38,
-						"h": 41
-					},
-					"frame": {
-						"x": 76,
-						"y": 86,
-						"w": 38,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0110.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 38,
-						"h": 41
-					},
-					"frame": {
-						"x": 76,
-						"y": 86,
-						"w": 38,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0111.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 38,
-						"h": 41
-					},
-					"frame": {
-						"x": 76,
-						"y": 86,
-						"w": 38,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0104.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 38,
-						"h": 41
-					},
-					"frame": {
-						"x": 38,
-						"y": 127,
-						"w": 38,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0105.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 38,
-						"h": 41
-					},
-					"frame": {
-						"x": 38,
-						"y": 127,
-						"w": 38,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0108.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 38,
-						"h": 41
-					},
-					"frame": {
-						"x": 38,
-						"y": 127,
-						"w": 38,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0109.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 38,
-						"h": 41
-					},
-					"frame": {
-						"x": 38,
-						"y": 127,
-						"w": 38,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0114.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 38,
-						"h": 41
-					},
-					"frame": {
-						"x": 38,
-						"y": 168,
-						"w": 38,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0115.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 38,
-						"h": 41
-					},
-					"frame": {
-						"x": 38,
-						"y": 168,
-						"w": 38,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0116.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 38,
-						"h": 41
-					},
-					"frame": {
-						"x": 76,
-						"y": 127,
-						"w": 38,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0117.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 38,
-						"h": 41
-					},
-					"frame": {
-						"x": 76,
-						"y": 127,
-						"w": 38,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0118.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 38,
-						"h": 41
-					},
-					"frame": {
-						"x": 76,
-						"y": 168,
-						"w": 38,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0119.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 38,
-						"h": 41
-					},
-					"frame": {
-						"x": 76,
-						"y": 168,
-						"w": 38,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0120.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 38,
-						"h": 41
-					},
-					"frame": {
-						"x": 114,
-						"y": 126,
-						"w": 38,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0121.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 38,
-						"h": 41
-					},
-					"frame": {
-						"x": 114,
-						"y": 126,
-						"w": 38,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0106.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 37,
-						"h": 41
-					},
-					"frame": {
-						"x": 114,
-						"y": 167,
-						"w": 37,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0107.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 37,
-						"h": 41
-					},
-					"frame": {
-						"x": 114,
-						"y": 167,
-						"w": 37,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0122.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 3,
-						"w": 37,
-						"h": 41
-					},
-					"frame": {
-						"x": 151,
-						"y": 167,
-						"w": 37,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0123.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 3,
-						"w": 37,
-						"h": 41
-					},
-					"frame": {
-						"x": 151,
-						"y": 167,
-						"w": 37,
-						"h": 41
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:144801e89f73b8a2d351aa5854b03ced:c8bd981e9dc030e1f41d7d7d0b7df029:3a1cc69824960d920ca43f8c9376d136$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 72, "y": 0, "w": 36, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 72, "y": 0, "w": 36, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 72, "y": 0, "w": 36, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 108, "y": 0, "w": 36, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 108, "y": 0, "w": 36, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 109, "y": 43, "w": 36, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 36, "h": 42 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 109, "y": 43, "w": 36, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 36, "h": 42 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 145, "y": 43, "w": 36, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 36, "h": 42 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 145, "y": 43, "w": 36, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 36, "h": 42 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 0, "y": 44, "w": 36, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 36, "h": 42 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 0, "y": 44, "w": 36, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 36, "h": 42 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 72, "y": 84, "w": 36, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 36, "h": 41 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 72, "y": 84, "w": 36, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 36, "h": 41 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 144, "y": 0, "w": 36, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 36, "h": 43 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 144, "y": 0, "w": 36, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 36, "h": 43 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 0, "y": 0, "w": 36, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 36, "h": 44 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 0, "y": 0, "w": 36, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 36, "h": 44 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 36, "y": 0, "w": 36, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 36, "h": 44 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 36, "y": 0, "w": 36, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 36, "h": 44 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 72, "y": 0, "w": 36, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 72, "y": 0, "w": 36, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 72, "y": 0, "w": 36, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 72, "y": 0, "w": 36, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 72, "y": 0, "w": 36, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 72, "y": 0, "w": 36, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 108, "y": 0, "w": 36, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 108, "y": 0, "w": 36, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 109, "y": 43, "w": 36, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 36, "h": 42 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 109, "y": 43, "w": 36, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 36, "h": 42 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 145, "y": 43, "w": 36, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 36, "h": 42 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 145, "y": 43, "w": 36, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 36, "h": 42 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 0, "y": 44, "w": 36, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 36, "h": 42 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 0, "y": 44, "w": 36, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 36, "h": 42 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 72, "y": 84, "w": 36, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 36, "h": 41 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 72, "y": 84, "w": 36, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 36, "h": 41 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 144, "y": 0, "w": 36, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 36, "h": 43 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 144, "y": 0, "w": 36, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 36, "h": 43 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 0, "y": 0, "w": 36, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 36, "h": 44 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 0, "y": 0, "w": 36, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 36, "h": 44 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 36, "y": 0, "w": 36, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 36, "h": 44 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 36, "y": 0, "w": 36, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 36, "h": 44 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 72, "y": 0, "w": 36, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 72, "y": 0, "w": 36, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 72, "y": 0, "w": 36, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 72, "y": 0, "w": 36, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 72, "y": 0, "w": 36, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 72, "y": 0, "w": 36, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 108, "y": 0, "w": 36, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 108, "y": 0, "w": 36, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 109, "y": 43, "w": 36, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 36, "h": 42 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 109, "y": 43, "w": 36, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 36, "h": 42 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 145, "y": 43, "w": 36, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 36, "h": 42 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 145, "y": 43, "w": 36, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 36, "h": 42 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 0, "y": 44, "w": 36, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 36, "h": 42 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 0, "y": 44, "w": 36, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 36, "h": 42 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 72, "y": 84, "w": 36, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 36, "h": 41 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 72, "y": 84, "w": 36, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 36, "h": 41 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 144, "y": 0, "w": 36, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 36, "h": 43 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 144, "y": 0, "w": 36, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 36, "h": 43 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 0, "y": 0, "w": 36, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 36, "h": 44 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 0, "y": 0, "w": 36, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 36, "h": 44 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 36, "y": 0, "w": 36, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 36, "h": 44 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 36, "y": 0, "w": 36, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 36, "h": 44 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 72, "y": 0, "w": 36, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 72, "y": 0, "w": 36, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 72, "y": 0, "w": 36, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 72, "y": 0, "w": 36, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 72, "y": 0, "w": 36, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 72, "y": 0, "w": 36, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 108, "y": 0, "w": 36, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 108, "y": 0, "w": 36, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 109, "y": 43, "w": 36, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 36, "h": 42 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 109, "y": 43, "w": 36, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 36, "h": 42 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 145, "y": 43, "w": 36, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 36, "h": 42 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 145, "y": 43, "w": 36, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 36, "h": 42 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 0, "y": 44, "w": 36, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 36, "h": 42 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 0, "y": 44, "w": 36, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 36, "h": 42 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 72, "y": 84, "w": 36, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 36, "h": 41 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 72, "y": 84, "w": 36, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 36, "h": 41 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 144, "y": 0, "w": 36, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 36, "h": 43 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 144, "y": 0, "w": 36, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 36, "h": 43 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 0, "y": 0, "w": 36, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 36, "h": 44 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 0, "y": 0, "w": 36, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 36, "h": 44 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 36, "y": 0, "w": 36, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 36, "h": 44 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 36, "y": 0, "w": 36, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 36, "h": 44 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 72, "y": 0, "w": 36, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 72, "y": 0, "w": 36, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0088.png",
+    "frame": { "x": 72, "y": 0, "w": 36, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0089.png",
+    "frame": { "x": 72, "y": 0, "w": 36, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0090.png",
+    "frame": { "x": 72, "y": 0, "w": 36, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0091.png",
+    "frame": { "x": 72, "y": 0, "w": 36, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0092.png",
+    "frame": { "x": 108, "y": 0, "w": 36, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0093.png",
+    "frame": { "x": 108, "y": 0, "w": 36, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0094.png",
+    "frame": { "x": 109, "y": 43, "w": 36, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 36, "h": 42 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0095.png",
+    "frame": { "x": 109, "y": 43, "w": 36, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 36, "h": 42 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0096.png",
+    "frame": { "x": 145, "y": 43, "w": 36, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 36, "h": 42 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0097.png",
+    "frame": { "x": 145, "y": 43, "w": 36, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 36, "h": 42 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0098.png",
+    "frame": { "x": 0, "y": 44, "w": 36, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 36, "h": 42 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0099.png",
+    "frame": { "x": 0, "y": 44, "w": 36, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 36, "h": 42 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0100.png",
+    "frame": { "x": 72, "y": 84, "w": 36, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 36, "h": 41 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0101.png",
+    "frame": { "x": 72, "y": 84, "w": 36, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 36, "h": 41 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0102.png",
+    "frame": { "x": 144, "y": 0, "w": 36, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 36, "h": 43 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0103.png",
+    "frame": { "x": 144, "y": 0, "w": 36, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 36, "h": 43 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0104.png",
+    "frame": { "x": 0, "y": 0, "w": 36, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 36, "h": 44 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0105.png",
+    "frame": { "x": 0, "y": 0, "w": 36, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 36, "h": 44 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0106.png",
+    "frame": { "x": 36, "y": 0, "w": 36, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 36, "h": 44 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0107.png",
+    "frame": { "x": 36, "y": 0, "w": 36, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 36, "h": 44 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0108.png",
+    "frame": { "x": 72, "y": 0, "w": 36, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0109.png",
+    "frame": { "x": 72, "y": 0, "w": 36, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0110.png",
+    "frame": { "x": 72, "y": 0, "w": 36, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0111.png",
+    "frame": { "x": 72, "y": 0, "w": 36, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0112.png",
+    "frame": { "x": 72, "y": 0, "w": 36, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0113.png",
+    "frame": { "x": 72, "y": 0, "w": 36, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0114.png",
+    "frame": { "x": 36, "y": 44, "w": 36, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 36, "h": 42 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0115.png",
+    "frame": { "x": 36, "y": 44, "w": 36, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 36, "h": 42 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0116.png",
+    "frame": { "x": 108, "y": 85, "w": 36, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 36, "h": 41 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0117.png",
+    "frame": { "x": 108, "y": 85, "w": 36, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 36, "h": 41 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0118.png",
+    "frame": { "x": 144, "y": 85, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 36, "h": 40 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0119.png",
+    "frame": { "x": 144, "y": 85, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 36, "h": 40 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0120.png",
+    "frame": { "x": 0, "y": 86, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 36, "h": 40 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0121.png",
+    "frame": { "x": 0, "y": 86, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 36, "h": 40 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0122.png",
+    "frame": { "x": 0, "y": 86, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 36, "h": 40 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0123.png",
+    "frame": { "x": 0, "y": 86, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 36, "h": 40 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0124.png",
+    "frame": { "x": 36, "y": 86, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 36, "h": 40 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0125.png",
+    "frame": { "x": 36, "y": 86, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 36, "h": 40 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0126.png",
+    "frame": { "x": 72, "y": 125, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 36, "h": 40 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0127.png",
+    "frame": { "x": 72, "y": 125, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 36, "h": 40 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0128.png",
+    "frame": { "x": 144, "y": 125, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 36, "h": 40 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0129.png",
+    "frame": { "x": 144, "y": 125, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 36, "h": 40 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0130.png",
+    "frame": { "x": 0, "y": 126, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 36, "h": 40 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0131.png",
+    "frame": { "x": 0, "y": 126, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 36, "h": 40 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0132.png",
+    "frame": { "x": 144, "y": 125, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 36, "h": 40 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0133.png",
+    "frame": { "x": 144, "y": 125, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 36, "h": 40 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0134.png",
+    "frame": { "x": 72, "y": 125, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 36, "h": 40 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0135.png",
+    "frame": { "x": 72, "y": 125, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 36, "h": 40 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0136.png",
+    "frame": { "x": 36, "y": 86, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 36, "h": 40 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0137.png",
+    "frame": { "x": 36, "y": 86, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 36, "h": 40 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0138.png",
+    "frame": { "x": 36, "y": 126, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 36, "h": 40 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0139.png",
+    "frame": { "x": 36, "y": 126, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 36, "h": 40 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0140.png",
+    "frame": { "x": 108, "y": 126, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 36, "h": 40 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0141.png",
+    "frame": { "x": 108, "y": 126, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 36, "h": 40 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0142.png",
+    "frame": { "x": 72, "y": 165, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 36, "h": 40 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0143.png",
+    "frame": { "x": 72, "y": 165, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 36, "h": 40 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0144.png",
+    "frame": { "x": 144, "y": 165, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 36, "h": 40 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0145.png",
+    "frame": { "x": 144, "y": 165, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 36, "h": 40 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0146.png",
+    "frame": { "x": 0, "y": 166, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 4, "w": 36, "h": 40 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0147.png",
+    "frame": { "x": 0, "y": 166, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 4, "w": 36, "h": 40 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0148.png",
+    "frame": { "x": 72, "y": 43, "w": 37, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 37, "h": 41 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0149.png",
+    "frame": { "x": 72, "y": 43, "w": 37, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 37, "h": 41 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0150.png",
+    "frame": { "x": 0, "y": 86, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 36, "h": 40 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0151.png",
+    "frame": { "x": 0, "y": 86, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 36, "h": 40 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0152.png",
+    "frame": { "x": 0, "y": 86, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 36, "h": 40 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0153.png",
+    "frame": { "x": 144, "y": 85, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 36, "h": 40 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0154.png",
+    "frame": { "x": 144, "y": 85, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 36, "h": 40 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0155.png",
+    "frame": { "x": 108, "y": 85, "w": 36, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 36, "h": 41 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0156.png",
+    "frame": { "x": 108, "y": 85, "w": 36, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 36, "h": 41 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0157.png",
+    "frame": { "x": 36, "y": 44, "w": 36, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 36, "h": 42 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0158.png",
+    "frame": { "x": 36, "y": 44, "w": 36, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 36, "h": 42 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.11-x64",
+  "image": "712.png",
+  "format": "I8",
+  "size": { "w": 181, "h": 206 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/712.png b/public/images/pokemon/exp/712.png
index cd40c2e5c9b..1726f22f7b8 100644
Binary files a/public/images/pokemon/exp/712.png and b/public/images/pokemon/exp/712.png differ
diff --git a/public/images/pokemon/exp/713.json b/public/images/pokemon/exp/713.json
index 7c5c6b565e4..f4fcfa1ff85 100644
--- a/public/images/pokemon/exp/713.json
+++ b/public/images/pokemon/exp/713.json
@@ -1,146 +1,1100 @@
-{
-	"textures": [
-		{
-			"image": "713.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 174,
-				"h": 174
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 87,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 87,
-						"h": 71
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 87,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 87,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 87,
-						"h": 72
-					},
-					"frame": {
-						"x": 87,
-						"y": 0,
-						"w": 87,
-						"h": 72
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 87,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 87,
-						"h": 72
-					},
-					"frame": {
-						"x": 87,
-						"y": 0,
-						"w": 87,
-						"h": 72
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 87,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 87,
-						"h": 73
-					},
-					"frame": {
-						"x": 0,
-						"y": 71,
-						"w": 87,
-						"h": 73
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 87,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 87,
-						"h": 73
-					},
-					"frame": {
-						"x": 0,
-						"y": 71,
-						"w": 87,
-						"h": 73
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 87,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 87,
-						"h": 73
-					},
-					"frame": {
-						"x": 87,
-						"y": 72,
-						"w": 87,
-						"h": 73
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:11a7176e3fe76c2e9fc09061688f4db6:8fdb4357b8a1808fc8dcdc5a29bec720:625f70bcfe9c7f2437cb9cad6d2b863c$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 166, "y": 64, "w": 83, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 63 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 249, "y": 64, "w": 83, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 63 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 332, "y": 126, "w": 83, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 83, "h": 62 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 166, "y": 127, "w": 83, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 83, "h": 62 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 0, "y": 128, "w": 83, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 83, "h": 61 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 83, "y": 128, "w": 83, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 83, "h": 61 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 83, "y": 128, "w": 83, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 83, "h": 61 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 83, "y": 128, "w": 83, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 83, "h": 61 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 0, "y": 128, "w": 83, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 83, "h": 61 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 166, "y": 127, "w": 83, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 83, "h": 62 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 332, "y": 126, "w": 83, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 83, "h": 62 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 249, "y": 64, "w": 83, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 63 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 166, "y": 64, "w": 83, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 63 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 166, "y": 0, "w": 83, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 83, "h": 64 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 249, "y": 0, "w": 83, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 83, "h": 64 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 0, "y": 0, "w": 83, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 83, "h": 65 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 83, "y": 0, "w": 83, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 83, "h": 65 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 83, "y": 0, "w": 83, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 83, "h": 65 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 83, "y": 0, "w": 83, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 83, "h": 65 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 83, "y": 0, "w": 83, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 83, "h": 65 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 0, "y": 0, "w": 83, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 83, "h": 65 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 249, "y": 0, "w": 83, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 83, "h": 64 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 166, "y": 0, "w": 83, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 83, "h": 64 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 166, "y": 64, "w": 83, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 63 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 249, "y": 64, "w": 83, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 63 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 332, "y": 126, "w": 83, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 83, "h": 62 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 166, "y": 127, "w": 83, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 83, "h": 62 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 0, "y": 128, "w": 83, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 83, "h": 61 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 83, "y": 128, "w": 83, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 83, "h": 61 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 83, "y": 128, "w": 83, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 83, "h": 61 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 83, "y": 128, "w": 83, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 83, "h": 61 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 0, "y": 128, "w": 83, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 83, "h": 61 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 166, "y": 127, "w": 83, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 83, "h": 62 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 332, "y": 126, "w": 83, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 83, "h": 62 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 249, "y": 64, "w": 83, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 63 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 166, "y": 64, "w": 83, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 63 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 166, "y": 0, "w": 83, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 83, "h": 64 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 249, "y": 0, "w": 83, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 83, "h": 64 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 0, "y": 0, "w": 83, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 83, "h": 65 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 83, "y": 0, "w": 83, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 83, "h": 65 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 83, "y": 0, "w": 83, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 83, "h": 65 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 83, "y": 0, "w": 83, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 83, "h": 65 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 83, "y": 0, "w": 83, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 83, "h": 65 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 0, "y": 0, "w": 83, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 83, "h": 65 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 249, "y": 0, "w": 83, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 83, "h": 64 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 166, "y": 0, "w": 83, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 83, "h": 64 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 166, "y": 64, "w": 83, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 63 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 249, "y": 64, "w": 83, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 63 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 332, "y": 126, "w": 83, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 83, "h": 62 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 166, "y": 127, "w": 83, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 83, "h": 62 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 0, "y": 128, "w": 83, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 83, "h": 61 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 83, "y": 128, "w": 83, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 83, "h": 61 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 83, "y": 128, "w": 83, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 83, "h": 61 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 83, "y": 128, "w": 83, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 83, "h": 61 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 0, "y": 128, "w": 83, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 83, "h": 61 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 166, "y": 127, "w": 83, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 83, "h": 62 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 332, "y": 126, "w": 83, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 83, "h": 62 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 249, "y": 64, "w": 83, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 63 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 166, "y": 64, "w": 83, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 63 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 166, "y": 0, "w": 83, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 83, "h": 64 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 249, "y": 0, "w": 83, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 83, "h": 64 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 0, "y": 0, "w": 83, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 83, "h": 65 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 83, "y": 0, "w": 83, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 83, "h": 65 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 83, "y": 0, "w": 83, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 83, "h": 65 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 83, "y": 0, "w": 83, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 83, "h": 65 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 83, "y": 0, "w": 83, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 83, "h": 65 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 0, "y": 0, "w": 83, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 83, "h": 65 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 249, "y": 0, "w": 83, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 83, "h": 64 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 166, "y": 0, "w": 83, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 83, "h": 64 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 166, "y": 64, "w": 83, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 63 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 249, "y": 64, "w": 83, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 63 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 332, "y": 126, "w": 83, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 83, "h": 62 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 166, "y": 127, "w": 83, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 83, "h": 62 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 0, "y": 128, "w": 83, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 83, "h": 61 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 83, "y": 128, "w": 83, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 83, "h": 61 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 83, "y": 128, "w": 83, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 83, "h": 61 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 83, "y": 128, "w": 83, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 83, "h": 61 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 0, "y": 128, "w": 83, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 83, "h": 61 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 166, "y": 127, "w": 83, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 83, "h": 62 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 332, "y": 126, "w": 83, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 83, "h": 62 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 249, "y": 64, "w": 83, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 63 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 166, "y": 64, "w": 83, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 63 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 166, "y": 0, "w": 83, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 83, "h": 64 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 249, "y": 0, "w": 83, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 83, "h": 64 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 0, "y": 0, "w": 83, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 83, "h": 65 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 83, "y": 0, "w": 83, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 83, "h": 65 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 83, "y": 0, "w": 83, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 83, "h": 65 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0088.png",
+    "frame": { "x": 83, "y": 0, "w": 83, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 83, "h": 65 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0089.png",
+    "frame": { "x": 83, "y": 0, "w": 83, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 83, "h": 65 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0090.png",
+    "frame": { "x": 0, "y": 0, "w": 83, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 83, "h": 65 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0091.png",
+    "frame": { "x": 249, "y": 0, "w": 83, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 83, "h": 64 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0092.png",
+    "frame": { "x": 166, "y": 0, "w": 83, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 83, "h": 64 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0093.png",
+    "frame": { "x": 166, "y": 0, "w": 83, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 83, "h": 64 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0094.png",
+    "frame": { "x": 0, "y": 65, "w": 83, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 63 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0095.png",
+    "frame": { "x": 0, "y": 65, "w": 83, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 63 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0096.png",
+    "frame": { "x": 0, "y": 65, "w": 83, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 63 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0097.png",
+    "frame": { "x": 0, "y": 65, "w": 83, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 63 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0098.png",
+    "frame": { "x": 83, "y": 65, "w": 83, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 63 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0099.png",
+    "frame": { "x": 83, "y": 65, "w": 83, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 63 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0100.png",
+    "frame": { "x": 332, "y": 0, "w": 84, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 84, "h": 63 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0101.png",
+    "frame": { "x": 332, "y": 0, "w": 84, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 84, "h": 63 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0102.png",
+    "frame": { "x": 332, "y": 63, "w": 84, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 84, "h": 63 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0103.png",
+    "frame": { "x": 332, "y": 63, "w": 84, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 84, "h": 63 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0104.png",
+    "frame": { "x": 332, "y": 63, "w": 84, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 84, "h": 63 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0105.png",
+    "frame": { "x": 332, "y": 63, "w": 84, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 84, "h": 63 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0106.png",
+    "frame": { "x": 332, "y": 0, "w": 84, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 84, "h": 63 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0107.png",
+    "frame": { "x": 0, "y": 65, "w": 83, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 83, "h": 63 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0108.png",
+    "frame": { "x": 0, "y": 65, "w": 83, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 83, "h": 63 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0109.png",
+    "frame": { "x": 249, "y": 127, "w": 83, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 62 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0110.png",
+    "frame": { "x": 249, "y": 127, "w": 83, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 62 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0111.png",
+    "frame": { "x": 332, "y": 188, "w": 83, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 59 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0112.png",
+    "frame": { "x": 332, "y": 188, "w": 83, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 59 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0113.png",
+    "frame": { "x": 0, "y": 189, "w": 83, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 58 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0114.png",
+    "frame": { "x": 0, "y": 189, "w": 83, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 58 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0115.png",
+    "frame": { "x": 0, "y": 189, "w": 83, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 58 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0116.png",
+    "frame": { "x": 0, "y": 189, "w": 83, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 58 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0117.png",
+    "frame": { "x": 332, "y": 188, "w": 83, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 59 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0118.png",
+    "frame": { "x": 0, "y": 65, "w": 83, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 83, "h": 63 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0119.png",
+    "frame": { "x": 0, "y": 65, "w": 83, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 83, "h": 63 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0120.png",
+    "frame": { "x": 0, "y": 65, "w": 83, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 83, "h": 63 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0121.png",
+    "frame": { "x": 0, "y": 65, "w": 83, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 63 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.11-x64",
+  "image": "713.png",
+  "format": "I8",
+  "size": { "w": 416, "h": 247 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/713.png b/public/images/pokemon/exp/713.png
index 0452b1989a1..2d0b8477262 100644
Binary files a/public/images/pokemon/exp/713.png and b/public/images/pokemon/exp/713.png differ
diff --git a/public/images/pokemon/exp/714.json b/public/images/pokemon/exp/714.json
deleted file mode 100644
index 7deaf1909af..00000000000
--- a/public/images/pokemon/exp/714.json
+++ /dev/null
@@ -1,314 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "714.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 179,
-				"h": 179
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 64,
-						"h": 63
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 63,
-						"h": 60
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 63,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 64,
-						"h": 63
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 63,
-						"h": 60
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 63,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 64,
-						"h": 63
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 64,
-						"h": 59
-					},
-					"frame": {
-						"x": 0,
-						"y": 60,
-						"w": 64,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 64,
-						"h": 63
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 64,
-						"h": 59
-					},
-					"frame": {
-						"x": 0,
-						"y": 60,
-						"w": 64,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 64,
-						"h": 63
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 64,
-						"h": 58
-					},
-					"frame": {
-						"x": 63,
-						"y": 0,
-						"w": 64,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 64,
-						"h": 63
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 0,
-						"w": 60,
-						"h": 61
-					},
-					"frame": {
-						"x": 64,
-						"y": 58,
-						"w": 60,
-						"h": 61
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 64,
-						"h": 63
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 0,
-						"w": 60,
-						"h": 61
-					},
-					"frame": {
-						"x": 64,
-						"y": 58,
-						"w": 60,
-						"h": 61
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 64,
-						"h": 63
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 54,
-						"h": 58
-					},
-					"frame": {
-						"x": 124,
-						"y": 58,
-						"w": 54,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 64,
-						"h": 63
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 54,
-						"h": 58
-					},
-					"frame": {
-						"x": 124,
-						"y": 58,
-						"w": 54,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 64,
-						"h": 63
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 54,
-						"h": 58
-					},
-					"frame": {
-						"x": 124,
-						"y": 116,
-						"w": 54,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 64,
-						"h": 63
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 2,
-						"w": 60,
-						"h": 60
-					},
-					"frame": {
-						"x": 0,
-						"y": 119,
-						"w": 60,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 64,
-						"h": 63
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 2,
-						"w": 60,
-						"h": 60
-					},
-					"frame": {
-						"x": 0,
-						"y": 119,
-						"w": 60,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 64,
-						"h": 63
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 56,
-						"h": 60
-					},
-					"frame": {
-						"x": 60,
-						"y": 119,
-						"w": 56,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 64,
-						"h": 63
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 56,
-						"h": 60
-					},
-					"frame": {
-						"x": 60,
-						"y": 119,
-						"w": 56,
-						"h": 60
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:585d7099ac8249026b274a63ac9c25f0:8d770fdec6c3922ce9cc2e04a6453388:1a07d46e710b0568ec824f54fbc4fe6a$"
-	}
-}
diff --git a/public/images/pokemon/exp/714.png b/public/images/pokemon/exp/714.png
deleted file mode 100644
index 21c184bf476..00000000000
Binary files a/public/images/pokemon/exp/714.png and /dev/null differ
diff --git a/public/images/pokemon/exp/715.png b/public/images/pokemon/exp/715.png
index 58f093d089a..3967da0f1b9 100644
Binary files a/public/images/pokemon/exp/715.png and b/public/images/pokemon/exp/715.png differ
diff --git a/public/images/pokemon/exp/718-10.json b/public/images/pokemon/exp/718-10.json
deleted file mode 100644
index f387823bf4c..00000000000
--- a/public/images/pokemon/exp/718-10.json
+++ /dev/null
@@ -1,692 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "718-10.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 239,
-				"h": 239
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0028.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 61,
-						"h": 65
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 61,
-						"h": 65
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 0,
-						"w": 59,
-						"h": 67
-					},
-					"frame": {
-						"x": 0,
-						"y": 65,
-						"w": 59,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 0,
-						"w": 59,
-						"h": 67
-					},
-					"frame": {
-						"x": 0,
-						"y": 65,
-						"w": 59,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 0,
-						"w": 59,
-						"h": 67
-					},
-					"frame": {
-						"x": 0,
-						"y": 65,
-						"w": 59,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0029.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 64,
-						"h": 61
-					},
-					"frame": {
-						"x": 0,
-						"y": 132,
-						"w": 64,
-						"h": 61
-					}
-				},
-				{
-					"filename": "0030.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 65,
-						"h": 60
-					},
-					"frame": {
-						"x": 59,
-						"y": 65,
-						"w": 65,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 59,
-						"h": 65
-					},
-					"frame": {
-						"x": 61,
-						"y": 0,
-						"w": 59,
-						"h": 65
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 59,
-						"h": 65
-					},
-					"frame": {
-						"x": 61,
-						"y": 0,
-						"w": 59,
-						"h": 65
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 59,
-						"h": 65
-					},
-					"frame": {
-						"x": 61,
-						"y": 0,
-						"w": 59,
-						"h": 65
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 59,
-						"h": 65
-					},
-					"frame": {
-						"x": 120,
-						"y": 0,
-						"w": 59,
-						"h": 65
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 59,
-						"h": 65
-					},
-					"frame": {
-						"x": 120,
-						"y": 0,
-						"w": 59,
-						"h": 65
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 59,
-						"h": 65
-					},
-					"frame": {
-						"x": 120,
-						"y": 0,
-						"w": 59,
-						"h": 65
-					}
-				},
-				{
-					"filename": "0027.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 1,
-						"w": 59,
-						"h": 66
-					},
-					"frame": {
-						"x": 179,
-						"y": 0,
-						"w": 59,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 58,
-						"h": 67
-					},
-					"frame": {
-						"x": 124,
-						"y": 66,
-						"w": 58,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 58,
-						"h": 67
-					},
-					"frame": {
-						"x": 124,
-						"y": 66,
-						"w": 58,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 58,
-						"h": 67
-					},
-					"frame": {
-						"x": 124,
-						"y": 66,
-						"w": 58,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0031.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 2,
-						"w": 59,
-						"h": 65
-					},
-					"frame": {
-						"x": 64,
-						"y": 125,
-						"w": 59,
-						"h": 65
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 0,
-						"w": 57,
-						"h": 67
-					},
-					"frame": {
-						"x": 182,
-						"y": 66,
-						"w": 57,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 0,
-						"w": 57,
-						"h": 67
-					},
-					"frame": {
-						"x": 182,
-						"y": 66,
-						"w": 57,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 0,
-						"w": 57,
-						"h": 67
-					},
-					"frame": {
-						"x": 182,
-						"y": 66,
-						"w": 57,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 0,
-						"w": 57,
-						"h": 67
-					},
-					"frame": {
-						"x": 182,
-						"y": 66,
-						"w": 57,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 0,
-						"w": 57,
-						"h": 67
-					},
-					"frame": {
-						"x": 182,
-						"y": 66,
-						"w": 57,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 0,
-						"w": 57,
-						"h": 67
-					},
-					"frame": {
-						"x": 182,
-						"y": 66,
-						"w": 57,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0025.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 0,
-						"w": 57,
-						"h": 67
-					},
-					"frame": {
-						"x": 182,
-						"y": 66,
-						"w": 57,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0026.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 0,
-						"w": 57,
-						"h": 67
-					},
-					"frame": {
-						"x": 182,
-						"y": 66,
-						"w": 57,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0032.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 0,
-						"w": 57,
-						"h": 67
-					},
-					"frame": {
-						"x": 182,
-						"y": 66,
-						"w": 57,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 1,
-						"w": 58,
-						"h": 66
-					},
-					"frame": {
-						"x": 123,
-						"y": 133,
-						"w": 58,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 1,
-						"w": 58,
-						"h": 66
-					},
-					"frame": {
-						"x": 123,
-						"y": 133,
-						"w": 58,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 1,
-						"w": 58,
-						"h": 66
-					},
-					"frame": {
-						"x": 123,
-						"y": 133,
-						"w": 58,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 0,
-						"w": 57,
-						"h": 67
-					},
-					"frame": {
-						"x": 181,
-						"y": 133,
-						"w": 57,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 0,
-						"w": 57,
-						"h": 67
-					},
-					"frame": {
-						"x": 181,
-						"y": 133,
-						"w": 57,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 0,
-						"w": 57,
-						"h": 67
-					},
-					"frame": {
-						"x": 181,
-						"y": 133,
-						"w": 57,
-						"h": 67
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:4a92d566ab5398ac1329b7a8bd47bf23:05925b513eba9d64f38ee84fe4b031b9:82195cf2a6db620c5643b8162d6e8c5c$"
-	}
-}
diff --git a/public/images/pokemon/exp/718-10.png b/public/images/pokemon/exp/718-10.png
deleted file mode 100644
index faf98182653..00000000000
Binary files a/public/images/pokemon/exp/718-10.png and /dev/null differ
diff --git a/public/images/pokemon/exp/718.json b/public/images/pokemon/exp/718.json
deleted file mode 100644
index 7e32292a1be..00000000000
--- a/public/images/pokemon/exp/718.json
+++ /dev/null
@@ -1,230 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "718.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 219,
-				"h": 219
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 75,
-						"h": 89
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 71,
-						"h": 88
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 71,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 75,
-						"h": 89
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 73,
-						"h": 89
-					},
-					"frame": {
-						"x": 71,
-						"y": 0,
-						"w": 73,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 75,
-						"h": 89
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 74,
-						"h": 89
-					},
-					"frame": {
-						"x": 144,
-						"y": 0,
-						"w": 74,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 75,
-						"h": 89
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 74,
-						"h": 89
-					},
-					"frame": {
-						"x": 144,
-						"y": 0,
-						"w": 74,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 75,
-						"h": 89
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 74,
-						"h": 89
-					},
-					"frame": {
-						"x": 0,
-						"y": 89,
-						"w": 74,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 75,
-						"h": 89
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 74,
-						"h": 89
-					},
-					"frame": {
-						"x": 0,
-						"y": 89,
-						"w": 74,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 75,
-						"h": 89
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 73,
-						"h": 89
-					},
-					"frame": {
-						"x": 74,
-						"y": 89,
-						"w": 73,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 75,
-						"h": 89
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 73,
-						"h": 89
-					},
-					"frame": {
-						"x": 74,
-						"y": 89,
-						"w": 73,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 75,
-						"h": 89
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 72,
-						"h": 89
-					},
-					"frame": {
-						"x": 147,
-						"y": 89,
-						"w": 72,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 75,
-						"h": 89
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 72,
-						"h": 89
-					},
-					"frame": {
-						"x": 147,
-						"y": 89,
-						"w": 72,
-						"h": 89
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:ca886cfe27a80d5575319fa107b1227d:f6e306f8382a9caca9560b144b026413:7b4a06b06cbac24b3f39727b0238661b$"
-	}
-}
diff --git a/public/images/pokemon/exp/718.png b/public/images/pokemon/exp/718.png
deleted file mode 100644
index 01595585059..00000000000
Binary files a/public/images/pokemon/exp/718.png and /dev/null differ
diff --git a/public/images/pokemon/exp/719.json b/public/images/pokemon/exp/719.json
deleted file mode 100644
index 289b518f437..00000000000
--- a/public/images/pokemon/exp/719.json
+++ /dev/null
@@ -1,1091 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "719.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 210,
-				"h": 210
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 24,
-						"y": 10,
-						"w": 49,
-						"h": 67
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 49,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 24,
-						"y": 6,
-						"w": 49,
-						"h": 67
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 49,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 24,
-						"y": 10,
-						"w": 49,
-						"h": 67
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 49,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 24,
-						"y": 6,
-						"w": 49,
-						"h": 67
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 49,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0025.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 24,
-						"y": 10,
-						"w": 49,
-						"h": 67
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 49,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0031.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 24,
-						"y": 6,
-						"w": 49,
-						"h": 67
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 49,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0040.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 34,
-						"y": 9,
-						"w": 48,
-						"h": 67
-					},
-					"frame": {
-						"x": 49,
-						"y": 0,
-						"w": 48,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0041.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 22,
-						"y": 5,
-						"w": 48,
-						"h": 67
-					},
-					"frame": {
-						"x": 49,
-						"y": 0,
-						"w": 48,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0042.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 16,
-						"y": 3,
-						"w": 48,
-						"h": 67
-					},
-					"frame": {
-						"x": 49,
-						"y": 0,
-						"w": 48,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0043.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 0,
-						"w": 48,
-						"h": 67
-					},
-					"frame": {
-						"x": 49,
-						"y": 0,
-						"w": 48,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 25,
-						"y": 8,
-						"w": 47,
-						"h": 67
-					},
-					"frame": {
-						"x": 97,
-						"y": 0,
-						"w": 47,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 25,
-						"y": 8,
-						"w": 47,
-						"h": 67
-					},
-					"frame": {
-						"x": 97,
-						"y": 0,
-						"w": 47,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 25,
-						"y": 4,
-						"w": 47,
-						"h": 67
-					},
-					"frame": {
-						"x": 97,
-						"y": 0,
-						"w": 47,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 25,
-						"y": 6,
-						"w": 47,
-						"h": 67
-					},
-					"frame": {
-						"x": 97,
-						"y": 0,
-						"w": 47,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 25,
-						"y": 8,
-						"w": 47,
-						"h": 67
-					},
-					"frame": {
-						"x": 97,
-						"y": 0,
-						"w": 47,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 25,
-						"y": 8,
-						"w": 47,
-						"h": 67
-					},
-					"frame": {
-						"x": 97,
-						"y": 0,
-						"w": 47,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 25,
-						"y": 4,
-						"w": 47,
-						"h": 67
-					},
-					"frame": {
-						"x": 97,
-						"y": 0,
-						"w": 47,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 25,
-						"y": 6,
-						"w": 47,
-						"h": 67
-					},
-					"frame": {
-						"x": 97,
-						"y": 0,
-						"w": 47,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 25,
-						"y": 8,
-						"w": 47,
-						"h": 67
-					},
-					"frame": {
-						"x": 97,
-						"y": 0,
-						"w": 47,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0026.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 25,
-						"y": 8,
-						"w": 47,
-						"h": 67
-					},
-					"frame": {
-						"x": 97,
-						"y": 0,
-						"w": 47,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0030.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 25,
-						"y": 4,
-						"w": 47,
-						"h": 67
-					},
-					"frame": {
-						"x": 97,
-						"y": 0,
-						"w": 47,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0032.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 25,
-						"y": 6,
-						"w": 47,
-						"h": 67
-					},
-					"frame": {
-						"x": 97,
-						"y": 0,
-						"w": 47,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0045.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 5,
-						"w": 46,
-						"h": 67
-					},
-					"frame": {
-						"x": 144,
-						"y": 0,
-						"w": 46,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0044.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 0,
-						"w": 48,
-						"h": 66
-					},
-					"frame": {
-						"x": 0,
-						"y": 67,
-						"w": 48,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0039.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 48,
-						"y": 12,
-						"w": 46,
-						"h": 66
-					},
-					"frame": {
-						"x": 48,
-						"y": 67,
-						"w": 46,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0036.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 45,
-						"y": 1,
-						"w": 45,
-						"h": 67
-					},
-					"frame": {
-						"x": 94,
-						"y": 67,
-						"w": 45,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0048.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 12,
-						"y": 8,
-						"w": 45,
-						"h": 67
-					},
-					"frame": {
-						"x": 94,
-						"y": 67,
-						"w": 45,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0049.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 19,
-						"y": 5,
-						"w": 45,
-						"h": 67
-					},
-					"frame": {
-						"x": 94,
-						"y": 67,
-						"w": 45,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 25,
-						"y": 6,
-						"w": 44,
-						"h": 67
-					},
-					"frame": {
-						"x": 0,
-						"y": 133,
-						"w": 44,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 25,
-						"y": 6,
-						"w": 44,
-						"h": 67
-					},
-					"frame": {
-						"x": 0,
-						"y": 133,
-						"w": 44,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 25,
-						"y": 4,
-						"w": 44,
-						"h": 67
-					},
-					"frame": {
-						"x": 0,
-						"y": 133,
-						"w": 44,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 25,
-						"y": 2,
-						"w": 44,
-						"h": 67
-					},
-					"frame": {
-						"x": 0,
-						"y": 133,
-						"w": 44,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 25,
-						"y": 6,
-						"w": 44,
-						"h": 67
-					},
-					"frame": {
-						"x": 0,
-						"y": 133,
-						"w": 44,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 25,
-						"y": 6,
-						"w": 44,
-						"h": 67
-					},
-					"frame": {
-						"x": 0,
-						"y": 133,
-						"w": 44,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 25,
-						"y": 6,
-						"w": 44,
-						"h": 67
-					},
-					"frame": {
-						"x": 0,
-						"y": 133,
-						"w": 44,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 25,
-						"y": 4,
-						"w": 44,
-						"h": 67
-					},
-					"frame": {
-						"x": 0,
-						"y": 133,
-						"w": 44,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 25,
-						"y": 2,
-						"w": 44,
-						"h": 67
-					},
-					"frame": {
-						"x": 0,
-						"y": 133,
-						"w": 44,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 25,
-						"y": 6,
-						"w": 44,
-						"h": 67
-					},
-					"frame": {
-						"x": 0,
-						"y": 133,
-						"w": 44,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 25,
-						"y": 6,
-						"w": 44,
-						"h": 67
-					},
-					"frame": {
-						"x": 0,
-						"y": 133,
-						"w": 44,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0027.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 25,
-						"y": 6,
-						"w": 44,
-						"h": 67
-					},
-					"frame": {
-						"x": 0,
-						"y": 133,
-						"w": 44,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0028.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 25,
-						"y": 4,
-						"w": 44,
-						"h": 67
-					},
-					"frame": {
-						"x": 0,
-						"y": 133,
-						"w": 44,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0029.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 25,
-						"y": 2,
-						"w": 44,
-						"h": 67
-					},
-					"frame": {
-						"x": 0,
-						"y": 133,
-						"w": 44,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0033.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 25,
-						"y": 6,
-						"w": 44,
-						"h": 67
-					},
-					"frame": {
-						"x": 0,
-						"y": 133,
-						"w": 44,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0034.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 27,
-						"y": 4,
-						"w": 44,
-						"h": 67
-					},
-					"frame": {
-						"x": 0,
-						"y": 133,
-						"w": 44,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0051.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 25,
-						"y": 6,
-						"w": 44,
-						"h": 67
-					},
-					"frame": {
-						"x": 0,
-						"y": 133,
-						"w": 44,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0035.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 36,
-						"y": 2,
-						"w": 42,
-						"h": 67
-					},
-					"frame": {
-						"x": 44,
-						"y": 133,
-						"w": 42,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0037.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 54,
-						"y": 3,
-						"w": 42,
-						"h": 67
-					},
-					"frame": {
-						"x": 139,
-						"y": 67,
-						"w": 42,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0050.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 23,
-						"y": 6,
-						"w": 42,
-						"h": 67
-					},
-					"frame": {
-						"x": 139,
-						"y": 67,
-						"w": 42,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0047.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 12,
-						"w": 42,
-						"h": 66
-					},
-					"frame": {
-						"x": 86,
-						"y": 134,
-						"w": 42,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0038.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 55,
-						"y": 6,
-						"w": 41,
-						"h": 67
-					},
-					"frame": {
-						"x": 128,
-						"y": 134,
-						"w": 41,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0046.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 8,
-						"w": 41,
-						"h": 67
-					},
-					"frame": {
-						"x": 169,
-						"y": 134,
-						"w": 41,
-						"h": 67
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:eb63d565533cc4db6abe2324f72ce7a0:5cfab760df87a56d5ca4db54a28b4a46:17a705bb924916761be2495822a53735$"
-	}
-}
diff --git a/public/images/pokemon/exp/719.png b/public/images/pokemon/exp/719.png
deleted file mode 100644
index f9059000661..00000000000
Binary files a/public/images/pokemon/exp/719.png and /dev/null differ
diff --git a/public/images/pokemon/exp/728.json b/public/images/pokemon/exp/728.json
index e9ca9c51315..c30ff4b6d18 100644
--- a/public/images/pokemon/exp/728.json
+++ b/public/images/pokemon/exp/728.json
@@ -1,1112 +1,776 @@
-{
-	"textures": [
-		{
-			"image": "728.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 165,
-				"h": 165
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0039.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 44,
-						"h": 40
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 44,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0051.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 44,
-						"h": 40
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 44,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 42,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 40,
-						"w": 42,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 42,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 40,
-						"w": 42,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 42,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 40,
-						"w": 42,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 42,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 40,
-						"w": 42,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0026.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 42,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 40,
-						"w": 42,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0036.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 42,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 40,
-						"w": 42,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 42,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 81,
-						"w": 42,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 42,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 81,
-						"w": 42,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 42,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 81,
-						"w": 42,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 42,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 81,
-						"w": 42,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0027.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 42,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 81,
-						"w": 42,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0035.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 42,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 81,
-						"w": 42,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0040.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 44,
-						"h": 39
-					},
-					"frame": {
-						"x": 44,
-						"y": 0,
-						"w": 44,
-						"h": 39
-					}
-				},
-				{
-					"filename": "0050.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 44,
-						"h": 39
-					},
-					"frame": {
-						"x": 44,
-						"y": 0,
-						"w": 44,
-						"h": 39
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 42,
-						"h": 40
-					},
-					"frame": {
-						"x": 0,
-						"y": 122,
-						"w": 42,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 42,
-						"h": 40
-					},
-					"frame": {
-						"x": 0,
-						"y": 122,
-						"w": 42,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0025.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 42,
-						"h": 40
-					},
-					"frame": {
-						"x": 0,
-						"y": 122,
-						"w": 42,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0037.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 42,
-						"h": 40
-					},
-					"frame": {
-						"x": 0,
-						"y": 122,
-						"w": 42,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0041.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 45,
-						"h": 37
-					},
-					"frame": {
-						"x": 88,
-						"y": 0,
-						"w": 45,
-						"h": 37
-					}
-				},
-				{
-					"filename": "0045.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 45,
-						"h": 37
-					},
-					"frame": {
-						"x": 88,
-						"y": 0,
-						"w": 45,
-						"h": 37
-					}
-				},
-				{
-					"filename": "0049.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 45,
-						"h": 37
-					},
-					"frame": {
-						"x": 88,
-						"y": 0,
-						"w": 45,
-						"h": 37
-					}
-				},
-				{
-					"filename": "0042.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 45,
-						"h": 37
-					},
-					"frame": {
-						"x": 88,
-						"y": 37,
-						"w": 45,
-						"h": 37
-					}
-				},
-				{
-					"filename": "0044.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 45,
-						"h": 37
-					},
-					"frame": {
-						"x": 88,
-						"y": 37,
-						"w": 45,
-						"h": 37
-					}
-				},
-				{
-					"filename": "0046.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 45,
-						"h": 37
-					},
-					"frame": {
-						"x": 88,
-						"y": 37,
-						"w": 45,
-						"h": 37
-					}
-				},
-				{
-					"filename": "0048.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 45,
-						"h": 37
-					},
-					"frame": {
-						"x": 88,
-						"y": 37,
-						"w": 45,
-						"h": 37
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 42,
-						"h": 40
-					},
-					"frame": {
-						"x": 44,
-						"y": 39,
-						"w": 42,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 42,
-						"h": 40
-					},
-					"frame": {
-						"x": 44,
-						"y": 39,
-						"w": 42,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 42,
-						"h": 40
-					},
-					"frame": {
-						"x": 44,
-						"y": 39,
-						"w": 42,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 42,
-						"h": 40
-					},
-					"frame": {
-						"x": 44,
-						"y": 39,
-						"w": 42,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0028.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 42,
-						"h": 40
-					},
-					"frame": {
-						"x": 44,
-						"y": 39,
-						"w": 42,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0034.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 42,
-						"h": 40
-					},
-					"frame": {
-						"x": 44,
-						"y": 39,
-						"w": 42,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 42,
-						"h": 40
-					},
-					"frame": {
-						"x": 42,
-						"y": 79,
-						"w": 42,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 42,
-						"h": 40
-					},
-					"frame": {
-						"x": 42,
-						"y": 79,
-						"w": 42,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 42,
-						"h": 40
-					},
-					"frame": {
-						"x": 42,
-						"y": 79,
-						"w": 42,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 42,
-						"h": 40
-					},
-					"frame": {
-						"x": 42,
-						"y": 79,
-						"w": 42,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0029.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 42,
-						"h": 40
-					},
-					"frame": {
-						"x": 42,
-						"y": 79,
-						"w": 42,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0033.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 42,
-						"h": 40
-					},
-					"frame": {
-						"x": 42,
-						"y": 79,
-						"w": 42,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 42,
-						"h": 39
-					},
-					"frame": {
-						"x": 42,
-						"y": 119,
-						"w": 42,
-						"h": 39
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 42,
-						"h": 39
-					},
-					"frame": {
-						"x": 42,
-						"y": 119,
-						"w": 42,
-						"h": 39
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 42,
-						"h": 39
-					},
-					"frame": {
-						"x": 42,
-						"y": 119,
-						"w": 42,
-						"h": 39
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 42,
-						"h": 39
-					},
-					"frame": {
-						"x": 42,
-						"y": 119,
-						"w": 42,
-						"h": 39
-					}
-				},
-				{
-					"filename": "0030.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 42,
-						"h": 39
-					},
-					"frame": {
-						"x": 42,
-						"y": 119,
-						"w": 42,
-						"h": 39
-					}
-				},
-				{
-					"filename": "0032.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 42,
-						"h": 39
-					},
-					"frame": {
-						"x": 42,
-						"y": 119,
-						"w": 42,
-						"h": 39
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 42,
-						"h": 39
-					},
-					"frame": {
-						"x": 86,
-						"y": 74,
-						"w": 42,
-						"h": 39
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 42,
-						"h": 39
-					},
-					"frame": {
-						"x": 86,
-						"y": 74,
-						"w": 42,
-						"h": 39
-					}
-				},
-				{
-					"filename": "0031.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 42,
-						"h": 39
-					},
-					"frame": {
-						"x": 86,
-						"y": 74,
-						"w": 42,
-						"h": 39
-					}
-				},
-				{
-					"filename": "0038.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 40,
-						"h": 40
-					},
-					"frame": {
-						"x": 84,
-						"y": 113,
-						"w": 40,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0052.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 40,
-						"h": 40
-					},
-					"frame": {
-						"x": 84,
-						"y": 113,
-						"w": 40,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0043.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 41,
-						"h": 37
-					},
-					"frame": {
-						"x": 124,
-						"y": 113,
-						"w": 41,
-						"h": 37
-					}
-				},
-				{
-					"filename": "0047.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 41,
-						"h": 37
-					},
-					"frame": {
-						"x": 124,
-						"y": 113,
-						"w": 41,
-						"h": 37
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:aca6840c416df6edb5630db2ccfd6b44:c238f59207b625e83d441c2da913ee60:74218c18c9d392741666ee5c0c28d306$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 43, "y": 99, "w": 40, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 15, "w": 40, "h": 39 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 85, "y": 141, "w": 40, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 16, "w": 40, "h": 38 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 43, "y": 181, "w": 40, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 17, "w": 40, "h": 37 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 127, "y": 182, "w": 39, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 18, "w": 39, "h": 36 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 168, "y": 218, "w": 39, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 19, "w": 39, "h": 36 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 1, "y": 221, "w": 38, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 20, "w": 38, "h": 35 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 43, "y": 220, "w": 39, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 19, "w": 39, "h": 36 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 125, "y": 220, "w": 39, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 19, "w": 39, "h": 35 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 84, "y": 220, "w": 39, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 18, "w": 39, "h": 36 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 85, "y": 181, "w": 40, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 17, "w": 40, "h": 37 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 168, "y": 178, "w": 40, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 16, "w": 40, "h": 38 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 1, "y": 181, "w": 40, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 16, "w": 40, "h": 38 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 85, "y": 100, "w": 40, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 15, "w": 40, "h": 39 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 85, "y": 141, "w": 40, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 16, "w": 40, "h": 38 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 43, "y": 181, "w": 40, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 17, "w": 40, "h": 37 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 127, "y": 182, "w": 39, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 18, "w": 39, "h": 36 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 168, "y": 218, "w": 39, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 19, "w": 39, "h": 36 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 1, "y": 221, "w": 38, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 20, "w": 38, "h": 35 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 43, "y": 220, "w": 39, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 19, "w": 39, "h": 36 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 125, "y": 220, "w": 39, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 19, "w": 39, "h": 35 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 84, "y": 220, "w": 39, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 18, "w": 39, "h": 36 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 85, "y": 181, "w": 40, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 17, "w": 40, "h": 37 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 168, "y": 178, "w": 40, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 16, "w": 40, "h": 38 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 1, "y": 181, "w": 40, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 16, "w": 40, "h": 38 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 85, "y": 100, "w": 40, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 15, "w": 40, "h": 39 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 85, "y": 141, "w": 40, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 16, "w": 40, "h": 38 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 43, "y": 181, "w": 40, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 17, "w": 40, "h": 37 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 127, "y": 182, "w": 39, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 18, "w": 39, "h": 36 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 168, "y": 218, "w": 39, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 19, "w": 39, "h": 36 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 1, "y": 221, "w": 38, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 20, "w": 38, "h": 35 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 43, "y": 220, "w": 39, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 19, "w": 39, "h": 36 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 125, "y": 220, "w": 39, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 19, "w": 39, "h": 35 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 84, "y": 220, "w": 39, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 18, "w": 39, "h": 36 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 85, "y": 181, "w": 40, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 17, "w": 40, "h": 37 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 168, "y": 178, "w": 40, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 16, "w": 40, "h": 38 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 1, "y": 181, "w": 40, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 16, "w": 40, "h": 38 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 85, "y": 100, "w": 40, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 15, "w": 40, "h": 39 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 85, "y": 141, "w": 40, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 16, "w": 40, "h": 38 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 43, "y": 181, "w": 40, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 17, "w": 40, "h": 37 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 127, "y": 182, "w": 39, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 18, "w": 39, "h": 36 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 168, "y": 218, "w": 39, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 19, "w": 39, "h": 36 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 1, "y": 221, "w": 38, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 20, "w": 38, "h": 35 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 43, "y": 220, "w": 39, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 19, "w": 39, "h": 36 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 125, "y": 220, "w": 39, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 19, "w": 39, "h": 35 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 84, "y": 220, "w": 39, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 18, "w": 39, "h": 36 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 85, "y": 181, "w": 40, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 17, "w": 40, "h": 37 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 168, "y": 178, "w": 40, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 16, "w": 40, "h": 38 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 1, "y": 181, "w": 40, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 16, "w": 40, "h": 38 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 85, "y": 100, "w": 40, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 15, "w": 40, "h": 39 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 85, "y": 141, "w": 40, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 16, "w": 40, "h": 38 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 43, "y": 181, "w": 40, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 17, "w": 40, "h": 37 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 127, "y": 182, "w": 39, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 18, "w": 39, "h": 36 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 168, "y": 218, "w": 39, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 19, "w": 39, "h": 36 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 1, "y": 221, "w": 38, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 20, "w": 38, "h": 35 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 43, "y": 220, "w": 39, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 19, "w": 39, "h": 36 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 125, "y": 220, "w": 39, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 19, "w": 39, "h": 35 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 84, "y": 220, "w": 39, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 18, "w": 39, "h": 36 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 85, "y": 181, "w": 40, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 17, "w": 40, "h": 37 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 168, "y": 178, "w": 40, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 16, "w": 40, "h": 38 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 1, "y": 181, "w": 40, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 16, "w": 40, "h": 38 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 43, "y": 99, "w": 40, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 15, "w": 40, "h": 39 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 179, "y": 137, "w": 40, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 15, "w": 40, "h": 39 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 1, "y": 140, "w": 40, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 15, "w": 40, "h": 39 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 43, "y": 140, "w": 40, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 15, "w": 40, "h": 39 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 1, "y": 56, "w": 40, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 14, "w": 40, "h": 40 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 43, "y": 57, "w": 40, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 14, "w": 40, "h": 40 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 179, "y": 95, "w": 40, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 14, "w": 40, "h": 40 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 1, "y": 98, "w": 40, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 14, "w": 40, "h": 40 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 137, "y": 55, "w": 40, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 13, "w": 40, "h": 41 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 95, "y": 55, "w": 40, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 11, "w": 40, "h": 43 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 186, "y": 49, "w": 40, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 10, "w": 40, "h": 44 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 186, "y": 1, "w": 40, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 8, "w": 40, "h": 46 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 95, "y": 1, "w": 45, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 45, "h": 52 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 1, "y": 1, "w": 46, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 46, "h": 53 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 1, "y": 1, "w": 46, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 46, "h": 53 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 1, "y": 1, "w": 46, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 46, "h": 53 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 1, "y": 1, "w": 46, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 46, "h": 53 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 142, "y": 1, "w": 42, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 42, "h": 52 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 49, "y": 1, "w": 44, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 44, "h": 54 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 127, "y": 140, "w": 39, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 14, "w": 39, "h": 40 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 137, "y": 98, "w": 40, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 14, "w": 40, "h": 40 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 1, "y": 56, "w": 40, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 14, "w": 40, "h": 40 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 43, "y": 140, "w": 40, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 15, "w": 40, "h": 39 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 1, "y": 140, "w": 40, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 15, "w": 40, "h": 39 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 179, "y": 137, "w": 40, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 15, "w": 40, "h": 39 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.13-x64",
+  "image": "728.png",
+  "format": "I8",
+  "size": { "w": 227, "h": 257 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/728.png b/public/images/pokemon/exp/728.png
index a057058aab8..e7fbfa19d1e 100644
Binary files a/public/images/pokemon/exp/728.png and b/public/images/pokemon/exp/728.png differ
diff --git a/public/images/pokemon/exp/729.json b/public/images/pokemon/exp/729.json
index baa1260a0f7..ed22b70455c 100644
--- a/public/images/pokemon/exp/729.json
+++ b/public/images/pokemon/exp/729.json
@@ -1,272 +1,1055 @@
-{
-	"textures": [
-		{
-			"image": "729.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 141,
-				"h": 141
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 49,
-						"h": 51
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 49,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 49,
-						"h": 51
-					},
-					"frame": {
-						"x": 0,
-						"y": 51,
-						"w": 49,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 49,
-						"h": 51
-					},
-					"frame": {
-						"x": 0,
-						"y": 51,
-						"w": 49,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 48,
-						"h": 50
-					},
-					"frame": {
-						"x": 49,
-						"y": 0,
-						"w": 48,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 48,
-						"h": 50
-					},
-					"frame": {
-						"x": 49,
-						"y": 0,
-						"w": 48,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 42,
-						"h": 47
-					},
-					"frame": {
-						"x": 97,
-						"y": 0,
-						"w": 42,
-						"h": 47
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 42,
-						"h": 47
-					},
-					"frame": {
-						"x": 97,
-						"y": 0,
-						"w": 42,
-						"h": 47
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 40,
-						"h": 47
-					},
-					"frame": {
-						"x": 97,
-						"y": 47,
-						"w": 40,
-						"h": 47
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 46,
-						"h": 48
-					},
-					"frame": {
-						"x": 49,
-						"y": 50,
-						"w": 46,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 46,
-						"h": 48
-					},
-					"frame": {
-						"x": 49,
-						"y": 50,
-						"w": 46,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 45,
-						"h": 47
-					},
-					"frame": {
-						"x": 95,
-						"y": 94,
-						"w": 45,
-						"h": 47
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 45,
-						"h": 47
-					},
-					"frame": {
-						"x": 95,
-						"y": 94,
-						"w": 45,
-						"h": 47
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:4df3ec883b357e664a50e3015060795f:29a8d34f9df9fa51691fda1da5961207:b2d5dd692ec79c7357afdffa7b3670a9$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 53, "y": 283, "w": 52, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 52, "h": 55 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 105, "y": 286, "w": 51, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 51, "h": 55 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 429, "y": 336, "w": 50, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 10, "w": 50, "h": 54 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 263, "y": 337, "w": 49, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 10, "w": 49, "h": 54 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 0, "y": 345, "w": 48, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 11, "w": 48, "h": 53 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 408, "y": 390, "w": 46, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 10, "w": 46, "h": 55 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 454, "y": 390, "w": 46, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 11, "w": 46, "h": 54 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 48, "y": 391, "w": 46, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 11, "w": 46, "h": 53 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 204, "y": 390, "w": 47, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 10, "w": 47, "h": 54 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 156, "y": 339, "w": 48, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 10, "w": 48, "h": 54 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 462, "y": 226, "w": 50, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 50, "h": 55 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 0, "y": 290, "w": 51, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 51, "h": 55 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 326, "y": 282, "w": 52, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 52, "h": 55 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 164, "y": 229, "w": 53, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 8, "w": 53, "h": 56 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 0, "y": 178, "w": 54, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 8, "w": 54, "h": 56 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 55, "y": 117, "w": 55, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 8, "w": 55, "h": 56 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 109, "y": 175, "w": 55, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 55, "h": 55 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 164, "y": 174, "w": 55, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 55, "h": 55 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 54, "y": 173, "w": 55, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 55, "h": 55 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 236, "y": 171, "w": 55, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 55, "h": 55 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 54, "y": 228, "w": 54, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 54, "h": 55 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 327, "y": 227, "w": 54, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 54, "h": 55 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 381, "y": 281, "w": 53, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 53, "h": 55 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 434, "y": 281, "w": 53, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 53, "h": 55 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 53, "y": 283, "w": 52, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 52, "h": 55 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 105, "y": 286, "w": 51, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 51, "h": 55 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 429, "y": 336, "w": 50, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 10, "w": 50, "h": 54 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 263, "y": 337, "w": 49, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 10, "w": 49, "h": 54 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 0, "y": 345, "w": 48, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 11, "w": 48, "h": 53 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 408, "y": 390, "w": 46, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 10, "w": 46, "h": 55 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 454, "y": 390, "w": 46, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 11, "w": 46, "h": 54 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 48, "y": 391, "w": 46, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 11, "w": 46, "h": 53 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 204, "y": 390, "w": 47, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 10, "w": 47, "h": 54 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 156, "y": 339, "w": 48, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 10, "w": 48, "h": 54 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 462, "y": 226, "w": 50, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 50, "h": 55 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 0, "y": 290, "w": 51, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 51, "h": 55 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 326, "y": 282, "w": 52, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 52, "h": 55 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 164, "y": 229, "w": 53, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 8, "w": 53, "h": 56 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 0, "y": 178, "w": 54, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 8, "w": 54, "h": 56 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 55, "y": 117, "w": 55, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 8, "w": 55, "h": 56 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 109, "y": 175, "w": 55, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 55, "h": 55 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 164, "y": 174, "w": 55, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 55, "h": 55 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 54, "y": 173, "w": 55, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 55, "h": 55 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 236, "y": 171, "w": 55, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 55, "h": 55 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 54, "y": 228, "w": 54, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 54, "h": 55 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 327, "y": 227, "w": 54, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 54, "h": 55 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 381, "y": 281, "w": 53, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 53, "h": 55 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 434, "y": 281, "w": 53, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 53, "h": 55 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 53, "y": 283, "w": 52, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 52, "h": 55 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 105, "y": 286, "w": 51, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 51, "h": 55 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 429, "y": 336, "w": 50, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 10, "w": 50, "h": 54 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 263, "y": 337, "w": 49, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 10, "w": 49, "h": 54 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 0, "y": 345, "w": 48, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 11, "w": 48, "h": 53 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 408, "y": 390, "w": 46, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 10, "w": 46, "h": 55 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 454, "y": 390, "w": 46, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 11, "w": 46, "h": 54 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 48, "y": 391, "w": 46, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 11, "w": 46, "h": 53 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 204, "y": 390, "w": 47, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 10, "w": 47, "h": 54 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 156, "y": 339, "w": 48, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 10, "w": 48, "h": 54 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 462, "y": 226, "w": 50, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 50, "h": 55 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 0, "y": 290, "w": 51, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 51, "h": 55 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 326, "y": 282, "w": 52, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 52, "h": 55 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 164, "y": 229, "w": 53, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 8, "w": 53, "h": 56 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 0, "y": 178, "w": 54, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 8, "w": 54, "h": 56 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 55, "y": 117, "w": 55, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 8, "w": 55, "h": 56 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 109, "y": 175, "w": 55, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 55, "h": 55 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 164, "y": 174, "w": 55, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 55, "h": 55 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 54, "y": 173, "w": 55, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 55, "h": 55 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 236, "y": 171, "w": 55, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 55, "h": 55 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 54, "y": 228, "w": 54, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 54, "h": 55 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 327, "y": 227, "w": 54, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 54, "h": 55 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 381, "y": 281, "w": 53, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 53, "h": 55 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 434, "y": 281, "w": 53, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 53, "h": 55 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 53, "y": 283, "w": 52, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 52, "h": 55 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 408, "y": 226, "w": 54, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 9, "w": 54, "h": 55 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 312, "y": 56, "w": 57, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 8, "w": 57, "h": 56 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 312, "y": 0, "w": 59, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 8, "w": 59, "h": 56 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 244, "y": 116, "w": 56, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 9, "w": 56, "h": 55 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 416, "y": 114, "w": 56, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 9, "w": 56, "h": 55 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 64, "y": 62, "w": 57, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 9, "w": 57, "h": 55 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 371, "y": 0, "w": 58, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 8, "w": 58, "h": 56 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 273, "y": 226, "w": 54, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 9, "w": 54, "h": 55 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 53, "y": 283, "w": 52, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 52, "h": 55 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 161, "y": 285, "w": 52, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 52, "h": 54 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 312, "y": 337, "w": 50, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 10, "w": 50, "h": 52 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 312, "y": 389, "w": 48, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 10, "w": 48, "h": 53 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 51, "y": 338, "w": 49, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 10, "w": 49, "h": 53 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 378, "y": 336, "w": 51, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 10, "w": 51, "h": 53 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0088.png",
+    "frame": { "x": 213, "y": 337, "w": 50, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 10, "w": 50, "h": 53 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0089.png",
+    "frame": { "x": 360, "y": 389, "w": 48, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 48, "h": 53 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0090.png",
+    "frame": { "x": 100, "y": 341, "w": 49, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 10, "w": 49, "h": 52 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0091.png",
+    "frame": { "x": 53, "y": 283, "w": 52, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 52, "h": 55 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0092.png",
+    "frame": { "x": 217, "y": 282, "w": 52, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 52, "h": 55 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0093.png",
+    "frame": { "x": 108, "y": 230, "w": 53, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 8, "w": 53, "h": 56 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0094.png",
+    "frame": { "x": 300, "y": 169, "w": 54, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 7, "w": 54, "h": 57 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0095.png",
+    "frame": { "x": 182, "y": 117, "w": 54, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 7, "w": 54, "h": 57 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0096.png",
+    "frame": { "x": 0, "y": 121, "w": 54, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 7, "w": 54, "h": 57 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0097.png",
+    "frame": { "x": 189, "y": 60, "w": 55, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 7, "w": 55, "h": 57 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0098.png",
+    "frame": { "x": 110, "y": 118, "w": 54, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 7, "w": 54, "h": 57 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0099.png",
+    "frame": { "x": 369, "y": 56, "w": 55, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 7, "w": 55, "h": 57 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0100.png",
+    "frame": { "x": 424, "y": 57, "w": 55, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 7, "w": 55, "h": 57 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0101.png",
+    "frame": { "x": 429, "y": 0, "w": 56, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 7, "w": 56, "h": 57 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0102.png",
+    "frame": { "x": 127, "y": 0, "w": 62, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 62, "h": 61 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0103.png",
+    "frame": { "x": 64, "y": 0, "w": 63, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 63, "h": 62 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0104.png",
+    "frame": { "x": 0, "y": 0, "w": 64, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 64, "h": 64 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0105.png",
+    "frame": { "x": 251, "y": 0, "w": 61, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 61, "h": 59 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0106.png",
+    "frame": { "x": 189, "y": 0, "w": 62, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 62, "h": 60 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0107.png",
+    "frame": { "x": 0, "y": 64, "w": 55, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 7, "w": 55, "h": 57 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0108.png",
+    "frame": { "x": 127, "y": 61, "w": 55, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 7, "w": 55, "h": 57 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0109.png",
+    "frame": { "x": 306, "y": 112, "w": 55, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 7, "w": 55, "h": 57 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0110.png",
+    "frame": { "x": 361, "y": 113, "w": 55, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 7, "w": 55, "h": 57 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0111.png",
+    "frame": { "x": 251, "y": 59, "w": 55, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 7, "w": 55, "h": 57 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0112.png",
+    "frame": { "x": 416, "y": 169, "w": 54, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 7, "w": 54, "h": 57 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0113.png",
+    "frame": { "x": 354, "y": 170, "w": 54, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 7, "w": 54, "h": 57 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0114.png",
+    "frame": { "x": 219, "y": 226, "w": 54, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 8, "w": 54, "h": 56 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0115.png",
+    "frame": { "x": 0, "y": 234, "w": 53, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 8, "w": 53, "h": 56 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0116.png",
+    "frame": { "x": 273, "y": 281, "w": 53, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 8, "w": 53, "h": 56 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.13-x64",
+  "image": "729.png",
+  "format": "I8",
+  "size": { "w": 512, "h": 445 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/729.png b/public/images/pokemon/exp/729.png
index 31cd2f7e1fa..33af53ebc16 100644
Binary files a/public/images/pokemon/exp/729.png and b/public/images/pokemon/exp/729.png differ
diff --git a/public/images/pokemon/exp/730.json b/public/images/pokemon/exp/730.json
index ff2d76644f9..b1b6c5189bc 100644
--- a/public/images/pokemon/exp/730.json
+++ b/public/images/pokemon/exp/730.json
@@ -1,2309 +1,839 @@
-{
-	"textures": [
-		{
-			"image": "730.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 615,
-				"h": 615
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 83,
-						"h": 81
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 83,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0038.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 83,
-						"h": 81
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 83,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0086.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 83,
-						"h": 81
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 83,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 78,
-						"h": 85
-					},
-					"frame": {
-						"x": 0,
-						"y": 81,
-						"w": 78,
-						"h": 85
-					}
-				},
-				{
-					"filename": "0035.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 78,
-						"h": 85
-					},
-					"frame": {
-						"x": 0,
-						"y": 81,
-						"w": 78,
-						"h": 85
-					}
-				},
-				{
-					"filename": "0083.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 78,
-						"h": 85
-					},
-					"frame": {
-						"x": 0,
-						"y": 81,
-						"w": 78,
-						"h": 85
-					}
-				},
-				{
-					"filename": "0062.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 83,
-						"h": 80
-					},
-					"frame": {
-						"x": 83,
-						"y": 0,
-						"w": 83,
-						"h": 80
-					}
-				},
-				{
-					"filename": "0107.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 8,
-						"w": 83,
-						"h": 80
-					},
-					"frame": {
-						"x": 166,
-						"y": 0,
-						"w": 83,
-						"h": 80
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 74,
-						"h": 88
-					},
-					"frame": {
-						"x": 0,
-						"y": 166,
-						"w": 74,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0034.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 74,
-						"h": 88
-					},
-					"frame": {
-						"x": 0,
-						"y": 166,
-						"w": 74,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0082.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 74,
-						"h": 88
-					},
-					"frame": {
-						"x": 0,
-						"y": 166,
-						"w": 74,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 9,
-						"w": 83,
-						"h": 79
-					},
-					"frame": {
-						"x": 249,
-						"y": 0,
-						"w": 83,
-						"h": 79
-					}
-				},
-				{
-					"filename": "0039.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 9,
-						"w": 83,
-						"h": 79
-					},
-					"frame": {
-						"x": 249,
-						"y": 0,
-						"w": 83,
-						"h": 79
-					}
-				},
-				{
-					"filename": "0087.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 9,
-						"w": 83,
-						"h": 79
-					},
-					"frame": {
-						"x": 249,
-						"y": 0,
-						"w": 83,
-						"h": 79
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 10,
-						"w": 84,
-						"h": 78
-					},
-					"frame": {
-						"x": 332,
-						"y": 0,
-						"w": 84,
-						"h": 78
-					}
-				},
-				{
-					"filename": "0040.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 10,
-						"w": 84,
-						"h": 78
-					},
-					"frame": {
-						"x": 332,
-						"y": 0,
-						"w": 84,
-						"h": 78
-					}
-				},
-				{
-					"filename": "0088.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 10,
-						"w": 84,
-						"h": 78
-					},
-					"frame": {
-						"x": 332,
-						"y": 0,
-						"w": 84,
-						"h": 78
-					}
-				},
-				{
-					"filename": "0064.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 10,
-						"w": 84,
-						"h": 78
-					},
-					"frame": {
-						"x": 416,
-						"y": 0,
-						"w": 84,
-						"h": 78
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 73,
-						"h": 88
-					},
-					"frame": {
-						"x": 0,
-						"y": 254,
-						"w": 73,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0033.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 73,
-						"h": 88
-					},
-					"frame": {
-						"x": 0,
-						"y": 254,
-						"w": 73,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0081.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 73,
-						"h": 88
-					},
-					"frame": {
-						"x": 0,
-						"y": 254,
-						"w": 73,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0063.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 9,
-						"w": 83,
-						"h": 79
-					},
-					"frame": {
-						"x": 500,
-						"y": 0,
-						"w": 83,
-						"h": 79
-					}
-				},
-				{
-					"filename": "0057.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 73,
-						"h": 87
-					},
-					"frame": {
-						"x": 0,
-						"y": 342,
-						"w": 73,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 75,
-						"h": 86
-					},
-					"frame": {
-						"x": 0,
-						"y": 429,
-						"w": 75,
-						"h": 86
-					}
-				},
-				{
-					"filename": "0032.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 75,
-						"h": 86
-					},
-					"frame": {
-						"x": 0,
-						"y": 429,
-						"w": 75,
-						"h": 86
-					}
-				},
-				{
-					"filename": "0080.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 75,
-						"h": 86
-					},
-					"frame": {
-						"x": 0,
-						"y": 429,
-						"w": 75,
-						"h": 86
-					}
-				},
-				{
-					"filename": "0056.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 75,
-						"h": 86
-					},
-					"frame": {
-						"x": 0,
-						"y": 515,
-						"w": 75,
-						"h": 86
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 75,
-						"h": 85
-					},
-					"frame": {
-						"x": 78,
-						"y": 81,
-						"w": 75,
-						"h": 85
-					}
-				},
-				{
-					"filename": "0031.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 75,
-						"h": 85
-					},
-					"frame": {
-						"x": 78,
-						"y": 81,
-						"w": 75,
-						"h": 85
-					}
-				},
-				{
-					"filename": "0079.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 75,
-						"h": 85
-					},
-					"frame": {
-						"x": 78,
-						"y": 81,
-						"w": 75,
-						"h": 85
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 81,
-						"h": 82
-					},
-					"frame": {
-						"x": 153,
-						"y": 80,
-						"w": 81,
-						"h": 82
-					}
-				},
-				{
-					"filename": "0037.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 81,
-						"h": 82
-					},
-					"frame": {
-						"x": 153,
-						"y": 80,
-						"w": 81,
-						"h": 82
-					}
-				},
-				{
-					"filename": "0085.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 81,
-						"h": 82
-					},
-					"frame": {
-						"x": 153,
-						"y": 80,
-						"w": 81,
-						"h": 82
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 80,
-						"h": 82
-					},
-					"frame": {
-						"x": 74,
-						"y": 166,
-						"w": 80,
-						"h": 82
-					}
-				},
-				{
-					"filename": "0036.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 80,
-						"h": 82
-					},
-					"frame": {
-						"x": 74,
-						"y": 166,
-						"w": 80,
-						"h": 82
-					}
-				},
-				{
-					"filename": "0084.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 80,
-						"h": 82
-					},
-					"frame": {
-						"x": 74,
-						"y": 166,
-						"w": 80,
-						"h": 82
-					}
-				},
-				{
-					"filename": "0108.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 80,
-						"h": 81
-					},
-					"frame": {
-						"x": 154,
-						"y": 162,
-						"w": 80,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0055.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 75,
-						"h": 85
-					},
-					"frame": {
-						"x": 234,
-						"y": 80,
-						"w": 75,
-						"h": 85
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 78,
-						"h": 81
-					},
-					"frame": {
-						"x": 234,
-						"y": 165,
-						"w": 78,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0025.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 78,
-						"h": 81
-					},
-					"frame": {
-						"x": 234,
-						"y": 165,
-						"w": 78,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0049.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 78,
-						"h": 81
-					},
-					"frame": {
-						"x": 234,
-						"y": 165,
-						"w": 78,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0073.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 78,
-						"h": 81
-					},
-					"frame": {
-						"x": 234,
-						"y": 165,
-						"w": 78,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0097.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 78,
-						"h": 81
-					},
-					"frame": {
-						"x": 234,
-						"y": 165,
-						"w": 78,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0058.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 74,
-						"h": 85
-					},
-					"frame": {
-						"x": 309,
-						"y": 79,
-						"w": 74,
-						"h": 85
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 78,
-						"h": 82
-					},
-					"frame": {
-						"x": 383,
-						"y": 78,
-						"w": 78,
-						"h": 82
-					}
-				},
-				{
-					"filename": "0028.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 78,
-						"h": 82
-					},
-					"frame": {
-						"x": 383,
-						"y": 78,
-						"w": 78,
-						"h": 82
-					}
-				},
-				{
-					"filename": "0052.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 78,
-						"h": 82
-					},
-					"frame": {
-						"x": 383,
-						"y": 78,
-						"w": 78,
-						"h": 82
-					}
-				},
-				{
-					"filename": "0076.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 78,
-						"h": 82
-					},
-					"frame": {
-						"x": 383,
-						"y": 78,
-						"w": 78,
-						"h": 82
-					}
-				},
-				{
-					"filename": "0059.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 78,
-						"h": 82
-					},
-					"frame": {
-						"x": 312,
-						"y": 164,
-						"w": 78,
-						"h": 82
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 78,
-						"h": 81
-					},
-					"frame": {
-						"x": 390,
-						"y": 160,
-						"w": 78,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0026.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 78,
-						"h": 81
-					},
-					"frame": {
-						"x": 390,
-						"y": 160,
-						"w": 78,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0050.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 78,
-						"h": 81
-					},
-					"frame": {
-						"x": 390,
-						"y": 160,
-						"w": 78,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0074.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 78,
-						"h": 81
-					},
-					"frame": {
-						"x": 390,
-						"y": 160,
-						"w": 78,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 78,
-						"h": 81
-					},
-					"frame": {
-						"x": 461,
-						"y": 79,
-						"w": 78,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0027.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 78,
-						"h": 81
-					},
-					"frame": {
-						"x": 461,
-						"y": 79,
-						"w": 78,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0051.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 78,
-						"h": 81
-					},
-					"frame": {
-						"x": 461,
-						"y": 79,
-						"w": 78,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0075.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 78,
-						"h": 81
-					},
-					"frame": {
-						"x": 461,
-						"y": 79,
-						"w": 78,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 76,
-						"h": 81
-					},
-					"frame": {
-						"x": 539,
-						"y": 79,
-						"w": 76,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0030.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 76,
-						"h": 81
-					},
-					"frame": {
-						"x": 539,
-						"y": 79,
-						"w": 76,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0054.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 76,
-						"h": 81
-					},
-					"frame": {
-						"x": 539,
-						"y": 79,
-						"w": 76,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0078.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 76,
-						"h": 81
-					},
-					"frame": {
-						"x": 539,
-						"y": 79,
-						"w": 76,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0061.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 81,
-						"h": 79
-					},
-					"frame": {
-						"x": 468,
-						"y": 160,
-						"w": 81,
-						"h": 79
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 13,
-						"w": 80,
-						"h": 75
-					},
-					"frame": {
-						"x": 154,
-						"y": 243,
-						"w": 80,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0047.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 13,
-						"w": 80,
-						"h": 75
-					},
-					"frame": {
-						"x": 154,
-						"y": 243,
-						"w": 80,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0095.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 13,
-						"w": 80,
-						"h": 75
-					},
-					"frame": {
-						"x": 154,
-						"y": 243,
-						"w": 80,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 14,
-						"w": 84,
-						"h": 74
-					},
-					"frame": {
-						"x": 234,
-						"y": 246,
-						"w": 84,
-						"h": 74
-					}
-				},
-				{
-					"filename": "0041.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 14,
-						"w": 84,
-						"h": 74
-					},
-					"frame": {
-						"x": 234,
-						"y": 246,
-						"w": 84,
-						"h": 74
-					}
-				},
-				{
-					"filename": "0089.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 14,
-						"w": 84,
-						"h": 74
-					},
-					"frame": {
-						"x": 234,
-						"y": 246,
-						"w": 84,
-						"h": 74
-					}
-				},
-				{
-					"filename": "0060.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 80,
-						"h": 79
-					},
-					"frame": {
-						"x": 74,
-						"y": 248,
-						"w": 80,
-						"h": 79
-					}
-				},
-				{
-					"filename": "0109.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 78,
-						"h": 81
-					},
-					"frame": {
-						"x": 73,
-						"y": 327,
-						"w": 78,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 77,
-						"h": 81
-					},
-					"frame": {
-						"x": 318,
-						"y": 246,
-						"w": 77,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0029.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 77,
-						"h": 81
-					},
-					"frame": {
-						"x": 318,
-						"y": 246,
-						"w": 77,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0053.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 77,
-						"h": 81
-					},
-					"frame": {
-						"x": 318,
-						"y": 246,
-						"w": 77,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0077.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 77,
-						"h": 81
-					},
-					"frame": {
-						"x": 318,
-						"y": 246,
-						"w": 77,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0098.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 9,
-						"w": 78,
-						"h": 79
-					},
-					"frame": {
-						"x": 395,
-						"y": 241,
-						"w": 78,
-						"h": 79
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 10,
-						"w": 78,
-						"h": 78
-					},
-					"frame": {
-						"x": 473,
-						"y": 239,
-						"w": 78,
-						"h": 78
-					}
-				},
-				{
-					"filename": "0048.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 10,
-						"w": 78,
-						"h": 78
-					},
-					"frame": {
-						"x": 473,
-						"y": 239,
-						"w": 78,
-						"h": 78
-					}
-				},
-				{
-					"filename": "0096.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 10,
-						"w": 78,
-						"h": 78
-					},
-					"frame": {
-						"x": 473,
-						"y": 239,
-						"w": 78,
-						"h": 78
-					}
-				},
-				{
-					"filename": "0072.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 10,
-						"w": 78,
-						"h": 78
-					},
-					"frame": {
-						"x": 75,
-						"y": 408,
-						"w": 78,
-						"h": 78
-					}
-				},
-				{
-					"filename": "0099.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 11,
-						"w": 79,
-						"h": 77
-					},
-					"frame": {
-						"x": 75,
-						"y": 486,
-						"w": 79,
-						"h": 77
-					}
-				},
-				{
-					"filename": "0071.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 13,
-						"w": 80,
-						"h": 75
-					},
-					"frame": {
-						"x": 154,
-						"y": 318,
-						"w": 80,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 15,
-						"w": 84,
-						"h": 73
-					},
-					"frame": {
-						"x": 234,
-						"y": 320,
-						"w": 84,
-						"h": 73
-					}
-				},
-				{
-					"filename": "0042.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 15,
-						"w": 84,
-						"h": 73
-					},
-					"frame": {
-						"x": 234,
-						"y": 320,
-						"w": 84,
-						"h": 73
-					}
-				},
-				{
-					"filename": "0090.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 15,
-						"w": 84,
-						"h": 73
-					},
-					"frame": {
-						"x": 234,
-						"y": 320,
-						"w": 84,
-						"h": 73
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 16,
-						"w": 84,
-						"h": 72
-					},
-					"frame": {
-						"x": 318,
-						"y": 327,
-						"w": 84,
-						"h": 72
-					}
-				},
-				{
-					"filename": "0043.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 16,
-						"w": 84,
-						"h": 72
-					},
-					"frame": {
-						"x": 318,
-						"y": 327,
-						"w": 84,
-						"h": 72
-					}
-				},
-				{
-					"filename": "0091.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 16,
-						"w": 84,
-						"h": 72
-					},
-					"frame": {
-						"x": 318,
-						"y": 327,
-						"w": 84,
-						"h": 72
-					}
-				},
-				{
-					"filename": "0065.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 14,
-						"w": 84,
-						"h": 74
-					},
-					"frame": {
-						"x": 153,
-						"y": 393,
-						"w": 84,
-						"h": 74
-					}
-				},
-				{
-					"filename": "0101.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 17,
-						"w": 81,
-						"h": 71
-					},
-					"frame": {
-						"x": 237,
-						"y": 393,
-						"w": 81,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0066.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 15,
-						"w": 84,
-						"h": 73
-					},
-					"frame": {
-						"x": 318,
-						"y": 399,
-						"w": 84,
-						"h": 73
-					}
-				},
-				{
-					"filename": "0106.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 13,
-						"w": 83,
-						"h": 75
-					},
-					"frame": {
-						"x": 402,
-						"y": 320,
-						"w": 83,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0105.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 14,
-						"w": 84,
-						"h": 74
-					},
-					"frame": {
-						"x": 402,
-						"y": 395,
-						"w": 84,
-						"h": 74
-					}
-				},
-				{
-					"filename": "0100.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 14,
-						"w": 80,
-						"h": 74
-					},
-					"frame": {
-						"x": 485,
-						"y": 317,
-						"w": 80,
-						"h": 74
-					}
-				},
-				{
-					"filename": "0104.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 15,
-						"w": 83,
-						"h": 73
-					},
-					"frame": {
-						"x": 486,
-						"y": 391,
-						"w": 83,
-						"h": 73
-					}
-				},
-				{
-					"filename": "0067.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 16,
-						"w": 84,
-						"h": 72
-					},
-					"frame": {
-						"x": 154,
-						"y": 467,
-						"w": 84,
-						"h": 72
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 17,
-						"w": 83,
-						"h": 71
-					},
-					"frame": {
-						"x": 154,
-						"y": 539,
-						"w": 83,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0045.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 17,
-						"w": 83,
-						"h": 71
-					},
-					"frame": {
-						"x": 154,
-						"y": 539,
-						"w": 83,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0093.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 17,
-						"w": 83,
-						"h": 71
-					},
-					"frame": {
-						"x": 154,
-						"y": 539,
-						"w": 83,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 17,
-						"w": 83,
-						"h": 71
-					},
-					"frame": {
-						"x": 486,
-						"y": 464,
-						"w": 83,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0046.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 17,
-						"w": 83,
-						"h": 71
-					},
-					"frame": {
-						"x": 486,
-						"y": 464,
-						"w": 83,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0094.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 17,
-						"w": 83,
-						"h": 71
-					},
-					"frame": {
-						"x": 486,
-						"y": 464,
-						"w": 83,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0069.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 17,
-						"w": 83,
-						"h": 71
-					},
-					"frame": {
-						"x": 402,
-						"y": 469,
-						"w": 83,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0070.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 17,
-						"w": 83,
-						"h": 71
-					},
-					"frame": {
-						"x": 485,
-						"y": 535,
-						"w": 83,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 16,
-						"w": 82,
-						"h": 72
-					},
-					"frame": {
-						"x": 237,
-						"y": 539,
-						"w": 82,
-						"h": 72
-					}
-				},
-				{
-					"filename": "0044.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 16,
-						"w": 82,
-						"h": 72
-					},
-					"frame": {
-						"x": 237,
-						"y": 539,
-						"w": 82,
-						"h": 72
-					}
-				},
-				{
-					"filename": "0092.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 16,
-						"w": 82,
-						"h": 72
-					},
-					"frame": {
-						"x": 237,
-						"y": 539,
-						"w": 82,
-						"h": 72
-					}
-				},
-				{
-					"filename": "0103.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 16,
-						"w": 83,
-						"h": 72
-					},
-					"frame": {
-						"x": 319,
-						"y": 472,
-						"w": 83,
-						"h": 72
-					}
-				},
-				{
-					"filename": "0102.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 18,
-						"w": 82,
-						"h": 70
-					},
-					"frame": {
-						"x": 319,
-						"y": 544,
-						"w": 82,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0068.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 16,
-						"w": 82,
-						"h": 72
-					},
-					"frame": {
-						"x": 402,
-						"y": 540,
-						"w": 82,
-						"h": 72
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:4329c19087eab420ea4188f3ebf013ba:3f36a5e65803b0f012c6fee4aeaf5df7:fcd0d2cb6b26724e796ae0dcb71fae3f$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 491, "y": 0, "w": 79, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 13, "w": 79, "h": 71 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 341, "y": 0, "w": 77, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 11, "w": 77, "h": 73 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 265, "y": 0, "w": 76, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 76, "h": 75 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 418, "y": 0, "w": 73, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 7, "w": 73, "h": 77 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 159, "y": 68, "w": 69, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 4, "w": 69, "h": 80 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 309, "y": 143, "w": 64, "h": 83 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 1, "w": 64, "h": 83 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 0, "y": 145, "w": 63, "h": 84 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 0, "w": 63, "h": 84 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 63, "y": 147, "w": 63, "h": 84 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 0, "w": 63, "h": 84 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 446, "y": 203, "w": 63, "h": 82 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 63, "h": 82 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 509, "y": 335, "w": 63, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 5, "w": 63, "h": 79 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 74, "y": 375, "w": 66, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 10, "w": 66, "h": 74 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 140, "y": 409, "w": 69, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 15, "w": 69, "h": 69 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 280, "y": 428, "w": 72, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 18, "w": 72, "h": 66 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 353, "y": 416, "w": 74, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 19, "w": 74, "h": 65 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 536, "y": 414, "w": 74, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 19, "w": 74, "h": 65 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 461, "y": 414, "w": 75, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 19, "w": 75, "h": 65 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 385, "y": 351, "w": 76, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 19, "w": 76, "h": 65 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 231, "y": 291, "w": 78, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 19, "w": 78, "h": 65 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 277, "y": 226, "w": 79, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 19, "w": 79, "h": 65 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 485, "y": 137, "w": 81, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 18, "w": 81, "h": 66 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 228, "y": 143, "w": 81, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 18, "w": 81, "h": 66 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 228, "y": 75, "w": 80, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 16, "w": 80, "h": 68 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 491, "y": 0, "w": 79, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 13, "w": 79, "h": 71 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 341, "y": 0, "w": 77, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 11, "w": 77, "h": 73 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 265, "y": 0, "w": 76, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 76, "h": 75 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 418, "y": 0, "w": 73, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 7, "w": 73, "h": 77 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 159, "y": 68, "w": 69, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 4, "w": 69, "h": 80 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 309, "y": 143, "w": 64, "h": 83 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 1, "w": 64, "h": 83 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 0, "y": 145, "w": 63, "h": 84 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 0, "w": 63, "h": 84 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 63, "y": 147, "w": 63, "h": 84 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 0, "w": 63, "h": 84 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 446, "y": 203, "w": 63, "h": 82 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 63, "h": 82 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 509, "y": 335, "w": 63, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 5, "w": 63, "h": 79 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 74, "y": 375, "w": 66, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 10, "w": 66, "h": 74 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 140, "y": 409, "w": 69, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 15, "w": 69, "h": 69 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 280, "y": 428, "w": 72, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 18, "w": 72, "h": 66 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 353, "y": 416, "w": 74, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 19, "w": 74, "h": 65 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 536, "y": 414, "w": 74, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 19, "w": 74, "h": 65 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 461, "y": 414, "w": 75, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 19, "w": 75, "h": 65 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 385, "y": 351, "w": 76, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 19, "w": 76, "h": 65 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 231, "y": 291, "w": 78, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 19, "w": 78, "h": 65 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 277, "y": 226, "w": 79, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 19, "w": 79, "h": 65 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 485, "y": 137, "w": 81, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 18, "w": 81, "h": 66 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 228, "y": 143, "w": 81, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 18, "w": 81, "h": 66 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 228, "y": 75, "w": 80, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 16, "w": 80, "h": 68 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 491, "y": 0, "w": 79, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 13, "w": 79, "h": 71 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 341, "y": 0, "w": 77, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 11, "w": 77, "h": 73 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 265, "y": 0, "w": 76, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 76, "h": 75 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 418, "y": 0, "w": 73, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 7, "w": 73, "h": 77 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 159, "y": 68, "w": 69, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 4, "w": 69, "h": 80 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 309, "y": 143, "w": 64, "h": 83 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 1, "w": 64, "h": 83 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 0, "y": 145, "w": 63, "h": 84 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 0, "w": 63, "h": 84 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 63, "y": 147, "w": 63, "h": 84 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 0, "w": 63, "h": 84 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 446, "y": 203, "w": 63, "h": 82 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 63, "h": 82 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 509, "y": 335, "w": 63, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 5, "w": 63, "h": 79 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 74, "y": 375, "w": 66, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 10, "w": 66, "h": 74 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 140, "y": 409, "w": 69, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 15, "w": 69, "h": 69 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 280, "y": 428, "w": 72, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 18, "w": 72, "h": 66 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 353, "y": 416, "w": 74, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 19, "w": 74, "h": 65 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 536, "y": 414, "w": 74, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 19, "w": 74, "h": 65 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 461, "y": 414, "w": 75, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 19, "w": 75, "h": 65 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 385, "y": 351, "w": 76, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 19, "w": 76, "h": 65 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 231, "y": 291, "w": 78, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 19, "w": 78, "h": 65 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 277, "y": 226, "w": 79, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 19, "w": 79, "h": 65 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 485, "y": 137, "w": 81, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 18, "w": 81, "h": 66 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 228, "y": 143, "w": 81, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 18, "w": 81, "h": 66 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 228, "y": 75, "w": 80, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 16, "w": 80, "h": 68 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 341, "y": 73, "w": 77, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 14, "w": 77, "h": 70 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 373, "y": 157, "w": 73, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 12, "w": 73, "h": 72 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 213, "y": 356, "w": 67, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 11, "w": 67, "h": 73 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 0, "y": 429, "w": 63, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 63, "h": 75 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 76, "y": 297, "w": 64, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 6, "w": 64, "h": 78 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 418, "y": 77, "w": 67, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 67, "h": 80 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 89, "y": 67, "w": 70, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 70, "h": 80 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 0, "y": 68, "w": 72, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 72, "h": 77 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 126, "y": 148, "w": 73, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 12, "w": 73, "h": 72 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 140, "y": 341, "w": 73, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 16, "w": 73, "h": 68 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 280, "y": 361, "w": 73, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 17, "w": 73, "h": 67 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 0, "y": 363, "w": 74, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 18, "w": 74, "h": 66 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 433, "y": 285, "w": 76, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 18, "w": 76, "h": 66 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 509, "y": 269, "w": 77, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 18, "w": 77, "h": 66 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 356, "y": 229, "w": 77, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 18, "w": 77, "h": 66 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 199, "y": 209, "w": 78, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 18, "w": 78, "h": 66 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 509, "y": 203, "w": 78, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 18, "w": 78, "h": 66 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 0, "y": 231, "w": 77, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 18, "w": 77, "h": 66 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 77, "y": 231, "w": 77, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 18, "w": 77, "h": 66 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 0, "y": 297, "w": 76, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 18, "w": 76, "h": 66 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 309, "y": 295, "w": 76, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 18, "w": 76, "h": 66 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0088.png",
+    "frame": { "x": 154, "y": 275, "w": 77, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 18, "w": 77, "h": 66 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0089.png",
+    "frame": { "x": 491, "y": 71, "w": 83, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 18, "w": 83, "h": 66 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0090.png",
+    "frame": { "x": 89, "y": 0, "w": 89, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 17, "w": 89, "h": 67 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0091.png",
+    "frame": { "x": 0, "y": 0, "w": 89, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 16, "w": 89, "h": 68 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0092.png",
+    "frame": { "x": 178, "y": 0, "w": 87, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 16, "w": 87, "h": 68 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.13-x64",
+  "image": "730.png",
+  "format": "I8",
+  "size": { "w": 610, "h": 504 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/730.png b/public/images/pokemon/exp/730.png
index 69244f9dff0..2d274bcf606 100644
Binary files a/public/images/pokemon/exp/730.png and b/public/images/pokemon/exp/730.png differ
diff --git a/public/images/pokemon/exp/746-school.json b/public/images/pokemon/exp/746-school.json
index 5081ae50573..5c972da9255 100644
--- a/public/images/pokemon/exp/746-school.json
+++ b/public/images/pokemon/exp/746-school.json
@@ -1,272 +1,191 @@
-{
-	"textures": [
-		{
-			"image": "746-school.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 268,
-				"h": 268
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 102,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 95,
-						"h": 73
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 95,
-						"h": 73
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 102,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 94,
-						"h": 73
-					},
-					"frame": {
-						"x": 0,
-						"y": 73,
-						"w": 94,
-						"h": 73
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 102,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 94,
-						"h": 73
-					},
-					"frame": {
-						"x": 0,
-						"y": 73,
-						"w": 94,
-						"h": 73
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 102,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 1,
-						"w": 93,
-						"h": 71
-					},
-					"frame": {
-						"x": 95,
-						"y": 0,
-						"w": 93,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 102,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 1,
-						"w": 93,
-						"h": 71
-					},
-					"frame": {
-						"x": 95,
-						"y": 0,
-						"w": 93,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 102,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 92,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 146,
-						"w": 92,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 102,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 92,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 146,
-						"w": 92,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 102,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 5,
-						"w": 91,
-						"h": 67
-					},
-					"frame": {
-						"x": 95,
-						"y": 71,
-						"w": 91,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 102,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 5,
-						"w": 91,
-						"h": 67
-					},
-					"frame": {
-						"x": 95,
-						"y": 71,
-						"w": 91,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 102,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 91,
-						"h": 66
-					},
-					"frame": {
-						"x": 94,
-						"y": 138,
-						"w": 91,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 102,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 91,
-						"h": 66
-					},
-					"frame": {
-						"x": 94,
-						"y": 138,
-						"w": 91,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 102,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 90,
-						"h": 64
-					},
-					"frame": {
-						"x": 92,
-						"y": 204,
-						"w": 90,
-						"h": 64
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:081944ebe67318e4a46f44a408e2f8ad:3d1760eb9efa179defcf703a35dde41b:10f3c9d1f1118f8f9f6e40f37a0eb499$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 408, "y": 257, "w": 96, "h": 83 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 94, "h": 81 },
+    "sourceSize": { "w": 104, "h": 89 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 411, "y": 174, "w": 99, "h": 83 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 6, "w": 97, "h": 81 },
+    "sourceSize": { "w": 104, "h": 89 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 311, "y": 175, "w": 97, "h": 84 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 6, "w": 95, "h": 82 },
+    "sourceSize": { "w": 104, "h": 89 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 411, "y": 89, "w": 101, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 99, "h": 83 },
+    "sourceSize": { "w": 104, "h": 89 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 311, "y": 89, "w": 100, "h": 86 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 98, "h": 84 },
+    "sourceSize": { "w": 104, "h": 89 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 213, "y": 1, "w": 104, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 102, "h": 86 },
+    "sourceSize": { "w": 104, "h": 89 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 317, "y": 1, "w": 104, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 102, "h": 86 },
+    "sourceSize": { "w": 104, "h": 89 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 1, "y": 1, "w": 106, "h": 89 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 104, "h": 87 },
+    "sourceSize": { "w": 104, "h": 89 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 421, "y": 1, "w": 104, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 102, "h": 86 },
+    "sourceSize": { "w": 104, "h": 89 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 107, "y": 1, "w": 106, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 104, "h": 86 },
+    "sourceSize": { "w": 104, "h": 89 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 107, "y": 89, "w": 102, "h": 87 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 100, "h": 85 },
+    "sourceSize": { "w": 104, "h": 89 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 209, "y": 89, "w": 102, "h": 87 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 100, "h": 85 },
+    "sourceSize": { "w": 104, "h": 89 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 1, "y": 90, "w": 97, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 95, "h": 83 },
+    "sourceSize": { "w": 104, "h": 89 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 1, "y": 175, "w": 96, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 94, "h": 83 },
+    "sourceSize": { "w": 104, "h": 89 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 289, "y": 259, "w": 92, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 90, "h": 83 },
+    "sourceSize": { "w": 104, "h": 89 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 192, "y": 260, "w": 91, "h": 84 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 89, "h": 82 },
+    "sourceSize": { "w": 104, "h": 89 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 194, "y": 176, "w": 95, "h": 84 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 6, "w": 93, "h": 82 },
+    "sourceSize": { "w": 104, "h": 89 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 1, "y": 260, "w": 93, "h": 83 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 6, "w": 91, "h": 81 },
+    "sourceSize": { "w": 104, "h": 89 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 97, "y": 259, "w": 95, "h": 83 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 6, "w": 93, "h": 81 },
+    "sourceSize": { "w": 104, "h": 89 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 97, "y": 176, "w": 97, "h": 83 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 95, "h": 81 },
+    "sourceSize": { "w": 104, "h": 89 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.13-x64",
+  "image": "746-school.png",
+  "format": "I8",
+  "size": { "w": 526, "h": 345 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/746-school.png b/public/images/pokemon/exp/746-school.png
index 4732a307f96..3b2b5e42dd5 100644
Binary files a/public/images/pokemon/exp/746-school.png and b/public/images/pokemon/exp/746-school.png differ
diff --git a/public/images/pokemon/exp/746.json b/public/images/pokemon/exp/746.json
index 43f4f67fc2b..9f5db562bf0 100644
--- a/public/images/pokemon/exp/746.json
+++ b/public/images/pokemon/exp/746.json
@@ -4,156 +4,51 @@
 			"image": "746.png",
 			"format": "RGBA8888",
 			"size": {
-				"w": 134,
-				"h": 134
+				"w": 100,
+				"h": 100
 			},
 			"scale": 1,
 			"frames": [
 				{
 					"filename": "0001.png",
 					"rotated": false,
-					"trimmed": false,
+					"trimmed": true,
 					"sourceSize": {
-						"w": 46,
-						"h": 28
+						"w": 50,
+						"h": 50
 					},
 					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 46,
-						"h": 28
+						"x": 7,
+						"y": 15,
+						"w": 39,
+						"h": 25
 					},
 					"frame": {
 						"x": 0,
 						"y": 0,
-						"w": 46,
-						"h": 28
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 46,
-						"h": 28
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 46,
-						"h": 28
-					},
-					"frame": {
-						"x": 0,
-						"y": 28,
-						"w": 46,
-						"h": 28
+						"w": 39,
+						"h": 25
 					}
 				},
 				{
 					"filename": "0003.png",
 					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 46,
-						"h": 28
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 46,
-						"h": 28
-					},
-					"frame": {
-						"x": 0,
-						"y": 56,
-						"w": 46,
-						"h": 28
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 46,
-						"h": 28
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 46,
-						"h": 28
-					},
-					"frame": {
-						"x": 0,
-						"y": 56,
-						"w": 46,
-						"h": 28
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 46,
-						"h": 28
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 46,
-						"h": 28
-					},
-					"frame": {
-						"x": 0,
-						"y": 84,
-						"w": 46,
-						"h": 28
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 46,
-						"h": 28
+						"w": 50,
+						"h": 50
 					},
 					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 46,
-						"h": 27
+						"x": 7,
+						"y": 15,
+						"w": 39,
+						"h": 25
 					},
 					"frame": {
-						"x": 46,
-						"y": 0,
-						"w": 46,
-						"h": 27
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 28
-					},
-					"spriteSourceSize": {
 						"x": 0,
 						"y": 0,
-						"w": 46,
-						"h": 27
-					},
-					"frame": {
-						"x": 46,
-						"y": 0,
-						"w": 46,
-						"h": 27
+						"w": 39,
+						"h": 25
 					}
 				},
 				{
@@ -161,41 +56,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 46,
-						"h": 28
+						"w": 50,
+						"h": 50
 					},
 					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 46,
-						"h": 27
+						"x": 7,
+						"y": 15,
+						"w": 39,
+						"h": 25
 					},
 					"frame": {
-						"x": 46,
-						"y": 27,
-						"w": 46,
-						"h": 27
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 28
-					},
-					"spriteSourceSize": {
 						"x": 0,
-						"y": 1,
-						"w": 46,
-						"h": 27
-					},
-					"frame": {
-						"x": 46,
-						"y": 27,
-						"w": 46,
-						"h": 27
+						"y": 0,
+						"w": 39,
+						"h": 25
 					}
 				},
 				{
@@ -203,41 +77,713 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 46,
-						"h": 28
+						"w": 50,
+						"h": 50
 					},
 					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 46,
-						"h": 27
+						"x": 7,
+						"y": 18,
+						"w": 39,
+						"h": 25
 					},
 					"frame": {
-						"x": 46,
-						"y": 54,
-						"w": 46,
-						"h": 27
+						"x": 0,
+						"y": 0,
+						"w": 39,
+						"h": 25
 					}
 				},
 				{
-					"filename": "0008.png",
+					"filename": "0009.png",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 46,
-						"h": 28
+						"w": 50,
+						"h": 50
 					},
 					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 46,
-						"h": 27
+						"x": 7,
+						"y": 21,
+						"w": 39,
+						"h": 25
 					},
 					"frame": {
-						"x": 46,
-						"y": 81,
-						"w": 46,
-						"h": 27
+						"x": 0,
+						"y": 0,
+						"w": 39,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0011.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 22,
+						"w": 39,
+						"h": 25
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 39,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0013.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 22,
+						"w": 39,
+						"h": 25
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 39,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0015.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 21,
+						"w": 39,
+						"h": 25
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 39,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0017.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 18,
+						"w": 39,
+						"h": 25
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 39,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0019.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 15,
+						"w": 39,
+						"h": 25
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 39,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0021.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 15,
+						"w": 39,
+						"h": 25
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 39,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0023.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 15,
+						"w": 39,
+						"h": 25
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 39,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0025.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 18,
+						"w": 39,
+						"h": 25
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 39,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0027.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 21,
+						"w": 39,
+						"h": 25
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 39,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0029.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 22,
+						"w": 39,
+						"h": 25
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 39,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0031.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 22,
+						"w": 39,
+						"h": 25
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 39,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0033.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 21,
+						"w": 39,
+						"h": 25
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 39,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0035.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 18,
+						"w": 39,
+						"h": 25
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 39,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0037.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 15,
+						"w": 39,
+						"h": 25
+					},
+					"frame": {
+						"x": 39,
+						"y": 0,
+						"w": 39,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0039.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 15,
+						"w": 39,
+						"h": 25
+					},
+					"frame": {
+						"x": 0,
+						"y": 25,
+						"w": 39,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0041.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 15,
+						"w": 39,
+						"h": 25
+					},
+					"frame": {
+						"x": 0,
+						"y": 25,
+						"w": 39,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0043.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 18,
+						"w": 39,
+						"h": 25
+					},
+					"frame": {
+						"x": 0,
+						"y": 25,
+						"w": 39,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0045.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 21,
+						"w": 39,
+						"h": 25
+					},
+					"frame": {
+						"x": 0,
+						"y": 25,
+						"w": 39,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0047.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 22,
+						"w": 39,
+						"h": 25
+					},
+					"frame": {
+						"x": 0,
+						"y": 25,
+						"w": 39,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0049.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 22,
+						"w": 39,
+						"h": 25
+					},
+					"frame": {
+						"x": 0,
+						"y": 25,
+						"w": 39,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0051.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 21,
+						"w": 39,
+						"h": 25
+					},
+					"frame": {
+						"x": 0,
+						"y": 25,
+						"w": 39,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0053.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 18,
+						"w": 39,
+						"h": 25
+					},
+					"frame": {
+						"x": 0,
+						"y": 25,
+						"w": 39,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0055.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 15,
+						"w": 39,
+						"h": 25
+					},
+					"frame": {
+						"x": 0,
+						"y": 25,
+						"w": 39,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0057.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 15,
+						"w": 39,
+						"h": 25
+					},
+					"frame": {
+						"x": 0,
+						"y": 25,
+						"w": 39,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0059.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 18,
+						"w": 39,
+						"h": 25
+					},
+					"frame": {
+						"x": 0,
+						"y": 25,
+						"w": 39,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0061.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 21,
+						"w": 39,
+						"h": 25
+					},
+					"frame": {
+						"x": 0,
+						"y": 25,
+						"w": 39,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0063.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 22,
+						"w": 39,
+						"h": 25
+					},
+					"frame": {
+						"x": 0,
+						"y": 25,
+						"w": 39,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0065.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 22,
+						"w": 39,
+						"h": 25
+					},
+					"frame": {
+						"x": 0,
+						"y": 25,
+						"w": 39,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0067.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 21,
+						"w": 39,
+						"h": 25
+					},
+					"frame": {
+						"x": 0,
+						"y": 25,
+						"w": 39,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0069.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 18,
+						"w": 39,
+						"h": 25
+					},
+					"frame": {
+						"x": 39,
+						"y": 25,
+						"w": 39,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0002.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 15,
+						"w": 35,
+						"h": 25
+					},
+					"frame": {
+						"x": 0,
+						"y": 50,
+						"w": 35,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0004.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 15,
+						"w": 35,
+						"h": 25
+					},
+					"frame": {
+						"x": 0,
+						"y": 50,
+						"w": 35,
+						"h": 25
 					}
 				},
 				{
@@ -245,20 +791,692 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 46,
-						"h": 28
+						"w": 50,
+						"h": 50
 					},
 					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 46,
-						"h": 26
+						"x": 7,
+						"y": 16,
+						"w": 35,
+						"h": 25
 					},
 					"frame": {
-						"x": 46,
-						"y": 108,
-						"w": 46,
-						"h": 26
+						"x": 0,
+						"y": 50,
+						"w": 35,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0008.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 20,
+						"w": 35,
+						"h": 25
+					},
+					"frame": {
+						"x": 0,
+						"y": 50,
+						"w": 35,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0010.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 22,
+						"w": 35,
+						"h": 25
+					},
+					"frame": {
+						"x": 0,
+						"y": 50,
+						"w": 35,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0012.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 22,
+						"w": 35,
+						"h": 25
+					},
+					"frame": {
+						"x": 0,
+						"y": 50,
+						"w": 35,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0014.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 22,
+						"w": 35,
+						"h": 25
+					},
+					"frame": {
+						"x": 0,
+						"y": 50,
+						"w": 35,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0016.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 20,
+						"w": 35,
+						"h": 25
+					},
+					"frame": {
+						"x": 0,
+						"y": 50,
+						"w": 35,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0018.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 16,
+						"w": 35,
+						"h": 25
+					},
+					"frame": {
+						"x": 0,
+						"y": 50,
+						"w": 35,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0020.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 15,
+						"w": 35,
+						"h": 25
+					},
+					"frame": {
+						"x": 0,
+						"y": 50,
+						"w": 35,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0022.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 15,
+						"w": 35,
+						"h": 25
+					},
+					"frame": {
+						"x": 0,
+						"y": 50,
+						"w": 35,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0024.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 16,
+						"w": 35,
+						"h": 25
+					},
+					"frame": {
+						"x": 0,
+						"y": 50,
+						"w": 35,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0026.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 20,
+						"w": 35,
+						"h": 25
+					},
+					"frame": {
+						"x": 0,
+						"y": 50,
+						"w": 35,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0028.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 22,
+						"w": 35,
+						"h": 25
+					},
+					"frame": {
+						"x": 0,
+						"y": 50,
+						"w": 35,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0030.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 22,
+						"w": 35,
+						"h": 25
+					},
+					"frame": {
+						"x": 0,
+						"y": 50,
+						"w": 35,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0032.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 22,
+						"w": 35,
+						"h": 25
+					},
+					"frame": {
+						"x": 0,
+						"y": 50,
+						"w": 35,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0034.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 20,
+						"w": 35,
+						"h": 25
+					},
+					"frame": {
+						"x": 0,
+						"y": 50,
+						"w": 35,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0036.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 16,
+						"w": 35,
+						"h": 25
+					},
+					"frame": {
+						"x": 0,
+						"y": 50,
+						"w": 35,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0038.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 15,
+						"w": 35,
+						"h": 25
+					},
+					"frame": {
+						"x": 0,
+						"y": 75,
+						"w": 35,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0040.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 15,
+						"w": 35,
+						"h": 25
+					},
+					"frame": {
+						"x": 35,
+						"y": 50,
+						"w": 35,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0042.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 16,
+						"w": 35,
+						"h": 25
+					},
+					"frame": {
+						"x": 35,
+						"y": 50,
+						"w": 35,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0044.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 20,
+						"w": 35,
+						"h": 25
+					},
+					"frame": {
+						"x": 35,
+						"y": 50,
+						"w": 35,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0046.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 22,
+						"w": 35,
+						"h": 25
+					},
+					"frame": {
+						"x": 35,
+						"y": 50,
+						"w": 35,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0048.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 22,
+						"w": 35,
+						"h": 25
+					},
+					"frame": {
+						"x": 35,
+						"y": 50,
+						"w": 35,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0050.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 22,
+						"w": 35,
+						"h": 25
+					},
+					"frame": {
+						"x": 35,
+						"y": 50,
+						"w": 35,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0052.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 20,
+						"w": 35,
+						"h": 25
+					},
+					"frame": {
+						"x": 35,
+						"y": 50,
+						"w": 35,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0054.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 15,
+						"w": 35,
+						"h": 25
+					},
+					"frame": {
+						"x": 35,
+						"y": 50,
+						"w": 35,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0056.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 15,
+						"w": 35,
+						"h": 25
+					},
+					"frame": {
+						"x": 35,
+						"y": 50,
+						"w": 35,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0058.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 16,
+						"w": 35,
+						"h": 25
+					},
+					"frame": {
+						"x": 35,
+						"y": 50,
+						"w": 35,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0060.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 20,
+						"w": 35,
+						"h": 25
+					},
+					"frame": {
+						"x": 35,
+						"y": 50,
+						"w": 35,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0062.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 22,
+						"w": 35,
+						"h": 25
+					},
+					"frame": {
+						"x": 35,
+						"y": 50,
+						"w": 35,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0064.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 22,
+						"w": 35,
+						"h": 25
+					},
+					"frame": {
+						"x": 35,
+						"y": 50,
+						"w": 35,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0066.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 22,
+						"w": 35,
+						"h": 25
+					},
+					"frame": {
+						"x": 35,
+						"y": 50,
+						"w": 35,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0068.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 20,
+						"w": 35,
+						"h": 25
+					},
+					"frame": {
+						"x": 35,
+						"y": 50,
+						"w": 35,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0070.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 16,
+						"w": 35,
+						"h": 25
+					},
+					"frame": {
+						"x": 35,
+						"y": 75,
+						"w": 35,
+						"h": 25
 					}
 				}
 			]
@@ -267,6 +1485,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:ed115b8b30c0e1285651afd1dde147d7:57cc34f3531fe7225c220731468a52f3:1a4f7e535d823202c4828f963d5b4404$"
+		"smartupdate": "$TexturePacker:SmartUpdate:f7634f2f6edeb6f56071bb6680b7f94b:08a6c2c31e47fffe1f31594d207e513f:1a4f7e535d823202c4828f963d5b4404$"
 	}
 }
diff --git a/public/images/pokemon/exp/746.png b/public/images/pokemon/exp/746.png
index 564f620edc9..e06ee8916de 100644
Binary files a/public/images/pokemon/exp/746.png and b/public/images/pokemon/exp/746.png differ
diff --git a/public/images/pokemon/exp/749.json b/public/images/pokemon/exp/749.json
index 69ac390edc1..da3a5a552a9 100644
--- a/public/images/pokemon/exp/749.json
+++ b/public/images/pokemon/exp/749.json
@@ -1,272 +1,1028 @@
-{
-	"textures": [
-		{
-			"image": "749.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 170,
-				"h": 170
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 45,
-						"h": 58
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 45,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 45,
-						"h": 58
-					},
-					"frame": {
-						"x": 45,
-						"y": 0,
-						"w": 45,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 45,
-						"h": 58
-					},
-					"frame": {
-						"x": 45,
-						"y": 0,
-						"w": 45,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 44,
-						"h": 58
-					},
-					"frame": {
-						"x": 90,
-						"y": 0,
-						"w": 44,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 44,
-						"h": 58
-					},
-					"frame": {
-						"x": 90,
-						"y": 0,
-						"w": 44,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 43,
-						"h": 58
-					},
-					"frame": {
-						"x": 0,
-						"y": 58,
-						"w": 43,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 43,
-						"h": 58
-					},
-					"frame": {
-						"x": 0,
-						"y": 58,
-						"w": 43,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 43,
-						"h": 58
-					},
-					"frame": {
-						"x": 43,
-						"y": 58,
-						"w": 43,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 43,
-						"h": 58
-					},
-					"frame": {
-						"x": 43,
-						"y": 58,
-						"w": 43,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 42,
-						"h": 58
-					},
-					"frame": {
-						"x": 86,
-						"y": 58,
-						"w": 42,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 42,
-						"h": 58
-					},
-					"frame": {
-						"x": 86,
-						"y": 58,
-						"w": 42,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 42,
-						"h": 58
-					},
-					"frame": {
-						"x": 128,
-						"y": 58,
-						"w": 42,
-						"h": 58
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:7f255a5a247eaf707c21fe9318b95606:5043a3dd96e0a55f3564a745c5bf699f:d52e05c524384ef985e6339a08b2f938$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 197, "y": 240, "w": 48, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 15, "w": 46, "h": 56 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 204, "y": 182, "w": 49, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 15, "w": 47, "h": 56 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 195, "y": 124, "w": 51, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 16, "w": 49, "h": 55 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 246, "y": 127, "w": 52, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 18, "w": 50, "h": 53 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 250, "y": 72, "w": 53, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 18, "w": 51, "h": 53 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 49, "y": 72, "w": 53, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 18, "w": 51, "h": 53 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 298, "y": 143, "w": 52, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 18, "w": 50, "h": 53 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 102, "y": 125, "w": 51, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 16, "w": 49, "h": 55 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 1, "y": 187, "w": 49, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 15, "w": 47, "h": 56 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 49, "y": 127, "w": 48, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 13, "w": 46, "h": 58 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 50, "y": 187, "w": 47, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 13, "w": 45, "h": 58 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 49, "y": 247, "w": 46, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 13, "w": 44, "h": 58 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 145, "y": 349, "w": 46, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 14, "w": 44, "h": 57 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 253, "y": 198, "w": 48, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 14, "w": 46, "h": 57 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 197, "y": 240, "w": 48, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 15, "w": 46, "h": 56 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 204, "y": 182, "w": 49, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 15, "w": 47, "h": 56 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 195, "y": 124, "w": 51, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 16, "w": 49, "h": 55 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 246, "y": 127, "w": 52, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 18, "w": 50, "h": 53 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 250, "y": 72, "w": 53, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 18, "w": 51, "h": 53 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 49, "y": 72, "w": 53, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 18, "w": 51, "h": 53 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 298, "y": 143, "w": 52, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 18, "w": 50, "h": 53 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 102, "y": 125, "w": 51, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 16, "w": 49, "h": 55 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 1, "y": 187, "w": 49, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 15, "w": 47, "h": 56 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 49, "y": 127, "w": 48, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 13, "w": 46, "h": 58 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 50, "y": 187, "w": 47, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 13, "w": 45, "h": 58 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 49, "y": 247, "w": 46, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 13, "w": 44, "h": 58 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 145, "y": 349, "w": 46, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 14, "w": 44, "h": 57 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 253, "y": 198, "w": 48, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 14, "w": 46, "h": 57 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 197, "y": 240, "w": 48, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 15, "w": 46, "h": 56 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 1, "y": 130, "w": 48, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 17, "w": 46, "h": 54 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 146, "y": 294, "w": 50, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 18, "w": 48, "h": 53 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 191, "y": 359, "w": 47, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 13, "w": 45, "h": 55 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 50, "y": 307, "w": 45, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 43, "h": 58 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 1, "y": 363, "w": 43, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 4, "w": 41, "h": 60 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 95, "y": 350, "w": 47, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 8, "w": 45, "h": 55 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 245, "y": 257, "w": 50, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 12, "w": 48, "h": 53 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 301, "y": 255, "w": 50, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 15, "w": 48, "h": 53 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 95, "y": 295, "w": 50, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 18, "w": 48, "h": 53 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 1, "y": 307, "w": 49, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 17, "w": 47, "h": 54 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 97, "y": 238, "w": 49, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 16, "w": 47, "h": 55 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 197, "y": 240, "w": 48, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 15, "w": 46, "h": 56 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 204, "y": 182, "w": 49, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 15, "w": 47, "h": 56 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 195, "y": 124, "w": 51, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 16, "w": 49, "h": 55 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 246, "y": 127, "w": 52, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 18, "w": 50, "h": 53 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 250, "y": 72, "w": 53, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 18, "w": 51, "h": 53 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 49, "y": 72, "w": 53, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 18, "w": 51, "h": 53 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 298, "y": 143, "w": 52, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 18, "w": 50, "h": 53 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 102, "y": 125, "w": 51, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 16, "w": 49, "h": 55 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 1, "y": 187, "w": 49, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 15, "w": 47, "h": 56 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 49, "y": 127, "w": 48, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 13, "w": 46, "h": 58 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 50, "y": 187, "w": 47, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 13, "w": 45, "h": 58 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 49, "y": 247, "w": 46, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 13, "w": 44, "h": 58 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 145, "y": 349, "w": 46, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 14, "w": 44, "h": 57 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 253, "y": 198, "w": 48, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 14, "w": 46, "h": 57 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 197, "y": 240, "w": 48, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 15, "w": 46, "h": 56 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 1, "y": 130, "w": 48, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 17, "w": 46, "h": 54 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 146, "y": 294, "w": 50, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 18, "w": 48, "h": 53 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 191, "y": 359, "w": 47, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 13, "w": 45, "h": 55 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 50, "y": 307, "w": 45, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 43, "h": 58 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 1, "y": 363, "w": 43, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 4, "w": 41, "h": 60 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 95, "y": 350, "w": 47, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 8, "w": 45, "h": 55 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 245, "y": 257, "w": 50, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 12, "w": 48, "h": 53 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 301, "y": 255, "w": 50, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 15, "w": 48, "h": 53 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 95, "y": 295, "w": 50, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 18, "w": 48, "h": 53 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 1, "y": 307, "w": 49, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 17, "w": 47, "h": 54 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 97, "y": 238, "w": 49, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 16, "w": 47, "h": 55 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 197, "y": 240, "w": 48, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 15, "w": 46, "h": 56 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 1, "y": 130, "w": 48, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 17, "w": 46, "h": 54 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 146, "y": 294, "w": 50, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 18, "w": 48, "h": 53 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 191, "y": 359, "w": 47, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 13, "w": 45, "h": 55 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 50, "y": 307, "w": 45, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 43, "h": 58 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 1, "y": 363, "w": 43, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 4, "w": 41, "h": 60 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 95, "y": 350, "w": 47, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 8, "w": 45, "h": 55 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 245, "y": 257, "w": 50, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 12, "w": 48, "h": 53 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 301, "y": 255, "w": 50, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 15, "w": 48, "h": 53 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 95, "y": 295, "w": 50, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 18, "w": 48, "h": 53 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 1, "y": 307, "w": 49, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 17, "w": 47, "h": 54 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 97, "y": 238, "w": 49, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 16, "w": 47, "h": 55 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 197, "y": 240, "w": 48, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 15, "w": 46, "h": 56 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 204, "y": 182, "w": 49, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 15, "w": 47, "h": 56 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 195, "y": 124, "w": 51, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 16, "w": 49, "h": 55 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 246, "y": 127, "w": 52, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 18, "w": 50, "h": 53 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 250, "y": 72, "w": 53, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 18, "w": 51, "h": 53 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 49, "y": 72, "w": 53, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 18, "w": 51, "h": 53 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 298, "y": 143, "w": 52, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 18, "w": 50, "h": 53 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 102, "y": 125, "w": 51, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 16, "w": 49, "h": 55 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 1, "y": 187, "w": 49, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 15, "w": 47, "h": 56 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0088.png",
+    "frame": { "x": 49, "y": 127, "w": 48, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 13, "w": 46, "h": 58 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0089.png",
+    "frame": { "x": 50, "y": 187, "w": 47, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 13, "w": 45, "h": 58 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0090.png",
+    "frame": { "x": 49, "y": 247, "w": 46, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 13, "w": 44, "h": 58 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0091.png",
+    "frame": { "x": 145, "y": 349, "w": 46, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 14, "w": 44, "h": 57 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0092.png",
+    "frame": { "x": 253, "y": 198, "w": 48, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 14, "w": 46, "h": 57 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0093.png",
+    "frame": { "x": 1, "y": 245, "w": 48, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 15, "w": 46, "h": 56 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0094.png",
+    "frame": { "x": 301, "y": 198, "w": 49, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 16, "w": 47, "h": 55 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0095.png",
+    "frame": { "x": 153, "y": 181, "w": 51, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 17, "w": 49, "h": 54 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0096.png",
+    "frame": { "x": 141, "y": 70, "w": 54, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 18, "w": 52, "h": 53 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0097.png",
+    "frame": { "x": 195, "y": 70, "w": 55, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 19, "w": 53, "h": 52 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0098.png",
+    "frame": { "x": 234, "y": 1, "w": 52, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 14, "w": 50, "h": 57 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0099.png",
+    "frame": { "x": 1, "y": 69, "w": 48, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 10, "w": 46, "h": 59 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0100.png",
+    "frame": { "x": 141, "y": 1, "w": 48, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 6, "w": 46, "h": 63 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0101.png",
+    "frame": { "x": 1, "y": 1, "w": 49, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 3, "w": 47, "h": 66 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0102.png",
+    "frame": { "x": 329, "y": 1, "w": 42, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 0, "w": 40, "h": 69 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0103.png",
+    "frame": { "x": 96, "y": 1, "w": 45, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 0, "w": 43, "h": 69 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0104.png",
+    "frame": { "x": 303, "y": 72, "w": 41, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 0, "w": 39, "h": 69 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0105.png",
+    "frame": { "x": 50, "y": 1, "w": 46, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 0, "w": 44, "h": 69 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0106.png",
+    "frame": { "x": 286, "y": 1, "w": 43, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 0, "w": 41, "h": 69 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0107.png",
+    "frame": { "x": 189, "y": 1, "w": 45, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 43, "h": 67 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0108.png",
+    "frame": { "x": 344, "y": 72, "w": 42, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 6, "w": 40, "h": 63 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0109.png",
+    "frame": { "x": 196, "y": 298, "w": 45, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 10, "w": 43, "h": 59 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0110.png",
+    "frame": { "x": 241, "y": 312, "w": 47, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 14, "w": 45, "h": 56 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0111.png",
+    "frame": { "x": 295, "y": 310, "w": 49, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 17, "w": 47, "h": 54 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0112.png",
+    "frame": { "x": 97, "y": 182, "w": 51, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 17, "w": 49, "h": 54 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0113.png",
+    "frame": { "x": 148, "y": 237, "w": 49, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 16, "w": 47, "h": 55 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.13-x64",
+  "image": "749.png",
+  "format": "I8",
+  "size": { "w": 387, "h": 426 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/749.png b/public/images/pokemon/exp/749.png
index 3ff9a80592a..8d188b69a55 100644
Binary files a/public/images/pokemon/exp/749.png and b/public/images/pokemon/exp/749.png differ
diff --git a/public/images/pokemon/exp/750.json b/public/images/pokemon/exp/750.json
index 1acc93e6c42..f8817cf7770 100644
--- a/public/images/pokemon/exp/750.json
+++ b/public/images/pokemon/exp/750.json
@@ -1,272 +1,929 @@
-{
-	"textures": [
-		{
-			"image": "750.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 230,
-				"h": 230
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 60,
-						"h": 78
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 60,
-						"h": 78
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 60,
-						"h": 78
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 60,
-						"h": 78
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 57,
-						"h": 78
-					},
-					"frame": {
-						"x": 0,
-						"y": 78,
-						"w": 57,
-						"h": 78
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 57,
-						"h": 78
-					},
-					"frame": {
-						"x": 0,
-						"y": 78,
-						"w": 57,
-						"h": 78
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 55,
-						"h": 78
-					},
-					"frame": {
-						"x": 57,
-						"y": 78,
-						"w": 55,
-						"h": 78
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 65,
-						"h": 77
-					},
-					"frame": {
-						"x": 60,
-						"y": 0,
-						"w": 65,
-						"h": 77
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 65,
-						"h": 77
-					},
-					"frame": {
-						"x": 60,
-						"y": 0,
-						"w": 65,
-						"h": 77
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 65,
-						"h": 77
-					},
-					"frame": {
-						"x": 125,
-						"y": 0,
-						"w": 65,
-						"h": 77
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 64,
-						"h": 76
-					},
-					"frame": {
-						"x": 112,
-						"y": 77,
-						"w": 64,
-						"h": 76
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 64,
-						"h": 76
-					},
-					"frame": {
-						"x": 112,
-						"y": 77,
-						"w": 64,
-						"h": 76
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 62,
-						"h": 77
-					},
-					"frame": {
-						"x": 112,
-						"y": 153,
-						"w": 62,
-						"h": 77
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 62,
-						"h": 77
-					},
-					"frame": {
-						"x": 112,
-						"y": 153,
-						"w": 62,
-						"h": 77
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:bd70c3cd0fb03a598c57d5cb0c94e175:820365fc5d0d7a145bacef3ec0815440:4ad6abb5f7a40182d2391bde900ad082$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 394, "y": 218, "w": 76, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 16, "w": 74, "h": 68 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 231, "y": 163, "w": 78, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 16, "w": 76, "h": 68 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 476, "y": 217, "w": 79, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 17, "w": 77, "h": 67 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 151, "y": 163, "w": 80, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 17, "w": 78, "h": 67 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 394, "y": 150, "w": 82, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 18, "w": 80, "h": 66 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 1, "y": 150, "w": 83, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 18, "w": 81, "h": 66 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 327, "y": 81, "w": 85, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 18, "w": 83, "h": 66 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 1, "y": 83, "w": 86, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 19, "w": 84, "h": 65 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 87, "y": 83, "w": 86, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 19, "w": 84, "h": 65 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 412, "y": 83, "w": 86, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 19, "w": 84, "h": 65 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 498, "y": 83, "w": 85, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 19, "w": 83, "h": 65 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 476, "y": 150, "w": 83, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 19, "w": 81, "h": 65 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 64, "y": 234, "w": 79, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 19, "w": 77, "h": 65 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 202, "y": 311, "w": 77, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 19, "w": 75, "h": 65 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 279, "y": 357, "w": 74, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 18, "w": 72, "h": 66 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 201, "y": 448, "w": 70, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 17, "w": 68, "h": 67 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 1, "y": 448, "w": 70, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 17, "w": 68, "h": 67 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 271, "y": 494, "w": 69, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 17, "w": 67, "h": 67 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 509, "y": 489, "w": 69, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 17, "w": 67, "h": 67 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 345, "y": 435, "w": 70, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 17, "w": 68, "h": 67 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 438, "y": 426, "w": 71, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 17, "w": 69, "h": 67 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 438, "y": 356, "w": 73, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 16, "w": 71, "h": 68 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 64, "y": 301, "w": 75, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 17, "w": 73, "h": 67 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 394, "y": 218, "w": 76, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 16, "w": 74, "h": 68 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 231, "y": 163, "w": 78, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 16, "w": 76, "h": 68 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 476, "y": 217, "w": 79, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 17, "w": 77, "h": 67 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 151, "y": 163, "w": 80, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 17, "w": 78, "h": 67 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 394, "y": 150, "w": 82, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 18, "w": 80, "h": 66 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 1, "y": 150, "w": 83, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 18, "w": 81, "h": 66 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 327, "y": 81, "w": 85, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 18, "w": 83, "h": 66 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 1, "y": 83, "w": 86, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 19, "w": 84, "h": 65 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 87, "y": 83, "w": 86, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 19, "w": 84, "h": 65 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 412, "y": 83, "w": 86, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 19, "w": 84, "h": 65 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 498, "y": 83, "w": 85, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 19, "w": 83, "h": 65 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 476, "y": 150, "w": 83, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 19, "w": 81, "h": 65 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 64, "y": 234, "w": 79, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 19, "w": 77, "h": 65 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 202, "y": 311, "w": 77, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 19, "w": 75, "h": 65 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 279, "y": 357, "w": 74, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 18, "w": 72, "h": 66 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 201, "y": 448, "w": 70, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 17, "w": 68, "h": 67 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 1, "y": 448, "w": 70, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 17, "w": 68, "h": 67 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 271, "y": 494, "w": 69, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 17, "w": 67, "h": 67 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 509, "y": 489, "w": 69, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 17, "w": 67, "h": 67 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 345, "y": 435, "w": 70, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 17, "w": 68, "h": 67 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 438, "y": 426, "w": 71, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 17, "w": 69, "h": 67 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 438, "y": 356, "w": 73, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 16, "w": 71, "h": 68 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 64, "y": 301, "w": 75, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 17, "w": 73, "h": 67 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 394, "y": 218, "w": 76, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 16, "w": 74, "h": 68 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 231, "y": 163, "w": 78, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 16, "w": 76, "h": 68 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 476, "y": 217, "w": 79, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 17, "w": 77, "h": 67 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 151, "y": 163, "w": 80, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 17, "w": 78, "h": 67 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 394, "y": 150, "w": 82, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 18, "w": 80, "h": 66 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 1, "y": 150, "w": 83, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 18, "w": 81, "h": 66 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 327, "y": 81, "w": 85, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 18, "w": 83, "h": 66 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 1, "y": 83, "w": 86, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 19, "w": 84, "h": 65 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 87, "y": 83, "w": 86, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 19, "w": 84, "h": 65 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 412, "y": 83, "w": 86, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 19, "w": 84, "h": 65 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 498, "y": 83, "w": 85, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 19, "w": 83, "h": 65 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 476, "y": 150, "w": 83, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 19, "w": 81, "h": 65 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 64, "y": 234, "w": 79, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 19, "w": 77, "h": 65 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 202, "y": 311, "w": 77, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 19, "w": 75, "h": 65 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 279, "y": 357, "w": 74, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 18, "w": 72, "h": 66 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 201, "y": 448, "w": 70, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 17, "w": 68, "h": 67 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 1, "y": 448, "w": 70, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 17, "w": 68, "h": 67 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 271, "y": 494, "w": 69, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 17, "w": 67, "h": 67 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 509, "y": 489, "w": 69, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 17, "w": 67, "h": 67 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 345, "y": 435, "w": 70, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 17, "w": 68, "h": 67 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 438, "y": 426, "w": 71, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 17, "w": 69, "h": 67 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 438, "y": 356, "w": 73, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 16, "w": 71, "h": 68 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 64, "y": 301, "w": 75, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 17, "w": 73, "h": 67 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 394, "y": 218, "w": 76, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 16, "w": 74, "h": 68 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 309, "y": 220, "w": 76, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 16, "w": 74, "h": 68 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 385, "y": 288, "w": 77, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 18, "w": 75, "h": 66 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 295, "y": 290, "w": 78, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 20, "w": 76, "h": 65 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 1, "y": 384, "w": 78, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 22, "w": 76, "h": 62 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 511, "y": 425, "w": 77, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 22, "w": 75, "h": 62 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 340, "y": 504, "w": 72, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 20, "w": 70, "h": 64 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 1, "y": 517, "w": 64, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 15, "w": 62, "h": 68 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 139, "y": 384, "w": 62, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 7, "w": 60, "h": 76 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 79, "y": 370, "w": 60, "h": 83 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 2, "w": 58, "h": 81 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 1, "y": 218, "w": 63, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 0, "w": 61, "h": 83 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 84, "y": 150, "w": 67, "h": 84 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 1, "w": 65, "h": 82 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 479, "y": 1, "w": 71, "h": 82 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 69, "h": 80 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 406, "y": 1, "w": 73, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 5, "w": 71, "h": 78 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 242, "y": 84, "w": 72, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 6, "w": 70, "h": 77 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 227, "y": 233, "w": 68, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 7, "w": 66, "h": 76 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 373, "y": 356, "w": 65, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 16, "y": 6, "w": 63, "h": 77 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 1, "y": 303, "w": 62, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 16, "y": 4, "w": 60, "h": 79 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0088.png",
+    "frame": { "x": 139, "y": 302, "w": 63, "h": 82 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 3, "w": 61, "h": 80 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0089.png",
+    "frame": { "x": 173, "y": 80, "w": 69, "h": 83 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 2, "w": 67, "h": 81 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0090.png",
+    "frame": { "x": 249, "y": 1, "w": 78, "h": 83 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 2, "w": 76, "h": 81 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0091.png",
+    "frame": { "x": 85, "y": 1, "w": 82, "h": 82 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 3, "w": 80, "h": 80 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0092.png",
+    "frame": { "x": 1, "y": 1, "w": 84, "h": 82 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 3, "w": 82, "h": 80 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0093.png",
+    "frame": { "x": 167, "y": 1, "w": 82, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 6, "w": 80, "h": 77 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0094.png",
+    "frame": { "x": 327, "y": 1, "w": 79, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 10, "w": 77, "h": 73 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0095.png",
+    "frame": { "x": 314, "y": 149, "w": 80, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 14, "w": 78, "h": 69 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0096.png",
+    "frame": { "x": 470, "y": 286, "w": 75, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 15, "w": 73, "h": 68 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0097.png",
+    "frame": { "x": 415, "y": 495, "w": 69, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 17, "w": 67, "h": 67 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0098.png",
+    "frame": { "x": 71, "y": 462, "w": 70, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 17, "w": 68, "h": 67 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0099.png",
+    "frame": { "x": 202, "y": 378, "w": 71, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 16, "w": 69, "h": 68 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0100.png",
+    "frame": { "x": 273, "y": 425, "w": 72, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 17, "w": 70, "h": 67 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0101.png",
+    "frame": { "x": 511, "y": 356, "w": 74, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 17, "w": 72, "h": 67 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0102.png",
+    "frame": { "x": 151, "y": 232, "w": 76, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 16, "w": 74, "h": 68 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.13-x64",
+  "image": "750.png",
+  "format": "I8",
+  "size": { "w": 589, "h": 588 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/750.png b/public/images/pokemon/exp/750.png
index 9c9d6047887..4f3d6dbaa68 100644
Binary files a/public/images/pokemon/exp/750.png and b/public/images/pokemon/exp/750.png differ
diff --git a/public/images/pokemon/exp/780.json b/public/images/pokemon/exp/780.json
index f8ad9f3fabf..9aaf27d0d99 100644
--- a/public/images/pokemon/exp/780.json
+++ b/public/images/pokemon/exp/780.json
@@ -1,272 +1,884 @@
-{
-	"textures": [
-		{
-			"image": "780.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 244,
-				"h": 244
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 61
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 93,
-						"h": 61
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 93,
-						"h": 61
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 61
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 93,
-						"h": 61
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 93,
-						"h": 61
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 61
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 91,
-						"h": 61
-					},
-					"frame": {
-						"x": 93,
-						"y": 0,
-						"w": 91,
-						"h": 61
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 61
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 91,
-						"h": 61
-					},
-					"frame": {
-						"x": 0,
-						"y": 61,
-						"w": 91,
-						"h": 61
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 61
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 91,
-						"h": 61
-					},
-					"frame": {
-						"x": 0,
-						"y": 61,
-						"w": 91,
-						"h": 61
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 61
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 0,
-						"w": 89,
-						"h": 61
-					},
-					"frame": {
-						"x": 0,
-						"y": 122,
-						"w": 89,
-						"h": 61
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 61
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 0,
-						"w": 89,
-						"h": 61
-					},
-					"frame": {
-						"x": 0,
-						"y": 122,
-						"w": 89,
-						"h": 61
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 61
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 0,
-						"w": 86,
-						"h": 61
-					},
-					"frame": {
-						"x": 0,
-						"y": 183,
-						"w": 86,
-						"h": 61
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 61
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 0,
-						"w": 86,
-						"h": 61
-					},
-					"frame": {
-						"x": 0,
-						"y": 183,
-						"w": 86,
-						"h": 61
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 61
-					},
-					"spriteSourceSize": {
-						"x": 13,
-						"y": 0,
-						"w": 83,
-						"h": 61
-					},
-					"frame": {
-						"x": 86,
-						"y": 183,
-						"w": 83,
-						"h": 61
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 61
-					},
-					"spriteSourceSize": {
-						"x": 13,
-						"y": 0,
-						"w": 83,
-						"h": 61
-					},
-					"frame": {
-						"x": 86,
-						"y": 183,
-						"w": 83,
-						"h": 61
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 61
-					},
-					"spriteSourceSize": {
-						"x": 15,
-						"y": 0,
-						"w": 81,
-						"h": 61
-					},
-					"frame": {
-						"x": 89,
-						"y": 122,
-						"w": 81,
-						"h": 61
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:fe34fb6d380349d40565cc0028a1e450:fc8d4060739ce529ee2874e9cb8d68ed:9470182902340de73b2565411cb0ab89$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 303, "y": 72, "w": 72, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 72, "h": 70 },
+    "sourceSize": { "w": 78, "h": 72 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 376, "y": 72, "w": 72, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 72, "h": 70 },
+    "sourceSize": { "w": 78, "h": 72 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 449, "y": 72, "w": 72, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 72, "h": 70 },
+    "sourceSize": { "w": 78, "h": 72 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 1, "y": 214, "w": 72, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 72, "h": 69 },
+    "sourceSize": { "w": 78, "h": 72 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 365, "y": 214, "w": 73, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 73, "h": 68 },
+    "sourceSize": { "w": 78, "h": 72 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 292, "y": 284, "w": 72, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 72, "h": 68 },
+    "sourceSize": { "w": 78, "h": 72 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 439, "y": 214, "w": 73, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 73, "h": 68 },
+    "sourceSize": { "w": 78, "h": 72 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 439, "y": 350, "w": 73, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 73, "h": 67 },
+    "sourceSize": { "w": 78, "h": 72 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 223, "y": 353, "w": 74, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 74, "h": 66 },
+    "sourceSize": { "w": 78, "h": 72 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 439, "y": 283, "w": 75, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 75, "h": 66 },
+    "sourceSize": { "w": 78, "h": 72 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 148, "y": 353, "w": 74, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 6, "w": 74, "h": 66 },
+    "sourceSize": { "w": 78, "h": 72 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 73, "y": 351, "w": 74, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 74, "h": 66 },
+    "sourceSize": { "w": 78, "h": 72 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 145, "y": 214, "w": 75, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 75, "h": 67 },
+    "sourceSize": { "w": 78, "h": 72 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 219, "y": 144, "w": 74, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 74, "h": 68 },
+    "sourceSize": { "w": 78, "h": 72 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 365, "y": 283, "w": 73, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 73, "h": 68 },
+    "sourceSize": { "w": 78, "h": 72 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 74, "y": 282, "w": 73, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 73, "h": 68 },
+    "sourceSize": { "w": 78, "h": 72 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 292, "y": 214, "w": 72, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 72, "h": 69 },
+    "sourceSize": { "w": 78, "h": 72 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 367, "y": 143, "w": 72, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 72, "h": 70 },
+    "sourceSize": { "w": 78, "h": 72 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 303, "y": 72, "w": 72, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 72, "h": 70 },
+    "sourceSize": { "w": 78, "h": 72 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 376, "y": 72, "w": 72, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 72, "h": 70 },
+    "sourceSize": { "w": 78, "h": 72 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 449, "y": 72, "w": 72, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 72, "h": 70 },
+    "sourceSize": { "w": 78, "h": 72 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 1, "y": 214, "w": 72, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 72, "h": 69 },
+    "sourceSize": { "w": 78, "h": 72 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 365, "y": 214, "w": 73, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 73, "h": 68 },
+    "sourceSize": { "w": 78, "h": 72 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 292, "y": 284, "w": 72, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 72, "h": 68 },
+    "sourceSize": { "w": 78, "h": 72 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 439, "y": 214, "w": 73, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 73, "h": 68 },
+    "sourceSize": { "w": 78, "h": 72 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 439, "y": 350, "w": 73, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 73, "h": 67 },
+    "sourceSize": { "w": 78, "h": 72 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 223, "y": 353, "w": 74, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 74, "h": 66 },
+    "sourceSize": { "w": 78, "h": 72 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 439, "y": 283, "w": 75, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 75, "h": 66 },
+    "sourceSize": { "w": 78, "h": 72 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 148, "y": 353, "w": 74, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 6, "w": 74, "h": 66 },
+    "sourceSize": { "w": 78, "h": 72 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 73, "y": 351, "w": 74, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 74, "h": 66 },
+    "sourceSize": { "w": 78, "h": 72 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 145, "y": 214, "w": 75, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 75, "h": 67 },
+    "sourceSize": { "w": 78, "h": 72 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 219, "y": 144, "w": 74, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 74, "h": 68 },
+    "sourceSize": { "w": 78, "h": 72 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 365, "y": 283, "w": 73, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 73, "h": 68 },
+    "sourceSize": { "w": 78, "h": 72 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 74, "y": 282, "w": 73, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 73, "h": 68 },
+    "sourceSize": { "w": 78, "h": 72 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 292, "y": 214, "w": 72, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 72, "h": 69 },
+    "sourceSize": { "w": 78, "h": 72 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 367, "y": 143, "w": 72, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 72, "h": 70 },
+    "sourceSize": { "w": 78, "h": 72 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 303, "y": 72, "w": 72, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 72, "h": 70 },
+    "sourceSize": { "w": 78, "h": 72 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 376, "y": 72, "w": 72, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 72, "h": 70 },
+    "sourceSize": { "w": 78, "h": 72 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 449, "y": 72, "w": 72, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 72, "h": 70 },
+    "sourceSize": { "w": 78, "h": 72 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 1, "y": 214, "w": 72, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 72, "h": 69 },
+    "sourceSize": { "w": 78, "h": 72 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 365, "y": 214, "w": 73, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 73, "h": 68 },
+    "sourceSize": { "w": 78, "h": 72 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 292, "y": 284, "w": 72, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 72, "h": 68 },
+    "sourceSize": { "w": 78, "h": 72 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 439, "y": 214, "w": 73, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 73, "h": 68 },
+    "sourceSize": { "w": 78, "h": 72 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 439, "y": 350, "w": 73, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 73, "h": 67 },
+    "sourceSize": { "w": 78, "h": 72 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 223, "y": 353, "w": 74, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 74, "h": 66 },
+    "sourceSize": { "w": 78, "h": 72 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 439, "y": 283, "w": 75, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 75, "h": 66 },
+    "sourceSize": { "w": 78, "h": 72 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 148, "y": 353, "w": 74, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 6, "w": 74, "h": 66 },
+    "sourceSize": { "w": 78, "h": 72 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 73, "y": 351, "w": 74, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 74, "h": 66 },
+    "sourceSize": { "w": 78, "h": 72 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 145, "y": 214, "w": 75, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 75, "h": 67 },
+    "sourceSize": { "w": 78, "h": 72 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 219, "y": 144, "w": 74, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 74, "h": 68 },
+    "sourceSize": { "w": 78, "h": 72 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 365, "y": 283, "w": 73, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 73, "h": 68 },
+    "sourceSize": { "w": 78, "h": 72 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 74, "y": 282, "w": 73, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 73, "h": 68 },
+    "sourceSize": { "w": 78, "h": 72 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 292, "y": 214, "w": 72, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 72, "h": 69 },
+    "sourceSize": { "w": 78, "h": 72 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 367, "y": 143, "w": 72, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 72, "h": 70 },
+    "sourceSize": { "w": 78, "h": 72 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 303, "y": 72, "w": 72, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 72, "h": 70 },
+    "sourceSize": { "w": 78, "h": 72 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 376, "y": 72, "w": 72, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 72, "h": 70 },
+    "sourceSize": { "w": 78, "h": 72 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 449, "y": 72, "w": 72, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 72, "h": 70 },
+    "sourceSize": { "w": 78, "h": 72 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 1, "y": 214, "w": 72, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 72, "h": 69 },
+    "sourceSize": { "w": 78, "h": 72 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 365, "y": 214, "w": 73, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 73, "h": 68 },
+    "sourceSize": { "w": 78, "h": 72 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 292, "y": 284, "w": 72, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 72, "h": 68 },
+    "sourceSize": { "w": 78, "h": 72 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 439, "y": 214, "w": 73, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 73, "h": 68 },
+    "sourceSize": { "w": 78, "h": 72 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 439, "y": 350, "w": 73, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 73, "h": 67 },
+    "sourceSize": { "w": 78, "h": 72 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 223, "y": 353, "w": 74, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 74, "h": 66 },
+    "sourceSize": { "w": 78, "h": 72 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 439, "y": 283, "w": 75, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 75, "h": 66 },
+    "sourceSize": { "w": 78, "h": 72 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 148, "y": 353, "w": 74, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 6, "w": 74, "h": 66 },
+    "sourceSize": { "w": 78, "h": 72 },
+    "duration": 100
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 73, "y": 351, "w": 74, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 74, "h": 66 },
+    "sourceSize": { "w": 78, "h": 72 },
+    "duration": 100
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 145, "y": 214, "w": 75, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 75, "h": 67 },
+    "sourceSize": { "w": 78, "h": 72 },
+    "duration": 100
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 219, "y": 144, "w": 74, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 74, "h": 68 },
+    "sourceSize": { "w": 78, "h": 72 },
+    "duration": 100
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 365, "y": 283, "w": 73, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 73, "h": 68 },
+    "sourceSize": { "w": 78, "h": 72 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 74, "y": 282, "w": 73, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 73, "h": 68 },
+    "sourceSize": { "w": 78, "h": 72 },
+    "duration": 100
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 292, "y": 214, "w": 72, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 72, "h": 69 },
+    "sourceSize": { "w": 78, "h": 72 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 367, "y": 143, "w": 72, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 72, "h": 70 },
+    "sourceSize": { "w": 78, "h": 72 },
+    "duration": 100
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 440, "y": 143, "w": 72, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 72, "h": 70 },
+    "sourceSize": { "w": 78, "h": 72 },
+    "duration": 100
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 221, "y": 73, "w": 72, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 72, "h": 70 },
+    "sourceSize": { "w": 78, "h": 72 },
+    "duration": 100
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 377, "y": 1, "w": 73, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 73, "h": 70 },
+    "sourceSize": { "w": 78, "h": 72 },
+    "duration": 100
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 303, "y": 1, "w": 73, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 73, "h": 70 },
+    "sourceSize": { "w": 78, "h": 72 },
+    "duration": 100
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 154, "y": 1, "w": 75, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 75, "h": 70 },
+    "sourceSize": { "w": 78, "h": 72 },
+    "duration": 100
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 78, "y": 1, "w": 75, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 75, "h": 70 },
+    "sourceSize": { "w": 78, "h": 72 },
+    "duration": 100
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 1, "y": 1, "w": 76, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 76, "h": 70 },
+    "sourceSize": { "w": 78, "h": 72 },
+    "duration": 100
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 1, "y": 143, "w": 72, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 72, "h": 70 },
+    "sourceSize": { "w": 78, "h": 72 },
+    "duration": 100
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 230, "y": 1, "w": 72, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 72, "h": 71 },
+    "sourceSize": { "w": 78, "h": 72 },
+    "duration": 100
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 221, "y": 213, "w": 70, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 70, "h": 71 },
+    "sourceSize": { "w": 78, "h": 72 },
+    "duration": 100
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 149, "y": 72, "w": 71, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 71, "h": 71 },
+    "sourceSize": { "w": 78, "h": 72 },
+    "duration": 100
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 74, "y": 143, "w": 70, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 70, "h": 72 },
+    "sourceSize": { "w": 78, "h": 72 },
+    "duration": 100
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 149, "y": 72, "w": 71, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 71, "h": 71 },
+    "sourceSize": { "w": 78, "h": 72 },
+    "duration": 100
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 74, "y": 143, "w": 70, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 70, "h": 72 },
+    "sourceSize": { "w": 78, "h": 72 },
+    "duration": 100
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 149, "y": 72, "w": 71, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 71, "h": 71 },
+    "sourceSize": { "w": 78, "h": 72 },
+    "duration": 100
+   },
+   {
+    "filename": "0088.png",
+    "frame": { "x": 74, "y": 143, "w": 70, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 70, "h": 72 },
+    "sourceSize": { "w": 78, "h": 72 },
+    "duration": 100
+   },
+   {
+    "filename": "0089.png",
+    "frame": { "x": 149, "y": 72, "w": 71, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 71, "h": 71 },
+    "sourceSize": { "w": 78, "h": 72 },
+    "duration": 100
+   },
+   {
+    "filename": "0090.png",
+    "frame": { "x": 148, "y": 282, "w": 70, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 70, "h": 70 },
+    "sourceSize": { "w": 78, "h": 72 },
+    "duration": 100
+   },
+   {
+    "filename": "0091.png",
+    "frame": { "x": 365, "y": 352, "w": 71, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 71, "h": 68 },
+    "sourceSize": { "w": 78, "h": 72 },
+    "duration": 100
+   },
+   {
+    "filename": "0092.png",
+    "frame": { "x": 1, "y": 284, "w": 71, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 71, "h": 69 },
+    "sourceSize": { "w": 78, "h": 72 },
+    "duration": 100
+   },
+   {
+    "filename": "0093.png",
+    "frame": { "x": 145, "y": 144, "w": 73, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 73, "h": 69 },
+    "sourceSize": { "w": 78, "h": 72 },
+    "duration": 100
+   },
+   {
+    "filename": "0094.png",
+    "frame": { "x": 75, "y": 72, "w": 73, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 73, "h": 70 },
+    "sourceSize": { "w": 78, "h": 72 },
+    "duration": 100
+   },
+   {
+    "filename": "0095.png",
+    "frame": { "x": 1, "y": 72, "w": 73, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 73, "h": 70 },
+    "sourceSize": { "w": 78, "h": 72 },
+    "duration": 100
+   },
+   {
+    "filename": "0096.png",
+    "frame": { "x": 451, "y": 1, "w": 73, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 73, "h": 70 },
+    "sourceSize": { "w": 78, "h": 72 },
+    "duration": 100
+   },
+   {
+    "filename": "0097.png",
+    "frame": { "x": 294, "y": 143, "w": 72, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 72, "h": 70 },
+    "sourceSize": { "w": 78, "h": 72 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.13-x64",
+  "image": "780.png",
+  "format": "I8",
+  "size": { "w": 525, "h": 421 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/780.png b/public/images/pokemon/exp/780.png
index 2c92fe61df1..69a13eb3bf6 100644
Binary files a/public/images/pokemon/exp/780.png and b/public/images/pokemon/exp/780.png differ
diff --git a/public/images/pokemon/exp/782.json b/public/images/pokemon/exp/782.json
deleted file mode 100644
index ea51775cf3e..00000000000
--- a/public/images/pokemon/exp/782.json
+++ /dev/null
@@ -1,2351 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "782.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 240,
-				"h": 240
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0083.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0111.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0084.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					},
-					"frame": {
-						"x": 0,
-						"y": 52,
-						"w": 48,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0110.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					},
-					"frame": {
-						"x": 0,
-						"y": 52,
-						"w": 48,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0085.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					},
-					"frame": {
-						"x": 0,
-						"y": 104,
-						"w": 48,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0086.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					},
-					"frame": {
-						"x": 0,
-						"y": 156,
-						"w": 48,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 49,
-						"h": 50
-					},
-					"frame": {
-						"x": 48,
-						"y": 0,
-						"w": 49,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 49,
-						"h": 50
-					},
-					"frame": {
-						"x": 48,
-						"y": 0,
-						"w": 49,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0029.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 49,
-						"h": 50
-					},
-					"frame": {
-						"x": 48,
-						"y": 0,
-						"w": 49,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0030.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 49,
-						"h": 50
-					},
-					"frame": {
-						"x": 48,
-						"y": 0,
-						"w": 49,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0045.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 49,
-						"h": 50
-					},
-					"frame": {
-						"x": 48,
-						"y": 0,
-						"w": 49,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0046.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 49,
-						"h": 50
-					},
-					"frame": {
-						"x": 48,
-						"y": 0,
-						"w": 49,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0061.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 49,
-						"h": 50
-					},
-					"frame": {
-						"x": 48,
-						"y": 0,
-						"w": 49,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0062.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 49,
-						"h": 50
-					},
-					"frame": {
-						"x": 48,
-						"y": 0,
-						"w": 49,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0077.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 49,
-						"h": 50
-					},
-					"frame": {
-						"x": 48,
-						"y": 0,
-						"w": 49,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0078.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 49,
-						"h": 50
-					},
-					"frame": {
-						"x": 48,
-						"y": 0,
-						"w": 49,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0089.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					},
-					"frame": {
-						"x": 97,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0090.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					},
-					"frame": {
-						"x": 48,
-						"y": 50,
-						"w": 48,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0091.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					},
-					"frame": {
-						"x": 145,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0108.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					},
-					"frame": {
-						"x": 145,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0087.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 47,
-						"h": 52
-					},
-					"frame": {
-						"x": 193,
-						"y": 0,
-						"w": 47,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0088.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 47,
-						"h": 52
-					},
-					"frame": {
-						"x": 193,
-						"y": 0,
-						"w": 47,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0095.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 47,
-						"h": 52
-					},
-					"frame": {
-						"x": 193,
-						"y": 0,
-						"w": 47,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0096.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 47,
-						"h": 52
-					},
-					"frame": {
-						"x": 193,
-						"y": 0,
-						"w": 47,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0104.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 47,
-						"h": 52
-					},
-					"frame": {
-						"x": 193,
-						"y": 0,
-						"w": 47,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0105.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 47,
-						"h": 52
-					},
-					"frame": {
-						"x": 193,
-						"y": 0,
-						"w": 47,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0092.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					},
-					"frame": {
-						"x": 48,
-						"y": 102,
-						"w": 48,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0099.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					},
-					"frame": {
-						"x": 48,
-						"y": 102,
-						"w": 48,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0100.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					},
-					"frame": {
-						"x": 48,
-						"y": 102,
-						"w": 48,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0093.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					},
-					"frame": {
-						"x": 48,
-						"y": 154,
-						"w": 48,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0094.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					},
-					"frame": {
-						"x": 48,
-						"y": 154,
-						"w": 48,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0101.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					},
-					"frame": {
-						"x": 48,
-						"y": 154,
-						"w": 48,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0102.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					},
-					"frame": {
-						"x": 48,
-						"y": 154,
-						"w": 48,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0103.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					},
-					"frame": {
-						"x": 48,
-						"y": 154,
-						"w": 48,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0097.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					},
-					"frame": {
-						"x": 96,
-						"y": 52,
-						"w": 48,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0098.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					},
-					"frame": {
-						"x": 96,
-						"y": 52,
-						"w": 48,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0106.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					},
-					"frame": {
-						"x": 96,
-						"y": 52,
-						"w": 48,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0107.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					},
-					"frame": {
-						"x": 96,
-						"y": 52,
-						"w": 48,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0109.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					},
-					"frame": {
-						"x": 144,
-						"y": 52,
-						"w": 48,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 48,
-						"h": 51
-					},
-					"frame": {
-						"x": 192,
-						"y": 52,
-						"w": 48,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 48,
-						"h": 51
-					},
-					"frame": {
-						"x": 192,
-						"y": 52,
-						"w": 48,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 48,
-						"h": 51
-					},
-					"frame": {
-						"x": 192,
-						"y": 52,
-						"w": 48,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 48,
-						"h": 51
-					},
-					"frame": {
-						"x": 192,
-						"y": 52,
-						"w": 48,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0033.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 48,
-						"h": 51
-					},
-					"frame": {
-						"x": 192,
-						"y": 52,
-						"w": 48,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0034.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 48,
-						"h": 51
-					},
-					"frame": {
-						"x": 192,
-						"y": 52,
-						"w": 48,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0049.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 48,
-						"h": 51
-					},
-					"frame": {
-						"x": 192,
-						"y": 52,
-						"w": 48,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0050.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 48,
-						"h": 51
-					},
-					"frame": {
-						"x": 192,
-						"y": 52,
-						"w": 48,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0065.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 48,
-						"h": 51
-					},
-					"frame": {
-						"x": 192,
-						"y": 52,
-						"w": 48,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0066.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 48,
-						"h": 51
-					},
-					"frame": {
-						"x": 192,
-						"y": 52,
-						"w": 48,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0081.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 48,
-						"h": 51
-					},
-					"frame": {
-						"x": 192,
-						"y": 52,
-						"w": 48,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0082.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 48,
-						"h": 51
-					},
-					"frame": {
-						"x": 192,
-						"y": 52,
-						"w": 48,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 48,
-						"h": 51
-					},
-					"frame": {
-						"x": 192,
-						"y": 103,
-						"w": 48,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 48,
-						"h": 51
-					},
-					"frame": {
-						"x": 192,
-						"y": 103,
-						"w": 48,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0031.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 48,
-						"h": 51
-					},
-					"frame": {
-						"x": 192,
-						"y": 103,
-						"w": 48,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0032.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 48,
-						"h": 51
-					},
-					"frame": {
-						"x": 192,
-						"y": 103,
-						"w": 48,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0047.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 48,
-						"h": 51
-					},
-					"frame": {
-						"x": 192,
-						"y": 103,
-						"w": 48,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0048.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 48,
-						"h": 51
-					},
-					"frame": {
-						"x": 192,
-						"y": 103,
-						"w": 48,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0063.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 48,
-						"h": 51
-					},
-					"frame": {
-						"x": 192,
-						"y": 103,
-						"w": 48,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0064.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 48,
-						"h": 51
-					},
-					"frame": {
-						"x": 192,
-						"y": 103,
-						"w": 48,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0079.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 48,
-						"h": 51
-					},
-					"frame": {
-						"x": 192,
-						"y": 103,
-						"w": 48,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0080.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 48,
-						"h": 51
-					},
-					"frame": {
-						"x": 192,
-						"y": 103,
-						"w": 48,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 47,
-						"h": 51
-					},
-					"frame": {
-						"x": 96,
-						"y": 154,
-						"w": 47,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 47,
-						"h": 51
-					},
-					"frame": {
-						"x": 96,
-						"y": 154,
-						"w": 47,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 47,
-						"h": 51
-					},
-					"frame": {
-						"x": 96,
-						"y": 154,
-						"w": 47,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 47,
-						"h": 51
-					},
-					"frame": {
-						"x": 96,
-						"y": 154,
-						"w": 47,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0035.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 47,
-						"h": 51
-					},
-					"frame": {
-						"x": 96,
-						"y": 154,
-						"w": 47,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0036.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 47,
-						"h": 51
-					},
-					"frame": {
-						"x": 96,
-						"y": 154,
-						"w": 47,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0051.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 47,
-						"h": 51
-					},
-					"frame": {
-						"x": 96,
-						"y": 154,
-						"w": 47,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0052.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 47,
-						"h": 51
-					},
-					"frame": {
-						"x": 96,
-						"y": 154,
-						"w": 47,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0067.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 47,
-						"h": 51
-					},
-					"frame": {
-						"x": 96,
-						"y": 154,
-						"w": 47,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0068.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 47,
-						"h": 51
-					},
-					"frame": {
-						"x": 96,
-						"y": 154,
-						"w": 47,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 48,
-						"h": 50
-					},
-					"frame": {
-						"x": 96,
-						"y": 104,
-						"w": 48,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 48,
-						"h": 50
-					},
-					"frame": {
-						"x": 96,
-						"y": 104,
-						"w": 48,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 48,
-						"h": 50
-					},
-					"frame": {
-						"x": 96,
-						"y": 104,
-						"w": 48,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 48,
-						"h": 50
-					},
-					"frame": {
-						"x": 96,
-						"y": 104,
-						"w": 48,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0037.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 48,
-						"h": 50
-					},
-					"frame": {
-						"x": 96,
-						"y": 104,
-						"w": 48,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0038.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 48,
-						"h": 50
-					},
-					"frame": {
-						"x": 96,
-						"y": 104,
-						"w": 48,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0053.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 48,
-						"h": 50
-					},
-					"frame": {
-						"x": 96,
-						"y": 104,
-						"w": 48,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0054.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 48,
-						"h": 50
-					},
-					"frame": {
-						"x": 96,
-						"y": 104,
-						"w": 48,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0069.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 48,
-						"h": 50
-					},
-					"frame": {
-						"x": 96,
-						"y": 104,
-						"w": 48,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0070.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 48,
-						"h": 50
-					},
-					"frame": {
-						"x": 96,
-						"y": 104,
-						"w": 48,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 48,
-						"h": 48
-					},
-					"frame": {
-						"x": 144,
-						"y": 104,
-						"w": 48,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 48,
-						"h": 48
-					},
-					"frame": {
-						"x": 144,
-						"y": 104,
-						"w": 48,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 48,
-						"h": 48
-					},
-					"frame": {
-						"x": 144,
-						"y": 104,
-						"w": 48,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 48,
-						"h": 48
-					},
-					"frame": {
-						"x": 144,
-						"y": 104,
-						"w": 48,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0039.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 48,
-						"h": 48
-					},
-					"frame": {
-						"x": 144,
-						"y": 104,
-						"w": 48,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0040.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 48,
-						"h": 48
-					},
-					"frame": {
-						"x": 144,
-						"y": 104,
-						"w": 48,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0055.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 48,
-						"h": 48
-					},
-					"frame": {
-						"x": 144,
-						"y": 104,
-						"w": 48,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0056.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 48,
-						"h": 48
-					},
-					"frame": {
-						"x": 144,
-						"y": 104,
-						"w": 48,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0071.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 48,
-						"h": 48
-					},
-					"frame": {
-						"x": 144,
-						"y": 104,
-						"w": 48,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0072.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 48,
-						"h": 48
-					},
-					"frame": {
-						"x": 144,
-						"y": 104,
-						"w": 48,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 48,
-						"h": 48
-					},
-					"frame": {
-						"x": 144,
-						"y": 152,
-						"w": 48,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 48,
-						"h": 48
-					},
-					"frame": {
-						"x": 144,
-						"y": 152,
-						"w": 48,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0025.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 48,
-						"h": 48
-					},
-					"frame": {
-						"x": 144,
-						"y": 152,
-						"w": 48,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0026.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 48,
-						"h": 48
-					},
-					"frame": {
-						"x": 144,
-						"y": 152,
-						"w": 48,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0041.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 48,
-						"h": 48
-					},
-					"frame": {
-						"x": 144,
-						"y": 152,
-						"w": 48,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0042.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 48,
-						"h": 48
-					},
-					"frame": {
-						"x": 144,
-						"y": 152,
-						"w": 48,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0057.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 48,
-						"h": 48
-					},
-					"frame": {
-						"x": 144,
-						"y": 152,
-						"w": 48,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0058.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 48,
-						"h": 48
-					},
-					"frame": {
-						"x": 144,
-						"y": 152,
-						"w": 48,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0073.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 48,
-						"h": 48
-					},
-					"frame": {
-						"x": 144,
-						"y": 152,
-						"w": 48,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0074.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 48,
-						"h": 48
-					},
-					"frame": {
-						"x": 144,
-						"y": 152,
-						"w": 48,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 48,
-						"h": 48
-					},
-					"frame": {
-						"x": 192,
-						"y": 154,
-						"w": 48,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 48,
-						"h": 48
-					},
-					"frame": {
-						"x": 192,
-						"y": 154,
-						"w": 48,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0027.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 48,
-						"h": 48
-					},
-					"frame": {
-						"x": 192,
-						"y": 154,
-						"w": 48,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0028.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 48,
-						"h": 48
-					},
-					"frame": {
-						"x": 192,
-						"y": 154,
-						"w": 48,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0043.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 48,
-						"h": 48
-					},
-					"frame": {
-						"x": 192,
-						"y": 154,
-						"w": 48,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0044.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 48,
-						"h": 48
-					},
-					"frame": {
-						"x": 192,
-						"y": 154,
-						"w": 48,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0059.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 48,
-						"h": 48
-					},
-					"frame": {
-						"x": 192,
-						"y": 154,
-						"w": 48,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0060.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 48,
-						"h": 48
-					},
-					"frame": {
-						"x": 192,
-						"y": 154,
-						"w": 48,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0075.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 48,
-						"h": 48
-					},
-					"frame": {
-						"x": 192,
-						"y": 154,
-						"w": 48,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0076.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 48,
-						"h": 48
-					},
-					"frame": {
-						"x": 192,
-						"y": 154,
-						"w": 48,
-						"h": 48
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:9772e042208152c03f4677b5a37d739c:828b3c5d233c21ed5ab3c368a1cf1988:d07862436676aa228a148ee1f1d82a8f$"
-	}
-}
diff --git a/public/images/pokemon/exp/782.png b/public/images/pokemon/exp/782.png
deleted file mode 100644
index 9ca666d0a74..00000000000
Binary files a/public/images/pokemon/exp/782.png and /dev/null differ
diff --git a/public/images/pokemon/exp/783.json b/public/images/pokemon/exp/783.json
deleted file mode 100644
index 71aeb29890a..00000000000
--- a/public/images/pokemon/exp/783.json
+++ /dev/null
@@ -1,1154 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "783.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 335,
-				"h": 335
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 69
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 74,
-						"h": 67
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 74,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 69
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 74,
-						"h": 67
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 74,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0027.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 69
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 74,
-						"h": 67
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 74,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0038.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 69
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 74,
-						"h": 67
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 74,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 69
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 71,
-						"h": 68
-					},
-					"frame": {
-						"x": 0,
-						"y": 67,
-						"w": 71,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0026.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 69
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 71,
-						"h": 68
-					},
-					"frame": {
-						"x": 0,
-						"y": 67,
-						"w": 71,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0037.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 69
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 71,
-						"h": 68
-					},
-					"frame": {
-						"x": 0,
-						"y": 67,
-						"w": 71,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 69
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 71,
-						"h": 68
-					},
-					"frame": {
-						"x": 0,
-						"y": 135,
-						"w": 71,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 69
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 203,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0025.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 69
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 203,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0036.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 69
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 203,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0040.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 69
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 70,
-						"h": 66
-					},
-					"frame": {
-						"x": 74,
-						"y": 0,
-						"w": 70,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0042.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 69
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 70,
-						"h": 66
-					},
-					"frame": {
-						"x": 144,
-						"y": 0,
-						"w": 70,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0044.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 69
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 70,
-						"h": 66
-					},
-					"frame": {
-						"x": 214,
-						"y": 0,
-						"w": 70,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 69
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 62,
-						"h": 69
-					},
-					"frame": {
-						"x": 67,
-						"y": 203,
-						"w": 62,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 69
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 62,
-						"h": 69
-					},
-					"frame": {
-						"x": 67,
-						"y": 203,
-						"w": 62,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 69
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 62,
-						"h": 69
-					},
-					"frame": {
-						"x": 67,
-						"y": 203,
-						"w": 62,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0034.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 69
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 62,
-						"h": 69
-					},
-					"frame": {
-						"x": 67,
-						"y": 203,
-						"w": 62,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 69
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 64,
-						"h": 69
-					},
-					"frame": {
-						"x": 71,
-						"y": 67,
-						"w": 64,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 69
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 64,
-						"h": 69
-					},
-					"frame": {
-						"x": 71,
-						"y": 67,
-						"w": 64,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 69
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 64,
-						"h": 69
-					},
-					"frame": {
-						"x": 71,
-						"y": 67,
-						"w": 64,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0035.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 69
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 64,
-						"h": 69
-					},
-					"frame": {
-						"x": 71,
-						"y": 67,
-						"w": 64,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 69
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 2,
-						"w": 64,
-						"h": 67
-					},
-					"frame": {
-						"x": 71,
-						"y": 136,
-						"w": 64,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 69
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 2,
-						"w": 64,
-						"h": 67
-					},
-					"frame": {
-						"x": 71,
-						"y": 136,
-						"w": 64,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0029.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 69
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 2,
-						"w": 64,
-						"h": 67
-					},
-					"frame": {
-						"x": 71,
-						"y": 136,
-						"w": 64,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0050.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 69
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 2,
-						"w": 64,
-						"h": 67
-					},
-					"frame": {
-						"x": 71,
-						"y": 136,
-						"w": 64,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 69
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 135,
-						"y": 66,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0046.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 69
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 70,
-						"h": 66
-					},
-					"frame": {
-						"x": 202,
-						"y": 66,
-						"w": 70,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 69
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 69,
-						"h": 66
-					},
-					"frame": {
-						"x": 135,
-						"y": 135,
-						"w": 69,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 69
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 69,
-						"h": 66
-					},
-					"frame": {
-						"x": 135,
-						"y": 135,
-						"w": 69,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0028.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 69
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 69,
-						"h": 66
-					},
-					"frame": {
-						"x": 135,
-						"y": 135,
-						"w": 69,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0039.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 69
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 69,
-						"h": 66
-					},
-					"frame": {
-						"x": 135,
-						"y": 135,
-						"w": 69,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0049.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 69
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 69,
-						"h": 66
-					},
-					"frame": {
-						"x": 135,
-						"y": 135,
-						"w": 69,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0041.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 69
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 69,
-						"h": 66
-					},
-					"frame": {
-						"x": 204,
-						"y": 132,
-						"w": 69,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 69
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 62,
-						"h": 69
-					},
-					"frame": {
-						"x": 273,
-						"y": 66,
-						"w": 62,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 69
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 62,
-						"h": 69
-					},
-					"frame": {
-						"x": 273,
-						"y": 66,
-						"w": 62,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0032.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 69
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 62,
-						"h": 69
-					},
-					"frame": {
-						"x": 273,
-						"y": 66,
-						"w": 62,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0053.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 69
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 62,
-						"h": 69
-					},
-					"frame": {
-						"x": 273,
-						"y": 66,
-						"w": 62,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 69
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 62,
-						"h": 69
-					},
-					"frame": {
-						"x": 273,
-						"y": 135,
-						"w": 62,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 69
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 62,
-						"h": 69
-					},
-					"frame": {
-						"x": 273,
-						"y": 135,
-						"w": 62,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0033.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 69
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 62,
-						"h": 69
-					},
-					"frame": {
-						"x": 273,
-						"y": 135,
-						"w": 62,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0054.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 69
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 62,
-						"h": 69
-					},
-					"frame": {
-						"x": 273,
-						"y": 135,
-						"w": 62,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0043.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 69
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 69,
-						"h": 66
-					},
-					"frame": {
-						"x": 204,
-						"y": 198,
-						"w": 69,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0045.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 69
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 69,
-						"h": 66
-					},
-					"frame": {
-						"x": 135,
-						"y": 201,
-						"w": 69,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0047.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 69
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 69,
-						"h": 66
-					},
-					"frame": {
-						"x": 135,
-						"y": 201,
-						"w": 69,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 69
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 61,
-						"h": 68
-					},
-					"frame": {
-						"x": 273,
-						"y": 204,
-						"w": 61,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 69
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 61,
-						"h": 68
-					},
-					"frame": {
-						"x": 273,
-						"y": 204,
-						"w": 61,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0031.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 69
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 61,
-						"h": 68
-					},
-					"frame": {
-						"x": 273,
-						"y": 204,
-						"w": 61,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0052.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 69
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 61,
-						"h": 68
-					},
-					"frame": {
-						"x": 273,
-						"y": 204,
-						"w": 61,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0048.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 69
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 70,
-						"h": 66
-					},
-					"frame": {
-						"x": 129,
-						"y": 267,
-						"w": 70,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 69
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 64,
-						"h": 67
-					},
-					"frame": {
-						"x": 199,
-						"y": 267,
-						"w": 64,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 69
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 64,
-						"h": 67
-					},
-					"frame": {
-						"x": 199,
-						"y": 267,
-						"w": 64,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0030.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 69
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 64,
-						"h": 67
-					},
-					"frame": {
-						"x": 199,
-						"y": 267,
-						"w": 64,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0051.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 69
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 64,
-						"h": 67
-					},
-					"frame": {
-						"x": 199,
-						"y": 267,
-						"w": 64,
-						"h": 67
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:f33a08a20212ca30a4c442095b0effc2:91a27eccd7f819b29aa8e5f9bc790c41:aab166e28c744865a0296041224dd01b$"
-	}
-}
diff --git a/public/images/pokemon/exp/783.png b/public/images/pokemon/exp/783.png
deleted file mode 100644
index 58372a977c6..00000000000
Binary files a/public/images/pokemon/exp/783.png and /dev/null differ
diff --git a/public/images/pokemon/exp/784.json b/public/images/pokemon/exp/784.json
deleted file mode 100644
index 4200616ecef..00000000000
--- a/public/images/pokemon/exp/784.json
+++ /dev/null
@@ -1,1826 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "784.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 461,
-				"h": 461
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 96,
-						"h": 88
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 96,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0032.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 96,
-						"h": 88
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 96,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0050.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 96,
-						"h": 88
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 96,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0068.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 96,
-						"h": 88
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 96,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 96,
-						"h": 88
-					},
-					"frame": {
-						"x": 0,
-						"y": 88,
-						"w": 96,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0033.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 96,
-						"h": 88
-					},
-					"frame": {
-						"x": 0,
-						"y": 88,
-						"w": 96,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0051.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 96,
-						"h": 88
-					},
-					"frame": {
-						"x": 0,
-						"y": 88,
-						"w": 96,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0069.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 96,
-						"h": 88
-					},
-					"frame": {
-						"x": 0,
-						"y": 88,
-						"w": 96,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 96,
-						"h": 88
-					},
-					"frame": {
-						"x": 96,
-						"y": 0,
-						"w": 96,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0034.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 96,
-						"h": 88
-					},
-					"frame": {
-						"x": 96,
-						"y": 0,
-						"w": 96,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0052.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 96,
-						"h": 88
-					},
-					"frame": {
-						"x": 96,
-						"y": 0,
-						"w": 96,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0070.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 96,
-						"h": 88
-					},
-					"frame": {
-						"x": 96,
-						"y": 0,
-						"w": 96,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 96,
-						"h": 88
-					},
-					"frame": {
-						"x": 0,
-						"y": 176,
-						"w": 96,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0035.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 96,
-						"h": 88
-					},
-					"frame": {
-						"x": 0,
-						"y": 176,
-						"w": 96,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0053.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 96,
-						"h": 88
-					},
-					"frame": {
-						"x": 0,
-						"y": 176,
-						"w": 96,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0071.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 96,
-						"h": 88
-					},
-					"frame": {
-						"x": 0,
-						"y": 176,
-						"w": 96,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 96,
-						"h": 88
-					},
-					"frame": {
-						"x": 96,
-						"y": 88,
-						"w": 96,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0036.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 96,
-						"h": 88
-					},
-					"frame": {
-						"x": 96,
-						"y": 88,
-						"w": 96,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0054.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 96,
-						"h": 88
-					},
-					"frame": {
-						"x": 96,
-						"y": 88,
-						"w": 96,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0072.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 96,
-						"h": 88
-					},
-					"frame": {
-						"x": 96,
-						"y": 88,
-						"w": 96,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 94,
-						"h": 88
-					},
-					"frame": {
-						"x": 192,
-						"y": 0,
-						"w": 94,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 94,
-						"h": 88
-					},
-					"frame": {
-						"x": 192,
-						"y": 0,
-						"w": 94,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 94,
-						"h": 88
-					},
-					"frame": {
-						"x": 192,
-						"y": 0,
-						"w": 94,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0031.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 94,
-						"h": 88
-					},
-					"frame": {
-						"x": 192,
-						"y": 0,
-						"w": 94,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0037.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 94,
-						"h": 88
-					},
-					"frame": {
-						"x": 192,
-						"y": 0,
-						"w": 94,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0049.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 94,
-						"h": 88
-					},
-					"frame": {
-						"x": 192,
-						"y": 0,
-						"w": 94,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0055.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 94,
-						"h": 88
-					},
-					"frame": {
-						"x": 192,
-						"y": 0,
-						"w": 94,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0067.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 94,
-						"h": 88
-					},
-					"frame": {
-						"x": 192,
-						"y": 0,
-						"w": 94,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0073.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 94,
-						"h": 88
-					},
-					"frame": {
-						"x": 192,
-						"y": 0,
-						"w": 94,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0086.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 94,
-						"h": 88
-					},
-					"frame": {
-						"x": 192,
-						"y": 0,
-						"w": 94,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 92,
-						"h": 89
-					},
-					"frame": {
-						"x": 0,
-						"y": 264,
-						"w": 92,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 92,
-						"h": 89
-					},
-					"frame": {
-						"x": 0,
-						"y": 264,
-						"w": 92,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 92,
-						"h": 89
-					},
-					"frame": {
-						"x": 0,
-						"y": 264,
-						"w": 92,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0029.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 92,
-						"h": 89
-					},
-					"frame": {
-						"x": 0,
-						"y": 264,
-						"w": 92,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0039.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 92,
-						"h": 89
-					},
-					"frame": {
-						"x": 0,
-						"y": 264,
-						"w": 92,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0047.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 92,
-						"h": 89
-					},
-					"frame": {
-						"x": 0,
-						"y": 264,
-						"w": 92,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0057.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 92,
-						"h": 89
-					},
-					"frame": {
-						"x": 0,
-						"y": 264,
-						"w": 92,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0065.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 92,
-						"h": 89
-					},
-					"frame": {
-						"x": 0,
-						"y": 264,
-						"w": 92,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0074.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 92,
-						"h": 89
-					},
-					"frame": {
-						"x": 0,
-						"y": 353,
-						"w": 92,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 92,
-						"h": 88
-					},
-					"frame": {
-						"x": 96,
-						"y": 176,
-						"w": 92,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 92,
-						"h": 88
-					},
-					"frame": {
-						"x": 96,
-						"y": 176,
-						"w": 92,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 92,
-						"h": 88
-					},
-					"frame": {
-						"x": 96,
-						"y": 176,
-						"w": 92,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0030.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 92,
-						"h": 88
-					},
-					"frame": {
-						"x": 96,
-						"y": 176,
-						"w": 92,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0038.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 92,
-						"h": 88
-					},
-					"frame": {
-						"x": 96,
-						"y": 176,
-						"w": 92,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0048.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 92,
-						"h": 88
-					},
-					"frame": {
-						"x": 96,
-						"y": 176,
-						"w": 92,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0056.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 92,
-						"h": 88
-					},
-					"frame": {
-						"x": 96,
-						"y": 176,
-						"w": 92,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0066.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 92,
-						"h": 88
-					},
-					"frame": {
-						"x": 96,
-						"y": 176,
-						"w": 92,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0085.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 92,
-						"h": 89
-					},
-					"frame": {
-						"x": 92,
-						"y": 264,
-						"w": 92,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 90,
-						"h": 90
-					},
-					"frame": {
-						"x": 92,
-						"y": 353,
-						"w": 90,
-						"h": 90
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 90,
-						"h": 90
-					},
-					"frame": {
-						"x": 92,
-						"y": 353,
-						"w": 90,
-						"h": 90
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 90,
-						"h": 90
-					},
-					"frame": {
-						"x": 92,
-						"y": 353,
-						"w": 90,
-						"h": 90
-					}
-				},
-				{
-					"filename": "0028.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 90,
-						"h": 90
-					},
-					"frame": {
-						"x": 92,
-						"y": 353,
-						"w": 90,
-						"h": 90
-					}
-				},
-				{
-					"filename": "0040.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 90,
-						"h": 90
-					},
-					"frame": {
-						"x": 92,
-						"y": 353,
-						"w": 90,
-						"h": 90
-					}
-				},
-				{
-					"filename": "0046.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 90,
-						"h": 90
-					},
-					"frame": {
-						"x": 92,
-						"y": 353,
-						"w": 90,
-						"h": 90
-					}
-				},
-				{
-					"filename": "0058.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 90,
-						"h": 90
-					},
-					"frame": {
-						"x": 92,
-						"y": 353,
-						"w": 90,
-						"h": 90
-					}
-				},
-				{
-					"filename": "0064.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 90,
-						"h": 90
-					},
-					"frame": {
-						"x": 92,
-						"y": 353,
-						"w": 90,
-						"h": 90
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 2,
-						"w": 89,
-						"h": 89
-					},
-					"frame": {
-						"x": 192,
-						"y": 88,
-						"w": 89,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 2,
-						"w": 89,
-						"h": 89
-					},
-					"frame": {
-						"x": 192,
-						"y": 88,
-						"w": 89,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0041.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 2,
-						"w": 89,
-						"h": 89
-					},
-					"frame": {
-						"x": 192,
-						"y": 88,
-						"w": 89,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0059.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 2,
-						"w": 89,
-						"h": 89
-					},
-					"frame": {
-						"x": 192,
-						"y": 88,
-						"w": 89,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 2,
-						"w": 89,
-						"h": 89
-					},
-					"frame": {
-						"x": 286,
-						"y": 0,
-						"w": 89,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0027.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 2,
-						"w": 89,
-						"h": 89
-					},
-					"frame": {
-						"x": 286,
-						"y": 0,
-						"w": 89,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0045.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 2,
-						"w": 89,
-						"h": 89
-					},
-					"frame": {
-						"x": 286,
-						"y": 0,
-						"w": 89,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0063.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 2,
-						"w": 89,
-						"h": 89
-					},
-					"frame": {
-						"x": 286,
-						"y": 0,
-						"w": 89,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0079.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 86,
-						"h": 87
-					},
-					"frame": {
-						"x": 375,
-						"y": 0,
-						"w": 86,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0081.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 86,
-						"h": 87
-					},
-					"frame": {
-						"x": 375,
-						"y": 87,
-						"w": 86,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0075.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 2,
-						"w": 89,
-						"h": 89
-					},
-					"frame": {
-						"x": 188,
-						"y": 177,
-						"w": 89,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0084.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 2,
-						"w": 89,
-						"h": 89
-					},
-					"frame": {
-						"x": 281,
-						"y": 89,
-						"w": 89,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 88,
-						"h": 89
-					},
-					"frame": {
-						"x": 277,
-						"y": 178,
-						"w": 88,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 88,
-						"h": 89
-					},
-					"frame": {
-						"x": 277,
-						"y": 178,
-						"w": 88,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0042.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 88,
-						"h": 89
-					},
-					"frame": {
-						"x": 277,
-						"y": 178,
-						"w": 88,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0060.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 88,
-						"h": 89
-					},
-					"frame": {
-						"x": 277,
-						"y": 178,
-						"w": 88,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 88,
-						"h": 89
-					},
-					"frame": {
-						"x": 184,
-						"y": 266,
-						"w": 88,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0025.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 88,
-						"h": 89
-					},
-					"frame": {
-						"x": 184,
-						"y": 266,
-						"w": 88,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0043.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 88,
-						"h": 89
-					},
-					"frame": {
-						"x": 184,
-						"y": 266,
-						"w": 88,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0061.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 88,
-						"h": 89
-					},
-					"frame": {
-						"x": 184,
-						"y": 266,
-						"w": 88,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 88,
-						"h": 89
-					},
-					"frame": {
-						"x": 182,
-						"y": 355,
-						"w": 88,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0026.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 88,
-						"h": 89
-					},
-					"frame": {
-						"x": 182,
-						"y": 355,
-						"w": 88,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0044.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 88,
-						"h": 89
-					},
-					"frame": {
-						"x": 182,
-						"y": 355,
-						"w": 88,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0062.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 88,
-						"h": 89
-					},
-					"frame": {
-						"x": 182,
-						"y": 355,
-						"w": 88,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0076.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 2,
-						"w": 87,
-						"h": 89
-					},
-					"frame": {
-						"x": 272,
-						"y": 267,
-						"w": 87,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0083.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 2,
-						"w": 87,
-						"h": 89
-					},
-					"frame": {
-						"x": 270,
-						"y": 356,
-						"w": 87,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0077.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 87,
-						"h": 87
-					},
-					"frame": {
-						"x": 359,
-						"y": 267,
-						"w": 87,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0078.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 87,
-						"h": 87
-					},
-					"frame": {
-						"x": 365,
-						"y": 178,
-						"w": 87,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0080.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 87,
-						"h": 87
-					},
-					"frame": {
-						"x": 357,
-						"y": 356,
-						"w": 87,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0082.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 87,
-						"h": 87
-					},
-					"frame": {
-						"x": 357,
-						"y": 356,
-						"w": 87,
-						"h": 87
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:fd28dfd35a375d4d0d568c72bbbe079f:b186d9a5868eaf1d0a3bd9bcddd90d79:c2f7ca3ab1075b8c824730653d891244$"
-	}
-}
diff --git a/public/images/pokemon/exp/784.png b/public/images/pokemon/exp/784.png
deleted file mode 100644
index e3e384d4699..00000000000
Binary files a/public/images/pokemon/exp/784.png and /dev/null differ
diff --git a/public/images/pokemon/exp/815-gigantamax.json b/public/images/pokemon/exp/815-gigantamax.json
new file mode 100644
index 00000000000..d8fb9d62e57
--- /dev/null
+++ b/public/images/pokemon/exp/815-gigantamax.json
@@ -0,0 +1,659 @@
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 343, "y": 292, "w": 81, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 81, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 357, "y": 1, "w": 86, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 86, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 177, "y": 194, "w": 86, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 4, "w": 86, "h": 94 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 179, "y": 1, "w": 87, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 87, "h": 94 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 85, "y": 292, "w": 82, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 4, "w": 82, "h": 94 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 252, "y": 482, "w": 81, "h": 93 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 81, "h": 93 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 258, "y": 290, "w": 83, "h": 93 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 5, "w": 83, "h": 93 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 416, "y": 484, "w": 79, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 4, "w": 79, "h": 94 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 426, "y": 292, "w": 81, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 3, "w": 81, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 445, "y": 1, "w": 86, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 86, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 179, "y": 97, "w": 86, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 86, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 1, "y": 1, "w": 87, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 87, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 523, "y": 195, "w": 82, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 2, "w": 82, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 509, "y": 292, "w": 81, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 2, "w": 81, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 89, "y": 195, "w": 83, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 83, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 531, "y": 98, "w": 79, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 79, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 343, "y": 292, "w": 81, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 81, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 357, "y": 1, "w": 86, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 86, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 177, "y": 194, "w": 86, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 4, "w": 86, "h": 94 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 179, "y": 1, "w": 87, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 87, "h": 94 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 85, "y": 292, "w": 82, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 4, "w": 82, "h": 94 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 252, "y": 482, "w": 81, "h": 93 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 81, "h": 93 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 258, "y": 290, "w": 83, "h": 93 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 5, "w": 83, "h": 93 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 416, "y": 484, "w": 79, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 4, "w": 79, "h": 94 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 426, "y": 292, "w": 81, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 3, "w": 81, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 445, "y": 1, "w": 86, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 86, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 179, "y": 97, "w": 86, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 86, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 1, "y": 1, "w": 87, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 87, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 523, "y": 195, "w": 82, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 2, "w": 82, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 509, "y": 292, "w": 81, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 2, "w": 81, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 89, "y": 195, "w": 83, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 83, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 531, "y": 98, "w": 79, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 79, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 343, "y": 292, "w": 81, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 81, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 357, "y": 1, "w": 86, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 86, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 177, "y": 194, "w": 86, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 4, "w": 86, "h": 94 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 179, "y": 1, "w": 87, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 87, "h": 94 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 85, "y": 292, "w": 82, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 4, "w": 82, "h": 94 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 252, "y": 482, "w": 81, "h": 93 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 81, "h": 93 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 258, "y": 290, "w": 83, "h": 93 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 5, "w": 83, "h": 93 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 416, "y": 484, "w": 79, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 4, "w": 79, "h": 94 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 426, "y": 292, "w": 81, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 3, "w": 81, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 445, "y": 1, "w": 86, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 86, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 179, "y": 97, "w": 86, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 86, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 1, "y": 1, "w": 87, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 87, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 523, "y": 195, "w": 82, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 2, "w": 82, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 509, "y": 292, "w": 81, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 2, "w": 81, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 89, "y": 195, "w": 83, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 83, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 531, "y": 98, "w": 79, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 79, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 258, "y": 385, "w": 81, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 81, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 267, "y": 97, "w": 86, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 86, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 1, "y": 98, "w": 86, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 86, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 268, "y": 1, "w": 87, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 87, "h": 94 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 426, "y": 389, "w": 82, "h": 93 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 82, "h": 93 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 1, "y": 484, "w": 81, "h": 92 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 6, "w": 81, "h": 92 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 341, "y": 389, "w": 83, "h": 92 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 7, "w": 83, "h": 92 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 84, "y": 485, "w": 79, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 9, "w": 79, "h": 91 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 167, "y": 484, "w": 81, "h": 92 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 7, "w": 81, "h": 92 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 1, "y": 195, "w": 86, "h": 93 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 86, "h": 93 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 265, "y": 194, "w": 86, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 86, "h": 94 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 89, "y": 98, "w": 86, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 86, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 1, "y": 290, "w": 82, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 82, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 1, "y": 387, "w": 81, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 1, "w": 81, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 353, "y": 195, "w": 83, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 0, "w": 83, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 510, "y": 389, "w": 80, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 1, "w": 80, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 169, "y": 387, "w": 81, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 1, "w": 81, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 355, "y": 98, "w": 86, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 1, "w": 86, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 443, "y": 98, "w": 86, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 2, "w": 86, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 90, "y": 1, "w": 87, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 3, "w": 87, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 174, "y": 290, "w": 82, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 82, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 84, "y": 388, "w": 81, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 4, "w": 81, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 438, "y": 195, "w": 83, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 3, "w": 83, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 335, "y": 483, "w": 79, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 2, "w": 79, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.13-x64",
+  "image": "815-gigantamax.png",
+  "format": "I8",
+  "size": { "w": 611, "h": 579 },
+  "scale": "1"
+ }
+}
diff --git a/public/images/pokemon/exp/815-gigantamax.png b/public/images/pokemon/exp/815-gigantamax.png
new file mode 100644
index 00000000000..4720e564c09
Binary files /dev/null and b/public/images/pokemon/exp/815-gigantamax.png differ
diff --git a/public/images/pokemon/exp/839-gigantamax.json b/public/images/pokemon/exp/839-gigantamax.json
new file mode 100644
index 00000000000..15a7c122f5d
--- /dev/null
+++ b/public/images/pokemon/exp/839-gigantamax.json
@@ -0,0 +1,821 @@
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 525, "y": 567, "w": 84, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 0, "w": 84, "h": 96 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 441, "y": 566, "w": 84, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 0, "w": 84, "h": 96 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 609, "y": 567, "w": 83, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 0, "w": 83, "h": 96 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 255, "y": 563, "w": 84, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 0, "w": 84, "h": 96 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 171, "y": 563, "w": 84, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 0, "w": 84, "h": 96 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 0, "y": 569, "w": 83, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 1, "w": 83, "h": 95 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 339, "y": 569, "w": 82, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 1, "w": 82, "h": 95 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 0, "y": 474, "w": 86, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 1, "w": 86, "h": 95 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 464, "y": 375, "w": 89, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 1, "w": 89, "h": 95 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 580, "y": 190, "w": 92, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 92, "h": 95 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 95, "y": 96, "w": 94, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 94, "h": 95 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 198, "y": 95, "w": 95, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 95, "h": 95 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 491, "y": 0, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 96, "h": 95 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 297, "y": 0, "w": 98, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 98, "h": 95 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 0, "y": 0, "w": 100, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 100, "h": 95 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 198, "y": 0, "w": 99, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 99, "h": 95 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 100, "y": 0, "w": 98, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 98, "h": 96 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 395, "y": 0, "w": 96, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 96, "h": 96 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 189, "y": 190, "w": 92, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 0, "w": 92, "h": 96 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 89, "y": 379, "w": 88, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 88, "h": 96 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 525, "y": 567, "w": 84, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 0, "w": 84, "h": 96 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 441, "y": 566, "w": 84, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 0, "w": 84, "h": 96 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 609, "y": 567, "w": 83, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 0, "w": 83, "h": 96 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 255, "y": 563, "w": 84, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 0, "w": 84, "h": 96 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 171, "y": 563, "w": 84, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 0, "w": 84, "h": 96 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 0, "y": 569, "w": 83, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 1, "w": 83, "h": 95 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 339, "y": 569, "w": 82, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 1, "w": 82, "h": 95 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 0, "y": 474, "w": 86, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 1, "w": 86, "h": 95 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 464, "y": 375, "w": 89, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 1, "w": 89, "h": 95 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 580, "y": 190, "w": 92, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 92, "h": 95 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 95, "y": 96, "w": 94, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 94, "h": 95 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 198, "y": 95, "w": 95, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 95, "h": 95 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 491, "y": 0, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 96, "h": 95 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 297, "y": 0, "w": 98, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 98, "h": 95 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 0, "y": 0, "w": 100, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 100, "h": 95 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 198, "y": 0, "w": 99, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 99, "h": 95 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 100, "y": 0, "w": 98, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 98, "h": 96 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 395, "y": 0, "w": 96, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 96, "h": 96 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 189, "y": 190, "w": 92, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 0, "w": 92, "h": 96 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 89, "y": 379, "w": 88, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 88, "h": 96 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 525, "y": 567, "w": 84, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 0, "w": 84, "h": 96 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 441, "y": 566, "w": 84, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 0, "w": 84, "h": 96 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 609, "y": 567, "w": 83, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 0, "w": 83, "h": 96 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 255, "y": 563, "w": 84, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 0, "w": 84, "h": 96 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 171, "y": 563, "w": 84, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 0, "w": 84, "h": 96 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 0, "y": 569, "w": 83, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 1, "w": 83, "h": 95 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 339, "y": 569, "w": 82, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 1, "w": 82, "h": 95 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 0, "y": 474, "w": 86, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 1, "w": 86, "h": 95 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 464, "y": 375, "w": 89, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 1, "w": 89, "h": 95 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 580, "y": 190, "w": 92, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 92, "h": 95 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 95, "y": 96, "w": 94, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 94, "h": 95 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 198, "y": 95, "w": 95, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 95, "h": 95 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 491, "y": 0, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 96, "h": 95 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 297, "y": 0, "w": 98, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 98, "h": 95 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 0, "y": 0, "w": 100, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 100, "h": 95 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 198, "y": 0, "w": 99, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 99, "h": 95 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 100, "y": 0, "w": 98, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 98, "h": 96 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 395, "y": 0, "w": 96, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 96, "h": 96 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 189, "y": 190, "w": 92, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 0, "w": 92, "h": 96 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 89, "y": 379, "w": 88, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 88, "h": 96 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 525, "y": 567, "w": 84, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 0, "w": 84, "h": 96 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 454, "y": 470, "w": 86, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 0, "w": 86, "h": 96 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 0, "y": 379, "w": 89, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 1, "w": 89, "h": 95 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 573, "y": 285, "w": 91, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 1, "w": 91, "h": 95 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 93, "y": 191, "w": 92, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 1, "w": 92, "h": 95 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 390, "y": 96, "w": 94, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 17, "y": 1, "w": 94, "h": 95 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 585, "y": 96, "w": 94, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 17, "y": 2, "w": 94, "h": 94 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 293, "y": 95, "w": 97, "h": 93 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 3, "w": 97, "h": 93 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 484, "y": 190, "w": 96, "h": 92 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 4, "w": 96, "h": 92 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 92, "y": 286, "w": 92, "h": 93 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 3, "w": 92, "h": 93 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 177, "y": 471, "w": 89, "h": 92 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 89, "h": 92 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 177, "y": 379, "w": 91, "h": 92 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 91, "h": 92 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 184, "y": 286, "w": 91, "h": 93 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 91, "h": 93 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 480, "y": 282, "w": 93, "h": 93 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 93, "h": 93 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 281, "y": 281, "w": 93, "h": 93 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 93, "h": 93 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 293, "y": 188, "w": 95, "h": 93 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 95, "h": 93 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 587, "y": 0, "w": 95, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 95, "h": 96 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 0, "y": 95, "w": 95, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 95, "h": 95 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 491, "y": 95, "w": 94, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 94, "h": 95 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 0, "y": 190, "w": 93, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 1, "w": 93, "h": 95 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 388, "y": 191, "w": 92, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 1, "w": 92, "h": 95 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 0, "y": 285, "w": 92, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 2, "w": 92, "h": 94 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 275, "y": 374, "w": 90, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 2, "w": 90, "h": 94 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 374, "y": 286, "w": 90, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 2, "w": 90, "h": 94 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 365, "y": 380, "w": 89, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 2, "w": 89, "h": 94 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 553, "y": 380, "w": 89, "h": 93 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 3, "w": 89, "h": 93 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 540, "y": 473, "w": 87, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 2, "w": 87, "h": 94 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0088.png",
+    "frame": { "x": 268, "y": 468, "w": 87, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 1, "w": 87, "h": 95 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0089.png",
+    "frame": { "x": 355, "y": 474, "w": 86, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 1, "w": 86, "h": 95 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0090.png",
+    "frame": { "x": 86, "y": 475, "w": 85, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 0, "w": 85, "h": 96 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.13-x64",
+  "image": "839-gigantamax.png",
+  "format": "I8",
+  "size": { "w": 692, "h": 664 },
+  "scale": "1"
+ }
+}
diff --git a/public/images/pokemon/exp/839-gigantamax.png b/public/images/pokemon/exp/839-gigantamax.png
new file mode 100644
index 00000000000..5a614b0c895
Binary files /dev/null and b/public/images/pokemon/exp/839-gigantamax.png differ
diff --git a/public/images/pokemon/exp/840.png b/public/images/pokemon/exp/840.png
index 3e76cd5fff8..86b701fa0d7 100644
Binary files a/public/images/pokemon/exp/840.png and b/public/images/pokemon/exp/840.png differ
diff --git a/public/images/pokemon/exp/841.png b/public/images/pokemon/exp/841.png
index 2bf0ad3b138..564ffaa0f27 100644
Binary files a/public/images/pokemon/exp/841.png and b/public/images/pokemon/exp/841.png differ
diff --git a/public/images/pokemon/exp/842.png b/public/images/pokemon/exp/842.png
index 85b9ae30fe0..41c2ebcf7d4 100644
Binary files a/public/images/pokemon/exp/842.png and b/public/images/pokemon/exp/842.png differ
diff --git a/public/images/pokemon/exp/871.png b/public/images/pokemon/exp/871.png
index d4ffceea07a..8f03d72f0b3 100644
Binary files a/public/images/pokemon/exp/871.png and b/public/images/pokemon/exp/871.png differ
diff --git a/public/images/pokemon/exp/935.png b/public/images/pokemon/exp/935.png
deleted file mode 100644
index 1ca019f8c11..00000000000
Binary files a/public/images/pokemon/exp/935.png and /dev/null differ
diff --git a/public/images/pokemon/exp/936.json b/public/images/pokemon/exp/936.json
deleted file mode 100644
index b7dff5e8393..00000000000
--- a/public/images/pokemon/exp/936.json
+++ /dev/null
@@ -1,524 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "936.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 323,
-				"h": 323
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 76,
-						"h": 99
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 76,
-						"h": 99
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 76,
-						"h": 99
-					},
-					"frame": {
-						"x": 0,
-						"y": 99,
-						"w": 76,
-						"h": 99
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 76,
-						"h": 99
-					},
-					"frame": {
-						"x": 0,
-						"y": 198,
-						"w": 76,
-						"h": 99
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 76,
-						"h": 98
-					},
-					"frame": {
-						"x": 76,
-						"y": 0,
-						"w": 76,
-						"h": 98
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 76,
-						"h": 98
-					},
-					"frame": {
-						"x": 152,
-						"y": 0,
-						"w": 76,
-						"h": 98
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 70,
-						"h": 99
-					},
-					"frame": {
-						"x": 228,
-						"y": 0,
-						"w": 70,
-						"h": 99
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 70,
-						"h": 99
-					},
-					"frame": {
-						"x": 76,
-						"y": 98,
-						"w": 70,
-						"h": 99
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 0,
-						"w": 59,
-						"h": 99
-					},
-					"frame": {
-						"x": 146,
-						"y": 98,
-						"w": 59,
-						"h": 99
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 0,
-						"w": 59,
-						"h": 99
-					},
-					"frame": {
-						"x": 146,
-						"y": 98,
-						"w": 59,
-						"h": 99
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 0,
-						"w": 59,
-						"h": 99
-					},
-					"frame": {
-						"x": 146,
-						"y": 98,
-						"w": 59,
-						"h": 99
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 0,
-						"w": 59,
-						"h": 99
-					},
-					"frame": {
-						"x": 76,
-						"y": 197,
-						"w": 59,
-						"h": 99
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 0,
-						"w": 59,
-						"h": 99
-					},
-					"frame": {
-						"x": 76,
-						"y": 197,
-						"w": 59,
-						"h": 99
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 0,
-						"w": 59,
-						"h": 99
-					},
-					"frame": {
-						"x": 76,
-						"y": 197,
-						"w": 59,
-						"h": 99
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 0,
-						"w": 59,
-						"h": 99
-					},
-					"frame": {
-						"x": 76,
-						"y": 197,
-						"w": 59,
-						"h": 99
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 0,
-						"w": 59,
-						"h": 99
-					},
-					"frame": {
-						"x": 135,
-						"y": 197,
-						"w": 59,
-						"h": 99
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 0,
-						"w": 59,
-						"h": 99
-					},
-					"frame": {
-						"x": 135,
-						"y": 197,
-						"w": 59,
-						"h": 99
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 0,
-						"w": 59,
-						"h": 99
-					},
-					"frame": {
-						"x": 135,
-						"y": 197,
-						"w": 59,
-						"h": 99
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 0,
-						"w": 59,
-						"h": 99
-					},
-					"frame": {
-						"x": 194,
-						"y": 197,
-						"w": 59,
-						"h": 99
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 1,
-						"w": 59,
-						"h": 98
-					},
-					"frame": {
-						"x": 205,
-						"y": 99,
-						"w": 59,
-						"h": 98
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 1,
-						"w": 59,
-						"h": 98
-					},
-					"frame": {
-						"x": 205,
-						"y": 99,
-						"w": 59,
-						"h": 98
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 1,
-						"w": 59,
-						"h": 98
-					},
-					"frame": {
-						"x": 205,
-						"y": 99,
-						"w": 59,
-						"h": 98
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 1,
-						"w": 59,
-						"h": 98
-					},
-					"frame": {
-						"x": 205,
-						"y": 99,
-						"w": 59,
-						"h": 98
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 0,
-						"w": 59,
-						"h": 99
-					},
-					"frame": {
-						"x": 264,
-						"y": 99,
-						"w": 59,
-						"h": 99
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 1,
-						"w": 59,
-						"h": 98
-					},
-					"frame": {
-						"x": 253,
-						"y": 198,
-						"w": 59,
-						"h": 98
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:2943281264e8142bbdb55f3a34167d72:322e92870c690e237c7a5e4a4a5f8e84:1a0490303f9626f92e787c567cd10feb$"
-	}
-}
diff --git a/public/images/pokemon/exp/936.png b/public/images/pokemon/exp/936.png
deleted file mode 100644
index dce770dca44..00000000000
Binary files a/public/images/pokemon/exp/936.png and /dev/null differ
diff --git a/public/images/pokemon/exp/937.json b/public/images/pokemon/exp/937.json
deleted file mode 100644
index 9eba0e32900..00000000000
--- a/public/images/pokemon/exp/937.json
+++ /dev/null
@@ -1,125 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "937.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 247,
-				"h": 247
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 86,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 83,
-						"h": 98
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 83,
-						"h": 98
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 86,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 81,
-						"h": 99
-					},
-					"frame": {
-						"x": 83,
-						"y": 0,
-						"w": 81,
-						"h": 99
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 86,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 83,
-						"h": 99
-					},
-					"frame": {
-						"x": 164,
-						"y": 0,
-						"w": 83,
-						"h": 99
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 86,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 86,
-						"h": 99
-					},
-					"frame": {
-						"x": 0,
-						"y": 99,
-						"w": 86,
-						"h": 99
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 86,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 86,
-						"h": 99
-					},
-					"frame": {
-						"x": 86,
-						"y": 99,
-						"w": 86,
-						"h": 99
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:492182e4e32e5cddaa9dfc2c2c08b684:084d0317f824a0d082ba0ffcfebc407b:1d4b4f8d62307c37457ba974879b47d0$"
-	}
-}
diff --git a/public/images/pokemon/exp/937.png b/public/images/pokemon/exp/937.png
deleted file mode 100644
index 6e8b5b34268..00000000000
Binary files a/public/images/pokemon/exp/937.png and /dev/null differ
diff --git a/public/images/pokemon/exp/back/2037.json b/public/images/pokemon/exp/back/2037.json
index 15e851c69e6..bd9c903fede 100644
--- a/public/images/pokemon/exp/back/2037.json
+++ b/public/images/pokemon/exp/back/2037.json
@@ -1,188 +1,101 @@
-{
-	"textures": [
-		{
-			"image": "2037.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 150,
-				"h": 150
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 61,
-						"h": 50
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 61,
-						"h": 50
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 61,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 61,
-						"h": 50
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 61,
-						"h": 50
-					},
-					"frame": {
-						"x": 61,
-						"y": 0,
-						"w": 61,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 61,
-						"h": 50
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 60,
-						"h": 50
-					},
-					"frame": {
-						"x": 0,
-						"y": 50,
-						"w": 60,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 61,
-						"h": 50
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 60,
-						"h": 50
-					},
-					"frame": {
-						"x": 0,
-						"y": 50,
-						"w": 60,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 61,
-						"h": 50
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 59,
-						"h": 50
-					},
-					"frame": {
-						"x": 0,
-						"y": 100,
-						"w": 59,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 61,
-						"h": 50
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 59,
-						"h": 50
-					},
-					"frame": {
-						"x": 59,
-						"y": 100,
-						"w": 59,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 61,
-						"h": 50
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 59,
-						"h": 50
-					},
-					"frame": {
-						"x": 59,
-						"y": 100,
-						"w": 59,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 61,
-						"h": 50
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 61,
-						"h": 48
-					},
-					"frame": {
-						"x": 60,
-						"y": 50,
-						"w": 61,
-						"h": 48
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:b0b51d6624079d060ef8895666c251a5:a4d98b9d3c1f076758f8595cceddc8c2:c679847d1c2ddf91caeaa5ebb76a6664$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 0, "y": 48, "w": 58, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 0, "w": 58, "h": 49 },
+    "sourceSize": { "w": 63, "h": 49 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 58, "y": 48, "w": 58, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 1, "w": 58, "h": 48 },
+    "sourceSize": { "w": 63, "h": 49 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 116, "y": 48, "w": 58, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 1, "w": 58, "h": 48 },
+    "sourceSize": { "w": 63, "h": 49 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 58, "y": 96, "w": 56, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 56, "h": 46 },
+    "sourceSize": { "w": 63, "h": 49 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 174, "y": 95, "w": 58, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 58, "h": 46 },
+    "sourceSize": { "w": 63, "h": 49 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 174, "y": 49, "w": 60, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 60, "h": 46 },
+    "sourceSize": { "w": 63, "h": 49 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 0, "y": 0, "w": 63, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 63, "h": 48 },
+    "sourceSize": { "w": 63, "h": 49 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 63, "y": 0, "w": 62, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 62, "h": 48 },
+    "sourceSize": { "w": 63, "h": 49 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 125, "y": 0, "w": 61, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 61, "h": 48 },
+    "sourceSize": { "w": 63, "h": 49 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 186, "y": 0, "w": 59, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 59, "h": 49 },
+    "sourceSize": { "w": 63, "h": 49 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.13-x64",
+  "image": "2037.png",
+  "format": "I8",
+  "size": { "w": 245, "h": 142 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/2037.png b/public/images/pokemon/exp/back/2037.png
index 7a945877fe1..7c5d688b020 100644
Binary files a/public/images/pokemon/exp/back/2037.png and b/public/images/pokemon/exp/back/2037.png differ
diff --git a/public/images/pokemon/exp/back/2038.json b/public/images/pokemon/exp/back/2038.json
index 902ed5c4863..af164a77c57 100644
--- a/public/images/pokemon/exp/back/2038.json
+++ b/public/images/pokemon/exp/back/2038.json
@@ -1,692 +1,155 @@
-{
-	"textures": [
-		{
-			"image": "2038.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 514,
-				"h": 514
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 111,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 8,
-						"w": 101,
-						"h": 63
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 101,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 111,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 8,
-						"w": 102,
-						"h": 64
-					},
-					"frame": {
-						"x": 101,
-						"y": 0,
-						"w": 102,
-						"h": 64
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 111,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 12,
-						"y": 7,
-						"w": 99,
-						"h": 64
-					},
-					"frame": {
-						"x": 203,
-						"y": 0,
-						"w": 99,
-						"h": 64
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 111,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 12,
-						"y": 7,
-						"w": 99,
-						"h": 64
-					},
-					"frame": {
-						"x": 302,
-						"y": 0,
-						"w": 99,
-						"h": 64
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 111,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 12,
-						"y": 7,
-						"w": 98,
-						"h": 64
-					},
-					"frame": {
-						"x": 401,
-						"y": 0,
-						"w": 98,
-						"h": 64
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 111,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 12,
-						"y": 6,
-						"w": 98,
-						"h": 65
-					},
-					"frame": {
-						"x": 0,
-						"y": 63,
-						"w": 98,
-						"h": 65
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 111,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 111,
-						"h": 65
-					},
-					"frame": {
-						"x": 98,
-						"y": 64,
-						"w": 111,
-						"h": 65
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 111,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 111,
-						"h": 65
-					},
-					"frame": {
-						"x": 209,
-						"y": 64,
-						"w": 111,
-						"h": 65
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 111,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 8,
-						"w": 104,
-						"h": 65
-					},
-					"frame": {
-						"x": 320,
-						"y": 64,
-						"w": 104,
-						"h": 65
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 111,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 12,
-						"y": 6,
-						"w": 97,
-						"h": 65
-					},
-					"frame": {
-						"x": 0,
-						"y": 128,
-						"w": 97,
-						"h": 65
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 111,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 12,
-						"y": 6,
-						"w": 97,
-						"h": 65
-					},
-					"frame": {
-						"x": 97,
-						"y": 129,
-						"w": 97,
-						"h": 65
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 111,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 111,
-						"h": 66
-					},
-					"frame": {
-						"x": 194,
-						"y": 129,
-						"w": 111,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 111,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 111,
-						"h": 66
-					},
-					"frame": {
-						"x": 305,
-						"y": 129,
-						"w": 111,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 111,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 11,
-						"y": 5,
-						"w": 98,
-						"h": 66
-					},
-					"frame": {
-						"x": 416,
-						"y": 129,
-						"w": 98,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 111,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 7,
-						"w": 110,
-						"h": 66
-					},
-					"frame": {
-						"x": 0,
-						"y": 194,
-						"w": 110,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 111,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 7,
-						"w": 108,
-						"h": 66
-					},
-					"frame": {
-						"x": 110,
-						"y": 195,
-						"w": 108,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 111,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 7,
-						"w": 106,
-						"h": 66
-					},
-					"frame": {
-						"x": 218,
-						"y": 195,
-						"w": 106,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 111,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 4,
-						"w": 109,
-						"h": 67
-					},
-					"frame": {
-						"x": 324,
-						"y": 195,
-						"w": 109,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 111,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 111,
-						"h": 67
-					},
-					"frame": {
-						"x": 0,
-						"y": 261,
-						"w": 111,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 111,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 3,
-						"w": 98,
-						"h": 68
-					},
-					"frame": {
-						"x": 111,
-						"y": 261,
-						"w": 98,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 111,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 2,
-						"w": 108,
-						"h": 69
-					},
-					"frame": {
-						"x": 209,
-						"y": 261,
-						"w": 108,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 111,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 2,
-						"w": 98,
-						"h": 69
-					},
-					"frame": {
-						"x": 317,
-						"y": 262,
-						"w": 98,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 111,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 1,
-						"w": 98,
-						"h": 70
-					},
-					"frame": {
-						"x": 415,
-						"y": 262,
-						"w": 98,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0031.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 111,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 106,
-						"h": 70
-					},
-					"frame": {
-						"x": 0,
-						"y": 328,
-						"w": 106,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 111,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 0,
-						"w": 99,
-						"h": 71
-					},
-					"frame": {
-						"x": 106,
-						"y": 329,
-						"w": 99,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0032.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 111,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 1,
-						"w": 106,
-						"h": 70
-					},
-					"frame": {
-						"x": 205,
-						"y": 330,
-						"w": 106,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0025.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 111,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 0,
-						"w": 98,
-						"h": 71
-					},
-					"frame": {
-						"x": 311,
-						"y": 331,
-						"w": 98,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0026.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 111,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 100,
-						"h": 71
-					},
-					"frame": {
-						"x": 409,
-						"y": 332,
-						"w": 100,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0027.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 111,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 0,
-						"w": 102,
-						"h": 71
-					},
-					"frame": {
-						"x": 0,
-						"y": 398,
-						"w": 102,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0028.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 111,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 0,
-						"w": 103,
-						"h": 71
-					},
-					"frame": {
-						"x": 102,
-						"y": 400,
-						"w": 103,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0029.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 111,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 0,
-						"w": 104,
-						"h": 71
-					},
-					"frame": {
-						"x": 205,
-						"y": 400,
-						"w": 104,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0030.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 111,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 0,
-						"w": 106,
-						"h": 71
-					},
-					"frame": {
-						"x": 309,
-						"y": 403,
-						"w": 106,
-						"h": 71
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:612f29cb3148d3054c6515b49bbbd16a:431a4f3395b63c472bcd1086332ea861:51bcdbb4fa6a1a9e90a83c2a4132ee1b$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 232, "y": 198, "w": 74, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 2, "w": 74, "h": 62 },
+    "sourceSize": { "w": 82, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 155, "y": 132, "w": 78, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 78, "h": 65 },
+    "sourceSize": { "w": 82, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 156, "y": 66, "w": 78, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 78, "h": 66 },
+    "sourceSize": { "w": 82, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 78, "y": 134, "w": 77, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 77, "h": 64 },
+    "sourceSize": { "w": 82, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 75, "y": 198, "w": 77, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 77, "h": 61 },
+    "sourceSize": { "w": 82, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 0, "y": 134, "w": 78, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 78, "h": 64 },
+    "sourceSize": { "w": 82, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 234, "y": 67, "w": 78, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 78, "h": 66 },
+    "sourceSize": { "w": 82, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 233, "y": 133, "w": 78, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 78, "h": 65 },
+    "sourceSize": { "w": 82, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 155, "y": 197, "w": 77, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 77, "h": 63 },
+    "sourceSize": { "w": 82, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 156, "y": 0, "w": 79, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 79, "h": 66 },
+    "sourceSize": { "w": 82, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 0, "y": 0, "w": 78, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 78, "h": 68 },
+    "sourceSize": { "w": 82, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 235, "y": 0, "w": 77, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 77, "h": 67 },
+    "sourceSize": { "w": 82, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 0, "y": 198, "w": 75, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 75, "h": 64 },
+    "sourceSize": { "w": 82, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 0, "y": 68, "w": 78, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 78, "h": 66 },
+    "sourceSize": { "w": 82, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 78, "y": 0, "w": 78, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 78, "h": 68 },
+    "sourceSize": { "w": 82, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 78, "y": 68, "w": 77, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 77, "h": 66 },
+    "sourceSize": { "w": 82, "h": 69 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.13-x64",
+  "image": "2038.png",
+  "format": "I8",
+  "size": { "w": 312, "h": 262 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/2038.png b/public/images/pokemon/exp/back/2038.png
index 90f487089a9..f4a022692a1 100644
Binary files a/public/images/pokemon/exp/back/2038.png and b/public/images/pokemon/exp/back/2038.png differ
diff --git a/public/images/pokemon/exp/back/2074.json b/public/images/pokemon/exp/back/2074.json
index 953cc076151..d7500c522e9 100644
--- a/public/images/pokemon/exp/back/2074.json
+++ b/public/images/pokemon/exp/back/2074.json
@@ -1,230 +1,398 @@
-{
-	"textures": [
-		{
-			"image": "2074.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 108,
-				"h": 108
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 57,
-						"h": 43
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 11,
-						"w": 57,
-						"h": 32
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 57,
-						"h": 32
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 57,
-						"h": 43
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 9,
-						"w": 56,
-						"h": 33
-					},
-					"frame": {
-						"x": 0,
-						"y": 32,
-						"w": 56,
-						"h": 33
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 57,
-						"h": 43
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 9,
-						"w": 56,
-						"h": 33
-					},
-					"frame": {
-						"x": 0,
-						"y": 32,
-						"w": 56,
-						"h": 33
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 57,
-						"h": 43
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 6,
-						"w": 54,
-						"h": 34
-					},
-					"frame": {
-						"x": 0,
-						"y": 65,
-						"w": 54,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 57,
-						"h": 43
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 6,
-						"w": 54,
-						"h": 34
-					},
-					"frame": {
-						"x": 0,
-						"y": 65,
-						"w": 54,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 57,
-						"h": 43
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 4,
-						"w": 51,
-						"h": 34
-					},
-					"frame": {
-						"x": 57,
-						"y": 0,
-						"w": 51,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 57,
-						"h": 43
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 4,
-						"w": 51,
-						"h": 34
-					},
-					"frame": {
-						"x": 57,
-						"y": 0,
-						"w": 51,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 57,
-						"h": 43
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 51,
-						"h": 35
-					},
-					"frame": {
-						"x": 56,
-						"y": 34,
-						"w": 51,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 57,
-						"h": 43
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 51,
-						"h": 35
-					},
-					"frame": {
-						"x": 56,
-						"y": 34,
-						"w": 51,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 57,
-						"h": 43
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 51,
-						"h": 34
-					},
-					"frame": {
-						"x": 54,
-						"y": 69,
-						"w": 51,
-						"h": 34
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:fdf01f8cadd6949c73cf35b994ae45ba:5c71945b84f6c35163c62bc518f57fb5:ad137687a877f55f096b7447bfdfe295$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 63, "y": 100, "w": 59, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 59, "h": 32 },
+    "sourceSize": { "w": 71, "h": 44 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 195, "y": 99, "w": 61, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 5, "w": 61, "h": 32 },
+    "sourceSize": { "w": 71, "h": 44 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 131, "y": 68, "w": 64, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 9, "w": 64, "h": 32 },
+    "sourceSize": { "w": 71, "h": 44 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 203, "y": 67, "w": 65, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 12, "w": 65, "h": 32 },
+    "sourceSize": { "w": 71, "h": 44 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 1, "y": 35, "w": 66, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 12, "w": 66, "h": 32 },
+    "sourceSize": { "w": 71, "h": 44 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 1, "y": 67, "w": 66, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 12, "w": 66, "h": 32 },
+    "sourceSize": { "w": 71, "h": 44 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 1, "y": 35, "w": 66, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 10, "w": 66, "h": 32 },
+    "sourceSize": { "w": 71, "h": 44 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 203, "y": 67, "w": 65, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 8, "w": 65, "h": 32 },
+    "sourceSize": { "w": 71, "h": 44 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 131, "y": 68, "w": 64, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 6, "w": 64, "h": 32 },
+    "sourceSize": { "w": 71, "h": 44 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 195, "y": 99, "w": 61, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 4, "w": 61, "h": 32 },
+    "sourceSize": { "w": 71, "h": 44 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 63, "y": 100, "w": 59, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 59, "h": 32 },
+    "sourceSize": { "w": 71, "h": 44 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 195, "y": 99, "w": 61, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 5, "w": 61, "h": 32 },
+    "sourceSize": { "w": 71, "h": 44 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 131, "y": 68, "w": 64, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 9, "w": 64, "h": 32 },
+    "sourceSize": { "w": 71, "h": 44 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 203, "y": 67, "w": 65, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 12, "w": 65, "h": 32 },
+    "sourceSize": { "w": 71, "h": 44 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 1, "y": 35, "w": 66, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 12, "w": 66, "h": 32 },
+    "sourceSize": { "w": 71, "h": 44 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 1, "y": 67, "w": 66, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 12, "w": 66, "h": 32 },
+    "sourceSize": { "w": 71, "h": 44 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 1, "y": 35, "w": 66, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 10, "w": 66, "h": 32 },
+    "sourceSize": { "w": 71, "h": 44 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 203, "y": 67, "w": 65, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 8, "w": 65, "h": 32 },
+    "sourceSize": { "w": 71, "h": 44 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 131, "y": 68, "w": 64, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 6, "w": 64, "h": 32 },
+    "sourceSize": { "w": 71, "h": 44 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 195, "y": 99, "w": 61, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 4, "w": 61, "h": 32 },
+    "sourceSize": { "w": 71, "h": 44 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 63, "y": 100, "w": 59, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 59, "h": 32 },
+    "sourceSize": { "w": 71, "h": 44 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 195, "y": 99, "w": 61, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 5, "w": 61, "h": 32 },
+    "sourceSize": { "w": 71, "h": 44 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 131, "y": 68, "w": 64, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 9, "w": 64, "h": 32 },
+    "sourceSize": { "w": 71, "h": 44 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 203, "y": 67, "w": 65, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 12, "w": 65, "h": 32 },
+    "sourceSize": { "w": 71, "h": 44 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 1, "y": 35, "w": 66, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 12, "w": 66, "h": 32 },
+    "sourceSize": { "w": 71, "h": 44 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 1, "y": 67, "w": 66, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 12, "w": 66, "h": 32 },
+    "sourceSize": { "w": 71, "h": 44 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 1, "y": 35, "w": 66, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 10, "w": 66, "h": 32 },
+    "sourceSize": { "w": 71, "h": 44 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 203, "y": 67, "w": 65, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 8, "w": 65, "h": 32 },
+    "sourceSize": { "w": 71, "h": 44 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 131, "y": 68, "w": 64, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 6, "w": 64, "h": 32 },
+    "sourceSize": { "w": 71, "h": 44 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 195, "y": 99, "w": 61, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 4, "w": 61, "h": 32 },
+    "sourceSize": { "w": 71, "h": 44 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 63, "y": 100, "w": 59, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 59, "h": 32 },
+    "sourceSize": { "w": 71, "h": 44 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 268, "y": 68, "w": 62, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 62, "h": 33 },
+    "sourceSize": { "w": 71, "h": 44 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 67, "y": 67, "w": 64, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 8, "w": 64, "h": 33 },
+    "sourceSize": { "w": 71, "h": 44 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 203, "y": 34, "w": 66, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 8, "w": 66, "h": 33 },
+    "sourceSize": { "w": 71, "h": 44 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 275, "y": 1, "w": 67, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 67, "h": 33 },
+    "sourceSize": { "w": 71, "h": 44 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 71, "y": 1, "w": 68, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 68, "h": 33 },
+    "sourceSize": { "w": 71, "h": 44 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 1, "y": 1, "w": 70, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 70, "h": 34 },
+    "sourceSize": { "w": 71, "h": 44 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 139, "y": 1, "w": 68, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 68, "h": 33 },
+    "sourceSize": { "w": 71, "h": 44 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 207, "y": 1, "w": 68, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 68, "h": 33 },
+    "sourceSize": { "w": 71, "h": 44 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 71, "y": 34, "w": 67, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 67, "h": 33 },
+    "sourceSize": { "w": 71, "h": 44 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 138, "y": 34, "w": 65, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 65, "h": 34 },
+    "sourceSize": { "w": 71, "h": 44 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 269, "y": 34, "w": 64, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 64, "h": 34 },
+    "sourceSize": { "w": 71, "h": 44 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 1, "y": 99, "w": 62, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 1, "w": 62, "h": 33 },
+    "sourceSize": { "w": 71, "h": 44 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.13-x64",
+  "image": "2074.png",
+  "format": "I8",
+  "size": { "w": 343, "h": 133 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/2074.png b/public/images/pokemon/exp/back/2074.png
index ebf58bf2f76..e8e2dc5ad22 100644
Binary files a/public/images/pokemon/exp/back/2074.png and b/public/images/pokemon/exp/back/2074.png differ
diff --git a/public/images/pokemon/exp/back/2075.json b/public/images/pokemon/exp/back/2075.json
index accac7c7dcf..3dd46debe2f 100644
--- a/public/images/pokemon/exp/back/2075.json
+++ b/public/images/pokemon/exp/back/2075.json
@@ -1,188 +1,812 @@
-{
-	"textures": [
-		{
-			"image": "2075.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 131,
-				"h": 131
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 67,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 67,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 67,
-						"h": 43
-					},
-					"frame": {
-						"x": 0,
-						"y": 44,
-						"w": 67,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 65,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 87,
-						"w": 65,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 65,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 87,
-						"w": 65,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 0,
-						"w": 63,
-						"h": 44
-					},
-					"frame": {
-						"x": 65,
-						"y": 87,
-						"w": 63,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 0,
-						"w": 63,
-						"h": 44
-					},
-					"frame": {
-						"x": 65,
-						"y": 87,
-						"w": 63,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 0,
-						"w": 61,
-						"h": 44
-					},
-					"frame": {
-						"x": 67,
-						"y": 0,
-						"w": 61,
-						"h": 44
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:0b4413911e6a410c634fb5925e19fb50:d060400f7fc28ab507bb0c4ef37df223:732805cb123f88b2d403da0dec709706$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 147, "y": 1, "w": 71, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 0, "w": 71, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 219, "y": 1, "w": 71, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 0, "w": 71, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 418, "y": 90, "w": 69, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 69, "h": 42 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 213, "y": 215, "w": 67, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 67, "h": 42 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 1, "y": 256, "w": 65, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 65, "h": 42 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 213, "y": 215, "w": 67, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 67, "h": 42 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 418, "y": 90, "w": 69, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 69, "h": 42 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 219, "y": 1, "w": 71, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 0, "w": 71, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 147, "y": 1, "w": 71, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 0, "w": 71, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 435, "y": 1, "w": 71, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 71, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 74, "y": 1, "w": 72, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 72, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 1, "y": 1, "w": 72, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 72, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 291, "y": 1, "w": 71, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 71, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 1, "y": 1, "w": 72, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 72, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 74, "y": 1, "w": 72, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 72, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 435, "y": 1, "w": 71, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 71, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 147, "y": 1, "w": 71, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 0, "w": 71, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 219, "y": 1, "w": 71, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 0, "w": 71, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 418, "y": 90, "w": 69, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 69, "h": 42 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 213, "y": 215, "w": 67, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 67, "h": 42 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 1, "y": 256, "w": 65, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 65, "h": 42 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 213, "y": 215, "w": 67, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 67, "h": 42 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 418, "y": 90, "w": 69, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 69, "h": 42 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 219, "y": 1, "w": 71, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 0, "w": 71, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 147, "y": 1, "w": 71, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 0, "w": 71, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 435, "y": 1, "w": 71, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 71, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 74, "y": 1, "w": 72, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 72, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 1, "y": 1, "w": 72, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 72, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 291, "y": 1, "w": 71, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 71, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 1, "y": 1, "w": 72, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 72, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 74, "y": 1, "w": 72, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 72, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 435, "y": 1, "w": 71, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 71, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 147, "y": 1, "w": 71, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 0, "w": 71, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 219, "y": 1, "w": 71, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 0, "w": 71, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 418, "y": 90, "w": 69, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 69, "h": 42 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 213, "y": 215, "w": 67, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 67, "h": 42 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 1, "y": 256, "w": 65, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 65, "h": 42 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 213, "y": 215, "w": 67, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 67, "h": 42 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 418, "y": 90, "w": 69, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 69, "h": 42 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 219, "y": 1, "w": 71, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 0, "w": 71, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 147, "y": 1, "w": 71, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 0, "w": 71, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 435, "y": 1, "w": 71, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 71, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 74, "y": 1, "w": 72, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 72, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 1, "y": 1, "w": 72, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 72, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 291, "y": 1, "w": 71, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 71, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 1, "y": 1, "w": 72, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 72, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 74, "y": 1, "w": 72, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 72, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 435, "y": 1, "w": 71, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 71, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 147, "y": 1, "w": 71, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 0, "w": 71, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 346, "y": 89, "w": 71, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 1, "w": 71, "h": 41 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 425, "y": 133, "w": 71, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 71, "h": 40 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 425, "y": 133, "w": 71, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 1, "w": 71, "h": 40 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 425, "y": 133, "w": 71, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 71, "h": 40 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 289, "y": 175, "w": 71, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 71, "h": 40 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 497, "y": 174, "w": 71, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 2, "w": 71, "h": 40 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 1, "y": 174, "w": 71, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 2, "w": 71, "h": 40 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 497, "y": 133, "w": 71, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 2, "w": 71, "h": 40 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 503, "y": 215, "w": 70, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 70, "h": 40 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 73, "y": 215, "w": 69, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 2, "w": 69, "h": 41 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 486, "y": 46, "w": 68, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 2, "w": 68, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 210, "y": 45, "w": 67, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 2, "w": 67, "h": 44 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 1, "y": 45, "w": 66, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 1, "w": 66, "h": 46 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 278, "y": 45, "w": 67, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 2, "w": 67, "h": 44 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 284, "y": 131, "w": 69, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 2, "w": 69, "h": 42 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 143, "y": 215, "w": 69, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 2, "w": 69, "h": 41 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 281, "y": 216, "w": 70, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 70, "h": 40 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 432, "y": 215, "w": 70, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 70, "h": 40 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 361, "y": 215, "w": 70, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 2, "w": 70, "h": 40 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 73, "y": 174, "w": 71, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 2, "w": 71, "h": 40 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 1, "y": 215, "w": 71, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 71, "h": 40 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 145, "y": 174, "w": 71, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 71, "h": 40 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 71, "y": 132, "w": 70, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 70, "h": 41 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 140, "y": 90, "w": 71, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 71, "h": 41 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 68, "y": 88, "w": 71, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 71, "h": 41 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 346, "y": 45, "w": 70, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 70, "h": 42 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 1, "y": 130, "w": 69, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 69, "h": 42 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 417, "y": 45, "w": 68, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 68, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 507, "y": 1, "w": 69, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 69, "h": 44 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 140, "y": 45, "w": 69, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 69, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 488, "y": 90, "w": 69, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 69, "h": 42 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 142, "y": 132, "w": 70, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 70, "h": 41 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 213, "y": 132, "w": 70, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 70, "h": 41 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 354, "y": 133, "w": 70, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 70, "h": 41 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 217, "y": 174, "w": 71, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 71, "h": 40 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 425, "y": 174, "w": 71, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 71, "h": 40 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 212, "y": 90, "w": 71, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 71, "h": 41 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 346, "y": 89, "w": 71, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 71, "h": 41 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0088.png",
+    "frame": { "x": 68, "y": 45, "w": 71, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 1, "w": 71, "h": 42 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0089.png",
+    "frame": { "x": 363, "y": 1, "w": 71, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 0, "w": 71, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.13-x64",
+  "image": "2075.png",
+  "format": "I8",
+  "size": { "w": 577, "h": 299 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/2075.png b/public/images/pokemon/exp/back/2075.png
index 8d3bea8a7e2..6c11c18bd1d 100644
Binary files a/public/images/pokemon/exp/back/2075.png and b/public/images/pokemon/exp/back/2075.png differ
diff --git a/public/images/pokemon/exp/back/2076.json b/public/images/pokemon/exp/back/2076.json
index 35dc582bd1f..11a4999b41d 100644
--- a/public/images/pokemon/exp/back/2076.json
+++ b/public/images/pokemon/exp/back/2076.json
@@ -1,209 +1,965 @@
-{
-	"textures": [
-		{
-			"image": "2076.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 206,
-				"h": 206
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 55,
-						"h": 70
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 55,
-						"h": 67
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 55,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 55,
-						"h": 70
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 55,
-						"h": 67
-					},
-					"frame": {
-						"x": 55,
-						"y": 0,
-						"w": 55,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 55,
-						"h": 70
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 55,
-						"h": 67
-					},
-					"frame": {
-						"x": 110,
-						"y": 0,
-						"w": 55,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 55,
-						"h": 70
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 55,
-						"h": 67
-					},
-					"frame": {
-						"x": 0,
-						"y": 67,
-						"w": 55,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 55,
-						"h": 70
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 54,
-						"h": 69
-					},
-					"frame": {
-						"x": 55,
-						"y": 67,
-						"w": 54,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 55,
-						"h": 70
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 55,
-						"h": 69
-					},
-					"frame": {
-						"x": 109,
-						"y": 67,
-						"w": 55,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 55,
-						"h": 70
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 55,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 134,
-						"w": 55,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 55,
-						"h": 70
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 55,
-						"h": 70
-					},
-					"frame": {
-						"x": 55,
-						"y": 136,
-						"w": 55,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 55,
-						"h": 70
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 55,
-						"h": 70
-					},
-					"frame": {
-						"x": 110,
-						"y": 136,
-						"w": 55,
-						"h": 70
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:43a87c427fa88140ff282cd96661b87b:3134e1dbacb6621feff55273f34d3386:719cdf7324091edbb7b1d6e2d7254a1a$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 1, "y": 322, "w": 53, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 53, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 165, "y": 318, "w": 53, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 53, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 218, "y": 318, "w": 53, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 53, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 271, "y": 254, "w": 54, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 54, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 163, "y": 193, "w": 54, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 54, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 57, "y": 64, "w": 55, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 55, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 56, "y": 129, "w": 55, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 5, "w": 55, "h": 64 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 111, "y": 129, "w": 55, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 55, "h": 64 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 348, "y": 63, "w": 56, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 56, "h": 64 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 1, "y": 64, "w": 56, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 56, "h": 64 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 221, "y": 189, "w": 55, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 55, "h": 64 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 166, "y": 129, "w": 55, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 55, "h": 64 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 167, "y": 64, "w": 55, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 55, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 55, "y": 193, "w": 54, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 54, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 324, "y": 321, "w": 53, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 53, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 1, "y": 192, "w": 54, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 54, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 1, "y": 322, "w": 53, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 53, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 165, "y": 318, "w": 53, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 53, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 218, "y": 318, "w": 53, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 53, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 271, "y": 254, "w": 54, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 54, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 163, "y": 193, "w": 54, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 54, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 57, "y": 64, "w": 55, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 55, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 56, "y": 129, "w": 55, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 5, "w": 55, "h": 64 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 111, "y": 129, "w": 55, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 55, "h": 64 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 348, "y": 63, "w": 56, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 56, "h": 64 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 1, "y": 64, "w": 56, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 56, "h": 64 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 221, "y": 189, "w": 55, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 55, "h": 64 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 166, "y": 129, "w": 55, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 55, "h": 64 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 167, "y": 64, "w": 55, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 55, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 55, "y": 193, "w": 54, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 54, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 324, "y": 321, "w": 53, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 53, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 1, "y": 192, "w": 54, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 54, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 1, "y": 322, "w": 53, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 53, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 165, "y": 318, "w": 53, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 53, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 218, "y": 318, "w": 53, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 53, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 271, "y": 254, "w": 54, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 54, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 163, "y": 193, "w": 54, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 54, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 57, "y": 64, "w": 55, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 55, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 56, "y": 129, "w": 55, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 5, "w": 55, "h": 64 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 111, "y": 129, "w": 55, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 55, "h": 64 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 348, "y": 63, "w": 56, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 56, "h": 64 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 1, "y": 64, "w": 56, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 56, "h": 64 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 221, "y": 189, "w": 55, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 55, "h": 64 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 166, "y": 129, "w": 55, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 55, "h": 64 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 167, "y": 64, "w": 55, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 55, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 55, "y": 193, "w": 54, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 54, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 324, "y": 321, "w": 53, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 53, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 1, "y": 192, "w": 54, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 54, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 1, "y": 322, "w": 53, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 53, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 165, "y": 318, "w": 53, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 53, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 218, "y": 318, "w": 53, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 53, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 271, "y": 254, "w": 54, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 54, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 163, "y": 193, "w": 54, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 54, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 57, "y": 64, "w": 55, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 55, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 56, "y": 129, "w": 55, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 5, "w": 55, "h": 64 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 111, "y": 129, "w": 55, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 55, "h": 64 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 348, "y": 63, "w": 56, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 56, "h": 64 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 1, "y": 64, "w": 56, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 56, "h": 64 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 221, "y": 189, "w": 55, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 55, "h": 64 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 166, "y": 129, "w": 55, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 55, "h": 64 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 167, "y": 64, "w": 55, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 55, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 55, "y": 193, "w": 54, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 54, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 324, "y": 321, "w": 53, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 53, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 1, "y": 192, "w": 54, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 54, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 1, "y": 322, "w": 53, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 53, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 109, "y": 193, "w": 54, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 54, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 111, "y": 258, "w": 54, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 54, "h": 64 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 330, "y": 191, "w": 54, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 54, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 108, "y": 322, "w": 53, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 53, "h": 64 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 161, "y": 383, "w": 53, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 6, "w": 53, "h": 63 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 1, "y": 322, "w": 53, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 53, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 55, "y": 320, "w": 53, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 53, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 271, "y": 319, "w": 53, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 53, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 217, "y": 253, "w": 54, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 54, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 276, "y": 189, "w": 54, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 54, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 334, "y": 127, "w": 55, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 55, "h": 64 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 222, "y": 126, "w": 56, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 56, "h": 63 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 175, "y": 1, "w": 58, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 58, "h": 63 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 175, "y": 1, "w": 58, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 58, "h": 63 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 117, "y": 1, "w": 58, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 58, "h": 63 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 117, "y": 1, "w": 58, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 58, "h": 63 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 59, "y": 1, "w": 58, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 58, "h": 63 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 59, "y": 1, "w": 58, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 58, "h": 63 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 1, "y": 1, "w": 58, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 58, "h": 63 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 1, "y": 1, "w": 58, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 58, "h": 63 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 1, "y": 1, "w": 58, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 58, "h": 63 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 233, "y": 1, "w": 58, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 58, "h": 63 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0088.png",
+    "frame": { "x": 233, "y": 1, "w": 58, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 58, "h": 63 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0089.png",
+    "frame": { "x": 349, "y": 1, "w": 58, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 7, "w": 58, "h": 62 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0090.png",
+    "frame": { "x": 233, "y": 1, "w": 58, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 58, "h": 63 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0091.png",
+    "frame": { "x": 349, "y": 1, "w": 58, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 7, "w": 58, "h": 62 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0092.png",
+    "frame": { "x": 233, "y": 1, "w": 58, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 58, "h": 63 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0093.png",
+    "frame": { "x": 349, "y": 1, "w": 58, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 7, "w": 58, "h": 62 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0094.png",
+    "frame": { "x": 233, "y": 1, "w": 58, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 58, "h": 63 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0095.png",
+    "frame": { "x": 349, "y": 1, "w": 58, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 7, "w": 58, "h": 62 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0096.png",
+    "frame": { "x": 233, "y": 1, "w": 58, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 58, "h": 63 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0097.png",
+    "frame": { "x": 349, "y": 1, "w": 58, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 7, "w": 58, "h": 62 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0098.png",
+    "frame": { "x": 291, "y": 1, "w": 58, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 7, "w": 58, "h": 62 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0099.png",
+    "frame": { "x": 222, "y": 64, "w": 57, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 7, "w": 57, "h": 62 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0100.png",
+    "frame": { "x": 55, "y": 258, "w": 56, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 7, "w": 56, "h": 62 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0101.png",
+    "frame": { "x": 291, "y": 63, "w": 57, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 6, "w": 57, "h": 63 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0102.png",
+    "frame": { "x": 278, "y": 126, "w": 56, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 6, "w": 56, "h": 63 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0103.png",
+    "frame": { "x": 1, "y": 128, "w": 55, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 55, "h": 64 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0104.png",
+    "frame": { "x": 112, "y": 64, "w": 55, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 55, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0105.png",
+    "frame": { "x": 325, "y": 256, "w": 54, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 54, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0106.png",
+    "frame": { "x": 1, "y": 257, "w": 54, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 54, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.13-x64",
+  "image": "2076.png",
+  "format": "I8",
+  "size": { "w": 408, "h": 447 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/2076.png b/public/images/pokemon/exp/back/2076.png
index 327aed5d485..a3e203ac669 100644
Binary files a/public/images/pokemon/exp/back/2076.png and b/public/images/pokemon/exp/back/2076.png differ
diff --git a/public/images/pokemon/exp/back/2088.json b/public/images/pokemon/exp/back/2088.json
index 72673c949ba..bc5207262b9 100644
--- a/public/images/pokemon/exp/back/2088.json
+++ b/public/images/pokemon/exp/back/2088.json
@@ -1,230 +1,173 @@
-{
-	"textures": [
-		{
-			"image": "2088.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 123,
-				"h": 123
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 41
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 47,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 47,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 41
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 47,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 47,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 41
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 48,
-						"h": 40
-					},
-					"frame": {
-						"x": 0,
-						"y": 41,
-						"w": 48,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 41
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 45,
-						"h": 41
-					},
-					"frame": {
-						"x": 47,
-						"y": 0,
-						"w": 45,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 41
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 45,
-						"h": 41
-					},
-					"frame": {
-						"x": 47,
-						"y": 0,
-						"w": 45,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 41
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 45,
-						"h": 41
-					},
-					"frame": {
-						"x": 48,
-						"y": 41,
-						"w": 45,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 41
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 45,
-						"h": 41
-					},
-					"frame": {
-						"x": 48,
-						"y": 41,
-						"w": 45,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 41
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 45,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 81,
-						"w": 45,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 41
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 44,
-						"h": 41
-					},
-					"frame": {
-						"x": 45,
-						"y": 82,
-						"w": 44,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 41
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 44,
-						"h": 41
-					},
-					"frame": {
-						"x": 45,
-						"y": 82,
-						"w": 44,
-						"h": 41
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:e484c868865b60e304dbc1fe02c5c476:0f1d94616ba91025b99edb3470c9c467:b8df8f168871505f42fdc6d3c5b106f0$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 49, "y": 111, "w": 48, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 0, "w": 48, "h": 39 },
+    "sourceSize": { "w": 58, "h": 39 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 0, "y": 75, "w": 49, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 0, "w": 49, "h": 39 },
+    "sourceSize": { "w": 58, "h": 39 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 216, "y": 75, "w": 50, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 50, "h": 38 },
+    "sourceSize": { "w": 58, "h": 39 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 54, "y": 73, "w": 52, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 52, "h": 38 },
+    "sourceSize": { "w": 58, "h": 39 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 0, "y": 37, "w": 54, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 54, "h": 38 },
+    "sourceSize": { "w": 58, "h": 39 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 111, "y": 38, "w": 54, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 54, "h": 37 },
+    "sourceSize": { "w": 58, "h": 39 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 169, "y": 0, "w": 56, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 56, "h": 37 },
+    "sourceSize": { "w": 58, "h": 39 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 225, "y": 0, "w": 56, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 56, "h": 37 },
+    "sourceSize": { "w": 58, "h": 39 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 54, "y": 37, "w": 57, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 57, "h": 36 },
+    "sourceSize": { "w": 58, "h": 39 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 0, "y": 0, "w": 57, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 57, "h": 37 },
+    "sourceSize": { "w": 58, "h": 39 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 57, "y": 0, "w": 57, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 57, "h": 37 },
+    "sourceSize": { "w": 58, "h": 39 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 169, "y": 37, "w": 55, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 55, "h": 37 },
+    "sourceSize": { "w": 58, "h": 39 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 114, "y": 0, "w": 55, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 55, "h": 38 },
+    "sourceSize": { "w": 58, "h": 39 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 224, "y": 37, "w": 53, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 53, "h": 38 },
+    "sourceSize": { "w": 58, "h": 39 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 165, "y": 74, "w": 51, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 51, "h": 38 },
+    "sourceSize": { "w": 58, "h": 39 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 106, "y": 75, "w": 49, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 0, "w": 49, "h": 39 },
+    "sourceSize": { "w": 58, "h": 39 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 155, "y": 112, "w": 48, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 0, "w": 48, "h": 39 },
+    "sourceSize": { "w": 58, "h": 39 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 203, "y": 113, "w": 48, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 0, "w": 48, "h": 39 },
+    "sourceSize": { "w": 58, "h": 39 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.13-x64",
+  "image": "2088.png",
+  "format": "I8",
+  "size": { "w": 281, "h": 152 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/2088.png b/public/images/pokemon/exp/back/2088.png
index e98936663f3..24bf7f0f893 100644
Binary files a/public/images/pokemon/exp/back/2088.png and b/public/images/pokemon/exp/back/2088.png differ
diff --git a/public/images/pokemon/exp/back/2089.json b/public/images/pokemon/exp/back/2089.json
index 96334438eeb..c0416f08b26 100644
--- a/public/images/pokemon/exp/back/2089.json
+++ b/public/images/pokemon/exp/back/2089.json
@@ -1,230 +1,1091 @@
-{
-	"textures": [
-		{
-			"image": "2089.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 178,
-				"h": 178
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 82,
-						"h": 63
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 82,
-						"h": 63
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 82,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 82,
-						"h": 63
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 82,
-						"h": 63
-					},
-					"frame": {
-						"x": 82,
-						"y": 0,
-						"w": 82,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 82,
-						"h": 63
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 82,
-						"h": 63
-					},
-					"frame": {
-						"x": 82,
-						"y": 0,
-						"w": 82,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 82,
-						"h": 63
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 82,
-						"h": 62
-					},
-					"frame": {
-						"x": 0,
-						"y": 63,
-						"w": 82,
-						"h": 62
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 82,
-						"h": 63
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 82,
-						"h": 62
-					},
-					"frame": {
-						"x": 0,
-						"y": 63,
-						"w": 82,
-						"h": 62
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 82,
-						"h": 63
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 10,
-						"w": 82,
-						"h": 53
-					},
-					"frame": {
-						"x": 0,
-						"y": 125,
-						"w": 82,
-						"h": 53
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 82,
-						"h": 63
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 82,
-						"h": 59
-					},
-					"frame": {
-						"x": 82,
-						"y": 63,
-						"w": 82,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 82,
-						"h": 63
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 82,
-						"h": 59
-					},
-					"frame": {
-						"x": 82,
-						"y": 63,
-						"w": 82,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 82,
-						"h": 63
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 82,
-						"h": 56
-					},
-					"frame": {
-						"x": 82,
-						"y": 122,
-						"w": 82,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 82,
-						"h": 63
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 82,
-						"h": 56
-					},
-					"frame": {
-						"x": 82,
-						"y": 122,
-						"w": 82,
-						"h": 56
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:0605853b2d9e9b9ce3c2246177880cad:22cda080d52bc16ce02f7cf908ef31b6:49ee9ed0dd32c5ba33977741b45fc3f4$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 1, "y": 1, "w": 81, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 81, "h": 62 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 82, "y": 1, "w": 82, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 1, "w": 82, "h": 61 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 246, "y": 1, "w": 83, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 83, "h": 60 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 246, "y": 61, "w": 84, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 84, "h": 58 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 414, "y": 61, "w": 85, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 85, "h": 57 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 499, "y": 118, "w": 86, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 6, "w": 86, "h": 56 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 259, "y": 119, "w": 87, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 8, "w": 87, "h": 54 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 87, "y": 174, "w": 88, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 9, "w": 88, "h": 53 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 88, "y": 227, "w": 89, "h": 51 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 11, "w": 89, "h": 51 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 266, "y": 228, "w": 90, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 12, "w": 90, "h": 50 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 358, "y": 278, "w": 91, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 13, "w": 91, "h": 49 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 1, "y": 328, "w": 92, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 15, "w": 92, "h": 47 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 93, "y": 375, "w": 93, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 16, "w": 93, "h": 46 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 186, "y": 375, "w": 93, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 16, "w": 93, "h": 46 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 542, "y": 375, "w": 92, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 16, "w": 92, "h": 46 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 1, "y": 375, "w": 92, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 15, "w": 92, "h": 47 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 449, "y": 327, "w": 92, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 14, "w": 92, "h": 48 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 449, "y": 278, "w": 91, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 13, "w": 91, "h": 49 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 88, "y": 278, "w": 90, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 12, "w": 90, "h": 50 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 177, "y": 227, "w": 89, "h": 51 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 11, "w": 89, "h": 51 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 346, "y": 175, "w": 87, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 9, "w": 87, "h": 53 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 87, "y": 119, "w": 86, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 7, "w": 86, "h": 55 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 499, "y": 61, "w": 85, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 85, "h": 57 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 412, "y": 1, "w": 83, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 83, "h": 60 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 1, "y": 1, "w": 81, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 81, "h": 62 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 82, "y": 1, "w": 82, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 1, "w": 82, "h": 61 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 246, "y": 1, "w": 83, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 83, "h": 60 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 246, "y": 61, "w": 84, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 84, "h": 58 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 414, "y": 61, "w": 85, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 85, "h": 57 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 499, "y": 118, "w": 86, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 6, "w": 86, "h": 56 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 259, "y": 119, "w": 87, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 8, "w": 87, "h": 54 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 87, "y": 174, "w": 88, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 9, "w": 88, "h": 53 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 88, "y": 227, "w": 89, "h": 51 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 11, "w": 89, "h": 51 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 266, "y": 228, "w": 90, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 12, "w": 90, "h": 50 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 358, "y": 278, "w": 91, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 13, "w": 91, "h": 49 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 1, "y": 328, "w": 92, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 15, "w": 92, "h": 47 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 93, "y": 375, "w": 93, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 16, "w": 93, "h": 46 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 186, "y": 375, "w": 93, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 16, "w": 93, "h": 46 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 542, "y": 375, "w": 92, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 16, "w": 92, "h": 46 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 1, "y": 375, "w": 92, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 15, "w": 92, "h": 47 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 449, "y": 327, "w": 92, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 14, "w": 92, "h": 48 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 449, "y": 278, "w": 91, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 13, "w": 91, "h": 49 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 88, "y": 278, "w": 90, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 12, "w": 90, "h": 50 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 177, "y": 227, "w": 89, "h": 51 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 11, "w": 89, "h": 51 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 346, "y": 175, "w": 87, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 9, "w": 87, "h": 53 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 87, "y": 119, "w": 86, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 7, "w": 86, "h": 55 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 499, "y": 61, "w": 85, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 85, "h": 57 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 412, "y": 1, "w": 83, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 83, "h": 60 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 1, "y": 1, "w": 81, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 81, "h": 62 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 82, "y": 1, "w": 82, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 1, "w": 82, "h": 61 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 246, "y": 1, "w": 83, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 83, "h": 60 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 246, "y": 61, "w": 84, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 84, "h": 58 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 414, "y": 61, "w": 85, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 85, "h": 57 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 499, "y": 118, "w": 86, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 6, "w": 86, "h": 56 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 259, "y": 119, "w": 87, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 8, "w": 87, "h": 54 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 87, "y": 174, "w": 88, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 9, "w": 88, "h": 53 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 88, "y": 227, "w": 89, "h": 51 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 11, "w": 89, "h": 51 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 266, "y": 228, "w": 90, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 12, "w": 90, "h": 50 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 358, "y": 278, "w": 91, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 13, "w": 91, "h": 49 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 1, "y": 328, "w": 92, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 15, "w": 92, "h": 47 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 93, "y": 375, "w": 93, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 16, "w": 93, "h": 46 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 186, "y": 375, "w": 93, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 16, "w": 93, "h": 46 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 542, "y": 375, "w": 92, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 16, "w": 92, "h": 46 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 1, "y": 375, "w": 92, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 15, "w": 92, "h": 47 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 449, "y": 327, "w": 92, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 14, "w": 92, "h": 48 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 449, "y": 278, "w": 91, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 13, "w": 91, "h": 49 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 88, "y": 278, "w": 90, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 12, "w": 90, "h": 50 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 177, "y": 227, "w": 89, "h": 51 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 11, "w": 89, "h": 51 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 346, "y": 175, "w": 87, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 9, "w": 87, "h": 53 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 87, "y": 119, "w": 86, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 7, "w": 86, "h": 55 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 499, "y": 61, "w": 85, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 85, "h": 57 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 412, "y": 1, "w": 83, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 83, "h": 60 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 1, "y": 1, "w": 81, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 81, "h": 62 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 82, "y": 1, "w": 82, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 1, "w": 82, "h": 61 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 246, "y": 1, "w": 83, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 83, "h": 60 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 246, "y": 61, "w": 84, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 84, "h": 58 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 414, "y": 61, "w": 85, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 85, "h": 57 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 499, "y": 118, "w": 86, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 6, "w": 86, "h": 56 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 259, "y": 119, "w": 87, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 8, "w": 87, "h": 54 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 87, "y": 174, "w": 88, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 9, "w": 88, "h": 53 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 88, "y": 227, "w": 89, "h": 51 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 11, "w": 89, "h": 51 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 266, "y": 228, "w": 90, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 12, "w": 90, "h": 50 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 358, "y": 278, "w": 91, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 13, "w": 91, "h": 49 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 1, "y": 328, "w": 92, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 15, "w": 92, "h": 47 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 93, "y": 375, "w": 93, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 16, "w": 93, "h": 46 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 186, "y": 375, "w": 93, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 16, "w": 93, "h": 46 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 542, "y": 375, "w": 92, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 16, "w": 92, "h": 46 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0088.png",
+    "frame": { "x": 1, "y": 375, "w": 92, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 15, "w": 92, "h": 47 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0089.png",
+    "frame": { "x": 449, "y": 327, "w": 92, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 14, "w": 92, "h": 48 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0090.png",
+    "frame": { "x": 449, "y": 278, "w": 91, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 13, "w": 91, "h": 49 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0091.png",
+    "frame": { "x": 88, "y": 278, "w": 90, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 12, "w": 90, "h": 50 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0092.png",
+    "frame": { "x": 177, "y": 227, "w": 89, "h": 51 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 11, "w": 89, "h": 51 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0093.png",
+    "frame": { "x": 346, "y": 175, "w": 87, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 9, "w": 87, "h": 53 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0094.png",
+    "frame": { "x": 87, "y": 119, "w": 86, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 7, "w": 86, "h": 55 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0095.png",
+    "frame": { "x": 499, "y": 61, "w": 85, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 85, "h": 57 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0096.png",
+    "frame": { "x": 412, "y": 1, "w": 83, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 83, "h": 60 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0097.png",
+    "frame": { "x": 1, "y": 1, "w": 81, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 81, "h": 62 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0098.png",
+    "frame": { "x": 164, "y": 1, "w": 82, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 1, "w": 82, "h": 61 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0099.png",
+    "frame": { "x": 495, "y": 1, "w": 83, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 83, "h": 60 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0100.png",
+    "frame": { "x": 330, "y": 61, "w": 84, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 84, "h": 58 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0101.png",
+    "frame": { "x": 414, "y": 118, "w": 85, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 85, "h": 57 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0102.png",
+    "frame": { "x": 1, "y": 119, "w": 86, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 6, "w": 86, "h": 56 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0103.png",
+    "frame": { "x": 259, "y": 173, "w": 87, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 8, "w": 87, "h": 54 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0104.png",
+    "frame": { "x": 499, "y": 174, "w": 88, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 9, "w": 88, "h": 53 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0105.png",
+    "frame": { "x": 433, "y": 227, "w": 89, "h": 51 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 11, "w": 89, "h": 51 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0106.png",
+    "frame": { "x": 178, "y": 278, "w": 90, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 12, "w": 90, "h": 50 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0107.png",
+    "frame": { "x": 540, "y": 278, "w": 91, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 13, "w": 91, "h": 49 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0108.png",
+    "frame": { "x": 93, "y": 328, "w": 92, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 15, "w": 92, "h": 47 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0109.png",
+    "frame": { "x": 93, "y": 375, "w": 93, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 16, "w": 93, "h": 46 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0110.png",
+    "frame": { "x": 449, "y": 375, "w": 93, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 16, "w": 93, "h": 46 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0111.png",
+    "frame": { "x": 279, "y": 376, "w": 92, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 16, "w": 92, "h": 46 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0112.png",
+    "frame": { "x": 185, "y": 328, "w": 92, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 15, "w": 92, "h": 47 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0113.png",
+    "frame": { "x": 541, "y": 327, "w": 92, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 14, "w": 92, "h": 48 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0114.png",
+    "frame": { "x": 358, "y": 327, "w": 91, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 13, "w": 91, "h": 49 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0115.png",
+    "frame": { "x": 268, "y": 278, "w": 90, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 12, "w": 90, "h": 50 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0116.png",
+    "frame": { "x": 522, "y": 227, "w": 89, "h": 51 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 11, "w": 89, "h": 51 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0117.png",
+    "frame": { "x": 1, "y": 227, "w": 87, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 9, "w": 87, "h": 53 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0118.png",
+    "frame": { "x": 173, "y": 119, "w": 86, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 7, "w": 86, "h": 55 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0119.png",
+    "frame": { "x": 82, "y": 62, "w": 85, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 85, "h": 57 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0120.png",
+    "frame": { "x": 329, "y": 1, "w": 83, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 83, "h": 60 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.13-x64",
+  "image": "2089.png",
+  "format": "I8",
+  "size": { "w": 635, "h": 423 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/2089.png b/public/images/pokemon/exp/back/2089.png
index 2fbf7d8b1f4..244aeeed5a9 100644
Binary files a/public/images/pokemon/exp/back/2089.png and b/public/images/pokemon/exp/back/2089.png differ
diff --git a/public/images/pokemon/exp/back/248-mega.json b/public/images/pokemon/exp/back/248-mega.json
index 25bc42548ab..ddd3987db90 100644
--- a/public/images/pokemon/exp/back/248-mega.json
+++ b/public/images/pokemon/exp/back/248-mega.json
@@ -1,272 +1,929 @@
-{
-	"textures": [
-		{
-			"image": "248-mega.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 292,
-				"h": 292
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 80,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 80,
-						"h": 74
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 80,
-						"h": 74
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 80,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 80,
-						"h": 74
-					},
-					"frame": {
-						"x": 0,
-						"y": 74,
-						"w": 80,
-						"h": 74
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 79,
-						"h": 74
-					},
-					"frame": {
-						"x": 0,
-						"y": 148,
-						"w": 79,
-						"h": 74
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 79,
-						"h": 74
-					},
-					"frame": {
-						"x": 79,
-						"y": 148,
-						"w": 79,
-						"h": 74
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 79,
-						"h": 73
-					},
-					"frame": {
-						"x": 80,
-						"y": 0,
-						"w": 79,
-						"h": 73
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 79,
-						"h": 73
-					},
-					"frame": {
-						"x": 80,
-						"y": 73,
-						"w": 79,
-						"h": 73
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 75,
-						"h": 73
-					},
-					"frame": {
-						"x": 158,
-						"y": 146,
-						"w": 75,
-						"h": 73
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 75,
-						"h": 73
-					},
-					"frame": {
-						"x": 158,
-						"y": 146,
-						"w": 75,
-						"h": 73
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 75,
-						"h": 73
-					},
-					"frame": {
-						"x": 158,
-						"y": 219,
-						"w": 75,
-						"h": 73
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 75,
-						"h": 73
-					},
-					"frame": {
-						"x": 158,
-						"y": 219,
-						"w": 75,
-						"h": 73
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 1,
-						"w": 73,
-						"h": 73
-					},
-					"frame": {
-						"x": 159,
-						"y": 0,
-						"w": 73,
-						"h": 73
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 1,
-						"w": 73,
-						"h": 73
-					},
-					"frame": {
-						"x": 159,
-						"y": 73,
-						"w": 73,
-						"h": 73
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:625e35ec9f8e731e89fa37587ffb4738:07d356e18baf0312a4e8a36adb76fdd5:90df97eb431b7162252516cb937a0b9e$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 0, "y": 101, "w": 82, "h": 92 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 82, "h": 92 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 430, "y": 101, "w": 82, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 82, "h": 91 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 0, "y": 195, "w": 84, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 84, "h": 88 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 173, "y": 287, "w": 85, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 85, "h": 85 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 0, "y": 373, "w": 85, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 10, "w": 85, "h": 80 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 84, "y": 456, "w": 85, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 12, "w": 85, "h": 76 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 511, "y": 534, "w": 84, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 12, "w": 84, "h": 76 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 512, "y": 612, "w": 83, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 12, "w": 83, "h": 76 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 427, "y": 612, "w": 83, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 12, "w": 83, "h": 76 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 255, "y": 536, "w": 84, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 12, "w": 84, "h": 76 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 169, "y": 535, "w": 84, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 12, "w": 84, "h": 76 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 431, "y": 455, "w": 84, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 84, "h": 77 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 340, "y": 456, "w": 83, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 83, "h": 77 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 171, "y": 456, "w": 83, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 83, "h": 77 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 171, "y": 374, "w": 83, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 9, "w": 83, "h": 80 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 516, "y": 287, "w": 83, "h": 83 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 9, "w": 83, "h": 83 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 347, "y": 287, "w": 83, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 83, "h": 85 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 256, "y": 196, "w": 83, "h": 89 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 83, "h": 89 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 342, "y": 192, "w": 82, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 6, "w": 82, "h": 91 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 0, "y": 101, "w": 82, "h": 92 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 82, "h": 92 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 430, "y": 101, "w": 82, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 82, "h": 91 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 0, "y": 195, "w": 84, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 84, "h": 88 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 173, "y": 287, "w": 85, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 85, "h": 85 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 260, "y": 373, "w": 85, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 10, "w": 85, "h": 80 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 84, "y": 456, "w": 85, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 12, "w": 85, "h": 76 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 511, "y": 534, "w": 84, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 12, "w": 84, "h": 76 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 85, "y": 613, "w": 83, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 12, "w": 83, "h": 76 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 427, "y": 612, "w": 83, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 12, "w": 83, "h": 76 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 255, "y": 536, "w": 84, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 12, "w": 84, "h": 76 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 169, "y": 535, "w": 84, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 12, "w": 84, "h": 76 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 431, "y": 455, "w": 84, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 84, "h": 77 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 340, "y": 456, "w": 83, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 83, "h": 77 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 171, "y": 456, "w": 83, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 83, "h": 77 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 171, "y": 374, "w": 83, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 9, "w": 83, "h": 80 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 516, "y": 287, "w": 83, "h": 83 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 9, "w": 83, "h": 83 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 347, "y": 287, "w": 83, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 83, "h": 85 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 256, "y": 196, "w": 83, "h": 89 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 83, "h": 89 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 342, "y": 192, "w": 82, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 6, "w": 82, "h": 91 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 0, "y": 101, "w": 82, "h": 92 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 82, "h": 92 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 430, "y": 101, "w": 82, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 82, "h": 91 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 0, "y": 195, "w": 84, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 84, "h": 88 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 173, "y": 287, "w": 85, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 85, "h": 85 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 260, "y": 373, "w": 85, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 10, "w": 85, "h": 80 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 84, "y": 456, "w": 85, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 12, "w": 85, "h": 76 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 341, "y": 612, "w": 84, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 12, "w": 84, "h": 76 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 0, "y": 613, "w": 83, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 12, "w": 83, "h": 76 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 427, "y": 612, "w": 83, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 12, "w": 83, "h": 76 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 255, "y": 536, "w": 84, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 12, "w": 84, "h": 76 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 169, "y": 535, "w": 84, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 12, "w": 84, "h": 76 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 518, "y": 455, "w": 84, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 84, "h": 77 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 84, "y": 534, "w": 83, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 83, "h": 77 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 171, "y": 456, "w": 83, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 83, "h": 77 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 171, "y": 374, "w": 83, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 9, "w": 83, "h": 80 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 516, "y": 287, "w": 83, "h": 83 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 9, "w": 83, "h": 83 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 347, "y": 287, "w": 83, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 83, "h": 85 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 256, "y": 196, "w": 83, "h": 89 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 83, "h": 89 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 342, "y": 192, "w": 82, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 6, "w": 82, "h": 91 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 0, "y": 101, "w": 82, "h": 92 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 82, "h": 92 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 430, "y": 101, "w": 82, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 82, "h": 91 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 0, "y": 195, "w": 84, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 84, "h": 88 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 173, "y": 287, "w": 85, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 85, "h": 85 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 260, "y": 373, "w": 85, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 10, "w": 85, "h": 80 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 84, "y": 456, "w": 85, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 12, "w": 85, "h": 76 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 425, "y": 534, "w": 84, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 12, "w": 84, "h": 76 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 0, "y": 613, "w": 83, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 12, "w": 83, "h": 76 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 427, "y": 612, "w": 83, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 12, "w": 83, "h": 76 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 255, "y": 536, "w": 84, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 12, "w": 84, "h": 76 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 169, "y": 535, "w": 84, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 12, "w": 84, "h": 76 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 518, "y": 455, "w": 84, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 84, "h": 77 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 84, "y": 534, "w": 83, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 83, "h": 77 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 171, "y": 456, "w": 83, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 83, "h": 77 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 171, "y": 374, "w": 83, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 9, "w": 83, "h": 80 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 516, "y": 287, "w": 83, "h": 83 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 9, "w": 83, "h": 83 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 347, "y": 287, "w": 83, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 83, "h": 85 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 256, "y": 196, "w": 83, "h": 89 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 83, "h": 89 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 342, "y": 192, "w": 82, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 6, "w": 82, "h": 91 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 0, "y": 101, "w": 82, "h": 92 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 82, "h": 92 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 426, "y": 194, "w": 82, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 82, "h": 91 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 510, "y": 196, "w": 83, "h": 89 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 5, "w": 83, "h": 89 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 0, "y": 285, "w": 83, "h": 86 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 83, "h": 86 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 432, "y": 287, "w": 82, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 82, "h": 85 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 85, "y": 288, "w": 82, "h": 83 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 82, "h": 83 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 87, "y": 373, "w": 82, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 82, "h": 81 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 431, "y": 374, "w": 82, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 9, "w": 82, "h": 79 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 0, "y": 455, "w": 82, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 9, "w": 82, "h": 79 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 256, "y": 455, "w": 82, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 9, "w": 82, "h": 79 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 347, "y": 374, "w": 82, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 8, "w": 82, "h": 80 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0088.png",
+    "frame": { "x": 516, "y": 372, "w": 84, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 84, "h": 81 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0089.png",
+    "frame": { "x": 260, "y": 287, "w": 85, "h": 84 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 85, "h": 84 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0090.png",
+    "frame": { "x": 86, "y": 200, "w": 85, "h": 86 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 85, "h": 86 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0091.png",
+    "frame": { "x": 342, "y": 101, "w": 86, "h": 89 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 86, "h": 89 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0092.png",
+    "frame": { "x": 256, "y": 100, "w": 84, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 84, "h": 94 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0093.png",
+    "frame": { "x": 86, "y": 100, "w": 83, "h": 98 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 83, "h": 98 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0094.png",
+    "frame": { "x": 514, "y": 0, "w": 83, "h": 98 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 83, "h": 98 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0095.png",
+    "frame": { "x": 344, "y": 0, "w": 83, "h": 99 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 83, "h": 99 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0096.png",
+    "frame": { "x": 429, "y": 0, "w": 83, "h": 99 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 83, "h": 99 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0097.png",
+    "frame": { "x": 0, "y": 0, "w": 84, "h": 99 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 84, "h": 99 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0098.png",
+    "frame": { "x": 86, "y": 0, "w": 84, "h": 98 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 84, "h": 98 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0099.png",
+    "frame": { "x": 172, "y": 0, "w": 84, "h": 98 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 84, "h": 98 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0100.png",
+    "frame": { "x": 258, "y": 0, "w": 84, "h": 98 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 84, "h": 98 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0101.png",
+    "frame": { "x": 171, "y": 100, "w": 83, "h": 97 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 83, "h": 97 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0102.png",
+    "frame": { "x": 514, "y": 100, "w": 83, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 83, "h": 94 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "248-mega.png",
+  "format": "I8",
+  "size": { "w": 602, "h": 689 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/248-mega.png b/public/images/pokemon/exp/back/248-mega.png
index 4b2a4021721..1e4918e5ca7 100644
Binary files a/public/images/pokemon/exp/back/248-mega.png and b/public/images/pokemon/exp/back/248-mega.png differ
diff --git a/public/images/pokemon/exp/back/362-mega.json b/public/images/pokemon/exp/back/362-mega.json
index 6f5b4ea32bb..02354ddad93 100644
--- a/public/images/pokemon/exp/back/362-mega.json
+++ b/public/images/pokemon/exp/back/362-mega.json
@@ -1,272 +1,551 @@
-{
-	"textures": [
-		{
-			"image": "362-mega.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 140,
-				"h": 140
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 61,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 61,
-						"h": 71
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 61,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 61,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 61,
-						"h": 71
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 61,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 61,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 61,
-						"h": 71
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 61,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 61,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 61,
-						"h": 71
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 61,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 61,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 61,
-						"h": 70
-					},
-					"frame": {
-						"x": 61,
-						"y": 0,
-						"w": 61,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 61,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 61,
-						"h": 70
-					},
-					"frame": {
-						"x": 61,
-						"y": 0,
-						"w": 61,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 61,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 61,
-						"h": 70
-					},
-					"frame": {
-						"x": 61,
-						"y": 0,
-						"w": 61,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 61,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 61,
-						"h": 70
-					},
-					"frame": {
-						"x": 61,
-						"y": 0,
-						"w": 61,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 61,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 61,
-						"h": 70
-					},
-					"frame": {
-						"x": 61,
-						"y": 70,
-						"w": 61,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 61,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 61,
-						"h": 70
-					},
-					"frame": {
-						"x": 61,
-						"y": 70,
-						"w": 61,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 61,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 61,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 71,
-						"w": 61,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 61,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 61,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 71,
-						"w": 61,
-						"h": 69
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:b710cac988ef0d2bf31cf4b83951fd3a:aaedfd5f04a5c93bc13787cb0b73c4e3:8a7271a5423838c97ddeb1e6dc343255$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 67, "y": 0, "w": 61, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 61, "h": 64 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 67, "y": 0, "w": 61, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 9, "w": 61, "h": 64 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 67, "y": 0, "w": 61, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 61, "h": 64 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 67, "y": 0, "w": 61, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 14, "w": 61, "h": 64 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 67, "y": 0, "w": 61, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 16, "w": 61, "h": 64 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 67, "y": 0, "w": 61, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 18, "w": 61, "h": 64 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 67, "y": 0, "w": 61, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 15, "w": 61, "h": 64 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 67, "y": 0, "w": 61, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 13, "w": 61, "h": 64 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 67, "y": 0, "w": 61, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 10, "w": 61, "h": 64 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 67, "y": 0, "w": 61, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 61, "h": 64 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 67, "y": 0, "w": 61, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 5, "w": 61, "h": 64 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 67, "y": 0, "w": 61, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 61, "h": 64 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 67, "y": 0, "w": 61, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 61, "h": 64 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 67, "y": 0, "w": 61, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 61, "h": 64 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 67, "y": 0, "w": 61, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 5, "w": 61, "h": 64 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 67, "y": 0, "w": 61, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 61, "h": 64 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 67, "y": 0, "w": 61, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 9, "w": 61, "h": 64 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 67, "y": 0, "w": 61, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 61, "h": 64 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 67, "y": 0, "w": 61, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 14, "w": 61, "h": 64 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 67, "y": 0, "w": 61, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 16, "w": 61, "h": 64 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 67, "y": 0, "w": 61, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 18, "w": 61, "h": 64 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 67, "y": 0, "w": 61, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 15, "w": 61, "h": 64 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 67, "y": 0, "w": 61, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 13, "w": 61, "h": 64 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 67, "y": 0, "w": 61, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 10, "w": 61, "h": 64 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 67, "y": 0, "w": 61, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 61, "h": 64 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 67, "y": 0, "w": 61, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 5, "w": 61, "h": 64 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 67, "y": 0, "w": 61, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 61, "h": 64 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 67, "y": 0, "w": 61, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 61, "h": 64 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 67, "y": 0, "w": 61, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 61, "h": 64 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 67, "y": 0, "w": 61, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 5, "w": 61, "h": 64 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 67, "y": 0, "w": 61, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 61, "h": 64 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 67, "y": 0, "w": 61, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 9, "w": 61, "h": 64 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 67, "y": 0, "w": 61, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 61, "h": 64 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 67, "y": 0, "w": 61, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 14, "w": 61, "h": 64 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 67, "y": 0, "w": 61, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 16, "w": 61, "h": 64 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 67, "y": 0, "w": 61, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 18, "w": 61, "h": 64 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 67, "y": 0, "w": 61, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 15, "w": 61, "h": 64 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 67, "y": 0, "w": 61, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 13, "w": 61, "h": 64 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 67, "y": 0, "w": 61, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 10, "w": 61, "h": 64 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 67, "y": 0, "w": 61, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 61, "h": 64 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 67, "y": 0, "w": 61, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 5, "w": 61, "h": 64 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 67, "y": 0, "w": 61, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 61, "h": 64 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 67, "y": 0, "w": 61, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 61, "h": 64 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 67, "y": 0, "w": 61, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 61, "h": 64 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 67, "y": 0, "w": 61, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 5, "w": 61, "h": 64 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 67, "y": 0, "w": 61, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 61, "h": 64 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 0, "y": 0, "w": 65, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 65, "h": 68 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 67, "y": 66, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 58, "h": 66 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 0, "y": 0, "w": 65, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 65, "h": 68 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 67, "y": 66, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 58, "h": 66 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 0, "y": 0, "w": 65, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 65, "h": 68 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 67, "y": 66, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 58, "h": 66 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 0, "y": 0, "w": 65, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 65, "h": 68 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 67, "y": 66, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 58, "h": 66 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 0, "y": 0, "w": 65, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 65, "h": 68 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 67, "y": 66, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 58, "h": 66 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 0, "y": 0, "w": 65, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 65, "h": 68 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 67, "y": 66, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 58, "h": 66 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 67, "y": 0, "w": 61, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 61, "h": 64 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 67, "y": 0, "w": 61, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 61, "h": 64 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "362-mega.png",
+  "format": "I8",
+  "size": { "w": 128, "h": 132 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/362-mega.png b/public/images/pokemon/exp/back/362-mega.png
index 81f9bb5cdcd..5bbfd932d33 100644
Binary files a/public/images/pokemon/exp/back/362-mega.png and b/public/images/pokemon/exp/back/362-mega.png differ
diff --git a/public/images/pokemon/exp/back/487-origin.json b/public/images/pokemon/exp/back/487-origin.json
deleted file mode 100644
index 72f5e4d4dc4..00000000000
--- a/public/images/pokemon/exp/back/487-origin.json
+++ /dev/null
@@ -1,566 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "487-origin.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 326,
-				"h": 326
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 101,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 2,
-						"w": 95,
-						"h": 84
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 95,
-						"h": 84
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 101,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 95,
-						"h": 84
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 95,
-						"h": 84
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 101,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 7,
-						"w": 97,
-						"h": 79
-					},
-					"frame": {
-						"x": 0,
-						"y": 84,
-						"w": 97,
-						"h": 79
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 101,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 7,
-						"w": 97,
-						"h": 79
-					},
-					"frame": {
-						"x": 0,
-						"y": 84,
-						"w": 97,
-						"h": 79
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 101,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 6,
-						"w": 97,
-						"h": 78
-					},
-					"frame": {
-						"x": 95,
-						"y": 0,
-						"w": 97,
-						"h": 78
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 101,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 7,
-						"w": 97,
-						"h": 78
-					},
-					"frame": {
-						"x": 95,
-						"y": 0,
-						"w": 97,
-						"h": 78
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 101,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 7,
-						"w": 97,
-						"h": 78
-					},
-					"frame": {
-						"x": 95,
-						"y": 0,
-						"w": 97,
-						"h": 78
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 101,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 94,
-						"h": 84
-					},
-					"frame": {
-						"x": 97,
-						"y": 78,
-						"w": 94,
-						"h": 84
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 101,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 94,
-						"h": 84
-					},
-					"frame": {
-						"x": 97,
-						"y": 78,
-						"w": 94,
-						"h": 84
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 101,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 94,
-						"h": 84
-					},
-					"frame": {
-						"x": 97,
-						"y": 78,
-						"w": 94,
-						"h": 84
-					}
-				},
-				{
-					"filename": "0025.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 101,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 6,
-						"w": 95,
-						"h": 81
-					},
-					"frame": {
-						"x": 97,
-						"y": 162,
-						"w": 95,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0026.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 101,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 7,
-						"w": 95,
-						"h": 81
-					},
-					"frame": {
-						"x": 97,
-						"y": 162,
-						"w": 95,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 101,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 94,
-						"h": 84
-					},
-					"frame": {
-						"x": 191,
-						"y": 78,
-						"w": 94,
-						"h": 84
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 101,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 0,
-						"w": 94,
-						"h": 84
-					},
-					"frame": {
-						"x": 191,
-						"y": 78,
-						"w": 94,
-						"h": 84
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 101,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 94,
-						"h": 77
-					},
-					"frame": {
-						"x": 192,
-						"y": 0,
-						"w": 94,
-						"h": 77
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 101,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 6,
-						"w": 94,
-						"h": 77
-					},
-					"frame": {
-						"x": 192,
-						"y": 0,
-						"w": 94,
-						"h": 77
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 101,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 6,
-						"w": 94,
-						"h": 77
-					},
-					"frame": {
-						"x": 192,
-						"y": 0,
-						"w": 94,
-						"h": 77
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 101,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 0,
-						"w": 94,
-						"h": 83
-					},
-					"frame": {
-						"x": 0,
-						"y": 163,
-						"w": 94,
-						"h": 83
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 101,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 92,
-						"h": 83
-					},
-					"frame": {
-						"x": 192,
-						"y": 162,
-						"w": 92,
-						"h": 83
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 101,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 92,
-						"h": 82
-					},
-					"frame": {
-						"x": 94,
-						"y": 243,
-						"w": 92,
-						"h": 82
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 101,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 92,
-						"h": 82
-					},
-					"frame": {
-						"x": 94,
-						"y": 243,
-						"w": 92,
-						"h": 82
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 101,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 3,
-						"w": 90,
-						"h": 78
-					},
-					"frame": {
-						"x": 0,
-						"y": 246,
-						"w": 90,
-						"h": 78
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 101,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 4,
-						"w": 90,
-						"h": 78
-					},
-					"frame": {
-						"x": 0,
-						"y": 246,
-						"w": 90,
-						"h": 78
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 101,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 2,
-						"w": 91,
-						"h": 81
-					},
-					"frame": {
-						"x": 186,
-						"y": 245,
-						"w": 91,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 101,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 1,
-						"w": 91,
-						"h": 81
-					},
-					"frame": {
-						"x": 186,
-						"y": 245,
-						"w": 91,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 101,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 1,
-						"w": 91,
-						"h": 81
-					},
-					"frame": {
-						"x": 186,
-						"y": 245,
-						"w": 91,
-						"h": 81
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:d1a63c2aac4c99e778e6efb9fa120e53:11f49886c328fc8474daefc2533a7f5d:5d19509f6557fe13b0b6311434ba7e2d$"
-	}
-}
diff --git a/public/images/pokemon/exp/back/487-origin.png b/public/images/pokemon/exp/back/487-origin.png
deleted file mode 100644
index ec3dfd6c8f8..00000000000
Binary files a/public/images/pokemon/exp/back/487-origin.png and /dev/null differ
diff --git a/public/images/pokemon/exp/back/569-gigantamax.json b/public/images/pokemon/exp/back/569-gigantamax.json
new file mode 100644
index 00000000000..b266f5eb799
--- /dev/null
+++ b/public/images/pokemon/exp/back/569-gigantamax.json
@@ -0,0 +1,1478 @@
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 194, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 194, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 194, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 194, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 194, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 194, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 194, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 290, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 290, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 192, "y": 187, "w": 97, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 97, "h": 94 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 192, "y": 187, "w": 97, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 97, "h": 94 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 192, "y": 187, "w": 97, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 97, "h": 94 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 192, "y": 187, "w": 97, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 97, "h": 94 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 209, "y": 0, "w": 102, "h": 92 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 102, "h": 92 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 209, "y": 0, "w": 102, "h": 92 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 102, "h": 92 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 105, "y": 0, "w": 104, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 104, "h": 91 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 105, "y": 0, "w": 104, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 104, "h": 91 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 105, "y": 0, "w": 104, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 104, "h": 91 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 105, "y": 0, "w": 104, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 104, "h": 91 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 0, "y": 0, "w": 105, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 105, "h": 91 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 0, "y": 0, "w": 105, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 105, "h": 91 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 0, "y": 0, "w": 105, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 105, "h": 91 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 105, "y": 0, "w": 104, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 104, "h": 91 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 105, "y": 0, "w": 104, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 104, "h": 91 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 105, "y": 0, "w": 104, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 104, "h": 91 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 105, "y": 0, "w": 104, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 104, "h": 91 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 209, "y": 0, "w": 102, "h": 92 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 102, "h": 92 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 209, "y": 0, "w": 102, "h": 92 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 102, "h": 92 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 209, "y": 0, "w": 102, "h": 92 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 102, "h": 92 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 192, "y": 187, "w": 97, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 97, "h": 94 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 192, "y": 187, "w": 97, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 97, "h": 94 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 192, "y": 187, "w": 97, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 97, "h": 94 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 290, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 290, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 194, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 194, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 194, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 194, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 194, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 194, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 194, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 194, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 290, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 290, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 290, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 192, "y": 187, "w": 97, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 97, "h": 94 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 192, "y": 187, "w": 97, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 97, "h": 94 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 192, "y": 187, "w": 97, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 97, "h": 94 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 209, "y": 0, "w": 102, "h": 92 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 102, "h": 92 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 209, "y": 0, "w": 102, "h": 92 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 102, "h": 92 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 209, "y": 0, "w": 102, "h": 92 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 102, "h": 92 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 105, "y": 0, "w": 104, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 104, "h": 91 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 105, "y": 0, "w": 104, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 104, "h": 91 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 105, "y": 0, "w": 104, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 104, "h": 91 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 0, "y": 0, "w": 105, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 105, "h": 91 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 0, "y": 0, "w": 105, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 105, "h": 91 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 0, "y": 0, "w": 105, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 105, "h": 91 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 105, "y": 0, "w": 104, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 104, "h": 91 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 105, "y": 0, "w": 104, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 104, "h": 91 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 105, "y": 0, "w": 104, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 104, "h": 91 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 311, "y": 0, "w": 102, "h": 92 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 102, "h": 92 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 311, "y": 0, "w": 102, "h": 92 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 102, "h": 92 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 311, "y": 0, "w": 102, "h": 92 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 102, "h": 92 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 192, "y": 187, "w": 97, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 97, "h": 94 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 192, "y": 187, "w": 97, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 97, "h": 94 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 192, "y": 187, "w": 97, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 97, "h": 94 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 290, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 290, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 290, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 194, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 194, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 194, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 0, "y": 186, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 0, "y": 186, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 0, "y": 186, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 96, "y": 186, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 96, "y": 186, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 0, "y": 91, "w": 97, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 97, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 0, "y": 91, "w": 97, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 97, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 0, "y": 91, "w": 97, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 97, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 97, "y": 91, "w": 97, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 97, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 97, "y": 91, "w": 97, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 97, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 97, "y": 91, "w": 97, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 97, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 97, "y": 91, "w": 97, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 97, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 97, "y": 91, "w": 97, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 97, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 97, "y": 91, "w": 97, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 97, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 0, "y": 91, "w": 97, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 97, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0088.png",
+    "frame": { "x": 0, "y": 91, "w": 97, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 97, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0089.png",
+    "frame": { "x": 0, "y": 91, "w": 97, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 97, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0090.png",
+    "frame": { "x": 0, "y": 91, "w": 97, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 97, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0091.png",
+    "frame": { "x": 96, "y": 186, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0092.png",
+    "frame": { "x": 96, "y": 186, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0093.png",
+    "frame": { "x": 96, "y": 186, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0094.png",
+    "frame": { "x": 0, "y": 186, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0095.png",
+    "frame": { "x": 194, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0096.png",
+    "frame": { "x": 194, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0097.png",
+    "frame": { "x": 194, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0098.png",
+    "frame": { "x": 194, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0099.png",
+    "frame": { "x": 194, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0100.png",
+    "frame": { "x": 194, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0101.png",
+    "frame": { "x": 194, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0102.png",
+    "frame": { "x": 194, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0103.png",
+    "frame": { "x": 290, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0104.png",
+    "frame": { "x": 290, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0105.png",
+    "frame": { "x": 290, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0106.png",
+    "frame": { "x": 192, "y": 187, "w": 97, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 97, "h": 94 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0107.png",
+    "frame": { "x": 192, "y": 187, "w": 97, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 97, "h": 94 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0108.png",
+    "frame": { "x": 192, "y": 187, "w": 97, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 97, "h": 94 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0109.png",
+    "frame": { "x": 209, "y": 0, "w": 102, "h": 92 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 102, "h": 92 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0110.png",
+    "frame": { "x": 209, "y": 0, "w": 102, "h": 92 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 102, "h": 92 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0111.png",
+    "frame": { "x": 209, "y": 0, "w": 102, "h": 92 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 102, "h": 92 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0112.png",
+    "frame": { "x": 105, "y": 0, "w": 104, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 104, "h": 91 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0113.png",
+    "frame": { "x": 105, "y": 0, "w": 104, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 104, "h": 91 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0114.png",
+    "frame": { "x": 105, "y": 0, "w": 104, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 104, "h": 91 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0115.png",
+    "frame": { "x": 0, "y": 0, "w": 105, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 105, "h": 91 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0116.png",
+    "frame": { "x": 0, "y": 0, "w": 105, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 105, "h": 91 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0117.png",
+    "frame": { "x": 0, "y": 0, "w": 105, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 105, "h": 91 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0118.png",
+    "frame": { "x": 105, "y": 0, "w": 104, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 104, "h": 91 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0119.png",
+    "frame": { "x": 105, "y": 0, "w": 104, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 104, "h": 91 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0120.png",
+    "frame": { "x": 105, "y": 0, "w": 104, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 104, "h": 91 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0121.png",
+    "frame": { "x": 209, "y": 0, "w": 102, "h": 92 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 102, "h": 92 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0122.png",
+    "frame": { "x": 209, "y": 0, "w": 102, "h": 92 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 102, "h": 92 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0123.png",
+    "frame": { "x": 209, "y": 0, "w": 102, "h": 92 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 102, "h": 92 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0124.png",
+    "frame": { "x": 192, "y": 187, "w": 97, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 97, "h": 94 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0125.png",
+    "frame": { "x": 192, "y": 187, "w": 97, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 97, "h": 94 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0126.png",
+    "frame": { "x": 290, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0127.png",
+    "frame": { "x": 290, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0128.png",
+    "frame": { "x": 290, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0129.png",
+    "frame": { "x": 290, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0130.png",
+    "frame": { "x": 194, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0131.png",
+    "frame": { "x": 194, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0132.png",
+    "frame": { "x": 194, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0133.png",
+    "frame": { "x": 194, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0134.png",
+    "frame": { "x": 194, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0135.png",
+    "frame": { "x": 194, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0136.png",
+    "frame": { "x": 194, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0137.png",
+    "frame": { "x": 194, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0138.png",
+    "frame": { "x": 290, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0139.png",
+    "frame": { "x": 290, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0140.png",
+    "frame": { "x": 192, "y": 187, "w": 97, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 97, "h": 94 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0141.png",
+    "frame": { "x": 192, "y": 187, "w": 97, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 97, "h": 94 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0142.png",
+    "frame": { "x": 192, "y": 187, "w": 97, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 97, "h": 94 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0143.png",
+    "frame": { "x": 209, "y": 0, "w": 102, "h": 92 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 102, "h": 92 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0144.png",
+    "frame": { "x": 209, "y": 0, "w": 102, "h": 92 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 102, "h": 92 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0145.png",
+    "frame": { "x": 209, "y": 0, "w": 102, "h": 92 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 102, "h": 92 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0146.png",
+    "frame": { "x": 105, "y": 0, "w": 104, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 104, "h": 91 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0147.png",
+    "frame": { "x": 105, "y": 0, "w": 104, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 104, "h": 91 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0148.png",
+    "frame": { "x": 105, "y": 0, "w": 104, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 104, "h": 91 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0149.png",
+    "frame": { "x": 105, "y": 0, "w": 104, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 104, "h": 91 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0150.png",
+    "frame": { "x": 0, "y": 0, "w": 105, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 105, "h": 91 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0151.png",
+    "frame": { "x": 0, "y": 0, "w": 105, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 105, "h": 91 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0152.png",
+    "frame": { "x": 105, "y": 0, "w": 104, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 104, "h": 91 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0153.png",
+    "frame": { "x": 105, "y": 0, "w": 104, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 104, "h": 91 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0154.png",
+    "frame": { "x": 105, "y": 0, "w": 104, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 104, "h": 91 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0155.png",
+    "frame": { "x": 209, "y": 0, "w": 102, "h": 92 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 102, "h": 92 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0156.png",
+    "frame": { "x": 209, "y": 0, "w": 102, "h": 92 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 102, "h": 92 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0157.png",
+    "frame": { "x": 209, "y": 0, "w": 102, "h": 92 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 102, "h": 92 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0158.png",
+    "frame": { "x": 192, "y": 187, "w": 97, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 97, "h": 94 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0159.png",
+    "frame": { "x": 192, "y": 187, "w": 97, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 97, "h": 94 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0160.png",
+    "frame": { "x": 192, "y": 187, "w": 97, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 97, "h": 94 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0161.png",
+    "frame": { "x": 192, "y": 187, "w": 97, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 97, "h": 94 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0162.png",
+    "frame": { "x": 290, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0163.png",
+    "frame": { "x": 290, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.13-x64",
+  "image": "569-gigantamax.png",
+  "format": "I8",
+  "size": { "w": 413, "h": 281 },
+  "scale": "1"
+ }
+}
diff --git a/public/images/pokemon/exp/back/569-gigantamax.png b/public/images/pokemon/exp/back/569-gigantamax.png
new file mode 100644
index 00000000000..13bbe97bee4
Binary files /dev/null and b/public/images/pokemon/exp/back/569-gigantamax.png differ
diff --git a/public/images/pokemon/exp/back/651.json b/public/images/pokemon/exp/back/651.json
index 2dfe8c0091a..d000767029c 100644
--- a/public/images/pokemon/exp/back/651.json
+++ b/public/images/pokemon/exp/back/651.json
@@ -1,104 +1,713 @@
-{
-	"textures": [
-		{
-			"image": "651.png", 
-			"format": "RGBA8888", 
-			"size": {
-				"w": 106, 
-				"h": 106
-			}, 
-			"scale": 1, 
-			"frames": [
-				{
-					"filename": "0002.png", 
-					"rotated": false, 
-					"trimmed": false, 
-					"sourceSize": {
-						"w": 53, 
-						"h": 50
-					}, 
-					"spriteSourceSize": {
-						"x": 0, 
-						"y": 0, 
-						"w": 53, 
-						"h": 50
-					}, 
-					"frame": {
-						"x": 0, 
-						"y": 0, 
-						"w": 53, 
-						"h": 50
-					}
-				}, 
-				{
-					"filename": "0004.png", 
-					"rotated": false, 
-					"trimmed": false, 
-					"sourceSize": {
-						"w": 53, 
-						"h": 50
-					}, 
-					"spriteSourceSize": {
-						"x": 0, 
-						"y": 0, 
-						"w": 53, 
-						"h": 50
-					}, 
-					"frame": {
-						"x": 0, 
-						"y": 0, 
-						"w": 53, 
-						"h": 50
-					}
-				}, 
-				{
-					"filename": "0003.png", 
-					"rotated": false, 
-					"trimmed": false, 
-					"sourceSize": {
-						"w": 53, 
-						"h": 50
-					}, 
-					"spriteSourceSize": {
-						"x": 0, 
-						"y": 0, 
-						"w": 53, 
-						"h": 50
-					}, 
-					"frame": {
-						"x": 53, 
-						"y": 0, 
-						"w": 53, 
-						"h": 50
-					}
-				}, 
-				{
-					"filename": "0001.png", 
-					"rotated": false, 
-					"trimmed": true, 
-					"sourceSize": {
-						"w": 53, 
-						"h": 50
-					}, 
-					"spriteSourceSize": {
-						"x": 0, 
-						"y": 1, 
-						"w": 53, 
-						"h": 49
-					}, 
-					"frame": {
-						"x": 0, 
-						"y": 50, 
-						"w": 53, 
-						"h": 49
-					}
-				}
-			]
-		}
-	], 
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker", 
-		"version": "3.0", 
-		"smartupdate": "$TexturePacker:SmartUpdate:04a3a807a85b2fbb34c6e0e609d7bcd9:4422017bd667a14a570c0aab29c8a613:a93e5fa02e10bf11e3ed8bf6571835ca$"
-	}
-}
\ No newline at end of file
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 167, "y": 0, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 55, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 222, "y": 0, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 55, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 277, "y": 0, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 55, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 56, "y": 100, "w": 54, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 54, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 277, "y": 150, "w": 53, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 53, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 329, "y": 200, "w": 52, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 52, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 330, "y": 150, "w": 53, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 53, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 0, "y": 198, "w": 53, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 53, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 110, "y": 100, "w": 54, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 54, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 164, "y": 100, "w": 54, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 54, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 218, "y": 100, "w": 54, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 54, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 55, "y": 50, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 55, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 110, "y": 50, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 55, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 55, "y": 0, "w": 56, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 56, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 165, "y": 50, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 55, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 0, "y": 0, "w": 55, "h": 51 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 55, "h": 51 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 220, "y": 50, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 55, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 111, "y": 0, "w": 56, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 56, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 275, "y": 50, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 55, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 330, "y": 50, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 55, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 167, "y": 0, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 55, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 222, "y": 0, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 55, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 277, "y": 0, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 55, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 56, "y": 100, "w": 54, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 54, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 277, "y": 150, "w": 53, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 53, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 329, "y": 200, "w": 52, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 52, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 330, "y": 150, "w": 53, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 53, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 0, "y": 198, "w": 53, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 53, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 110, "y": 100, "w": 54, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 54, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 164, "y": 100, "w": 54, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 54, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 218, "y": 100, "w": 54, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 54, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 55, "y": 50, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 55, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 110, "y": 50, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 55, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 55, "y": 0, "w": 56, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 56, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 165, "y": 50, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 55, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 0, "y": 0, "w": 55, "h": 51 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 55, "h": 51 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 220, "y": 50, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 55, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 111, "y": 0, "w": 56, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 56, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 275, "y": 50, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 55, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 330, "y": 50, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 55, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 167, "y": 0, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 55, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 222, "y": 0, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 55, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 277, "y": 0, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 55, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 56, "y": 100, "w": 54, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 54, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 277, "y": 150, "w": 53, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 53, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 329, "y": 200, "w": 52, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 52, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 330, "y": 150, "w": 53, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 53, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 0, "y": 198, "w": 53, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 53, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 110, "y": 100, "w": 54, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 54, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 164, "y": 100, "w": 54, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 54, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 218, "y": 100, "w": 54, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 54, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 55, "y": 50, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 55, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 110, "y": 50, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 55, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 55, "y": 0, "w": 56, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 56, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 165, "y": 50, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 55, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 0, "y": 0, "w": 55, "h": 51 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 55, "h": 51 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 220, "y": 50, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 55, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 111, "y": 0, "w": 56, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 56, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 275, "y": 50, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 55, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 330, "y": 50, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 55, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 272, "y": 100, "w": 54, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 54, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 0, "y": 100, "w": 56, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 5, "w": 56, "h": 49 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 0, "y": 51, "w": 55, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 55, "h": 49 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 165, "y": 150, "w": 56, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 6, "w": 56, "h": 48 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 160, "y": 247, "w": 55, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 7, "w": 55, "h": 47 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 221, "y": 150, "w": 56, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 56, "h": 48 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 273, "y": 200, "w": 56, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 7, "w": 56, "h": 47 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 0, "y": 149, "w": 55, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 55, "h": 49 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 332, "y": 0, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 55, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 165, "y": 198, "w": 54, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 54, "h": 49 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 215, "y": 247, "w": 53, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 53, "h": 48 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 107, "y": 247, "w": 53, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 53, "h": 49 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 219, "y": 198, "w": 54, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 54, "h": 49 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 326, "y": 100, "w": 54, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 54, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 53, "y": 199, "w": 54, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 5, "w": 54, "h": 49 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 107, "y": 199, "w": 55, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 6, "w": 55, "h": 48 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 55, "y": 150, "w": 55, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 5, "w": 55, "h": 49 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 110, "y": 150, "w": 55, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 5, "w": 55, "h": 49 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.11-x64",
+  "image": "651.png",
+  "format": "I8",
+  "size": { "w": 387, "h": 296 },
+  "scale": "1"
+ }
+}
diff --git a/public/images/pokemon/exp/back/651.png b/public/images/pokemon/exp/back/651.png
index dd8d2b22d61..b16c8d5d67b 100644
Binary files a/public/images/pokemon/exp/back/651.png and b/public/images/pokemon/exp/back/651.png differ
diff --git a/public/images/pokemon/exp/back/653.json b/public/images/pokemon/exp/back/653.json
index 48c09e77b1b..c5fb4a5db61 100644
--- a/public/images/pokemon/exp/back/653.json
+++ b/public/images/pokemon/exp/back/653.json
@@ -1,2036 +1,947 @@
-{
-	"textures": [
-		{
-			"image": "653.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 173,
-				"h": 173
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0077.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 45,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 45,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0078.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 45,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 45,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0092.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 45,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 45,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0093.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 45,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 45,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0079.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 45,
-						"h": 44
-					},
-					"frame": {
-						"x": 45,
-						"y": 0,
-						"w": 45,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0080.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 45,
-						"h": 44
-					},
-					"frame": {
-						"x": 45,
-						"y": 0,
-						"w": 45,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0083.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 45,
-						"h": 44
-					},
-					"frame": {
-						"x": 45,
-						"y": 0,
-						"w": 45,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0084.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 45,
-						"h": 44
-					},
-					"frame": {
-						"x": 45,
-						"y": 0,
-						"w": 45,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0087.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 45,
-						"h": 44
-					},
-					"frame": {
-						"x": 45,
-						"y": 0,
-						"w": 45,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0081.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 45,
-						"h": 44
-					},
-					"frame": {
-						"x": 90,
-						"y": 0,
-						"w": 45,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0082.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 45,
-						"h": 44
-					},
-					"frame": {
-						"x": 90,
-						"y": 0,
-						"w": 45,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0085.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 45,
-						"h": 44
-					},
-					"frame": {
-						"x": 90,
-						"y": 0,
-						"w": 45,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0086.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 45,
-						"h": 44
-					},
-					"frame": {
-						"x": 90,
-						"y": 0,
-						"w": 45,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0088.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 45,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 44,
-						"w": 45,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0089.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 45,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 44,
-						"w": 45,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0090.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 45,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 88,
-						"w": 45,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0091.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 45,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 88,
-						"w": 45,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 43,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 132,
-						"w": 43,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 43,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 132,
-						"w": 43,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 43,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 132,
-						"w": 43,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 43,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 132,
-						"w": 43,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 43,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 132,
-						"w": 43,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 43,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 132,
-						"w": 43,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 43,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 132,
-						"w": 43,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 43,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 132,
-						"w": 43,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0033.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 43,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 132,
-						"w": 43,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0034.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 43,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 132,
-						"w": 43,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0037.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 43,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 132,
-						"w": 43,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0038.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 43,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 132,
-						"w": 43,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0047.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 43,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 132,
-						"w": 43,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0048.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 43,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 132,
-						"w": 43,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0051.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 43,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 132,
-						"w": 43,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0052.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 43,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 132,
-						"w": 43,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0061.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 43,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 132,
-						"w": 43,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0062.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 43,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 132,
-						"w": 43,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0065.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 43,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 132,
-						"w": 43,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0066.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 43,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 132,
-						"w": 43,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 43,
-						"h": 40
-					},
-					"frame": {
-						"x": 43,
-						"y": 132,
-						"w": 43,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 43,
-						"h": 40
-					},
-					"frame": {
-						"x": 43,
-						"y": 132,
-						"w": 43,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 43,
-						"h": 40
-					},
-					"frame": {
-						"x": 43,
-						"y": 132,
-						"w": 43,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 43,
-						"h": 40
-					},
-					"frame": {
-						"x": 43,
-						"y": 132,
-						"w": 43,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0035.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 43,
-						"h": 40
-					},
-					"frame": {
-						"x": 43,
-						"y": 132,
-						"w": 43,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0036.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 43,
-						"h": 40
-					},
-					"frame": {
-						"x": 43,
-						"y": 132,
-						"w": 43,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0049.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 43,
-						"h": 40
-					},
-					"frame": {
-						"x": 43,
-						"y": 132,
-						"w": 43,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0050.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 43,
-						"h": 40
-					},
-					"frame": {
-						"x": 43,
-						"y": 132,
-						"w": 43,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0063.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 43,
-						"h": 40
-					},
-					"frame": {
-						"x": 43,
-						"y": 132,
-						"w": 43,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0064.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 43,
-						"h": 40
-					},
-					"frame": {
-						"x": 43,
-						"y": 132,
-						"w": 43,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0075.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 44,
-						"h": 44
-					},
-					"frame": {
-						"x": 45,
-						"y": 44,
-						"w": 44,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0076.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 44,
-						"h": 44
-					},
-					"frame": {
-						"x": 45,
-						"y": 44,
-						"w": 44,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0094.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 44,
-						"h": 44
-					},
-					"frame": {
-						"x": 45,
-						"y": 44,
-						"w": 44,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0095.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 44,
-						"h": 44
-					},
-					"frame": {
-						"x": 45,
-						"y": 44,
-						"w": 44,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0073.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 43,
-						"h": 44
-					},
-					"frame": {
-						"x": 45,
-						"y": 88,
-						"w": 43,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0074.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 43,
-						"h": 44
-					},
-					"frame": {
-						"x": 45,
-						"y": 88,
-						"w": 43,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0096.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 43,
-						"h": 44
-					},
-					"frame": {
-						"x": 45,
-						"y": 88,
-						"w": 43,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 40,
-						"h": 44
-					},
-					"frame": {
-						"x": 88,
-						"y": 88,
-						"w": 40,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 40,
-						"h": 44
-					},
-					"frame": {
-						"x": 88,
-						"y": 88,
-						"w": 40,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 40,
-						"h": 44
-					},
-					"frame": {
-						"x": 88,
-						"y": 88,
-						"w": 40,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 40,
-						"h": 44
-					},
-					"frame": {
-						"x": 88,
-						"y": 88,
-						"w": 40,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0029.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 40,
-						"h": 44
-					},
-					"frame": {
-						"x": 88,
-						"y": 88,
-						"w": 40,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0030.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 40,
-						"h": 44
-					},
-					"frame": {
-						"x": 88,
-						"y": 88,
-						"w": 40,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0043.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 40,
-						"h": 44
-					},
-					"frame": {
-						"x": 88,
-						"y": 88,
-						"w": 40,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0044.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 40,
-						"h": 44
-					},
-					"frame": {
-						"x": 88,
-						"y": 88,
-						"w": 40,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0057.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 40,
-						"h": 44
-					},
-					"frame": {
-						"x": 88,
-						"y": 88,
-						"w": 40,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0058.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 40,
-						"h": 44
-					},
-					"frame": {
-						"x": 88,
-						"y": 88,
-						"w": 40,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0071.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 40,
-						"h": 44
-					},
-					"frame": {
-						"x": 88,
-						"y": 88,
-						"w": 40,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0072.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 40,
-						"h": 44
-					},
-					"frame": {
-						"x": 88,
-						"y": 88,
-						"w": 40,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 41,
-						"h": 43
-					},
-					"frame": {
-						"x": 89,
-						"y": 44,
-						"w": 41,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 41,
-						"h": 43
-					},
-					"frame": {
-						"x": 89,
-						"y": 44,
-						"w": 41,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0041.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 41,
-						"h": 43
-					},
-					"frame": {
-						"x": 89,
-						"y": 44,
-						"w": 41,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0042.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 41,
-						"h": 43
-					},
-					"frame": {
-						"x": 89,
-						"y": 44,
-						"w": 41,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0055.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 41,
-						"h": 43
-					},
-					"frame": {
-						"x": 89,
-						"y": 44,
-						"w": 41,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0056.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 41,
-						"h": 43
-					},
-					"frame": {
-						"x": 89,
-						"y": 44,
-						"w": 41,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0069.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 41,
-						"h": 43
-					},
-					"frame": {
-						"x": 89,
-						"y": 44,
-						"w": 41,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0070.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 41,
-						"h": 43
-					},
-					"frame": {
-						"x": 89,
-						"y": 44,
-						"w": 41,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0027.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 41,
-						"h": 43
-					},
-					"frame": {
-						"x": 130,
-						"y": 44,
-						"w": 41,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0028.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 41,
-						"h": 43
-					},
-					"frame": {
-						"x": 130,
-						"y": 44,
-						"w": 41,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 40,
-						"h": 43
-					},
-					"frame": {
-						"x": 128,
-						"y": 87,
-						"w": 40,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 40,
-						"h": 43
-					},
-					"frame": {
-						"x": 128,
-						"y": 87,
-						"w": 40,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 40,
-						"h": 43
-					},
-					"frame": {
-						"x": 128,
-						"y": 87,
-						"w": 40,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 40,
-						"h": 43
-					},
-					"frame": {
-						"x": 128,
-						"y": 87,
-						"w": 40,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 40,
-						"h": 43
-					},
-					"frame": {
-						"x": 128,
-						"y": 130,
-						"w": 40,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 40,
-						"h": 43
-					},
-					"frame": {
-						"x": 128,
-						"y": 130,
-						"w": 40,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0025.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 40,
-						"h": 43
-					},
-					"frame": {
-						"x": 128,
-						"y": 130,
-						"w": 40,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0026.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 40,
-						"h": 43
-					},
-					"frame": {
-						"x": 128,
-						"y": 130,
-						"w": 40,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0031.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 40,
-						"h": 43
-					},
-					"frame": {
-						"x": 128,
-						"y": 130,
-						"w": 40,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0032.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 40,
-						"h": 43
-					},
-					"frame": {
-						"x": 128,
-						"y": 130,
-						"w": 40,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0039.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 40,
-						"h": 43
-					},
-					"frame": {
-						"x": 128,
-						"y": 130,
-						"w": 40,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0040.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 40,
-						"h": 43
-					},
-					"frame": {
-						"x": 128,
-						"y": 130,
-						"w": 40,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0045.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 40,
-						"h": 43
-					},
-					"frame": {
-						"x": 128,
-						"y": 130,
-						"w": 40,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0046.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 40,
-						"h": 43
-					},
-					"frame": {
-						"x": 128,
-						"y": 130,
-						"w": 40,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0053.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 40,
-						"h": 43
-					},
-					"frame": {
-						"x": 128,
-						"y": 130,
-						"w": 40,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0054.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 40,
-						"h": 43
-					},
-					"frame": {
-						"x": 128,
-						"y": 130,
-						"w": 40,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0059.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 40,
-						"h": 43
-					},
-					"frame": {
-						"x": 128,
-						"y": 130,
-						"w": 40,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0060.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 40,
-						"h": 43
-					},
-					"frame": {
-						"x": 128,
-						"y": 130,
-						"w": 40,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0067.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 40,
-						"h": 43
-					},
-					"frame": {
-						"x": 128,
-						"y": 130,
-						"w": 40,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0068.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 40,
-						"h": 43
-					},
-					"frame": {
-						"x": 128,
-						"y": 130,
-						"w": 40,
-						"h": 43
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:2657d933ba34a7364529c17b46d25589:b79a47cc022bd83470144fdf9b951be2:a7be961d0230f568aff23d95e7ff0036$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 81, "y": 87, "w": 38, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 38, "h": 43 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 81, "y": 87, "w": 38, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 38, "h": 43 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 81, "y": 87, "w": 38, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 38, "h": 43 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 0, "y": 123, "w": 38, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 38, "h": 42 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 0, "y": 123, "w": 38, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 38, "h": 42 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 0, "y": 44, "w": 41, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 41, "h": 40 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 0, "y": 44, "w": 41, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 41, "h": 40 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 0, "y": 84, "w": 42, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 42, "h": 39 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 0, "y": 84, "w": 42, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 42, "h": 39 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 0, "y": 44, "w": 41, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 41, "h": 40 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 0, "y": 44, "w": 41, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 41, "h": 40 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 38, "y": 128, "w": 38, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 38, "h": 42 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 38, "y": 128, "w": 38, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 38, "h": 42 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 42, "y": 86, "w": 39, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 39, "h": 42 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 42, "y": 86, "w": 39, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 39, "h": 42 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 81, "y": 87, "w": 38, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 38, "h": 43 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 81, "y": 87, "w": 38, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 38, "h": 43 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 81, "y": 87, "w": 38, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 38, "h": 43 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 0, "y": 123, "w": 38, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 38, "h": 42 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 0, "y": 123, "w": 38, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 38, "h": 42 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 0, "y": 44, "w": 41, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 41, "h": 40 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 0, "y": 44, "w": 41, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 41, "h": 40 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 0, "y": 84, "w": 42, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 42, "h": 39 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 0, "y": 84, "w": 42, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 42, "h": 39 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 0, "y": 44, "w": 41, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 41, "h": 40 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 0, "y": 44, "w": 41, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 41, "h": 40 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 38, "y": 128, "w": 38, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 38, "h": 42 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 38, "y": 128, "w": 38, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 38, "h": 42 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 130, "y": 86, "w": 39, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 39, "h": 42 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 130, "y": 86, "w": 39, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 39, "h": 42 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 81, "y": 87, "w": 38, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 38, "h": 43 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 81, "y": 87, "w": 38, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 38, "h": 43 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 81, "y": 87, "w": 38, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 38, "h": 43 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 38, "y": 128, "w": 38, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 38, "h": 42 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 38, "y": 128, "w": 38, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 38, "h": 42 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 0, "y": 44, "w": 41, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 41, "h": 40 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 0, "y": 44, "w": 41, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 41, "h": 40 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 0, "y": 84, "w": 42, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 42, "h": 39 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 0, "y": 84, "w": 42, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 42, "h": 39 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 0, "y": 44, "w": 41, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 41, "h": 40 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 0, "y": 44, "w": 41, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 41, "h": 40 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 38, "y": 128, "w": 38, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 38, "h": 42 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 38, "y": 128, "w": 38, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 38, "h": 42 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 42, "y": 86, "w": 39, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 39, "h": 42 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 42, "y": 86, "w": 39, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 39, "h": 42 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 81, "y": 87, "w": 38, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 38, "h": 43 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 81, "y": 87, "w": 38, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 38, "h": 43 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 81, "y": 87, "w": 38, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 38, "h": 43 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 38, "y": 128, "w": 38, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 38, "h": 42 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 38, "y": 128, "w": 38, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 38, "h": 42 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 0, "y": 44, "w": 41, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 41, "h": 40 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 0, "y": 44, "w": 41, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 41, "h": 40 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 0, "y": 84, "w": 42, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 42, "h": 39 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 0, "y": 84, "w": 42, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 42, "h": 39 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 0, "y": 44, "w": 41, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 41, "h": 40 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 0, "y": 44, "w": 41, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 41, "h": 40 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 38, "y": 128, "w": 38, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 38, "h": 42 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 38, "y": 128, "w": 38, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 38, "h": 42 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 42, "y": 86, "w": 39, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 39, "h": 42 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 42, "y": 86, "w": 39, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 39, "h": 42 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 81, "y": 87, "w": 38, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 38, "h": 43 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 81, "y": 87, "w": 38, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 38, "h": 43 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 81, "y": 87, "w": 38, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 38, "h": 43 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 38, "y": 128, "w": 38, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 38, "h": 42 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 38, "y": 128, "w": 38, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 38, "h": 42 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 0, "y": 44, "w": 41, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 41, "h": 40 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 0, "y": 44, "w": 41, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 41, "h": 40 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 0, "y": 84, "w": 42, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 42, "h": 39 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 0, "y": 84, "w": 42, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 42, "h": 39 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 0, "y": 44, "w": 41, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 41, "h": 40 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 0, "y": 44, "w": 41, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 41, "h": 40 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 38, "y": 128, "w": 38, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 38, "h": 42 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 38, "y": 128, "w": 38, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 38, "h": 42 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 42, "y": 86, "w": 39, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 39, "h": 42 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 42, "y": 86, "w": 39, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 39, "h": 42 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 81, "y": 87, "w": 38, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 38, "h": 43 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 81, "y": 87, "w": 38, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 38, "h": 43 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 81, "y": 87, "w": 38, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 38, "h": 43 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 130, "y": 43, "w": 41, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 41, "h": 43 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 130, "y": 43, "w": 41, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 41, "h": 43 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 88, "y": 43, "w": 42, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 42, "h": 44 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 88, "y": 43, "w": 42, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 42, "h": 44 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 0, "y": 0, "w": 44, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 44, "h": 44 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 0, "y": 0, "w": 44, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 44, "h": 44 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 44, "y": 0, "w": 44, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 44, "h": 43 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 44, "y": 0, "w": 44, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 44, "h": 43 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 44, "y": 0, "w": 44, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 44, "h": 43 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0088.png",
+    "frame": { "x": 88, "y": 0, "w": 44, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 44, "h": 43 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0089.png",
+    "frame": { "x": 88, "y": 0, "w": 44, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 44, "h": 43 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0090.png",
+    "frame": { "x": 44, "y": 0, "w": 44, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 44, "h": 43 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0091.png",
+    "frame": { "x": 44, "y": 0, "w": 44, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 44, "h": 43 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0092.png",
+    "frame": { "x": 88, "y": 0, "w": 44, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 44, "h": 43 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0093.png",
+    "frame": { "x": 88, "y": 0, "w": 44, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 44, "h": 43 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0094.png",
+    "frame": { "x": 44, "y": 0, "w": 44, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 44, "h": 43 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0095.png",
+    "frame": { "x": 132, "y": 0, "w": 44, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 44, "h": 43 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0096.png",
+    "frame": { "x": 132, "y": 0, "w": 44, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 44, "h": 43 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0097.png",
+    "frame": { "x": 44, "y": 43, "w": 44, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 44, "h": 43 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0098.png",
+    "frame": { "x": 44, "y": 43, "w": 44, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 44, "h": 43 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0099.png",
+    "frame": { "x": 0, "y": 0, "w": 44, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 44, "h": 44 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0100.png",
+    "frame": { "x": 0, "y": 0, "w": 44, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 44, "h": 44 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0101.png",
+    "frame": { "x": 88, "y": 43, "w": 42, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 42, "h": 44 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0102.png",
+    "frame": { "x": 88, "y": 43, "w": 42, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 42, "h": 44 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0103.png",
+    "frame": { "x": 130, "y": 43, "w": 41, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 41, "h": 43 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0104.png",
+    "frame": { "x": 130, "y": 43, "w": 41, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 41, "h": 43 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "653.png",
+  "format": "I8",
+  "size": { "w": 176, "h": 170 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/653.png b/public/images/pokemon/exp/back/653.png
index 1f9cb2fe168..58682e90e58 100644
Binary files a/public/images/pokemon/exp/back/653.png and b/public/images/pokemon/exp/back/653.png differ
diff --git a/public/images/pokemon/exp/back/654.json b/public/images/pokemon/exp/back/654.json
index e62078dc236..a5bd681b6cb 100644
--- a/public/images/pokemon/exp/back/654.json
+++ b/public/images/pokemon/exp/back/654.json
@@ -1,188 +1,677 @@
-{
-	"textures": [
-		{
-			"image": "654.png", 
-			"format": "RGBA8888", 
-			"size": {
-				"w": 120, 
-				"h": 120
-			}, 
-			"scale": 1, 
-			"frames": [
-				{
-					"filename": "0003.png", 
-					"rotated": false, 
-					"trimmed": false, 
-					"sourceSize": {
-						"w": 40, 
-						"h": 66
-					}, 
-					"spriteSourceSize": {
-						"x": 0, 
-						"y": 0, 
-						"w": 40, 
-						"h": 66
-					}, 
-					"frame": {
-						"x": 0, 
-						"y": 0, 
-						"w": 40, 
-						"h": 66
-					}
-				}, 
-				{
-					"filename": "0004.png", 
-					"rotated": false, 
-					"trimmed": false, 
-					"sourceSize": {
-						"w": 40, 
-						"h": 66
-					}, 
-					"spriteSourceSize": {
-						"x": 0, 
-						"y": 0, 
-						"w": 40, 
-						"h": 66
-					}, 
-					"frame": {
-						"x": 0, 
-						"y": 0, 
-						"w": 40, 
-						"h": 66
-					}
-				}, 
-				{
-					"filename": "0007.png", 
-					"rotated": false, 
-					"trimmed": false, 
-					"sourceSize": {
-						"w": 40, 
-						"h": 66
-					}, 
-					"spriteSourceSize": {
-						"x": 0, 
-						"y": 0, 
-						"w": 40, 
-						"h": 66
-					}, 
-					"frame": {
-						"x": 0, 
-						"y": 0, 
-						"w": 40, 
-						"h": 66
-					}
-				}, 
-				{
-					"filename": "0008.png", 
-					"rotated": false, 
-					"trimmed": false, 
-					"sourceSize": {
-						"w": 40, 
-						"h": 66
-					}, 
-					"spriteSourceSize": {
-						"x": 0, 
-						"y": 0, 
-						"w": 40, 
-						"h": 66
-					}, 
-					"frame": {
-						"x": 0, 
-						"y": 0, 
-						"w": 40, 
-						"h": 66
-					}
-				}, 
-				{
-					"filename": "0005.png", 
-					"rotated": false, 
-					"trimmed": false, 
-					"sourceSize": {
-						"w": 40, 
-						"h": 66
-					}, 
-					"spriteSourceSize": {
-						"x": 0, 
-						"y": 0, 
-						"w": 40, 
-						"h": 66
-					}, 
-					"frame": {
-						"x": 40, 
-						"y": 0, 
-						"w": 40, 
-						"h": 66
-					}
-				}, 
-				{
-					"filename": "0006.png", 
-					"rotated": false, 
-					"trimmed": false, 
-					"sourceSize": {
-						"w": 40, 
-						"h": 66
-					}, 
-					"spriteSourceSize": {
-						"x": 0, 
-						"y": 0, 
-						"w": 40, 
-						"h": 66
-					}, 
-					"frame": {
-						"x": 40, 
-						"y": 0, 
-						"w": 40, 
-						"h": 66
-					}
-				}, 
-				{
-					"filename": "0001.png", 
-					"rotated": false, 
-					"trimmed": true, 
-					"sourceSize": {
-						"w": 40, 
-						"h": 66
-					}, 
-					"spriteSourceSize": {
-						"x": 0, 
-						"y": 1, 
-						"w": 40, 
-						"h": 65
-					}, 
-					"frame": {
-						"x": 80, 
-						"y": 0, 
-						"w": 40, 
-						"h": 65
-					}
-				}, 
-				{
-					"filename": "0002.png", 
-					"rotated": false, 
-					"trimmed": true, 
-					"sourceSize": {
-						"w": 40, 
-						"h": 66
-					}, 
-					"spriteSourceSize": {
-						"x": 0, 
-						"y": 1, 
-						"w": 40, 
-						"h": 65
-					}, 
-					"frame": {
-						"x": 80, 
-						"y": 0, 
-						"w": 40, 
-						"h": 65
-					}
-				}
-			]
-		}
-	], 
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker", 
-		"version": "3.0", 
-		"smartupdate": "$TexturePacker:SmartUpdate:d0b30f6e084cc1428328b2f8b9fbe624:bf595af9905e0e91443856bfefa85a3a:1977f50e1ab8a3304ceeb59ee1aa2ba9$"
-	}
-}
\ No newline at end of file
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 0, "y": 263, "w": 50, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 50, "h": 67 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 102, "y": 203, "w": 52, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 52, "h": 65 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 161, "y": 130, "w": 54, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 54, "h": 65 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 0, "y": 0, "w": 55, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 55, "h": 66 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 55, "y": 0, "w": 55, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 55, "h": 66 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 110, "y": 0, "w": 53, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 53, "h": 68 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 110, "y": 68, "w": 51, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 51, "h": 69 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 214, "y": 195, "w": 51, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 51, "h": 68 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 0, "y": 263, "w": 50, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 50, "h": 67 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 102, "y": 203, "w": 52, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 52, "h": 65 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 161, "y": 130, "w": 54, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 54, "h": 65 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 0, "y": 0, "w": 55, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 55, "h": 66 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 55, "y": 0, "w": 55, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 55, "h": 66 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 110, "y": 0, "w": 53, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 53, "h": 68 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 110, "y": 68, "w": 51, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 51, "h": 69 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 214, "y": 195, "w": 51, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 51, "h": 68 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 0, "y": 263, "w": 50, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 50, "h": 67 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 102, "y": 203, "w": 52, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 52, "h": 65 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 161, "y": 130, "w": 54, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 54, "h": 65 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 0, "y": 0, "w": 55, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 55, "h": 66 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 55, "y": 0, "w": 55, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 55, "h": 66 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 110, "y": 0, "w": 53, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 53, "h": 68 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 110, "y": 68, "w": 51, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 51, "h": 69 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 214, "y": 195, "w": 51, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 51, "h": 68 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 0, "y": 263, "w": 50, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 50, "h": 67 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 102, "y": 203, "w": 52, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 52, "h": 65 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 161, "y": 130, "w": 54, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 54, "h": 65 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 0, "y": 0, "w": 55, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 55, "h": 66 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 55, "y": 0, "w": 55, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 55, "h": 66 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 110, "y": 0, "w": 53, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 53, "h": 68 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 110, "y": 68, "w": 51, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 51, "h": 69 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 214, "y": 195, "w": 51, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 51, "h": 68 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 0, "y": 263, "w": 50, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 50, "h": 67 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 102, "y": 203, "w": 52, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 52, "h": 65 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 161, "y": 130, "w": 54, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 54, "h": 65 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 0, "y": 0, "w": 55, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 55, "h": 66 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 55, "y": 0, "w": 55, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 55, "h": 66 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 110, "y": 0, "w": 53, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 53, "h": 68 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 110, "y": 68, "w": 51, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 51, "h": 69 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 214, "y": 195, "w": 51, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 51, "h": 68 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 0, "y": 263, "w": 50, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 50, "h": 67 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 102, "y": 203, "w": 52, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 52, "h": 65 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 161, "y": 130, "w": 54, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 54, "h": 65 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 0, "y": 0, "w": 55, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 55, "h": 66 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 55, "y": 0, "w": 55, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 55, "h": 66 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 110, "y": 0, "w": 53, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 53, "h": 68 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 110, "y": 68, "w": 51, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 51, "h": 69 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 214, "y": 195, "w": 51, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 51, "h": 68 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 0, "y": 263, "w": 50, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 50, "h": 67 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 215, "y": 130, "w": 54, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 54, "h": 65 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 163, "y": 0, "w": 55, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 55, "h": 65 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 108, "y": 137, "w": 53, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 53, "h": 66 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 50, "y": 263, "w": 50, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 50, "h": 66 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 0, "y": 131, "w": 54, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 54, "h": 65 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 218, "y": 0, "w": 55, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 55, "h": 65 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 161, "y": 195, "w": 53, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 53, "h": 66 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 154, "y": 261, "w": 52, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 52, "h": 65 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 54, "y": 131, "w": 54, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 54, "h": 65 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 163, "y": 65, "w": 55, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 55, "h": 65 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 154, "y": 261, "w": 52, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 52, "h": 65 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 54, "y": 131, "w": 54, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 54, "h": 65 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 163, "y": 65, "w": 55, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 55, "h": 65 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 154, "y": 261, "w": 52, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 52, "h": 65 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 54, "y": 131, "w": 54, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 54, "h": 65 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 163, "y": 65, "w": 55, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 55, "h": 65 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 154, "y": 261, "w": 52, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 52, "h": 65 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 54, "y": 131, "w": 54, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 54, "h": 65 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 218, "y": 65, "w": 55, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 55, "h": 65 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 0, "y": 66, "w": 55, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 55, "h": 65 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 0, "y": 66, "w": 55, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 55, "h": 65 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 55, "y": 66, "w": 55, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 55, "h": 65 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 108, "y": 137, "w": 53, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 53, "h": 66 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 0, "y": 196, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 51, "h": 67 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 51, "y": 196, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 51, "h": 67 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "654.png",
+  "format": "I8",
+  "size": { "w": 273, "h": 330 },
+  "scale": "1"
+ }
+}
diff --git a/public/images/pokemon/exp/back/654.png b/public/images/pokemon/exp/back/654.png
index 1f8fdd06967..f5d317f8a2e 100644
Binary files a/public/images/pokemon/exp/back/654.png and b/public/images/pokemon/exp/back/654.png differ
diff --git a/public/images/pokemon/exp/back/656.json b/public/images/pokemon/exp/back/656.json
index 45c9ae75c29..78a3ae89852 100644
--- a/public/images/pokemon/exp/back/656.json
+++ b/public/images/pokemon/exp/back/656.json
@@ -1,1007 +1,713 @@
-{
-	"textures": [
-		{
-			"image": "656.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 70,
-				"h": 70
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 35,
-						"h": 34
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 34
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 35,
-						"h": 34
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 34
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 35,
-						"h": 34
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 34
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 35,
-						"h": 34
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 34
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 35,
-						"h": 34
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 34
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 35,
-						"h": 34
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 34
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0025.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 35,
-						"h": 34
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 34
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0026.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 35,
-						"h": 34
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 34
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0033.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 35,
-						"h": 34
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 34
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0034.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 35,
-						"h": 34
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 34
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0041.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 35,
-						"h": 34
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 34
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0042.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 35,
-						"h": 34
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 34
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 35,
-						"h": 34
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 34
-					},
-					"frame": {
-						"x": 35,
-						"y": 0,
-						"w": 35,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 35,
-						"h": 34
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 34
-					},
-					"frame": {
-						"x": 35,
-						"y": 0,
-						"w": 35,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 35,
-						"h": 34
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 34
-					},
-					"frame": {
-						"x": 35,
-						"y": 0,
-						"w": 35,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 35,
-						"h": 34
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 34
-					},
-					"frame": {
-						"x": 35,
-						"y": 0,
-						"w": 35,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 35,
-						"h": 34
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 34
-					},
-					"frame": {
-						"x": 35,
-						"y": 0,
-						"w": 35,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 35,
-						"h": 34
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 34
-					},
-					"frame": {
-						"x": 35,
-						"y": 0,
-						"w": 35,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 35,
-						"h": 34
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 34
-					},
-					"frame": {
-						"x": 35,
-						"y": 0,
-						"w": 35,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 35,
-						"h": 34
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 34
-					},
-					"frame": {
-						"x": 35,
-						"y": 0,
-						"w": 35,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 35,
-						"h": 34
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 34
-					},
-					"frame": {
-						"x": 35,
-						"y": 0,
-						"w": 35,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 35,
-						"h": 34
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 34
-					},
-					"frame": {
-						"x": 35,
-						"y": 0,
-						"w": 35,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 35,
-						"h": 34
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 34
-					},
-					"frame": {
-						"x": 35,
-						"y": 0,
-						"w": 35,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 35,
-						"h": 34
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 34
-					},
-					"frame": {
-						"x": 35,
-						"y": 0,
-						"w": 35,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0027.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 35,
-						"h": 34
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 34
-					},
-					"frame": {
-						"x": 35,
-						"y": 0,
-						"w": 35,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0028.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 35,
-						"h": 34
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 34
-					},
-					"frame": {
-						"x": 35,
-						"y": 0,
-						"w": 35,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0031.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 35,
-						"h": 34
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 34
-					},
-					"frame": {
-						"x": 35,
-						"y": 0,
-						"w": 35,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0032.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 35,
-						"h": 34
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 34
-					},
-					"frame": {
-						"x": 35,
-						"y": 0,
-						"w": 35,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0035.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 35,
-						"h": 34
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 34
-					},
-					"frame": {
-						"x": 35,
-						"y": 0,
-						"w": 35,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0036.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 35,
-						"h": 34
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 34
-					},
-					"frame": {
-						"x": 35,
-						"y": 0,
-						"w": 35,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0039.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 35,
-						"h": 34
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 34
-					},
-					"frame": {
-						"x": 35,
-						"y": 0,
-						"w": 35,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0040.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 35,
-						"h": 34
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 34
-					},
-					"frame": {
-						"x": 35,
-						"y": 0,
-						"w": 35,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0043.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 35,
-						"h": 34
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 34
-					},
-					"frame": {
-						"x": 35,
-						"y": 0,
-						"w": 35,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0044.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 35,
-						"h": 34
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 34
-					},
-					"frame": {
-						"x": 35,
-						"y": 0,
-						"w": 35,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0047.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 35,
-						"h": 34
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 34
-					},
-					"frame": {
-						"x": 35,
-						"y": 0,
-						"w": 35,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 35,
-						"h": 34
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 35,
-						"h": 33
-					},
-					"frame": {
-						"x": 0,
-						"y": 34,
-						"w": 35,
-						"h": 33
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 35,
-						"h": 34
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 35,
-						"h": 33
-					},
-					"frame": {
-						"x": 0,
-						"y": 34,
-						"w": 35,
-						"h": 33
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 35,
-						"h": 34
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 35,
-						"h": 33
-					},
-					"frame": {
-						"x": 0,
-						"y": 34,
-						"w": 35,
-						"h": 33
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 35,
-						"h": 34
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 35,
-						"h": 33
-					},
-					"frame": {
-						"x": 0,
-						"y": 34,
-						"w": 35,
-						"h": 33
-					}
-				},
-				{
-					"filename": "0037.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 35,
-						"h": 34
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 35,
-						"h": 33
-					},
-					"frame": {
-						"x": 0,
-						"y": 34,
-						"w": 35,
-						"h": 33
-					}
-				},
-				{
-					"filename": "0038.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 35,
-						"h": 34
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 35,
-						"h": 33
-					},
-					"frame": {
-						"x": 0,
-						"y": 34,
-						"w": 35,
-						"h": 33
-					}
-				},
-				{
-					"filename": "0045.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 35,
-						"h": 34
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 35,
-						"h": 33
-					},
-					"frame": {
-						"x": 0,
-						"y": 34,
-						"w": 35,
-						"h": 33
-					}
-				},
-				{
-					"filename": "0046.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 35,
-						"h": 34
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 35,
-						"h": 33
-					},
-					"frame": {
-						"x": 0,
-						"y": 34,
-						"w": 35,
-						"h": 33
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 35,
-						"h": 34
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 35,
-						"h": 33
-					},
-					"frame": {
-						"x": 35,
-						"y": 34,
-						"w": 35,
-						"h": 33
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 35,
-						"h": 34
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 35,
-						"h": 33
-					},
-					"frame": {
-						"x": 35,
-						"y": 34,
-						"w": 35,
-						"h": 33
-					}
-				},
-				{
-					"filename": "0029.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 35,
-						"h": 34
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 35,
-						"h": 33
-					},
-					"frame": {
-						"x": 35,
-						"y": 34,
-						"w": 35,
-						"h": 33
-					}
-				},
-				{
-					"filename": "0030.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 35,
-						"h": 34
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 35,
-						"h": 33
-					},
-					"frame": {
-						"x": 35,
-						"y": 34,
-						"w": 35,
-						"h": 33
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:a0be6653f39ddbef185db62f993cae42:d1b80f97b079891e5ee3e04a05cb932f:9c4d208e6c2f857bfb0b23b8eea3326c$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 1, "y": 81, "w": 34, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 34 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 131, "y": 81, "w": 34, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 34 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 37, "y": 83, "w": 34, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 34 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 109, "y": 117, "w": 34, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 14, "w": 34, "h": 33 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 35, "y": 119, "w": 34, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 14, "w": 34, "h": 33 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 35, "y": 154, "w": 34, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 15, "w": 34, "h": 32 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 71, "y": 156, "w": 34, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 15, "w": 34, "h": 32 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 167, "y": 43, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 12, "w": 34, "h": 35 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 71, "y": 121, "w": 34, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 12, "w": 34, "h": 33 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 141, "y": 158, "w": 34, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 32 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 73, "y": 85, "w": 34, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 34 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 1, "y": 81, "w": 34, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 34 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 131, "y": 81, "w": 34, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 34 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 37, "y": 83, "w": 34, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 34 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 109, "y": 117, "w": 34, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 14, "w": 34, "h": 33 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 35, "y": 119, "w": 34, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 14, "w": 34, "h": 33 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 35, "y": 154, "w": 34, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 15, "w": 34, "h": 32 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 71, "y": 156, "w": 34, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 15, "w": 34, "h": 32 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 167, "y": 43, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 12, "w": 34, "h": 35 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 71, "y": 121, "w": 34, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 12, "w": 34, "h": 33 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 141, "y": 158, "w": 34, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 32 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 73, "y": 85, "w": 34, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 34 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 1, "y": 81, "w": 34, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 34 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 131, "y": 81, "w": 34, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 34 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 37, "y": 83, "w": 34, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 34 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 109, "y": 117, "w": 34, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 14, "w": 34, "h": 33 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 35, "y": 119, "w": 34, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 14, "w": 34, "h": 33 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 35, "y": 154, "w": 34, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 15, "w": 34, "h": 32 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 71, "y": 156, "w": 34, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 15, "w": 34, "h": 32 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 167, "y": 43, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 12, "w": 34, "h": 35 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 71, "y": 121, "w": 34, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 12, "w": 34, "h": 33 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 141, "y": 158, "w": 34, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 32 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 73, "y": 85, "w": 34, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 34 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 1, "y": 81, "w": 34, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 34 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 131, "y": 81, "w": 34, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 34 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 37, "y": 83, "w": 34, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 34 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 109, "y": 117, "w": 34, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 14, "w": 34, "h": 33 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 35, "y": 119, "w": 34, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 14, "w": 34, "h": 33 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 35, "y": 154, "w": 34, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 15, "w": 34, "h": 32 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 71, "y": 156, "w": 34, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 15, "w": 34, "h": 32 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 167, "y": 43, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 12, "w": 34, "h": 35 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 71, "y": 121, "w": 34, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 12, "w": 34, "h": 33 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 141, "y": 158, "w": 34, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 32 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 73, "y": 85, "w": 34, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 34 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 1, "y": 81, "w": 34, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 34 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 131, "y": 81, "w": 34, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 34 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 37, "y": 83, "w": 34, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 34 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 109, "y": 117, "w": 34, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 14, "w": 34, "h": 33 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 35, "y": 119, "w": 34, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 14, "w": 34, "h": 33 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 35, "y": 154, "w": 34, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 15, "w": 34, "h": 32 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 71, "y": 156, "w": 34, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 15, "w": 34, "h": 32 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 167, "y": 43, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 12, "w": 34, "h": 35 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 71, "y": 121, "w": 34, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 12, "w": 34, "h": 33 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 141, "y": 158, "w": 34, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 32 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 73, "y": 85, "w": 34, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 34 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 1, "y": 81, "w": 34, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 34 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 200
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 67, "y": 1, "w": 33, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 9, "w": 33, "h": 38 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 1, "y": 1, "w": 31, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 6, "w": 31, "h": 41 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 34, "y": 1, "w": 31, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 31, "h": 41 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 50
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 102, "y": 1, "w": 31, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 31, "h": 40 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 50
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 167, "y": 1, "w": 30, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 30, "h": 40 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 50
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 167, "y": 80, "w": 30, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 30, "h": 39 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 67, "y": 41, "w": 30, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 30, "h": 40 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 50
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 135, "y": 1, "w": 30, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 30, "h": 41 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 50
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 99, "y": 43, "w": 30, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 6, "w": 30, "h": 40 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 50
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 1, "y": 155, "w": 32, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 13, "w": 32, "h": 34 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 50
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 107, "y": 189, "w": 32, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 15, "w": 32, "h": 32 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 50
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 1, "y": 191, "w": 31, "h": 31 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 16, "w": 31, "h": 31 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 50
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 69, "y": 190, "w": 31, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 14, "w": 31, "h": 33 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 35, "y": 188, "w": 32, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 13, "w": 32, "h": 34 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 750
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 145, "y": 121, "w": 32, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 35 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 1, "y": 117, "w": 32, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 11, "w": 32, "h": 36 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 107, "y": 152, "w": 32, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 35 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 1, "y": 44, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 12, "w": 34, "h": 35 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 131, "y": 44, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 12, "w": 34, "h": 35 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 1, "y": 81, "w": 34, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 34 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 1, "y": 81, "w": 34, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 34 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 1, "y": 81, "w": 34, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 34 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "656.png",
+  "format": "I8",
+  "size": { "w": 202, "h": 224 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/656.png b/public/images/pokemon/exp/back/656.png
index 99119d2e96e..9e98534aab2 100644
Binary files a/public/images/pokemon/exp/back/656.png and b/public/images/pokemon/exp/back/656.png differ
diff --git a/public/images/pokemon/exp/back/661.json b/public/images/pokemon/exp/back/661.json
index 5ccc4bdde31..be82a4ce425 100644
--- a/public/images/pokemon/exp/back/661.json
+++ b/public/images/pokemon/exp/back/661.json
@@ -1,356 +1,398 @@
-{
-	"textures": [
-		{
-			"image": "661.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 68,
-				"h": 68
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 34
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 34
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 34
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 34
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 34
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 34
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 34
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 34
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 34
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 34
-					},
-					"frame": {
-						"x": 0,
-						"y": 34,
-						"w": 32,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 34
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 34
-					},
-					"frame": {
-						"x": 0,
-						"y": 34,
-						"w": 32,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 34
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 34
-					},
-					"frame": {
-						"x": 0,
-						"y": 34,
-						"w": 32,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 34
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 34
-					},
-					"frame": {
-						"x": 0,
-						"y": 34,
-						"w": 32,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 34
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 34
-					},
-					"frame": {
-						"x": 0,
-						"y": 34,
-						"w": 32,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 34
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 34
-					},
-					"frame": {
-						"x": 0,
-						"y": 34,
-						"w": 32,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 34
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 34
-					},
-					"frame": {
-						"x": 32,
-						"y": 0,
-						"w": 32,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 34
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 34
-					},
-					"frame": {
-						"x": 32,
-						"y": 0,
-						"w": 32,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 34
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 34
-					},
-					"frame": {
-						"x": 32,
-						"y": 0,
-						"w": 32,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 34
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 34
-					},
-					"frame": {
-						"x": 32,
-						"y": 0,
-						"w": 32,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 34
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 34
-					},
-					"frame": {
-						"x": 32,
-						"y": 34,
-						"w": 32,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 34
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 34
-					},
-					"frame": {
-						"x": 32,
-						"y": 34,
-						"w": 32,
-						"h": 34
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:64046aa714277f415100be681fde9148:1306649eb47cc5be6e5f0b266b6c13ae:186d621a544ea0e0e2e0bd57975a29b1$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 66, "y": 114, "w": 33, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 33, "h": 38 },
+    "sourceSize": { "w": 38, "h": 40 },
+    "duration": 120
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 0, "y": 117, "w": 33, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 33, "h": 38 },
+    "sourceSize": { "w": 38, "h": 40 },
+    "duration": 120
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 0, "y": 39, "w": 34, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 34, "h": 39 },
+    "sourceSize": { "w": 38, "h": 40 },
+    "duration": 120
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 105, "y": 36, "w": 35, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 35, "h": 38 },
+    "sourceSize": { "w": 38, "h": 40 },
+    "duration": 120
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 33, "y": 118, "w": 33, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 33, "h": 38 },
+    "sourceSize": { "w": 38, "h": 40 },
+    "duration": 120
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 66, "y": 114, "w": 33, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 33, "h": 38 },
+    "sourceSize": { "w": 38, "h": 40 },
+    "duration": 120
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 68, "y": 75, "w": 33, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 33, "h": 39 },
+    "sourceSize": { "w": 38, "h": 40 },
+    "duration": 120
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 35, "y": 0, "w": 34, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 34, "h": 40 },
+    "sourceSize": { "w": 38, "h": 40 },
+    "duration": 120
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 0, "y": 0, "w": 35, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 35, "h": 39 },
+    "sourceSize": { "w": 38, "h": 40 },
+    "duration": 120
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 0, "y": 78, "w": 33, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 33, "h": 39 },
+    "sourceSize": { "w": 38, "h": 40 },
+    "duration": 120
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 66, "y": 114, "w": 33, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 33, "h": 38 },
+    "sourceSize": { "w": 38, "h": 40 },
+    "duration": 120
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 0, "y": 117, "w": 33, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 33, "h": 38 },
+    "sourceSize": { "w": 38, "h": 40 },
+    "duration": 120
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 34, "y": 40, "w": 34, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 34, "h": 39 },
+    "sourceSize": { "w": 38, "h": 40 },
+    "duration": 120
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 69, "y": 37, "w": 35, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 35, "h": 38 },
+    "sourceSize": { "w": 38, "h": 40 },
+    "duration": 120
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 33, "y": 118, "w": 33, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 33, "h": 38 },
+    "sourceSize": { "w": 38, "h": 40 },
+    "duration": 120
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 66, "y": 114, "w": 33, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 33, "h": 38 },
+    "sourceSize": { "w": 38, "h": 40 },
+    "duration": 120
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 68, "y": 75, "w": 33, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 33, "h": 39 },
+    "sourceSize": { "w": 38, "h": 40 },
+    "duration": 120
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 35, "y": 0, "w": 34, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 34, "h": 40 },
+    "sourceSize": { "w": 38, "h": 40 },
+    "duration": 120
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 0, "y": 0, "w": 35, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 35, "h": 39 },
+    "sourceSize": { "w": 38, "h": 40 },
+    "duration": 120
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 0, "y": 78, "w": 33, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 33, "h": 39 },
+    "sourceSize": { "w": 38, "h": 40 },
+    "duration": 120
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 66, "y": 114, "w": 33, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 33, "h": 38 },
+    "sourceSize": { "w": 38, "h": 40 },
+    "duration": 120
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 0, "y": 117, "w": 33, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 33, "h": 38 },
+    "sourceSize": { "w": 38, "h": 40 },
+    "duration": 120
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 34, "y": 40, "w": 34, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 34, "h": 39 },
+    "sourceSize": { "w": 38, "h": 40 },
+    "duration": 120
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 69, "y": 37, "w": 35, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 35, "h": 38 },
+    "sourceSize": { "w": 38, "h": 40 },
+    "duration": 120
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 33, "y": 118, "w": 33, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 33, "h": 38 },
+    "sourceSize": { "w": 38, "h": 40 },
+    "duration": 120
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 66, "y": 114, "w": 33, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 33, "h": 38 },
+    "sourceSize": { "w": 38, "h": 40 },
+    "duration": 120
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 68, "y": 75, "w": 33, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 33, "h": 39 },
+    "sourceSize": { "w": 38, "h": 40 },
+    "duration": 120
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 35, "y": 0, "w": 34, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 34, "h": 40 },
+    "sourceSize": { "w": 38, "h": 40 },
+    "duration": 120
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 0, "y": 0, "w": 35, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 35, "h": 39 },
+    "sourceSize": { "w": 38, "h": 40 },
+    "duration": 120
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 0, "y": 78, "w": 33, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 33, "h": 39 },
+    "sourceSize": { "w": 38, "h": 40 },
+    "duration": 120
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 66, "y": 114, "w": 33, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 33, "h": 38 },
+    "sourceSize": { "w": 38, "h": 40 },
+    "duration": 120
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 33, "y": 79, "w": 33, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 33, "h": 39 },
+    "sourceSize": { "w": 38, "h": 40 },
+    "duration": 120
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 33, "y": 79, "w": 33, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 33, "h": 39 },
+    "sourceSize": { "w": 38, "h": 40 },
+    "duration": 120
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 101, "y": 112, "w": 34, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 34, "h": 37 },
+    "sourceSize": { "w": 38, "h": 40 },
+    "duration": 120
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 69, "y": 0, "w": 36, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 36, "h": 37 },
+    "sourceSize": { "w": 38, "h": 40 },
+    "duration": 120
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 105, "y": 0, "w": 37, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 37, "h": 36 },
+    "sourceSize": { "w": 38, "h": 40 },
+    "duration": 120
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 69, "y": 0, "w": 36, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 36, "h": 37 },
+    "sourceSize": { "w": 38, "h": 40 },
+    "duration": 120
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 105, "y": 0, "w": 37, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 37, "h": 36 },
+    "sourceSize": { "w": 38, "h": 40 },
+    "duration": 120
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 69, "y": 0, "w": 36, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 36, "h": 37 },
+    "sourceSize": { "w": 38, "h": 40 },
+    "duration": 120
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 105, "y": 0, "w": 37, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 37, "h": 36 },
+    "sourceSize": { "w": 38, "h": 40 },
+    "duration": 120
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 69, "y": 0, "w": 36, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 36, "h": 37 },
+    "sourceSize": { "w": 38, "h": 40 },
+    "duration": 120
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 104, "y": 74, "w": 34, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 34, "h": 38 },
+    "sourceSize": { "w": 38, "h": 40 },
+    "duration": 120
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 33, "y": 79, "w": 33, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 33, "h": 39 },
+    "sourceSize": { "w": 38, "h": 40 },
+    "duration": 120
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.11-x64",
+  "image": "661.png",
+  "format": "I8",
+  "size": { "w": 142, "h": 156 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/661.png b/public/images/pokemon/exp/back/661.png
index 8ab845902d1..67d9bb04293 100644
Binary files a/public/images/pokemon/exp/back/661.png and b/public/images/pokemon/exp/back/661.png differ
diff --git a/public/images/pokemon/exp/back/662.json b/public/images/pokemon/exp/back/662.json
index e854c2b896c..52cc70bbe5d 100644
--- a/public/images/pokemon/exp/back/662.json
+++ b/public/images/pokemon/exp/back/662.json
@@ -1,671 +1,254 @@
-{
-	"textures": [
-		{
-			"image": "662.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 154,
-				"h": 154
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 16,
-						"w": 56,
-						"h": 37
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 56,
-						"h": 37
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 16,
-						"w": 56,
-						"h": 37
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 56,
-						"h": 37
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 16,
-						"w": 56,
-						"h": 37
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 56,
-						"h": 37
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 16,
-						"w": 56,
-						"h": 37
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 56,
-						"h": 37
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 17,
-						"w": 49,
-						"h": 48
-					},
-					"frame": {
-						"x": 56,
-						"y": 0,
-						"w": 49,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 17,
-						"w": 49,
-						"h": 48
-					},
-					"frame": {
-						"x": 56,
-						"y": 0,
-						"w": 49,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 17,
-						"w": 49,
-						"h": 48
-					},
-					"frame": {
-						"x": 105,
-						"y": 0,
-						"w": 49,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 17,
-						"w": 49,
-						"h": 48
-					},
-					"frame": {
-						"x": 105,
-						"y": 0,
-						"w": 49,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 57,
-						"h": 50
-					},
-					"frame": {
-						"x": 0,
-						"y": 48,
-						"w": 57,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 57,
-						"h": 50
-					},
-					"frame": {
-						"x": 0,
-						"y": 48,
-						"w": 57,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0027.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 57,
-						"h": 50
-					},
-					"frame": {
-						"x": 0,
-						"y": 48,
-						"w": 57,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0028.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 57,
-						"h": 50
-					},
-					"frame": {
-						"x": 0,
-						"y": 48,
-						"w": 57,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 57,
-						"h": 51
-					},
-					"frame": {
-						"x": 57,
-						"y": 48,
-						"w": 57,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 57,
-						"h": 51
-					},
-					"frame": {
-						"x": 57,
-						"y": 48,
-						"w": 57,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0029.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 57,
-						"h": 51
-					},
-					"frame": {
-						"x": 57,
-						"y": 48,
-						"w": 57,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0030.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 57,
-						"h": 51
-					},
-					"frame": {
-						"x": 57,
-						"y": 48,
-						"w": 57,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 57,
-						"h": 52
-					},
-					"frame": {
-						"x": 0,
-						"y": 98,
-						"w": 57,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 57,
-						"h": 52
-					},
-					"frame": {
-						"x": 0,
-						"y": 98,
-						"w": 57,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 57,
-						"h": 52
-					},
-					"frame": {
-						"x": 0,
-						"y": 98,
-						"w": 57,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 57,
-						"h": 52
-					},
-					"frame": {
-						"x": 0,
-						"y": 98,
-						"w": 57,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 57,
-						"h": 52
-					},
-					"frame": {
-						"x": 0,
-						"y": 98,
-						"w": 57,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 57,
-						"h": 52
-					},
-					"frame": {
-						"x": 0,
-						"y": 98,
-						"w": 57,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 57,
-						"h": 52
-					},
-					"frame": {
-						"x": 0,
-						"y": 98,
-						"w": 57,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 57,
-						"h": 52
-					},
-					"frame": {
-						"x": 0,
-						"y": 98,
-						"w": 57,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0025.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 57,
-						"h": 52
-					},
-					"frame": {
-						"x": 0,
-						"y": 98,
-						"w": 57,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0026.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 57,
-						"h": 52
-					},
-					"frame": {
-						"x": 0,
-						"y": 98,
-						"w": 57,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0031.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 57,
-						"h": 52
-					},
-					"frame": {
-						"x": 0,
-						"y": 98,
-						"w": 57,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 57,
-						"h": 52
-					},
-					"frame": {
-						"x": 57,
-						"y": 99,
-						"w": 57,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 57,
-						"h": 52
-					},
-					"frame": {
-						"x": 57,
-						"y": 99,
-						"w": 57,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 57,
-						"h": 52
-					},
-					"frame": {
-						"x": 57,
-						"y": 99,
-						"w": 57,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 57,
-						"h": 52
-					},
-					"frame": {
-						"x": 57,
-						"y": 99,
-						"w": 57,
-						"h": 52
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:66c0226d9868b335d6f9adbc58ca011b:9d85ba89536227407c6480dea06dad13:e3da2dd0277c18bcc713dc6dd2460c87$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 1, "y": 70, "w": 53, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 16, "w": 53, "h": 62 },
+    "sourceSize": { "w": 70, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 212, "y": 70, "w": 52, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 18, "w": 52, "h": 63 },
+    "sourceSize": { "w": 70, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 247, "y": 204, "w": 46, "h": 51 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 36, "w": 46, "h": 51 },
+    "sourceSize": { "w": 70, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 1, "y": 196, "w": 49, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 33, "w": 49, "h": 49 },
+    "sourceSize": { "w": 70, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 56, "y": 1, "w": 56, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 15, "w": 56, "h": 65 },
+    "sourceSize": { "w": 70, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 224, "y": 1, "w": 52, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 10, "w": 52, "h": 68 },
+    "sourceSize": { "w": 70, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 107, "y": 68, "w": 48, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 6, "w": 48, "h": 69 },
+    "sourceSize": { "w": 70, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 277, "y": 1, "w": 51, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 12, "w": 51, "h": 68 },
+    "sourceSize": { "w": 70, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 113, "y": 1, "w": 55, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 18, "w": 55, "h": 66 },
+    "sourceSize": { "w": 70, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 48, "y": 249, "w": 44, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 31, "w": 44, "h": 50 },
+    "sourceSize": { "w": 70, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 191, "y": 248, "w": 47, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 27, "w": 47, "h": 49 },
+    "sourceSize": { "w": 70, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 169, "y": 1, "w": 54, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 54, "h": 67 },
+    "sourceSize": { "w": 70, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 101, "y": 208, "w": 45, "h": 51 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 19, "y": 18, "w": 45, "h": 51 },
+    "sourceSize": { "w": 70, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 1, "y": 246, "w": 46, "h": 51 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 13, "w": 46, "h": 51 },
+    "sourceSize": { "w": 70, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 1, "y": 1, "w": 54, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 54, "h": 68 },
+    "sourceSize": { "w": 70, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 56, "y": 67, "w": 50, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 50, "h": 69 },
+    "sourceSize": { "w": 70, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 265, "y": 70, "w": 47, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 6, "w": 47, "h": 69 },
+    "sourceSize": { "w": 70, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 102, "y": 138, "w": 44, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 11, "w": 44, "h": 69 },
+    "sourceSize": { "w": 70, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 147, "y": 193, "w": 43, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 17, "y": 14, "w": 43, "h": 69 },
+    "sourceSize": { "w": 70, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 191, "y": 199, "w": 55, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 31, "w": 55, "h": 48 },
+    "sourceSize": { "w": 70, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 51, "y": 200, "w": 49, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 27, "w": 49, "h": 48 },
+    "sourceSize": { "w": 70, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 156, "y": 69, "w": 55, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 11, "w": 55, "h": 60 },
+    "sourceSize": { "w": 70, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 1, "y": 133, "w": 50, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 6, "w": 50, "h": 62 },
+    "sourceSize": { "w": 70, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 208, "y": 134, "w": 48, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 2, "w": 48, "h": 64 },
+    "sourceSize": { "w": 70, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 257, "y": 140, "w": 48, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 6, "w": 48, "h": 63 },
+    "sourceSize": { "w": 70, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 52, "y": 137, "w": 49, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 10, "w": 49, "h": 62 },
+    "sourceSize": { "w": 70, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 156, "y": 130, "w": 51, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 13, "w": 51, "h": 62 },
+    "sourceSize": { "w": 70, "h": 87 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.11-x64",
+  "image": "662.png",
+  "format": "I8",
+  "size": { "w": 329, "h": 300 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/662.png b/public/images/pokemon/exp/back/662.png
index 4e6a3c88277..39a9e8e53ad 100644
Binary files a/public/images/pokemon/exp/back/662.png and b/public/images/pokemon/exp/back/662.png differ
diff --git a/public/images/pokemon/exp/back/663.json b/public/images/pokemon/exp/back/663.json
index 83f5b7ddc42..48526624362 100644
--- a/public/images/pokemon/exp/back/663.json
+++ b/public/images/pokemon/exp/back/663.json
@@ -1,587 +1,731 @@
-{
-	"textures": [
-		{
-			"image": "663.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 226,
-				"h": 226
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 90,
-						"h": 96
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 90,
-						"h": 93
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 90,
-						"h": 93
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 90,
-						"h": 96
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 90,
-						"h": 93
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 90,
-						"h": 93
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 90,
-						"h": 96
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 90,
-						"h": 93
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 90,
-						"h": 93
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 90,
-						"h": 96
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 90,
-						"h": 93
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 90,
-						"h": 93
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 90,
-						"h": 96
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 90,
-						"h": 93
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 90,
-						"h": 93
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 90,
-						"h": 96
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 90,
-						"h": 93
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 90,
-						"h": 93
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 90,
-						"h": 96
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 90,
-						"h": 93
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 90,
-						"h": 93
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 90,
-						"h": 96
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 90,
-						"h": 93
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 90,
-						"h": 93
-					}
-				},
-				{
-					"filename": "0025.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 90,
-						"h": 96
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 90,
-						"h": 93
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 90,
-						"h": 93
-					}
-				},
-				{
-					"filename": "0026.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 90,
-						"h": 96
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 90,
-						"h": 93
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 90,
-						"h": 93
-					}
-				},
-				{
-					"filename": "0027.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 90,
-						"h": 96
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 90,
-						"h": 93
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 90,
-						"h": 93
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 90,
-						"h": 96
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 90,
-						"h": 93
-					},
-					"frame": {
-						"x": 0,
-						"y": 93,
-						"w": 90,
-						"h": 93
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 90,
-						"h": 96
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 90,
-						"h": 93
-					},
-					"frame": {
-						"x": 0,
-						"y": 93,
-						"w": 90,
-						"h": 93
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 90,
-						"h": 96
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 90,
-						"h": 93
-					},
-					"frame": {
-						"x": 0,
-						"y": 93,
-						"w": 90,
-						"h": 93
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 90,
-						"h": 96
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 90,
-						"h": 93
-					},
-					"frame": {
-						"x": 0,
-						"y": 93,
-						"w": 90,
-						"h": 93
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 90,
-						"h": 96
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 90,
-						"h": 92
-					},
-					"frame": {
-						"x": 90,
-						"y": 0,
-						"w": 90,
-						"h": 92
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 90,
-						"h": 96
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 90,
-						"h": 92
-					},
-					"frame": {
-						"x": 90,
-						"y": 0,
-						"w": 90,
-						"h": 92
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 90,
-						"h": 96
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 90,
-						"h": 92
-					},
-					"frame": {
-						"x": 90,
-						"y": 0,
-						"w": 90,
-						"h": 92
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 90,
-						"h": 96
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 90,
-						"h": 92
-					},
-					"frame": {
-						"x": 90,
-						"y": 0,
-						"w": 90,
-						"h": 92
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 90,
-						"h": 96
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 19,
-						"w": 84,
-						"h": 62
-					},
-					"frame": {
-						"x": 90,
-						"y": 92,
-						"w": 84,
-						"h": 62
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 90,
-						"h": 96
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 19,
-						"w": 84,
-						"h": 62
-					},
-					"frame": {
-						"x": 90,
-						"y": 92,
-						"w": 84,
-						"h": 62
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 90,
-						"h": 96
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 19,
-						"w": 84,
-						"h": 62
-					},
-					"frame": {
-						"x": 90,
-						"y": 92,
-						"w": 84,
-						"h": 62
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 90,
-						"h": 96
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 19,
-						"w": 84,
-						"h": 62
-					},
-					"frame": {
-						"x": 90,
-						"y": 92,
-						"w": 84,
-						"h": 62
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 90,
-						"h": 96
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 24,
-						"w": 80,
-						"h": 72
-					},
-					"frame": {
-						"x": 90,
-						"y": 154,
-						"w": 80,
-						"h": 72
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 90,
-						"h": 96
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 24,
-						"w": 80,
-						"h": 72
-					},
-					"frame": {
-						"x": 90,
-						"y": 154,
-						"w": 80,
-						"h": 72
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 90,
-						"h": 96
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 24,
-						"w": 80,
-						"h": 72
-					},
-					"frame": {
-						"x": 90,
-						"y": 154,
-						"w": 80,
-						"h": 72
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 90,
-						"h": 96
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 24,
-						"w": 80,
-						"h": 72
-					},
-					"frame": {
-						"x": 90,
-						"y": 154,
-						"w": 80,
-						"h": 72
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:e8559a9780e93da88e5a990643c22bc0:3bdf9c50c7e3aa9ed9acc8477ddf312d:3790d8d72a704a789cc594688d98802e$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 298, "y": 0, "w": 90, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 19, "y": 3, "w": 90, "h": 91 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 0, "y": 0, "w": 95, "h": 89 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 4, "w": 95, "h": 89 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 193, "y": 0, "w": 104, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 11, "w": 104, "h": 81 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 276, "y": 92, "w": 111, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 32, "w": 111, "h": 60 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 0, "y": 90, "w": 107, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 31, "w": 107, "h": 64 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 276, "y": 153, "w": 110, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 32, "w": 110, "h": 58 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 0, "y": 155, "w": 101, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 36, "w": 101, "h": 57 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 96, "y": 0, "w": 96, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 16, "y": 5, "w": 96, "h": 88 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 298, "y": 0, "w": 90, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 19, "y": 3, "w": 90, "h": 91 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 193, "y": 82, "w": 82, "h": 93 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 2, "w": 82, "h": 93 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 298, "y": 0, "w": 90, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 19, "y": 3, "w": 90, "h": 91 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 0, "y": 0, "w": 95, "h": 89 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 4, "w": 95, "h": 89 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 193, "y": 0, "w": 104, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 11, "w": 104, "h": 81 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 276, "y": 92, "w": 111, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 32, "w": 111, "h": 60 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 0, "y": 90, "w": 107, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 31, "w": 107, "h": 64 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 276, "y": 153, "w": 110, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 32, "w": 110, "h": 58 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 0, "y": 155, "w": 101, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 36, "w": 101, "h": 57 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 96, "y": 0, "w": 96, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 16, "y": 5, "w": 96, "h": 88 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 298, "y": 0, "w": 90, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 19, "y": 3, "w": 90, "h": 91 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 193, "y": 82, "w": 82, "h": 93 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 2, "w": 82, "h": 93 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 298, "y": 0, "w": 90, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 19, "y": 3, "w": 90, "h": 91 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 0, "y": 0, "w": 95, "h": 89 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 4, "w": 95, "h": 89 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 193, "y": 0, "w": 104, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 11, "w": 104, "h": 81 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 276, "y": 92, "w": 111, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 32, "w": 111, "h": 60 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 0, "y": 90, "w": 107, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 31, "w": 107, "h": 64 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 276, "y": 153, "w": 110, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 32, "w": 110, "h": 58 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 0, "y": 155, "w": 101, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 36, "w": 101, "h": 57 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 96, "y": 0, "w": 96, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 16, "y": 5, "w": 96, "h": 88 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 298, "y": 0, "w": 90, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 19, "y": 3, "w": 90, "h": 91 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 193, "y": 82, "w": 82, "h": 93 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 2, "w": 82, "h": 93 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 298, "y": 0, "w": 90, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 19, "y": 3, "w": 90, "h": 91 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 0, "y": 0, "w": 95, "h": 89 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 4, "w": 95, "h": 89 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 193, "y": 0, "w": 104, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 11, "w": 104, "h": 81 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 276, "y": 92, "w": 111, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 32, "w": 111, "h": 60 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 0, "y": 90, "w": 107, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 31, "w": 107, "h": 64 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 276, "y": 153, "w": 110, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 32, "w": 110, "h": 58 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 0, "y": 155, "w": 101, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 36, "w": 101, "h": 57 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 96, "y": 0, "w": 96, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 16, "y": 5, "w": 96, "h": 88 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 298, "y": 0, "w": 90, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 19, "y": 3, "w": 90, "h": 91 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 193, "y": 82, "w": 82, "h": 93 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 2, "w": 82, "h": 93 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 298, "y": 0, "w": 90, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 19, "y": 3, "w": 90, "h": 91 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 0, "y": 0, "w": 95, "h": 89 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 4, "w": 95, "h": 89 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 193, "y": 0, "w": 104, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 11, "w": 104, "h": 81 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 276, "y": 92, "w": 111, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 32, "w": 111, "h": 60 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 0, "y": 90, "w": 107, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 31, "w": 107, "h": 64 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 276, "y": 153, "w": 110, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 32, "w": 110, "h": 58 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 0, "y": 155, "w": 101, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 36, "w": 101, "h": 57 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 96, "y": 0, "w": 96, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 16, "y": 5, "w": 96, "h": 88 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 298, "y": 0, "w": 90, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 19, "y": 3, "w": 90, "h": 91 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 193, "y": 82, "w": 82, "h": 93 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 2, "w": 82, "h": 93 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 298, "y": 0, "w": 90, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 19, "y": 3, "w": 90, "h": 91 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 0, "y": 0, "w": 95, "h": 89 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 4, "w": 95, "h": 89 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 193, "y": 0, "w": 104, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 11, "w": 104, "h": 81 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 276, "y": 92, "w": 111, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 32, "w": 111, "h": 60 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 0, "y": 90, "w": 107, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 31, "w": 107, "h": 64 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 276, "y": 153, "w": 110, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 32, "w": 110, "h": 58 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 0, "y": 155, "w": 101, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 36, "w": 101, "h": 57 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 96, "y": 0, "w": 96, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 16, "y": 5, "w": 96, "h": 88 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 298, "y": 0, "w": 90, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 19, "y": 3, "w": 90, "h": 91 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 193, "y": 82, "w": 82, "h": 93 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 2, "w": 82, "h": 93 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 0, "y": 0, "w": 95, "h": 89 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 4, "w": 95, "h": 89 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 193, "y": 0, "w": 104, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 11, "w": 104, "h": 81 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 0, "y": 90, "w": 107, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 31, "w": 107, "h": 64 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 0, "y": 155, "w": 101, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 36, "w": 101, "h": 57 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 193, "y": 82, "w": 82, "h": 93 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 2, "w": 82, "h": 93 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 0, "y": 0, "w": 95, "h": 89 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 4, "w": 95, "h": 89 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 193, "y": 0, "w": 104, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 11, "w": 104, "h": 81 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 0, "y": 90, "w": 107, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 31, "w": 107, "h": 64 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 0, "y": 155, "w": 101, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 36, "w": 101, "h": 57 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 193, "y": 82, "w": 82, "h": 93 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 2, "w": 82, "h": 93 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 0, "y": 0, "w": 95, "h": 89 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 4, "w": 95, "h": 89 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 193, "y": 0, "w": 104, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 11, "w": 104, "h": 81 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 0, "y": 90, "w": 107, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 31, "w": 107, "h": 64 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 0, "y": 155, "w": 101, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 36, "w": 101, "h": 57 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 193, "y": 82, "w": 82, "h": 93 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 2, "w": 82, "h": 93 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 0, "y": 0, "w": 95, "h": 89 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 4, "w": 95, "h": 89 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 193, "y": 0, "w": 104, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 11, "w": 104, "h": 81 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 0, "y": 90, "w": 107, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 31, "w": 107, "h": 64 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 0, "y": 155, "w": 101, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 36, "w": 101, "h": 57 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 193, "y": 82, "w": 82, "h": 93 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 2, "w": 82, "h": 93 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "663.png",
+  "format": "I8",
+  "size": { "w": 388, "h": 212 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/663.png b/public/images/pokemon/exp/back/663.png
index d241c8be871..6b49fc0a803 100644
Binary files a/public/images/pokemon/exp/back/663.png and b/public/images/pokemon/exp/back/663.png differ
diff --git a/public/images/pokemon/exp/back/664.json b/public/images/pokemon/exp/back/664.json
index 10da9db36bd..61c85d30239 100644
--- a/public/images/pokemon/exp/back/664.json
+++ b/public/images/pokemon/exp/back/664.json
@@ -1,104 +1,110 @@
-{
-	"textures": [
-		{
-			"image": "664.png", 
-			"format": "RGBA8888", 
-			"size": {
-				"w": 72, 
-				"h": 72
-			}, 
-			"scale": 1, 
-			"frames": [
-				{
-					"filename": "0002.png", 
-					"rotated": false, 
-					"trimmed": false, 
-					"sourceSize": {
-						"w": 24, 
-						"h": 44
-					}, 
-					"spriteSourceSize": {
-						"x": 0, 
-						"y": 0, 
-						"w": 24, 
-						"h": 44
-					}, 
-					"frame": {
-						"x": 0, 
-						"y": 0, 
-						"w": 24, 
-						"h": 44
-					}
-				}, 
-				{
-					"filename": "0004.png", 
-					"rotated": false, 
-					"trimmed": false, 
-					"sourceSize": {
-						"w": 24, 
-						"h": 44
-					}, 
-					"spriteSourceSize": {
-						"x": 0, 
-						"y": 0, 
-						"w": 24, 
-						"h": 44
-					}, 
-					"frame": {
-						"x": 0, 
-						"y": 0, 
-						"w": 24, 
-						"h": 44
-					}
-				}, 
-				{
-					"filename": "0003.png", 
-					"rotated": false, 
-					"trimmed": false, 
-					"sourceSize": {
-						"w": 24, 
-						"h": 44
-					}, 
-					"spriteSourceSize": {
-						"x": 0, 
-						"y": 0, 
-						"w": 24, 
-						"h": 44
-					}, 
-					"frame": {
-						"x": 24, 
-						"y": 0, 
-						"w": 24, 
-						"h": 44
-					}
-				}, 
-				{
-					"filename": "0001.png", 
-					"rotated": false, 
-					"trimmed": true, 
-					"sourceSize": {
-						"w": 24, 
-						"h": 44
-					}, 
-					"spriteSourceSize": {
-						"x": 0, 
-						"y": 2, 
-						"w": 24, 
-						"h": 42
-					}, 
-					"frame": {
-						"x": 48, 
-						"y": 0, 
-						"w": 24, 
-						"h": 42
-					}
-				}
-			]
-		}
-	], 
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker", 
-		"version": "3.0", 
-		"smartupdate": "$TexturePacker:SmartUpdate:7fc62d03764cbb44c78d222a8281c03b:59a11cbddf36944dc23f528022e71fc9:596e7d5b15b1bf041c4d7f6707c8ff49$"
-	}
-}
\ No newline at end of file
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 54, "y": 49, "w": 26, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 26, "h": 49 },
+    "sourceSize": { "w": 28, "h": 49 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 80, "y": 96, "w": 26, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 26, "h": 48 },
+    "sourceSize": { "w": 28, "h": 49 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 0, "y": 97, "w": 26, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 26, "h": 48 },
+    "sourceSize": { "w": 28, "h": 49 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 0, "y": 49, "w": 27, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 27, "h": 48 },
+    "sourceSize": { "w": 28, "h": 49 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 26, "y": 97, "w": 26, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 26, "h": 47 },
+    "sourceSize": { "w": 28, "h": 49 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 80, "y": 49, "w": 27, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 27, "h": 47 },
+    "sourceSize": { "w": 28, "h": 49 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 27, "y": 49, "w": 27, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 27, "h": 48 },
+    "sourceSize": { "w": 28, "h": 49 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 28, "y": 0, "w": 27, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 27, "h": 49 },
+    "sourceSize": { "w": 28, "h": 49 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 55, "y": 0, "w": 27, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 27, "h": 49 },
+    "sourceSize": { "w": 28, "h": 49 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 0, "y": 0, "w": 28, "h": 49 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 28, "h": 49 },
+    "sourceSize": { "w": 28, "h": 49 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 82, "y": 0, "w": 27, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 27, "h": 49 },
+    "sourceSize": { "w": 28, "h": 49 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "664.png",
+  "format": "I8",
+  "size": { "w": 109, "h": 145 },
+  "scale": "1"
+ }
+}
diff --git a/public/images/pokemon/exp/back/664.png b/public/images/pokemon/exp/back/664.png
index 30664a6aaf1..a8f0906c60d 100644
Binary files a/public/images/pokemon/exp/back/664.png and b/public/images/pokemon/exp/back/664.png differ
diff --git a/public/images/pokemon/exp/back/665.json b/public/images/pokemon/exp/back/665.json
index 320219545d9..6e713a69311 100644
--- a/public/images/pokemon/exp/back/665.json
+++ b/public/images/pokemon/exp/back/665.json
@@ -1,104 +1,596 @@
-{
-	"textures": [
-		{
-			"image": "665.png", 
-			"format": "RGBA8888", 
-			"size": {
-				"w": 75, 
-				"h": 75
-			}, 
-			"scale": 1, 
-			"frames": [
-				{
-					"filename": "0002.png", 
-					"rotated": false, 
-					"trimmed": false, 
-					"sourceSize": {
-						"w": 38, 
-						"h": 36
-					}, 
-					"spriteSourceSize": {
-						"x": 0, 
-						"y": 0, 
-						"w": 38, 
-						"h": 36
-					}, 
-					"frame": {
-						"x": 0, 
-						"y": 0, 
-						"w": 38, 
-						"h": 36
-					}
-				}, 
-				{
-					"filename": "0004.png", 
-					"rotated": false, 
-					"trimmed": false, 
-					"sourceSize": {
-						"w": 38, 
-						"h": 36
-					}, 
-					"spriteSourceSize": {
-						"x": 0, 
-						"y": 0, 
-						"w": 38, 
-						"h": 36
-					}, 
-					"frame": {
-						"x": 0, 
-						"y": 0, 
-						"w": 38, 
-						"h": 36
-					}
-				}, 
-				{
-					"filename": "0003.png", 
-					"rotated": false, 
-					"trimmed": true, 
-					"sourceSize": {
-						"w": 38, 
-						"h": 36
-					}, 
-					"spriteSourceSize": {
-						"x": 0, 
-						"y": 0, 
-						"w": 37, 
-						"h": 36
-					}, 
-					"frame": {
-						"x": 38, 
-						"y": 0, 
-						"w": 37, 
-						"h": 36
-					}
-				}, 
-				{
-					"filename": "0001.png", 
-					"rotated": false, 
-					"trimmed": true, 
-					"sourceSize": {
-						"w": 38, 
-						"h": 36
-					}, 
-					"spriteSourceSize": {
-						"x": 0, 
-						"y": 1, 
-						"w": 38, 
-						"h": 35
-					}, 
-					"frame": {
-						"x": 0, 
-						"y": 36, 
-						"w": 38, 
-						"h": 35
-					}
-				}
-			]
-		}
-	], 
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker", 
-		"version": "3.0", 
-		"smartupdate": "$TexturePacker:SmartUpdate:9899654837114efa492ec85d06cd415a:0050d8b3ae2b780795145dd4beb4e6bb:a72e6c94514c750d7462eab6b08ee591$"
-	}
-}
\ No newline at end of file
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 126, "y": 66, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 5, "w": 34, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 86, "y": 73, "w": 34, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 6, "w": 34, "h": 34 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 358, "y": 69, "w": 36, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 7, "w": 36, "h": 33 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 0, "y": 71, "w": 36, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 7, "w": 36, "h": 33 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 120, "y": 101, "w": 36, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 8, "w": 36, "h": 32 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 262, "y": 102, "w": 36, "h": 31 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 9, "w": 36, "h": 31 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 120, "y": 101, "w": 36, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 8, "w": 36, "h": 32 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 0, "y": 71, "w": 36, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 7, "w": 36, "h": 33 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 358, "y": 69, "w": 36, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 7, "w": 36, "h": 33 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 86, "y": 73, "w": 34, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 6, "w": 34, "h": 34 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 126, "y": 66, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 5, "w": 34, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 126, "y": 66, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 5, "w": 34, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 126, "y": 66, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 5, "w": 34, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 126, "y": 66, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 5, "w": 34, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 126, "y": 66, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 5, "w": 34, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 86, "y": 73, "w": 34, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 6, "w": 34, "h": 34 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 358, "y": 69, "w": 36, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 7, "w": 36, "h": 33 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 0, "y": 71, "w": 36, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 7, "w": 36, "h": 33 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 120, "y": 101, "w": 36, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 8, "w": 36, "h": 32 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 262, "y": 102, "w": 36, "h": 31 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 9, "w": 36, "h": 31 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 120, "y": 101, "w": 36, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 8, "w": 36, "h": 32 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 0, "y": 71, "w": 36, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 7, "w": 36, "h": 33 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 358, "y": 69, "w": 36, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 7, "w": 36, "h": 33 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 86, "y": 73, "w": 34, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 6, "w": 34, "h": 34 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 126, "y": 66, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 5, "w": 34, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 126, "y": 66, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 5, "w": 34, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 126, "y": 66, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 5, "w": 34, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 126, "y": 66, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 5, "w": 34, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 126, "y": 66, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 5, "w": 34, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 86, "y": 73, "w": 34, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 6, "w": 34, "h": 34 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 358, "y": 69, "w": 36, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 7, "w": 36, "h": 33 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 0, "y": 71, "w": 36, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 7, "w": 36, "h": 33 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 120, "y": 101, "w": 36, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 8, "w": 36, "h": 32 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 262, "y": 102, "w": 36, "h": 31 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 9, "w": 36, "h": 31 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 120, "y": 101, "w": 36, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 8, "w": 36, "h": 32 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 0, "y": 71, "w": 36, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 7, "w": 36, "h": 33 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 358, "y": 69, "w": 36, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 7, "w": 36, "h": 33 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 86, "y": 73, "w": 34, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 6, "w": 34, "h": 34 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 126, "y": 66, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 5, "w": 34, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 126, "y": 66, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 5, "w": 34, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 126, "y": 66, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 5, "w": 34, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 126, "y": 66, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 5, "w": 34, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 126, "y": 66, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 5, "w": 34, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 160, "y": 66, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 5, "w": 34, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 290, "y": 67, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 5, "w": 34, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 160, "y": 66, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 5, "w": 34, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 126, "y": 66, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 5, "w": 34, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 47, "y": 40, "w": 39, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 5, "w": 39, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 343, "y": 34, "w": 45, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 5, "w": 45, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 227, "y": 33, "w": 63, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 4, "w": 63, "h": 36 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 80, "y": 0, "w": 74, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 74, "h": 40 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 154, "y": 0, "w": 81, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 81, "h": 33 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 235, "y": 0, "w": 81, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 81, "h": 33 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 0, "y": 0, "w": 80, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 80, "h": 38 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 154, "y": 33, "w": 73, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 7, "w": 73, "h": 33 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 316, "y": 0, "w": 73, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 7, "w": 73, "h": 34 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 290, "y": 34, "w": 53, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 17, "y": 7, "w": 53, "h": 33 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 0, "y": 38, "w": 47, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 7, "w": 47, "h": 33 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 86, "y": 40, "w": 40, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 7, "w": 40, "h": 33 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 156, "y": 101, "w": 34, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 7, "w": 34, "h": 33 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 36, "y": 75, "w": 34, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 6, "w": 34, "h": 34 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 194, "y": 69, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 5, "w": 34, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 228, "y": 69, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 5, "w": 34, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 324, "y": 69, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 5, "w": 34, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 126, "y": 66, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 5, "w": 34, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "665.png",
+  "format": "I8",
+  "size": { "w": 394, "h": 134 },
+  "scale": "1"
+ }
+}
diff --git a/public/images/pokemon/exp/back/665.png b/public/images/pokemon/exp/back/665.png
index 1cb4789e140..c989771bc5f 100644
Binary files a/public/images/pokemon/exp/back/665.png and b/public/images/pokemon/exp/back/665.png differ
diff --git a/public/images/pokemon/exp/back/666-archipelago.json b/public/images/pokemon/exp/back/666-archipelago.json
index bc4abf95a6d..817696f70a1 100644
--- a/public/images/pokemon/exp/back/666-archipelago.json
+++ b/public/images/pokemon/exp/back/666-archipelago.json
@@ -1,104 +1,119 @@
-{
-	"textures": [
-		{
-			"image": "666-archipelago.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 136,
-				"h": 136
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 16,
-						"y": 1,
-						"w": 42,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 42,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 16,
-						"y": 1,
-						"w": 42,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 42,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 42,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 42,
-						"y": 68,
-						"w": 67,
-						"h": 68
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:223e2a75aa192f3fb67e18f7f0d6c4c7:ba854fe0d08f005e9aa52e55cdc7eb4e:80cdb6dd219378a41ccf5c2acc7e7786$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 2, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 209, "y": 2, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 71, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 71, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 140, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 124, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 2, "y": 71, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 6, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 124, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 140, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 71, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 71, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 209, "y": 2, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "666-archipelago.png",
+  "format": "I8",
+  "size": { "w": 262, "h": 140 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/666-archipelago.png b/public/images/pokemon/exp/back/666-archipelago.png
index 83622bd976f..f83b645e0fe 100644
Binary files a/public/images/pokemon/exp/back/666-archipelago.png and b/public/images/pokemon/exp/back/666-archipelago.png differ
diff --git a/public/images/pokemon/exp/back/666-continental.json b/public/images/pokemon/exp/back/666-continental.json
index d0cd7359c88..fc21deb6978 100644
--- a/public/images/pokemon/exp/back/666-continental.json
+++ b/public/images/pokemon/exp/back/666-continental.json
@@ -1,104 +1,119 @@
-{
-	"textures": [
-		{
-			"image": "666-continental.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 136,
-				"h": 136
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 13,
-						"y": 1,
-						"w": 46,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 46,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 13,
-						"y": 1,
-						"w": 46,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 46,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 46,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 46,
-						"y": 68,
-						"w": 67,
-						"h": 68
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:89725e18f2e4d97217076ac82b40230b:c83c3d03ad1200fc71d95ecafb54bc03:23aaac2256d564b9d8a58d7de70397c3$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 2, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 209, "y": 2, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 71, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 71, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 140, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 124, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 2, "y": 71, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 6, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 124, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 140, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 71, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 71, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 209, "y": 2, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "666-continental.png",
+  "format": "I8",
+  "size": { "w": 262, "h": 140 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/666-continental.png b/public/images/pokemon/exp/back/666-continental.png
index 21447191338..f1a4cf5a2a4 100644
Binary files a/public/images/pokemon/exp/back/666-continental.png and b/public/images/pokemon/exp/back/666-continental.png differ
diff --git a/public/images/pokemon/exp/back/666-elegant.json b/public/images/pokemon/exp/back/666-elegant.json
index c44ea10f7dd..35c20315153 100644
--- a/public/images/pokemon/exp/back/666-elegant.json
+++ b/public/images/pokemon/exp/back/666-elegant.json
@@ -1,104 +1,119 @@
-{
-	"textures": [
-		{
-			"image": "666-elegant.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 136,
-				"h": 136
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 15,
-						"y": 1,
-						"w": 44,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 44,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 15,
-						"y": 1,
-						"w": 44,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 44,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 44,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 44,
-						"y": 68,
-						"w": 67,
-						"h": 68
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:bbba66d69955866664e782205a4af88d:66e99814147be780756a4d4ccd8b31dc:d6b035048c66474f6236a3bc923faa7b$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 2, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 209, "y": 2, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 71, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 71, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 140, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 124, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 2, "y": 71, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 6, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 124, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 140, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 71, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 71, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 209, "y": 2, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "666-elegant.png",
+  "format": "I8",
+  "size": { "w": 262, "h": 140 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/666-elegant.png b/public/images/pokemon/exp/back/666-elegant.png
index 3187d681140..2a75c09b505 100644
Binary files a/public/images/pokemon/exp/back/666-elegant.png and b/public/images/pokemon/exp/back/666-elegant.png differ
diff --git a/public/images/pokemon/exp/back/666-fancy.json b/public/images/pokemon/exp/back/666-fancy.json
index 657c29e99ee..54113df4b51 100644
--- a/public/images/pokemon/exp/back/666-fancy.json
+++ b/public/images/pokemon/exp/back/666-fancy.json
@@ -1,104 +1,119 @@
-{
-	"textures": [
-		{
-			"image": "666-fancy.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 137,
-				"h": 137
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 15,
-						"y": 1,
-						"w": 43,
-						"h": 69
-					},
-					"frame": {
-						"x": 67,
-						"y": 0,
-						"w": 43,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 15,
-						"y": 1,
-						"w": 43,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 68,
-						"w": 43,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 43,
-						"y": 69,
-						"w": 67,
-						"h": 68
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:570d1bf9b987c1bf5ebfe39e485464dd:a3c8bebd39c1c84b1bf0fdf600026ea5:6d5edff9a806f43feff031c9919c9aca$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 2, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 209, "y": 2, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 71, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 71, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 140, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 124, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 2, "y": 71, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 6, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 124, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 140, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 71, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 71, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 209, "y": 2, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "666-fancy.png",
+  "format": "I8",
+  "size": { "w": 262, "h": 140 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/666-fancy.png b/public/images/pokemon/exp/back/666-fancy.png
index 9f9f9c42e80..f7da62d0637 100644
Binary files a/public/images/pokemon/exp/back/666-fancy.png and b/public/images/pokemon/exp/back/666-fancy.png differ
diff --git a/public/images/pokemon/exp/back/666-garden.json b/public/images/pokemon/exp/back/666-garden.json
index 763dd125a5c..4fcc5ab0ad1 100644
--- a/public/images/pokemon/exp/back/666-garden.json
+++ b/public/images/pokemon/exp/back/666-garden.json
@@ -1,104 +1,119 @@
-{
-	"textures": [
-		{
-			"image": "666-garden.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 136,
-				"h": 136
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 16,
-						"y": 1,
-						"w": 42,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 42,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 16,
-						"y": 1,
-						"w": 42,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 42,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 42,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 42,
-						"y": 68,
-						"w": 67,
-						"h": 68
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:4b2ac69ef7a99f6cef35d3fd38c74d01:8a4c29615f3bf20e9c5d0bb372a5b210:f13a1a8fa0a411aa91fccb833ac8719c$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 2, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 209, "y": 2, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 71, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 71, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 140, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 124, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 2, "y": 71, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 6, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 124, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 140, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 71, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 71, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 209, "y": 2, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "666-garden.png",
+  "format": "I8",
+  "size": { "w": 262, "h": 140 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/666-garden.png b/public/images/pokemon/exp/back/666-garden.png
index 47a9a27e790..35e0dd02087 100644
Binary files a/public/images/pokemon/exp/back/666-garden.png and b/public/images/pokemon/exp/back/666-garden.png differ
diff --git a/public/images/pokemon/exp/back/666-high-plains.json b/public/images/pokemon/exp/back/666-high-plains.json
index 90101dd98ba..56a90a01899 100644
--- a/public/images/pokemon/exp/back/666-high-plains.json
+++ b/public/images/pokemon/exp/back/666-high-plains.json
@@ -1,104 +1,119 @@
-{
-	"textures": [
-		{
-			"image": "666-high-plains.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 137,
-				"h": 137
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 15,
-						"y": 1,
-						"w": 43,
-						"h": 69
-					},
-					"frame": {
-						"x": 67,
-						"y": 0,
-						"w": 43,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 15,
-						"y": 1,
-						"w": 43,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 68,
-						"w": 43,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 43,
-						"y": 69,
-						"w": 67,
-						"h": 68
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:410c759185f779797422e8f2ce55db4f:6afd0d04b6138fdd57d12681e967b48c:2abdb5d19b2754e3daa24b6ff3ed2c2c$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 2, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 209, "y": 2, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 71, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 71, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 140, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 124, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 2, "y": 71, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 6, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 124, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 140, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 71, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 71, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 209, "y": 2, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "666-high-plains.png",
+  "format": "I8",
+  "size": { "w": 262, "h": 140 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/666-high-plains.png b/public/images/pokemon/exp/back/666-high-plains.png
index 7b06fcc8040..7b84c4ebac3 100644
Binary files a/public/images/pokemon/exp/back/666-high-plains.png and b/public/images/pokemon/exp/back/666-high-plains.png differ
diff --git a/public/images/pokemon/exp/back/666-icy-snow.json b/public/images/pokemon/exp/back/666-icy-snow.json
index 17e6e3be8ef..b44f33bb07f 100644
--- a/public/images/pokemon/exp/back/666-icy-snow.json
+++ b/public/images/pokemon/exp/back/666-icy-snow.json
@@ -1,104 +1,119 @@
-{
-	"textures": [
-		{
-			"image": "666-icy-snow.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 136,
-				"h": 136
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 16,
-						"y": 1,
-						"w": 43,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 43,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 16,
-						"y": 1,
-						"w": 43,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 43,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 43,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 43,
-						"y": 68,
-						"w": 67,
-						"h": 68
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:9f47e6de00b727163c2ffb6870af9c6b:16bfd68007c3798294c7d690e075f679:fb1e8b97806dc5c60ac6adf0ae48199b$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 2, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 209, "y": 2, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 71, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 71, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 140, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 124, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 2, "y": 71, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 6, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 124, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 140, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 71, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 71, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 209, "y": 2, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "666-icy-snow.png",
+  "format": "I8",
+  "size": { "w": 262, "h": 140 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/666-icy-snow.png b/public/images/pokemon/exp/back/666-icy-snow.png
index b34659ded51..332e96a6d61 100644
Binary files a/public/images/pokemon/exp/back/666-icy-snow.png and b/public/images/pokemon/exp/back/666-icy-snow.png differ
diff --git a/public/images/pokemon/exp/back/666-jungle.json b/public/images/pokemon/exp/back/666-jungle.json
index b2ffdb768e6..51876d649da 100644
--- a/public/images/pokemon/exp/back/666-jungle.json
+++ b/public/images/pokemon/exp/back/666-jungle.json
@@ -1,104 +1,119 @@
-{
-	"textures": [
-		{
-			"image": "666-jungle.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 137,
-				"h": 137
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 16,
-						"y": 1,
-						"w": 43,
-						"h": 69
-					},
-					"frame": {
-						"x": 67,
-						"y": 0,
-						"w": 43,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 16,
-						"y": 1,
-						"w": 43,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 68,
-						"w": 43,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 43,
-						"y": 69,
-						"w": 67,
-						"h": 68
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:4d8913bd65ce0b63c5354717532a7d60:39392afb8d9fb30f37b8d68b6cd368ad:c8686bcc5493911384853d54c85bfea1$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 2, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 209, "y": 2, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 71, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 71, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 140, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 124, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 2, "y": 71, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 6, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 124, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 140, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 71, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 71, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 209, "y": 2, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "666-jungle.png",
+  "format": "I8",
+  "size": { "w": 262, "h": 140 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/666-jungle.png b/public/images/pokemon/exp/back/666-jungle.png
index 8e72fdd3af6..291c6bce18c 100644
Binary files a/public/images/pokemon/exp/back/666-jungle.png and b/public/images/pokemon/exp/back/666-jungle.png differ
diff --git a/public/images/pokemon/exp/back/666-marine.json b/public/images/pokemon/exp/back/666-marine.json
index 6f4be700dfc..18edbc78ec0 100644
--- a/public/images/pokemon/exp/back/666-marine.json
+++ b/public/images/pokemon/exp/back/666-marine.json
@@ -1,104 +1,119 @@
-{
-	"textures": [
-		{
-			"image": "666-marine.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 136,
-				"h": 136
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 16,
-						"y": 1,
-						"w": 42,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 42,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 16,
-						"y": 1,
-						"w": 42,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 42,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 42,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 42,
-						"y": 68,
-						"w": 67,
-						"h": 68
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:b061fec5d665439da49159647e0a7d71:7cac8aa51d4531fbcf0f9ea9bf644452:dc240f0acbf3d56fe8729dd1f703009f$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 2, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 209, "y": 2, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 71, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 71, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 140, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 124, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 2, "y": 71, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 6, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 124, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 140, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 71, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 71, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 209, "y": 2, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "666-marine.png",
+  "format": "RGBA8888",
+  "size": { "w": 262, "h": 140 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/666-marine.png b/public/images/pokemon/exp/back/666-marine.png
index 91c5b1be983..9e644f0cdaa 100644
Binary files a/public/images/pokemon/exp/back/666-marine.png and b/public/images/pokemon/exp/back/666-marine.png differ
diff --git a/public/images/pokemon/exp/back/666-meadow.json b/public/images/pokemon/exp/back/666-meadow.json
index 737ccd7c848..0f24040bd0d 100644
--- a/public/images/pokemon/exp/back/666-meadow.json
+++ b/public/images/pokemon/exp/back/666-meadow.json
@@ -1,524 +1,118 @@
-{
-	"textures": [
-		{
-			"image": "666-meadow.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 234,
-				"h": 234
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 78,
-						"h": 87
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 78,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 78,
-						"h": 87
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 78,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 78,
-						"h": 87
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 78,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 78,
-						"h": 87
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 78,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 3,
-						"w": 70,
-						"h": 87
-					},
-					"frame": {
-						"x": 0,
-						"y": 87,
-						"w": 70,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 3,
-						"w": 70,
-						"h": 87
-					},
-					"frame": {
-						"x": 0,
-						"y": 87,
-						"w": 70,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 3,
-						"w": 70,
-						"h": 87
-					},
-					"frame": {
-						"x": 0,
-						"y": 87,
-						"w": 70,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 3,
-						"w": 70,
-						"h": 87
-					},
-					"frame": {
-						"x": 0,
-						"y": 87,
-						"w": 70,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 11,
-						"y": 2,
-						"w": 63,
-						"h": 87
-					},
-					"frame": {
-						"x": 70,
-						"y": 87,
-						"w": 63,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 11,
-						"y": 2,
-						"w": 63,
-						"h": 87
-					},
-					"frame": {
-						"x": 70,
-						"y": 87,
-						"w": 63,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 11,
-						"y": 2,
-						"w": 63,
-						"h": 87
-					},
-					"frame": {
-						"x": 70,
-						"y": 87,
-						"w": 63,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 11,
-						"y": 2,
-						"w": 63,
-						"h": 87
-					},
-					"frame": {
-						"x": 70,
-						"y": 87,
-						"w": 63,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 14,
-						"y": 1,
-						"w": 57,
-						"h": 87
-					},
-					"frame": {
-						"x": 78,
-						"y": 0,
-						"w": 57,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 14,
-						"y": 1,
-						"w": 57,
-						"h": 87
-					},
-					"frame": {
-						"x": 78,
-						"y": 0,
-						"w": 57,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 14,
-						"y": 1,
-						"w": 57,
-						"h": 87
-					},
-					"frame": {
-						"x": 78,
-						"y": 0,
-						"w": 57,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 14,
-						"y": 1,
-						"w": 57,
-						"h": 87
-					},
-					"frame": {
-						"x": 78,
-						"y": 0,
-						"w": 57,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 84,
-						"h": 86
-					},
-					"frame": {
-						"x": 135,
-						"y": 0,
-						"w": 84,
-						"h": 86
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 84,
-						"h": 86
-					},
-					"frame": {
-						"x": 135,
-						"y": 0,
-						"w": 84,
-						"h": 86
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 17,
-						"y": 0,
-						"w": 52,
-						"h": 87
-					},
-					"frame": {
-						"x": 135,
-						"y": 86,
-						"w": 52,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 17,
-						"y": 0,
-						"w": 52,
-						"h": 87
-					},
-					"frame": {
-						"x": 135,
-						"y": 86,
-						"w": 52,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 17,
-						"y": 0,
-						"w": 52,
-						"h": 87
-					},
-					"frame": {
-						"x": 135,
-						"y": 86,
-						"w": 52,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 17,
-						"y": 0,
-						"w": 52,
-						"h": 87
-					},
-					"frame": {
-						"x": 135,
-						"y": 86,
-						"w": 52,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 20,
-						"y": 0,
-						"w": 47,
-						"h": 85
-					},
-					"frame": {
-						"x": 187,
-						"y": 86,
-						"w": 47,
-						"h": 85
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 20,
-						"y": 0,
-						"w": 47,
-						"h": 85
-					},
-					"frame": {
-						"x": 187,
-						"y": 86,
-						"w": 47,
-						"h": 85
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:49698fe6f96ff24d2fe1c7a365f79f1b:f15ccef05dfd7ebb03ac6c66ae05dcef:f8ac4807b4d6eef2256fa1b93e0f89ba$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 2, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 209, "y": 2, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 71, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 71, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 140, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 124, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 2, "y": 71, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 6, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 124, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 140, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 71, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 71, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 209, "y": 2, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "format": "I8",
+  "size": { "w": 262, "h": 140 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/666-meadow.png b/public/images/pokemon/exp/back/666-meadow.png
index d7d63b3098f..fabeb9730db 100644
Binary files a/public/images/pokemon/exp/back/666-meadow.png and b/public/images/pokemon/exp/back/666-meadow.png differ
diff --git a/public/images/pokemon/exp/back/666-modern.json b/public/images/pokemon/exp/back/666-modern.json
index a57b695d10b..e0a00da6d81 100644
--- a/public/images/pokemon/exp/back/666-modern.json
+++ b/public/images/pokemon/exp/back/666-modern.json
@@ -1,104 +1,119 @@
-{
-	"textures": [
-		{
-			"image": "666-modern.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 136,
-				"h": 136
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 16,
-						"y": 1,
-						"w": 42,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 42,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 16,
-						"y": 1,
-						"w": 42,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 42,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 42,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 42,
-						"y": 68,
-						"w": 67,
-						"h": 68
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:deb5b8b4295c15b4c8718bf2ed9791d1:bbe309a34a59a4e2f74eeba5769476f4:5fc0e8f9a0750c2f3cfb5d6e7eca0d45$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 2, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 209, "y": 2, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 71, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 71, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 140, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 124, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 2, "y": 71, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 6, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 124, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 140, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 71, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 71, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 209, "y": 2, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "666-modern.png",
+  "format": "I8",
+  "size": { "w": 262, "h": 140 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/666-modern.png b/public/images/pokemon/exp/back/666-modern.png
index 689876c3d6d..01a3981dd97 100644
Binary files a/public/images/pokemon/exp/back/666-modern.png and b/public/images/pokemon/exp/back/666-modern.png differ
diff --git a/public/images/pokemon/exp/back/666-monsoon.json b/public/images/pokemon/exp/back/666-monsoon.json
index 3afda85f798..117fad03b83 100644
--- a/public/images/pokemon/exp/back/666-monsoon.json
+++ b/public/images/pokemon/exp/back/666-monsoon.json
@@ -1,104 +1,119 @@
-{
-	"textures": [
-		{
-			"image": "666-monsoon.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 137,
-				"h": 137
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 16,
-						"y": 1,
-						"w": 42,
-						"h": 69
-					},
-					"frame": {
-						"x": 67,
-						"y": 0,
-						"w": 42,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 16,
-						"y": 1,
-						"w": 42,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 68,
-						"w": 42,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 42,
-						"y": 69,
-						"w": 67,
-						"h": 68
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:71a24b11bc54be921b67b4376d798e05:f5358aac113e1f7af7eddf984d9692b3:637bea52b465abfb8e5a576310b4dacc$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 2, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 209, "y": 2, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 71, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 71, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 140, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 124, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 2, "y": 71, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 6, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 124, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 140, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 71, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 71, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 209, "y": 2, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "666-monsoon.png",
+  "format": "I8",
+  "size": { "w": 262, "h": 140 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/666-monsoon.png b/public/images/pokemon/exp/back/666-monsoon.png
index e3cb4d2dca7..32cf2331411 100644
Binary files a/public/images/pokemon/exp/back/666-monsoon.png and b/public/images/pokemon/exp/back/666-monsoon.png differ
diff --git a/public/images/pokemon/exp/back/666-ocean.json b/public/images/pokemon/exp/back/666-ocean.json
index f0785703906..8d23d70cd31 100644
--- a/public/images/pokemon/exp/back/666-ocean.json
+++ b/public/images/pokemon/exp/back/666-ocean.json
@@ -1,104 +1,119 @@
-{
-	"textures": [
-		{
-			"image": "666-ocean.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 137,
-				"h": 137
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 15,
-						"y": 1,
-						"w": 43,
-						"h": 69
-					},
-					"frame": {
-						"x": 67,
-						"y": 0,
-						"w": 43,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 15,
-						"y": 1,
-						"w": 43,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 68,
-						"w": 43,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 43,
-						"y": 69,
-						"w": 67,
-						"h": 68
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:a1a0079c64e9d91336d227b1380cd9d2:cf159e4653ad9208c0f4633a498a6cd1:e7a0e68eab89c2013a3eb7f3b6fc0b33$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 2, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 209, "y": 2, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 71, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 71, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 140, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 124, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 2, "y": 71, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 6, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 124, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 140, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 71, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 71, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 209, "y": 2, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "666-ocean.png",
+  "format": "I8",
+  "size": { "w": 262, "h": 140 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/666-ocean.png b/public/images/pokemon/exp/back/666-ocean.png
index f60844a9b87..65665ea56c3 100644
Binary files a/public/images/pokemon/exp/back/666-ocean.png and b/public/images/pokemon/exp/back/666-ocean.png differ
diff --git a/public/images/pokemon/exp/back/666-poke-ball.json b/public/images/pokemon/exp/back/666-poke-ball.json
index ed04a06e7ab..45564e59a32 100644
--- a/public/images/pokemon/exp/back/666-poke-ball.json
+++ b/public/images/pokemon/exp/back/666-poke-ball.json
@@ -1,104 +1,119 @@
-{
-	"textures": [
-		{
-			"image": "666-poke-ball.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 137,
-				"h": 137
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 16,
-						"y": 1,
-						"w": 43,
-						"h": 69
-					},
-					"frame": {
-						"x": 67,
-						"y": 0,
-						"w": 43,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 16,
-						"y": 1,
-						"w": 43,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 68,
-						"w": 43,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 43,
-						"y": 69,
-						"w": 67,
-						"h": 68
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:e744396a3b647429d050d678017c05ce:ec812f719dffcd362f0481d7d83c3476:8ec14f129d1691b8da504a13b661abed$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 2, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 209, "y": 2, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 71, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 71, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 140, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 124, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 2, "y": 71, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 6, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 124, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 140, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 71, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 71, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 209, "y": 2, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "666-poke-ball.png",
+  "format": "I8",
+  "size": { "w": 262, "h": 140 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/666-poke-ball.png b/public/images/pokemon/exp/back/666-poke-ball.png
index eb3053e9434..895a2bf680f 100644
Binary files a/public/images/pokemon/exp/back/666-poke-ball.png and b/public/images/pokemon/exp/back/666-poke-ball.png differ
diff --git a/public/images/pokemon/exp/back/666-polar.json b/public/images/pokemon/exp/back/666-polar.json
index 4618d891d3f..abb6d0286f4 100644
--- a/public/images/pokemon/exp/back/666-polar.json
+++ b/public/images/pokemon/exp/back/666-polar.json
@@ -1,104 +1,119 @@
-{
-	"textures": [
-		{
-			"image": "666-polar.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 136,
-				"h": 136
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 14,
-						"y": 1,
-						"w": 45,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 45,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 14,
-						"y": 1,
-						"w": 45,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 45,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 45,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 45,
-						"y": 68,
-						"w": 67,
-						"h": 68
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:a3b0453f2d03b9c62472f57a438298a4:81a5a3455ae0c378bdb1dbe3c3323463:eb7086e98f867c6592e4b161835da18b$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 2, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 209, "y": 2, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 71, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 71, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 140, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 124, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 2, "y": 71, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 6, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 124, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 140, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 71, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 71, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 209, "y": 2, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "666-polar.png",
+  "format": "I8",
+  "size": { "w": 262, "h": 140 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/666-polar.png b/public/images/pokemon/exp/back/666-polar.png
index 5d09b57833c..c7ec3ec550a 100644
Binary files a/public/images/pokemon/exp/back/666-polar.png and b/public/images/pokemon/exp/back/666-polar.png differ
diff --git a/public/images/pokemon/exp/back/666-river.json b/public/images/pokemon/exp/back/666-river.json
index c4e5274ab6d..28912532d76 100644
--- a/public/images/pokemon/exp/back/666-river.json
+++ b/public/images/pokemon/exp/back/666-river.json
@@ -1,104 +1,119 @@
-{
-	"textures": [
-		{
-			"image": "666-river.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 136,
-				"h": 136
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 15,
-						"y": 1,
-						"w": 43,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 43,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 15,
-						"y": 1,
-						"w": 43,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 43,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 43,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 43,
-						"y": 68,
-						"w": 67,
-						"h": 68
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:2bb6d375761e6690eba12cf4d2bc99c9:9db30ec1cf68fe8c1026c243086573f3:fa23dc87fc53ba2cfa532cf440553cf5$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 2, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 209, "y": 2, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 71, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 71, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 140, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 124, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 2, "y": 71, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 6, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 124, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 140, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 71, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 71, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 209, "y": 2, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "666-river.png",
+  "format": "I8",
+  "size": { "w": 262, "h": 140 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/666-river.png b/public/images/pokemon/exp/back/666-river.png
index 2910340b676..4e0493b8de5 100644
Binary files a/public/images/pokemon/exp/back/666-river.png and b/public/images/pokemon/exp/back/666-river.png differ
diff --git a/public/images/pokemon/exp/back/666-sandstorm.json b/public/images/pokemon/exp/back/666-sandstorm.json
index cc96c2a2805..99df25242ff 100644
--- a/public/images/pokemon/exp/back/666-sandstorm.json
+++ b/public/images/pokemon/exp/back/666-sandstorm.json
@@ -1,104 +1,119 @@
-{
-	"textures": [
-		{
-			"image": "666-sandstorm.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 136,
-				"h": 136
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 0,
-						"y": 68,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 17,
-						"y": 2,
-						"w": 40,
-						"h": 68
-					},
-					"frame": {
-						"x": 67,
-						"y": 0,
-						"w": 40,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 17,
-						"y": 2,
-						"w": 40,
-						"h": 68
-					},
-					"frame": {
-						"x": 67,
-						"y": 68,
-						"w": 40,
-						"h": 68
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:e35abed8cd9d0bbf1556fa684995d930:8d765a06a769bbf3d1639f361548cd6f:12f47e779927411662912d6094a9782d$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 2, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 209, "y": 2, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 71, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 71, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 140, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 124, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 2, "y": 71, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 6, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 124, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 140, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 71, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 71, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 209, "y": 2, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "666-sandstorm.png",
+  "format": "I8",
+  "size": { "w": 262, "h": 140 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/666-sandstorm.png b/public/images/pokemon/exp/back/666-sandstorm.png
index 96d7084eb30..d95ab4413a5 100644
Binary files a/public/images/pokemon/exp/back/666-sandstorm.png and b/public/images/pokemon/exp/back/666-sandstorm.png differ
diff --git a/public/images/pokemon/exp/back/666-savanna.json b/public/images/pokemon/exp/back/666-savanna.json
index 8f85dfdeb13..8fa326da1b4 100644
--- a/public/images/pokemon/exp/back/666-savanna.json
+++ b/public/images/pokemon/exp/back/666-savanna.json
@@ -1,104 +1,119 @@
-{
-	"textures": [
-		{
-			"image": "666-savanna.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 137,
-				"h": 137
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 16,
-						"y": 1,
-						"w": 43,
-						"h": 69
-					},
-					"frame": {
-						"x": 67,
-						"y": 0,
-						"w": 43,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 16,
-						"y": 1,
-						"w": 43,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 68,
-						"w": 43,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 43,
-						"y": 69,
-						"w": 67,
-						"h": 68
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:1ad0c7c841409c3fd4cb50b399d6e13c:b9406b41d37bc72c57260f9a01a352c8:625a4f0dc001069326a75c6a381f93e6$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 2, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 209, "y": 2, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 71, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 71, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 140, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 124, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 2, "y": 71, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 6, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 124, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 140, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 71, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 71, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 209, "y": 2, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "666-savanna.png",
+  "format": "I8",
+  "size": { "w": 262, "h": 140 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/666-savanna.png b/public/images/pokemon/exp/back/666-savanna.png
index 7254d0f1f61..4169b1325a6 100644
Binary files a/public/images/pokemon/exp/back/666-savanna.png and b/public/images/pokemon/exp/back/666-savanna.png differ
diff --git a/public/images/pokemon/exp/back/666-sun.json b/public/images/pokemon/exp/back/666-sun.json
index df795f0ef0c..d41f22f541c 100644
--- a/public/images/pokemon/exp/back/666-sun.json
+++ b/public/images/pokemon/exp/back/666-sun.json
@@ -1,104 +1,119 @@
-{
-	"textures": [
-		{
-			"image": "666-sun.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 137,
-				"h": 137
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 15,
-						"y": 1,
-						"w": 43,
-						"h": 69
-					},
-					"frame": {
-						"x": 67,
-						"y": 0,
-						"w": 43,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 15,
-						"y": 1,
-						"w": 43,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 68,
-						"w": 43,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 43,
-						"y": 69,
-						"w": 67,
-						"h": 68
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:1d3a140bac5951725915aa0b64d1fdc6:e322510cf8386dcc7834a05d57e5368e:8f5fdd0a698701f5391c5a3f67e303d6$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 2, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 209, "y": 2, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 71, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 71, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 140, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 124, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 2, "y": 71, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 6, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 124, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 140, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 71, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 71, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 209, "y": 2, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "666-sun.png",
+  "format": "I8",
+  "size": { "w": 262, "h": 140 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/666-sun.png b/public/images/pokemon/exp/back/666-sun.png
index 84b9d76ef88..5cc814e82d7 100644
Binary files a/public/images/pokemon/exp/back/666-sun.png and b/public/images/pokemon/exp/back/666-sun.png differ
diff --git a/public/images/pokemon/exp/back/666-tundra.json b/public/images/pokemon/exp/back/666-tundra.json
index 92e5cf92e07..afa574f9e07 100644
--- a/public/images/pokemon/exp/back/666-tundra.json
+++ b/public/images/pokemon/exp/back/666-tundra.json
@@ -1,104 +1,119 @@
-{
-	"textures": [
-		{
-			"image": "666-tundra.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 136,
-				"h": 136
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 13,
-						"y": 1,
-						"w": 46,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 46,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 13,
-						"y": 1,
-						"w": 46,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 46,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 46,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 46,
-						"y": 68,
-						"w": 67,
-						"h": 68
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:40f74f8757cb0f5a2ab7b5f68ea979a0:d062f67571674668b47f6fab68361105:9779ed3adebc298af537dd64dc25fe00$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 2, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 209, "y": 2, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 71, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 71, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 140, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 124, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 2, "y": 71, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 6, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 124, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 140, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 71, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 71, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 209, "y": 2, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "666-tundra.png",
+  "format": "I8",
+  "size": { "w": 262, "h": 140 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/666-tundra.png b/public/images/pokemon/exp/back/666-tundra.png
index 393ea113766..01657b339fd 100644
Binary files a/public/images/pokemon/exp/back/666-tundra.png and b/public/images/pokemon/exp/back/666-tundra.png differ
diff --git a/public/images/pokemon/exp/back/667.json b/public/images/pokemon/exp/back/667.json
index cfe6b109d70..db9918ea230 100644
--- a/public/images/pokemon/exp/back/667.json
+++ b/public/images/pokemon/exp/back/667.json
@@ -1,125 +1,659 @@
-{
-	"textures": [
-		{
-			"image": "667.png", 
-			"format": "RGBA8888", 
-			"size": {
-				"w": 115, 
-				"h": 115
-			}, 
-			"scale": 1, 
-			"frames": [
-				{
-					"filename": "0001.png", 
-					"rotated": false, 
-					"trimmed": false, 
-					"sourceSize": {
-						"w": 39, 
-						"h": 42
-					}, 
-					"spriteSourceSize": {
-						"x": 0, 
-						"y": 0, 
-						"w": 39, 
-						"h": 42
-					}, 
-					"frame": {
-						"x": 0, 
-						"y": 0, 
-						"w": 39, 
-						"h": 42
-					}
-				}, 
-				{
-					"filename": "0002.png", 
-					"rotated": false, 
-					"trimmed": false, 
-					"sourceSize": {
-						"w": 39, 
-						"h": 42
-					}, 
-					"spriteSourceSize": {
-						"x": 0, 
-						"y": 0, 
-						"w": 39, 
-						"h": 42
-					}, 
-					"frame": {
-						"x": 0, 
-						"y": 42, 
-						"w": 39, 
-						"h": 42
-					}
-				}, 
-				{
-					"filename": "0003.png", 
-					"rotated": false, 
-					"trimmed": true, 
-					"sourceSize": {
-						"w": 39, 
-						"h": 42
-					}, 
-					"spriteSourceSize": {
-						"x": 0, 
-						"y": 1, 
-						"w": 39, 
-						"h": 41
-					}, 
-					"frame": {
-						"x": 39, 
-						"y": 0, 
-						"w": 39, 
-						"h": 41
-					}
-				}, 
-				{
-					"filename": "0004.png", 
-					"rotated": false, 
-					"trimmed": true, 
-					"sourceSize": {
-						"w": 39, 
-						"h": 42
-					}, 
-					"spriteSourceSize": {
-						"x": 1, 
-						"y": 0, 
-						"w": 38, 
-						"h": 42
-					}, 
-					"frame": {
-						"x": 39, 
-						"y": 41, 
-						"w": 38, 
-						"h": 42
-					}
-				}, 
-				{
-					"filename": "0005.png", 
-					"rotated": false, 
-					"trimmed": true, 
-					"sourceSize": {
-						"w": 39, 
-						"h": 42
-					}, 
-					"spriteSourceSize": {
-						"x": 1, 
-						"y": 0, 
-						"w": 38, 
-						"h": 42
-					}, 
-					"frame": {
-						"x": 77, 
-						"y": 41, 
-						"w": 38, 
-						"h": 42
-					}
-				}
-			]
-		}
-	], 
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker", 
-		"version": "3.0", 
-		"smartupdate": "$TexturePacker:SmartUpdate:0515d906bdf1ec3ad533ac13c4e701ec:195a93073ecc7446c747c2e79ae07d54:02171d511e760c8a3e1b623ad6bf93f5$"
-	}
-}
\ No newline at end of file
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 127, "y": 0, "w": 40, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 40, "h": 46 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 127, "y": 47, "w": 39, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 39, "h": 46 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 85, "y": 48, "w": 39, "h": 45 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 39, "h": 45 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 40, "y": 94, "w": 38, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 38, "h": 44 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 79, "y": 94, "w": 38, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 38, "h": 43 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 118, "y": 94, "w": 38, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 38, "h": 43 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 40, "y": 49, "w": 39, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 39, "h": 44 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 0, "y": 49, "w": 39, "h": 45 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 39, "h": 45 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 127, "y": 0, "w": 40, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 40, "h": 46 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 127, "y": 0, "w": 40, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 40, "h": 46 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 127, "y": 47, "w": 39, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 39, "h": 46 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 85, "y": 48, "w": 39, "h": 45 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 39, "h": 45 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 40, "y": 94, "w": 38, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 38, "h": 44 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 79, "y": 94, "w": 38, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 38, "h": 43 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 118, "y": 94, "w": 38, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 38, "h": 43 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 40, "y": 49, "w": 39, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 39, "h": 44 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 0, "y": 49, "w": 39, "h": 45 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 39, "h": 45 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 127, "y": 0, "w": 40, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 40, "h": 46 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 127, "y": 0, "w": 40, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 40, "h": 46 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 127, "y": 47, "w": 39, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 39, "h": 46 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 85, "y": 48, "w": 39, "h": 45 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 39, "h": 45 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 40, "y": 94, "w": 38, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 38, "h": 44 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 79, "y": 94, "w": 38, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 38, "h": 43 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 118, "y": 94, "w": 38, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 38, "h": 43 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 40, "y": 49, "w": 39, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 39, "h": 44 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 0, "y": 49, "w": 39, "h": 45 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 39, "h": 45 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 127, "y": 0, "w": 40, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 40, "h": 46 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 127, "y": 0, "w": 40, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 40, "h": 46 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 127, "y": 47, "w": 39, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 39, "h": 46 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 85, "y": 48, "w": 39, "h": 45 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 39, "h": 45 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 40, "y": 94, "w": 38, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 38, "h": 44 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 79, "y": 94, "w": 38, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 38, "h": 43 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 118, "y": 94, "w": 38, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 38, "h": 43 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 40, "y": 49, "w": 39, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 39, "h": 44 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 0, "y": 49, "w": 39, "h": 45 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 39, "h": 45 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 127, "y": 0, "w": 40, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 40, "h": 46 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 127, "y": 0, "w": 40, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 40, "h": 46 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 127, "y": 47, "w": 39, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 39, "h": 46 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 85, "y": 48, "w": 39, "h": 45 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 39, "h": 45 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 40, "y": 94, "w": 38, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 38, "h": 44 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 79, "y": 94, "w": 38, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 38, "h": 43 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 118, "y": 94, "w": 38, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 38, "h": 43 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 40, "y": 49, "w": 39, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 39, "h": 44 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 0, "y": 49, "w": 39, "h": 45 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 39, "h": 45 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 127, "y": 0, "w": 40, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 40, "h": 46 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 127, "y": 0, "w": 40, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 40, "h": 46 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 127, "y": 47, "w": 39, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 39, "h": 46 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 85, "y": 48, "w": 39, "h": 45 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 39, "h": 45 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 40, "y": 94, "w": 38, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 38, "h": 44 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 79, "y": 94, "w": 38, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 38, "h": 43 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 118, "y": 94, "w": 38, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 38, "h": 43 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 40, "y": 49, "w": 39, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 39, "h": 44 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 0, "y": 49, "w": 39, "h": 45 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 39, "h": 45 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 127, "y": 0, "w": 40, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 40, "h": 46 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 127, "y": 0, "w": 40, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 40, "h": 46 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 85, "y": 0, "w": 41, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 41, "h": 47 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 0, "y": 0, "w": 42, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 42, "h": 48 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 43, "y": 0, "w": 41, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 41, "h": 48 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 0, "y": 0, "w": 42, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 42, "h": 48 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 43, "y": 0, "w": 41, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 41, "h": 48 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 0, "y": 0, "w": 42, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 42, "h": 48 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 43, "y": 0, "w": 41, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 41, "h": 48 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 0, "y": 0, "w": 42, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 42, "h": 48 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 43, "y": 0, "w": 41, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 41, "h": 48 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 0, "y": 0, "w": 42, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 42, "h": 48 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 43, "y": 0, "w": 41, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 41, "h": 48 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 0, "y": 0, "w": 42, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 42, "h": 48 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 43, "y": 0, "w": 41, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 41, "h": 48 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 0, "y": 0, "w": 42, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 42, "h": 48 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 43, "y": 0, "w": 41, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 41, "h": 48 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 85, "y": 0, "w": 41, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 41, "h": 47 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 127, "y": 0, "w": 40, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 40, "h": 46 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.11-x64",
+  "image": "667.png",
+  "format": "I8",
+  "size": { "w": 167, "h": 138 },
+  "scale": "1"
+ }
+}
diff --git a/public/images/pokemon/exp/back/667.png b/public/images/pokemon/exp/back/667.png
index ef7ea964737..f1209cf8e20 100644
Binary files a/public/images/pokemon/exp/back/667.png and b/public/images/pokemon/exp/back/667.png differ
diff --git a/public/images/pokemon/exp/back/668.json b/public/images/pokemon/exp/back/668.json
index 1e37573828e..594e69189dc 100644
--- a/public/images/pokemon/exp/back/668.json
+++ b/public/images/pokemon/exp/back/668.json
@@ -1,146 +1,821 @@
-{
-	"textures": [
-		{
-			"image": "668.png", 
-			"format": "RGBA8888", 
-			"size": {
-				"w": 146, 
-				"h": 146
-			}, 
-			"scale": 1, 
-			"frames": [
-				{
-					"filename": "0001.png", 
-					"rotated": false, 
-					"trimmed": false, 
-					"sourceSize": {
-						"w": 73, 
-						"h": 61
-					}, 
-					"spriteSourceSize": {
-						"x": 0, 
-						"y": 0, 
-						"w": 73, 
-						"h": 61
-					}, 
-					"frame": {
-						"x": 0, 
-						"y": 0, 
-						"w": 73, 
-						"h": 61
-					}
-				}, 
-				{
-					"filename": "0002.png", 
-					"rotated": false, 
-					"trimmed": false, 
-					"sourceSize": {
-						"w": 73, 
-						"h": 61
-					}, 
-					"spriteSourceSize": {
-						"x": 0, 
-						"y": 0, 
-						"w": 73, 
-						"h": 61
-					}, 
-					"frame": {
-						"x": 73, 
-						"y": 0, 
-						"w": 73, 
-						"h": 61
-					}
-				}, 
-				{
-					"filename": "0006.png", 
-					"rotated": false, 
-					"trimmed": false, 
-					"sourceSize": {
-						"w": 73, 
-						"h": 61
-					}, 
-					"spriteSourceSize": {
-						"x": 0, 
-						"y": 0, 
-						"w": 73, 
-						"h": 61
-					}, 
-					"frame": {
-						"x": 73, 
-						"y": 0, 
-						"w": 73, 
-						"h": 61
-					}
-				}, 
-				{
-					"filename": "0003.png", 
-					"rotated": false, 
-					"trimmed": true, 
-					"sourceSize": {
-						"w": 73, 
-						"h": 61
-					}, 
-					"spriteSourceSize": {
-						"x": 0, 
-						"y": 1, 
-						"w": 73, 
-						"h": 60
-					}, 
-					"frame": {
-						"x": 0, 
-						"y": 61, 
-						"w": 73, 
-						"h": 60
-					}
-				}, 
-				{
-					"filename": "0005.png", 
-					"rotated": false, 
-					"trimmed": true, 
-					"sourceSize": {
-						"w": 73, 
-						"h": 61
-					}, 
-					"spriteSourceSize": {
-						"x": 0, 
-						"y": 1, 
-						"w": 73, 
-						"h": 60
-					}, 
-					"frame": {
-						"x": 0, 
-						"y": 61, 
-						"w": 73, 
-						"h": 60
-					}
-				}, 
-				{
-					"filename": "0004.png", 
-					"rotated": false, 
-					"trimmed": true, 
-					"sourceSize": {
-						"w": 73, 
-						"h": 61
-					}, 
-					"spriteSourceSize": {
-						"x": 1, 
-						"y": 2, 
-						"w": 72, 
-						"h": 59
-					}, 
-					"frame": {
-						"x": 73, 
-						"y": 61, 
-						"w": 72, 
-						"h": 59
-					}
-				}
-			]
-		}
-	], 
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker", 
-		"version": "3.0", 
-		"smartupdate": "$TexturePacker:SmartUpdate:bc67ee0b37e5c8a13762178a52fad862:1ee199920770bc5797feb94424ff9f9a:947bf84d1af493c62e2cef45bb6c19ad$"
-	}
-}
\ No newline at end of file
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 152, "y": 292, "w": 74, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 74, "h": 71 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 303, "y": 221, "w": 74, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 74, "h": 71 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 383, "y": 147, "w": 75, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 75, "h": 72 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 233, "y": 74, "w": 76, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 76, "h": 72 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 459, "y": 147, "w": 75, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 75, "h": 72 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 315, "y": 0, "w": 76, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 76, "h": 73 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 387, "y": 74, "w": 76, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 76, "h": 72 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 392, "y": 0, "w": 75, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 75, "h": 73 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 237, "y": 0, "w": 77, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 77, "h": 73 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 0, "y": 0, "w": 78, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 78, "h": 74 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 79, "y": 0, "w": 78, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 78, "h": 73 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 158, "y": 0, "w": 78, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 78, "h": 73 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 0, "y": 75, "w": 76, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 76, "h": 72 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 458, "y": 220, "w": 75, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 75, "h": 71 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 150, "y": 364, "w": 73, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 73, "h": 71 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 152, "y": 292, "w": 74, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 74, "h": 71 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 303, "y": 221, "w": 74, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 74, "h": 71 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 383, "y": 147, "w": 75, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 75, "h": 72 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 233, "y": 74, "w": 76, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 76, "h": 72 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 459, "y": 147, "w": 75, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 75, "h": 72 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 315, "y": 0, "w": 76, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 76, "h": 73 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 387, "y": 74, "w": 76, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 76, "h": 72 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 392, "y": 0, "w": 75, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 75, "h": 73 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 237, "y": 0, "w": 77, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 77, "h": 73 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 0, "y": 0, "w": 78, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 78, "h": 74 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 79, "y": 0, "w": 78, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 78, "h": 73 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 158, "y": 0, "w": 78, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 78, "h": 73 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 0, "y": 75, "w": 76, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 76, "h": 72 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 458, "y": 220, "w": 75, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 75, "h": 71 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 150, "y": 364, "w": 73, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 73, "h": 71 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 152, "y": 292, "w": 74, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 74, "h": 71 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 303, "y": 221, "w": 74, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 74, "h": 71 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 383, "y": 147, "w": 75, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 75, "h": 72 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 233, "y": 74, "w": 76, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 76, "h": 72 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 459, "y": 147, "w": 75, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 75, "h": 72 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 315, "y": 0, "w": 76, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 76, "h": 73 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 387, "y": 74, "w": 76, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 76, "h": 72 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 392, "y": 0, "w": 75, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 75, "h": 73 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 237, "y": 0, "w": 77, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 77, "h": 73 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 0, "y": 0, "w": 78, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 78, "h": 74 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 79, "y": 0, "w": 78, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 78, "h": 73 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 158, "y": 0, "w": 78, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 78, "h": 73 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 0, "y": 75, "w": 76, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 76, "h": 72 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 458, "y": 220, "w": 75, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 75, "h": 71 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 150, "y": 364, "w": 73, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 73, "h": 71 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 152, "y": 292, "w": 74, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 74, "h": 71 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 303, "y": 221, "w": 74, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 74, "h": 71 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 383, "y": 147, "w": 75, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 75, "h": 72 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 233, "y": 74, "w": 76, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 76, "h": 72 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 459, "y": 147, "w": 75, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 75, "h": 72 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 315, "y": 0, "w": 76, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 76, "h": 73 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 387, "y": 74, "w": 76, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 76, "h": 72 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 392, "y": 0, "w": 75, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 75, "h": 73 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 237, "y": 0, "w": 77, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 77, "h": 73 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 0, "y": 0, "w": 78, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 78, "h": 74 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 79, "y": 0, "w": 78, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 78, "h": 73 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 158, "y": 0, "w": 78, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 78, "h": 73 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 0, "y": 75, "w": 76, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 76, "h": 72 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 458, "y": 220, "w": 75, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 75, "h": 71 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 150, "y": 364, "w": 73, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 73, "h": 71 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 152, "y": 292, "w": 74, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 74, "h": 71 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 458, "y": 292, "w": 74, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 74, "h": 71 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 303, "y": 364, "w": 74, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 74, "h": 70 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 227, "y": 294, "w": 75, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 75, "h": 70 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 378, "y": 364, "w": 75, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 75, "h": 69 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 303, "y": 293, "w": 75, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 75, "h": 70 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 379, "y": 293, "w": 75, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 75, "h": 70 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 454, "y": 364, "w": 72, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 72, "h": 71 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 70, "y": 365, "w": 68, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 3, "w": 68, "h": 71 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 291, "y": 435, "w": 62, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 17, "y": 2, "w": 62, "h": 72 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 378, "y": 434, "w": 63, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 2, "w": 63, "h": 72 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 224, "y": 365, "w": 66, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 2, "w": 66, "h": 72 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 0, "y": 365, "w": 69, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 2, "w": 69, "h": 72 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 229, "y": 220, "w": 73, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 1, "w": 73, "h": 73 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 468, "y": 0, "w": 75, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 75, "h": 73 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 308, "y": 147, "w": 74, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 74, "h": 73 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 0, "y": 148, "w": 75, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 75, "h": 72 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 383, "y": 220, "w": 74, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 74, "h": 72 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 231, "y": 147, "w": 76, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 76, "h": 72 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 79, "y": 74, "w": 76, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 76, "h": 72 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 156, "y": 74, "w": 76, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 76, "h": 72 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 310, "y": 74, "w": 76, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 76, "h": 72 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 464, "y": 74, "w": 76, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 76, "h": 72 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 77, "y": 147, "w": 76, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 76, "h": 72 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 154, "y": 147, "w": 76, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 76, "h": 72 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 76, "y": 220, "w": 75, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 75, "h": 72 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 152, "y": 220, "w": 76, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 76, "h": 71 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0088.png",
+    "frame": { "x": 0, "y": 221, "w": 75, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 75, "h": 71 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0089.png",
+    "frame": { "x": 0, "y": 293, "w": 74, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 74, "h": 71 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0090.png",
+    "frame": { "x": 75, "y": 293, "w": 74, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 74, "h": 71 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.11-x64",
+  "image": "668.png",
+  "format": "I8",
+  "size": { "w": 543, "h": 507 },
+  "scale": "1"
+ }
+}
diff --git a/public/images/pokemon/exp/back/668.png b/public/images/pokemon/exp/back/668.png
index a8384e5cf3c..e600e3e40e1 100644
Binary files a/public/images/pokemon/exp/back/668.png and b/public/images/pokemon/exp/back/668.png differ
diff --git a/public/images/pokemon/exp/back/672.json b/public/images/pokemon/exp/back/672.json
index e323b585879..f877b9abc2e 100644
--- a/public/images/pokemon/exp/back/672.json
+++ b/public/images/pokemon/exp/back/672.json
@@ -1,965 +1,479 @@
-{
-	"textures": [
-		{
-			"image": "672.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 282,
-				"h": 282
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 42
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 42
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 42
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 42
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 42
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 42
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0045.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 42
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 42
-					},
-					"frame": {
-						"x": 0,
-						"y": 42,
-						"w": 41,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 42
-					},
-					"frame": {
-						"x": 0,
-						"y": 42,
-						"w": 41,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 42
-					},
-					"frame": {
-						"x": 0,
-						"y": 84,
-						"w": 41,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 42
-					},
-					"frame": {
-						"x": 0,
-						"y": 126,
-						"w": 41,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 42
-					},
-					"frame": {
-						"x": 0,
-						"y": 168,
-						"w": 41,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 42
-					},
-					"frame": {
-						"x": 0,
-						"y": 210,
-						"w": 41,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 42
-					},
-					"frame": {
-						"x": 41,
-						"y": 0,
-						"w": 41,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 42
-					},
-					"frame": {
-						"x": 82,
-						"y": 0,
-						"w": 41,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0025.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 42
-					},
-					"frame": {
-						"x": 123,
-						"y": 0,
-						"w": 41,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0026.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 42
-					},
-					"frame": {
-						"x": 164,
-						"y": 0,
-						"w": 41,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0027.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 42
-					},
-					"frame": {
-						"x": 205,
-						"y": 0,
-						"w": 41,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0042.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 42
-					},
-					"frame": {
-						"x": 41,
-						"y": 42,
-						"w": 41,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0043.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 42
-					},
-					"frame": {
-						"x": 41,
-						"y": 84,
-						"w": 41,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0044.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 42
-					},
-					"frame": {
-						"x": 41,
-						"y": 126,
-						"w": 41,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 41,
-						"h": 41
-					},
-					"frame": {
-						"x": 41,
-						"y": 168,
-						"w": 41,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 41,
-						"h": 41
-					},
-					"frame": {
-						"x": 41,
-						"y": 209,
-						"w": 41,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 41,
-						"h": 41
-					},
-					"frame": {
-						"x": 82,
-						"y": 42,
-						"w": 41,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 41,
-						"h": 41
-					},
-					"frame": {
-						"x": 123,
-						"y": 42,
-						"w": 41,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 41,
-						"h": 41
-					},
-					"frame": {
-						"x": 164,
-						"y": 42,
-						"w": 41,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 41,
-						"h": 41
-					},
-					"frame": {
-						"x": 205,
-						"y": 42,
-						"w": 41,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0028.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 41,
-						"h": 41
-					},
-					"frame": {
-						"x": 82,
-						"y": 83,
-						"w": 41,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0029.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 41,
-						"h": 41
-					},
-					"frame": {
-						"x": 82,
-						"y": 124,
-						"w": 41,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0040.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 40,
-						"h": 42
-					},
-					"frame": {
-						"x": 82,
-						"y": 165,
-						"w": 40,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0041.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 40,
-						"h": 42
-					},
-					"frame": {
-						"x": 82,
-						"y": 207,
-						"w": 40,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 40,
-						"h": 41
-					},
-					"frame": {
-						"x": 122,
-						"y": 165,
-						"w": 40,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 40,
-						"h": 41
-					},
-					"frame": {
-						"x": 122,
-						"y": 206,
-						"w": 40,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 40,
-						"h": 41
-					},
-					"frame": {
-						"x": 123,
-						"y": 83,
-						"w": 40,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 40,
-						"h": 41
-					},
-					"frame": {
-						"x": 123,
-						"y": 124,
-						"w": 40,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0037.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 40,
-						"h": 41
-					},
-					"frame": {
-						"x": 162,
-						"y": 165,
-						"w": 40,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0038.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 40,
-						"h": 41
-					},
-					"frame": {
-						"x": 162,
-						"y": 206,
-						"w": 40,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0039.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 40,
-						"h": 41
-					},
-					"frame": {
-						"x": 163,
-						"y": 83,
-						"w": 40,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0030.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 41,
-						"h": 40
-					},
-					"frame": {
-						"x": 163,
-						"y": 124,
-						"w": 41,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0031.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 41,
-						"h": 40
-					},
-					"frame": {
-						"x": 203,
-						"y": 83,
-						"w": 41,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0032.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 40,
-						"h": 40
-					},
-					"frame": {
-						"x": 202,
-						"y": 164,
-						"w": 40,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0033.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 40,
-						"h": 40
-					},
-					"frame": {
-						"x": 204,
-						"y": 123,
-						"w": 40,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0034.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 40,
-						"h": 40
-					},
-					"frame": {
-						"x": 242,
-						"y": 163,
-						"w": 40,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0035.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 40,
-						"h": 40
-					},
-					"frame": {
-						"x": 242,
-						"y": 203,
-						"w": 40,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0036.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 40,
-						"h": 40
-					},
-					"frame": {
-						"x": 202,
-						"y": 204,
-						"w": 40,
-						"h": 40
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:b36f1de558a8fa8ac8b56a9ba43a0dfd:5fe84a3f522e543bfbbfe0837355266b:2e4767b7cd134fc0ab1bb6e9eee82bc7$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 120, "y": 0, "w": 40, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 8, "w": 40, "h": 50 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 118, "y": 97, "w": 40, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 9, "w": 40, "h": 49 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 41, "y": 98, "w": 40, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 10, "w": 40, "h": 48 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 78, "y": 0, "w": 42, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 10, "w": 42, "h": 48 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 118, "y": 50, "w": 42, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 11, "w": 42, "h": 47 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 0, "y": 56, "w": 41, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 10, "w": 41, "h": 48 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 0, "y": 104, "w": 40, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 10, "w": 40, "h": 48 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 40, "y": 146, "w": 39, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 9, "w": 39, "h": 49 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 78, "y": 48, "w": 40, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 8, "w": 40, "h": 50 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 120, "y": 0, "w": 40, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 8, "w": 40, "h": 50 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 120, "y": 0, "w": 40, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 8, "w": 40, "h": 50 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 118, "y": 97, "w": 40, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 9, "w": 40, "h": 49 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 41, "y": 98, "w": 40, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 10, "w": 40, "h": 48 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 78, "y": 0, "w": 42, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 10, "w": 42, "h": 48 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 118, "y": 50, "w": 42, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 11, "w": 42, "h": 47 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 0, "y": 56, "w": 41, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 10, "w": 41, "h": 48 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 0, "y": 104, "w": 40, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 10, "w": 40, "h": 48 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 40, "y": 146, "w": 39, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 9, "w": 39, "h": 49 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 78, "y": 48, "w": 40, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 8, "w": 40, "h": 50 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 120, "y": 0, "w": 40, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 8, "w": 40, "h": 50 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 120, "y": 0, "w": 40, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 8, "w": 40, "h": 50 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 118, "y": 97, "w": 40, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 9, "w": 40, "h": 49 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 41, "y": 98, "w": 40, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 10, "w": 40, "h": 48 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 78, "y": 0, "w": 42, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 10, "w": 42, "h": 48 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 118, "y": 50, "w": 42, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 11, "w": 42, "h": 47 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 0, "y": 56, "w": 41, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 10, "w": 41, "h": 48 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 0, "y": 104, "w": 40, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 10, "w": 40, "h": 48 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 40, "y": 146, "w": 39, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 9, "w": 39, "h": 49 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 78, "y": 48, "w": 40, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 8, "w": 40, "h": 50 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 120, "y": 0, "w": 40, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 8, "w": 40, "h": 50 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 120, "y": 0, "w": 40, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 8, "w": 40, "h": 50 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 118, "y": 97, "w": 40, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 9, "w": 40, "h": 49 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 41, "y": 98, "w": 40, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 10, "w": 40, "h": 48 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 78, "y": 0, "w": 42, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 10, "w": 42, "h": 48 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 118, "y": 50, "w": 42, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 11, "w": 42, "h": 47 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 0, "y": 56, "w": 41, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 10, "w": 41, "h": 48 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 0, "y": 104, "w": 40, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 10, "w": 40, "h": 48 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 40, "y": 146, "w": 39, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 9, "w": 39, "h": 49 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 78, "y": 48, "w": 40, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 8, "w": 40, "h": 50 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 120, "y": 0, "w": 40, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 8, "w": 40, "h": 50 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 120, "y": 0, "w": 40, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 8, "w": 40, "h": 50 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 39, "y": 0, "w": 39, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 5, "w": 39, "h": 53 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 0, "y": 0, "w": 39, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 39, "h": 56 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 79, "y": 146, "w": 40, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 9, "w": 40, "h": 47 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 119, "y": 146, "w": 38, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 8, "w": 38, "h": 49 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 120, "y": 0, "w": 40, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 8, "w": 40, "h": 50 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 120, "y": 0, "w": 40, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 8, "w": 40, "h": 50 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 39, "y": 0, "w": 39, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 5, "w": 39, "h": 53 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 0, "y": 0, "w": 39, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 39, "h": 56 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 79, "y": 146, "w": 40, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 9, "w": 40, "h": 47 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 119, "y": 146, "w": 38, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 8, "w": 38, "h": 49 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 120, "y": 0, "w": 40, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 8, "w": 40, "h": 50 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.11-x64",
+  "image": "672.png",
+  "format": "I8",
+  "size": { "w": 160, "h": 195 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/672.png b/public/images/pokemon/exp/back/672.png
index 5281168ec2e..ef5cf63938e 100644
Binary files a/public/images/pokemon/exp/back/672.png and b/public/images/pokemon/exp/back/672.png differ
diff --git a/public/images/pokemon/exp/back/674.json b/public/images/pokemon/exp/back/674.json
deleted file mode 100644
index 9ace3fec70f..00000000000
--- a/public/images/pokemon/exp/back/674.json
+++ /dev/null
@@ -1,1175 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "674.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 124,
-				"h": 124
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0036.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 29,
-						"h": 42
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 29,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0050.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 29,
-						"h": 42
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 29,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0037.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 29,
-						"h": 42
-					},
-					"frame": {
-						"x": 29,
-						"y": 0,
-						"w": 29,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0043.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 29,
-						"h": 42
-					},
-					"frame": {
-						"x": 29,
-						"y": 0,
-						"w": 29,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0049.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 29,
-						"h": 42
-					},
-					"frame": {
-						"x": 29,
-						"y": 0,
-						"w": 29,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0038.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 29,
-						"h": 42
-					},
-					"frame": {
-						"x": 58,
-						"y": 0,
-						"w": 29,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0042.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 29,
-						"h": 42
-					},
-					"frame": {
-						"x": 58,
-						"y": 0,
-						"w": 29,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0044.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 29,
-						"h": 42
-					},
-					"frame": {
-						"x": 58,
-						"y": 0,
-						"w": 29,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0048.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 29,
-						"h": 42
-					},
-					"frame": {
-						"x": 58,
-						"y": 0,
-						"w": 29,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 28,
-						"h": 42
-					},
-					"frame": {
-						"x": 87,
-						"y": 0,
-						"w": 28,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 28,
-						"h": 42
-					},
-					"frame": {
-						"x": 87,
-						"y": 0,
-						"w": 28,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 28,
-						"h": 42
-					},
-					"frame": {
-						"x": 87,
-						"y": 0,
-						"w": 28,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 28,
-						"h": 42
-					},
-					"frame": {
-						"x": 87,
-						"y": 0,
-						"w": 28,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0025.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 28,
-						"h": 42
-					},
-					"frame": {
-						"x": 87,
-						"y": 0,
-						"w": 28,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0031.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 28,
-						"h": 42
-					},
-					"frame": {
-						"x": 87,
-						"y": 0,
-						"w": 28,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0055.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 28,
-						"h": 42
-					},
-					"frame": {
-						"x": 87,
-						"y": 0,
-						"w": 28,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0039.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 29,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 42,
-						"w": 29,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0041.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 29,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 42,
-						"w": 29,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0045.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 29,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 42,
-						"w": 29,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0047.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 29,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 42,
-						"w": 29,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0040.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 29,
-						"h": 40
-					},
-					"frame": {
-						"x": 29,
-						"y": 42,
-						"w": 29,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0046.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 29,
-						"h": 40
-					},
-					"frame": {
-						"x": 29,
-						"y": 42,
-						"w": 29,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 28,
-						"h": 42
-					},
-					"frame": {
-						"x": 58,
-						"y": 42,
-						"w": 28,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 28,
-						"h": 42
-					},
-					"frame": {
-						"x": 58,
-						"y": 42,
-						"w": 28,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 28,
-						"h": 42
-					},
-					"frame": {
-						"x": 58,
-						"y": 42,
-						"w": 28,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 28,
-						"h": 42
-					},
-					"frame": {
-						"x": 58,
-						"y": 42,
-						"w": 28,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 28,
-						"h": 42
-					},
-					"frame": {
-						"x": 58,
-						"y": 42,
-						"w": 28,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 28,
-						"h": 42
-					},
-					"frame": {
-						"x": 58,
-						"y": 42,
-						"w": 28,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 28,
-						"h": 42
-					},
-					"frame": {
-						"x": 58,
-						"y": 42,
-						"w": 28,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 28,
-						"h": 42
-					},
-					"frame": {
-						"x": 58,
-						"y": 42,
-						"w": 28,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0026.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 28,
-						"h": 42
-					},
-					"frame": {
-						"x": 58,
-						"y": 42,
-						"w": 28,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0030.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 28,
-						"h": 42
-					},
-					"frame": {
-						"x": 58,
-						"y": 42,
-						"w": 28,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0054.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 28,
-						"h": 42
-					},
-					"frame": {
-						"x": 58,
-						"y": 42,
-						"w": 28,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0032.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 28,
-						"h": 42
-					},
-					"frame": {
-						"x": 29,
-						"y": 82,
-						"w": 28,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 28,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 83,
-						"w": 28,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 28,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 83,
-						"w": 28,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 28,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 83,
-						"w": 28,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 28,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 83,
-						"w": 28,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 28,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 83,
-						"w": 28,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 28,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 83,
-						"w": 28,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 28,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 83,
-						"w": 28,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 28,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 83,
-						"w": 28,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0027.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 28,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 83,
-						"w": 28,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0029.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 28,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 83,
-						"w": 28,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0053.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 28,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 83,
-						"w": 28,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 28,
-						"h": 40
-					},
-					"frame": {
-						"x": 57,
-						"y": 84,
-						"w": 28,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 28,
-						"h": 40
-					},
-					"frame": {
-						"x": 57,
-						"y": 84,
-						"w": 28,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 28,
-						"h": 40
-					},
-					"frame": {
-						"x": 57,
-						"y": 84,
-						"w": 28,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 28,
-						"h": 40
-					},
-					"frame": {
-						"x": 57,
-						"y": 84,
-						"w": 28,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0028.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 28,
-						"h": 40
-					},
-					"frame": {
-						"x": 57,
-						"y": 84,
-						"w": 28,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0052.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 28,
-						"h": 40
-					},
-					"frame": {
-						"x": 57,
-						"y": 84,
-						"w": 28,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0034.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 28,
-						"h": 40
-					},
-					"frame": {
-						"x": 85,
-						"y": 84,
-						"w": 28,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0033.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 28,
-						"h": 41
-					},
-					"frame": {
-						"x": 86,
-						"y": 42,
-						"w": 28,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0035.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 28,
-						"h": 41
-					},
-					"frame": {
-						"x": 86,
-						"y": 42,
-						"w": 28,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0051.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 28,
-						"h": 41
-					},
-					"frame": {
-						"x": 86,
-						"y": 42,
-						"w": 28,
-						"h": 41
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:25c10f058ffdfacdf8263d7198233227:17e793a518166b0f2a1f8af6ec7b8dd7:b823d10f1c9b4d501296982088ba63d6$"
-	}
-}
diff --git a/public/images/pokemon/exp/back/674.png b/public/images/pokemon/exp/back/674.png
deleted file mode 100644
index 69d9e886150..00000000000
Binary files a/public/images/pokemon/exp/back/674.png and /dev/null differ
diff --git a/public/images/pokemon/exp/back/692.json b/public/images/pokemon/exp/back/692.json
index 41e845ef9ed..801710c4861 100644
--- a/public/images/pokemon/exp/back/692.json
+++ b/public/images/pokemon/exp/back/692.json
@@ -1,356 +1,794 @@
-{
-	"textures": [
-		{
-			"image": "692.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 152,
-				"h": 152
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 51,
-						"h": 39
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 51,
-						"h": 39
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 51,
-						"h": 39
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 51,
-						"h": 39
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 51,
-						"h": 39
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 51,
-						"h": 39
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 51,
-						"h": 39
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 51,
-						"h": 39
-					},
-					"frame": {
-						"x": 51,
-						"y": 0,
-						"w": 51,
-						"h": 39
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 51,
-						"h": 39
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 51,
-						"h": 39
-					},
-					"frame": {
-						"x": 51,
-						"y": 0,
-						"w": 51,
-						"h": 39
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 51,
-						"h": 39
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 51,
-						"h": 39
-					},
-					"frame": {
-						"x": 51,
-						"y": 0,
-						"w": 51,
-						"h": 39
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 51,
-						"h": 39
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 51,
-						"h": 39
-					},
-					"frame": {
-						"x": 51,
-						"y": 0,
-						"w": 51,
-						"h": 39
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 51,
-						"h": 39
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 51,
-						"h": 39
-					},
-					"frame": {
-						"x": 0,
-						"y": 39,
-						"w": 51,
-						"h": 39
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 51,
-						"h": 39
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 51,
-						"h": 39
-					},
-					"frame": {
-						"x": 0,
-						"y": 39,
-						"w": 51,
-						"h": 39
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 51,
-						"h": 39
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 51,
-						"h": 39
-					},
-					"frame": {
-						"x": 0,
-						"y": 39,
-						"w": 51,
-						"h": 39
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 51,
-						"h": 39
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 51,
-						"h": 39
-					},
-					"frame": {
-						"x": 0,
-						"y": 39,
-						"w": 51,
-						"h": 39
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 51,
-						"h": 39
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 51,
-						"h": 39
-					},
-					"frame": {
-						"x": 0,
-						"y": 78,
-						"w": 51,
-						"h": 39
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 51,
-						"h": 39
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 51,
-						"h": 39
-					},
-					"frame": {
-						"x": 0,
-						"y": 78,
-						"w": 51,
-						"h": 39
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 51,
-						"h": 39
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 51,
-						"h": 39
-					},
-					"frame": {
-						"x": 51,
-						"y": 39,
-						"w": 51,
-						"h": 39
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 51,
-						"h": 39
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 51,
-						"h": 39
-					},
-					"frame": {
-						"x": 51,
-						"y": 39,
-						"w": 51,
-						"h": 39
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 51,
-						"h": 39
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 51,
-						"h": 37
-					},
-					"frame": {
-						"x": 51,
-						"y": 78,
-						"w": 51,
-						"h": 37
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 51,
-						"h": 39
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 51,
-						"h": 37
-					},
-					"frame": {
-						"x": 51,
-						"y": 115,
-						"w": 51,
-						"h": 37
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:4116bfb3ff62a8dd3ed77070dfb17bc8:e9bdb93a4ed57d3e08db360998da889f:2880def858c84cd859bedf13b0b49a33$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 121, "y": 36, "w": 56, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 121, "y": 36, "w": 56, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 1, "y": 36, "w": 57, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 57, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 62, "y": 1, "w": 58, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 58, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 62, "y": 1, "w": 58, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 58, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 121, "y": 1, "w": 59, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 59, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 121, "y": 1, "w": 59, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 59, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 1, "y": 1, "w": 60, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 60, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 1, "y": 1, "w": 60, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 60, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 121, "y": 1, "w": 59, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 59, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 121, "y": 1, "w": 59, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 59, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 62, "y": 1, "w": 58, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 58, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 62, "y": 1, "w": 58, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 58, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 1, "y": 36, "w": 57, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 57, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 121, "y": 36, "w": 56, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 121, "y": 36, "w": 56, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 121, "y": 36, "w": 56, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 121, "y": 36, "w": 56, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 1, "y": 36, "w": 57, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 57, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 62, "y": 1, "w": 58, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 58, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 62, "y": 1, "w": 58, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 58, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 121, "y": 1, "w": 59, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 59, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 121, "y": 1, "w": 59, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 59, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 1, "y": 1, "w": 60, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 60, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 1, "y": 1, "w": 60, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 60, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 121, "y": 1, "w": 59, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 59, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 121, "y": 1, "w": 59, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 59, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 62, "y": 1, "w": 58, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 58, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 62, "y": 1, "w": 58, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 58, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 1, "y": 36, "w": 57, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 57, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 121, "y": 36, "w": 56, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 121, "y": 36, "w": 56, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 121, "y": 36, "w": 56, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 121, "y": 36, "w": 56, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 1, "y": 36, "w": 57, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 57, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 62, "y": 1, "w": 58, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 58, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 62, "y": 1, "w": 58, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 58, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 121, "y": 1, "w": 59, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 59, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 121, "y": 1, "w": 59, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 59, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 1, "y": 1, "w": 60, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 60, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 1, "y": 1, "w": 60, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 60, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 121, "y": 1, "w": 59, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 59, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 121, "y": 1, "w": 59, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 59, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 62, "y": 1, "w": 58, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 58, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 62, "y": 1, "w": 58, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 58, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 1, "y": 36, "w": 57, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 57, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 121, "y": 36, "w": 56, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 121, "y": 36, "w": 56, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 121, "y": 36, "w": 56, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 121, "y": 36, "w": 56, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 1, "y": 36, "w": 57, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 57, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 62, "y": 1, "w": 58, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 58, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 62, "y": 1, "w": 58, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 58, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 121, "y": 1, "w": 59, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 59, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 121, "y": 1, "w": 59, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 59, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 1, "y": 1, "w": 60, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 60, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 1, "y": 1, "w": 60, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 60, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 121, "y": 1, "w": 59, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 59, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 121, "y": 1, "w": 59, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 59, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 62, "y": 1, "w": 58, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 58, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 62, "y": 1, "w": 58, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 58, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 1, "y": 36, "w": 57, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 57, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 121, "y": 36, "w": 56, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 121, "y": 36, "w": 56, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 121, "y": 36, "w": 56, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 121, "y": 36, "w": 56, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 59, "y": 37, "w": 57, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 57, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 59, "y": 37, "w": 57, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 57, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 1, "y": 72, "w": 58, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 58, "h": 33 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 1, "y": 72, "w": 58, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 58, "h": 33 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 1, "y": 72, "w": 58, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 58, "h": 33 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 1, "y": 72, "w": 58, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 58, "h": 33 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 1, "y": 72, "w": 58, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 58, "h": 33 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 60, "y": 72, "w": 58, "h": 31 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 58, "h": 31 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 119, "y": 72, "w": 56, "h": 31 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 56, "h": 31 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 60, "y": 72, "w": 58, "h": 31 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 58, "h": 31 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 1, "y": 72, "w": 58, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 58, "h": 33 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 1, "y": 72, "w": 58, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 58, "h": 33 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 1, "y": 72, "w": 58, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 58, "h": 33 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 1, "y": 72, "w": 58, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 58, "h": 33 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 1, "y": 72, "w": 58, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 58, "h": 33 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 1, "y": 72, "w": 58, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 58, "h": 33 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 1, "y": 72, "w": 58, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 58, "h": 33 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 59, "y": 37, "w": 57, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 57, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 59, "y": 37, "w": 57, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 57, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 121, "y": 36, "w": 56, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 121, "y": 36, "w": 56, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "692.png",
+  "format": "I8",
+  "size": { "w": 181, "h": 106 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/692.png b/public/images/pokemon/exp/back/692.png
index 0b3462fe06d..33059d53c05 100644
Binary files a/public/images/pokemon/exp/back/692.png and b/public/images/pokemon/exp/back/692.png differ
diff --git a/public/images/pokemon/exp/back/693.json b/public/images/pokemon/exp/back/693.json
index fb29d014658..6358a8908f6 100644
--- a/public/images/pokemon/exp/back/693.json
+++ b/public/images/pokemon/exp/back/693.json
@@ -1,230 +1,902 @@
-{
-	"textures": [
-		{
-			"image": "693.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 223,
-				"h": 223
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 90,
-						"h": 76
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 90,
-						"h": 72
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 90,
-						"h": 72
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 90,
-						"h": 76
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 90,
-						"h": 72
-					},
-					"frame": {
-						"x": 90,
-						"y": 0,
-						"w": 90,
-						"h": 72
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 90,
-						"h": 76
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 90,
-						"h": 72
-					},
-					"frame": {
-						"x": 90,
-						"y": 0,
-						"w": 90,
-						"h": 72
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 90,
-						"h": 76
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 90,
-						"h": 73
-					},
-					"frame": {
-						"x": 0,
-						"y": 72,
-						"w": 90,
-						"h": 73
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 90,
-						"h": 76
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 90,
-						"h": 73
-					},
-					"frame": {
-						"x": 0,
-						"y": 72,
-						"w": 90,
-						"h": 73
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 90,
-						"h": 76
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 90,
-						"h": 75
-					},
-					"frame": {
-						"x": 90,
-						"y": 72,
-						"w": 90,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 90,
-						"h": 76
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 90,
-						"h": 75
-					},
-					"frame": {
-						"x": 90,
-						"y": 72,
-						"w": 90,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 90,
-						"h": 76
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 90,
-						"h": 76
-					},
-					"frame": {
-						"x": 0,
-						"y": 145,
-						"w": 90,
-						"h": 76
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 90,
-						"h": 76
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 90,
-						"h": 76
-					},
-					"frame": {
-						"x": 0,
-						"y": 145,
-						"w": 90,
-						"h": 76
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 90,
-						"h": 76
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 90,
-						"h": 76
-					},
-					"frame": {
-						"x": 90,
-						"y": 147,
-						"w": 90,
-						"h": 76
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:f3b26f7df2eeda76e504b3f1294ac699:a2e5c9fc75e286a40f09ab013ac5cb32:9c1f9147e693c05eb4655590e9099679$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 381, "y": 68, "w": 91, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 3, "w": 91, "h": 70 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 472, "y": 70, "w": 88, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 0, "w": 88, "h": 72 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 378, "y": 138, "w": 91, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 8, "w": 91, "h": 65 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 187, "y": 260, "w": 91, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 15, "w": 91, "h": 59 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 379, "y": 257, "w": 95, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 16, "y": 16, "w": 95, "h": 60 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 572, "y": 1, "w": 98, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 12, "w": 98, "h": 66 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 478, "y": 1, "w": 94, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 17, "y": 11, "w": 94, "h": 69 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 560, "y": 132, "w": 93, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 19, "w": 93, "h": 64 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 474, "y": 257, "w": 90, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 22, "w": 90, "h": 61 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 95, "y": 197, "w": 94, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 17, "y": 21, "w": 94, "h": 62 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 99, "y": 1, "w": 94, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 17, "y": 10, "w": 94, "h": 71 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 291, "y": 1, "w": 90, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 6, "w": 90, "h": 73 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 288, "y": 74, "w": 90, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 11, "w": 90, "h": 67 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 368, "y": 317, "w": 88, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 17, "w": 88, "h": 59 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 96, "y": 259, "w": 91, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 15, "w": 91, "h": 59 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 381, "y": 68, "w": 91, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 3, "w": 91, "h": 70 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 472, "y": 70, "w": 88, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 0, "w": 88, "h": 72 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 378, "y": 138, "w": 91, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 8, "w": 91, "h": 65 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 187, "y": 260, "w": 91, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 15, "w": 91, "h": 59 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 379, "y": 257, "w": 95, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 16, "y": 16, "w": 95, "h": 60 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 572, "y": 1, "w": 98, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 12, "w": 98, "h": 66 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 478, "y": 1, "w": 94, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 17, "y": 11, "w": 94, "h": 69 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 560, "y": 132, "w": 93, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 19, "w": 93, "h": 64 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 474, "y": 257, "w": 90, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 22, "w": 90, "h": 61 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 95, "y": 197, "w": 94, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 17, "y": 21, "w": 94, "h": 62 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 99, "y": 1, "w": 94, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 17, "y": 10, "w": 94, "h": 71 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 291, "y": 1, "w": 90, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 6, "w": 90, "h": 73 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 288, "y": 74, "w": 90, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 11, "w": 90, "h": 67 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 368, "y": 317, "w": 88, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 17, "w": 88, "h": 59 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 96, "y": 259, "w": 91, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 15, "w": 91, "h": 59 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 381, "y": 68, "w": 91, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 3, "w": 91, "h": 70 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 472, "y": 70, "w": 88, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 0, "w": 88, "h": 72 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 378, "y": 138, "w": 91, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 8, "w": 91, "h": 65 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 187, "y": 260, "w": 91, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 15, "w": 91, "h": 59 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 379, "y": 257, "w": 95, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 16, "y": 16, "w": 95, "h": 60 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 572, "y": 1, "w": 98, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 12, "w": 98, "h": 66 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 478, "y": 1, "w": 94, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 17, "y": 11, "w": 94, "h": 69 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 560, "y": 132, "w": 93, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 19, "w": 93, "h": 64 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 474, "y": 257, "w": 90, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 22, "w": 90, "h": 61 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 95, "y": 197, "w": 94, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 17, "y": 21, "w": 94, "h": 62 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 99, "y": 1, "w": 94, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 17, "y": 10, "w": 94, "h": 71 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 291, "y": 1, "w": 90, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 6, "w": 90, "h": 73 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 288, "y": 74, "w": 90, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 11, "w": 90, "h": 67 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 368, "y": 317, "w": 88, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 17, "w": 88, "h": 59 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 96, "y": 259, "w": 91, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 15, "w": 91, "h": 59 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 381, "y": 68, "w": 91, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 3, "w": 91, "h": 70 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 472, "y": 70, "w": 88, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 0, "w": 88, "h": 72 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 378, "y": 138, "w": 91, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 8, "w": 91, "h": 65 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 187, "y": 260, "w": 91, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 15, "w": 91, "h": 59 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 379, "y": 257, "w": 95, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 16, "y": 16, "w": 95, "h": 60 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 572, "y": 1, "w": 98, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 12, "w": 98, "h": 66 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 478, "y": 1, "w": 94, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 17, "y": 11, "w": 94, "h": 69 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 560, "y": 132, "w": 93, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 19, "w": 93, "h": 64 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 474, "y": 257, "w": 90, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 22, "w": 90, "h": 61 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 95, "y": 197, "w": 94, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 17, "y": 21, "w": 94, "h": 62 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 99, "y": 1, "w": 94, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 17, "y": 10, "w": 94, "h": 71 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 291, "y": 1, "w": 90, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 6, "w": 90, "h": 73 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 288, "y": 74, "w": 90, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 11, "w": 90, "h": 67 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 368, "y": 317, "w": 88, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 17, "w": 88, "h": 59 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 96, "y": 259, "w": 91, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 15, "w": 91, "h": 59 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 381, "y": 68, "w": 91, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 3, "w": 91, "h": 70 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 472, "y": 70, "w": 88, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 0, "w": 88, "h": 72 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 378, "y": 138, "w": 91, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 8, "w": 91, "h": 65 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 187, "y": 260, "w": 91, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 15, "w": 91, "h": 59 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 379, "y": 257, "w": 95, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 16, "y": 16, "w": 95, "h": 60 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 572, "y": 1, "w": 98, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 12, "w": 98, "h": 66 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 478, "y": 1, "w": 94, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 17, "y": 11, "w": 94, "h": 69 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 560, "y": 132, "w": 93, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 19, "w": 93, "h": 64 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 474, "y": 257, "w": 90, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 22, "w": 90, "h": 61 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 95, "y": 197, "w": 94, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 17, "y": 21, "w": 94, "h": 62 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 99, "y": 1, "w": 94, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 17, "y": 10, "w": 94, "h": 71 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 291, "y": 1, "w": 90, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 6, "w": 90, "h": 73 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 288, "y": 74, "w": 90, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 11, "w": 90, "h": 67 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 368, "y": 317, "w": 88, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 17, "w": 88, "h": 59 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 96, "y": 259, "w": 91, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 15, "w": 91, "h": 59 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 381, "y": 68, "w": 91, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 3, "w": 91, "h": 70 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 565, "y": 196, "w": 90, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 16, "y": 6, "w": 90, "h": 65 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 278, "y": 266, "w": 90, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 10, "w": 90, "h": 59 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 189, "y": 199, "w": 95, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 8, "w": 95, "h": 61 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 193, "y": 1, "w": 98, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 98, "h": 68 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 1, "y": 71, "w": 94, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 17, "y": 10, "w": 94, "h": 65 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 469, "y": 196, "w": 96, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 12, "w": 96, "h": 61 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 1, "y": 1, "w": 98, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 5, "w": 98, "h": 70 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 1, "y": 136, "w": 94, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 10, "w": 94, "h": 63 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 95, "y": 72, "w": 96, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 12, "w": 96, "h": 63 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 381, "y": 1, "w": 97, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 6, "w": 97, "h": 67 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 1, "y": 71, "w": 94, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 17, "y": 10, "w": 94, "h": 65 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0088.png",
+    "frame": { "x": 469, "y": 196, "w": 96, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 12, "w": 96, "h": 61 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0089.png",
+    "frame": { "x": 1, "y": 1, "w": 98, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 5, "w": 98, "h": 70 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0090.png",
+    "frame": { "x": 191, "y": 136, "w": 94, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 10, "w": 94, "h": 63 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0091.png",
+    "frame": { "x": 95, "y": 135, "w": 96, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 11, "w": 96, "h": 62 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0092.png",
+    "frame": { "x": 572, "y": 67, "w": 99, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 7, "w": 99, "h": 65 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0093.png",
+    "frame": { "x": 284, "y": 205, "w": 95, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 11, "w": 95, "h": 61 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0094.png",
+    "frame": { "x": 1, "y": 199, "w": 91, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 12, "w": 91, "h": 60 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0095.png",
+    "frame": { "x": 1, "y": 259, "w": 95, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 12, "w": 95, "h": 60 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0096.png",
+    "frame": { "x": 193, "y": 69, "w": 95, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 5, "w": 95, "h": 67 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0097.png",
+    "frame": { "x": 285, "y": 141, "w": 92, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 8, "w": 92, "h": 64 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0098.png",
+    "frame": { "x": 96, "y": 318, "w": 89, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 14, "w": 89, "h": 58 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0099.png",
+    "frame": { "x": 564, "y": 261, "w": 92, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 19, "y": 14, "w": 92, "h": 58 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "693.png",
+  "format": "I8",
+  "size": { "w": 672, "h": 377 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/693.png b/public/images/pokemon/exp/back/693.png
index a4b89137043..4772c64f8d0 100644
Binary files a/public/images/pokemon/exp/back/693.png and b/public/images/pokemon/exp/back/693.png differ
diff --git a/public/images/pokemon/exp/back/694.json b/public/images/pokemon/exp/back/694.json
deleted file mode 100644
index d77a3db07e3..00000000000
--- a/public/images/pokemon/exp/back/694.json
+++ /dev/null
@@ -1,272 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "694.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 130,
-				"h": 130
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 39
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 48,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 48,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 39
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 48,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 48,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 39
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 47,
-						"h": 35
-					},
-					"frame": {
-						"x": 48,
-						"y": 0,
-						"w": 47,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 39
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 47,
-						"h": 36
-					},
-					"frame": {
-						"x": 0,
-						"y": 35,
-						"w": 47,
-						"h": 36
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 39
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 47,
-						"h": 36
-					},
-					"frame": {
-						"x": 0,
-						"y": 35,
-						"w": 47,
-						"h": 36
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 39
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 47,
-						"h": 37
-					},
-					"frame": {
-						"x": 47,
-						"y": 35,
-						"w": 47,
-						"h": 37
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 39
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 47,
-						"h": 37
-					},
-					"frame": {
-						"x": 47,
-						"y": 35,
-						"w": 47,
-						"h": 37
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 39
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 46,
-						"h": 38
-					},
-					"frame": {
-						"x": 0,
-						"y": 71,
-						"w": 46,
-						"h": 38
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 39
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 46,
-						"h": 38
-					},
-					"frame": {
-						"x": 0,
-						"y": 71,
-						"w": 46,
-						"h": 38
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 39
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 44,
-						"h": 39
-					},
-					"frame": {
-						"x": 46,
-						"y": 72,
-						"w": 44,
-						"h": 39
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 39
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 44,
-						"h": 39
-					},
-					"frame": {
-						"x": 46,
-						"y": 72,
-						"w": 44,
-						"h": 39
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 39
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 40,
-						"h": 39
-					},
-					"frame": {
-						"x": 90,
-						"y": 72,
-						"w": 40,
-						"h": 39
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:8940ca5f146f0b24d2aa10692e8e18b0:e6a9f01d7ca698d2b3d7fdf6d9244c8c:b0990f9650cfe63b836cbed33f0b44d8$"
-	}
-}
diff --git a/public/images/pokemon/exp/back/694.png b/public/images/pokemon/exp/back/694.png
deleted file mode 100644
index d3675e0a9d7..00000000000
Binary files a/public/images/pokemon/exp/back/694.png and /dev/null differ
diff --git a/public/images/pokemon/exp/back/697.json b/public/images/pokemon/exp/back/697.json
index 9707f931b14..6963da289ab 100644
--- a/public/images/pokemon/exp/back/697.json
+++ b/public/images/pokemon/exp/back/697.json
@@ -1,1196 +1,992 @@
-{
-	"textures": [
-		{
-			"image": "697.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 374,
-				"h": 374
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0043.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 0,
-						"w": 63,
-						"h": 78
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 63,
-						"h": 78
-					}
-				},
-				{
-					"filename": "0045.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 0,
-						"w": 63,
-						"h": 78
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 63,
-						"h": 78
-					}
-				},
-				{
-					"filename": "0044.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 11,
-						"y": 0,
-						"w": 60,
-						"h": 78
-					},
-					"frame": {
-						"x": 0,
-						"y": 78,
-						"w": 60,
-						"h": 78
-					}
-				},
-				{
-					"filename": "0042.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 1,
-						"w": 66,
-						"h": 77
-					},
-					"frame": {
-						"x": 0,
-						"y": 156,
-						"w": 66,
-						"h": 77
-					}
-				},
-				{
-					"filename": "0046.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 1,
-						"w": 66,
-						"h": 77
-					},
-					"frame": {
-						"x": 0,
-						"y": 156,
-						"w": 66,
-						"h": 77
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 77,
-						"h": 76
-					},
-					"frame": {
-						"x": 60,
-						"y": 78,
-						"w": 77,
-						"h": 76
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 77,
-						"h": 76
-					},
-					"frame": {
-						"x": 60,
-						"y": 78,
-						"w": 77,
-						"h": 76
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 77,
-						"h": 76
-					},
-					"frame": {
-						"x": 60,
-						"y": 78,
-						"w": 77,
-						"h": 76
-					}
-				},
-				{
-					"filename": "0034.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 77,
-						"h": 76
-					},
-					"frame": {
-						"x": 60,
-						"y": 78,
-						"w": 77,
-						"h": 76
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 77,
-						"h": 76
-					},
-					"frame": {
-						"x": 63,
-						"y": 0,
-						"w": 77,
-						"h": 76
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 77,
-						"h": 76
-					},
-					"frame": {
-						"x": 63,
-						"y": 0,
-						"w": 77,
-						"h": 76
-					}
-				},
-				{
-					"filename": "0025.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 77,
-						"h": 76
-					},
-					"frame": {
-						"x": 63,
-						"y": 0,
-						"w": 77,
-						"h": 76
-					}
-				},
-				{
-					"filename": "0035.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 77,
-						"h": 76
-					},
-					"frame": {
-						"x": 63,
-						"y": 0,
-						"w": 77,
-						"h": 76
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 77,
-						"h": 76
-					},
-					"frame": {
-						"x": 0,
-						"y": 233,
-						"w": 77,
-						"h": 76
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 77,
-						"h": 76
-					},
-					"frame": {
-						"x": 0,
-						"y": 233,
-						"w": 77,
-						"h": 76
-					}
-				},
-				{
-					"filename": "0026.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 77,
-						"h": 76
-					},
-					"frame": {
-						"x": 0,
-						"y": 233,
-						"w": 77,
-						"h": 76
-					}
-				},
-				{
-					"filename": "0036.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 77,
-						"h": 76
-					},
-					"frame": {
-						"x": 0,
-						"y": 233,
-						"w": 77,
-						"h": 76
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 77,
-						"h": 76
-					},
-					"frame": {
-						"x": 66,
-						"y": 154,
-						"w": 77,
-						"h": 76
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 77,
-						"h": 76
-					},
-					"frame": {
-						"x": 66,
-						"y": 154,
-						"w": 77,
-						"h": 76
-					}
-				},
-				{
-					"filename": "0027.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 77,
-						"h": 76
-					},
-					"frame": {
-						"x": 66,
-						"y": 154,
-						"w": 77,
-						"h": 76
-					}
-				},
-				{
-					"filename": "0037.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 77,
-						"h": 76
-					},
-					"frame": {
-						"x": 66,
-						"y": 154,
-						"w": 77,
-						"h": 76
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 76,
-						"h": 76
-					},
-					"frame": {
-						"x": 137,
-						"y": 76,
-						"w": 76,
-						"h": 76
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 76,
-						"h": 76
-					},
-					"frame": {
-						"x": 137,
-						"y": 76,
-						"w": 76,
-						"h": 76
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 76,
-						"h": 76
-					},
-					"frame": {
-						"x": 137,
-						"y": 76,
-						"w": 76,
-						"h": 76
-					}
-				},
-				{
-					"filename": "0033.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 76,
-						"h": 76
-					},
-					"frame": {
-						"x": 137,
-						"y": 76,
-						"w": 76,
-						"h": 76
-					}
-				},
-				{
-					"filename": "0041.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 2,
-						"w": 69,
-						"h": 76
-					},
-					"frame": {
-						"x": 140,
-						"y": 0,
-						"w": 69,
-						"h": 76
-					}
-				},
-				{
-					"filename": "0047.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 2,
-						"w": 69,
-						"h": 76
-					},
-					"frame": {
-						"x": 140,
-						"y": 0,
-						"w": 69,
-						"h": 76
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 76,
-						"h": 75
-					},
-					"frame": {
-						"x": 209,
-						"y": 0,
-						"w": 76,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 76,
-						"h": 75
-					},
-					"frame": {
-						"x": 209,
-						"y": 0,
-						"w": 76,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0028.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 76,
-						"h": 75
-					},
-					"frame": {
-						"x": 209,
-						"y": 0,
-						"w": 76,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0052.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 77,
-						"h": 73
-					},
-					"frame": {
-						"x": 285,
-						"y": 0,
-						"w": 77,
-						"h": 73
-					}
-				},
-				{
-					"filename": "0038.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 76,
-						"h": 75
-					},
-					"frame": {
-						"x": 285,
-						"y": 73,
-						"w": 76,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0040.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 72,
-						"h": 75
-					},
-					"frame": {
-						"x": 213,
-						"y": 75,
-						"w": 72,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0048.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 72,
-						"h": 75
-					},
-					"frame": {
-						"x": 213,
-						"y": 75,
-						"w": 72,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0051.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 76,
-						"h": 74
-					},
-					"frame": {
-						"x": 285,
-						"y": 148,
-						"w": 76,
-						"h": 74
-					}
-				},
-				{
-					"filename": "0053.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 76,
-						"h": 74
-					},
-					"frame": {
-						"x": 285,
-						"y": 148,
-						"w": 76,
-						"h": 74
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 75,
-						"h": 75
-					},
-					"frame": {
-						"x": 143,
-						"y": 152,
-						"w": 75,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 75,
-						"h": 75
-					},
-					"frame": {
-						"x": 143,
-						"y": 152,
-						"w": 75,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 75,
-						"h": 75
-					},
-					"frame": {
-						"x": 143,
-						"y": 152,
-						"w": 75,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0032.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 75,
-						"h": 75
-					},
-					"frame": {
-						"x": 143,
-						"y": 152,
-						"w": 75,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 74,
-						"h": 74
-					},
-					"frame": {
-						"x": 77,
-						"y": 230,
-						"w": 74,
-						"h": 74
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 74,
-						"h": 74
-					},
-					"frame": {
-						"x": 77,
-						"y": 230,
-						"w": 74,
-						"h": 74
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 74,
-						"h": 74
-					},
-					"frame": {
-						"x": 77,
-						"y": 230,
-						"w": 74,
-						"h": 74
-					}
-				},
-				{
-					"filename": "0029.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 74,
-						"h": 74
-					},
-					"frame": {
-						"x": 77,
-						"y": 230,
-						"w": 74,
-						"h": 74
-					}
-				},
-				{
-					"filename": "0056.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 74,
-						"h": 74
-					},
-					"frame": {
-						"x": 77,
-						"y": 230,
-						"w": 74,
-						"h": 74
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 74,
-						"h": 74
-					},
-					"frame": {
-						"x": 151,
-						"y": 227,
-						"w": 74,
-						"h": 74
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 74,
-						"h": 74
-					},
-					"frame": {
-						"x": 151,
-						"y": 227,
-						"w": 74,
-						"h": 74
-					}
-				},
-				{
-					"filename": "0031.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 74,
-						"h": 74
-					},
-					"frame": {
-						"x": 151,
-						"y": 227,
-						"w": 74,
-						"h": 74
-					}
-				},
-				{
-					"filename": "0050.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 5,
-						"w": 75,
-						"h": 73
-					},
-					"frame": {
-						"x": 151,
-						"y": 301,
-						"w": 75,
-						"h": 73
-					}
-				},
-				{
-					"filename": "0054.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 5,
-						"w": 75,
-						"h": 73
-					},
-					"frame": {
-						"x": 151,
-						"y": 301,
-						"w": 75,
-						"h": 73
-					}
-				},
-				{
-					"filename": "0049.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 74,
-						"h": 74
-					},
-					"frame": {
-						"x": 225,
-						"y": 222,
-						"w": 74,
-						"h": 74
-					}
-				},
-				{
-					"filename": "0055.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 74,
-						"h": 74
-					},
-					"frame": {
-						"x": 299,
-						"y": 222,
-						"w": 74,
-						"h": 74
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 4,
-						"w": 73,
-						"h": 74
-					},
-					"frame": {
-						"x": 226,
-						"y": 296,
-						"w": 73,
-						"h": 74
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 4,
-						"w": 73,
-						"h": 74
-					},
-					"frame": {
-						"x": 226,
-						"y": 296,
-						"w": 73,
-						"h": 74
-					}
-				},
-				{
-					"filename": "0030.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 4,
-						"w": 73,
-						"h": 74
-					},
-					"frame": {
-						"x": 226,
-						"y": 296,
-						"w": 73,
-						"h": 74
-					}
-				},
-				{
-					"filename": "0039.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 4,
-						"w": 73,
-						"h": 74
-					},
-					"frame": {
-						"x": 299,
-						"y": 296,
-						"w": 73,
-						"h": 74
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:5c15a6488ad8d9c5cd58a9490e3f8fe1:9f98e28712fdc6eb5949c7f74cafffeb:f4fdd87d2fc1483d8e0a185c2654e3d9$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 0, "y": 149, "w": 92, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 92, "h": 75 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 286, "y": 150, "w": 92, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 92, "h": 75 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 185, "y": 227, "w": 91, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 91, "h": 75 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 93, "y": 227, "w": 91, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 91, "h": 75 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 0, "y": 301, "w": 91, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 91, "h": 74 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 182, "y": 303, "w": 90, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 90, "h": 74 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 273, "y": 375, "w": 91, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 91, "h": 73 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 182, "y": 378, "w": 90, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 90, "h": 73 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 273, "y": 449, "w": 89, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 5, "w": 89, "h": 73 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 177, "y": 452, "w": 89, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 6, "w": 89, "h": 72 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 452, "y": 450, "w": 89, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 6, "w": 89, "h": 72 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 461, "y": 376, "w": 90, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 90, "h": 73 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 649, "y": 375, "w": 91, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 91, "h": 73 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 558, "y": 303, "w": 90, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 90, "h": 74 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 649, "y": 300, "w": 91, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 91, "h": 74 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 373, "y": 227, "w": 91, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 91, "h": 75 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 0, "y": 149, "w": 92, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 92, "h": 75 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 286, "y": 150, "w": 92, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 92, "h": 75 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 185, "y": 227, "w": 91, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 91, "h": 75 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 93, "y": 227, "w": 91, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 91, "h": 75 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 0, "y": 301, "w": 91, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 91, "h": 74 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 182, "y": 303, "w": 90, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 90, "h": 74 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 273, "y": 375, "w": 91, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 91, "h": 73 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 182, "y": 378, "w": 90, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 90, "h": 73 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 273, "y": 449, "w": 89, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 5, "w": 89, "h": 73 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 177, "y": 452, "w": 89, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 6, "w": 89, "h": 72 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 452, "y": 450, "w": 89, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 6, "w": 89, "h": 72 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 461, "y": 376, "w": 90, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 90, "h": 73 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 649, "y": 375, "w": 91, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 91, "h": 73 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 558, "y": 303, "w": 90, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 90, "h": 74 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 649, "y": 300, "w": 91, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 91, "h": 74 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 373, "y": 227, "w": 91, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 91, "h": 75 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 0, "y": 149, "w": 92, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 92, "h": 75 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 286, "y": 150, "w": 92, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 92, "h": 75 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 185, "y": 227, "w": 91, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 91, "h": 75 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 93, "y": 227, "w": 91, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 91, "h": 75 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 0, "y": 301, "w": 91, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 91, "h": 74 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 182, "y": 303, "w": 90, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 90, "h": 74 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 273, "y": 375, "w": 91, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 91, "h": 73 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 182, "y": 378, "w": 90, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 90, "h": 73 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 273, "y": 449, "w": 89, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 5, "w": 89, "h": 73 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 177, "y": 452, "w": 89, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 6, "w": 89, "h": 72 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 452, "y": 450, "w": 89, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 6, "w": 89, "h": 72 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 461, "y": 376, "w": 90, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 90, "h": 73 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 649, "y": 375, "w": 91, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 91, "h": 73 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 558, "y": 303, "w": 90, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 90, "h": 74 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 649, "y": 300, "w": 91, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 91, "h": 74 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 373, "y": 227, "w": 91, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 91, "h": 75 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 0, "y": 149, "w": 92, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 92, "h": 75 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 286, "y": 150, "w": 92, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 92, "h": 75 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 185, "y": 227, "w": 91, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 91, "h": 75 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 93, "y": 227, "w": 91, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 91, "h": 75 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 0, "y": 301, "w": 91, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 91, "h": 74 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 182, "y": 303, "w": 90, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 90, "h": 74 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 273, "y": 375, "w": 91, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 91, "h": 73 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 182, "y": 378, "w": 90, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 90, "h": 73 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 273, "y": 449, "w": 89, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 5, "w": 89, "h": 73 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 177, "y": 452, "w": 89, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 6, "w": 89, "h": 72 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 452, "y": 450, "w": 89, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 6, "w": 89, "h": 72 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 461, "y": 376, "w": 90, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 90, "h": 73 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 649, "y": 375, "w": 91, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 91, "h": 73 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 558, "y": 303, "w": 90, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 90, "h": 74 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 649, "y": 300, "w": 91, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 91, "h": 74 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 373, "y": 227, "w": 91, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 91, "h": 75 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 0, "y": 149, "w": 92, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 92, "h": 75 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 370, "y": 303, "w": 90, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 90, "h": 74 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 558, "y": 227, "w": 90, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 90, "h": 75 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 0, "y": 376, "w": 88, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 88, "h": 75 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 89, "y": 379, "w": 87, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 87, "h": 75 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 365, "y": 378, "w": 86, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 86, "h": 76 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 640, "y": 449, "w": 84, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 0, "w": 84, "h": 77 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 552, "y": 378, "w": 87, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 87, "h": 75 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 92, "y": 303, "w": 89, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 89, "h": 75 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 465, "y": 302, "w": 92, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 5, "w": 92, "h": 73 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 465, "y": 227, "w": 92, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 92, "h": 74 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 465, "y": 227, "w": 92, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 92, "h": 74 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 0, "y": 149, "w": 92, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 92, "h": 75 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 186, "y": 151, "w": 92, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 92, "h": 75 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 0, "y": 225, "w": 92, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 92, "h": 75 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 670, "y": 150, "w": 92, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 92, "h": 75 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 93, "y": 151, "w": 92, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 92, "h": 75 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 472, "y": 151, "w": 92, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 92, "h": 75 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 565, "y": 151, "w": 92, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 92, "h": 75 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 670, "y": 150, "w": 92, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 92, "h": 75 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 0, "y": 149, "w": 92, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 92, "h": 75 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 277, "y": 301, "w": 92, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 5, "w": 92, "h": 73 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 465, "y": 227, "w": 92, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 92, "h": 74 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0088.png",
+    "frame": { "x": 465, "y": 227, "w": 92, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 92, "h": 74 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0089.png",
+    "frame": { "x": 0, "y": 149, "w": 92, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 92, "h": 75 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0090.png",
+    "frame": { "x": 388, "y": 75, "w": 93, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 93, "h": 75 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0091.png",
+    "frame": { "x": 97, "y": 75, "w": 93, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 93, "h": 75 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0092.png",
+    "frame": { "x": 292, "y": 0, "w": 95, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 95, "h": 75 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0093.png",
+    "frame": { "x": 196, "y": 0, "w": 95, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 95, "h": 75 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0094.png",
+    "frame": { "x": 582, "y": 0, "w": 96, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 96, "h": 74 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0095.png",
+    "frame": { "x": 98, "y": 0, "w": 97, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 97, "h": 74 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0096.png",
+    "frame": { "x": 0, "y": 0, "w": 97, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 97, "h": 74 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0097.png",
+    "frame": { "x": 485, "y": 0, "w": 96, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 96, "h": 74 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0098.png",
+    "frame": { "x": 388, "y": 0, "w": 96, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 96, "h": 74 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0099.png",
+    "frame": { "x": 0, "y": 75, "w": 96, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 96, "h": 73 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0100.png",
+    "frame": { "x": 286, "y": 76, "w": 95, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 95, "h": 73 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0101.png",
+    "frame": { "x": 670, "y": 76, "w": 95, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 95, "h": 73 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0102.png",
+    "frame": { "x": 658, "y": 226, "w": 94, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 94, "h": 73 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0103.png",
+    "frame": { "x": 191, "y": 76, "w": 94, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 94, "h": 74 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0104.png",
+    "frame": { "x": 279, "y": 226, "w": 93, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 93, "h": 74 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0105.png",
+    "frame": { "x": 679, "y": 0, "w": 94, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 94, "h": 75 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0106.png",
+    "frame": { "x": 482, "y": 75, "w": 93, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 93, "h": 75 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0107.png",
+    "frame": { "x": 576, "y": 75, "w": 93, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 93, "h": 75 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0108.png",
+    "frame": { "x": 379, "y": 151, "w": 92, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 92, "h": 75 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0109.png",
+    "frame": { "x": 465, "y": 227, "w": 92, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 92, "h": 74 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.11-x64",
+  "image": "697.png",
+  "format": "I8",
+  "size": { "w": 773, "h": 526 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/697.png b/public/images/pokemon/exp/back/697.png
index 44a73042829..f0ae22f2bb0 100644
Binary files a/public/images/pokemon/exp/back/697.png and b/public/images/pokemon/exp/back/697.png differ
diff --git a/public/images/pokemon/exp/back/698.json b/public/images/pokemon/exp/back/698.json
deleted file mode 100644
index 01e3235cc36..00000000000
--- a/public/images/pokemon/exp/back/698.json
+++ /dev/null
@@ -1,3296 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "698.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 181,
-				"h": 181
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0029.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 45,
-						"h": 54
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 45,
-						"h": 54
-					}
-				},
-				{
-					"filename": "0030.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 45,
-						"h": 54
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 45,
-						"h": 54
-					}
-				},
-				{
-					"filename": "0033.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 45,
-						"h": 54
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 45,
-						"h": 54
-					}
-				},
-				{
-					"filename": "0034.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 45,
-						"h": 54
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 45,
-						"h": 54
-					}
-				},
-				{
-					"filename": "0069.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 45,
-						"h": 54
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 45,
-						"h": 54
-					}
-				},
-				{
-					"filename": "0070.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 45,
-						"h": 54
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 45,
-						"h": 54
-					}
-				},
-				{
-					"filename": "0073.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 45,
-						"h": 54
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 45,
-						"h": 54
-					}
-				},
-				{
-					"filename": "0074.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 45,
-						"h": 54
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 45,
-						"h": 54
-					}
-				},
-				{
-					"filename": "0109.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 45,
-						"h": 54
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 45,
-						"h": 54
-					}
-				},
-				{
-					"filename": "0110.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 45,
-						"h": 54
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 45,
-						"h": 54
-					}
-				},
-				{
-					"filename": "0113.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 45,
-						"h": 54
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 45,
-						"h": 54
-					}
-				},
-				{
-					"filename": "0114.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 45,
-						"h": 54
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 45,
-						"h": 54
-					}
-				},
-				{
-					"filename": "0027.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 43,
-						"h": 55
-					},
-					"frame": {
-						"x": 0,
-						"y": 54,
-						"w": 43,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0028.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 43,
-						"h": 55
-					},
-					"frame": {
-						"x": 0,
-						"y": 54,
-						"w": 43,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0035.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 43,
-						"h": 55
-					},
-					"frame": {
-						"x": 0,
-						"y": 54,
-						"w": 43,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0036.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 43,
-						"h": 55
-					},
-					"frame": {
-						"x": 0,
-						"y": 54,
-						"w": 43,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0067.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 43,
-						"h": 55
-					},
-					"frame": {
-						"x": 0,
-						"y": 54,
-						"w": 43,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0068.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 43,
-						"h": 55
-					},
-					"frame": {
-						"x": 0,
-						"y": 54,
-						"w": 43,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0075.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 43,
-						"h": 55
-					},
-					"frame": {
-						"x": 0,
-						"y": 54,
-						"w": 43,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0076.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 43,
-						"h": 55
-					},
-					"frame": {
-						"x": 0,
-						"y": 54,
-						"w": 43,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0107.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 43,
-						"h": 55
-					},
-					"frame": {
-						"x": 0,
-						"y": 54,
-						"w": 43,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0108.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 43,
-						"h": 55
-					},
-					"frame": {
-						"x": 0,
-						"y": 54,
-						"w": 43,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0115.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 43,
-						"h": 55
-					},
-					"frame": {
-						"x": 0,
-						"y": 54,
-						"w": 43,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0116.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 43,
-						"h": 55
-					},
-					"frame": {
-						"x": 0,
-						"y": 54,
-						"w": 43,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0031.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 45,
-						"h": 53
-					},
-					"frame": {
-						"x": 45,
-						"y": 0,
-						"w": 45,
-						"h": 53
-					}
-				},
-				{
-					"filename": "0032.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 45,
-						"h": 53
-					},
-					"frame": {
-						"x": 45,
-						"y": 0,
-						"w": 45,
-						"h": 53
-					}
-				},
-				{
-					"filename": "0071.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 45,
-						"h": 53
-					},
-					"frame": {
-						"x": 45,
-						"y": 0,
-						"w": 45,
-						"h": 53
-					}
-				},
-				{
-					"filename": "0072.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 45,
-						"h": 53
-					},
-					"frame": {
-						"x": 45,
-						"y": 0,
-						"w": 45,
-						"h": 53
-					}
-				},
-				{
-					"filename": "0111.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 45,
-						"h": 53
-					},
-					"frame": {
-						"x": 45,
-						"y": 0,
-						"w": 45,
-						"h": 53
-					}
-				},
-				{
-					"filename": "0112.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 45,
-						"h": 53
-					},
-					"frame": {
-						"x": 45,
-						"y": 0,
-						"w": 45,
-						"h": 53
-					}
-				},
-				{
-					"filename": "0025.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 41,
-						"h": 56
-					},
-					"frame": {
-						"x": 0,
-						"y": 109,
-						"w": 41,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0026.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 41,
-						"h": 56
-					},
-					"frame": {
-						"x": 0,
-						"y": 109,
-						"w": 41,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0037.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 41,
-						"h": 56
-					},
-					"frame": {
-						"x": 0,
-						"y": 109,
-						"w": 41,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0038.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 41,
-						"h": 56
-					},
-					"frame": {
-						"x": 0,
-						"y": 109,
-						"w": 41,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0039.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 41,
-						"h": 56
-					},
-					"frame": {
-						"x": 0,
-						"y": 109,
-						"w": 41,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0040.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 41,
-						"h": 56
-					},
-					"frame": {
-						"x": 0,
-						"y": 109,
-						"w": 41,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0065.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 41,
-						"h": 56
-					},
-					"frame": {
-						"x": 0,
-						"y": 109,
-						"w": 41,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0066.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 41,
-						"h": 56
-					},
-					"frame": {
-						"x": 0,
-						"y": 109,
-						"w": 41,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0077.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 41,
-						"h": 56
-					},
-					"frame": {
-						"x": 0,
-						"y": 109,
-						"w": 41,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0078.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 41,
-						"h": 56
-					},
-					"frame": {
-						"x": 0,
-						"y": 109,
-						"w": 41,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0079.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 41,
-						"h": 56
-					},
-					"frame": {
-						"x": 0,
-						"y": 109,
-						"w": 41,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0080.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 41,
-						"h": 56
-					},
-					"frame": {
-						"x": 0,
-						"y": 109,
-						"w": 41,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0105.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 41,
-						"h": 56
-					},
-					"frame": {
-						"x": 0,
-						"y": 109,
-						"w": 41,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0106.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 41,
-						"h": 56
-					},
-					"frame": {
-						"x": 0,
-						"y": 109,
-						"w": 41,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0117.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 41,
-						"h": 56
-					},
-					"frame": {
-						"x": 0,
-						"y": 109,
-						"w": 41,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0118.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 41,
-						"h": 56
-					},
-					"frame": {
-						"x": 0,
-						"y": 109,
-						"w": 41,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0119.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 41,
-						"h": 56
-					},
-					"frame": {
-						"x": 0,
-						"y": 109,
-						"w": 41,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0120.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 41,
-						"h": 56
-					},
-					"frame": {
-						"x": 0,
-						"y": 109,
-						"w": 41,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 39,
-						"h": 56
-					},
-					"frame": {
-						"x": 90,
-						"y": 0,
-						"w": 39,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 39,
-						"h": 56
-					},
-					"frame": {
-						"x": 90,
-						"y": 0,
-						"w": 39,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 39,
-						"h": 56
-					},
-					"frame": {
-						"x": 90,
-						"y": 0,
-						"w": 39,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 39,
-						"h": 56
-					},
-					"frame": {
-						"x": 90,
-						"y": 0,
-						"w": 39,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 39,
-						"h": 56
-					},
-					"frame": {
-						"x": 90,
-						"y": 0,
-						"w": 39,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 39,
-						"h": 56
-					},
-					"frame": {
-						"x": 90,
-						"y": 0,
-						"w": 39,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 39,
-						"h": 56
-					},
-					"frame": {
-						"x": 90,
-						"y": 0,
-						"w": 39,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 39,
-						"h": 56
-					},
-					"frame": {
-						"x": 90,
-						"y": 0,
-						"w": 39,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 39,
-						"h": 56
-					},
-					"frame": {
-						"x": 90,
-						"y": 0,
-						"w": 39,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 39,
-						"h": 56
-					},
-					"frame": {
-						"x": 90,
-						"y": 0,
-						"w": 39,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0041.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 39,
-						"h": 56
-					},
-					"frame": {
-						"x": 90,
-						"y": 0,
-						"w": 39,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0042.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 39,
-						"h": 56
-					},
-					"frame": {
-						"x": 90,
-						"y": 0,
-						"w": 39,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0057.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 39,
-						"h": 56
-					},
-					"frame": {
-						"x": 90,
-						"y": 0,
-						"w": 39,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0058.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 39,
-						"h": 56
-					},
-					"frame": {
-						"x": 90,
-						"y": 0,
-						"w": 39,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0059.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 39,
-						"h": 56
-					},
-					"frame": {
-						"x": 90,
-						"y": 0,
-						"w": 39,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0060.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 39,
-						"h": 56
-					},
-					"frame": {
-						"x": 90,
-						"y": 0,
-						"w": 39,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0061.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 39,
-						"h": 56
-					},
-					"frame": {
-						"x": 90,
-						"y": 0,
-						"w": 39,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0062.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 39,
-						"h": 56
-					},
-					"frame": {
-						"x": 90,
-						"y": 0,
-						"w": 39,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0063.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 39,
-						"h": 56
-					},
-					"frame": {
-						"x": 90,
-						"y": 0,
-						"w": 39,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0064.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 39,
-						"h": 56
-					},
-					"frame": {
-						"x": 90,
-						"y": 0,
-						"w": 39,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0081.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 39,
-						"h": 56
-					},
-					"frame": {
-						"x": 90,
-						"y": 0,
-						"w": 39,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0082.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 39,
-						"h": 56
-					},
-					"frame": {
-						"x": 90,
-						"y": 0,
-						"w": 39,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0097.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 39,
-						"h": 56
-					},
-					"frame": {
-						"x": 90,
-						"y": 0,
-						"w": 39,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0098.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 39,
-						"h": 56
-					},
-					"frame": {
-						"x": 90,
-						"y": 0,
-						"w": 39,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0099.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 39,
-						"h": 56
-					},
-					"frame": {
-						"x": 90,
-						"y": 0,
-						"w": 39,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0100.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 39,
-						"h": 56
-					},
-					"frame": {
-						"x": 90,
-						"y": 0,
-						"w": 39,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0101.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 39,
-						"h": 56
-					},
-					"frame": {
-						"x": 90,
-						"y": 0,
-						"w": 39,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0102.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 39,
-						"h": 56
-					},
-					"frame": {
-						"x": 90,
-						"y": 0,
-						"w": 39,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0103.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 39,
-						"h": 56
-					},
-					"frame": {
-						"x": 90,
-						"y": 0,
-						"w": 39,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0104.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 39,
-						"h": 56
-					},
-					"frame": {
-						"x": 90,
-						"y": 0,
-						"w": 39,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0121.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 39,
-						"h": 56
-					},
-					"frame": {
-						"x": 90,
-						"y": 0,
-						"w": 39,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0122.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 39,
-						"h": 56
-					},
-					"frame": {
-						"x": 90,
-						"y": 0,
-						"w": 39,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0155.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 39,
-						"h": 56
-					},
-					"frame": {
-						"x": 90,
-						"y": 0,
-						"w": 39,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0156.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 39,
-						"h": 56
-					},
-					"frame": {
-						"x": 90,
-						"y": 0,
-						"w": 39,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 37,
-						"h": 56
-					},
-					"frame": {
-						"x": 129,
-						"y": 0,
-						"w": 37,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 37,
-						"h": 56
-					},
-					"frame": {
-						"x": 129,
-						"y": 0,
-						"w": 37,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 37,
-						"h": 56
-					},
-					"frame": {
-						"x": 129,
-						"y": 0,
-						"w": 37,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 37,
-						"h": 56
-					},
-					"frame": {
-						"x": 129,
-						"y": 0,
-						"w": 37,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0043.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 37,
-						"h": 56
-					},
-					"frame": {
-						"x": 129,
-						"y": 0,
-						"w": 37,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0044.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 37,
-						"h": 56
-					},
-					"frame": {
-						"x": 129,
-						"y": 0,
-						"w": 37,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0055.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 37,
-						"h": 56
-					},
-					"frame": {
-						"x": 129,
-						"y": 0,
-						"w": 37,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0056.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 37,
-						"h": 56
-					},
-					"frame": {
-						"x": 129,
-						"y": 0,
-						"w": 37,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0083.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 37,
-						"h": 56
-					},
-					"frame": {
-						"x": 129,
-						"y": 0,
-						"w": 37,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0084.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 37,
-						"h": 56
-					},
-					"frame": {
-						"x": 129,
-						"y": 0,
-						"w": 37,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0095.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 37,
-						"h": 56
-					},
-					"frame": {
-						"x": 129,
-						"y": 0,
-						"w": 37,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0096.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 37,
-						"h": 56
-					},
-					"frame": {
-						"x": 129,
-						"y": 0,
-						"w": 37,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 35,
-						"h": 56
-					},
-					"frame": {
-						"x": 41,
-						"y": 109,
-						"w": 35,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 35,
-						"h": 56
-					},
-					"frame": {
-						"x": 41,
-						"y": 109,
-						"w": 35,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 35,
-						"h": 56
-					},
-					"frame": {
-						"x": 41,
-						"y": 109,
-						"w": 35,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 35,
-						"h": 56
-					},
-					"frame": {
-						"x": 41,
-						"y": 109,
-						"w": 35,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0045.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 35,
-						"h": 56
-					},
-					"frame": {
-						"x": 41,
-						"y": 109,
-						"w": 35,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0046.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 35,
-						"h": 56
-					},
-					"frame": {
-						"x": 41,
-						"y": 109,
-						"w": 35,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0053.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 35,
-						"h": 56
-					},
-					"frame": {
-						"x": 41,
-						"y": 109,
-						"w": 35,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0054.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 35,
-						"h": 56
-					},
-					"frame": {
-						"x": 41,
-						"y": 109,
-						"w": 35,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0085.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 35,
-						"h": 56
-					},
-					"frame": {
-						"x": 41,
-						"y": 109,
-						"w": 35,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0086.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 35,
-						"h": 56
-					},
-					"frame": {
-						"x": 41,
-						"y": 109,
-						"w": 35,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0093.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 35,
-						"h": 56
-					},
-					"frame": {
-						"x": 41,
-						"y": 109,
-						"w": 35,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0094.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 35,
-						"h": 56
-					},
-					"frame": {
-						"x": 41,
-						"y": 109,
-						"w": 35,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 33,
-						"h": 55
-					},
-					"frame": {
-						"x": 43,
-						"y": 54,
-						"w": 33,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 33,
-						"h": 55
-					},
-					"frame": {
-						"x": 43,
-						"y": 54,
-						"w": 33,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 33,
-						"h": 55
-					},
-					"frame": {
-						"x": 43,
-						"y": 54,
-						"w": 33,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 33,
-						"h": 55
-					},
-					"frame": {
-						"x": 43,
-						"y": 54,
-						"w": 33,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0047.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 33,
-						"h": 55
-					},
-					"frame": {
-						"x": 43,
-						"y": 54,
-						"w": 33,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0048.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 33,
-						"h": 55
-					},
-					"frame": {
-						"x": 43,
-						"y": 54,
-						"w": 33,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0051.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 33,
-						"h": 55
-					},
-					"frame": {
-						"x": 43,
-						"y": 54,
-						"w": 33,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0052.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 33,
-						"h": 55
-					},
-					"frame": {
-						"x": 43,
-						"y": 54,
-						"w": 33,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0087.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 33,
-						"h": 55
-					},
-					"frame": {
-						"x": 43,
-						"y": 54,
-						"w": 33,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0088.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 33,
-						"h": 55
-					},
-					"frame": {
-						"x": 43,
-						"y": 54,
-						"w": 33,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0091.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 33,
-						"h": 55
-					},
-					"frame": {
-						"x": 43,
-						"y": 54,
-						"w": 33,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0092.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 33,
-						"h": 55
-					},
-					"frame": {
-						"x": 43,
-						"y": 54,
-						"w": 33,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0123.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 37,
-						"h": 57
-					},
-					"frame": {
-						"x": 76,
-						"y": 56,
-						"w": 37,
-						"h": 57
-					}
-				},
-				{
-					"filename": "0124.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 37,
-						"h": 57
-					},
-					"frame": {
-						"x": 76,
-						"y": 56,
-						"w": 37,
-						"h": 57
-					}
-				},
-				{
-					"filename": "0153.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 37,
-						"h": 57
-					},
-					"frame": {
-						"x": 76,
-						"y": 56,
-						"w": 37,
-						"h": 57
-					}
-				},
-				{
-					"filename": "0154.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 37,
-						"h": 57
-					},
-					"frame": {
-						"x": 76,
-						"y": 56,
-						"w": 37,
-						"h": 57
-					}
-				},
-				{
-					"filename": "0125.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 58
-					},
-					"frame": {
-						"x": 113,
-						"y": 56,
-						"w": 35,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0126.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 58
-					},
-					"frame": {
-						"x": 113,
-						"y": 56,
-						"w": 35,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0151.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 58
-					},
-					"frame": {
-						"x": 113,
-						"y": 56,
-						"w": 35,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0152.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 58
-					},
-					"frame": {
-						"x": 113,
-						"y": 56,
-						"w": 35,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 33,
-						"h": 54
-					},
-					"frame": {
-						"x": 148,
-						"y": 56,
-						"w": 33,
-						"h": 54
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 33,
-						"h": 54
-					},
-					"frame": {
-						"x": 148,
-						"y": 56,
-						"w": 33,
-						"h": 54
-					}
-				},
-				{
-					"filename": "0049.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 33,
-						"h": 54
-					},
-					"frame": {
-						"x": 148,
-						"y": 56,
-						"w": 33,
-						"h": 54
-					}
-				},
-				{
-					"filename": "0050.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 33,
-						"h": 54
-					},
-					"frame": {
-						"x": 148,
-						"y": 56,
-						"w": 33,
-						"h": 54
-					}
-				},
-				{
-					"filename": "0089.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 33,
-						"h": 54
-					},
-					"frame": {
-						"x": 148,
-						"y": 56,
-						"w": 33,
-						"h": 54
-					}
-				},
-				{
-					"filename": "0090.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 33,
-						"h": 54
-					},
-					"frame": {
-						"x": 148,
-						"y": 56,
-						"w": 33,
-						"h": 54
-					}
-				},
-				{
-					"filename": "0127.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 58
-					},
-					"frame": {
-						"x": 76,
-						"y": 113,
-						"w": 35,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0128.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 58
-					},
-					"frame": {
-						"x": 76,
-						"y": 113,
-						"w": 35,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0133.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 58
-					},
-					"frame": {
-						"x": 76,
-						"y": 113,
-						"w": 35,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0134.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 58
-					},
-					"frame": {
-						"x": 76,
-						"y": 113,
-						"w": 35,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0139.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 58
-					},
-					"frame": {
-						"x": 76,
-						"y": 113,
-						"w": 35,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0140.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 58
-					},
-					"frame": {
-						"x": 76,
-						"y": 113,
-						"w": 35,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0145.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 58
-					},
-					"frame": {
-						"x": 76,
-						"y": 113,
-						"w": 35,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0146.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 58
-					},
-					"frame": {
-						"x": 76,
-						"y": 113,
-						"w": 35,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0129.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 58
-					},
-					"frame": {
-						"x": 111,
-						"y": 114,
-						"w": 35,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0130.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 58
-					},
-					"frame": {
-						"x": 111,
-						"y": 114,
-						"w": 35,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0135.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 58
-					},
-					"frame": {
-						"x": 111,
-						"y": 114,
-						"w": 35,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0136.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 58
-					},
-					"frame": {
-						"x": 111,
-						"y": 114,
-						"w": 35,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0141.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 58
-					},
-					"frame": {
-						"x": 111,
-						"y": 114,
-						"w": 35,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0142.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 58
-					},
-					"frame": {
-						"x": 111,
-						"y": 114,
-						"w": 35,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0147.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 58
-					},
-					"frame": {
-						"x": 111,
-						"y": 114,
-						"w": 35,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0148.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 58
-					},
-					"frame": {
-						"x": 111,
-						"y": 114,
-						"w": 35,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0131.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 58
-					},
-					"frame": {
-						"x": 146,
-						"y": 114,
-						"w": 35,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0132.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 58
-					},
-					"frame": {
-						"x": 146,
-						"y": 114,
-						"w": 35,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0137.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 58
-					},
-					"frame": {
-						"x": 146,
-						"y": 114,
-						"w": 35,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0138.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 58
-					},
-					"frame": {
-						"x": 146,
-						"y": 114,
-						"w": 35,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0143.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 58
-					},
-					"frame": {
-						"x": 146,
-						"y": 114,
-						"w": 35,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0144.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 58
-					},
-					"frame": {
-						"x": 146,
-						"y": 114,
-						"w": 35,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0149.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 58
-					},
-					"frame": {
-						"x": 146,
-						"y": 114,
-						"w": 35,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0150.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 58
-					},
-					"frame": {
-						"x": 146,
-						"y": 114,
-						"w": 35,
-						"h": 58
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:47af8de4c4888204d35a4e17ac074ed2:4f5193840bb62c79e8f9d414f094a882:198087d69fed44d4a642fa3ba5c077d6$"
-	}
-}
diff --git a/public/images/pokemon/exp/back/698.png b/public/images/pokemon/exp/back/698.png
deleted file mode 100644
index 43738b78928..00000000000
Binary files a/public/images/pokemon/exp/back/698.png and /dev/null differ
diff --git a/public/images/pokemon/exp/back/700.json b/public/images/pokemon/exp/back/700.json
index 8919ba29366..70083de61c9 100644
--- a/public/images/pokemon/exp/back/700.json
+++ b/public/images/pokemon/exp/back/700.json
@@ -1,209 +1,587 @@
-{
-	"textures": [
-		{
-			"image": "700.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 173,
-				"h": 173
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 44,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 44,
-						"h": 58
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 44,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 44,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 44,
-						"h": 58
-					},
-					"frame": {
-						"x": 0,
-						"y": 58,
-						"w": 44,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 44,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 44,
-						"h": 57
-					},
-					"frame": {
-						"x": 0,
-						"y": 116,
-						"w": 44,
-						"h": 57
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 44,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 44,
-						"h": 58
-					},
-					"frame": {
-						"x": 44,
-						"y": 0,
-						"w": 44,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 44,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 44,
-						"h": 58
-					},
-					"frame": {
-						"x": 88,
-						"y": 0,
-						"w": 44,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 44,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 44,
-						"h": 58
-					},
-					"frame": {
-						"x": 88,
-						"y": 0,
-						"w": 44,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 44,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 44,
-						"h": 58
-					},
-					"frame": {
-						"x": 44,
-						"y": 58,
-						"w": 44,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 44,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 44,
-						"h": 56
-					},
-					"frame": {
-						"x": 44,
-						"y": 116,
-						"w": 44,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 44,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 44,
-						"h": 58
-					},
-					"frame": {
-						"x": 88,
-						"y": 58,
-						"w": 44,
-						"h": 58
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:e0cdfdc055c08cdcb7b31d0da301c709:2affc6f4613ab8f1ba13cd35d9106bb3:2e4bf5ef1f19e475073f7da10c60b540$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 46, "y": 123, "w": 46, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 5, "w": 46, "h": 59 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 101, "y": 63, "w": 47, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 47, "h": 59 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 0, "y": 180, "w": 46, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 46, "h": 58 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 91, "y": 182, "w": 46, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 46, "h": 57 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 137, "y": 183, "w": 46, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 46, "h": 57 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 188, "y": 180, "w": 45, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 45, "h": 59 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 46, "y": 182, "w": 45, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 45, "h": 59 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 49, "y": 64, "w": 47, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 5, "w": 47, "h": 59 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 46, "y": 123, "w": 46, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 5, "w": 46, "h": 59 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 101, "y": 63, "w": 47, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 47, "h": 59 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 0, "y": 180, "w": 46, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 46, "h": 58 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 91, "y": 182, "w": 46, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 46, "h": 57 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 137, "y": 183, "w": 46, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 46, "h": 57 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 188, "y": 180, "w": 45, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 45, "h": 59 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 46, "y": 182, "w": 45, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 45, "h": 59 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 49, "y": 64, "w": 47, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 5, "w": 47, "h": 59 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 46, "y": 123, "w": 46, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 5, "w": 46, "h": 59 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 101, "y": 63, "w": 47, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 47, "h": 59 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 0, "y": 180, "w": 46, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 46, "h": 58 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 91, "y": 182, "w": 46, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 46, "h": 57 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 137, "y": 183, "w": 46, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 46, "h": 57 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 188, "y": 180, "w": 45, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 45, "h": 59 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 46, "y": 182, "w": 45, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 45, "h": 59 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 49, "y": 64, "w": 47, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 5, "w": 47, "h": 59 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 46, "y": 123, "w": 46, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 5, "w": 46, "h": 59 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 101, "y": 63, "w": 47, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 47, "h": 59 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 0, "y": 180, "w": 46, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 46, "h": 58 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 91, "y": 182, "w": 46, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 46, "h": 57 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 137, "y": 183, "w": 46, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 46, "h": 57 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 188, "y": 180, "w": 45, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 45, "h": 59 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 46, "y": 182, "w": 45, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 45, "h": 59 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 49, "y": 64, "w": 47, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 5, "w": 47, "h": 59 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 46, "y": 123, "w": 46, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 5, "w": 46, "h": 59 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 101, "y": 63, "w": 47, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 47, "h": 59 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 0, "y": 180, "w": 46, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 46, "h": 58 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 91, "y": 182, "w": 46, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 46, "h": 57 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 137, "y": 183, "w": 46, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 46, "h": 57 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 188, "y": 180, "w": 45, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 45, "h": 59 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 46, "y": 182, "w": 45, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 45, "h": 59 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 49, "y": 64, "w": 47, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 5, "w": 47, "h": 59 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 46, "y": 123, "w": 46, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 5, "w": 46, "h": 59 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 101, "y": 63, "w": 47, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 47, "h": 59 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 0, "y": 180, "w": 46, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 46, "h": 58 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 91, "y": 182, "w": 46, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 46, "h": 57 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 137, "y": 183, "w": 46, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 46, "h": 57 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 188, "y": 180, "w": 45, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 45, "h": 59 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 46, "y": 182, "w": 45, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 45, "h": 59 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 49, "y": 64, "w": 47, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 5, "w": 47, "h": 59 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 142, "y": 124, "w": 46, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 46, "h": 59 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 101, "y": 0, "w": 48, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 48, "h": 63 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 195, "y": 0, "w": 49, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 49, "h": 60 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 0, "y": 60, "w": 49, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 49, "h": 60 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 0, "y": 0, "w": 53, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 53, "h": 60 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 148, "y": 64, "w": 46, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 46, "h": 60 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 0, "y": 120, "w": 46, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 46, "h": 60 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 195, "y": 60, "w": 47, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 47, "h": 60 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 194, "y": 120, "w": 46, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 46, "h": 60 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 96, "y": 122, "w": 46, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 46, "h": 60 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 195, "y": 60, "w": 47, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 47, "h": 60 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 194, "y": 120, "w": 46, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 46, "h": 60 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 96, "y": 122, "w": 46, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 46, "h": 60 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 149, "y": 0, "w": 46, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 46, "h": 64 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 53, "y": 0, "w": 48, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 48, "h": 64 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 142, "y": 124, "w": 46, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 46, "h": 59 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.11-x64",
+  "image": "700.png",
+  "format": "I8",
+  "size": { "w": 244, "h": 241 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/700.png b/public/images/pokemon/exp/back/700.png
index 6684e845a39..a3675cc15d8 100644
Binary files a/public/images/pokemon/exp/back/700.png and b/public/images/pokemon/exp/back/700.png differ
diff --git a/public/images/pokemon/exp/back/702.json b/public/images/pokemon/exp/back/702.json
index 7fa99d3eb04..9680e17e397 100644
--- a/public/images/pokemon/exp/back/702.json
+++ b/public/images/pokemon/exp/back/702.json
@@ -1,1028 +1,443 @@
-{
-	"textures": [
-		{
-			"image": "702.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 141,
-				"h": 141
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 47,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 47,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 47,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 47,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 47,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 47,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 47,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 47,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 47,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0025.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 47,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 47,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 47,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0033.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 47,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 47,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 47,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 47,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 47,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 35,
-						"w": 47,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 47,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 47,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 35,
-						"w": 47,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 47,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 47,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 35,
-						"w": 47,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0026.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 47,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 47,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 35,
-						"w": 47,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0034.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 47,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 47,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 35,
-						"w": 47,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0042.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 47,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 47,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 35,
-						"w": 47,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 47,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 47,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 70,
-						"w": 47,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 47,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 47,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 70,
-						"w": 47,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 47,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 47,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 70,
-						"w": 47,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0031.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 47,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 47,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 70,
-						"w": 47,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0039.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 47,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 47,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 70,
-						"w": 47,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0041.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 47,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 47,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 105,
-						"w": 47,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0047.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 47,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 47,
-						"h": 35
-					},
-					"frame": {
-						"x": 47,
-						"y": 0,
-						"w": 47,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 46,
-						"h": 35
-					},
-					"frame": {
-						"x": 47,
-						"y": 35,
-						"w": 46,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 46,
-						"h": 35
-					},
-					"frame": {
-						"x": 47,
-						"y": 35,
-						"w": 46,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 46,
-						"h": 35
-					},
-					"frame": {
-						"x": 47,
-						"y": 35,
-						"w": 46,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0032.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 46,
-						"h": 35
-					},
-					"frame": {
-						"x": 47,
-						"y": 35,
-						"w": 46,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0040.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 46,
-						"h": 35
-					},
-					"frame": {
-						"x": 47,
-						"y": 35,
-						"w": 46,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0048.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 46,
-						"h": 35
-					},
-					"frame": {
-						"x": 47,
-						"y": 35,
-						"w": 46,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 47,
-						"h": 34
-					},
-					"frame": {
-						"x": 47,
-						"y": 70,
-						"w": 47,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 47,
-						"h": 34
-					},
-					"frame": {
-						"x": 47,
-						"y": 70,
-						"w": 47,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 47,
-						"h": 34
-					},
-					"frame": {
-						"x": 47,
-						"y": 70,
-						"w": 47,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0027.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 47,
-						"h": 34
-					},
-					"frame": {
-						"x": 47,
-						"y": 70,
-						"w": 47,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0035.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 47,
-						"h": 34
-					},
-					"frame": {
-						"x": 47,
-						"y": 70,
-						"w": 47,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 47,
-						"h": 34
-					},
-					"frame": {
-						"x": 93,
-						"y": 35,
-						"w": 47,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 47,
-						"h": 34
-					},
-					"frame": {
-						"x": 93,
-						"y": 35,
-						"w": 47,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 47,
-						"h": 34
-					},
-					"frame": {
-						"x": 93,
-						"y": 35,
-						"w": 47,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0030.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 47,
-						"h": 34
-					},
-					"frame": {
-						"x": 93,
-						"y": 35,
-						"w": 47,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0038.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 47,
-						"h": 34
-					},
-					"frame": {
-						"x": 93,
-						"y": 35,
-						"w": 47,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0046.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 47,
-						"h": 34
-					},
-					"frame": {
-						"x": 93,
-						"y": 35,
-						"w": 47,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0043.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 47,
-						"h": 34
-					},
-					"frame": {
-						"x": 94,
-						"y": 0,
-						"w": 47,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 47,
-						"h": 32
-					},
-					"frame": {
-						"x": 94,
-						"y": 69,
-						"w": 47,
-						"h": 32
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 47,
-						"h": 32
-					},
-					"frame": {
-						"x": 94,
-						"y": 69,
-						"w": 47,
-						"h": 32
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 47,
-						"h": 32
-					},
-					"frame": {
-						"x": 94,
-						"y": 69,
-						"w": 47,
-						"h": 32
-					}
-				},
-				{
-					"filename": "0028.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 47,
-						"h": 32
-					},
-					"frame": {
-						"x": 94,
-						"y": 69,
-						"w": 47,
-						"h": 32
-					}
-				},
-				{
-					"filename": "0036.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 47,
-						"h": 32
-					},
-					"frame": {
-						"x": 94,
-						"y": 69,
-						"w": 47,
-						"h": 32
-					}
-				},
-				{
-					"filename": "0044.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 47,
-						"h": 32
-					},
-					"frame": {
-						"x": 94,
-						"y": 69,
-						"w": 47,
-						"h": 32
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 47,
-						"h": 32
-					},
-					"frame": {
-						"x": 94,
-						"y": 101,
-						"w": 47,
-						"h": 32
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 47,
-						"h": 32
-					},
-					"frame": {
-						"x": 94,
-						"y": 101,
-						"w": 47,
-						"h": 32
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 47,
-						"h": 32
-					},
-					"frame": {
-						"x": 94,
-						"y": 101,
-						"w": 47,
-						"h": 32
-					}
-				},
-				{
-					"filename": "0029.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 47,
-						"h": 32
-					},
-					"frame": {
-						"x": 94,
-						"y": 101,
-						"w": 47,
-						"h": 32
-					}
-				},
-				{
-					"filename": "0037.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 47,
-						"h": 32
-					},
-					"frame": {
-						"x": 94,
-						"y": 101,
-						"w": 47,
-						"h": 32
-					}
-				},
-				{
-					"filename": "0045.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 47,
-						"h": 32
-					},
-					"frame": {
-						"x": 47,
-						"y": 104,
-						"w": 47,
-						"h": 32
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:4052cb31e311daed50c3ad98d6d07226:990695ce3fc0717eec42d716a52de75e:ba8fdab405d5efab99c4aa1084328e6b$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 48, "y": 0, "w": 46, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 46, "h": 35 },
+    "sourceSize": { "w": 47, "h": 35 },
+    "duration": 110
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 0, "y": 0, "w": 47, "h": 35 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 47, "h": 35 },
+    "sourceSize": { "w": 47, "h": 35 },
+    "duration": 110
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 93, "y": 36, "w": 46, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 46, "h": 33 },
+    "sourceSize": { "w": 47, "h": 35 },
+    "duration": 110
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 47, "y": 72, "w": 45, "h": 31 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 45, "h": 31 },
+    "sourceSize": { "w": 47, "h": 35 },
+    "duration": 110
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 139, "y": 70, "w": 46, "h": 31 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 46, "h": 31 },
+    "sourceSize": { "w": 47, "h": 35 },
+    "duration": 110
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 93, "y": 70, "w": 45, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 45, "h": 33 },
+    "sourceSize": { "w": 47, "h": 35 },
+    "duration": 110
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 95, "y": 0, "w": 46, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 46, "h": 35 },
+    "sourceSize": { "w": 47, "h": 35 },
+    "duration": 110
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 47, "y": 36, "w": 45, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 45, "h": 35 },
+    "sourceSize": { "w": 47, "h": 35 },
+    "duration": 110
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 48, "y": 0, "w": 46, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 46, "h": 35 },
+    "sourceSize": { "w": 47, "h": 35 },
+    "duration": 110
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 0, "y": 0, "w": 47, "h": 35 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 47, "h": 35 },
+    "sourceSize": { "w": 47, "h": 35 },
+    "duration": 110
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 93, "y": 36, "w": 46, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 46, "h": 33 },
+    "sourceSize": { "w": 47, "h": 35 },
+    "duration": 110
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 47, "y": 72, "w": 45, "h": 31 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 45, "h": 31 },
+    "sourceSize": { "w": 47, "h": 35 },
+    "duration": 110
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 139, "y": 70, "w": 46, "h": 31 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 46, "h": 31 },
+    "sourceSize": { "w": 47, "h": 35 },
+    "duration": 110
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 93, "y": 70, "w": 45, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 45, "h": 33 },
+    "sourceSize": { "w": 47, "h": 35 },
+    "duration": 110
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 95, "y": 0, "w": 46, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 46, "h": 35 },
+    "sourceSize": { "w": 47, "h": 35 },
+    "duration": 110
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 47, "y": 36, "w": 45, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 45, "h": 35 },
+    "sourceSize": { "w": 47, "h": 35 },
+    "duration": 110
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 48, "y": 0, "w": 46, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 46, "h": 35 },
+    "sourceSize": { "w": 47, "h": 35 },
+    "duration": 110
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 0, "y": 0, "w": 47, "h": 35 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 47, "h": 35 },
+    "sourceSize": { "w": 47, "h": 35 },
+    "duration": 110
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 93, "y": 36, "w": 46, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 46, "h": 33 },
+    "sourceSize": { "w": 47, "h": 35 },
+    "duration": 110
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 47, "y": 72, "w": 45, "h": 31 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 45, "h": 31 },
+    "sourceSize": { "w": 47, "h": 35 },
+    "duration": 110
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 139, "y": 70, "w": 46, "h": 31 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 46, "h": 31 },
+    "sourceSize": { "w": 47, "h": 35 },
+    "duration": 110
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 93, "y": 70, "w": 45, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 45, "h": 33 },
+    "sourceSize": { "w": 47, "h": 35 },
+    "duration": 110
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 95, "y": 0, "w": 46, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 46, "h": 35 },
+    "sourceSize": { "w": 47, "h": 35 },
+    "duration": 110
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 47, "y": 36, "w": 45, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 45, "h": 35 },
+    "sourceSize": { "w": 47, "h": 35 },
+    "duration": 110
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 48, "y": 0, "w": 46, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 46, "h": 35 },
+    "sourceSize": { "w": 47, "h": 35 },
+    "duration": 110
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 0, "y": 0, "w": 47, "h": 35 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 47, "h": 35 },
+    "sourceSize": { "w": 47, "h": 35 },
+    "duration": 110
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 93, "y": 36, "w": 46, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 46, "h": 33 },
+    "sourceSize": { "w": 47, "h": 35 },
+    "duration": 110
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 47, "y": 72, "w": 45, "h": 31 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 45, "h": 31 },
+    "sourceSize": { "w": 47, "h": 35 },
+    "duration": 110
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 139, "y": 70, "w": 46, "h": 31 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 46, "h": 31 },
+    "sourceSize": { "w": 47, "h": 35 },
+    "duration": 110
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 93, "y": 70, "w": 45, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 45, "h": 33 },
+    "sourceSize": { "w": 47, "h": 35 },
+    "duration": 110
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 95, "y": 0, "w": 46, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 46, "h": 35 },
+    "sourceSize": { "w": 47, "h": 35 },
+    "duration": 110
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 47, "y": 36, "w": 45, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 45, "h": 35 },
+    "sourceSize": { "w": 47, "h": 35 },
+    "duration": 110
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 48, "y": 0, "w": 46, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 46, "h": 35 },
+    "sourceSize": { "w": 47, "h": 35 },
+    "duration": 110
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 0, "y": 0, "w": 47, "h": 35 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 47, "h": 35 },
+    "sourceSize": { "w": 47, "h": 35 },
+    "duration": 110
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 93, "y": 36, "w": 46, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 46, "h": 33 },
+    "sourceSize": { "w": 47, "h": 35 },
+    "duration": 110
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 47, "y": 72, "w": 45, "h": 31 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 45, "h": 31 },
+    "sourceSize": { "w": 47, "h": 35 },
+    "duration": 110
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 139, "y": 70, "w": 46, "h": 31 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 46, "h": 31 },
+    "sourceSize": { "w": 47, "h": 35 },
+    "duration": 110
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 93, "y": 70, "w": 45, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 45, "h": 33 },
+    "sourceSize": { "w": 47, "h": 35 },
+    "duration": 110
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 95, "y": 0, "w": 46, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 46, "h": 35 },
+    "sourceSize": { "w": 47, "h": 35 },
+    "duration": 110
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 47, "y": 36, "w": 45, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 45, "h": 35 },
+    "sourceSize": { "w": 47, "h": 35 },
+    "duration": 110
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 142, "y": 0, "w": 46, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 46, "h": 35 },
+    "sourceSize": { "w": 47, "h": 35 },
+    "duration": 110
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 0, "y": 0, "w": 47, "h": 35 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 47, "h": 35 },
+    "sourceSize": { "w": 47, "h": 35 },
+    "duration": 110
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 140, "y": 36, "w": 46, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 46, "h": 33 },
+    "sourceSize": { "w": 47, "h": 35 },
+    "duration": 110
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 47, "y": 72, "w": 45, "h": 31 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 45, "h": 31 },
+    "sourceSize": { "w": 47, "h": 35 },
+    "duration": 110
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 0, "y": 72, "w": 46, "h": 31 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 46, "h": 31 },
+    "sourceSize": { "w": 47, "h": 35 },
+    "duration": 110
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 93, "y": 70, "w": 45, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 45, "h": 33 },
+    "sourceSize": { "w": 47, "h": 35 },
+    "duration": 110
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 0, "y": 36, "w": 46, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 46, "h": 35 },
+    "sourceSize": { "w": 47, "h": 35 },
+    "duration": 110
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 47, "y": 36, "w": 45, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 45, "h": 35 },
+    "sourceSize": { "w": 47, "h": 35 },
+    "duration": 110
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.11-x64",
+  "image": "702.png",
+  "format": "I8",
+  "size": { "w": 188, "h": 103 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/702.png b/public/images/pokemon/exp/back/702.png
index e90d2e5200b..2305dd44628 100644
Binary files a/public/images/pokemon/exp/back/702.png and b/public/images/pokemon/exp/back/702.png differ
diff --git a/public/images/pokemon/exp/back/703.json b/public/images/pokemon/exp/back/703.json
deleted file mode 100644
index dc39d04326d..00000000000
--- a/public/images/pokemon/exp/back/703.json
+++ /dev/null
@@ -1,314 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "703.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 110,
-				"h": 110
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 37,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 10,
-						"w": 36,
-						"h": 39
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 36,
-						"h": 39
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 37,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 39
-					},
-					"frame": {
-						"x": 36,
-						"y": 0,
-						"w": 37,
-						"h": 39
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 37,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 37,
-						"h": 40
-					},
-					"frame": {
-						"x": 73,
-						"y": 0,
-						"w": 37,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 37,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 37,
-						"h": 40
-					},
-					"frame": {
-						"x": 73,
-						"y": 0,
-						"w": 37,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 37,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 37,
-						"h": 40
-					},
-					"frame": {
-						"x": 73,
-						"y": 0,
-						"w": 37,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 37,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 37,
-						"h": 40
-					},
-					"frame": {
-						"x": 73,
-						"y": 0,
-						"w": 37,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 37,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 37,
-						"h": 40
-					},
-					"frame": {
-						"x": 73,
-						"y": 0,
-						"w": 37,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 37,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 8,
-						"w": 37,
-						"h": 40
-					},
-					"frame": {
-						"x": 73,
-						"y": 0,
-						"w": 37,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 37,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 37,
-						"h": 40
-					},
-					"frame": {
-						"x": 73,
-						"y": 0,
-						"w": 37,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 37,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 9,
-						"w": 37,
-						"h": 40
-					},
-					"frame": {
-						"x": 0,
-						"y": 39,
-						"w": 37,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 37,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 36,
-						"h": 40
-					},
-					"frame": {
-						"x": 37,
-						"y": 39,
-						"w": 36,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 37,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 36,
-						"h": 40
-					},
-					"frame": {
-						"x": 37,
-						"y": 39,
-						"w": 36,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 37,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 36,
-						"h": 40
-					},
-					"frame": {
-						"x": 37,
-						"y": 39,
-						"w": 36,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 37,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 40
-					},
-					"frame": {
-						"x": 73,
-						"y": 40,
-						"w": 37,
-						"h": 40
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:9e937b9120a4e2d30cb17c3057bdb25e:2992340ca21fbb2052a947040742ff82:721af8c322ff60159262e9b3017c784d$"
-	}
-}
diff --git a/public/images/pokemon/exp/back/703.png b/public/images/pokemon/exp/back/703.png
deleted file mode 100644
index 2af4ac363ea..00000000000
Binary files a/public/images/pokemon/exp/back/703.png and /dev/null differ
diff --git a/public/images/pokemon/exp/back/704.json b/public/images/pokemon/exp/back/704.json
index cfee176924b..ff94c52a2a8 100644
--- a/public/images/pokemon/exp/back/704.json
+++ b/public/images/pokemon/exp/back/704.json
@@ -1,1742 +1,101 @@
-{
-	"textures": [
-		{
-			"image": "704.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 233,
-				"h": 233
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0037.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 66,
-						"h": 72
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 66,
-						"h": 72
-					}
-				},
-				{
-					"filename": "0042.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 26,
-						"y": 24,
-						"w": 41,
-						"h": 48
-					},
-					"frame": {
-						"x": 0,
-						"y": 72,
-						"w": 41,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0041.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 26,
-						"y": 25,
-						"w": 41,
-						"h": 47
-					},
-					"frame": {
-						"x": 66,
-						"y": 0,
-						"w": 41,
-						"h": 47
-					}
-				},
-				{
-					"filename": "0043.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 26,
-						"y": 25,
-						"w": 41,
-						"h": 47
-					},
-					"frame": {
-						"x": 66,
-						"y": 0,
-						"w": 41,
-						"h": 47
-					}
-				},
-				{
-					"filename": "0040.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 27,
-						"y": 25,
-						"w": 40,
-						"h": 47
-					},
-					"frame": {
-						"x": 0,
-						"y": 120,
-						"w": 40,
-						"h": 47
-					}
-				},
-				{
-					"filename": "0044.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 27,
-						"y": 25,
-						"w": 40,
-						"h": 47
-					},
-					"frame": {
-						"x": 0,
-						"y": 120,
-						"w": 40,
-						"h": 47
-					}
-				},
-				{
-					"filename": "0039.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 28,
-						"y": 26,
-						"w": 39,
-						"h": 46
-					},
-					"frame": {
-						"x": 107,
-						"y": 0,
-						"w": 39,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0045.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 28,
-						"y": 26,
-						"w": 39,
-						"h": 46
-					},
-					"frame": {
-						"x": 0,
-						"y": 167,
-						"w": 39,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 26,
-						"y": 29,
-						"w": 41,
-						"h": 43
-					},
-					"frame": {
-						"x": 146,
-						"y": 0,
-						"w": 41,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 26,
-						"y": 29,
-						"w": 41,
-						"h": 43
-					},
-					"frame": {
-						"x": 146,
-						"y": 0,
-						"w": 41,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 26,
-						"y": 29,
-						"w": 41,
-						"h": 43
-					},
-					"frame": {
-						"x": 146,
-						"y": 0,
-						"w": 41,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0029.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 26,
-						"y": 29,
-						"w": 41,
-						"h": 43
-					},
-					"frame": {
-						"x": 146,
-						"y": 0,
-						"w": 41,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0054.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 26,
-						"y": 29,
-						"w": 41,
-						"h": 43
-					},
-					"frame": {
-						"x": 146,
-						"y": 0,
-						"w": 41,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0060.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 26,
-						"y": 29,
-						"w": 41,
-						"h": 43
-					},
-					"frame": {
-						"x": 146,
-						"y": 0,
-						"w": 41,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0071.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 26,
-						"y": 29,
-						"w": 41,
-						"h": 43
-					},
-					"frame": {
-						"x": 146,
-						"y": 0,
-						"w": 41,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0077.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 26,
-						"y": 29,
-						"w": 41,
-						"h": 43
-					},
-					"frame": {
-						"x": 146,
-						"y": 0,
-						"w": 41,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 26,
-						"y": 30,
-						"w": 41,
-						"h": 42
-					},
-					"frame": {
-						"x": 187,
-						"y": 0,
-						"w": 41,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 26,
-						"y": 30,
-						"w": 41,
-						"h": 42
-					},
-					"frame": {
-						"x": 187,
-						"y": 0,
-						"w": 41,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 26,
-						"y": 30,
-						"w": 41,
-						"h": 42
-					},
-					"frame": {
-						"x": 187,
-						"y": 0,
-						"w": 41,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0028.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 26,
-						"y": 30,
-						"w": 41,
-						"h": 42
-					},
-					"frame": {
-						"x": 187,
-						"y": 0,
-						"w": 41,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 29,
-						"y": 26,
-						"w": 37,
-						"h": 46
-					},
-					"frame": {
-						"x": 41,
-						"y": 72,
-						"w": 37,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0049.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 29,
-						"y": 26,
-						"w": 37,
-						"h": 46
-					},
-					"frame": {
-						"x": 41,
-						"y": 72,
-						"w": 37,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0065.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 29,
-						"y": 26,
-						"w": 37,
-						"h": 46
-					},
-					"frame": {
-						"x": 41,
-						"y": 72,
-						"w": 37,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0066.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 29,
-						"y": 26,
-						"w": 37,
-						"h": 46
-					},
-					"frame": {
-						"x": 41,
-						"y": 72,
-						"w": 37,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0082.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 29,
-						"y": 26,
-						"w": 37,
-						"h": 46
-					},
-					"frame": {
-						"x": 41,
-						"y": 72,
-						"w": 37,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 29,
-						"y": 26,
-						"w": 37,
-						"h": 46
-					},
-					"frame": {
-						"x": 78,
-						"y": 47,
-						"w": 37,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0050.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 29,
-						"y": 26,
-						"w": 37,
-						"h": 46
-					},
-					"frame": {
-						"x": 78,
-						"y": 47,
-						"w": 37,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0064.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 29,
-						"y": 26,
-						"w": 37,
-						"h": 46
-					},
-					"frame": {
-						"x": 78,
-						"y": 47,
-						"w": 37,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0067.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 29,
-						"y": 26,
-						"w": 37,
-						"h": 46
-					},
-					"frame": {
-						"x": 78,
-						"y": 47,
-						"w": 37,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0081.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 29,
-						"y": 26,
-						"w": 37,
-						"h": 46
-					},
-					"frame": {
-						"x": 78,
-						"y": 47,
-						"w": 37,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 29,
-						"y": 26,
-						"w": 37,
-						"h": 46
-					},
-					"frame": {
-						"x": 115,
-						"y": 46,
-						"w": 37,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 29,
-						"y": 26,
-						"w": 37,
-						"h": 46
-					},
-					"frame": {
-						"x": 115,
-						"y": 46,
-						"w": 37,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0033.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 29,
-						"y": 26,
-						"w": 37,
-						"h": 46
-					},
-					"frame": {
-						"x": 115,
-						"y": 46,
-						"w": 37,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 29,
-						"y": 26,
-						"w": 37,
-						"h": 46
-					},
-					"frame": {
-						"x": 152,
-						"y": 43,
-						"w": 37,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 29,
-						"y": 26,
-						"w": 37,
-						"h": 46
-					},
-					"frame": {
-						"x": 152,
-						"y": 43,
-						"w": 37,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0034.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 29,
-						"y": 26,
-						"w": 37,
-						"h": 46
-					},
-					"frame": {
-						"x": 152,
-						"y": 43,
-						"w": 37,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0035.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 29,
-						"y": 26,
-						"w": 37,
-						"h": 46
-					},
-					"frame": {
-						"x": 152,
-						"y": 43,
-						"w": 37,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0038.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 28,
-						"y": 26,
-						"w": 38,
-						"h": 46
-					},
-					"frame": {
-						"x": 189,
-						"y": 42,
-						"w": 38,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0046.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 28,
-						"y": 26,
-						"w": 38,
-						"h": 46
-					},
-					"frame": {
-						"x": 189,
-						"y": 42,
-						"w": 38,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 28,
-						"y": 27,
-						"w": 38,
-						"h": 45
-					},
-					"frame": {
-						"x": 78,
-						"y": 93,
-						"w": 38,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 28,
-						"y": 27,
-						"w": 38,
-						"h": 45
-					},
-					"frame": {
-						"x": 78,
-						"y": 93,
-						"w": 38,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0032.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 28,
-						"y": 27,
-						"w": 38,
-						"h": 45
-					},
-					"frame": {
-						"x": 78,
-						"y": 93,
-						"w": 38,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0036.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 28,
-						"y": 27,
-						"w": 38,
-						"h": 45
-					},
-					"frame": {
-						"x": 78,
-						"y": 93,
-						"w": 38,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0048.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 28,
-						"y": 27,
-						"w": 38,
-						"h": 45
-					},
-					"frame": {
-						"x": 78,
-						"y": 93,
-						"w": 38,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0063.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 28,
-						"y": 27,
-						"w": 38,
-						"h": 45
-					},
-					"frame": {
-						"x": 78,
-						"y": 93,
-						"w": 38,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0068.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 28,
-						"y": 27,
-						"w": 38,
-						"h": 45
-					},
-					"frame": {
-						"x": 78,
-						"y": 93,
-						"w": 38,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0080.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 28,
-						"y": 27,
-						"w": 38,
-						"h": 45
-					},
-					"frame": {
-						"x": 78,
-						"y": 93,
-						"w": 38,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 28,
-						"y": 27,
-						"w": 38,
-						"h": 45
-					},
-					"frame": {
-						"x": 116,
-						"y": 92,
-						"w": 38,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0051.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 28,
-						"y": 27,
-						"w": 38,
-						"h": 45
-					},
-					"frame": {
-						"x": 154,
-						"y": 89,
-						"w": 38,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0055.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 26,
-						"y": 30,
-						"w": 41,
-						"h": 42
-					},
-					"frame": {
-						"x": 192,
-						"y": 88,
-						"w": 41,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0072.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 26,
-						"y": 30,
-						"w": 41,
-						"h": 42
-					},
-					"frame": {
-						"x": 192,
-						"y": 88,
-						"w": 41,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0076.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 26,
-						"y": 30,
-						"w": 41,
-						"h": 42
-					},
-					"frame": {
-						"x": 192,
-						"y": 88,
-						"w": 41,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0059.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 26,
-						"y": 30,
-						"w": 41,
-						"h": 42
-					},
-					"frame": {
-						"x": 192,
-						"y": 130,
-						"w": 41,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 28,
-						"y": 28,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 154,
-						"y": 134,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 28,
-						"y": 28,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 154,
-						"y": 134,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 28,
-						"y": 28,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 154,
-						"y": 134,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0031.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 28,
-						"y": 28,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 154,
-						"y": 134,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0047.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 28,
-						"y": 28,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 116,
-						"y": 137,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0052.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 28,
-						"y": 28,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 40,
-						"y": 120,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0069.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 28,
-						"y": 28,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 40,
-						"y": 120,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0079.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 28,
-						"y": 28,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 40,
-						"y": 120,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0062.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 28,
-						"y": 28,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 78,
-						"y": 138,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 27,
-						"y": 28,
-						"w": 39,
-						"h": 44
-					},
-					"frame": {
-						"x": 39,
-						"y": 167,
-						"w": 39,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 27,
-						"y": 28,
-						"w": 39,
-						"h": 44
-					},
-					"frame": {
-						"x": 39,
-						"y": 167,
-						"w": 39,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0030.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 27,
-						"y": 28,
-						"w": 39,
-						"h": 44
-					},
-					"frame": {
-						"x": 39,
-						"y": 167,
-						"w": 39,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 25,
-						"y": 31,
-						"w": 42,
-						"h": 41
-					},
-					"frame": {
-						"x": 78,
-						"y": 182,
-						"w": 42,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 25,
-						"y": 31,
-						"w": 42,
-						"h": 41
-					},
-					"frame": {
-						"x": 78,
-						"y": 182,
-						"w": 42,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0025.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 25,
-						"y": 31,
-						"w": 42,
-						"h": 41
-					},
-					"frame": {
-						"x": 78,
-						"y": 182,
-						"w": 42,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0027.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 25,
-						"y": 31,
-						"w": 42,
-						"h": 41
-					},
-					"frame": {
-						"x": 78,
-						"y": 182,
-						"w": 42,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0056.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 25,
-						"y": 31,
-						"w": 42,
-						"h": 41
-					},
-					"frame": {
-						"x": 78,
-						"y": 182,
-						"w": 42,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0058.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 25,
-						"y": 31,
-						"w": 42,
-						"h": 41
-					},
-					"frame": {
-						"x": 78,
-						"y": 182,
-						"w": 42,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0073.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 25,
-						"y": 31,
-						"w": 42,
-						"h": 41
-					},
-					"frame": {
-						"x": 78,
-						"y": 182,
-						"w": 42,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0075.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 25,
-						"y": 31,
-						"w": 42,
-						"h": 41
-					},
-					"frame": {
-						"x": 78,
-						"y": 182,
-						"w": 42,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 27,
-						"y": 28,
-						"w": 39,
-						"h": 44
-					},
-					"frame": {
-						"x": 120,
-						"y": 181,
-						"w": 39,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0053.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 27,
-						"y": 28,
-						"w": 39,
-						"h": 44
-					},
-					"frame": {
-						"x": 120,
-						"y": 181,
-						"w": 39,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0061.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 27,
-						"y": 28,
-						"w": 39,
-						"h": 44
-					},
-					"frame": {
-						"x": 120,
-						"y": 181,
-						"w": 39,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0070.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 27,
-						"y": 28,
-						"w": 39,
-						"h": 44
-					},
-					"frame": {
-						"x": 120,
-						"y": 181,
-						"w": 39,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0078.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 27,
-						"y": 28,
-						"w": 39,
-						"h": 44
-					},
-					"frame": {
-						"x": 120,
-						"y": 181,
-						"w": 39,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 25,
-						"y": 32,
-						"w": 42,
-						"h": 40
-					},
-					"frame": {
-						"x": 159,
-						"y": 178,
-						"w": 42,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0026.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 25,
-						"y": 32,
-						"w": 42,
-						"h": 40
-					},
-					"frame": {
-						"x": 159,
-						"y": 178,
-						"w": 42,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0057.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 25,
-						"y": 32,
-						"w": 42,
-						"h": 40
-					},
-					"frame": {
-						"x": 159,
-						"y": 178,
-						"w": 42,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0074.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 25,
-						"y": 32,
-						"w": 42,
-						"h": 40
-					},
-					"frame": {
-						"x": 159,
-						"y": 178,
-						"w": 42,
-						"h": 40
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:1af9bc6c970e4ca611c23ce1e26ff660:ab013a92210cb1b0ae94301a2c9b4c2a:45bb13be23ae6e2a6654a2a00c450d62$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 0, "y": 0, "w": 26, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 26, "h": 34 },
+    "sourceSize": { "w": 27, "h": 34 },
+    "duration": 150
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 53, "y": 0, "w": 26, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 26, "h": 32 },
+    "sourceSize": { "w": 27, "h": 34 },
+    "duration": 150
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 26, "y": 0, "w": 27, "h": 31 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 27, "h": 31 },
+    "sourceSize": { "w": 27, "h": 34 },
+    "duration": 150
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 53, "y": 0, "w": 26, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 26, "h": 32 },
+    "sourceSize": { "w": 27, "h": 34 },
+    "duration": 150
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 0, "y": 0, "w": 26, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 26, "h": 34 },
+    "sourceSize": { "w": 27, "h": 34 },
+    "duration": 150
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 0, "y": 0, "w": 26, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 26, "h": 34 },
+    "sourceSize": { "w": 27, "h": 34 },
+    "duration": 150
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 26, "y": 31, "w": 26, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 26, "h": 32 },
+    "sourceSize": { "w": 27, "h": 34 },
+    "duration": 150
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 52, "y": 32, "w": 27, "h": 30 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 27, "h": 30 },
+    "sourceSize": { "w": 27, "h": 34 },
+    "duration": 150
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 26, "y": 31, "w": 26, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 26, "h": 32 },
+    "sourceSize": { "w": 27, "h": 34 },
+    "duration": 150
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 0, "y": 0, "w": 26, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 26, "h": 34 },
+    "sourceSize": { "w": 27, "h": 34 },
+    "duration": 150
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "704.png",
+  "format": "I8",
+  "size": { "w": 79, "h": 63 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/704.png b/public/images/pokemon/exp/back/704.png
index e08171177fd..a67b79b0ee9 100644
Binary files a/public/images/pokemon/exp/back/704.png and b/public/images/pokemon/exp/back/704.png differ
diff --git a/public/images/pokemon/exp/back/705.json b/public/images/pokemon/exp/back/705.json
index be407b80180..2fc8cb18e99 100644
--- a/public/images/pokemon/exp/back/705.json
+++ b/public/images/pokemon/exp/back/705.json
@@ -1,230 +1,596 @@
-{
-	"textures": [
-		{
-			"image": "705.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 118,
-				"h": 118
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 39,
-						"h": 59
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 39,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 39,
-						"h": 59
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 39,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 59
-					},
-					"frame": {
-						"x": 0,
-						"y": 59,
-						"w": 37,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 59
-					},
-					"frame": {
-						"x": 0,
-						"y": 59,
-						"w": 37,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 59
-					},
-					"frame": {
-						"x": 37,
-						"y": 59,
-						"w": 35,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 59
-					},
-					"frame": {
-						"x": 39,
-						"y": 0,
-						"w": 35,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 59
-					},
-					"frame": {
-						"x": 39,
-						"y": 0,
-						"w": 35,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 41,
-						"h": 58
-					},
-					"frame": {
-						"x": 72,
-						"y": 59,
-						"w": 41,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 41,
-						"h": 58
-					},
-					"frame": {
-						"x": 72,
-						"y": 59,
-						"w": 41,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 42,
-						"h": 57
-					},
-					"frame": {
-						"x": 74,
-						"y": 0,
-						"w": 42,
-						"h": 57
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:25dc113e55116f41d58d372b4ed9b10a:95a84e44ff027f7c648e68bbd8ace4bc:6b57e983626c7fc9144ab67f30c66814$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 116, "y": 124, "w": 40, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 40, "h": 59 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 40, "y": 185, "w": 40, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 40, "h": 58 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 77, "y": 298, "w": 40, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 40, "h": 56 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 162, "y": 299, "w": 40, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 40, "h": 56 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 202, "y": 299, "w": 41, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 9, "w": 41, "h": 54 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 117, "y": 300, "w": 41, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 9, "w": 41, "h": 54 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 121, "y": 245, "w": 41, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 41, "h": 55 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 80, "y": 242, "w": 41, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 41, "h": 56 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 0, "y": 244, "w": 40, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 40, "h": 57 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 194, "y": 240, "w": 39, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 39, "h": 59 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 0, "y": 125, "w": 37, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 37, "h": 59 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 156, "y": 184, "w": 38, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 38, "h": 61 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 40, "y": 243, "w": 37, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 37, "h": 62 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 158, "y": 0, "w": 39, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 39, "h": 62 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 156, "y": 62, "w": 39, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 39, "h": 61 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 197, "y": 0, "w": 40, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 40, "h": 60 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 116, "y": 124, "w": 40, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 40, "h": 59 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 40, "y": 185, "w": 40, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 40, "h": 58 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 77, "y": 298, "w": 40, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 40, "h": 56 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 162, "y": 299, "w": 40, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 40, "h": 56 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 202, "y": 299, "w": 41, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 9, "w": 41, "h": 54 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 117, "y": 300, "w": 41, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 9, "w": 41, "h": 54 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 121, "y": 245, "w": 41, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 41, "h": 55 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 80, "y": 242, "w": 41, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 41, "h": 56 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 0, "y": 244, "w": 40, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 40, "h": 57 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 194, "y": 240, "w": 39, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 39, "h": 59 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 0, "y": 125, "w": 37, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 37, "h": 59 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 156, "y": 184, "w": 38, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 38, "h": 61 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 40, "y": 243, "w": 37, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 37, "h": 62 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 158, "y": 0, "w": 39, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 39, "h": 62 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 156, "y": 62, "w": 39, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 39, "h": 61 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 197, "y": 0, "w": 40, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 40, "h": 60 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 116, "y": 124, "w": 40, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 40, "h": 59 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 40, "y": 185, "w": 40, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 40, "h": 58 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 77, "y": 298, "w": 40, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 40, "h": 56 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 162, "y": 299, "w": 40, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 40, "h": 56 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 202, "y": 299, "w": 41, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 9, "w": 41, "h": 54 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 117, "y": 300, "w": 41, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 9, "w": 41, "h": 54 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 121, "y": 245, "w": 41, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 41, "h": 55 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 80, "y": 242, "w": 41, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 41, "h": 56 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 0, "y": 244, "w": 40, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 40, "h": 57 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 194, "y": 240, "w": 39, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 39, "h": 59 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 0, "y": 125, "w": 37, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 37, "h": 59 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 156, "y": 184, "w": 38, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 38, "h": 61 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 40, "y": 243, "w": 37, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 37, "h": 62 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 158, "y": 0, "w": 39, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 39, "h": 62 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 156, "y": 62, "w": 39, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 39, "h": 61 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 197, "y": 0, "w": 40, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 40, "h": 60 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 116, "y": 124, "w": 40, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 40, "h": 59 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 195, "y": 181, "w": 40, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 40, "h": 59 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 118, "y": 0, "w": 40, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 40, "h": 61 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 0, "y": 0, "w": 40, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 40, "h": 62 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 118, "y": 61, "w": 38, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 38, "h": 63 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 0, "y": 62, "w": 38, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 38, "h": 63 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 40, "y": 0, "w": 39, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 39, "h": 63 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 79, "y": 0, "w": 39, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 39, "h": 63 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 38, "y": 63, "w": 39, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 39, "h": 61 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 77, "y": 63, "w": 39, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 39, "h": 61 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 195, "y": 120, "w": 39, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 39, "h": 61 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 156, "y": 123, "w": 39, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 39, "h": 61 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 38, "y": 124, "w": 39, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 39, "h": 61 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 77, "y": 124, "w": 39, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 39, "h": 61 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 197, "y": 60, "w": 40, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 40, "h": 60 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 116, "y": 183, "w": 40, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 40, "h": 59 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 0, "y": 185, "w": 40, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 40, "h": 59 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "705.png",
+  "format": "I8",
+  "size": { "w": 243, "h": 355 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/705.png b/public/images/pokemon/exp/back/705.png
index a4f62a21004..18c942605d6 100644
Binary files a/public/images/pokemon/exp/back/705.png and b/public/images/pokemon/exp/back/705.png differ
diff --git a/public/images/pokemon/exp/back/707.png b/public/images/pokemon/exp/back/707.png
deleted file mode 100644
index 6ce681a5651..00000000000
Binary files a/public/images/pokemon/exp/back/707.png and /dev/null differ
diff --git a/public/images/pokemon/exp/back/708.json b/public/images/pokemon/exp/back/708.json
deleted file mode 100644
index f0b2e21b5c1..00000000000
--- a/public/images/pokemon/exp/back/708.json
+++ /dev/null
@@ -1,503 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "708.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 135,
-				"h": 135
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 4,
-						"w": 46,
-						"h": 46
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 46,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 4,
-						"w": 46,
-						"h": 46
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 46,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 4,
-						"w": 46,
-						"h": 46
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 46,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 1,
-						"w": 45,
-						"h": 46
-					},
-					"frame": {
-						"x": 0,
-						"y": 46,
-						"w": 45,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 1,
-						"w": 45,
-						"h": 46
-					},
-					"frame": {
-						"x": 0,
-						"y": 46,
-						"w": 45,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 1,
-						"w": 45,
-						"h": 46
-					},
-					"frame": {
-						"x": 0,
-						"y": 46,
-						"w": 45,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 8,
-						"w": 45,
-						"h": 43
-					},
-					"frame": {
-						"x": 0,
-						"y": 92,
-						"w": 45,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 8,
-						"w": 45,
-						"h": 43
-					},
-					"frame": {
-						"x": 0,
-						"y": 92,
-						"w": 45,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 0,
-						"w": 44,
-						"h": 46
-					},
-					"frame": {
-						"x": 45,
-						"y": 46,
-						"w": 44,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 0,
-						"w": 44,
-						"h": 46
-					},
-					"frame": {
-						"x": 45,
-						"y": 46,
-						"w": 44,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 0,
-						"w": 44,
-						"h": 46
-					},
-					"frame": {
-						"x": 45,
-						"y": 46,
-						"w": 44,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 6,
-						"w": 45,
-						"h": 45
-					},
-					"frame": {
-						"x": 46,
-						"y": 0,
-						"w": 45,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 6,
-						"w": 45,
-						"h": 45
-					},
-					"frame": {
-						"x": 46,
-						"y": 0,
-						"w": 45,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 6,
-						"w": 45,
-						"h": 45
-					},
-					"frame": {
-						"x": 46,
-						"y": 0,
-						"w": 45,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 6,
-						"w": 45,
-						"h": 45
-					},
-					"frame": {
-						"x": 46,
-						"y": 0,
-						"w": 45,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 10,
-						"w": 44,
-						"h": 41
-					},
-					"frame": {
-						"x": 91,
-						"y": 0,
-						"w": 44,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 10,
-						"w": 44,
-						"h": 41
-					},
-					"frame": {
-						"x": 91,
-						"y": 0,
-						"w": 44,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 1,
-						"w": 45,
-						"h": 45
-					},
-					"frame": {
-						"x": 89,
-						"y": 45,
-						"w": 45,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 1,
-						"w": 45,
-						"h": 45
-					},
-					"frame": {
-						"x": 89,
-						"y": 45,
-						"w": 45,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 1,
-						"w": 45,
-						"h": 45
-					},
-					"frame": {
-						"x": 89,
-						"y": 45,
-						"w": 45,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 3,
-						"w": 45,
-						"h": 44
-					},
-					"frame": {
-						"x": 89,
-						"y": 90,
-						"w": 45,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 3,
-						"w": 45,
-						"h": 44
-					},
-					"frame": {
-						"x": 89,
-						"y": 90,
-						"w": 45,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 3,
-						"w": 45,
-						"h": 44
-					},
-					"frame": {
-						"x": 89,
-						"y": 90,
-						"w": 45,
-						"h": 44
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:bcbffc2559c06539de3a8e783aa9b810:1a73d753b783ff36005e333d5e1a213a:796c82c5076b122f2663381836c65843$"
-	}
-}
diff --git a/public/images/pokemon/exp/back/708.png b/public/images/pokemon/exp/back/708.png
deleted file mode 100644
index a531ec27f9f..00000000000
Binary files a/public/images/pokemon/exp/back/708.png and /dev/null differ
diff --git a/public/images/pokemon/exp/back/712.json b/public/images/pokemon/exp/back/712.json
index 46b8cdaad44..fe53f52369e 100644
--- a/public/images/pokemon/exp/back/712.json
+++ b/public/images/pokemon/exp/back/712.json
@@ -1,2729 +1,1433 @@
-{
-	"textures": [
-		{
-			"image": "712.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 208,
-				"h": 208
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0037.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0038.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0055.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0056.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0073.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0074.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0091.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0092.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 44,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 44,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 44,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 44,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0039.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 44,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0040.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 44,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0057.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 44,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0058.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 44,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0075.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 44,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0076.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 44,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 88,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 88,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0031.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 88,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0032.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 88,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0049.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 88,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0050.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 88,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0067.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 88,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0068.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 88,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0085.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 88,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0086.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 88,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 132,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 132,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0033.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 132,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0034.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 132,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0051.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 132,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0052.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 132,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0069.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 132,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0070.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 132,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0087.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 132,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0088.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 132,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0113.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 38,
-						"h": 41
-					},
-					"frame": {
-						"x": 37,
-						"y": 0,
-						"w": 38,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0114.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 38,
-						"h": 41
-					},
-					"frame": {
-						"x": 37,
-						"y": 0,
-						"w": 38,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0115.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 38,
-						"h": 41
-					},
-					"frame": {
-						"x": 75,
-						"y": 0,
-						"w": 38,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0116.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 38,
-						"h": 41
-					},
-					"frame": {
-						"x": 75,
-						"y": 0,
-						"w": 38,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0119.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 38,
-						"h": 41
-					},
-					"frame": {
-						"x": 113,
-						"y": 0,
-						"w": 38,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0120.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 38,
-						"h": 41
-					},
-					"frame": {
-						"x": 113,
-						"y": 0,
-						"w": 38,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 151,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 151,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0035.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 151,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0036.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 151,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0053.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 151,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0054.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 151,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0071.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 151,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0072.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 151,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0089.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 151,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0090.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 151,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 37,
-						"h": 43
-					},
-					"frame": {
-						"x": 37,
-						"y": 41,
-						"w": 37,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 37,
-						"h": 43
-					},
-					"frame": {
-						"x": 37,
-						"y": 41,
-						"w": 37,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 37,
-						"h": 43
-					},
-					"frame": {
-						"x": 37,
-						"y": 41,
-						"w": 37,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 37,
-						"h": 43
-					},
-					"frame": {
-						"x": 37,
-						"y": 41,
-						"w": 37,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0041.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 37,
-						"h": 43
-					},
-					"frame": {
-						"x": 37,
-						"y": 41,
-						"w": 37,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0042.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 37,
-						"h": 43
-					},
-					"frame": {
-						"x": 37,
-						"y": 41,
-						"w": 37,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0059.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 37,
-						"h": 43
-					},
-					"frame": {
-						"x": 37,
-						"y": 41,
-						"w": 37,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0060.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 37,
-						"h": 43
-					},
-					"frame": {
-						"x": 37,
-						"y": 41,
-						"w": 37,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0077.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 37,
-						"h": 43
-					},
-					"frame": {
-						"x": 37,
-						"y": 41,
-						"w": 37,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0078.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 37,
-						"h": 43
-					},
-					"frame": {
-						"x": 37,
-						"y": 41,
-						"w": 37,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 37,
-						"h": 43
-					},
-					"frame": {
-						"x": 74,
-						"y": 41,
-						"w": 37,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 37,
-						"h": 43
-					},
-					"frame": {
-						"x": 74,
-						"y": 41,
-						"w": 37,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0025.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 37,
-						"h": 43
-					},
-					"frame": {
-						"x": 74,
-						"y": 41,
-						"w": 37,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0026.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 37,
-						"h": 43
-					},
-					"frame": {
-						"x": 74,
-						"y": 41,
-						"w": 37,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0043.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 37,
-						"h": 43
-					},
-					"frame": {
-						"x": 74,
-						"y": 41,
-						"w": 37,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0044.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 37,
-						"h": 43
-					},
-					"frame": {
-						"x": 74,
-						"y": 41,
-						"w": 37,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0061.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 37,
-						"h": 43
-					},
-					"frame": {
-						"x": 74,
-						"y": 41,
-						"w": 37,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0062.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 37,
-						"h": 43
-					},
-					"frame": {
-						"x": 74,
-						"y": 41,
-						"w": 37,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0079.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 37,
-						"h": 43
-					},
-					"frame": {
-						"x": 74,
-						"y": 41,
-						"w": 37,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0080.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 37,
-						"h": 43
-					},
-					"frame": {
-						"x": 74,
-						"y": 41,
-						"w": 37,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 37,
-						"h": 43
-					},
-					"frame": {
-						"x": 111,
-						"y": 41,
-						"w": 37,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 37,
-						"h": 43
-					},
-					"frame": {
-						"x": 111,
-						"y": 41,
-						"w": 37,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0027.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 37,
-						"h": 43
-					},
-					"frame": {
-						"x": 111,
-						"y": 41,
-						"w": 37,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0028.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 37,
-						"h": 43
-					},
-					"frame": {
-						"x": 111,
-						"y": 41,
-						"w": 37,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0045.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 37,
-						"h": 43
-					},
-					"frame": {
-						"x": 111,
-						"y": 41,
-						"w": 37,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0046.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 37,
-						"h": 43
-					},
-					"frame": {
-						"x": 111,
-						"y": 41,
-						"w": 37,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0063.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 37,
-						"h": 43
-					},
-					"frame": {
-						"x": 111,
-						"y": 41,
-						"w": 37,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0064.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 37,
-						"h": 43
-					},
-					"frame": {
-						"x": 111,
-						"y": 41,
-						"w": 37,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0081.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 37,
-						"h": 43
-					},
-					"frame": {
-						"x": 111,
-						"y": 41,
-						"w": 37,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0082.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 37,
-						"h": 43
-					},
-					"frame": {
-						"x": 111,
-						"y": 41,
-						"w": 37,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 37,
-						"h": 43
-					},
-					"frame": {
-						"x": 148,
-						"y": 44,
-						"w": 37,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 37,
-						"h": 43
-					},
-					"frame": {
-						"x": 148,
-						"y": 44,
-						"w": 37,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0029.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 37,
-						"h": 43
-					},
-					"frame": {
-						"x": 148,
-						"y": 44,
-						"w": 37,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0030.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 37,
-						"h": 43
-					},
-					"frame": {
-						"x": 148,
-						"y": 44,
-						"w": 37,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0047.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 37,
-						"h": 43
-					},
-					"frame": {
-						"x": 148,
-						"y": 44,
-						"w": 37,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0048.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 37,
-						"h": 43
-					},
-					"frame": {
-						"x": 148,
-						"y": 44,
-						"w": 37,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0065.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 37,
-						"h": 43
-					},
-					"frame": {
-						"x": 148,
-						"y": 44,
-						"w": 37,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0066.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 37,
-						"h": 43
-					},
-					"frame": {
-						"x": 148,
-						"y": 44,
-						"w": 37,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0083.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 37,
-						"h": 43
-					},
-					"frame": {
-						"x": 148,
-						"y": 44,
-						"w": 37,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0084.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 37,
-						"h": 43
-					},
-					"frame": {
-						"x": 148,
-						"y": 44,
-						"w": 37,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0093.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 37,
-						"h": 43
-					},
-					"frame": {
-						"x": 37,
-						"y": 84,
-						"w": 37,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0094.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 37,
-						"h": 43
-					},
-					"frame": {
-						"x": 37,
-						"y": 84,
-						"w": 37,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0129.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 37,
-						"h": 43
-					},
-					"frame": {
-						"x": 37,
-						"y": 84,
-						"w": 37,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0095.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 2,
-						"w": 37,
-						"h": 42
-					},
-					"frame": {
-						"x": 74,
-						"y": 84,
-						"w": 37,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0096.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 2,
-						"w": 37,
-						"h": 42
-					},
-					"frame": {
-						"x": 74,
-						"y": 84,
-						"w": 37,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0127.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 2,
-						"w": 37,
-						"h": 42
-					},
-					"frame": {
-						"x": 74,
-						"y": 84,
-						"w": 37,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0128.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 2,
-						"w": 37,
-						"h": 42
-					},
-					"frame": {
-						"x": 74,
-						"y": 84,
-						"w": 37,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0097.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 37,
-						"h": 41
-					},
-					"frame": {
-						"x": 111,
-						"y": 84,
-						"w": 37,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0098.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 37,
-						"h": 41
-					},
-					"frame": {
-						"x": 111,
-						"y": 84,
-						"w": 37,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0125.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 37,
-						"h": 41
-					},
-					"frame": {
-						"x": 111,
-						"y": 84,
-						"w": 37,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0126.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 37,
-						"h": 41
-					},
-					"frame": {
-						"x": 111,
-						"y": 84,
-						"w": 37,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0099.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 37,
-						"h": 41
-					},
-					"frame": {
-						"x": 148,
-						"y": 87,
-						"w": 37,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0100.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 37,
-						"h": 41
-					},
-					"frame": {
-						"x": 148,
-						"y": 87,
-						"w": 37,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0101.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 37,
-						"h": 41
-					},
-					"frame": {
-						"x": 111,
-						"y": 125,
-						"w": 37,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0102.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 37,
-						"h": 41
-					},
-					"frame": {
-						"x": 111,
-						"y": 125,
-						"w": 37,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0109.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 37,
-						"h": 41
-					},
-					"frame": {
-						"x": 111,
-						"y": 125,
-						"w": 37,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0110.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 37,
-						"h": 41
-					},
-					"frame": {
-						"x": 111,
-						"y": 125,
-						"w": 37,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0103.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 37,
-						"h": 41
-					},
-					"frame": {
-						"x": 74,
-						"y": 126,
-						"w": 37,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0104.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 37,
-						"h": 41
-					},
-					"frame": {
-						"x": 74,
-						"y": 126,
-						"w": 37,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0107.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 37,
-						"h": 41
-					},
-					"frame": {
-						"x": 74,
-						"y": 126,
-						"w": 37,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0108.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 37,
-						"h": 41
-					},
-					"frame": {
-						"x": 74,
-						"y": 126,
-						"w": 37,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0105.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 37,
-						"h": 41
-					},
-					"frame": {
-						"x": 37,
-						"y": 127,
-						"w": 37,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0106.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 37,
-						"h": 41
-					},
-					"frame": {
-						"x": 37,
-						"y": 127,
-						"w": 37,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0111.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 37,
-						"h": 41
-					},
-					"frame": {
-						"x": 74,
-						"y": 167,
-						"w": 37,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0112.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 37,
-						"h": 41
-					},
-					"frame": {
-						"x": 74,
-						"y": 167,
-						"w": 37,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0123.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 37,
-						"h": 40
-					},
-					"frame": {
-						"x": 37,
-						"y": 168,
-						"w": 37,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0124.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 37,
-						"h": 40
-					},
-					"frame": {
-						"x": 37,
-						"y": 168,
-						"w": 37,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0117.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 37,
-						"h": 41
-					},
-					"frame": {
-						"x": 111,
-						"y": 166,
-						"w": 37,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0118.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 37,
-						"h": 41
-					},
-					"frame": {
-						"x": 111,
-						"y": 166,
-						"w": 37,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0121.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 36,
-						"h": 41
-					},
-					"frame": {
-						"x": 148,
-						"y": 128,
-						"w": 36,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0122.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 36,
-						"h": 41
-					},
-					"frame": {
-						"x": 148,
-						"y": 128,
-						"w": 36,
-						"h": 41
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:600bb71c0995d9554966ee794b89312a:22158bf1d17659480b23ef6d5ed6dbcb:3a1cc69824960d920ca43f8c9376d136$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 106, "y": 0, "w": 35, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 106, "y": 0, "w": 35, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 106, "y": 0, "w": 35, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 141, "y": 0, "w": 35, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 141, "y": 0, "w": 35, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 105, "y": 43, "w": 35, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 35, "h": 42 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 105, "y": 43, "w": 35, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 35, "h": 42 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 140, "y": 43, "w": 35, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 35, "h": 42 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 140, "y": 43, "w": 35, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 35, "h": 42 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 0, "y": 44, "w": 35, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 35, "h": 42 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 0, "y": 44, "w": 35, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 35, "h": 42 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 70, "y": 0, "w": 36, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 36, "h": 42 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 70, "y": 0, "w": 36, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 36, "h": 42 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 70, "y": 42, "w": 35, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 35, "h": 43 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 70, "y": 42, "w": 35, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 35, "h": 43 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 0, "y": 0, "w": 35, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 35, "h": 44 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 0, "y": 0, "w": 35, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 35, "h": 44 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 35, "y": 0, "w": 35, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 35, "h": 44 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 35, "y": 0, "w": 35, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 35, "h": 44 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 106, "y": 0, "w": 35, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 106, "y": 0, "w": 35, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 106, "y": 0, "w": 35, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 106, "y": 0, "w": 35, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 106, "y": 0, "w": 35, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 106, "y": 0, "w": 35, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 141, "y": 0, "w": 35, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 141, "y": 0, "w": 35, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 105, "y": 43, "w": 35, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 35, "h": 42 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 105, "y": 43, "w": 35, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 35, "h": 42 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 140, "y": 43, "w": 35, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 35, "h": 42 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 140, "y": 43, "w": 35, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 35, "h": 42 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 0, "y": 44, "w": 35, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 35, "h": 42 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 0, "y": 44, "w": 35, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 35, "h": 42 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 70, "y": 0, "w": 36, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 36, "h": 42 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 70, "y": 0, "w": 36, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 36, "h": 42 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 70, "y": 42, "w": 35, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 35, "h": 43 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 70, "y": 42, "w": 35, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 35, "h": 43 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 0, "y": 0, "w": 35, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 35, "h": 44 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 0, "y": 0, "w": 35, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 35, "h": 44 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 35, "y": 0, "w": 35, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 35, "h": 44 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 35, "y": 0, "w": 35, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 35, "h": 44 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 106, "y": 0, "w": 35, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 106, "y": 0, "w": 35, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 106, "y": 0, "w": 35, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 106, "y": 0, "w": 35, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 106, "y": 0, "w": 35, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 106, "y": 0, "w": 35, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 141, "y": 0, "w": 35, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 141, "y": 0, "w": 35, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 105, "y": 43, "w": 35, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 35, "h": 42 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 105, "y": 43, "w": 35, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 35, "h": 42 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 140, "y": 43, "w": 35, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 35, "h": 42 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 140, "y": 43, "w": 35, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 35, "h": 42 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 0, "y": 44, "w": 35, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 35, "h": 42 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 0, "y": 44, "w": 35, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 35, "h": 42 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 70, "y": 0, "w": 36, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 36, "h": 42 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 70, "y": 0, "w": 36, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 36, "h": 42 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 70, "y": 42, "w": 35, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 35, "h": 43 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 70, "y": 42, "w": 35, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 35, "h": 43 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 0, "y": 0, "w": 35, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 35, "h": 44 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 0, "y": 0, "w": 35, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 35, "h": 44 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 35, "y": 0, "w": 35, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 35, "h": 44 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 35, "y": 0, "w": 35, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 35, "h": 44 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 106, "y": 0, "w": 35, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 106, "y": 0, "w": 35, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 106, "y": 0, "w": 35, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 106, "y": 0, "w": 35, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 106, "y": 0, "w": 35, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 106, "y": 0, "w": 35, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 141, "y": 0, "w": 35, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 141, "y": 0, "w": 35, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 105, "y": 43, "w": 35, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 35, "h": 42 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 105, "y": 43, "w": 35, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 35, "h": 42 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 140, "y": 43, "w": 35, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 35, "h": 42 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 140, "y": 43, "w": 35, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 35, "h": 42 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 0, "y": 44, "w": 35, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 35, "h": 42 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 0, "y": 44, "w": 35, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 35, "h": 42 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 70, "y": 0, "w": 36, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 36, "h": 42 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 70, "y": 0, "w": 36, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 36, "h": 42 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 70, "y": 42, "w": 35, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 35, "h": 43 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 70, "y": 42, "w": 35, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 35, "h": 43 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 0, "y": 0, "w": 35, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 35, "h": 44 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 0, "y": 0, "w": 35, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 35, "h": 44 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 35, "y": 0, "w": 35, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 35, "h": 44 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 35, "y": 0, "w": 35, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 35, "h": 44 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 106, "y": 0, "w": 35, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 106, "y": 0, "w": 35, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0088.png",
+    "frame": { "x": 106, "y": 0, "w": 35, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0089.png",
+    "frame": { "x": 106, "y": 0, "w": 35, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0090.png",
+    "frame": { "x": 106, "y": 0, "w": 35, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0091.png",
+    "frame": { "x": 106, "y": 0, "w": 35, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0092.png",
+    "frame": { "x": 141, "y": 0, "w": 35, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0093.png",
+    "frame": { "x": 141, "y": 0, "w": 35, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0094.png",
+    "frame": { "x": 105, "y": 43, "w": 35, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 35, "h": 42 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0095.png",
+    "frame": { "x": 105, "y": 43, "w": 35, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 35, "h": 42 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0096.png",
+    "frame": { "x": 140, "y": 43, "w": 35, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 35, "h": 42 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0097.png",
+    "frame": { "x": 140, "y": 43, "w": 35, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 35, "h": 42 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0098.png",
+    "frame": { "x": 0, "y": 44, "w": 35, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 35, "h": 42 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0099.png",
+    "frame": { "x": 0, "y": 44, "w": 35, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 35, "h": 42 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0100.png",
+    "frame": { "x": 70, "y": 0, "w": 36, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 36, "h": 42 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0101.png",
+    "frame": { "x": 70, "y": 0, "w": 36, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 36, "h": 42 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0102.png",
+    "frame": { "x": 70, "y": 42, "w": 35, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 35, "h": 43 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0103.png",
+    "frame": { "x": 70, "y": 42, "w": 35, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 35, "h": 43 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0104.png",
+    "frame": { "x": 0, "y": 0, "w": 35, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 35, "h": 44 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0105.png",
+    "frame": { "x": 0, "y": 0, "w": 35, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 35, "h": 44 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0106.png",
+    "frame": { "x": 35, "y": 0, "w": 35, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 35, "h": 44 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0107.png",
+    "frame": { "x": 35, "y": 0, "w": 35, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 35, "h": 44 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0108.png",
+    "frame": { "x": 106, "y": 0, "w": 35, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0109.png",
+    "frame": { "x": 106, "y": 0, "w": 35, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0110.png",
+    "frame": { "x": 106, "y": 0, "w": 35, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0111.png",
+    "frame": { "x": 106, "y": 0, "w": 35, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0112.png",
+    "frame": { "x": 106, "y": 0, "w": 35, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0113.png",
+    "frame": { "x": 106, "y": 0, "w": 35, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0114.png",
+    "frame": { "x": 35, "y": 44, "w": 35, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 35, "h": 42 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0115.png",
+    "frame": { "x": 35, "y": 44, "w": 35, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 35, "h": 42 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0116.png",
+    "frame": { "x": 72, "y": 125, "w": 35, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 35, "h": 41 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0117.png",
+    "frame": { "x": 72, "y": 125, "w": 35, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 35, "h": 41 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0118.png",
+    "frame": { "x": 107, "y": 125, "w": 35, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 35, "h": 40 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0119.png",
+    "frame": { "x": 107, "y": 125, "w": 35, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 35, "h": 40 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0120.png",
+    "frame": { "x": 107, "y": 125, "w": 35, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 35, "h": 40 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0121.png",
+    "frame": { "x": 107, "y": 125, "w": 35, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 35, "h": 40 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0122.png",
+    "frame": { "x": 107, "y": 125, "w": 35, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 35, "h": 40 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0123.png",
+    "frame": { "x": 107, "y": 125, "w": 35, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 35, "h": 40 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0124.png",
+    "frame": { "x": 142, "y": 125, "w": 35, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 35, "h": 40 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0125.png",
+    "frame": { "x": 142, "y": 125, "w": 35, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 35, "h": 40 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0126.png",
+    "frame": { "x": 0, "y": 126, "w": 35, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 35, "h": 40 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0127.png",
+    "frame": { "x": 0, "y": 126, "w": 35, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 35, "h": 40 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0128.png",
+    "frame": { "x": 70, "y": 85, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 36, "h": 40 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0129.png",
+    "frame": { "x": 70, "y": 85, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 36, "h": 40 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0130.png",
+    "frame": { "x": 106, "y": 85, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 36, "h": 40 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0131.png",
+    "frame": { "x": 106, "y": 85, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 36, "h": 40 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0132.png",
+    "frame": { "x": 70, "y": 85, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 36, "h": 40 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0133.png",
+    "frame": { "x": 70, "y": 85, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 36, "h": 40 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0134.png",
+    "frame": { "x": 0, "y": 126, "w": 35, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 35, "h": 40 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0135.png",
+    "frame": { "x": 0, "y": 126, "w": 35, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 35, "h": 40 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0136.png",
+    "frame": { "x": 35, "y": 165, "w": 35, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 35, "h": 40 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0137.png",
+    "frame": { "x": 35, "y": 165, "w": 35, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 35, "h": 40 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0138.png",
+    "frame": { "x": 142, "y": 85, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 36, "h": 40 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0139.png",
+    "frame": { "x": 142, "y": 85, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 36, "h": 40 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0140.png",
+    "frame": { "x": 0, "y": 86, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 36, "h": 40 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0141.png",
+    "frame": { "x": 0, "y": 86, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 36, "h": 40 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0142.png",
+    "frame": { "x": 107, "y": 165, "w": 35, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 35, "h": 40 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0143.png",
+    "frame": { "x": 107, "y": 165, "w": 35, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 35, "h": 40 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0144.png",
+    "frame": { "x": 36, "y": 125, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 36, "h": 40 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0145.png",
+    "frame": { "x": 36, "y": 125, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 36, "h": 40 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0146.png",
+    "frame": { "x": 142, "y": 165, "w": 35, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 35, "h": 40 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0147.png",
+    "frame": { "x": 142, "y": 165, "w": 35, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 35, "h": 40 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0148.png",
+    "frame": { "x": 0, "y": 166, "w": 35, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 35, "h": 39 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0149.png",
+    "frame": { "x": 0, "y": 166, "w": 35, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 35, "h": 39 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0150.png",
+    "frame": { "x": 107, "y": 125, "w": 35, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 35, "h": 40 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0151.png",
+    "frame": { "x": 107, "y": 125, "w": 35, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 35, "h": 40 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0152.png",
+    "frame": { "x": 107, "y": 125, "w": 35, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 35, "h": 40 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0153.png",
+    "frame": { "x": 107, "y": 125, "w": 35, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 35, "h": 40 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0154.png",
+    "frame": { "x": 107, "y": 125, "w": 35, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 35, "h": 40 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0155.png",
+    "frame": { "x": 72, "y": 125, "w": 35, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 35, "h": 41 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0156.png",
+    "frame": { "x": 72, "y": 125, "w": 35, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 35, "h": 41 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0157.png",
+    "frame": { "x": 35, "y": 44, "w": 35, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 35, "h": 42 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0158.png",
+    "frame": { "x": 35, "y": 44, "w": 35, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 35, "h": 42 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.11-x64",
+  "image": "712.png",
+  "format": "I8",
+  "size": { "w": 178, "h": 205 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/712.png b/public/images/pokemon/exp/back/712.png
index 81f77412357..a5b57fc9f1b 100644
Binary files a/public/images/pokemon/exp/back/712.png and b/public/images/pokemon/exp/back/712.png differ
diff --git a/public/images/pokemon/exp/back/713.json b/public/images/pokemon/exp/back/713.json
index c2e09d4783e..0ff72eef867 100644
--- a/public/images/pokemon/exp/back/713.json
+++ b/public/images/pokemon/exp/back/713.json
@@ -1,188 +1,1100 @@
-{
-	"textures": [
-		{
-			"image": "713.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 199,
-				"h": 199
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 87,
-						"h": 69
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 87,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 87,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 87,
-						"h": 69
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 87,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 87,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 87,
-						"h": 69
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 87,
-						"h": 69
-					},
-					"frame": {
-						"x": 87,
-						"y": 0,
-						"w": 87,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 87,
-						"h": 69
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 87,
-						"h": 69
-					},
-					"frame": {
-						"x": 87,
-						"y": 0,
-						"w": 87,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 87,
-						"h": 69
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 87,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 69,
-						"w": 87,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 87,
-						"h": 69
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 87,
-						"h": 66
-					},
-					"frame": {
-						"x": 87,
-						"y": 69,
-						"w": 87,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 87,
-						"h": 69
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 87,
-						"h": 66
-					},
-					"frame": {
-						"x": 87,
-						"y": 69,
-						"w": 87,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 87,
-						"h": 69
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 87,
-						"h": 64
-					},
-					"frame": {
-						"x": 87,
-						"y": 135,
-						"w": 87,
-						"h": 64
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:6f396042cb759179580f2aeb1af94e22:59471aca6db39209b1e31d5894938bcb:625f70bcfe9c7f2437cb9cad6d2b863c$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 87, "y": 63, "w": 87, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 87, "y": 126, "w": 87, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 87, "h": 62 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 0, "y": 127, "w": 87, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 87, "h": 62 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 261, "y": 127, "w": 87, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 87, "h": 61 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 174, "y": 128, "w": 87, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 87, "h": 61 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 87, "y": 188, "w": 87, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 87, "h": 60 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 87, "y": 188, "w": 87, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 87, "h": 60 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 87, "y": 188, "w": 87, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 87, "h": 60 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 174, "y": 128, "w": 87, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 87, "h": 61 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 261, "y": 127, "w": 87, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 87, "h": 61 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 0, "y": 127, "w": 87, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 87, "h": 62 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 87, "y": 126, "w": 87, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 87, "h": 62 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 87, "y": 63, "w": 87, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 270, "y": 64, "w": 87, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 270, "y": 0, "w": 87, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 87, "h": 64 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 0, "y": 63, "w": 87, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 87, "h": 64 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 183, "y": 0, "w": 87, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 87, "h": 65 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 183, "y": 0, "w": 87, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 87, "h": 65 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 183, "y": 0, "w": 87, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 87, "h": 65 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 183, "y": 0, "w": 87, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 87, "h": 65 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 0, "y": 63, "w": 87, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 87, "h": 64 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 270, "y": 0, "w": 87, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 87, "h": 64 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 270, "y": 64, "w": 87, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 87, "y": 63, "w": 87, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 87, "y": 126, "w": 87, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 87, "h": 62 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 0, "y": 127, "w": 87, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 87, "h": 62 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 261, "y": 127, "w": 87, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 87, "h": 61 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 174, "y": 128, "w": 87, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 87, "h": 61 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 87, "y": 188, "w": 87, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 87, "h": 60 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 87, "y": 188, "w": 87, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 87, "h": 60 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 87, "y": 188, "w": 87, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 87, "h": 60 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 174, "y": 128, "w": 87, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 87, "h": 61 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 261, "y": 127, "w": 87, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 87, "h": 61 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 0, "y": 127, "w": 87, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 87, "h": 62 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 87, "y": 126, "w": 87, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 87, "h": 62 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 87, "y": 63, "w": 87, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 270, "y": 64, "w": 87, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 270, "y": 0, "w": 87, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 87, "h": 64 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 0, "y": 63, "w": 87, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 87, "h": 64 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 183, "y": 0, "w": 87, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 87, "h": 65 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 183, "y": 0, "w": 87, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 87, "h": 65 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 183, "y": 0, "w": 87, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 87, "h": 65 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 183, "y": 0, "w": 87, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 87, "h": 65 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 0, "y": 63, "w": 87, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 87, "h": 64 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 270, "y": 0, "w": 87, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 87, "h": 64 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 270, "y": 64, "w": 87, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 87, "y": 63, "w": 87, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 87, "y": 126, "w": 87, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 87, "h": 62 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 0, "y": 127, "w": 87, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 87, "h": 62 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 261, "y": 127, "w": 87, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 87, "h": 61 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 174, "y": 128, "w": 87, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 87, "h": 61 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 87, "y": 188, "w": 87, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 87, "h": 60 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 87, "y": 188, "w": 87, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 87, "h": 60 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 87, "y": 188, "w": 87, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 87, "h": 60 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 174, "y": 128, "w": 87, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 87, "h": 61 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 261, "y": 127, "w": 87, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 87, "h": 61 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 0, "y": 127, "w": 87, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 87, "h": 62 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 87, "y": 126, "w": 87, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 87, "h": 62 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 87, "y": 63, "w": 87, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 270, "y": 64, "w": 87, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 270, "y": 0, "w": 87, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 87, "h": 64 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 0, "y": 63, "w": 87, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 87, "h": 64 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 183, "y": 0, "w": 87, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 87, "h": 65 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 183, "y": 0, "w": 87, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 87, "h": 65 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 183, "y": 0, "w": 87, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 87, "h": 65 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 183, "y": 0, "w": 87, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 87, "h": 65 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 0, "y": 63, "w": 87, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 87, "h": 64 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 270, "y": 0, "w": 87, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 87, "h": 64 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 270, "y": 64, "w": 87, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 87, "y": 63, "w": 87, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 87, "y": 126, "w": 87, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 87, "h": 62 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 0, "y": 127, "w": 87, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 87, "h": 62 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 261, "y": 127, "w": 87, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 87, "h": 61 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 174, "y": 128, "w": 87, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 87, "h": 61 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 87, "y": 188, "w": 87, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 87, "h": 60 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 87, "y": 188, "w": 87, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 87, "h": 60 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 87, "y": 188, "w": 87, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 87, "h": 60 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 174, "y": 128, "w": 87, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 87, "h": 61 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 261, "y": 127, "w": 87, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 87, "h": 61 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 0, "y": 127, "w": 87, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 87, "h": 62 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 87, "y": 126, "w": 87, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 87, "h": 62 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 87, "y": 63, "w": 87, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 270, "y": 64, "w": 87, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 270, "y": 0, "w": 87, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 87, "h": 64 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 0, "y": 63, "w": 87, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 87, "h": 64 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 183, "y": 0, "w": 87, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 87, "h": 65 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 183, "y": 0, "w": 87, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 87, "h": 65 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0088.png",
+    "frame": { "x": 183, "y": 0, "w": 87, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 87, "h": 65 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0089.png",
+    "frame": { "x": 183, "y": 0, "w": 87, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 87, "h": 65 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0090.png",
+    "frame": { "x": 0, "y": 63, "w": 87, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 87, "h": 64 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0091.png",
+    "frame": { "x": 270, "y": 0, "w": 87, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 87, "h": 64 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0092.png",
+    "frame": { "x": 270, "y": 64, "w": 87, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0093.png",
+    "frame": { "x": 270, "y": 64, "w": 87, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0094.png",
+    "frame": { "x": 87, "y": 63, "w": 87, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0095.png",
+    "frame": { "x": 87, "y": 63, "w": 87, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0096.png",
+    "frame": { "x": 87, "y": 63, "w": 87, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0097.png",
+    "frame": { "x": 87, "y": 63, "w": 87, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0098.png",
+    "frame": { "x": 174, "y": 65, "w": 87, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0099.png",
+    "frame": { "x": 174, "y": 65, "w": 87, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0100.png",
+    "frame": { "x": 92, "y": 0, "w": 91, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 91, "h": 63 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0101.png",
+    "frame": { "x": 92, "y": 0, "w": 91, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 91, "h": 63 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0102.png",
+    "frame": { "x": 0, "y": 0, "w": 92, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 92, "h": 63 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0103.png",
+    "frame": { "x": 0, "y": 0, "w": 92, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 92, "h": 63 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0104.png",
+    "frame": { "x": 0, "y": 0, "w": 92, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 92, "h": 63 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0105.png",
+    "frame": { "x": 0, "y": 0, "w": 92, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 92, "h": 63 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0106.png",
+    "frame": { "x": 0, "y": 0, "w": 92, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 92, "h": 63 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0107.png",
+    "frame": { "x": 87, "y": 63, "w": 87, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 87, "h": 63 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0108.png",
+    "frame": { "x": 87, "y": 63, "w": 87, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 87, "h": 63 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0109.png",
+    "frame": { "x": 87, "y": 63, "w": 87, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0110.png",
+    "frame": { "x": 87, "y": 63, "w": 87, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0111.png",
+    "frame": { "x": 87, "y": 63, "w": 87, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0112.png",
+    "frame": { "x": 87, "y": 63, "w": 87, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0113.png",
+    "frame": { "x": 87, "y": 63, "w": 87, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0114.png",
+    "frame": { "x": 87, "y": 63, "w": 87, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0115.png",
+    "frame": { "x": 87, "y": 63, "w": 87, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0116.png",
+    "frame": { "x": 87, "y": 63, "w": 87, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0117.png",
+    "frame": { "x": 87, "y": 63, "w": 87, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0118.png",
+    "frame": { "x": 87, "y": 63, "w": 87, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 87, "h": 63 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0119.png",
+    "frame": { "x": 87, "y": 63, "w": 87, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 87, "h": 63 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0120.png",
+    "frame": { "x": 87, "y": 63, "w": 87, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 87, "h": 63 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0121.png",
+    "frame": { "x": 87, "y": 63, "w": 87, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.11-x64",
+  "image": "713.png",
+  "format": "I8",
+  "size": { "w": 357, "h": 248 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/713.png b/public/images/pokemon/exp/back/713.png
index 6692bc5c65a..d6782ee4357 100644
Binary files a/public/images/pokemon/exp/back/713.png and b/public/images/pokemon/exp/back/713.png differ
diff --git a/public/images/pokemon/exp/back/714.json b/public/images/pokemon/exp/back/714.json
deleted file mode 100644
index ecdf5b1b813..00000000000
--- a/public/images/pokemon/exp/back/714.json
+++ /dev/null
@@ -1,230 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "714.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 147,
-				"h": 147
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 60,
-						"h": 69
-					},
-					"spriteSourceSize": {
-						"x": 13,
-						"y": 0,
-						"w": 34,
-						"h": 57
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 34,
-						"h": 57
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 60,
-						"h": 69
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 11,
-						"w": 60,
-						"h": 58
-					},
-					"frame": {
-						"x": 34,
-						"y": 0,
-						"w": 60,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 60,
-						"h": 69
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 3,
-						"w": 46,
-						"h": 58
-					},
-					"frame": {
-						"x": 94,
-						"y": 0,
-						"w": 46,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 60,
-						"h": 69
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 3,
-						"w": 46,
-						"h": 58
-					},
-					"frame": {
-						"x": 94,
-						"y": 0,
-						"w": 46,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 60,
-						"h": 69
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 10,
-						"w": 58,
-						"h": 58
-					},
-					"frame": {
-						"x": 0,
-						"y": 58,
-						"w": 58,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 60,
-						"h": 69
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 10,
-						"w": 58,
-						"h": 58
-					},
-					"frame": {
-						"x": 0,
-						"y": 58,
-						"w": 58,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 60,
-						"h": 69
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 7,
-						"w": 54,
-						"h": 58
-					},
-					"frame": {
-						"x": 58,
-						"y": 58,
-						"w": 54,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 60,
-						"h": 69
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 7,
-						"w": 54,
-						"h": 58
-					},
-					"frame": {
-						"x": 58,
-						"y": 58,
-						"w": 54,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 60,
-						"h": 69
-					},
-					"spriteSourceSize": {
-						"x": 12,
-						"y": 1,
-						"w": 35,
-						"h": 58
-					},
-					"frame": {
-						"x": 112,
-						"y": 58,
-						"w": 35,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 60,
-						"h": 69
-					},
-					"spriteSourceSize": {
-						"x": 12,
-						"y": 1,
-						"w": 35,
-						"h": 58
-					},
-					"frame": {
-						"x": 112,
-						"y": 58,
-						"w": 35,
-						"h": 58
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:5c3a62d7014eae3eb4c5e67ef6a405f3:1456f6425f3a65e77dc4017298499d80:1a07d46e710b0568ec824f54fbc4fe6a$"
-	}
-}
diff --git a/public/images/pokemon/exp/back/714.png b/public/images/pokemon/exp/back/714.png
deleted file mode 100644
index 0d81f19fcd4..00000000000
Binary files a/public/images/pokemon/exp/back/714.png and /dev/null differ
diff --git a/public/images/pokemon/exp/back/718-10.png b/public/images/pokemon/exp/back/718-10.png
deleted file mode 100644
index 709dc3bea8a..00000000000
Binary files a/public/images/pokemon/exp/back/718-10.png and /dev/null differ
diff --git a/public/images/pokemon/exp/back/718.json b/public/images/pokemon/exp/back/718.json
deleted file mode 100644
index 698179b1453..00000000000
--- a/public/images/pokemon/exp/back/718.json
+++ /dev/null
@@ -1,230 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "718.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 216,
-				"h": 216
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 75,
-						"h": 89
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 74,
-						"h": 89
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 74,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 75,
-						"h": 89
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 74,
-						"h": 89
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 74,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 75,
-						"h": 89
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 73,
-						"h": 89
-					},
-					"frame": {
-						"x": 0,
-						"y": 89,
-						"w": 73,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 75,
-						"h": 89
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 73,
-						"h": 89
-					},
-					"frame": {
-						"x": 73,
-						"y": 89,
-						"w": 73,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 75,
-						"h": 89
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 73,
-						"h": 89
-					},
-					"frame": {
-						"x": 73,
-						"y": 89,
-						"w": 73,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 75,
-						"h": 89
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 72,
-						"h": 89
-					},
-					"frame": {
-						"x": 74,
-						"y": 0,
-						"w": 72,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 75,
-						"h": 89
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 72,
-						"h": 89
-					},
-					"frame": {
-						"x": 74,
-						"y": 0,
-						"w": 72,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 75,
-						"h": 89
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 0,
-						"w": 70,
-						"h": 88
-					},
-					"frame": {
-						"x": 146,
-						"y": 0,
-						"w": 70,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 75,
-						"h": 89
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 0,
-						"w": 70,
-						"h": 88
-					},
-					"frame": {
-						"x": 146,
-						"y": 0,
-						"w": 70,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 75,
-						"h": 89
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 1,
-						"w": 69,
-						"h": 87
-					},
-					"frame": {
-						"x": 146,
-						"y": 88,
-						"w": 69,
-						"h": 87
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:82c29d609c52a3a1aa4b9af042ef9ce8:8d05611f8189d493fef8906e0f11f3de:7b4a06b06cbac24b3f39727b0238661b$"
-	}
-}
diff --git a/public/images/pokemon/exp/back/718.png b/public/images/pokemon/exp/back/718.png
deleted file mode 100644
index f2f380e339a..00000000000
Binary files a/public/images/pokemon/exp/back/718.png and /dev/null differ
diff --git a/public/images/pokemon/exp/back/719.json b/public/images/pokemon/exp/back/719.json
deleted file mode 100644
index 4cd0e34f113..00000000000
--- a/public/images/pokemon/exp/back/719.json
+++ /dev/null
@@ -1,272 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "719.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 158,
-				"h": 158
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 44,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 14,
-						"w": 39,
-						"h": 66
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 39,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 44,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 12,
-						"w": 39,
-						"h": 67
-					},
-					"frame": {
-						"x": 39,
-						"y": 0,
-						"w": 39,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 44,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 12,
-						"w": 39,
-						"h": 67
-					},
-					"frame": {
-						"x": 39,
-						"y": 0,
-						"w": 39,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 44,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 8,
-						"w": 40,
-						"h": 67
-					},
-					"frame": {
-						"x": 78,
-						"y": 0,
-						"w": 40,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 44,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 8,
-						"w": 40,
-						"h": 67
-					},
-					"frame": {
-						"x": 78,
-						"y": 0,
-						"w": 40,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 44,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 5,
-						"w": 40,
-						"h": 67
-					},
-					"frame": {
-						"x": 118,
-						"y": 0,
-						"w": 40,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 44,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 5,
-						"w": 40,
-						"h": 67
-					},
-					"frame": {
-						"x": 118,
-						"y": 0,
-						"w": 40,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 44,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 41,
-						"h": 67
-					},
-					"frame": {
-						"x": 0,
-						"y": 67,
-						"w": 41,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 44,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 41,
-						"h": 68
-					},
-					"frame": {
-						"x": 41,
-						"y": 67,
-						"w": 41,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 44,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 41,
-						"h": 68
-					},
-					"frame": {
-						"x": 41,
-						"y": 67,
-						"w": 41,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 44,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 42,
-						"h": 68
-					},
-					"frame": {
-						"x": 82,
-						"y": 67,
-						"w": 42,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 44,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 42,
-						"h": 68
-					},
-					"frame": {
-						"x": 82,
-						"y": 67,
-						"w": 42,
-						"h": 68
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:0db095e3b451ffc873bea6b5e23ba65d:f7ad8a345854a119edb545cc03dcde8e:17a705bb924916761be2495822a53735$"
-	}
-}
diff --git a/public/images/pokemon/exp/back/719.png b/public/images/pokemon/exp/back/719.png
deleted file mode 100644
index cb0c84041f9..00000000000
Binary files a/public/images/pokemon/exp/back/719.png and /dev/null differ
diff --git a/public/images/pokemon/exp/back/728.json b/public/images/pokemon/exp/back/728.json
index 5f57c1fcd44..58c482252ec 100644
--- a/public/images/pokemon/exp/back/728.json
+++ b/public/images/pokemon/exp/back/728.json
@@ -1,230 +1,776 @@
-{
-	"textures": [
-		{
-			"image": "728.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 117,
-				"h": 117
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 41,
-						"h": 39
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 39
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 39
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 41,
-						"h": 39
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 39
-					},
-					"frame": {
-						"x": 0,
-						"y": 39,
-						"w": 41,
-						"h": 39
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 41,
-						"h": 39
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 39
-					},
-					"frame": {
-						"x": 0,
-						"y": 39,
-						"w": 41,
-						"h": 39
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 41,
-						"h": 39
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 39
-					},
-					"frame": {
-						"x": 0,
-						"y": 78,
-						"w": 41,
-						"h": 39
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 41,
-						"h": 39
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 39
-					},
-					"frame": {
-						"x": 0,
-						"y": 78,
-						"w": 41,
-						"h": 39
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 41,
-						"h": 39
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 39
-					},
-					"frame": {
-						"x": 41,
-						"y": 0,
-						"w": 41,
-						"h": 39
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 41,
-						"h": 39
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 39
-					},
-					"frame": {
-						"x": 41,
-						"y": 0,
-						"w": 41,
-						"h": 39
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 41,
-						"h": 39
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 39
-					},
-					"frame": {
-						"x": 41,
-						"y": 39,
-						"w": 41,
-						"h": 39
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 41,
-						"h": 39
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 39
-					},
-					"frame": {
-						"x": 41,
-						"y": 39,
-						"w": 41,
-						"h": 39
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 41,
-						"h": 39
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 39
-					},
-					"frame": {
-						"x": 41,
-						"y": 78,
-						"w": 41,
-						"h": 39
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:0c090e4088db927644a68af712498874:155a43cf4b3a603228f72b6aea7f5fa8:74218c18c9d392741666ee5c0c28d306$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 130, "y": 151, "w": 40, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 20, "w": 40, "h": 39 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 85, "y": 152, "w": 40, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 20, "w": 40, "h": 39 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 43, "y": 194, "w": 40, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 21, "w": 40, "h": 37 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 169, "y": 194, "w": 39, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 21, "w": 39, "h": 37 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 166, "y": 233, "w": 39, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 22, "w": 39, "h": 36 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 1, "y": 234, "w": 39, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 22, "w": 39, "h": 36 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 43, "y": 233, "w": 39, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 21, "w": 39, "h": 37 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 84, "y": 233, "w": 39, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 21, "w": 39, "h": 37 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 125, "y": 233, "w": 39, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 21, "w": 39, "h": 37 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 85, "y": 193, "w": 40, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 20, "w": 40, "h": 38 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 43, "y": 153, "w": 40, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 20, "w": 40, "h": 39 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 127, "y": 192, "w": 40, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 20, "w": 40, "h": 39 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 130, "y": 151, "w": 40, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 20, "w": 40, "h": 39 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 85, "y": 152, "w": 40, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 20, "w": 40, "h": 39 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 43, "y": 194, "w": 40, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 21, "w": 40, "h": 37 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 169, "y": 194, "w": 39, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 21, "w": 39, "h": 37 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 166, "y": 233, "w": 39, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 22, "w": 39, "h": 36 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 1, "y": 234, "w": 39, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 22, "w": 39, "h": 36 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 43, "y": 233, "w": 39, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 21, "w": 39, "h": 37 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 84, "y": 233, "w": 39, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 21, "w": 39, "h": 37 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 125, "y": 233, "w": 39, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 21, "w": 39, "h": 37 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 85, "y": 193, "w": 40, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 20, "w": 40, "h": 38 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 43, "y": 153, "w": 40, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 20, "w": 40, "h": 39 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 127, "y": 192, "w": 40, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 20, "w": 40, "h": 39 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 130, "y": 151, "w": 40, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 20, "w": 40, "h": 39 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 85, "y": 152, "w": 40, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 20, "w": 40, "h": 39 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 43, "y": 194, "w": 40, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 21, "w": 40, "h": 37 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 169, "y": 194, "w": 39, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 21, "w": 39, "h": 37 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 166, "y": 233, "w": 39, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 22, "w": 39, "h": 36 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 1, "y": 234, "w": 39, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 22, "w": 39, "h": 36 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 43, "y": 233, "w": 39, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 21, "w": 39, "h": 37 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 84, "y": 233, "w": 39, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 21, "w": 39, "h": 37 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 125, "y": 233, "w": 39, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 21, "w": 39, "h": 37 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 85, "y": 193, "w": 40, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 20, "w": 40, "h": 38 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 43, "y": 153, "w": 40, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 20, "w": 40, "h": 39 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 127, "y": 192, "w": 40, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 20, "w": 40, "h": 39 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 130, "y": 151, "w": 40, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 20, "w": 40, "h": 39 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 85, "y": 152, "w": 40, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 20, "w": 40, "h": 39 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 43, "y": 194, "w": 40, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 21, "w": 40, "h": 37 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 169, "y": 194, "w": 39, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 21, "w": 39, "h": 37 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 166, "y": 233, "w": 39, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 22, "w": 39, "h": 36 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 1, "y": 234, "w": 39, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 22, "w": 39, "h": 36 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 43, "y": 233, "w": 39, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 21, "w": 39, "h": 37 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 84, "y": 233, "w": 39, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 21, "w": 39, "h": 37 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 125, "y": 233, "w": 39, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 21, "w": 39, "h": 37 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 85, "y": 193, "w": 40, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 20, "w": 40, "h": 38 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 43, "y": 153, "w": 40, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 20, "w": 40, "h": 39 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 127, "y": 192, "w": 40, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 20, "w": 40, "h": 39 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 130, "y": 151, "w": 40, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 20, "w": 40, "h": 39 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 85, "y": 152, "w": 40, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 20, "w": 40, "h": 39 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 43, "y": 194, "w": 40, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 21, "w": 40, "h": 37 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 169, "y": 194, "w": 39, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 21, "w": 39, "h": 37 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 166, "y": 233, "w": 39, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 22, "w": 39, "h": 36 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 1, "y": 234, "w": 39, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 22, "w": 39, "h": 36 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 43, "y": 233, "w": 39, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 21, "w": 39, "h": 37 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 84, "y": 233, "w": 39, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 21, "w": 39, "h": 37 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 125, "y": 233, "w": 39, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 21, "w": 39, "h": 37 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 85, "y": 193, "w": 40, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 20, "w": 40, "h": 38 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 43, "y": 153, "w": 40, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 20, "w": 40, "h": 39 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 127, "y": 192, "w": 40, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 20, "w": 40, "h": 39 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 1, "y": 193, "w": 40, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 20, "w": 40, "h": 39 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 1, "y": 151, "w": 40, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 19, "w": 40, "h": 40 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 43, "y": 110, "w": 40, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 18, "w": 40, "h": 41 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 1, "y": 107, "w": 40, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 17, "w": 40, "h": 42 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 130, "y": 107, "w": 40, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 17, "w": 40, "h": 42 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 172, "y": 105, "w": 40, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 16, "w": 40, "h": 43 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 1, "y": 61, "w": 40, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 15, "w": 40, "h": 44 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 130, "y": 60, "w": 40, "h": 45 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 14, "w": 40, "h": 45 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 88, "y": 60, "w": 40, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 13, "w": 40, "h": 46 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 46, "y": 60, "w": 40, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 11, "w": 40, "h": 48 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 174, "y": 54, "w": 40, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 10, "w": 40, "h": 49 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 174, "y": 1, "w": 40, "h": 51 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 8, "w": 40, "h": 51 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 46, "y": 1, "w": 42, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 42, "h": 57 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 1, "y": 1, "w": 43, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 43, "h": 58 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 1, "y": 1, "w": 43, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 43, "h": 58 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 1, "y": 1, "w": 43, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 43, "h": 58 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 1, "y": 1, "w": 43, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 43, "h": 58 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 133, "y": 1, "w": 39, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 39, "h": 55 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 90, "y": 1, "w": 41, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 41, "h": 57 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 172, "y": 150, "w": 39, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 16, "w": 39, "h": 42 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 88, "y": 108, "w": 40, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 16, "w": 40, "h": 42 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 130, "y": 107, "w": 40, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 17, "w": 40, "h": 42 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 1, "y": 107, "w": 40, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 17, "w": 40, "h": 42 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 43, "y": 110, "w": 40, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 18, "w": 40, "h": 41 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 1, "y": 151, "w": 40, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 19, "w": 40, "h": 40 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.13-x64",
+  "image": "728.png",
+  "format": "I8",
+  "size": { "w": 215, "h": 271 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/728.png b/public/images/pokemon/exp/back/728.png
index 7564e0eceac..d3534c8f37b 100644
Binary files a/public/images/pokemon/exp/back/728.png and b/public/images/pokemon/exp/back/728.png differ
diff --git a/public/images/pokemon/exp/back/729.json b/public/images/pokemon/exp/back/729.json
index a8859e39a33..97deebe472e 100644
--- a/public/images/pokemon/exp/back/729.json
+++ b/public/images/pokemon/exp/back/729.json
@@ -1,230 +1,1055 @@
-{
-	"textures": [
-		{
-			"image": "729.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 148,
-				"h": 148
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 71,
-						"h": 50
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 70,
-						"h": 50
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 70,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 71,
-						"h": 50
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 70,
-						"h": 49
-					},
-					"frame": {
-						"x": 0,
-						"y": 50,
-						"w": 70,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 71,
-						"h": 50
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 70,
-						"h": 49
-					},
-					"frame": {
-						"x": 0,
-						"y": 50,
-						"w": 70,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 71,
-						"h": 50
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 69,
-						"h": 49
-					},
-					"frame": {
-						"x": 0,
-						"y": 99,
-						"w": 69,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 71,
-						"h": 50
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 69,
-						"h": 49
-					},
-					"frame": {
-						"x": 0,
-						"y": 99,
-						"w": 69,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 71,
-						"h": 50
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 68,
-						"h": 50
-					},
-					"frame": {
-						"x": 70,
-						"y": 0,
-						"w": 68,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 71,
-						"h": 50
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 68,
-						"h": 50
-					},
-					"frame": {
-						"x": 70,
-						"y": 0,
-						"w": 68,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 71,
-						"h": 50
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 50
-					},
-					"frame": {
-						"x": 70,
-						"y": 50,
-						"w": 67,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 71,
-						"h": 50
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 70,
-						"h": 48
-					},
-					"frame": {
-						"x": 69,
-						"y": 100,
-						"w": 70,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 71,
-						"h": 50
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 70,
-						"h": 48
-					},
-					"frame": {
-						"x": 69,
-						"y": 100,
-						"w": 70,
-						"h": 48
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:ca6603181d5c8644f2bdbeecb46551b0:09ccc951204ac93cf598ed13a34f0429:b2d5dd692ec79c7357afdffa7b3670a9$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 348, "y": 280, "w": 56, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 9, "w": 56, "h": 54 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 166, "y": 283, "w": 55, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 10, "w": 55, "h": 53 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 0, "y": 284, "w": 54, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 10, "w": 54, "h": 53 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 348, "y": 334, "w": 52, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 11, "w": 52, "h": 52 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 49, "y": 337, "w": 49, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 11, "w": 49, "h": 52 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 49, "y": 389, "w": 47, "h": 51 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 12, "w": 47, "h": 51 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 265, "y": 388, "w": 47, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 11, "w": 47, "h": 52 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 386, "y": 386, "w": 47, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 11, "w": 47, "h": 52 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 98, "y": 337, "w": 49, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 11, "w": 49, "h": 52 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 287, "y": 335, "w": 51, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 10, "w": 51, "h": 53 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 491, "y": 224, "w": 53, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 10, "w": 53, "h": 53 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 112, "y": 283, "w": 54, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 9, "w": 54, "h": 54 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 292, "y": 280, "w": 56, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 8, "w": 56, "h": 55 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 174, "y": 228, "w": 57, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 8, "w": 57, "h": 55 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 328, "y": 114, "w": 59, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 59, "h": 56 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 195, "y": 61, "w": 59, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 59, "h": 57 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 334, "y": 57, "w": 60, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 60, "h": 57 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 394, "y": 57, "w": 60, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 60, "h": 57 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 268, "y": 60, "w": 60, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 60, "h": 57 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 68, "y": 62, "w": 60, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 60, "h": 56 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 234, "y": 172, "w": 59, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 59, "h": 55 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 293, "y": 225, "w": 59, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 59, "h": 55 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 234, "y": 227, "w": 58, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 8, "w": 58, "h": 55 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 59, "y": 174, "w": 57, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 9, "w": 57, "h": 54 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 348, "y": 280, "w": 56, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 9, "w": 56, "h": 54 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 166, "y": 283, "w": 55, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 10, "w": 55, "h": 53 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 0, "y": 284, "w": 54, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 10, "w": 54, "h": 53 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 348, "y": 334, "w": 52, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 11, "w": 52, "h": 52 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 49, "y": 337, "w": 49, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 11, "w": 49, "h": 52 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 49, "y": 389, "w": 47, "h": 51 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 12, "w": 47, "h": 51 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 265, "y": 388, "w": 47, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 11, "w": 47, "h": 52 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 386, "y": 386, "w": 47, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 11, "w": 47, "h": 52 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 98, "y": 337, "w": 49, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 11, "w": 49, "h": 52 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 287, "y": 335, "w": 51, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 10, "w": 51, "h": 53 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 491, "y": 224, "w": 53, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 10, "w": 53, "h": 53 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 112, "y": 283, "w": 54, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 9, "w": 54, "h": 54 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 292, "y": 280, "w": 56, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 8, "w": 56, "h": 55 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 174, "y": 228, "w": 57, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 8, "w": 57, "h": 55 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 328, "y": 114, "w": 59, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 59, "h": 56 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 195, "y": 61, "w": 59, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 59, "h": 57 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 334, "y": 57, "w": 60, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 60, "h": 57 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 394, "y": 57, "w": 60, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 60, "h": 57 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 268, "y": 60, "w": 60, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 60, "h": 57 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 68, "y": 62, "w": 60, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 60, "h": 56 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 234, "y": 172, "w": 59, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 59, "h": 55 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 293, "y": 225, "w": 59, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 59, "h": 55 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 234, "y": 227, "w": 58, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 8, "w": 58, "h": 55 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 59, "y": 174, "w": 57, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 9, "w": 57, "h": 54 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 348, "y": 280, "w": 56, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 9, "w": 56, "h": 54 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 166, "y": 283, "w": 55, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 10, "w": 55, "h": 53 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 0, "y": 284, "w": 54, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 10, "w": 54, "h": 53 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 348, "y": 334, "w": 52, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 11, "w": 52, "h": 52 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 49, "y": 337, "w": 49, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 11, "w": 49, "h": 52 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 49, "y": 389, "w": 47, "h": 51 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 12, "w": 47, "h": 51 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 265, "y": 388, "w": 47, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 11, "w": 47, "h": 52 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 386, "y": 386, "w": 47, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 11, "w": 47, "h": 52 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 98, "y": 337, "w": 49, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 11, "w": 49, "h": 52 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 287, "y": 335, "w": 51, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 10, "w": 51, "h": 53 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 491, "y": 224, "w": 53, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 10, "w": 53, "h": 53 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 112, "y": 283, "w": 54, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 9, "w": 54, "h": 54 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 292, "y": 280, "w": 56, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 8, "w": 56, "h": 55 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 174, "y": 228, "w": 57, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 8, "w": 57, "h": 55 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 328, "y": 114, "w": 59, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 59, "h": 56 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 195, "y": 61, "w": 59, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 59, "h": 57 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 334, "y": 57, "w": 60, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 60, "h": 57 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 394, "y": 57, "w": 60, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 60, "h": 57 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 268, "y": 60, "w": 60, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 60, "h": 57 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 68, "y": 62, "w": 60, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 60, "h": 56 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 234, "y": 172, "w": 59, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 59, "h": 55 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 293, "y": 225, "w": 59, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 59, "h": 55 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 234, "y": 227, "w": 58, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 8, "w": 58, "h": 55 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 59, "y": 174, "w": 57, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 9, "w": 57, "h": 54 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 348, "y": 280, "w": 56, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 9, "w": 56, "h": 54 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 467, "y": 279, "w": 58, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 9, "w": 58, "h": 54 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 0, "y": 63, "w": 61, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 8, "w": 61, "h": 55 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 334, "y": 0, "w": 63, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 63, "h": 57 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 135, "y": 61, "w": 60, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 60, "h": 57 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 458, "y": 56, "w": 59, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 59, "h": 58 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 397, "y": 0, "w": 61, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 61, "h": 57 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 458, "y": 0, "w": 62, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 62, "h": 56 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 446, "y": 169, "w": 59, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 8, "w": 59, "h": 55 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 348, "y": 280, "w": 56, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 9, "w": 56, "h": 54 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 57, "y": 283, "w": 55, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 9, "w": 55, "h": 54 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 467, "y": 333, "w": 53, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 11, "w": 53, "h": 52 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 338, "y": 386, "w": 48, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 11, "w": 48, "h": 52 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 216, "y": 336, "w": 49, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 11, "w": 49, "h": 53 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 166, "y": 336, "w": 50, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 11, "w": 50, "h": 53 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0088.png",
+    "frame": { "x": 0, "y": 337, "w": 49, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 11, "w": 49, "h": 53 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0089.png",
+    "frame": { "x": 452, "y": 385, "w": 48, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 10, "w": 48, "h": 53 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0090.png",
+    "frame": { "x": 400, "y": 334, "w": 52, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 11, "w": 52, "h": 52 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0091.png",
+    "frame": { "x": 348, "y": 280, "w": 56, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 9, "w": 56, "h": 54 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0092.png",
+    "frame": { "x": 231, "y": 282, "w": 56, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 9, "w": 56, "h": 54 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0093.png",
+    "frame": { "x": 117, "y": 228, "w": 57, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 8, "w": 57, "h": 55 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0094.png",
+    "frame": { "x": 58, "y": 118, "w": 58, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 7, "w": 58, "h": 56 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0095.png",
+    "frame": { "x": 352, "y": 225, "w": 58, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 8, "w": 58, "h": 55 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0096.png",
+    "frame": { "x": 0, "y": 118, "w": 58, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 7, "w": 58, "h": 56 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0097.png",
+    "frame": { "x": 314, "y": 170, "w": 59, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 59, "h": 55 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0098.png",
+    "frame": { "x": 175, "y": 118, "w": 59, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 59, "h": 55 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0099.png",
+    "frame": { "x": 373, "y": 170, "w": 59, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 59, "h": 55 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0100.png",
+    "frame": { "x": 116, "y": 118, "w": 59, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 59, "h": 55 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0101.png",
+    "frame": { "x": 446, "y": 114, "w": 60, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 8, "w": 60, "h": 55 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0102.png",
+    "frame": { "x": 202, "y": 0, "w": 66, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 66, "h": 61 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0103.png",
+    "frame": { "x": 68, "y": 0, "w": 67, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 67, "h": 62 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0104.png",
+    "frame": { "x": 0, "y": 0, "w": 68, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 68, "h": 63 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0105.png",
+    "frame": { "x": 268, "y": 0, "w": 66, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 66, "h": 60 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0106.png",
+    "frame": { "x": 135, "y": 0, "w": 67, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 61 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0107.png",
+    "frame": { "x": 254, "y": 117, "w": 60, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 8, "w": 60, "h": 55 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0108.png",
+    "frame": { "x": 116, "y": 173, "w": 59, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 59, "h": 55 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0109.png",
+    "frame": { "x": 116, "y": 173, "w": 59, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 59, "h": 55 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0110.png",
+    "frame": { "x": 175, "y": 173, "w": 59, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 59, "h": 55 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0111.png",
+    "frame": { "x": 0, "y": 174, "w": 59, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 59, "h": 55 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0112.png",
+    "frame": { "x": 432, "y": 224, "w": 59, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 59, "h": 55 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0113.png",
+    "frame": { "x": 387, "y": 114, "w": 59, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 59, "h": 56 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0114.png",
+    "frame": { "x": 59, "y": 228, "w": 58, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 8, "w": 58, "h": 55 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0115.png",
+    "frame": { "x": 0, "y": 229, "w": 57, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 8, "w": 57, "h": 55 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0116.png",
+    "frame": { "x": 410, "y": 279, "w": 57, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 8, "w": 57, "h": 55 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.13-x64",
+  "image": "729.png",
+  "format": "I8",
+  "size": { "w": 544, "h": 440 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/729.png b/public/images/pokemon/exp/back/729.png
index 08135d50267..b303934d595 100644
Binary files a/public/images/pokemon/exp/back/729.png and b/public/images/pokemon/exp/back/729.png differ
diff --git a/public/images/pokemon/exp/back/730.json b/public/images/pokemon/exp/back/730.json
index 867195486fa..5e3c835b381 100644
--- a/public/images/pokemon/exp/back/730.json
+++ b/public/images/pokemon/exp/back/730.json
@@ -1,230 +1,839 @@
-{
-	"textures": [
-		{
-			"image": "730.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 206,
-				"h": 206
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 69,
-						"h": 82
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 69,
-						"h": 79
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 69,
-						"h": 79
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 69,
-						"h": 82
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 68,
-						"h": 81
-					},
-					"frame": {
-						"x": 69,
-						"y": 0,
-						"w": 68,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 69,
-						"h": 82
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 68,
-						"h": 81
-					},
-					"frame": {
-						"x": 69,
-						"y": 0,
-						"w": 68,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 69,
-						"h": 82
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 68,
-						"h": 81
-					},
-					"frame": {
-						"x": 0,
-						"y": 79,
-						"w": 68,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 69,
-						"h": 82
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 69,
-						"h": 79
-					},
-					"frame": {
-						"x": 68,
-						"y": 81,
-						"w": 69,
-						"h": 79
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 69,
-						"h": 82
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 69,
-						"h": 79
-					},
-					"frame": {
-						"x": 68,
-						"y": 81,
-						"w": 69,
-						"h": 79
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 69,
-						"h": 82
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 69,
-						"h": 79
-					},
-					"frame": {
-						"x": 137,
-						"y": 0,
-						"w": 69,
-						"h": 79
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 69,
-						"h": 82
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 69,
-						"h": 79
-					},
-					"frame": {
-						"x": 137,
-						"y": 0,
-						"w": 69,
-						"h": 79
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 69,
-						"h": 82
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 69,
-						"h": 78
-					},
-					"frame": {
-						"x": 137,
-						"y": 79,
-						"w": 69,
-						"h": 78
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 69,
-						"h": 82
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 69,
-						"h": 78
-					},
-					"frame": {
-						"x": 137,
-						"y": 79,
-						"w": 69,
-						"h": 78
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:2717094fe274718326c9b0fe3237866b:3ad96e0a8adb3bab17597f2996c3f5cc:fcd0d2cb6b26724e796ae0dcb71fae3f$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 397, "y": 0, "w": 75, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 13, "w": 75, "h": 71 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 324, "y": 0, "w": 73, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 11, "w": 73, "h": 73 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 397, "y": 71, "w": 69, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 8, "w": 69, "h": 76 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 70, "y": 135, "w": 66, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 5, "w": 66, "h": 78 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 278, "y": 401, "w": 61, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 3, "w": 61, "h": 78 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 137, "y": 400, "w": 60, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 19, "y": 1, "w": 60, "h": 80 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 77, "y": 394, "w": 60, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 19, "y": 1, "w": 60, "h": 80 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 217, "y": 335, "w": 61, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 2, "w": 61, "h": 79 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 415, "y": 418, "w": 61, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 4, "w": 61, "h": 77 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 351, "y": 359, "w": 64, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 16, "y": 8, "w": 64, "h": 76 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 505, "y": 288, "w": 69, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 13, "w": 69, "h": 71 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 278, "y": 334, "w": 73, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 17, "w": 73, "h": 67 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 124, "y": 265, "w": 76, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 18, "w": 76, "h": 66 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 292, "y": 269, "w": 77, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 19, "w": 77, "h": 65 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 200, "y": 271, "w": 78, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 19, "w": 78, "h": 64 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 197, "y": 414, "w": 77, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 19, "w": 77, "h": 62 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 0, "y": 394, "w": 77, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 18, "w": 77, "h": 63 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 64, "y": 331, "w": 78, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 18, "w": 78, "h": 63 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 385, "y": 212, "w": 79, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 17, "w": 79, "h": 64 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 213, "y": 207, "w": 79, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 17, "w": 79, "h": 64 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 156, "y": 67, "w": 79, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 17, "w": 79, "h": 67 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 78, "y": 67, "w": 78, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 16, "w": 78, "h": 68 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 397, "y": 0, "w": 75, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 13, "w": 75, "h": 71 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 324, "y": 0, "w": 73, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 11, "w": 73, "h": 73 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 397, "y": 71, "w": 69, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 8, "w": 69, "h": 76 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 70, "y": 135, "w": 66, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 5, "w": 66, "h": 78 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 278, "y": 401, "w": 61, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 3, "w": 61, "h": 78 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 137, "y": 400, "w": 60, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 19, "y": 1, "w": 60, "h": 80 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 77, "y": 394, "w": 60, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 19, "y": 1, "w": 60, "h": 80 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 217, "y": 335, "w": 61, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 2, "w": 61, "h": 79 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 415, "y": 418, "w": 61, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 4, "w": 61, "h": 77 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 351, "y": 359, "w": 64, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 16, "y": 8, "w": 64, "h": 76 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 505, "y": 288, "w": 69, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 13, "w": 69, "h": 71 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 278, "y": 334, "w": 73, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 17, "w": 73, "h": 67 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 124, "y": 265, "w": 76, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 18, "w": 76, "h": 66 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 292, "y": 269, "w": 77, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 19, "w": 77, "h": 65 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 200, "y": 271, "w": 78, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 19, "w": 78, "h": 64 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 197, "y": 414, "w": 77, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 19, "w": 77, "h": 62 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 0, "y": 394, "w": 77, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 18, "w": 77, "h": 63 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 64, "y": 331, "w": 78, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 18, "w": 78, "h": 63 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 385, "y": 212, "w": 79, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 17, "w": 79, "h": 64 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 213, "y": 207, "w": 79, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 17, "w": 79, "h": 64 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 156, "y": 67, "w": 79, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 17, "w": 79, "h": 67 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 78, "y": 67, "w": 78, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 16, "w": 78, "h": 68 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 397, "y": 0, "w": 75, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 13, "w": 75, "h": 71 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 324, "y": 0, "w": 73, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 11, "w": 73, "h": 73 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 397, "y": 71, "w": 69, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 8, "w": 69, "h": 76 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 70, "y": 135, "w": 66, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 5, "w": 66, "h": 78 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 278, "y": 401, "w": 61, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 3, "w": 61, "h": 78 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 137, "y": 400, "w": 60, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 19, "y": 1, "w": 60, "h": 80 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 77, "y": 394, "w": 60, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 19, "y": 1, "w": 60, "h": 80 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 217, "y": 335, "w": 61, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 2, "w": 61, "h": 79 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 415, "y": 418, "w": 61, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 4, "w": 61, "h": 77 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 351, "y": 359, "w": 64, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 16, "y": 8, "w": 64, "h": 76 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 505, "y": 288, "w": 69, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 13, "w": 69, "h": 71 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 278, "y": 334, "w": 73, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 17, "w": 73, "h": 67 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 124, "y": 265, "w": 76, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 18, "w": 76, "h": 66 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 292, "y": 269, "w": 77, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 19, "w": 77, "h": 65 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 200, "y": 271, "w": 78, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 19, "w": 78, "h": 64 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 197, "y": 414, "w": 77, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 19, "w": 77, "h": 62 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 0, "y": 394, "w": 77, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 18, "w": 77, "h": 63 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 64, "y": 331, "w": 78, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 18, "w": 78, "h": 63 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 385, "y": 212, "w": 79, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 17, "w": 79, "h": 64 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 213, "y": 207, "w": 79, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 17, "w": 79, "h": 64 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 156, "y": 67, "w": 79, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 17, "w": 79, "h": 67 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 78, "y": 67, "w": 78, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 16, "w": 78, "h": 68 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 472, "y": 0, "w": 75, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 13, "w": 75, "h": 71 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 0, "y": 135, "w": 70, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 10, "w": 70, "h": 74 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 0, "y": 288, "w": 64, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 16, "y": 7, "w": 64, "h": 77 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 504, "y": 359, "w": 60, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 4, "w": 60, "h": 80 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 369, "y": 276, "w": 60, "h": 83 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 1, "w": 60, "h": 83 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 64, "y": 213, "w": 60, "h": 84 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 0, "w": 60, "h": 84 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 466, "y": 139, "w": 62, "h": 83 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 1, "w": 62, "h": 83 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 0, "y": 209, "w": 64, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 19, "y": 5, "w": 64, "h": 79 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 236, "y": 134, "w": 71, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 11, "w": 71, "h": 73 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 136, "y": 199, "w": 77, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 18, "w": 77, "h": 66 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 156, "y": 134, "w": 80, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 19, "w": 80, "h": 65 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 315, "y": 73, "w": 80, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 19, "w": 80, "h": 65 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 385, "y": 147, "w": 79, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 19, "w": 79, "h": 65 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 307, "y": 204, "w": 78, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 19, "w": 78, "h": 65 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 429, "y": 288, "w": 76, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 19, "w": 76, "h": 65 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 142, "y": 335, "w": 75, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 19, "w": 75, "h": 65 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 429, "y": 353, "w": 75, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 19, "w": 75, "h": 65 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 464, "y": 222, "w": 76, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 18, "w": 76, "h": 66 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 307, "y": 138, "w": 78, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 18, "w": 78, "h": 66 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 235, "y": 68, "w": 80, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 18, "w": 80, "h": 66 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 82, "y": 0, "w": 82, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 17, "w": 82, "h": 67 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0088.png",
+    "frame": { "x": 0, "y": 0, "w": 82, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 17, "w": 82, "h": 67 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0089.png",
+    "frame": { "x": 164, "y": 0, "w": 81, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 17, "w": 81, "h": 67 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0090.png",
+    "frame": { "x": 245, "y": 0, "w": 79, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 16, "w": 79, "h": 68 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0091.png",
+    "frame": { "x": 0, "y": 67, "w": 78, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 16, "w": 78, "h": 68 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0092.png",
+    "frame": { "x": 466, "y": 71, "w": 77, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 16, "w": 77, "h": 68 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.13-x64",
+  "image": "730.png",
+  "format": "I8",
+  "size": { "w": 574, "h": 495 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/730.png b/public/images/pokemon/exp/back/730.png
index 155152edd08..4a91464e076 100644
Binary files a/public/images/pokemon/exp/back/730.png and b/public/images/pokemon/exp/back/730.png differ
diff --git a/public/images/pokemon/exp/back/746-school.json b/public/images/pokemon/exp/back/746-school.json
index deea4a085b4..5874f93c128 100644
--- a/public/images/pokemon/exp/back/746-school.json
+++ b/public/images/pokemon/exp/back/746-school.json
@@ -1,230 +1,171 @@
-{
-	"textures": [
-		{
-			"image": "746-school.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 261,
-				"h": 261
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 97,
-						"h": 84
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 97,
-						"h": 80
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 97,
-						"h": 80
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 97,
-						"h": 84
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 96,
-						"h": 81
-					},
-					"frame": {
-						"x": 97,
-						"y": 0,
-						"w": 96,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 97,
-						"h": 84
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 96,
-						"h": 81
-					},
-					"frame": {
-						"x": 97,
-						"y": 0,
-						"w": 96,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 97,
-						"h": 84
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 93,
-						"h": 80
-					},
-					"frame": {
-						"x": 0,
-						"y": 80,
-						"w": 93,
-						"h": 80
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 97,
-						"h": 84
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 93,
-						"h": 80
-					},
-					"frame": {
-						"x": 0,
-						"y": 80,
-						"w": 93,
-						"h": 80
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 97,
-						"h": 84
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 5,
-						"w": 87,
-						"h": 79
-					},
-					"frame": {
-						"x": 0,
-						"y": 160,
-						"w": 87,
-						"h": 79
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 97,
-						"h": 84
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 5,
-						"w": 87,
-						"h": 79
-					},
-					"frame": {
-						"x": 87,
-						"y": 160,
-						"w": 87,
-						"h": 79
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 97,
-						"h": 84
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 89,
-						"h": 78
-					},
-					"frame": {
-						"x": 93,
-						"y": 81,
-						"w": 89,
-						"h": 78
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 97,
-						"h": 84
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 89,
-						"h": 78
-					},
-					"frame": {
-						"x": 93,
-						"y": 81,
-						"w": 89,
-						"h": 78
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 97,
-						"h": 84
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 87,
-						"h": 77
-					},
-					"frame": {
-						"x": 174,
-						"y": 159,
-						"w": 87,
-						"h": 77
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:30cb66415aef361ed227b9b95c6e059e:691d98e44070749abe13d4a0a6ceb7a7:10f3c9d1f1118f8f9f6e40f37a0eb499$"
-	}
+{ "frames": {
+   "0001.png": {
+    "frame": { "x": 279, "y": 206, "w": 96, "h": 97 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 7, "w": 96, "h": 97 },
+    "sourceSize": { "w": 100, "h": 111 },
+    "duration": 100
+   },
+   "0002.png": {
+    "frame": { "x": 288, "y": 108, "w": 96, "h": 98 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 6, "w": 96, "h": 98 },
+    "sourceSize": { "w": 100, "h": 111 },
+    "duration": 100
+   },
+   "0003.png": {
+    "frame": { "x": 95, "y": 107, "w": 94, "h": 100 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 6, "w": 94, "h": 100 },
+    "sourceSize": { "w": 100, "h": 111 },
+    "duration": 100
+   },
+   "0004.png": {
+    "frame": { "x": 94, "y": 207, "w": 93, "h": 99 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 6, "w": 93, "h": 99 },
+    "sourceSize": { "w": 100, "h": 111 },
+    "duration": 100
+   },
+   "0005.png": {
+    "frame": { "x": 1, "y": 104, "w": 94, "h": 102 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 94, "h": 102 },
+    "sourceSize": { "w": 100, "h": 111 },
+    "duration": 100
+   },
+   "0006.png": {
+    "frame": { "x": 189, "y": 203, "w": 90, "h": 104 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 5, "w": 90, "h": 104 },
+    "sourceSize": { "w": 100, "h": 111 },
+    "duration": 100
+   },
+   "0007.png": {
+    "frame": { "x": 283, "y": 1, "w": 92, "h": 105 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 92, "h": 105 },
+    "sourceSize": { "w": 100, "h": 111 },
+    "duration": 100
+   },
+   "0008.png": {
+    "frame": { "x": 375, "y": 1, "w": 90, "h": 107 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 4, "w": 90, "h": 107 },
+    "sourceSize": { "w": 100, "h": 111 },
+    "duration": 100
+   },
+   "0009.png": {
+    "frame": { "x": 97, "y": 1, "w": 93, "h": 106 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 93, "h": 106 },
+    "sourceSize": { "w": 100, "h": 111 },
+    "duration": 100
+   },
+   "0010.png": {
+    "frame": { "x": 190, "y": 1, "w": 93, "h": 105 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 93, "h": 105 },
+    "sourceSize": { "w": 100, "h": 111 },
+    "duration": 100
+   },
+   "0011.png": {
+    "frame": { "x": 1, "y": 1, "w": 96, "h": 103 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 96, "h": 103 },
+    "sourceSize": { "w": 100, "h": 111 },
+    "duration": 100
+   },
+   "0012.png": {
+    "frame": { "x": 1, "y": 206, "w": 93, "h": 100 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 93, "h": 100 },
+    "sourceSize": { "w": 100, "h": 111 },
+    "duration": 100
+   },
+   "0013.png": {
+    "frame": { "x": 384, "y": 108, "w": 96, "h": 98 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 96, "h": 98 },
+    "sourceSize": { "w": 100, "h": 111 },
+    "duration": 100
+   },
+   "0014.png": {
+    "frame": { "x": 279, "y": 303, "w": 95, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 95, "h": 96 },
+    "sourceSize": { "w": 100, "h": 111 },
+    "duration": 100
+   },
+   "0015.png": {
+    "frame": { "x": 96, "y": 307, "w": 97, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 97, "h": 94 },
+    "sourceSize": { "w": 100, "h": 111 },
+    "duration": 100
+   },
+   "0016.png": {
+    "frame": { "x": 375, "y": 301, "w": 98, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 98, "h": 94 },
+    "sourceSize": { "w": 100, "h": 111 },
+    "duration": 100
+   },
+   "0017.png": {
+    "frame": { "x": 1, "y": 306, "w": 95, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 95, "h": 96 },
+    "sourceSize": { "w": 100, "h": 111 },
+    "duration": 100
+   },
+   "0018.png": {
+    "frame": { "x": 375, "y": 206, "w": 97, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 97, "h": 95 },
+    "sourceSize": { "w": 100, "h": 111 },
+    "duration": 100
+   },
+   "0019.png": {
+    "frame": { "x": 374, "y": 395, "w": 94, "h": 97 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 94, "h": 97 },
+    "sourceSize": { "w": 100, "h": 111 },
+    "duration": 100
+   },
+   "0020.png": {
+    "frame": { "x": 190, "y": 106, "w": 98, "h": 97 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 98, "h": 97 },
+    "sourceSize": { "w": 100, "h": 111 },
+    "duration": 100
+   }
+ },
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.13-x64",
+  "image": "746-school.png",
+  "format": "I8",
+  "size": { "w": 481, "h": 493 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/746-school.png b/public/images/pokemon/exp/back/746-school.png
index 808f0d993db..baa5fde8219 100644
Binary files a/public/images/pokemon/exp/back/746-school.png and b/public/images/pokemon/exp/back/746-school.png differ
diff --git a/public/images/pokemon/exp/back/746.json b/public/images/pokemon/exp/back/746.json
index 971e045fbf4..1f15d713330 100644
--- a/public/images/pokemon/exp/back/746.json
+++ b/public/images/pokemon/exp/back/746.json
@@ -1,314 +1,641 @@
-{
-	"textures": [
-		{
-			"image": "746.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 132,
-				"h": 132
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 29
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 46,
-						"h": 27
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 46,
-						"h": 27
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 29
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 46,
-						"h": 27
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 46,
-						"h": 27
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 29
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 45,
-						"h": 27
-					},
-					"frame": {
-						"x": 46,
-						"y": 0,
-						"w": 45,
-						"h": 27
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 29
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 41,
-						"h": 27
-					},
-					"frame": {
-						"x": 91,
-						"y": 0,
-						"w": 41,
-						"h": 27
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 29
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 45,
-						"h": 27
-					},
-					"frame": {
-						"x": 0,
-						"y": 27,
-						"w": 45,
-						"h": 27
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 29
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 45,
-						"h": 27
-					},
-					"frame": {
-						"x": 45,
-						"y": 27,
-						"w": 45,
-						"h": 27
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 29
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 42,
-						"h": 27
-					},
-					"frame": {
-						"x": 90,
-						"y": 27,
-						"w": 42,
-						"h": 27
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 29
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 42,
-						"h": 27
-					},
-					"frame": {
-						"x": 90,
-						"y": 27,
-						"w": 42,
-						"h": 27
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 29
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 44,
-						"h": 27
-					},
-					"frame": {
-						"x": 0,
-						"y": 54,
-						"w": 44,
-						"h": 27
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 29
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 44,
-						"h": 27
-					},
-					"frame": {
-						"x": 0,
-						"y": 81,
-						"w": 44,
-						"h": 27
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 29
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 45,
-						"h": 26
-					},
-					"frame": {
-						"x": 44,
-						"y": 54,
-						"w": 45,
-						"h": 26
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 29
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 43,
-						"h": 27
-					},
-					"frame": {
-						"x": 89,
-						"y": 54,
-						"w": 43,
-						"h": 27
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 29
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 44,
-						"h": 26
-					},
-					"frame": {
-						"x": 44,
-						"y": 80,
-						"w": 44,
-						"h": 26
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 29
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 41,
-						"h": 26
-					},
-					"frame": {
-						"x": 44,
-						"y": 106,
-						"w": 41,
-						"h": 26
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:93d33f4a5b3862a769ebca021367624a:963e4390d528585dcdd0e7068e5ec568:1a4f7e535d823202c4828f963d5b4404$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 1, "y": 1, "w": 40, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 38, "w": 38, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 1, "y": 26, "w": 36, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 30, "y": 38, "w": 34, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 1, "y": 1, "w": 40, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 38, "w": 38, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 1, "y": 26, "w": 36, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 30, "y": 38, "w": 34, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 1, "y": 1, "w": 40, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 38, "w": 38, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 1, "y": 26, "w": 36, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 30, "y": 39, "w": 34, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 1, "y": 1, "w": 40, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 41, "w": 38, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 1, "y": 26, "w": 36, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 30, "y": 43, "w": 34, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 1, "y": 1, "w": 40, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 44, "w": 38, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 1, "y": 26, "w": 36, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 30, "y": 45, "w": 34, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 1, "y": 1, "w": 40, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 45, "w": 38, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 1, "y": 26, "w": 36, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 30, "y": 45, "w": 34, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 1, "y": 1, "w": 40, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 45, "w": 38, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 1, "y": 26, "w": 36, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 30, "y": 45, "w": 34, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 1, "y": 1, "w": 40, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 44, "w": 38, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 1, "y": 26, "w": 36, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 30, "y": 43, "w": 34, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 1, "y": 1, "w": 40, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 41, "w": 38, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 1, "y": 26, "w": 36, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 30, "y": 39, "w": 34, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 1, "y": 1, "w": 40, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 38, "w": 38, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 1, "y": 26, "w": 36, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 30, "y": 38, "w": 34, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 1, "y": 1, "w": 40, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 38, "w": 38, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 1, "y": 26, "w": 36, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 30, "y": 38, "w": 34, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 1, "y": 1, "w": 40, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 38, "w": 38, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 1, "y": 26, "w": 36, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 30, "y": 39, "w": 34, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 1, "y": 1, "w": 40, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 41, "w": 38, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 1, "y": 26, "w": 36, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 30, "y": 43, "w": 34, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 1, "y": 1, "w": 40, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 44, "w": 38, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 1, "y": 26, "w": 36, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 30, "y": 45, "w": 34, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 1, "y": 1, "w": 40, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 45, "w": 38, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 1, "y": 26, "w": 36, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 30, "y": 45, "w": 34, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 1, "y": 1, "w": 40, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 45, "w": 38, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 1, "y": 26, "w": 36, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 30, "y": 45, "w": 34, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 1, "y": 1, "w": 40, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 44, "w": 38, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 1, "y": 26, "w": 36, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 30, "y": 43, "w": 34, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 1, "y": 1, "w": 40, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 41, "w": 38, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 1, "y": 26, "w": 36, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 30, "y": 39, "w": 34, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 41, "y": 1, "w": 40, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 38, "w": 38, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 37, "y": 26, "w": 36, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 30, "y": 38, "w": 34, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 81, "y": 1, "w": 40, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 38, "w": 38, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 37, "y": 26, "w": 36, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 30, "y": 38, "w": 34, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 81, "y": 1, "w": 40, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 38, "w": 38, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 37, "y": 26, "w": 36, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 30, "y": 39, "w": 34, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 81, "y": 1, "w": 40, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 41, "w": 38, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 37, "y": 26, "w": 36, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 30, "y": 43, "w": 34, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 81, "y": 1, "w": 40, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 44, "w": 38, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 37, "y": 26, "w": 36, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 30, "y": 45, "w": 34, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 81, "y": 1, "w": 40, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 45, "w": 38, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 37, "y": 26, "w": 36, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 30, "y": 45, "w": 34, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 81, "y": 1, "w": 40, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 45, "w": 38, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 37, "y": 26, "w": 36, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 30, "y": 45, "w": 34, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 81, "y": 1, "w": 40, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 44, "w": 38, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 37, "y": 26, "w": 36, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 30, "y": 43, "w": 34, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 81, "y": 1, "w": 40, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 41, "w": 38, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 37, "y": 26, "w": 36, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 30, "y": 38, "w": 34, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 81, "y": 1, "w": 40, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 38, "w": 38, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 37, "y": 26, "w": 36, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 30, "y": 38, "w": 34, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 81, "y": 1, "w": 40, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 38, "w": 38, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 37, "y": 26, "w": 36, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 30, "y": 39, "w": 34, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 81, "y": 1, "w": 40, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 41, "w": 38, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 37, "y": 26, "w": 36, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 30, "y": 43, "w": 34, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 81, "y": 1, "w": 40, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 44, "w": 38, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 37, "y": 26, "w": 36, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 30, "y": 45, "w": 34, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 81, "y": 1, "w": 40, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 45, "w": 38, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 37, "y": 26, "w": 36, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 30, "y": 45, "w": 34, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 81, "y": 1, "w": 40, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 45, "w": 38, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 37, "y": 26, "w": 36, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 30, "y": 45, "w": 34, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 81, "y": 1, "w": 40, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 44, "w": 38, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 37, "y": 26, "w": 36, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 30, "y": 43, "w": 34, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 81, "y": 1, "w": 40, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 41, "w": 38, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 73, "y": 26, "w": 36, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 30, "y": 39, "w": 34, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.13-x64",
+  "image": "746.png",
+  "format": "I8",
+  "size": { "w": 122, "h": 52 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/746.png b/public/images/pokemon/exp/back/746.png
index b9b84821eee..33cfa5ffec8 100644
Binary files a/public/images/pokemon/exp/back/746.png and b/public/images/pokemon/exp/back/746.png differ
diff --git a/public/images/pokemon/exp/back/749.json b/public/images/pokemon/exp/back/749.json
index d7851eaa797..ae6773c4296 100644
--- a/public/images/pokemon/exp/back/749.json
+++ b/public/images/pokemon/exp/back/749.json
@@ -1,230 +1,1037 @@
-{
-	"textures": [
-		{
-			"image": "749.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 171,
-				"h": 171
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 59,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 59,
-						"h": 66
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 59,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 59,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 59,
-						"h": 66
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 59,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 59,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 58,
-						"h": 66
-					},
-					"frame": {
-						"x": 59,
-						"y": 0,
-						"w": 58,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 59,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 58,
-						"h": 66
-					},
-					"frame": {
-						"x": 59,
-						"y": 0,
-						"w": 58,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 59,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 54,
-						"h": 66
-					},
-					"frame": {
-						"x": 117,
-						"y": 0,
-						"w": 54,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 59,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 59,
-						"h": 65
-					},
-					"frame": {
-						"x": 0,
-						"y": 66,
-						"w": 59,
-						"h": 65
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 59,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 56,
-						"h": 66
-					},
-					"frame": {
-						"x": 59,
-						"y": 66,
-						"w": 56,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 59,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 56,
-						"h": 66
-					},
-					"frame": {
-						"x": 59,
-						"y": 66,
-						"w": 56,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 59,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 55,
-						"h": 66
-					},
-					"frame": {
-						"x": 115,
-						"y": 66,
-						"w": 55,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 59,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 55,
-						"h": 66
-					},
-					"frame": {
-						"x": 115,
-						"y": 66,
-						"w": 55,
-						"h": 66
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:6de951f837f3cd5e1f402431f0377838:262bd4a6b62a63a60897a16743d96663:d52e05c524384ef985e6339a08b2f938$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 146, "y": 297, "w": 48, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 11, "w": 46, "h": 56 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 149, "y": 181, "w": 49, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 11, "w": 47, "h": 56 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 1, "y": 183, "w": 49, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 11, "w": 47, "h": 56 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 203, "y": 70, "w": 51, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 12, "w": 49, "h": 55 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 98, "y": 127, "w": 51, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 13, "w": 49, "h": 54 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 150, "y": 125, "w": 51, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 13, "w": 49, "h": 54 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 99, "y": 69, "w": 51, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 49, "h": 56 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 1, "y": 125, "w": 50, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 48, "h": 56 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 50, "y": 186, "w": 48, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 10, "w": 46, "h": 57 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 1, "y": 241, "w": 48, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 10, "w": 46, "h": 57 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 243, "y": 243, "w": 47, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 9, "w": 45, "h": 58 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 286, "y": 356, "w": 46, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 10, "w": 44, "h": 57 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 144, "y": 355, "w": 46, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 10, "w": 44, "h": 57 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 97, "y": 355, "w": 47, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 11, "w": 45, "h": 56 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 146, "y": 297, "w": 48, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 11, "w": 46, "h": 56 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 149, "y": 181, "w": 49, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 11, "w": 47, "h": 56 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 1, "y": 183, "w": 49, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 11, "w": 47, "h": 56 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 203, "y": 70, "w": 51, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 12, "w": 49, "h": 55 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 98, "y": 127, "w": 51, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 13, "w": 49, "h": 54 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 150, "y": 125, "w": 51, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 13, "w": 49, "h": 54 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 99, "y": 69, "w": 51, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 49, "h": 56 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 1, "y": 125, "w": 50, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 48, "h": 56 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 50, "y": 186, "w": 48, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 10, "w": 46, "h": 57 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 1, "y": 241, "w": 48, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 10, "w": 46, "h": 57 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 243, "y": 243, "w": 47, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 9, "w": 45, "h": 58 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 286, "y": 356, "w": 46, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 10, "w": 44, "h": 57 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 144, "y": 355, "w": 46, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 10, "w": 44, "h": 57 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 97, "y": 355, "w": 47, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 11, "w": 45, "h": 56 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 146, "y": 297, "w": 48, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 11, "w": 46, "h": 56 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 190, "y": 357, "w": 48, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 13, "w": 46, "h": 54 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 238, "y": 365, "w": 48, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 14, "w": 46, "h": 53 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 196, "y": 239, "w": 47, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 9, "w": 45, "h": 58 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 49, "y": 245, "w": 45, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 43, "h": 60 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 242, "y": 303, "w": 44, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 42, "h": 60 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 1, "y": 300, "w": 47, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 45, "h": 57 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 94, "y": 300, "w": 50, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 48, "h": 53 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 290, "y": 300, "w": 49, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 10, "w": 47, "h": 54 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 290, "y": 244, "w": 50, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 13, "w": 48, "h": 54 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 48, "y": 355, "w": 49, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 13, "w": 47, "h": 54 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 98, "y": 183, "w": 49, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 11, "w": 47, "h": 56 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 146, "y": 297, "w": 48, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 11, "w": 46, "h": 56 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 149, "y": 181, "w": 49, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 11, "w": 47, "h": 56 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 1, "y": 183, "w": 49, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 11, "w": 47, "h": 56 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 203, "y": 70, "w": 51, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 12, "w": 49, "h": 55 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 98, "y": 127, "w": 51, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 13, "w": 49, "h": 54 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 150, "y": 125, "w": 51, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 13, "w": 49, "h": 54 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 99, "y": 69, "w": 51, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 49, "h": 56 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 1, "y": 125, "w": 50, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 48, "h": 56 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 50, "y": 186, "w": 48, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 10, "w": 46, "h": 57 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 1, "y": 241, "w": 48, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 10, "w": 46, "h": 57 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 243, "y": 243, "w": 47, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 9, "w": 45, "h": 58 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 286, "y": 356, "w": 46, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 10, "w": 44, "h": 57 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 144, "y": 355, "w": 46, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 10, "w": 44, "h": 57 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 97, "y": 355, "w": 47, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 11, "w": 45, "h": 56 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 146, "y": 297, "w": 48, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 11, "w": 46, "h": 56 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 190, "y": 357, "w": 48, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 13, "w": 46, "h": 54 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 238, "y": 365, "w": 48, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 14, "w": 46, "h": 53 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 196, "y": 239, "w": 47, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 9, "w": 45, "h": 58 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 49, "y": 245, "w": 45, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 43, "h": 60 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 242, "y": 303, "w": 44, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 42, "h": 60 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 1, "y": 300, "w": 47, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 45, "h": 57 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 94, "y": 300, "w": 50, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 48, "h": 53 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 290, "y": 300, "w": 49, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 10, "w": 47, "h": 54 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 290, "y": 244, "w": 50, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 13, "w": 48, "h": 54 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 48, "y": 355, "w": 49, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 13, "w": 47, "h": 54 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 98, "y": 183, "w": 49, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 11, "w": 47, "h": 56 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 146, "y": 297, "w": 48, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 11, "w": 46, "h": 56 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 190, "y": 357, "w": 48, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 13, "w": 46, "h": 54 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 238, "y": 365, "w": 48, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 14, "w": 46, "h": 53 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 196, "y": 239, "w": 47, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 9, "w": 45, "h": 58 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 49, "y": 245, "w": 45, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 43, "h": 60 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 242, "y": 303, "w": 44, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 42, "h": 60 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 1, "y": 300, "w": 47, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 45, "h": 57 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 94, "y": 300, "w": 50, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 48, "h": 53 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 290, "y": 300, "w": 49, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 10, "w": 47, "h": 54 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 290, "y": 244, "w": 50, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 13, "w": 48, "h": 54 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 48, "y": 355, "w": 49, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 13, "w": 47, "h": 54 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 98, "y": 183, "w": 49, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 11, "w": 47, "h": 56 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 146, "y": 297, "w": 48, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 11, "w": 46, "h": 56 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 149, "y": 181, "w": 49, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 11, "w": 47, "h": 56 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 1, "y": 183, "w": 49, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 11, "w": 47, "h": 56 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 203, "y": 70, "w": 51, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 12, "w": 49, "h": 55 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 98, "y": 127, "w": 51, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 13, "w": 49, "h": 54 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 150, "y": 125, "w": 51, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 13, "w": 49, "h": 54 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 99, "y": 69, "w": 51, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 49, "h": 56 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 1, "y": 125, "w": 50, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 48, "h": 56 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 50, "y": 186, "w": 48, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 10, "w": 46, "h": 57 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0088.png",
+    "frame": { "x": 1, "y": 241, "w": 48, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 10, "w": 46, "h": 57 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0089.png",
+    "frame": { "x": 243, "y": 243, "w": 47, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 9, "w": 45, "h": 58 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0090.png",
+    "frame": { "x": 286, "y": 356, "w": 46, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 10, "w": 44, "h": 57 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0091.png",
+    "frame": { "x": 144, "y": 355, "w": 46, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 10, "w": 44, "h": 57 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0092.png",
+    "frame": { "x": 97, "y": 355, "w": 47, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 11, "w": 45, "h": 56 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0093.png",
+    "frame": { "x": 194, "y": 299, "w": 48, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 11, "w": 46, "h": 56 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0094.png",
+    "frame": { "x": 243, "y": 185, "w": 49, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 11, "w": 47, "h": 56 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0095.png",
+    "frame": { "x": 294, "y": 129, "w": 50, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 12, "w": 48, "h": 55 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0096.png",
+    "frame": { "x": 243, "y": 129, "w": 51, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 13, "w": 49, "h": 54 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0097.png",
+    "frame": { "x": 150, "y": 70, "w": 53, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 14, "w": 51, "h": 53 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0098.png",
+    "frame": { "x": 48, "y": 66, "w": 51, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 10, "w": 49, "h": 57 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0099.png",
+    "frame": { "x": 279, "y": 68, "w": 49, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 8, "w": 47, "h": 59 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0100.png",
+    "frame": { "x": 97, "y": 1, "w": 49, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 47, "h": 61 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0101.png",
+    "frame": { "x": 48, "y": 1, "w": 49, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 47, "h": 63 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0102.png",
+    "frame": { "x": 235, "y": 1, "w": 44, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 42, "h": 67 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0103.png",
+    "frame": { "x": 201, "y": 127, "w": 42, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 40, "h": 66 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0104.png",
+    "frame": { "x": 191, "y": 1, "w": 44, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 42, "h": 67 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0105.png",
+    "frame": { "x": 1, "y": 1, "w": 47, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 45, "h": 66 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0106.png",
+    "frame": { "x": 146, "y": 1, "w": 45, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 43, "h": 66 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0107.png",
+    "frame": { "x": 279, "y": 1, "w": 45, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 43, "h": 65 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0108.png",
+    "frame": { "x": 328, "y": 63, "w": 44, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 42, "h": 63 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0109.png",
+    "frame": { "x": 324, "y": 1, "w": 47, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 7, "w": 45, "h": 60 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0110.png",
+    "frame": { "x": 51, "y": 125, "w": 47, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 8, "w": 45, "h": 59 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0111.png",
+    "frame": { "x": 98, "y": 241, "w": 48, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 10, "w": 46, "h": 57 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0112.png",
+    "frame": { "x": 292, "y": 186, "w": 49, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 11, "w": 47, "h": 56 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0113.png",
+    "frame": { "x": 147, "y": 239, "w": 49, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 11, "w": 47, "h": 56 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0114.png",
+    "frame": { "x": 146, "y": 297, "w": 48, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 11, "w": 46, "h": 56 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.13-x64",
+  "image": "749.png",
+  "format": "I8",
+  "size": { "w": 373, "h": 421 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/749.png b/public/images/pokemon/exp/back/749.png
index d0194d3cf8a..ce8d43db939 100644
Binary files a/public/images/pokemon/exp/back/749.png and b/public/images/pokemon/exp/back/749.png differ
diff --git a/public/images/pokemon/exp/back/750.json b/public/images/pokemon/exp/back/750.json
index c9d0713c741..fad02642748 100644
--- a/public/images/pokemon/exp/back/750.json
+++ b/public/images/pokemon/exp/back/750.json
@@ -1,230 +1,929 @@
-{
-	"textures": [
-		{
-			"image": "750.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 253,
-				"h": 253
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 88,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 88,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 88,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 88,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 87,
-						"h": 71
-					},
-					"frame": {
-						"x": 88,
-						"y": 0,
-						"w": 87,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 88,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 87,
-						"h": 71
-					},
-					"frame": {
-						"x": 0,
-						"y": 69,
-						"w": 87,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 88,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 86,
-						"h": 72
-					},
-					"frame": {
-						"x": 87,
-						"y": 71,
-						"w": 86,
-						"h": 72
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 88,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 79,
-						"h": 73
-					},
-					"frame": {
-						"x": 173,
-						"y": 71,
-						"w": 79,
-						"h": 73
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 88,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 86,
-						"h": 72
-					},
-					"frame": {
-						"x": 0,
-						"y": 140,
-						"w": 86,
-						"h": 72
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 88,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 83,
-						"h": 73
-					},
-					"frame": {
-						"x": 86,
-						"y": 143,
-						"w": 83,
-						"h": 73
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 88,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 83,
-						"h": 73
-					},
-					"frame": {
-						"x": 86,
-						"y": 143,
-						"w": 83,
-						"h": 73
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 88,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 84,
-						"h": 73
-					},
-					"frame": {
-						"x": 169,
-						"y": 144,
-						"w": 84,
-						"h": 73
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 88,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 84,
-						"h": 73
-					},
-					"frame": {
-						"x": 169,
-						"y": 144,
-						"w": 84,
-						"h": 73
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:f47cf7a324fea46ff24490e5f9ff75b2:b9e77a95b48977f27c24067d0f519108:4ad6abb5f7a40182d2391bde900ad082$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 565, "y": 215, "w": 78, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 11, "w": 76, "h": 67 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 324, "y": 213, "w": 79, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 11, "w": 77, "h": 67 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 80, "y": 214, "w": 80, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 12, "w": 78, "h": 66 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 581, "y": 147, "w": 81, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 12, "w": 79, "h": 66 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 333, "y": 146, "w": 84, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 13, "w": 82, "h": 65 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 1, "y": 147, "w": 84, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 13, "w": 82, "h": 65 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 499, "y": 81, "w": 86, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 14, "w": 84, "h": 64 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 333, "y": 80, "w": 87, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 14, "w": 85, "h": 64 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 1, "y": 81, "w": 87, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 14, "w": 85, "h": 64 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 88, "y": 81, "w": 87, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 14, "w": 85, "h": 64 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 585, "y": 81, "w": 86, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 14, "w": 84, "h": 64 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 85, "y": 147, "w": 84, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 13, "w": 82, "h": 65 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 499, "y": 147, "w": 82, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 12, "w": 80, "h": 66 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 1, "y": 214, "w": 79, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 11, "w": 77, "h": 67 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 246, "y": 152, "w": 78, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 10, "w": 76, "h": 68 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 169, "y": 159, "w": 77, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 10, "w": 75, "h": 68 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 77, "y": 350, "w": 74, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 19, "y": 10, "w": 72, "h": 68 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 466, "y": 353, "w": 73, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 19, "y": 10, "w": 71, "h": 68 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 1, "y": 352, "w": 73, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 10, "w": 71, "h": 68 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 306, "y": 360, "w": 73, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 17, "y": 11, "w": 71, "h": 67 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 392, "y": 304, "w": 74, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 10, "w": 72, "h": 68 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 1, "y": 283, "w": 76, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 11, "w": 74, "h": 67 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 403, "y": 235, "w": 77, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 11, "w": 75, "h": 67 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 565, "y": 215, "w": 78, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 11, "w": 76, "h": 67 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 324, "y": 213, "w": 79, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 11, "w": 77, "h": 67 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 80, "y": 214, "w": 80, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 12, "w": 78, "h": 66 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 581, "y": 147, "w": 81, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 12, "w": 79, "h": 66 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 333, "y": 146, "w": 84, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 13, "w": 82, "h": 65 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 1, "y": 147, "w": 84, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 13, "w": 82, "h": 65 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 499, "y": 81, "w": 86, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 14, "w": 84, "h": 64 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 333, "y": 80, "w": 87, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 14, "w": 85, "h": 64 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 1, "y": 81, "w": 87, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 14, "w": 85, "h": 64 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 88, "y": 81, "w": 87, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 14, "w": 85, "h": 64 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 585, "y": 81, "w": 86, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 14, "w": 84, "h": 64 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 85, "y": 147, "w": 84, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 13, "w": 82, "h": 65 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 499, "y": 147, "w": 82, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 12, "w": 80, "h": 66 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 1, "y": 214, "w": 79, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 11, "w": 77, "h": 67 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 246, "y": 152, "w": 78, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 10, "w": 76, "h": 68 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 169, "y": 159, "w": 77, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 10, "w": 75, "h": 68 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 77, "y": 350, "w": 74, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 19, "y": 10, "w": 72, "h": 68 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 466, "y": 353, "w": 73, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 19, "y": 10, "w": 71, "h": 68 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 1, "y": 352, "w": 73, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 10, "w": 71, "h": 68 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 306, "y": 360, "w": 73, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 17, "y": 11, "w": 71, "h": 67 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 392, "y": 304, "w": 74, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 10, "w": 72, "h": 68 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 1, "y": 283, "w": 76, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 11, "w": 74, "h": 67 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 403, "y": 235, "w": 77, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 11, "w": 75, "h": 67 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 565, "y": 215, "w": 78, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 11, "w": 76, "h": 67 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 324, "y": 213, "w": 79, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 11, "w": 77, "h": 67 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 80, "y": 214, "w": 80, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 12, "w": 78, "h": 66 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 581, "y": 147, "w": 81, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 12, "w": 79, "h": 66 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 333, "y": 146, "w": 84, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 13, "w": 82, "h": 65 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 1, "y": 147, "w": 84, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 13, "w": 82, "h": 65 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 499, "y": 81, "w": 86, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 14, "w": 84, "h": 64 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 333, "y": 80, "w": 87, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 14, "w": 85, "h": 64 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 1, "y": 81, "w": 87, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 14, "w": 85, "h": 64 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 88, "y": 81, "w": 87, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 14, "w": 85, "h": 64 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 585, "y": 81, "w": 86, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 14, "w": 84, "h": 64 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 85, "y": 147, "w": 84, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 13, "w": 82, "h": 65 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 499, "y": 147, "w": 82, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 12, "w": 80, "h": 66 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 1, "y": 214, "w": 79, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 11, "w": 77, "h": 67 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 246, "y": 152, "w": 78, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 10, "w": 76, "h": 68 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 169, "y": 159, "w": 77, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 10, "w": 75, "h": 68 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 77, "y": 350, "w": 74, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 19, "y": 10, "w": 72, "h": 68 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 466, "y": 353, "w": 73, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 19, "y": 10, "w": 71, "h": 68 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 1, "y": 352, "w": 73, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 10, "w": 71, "h": 68 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 306, "y": 360, "w": 73, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 17, "y": 11, "w": 71, "h": 67 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 392, "y": 304, "w": 74, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 10, "w": 72, "h": 68 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 1, "y": 283, "w": 76, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 11, "w": 74, "h": 67 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 403, "y": 235, "w": 77, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 11, "w": 75, "h": 67 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 565, "y": 215, "w": 78, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 11, "w": 76, "h": 67 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 246, "y": 222, "w": 78, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 11, "w": 76, "h": 67 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 80, "y": 282, "w": 78, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 12, "w": 76, "h": 66 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 227, "y": 291, "w": 78, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 13, "w": 76, "h": 65 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 556, "y": 352, "w": 80, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 16, "w": 78, "h": 62 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 226, "y": 358, "w": 80, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 17, "w": 78, "h": 61 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 74, "y": 420, "w": 76, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 16, "y": 16, "w": 74, "h": 62 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 452, "y": 423, "w": 68, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 13, "w": 66, "h": 65 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 1, "y": 422, "w": 65, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 8, "w": 63, "h": 70 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 539, "y": 416, "w": 64, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 3, "w": 62, "h": 75 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 160, "y": 229, "w": 67, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 0, "w": 65, "h": 78 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 427, "y": 77, "w": 72, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 0, "w": 70, "h": 78 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 588, "y": 1, "w": 76, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 0, "w": 74, "h": 78 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 511, "y": 1, "w": 77, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 0, "w": 75, "h": 78 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 258, "y": 74, "w": 75, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 2, "w": 73, "h": 76 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 417, "y": 157, "w": 70, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 68, "h": 76 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 324, "y": 282, "w": 68, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 2, "w": 66, "h": 76 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 636, "y": 284, "w": 65, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 2, "w": 63, "h": 76 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0088.png",
+    "frame": { "x": 636, "y": 362, "w": 63, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 1, "w": 61, "h": 77 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0089.png",
+    "frame": { "x": 175, "y": 80, "w": 71, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 1, "w": 69, "h": 77 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0090.png",
+    "frame": { "x": 346, "y": 1, "w": 81, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 1, "w": 79, "h": 77 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0091.png",
+    "frame": { "x": 88, "y": 1, "w": 86, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 84, "h": 78 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0092.png",
+    "frame": { "x": 1, "y": 1, "w": 87, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 85, "h": 78 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0093.png",
+    "frame": { "x": 174, "y": 1, "w": 84, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 82, "h": 77 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0094.png",
+    "frame": { "x": 427, "y": 1, "w": 84, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 82, "h": 74 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0095.png",
+    "frame": { "x": 258, "y": 1, "w": 88, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 7, "w": 86, "h": 71 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0096.png",
+    "frame": { "x": 556, "y": 284, "w": 77, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 12, "w": 75, "h": 66 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0097.png",
+    "frame": { "x": 151, "y": 419, "w": 71, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 12, "w": 69, "h": 66 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0098.png",
+    "frame": { "x": 222, "y": 421, "w": 71, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 12, "w": 69, "h": 66 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0099.png",
+    "frame": { "x": 379, "y": 374, "w": 73, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 16, "y": 12, "w": 71, "h": 66 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0100.png",
+    "frame": { "x": 151, "y": 350, "w": 75, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 11, "w": 73, "h": 67 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0101.png",
+    "frame": { "x": 480, "y": 284, "w": 76, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 11, "w": 74, "h": 67 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0102.png",
+    "frame": { "x": 487, "y": 215, "w": 78, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 11, "w": 76, "h": 67 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.13-x64",
+  "image": "750.png",
+  "format": "I8",
+  "size": { "w": 702, "h": 495 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/750.png b/public/images/pokemon/exp/back/750.png
index 4ac4682a955..5ecd848832e 100644
Binary files a/public/images/pokemon/exp/back/750.png and b/public/images/pokemon/exp/back/750.png differ
diff --git a/public/images/pokemon/exp/back/780.json b/public/images/pokemon/exp/back/780.json
index 6a6dc7a0f38..af67efba2a0 100644
--- a/public/images/pokemon/exp/back/780.json
+++ b/public/images/pokemon/exp/back/780.json
@@ -1,230 +1,884 @@
-{
-	"textures": [
-		{
-			"image": "780.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 183,
-				"h": 183
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 86,
-						"h": 62
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 86,
-						"h": 62
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 86,
-						"h": 62
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 86,
-						"h": 62
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 85,
-						"h": 62
-					},
-					"frame": {
-						"x": 0,
-						"y": 62,
-						"w": 85,
-						"h": 62
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 86,
-						"h": 62
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 85,
-						"h": 62
-					},
-					"frame": {
-						"x": 0,
-						"y": 62,
-						"w": 85,
-						"h": 62
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 86,
-						"h": 62
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 83,
-						"h": 62
-					},
-					"frame": {
-						"x": 85,
-						"y": 62,
-						"w": 83,
-						"h": 62
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 86,
-						"h": 62
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 83,
-						"h": 62
-					},
-					"frame": {
-						"x": 85,
-						"y": 62,
-						"w": 83,
-						"h": 62
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 86,
-						"h": 62
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 82,
-						"h": 61
-					},
-					"frame": {
-						"x": 86,
-						"y": 0,
-						"w": 82,
-						"h": 61
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 86,
-						"h": 62
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 82,
-						"h": 61
-					},
-					"frame": {
-						"x": 86,
-						"y": 0,
-						"w": 82,
-						"h": 61
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 86,
-						"h": 62
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 81,
-						"h": 59
-					},
-					"frame": {
-						"x": 0,
-						"y": 124,
-						"w": 81,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 86,
-						"h": 62
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 81,
-						"h": 59
-					},
-					"frame": {
-						"x": 0,
-						"y": 124,
-						"w": 81,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 86,
-						"h": 62
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 79,
-						"h": 59
-					},
-					"frame": {
-						"x": 81,
-						"y": 124,
-						"w": 79,
-						"h": 59
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:248a786810697270e14c6ebc74f4c011:d66b0c13068d3a83b9b49f5d2fdc42b5:9470182902340de73b2565411cb0ab89$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 1, "y": 153, "w": 82, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 9, "w": 82, "h": 70 },
+    "sourceSize": { "w": 82, "h": 79 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 490, "y": 147, "w": 82, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 9, "w": 82, "h": 70 },
+    "sourceSize": { "w": 82, "h": 79 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 246, "y": 148, "w": 82, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 9, "w": 82, "h": 70 },
+    "sourceSize": { "w": 82, "h": 79 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 329, "y": 148, "w": 82, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 9, "w": 82, "h": 70 },
+    "sourceSize": { "w": 82, "h": 79 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 167, "y": 219, "w": 82, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 10, "w": 82, "h": 69 },
+    "sourceSize": { "w": 82, "h": 79 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 250, "y": 219, "w": 82, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 10, "w": 82, "h": 69 },
+    "sourceSize": { "w": 82, "h": 79 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 84, "y": 221, "w": 82, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 10, "w": 82, "h": 69 },
+    "sourceSize": { "w": 82, "h": 79 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 1, "y": 294, "w": 82, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 11, "w": 82, "h": 68 },
+    "sourceSize": { "w": 82, "h": 79 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 331, "y": 359, "w": 81, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 11, "w": 81, "h": 68 },
+    "sourceSize": { "w": 82, "h": 79 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 249, "y": 359, "w": 81, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 11, "w": 81, "h": 68 },
+    "sourceSize": { "w": 82, "h": 79 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 83, "y": 428, "w": 81, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 12, "w": 81, "h": 67 },
+    "sourceSize": { "w": 82, "h": 79 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 1, "y": 363, "w": 81, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 12, "w": 81, "h": 67 },
+    "sourceSize": { "w": 82, "h": 79 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 84, "y": 360, "w": 81, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 12, "w": 81, "h": 67 },
+    "sourceSize": { "w": 82, "h": 79 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 167, "y": 359, "w": 81, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 11, "w": 81, "h": 68 },
+    "sourceSize": { "w": 82, "h": 79 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 415, "y": 289, "w": 81, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 10, "w": 81, "h": 69 },
+    "sourceSize": { "w": 82, "h": 79 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 333, "y": 289, "w": 81, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 10, "w": 81, "h": 69 },
+    "sourceSize": { "w": 82, "h": 79 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 250, "y": 289, "w": 82, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 10, "w": 82, "h": 69 },
+    "sourceSize": { "w": 82, "h": 79 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 84, "y": 150, "w": 82, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 9, "w": 82, "h": 70 },
+    "sourceSize": { "w": 82, "h": 79 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 1, "y": 153, "w": 82, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 9, "w": 82, "h": 70 },
+    "sourceSize": { "w": 82, "h": 79 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 490, "y": 147, "w": 82, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 9, "w": 82, "h": 70 },
+    "sourceSize": { "w": 82, "h": 79 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 246, "y": 148, "w": 82, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 9, "w": 82, "h": 70 },
+    "sourceSize": { "w": 82, "h": 79 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 329, "y": 148, "w": 82, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 9, "w": 82, "h": 70 },
+    "sourceSize": { "w": 82, "h": 79 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 167, "y": 219, "w": 82, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 10, "w": 82, "h": 69 },
+    "sourceSize": { "w": 82, "h": 79 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 250, "y": 219, "w": 82, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 10, "w": 82, "h": 69 },
+    "sourceSize": { "w": 82, "h": 79 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 84, "y": 221, "w": 82, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 10, "w": 82, "h": 69 },
+    "sourceSize": { "w": 82, "h": 79 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 1, "y": 294, "w": 82, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 11, "w": 82, "h": 68 },
+    "sourceSize": { "w": 82, "h": 79 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 331, "y": 359, "w": 81, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 11, "w": 81, "h": 68 },
+    "sourceSize": { "w": 82, "h": 79 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 249, "y": 359, "w": 81, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 11, "w": 81, "h": 68 },
+    "sourceSize": { "w": 82, "h": 79 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 83, "y": 428, "w": 81, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 12, "w": 81, "h": 67 },
+    "sourceSize": { "w": 82, "h": 79 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 1, "y": 363, "w": 81, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 12, "w": 81, "h": 67 },
+    "sourceSize": { "w": 82, "h": 79 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 84, "y": 360, "w": 81, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 12, "w": 81, "h": 67 },
+    "sourceSize": { "w": 82, "h": 79 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 167, "y": 359, "w": 81, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 11, "w": 81, "h": 68 },
+    "sourceSize": { "w": 82, "h": 79 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 415, "y": 289, "w": 81, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 10, "w": 81, "h": 69 },
+    "sourceSize": { "w": 82, "h": 79 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 333, "y": 289, "w": 81, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 10, "w": 81, "h": 69 },
+    "sourceSize": { "w": 82, "h": 79 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 250, "y": 289, "w": 82, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 10, "w": 82, "h": 69 },
+    "sourceSize": { "w": 82, "h": 79 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 84, "y": 150, "w": 82, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 9, "w": 82, "h": 70 },
+    "sourceSize": { "w": 82, "h": 79 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 1, "y": 153, "w": 82, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 9, "w": 82, "h": 70 },
+    "sourceSize": { "w": 82, "h": 79 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 490, "y": 147, "w": 82, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 9, "w": 82, "h": 70 },
+    "sourceSize": { "w": 82, "h": 79 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 246, "y": 148, "w": 82, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 9, "w": 82, "h": 70 },
+    "sourceSize": { "w": 82, "h": 79 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 329, "y": 148, "w": 82, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 9, "w": 82, "h": 70 },
+    "sourceSize": { "w": 82, "h": 79 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 167, "y": 219, "w": 82, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 10, "w": 82, "h": 69 },
+    "sourceSize": { "w": 82, "h": 79 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 250, "y": 219, "w": 82, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 10, "w": 82, "h": 69 },
+    "sourceSize": { "w": 82, "h": 79 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 84, "y": 221, "w": 82, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 10, "w": 82, "h": 69 },
+    "sourceSize": { "w": 82, "h": 79 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 1, "y": 294, "w": 82, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 11, "w": 82, "h": 68 },
+    "sourceSize": { "w": 82, "h": 79 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 331, "y": 359, "w": 81, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 11, "w": 81, "h": 68 },
+    "sourceSize": { "w": 82, "h": 79 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 249, "y": 359, "w": 81, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 11, "w": 81, "h": 68 },
+    "sourceSize": { "w": 82, "h": 79 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 83, "y": 428, "w": 81, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 12, "w": 81, "h": 67 },
+    "sourceSize": { "w": 82, "h": 79 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 1, "y": 363, "w": 81, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 12, "w": 81, "h": 67 },
+    "sourceSize": { "w": 82, "h": 79 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 84, "y": 360, "w": 81, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 12, "w": 81, "h": 67 },
+    "sourceSize": { "w": 82, "h": 79 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 167, "y": 359, "w": 81, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 11, "w": 81, "h": 68 },
+    "sourceSize": { "w": 82, "h": 79 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 415, "y": 289, "w": 81, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 10, "w": 81, "h": 69 },
+    "sourceSize": { "w": 82, "h": 79 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 333, "y": 289, "w": 81, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 10, "w": 81, "h": 69 },
+    "sourceSize": { "w": 82, "h": 79 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 250, "y": 289, "w": 82, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 10, "w": 82, "h": 69 },
+    "sourceSize": { "w": 82, "h": 79 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 84, "y": 150, "w": 82, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 9, "w": 82, "h": 70 },
+    "sourceSize": { "w": 82, "h": 79 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 1, "y": 153, "w": 82, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 9, "w": 82, "h": 70 },
+    "sourceSize": { "w": 82, "h": 79 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 490, "y": 147, "w": 82, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 9, "w": 82, "h": 70 },
+    "sourceSize": { "w": 82, "h": 79 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 246, "y": 148, "w": 82, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 9, "w": 82, "h": 70 },
+    "sourceSize": { "w": 82, "h": 79 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 329, "y": 148, "w": 82, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 9, "w": 82, "h": 70 },
+    "sourceSize": { "w": 82, "h": 79 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 167, "y": 219, "w": 82, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 10, "w": 82, "h": 69 },
+    "sourceSize": { "w": 82, "h": 79 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 250, "y": 219, "w": 82, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 10, "w": 82, "h": 69 },
+    "sourceSize": { "w": 82, "h": 79 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 84, "y": 221, "w": 82, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 10, "w": 82, "h": 69 },
+    "sourceSize": { "w": 82, "h": 79 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 1, "y": 294, "w": 82, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 11, "w": 82, "h": 68 },
+    "sourceSize": { "w": 82, "h": 79 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 331, "y": 359, "w": 81, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 11, "w": 81, "h": 68 },
+    "sourceSize": { "w": 82, "h": 79 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 249, "y": 359, "w": 81, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 11, "w": 81, "h": 68 },
+    "sourceSize": { "w": 82, "h": 79 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 83, "y": 428, "w": 81, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 12, "w": 81, "h": 67 },
+    "sourceSize": { "w": 82, "h": 79 },
+    "duration": 100
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 1, "y": 363, "w": 81, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 12, "w": 81, "h": 67 },
+    "sourceSize": { "w": 82, "h": 79 },
+    "duration": 100
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 84, "y": 360, "w": 81, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 12, "w": 81, "h": 67 },
+    "sourceSize": { "w": 82, "h": 79 },
+    "duration": 100
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 167, "y": 359, "w": 81, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 11, "w": 81, "h": 68 },
+    "sourceSize": { "w": 82, "h": 79 },
+    "duration": 100
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 415, "y": 289, "w": 81, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 10, "w": 81, "h": 69 },
+    "sourceSize": { "w": 82, "h": 79 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 333, "y": 289, "w": 81, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 10, "w": 81, "h": 69 },
+    "sourceSize": { "w": 82, "h": 79 },
+    "duration": 100
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 250, "y": 289, "w": 82, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 10, "w": 82, "h": 69 },
+    "sourceSize": { "w": 82, "h": 79 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 84, "y": 150, "w": 82, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 9, "w": 82, "h": 70 },
+    "sourceSize": { "w": 82, "h": 79 },
+    "duration": 100
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 1, "y": 153, "w": 82, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 9, "w": 82, "h": 70 },
+    "sourceSize": { "w": 82, "h": 79 },
+    "duration": 100
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 1, "y": 81, "w": 82, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 8, "w": 82, "h": 71 },
+    "sourceSize": { "w": 82, "h": 79 },
+    "duration": 100
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 490, "y": 75, "w": 82, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 8, "w": 82, "h": 71 },
+    "sourceSize": { "w": 82, "h": 79 },
+    "duration": 100
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 325, "y": 75, "w": 82, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 82, "h": 72 },
+    "sourceSize": { "w": 82, "h": 79 },
+    "duration": 100
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 408, "y": 75, "w": 81, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 81, "h": 72 },
+    "sourceSize": { "w": 82, "h": 79 },
+    "duration": 100
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 407, "y": 1, "w": 81, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 6, "w": 81, "h": 73 },
+    "sourceSize": { "w": 82, "h": 79 },
+    "duration": 100
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 325, "y": 1, "w": 81, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 6, "w": 81, "h": 73 },
+    "sourceSize": { "w": 82, "h": 79 },
+    "duration": 100
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 163, "y": 78, "w": 82, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 8, "w": 82, "h": 71 },
+    "sourceSize": { "w": 82, "h": 79 },
+    "duration": 100
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 84, "y": 291, "w": 82, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 11, "w": 82, "h": 68 },
+    "sourceSize": { "w": 82, "h": 79 },
+    "duration": 100
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 495, "y": 218, "w": 80, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 10, "w": 80, "h": 69 },
+    "sourceSize": { "w": 82, "h": 79 },
+    "duration": 100
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 243, "y": 1, "w": 81, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 81, "h": 74 },
+    "sourceSize": { "w": 82, "h": 79 },
+    "duration": 100
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 83, "y": 1, "w": 79, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 79, "h": 79 },
+    "sourceSize": { "w": 82, "h": 79 },
+    "duration": 100
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 1, "y": 1, "w": 81, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 81, "h": 78 },
+    "sourceSize": { "w": 82, "h": 79 },
+    "duration": 100
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 83, "y": 1, "w": 79, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 79, "h": 79 },
+    "sourceSize": { "w": 82, "h": 79 },
+    "duration": 100
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 1, "y": 1, "w": 81, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 81, "h": 78 },
+    "sourceSize": { "w": 82, "h": 79 },
+    "duration": 100
+   },
+   {
+    "filename": "0088.png",
+    "frame": { "x": 83, "y": 1, "w": 79, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 79, "h": 79 },
+    "sourceSize": { "w": 82, "h": 79 },
+    "duration": 100
+   },
+   {
+    "filename": "0089.png",
+    "frame": { "x": 1, "y": 1, "w": 81, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 81, "h": 78 },
+    "sourceSize": { "w": 82, "h": 79 },
+    "duration": 100
+   },
+   {
+    "filename": "0090.png",
+    "frame": { "x": 163, "y": 1, "w": 79, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 79, "h": 76 },
+    "sourceSize": { "w": 82, "h": 79 },
+    "duration": 100
+   },
+   {
+    "filename": "0091.png",
+    "frame": { "x": 489, "y": 1, "w": 81, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 6, "w": 81, "h": 73 },
+    "sourceSize": { "w": 82, "h": 79 },
+    "duration": 100
+   },
+   {
+    "filename": "0092.png",
+    "frame": { "x": 247, "y": 428, "w": 82, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 14, "w": 82, "h": 65 },
+    "sourceSize": { "w": 82, "h": 79 },
+    "duration": 100
+   },
+   {
+    "filename": "0093.png",
+    "frame": { "x": 165, "y": 428, "w": 81, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 12, "w": 81, "h": 67 },
+    "sourceSize": { "w": 82, "h": 79 },
+    "duration": 100
+   },
+   {
+    "filename": "0094.png",
+    "frame": { "x": 413, "y": 359, "w": 81, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 11, "w": 81, "h": 68 },
+    "sourceSize": { "w": 82, "h": 79 },
+    "duration": 100
+   },
+   {
+    "filename": "0095.png",
+    "frame": { "x": 1, "y": 224, "w": 82, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 10, "w": 82, "h": 69 },
+    "sourceSize": { "w": 82, "h": 79 },
+    "duration": 100
+   },
+   {
+    "filename": "0096.png",
+    "frame": { "x": 167, "y": 289, "w": 82, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 10, "w": 82, "h": 69 },
+    "sourceSize": { "w": 82, "h": 79 },
+    "duration": 100
+   },
+   {
+    "filename": "0097.png",
+    "frame": { "x": 412, "y": 218, "w": 82, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 9, "w": 82, "h": 70 },
+    "sourceSize": { "w": 82, "h": 79 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.13-x64",
+  "image": "780.png",
+  "format": "I8",
+  "size": { "w": 576, "h": 496 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/780.png b/public/images/pokemon/exp/back/780.png
index aa85f9ed535..595476cf717 100644
Binary files a/public/images/pokemon/exp/back/780.png and b/public/images/pokemon/exp/back/780.png differ
diff --git a/public/images/pokemon/exp/back/782.json b/public/images/pokemon/exp/back/782.json
deleted file mode 100644
index aa9698c6554..00000000000
--- a/public/images/pokemon/exp/back/782.json
+++ /dev/null
@@ -1,2351 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "782.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 239,
-				"h": 239
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0083.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0111.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0084.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					},
-					"frame": {
-						"x": 0,
-						"y": 52,
-						"w": 48,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0110.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					},
-					"frame": {
-						"x": 0,
-						"y": 52,
-						"w": 48,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0085.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					},
-					"frame": {
-						"x": 48,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0086.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					},
-					"frame": {
-						"x": 0,
-						"y": 104,
-						"w": 48,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0087.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					},
-					"frame": {
-						"x": 48,
-						"y": 52,
-						"w": 48,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0088.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					},
-					"frame": {
-						"x": 48,
-						"y": 52,
-						"w": 48,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0095.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					},
-					"frame": {
-						"x": 48,
-						"y": 52,
-						"w": 48,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0096.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					},
-					"frame": {
-						"x": 48,
-						"y": 52,
-						"w": 48,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0104.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					},
-					"frame": {
-						"x": 48,
-						"y": 52,
-						"w": 48,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0105.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					},
-					"frame": {
-						"x": 48,
-						"y": 52,
-						"w": 48,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0089.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					},
-					"frame": {
-						"x": 96,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0090.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					},
-					"frame": {
-						"x": 0,
-						"y": 156,
-						"w": 48,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0091.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					},
-					"frame": {
-						"x": 48,
-						"y": 104,
-						"w": 48,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0108.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					},
-					"frame": {
-						"x": 48,
-						"y": 104,
-						"w": 48,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0092.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					},
-					"frame": {
-						"x": 96,
-						"y": 52,
-						"w": 48,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0099.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					},
-					"frame": {
-						"x": 96,
-						"y": 52,
-						"w": 48,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0100.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					},
-					"frame": {
-						"x": 96,
-						"y": 52,
-						"w": 48,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0093.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					},
-					"frame": {
-						"x": 144,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0094.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					},
-					"frame": {
-						"x": 144,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0101.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					},
-					"frame": {
-						"x": 144,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0102.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					},
-					"frame": {
-						"x": 144,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0103.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					},
-					"frame": {
-						"x": 144,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 47,
-						"h": 51
-					},
-					"frame": {
-						"x": 192,
-						"y": 0,
-						"w": 47,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 47,
-						"h": 51
-					},
-					"frame": {
-						"x": 192,
-						"y": 0,
-						"w": 47,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0029.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 47,
-						"h": 51
-					},
-					"frame": {
-						"x": 192,
-						"y": 0,
-						"w": 47,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0030.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 47,
-						"h": 51
-					},
-					"frame": {
-						"x": 192,
-						"y": 0,
-						"w": 47,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0045.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 47,
-						"h": 51
-					},
-					"frame": {
-						"x": 192,
-						"y": 0,
-						"w": 47,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0046.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 47,
-						"h": 51
-					},
-					"frame": {
-						"x": 192,
-						"y": 0,
-						"w": 47,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0061.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 47,
-						"h": 51
-					},
-					"frame": {
-						"x": 192,
-						"y": 0,
-						"w": 47,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0062.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 47,
-						"h": 51
-					},
-					"frame": {
-						"x": 192,
-						"y": 0,
-						"w": 47,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0077.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 47,
-						"h": 51
-					},
-					"frame": {
-						"x": 192,
-						"y": 0,
-						"w": 47,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0078.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 47,
-						"h": 51
-					},
-					"frame": {
-						"x": 192,
-						"y": 0,
-						"w": 47,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0097.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					},
-					"frame": {
-						"x": 48,
-						"y": 156,
-						"w": 48,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0098.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					},
-					"frame": {
-						"x": 48,
-						"y": 156,
-						"w": 48,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0106.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					},
-					"frame": {
-						"x": 48,
-						"y": 156,
-						"w": 48,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0107.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					},
-					"frame": {
-						"x": 48,
-						"y": 156,
-						"w": 48,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0109.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					},
-					"frame": {
-						"x": 96,
-						"y": 104,
-						"w": 48,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 48,
-						"h": 51
-					},
-					"frame": {
-						"x": 144,
-						"y": 52,
-						"w": 48,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 48,
-						"h": 51
-					},
-					"frame": {
-						"x": 144,
-						"y": 52,
-						"w": 48,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 48,
-						"h": 51
-					},
-					"frame": {
-						"x": 144,
-						"y": 52,
-						"w": 48,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 48,
-						"h": 51
-					},
-					"frame": {
-						"x": 144,
-						"y": 52,
-						"w": 48,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0033.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 48,
-						"h": 51
-					},
-					"frame": {
-						"x": 144,
-						"y": 52,
-						"w": 48,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0034.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 48,
-						"h": 51
-					},
-					"frame": {
-						"x": 144,
-						"y": 52,
-						"w": 48,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0049.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 48,
-						"h": 51
-					},
-					"frame": {
-						"x": 144,
-						"y": 52,
-						"w": 48,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0050.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 48,
-						"h": 51
-					},
-					"frame": {
-						"x": 144,
-						"y": 52,
-						"w": 48,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0065.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 48,
-						"h": 51
-					},
-					"frame": {
-						"x": 144,
-						"y": 52,
-						"w": 48,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0066.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 48,
-						"h": 51
-					},
-					"frame": {
-						"x": 144,
-						"y": 52,
-						"w": 48,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0081.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 48,
-						"h": 51
-					},
-					"frame": {
-						"x": 144,
-						"y": 52,
-						"w": 48,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0082.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 48,
-						"h": 51
-					},
-					"frame": {
-						"x": 144,
-						"y": 52,
-						"w": 48,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 47,
-						"h": 51
-					},
-					"frame": {
-						"x": 192,
-						"y": 51,
-						"w": 47,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 47,
-						"h": 51
-					},
-					"frame": {
-						"x": 192,
-						"y": 51,
-						"w": 47,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0031.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 47,
-						"h": 51
-					},
-					"frame": {
-						"x": 192,
-						"y": 51,
-						"w": 47,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0032.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 47,
-						"h": 51
-					},
-					"frame": {
-						"x": 192,
-						"y": 51,
-						"w": 47,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0047.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 47,
-						"h": 51
-					},
-					"frame": {
-						"x": 192,
-						"y": 51,
-						"w": 47,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0048.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 47,
-						"h": 51
-					},
-					"frame": {
-						"x": 192,
-						"y": 51,
-						"w": 47,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0063.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 47,
-						"h": 51
-					},
-					"frame": {
-						"x": 192,
-						"y": 51,
-						"w": 47,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0064.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 47,
-						"h": 51
-					},
-					"frame": {
-						"x": 192,
-						"y": 51,
-						"w": 47,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0079.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 47,
-						"h": 51
-					},
-					"frame": {
-						"x": 192,
-						"y": 51,
-						"w": 47,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0080.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 47,
-						"h": 51
-					},
-					"frame": {
-						"x": 192,
-						"y": 51,
-						"w": 47,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 48,
-						"h": 51
-					},
-					"frame": {
-						"x": 96,
-						"y": 156,
-						"w": 48,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 48,
-						"h": 51
-					},
-					"frame": {
-						"x": 96,
-						"y": 156,
-						"w": 48,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 48,
-						"h": 51
-					},
-					"frame": {
-						"x": 96,
-						"y": 156,
-						"w": 48,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 48,
-						"h": 51
-					},
-					"frame": {
-						"x": 96,
-						"y": 156,
-						"w": 48,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0035.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 48,
-						"h": 51
-					},
-					"frame": {
-						"x": 96,
-						"y": 156,
-						"w": 48,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0036.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 48,
-						"h": 51
-					},
-					"frame": {
-						"x": 96,
-						"y": 156,
-						"w": 48,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0051.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 48,
-						"h": 51
-					},
-					"frame": {
-						"x": 96,
-						"y": 156,
-						"w": 48,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0052.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 48,
-						"h": 51
-					},
-					"frame": {
-						"x": 96,
-						"y": 156,
-						"w": 48,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0067.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 48,
-						"h": 51
-					},
-					"frame": {
-						"x": 96,
-						"y": 156,
-						"w": 48,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0068.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 48,
-						"h": 51
-					},
-					"frame": {
-						"x": 96,
-						"y": 156,
-						"w": 48,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 48,
-						"h": 51
-					},
-					"frame": {
-						"x": 144,
-						"y": 103,
-						"w": 48,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 48,
-						"h": 51
-					},
-					"frame": {
-						"x": 144,
-						"y": 103,
-						"w": 48,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 48,
-						"h": 51
-					},
-					"frame": {
-						"x": 144,
-						"y": 103,
-						"w": 48,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 48,
-						"h": 51
-					},
-					"frame": {
-						"x": 144,
-						"y": 103,
-						"w": 48,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0037.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 48,
-						"h": 51
-					},
-					"frame": {
-						"x": 144,
-						"y": 103,
-						"w": 48,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0038.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 48,
-						"h": 51
-					},
-					"frame": {
-						"x": 144,
-						"y": 103,
-						"w": 48,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0053.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 48,
-						"h": 51
-					},
-					"frame": {
-						"x": 144,
-						"y": 103,
-						"w": 48,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0054.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 48,
-						"h": 51
-					},
-					"frame": {
-						"x": 144,
-						"y": 103,
-						"w": 48,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0069.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 48,
-						"h": 51
-					},
-					"frame": {
-						"x": 144,
-						"y": 103,
-						"w": 48,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0070.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 48,
-						"h": 51
-					},
-					"frame": {
-						"x": 144,
-						"y": 103,
-						"w": 48,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 2,
-						"w": 47,
-						"h": 50
-					},
-					"frame": {
-						"x": 192,
-						"y": 102,
-						"w": 47,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 2,
-						"w": 47,
-						"h": 50
-					},
-					"frame": {
-						"x": 192,
-						"y": 102,
-						"w": 47,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 2,
-						"w": 47,
-						"h": 50
-					},
-					"frame": {
-						"x": 192,
-						"y": 102,
-						"w": 47,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 2,
-						"w": 47,
-						"h": 50
-					},
-					"frame": {
-						"x": 192,
-						"y": 102,
-						"w": 47,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0039.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 2,
-						"w": 47,
-						"h": 50
-					},
-					"frame": {
-						"x": 192,
-						"y": 102,
-						"w": 47,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0040.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 2,
-						"w": 47,
-						"h": 50
-					},
-					"frame": {
-						"x": 192,
-						"y": 102,
-						"w": 47,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0055.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 2,
-						"w": 47,
-						"h": 50
-					},
-					"frame": {
-						"x": 192,
-						"y": 102,
-						"w": 47,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0056.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 2,
-						"w": 47,
-						"h": 50
-					},
-					"frame": {
-						"x": 192,
-						"y": 102,
-						"w": 47,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0071.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 2,
-						"w": 47,
-						"h": 50
-					},
-					"frame": {
-						"x": 192,
-						"y": 102,
-						"w": 47,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0072.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 2,
-						"w": 47,
-						"h": 50
-					},
-					"frame": {
-						"x": 192,
-						"y": 102,
-						"w": 47,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 2,
-						"w": 47,
-						"h": 50
-					},
-					"frame": {
-						"x": 192,
-						"y": 152,
-						"w": 47,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 2,
-						"w": 47,
-						"h": 50
-					},
-					"frame": {
-						"x": 192,
-						"y": 152,
-						"w": 47,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0027.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 2,
-						"w": 47,
-						"h": 50
-					},
-					"frame": {
-						"x": 192,
-						"y": 152,
-						"w": 47,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0028.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 2,
-						"w": 47,
-						"h": 50
-					},
-					"frame": {
-						"x": 192,
-						"y": 152,
-						"w": 47,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0043.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 2,
-						"w": 47,
-						"h": 50
-					},
-					"frame": {
-						"x": 192,
-						"y": 152,
-						"w": 47,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0044.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 2,
-						"w": 47,
-						"h": 50
-					},
-					"frame": {
-						"x": 192,
-						"y": 152,
-						"w": 47,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0059.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 2,
-						"w": 47,
-						"h": 50
-					},
-					"frame": {
-						"x": 192,
-						"y": 152,
-						"w": 47,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0060.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 2,
-						"w": 47,
-						"h": 50
-					},
-					"frame": {
-						"x": 192,
-						"y": 152,
-						"w": 47,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0075.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 2,
-						"w": 47,
-						"h": 50
-					},
-					"frame": {
-						"x": 192,
-						"y": 152,
-						"w": 47,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0076.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 2,
-						"w": 47,
-						"h": 50
-					},
-					"frame": {
-						"x": 192,
-						"y": 152,
-						"w": 47,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 47,
-						"h": 49
-					},
-					"frame": {
-						"x": 144,
-						"y": 154,
-						"w": 47,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 47,
-						"h": 49
-					},
-					"frame": {
-						"x": 144,
-						"y": 154,
-						"w": 47,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0025.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 47,
-						"h": 49
-					},
-					"frame": {
-						"x": 144,
-						"y": 154,
-						"w": 47,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0026.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 47,
-						"h": 49
-					},
-					"frame": {
-						"x": 144,
-						"y": 154,
-						"w": 47,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0041.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 47,
-						"h": 49
-					},
-					"frame": {
-						"x": 144,
-						"y": 154,
-						"w": 47,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0042.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 47,
-						"h": 49
-					},
-					"frame": {
-						"x": 144,
-						"y": 154,
-						"w": 47,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0057.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 47,
-						"h": 49
-					},
-					"frame": {
-						"x": 144,
-						"y": 154,
-						"w": 47,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0058.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 47,
-						"h": 49
-					},
-					"frame": {
-						"x": 144,
-						"y": 154,
-						"w": 47,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0073.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 47,
-						"h": 49
-					},
-					"frame": {
-						"x": 144,
-						"y": 154,
-						"w": 47,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0074.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 47,
-						"h": 49
-					},
-					"frame": {
-						"x": 144,
-						"y": 154,
-						"w": 47,
-						"h": 49
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:48f53f968d06c5de2d5b76e15505b755:5d901e7ac581518a4fe6730bcf366c83:d07862436676aa228a148ee1f1d82a8f$"
-	}
-}
diff --git a/public/images/pokemon/exp/back/782.png b/public/images/pokemon/exp/back/782.png
deleted file mode 100644
index 402ac12f53a..00000000000
Binary files a/public/images/pokemon/exp/back/782.png and /dev/null differ
diff --git a/public/images/pokemon/exp/back/783.json b/public/images/pokemon/exp/back/783.json
deleted file mode 100644
index ea0bcf61b16..00000000000
--- a/public/images/pokemon/exp/back/783.json
+++ /dev/null
@@ -1,230 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "783.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 170,
-				"h": 170
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 60,
-						"h": 70
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 60,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 60,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 60,
-						"h": 70
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 59,
-						"h": 70
-					},
-					"frame": {
-						"x": 0,
-						"y": 69,
-						"w": 59,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 60,
-						"h": 70
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 59,
-						"h": 70
-					},
-					"frame": {
-						"x": 0,
-						"y": 69,
-						"w": 59,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 60,
-						"h": 70
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 57,
-						"h": 70
-					},
-					"frame": {
-						"x": 60,
-						"y": 0,
-						"w": 57,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 60,
-						"h": 70
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 57,
-						"h": 70
-					},
-					"frame": {
-						"x": 60,
-						"y": 0,
-						"w": 57,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 60,
-						"h": 70
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 53,
-						"h": 70
-					},
-					"frame": {
-						"x": 117,
-						"y": 0,
-						"w": 53,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 60,
-						"h": 70
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 55,
-						"h": 70
-					},
-					"frame": {
-						"x": 59,
-						"y": 70,
-						"w": 55,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 60,
-						"h": 70
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 55,
-						"h": 70
-					},
-					"frame": {
-						"x": 59,
-						"y": 70,
-						"w": 55,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 60,
-						"h": 70
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 55,
-						"h": 70
-					},
-					"frame": {
-						"x": 114,
-						"y": 70,
-						"w": 55,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 60,
-						"h": 70
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 55,
-						"h": 70
-					},
-					"frame": {
-						"x": 114,
-						"y": 70,
-						"w": 55,
-						"h": 70
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:20660c9e03072cd65380bda5628411e8:a05376d2ce003dccda577a6cc48e817b:aab166e28c744865a0296041224dd01b$"
-	}
-}
diff --git a/public/images/pokemon/exp/back/783.png b/public/images/pokemon/exp/back/783.png
deleted file mode 100644
index ea3deeb1a40..00000000000
Binary files a/public/images/pokemon/exp/back/783.png and /dev/null differ
diff --git a/public/images/pokemon/exp/back/784.json b/public/images/pokemon/exp/back/784.json
deleted file mode 100644
index 7ff49909f1a..00000000000
--- a/public/images/pokemon/exp/back/784.json
+++ /dev/null
@@ -1,230 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "784.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 240,
-				"h": 240
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 87,
-						"h": 81
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 87,
-						"h": 81
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 87,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 87,
-						"h": 81
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 84,
-						"h": 81
-					},
-					"frame": {
-						"x": 87,
-						"y": 0,
-						"w": 84,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 87,
-						"h": 81
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 84,
-						"h": 81
-					},
-					"frame": {
-						"x": 87,
-						"y": 0,
-						"w": 84,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 87,
-						"h": 81
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 81,
-						"h": 81
-					},
-					"frame": {
-						"x": 0,
-						"y": 81,
-						"w": 81,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 87,
-						"h": 81
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 81,
-						"h": 81
-					},
-					"frame": {
-						"x": 0,
-						"y": 81,
-						"w": 81,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 87,
-						"h": 81
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 0,
-						"w": 78,
-						"h": 81
-					},
-					"frame": {
-						"x": 81,
-						"y": 81,
-						"w": 78,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 87,
-						"h": 81
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 0,
-						"w": 78,
-						"h": 81
-					},
-					"frame": {
-						"x": 81,
-						"y": 81,
-						"w": 78,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 87,
-						"h": 81
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 79,
-						"h": 79
-					},
-					"frame": {
-						"x": 159,
-						"y": 81,
-						"w": 79,
-						"h": 79
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 87,
-						"h": 81
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 78,
-						"h": 80
-					},
-					"frame": {
-						"x": 159,
-						"y": 160,
-						"w": 78,
-						"h": 80
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 87,
-						"h": 81
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 78,
-						"h": 80
-					},
-					"frame": {
-						"x": 159,
-						"y": 160,
-						"w": 78,
-						"h": 80
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:e1718793cec57b03b57147eb8c643dea:df6891980c354d7d34cd79ab41de7d58:c2f7ca3ab1075b8c824730653d891244$"
-	}
-}
diff --git a/public/images/pokemon/exp/back/784.png b/public/images/pokemon/exp/back/784.png
deleted file mode 100644
index 54522e52998..00000000000
Binary files a/public/images/pokemon/exp/back/784.png and /dev/null differ
diff --git a/public/images/pokemon/exp/back/815-gigantamax.json b/public/images/pokemon/exp/back/815-gigantamax.json
new file mode 100644
index 00000000000..952ea16b6b8
--- /dev/null
+++ b/public/images/pokemon/exp/back/815-gigantamax.json
@@ -0,0 +1,659 @@
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 525, "y": 384, "w": 81, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 81, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 356, "y": 98, "w": 86, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 86, "h": 94 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 444, "y": 98, "w": 86, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 86, "h": 94 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 267, "y": 98, "w": 87, "h": 93 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 87, "h": 93 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 528, "y": 194, "w": 82, "h": 92 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 6, "w": 82, "h": 92 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 250, "y": 484, "w": 81, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 7, "w": 81, "h": 91 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 333, "y": 388, "w": 83, "h": 92 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 6, "w": 83, "h": 92 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 82, "y": 485, "w": 79, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 7, "w": 79, "h": 91 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 167, "y": 483, "w": 81, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 7, "w": 81, "h": 91 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 440, "y": 194, "w": 86, "h": 92 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 86, "h": 92 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 177, "y": 194, "w": 86, "h": 93 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 86, "h": 93 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 179, "y": 1, "w": 87, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 87, "h": 94 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 267, "y": 193, "w": 85, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 85, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 1, "y": 292, "w": 81, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 2, "w": 81, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 86, "y": 195, "w": 83, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 2, "w": 83, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 333, "y": 482, "w": 79, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 2, "w": 79, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 525, "y": 384, "w": 81, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 81, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 356, "y": 98, "w": 86, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 86, "h": 94 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 444, "y": 98, "w": 86, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 86, "h": 94 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 267, "y": 98, "w": 87, "h": 93 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 87, "h": 93 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 528, "y": 194, "w": 82, "h": 92 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 6, "w": 82, "h": 92 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 250, "y": 484, "w": 81, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 7, "w": 81, "h": 91 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 333, "y": 388, "w": 83, "h": 92 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 6, "w": 83, "h": 92 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 82, "y": 485, "w": 79, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 7, "w": 79, "h": 91 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 167, "y": 483, "w": 81, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 7, "w": 81, "h": 91 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 440, "y": 194, "w": 86, "h": 92 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 86, "h": 92 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 177, "y": 194, "w": 86, "h": 93 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 86, "h": 93 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 179, "y": 1, "w": 87, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 87, "h": 94 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 267, "y": 193, "w": 85, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 85, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 1, "y": 292, "w": 81, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 2, "w": 81, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 86, "y": 195, "w": 83, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 2, "w": 83, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 333, "y": 482, "w": 79, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 2, "w": 79, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 525, "y": 384, "w": 81, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 81, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 356, "y": 98, "w": 86, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 86, "h": 94 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 444, "y": 98, "w": 86, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 86, "h": 94 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 267, "y": 98, "w": 87, "h": 93 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 87, "h": 93 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 528, "y": 194, "w": 82, "h": 92 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 6, "w": 82, "h": 92 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 250, "y": 484, "w": 81, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 7, "w": 81, "h": 91 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 333, "y": 388, "w": 83, "h": 92 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 6, "w": 83, "h": 92 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 82, "y": 485, "w": 79, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 7, "w": 79, "h": 91 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 167, "y": 483, "w": 81, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 7, "w": 81, "h": 91 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 440, "y": 194, "w": 86, "h": 92 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 86, "h": 92 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 177, "y": 194, "w": 86, "h": 93 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 86, "h": 93 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 179, "y": 1, "w": 87, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 87, "h": 94 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 267, "y": 193, "w": 85, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 85, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 1, "y": 292, "w": 81, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 2, "w": 81, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 86, "y": 195, "w": 83, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 2, "w": 83, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 333, "y": 482, "w": 79, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 2, "w": 79, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 84, "y": 292, "w": 81, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 81, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 179, "y": 97, "w": 86, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 86, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 444, "y": 1, "w": 86, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 86, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 1, "y": 1, "w": 87, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 2, "w": 87, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 171, "y": 289, "w": 82, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 2, "w": 82, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 1, "y": 389, "w": 81, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 4, "w": 81, "h": 94 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 525, "y": 288, "w": 83, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 83, "h": 94 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 1, "y": 485, "w": 79, "h": 93 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 7, "w": 79, "h": 93 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 84, "y": 389, "w": 81, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 6, "w": 81, "h": 94 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 356, "y": 1, "w": 86, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 4, "w": 86, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 268, "y": 1, "w": 86, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 3, "w": 86, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 354, "y": 194, "w": 84, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 2, "w": 84, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 255, "y": 290, "w": 82, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 1, "w": 82, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 423, "y": 385, "w": 81, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 1, "w": 81, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 1, "y": 195, "w": 83, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 1, "w": 83, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 506, "y": 481, "w": 80, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 0, "w": 80, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 250, "y": 387, "w": 81, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 1, "w": 81, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 1, "y": 98, "w": 86, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 86, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 89, "y": 98, "w": 86, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 86, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 90, "y": 1, "w": 87, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 87, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 339, "y": 291, "w": 82, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 5, "w": 82, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 167, "y": 386, "w": 81, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 4, "w": 81, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 440, "y": 288, "w": 83, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 83, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 414, "y": 482, "w": 79, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 2, "w": 79, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.13-x64",
+  "image": "815-gigantamax.png",
+  "format": "I8",
+  "size": { "w": 611, "h": 579 },
+  "scale": "1"
+ }
+}
diff --git a/public/images/pokemon/exp/back/815-gigantamax.png b/public/images/pokemon/exp/back/815-gigantamax.png
new file mode 100644
index 00000000000..0036d75cbfc
Binary files /dev/null and b/public/images/pokemon/exp/back/815-gigantamax.png differ
diff --git a/public/images/pokemon/exp/back/839-gigantamax.json b/public/images/pokemon/exp/back/839-gigantamax.json
new file mode 100644
index 00000000000..35d98910c9f
--- /dev/null
+++ b/public/images/pokemon/exp/back/839-gigantamax.json
@@ -0,0 +1,821 @@
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 238, "y": 282, "w": 77, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 0, "w": 77, "h": 96 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 470, "y": 377, "w": 76, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 19, "y": 0, "w": 76, "h": 96 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 546, "y": 377, "w": 76, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 0, "w": 76, "h": 96 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 469, "y": 473, "w": 75, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 0, "w": 75, "h": 96 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 544, "y": 473, "w": 75, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 0, "w": 75, "h": 96 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 154, "y": 472, "w": 76, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 1, "w": 76, "h": 95 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 0, "y": 566, "w": 75, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 1, "w": 75, "h": 95 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 393, "y": 376, "w": 77, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 1, "w": 77, "h": 95 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 414, "y": 190, "w": 78, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 1, "w": 78, "h": 95 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 492, "y": 191, "w": 78, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 1, "w": 78, "h": 95 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 159, "y": 283, "w": 78, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 2, "w": 78, "h": 94 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 158, "y": 189, "w": 80, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 2, "w": 80, "h": 94 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 255, "y": 188, "w": 80, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 2, "w": 80, "h": 94 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 173, "y": 95, "w": 82, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 2, "w": 82, "h": 94 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 90, "y": 93, "w": 83, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 2, "w": 83, "h": 94 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 350, "y": 95, "w": 82, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 2, "w": 82, "h": 94 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 524, "y": 0, "w": 83, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 1, "w": 83, "h": 95 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 268, "y": 92, "w": 82, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 0, "w": 82, "h": 96 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 513, "y": 95, "w": 80, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 0, "w": 80, "h": 96 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 0, "y": 185, "w": 79, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 0, "w": 79, "h": 96 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 238, "y": 282, "w": 77, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 0, "w": 77, "h": 96 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 470, "y": 377, "w": 76, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 19, "y": 0, "w": 76, "h": 96 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 546, "y": 377, "w": 76, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 0, "w": 76, "h": 96 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 469, "y": 473, "w": 75, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 0, "w": 75, "h": 96 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 544, "y": 473, "w": 75, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 0, "w": 75, "h": 96 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 154, "y": 472, "w": 76, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 1, "w": 76, "h": 95 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 0, "y": 566, "w": 75, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 1, "w": 75, "h": 95 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 393, "y": 376, "w": 77, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 1, "w": 77, "h": 95 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 414, "y": 190, "w": 78, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 1, "w": 78, "h": 95 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 492, "y": 191, "w": 78, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 1, "w": 78, "h": 95 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 159, "y": 283, "w": 78, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 2, "w": 78, "h": 94 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 158, "y": 189, "w": 80, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 2, "w": 80, "h": 94 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 255, "y": 188, "w": 80, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 2, "w": 80, "h": 94 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 173, "y": 95, "w": 82, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 2, "w": 82, "h": 94 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 90, "y": 93, "w": 83, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 2, "w": 83, "h": 94 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 350, "y": 95, "w": 82, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 2, "w": 82, "h": 94 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 524, "y": 0, "w": 83, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 1, "w": 83, "h": 95 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 268, "y": 92, "w": 82, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 0, "w": 82, "h": 96 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 513, "y": 95, "w": 80, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 0, "w": 80, "h": 96 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 0, "y": 185, "w": 79, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 0, "w": 79, "h": 96 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 238, "y": 282, "w": 77, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 0, "w": 77, "h": 96 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 470, "y": 377, "w": 76, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 19, "y": 0, "w": 76, "h": 96 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 546, "y": 377, "w": 76, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 0, "w": 76, "h": 96 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 469, "y": 473, "w": 75, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 0, "w": 75, "h": 96 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 544, "y": 473, "w": 75, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 0, "w": 75, "h": 96 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 154, "y": 472, "w": 76, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 1, "w": 76, "h": 95 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 0, "y": 566, "w": 75, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 1, "w": 75, "h": 95 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 393, "y": 376, "w": 77, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 1, "w": 77, "h": 95 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 414, "y": 190, "w": 78, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 1, "w": 78, "h": 95 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 492, "y": 191, "w": 78, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 1, "w": 78, "h": 95 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 159, "y": 283, "w": 78, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 2, "w": 78, "h": 94 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 158, "y": 189, "w": 80, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 2, "w": 80, "h": 94 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 255, "y": 188, "w": 80, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 2, "w": 80, "h": 94 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 173, "y": 95, "w": 82, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 2, "w": 82, "h": 94 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 90, "y": 93, "w": 83, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 2, "w": 83, "h": 94 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 350, "y": 95, "w": 82, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 2, "w": 82, "h": 94 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 524, "y": 0, "w": 83, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 1, "w": 83, "h": 95 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 268, "y": 92, "w": 82, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 0, "w": 82, "h": 96 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 513, "y": 95, "w": 80, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 0, "w": 80, "h": 96 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 0, "y": 185, "w": 79, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 0, "w": 79, "h": 96 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 238, "y": 282, "w": 77, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 0, "w": 77, "h": 96 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 79, "y": 187, "w": 79, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 17, "y": 0, "w": 79, "h": 96 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 432, "y": 95, "w": 81, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 1, "w": 81, "h": 95 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 441, "y": 0, "w": 83, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 1, "w": 83, "h": 95 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 356, "y": 0, "w": 85, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 1, "w": 85, "h": 95 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 180, "y": 0, "w": 88, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 88, "h": 95 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 0, "y": 0, "w": 90, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 90, "h": 94 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 90, "y": 0, "w": 90, "h": 93 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 90, "h": 93 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 268, "y": 0, "w": 88, "h": 92 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 4, "w": 88, "h": 92 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 0, "y": 94, "w": 85, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 5, "w": 85, "h": 91 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 77, "y": 283, "w": 82, "h": 90 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 6, "w": 82, "h": 90 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 397, "y": 285, "w": 81, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 5, "w": 81, "h": 91 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 232, "y": 378, "w": 81, "h": 90 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 6, "w": 81, "h": 90 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 315, "y": 283, "w": 82, "h": 90 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 6, "w": 82, "h": 90 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 478, "y": 286, "w": 81, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 5, "w": 81, "h": 91 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 313, "y": 467, "w": 79, "h": 92 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 4, "w": 79, "h": 92 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 335, "y": 189, "w": 79, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 2, "w": 79, "h": 94 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 315, "y": 373, "w": 78, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 2, "w": 78, "h": 94 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 77, "y": 373, "w": 78, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 2, "w": 78, "h": 94 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 77, "y": 467, "w": 77, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 2, "w": 77, "h": 94 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 232, "y": 468, "w": 77, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 2, "w": 77, "h": 94 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 392, "y": 471, "w": 77, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 2, "w": 77, "h": 94 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 309, "y": 559, "w": 77, "h": 93 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 3, "w": 77, "h": 93 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 386, "y": 565, "w": 77, "h": 93 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 3, "w": 77, "h": 93 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 77, "y": 561, "w": 77, "h": 93 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 3, "w": 77, "h": 93 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 230, "y": 562, "w": 77, "h": 93 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 3, "w": 77, "h": 93 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 0, "y": 472, "w": 77, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 2, "w": 77, "h": 94 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0088.png",
+    "frame": { "x": 0, "y": 377, "w": 77, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 1, "w": 77, "h": 95 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0089.png",
+    "frame": { "x": 155, "y": 377, "w": 77, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 1, "w": 77, "h": 95 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0090.png",
+    "frame": { "x": 0, "y": 281, "w": 77, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 0, "w": 77, "h": 96 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.13-x64",
+  "image": "839-gigantamax.png",
+  "format": "I8",
+  "size": { "w": 622, "h": 661 },
+  "scale": "1"
+ }
+}
diff --git a/public/images/pokemon/exp/back/839-gigantamax.png b/public/images/pokemon/exp/back/839-gigantamax.png
new file mode 100644
index 00000000000..6b7622b05d8
Binary files /dev/null and b/public/images/pokemon/exp/back/839-gigantamax.png differ
diff --git a/public/images/pokemon/exp/back/840.json b/public/images/pokemon/exp/back/840.json
index 4e49422dab7..eb5a925c565 100644
--- a/public/images/pokemon/exp/back/840.json
+++ b/public/images/pokemon/exp/back/840.json
@@ -1,230 +1,1145 @@
-{
-	"textures": [
-		{
-			"image": "840.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 95,
-				"h": 95
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 42
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 42
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 42
-					},
-					"frame": {
-						"x": 0,
-						"y": 42,
-						"w": 32,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 42
-					},
-					"frame": {
-						"x": 0,
-						"y": 42,
-						"w": 32,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 32,
-						"h": 41
-					},
-					"frame": {
-						"x": 32,
-						"y": 0,
-						"w": 32,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 32,
-						"h": 41
-					},
-					"frame": {
-						"x": 32,
-						"y": 0,
-						"w": 32,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 31,
-						"h": 42
-					},
-					"frame": {
-						"x": 64,
-						"y": 0,
-						"w": 31,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 31,
-						"h": 42
-					},
-					"frame": {
-						"x": 32,
-						"y": 41,
-						"w": 31,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 31,
-						"h": 41
-					},
-					"frame": {
-						"x": 63,
-						"y": 42,
-						"w": 31,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 31,
-						"h": 41
-					},
-					"frame": {
-						"x": 63,
-						"y": 42,
-						"w": 31,
-						"h": 41
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:b5d6af055845f0bb50dedd55de251612:02858b561d730304d719627e15bc2130:c6a93eb4343acba47be6c18cd2c93ef1$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 73, "y": 44, "w": 33, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 33, "h": 41 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 136, "y": 90, "w": 33, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 33, "h": 40 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 171, "y": 91, "w": 33, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 33, "h": 40 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 37, "y": 44, "w": 34, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 34, "h": 40 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 79, "y": 2, "w": 35, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 35, "h": 40 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 41, "y": 2, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 36, "h": 40 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 2, "y": 2, "w": 37, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 37, "h": 40 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 2, "y": 2, "w": 37, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 37, "h": 40 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 2, "y": 2, "w": 37, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 37, "h": 40 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 116, "y": 2, "w": 34, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 34, "h": 41 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 35, "y": 131, "w": 33, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 33, "h": 40 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 136, "y": 132, "w": 33, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 33, "h": 40 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 171, "y": 133, "w": 33, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 33, "h": 40 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 73, "y": 44, "w": 33, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 33, "h": 41 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 73, "y": 44, "w": 33, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 33, "h": 41 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 152, "y": 2, "w": 33, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 33, "h": 42 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 108, "y": 45, "w": 32, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 32, "h": 42 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 176, "y": 46, "w": 31, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 31, "h": 43 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 37, "y": 86, "w": 31, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 31, "h": 43 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 70, "y": 87, "w": 31, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 31, "h": 43 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 2, "y": 88, "w": 31, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 31, "h": 43 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 2, "y": 88, "w": 31, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 31, "h": 43 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 2, "y": 88, "w": 31, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 31, "h": 43 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 70, "y": 132, "w": 30, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 30, "h": 43 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 103, "y": 89, "w": 31, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 31, "h": 43 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 142, "y": 46, "w": 32, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 32, "h": 42 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 187, "y": 2, "w": 33, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 33, "h": 42 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 2, "y": 44, "w": 33, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 33, "h": 42 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 73, "y": 44, "w": 33, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 33, "h": 41 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 73, "y": 44, "w": 33, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 33, "h": 41 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 73, "y": 44, "w": 33, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 33, "h": 41 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 73, "y": 44, "w": 33, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 33, "h": 41 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 73, "y": 44, "w": 33, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 33, "h": 41 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 136, "y": 90, "w": 33, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 33, "h": 40 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 171, "y": 91, "w": 33, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 33, "h": 40 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 37, "y": 44, "w": 34, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 34, "h": 40 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 79, "y": 2, "w": 35, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 35, "h": 40 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 41, "y": 2, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 36, "h": 40 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 2, "y": 2, "w": 37, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 37, "h": 40 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 2, "y": 2, "w": 37, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 37, "h": 40 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 2, "y": 2, "w": 37, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 37, "h": 40 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 116, "y": 2, "w": 34, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 34, "h": 41 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 35, "y": 131, "w": 33, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 33, "h": 40 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 136, "y": 132, "w": 33, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 33, "h": 40 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 171, "y": 133, "w": 33, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 33, "h": 40 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 73, "y": 44, "w": 33, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 33, "h": 41 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 73, "y": 44, "w": 33, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 33, "h": 41 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 152, "y": 2, "w": 33, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 33, "h": 42 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 108, "y": 45, "w": 32, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 32, "h": 42 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 176, "y": 46, "w": 31, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 31, "h": 43 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 37, "y": 86, "w": 31, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 31, "h": 43 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 70, "y": 87, "w": 31, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 31, "h": 43 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 2, "y": 88, "w": 31, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 31, "h": 43 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 2, "y": 88, "w": 31, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 31, "h": 43 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 2, "y": 88, "w": 31, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 31, "h": 43 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 70, "y": 132, "w": 30, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 30, "h": 43 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 103, "y": 89, "w": 31, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 31, "h": 43 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 142, "y": 46, "w": 32, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 32, "h": 42 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 187, "y": 2, "w": 33, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 33, "h": 42 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 2, "y": 44, "w": 33, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 33, "h": 42 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 73, "y": 44, "w": 33, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 33, "h": 41 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 73, "y": 44, "w": 33, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 33, "h": 41 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 73, "y": 44, "w": 33, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 33, "h": 41 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 73, "y": 44, "w": 33, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 33, "h": 41 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 73, "y": 44, "w": 33, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 33, "h": 41 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 136, "y": 90, "w": 33, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 33, "h": 40 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 171, "y": 91, "w": 33, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 33, "h": 40 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 37, "y": 44, "w": 34, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 34, "h": 40 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 79, "y": 2, "w": 35, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 35, "h": 40 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 41, "y": 2, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 36, "h": 40 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 2, "y": 2, "w": 37, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 37, "h": 40 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 2, "y": 2, "w": 37, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 37, "h": 40 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 2, "y": 2, "w": 37, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 37, "h": 40 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 116, "y": 2, "w": 34, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 34, "h": 41 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 35, "y": 131, "w": 33, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 33, "h": 40 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 136, "y": 132, "w": 33, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 33, "h": 40 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 171, "y": 133, "w": 33, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 33, "h": 40 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 73, "y": 44, "w": 33, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 33, "h": 41 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 73, "y": 44, "w": 33, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 33, "h": 41 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 152, "y": 2, "w": 33, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 33, "h": 42 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 108, "y": 45, "w": 32, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 32, "h": 42 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 176, "y": 46, "w": 31, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 31, "h": 43 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 37, "y": 86, "w": 31, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 31, "h": 43 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 70, "y": 87, "w": 31, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 31, "h": 43 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 2, "y": 88, "w": 31, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 31, "h": 43 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 2, "y": 88, "w": 31, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 31, "h": 43 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 2, "y": 88, "w": 31, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 31, "h": 43 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0088.png",
+    "frame": { "x": 70, "y": 132, "w": 30, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 30, "h": 43 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0089.png",
+    "frame": { "x": 103, "y": 89, "w": 31, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 31, "h": 43 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0090.png",
+    "frame": { "x": 142, "y": 46, "w": 32, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 32, "h": 42 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0091.png",
+    "frame": { "x": 187, "y": 2, "w": 33, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 33, "h": 42 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0092.png",
+    "frame": { "x": 2, "y": 44, "w": 33, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 33, "h": 42 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0093.png",
+    "frame": { "x": 73, "y": 44, "w": 33, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 33, "h": 41 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0094.png",
+    "frame": { "x": 73, "y": 44, "w": 33, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 33, "h": 41 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0095.png",
+    "frame": { "x": 73, "y": 44, "w": 33, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 33, "h": 41 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0096.png",
+    "frame": { "x": 73, "y": 44, "w": 33, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 33, "h": 41 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0097.png",
+    "frame": { "x": 73, "y": 44, "w": 33, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 33, "h": 41 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0098.png",
+    "frame": { "x": 2, "y": 173, "w": 33, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 33, "h": 39 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0099.png",
+    "frame": { "x": 2, "y": 133, "w": 30, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 9, "w": 30, "h": 34 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0100.png",
+    "frame": { "x": 102, "y": 134, "w": 28, "h": 30 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 12, "w": 28, "h": 30 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0101.png",
+    "frame": { "x": 102, "y": 166, "w": 27, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 17, "w": 27, "h": 25 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0102.png",
+    "frame": { "x": 102, "y": 166, "w": 27, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 17, "w": 27, "h": 25 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0103.png",
+    "frame": { "x": 102, "y": 166, "w": 27, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 17, "w": 27, "h": 25 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0104.png",
+    "frame": { "x": 102, "y": 166, "w": 27, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 15, "w": 27, "h": 25 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0105.png",
+    "frame": { "x": 102, "y": 166, "w": 27, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 13, "w": 27, "h": 25 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0106.png",
+    "frame": { "x": 102, "y": 166, "w": 27, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 12, "w": 27, "h": 25 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0107.png",
+    "frame": { "x": 102, "y": 166, "w": 27, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 11, "w": 27, "h": 25 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0108.png",
+    "frame": { "x": 102, "y": 166, "w": 27, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 11, "w": 27, "h": 25 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0109.png",
+    "frame": { "x": 102, "y": 166, "w": 27, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 12, "w": 27, "h": 25 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0110.png",
+    "frame": { "x": 102, "y": 166, "w": 27, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 14, "w": 27, "h": 25 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0111.png",
+    "frame": { "x": 102, "y": 166, "w": 27, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 17, "w": 27, "h": 25 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0112.png",
+    "frame": { "x": 102, "y": 166, "w": 27, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 17, "w": 27, "h": 25 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0113.png",
+    "frame": { "x": 102, "y": 166, "w": 27, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 15, "w": 27, "h": 25 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0114.png",
+    "frame": { "x": 102, "y": 166, "w": 27, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 13, "w": 27, "h": 25 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0115.png",
+    "frame": { "x": 102, "y": 166, "w": 27, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 12, "w": 27, "h": 25 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0116.png",
+    "frame": { "x": 102, "y": 166, "w": 27, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 11, "w": 27, "h": 25 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0117.png",
+    "frame": { "x": 102, "y": 166, "w": 27, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 11, "w": 27, "h": 25 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0118.png",
+    "frame": { "x": 102, "y": 166, "w": 27, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 12, "w": 27, "h": 25 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0119.png",
+    "frame": { "x": 102, "y": 166, "w": 27, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 14, "w": 27, "h": 25 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0120.png",
+    "frame": { "x": 102, "y": 166, "w": 27, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 17, "w": 27, "h": 25 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0121.png",
+    "frame": { "x": 102, "y": 166, "w": 27, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 17, "w": 27, "h": 25 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0122.png",
+    "frame": { "x": 102, "y": 134, "w": 28, "h": 30 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 12, "w": 28, "h": 30 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0123.png",
+    "frame": { "x": 2, "y": 133, "w": 30, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 9, "w": 30, "h": 34 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0124.png",
+    "frame": { "x": 2, "y": 173, "w": 33, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 33, "h": 39 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0125.png",
+    "frame": { "x": 73, "y": 44, "w": 33, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 33, "h": 41 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0126.png",
+    "frame": { "x": 73, "y": 44, "w": 33, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 33, "h": 41 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.13-x64",
+  "image": "840.png",
+  "format": "I8",
+  "size": { "w": 222, "h": 214 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/840.png b/public/images/pokemon/exp/back/840.png
index ac6aa240888..29336b622e3 100644
Binary files a/public/images/pokemon/exp/back/840.png and b/public/images/pokemon/exp/back/840.png differ
diff --git a/public/images/pokemon/exp/back/841.png b/public/images/pokemon/exp/back/841.png
index 9e6ec5effb1..ecf344211ef 100644
Binary files a/public/images/pokemon/exp/back/841.png and b/public/images/pokemon/exp/back/841.png differ
diff --git a/public/images/pokemon/exp/back/842.png b/public/images/pokemon/exp/back/842.png
index e38feeb0b42..9258c511d25 100644
Binary files a/public/images/pokemon/exp/back/842.png and b/public/images/pokemon/exp/back/842.png differ
diff --git a/public/images/pokemon/exp/back/871.png b/public/images/pokemon/exp/back/871.png
index faf12b7d4a2..e20040e8a6a 100644
Binary files a/public/images/pokemon/exp/back/871.png and b/public/images/pokemon/exp/back/871.png differ
diff --git a/public/images/pokemon/exp/back/935.json b/public/images/pokemon/exp/back/935.json
deleted file mode 100644
index 26aa6c572c3..00000000000
--- a/public/images/pokemon/exp/back/935.json
+++ /dev/null
@@ -1,356 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "935.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 133,
-				"h": 133
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 29,
-						"h": 49
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 29,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 29,
-						"h": 49
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 29,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 29,
-						"h": 49
-					},
-					"frame": {
-						"x": 29,
-						"y": 0,
-						"w": 29,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 29,
-						"h": 49
-					},
-					"frame": {
-						"x": 29,
-						"y": 0,
-						"w": 29,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 28,
-						"h": 49
-					},
-					"frame": {
-						"x": 58,
-						"y": 0,
-						"w": 28,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 28,
-						"h": 49
-					},
-					"frame": {
-						"x": 58,
-						"y": 0,
-						"w": 28,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 28,
-						"h": 49
-					},
-					"frame": {
-						"x": 86,
-						"y": 0,
-						"w": 28,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 28,
-						"h": 49
-					},
-					"frame": {
-						"x": 86,
-						"y": 0,
-						"w": 28,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 28,
-						"h": 48
-					},
-					"frame": {
-						"x": 0,
-						"y": 49,
-						"w": 28,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 28,
-						"h": 48
-					},
-					"frame": {
-						"x": 0,
-						"y": 49,
-						"w": 28,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 27,
-						"h": 48
-					},
-					"frame": {
-						"x": 28,
-						"y": 49,
-						"w": 27,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 2,
-						"w": 27,
-						"h": 47
-					},
-					"frame": {
-						"x": 55,
-						"y": 49,
-						"w": 27,
-						"h": 47
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 2,
-						"w": 27,
-						"h": 47
-					},
-					"frame": {
-						"x": 55,
-						"y": 49,
-						"w": 27,
-						"h": 47
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 3,
-						"w": 26,
-						"h": 46
-					},
-					"frame": {
-						"x": 82,
-						"y": 49,
-						"w": 26,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 3,
-						"w": 26,
-						"h": 46
-					},
-					"frame": {
-						"x": 82,
-						"y": 49,
-						"w": 26,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 4,
-						"w": 25,
-						"h": 45
-					},
-					"frame": {
-						"x": 108,
-						"y": 49,
-						"w": 25,
-						"h": 45
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:2880dad5e3c550bb25e02ab0ab8d58c8:9dc0340440df25f20b3f006422b7a238:077dcf06dc5fc347497b59afe6126a5e$"
-	}
-}
diff --git a/public/images/pokemon/exp/back/935.png b/public/images/pokemon/exp/back/935.png
deleted file mode 100644
index 64fc37a4a33..00000000000
Binary files a/public/images/pokemon/exp/back/935.png and /dev/null differ
diff --git a/public/images/pokemon/exp/back/936.json b/public/images/pokemon/exp/back/936.json
deleted file mode 100644
index 79ff3ce5c33..00000000000
--- a/public/images/pokemon/exp/back/936.json
+++ /dev/null
@@ -1,356 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "936.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 283,
-				"h": 283
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 0,
-						"w": 59,
-						"h": 97
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 59,
-						"h": 97
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 0,
-						"w": 59,
-						"h": 97
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 59,
-						"h": 97
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 59,
-						"h": 97
-					},
-					"frame": {
-						"x": 0,
-						"y": 97,
-						"w": 59,
-						"h": 97
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 59,
-						"h": 97
-					},
-					"frame": {
-						"x": 0,
-						"y": 97,
-						"w": 59,
-						"h": 97
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 59,
-						"h": 97
-					},
-					"frame": {
-						"x": 59,
-						"y": 0,
-						"w": 59,
-						"h": 97
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 59,
-						"h": 97
-					},
-					"frame": {
-						"x": 59,
-						"y": 0,
-						"w": 59,
-						"h": 97
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 0,
-						"w": 58,
-						"h": 97
-					},
-					"frame": {
-						"x": 59,
-						"y": 97,
-						"w": 58,
-						"h": 97
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 0,
-						"w": 58,
-						"h": 97
-					},
-					"frame": {
-						"x": 59,
-						"y": 97,
-						"w": 58,
-						"h": 97
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 58,
-						"h": 97
-					},
-					"frame": {
-						"x": 117,
-						"y": 97,
-						"w": 58,
-						"h": 97
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 58,
-						"h": 97
-					},
-					"frame": {
-						"x": 117,
-						"y": 97,
-						"w": 58,
-						"h": 97
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 1,
-						"w": 57,
-						"h": 96
-					},
-					"frame": {
-						"x": 118,
-						"y": 0,
-						"w": 57,
-						"h": 96
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 1,
-						"w": 57,
-						"h": 96
-					},
-					"frame": {
-						"x": 118,
-						"y": 0,
-						"w": 57,
-						"h": 96
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 58,
-						"h": 95
-					},
-					"frame": {
-						"x": 175,
-						"y": 0,
-						"w": 58,
-						"h": 95
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 58,
-						"h": 95
-					},
-					"frame": {
-						"x": 175,
-						"y": 0,
-						"w": 58,
-						"h": 95
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 58,
-						"h": 94
-					},
-					"frame": {
-						"x": 175,
-						"y": 95,
-						"w": 58,
-						"h": 94
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 3,
-						"w": 57,
-						"h": 94
-					},
-					"frame": {
-						"x": 175,
-						"y": 189,
-						"w": 57,
-						"h": 94
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:973448a7633a4dceb9828d95556ed3c2:09d8ad02433d8015e4665464587b1259:1a0490303f9626f92e787c567cd10feb$"
-	}
-}
diff --git a/public/images/pokemon/exp/back/936.png b/public/images/pokemon/exp/back/936.png
deleted file mode 100644
index 14b0c1c7bf2..00000000000
Binary files a/public/images/pokemon/exp/back/936.png and /dev/null differ
diff --git a/public/images/pokemon/exp/back/937.json b/public/images/pokemon/exp/back/937.json
deleted file mode 100644
index 9cdf9b93093..00000000000
--- a/public/images/pokemon/exp/back/937.json
+++ /dev/null
@@ -1,650 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "937.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 382,
-				"h": 382
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 91,
-						"h": 96
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 91,
-						"h": 96
-					}
-				},
-				{
-					"filename": "0028.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 91,
-						"h": 96
-					},
-					"frame": {
-						"x": 91,
-						"y": 0,
-						"w": 91,
-						"h": 96
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 90,
-						"h": 96
-					},
-					"frame": {
-						"x": 182,
-						"y": 0,
-						"w": 90,
-						"h": 96
-					}
-				},
-				{
-					"filename": "0027.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 90,
-						"h": 96
-					},
-					"frame": {
-						"x": 182,
-						"y": 0,
-						"w": 90,
-						"h": 96
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 89,
-						"h": 96
-					},
-					"frame": {
-						"x": 272,
-						"y": 0,
-						"w": 89,
-						"h": 96
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 89,
-						"h": 96
-					},
-					"frame": {
-						"x": 272,
-						"y": 0,
-						"w": 89,
-						"h": 96
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 91,
-						"h": 95
-					},
-					"frame": {
-						"x": 0,
-						"y": 96,
-						"w": 91,
-						"h": 95
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 91,
-						"h": 95
-					},
-					"frame": {
-						"x": 0,
-						"y": 96,
-						"w": 91,
-						"h": 95
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 89,
-						"h": 95
-					},
-					"frame": {
-						"x": 91,
-						"y": 96,
-						"w": 89,
-						"h": 95
-					}
-				},
-				{
-					"filename": "0026.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 89,
-						"h": 95
-					},
-					"frame": {
-						"x": 91,
-						"y": 96,
-						"w": 89,
-						"h": 95
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 88,
-						"h": 96
-					},
-					"frame": {
-						"x": 180,
-						"y": 96,
-						"w": 88,
-						"h": 96
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 88,
-						"h": 96
-					},
-					"frame": {
-						"x": 180,
-						"y": 96,
-						"w": 88,
-						"h": 96
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 88,
-						"h": 96
-					},
-					"frame": {
-						"x": 0,
-						"y": 191,
-						"w": 88,
-						"h": 96
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 88,
-						"h": 96
-					},
-					"frame": {
-						"x": 0,
-						"y": 191,
-						"w": 88,
-						"h": 96
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 88,
-						"h": 96
-					},
-					"frame": {
-						"x": 88,
-						"y": 191,
-						"w": 88,
-						"h": 96
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 88,
-						"h": 96
-					},
-					"frame": {
-						"x": 88,
-						"y": 191,
-						"w": 88,
-						"h": 96
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 87,
-						"h": 96
-					},
-					"frame": {
-						"x": 176,
-						"y": 192,
-						"w": 87,
-						"h": 96
-					}
-				},
-				{
-					"filename": "0025.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 87,
-						"h": 96
-					},
-					"frame": {
-						"x": 176,
-						"y": 192,
-						"w": 87,
-						"h": 96
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 85,
-						"h": 95
-					},
-					"frame": {
-						"x": 0,
-						"y": 287,
-						"w": 85,
-						"h": 95
-					}
-				},
-				{
-					"filename": "0029.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 85,
-						"h": 95
-					},
-					"frame": {
-						"x": 0,
-						"y": 287,
-						"w": 85,
-						"h": 95
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 85,
-						"h": 94
-					},
-					"frame": {
-						"x": 85,
-						"y": 287,
-						"w": 85,
-						"h": 94
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 85,
-						"h": 94
-					},
-					"frame": {
-						"x": 85,
-						"y": 287,
-						"w": 85,
-						"h": 94
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 82,
-						"h": 96
-					},
-					"frame": {
-						"x": 263,
-						"y": 192,
-						"w": 82,
-						"h": 96
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 82,
-						"h": 96
-					},
-					"frame": {
-						"x": 263,
-						"y": 192,
-						"w": 82,
-						"h": 96
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 3,
-						"w": 85,
-						"h": 93
-					},
-					"frame": {
-						"x": 268,
-						"y": 96,
-						"w": 85,
-						"h": 93
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 3,
-						"w": 85,
-						"h": 93
-					},
-					"frame": {
-						"x": 268,
-						"y": 96,
-						"w": 85,
-						"h": 93
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 81,
-						"h": 94
-					},
-					"frame": {
-						"x": 170,
-						"y": 288,
-						"w": 81,
-						"h": 94
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 81,
-						"h": 94
-					},
-					"frame": {
-						"x": 170,
-						"y": 288,
-						"w": 81,
-						"h": 94
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 80,
-						"h": 94
-					},
-					"frame": {
-						"x": 251,
-						"y": 288,
-						"w": 80,
-						"h": 94
-					}
-				},
-				{
-					"filename": "0030.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 80,
-						"h": 94
-					},
-					"frame": {
-						"x": 251,
-						"y": 288,
-						"w": 80,
-						"h": 94
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:25759b98c1f7867fe6c4ff54c797c3e2:0076c777d18a4f3d780937118dfb6388:1d4b4f8d62307c37457ba974879b47d0$"
-	}
-}
diff --git a/public/images/pokemon/exp/back/937.png b/public/images/pokemon/exp/back/937.png
deleted file mode 100644
index 676950a1999..00000000000
Binary files a/public/images/pokemon/exp/back/937.png and /dev/null differ
diff --git a/public/images/pokemon/exp/shiny/708.json b/public/images/pokemon/exp/back/female/6215.json
similarity index 62%
rename from public/images/pokemon/exp/shiny/708.json
rename to public/images/pokemon/exp/back/female/6215.json
index 188cebad63c..4f58734d55e 100644
--- a/public/images/pokemon/exp/shiny/708.json
+++ b/public/images/pokemon/exp/back/female/6215.json
@@ -1,432 +1,33 @@
 {
 	"textures": [
 		{
-			"image": "708.png",
+			"image": "6215.png",
 			"format": "RGBA8888",
 			"size": {
-				"w": 206,
-				"h": 206
+				"w": 155,
+				"h": 155
 			},
 			"scale": 1,
 			"frames": [
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 2,
-						"w": 51,
-						"h": 43
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 51,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 2,
-						"w": 51,
-						"h": 43
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 51,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0027.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 2,
-						"w": 51,
-						"h": 43
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 51,
-						"h": 43
-					}
-				},
 				{
 					"filename": "0007.png",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 58,
-						"h": 47
+						"w": 54,
+						"h": 50
 					},
 					"spriteSourceSize": {
-						"x": 5,
-						"y": 4,
-						"w": 51,
-						"h": 43
-					},
-					"frame": {
 						"x": 0,
-						"y": 43,
-						"w": 51,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 4,
-						"w": 51,
-						"h": 43
-					},
-					"frame": {
-						"x": 0,
-						"y": 43,
-						"w": 51,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0031.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 4,
-						"w": 51,
-						"h": 43
-					},
-					"frame": {
-						"x": 0,
-						"y": 43,
-						"w": 51,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 2,
 						"y": 1,
-						"w": 51,
-						"h": 43
+						"w": 54,
+						"h": 49
 					},
 					"frame": {
 						"x": 0,
-						"y": 86,
-						"w": 51,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 51,
-						"h": 43
-					},
-					"frame": {
-						"x": 0,
-						"y": 86,
-						"w": 51,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0035.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 51,
-						"h": 43
-					},
-					"frame": {
-						"x": 0,
-						"y": 86,
-						"w": 51,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 51,
-						"h": 42
-					},
-					"frame": {
-						"x": 0,
-						"y": 129,
-						"w": 51,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 51,
-						"h": 42
-					},
-					"frame": {
-						"x": 0,
-						"y": 129,
-						"w": 51,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0025.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 51,
-						"h": 42
-					},
-					"frame": {
-						"x": 0,
-						"y": 129,
-						"w": 51,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0037.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 51,
-						"h": 42
-					},
-					"frame": {
-						"x": 0,
-						"y": 129,
-						"w": 51,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0043.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 51,
-						"h": 42
-					},
-					"frame": {
-						"x": 0,
-						"y": 129,
-						"w": 51,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 2,
-						"w": 51,
-						"h": 42
-					},
-					"frame": {
-						"x": 51,
 						"y": 0,
-						"w": 51,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 2,
-						"w": 51,
-						"h": 42
-					},
-					"frame": {
-						"x": 51,
-						"y": 0,
-						"w": 51,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0026.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 2,
-						"w": 51,
-						"h": 42
-					},
-					"frame": {
-						"x": 51,
-						"y": 0,
-						"w": 51,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 4,
-						"w": 51,
-						"h": 42
-					},
-					"frame": {
-						"x": 51,
-						"y": 42,
-						"w": 51,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 4,
-						"w": 51,
-						"h": 42
-					},
-					"frame": {
-						"x": 51,
-						"y": 42,
-						"w": 51,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0028.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 4,
-						"w": 51,
-						"h": 42
-					},
-					"frame": {
-						"x": 51,
-						"y": 42,
-						"w": 51,
-						"h": 42
+						"w": 54,
+						"h": 49
 					}
 				},
 				{
@@ -434,20 +35,41 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 58,
-						"h": 47
+						"w": 54,
+						"h": 50
 					},
 					"spriteSourceSize": {
-						"x": 4,
-						"y": 4,
-						"w": 51,
-						"h": 42
+						"x": 0,
+						"y": 1,
+						"w": 54,
+						"h": 49
 					},
 					"frame": {
-						"x": 51,
-						"y": 84,
-						"w": 51,
-						"h": 42
+						"x": 0,
+						"y": 0,
+						"w": 54,
+						"h": 49
+					}
+				},
+				{
+					"filename": "0019.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 54,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 1,
+						"w": 54,
+						"h": 49
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 54,
+						"h": 49
 					}
 				},
 				{
@@ -455,20 +77,41 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 58,
-						"h": 47
+						"w": 54,
+						"h": 50
 					},
 					"spriteSourceSize": {
-						"x": 4,
-						"y": 4,
-						"w": 51,
-						"h": 42
+						"x": 0,
+						"y": 1,
+						"w": 54,
+						"h": 49
 					},
 					"frame": {
-						"x": 51,
-						"y": 84,
-						"w": 51,
-						"h": 42
+						"x": 0,
+						"y": 0,
+						"w": 54,
+						"h": 49
+					}
+				},
+				{
+					"filename": "0031.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 54,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 1,
+						"w": 54,
+						"h": 49
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 54,
+						"h": 49
 					}
 				},
 				{
@@ -476,461 +119,41 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 58,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 4,
-						"w": 51,
-						"h": 42
-					},
-					"frame": {
-						"x": 51,
-						"y": 84,
-						"w": 51,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 51,
-						"h": 42
-					},
-					"frame": {
-						"x": 51,
-						"y": 126,
-						"w": 51,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 51,
-						"h": 42
-					},
-					"frame": {
-						"x": 51,
-						"y": 126,
-						"w": 51,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0033.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 51,
-						"h": 42
-					},
-					"frame": {
-						"x": 51,
-						"y": 126,
-						"w": 51,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 2,
-						"w": 51,
-						"h": 42
-					},
-					"frame": {
-						"x": 102,
-						"y": 0,
-						"w": 51,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 2,
-						"w": 51,
-						"h": 42
-					},
-					"frame": {
-						"x": 102,
-						"y": 0,
-						"w": 51,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0034.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 2,
-						"w": 51,
-						"h": 42
-					},
-					"frame": {
-						"x": 102,
-						"y": 0,
-						"w": 51,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 51,
-						"h": 42
-					},
-					"frame": {
-						"x": 102,
-						"y": 42,
-						"w": 51,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 51,
-						"h": 42
-					},
-					"frame": {
-						"x": 102,
-						"y": 42,
-						"w": 51,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0036.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 51,
-						"h": 42
-					},
-					"frame": {
-						"x": 102,
-						"y": 42,
-						"w": 51,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 6,
-						"w": 51,
-						"h": 41
-					},
-					"frame": {
-						"x": 102,
-						"y": 84,
-						"w": 51,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 6,
-						"w": 51,
-						"h": 41
-					},
-					"frame": {
-						"x": 102,
-						"y": 84,
-						"w": 51,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0029.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 6,
-						"w": 51,
-						"h": 41
-					},
-					"frame": {
-						"x": 102,
-						"y": 84,
-						"w": 51,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 6,
-						"w": 51,
-						"h": 41
-					},
-					"frame": {
-						"x": 102,
-						"y": 125,
-						"w": 51,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 6,
-						"w": 51,
-						"h": 41
-					},
-					"frame": {
-						"x": 102,
-						"y": 125,
-						"w": 51,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0030.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 6,
-						"w": 51,
-						"h": 41
-					},
-					"frame": {
-						"x": 102,
-						"y": 125,
-						"w": 51,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0040.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 0,
-						"w": 50,
-						"h": 40
-					},
-					"frame": {
-						"x": 102,
-						"y": 166,
-						"w": 50,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0046.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 47
+						"w": 54,
+						"h": 50
 					},
 					"spriteSourceSize": {
 						"x": 0,
-						"y": 6,
-						"w": 50,
-						"h": 40
-					},
-					"frame": {
-						"x": 152,
-						"y": 166,
-						"w": 50,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0038.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 6,
 						"y": 1,
-						"w": 51,
-						"h": 41
+						"w": 54,
+						"h": 49
 					},
 					"frame": {
-						"x": 153,
+						"x": 0,
 						"y": 0,
-						"w": 51,
-						"h": 41
+						"w": 54,
+						"h": 49
 					}
 				},
 				{
-					"filename": "0042.png",
+					"filename": "0043.png",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 58,
-						"h": 47
+						"w": 54,
+						"h": 50
 					},
 					"spriteSourceSize": {
-						"x": 6,
+						"x": 0,
 						"y": 1,
-						"w": 51,
-						"h": 41
+						"w": 54,
+						"h": 49
 					},
 					"frame": {
-						"x": 153,
+						"x": 0,
 						"y": 0,
-						"w": 51,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0039.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 51,
-						"h": 41
-					},
-					"frame": {
-						"x": 153,
-						"y": 41,
-						"w": 51,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0041.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 51,
-						"h": 41
-					},
-					"frame": {
-						"x": 153,
-						"y": 41,
-						"w": 51,
-						"h": 41
+						"w": 54,
+						"h": 49
 					}
 				},
 				{
@@ -938,41 +161,146 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 58,
-						"h": 47
+						"w": 54,
+						"h": 50
 					},
 					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 51,
-						"h": 41
+						"x": 0,
+						"y": 1,
+						"w": 54,
+						"h": 49
 					},
 					"frame": {
-						"x": 153,
-						"y": 82,
-						"w": 51,
-						"h": 41
+						"x": 0,
+						"y": 0,
+						"w": 54,
+						"h": 49
 					}
 				},
 				{
-					"filename": "0048.png",
+					"filename": "0005.png",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 58,
-						"h": 47
+						"w": 54,
+						"h": 50
 					},
 					"spriteSourceSize": {
-						"x": 2,
+						"x": 0,
 						"y": 3,
-						"w": 51,
-						"h": 41
+						"w": 54,
+						"h": 47
 					},
 					"frame": {
-						"x": 153,
-						"y": 82,
-						"w": 51,
-						"h": 41
+						"x": 54,
+						"y": 0,
+						"w": 54,
+						"h": 47
+					}
+				},
+				{
+					"filename": "0006.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 54,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 3,
+						"w": 54,
+						"h": 47
+					},
+					"frame": {
+						"x": 54,
+						"y": 0,
+						"w": 54,
+						"h": 47
+					}
+				},
+				{
+					"filename": "0021.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 54,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 3,
+						"w": 54,
+						"h": 47
+					},
+					"frame": {
+						"x": 54,
+						"y": 0,
+						"w": 54,
+						"h": 47
+					}
+				},
+				{
+					"filename": "0022.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 54,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 3,
+						"w": 54,
+						"h": 47
+					},
+					"frame": {
+						"x": 54,
+						"y": 0,
+						"w": 54,
+						"h": 47
+					}
+				},
+				{
+					"filename": "0029.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 54,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 3,
+						"w": 54,
+						"h": 47
+					},
+					"frame": {
+						"x": 54,
+						"y": 0,
+						"w": 54,
+						"h": 47
+					}
+				},
+				{
+					"filename": "0030.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 54,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 3,
+						"w": 54,
+						"h": 47
+					},
+					"frame": {
+						"x": 54,
+						"y": 0,
+						"w": 54,
+						"h": 47
 					}
 				},
 				{
@@ -980,20 +308,167 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 58,
+						"w": 54,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 3,
+						"w": 54,
 						"h": 47
 					},
+					"frame": {
+						"x": 54,
+						"y": 0,
+						"w": 54,
+						"h": 47
+					}
+				},
+				{
+					"filename": "0046.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 54,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 3,
+						"w": 54,
+						"h": 47
+					},
+					"frame": {
+						"x": 54,
+						"y": 0,
+						"w": 54,
+						"h": 47
+					}
+				},
+				{
+					"filename": "0003.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 54,
+						"h": 50
+					},
 					"spriteSourceSize": {
 						"x": 0,
 						"y": 4,
-						"w": 51,
-						"h": 41
+						"w": 54,
+						"h": 46
 					},
 					"frame": {
-						"x": 153,
-						"y": 123,
-						"w": 51,
-						"h": 41
+						"x": 54,
+						"y": 47,
+						"w": 54,
+						"h": 46
+					}
+				},
+				{
+					"filename": "0004.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 54,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 4,
+						"w": 54,
+						"h": 46
+					},
+					"frame": {
+						"x": 54,
+						"y": 47,
+						"w": 54,
+						"h": 46
+					}
+				},
+				{
+					"filename": "0023.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 54,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 4,
+						"w": 54,
+						"h": 46
+					},
+					"frame": {
+						"x": 54,
+						"y": 47,
+						"w": 54,
+						"h": 46
+					}
+				},
+				{
+					"filename": "0024.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 54,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 4,
+						"w": 54,
+						"h": 46
+					},
+					"frame": {
+						"x": 54,
+						"y": 47,
+						"w": 54,
+						"h": 46
+					}
+				},
+				{
+					"filename": "0027.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 54,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 4,
+						"w": 54,
+						"h": 46
+					},
+					"frame": {
+						"x": 54,
+						"y": 47,
+						"w": 54,
+						"h": 46
+					}
+				},
+				{
+					"filename": "0028.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 54,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 4,
+						"w": 54,
+						"h": 46
+					},
+					"frame": {
+						"x": 54,
+						"y": 47,
+						"w": 54,
+						"h": 46
 					}
 				},
 				{
@@ -1001,20 +476,545 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 58,
-						"h": 47
+						"w": 54,
+						"h": 50
 					},
 					"spriteSourceSize": {
 						"x": 0,
 						"y": 4,
-						"w": 51,
-						"h": 41
+						"w": 54,
+						"h": 46
 					},
 					"frame": {
-						"x": 153,
-						"y": 123,
+						"x": 54,
+						"y": 47,
+						"w": 54,
+						"h": 46
+					}
+				},
+				{
+					"filename": "0048.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 54,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 4,
+						"w": 54,
+						"h": 46
+					},
+					"frame": {
+						"x": 54,
+						"y": 47,
+						"w": 54,
+						"h": 46
+					}
+				},
+				{
+					"filename": "0001.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 54,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 6,
+						"w": 54,
+						"h": 44
+					},
+					"frame": {
+						"x": 0,
+						"y": 49,
+						"w": 54,
+						"h": 44
+					}
+				},
+				{
+					"filename": "0002.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 54,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 6,
+						"w": 54,
+						"h": 44
+					},
+					"frame": {
+						"x": 0,
+						"y": 49,
+						"w": 54,
+						"h": 44
+					}
+				},
+				{
+					"filename": "0025.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 54,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 6,
+						"w": 54,
+						"h": 44
+					},
+					"frame": {
+						"x": 0,
+						"y": 49,
+						"w": 54,
+						"h": 44
+					}
+				},
+				{
+					"filename": "0026.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 54,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 6,
+						"w": 54,
+						"h": 44
+					},
+					"frame": {
+						"x": 0,
+						"y": 49,
+						"w": 54,
+						"h": 44
+					}
+				},
+				{
+					"filename": "0009.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 54,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 0,
+						"w": 52,
+						"h": 50
+					},
+					"frame": {
+						"x": 0,
+						"y": 93,
+						"w": 52,
+						"h": 50
+					}
+				},
+				{
+					"filename": "0010.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 54,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 0,
+						"w": 52,
+						"h": 50
+					},
+					"frame": {
+						"x": 0,
+						"y": 93,
+						"w": 52,
+						"h": 50
+					}
+				},
+				{
+					"filename": "0017.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 54,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 0,
+						"w": 52,
+						"h": 50
+					},
+					"frame": {
+						"x": 0,
+						"y": 93,
+						"w": 52,
+						"h": 50
+					}
+				},
+				{
+					"filename": "0018.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 54,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 0,
+						"w": 52,
+						"h": 50
+					},
+					"frame": {
+						"x": 0,
+						"y": 93,
+						"w": 52,
+						"h": 50
+					}
+				},
+				{
+					"filename": "0033.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 54,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 0,
+						"w": 52,
+						"h": 50
+					},
+					"frame": {
+						"x": 0,
+						"y": 93,
+						"w": 52,
+						"h": 50
+					}
+				},
+				{
+					"filename": "0034.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 54,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 0,
+						"w": 52,
+						"h": 50
+					},
+					"frame": {
+						"x": 0,
+						"y": 93,
+						"w": 52,
+						"h": 50
+					}
+				},
+				{
+					"filename": "0035.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 54,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 0,
+						"w": 52,
+						"h": 50
+					},
+					"frame": {
+						"x": 0,
+						"y": 93,
+						"w": 52,
+						"h": 50
+					}
+				},
+				{
+					"filename": "0042.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 54,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 0,
+						"w": 52,
+						"h": 50
+					},
+					"frame": {
+						"x": 0,
+						"y": 93,
+						"w": 52,
+						"h": 50
+					}
+				},
+				{
+					"filename": "0011.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 54,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 0,
+						"w": 52,
+						"h": 50
+					},
+					"frame": {
+						"x": 52,
+						"y": 93,
+						"w": 52,
+						"h": 50
+					}
+				},
+				{
+					"filename": "0012.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 54,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 0,
+						"w": 52,
+						"h": 50
+					},
+					"frame": {
+						"x": 52,
+						"y": 93,
+						"w": 52,
+						"h": 50
+					}
+				},
+				{
+					"filename": "0015.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 54,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 0,
+						"w": 52,
+						"h": 50
+					},
+					"frame": {
+						"x": 52,
+						"y": 93,
+						"w": 52,
+						"h": 50
+					}
+				},
+				{
+					"filename": "0016.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 54,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 0,
+						"w": 52,
+						"h": 50
+					},
+					"frame": {
+						"x": 52,
+						"y": 93,
+						"w": 52,
+						"h": 50
+					}
+				},
+				{
+					"filename": "0036.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 54,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 0,
+						"w": 52,
+						"h": 50
+					},
+					"frame": {
+						"x": 52,
+						"y": 93,
+						"w": 52,
+						"h": 50
+					}
+				},
+				{
+					"filename": "0037.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 54,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 0,
+						"w": 52,
+						"h": 50
+					},
+					"frame": {
+						"x": 52,
+						"y": 93,
+						"w": 52,
+						"h": 50
+					}
+				},
+				{
+					"filename": "0040.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 54,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 0,
+						"w": 52,
+						"h": 50
+					},
+					"frame": {
+						"x": 52,
+						"y": 93,
+						"w": 52,
+						"h": 50
+					}
+				},
+				{
+					"filename": "0041.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 54,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 0,
+						"w": 52,
+						"h": 50
+					},
+					"frame": {
+						"x": 52,
+						"y": 93,
+						"w": 52,
+						"h": 50
+					}
+				},
+				{
+					"filename": "0013.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 54,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 3,
+						"y": 0,
 						"w": 51,
-						"h": 41
+						"h": 50
+					},
+					"frame": {
+						"x": 104,
+						"y": 93,
+						"w": 51,
+						"h": 50
+					}
+				},
+				{
+					"filename": "0014.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 54,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 3,
+						"y": 0,
+						"w": 51,
+						"h": 50
+					},
+					"frame": {
+						"x": 104,
+						"y": 93,
+						"w": 51,
+						"h": 50
+					}
+				},
+				{
+					"filename": "0038.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 54,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 3,
+						"y": 0,
+						"w": 51,
+						"h": 50
+					},
+					"frame": {
+						"x": 104,
+						"y": 93,
+						"w": 51,
+						"h": 50
+					}
+				},
+				{
+					"filename": "0039.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 54,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 3,
+						"y": 0,
+						"w": 51,
+						"h": 50
+					},
+					"frame": {
+						"x": 104,
+						"y": 93,
+						"w": 51,
+						"h": 50
 					}
 				}
 			]
@@ -1023,6 +1023,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:02aeb20d3dedab69cd63430f383bb8a9:140bc3262838e3b187b88498bce06706:796c82c5076b122f2663381836c65843$"
+		"smartupdate": "$TexturePacker:SmartUpdate:29aeff74e785c73ae2261d8bb0459111:5709d3d72351f1424de632ebf8347c01:736cd88647e79ba7896fc74f9406c2fe$"
 	}
 }
diff --git a/public/images/pokemon/exp/back/female/6215.png b/public/images/pokemon/exp/back/female/6215.png
new file mode 100644
index 00000000000..7dbdab7eb85
Binary files /dev/null and b/public/images/pokemon/exp/back/female/6215.png differ
diff --git a/public/images/pokemon/exp/back/female/668.json b/public/images/pokemon/exp/back/female/668.json
new file mode 100644
index 00000000000..4c493f84959
--- /dev/null
+++ b/public/images/pokemon/exp/back/female/668.json
@@ -0,0 +1,821 @@
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 475, "y": 144, "w": 77, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 3, "w": 77, "h": 70 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 76, "y": 214, "w": 76, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 3, "w": 76, "h": 70 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 152, "y": 283, "w": 75, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 4, "w": 75, "h": 69 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 73, "y": 284, "w": 74, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 5, "w": 74, "h": 68 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 460, "y": 350, "w": 74, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 6, "w": 74, "h": 67 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 227, "y": 350, "w": 74, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 6, "w": 74, "h": 67 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 385, "y": 284, "w": 75, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 6, "w": 75, "h": 67 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 472, "y": 283, "w": 77, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 6, "w": 77, "h": 67 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 233, "y": 282, "w": 77, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 5, "w": 77, "h": 68 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 396, "y": 215, "w": 76, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 4, "w": 76, "h": 69 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 0, "y": 214, "w": 76, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 3, "w": 76, "h": 70 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 399, "y": 144, "w": 76, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 2, "w": 76, "h": 71 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 431, "y": 73, "w": 77, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 2, "w": 77, "h": 71 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 242, "y": 142, "w": 77, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 2, "w": 77, "h": 71 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 156, "y": 213, "w": 77, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 3, "w": 77, "h": 70 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 475, "y": 144, "w": 77, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 3, "w": 77, "h": 70 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 76, "y": 214, "w": 76, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 3, "w": 76, "h": 70 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 152, "y": 283, "w": 75, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 4, "w": 75, "h": 69 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 73, "y": 284, "w": 74, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 5, "w": 74, "h": 68 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 460, "y": 350, "w": 74, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 6, "w": 74, "h": 67 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 227, "y": 350, "w": 74, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 6, "w": 74, "h": 67 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 385, "y": 284, "w": 75, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 6, "w": 75, "h": 67 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 472, "y": 283, "w": 77, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 6, "w": 77, "h": 67 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 233, "y": 282, "w": 77, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 5, "w": 77, "h": 68 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 396, "y": 215, "w": 76, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 4, "w": 76, "h": 69 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 0, "y": 214, "w": 76, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 3, "w": 76, "h": 70 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 399, "y": 144, "w": 76, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 2, "w": 76, "h": 71 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 431, "y": 73, "w": 77, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 2, "w": 77, "h": 71 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 242, "y": 142, "w": 77, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 2, "w": 77, "h": 71 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 156, "y": 213, "w": 77, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 3, "w": 77, "h": 70 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 475, "y": 144, "w": 77, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 3, "w": 77, "h": 70 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 76, "y": 214, "w": 76, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 3, "w": 76, "h": 70 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 152, "y": 283, "w": 75, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 4, "w": 75, "h": 69 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 73, "y": 284, "w": 74, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 5, "w": 74, "h": 68 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 460, "y": 350, "w": 74, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 6, "w": 74, "h": 67 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 227, "y": 350, "w": 74, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 6, "w": 74, "h": 67 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 385, "y": 284, "w": 75, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 6, "w": 75, "h": 67 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 472, "y": 283, "w": 77, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 6, "w": 77, "h": 67 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 233, "y": 282, "w": 77, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 5, "w": 77, "h": 68 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 396, "y": 215, "w": 76, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 4, "w": 76, "h": 69 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 0, "y": 214, "w": 76, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 3, "w": 76, "h": 70 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 399, "y": 144, "w": 76, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 2, "w": 76, "h": 71 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 431, "y": 73, "w": 77, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 2, "w": 77, "h": 71 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 242, "y": 142, "w": 77, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 2, "w": 77, "h": 71 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 156, "y": 213, "w": 77, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 3, "w": 77, "h": 70 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 475, "y": 144, "w": 77, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 3, "w": 77, "h": 70 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 76, "y": 214, "w": 76, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 3, "w": 76, "h": 70 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 152, "y": 283, "w": 75, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 4, "w": 75, "h": 69 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 73, "y": 284, "w": 74, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 5, "w": 74, "h": 68 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 460, "y": 350, "w": 74, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 6, "w": 74, "h": 67 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 227, "y": 350, "w": 74, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 6, "w": 74, "h": 67 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 385, "y": 284, "w": 75, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 6, "w": 75, "h": 67 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 472, "y": 283, "w": 77, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 6, "w": 77, "h": 67 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 233, "y": 282, "w": 77, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 5, "w": 77, "h": 68 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 396, "y": 215, "w": 76, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 4, "w": 76, "h": 69 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 0, "y": 214, "w": 76, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 3, "w": 76, "h": 70 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 399, "y": 144, "w": 76, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 2, "w": 76, "h": 71 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 431, "y": 73, "w": 77, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 2, "w": 77, "h": 71 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 242, "y": 142, "w": 77, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 2, "w": 77, "h": 71 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 156, "y": 213, "w": 77, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 3, "w": 77, "h": 70 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 475, "y": 144, "w": 77, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 3, "w": 77, "h": 70 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 0, "y": 144, "w": 78, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 3, "w": 78, "h": 70 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 233, "y": 213, "w": 78, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 4, "w": 78, "h": 69 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 156, "y": 144, "w": 79, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 4, "w": 79, "h": 69 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 319, "y": 144, "w": 80, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 5, "w": 80, "h": 68 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 242, "y": 73, "w": 80, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 4, "w": 80, "h": 69 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 310, "y": 282, "w": 75, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 4, "w": 75, "h": 69 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 534, "y": 350, "w": 71, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 17, "y": 4, "w": 71, "h": 69 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 301, "y": 351, "w": 67, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 3, "w": 67, "h": 73 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 0, "y": 353, "w": 63, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 3, "w": 63, "h": 75 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 204, "y": 417, "w": 63, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 2, "w": 63, "h": 75 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 139, "y": 352, "w": 65, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 3, "w": 65, "h": 73 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 73, "y": 352, "w": 66, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 3, "w": 66, "h": 72 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 368, "y": 351, "w": 69, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 4, "w": 69, "h": 70 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 0, "y": 284, "w": 73, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 4, "w": 73, "h": 69 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 475, "y": 214, "w": 76, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 4, "w": 76, "h": 69 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 319, "y": 212, "w": 77, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 3, "w": 77, "h": 70 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 82, "y": 73, "w": 80, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 2, "w": 80, "h": 71 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 519, "y": 72, "w": 83, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 83, "h": 72 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 434, "y": 0, "w": 85, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 85, "h": 73 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 261, "y": 0, "w": 86, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 86, "h": 73 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 174, "y": 0, "w": 87, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 87, "h": 73 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 87, "y": 0, "w": 87, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 87, "h": 73 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 0, "y": 0, "w": 87, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 87, "h": 73 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 347, "y": 0, "w": 87, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 87, "h": 72 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 519, "y": 0, "w": 85, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 85, "h": 72 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 347, "y": 72, "w": 84, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 84, "h": 72 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0088.png",
+    "frame": { "x": 0, "y": 73, "w": 82, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 2, "w": 82, "h": 71 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0089.png",
+    "frame": { "x": 162, "y": 73, "w": 80, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 2, "w": 80, "h": 71 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0090.png",
+    "frame": { "x": 78, "y": 144, "w": 78, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 3, "w": 78, "h": 70 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.11-x64",
+  "image": "668-female.png",
+  "format": "I8",
+  "size": { "w": 605, "h": 492 },
+  "scale": "1"
+ }
+}
diff --git a/public/images/pokemon/exp/back/female/668.png b/public/images/pokemon/exp/back/female/668.png
new file mode 100644
index 00000000000..e5b5ed2494e
Binary files /dev/null and b/public/images/pokemon/exp/back/female/668.png differ
diff --git a/public/images/pokemon/exp/back/shiny/2037.json b/public/images/pokemon/exp/back/shiny/2037.json
index 01259c3dc3d..790321704de 100644
--- a/public/images/pokemon/exp/back/shiny/2037.json
+++ b/public/images/pokemon/exp/back/shiny/2037.json
@@ -1,188 +1,101 @@
-{
-	"textures": [
-		{
-			"image": "2037.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 150,
-				"h": 150
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 61,
-						"h": 50
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 61,
-						"h": 50
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 61,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 61,
-						"h": 50
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 61,
-						"h": 50
-					},
-					"frame": {
-						"x": 61,
-						"y": 0,
-						"w": 61,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 61,
-						"h": 50
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 60,
-						"h": 50
-					},
-					"frame": {
-						"x": 0,
-						"y": 50,
-						"w": 60,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 61,
-						"h": 50
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 60,
-						"h": 50
-					},
-					"frame": {
-						"x": 0,
-						"y": 50,
-						"w": 60,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 61,
-						"h": 50
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 59,
-						"h": 50
-					},
-					"frame": {
-						"x": 0,
-						"y": 100,
-						"w": 59,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 61,
-						"h": 50
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 59,
-						"h": 50
-					},
-					"frame": {
-						"x": 59,
-						"y": 100,
-						"w": 59,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 61,
-						"h": 50
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 59,
-						"h": 50
-					},
-					"frame": {
-						"x": 59,
-						"y": 100,
-						"w": 59,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 61,
-						"h": 50
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 61,
-						"h": 48
-					},
-					"frame": {
-						"x": 60,
-						"y": 50,
-						"w": 61,
-						"h": 48
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:c26c3a06a7e949ac3da512bb0c218169:1561eac8f519c7efd877f2e03ea21708:c679847d1c2ddf91caeaa5ebb76a6664$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 1, "y": 50, "w": 58, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 0, "w": 58, "h": 49 },
+    "sourceSize": { "w": 63, "h": 49 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 60, "y": 50, "w": 58, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 1, "w": 58, "h": 48 },
+    "sourceSize": { "w": 63, "h": 49 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 119, "y": 50, "w": 58, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 1, "w": 58, "h": 48 },
+    "sourceSize": { "w": 63, "h": 49 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 60, "y": 99, "w": 56, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 56, "h": 46 },
+    "sourceSize": { "w": 63, "h": 49 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 178, "y": 98, "w": 58, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 58, "h": 46 },
+    "sourceSize": { "w": 63, "h": 49 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 178, "y": 51, "w": 60, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 60, "h": 46 },
+    "sourceSize": { "w": 63, "h": 49 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 1, "y": 1, "w": 63, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 63, "h": 48 },
+    "sourceSize": { "w": 63, "h": 49 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 65, "y": 1, "w": 62, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 62, "h": 48 },
+    "sourceSize": { "w": 63, "h": 49 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 128, "y": 1, "w": 61, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 61, "h": 48 },
+    "sourceSize": { "w": 63, "h": 49 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 190, "y": 1, "w": 59, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 59, "h": 49 },
+    "sourceSize": { "w": 63, "h": 49 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.13-x64",
+  "image": "2037.png",
+  "format": "I8",
+  "size": { "w": 250, "h": 146 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/shiny/2037.png b/public/images/pokemon/exp/back/shiny/2037.png
index af9318d53b1..d5443e7d642 100644
Binary files a/public/images/pokemon/exp/back/shiny/2037.png and b/public/images/pokemon/exp/back/shiny/2037.png differ
diff --git a/public/images/pokemon/exp/back/shiny/2038.json b/public/images/pokemon/exp/back/shiny/2038.json
index 28b88e1c5d5..af164a77c57 100644
--- a/public/images/pokemon/exp/back/shiny/2038.json
+++ b/public/images/pokemon/exp/back/shiny/2038.json
@@ -1,692 +1,155 @@
-{
-	"textures": [
-		{
-			"image": "2038.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 514,
-				"h": 514
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 111,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 8,
-						"w": 101,
-						"h": 63
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 101,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 111,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 8,
-						"w": 102,
-						"h": 64
-					},
-					"frame": {
-						"x": 101,
-						"y": 0,
-						"w": 102,
-						"h": 64
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 111,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 12,
-						"y": 7,
-						"w": 99,
-						"h": 64
-					},
-					"frame": {
-						"x": 203,
-						"y": 0,
-						"w": 99,
-						"h": 64
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 111,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 12,
-						"y": 7,
-						"w": 99,
-						"h": 64
-					},
-					"frame": {
-						"x": 302,
-						"y": 0,
-						"w": 99,
-						"h": 64
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 111,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 12,
-						"y": 7,
-						"w": 98,
-						"h": 64
-					},
-					"frame": {
-						"x": 401,
-						"y": 0,
-						"w": 98,
-						"h": 64
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 111,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 12,
-						"y": 6,
-						"w": 98,
-						"h": 65
-					},
-					"frame": {
-						"x": 0,
-						"y": 63,
-						"w": 98,
-						"h": 65
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 111,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 111,
-						"h": 65
-					},
-					"frame": {
-						"x": 98,
-						"y": 64,
-						"w": 111,
-						"h": 65
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 111,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 111,
-						"h": 65
-					},
-					"frame": {
-						"x": 209,
-						"y": 64,
-						"w": 111,
-						"h": 65
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 111,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 8,
-						"w": 104,
-						"h": 65
-					},
-					"frame": {
-						"x": 320,
-						"y": 64,
-						"w": 104,
-						"h": 65
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 111,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 12,
-						"y": 6,
-						"w": 97,
-						"h": 65
-					},
-					"frame": {
-						"x": 0,
-						"y": 128,
-						"w": 97,
-						"h": 65
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 111,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 12,
-						"y": 6,
-						"w": 97,
-						"h": 65
-					},
-					"frame": {
-						"x": 97,
-						"y": 129,
-						"w": 97,
-						"h": 65
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 111,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 111,
-						"h": 66
-					},
-					"frame": {
-						"x": 194,
-						"y": 129,
-						"w": 111,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 111,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 111,
-						"h": 66
-					},
-					"frame": {
-						"x": 305,
-						"y": 129,
-						"w": 111,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 111,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 11,
-						"y": 5,
-						"w": 98,
-						"h": 66
-					},
-					"frame": {
-						"x": 416,
-						"y": 129,
-						"w": 98,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 111,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 7,
-						"w": 110,
-						"h": 66
-					},
-					"frame": {
-						"x": 0,
-						"y": 194,
-						"w": 110,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 111,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 7,
-						"w": 108,
-						"h": 66
-					},
-					"frame": {
-						"x": 110,
-						"y": 195,
-						"w": 108,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 111,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 7,
-						"w": 106,
-						"h": 66
-					},
-					"frame": {
-						"x": 218,
-						"y": 195,
-						"w": 106,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 111,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 4,
-						"w": 109,
-						"h": 67
-					},
-					"frame": {
-						"x": 324,
-						"y": 195,
-						"w": 109,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 111,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 111,
-						"h": 67
-					},
-					"frame": {
-						"x": 0,
-						"y": 261,
-						"w": 111,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 111,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 3,
-						"w": 98,
-						"h": 68
-					},
-					"frame": {
-						"x": 111,
-						"y": 261,
-						"w": 98,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 111,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 2,
-						"w": 108,
-						"h": 69
-					},
-					"frame": {
-						"x": 209,
-						"y": 261,
-						"w": 108,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 111,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 2,
-						"w": 98,
-						"h": 69
-					},
-					"frame": {
-						"x": 317,
-						"y": 262,
-						"w": 98,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 111,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 1,
-						"w": 98,
-						"h": 70
-					},
-					"frame": {
-						"x": 415,
-						"y": 262,
-						"w": 98,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0031.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 111,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 106,
-						"h": 70
-					},
-					"frame": {
-						"x": 0,
-						"y": 328,
-						"w": 106,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 111,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 0,
-						"w": 99,
-						"h": 71
-					},
-					"frame": {
-						"x": 106,
-						"y": 329,
-						"w": 99,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0032.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 111,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 1,
-						"w": 106,
-						"h": 70
-					},
-					"frame": {
-						"x": 205,
-						"y": 330,
-						"w": 106,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0025.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 111,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 0,
-						"w": 98,
-						"h": 71
-					},
-					"frame": {
-						"x": 311,
-						"y": 331,
-						"w": 98,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0026.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 111,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 100,
-						"h": 71
-					},
-					"frame": {
-						"x": 409,
-						"y": 332,
-						"w": 100,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0027.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 111,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 0,
-						"w": 102,
-						"h": 71
-					},
-					"frame": {
-						"x": 0,
-						"y": 398,
-						"w": 102,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0028.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 111,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 0,
-						"w": 103,
-						"h": 71
-					},
-					"frame": {
-						"x": 102,
-						"y": 400,
-						"w": 103,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0029.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 111,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 0,
-						"w": 104,
-						"h": 71
-					},
-					"frame": {
-						"x": 205,
-						"y": 400,
-						"w": 104,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0030.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 111,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 0,
-						"w": 106,
-						"h": 71
-					},
-					"frame": {
-						"x": 309,
-						"y": 403,
-						"w": 106,
-						"h": 71
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:daba98eede1b4cafdaf3d2c2d7ef907f:c4d90754ddb58ba739191c8fc94a8f24:51bcdbb4fa6a1a9e90a83c2a4132ee1b$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 232, "y": 198, "w": 74, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 2, "w": 74, "h": 62 },
+    "sourceSize": { "w": 82, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 155, "y": 132, "w": 78, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 78, "h": 65 },
+    "sourceSize": { "w": 82, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 156, "y": 66, "w": 78, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 78, "h": 66 },
+    "sourceSize": { "w": 82, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 78, "y": 134, "w": 77, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 77, "h": 64 },
+    "sourceSize": { "w": 82, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 75, "y": 198, "w": 77, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 77, "h": 61 },
+    "sourceSize": { "w": 82, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 0, "y": 134, "w": 78, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 78, "h": 64 },
+    "sourceSize": { "w": 82, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 234, "y": 67, "w": 78, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 78, "h": 66 },
+    "sourceSize": { "w": 82, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 233, "y": 133, "w": 78, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 78, "h": 65 },
+    "sourceSize": { "w": 82, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 155, "y": 197, "w": 77, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 77, "h": 63 },
+    "sourceSize": { "w": 82, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 156, "y": 0, "w": 79, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 79, "h": 66 },
+    "sourceSize": { "w": 82, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 0, "y": 0, "w": 78, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 78, "h": 68 },
+    "sourceSize": { "w": 82, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 235, "y": 0, "w": 77, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 77, "h": 67 },
+    "sourceSize": { "w": 82, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 0, "y": 198, "w": 75, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 75, "h": 64 },
+    "sourceSize": { "w": 82, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 0, "y": 68, "w": 78, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 78, "h": 66 },
+    "sourceSize": { "w": 82, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 78, "y": 0, "w": 78, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 78, "h": 68 },
+    "sourceSize": { "w": 82, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 78, "y": 68, "w": 77, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 77, "h": 66 },
+    "sourceSize": { "w": 82, "h": 69 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.13-x64",
+  "image": "2038.png",
+  "format": "I8",
+  "size": { "w": 312, "h": 262 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/shiny/2038.png b/public/images/pokemon/exp/back/shiny/2038.png
index 7452a07959e..33c5406bbb7 100644
Binary files a/public/images/pokemon/exp/back/shiny/2038.png and b/public/images/pokemon/exp/back/shiny/2038.png differ
diff --git a/public/images/pokemon/exp/back/shiny/2074.json b/public/images/pokemon/exp/back/shiny/2074.json
index 3750e354036..d7500c522e9 100644
--- a/public/images/pokemon/exp/back/shiny/2074.json
+++ b/public/images/pokemon/exp/back/shiny/2074.json
@@ -1,230 +1,398 @@
-{
-	"textures": [
-		{
-			"image": "2074.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 108,
-				"h": 108
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 57,
-						"h": 43
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 11,
-						"w": 57,
-						"h": 32
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 57,
-						"h": 32
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 57,
-						"h": 43
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 9,
-						"w": 56,
-						"h": 33
-					},
-					"frame": {
-						"x": 0,
-						"y": 32,
-						"w": 56,
-						"h": 33
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 57,
-						"h": 43
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 9,
-						"w": 56,
-						"h": 33
-					},
-					"frame": {
-						"x": 0,
-						"y": 32,
-						"w": 56,
-						"h": 33
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 57,
-						"h": 43
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 6,
-						"w": 54,
-						"h": 34
-					},
-					"frame": {
-						"x": 0,
-						"y": 65,
-						"w": 54,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 57,
-						"h": 43
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 6,
-						"w": 54,
-						"h": 34
-					},
-					"frame": {
-						"x": 0,
-						"y": 65,
-						"w": 54,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 57,
-						"h": 43
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 4,
-						"w": 51,
-						"h": 34
-					},
-					"frame": {
-						"x": 57,
-						"y": 0,
-						"w": 51,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 57,
-						"h": 43
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 4,
-						"w": 51,
-						"h": 34
-					},
-					"frame": {
-						"x": 57,
-						"y": 0,
-						"w": 51,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 57,
-						"h": 43
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 51,
-						"h": 35
-					},
-					"frame": {
-						"x": 56,
-						"y": 34,
-						"w": 51,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 57,
-						"h": 43
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 51,
-						"h": 35
-					},
-					"frame": {
-						"x": 56,
-						"y": 34,
-						"w": 51,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 57,
-						"h": 43
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 51,
-						"h": 34
-					},
-					"frame": {
-						"x": 54,
-						"y": 69,
-						"w": 51,
-						"h": 34
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:83d00ed4c6a02e60a38ac9aee06d8c3c:775f78f8cdeebcc0ae0338af2fc1f6c7:ad137687a877f55f096b7447bfdfe295$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 63, "y": 100, "w": 59, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 59, "h": 32 },
+    "sourceSize": { "w": 71, "h": 44 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 195, "y": 99, "w": 61, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 5, "w": 61, "h": 32 },
+    "sourceSize": { "w": 71, "h": 44 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 131, "y": 68, "w": 64, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 9, "w": 64, "h": 32 },
+    "sourceSize": { "w": 71, "h": 44 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 203, "y": 67, "w": 65, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 12, "w": 65, "h": 32 },
+    "sourceSize": { "w": 71, "h": 44 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 1, "y": 35, "w": 66, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 12, "w": 66, "h": 32 },
+    "sourceSize": { "w": 71, "h": 44 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 1, "y": 67, "w": 66, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 12, "w": 66, "h": 32 },
+    "sourceSize": { "w": 71, "h": 44 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 1, "y": 35, "w": 66, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 10, "w": 66, "h": 32 },
+    "sourceSize": { "w": 71, "h": 44 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 203, "y": 67, "w": 65, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 8, "w": 65, "h": 32 },
+    "sourceSize": { "w": 71, "h": 44 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 131, "y": 68, "w": 64, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 6, "w": 64, "h": 32 },
+    "sourceSize": { "w": 71, "h": 44 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 195, "y": 99, "w": 61, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 4, "w": 61, "h": 32 },
+    "sourceSize": { "w": 71, "h": 44 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 63, "y": 100, "w": 59, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 59, "h": 32 },
+    "sourceSize": { "w": 71, "h": 44 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 195, "y": 99, "w": 61, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 5, "w": 61, "h": 32 },
+    "sourceSize": { "w": 71, "h": 44 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 131, "y": 68, "w": 64, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 9, "w": 64, "h": 32 },
+    "sourceSize": { "w": 71, "h": 44 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 203, "y": 67, "w": 65, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 12, "w": 65, "h": 32 },
+    "sourceSize": { "w": 71, "h": 44 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 1, "y": 35, "w": 66, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 12, "w": 66, "h": 32 },
+    "sourceSize": { "w": 71, "h": 44 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 1, "y": 67, "w": 66, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 12, "w": 66, "h": 32 },
+    "sourceSize": { "w": 71, "h": 44 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 1, "y": 35, "w": 66, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 10, "w": 66, "h": 32 },
+    "sourceSize": { "w": 71, "h": 44 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 203, "y": 67, "w": 65, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 8, "w": 65, "h": 32 },
+    "sourceSize": { "w": 71, "h": 44 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 131, "y": 68, "w": 64, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 6, "w": 64, "h": 32 },
+    "sourceSize": { "w": 71, "h": 44 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 195, "y": 99, "w": 61, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 4, "w": 61, "h": 32 },
+    "sourceSize": { "w": 71, "h": 44 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 63, "y": 100, "w": 59, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 59, "h": 32 },
+    "sourceSize": { "w": 71, "h": 44 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 195, "y": 99, "w": 61, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 5, "w": 61, "h": 32 },
+    "sourceSize": { "w": 71, "h": 44 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 131, "y": 68, "w": 64, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 9, "w": 64, "h": 32 },
+    "sourceSize": { "w": 71, "h": 44 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 203, "y": 67, "w": 65, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 12, "w": 65, "h": 32 },
+    "sourceSize": { "w": 71, "h": 44 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 1, "y": 35, "w": 66, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 12, "w": 66, "h": 32 },
+    "sourceSize": { "w": 71, "h": 44 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 1, "y": 67, "w": 66, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 12, "w": 66, "h": 32 },
+    "sourceSize": { "w": 71, "h": 44 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 1, "y": 35, "w": 66, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 10, "w": 66, "h": 32 },
+    "sourceSize": { "w": 71, "h": 44 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 203, "y": 67, "w": 65, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 8, "w": 65, "h": 32 },
+    "sourceSize": { "w": 71, "h": 44 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 131, "y": 68, "w": 64, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 6, "w": 64, "h": 32 },
+    "sourceSize": { "w": 71, "h": 44 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 195, "y": 99, "w": 61, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 4, "w": 61, "h": 32 },
+    "sourceSize": { "w": 71, "h": 44 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 63, "y": 100, "w": 59, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 59, "h": 32 },
+    "sourceSize": { "w": 71, "h": 44 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 268, "y": 68, "w": 62, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 62, "h": 33 },
+    "sourceSize": { "w": 71, "h": 44 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 67, "y": 67, "w": 64, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 8, "w": 64, "h": 33 },
+    "sourceSize": { "w": 71, "h": 44 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 203, "y": 34, "w": 66, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 8, "w": 66, "h": 33 },
+    "sourceSize": { "w": 71, "h": 44 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 275, "y": 1, "w": 67, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 67, "h": 33 },
+    "sourceSize": { "w": 71, "h": 44 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 71, "y": 1, "w": 68, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 68, "h": 33 },
+    "sourceSize": { "w": 71, "h": 44 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 1, "y": 1, "w": 70, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 70, "h": 34 },
+    "sourceSize": { "w": 71, "h": 44 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 139, "y": 1, "w": 68, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 68, "h": 33 },
+    "sourceSize": { "w": 71, "h": 44 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 207, "y": 1, "w": 68, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 68, "h": 33 },
+    "sourceSize": { "w": 71, "h": 44 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 71, "y": 34, "w": 67, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 67, "h": 33 },
+    "sourceSize": { "w": 71, "h": 44 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 138, "y": 34, "w": 65, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 65, "h": 34 },
+    "sourceSize": { "w": 71, "h": 44 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 269, "y": 34, "w": 64, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 64, "h": 34 },
+    "sourceSize": { "w": 71, "h": 44 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 1, "y": 99, "w": 62, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 1, "w": 62, "h": 33 },
+    "sourceSize": { "w": 71, "h": 44 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.13-x64",
+  "image": "2074.png",
+  "format": "I8",
+  "size": { "w": 343, "h": 133 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/shiny/2074.png b/public/images/pokemon/exp/back/shiny/2074.png
index 84f0eea9eea..9db2c9ea0b0 100644
Binary files a/public/images/pokemon/exp/back/shiny/2074.png and b/public/images/pokemon/exp/back/shiny/2074.png differ
diff --git a/public/images/pokemon/exp/back/shiny/2075.json b/public/images/pokemon/exp/back/shiny/2075.json
index 94e0db4a192..76c9932c417 100644
--- a/public/images/pokemon/exp/back/shiny/2075.json
+++ b/public/images/pokemon/exp/back/shiny/2075.json
@@ -1,188 +1,812 @@
-{
-	"textures": [
-		{
-			"image": "2075.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 131,
-				"h": 131
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 67,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 67,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 67,
-						"h": 43
-					},
-					"frame": {
-						"x": 0,
-						"y": 44,
-						"w": 67,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 65,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 87,
-						"w": 65,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 65,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 87,
-						"w": 65,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 0,
-						"w": 63,
-						"h": 44
-					},
-					"frame": {
-						"x": 65,
-						"y": 87,
-						"w": 63,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 0,
-						"w": 63,
-						"h": 44
-					},
-					"frame": {
-						"x": 65,
-						"y": 87,
-						"w": 63,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 0,
-						"w": 61,
-						"h": 44
-					},
-					"frame": {
-						"x": 67,
-						"y": 0,
-						"w": 61,
-						"h": 44
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:e29904dcd6139adeb45191492d71f1e5:4dd0caa839bbbfbf24d378cf60fffd1b:732805cb123f88b2d403da0dec709706$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 145, "y": 1, "w": 71, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 0, "w": 71, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 216, "y": 1, "w": 71, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 0, "w": 71, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 412, "y": 88, "w": 69, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 69, "h": 42 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 210, "y": 210, "w": 67, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 67, "h": 42 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 1, "y": 250, "w": 65, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 65, "h": 42 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 210, "y": 210, "w": 67, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 67, "h": 42 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 412, "y": 88, "w": 69, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 69, "h": 42 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 216, "y": 1, "w": 71, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 0, "w": 71, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 145, "y": 1, "w": 71, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 0, "w": 71, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 429, "y": 1, "w": 71, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 71, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 73, "y": 1, "w": 72, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 72, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 1, "y": 1, "w": 72, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 72, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 287, "y": 1, "w": 71, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 71, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 1, "y": 1, "w": 72, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 72, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 73, "y": 1, "w": 72, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 72, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 429, "y": 1, "w": 71, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 71, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 145, "y": 1, "w": 71, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 0, "w": 71, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 216, "y": 1, "w": 71, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 0, "w": 71, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 412, "y": 88, "w": 69, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 69, "h": 42 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 210, "y": 210, "w": 67, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 67, "h": 42 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 1, "y": 250, "w": 65, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 65, "h": 42 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 210, "y": 210, "w": 67, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 67, "h": 42 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 412, "y": 88, "w": 69, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 69, "h": 42 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 216, "y": 1, "w": 71, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 0, "w": 71, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 145, "y": 1, "w": 71, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 0, "w": 71, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 429, "y": 1, "w": 71, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 71, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 73, "y": 1, "w": 72, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 72, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 1, "y": 1, "w": 72, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 72, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 287, "y": 1, "w": 71, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 71, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 1, "y": 1, "w": 72, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 72, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 73, "y": 1, "w": 72, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 72, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 429, "y": 1, "w": 71, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 71, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 145, "y": 1, "w": 71, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 0, "w": 71, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 216, "y": 1, "w": 71, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 0, "w": 71, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 412, "y": 88, "w": 69, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 69, "h": 42 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 210, "y": 210, "w": 67, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 67, "h": 42 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 1, "y": 250, "w": 65, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 65, "h": 42 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 210, "y": 210, "w": 67, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 67, "h": 42 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 412, "y": 88, "w": 69, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 69, "h": 42 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 216, "y": 1, "w": 71, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 0, "w": 71, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 145, "y": 1, "w": 71, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 0, "w": 71, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 429, "y": 1, "w": 71, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 71, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 73, "y": 1, "w": 72, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 72, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 1, "y": 1, "w": 72, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 72, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 287, "y": 1, "w": 71, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 71, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 1, "y": 1, "w": 72, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 72, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 73, "y": 1, "w": 72, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 72, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 429, "y": 1, "w": 71, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 71, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 145, "y": 1, "w": 71, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 0, "w": 71, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 341, "y": 87, "w": 71, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 1, "w": 71, "h": 41 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 419, "y": 130, "w": 71, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 71, "h": 40 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 419, "y": 130, "w": 71, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 1, "w": 71, "h": 40 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 419, "y": 130, "w": 71, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 71, "h": 40 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 285, "y": 171, "w": 71, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 71, "h": 40 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 490, "y": 170, "w": 71, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 2, "w": 71, "h": 40 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 1, "y": 170, "w": 71, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 2, "w": 71, "h": 40 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 490, "y": 130, "w": 71, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 2, "w": 71, "h": 40 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 496, "y": 210, "w": 70, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 70, "h": 40 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 72, "y": 210, "w": 69, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 2, "w": 69, "h": 41 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 479, "y": 45, "w": 68, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 2, "w": 68, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 207, "y": 44, "w": 67, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 2, "w": 67, "h": 44 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 1, "y": 44, "w": 66, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 1, "w": 66, "h": 46 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 274, "y": 44, "w": 67, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 2, "w": 67, "h": 44 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 280, "y": 128, "w": 69, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 2, "w": 69, "h": 42 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 141, "y": 210, "w": 69, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 2, "w": 69, "h": 41 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 277, "y": 211, "w": 70, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 70, "h": 40 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 426, "y": 210, "w": 70, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 70, "h": 40 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 356, "y": 210, "w": 70, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 2, "w": 70, "h": 40 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 72, "y": 170, "w": 71, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 2, "w": 71, "h": 40 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 1, "y": 210, "w": 71, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 71, "h": 40 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 143, "y": 170, "w": 71, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 71, "h": 40 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 70, "y": 129, "w": 70, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 70, "h": 41 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 138, "y": 88, "w": 71, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 71, "h": 41 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 67, "y": 86, "w": 71, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 71, "h": 41 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 341, "y": 44, "w": 70, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 70, "h": 42 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 1, "y": 127, "w": 69, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 69, "h": 42 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 411, "y": 44, "w": 68, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 68, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 500, "y": 1, "w": 69, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 69, "h": 44 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 138, "y": 44, "w": 69, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 69, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 481, "y": 88, "w": 69, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 69, "h": 42 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 140, "y": 129, "w": 70, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 70, "h": 41 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 210, "y": 129, "w": 70, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 70, "h": 41 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 349, "y": 130, "w": 70, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 70, "h": 41 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 214, "y": 170, "w": 71, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 71, "h": 40 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 419, "y": 170, "w": 71, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 71, "h": 40 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 209, "y": 88, "w": 71, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 71, "h": 41 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 341, "y": 87, "w": 71, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 71, "h": 41 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0088.png",
+    "frame": { "x": 67, "y": 44, "w": 71, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 1, "w": 71, "h": 42 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0089.png",
+    "frame": { "x": 358, "y": 1, "w": 71, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 0, "w": 71, "h": 43 },
+    "sourceSize": { "w": 81, "h": 47 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.13-x64",
+  "image": "2075.png",
+  "format": "I8",
+  "size": { "w": 570, "h": 293 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/shiny/2075.png b/public/images/pokemon/exp/back/shiny/2075.png
index cdcfd55d4ba..6fbe68dd727 100644
Binary files a/public/images/pokemon/exp/back/shiny/2075.png and b/public/images/pokemon/exp/back/shiny/2075.png differ
diff --git a/public/images/pokemon/exp/back/shiny/2076.json b/public/images/pokemon/exp/back/shiny/2076.json
index aa499f537be..11a4999b41d 100644
--- a/public/images/pokemon/exp/back/shiny/2076.json
+++ b/public/images/pokemon/exp/back/shiny/2076.json
@@ -1,209 +1,965 @@
-{
-	"textures": [
-		{
-			"image": "2076.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 206,
-				"h": 206
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 55,
-						"h": 70
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 55,
-						"h": 67
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 55,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 55,
-						"h": 70
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 55,
-						"h": 67
-					},
-					"frame": {
-						"x": 55,
-						"y": 0,
-						"w": 55,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 55,
-						"h": 70
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 55,
-						"h": 67
-					},
-					"frame": {
-						"x": 110,
-						"y": 0,
-						"w": 55,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 55,
-						"h": 70
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 55,
-						"h": 67
-					},
-					"frame": {
-						"x": 0,
-						"y": 67,
-						"w": 55,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 55,
-						"h": 70
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 54,
-						"h": 69
-					},
-					"frame": {
-						"x": 55,
-						"y": 67,
-						"w": 54,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 55,
-						"h": 70
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 55,
-						"h": 69
-					},
-					"frame": {
-						"x": 109,
-						"y": 67,
-						"w": 55,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 55,
-						"h": 70
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 55,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 134,
-						"w": 55,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 55,
-						"h": 70
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 55,
-						"h": 70
-					},
-					"frame": {
-						"x": 55,
-						"y": 136,
-						"w": 55,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 55,
-						"h": 70
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 55,
-						"h": 70
-					},
-					"frame": {
-						"x": 110,
-						"y": 136,
-						"w": 55,
-						"h": 70
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:4e9f4d6cd9939d8af2f26d93c51cca84:ba5f3bd7a848240c136dc6e321666792:719cdf7324091edbb7b1d6e2d7254a1a$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 1, "y": 322, "w": 53, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 53, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 165, "y": 318, "w": 53, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 53, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 218, "y": 318, "w": 53, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 53, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 271, "y": 254, "w": 54, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 54, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 163, "y": 193, "w": 54, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 54, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 57, "y": 64, "w": 55, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 55, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 56, "y": 129, "w": 55, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 5, "w": 55, "h": 64 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 111, "y": 129, "w": 55, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 55, "h": 64 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 348, "y": 63, "w": 56, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 56, "h": 64 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 1, "y": 64, "w": 56, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 56, "h": 64 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 221, "y": 189, "w": 55, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 55, "h": 64 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 166, "y": 129, "w": 55, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 55, "h": 64 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 167, "y": 64, "w": 55, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 55, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 55, "y": 193, "w": 54, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 54, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 324, "y": 321, "w": 53, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 53, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 1, "y": 192, "w": 54, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 54, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 1, "y": 322, "w": 53, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 53, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 165, "y": 318, "w": 53, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 53, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 218, "y": 318, "w": 53, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 53, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 271, "y": 254, "w": 54, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 54, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 163, "y": 193, "w": 54, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 54, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 57, "y": 64, "w": 55, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 55, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 56, "y": 129, "w": 55, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 5, "w": 55, "h": 64 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 111, "y": 129, "w": 55, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 55, "h": 64 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 348, "y": 63, "w": 56, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 56, "h": 64 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 1, "y": 64, "w": 56, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 56, "h": 64 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 221, "y": 189, "w": 55, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 55, "h": 64 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 166, "y": 129, "w": 55, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 55, "h": 64 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 167, "y": 64, "w": 55, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 55, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 55, "y": 193, "w": 54, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 54, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 324, "y": 321, "w": 53, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 53, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 1, "y": 192, "w": 54, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 54, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 1, "y": 322, "w": 53, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 53, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 165, "y": 318, "w": 53, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 53, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 218, "y": 318, "w": 53, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 53, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 271, "y": 254, "w": 54, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 54, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 163, "y": 193, "w": 54, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 54, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 57, "y": 64, "w": 55, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 55, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 56, "y": 129, "w": 55, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 5, "w": 55, "h": 64 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 111, "y": 129, "w": 55, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 55, "h": 64 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 348, "y": 63, "w": 56, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 56, "h": 64 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 1, "y": 64, "w": 56, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 56, "h": 64 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 221, "y": 189, "w": 55, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 55, "h": 64 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 166, "y": 129, "w": 55, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 55, "h": 64 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 167, "y": 64, "w": 55, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 55, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 55, "y": 193, "w": 54, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 54, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 324, "y": 321, "w": 53, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 53, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 1, "y": 192, "w": 54, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 54, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 1, "y": 322, "w": 53, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 53, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 165, "y": 318, "w": 53, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 53, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 218, "y": 318, "w": 53, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 53, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 271, "y": 254, "w": 54, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 54, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 163, "y": 193, "w": 54, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 54, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 57, "y": 64, "w": 55, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 55, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 56, "y": 129, "w": 55, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 5, "w": 55, "h": 64 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 111, "y": 129, "w": 55, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 55, "h": 64 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 348, "y": 63, "w": 56, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 56, "h": 64 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 1, "y": 64, "w": 56, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 56, "h": 64 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 221, "y": 189, "w": 55, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 55, "h": 64 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 166, "y": 129, "w": 55, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 55, "h": 64 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 167, "y": 64, "w": 55, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 55, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 55, "y": 193, "w": 54, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 54, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 324, "y": 321, "w": 53, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 53, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 1, "y": 192, "w": 54, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 54, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 1, "y": 322, "w": 53, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 53, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 109, "y": 193, "w": 54, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 54, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 111, "y": 258, "w": 54, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 54, "h": 64 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 330, "y": 191, "w": 54, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 54, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 108, "y": 322, "w": 53, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 53, "h": 64 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 161, "y": 383, "w": 53, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 6, "w": 53, "h": 63 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 1, "y": 322, "w": 53, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 53, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 55, "y": 320, "w": 53, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 53, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 271, "y": 319, "w": 53, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 53, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 217, "y": 253, "w": 54, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 54, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 276, "y": 189, "w": 54, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 54, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 334, "y": 127, "w": 55, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 55, "h": 64 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 222, "y": 126, "w": 56, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 56, "h": 63 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 175, "y": 1, "w": 58, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 58, "h": 63 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 175, "y": 1, "w": 58, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 58, "h": 63 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 117, "y": 1, "w": 58, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 58, "h": 63 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 117, "y": 1, "w": 58, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 58, "h": 63 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 59, "y": 1, "w": 58, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 58, "h": 63 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 59, "y": 1, "w": 58, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 58, "h": 63 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 1, "y": 1, "w": 58, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 58, "h": 63 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 1, "y": 1, "w": 58, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 58, "h": 63 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 1, "y": 1, "w": 58, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 58, "h": 63 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 233, "y": 1, "w": 58, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 58, "h": 63 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0088.png",
+    "frame": { "x": 233, "y": 1, "w": 58, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 58, "h": 63 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0089.png",
+    "frame": { "x": 349, "y": 1, "w": 58, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 7, "w": 58, "h": 62 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0090.png",
+    "frame": { "x": 233, "y": 1, "w": 58, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 58, "h": 63 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0091.png",
+    "frame": { "x": 349, "y": 1, "w": 58, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 7, "w": 58, "h": 62 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0092.png",
+    "frame": { "x": 233, "y": 1, "w": 58, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 58, "h": 63 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0093.png",
+    "frame": { "x": 349, "y": 1, "w": 58, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 7, "w": 58, "h": 62 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0094.png",
+    "frame": { "x": 233, "y": 1, "w": 58, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 58, "h": 63 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0095.png",
+    "frame": { "x": 349, "y": 1, "w": 58, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 7, "w": 58, "h": 62 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0096.png",
+    "frame": { "x": 233, "y": 1, "w": 58, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 58, "h": 63 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0097.png",
+    "frame": { "x": 349, "y": 1, "w": 58, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 7, "w": 58, "h": 62 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0098.png",
+    "frame": { "x": 291, "y": 1, "w": 58, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 7, "w": 58, "h": 62 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0099.png",
+    "frame": { "x": 222, "y": 64, "w": 57, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 7, "w": 57, "h": 62 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0100.png",
+    "frame": { "x": 55, "y": 258, "w": 56, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 7, "w": 56, "h": 62 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0101.png",
+    "frame": { "x": 291, "y": 63, "w": 57, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 6, "w": 57, "h": 63 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0102.png",
+    "frame": { "x": 278, "y": 126, "w": 56, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 6, "w": 56, "h": 63 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0103.png",
+    "frame": { "x": 1, "y": 128, "w": 55, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 55, "h": 64 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0104.png",
+    "frame": { "x": 112, "y": 64, "w": 55, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 55, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0105.png",
+    "frame": { "x": 325, "y": 256, "w": 54, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 54, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0106.png",
+    "frame": { "x": 1, "y": 257, "w": 54, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 54, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.13-x64",
+  "image": "2076.png",
+  "format": "I8",
+  "size": { "w": 408, "h": 447 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/shiny/2076.png b/public/images/pokemon/exp/back/shiny/2076.png
index 54294d688a7..69424220267 100644
Binary files a/public/images/pokemon/exp/back/shiny/2076.png and b/public/images/pokemon/exp/back/shiny/2076.png differ
diff --git a/public/images/pokemon/exp/back/shiny/2088.json b/public/images/pokemon/exp/back/shiny/2088.json
index d83a5e80b9f..bc5207262b9 100644
--- a/public/images/pokemon/exp/back/shiny/2088.json
+++ b/public/images/pokemon/exp/back/shiny/2088.json
@@ -1,230 +1,173 @@
-{
-	"textures": [
-		{
-			"image": "2088.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 123,
-				"h": 123
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 41
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 47,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 47,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 41
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 47,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 47,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 41
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 48,
-						"h": 40
-					},
-					"frame": {
-						"x": 0,
-						"y": 41,
-						"w": 48,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 41
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 45,
-						"h": 41
-					},
-					"frame": {
-						"x": 47,
-						"y": 0,
-						"w": 45,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 41
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 45,
-						"h": 41
-					},
-					"frame": {
-						"x": 47,
-						"y": 0,
-						"w": 45,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 41
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 45,
-						"h": 41
-					},
-					"frame": {
-						"x": 48,
-						"y": 41,
-						"w": 45,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 41
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 45,
-						"h": 41
-					},
-					"frame": {
-						"x": 48,
-						"y": 41,
-						"w": 45,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 41
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 45,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 81,
-						"w": 45,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 41
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 44,
-						"h": 41
-					},
-					"frame": {
-						"x": 45,
-						"y": 82,
-						"w": 44,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 41
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 44,
-						"h": 41
-					},
-					"frame": {
-						"x": 45,
-						"y": 82,
-						"w": 44,
-						"h": 41
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:ba890bb81fa834ddd0788233d167fc52:cbdce6f244382f200e05794e64d74837:b8df8f168871505f42fdc6d3c5b106f0$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 49, "y": 111, "w": 48, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 0, "w": 48, "h": 39 },
+    "sourceSize": { "w": 58, "h": 39 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 0, "y": 75, "w": 49, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 0, "w": 49, "h": 39 },
+    "sourceSize": { "w": 58, "h": 39 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 216, "y": 75, "w": 50, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 50, "h": 38 },
+    "sourceSize": { "w": 58, "h": 39 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 54, "y": 73, "w": 52, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 52, "h": 38 },
+    "sourceSize": { "w": 58, "h": 39 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 0, "y": 37, "w": 54, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 54, "h": 38 },
+    "sourceSize": { "w": 58, "h": 39 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 111, "y": 38, "w": 54, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 54, "h": 37 },
+    "sourceSize": { "w": 58, "h": 39 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 169, "y": 0, "w": 56, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 56, "h": 37 },
+    "sourceSize": { "w": 58, "h": 39 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 225, "y": 0, "w": 56, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 56, "h": 37 },
+    "sourceSize": { "w": 58, "h": 39 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 54, "y": 37, "w": 57, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 57, "h": 36 },
+    "sourceSize": { "w": 58, "h": 39 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 0, "y": 0, "w": 57, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 57, "h": 37 },
+    "sourceSize": { "w": 58, "h": 39 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 57, "y": 0, "w": 57, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 57, "h": 37 },
+    "sourceSize": { "w": 58, "h": 39 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 169, "y": 37, "w": 55, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 55, "h": 37 },
+    "sourceSize": { "w": 58, "h": 39 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 114, "y": 0, "w": 55, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 55, "h": 38 },
+    "sourceSize": { "w": 58, "h": 39 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 224, "y": 37, "w": 53, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 53, "h": 38 },
+    "sourceSize": { "w": 58, "h": 39 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 165, "y": 74, "w": 51, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 51, "h": 38 },
+    "sourceSize": { "w": 58, "h": 39 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 106, "y": 75, "w": 49, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 0, "w": 49, "h": 39 },
+    "sourceSize": { "w": 58, "h": 39 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 155, "y": 112, "w": 48, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 0, "w": 48, "h": 39 },
+    "sourceSize": { "w": 58, "h": 39 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 203, "y": 113, "w": 48, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 0, "w": 48, "h": 39 },
+    "sourceSize": { "w": 58, "h": 39 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.13-x64",
+  "image": "2088.png",
+  "format": "I8",
+  "size": { "w": 281, "h": 152 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/shiny/2088.png b/public/images/pokemon/exp/back/shiny/2088.png
index 89227ccbb55..1f939f63d70 100644
Binary files a/public/images/pokemon/exp/back/shiny/2088.png and b/public/images/pokemon/exp/back/shiny/2088.png differ
diff --git a/public/images/pokemon/exp/back/shiny/2089.json b/public/images/pokemon/exp/back/shiny/2089.json
index 43d6fa141b3..c0416f08b26 100644
--- a/public/images/pokemon/exp/back/shiny/2089.json
+++ b/public/images/pokemon/exp/back/shiny/2089.json
@@ -1,230 +1,1091 @@
-{
-	"textures": [
-		{
-			"image": "2089.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 178,
-				"h": 178
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 82,
-						"h": 63
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 82,
-						"h": 63
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 82,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 82,
-						"h": 63
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 82,
-						"h": 63
-					},
-					"frame": {
-						"x": 82,
-						"y": 0,
-						"w": 82,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 82,
-						"h": 63
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 82,
-						"h": 63
-					},
-					"frame": {
-						"x": 82,
-						"y": 0,
-						"w": 82,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 82,
-						"h": 63
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 82,
-						"h": 62
-					},
-					"frame": {
-						"x": 0,
-						"y": 63,
-						"w": 82,
-						"h": 62
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 82,
-						"h": 63
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 82,
-						"h": 62
-					},
-					"frame": {
-						"x": 0,
-						"y": 63,
-						"w": 82,
-						"h": 62
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 82,
-						"h": 63
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 10,
-						"w": 82,
-						"h": 53
-					},
-					"frame": {
-						"x": 0,
-						"y": 125,
-						"w": 82,
-						"h": 53
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 82,
-						"h": 63
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 82,
-						"h": 59
-					},
-					"frame": {
-						"x": 82,
-						"y": 63,
-						"w": 82,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 82,
-						"h": 63
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 82,
-						"h": 59
-					},
-					"frame": {
-						"x": 82,
-						"y": 63,
-						"w": 82,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 82,
-						"h": 63
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 82,
-						"h": 56
-					},
-					"frame": {
-						"x": 82,
-						"y": 122,
-						"w": 82,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 82,
-						"h": 63
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 82,
-						"h": 56
-					},
-					"frame": {
-						"x": 82,
-						"y": 122,
-						"w": 82,
-						"h": 56
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:6de3971a726023157c38b599fa8651b9:a11b234c76dc80c742c8c4b3d7e37c73:49ee9ed0dd32c5ba33977741b45fc3f4$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 1, "y": 1, "w": 81, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 81, "h": 62 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 82, "y": 1, "w": 82, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 1, "w": 82, "h": 61 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 246, "y": 1, "w": 83, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 83, "h": 60 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 246, "y": 61, "w": 84, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 84, "h": 58 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 414, "y": 61, "w": 85, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 85, "h": 57 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 499, "y": 118, "w": 86, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 6, "w": 86, "h": 56 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 259, "y": 119, "w": 87, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 8, "w": 87, "h": 54 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 87, "y": 174, "w": 88, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 9, "w": 88, "h": 53 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 88, "y": 227, "w": 89, "h": 51 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 11, "w": 89, "h": 51 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 266, "y": 228, "w": 90, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 12, "w": 90, "h": 50 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 358, "y": 278, "w": 91, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 13, "w": 91, "h": 49 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 1, "y": 328, "w": 92, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 15, "w": 92, "h": 47 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 93, "y": 375, "w": 93, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 16, "w": 93, "h": 46 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 186, "y": 375, "w": 93, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 16, "w": 93, "h": 46 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 542, "y": 375, "w": 92, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 16, "w": 92, "h": 46 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 1, "y": 375, "w": 92, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 15, "w": 92, "h": 47 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 449, "y": 327, "w": 92, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 14, "w": 92, "h": 48 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 449, "y": 278, "w": 91, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 13, "w": 91, "h": 49 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 88, "y": 278, "w": 90, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 12, "w": 90, "h": 50 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 177, "y": 227, "w": 89, "h": 51 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 11, "w": 89, "h": 51 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 346, "y": 175, "w": 87, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 9, "w": 87, "h": 53 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 87, "y": 119, "w": 86, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 7, "w": 86, "h": 55 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 499, "y": 61, "w": 85, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 85, "h": 57 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 412, "y": 1, "w": 83, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 83, "h": 60 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 1, "y": 1, "w": 81, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 81, "h": 62 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 82, "y": 1, "w": 82, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 1, "w": 82, "h": 61 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 246, "y": 1, "w": 83, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 83, "h": 60 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 246, "y": 61, "w": 84, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 84, "h": 58 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 414, "y": 61, "w": 85, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 85, "h": 57 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 499, "y": 118, "w": 86, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 6, "w": 86, "h": 56 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 259, "y": 119, "w": 87, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 8, "w": 87, "h": 54 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 87, "y": 174, "w": 88, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 9, "w": 88, "h": 53 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 88, "y": 227, "w": 89, "h": 51 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 11, "w": 89, "h": 51 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 266, "y": 228, "w": 90, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 12, "w": 90, "h": 50 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 358, "y": 278, "w": 91, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 13, "w": 91, "h": 49 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 1, "y": 328, "w": 92, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 15, "w": 92, "h": 47 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 93, "y": 375, "w": 93, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 16, "w": 93, "h": 46 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 186, "y": 375, "w": 93, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 16, "w": 93, "h": 46 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 542, "y": 375, "w": 92, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 16, "w": 92, "h": 46 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 1, "y": 375, "w": 92, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 15, "w": 92, "h": 47 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 449, "y": 327, "w": 92, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 14, "w": 92, "h": 48 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 449, "y": 278, "w": 91, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 13, "w": 91, "h": 49 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 88, "y": 278, "w": 90, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 12, "w": 90, "h": 50 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 177, "y": 227, "w": 89, "h": 51 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 11, "w": 89, "h": 51 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 346, "y": 175, "w": 87, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 9, "w": 87, "h": 53 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 87, "y": 119, "w": 86, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 7, "w": 86, "h": 55 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 499, "y": 61, "w": 85, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 85, "h": 57 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 412, "y": 1, "w": 83, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 83, "h": 60 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 1, "y": 1, "w": 81, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 81, "h": 62 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 82, "y": 1, "w": 82, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 1, "w": 82, "h": 61 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 246, "y": 1, "w": 83, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 83, "h": 60 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 246, "y": 61, "w": 84, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 84, "h": 58 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 414, "y": 61, "w": 85, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 85, "h": 57 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 499, "y": 118, "w": 86, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 6, "w": 86, "h": 56 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 259, "y": 119, "w": 87, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 8, "w": 87, "h": 54 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 87, "y": 174, "w": 88, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 9, "w": 88, "h": 53 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 88, "y": 227, "w": 89, "h": 51 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 11, "w": 89, "h": 51 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 266, "y": 228, "w": 90, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 12, "w": 90, "h": 50 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 358, "y": 278, "w": 91, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 13, "w": 91, "h": 49 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 1, "y": 328, "w": 92, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 15, "w": 92, "h": 47 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 93, "y": 375, "w": 93, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 16, "w": 93, "h": 46 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 186, "y": 375, "w": 93, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 16, "w": 93, "h": 46 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 542, "y": 375, "w": 92, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 16, "w": 92, "h": 46 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 1, "y": 375, "w": 92, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 15, "w": 92, "h": 47 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 449, "y": 327, "w": 92, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 14, "w": 92, "h": 48 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 449, "y": 278, "w": 91, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 13, "w": 91, "h": 49 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 88, "y": 278, "w": 90, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 12, "w": 90, "h": 50 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 177, "y": 227, "w": 89, "h": 51 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 11, "w": 89, "h": 51 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 346, "y": 175, "w": 87, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 9, "w": 87, "h": 53 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 87, "y": 119, "w": 86, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 7, "w": 86, "h": 55 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 499, "y": 61, "w": 85, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 85, "h": 57 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 412, "y": 1, "w": 83, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 83, "h": 60 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 1, "y": 1, "w": 81, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 81, "h": 62 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 82, "y": 1, "w": 82, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 1, "w": 82, "h": 61 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 246, "y": 1, "w": 83, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 83, "h": 60 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 246, "y": 61, "w": 84, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 84, "h": 58 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 414, "y": 61, "w": 85, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 85, "h": 57 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 499, "y": 118, "w": 86, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 6, "w": 86, "h": 56 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 259, "y": 119, "w": 87, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 8, "w": 87, "h": 54 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 87, "y": 174, "w": 88, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 9, "w": 88, "h": 53 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 88, "y": 227, "w": 89, "h": 51 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 11, "w": 89, "h": 51 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 266, "y": 228, "w": 90, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 12, "w": 90, "h": 50 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 358, "y": 278, "w": 91, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 13, "w": 91, "h": 49 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 1, "y": 328, "w": 92, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 15, "w": 92, "h": 47 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 93, "y": 375, "w": 93, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 16, "w": 93, "h": 46 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 186, "y": 375, "w": 93, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 16, "w": 93, "h": 46 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 542, "y": 375, "w": 92, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 16, "w": 92, "h": 46 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0088.png",
+    "frame": { "x": 1, "y": 375, "w": 92, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 15, "w": 92, "h": 47 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0089.png",
+    "frame": { "x": 449, "y": 327, "w": 92, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 14, "w": 92, "h": 48 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0090.png",
+    "frame": { "x": 449, "y": 278, "w": 91, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 13, "w": 91, "h": 49 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0091.png",
+    "frame": { "x": 88, "y": 278, "w": 90, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 12, "w": 90, "h": 50 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0092.png",
+    "frame": { "x": 177, "y": 227, "w": 89, "h": 51 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 11, "w": 89, "h": 51 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0093.png",
+    "frame": { "x": 346, "y": 175, "w": 87, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 9, "w": 87, "h": 53 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0094.png",
+    "frame": { "x": 87, "y": 119, "w": 86, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 7, "w": 86, "h": 55 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0095.png",
+    "frame": { "x": 499, "y": 61, "w": 85, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 85, "h": 57 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0096.png",
+    "frame": { "x": 412, "y": 1, "w": 83, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 83, "h": 60 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0097.png",
+    "frame": { "x": 1, "y": 1, "w": 81, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 81, "h": 62 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0098.png",
+    "frame": { "x": 164, "y": 1, "w": 82, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 1, "w": 82, "h": 61 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0099.png",
+    "frame": { "x": 495, "y": 1, "w": 83, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 83, "h": 60 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0100.png",
+    "frame": { "x": 330, "y": 61, "w": 84, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 84, "h": 58 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0101.png",
+    "frame": { "x": 414, "y": 118, "w": 85, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 85, "h": 57 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0102.png",
+    "frame": { "x": 1, "y": 119, "w": 86, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 6, "w": 86, "h": 56 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0103.png",
+    "frame": { "x": 259, "y": 173, "w": 87, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 8, "w": 87, "h": 54 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0104.png",
+    "frame": { "x": 499, "y": 174, "w": 88, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 9, "w": 88, "h": 53 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0105.png",
+    "frame": { "x": 433, "y": 227, "w": 89, "h": 51 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 11, "w": 89, "h": 51 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0106.png",
+    "frame": { "x": 178, "y": 278, "w": 90, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 12, "w": 90, "h": 50 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0107.png",
+    "frame": { "x": 540, "y": 278, "w": 91, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 13, "w": 91, "h": 49 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0108.png",
+    "frame": { "x": 93, "y": 328, "w": 92, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 15, "w": 92, "h": 47 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0109.png",
+    "frame": { "x": 93, "y": 375, "w": 93, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 16, "w": 93, "h": 46 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0110.png",
+    "frame": { "x": 449, "y": 375, "w": 93, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 16, "w": 93, "h": 46 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0111.png",
+    "frame": { "x": 279, "y": 376, "w": 92, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 16, "w": 92, "h": 46 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0112.png",
+    "frame": { "x": 185, "y": 328, "w": 92, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 15, "w": 92, "h": 47 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0113.png",
+    "frame": { "x": 541, "y": 327, "w": 92, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 14, "w": 92, "h": 48 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0114.png",
+    "frame": { "x": 358, "y": 327, "w": 91, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 13, "w": 91, "h": 49 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0115.png",
+    "frame": { "x": 268, "y": 278, "w": 90, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 12, "w": 90, "h": 50 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0116.png",
+    "frame": { "x": 522, "y": 227, "w": 89, "h": 51 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 11, "w": 89, "h": 51 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0117.png",
+    "frame": { "x": 1, "y": 227, "w": 87, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 9, "w": 87, "h": 53 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0118.png",
+    "frame": { "x": 173, "y": 119, "w": 86, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 7, "w": 86, "h": 55 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0119.png",
+    "frame": { "x": 82, "y": 62, "w": 85, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 85, "h": 57 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   },
+   {
+    "filename": "0120.png",
+    "frame": { "x": 329, "y": 1, "w": 83, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 83, "h": 60 },
+    "sourceSize": { "w": 93, "h": 62 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.13-x64",
+  "image": "2089.png",
+  "format": "I8",
+  "size": { "w": 635, "h": 423 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/shiny/2089.png b/public/images/pokemon/exp/back/shiny/2089.png
index db7e46bad80..8dcb36bcb09 100644
Binary files a/public/images/pokemon/exp/back/shiny/2089.png and b/public/images/pokemon/exp/back/shiny/2089.png differ
diff --git a/public/images/pokemon/exp/back/shiny/248-mega.json b/public/images/pokemon/exp/back/shiny/248-mega.json
index e6874d48784..67e88b6014f 100644
--- a/public/images/pokemon/exp/back/shiny/248-mega.json
+++ b/public/images/pokemon/exp/back/shiny/248-mega.json
@@ -1,272 +1,929 @@
-{
-	"textures": [
-		{
-			"image": "248-mega.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 292,
-				"h": 292
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 80,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 80,
-						"h": 74
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 80,
-						"h": 74
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 80,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 80,
-						"h": 74
-					},
-					"frame": {
-						"x": 0,
-						"y": 74,
-						"w": 80,
-						"h": 74
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 79,
-						"h": 74
-					},
-					"frame": {
-						"x": 0,
-						"y": 148,
-						"w": 79,
-						"h": 74
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 79,
-						"h": 74
-					},
-					"frame": {
-						"x": 79,
-						"y": 148,
-						"w": 79,
-						"h": 74
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 79,
-						"h": 73
-					},
-					"frame": {
-						"x": 80,
-						"y": 0,
-						"w": 79,
-						"h": 73
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 79,
-						"h": 73
-					},
-					"frame": {
-						"x": 80,
-						"y": 73,
-						"w": 79,
-						"h": 73
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 75,
-						"h": 73
-					},
-					"frame": {
-						"x": 158,
-						"y": 146,
-						"w": 75,
-						"h": 73
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 75,
-						"h": 73
-					},
-					"frame": {
-						"x": 158,
-						"y": 146,
-						"w": 75,
-						"h": 73
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 75,
-						"h": 73
-					},
-					"frame": {
-						"x": 158,
-						"y": 219,
-						"w": 75,
-						"h": 73
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 75,
-						"h": 73
-					},
-					"frame": {
-						"x": 158,
-						"y": 219,
-						"w": 75,
-						"h": 73
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 1,
-						"w": 73,
-						"h": 73
-					},
-					"frame": {
-						"x": 159,
-						"y": 0,
-						"w": 73,
-						"h": 73
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 1,
-						"w": 73,
-						"h": 73
-					},
-					"frame": {
-						"x": 159,
-						"y": 73,
-						"w": 73,
-						"h": 73
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:3dba844e4799c099eae9413ec740d703:7a7dc95ebe53fcea6738011b92bff44e:90df97eb431b7162252516cb937a0b9e$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 0, "y": 101, "w": 82, "h": 92 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 82, "h": 92 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 430, "y": 101, "w": 82, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 82, "h": 91 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 0, "y": 195, "w": 84, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 84, "h": 88 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 173, "y": 287, "w": 85, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 85, "h": 85 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 0, "y": 373, "w": 85, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 10, "w": 85, "h": 80 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 341, "y": 455, "w": 85, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 12, "w": 85, "h": 76 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 84, "y": 534, "w": 84, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 12, "w": 84, "h": 76 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 170, "y": 534, "w": 83, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 12, "w": 83, "h": 76 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 170, "y": 456, "w": 83, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 12, "w": 83, "h": 76 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 341, "y": 533, "w": 84, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 12, "w": 84, "h": 76 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 84, "y": 456, "w": 84, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 12, "w": 84, "h": 76 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 255, "y": 455, "w": 84, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 84, "h": 77 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 513, "y": 455, "w": 83, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 83, "h": 77 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 428, "y": 455, "w": 83, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 83, "h": 77 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 260, "y": 373, "w": 83, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 9, "w": 83, "h": 80 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 516, "y": 287, "w": 83, "h": 83 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 9, "w": 83, "h": 83 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 347, "y": 287, "w": 83, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 83, "h": 85 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 256, "y": 196, "w": 83, "h": 89 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 83, "h": 89 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 342, "y": 192, "w": 82, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 6, "w": 82, "h": 91 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 0, "y": 101, "w": 82, "h": 92 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 82, "h": 92 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 430, "y": 101, "w": 82, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 82, "h": 91 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 0, "y": 195, "w": 84, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 84, "h": 88 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 173, "y": 287, "w": 85, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 85, "h": 85 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 0, "y": 373, "w": 85, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 10, "w": 85, "h": 80 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 341, "y": 455, "w": 85, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 12, "w": 85, "h": 76 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 84, "y": 534, "w": 84, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 12, "w": 84, "h": 76 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 170, "y": 534, "w": 83, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 12, "w": 83, "h": 76 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 170, "y": 456, "w": 83, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 12, "w": 83, "h": 76 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 341, "y": 533, "w": 84, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 12, "w": 84, "h": 76 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 84, "y": 456, "w": 84, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 12, "w": 84, "h": 76 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 255, "y": 455, "w": 84, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 84, "h": 77 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 513, "y": 455, "w": 83, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 83, "h": 77 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 428, "y": 455, "w": 83, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 83, "h": 77 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 260, "y": 373, "w": 83, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 9, "w": 83, "h": 80 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 516, "y": 287, "w": 83, "h": 83 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 9, "w": 83, "h": 83 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 347, "y": 287, "w": 83, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 83, "h": 85 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 256, "y": 196, "w": 83, "h": 89 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 83, "h": 89 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 342, "y": 192, "w": 82, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 6, "w": 82, "h": 91 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 0, "y": 101, "w": 82, "h": 92 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 82, "h": 92 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 430, "y": 101, "w": 82, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 82, "h": 91 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 0, "y": 195, "w": 84, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 84, "h": 88 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 173, "y": 287, "w": 85, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 85, "h": 85 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 0, "y": 373, "w": 85, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 10, "w": 85, "h": 80 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 341, "y": 455, "w": 85, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 12, "w": 85, "h": 76 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 84, "y": 534, "w": 84, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 12, "w": 84, "h": 76 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 170, "y": 534, "w": 83, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 12, "w": 83, "h": 76 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 170, "y": 456, "w": 83, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 12, "w": 83, "h": 76 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 341, "y": 533, "w": 84, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 12, "w": 84, "h": 76 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 84, "y": 456, "w": 84, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 12, "w": 84, "h": 76 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 255, "y": 455, "w": 84, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 84, "h": 77 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 513, "y": 455, "w": 83, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 83, "h": 77 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 428, "y": 455, "w": 83, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 83, "h": 77 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 260, "y": 373, "w": 83, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 9, "w": 83, "h": 80 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 516, "y": 287, "w": 83, "h": 83 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 9, "w": 83, "h": 83 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 347, "y": 287, "w": 83, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 83, "h": 85 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 256, "y": 196, "w": 83, "h": 89 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 83, "h": 89 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 342, "y": 192, "w": 82, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 6, "w": 82, "h": 91 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 0, "y": 101, "w": 82, "h": 92 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 82, "h": 92 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 430, "y": 101, "w": 82, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 82, "h": 91 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 0, "y": 195, "w": 84, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 84, "h": 88 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 173, "y": 287, "w": 85, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 85, "h": 85 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 0, "y": 373, "w": 85, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 10, "w": 85, "h": 80 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 341, "y": 455, "w": 85, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 12, "w": 85, "h": 76 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 84, "y": 534, "w": 84, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 12, "w": 84, "h": 76 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 170, "y": 534, "w": 83, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 12, "w": 83, "h": 76 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 170, "y": 456, "w": 83, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 12, "w": 83, "h": 76 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 341, "y": 533, "w": 84, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 12, "w": 84, "h": 76 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 84, "y": 456, "w": 84, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 12, "w": 84, "h": 76 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 255, "y": 455, "w": 84, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 84, "h": 77 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 513, "y": 455, "w": 83, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 83, "h": 77 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 428, "y": 455, "w": 83, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 83, "h": 77 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 260, "y": 373, "w": 83, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 9, "w": 83, "h": 80 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 516, "y": 287, "w": 83, "h": 83 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 9, "w": 83, "h": 83 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 347, "y": 287, "w": 83, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 83, "h": 85 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 256, "y": 196, "w": 83, "h": 89 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 83, "h": 89 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 342, "y": 192, "w": 82, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 6, "w": 82, "h": 91 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 0, "y": 101, "w": 82, "h": 92 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 82, "h": 92 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 426, "y": 194, "w": 82, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 82, "h": 91 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 510, "y": 196, "w": 83, "h": 89 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 5, "w": 83, "h": 89 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 0, "y": 285, "w": 83, "h": 86 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 83, "h": 86 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 432, "y": 287, "w": 82, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 82, "h": 85 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 85, "y": 288, "w": 82, "h": 83 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 82, "h": 83 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 87, "y": 373, "w": 82, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 82, "h": 81 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 345, "y": 374, "w": 82, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 9, "w": 82, "h": 79 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 429, "y": 374, "w": 82, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 9, "w": 82, "h": 79 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 0, "y": 455, "w": 82, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 9, "w": 82, "h": 79 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 171, "y": 374, "w": 82, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 8, "w": 82, "h": 80 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0088.png",
+    "frame": { "x": 516, "y": 372, "w": 84, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 84, "h": 81 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0089.png",
+    "frame": { "x": 260, "y": 287, "w": 85, "h": 84 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 85, "h": 84 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0090.png",
+    "frame": { "x": 86, "y": 200, "w": 85, "h": 86 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 85, "h": 86 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0091.png",
+    "frame": { "x": 342, "y": 101, "w": 86, "h": 89 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 86, "h": 89 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0092.png",
+    "frame": { "x": 256, "y": 100, "w": 84, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 84, "h": 94 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0093.png",
+    "frame": { "x": 86, "y": 100, "w": 83, "h": 98 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 83, "h": 98 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0094.png",
+    "frame": { "x": 514, "y": 0, "w": 83, "h": 98 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 83, "h": 98 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0095.png",
+    "frame": { "x": 429, "y": 0, "w": 83, "h": 99 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 83, "h": 99 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0096.png",
+    "frame": { "x": 344, "y": 0, "w": 83, "h": 99 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 83, "h": 99 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0097.png",
+    "frame": { "x": 0, "y": 0, "w": 84, "h": 99 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 84, "h": 99 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0098.png",
+    "frame": { "x": 258, "y": 0, "w": 84, "h": 98 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 84, "h": 98 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0099.png",
+    "frame": { "x": 172, "y": 0, "w": 84, "h": 98 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 84, "h": 98 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0100.png",
+    "frame": { "x": 86, "y": 0, "w": 84, "h": 98 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 84, "h": 98 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0101.png",
+    "frame": { "x": 171, "y": 100, "w": 83, "h": 97 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 83, "h": 97 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   },
+   {
+    "filename": "0102.png",
+    "frame": { "x": 514, "y": 100, "w": 83, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 83, "h": 94 },
+    "sourceSize": { "w": 88, "h": 101 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "248-mega.png",
+  "format": "I8",
+  "size": { "w": 600, "h": 610 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/shiny/248-mega.png b/public/images/pokemon/exp/back/shiny/248-mega.png
index 10b8bfb05f3..bb4a62d441f 100644
Binary files a/public/images/pokemon/exp/back/shiny/248-mega.png and b/public/images/pokemon/exp/back/shiny/248-mega.png differ
diff --git a/public/images/pokemon/exp/back/shiny/362-mega.json b/public/images/pokemon/exp/back/shiny/362-mega.json
index 2c42a6db6f1..02354ddad93 100644
--- a/public/images/pokemon/exp/back/shiny/362-mega.json
+++ b/public/images/pokemon/exp/back/shiny/362-mega.json
@@ -1,272 +1,551 @@
-{
-	"textures": [
-		{
-			"image": "362-mega.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 140,
-				"h": 140
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 61,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 61,
-						"h": 71
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 61,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 61,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 61,
-						"h": 71
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 61,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 61,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 61,
-						"h": 71
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 61,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 61,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 61,
-						"h": 71
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 61,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 61,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 61,
-						"h": 70
-					},
-					"frame": {
-						"x": 61,
-						"y": 0,
-						"w": 61,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 61,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 61,
-						"h": 70
-					},
-					"frame": {
-						"x": 61,
-						"y": 0,
-						"w": 61,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 61,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 61,
-						"h": 70
-					},
-					"frame": {
-						"x": 61,
-						"y": 0,
-						"w": 61,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 61,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 61,
-						"h": 70
-					},
-					"frame": {
-						"x": 61,
-						"y": 0,
-						"w": 61,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 61,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 61,
-						"h": 70
-					},
-					"frame": {
-						"x": 61,
-						"y": 70,
-						"w": 61,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 61,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 61,
-						"h": 70
-					},
-					"frame": {
-						"x": 61,
-						"y": 70,
-						"w": 61,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 61,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 61,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 71,
-						"w": 61,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 61,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 61,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 71,
-						"w": 61,
-						"h": 69
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:25f7f8085d78ddcdd4aadd2f3591c111:e79d613f15426593f8c7367b1afc6c04:8a7271a5423838c97ddeb1e6dc343255$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 67, "y": 0, "w": 61, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 61, "h": 64 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 67, "y": 0, "w": 61, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 9, "w": 61, "h": 64 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 67, "y": 0, "w": 61, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 61, "h": 64 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 67, "y": 0, "w": 61, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 14, "w": 61, "h": 64 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 67, "y": 0, "w": 61, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 16, "w": 61, "h": 64 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 67, "y": 0, "w": 61, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 18, "w": 61, "h": 64 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 67, "y": 0, "w": 61, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 15, "w": 61, "h": 64 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 67, "y": 0, "w": 61, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 13, "w": 61, "h": 64 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 67, "y": 0, "w": 61, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 10, "w": 61, "h": 64 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 67, "y": 0, "w": 61, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 61, "h": 64 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 67, "y": 0, "w": 61, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 5, "w": 61, "h": 64 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 67, "y": 0, "w": 61, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 61, "h": 64 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 67, "y": 0, "w": 61, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 61, "h": 64 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 67, "y": 0, "w": 61, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 61, "h": 64 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 67, "y": 0, "w": 61, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 5, "w": 61, "h": 64 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 67, "y": 0, "w": 61, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 61, "h": 64 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 67, "y": 0, "w": 61, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 9, "w": 61, "h": 64 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 67, "y": 0, "w": 61, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 61, "h": 64 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 67, "y": 0, "w": 61, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 14, "w": 61, "h": 64 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 67, "y": 0, "w": 61, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 16, "w": 61, "h": 64 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 67, "y": 0, "w": 61, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 18, "w": 61, "h": 64 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 67, "y": 0, "w": 61, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 15, "w": 61, "h": 64 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 67, "y": 0, "w": 61, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 13, "w": 61, "h": 64 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 67, "y": 0, "w": 61, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 10, "w": 61, "h": 64 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 67, "y": 0, "w": 61, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 61, "h": 64 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 67, "y": 0, "w": 61, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 5, "w": 61, "h": 64 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 67, "y": 0, "w": 61, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 61, "h": 64 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 67, "y": 0, "w": 61, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 61, "h": 64 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 67, "y": 0, "w": 61, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 61, "h": 64 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 67, "y": 0, "w": 61, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 5, "w": 61, "h": 64 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 67, "y": 0, "w": 61, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 61, "h": 64 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 67, "y": 0, "w": 61, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 9, "w": 61, "h": 64 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 67, "y": 0, "w": 61, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 61, "h": 64 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 67, "y": 0, "w": 61, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 14, "w": 61, "h": 64 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 67, "y": 0, "w": 61, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 16, "w": 61, "h": 64 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 67, "y": 0, "w": 61, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 18, "w": 61, "h": 64 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 67, "y": 0, "w": 61, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 15, "w": 61, "h": 64 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 67, "y": 0, "w": 61, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 13, "w": 61, "h": 64 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 67, "y": 0, "w": 61, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 10, "w": 61, "h": 64 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 67, "y": 0, "w": 61, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 61, "h": 64 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 67, "y": 0, "w": 61, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 5, "w": 61, "h": 64 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 67, "y": 0, "w": 61, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 61, "h": 64 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 67, "y": 0, "w": 61, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 61, "h": 64 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 67, "y": 0, "w": 61, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 61, "h": 64 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 67, "y": 0, "w": 61, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 5, "w": 61, "h": 64 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 67, "y": 0, "w": 61, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 61, "h": 64 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 0, "y": 0, "w": 65, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 65, "h": 68 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 67, "y": 66, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 58, "h": 66 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 0, "y": 0, "w": 65, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 65, "h": 68 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 67, "y": 66, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 58, "h": 66 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 0, "y": 0, "w": 65, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 65, "h": 68 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 67, "y": 66, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 58, "h": 66 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 0, "y": 0, "w": 65, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 65, "h": 68 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 67, "y": 66, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 58, "h": 66 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 0, "y": 0, "w": 65, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 65, "h": 68 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 67, "y": 66, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 58, "h": 66 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 0, "y": 0, "w": 65, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 65, "h": 68 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 67, "y": 66, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 58, "h": 66 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 67, "y": 0, "w": 61, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 61, "h": 64 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 67, "y": 0, "w": 61, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 61, "h": 64 },
+    "sourceSize": { "w": 65, "h": 82 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "362-mega.png",
+  "format": "I8",
+  "size": { "w": 128, "h": 132 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/shiny/362-mega.png b/public/images/pokemon/exp/back/shiny/362-mega.png
index 32f3e5658a3..75d5b5075b9 100644
Binary files a/public/images/pokemon/exp/back/shiny/362-mega.png and b/public/images/pokemon/exp/back/shiny/362-mega.png differ
diff --git a/public/images/pokemon/exp/back/shiny/487-origin.json b/public/images/pokemon/exp/back/shiny/487-origin.json
deleted file mode 100644
index 8da21992405..00000000000
--- a/public/images/pokemon/exp/back/shiny/487-origin.json
+++ /dev/null
@@ -1,293 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "487-origin.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 326,
-				"h": 326
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 101,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 2,
-						"w": 95,
-						"h": 84
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 95,
-						"h": 84
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 101,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 7,
-						"w": 97,
-						"h": 79
-					},
-					"frame": {
-						"x": 0,
-						"y": 84,
-						"w": 97,
-						"h": 79
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 101,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 7,
-						"w": 97,
-						"h": 78
-					},
-					"frame": {
-						"x": 95,
-						"y": 0,
-						"w": 97,
-						"h": 78
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 101,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 94,
-						"h": 84
-					},
-					"frame": {
-						"x": 97,
-						"y": 78,
-						"w": 94,
-						"h": 84
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 101,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 6,
-						"w": 95,
-						"h": 81
-					},
-					"frame": {
-						"x": 97,
-						"y": 162,
-						"w": 95,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 101,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 94,
-						"h": 84
-					},
-					"frame": {
-						"x": 191,
-						"y": 78,
-						"w": 94,
-						"h": 84
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 101,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 94,
-						"h": 77
-					},
-					"frame": {
-						"x": 192,
-						"y": 0,
-						"w": 94,
-						"h": 77
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 101,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 6,
-						"w": 94,
-						"h": 77
-					},
-					"frame": {
-						"x": 192,
-						"y": 0,
-						"w": 94,
-						"h": 77
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 101,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 0,
-						"w": 94,
-						"h": 83
-					},
-					"frame": {
-						"x": 0,
-						"y": 163,
-						"w": 94,
-						"h": 83
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 101,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 92,
-						"h": 83
-					},
-					"frame": {
-						"x": 192,
-						"y": 162,
-						"w": 92,
-						"h": 83
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 101,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 92,
-						"h": 82
-					},
-					"frame": {
-						"x": 94,
-						"y": 243,
-						"w": 92,
-						"h": 82
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 101,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 3,
-						"w": 90,
-						"h": 78
-					},
-					"frame": {
-						"x": 0,
-						"y": 246,
-						"w": 90,
-						"h": 78
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 101,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 1,
-						"w": 91,
-						"h": 81
-					},
-					"frame": {
-						"x": 186,
-						"y": 245,
-						"w": 91,
-						"h": 81
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:47e13c1a7a77825c7cf7e9fb039c2587:68949a6c55126e61a0a82829cd6ac5a8:5d19509f6557fe13b0b6311434ba7e2d$"
-	}
-}
diff --git a/public/images/pokemon/exp/back/shiny/487-origin.png b/public/images/pokemon/exp/back/shiny/487-origin.png
deleted file mode 100644
index 95bee551e5d..00000000000
Binary files a/public/images/pokemon/exp/back/shiny/487-origin.png and /dev/null differ
diff --git a/public/images/pokemon/exp/back/shiny/569-gigantamax.json b/public/images/pokemon/exp/back/shiny/569-gigantamax.json
new file mode 100644
index 00000000000..b266f5eb799
--- /dev/null
+++ b/public/images/pokemon/exp/back/shiny/569-gigantamax.json
@@ -0,0 +1,1478 @@
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 194, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 194, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 194, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 194, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 194, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 194, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 194, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 290, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 290, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 192, "y": 187, "w": 97, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 97, "h": 94 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 192, "y": 187, "w": 97, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 97, "h": 94 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 192, "y": 187, "w": 97, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 97, "h": 94 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 192, "y": 187, "w": 97, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 97, "h": 94 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 209, "y": 0, "w": 102, "h": 92 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 102, "h": 92 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 209, "y": 0, "w": 102, "h": 92 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 102, "h": 92 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 105, "y": 0, "w": 104, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 104, "h": 91 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 105, "y": 0, "w": 104, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 104, "h": 91 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 105, "y": 0, "w": 104, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 104, "h": 91 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 105, "y": 0, "w": 104, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 104, "h": 91 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 0, "y": 0, "w": 105, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 105, "h": 91 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 0, "y": 0, "w": 105, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 105, "h": 91 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 0, "y": 0, "w": 105, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 105, "h": 91 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 105, "y": 0, "w": 104, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 104, "h": 91 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 105, "y": 0, "w": 104, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 104, "h": 91 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 105, "y": 0, "w": 104, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 104, "h": 91 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 105, "y": 0, "w": 104, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 104, "h": 91 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 209, "y": 0, "w": 102, "h": 92 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 102, "h": 92 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 209, "y": 0, "w": 102, "h": 92 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 102, "h": 92 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 209, "y": 0, "w": 102, "h": 92 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 102, "h": 92 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 192, "y": 187, "w": 97, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 97, "h": 94 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 192, "y": 187, "w": 97, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 97, "h": 94 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 192, "y": 187, "w": 97, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 97, "h": 94 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 290, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 290, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 194, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 194, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 194, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 194, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 194, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 194, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 194, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 194, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 290, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 290, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 290, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 192, "y": 187, "w": 97, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 97, "h": 94 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 192, "y": 187, "w": 97, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 97, "h": 94 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 192, "y": 187, "w": 97, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 97, "h": 94 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 209, "y": 0, "w": 102, "h": 92 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 102, "h": 92 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 209, "y": 0, "w": 102, "h": 92 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 102, "h": 92 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 209, "y": 0, "w": 102, "h": 92 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 102, "h": 92 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 105, "y": 0, "w": 104, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 104, "h": 91 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 105, "y": 0, "w": 104, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 104, "h": 91 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 105, "y": 0, "w": 104, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 104, "h": 91 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 0, "y": 0, "w": 105, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 105, "h": 91 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 0, "y": 0, "w": 105, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 105, "h": 91 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 0, "y": 0, "w": 105, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 105, "h": 91 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 105, "y": 0, "w": 104, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 104, "h": 91 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 105, "y": 0, "w": 104, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 104, "h": 91 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 105, "y": 0, "w": 104, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 104, "h": 91 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 311, "y": 0, "w": 102, "h": 92 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 102, "h": 92 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 311, "y": 0, "w": 102, "h": 92 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 102, "h": 92 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 311, "y": 0, "w": 102, "h": 92 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 102, "h": 92 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 192, "y": 187, "w": 97, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 97, "h": 94 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 192, "y": 187, "w": 97, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 97, "h": 94 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 192, "y": 187, "w": 97, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 97, "h": 94 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 290, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 290, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 290, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 194, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 194, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 194, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 0, "y": 186, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 0, "y": 186, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 0, "y": 186, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 96, "y": 186, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 96, "y": 186, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 0, "y": 91, "w": 97, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 97, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 0, "y": 91, "w": 97, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 97, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 0, "y": 91, "w": 97, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 97, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 97, "y": 91, "w": 97, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 97, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 97, "y": 91, "w": 97, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 97, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 97, "y": 91, "w": 97, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 97, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 97, "y": 91, "w": 97, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 97, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 97, "y": 91, "w": 97, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 97, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 97, "y": 91, "w": 97, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 97, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 0, "y": 91, "w": 97, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 97, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0088.png",
+    "frame": { "x": 0, "y": 91, "w": 97, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 97, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0089.png",
+    "frame": { "x": 0, "y": 91, "w": 97, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 97, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0090.png",
+    "frame": { "x": 0, "y": 91, "w": 97, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 97, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0091.png",
+    "frame": { "x": 96, "y": 186, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0092.png",
+    "frame": { "x": 96, "y": 186, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0093.png",
+    "frame": { "x": 96, "y": 186, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0094.png",
+    "frame": { "x": 0, "y": 186, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0095.png",
+    "frame": { "x": 194, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0096.png",
+    "frame": { "x": 194, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0097.png",
+    "frame": { "x": 194, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0098.png",
+    "frame": { "x": 194, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0099.png",
+    "frame": { "x": 194, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0100.png",
+    "frame": { "x": 194, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0101.png",
+    "frame": { "x": 194, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0102.png",
+    "frame": { "x": 194, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0103.png",
+    "frame": { "x": 290, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0104.png",
+    "frame": { "x": 290, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0105.png",
+    "frame": { "x": 290, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0106.png",
+    "frame": { "x": 192, "y": 187, "w": 97, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 97, "h": 94 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0107.png",
+    "frame": { "x": 192, "y": 187, "w": 97, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 97, "h": 94 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0108.png",
+    "frame": { "x": 192, "y": 187, "w": 97, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 97, "h": 94 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0109.png",
+    "frame": { "x": 209, "y": 0, "w": 102, "h": 92 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 102, "h": 92 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0110.png",
+    "frame": { "x": 209, "y": 0, "w": 102, "h": 92 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 102, "h": 92 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0111.png",
+    "frame": { "x": 209, "y": 0, "w": 102, "h": 92 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 102, "h": 92 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0112.png",
+    "frame": { "x": 105, "y": 0, "w": 104, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 104, "h": 91 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0113.png",
+    "frame": { "x": 105, "y": 0, "w": 104, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 104, "h": 91 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0114.png",
+    "frame": { "x": 105, "y": 0, "w": 104, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 104, "h": 91 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0115.png",
+    "frame": { "x": 0, "y": 0, "w": 105, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 105, "h": 91 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0116.png",
+    "frame": { "x": 0, "y": 0, "w": 105, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 105, "h": 91 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0117.png",
+    "frame": { "x": 0, "y": 0, "w": 105, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 105, "h": 91 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0118.png",
+    "frame": { "x": 105, "y": 0, "w": 104, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 104, "h": 91 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0119.png",
+    "frame": { "x": 105, "y": 0, "w": 104, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 104, "h": 91 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0120.png",
+    "frame": { "x": 105, "y": 0, "w": 104, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 104, "h": 91 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0121.png",
+    "frame": { "x": 209, "y": 0, "w": 102, "h": 92 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 102, "h": 92 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0122.png",
+    "frame": { "x": 209, "y": 0, "w": 102, "h": 92 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 102, "h": 92 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0123.png",
+    "frame": { "x": 209, "y": 0, "w": 102, "h": 92 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 102, "h": 92 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0124.png",
+    "frame": { "x": 192, "y": 187, "w": 97, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 97, "h": 94 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0125.png",
+    "frame": { "x": 192, "y": 187, "w": 97, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 97, "h": 94 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0126.png",
+    "frame": { "x": 290, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0127.png",
+    "frame": { "x": 290, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0128.png",
+    "frame": { "x": 290, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0129.png",
+    "frame": { "x": 290, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0130.png",
+    "frame": { "x": 194, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0131.png",
+    "frame": { "x": 194, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0132.png",
+    "frame": { "x": 194, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0133.png",
+    "frame": { "x": 194, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0134.png",
+    "frame": { "x": 194, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0135.png",
+    "frame": { "x": 194, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0136.png",
+    "frame": { "x": 194, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0137.png",
+    "frame": { "x": 194, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0138.png",
+    "frame": { "x": 290, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0139.png",
+    "frame": { "x": 290, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0140.png",
+    "frame": { "x": 192, "y": 187, "w": 97, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 97, "h": 94 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0141.png",
+    "frame": { "x": 192, "y": 187, "w": 97, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 97, "h": 94 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0142.png",
+    "frame": { "x": 192, "y": 187, "w": 97, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 97, "h": 94 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0143.png",
+    "frame": { "x": 209, "y": 0, "w": 102, "h": 92 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 102, "h": 92 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0144.png",
+    "frame": { "x": 209, "y": 0, "w": 102, "h": 92 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 102, "h": 92 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0145.png",
+    "frame": { "x": 209, "y": 0, "w": 102, "h": 92 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 102, "h": 92 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0146.png",
+    "frame": { "x": 105, "y": 0, "w": 104, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 104, "h": 91 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0147.png",
+    "frame": { "x": 105, "y": 0, "w": 104, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 104, "h": 91 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0148.png",
+    "frame": { "x": 105, "y": 0, "w": 104, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 104, "h": 91 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0149.png",
+    "frame": { "x": 105, "y": 0, "w": 104, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 104, "h": 91 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0150.png",
+    "frame": { "x": 0, "y": 0, "w": 105, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 105, "h": 91 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0151.png",
+    "frame": { "x": 0, "y": 0, "w": 105, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 105, "h": 91 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0152.png",
+    "frame": { "x": 105, "y": 0, "w": 104, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 104, "h": 91 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0153.png",
+    "frame": { "x": 105, "y": 0, "w": 104, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 104, "h": 91 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0154.png",
+    "frame": { "x": 105, "y": 0, "w": 104, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 104, "h": 91 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0155.png",
+    "frame": { "x": 209, "y": 0, "w": 102, "h": 92 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 102, "h": 92 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0156.png",
+    "frame": { "x": 209, "y": 0, "w": 102, "h": 92 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 102, "h": 92 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0157.png",
+    "frame": { "x": 209, "y": 0, "w": 102, "h": 92 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 102, "h": 92 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0158.png",
+    "frame": { "x": 192, "y": 187, "w": 97, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 97, "h": 94 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0159.png",
+    "frame": { "x": 192, "y": 187, "w": 97, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 97, "h": 94 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0160.png",
+    "frame": { "x": 192, "y": 187, "w": 97, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 97, "h": 94 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0161.png",
+    "frame": { "x": 192, "y": 187, "w": 97, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 97, "h": 94 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0162.png",
+    "frame": { "x": 290, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   },
+   {
+    "filename": "0163.png",
+    "frame": { "x": 290, "y": 92, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 95 },
+    "sourceSize": { "w": 105, "h": 95 },
+    "duration": 60
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.13-x64",
+  "image": "569-gigantamax.png",
+  "format": "I8",
+  "size": { "w": 413, "h": 281 },
+  "scale": "1"
+ }
+}
diff --git a/public/images/pokemon/exp/back/shiny/569-gigantamax.png b/public/images/pokemon/exp/back/shiny/569-gigantamax.png
new file mode 100644
index 00000000000..2322fc2321e
Binary files /dev/null and b/public/images/pokemon/exp/back/shiny/569-gigantamax.png differ
diff --git a/public/images/pokemon/exp/back/shiny/651.json b/public/images/pokemon/exp/back/shiny/651.json
index 4e96154d67b..04a791f539f 100644
--- a/public/images/pokemon/exp/back/shiny/651.json
+++ b/public/images/pokemon/exp/back/shiny/651.json
@@ -1,104 +1,713 @@
-{
-	"textures": [
-		{
-			"image": "651.png", 
-			"format": "RGBA8888", 
-			"size": {
-				"w": 106, 
-				"h": 106
-			}, 
-			"scale": 1, 
-			"frames": [
-				{
-					"filename": "0002.png", 
-					"rotated": false, 
-					"trimmed": false, 
-					"sourceSize": {
-						"w": 53, 
-						"h": 50
-					}, 
-					"spriteSourceSize": {
-						"x": 0, 
-						"y": 0, 
-						"w": 53, 
-						"h": 50
-					}, 
-					"frame": {
-						"x": 0, 
-						"y": 0, 
-						"w": 53, 
-						"h": 50
-					}
-				}, 
-				{
-					"filename": "0004.png", 
-					"rotated": false, 
-					"trimmed": false, 
-					"sourceSize": {
-						"w": 53, 
-						"h": 50
-					}, 
-					"spriteSourceSize": {
-						"x": 0, 
-						"y": 0, 
-						"w": 53, 
-						"h": 50
-					}, 
-					"frame": {
-						"x": 0, 
-						"y": 0, 
-						"w": 53, 
-						"h": 50
-					}
-				}, 
-				{
-					"filename": "0003.png", 
-					"rotated": false, 
-					"trimmed": false, 
-					"sourceSize": {
-						"w": 53, 
-						"h": 50
-					}, 
-					"spriteSourceSize": {
-						"x": 0, 
-						"y": 0, 
-						"w": 53, 
-						"h": 50
-					}, 
-					"frame": {
-						"x": 53, 
-						"y": 0, 
-						"w": 53, 
-						"h": 50
-					}
-				}, 
-				{
-					"filename": "0001.png", 
-					"rotated": false, 
-					"trimmed": true, 
-					"sourceSize": {
-						"w": 53, 
-						"h": 50
-					}, 
-					"spriteSourceSize": {
-						"x": 0, 
-						"y": 1, 
-						"w": 53, 
-						"h": 49
-					}, 
-					"frame": {
-						"x": 0, 
-						"y": 50, 
-						"w": 53, 
-						"h": 49
-					}
-				}
-			]
-		}
-	], 
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker", 
-		"version": "3.0", 
-		"smartupdate": "$TexturePacker:SmartUpdate:3f6a8875e3bdc40a01569005eeaa99a4:fe6f34e605d5c3077475cfd03942ff77:a93e5fa02e10bf11e3ed8bf6571835ca$"
-	}
-}
\ No newline at end of file
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 167, "y": 0, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 55, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 222, "y": 0, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 55, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 277, "y": 0, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 55, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 56, "y": 100, "w": 54, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 54, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 331, "y": 150, "w": 53, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 53, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 162, "y": 247, "w": 52, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 52, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 219, "y": 198, "w": 53, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 53, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 272, "y": 198, "w": 53, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 53, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 110, "y": 100, "w": 54, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 54, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 164, "y": 100, "w": 54, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 54, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 218, "y": 100, "w": 54, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 54, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 55, "y": 50, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 55, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 110, "y": 50, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 55, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 55, "y": 0, "w": 56, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 56, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 165, "y": 50, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 55, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 0, "y": 0, "w": 55, "h": 51 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 55, "h": 51 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 220, "y": 50, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 55, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 111, "y": 0, "w": 56, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 56, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 275, "y": 50, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 55, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 330, "y": 50, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 55, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 167, "y": 0, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 55, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 222, "y": 0, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 55, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 277, "y": 0, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 55, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 56, "y": 100, "w": 54, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 54, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 331, "y": 150, "w": 53, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 53, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 162, "y": 247, "w": 52, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 52, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 219, "y": 198, "w": 53, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 53, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 272, "y": 198, "w": 53, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 53, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 326, "y": 100, "w": 54, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 54, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 164, "y": 100, "w": 54, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 54, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 218, "y": 100, "w": 54, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 54, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 55, "y": 50, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 55, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 110, "y": 50, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 55, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 55, "y": 0, "w": 56, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 56, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 165, "y": 50, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 55, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 0, "y": 0, "w": 55, "h": 51 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 55, "h": 51 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 220, "y": 50, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 55, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 111, "y": 0, "w": 56, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 56, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 275, "y": 50, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 55, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 330, "y": 50, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 55, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 167, "y": 0, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 55, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 222, "y": 0, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 55, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 277, "y": 0, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 55, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 56, "y": 100, "w": 54, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 54, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 331, "y": 150, "w": 53, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 53, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 162, "y": 247, "w": 52, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 52, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 219, "y": 198, "w": 53, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 53, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 272, "y": 198, "w": 53, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 53, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 110, "y": 100, "w": 54, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 54, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 164, "y": 100, "w": 54, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 54, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 218, "y": 100, "w": 54, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 54, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 55, "y": 50, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 55, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 110, "y": 50, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 55, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 55, "y": 0, "w": 56, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 56, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 165, "y": 50, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 55, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 0, "y": 0, "w": 55, "h": 51 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 55, "h": 51 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 220, "y": 50, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 55, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 111, "y": 0, "w": 56, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 56, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 275, "y": 50, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 55, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 330, "y": 50, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 55, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 272, "y": 100, "w": 54, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 54, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 0, "y": 100, "w": 56, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 5, "w": 56, "h": 49 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 0, "y": 51, "w": 55, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 55, "h": 49 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 219, "y": 150, "w": 56, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 6, "w": 56, "h": 48 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 0, "y": 248, "w": 55, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 7, "w": 55, "h": 47 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 275, "y": 150, "w": 56, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 56, "h": 48 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 325, "y": 200, "w": 56, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 7, "w": 56, "h": 47 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 54, "y": 150, "w": 55, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 55, "h": 49 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 332, "y": 0, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 55, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 0, "y": 199, "w": 54, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 54, "h": 49 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 55, "y": 248, "w": 53, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 53, "h": 48 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 325, "y": 247, "w": 53, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 53, "h": 49 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 54, "y": 199, "w": 54, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 54, "h": 49 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 0, "y": 149, "w": 54, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 54, "h": 50 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 108, "y": 199, "w": 54, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 5, "w": 54, "h": 49 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 162, "y": 199, "w": 55, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 6, "w": 55, "h": 48 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 109, "y": 150, "w": 55, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 5, "w": 55, "h": 49 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 164, "y": 150, "w": 55, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 5, "w": 55, "h": 49 },
+    "sourceSize": { "w": 59, "h": 54 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.11-x64",
+  "image": "651.png",
+  "format": "I8",
+  "size": { "w": 387, "h": 297 },
+  "scale": "1"
+ }
+}
diff --git a/public/images/pokemon/exp/back/shiny/651.png b/public/images/pokemon/exp/back/shiny/651.png
index 99fa14d5df9..b607fa69a15 100644
Binary files a/public/images/pokemon/exp/back/shiny/651.png and b/public/images/pokemon/exp/back/shiny/651.png differ
diff --git a/public/images/pokemon/exp/back/shiny/653.json b/public/images/pokemon/exp/back/shiny/653.json
index a5d273cff64..c5fb4a5db61 100644
--- a/public/images/pokemon/exp/back/shiny/653.json
+++ b/public/images/pokemon/exp/back/shiny/653.json
@@ -1,2204 +1,947 @@
-{
-	"textures": [
-		{
-			"image": "653.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 173,
-				"h": 173
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0083.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 45,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 45,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0084.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 45,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 45,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0099.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 45,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 45,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0100.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 45,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 45,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0085.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 45,
-						"h": 44
-					},
-					"frame": {
-						"x": 45,
-						"y": 0,
-						"w": 45,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0086.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 45,
-						"h": 44
-					},
-					"frame": {
-						"x": 45,
-						"y": 0,
-						"w": 45,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0087.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 45,
-						"h": 44
-					},
-					"frame": {
-						"x": 45,
-						"y": 0,
-						"w": 45,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0090.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 45,
-						"h": 44
-					},
-					"frame": {
-						"x": 45,
-						"y": 0,
-						"w": 45,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0091.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 45,
-						"h": 44
-					},
-					"frame": {
-						"x": 45,
-						"y": 0,
-						"w": 45,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0094.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 45,
-						"h": 44
-					},
-					"frame": {
-						"x": 45,
-						"y": 0,
-						"w": 45,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0088.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 45,
-						"h": 44
-					},
-					"frame": {
-						"x": 90,
-						"y": 0,
-						"w": 45,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0089.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 45,
-						"h": 44
-					},
-					"frame": {
-						"x": 90,
-						"y": 0,
-						"w": 45,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0092.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 45,
-						"h": 44
-					},
-					"frame": {
-						"x": 90,
-						"y": 0,
-						"w": 45,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0093.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 45,
-						"h": 44
-					},
-					"frame": {
-						"x": 90,
-						"y": 0,
-						"w": 45,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0095.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 45,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 44,
-						"w": 45,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0096.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 45,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 44,
-						"w": 45,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0097.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 45,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 88,
-						"w": 45,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0098.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 45,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 88,
-						"w": 45,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 43,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 132,
-						"w": 43,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 43,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 132,
-						"w": 43,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 43,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 132,
-						"w": 43,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 43,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 132,
-						"w": 43,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 43,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 132,
-						"w": 43,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 43,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 132,
-						"w": 43,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0025.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 43,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 132,
-						"w": 43,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0026.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 43,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 132,
-						"w": 43,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0036.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 43,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 132,
-						"w": 43,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0037.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 43,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 132,
-						"w": 43,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0040.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 43,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 132,
-						"w": 43,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0041.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 43,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 132,
-						"w": 43,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0051.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 43,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 132,
-						"w": 43,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0052.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 43,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 132,
-						"w": 43,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0055.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 43,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 132,
-						"w": 43,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0056.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 43,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 132,
-						"w": 43,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0066.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 43,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 132,
-						"w": 43,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0067.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 43,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 132,
-						"w": 43,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0070.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 43,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 132,
-						"w": 43,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0071.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 43,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 132,
-						"w": 43,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 43,
-						"h": 40
-					},
-					"frame": {
-						"x": 43,
-						"y": 132,
-						"w": 43,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 43,
-						"h": 40
-					},
-					"frame": {
-						"x": 43,
-						"y": 132,
-						"w": 43,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 43,
-						"h": 40
-					},
-					"frame": {
-						"x": 43,
-						"y": 132,
-						"w": 43,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 43,
-						"h": 40
-					},
-					"frame": {
-						"x": 43,
-						"y": 132,
-						"w": 43,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0038.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 43,
-						"h": 40
-					},
-					"frame": {
-						"x": 43,
-						"y": 132,
-						"w": 43,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0039.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 43,
-						"h": 40
-					},
-					"frame": {
-						"x": 43,
-						"y": 132,
-						"w": 43,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0053.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 43,
-						"h": 40
-					},
-					"frame": {
-						"x": 43,
-						"y": 132,
-						"w": 43,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0054.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 43,
-						"h": 40
-					},
-					"frame": {
-						"x": 43,
-						"y": 132,
-						"w": 43,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0068.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 43,
-						"h": 40
-					},
-					"frame": {
-						"x": 43,
-						"y": 132,
-						"w": 43,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0069.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 43,
-						"h": 40
-					},
-					"frame": {
-						"x": 43,
-						"y": 132,
-						"w": 43,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0081.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 44,
-						"h": 44
-					},
-					"frame": {
-						"x": 45,
-						"y": 44,
-						"w": 44,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0082.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 44,
-						"h": 44
-					},
-					"frame": {
-						"x": 45,
-						"y": 44,
-						"w": 44,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0101.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 44,
-						"h": 44
-					},
-					"frame": {
-						"x": 45,
-						"y": 44,
-						"w": 44,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0102.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 44,
-						"h": 44
-					},
-					"frame": {
-						"x": 45,
-						"y": 44,
-						"w": 44,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0079.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 43,
-						"h": 44
-					},
-					"frame": {
-						"x": 45,
-						"y": 88,
-						"w": 43,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0080.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 43,
-						"h": 44
-					},
-					"frame": {
-						"x": 45,
-						"y": 88,
-						"w": 43,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0103.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 43,
-						"h": 44
-					},
-					"frame": {
-						"x": 45,
-						"y": 88,
-						"w": 43,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0104.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 43,
-						"h": 44
-					},
-					"frame": {
-						"x": 45,
-						"y": 88,
-						"w": 43,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 40,
-						"h": 44
-					},
-					"frame": {
-						"x": 88,
-						"y": 88,
-						"w": 40,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 40,
-						"h": 44
-					},
-					"frame": {
-						"x": 88,
-						"y": 88,
-						"w": 40,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 40,
-						"h": 44
-					},
-					"frame": {
-						"x": 88,
-						"y": 88,
-						"w": 40,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 40,
-						"h": 44
-					},
-					"frame": {
-						"x": 88,
-						"y": 88,
-						"w": 40,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 40,
-						"h": 44
-					},
-					"frame": {
-						"x": 88,
-						"y": 88,
-						"w": 40,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 40,
-						"h": 44
-					},
-					"frame": {
-						"x": 88,
-						"y": 88,
-						"w": 40,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0031.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 40,
-						"h": 44
-					},
-					"frame": {
-						"x": 88,
-						"y": 88,
-						"w": 40,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0032.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 40,
-						"h": 44
-					},
-					"frame": {
-						"x": 88,
-						"y": 88,
-						"w": 40,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0033.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 40,
-						"h": 44
-					},
-					"frame": {
-						"x": 88,
-						"y": 88,
-						"w": 40,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0046.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 40,
-						"h": 44
-					},
-					"frame": {
-						"x": 88,
-						"y": 88,
-						"w": 40,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0047.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 40,
-						"h": 44
-					},
-					"frame": {
-						"x": 88,
-						"y": 88,
-						"w": 40,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0048.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 40,
-						"h": 44
-					},
-					"frame": {
-						"x": 88,
-						"y": 88,
-						"w": 40,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0061.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 40,
-						"h": 44
-					},
-					"frame": {
-						"x": 88,
-						"y": 88,
-						"w": 40,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0062.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 40,
-						"h": 44
-					},
-					"frame": {
-						"x": 88,
-						"y": 88,
-						"w": 40,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0063.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 40,
-						"h": 44
-					},
-					"frame": {
-						"x": 88,
-						"y": 88,
-						"w": 40,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0076.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 40,
-						"h": 44
-					},
-					"frame": {
-						"x": 88,
-						"y": 88,
-						"w": 40,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0077.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 40,
-						"h": 44
-					},
-					"frame": {
-						"x": 88,
-						"y": 88,
-						"w": 40,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0078.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 40,
-						"h": 44
-					},
-					"frame": {
-						"x": 88,
-						"y": 88,
-						"w": 40,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 41,
-						"h": 43
-					},
-					"frame": {
-						"x": 89,
-						"y": 44,
-						"w": 41,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 41,
-						"h": 43
-					},
-					"frame": {
-						"x": 89,
-						"y": 44,
-						"w": 41,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0044.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 41,
-						"h": 43
-					},
-					"frame": {
-						"x": 89,
-						"y": 44,
-						"w": 41,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0045.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 41,
-						"h": 43
-					},
-					"frame": {
-						"x": 89,
-						"y": 44,
-						"w": 41,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0059.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 41,
-						"h": 43
-					},
-					"frame": {
-						"x": 89,
-						"y": 44,
-						"w": 41,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0060.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 41,
-						"h": 43
-					},
-					"frame": {
-						"x": 89,
-						"y": 44,
-						"w": 41,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0074.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 41,
-						"h": 43
-					},
-					"frame": {
-						"x": 89,
-						"y": 44,
-						"w": 41,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0075.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 41,
-						"h": 43
-					},
-					"frame": {
-						"x": 89,
-						"y": 44,
-						"w": 41,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0029.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 41,
-						"h": 43
-					},
-					"frame": {
-						"x": 130,
-						"y": 44,
-						"w": 41,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0030.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 41,
-						"h": 43
-					},
-					"frame": {
-						"x": 130,
-						"y": 44,
-						"w": 41,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 40,
-						"h": 43
-					},
-					"frame": {
-						"x": 128,
-						"y": 87,
-						"w": 40,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 40,
-						"h": 43
-					},
-					"frame": {
-						"x": 128,
-						"y": 87,
-						"w": 40,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 40,
-						"h": 43
-					},
-					"frame": {
-						"x": 128,
-						"y": 87,
-						"w": 40,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 40,
-						"h": 43
-					},
-					"frame": {
-						"x": 128,
-						"y": 87,
-						"w": 40,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 40,
-						"h": 43
-					},
-					"frame": {
-						"x": 128,
-						"y": 130,
-						"w": 40,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 40,
-						"h": 43
-					},
-					"frame": {
-						"x": 128,
-						"y": 130,
-						"w": 40,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0027.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 40,
-						"h": 43
-					},
-					"frame": {
-						"x": 128,
-						"y": 130,
-						"w": 40,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0028.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 40,
-						"h": 43
-					},
-					"frame": {
-						"x": 128,
-						"y": 130,
-						"w": 40,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0034.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 40,
-						"h": 43
-					},
-					"frame": {
-						"x": 128,
-						"y": 130,
-						"w": 40,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0035.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 40,
-						"h": 43
-					},
-					"frame": {
-						"x": 128,
-						"y": 130,
-						"w": 40,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0042.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 40,
-						"h": 43
-					},
-					"frame": {
-						"x": 128,
-						"y": 130,
-						"w": 40,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0043.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 40,
-						"h": 43
-					},
-					"frame": {
-						"x": 128,
-						"y": 130,
-						"w": 40,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0049.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 40,
-						"h": 43
-					},
-					"frame": {
-						"x": 128,
-						"y": 130,
-						"w": 40,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0050.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 40,
-						"h": 43
-					},
-					"frame": {
-						"x": 128,
-						"y": 130,
-						"w": 40,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0057.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 40,
-						"h": 43
-					},
-					"frame": {
-						"x": 128,
-						"y": 130,
-						"w": 40,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0058.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 40,
-						"h": 43
-					},
-					"frame": {
-						"x": 128,
-						"y": 130,
-						"w": 40,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0064.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 40,
-						"h": 43
-					},
-					"frame": {
-						"x": 128,
-						"y": 130,
-						"w": 40,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0065.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 40,
-						"h": 43
-					},
-					"frame": {
-						"x": 128,
-						"y": 130,
-						"w": 40,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0072.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 40,
-						"h": 43
-					},
-					"frame": {
-						"x": 128,
-						"y": 130,
-						"w": 40,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0073.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 40,
-						"h": 43
-					},
-					"frame": {
-						"x": 128,
-						"y": 130,
-						"w": 40,
-						"h": 43
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:d04be8782bc4dd7044942acce05841d1:0e29431888e23f35da7ce4bf9b48965f:a7be961d0230f568aff23d95e7ff0036$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 81, "y": 87, "w": 38, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 38, "h": 43 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 81, "y": 87, "w": 38, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 38, "h": 43 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 81, "y": 87, "w": 38, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 38, "h": 43 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 0, "y": 123, "w": 38, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 38, "h": 42 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 0, "y": 123, "w": 38, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 38, "h": 42 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 0, "y": 44, "w": 41, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 41, "h": 40 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 0, "y": 44, "w": 41, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 41, "h": 40 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 0, "y": 84, "w": 42, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 42, "h": 39 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 0, "y": 84, "w": 42, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 42, "h": 39 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 0, "y": 44, "w": 41, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 41, "h": 40 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 0, "y": 44, "w": 41, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 41, "h": 40 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 38, "y": 128, "w": 38, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 38, "h": 42 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 38, "y": 128, "w": 38, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 38, "h": 42 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 42, "y": 86, "w": 39, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 39, "h": 42 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 42, "y": 86, "w": 39, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 39, "h": 42 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 81, "y": 87, "w": 38, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 38, "h": 43 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 81, "y": 87, "w": 38, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 38, "h": 43 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 81, "y": 87, "w": 38, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 38, "h": 43 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 0, "y": 123, "w": 38, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 38, "h": 42 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 0, "y": 123, "w": 38, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 38, "h": 42 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 0, "y": 44, "w": 41, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 41, "h": 40 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 0, "y": 44, "w": 41, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 41, "h": 40 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 0, "y": 84, "w": 42, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 42, "h": 39 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 0, "y": 84, "w": 42, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 42, "h": 39 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 0, "y": 44, "w": 41, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 41, "h": 40 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 0, "y": 44, "w": 41, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 41, "h": 40 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 38, "y": 128, "w": 38, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 38, "h": 42 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 38, "y": 128, "w": 38, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 38, "h": 42 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 130, "y": 86, "w": 39, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 39, "h": 42 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 130, "y": 86, "w": 39, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 39, "h": 42 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 81, "y": 87, "w": 38, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 38, "h": 43 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 81, "y": 87, "w": 38, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 38, "h": 43 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 81, "y": 87, "w": 38, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 38, "h": 43 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 38, "y": 128, "w": 38, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 38, "h": 42 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 38, "y": 128, "w": 38, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 38, "h": 42 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 0, "y": 44, "w": 41, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 41, "h": 40 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 0, "y": 44, "w": 41, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 41, "h": 40 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 0, "y": 84, "w": 42, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 42, "h": 39 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 0, "y": 84, "w": 42, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 42, "h": 39 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 0, "y": 44, "w": 41, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 41, "h": 40 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 0, "y": 44, "w": 41, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 41, "h": 40 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 38, "y": 128, "w": 38, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 38, "h": 42 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 38, "y": 128, "w": 38, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 38, "h": 42 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 42, "y": 86, "w": 39, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 39, "h": 42 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 42, "y": 86, "w": 39, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 39, "h": 42 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 81, "y": 87, "w": 38, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 38, "h": 43 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 81, "y": 87, "w": 38, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 38, "h": 43 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 81, "y": 87, "w": 38, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 38, "h": 43 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 38, "y": 128, "w": 38, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 38, "h": 42 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 38, "y": 128, "w": 38, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 38, "h": 42 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 0, "y": 44, "w": 41, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 41, "h": 40 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 0, "y": 44, "w": 41, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 41, "h": 40 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 0, "y": 84, "w": 42, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 42, "h": 39 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 0, "y": 84, "w": 42, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 42, "h": 39 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 0, "y": 44, "w": 41, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 41, "h": 40 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 0, "y": 44, "w": 41, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 41, "h": 40 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 38, "y": 128, "w": 38, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 38, "h": 42 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 38, "y": 128, "w": 38, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 38, "h": 42 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 42, "y": 86, "w": 39, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 39, "h": 42 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 42, "y": 86, "w": 39, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 39, "h": 42 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 81, "y": 87, "w": 38, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 38, "h": 43 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 81, "y": 87, "w": 38, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 38, "h": 43 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 81, "y": 87, "w": 38, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 38, "h": 43 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 38, "y": 128, "w": 38, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 38, "h": 42 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 38, "y": 128, "w": 38, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 38, "h": 42 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 0, "y": 44, "w": 41, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 41, "h": 40 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 0, "y": 44, "w": 41, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 41, "h": 40 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 0, "y": 84, "w": 42, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 42, "h": 39 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 0, "y": 84, "w": 42, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 42, "h": 39 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 0, "y": 44, "w": 41, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 41, "h": 40 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 0, "y": 44, "w": 41, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 41, "h": 40 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 38, "y": 128, "w": 38, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 38, "h": 42 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 38, "y": 128, "w": 38, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 38, "h": 42 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 42, "y": 86, "w": 39, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 39, "h": 42 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 42, "y": 86, "w": 39, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 39, "h": 42 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 81, "y": 87, "w": 38, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 38, "h": 43 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 81, "y": 87, "w": 38, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 38, "h": 43 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 81, "y": 87, "w": 38, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 38, "h": 43 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 130, "y": 43, "w": 41, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 41, "h": 43 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 130, "y": 43, "w": 41, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 41, "h": 43 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 88, "y": 43, "w": 42, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 42, "h": 44 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 88, "y": 43, "w": 42, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 42, "h": 44 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 0, "y": 0, "w": 44, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 44, "h": 44 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 0, "y": 0, "w": 44, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 44, "h": 44 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 44, "y": 0, "w": 44, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 44, "h": 43 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 44, "y": 0, "w": 44, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 44, "h": 43 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 44, "y": 0, "w": 44, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 44, "h": 43 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0088.png",
+    "frame": { "x": 88, "y": 0, "w": 44, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 44, "h": 43 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0089.png",
+    "frame": { "x": 88, "y": 0, "w": 44, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 44, "h": 43 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0090.png",
+    "frame": { "x": 44, "y": 0, "w": 44, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 44, "h": 43 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0091.png",
+    "frame": { "x": 44, "y": 0, "w": 44, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 44, "h": 43 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0092.png",
+    "frame": { "x": 88, "y": 0, "w": 44, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 44, "h": 43 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0093.png",
+    "frame": { "x": 88, "y": 0, "w": 44, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 44, "h": 43 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0094.png",
+    "frame": { "x": 44, "y": 0, "w": 44, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 44, "h": 43 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0095.png",
+    "frame": { "x": 132, "y": 0, "w": 44, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 44, "h": 43 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0096.png",
+    "frame": { "x": 132, "y": 0, "w": 44, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 44, "h": 43 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0097.png",
+    "frame": { "x": 44, "y": 43, "w": 44, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 44, "h": 43 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0098.png",
+    "frame": { "x": 44, "y": 43, "w": 44, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 44, "h": 43 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0099.png",
+    "frame": { "x": 0, "y": 0, "w": 44, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 44, "h": 44 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0100.png",
+    "frame": { "x": 0, "y": 0, "w": 44, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 44, "h": 44 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0101.png",
+    "frame": { "x": 88, "y": 43, "w": 42, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 42, "h": 44 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0102.png",
+    "frame": { "x": 88, "y": 43, "w": 42, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 42, "h": 44 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0103.png",
+    "frame": { "x": 130, "y": 43, "w": 41, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 41, "h": 43 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0104.png",
+    "frame": { "x": 130, "y": 43, "w": 41, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 41, "h": 43 },
+    "sourceSize": { "w": 46, "h": 44 },
+    "duration": 50
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "653.png",
+  "format": "I8",
+  "size": { "w": 176, "h": 170 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/shiny/653.png b/public/images/pokemon/exp/back/shiny/653.png
index efd98f5ee42..08b2420ad11 100644
Binary files a/public/images/pokemon/exp/back/shiny/653.png and b/public/images/pokemon/exp/back/shiny/653.png differ
diff --git a/public/images/pokemon/exp/back/shiny/654.json b/public/images/pokemon/exp/back/shiny/654.json
index 990436ec243..a5bd681b6cb 100644
--- a/public/images/pokemon/exp/back/shiny/654.json
+++ b/public/images/pokemon/exp/back/shiny/654.json
@@ -1,188 +1,677 @@
-{
-	"textures": [
-		{
-			"image": "654.png", 
-			"format": "RGBA8888", 
-			"size": {
-				"w": 120, 
-				"h": 120
-			}, 
-			"scale": 1, 
-			"frames": [
-				{
-					"filename": "0003.png", 
-					"rotated": false, 
-					"trimmed": false, 
-					"sourceSize": {
-						"w": 40, 
-						"h": 66
-					}, 
-					"spriteSourceSize": {
-						"x": 0, 
-						"y": 0, 
-						"w": 40, 
-						"h": 66
-					}, 
-					"frame": {
-						"x": 0, 
-						"y": 0, 
-						"w": 40, 
-						"h": 66
-					}
-				}, 
-				{
-					"filename": "0004.png", 
-					"rotated": false, 
-					"trimmed": false, 
-					"sourceSize": {
-						"w": 40, 
-						"h": 66
-					}, 
-					"spriteSourceSize": {
-						"x": 0, 
-						"y": 0, 
-						"w": 40, 
-						"h": 66
-					}, 
-					"frame": {
-						"x": 0, 
-						"y": 0, 
-						"w": 40, 
-						"h": 66
-					}
-				}, 
-				{
-					"filename": "0007.png", 
-					"rotated": false, 
-					"trimmed": false, 
-					"sourceSize": {
-						"w": 40, 
-						"h": 66
-					}, 
-					"spriteSourceSize": {
-						"x": 0, 
-						"y": 0, 
-						"w": 40, 
-						"h": 66
-					}, 
-					"frame": {
-						"x": 0, 
-						"y": 0, 
-						"w": 40, 
-						"h": 66
-					}
-				}, 
-				{
-					"filename": "0008.png", 
-					"rotated": false, 
-					"trimmed": false, 
-					"sourceSize": {
-						"w": 40, 
-						"h": 66
-					}, 
-					"spriteSourceSize": {
-						"x": 0, 
-						"y": 0, 
-						"w": 40, 
-						"h": 66
-					}, 
-					"frame": {
-						"x": 0, 
-						"y": 0, 
-						"w": 40, 
-						"h": 66
-					}
-				}, 
-				{
-					"filename": "0005.png", 
-					"rotated": false, 
-					"trimmed": false, 
-					"sourceSize": {
-						"w": 40, 
-						"h": 66
-					}, 
-					"spriteSourceSize": {
-						"x": 0, 
-						"y": 0, 
-						"w": 40, 
-						"h": 66
-					}, 
-					"frame": {
-						"x": 40, 
-						"y": 0, 
-						"w": 40, 
-						"h": 66
-					}
-				}, 
-				{
-					"filename": "0006.png", 
-					"rotated": false, 
-					"trimmed": false, 
-					"sourceSize": {
-						"w": 40, 
-						"h": 66
-					}, 
-					"spriteSourceSize": {
-						"x": 0, 
-						"y": 0, 
-						"w": 40, 
-						"h": 66
-					}, 
-					"frame": {
-						"x": 40, 
-						"y": 0, 
-						"w": 40, 
-						"h": 66
-					}
-				}, 
-				{
-					"filename": "0001.png", 
-					"rotated": false, 
-					"trimmed": true, 
-					"sourceSize": {
-						"w": 40, 
-						"h": 66
-					}, 
-					"spriteSourceSize": {
-						"x": 0, 
-						"y": 1, 
-						"w": 40, 
-						"h": 65
-					}, 
-					"frame": {
-						"x": 80, 
-						"y": 0, 
-						"w": 40, 
-						"h": 65
-					}
-				}, 
-				{
-					"filename": "0002.png", 
-					"rotated": false, 
-					"trimmed": true, 
-					"sourceSize": {
-						"w": 40, 
-						"h": 66
-					}, 
-					"spriteSourceSize": {
-						"x": 0, 
-						"y": 1, 
-						"w": 40, 
-						"h": 65
-					}, 
-					"frame": {
-						"x": 80, 
-						"y": 0, 
-						"w": 40, 
-						"h": 65
-					}
-				}
-			]
-		}
-	], 
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker", 
-		"version": "3.0", 
-		"smartupdate": "$TexturePacker:SmartUpdate:6f47a7be287accef984c271dc9a4c0a3:dfd096ac65957c3db229b035490b4fbb:1977f50e1ab8a3304ceeb59ee1aa2ba9$"
-	}
-}
\ No newline at end of file
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 0, "y": 263, "w": 50, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 50, "h": 67 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 102, "y": 203, "w": 52, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 52, "h": 65 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 161, "y": 130, "w": 54, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 54, "h": 65 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 0, "y": 0, "w": 55, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 55, "h": 66 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 55, "y": 0, "w": 55, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 55, "h": 66 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 110, "y": 0, "w": 53, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 53, "h": 68 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 110, "y": 68, "w": 51, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 51, "h": 69 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 214, "y": 195, "w": 51, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 51, "h": 68 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 0, "y": 263, "w": 50, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 50, "h": 67 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 102, "y": 203, "w": 52, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 52, "h": 65 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 161, "y": 130, "w": 54, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 54, "h": 65 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 0, "y": 0, "w": 55, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 55, "h": 66 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 55, "y": 0, "w": 55, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 55, "h": 66 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 110, "y": 0, "w": 53, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 53, "h": 68 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 110, "y": 68, "w": 51, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 51, "h": 69 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 214, "y": 195, "w": 51, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 51, "h": 68 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 0, "y": 263, "w": 50, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 50, "h": 67 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 102, "y": 203, "w": 52, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 52, "h": 65 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 161, "y": 130, "w": 54, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 54, "h": 65 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 0, "y": 0, "w": 55, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 55, "h": 66 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 55, "y": 0, "w": 55, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 55, "h": 66 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 110, "y": 0, "w": 53, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 53, "h": 68 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 110, "y": 68, "w": 51, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 51, "h": 69 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 214, "y": 195, "w": 51, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 51, "h": 68 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 0, "y": 263, "w": 50, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 50, "h": 67 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 102, "y": 203, "w": 52, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 52, "h": 65 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 161, "y": 130, "w": 54, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 54, "h": 65 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 0, "y": 0, "w": 55, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 55, "h": 66 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 55, "y": 0, "w": 55, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 55, "h": 66 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 110, "y": 0, "w": 53, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 53, "h": 68 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 110, "y": 68, "w": 51, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 51, "h": 69 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 214, "y": 195, "w": 51, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 51, "h": 68 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 0, "y": 263, "w": 50, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 50, "h": 67 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 102, "y": 203, "w": 52, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 52, "h": 65 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 161, "y": 130, "w": 54, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 54, "h": 65 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 0, "y": 0, "w": 55, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 55, "h": 66 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 55, "y": 0, "w": 55, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 55, "h": 66 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 110, "y": 0, "w": 53, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 53, "h": 68 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 110, "y": 68, "w": 51, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 51, "h": 69 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 214, "y": 195, "w": 51, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 51, "h": 68 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 0, "y": 263, "w": 50, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 50, "h": 67 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 102, "y": 203, "w": 52, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 52, "h": 65 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 161, "y": 130, "w": 54, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 54, "h": 65 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 0, "y": 0, "w": 55, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 55, "h": 66 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 55, "y": 0, "w": 55, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 55, "h": 66 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 110, "y": 0, "w": 53, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 53, "h": 68 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 110, "y": 68, "w": 51, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 51, "h": 69 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 214, "y": 195, "w": 51, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 51, "h": 68 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 0, "y": 263, "w": 50, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 50, "h": 67 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 215, "y": 130, "w": 54, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 54, "h": 65 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 163, "y": 0, "w": 55, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 55, "h": 65 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 108, "y": 137, "w": 53, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 53, "h": 66 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 50, "y": 263, "w": 50, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 50, "h": 66 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 0, "y": 131, "w": 54, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 54, "h": 65 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 218, "y": 0, "w": 55, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 55, "h": 65 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 161, "y": 195, "w": 53, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 53, "h": 66 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 154, "y": 261, "w": 52, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 52, "h": 65 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 54, "y": 131, "w": 54, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 54, "h": 65 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 163, "y": 65, "w": 55, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 55, "h": 65 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 154, "y": 261, "w": 52, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 52, "h": 65 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 54, "y": 131, "w": 54, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 54, "h": 65 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 163, "y": 65, "w": 55, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 55, "h": 65 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 154, "y": 261, "w": 52, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 52, "h": 65 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 54, "y": 131, "w": 54, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 54, "h": 65 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 163, "y": 65, "w": 55, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 55, "h": 65 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 154, "y": 261, "w": 52, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 52, "h": 65 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 54, "y": 131, "w": 54, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 54, "h": 65 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 218, "y": 65, "w": 55, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 55, "h": 65 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 0, "y": 66, "w": 55, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 55, "h": 65 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 0, "y": 66, "w": 55, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 55, "h": 65 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 55, "y": 66, "w": 55, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 55, "h": 65 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 108, "y": 137, "w": 53, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 53, "h": 66 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 0, "y": 196, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 51, "h": 67 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 51, "y": 196, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 51, "h": 67 },
+    "sourceSize": { "w": 55, "h": 69 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "654.png",
+  "format": "I8",
+  "size": { "w": 273, "h": 330 },
+  "scale": "1"
+ }
+}
diff --git a/public/images/pokemon/exp/back/shiny/654.png b/public/images/pokemon/exp/back/shiny/654.png
index 0dfad6834cc..747aa61bd58 100644
Binary files a/public/images/pokemon/exp/back/shiny/654.png and b/public/images/pokemon/exp/back/shiny/654.png differ
diff --git a/public/images/pokemon/exp/back/shiny/656.json b/public/images/pokemon/exp/back/shiny/656.json
index 0a023d7bee6..78a3ae89852 100644
--- a/public/images/pokemon/exp/back/shiny/656.json
+++ b/public/images/pokemon/exp/back/shiny/656.json
@@ -1,1658 +1,713 @@
-{
-	"textures": [
-		{
-			"image": "656.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 201,
-				"h": 201
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0068.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 34,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 15,
-						"w": 32,
-						"h": 32
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 32
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 34,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 14,
-						"w": 34,
-						"h": 33
-					},
-					"frame": {
-						"x": 32,
-						"y": 0,
-						"w": 34,
-						"h": 33
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 34,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 14,
-						"w": 34,
-						"h": 33
-					},
-					"frame": {
-						"x": 32,
-						"y": 0,
-						"w": 34,
-						"h": 33
-					}
-				},
-				{
-					"filename": "0028.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 34,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 14,
-						"w": 34,
-						"h": 33
-					},
-					"frame": {
-						"x": 32,
-						"y": 0,
-						"w": 34,
-						"h": 33
-					}
-				},
-				{
-					"filename": "0039.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 34,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 14,
-						"w": 34,
-						"h": 33
-					},
-					"frame": {
-						"x": 32,
-						"y": 0,
-						"w": 34,
-						"h": 33
-					}
-				},
-				{
-					"filename": "0050.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 34,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 14,
-						"w": 34,
-						"h": 33
-					},
-					"frame": {
-						"x": 32,
-						"y": 0,
-						"w": 34,
-						"h": 33
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 34,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 14,
-						"w": 34,
-						"h": 33
-					},
-					"frame": {
-						"x": 66,
-						"y": 0,
-						"w": 34,
-						"h": 33
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 34,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 14,
-						"w": 34,
-						"h": 33
-					},
-					"frame": {
-						"x": 66,
-						"y": 0,
-						"w": 34,
-						"h": 33
-					}
-				},
-				{
-					"filename": "0029.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 34,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 14,
-						"w": 34,
-						"h": 33
-					},
-					"frame": {
-						"x": 66,
-						"y": 0,
-						"w": 34,
-						"h": 33
-					}
-				},
-				{
-					"filename": "0040.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 34,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 14,
-						"w": 34,
-						"h": 33
-					},
-					"frame": {
-						"x": 66,
-						"y": 0,
-						"w": 34,
-						"h": 33
-					}
-				},
-				{
-					"filename": "0051.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 34,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 14,
-						"w": 34,
-						"h": 33
-					},
-					"frame": {
-						"x": 66,
-						"y": 0,
-						"w": 34,
-						"h": 33
-					}
-				},
-				{
-					"filename": "0067.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 34,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 14,
-						"w": 33,
-						"h": 33
-					},
-					"frame": {
-						"x": 100,
-						"y": 0,
-						"w": 33,
-						"h": 33
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 34,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 13,
-						"w": 34,
-						"h": 34
-					},
-					"frame": {
-						"x": 133,
-						"y": 0,
-						"w": 34,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 34,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 13,
-						"w": 34,
-						"h": 34
-					},
-					"frame": {
-						"x": 133,
-						"y": 0,
-						"w": 34,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0026.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 34,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 13,
-						"w": 34,
-						"h": 34
-					},
-					"frame": {
-						"x": 133,
-						"y": 0,
-						"w": 34,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0037.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 34,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 13,
-						"w": 34,
-						"h": 34
-					},
-					"frame": {
-						"x": 133,
-						"y": 0,
-						"w": 34,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0048.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 34,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 13,
-						"w": 34,
-						"h": 34
-					},
-					"frame": {
-						"x": 133,
-						"y": 0,
-						"w": 34,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 34,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 13,
-						"w": 34,
-						"h": 34
-					},
-					"frame": {
-						"x": 167,
-						"y": 0,
-						"w": 34,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 34,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 13,
-						"w": 34,
-						"h": 34
-					},
-					"frame": {
-						"x": 167,
-						"y": 0,
-						"w": 34,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0027.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 34,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 13,
-						"w": 34,
-						"h": 34
-					},
-					"frame": {
-						"x": 167,
-						"y": 0,
-						"w": 34,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0038.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 34,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 13,
-						"w": 34,
-						"h": 34
-					},
-					"frame": {
-						"x": 167,
-						"y": 0,
-						"w": 34,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0049.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 34,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 13,
-						"w": 34,
-						"h": 34
-					},
-					"frame": {
-						"x": 167,
-						"y": 0,
-						"w": 34,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0069.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 34,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 13,
-						"w": 32,
-						"h": 34
-					},
-					"frame": {
-						"x": 0,
-						"y": 32,
-						"w": 32,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 34,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 12,
-						"w": 34,
-						"h": 34
-					},
-					"frame": {
-						"x": 32,
-						"y": 33,
-						"w": 34,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 34,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 12,
-						"w": 34,
-						"h": 34
-					},
-					"frame": {
-						"x": 32,
-						"y": 33,
-						"w": 34,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0032.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 34,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 12,
-						"w": 34,
-						"h": 34
-					},
-					"frame": {
-						"x": 32,
-						"y": 33,
-						"w": 34,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0043.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 34,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 12,
-						"w": 34,
-						"h": 34
-					},
-					"frame": {
-						"x": 32,
-						"y": 33,
-						"w": 34,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0054.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 34,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 12,
-						"w": 34,
-						"h": 34
-					},
-					"frame": {
-						"x": 32,
-						"y": 33,
-						"w": 34,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 34,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 12,
-						"w": 34,
-						"h": 35
-					},
-					"frame": {
-						"x": 66,
-						"y": 33,
-						"w": 34,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 34,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 12,
-						"w": 34,
-						"h": 35
-					},
-					"frame": {
-						"x": 66,
-						"y": 33,
-						"w": 34,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 34,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 12,
-						"w": 34,
-						"h": 35
-					},
-					"frame": {
-						"x": 66,
-						"y": 33,
-						"w": 34,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0034.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 34,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 12,
-						"w": 34,
-						"h": 35
-					},
-					"frame": {
-						"x": 66,
-						"y": 33,
-						"w": 34,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0045.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 34,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 12,
-						"w": 34,
-						"h": 35
-					},
-					"frame": {
-						"x": 66,
-						"y": 33,
-						"w": 34,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0056.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 34,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 12,
-						"w": 34,
-						"h": 35
-					},
-					"frame": {
-						"x": 66,
-						"y": 33,
-						"w": 34,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0076.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 34,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 12,
-						"w": 34,
-						"h": 35
-					},
-					"frame": {
-						"x": 66,
-						"y": 33,
-						"w": 34,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0077.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 34,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 12,
-						"w": 34,
-						"h": 35
-					},
-					"frame": {
-						"x": 66,
-						"y": 33,
-						"w": 34,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0078.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 34,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 12,
-						"w": 34,
-						"h": 35
-					},
-					"frame": {
-						"x": 66,
-						"y": 33,
-						"w": 34,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0066.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 34,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 12,
-						"w": 33,
-						"h": 35
-					},
-					"frame": {
-						"x": 100,
-						"y": 33,
-						"w": 33,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 34,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 12,
-						"w": 34,
-						"h": 35
-					},
-					"frame": {
-						"x": 133,
-						"y": 34,
-						"w": 34,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 34,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 12,
-						"w": 34,
-						"h": 35
-					},
-					"frame": {
-						"x": 133,
-						"y": 34,
-						"w": 34,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 34,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 12,
-						"w": 34,
-						"h": 35
-					},
-					"frame": {
-						"x": 133,
-						"y": 34,
-						"w": 34,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0035.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 34,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 12,
-						"w": 34,
-						"h": 35
-					},
-					"frame": {
-						"x": 133,
-						"y": 34,
-						"w": 34,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0046.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 34,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 12,
-						"w": 34,
-						"h": 35
-					},
-					"frame": {
-						"x": 133,
-						"y": 34,
-						"w": 34,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 34,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 12,
-						"w": 34,
-						"h": 35
-					},
-					"frame": {
-						"x": 167,
-						"y": 34,
-						"w": 34,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 34,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 12,
-						"w": 34,
-						"h": 35
-					},
-					"frame": {
-						"x": 167,
-						"y": 34,
-						"w": 34,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0025.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 34,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 12,
-						"w": 34,
-						"h": 35
-					},
-					"frame": {
-						"x": 167,
-						"y": 34,
-						"w": 34,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0036.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 34,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 12,
-						"w": 34,
-						"h": 35
-					},
-					"frame": {
-						"x": 167,
-						"y": 34,
-						"w": 34,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0047.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 34,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 12,
-						"w": 34,
-						"h": 35
-					},
-					"frame": {
-						"x": 167,
-						"y": 34,
-						"w": 34,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 34,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 11,
-						"w": 34,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 67,
-						"w": 34,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 34,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 11,
-						"w": 34,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 67,
-						"w": 34,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0031.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 34,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 11,
-						"w": 34,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 67,
-						"w": 34,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0042.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 34,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 11,
-						"w": 34,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 67,
-						"w": 34,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0053.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 34,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 11,
-						"w": 34,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 67,
-						"w": 34,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 34,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 12,
-						"w": 34,
-						"h": 35
-					},
-					"frame": {
-						"x": 34,
-						"y": 68,
-						"w": 34,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 34,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 12,
-						"w": 34,
-						"h": 35
-					},
-					"frame": {
-						"x": 34,
-						"y": 68,
-						"w": 34,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0033.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 34,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 12,
-						"w": 34,
-						"h": 35
-					},
-					"frame": {
-						"x": 34,
-						"y": 68,
-						"w": 34,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0044.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 34,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 12,
-						"w": 34,
-						"h": 35
-					},
-					"frame": {
-						"x": 34,
-						"y": 68,
-						"w": 34,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0055.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 34,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 12,
-						"w": 34,
-						"h": 35
-					},
-					"frame": {
-						"x": 34,
-						"y": 68,
-						"w": 34,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0070.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 34,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 12,
-						"w": 33,
-						"h": 35
-					},
-					"frame": {
-						"x": 68,
-						"y": 68,
-						"w": 33,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 34,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 11,
-						"w": 34,
-						"h": 36
-					},
-					"frame": {
-						"x": 101,
-						"y": 69,
-						"w": 34,
-						"h": 36
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 34,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 11,
-						"w": 34,
-						"h": 36
-					},
-					"frame": {
-						"x": 101,
-						"y": 69,
-						"w": 34,
-						"h": 36
-					}
-				},
-				{
-					"filename": "0030.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 34,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 11,
-						"w": 34,
-						"h": 36
-					},
-					"frame": {
-						"x": 101,
-						"y": 69,
-						"w": 34,
-						"h": 36
-					}
-				},
-				{
-					"filename": "0041.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 34,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 11,
-						"w": 34,
-						"h": 36
-					},
-					"frame": {
-						"x": 101,
-						"y": 69,
-						"w": 34,
-						"h": 36
-					}
-				},
-				{
-					"filename": "0052.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 34,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 11,
-						"w": 34,
-						"h": 36
-					},
-					"frame": {
-						"x": 101,
-						"y": 69,
-						"w": 34,
-						"h": 36
-					}
-				},
-				{
-					"filename": "0071.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 34,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 11,
-						"w": 33,
-						"h": 36
-					},
-					"frame": {
-						"x": 135,
-						"y": 69,
-						"w": 33,
-						"h": 36
-					}
-				},
-				{
-					"filename": "0073.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 34,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 11,
-						"w": 33,
-						"h": 36
-					},
-					"frame": {
-						"x": 168,
-						"y": 69,
-						"w": 33,
-						"h": 36
-					}
-				},
-				{
-					"filename": "0074.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 34,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 11,
-						"w": 34,
-						"h": 36
-					},
-					"frame": {
-						"x": 0,
-						"y": 102,
-						"w": 34,
-						"h": 36
-					}
-				},
-				{
-					"filename": "0075.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 34,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 11,
-						"w": 34,
-						"h": 36
-					},
-					"frame": {
-						"x": 34,
-						"y": 103,
-						"w": 34,
-						"h": 36
-					}
-				},
-				{
-					"filename": "0072.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 34,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 10,
-						"w": 33,
-						"h": 37
-					},
-					"frame": {
-						"x": 68,
-						"y": 103,
-						"w": 33,
-						"h": 37
-					}
-				},
-				{
-					"filename": "0057.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 34,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 8,
-						"w": 34,
-						"h": 39
-					},
-					"frame": {
-						"x": 101,
-						"y": 105,
-						"w": 34,
-						"h": 39
-					}
-				},
-				{
-					"filename": "0062.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 34,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 31,
-						"h": 40
-					},
-					"frame": {
-						"x": 135,
-						"y": 105,
-						"w": 31,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0063.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 34,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 31,
-						"h": 41
-					},
-					"frame": {
-						"x": 166,
-						"y": 105,
-						"w": 31,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0058.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 34,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 32,
-						"h": 42
-					},
-					"frame": {
-						"x": 0,
-						"y": 138,
-						"w": 32,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0060.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 34,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 32,
-						"h": 42
-					},
-					"frame": {
-						"x": 32,
-						"y": 139,
-						"w": 32,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0061.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 34,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 31,
-						"h": 42
-					},
-					"frame": {
-						"x": 64,
-						"y": 140,
-						"w": 31,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0065.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 34,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 31,
-						"h": 42
-					},
-					"frame": {
-						"x": 95,
-						"y": 144,
-						"w": 31,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0059.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 34,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 32,
-						"h": 43
-					},
-					"frame": {
-						"x": 126,
-						"y": 145,
-						"w": 32,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0064.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 34,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 31,
-						"h": 43
-					},
-					"frame": {
-						"x": 158,
-						"y": 146,
-						"w": 31,
-						"h": 43
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:5076cf3500c6d9392a3e656db2bcf661:8a870f3a4f8085495687c4af91e0de7e:9c4d208e6c2f857bfb0b23b8eea3326c$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 1, "y": 81, "w": 34, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 34 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 131, "y": 81, "w": 34, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 34 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 37, "y": 83, "w": 34, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 34 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 109, "y": 117, "w": 34, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 14, "w": 34, "h": 33 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 35, "y": 119, "w": 34, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 14, "w": 34, "h": 33 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 35, "y": 154, "w": 34, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 15, "w": 34, "h": 32 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 71, "y": 156, "w": 34, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 15, "w": 34, "h": 32 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 167, "y": 43, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 12, "w": 34, "h": 35 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 71, "y": 121, "w": 34, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 12, "w": 34, "h": 33 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 141, "y": 158, "w": 34, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 32 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 73, "y": 85, "w": 34, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 34 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 1, "y": 81, "w": 34, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 34 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 131, "y": 81, "w": 34, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 34 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 37, "y": 83, "w": 34, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 34 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 109, "y": 117, "w": 34, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 14, "w": 34, "h": 33 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 35, "y": 119, "w": 34, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 14, "w": 34, "h": 33 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 35, "y": 154, "w": 34, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 15, "w": 34, "h": 32 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 71, "y": 156, "w": 34, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 15, "w": 34, "h": 32 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 167, "y": 43, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 12, "w": 34, "h": 35 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 71, "y": 121, "w": 34, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 12, "w": 34, "h": 33 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 141, "y": 158, "w": 34, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 32 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 73, "y": 85, "w": 34, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 34 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 1, "y": 81, "w": 34, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 34 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 131, "y": 81, "w": 34, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 34 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 37, "y": 83, "w": 34, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 34 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 109, "y": 117, "w": 34, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 14, "w": 34, "h": 33 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 35, "y": 119, "w": 34, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 14, "w": 34, "h": 33 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 35, "y": 154, "w": 34, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 15, "w": 34, "h": 32 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 71, "y": 156, "w": 34, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 15, "w": 34, "h": 32 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 167, "y": 43, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 12, "w": 34, "h": 35 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 71, "y": 121, "w": 34, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 12, "w": 34, "h": 33 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 141, "y": 158, "w": 34, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 32 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 73, "y": 85, "w": 34, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 34 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 1, "y": 81, "w": 34, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 34 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 131, "y": 81, "w": 34, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 34 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 37, "y": 83, "w": 34, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 34 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 109, "y": 117, "w": 34, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 14, "w": 34, "h": 33 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 35, "y": 119, "w": 34, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 14, "w": 34, "h": 33 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 35, "y": 154, "w": 34, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 15, "w": 34, "h": 32 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 71, "y": 156, "w": 34, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 15, "w": 34, "h": 32 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 167, "y": 43, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 12, "w": 34, "h": 35 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 71, "y": 121, "w": 34, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 12, "w": 34, "h": 33 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 141, "y": 158, "w": 34, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 32 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 73, "y": 85, "w": 34, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 34 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 1, "y": 81, "w": 34, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 34 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 131, "y": 81, "w": 34, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 34 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 37, "y": 83, "w": 34, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 34 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 109, "y": 117, "w": 34, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 14, "w": 34, "h": 33 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 35, "y": 119, "w": 34, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 14, "w": 34, "h": 33 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 35, "y": 154, "w": 34, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 15, "w": 34, "h": 32 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 71, "y": 156, "w": 34, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 15, "w": 34, "h": 32 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 167, "y": 43, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 12, "w": 34, "h": 35 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 71, "y": 121, "w": 34, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 12, "w": 34, "h": 33 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 141, "y": 158, "w": 34, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 32 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 73, "y": 85, "w": 34, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 34 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 1, "y": 81, "w": 34, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 34 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 200
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 67, "y": 1, "w": 33, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 9, "w": 33, "h": 38 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 1, "y": 1, "w": 31, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 6, "w": 31, "h": 41 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 34, "y": 1, "w": 31, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 31, "h": 41 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 50
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 102, "y": 1, "w": 31, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 31, "h": 40 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 50
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 167, "y": 1, "w": 30, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 30, "h": 40 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 50
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 167, "y": 80, "w": 30, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 30, "h": 39 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 67, "y": 41, "w": 30, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 30, "h": 40 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 50
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 135, "y": 1, "w": 30, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 30, "h": 41 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 50
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 99, "y": 43, "w": 30, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 6, "w": 30, "h": 40 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 50
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 1, "y": 155, "w": 32, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 13, "w": 32, "h": 34 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 50
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 107, "y": 189, "w": 32, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 15, "w": 32, "h": 32 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 50
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 1, "y": 191, "w": 31, "h": 31 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 16, "w": 31, "h": 31 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 50
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 69, "y": 190, "w": 31, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 14, "w": 31, "h": 33 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 35, "y": 188, "w": 32, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 13, "w": 32, "h": 34 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 750
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 145, "y": 121, "w": 32, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 35 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 1, "y": 117, "w": 32, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 11, "w": 32, "h": 36 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 107, "y": 152, "w": 32, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 35 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 1, "y": 44, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 12, "w": 34, "h": 35 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 131, "y": 44, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 12, "w": 34, "h": 35 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 1, "y": 81, "w": 34, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 34 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 1, "y": 81, "w": 34, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 34 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 1, "y": 81, "w": 34, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 13, "w": 34, "h": 34 },
+    "sourceSize": { "w": 34, "h": 47 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "656.png",
+  "format": "I8",
+  "size": { "w": 202, "h": 224 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/shiny/656.png b/public/images/pokemon/exp/back/shiny/656.png
index 47b18020ffe..0c974e52a98 100644
Binary files a/public/images/pokemon/exp/back/shiny/656.png and b/public/images/pokemon/exp/back/shiny/656.png differ
diff --git a/public/images/pokemon/exp/back/shiny/661.json b/public/images/pokemon/exp/back/shiny/661.json
index 1199eaead4b..be82a4ce425 100644
--- a/public/images/pokemon/exp/back/shiny/661.json
+++ b/public/images/pokemon/exp/back/shiny/661.json
@@ -1,356 +1,398 @@
-{
-	"textures": [
-		{
-			"image": "661.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 68,
-				"h": 68
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 34
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 34
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 34
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 34
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 34
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 34
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 34
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 34
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 34
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 34
-					},
-					"frame": {
-						"x": 0,
-						"y": 34,
-						"w": 32,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 34
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 34
-					},
-					"frame": {
-						"x": 0,
-						"y": 34,
-						"w": 32,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 34
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 34
-					},
-					"frame": {
-						"x": 0,
-						"y": 34,
-						"w": 32,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 34
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 34
-					},
-					"frame": {
-						"x": 0,
-						"y": 34,
-						"w": 32,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 34
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 34
-					},
-					"frame": {
-						"x": 0,
-						"y": 34,
-						"w": 32,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 34
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 34
-					},
-					"frame": {
-						"x": 0,
-						"y": 34,
-						"w": 32,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 34
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 34
-					},
-					"frame": {
-						"x": 32,
-						"y": 0,
-						"w": 32,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 34
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 34
-					},
-					"frame": {
-						"x": 32,
-						"y": 0,
-						"w": 32,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 34
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 34
-					},
-					"frame": {
-						"x": 32,
-						"y": 0,
-						"w": 32,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 34
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 34
-					},
-					"frame": {
-						"x": 32,
-						"y": 0,
-						"w": 32,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 34
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 34
-					},
-					"frame": {
-						"x": 32,
-						"y": 34,
-						"w": 32,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 34
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 34
-					},
-					"frame": {
-						"x": 32,
-						"y": 34,
-						"w": 32,
-						"h": 34
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:622c17fd3933b7d7d1eddb422fc24fc5:684446320bdfd8fa492ed28395182fcc:186d621a544ea0e0e2e0bd57975a29b1$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 66, "y": 114, "w": 33, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 33, "h": 38 },
+    "sourceSize": { "w": 38, "h": 40 },
+    "duration": 120
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 0, "y": 117, "w": 33, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 33, "h": 38 },
+    "sourceSize": { "w": 38, "h": 40 },
+    "duration": 120
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 0, "y": 39, "w": 34, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 34, "h": 39 },
+    "sourceSize": { "w": 38, "h": 40 },
+    "duration": 120
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 105, "y": 36, "w": 35, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 35, "h": 38 },
+    "sourceSize": { "w": 38, "h": 40 },
+    "duration": 120
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 33, "y": 118, "w": 33, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 33, "h": 38 },
+    "sourceSize": { "w": 38, "h": 40 },
+    "duration": 120
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 66, "y": 114, "w": 33, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 33, "h": 38 },
+    "sourceSize": { "w": 38, "h": 40 },
+    "duration": 120
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 68, "y": 75, "w": 33, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 33, "h": 39 },
+    "sourceSize": { "w": 38, "h": 40 },
+    "duration": 120
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 35, "y": 0, "w": 34, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 34, "h": 40 },
+    "sourceSize": { "w": 38, "h": 40 },
+    "duration": 120
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 0, "y": 0, "w": 35, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 35, "h": 39 },
+    "sourceSize": { "w": 38, "h": 40 },
+    "duration": 120
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 0, "y": 78, "w": 33, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 33, "h": 39 },
+    "sourceSize": { "w": 38, "h": 40 },
+    "duration": 120
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 66, "y": 114, "w": 33, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 33, "h": 38 },
+    "sourceSize": { "w": 38, "h": 40 },
+    "duration": 120
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 0, "y": 117, "w": 33, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 33, "h": 38 },
+    "sourceSize": { "w": 38, "h": 40 },
+    "duration": 120
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 34, "y": 40, "w": 34, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 34, "h": 39 },
+    "sourceSize": { "w": 38, "h": 40 },
+    "duration": 120
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 69, "y": 37, "w": 35, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 35, "h": 38 },
+    "sourceSize": { "w": 38, "h": 40 },
+    "duration": 120
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 33, "y": 118, "w": 33, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 33, "h": 38 },
+    "sourceSize": { "w": 38, "h": 40 },
+    "duration": 120
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 66, "y": 114, "w": 33, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 33, "h": 38 },
+    "sourceSize": { "w": 38, "h": 40 },
+    "duration": 120
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 68, "y": 75, "w": 33, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 33, "h": 39 },
+    "sourceSize": { "w": 38, "h": 40 },
+    "duration": 120
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 35, "y": 0, "w": 34, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 34, "h": 40 },
+    "sourceSize": { "w": 38, "h": 40 },
+    "duration": 120
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 0, "y": 0, "w": 35, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 35, "h": 39 },
+    "sourceSize": { "w": 38, "h": 40 },
+    "duration": 120
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 0, "y": 78, "w": 33, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 33, "h": 39 },
+    "sourceSize": { "w": 38, "h": 40 },
+    "duration": 120
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 66, "y": 114, "w": 33, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 33, "h": 38 },
+    "sourceSize": { "w": 38, "h": 40 },
+    "duration": 120
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 0, "y": 117, "w": 33, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 33, "h": 38 },
+    "sourceSize": { "w": 38, "h": 40 },
+    "duration": 120
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 34, "y": 40, "w": 34, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 34, "h": 39 },
+    "sourceSize": { "w": 38, "h": 40 },
+    "duration": 120
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 69, "y": 37, "w": 35, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 35, "h": 38 },
+    "sourceSize": { "w": 38, "h": 40 },
+    "duration": 120
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 33, "y": 118, "w": 33, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 33, "h": 38 },
+    "sourceSize": { "w": 38, "h": 40 },
+    "duration": 120
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 66, "y": 114, "w": 33, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 33, "h": 38 },
+    "sourceSize": { "w": 38, "h": 40 },
+    "duration": 120
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 68, "y": 75, "w": 33, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 33, "h": 39 },
+    "sourceSize": { "w": 38, "h": 40 },
+    "duration": 120
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 35, "y": 0, "w": 34, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 34, "h": 40 },
+    "sourceSize": { "w": 38, "h": 40 },
+    "duration": 120
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 0, "y": 0, "w": 35, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 35, "h": 39 },
+    "sourceSize": { "w": 38, "h": 40 },
+    "duration": 120
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 0, "y": 78, "w": 33, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 33, "h": 39 },
+    "sourceSize": { "w": 38, "h": 40 },
+    "duration": 120
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 66, "y": 114, "w": 33, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 33, "h": 38 },
+    "sourceSize": { "w": 38, "h": 40 },
+    "duration": 120
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 33, "y": 79, "w": 33, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 33, "h": 39 },
+    "sourceSize": { "w": 38, "h": 40 },
+    "duration": 120
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 33, "y": 79, "w": 33, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 33, "h": 39 },
+    "sourceSize": { "w": 38, "h": 40 },
+    "duration": 120
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 101, "y": 112, "w": 34, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 34, "h": 37 },
+    "sourceSize": { "w": 38, "h": 40 },
+    "duration": 120
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 69, "y": 0, "w": 36, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 36, "h": 37 },
+    "sourceSize": { "w": 38, "h": 40 },
+    "duration": 120
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 105, "y": 0, "w": 37, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 37, "h": 36 },
+    "sourceSize": { "w": 38, "h": 40 },
+    "duration": 120
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 69, "y": 0, "w": 36, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 36, "h": 37 },
+    "sourceSize": { "w": 38, "h": 40 },
+    "duration": 120
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 105, "y": 0, "w": 37, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 37, "h": 36 },
+    "sourceSize": { "w": 38, "h": 40 },
+    "duration": 120
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 69, "y": 0, "w": 36, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 36, "h": 37 },
+    "sourceSize": { "w": 38, "h": 40 },
+    "duration": 120
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 105, "y": 0, "w": 37, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 37, "h": 36 },
+    "sourceSize": { "w": 38, "h": 40 },
+    "duration": 120
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 69, "y": 0, "w": 36, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 36, "h": 37 },
+    "sourceSize": { "w": 38, "h": 40 },
+    "duration": 120
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 104, "y": 74, "w": 34, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 34, "h": 38 },
+    "sourceSize": { "w": 38, "h": 40 },
+    "duration": 120
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 33, "y": 79, "w": 33, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 33, "h": 39 },
+    "sourceSize": { "w": 38, "h": 40 },
+    "duration": 120
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.11-x64",
+  "image": "661.png",
+  "format": "I8",
+  "size": { "w": 142, "h": 156 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/shiny/661.png b/public/images/pokemon/exp/back/shiny/661.png
index a76bde31ab3..a38de0cabe4 100644
Binary files a/public/images/pokemon/exp/back/shiny/661.png and b/public/images/pokemon/exp/back/shiny/661.png differ
diff --git a/public/images/pokemon/exp/back/shiny/662.json b/public/images/pokemon/exp/back/shiny/662.json
index f2154fb0de0..52cc70bbe5d 100644
--- a/public/images/pokemon/exp/back/shiny/662.json
+++ b/public/images/pokemon/exp/back/shiny/662.json
@@ -1,671 +1,254 @@
-{
-	"textures": [
-		{
-			"image": "662.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 154,
-				"h": 154
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 16,
-						"w": 56,
-						"h": 37
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 56,
-						"h": 37
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 16,
-						"w": 56,
-						"h": 37
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 56,
-						"h": 37
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 16,
-						"w": 56,
-						"h": 37
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 56,
-						"h": 37
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 16,
-						"w": 56,
-						"h": 37
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 56,
-						"h": 37
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 17,
-						"w": 49,
-						"h": 48
-					},
-					"frame": {
-						"x": 56,
-						"y": 0,
-						"w": 49,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 17,
-						"w": 49,
-						"h": 48
-					},
-					"frame": {
-						"x": 56,
-						"y": 0,
-						"w": 49,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 17,
-						"w": 49,
-						"h": 48
-					},
-					"frame": {
-						"x": 105,
-						"y": 0,
-						"w": 49,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 17,
-						"w": 49,
-						"h": 48
-					},
-					"frame": {
-						"x": 105,
-						"y": 0,
-						"w": 49,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 57,
-						"h": 50
-					},
-					"frame": {
-						"x": 0,
-						"y": 48,
-						"w": 57,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 57,
-						"h": 50
-					},
-					"frame": {
-						"x": 0,
-						"y": 48,
-						"w": 57,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0027.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 57,
-						"h": 50
-					},
-					"frame": {
-						"x": 0,
-						"y": 48,
-						"w": 57,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0028.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 57,
-						"h": 50
-					},
-					"frame": {
-						"x": 0,
-						"y": 48,
-						"w": 57,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 57,
-						"h": 51
-					},
-					"frame": {
-						"x": 57,
-						"y": 48,
-						"w": 57,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 57,
-						"h": 51
-					},
-					"frame": {
-						"x": 57,
-						"y": 48,
-						"w": 57,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0029.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 57,
-						"h": 51
-					},
-					"frame": {
-						"x": 57,
-						"y": 48,
-						"w": 57,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0030.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 57,
-						"h": 51
-					},
-					"frame": {
-						"x": 57,
-						"y": 48,
-						"w": 57,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 57,
-						"h": 52
-					},
-					"frame": {
-						"x": 0,
-						"y": 98,
-						"w": 57,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 57,
-						"h": 52
-					},
-					"frame": {
-						"x": 0,
-						"y": 98,
-						"w": 57,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 57,
-						"h": 52
-					},
-					"frame": {
-						"x": 0,
-						"y": 98,
-						"w": 57,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 57,
-						"h": 52
-					},
-					"frame": {
-						"x": 0,
-						"y": 98,
-						"w": 57,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 57,
-						"h": 52
-					},
-					"frame": {
-						"x": 0,
-						"y": 98,
-						"w": 57,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 57,
-						"h": 52
-					},
-					"frame": {
-						"x": 0,
-						"y": 98,
-						"w": 57,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 57,
-						"h": 52
-					},
-					"frame": {
-						"x": 0,
-						"y": 98,
-						"w": 57,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 57,
-						"h": 52
-					},
-					"frame": {
-						"x": 0,
-						"y": 98,
-						"w": 57,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0025.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 57,
-						"h": 52
-					},
-					"frame": {
-						"x": 0,
-						"y": 98,
-						"w": 57,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0026.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 57,
-						"h": 52
-					},
-					"frame": {
-						"x": 0,
-						"y": 98,
-						"w": 57,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0031.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 57,
-						"h": 52
-					},
-					"frame": {
-						"x": 0,
-						"y": 98,
-						"w": 57,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 57,
-						"h": 52
-					},
-					"frame": {
-						"x": 57,
-						"y": 99,
-						"w": 57,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 57,
-						"h": 52
-					},
-					"frame": {
-						"x": 57,
-						"y": 99,
-						"w": 57,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 57,
-						"h": 52
-					},
-					"frame": {
-						"x": 57,
-						"y": 99,
-						"w": 57,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 57,
-						"h": 52
-					},
-					"frame": {
-						"x": 57,
-						"y": 99,
-						"w": 57,
-						"h": 52
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:14a51ba69bd1aad179c85e117e323d5e:a3d65c092dec9149a9e5c39aed3a7dc3:e3da2dd0277c18bcc713dc6dd2460c87$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 1, "y": 70, "w": 53, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 16, "w": 53, "h": 62 },
+    "sourceSize": { "w": 70, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 212, "y": 70, "w": 52, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 18, "w": 52, "h": 63 },
+    "sourceSize": { "w": 70, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 247, "y": 204, "w": 46, "h": 51 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 36, "w": 46, "h": 51 },
+    "sourceSize": { "w": 70, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 1, "y": 196, "w": 49, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 33, "w": 49, "h": 49 },
+    "sourceSize": { "w": 70, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 56, "y": 1, "w": 56, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 15, "w": 56, "h": 65 },
+    "sourceSize": { "w": 70, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 224, "y": 1, "w": 52, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 10, "w": 52, "h": 68 },
+    "sourceSize": { "w": 70, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 107, "y": 68, "w": 48, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 6, "w": 48, "h": 69 },
+    "sourceSize": { "w": 70, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 277, "y": 1, "w": 51, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 12, "w": 51, "h": 68 },
+    "sourceSize": { "w": 70, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 113, "y": 1, "w": 55, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 18, "w": 55, "h": 66 },
+    "sourceSize": { "w": 70, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 48, "y": 249, "w": 44, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 31, "w": 44, "h": 50 },
+    "sourceSize": { "w": 70, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 191, "y": 248, "w": 47, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 27, "w": 47, "h": 49 },
+    "sourceSize": { "w": 70, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 169, "y": 1, "w": 54, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 54, "h": 67 },
+    "sourceSize": { "w": 70, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 101, "y": 208, "w": 45, "h": 51 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 19, "y": 18, "w": 45, "h": 51 },
+    "sourceSize": { "w": 70, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 1, "y": 246, "w": 46, "h": 51 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 13, "w": 46, "h": 51 },
+    "sourceSize": { "w": 70, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 1, "y": 1, "w": 54, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 54, "h": 68 },
+    "sourceSize": { "w": 70, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 56, "y": 67, "w": 50, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 50, "h": 69 },
+    "sourceSize": { "w": 70, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 265, "y": 70, "w": 47, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 6, "w": 47, "h": 69 },
+    "sourceSize": { "w": 70, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 102, "y": 138, "w": 44, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 11, "w": 44, "h": 69 },
+    "sourceSize": { "w": 70, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 147, "y": 193, "w": 43, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 17, "y": 14, "w": 43, "h": 69 },
+    "sourceSize": { "w": 70, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 191, "y": 199, "w": 55, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 31, "w": 55, "h": 48 },
+    "sourceSize": { "w": 70, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 51, "y": 200, "w": 49, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 27, "w": 49, "h": 48 },
+    "sourceSize": { "w": 70, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 156, "y": 69, "w": 55, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 11, "w": 55, "h": 60 },
+    "sourceSize": { "w": 70, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 1, "y": 133, "w": 50, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 6, "w": 50, "h": 62 },
+    "sourceSize": { "w": 70, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 208, "y": 134, "w": 48, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 2, "w": 48, "h": 64 },
+    "sourceSize": { "w": 70, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 257, "y": 140, "w": 48, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 6, "w": 48, "h": 63 },
+    "sourceSize": { "w": 70, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 52, "y": 137, "w": 49, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 10, "w": 49, "h": 62 },
+    "sourceSize": { "w": 70, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 156, "y": 130, "w": 51, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 13, "w": 51, "h": 62 },
+    "sourceSize": { "w": 70, "h": 87 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.11-x64",
+  "image": "662.png",
+  "format": "I8",
+  "size": { "w": 329, "h": 300 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/shiny/662.png b/public/images/pokemon/exp/back/shiny/662.png
index e662b3198a6..b914dac31b1 100644
Binary files a/public/images/pokemon/exp/back/shiny/662.png and b/public/images/pokemon/exp/back/shiny/662.png differ
diff --git a/public/images/pokemon/exp/back/shiny/663.json b/public/images/pokemon/exp/back/shiny/663.json
index d464b333f20..48526624362 100644
--- a/public/images/pokemon/exp/back/shiny/663.json
+++ b/public/images/pokemon/exp/back/shiny/663.json
@@ -1,1700 +1,731 @@
-{
-	"textures": [
-		{
-			"image": "663.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 302,
-				"h": 302
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 116,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 33,
-						"w": 103,
-						"h": 59
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 103,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 116,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 33,
-						"w": 103,
-						"h": 59
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 103,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0027.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 116,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 33,
-						"w": 103,
-						"h": 59
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 103,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0037.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 116,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 33,
-						"w": 103,
-						"h": 59
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 103,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0047.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 116,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 33,
-						"w": 103,
-						"h": 59
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 103,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0057.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 116,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 33,
-						"w": 103,
-						"h": 59
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 103,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0064.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 116,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 33,
-						"w": 103,
-						"h": 59
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 103,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0069.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 116,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 33,
-						"w": 103,
-						"h": 59
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 103,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0074.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 116,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 33,
-						"w": 103,
-						"h": 59
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 103,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0079.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 116,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 33,
-						"w": 103,
-						"h": 59
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 103,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 116,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 29,
-						"w": 112,
-						"h": 60
-					},
-					"frame": {
-						"x": 103,
-						"y": 0,
-						"w": 112,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 116,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 29,
-						"w": 112,
-						"h": 60
-					},
-					"frame": {
-						"x": 103,
-						"y": 0,
-						"w": 112,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0026.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 116,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 29,
-						"w": 112,
-						"h": 60
-					},
-					"frame": {
-						"x": 103,
-						"y": 0,
-						"w": 112,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0036.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 116,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 29,
-						"w": 112,
-						"h": 60
-					},
-					"frame": {
-						"x": 103,
-						"y": 0,
-						"w": 112,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0046.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 116,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 29,
-						"w": 112,
-						"h": 60
-					},
-					"frame": {
-						"x": 103,
-						"y": 0,
-						"w": 112,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0056.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 116,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 29,
-						"w": 112,
-						"h": 60
-					},
-					"frame": {
-						"x": 103,
-						"y": 0,
-						"w": 112,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 116,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 14,
-						"y": 0,
-						"w": 84,
-						"h": 93
-					},
-					"frame": {
-						"x": 215,
-						"y": 0,
-						"w": 84,
-						"h": 93
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 116,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 14,
-						"y": 0,
-						"w": 84,
-						"h": 93
-					},
-					"frame": {
-						"x": 215,
-						"y": 0,
-						"w": 84,
-						"h": 93
-					}
-				},
-				{
-					"filename": "0030.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 116,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 14,
-						"y": 0,
-						"w": 84,
-						"h": 93
-					},
-					"frame": {
-						"x": 215,
-						"y": 0,
-						"w": 84,
-						"h": 93
-					}
-				},
-				{
-					"filename": "0040.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 116,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 14,
-						"y": 0,
-						"w": 84,
-						"h": 93
-					},
-					"frame": {
-						"x": 215,
-						"y": 0,
-						"w": 84,
-						"h": 93
-					}
-				},
-				{
-					"filename": "0050.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 116,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 14,
-						"y": 0,
-						"w": 84,
-						"h": 93
-					},
-					"frame": {
-						"x": 215,
-						"y": 0,
-						"w": 84,
-						"h": 93
-					}
-				},
-				{
-					"filename": "0060.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 116,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 14,
-						"y": 0,
-						"w": 84,
-						"h": 93
-					},
-					"frame": {
-						"x": 215,
-						"y": 0,
-						"w": 84,
-						"h": 93
-					}
-				},
-				{
-					"filename": "0065.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 116,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 14,
-						"y": 0,
-						"w": 84,
-						"h": 93
-					},
-					"frame": {
-						"x": 215,
-						"y": 0,
-						"w": 84,
-						"h": 93
-					}
-				},
-				{
-					"filename": "0070.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 116,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 14,
-						"y": 0,
-						"w": 84,
-						"h": 93
-					},
-					"frame": {
-						"x": 215,
-						"y": 0,
-						"w": 84,
-						"h": 93
-					}
-				},
-				{
-					"filename": "0075.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 116,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 14,
-						"y": 0,
-						"w": 84,
-						"h": 93
-					},
-					"frame": {
-						"x": 215,
-						"y": 0,
-						"w": 84,
-						"h": 93
-					}
-				},
-				{
-					"filename": "0080.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 116,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 14,
-						"y": 0,
-						"w": 84,
-						"h": 93
-					},
-					"frame": {
-						"x": 215,
-						"y": 0,
-						"w": 84,
-						"h": 93
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 116,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 29,
-						"w": 112,
-						"h": 62
-					},
-					"frame": {
-						"x": 0,
-						"y": 60,
-						"w": 112,
-						"h": 62
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 116,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 29,
-						"w": 112,
-						"h": 62
-					},
-					"frame": {
-						"x": 0,
-						"y": 60,
-						"w": 112,
-						"h": 62
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 116,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 29,
-						"w": 112,
-						"h": 62
-					},
-					"frame": {
-						"x": 0,
-						"y": 60,
-						"w": 112,
-						"h": 62
-					}
-				},
-				{
-					"filename": "0034.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 116,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 29,
-						"w": 112,
-						"h": 62
-					},
-					"frame": {
-						"x": 0,
-						"y": 60,
-						"w": 112,
-						"h": 62
-					}
-				},
-				{
-					"filename": "0044.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 116,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 29,
-						"w": 112,
-						"h": 62
-					},
-					"frame": {
-						"x": 0,
-						"y": 60,
-						"w": 112,
-						"h": 62
-					}
-				},
-				{
-					"filename": "0054.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 116,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 29,
-						"w": 112,
-						"h": 62
-					},
-					"frame": {
-						"x": 0,
-						"y": 60,
-						"w": 112,
-						"h": 62
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 116,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 2,
-						"w": 98,
-						"h": 90
-					},
-					"frame": {
-						"x": 112,
-						"y": 60,
-						"w": 98,
-						"h": 90
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 116,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 2,
-						"w": 98,
-						"h": 90
-					},
-					"frame": {
-						"x": 112,
-						"y": 60,
-						"w": 98,
-						"h": 90
-					}
-				},
-				{
-					"filename": "0028.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 116,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 2,
-						"w": 98,
-						"h": 90
-					},
-					"frame": {
-						"x": 112,
-						"y": 60,
-						"w": 98,
-						"h": 90
-					}
-				},
-				{
-					"filename": "0038.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 116,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 2,
-						"w": 98,
-						"h": 90
-					},
-					"frame": {
-						"x": 112,
-						"y": 60,
-						"w": 98,
-						"h": 90
-					}
-				},
-				{
-					"filename": "0048.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 116,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 2,
-						"w": 98,
-						"h": 90
-					},
-					"frame": {
-						"x": 112,
-						"y": 60,
-						"w": 98,
-						"h": 90
-					}
-				},
-				{
-					"filename": "0058.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 116,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 2,
-						"w": 98,
-						"h": 90
-					},
-					"frame": {
-						"x": 112,
-						"y": 60,
-						"w": 98,
-						"h": 90
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 116,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 0,
-						"w": 92,
-						"h": 93
-					},
-					"frame": {
-						"x": 210,
-						"y": 93,
-						"w": 92,
-						"h": 93
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 116,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 0,
-						"w": 92,
-						"h": 93
-					},
-					"frame": {
-						"x": 210,
-						"y": 93,
-						"w": 92,
-						"h": 93
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 116,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 0,
-						"w": 92,
-						"h": 93
-					},
-					"frame": {
-						"x": 210,
-						"y": 93,
-						"w": 92,
-						"h": 93
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 116,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 0,
-						"w": 92,
-						"h": 93
-					},
-					"frame": {
-						"x": 210,
-						"y": 93,
-						"w": 92,
-						"h": 93
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 116,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 0,
-						"w": 92,
-						"h": 93
-					},
-					"frame": {
-						"x": 210,
-						"y": 93,
-						"w": 92,
-						"h": 93
-					}
-				},
-				{
-					"filename": "0029.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 116,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 0,
-						"w": 92,
-						"h": 93
-					},
-					"frame": {
-						"x": 210,
-						"y": 93,
-						"w": 92,
-						"h": 93
-					}
-				},
-				{
-					"filename": "0031.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 116,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 0,
-						"w": 92,
-						"h": 93
-					},
-					"frame": {
-						"x": 210,
-						"y": 93,
-						"w": 92,
-						"h": 93
-					}
-				},
-				{
-					"filename": "0039.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 116,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 0,
-						"w": 92,
-						"h": 93
-					},
-					"frame": {
-						"x": 210,
-						"y": 93,
-						"w": 92,
-						"h": 93
-					}
-				},
-				{
-					"filename": "0041.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 116,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 0,
-						"w": 92,
-						"h": 93
-					},
-					"frame": {
-						"x": 210,
-						"y": 93,
-						"w": 92,
-						"h": 93
-					}
-				},
-				{
-					"filename": "0049.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 116,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 0,
-						"w": 92,
-						"h": 93
-					},
-					"frame": {
-						"x": 210,
-						"y": 93,
-						"w": 92,
-						"h": 93
-					}
-				},
-				{
-					"filename": "0051.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 116,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 0,
-						"w": 92,
-						"h": 93
-					},
-					"frame": {
-						"x": 210,
-						"y": 93,
-						"w": 92,
-						"h": 93
-					}
-				},
-				{
-					"filename": "0059.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 116,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 0,
-						"w": 92,
-						"h": 93
-					},
-					"frame": {
-						"x": 210,
-						"y": 93,
-						"w": 92,
-						"h": 93
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 116,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 28,
-						"w": 109,
-						"h": 65
-					},
-					"frame": {
-						"x": 0,
-						"y": 122,
-						"w": 109,
-						"h": 65
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 116,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 28,
-						"w": 109,
-						"h": 65
-					},
-					"frame": {
-						"x": 0,
-						"y": 122,
-						"w": 109,
-						"h": 65
-					}
-				},
-				{
-					"filename": "0025.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 116,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 28,
-						"w": 109,
-						"h": 65
-					},
-					"frame": {
-						"x": 0,
-						"y": 122,
-						"w": 109,
-						"h": 65
-					}
-				},
-				{
-					"filename": "0035.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 116,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 28,
-						"w": 109,
-						"h": 65
-					},
-					"frame": {
-						"x": 0,
-						"y": 122,
-						"w": 109,
-						"h": 65
-					}
-				},
-				{
-					"filename": "0045.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 116,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 28,
-						"w": 109,
-						"h": 65
-					},
-					"frame": {
-						"x": 0,
-						"y": 122,
-						"w": 109,
-						"h": 65
-					}
-				},
-				{
-					"filename": "0055.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 116,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 28,
-						"w": 109,
-						"h": 65
-					},
-					"frame": {
-						"x": 0,
-						"y": 122,
-						"w": 109,
-						"h": 65
-					}
-				},
-				{
-					"filename": "0063.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 116,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 28,
-						"w": 109,
-						"h": 65
-					},
-					"frame": {
-						"x": 0,
-						"y": 122,
-						"w": 109,
-						"h": 65
-					}
-				},
-				{
-					"filename": "0068.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 116,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 28,
-						"w": 109,
-						"h": 65
-					},
-					"frame": {
-						"x": 0,
-						"y": 122,
-						"w": 109,
-						"h": 65
-					}
-				},
-				{
-					"filename": "0073.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 116,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 28,
-						"w": 109,
-						"h": 65
-					},
-					"frame": {
-						"x": 0,
-						"y": 122,
-						"w": 109,
-						"h": 65
-					}
-				},
-				{
-					"filename": "0078.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 116,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 28,
-						"w": 109,
-						"h": 65
-					},
-					"frame": {
-						"x": 0,
-						"y": 122,
-						"w": 109,
-						"h": 65
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 116,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 1,
-						"w": 97,
-						"h": 91
-					},
-					"frame": {
-						"x": 109,
-						"y": 150,
-						"w": 97,
-						"h": 91
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 116,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 1,
-						"w": 97,
-						"h": 91
-					},
-					"frame": {
-						"x": 109,
-						"y": 150,
-						"w": 97,
-						"h": 91
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 116,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 1,
-						"w": 97,
-						"h": 91
-					},
-					"frame": {
-						"x": 109,
-						"y": 150,
-						"w": 97,
-						"h": 91
-					}
-				},
-				{
-					"filename": "0032.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 116,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 1,
-						"w": 97,
-						"h": 91
-					},
-					"frame": {
-						"x": 109,
-						"y": 150,
-						"w": 97,
-						"h": 91
-					}
-				},
-				{
-					"filename": "0042.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 116,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 1,
-						"w": 97,
-						"h": 91
-					},
-					"frame": {
-						"x": 109,
-						"y": 150,
-						"w": 97,
-						"h": 91
-					}
-				},
-				{
-					"filename": "0052.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 116,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 1,
-						"w": 97,
-						"h": 91
-					},
-					"frame": {
-						"x": 109,
-						"y": 150,
-						"w": 97,
-						"h": 91
-					}
-				},
-				{
-					"filename": "0061.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 116,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 1,
-						"w": 97,
-						"h": 91
-					},
-					"frame": {
-						"x": 109,
-						"y": 150,
-						"w": 97,
-						"h": 91
-					}
-				},
-				{
-					"filename": "0066.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 116,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 1,
-						"w": 97,
-						"h": 91
-					},
-					"frame": {
-						"x": 109,
-						"y": 150,
-						"w": 97,
-						"h": 91
-					}
-				},
-				{
-					"filename": "0071.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 116,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 1,
-						"w": 97,
-						"h": 91
-					},
-					"frame": {
-						"x": 109,
-						"y": 150,
-						"w": 97,
-						"h": 91
-					}
-				},
-				{
-					"filename": "0076.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 116,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 1,
-						"w": 97,
-						"h": 91
-					},
-					"frame": {
-						"x": 109,
-						"y": 150,
-						"w": 97,
-						"h": 91
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 116,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 11,
-						"y": 8,
-						"w": 105,
-						"h": 83
-					},
-					"frame": {
-						"x": 0,
-						"y": 187,
-						"w": 105,
-						"h": 83
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 116,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 11,
-						"y": 8,
-						"w": 105,
-						"h": 83
-					},
-					"frame": {
-						"x": 0,
-						"y": 187,
-						"w": 105,
-						"h": 83
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 116,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 11,
-						"y": 8,
-						"w": 105,
-						"h": 83
-					},
-					"frame": {
-						"x": 0,
-						"y": 187,
-						"w": 105,
-						"h": 83
-					}
-				},
-				{
-					"filename": "0033.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 116,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 11,
-						"y": 8,
-						"w": 105,
-						"h": 83
-					},
-					"frame": {
-						"x": 0,
-						"y": 187,
-						"w": 105,
-						"h": 83
-					}
-				},
-				{
-					"filename": "0043.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 116,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 11,
-						"y": 8,
-						"w": 105,
-						"h": 83
-					},
-					"frame": {
-						"x": 0,
-						"y": 187,
-						"w": 105,
-						"h": 83
-					}
-				},
-				{
-					"filename": "0053.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 116,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 11,
-						"y": 8,
-						"w": 105,
-						"h": 83
-					},
-					"frame": {
-						"x": 0,
-						"y": 187,
-						"w": 105,
-						"h": 83
-					}
-				},
-				{
-					"filename": "0062.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 116,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 11,
-						"y": 8,
-						"w": 105,
-						"h": 83
-					},
-					"frame": {
-						"x": 0,
-						"y": 187,
-						"w": 105,
-						"h": 83
-					}
-				},
-				{
-					"filename": "0067.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 116,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 11,
-						"y": 8,
-						"w": 105,
-						"h": 83
-					},
-					"frame": {
-						"x": 0,
-						"y": 187,
-						"w": 105,
-						"h": 83
-					}
-				},
-				{
-					"filename": "0072.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 116,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 11,
-						"y": 8,
-						"w": 105,
-						"h": 83
-					},
-					"frame": {
-						"x": 0,
-						"y": 187,
-						"w": 105,
-						"h": 83
-					}
-				},
-				{
-					"filename": "0077.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 116,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 11,
-						"y": 8,
-						"w": 105,
-						"h": 83
-					},
-					"frame": {
-						"x": 0,
-						"y": 187,
-						"w": 105,
-						"h": 83
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:cee80289834c8acf0ea6d754131cf471:08d47f0b9be8c73bf8d3f74f4dc0a00d:3790d8d72a704a789cc594688d98802e$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 298, "y": 0, "w": 90, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 19, "y": 3, "w": 90, "h": 91 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 0, "y": 0, "w": 95, "h": 89 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 4, "w": 95, "h": 89 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 193, "y": 0, "w": 104, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 11, "w": 104, "h": 81 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 276, "y": 92, "w": 111, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 32, "w": 111, "h": 60 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 0, "y": 90, "w": 107, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 31, "w": 107, "h": 64 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 276, "y": 153, "w": 110, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 32, "w": 110, "h": 58 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 0, "y": 155, "w": 101, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 36, "w": 101, "h": 57 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 96, "y": 0, "w": 96, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 16, "y": 5, "w": 96, "h": 88 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 298, "y": 0, "w": 90, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 19, "y": 3, "w": 90, "h": 91 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 193, "y": 82, "w": 82, "h": 93 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 2, "w": 82, "h": 93 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 298, "y": 0, "w": 90, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 19, "y": 3, "w": 90, "h": 91 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 0, "y": 0, "w": 95, "h": 89 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 4, "w": 95, "h": 89 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 193, "y": 0, "w": 104, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 11, "w": 104, "h": 81 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 276, "y": 92, "w": 111, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 32, "w": 111, "h": 60 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 0, "y": 90, "w": 107, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 31, "w": 107, "h": 64 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 276, "y": 153, "w": 110, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 32, "w": 110, "h": 58 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 0, "y": 155, "w": 101, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 36, "w": 101, "h": 57 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 96, "y": 0, "w": 96, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 16, "y": 5, "w": 96, "h": 88 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 298, "y": 0, "w": 90, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 19, "y": 3, "w": 90, "h": 91 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 193, "y": 82, "w": 82, "h": 93 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 2, "w": 82, "h": 93 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 298, "y": 0, "w": 90, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 19, "y": 3, "w": 90, "h": 91 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 0, "y": 0, "w": 95, "h": 89 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 4, "w": 95, "h": 89 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 193, "y": 0, "w": 104, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 11, "w": 104, "h": 81 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 276, "y": 92, "w": 111, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 32, "w": 111, "h": 60 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 0, "y": 90, "w": 107, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 31, "w": 107, "h": 64 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 276, "y": 153, "w": 110, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 32, "w": 110, "h": 58 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 0, "y": 155, "w": 101, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 36, "w": 101, "h": 57 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 96, "y": 0, "w": 96, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 16, "y": 5, "w": 96, "h": 88 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 298, "y": 0, "w": 90, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 19, "y": 3, "w": 90, "h": 91 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 193, "y": 82, "w": 82, "h": 93 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 2, "w": 82, "h": 93 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 298, "y": 0, "w": 90, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 19, "y": 3, "w": 90, "h": 91 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 0, "y": 0, "w": 95, "h": 89 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 4, "w": 95, "h": 89 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 193, "y": 0, "w": 104, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 11, "w": 104, "h": 81 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 276, "y": 92, "w": 111, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 32, "w": 111, "h": 60 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 0, "y": 90, "w": 107, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 31, "w": 107, "h": 64 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 276, "y": 153, "w": 110, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 32, "w": 110, "h": 58 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 0, "y": 155, "w": 101, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 36, "w": 101, "h": 57 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 96, "y": 0, "w": 96, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 16, "y": 5, "w": 96, "h": 88 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 298, "y": 0, "w": 90, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 19, "y": 3, "w": 90, "h": 91 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 193, "y": 82, "w": 82, "h": 93 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 2, "w": 82, "h": 93 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 298, "y": 0, "w": 90, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 19, "y": 3, "w": 90, "h": 91 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 0, "y": 0, "w": 95, "h": 89 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 4, "w": 95, "h": 89 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 193, "y": 0, "w": 104, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 11, "w": 104, "h": 81 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 276, "y": 92, "w": 111, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 32, "w": 111, "h": 60 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 0, "y": 90, "w": 107, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 31, "w": 107, "h": 64 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 276, "y": 153, "w": 110, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 32, "w": 110, "h": 58 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 0, "y": 155, "w": 101, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 36, "w": 101, "h": 57 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 96, "y": 0, "w": 96, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 16, "y": 5, "w": 96, "h": 88 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 298, "y": 0, "w": 90, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 19, "y": 3, "w": 90, "h": 91 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 193, "y": 82, "w": 82, "h": 93 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 2, "w": 82, "h": 93 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 298, "y": 0, "w": 90, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 19, "y": 3, "w": 90, "h": 91 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 0, "y": 0, "w": 95, "h": 89 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 4, "w": 95, "h": 89 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 193, "y": 0, "w": 104, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 11, "w": 104, "h": 81 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 276, "y": 92, "w": 111, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 32, "w": 111, "h": 60 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 0, "y": 90, "w": 107, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 31, "w": 107, "h": 64 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 276, "y": 153, "w": 110, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 32, "w": 110, "h": 58 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 0, "y": 155, "w": 101, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 36, "w": 101, "h": 57 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 96, "y": 0, "w": 96, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 16, "y": 5, "w": 96, "h": 88 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 298, "y": 0, "w": 90, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 19, "y": 3, "w": 90, "h": 91 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 193, "y": 82, "w": 82, "h": 93 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 2, "w": 82, "h": 93 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 0, "y": 0, "w": 95, "h": 89 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 4, "w": 95, "h": 89 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 193, "y": 0, "w": 104, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 11, "w": 104, "h": 81 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 0, "y": 90, "w": 107, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 31, "w": 107, "h": 64 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 0, "y": 155, "w": 101, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 36, "w": 101, "h": 57 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 193, "y": 82, "w": 82, "h": 93 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 2, "w": 82, "h": 93 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 0, "y": 0, "w": 95, "h": 89 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 4, "w": 95, "h": 89 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 193, "y": 0, "w": 104, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 11, "w": 104, "h": 81 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 0, "y": 90, "w": 107, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 31, "w": 107, "h": 64 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 0, "y": 155, "w": 101, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 36, "w": 101, "h": 57 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 193, "y": 82, "w": 82, "h": 93 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 2, "w": 82, "h": 93 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 0, "y": 0, "w": 95, "h": 89 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 4, "w": 95, "h": 89 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 193, "y": 0, "w": 104, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 11, "w": 104, "h": 81 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 0, "y": 90, "w": 107, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 31, "w": 107, "h": 64 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 0, "y": 155, "w": 101, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 36, "w": 101, "h": 57 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 193, "y": 82, "w": 82, "h": 93 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 2, "w": 82, "h": 93 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 0, "y": 0, "w": 95, "h": 89 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 4, "w": 95, "h": 89 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 193, "y": 0, "w": 104, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 11, "w": 104, "h": 81 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 0, "y": 90, "w": 107, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 31, "w": 107, "h": 64 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 0, "y": 155, "w": 101, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 36, "w": 101, "h": 57 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 193, "y": 82, "w": 82, "h": 93 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 2, "w": 82, "h": 93 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "663.png",
+  "format": "I8",
+  "size": { "w": 388, "h": 212 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/shiny/663.png b/public/images/pokemon/exp/back/shiny/663.png
index bb8a7a63b47..ddb4658f34f 100644
Binary files a/public/images/pokemon/exp/back/shiny/663.png and b/public/images/pokemon/exp/back/shiny/663.png differ
diff --git a/public/images/pokemon/exp/back/shiny/664.json b/public/images/pokemon/exp/back/shiny/664.json
index 737a874aeef..61c85d30239 100644
--- a/public/images/pokemon/exp/back/shiny/664.json
+++ b/public/images/pokemon/exp/back/shiny/664.json
@@ -1,104 +1,110 @@
-{
-	"textures": [
-		{
-			"image": "664.png", 
-			"format": "RGBA8888", 
-			"size": {
-				"w": 72, 
-				"h": 72
-			}, 
-			"scale": 1, 
-			"frames": [
-				{
-					"filename": "0002.png", 
-					"rotated": false, 
-					"trimmed": false, 
-					"sourceSize": {
-						"w": 24, 
-						"h": 44
-					}, 
-					"spriteSourceSize": {
-						"x": 0, 
-						"y": 0, 
-						"w": 24, 
-						"h": 44
-					}, 
-					"frame": {
-						"x": 0, 
-						"y": 0, 
-						"w": 24, 
-						"h": 44
-					}
-				}, 
-				{
-					"filename": "0004.png", 
-					"rotated": false, 
-					"trimmed": false, 
-					"sourceSize": {
-						"w": 24, 
-						"h": 44
-					}, 
-					"spriteSourceSize": {
-						"x": 0, 
-						"y": 0, 
-						"w": 24, 
-						"h": 44
-					}, 
-					"frame": {
-						"x": 0, 
-						"y": 0, 
-						"w": 24, 
-						"h": 44
-					}
-				}, 
-				{
-					"filename": "0003.png", 
-					"rotated": false, 
-					"trimmed": false, 
-					"sourceSize": {
-						"w": 24, 
-						"h": 44
-					}, 
-					"spriteSourceSize": {
-						"x": 0, 
-						"y": 0, 
-						"w": 24, 
-						"h": 44
-					}, 
-					"frame": {
-						"x": 24, 
-						"y": 0, 
-						"w": 24, 
-						"h": 44
-					}
-				}, 
-				{
-					"filename": "0001.png", 
-					"rotated": false, 
-					"trimmed": true, 
-					"sourceSize": {
-						"w": 24, 
-						"h": 44
-					}, 
-					"spriteSourceSize": {
-						"x": 0, 
-						"y": 2, 
-						"w": 24, 
-						"h": 42
-					}, 
-					"frame": {
-						"x": 48, 
-						"y": 0, 
-						"w": 24, 
-						"h": 42
-					}
-				}
-			]
-		}
-	], 
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker", 
-		"version": "3.0", 
-		"smartupdate": "$TexturePacker:SmartUpdate:601a4fb542614963fb9749e3339712b0:f6208a116912601a698682c3723dc18c:596e7d5b15b1bf041c4d7f6707c8ff49$"
-	}
-}
\ No newline at end of file
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 54, "y": 49, "w": 26, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 26, "h": 49 },
+    "sourceSize": { "w": 28, "h": 49 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 80, "y": 96, "w": 26, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 26, "h": 48 },
+    "sourceSize": { "w": 28, "h": 49 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 0, "y": 97, "w": 26, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 26, "h": 48 },
+    "sourceSize": { "w": 28, "h": 49 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 0, "y": 49, "w": 27, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 27, "h": 48 },
+    "sourceSize": { "w": 28, "h": 49 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 26, "y": 97, "w": 26, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 26, "h": 47 },
+    "sourceSize": { "w": 28, "h": 49 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 80, "y": 49, "w": 27, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 27, "h": 47 },
+    "sourceSize": { "w": 28, "h": 49 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 27, "y": 49, "w": 27, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 27, "h": 48 },
+    "sourceSize": { "w": 28, "h": 49 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 28, "y": 0, "w": 27, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 27, "h": 49 },
+    "sourceSize": { "w": 28, "h": 49 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 55, "y": 0, "w": 27, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 27, "h": 49 },
+    "sourceSize": { "w": 28, "h": 49 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 0, "y": 0, "w": 28, "h": 49 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 28, "h": 49 },
+    "sourceSize": { "w": 28, "h": 49 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 82, "y": 0, "w": 27, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 27, "h": 49 },
+    "sourceSize": { "w": 28, "h": 49 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "664.png",
+  "format": "I8",
+  "size": { "w": 109, "h": 145 },
+  "scale": "1"
+ }
+}
diff --git a/public/images/pokemon/exp/back/shiny/664.png b/public/images/pokemon/exp/back/shiny/664.png
index 84657407fb6..ad6b46a574e 100644
Binary files a/public/images/pokemon/exp/back/shiny/664.png and b/public/images/pokemon/exp/back/shiny/664.png differ
diff --git a/public/images/pokemon/exp/back/shiny/665.json b/public/images/pokemon/exp/back/shiny/665.json
index 74db8ba58cd..fe2659dbf6d 100644
--- a/public/images/pokemon/exp/back/shiny/665.json
+++ b/public/images/pokemon/exp/back/shiny/665.json
@@ -1,188 +1,596 @@
-{
-	"textures": [
-		{
-			"image": "665.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 107,
-				"h": 107
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 38,
-						"h": 36
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 38,
-						"h": 36
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 38,
-						"h": 36
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 38,
-						"h": 36
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 38,
-						"h": 36
-					},
-					"frame": {
-						"x": 0,
-						"y": 36,
-						"w": 38,
-						"h": 36
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 38,
-						"h": 36
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 38,
-						"h": 36
-					},
-					"frame": {
-						"x": 0,
-						"y": 36,
-						"w": 38,
-						"h": 36
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 38,
-						"h": 36
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 38,
-						"h": 36
-					},
-					"frame": {
-						"x": 0,
-						"y": 36,
-						"w": 38,
-						"h": 36
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 36
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 38,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 72,
-						"w": 38,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 36
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 36
-					},
-					"frame": {
-						"x": 38,
-						"y": 0,
-						"w": 37,
-						"h": 36
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 36
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 36
-					},
-					"frame": {
-						"x": 38,
-						"y": 36,
-						"w": 37,
-						"h": 36
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 36
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 38,
-						"h": 35
-					},
-					"frame": {
-						"x": 38,
-						"y": 72,
-						"w": 38,
-						"h": 35
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:33adc9cf726011c23993f48b34d8072e:5df22173a3e399c0e4fd7f67a42a829c:a72e6c94514c750d7462eab6b08ee591$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 126, "y": 66, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 5, "w": 34, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 86, "y": 73, "w": 34, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 6, "w": 34, "h": 34 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 358, "y": 69, "w": 36, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 7, "w": 36, "h": 33 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 0, "y": 71, "w": 36, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 7, "w": 36, "h": 33 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 120, "y": 101, "w": 36, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 8, "w": 36, "h": 32 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 262, "y": 102, "w": 36, "h": 31 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 9, "w": 36, "h": 31 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 120, "y": 101, "w": 36, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 8, "w": 36, "h": 32 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 0, "y": 71, "w": 36, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 7, "w": 36, "h": 33 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 358, "y": 69, "w": 36, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 7, "w": 36, "h": 33 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 86, "y": 73, "w": 34, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 6, "w": 34, "h": 34 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 126, "y": 66, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 5, "w": 34, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 126, "y": 66, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 5, "w": 34, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 126, "y": 66, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 5, "w": 34, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 126, "y": 66, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 5, "w": 34, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 126, "y": 66, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 5, "w": 34, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 86, "y": 73, "w": 34, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 6, "w": 34, "h": 34 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 358, "y": 69, "w": 36, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 7, "w": 36, "h": 33 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 0, "y": 71, "w": 36, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 7, "w": 36, "h": 33 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 120, "y": 101, "w": 36, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 8, "w": 36, "h": 32 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 262, "y": 102, "w": 36, "h": 31 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 9, "w": 36, "h": 31 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 120, "y": 101, "w": 36, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 8, "w": 36, "h": 32 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 0, "y": 71, "w": 36, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 7, "w": 36, "h": 33 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 358, "y": 69, "w": 36, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 7, "w": 36, "h": 33 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 86, "y": 73, "w": 34, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 6, "w": 34, "h": 34 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 126, "y": 66, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 5, "w": 34, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 126, "y": 66, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 5, "w": 34, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 126, "y": 66, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 5, "w": 34, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 126, "y": 66, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 5, "w": 34, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 126, "y": 66, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 5, "w": 34, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 86, "y": 73, "w": 34, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 6, "w": 34, "h": 34 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 358, "y": 69, "w": 36, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 7, "w": 36, "h": 33 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 0, "y": 71, "w": 36, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 7, "w": 36, "h": 33 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 120, "y": 101, "w": 36, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 8, "w": 36, "h": 32 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 262, "y": 102, "w": 36, "h": 31 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 9, "w": 36, "h": 31 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 120, "y": 101, "w": 36, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 8, "w": 36, "h": 32 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 0, "y": 71, "w": 36, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 7, "w": 36, "h": 33 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 358, "y": 69, "w": 36, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 7, "w": 36, "h": 33 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 86, "y": 73, "w": 34, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 6, "w": 34, "h": 34 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 126, "y": 66, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 5, "w": 34, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 126, "y": 66, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 5, "w": 34, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 126, "y": 66, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 5, "w": 34, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 126, "y": 66, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 5, "w": 34, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 126, "y": 66, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 5, "w": 34, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 160, "y": 66, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 5, "w": 34, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 290, "y": 67, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 5, "w": 34, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 160, "y": 66, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 5, "w": 34, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 126, "y": 66, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 5, "w": 34, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 47, "y": 40, "w": 39, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 5, "w": 39, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 343, "y": 34, "w": 45, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 5, "w": 45, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 227, "y": 33, "w": 63, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 4, "w": 63, "h": 36 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 80, "y": 0, "w": 74, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 74, "h": 40 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 154, "y": 0, "w": 81, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 81, "h": 33 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 235, "y": 0, "w": 81, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 81, "h": 33 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 0, "y": 0, "w": 80, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 80, "h": 38 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 154, "y": 33, "w": 73, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 7, "w": 73, "h": 33 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 316, "y": 0, "w": 73, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 7, "w": 73, "h": 34 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 290, "y": 34, "w": 53, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 17, "y": 7, "w": 53, "h": 33 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 0, "y": 38, "w": 47, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 7, "w": 47, "h": 33 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 86, "y": 40, "w": 40, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 7, "w": 40, "h": 33 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 156, "y": 101, "w": 34, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 7, "w": 34, "h": 33 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 36, "y": 75, "w": 34, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 6, "w": 34, "h": 34 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 194, "y": 69, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 5, "w": 34, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 228, "y": 69, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 5, "w": 34, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 324, "y": 69, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 5, "w": 34, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 126, "y": 66, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 5, "w": 34, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "665.png",
+  "format": "I8",
+  "size": { "w": 394, "h": 134 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/shiny/665.png b/public/images/pokemon/exp/back/shiny/665.png
index 098b20d3d82..6b8ae18d7a0 100644
Binary files a/public/images/pokemon/exp/back/shiny/665.png and b/public/images/pokemon/exp/back/shiny/665.png differ
diff --git a/public/images/pokemon/exp/back/shiny/666-archipelago.json b/public/images/pokemon/exp/back/shiny/666-archipelago.json
index 5207ba45af5..817696f70a1 100644
--- a/public/images/pokemon/exp/back/shiny/666-archipelago.json
+++ b/public/images/pokemon/exp/back/shiny/666-archipelago.json
@@ -1,104 +1,119 @@
-{
-	"textures": [
-		{
-			"image": "666-archipelago.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 137,
-				"h": 137
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 16,
-						"y": 1,
-						"w": 42,
-						"h": 69
-					},
-					"frame": {
-						"x": 67,
-						"y": 0,
-						"w": 42,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 16,
-						"y": 1,
-						"w": 42,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 68,
-						"w": 42,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 42,
-						"y": 69,
-						"w": 67,
-						"h": 68
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:d3b3934e858033f670ae2a24ec4d347a:f014942f9212da6fadbc8a0c94f2dc11:80cdb6dd219378a41ccf5c2acc7e7786$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 2, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 209, "y": 2, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 71, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 71, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 140, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 124, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 2, "y": 71, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 6, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 124, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 140, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 71, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 71, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 209, "y": 2, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "666-archipelago.png",
+  "format": "I8",
+  "size": { "w": 262, "h": 140 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/shiny/666-archipelago.png b/public/images/pokemon/exp/back/shiny/666-archipelago.png
index cfc3f0012b6..ada5bd02bdb 100644
Binary files a/public/images/pokemon/exp/back/shiny/666-archipelago.png and b/public/images/pokemon/exp/back/shiny/666-archipelago.png differ
diff --git a/public/images/pokemon/exp/back/shiny/666-continental.json b/public/images/pokemon/exp/back/shiny/666-continental.json
index a20a1baa32b..fc21deb6978 100644
--- a/public/images/pokemon/exp/back/shiny/666-continental.json
+++ b/public/images/pokemon/exp/back/shiny/666-continental.json
@@ -1,104 +1,119 @@
-{
-	"textures": [
-		{
-			"image": "666-continental.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 137,
-				"h": 137
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 13,
-						"y": 1,
-						"w": 46,
-						"h": 69
-					},
-					"frame": {
-						"x": 67,
-						"y": 0,
-						"w": 46,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 13,
-						"y": 1,
-						"w": 46,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 68,
-						"w": 46,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 46,
-						"y": 69,
-						"w": 67,
-						"h": 68
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:06c65586a6c76ae16868407b3530cc3e:c9740628cc5f7aa0301821f74d9d2e17:23aaac2256d564b9d8a58d7de70397c3$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 2, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 209, "y": 2, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 71, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 71, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 140, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 124, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 2, "y": 71, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 6, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 124, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 140, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 71, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 71, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 209, "y": 2, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "666-continental.png",
+  "format": "I8",
+  "size": { "w": 262, "h": 140 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/shiny/666-continental.png b/public/images/pokemon/exp/back/shiny/666-continental.png
index 80fdfbd42fe..a70b86e6f4e 100644
Binary files a/public/images/pokemon/exp/back/shiny/666-continental.png and b/public/images/pokemon/exp/back/shiny/666-continental.png differ
diff --git a/public/images/pokemon/exp/back/shiny/666-elegant.json b/public/images/pokemon/exp/back/shiny/666-elegant.json
index e4372fe6e79..35c20315153 100644
--- a/public/images/pokemon/exp/back/shiny/666-elegant.json
+++ b/public/images/pokemon/exp/back/shiny/666-elegant.json
@@ -1,104 +1,119 @@
-{
-	"textures": [
-		{
-			"image": "666-elegant.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 137,
-				"h": 137
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 15,
-						"y": 1,
-						"w": 44,
-						"h": 69
-					},
-					"frame": {
-						"x": 67,
-						"y": 0,
-						"w": 44,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 15,
-						"y": 1,
-						"w": 44,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 68,
-						"w": 44,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 44,
-						"y": 69,
-						"w": 67,
-						"h": 68
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:2f5780697c633c5f2db2d90012b0bfaa:3df5d06e71f1f48664b1d3f70b589ce5:d6b035048c66474f6236a3bc923faa7b$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 2, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 209, "y": 2, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 71, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 71, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 140, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 124, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 2, "y": 71, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 6, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 124, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 140, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 71, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 71, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 209, "y": 2, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "666-elegant.png",
+  "format": "I8",
+  "size": { "w": 262, "h": 140 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/shiny/666-elegant.png b/public/images/pokemon/exp/back/shiny/666-elegant.png
index a63ccd8a4fd..f1493354831 100644
Binary files a/public/images/pokemon/exp/back/shiny/666-elegant.png and b/public/images/pokemon/exp/back/shiny/666-elegant.png differ
diff --git a/public/images/pokemon/exp/back/shiny/666-fancy.json b/public/images/pokemon/exp/back/shiny/666-fancy.json
index da0238946be..54113df4b51 100644
--- a/public/images/pokemon/exp/back/shiny/666-fancy.json
+++ b/public/images/pokemon/exp/back/shiny/666-fancy.json
@@ -1,104 +1,119 @@
-{
-	"textures": [
-		{
-			"image": "666-fancy.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 133,
-				"h": 133
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 69
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 65,
-						"h": 66
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 65,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 69
-					},
-					"spriteSourceSize": {
-						"x": 15,
-						"y": 1,
-						"w": 41,
-						"h": 67
-					},
-					"frame": {
-						"x": 65,
-						"y": 0,
-						"w": 41,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 69
-					},
-					"spriteSourceSize": {
-						"x": 15,
-						"y": 1,
-						"w": 41,
-						"h": 67
-					},
-					"frame": {
-						"x": 0,
-						"y": 66,
-						"w": 41,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 69
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 65,
-						"h": 66
-					},
-					"frame": {
-						"x": 41,
-						"y": 67,
-						"w": 65,
-						"h": 66
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:f6d28d4fec94007c70d1812b69e8c9a4:cff02079419826e1cb2148e331588d89:6d5edff9a806f43feff031c9919c9aca$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 2, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 209, "y": 2, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 71, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 71, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 140, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 124, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 2, "y": 71, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 6, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 124, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 140, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 71, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 71, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 209, "y": 2, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "666-fancy.png",
+  "format": "I8",
+  "size": { "w": 262, "h": 140 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/shiny/666-fancy.png b/public/images/pokemon/exp/back/shiny/666-fancy.png
index c84443bbe4e..6a50c5817a8 100644
Binary files a/public/images/pokemon/exp/back/shiny/666-fancy.png and b/public/images/pokemon/exp/back/shiny/666-fancy.png differ
diff --git a/public/images/pokemon/exp/back/shiny/666-garden.json b/public/images/pokemon/exp/back/shiny/666-garden.json
index 1a44f773e4f..4fcc5ab0ad1 100644
--- a/public/images/pokemon/exp/back/shiny/666-garden.json
+++ b/public/images/pokemon/exp/back/shiny/666-garden.json
@@ -1,104 +1,119 @@
-{
-	"textures": [
-		{
-			"image": "666-garden.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 137,
-				"h": 137
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 16,
-						"y": 1,
-						"w": 42,
-						"h": 69
-					},
-					"frame": {
-						"x": 67,
-						"y": 0,
-						"w": 42,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 16,
-						"y": 1,
-						"w": 42,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 68,
-						"w": 42,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 42,
-						"y": 69,
-						"w": 67,
-						"h": 68
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:b8e1d103e0e6ac306d2c8f447067ec3c:8483540406726b13fa42ad566b4f6991:f13a1a8fa0a411aa91fccb833ac8719c$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 2, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 209, "y": 2, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 71, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 71, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 140, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 124, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 2, "y": 71, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 6, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 124, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 140, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 71, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 71, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 209, "y": 2, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "666-garden.png",
+  "format": "I8",
+  "size": { "w": 262, "h": 140 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/shiny/666-garden.png b/public/images/pokemon/exp/back/shiny/666-garden.png
index b37c6f8c84e..92214cc4d75 100644
Binary files a/public/images/pokemon/exp/back/shiny/666-garden.png and b/public/images/pokemon/exp/back/shiny/666-garden.png differ
diff --git a/public/images/pokemon/exp/back/shiny/666-high-plains.json b/public/images/pokemon/exp/back/shiny/666-high-plains.json
index 898cbf94515..56a90a01899 100644
--- a/public/images/pokemon/exp/back/shiny/666-high-plains.json
+++ b/public/images/pokemon/exp/back/shiny/666-high-plains.json
@@ -1,104 +1,119 @@
-{
-	"textures": [
-		{
-			"image": "666-high-plains.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 137,
-				"h": 137
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 15,
-						"y": 1,
-						"w": 43,
-						"h": 69
-					},
-					"frame": {
-						"x": 67,
-						"y": 0,
-						"w": 43,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 15,
-						"y": 1,
-						"w": 43,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 68,
-						"w": 43,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 43,
-						"y": 69,
-						"w": 67,
-						"h": 68
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:6a10c59dc5b4abef78a2379364bae874:239b86e13316e6d8fc74b42cc7f657d9:2abdb5d19b2754e3daa24b6ff3ed2c2c$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 2, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 209, "y": 2, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 71, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 71, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 140, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 124, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 2, "y": 71, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 6, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 124, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 140, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 71, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 71, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 209, "y": 2, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "666-high-plains.png",
+  "format": "I8",
+  "size": { "w": 262, "h": 140 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/shiny/666-high-plains.png b/public/images/pokemon/exp/back/shiny/666-high-plains.png
index e23f879af0c..80e02eede13 100644
Binary files a/public/images/pokemon/exp/back/shiny/666-high-plains.png and b/public/images/pokemon/exp/back/shiny/666-high-plains.png differ
diff --git a/public/images/pokemon/exp/back/shiny/666-icy-snow.json b/public/images/pokemon/exp/back/shiny/666-icy-snow.json
index 4922c7c1fb6..b44f33bb07f 100644
--- a/public/images/pokemon/exp/back/shiny/666-icy-snow.json
+++ b/public/images/pokemon/exp/back/shiny/666-icy-snow.json
@@ -1,104 +1,119 @@
-{
-	"textures": [
-		{
-			"image": "666-icy-snow.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 137,
-				"h": 137
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 16,
-						"y": 1,
-						"w": 43,
-						"h": 69
-					},
-					"frame": {
-						"x": 67,
-						"y": 0,
-						"w": 43,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 16,
-						"y": 1,
-						"w": 43,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 68,
-						"w": 43,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 43,
-						"y": 69,
-						"w": 67,
-						"h": 68
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:a19b20c8ff121729b5b9dfb470e1e166:abf786c03cda88b39336d9172fd788ec:fb1e8b97806dc5c60ac6adf0ae48199b$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 2, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 209, "y": 2, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 71, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 71, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 140, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 124, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 2, "y": 71, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 6, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 124, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 140, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 71, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 71, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 209, "y": 2, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "666-icy-snow.png",
+  "format": "I8",
+  "size": { "w": 262, "h": 140 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/shiny/666-icy-snow.png b/public/images/pokemon/exp/back/shiny/666-icy-snow.png
index 2ba96cc9ac3..1fe8305f068 100644
Binary files a/public/images/pokemon/exp/back/shiny/666-icy-snow.png and b/public/images/pokemon/exp/back/shiny/666-icy-snow.png differ
diff --git a/public/images/pokemon/exp/back/shiny/666-jungle.json b/public/images/pokemon/exp/back/shiny/666-jungle.json
index 17254038662..51876d649da 100644
--- a/public/images/pokemon/exp/back/shiny/666-jungle.json
+++ b/public/images/pokemon/exp/back/shiny/666-jungle.json
@@ -1,104 +1,119 @@
-{
-	"textures": [
-		{
-			"image": "666-jungle.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 137,
-				"h": 137
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 16,
-						"y": 1,
-						"w": 43,
-						"h": 69
-					},
-					"frame": {
-						"x": 67,
-						"y": 0,
-						"w": 43,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 16,
-						"y": 1,
-						"w": 43,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 68,
-						"w": 43,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 43,
-						"y": 69,
-						"w": 67,
-						"h": 68
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:4318d523b7ff0df47aa749ed39d81402:f7d5cbe7029fecd1e518aa0501a8c8ba:c8686bcc5493911384853d54c85bfea1$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 2, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 209, "y": 2, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 71, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 71, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 140, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 124, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 2, "y": 71, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 6, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 124, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 140, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 71, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 71, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 209, "y": 2, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "666-jungle.png",
+  "format": "I8",
+  "size": { "w": 262, "h": 140 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/shiny/666-jungle.png b/public/images/pokemon/exp/back/shiny/666-jungle.png
index 3f1127f0265..1dbe65c02f2 100644
Binary files a/public/images/pokemon/exp/back/shiny/666-jungle.png and b/public/images/pokemon/exp/back/shiny/666-jungle.png differ
diff --git a/public/images/pokemon/exp/back/shiny/666-marine.json b/public/images/pokemon/exp/back/shiny/666-marine.json
index 5e89662d52f..a77fd76f1dd 100644
--- a/public/images/pokemon/exp/back/shiny/666-marine.json
+++ b/public/images/pokemon/exp/back/shiny/666-marine.json
@@ -1,104 +1,119 @@
-{
-	"textures": [
-		{
-			"image": "666-marine.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 137,
-				"h": 137
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 16,
-						"y": 1,
-						"w": 42,
-						"h": 69
-					},
-					"frame": {
-						"x": 67,
-						"y": 0,
-						"w": 42,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 16,
-						"y": 1,
-						"w": 42,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 68,
-						"w": 42,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 42,
-						"y": 69,
-						"w": 67,
-						"h": 68
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:df888a902e99f6aa55c8d9a1696f30ef:5e5db402df59c188bf1aaf4cc0b516d5:dc240f0acbf3d56fe8729dd1f703009f$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 2, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 209, "y": 2, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 71, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 71, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 140, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 124, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 2, "y": 71, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 6, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 124, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 140, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 71, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 71, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 209, "y": 2, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "666-marine.png",
+  "format": "I8",
+  "size": { "w": 262, "h": 140 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/shiny/666-marine.png b/public/images/pokemon/exp/back/shiny/666-marine.png
index 7e1a47124b9..1a69d6587da 100644
Binary files a/public/images/pokemon/exp/back/shiny/666-marine.png and b/public/images/pokemon/exp/back/shiny/666-marine.png differ
diff --git a/public/images/pokemon/exp/back/shiny/666-meadow.json b/public/images/pokemon/exp/back/shiny/666-meadow.json
index 54e872aee05..2c4a73b80cf 100644
--- a/public/images/pokemon/exp/back/shiny/666-meadow.json
+++ b/public/images/pokemon/exp/back/shiny/666-meadow.json
@@ -1,524 +1,119 @@
-{
-	"textures": [
-		{
-			"image": "666-meadow.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 234,
-				"h": 234
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 78,
-						"h": 87
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 78,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 78,
-						"h": 87
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 78,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 78,
-						"h": 87
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 78,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 78,
-						"h": 87
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 78,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 3,
-						"w": 70,
-						"h": 87
-					},
-					"frame": {
-						"x": 0,
-						"y": 87,
-						"w": 70,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 3,
-						"w": 70,
-						"h": 87
-					},
-					"frame": {
-						"x": 0,
-						"y": 87,
-						"w": 70,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 3,
-						"w": 70,
-						"h": 87
-					},
-					"frame": {
-						"x": 0,
-						"y": 87,
-						"w": 70,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 3,
-						"w": 70,
-						"h": 87
-					},
-					"frame": {
-						"x": 0,
-						"y": 87,
-						"w": 70,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 11,
-						"y": 2,
-						"w": 63,
-						"h": 87
-					},
-					"frame": {
-						"x": 70,
-						"y": 87,
-						"w": 63,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 11,
-						"y": 2,
-						"w": 63,
-						"h": 87
-					},
-					"frame": {
-						"x": 70,
-						"y": 87,
-						"w": 63,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 11,
-						"y": 2,
-						"w": 63,
-						"h": 87
-					},
-					"frame": {
-						"x": 70,
-						"y": 87,
-						"w": 63,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 11,
-						"y": 2,
-						"w": 63,
-						"h": 87
-					},
-					"frame": {
-						"x": 70,
-						"y": 87,
-						"w": 63,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 14,
-						"y": 1,
-						"w": 57,
-						"h": 87
-					},
-					"frame": {
-						"x": 78,
-						"y": 0,
-						"w": 57,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 14,
-						"y": 1,
-						"w": 57,
-						"h": 87
-					},
-					"frame": {
-						"x": 78,
-						"y": 0,
-						"w": 57,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 14,
-						"y": 1,
-						"w": 57,
-						"h": 87
-					},
-					"frame": {
-						"x": 78,
-						"y": 0,
-						"w": 57,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 14,
-						"y": 1,
-						"w": 57,
-						"h": 87
-					},
-					"frame": {
-						"x": 78,
-						"y": 0,
-						"w": 57,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 84,
-						"h": 86
-					},
-					"frame": {
-						"x": 135,
-						"y": 0,
-						"w": 84,
-						"h": 86
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 84,
-						"h": 86
-					},
-					"frame": {
-						"x": 135,
-						"y": 0,
-						"w": 84,
-						"h": 86
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 17,
-						"y": 0,
-						"w": 52,
-						"h": 87
-					},
-					"frame": {
-						"x": 135,
-						"y": 86,
-						"w": 52,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 17,
-						"y": 0,
-						"w": 52,
-						"h": 87
-					},
-					"frame": {
-						"x": 135,
-						"y": 86,
-						"w": 52,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 17,
-						"y": 0,
-						"w": 52,
-						"h": 87
-					},
-					"frame": {
-						"x": 135,
-						"y": 86,
-						"w": 52,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 17,
-						"y": 0,
-						"w": 52,
-						"h": 87
-					},
-					"frame": {
-						"x": 135,
-						"y": 86,
-						"w": 52,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 20,
-						"y": 0,
-						"w": 47,
-						"h": 85
-					},
-					"frame": {
-						"x": 187,
-						"y": 86,
-						"w": 47,
-						"h": 85
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 20,
-						"y": 0,
-						"w": 47,
-						"h": 85
-					},
-					"frame": {
-						"x": 187,
-						"y": 86,
-						"w": 47,
-						"h": 85
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:217e1d90eca71c8b95407de1c156a5e6:e2b23be3d14960d78059a46f5b83304a:f8ac4807b4d6eef2256fa1b93e0f89ba$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 2, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 209, "y": 2, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 71, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 71, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 140, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 124, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 2, "y": 71, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 6, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 124, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 140, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 71, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 71, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 209, "y": 2, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "666-meadow.png",
+  "format": "I8",
+  "size": { "w": 262, "h": 140 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/shiny/666-meadow.png b/public/images/pokemon/exp/back/shiny/666-meadow.png
index 2e8a64be5d4..1148fa5a620 100644
Binary files a/public/images/pokemon/exp/back/shiny/666-meadow.png and b/public/images/pokemon/exp/back/shiny/666-meadow.png differ
diff --git a/public/images/pokemon/exp/back/shiny/666-modern.json b/public/images/pokemon/exp/back/shiny/666-modern.json
index c60078bd8ce..e0a00da6d81 100644
--- a/public/images/pokemon/exp/back/shiny/666-modern.json
+++ b/public/images/pokemon/exp/back/shiny/666-modern.json
@@ -1,104 +1,119 @@
-{
-	"textures": [
-		{
-			"image": "666-modern.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 132,
-				"h": 132
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 69
-					},
-					"spriteSourceSize": {
-						"x": 16,
-						"y": 1,
-						"w": 40,
-						"h": 67
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 40,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 69
-					},
-					"spriteSourceSize": {
-						"x": 16,
-						"y": 1,
-						"w": 40,
-						"h": 67
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 40,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 69
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 65,
-						"h": 66
-					},
-					"frame": {
-						"x": 40,
-						"y": 0,
-						"w": 65,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 69
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 65,
-						"h": 66
-					},
-					"frame": {
-						"x": 40,
-						"y": 66,
-						"w": 65,
-						"h": 66
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:854759536c0175b34e9ed7b2513e55dd:9fbbae33832e3b62152c5bae85714a7a:5fc0e8f9a0750c2f3cfb5d6e7eca0d45$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 2, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 209, "y": 2, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 71, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 71, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 140, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 124, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 2, "y": 71, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 6, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 124, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 140, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 71, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 71, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 209, "y": 2, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "666-modern.png",
+  "format": "I8",
+  "size": { "w": 262, "h": 140 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/shiny/666-modern.png b/public/images/pokemon/exp/back/shiny/666-modern.png
index f9654fbeb02..d9f109c8ef9 100644
Binary files a/public/images/pokemon/exp/back/shiny/666-modern.png and b/public/images/pokemon/exp/back/shiny/666-modern.png differ
diff --git a/public/images/pokemon/exp/back/shiny/666-monsoon.json b/public/images/pokemon/exp/back/shiny/666-monsoon.json
index 78130a47159..117fad03b83 100644
--- a/public/images/pokemon/exp/back/shiny/666-monsoon.json
+++ b/public/images/pokemon/exp/back/shiny/666-monsoon.json
@@ -1,104 +1,119 @@
-{
-	"textures": [
-		{
-			"image": "666-monsoon.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 137,
-				"h": 137
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 16,
-						"y": 1,
-						"w": 42,
-						"h": 69
-					},
-					"frame": {
-						"x": 67,
-						"y": 0,
-						"w": 42,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 16,
-						"y": 1,
-						"w": 42,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 68,
-						"w": 42,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 42,
-						"y": 69,
-						"w": 67,
-						"h": 68
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:dcde8c849851ea64b2ceed92a82153e1:5a97106b9193dc2cda01b0448d9f2637:637bea52b465abfb8e5a576310b4dacc$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 2, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 209, "y": 2, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 71, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 71, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 140, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 124, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 2, "y": 71, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 6, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 124, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 140, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 71, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 71, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 209, "y": 2, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "666-monsoon.png",
+  "format": "I8",
+  "size": { "w": 262, "h": 140 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/shiny/666-monsoon.png b/public/images/pokemon/exp/back/shiny/666-monsoon.png
index 5d87fc101a8..cc5279545d5 100644
Binary files a/public/images/pokemon/exp/back/shiny/666-monsoon.png and b/public/images/pokemon/exp/back/shiny/666-monsoon.png differ
diff --git a/public/images/pokemon/exp/back/shiny/666-ocean.json b/public/images/pokemon/exp/back/shiny/666-ocean.json
index 1bf44996eef..8d23d70cd31 100644
--- a/public/images/pokemon/exp/back/shiny/666-ocean.json
+++ b/public/images/pokemon/exp/back/shiny/666-ocean.json
@@ -1,104 +1,119 @@
-{
-	"textures": [
-		{
-			"image": "666-ocean.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 137,
-				"h": 137
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 15,
-						"y": 1,
-						"w": 43,
-						"h": 69
-					},
-					"frame": {
-						"x": 67,
-						"y": 0,
-						"w": 43,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 15,
-						"y": 1,
-						"w": 43,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 68,
-						"w": 43,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 43,
-						"y": 69,
-						"w": 67,
-						"h": 68
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:dc3f54a39a4afa0ea28913252050d7c1:d856dfe44678a2ee4dc3d367a6658ad3:e7a0e68eab89c2013a3eb7f3b6fc0b33$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 2, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 209, "y": 2, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 71, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 71, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 140, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 124, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 2, "y": 71, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 6, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 124, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 140, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 71, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 71, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 209, "y": 2, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "666-ocean.png",
+  "format": "I8",
+  "size": { "w": 262, "h": 140 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/shiny/666-ocean.png b/public/images/pokemon/exp/back/shiny/666-ocean.png
index 8c6aeca189a..caabd9302ea 100644
Binary files a/public/images/pokemon/exp/back/shiny/666-ocean.png and b/public/images/pokemon/exp/back/shiny/666-ocean.png differ
diff --git a/public/images/pokemon/exp/back/shiny/666-poke-ball.json b/public/images/pokemon/exp/back/shiny/666-poke-ball.json
index 5c8715a8a1e..45564e59a32 100644
--- a/public/images/pokemon/exp/back/shiny/666-poke-ball.json
+++ b/public/images/pokemon/exp/back/shiny/666-poke-ball.json
@@ -1,104 +1,119 @@
-{
-	"textures": [
-		{
-			"image": "666-poke-ball.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 137,
-				"h": 137
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 16,
-						"y": 1,
-						"w": 43,
-						"h": 69
-					},
-					"frame": {
-						"x": 67,
-						"y": 0,
-						"w": 43,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 16,
-						"y": 1,
-						"w": 43,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 68,
-						"w": 43,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 43,
-						"y": 69,
-						"w": 67,
-						"h": 68
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:9df25dba5036e3cd48218e8de3a98074:4357b8b161f5f87776f4d39fcb3723f5:8ec14f129d1691b8da504a13b661abed$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 2, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 209, "y": 2, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 71, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 71, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 140, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 124, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 2, "y": 71, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 6, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 124, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 140, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 71, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 71, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 209, "y": 2, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "666-poke-ball.png",
+  "format": "I8",
+  "size": { "w": 262, "h": 140 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/shiny/666-poke-ball.png b/public/images/pokemon/exp/back/shiny/666-poke-ball.png
index 24907a5ef9f..30e2cbf8615 100644
Binary files a/public/images/pokemon/exp/back/shiny/666-poke-ball.png and b/public/images/pokemon/exp/back/shiny/666-poke-ball.png differ
diff --git a/public/images/pokemon/exp/back/shiny/666-polar.json b/public/images/pokemon/exp/back/shiny/666-polar.json
index ef69f49e390..abb6d0286f4 100644
--- a/public/images/pokemon/exp/back/shiny/666-polar.json
+++ b/public/images/pokemon/exp/back/shiny/666-polar.json
@@ -1,104 +1,119 @@
-{
-	"textures": [
-		{
-			"image": "666-polar.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 137,
-				"h": 137
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 14,
-						"y": 1,
-						"w": 45,
-						"h": 69
-					},
-					"frame": {
-						"x": 67,
-						"y": 0,
-						"w": 45,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 14,
-						"y": 1,
-						"w": 45,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 68,
-						"w": 45,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 45,
-						"y": 69,
-						"w": 67,
-						"h": 68
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:aab22d39518ad2f1b1621a5954e95674:958cacbba11b25f5b1e7fe9a9a40465d:eb7086e98f867c6592e4b161835da18b$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 2, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 209, "y": 2, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 71, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 71, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 140, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 124, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 2, "y": 71, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 6, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 124, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 140, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 71, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 71, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 209, "y": 2, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "666-polar.png",
+  "format": "I8",
+  "size": { "w": 262, "h": 140 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/shiny/666-polar.png b/public/images/pokemon/exp/back/shiny/666-polar.png
index b2f00a2a6df..c9f4fe642ee 100644
Binary files a/public/images/pokemon/exp/back/shiny/666-polar.png and b/public/images/pokemon/exp/back/shiny/666-polar.png differ
diff --git a/public/images/pokemon/exp/back/shiny/666-savanna.json b/public/images/pokemon/exp/back/shiny/666-savanna.json
index 24638119724..8fa326da1b4 100644
--- a/public/images/pokemon/exp/back/shiny/666-savanna.json
+++ b/public/images/pokemon/exp/back/shiny/666-savanna.json
@@ -1,104 +1,119 @@
-{
-	"textures": [
-		{
-			"image": "666-savanna.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 137,
-				"h": 137
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 16,
-						"y": 1,
-						"w": 43,
-						"h": 69
-					},
-					"frame": {
-						"x": 67,
-						"y": 0,
-						"w": 43,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 16,
-						"y": 1,
-						"w": 43,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 68,
-						"w": 43,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 43,
-						"y": 69,
-						"w": 67,
-						"h": 68
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:0c7fd4a8c1137a2566fabe2f53dac4c4:295a7bdde494b6106f9c73b649be6098:625a4f0dc001069326a75c6a381f93e6$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 2, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 209, "y": 2, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 71, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 71, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 140, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 124, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 2, "y": 71, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 6, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 124, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 140, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 71, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 71, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 209, "y": 2, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "666-savanna.png",
+  "format": "I8",
+  "size": { "w": 262, "h": 140 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/shiny/666-savanna.png b/public/images/pokemon/exp/back/shiny/666-savanna.png
index 5fcf8bc6d28..a69c0c18ae1 100644
Binary files a/public/images/pokemon/exp/back/shiny/666-savanna.png and b/public/images/pokemon/exp/back/shiny/666-savanna.png differ
diff --git a/public/images/pokemon/exp/back/shiny/666-sun.json b/public/images/pokemon/exp/back/shiny/666-sun.json
index a2ccb3c82d8..d41f22f541c 100644
--- a/public/images/pokemon/exp/back/shiny/666-sun.json
+++ b/public/images/pokemon/exp/back/shiny/666-sun.json
@@ -1,104 +1,119 @@
-{
-	"textures": [
-		{
-			"image": "666-sun.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 135,
-				"h": 135
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 70
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 65,
-						"h": 67
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 65,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 70
-					},
-					"spriteSourceSize": {
-						"x": 15,
-						"y": 1,
-						"w": 41,
-						"h": 68
-					},
-					"frame": {
-						"x": 65,
-						"y": 0,
-						"w": 41,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 70
-					},
-					"spriteSourceSize": {
-						"x": 15,
-						"y": 1,
-						"w": 41,
-						"h": 68
-					},
-					"frame": {
-						"x": 0,
-						"y": 67,
-						"w": 41,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 70
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 65,
-						"h": 67
-					},
-					"frame": {
-						"x": 41,
-						"y": 68,
-						"w": 65,
-						"h": 67
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:d1400564456ce432aab0ca4f263c336a:fba76efed9d6341c0b46301efd8cd8f5:8f5fdd0a698701f5391c5a3f67e303d6$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 2, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 209, "y": 2, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 71, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 71, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 140, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 124, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 2, "y": 71, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 6, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 124, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 140, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 71, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 71, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 209, "y": 2, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "666-sun.png",
+  "format": "I8",
+  "size": { "w": 262, "h": 140 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/shiny/666-sun.png b/public/images/pokemon/exp/back/shiny/666-sun.png
index 28918f2b59a..3914a0fe350 100644
Binary files a/public/images/pokemon/exp/back/shiny/666-sun.png and b/public/images/pokemon/exp/back/shiny/666-sun.png differ
diff --git a/public/images/pokemon/exp/back/shiny/666-tundra.json b/public/images/pokemon/exp/back/shiny/666-tundra.json
index 8361b7ca139..afa574f9e07 100644
--- a/public/images/pokemon/exp/back/shiny/666-tundra.json
+++ b/public/images/pokemon/exp/back/shiny/666-tundra.json
@@ -1,104 +1,119 @@
-{
-	"textures": [
-		{
-			"image": "666-tundra.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 137,
-				"h": 137
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 13,
-						"y": 1,
-						"w": 46,
-						"h": 69
-					},
-					"frame": {
-						"x": 67,
-						"y": 0,
-						"w": 46,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 13,
-						"y": 1,
-						"w": 46,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 68,
-						"w": 46,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 46,
-						"y": 69,
-						"w": 67,
-						"h": 68
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:b87511ba7b272729aecbf5eb18fe65cc:383836b7b2902a470e150b17bdd9bcfc:9779ed3adebc298af537dd64dc25fe00$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 2, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 209, "y": 2, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 71, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 71, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 140, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 124, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 2, "y": 71, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 6, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 124, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 140, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 71, "y": 71, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 71, "y": 2, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 209, "y": 2, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 1, "w": 51, "h": 67 },
+    "sourceSize": { "w": 67, "h": 73 },
+    "duration": 110
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "666-tundra.png",
+  "format": "I8",
+  "size": { "w": 262, "h": 140 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/shiny/666-tundra.png b/public/images/pokemon/exp/back/shiny/666-tundra.png
index c33fbf1fc65..78316df8a8f 100644
Binary files a/public/images/pokemon/exp/back/shiny/666-tundra.png and b/public/images/pokemon/exp/back/shiny/666-tundra.png differ
diff --git a/public/images/pokemon/exp/back/shiny/667.json b/public/images/pokemon/exp/back/shiny/667.json
index cf561f26e4f..db9918ea230 100644
--- a/public/images/pokemon/exp/back/shiny/667.json
+++ b/public/images/pokemon/exp/back/shiny/667.json
@@ -1,1532 +1,659 @@
-{
-	"textures": [
-		{
-			"image": "667.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 160,
-				"h": 160
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0056.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 43,
-						"h": 48
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 43,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0071.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 43,
-						"h": 48
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 43,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0057.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 43,
-						"h": 48
-					},
-					"frame": {
-						"x": 43,
-						"y": 0,
-						"w": 43,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0059.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 43,
-						"h": 48
-					},
-					"frame": {
-						"x": 43,
-						"y": 0,
-						"w": 43,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0061.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 43,
-						"h": 48
-					},
-					"frame": {
-						"x": 43,
-						"y": 0,
-						"w": 43,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0063.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 43,
-						"h": 48
-					},
-					"frame": {
-						"x": 43,
-						"y": 0,
-						"w": 43,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0065.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 43,
-						"h": 48
-					},
-					"frame": {
-						"x": 43,
-						"y": 0,
-						"w": 43,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0067.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 43,
-						"h": 48
-					},
-					"frame": {
-						"x": 43,
-						"y": 0,
-						"w": 43,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0069.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 43,
-						"h": 48
-					},
-					"frame": {
-						"x": 43,
-						"y": 0,
-						"w": 43,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0058.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 43,
-						"h": 48
-					},
-					"frame": {
-						"x": 86,
-						"y": 0,
-						"w": 43,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0060.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 43,
-						"h": 48
-					},
-					"frame": {
-						"x": 86,
-						"y": 0,
-						"w": 43,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0062.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 43,
-						"h": 48
-					},
-					"frame": {
-						"x": 86,
-						"y": 0,
-						"w": 43,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0064.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 43,
-						"h": 48
-					},
-					"frame": {
-						"x": 86,
-						"y": 0,
-						"w": 43,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0066.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 43,
-						"h": 48
-					},
-					"frame": {
-						"x": 86,
-						"y": 0,
-						"w": 43,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0068.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 43,
-						"h": 48
-					},
-					"frame": {
-						"x": 86,
-						"y": 0,
-						"w": 43,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0070.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 43,
-						"h": 48
-					},
-					"frame": {
-						"x": 86,
-						"y": 0,
-						"w": 43,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 41,
-						"h": 47
-					},
-					"frame": {
-						"x": 0,
-						"y": 48,
-						"w": 41,
-						"h": 47
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 41,
-						"h": 47
-					},
-					"frame": {
-						"x": 0,
-						"y": 48,
-						"w": 41,
-						"h": 47
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 41,
-						"h": 47
-					},
-					"frame": {
-						"x": 0,
-						"y": 48,
-						"w": 41,
-						"h": 47
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 41,
-						"h": 47
-					},
-					"frame": {
-						"x": 0,
-						"y": 48,
-						"w": 41,
-						"h": 47
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 41,
-						"h": 47
-					},
-					"frame": {
-						"x": 0,
-						"y": 48,
-						"w": 41,
-						"h": 47
-					}
-				},
-				{
-					"filename": "0027.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 41,
-						"h": 47
-					},
-					"frame": {
-						"x": 0,
-						"y": 48,
-						"w": 41,
-						"h": 47
-					}
-				},
-				{
-					"filename": "0028.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 41,
-						"h": 47
-					},
-					"frame": {
-						"x": 0,
-						"y": 48,
-						"w": 41,
-						"h": 47
-					}
-				},
-				{
-					"filename": "0036.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 41,
-						"h": 47
-					},
-					"frame": {
-						"x": 0,
-						"y": 48,
-						"w": 41,
-						"h": 47
-					}
-				},
-				{
-					"filename": "0037.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 41,
-						"h": 47
-					},
-					"frame": {
-						"x": 0,
-						"y": 48,
-						"w": 41,
-						"h": 47
-					}
-				},
-				{
-					"filename": "0045.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 41,
-						"h": 47
-					},
-					"frame": {
-						"x": 0,
-						"y": 48,
-						"w": 41,
-						"h": 47
-					}
-				},
-				{
-					"filename": "0046.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 41,
-						"h": 47
-					},
-					"frame": {
-						"x": 0,
-						"y": 48,
-						"w": 41,
-						"h": 47
-					}
-				},
-				{
-					"filename": "0054.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 41,
-						"h": 47
-					},
-					"frame": {
-						"x": 0,
-						"y": 48,
-						"w": 41,
-						"h": 47
-					}
-				},
-				{
-					"filename": "0055.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 41,
-						"h": 47
-					},
-					"frame": {
-						"x": 0,
-						"y": 48,
-						"w": 41,
-						"h": 47
-					}
-				},
-				{
-					"filename": "0072.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 41,
-						"h": 47
-					},
-					"frame": {
-						"x": 0,
-						"y": 48,
-						"w": 41,
-						"h": 47
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 40,
-						"h": 47
-					},
-					"frame": {
-						"x": 41,
-						"y": 48,
-						"w": 40,
-						"h": 47
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 40,
-						"h": 47
-					},
-					"frame": {
-						"x": 41,
-						"y": 48,
-						"w": 40,
-						"h": 47
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 40,
-						"h": 47
-					},
-					"frame": {
-						"x": 41,
-						"y": 48,
-						"w": 40,
-						"h": 47
-					}
-				},
-				{
-					"filename": "0029.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 40,
-						"h": 47
-					},
-					"frame": {
-						"x": 41,
-						"y": 48,
-						"w": 40,
-						"h": 47
-					}
-				},
-				{
-					"filename": "0038.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 40,
-						"h": 47
-					},
-					"frame": {
-						"x": 41,
-						"y": 48,
-						"w": 40,
-						"h": 47
-					}
-				},
-				{
-					"filename": "0047.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 40,
-						"h": 47
-					},
-					"frame": {
-						"x": 41,
-						"y": 48,
-						"w": 40,
-						"h": 47
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 2,
-						"w": 40,
-						"h": 46
-					},
-					"frame": {
-						"x": 81,
-						"y": 48,
-						"w": 40,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 2,
-						"w": 40,
-						"h": 46
-					},
-					"frame": {
-						"x": 81,
-						"y": 48,
-						"w": 40,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 2,
-						"w": 40,
-						"h": 46
-					},
-					"frame": {
-						"x": 81,
-						"y": 48,
-						"w": 40,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0030.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 2,
-						"w": 40,
-						"h": 46
-					},
-					"frame": {
-						"x": 81,
-						"y": 48,
-						"w": 40,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0039.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 2,
-						"w": 40,
-						"h": 46
-					},
-					"frame": {
-						"x": 81,
-						"y": 48,
-						"w": 40,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0048.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 2,
-						"w": 40,
-						"h": 46
-					},
-					"frame": {
-						"x": 81,
-						"y": 48,
-						"w": 40,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 2,
-						"w": 40,
-						"h": 46
-					},
-					"frame": {
-						"x": 81,
-						"y": 94,
-						"w": 40,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 2,
-						"w": 40,
-						"h": 46
-					},
-					"frame": {
-						"x": 81,
-						"y": 94,
-						"w": 40,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0026.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 2,
-						"w": 40,
-						"h": 46
-					},
-					"frame": {
-						"x": 81,
-						"y": 94,
-						"w": 40,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0035.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 2,
-						"w": 40,
-						"h": 46
-					},
-					"frame": {
-						"x": 81,
-						"y": 94,
-						"w": 40,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0044.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 2,
-						"w": 40,
-						"h": 46
-					},
-					"frame": {
-						"x": 81,
-						"y": 94,
-						"w": 40,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0053.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 2,
-						"w": 40,
-						"h": 46
-					},
-					"frame": {
-						"x": 81,
-						"y": 94,
-						"w": 40,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 40,
-						"h": 45
-					},
-					"frame": {
-						"x": 0,
-						"y": 95,
-						"w": 40,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 40,
-						"h": 45
-					},
-					"frame": {
-						"x": 0,
-						"y": 95,
-						"w": 40,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0025.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 40,
-						"h": 45
-					},
-					"frame": {
-						"x": 0,
-						"y": 95,
-						"w": 40,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0034.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 40,
-						"h": 45
-					},
-					"frame": {
-						"x": 0,
-						"y": 95,
-						"w": 40,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0043.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 40,
-						"h": 45
-					},
-					"frame": {
-						"x": 0,
-						"y": 95,
-						"w": 40,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0052.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 40,
-						"h": 45
-					},
-					"frame": {
-						"x": 0,
-						"y": 95,
-						"w": 40,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 39,
-						"h": 45
-					},
-					"frame": {
-						"x": 40,
-						"y": 95,
-						"w": 39,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 39,
-						"h": 45
-					},
-					"frame": {
-						"x": 40,
-						"y": 95,
-						"w": 39,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 39,
-						"h": 45
-					},
-					"frame": {
-						"x": 40,
-						"y": 95,
-						"w": 39,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0031.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 39,
-						"h": 45
-					},
-					"frame": {
-						"x": 40,
-						"y": 95,
-						"w": 39,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0040.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 39,
-						"h": 45
-					},
-					"frame": {
-						"x": 40,
-						"y": 95,
-						"w": 39,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0049.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 39,
-						"h": 45
-					},
-					"frame": {
-						"x": 40,
-						"y": 95,
-						"w": 39,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 4,
-						"w": 39,
-						"h": 44
-					},
-					"frame": {
-						"x": 121,
-						"y": 48,
-						"w": 39,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 4,
-						"w": 39,
-						"h": 44
-					},
-					"frame": {
-						"x": 121,
-						"y": 48,
-						"w": 39,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 4,
-						"w": 39,
-						"h": 44
-					},
-					"frame": {
-						"x": 121,
-						"y": 48,
-						"w": 39,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0032.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 4,
-						"w": 39,
-						"h": 44
-					},
-					"frame": {
-						"x": 121,
-						"y": 48,
-						"w": 39,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0041.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 4,
-						"w": 39,
-						"h": 44
-					},
-					"frame": {
-						"x": 121,
-						"y": 48,
-						"w": 39,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0050.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 4,
-						"w": 39,
-						"h": 44
-					},
-					"frame": {
-						"x": 121,
-						"y": 48,
-						"w": 39,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 4,
-						"w": 39,
-						"h": 44
-					},
-					"frame": {
-						"x": 121,
-						"y": 92,
-						"w": 39,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 4,
-						"w": 39,
-						"h": 44
-					},
-					"frame": {
-						"x": 121,
-						"y": 92,
-						"w": 39,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 4,
-						"w": 39,
-						"h": 44
-					},
-					"frame": {
-						"x": 121,
-						"y": 92,
-						"w": 39,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0033.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 4,
-						"w": 39,
-						"h": 44
-					},
-					"frame": {
-						"x": 121,
-						"y": 92,
-						"w": 39,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0042.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 4,
-						"w": 39,
-						"h": 44
-					},
-					"frame": {
-						"x": 121,
-						"y": 92,
-						"w": 39,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0051.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 4,
-						"w": 39,
-						"h": 44
-					},
-					"frame": {
-						"x": 121,
-						"y": 92,
-						"w": 39,
-						"h": 44
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:4fbaee798794f5f6bc216941c6d420d9:a27205da0cc7ce20d4a4422df81b9109:02171d511e760c8a3e1b623ad6bf93f5$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 127, "y": 0, "w": 40, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 40, "h": 46 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 127, "y": 47, "w": 39, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 39, "h": 46 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 85, "y": 48, "w": 39, "h": 45 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 39, "h": 45 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 40, "y": 94, "w": 38, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 38, "h": 44 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 79, "y": 94, "w": 38, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 38, "h": 43 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 118, "y": 94, "w": 38, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 38, "h": 43 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 40, "y": 49, "w": 39, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 39, "h": 44 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 0, "y": 49, "w": 39, "h": 45 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 39, "h": 45 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 127, "y": 0, "w": 40, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 40, "h": 46 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 127, "y": 0, "w": 40, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 40, "h": 46 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 127, "y": 47, "w": 39, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 39, "h": 46 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 85, "y": 48, "w": 39, "h": 45 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 39, "h": 45 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 40, "y": 94, "w": 38, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 38, "h": 44 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 79, "y": 94, "w": 38, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 38, "h": 43 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 118, "y": 94, "w": 38, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 38, "h": 43 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 40, "y": 49, "w": 39, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 39, "h": 44 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 0, "y": 49, "w": 39, "h": 45 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 39, "h": 45 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 127, "y": 0, "w": 40, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 40, "h": 46 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 127, "y": 0, "w": 40, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 40, "h": 46 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 127, "y": 47, "w": 39, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 39, "h": 46 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 85, "y": 48, "w": 39, "h": 45 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 39, "h": 45 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 40, "y": 94, "w": 38, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 38, "h": 44 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 79, "y": 94, "w": 38, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 38, "h": 43 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 118, "y": 94, "w": 38, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 38, "h": 43 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 40, "y": 49, "w": 39, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 39, "h": 44 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 0, "y": 49, "w": 39, "h": 45 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 39, "h": 45 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 127, "y": 0, "w": 40, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 40, "h": 46 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 127, "y": 0, "w": 40, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 40, "h": 46 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 127, "y": 47, "w": 39, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 39, "h": 46 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 85, "y": 48, "w": 39, "h": 45 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 39, "h": 45 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 40, "y": 94, "w": 38, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 38, "h": 44 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 79, "y": 94, "w": 38, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 38, "h": 43 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 118, "y": 94, "w": 38, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 38, "h": 43 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 40, "y": 49, "w": 39, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 39, "h": 44 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 0, "y": 49, "w": 39, "h": 45 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 39, "h": 45 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 127, "y": 0, "w": 40, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 40, "h": 46 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 127, "y": 0, "w": 40, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 40, "h": 46 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 127, "y": 47, "w": 39, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 39, "h": 46 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 85, "y": 48, "w": 39, "h": 45 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 39, "h": 45 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 40, "y": 94, "w": 38, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 38, "h": 44 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 79, "y": 94, "w": 38, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 38, "h": 43 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 118, "y": 94, "w": 38, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 38, "h": 43 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 40, "y": 49, "w": 39, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 39, "h": 44 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 0, "y": 49, "w": 39, "h": 45 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 39, "h": 45 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 127, "y": 0, "w": 40, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 40, "h": 46 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 127, "y": 0, "w": 40, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 40, "h": 46 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 127, "y": 47, "w": 39, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 39, "h": 46 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 85, "y": 48, "w": 39, "h": 45 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 39, "h": 45 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 40, "y": 94, "w": 38, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 38, "h": 44 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 79, "y": 94, "w": 38, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 38, "h": 43 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 118, "y": 94, "w": 38, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 38, "h": 43 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 40, "y": 49, "w": 39, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 39, "h": 44 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 0, "y": 49, "w": 39, "h": 45 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 39, "h": 45 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 127, "y": 0, "w": 40, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 40, "h": 46 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 127, "y": 0, "w": 40, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 40, "h": 46 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 85, "y": 0, "w": 41, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 41, "h": 47 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 0, "y": 0, "w": 42, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 42, "h": 48 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 43, "y": 0, "w": 41, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 41, "h": 48 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 0, "y": 0, "w": 42, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 42, "h": 48 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 43, "y": 0, "w": 41, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 41, "h": 48 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 0, "y": 0, "w": 42, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 42, "h": 48 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 43, "y": 0, "w": 41, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 41, "h": 48 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 0, "y": 0, "w": 42, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 42, "h": 48 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 43, "y": 0, "w": 41, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 41, "h": 48 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 0, "y": 0, "w": 42, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 42, "h": 48 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 43, "y": 0, "w": 41, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 41, "h": 48 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 0, "y": 0, "w": 42, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 42, "h": 48 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 43, "y": 0, "w": 41, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 41, "h": 48 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 0, "y": 0, "w": 42, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 42, "h": 48 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 43, "y": 0, "w": 41, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 41, "h": 48 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 85, "y": 0, "w": 41, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 41, "h": 47 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 127, "y": 0, "w": 40, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 40, "h": 46 },
+    "sourceSize": { "w": 43, "h": 48 },
+    "duration": 110
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.11-x64",
+  "image": "667.png",
+  "format": "I8",
+  "size": { "w": 167, "h": 138 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/shiny/667.png b/public/images/pokemon/exp/back/shiny/667.png
index eb8b7eb756f..d44bed5ee65 100644
Binary files a/public/images/pokemon/exp/back/shiny/667.png and b/public/images/pokemon/exp/back/shiny/667.png differ
diff --git a/public/images/pokemon/exp/back/shiny/668.json b/public/images/pokemon/exp/back/shiny/668.json
index cd1665c7fe7..594e69189dc 100644
--- a/public/images/pokemon/exp/back/shiny/668.json
+++ b/public/images/pokemon/exp/back/shiny/668.json
@@ -1,146 +1,821 @@
-{
-	"textures": [
-		{
-			"image": "668.png", 
-			"format": "RGBA8888", 
-			"size": {
-				"w": 146, 
-				"h": 146
-			}, 
-			"scale": 1, 
-			"frames": [
-				{
-					"filename": "0001.png", 
-					"rotated": false, 
-					"trimmed": false, 
-					"sourceSize": {
-						"w": 73, 
-						"h": 61
-					}, 
-					"spriteSourceSize": {
-						"x": 0, 
-						"y": 0, 
-						"w": 73, 
-						"h": 61
-					}, 
-					"frame": {
-						"x": 0, 
-						"y": 0, 
-						"w": 73, 
-						"h": 61
-					}
-				}, 
-				{
-					"filename": "0002.png", 
-					"rotated": false, 
-					"trimmed": false, 
-					"sourceSize": {
-						"w": 73, 
-						"h": 61
-					}, 
-					"spriteSourceSize": {
-						"x": 0, 
-						"y": 0, 
-						"w": 73, 
-						"h": 61
-					}, 
-					"frame": {
-						"x": 73, 
-						"y": 0, 
-						"w": 73, 
-						"h": 61
-					}
-				}, 
-				{
-					"filename": "0006.png", 
-					"rotated": false, 
-					"trimmed": false, 
-					"sourceSize": {
-						"w": 73, 
-						"h": 61
-					}, 
-					"spriteSourceSize": {
-						"x": 0, 
-						"y": 0, 
-						"w": 73, 
-						"h": 61
-					}, 
-					"frame": {
-						"x": 73, 
-						"y": 0, 
-						"w": 73, 
-						"h": 61
-					}
-				}, 
-				{
-					"filename": "0003.png", 
-					"rotated": false, 
-					"trimmed": true, 
-					"sourceSize": {
-						"w": 73, 
-						"h": 61
-					}, 
-					"spriteSourceSize": {
-						"x": 0, 
-						"y": 1, 
-						"w": 73, 
-						"h": 60
-					}, 
-					"frame": {
-						"x": 0, 
-						"y": 61, 
-						"w": 73, 
-						"h": 60
-					}
-				}, 
-				{
-					"filename": "0005.png", 
-					"rotated": false, 
-					"trimmed": true, 
-					"sourceSize": {
-						"w": 73, 
-						"h": 61
-					}, 
-					"spriteSourceSize": {
-						"x": 0, 
-						"y": 1, 
-						"w": 73, 
-						"h": 60
-					}, 
-					"frame": {
-						"x": 0, 
-						"y": 61, 
-						"w": 73, 
-						"h": 60
-					}
-				}, 
-				{
-					"filename": "0004.png", 
-					"rotated": false, 
-					"trimmed": true, 
-					"sourceSize": {
-						"w": 73, 
-						"h": 61
-					}, 
-					"spriteSourceSize": {
-						"x": 1, 
-						"y": 2, 
-						"w": 72, 
-						"h": 59
-					}, 
-					"frame": {
-						"x": 73, 
-						"y": 61, 
-						"w": 72, 
-						"h": 59
-					}
-				}
-			]
-		}
-	], 
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker", 
-		"version": "3.0", 
-		"smartupdate": "$TexturePacker:SmartUpdate:0e20693ecfc704a58db8c8592fcdc9cc:659468d84f3cc98068a3454a7c68f1e4:947bf84d1af493c62e2cef45bb6c19ad$"
-	}
-}
\ No newline at end of file
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 152, "y": 292, "w": 74, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 74, "h": 71 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 303, "y": 221, "w": 74, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 74, "h": 71 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 383, "y": 147, "w": 75, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 75, "h": 72 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 233, "y": 74, "w": 76, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 76, "h": 72 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 459, "y": 147, "w": 75, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 75, "h": 72 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 315, "y": 0, "w": 76, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 76, "h": 73 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 387, "y": 74, "w": 76, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 76, "h": 72 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 392, "y": 0, "w": 75, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 75, "h": 73 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 237, "y": 0, "w": 77, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 77, "h": 73 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 0, "y": 0, "w": 78, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 78, "h": 74 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 79, "y": 0, "w": 78, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 78, "h": 73 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 158, "y": 0, "w": 78, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 78, "h": 73 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 0, "y": 75, "w": 76, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 76, "h": 72 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 458, "y": 220, "w": 75, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 75, "h": 71 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 150, "y": 364, "w": 73, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 73, "h": 71 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 152, "y": 292, "w": 74, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 74, "h": 71 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 303, "y": 221, "w": 74, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 74, "h": 71 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 383, "y": 147, "w": 75, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 75, "h": 72 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 233, "y": 74, "w": 76, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 76, "h": 72 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 459, "y": 147, "w": 75, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 75, "h": 72 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 315, "y": 0, "w": 76, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 76, "h": 73 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 387, "y": 74, "w": 76, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 76, "h": 72 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 392, "y": 0, "w": 75, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 75, "h": 73 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 237, "y": 0, "w": 77, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 77, "h": 73 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 0, "y": 0, "w": 78, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 78, "h": 74 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 79, "y": 0, "w": 78, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 78, "h": 73 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 158, "y": 0, "w": 78, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 78, "h": 73 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 0, "y": 75, "w": 76, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 76, "h": 72 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 458, "y": 220, "w": 75, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 75, "h": 71 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 150, "y": 364, "w": 73, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 73, "h": 71 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 152, "y": 292, "w": 74, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 74, "h": 71 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 303, "y": 221, "w": 74, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 74, "h": 71 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 383, "y": 147, "w": 75, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 75, "h": 72 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 233, "y": 74, "w": 76, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 76, "h": 72 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 459, "y": 147, "w": 75, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 75, "h": 72 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 315, "y": 0, "w": 76, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 76, "h": 73 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 387, "y": 74, "w": 76, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 76, "h": 72 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 392, "y": 0, "w": 75, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 75, "h": 73 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 237, "y": 0, "w": 77, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 77, "h": 73 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 0, "y": 0, "w": 78, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 78, "h": 74 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 79, "y": 0, "w": 78, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 78, "h": 73 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 158, "y": 0, "w": 78, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 78, "h": 73 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 0, "y": 75, "w": 76, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 76, "h": 72 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 458, "y": 220, "w": 75, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 75, "h": 71 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 150, "y": 364, "w": 73, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 73, "h": 71 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 152, "y": 292, "w": 74, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 74, "h": 71 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 303, "y": 221, "w": 74, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 74, "h": 71 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 383, "y": 147, "w": 75, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 75, "h": 72 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 233, "y": 74, "w": 76, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 76, "h": 72 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 459, "y": 147, "w": 75, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 75, "h": 72 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 315, "y": 0, "w": 76, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 76, "h": 73 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 387, "y": 74, "w": 76, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 76, "h": 72 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 392, "y": 0, "w": 75, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 75, "h": 73 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 237, "y": 0, "w": 77, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 77, "h": 73 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 0, "y": 0, "w": 78, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 78, "h": 74 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 79, "y": 0, "w": 78, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 78, "h": 73 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 158, "y": 0, "w": 78, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 78, "h": 73 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 0, "y": 75, "w": 76, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 76, "h": 72 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 458, "y": 220, "w": 75, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 75, "h": 71 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 150, "y": 364, "w": 73, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 73, "h": 71 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 152, "y": 292, "w": 74, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 74, "h": 71 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 458, "y": 292, "w": 74, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 74, "h": 71 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 303, "y": 364, "w": 74, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 74, "h": 70 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 227, "y": 294, "w": 75, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 75, "h": 70 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 378, "y": 364, "w": 75, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 75, "h": 69 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 303, "y": 293, "w": 75, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 75, "h": 70 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 379, "y": 293, "w": 75, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 75, "h": 70 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 454, "y": 364, "w": 72, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 72, "h": 71 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 70, "y": 365, "w": 68, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 3, "w": 68, "h": 71 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 291, "y": 435, "w": 62, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 17, "y": 2, "w": 62, "h": 72 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 378, "y": 434, "w": 63, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 2, "w": 63, "h": 72 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 224, "y": 365, "w": 66, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 2, "w": 66, "h": 72 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 0, "y": 365, "w": 69, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 2, "w": 69, "h": 72 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 229, "y": 220, "w": 73, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 1, "w": 73, "h": 73 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 468, "y": 0, "w": 75, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 75, "h": 73 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 308, "y": 147, "w": 74, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 74, "h": 73 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 0, "y": 148, "w": 75, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 75, "h": 72 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 383, "y": 220, "w": 74, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 74, "h": 72 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 231, "y": 147, "w": 76, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 76, "h": 72 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 79, "y": 74, "w": 76, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 76, "h": 72 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 156, "y": 74, "w": 76, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 76, "h": 72 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 310, "y": 74, "w": 76, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 76, "h": 72 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 464, "y": 74, "w": 76, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 76, "h": 72 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 77, "y": 147, "w": 76, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 76, "h": 72 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 154, "y": 147, "w": 76, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 76, "h": 72 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 76, "y": 220, "w": 75, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 75, "h": 72 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 152, "y": 220, "w": 76, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 76, "h": 71 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0088.png",
+    "frame": { "x": 0, "y": 221, "w": 75, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 75, "h": 71 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0089.png",
+    "frame": { "x": 0, "y": 293, "w": 74, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 74, "h": 71 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0090.png",
+    "frame": { "x": 75, "y": 293, "w": 74, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 74, "h": 71 },
+    "sourceSize": { "w": 80, "h": 74 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.11-x64",
+  "image": "668.png",
+  "format": "I8",
+  "size": { "w": 543, "h": 507 },
+  "scale": "1"
+ }
+}
diff --git a/public/images/pokemon/exp/back/shiny/668.png b/public/images/pokemon/exp/back/shiny/668.png
index e2fa147e7fd..0ece333f235 100644
Binary files a/public/images/pokemon/exp/back/shiny/668.png and b/public/images/pokemon/exp/back/shiny/668.png differ
diff --git a/public/images/pokemon/exp/back/shiny/672.json b/public/images/pokemon/exp/back/shiny/672.json
index a8bb0336e34..f877b9abc2e 100644
--- a/public/images/pokemon/exp/back/shiny/672.json
+++ b/public/images/pokemon/exp/back/shiny/672.json
@@ -1,965 +1,479 @@
-{
-	"textures": [
-		{
-			"image": "672.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 282,
-				"h": 282
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 42
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 42
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 42
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 42
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 42
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 42
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0045.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 42
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 42
-					},
-					"frame": {
-						"x": 0,
-						"y": 42,
-						"w": 41,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 42
-					},
-					"frame": {
-						"x": 0,
-						"y": 42,
-						"w": 41,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 42
-					},
-					"frame": {
-						"x": 0,
-						"y": 84,
-						"w": 41,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 42
-					},
-					"frame": {
-						"x": 0,
-						"y": 126,
-						"w": 41,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 42
-					},
-					"frame": {
-						"x": 0,
-						"y": 168,
-						"w": 41,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 42
-					},
-					"frame": {
-						"x": 0,
-						"y": 210,
-						"w": 41,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 42
-					},
-					"frame": {
-						"x": 41,
-						"y": 0,
-						"w": 41,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 42
-					},
-					"frame": {
-						"x": 82,
-						"y": 0,
-						"w": 41,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0025.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 42
-					},
-					"frame": {
-						"x": 123,
-						"y": 0,
-						"w": 41,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0026.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 42
-					},
-					"frame": {
-						"x": 164,
-						"y": 0,
-						"w": 41,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0027.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 42
-					},
-					"frame": {
-						"x": 205,
-						"y": 0,
-						"w": 41,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0042.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 42
-					},
-					"frame": {
-						"x": 41,
-						"y": 42,
-						"w": 41,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0043.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 42
-					},
-					"frame": {
-						"x": 41,
-						"y": 84,
-						"w": 41,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0044.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 42
-					},
-					"frame": {
-						"x": 41,
-						"y": 126,
-						"w": 41,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 41,
-						"h": 41
-					},
-					"frame": {
-						"x": 41,
-						"y": 168,
-						"w": 41,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 41,
-						"h": 41
-					},
-					"frame": {
-						"x": 41,
-						"y": 209,
-						"w": 41,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 41,
-						"h": 41
-					},
-					"frame": {
-						"x": 82,
-						"y": 42,
-						"w": 41,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 41,
-						"h": 41
-					},
-					"frame": {
-						"x": 123,
-						"y": 42,
-						"w": 41,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 41,
-						"h": 41
-					},
-					"frame": {
-						"x": 164,
-						"y": 42,
-						"w": 41,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 41,
-						"h": 41
-					},
-					"frame": {
-						"x": 205,
-						"y": 42,
-						"w": 41,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0028.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 41,
-						"h": 41
-					},
-					"frame": {
-						"x": 82,
-						"y": 83,
-						"w": 41,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0029.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 41,
-						"h": 41
-					},
-					"frame": {
-						"x": 82,
-						"y": 124,
-						"w": 41,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0040.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 40,
-						"h": 42
-					},
-					"frame": {
-						"x": 82,
-						"y": 165,
-						"w": 40,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0041.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 40,
-						"h": 42
-					},
-					"frame": {
-						"x": 82,
-						"y": 207,
-						"w": 40,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 40,
-						"h": 41
-					},
-					"frame": {
-						"x": 122,
-						"y": 165,
-						"w": 40,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 40,
-						"h": 41
-					},
-					"frame": {
-						"x": 122,
-						"y": 206,
-						"w": 40,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 40,
-						"h": 41
-					},
-					"frame": {
-						"x": 123,
-						"y": 83,
-						"w": 40,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 40,
-						"h": 41
-					},
-					"frame": {
-						"x": 123,
-						"y": 124,
-						"w": 40,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0037.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 40,
-						"h": 41
-					},
-					"frame": {
-						"x": 162,
-						"y": 165,
-						"w": 40,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0038.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 40,
-						"h": 41
-					},
-					"frame": {
-						"x": 162,
-						"y": 206,
-						"w": 40,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0039.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 40,
-						"h": 41
-					},
-					"frame": {
-						"x": 163,
-						"y": 83,
-						"w": 40,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0030.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 41,
-						"h": 40
-					},
-					"frame": {
-						"x": 163,
-						"y": 124,
-						"w": 41,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0031.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 41,
-						"h": 40
-					},
-					"frame": {
-						"x": 203,
-						"y": 83,
-						"w": 41,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0032.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 40,
-						"h": 40
-					},
-					"frame": {
-						"x": 202,
-						"y": 164,
-						"w": 40,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0033.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 40,
-						"h": 40
-					},
-					"frame": {
-						"x": 204,
-						"y": 123,
-						"w": 40,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0034.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 40,
-						"h": 40
-					},
-					"frame": {
-						"x": 242,
-						"y": 163,
-						"w": 40,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0035.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 40,
-						"h": 40
-					},
-					"frame": {
-						"x": 242,
-						"y": 203,
-						"w": 40,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0036.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 40,
-						"h": 40
-					},
-					"frame": {
-						"x": 202,
-						"y": 204,
-						"w": 40,
-						"h": 40
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:e27a409eb13547a4ef97935b726389b3:05b6a88e37fb9d64101b9f9071f3afb5:2e4767b7cd134fc0ab1bb6e9eee82bc7$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 120, "y": 0, "w": 40, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 8, "w": 40, "h": 50 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 118, "y": 97, "w": 40, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 9, "w": 40, "h": 49 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 41, "y": 98, "w": 40, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 10, "w": 40, "h": 48 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 78, "y": 0, "w": 42, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 10, "w": 42, "h": 48 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 118, "y": 50, "w": 42, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 11, "w": 42, "h": 47 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 0, "y": 56, "w": 41, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 10, "w": 41, "h": 48 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 0, "y": 104, "w": 40, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 10, "w": 40, "h": 48 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 40, "y": 146, "w": 39, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 9, "w": 39, "h": 49 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 78, "y": 48, "w": 40, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 8, "w": 40, "h": 50 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 120, "y": 0, "w": 40, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 8, "w": 40, "h": 50 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 120, "y": 0, "w": 40, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 8, "w": 40, "h": 50 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 118, "y": 97, "w": 40, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 9, "w": 40, "h": 49 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 41, "y": 98, "w": 40, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 10, "w": 40, "h": 48 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 78, "y": 0, "w": 42, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 10, "w": 42, "h": 48 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 118, "y": 50, "w": 42, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 11, "w": 42, "h": 47 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 0, "y": 56, "w": 41, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 10, "w": 41, "h": 48 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 0, "y": 104, "w": 40, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 10, "w": 40, "h": 48 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 40, "y": 146, "w": 39, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 9, "w": 39, "h": 49 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 78, "y": 48, "w": 40, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 8, "w": 40, "h": 50 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 120, "y": 0, "w": 40, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 8, "w": 40, "h": 50 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 120, "y": 0, "w": 40, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 8, "w": 40, "h": 50 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 118, "y": 97, "w": 40, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 9, "w": 40, "h": 49 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 41, "y": 98, "w": 40, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 10, "w": 40, "h": 48 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 78, "y": 0, "w": 42, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 10, "w": 42, "h": 48 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 118, "y": 50, "w": 42, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 11, "w": 42, "h": 47 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 0, "y": 56, "w": 41, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 10, "w": 41, "h": 48 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 0, "y": 104, "w": 40, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 10, "w": 40, "h": 48 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 40, "y": 146, "w": 39, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 9, "w": 39, "h": 49 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 78, "y": 48, "w": 40, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 8, "w": 40, "h": 50 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 120, "y": 0, "w": 40, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 8, "w": 40, "h": 50 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 120, "y": 0, "w": 40, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 8, "w": 40, "h": 50 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 118, "y": 97, "w": 40, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 9, "w": 40, "h": 49 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 41, "y": 98, "w": 40, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 10, "w": 40, "h": 48 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 78, "y": 0, "w": 42, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 10, "w": 42, "h": 48 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 118, "y": 50, "w": 42, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 11, "w": 42, "h": 47 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 0, "y": 56, "w": 41, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 10, "w": 41, "h": 48 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 0, "y": 104, "w": 40, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 10, "w": 40, "h": 48 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 40, "y": 146, "w": 39, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 9, "w": 39, "h": 49 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 78, "y": 48, "w": 40, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 8, "w": 40, "h": 50 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 120, "y": 0, "w": 40, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 8, "w": 40, "h": 50 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 120, "y": 0, "w": 40, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 8, "w": 40, "h": 50 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 39, "y": 0, "w": 39, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 5, "w": 39, "h": 53 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 0, "y": 0, "w": 39, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 39, "h": 56 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 79, "y": 146, "w": 40, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 9, "w": 40, "h": 47 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 119, "y": 146, "w": 38, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 8, "w": 38, "h": 49 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 120, "y": 0, "w": 40, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 8, "w": 40, "h": 50 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 120, "y": 0, "w": 40, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 8, "w": 40, "h": 50 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 39, "y": 0, "w": 39, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 5, "w": 39, "h": 53 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 0, "y": 0, "w": 39, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 39, "h": 56 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 79, "y": 146, "w": 40, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 9, "w": 40, "h": 47 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 119, "y": 146, "w": 38, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 8, "w": 38, "h": 49 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 120, "y": 0, "w": 40, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 8, "w": 40, "h": 50 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.11-x64",
+  "image": "672.png",
+  "format": "I8",
+  "size": { "w": 160, "h": 195 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/shiny/672.png b/public/images/pokemon/exp/back/shiny/672.png
index 2fab39d2aee..848b2e35962 100644
Binary files a/public/images/pokemon/exp/back/shiny/672.png and b/public/images/pokemon/exp/back/shiny/672.png differ
diff --git a/public/images/pokemon/exp/back/shiny/674.json b/public/images/pokemon/exp/back/shiny/674.json
deleted file mode 100644
index 52192847bdf..00000000000
--- a/public/images/pokemon/exp/back/shiny/674.json
+++ /dev/null
@@ -1,1175 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "674.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 124,
-				"h": 124
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0036.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 29,
-						"h": 42
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 29,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0050.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 29,
-						"h": 42
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 29,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0037.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 29,
-						"h": 42
-					},
-					"frame": {
-						"x": 29,
-						"y": 0,
-						"w": 29,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0043.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 29,
-						"h": 42
-					},
-					"frame": {
-						"x": 29,
-						"y": 0,
-						"w": 29,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0049.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 29,
-						"h": 42
-					},
-					"frame": {
-						"x": 29,
-						"y": 0,
-						"w": 29,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0038.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 29,
-						"h": 42
-					},
-					"frame": {
-						"x": 58,
-						"y": 0,
-						"w": 29,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0042.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 29,
-						"h": 42
-					},
-					"frame": {
-						"x": 58,
-						"y": 0,
-						"w": 29,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0044.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 29,
-						"h": 42
-					},
-					"frame": {
-						"x": 58,
-						"y": 0,
-						"w": 29,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0048.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 29,
-						"h": 42
-					},
-					"frame": {
-						"x": 58,
-						"y": 0,
-						"w": 29,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 28,
-						"h": 42
-					},
-					"frame": {
-						"x": 87,
-						"y": 0,
-						"w": 28,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 28,
-						"h": 42
-					},
-					"frame": {
-						"x": 87,
-						"y": 0,
-						"w": 28,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 28,
-						"h": 42
-					},
-					"frame": {
-						"x": 87,
-						"y": 0,
-						"w": 28,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 28,
-						"h": 42
-					},
-					"frame": {
-						"x": 87,
-						"y": 0,
-						"w": 28,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0025.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 28,
-						"h": 42
-					},
-					"frame": {
-						"x": 87,
-						"y": 0,
-						"w": 28,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0031.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 28,
-						"h": 42
-					},
-					"frame": {
-						"x": 87,
-						"y": 0,
-						"w": 28,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0055.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 28,
-						"h": 42
-					},
-					"frame": {
-						"x": 87,
-						"y": 0,
-						"w": 28,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0039.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 29,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 42,
-						"w": 29,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0041.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 29,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 42,
-						"w": 29,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0045.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 29,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 42,
-						"w": 29,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0047.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 29,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 42,
-						"w": 29,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0040.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 29,
-						"h": 40
-					},
-					"frame": {
-						"x": 29,
-						"y": 42,
-						"w": 29,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0046.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 29,
-						"h": 40
-					},
-					"frame": {
-						"x": 29,
-						"y": 42,
-						"w": 29,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 28,
-						"h": 42
-					},
-					"frame": {
-						"x": 58,
-						"y": 42,
-						"w": 28,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 28,
-						"h": 42
-					},
-					"frame": {
-						"x": 58,
-						"y": 42,
-						"w": 28,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 28,
-						"h": 42
-					},
-					"frame": {
-						"x": 58,
-						"y": 42,
-						"w": 28,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 28,
-						"h": 42
-					},
-					"frame": {
-						"x": 58,
-						"y": 42,
-						"w": 28,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 28,
-						"h": 42
-					},
-					"frame": {
-						"x": 58,
-						"y": 42,
-						"w": 28,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 28,
-						"h": 42
-					},
-					"frame": {
-						"x": 58,
-						"y": 42,
-						"w": 28,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 28,
-						"h": 42
-					},
-					"frame": {
-						"x": 58,
-						"y": 42,
-						"w": 28,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 28,
-						"h": 42
-					},
-					"frame": {
-						"x": 58,
-						"y": 42,
-						"w": 28,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0026.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 28,
-						"h": 42
-					},
-					"frame": {
-						"x": 58,
-						"y": 42,
-						"w": 28,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0030.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 28,
-						"h": 42
-					},
-					"frame": {
-						"x": 58,
-						"y": 42,
-						"w": 28,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0054.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 28,
-						"h": 42
-					},
-					"frame": {
-						"x": 58,
-						"y": 42,
-						"w": 28,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0032.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 28,
-						"h": 42
-					},
-					"frame": {
-						"x": 29,
-						"y": 82,
-						"w": 28,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 28,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 83,
-						"w": 28,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 28,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 83,
-						"w": 28,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 28,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 83,
-						"w": 28,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 28,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 83,
-						"w": 28,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 28,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 83,
-						"w": 28,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 28,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 83,
-						"w": 28,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 28,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 83,
-						"w": 28,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 28,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 83,
-						"w": 28,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0027.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 28,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 83,
-						"w": 28,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0029.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 28,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 83,
-						"w": 28,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0053.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 28,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 83,
-						"w": 28,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 28,
-						"h": 40
-					},
-					"frame": {
-						"x": 57,
-						"y": 84,
-						"w": 28,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 28,
-						"h": 40
-					},
-					"frame": {
-						"x": 57,
-						"y": 84,
-						"w": 28,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 28,
-						"h": 40
-					},
-					"frame": {
-						"x": 57,
-						"y": 84,
-						"w": 28,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 28,
-						"h": 40
-					},
-					"frame": {
-						"x": 57,
-						"y": 84,
-						"w": 28,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0028.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 28,
-						"h": 40
-					},
-					"frame": {
-						"x": 57,
-						"y": 84,
-						"w": 28,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0052.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 28,
-						"h": 40
-					},
-					"frame": {
-						"x": 57,
-						"y": 84,
-						"w": 28,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0034.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 28,
-						"h": 40
-					},
-					"frame": {
-						"x": 85,
-						"y": 84,
-						"w": 28,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0033.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 28,
-						"h": 41
-					},
-					"frame": {
-						"x": 86,
-						"y": 42,
-						"w": 28,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0035.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 28,
-						"h": 41
-					},
-					"frame": {
-						"x": 86,
-						"y": 42,
-						"w": 28,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0051.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 29,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 28,
-						"h": 41
-					},
-					"frame": {
-						"x": 86,
-						"y": 42,
-						"w": 28,
-						"h": 41
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:76841431bc0f022caab94cff146aa974:cfb5f5b4c165e509044ceea57b0d5b30:b823d10f1c9b4d501296982088ba63d6$"
-	}
-}
diff --git a/public/images/pokemon/exp/back/shiny/674.png b/public/images/pokemon/exp/back/shiny/674.png
deleted file mode 100644
index 75e7b228137..00000000000
Binary files a/public/images/pokemon/exp/back/shiny/674.png and /dev/null differ
diff --git a/public/images/pokemon/exp/back/shiny/692.json b/public/images/pokemon/exp/back/shiny/692.json
index 9e90079e613..801710c4861 100644
--- a/public/images/pokemon/exp/back/shiny/692.json
+++ b/public/images/pokemon/exp/back/shiny/692.json
@@ -1,1847 +1,794 @@
-{
-	"textures": [
-		{
-			"image": "692.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 168,
-				"h": 168
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 61,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 61,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 61,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 61,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 61,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 61,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 61,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 61,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 61,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 61,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 61,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 61,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0026.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 61,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 61,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0027.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 61,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 61,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0038.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 61,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 61,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0039.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 61,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 61,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0042.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 61,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 61,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0043.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 61,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 61,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0054.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 61,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 61,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0055.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 61,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 61,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0058.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 61,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 61,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0059.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 61,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 61,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 61,
-						"h": 35
-					},
-					"frame": {
-						"x": 61,
-						"y": 0,
-						"w": 61,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 61,
-						"h": 35
-					},
-					"frame": {
-						"x": 61,
-						"y": 0,
-						"w": 61,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 61,
-						"h": 35
-					},
-					"frame": {
-						"x": 61,
-						"y": 0,
-						"w": 61,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0025.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 61,
-						"h": 35
-					},
-					"frame": {
-						"x": 61,
-						"y": 0,
-						"w": 61,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0040.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 61,
-						"h": 35
-					},
-					"frame": {
-						"x": 61,
-						"y": 0,
-						"w": 61,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0041.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 61,
-						"h": 35
-					},
-					"frame": {
-						"x": 61,
-						"y": 0,
-						"w": 61,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0056.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 61,
-						"h": 35
-					},
-					"frame": {
-						"x": 61,
-						"y": 0,
-						"w": 61,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0057.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 61,
-						"h": 35
-					},
-					"frame": {
-						"x": 61,
-						"y": 0,
-						"w": 61,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 60,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 35,
-						"w": 60,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 60,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 35,
-						"w": 60,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 60,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 35,
-						"w": 60,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 60,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 35,
-						"w": 60,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 60,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 35,
-						"w": 60,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 60,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 35,
-						"w": 60,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0028.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 60,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 35,
-						"w": 60,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0029.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 60,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 35,
-						"w": 60,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0036.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 60,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 35,
-						"w": 60,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0037.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 60,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 35,
-						"w": 60,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0044.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 60,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 35,
-						"w": 60,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0045.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 60,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 35,
-						"w": 60,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0052.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 60,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 35,
-						"w": 60,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0053.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 60,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 35,
-						"w": 60,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0060.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 60,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 35,
-						"w": 60,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0061.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 60,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 35,
-						"w": 60,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0069.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 60,
-						"h": 34
-					},
-					"frame": {
-						"x": 60,
-						"y": 35,
-						"w": 60,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0070.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 60,
-						"h": 34
-					},
-					"frame": {
-						"x": 60,
-						"y": 35,
-						"w": 60,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0071.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 60,
-						"h": 34
-					},
-					"frame": {
-						"x": 60,
-						"y": 35,
-						"w": 60,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0072.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 60,
-						"h": 34
-					},
-					"frame": {
-						"x": 60,
-						"y": 35,
-						"w": 60,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0073.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 60,
-						"h": 34
-					},
-					"frame": {
-						"x": 60,
-						"y": 35,
-						"w": 60,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0077.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 60,
-						"h": 34
-					},
-					"frame": {
-						"x": 60,
-						"y": 35,
-						"w": 60,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0078.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 60,
-						"h": 34
-					},
-					"frame": {
-						"x": 60,
-						"y": 35,
-						"w": 60,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0079.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 60,
-						"h": 34
-					},
-					"frame": {
-						"x": 60,
-						"y": 35,
-						"w": 60,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0080.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 60,
-						"h": 34
-					},
-					"frame": {
-						"x": 60,
-						"y": 35,
-						"w": 60,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0081.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 60,
-						"h": 34
-					},
-					"frame": {
-						"x": 60,
-						"y": 35,
-						"w": 60,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0082.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 60,
-						"h": 34
-					},
-					"frame": {
-						"x": 60,
-						"y": 35,
-						"w": 60,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0083.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 60,
-						"h": 34
-					},
-					"frame": {
-						"x": 60,
-						"y": 35,
-						"w": 60,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0074.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 60,
-						"h": 32
-					},
-					"frame": {
-						"x": 60,
-						"y": 69,
-						"w": 60,
-						"h": 32
-					}
-				},
-				{
-					"filename": "0076.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 60,
-						"h": 32
-					},
-					"frame": {
-						"x": 60,
-						"y": 69,
-						"w": 60,
-						"h": 32
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 59,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 70,
-						"w": 59,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 59,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 70,
-						"w": 59,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 59,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 70,
-						"w": 59,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0030.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 59,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 70,
-						"w": 59,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0035.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 59,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 70,
-						"w": 59,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0046.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 59,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 70,
-						"w": 59,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0051.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 59,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 70,
-						"w": 59,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0062.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 59,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 70,
-						"w": 59,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0067.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 59,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 105,
-						"w": 59,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0068.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 59,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 105,
-						"w": 59,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0084.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 59,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 105,
-						"w": 59,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0085.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 59,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 105,
-						"w": 59,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 58,
-						"h": 35
-					},
-					"frame": {
-						"x": 59,
-						"y": 101,
-						"w": 58,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 58,
-						"h": 35
-					},
-					"frame": {
-						"x": 59,
-						"y": 101,
-						"w": 58,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 58,
-						"h": 35
-					},
-					"frame": {
-						"x": 59,
-						"y": 101,
-						"w": 58,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 58,
-						"h": 35
-					},
-					"frame": {
-						"x": 59,
-						"y": 101,
-						"w": 58,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 58,
-						"h": 35
-					},
-					"frame": {
-						"x": 59,
-						"y": 101,
-						"w": 58,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 58,
-						"h": 35
-					},
-					"frame": {
-						"x": 59,
-						"y": 101,
-						"w": 58,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0031.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 58,
-						"h": 35
-					},
-					"frame": {
-						"x": 59,
-						"y": 101,
-						"w": 58,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0032.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 58,
-						"h": 35
-					},
-					"frame": {
-						"x": 59,
-						"y": 101,
-						"w": 58,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0033.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 58,
-						"h": 35
-					},
-					"frame": {
-						"x": 59,
-						"y": 101,
-						"w": 58,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0034.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 58,
-						"h": 35
-					},
-					"frame": {
-						"x": 59,
-						"y": 101,
-						"w": 58,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0047.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 58,
-						"h": 35
-					},
-					"frame": {
-						"x": 59,
-						"y": 101,
-						"w": 58,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0048.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 58,
-						"h": 35
-					},
-					"frame": {
-						"x": 59,
-						"y": 101,
-						"w": 58,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0049.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 58,
-						"h": 35
-					},
-					"frame": {
-						"x": 59,
-						"y": 101,
-						"w": 58,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0050.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 58,
-						"h": 35
-					},
-					"frame": {
-						"x": 59,
-						"y": 101,
-						"w": 58,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0063.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 58,
-						"h": 35
-					},
-					"frame": {
-						"x": 59,
-						"y": 101,
-						"w": 58,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0064.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 58,
-						"h": 35
-					},
-					"frame": {
-						"x": 59,
-						"y": 101,
-						"w": 58,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0065.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 58,
-						"h": 35
-					},
-					"frame": {
-						"x": 59,
-						"y": 101,
-						"w": 58,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0066.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 58,
-						"h": 35
-					},
-					"frame": {
-						"x": 59,
-						"y": 101,
-						"w": 58,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0086.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 58,
-						"h": 35
-					},
-					"frame": {
-						"x": 59,
-						"y": 101,
-						"w": 58,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0087.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 58,
-						"h": 35
-					},
-					"frame": {
-						"x": 59,
-						"y": 101,
-						"w": 58,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0075.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 57,
-						"h": 32
-					},
-					"frame": {
-						"x": 59,
-						"y": 136,
-						"w": 57,
-						"h": 32
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:8f5831496e68316e4cb3449a0eaf2bb1:e0a74859ab21c488d9f8cbabc8355b5a:2880def858c84cd859bedf13b0b49a33$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 121, "y": 36, "w": 56, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 121, "y": 36, "w": 56, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 1, "y": 36, "w": 57, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 57, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 62, "y": 1, "w": 58, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 58, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 62, "y": 1, "w": 58, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 58, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 121, "y": 1, "w": 59, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 59, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 121, "y": 1, "w": 59, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 59, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 1, "y": 1, "w": 60, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 60, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 1, "y": 1, "w": 60, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 60, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 121, "y": 1, "w": 59, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 59, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 121, "y": 1, "w": 59, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 59, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 62, "y": 1, "w": 58, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 58, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 62, "y": 1, "w": 58, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 58, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 1, "y": 36, "w": 57, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 57, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 121, "y": 36, "w": 56, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 121, "y": 36, "w": 56, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 121, "y": 36, "w": 56, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 121, "y": 36, "w": 56, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 1, "y": 36, "w": 57, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 57, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 62, "y": 1, "w": 58, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 58, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 62, "y": 1, "w": 58, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 58, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 121, "y": 1, "w": 59, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 59, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 121, "y": 1, "w": 59, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 59, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 1, "y": 1, "w": 60, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 60, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 1, "y": 1, "w": 60, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 60, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 121, "y": 1, "w": 59, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 59, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 121, "y": 1, "w": 59, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 59, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 62, "y": 1, "w": 58, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 58, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 62, "y": 1, "w": 58, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 58, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 1, "y": 36, "w": 57, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 57, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 121, "y": 36, "w": 56, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 121, "y": 36, "w": 56, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 121, "y": 36, "w": 56, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 121, "y": 36, "w": 56, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 1, "y": 36, "w": 57, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 57, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 62, "y": 1, "w": 58, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 58, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 62, "y": 1, "w": 58, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 58, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 121, "y": 1, "w": 59, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 59, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 121, "y": 1, "w": 59, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 59, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 1, "y": 1, "w": 60, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 60, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 1, "y": 1, "w": 60, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 60, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 121, "y": 1, "w": 59, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 59, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 121, "y": 1, "w": 59, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 59, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 62, "y": 1, "w": 58, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 58, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 62, "y": 1, "w": 58, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 58, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 1, "y": 36, "w": 57, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 57, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 121, "y": 36, "w": 56, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 121, "y": 36, "w": 56, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 121, "y": 36, "w": 56, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 121, "y": 36, "w": 56, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 1, "y": 36, "w": 57, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 57, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 62, "y": 1, "w": 58, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 58, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 62, "y": 1, "w": 58, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 58, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 121, "y": 1, "w": 59, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 59, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 121, "y": 1, "w": 59, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 59, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 1, "y": 1, "w": 60, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 60, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 1, "y": 1, "w": 60, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 60, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 121, "y": 1, "w": 59, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 59, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 121, "y": 1, "w": 59, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 59, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 62, "y": 1, "w": 58, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 58, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 62, "y": 1, "w": 58, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 58, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 1, "y": 36, "w": 57, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 57, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 121, "y": 36, "w": 56, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 121, "y": 36, "w": 56, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 121, "y": 36, "w": 56, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 121, "y": 36, "w": 56, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 59, "y": 37, "w": 57, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 57, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 59, "y": 37, "w": 57, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 57, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 1, "y": 72, "w": 58, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 58, "h": 33 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 1, "y": 72, "w": 58, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 58, "h": 33 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 1, "y": 72, "w": 58, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 58, "h": 33 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 1, "y": 72, "w": 58, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 58, "h": 33 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 1, "y": 72, "w": 58, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 58, "h": 33 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 60, "y": 72, "w": 58, "h": 31 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 58, "h": 31 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 119, "y": 72, "w": 56, "h": 31 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 56, "h": 31 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 60, "y": 72, "w": 58, "h": 31 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 58, "h": 31 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 1, "y": 72, "w": 58, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 58, "h": 33 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 1, "y": 72, "w": 58, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 58, "h": 33 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 1, "y": 72, "w": 58, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 58, "h": 33 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 1, "y": 72, "w": 58, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 58, "h": 33 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 1, "y": 72, "w": 58, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 58, "h": 33 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 1, "y": 72, "w": 58, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 58, "h": 33 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 1, "y": 72, "w": 58, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 58, "h": 33 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 59, "y": 37, "w": 57, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 57, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 59, "y": 37, "w": 57, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 57, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 121, "y": 36, "w": 56, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 121, "y": 36, "w": 56, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "692.png",
+  "format": "I8",
+  "size": { "w": 181, "h": 106 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/shiny/692.png b/public/images/pokemon/exp/back/shiny/692.png
index a08f22af600..baee2adcd4f 100644
Binary files a/public/images/pokemon/exp/back/shiny/692.png and b/public/images/pokemon/exp/back/shiny/692.png differ
diff --git a/public/images/pokemon/exp/back/shiny/693.json b/public/images/pokemon/exp/back/shiny/693.json
index b0fcec5a40b..6358a8908f6 100644
--- a/public/images/pokemon/exp/back/shiny/693.json
+++ b/public/images/pokemon/exp/back/shiny/693.json
@@ -1,230 +1,902 @@
-{
-	"textures": [
-		{
-			"image": "693.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 223,
-				"h": 223
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 90,
-						"h": 76
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 90,
-						"h": 72
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 90,
-						"h": 72
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 90,
-						"h": 76
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 90,
-						"h": 72
-					},
-					"frame": {
-						"x": 90,
-						"y": 0,
-						"w": 90,
-						"h": 72
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 90,
-						"h": 76
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 90,
-						"h": 72
-					},
-					"frame": {
-						"x": 90,
-						"y": 0,
-						"w": 90,
-						"h": 72
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 90,
-						"h": 76
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 90,
-						"h": 73
-					},
-					"frame": {
-						"x": 0,
-						"y": 72,
-						"w": 90,
-						"h": 73
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 90,
-						"h": 76
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 90,
-						"h": 73
-					},
-					"frame": {
-						"x": 0,
-						"y": 72,
-						"w": 90,
-						"h": 73
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 90,
-						"h": 76
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 90,
-						"h": 75
-					},
-					"frame": {
-						"x": 90,
-						"y": 72,
-						"w": 90,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 90,
-						"h": 76
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 90,
-						"h": 75
-					},
-					"frame": {
-						"x": 90,
-						"y": 72,
-						"w": 90,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 90,
-						"h": 76
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 90,
-						"h": 76
-					},
-					"frame": {
-						"x": 0,
-						"y": 145,
-						"w": 90,
-						"h": 76
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 90,
-						"h": 76
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 90,
-						"h": 76
-					},
-					"frame": {
-						"x": 0,
-						"y": 145,
-						"w": 90,
-						"h": 76
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 90,
-						"h": 76
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 90,
-						"h": 76
-					},
-					"frame": {
-						"x": 90,
-						"y": 147,
-						"w": 90,
-						"h": 76
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:e2d977eceb50e18ece349b4545bbecdd:e9880823c470ec1cfcd9a8f06892f017:9c1f9147e693c05eb4655590e9099679$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 381, "y": 68, "w": 91, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 3, "w": 91, "h": 70 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 472, "y": 70, "w": 88, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 0, "w": 88, "h": 72 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 378, "y": 138, "w": 91, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 8, "w": 91, "h": 65 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 187, "y": 260, "w": 91, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 15, "w": 91, "h": 59 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 379, "y": 257, "w": 95, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 16, "y": 16, "w": 95, "h": 60 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 572, "y": 1, "w": 98, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 12, "w": 98, "h": 66 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 478, "y": 1, "w": 94, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 17, "y": 11, "w": 94, "h": 69 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 560, "y": 132, "w": 93, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 19, "w": 93, "h": 64 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 474, "y": 257, "w": 90, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 22, "w": 90, "h": 61 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 95, "y": 197, "w": 94, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 17, "y": 21, "w": 94, "h": 62 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 99, "y": 1, "w": 94, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 17, "y": 10, "w": 94, "h": 71 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 291, "y": 1, "w": 90, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 6, "w": 90, "h": 73 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 288, "y": 74, "w": 90, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 11, "w": 90, "h": 67 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 368, "y": 317, "w": 88, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 17, "w": 88, "h": 59 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 96, "y": 259, "w": 91, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 15, "w": 91, "h": 59 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 381, "y": 68, "w": 91, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 3, "w": 91, "h": 70 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 472, "y": 70, "w": 88, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 0, "w": 88, "h": 72 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 378, "y": 138, "w": 91, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 8, "w": 91, "h": 65 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 187, "y": 260, "w": 91, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 15, "w": 91, "h": 59 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 379, "y": 257, "w": 95, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 16, "y": 16, "w": 95, "h": 60 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 572, "y": 1, "w": 98, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 12, "w": 98, "h": 66 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 478, "y": 1, "w": 94, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 17, "y": 11, "w": 94, "h": 69 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 560, "y": 132, "w": 93, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 19, "w": 93, "h": 64 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 474, "y": 257, "w": 90, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 22, "w": 90, "h": 61 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 95, "y": 197, "w": 94, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 17, "y": 21, "w": 94, "h": 62 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 99, "y": 1, "w": 94, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 17, "y": 10, "w": 94, "h": 71 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 291, "y": 1, "w": 90, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 6, "w": 90, "h": 73 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 288, "y": 74, "w": 90, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 11, "w": 90, "h": 67 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 368, "y": 317, "w": 88, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 17, "w": 88, "h": 59 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 96, "y": 259, "w": 91, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 15, "w": 91, "h": 59 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 381, "y": 68, "w": 91, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 3, "w": 91, "h": 70 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 472, "y": 70, "w": 88, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 0, "w": 88, "h": 72 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 378, "y": 138, "w": 91, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 8, "w": 91, "h": 65 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 187, "y": 260, "w": 91, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 15, "w": 91, "h": 59 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 379, "y": 257, "w": 95, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 16, "y": 16, "w": 95, "h": 60 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 572, "y": 1, "w": 98, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 12, "w": 98, "h": 66 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 478, "y": 1, "w": 94, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 17, "y": 11, "w": 94, "h": 69 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 560, "y": 132, "w": 93, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 19, "w": 93, "h": 64 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 474, "y": 257, "w": 90, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 22, "w": 90, "h": 61 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 95, "y": 197, "w": 94, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 17, "y": 21, "w": 94, "h": 62 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 99, "y": 1, "w": 94, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 17, "y": 10, "w": 94, "h": 71 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 291, "y": 1, "w": 90, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 6, "w": 90, "h": 73 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 288, "y": 74, "w": 90, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 11, "w": 90, "h": 67 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 368, "y": 317, "w": 88, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 17, "w": 88, "h": 59 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 96, "y": 259, "w": 91, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 15, "w": 91, "h": 59 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 381, "y": 68, "w": 91, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 3, "w": 91, "h": 70 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 472, "y": 70, "w": 88, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 0, "w": 88, "h": 72 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 378, "y": 138, "w": 91, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 8, "w": 91, "h": 65 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 187, "y": 260, "w": 91, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 15, "w": 91, "h": 59 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 379, "y": 257, "w": 95, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 16, "y": 16, "w": 95, "h": 60 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 572, "y": 1, "w": 98, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 12, "w": 98, "h": 66 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 478, "y": 1, "w": 94, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 17, "y": 11, "w": 94, "h": 69 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 560, "y": 132, "w": 93, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 19, "w": 93, "h": 64 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 474, "y": 257, "w": 90, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 22, "w": 90, "h": 61 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 95, "y": 197, "w": 94, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 17, "y": 21, "w": 94, "h": 62 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 99, "y": 1, "w": 94, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 17, "y": 10, "w": 94, "h": 71 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 291, "y": 1, "w": 90, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 6, "w": 90, "h": 73 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 288, "y": 74, "w": 90, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 11, "w": 90, "h": 67 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 368, "y": 317, "w": 88, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 17, "w": 88, "h": 59 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 96, "y": 259, "w": 91, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 15, "w": 91, "h": 59 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 381, "y": 68, "w": 91, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 3, "w": 91, "h": 70 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 472, "y": 70, "w": 88, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 0, "w": 88, "h": 72 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 378, "y": 138, "w": 91, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 8, "w": 91, "h": 65 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 187, "y": 260, "w": 91, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 15, "w": 91, "h": 59 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 379, "y": 257, "w": 95, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 16, "y": 16, "w": 95, "h": 60 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 572, "y": 1, "w": 98, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 12, "w": 98, "h": 66 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 478, "y": 1, "w": 94, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 17, "y": 11, "w": 94, "h": 69 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 560, "y": 132, "w": 93, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 19, "w": 93, "h": 64 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 474, "y": 257, "w": 90, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 22, "w": 90, "h": 61 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 95, "y": 197, "w": 94, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 17, "y": 21, "w": 94, "h": 62 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 99, "y": 1, "w": 94, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 17, "y": 10, "w": 94, "h": 71 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 291, "y": 1, "w": 90, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 6, "w": 90, "h": 73 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 288, "y": 74, "w": 90, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 11, "w": 90, "h": 67 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 368, "y": 317, "w": 88, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 17, "w": 88, "h": 59 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 96, "y": 259, "w": 91, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 15, "w": 91, "h": 59 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 381, "y": 68, "w": 91, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 3, "w": 91, "h": 70 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 565, "y": 196, "w": 90, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 16, "y": 6, "w": 90, "h": 65 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 278, "y": 266, "w": 90, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 10, "w": 90, "h": 59 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 189, "y": 199, "w": 95, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 8, "w": 95, "h": 61 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 193, "y": 1, "w": 98, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 98, "h": 68 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 1, "y": 71, "w": 94, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 17, "y": 10, "w": 94, "h": 65 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 469, "y": 196, "w": 96, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 12, "w": 96, "h": 61 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 1, "y": 1, "w": 98, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 5, "w": 98, "h": 70 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 1, "y": 136, "w": 94, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 10, "w": 94, "h": 63 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 95, "y": 72, "w": 96, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 12, "w": 96, "h": 63 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 381, "y": 1, "w": 97, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 6, "w": 97, "h": 67 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 1, "y": 71, "w": 94, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 17, "y": 10, "w": 94, "h": 65 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0088.png",
+    "frame": { "x": 469, "y": 196, "w": 96, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 12, "w": 96, "h": 61 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0089.png",
+    "frame": { "x": 1, "y": 1, "w": 98, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 5, "w": 98, "h": 70 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0090.png",
+    "frame": { "x": 191, "y": 136, "w": 94, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 10, "w": 94, "h": 63 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0091.png",
+    "frame": { "x": 95, "y": 135, "w": 96, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 11, "w": 96, "h": 62 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0092.png",
+    "frame": { "x": 572, "y": 67, "w": 99, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 7, "w": 99, "h": 65 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0093.png",
+    "frame": { "x": 284, "y": 205, "w": 95, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 11, "w": 95, "h": 61 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0094.png",
+    "frame": { "x": 1, "y": 199, "w": 91, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 12, "w": 91, "h": 60 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0095.png",
+    "frame": { "x": 1, "y": 259, "w": 95, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 12, "w": 95, "h": 60 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0096.png",
+    "frame": { "x": 193, "y": 69, "w": 95, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 5, "w": 95, "h": 67 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0097.png",
+    "frame": { "x": 285, "y": 141, "w": 92, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 8, "w": 92, "h": 64 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0098.png",
+    "frame": { "x": 96, "y": 318, "w": 89, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 14, "w": 89, "h": 58 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   },
+   {
+    "filename": "0099.png",
+    "frame": { "x": 564, "y": 261, "w": 92, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 19, "y": 14, "w": 92, "h": 58 },
+    "sourceSize": { "w": 111, "h": 83 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "693.png",
+  "format": "I8",
+  "size": { "w": 672, "h": 377 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/shiny/693.png b/public/images/pokemon/exp/back/shiny/693.png
index 5eb7110fc3d..10b639004ae 100644
Binary files a/public/images/pokemon/exp/back/shiny/693.png and b/public/images/pokemon/exp/back/shiny/693.png differ
diff --git a/public/images/pokemon/exp/back/shiny/694.json b/public/images/pokemon/exp/back/shiny/694.json
deleted file mode 100644
index ec28fb40922..00000000000
--- a/public/images/pokemon/exp/back/shiny/694.json
+++ /dev/null
@@ -1,272 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "694.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 130,
-				"h": 130
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 39
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 48,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 48,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 39
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 48,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 48,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 39
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 47,
-						"h": 35
-					},
-					"frame": {
-						"x": 48,
-						"y": 0,
-						"w": 47,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 39
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 47,
-						"h": 36
-					},
-					"frame": {
-						"x": 0,
-						"y": 35,
-						"w": 47,
-						"h": 36
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 39
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 47,
-						"h": 36
-					},
-					"frame": {
-						"x": 0,
-						"y": 35,
-						"w": 47,
-						"h": 36
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 39
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 47,
-						"h": 37
-					},
-					"frame": {
-						"x": 47,
-						"y": 35,
-						"w": 47,
-						"h": 37
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 39
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 47,
-						"h": 37
-					},
-					"frame": {
-						"x": 47,
-						"y": 35,
-						"w": 47,
-						"h": 37
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 39
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 46,
-						"h": 38
-					},
-					"frame": {
-						"x": 0,
-						"y": 71,
-						"w": 46,
-						"h": 38
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 39
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 46,
-						"h": 38
-					},
-					"frame": {
-						"x": 0,
-						"y": 71,
-						"w": 46,
-						"h": 38
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 39
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 44,
-						"h": 39
-					},
-					"frame": {
-						"x": 46,
-						"y": 72,
-						"w": 44,
-						"h": 39
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 39
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 44,
-						"h": 39
-					},
-					"frame": {
-						"x": 46,
-						"y": 72,
-						"w": 44,
-						"h": 39
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 39
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 40,
-						"h": 39
-					},
-					"frame": {
-						"x": 90,
-						"y": 72,
-						"w": 40,
-						"h": 39
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:d46bf508ccc2fa50cb3f373328d8e60a:7d537a54677423b5809fcbc4394d9538:b0990f9650cfe63b836cbed33f0b44d8$"
-	}
-}
diff --git a/public/images/pokemon/exp/back/shiny/694.png b/public/images/pokemon/exp/back/shiny/694.png
deleted file mode 100644
index 2df2c82fdd7..00000000000
Binary files a/public/images/pokemon/exp/back/shiny/694.png and /dev/null differ
diff --git a/public/images/pokemon/exp/back/shiny/697.json b/public/images/pokemon/exp/back/shiny/697.json
index ade475cd439..6963da289ab 100644
--- a/public/images/pokemon/exp/back/shiny/697.json
+++ b/public/images/pokemon/exp/back/shiny/697.json
@@ -1,1196 +1,992 @@
-{
-	"textures": [
-		{
-			"image": "697.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 374,
-				"h": 374
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0043.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 0,
-						"w": 63,
-						"h": 78
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 63,
-						"h": 78
-					}
-				},
-				{
-					"filename": "0045.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 0,
-						"w": 63,
-						"h": 78
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 63,
-						"h": 78
-					}
-				},
-				{
-					"filename": "0044.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 11,
-						"y": 0,
-						"w": 60,
-						"h": 78
-					},
-					"frame": {
-						"x": 0,
-						"y": 78,
-						"w": 60,
-						"h": 78
-					}
-				},
-				{
-					"filename": "0042.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 1,
-						"w": 66,
-						"h": 77
-					},
-					"frame": {
-						"x": 0,
-						"y": 156,
-						"w": 66,
-						"h": 77
-					}
-				},
-				{
-					"filename": "0046.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 1,
-						"w": 66,
-						"h": 77
-					},
-					"frame": {
-						"x": 0,
-						"y": 156,
-						"w": 66,
-						"h": 77
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 77,
-						"h": 76
-					},
-					"frame": {
-						"x": 60,
-						"y": 78,
-						"w": 77,
-						"h": 76
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 77,
-						"h": 76
-					},
-					"frame": {
-						"x": 60,
-						"y": 78,
-						"w": 77,
-						"h": 76
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 77,
-						"h": 76
-					},
-					"frame": {
-						"x": 60,
-						"y": 78,
-						"w": 77,
-						"h": 76
-					}
-				},
-				{
-					"filename": "0034.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 77,
-						"h": 76
-					},
-					"frame": {
-						"x": 60,
-						"y": 78,
-						"w": 77,
-						"h": 76
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 77,
-						"h": 76
-					},
-					"frame": {
-						"x": 63,
-						"y": 0,
-						"w": 77,
-						"h": 76
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 77,
-						"h": 76
-					},
-					"frame": {
-						"x": 63,
-						"y": 0,
-						"w": 77,
-						"h": 76
-					}
-				},
-				{
-					"filename": "0025.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 77,
-						"h": 76
-					},
-					"frame": {
-						"x": 63,
-						"y": 0,
-						"w": 77,
-						"h": 76
-					}
-				},
-				{
-					"filename": "0035.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 77,
-						"h": 76
-					},
-					"frame": {
-						"x": 63,
-						"y": 0,
-						"w": 77,
-						"h": 76
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 77,
-						"h": 76
-					},
-					"frame": {
-						"x": 0,
-						"y": 233,
-						"w": 77,
-						"h": 76
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 77,
-						"h": 76
-					},
-					"frame": {
-						"x": 0,
-						"y": 233,
-						"w": 77,
-						"h": 76
-					}
-				},
-				{
-					"filename": "0026.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 77,
-						"h": 76
-					},
-					"frame": {
-						"x": 0,
-						"y": 233,
-						"w": 77,
-						"h": 76
-					}
-				},
-				{
-					"filename": "0036.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 77,
-						"h": 76
-					},
-					"frame": {
-						"x": 0,
-						"y": 233,
-						"w": 77,
-						"h": 76
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 77,
-						"h": 76
-					},
-					"frame": {
-						"x": 66,
-						"y": 154,
-						"w": 77,
-						"h": 76
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 77,
-						"h": 76
-					},
-					"frame": {
-						"x": 66,
-						"y": 154,
-						"w": 77,
-						"h": 76
-					}
-				},
-				{
-					"filename": "0027.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 77,
-						"h": 76
-					},
-					"frame": {
-						"x": 66,
-						"y": 154,
-						"w": 77,
-						"h": 76
-					}
-				},
-				{
-					"filename": "0037.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 77,
-						"h": 76
-					},
-					"frame": {
-						"x": 66,
-						"y": 154,
-						"w": 77,
-						"h": 76
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 76,
-						"h": 76
-					},
-					"frame": {
-						"x": 137,
-						"y": 76,
-						"w": 76,
-						"h": 76
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 76,
-						"h": 76
-					},
-					"frame": {
-						"x": 137,
-						"y": 76,
-						"w": 76,
-						"h": 76
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 76,
-						"h": 76
-					},
-					"frame": {
-						"x": 137,
-						"y": 76,
-						"w": 76,
-						"h": 76
-					}
-				},
-				{
-					"filename": "0033.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 76,
-						"h": 76
-					},
-					"frame": {
-						"x": 137,
-						"y": 76,
-						"w": 76,
-						"h": 76
-					}
-				},
-				{
-					"filename": "0041.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 2,
-						"w": 69,
-						"h": 76
-					},
-					"frame": {
-						"x": 140,
-						"y": 0,
-						"w": 69,
-						"h": 76
-					}
-				},
-				{
-					"filename": "0047.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 2,
-						"w": 69,
-						"h": 76
-					},
-					"frame": {
-						"x": 140,
-						"y": 0,
-						"w": 69,
-						"h": 76
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 76,
-						"h": 75
-					},
-					"frame": {
-						"x": 209,
-						"y": 0,
-						"w": 76,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 76,
-						"h": 75
-					},
-					"frame": {
-						"x": 209,
-						"y": 0,
-						"w": 76,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0028.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 76,
-						"h": 75
-					},
-					"frame": {
-						"x": 209,
-						"y": 0,
-						"w": 76,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0052.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 77,
-						"h": 73
-					},
-					"frame": {
-						"x": 285,
-						"y": 0,
-						"w": 77,
-						"h": 73
-					}
-				},
-				{
-					"filename": "0038.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 76,
-						"h": 75
-					},
-					"frame": {
-						"x": 285,
-						"y": 73,
-						"w": 76,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0040.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 72,
-						"h": 75
-					},
-					"frame": {
-						"x": 213,
-						"y": 75,
-						"w": 72,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0048.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 72,
-						"h": 75
-					},
-					"frame": {
-						"x": 213,
-						"y": 75,
-						"w": 72,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0051.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 76,
-						"h": 74
-					},
-					"frame": {
-						"x": 285,
-						"y": 148,
-						"w": 76,
-						"h": 74
-					}
-				},
-				{
-					"filename": "0053.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 76,
-						"h": 74
-					},
-					"frame": {
-						"x": 285,
-						"y": 148,
-						"w": 76,
-						"h": 74
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 75,
-						"h": 75
-					},
-					"frame": {
-						"x": 143,
-						"y": 152,
-						"w": 75,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 75,
-						"h": 75
-					},
-					"frame": {
-						"x": 143,
-						"y": 152,
-						"w": 75,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 75,
-						"h": 75
-					},
-					"frame": {
-						"x": 143,
-						"y": 152,
-						"w": 75,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0032.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 75,
-						"h": 75
-					},
-					"frame": {
-						"x": 143,
-						"y": 152,
-						"w": 75,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 74,
-						"h": 74
-					},
-					"frame": {
-						"x": 77,
-						"y": 230,
-						"w": 74,
-						"h": 74
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 74,
-						"h": 74
-					},
-					"frame": {
-						"x": 77,
-						"y": 230,
-						"w": 74,
-						"h": 74
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 74,
-						"h": 74
-					},
-					"frame": {
-						"x": 77,
-						"y": 230,
-						"w": 74,
-						"h": 74
-					}
-				},
-				{
-					"filename": "0029.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 74,
-						"h": 74
-					},
-					"frame": {
-						"x": 77,
-						"y": 230,
-						"w": 74,
-						"h": 74
-					}
-				},
-				{
-					"filename": "0056.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 74,
-						"h": 74
-					},
-					"frame": {
-						"x": 77,
-						"y": 230,
-						"w": 74,
-						"h": 74
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 74,
-						"h": 74
-					},
-					"frame": {
-						"x": 151,
-						"y": 227,
-						"w": 74,
-						"h": 74
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 74,
-						"h": 74
-					},
-					"frame": {
-						"x": 151,
-						"y": 227,
-						"w": 74,
-						"h": 74
-					}
-				},
-				{
-					"filename": "0031.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 74,
-						"h": 74
-					},
-					"frame": {
-						"x": 151,
-						"y": 227,
-						"w": 74,
-						"h": 74
-					}
-				},
-				{
-					"filename": "0050.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 5,
-						"w": 75,
-						"h": 73
-					},
-					"frame": {
-						"x": 151,
-						"y": 301,
-						"w": 75,
-						"h": 73
-					}
-				},
-				{
-					"filename": "0054.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 5,
-						"w": 75,
-						"h": 73
-					},
-					"frame": {
-						"x": 151,
-						"y": 301,
-						"w": 75,
-						"h": 73
-					}
-				},
-				{
-					"filename": "0049.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 74,
-						"h": 74
-					},
-					"frame": {
-						"x": 225,
-						"y": 222,
-						"w": 74,
-						"h": 74
-					}
-				},
-				{
-					"filename": "0055.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 74,
-						"h": 74
-					},
-					"frame": {
-						"x": 299,
-						"y": 222,
-						"w": 74,
-						"h": 74
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 4,
-						"w": 73,
-						"h": 74
-					},
-					"frame": {
-						"x": 226,
-						"y": 296,
-						"w": 73,
-						"h": 74
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 4,
-						"w": 73,
-						"h": 74
-					},
-					"frame": {
-						"x": 226,
-						"y": 296,
-						"w": 73,
-						"h": 74
-					}
-				},
-				{
-					"filename": "0030.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 4,
-						"w": 73,
-						"h": 74
-					},
-					"frame": {
-						"x": 226,
-						"y": 296,
-						"w": 73,
-						"h": 74
-					}
-				},
-				{
-					"filename": "0039.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 4,
-						"w": 73,
-						"h": 74
-					},
-					"frame": {
-						"x": 299,
-						"y": 296,
-						"w": 73,
-						"h": 74
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:dc19d18c6fcbcf52992f8e0181b428f3:44bc6e229ce96fd68619c97288aeb670:f4fdd87d2fc1483d8e0a185c2654e3d9$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 0, "y": 149, "w": 92, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 92, "h": 75 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 286, "y": 150, "w": 92, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 92, "h": 75 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 185, "y": 227, "w": 91, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 91, "h": 75 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 93, "y": 227, "w": 91, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 91, "h": 75 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 0, "y": 301, "w": 91, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 91, "h": 74 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 182, "y": 303, "w": 90, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 90, "h": 74 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 273, "y": 375, "w": 91, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 91, "h": 73 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 182, "y": 378, "w": 90, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 90, "h": 73 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 273, "y": 449, "w": 89, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 5, "w": 89, "h": 73 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 177, "y": 452, "w": 89, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 6, "w": 89, "h": 72 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 452, "y": 450, "w": 89, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 6, "w": 89, "h": 72 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 461, "y": 376, "w": 90, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 90, "h": 73 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 649, "y": 375, "w": 91, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 91, "h": 73 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 558, "y": 303, "w": 90, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 90, "h": 74 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 649, "y": 300, "w": 91, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 91, "h": 74 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 373, "y": 227, "w": 91, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 91, "h": 75 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 0, "y": 149, "w": 92, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 92, "h": 75 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 286, "y": 150, "w": 92, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 92, "h": 75 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 185, "y": 227, "w": 91, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 91, "h": 75 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 93, "y": 227, "w": 91, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 91, "h": 75 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 0, "y": 301, "w": 91, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 91, "h": 74 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 182, "y": 303, "w": 90, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 90, "h": 74 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 273, "y": 375, "w": 91, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 91, "h": 73 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 182, "y": 378, "w": 90, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 90, "h": 73 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 273, "y": 449, "w": 89, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 5, "w": 89, "h": 73 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 177, "y": 452, "w": 89, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 6, "w": 89, "h": 72 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 452, "y": 450, "w": 89, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 6, "w": 89, "h": 72 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 461, "y": 376, "w": 90, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 90, "h": 73 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 649, "y": 375, "w": 91, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 91, "h": 73 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 558, "y": 303, "w": 90, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 90, "h": 74 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 649, "y": 300, "w": 91, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 91, "h": 74 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 373, "y": 227, "w": 91, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 91, "h": 75 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 0, "y": 149, "w": 92, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 92, "h": 75 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 286, "y": 150, "w": 92, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 92, "h": 75 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 185, "y": 227, "w": 91, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 91, "h": 75 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 93, "y": 227, "w": 91, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 91, "h": 75 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 0, "y": 301, "w": 91, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 91, "h": 74 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 182, "y": 303, "w": 90, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 90, "h": 74 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 273, "y": 375, "w": 91, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 91, "h": 73 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 182, "y": 378, "w": 90, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 90, "h": 73 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 273, "y": 449, "w": 89, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 5, "w": 89, "h": 73 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 177, "y": 452, "w": 89, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 6, "w": 89, "h": 72 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 452, "y": 450, "w": 89, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 6, "w": 89, "h": 72 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 461, "y": 376, "w": 90, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 90, "h": 73 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 649, "y": 375, "w": 91, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 91, "h": 73 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 558, "y": 303, "w": 90, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 90, "h": 74 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 649, "y": 300, "w": 91, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 91, "h": 74 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 373, "y": 227, "w": 91, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 91, "h": 75 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 0, "y": 149, "w": 92, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 92, "h": 75 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 286, "y": 150, "w": 92, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 92, "h": 75 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 185, "y": 227, "w": 91, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 91, "h": 75 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 93, "y": 227, "w": 91, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 91, "h": 75 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 0, "y": 301, "w": 91, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 91, "h": 74 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 182, "y": 303, "w": 90, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 90, "h": 74 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 273, "y": 375, "w": 91, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 91, "h": 73 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 182, "y": 378, "w": 90, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 90, "h": 73 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 273, "y": 449, "w": 89, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 5, "w": 89, "h": 73 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 177, "y": 452, "w": 89, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 6, "w": 89, "h": 72 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 452, "y": 450, "w": 89, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 6, "w": 89, "h": 72 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 461, "y": 376, "w": 90, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 90, "h": 73 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 649, "y": 375, "w": 91, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 91, "h": 73 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 558, "y": 303, "w": 90, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 90, "h": 74 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 649, "y": 300, "w": 91, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 91, "h": 74 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 373, "y": 227, "w": 91, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 91, "h": 75 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 0, "y": 149, "w": 92, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 92, "h": 75 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 370, "y": 303, "w": 90, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 90, "h": 74 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 558, "y": 227, "w": 90, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 90, "h": 75 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 0, "y": 376, "w": 88, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 88, "h": 75 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 89, "y": 379, "w": 87, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 87, "h": 75 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 365, "y": 378, "w": 86, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 86, "h": 76 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 640, "y": 449, "w": 84, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 0, "w": 84, "h": 77 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 552, "y": 378, "w": 87, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 87, "h": 75 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 92, "y": 303, "w": 89, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 89, "h": 75 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 465, "y": 302, "w": 92, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 5, "w": 92, "h": 73 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 465, "y": 227, "w": 92, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 92, "h": 74 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 465, "y": 227, "w": 92, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 92, "h": 74 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 0, "y": 149, "w": 92, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 92, "h": 75 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 186, "y": 151, "w": 92, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 92, "h": 75 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 0, "y": 225, "w": 92, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 92, "h": 75 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 670, "y": 150, "w": 92, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 92, "h": 75 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 93, "y": 151, "w": 92, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 92, "h": 75 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 472, "y": 151, "w": 92, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 92, "h": 75 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 565, "y": 151, "w": 92, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 92, "h": 75 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 670, "y": 150, "w": 92, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 92, "h": 75 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 0, "y": 149, "w": 92, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 92, "h": 75 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 277, "y": 301, "w": 92, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 5, "w": 92, "h": 73 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 465, "y": 227, "w": 92, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 92, "h": 74 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0088.png",
+    "frame": { "x": 465, "y": 227, "w": 92, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 92, "h": 74 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0089.png",
+    "frame": { "x": 0, "y": 149, "w": 92, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 92, "h": 75 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0090.png",
+    "frame": { "x": 388, "y": 75, "w": 93, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 93, "h": 75 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0091.png",
+    "frame": { "x": 97, "y": 75, "w": 93, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 93, "h": 75 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0092.png",
+    "frame": { "x": 292, "y": 0, "w": 95, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 95, "h": 75 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0093.png",
+    "frame": { "x": 196, "y": 0, "w": 95, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 95, "h": 75 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0094.png",
+    "frame": { "x": 582, "y": 0, "w": 96, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 96, "h": 74 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0095.png",
+    "frame": { "x": 98, "y": 0, "w": 97, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 97, "h": 74 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0096.png",
+    "frame": { "x": 0, "y": 0, "w": 97, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 97, "h": 74 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0097.png",
+    "frame": { "x": 485, "y": 0, "w": 96, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 96, "h": 74 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0098.png",
+    "frame": { "x": 388, "y": 0, "w": 96, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 96, "h": 74 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0099.png",
+    "frame": { "x": 0, "y": 75, "w": 96, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 96, "h": 73 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0100.png",
+    "frame": { "x": 286, "y": 76, "w": 95, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 95, "h": 73 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0101.png",
+    "frame": { "x": 670, "y": 76, "w": 95, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 95, "h": 73 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0102.png",
+    "frame": { "x": 658, "y": 226, "w": 94, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 94, "h": 73 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0103.png",
+    "frame": { "x": 191, "y": 76, "w": 94, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 94, "h": 74 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0104.png",
+    "frame": { "x": 279, "y": 226, "w": 93, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 93, "h": 74 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0105.png",
+    "frame": { "x": 679, "y": 0, "w": 94, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 94, "h": 75 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0106.png",
+    "frame": { "x": 482, "y": 75, "w": 93, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 93, "h": 75 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0107.png",
+    "frame": { "x": 576, "y": 75, "w": 93, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 93, "h": 75 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0108.png",
+    "frame": { "x": 379, "y": 151, "w": 92, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 92, "h": 75 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0109.png",
+    "frame": { "x": 465, "y": 227, "w": 92, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 92, "h": 74 },
+    "sourceSize": { "w": 100, "h": 78 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.11-x64",
+  "image": "697.png",
+  "format": "I8",
+  "size": { "w": 773, "h": 526 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/shiny/697.png b/public/images/pokemon/exp/back/shiny/697.png
index cc3a5b344c3..fabed852462 100644
Binary files a/public/images/pokemon/exp/back/shiny/697.png and b/public/images/pokemon/exp/back/shiny/697.png differ
diff --git a/public/images/pokemon/exp/back/shiny/698.json b/public/images/pokemon/exp/back/shiny/698.json
deleted file mode 100644
index 197e3b844b3..00000000000
--- a/public/images/pokemon/exp/back/shiny/698.json
+++ /dev/null
@@ -1,3296 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "698.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 181,
-				"h": 181
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0029.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 45,
-						"h": 54
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 45,
-						"h": 54
-					}
-				},
-				{
-					"filename": "0030.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 45,
-						"h": 54
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 45,
-						"h": 54
-					}
-				},
-				{
-					"filename": "0033.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 45,
-						"h": 54
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 45,
-						"h": 54
-					}
-				},
-				{
-					"filename": "0034.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 45,
-						"h": 54
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 45,
-						"h": 54
-					}
-				},
-				{
-					"filename": "0069.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 45,
-						"h": 54
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 45,
-						"h": 54
-					}
-				},
-				{
-					"filename": "0070.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 45,
-						"h": 54
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 45,
-						"h": 54
-					}
-				},
-				{
-					"filename": "0073.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 45,
-						"h": 54
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 45,
-						"h": 54
-					}
-				},
-				{
-					"filename": "0074.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 45,
-						"h": 54
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 45,
-						"h": 54
-					}
-				},
-				{
-					"filename": "0109.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 45,
-						"h": 54
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 45,
-						"h": 54
-					}
-				},
-				{
-					"filename": "0110.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 45,
-						"h": 54
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 45,
-						"h": 54
-					}
-				},
-				{
-					"filename": "0113.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 45,
-						"h": 54
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 45,
-						"h": 54
-					}
-				},
-				{
-					"filename": "0114.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 45,
-						"h": 54
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 45,
-						"h": 54
-					}
-				},
-				{
-					"filename": "0027.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 43,
-						"h": 55
-					},
-					"frame": {
-						"x": 0,
-						"y": 54,
-						"w": 43,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0028.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 43,
-						"h": 55
-					},
-					"frame": {
-						"x": 0,
-						"y": 54,
-						"w": 43,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0035.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 43,
-						"h": 55
-					},
-					"frame": {
-						"x": 0,
-						"y": 54,
-						"w": 43,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0036.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 43,
-						"h": 55
-					},
-					"frame": {
-						"x": 0,
-						"y": 54,
-						"w": 43,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0067.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 43,
-						"h": 55
-					},
-					"frame": {
-						"x": 0,
-						"y": 54,
-						"w": 43,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0068.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 43,
-						"h": 55
-					},
-					"frame": {
-						"x": 0,
-						"y": 54,
-						"w": 43,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0075.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 43,
-						"h": 55
-					},
-					"frame": {
-						"x": 0,
-						"y": 54,
-						"w": 43,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0076.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 43,
-						"h": 55
-					},
-					"frame": {
-						"x": 0,
-						"y": 54,
-						"w": 43,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0107.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 43,
-						"h": 55
-					},
-					"frame": {
-						"x": 0,
-						"y": 54,
-						"w": 43,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0108.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 43,
-						"h": 55
-					},
-					"frame": {
-						"x": 0,
-						"y": 54,
-						"w": 43,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0115.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 43,
-						"h": 55
-					},
-					"frame": {
-						"x": 0,
-						"y": 54,
-						"w": 43,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0116.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 43,
-						"h": 55
-					},
-					"frame": {
-						"x": 0,
-						"y": 54,
-						"w": 43,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0031.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 45,
-						"h": 53
-					},
-					"frame": {
-						"x": 45,
-						"y": 0,
-						"w": 45,
-						"h": 53
-					}
-				},
-				{
-					"filename": "0032.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 45,
-						"h": 53
-					},
-					"frame": {
-						"x": 45,
-						"y": 0,
-						"w": 45,
-						"h": 53
-					}
-				},
-				{
-					"filename": "0071.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 45,
-						"h": 53
-					},
-					"frame": {
-						"x": 45,
-						"y": 0,
-						"w": 45,
-						"h": 53
-					}
-				},
-				{
-					"filename": "0072.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 45,
-						"h": 53
-					},
-					"frame": {
-						"x": 45,
-						"y": 0,
-						"w": 45,
-						"h": 53
-					}
-				},
-				{
-					"filename": "0111.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 45,
-						"h": 53
-					},
-					"frame": {
-						"x": 45,
-						"y": 0,
-						"w": 45,
-						"h": 53
-					}
-				},
-				{
-					"filename": "0112.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 45,
-						"h": 53
-					},
-					"frame": {
-						"x": 45,
-						"y": 0,
-						"w": 45,
-						"h": 53
-					}
-				},
-				{
-					"filename": "0025.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 41,
-						"h": 56
-					},
-					"frame": {
-						"x": 0,
-						"y": 109,
-						"w": 41,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0026.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 41,
-						"h": 56
-					},
-					"frame": {
-						"x": 0,
-						"y": 109,
-						"w": 41,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0037.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 41,
-						"h": 56
-					},
-					"frame": {
-						"x": 0,
-						"y": 109,
-						"w": 41,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0038.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 41,
-						"h": 56
-					},
-					"frame": {
-						"x": 0,
-						"y": 109,
-						"w": 41,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0039.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 41,
-						"h": 56
-					},
-					"frame": {
-						"x": 0,
-						"y": 109,
-						"w": 41,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0040.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 41,
-						"h": 56
-					},
-					"frame": {
-						"x": 0,
-						"y": 109,
-						"w": 41,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0065.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 41,
-						"h": 56
-					},
-					"frame": {
-						"x": 0,
-						"y": 109,
-						"w": 41,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0066.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 41,
-						"h": 56
-					},
-					"frame": {
-						"x": 0,
-						"y": 109,
-						"w": 41,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0077.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 41,
-						"h": 56
-					},
-					"frame": {
-						"x": 0,
-						"y": 109,
-						"w": 41,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0078.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 41,
-						"h": 56
-					},
-					"frame": {
-						"x": 0,
-						"y": 109,
-						"w": 41,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0079.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 41,
-						"h": 56
-					},
-					"frame": {
-						"x": 0,
-						"y": 109,
-						"w": 41,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0080.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 41,
-						"h": 56
-					},
-					"frame": {
-						"x": 0,
-						"y": 109,
-						"w": 41,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0105.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 41,
-						"h": 56
-					},
-					"frame": {
-						"x": 0,
-						"y": 109,
-						"w": 41,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0106.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 41,
-						"h": 56
-					},
-					"frame": {
-						"x": 0,
-						"y": 109,
-						"w": 41,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0117.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 41,
-						"h": 56
-					},
-					"frame": {
-						"x": 0,
-						"y": 109,
-						"w": 41,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0118.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 41,
-						"h": 56
-					},
-					"frame": {
-						"x": 0,
-						"y": 109,
-						"w": 41,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0119.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 41,
-						"h": 56
-					},
-					"frame": {
-						"x": 0,
-						"y": 109,
-						"w": 41,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0120.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 41,
-						"h": 56
-					},
-					"frame": {
-						"x": 0,
-						"y": 109,
-						"w": 41,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 39,
-						"h": 56
-					},
-					"frame": {
-						"x": 90,
-						"y": 0,
-						"w": 39,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 39,
-						"h": 56
-					},
-					"frame": {
-						"x": 90,
-						"y": 0,
-						"w": 39,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 39,
-						"h": 56
-					},
-					"frame": {
-						"x": 90,
-						"y": 0,
-						"w": 39,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 39,
-						"h": 56
-					},
-					"frame": {
-						"x": 90,
-						"y": 0,
-						"w": 39,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 39,
-						"h": 56
-					},
-					"frame": {
-						"x": 90,
-						"y": 0,
-						"w": 39,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 39,
-						"h": 56
-					},
-					"frame": {
-						"x": 90,
-						"y": 0,
-						"w": 39,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 39,
-						"h": 56
-					},
-					"frame": {
-						"x": 90,
-						"y": 0,
-						"w": 39,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 39,
-						"h": 56
-					},
-					"frame": {
-						"x": 90,
-						"y": 0,
-						"w": 39,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 39,
-						"h": 56
-					},
-					"frame": {
-						"x": 90,
-						"y": 0,
-						"w": 39,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 39,
-						"h": 56
-					},
-					"frame": {
-						"x": 90,
-						"y": 0,
-						"w": 39,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0041.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 39,
-						"h": 56
-					},
-					"frame": {
-						"x": 90,
-						"y": 0,
-						"w": 39,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0042.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 39,
-						"h": 56
-					},
-					"frame": {
-						"x": 90,
-						"y": 0,
-						"w": 39,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0057.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 39,
-						"h": 56
-					},
-					"frame": {
-						"x": 90,
-						"y": 0,
-						"w": 39,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0058.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 39,
-						"h": 56
-					},
-					"frame": {
-						"x": 90,
-						"y": 0,
-						"w": 39,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0059.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 39,
-						"h": 56
-					},
-					"frame": {
-						"x": 90,
-						"y": 0,
-						"w": 39,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0060.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 39,
-						"h": 56
-					},
-					"frame": {
-						"x": 90,
-						"y": 0,
-						"w": 39,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0061.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 39,
-						"h": 56
-					},
-					"frame": {
-						"x": 90,
-						"y": 0,
-						"w": 39,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0062.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 39,
-						"h": 56
-					},
-					"frame": {
-						"x": 90,
-						"y": 0,
-						"w": 39,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0063.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 39,
-						"h": 56
-					},
-					"frame": {
-						"x": 90,
-						"y": 0,
-						"w": 39,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0064.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 39,
-						"h": 56
-					},
-					"frame": {
-						"x": 90,
-						"y": 0,
-						"w": 39,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0081.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 39,
-						"h": 56
-					},
-					"frame": {
-						"x": 90,
-						"y": 0,
-						"w": 39,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0082.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 39,
-						"h": 56
-					},
-					"frame": {
-						"x": 90,
-						"y": 0,
-						"w": 39,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0097.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 39,
-						"h": 56
-					},
-					"frame": {
-						"x": 90,
-						"y": 0,
-						"w": 39,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0098.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 39,
-						"h": 56
-					},
-					"frame": {
-						"x": 90,
-						"y": 0,
-						"w": 39,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0099.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 39,
-						"h": 56
-					},
-					"frame": {
-						"x": 90,
-						"y": 0,
-						"w": 39,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0100.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 39,
-						"h": 56
-					},
-					"frame": {
-						"x": 90,
-						"y": 0,
-						"w": 39,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0101.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 39,
-						"h": 56
-					},
-					"frame": {
-						"x": 90,
-						"y": 0,
-						"w": 39,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0102.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 39,
-						"h": 56
-					},
-					"frame": {
-						"x": 90,
-						"y": 0,
-						"w": 39,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0103.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 39,
-						"h": 56
-					},
-					"frame": {
-						"x": 90,
-						"y": 0,
-						"w": 39,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0104.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 39,
-						"h": 56
-					},
-					"frame": {
-						"x": 90,
-						"y": 0,
-						"w": 39,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0121.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 39,
-						"h": 56
-					},
-					"frame": {
-						"x": 90,
-						"y": 0,
-						"w": 39,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0122.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 39,
-						"h": 56
-					},
-					"frame": {
-						"x": 90,
-						"y": 0,
-						"w": 39,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0155.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 39,
-						"h": 56
-					},
-					"frame": {
-						"x": 90,
-						"y": 0,
-						"w": 39,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0156.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 39,
-						"h": 56
-					},
-					"frame": {
-						"x": 90,
-						"y": 0,
-						"w": 39,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 37,
-						"h": 56
-					},
-					"frame": {
-						"x": 129,
-						"y": 0,
-						"w": 37,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 37,
-						"h": 56
-					},
-					"frame": {
-						"x": 129,
-						"y": 0,
-						"w": 37,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 37,
-						"h": 56
-					},
-					"frame": {
-						"x": 129,
-						"y": 0,
-						"w": 37,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 37,
-						"h": 56
-					},
-					"frame": {
-						"x": 129,
-						"y": 0,
-						"w": 37,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0043.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 37,
-						"h": 56
-					},
-					"frame": {
-						"x": 129,
-						"y": 0,
-						"w": 37,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0044.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 37,
-						"h": 56
-					},
-					"frame": {
-						"x": 129,
-						"y": 0,
-						"w": 37,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0055.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 37,
-						"h": 56
-					},
-					"frame": {
-						"x": 129,
-						"y": 0,
-						"w": 37,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0056.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 37,
-						"h": 56
-					},
-					"frame": {
-						"x": 129,
-						"y": 0,
-						"w": 37,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0083.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 37,
-						"h": 56
-					},
-					"frame": {
-						"x": 129,
-						"y": 0,
-						"w": 37,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0084.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 37,
-						"h": 56
-					},
-					"frame": {
-						"x": 129,
-						"y": 0,
-						"w": 37,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0095.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 37,
-						"h": 56
-					},
-					"frame": {
-						"x": 129,
-						"y": 0,
-						"w": 37,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0096.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 37,
-						"h": 56
-					},
-					"frame": {
-						"x": 129,
-						"y": 0,
-						"w": 37,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 35,
-						"h": 56
-					},
-					"frame": {
-						"x": 41,
-						"y": 109,
-						"w": 35,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 35,
-						"h": 56
-					},
-					"frame": {
-						"x": 41,
-						"y": 109,
-						"w": 35,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 35,
-						"h": 56
-					},
-					"frame": {
-						"x": 41,
-						"y": 109,
-						"w": 35,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 35,
-						"h": 56
-					},
-					"frame": {
-						"x": 41,
-						"y": 109,
-						"w": 35,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0045.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 35,
-						"h": 56
-					},
-					"frame": {
-						"x": 41,
-						"y": 109,
-						"w": 35,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0046.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 35,
-						"h": 56
-					},
-					"frame": {
-						"x": 41,
-						"y": 109,
-						"w": 35,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0053.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 35,
-						"h": 56
-					},
-					"frame": {
-						"x": 41,
-						"y": 109,
-						"w": 35,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0054.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 35,
-						"h": 56
-					},
-					"frame": {
-						"x": 41,
-						"y": 109,
-						"w": 35,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0085.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 35,
-						"h": 56
-					},
-					"frame": {
-						"x": 41,
-						"y": 109,
-						"w": 35,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0086.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 35,
-						"h": 56
-					},
-					"frame": {
-						"x": 41,
-						"y": 109,
-						"w": 35,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0093.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 35,
-						"h": 56
-					},
-					"frame": {
-						"x": 41,
-						"y": 109,
-						"w": 35,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0094.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 35,
-						"h": 56
-					},
-					"frame": {
-						"x": 41,
-						"y": 109,
-						"w": 35,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 33,
-						"h": 55
-					},
-					"frame": {
-						"x": 43,
-						"y": 54,
-						"w": 33,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 33,
-						"h": 55
-					},
-					"frame": {
-						"x": 43,
-						"y": 54,
-						"w": 33,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 33,
-						"h": 55
-					},
-					"frame": {
-						"x": 43,
-						"y": 54,
-						"w": 33,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 33,
-						"h": 55
-					},
-					"frame": {
-						"x": 43,
-						"y": 54,
-						"w": 33,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0047.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 33,
-						"h": 55
-					},
-					"frame": {
-						"x": 43,
-						"y": 54,
-						"w": 33,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0048.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 33,
-						"h": 55
-					},
-					"frame": {
-						"x": 43,
-						"y": 54,
-						"w": 33,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0051.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 33,
-						"h": 55
-					},
-					"frame": {
-						"x": 43,
-						"y": 54,
-						"w": 33,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0052.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 33,
-						"h": 55
-					},
-					"frame": {
-						"x": 43,
-						"y": 54,
-						"w": 33,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0087.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 33,
-						"h": 55
-					},
-					"frame": {
-						"x": 43,
-						"y": 54,
-						"w": 33,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0088.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 33,
-						"h": 55
-					},
-					"frame": {
-						"x": 43,
-						"y": 54,
-						"w": 33,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0091.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 33,
-						"h": 55
-					},
-					"frame": {
-						"x": 43,
-						"y": 54,
-						"w": 33,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0092.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 33,
-						"h": 55
-					},
-					"frame": {
-						"x": 43,
-						"y": 54,
-						"w": 33,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0123.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 37,
-						"h": 57
-					},
-					"frame": {
-						"x": 76,
-						"y": 56,
-						"w": 37,
-						"h": 57
-					}
-				},
-				{
-					"filename": "0124.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 37,
-						"h": 57
-					},
-					"frame": {
-						"x": 76,
-						"y": 56,
-						"w": 37,
-						"h": 57
-					}
-				},
-				{
-					"filename": "0153.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 37,
-						"h": 57
-					},
-					"frame": {
-						"x": 76,
-						"y": 56,
-						"w": 37,
-						"h": 57
-					}
-				},
-				{
-					"filename": "0154.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 37,
-						"h": 57
-					},
-					"frame": {
-						"x": 76,
-						"y": 56,
-						"w": 37,
-						"h": 57
-					}
-				},
-				{
-					"filename": "0125.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 58
-					},
-					"frame": {
-						"x": 113,
-						"y": 56,
-						"w": 35,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0126.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 58
-					},
-					"frame": {
-						"x": 113,
-						"y": 56,
-						"w": 35,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0151.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 58
-					},
-					"frame": {
-						"x": 113,
-						"y": 56,
-						"w": 35,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0152.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 58
-					},
-					"frame": {
-						"x": 113,
-						"y": 56,
-						"w": 35,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 33,
-						"h": 54
-					},
-					"frame": {
-						"x": 148,
-						"y": 56,
-						"w": 33,
-						"h": 54
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 33,
-						"h": 54
-					},
-					"frame": {
-						"x": 148,
-						"y": 56,
-						"w": 33,
-						"h": 54
-					}
-				},
-				{
-					"filename": "0049.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 33,
-						"h": 54
-					},
-					"frame": {
-						"x": 148,
-						"y": 56,
-						"w": 33,
-						"h": 54
-					}
-				},
-				{
-					"filename": "0050.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 33,
-						"h": 54
-					},
-					"frame": {
-						"x": 148,
-						"y": 56,
-						"w": 33,
-						"h": 54
-					}
-				},
-				{
-					"filename": "0089.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 33,
-						"h": 54
-					},
-					"frame": {
-						"x": 148,
-						"y": 56,
-						"w": 33,
-						"h": 54
-					}
-				},
-				{
-					"filename": "0090.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 33,
-						"h": 54
-					},
-					"frame": {
-						"x": 148,
-						"y": 56,
-						"w": 33,
-						"h": 54
-					}
-				},
-				{
-					"filename": "0127.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 58
-					},
-					"frame": {
-						"x": 76,
-						"y": 113,
-						"w": 35,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0128.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 58
-					},
-					"frame": {
-						"x": 76,
-						"y": 113,
-						"w": 35,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0133.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 58
-					},
-					"frame": {
-						"x": 76,
-						"y": 113,
-						"w": 35,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0134.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 58
-					},
-					"frame": {
-						"x": 76,
-						"y": 113,
-						"w": 35,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0139.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 58
-					},
-					"frame": {
-						"x": 76,
-						"y": 113,
-						"w": 35,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0140.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 58
-					},
-					"frame": {
-						"x": 76,
-						"y": 113,
-						"w": 35,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0145.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 58
-					},
-					"frame": {
-						"x": 76,
-						"y": 113,
-						"w": 35,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0146.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 58
-					},
-					"frame": {
-						"x": 76,
-						"y": 113,
-						"w": 35,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0129.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 58
-					},
-					"frame": {
-						"x": 111,
-						"y": 114,
-						"w": 35,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0130.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 58
-					},
-					"frame": {
-						"x": 111,
-						"y": 114,
-						"w": 35,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0135.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 58
-					},
-					"frame": {
-						"x": 111,
-						"y": 114,
-						"w": 35,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0136.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 58
-					},
-					"frame": {
-						"x": 111,
-						"y": 114,
-						"w": 35,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0141.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 58
-					},
-					"frame": {
-						"x": 111,
-						"y": 114,
-						"w": 35,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0142.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 58
-					},
-					"frame": {
-						"x": 111,
-						"y": 114,
-						"w": 35,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0147.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 58
-					},
-					"frame": {
-						"x": 111,
-						"y": 114,
-						"w": 35,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0148.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 58
-					},
-					"frame": {
-						"x": 111,
-						"y": 114,
-						"w": 35,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0131.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 58
-					},
-					"frame": {
-						"x": 146,
-						"y": 114,
-						"w": 35,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0132.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 58
-					},
-					"frame": {
-						"x": 146,
-						"y": 114,
-						"w": 35,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0137.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 58
-					},
-					"frame": {
-						"x": 146,
-						"y": 114,
-						"w": 35,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0138.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 58
-					},
-					"frame": {
-						"x": 146,
-						"y": 114,
-						"w": 35,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0143.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 58
-					},
-					"frame": {
-						"x": 146,
-						"y": 114,
-						"w": 35,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0144.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 58
-					},
-					"frame": {
-						"x": 146,
-						"y": 114,
-						"w": 35,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0149.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 58
-					},
-					"frame": {
-						"x": 146,
-						"y": 114,
-						"w": 35,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0150.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 58
-					},
-					"frame": {
-						"x": 146,
-						"y": 114,
-						"w": 35,
-						"h": 58
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:7926d4052a1ca822dcfc49423c76e3a1:6930576af3683498fb06f805ffdf25f2:198087d69fed44d4a642fa3ba5c077d6$"
-	}
-}
diff --git a/public/images/pokemon/exp/back/shiny/698.png b/public/images/pokemon/exp/back/shiny/698.png
deleted file mode 100644
index dbd5cefcbf0..00000000000
Binary files a/public/images/pokemon/exp/back/shiny/698.png and /dev/null differ
diff --git a/public/images/pokemon/exp/back/shiny/700.json b/public/images/pokemon/exp/back/shiny/700.json
index fd3cf94bb73..70083de61c9 100644
--- a/public/images/pokemon/exp/back/shiny/700.json
+++ b/public/images/pokemon/exp/back/shiny/700.json
@@ -1,1364 +1,587 @@
-{
-	"textures": [
-		{
-			"image": "700.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 248,
-				"h": 248
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0053.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 55,
-						"h": 64
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 54,
-						"h": 61
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 54,
-						"h": 61
-					}
-				},
-				{
-					"filename": "0050.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 55,
-						"h": 64
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 50,
-						"h": 64
-					},
-					"frame": {
-						"x": 54,
-						"y": 0,
-						"w": 50,
-						"h": 64
-					}
-				},
-				{
-					"filename": "0063.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 55,
-						"h": 64
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 50,
-						"h": 64
-					},
-					"frame": {
-						"x": 0,
-						"y": 61,
-						"w": 50,
-						"h": 64
-					}
-				},
-				{
-					"filename": "0051.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 55,
-						"h": 64
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 51,
-						"h": 61
-					},
-					"frame": {
-						"x": 50,
-						"y": 64,
-						"w": 51,
-						"h": 61
-					}
-				},
-				{
-					"filename": "0062.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 55,
-						"h": 64
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 48,
-						"h": 64
-					},
-					"frame": {
-						"x": 101,
-						"y": 64,
-						"w": 48,
-						"h": 64
-					}
-				},
-				{
-					"filename": "0052.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 55,
-						"h": 64
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 51,
-						"h": 61
-					},
-					"frame": {
-						"x": 0,
-						"y": 125,
-						"w": 51,
-						"h": 61
-					}
-				},
-				{
-					"filename": "0056.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 55,
-						"h": 64
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 49,
-						"h": 61
-					},
-					"frame": {
-						"x": 51,
-						"y": 125,
-						"w": 49,
-						"h": 61
-					}
-				},
-				{
-					"filename": "0059.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 55,
-						"h": 64
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 49,
-						"h": 61
-					},
-					"frame": {
-						"x": 51,
-						"y": 125,
-						"w": 49,
-						"h": 61
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 55,
-						"h": 64
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 49,
-						"h": 60
-					},
-					"frame": {
-						"x": 104,
-						"y": 0,
-						"w": 49,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 55,
-						"h": 64
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 49,
-						"h": 60
-					},
-					"frame": {
-						"x": 104,
-						"y": 0,
-						"w": 49,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 55,
-						"h": 64
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 49,
-						"h": 60
-					},
-					"frame": {
-						"x": 104,
-						"y": 0,
-						"w": 49,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0032.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 55,
-						"h": 64
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 49,
-						"h": 60
-					},
-					"frame": {
-						"x": 104,
-						"y": 0,
-						"w": 49,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0040.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 55,
-						"h": 64
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 49,
-						"h": 60
-					},
-					"frame": {
-						"x": 104,
-						"y": 0,
-						"w": 49,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0048.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 55,
-						"h": 64
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 49,
-						"h": 60
-					},
-					"frame": {
-						"x": 104,
-						"y": 0,
-						"w": 49,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0054.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 55,
-						"h": 64
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 48,
-						"h": 61
-					},
-					"frame": {
-						"x": 100,
-						"y": 128,
-						"w": 48,
-						"h": 61
-					}
-				},
-				{
-					"filename": "0055.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 55,
-						"h": 64
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 48,
-						"h": 61
-					},
-					"frame": {
-						"x": 0,
-						"y": 186,
-						"w": 48,
-						"h": 61
-					}
-				},
-				{
-					"filename": "0057.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 55,
-						"h": 64
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 48,
-						"h": 61
-					},
-					"frame": {
-						"x": 48,
-						"y": 186,
-						"w": 48,
-						"h": 61
-					}
-				},
-				{
-					"filename": "0060.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 55,
-						"h": 64
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 48,
-						"h": 61
-					},
-					"frame": {
-						"x": 48,
-						"y": 186,
-						"w": 48,
-						"h": 61
-					}
-				},
-				{
-					"filename": "0058.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 55,
-						"h": 64
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 48,
-						"h": 61
-					},
-					"frame": {
-						"x": 148,
-						"y": 128,
-						"w": 48,
-						"h": 61
-					}
-				},
-				{
-					"filename": "0061.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 55,
-						"h": 64
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 48,
-						"h": 61
-					},
-					"frame": {
-						"x": 148,
-						"y": 128,
-						"w": 48,
-						"h": 61
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 55,
-						"h": 64
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 48,
-						"h": 60
-					},
-					"frame": {
-						"x": 149,
-						"y": 60,
-						"w": 48,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 55,
-						"h": 64
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 48,
-						"h": 60
-					},
-					"frame": {
-						"x": 149,
-						"y": 60,
-						"w": 48,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 55,
-						"h": 64
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 48,
-						"h": 60
-					},
-					"frame": {
-						"x": 149,
-						"y": 60,
-						"w": 48,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0025.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 55,
-						"h": 64
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 48,
-						"h": 60
-					},
-					"frame": {
-						"x": 149,
-						"y": 60,
-						"w": 48,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0033.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 55,
-						"h": 64
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 48,
-						"h": 60
-					},
-					"frame": {
-						"x": 149,
-						"y": 60,
-						"w": 48,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0041.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 55,
-						"h": 64
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 48,
-						"h": 60
-					},
-					"frame": {
-						"x": 149,
-						"y": 60,
-						"w": 48,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 55,
-						"h": 64
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 48,
-						"h": 60
-					},
-					"frame": {
-						"x": 153,
-						"y": 0,
-						"w": 48,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 55,
-						"h": 64
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 48,
-						"h": 60
-					},
-					"frame": {
-						"x": 153,
-						"y": 0,
-						"w": 48,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 55,
-						"h": 64
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 48,
-						"h": 60
-					},
-					"frame": {
-						"x": 153,
-						"y": 0,
-						"w": 48,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0026.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 55,
-						"h": 64
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 48,
-						"h": 60
-					},
-					"frame": {
-						"x": 153,
-						"y": 0,
-						"w": 48,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0034.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 55,
-						"h": 64
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 48,
-						"h": 60
-					},
-					"frame": {
-						"x": 153,
-						"y": 0,
-						"w": 48,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0042.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 55,
-						"h": 64
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 48,
-						"h": 60
-					},
-					"frame": {
-						"x": 153,
-						"y": 0,
-						"w": 48,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0049.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 55,
-						"h": 64
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 48,
-						"h": 60
-					},
-					"frame": {
-						"x": 196,
-						"y": 120,
-						"w": 48,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0064.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 55,
-						"h": 64
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 48,
-						"h": 60
-					},
-					"frame": {
-						"x": 196,
-						"y": 120,
-						"w": 48,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 55,
-						"h": 64
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 48,
-						"h": 59
-					},
-					"frame": {
-						"x": 197,
-						"y": 60,
-						"w": 48,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 55,
-						"h": 64
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 48,
-						"h": 59
-					},
-					"frame": {
-						"x": 197,
-						"y": 60,
-						"w": 48,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 55,
-						"h": 64
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 48,
-						"h": 59
-					},
-					"frame": {
-						"x": 197,
-						"y": 60,
-						"w": 48,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0027.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 55,
-						"h": 64
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 48,
-						"h": 59
-					},
-					"frame": {
-						"x": 197,
-						"y": 60,
-						"w": 48,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0035.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 55,
-						"h": 64
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 48,
-						"h": 59
-					},
-					"frame": {
-						"x": 197,
-						"y": 60,
-						"w": 48,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0043.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 55,
-						"h": 64
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 48,
-						"h": 59
-					},
-					"frame": {
-						"x": 197,
-						"y": 60,
-						"w": 48,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 55,
-						"h": 64
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 47,
-						"h": 60
-					},
-					"frame": {
-						"x": 201,
-						"y": 0,
-						"w": 47,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 55,
-						"h": 64
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 47,
-						"h": 60
-					},
-					"frame": {
-						"x": 201,
-						"y": 0,
-						"w": 47,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 55,
-						"h": 64
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 47,
-						"h": 60
-					},
-					"frame": {
-						"x": 201,
-						"y": 0,
-						"w": 47,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0030.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 55,
-						"h": 64
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 47,
-						"h": 60
-					},
-					"frame": {
-						"x": 201,
-						"y": 0,
-						"w": 47,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0038.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 55,
-						"h": 64
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 47,
-						"h": 60
-					},
-					"frame": {
-						"x": 201,
-						"y": 0,
-						"w": 47,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0046.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 55,
-						"h": 64
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 47,
-						"h": 60
-					},
-					"frame": {
-						"x": 201,
-						"y": 0,
-						"w": 47,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 55,
-						"h": 64
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 4,
-						"w": 47,
-						"h": 60
-					},
-					"frame": {
-						"x": 196,
-						"y": 180,
-						"w": 47,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 55,
-						"h": 64
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 4,
-						"w": 47,
-						"h": 60
-					},
-					"frame": {
-						"x": 196,
-						"y": 180,
-						"w": 47,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 55,
-						"h": 64
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 4,
-						"w": 47,
-						"h": 60
-					},
-					"frame": {
-						"x": 196,
-						"y": 180,
-						"w": 47,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0031.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 55,
-						"h": 64
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 4,
-						"w": 47,
-						"h": 60
-					},
-					"frame": {
-						"x": 196,
-						"y": 180,
-						"w": 47,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0039.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 55,
-						"h": 64
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 4,
-						"w": 47,
-						"h": 60
-					},
-					"frame": {
-						"x": 196,
-						"y": 180,
-						"w": 47,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0047.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 55,
-						"h": 64
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 4,
-						"w": 47,
-						"h": 60
-					},
-					"frame": {
-						"x": 196,
-						"y": 180,
-						"w": 47,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 55,
-						"h": 64
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 48,
-						"h": 58
-					},
-					"frame": {
-						"x": 96,
-						"y": 189,
-						"w": 48,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 55,
-						"h": 64
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 48,
-						"h": 58
-					},
-					"frame": {
-						"x": 96,
-						"y": 189,
-						"w": 48,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 55,
-						"h": 64
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 48,
-						"h": 58
-					},
-					"frame": {
-						"x": 96,
-						"y": 189,
-						"w": 48,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0028.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 55,
-						"h": 64
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 48,
-						"h": 58
-					},
-					"frame": {
-						"x": 96,
-						"y": 189,
-						"w": 48,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0036.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 55,
-						"h": 64
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 48,
-						"h": 58
-					},
-					"frame": {
-						"x": 96,
-						"y": 189,
-						"w": 48,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0044.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 55,
-						"h": 64
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 48,
-						"h": 58
-					},
-					"frame": {
-						"x": 96,
-						"y": 189,
-						"w": 48,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 55,
-						"h": 64
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 48,
-						"h": 58
-					},
-					"frame": {
-						"x": 144,
-						"y": 189,
-						"w": 48,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 55,
-						"h": 64
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 48,
-						"h": 58
-					},
-					"frame": {
-						"x": 144,
-						"y": 189,
-						"w": 48,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 55,
-						"h": 64
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 48,
-						"h": 58
-					},
-					"frame": {
-						"x": 144,
-						"y": 189,
-						"w": 48,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0029.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 55,
-						"h": 64
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 48,
-						"h": 58
-					},
-					"frame": {
-						"x": 144,
-						"y": 189,
-						"w": 48,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0037.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 55,
-						"h": 64
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 48,
-						"h": 58
-					},
-					"frame": {
-						"x": 144,
-						"y": 189,
-						"w": 48,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0045.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 55,
-						"h": 64
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 48,
-						"h": 58
-					},
-					"frame": {
-						"x": 144,
-						"y": 189,
-						"w": 48,
-						"h": 58
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:cc4ca4dff49e9c03ffd4d0d75ae6e17b:1555e19065e6e4144c3cbb6020a0ae39:2e4bf5ef1f19e475073f7da10c60b540$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 46, "y": 123, "w": 46, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 5, "w": 46, "h": 59 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 101, "y": 63, "w": 47, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 47, "h": 59 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 0, "y": 180, "w": 46, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 46, "h": 58 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 91, "y": 182, "w": 46, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 46, "h": 57 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 137, "y": 183, "w": 46, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 46, "h": 57 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 188, "y": 180, "w": 45, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 45, "h": 59 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 46, "y": 182, "w": 45, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 45, "h": 59 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 49, "y": 64, "w": 47, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 5, "w": 47, "h": 59 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 46, "y": 123, "w": 46, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 5, "w": 46, "h": 59 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 101, "y": 63, "w": 47, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 47, "h": 59 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 0, "y": 180, "w": 46, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 46, "h": 58 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 91, "y": 182, "w": 46, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 46, "h": 57 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 137, "y": 183, "w": 46, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 46, "h": 57 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 188, "y": 180, "w": 45, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 45, "h": 59 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 46, "y": 182, "w": 45, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 45, "h": 59 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 49, "y": 64, "w": 47, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 5, "w": 47, "h": 59 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 46, "y": 123, "w": 46, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 5, "w": 46, "h": 59 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 101, "y": 63, "w": 47, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 47, "h": 59 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 0, "y": 180, "w": 46, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 46, "h": 58 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 91, "y": 182, "w": 46, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 46, "h": 57 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 137, "y": 183, "w": 46, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 46, "h": 57 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 188, "y": 180, "w": 45, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 45, "h": 59 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 46, "y": 182, "w": 45, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 45, "h": 59 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 49, "y": 64, "w": 47, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 5, "w": 47, "h": 59 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 46, "y": 123, "w": 46, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 5, "w": 46, "h": 59 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 101, "y": 63, "w": 47, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 47, "h": 59 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 0, "y": 180, "w": 46, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 46, "h": 58 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 91, "y": 182, "w": 46, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 46, "h": 57 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 137, "y": 183, "w": 46, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 46, "h": 57 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 188, "y": 180, "w": 45, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 45, "h": 59 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 46, "y": 182, "w": 45, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 45, "h": 59 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 49, "y": 64, "w": 47, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 5, "w": 47, "h": 59 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 46, "y": 123, "w": 46, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 5, "w": 46, "h": 59 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 101, "y": 63, "w": 47, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 47, "h": 59 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 0, "y": 180, "w": 46, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 46, "h": 58 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 91, "y": 182, "w": 46, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 46, "h": 57 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 137, "y": 183, "w": 46, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 46, "h": 57 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 188, "y": 180, "w": 45, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 45, "h": 59 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 46, "y": 182, "w": 45, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 45, "h": 59 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 49, "y": 64, "w": 47, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 5, "w": 47, "h": 59 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 46, "y": 123, "w": 46, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 5, "w": 46, "h": 59 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 101, "y": 63, "w": 47, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 47, "h": 59 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 0, "y": 180, "w": 46, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 46, "h": 58 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 91, "y": 182, "w": 46, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 46, "h": 57 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 137, "y": 183, "w": 46, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 46, "h": 57 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 188, "y": 180, "w": 45, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 45, "h": 59 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 46, "y": 182, "w": 45, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 45, "h": 59 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 49, "y": 64, "w": 47, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 5, "w": 47, "h": 59 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 142, "y": 124, "w": 46, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 46, "h": 59 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 101, "y": 0, "w": 48, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 48, "h": 63 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 195, "y": 0, "w": 49, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 49, "h": 60 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 0, "y": 60, "w": 49, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 49, "h": 60 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 0, "y": 0, "w": 53, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 53, "h": 60 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 148, "y": 64, "w": 46, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 46, "h": 60 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 0, "y": 120, "w": 46, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 46, "h": 60 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 195, "y": 60, "w": 47, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 47, "h": 60 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 194, "y": 120, "w": 46, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 46, "h": 60 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 96, "y": 122, "w": 46, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 46, "h": 60 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 195, "y": 60, "w": 47, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 47, "h": 60 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 194, "y": 120, "w": 46, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 46, "h": 60 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 96, "y": 122, "w": 46, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 46, "h": 60 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 149, "y": 0, "w": 46, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 46, "h": 64 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 53, "y": 0, "w": 48, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 48, "h": 64 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 142, "y": 124, "w": 46, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 46, "h": 59 },
+    "sourceSize": { "w": 55, "h": 64 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.11-x64",
+  "image": "700.png",
+  "format": "I8",
+  "size": { "w": 244, "h": 241 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/shiny/700.png b/public/images/pokemon/exp/back/shiny/700.png
index fe533ba5a88..dab66177e99 100644
Binary files a/public/images/pokemon/exp/back/shiny/700.png and b/public/images/pokemon/exp/back/shiny/700.png differ
diff --git a/public/images/pokemon/exp/back/shiny/702.json b/public/images/pokemon/exp/back/shiny/702.json
index 2e194f21033..9680e17e397 100644
--- a/public/images/pokemon/exp/back/shiny/702.json
+++ b/public/images/pokemon/exp/back/shiny/702.json
@@ -1,1028 +1,443 @@
-{
-	"textures": [
-		{
-			"image": "702.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 141,
-				"h": 141
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 47,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 47,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 47,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 47,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 47,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 47,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 47,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 47,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 47,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0025.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 47,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 47,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 47,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0033.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 47,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 47,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 47,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 47,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 47,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 35,
-						"w": 47,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 47,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 47,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 35,
-						"w": 47,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 47,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 47,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 35,
-						"w": 47,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0026.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 47,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 47,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 35,
-						"w": 47,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0034.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 47,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 47,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 35,
-						"w": 47,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0042.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 47,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 47,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 35,
-						"w": 47,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 47,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 47,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 70,
-						"w": 47,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 47,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 47,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 70,
-						"w": 47,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 47,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 47,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 70,
-						"w": 47,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0031.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 47,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 47,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 70,
-						"w": 47,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0039.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 47,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 47,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 70,
-						"w": 47,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0041.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 47,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 47,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 105,
-						"w": 47,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0047.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 47,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 47,
-						"h": 35
-					},
-					"frame": {
-						"x": 47,
-						"y": 0,
-						"w": 47,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 46,
-						"h": 35
-					},
-					"frame": {
-						"x": 47,
-						"y": 35,
-						"w": 46,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 46,
-						"h": 35
-					},
-					"frame": {
-						"x": 47,
-						"y": 35,
-						"w": 46,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 46,
-						"h": 35
-					},
-					"frame": {
-						"x": 47,
-						"y": 35,
-						"w": 46,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0032.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 46,
-						"h": 35
-					},
-					"frame": {
-						"x": 47,
-						"y": 35,
-						"w": 46,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0040.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 46,
-						"h": 35
-					},
-					"frame": {
-						"x": 47,
-						"y": 35,
-						"w": 46,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0048.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 46,
-						"h": 35
-					},
-					"frame": {
-						"x": 47,
-						"y": 35,
-						"w": 46,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 47,
-						"h": 34
-					},
-					"frame": {
-						"x": 47,
-						"y": 70,
-						"w": 47,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 47,
-						"h": 34
-					},
-					"frame": {
-						"x": 47,
-						"y": 70,
-						"w": 47,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 47,
-						"h": 34
-					},
-					"frame": {
-						"x": 47,
-						"y": 70,
-						"w": 47,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0027.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 47,
-						"h": 34
-					},
-					"frame": {
-						"x": 47,
-						"y": 70,
-						"w": 47,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0035.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 47,
-						"h": 34
-					},
-					"frame": {
-						"x": 47,
-						"y": 70,
-						"w": 47,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 47,
-						"h": 34
-					},
-					"frame": {
-						"x": 93,
-						"y": 35,
-						"w": 47,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 47,
-						"h": 34
-					},
-					"frame": {
-						"x": 93,
-						"y": 35,
-						"w": 47,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 47,
-						"h": 34
-					},
-					"frame": {
-						"x": 93,
-						"y": 35,
-						"w": 47,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0030.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 47,
-						"h": 34
-					},
-					"frame": {
-						"x": 93,
-						"y": 35,
-						"w": 47,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0038.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 47,
-						"h": 34
-					},
-					"frame": {
-						"x": 93,
-						"y": 35,
-						"w": 47,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0046.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 47,
-						"h": 34
-					},
-					"frame": {
-						"x": 93,
-						"y": 35,
-						"w": 47,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0043.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 47,
-						"h": 34
-					},
-					"frame": {
-						"x": 94,
-						"y": 0,
-						"w": 47,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 47,
-						"h": 32
-					},
-					"frame": {
-						"x": 94,
-						"y": 69,
-						"w": 47,
-						"h": 32
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 47,
-						"h": 32
-					},
-					"frame": {
-						"x": 94,
-						"y": 69,
-						"w": 47,
-						"h": 32
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 47,
-						"h": 32
-					},
-					"frame": {
-						"x": 94,
-						"y": 69,
-						"w": 47,
-						"h": 32
-					}
-				},
-				{
-					"filename": "0028.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 47,
-						"h": 32
-					},
-					"frame": {
-						"x": 94,
-						"y": 69,
-						"w": 47,
-						"h": 32
-					}
-				},
-				{
-					"filename": "0036.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 47,
-						"h": 32
-					},
-					"frame": {
-						"x": 94,
-						"y": 69,
-						"w": 47,
-						"h": 32
-					}
-				},
-				{
-					"filename": "0044.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 47,
-						"h": 32
-					},
-					"frame": {
-						"x": 94,
-						"y": 69,
-						"w": 47,
-						"h": 32
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 47,
-						"h": 32
-					},
-					"frame": {
-						"x": 94,
-						"y": 101,
-						"w": 47,
-						"h": 32
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 47,
-						"h": 32
-					},
-					"frame": {
-						"x": 94,
-						"y": 101,
-						"w": 47,
-						"h": 32
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 47,
-						"h": 32
-					},
-					"frame": {
-						"x": 94,
-						"y": 101,
-						"w": 47,
-						"h": 32
-					}
-				},
-				{
-					"filename": "0029.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 47,
-						"h": 32
-					},
-					"frame": {
-						"x": 94,
-						"y": 101,
-						"w": 47,
-						"h": 32
-					}
-				},
-				{
-					"filename": "0037.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 47,
-						"h": 32
-					},
-					"frame": {
-						"x": 94,
-						"y": 101,
-						"w": 47,
-						"h": 32
-					}
-				},
-				{
-					"filename": "0045.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 47,
-						"h": 32
-					},
-					"frame": {
-						"x": 47,
-						"y": 104,
-						"w": 47,
-						"h": 32
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:72bba6c37c149abe81c9754a412876bd:fb5c4a7192ee7ba359b93fb9fea89158:ba8fdab405d5efab99c4aa1084328e6b$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 48, "y": 0, "w": 46, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 46, "h": 35 },
+    "sourceSize": { "w": 47, "h": 35 },
+    "duration": 110
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 0, "y": 0, "w": 47, "h": 35 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 47, "h": 35 },
+    "sourceSize": { "w": 47, "h": 35 },
+    "duration": 110
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 93, "y": 36, "w": 46, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 46, "h": 33 },
+    "sourceSize": { "w": 47, "h": 35 },
+    "duration": 110
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 47, "y": 72, "w": 45, "h": 31 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 45, "h": 31 },
+    "sourceSize": { "w": 47, "h": 35 },
+    "duration": 110
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 139, "y": 70, "w": 46, "h": 31 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 46, "h": 31 },
+    "sourceSize": { "w": 47, "h": 35 },
+    "duration": 110
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 93, "y": 70, "w": 45, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 45, "h": 33 },
+    "sourceSize": { "w": 47, "h": 35 },
+    "duration": 110
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 95, "y": 0, "w": 46, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 46, "h": 35 },
+    "sourceSize": { "w": 47, "h": 35 },
+    "duration": 110
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 47, "y": 36, "w": 45, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 45, "h": 35 },
+    "sourceSize": { "w": 47, "h": 35 },
+    "duration": 110
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 48, "y": 0, "w": 46, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 46, "h": 35 },
+    "sourceSize": { "w": 47, "h": 35 },
+    "duration": 110
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 0, "y": 0, "w": 47, "h": 35 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 47, "h": 35 },
+    "sourceSize": { "w": 47, "h": 35 },
+    "duration": 110
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 93, "y": 36, "w": 46, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 46, "h": 33 },
+    "sourceSize": { "w": 47, "h": 35 },
+    "duration": 110
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 47, "y": 72, "w": 45, "h": 31 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 45, "h": 31 },
+    "sourceSize": { "w": 47, "h": 35 },
+    "duration": 110
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 139, "y": 70, "w": 46, "h": 31 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 46, "h": 31 },
+    "sourceSize": { "w": 47, "h": 35 },
+    "duration": 110
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 93, "y": 70, "w": 45, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 45, "h": 33 },
+    "sourceSize": { "w": 47, "h": 35 },
+    "duration": 110
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 95, "y": 0, "w": 46, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 46, "h": 35 },
+    "sourceSize": { "w": 47, "h": 35 },
+    "duration": 110
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 47, "y": 36, "w": 45, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 45, "h": 35 },
+    "sourceSize": { "w": 47, "h": 35 },
+    "duration": 110
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 48, "y": 0, "w": 46, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 46, "h": 35 },
+    "sourceSize": { "w": 47, "h": 35 },
+    "duration": 110
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 0, "y": 0, "w": 47, "h": 35 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 47, "h": 35 },
+    "sourceSize": { "w": 47, "h": 35 },
+    "duration": 110
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 93, "y": 36, "w": 46, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 46, "h": 33 },
+    "sourceSize": { "w": 47, "h": 35 },
+    "duration": 110
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 47, "y": 72, "w": 45, "h": 31 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 45, "h": 31 },
+    "sourceSize": { "w": 47, "h": 35 },
+    "duration": 110
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 139, "y": 70, "w": 46, "h": 31 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 46, "h": 31 },
+    "sourceSize": { "w": 47, "h": 35 },
+    "duration": 110
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 93, "y": 70, "w": 45, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 45, "h": 33 },
+    "sourceSize": { "w": 47, "h": 35 },
+    "duration": 110
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 95, "y": 0, "w": 46, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 46, "h": 35 },
+    "sourceSize": { "w": 47, "h": 35 },
+    "duration": 110
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 47, "y": 36, "w": 45, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 45, "h": 35 },
+    "sourceSize": { "w": 47, "h": 35 },
+    "duration": 110
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 48, "y": 0, "w": 46, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 46, "h": 35 },
+    "sourceSize": { "w": 47, "h": 35 },
+    "duration": 110
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 0, "y": 0, "w": 47, "h": 35 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 47, "h": 35 },
+    "sourceSize": { "w": 47, "h": 35 },
+    "duration": 110
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 93, "y": 36, "w": 46, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 46, "h": 33 },
+    "sourceSize": { "w": 47, "h": 35 },
+    "duration": 110
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 47, "y": 72, "w": 45, "h": 31 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 45, "h": 31 },
+    "sourceSize": { "w": 47, "h": 35 },
+    "duration": 110
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 139, "y": 70, "w": 46, "h": 31 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 46, "h": 31 },
+    "sourceSize": { "w": 47, "h": 35 },
+    "duration": 110
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 93, "y": 70, "w": 45, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 45, "h": 33 },
+    "sourceSize": { "w": 47, "h": 35 },
+    "duration": 110
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 95, "y": 0, "w": 46, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 46, "h": 35 },
+    "sourceSize": { "w": 47, "h": 35 },
+    "duration": 110
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 47, "y": 36, "w": 45, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 45, "h": 35 },
+    "sourceSize": { "w": 47, "h": 35 },
+    "duration": 110
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 48, "y": 0, "w": 46, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 46, "h": 35 },
+    "sourceSize": { "w": 47, "h": 35 },
+    "duration": 110
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 0, "y": 0, "w": 47, "h": 35 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 47, "h": 35 },
+    "sourceSize": { "w": 47, "h": 35 },
+    "duration": 110
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 93, "y": 36, "w": 46, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 46, "h": 33 },
+    "sourceSize": { "w": 47, "h": 35 },
+    "duration": 110
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 47, "y": 72, "w": 45, "h": 31 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 45, "h": 31 },
+    "sourceSize": { "w": 47, "h": 35 },
+    "duration": 110
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 139, "y": 70, "w": 46, "h": 31 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 46, "h": 31 },
+    "sourceSize": { "w": 47, "h": 35 },
+    "duration": 110
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 93, "y": 70, "w": 45, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 45, "h": 33 },
+    "sourceSize": { "w": 47, "h": 35 },
+    "duration": 110
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 95, "y": 0, "w": 46, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 46, "h": 35 },
+    "sourceSize": { "w": 47, "h": 35 },
+    "duration": 110
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 47, "y": 36, "w": 45, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 45, "h": 35 },
+    "sourceSize": { "w": 47, "h": 35 },
+    "duration": 110
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 142, "y": 0, "w": 46, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 46, "h": 35 },
+    "sourceSize": { "w": 47, "h": 35 },
+    "duration": 110
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 0, "y": 0, "w": 47, "h": 35 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 47, "h": 35 },
+    "sourceSize": { "w": 47, "h": 35 },
+    "duration": 110
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 140, "y": 36, "w": 46, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 46, "h": 33 },
+    "sourceSize": { "w": 47, "h": 35 },
+    "duration": 110
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 47, "y": 72, "w": 45, "h": 31 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 45, "h": 31 },
+    "sourceSize": { "w": 47, "h": 35 },
+    "duration": 110
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 0, "y": 72, "w": 46, "h": 31 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 46, "h": 31 },
+    "sourceSize": { "w": 47, "h": 35 },
+    "duration": 110
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 93, "y": 70, "w": 45, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 45, "h": 33 },
+    "sourceSize": { "w": 47, "h": 35 },
+    "duration": 110
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 0, "y": 36, "w": 46, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 46, "h": 35 },
+    "sourceSize": { "w": 47, "h": 35 },
+    "duration": 110
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 47, "y": 36, "w": 45, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 45, "h": 35 },
+    "sourceSize": { "w": 47, "h": 35 },
+    "duration": 110
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.11-x64",
+  "image": "702.png",
+  "format": "I8",
+  "size": { "w": 188, "h": 103 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/shiny/702.png b/public/images/pokemon/exp/back/shiny/702.png
index 12401f8950b..7a02b912cf0 100644
Binary files a/public/images/pokemon/exp/back/shiny/702.png and b/public/images/pokemon/exp/back/shiny/702.png differ
diff --git a/public/images/pokemon/exp/back/shiny/703.json b/public/images/pokemon/exp/back/shiny/703.json
deleted file mode 100644
index dee9aa2bb4e..00000000000
--- a/public/images/pokemon/exp/back/shiny/703.json
+++ /dev/null
@@ -1,1322 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "703.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 152,
-				"h": 152
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 7,
-						"w": 38,
-						"h": 42
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 38,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 7,
-						"w": 38,
-						"h": 42
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 38,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0032.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 7,
-						"w": 38,
-						"h": 42
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 38,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0044.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 7,
-						"w": 38,
-						"h": 42
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 38,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 8,
-						"w": 38,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 42,
-						"w": 38,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 8,
-						"w": 38,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 42,
-						"w": 38,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0031.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 8,
-						"w": 38,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 42,
-						"w": 38,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0043.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 8,
-						"w": 38,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 42,
-						"w": 38,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 8,
-						"w": 37,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 83,
-						"w": 37,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 6,
-						"w": 37,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 83,
-						"w": 37,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 8,
-						"w": 37,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 83,
-						"w": 37,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 6,
-						"w": 37,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 83,
-						"w": 37,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0030.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 8,
-						"w": 37,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 83,
-						"w": 37,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0033.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 6,
-						"w": 37,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 83,
-						"w": 37,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0042.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 8,
-						"w": 37,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 83,
-						"w": 37,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0045.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 6,
-						"w": 37,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 83,
-						"w": 37,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0051.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 37,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 83,
-						"w": 37,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0052.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 6,
-						"w": 37,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 83,
-						"w": 37,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0053.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 37,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 83,
-						"w": 37,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0054.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 5,
-						"w": 37,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 83,
-						"w": 37,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0055.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 37,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 83,
-						"w": 37,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0056.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 5,
-						"w": 37,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 83,
-						"w": 37,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0057.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 37,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 83,
-						"w": 37,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0058.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 5,
-						"w": 37,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 83,
-						"w": 37,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0059.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 37,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 83,
-						"w": 37,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0050.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 39,
-						"h": 40
-					},
-					"frame": {
-						"x": 37,
-						"y": 83,
-						"w": 39,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0060.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 39,
-						"h": 40
-					},
-					"frame": {
-						"x": 37,
-						"y": 83,
-						"w": 39,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 39,
-						"h": 39
-					},
-					"frame": {
-						"x": 76,
-						"y": 0,
-						"w": 39,
-						"h": 39
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 39,
-						"h": 39
-					},
-					"frame": {
-						"x": 76,
-						"y": 0,
-						"w": 39,
-						"h": 39
-					}
-				},
-				{
-					"filename": "0025.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 39,
-						"h": 39
-					},
-					"frame": {
-						"x": 76,
-						"y": 0,
-						"w": 39,
-						"h": 39
-					}
-				},
-				{
-					"filename": "0037.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 39,
-						"h": 39
-					},
-					"frame": {
-						"x": 76,
-						"y": 0,
-						"w": 39,
-						"h": 39
-					}
-				},
-				{
-					"filename": "0049.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 39,
-						"h": 39
-					},
-					"frame": {
-						"x": 76,
-						"y": 0,
-						"w": 39,
-						"h": 39
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 38,
-						"h": 40
-					},
-					"frame": {
-						"x": 38,
-						"y": 0,
-						"w": 38,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 38,
-						"h": 40
-					},
-					"frame": {
-						"x": 38,
-						"y": 0,
-						"w": 38,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0026.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 38,
-						"h": 40
-					},
-					"frame": {
-						"x": 38,
-						"y": 0,
-						"w": 38,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0038.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 38,
-						"h": 40
-					},
-					"frame": {
-						"x": 38,
-						"y": 0,
-						"w": 38,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 37,
-						"h": 40
-					},
-					"frame": {
-						"x": 115,
-						"y": 0,
-						"w": 37,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 37,
-						"h": 40
-					},
-					"frame": {
-						"x": 115,
-						"y": 0,
-						"w": 37,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0027.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 37,
-						"h": 40
-					},
-					"frame": {
-						"x": 115,
-						"y": 0,
-						"w": 37,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0039.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 37,
-						"h": 40
-					},
-					"frame": {
-						"x": 115,
-						"y": 0,
-						"w": 37,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 5,
-						"w": 38,
-						"h": 40
-					},
-					"frame": {
-						"x": 76,
-						"y": 39,
-						"w": 38,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 5,
-						"w": 38,
-						"h": 40
-					},
-					"frame": {
-						"x": 76,
-						"y": 39,
-						"w": 38,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0028.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 5,
-						"w": 38,
-						"h": 40
-					},
-					"frame": {
-						"x": 76,
-						"y": 39,
-						"w": 38,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0040.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 5,
-						"w": 38,
-						"h": 40
-					},
-					"frame": {
-						"x": 76,
-						"y": 39,
-						"w": 38,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 7,
-						"w": 38,
-						"h": 40
-					},
-					"frame": {
-						"x": 38,
-						"y": 40,
-						"w": 38,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 38,
-						"h": 40
-					},
-					"frame": {
-						"x": 38,
-						"y": 40,
-						"w": 38,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 7,
-						"w": 38,
-						"h": 40
-					},
-					"frame": {
-						"x": 38,
-						"y": 40,
-						"w": 38,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 38,
-						"h": 40
-					},
-					"frame": {
-						"x": 38,
-						"y": 40,
-						"w": 38,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0029.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 7,
-						"w": 38,
-						"h": 40
-					},
-					"frame": {
-						"x": 38,
-						"y": 40,
-						"w": 38,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0034.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 38,
-						"h": 40
-					},
-					"frame": {
-						"x": 38,
-						"y": 40,
-						"w": 38,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0041.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 7,
-						"w": 38,
-						"h": 40
-					},
-					"frame": {
-						"x": 38,
-						"y": 40,
-						"w": 38,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0046.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 38,
-						"h": 40
-					},
-					"frame": {
-						"x": 38,
-						"y": 40,
-						"w": 38,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 38,
-						"h": 40
-					},
-					"frame": {
-						"x": 114,
-						"y": 40,
-						"w": 38,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 38,
-						"h": 40
-					},
-					"frame": {
-						"x": 114,
-						"y": 40,
-						"w": 38,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0036.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 38,
-						"h": 40
-					},
-					"frame": {
-						"x": 114,
-						"y": 40,
-						"w": 38,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0048.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 38,
-						"h": 40
-					},
-					"frame": {
-						"x": 114,
-						"y": 40,
-						"w": 38,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0062.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 38,
-						"h": 40
-					},
-					"frame": {
-						"x": 114,
-						"y": 40,
-						"w": 38,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0061.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 38,
-						"h": 40
-					},
-					"frame": {
-						"x": 76,
-						"y": 79,
-						"w": 38,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 37,
-						"h": 40
-					},
-					"frame": {
-						"x": 114,
-						"y": 80,
-						"w": 37,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 37,
-						"h": 40
-					},
-					"frame": {
-						"x": 114,
-						"y": 80,
-						"w": 37,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0035.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 37,
-						"h": 40
-					},
-					"frame": {
-						"x": 114,
-						"y": 80,
-						"w": 37,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0047.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 37,
-						"h": 40
-					},
-					"frame": {
-						"x": 114,
-						"y": 80,
-						"w": 37,
-						"h": 40
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:910fb9af9ea6e167d162cc6f8ae5174e:9e48a450788ccb42705466148db9893d:721af8c322ff60159262e9b3017c784d$"
-	}
-}
diff --git a/public/images/pokemon/exp/back/shiny/703.png b/public/images/pokemon/exp/back/shiny/703.png
deleted file mode 100644
index 2081d702118..00000000000
Binary files a/public/images/pokemon/exp/back/shiny/703.png and /dev/null differ
diff --git a/public/images/pokemon/exp/back/shiny/704.json b/public/images/pokemon/exp/back/shiny/704.json
index 32f8d89d5a8..ff94c52a2a8 100644
--- a/public/images/pokemon/exp/back/shiny/704.json
+++ b/public/images/pokemon/exp/back/shiny/704.json
@@ -1,230 +1,101 @@
-{
-	"textures": [
-		{
-			"image": "704.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 81,
-				"h": 81
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 27,
-						"h": 34
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 27,
-						"h": 34
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 27,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 27,
-						"h": 34
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 27,
-						"h": 34
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 27,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 27,
-						"h": 34
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 27,
-						"h": 34
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 27,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 27,
-						"h": 34
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 27,
-						"h": 34
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 27,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 27,
-						"h": 34
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 27,
-						"h": 33
-					},
-					"frame": {
-						"x": 27,
-						"y": 0,
-						"w": 27,
-						"h": 33
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 27,
-						"h": 34
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 27,
-						"h": 33
-					},
-					"frame": {
-						"x": 27,
-						"y": 0,
-						"w": 27,
-						"h": 33
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 27,
-						"h": 34
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 27,
-						"h": 33
-					},
-					"frame": {
-						"x": 27,
-						"y": 33,
-						"w": 27,
-						"h": 33
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 27,
-						"h": 34
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 27,
-						"h": 33
-					},
-					"frame": {
-						"x": 27,
-						"y": 33,
-						"w": 27,
-						"h": 33
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 27,
-						"h": 34
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 27,
-						"h": 32
-					},
-					"frame": {
-						"x": 0,
-						"y": 34,
-						"w": 27,
-						"h": 32
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 27,
-						"h": 34
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 27,
-						"h": 31
-					},
-					"frame": {
-						"x": 54,
-						"y": 0,
-						"w": 27,
-						"h": 31
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:6de9f988e21fa1819baa4118b3f8d3c5:467738d3742ffa651ad1f101f3369860:45bb13be23ae6e2a6654a2a00c450d62$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 0, "y": 0, "w": 26, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 26, "h": 34 },
+    "sourceSize": { "w": 27, "h": 34 },
+    "duration": 150
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 53, "y": 0, "w": 26, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 26, "h": 32 },
+    "sourceSize": { "w": 27, "h": 34 },
+    "duration": 150
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 26, "y": 0, "w": 27, "h": 31 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 27, "h": 31 },
+    "sourceSize": { "w": 27, "h": 34 },
+    "duration": 150
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 53, "y": 0, "w": 26, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 26, "h": 32 },
+    "sourceSize": { "w": 27, "h": 34 },
+    "duration": 150
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 0, "y": 0, "w": 26, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 26, "h": 34 },
+    "sourceSize": { "w": 27, "h": 34 },
+    "duration": 150
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 0, "y": 0, "w": 26, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 26, "h": 34 },
+    "sourceSize": { "w": 27, "h": 34 },
+    "duration": 150
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 26, "y": 31, "w": 26, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 26, "h": 32 },
+    "sourceSize": { "w": 27, "h": 34 },
+    "duration": 150
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 52, "y": 32, "w": 27, "h": 30 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 27, "h": 30 },
+    "sourceSize": { "w": 27, "h": 34 },
+    "duration": 150
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 26, "y": 31, "w": 26, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 26, "h": 32 },
+    "sourceSize": { "w": 27, "h": 34 },
+    "duration": 150
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 0, "y": 0, "w": 26, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 26, "h": 34 },
+    "sourceSize": { "w": 27, "h": 34 },
+    "duration": 150
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "704.png",
+  "format": "I8",
+  "size": { "w": 79, "h": 63 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/shiny/704.png b/public/images/pokemon/exp/back/shiny/704.png
index 5d3b5026ded..75a2898cd92 100644
Binary files a/public/images/pokemon/exp/back/shiny/704.png and b/public/images/pokemon/exp/back/shiny/704.png differ
diff --git a/public/images/pokemon/exp/back/shiny/705.json b/public/images/pokemon/exp/back/shiny/705.json
index ab139c247f5..2fc8cb18e99 100644
--- a/public/images/pokemon/exp/back/shiny/705.json
+++ b/public/images/pokemon/exp/back/shiny/705.json
@@ -1,230 +1,596 @@
-{
-	"textures": [
-		{
-			"image": "705.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 118,
-				"h": 118
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 39,
-						"h": 59
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 39,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 39,
-						"h": 59
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 39,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 59
-					},
-					"frame": {
-						"x": 0,
-						"y": 59,
-						"w": 37,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 59
-					},
-					"frame": {
-						"x": 0,
-						"y": 59,
-						"w": 37,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 59
-					},
-					"frame": {
-						"x": 37,
-						"y": 59,
-						"w": 35,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 59
-					},
-					"frame": {
-						"x": 39,
-						"y": 0,
-						"w": 35,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 59
-					},
-					"frame": {
-						"x": 39,
-						"y": 0,
-						"w": 35,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 41,
-						"h": 58
-					},
-					"frame": {
-						"x": 72,
-						"y": 59,
-						"w": 41,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 41,
-						"h": 58
-					},
-					"frame": {
-						"x": 72,
-						"y": 59,
-						"w": 41,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 42,
-						"h": 57
-					},
-					"frame": {
-						"x": 74,
-						"y": 0,
-						"w": 42,
-						"h": 57
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:82a03fa5424412ce647108fd8dac55a8:b9edd38338e7033be81034e75b8ae8a8:6b57e983626c7fc9144ab67f30c66814$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 116, "y": 124, "w": 40, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 40, "h": 59 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 40, "y": 185, "w": 40, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 40, "h": 58 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 77, "y": 298, "w": 40, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 40, "h": 56 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 162, "y": 299, "w": 40, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 40, "h": 56 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 202, "y": 299, "w": 41, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 9, "w": 41, "h": 54 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 117, "y": 300, "w": 41, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 9, "w": 41, "h": 54 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 121, "y": 245, "w": 41, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 41, "h": 55 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 80, "y": 242, "w": 41, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 41, "h": 56 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 0, "y": 244, "w": 40, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 40, "h": 57 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 194, "y": 240, "w": 39, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 39, "h": 59 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 0, "y": 125, "w": 37, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 37, "h": 59 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 156, "y": 184, "w": 38, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 38, "h": 61 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 40, "y": 243, "w": 37, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 37, "h": 62 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 158, "y": 0, "w": 39, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 39, "h": 62 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 156, "y": 62, "w": 39, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 39, "h": 61 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 197, "y": 0, "w": 40, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 40, "h": 60 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 116, "y": 124, "w": 40, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 40, "h": 59 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 40, "y": 185, "w": 40, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 40, "h": 58 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 77, "y": 298, "w": 40, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 40, "h": 56 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 162, "y": 299, "w": 40, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 40, "h": 56 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 202, "y": 299, "w": 41, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 9, "w": 41, "h": 54 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 117, "y": 300, "w": 41, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 9, "w": 41, "h": 54 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 121, "y": 245, "w": 41, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 41, "h": 55 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 80, "y": 242, "w": 41, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 41, "h": 56 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 0, "y": 244, "w": 40, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 40, "h": 57 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 194, "y": 240, "w": 39, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 39, "h": 59 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 0, "y": 125, "w": 37, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 37, "h": 59 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 156, "y": 184, "w": 38, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 38, "h": 61 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 40, "y": 243, "w": 37, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 37, "h": 62 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 158, "y": 0, "w": 39, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 39, "h": 62 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 156, "y": 62, "w": 39, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 39, "h": 61 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 197, "y": 0, "w": 40, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 40, "h": 60 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 116, "y": 124, "w": 40, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 40, "h": 59 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 40, "y": 185, "w": 40, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 40, "h": 58 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 77, "y": 298, "w": 40, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 40, "h": 56 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 162, "y": 299, "w": 40, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 40, "h": 56 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 202, "y": 299, "w": 41, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 9, "w": 41, "h": 54 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 117, "y": 300, "w": 41, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 9, "w": 41, "h": 54 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 121, "y": 245, "w": 41, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 41, "h": 55 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 80, "y": 242, "w": 41, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 41, "h": 56 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 0, "y": 244, "w": 40, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 40, "h": 57 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 194, "y": 240, "w": 39, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 39, "h": 59 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 0, "y": 125, "w": 37, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 37, "h": 59 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 156, "y": 184, "w": 38, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 38, "h": 61 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 40, "y": 243, "w": 37, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 37, "h": 62 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 158, "y": 0, "w": 39, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 39, "h": 62 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 156, "y": 62, "w": 39, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 39, "h": 61 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 197, "y": 0, "w": 40, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 40, "h": 60 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 116, "y": 124, "w": 40, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 40, "h": 59 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 195, "y": 181, "w": 40, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 40, "h": 59 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 118, "y": 0, "w": 40, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 40, "h": 61 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 0, "y": 0, "w": 40, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 40, "h": 62 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 118, "y": 61, "w": 38, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 38, "h": 63 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 0, "y": 62, "w": 38, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 38, "h": 63 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 40, "y": 0, "w": 39, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 39, "h": 63 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 79, "y": 0, "w": 39, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 39, "h": 63 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 38, "y": 63, "w": 39, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 39, "h": 61 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 77, "y": 63, "w": 39, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 39, "h": 61 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 195, "y": 120, "w": 39, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 39, "h": 61 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 156, "y": 123, "w": 39, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 39, "h": 61 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 38, "y": 124, "w": 39, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 39, "h": 61 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 77, "y": 124, "w": 39, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 39, "h": 61 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 197, "y": 60, "w": 40, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 40, "h": 60 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 116, "y": 183, "w": 40, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 40, "h": 59 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 0, "y": 185, "w": 40, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 40, "h": 59 },
+    "sourceSize": { "w": 43, "h": 63 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "705.png",
+  "format": "I8",
+  "size": { "w": 243, "h": 355 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/shiny/705.png b/public/images/pokemon/exp/back/shiny/705.png
index 65c9933f415..4ee803dd570 100644
Binary files a/public/images/pokemon/exp/back/shiny/705.png and b/public/images/pokemon/exp/back/shiny/705.png differ
diff --git a/public/images/pokemon/exp/back/shiny/707.png b/public/images/pokemon/exp/back/shiny/707.png
deleted file mode 100644
index 538667f7252..00000000000
Binary files a/public/images/pokemon/exp/back/shiny/707.png and /dev/null differ
diff --git a/public/images/pokemon/exp/back/shiny/708.json b/public/images/pokemon/exp/back/shiny/708.json
deleted file mode 100644
index fe864e9f9ea..00000000000
--- a/public/images/pokemon/exp/back/shiny/708.json
+++ /dev/null
@@ -1,503 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "708.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 135,
-				"h": 135
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 4,
-						"w": 46,
-						"h": 46
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 46,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 4,
-						"w": 46,
-						"h": 46
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 46,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 4,
-						"w": 46,
-						"h": 46
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 46,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 1,
-						"w": 45,
-						"h": 46
-					},
-					"frame": {
-						"x": 0,
-						"y": 46,
-						"w": 45,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 1,
-						"w": 45,
-						"h": 46
-					},
-					"frame": {
-						"x": 0,
-						"y": 46,
-						"w": 45,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 1,
-						"w": 45,
-						"h": 46
-					},
-					"frame": {
-						"x": 0,
-						"y": 46,
-						"w": 45,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 8,
-						"w": 45,
-						"h": 43
-					},
-					"frame": {
-						"x": 0,
-						"y": 92,
-						"w": 45,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 8,
-						"w": 45,
-						"h": 43
-					},
-					"frame": {
-						"x": 0,
-						"y": 92,
-						"w": 45,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 0,
-						"w": 44,
-						"h": 46
-					},
-					"frame": {
-						"x": 45,
-						"y": 46,
-						"w": 44,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 0,
-						"w": 44,
-						"h": 46
-					},
-					"frame": {
-						"x": 45,
-						"y": 46,
-						"w": 44,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 0,
-						"w": 44,
-						"h": 46
-					},
-					"frame": {
-						"x": 45,
-						"y": 46,
-						"w": 44,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 6,
-						"w": 45,
-						"h": 45
-					},
-					"frame": {
-						"x": 46,
-						"y": 0,
-						"w": 45,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 6,
-						"w": 45,
-						"h": 45
-					},
-					"frame": {
-						"x": 46,
-						"y": 0,
-						"w": 45,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 6,
-						"w": 45,
-						"h": 45
-					},
-					"frame": {
-						"x": 46,
-						"y": 0,
-						"w": 45,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 6,
-						"w": 45,
-						"h": 45
-					},
-					"frame": {
-						"x": 46,
-						"y": 0,
-						"w": 45,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 10,
-						"w": 44,
-						"h": 41
-					},
-					"frame": {
-						"x": 91,
-						"y": 0,
-						"w": 44,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 10,
-						"w": 44,
-						"h": 41
-					},
-					"frame": {
-						"x": 91,
-						"y": 0,
-						"w": 44,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 1,
-						"w": 45,
-						"h": 45
-					},
-					"frame": {
-						"x": 89,
-						"y": 45,
-						"w": 45,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 1,
-						"w": 45,
-						"h": 45
-					},
-					"frame": {
-						"x": 89,
-						"y": 45,
-						"w": 45,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 1,
-						"w": 45,
-						"h": 45
-					},
-					"frame": {
-						"x": 89,
-						"y": 45,
-						"w": 45,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 3,
-						"w": 45,
-						"h": 44
-					},
-					"frame": {
-						"x": 89,
-						"y": 90,
-						"w": 45,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 3,
-						"w": 45,
-						"h": 44
-					},
-					"frame": {
-						"x": 89,
-						"y": 90,
-						"w": 45,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 3,
-						"w": 45,
-						"h": 44
-					},
-					"frame": {
-						"x": 89,
-						"y": 90,
-						"w": 45,
-						"h": 44
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:ae43a2361518d114c34efceaee18a46b:85de733a19b6cdd71d9518299acef7f4:796c82c5076b122f2663381836c65843$"
-	}
-}
diff --git a/public/images/pokemon/exp/back/shiny/708.png b/public/images/pokemon/exp/back/shiny/708.png
deleted file mode 100644
index 35e2594241a..00000000000
Binary files a/public/images/pokemon/exp/back/shiny/708.png and /dev/null differ
diff --git a/public/images/pokemon/exp/back/shiny/712.json b/public/images/pokemon/exp/back/shiny/712.json
index 1fc96cf19a4..869a92fd6ea 100644
--- a/public/images/pokemon/exp/back/shiny/712.json
+++ b/public/images/pokemon/exp/back/shiny/712.json
@@ -1,3338 +1,1433 @@
-{
-	"textures": [
-		{
-			"image": "712.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 208,
-				"h": 208
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0025.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0042.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0043.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0044.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0045.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0046.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0047.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0064.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0065.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0066.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0067.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0068.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0069.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0086.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0087.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0088.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0089.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0090.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0091.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0108.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0109.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0110.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0111.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0112.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0113.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 44,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 44,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0026.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 44,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0027.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 44,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0048.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 44,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0049.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 44,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0070.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 44,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0071.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 44,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0092.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 44,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0093.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 44,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 88,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 88,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0036.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 88,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0037.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 88,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0058.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 88,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0059.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 88,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0080.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 88,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0081.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 88,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0102.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 88,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0103.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 88,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 132,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 132,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0038.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 132,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0039.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 132,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0060.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 132,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0061.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 132,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0082.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 132,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0083.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 132,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0104.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 132,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0105.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 132,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0138.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 38,
-						"h": 41
-					},
-					"frame": {
-						"x": 37,
-						"y": 0,
-						"w": 38,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0139.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 38,
-						"h": 41
-					},
-					"frame": {
-						"x": 37,
-						"y": 0,
-						"w": 38,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0140.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 38,
-						"h": 41
-					},
-					"frame": {
-						"x": 75,
-						"y": 0,
-						"w": 38,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0141.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 38,
-						"h": 41
-					},
-					"frame": {
-						"x": 75,
-						"y": 0,
-						"w": 38,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0144.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 38,
-						"h": 41
-					},
-					"frame": {
-						"x": 113,
-						"y": 0,
-						"w": 38,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0145.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 38,
-						"h": 41
-					},
-					"frame": {
-						"x": 113,
-						"y": 0,
-						"w": 38,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 151,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 151,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0040.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 151,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0041.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 151,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0062.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 151,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0063.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 151,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0084.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 151,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0085.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 151,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0106.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 151,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0107.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 151,
-						"y": 0,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 37,
-						"h": 43
-					},
-					"frame": {
-						"x": 37,
-						"y": 41,
-						"w": 37,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 37,
-						"h": 43
-					},
-					"frame": {
-						"x": 37,
-						"y": 41,
-						"w": 37,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0028.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 37,
-						"h": 43
-					},
-					"frame": {
-						"x": 37,
-						"y": 41,
-						"w": 37,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0029.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 37,
-						"h": 43
-					},
-					"frame": {
-						"x": 37,
-						"y": 41,
-						"w": 37,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0050.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 37,
-						"h": 43
-					},
-					"frame": {
-						"x": 37,
-						"y": 41,
-						"w": 37,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0051.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 37,
-						"h": 43
-					},
-					"frame": {
-						"x": 37,
-						"y": 41,
-						"w": 37,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0072.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 37,
-						"h": 43
-					},
-					"frame": {
-						"x": 37,
-						"y": 41,
-						"w": 37,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0073.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 37,
-						"h": 43
-					},
-					"frame": {
-						"x": 37,
-						"y": 41,
-						"w": 37,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0094.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 37,
-						"h": 43
-					},
-					"frame": {
-						"x": 37,
-						"y": 41,
-						"w": 37,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0095.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 37,
-						"h": 43
-					},
-					"frame": {
-						"x": 37,
-						"y": 41,
-						"w": 37,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 37,
-						"h": 43
-					},
-					"frame": {
-						"x": 74,
-						"y": 41,
-						"w": 37,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 37,
-						"h": 43
-					},
-					"frame": {
-						"x": 74,
-						"y": 41,
-						"w": 37,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0030.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 37,
-						"h": 43
-					},
-					"frame": {
-						"x": 74,
-						"y": 41,
-						"w": 37,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0031.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 37,
-						"h": 43
-					},
-					"frame": {
-						"x": 74,
-						"y": 41,
-						"w": 37,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0052.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 37,
-						"h": 43
-					},
-					"frame": {
-						"x": 74,
-						"y": 41,
-						"w": 37,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0053.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 37,
-						"h": 43
-					},
-					"frame": {
-						"x": 74,
-						"y": 41,
-						"w": 37,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0074.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 37,
-						"h": 43
-					},
-					"frame": {
-						"x": 74,
-						"y": 41,
-						"w": 37,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0075.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 37,
-						"h": 43
-					},
-					"frame": {
-						"x": 74,
-						"y": 41,
-						"w": 37,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0096.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 37,
-						"h": 43
-					},
-					"frame": {
-						"x": 74,
-						"y": 41,
-						"w": 37,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0097.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 37,
-						"h": 43
-					},
-					"frame": {
-						"x": 74,
-						"y": 41,
-						"w": 37,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 37,
-						"h": 43
-					},
-					"frame": {
-						"x": 111,
-						"y": 41,
-						"w": 37,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 37,
-						"h": 43
-					},
-					"frame": {
-						"x": 111,
-						"y": 41,
-						"w": 37,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0032.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 37,
-						"h": 43
-					},
-					"frame": {
-						"x": 111,
-						"y": 41,
-						"w": 37,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0033.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 37,
-						"h": 43
-					},
-					"frame": {
-						"x": 111,
-						"y": 41,
-						"w": 37,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0054.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 37,
-						"h": 43
-					},
-					"frame": {
-						"x": 111,
-						"y": 41,
-						"w": 37,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0055.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 37,
-						"h": 43
-					},
-					"frame": {
-						"x": 111,
-						"y": 41,
-						"w": 37,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0076.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 37,
-						"h": 43
-					},
-					"frame": {
-						"x": 111,
-						"y": 41,
-						"w": 37,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0077.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 37,
-						"h": 43
-					},
-					"frame": {
-						"x": 111,
-						"y": 41,
-						"w": 37,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0098.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 37,
-						"h": 43
-					},
-					"frame": {
-						"x": 111,
-						"y": 41,
-						"w": 37,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0099.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 37,
-						"h": 43
-					},
-					"frame": {
-						"x": 111,
-						"y": 41,
-						"w": 37,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 37,
-						"h": 43
-					},
-					"frame": {
-						"x": 148,
-						"y": 44,
-						"w": 37,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 37,
-						"h": 43
-					},
-					"frame": {
-						"x": 148,
-						"y": 44,
-						"w": 37,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0034.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 37,
-						"h": 43
-					},
-					"frame": {
-						"x": 148,
-						"y": 44,
-						"w": 37,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0035.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 37,
-						"h": 43
-					},
-					"frame": {
-						"x": 148,
-						"y": 44,
-						"w": 37,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0056.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 37,
-						"h": 43
-					},
-					"frame": {
-						"x": 148,
-						"y": 44,
-						"w": 37,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0057.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 37,
-						"h": 43
-					},
-					"frame": {
-						"x": 148,
-						"y": 44,
-						"w": 37,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0078.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 37,
-						"h": 43
-					},
-					"frame": {
-						"x": 148,
-						"y": 44,
-						"w": 37,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0079.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 37,
-						"h": 43
-					},
-					"frame": {
-						"x": 148,
-						"y": 44,
-						"w": 37,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0100.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 37,
-						"h": 43
-					},
-					"frame": {
-						"x": 148,
-						"y": 44,
-						"w": 37,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0101.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 37,
-						"h": 43
-					},
-					"frame": {
-						"x": 148,
-						"y": 44,
-						"w": 37,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0114.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 37,
-						"h": 43
-					},
-					"frame": {
-						"x": 37,
-						"y": 84,
-						"w": 37,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0115.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 37,
-						"h": 43
-					},
-					"frame": {
-						"x": 37,
-						"y": 84,
-						"w": 37,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0157.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 37,
-						"h": 43
-					},
-					"frame": {
-						"x": 37,
-						"y": 84,
-						"w": 37,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0158.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 37,
-						"h": 43
-					},
-					"frame": {
-						"x": 37,
-						"y": 84,
-						"w": 37,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0116.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 2,
-						"w": 37,
-						"h": 42
-					},
-					"frame": {
-						"x": 74,
-						"y": 84,
-						"w": 37,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0117.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 2,
-						"w": 37,
-						"h": 42
-					},
-					"frame": {
-						"x": 74,
-						"y": 84,
-						"w": 37,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0155.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 2,
-						"w": 37,
-						"h": 42
-					},
-					"frame": {
-						"x": 74,
-						"y": 84,
-						"w": 37,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0156.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 2,
-						"w": 37,
-						"h": 42
-					},
-					"frame": {
-						"x": 74,
-						"y": 84,
-						"w": 37,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0118.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 37,
-						"h": 41
-					},
-					"frame": {
-						"x": 111,
-						"y": 84,
-						"w": 37,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0119.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 37,
-						"h": 41
-					},
-					"frame": {
-						"x": 111,
-						"y": 84,
-						"w": 37,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0120.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 37,
-						"h": 41
-					},
-					"frame": {
-						"x": 111,
-						"y": 84,
-						"w": 37,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0121.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 37,
-						"h": 41
-					},
-					"frame": {
-						"x": 111,
-						"y": 84,
-						"w": 37,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0122.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 37,
-						"h": 41
-					},
-					"frame": {
-						"x": 111,
-						"y": 84,
-						"w": 37,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0123.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 37,
-						"h": 41
-					},
-					"frame": {
-						"x": 111,
-						"y": 84,
-						"w": 37,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0150.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 37,
-						"h": 41
-					},
-					"frame": {
-						"x": 111,
-						"y": 84,
-						"w": 37,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0151.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 37,
-						"h": 41
-					},
-					"frame": {
-						"x": 111,
-						"y": 84,
-						"w": 37,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0152.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 37,
-						"h": 41
-					},
-					"frame": {
-						"x": 111,
-						"y": 84,
-						"w": 37,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0153.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 37,
-						"h": 41
-					},
-					"frame": {
-						"x": 111,
-						"y": 84,
-						"w": 37,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0154.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 37,
-						"h": 41
-					},
-					"frame": {
-						"x": 111,
-						"y": 84,
-						"w": 37,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0124.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 37,
-						"h": 41
-					},
-					"frame": {
-						"x": 148,
-						"y": 87,
-						"w": 37,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0125.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 37,
-						"h": 41
-					},
-					"frame": {
-						"x": 148,
-						"y": 87,
-						"w": 37,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0126.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 37,
-						"h": 41
-					},
-					"frame": {
-						"x": 111,
-						"y": 125,
-						"w": 37,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0127.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 37,
-						"h": 41
-					},
-					"frame": {
-						"x": 111,
-						"y": 125,
-						"w": 37,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0134.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 37,
-						"h": 41
-					},
-					"frame": {
-						"x": 111,
-						"y": 125,
-						"w": 37,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0135.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 37,
-						"h": 41
-					},
-					"frame": {
-						"x": 111,
-						"y": 125,
-						"w": 37,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0128.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 37,
-						"h": 41
-					},
-					"frame": {
-						"x": 74,
-						"y": 126,
-						"w": 37,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0129.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 37,
-						"h": 41
-					},
-					"frame": {
-						"x": 74,
-						"y": 126,
-						"w": 37,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0132.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 37,
-						"h": 41
-					},
-					"frame": {
-						"x": 74,
-						"y": 126,
-						"w": 37,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0133.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 37,
-						"h": 41
-					},
-					"frame": {
-						"x": 74,
-						"y": 126,
-						"w": 37,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0130.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 37,
-						"h": 41
-					},
-					"frame": {
-						"x": 37,
-						"y": 127,
-						"w": 37,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0131.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 37,
-						"h": 41
-					},
-					"frame": {
-						"x": 37,
-						"y": 127,
-						"w": 37,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0136.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 37,
-						"h": 41
-					},
-					"frame": {
-						"x": 74,
-						"y": 167,
-						"w": 37,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0137.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 37,
-						"h": 41
-					},
-					"frame": {
-						"x": 74,
-						"y": 167,
-						"w": 37,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0148.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 37,
-						"h": 40
-					},
-					"frame": {
-						"x": 37,
-						"y": 168,
-						"w": 37,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0149.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 37,
-						"h": 40
-					},
-					"frame": {
-						"x": 37,
-						"y": 168,
-						"w": 37,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0142.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 37,
-						"h": 41
-					},
-					"frame": {
-						"x": 111,
-						"y": 166,
-						"w": 37,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0143.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 37,
-						"h": 41
-					},
-					"frame": {
-						"x": 111,
-						"y": 166,
-						"w": 37,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0146.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 36,
-						"h": 41
-					},
-					"frame": {
-						"x": 148,
-						"y": 128,
-						"w": 36,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0147.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 36,
-						"h": 41
-					},
-					"frame": {
-						"x": 148,
-						"y": 128,
-						"w": 36,
-						"h": 41
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:6fc0455d6f0af01f72622b0f21f8ee70:352443e5019cc9719abfbd45c1015afa:3a1cc69824960d920ca43f8c9376d136$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 109, "y": 0, "w": 35, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 109, "y": 0, "w": 35, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 109, "y": 0, "w": 35, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 145, "y": 0, "w": 35, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 145, "y": 0, "w": 35, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 72, "y": 43, "w": 35, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 35, "h": 42 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 72, "y": 43, "w": 35, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 35, "h": 42 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 108, "y": 44, "w": 35, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 35, "h": 42 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 108, "y": 44, "w": 35, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 35, "h": 42 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 144, "y": 44, "w": 35, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 35, "h": 42 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 144, "y": 44, "w": 35, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 35, "h": 42 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 72, "y": 0, "w": 36, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 36, "h": 42 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 72, "y": 0, "w": 36, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 36, "h": 42 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 181, "y": 0, "w": 35, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 35, "h": 43 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 181, "y": 0, "w": 35, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 35, "h": 43 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 0, "y": 0, "w": 35, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 35, "h": 44 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 0, "y": 0, "w": 35, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 35, "h": 44 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 36, "y": 0, "w": 35, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 35, "h": 44 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 36, "y": 0, "w": 35, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 35, "h": 44 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 109, "y": 0, "w": 35, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 109, "y": 0, "w": 35, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 109, "y": 0, "w": 35, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 109, "y": 0, "w": 35, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 109, "y": 0, "w": 35, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 109, "y": 0, "w": 35, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 145, "y": 0, "w": 35, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 145, "y": 0, "w": 35, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 72, "y": 43, "w": 35, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 35, "h": 42 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 72, "y": 43, "w": 35, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 35, "h": 42 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 108, "y": 44, "w": 35, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 35, "h": 42 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 108, "y": 44, "w": 35, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 35, "h": 42 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 144, "y": 44, "w": 35, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 35, "h": 42 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 144, "y": 44, "w": 35, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 35, "h": 42 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 72, "y": 0, "w": 36, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 36, "h": 42 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 72, "y": 0, "w": 36, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 36, "h": 42 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 181, "y": 0, "w": 35, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 35, "h": 43 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 181, "y": 0, "w": 35, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 35, "h": 43 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 0, "y": 0, "w": 35, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 35, "h": 44 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 0, "y": 0, "w": 35, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 35, "h": 44 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 36, "y": 0, "w": 35, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 35, "h": 44 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 36, "y": 0, "w": 35, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 35, "h": 44 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 109, "y": 0, "w": 35, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 109, "y": 0, "w": 35, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 109, "y": 0, "w": 35, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 109, "y": 0, "w": 35, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 109, "y": 0, "w": 35, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 109, "y": 0, "w": 35, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 145, "y": 0, "w": 35, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 145, "y": 0, "w": 35, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 72, "y": 43, "w": 35, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 35, "h": 42 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 72, "y": 43, "w": 35, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 35, "h": 42 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 108, "y": 44, "w": 35, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 35, "h": 42 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 108, "y": 44, "w": 35, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 35, "h": 42 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 144, "y": 44, "w": 35, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 35, "h": 42 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 144, "y": 44, "w": 35, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 35, "h": 42 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 72, "y": 0, "w": 36, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 36, "h": 42 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 72, "y": 0, "w": 36, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 36, "h": 42 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 181, "y": 0, "w": 35, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 35, "h": 43 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 181, "y": 0, "w": 35, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 35, "h": 43 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 0, "y": 0, "w": 35, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 35, "h": 44 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 0, "y": 0, "w": 35, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 35, "h": 44 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 36, "y": 0, "w": 35, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 35, "h": 44 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 36, "y": 0, "w": 35, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 35, "h": 44 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 109, "y": 0, "w": 35, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 109, "y": 0, "w": 35, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 109, "y": 0, "w": 35, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 109, "y": 0, "w": 35, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 109, "y": 0, "w": 35, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 109, "y": 0, "w": 35, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 145, "y": 0, "w": 35, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 145, "y": 0, "w": 35, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 72, "y": 43, "w": 35, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 35, "h": 42 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 72, "y": 43, "w": 35, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 35, "h": 42 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 108, "y": 44, "w": 35, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 35, "h": 42 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 108, "y": 44, "w": 35, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 35, "h": 42 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 144, "y": 44, "w": 35, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 35, "h": 42 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 144, "y": 44, "w": 35, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 35, "h": 42 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 72, "y": 0, "w": 36, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 36, "h": 42 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 72, "y": 0, "w": 36, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 36, "h": 42 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 181, "y": 0, "w": 35, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 35, "h": 43 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 181, "y": 0, "w": 35, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 35, "h": 43 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 0, "y": 0, "w": 35, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 35, "h": 44 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 0, "y": 0, "w": 35, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 35, "h": 44 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 36, "y": 0, "w": 35, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 35, "h": 44 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 36, "y": 0, "w": 35, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 35, "h": 44 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 109, "y": 0, "w": 35, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 109, "y": 0, "w": 35, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0088.png",
+    "frame": { "x": 109, "y": 0, "w": 35, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0089.png",
+    "frame": { "x": 109, "y": 0, "w": 35, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0090.png",
+    "frame": { "x": 109, "y": 0, "w": 35, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0091.png",
+    "frame": { "x": 109, "y": 0, "w": 35, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0092.png",
+    "frame": { "x": 145, "y": 0, "w": 35, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0093.png",
+    "frame": { "x": 145, "y": 0, "w": 35, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0094.png",
+    "frame": { "x": 72, "y": 43, "w": 35, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 35, "h": 42 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0095.png",
+    "frame": { "x": 72, "y": 43, "w": 35, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 35, "h": 42 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0096.png",
+    "frame": { "x": 108, "y": 44, "w": 35, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 35, "h": 42 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0097.png",
+    "frame": { "x": 108, "y": 44, "w": 35, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 35, "h": 42 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0098.png",
+    "frame": { "x": 144, "y": 44, "w": 35, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 35, "h": 42 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0099.png",
+    "frame": { "x": 144, "y": 44, "w": 35, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 35, "h": 42 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0100.png",
+    "frame": { "x": 72, "y": 0, "w": 36, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 36, "h": 42 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0101.png",
+    "frame": { "x": 72, "y": 0, "w": 36, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 36, "h": 42 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0102.png",
+    "frame": { "x": 181, "y": 0, "w": 35, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 35, "h": 43 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0103.png",
+    "frame": { "x": 181, "y": 0, "w": 35, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 35, "h": 43 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0104.png",
+    "frame": { "x": 0, "y": 0, "w": 35, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 35, "h": 44 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0105.png",
+    "frame": { "x": 0, "y": 0, "w": 35, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 35, "h": 44 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0106.png",
+    "frame": { "x": 36, "y": 0, "w": 35, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 35, "h": 44 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0107.png",
+    "frame": { "x": 36, "y": 0, "w": 35, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 35, "h": 44 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0108.png",
+    "frame": { "x": 109, "y": 0, "w": 35, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0109.png",
+    "frame": { "x": 109, "y": 0, "w": 35, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0110.png",
+    "frame": { "x": 109, "y": 0, "w": 35, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0111.png",
+    "frame": { "x": 109, "y": 0, "w": 35, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0112.png",
+    "frame": { "x": 109, "y": 0, "w": 35, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0113.png",
+    "frame": { "x": 109, "y": 0, "w": 35, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 35, "h": 43 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0114.png",
+    "frame": { "x": 180, "y": 44, "w": 35, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 35, "h": 42 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0115.png",
+    "frame": { "x": 180, "y": 44, "w": 35, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 35, "h": 42 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0116.png",
+    "frame": { "x": 148, "y": 87, "w": 35, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 35, "h": 41 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0117.png",
+    "frame": { "x": 148, "y": 87, "w": 35, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 35, "h": 41 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0118.png",
+    "frame": { "x": 0, "y": 127, "w": 35, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 35, "h": 40 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0119.png",
+    "frame": { "x": 0, "y": 127, "w": 35, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 35, "h": 40 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0120.png",
+    "frame": { "x": 0, "y": 127, "w": 35, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 35, "h": 40 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0121.png",
+    "frame": { "x": 0, "y": 127, "w": 35, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 35, "h": 40 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0122.png",
+    "frame": { "x": 0, "y": 127, "w": 35, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 35, "h": 40 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0123.png",
+    "frame": { "x": 0, "y": 127, "w": 35, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 35, "h": 40 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0124.png",
+    "frame": { "x": 36, "y": 127, "w": 35, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 35, "h": 40 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0125.png",
+    "frame": { "x": 36, "y": 127, "w": 35, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 35, "h": 40 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0126.png",
+    "frame": { "x": 72, "y": 128, "w": 35, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 35, "h": 40 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0127.png",
+    "frame": { "x": 72, "y": 128, "w": 35, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 35, "h": 40 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0128.png",
+    "frame": { "x": 0, "y": 45, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 36, "h": 40 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0129.png",
+    "frame": { "x": 0, "y": 45, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 36, "h": 40 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0130.png",
+    "frame": { "x": 0, "y": 86, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 36, "h": 40 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0131.png",
+    "frame": { "x": 0, "y": 86, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 36, "h": 40 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0132.png",
+    "frame": { "x": 0, "y": 45, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 36, "h": 40 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0133.png",
+    "frame": { "x": 0, "y": 45, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 36, "h": 40 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0134.png",
+    "frame": { "x": 72, "y": 128, "w": 35, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 35, "h": 40 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0135.png",
+    "frame": { "x": 72, "y": 128, "w": 35, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 35, "h": 40 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0136.png",
+    "frame": { "x": 108, "y": 128, "w": 35, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 35, "h": 40 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0137.png",
+    "frame": { "x": 108, "y": 128, "w": 35, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 35, "h": 40 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0138.png",
+    "frame": { "x": 37, "y": 86, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 36, "h": 40 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0139.png",
+    "frame": { "x": 37, "y": 86, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 36, "h": 40 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0140.png",
+    "frame": { "x": 74, "y": 87, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 36, "h": 40 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0141.png",
+    "frame": { "x": 74, "y": 87, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 36, "h": 40 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0142.png",
+    "frame": { "x": 144, "y": 129, "w": 35, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 35, "h": 40 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0143.png",
+    "frame": { "x": 144, "y": 129, "w": 35, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 35, "h": 40 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0144.png",
+    "frame": { "x": 111, "y": 87, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 36, "h": 40 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0145.png",
+    "frame": { "x": 111, "y": 87, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 36, "h": 40 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0146.png",
+    "frame": { "x": 180, "y": 129, "w": 35, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 35, "h": 40 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0147.png",
+    "frame": { "x": 180, "y": 129, "w": 35, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 35, "h": 40 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0148.png",
+    "frame": { "x": 0, "y": 168, "w": 35, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 35, "h": 39 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0149.png",
+    "frame": { "x": 0, "y": 168, "w": 35, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 35, "h": 39 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0150.png",
+    "frame": { "x": 0, "y": 127, "w": 35, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 35, "h": 40 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0151.png",
+    "frame": { "x": 0, "y": 127, "w": 35, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 35, "h": 40 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0152.png",
+    "frame": { "x": 0, "y": 127, "w": 35, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 35, "h": 40 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0153.png",
+    "frame": { "x": 0, "y": 127, "w": 35, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 35, "h": 40 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0154.png",
+    "frame": { "x": 0, "y": 127, "w": 35, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 35, "h": 40 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0155.png",
+    "frame": { "x": 148, "y": 87, "w": 35, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 35, "h": 41 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0156.png",
+    "frame": { "x": 148, "y": 87, "w": 35, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 35, "h": 41 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0157.png",
+    "frame": { "x": 180, "y": 44, "w": 35, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 35, "h": 42 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0158.png",
+    "frame": { "x": 180, "y": 44, "w": 35, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 35, "h": 42 },
+    "sourceSize": { "w": 40, "h": 44 },
+    "duration": 50
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.11-x64",
+  "image": "712.png",
+  "format": "I8",
+  "size": { "w": 216, "h": 207 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/shiny/712.png b/public/images/pokemon/exp/back/shiny/712.png
index 709718daf83..989ed14b08e 100644
Binary files a/public/images/pokemon/exp/back/shiny/712.png and b/public/images/pokemon/exp/back/shiny/712.png differ
diff --git a/public/images/pokemon/exp/back/shiny/713.json b/public/images/pokemon/exp/back/shiny/713.json
index 8f1736a5256..0ff72eef867 100644
--- a/public/images/pokemon/exp/back/shiny/713.json
+++ b/public/images/pokemon/exp/back/shiny/713.json
@@ -1,188 +1,1100 @@
-{
-	"textures": [
-		{
-			"image": "713.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 199,
-				"h": 199
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 87,
-						"h": 69
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 87,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 87,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 87,
-						"h": 69
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 87,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 87,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 87,
-						"h": 69
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 87,
-						"h": 69
-					},
-					"frame": {
-						"x": 87,
-						"y": 0,
-						"w": 87,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 87,
-						"h": 69
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 87,
-						"h": 69
-					},
-					"frame": {
-						"x": 87,
-						"y": 0,
-						"w": 87,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 87,
-						"h": 69
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 87,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 69,
-						"w": 87,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 87,
-						"h": 69
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 87,
-						"h": 66
-					},
-					"frame": {
-						"x": 87,
-						"y": 69,
-						"w": 87,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 87,
-						"h": 69
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 87,
-						"h": 66
-					},
-					"frame": {
-						"x": 87,
-						"y": 69,
-						"w": 87,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 87,
-						"h": 69
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 87,
-						"h": 64
-					},
-					"frame": {
-						"x": 87,
-						"y": 135,
-						"w": 87,
-						"h": 64
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:0af8023555592952fe28b217e91b3a50:e8f7bce9a0476374152ae2437bd2d84b:625f70bcfe9c7f2437cb9cad6d2b863c$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 87, "y": 63, "w": 87, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 87, "y": 126, "w": 87, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 87, "h": 62 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 0, "y": 127, "w": 87, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 87, "h": 62 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 261, "y": 127, "w": 87, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 87, "h": 61 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 174, "y": 128, "w": 87, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 87, "h": 61 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 87, "y": 188, "w": 87, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 87, "h": 60 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 87, "y": 188, "w": 87, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 87, "h": 60 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 87, "y": 188, "w": 87, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 87, "h": 60 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 174, "y": 128, "w": 87, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 87, "h": 61 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 261, "y": 127, "w": 87, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 87, "h": 61 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 0, "y": 127, "w": 87, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 87, "h": 62 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 87, "y": 126, "w": 87, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 87, "h": 62 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 87, "y": 63, "w": 87, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 270, "y": 64, "w": 87, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 270, "y": 0, "w": 87, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 87, "h": 64 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 0, "y": 63, "w": 87, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 87, "h": 64 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 183, "y": 0, "w": 87, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 87, "h": 65 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 183, "y": 0, "w": 87, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 87, "h": 65 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 183, "y": 0, "w": 87, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 87, "h": 65 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 183, "y": 0, "w": 87, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 87, "h": 65 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 0, "y": 63, "w": 87, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 87, "h": 64 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 270, "y": 0, "w": 87, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 87, "h": 64 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 270, "y": 64, "w": 87, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 87, "y": 63, "w": 87, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 87, "y": 126, "w": 87, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 87, "h": 62 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 0, "y": 127, "w": 87, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 87, "h": 62 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 261, "y": 127, "w": 87, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 87, "h": 61 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 174, "y": 128, "w": 87, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 87, "h": 61 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 87, "y": 188, "w": 87, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 87, "h": 60 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 87, "y": 188, "w": 87, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 87, "h": 60 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 87, "y": 188, "w": 87, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 87, "h": 60 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 174, "y": 128, "w": 87, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 87, "h": 61 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 261, "y": 127, "w": 87, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 87, "h": 61 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 0, "y": 127, "w": 87, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 87, "h": 62 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 87, "y": 126, "w": 87, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 87, "h": 62 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 87, "y": 63, "w": 87, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 270, "y": 64, "w": 87, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 270, "y": 0, "w": 87, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 87, "h": 64 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 0, "y": 63, "w": 87, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 87, "h": 64 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 183, "y": 0, "w": 87, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 87, "h": 65 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 183, "y": 0, "w": 87, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 87, "h": 65 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 183, "y": 0, "w": 87, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 87, "h": 65 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 183, "y": 0, "w": 87, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 87, "h": 65 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 0, "y": 63, "w": 87, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 87, "h": 64 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 270, "y": 0, "w": 87, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 87, "h": 64 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 270, "y": 64, "w": 87, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 87, "y": 63, "w": 87, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 87, "y": 126, "w": 87, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 87, "h": 62 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 0, "y": 127, "w": 87, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 87, "h": 62 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 261, "y": 127, "w": 87, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 87, "h": 61 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 174, "y": 128, "w": 87, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 87, "h": 61 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 87, "y": 188, "w": 87, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 87, "h": 60 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 87, "y": 188, "w": 87, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 87, "h": 60 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 87, "y": 188, "w": 87, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 87, "h": 60 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 174, "y": 128, "w": 87, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 87, "h": 61 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 261, "y": 127, "w": 87, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 87, "h": 61 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 0, "y": 127, "w": 87, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 87, "h": 62 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 87, "y": 126, "w": 87, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 87, "h": 62 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 87, "y": 63, "w": 87, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 270, "y": 64, "w": 87, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 270, "y": 0, "w": 87, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 87, "h": 64 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 0, "y": 63, "w": 87, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 87, "h": 64 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 183, "y": 0, "w": 87, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 87, "h": 65 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 183, "y": 0, "w": 87, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 87, "h": 65 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 183, "y": 0, "w": 87, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 87, "h": 65 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 183, "y": 0, "w": 87, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 87, "h": 65 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 0, "y": 63, "w": 87, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 87, "h": 64 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 270, "y": 0, "w": 87, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 87, "h": 64 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 270, "y": 64, "w": 87, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 87, "y": 63, "w": 87, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 87, "y": 126, "w": 87, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 87, "h": 62 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 0, "y": 127, "w": 87, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 87, "h": 62 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 261, "y": 127, "w": 87, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 87, "h": 61 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 174, "y": 128, "w": 87, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 87, "h": 61 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 87, "y": 188, "w": 87, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 87, "h": 60 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 87, "y": 188, "w": 87, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 87, "h": 60 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 87, "y": 188, "w": 87, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 87, "h": 60 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 174, "y": 128, "w": 87, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 87, "h": 61 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 261, "y": 127, "w": 87, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 87, "h": 61 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 0, "y": 127, "w": 87, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 87, "h": 62 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 87, "y": 126, "w": 87, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 87, "h": 62 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 87, "y": 63, "w": 87, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 270, "y": 64, "w": 87, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 270, "y": 0, "w": 87, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 87, "h": 64 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 0, "y": 63, "w": 87, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 87, "h": 64 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 183, "y": 0, "w": 87, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 87, "h": 65 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 183, "y": 0, "w": 87, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 87, "h": 65 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0088.png",
+    "frame": { "x": 183, "y": 0, "w": 87, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 87, "h": 65 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0089.png",
+    "frame": { "x": 183, "y": 0, "w": 87, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 87, "h": 65 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0090.png",
+    "frame": { "x": 0, "y": 63, "w": 87, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 87, "h": 64 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0091.png",
+    "frame": { "x": 270, "y": 0, "w": 87, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 87, "h": 64 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0092.png",
+    "frame": { "x": 270, "y": 64, "w": 87, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0093.png",
+    "frame": { "x": 270, "y": 64, "w": 87, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0094.png",
+    "frame": { "x": 87, "y": 63, "w": 87, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0095.png",
+    "frame": { "x": 87, "y": 63, "w": 87, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0096.png",
+    "frame": { "x": 87, "y": 63, "w": 87, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0097.png",
+    "frame": { "x": 87, "y": 63, "w": 87, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0098.png",
+    "frame": { "x": 174, "y": 65, "w": 87, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0099.png",
+    "frame": { "x": 174, "y": 65, "w": 87, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0100.png",
+    "frame": { "x": 92, "y": 0, "w": 91, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 91, "h": 63 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0101.png",
+    "frame": { "x": 92, "y": 0, "w": 91, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 91, "h": 63 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0102.png",
+    "frame": { "x": 0, "y": 0, "w": 92, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 92, "h": 63 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0103.png",
+    "frame": { "x": 0, "y": 0, "w": 92, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 92, "h": 63 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0104.png",
+    "frame": { "x": 0, "y": 0, "w": 92, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 92, "h": 63 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0105.png",
+    "frame": { "x": 0, "y": 0, "w": 92, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 92, "h": 63 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0106.png",
+    "frame": { "x": 0, "y": 0, "w": 92, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 92, "h": 63 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0107.png",
+    "frame": { "x": 87, "y": 63, "w": 87, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 87, "h": 63 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0108.png",
+    "frame": { "x": 87, "y": 63, "w": 87, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 87, "h": 63 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0109.png",
+    "frame": { "x": 87, "y": 63, "w": 87, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0110.png",
+    "frame": { "x": 87, "y": 63, "w": 87, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0111.png",
+    "frame": { "x": 87, "y": 63, "w": 87, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0112.png",
+    "frame": { "x": 87, "y": 63, "w": 87, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0113.png",
+    "frame": { "x": 87, "y": 63, "w": 87, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0114.png",
+    "frame": { "x": 87, "y": 63, "w": 87, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0115.png",
+    "frame": { "x": 87, "y": 63, "w": 87, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0116.png",
+    "frame": { "x": 87, "y": 63, "w": 87, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0117.png",
+    "frame": { "x": 87, "y": 63, "w": 87, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0118.png",
+    "frame": { "x": 87, "y": 63, "w": 87, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 87, "h": 63 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0119.png",
+    "frame": { "x": 87, "y": 63, "w": 87, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 87, "h": 63 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0120.png",
+    "frame": { "x": 87, "y": 63, "w": 87, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 87, "h": 63 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0121.png",
+    "frame": { "x": 87, "y": 63, "w": 87, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 87, "h": 63 },
+    "sourceSize": { "w": 92, "h": 66 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.11-x64",
+  "image": "713.png",
+  "format": "I8",
+  "size": { "w": 357, "h": 248 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/shiny/713.png b/public/images/pokemon/exp/back/shiny/713.png
index 87011e1bbb9..b4417f8386b 100644
Binary files a/public/images/pokemon/exp/back/shiny/713.png and b/public/images/pokemon/exp/back/shiny/713.png differ
diff --git a/public/images/pokemon/exp/back/shiny/714.json b/public/images/pokemon/exp/back/shiny/714.json
deleted file mode 100644
index 1d8e87ffa8c..00000000000
--- a/public/images/pokemon/exp/back/shiny/714.json
+++ /dev/null
@@ -1,230 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "714.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 147,
-				"h": 147
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 60,
-						"h": 69
-					},
-					"spriteSourceSize": {
-						"x": 13,
-						"y": 0,
-						"w": 34,
-						"h": 57
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 34,
-						"h": 57
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 60,
-						"h": 69
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 11,
-						"w": 60,
-						"h": 58
-					},
-					"frame": {
-						"x": 34,
-						"y": 0,
-						"w": 60,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 60,
-						"h": 69
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 3,
-						"w": 46,
-						"h": 58
-					},
-					"frame": {
-						"x": 94,
-						"y": 0,
-						"w": 46,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 60,
-						"h": 69
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 3,
-						"w": 46,
-						"h": 58
-					},
-					"frame": {
-						"x": 94,
-						"y": 0,
-						"w": 46,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 60,
-						"h": 69
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 10,
-						"w": 58,
-						"h": 58
-					},
-					"frame": {
-						"x": 0,
-						"y": 58,
-						"w": 58,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 60,
-						"h": 69
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 10,
-						"w": 58,
-						"h": 58
-					},
-					"frame": {
-						"x": 0,
-						"y": 58,
-						"w": 58,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 60,
-						"h": 69
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 7,
-						"w": 54,
-						"h": 58
-					},
-					"frame": {
-						"x": 58,
-						"y": 58,
-						"w": 54,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 60,
-						"h": 69
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 7,
-						"w": 54,
-						"h": 58
-					},
-					"frame": {
-						"x": 58,
-						"y": 58,
-						"w": 54,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 60,
-						"h": 69
-					},
-					"spriteSourceSize": {
-						"x": 12,
-						"y": 1,
-						"w": 35,
-						"h": 58
-					},
-					"frame": {
-						"x": 112,
-						"y": 58,
-						"w": 35,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 60,
-						"h": 69
-					},
-					"spriteSourceSize": {
-						"x": 12,
-						"y": 1,
-						"w": 35,
-						"h": 58
-					},
-					"frame": {
-						"x": 112,
-						"y": 58,
-						"w": 35,
-						"h": 58
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:b5f2c2112a42d04cd66e9ed8b57be94f:1af3c375153c5a8b4950e81283c602fa:1a07d46e710b0568ec824f54fbc4fe6a$"
-	}
-}
diff --git a/public/images/pokemon/exp/back/shiny/714.png b/public/images/pokemon/exp/back/shiny/714.png
deleted file mode 100644
index fa2c001e7cc..00000000000
Binary files a/public/images/pokemon/exp/back/shiny/714.png and /dev/null differ
diff --git a/public/images/pokemon/exp/back/shiny/718-10.json b/public/images/pokemon/exp/back/shiny/718-10.json
deleted file mode 100644
index 147d661bd6b..00000000000
--- a/public/images/pokemon/exp/back/shiny/718-10.json
+++ /dev/null
@@ -1,188 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "718-10.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 194,
-				"h": 194
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 62,
-						"h": 66
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 62,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 60,
-						"h": 66
-					},
-					"frame": {
-						"x": 0,
-						"y": 66,
-						"w": 60,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 60,
-						"h": 66
-					},
-					"frame": {
-						"x": 0,
-						"y": 66,
-						"w": 60,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 63,
-						"h": 65
-					},
-					"frame": {
-						"x": 60,
-						"y": 66,
-						"w": 63,
-						"h": 65
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 63,
-						"h": 65
-					},
-					"frame": {
-						"x": 62,
-						"y": 0,
-						"w": 63,
-						"h": 65
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 63,
-						"h": 64
-					},
-					"frame": {
-						"x": 125,
-						"y": 0,
-						"w": 63,
-						"h": 64
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 62,
-						"h": 65
-					},
-					"frame": {
-						"x": 125,
-						"y": 64,
-						"w": 62,
-						"h": 65
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 59,
-						"h": 65
-					},
-					"frame": {
-						"x": 123,
-						"y": 129,
-						"w": 59,
-						"h": 65
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:9b4423fced8dd8763a4e886055e4ab1f:d04b9095317ace207a8d36f1e501da19:82195cf2a6db620c5643b8162d6e8c5c$"
-	}
-}
diff --git a/public/images/pokemon/exp/back/shiny/718-10.png b/public/images/pokemon/exp/back/shiny/718-10.png
deleted file mode 100644
index 63d73684da4..00000000000
Binary files a/public/images/pokemon/exp/back/shiny/718-10.png and /dev/null differ
diff --git a/public/images/pokemon/exp/back/shiny/718.json b/public/images/pokemon/exp/back/shiny/718.json
deleted file mode 100644
index b5cde64bbad..00000000000
--- a/public/images/pokemon/exp/back/shiny/718.json
+++ /dev/null
@@ -1,230 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "718.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 216,
-				"h": 216
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 75,
-						"h": 89
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 74,
-						"h": 89
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 74,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 75,
-						"h": 89
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 74,
-						"h": 89
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 74,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 75,
-						"h": 89
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 73,
-						"h": 89
-					},
-					"frame": {
-						"x": 0,
-						"y": 89,
-						"w": 73,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 75,
-						"h": 89
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 73,
-						"h": 89
-					},
-					"frame": {
-						"x": 73,
-						"y": 89,
-						"w": 73,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 75,
-						"h": 89
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 73,
-						"h": 89
-					},
-					"frame": {
-						"x": 73,
-						"y": 89,
-						"w": 73,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 75,
-						"h": 89
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 72,
-						"h": 89
-					},
-					"frame": {
-						"x": 74,
-						"y": 0,
-						"w": 72,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 75,
-						"h": 89
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 72,
-						"h": 89
-					},
-					"frame": {
-						"x": 74,
-						"y": 0,
-						"w": 72,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 75,
-						"h": 89
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 0,
-						"w": 70,
-						"h": 88
-					},
-					"frame": {
-						"x": 146,
-						"y": 0,
-						"w": 70,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 75,
-						"h": 89
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 0,
-						"w": 70,
-						"h": 88
-					},
-					"frame": {
-						"x": 146,
-						"y": 0,
-						"w": 70,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 75,
-						"h": 89
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 1,
-						"w": 69,
-						"h": 87
-					},
-					"frame": {
-						"x": 146,
-						"y": 88,
-						"w": 69,
-						"h": 87
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:b8c991edb02cd8fac15ae3bfa6518a6b:1cf351059eb3257fa98dfd55b07708c4:7b4a06b06cbac24b3f39727b0238661b$"
-	}
-}
diff --git a/public/images/pokemon/exp/back/shiny/718.png b/public/images/pokemon/exp/back/shiny/718.png
deleted file mode 100644
index 5e981224596..00000000000
Binary files a/public/images/pokemon/exp/back/shiny/718.png and /dev/null differ
diff --git a/public/images/pokemon/exp/back/shiny/719.json b/public/images/pokemon/exp/back/shiny/719.json
deleted file mode 100644
index d39dc5b1c99..00000000000
--- a/public/images/pokemon/exp/back/shiny/719.json
+++ /dev/null
@@ -1,272 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "719.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 158,
-				"h": 158
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 44,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 14,
-						"w": 39,
-						"h": 66
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 39,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 44,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 12,
-						"w": 39,
-						"h": 67
-					},
-					"frame": {
-						"x": 39,
-						"y": 0,
-						"w": 39,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 44,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 12,
-						"w": 39,
-						"h": 67
-					},
-					"frame": {
-						"x": 39,
-						"y": 0,
-						"w": 39,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 44,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 8,
-						"w": 40,
-						"h": 67
-					},
-					"frame": {
-						"x": 78,
-						"y": 0,
-						"w": 40,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 44,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 8,
-						"w": 40,
-						"h": 67
-					},
-					"frame": {
-						"x": 78,
-						"y": 0,
-						"w": 40,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 44,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 5,
-						"w": 40,
-						"h": 67
-					},
-					"frame": {
-						"x": 118,
-						"y": 0,
-						"w": 40,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 44,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 5,
-						"w": 40,
-						"h": 67
-					},
-					"frame": {
-						"x": 118,
-						"y": 0,
-						"w": 40,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 44,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 41,
-						"h": 67
-					},
-					"frame": {
-						"x": 0,
-						"y": 67,
-						"w": 41,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 44,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 41,
-						"h": 68
-					},
-					"frame": {
-						"x": 41,
-						"y": 67,
-						"w": 41,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 44,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 41,
-						"h": 68
-					},
-					"frame": {
-						"x": 41,
-						"y": 67,
-						"w": 41,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 44,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 42,
-						"h": 68
-					},
-					"frame": {
-						"x": 82,
-						"y": 67,
-						"w": 42,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 44,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 42,
-						"h": 68
-					},
-					"frame": {
-						"x": 82,
-						"y": 67,
-						"w": 42,
-						"h": 68
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:4664ffe6d92453555d7befbaf3a06e34:ee4f7a42565694ad44dfdf274a36ffbb:17a705bb924916761be2495822a53735$"
-	}
-}
diff --git a/public/images/pokemon/exp/back/shiny/719.png b/public/images/pokemon/exp/back/shiny/719.png
deleted file mode 100644
index d1640abb4a0..00000000000
Binary files a/public/images/pokemon/exp/back/shiny/719.png and /dev/null differ
diff --git a/public/images/pokemon/exp/back/shiny/728.json b/public/images/pokemon/exp/back/shiny/728.json
index 37f02ac84d7..f60b5965bed 100644
--- a/public/images/pokemon/exp/back/shiny/728.json
+++ b/public/images/pokemon/exp/back/shiny/728.json
@@ -1,230 +1,776 @@
-{
-	"textures": [
-		{
-			"image": "728.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 117,
-				"h": 117
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 41,
-						"h": 39
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 39
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 39
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 41,
-						"h": 39
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 39
-					},
-					"frame": {
-						"x": 0,
-						"y": 39,
-						"w": 41,
-						"h": 39
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 41,
-						"h": 39
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 39
-					},
-					"frame": {
-						"x": 0,
-						"y": 39,
-						"w": 41,
-						"h": 39
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 41,
-						"h": 39
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 39
-					},
-					"frame": {
-						"x": 0,
-						"y": 78,
-						"w": 41,
-						"h": 39
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 41,
-						"h": 39
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 39
-					},
-					"frame": {
-						"x": 0,
-						"y": 78,
-						"w": 41,
-						"h": 39
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 41,
-						"h": 39
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 39
-					},
-					"frame": {
-						"x": 41,
-						"y": 0,
-						"w": 41,
-						"h": 39
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 41,
-						"h": 39
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 39
-					},
-					"frame": {
-						"x": 41,
-						"y": 0,
-						"w": 41,
-						"h": 39
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 41,
-						"h": 39
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 39
-					},
-					"frame": {
-						"x": 41,
-						"y": 39,
-						"w": 41,
-						"h": 39
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 41,
-						"h": 39
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 39
-					},
-					"frame": {
-						"x": 41,
-						"y": 39,
-						"w": 41,
-						"h": 39
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 41,
-						"h": 39
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 39
-					},
-					"frame": {
-						"x": 41,
-						"y": 78,
-						"w": 41,
-						"h": 39
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:4b3aa1071cae1ccbd84e587c2c8d2cde:022fe282ca0614cda2fd19d531e24090:74218c18c9d392741666ee5c0c28d306$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 123, "y": 144, "w": 40, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 20, "w": 40, "h": 39 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 80, "y": 145, "w": 40, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 20, "w": 40, "h": 39 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 40, "y": 185, "w": 40, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 21, "w": 40, "h": 37 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 160, "y": 185, "w": 39, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 21, "w": 39, "h": 37 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 157, "y": 222, "w": 39, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 22, "w": 39, "h": 36 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 0, "y": 223, "w": 39, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 22, "w": 39, "h": 36 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 40, "y": 222, "w": 39, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 21, "w": 39, "h": 37 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 79, "y": 222, "w": 39, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 21, "w": 39, "h": 37 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 118, "y": 222, "w": 39, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 21, "w": 39, "h": 37 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 80, "y": 184, "w": 40, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 20, "w": 40, "h": 38 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 40, "y": 146, "w": 40, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 20, "w": 40, "h": 39 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 120, "y": 183, "w": 40, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 20, "w": 40, "h": 39 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 123, "y": 144, "w": 40, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 20, "w": 40, "h": 39 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 80, "y": 145, "w": 40, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 20, "w": 40, "h": 39 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 40, "y": 185, "w": 40, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 21, "w": 40, "h": 37 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 160, "y": 185, "w": 39, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 21, "w": 39, "h": 37 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 157, "y": 222, "w": 39, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 22, "w": 39, "h": 36 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 0, "y": 223, "w": 39, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 22, "w": 39, "h": 36 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 40, "y": 222, "w": 39, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 21, "w": 39, "h": 37 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 79, "y": 222, "w": 39, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 21, "w": 39, "h": 37 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 118, "y": 222, "w": 39, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 21, "w": 39, "h": 37 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 80, "y": 184, "w": 40, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 20, "w": 40, "h": 38 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 40, "y": 146, "w": 40, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 20, "w": 40, "h": 39 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 120, "y": 183, "w": 40, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 20, "w": 40, "h": 39 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 123, "y": 144, "w": 40, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 20, "w": 40, "h": 39 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 80, "y": 145, "w": 40, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 20, "w": 40, "h": 39 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 40, "y": 185, "w": 40, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 21, "w": 40, "h": 37 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 160, "y": 185, "w": 39, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 21, "w": 39, "h": 37 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 157, "y": 222, "w": 39, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 22, "w": 39, "h": 36 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 0, "y": 223, "w": 39, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 22, "w": 39, "h": 36 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 40, "y": 222, "w": 39, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 21, "w": 39, "h": 37 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 79, "y": 222, "w": 39, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 21, "w": 39, "h": 37 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 118, "y": 222, "w": 39, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 21, "w": 39, "h": 37 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 80, "y": 184, "w": 40, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 20, "w": 40, "h": 38 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 40, "y": 146, "w": 40, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 20, "w": 40, "h": 39 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 120, "y": 183, "w": 40, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 20, "w": 40, "h": 39 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 123, "y": 144, "w": 40, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 20, "w": 40, "h": 39 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 80, "y": 145, "w": 40, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 20, "w": 40, "h": 39 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 40, "y": 185, "w": 40, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 21, "w": 40, "h": 37 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 160, "y": 185, "w": 39, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 21, "w": 39, "h": 37 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 157, "y": 222, "w": 39, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 22, "w": 39, "h": 36 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 0, "y": 223, "w": 39, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 22, "w": 39, "h": 36 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 40, "y": 222, "w": 39, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 21, "w": 39, "h": 37 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 79, "y": 222, "w": 39, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 21, "w": 39, "h": 37 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 118, "y": 222, "w": 39, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 21, "w": 39, "h": 37 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 80, "y": 184, "w": 40, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 20, "w": 40, "h": 38 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 40, "y": 146, "w": 40, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 20, "w": 40, "h": 39 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 120, "y": 183, "w": 40, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 20, "w": 40, "h": 39 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 123, "y": 144, "w": 40, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 20, "w": 40, "h": 39 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 80, "y": 145, "w": 40, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 20, "w": 40, "h": 39 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 40, "y": 185, "w": 40, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 21, "w": 40, "h": 37 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 160, "y": 185, "w": 39, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 21, "w": 39, "h": 37 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 157, "y": 222, "w": 39, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 22, "w": 39, "h": 36 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 0, "y": 223, "w": 39, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 22, "w": 39, "h": 36 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 40, "y": 222, "w": 39, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 21, "w": 39, "h": 37 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 79, "y": 222, "w": 39, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 21, "w": 39, "h": 37 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 118, "y": 222, "w": 39, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 21, "w": 39, "h": 37 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 80, "y": 184, "w": 40, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 20, "w": 40, "h": 38 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 40, "y": 146, "w": 40, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 20, "w": 40, "h": 39 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 120, "y": 183, "w": 40, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 20, "w": 40, "h": 39 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 0, "y": 184, "w": 40, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 20, "w": 40, "h": 39 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 0, "y": 144, "w": 40, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 19, "w": 40, "h": 40 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 40, "y": 105, "w": 40, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 18, "w": 40, "h": 41 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 0, "y": 102, "w": 40, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 17, "w": 40, "h": 42 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 123, "y": 102, "w": 40, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 17, "w": 40, "h": 42 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 163, "y": 100, "w": 40, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 16, "w": 40, "h": 43 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 0, "y": 58, "w": 40, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 15, "w": 40, "h": 44 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 123, "y": 57, "w": 40, "h": 45 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 14, "w": 40, "h": 45 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 83, "y": 57, "w": 40, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 13, "w": 40, "h": 46 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 43, "y": 57, "w": 40, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 11, "w": 40, "h": 48 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 165, "y": 51, "w": 40, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 10, "w": 40, "h": 49 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 165, "y": 0, "w": 40, "h": 51 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 8, "w": 40, "h": 51 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 43, "y": 0, "w": 42, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 42, "h": 57 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 0, "y": 0, "w": 43, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 43, "h": 58 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 0, "y": 0, "w": 43, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 43, "h": 58 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 0, "y": 0, "w": 43, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 43, "h": 58 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 0, "y": 0, "w": 43, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 43, "h": 58 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 126, "y": 0, "w": 39, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 39, "h": 55 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 85, "y": 0, "w": 41, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 41, "h": 57 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 163, "y": 143, "w": 39, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 16, "w": 39, "h": 42 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 83, "y": 103, "w": 40, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 16, "w": 40, "h": 42 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 123, "y": 102, "w": 40, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 17, "w": 40, "h": 42 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 0, "y": 102, "w": 40, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 17, "w": 40, "h": 42 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 40, "y": 105, "w": 40, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 18, "w": 40, "h": 41 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 0, "y": 144, "w": 40, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 19, "w": 40, "h": 40 },
+    "sourceSize": { "w": 43, "h": 59 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.13-x64",
+  "image": "728.png",
+  "format": "I8",
+  "size": { "w": 205, "h": 259 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/shiny/728.png b/public/images/pokemon/exp/back/shiny/728.png
index 116bbd97904..c28f73eb846 100644
Binary files a/public/images/pokemon/exp/back/shiny/728.png and b/public/images/pokemon/exp/back/shiny/728.png differ
diff --git a/public/images/pokemon/exp/back/shiny/729.json b/public/images/pokemon/exp/back/shiny/729.json
index 88363e67c9b..97deebe472e 100644
--- a/public/images/pokemon/exp/back/shiny/729.json
+++ b/public/images/pokemon/exp/back/shiny/729.json
@@ -1,230 +1,1055 @@
-{
-	"textures": [
-		{
-			"image": "729.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 148,
-				"h": 148
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 71,
-						"h": 50
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 70,
-						"h": 50
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 70,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 71,
-						"h": 50
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 70,
-						"h": 49
-					},
-					"frame": {
-						"x": 0,
-						"y": 50,
-						"w": 70,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 71,
-						"h": 50
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 70,
-						"h": 49
-					},
-					"frame": {
-						"x": 0,
-						"y": 50,
-						"w": 70,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 71,
-						"h": 50
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 69,
-						"h": 49
-					},
-					"frame": {
-						"x": 0,
-						"y": 99,
-						"w": 69,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 71,
-						"h": 50
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 69,
-						"h": 49
-					},
-					"frame": {
-						"x": 0,
-						"y": 99,
-						"w": 69,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 71,
-						"h": 50
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 68,
-						"h": 50
-					},
-					"frame": {
-						"x": 70,
-						"y": 0,
-						"w": 68,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 71,
-						"h": 50
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 68,
-						"h": 50
-					},
-					"frame": {
-						"x": 70,
-						"y": 0,
-						"w": 68,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 71,
-						"h": 50
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 50
-					},
-					"frame": {
-						"x": 70,
-						"y": 50,
-						"w": 67,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 71,
-						"h": 50
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 70,
-						"h": 48
-					},
-					"frame": {
-						"x": 69,
-						"y": 100,
-						"w": 70,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 71,
-						"h": 50
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 70,
-						"h": 48
-					},
-					"frame": {
-						"x": 69,
-						"y": 100,
-						"w": 70,
-						"h": 48
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:2ec3964e8d511b8d6f4605adc54b17bc:5161b57c2302335b0d40aea50fb7f56d:b2d5dd692ec79c7357afdffa7b3670a9$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 348, "y": 280, "w": 56, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 9, "w": 56, "h": 54 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 166, "y": 283, "w": 55, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 10, "w": 55, "h": 53 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 0, "y": 284, "w": 54, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 10, "w": 54, "h": 53 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 348, "y": 334, "w": 52, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 11, "w": 52, "h": 52 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 49, "y": 337, "w": 49, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 11, "w": 49, "h": 52 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 49, "y": 389, "w": 47, "h": 51 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 12, "w": 47, "h": 51 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 265, "y": 388, "w": 47, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 11, "w": 47, "h": 52 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 386, "y": 386, "w": 47, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 11, "w": 47, "h": 52 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 98, "y": 337, "w": 49, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 11, "w": 49, "h": 52 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 287, "y": 335, "w": 51, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 10, "w": 51, "h": 53 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 491, "y": 224, "w": 53, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 10, "w": 53, "h": 53 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 112, "y": 283, "w": 54, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 9, "w": 54, "h": 54 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 292, "y": 280, "w": 56, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 8, "w": 56, "h": 55 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 174, "y": 228, "w": 57, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 8, "w": 57, "h": 55 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 328, "y": 114, "w": 59, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 59, "h": 56 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 195, "y": 61, "w": 59, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 59, "h": 57 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 334, "y": 57, "w": 60, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 60, "h": 57 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 394, "y": 57, "w": 60, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 60, "h": 57 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 268, "y": 60, "w": 60, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 60, "h": 57 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 68, "y": 62, "w": 60, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 60, "h": 56 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 234, "y": 172, "w": 59, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 59, "h": 55 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 293, "y": 225, "w": 59, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 59, "h": 55 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 234, "y": 227, "w": 58, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 8, "w": 58, "h": 55 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 59, "y": 174, "w": 57, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 9, "w": 57, "h": 54 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 348, "y": 280, "w": 56, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 9, "w": 56, "h": 54 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 166, "y": 283, "w": 55, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 10, "w": 55, "h": 53 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 0, "y": 284, "w": 54, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 10, "w": 54, "h": 53 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 348, "y": 334, "w": 52, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 11, "w": 52, "h": 52 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 49, "y": 337, "w": 49, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 11, "w": 49, "h": 52 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 49, "y": 389, "w": 47, "h": 51 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 12, "w": 47, "h": 51 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 265, "y": 388, "w": 47, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 11, "w": 47, "h": 52 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 386, "y": 386, "w": 47, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 11, "w": 47, "h": 52 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 98, "y": 337, "w": 49, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 11, "w": 49, "h": 52 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 287, "y": 335, "w": 51, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 10, "w": 51, "h": 53 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 491, "y": 224, "w": 53, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 10, "w": 53, "h": 53 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 112, "y": 283, "w": 54, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 9, "w": 54, "h": 54 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 292, "y": 280, "w": 56, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 8, "w": 56, "h": 55 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 174, "y": 228, "w": 57, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 8, "w": 57, "h": 55 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 328, "y": 114, "w": 59, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 59, "h": 56 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 195, "y": 61, "w": 59, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 59, "h": 57 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 334, "y": 57, "w": 60, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 60, "h": 57 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 394, "y": 57, "w": 60, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 60, "h": 57 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 268, "y": 60, "w": 60, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 60, "h": 57 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 68, "y": 62, "w": 60, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 60, "h": 56 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 234, "y": 172, "w": 59, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 59, "h": 55 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 293, "y": 225, "w": 59, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 59, "h": 55 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 234, "y": 227, "w": 58, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 8, "w": 58, "h": 55 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 59, "y": 174, "w": 57, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 9, "w": 57, "h": 54 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 348, "y": 280, "w": 56, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 9, "w": 56, "h": 54 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 166, "y": 283, "w": 55, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 10, "w": 55, "h": 53 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 0, "y": 284, "w": 54, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 10, "w": 54, "h": 53 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 348, "y": 334, "w": 52, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 11, "w": 52, "h": 52 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 49, "y": 337, "w": 49, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 11, "w": 49, "h": 52 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 49, "y": 389, "w": 47, "h": 51 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 12, "w": 47, "h": 51 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 265, "y": 388, "w": 47, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 11, "w": 47, "h": 52 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 386, "y": 386, "w": 47, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 11, "w": 47, "h": 52 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 98, "y": 337, "w": 49, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 11, "w": 49, "h": 52 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 287, "y": 335, "w": 51, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 10, "w": 51, "h": 53 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 491, "y": 224, "w": 53, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 10, "w": 53, "h": 53 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 112, "y": 283, "w": 54, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 9, "w": 54, "h": 54 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 292, "y": 280, "w": 56, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 8, "w": 56, "h": 55 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 174, "y": 228, "w": 57, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 8, "w": 57, "h": 55 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 328, "y": 114, "w": 59, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 59, "h": 56 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 195, "y": 61, "w": 59, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 59, "h": 57 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 334, "y": 57, "w": 60, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 60, "h": 57 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 394, "y": 57, "w": 60, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 60, "h": 57 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 268, "y": 60, "w": 60, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 60, "h": 57 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 68, "y": 62, "w": 60, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 60, "h": 56 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 234, "y": 172, "w": 59, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 59, "h": 55 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 293, "y": 225, "w": 59, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 59, "h": 55 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 234, "y": 227, "w": 58, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 8, "w": 58, "h": 55 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 59, "y": 174, "w": 57, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 9, "w": 57, "h": 54 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 348, "y": 280, "w": 56, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 9, "w": 56, "h": 54 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 467, "y": 279, "w": 58, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 9, "w": 58, "h": 54 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 0, "y": 63, "w": 61, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 8, "w": 61, "h": 55 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 334, "y": 0, "w": 63, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 63, "h": 57 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 135, "y": 61, "w": 60, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 60, "h": 57 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 458, "y": 56, "w": 59, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 59, "h": 58 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 397, "y": 0, "w": 61, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 61, "h": 57 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 458, "y": 0, "w": 62, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 62, "h": 56 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 446, "y": 169, "w": 59, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 8, "w": 59, "h": 55 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 348, "y": 280, "w": 56, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 9, "w": 56, "h": 54 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 57, "y": 283, "w": 55, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 9, "w": 55, "h": 54 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 467, "y": 333, "w": 53, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 11, "w": 53, "h": 52 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 338, "y": 386, "w": 48, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 11, "w": 48, "h": 52 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 216, "y": 336, "w": 49, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 11, "w": 49, "h": 53 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 166, "y": 336, "w": 50, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 11, "w": 50, "h": 53 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0088.png",
+    "frame": { "x": 0, "y": 337, "w": 49, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 11, "w": 49, "h": 53 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0089.png",
+    "frame": { "x": 452, "y": 385, "w": 48, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 10, "w": 48, "h": 53 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0090.png",
+    "frame": { "x": 400, "y": 334, "w": 52, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 11, "w": 52, "h": 52 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0091.png",
+    "frame": { "x": 348, "y": 280, "w": 56, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 9, "w": 56, "h": 54 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0092.png",
+    "frame": { "x": 231, "y": 282, "w": 56, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 9, "w": 56, "h": 54 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0093.png",
+    "frame": { "x": 117, "y": 228, "w": 57, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 8, "w": 57, "h": 55 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0094.png",
+    "frame": { "x": 58, "y": 118, "w": 58, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 7, "w": 58, "h": 56 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0095.png",
+    "frame": { "x": 352, "y": 225, "w": 58, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 8, "w": 58, "h": 55 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0096.png",
+    "frame": { "x": 0, "y": 118, "w": 58, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 7, "w": 58, "h": 56 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0097.png",
+    "frame": { "x": 314, "y": 170, "w": 59, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 59, "h": 55 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0098.png",
+    "frame": { "x": 175, "y": 118, "w": 59, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 59, "h": 55 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0099.png",
+    "frame": { "x": 373, "y": 170, "w": 59, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 59, "h": 55 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0100.png",
+    "frame": { "x": 116, "y": 118, "w": 59, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 59, "h": 55 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0101.png",
+    "frame": { "x": 446, "y": 114, "w": 60, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 8, "w": 60, "h": 55 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0102.png",
+    "frame": { "x": 202, "y": 0, "w": 66, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 66, "h": 61 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0103.png",
+    "frame": { "x": 68, "y": 0, "w": 67, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 67, "h": 62 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0104.png",
+    "frame": { "x": 0, "y": 0, "w": 68, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 68, "h": 63 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0105.png",
+    "frame": { "x": 268, "y": 0, "w": 66, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 66, "h": 60 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0106.png",
+    "frame": { "x": 135, "y": 0, "w": 67, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 67, "h": 61 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0107.png",
+    "frame": { "x": 254, "y": 117, "w": 60, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 8, "w": 60, "h": 55 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0108.png",
+    "frame": { "x": 116, "y": 173, "w": 59, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 59, "h": 55 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0109.png",
+    "frame": { "x": 116, "y": 173, "w": 59, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 59, "h": 55 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0110.png",
+    "frame": { "x": 175, "y": 173, "w": 59, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 59, "h": 55 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0111.png",
+    "frame": { "x": 0, "y": 174, "w": 59, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 59, "h": 55 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0112.png",
+    "frame": { "x": 432, "y": 224, "w": 59, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 59, "h": 55 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0113.png",
+    "frame": { "x": 387, "y": 114, "w": 59, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 59, "h": 56 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0114.png",
+    "frame": { "x": 59, "y": 228, "w": 58, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 8, "w": 58, "h": 55 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0115.png",
+    "frame": { "x": 0, "y": 229, "w": 57, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 8, "w": 57, "h": 55 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0116.png",
+    "frame": { "x": 410, "y": 279, "w": 57, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 8, "w": 57, "h": 55 },
+    "sourceSize": { "w": 68, "h": 66 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.13-x64",
+  "image": "729.png",
+  "format": "I8",
+  "size": { "w": 544, "h": 440 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/shiny/729.png b/public/images/pokemon/exp/back/shiny/729.png
index 7818ca064bc..15c7bb566cf 100644
Binary files a/public/images/pokemon/exp/back/shiny/729.png and b/public/images/pokemon/exp/back/shiny/729.png differ
diff --git a/public/images/pokemon/exp/back/shiny/730.json b/public/images/pokemon/exp/back/shiny/730.json
index b32a006ec2b..5e3c835b381 100644
--- a/public/images/pokemon/exp/back/shiny/730.json
+++ b/public/images/pokemon/exp/back/shiny/730.json
@@ -1,230 +1,839 @@
-{
-	"textures": [
-		{
-			"image": "730.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 206,
-				"h": 206
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 69,
-						"h": 82
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 69,
-						"h": 79
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 69,
-						"h": 79
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 69,
-						"h": 82
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 68,
-						"h": 81
-					},
-					"frame": {
-						"x": 69,
-						"y": 0,
-						"w": 68,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 69,
-						"h": 82
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 68,
-						"h": 81
-					},
-					"frame": {
-						"x": 69,
-						"y": 0,
-						"w": 68,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 69,
-						"h": 82
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 68,
-						"h": 81
-					},
-					"frame": {
-						"x": 0,
-						"y": 79,
-						"w": 68,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 69,
-						"h": 82
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 69,
-						"h": 79
-					},
-					"frame": {
-						"x": 68,
-						"y": 81,
-						"w": 69,
-						"h": 79
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 69,
-						"h": 82
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 69,
-						"h": 79
-					},
-					"frame": {
-						"x": 68,
-						"y": 81,
-						"w": 69,
-						"h": 79
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 69,
-						"h": 82
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 69,
-						"h": 79
-					},
-					"frame": {
-						"x": 137,
-						"y": 0,
-						"w": 69,
-						"h": 79
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 69,
-						"h": 82
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 69,
-						"h": 79
-					},
-					"frame": {
-						"x": 137,
-						"y": 0,
-						"w": 69,
-						"h": 79
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 69,
-						"h": 82
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 69,
-						"h": 78
-					},
-					"frame": {
-						"x": 137,
-						"y": 79,
-						"w": 69,
-						"h": 78
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 69,
-						"h": 82
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 69,
-						"h": 78
-					},
-					"frame": {
-						"x": 137,
-						"y": 79,
-						"w": 69,
-						"h": 78
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:58a363a646c000c7482433c620e2e758:8b636d10e03d9f55a9d52a248f1e3999:fcd0d2cb6b26724e796ae0dcb71fae3f$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 397, "y": 0, "w": 75, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 13, "w": 75, "h": 71 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 324, "y": 0, "w": 73, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 11, "w": 73, "h": 73 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 397, "y": 71, "w": 69, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 8, "w": 69, "h": 76 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 70, "y": 135, "w": 66, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 5, "w": 66, "h": 78 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 278, "y": 401, "w": 61, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 3, "w": 61, "h": 78 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 137, "y": 400, "w": 60, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 19, "y": 1, "w": 60, "h": 80 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 77, "y": 394, "w": 60, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 19, "y": 1, "w": 60, "h": 80 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 217, "y": 335, "w": 61, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 2, "w": 61, "h": 79 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 415, "y": 418, "w": 61, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 4, "w": 61, "h": 77 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 351, "y": 359, "w": 64, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 16, "y": 8, "w": 64, "h": 76 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 505, "y": 288, "w": 69, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 13, "w": 69, "h": 71 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 278, "y": 334, "w": 73, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 17, "w": 73, "h": 67 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 124, "y": 265, "w": 76, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 18, "w": 76, "h": 66 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 292, "y": 269, "w": 77, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 19, "w": 77, "h": 65 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 200, "y": 271, "w": 78, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 19, "w": 78, "h": 64 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 197, "y": 414, "w": 77, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 19, "w": 77, "h": 62 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 0, "y": 394, "w": 77, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 18, "w": 77, "h": 63 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 64, "y": 331, "w": 78, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 18, "w": 78, "h": 63 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 385, "y": 212, "w": 79, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 17, "w": 79, "h": 64 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 213, "y": 207, "w": 79, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 17, "w": 79, "h": 64 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 156, "y": 67, "w": 79, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 17, "w": 79, "h": 67 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 78, "y": 67, "w": 78, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 16, "w": 78, "h": 68 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 397, "y": 0, "w": 75, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 13, "w": 75, "h": 71 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 324, "y": 0, "w": 73, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 11, "w": 73, "h": 73 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 397, "y": 71, "w": 69, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 8, "w": 69, "h": 76 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 70, "y": 135, "w": 66, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 5, "w": 66, "h": 78 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 278, "y": 401, "w": 61, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 3, "w": 61, "h": 78 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 137, "y": 400, "w": 60, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 19, "y": 1, "w": 60, "h": 80 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 77, "y": 394, "w": 60, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 19, "y": 1, "w": 60, "h": 80 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 217, "y": 335, "w": 61, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 2, "w": 61, "h": 79 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 415, "y": 418, "w": 61, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 4, "w": 61, "h": 77 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 351, "y": 359, "w": 64, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 16, "y": 8, "w": 64, "h": 76 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 505, "y": 288, "w": 69, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 13, "w": 69, "h": 71 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 278, "y": 334, "w": 73, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 17, "w": 73, "h": 67 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 124, "y": 265, "w": 76, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 18, "w": 76, "h": 66 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 292, "y": 269, "w": 77, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 19, "w": 77, "h": 65 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 200, "y": 271, "w": 78, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 19, "w": 78, "h": 64 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 197, "y": 414, "w": 77, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 19, "w": 77, "h": 62 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 0, "y": 394, "w": 77, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 18, "w": 77, "h": 63 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 64, "y": 331, "w": 78, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 18, "w": 78, "h": 63 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 385, "y": 212, "w": 79, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 17, "w": 79, "h": 64 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 213, "y": 207, "w": 79, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 17, "w": 79, "h": 64 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 156, "y": 67, "w": 79, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 17, "w": 79, "h": 67 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 78, "y": 67, "w": 78, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 16, "w": 78, "h": 68 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 397, "y": 0, "w": 75, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 13, "w": 75, "h": 71 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 324, "y": 0, "w": 73, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 11, "w": 73, "h": 73 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 397, "y": 71, "w": 69, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 8, "w": 69, "h": 76 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 70, "y": 135, "w": 66, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 5, "w": 66, "h": 78 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 278, "y": 401, "w": 61, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 3, "w": 61, "h": 78 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 137, "y": 400, "w": 60, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 19, "y": 1, "w": 60, "h": 80 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 77, "y": 394, "w": 60, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 19, "y": 1, "w": 60, "h": 80 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 217, "y": 335, "w": 61, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 2, "w": 61, "h": 79 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 415, "y": 418, "w": 61, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 4, "w": 61, "h": 77 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 351, "y": 359, "w": 64, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 16, "y": 8, "w": 64, "h": 76 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 505, "y": 288, "w": 69, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 13, "w": 69, "h": 71 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 278, "y": 334, "w": 73, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 17, "w": 73, "h": 67 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 124, "y": 265, "w": 76, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 18, "w": 76, "h": 66 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 292, "y": 269, "w": 77, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 19, "w": 77, "h": 65 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 200, "y": 271, "w": 78, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 19, "w": 78, "h": 64 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 197, "y": 414, "w": 77, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 19, "w": 77, "h": 62 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 0, "y": 394, "w": 77, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 18, "w": 77, "h": 63 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 64, "y": 331, "w": 78, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 18, "w": 78, "h": 63 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 385, "y": 212, "w": 79, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 17, "w": 79, "h": 64 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 213, "y": 207, "w": 79, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 17, "w": 79, "h": 64 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 156, "y": 67, "w": 79, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 17, "w": 79, "h": 67 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 78, "y": 67, "w": 78, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 16, "w": 78, "h": 68 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 472, "y": 0, "w": 75, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 13, "w": 75, "h": 71 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 0, "y": 135, "w": 70, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 10, "w": 70, "h": 74 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 0, "y": 288, "w": 64, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 16, "y": 7, "w": 64, "h": 77 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 504, "y": 359, "w": 60, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 4, "w": 60, "h": 80 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 369, "y": 276, "w": 60, "h": 83 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 1, "w": 60, "h": 83 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 64, "y": 213, "w": 60, "h": 84 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 0, "w": 60, "h": 84 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 466, "y": 139, "w": 62, "h": 83 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 1, "w": 62, "h": 83 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 0, "y": 209, "w": 64, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 19, "y": 5, "w": 64, "h": 79 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 236, "y": 134, "w": 71, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 11, "w": 71, "h": 73 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 136, "y": 199, "w": 77, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 18, "w": 77, "h": 66 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 156, "y": 134, "w": 80, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 19, "w": 80, "h": 65 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 315, "y": 73, "w": 80, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 19, "w": 80, "h": 65 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 385, "y": 147, "w": 79, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 19, "w": 79, "h": 65 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 307, "y": 204, "w": 78, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 19, "w": 78, "h": 65 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 429, "y": 288, "w": 76, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 19, "w": 76, "h": 65 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 142, "y": 335, "w": 75, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 19, "w": 75, "h": 65 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 429, "y": 353, "w": 75, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 19, "w": 75, "h": 65 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 464, "y": 222, "w": 76, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 18, "w": 76, "h": 66 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 307, "y": 138, "w": 78, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 18, "w": 78, "h": 66 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 235, "y": 68, "w": 80, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 18, "w": 80, "h": 66 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 82, "y": 0, "w": 82, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 17, "w": 82, "h": 67 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0088.png",
+    "frame": { "x": 0, "y": 0, "w": 82, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 17, "w": 82, "h": 67 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0089.png",
+    "frame": { "x": 164, "y": 0, "w": 81, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 17, "w": 81, "h": 67 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0090.png",
+    "frame": { "x": 245, "y": 0, "w": 79, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 16, "w": 79, "h": 68 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0091.png",
+    "frame": { "x": 0, "y": 67, "w": 78, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 16, "w": 78, "h": 68 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0092.png",
+    "frame": { "x": 466, "y": 71, "w": 77, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 16, "w": 77, "h": 68 },
+    "sourceSize": { "w": 84, "h": 84 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.13-x64",
+  "image": "730.png",
+  "format": "I8",
+  "size": { "w": 574, "h": 495 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/shiny/730.png b/public/images/pokemon/exp/back/shiny/730.png
index 1335419944f..413702c3bfd 100644
Binary files a/public/images/pokemon/exp/back/shiny/730.png and b/public/images/pokemon/exp/back/shiny/730.png differ
diff --git a/public/images/pokemon/exp/back/shiny/746-school.json b/public/images/pokemon/exp/back/shiny/746-school.json
index ed524e1a4e2..85063ecea1f 100644
--- a/public/images/pokemon/exp/back/shiny/746-school.json
+++ b/public/images/pokemon/exp/back/shiny/746-school.json
@@ -1,230 +1,191 @@
-{
-	"textures": [
-		{
-			"image": "746-school.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 261,
-				"h": 261
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 97,
-						"h": 84
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 97,
-						"h": 80
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 97,
-						"h": 80
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 97,
-						"h": 84
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 96,
-						"h": 81
-					},
-					"frame": {
-						"x": 97,
-						"y": 0,
-						"w": 96,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 97,
-						"h": 84
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 96,
-						"h": 81
-					},
-					"frame": {
-						"x": 97,
-						"y": 0,
-						"w": 96,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 97,
-						"h": 84
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 93,
-						"h": 80
-					},
-					"frame": {
-						"x": 0,
-						"y": 80,
-						"w": 93,
-						"h": 80
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 97,
-						"h": 84
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 93,
-						"h": 80
-					},
-					"frame": {
-						"x": 0,
-						"y": 80,
-						"w": 93,
-						"h": 80
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 97,
-						"h": 84
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 5,
-						"w": 87,
-						"h": 79
-					},
-					"frame": {
-						"x": 0,
-						"y": 160,
-						"w": 87,
-						"h": 79
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 97,
-						"h": 84
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 5,
-						"w": 87,
-						"h": 79
-					},
-					"frame": {
-						"x": 87,
-						"y": 160,
-						"w": 87,
-						"h": 79
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 97,
-						"h": 84
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 89,
-						"h": 78
-					},
-					"frame": {
-						"x": 93,
-						"y": 81,
-						"w": 89,
-						"h": 78
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 97,
-						"h": 84
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 89,
-						"h": 78
-					},
-					"frame": {
-						"x": 93,
-						"y": 81,
-						"w": 89,
-						"h": 78
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 97,
-						"h": 84
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 87,
-						"h": 77
-					},
-					"frame": {
-						"x": 174,
-						"y": 159,
-						"w": 87,
-						"h": 77
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:b6f5edcb419173bceb1876532c1f18db:d88467b51af7d786b06e3b5b9daaa4e3:10f3c9d1f1118f8f9f6e40f37a0eb499$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 278, "y": 205, "w": 96, "h": 97 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 7, "w": 96, "h": 97 },
+    "sourceSize": { "w": 100, "h": 111 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 287, "y": 107, "w": 96, "h": 98 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 6, "w": 96, "h": 98 },
+    "sourceSize": { "w": 100, "h": 111 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 94, "y": 106, "w": 94, "h": 100 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 6, "w": 94, "h": 100 },
+    "sourceSize": { "w": 100, "h": 111 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 93, "y": 206, "w": 93, "h": 99 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 6, "w": 93, "h": 99 },
+    "sourceSize": { "w": 100, "h": 111 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 0, "y": 103, "w": 94, "h": 102 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 94, "h": 102 },
+    "sourceSize": { "w": 100, "h": 111 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 188, "y": 202, "w": 90, "h": 104 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 5, "w": 90, "h": 104 },
+    "sourceSize": { "w": 100, "h": 111 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 282, "y": 0, "w": 92, "h": 105 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 92, "h": 105 },
+    "sourceSize": { "w": 100, "h": 111 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 374, "y": 0, "w": 90, "h": 107 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 4, "w": 90, "h": 107 },
+    "sourceSize": { "w": 100, "h": 111 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 96, "y": 0, "w": 93, "h": 106 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 93, "h": 106 },
+    "sourceSize": { "w": 100, "h": 111 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 189, "y": 0, "w": 93, "h": 105 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 93, "h": 105 },
+    "sourceSize": { "w": 100, "h": 111 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 0, "y": 0, "w": 96, "h": 103 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 96, "h": 103 },
+    "sourceSize": { "w": 100, "h": 111 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 0, "y": 205, "w": 93, "h": 100 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 93, "h": 100 },
+    "sourceSize": { "w": 100, "h": 111 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 383, "y": 107, "w": 96, "h": 98 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 96, "h": 98 },
+    "sourceSize": { "w": 100, "h": 111 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 278, "y": 302, "w": 95, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 95, "h": 96 },
+    "sourceSize": { "w": 100, "h": 111 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 95, "y": 306, "w": 97, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 97, "h": 94 },
+    "sourceSize": { "w": 100, "h": 111 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 374, "y": 300, "w": 98, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 98, "h": 94 },
+    "sourceSize": { "w": 100, "h": 111 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 0, "y": 305, "w": 95, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 95, "h": 96 },
+    "sourceSize": { "w": 100, "h": 111 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 374, "y": 205, "w": 97, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 97, "h": 95 },
+    "sourceSize": { "w": 100, "h": 111 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 373, "y": 394, "w": 94, "h": 97 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 94, "h": 97 },
+    "sourceSize": { "w": 100, "h": 111 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 189, "y": 105, "w": 98, "h": 97 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 98, "h": 97 },
+    "sourceSize": { "w": 100, "h": 111 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.13-x64",
+  "image": "746-school.png",
+  "format": "I8",
+  "size": { "w": 479, "h": 491 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/shiny/746-school.png b/public/images/pokemon/exp/back/shiny/746-school.png
index 3d4af95cec3..2899d209989 100644
Binary files a/public/images/pokemon/exp/back/shiny/746-school.png and b/public/images/pokemon/exp/back/shiny/746-school.png differ
diff --git a/public/images/pokemon/exp/back/shiny/746.json b/public/images/pokemon/exp/back/shiny/746.json
index 97967ad0483..cf52bbd9a97 100644
--- a/public/images/pokemon/exp/back/shiny/746.json
+++ b/public/images/pokemon/exp/back/shiny/746.json
@@ -1,1490 +1,641 @@
-{
-	"textures": [
-		{
-			"image": "746.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 122,
-				"h": 122
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 38,
-						"h": 25
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 38,
-						"h": 25
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 38,
-						"h": 25
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 38,
-						"h": 25
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 38,
-						"h": 25
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 38,
-						"h": 25
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 38,
-						"h": 25
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 38,
-						"h": 25
-					}
-				},
-				{
-					"filename": "0025.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 38,
-						"h": 25
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 38,
-						"h": 25
-					}
-				},
-				{
-					"filename": "0027.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 38,
-						"h": 25
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 38,
-						"h": 25
-					}
-				},
-				{
-					"filename": "0033.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 38,
-						"h": 25
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 38,
-						"h": 25
-					}
-				},
-				{
-					"filename": "0035.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 38,
-						"h": 25
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 38,
-						"h": 25
-					}
-				},
-				{
-					"filename": "0043.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 38,
-						"h": 25
-					},
-					"frame": {
-						"x": 0,
-						"y": 25,
-						"w": 38,
-						"h": 25
-					}
-				},
-				{
-					"filename": "0045.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 38,
-						"h": 25
-					},
-					"frame": {
-						"x": 0,
-						"y": 25,
-						"w": 38,
-						"h": 25
-					}
-				},
-				{
-					"filename": "0051.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 38,
-						"h": 25
-					},
-					"frame": {
-						"x": 0,
-						"y": 25,
-						"w": 38,
-						"h": 25
-					}
-				},
-				{
-					"filename": "0053.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 38,
-						"h": 25
-					},
-					"frame": {
-						"x": 0,
-						"y": 25,
-						"w": 38,
-						"h": 25
-					}
-				},
-				{
-					"filename": "0059.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 38,
-						"h": 25
-					},
-					"frame": {
-						"x": 0,
-						"y": 25,
-						"w": 38,
-						"h": 25
-					}
-				},
-				{
-					"filename": "0061.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 38,
-						"h": 25
-					},
-					"frame": {
-						"x": 0,
-						"y": 25,
-						"w": 38,
-						"h": 25
-					}
-				},
-				{
-					"filename": "0067.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 38,
-						"h": 25
-					},
-					"frame": {
-						"x": 0,
-						"y": 25,
-						"w": 38,
-						"h": 25
-					}
-				},
-				{
-					"filename": "0069.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 38,
-						"h": 25
-					},
-					"frame": {
-						"x": 0,
-						"y": 25,
-						"w": 38,
-						"h": 25
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 38,
-						"h": 24
-					},
-					"frame": {
-						"x": 0,
-						"y": 50,
-						"w": 38,
-						"h": 24
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 38,
-						"h": 24
-					},
-					"frame": {
-						"x": 0,
-						"y": 50,
-						"w": 38,
-						"h": 24
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 38,
-						"h": 24
-					},
-					"frame": {
-						"x": 0,
-						"y": 50,
-						"w": 38,
-						"h": 24
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 38,
-						"h": 24
-					},
-					"frame": {
-						"x": 0,
-						"y": 50,
-						"w": 38,
-						"h": 24
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 38,
-						"h": 24
-					},
-					"frame": {
-						"x": 0,
-						"y": 50,
-						"w": 38,
-						"h": 24
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 38,
-						"h": 24
-					},
-					"frame": {
-						"x": 0,
-						"y": 50,
-						"w": 38,
-						"h": 24
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 38,
-						"h": 24
-					},
-					"frame": {
-						"x": 0,
-						"y": 74,
-						"w": 38,
-						"h": 24
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 38,
-						"h": 24
-					},
-					"frame": {
-						"x": 0,
-						"y": 74,
-						"w": 38,
-						"h": 24
-					}
-				},
-				{
-					"filename": "0029.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 38,
-						"h": 24
-					},
-					"frame": {
-						"x": 0,
-						"y": 74,
-						"w": 38,
-						"h": 24
-					}
-				},
-				{
-					"filename": "0031.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 38,
-						"h": 24
-					},
-					"frame": {
-						"x": 0,
-						"y": 74,
-						"w": 38,
-						"h": 24
-					}
-				},
-				{
-					"filename": "0037.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 38,
-						"h": 24
-					},
-					"frame": {
-						"x": 0,
-						"y": 98,
-						"w": 38,
-						"h": 24
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 35,
-						"h": 25
-					},
-					"frame": {
-						"x": 38,
-						"y": 0,
-						"w": 35,
-						"h": 25
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 35,
-						"h": 25
-					},
-					"frame": {
-						"x": 38,
-						"y": 0,
-						"w": 35,
-						"h": 25
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 35,
-						"h": 25
-					},
-					"frame": {
-						"x": 38,
-						"y": 0,
-						"w": 35,
-						"h": 25
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 35,
-						"h": 25
-					},
-					"frame": {
-						"x": 38,
-						"y": 0,
-						"w": 35,
-						"h": 25
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 35,
-						"h": 25
-					},
-					"frame": {
-						"x": 38,
-						"y": 0,
-						"w": 35,
-						"h": 25
-					}
-				},
-				{
-					"filename": "0026.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 35,
-						"h": 25
-					},
-					"frame": {
-						"x": 38,
-						"y": 0,
-						"w": 35,
-						"h": 25
-					}
-				},
-				{
-					"filename": "0034.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 35,
-						"h": 25
-					},
-					"frame": {
-						"x": 38,
-						"y": 0,
-						"w": 35,
-						"h": 25
-					}
-				},
-				{
-					"filename": "0036.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 35,
-						"h": 25
-					},
-					"frame": {
-						"x": 38,
-						"y": 0,
-						"w": 35,
-						"h": 25
-					}
-				},
-				{
-					"filename": "0042.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 35,
-						"h": 25
-					},
-					"frame": {
-						"x": 38,
-						"y": 25,
-						"w": 35,
-						"h": 25
-					}
-				},
-				{
-					"filename": "0044.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 35,
-						"h": 25
-					},
-					"frame": {
-						"x": 38,
-						"y": 25,
-						"w": 35,
-						"h": 25
-					}
-				},
-				{
-					"filename": "0052.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 35,
-						"h": 25
-					},
-					"frame": {
-						"x": 38,
-						"y": 25,
-						"w": 35,
-						"h": 25
-					}
-				},
-				{
-					"filename": "0058.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 35,
-						"h": 25
-					},
-					"frame": {
-						"x": 38,
-						"y": 25,
-						"w": 35,
-						"h": 25
-					}
-				},
-				{
-					"filename": "0060.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 35,
-						"h": 25
-					},
-					"frame": {
-						"x": 38,
-						"y": 25,
-						"w": 35,
-						"h": 25
-					}
-				},
-				{
-					"filename": "0068.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 35,
-						"h": 25
-					},
-					"frame": {
-						"x": 38,
-						"y": 25,
-						"w": 35,
-						"h": 25
-					}
-				},
-				{
-					"filename": "0039.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 38,
-						"h": 24
-					},
-					"frame": {
-						"x": 38,
-						"y": 50,
-						"w": 38,
-						"h": 24
-					}
-				},
-				{
-					"filename": "0041.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 38,
-						"h": 24
-					},
-					"frame": {
-						"x": 38,
-						"y": 50,
-						"w": 38,
-						"h": 24
-					}
-				},
-				{
-					"filename": "0055.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 38,
-						"h": 24
-					},
-					"frame": {
-						"x": 38,
-						"y": 50,
-						"w": 38,
-						"h": 24
-					}
-				},
-				{
-					"filename": "0057.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 38,
-						"h": 24
-					},
-					"frame": {
-						"x": 38,
-						"y": 50,
-						"w": 38,
-						"h": 24
-					}
-				},
-				{
-					"filename": "0070.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 35,
-						"h": 25
-					},
-					"frame": {
-						"x": 73,
-						"y": 0,
-						"w": 35,
-						"h": 25
-					}
-				},
-				{
-					"filename": "0047.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 38,
-						"h": 24
-					},
-					"frame": {
-						"x": 73,
-						"y": 25,
-						"w": 38,
-						"h": 24
-					}
-				},
-				{
-					"filename": "0049.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 38,
-						"h": 24
-					},
-					"frame": {
-						"x": 73,
-						"y": 25,
-						"w": 38,
-						"h": 24
-					}
-				},
-				{
-					"filename": "0063.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 38,
-						"h": 24
-					},
-					"frame": {
-						"x": 73,
-						"y": 25,
-						"w": 38,
-						"h": 24
-					}
-				},
-				{
-					"filename": "0065.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 38,
-						"h": 24
-					},
-					"frame": {
-						"x": 73,
-						"y": 25,
-						"w": 38,
-						"h": 24
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 35,
-						"h": 24
-					},
-					"frame": {
-						"x": 76,
-						"y": 49,
-						"w": 35,
-						"h": 24
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 35,
-						"h": 24
-					},
-					"frame": {
-						"x": 76,
-						"y": 49,
-						"w": 35,
-						"h": 24
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 35,
-						"h": 24
-					},
-					"frame": {
-						"x": 76,
-						"y": 49,
-						"w": 35,
-						"h": 24
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 35,
-						"h": 24
-					},
-					"frame": {
-						"x": 76,
-						"y": 49,
-						"w": 35,
-						"h": 24
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 6,
-						"w": 35,
-						"h": 24
-					},
-					"frame": {
-						"x": 76,
-						"y": 73,
-						"w": 35,
-						"h": 24
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 6,
-						"w": 35,
-						"h": 24
-					},
-					"frame": {
-						"x": 76,
-						"y": 73,
-						"w": 35,
-						"h": 24
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 6,
-						"w": 35,
-						"h": 24
-					},
-					"frame": {
-						"x": 76,
-						"y": 73,
-						"w": 35,
-						"h": 24
-					}
-				},
-				{
-					"filename": "0028.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 6,
-						"w": 35,
-						"h": 24
-					},
-					"frame": {
-						"x": 76,
-						"y": 73,
-						"w": 35,
-						"h": 24
-					}
-				},
-				{
-					"filename": "0030.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 6,
-						"w": 35,
-						"h": 24
-					},
-					"frame": {
-						"x": 76,
-						"y": 73,
-						"w": 35,
-						"h": 24
-					}
-				},
-				{
-					"filename": "0032.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 6,
-						"w": 35,
-						"h": 24
-					},
-					"frame": {
-						"x": 76,
-						"y": 73,
-						"w": 35,
-						"h": 24
-					}
-				},
-				{
-					"filename": "0038.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 35,
-						"h": 24
-					},
-					"frame": {
-						"x": 38,
-						"y": 74,
-						"w": 35,
-						"h": 24
-					}
-				},
-				{
-					"filename": "0040.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 35,
-						"h": 24
-					},
-					"frame": {
-						"x": 38,
-						"y": 74,
-						"w": 35,
-						"h": 24
-					}
-				},
-				{
-					"filename": "0054.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 35,
-						"h": 24
-					},
-					"frame": {
-						"x": 38,
-						"y": 74,
-						"w": 35,
-						"h": 24
-					}
-				},
-				{
-					"filename": "0056.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 35,
-						"h": 24
-					},
-					"frame": {
-						"x": 38,
-						"y": 74,
-						"w": 35,
-						"h": 24
-					}
-				},
-				{
-					"filename": "0046.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 6,
-						"w": 35,
-						"h": 24
-					},
-					"frame": {
-						"x": 73,
-						"y": 97,
-						"w": 35,
-						"h": 24
-					}
-				},
-				{
-					"filename": "0048.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 6,
-						"w": 35,
-						"h": 24
-					},
-					"frame": {
-						"x": 73,
-						"y": 97,
-						"w": 35,
-						"h": 24
-					}
-				},
-				{
-					"filename": "0050.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 6,
-						"w": 35,
-						"h": 24
-					},
-					"frame": {
-						"x": 73,
-						"y": 97,
-						"w": 35,
-						"h": 24
-					}
-				},
-				{
-					"filename": "0062.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 6,
-						"w": 35,
-						"h": 24
-					},
-					"frame": {
-						"x": 73,
-						"y": 97,
-						"w": 35,
-						"h": 24
-					}
-				},
-				{
-					"filename": "0064.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 6,
-						"w": 35,
-						"h": 24
-					},
-					"frame": {
-						"x": 73,
-						"y": 97,
-						"w": 35,
-						"h": 24
-					}
-				},
-				{
-					"filename": "0066.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 6,
-						"w": 35,
-						"h": 24
-					},
-					"frame": {
-						"x": 73,
-						"y": 97,
-						"w": 35,
-						"h": 24
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:123126a79a6088db4c7fde804f3b1df6:3efa447d1fe4461ae2ff382f6b0d7fb8:1a4f7e535d823202c4828f963d5b4404$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 0, "y": 0, "w": 38, "h": 23 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 38, "w": 38, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 0, "y": 23, "w": 34, "h": 23 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 30, "y": 38, "w": 34, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 0, "y": 0, "w": 38, "h": 23 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 38, "w": 38, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 0, "y": 23, "w": 34, "h": 23 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 30, "y": 38, "w": 34, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 0, "y": 0, "w": 38, "h": 23 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 38, "w": 38, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 0, "y": 23, "w": 34, "h": 23 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 30, "y": 39, "w": 34, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 0, "y": 0, "w": 38, "h": 23 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 41, "w": 38, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 0, "y": 23, "w": 34, "h": 23 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 30, "y": 43, "w": 34, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 0, "y": 0, "w": 38, "h": 23 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 44, "w": 38, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 0, "y": 23, "w": 34, "h": 23 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 30, "y": 45, "w": 34, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 0, "y": 0, "w": 38, "h": 23 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 45, "w": 38, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 0, "y": 23, "w": 34, "h": 23 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 30, "y": 45, "w": 34, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 0, "y": 0, "w": 38, "h": 23 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 45, "w": 38, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 0, "y": 23, "w": 34, "h": 23 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 30, "y": 45, "w": 34, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 0, "y": 0, "w": 38, "h": 23 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 44, "w": 38, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 0, "y": 23, "w": 34, "h": 23 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 30, "y": 43, "w": 34, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 0, "y": 0, "w": 38, "h": 23 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 41, "w": 38, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 0, "y": 23, "w": 34, "h": 23 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 30, "y": 39, "w": 34, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 0, "y": 0, "w": 38, "h": 23 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 38, "w": 38, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 0, "y": 23, "w": 34, "h": 23 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 30, "y": 38, "w": 34, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 0, "y": 0, "w": 38, "h": 23 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 38, "w": 38, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 0, "y": 23, "w": 34, "h": 23 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 30, "y": 38, "w": 34, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 0, "y": 0, "w": 38, "h": 23 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 38, "w": 38, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 0, "y": 23, "w": 34, "h": 23 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 30, "y": 39, "w": 34, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 0, "y": 0, "w": 38, "h": 23 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 41, "w": 38, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 0, "y": 23, "w": 34, "h": 23 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 30, "y": 43, "w": 34, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 0, "y": 0, "w": 38, "h": 23 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 44, "w": 38, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 0, "y": 23, "w": 34, "h": 23 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 30, "y": 45, "w": 34, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 0, "y": 0, "w": 38, "h": 23 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 45, "w": 38, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 0, "y": 23, "w": 34, "h": 23 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 30, "y": 45, "w": 34, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 0, "y": 0, "w": 38, "h": 23 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 45, "w": 38, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 0, "y": 23, "w": 34, "h": 23 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 30, "y": 45, "w": 34, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 0, "y": 0, "w": 38, "h": 23 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 44, "w": 38, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 0, "y": 23, "w": 34, "h": 23 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 30, "y": 43, "w": 34, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 0, "y": 0, "w": 38, "h": 23 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 41, "w": 38, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 0, "y": 23, "w": 34, "h": 23 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 30, "y": 39, "w": 34, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 38, "y": 0, "w": 38, "h": 23 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 38, "w": 38, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 34, "y": 23, "w": 34, "h": 23 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 30, "y": 38, "w": 34, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 76, "y": 0, "w": 38, "h": 23 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 38, "w": 38, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 34, "y": 23, "w": 34, "h": 23 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 30, "y": 38, "w": 34, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 76, "y": 0, "w": 38, "h": 23 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 38, "w": 38, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 34, "y": 23, "w": 34, "h": 23 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 30, "y": 39, "w": 34, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 76, "y": 0, "w": 38, "h": 23 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 41, "w": 38, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 34, "y": 23, "w": 34, "h": 23 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 30, "y": 43, "w": 34, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 76, "y": 0, "w": 38, "h": 23 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 44, "w": 38, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 34, "y": 23, "w": 34, "h": 23 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 30, "y": 45, "w": 34, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 76, "y": 0, "w": 38, "h": 23 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 45, "w": 38, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 34, "y": 23, "w": 34, "h": 23 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 30, "y": 45, "w": 34, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 76, "y": 0, "w": 38, "h": 23 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 45, "w": 38, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 34, "y": 23, "w": 34, "h": 23 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 30, "y": 45, "w": 34, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 76, "y": 0, "w": 38, "h": 23 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 44, "w": 38, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 34, "y": 23, "w": 34, "h": 23 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 30, "y": 43, "w": 34, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 76, "y": 0, "w": 38, "h": 23 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 41, "w": 38, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 34, "y": 23, "w": 34, "h": 23 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 30, "y": 38, "w": 34, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 76, "y": 0, "w": 38, "h": 23 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 38, "w": 38, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 34, "y": 23, "w": 34, "h": 23 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 30, "y": 38, "w": 34, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 76, "y": 0, "w": 38, "h": 23 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 38, "w": 38, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 34, "y": 23, "w": 34, "h": 23 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 30, "y": 39, "w": 34, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 76, "y": 0, "w": 38, "h": 23 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 41, "w": 38, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 34, "y": 23, "w": 34, "h": 23 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 30, "y": 43, "w": 34, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 76, "y": 0, "w": 38, "h": 23 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 44, "w": 38, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 34, "y": 23, "w": 34, "h": 23 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 30, "y": 45, "w": 34, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 76, "y": 0, "w": 38, "h": 23 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 45, "w": 38, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 34, "y": 23, "w": 34, "h": 23 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 30, "y": 45, "w": 34, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 76, "y": 0, "w": 38, "h": 23 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 45, "w": 38, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 34, "y": 23, "w": 34, "h": 23 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 30, "y": 45, "w": 34, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 76, "y": 0, "w": 38, "h": 23 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 44, "w": 38, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 34, "y": 23, "w": 34, "h": 23 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 30, "y": 43, "w": 34, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 76, "y": 0, "w": 38, "h": 23 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 41, "w": 38, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 68, "y": 23, "w": 34, "h": 23 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 30, "y": 39, "w": 34, "h": 23 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 110
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.13-x64",
+  "image": "746.png",
+  "format": "I8",
+  "size": { "w": 114, "h": 46 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/shiny/746.png b/public/images/pokemon/exp/back/shiny/746.png
index 5206ceb9ff6..5ce4bdc8bcd 100644
Binary files a/public/images/pokemon/exp/back/shiny/746.png and b/public/images/pokemon/exp/back/shiny/746.png differ
diff --git a/public/images/pokemon/exp/back/shiny/749.json b/public/images/pokemon/exp/back/shiny/749.json
index f243011605c..40f3f03247d 100644
--- a/public/images/pokemon/exp/back/shiny/749.json
+++ b/public/images/pokemon/exp/back/shiny/749.json
@@ -1,230 +1,1037 @@
-{
-	"textures": [
-		{
-			"image": "749.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 171,
-				"h": 171
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 59,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 59,
-						"h": 66
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 59,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 59,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 59,
-						"h": 66
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 59,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 59,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 58,
-						"h": 66
-					},
-					"frame": {
-						"x": 59,
-						"y": 0,
-						"w": 58,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 59,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 58,
-						"h": 66
-					},
-					"frame": {
-						"x": 59,
-						"y": 0,
-						"w": 58,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 59,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 54,
-						"h": 66
-					},
-					"frame": {
-						"x": 117,
-						"y": 0,
-						"w": 54,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 59,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 59,
-						"h": 65
-					},
-					"frame": {
-						"x": 0,
-						"y": 66,
-						"w": 59,
-						"h": 65
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 59,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 56,
-						"h": 66
-					},
-					"frame": {
-						"x": 59,
-						"y": 66,
-						"w": 56,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 59,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 56,
-						"h": 66
-					},
-					"frame": {
-						"x": 59,
-						"y": 66,
-						"w": 56,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 59,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 55,
-						"h": 66
-					},
-					"frame": {
-						"x": 115,
-						"y": 66,
-						"w": 55,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 59,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 55,
-						"h": 66
-					},
-					"frame": {
-						"x": 115,
-						"y": 66,
-						"w": 55,
-						"h": 66
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:9d7331bd2d0e629e754348f158c3711c:edb98ecce518c521f5c31bb31243f866:d52e05c524384ef985e6339a08b2f938$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 0, "y": 287, "w": 46, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 11, "w": 46, "h": 56 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 0, "y": 174, "w": 47, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 11, "w": 47, "h": 56 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 47, "y": 174, "w": 47, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 11, "w": 47, "h": 56 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 145, "y": 67, "w": 49, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 12, "w": 49, "h": 55 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 242, "y": 121, "w": 49, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 13, "w": 49, "h": 54 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 45, "y": 120, "w": 49, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 13, "w": 49, "h": 54 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 266, "y": 65, "w": 49, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 49, "h": 56 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 194, "y": 67, "w": 48, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 48, "h": 56 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 0, "y": 230, "w": 46, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 10, "w": 46, "h": 57 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 46, "y": 230, "w": 46, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 10, "w": 46, "h": 57 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 138, "y": 232, "w": 45, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 9, "w": 45, "h": 58 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 44, "y": 343, "w": 44, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 10, "w": 44, "h": 57 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 0, "y": 343, "w": 44, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 10, "w": 44, "h": 57 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 137, "y": 290, "w": 45, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 11, "w": 45, "h": 56 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 0, "y": 287, "w": 46, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 11, "w": 46, "h": 56 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 0, "y": 174, "w": 47, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 11, "w": 47, "h": 56 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 47, "y": 174, "w": 47, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 11, "w": 47, "h": 56 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 145, "y": 67, "w": 49, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 12, "w": 49, "h": 55 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 242, "y": 121, "w": 49, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 13, "w": 49, "h": 54 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 45, "y": 120, "w": 49, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 13, "w": 49, "h": 54 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 266, "y": 65, "w": 49, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 49, "h": 56 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 194, "y": 67, "w": 48, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 48, "h": 56 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 0, "y": 230, "w": 46, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 10, "w": 46, "h": 57 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 46, "y": 230, "w": 46, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 10, "w": 46, "h": 57 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 138, "y": 232, "w": 45, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 9, "w": 45, "h": 58 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 44, "y": 343, "w": 44, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 10, "w": 44, "h": 57 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 0, "y": 343, "w": 44, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 10, "w": 44, "h": 57 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 137, "y": 290, "w": 45, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 11, "w": 45, "h": 56 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 0, "y": 287, "w": 46, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 11, "w": 46, "h": 56 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 224, "y": 343, "w": 46, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 13, "w": 46, "h": 54 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 88, "y": 344, "w": 46, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 14, "w": 46, "h": 53 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 233, "y": 231, "w": 45, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 9, "w": 45, "h": 58 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 278, "y": 244, "w": 43, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 43, "h": 60 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 182, "y": 341, "w": 42, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 42, "h": 60 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 92, "y": 287, "w": 45, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 45, "h": 57 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 183, "y": 288, "w": 48, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 48, "h": 53 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 231, "y": 289, "w": 47, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 10, "w": 47, "h": 54 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 183, "y": 234, "w": 48, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 13, "w": 48, "h": 54 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 278, "y": 304, "w": 47, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 13, "w": 47, "h": 54 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 236, "y": 175, "w": 47, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 11, "w": 47, "h": 56 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 0, "y": 287, "w": 46, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 11, "w": 46, "h": 56 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 0, "y": 174, "w": 47, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 11, "w": 47, "h": 56 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 47, "y": 174, "w": 47, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 11, "w": 47, "h": 56 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 145, "y": 67, "w": 49, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 12, "w": 49, "h": 55 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 242, "y": 121, "w": 49, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 13, "w": 49, "h": 54 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 45, "y": 120, "w": 49, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 13, "w": 49, "h": 54 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 266, "y": 65, "w": 49, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 49, "h": 56 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 194, "y": 67, "w": 48, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 48, "h": 56 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 0, "y": 230, "w": 46, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 10, "w": 46, "h": 57 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 46, "y": 230, "w": 46, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 10, "w": 46, "h": 57 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 138, "y": 232, "w": 45, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 9, "w": 45, "h": 58 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 44, "y": 343, "w": 44, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 10, "w": 44, "h": 57 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 0, "y": 343, "w": 44, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 10, "w": 44, "h": 57 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 137, "y": 290, "w": 45, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 11, "w": 45, "h": 56 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 0, "y": 287, "w": 46, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 11, "w": 46, "h": 56 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 224, "y": 343, "w": 46, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 13, "w": 46, "h": 54 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 88, "y": 344, "w": 46, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 14, "w": 46, "h": 53 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 233, "y": 231, "w": 45, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 9, "w": 45, "h": 58 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 278, "y": 244, "w": 43, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 43, "h": 60 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 182, "y": 341, "w": 42, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 42, "h": 60 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 92, "y": 287, "w": 45, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 45, "h": 57 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 183, "y": 288, "w": 48, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 48, "h": 53 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 231, "y": 289, "w": 47, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 10, "w": 47, "h": 54 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 183, "y": 234, "w": 48, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 13, "w": 48, "h": 54 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 278, "y": 304, "w": 47, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 13, "w": 47, "h": 54 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 236, "y": 175, "w": 47, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 11, "w": 47, "h": 56 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 0, "y": 287, "w": 46, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 11, "w": 46, "h": 56 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 224, "y": 343, "w": 46, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 13, "w": 46, "h": 54 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 88, "y": 344, "w": 46, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 14, "w": 46, "h": 53 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 233, "y": 231, "w": 45, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 9, "w": 45, "h": 58 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 278, "y": 244, "w": 43, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 43, "h": 60 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 182, "y": 341, "w": 42, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 42, "h": 60 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 92, "y": 287, "w": 45, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 45, "h": 57 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 183, "y": 288, "w": 48, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 48, "h": 53 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 231, "y": 289, "w": 47, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 10, "w": 47, "h": 54 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 183, "y": 234, "w": 48, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 13, "w": 48, "h": 54 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 278, "y": 304, "w": 47, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 13, "w": 47, "h": 54 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 236, "y": 175, "w": 47, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 11, "w": 47, "h": 56 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 0, "y": 287, "w": 46, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 11, "w": 46, "h": 56 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 0, "y": 174, "w": 47, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 11, "w": 47, "h": 56 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 47, "y": 174, "w": 47, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 11, "w": 47, "h": 56 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 145, "y": 67, "w": 49, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 12, "w": 49, "h": 55 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 242, "y": 121, "w": 49, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 13, "w": 49, "h": 54 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 45, "y": 120, "w": 49, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 13, "w": 49, "h": 54 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 266, "y": 65, "w": 49, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 49, "h": 56 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 194, "y": 67, "w": 48, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 48, "h": 56 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 0, "y": 230, "w": 46, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 10, "w": 46, "h": 57 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0088.png",
+    "frame": { "x": 46, "y": 230, "w": 46, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 10, "w": 46, "h": 57 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0089.png",
+    "frame": { "x": 138, "y": 232, "w": 45, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 9, "w": 45, "h": 58 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0090.png",
+    "frame": { "x": 44, "y": 343, "w": 44, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 10, "w": 44, "h": 57 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0091.png",
+    "frame": { "x": 0, "y": 343, "w": 44, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 10, "w": 44, "h": 57 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0092.png",
+    "frame": { "x": 137, "y": 290, "w": 45, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 11, "w": 45, "h": 56 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0093.png",
+    "frame": { "x": 46, "y": 287, "w": 46, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 11, "w": 46, "h": 56 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0094.png",
+    "frame": { "x": 139, "y": 176, "w": 47, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 11, "w": 47, "h": 56 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0095.png",
+    "frame": { "x": 188, "y": 123, "w": 48, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 12, "w": 48, "h": 55 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0096.png",
+    "frame": { "x": 139, "y": 122, "w": 49, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 13, "w": 49, "h": 54 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0097.png",
+    "frame": { "x": 94, "y": 66, "w": 51, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 14, "w": 51, "h": 53 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0098.png",
+    "frame": { "x": 45, "y": 63, "w": 49, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 10, "w": 49, "h": 57 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0099.png",
+    "frame": { "x": 309, "y": 0, "w": 47, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 8, "w": 47, "h": 59 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0100.png",
+    "frame": { "x": 92, "y": 0, "w": 47, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 47, "h": 61 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0101.png",
+    "frame": { "x": 45, "y": 0, "w": 47, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 47, "h": 63 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0102.png",
+    "frame": { "x": 224, "y": 0, "w": 42, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 42, "h": 67 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0103.png",
+    "frame": { "x": 291, "y": 122, "w": 40, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 40, "h": 66 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0104.png",
+    "frame": { "x": 182, "y": 0, "w": 42, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 42, "h": 67 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0105.png",
+    "frame": { "x": 0, "y": 0, "w": 45, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 45, "h": 66 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0106.png",
+    "frame": { "x": 139, "y": 0, "w": 43, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 43, "h": 66 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0107.png",
+    "frame": { "x": 266, "y": 0, "w": 43, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 43, "h": 65 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0108.png",
+    "frame": { "x": 315, "y": 59, "w": 42, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 42, "h": 63 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0109.png",
+    "frame": { "x": 0, "y": 66, "w": 45, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 7, "w": 45, "h": 60 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0110.png",
+    "frame": { "x": 94, "y": 119, "w": 45, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 8, "w": 45, "h": 59 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0111.png",
+    "frame": { "x": 92, "y": 230, "w": 46, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 10, "w": 46, "h": 57 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0112.png",
+    "frame": { "x": 186, "y": 178, "w": 47, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 11, "w": 47, "h": 56 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0113.png",
+    "frame": { "x": 283, "y": 188, "w": 47, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 11, "w": 47, "h": 56 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0114.png",
+    "frame": { "x": 0, "y": 287, "w": 46, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 11, "w": 46, "h": 56 },
+    "sourceSize": { "w": 53, "h": 67 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.13-x64",
+  "image": "749.png",
+  "format": "I8",
+  "size": { "w": 357, "h": 401 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/shiny/749.png b/public/images/pokemon/exp/back/shiny/749.png
index c657851e04b..63a7d57d28f 100644
Binary files a/public/images/pokemon/exp/back/shiny/749.png and b/public/images/pokemon/exp/back/shiny/749.png differ
diff --git a/public/images/pokemon/exp/back/shiny/750.json b/public/images/pokemon/exp/back/shiny/750.json
index 922dde20472..e4c7c035ff8 100644
--- a/public/images/pokemon/exp/back/shiny/750.json
+++ b/public/images/pokemon/exp/back/shiny/750.json
@@ -1,230 +1,929 @@
-{
-	"textures": [
-		{
-			"image": "750.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 253,
-				"h": 253
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 88,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 88,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 88,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 88,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 87,
-						"h": 71
-					},
-					"frame": {
-						"x": 88,
-						"y": 0,
-						"w": 87,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 88,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 87,
-						"h": 71
-					},
-					"frame": {
-						"x": 0,
-						"y": 69,
-						"w": 87,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 88,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 86,
-						"h": 72
-					},
-					"frame": {
-						"x": 87,
-						"y": 71,
-						"w": 86,
-						"h": 72
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 88,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 79,
-						"h": 73
-					},
-					"frame": {
-						"x": 173,
-						"y": 71,
-						"w": 79,
-						"h": 73
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 88,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 86,
-						"h": 72
-					},
-					"frame": {
-						"x": 0,
-						"y": 140,
-						"w": 86,
-						"h": 72
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 88,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 83,
-						"h": 73
-					},
-					"frame": {
-						"x": 86,
-						"y": 143,
-						"w": 83,
-						"h": 73
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 88,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 83,
-						"h": 73
-					},
-					"frame": {
-						"x": 86,
-						"y": 143,
-						"w": 83,
-						"h": 73
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 88,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 84,
-						"h": 73
-					},
-					"frame": {
-						"x": 169,
-						"y": 144,
-						"w": 84,
-						"h": 73
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 88,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 84,
-						"h": 73
-					},
-					"frame": {
-						"x": 169,
-						"y": 144,
-						"w": 84,
-						"h": 73
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:51a6dc655f9c503ef0f1d2d873adf903:1fa68a8a88f7b5239ba7a91c9a1204c0:4ad6abb5f7a40182d2391bde900ad082$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 550, "y": 208, "w": 76, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 11, "w": 76, "h": 67 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 315, "y": 206, "w": 77, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 11, "w": 77, "h": 67 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 77, "y": 207, "w": 78, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 12, "w": 78, "h": 66 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 566, "y": 142, "w": 79, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 12, "w": 79, "h": 66 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 324, "y": 141, "w": 82, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 13, "w": 82, "h": 65 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 0, "y": 142, "w": 82, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 13, "w": 82, "h": 65 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 486, "y": 78, "w": 84, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 14, "w": 84, "h": 64 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 324, "y": 77, "w": 85, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 14, "w": 85, "h": 64 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 0, "y": 78, "w": 85, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 14, "w": 85, "h": 64 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 85, "y": 78, "w": 85, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 14, "w": 85, "h": 64 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 570, "y": 78, "w": 84, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 14, "w": 84, "h": 64 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 82, "y": 142, "w": 82, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 13, "w": 82, "h": 65 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 486, "y": 142, "w": 80, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 12, "w": 80, "h": 66 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 0, "y": 207, "w": 77, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 11, "w": 77, "h": 67 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 239, "y": 147, "w": 76, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 10, "w": 76, "h": 68 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 164, "y": 154, "w": 75, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 10, "w": 75, "h": 68 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 381, "y": 295, "w": 72, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 19, "y": 10, "w": 72, "h": 68 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 0, "y": 341, "w": 71, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 19, "y": 10, "w": 71, "h": 68 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 147, "y": 339, "w": 71, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 10, "w": 71, "h": 68 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 218, "y": 347, "w": 71, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 17, "y": 11, "w": 71, "h": 67 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 616, "y": 275, "w": 72, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 10, "w": 72, "h": 68 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 0, "y": 274, "w": 74, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 11, "w": 74, "h": 67 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 392, "y": 228, "w": 75, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 11, "w": 75, "h": 67 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 550, "y": 208, "w": 76, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 11, "w": 76, "h": 67 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 315, "y": 206, "w": 77, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 11, "w": 77, "h": 67 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 77, "y": 207, "w": 78, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 12, "w": 78, "h": 66 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 566, "y": 142, "w": 79, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 12, "w": 79, "h": 66 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 324, "y": 141, "w": 82, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 13, "w": 82, "h": 65 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 0, "y": 142, "w": 82, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 13, "w": 82, "h": 65 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 486, "y": 78, "w": 84, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 14, "w": 84, "h": 64 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 324, "y": 77, "w": 85, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 14, "w": 85, "h": 64 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 0, "y": 78, "w": 85, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 14, "w": 85, "h": 64 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 85, "y": 78, "w": 85, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 14, "w": 85, "h": 64 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 570, "y": 78, "w": 84, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 14, "w": 84, "h": 64 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 82, "y": 142, "w": 82, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 13, "w": 82, "h": 65 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 486, "y": 142, "w": 80, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 12, "w": 80, "h": 66 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 0, "y": 207, "w": 77, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 11, "w": 77, "h": 67 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 239, "y": 147, "w": 76, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 10, "w": 76, "h": 68 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 164, "y": 154, "w": 75, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 10, "w": 75, "h": 68 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 381, "y": 295, "w": 72, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 19, "y": 10, "w": 72, "h": 68 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 0, "y": 341, "w": 71, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 19, "y": 10, "w": 71, "h": 68 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 147, "y": 339, "w": 71, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 10, "w": 71, "h": 68 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 218, "y": 347, "w": 71, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 17, "y": 11, "w": 71, "h": 67 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 616, "y": 275, "w": 72, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 10, "w": 72, "h": 68 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 0, "y": 274, "w": 74, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 11, "w": 74, "h": 67 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 392, "y": 228, "w": 75, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 11, "w": 75, "h": 67 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 550, "y": 208, "w": 76, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 11, "w": 76, "h": 67 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 315, "y": 206, "w": 77, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 11, "w": 77, "h": 67 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 77, "y": 207, "w": 78, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 12, "w": 78, "h": 66 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 566, "y": 142, "w": 79, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 12, "w": 79, "h": 66 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 324, "y": 141, "w": 82, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 13, "w": 82, "h": 65 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 0, "y": 142, "w": 82, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 13, "w": 82, "h": 65 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 486, "y": 78, "w": 84, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 14, "w": 84, "h": 64 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 324, "y": 77, "w": 85, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 14, "w": 85, "h": 64 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 0, "y": 78, "w": 85, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 14, "w": 85, "h": 64 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 85, "y": 78, "w": 85, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 14, "w": 85, "h": 64 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 570, "y": 78, "w": 84, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 14, "w": 84, "h": 64 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 82, "y": 142, "w": 82, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 13, "w": 82, "h": 65 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 486, "y": 142, "w": 80, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 12, "w": 80, "h": 66 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 0, "y": 207, "w": 77, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 11, "w": 77, "h": 67 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 239, "y": 147, "w": 76, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 10, "w": 76, "h": 68 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 164, "y": 154, "w": 75, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 10, "w": 75, "h": 68 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 381, "y": 295, "w": 72, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 19, "y": 10, "w": 72, "h": 68 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 0, "y": 341, "w": 71, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 19, "y": 10, "w": 71, "h": 68 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 147, "y": 339, "w": 71, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 10, "w": 71, "h": 68 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 218, "y": 347, "w": 71, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 17, "y": 11, "w": 71, "h": 67 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 616, "y": 275, "w": 72, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 10, "w": 72, "h": 68 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 0, "y": 274, "w": 74, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 11, "w": 74, "h": 67 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 392, "y": 228, "w": 75, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 11, "w": 75, "h": 67 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 550, "y": 208, "w": 76, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 11, "w": 76, "h": 67 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 239, "y": 215, "w": 76, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 11, "w": 76, "h": 67 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 77, "y": 273, "w": 76, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 12, "w": 76, "h": 66 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 220, "y": 282, "w": 76, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 13, "w": 76, "h": 65 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 453, "y": 342, "w": 78, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 16, "w": 78, "h": 62 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 604, "y": 343, "w": 78, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 17, "w": 78, "h": 61 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 604, "y": 404, "w": 74, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 16, "y": 16, "w": 74, "h": 62 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 209, "y": 414, "w": 66, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 13, "w": 66, "h": 65 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 0, "y": 409, "w": 63, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 8, "w": 63, "h": 70 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 421, "y": 404, "w": 62, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 3, "w": 62, "h": 75 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 155, "y": 222, "w": 65, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 0, "w": 65, "h": 78 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 416, "y": 74, "w": 70, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 0, "w": 70, "h": 78 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 573, "y": 0, "w": 74, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 0, "w": 74, "h": 78 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 498, "y": 0, "w": 75, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 0, "w": 75, "h": 78 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 251, "y": 71, "w": 73, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 2, "w": 73, "h": 76 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 406, "y": 152, "w": 68, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 68, "h": 76 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 315, "y": 273, "w": 66, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 2, "w": 66, "h": 76 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 541, "y": 341, "w": 63, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 2, "w": 63, "h": 76 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0088.png",
+    "frame": { "x": 289, "y": 349, "w": 61, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 1, "w": 61, "h": 77 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0089.png",
+    "frame": { "x": 170, "y": 77, "w": 69, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 1, "w": 69, "h": 77 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0090.png",
+    "frame": { "x": 337, "y": 0, "w": 79, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 1, "w": 79, "h": 77 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0091.png",
+    "frame": { "x": 85, "y": 0, "w": 84, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 84, "h": 78 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0092.png",
+    "frame": { "x": 0, "y": 0, "w": 85, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 85, "h": 78 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0093.png",
+    "frame": { "x": 169, "y": 0, "w": 82, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 82, "h": 77 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0094.png",
+    "frame": { "x": 416, "y": 0, "w": 82, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 82, "h": 74 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0095.png",
+    "frame": { "x": 251, "y": 0, "w": 86, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 7, "w": 86, "h": 71 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0096.png",
+    "frame": { "x": 541, "y": 275, "w": 75, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 12, "w": 75, "h": 66 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0097.png",
+    "frame": { "x": 71, "y": 406, "w": 69, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 12, "w": 69, "h": 66 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0098.png",
+    "frame": { "x": 140, "y": 407, "w": 69, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 12, "w": 69, "h": 66 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0099.png",
+    "frame": { "x": 350, "y": 363, "w": 71, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 16, "y": 12, "w": 71, "h": 66 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0100.png",
+    "frame": { "x": 74, "y": 339, "w": 73, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 11, "w": 73, "h": 67 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0101.png",
+    "frame": { "x": 467, "y": 275, "w": 74, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 11, "w": 74, "h": 67 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0102.png",
+    "frame": { "x": 474, "y": 208, "w": 76, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 11, "w": 76, "h": 67 },
+    "sourceSize": { "w": 93, "h": 78 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.13-x64",
+  "image": "750.png",
+  "format": "I8",
+  "size": { "w": 688, "h": 479 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/shiny/750.png b/public/images/pokemon/exp/back/shiny/750.png
index 604c23c7289..d099dce5a5e 100644
Binary files a/public/images/pokemon/exp/back/shiny/750.png and b/public/images/pokemon/exp/back/shiny/750.png differ
diff --git a/public/images/pokemon/exp/back/shiny/780.json b/public/images/pokemon/exp/back/shiny/780.json
index 1232a2acd52..09dee76d75d 100644
--- a/public/images/pokemon/exp/back/shiny/780.json
+++ b/public/images/pokemon/exp/back/shiny/780.json
@@ -1,230 +1,884 @@
-{
-	"textures": [
-		{
-			"image": "780.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 183,
-				"h": 183
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 86,
-						"h": 62
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 86,
-						"h": 62
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 86,
-						"h": 62
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 86,
-						"h": 62
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 85,
-						"h": 62
-					},
-					"frame": {
-						"x": 0,
-						"y": 62,
-						"w": 85,
-						"h": 62
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 86,
-						"h": 62
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 85,
-						"h": 62
-					},
-					"frame": {
-						"x": 0,
-						"y": 62,
-						"w": 85,
-						"h": 62
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 86,
-						"h": 62
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 83,
-						"h": 62
-					},
-					"frame": {
-						"x": 85,
-						"y": 62,
-						"w": 83,
-						"h": 62
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 86,
-						"h": 62
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 83,
-						"h": 62
-					},
-					"frame": {
-						"x": 85,
-						"y": 62,
-						"w": 83,
-						"h": 62
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 86,
-						"h": 62
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 82,
-						"h": 61
-					},
-					"frame": {
-						"x": 86,
-						"y": 0,
-						"w": 82,
-						"h": 61
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 86,
-						"h": 62
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 82,
-						"h": 61
-					},
-					"frame": {
-						"x": 86,
-						"y": 0,
-						"w": 82,
-						"h": 61
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 86,
-						"h": 62
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 81,
-						"h": 59
-					},
-					"frame": {
-						"x": 0,
-						"y": 124,
-						"w": 81,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 86,
-						"h": 62
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 81,
-						"h": 59
-					},
-					"frame": {
-						"x": 0,
-						"y": 124,
-						"w": 81,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 86,
-						"h": 62
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 79,
-						"h": 59
-					},
-					"frame": {
-						"x": 81,
-						"y": 124,
-						"w": 79,
-						"h": 59
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:e56d7591e5bcde367604688e6d07bae4:caee4120d5060ce743036fe68aaf7181:9470182902340de73b2565411cb0ab89$"
-	}
+{ "frames": [
+  {
+   "filename": "0001.png",
+   "frame": { "x": 1, "y": 153, "w": 82, "h": 70 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 0, "y": 9, "w": 82, "h": 70 },
+   "sourceSize": { "w": 82, "h": 79 },
+   "duration": 100
+  },
+  {
+   "filename": "0002.png",
+   "frame": { "x": 490, "y": 147, "w": 82, "h": 70 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 0, "y": 9, "w": 82, "h": 70 },
+   "sourceSize": { "w": 82, "h": 79 },
+   "duration": 100
+  },
+  {
+   "filename": "0003.png",
+   "frame": { "x": 246, "y": 148, "w": 82, "h": 70 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 0, "y": 9, "w": 82, "h": 70 },
+   "sourceSize": { "w": 82, "h": 79 },
+   "duration": 100
+  },
+  {
+   "filename": "0004.png",
+   "frame": { "x": 329, "y": 148, "w": 82, "h": 70 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 0, "y": 9, "w": 82, "h": 70 },
+   "sourceSize": { "w": 82, "h": 79 },
+   "duration": 100
+  },
+  {
+   "filename": "0005.png",
+   "frame": { "x": 167, "y": 219, "w": 82, "h": 69 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 0, "y": 10, "w": 82, "h": 69 },
+   "sourceSize": { "w": 82, "h": 79 },
+   "duration": 100
+  },
+  {
+   "filename": "0006.png",
+   "frame": { "x": 250, "y": 219, "w": 82, "h": 69 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 0, "y": 10, "w": 82, "h": 69 },
+   "sourceSize": { "w": 82, "h": 79 },
+   "duration": 100
+  },
+  {
+   "filename": "0007.png",
+   "frame": { "x": 84, "y": 221, "w": 82, "h": 69 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 0, "y": 10, "w": 82, "h": 69 },
+   "sourceSize": { "w": 82, "h": 79 },
+   "duration": 100
+  },
+  {
+   "filename": "0008.png",
+   "frame": { "x": 1, "y": 294, "w": 82, "h": 68 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 0, "y": 11, "w": 82, "h": 68 },
+   "sourceSize": { "w": 82, "h": 79 },
+   "duration": 100
+  },
+  {
+   "filename": "0009.png",
+   "frame": { "x": 331, "y": 359, "w": 81, "h": 68 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 0, "y": 11, "w": 81, "h": 68 },
+   "sourceSize": { "w": 82, "h": 79 },
+   "duration": 100
+  },
+  {
+   "filename": "0010.png",
+   "frame": { "x": 249, "y": 359, "w": 81, "h": 68 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 0, "y": 11, "w": 81, "h": 68 },
+   "sourceSize": { "w": 82, "h": 79 },
+   "duration": 100
+  },
+  {
+   "filename": "0011.png",
+   "frame": { "x": 83, "y": 428, "w": 81, "h": 67 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 0, "y": 12, "w": 81, "h": 67 },
+   "sourceSize": { "w": 82, "h": 79 },
+   "duration": 100
+  },
+  {
+   "filename": "0012.png",
+   "frame": { "x": 1, "y": 363, "w": 81, "h": 67 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 0, "y": 12, "w": 81, "h": 67 },
+   "sourceSize": { "w": 82, "h": 79 },
+   "duration": 100
+  },
+  {
+   "filename": "0013.png",
+   "frame": { "x": 84, "y": 360, "w": 81, "h": 67 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 0, "y": 12, "w": 81, "h": 67 },
+   "sourceSize": { "w": 82, "h": 79 },
+   "duration": 100
+  },
+  {
+   "filename": "0014.png",
+   "frame": { "x": 167, "y": 359, "w": 81, "h": 68 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 0, "y": 11, "w": 81, "h": 68 },
+   "sourceSize": { "w": 82, "h": 79 },
+   "duration": 100
+  },
+  {
+   "filename": "0015.png",
+   "frame": { "x": 415, "y": 289, "w": 81, "h": 69 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 0, "y": 10, "w": 81, "h": 69 },
+   "sourceSize": { "w": 82, "h": 79 },
+   "duration": 100
+  },
+  {
+   "filename": "0016.png",
+   "frame": { "x": 333, "y": 289, "w": 81, "h": 69 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 0, "y": 10, "w": 81, "h": 69 },
+   "sourceSize": { "w": 82, "h": 79 },
+   "duration": 100
+  },
+  {
+   "filename": "0017.png",
+   "frame": { "x": 250, "y": 289, "w": 82, "h": 69 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 0, "y": 10, "w": 82, "h": 69 },
+   "sourceSize": { "w": 82, "h": 79 },
+   "duration": 100
+  },
+  {
+   "filename": "0018.png",
+   "frame": { "x": 84, "y": 150, "w": 82, "h": 70 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 0, "y": 9, "w": 82, "h": 70 },
+   "sourceSize": { "w": 82, "h": 79 },
+   "duration": 100
+  },
+  {
+   "filename": "0019.png",
+   "frame": { "x": 1, "y": 153, "w": 82, "h": 70 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 0, "y": 9, "w": 82, "h": 70 },
+   "sourceSize": { "w": 82, "h": 79 },
+   "duration": 100
+  },
+  {
+   "filename": "0020.png",
+   "frame": { "x": 490, "y": 147, "w": 82, "h": 70 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 0, "y": 9, "w": 82, "h": 70 },
+   "sourceSize": { "w": 82, "h": 79 },
+   "duration": 100
+  },
+  {
+   "filename": "0021.png",
+   "frame": { "x": 246, "y": 148, "w": 82, "h": 70 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 0, "y": 9, "w": 82, "h": 70 },
+   "sourceSize": { "w": 82, "h": 79 },
+   "duration": 100
+  },
+  {
+   "filename": "0022.png",
+   "frame": { "x": 329, "y": 148, "w": 82, "h": 70 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 0, "y": 9, "w": 82, "h": 70 },
+   "sourceSize": { "w": 82, "h": 79 },
+   "duration": 100
+  },
+  {
+   "filename": "0023.png",
+   "frame": { "x": 167, "y": 219, "w": 82, "h": 69 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 0, "y": 10, "w": 82, "h": 69 },
+   "sourceSize": { "w": 82, "h": 79 },
+   "duration": 100
+  },
+  {
+   "filename": "0024.png",
+   "frame": { "x": 250, "y": 219, "w": 82, "h": 69 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 0, "y": 10, "w": 82, "h": 69 },
+   "sourceSize": { "w": 82, "h": 79 },
+   "duration": 100
+  },
+  {
+   "filename": "0025.png",
+   "frame": { "x": 84, "y": 221, "w": 82, "h": 69 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 0, "y": 10, "w": 82, "h": 69 },
+   "sourceSize": { "w": 82, "h": 79 },
+   "duration": 100
+  },
+  {
+   "filename": "0026.png",
+   "frame": { "x": 1, "y": 294, "w": 82, "h": 68 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 0, "y": 11, "w": 82, "h": 68 },
+   "sourceSize": { "w": 82, "h": 79 },
+   "duration": 100
+  },
+  {
+   "filename": "0027.png",
+   "frame": { "x": 331, "y": 359, "w": 81, "h": 68 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 0, "y": 11, "w": 81, "h": 68 },
+   "sourceSize": { "w": 82, "h": 79 },
+   "duration": 100
+  },
+  {
+   "filename": "0028.png",
+   "frame": { "x": 249, "y": 359, "w": 81, "h": 68 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 0, "y": 11, "w": 81, "h": 68 },
+   "sourceSize": { "w": 82, "h": 79 },
+   "duration": 100
+  },
+  {
+   "filename": "0029.png",
+   "frame": { "x": 83, "y": 428, "w": 81, "h": 67 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 0, "y": 12, "w": 81, "h": 67 },
+   "sourceSize": { "w": 82, "h": 79 },
+   "duration": 100
+  },
+  {
+   "filename": "0030.png",
+   "frame": { "x": 1, "y": 363, "w": 81, "h": 67 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 0, "y": 12, "w": 81, "h": 67 },
+   "sourceSize": { "w": 82, "h": 79 },
+   "duration": 100
+  },
+  {
+   "filename": "0031.png",
+   "frame": { "x": 84, "y": 360, "w": 81, "h": 67 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 0, "y": 12, "w": 81, "h": 67 },
+   "sourceSize": { "w": 82, "h": 79 },
+   "duration": 100
+  },
+  {
+   "filename": "0032.png",
+   "frame": { "x": 167, "y": 359, "w": 81, "h": 68 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 0, "y": 11, "w": 81, "h": 68 },
+   "sourceSize": { "w": 82, "h": 79 },
+   "duration": 100
+  },
+  {
+   "filename": "0033.png",
+   "frame": { "x": 415, "y": 289, "w": 81, "h": 69 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 0, "y": 10, "w": 81, "h": 69 },
+   "sourceSize": { "w": 82, "h": 79 },
+   "duration": 100
+  },
+  {
+   "filename": "0034.png",
+   "frame": { "x": 333, "y": 289, "w": 81, "h": 69 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 0, "y": 10, "w": 81, "h": 69 },
+   "sourceSize": { "w": 82, "h": 79 },
+   "duration": 100
+  },
+  {
+   "filename": "0035.png",
+   "frame": { "x": 250, "y": 289, "w": 82, "h": 69 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 0, "y": 10, "w": 82, "h": 69 },
+   "sourceSize": { "w": 82, "h": 79 },
+   "duration": 100
+  },
+  {
+   "filename": "0036.png",
+   "frame": { "x": 84, "y": 150, "w": 82, "h": 70 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 0, "y": 9, "w": 82, "h": 70 },
+   "sourceSize": { "w": 82, "h": 79 },
+   "duration": 100
+  },
+  {
+   "filename": "0037.png",
+   "frame": { "x": 1, "y": 153, "w": 82, "h": 70 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 0, "y": 9, "w": 82, "h": 70 },
+   "sourceSize": { "w": 82, "h": 79 },
+   "duration": 100
+  },
+  {
+   "filename": "0038.png",
+   "frame": { "x": 490, "y": 147, "w": 82, "h": 70 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 0, "y": 9, "w": 82, "h": 70 },
+   "sourceSize": { "w": 82, "h": 79 },
+   "duration": 100
+  },
+  {
+   "filename": "0039.png",
+   "frame": { "x": 246, "y": 148, "w": 82, "h": 70 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 0, "y": 9, "w": 82, "h": 70 },
+   "sourceSize": { "w": 82, "h": 79 },
+   "duration": 100
+  },
+  {
+   "filename": "0040.png",
+   "frame": { "x": 329, "y": 148, "w": 82, "h": 70 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 0, "y": 9, "w": 82, "h": 70 },
+   "sourceSize": { "w": 82, "h": 79 },
+   "duration": 100
+  },
+  {
+   "filename": "0041.png",
+   "frame": { "x": 167, "y": 219, "w": 82, "h": 69 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 0, "y": 10, "w": 82, "h": 69 },
+   "sourceSize": { "w": 82, "h": 79 },
+   "duration": 100
+  },
+  {
+   "filename": "0042.png",
+   "frame": { "x": 250, "y": 219, "w": 82, "h": 69 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 0, "y": 10, "w": 82, "h": 69 },
+   "sourceSize": { "w": 82, "h": 79 },
+   "duration": 100
+  },
+  {
+   "filename": "0043.png",
+   "frame": { "x": 84, "y": 221, "w": 82, "h": 69 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 0, "y": 10, "w": 82, "h": 69 },
+   "sourceSize": { "w": 82, "h": 79 },
+   "duration": 100
+  },
+  {
+   "filename": "0044.png",
+   "frame": { "x": 1, "y": 294, "w": 82, "h": 68 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 0, "y": 11, "w": 82, "h": 68 },
+   "sourceSize": { "w": 82, "h": 79 },
+   "duration": 100
+  },
+  {
+   "filename": "0045.png",
+   "frame": { "x": 331, "y": 359, "w": 81, "h": 68 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 0, "y": 11, "w": 81, "h": 68 },
+   "sourceSize": { "w": 82, "h": 79 },
+   "duration": 100
+  },
+  {
+   "filename": "0046.png",
+   "frame": { "x": 249, "y": 359, "w": 81, "h": 68 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 0, "y": 11, "w": 81, "h": 68 },
+   "sourceSize": { "w": 82, "h": 79 },
+   "duration": 100
+  },
+  {
+   "filename": "0047.png",
+   "frame": { "x": 83, "y": 428, "w": 81, "h": 67 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 0, "y": 12, "w": 81, "h": 67 },
+   "sourceSize": { "w": 82, "h": 79 },
+   "duration": 100
+  },
+  {
+   "filename": "0048.png",
+   "frame": { "x": 1, "y": 363, "w": 81, "h": 67 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 0, "y": 12, "w": 81, "h": 67 },
+   "sourceSize": { "w": 82, "h": 79 },
+   "duration": 100
+  },
+  {
+   "filename": "0049.png",
+   "frame": { "x": 84, "y": 360, "w": 81, "h": 67 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 0, "y": 12, "w": 81, "h": 67 },
+   "sourceSize": { "w": 82, "h": 79 },
+   "duration": 100
+  },
+  {
+   "filename": "0050.png",
+   "frame": { "x": 167, "y": 359, "w": 81, "h": 68 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 0, "y": 11, "w": 81, "h": 68 },
+   "sourceSize": { "w": 82, "h": 79 },
+   "duration": 100
+  },
+  {
+   "filename": "0051.png",
+   "frame": { "x": 415, "y": 289, "w": 81, "h": 69 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 0, "y": 10, "w": 81, "h": 69 },
+   "sourceSize": { "w": 82, "h": 79 },
+   "duration": 100
+  },
+  {
+   "filename": "0052.png",
+   "frame": { "x": 333, "y": 289, "w": 81, "h": 69 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 0, "y": 10, "w": 81, "h": 69 },
+   "sourceSize": { "w": 82, "h": 79 },
+   "duration": 100
+  },
+  {
+   "filename": "0053.png",
+   "frame": { "x": 250, "y": 289, "w": 82, "h": 69 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 0, "y": 10, "w": 82, "h": 69 },
+   "sourceSize": { "w": 82, "h": 79 },
+   "duration": 100
+  },
+  {
+   "filename": "0054.png",
+   "frame": { "x": 84, "y": 150, "w": 82, "h": 70 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 0, "y": 9, "w": 82, "h": 70 },
+   "sourceSize": { "w": 82, "h": 79 },
+   "duration": 100
+  },
+  {
+   "filename": "0055.png",
+   "frame": { "x": 1, "y": 153, "w": 82, "h": 70 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 0, "y": 9, "w": 82, "h": 70 },
+   "sourceSize": { "w": 82, "h": 79 },
+   "duration": 100
+  },
+  {
+   "filename": "0056.png",
+   "frame": { "x": 490, "y": 147, "w": 82, "h": 70 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 0, "y": 9, "w": 82, "h": 70 },
+   "sourceSize": { "w": 82, "h": 79 },
+   "duration": 100
+  },
+  {
+   "filename": "0057.png",
+   "frame": { "x": 246, "y": 148, "w": 82, "h": 70 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 0, "y": 9, "w": 82, "h": 70 },
+   "sourceSize": { "w": 82, "h": 79 },
+   "duration": 100
+  },
+  {
+   "filename": "0058.png",
+   "frame": { "x": 329, "y": 148, "w": 82, "h": 70 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 0, "y": 9, "w": 82, "h": 70 },
+   "sourceSize": { "w": 82, "h": 79 },
+   "duration": 100
+  },
+  {
+   "filename": "0059.png",
+   "frame": { "x": 167, "y": 219, "w": 82, "h": 69 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 0, "y": 10, "w": 82, "h": 69 },
+   "sourceSize": { "w": 82, "h": 79 },
+   "duration": 100
+  },
+  {
+   "filename": "0060.png",
+   "frame": { "x": 250, "y": 219, "w": 82, "h": 69 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 0, "y": 10, "w": 82, "h": 69 },
+   "sourceSize": { "w": 82, "h": 79 },
+   "duration": 100
+  },
+  {
+   "filename": "0061.png",
+   "frame": { "x": 84, "y": 221, "w": 82, "h": 69 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 0, "y": 10, "w": 82, "h": 69 },
+   "sourceSize": { "w": 82, "h": 79 },
+   "duration": 100
+  },
+  {
+   "filename": "0062.png",
+   "frame": { "x": 1, "y": 294, "w": 82, "h": 68 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 0, "y": 11, "w": 82, "h": 68 },
+   "sourceSize": { "w": 82, "h": 79 },
+   "duration": 100
+  },
+  {
+   "filename": "0063.png",
+   "frame": { "x": 331, "y": 359, "w": 81, "h": 68 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 0, "y": 11, "w": 81, "h": 68 },
+   "sourceSize": { "w": 82, "h": 79 },
+   "duration": 100
+  },
+  {
+   "filename": "0064.png",
+   "frame": { "x": 249, "y": 359, "w": 81, "h": 68 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 0, "y": 11, "w": 81, "h": 68 },
+   "sourceSize": { "w": 82, "h": 79 },
+   "duration": 100
+  },
+  {
+   "filename": "0065.png",
+   "frame": { "x": 83, "y": 428, "w": 81, "h": 67 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 0, "y": 12, "w": 81, "h": 67 },
+   "sourceSize": { "w": 82, "h": 79 },
+   "duration": 100
+  },
+  {
+   "filename": "0066.png",
+   "frame": { "x": 1, "y": 363, "w": 81, "h": 67 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 0, "y": 12, "w": 81, "h": 67 },
+   "sourceSize": { "w": 82, "h": 79 },
+   "duration": 100
+  },
+  {
+   "filename": "0067.png",
+   "frame": { "x": 84, "y": 360, "w": 81, "h": 67 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 0, "y": 12, "w": 81, "h": 67 },
+   "sourceSize": { "w": 82, "h": 79 },
+   "duration": 100
+  },
+  {
+   "filename": "0068.png",
+   "frame": { "x": 167, "y": 359, "w": 81, "h": 68 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 0, "y": 11, "w": 81, "h": 68 },
+   "sourceSize": { "w": 82, "h": 79 },
+   "duration": 100
+  },
+  {
+   "filename": "0069.png",
+   "frame": { "x": 415, "y": 289, "w": 81, "h": 69 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 0, "y": 10, "w": 81, "h": 69 },
+   "sourceSize": { "w": 82, "h": 79 },
+   "duration": 100
+  },
+  {
+   "filename": "0070.png",
+   "frame": { "x": 333, "y": 289, "w": 81, "h": 69 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 0, "y": 10, "w": 81, "h": 69 },
+   "sourceSize": { "w": 82, "h": 79 },
+   "duration": 100
+  },
+  {
+   "filename": "0071.png",
+   "frame": { "x": 250, "y": 289, "w": 82, "h": 69 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 0, "y": 10, "w": 82, "h": 69 },
+   "sourceSize": { "w": 82, "h": 79 },
+   "duration": 100
+  },
+  {
+   "filename": "0072.png",
+   "frame": { "x": 84, "y": 150, "w": 82, "h": 70 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 0, "y": 9, "w": 82, "h": 70 },
+   "sourceSize": { "w": 82, "h": 79 },
+   "duration": 100
+  },
+  {
+   "filename": "0073.png",
+   "frame": { "x": 1, "y": 153, "w": 82, "h": 70 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 0, "y": 9, "w": 82, "h": 70 },
+   "sourceSize": { "w": 82, "h": 79 },
+   "duration": 100
+  },
+  {
+   "filename": "0074.png",
+   "frame": { "x": 1, "y": 81, "w": 82, "h": 71 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 0, "y": 8, "w": 82, "h": 71 },
+   "sourceSize": { "w": 82, "h": 79 },
+   "duration": 100
+  },
+  {
+   "filename": "0075.png",
+   "frame": { "x": 490, "y": 75, "w": 82, "h": 71 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 0, "y": 8, "w": 82, "h": 71 },
+   "sourceSize": { "w": 82, "h": 79 },
+   "duration": 100
+  },
+  {
+   "filename": "0076.png",
+   "frame": { "x": 325, "y": 75, "w": 82, "h": 72 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 0, "y": 7, "w": 82, "h": 72 },
+   "sourceSize": { "w": 82, "h": 79 },
+   "duration": 100
+  },
+  {
+   "filename": "0077.png",
+   "frame": { "x": 408, "y": 75, "w": 81, "h": 72 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 0, "y": 7, "w": 81, "h": 72 },
+   "sourceSize": { "w": 82, "h": 79 },
+   "duration": 100
+  },
+  {
+   "filename": "0078.png",
+   "frame": { "x": 407, "y": 1, "w": 81, "h": 73 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 0, "y": 6, "w": 81, "h": 73 },
+   "sourceSize": { "w": 82, "h": 79 },
+   "duration": 100
+  },
+  {
+   "filename": "0079.png",
+   "frame": { "x": 325, "y": 1, "w": 81, "h": 73 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 0, "y": 6, "w": 81, "h": 73 },
+   "sourceSize": { "w": 82, "h": 79 },
+   "duration": 100
+  },
+  {
+   "filename": "0080.png",
+   "frame": { "x": 163, "y": 78, "w": 82, "h": 71 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 0, "y": 8, "w": 82, "h": 71 },
+   "sourceSize": { "w": 82, "h": 79 },
+   "duration": 100
+  },
+  {
+   "filename": "0081.png",
+   "frame": { "x": 84, "y": 291, "w": 82, "h": 68 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 0, "y": 11, "w": 82, "h": 68 },
+   "sourceSize": { "w": 82, "h": 79 },
+   "duration": 100
+  },
+  {
+   "filename": "0082.png",
+   "frame": { "x": 495, "y": 218, "w": 80, "h": 69 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 0, "y": 10, "w": 80, "h": 69 },
+   "sourceSize": { "w": 82, "h": 79 },
+   "duration": 100
+  },
+  {
+   "filename": "0083.png",
+   "frame": { "x": 243, "y": 1, "w": 81, "h": 74 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 0, "y": 5, "w": 81, "h": 74 },
+   "sourceSize": { "w": 82, "h": 79 },
+   "duration": 100
+  },
+  {
+   "filename": "0084.png",
+   "frame": { "x": 83, "y": 1, "w": 79, "h": 79 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 0, "y": 0, "w": 79, "h": 79 },
+   "sourceSize": { "w": 82, "h": 79 },
+   "duration": 100
+  },
+  {
+   "filename": "0085.png",
+   "frame": { "x": 1, "y": 1, "w": 81, "h": 78 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 0, "y": 1, "w": 81, "h": 78 },
+   "sourceSize": { "w": 82, "h": 79 },
+   "duration": 100
+  },
+  {
+   "filename": "0086.png",
+   "frame": { "x": 83, "y": 1, "w": 79, "h": 79 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 0, "y": 0, "w": 79, "h": 79 },
+   "sourceSize": { "w": 82, "h": 79 },
+   "duration": 100
+  },
+  {
+   "filename": "0087.png",
+   "frame": { "x": 1, "y": 1, "w": 81, "h": 78 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 0, "y": 1, "w": 81, "h": 78 },
+   "sourceSize": { "w": 82, "h": 79 },
+   "duration": 100
+  },
+  {
+   "filename": "0088.png",
+   "frame": { "x": 83, "y": 1, "w": 79, "h": 79 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 0, "y": 0, "w": 79, "h": 79 },
+   "sourceSize": { "w": 82, "h": 79 },
+   "duration": 100
+  },
+  {
+   "filename": "0089.png",
+   "frame": { "x": 1, "y": 1, "w": 81, "h": 78 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 0, "y": 1, "w": 81, "h": 78 },
+   "sourceSize": { "w": 82, "h": 79 },
+   "duration": 100
+  },
+  {
+   "filename": "0090.png",
+   "frame": { "x": 163, "y": 1, "w": 79, "h": 76 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 0, "y": 3, "w": 79, "h": 76 },
+   "sourceSize": { "w": 82, "h": 79 },
+   "duration": 100
+  },
+  {
+   "filename": "0091.png",
+   "frame": { "x": 489, "y": 1, "w": 81, "h": 73 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 0, "y": 6, "w": 81, "h": 73 },
+   "sourceSize": { "w": 82, "h": 79 },
+   "duration": 100
+  },
+  {
+   "filename": "0092.png",
+   "frame": { "x": 247, "y": 428, "w": 82, "h": 65 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 0, "y": 14, "w": 82, "h": 65 },
+   "sourceSize": { "w": 82, "h": 79 },
+   "duration": 100
+  },
+  {
+   "filename": "0093.png",
+   "frame": { "x": 165, "y": 428, "w": 81, "h": 67 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 0, "y": 12, "w": 81, "h": 67 },
+   "sourceSize": { "w": 82, "h": 79 },
+   "duration": 100
+  },
+  {
+   "filename": "0094.png",
+   "frame": { "x": 413, "y": 359, "w": 81, "h": 68 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 0, "y": 11, "w": 81, "h": 68 },
+   "sourceSize": { "w": 82, "h": 79 },
+   "duration": 100
+  },
+  {
+   "filename": "0095.png",
+   "frame": { "x": 1, "y": 224, "w": 82, "h": 69 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 0, "y": 10, "w": 82, "h": 69 },
+   "sourceSize": { "w": 82, "h": 79 },
+   "duration": 100
+  },
+  {
+   "filename": "0096.png",
+   "frame": { "x": 167, "y": 289, "w": 82, "h": 69 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 0, "y": 10, "w": 82, "h": 69 },
+   "sourceSize": { "w": 82, "h": 79 },
+   "duration": 100
+  },
+  {
+   "filename": "0097.png",
+   "frame": { "x": 412, "y": 218, "w": 82, "h": 70 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 0, "y": 9, "w": 82, "h": 70 },
+   "sourceSize": { "w": 82, "h": 79 },
+   "duration": 100
+  }
+],
+"meta": {
+ "app": "https://www.aseprite.org/",
+ "version": "1.3.13-x64",
+ "image": "780.png",
+ "format": "I8",
+ "size": { "w": 576, "h": 496 },
+ "scale": "1"
+}
 }
diff --git a/public/images/pokemon/exp/back/shiny/780.png b/public/images/pokemon/exp/back/shiny/780.png
index 6755273b14b..686b7220fbb 100644
Binary files a/public/images/pokemon/exp/back/shiny/780.png and b/public/images/pokemon/exp/back/shiny/780.png differ
diff --git a/public/images/pokemon/exp/back/shiny/782.json b/public/images/pokemon/exp/back/shiny/782.json
deleted file mode 100644
index facd127868f..00000000000
--- a/public/images/pokemon/exp/back/shiny/782.json
+++ /dev/null
@@ -1,2351 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "782.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 239,
-				"h": 239
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0083.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0111.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0084.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					},
-					"frame": {
-						"x": 0,
-						"y": 52,
-						"w": 48,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0110.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					},
-					"frame": {
-						"x": 0,
-						"y": 52,
-						"w": 48,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0085.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					},
-					"frame": {
-						"x": 48,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0086.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					},
-					"frame": {
-						"x": 0,
-						"y": 104,
-						"w": 48,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0087.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					},
-					"frame": {
-						"x": 48,
-						"y": 52,
-						"w": 48,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0088.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					},
-					"frame": {
-						"x": 48,
-						"y": 52,
-						"w": 48,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0095.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					},
-					"frame": {
-						"x": 48,
-						"y": 52,
-						"w": 48,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0096.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					},
-					"frame": {
-						"x": 48,
-						"y": 52,
-						"w": 48,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0104.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					},
-					"frame": {
-						"x": 48,
-						"y": 52,
-						"w": 48,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0105.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					},
-					"frame": {
-						"x": 48,
-						"y": 52,
-						"w": 48,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0089.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					},
-					"frame": {
-						"x": 96,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0090.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					},
-					"frame": {
-						"x": 0,
-						"y": 156,
-						"w": 48,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0091.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					},
-					"frame": {
-						"x": 48,
-						"y": 104,
-						"w": 48,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0108.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					},
-					"frame": {
-						"x": 48,
-						"y": 104,
-						"w": 48,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0092.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					},
-					"frame": {
-						"x": 96,
-						"y": 52,
-						"w": 48,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0099.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					},
-					"frame": {
-						"x": 96,
-						"y": 52,
-						"w": 48,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0100.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					},
-					"frame": {
-						"x": 96,
-						"y": 52,
-						"w": 48,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0093.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					},
-					"frame": {
-						"x": 144,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0094.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					},
-					"frame": {
-						"x": 144,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0101.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					},
-					"frame": {
-						"x": 144,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0102.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					},
-					"frame": {
-						"x": 144,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0103.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					},
-					"frame": {
-						"x": 144,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 47,
-						"h": 51
-					},
-					"frame": {
-						"x": 192,
-						"y": 0,
-						"w": 47,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 47,
-						"h": 51
-					},
-					"frame": {
-						"x": 192,
-						"y": 0,
-						"w": 47,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0029.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 47,
-						"h": 51
-					},
-					"frame": {
-						"x": 192,
-						"y": 0,
-						"w": 47,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0030.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 47,
-						"h": 51
-					},
-					"frame": {
-						"x": 192,
-						"y": 0,
-						"w": 47,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0045.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 47,
-						"h": 51
-					},
-					"frame": {
-						"x": 192,
-						"y": 0,
-						"w": 47,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0046.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 47,
-						"h": 51
-					},
-					"frame": {
-						"x": 192,
-						"y": 0,
-						"w": 47,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0061.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 47,
-						"h": 51
-					},
-					"frame": {
-						"x": 192,
-						"y": 0,
-						"w": 47,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0062.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 47,
-						"h": 51
-					},
-					"frame": {
-						"x": 192,
-						"y": 0,
-						"w": 47,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0077.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 47,
-						"h": 51
-					},
-					"frame": {
-						"x": 192,
-						"y": 0,
-						"w": 47,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0078.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 47,
-						"h": 51
-					},
-					"frame": {
-						"x": 192,
-						"y": 0,
-						"w": 47,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0097.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					},
-					"frame": {
-						"x": 48,
-						"y": 156,
-						"w": 48,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0098.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					},
-					"frame": {
-						"x": 48,
-						"y": 156,
-						"w": 48,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0106.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					},
-					"frame": {
-						"x": 48,
-						"y": 156,
-						"w": 48,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0107.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					},
-					"frame": {
-						"x": 48,
-						"y": 156,
-						"w": 48,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0109.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					},
-					"frame": {
-						"x": 96,
-						"y": 104,
-						"w": 48,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 48,
-						"h": 51
-					},
-					"frame": {
-						"x": 144,
-						"y": 52,
-						"w": 48,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 48,
-						"h": 51
-					},
-					"frame": {
-						"x": 144,
-						"y": 52,
-						"w": 48,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 48,
-						"h": 51
-					},
-					"frame": {
-						"x": 144,
-						"y": 52,
-						"w": 48,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 48,
-						"h": 51
-					},
-					"frame": {
-						"x": 144,
-						"y": 52,
-						"w": 48,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0033.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 48,
-						"h": 51
-					},
-					"frame": {
-						"x": 144,
-						"y": 52,
-						"w": 48,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0034.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 48,
-						"h": 51
-					},
-					"frame": {
-						"x": 144,
-						"y": 52,
-						"w": 48,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0049.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 48,
-						"h": 51
-					},
-					"frame": {
-						"x": 144,
-						"y": 52,
-						"w": 48,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0050.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 48,
-						"h": 51
-					},
-					"frame": {
-						"x": 144,
-						"y": 52,
-						"w": 48,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0065.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 48,
-						"h": 51
-					},
-					"frame": {
-						"x": 144,
-						"y": 52,
-						"w": 48,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0066.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 48,
-						"h": 51
-					},
-					"frame": {
-						"x": 144,
-						"y": 52,
-						"w": 48,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0081.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 48,
-						"h": 51
-					},
-					"frame": {
-						"x": 144,
-						"y": 52,
-						"w": 48,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0082.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 48,
-						"h": 51
-					},
-					"frame": {
-						"x": 144,
-						"y": 52,
-						"w": 48,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 47,
-						"h": 51
-					},
-					"frame": {
-						"x": 192,
-						"y": 51,
-						"w": 47,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 47,
-						"h": 51
-					},
-					"frame": {
-						"x": 192,
-						"y": 51,
-						"w": 47,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0031.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 47,
-						"h": 51
-					},
-					"frame": {
-						"x": 192,
-						"y": 51,
-						"w": 47,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0032.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 47,
-						"h": 51
-					},
-					"frame": {
-						"x": 192,
-						"y": 51,
-						"w": 47,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0047.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 47,
-						"h": 51
-					},
-					"frame": {
-						"x": 192,
-						"y": 51,
-						"w": 47,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0048.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 47,
-						"h": 51
-					},
-					"frame": {
-						"x": 192,
-						"y": 51,
-						"w": 47,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0063.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 47,
-						"h": 51
-					},
-					"frame": {
-						"x": 192,
-						"y": 51,
-						"w": 47,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0064.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 47,
-						"h": 51
-					},
-					"frame": {
-						"x": 192,
-						"y": 51,
-						"w": 47,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0079.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 47,
-						"h": 51
-					},
-					"frame": {
-						"x": 192,
-						"y": 51,
-						"w": 47,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0080.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 47,
-						"h": 51
-					},
-					"frame": {
-						"x": 192,
-						"y": 51,
-						"w": 47,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 48,
-						"h": 51
-					},
-					"frame": {
-						"x": 96,
-						"y": 156,
-						"w": 48,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 48,
-						"h": 51
-					},
-					"frame": {
-						"x": 96,
-						"y": 156,
-						"w": 48,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 48,
-						"h": 51
-					},
-					"frame": {
-						"x": 96,
-						"y": 156,
-						"w": 48,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 48,
-						"h": 51
-					},
-					"frame": {
-						"x": 96,
-						"y": 156,
-						"w": 48,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0035.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 48,
-						"h": 51
-					},
-					"frame": {
-						"x": 96,
-						"y": 156,
-						"w": 48,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0036.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 48,
-						"h": 51
-					},
-					"frame": {
-						"x": 96,
-						"y": 156,
-						"w": 48,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0051.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 48,
-						"h": 51
-					},
-					"frame": {
-						"x": 96,
-						"y": 156,
-						"w": 48,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0052.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 48,
-						"h": 51
-					},
-					"frame": {
-						"x": 96,
-						"y": 156,
-						"w": 48,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0067.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 48,
-						"h": 51
-					},
-					"frame": {
-						"x": 96,
-						"y": 156,
-						"w": 48,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0068.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 48,
-						"h": 51
-					},
-					"frame": {
-						"x": 96,
-						"y": 156,
-						"w": 48,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 48,
-						"h": 51
-					},
-					"frame": {
-						"x": 144,
-						"y": 103,
-						"w": 48,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 48,
-						"h": 51
-					},
-					"frame": {
-						"x": 144,
-						"y": 103,
-						"w": 48,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 48,
-						"h": 51
-					},
-					"frame": {
-						"x": 144,
-						"y": 103,
-						"w": 48,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 48,
-						"h": 51
-					},
-					"frame": {
-						"x": 144,
-						"y": 103,
-						"w": 48,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0037.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 48,
-						"h": 51
-					},
-					"frame": {
-						"x": 144,
-						"y": 103,
-						"w": 48,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0038.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 48,
-						"h": 51
-					},
-					"frame": {
-						"x": 144,
-						"y": 103,
-						"w": 48,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0053.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 48,
-						"h": 51
-					},
-					"frame": {
-						"x": 144,
-						"y": 103,
-						"w": 48,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0054.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 48,
-						"h": 51
-					},
-					"frame": {
-						"x": 144,
-						"y": 103,
-						"w": 48,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0069.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 48,
-						"h": 51
-					},
-					"frame": {
-						"x": 144,
-						"y": 103,
-						"w": 48,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0070.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 48,
-						"h": 51
-					},
-					"frame": {
-						"x": 144,
-						"y": 103,
-						"w": 48,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 2,
-						"w": 47,
-						"h": 50
-					},
-					"frame": {
-						"x": 192,
-						"y": 102,
-						"w": 47,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 2,
-						"w": 47,
-						"h": 50
-					},
-					"frame": {
-						"x": 192,
-						"y": 102,
-						"w": 47,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 2,
-						"w": 47,
-						"h": 50
-					},
-					"frame": {
-						"x": 192,
-						"y": 102,
-						"w": 47,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 2,
-						"w": 47,
-						"h": 50
-					},
-					"frame": {
-						"x": 192,
-						"y": 102,
-						"w": 47,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0039.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 2,
-						"w": 47,
-						"h": 50
-					},
-					"frame": {
-						"x": 192,
-						"y": 102,
-						"w": 47,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0040.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 2,
-						"w": 47,
-						"h": 50
-					},
-					"frame": {
-						"x": 192,
-						"y": 102,
-						"w": 47,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0055.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 2,
-						"w": 47,
-						"h": 50
-					},
-					"frame": {
-						"x": 192,
-						"y": 102,
-						"w": 47,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0056.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 2,
-						"w": 47,
-						"h": 50
-					},
-					"frame": {
-						"x": 192,
-						"y": 102,
-						"w": 47,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0071.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 2,
-						"w": 47,
-						"h": 50
-					},
-					"frame": {
-						"x": 192,
-						"y": 102,
-						"w": 47,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0072.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 2,
-						"w": 47,
-						"h": 50
-					},
-					"frame": {
-						"x": 192,
-						"y": 102,
-						"w": 47,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 2,
-						"w": 47,
-						"h": 50
-					},
-					"frame": {
-						"x": 192,
-						"y": 152,
-						"w": 47,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 2,
-						"w": 47,
-						"h": 50
-					},
-					"frame": {
-						"x": 192,
-						"y": 152,
-						"w": 47,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0027.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 2,
-						"w": 47,
-						"h": 50
-					},
-					"frame": {
-						"x": 192,
-						"y": 152,
-						"w": 47,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0028.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 2,
-						"w": 47,
-						"h": 50
-					},
-					"frame": {
-						"x": 192,
-						"y": 152,
-						"w": 47,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0043.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 2,
-						"w": 47,
-						"h": 50
-					},
-					"frame": {
-						"x": 192,
-						"y": 152,
-						"w": 47,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0044.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 2,
-						"w": 47,
-						"h": 50
-					},
-					"frame": {
-						"x": 192,
-						"y": 152,
-						"w": 47,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0059.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 2,
-						"w": 47,
-						"h": 50
-					},
-					"frame": {
-						"x": 192,
-						"y": 152,
-						"w": 47,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0060.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 2,
-						"w": 47,
-						"h": 50
-					},
-					"frame": {
-						"x": 192,
-						"y": 152,
-						"w": 47,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0075.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 2,
-						"w": 47,
-						"h": 50
-					},
-					"frame": {
-						"x": 192,
-						"y": 152,
-						"w": 47,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0076.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 2,
-						"w": 47,
-						"h": 50
-					},
-					"frame": {
-						"x": 192,
-						"y": 152,
-						"w": 47,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 47,
-						"h": 49
-					},
-					"frame": {
-						"x": 144,
-						"y": 154,
-						"w": 47,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 47,
-						"h": 49
-					},
-					"frame": {
-						"x": 144,
-						"y": 154,
-						"w": 47,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0025.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 47,
-						"h": 49
-					},
-					"frame": {
-						"x": 144,
-						"y": 154,
-						"w": 47,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0026.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 47,
-						"h": 49
-					},
-					"frame": {
-						"x": 144,
-						"y": 154,
-						"w": 47,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0041.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 47,
-						"h": 49
-					},
-					"frame": {
-						"x": 144,
-						"y": 154,
-						"w": 47,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0042.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 47,
-						"h": 49
-					},
-					"frame": {
-						"x": 144,
-						"y": 154,
-						"w": 47,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0057.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 47,
-						"h": 49
-					},
-					"frame": {
-						"x": 144,
-						"y": 154,
-						"w": 47,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0058.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 47,
-						"h": 49
-					},
-					"frame": {
-						"x": 144,
-						"y": 154,
-						"w": 47,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0073.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 47,
-						"h": 49
-					},
-					"frame": {
-						"x": 144,
-						"y": 154,
-						"w": 47,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0074.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 47,
-						"h": 49
-					},
-					"frame": {
-						"x": 144,
-						"y": 154,
-						"w": 47,
-						"h": 49
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:037c9a33b267f5b73f2e7c10c87bf653:509435f895db2af666d45fff3ec043dc:d07862436676aa228a148ee1f1d82a8f$"
-	}
-}
diff --git a/public/images/pokemon/exp/back/shiny/782.png b/public/images/pokemon/exp/back/shiny/782.png
deleted file mode 100644
index 9ecbcf1f035..00000000000
Binary files a/public/images/pokemon/exp/back/shiny/782.png and /dev/null differ
diff --git a/public/images/pokemon/exp/back/shiny/783.json b/public/images/pokemon/exp/back/shiny/783.json
deleted file mode 100644
index c23c9116e10..00000000000
--- a/public/images/pokemon/exp/back/shiny/783.json
+++ /dev/null
@@ -1,230 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "783.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 170,
-				"h": 170
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 60,
-						"h": 70
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 60,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 60,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 60,
-						"h": 70
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 59,
-						"h": 70
-					},
-					"frame": {
-						"x": 0,
-						"y": 69,
-						"w": 59,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 60,
-						"h": 70
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 59,
-						"h": 70
-					},
-					"frame": {
-						"x": 0,
-						"y": 69,
-						"w": 59,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 60,
-						"h": 70
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 57,
-						"h": 70
-					},
-					"frame": {
-						"x": 60,
-						"y": 0,
-						"w": 57,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 60,
-						"h": 70
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 57,
-						"h": 70
-					},
-					"frame": {
-						"x": 60,
-						"y": 0,
-						"w": 57,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 60,
-						"h": 70
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 53,
-						"h": 70
-					},
-					"frame": {
-						"x": 117,
-						"y": 0,
-						"w": 53,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 60,
-						"h": 70
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 55,
-						"h": 70
-					},
-					"frame": {
-						"x": 59,
-						"y": 70,
-						"w": 55,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 60,
-						"h": 70
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 55,
-						"h": 70
-					},
-					"frame": {
-						"x": 59,
-						"y": 70,
-						"w": 55,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 60,
-						"h": 70
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 55,
-						"h": 70
-					},
-					"frame": {
-						"x": 114,
-						"y": 70,
-						"w": 55,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 60,
-						"h": 70
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 55,
-						"h": 70
-					},
-					"frame": {
-						"x": 114,
-						"y": 70,
-						"w": 55,
-						"h": 70
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:ceb13eb26bf07b1a43fd9d23cef4895a:399ef100f2226bb28ca73ab82f617bd7:aab166e28c744865a0296041224dd01b$"
-	}
-}
diff --git a/public/images/pokemon/exp/back/shiny/783.png b/public/images/pokemon/exp/back/shiny/783.png
deleted file mode 100644
index fd57a32b55e..00000000000
Binary files a/public/images/pokemon/exp/back/shiny/783.png and /dev/null differ
diff --git a/public/images/pokemon/exp/back/shiny/784.json b/public/images/pokemon/exp/back/shiny/784.json
deleted file mode 100644
index 27f3d18b7d6..00000000000
--- a/public/images/pokemon/exp/back/shiny/784.json
+++ /dev/null
@@ -1,230 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "784.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 240,
-				"h": 240
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 86,
-						"h": 81
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 86,
-						"h": 81
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 86,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 86,
-						"h": 81
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 84,
-						"h": 81
-					},
-					"frame": {
-						"x": 86,
-						"y": 0,
-						"w": 84,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 86,
-						"h": 81
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 84,
-						"h": 81
-					},
-					"frame": {
-						"x": 86,
-						"y": 0,
-						"w": 84,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 86,
-						"h": 81
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 81,
-						"h": 81
-					},
-					"frame": {
-						"x": 0,
-						"y": 81,
-						"w": 81,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 86,
-						"h": 81
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 81,
-						"h": 81
-					},
-					"frame": {
-						"x": 0,
-						"y": 81,
-						"w": 81,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 86,
-						"h": 81
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 0,
-						"w": 78,
-						"h": 81
-					},
-					"frame": {
-						"x": 81,
-						"y": 81,
-						"w": 78,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 86,
-						"h": 81
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 0,
-						"w": 78,
-						"h": 81
-					},
-					"frame": {
-						"x": 81,
-						"y": 81,
-						"w": 78,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 86,
-						"h": 81
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 79,
-						"h": 79
-					},
-					"frame": {
-						"x": 159,
-						"y": 81,
-						"w": 79,
-						"h": 79
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 86,
-						"h": 81
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 78,
-						"h": 80
-					},
-					"frame": {
-						"x": 159,
-						"y": 160,
-						"w": 78,
-						"h": 80
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 86,
-						"h": 81
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 78,
-						"h": 80
-					},
-					"frame": {
-						"x": 159,
-						"y": 160,
-						"w": 78,
-						"h": 80
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:841ddb49f9601ed6f43373fcdfd97a55:abdfda19e619b7f57eb4c9c5d68cc9d9:c2f7ca3ab1075b8c824730653d891244$"
-	}
-}
diff --git a/public/images/pokemon/exp/back/shiny/784.png b/public/images/pokemon/exp/back/shiny/784.png
deleted file mode 100644
index fdec2486c56..00000000000
Binary files a/public/images/pokemon/exp/back/shiny/784.png and /dev/null differ
diff --git a/public/images/pokemon/exp/back/shiny/815-gigantamax.json b/public/images/pokemon/exp/back/shiny/815-gigantamax.json
new file mode 100644
index 00000000000..952ea16b6b8
--- /dev/null
+++ b/public/images/pokemon/exp/back/shiny/815-gigantamax.json
@@ -0,0 +1,659 @@
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 525, "y": 384, "w": 81, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 81, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 356, "y": 98, "w": 86, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 86, "h": 94 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 444, "y": 98, "w": 86, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 86, "h": 94 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 267, "y": 98, "w": 87, "h": 93 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 87, "h": 93 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 528, "y": 194, "w": 82, "h": 92 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 6, "w": 82, "h": 92 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 250, "y": 484, "w": 81, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 7, "w": 81, "h": 91 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 333, "y": 388, "w": 83, "h": 92 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 6, "w": 83, "h": 92 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 82, "y": 485, "w": 79, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 7, "w": 79, "h": 91 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 167, "y": 483, "w": 81, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 7, "w": 81, "h": 91 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 440, "y": 194, "w": 86, "h": 92 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 86, "h": 92 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 177, "y": 194, "w": 86, "h": 93 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 86, "h": 93 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 179, "y": 1, "w": 87, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 87, "h": 94 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 267, "y": 193, "w": 85, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 85, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 1, "y": 292, "w": 81, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 2, "w": 81, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 86, "y": 195, "w": 83, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 2, "w": 83, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 333, "y": 482, "w": 79, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 2, "w": 79, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 525, "y": 384, "w": 81, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 81, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 356, "y": 98, "w": 86, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 86, "h": 94 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 444, "y": 98, "w": 86, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 86, "h": 94 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 267, "y": 98, "w": 87, "h": 93 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 87, "h": 93 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 528, "y": 194, "w": 82, "h": 92 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 6, "w": 82, "h": 92 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 250, "y": 484, "w": 81, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 7, "w": 81, "h": 91 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 333, "y": 388, "w": 83, "h": 92 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 6, "w": 83, "h": 92 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 82, "y": 485, "w": 79, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 7, "w": 79, "h": 91 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 167, "y": 483, "w": 81, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 7, "w": 81, "h": 91 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 440, "y": 194, "w": 86, "h": 92 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 86, "h": 92 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 177, "y": 194, "w": 86, "h": 93 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 86, "h": 93 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 179, "y": 1, "w": 87, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 87, "h": 94 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 267, "y": 193, "w": 85, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 85, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 1, "y": 292, "w": 81, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 2, "w": 81, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 86, "y": 195, "w": 83, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 2, "w": 83, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 333, "y": 482, "w": 79, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 2, "w": 79, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 525, "y": 384, "w": 81, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 81, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 356, "y": 98, "w": 86, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 86, "h": 94 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 444, "y": 98, "w": 86, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 86, "h": 94 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 267, "y": 98, "w": 87, "h": 93 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 87, "h": 93 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 528, "y": 194, "w": 82, "h": 92 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 6, "w": 82, "h": 92 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 250, "y": 484, "w": 81, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 7, "w": 81, "h": 91 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 333, "y": 388, "w": 83, "h": 92 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 6, "w": 83, "h": 92 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 82, "y": 485, "w": 79, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 7, "w": 79, "h": 91 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 167, "y": 483, "w": 81, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 7, "w": 81, "h": 91 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 440, "y": 194, "w": 86, "h": 92 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 86, "h": 92 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 177, "y": 194, "w": 86, "h": 93 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 86, "h": 93 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 179, "y": 1, "w": 87, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 87, "h": 94 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 267, "y": 193, "w": 85, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 85, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 1, "y": 292, "w": 81, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 2, "w": 81, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 86, "y": 195, "w": 83, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 2, "w": 83, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 333, "y": 482, "w": 79, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 2, "w": 79, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 84, "y": 292, "w": 81, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 81, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 179, "y": 97, "w": 86, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 86, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 444, "y": 1, "w": 86, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 86, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 1, "y": 1, "w": 87, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 2, "w": 87, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 171, "y": 289, "w": 82, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 2, "w": 82, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 1, "y": 389, "w": 81, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 4, "w": 81, "h": 94 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 525, "y": 288, "w": 83, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 83, "h": 94 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 1, "y": 485, "w": 79, "h": 93 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 7, "w": 79, "h": 93 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 84, "y": 389, "w": 81, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 6, "w": 81, "h": 94 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 356, "y": 1, "w": 86, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 4, "w": 86, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 268, "y": 1, "w": 86, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 3, "w": 86, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 354, "y": 194, "w": 84, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 2, "w": 84, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 255, "y": 290, "w": 82, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 1, "w": 82, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 423, "y": 385, "w": 81, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 1, "w": 81, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 1, "y": 195, "w": 83, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 1, "w": 83, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 506, "y": 481, "w": 80, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 0, "w": 80, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 250, "y": 387, "w": 81, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 1, "w": 81, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 1, "y": 98, "w": 86, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 86, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 89, "y": 98, "w": 86, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 86, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 90, "y": 1, "w": 87, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 87, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 339, "y": 291, "w": 82, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 5, "w": 82, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 167, "y": 386, "w": 81, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 4, "w": 81, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 440, "y": 288, "w": 83, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 83, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 414, "y": 482, "w": 79, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 2, "w": 79, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.13-x64",
+  "image": "815-gigantamax.png",
+  "format": "I8",
+  "size": { "w": 611, "h": 579 },
+  "scale": "1"
+ }
+}
diff --git a/public/images/pokemon/exp/back/shiny/815-gigantamax.png b/public/images/pokemon/exp/back/shiny/815-gigantamax.png
new file mode 100644
index 00000000000..0668fd3b065
Binary files /dev/null and b/public/images/pokemon/exp/back/shiny/815-gigantamax.png differ
diff --git a/public/images/pokemon/exp/back/shiny/839-gigantamax.json b/public/images/pokemon/exp/back/shiny/839-gigantamax.json
new file mode 100644
index 00000000000..35d98910c9f
--- /dev/null
+++ b/public/images/pokemon/exp/back/shiny/839-gigantamax.json
@@ -0,0 +1,821 @@
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 238, "y": 282, "w": 77, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 0, "w": 77, "h": 96 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 470, "y": 377, "w": 76, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 19, "y": 0, "w": 76, "h": 96 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 546, "y": 377, "w": 76, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 0, "w": 76, "h": 96 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 469, "y": 473, "w": 75, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 0, "w": 75, "h": 96 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 544, "y": 473, "w": 75, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 0, "w": 75, "h": 96 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 154, "y": 472, "w": 76, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 1, "w": 76, "h": 95 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 0, "y": 566, "w": 75, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 1, "w": 75, "h": 95 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 393, "y": 376, "w": 77, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 1, "w": 77, "h": 95 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 414, "y": 190, "w": 78, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 1, "w": 78, "h": 95 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 492, "y": 191, "w": 78, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 1, "w": 78, "h": 95 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 159, "y": 283, "w": 78, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 2, "w": 78, "h": 94 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 158, "y": 189, "w": 80, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 2, "w": 80, "h": 94 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 255, "y": 188, "w": 80, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 2, "w": 80, "h": 94 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 173, "y": 95, "w": 82, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 2, "w": 82, "h": 94 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 90, "y": 93, "w": 83, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 2, "w": 83, "h": 94 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 350, "y": 95, "w": 82, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 2, "w": 82, "h": 94 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 524, "y": 0, "w": 83, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 1, "w": 83, "h": 95 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 268, "y": 92, "w": 82, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 0, "w": 82, "h": 96 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 513, "y": 95, "w": 80, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 0, "w": 80, "h": 96 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 0, "y": 185, "w": 79, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 0, "w": 79, "h": 96 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 238, "y": 282, "w": 77, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 0, "w": 77, "h": 96 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 470, "y": 377, "w": 76, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 19, "y": 0, "w": 76, "h": 96 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 546, "y": 377, "w": 76, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 0, "w": 76, "h": 96 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 469, "y": 473, "w": 75, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 0, "w": 75, "h": 96 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 544, "y": 473, "w": 75, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 0, "w": 75, "h": 96 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 154, "y": 472, "w": 76, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 1, "w": 76, "h": 95 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 0, "y": 566, "w": 75, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 1, "w": 75, "h": 95 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 393, "y": 376, "w": 77, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 1, "w": 77, "h": 95 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 414, "y": 190, "w": 78, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 1, "w": 78, "h": 95 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 492, "y": 191, "w": 78, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 1, "w": 78, "h": 95 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 159, "y": 283, "w": 78, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 2, "w": 78, "h": 94 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 158, "y": 189, "w": 80, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 2, "w": 80, "h": 94 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 255, "y": 188, "w": 80, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 2, "w": 80, "h": 94 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 173, "y": 95, "w": 82, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 2, "w": 82, "h": 94 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 90, "y": 93, "w": 83, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 2, "w": 83, "h": 94 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 350, "y": 95, "w": 82, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 2, "w": 82, "h": 94 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 524, "y": 0, "w": 83, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 1, "w": 83, "h": 95 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 268, "y": 92, "w": 82, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 0, "w": 82, "h": 96 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 513, "y": 95, "w": 80, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 0, "w": 80, "h": 96 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 0, "y": 185, "w": 79, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 0, "w": 79, "h": 96 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 238, "y": 282, "w": 77, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 0, "w": 77, "h": 96 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 470, "y": 377, "w": 76, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 19, "y": 0, "w": 76, "h": 96 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 546, "y": 377, "w": 76, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 0, "w": 76, "h": 96 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 469, "y": 473, "w": 75, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 0, "w": 75, "h": 96 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 544, "y": 473, "w": 75, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 0, "w": 75, "h": 96 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 154, "y": 472, "w": 76, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 1, "w": 76, "h": 95 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 0, "y": 566, "w": 75, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 1, "w": 75, "h": 95 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 393, "y": 376, "w": 77, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 1, "w": 77, "h": 95 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 414, "y": 190, "w": 78, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 1, "w": 78, "h": 95 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 492, "y": 191, "w": 78, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 1, "w": 78, "h": 95 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 159, "y": 283, "w": 78, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 2, "w": 78, "h": 94 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 158, "y": 189, "w": 80, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 2, "w": 80, "h": 94 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 255, "y": 188, "w": 80, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 2, "w": 80, "h": 94 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 173, "y": 95, "w": 82, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 2, "w": 82, "h": 94 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 90, "y": 93, "w": 83, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 2, "w": 83, "h": 94 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 350, "y": 95, "w": 82, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 2, "w": 82, "h": 94 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 524, "y": 0, "w": 83, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 1, "w": 83, "h": 95 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 268, "y": 92, "w": 82, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 0, "w": 82, "h": 96 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 513, "y": 95, "w": 80, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 0, "w": 80, "h": 96 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 0, "y": 185, "w": 79, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 0, "w": 79, "h": 96 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 238, "y": 282, "w": 77, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 0, "w": 77, "h": 96 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 79, "y": 187, "w": 79, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 17, "y": 0, "w": 79, "h": 96 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 432, "y": 95, "w": 81, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 1, "w": 81, "h": 95 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 441, "y": 0, "w": 83, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 1, "w": 83, "h": 95 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 356, "y": 0, "w": 85, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 1, "w": 85, "h": 95 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 180, "y": 0, "w": 88, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 88, "h": 95 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 0, "y": 0, "w": 90, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 90, "h": 94 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 90, "y": 0, "w": 90, "h": 93 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 90, "h": 93 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 268, "y": 0, "w": 88, "h": 92 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 4, "w": 88, "h": 92 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 0, "y": 94, "w": 85, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 5, "w": 85, "h": 91 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 77, "y": 283, "w": 82, "h": 90 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 6, "w": 82, "h": 90 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 397, "y": 285, "w": 81, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 5, "w": 81, "h": 91 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 232, "y": 378, "w": 81, "h": 90 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 6, "w": 81, "h": 90 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 315, "y": 283, "w": 82, "h": 90 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 6, "w": 82, "h": 90 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 478, "y": 286, "w": 81, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 5, "w": 81, "h": 91 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 313, "y": 467, "w": 79, "h": 92 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 4, "w": 79, "h": 92 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 335, "y": 189, "w": 79, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 2, "w": 79, "h": 94 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 315, "y": 373, "w": 78, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 2, "w": 78, "h": 94 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 77, "y": 373, "w": 78, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 2, "w": 78, "h": 94 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 77, "y": 467, "w": 77, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 2, "w": 77, "h": 94 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 232, "y": 468, "w": 77, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 2, "w": 77, "h": 94 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 392, "y": 471, "w": 77, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 2, "w": 77, "h": 94 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 309, "y": 559, "w": 77, "h": 93 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 3, "w": 77, "h": 93 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 386, "y": 565, "w": 77, "h": 93 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 3, "w": 77, "h": 93 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 77, "y": 561, "w": 77, "h": 93 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 3, "w": 77, "h": 93 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 230, "y": 562, "w": 77, "h": 93 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 3, "w": 77, "h": 93 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 0, "y": 472, "w": 77, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 2, "w": 77, "h": 94 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0088.png",
+    "frame": { "x": 0, "y": 377, "w": 77, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 1, "w": 77, "h": 95 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0089.png",
+    "frame": { "x": 155, "y": 377, "w": 77, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 1, "w": 77, "h": 95 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0090.png",
+    "frame": { "x": 0, "y": 281, "w": 77, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 0, "w": 77, "h": 96 },
+    "sourceSize": { "w": 106, "h": 96 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.13-x64",
+  "image": "839-gigantamax.png",
+  "format": "I8",
+  "size": { "w": 622, "h": 661 },
+  "scale": "1"
+ }
+}
diff --git a/public/images/pokemon/exp/back/shiny/839-gigantamax.png b/public/images/pokemon/exp/back/shiny/839-gigantamax.png
new file mode 100644
index 00000000000..ce96d8134a6
Binary files /dev/null and b/public/images/pokemon/exp/back/shiny/839-gigantamax.png differ
diff --git a/public/images/pokemon/exp/back/shiny/840.json b/public/images/pokemon/exp/back/shiny/840.json
index ccacb7508ff..eb5a925c565 100644
--- a/public/images/pokemon/exp/back/shiny/840.json
+++ b/public/images/pokemon/exp/back/shiny/840.json
@@ -1,230 +1,1145 @@
-{
-	"textures": [
-		{
-			"image": "840.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 95,
-				"h": 95
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 42
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 42
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 42
-					},
-					"frame": {
-						"x": 0,
-						"y": 42,
-						"w": 32,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 42
-					},
-					"frame": {
-						"x": 0,
-						"y": 42,
-						"w": 32,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 32,
-						"h": 41
-					},
-					"frame": {
-						"x": 32,
-						"y": 0,
-						"w": 32,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 32,
-						"h": 41
-					},
-					"frame": {
-						"x": 32,
-						"y": 0,
-						"w": 32,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 31,
-						"h": 42
-					},
-					"frame": {
-						"x": 64,
-						"y": 0,
-						"w": 31,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 31,
-						"h": 42
-					},
-					"frame": {
-						"x": 32,
-						"y": 41,
-						"w": 31,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 31,
-						"h": 41
-					},
-					"frame": {
-						"x": 63,
-						"y": 42,
-						"w": 31,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 31,
-						"h": 41
-					},
-					"frame": {
-						"x": 63,
-						"y": 42,
-						"w": 31,
-						"h": 41
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:c19a2ef85c7903c2a4c922be93e361d7:7a1608b4463c8ee6cb033125d1c506b4:c6a93eb4343acba47be6c18cd2c93ef1$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 73, "y": 44, "w": 33, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 33, "h": 41 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 136, "y": 90, "w": 33, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 33, "h": 40 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 171, "y": 91, "w": 33, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 33, "h": 40 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 37, "y": 44, "w": 34, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 34, "h": 40 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 79, "y": 2, "w": 35, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 35, "h": 40 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 41, "y": 2, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 36, "h": 40 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 2, "y": 2, "w": 37, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 37, "h": 40 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 2, "y": 2, "w": 37, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 37, "h": 40 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 2, "y": 2, "w": 37, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 37, "h": 40 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 116, "y": 2, "w": 34, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 34, "h": 41 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 35, "y": 131, "w": 33, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 33, "h": 40 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 136, "y": 132, "w": 33, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 33, "h": 40 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 171, "y": 133, "w": 33, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 33, "h": 40 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 73, "y": 44, "w": 33, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 33, "h": 41 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 73, "y": 44, "w": 33, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 33, "h": 41 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 152, "y": 2, "w": 33, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 33, "h": 42 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 108, "y": 45, "w": 32, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 32, "h": 42 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 176, "y": 46, "w": 31, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 31, "h": 43 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 37, "y": 86, "w": 31, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 31, "h": 43 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 70, "y": 87, "w": 31, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 31, "h": 43 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 2, "y": 88, "w": 31, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 31, "h": 43 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 2, "y": 88, "w": 31, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 31, "h": 43 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 2, "y": 88, "w": 31, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 31, "h": 43 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 70, "y": 132, "w": 30, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 30, "h": 43 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 103, "y": 89, "w": 31, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 31, "h": 43 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 142, "y": 46, "w": 32, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 32, "h": 42 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 187, "y": 2, "w": 33, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 33, "h": 42 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 2, "y": 44, "w": 33, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 33, "h": 42 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 73, "y": 44, "w": 33, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 33, "h": 41 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 73, "y": 44, "w": 33, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 33, "h": 41 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 73, "y": 44, "w": 33, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 33, "h": 41 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 73, "y": 44, "w": 33, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 33, "h": 41 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 73, "y": 44, "w": 33, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 33, "h": 41 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 136, "y": 90, "w": 33, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 33, "h": 40 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 171, "y": 91, "w": 33, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 33, "h": 40 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 37, "y": 44, "w": 34, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 34, "h": 40 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 79, "y": 2, "w": 35, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 35, "h": 40 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 41, "y": 2, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 36, "h": 40 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 2, "y": 2, "w": 37, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 37, "h": 40 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 2, "y": 2, "w": 37, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 37, "h": 40 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 2, "y": 2, "w": 37, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 37, "h": 40 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 116, "y": 2, "w": 34, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 34, "h": 41 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 35, "y": 131, "w": 33, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 33, "h": 40 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 136, "y": 132, "w": 33, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 33, "h": 40 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 171, "y": 133, "w": 33, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 33, "h": 40 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 73, "y": 44, "w": 33, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 33, "h": 41 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 73, "y": 44, "w": 33, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 33, "h": 41 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 152, "y": 2, "w": 33, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 33, "h": 42 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 108, "y": 45, "w": 32, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 32, "h": 42 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 176, "y": 46, "w": 31, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 31, "h": 43 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 37, "y": 86, "w": 31, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 31, "h": 43 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 70, "y": 87, "w": 31, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 31, "h": 43 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 2, "y": 88, "w": 31, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 31, "h": 43 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 2, "y": 88, "w": 31, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 31, "h": 43 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 2, "y": 88, "w": 31, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 31, "h": 43 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 70, "y": 132, "w": 30, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 30, "h": 43 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 103, "y": 89, "w": 31, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 31, "h": 43 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 142, "y": 46, "w": 32, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 32, "h": 42 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 187, "y": 2, "w": 33, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 33, "h": 42 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 2, "y": 44, "w": 33, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 33, "h": 42 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 73, "y": 44, "w": 33, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 33, "h": 41 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 73, "y": 44, "w": 33, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 33, "h": 41 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 73, "y": 44, "w": 33, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 33, "h": 41 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 73, "y": 44, "w": 33, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 33, "h": 41 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 73, "y": 44, "w": 33, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 33, "h": 41 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 136, "y": 90, "w": 33, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 33, "h": 40 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 171, "y": 91, "w": 33, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 33, "h": 40 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 37, "y": 44, "w": 34, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 34, "h": 40 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 79, "y": 2, "w": 35, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 35, "h": 40 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 41, "y": 2, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 36, "h": 40 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 2, "y": 2, "w": 37, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 37, "h": 40 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 2, "y": 2, "w": 37, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 37, "h": 40 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 2, "y": 2, "w": 37, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 37, "h": 40 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 116, "y": 2, "w": 34, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 34, "h": 41 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 35, "y": 131, "w": 33, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 33, "h": 40 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 136, "y": 132, "w": 33, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 33, "h": 40 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 171, "y": 133, "w": 33, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 33, "h": 40 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 73, "y": 44, "w": 33, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 33, "h": 41 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 73, "y": 44, "w": 33, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 33, "h": 41 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 152, "y": 2, "w": 33, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 33, "h": 42 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 108, "y": 45, "w": 32, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 32, "h": 42 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 176, "y": 46, "w": 31, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 31, "h": 43 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 37, "y": 86, "w": 31, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 31, "h": 43 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 70, "y": 87, "w": 31, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 31, "h": 43 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 2, "y": 88, "w": 31, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 31, "h": 43 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 2, "y": 88, "w": 31, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 31, "h": 43 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 2, "y": 88, "w": 31, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 31, "h": 43 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0088.png",
+    "frame": { "x": 70, "y": 132, "w": 30, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 30, "h": 43 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0089.png",
+    "frame": { "x": 103, "y": 89, "w": 31, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 31, "h": 43 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0090.png",
+    "frame": { "x": 142, "y": 46, "w": 32, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 32, "h": 42 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0091.png",
+    "frame": { "x": 187, "y": 2, "w": 33, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 33, "h": 42 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0092.png",
+    "frame": { "x": 2, "y": 44, "w": 33, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 33, "h": 42 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0093.png",
+    "frame": { "x": 73, "y": 44, "w": 33, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 33, "h": 41 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0094.png",
+    "frame": { "x": 73, "y": 44, "w": 33, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 33, "h": 41 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0095.png",
+    "frame": { "x": 73, "y": 44, "w": 33, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 33, "h": 41 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0096.png",
+    "frame": { "x": 73, "y": 44, "w": 33, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 33, "h": 41 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0097.png",
+    "frame": { "x": 73, "y": 44, "w": 33, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 33, "h": 41 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0098.png",
+    "frame": { "x": 2, "y": 173, "w": 33, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 33, "h": 39 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0099.png",
+    "frame": { "x": 2, "y": 133, "w": 30, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 9, "w": 30, "h": 34 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0100.png",
+    "frame": { "x": 102, "y": 134, "w": 28, "h": 30 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 12, "w": 28, "h": 30 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0101.png",
+    "frame": { "x": 102, "y": 166, "w": 27, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 17, "w": 27, "h": 25 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0102.png",
+    "frame": { "x": 102, "y": 166, "w": 27, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 17, "w": 27, "h": 25 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0103.png",
+    "frame": { "x": 102, "y": 166, "w": 27, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 17, "w": 27, "h": 25 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0104.png",
+    "frame": { "x": 102, "y": 166, "w": 27, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 15, "w": 27, "h": 25 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0105.png",
+    "frame": { "x": 102, "y": 166, "w": 27, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 13, "w": 27, "h": 25 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0106.png",
+    "frame": { "x": 102, "y": 166, "w": 27, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 12, "w": 27, "h": 25 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0107.png",
+    "frame": { "x": 102, "y": 166, "w": 27, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 11, "w": 27, "h": 25 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0108.png",
+    "frame": { "x": 102, "y": 166, "w": 27, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 11, "w": 27, "h": 25 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0109.png",
+    "frame": { "x": 102, "y": 166, "w": 27, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 12, "w": 27, "h": 25 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0110.png",
+    "frame": { "x": 102, "y": 166, "w": 27, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 14, "w": 27, "h": 25 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0111.png",
+    "frame": { "x": 102, "y": 166, "w": 27, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 17, "w": 27, "h": 25 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0112.png",
+    "frame": { "x": 102, "y": 166, "w": 27, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 17, "w": 27, "h": 25 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0113.png",
+    "frame": { "x": 102, "y": 166, "w": 27, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 15, "w": 27, "h": 25 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0114.png",
+    "frame": { "x": 102, "y": 166, "w": 27, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 13, "w": 27, "h": 25 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0115.png",
+    "frame": { "x": 102, "y": 166, "w": 27, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 12, "w": 27, "h": 25 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0116.png",
+    "frame": { "x": 102, "y": 166, "w": 27, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 11, "w": 27, "h": 25 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0117.png",
+    "frame": { "x": 102, "y": 166, "w": 27, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 11, "w": 27, "h": 25 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0118.png",
+    "frame": { "x": 102, "y": 166, "w": 27, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 12, "w": 27, "h": 25 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0119.png",
+    "frame": { "x": 102, "y": 166, "w": 27, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 14, "w": 27, "h": 25 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0120.png",
+    "frame": { "x": 102, "y": 166, "w": 27, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 17, "w": 27, "h": 25 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0121.png",
+    "frame": { "x": 102, "y": 166, "w": 27, "h": 25 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 17, "w": 27, "h": 25 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0122.png",
+    "frame": { "x": 102, "y": 134, "w": 28, "h": 30 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 12, "w": 28, "h": 30 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0123.png",
+    "frame": { "x": 2, "y": 133, "w": 30, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 9, "w": 30, "h": 34 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0124.png",
+    "frame": { "x": 2, "y": 173, "w": 33, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 33, "h": 39 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0125.png",
+    "frame": { "x": 73, "y": 44, "w": 33, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 33, "h": 41 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   },
+   {
+    "filename": "0126.png",
+    "frame": { "x": 73, "y": 44, "w": 33, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 33, "h": 41 },
+    "sourceSize": { "w": 37, "h": 44 },
+    "duration": 80
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.13-x64",
+  "image": "840.png",
+  "format": "I8",
+  "size": { "w": 222, "h": 214 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/shiny/840.png b/public/images/pokemon/exp/back/shiny/840.png
index 9a800ab956c..e37bd252d7b 100644
Binary files a/public/images/pokemon/exp/back/shiny/840.png and b/public/images/pokemon/exp/back/shiny/840.png differ
diff --git a/public/images/pokemon/exp/back/shiny/935.json b/public/images/pokemon/exp/back/shiny/935.json
deleted file mode 100644
index 2bdf2b2a155..00000000000
--- a/public/images/pokemon/exp/back/shiny/935.json
+++ /dev/null
@@ -1,356 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "935.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 133,
-				"h": 133
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 29,
-						"h": 49
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 29,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 29,
-						"h": 49
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 29,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 29,
-						"h": 49
-					},
-					"frame": {
-						"x": 29,
-						"y": 0,
-						"w": 29,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 29,
-						"h": 49
-					},
-					"frame": {
-						"x": 29,
-						"y": 0,
-						"w": 29,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 28,
-						"h": 49
-					},
-					"frame": {
-						"x": 58,
-						"y": 0,
-						"w": 28,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 28,
-						"h": 49
-					},
-					"frame": {
-						"x": 58,
-						"y": 0,
-						"w": 28,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 28,
-						"h": 49
-					},
-					"frame": {
-						"x": 86,
-						"y": 0,
-						"w": 28,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 28,
-						"h": 49
-					},
-					"frame": {
-						"x": 86,
-						"y": 0,
-						"w": 28,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 28,
-						"h": 48
-					},
-					"frame": {
-						"x": 0,
-						"y": 49,
-						"w": 28,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 28,
-						"h": 48
-					},
-					"frame": {
-						"x": 0,
-						"y": 49,
-						"w": 28,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 27,
-						"h": 48
-					},
-					"frame": {
-						"x": 28,
-						"y": 49,
-						"w": 27,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 2,
-						"w": 27,
-						"h": 47
-					},
-					"frame": {
-						"x": 55,
-						"y": 49,
-						"w": 27,
-						"h": 47
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 2,
-						"w": 27,
-						"h": 47
-					},
-					"frame": {
-						"x": 55,
-						"y": 49,
-						"w": 27,
-						"h": 47
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 3,
-						"w": 26,
-						"h": 46
-					},
-					"frame": {
-						"x": 82,
-						"y": 49,
-						"w": 26,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 3,
-						"w": 26,
-						"h": 46
-					},
-					"frame": {
-						"x": 82,
-						"y": 49,
-						"w": 26,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 4,
-						"w": 25,
-						"h": 45
-					},
-					"frame": {
-						"x": 108,
-						"y": 49,
-						"w": 25,
-						"h": 45
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:039aaaf52028b39c07e4909a88a5e8bb:1e66e8f98dd44fa06a53d364e32b154b:077dcf06dc5fc347497b59afe6126a5e$"
-	}
-}
diff --git a/public/images/pokemon/exp/back/shiny/935.png b/public/images/pokemon/exp/back/shiny/935.png
deleted file mode 100644
index bdd1ef192ad..00000000000
Binary files a/public/images/pokemon/exp/back/shiny/935.png and /dev/null differ
diff --git a/public/images/pokemon/exp/back/shiny/936.json b/public/images/pokemon/exp/back/shiny/936.json
deleted file mode 100644
index 295267305ad..00000000000
--- a/public/images/pokemon/exp/back/shiny/936.json
+++ /dev/null
@@ -1,356 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "936.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 283,
-				"h": 283
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 0,
-						"w": 59,
-						"h": 97
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 59,
-						"h": 97
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 0,
-						"w": 59,
-						"h": 97
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 59,
-						"h": 97
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 59,
-						"h": 97
-					},
-					"frame": {
-						"x": 0,
-						"y": 97,
-						"w": 59,
-						"h": 97
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 59,
-						"h": 97
-					},
-					"frame": {
-						"x": 0,
-						"y": 97,
-						"w": 59,
-						"h": 97
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 59,
-						"h": 97
-					},
-					"frame": {
-						"x": 59,
-						"y": 0,
-						"w": 59,
-						"h": 97
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 59,
-						"h": 97
-					},
-					"frame": {
-						"x": 59,
-						"y": 0,
-						"w": 59,
-						"h": 97
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 0,
-						"w": 58,
-						"h": 97
-					},
-					"frame": {
-						"x": 59,
-						"y": 97,
-						"w": 58,
-						"h": 97
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 0,
-						"w": 58,
-						"h": 97
-					},
-					"frame": {
-						"x": 59,
-						"y": 97,
-						"w": 58,
-						"h": 97
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 58,
-						"h": 97
-					},
-					"frame": {
-						"x": 117,
-						"y": 97,
-						"w": 58,
-						"h": 97
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 58,
-						"h": 97
-					},
-					"frame": {
-						"x": 117,
-						"y": 97,
-						"w": 58,
-						"h": 97
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 1,
-						"w": 57,
-						"h": 96
-					},
-					"frame": {
-						"x": 118,
-						"y": 0,
-						"w": 57,
-						"h": 96
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 1,
-						"w": 57,
-						"h": 96
-					},
-					"frame": {
-						"x": 118,
-						"y": 0,
-						"w": 57,
-						"h": 96
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 58,
-						"h": 95
-					},
-					"frame": {
-						"x": 175,
-						"y": 0,
-						"w": 58,
-						"h": 95
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 58,
-						"h": 95
-					},
-					"frame": {
-						"x": 175,
-						"y": 0,
-						"w": 58,
-						"h": 95
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 58,
-						"h": 94
-					},
-					"frame": {
-						"x": 175,
-						"y": 95,
-						"w": 58,
-						"h": 94
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 3,
-						"w": 57,
-						"h": 94
-					},
-					"frame": {
-						"x": 175,
-						"y": 189,
-						"w": 57,
-						"h": 94
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:28e584ed8d8aaebb8c9edc4517b84f45:09d8ad02433d8015e4665464587b1259:1a0490303f9626f92e787c567cd10feb$"
-	}
-}
diff --git a/public/images/pokemon/exp/back/shiny/936.png b/public/images/pokemon/exp/back/shiny/936.png
deleted file mode 100644
index 14b0c1c7bf2..00000000000
Binary files a/public/images/pokemon/exp/back/shiny/936.png and /dev/null differ
diff --git a/public/images/pokemon/exp/back/shiny/937.json b/public/images/pokemon/exp/back/shiny/937.json
deleted file mode 100644
index 1a94f5525d2..00000000000
--- a/public/images/pokemon/exp/back/shiny/937.json
+++ /dev/null
@@ -1,650 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "937.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 382,
-				"h": 382
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 91,
-						"h": 96
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 91,
-						"h": 96
-					}
-				},
-				{
-					"filename": "0028.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 91,
-						"h": 96
-					},
-					"frame": {
-						"x": 91,
-						"y": 0,
-						"w": 91,
-						"h": 96
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 90,
-						"h": 96
-					},
-					"frame": {
-						"x": 182,
-						"y": 0,
-						"w": 90,
-						"h": 96
-					}
-				},
-				{
-					"filename": "0027.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 90,
-						"h": 96
-					},
-					"frame": {
-						"x": 182,
-						"y": 0,
-						"w": 90,
-						"h": 96
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 89,
-						"h": 96
-					},
-					"frame": {
-						"x": 272,
-						"y": 0,
-						"w": 89,
-						"h": 96
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 89,
-						"h": 96
-					},
-					"frame": {
-						"x": 272,
-						"y": 0,
-						"w": 89,
-						"h": 96
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 91,
-						"h": 95
-					},
-					"frame": {
-						"x": 0,
-						"y": 96,
-						"w": 91,
-						"h": 95
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 91,
-						"h": 95
-					},
-					"frame": {
-						"x": 0,
-						"y": 96,
-						"w": 91,
-						"h": 95
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 89,
-						"h": 95
-					},
-					"frame": {
-						"x": 91,
-						"y": 96,
-						"w": 89,
-						"h": 95
-					}
-				},
-				{
-					"filename": "0026.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 89,
-						"h": 95
-					},
-					"frame": {
-						"x": 91,
-						"y": 96,
-						"w": 89,
-						"h": 95
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 88,
-						"h": 96
-					},
-					"frame": {
-						"x": 180,
-						"y": 96,
-						"w": 88,
-						"h": 96
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 88,
-						"h": 96
-					},
-					"frame": {
-						"x": 180,
-						"y": 96,
-						"w": 88,
-						"h": 96
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 88,
-						"h": 96
-					},
-					"frame": {
-						"x": 0,
-						"y": 191,
-						"w": 88,
-						"h": 96
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 88,
-						"h": 96
-					},
-					"frame": {
-						"x": 0,
-						"y": 191,
-						"w": 88,
-						"h": 96
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 88,
-						"h": 96
-					},
-					"frame": {
-						"x": 88,
-						"y": 191,
-						"w": 88,
-						"h": 96
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 88,
-						"h": 96
-					},
-					"frame": {
-						"x": 88,
-						"y": 191,
-						"w": 88,
-						"h": 96
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 87,
-						"h": 96
-					},
-					"frame": {
-						"x": 176,
-						"y": 192,
-						"w": 87,
-						"h": 96
-					}
-				},
-				{
-					"filename": "0025.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 87,
-						"h": 96
-					},
-					"frame": {
-						"x": 176,
-						"y": 192,
-						"w": 87,
-						"h": 96
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 85,
-						"h": 95
-					},
-					"frame": {
-						"x": 0,
-						"y": 287,
-						"w": 85,
-						"h": 95
-					}
-				},
-				{
-					"filename": "0029.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 85,
-						"h": 95
-					},
-					"frame": {
-						"x": 0,
-						"y": 287,
-						"w": 85,
-						"h": 95
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 85,
-						"h": 94
-					},
-					"frame": {
-						"x": 85,
-						"y": 287,
-						"w": 85,
-						"h": 94
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 85,
-						"h": 94
-					},
-					"frame": {
-						"x": 85,
-						"y": 287,
-						"w": 85,
-						"h": 94
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 82,
-						"h": 96
-					},
-					"frame": {
-						"x": 263,
-						"y": 192,
-						"w": 82,
-						"h": 96
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 82,
-						"h": 96
-					},
-					"frame": {
-						"x": 263,
-						"y": 192,
-						"w": 82,
-						"h": 96
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 3,
-						"w": 85,
-						"h": 93
-					},
-					"frame": {
-						"x": 268,
-						"y": 96,
-						"w": 85,
-						"h": 93
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 3,
-						"w": 85,
-						"h": 93
-					},
-					"frame": {
-						"x": 268,
-						"y": 96,
-						"w": 85,
-						"h": 93
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 81,
-						"h": 94
-					},
-					"frame": {
-						"x": 170,
-						"y": 288,
-						"w": 81,
-						"h": 94
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 81,
-						"h": 94
-					},
-					"frame": {
-						"x": 170,
-						"y": 288,
-						"w": 81,
-						"h": 94
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 80,
-						"h": 94
-					},
-					"frame": {
-						"x": 251,
-						"y": 288,
-						"w": 80,
-						"h": 94
-					}
-				},
-				{
-					"filename": "0030.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 80,
-						"h": 94
-					},
-					"frame": {
-						"x": 251,
-						"y": 288,
-						"w": 80,
-						"h": 94
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:d3ac9f14a29e2d6136e96b1fbd1551c7:0076c777d18a4f3d780937118dfb6388:1d4b4f8d62307c37457ba974879b47d0$"
-	}
-}
diff --git a/public/images/pokemon/exp/back/shiny/937.png b/public/images/pokemon/exp/back/shiny/937.png
deleted file mode 100644
index 676950a1999..00000000000
Binary files a/public/images/pokemon/exp/back/shiny/937.png and /dev/null differ
diff --git a/public/images/pokemon/exp/708.json b/public/images/pokemon/exp/back/shiny/female/6215.json
similarity index 62%
rename from public/images/pokemon/exp/708.json
rename to public/images/pokemon/exp/back/shiny/female/6215.json
index f03fc408ded..07510ceaa55 100644
--- a/public/images/pokemon/exp/708.json
+++ b/public/images/pokemon/exp/back/shiny/female/6215.json
@@ -1,432 +1,33 @@
 {
 	"textures": [
 		{
-			"image": "708.png",
+			"image": "6215.png",
 			"format": "RGBA8888",
 			"size": {
-				"w": 206,
-				"h": 206
+				"w": 155,
+				"h": 155
 			},
 			"scale": 1,
 			"frames": [
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 2,
-						"w": 51,
-						"h": 43
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 51,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 2,
-						"w": 51,
-						"h": 43
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 51,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0027.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 2,
-						"w": 51,
-						"h": 43
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 51,
-						"h": 43
-					}
-				},
 				{
 					"filename": "0007.png",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 58,
-						"h": 47
+						"w": 54,
+						"h": 50
 					},
 					"spriteSourceSize": {
-						"x": 5,
-						"y": 4,
-						"w": 51,
-						"h": 43
-					},
-					"frame": {
 						"x": 0,
-						"y": 43,
-						"w": 51,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 4,
-						"w": 51,
-						"h": 43
-					},
-					"frame": {
-						"x": 0,
-						"y": 43,
-						"w": 51,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0031.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 4,
-						"w": 51,
-						"h": 43
-					},
-					"frame": {
-						"x": 0,
-						"y": 43,
-						"w": 51,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 2,
 						"y": 1,
-						"w": 51,
-						"h": 43
+						"w": 54,
+						"h": 49
 					},
 					"frame": {
 						"x": 0,
-						"y": 86,
-						"w": 51,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 51,
-						"h": 43
-					},
-					"frame": {
-						"x": 0,
-						"y": 86,
-						"w": 51,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0035.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 51,
-						"h": 43
-					},
-					"frame": {
-						"x": 0,
-						"y": 86,
-						"w": 51,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 51,
-						"h": 42
-					},
-					"frame": {
-						"x": 0,
-						"y": 129,
-						"w": 51,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 51,
-						"h": 42
-					},
-					"frame": {
-						"x": 0,
-						"y": 129,
-						"w": 51,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0025.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 51,
-						"h": 42
-					},
-					"frame": {
-						"x": 0,
-						"y": 129,
-						"w": 51,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0037.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 51,
-						"h": 42
-					},
-					"frame": {
-						"x": 0,
-						"y": 129,
-						"w": 51,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0043.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 51,
-						"h": 42
-					},
-					"frame": {
-						"x": 0,
-						"y": 129,
-						"w": 51,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 2,
-						"w": 51,
-						"h": 42
-					},
-					"frame": {
-						"x": 51,
 						"y": 0,
-						"w": 51,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 2,
-						"w": 51,
-						"h": 42
-					},
-					"frame": {
-						"x": 51,
-						"y": 0,
-						"w": 51,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0026.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 2,
-						"w": 51,
-						"h": 42
-					},
-					"frame": {
-						"x": 51,
-						"y": 0,
-						"w": 51,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 4,
-						"w": 51,
-						"h": 42
-					},
-					"frame": {
-						"x": 51,
-						"y": 42,
-						"w": 51,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 4,
-						"w": 51,
-						"h": 42
-					},
-					"frame": {
-						"x": 51,
-						"y": 42,
-						"w": 51,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0028.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 4,
-						"w": 51,
-						"h": 42
-					},
-					"frame": {
-						"x": 51,
-						"y": 42,
-						"w": 51,
-						"h": 42
+						"w": 54,
+						"h": 49
 					}
 				},
 				{
@@ -434,20 +35,41 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 58,
-						"h": 47
+						"w": 54,
+						"h": 50
 					},
 					"spriteSourceSize": {
-						"x": 4,
-						"y": 4,
-						"w": 51,
-						"h": 42
+						"x": 0,
+						"y": 1,
+						"w": 54,
+						"h": 49
 					},
 					"frame": {
-						"x": 51,
-						"y": 84,
-						"w": 51,
-						"h": 42
+						"x": 0,
+						"y": 0,
+						"w": 54,
+						"h": 49
+					}
+				},
+				{
+					"filename": "0019.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 54,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 1,
+						"w": 54,
+						"h": 49
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 54,
+						"h": 49
 					}
 				},
 				{
@@ -455,20 +77,41 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 58,
-						"h": 47
+						"w": 54,
+						"h": 50
 					},
 					"spriteSourceSize": {
-						"x": 4,
-						"y": 4,
-						"w": 51,
-						"h": 42
+						"x": 0,
+						"y": 1,
+						"w": 54,
+						"h": 49
 					},
 					"frame": {
-						"x": 51,
-						"y": 84,
-						"w": 51,
-						"h": 42
+						"x": 0,
+						"y": 0,
+						"w": 54,
+						"h": 49
+					}
+				},
+				{
+					"filename": "0031.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 54,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 1,
+						"w": 54,
+						"h": 49
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 54,
+						"h": 49
 					}
 				},
 				{
@@ -476,461 +119,41 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 58,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 4,
-						"w": 51,
-						"h": 42
-					},
-					"frame": {
-						"x": 51,
-						"y": 84,
-						"w": 51,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 51,
-						"h": 42
-					},
-					"frame": {
-						"x": 51,
-						"y": 126,
-						"w": 51,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 51,
-						"h": 42
-					},
-					"frame": {
-						"x": 51,
-						"y": 126,
-						"w": 51,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0033.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 51,
-						"h": 42
-					},
-					"frame": {
-						"x": 51,
-						"y": 126,
-						"w": 51,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 2,
-						"w": 51,
-						"h": 42
-					},
-					"frame": {
-						"x": 102,
-						"y": 0,
-						"w": 51,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 2,
-						"w": 51,
-						"h": 42
-					},
-					"frame": {
-						"x": 102,
-						"y": 0,
-						"w": 51,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0034.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 2,
-						"w": 51,
-						"h": 42
-					},
-					"frame": {
-						"x": 102,
-						"y": 0,
-						"w": 51,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 51,
-						"h": 42
-					},
-					"frame": {
-						"x": 102,
-						"y": 42,
-						"w": 51,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 51,
-						"h": 42
-					},
-					"frame": {
-						"x": 102,
-						"y": 42,
-						"w": 51,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0036.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 51,
-						"h": 42
-					},
-					"frame": {
-						"x": 102,
-						"y": 42,
-						"w": 51,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 6,
-						"w": 51,
-						"h": 41
-					},
-					"frame": {
-						"x": 102,
-						"y": 84,
-						"w": 51,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 6,
-						"w": 51,
-						"h": 41
-					},
-					"frame": {
-						"x": 102,
-						"y": 84,
-						"w": 51,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0029.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 6,
-						"w": 51,
-						"h": 41
-					},
-					"frame": {
-						"x": 102,
-						"y": 84,
-						"w": 51,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 6,
-						"w": 51,
-						"h": 41
-					},
-					"frame": {
-						"x": 102,
-						"y": 125,
-						"w": 51,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 6,
-						"w": 51,
-						"h": 41
-					},
-					"frame": {
-						"x": 102,
-						"y": 125,
-						"w": 51,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0030.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 6,
-						"w": 51,
-						"h": 41
-					},
-					"frame": {
-						"x": 102,
-						"y": 125,
-						"w": 51,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0040.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 0,
-						"w": 50,
-						"h": 40
-					},
-					"frame": {
-						"x": 102,
-						"y": 166,
-						"w": 50,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0046.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 47
+						"w": 54,
+						"h": 50
 					},
 					"spriteSourceSize": {
 						"x": 0,
-						"y": 6,
-						"w": 50,
-						"h": 40
-					},
-					"frame": {
-						"x": 152,
-						"y": 166,
-						"w": 50,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0038.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 6,
 						"y": 1,
-						"w": 51,
-						"h": 41
+						"w": 54,
+						"h": 49
 					},
 					"frame": {
-						"x": 153,
+						"x": 0,
 						"y": 0,
-						"w": 51,
-						"h": 41
+						"w": 54,
+						"h": 49
 					}
 				},
 				{
-					"filename": "0042.png",
+					"filename": "0043.png",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 58,
-						"h": 47
+						"w": 54,
+						"h": 50
 					},
 					"spriteSourceSize": {
-						"x": 6,
+						"x": 0,
 						"y": 1,
-						"w": 51,
-						"h": 41
+						"w": 54,
+						"h": 49
 					},
 					"frame": {
-						"x": 153,
+						"x": 0,
 						"y": 0,
-						"w": 51,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0039.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 51,
-						"h": 41
-					},
-					"frame": {
-						"x": 153,
-						"y": 41,
-						"w": 51,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0041.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 51,
-						"h": 41
-					},
-					"frame": {
-						"x": 153,
-						"y": 41,
-						"w": 51,
-						"h": 41
+						"w": 54,
+						"h": 49
 					}
 				},
 				{
@@ -938,41 +161,146 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 58,
-						"h": 47
+						"w": 54,
+						"h": 50
 					},
 					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 51,
-						"h": 41
+						"x": 0,
+						"y": 1,
+						"w": 54,
+						"h": 49
 					},
 					"frame": {
-						"x": 153,
-						"y": 82,
-						"w": 51,
-						"h": 41
+						"x": 0,
+						"y": 0,
+						"w": 54,
+						"h": 49
 					}
 				},
 				{
-					"filename": "0048.png",
+					"filename": "0005.png",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 58,
-						"h": 47
+						"w": 54,
+						"h": 50
 					},
 					"spriteSourceSize": {
-						"x": 2,
+						"x": 0,
 						"y": 3,
-						"w": 51,
-						"h": 41
+						"w": 54,
+						"h": 47
 					},
 					"frame": {
-						"x": 153,
-						"y": 82,
-						"w": 51,
-						"h": 41
+						"x": 54,
+						"y": 0,
+						"w": 54,
+						"h": 47
+					}
+				},
+				{
+					"filename": "0006.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 54,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 3,
+						"w": 54,
+						"h": 47
+					},
+					"frame": {
+						"x": 54,
+						"y": 0,
+						"w": 54,
+						"h": 47
+					}
+				},
+				{
+					"filename": "0021.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 54,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 3,
+						"w": 54,
+						"h": 47
+					},
+					"frame": {
+						"x": 54,
+						"y": 0,
+						"w": 54,
+						"h": 47
+					}
+				},
+				{
+					"filename": "0022.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 54,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 3,
+						"w": 54,
+						"h": 47
+					},
+					"frame": {
+						"x": 54,
+						"y": 0,
+						"w": 54,
+						"h": 47
+					}
+				},
+				{
+					"filename": "0029.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 54,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 3,
+						"w": 54,
+						"h": 47
+					},
+					"frame": {
+						"x": 54,
+						"y": 0,
+						"w": 54,
+						"h": 47
+					}
+				},
+				{
+					"filename": "0030.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 54,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 3,
+						"w": 54,
+						"h": 47
+					},
+					"frame": {
+						"x": 54,
+						"y": 0,
+						"w": 54,
+						"h": 47
 					}
 				},
 				{
@@ -980,20 +308,167 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 58,
+						"w": 54,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 3,
+						"w": 54,
 						"h": 47
 					},
+					"frame": {
+						"x": 54,
+						"y": 0,
+						"w": 54,
+						"h": 47
+					}
+				},
+				{
+					"filename": "0046.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 54,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 3,
+						"w": 54,
+						"h": 47
+					},
+					"frame": {
+						"x": 54,
+						"y": 0,
+						"w": 54,
+						"h": 47
+					}
+				},
+				{
+					"filename": "0003.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 54,
+						"h": 50
+					},
 					"spriteSourceSize": {
 						"x": 0,
 						"y": 4,
-						"w": 51,
-						"h": 41
+						"w": 54,
+						"h": 46
 					},
 					"frame": {
-						"x": 153,
-						"y": 123,
-						"w": 51,
-						"h": 41
+						"x": 54,
+						"y": 47,
+						"w": 54,
+						"h": 46
+					}
+				},
+				{
+					"filename": "0004.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 54,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 4,
+						"w": 54,
+						"h": 46
+					},
+					"frame": {
+						"x": 54,
+						"y": 47,
+						"w": 54,
+						"h": 46
+					}
+				},
+				{
+					"filename": "0023.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 54,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 4,
+						"w": 54,
+						"h": 46
+					},
+					"frame": {
+						"x": 54,
+						"y": 47,
+						"w": 54,
+						"h": 46
+					}
+				},
+				{
+					"filename": "0024.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 54,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 4,
+						"w": 54,
+						"h": 46
+					},
+					"frame": {
+						"x": 54,
+						"y": 47,
+						"w": 54,
+						"h": 46
+					}
+				},
+				{
+					"filename": "0027.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 54,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 4,
+						"w": 54,
+						"h": 46
+					},
+					"frame": {
+						"x": 54,
+						"y": 47,
+						"w": 54,
+						"h": 46
+					}
+				},
+				{
+					"filename": "0028.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 54,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 4,
+						"w": 54,
+						"h": 46
+					},
+					"frame": {
+						"x": 54,
+						"y": 47,
+						"w": 54,
+						"h": 46
 					}
 				},
 				{
@@ -1001,20 +476,545 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 58,
-						"h": 47
+						"w": 54,
+						"h": 50
 					},
 					"spriteSourceSize": {
 						"x": 0,
 						"y": 4,
-						"w": 51,
-						"h": 41
+						"w": 54,
+						"h": 46
 					},
 					"frame": {
-						"x": 153,
-						"y": 123,
+						"x": 54,
+						"y": 47,
+						"w": 54,
+						"h": 46
+					}
+				},
+				{
+					"filename": "0048.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 54,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 4,
+						"w": 54,
+						"h": 46
+					},
+					"frame": {
+						"x": 54,
+						"y": 47,
+						"w": 54,
+						"h": 46
+					}
+				},
+				{
+					"filename": "0001.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 54,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 6,
+						"w": 54,
+						"h": 44
+					},
+					"frame": {
+						"x": 0,
+						"y": 49,
+						"w": 54,
+						"h": 44
+					}
+				},
+				{
+					"filename": "0002.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 54,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 6,
+						"w": 54,
+						"h": 44
+					},
+					"frame": {
+						"x": 0,
+						"y": 49,
+						"w": 54,
+						"h": 44
+					}
+				},
+				{
+					"filename": "0025.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 54,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 6,
+						"w": 54,
+						"h": 44
+					},
+					"frame": {
+						"x": 0,
+						"y": 49,
+						"w": 54,
+						"h": 44
+					}
+				},
+				{
+					"filename": "0026.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 54,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 6,
+						"w": 54,
+						"h": 44
+					},
+					"frame": {
+						"x": 0,
+						"y": 49,
+						"w": 54,
+						"h": 44
+					}
+				},
+				{
+					"filename": "0009.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 54,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 0,
+						"w": 52,
+						"h": 50
+					},
+					"frame": {
+						"x": 0,
+						"y": 93,
+						"w": 52,
+						"h": 50
+					}
+				},
+				{
+					"filename": "0010.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 54,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 0,
+						"w": 52,
+						"h": 50
+					},
+					"frame": {
+						"x": 0,
+						"y": 93,
+						"w": 52,
+						"h": 50
+					}
+				},
+				{
+					"filename": "0017.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 54,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 0,
+						"w": 52,
+						"h": 50
+					},
+					"frame": {
+						"x": 0,
+						"y": 93,
+						"w": 52,
+						"h": 50
+					}
+				},
+				{
+					"filename": "0018.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 54,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 0,
+						"w": 52,
+						"h": 50
+					},
+					"frame": {
+						"x": 0,
+						"y": 93,
+						"w": 52,
+						"h": 50
+					}
+				},
+				{
+					"filename": "0033.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 54,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 0,
+						"w": 52,
+						"h": 50
+					},
+					"frame": {
+						"x": 0,
+						"y": 93,
+						"w": 52,
+						"h": 50
+					}
+				},
+				{
+					"filename": "0034.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 54,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 0,
+						"w": 52,
+						"h": 50
+					},
+					"frame": {
+						"x": 0,
+						"y": 93,
+						"w": 52,
+						"h": 50
+					}
+				},
+				{
+					"filename": "0035.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 54,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 0,
+						"w": 52,
+						"h": 50
+					},
+					"frame": {
+						"x": 0,
+						"y": 93,
+						"w": 52,
+						"h": 50
+					}
+				},
+				{
+					"filename": "0042.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 54,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 0,
+						"w": 52,
+						"h": 50
+					},
+					"frame": {
+						"x": 0,
+						"y": 93,
+						"w": 52,
+						"h": 50
+					}
+				},
+				{
+					"filename": "0011.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 54,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 0,
+						"w": 52,
+						"h": 50
+					},
+					"frame": {
+						"x": 52,
+						"y": 93,
+						"w": 52,
+						"h": 50
+					}
+				},
+				{
+					"filename": "0012.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 54,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 0,
+						"w": 52,
+						"h": 50
+					},
+					"frame": {
+						"x": 52,
+						"y": 93,
+						"w": 52,
+						"h": 50
+					}
+				},
+				{
+					"filename": "0015.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 54,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 0,
+						"w": 52,
+						"h": 50
+					},
+					"frame": {
+						"x": 52,
+						"y": 93,
+						"w": 52,
+						"h": 50
+					}
+				},
+				{
+					"filename": "0016.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 54,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 0,
+						"w": 52,
+						"h": 50
+					},
+					"frame": {
+						"x": 52,
+						"y": 93,
+						"w": 52,
+						"h": 50
+					}
+				},
+				{
+					"filename": "0036.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 54,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 0,
+						"w": 52,
+						"h": 50
+					},
+					"frame": {
+						"x": 52,
+						"y": 93,
+						"w": 52,
+						"h": 50
+					}
+				},
+				{
+					"filename": "0037.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 54,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 0,
+						"w": 52,
+						"h": 50
+					},
+					"frame": {
+						"x": 52,
+						"y": 93,
+						"w": 52,
+						"h": 50
+					}
+				},
+				{
+					"filename": "0040.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 54,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 0,
+						"w": 52,
+						"h": 50
+					},
+					"frame": {
+						"x": 52,
+						"y": 93,
+						"w": 52,
+						"h": 50
+					}
+				},
+				{
+					"filename": "0041.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 54,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 0,
+						"w": 52,
+						"h": 50
+					},
+					"frame": {
+						"x": 52,
+						"y": 93,
+						"w": 52,
+						"h": 50
+					}
+				},
+				{
+					"filename": "0013.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 54,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 3,
+						"y": 0,
 						"w": 51,
-						"h": 41
+						"h": 50
+					},
+					"frame": {
+						"x": 104,
+						"y": 93,
+						"w": 51,
+						"h": 50
+					}
+				},
+				{
+					"filename": "0014.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 54,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 3,
+						"y": 0,
+						"w": 51,
+						"h": 50
+					},
+					"frame": {
+						"x": 104,
+						"y": 93,
+						"w": 51,
+						"h": 50
+					}
+				},
+				{
+					"filename": "0038.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 54,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 3,
+						"y": 0,
+						"w": 51,
+						"h": 50
+					},
+					"frame": {
+						"x": 104,
+						"y": 93,
+						"w": 51,
+						"h": 50
+					}
+				},
+				{
+					"filename": "0039.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 54,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 3,
+						"y": 0,
+						"w": 51,
+						"h": 50
+					},
+					"frame": {
+						"x": 104,
+						"y": 93,
+						"w": 51,
+						"h": 50
 					}
 				}
 			]
@@ -1023,6 +1023,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:db6408a4e96a3c4552035ce768316e02:28f26069e5c44ed9f6fa66442864f895:796c82c5076b122f2663381836c65843$"
+		"smartupdate": "$TexturePacker:SmartUpdate:7decf4c336c92bdacc5d43bc8590718f:30606c7130f3577df61a85f98b567a88:736cd88647e79ba7896fc74f9406c2fe$"
 	}
 }
diff --git a/public/images/pokemon/exp/back/shiny/female/6215.png b/public/images/pokemon/exp/back/shiny/female/6215.png
new file mode 100644
index 00000000000..3af5e81148c
Binary files /dev/null and b/public/images/pokemon/exp/back/shiny/female/6215.png differ
diff --git a/public/images/pokemon/exp/back/shiny/female/668.json b/public/images/pokemon/exp/back/shiny/female/668.json
new file mode 100644
index 00000000000..8e55af5a4de
--- /dev/null
+++ b/public/images/pokemon/exp/back/shiny/female/668.json
@@ -0,0 +1,820 @@
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 475, "y": 144, "w": 77, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 3, "w": 77, "h": 70 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 76, "y": 214, "w": 76, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 3, "w": 76, "h": 70 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 152, "y": 283, "w": 75, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 4, "w": 75, "h": 69 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 73, "y": 284, "w": 74, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 5, "w": 74, "h": 68 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 460, "y": 350, "w": 74, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 6, "w": 74, "h": 67 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 227, "y": 350, "w": 74, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 6, "w": 74, "h": 67 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 385, "y": 284, "w": 75, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 6, "w": 75, "h": 67 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 472, "y": 283, "w": 77, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 6, "w": 77, "h": 67 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 233, "y": 282, "w": 77, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 5, "w": 77, "h": 68 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 396, "y": 215, "w": 76, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 4, "w": 76, "h": 69 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 0, "y": 214, "w": 76, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 3, "w": 76, "h": 70 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 399, "y": 144, "w": 76, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 2, "w": 76, "h": 71 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 431, "y": 73, "w": 77, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 2, "w": 77, "h": 71 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 242, "y": 142, "w": 77, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 2, "w": 77, "h": 71 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 156, "y": 213, "w": 77, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 3, "w": 77, "h": 70 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 475, "y": 144, "w": 77, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 3, "w": 77, "h": 70 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 76, "y": 214, "w": 76, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 3, "w": 76, "h": 70 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 152, "y": 283, "w": 75, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 4, "w": 75, "h": 69 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 73, "y": 284, "w": 74, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 5, "w": 74, "h": 68 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 460, "y": 350, "w": 74, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 6, "w": 74, "h": 67 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 227, "y": 350, "w": 74, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 6, "w": 74, "h": 67 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 385, "y": 284, "w": 75, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 6, "w": 75, "h": 67 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 472, "y": 283, "w": 77, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 6, "w": 77, "h": 67 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 233, "y": 282, "w": 77, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 5, "w": 77, "h": 68 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 396, "y": 215, "w": 76, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 4, "w": 76, "h": 69 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 0, "y": 214, "w": 76, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 3, "w": 76, "h": 70 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 399, "y": 144, "w": 76, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 2, "w": 76, "h": 71 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 431, "y": 73, "w": 77, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 2, "w": 77, "h": 71 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 242, "y": 142, "w": 77, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 2, "w": 77, "h": 71 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 156, "y": 213, "w": 77, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 3, "w": 77, "h": 70 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 475, "y": 144, "w": 77, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 3, "w": 77, "h": 70 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 76, "y": 214, "w": 76, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 3, "w": 76, "h": 70 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 152, "y": 283, "w": 75, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 4, "w": 75, "h": 69 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 73, "y": 284, "w": 74, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 5, "w": 74, "h": 68 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 460, "y": 350, "w": 74, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 6, "w": 74, "h": 67 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 227, "y": 350, "w": 74, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 6, "w": 74, "h": 67 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 385, "y": 284, "w": 75, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 6, "w": 75, "h": 67 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 472, "y": 283, "w": 77, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 6, "w": 77, "h": 67 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 233, "y": 282, "w": 77, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 5, "w": 77, "h": 68 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 396, "y": 215, "w": 76, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 4, "w": 76, "h": 69 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 0, "y": 214, "w": 76, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 3, "w": 76, "h": 70 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 399, "y": 144, "w": 76, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 2, "w": 76, "h": 71 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 431, "y": 73, "w": 77, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 2, "w": 77, "h": 71 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 242, "y": 142, "w": 77, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 2, "w": 77, "h": 71 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 156, "y": 213, "w": 77, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 3, "w": 77, "h": 70 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 475, "y": 144, "w": 77, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 3, "w": 77, "h": 70 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 76, "y": 214, "w": 76, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 3, "w": 76, "h": 70 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 152, "y": 283, "w": 75, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 4, "w": 75, "h": 69 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 73, "y": 284, "w": 74, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 5, "w": 74, "h": 68 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 460, "y": 350, "w": 74, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 6, "w": 74, "h": 67 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 227, "y": 350, "w": 74, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 6, "w": 74, "h": 67 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 385, "y": 284, "w": 75, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 6, "w": 75, "h": 67 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 472, "y": 283, "w": 77, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 6, "w": 77, "h": 67 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 233, "y": 282, "w": 77, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 5, "w": 77, "h": 68 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 396, "y": 215, "w": 76, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 4, "w": 76, "h": 69 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 0, "y": 214, "w": 76, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 3, "w": 76, "h": 70 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 399, "y": 144, "w": 76, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 2, "w": 76, "h": 71 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 431, "y": 73, "w": 77, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 2, "w": 77, "h": 71 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 242, "y": 142, "w": 77, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 2, "w": 77, "h": 71 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 156, "y": 213, "w": 77, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 3, "w": 77, "h": 70 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 475, "y": 144, "w": 77, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 3, "w": 77, "h": 70 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 0, "y": 144, "w": 78, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 3, "w": 78, "h": 70 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 233, "y": 213, "w": 78, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 4, "w": 78, "h": 69 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 156, "y": 144, "w": 79, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 4, "w": 79, "h": 69 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 319, "y": 144, "w": 80, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 5, "w": 80, "h": 68 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 242, "y": 73, "w": 80, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 4, "w": 80, "h": 69 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 310, "y": 282, "w": 75, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 4, "w": 75, "h": 69 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 534, "y": 350, "w": 71, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 17, "y": 4, "w": 71, "h": 69 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 301, "y": 351, "w": 67, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 3, "w": 67, "h": 73 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 0, "y": 353, "w": 63, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 3, "w": 63, "h": 75 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 204, "y": 417, "w": 63, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 2, "w": 63, "h": 75 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 139, "y": 352, "w": 65, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 3, "w": 65, "h": 73 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 73, "y": 352, "w": 66, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 3, "w": 66, "h": 72 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 368, "y": 351, "w": 69, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 4, "w": 69, "h": 70 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 0, "y": 284, "w": 73, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 4, "w": 73, "h": 69 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 475, "y": 214, "w": 76, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 4, "w": 76, "h": 69 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 319, "y": 212, "w": 77, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 3, "w": 77, "h": 70 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 82, "y": 73, "w": 80, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 2, "w": 80, "h": 71 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 519, "y": 72, "w": 83, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 83, "h": 72 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 434, "y": 0, "w": 85, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 85, "h": 73 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 261, "y": 0, "w": 86, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 86, "h": 73 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 174, "y": 0, "w": 87, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 87, "h": 73 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 87, "y": 0, "w": 87, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 87, "h": 73 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 0, "y": 0, "w": 87, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 87, "h": 73 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 347, "y": 0, "w": 87, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 87, "h": 72 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 519, "y": 0, "w": 85, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 85, "h": 72 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 347, "y": 72, "w": 84, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 84, "h": 72 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0088.png",
+    "frame": { "x": 0, "y": 73, "w": 82, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 2, "w": 82, "h": 71 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0089.png",
+    "frame": { "x": 162, "y": 73, "w": 80, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 2, "w": 80, "h": 71 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0090.png",
+    "frame": { "x": 78, "y": 144, "w": 78, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 3, "w": 78, "h": 70 },
+    "sourceSize": { "w": 89, "h": 78 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.11-x64",
+  "format": "I8",
+  "size": { "w": 605, "h": 492 },
+  "scale": "1"
+ }
+}
diff --git a/public/images/pokemon/exp/back/shiny/female/668.png b/public/images/pokemon/exp/back/shiny/female/668.png
new file mode 100644
index 00000000000..cec15d8fcb7
Binary files /dev/null and b/public/images/pokemon/exp/back/shiny/female/668.png differ
diff --git a/public/images/pokemon/exp/back/707.json b/public/images/pokemon/exp/female/6215.json
similarity index 62%
rename from public/images/pokemon/exp/back/707.json
rename to public/images/pokemon/exp/female/6215.json
index b8db4ac17f3..8e010a77bb6 100644
--- a/public/images/pokemon/exp/back/707.json
+++ b/public/images/pokemon/exp/female/6215.json
@@ -1,2007 +1,33 @@
 {
 	"textures": [
 		{
-			"image": "707.png",
+			"image": "6215.png",
 			"format": "RGBA8888",
 			"size": {
-				"w": 286,
-				"h": 286
+				"w": 230,
+				"h": 230
 			},
 			"scale": 1,
 			"frames": [
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 1,
-						"w": 38,
-						"h": 72
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 38,
-						"h": 72
-					}
-				},
-				{
-					"filename": "0039.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 1,
-						"w": 38,
-						"h": 72
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 38,
-						"h": 72
-					}
-				},
-				{
-					"filename": "0067.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 1,
-						"w": 38,
-						"h": 72
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 38,
-						"h": 72
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 2,
-						"w": 38,
-						"h": 72
-					},
-					"frame": {
-						"x": 0,
-						"y": 72,
-						"w": 38,
-						"h": 72
-					}
-				},
-				{
-					"filename": "0040.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 2,
-						"w": 38,
-						"h": 72
-					},
-					"frame": {
-						"x": 0,
-						"y": 72,
-						"w": 38,
-						"h": 72
-					}
-				},
-				{
-					"filename": "0068.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 2,
-						"w": 38,
-						"h": 72
-					},
-					"frame": {
-						"x": 0,
-						"y": 72,
-						"w": 38,
-						"h": 72
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 2,
-						"w": 38,
-						"h": 72
-					},
-					"frame": {
-						"x": 0,
-						"y": 144,
-						"w": 38,
-						"h": 72
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 38,
-						"h": 72
-					},
-					"frame": {
-						"x": 0,
-						"y": 144,
-						"w": 38,
-						"h": 72
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 38,
-						"h": 72
-					},
-					"frame": {
-						"x": 0,
-						"y": 144,
-						"w": 38,
-						"h": 72
-					}
-				},
-				{
-					"filename": "0046.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 2,
-						"w": 38,
-						"h": 72
-					},
-					"frame": {
-						"x": 0,
-						"y": 144,
-						"w": 38,
-						"h": 72
-					}
-				},
-				{
-					"filename": "0047.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 38,
-						"h": 72
-					},
-					"frame": {
-						"x": 0,
-						"y": 144,
-						"w": 38,
-						"h": 72
-					}
-				},
-				{
-					"filename": "0048.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 38,
-						"h": 72
-					},
-					"frame": {
-						"x": 0,
-						"y": 144,
-						"w": 38,
-						"h": 72
-					}
-				},
-				{
-					"filename": "0074.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 2,
-						"w": 38,
-						"h": 72
-					},
-					"frame": {
-						"x": 0,
-						"y": 144,
-						"w": 38,
-						"h": 72
-					}
-				},
-				{
-					"filename": "0075.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 38,
-						"h": 72
-					},
-					"frame": {
-						"x": 0,
-						"y": 144,
-						"w": 38,
-						"h": 72
-					}
-				},
-				{
-					"filename": "0076.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 38,
-						"h": 72
-					},
-					"frame": {
-						"x": 0,
-						"y": 144,
-						"w": 38,
-						"h": 72
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 42,
-						"h": 70
-					},
-					"frame": {
-						"x": 0,
-						"y": 216,
-						"w": 42,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0028.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 42,
-						"h": 70
-					},
-					"frame": {
-						"x": 0,
-						"y": 216,
-						"w": 42,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0029.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 42,
-						"h": 70
-					},
-					"frame": {
-						"x": 0,
-						"y": 216,
-						"w": 42,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0056.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 42,
-						"h": 70
-					},
-					"frame": {
-						"x": 0,
-						"y": 216,
-						"w": 42,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0057.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 42,
-						"h": 70
-					},
-					"frame": {
-						"x": 0,
-						"y": 216,
-						"w": 42,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0084.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 42,
-						"h": 70
-					},
-					"frame": {
-						"x": 0,
-						"y": 216,
-						"w": 42,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0091.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 38,
-						"h": 72
-					},
-					"frame": {
-						"x": 38,
-						"y": 0,
-						"w": 38,
-						"h": 72
-					}
-				},
-				{
-					"filename": "0095.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 38,
-						"h": 72
-					},
-					"frame": {
-						"x": 38,
-						"y": 0,
-						"w": 38,
-						"h": 72
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 11,
-						"y": 0,
-						"w": 37,
-						"h": 72
-					},
-					"frame": {
-						"x": 38,
-						"y": 72,
-						"w": 37,
-						"h": 72
-					}
-				},
-				{
-					"filename": "0038.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 11,
-						"y": 0,
-						"w": 37,
-						"h": 72
-					},
-					"frame": {
-						"x": 38,
-						"y": 72,
-						"w": 37,
-						"h": 72
-					}
-				},
-				{
-					"filename": "0066.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 11,
-						"y": 0,
-						"w": 37,
-						"h": 72
-					},
-					"frame": {
-						"x": 38,
-						"y": 72,
-						"w": 37,
-						"h": 72
-					}
-				},
-				{
-					"filename": "0025.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 39,
-						"h": 71
-					},
-					"frame": {
-						"x": 38,
-						"y": 144,
-						"w": 39,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0053.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 39,
-						"h": 71
-					},
-					"frame": {
-						"x": 38,
-						"y": 144,
-						"w": 39,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0081.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 39,
-						"h": 71
-					},
-					"frame": {
-						"x": 38,
-						"y": 144,
-						"w": 39,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 3,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 42,
-						"y": 215,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 42,
-						"y": 215,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0041.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 3,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 42,
-						"y": 215,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0045.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 42,
-						"y": 215,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0069.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 3,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 42,
-						"y": 215,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0073.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 42,
-						"y": 215,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 3,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 75,
-						"y": 72,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 3,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 75,
-						"y": 72,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0042.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 3,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 75,
-						"y": 72,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0044.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 3,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 75,
-						"y": 72,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0070.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 3,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 75,
-						"y": 72,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0072.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 3,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 75,
-						"y": 72,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 3,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 77,
-						"y": 143,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0043.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 3,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 77,
-						"y": 143,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0071.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 3,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 77,
-						"y": 143,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 80,
-						"y": 214,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 80,
-						"y": 214,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0049.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 80,
-						"y": 214,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0050.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 80,
-						"y": 214,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0077.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 80,
-						"y": 214,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0078.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 80,
-						"y": 214,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 76,
-						"y": 0,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0051.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 76,
-						"y": 0,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0079.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 76,
-						"y": 0,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 113,
-						"y": 71,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0052.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 113,
-						"y": 71,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0080.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 113,
-						"y": 71,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 42,
-						"h": 70
-					},
-					"frame": {
-						"x": 114,
-						"y": 0,
-						"w": 42,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0030.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 42,
-						"h": 70
-					},
-					"frame": {
-						"x": 114,
-						"y": 0,
-						"w": 42,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0058.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 42,
-						"h": 70
-					},
-					"frame": {
-						"x": 114,
-						"y": 0,
-						"w": 42,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0085.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 42,
-						"h": 70
-					},
-					"frame": {
-						"x": 115,
-						"y": 142,
-						"w": 42,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0027.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 41,
-						"h": 70
-					},
-					"frame": {
-						"x": 151,
-						"y": 70,
-						"w": 41,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0055.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 41,
-						"h": 70
-					},
-					"frame": {
-						"x": 151,
-						"y": 70,
-						"w": 41,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0083.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 41,
-						"h": 70
-					},
-					"frame": {
-						"x": 151,
-						"y": 70,
-						"w": 41,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0026.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 40,
-						"h": 70
-					},
-					"frame": {
-						"x": 156,
-						"y": 0,
-						"w": 40,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0054.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 40,
-						"h": 70
-					},
-					"frame": {
-						"x": 156,
-						"y": 0,
-						"w": 40,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0082.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 40,
-						"h": 70
-					},
-					"frame": {
-						"x": 156,
-						"y": 0,
-						"w": 40,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 0,
-						"w": 38,
-						"h": 70
-					},
-					"frame": {
-						"x": 118,
-						"y": 212,
-						"w": 38,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0037.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 0,
-						"w": 38,
-						"h": 70
-					},
-					"frame": {
-						"x": 118,
-						"y": 212,
-						"w": 38,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0065.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 0,
-						"w": 38,
-						"h": 70
-					},
-					"frame": {
-						"x": 118,
-						"y": 212,
-						"w": 38,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 44,
-						"h": 69
-					},
-					"frame": {
-						"x": 156,
-						"y": 212,
-						"w": 44,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0033.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 44,
-						"h": 69
-					},
-					"frame": {
-						"x": 156,
-						"y": 212,
-						"w": 44,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0061.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 44,
-						"h": 69
-					},
-					"frame": {
-						"x": 156,
-						"y": 212,
-						"w": 44,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 43,
-						"h": 69
-					},
-					"frame": {
-						"x": 157,
-						"y": 140,
-						"w": 43,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0031.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 43,
-						"h": 69
-					},
-					"frame": {
-						"x": 157,
-						"y": 140,
-						"w": 43,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0059.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 43,
-						"h": 69
-					},
-					"frame": {
-						"x": 157,
-						"y": 140,
-						"w": 43,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 43,
-						"h": 69
-					},
-					"frame": {
-						"x": 192,
-						"y": 70,
-						"w": 43,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0032.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 43,
-						"h": 69
-					},
-					"frame": {
-						"x": 192,
-						"y": 70,
-						"w": 43,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0060.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 43,
-						"h": 69
-					},
-					"frame": {
-						"x": 192,
-						"y": 70,
-						"w": 43,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0090.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 43,
-						"h": 69
-					},
-					"frame": {
-						"x": 192,
-						"y": 70,
-						"w": 43,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0092.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 43,
-						"h": 69
-					},
-					"frame": {
-						"x": 192,
-						"y": 70,
-						"w": 43,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0094.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 43,
-						"h": 69
-					},
-					"frame": {
-						"x": 192,
-						"y": 70,
-						"w": 43,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0096.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 43,
-						"h": 69
-					},
-					"frame": {
-						"x": 192,
-						"y": 70,
-						"w": 43,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0097.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 43,
-						"h": 69
-					},
-					"frame": {
-						"x": 192,
-						"y": 70,
-						"w": 43,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 0,
-						"w": 43,
-						"h": 69
-					},
-					"frame": {
-						"x": 196,
-						"y": 0,
-						"w": 43,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0034.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 0,
-						"w": 43,
-						"h": 69
-					},
-					"frame": {
-						"x": 196,
-						"y": 0,
-						"w": 43,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0062.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 0,
-						"w": 43,
-						"h": 69
-					},
-					"frame": {
-						"x": 196,
-						"y": 0,
-						"w": 43,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0086.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 43,
-						"h": 69
-					},
-					"frame": {
-						"x": 239,
-						"y": 0,
-						"w": 43,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0098.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 43,
-						"h": 69
-					},
-					"frame": {
-						"x": 239,
-						"y": 0,
-						"w": 43,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0087.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 43,
-						"h": 69
-					},
-					"frame": {
-						"x": 235,
-						"y": 69,
-						"w": 43,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0088.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 43,
-						"h": 69
-					},
-					"frame": {
-						"x": 235,
-						"y": 69,
-						"w": 43,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0089.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 42,
-						"h": 69
-					},
-					"frame": {
-						"x": 235,
-						"y": 138,
-						"w": 42,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0093.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 42,
-						"h": 69
-					},
-					"frame": {
-						"x": 235,
-						"y": 138,
-						"w": 42,
-						"h": 69
-					}
-				},
 				{
 					"filename": "0007.png",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 48,
-						"h": 74
+						"w": 56,
+						"h": 54
 					},
 					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 41,
-						"h": 69
+						"x": 1,
+						"y": 1,
+						"w": 55,
+						"h": 50
 					},
 					"frame": {
-						"x": 200,
-						"y": 207,
-						"w": 41,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0035.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
+						"x": 0,
 						"y": 0,
-						"w": 41,
-						"h": 69
-					},
-					"frame": {
-						"x": 200,
-						"y": 207,
-						"w": 41,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0063.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 41,
-						"h": 69
-					},
-					"frame": {
-						"x": 200,
-						"y": 207,
-						"w": 41,
-						"h": 69
+						"w": 55,
+						"h": 50
 					}
 				},
 				{
@@ -2009,20 +35,1175 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 48,
-						"h": 74
+						"w": 56,
+						"h": 54
 					},
 					"spriteSourceSize": {
-						"x": 8,
-						"y": 0,
-						"w": 40,
-						"h": 69
+						"x": 1,
+						"y": 1,
+						"w": 55,
+						"h": 50
 					},
 					"frame": {
-						"x": 241,
-						"y": 207,
-						"w": 40,
-						"h": 69
+						"x": 0,
+						"y": 0,
+						"w": 55,
+						"h": 50
+					}
+				},
+				{
+					"filename": "0019.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 1,
+						"w": 55,
+						"h": 50
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 55,
+						"h": 50
+					}
+				},
+				{
+					"filename": "0020.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 1,
+						"w": 55,
+						"h": 50
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 55,
+						"h": 50
+					}
+				},
+				{
+					"filename": "0031.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 1,
+						"w": 55,
+						"h": 50
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 55,
+						"h": 50
+					}
+				},
+				{
+					"filename": "0032.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 1,
+						"w": 55,
+						"h": 50
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 55,
+						"h": 50
+					}
+				},
+				{
+					"filename": "0043.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 1,
+						"w": 55,
+						"h": 50
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 55,
+						"h": 50
+					}
+				},
+				{
+					"filename": "0044.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 1,
+						"w": 55,
+						"h": 50
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 55,
+						"h": 50
+					}
+				},
+				{
+					"filename": "0055.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 1,
+						"w": 55,
+						"h": 50
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 55,
+						"h": 50
+					}
+				},
+				{
+					"filename": "0056.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 1,
+						"w": 55,
+						"h": 50
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 55,
+						"h": 50
+					}
+				},
+				{
+					"filename": "0067.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 1,
+						"w": 55,
+						"h": 50
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 55,
+						"h": 50
+					}
+				},
+				{
+					"filename": "0068.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 1,
+						"w": 55,
+						"h": 50
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 55,
+						"h": 50
+					}
+				},
+				{
+					"filename": "0079.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 1,
+						"w": 55,
+						"h": 50
+					},
+					"frame": {
+						"x": 0,
+						"y": 50,
+						"w": 55,
+						"h": 50
+					}
+				},
+				{
+					"filename": "0080.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 1,
+						"w": 55,
+						"h": 50
+					},
+					"frame": {
+						"x": 0,
+						"y": 50,
+						"w": 55,
+						"h": 50
+					}
+				},
+				{
+					"filename": "0003.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 0,
+						"w": 52,
+						"h": 51
+					},
+					"frame": {
+						"x": 55,
+						"y": 0,
+						"w": 52,
+						"h": 51
+					}
+				},
+				{
+					"filename": "0004.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 0,
+						"w": 52,
+						"h": 51
+					},
+					"frame": {
+						"x": 55,
+						"y": 0,
+						"w": 52,
+						"h": 51
+					}
+				},
+				{
+					"filename": "0023.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 0,
+						"w": 52,
+						"h": 51
+					},
+					"frame": {
+						"x": 55,
+						"y": 0,
+						"w": 52,
+						"h": 51
+					}
+				},
+				{
+					"filename": "0024.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 0,
+						"w": 52,
+						"h": 51
+					},
+					"frame": {
+						"x": 55,
+						"y": 0,
+						"w": 52,
+						"h": 51
+					}
+				},
+				{
+					"filename": "0027.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 0,
+						"w": 52,
+						"h": 51
+					},
+					"frame": {
+						"x": 55,
+						"y": 0,
+						"w": 52,
+						"h": 51
+					}
+				},
+				{
+					"filename": "0028.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 0,
+						"w": 52,
+						"h": 51
+					},
+					"frame": {
+						"x": 55,
+						"y": 0,
+						"w": 52,
+						"h": 51
+					}
+				},
+				{
+					"filename": "0047.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 0,
+						"w": 52,
+						"h": 51
+					},
+					"frame": {
+						"x": 55,
+						"y": 0,
+						"w": 52,
+						"h": 51
+					}
+				},
+				{
+					"filename": "0048.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 0,
+						"w": 52,
+						"h": 51
+					},
+					"frame": {
+						"x": 55,
+						"y": 0,
+						"w": 52,
+						"h": 51
+					}
+				},
+				{
+					"filename": "0051.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 0,
+						"w": 52,
+						"h": 51
+					},
+					"frame": {
+						"x": 55,
+						"y": 0,
+						"w": 52,
+						"h": 51
+					}
+				},
+				{
+					"filename": "0052.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 0,
+						"w": 52,
+						"h": 51
+					},
+					"frame": {
+						"x": 55,
+						"y": 0,
+						"w": 52,
+						"h": 51
+					}
+				},
+				{
+					"filename": "0071.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 0,
+						"w": 52,
+						"h": 51
+					},
+					"frame": {
+						"x": 55,
+						"y": 0,
+						"w": 52,
+						"h": 51
+					}
+				},
+				{
+					"filename": "0072.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 0,
+						"w": 52,
+						"h": 51
+					},
+					"frame": {
+						"x": 55,
+						"y": 0,
+						"w": 52,
+						"h": 51
+					}
+				},
+				{
+					"filename": "0075.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 0,
+						"w": 52,
+						"h": 51
+					},
+					"frame": {
+						"x": 55,
+						"y": 0,
+						"w": 52,
+						"h": 51
+					}
+				},
+				{
+					"filename": "0076.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 0,
+						"w": 52,
+						"h": 51
+					},
+					"frame": {
+						"x": 55,
+						"y": 0,
+						"w": 52,
+						"h": 51
+					}
+				},
+				{
+					"filename": "0005.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 1,
+						"w": 53,
+						"h": 50
+					},
+					"frame": {
+						"x": 0,
+						"y": 100,
+						"w": 53,
+						"h": 50
+					}
+				},
+				{
+					"filename": "0006.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 1,
+						"w": 53,
+						"h": 50
+					},
+					"frame": {
+						"x": 0,
+						"y": 100,
+						"w": 53,
+						"h": 50
+					}
+				},
+				{
+					"filename": "0021.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 1,
+						"w": 53,
+						"h": 50
+					},
+					"frame": {
+						"x": 0,
+						"y": 100,
+						"w": 53,
+						"h": 50
+					}
+				},
+				{
+					"filename": "0022.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 1,
+						"w": 53,
+						"h": 50
+					},
+					"frame": {
+						"x": 0,
+						"y": 100,
+						"w": 53,
+						"h": 50
+					}
+				},
+				{
+					"filename": "0029.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 1,
+						"w": 53,
+						"h": 50
+					},
+					"frame": {
+						"x": 0,
+						"y": 100,
+						"w": 53,
+						"h": 50
+					}
+				},
+				{
+					"filename": "0030.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 1,
+						"w": 53,
+						"h": 50
+					},
+					"frame": {
+						"x": 0,
+						"y": 100,
+						"w": 53,
+						"h": 50
+					}
+				},
+				{
+					"filename": "0045.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 1,
+						"w": 53,
+						"h": 50
+					},
+					"frame": {
+						"x": 0,
+						"y": 100,
+						"w": 53,
+						"h": 50
+					}
+				},
+				{
+					"filename": "0046.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 1,
+						"w": 53,
+						"h": 50
+					},
+					"frame": {
+						"x": 0,
+						"y": 100,
+						"w": 53,
+						"h": 50
+					}
+				},
+				{
+					"filename": "0069.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 1,
+						"w": 53,
+						"h": 50
+					},
+					"frame": {
+						"x": 0,
+						"y": 100,
+						"w": 53,
+						"h": 50
+					}
+				},
+				{
+					"filename": "0070.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 1,
+						"w": 53,
+						"h": 50
+					},
+					"frame": {
+						"x": 0,
+						"y": 100,
+						"w": 53,
+						"h": 50
+					}
+				},
+				{
+					"filename": "0077.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 1,
+						"w": 53,
+						"h": 50
+					},
+					"frame": {
+						"x": 0,
+						"y": 100,
+						"w": 53,
+						"h": 50
+					}
+				},
+				{
+					"filename": "0078.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 1,
+						"w": 53,
+						"h": 50
+					},
+					"frame": {
+						"x": 0,
+						"y": 100,
+						"w": 53,
+						"h": 50
+					}
+				},
+				{
+					"filename": "0009.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 2,
+						"w": 54,
+						"h": 49
+					},
+					"frame": {
+						"x": 107,
+						"y": 0,
+						"w": 54,
+						"h": 49
+					}
+				},
+				{
+					"filename": "0010.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 2,
+						"w": 54,
+						"h": 49
+					},
+					"frame": {
+						"x": 107,
+						"y": 0,
+						"w": 54,
+						"h": 49
+					}
+				},
+				{
+					"filename": "0017.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 2,
+						"w": 54,
+						"h": 49
+					},
+					"frame": {
+						"x": 107,
+						"y": 0,
+						"w": 54,
+						"h": 49
+					}
+				},
+				{
+					"filename": "0018.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 2,
+						"w": 54,
+						"h": 49
+					},
+					"frame": {
+						"x": 107,
+						"y": 0,
+						"w": 54,
+						"h": 49
+					}
+				},
+				{
+					"filename": "0033.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 2,
+						"w": 54,
+						"h": 49
+					},
+					"frame": {
+						"x": 107,
+						"y": 0,
+						"w": 54,
+						"h": 49
+					}
+				},
+				{
+					"filename": "0034.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 2,
+						"w": 54,
+						"h": 49
+					},
+					"frame": {
+						"x": 107,
+						"y": 0,
+						"w": 54,
+						"h": 49
+					}
+				},
+				{
+					"filename": "0041.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 2,
+						"w": 54,
+						"h": 49
+					},
+					"frame": {
+						"x": 107,
+						"y": 0,
+						"w": 54,
+						"h": 49
+					}
+				},
+				{
+					"filename": "0042.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 2,
+						"w": 54,
+						"h": 49
+					},
+					"frame": {
+						"x": 107,
+						"y": 0,
+						"w": 54,
+						"h": 49
+					}
+				},
+				{
+					"filename": "0057.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 2,
+						"w": 54,
+						"h": 49
+					},
+					"frame": {
+						"x": 107,
+						"y": 0,
+						"w": 54,
+						"h": 49
+					}
+				},
+				{
+					"filename": "0058.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 2,
+						"w": 54,
+						"h": 49
+					},
+					"frame": {
+						"x": 107,
+						"y": 0,
+						"w": 54,
+						"h": 49
+					}
+				},
+				{
+					"filename": "0065.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 2,
+						"w": 54,
+						"h": 49
+					},
+					"frame": {
+						"x": 107,
+						"y": 0,
+						"w": 54,
+						"h": 49
+					}
+				},
+				{
+					"filename": "0066.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 2,
+						"w": 54,
+						"h": 49
+					},
+					"frame": {
+						"x": 107,
+						"y": 0,
+						"w": 54,
+						"h": 49
+					}
+				},
+				{
+					"filename": "0011.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 2,
+						"w": 54,
+						"h": 49
+					},
+					"frame": {
+						"x": 161,
+						"y": 0,
+						"w": 54,
+						"h": 49
+					}
+				},
+				{
+					"filename": "0012.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 2,
+						"w": 54,
+						"h": 49
+					},
+					"frame": {
+						"x": 161,
+						"y": 0,
+						"w": 54,
+						"h": 49
+					}
+				},
+				{
+					"filename": "0015.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 2,
+						"w": 54,
+						"h": 49
+					},
+					"frame": {
+						"x": 161,
+						"y": 0,
+						"w": 54,
+						"h": 49
+					}
+				},
+				{
+					"filename": "0016.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 2,
+						"w": 54,
+						"h": 49
+					},
+					"frame": {
+						"x": 161,
+						"y": 0,
+						"w": 54,
+						"h": 49
+					}
+				},
+				{
+					"filename": "0035.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 2,
+						"w": 54,
+						"h": 49
+					},
+					"frame": {
+						"x": 161,
+						"y": 0,
+						"w": 54,
+						"h": 49
 					}
 				},
 				{
@@ -2030,20 +1211,125 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 48,
-						"h": 74
+						"w": 56,
+						"h": 54
 					},
 					"spriteSourceSize": {
-						"x": 8,
-						"y": 0,
-						"w": 40,
-						"h": 69
+						"x": 2,
+						"y": 2,
+						"w": 54,
+						"h": 49
 					},
 					"frame": {
-						"x": 241,
-						"y": 207,
-						"w": 40,
-						"h": 69
+						"x": 161,
+						"y": 0,
+						"w": 54,
+						"h": 49
+					}
+				},
+				{
+					"filename": "0039.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 2,
+						"w": 54,
+						"h": 49
+					},
+					"frame": {
+						"x": 161,
+						"y": 0,
+						"w": 54,
+						"h": 49
+					}
+				},
+				{
+					"filename": "0040.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 2,
+						"w": 54,
+						"h": 49
+					},
+					"frame": {
+						"x": 161,
+						"y": 0,
+						"w": 54,
+						"h": 49
+					}
+				},
+				{
+					"filename": "0059.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 2,
+						"w": 54,
+						"h": 49
+					},
+					"frame": {
+						"x": 161,
+						"y": 0,
+						"w": 54,
+						"h": 49
+					}
+				},
+				{
+					"filename": "0060.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 2,
+						"w": 54,
+						"h": 49
+					},
+					"frame": {
+						"x": 161,
+						"y": 0,
+						"w": 54,
+						"h": 49
+					}
+				},
+				{
+					"filename": "0063.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 2,
+						"w": 54,
+						"h": 49
+					},
+					"frame": {
+						"x": 161,
+						"y": 0,
+						"w": 54,
+						"h": 49
 					}
 				},
 				{
@@ -2051,20 +1337,734 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 48,
-						"h": 74
+						"w": 56,
+						"h": 54
 					},
 					"spriteSourceSize": {
-						"x": 8,
-						"y": 0,
-						"w": 40,
-						"h": 69
+						"x": 2,
+						"y": 2,
+						"w": 54,
+						"h": 49
 					},
 					"frame": {
-						"x": 241,
-						"y": 207,
-						"w": 40,
-						"h": 69
+						"x": 161,
+						"y": 0,
+						"w": 54,
+						"h": 49
+					}
+				},
+				{
+					"filename": "0053.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 1,
+						"w": 53,
+						"h": 50
+					},
+					"frame": {
+						"x": 0,
+						"y": 150,
+						"w": 53,
+						"h": 50
+					}
+				},
+				{
+					"filename": "0054.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 1,
+						"w": 53,
+						"h": 50
+					},
+					"frame": {
+						"x": 0,
+						"y": 150,
+						"w": 53,
+						"h": 50
+					}
+				},
+				{
+					"filename": "0081.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 1,
+						"w": 53,
+						"h": 50
+					},
+					"frame": {
+						"x": 55,
+						"y": 51,
+						"w": 53,
+						"h": 50
+					}
+				},
+				{
+					"filename": "0082.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 1,
+						"w": 53,
+						"h": 50
+					},
+					"frame": {
+						"x": 55,
+						"y": 51,
+						"w": 53,
+						"h": 50
+					}
+				},
+				{
+					"filename": "0013.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 3,
+						"w": 54,
+						"h": 48
+					},
+					"frame": {
+						"x": 53,
+						"y": 101,
+						"w": 54,
+						"h": 48
+					}
+				},
+				{
+					"filename": "0014.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 3,
+						"w": 54,
+						"h": 48
+					},
+					"frame": {
+						"x": 53,
+						"y": 101,
+						"w": 54,
+						"h": 48
+					}
+				},
+				{
+					"filename": "0037.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 3,
+						"w": 54,
+						"h": 48
+					},
+					"frame": {
+						"x": 53,
+						"y": 101,
+						"w": 54,
+						"h": 48
+					}
+				},
+				{
+					"filename": "0038.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 3,
+						"w": 54,
+						"h": 48
+					},
+					"frame": {
+						"x": 53,
+						"y": 101,
+						"w": 54,
+						"h": 48
+					}
+				},
+				{
+					"filename": "0061.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 3,
+						"w": 54,
+						"h": 48
+					},
+					"frame": {
+						"x": 53,
+						"y": 101,
+						"w": 54,
+						"h": 48
+					}
+				},
+				{
+					"filename": "0062.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 3,
+						"w": 54,
+						"h": 48
+					},
+					"frame": {
+						"x": 53,
+						"y": 101,
+						"w": 54,
+						"h": 48
+					}
+				},
+				{
+					"filename": "0001.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 0,
+						"w": 50,
+						"h": 51
+					},
+					"frame": {
+						"x": 53,
+						"y": 149,
+						"w": 50,
+						"h": 51
+					}
+				},
+				{
+					"filename": "0002.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 0,
+						"w": 50,
+						"h": 51
+					},
+					"frame": {
+						"x": 53,
+						"y": 149,
+						"w": 50,
+						"h": 51
+					}
+				},
+				{
+					"filename": "0025.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 0,
+						"w": 50,
+						"h": 51
+					},
+					"frame": {
+						"x": 53,
+						"y": 149,
+						"w": 50,
+						"h": 51
+					}
+				},
+				{
+					"filename": "0026.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 0,
+						"w": 50,
+						"h": 51
+					},
+					"frame": {
+						"x": 53,
+						"y": 149,
+						"w": 50,
+						"h": 51
+					}
+				},
+				{
+					"filename": "0049.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 0,
+						"w": 50,
+						"h": 51
+					},
+					"frame": {
+						"x": 53,
+						"y": 149,
+						"w": 50,
+						"h": 51
+					}
+				},
+				{
+					"filename": "0050.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 0,
+						"w": 50,
+						"h": 51
+					},
+					"frame": {
+						"x": 53,
+						"y": 149,
+						"w": 50,
+						"h": 51
+					}
+				},
+				{
+					"filename": "0073.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 0,
+						"w": 50,
+						"h": 51
+					},
+					"frame": {
+						"x": 53,
+						"y": 149,
+						"w": 50,
+						"h": 51
+					}
+				},
+				{
+					"filename": "0074.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 0,
+						"w": 50,
+						"h": 51
+					},
+					"frame": {
+						"x": 53,
+						"y": 149,
+						"w": 50,
+						"h": 51
+					}
+				},
+				{
+					"filename": "0083.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 4,
+						"w": 47,
+						"h": 47
+					},
+					"frame": {
+						"x": 108,
+						"y": 49,
+						"w": 47,
+						"h": 47
+					}
+				},
+				{
+					"filename": "0084.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 4,
+						"w": 47,
+						"h": 47
+					},
+					"frame": {
+						"x": 108,
+						"y": 49,
+						"w": 47,
+						"h": 47
+					}
+				},
+				{
+					"filename": "0097.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 4,
+						"w": 47,
+						"h": 47
+					},
+					"frame": {
+						"x": 155,
+						"y": 49,
+						"w": 47,
+						"h": 47
+					}
+				},
+				{
+					"filename": "0098.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 4,
+						"w": 47,
+						"h": 47
+					},
+					"frame": {
+						"x": 155,
+						"y": 49,
+						"w": 47,
+						"h": 47
+					}
+				},
+				{
+					"filename": "0087.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 7,
+						"w": 47,
+						"h": 44
+					},
+					"frame": {
+						"x": 108,
+						"y": 96,
+						"w": 47,
+						"h": 44
+					}
+				},
+				{
+					"filename": "0088.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 7,
+						"w": 47,
+						"h": 44
+					},
+					"frame": {
+						"x": 108,
+						"y": 96,
+						"w": 47,
+						"h": 44
+					}
+				},
+				{
+					"filename": "0085.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 5,
+						"w": 45,
+						"h": 46
+					},
+					"frame": {
+						"x": 155,
+						"y": 96,
+						"w": 45,
+						"h": 46
+					}
+				},
+				{
+					"filename": "0086.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 5,
+						"w": 45,
+						"h": 46
+					},
+					"frame": {
+						"x": 155,
+						"y": 96,
+						"w": 45,
+						"h": 46
+					}
+				},
+				{
+					"filename": "0089.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 8,
+						"w": 45,
+						"h": 44
+					},
+					"frame": {
+						"x": 107,
+						"y": 140,
+						"w": 45,
+						"h": 44
+					}
+				},
+				{
+					"filename": "0090.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 8,
+						"w": 45,
+						"h": 44
+					},
+					"frame": {
+						"x": 107,
+						"y": 140,
+						"w": 45,
+						"h": 44
+					}
+				},
+				{
+					"filename": "0091.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 8,
+						"w": 39,
+						"h": 46
+					},
+					"frame": {
+						"x": 103,
+						"y": 184,
+						"w": 39,
+						"h": 46
+					}
+				},
+				{
+					"filename": "0092.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 8,
+						"w": 39,
+						"h": 46
+					},
+					"frame": {
+						"x": 103,
+						"y": 184,
+						"w": 39,
+						"h": 46
+					}
+				},
+				{
+					"filename": "0093.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 8,
+						"w": 38,
+						"h": 46
+					},
+					"frame": {
+						"x": 142,
+						"y": 184,
+						"w": 38,
+						"h": 46
+					}
+				},
+				{
+					"filename": "0094.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 8,
+						"w": 38,
+						"h": 46
+					},
+					"frame": {
+						"x": 142,
+						"y": 184,
+						"w": 38,
+						"h": 46
+					}
+				},
+				{
+					"filename": "0095.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 8,
+						"w": 41,
+						"h": 44
+					},
+					"frame": {
+						"x": 180,
+						"y": 142,
+						"w": 41,
+						"h": 44
+					}
+				},
+				{
+					"filename": "0096.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 8,
+						"w": 41,
+						"h": 44
+					},
+					"frame": {
+						"x": 180,
+						"y": 142,
+						"w": 41,
+						"h": 44
 					}
 				}
 			]
@@ -2073,6 +2073,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:923b4bcae7da04f16b46037df8433fd0:1631bc30b61a1b4a910dd4510c8733ca:8e96b9056ea81e44ced99c97f472a528$"
+		"smartupdate": "$TexturePacker:SmartUpdate:a8930baf3a1083758adeeca87b28c6c7:3138fb5696691a4322b6805a44d3caa0:736cd88647e79ba7896fc74f9406c2fe$"
 	}
 }
diff --git a/public/images/pokemon/exp/female/6215.png b/public/images/pokemon/exp/female/6215.png
new file mode 100644
index 00000000000..2d132090ae8
Binary files /dev/null and b/public/images/pokemon/exp/female/6215.png differ
diff --git a/public/images/pokemon/exp/female/668.json b/public/images/pokemon/exp/female/668.json
new file mode 100644
index 00000000000..443f13c0b54
--- /dev/null
+++ b/public/images/pokemon/exp/female/668.json
@@ -0,0 +1,820 @@
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 0, "y": 219, "w": 63, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 63, "h": 72 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 0, "y": 291, "w": 62, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 7, "w": 62, "h": 71 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 453, "y": 289, "w": 62, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 7, "w": 62, "h": 71 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 441, "y": 360, "w": 61, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 8, "w": 61, "h": 70 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 309, "y": 359, "w": 61, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 8, "w": 61, "h": 70 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 380, "y": 358, "w": 61, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 8, "w": 61, "h": 70 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 317, "y": 289, "w": 63, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 8, "w": 63, "h": 70 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 390, "y": 288, "w": 63, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 8, "w": 63, "h": 70 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 254, "y": 220, "w": 63, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 7, "w": 63, "h": 71 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 63, "y": 220, "w": 63, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 6, "w": 63, "h": 72 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 399, "y": 216, "w": 63, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 6, "w": 63, "h": 72 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 64, "y": 147, "w": 63, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 63, "h": 73 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 138, "y": 74, "w": 63, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 63, "h": 78 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 201, "y": 147, "w": 63, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 63, "h": 73 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 264, "y": 147, "w": 63, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 63, "h": 73 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 0, "y": 219, "w": 63, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 63, "h": 72 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 0, "y": 291, "w": 62, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 7, "w": 62, "h": 71 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 453, "y": 289, "w": 62, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 7, "w": 62, "h": 71 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 441, "y": 360, "w": 61, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 8, "w": 61, "h": 70 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 309, "y": 359, "w": 61, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 8, "w": 61, "h": 70 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 380, "y": 358, "w": 61, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 8, "w": 61, "h": 70 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 317, "y": 289, "w": 63, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 8, "w": 63, "h": 70 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 390, "y": 288, "w": 63, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 8, "w": 63, "h": 70 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 254, "y": 220, "w": 63, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 7, "w": 63, "h": 71 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 63, "y": 220, "w": 63, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 6, "w": 63, "h": 72 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 399, "y": 216, "w": 63, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 6, "w": 63, "h": 72 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 64, "y": 147, "w": 63, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 63, "h": 73 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 138, "y": 74, "w": 63, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 63, "h": 78 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 201, "y": 147, "w": 63, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 63, "h": 73 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 264, "y": 147, "w": 63, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 63, "h": 73 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 0, "y": 219, "w": 63, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 63, "h": 72 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 0, "y": 291, "w": 62, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 7, "w": 62, "h": 71 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 453, "y": 289, "w": 62, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 7, "w": 62, "h": 71 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 441, "y": 360, "w": 61, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 8, "w": 61, "h": 70 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 309, "y": 359, "w": 61, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 8, "w": 61, "h": 70 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 380, "y": 358, "w": 61, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 8, "w": 61, "h": 70 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 317, "y": 289, "w": 63, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 8, "w": 63, "h": 70 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 390, "y": 288, "w": 63, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 8, "w": 63, "h": 70 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 254, "y": 220, "w": 63, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 7, "w": 63, "h": 71 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 63, "y": 220, "w": 63, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 6, "w": 63, "h": 72 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 399, "y": 216, "w": 63, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 6, "w": 63, "h": 72 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 64, "y": 147, "w": 63, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 63, "h": 73 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 138, "y": 74, "w": 63, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 63, "h": 78 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 201, "y": 147, "w": 63, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 63, "h": 73 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 264, "y": 147, "w": 63, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 63, "h": 73 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 0, "y": 219, "w": 63, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 63, "h": 72 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 0, "y": 291, "w": 62, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 7, "w": 62, "h": 71 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 453, "y": 289, "w": 62, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 7, "w": 62, "h": 71 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 441, "y": 360, "w": 61, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 8, "w": 61, "h": 70 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 309, "y": 359, "w": 61, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 8, "w": 61, "h": 70 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 380, "y": 358, "w": 61, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 8, "w": 61, "h": 70 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 317, "y": 289, "w": 63, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 8, "w": 63, "h": 70 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 390, "y": 288, "w": 63, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 8, "w": 63, "h": 70 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 254, "y": 220, "w": 63, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 7, "w": 63, "h": 71 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 63, "y": 220, "w": 63, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 6, "w": 63, "h": 72 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 399, "y": 216, "w": 63, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 6, "w": 63, "h": 72 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 64, "y": 147, "w": 63, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 63, "h": 73 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 138, "y": 74, "w": 63, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 63, "h": 78 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 201, "y": 147, "w": 63, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 63, "h": 73 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 264, "y": 147, "w": 63, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 63, "h": 73 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 0, "y": 219, "w": 63, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 63, "h": 72 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 0, "y": 147, "w": 64, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 64, "h": 72 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 127, "y": 152, "w": 64, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 7, "w": 64, "h": 71 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 465, "y": 146, "w": 65, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 7, "w": 65, "h": 71 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 399, "y": 146, "w": 66, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 8, "w": 66, "h": 70 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 334, "y": 74, "w": 66, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 7, "w": 66, "h": 71 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 191, "y": 220, "w": 63, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 63, "h": 71 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 126, "y": 223, "w": 62, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 62, "h": 72 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 462, "y": 217, "w": 63, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 6, "w": 63, "h": 72 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 188, "y": 291, "w": 61, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 61, "h": 72 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 249, "y": 291, "w": 60, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 60, "h": 73 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 62, "y": 292, "w": 60, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 60, "h": 72 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 122, "y": 295, "w": 60, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 60, "h": 72 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 182, "y": 363, "w": 59, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 6, "w": 59, "h": 72 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 60, "y": 364, "w": 59, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 6, "w": 59, "h": 72 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 0, "y": 362, "w": 60, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 7, "w": 60, "h": 71 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 327, "y": 217, "w": 63, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 6, "w": 63, "h": 72 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 268, "y": 74, "w": 66, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 66, "h": 73 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 0, "y": 74, "w": 69, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 69, "h": 73 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 376, "y": 0, "w": 73, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 73, "h": 74 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 227, "y": 0, "w": 75, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 75, "h": 74 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 76, "y": 0, "w": 76, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 76, "h": 74 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 0, "y": 0, "w": 76, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 76, "h": 74 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 152, "y": 0, "w": 75, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 75, "h": 74 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 302, "y": 0, "w": 74, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 74, "h": 74 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 449, "y": 0, "w": 72, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 72, "h": 73 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 449, "y": 73, "w": 71, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 71, "h": 73 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0088.png",
+    "frame": { "x": 69, "y": 74, "w": 69, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 69, "h": 73 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0089.png",
+    "frame": { "x": 201, "y": 74, "w": 67, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 67, "h": 73 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0090.png",
+    "frame": { "x": 334, "y": 145, "w": 65, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 65, "h": 72 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.11-x64",
+  "format": "I8",
+  "size": { "w": 530, "h": 436 },
+  "scale": "1"
+ }
+}
diff --git a/public/images/pokemon/exp/female/668.png b/public/images/pokemon/exp/female/668.png
new file mode 100644
index 00000000000..fa0582a61f1
Binary files /dev/null and b/public/images/pokemon/exp/female/668.png differ
diff --git a/public/images/pokemon/exp/shiny/2037.json b/public/images/pokemon/exp/shiny/2037.json
index bba453cc0a9..bcd9340b28a 100644
--- a/public/images/pokemon/exp/shiny/2037.json
+++ b/public/images/pokemon/exp/shiny/2037.json
@@ -1,1112 +1,101 @@
-{
-	"textures": [
-		{
-			"image": "2037.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 224,
-				"h": 224
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0040.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 52,
-						"h": 47
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 52,
-						"h": 47
-					}
-				},
-				{
-					"filename": "0041.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 52,
-						"h": 47
-					},
-					"frame": {
-						"x": 0,
-						"y": 47,
-						"w": 52,
-						"h": 47
-					}
-				},
-				{
-					"filename": "0042.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 52,
-						"h": 47
-					},
-					"frame": {
-						"x": 52,
-						"y": 0,
-						"w": 52,
-						"h": 47
-					}
-				},
-				{
-					"filename": "0044.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 53,
-						"h": 46
-					},
-					"frame": {
-						"x": 104,
-						"y": 0,
-						"w": 53,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0045.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 53,
-						"h": 46
-					},
-					"frame": {
-						"x": 157,
-						"y": 0,
-						"w": 53,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0039.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 52,
-						"h": 46
-					},
-					"frame": {
-						"x": 0,
-						"y": 94,
-						"w": 52,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0043.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 52,
-						"h": 46
-					},
-					"frame": {
-						"x": 52,
-						"y": 47,
-						"w": 52,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 53,
-						"h": 45
-					},
-					"frame": {
-						"x": 104,
-						"y": 46,
-						"w": 53,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 53,
-						"h": 45
-					},
-					"frame": {
-						"x": 104,
-						"y": 46,
-						"w": 53,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 53,
-						"h": 45
-					},
-					"frame": {
-						"x": 104,
-						"y": 46,
-						"w": 53,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 53,
-						"h": 45
-					},
-					"frame": {
-						"x": 104,
-						"y": 46,
-						"w": 53,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0026.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 53,
-						"h": 45
-					},
-					"frame": {
-						"x": 104,
-						"y": 46,
-						"w": 53,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0036.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 53,
-						"h": 45
-					},
-					"frame": {
-						"x": 104,
-						"y": 46,
-						"w": 53,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0047.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 52,
-						"h": 46
-					},
-					"frame": {
-						"x": 0,
-						"y": 140,
-						"w": 52,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0048.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 53,
-						"h": 45
-					},
-					"frame": {
-						"x": 157,
-						"y": 46,
-						"w": 53,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 52,
-						"h": 45
-					},
-					"frame": {
-						"x": 52,
-						"y": 93,
-						"w": 52,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 52,
-						"h": 45
-					},
-					"frame": {
-						"x": 52,
-						"y": 93,
-						"w": 52,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0025.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 52,
-						"h": 45
-					},
-					"frame": {
-						"x": 52,
-						"y": 93,
-						"w": 52,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0037.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 52,
-						"h": 45
-					},
-					"frame": {
-						"x": 52,
-						"y": 93,
-						"w": 52,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0046.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 52,
-						"h": 45
-					},
-					"frame": {
-						"x": 52,
-						"y": 93,
-						"w": 52,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0051.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 52,
-						"h": 45
-					},
-					"frame": {
-						"x": 52,
-						"y": 93,
-						"w": 52,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0052.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 52,
-						"h": 45
-					},
-					"frame": {
-						"x": 52,
-						"y": 93,
-						"w": 52,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0049.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 53,
-						"h": 45
-					},
-					"frame": {
-						"x": 104,
-						"y": 91,
-						"w": 53,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 53,
-						"h": 44
-					},
-					"frame": {
-						"x": 157,
-						"y": 91,
-						"w": 53,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 53,
-						"h": 44
-					},
-					"frame": {
-						"x": 157,
-						"y": 91,
-						"w": 53,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 53,
-						"h": 44
-					},
-					"frame": {
-						"x": 157,
-						"y": 91,
-						"w": 53,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 53,
-						"h": 44
-					},
-					"frame": {
-						"x": 157,
-						"y": 91,
-						"w": 53,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0027.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 53,
-						"h": 44
-					},
-					"frame": {
-						"x": 157,
-						"y": 91,
-						"w": 53,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0035.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 53,
-						"h": 44
-					},
-					"frame": {
-						"x": 157,
-						"y": 91,
-						"w": 53,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0038.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 52,
-						"h": 45
-					},
-					"frame": {
-						"x": 52,
-						"y": 138,
-						"w": 52,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 54,
-						"h": 41
-					},
-					"frame": {
-						"x": 52,
-						"y": 183,
-						"w": 54,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 54,
-						"h": 41
-					},
-					"frame": {
-						"x": 52,
-						"y": 183,
-						"w": 54,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 54,
-						"h": 41
-					},
-					"frame": {
-						"x": 52,
-						"y": 183,
-						"w": 54,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 54,
-						"h": 41
-					},
-					"frame": {
-						"x": 52,
-						"y": 183,
-						"w": 54,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0030.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 54,
-						"h": 41
-					},
-					"frame": {
-						"x": 52,
-						"y": 183,
-						"w": 54,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0032.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 54,
-						"h": 41
-					},
-					"frame": {
-						"x": 52,
-						"y": 183,
-						"w": 54,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 53,
-						"h": 44
-					},
-					"frame": {
-						"x": 104,
-						"y": 136,
-						"w": 53,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 53,
-						"h": 44
-					},
-					"frame": {
-						"x": 104,
-						"y": 136,
-						"w": 53,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 53,
-						"h": 44
-					},
-					"frame": {
-						"x": 104,
-						"y": 136,
-						"w": 53,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 53,
-						"h": 44
-					},
-					"frame": {
-						"x": 104,
-						"y": 136,
-						"w": 53,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0028.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 53,
-						"h": 44
-					},
-					"frame": {
-						"x": 104,
-						"y": 136,
-						"w": 53,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0034.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 53,
-						"h": 44
-					},
-					"frame": {
-						"x": 104,
-						"y": 136,
-						"w": 53,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0050.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 52,
-						"h": 45
-					},
-					"frame": {
-						"x": 157,
-						"y": 135,
-						"w": 52,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 54,
-						"h": 42
-					},
-					"frame": {
-						"x": 106,
-						"y": 180,
-						"w": 54,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 54,
-						"h": 42
-					},
-					"frame": {
-						"x": 106,
-						"y": 180,
-						"w": 54,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 54,
-						"h": 42
-					},
-					"frame": {
-						"x": 106,
-						"y": 180,
-						"w": 54,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 54,
-						"h": 42
-					},
-					"frame": {
-						"x": 106,
-						"y": 180,
-						"w": 54,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0029.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 54,
-						"h": 42
-					},
-					"frame": {
-						"x": 106,
-						"y": 180,
-						"w": 54,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0033.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 54,
-						"h": 42
-					},
-					"frame": {
-						"x": 106,
-						"y": 180,
-						"w": 54,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 54,
-						"h": 42
-					},
-					"frame": {
-						"x": 160,
-						"y": 180,
-						"w": 54,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 54,
-						"h": 42
-					},
-					"frame": {
-						"x": 160,
-						"y": 180,
-						"w": 54,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0031.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 54,
-						"h": 42
-					},
-					"frame": {
-						"x": 160,
-						"y": 180,
-						"w": 54,
-						"h": 42
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:bc39b65cf0ec2f14ad8bf933de8a41c5:b5060619f68332d93b5dc706d7dd4b94:c679847d1c2ddf91caeaa5ebb76a6664$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 0, "y": 0, "w": 59, "h": 46 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 59, "h": 46 },
+    "sourceSize": { "w": 59, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 59, "y": 0, "w": 59, "h": 46 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 59, "h": 46 },
+    "sourceSize": { "w": 59, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 118, "y": 0, "w": 59, "h": 46 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 59, "h": 46 },
+    "sourceSize": { "w": 59, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 177, "y": 0, "w": 59, "h": 46 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 59, "h": 46 },
+    "sourceSize": { "w": 59, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 0, "y": 46, "w": 59, "h": 46 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 59, "h": 46 },
+    "sourceSize": { "w": 59, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 59, "y": 46, "w": 59, "h": 46 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 59, "h": 46 },
+    "sourceSize": { "w": 59, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 118, "y": 46, "w": 59, "h": 46 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 59, "h": 46 },
+    "sourceSize": { "w": 59, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 177, "y": 46, "w": 59, "h": 46 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 59, "h": 46 },
+    "sourceSize": { "w": 59, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 0, "y": 92, "w": 59, "h": 46 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 59, "h": 46 },
+    "sourceSize": { "w": 59, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 59, "y": 92, "w": 59, "h": 46 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 59, "h": 46 },
+    "sourceSize": { "w": 59, "h": 46 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.13-x64",
+  "image": "2037.png",
+  "format": "I8",
+  "size": { "w": 236, "h": 138 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/shiny/2037.png b/public/images/pokemon/exp/shiny/2037.png
index 57b5fc6a54a..bf55fc87f2c 100644
Binary files a/public/images/pokemon/exp/shiny/2037.png and b/public/images/pokemon/exp/shiny/2037.png differ
diff --git a/public/images/pokemon/exp/shiny/2038.json b/public/images/pokemon/exp/shiny/2038.json
index 864e19300de..90b36cbc795 100644
--- a/public/images/pokemon/exp/shiny/2038.json
+++ b/public/images/pokemon/exp/shiny/2038.json
@@ -1,692 +1,155 @@
-{
-	"textures": [
-		{
-			"image": "2038.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 516,
-				"h": 516
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 94,
-						"h": 87
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 9,
-						"w": 86,
-						"h": 74
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 86,
-						"h": 74
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 94,
-						"h": 87
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 8,
-						"w": 84,
-						"h": 75
-					},
-					"frame": {
-						"x": 86,
-						"y": 0,
-						"w": 84,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 94,
-						"h": 87
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 8,
-						"w": 85,
-						"h": 75
-					},
-					"frame": {
-						"x": 170,
-						"y": 0,
-						"w": 85,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 94,
-						"h": 87
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 8,
-						"w": 85,
-						"h": 75
-					},
-					"frame": {
-						"x": 255,
-						"y": 0,
-						"w": 85,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 94,
-						"h": 87
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 8,
-						"w": 86,
-						"h": 75
-					},
-					"frame": {
-						"x": 340,
-						"y": 0,
-						"w": 86,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 94,
-						"h": 87
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 8,
-						"w": 86,
-						"h": 75
-					},
-					"frame": {
-						"x": 426,
-						"y": 0,
-						"w": 86,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0031.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 94,
-						"h": 87
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 8,
-						"w": 88,
-						"h": 75
-					},
-					"frame": {
-						"x": 0,
-						"y": 75,
-						"w": 88,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0032.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 94,
-						"h": 87
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 8,
-						"w": 87,
-						"h": 75
-					},
-					"frame": {
-						"x": 88,
-						"y": 75,
-						"w": 87,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0030.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 94,
-						"h": 87
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 7,
-						"w": 89,
-						"h": 76
-					},
-					"frame": {
-						"x": 175,
-						"y": 75,
-						"w": 89,
-						"h": 76
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 94,
-						"h": 87
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 8,
-						"w": 87,
-						"h": 77
-					},
-					"frame": {
-						"x": 264,
-						"y": 75,
-						"w": 87,
-						"h": 77
-					}
-				},
-				{
-					"filename": "0029.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 94,
-						"h": 87
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 6,
-						"w": 90,
-						"h": 77
-					},
-					"frame": {
-						"x": 351,
-						"y": 75,
-						"w": 90,
-						"h": 77
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 94,
-						"h": 87
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 8,
-						"w": 86,
-						"h": 78
-					},
-					"frame": {
-						"x": 0,
-						"y": 150,
-						"w": 86,
-						"h": 78
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 94,
-						"h": 87
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 9,
-						"w": 85,
-						"h": 78
-					},
-					"frame": {
-						"x": 86,
-						"y": 150,
-						"w": 85,
-						"h": 78
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 94,
-						"h": 87
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 9,
-						"w": 85,
-						"h": 78
-					},
-					"frame": {
-						"x": 171,
-						"y": 151,
-						"w": 85,
-						"h": 78
-					}
-				},
-				{
-					"filename": "0028.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 94,
-						"h": 87
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 5,
-						"w": 91,
-						"h": 78
-					},
-					"frame": {
-						"x": 256,
-						"y": 152,
-						"w": 91,
-						"h": 78
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 94,
-						"h": 87
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 8,
-						"w": 86,
-						"h": 79
-					},
-					"frame": {
-						"x": 347,
-						"y": 152,
-						"w": 86,
-						"h": 79
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 94,
-						"h": 87
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 8,
-						"w": 86,
-						"h": 79
-					},
-					"frame": {
-						"x": 0,
-						"y": 228,
-						"w": 86,
-						"h": 79
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 94,
-						"h": 87
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 8,
-						"w": 85,
-						"h": 79
-					},
-					"frame": {
-						"x": 86,
-						"y": 228,
-						"w": 85,
-						"h": 79
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 94,
-						"h": 87
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 8,
-						"w": 85,
-						"h": 79
-					},
-					"frame": {
-						"x": 171,
-						"y": 229,
-						"w": 85,
-						"h": 79
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 94,
-						"h": 87
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 85,
-						"h": 79
-					},
-					"frame": {
-						"x": 256,
-						"y": 230,
-						"w": 85,
-						"h": 79
-					}
-				},
-				{
-					"filename": "0027.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 94,
-						"h": 87
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 4,
-						"w": 90,
-						"h": 79
-					},
-					"frame": {
-						"x": 341,
-						"y": 231,
-						"w": 90,
-						"h": 79
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 94,
-						"h": 87
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 85,
-						"h": 80
-					},
-					"frame": {
-						"x": 431,
-						"y": 231,
-						"w": 85,
-						"h": 80
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 94,
-						"h": 87
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 86,
-						"h": 80
-					},
-					"frame": {
-						"x": 0,
-						"y": 307,
-						"w": 86,
-						"h": 80
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 94,
-						"h": 87
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 87,
-						"h": 81
-					},
-					"frame": {
-						"x": 86,
-						"y": 308,
-						"w": 87,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0026.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 94,
-						"h": 87
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 90,
-						"h": 81
-					},
-					"frame": {
-						"x": 173,
-						"y": 309,
-						"w": 90,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 94,
-						"h": 87
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 88,
-						"h": 82
-					},
-					"frame": {
-						"x": 263,
-						"y": 310,
-						"w": 88,
-						"h": 82
-					}
-				},
-				{
-					"filename": "0025.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 94,
-						"h": 87
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 90,
-						"h": 82
-					},
-					"frame": {
-						"x": 351,
-						"y": 311,
-						"w": 90,
-						"h": 82
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 94,
-						"h": 87
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 88,
-						"h": 83
-					},
-					"frame": {
-						"x": 0,
-						"y": 389,
-						"w": 88,
-						"h": 83
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 94,
-						"h": 87
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 89,
-						"h": 83
-					},
-					"frame": {
-						"x": 88,
-						"y": 390,
-						"w": 89,
-						"h": 83
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 94,
-						"h": 87
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 89,
-						"h": 83
-					},
-					"frame": {
-						"x": 177,
-						"y": 392,
-						"w": 89,
-						"h": 83
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 94,
-						"h": 87
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 89,
-						"h": 83
-					},
-					"frame": {
-						"x": 266,
-						"y": 393,
-						"w": 89,
-						"h": 83
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 94,
-						"h": 87
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 90,
-						"h": 83
-					},
-					"frame": {
-						"x": 355,
-						"y": 393,
-						"w": 90,
-						"h": 83
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:90bf50050728a091bdf4379ca942498d:30c5d97fa3349bcea4fb2421cc82a0fc:51bcdbb4fa6a1a9e90a83c2a4132ee1b$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 157, "y": 194, "w": 76, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 76, "h": 65 },
+    "sourceSize": { "w": 86, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 164, "y": 128, "w": 80, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 80, "h": 66 },
+    "sourceSize": { "w": 86, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 244, "y": 128, "w": 80, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 80, "h": 64 },
+    "sourceSize": { "w": 86, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 0, "y": 130, "w": 80, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 80, "h": 64 },
+    "sourceSize": { "w": 86, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 78, "y": 194, "w": 79, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 79, "h": 64 },
+    "sourceSize": { "w": 86, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 170, "y": 0, "w": 84, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 84, "h": 64 },
+    "sourceSize": { "w": 86, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 254, "y": 0, "w": 84, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 84, "h": 64 },
+    "sourceSize": { "w": 86, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 86, "y": 0, "w": 84, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 84, "h": 65 },
+    "sourceSize": { "w": 86, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 170, "y": 64, "w": 84, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 84, "h": 64 },
+    "sourceSize": { "w": 86, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 0, "y": 0, "w": 86, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 86, "h": 65 },
+    "sourceSize": { "w": 86, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 254, "y": 64, "w": 84, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 84, "h": 64 },
+    "sourceSize": { "w": 86, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 0, "y": 65, "w": 82, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 82, "h": 65 },
+    "sourceSize": { "w": 86, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 80, "y": 130, "w": 80, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 80, "h": 64 },
+    "sourceSize": { "w": 86, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 82, "y": 65, "w": 82, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 82, "h": 65 },
+    "sourceSize": { "w": 86, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 244, "y": 192, "w": 80, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 80, "h": 64 },
+    "sourceSize": { "w": 86, "h": 67 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 0, "y": 194, "w": 78, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 78, "h": 65 },
+    "sourceSize": { "w": 86, "h": 67 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.13-x64",
+  "image": "2038.png",
+  "format": "I8",
+  "size": { "w": 338, "h": 259 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/shiny/2038.png b/public/images/pokemon/exp/shiny/2038.png
index 4496e7eacc2..c2e00f4c939 100644
Binary files a/public/images/pokemon/exp/shiny/2038.png and b/public/images/pokemon/exp/shiny/2038.png differ
diff --git a/public/images/pokemon/exp/shiny/2074.json b/public/images/pokemon/exp/shiny/2074.json
index 0707b26186c..c29fe8e2992 100644
--- a/public/images/pokemon/exp/shiny/2074.json
+++ b/public/images/pokemon/exp/shiny/2074.json
@@ -1,272 +1,425 @@
-{
-	"textures": [
-		{
-			"image": "2074.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 142,
-				"h": 142
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 16,
-						"w": 63,
-						"h": 28
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 63,
-						"h": 28
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 12,
-						"w": 61,
-						"h": 30
-					},
-					"frame": {
-						"x": 63,
-						"y": 0,
-						"w": 61,
-						"h": 30
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 12,
-						"w": 61,
-						"h": 30
-					},
-					"frame": {
-						"x": 63,
-						"y": 0,
-						"w": 61,
-						"h": 30
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 8,
-						"w": 57,
-						"h": 32
-					},
-					"frame": {
-						"x": 0,
-						"y": 28,
-						"w": 57,
-						"h": 32
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 8,
-						"w": 57,
-						"h": 32
-					},
-					"frame": {
-						"x": 0,
-						"y": 28,
-						"w": 57,
-						"h": 32
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 56,
-						"h": 35
-					},
-					"frame": {
-						"x": 57,
-						"y": 30,
-						"w": 56,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 56,
-						"h": 35
-					},
-					"frame": {
-						"x": 57,
-						"y": 30,
-						"w": 56,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 0,
-						"w": 52,
-						"h": 37
-					},
-					"frame": {
-						"x": 0,
-						"y": 60,
-						"w": 52,
-						"h": 37
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 0,
-						"w": 52,
-						"h": 37
-					},
-					"frame": {
-						"x": 0,
-						"y": 60,
-						"w": 52,
-						"h": 37
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 0,
-						"w": 47,
-						"h": 40
-					},
-					"frame": {
-						"x": 0,
-						"y": 97,
-						"w": 47,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 0,
-						"w": 48,
-						"h": 39
-					},
-					"frame": {
-						"x": 47,
-						"y": 97,
-						"w": 48,
-						"h": 39
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 63,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 0,
-						"w": 47,
-						"h": 39
-					},
-					"frame": {
-						"x": 95,
-						"y": 65,
-						"w": 47,
-						"h": 39
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:8b430a28b9c42658bb83aba3cc9d0d69:c07291451914e5634685b69162c2028f:ad137687a877f55f096b7447bfdfe295$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 118, "y": 120, "w": 55, "h": 30 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 4, "w": 55, "h": 30 },
+    "sourceSize": { "w": 70, "h": 42 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 64, "y": 91, "w": 58, "h": 29 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 7, "w": 58, "h": 29 },
+    "sourceSize": { "w": 70, "h": 42 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 122, "y": 92, "w": 60, "h": 28 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 11, "w": 60, "h": 28 },
+    "sourceSize": { "w": 70, "h": 42 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 1, "y": 90, "w": 63, "h": 28 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 14, "w": 63, "h": 28 },
+    "sourceSize": { "w": 70, "h": 42 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 251, "y": 32, "w": 65, "h": 29 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 13, "w": 65, "h": 29 },
+    "sourceSize": { "w": 70, "h": 42 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 1, "y": 32, "w": 67, "h": 30 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 12, "w": 67, "h": 30 },
+    "sourceSize": { "w": 70, "h": 42 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 251, "y": 61, "w": 65, "h": 29 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 65, "h": 29 },
+    "sourceSize": { "w": 70, "h": 42 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 133, "y": 64, "w": 64, "h": 28 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 11, "w": 64, "h": 28 },
+    "sourceSize": { "w": 70, "h": 42 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 256, "y": 118, "w": 62, "h": 27 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 10, "w": 62, "h": 27 },
+    "sourceSize": { "w": 70, "h": 42 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 1, "y": 118, "w": 60, "h": 28 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 8, "w": 60, "h": 28 },
+    "sourceSize": { "w": 70, "h": 42 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 61, "y": 120, "w": 57, "h": 29 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 6, "w": 57, "h": 29 },
+    "sourceSize": { "w": 70, "h": 42 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 118, "y": 120, "w": 55, "h": 30 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 4, "w": 55, "h": 30 },
+    "sourceSize": { "w": 70, "h": 42 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 64, "y": 91, "w": 58, "h": 29 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 7, "w": 58, "h": 29 },
+    "sourceSize": { "w": 70, "h": 42 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 122, "y": 92, "w": 60, "h": 28 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 11, "w": 60, "h": 28 },
+    "sourceSize": { "w": 70, "h": 42 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 1, "y": 90, "w": 63, "h": 28 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 14, "w": 63, "h": 28 },
+    "sourceSize": { "w": 70, "h": 42 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 251, "y": 32, "w": 65, "h": 29 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 13, "w": 65, "h": 29 },
+    "sourceSize": { "w": 70, "h": 42 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 1, "y": 32, "w": 67, "h": 30 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 12, "w": 67, "h": 30 },
+    "sourceSize": { "w": 70, "h": 42 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 251, "y": 61, "w": 65, "h": 29 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 65, "h": 29 },
+    "sourceSize": { "w": 70, "h": 42 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 133, "y": 64, "w": 64, "h": 28 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 11, "w": 64, "h": 28 },
+    "sourceSize": { "w": 70, "h": 42 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 182, "y": 119, "w": 62, "h": 27 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 10, "w": 62, "h": 27 },
+    "sourceSize": { "w": 70, "h": 42 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 1, "y": 118, "w": 60, "h": 28 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 8, "w": 60, "h": 28 },
+    "sourceSize": { "w": 70, "h": 42 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 61, "y": 120, "w": 57, "h": 29 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 6, "w": 57, "h": 29 },
+    "sourceSize": { "w": 70, "h": 42 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 118, "y": 120, "w": 55, "h": 30 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 4, "w": 55, "h": 30 },
+    "sourceSize": { "w": 70, "h": 42 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 64, "y": 91, "w": 58, "h": 29 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 7, "w": 58, "h": 29 },
+    "sourceSize": { "w": 70, "h": 42 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 122, "y": 92, "w": 60, "h": 28 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 11, "w": 60, "h": 28 },
+    "sourceSize": { "w": 70, "h": 42 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 1, "y": 90, "w": 63, "h": 28 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 14, "w": 63, "h": 28 },
+    "sourceSize": { "w": 70, "h": 42 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 251, "y": 32, "w": 65, "h": 29 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 13, "w": 65, "h": 29 },
+    "sourceSize": { "w": 70, "h": 42 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 1, "y": 32, "w": 67, "h": 30 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 12, "w": 67, "h": 30 },
+    "sourceSize": { "w": 70, "h": 42 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 251, "y": 61, "w": 65, "h": 29 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 11, "w": 65, "h": 29 },
+    "sourceSize": { "w": 70, "h": 42 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 133, "y": 64, "w": 64, "h": 28 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 11, "w": 64, "h": 28 },
+    "sourceSize": { "w": 70, "h": 42 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 182, "y": 119, "w": 62, "h": 27 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 10, "w": 62, "h": 27 },
+    "sourceSize": { "w": 70, "h": 42 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 1, "y": 118, "w": 60, "h": 28 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 8, "w": 60, "h": 28 },
+    "sourceSize": { "w": 70, "h": 42 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 61, "y": 120, "w": 57, "h": 29 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 6, "w": 57, "h": 29 },
+    "sourceSize": { "w": 70, "h": 42 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 118, "y": 120, "w": 55, "h": 30 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 4, "w": 55, "h": 30 },
+    "sourceSize": { "w": 70, "h": 42 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 197, "y": 90, "w": 59, "h": 29 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 8, "w": 59, "h": 29 },
+    "sourceSize": { "w": 70, "h": 42 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 256, "y": 90, "w": 61, "h": 28 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 11, "w": 61, "h": 28 },
+    "sourceSize": { "w": 70, "h": 42 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 68, "y": 63, "w": 65, "h": 28 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 11, "w": 65, "h": 28 },
+    "sourceSize": { "w": 70, "h": 42 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 1, "y": 62, "w": 67, "h": 28 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 67, "h": 28 },
+    "sourceSize": { "w": 70, "h": 42 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 71, "y": 1, "w": 69, "h": 31 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 69, "h": 31 },
+    "sourceSize": { "w": 70, "h": 42 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 1, "y": 1, "w": 70, "h": 31 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 70, "h": 31 },
+    "sourceSize": { "w": 70, "h": 42 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 140, "y": 1, "w": 69, "h": 31 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 69, "h": 31 },
+    "sourceSize": { "w": 70, "h": 42 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 209, "y": 1, "w": 67, "h": 31 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 67, "h": 31 },
+    "sourceSize": { "w": 70, "h": 42 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 276, "y": 1, "w": 65, "h": 31 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 65, "h": 31 },
+    "sourceSize": { "w": 70, "h": 42 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 129, "y": 32, "w": 63, "h": 30 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 63, "h": 30 },
+    "sourceSize": { "w": 70, "h": 42 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 68, "y": 32, "w": 61, "h": 31 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 61, "h": 31 },
+    "sourceSize": { "w": 70, "h": 42 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 192, "y": 32, "w": 59, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 59, "h": 32 },
+    "sourceSize": { "w": 70, "h": 42 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.13-x64",
+  "image": "2074.png",
+  "format": "I8",
+  "size": { "w": 342, "h": 151 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/shiny/2074.png b/public/images/pokemon/exp/shiny/2074.png
index 8ca5c12c06d..6697b81ffbc 100644
Binary files a/public/images/pokemon/exp/shiny/2074.png and b/public/images/pokemon/exp/shiny/2074.png differ
diff --git a/public/images/pokemon/exp/shiny/2075.json b/public/images/pokemon/exp/shiny/2075.json
index e754d41dc7e..536079456f0 100644
--- a/public/images/pokemon/exp/shiny/2075.json
+++ b/public/images/pokemon/exp/shiny/2075.json
@@ -1,272 +1,812 @@
-{
-	"textures": [
-		{
-			"image": "2075.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 184,
-				"h": 184
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 87,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 84,
-						"h": 50
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 84,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 87,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 84,
-						"h": 50
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 84,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 87,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 83,
-						"h": 50
-					},
-					"frame": {
-						"x": 84,
-						"y": 0,
-						"w": 83,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 87,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 83,
-						"h": 50
-					},
-					"frame": {
-						"x": 84,
-						"y": 0,
-						"w": 83,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 87,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 0,
-						"w": 82,
-						"h": 51
-					},
-					"frame": {
-						"x": 0,
-						"y": 50,
-						"w": 82,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 87,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 0,
-						"w": 82,
-						"h": 51
-					},
-					"frame": {
-						"x": 0,
-						"y": 50,
-						"w": 82,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 87,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 83,
-						"h": 46
-					},
-					"frame": {
-						"x": 82,
-						"y": 50,
-						"w": 83,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 87,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 83,
-						"h": 46
-					},
-					"frame": {
-						"x": 82,
-						"y": 50,
-						"w": 83,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 87,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 7,
-						"w": 81,
-						"h": 45
-					},
-					"frame": {
-						"x": 82,
-						"y": 96,
-						"w": 81,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 87,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 7,
-						"w": 81,
-						"h": 45
-					},
-					"frame": {
-						"x": 82,
-						"y": 96,
-						"w": 81,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 87,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 80,
-						"h": 51
-					},
-					"frame": {
-						"x": 0,
-						"y": 101,
-						"w": 80,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 87,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 9,
-						"w": 78,
-						"h": 43
-					},
-					"frame": {
-						"x": 80,
-						"y": 141,
-						"w": 78,
-						"h": 43
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:f0da90bc6bf32531b1e0ebbaa09bf832:9b17b69f6928a9f2486d30e170634486:732805cb123f88b2d403da0dec709706$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 225, "y": 1, "w": 73, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 2, "w": 73, "h": 44 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 442, "y": 1, "w": 72, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 72, "h": 44 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 144, "y": 88, "w": 71, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 71, "h": 43 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 358, "y": 89, "w": 69, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 1, "w": 69, "h": 44 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 145, "y": 218, "w": 65, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 0, "w": 65, "h": 44 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 358, "y": 89, "w": 69, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 1, "w": 69, "h": 44 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 144, "y": 88, "w": 71, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 71, "h": 43 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 442, "y": 1, "w": 72, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 72, "h": 44 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 225, "y": 1, "w": 73, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 2, "w": 73, "h": 44 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 1, "y": 1, "w": 75, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 2, "w": 75, "h": 44 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 76, "y": 1, "w": 75, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 75, "h": 44 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 151, "y": 1, "w": 74, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 74, "h": 44 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 298, "y": 1, "w": 73, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 73, "h": 44 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 151, "y": 1, "w": 74, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 74, "h": 44 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 76, "y": 1, "w": 75, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 75, "h": 44 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 1, "y": 1, "w": 75, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 2, "w": 75, "h": 44 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 225, "y": 1, "w": 73, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 2, "w": 73, "h": 44 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 442, "y": 1, "w": 72, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 72, "h": 44 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 144, "y": 88, "w": 71, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 71, "h": 43 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 358, "y": 89, "w": 69, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 1, "w": 69, "h": 44 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 145, "y": 218, "w": 65, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 0, "w": 65, "h": 44 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 358, "y": 89, "w": 69, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 1, "w": 69, "h": 44 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 144, "y": 88, "w": 71, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 71, "h": 43 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 442, "y": 1, "w": 72, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 72, "h": 44 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 225, "y": 1, "w": 73, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 2, "w": 73, "h": 44 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 1, "y": 1, "w": 75, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 2, "w": 75, "h": 44 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 76, "y": 1, "w": 75, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 75, "h": 44 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 151, "y": 1, "w": 74, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 74, "h": 44 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 298, "y": 1, "w": 73, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 73, "h": 44 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 151, "y": 1, "w": 74, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 74, "h": 44 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 76, "y": 1, "w": 75, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 75, "h": 44 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 1, "y": 1, "w": 75, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 2, "w": 75, "h": 44 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 225, "y": 1, "w": 73, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 2, "w": 73, "h": 44 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 442, "y": 1, "w": 72, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 72, "h": 44 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 144, "y": 88, "w": 71, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 71, "h": 43 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 358, "y": 89, "w": 69, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 1, "w": 69, "h": 44 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 145, "y": 218, "w": 65, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 0, "w": 65, "h": 44 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 358, "y": 89, "w": 69, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 1, "w": 69, "h": 44 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 144, "y": 88, "w": 71, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 71, "h": 43 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 442, "y": 1, "w": 72, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 72, "h": 44 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 225, "y": 1, "w": 73, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 2, "w": 73, "h": 44 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 1, "y": 1, "w": 75, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 2, "w": 75, "h": 44 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 76, "y": 1, "w": 75, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 75, "h": 44 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 151, "y": 1, "w": 74, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 74, "h": 44 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 298, "y": 1, "w": 73, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 73, "h": 44 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 151, "y": 1, "w": 74, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 74, "h": 44 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 76, "y": 1, "w": 75, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 75, "h": 44 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 1, "y": 1, "w": 75, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 2, "w": 75, "h": 44 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 225, "y": 1, "w": 73, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 2, "w": 73, "h": 44 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 434, "y": 87, "w": 73, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 73, "h": 42 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 358, "y": 169, "w": 73, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 4, "w": 73, "h": 40 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 358, "y": 169, "w": 73, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 73, "h": 40 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 358, "y": 169, "w": 73, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 4, "w": 73, "h": 40 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 431, "y": 169, "w": 73, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 4, "w": 73, "h": 40 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 1, "y": 170, "w": 73, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 4, "w": 73, "h": 40 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 427, "y": 129, "w": 74, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 4, "w": 74, "h": 40 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 74, "y": 172, "w": 73, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 73, "h": 40 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 442, "y": 45, "w": 74, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 74, "h": 42 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 362, "y": 46, "w": 72, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 72, "h": 43 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 217, "y": 45, "w": 71, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 71, "h": 44 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 371, "y": 1, "w": 71, "h": 45 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 71, "h": 45 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 1, "y": 45, "w": 70, "h": 45 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 70, "h": 45 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 288, "y": 87, "w": 70, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 70, "h": 44 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 215, "y": 89, "w": 71, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 71, "h": 43 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 144, "y": 45, "w": 73, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 73, "h": 43 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 288, "y": 45, "w": 74, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 74, "h": 42 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 215, "y": 172, "w": 73, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 73, "h": 40 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 1, "y": 130, "w": 74, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 74, "h": 40 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 288, "y": 209, "w": 73, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 4, "w": 73, "h": 40 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 361, "y": 209, "w": 73, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 4, "w": 73, "h": 40 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 1, "y": 210, "w": 72, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 4, "w": 72, "h": 40 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 1, "y": 250, "w": 72, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 4, "w": 72, "h": 39 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 210, "y": 253, "w": 71, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 4, "w": 71, "h": 39 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 215, "y": 132, "w": 71, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 4, "w": 71, "h": 40 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 348, "y": 249, "w": 69, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 3, "w": 69, "h": 41 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 147, "y": 131, "w": 68, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 16, "y": 2, "w": 68, "h": 43 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 147, "y": 174, "w": 66, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 1, "w": 66, "h": 44 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 283, "y": 249, "w": 65, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 19, "y": 1, "w": 65, "h": 44 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 434, "y": 209, "w": 67, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 17, "y": 2, "w": 67, "h": 43 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 417, "y": 252, "w": 68, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 3, "w": 68, "h": 41 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 213, "y": 212, "w": 70, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 3, "w": 70, "h": 41 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 1, "y": 90, "w": 70, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 4, "w": 70, "h": 39 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 73, "y": 252, "w": 72, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 4, "w": 72, "h": 39 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 73, "y": 212, "w": 72, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 4, "w": 72, "h": 40 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 75, "y": 131, "w": 72, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 4, "w": 72, "h": 41 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 286, "y": 131, "w": 72, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 4, "w": 72, "h": 41 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 71, "y": 88, "w": 73, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 4, "w": 73, "h": 42 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0088.png",
+    "frame": { "x": 71, "y": 45, "w": 73, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 73, "h": 43 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0089.png",
+    "frame": { "x": 225, "y": 1, "w": 73, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 2, "w": 73, "h": 44 },
+    "sourceSize": { "w": 84, "h": 46 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.13-x64",
+  "image": "2075.png",
+  "format": "I8",
+  "size": { "w": 517, "h": 294 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/shiny/2075.png b/public/images/pokemon/exp/shiny/2075.png
index 952acfb9d6c..212e4b011df 100644
Binary files a/public/images/pokemon/exp/shiny/2075.png and b/public/images/pokemon/exp/shiny/2075.png differ
diff --git a/public/images/pokemon/exp/shiny/2076.json b/public/images/pokemon/exp/shiny/2076.json
index 916f50ab286..7cc16fe2ae8 100644
--- a/public/images/pokemon/exp/shiny/2076.json
+++ b/public/images/pokemon/exp/shiny/2076.json
@@ -1,272 +1,965 @@
-{
-	"textures": [
-		{
-			"image": "2076.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 204,
-				"h": 204
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 62,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 60,
-						"h": 73
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 60,
-						"h": 73
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 62,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 60,
-						"h": 73
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 60,
-						"h": 73
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 62,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 58,
-						"h": 73
-					},
-					"frame": {
-						"x": 0,
-						"y": 73,
-						"w": 58,
-						"h": 73
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 62,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 58,
-						"h": 73
-					},
-					"frame": {
-						"x": 0,
-						"y": 73,
-						"w": 58,
-						"h": 73
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 62,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 0,
-						"w": 58,
-						"h": 73
-					},
-					"frame": {
-						"x": 58,
-						"y": 73,
-						"w": 58,
-						"h": 73
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 62,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 0,
-						"w": 58,
-						"h": 73
-					},
-					"frame": {
-						"x": 58,
-						"y": 73,
-						"w": 58,
-						"h": 73
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 62,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 0,
-						"w": 57,
-						"h": 73
-					},
-					"frame": {
-						"x": 60,
-						"y": 0,
-						"w": 57,
-						"h": 73
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 62,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 56,
-						"h": 70
-					},
-					"frame": {
-						"x": 117,
-						"y": 0,
-						"w": 56,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 62,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 56,
-						"h": 70
-					},
-					"frame": {
-						"x": 117,
-						"y": 0,
-						"w": 56,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 62,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 56,
-						"h": 68
-					},
-					"frame": {
-						"x": 117,
-						"y": 70,
-						"w": 56,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 62,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 56,
-						"h": 68
-					},
-					"frame": {
-						"x": 117,
-						"y": 70,
-						"w": 56,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 62,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 56,
-						"h": 66
-					},
-					"frame": {
-						"x": 116,
-						"y": 138,
-						"w": 56,
-						"h": 66
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:16956bca916a4bb869d1f41d97c30aa8:5d4d8d8dba8a507ca828fc7f08c0c2d9:719cdf7324091edbb7b1d6e2d7254a1a$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 1, "y": 407, "w": 54, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 54, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 166, "y": 343, "w": 54, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 54, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 115, "y": 274, "w": 55, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 55, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 347, "y": 204, "w": 56, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 56, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 116, "y": 205, "w": 56, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 56, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 174, "y": 69, "w": 57, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 57, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 231, "y": 69, "w": 57, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 57, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 59, "y": 204, "w": 57, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 57, "h": 68 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 233, "y": 204, "w": 57, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 57, "h": 68 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 233, "y": 1, "w": 58, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 58, "h": 68 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 117, "y": 1, "w": 58, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 58, "h": 68 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 348, "y": 1, "w": 57, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 57, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 117, "y": 69, "w": 57, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 57, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 170, "y": 274, "w": 55, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 55, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 1, "y": 338, "w": 55, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 55, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 280, "y": 407, "w": 54, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 54, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 1, "y": 407, "w": 54, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 54, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 166, "y": 343, "w": 54, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 54, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 115, "y": 274, "w": 55, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 55, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 347, "y": 204, "w": 56, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 56, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 116, "y": 205, "w": 56, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 56, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 174, "y": 69, "w": 57, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 57, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 231, "y": 69, "w": 57, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 57, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 59, "y": 204, "w": 57, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 57, "h": 68 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 233, "y": 204, "w": 57, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 57, "h": 68 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 233, "y": 1, "w": 58, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 58, "h": 68 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 117, "y": 1, "w": 58, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 58, "h": 68 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 348, "y": 1, "w": 57, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 57, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 117, "y": 69, "w": 57, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 57, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 170, "y": 274, "w": 55, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 55, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 1, "y": 338, "w": 55, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 55, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 280, "y": 407, "w": 54, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 54, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 1, "y": 407, "w": 54, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 54, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 166, "y": 343, "w": 54, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 54, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 115, "y": 274, "w": 55, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 55, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 347, "y": 204, "w": 56, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 56, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 116, "y": 205, "w": 56, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 56, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 174, "y": 69, "w": 57, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 57, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 231, "y": 69, "w": 57, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 57, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 59, "y": 204, "w": 57, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 57, "h": 68 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 233, "y": 204, "w": 57, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 57, "h": 68 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 233, "y": 1, "w": 58, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 58, "h": 68 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 117, "y": 1, "w": 58, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 58, "h": 68 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 348, "y": 1, "w": 57, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 57, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 117, "y": 69, "w": 57, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 57, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 170, "y": 274, "w": 55, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 55, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 1, "y": 338, "w": 55, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 55, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 280, "y": 407, "w": 54, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 54, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 1, "y": 407, "w": 54, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 54, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 166, "y": 343, "w": 54, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 54, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 115, "y": 274, "w": 55, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 55, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 347, "y": 204, "w": 56, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 56, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 116, "y": 205, "w": 56, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 56, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 174, "y": 69, "w": 57, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 57, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 231, "y": 69, "w": 57, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 57, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 59, "y": 204, "w": 57, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 57, "h": 68 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 233, "y": 204, "w": 57, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 57, "h": 68 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 233, "y": 1, "w": 58, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 58, "h": 68 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 117, "y": 1, "w": 58, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 58, "h": 68 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 348, "y": 1, "w": 57, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 57, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 117, "y": 69, "w": 57, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 57, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 170, "y": 274, "w": 55, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 55, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 1, "y": 338, "w": 55, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 55, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 280, "y": 407, "w": 54, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 54, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 55, "y": 408, "w": 54, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 54, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 172, "y": 205, "w": 56, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 56, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 288, "y": 70, "w": 58, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 58, "h": 67 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 59, "y": 1, "w": 58, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 58, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 280, "y": 340, "w": 56, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 56, "h": 67 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 109, "y": 411, "w": 53, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 7, "w": 53, "h": 67 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 220, "y": 409, "w": 54, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 54, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 225, "y": 340, "w": 55, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 55, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 56, "y": 339, "w": 55, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 55, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 291, "y": 1, "w": 57, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 57, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 1, "y": 1, "w": 58, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 58, "h": 69 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 290, "y": 204, "w": 57, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 6, "w": 57, "h": 68 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 175, "y": 1, "w": 58, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 58, "h": 68 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 346, "y": 70, "w": 58, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 58, "h": 67 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 346, "y": 70, "w": 58, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 58, "h": 67 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 1, "y": 137, "w": 58, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 58, "h": 67 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 1, "y": 137, "w": 58, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 58, "h": 67 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 59, "y": 137, "w": 58, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 58, "h": 67 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 59, "y": 137, "w": 58, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 58, "h": 67 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 288, "y": 137, "w": 58, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 58, "h": 67 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 288, "y": 137, "w": 58, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 58, "h": 67 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 346, "y": 137, "w": 58, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 58, "h": 67 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 346, "y": 137, "w": 58, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 58, "h": 67 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0088.png",
+    "frame": { "x": 346, "y": 137, "w": 58, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 58, "h": 67 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0089.png",
+    "frame": { "x": 117, "y": 138, "w": 58, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 58, "h": 67 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0090.png",
+    "frame": { "x": 175, "y": 138, "w": 58, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 58, "h": 67 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0091.png",
+    "frame": { "x": 1, "y": 204, "w": 58, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 58, "h": 67 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0092.png",
+    "frame": { "x": 1, "y": 70, "w": 58, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 58, "h": 67 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0093.png",
+    "frame": { "x": 1, "y": 204, "w": 58, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 58, "h": 67 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0094.png",
+    "frame": { "x": 1, "y": 70, "w": 58, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 58, "h": 67 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0095.png",
+    "frame": { "x": 1, "y": 204, "w": 58, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 58, "h": 67 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0096.png",
+    "frame": { "x": 1, "y": 70, "w": 58, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 58, "h": 67 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0097.png",
+    "frame": { "x": 1, "y": 204, "w": 58, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 58, "h": 67 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0098.png",
+    "frame": { "x": 59, "y": 70, "w": 58, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 58, "h": 67 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0099.png",
+    "frame": { "x": 1, "y": 271, "w": 57, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 57, "h": 67 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0100.png",
+    "frame": { "x": 58, "y": 272, "w": 57, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 57, "h": 67 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0101.png",
+    "frame": { "x": 228, "y": 272, "w": 56, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 6, "w": 56, "h": 68 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0102.png",
+    "frame": { "x": 284, "y": 272, "w": 56, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 6, "w": 56, "h": 68 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0103.png",
+    "frame": { "x": 340, "y": 273, "w": 56, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 6, "w": 56, "h": 68 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0104.png",
+    "frame": { "x": 336, "y": 341, "w": 55, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 55, "h": 68 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0105.png",
+    "frame": { "x": 111, "y": 343, "w": 55, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 55, "h": 68 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0106.png",
+    "frame": { "x": 334, "y": 409, "w": 54, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 6, "w": 54, "h": 68 },
+    "sourceSize": { "w": 61, "h": 74 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.13-x64",
+  "image": "2076.png",
+  "format": "I8",
+  "size": { "w": 406, "h": 479 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/shiny/2076.png b/public/images/pokemon/exp/shiny/2076.png
index c5a245e18d2..d98bf81cead 100644
Binary files a/public/images/pokemon/exp/shiny/2076.png and b/public/images/pokemon/exp/shiny/2076.png differ
diff --git a/public/images/pokemon/exp/shiny/2088.json b/public/images/pokemon/exp/shiny/2088.json
index 30a33724ef6..3dc69f1024c 100644
--- a/public/images/pokemon/exp/shiny/2088.json
+++ b/public/images/pokemon/exp/shiny/2088.json
@@ -1,272 +1,173 @@
-{
-	"textures": [
-		{
-			"image": "2088.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 114,
-				"h": 114
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 60,
-						"h": 37
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 60,
-						"h": 36
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 60,
-						"h": 36
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 60,
-						"h": 37
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 60,
-						"h": 36
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 60,
-						"h": 36
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 60,
-						"h": 37
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 60,
-						"h": 36
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 60,
-						"h": 36
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 60,
-						"h": 37
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 60,
-						"h": 36
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 60,
-						"h": 36
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 60,
-						"h": 37
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 58,
-						"h": 37
-					},
-					"frame": {
-						"x": 0,
-						"y": 36,
-						"w": 58,
-						"h": 37
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 60,
-						"h": 37
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 58,
-						"h": 37
-					},
-					"frame": {
-						"x": 0,
-						"y": 36,
-						"w": 58,
-						"h": 37
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 60,
-						"h": 37
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 58,
-						"h": 37
-					},
-					"frame": {
-						"x": 0,
-						"y": 36,
-						"w": 58,
-						"h": 37
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 60,
-						"h": 37
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 58,
-						"h": 37
-					},
-					"frame": {
-						"x": 0,
-						"y": 36,
-						"w": 58,
-						"h": 37
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 60,
-						"h": 37
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 56,
-						"h": 37
-					},
-					"frame": {
-						"x": 58,
-						"y": 36,
-						"w": 56,
-						"h": 37
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 60,
-						"h": 37
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 56,
-						"h": 37
-					},
-					"frame": {
-						"x": 58,
-						"y": 36,
-						"w": 56,
-						"h": 37
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 60,
-						"h": 37
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 60,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 73,
-						"w": 60,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 60,
-						"h": 37
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 60,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 73,
-						"w": 60,
-						"h": 35
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:42001773997f63bbe00b9d4da8df4959:1a203471d110b19654220aaa601645a0:b8df8f168871505f42fdc6d3c5b106f0$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 53, "y": 114, "w": 51, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 51, "h": 40 },
+    "sourceSize": { "w": 61, "h": 40 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 231, "y": 75, "w": 52, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 52, "h": 40 },
+    "sourceSize": { "w": 61, "h": 40 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 111, "y": 79, "w": 53, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 53, "h": 39 },
+    "sourceSize": { "w": 61, "h": 40 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 57, "y": 75, "w": 54, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 54, "h": 39 },
+    "sourceSize": { "w": 61, "h": 40 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 234, "y": 36, "w": 56, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 56, "h": 39 },
+    "sourceSize": { "w": 61, "h": 40 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 0, "y": 75, "w": 57, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 57, "h": 37 },
+    "sourceSize": { "w": 61, "h": 40 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 59, "y": 38, "w": 58, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 58, "h": 37 },
+    "sourceSize": { "w": 61, "h": 40 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 0, "y": 38, "w": 59, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 59, "h": 37 },
+    "sourceSize": { "w": 61, "h": 40 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 234, "y": 0, "w": 61, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 61, "h": 36 },
+    "sourceSize": { "w": 61, "h": 40 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 0, "y": 0, "w": 60, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 60, "h": 38 },
+    "sourceSize": { "w": 61, "h": 40 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 60, "y": 0, "w": 59, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 59, "h": 38 },
+    "sourceSize": { "w": 61, "h": 40 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 176, "y": 0, "w": 58, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 58, "h": 38 },
+    "sourceSize": { "w": 61, "h": 40 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 119, "y": 0, "w": 57, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 57, "h": 39 },
+    "sourceSize": { "w": 61, "h": 40 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 176, "y": 38, "w": 55, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 55, "h": 39 },
+    "sourceSize": { "w": 61, "h": 40 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 0, "y": 112, "w": 53, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 53, "h": 39 },
+    "sourceSize": { "w": 61, "h": 40 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 117, "y": 39, "w": 53, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 53, "h": 40 },
+    "sourceSize": { "w": 61, "h": 40 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 170, "y": 77, "w": 52, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 52, "h": 40 },
+    "sourceSize": { "w": 61, "h": 40 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 222, "y": 115, "w": 51, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 51, "h": 40 },
+    "sourceSize": { "w": 61, "h": 40 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.13-x64",
+  "image": "2088.png",
+  "format": "I8",
+  "size": { "w": 295, "h": 155 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/shiny/2088.png b/public/images/pokemon/exp/shiny/2088.png
index e8398a98c6e..5cccf0c0252 100644
Binary files a/public/images/pokemon/exp/shiny/2088.png and b/public/images/pokemon/exp/shiny/2088.png differ
diff --git a/public/images/pokemon/exp/shiny/2089.json b/public/images/pokemon/exp/shiny/2089.json
index c53c0ff8f49..3f8b618af75 100644
--- a/public/images/pokemon/exp/shiny/2089.json
+++ b/public/images/pokemon/exp/shiny/2089.json
@@ -1,1343 +1,1091 @@
-{
-	"textures": [
-		{
-			"image": "2089.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 349,
-				"h": 349
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 8,
-						"w": 94,
-						"h": 58
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 94,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 8,
-						"w": 94,
-						"h": 58
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 94,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0030.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 8,
-						"w": 94,
-						"h": 58
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 94,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0043.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 8,
-						"w": 94,
-						"h": 58
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 94,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 6,
-						"w": 92,
-						"h": 60
-					},
-					"frame": {
-						"x": 94,
-						"y": 0,
-						"w": 92,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 6,
-						"w": 92,
-						"h": 60
-					},
-					"frame": {
-						"x": 94,
-						"y": 0,
-						"w": 92,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0029.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 6,
-						"w": 92,
-						"h": 60
-					},
-					"frame": {
-						"x": 94,
-						"y": 0,
-						"w": 92,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0042.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 6,
-						"w": 92,
-						"h": 60
-					},
-					"frame": {
-						"x": 94,
-						"y": 0,
-						"w": 92,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 5,
-						"w": 91,
-						"h": 61
-					},
-					"frame": {
-						"x": 0,
-						"y": 58,
-						"w": 91,
-						"h": 61
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 5,
-						"w": 91,
-						"h": 61
-					},
-					"frame": {
-						"x": 0,
-						"y": 58,
-						"w": 91,
-						"h": 61
-					}
-				},
-				{
-					"filename": "0031.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 5,
-						"w": 91,
-						"h": 61
-					},
-					"frame": {
-						"x": 0,
-						"y": 58,
-						"w": 91,
-						"h": 61
-					}
-				},
-				{
-					"filename": "0044.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 5,
-						"w": 91,
-						"h": 61
-					},
-					"frame": {
-						"x": 0,
-						"y": 58,
-						"w": 91,
-						"h": 61
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 4,
-						"w": 90,
-						"h": 63
-					},
-					"frame": {
-						"x": 186,
-						"y": 0,
-						"w": 90,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 4,
-						"w": 90,
-						"h": 63
-					},
-					"frame": {
-						"x": 186,
-						"y": 0,
-						"w": 90,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0032.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 4,
-						"w": 90,
-						"h": 63
-					},
-					"frame": {
-						"x": 186,
-						"y": 0,
-						"w": 90,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0045.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 4,
-						"w": 90,
-						"h": 63
-					},
-					"frame": {
-						"x": 186,
-						"y": 0,
-						"w": 90,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 5,
-						"w": 90,
-						"h": 61
-					},
-					"frame": {
-						"x": 91,
-						"y": 60,
-						"w": 90,
-						"h": 61
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 5,
-						"w": 90,
-						"h": 61
-					},
-					"frame": {
-						"x": 91,
-						"y": 60,
-						"w": 90,
-						"h": 61
-					}
-				},
-				{
-					"filename": "0028.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 5,
-						"w": 90,
-						"h": 61
-					},
-					"frame": {
-						"x": 91,
-						"y": 60,
-						"w": 90,
-						"h": 61
-					}
-				},
-				{
-					"filename": "0041.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 5,
-						"w": 90,
-						"h": 61
-					},
-					"frame": {
-						"x": 91,
-						"y": 60,
-						"w": 90,
-						"h": 61
-					}
-				},
-				{
-					"filename": "0058.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 89,
-						"h": 60
-					},
-					"frame": {
-						"x": 0,
-						"y": 119,
-						"w": 89,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0057.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 89,
-						"h": 59
-					},
-					"frame": {
-						"x": 181,
-						"y": 63,
-						"w": 89,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0059.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 89,
-						"h": 59
-					},
-					"frame": {
-						"x": 181,
-						"y": 63,
-						"w": 89,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0055.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 8,
-						"w": 89,
-						"h": 58
-					},
-					"frame": {
-						"x": 89,
-						"y": 121,
-						"w": 89,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0061.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 8,
-						"w": 89,
-						"h": 58
-					},
-					"frame": {
-						"x": 89,
-						"y": 121,
-						"w": 89,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0056.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 8,
-						"w": 89,
-						"h": 58
-					},
-					"frame": {
-						"x": 178,
-						"y": 122,
-						"w": 89,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0060.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 8,
-						"w": 89,
-						"h": 58
-					},
-					"frame": {
-						"x": 178,
-						"y": 122,
-						"w": 89,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 2,
-						"w": 82,
-						"h": 64
-					},
-					"frame": {
-						"x": 267,
-						"y": 122,
-						"w": 82,
-						"h": 64
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 2,
-						"w": 82,
-						"h": 64
-					},
-					"frame": {
-						"x": 267,
-						"y": 122,
-						"w": 82,
-						"h": 64
-					}
-				},
-				{
-					"filename": "0037.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 2,
-						"w": 82,
-						"h": 64
-					},
-					"frame": {
-						"x": 267,
-						"y": 122,
-						"w": 82,
-						"h": 64
-					}
-				},
-				{
-					"filename": "0050.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 2,
-						"w": 82,
-						"h": 64
-					},
-					"frame": {
-						"x": 267,
-						"y": 122,
-						"w": 82,
-						"h": 64
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 2,
-						"w": 88,
-						"h": 65
-					},
-					"frame": {
-						"x": 0,
-						"y": 179,
-						"w": 88,
-						"h": 65
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 2,
-						"w": 88,
-						"h": 65
-					},
-					"frame": {
-						"x": 0,
-						"y": 179,
-						"w": 88,
-						"h": 65
-					}
-				},
-				{
-					"filename": "0033.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 2,
-						"w": 88,
-						"h": 65
-					},
-					"frame": {
-						"x": 0,
-						"y": 179,
-						"w": 88,
-						"h": 65
-					}
-				},
-				{
-					"filename": "0046.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 2,
-						"w": 88,
-						"h": 65
-					},
-					"frame": {
-						"x": 0,
-						"y": 179,
-						"w": 88,
-						"h": 65
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 5,
-						"w": 88,
-						"h": 61
-					},
-					"frame": {
-						"x": 88,
-						"y": 179,
-						"w": 88,
-						"h": 61
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 5,
-						"w": 88,
-						"h": 61
-					},
-					"frame": {
-						"x": 88,
-						"y": 179,
-						"w": 88,
-						"h": 61
-					}
-				},
-				{
-					"filename": "0027.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 5,
-						"w": 88,
-						"h": 61
-					},
-					"frame": {
-						"x": 88,
-						"y": 179,
-						"w": 88,
-						"h": 61
-					}
-				},
-				{
-					"filename": "0040.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 5,
-						"w": 88,
-						"h": 61
-					},
-					"frame": {
-						"x": 88,
-						"y": 179,
-						"w": 88,
-						"h": 61
-					}
-				},
-				{
-					"filename": "0053.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 5,
-						"w": 88,
-						"h": 61
-					},
-					"frame": {
-						"x": 88,
-						"y": 179,
-						"w": 88,
-						"h": 61
-					}
-				},
-				{
-					"filename": "0063.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 5,
-						"w": 88,
-						"h": 61
-					},
-					"frame": {
-						"x": 88,
-						"y": 179,
-						"w": 88,
-						"h": 61
-					}
-				},
-				{
-					"filename": "0054.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 6,
-						"w": 88,
-						"h": 60
-					},
-					"frame": {
-						"x": 176,
-						"y": 180,
-						"w": 88,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0062.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 6,
-						"w": 88,
-						"h": 60
-					},
-					"frame": {
-						"x": 176,
-						"y": 180,
-						"w": 88,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 85,
-						"h": 67
-					},
-					"frame": {
-						"x": 264,
-						"y": 186,
-						"w": 85,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 85,
-						"h": 67
-					},
-					"frame": {
-						"x": 264,
-						"y": 186,
-						"w": 85,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0034.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 85,
-						"h": 67
-					},
-					"frame": {
-						"x": 264,
-						"y": 186,
-						"w": 85,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0047.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 85,
-						"h": 67
-					},
-					"frame": {
-						"x": 264,
-						"y": 186,
-						"w": 85,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 83,
-						"h": 66
-					},
-					"frame": {
-						"x": 0,
-						"y": 253,
-						"w": 83,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 83,
-						"h": 66
-					},
-					"frame": {
-						"x": 0,
-						"y": 253,
-						"w": 83,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0035.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 83,
-						"h": 66
-					},
-					"frame": {
-						"x": 0,
-						"y": 253,
-						"w": 83,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0048.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 83,
-						"h": 66
-					},
-					"frame": {
-						"x": 0,
-						"y": 253,
-						"w": 83,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 83,
-						"h": 66
-					},
-					"frame": {
-						"x": 83,
-						"y": 253,
-						"w": 83,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 83,
-						"h": 66
-					},
-					"frame": {
-						"x": 83,
-						"y": 253,
-						"w": 83,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0036.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 83,
-						"h": 66
-					},
-					"frame": {
-						"x": 83,
-						"y": 253,
-						"w": 83,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0049.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 83,
-						"h": 66
-					},
-					"frame": {
-						"x": 83,
-						"y": 253,
-						"w": 83,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 86,
-						"h": 62
-					},
-					"frame": {
-						"x": 166,
-						"y": 240,
-						"w": 86,
-						"h": 62
-					}
-				},
-				{
-					"filename": "0026.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 86,
-						"h": 62
-					},
-					"frame": {
-						"x": 166,
-						"y": 240,
-						"w": 86,
-						"h": 62
-					}
-				},
-				{
-					"filename": "0039.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 86,
-						"h": 62
-					},
-					"frame": {
-						"x": 166,
-						"y": 240,
-						"w": 86,
-						"h": 62
-					}
-				},
-				{
-					"filename": "0052.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 86,
-						"h": 62
-					},
-					"frame": {
-						"x": 166,
-						"y": 240,
-						"w": 86,
-						"h": 62
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 84,
-						"h": 63
-					},
-					"frame": {
-						"x": 252,
-						"y": 253,
-						"w": 84,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0025.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 84,
-						"h": 63
-					},
-					"frame": {
-						"x": 252,
-						"y": 253,
-						"w": 84,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0038.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 84,
-						"h": 63
-					},
-					"frame": {
-						"x": 252,
-						"y": 253,
-						"w": 84,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0051.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 84,
-						"h": 63
-					},
-					"frame": {
-						"x": 252,
-						"y": 253,
-						"w": 84,
-						"h": 63
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:b372c992d91a52f723e195aa1fcf78ac:c1ffaccbd50e04a0e556b97d65b611ee:49ee9ed0dd32c5ba33977741b45fc3f4$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 463, "y": 58, "w": 73, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 73, "h": 64 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 536, "y": 58, "w": 73, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 73, "h": 64 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 151, "y": 61, "w": 73, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 73, "h": 64 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 370, "y": 61, "w": 75, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 75, "h": 62 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 236, "y": 125, "w": 76, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 76, "h": 61 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 1, "y": 183, "w": 77, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 77, "h": 60 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 151, "y": 1, "w": 78, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 78, "h": 60 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 76, "y": 125, "w": 80, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 80, "h": 58 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 540, "y": 238, "w": 81, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 81, "h": 57 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 463, "y": 1, "w": 82, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 82, "h": 57 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 445, "y": 122, "w": 83, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 8, "w": 83, "h": 56 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 499, "y": 295, "w": 83, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 9, "w": 83, "h": 55 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 333, "y": 295, "w": 83, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 9, "w": 83, "h": 55 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 250, "y": 295, "w": 83, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 9, "w": 83, "h": 55 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 167, "y": 243, "w": 83, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 9, "w": 83, "h": 55 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 84, "y": 243, "w": 83, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 9, "w": 83, "h": 55 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 1, "y": 243, "w": 83, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 9, "w": 83, "h": 55 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 321, "y": 239, "w": 82, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 8, "w": 82, "h": 56 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 78, "y": 183, "w": 81, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 81, "h": 57 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 250, "y": 350, "w": 80, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 80, "h": 57 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 488, "y": 350, "w": 78, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 6, "w": 78, "h": 58 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 385, "y": 1, "w": 78, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 78, "h": 60 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 312, "y": 125, "w": 76, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 76, "h": 61 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 76, "y": 1, "w": 75, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 75, "h": 63 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 463, "y": 58, "w": 73, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 73, "h": 64 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 536, "y": 58, "w": 73, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 73, "h": 64 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 151, "y": 61, "w": 73, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 73, "h": 64 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 370, "y": 61, "w": 75, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 75, "h": 62 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 236, "y": 125, "w": 76, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 76, "h": 61 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 1, "y": 183, "w": 77, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 77, "h": 60 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 151, "y": 1, "w": 78, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 78, "h": 60 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 76, "y": 125, "w": 80, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 80, "h": 58 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 540, "y": 238, "w": 81, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 81, "h": 57 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 463, "y": 1, "w": 82, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 82, "h": 57 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 445, "y": 122, "w": 83, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 8, "w": 83, "h": 56 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 499, "y": 295, "w": 83, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 9, "w": 83, "h": 55 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 333, "y": 295, "w": 83, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 9, "w": 83, "h": 55 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 250, "y": 295, "w": 83, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 9, "w": 83, "h": 55 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 167, "y": 243, "w": 83, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 9, "w": 83, "h": 55 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 84, "y": 243, "w": 83, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 9, "w": 83, "h": 55 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 1, "y": 243, "w": 83, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 9, "w": 83, "h": 55 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 321, "y": 239, "w": 82, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 8, "w": 82, "h": 56 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 78, "y": 183, "w": 81, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 81, "h": 57 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 250, "y": 350, "w": 80, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 80, "h": 57 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 488, "y": 350, "w": 78, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 6, "w": 78, "h": 58 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 385, "y": 1, "w": 78, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 78, "h": 60 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 312, "y": 125, "w": 76, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 76, "h": 61 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 76, "y": 1, "w": 75, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 75, "h": 63 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 463, "y": 58, "w": 73, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 73, "h": 64 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 536, "y": 58, "w": 73, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 73, "h": 64 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 151, "y": 61, "w": 73, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 73, "h": 64 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 370, "y": 61, "w": 75, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 75, "h": 62 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 236, "y": 125, "w": 76, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 76, "h": 61 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 1, "y": 183, "w": 77, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 77, "h": 60 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 151, "y": 1, "w": 78, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 78, "h": 60 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 76, "y": 125, "w": 80, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 80, "h": 58 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 540, "y": 238, "w": 81, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 81, "h": 57 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 463, "y": 1, "w": 82, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 82, "h": 57 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 445, "y": 122, "w": 83, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 8, "w": 83, "h": 56 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 499, "y": 295, "w": 83, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 9, "w": 83, "h": 55 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 333, "y": 295, "w": 83, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 9, "w": 83, "h": 55 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 250, "y": 295, "w": 83, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 9, "w": 83, "h": 55 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 167, "y": 243, "w": 83, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 9, "w": 83, "h": 55 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 84, "y": 243, "w": 83, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 9, "w": 83, "h": 55 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 1, "y": 243, "w": 83, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 9, "w": 83, "h": 55 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 321, "y": 239, "w": 82, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 8, "w": 82, "h": 56 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 78, "y": 183, "w": 81, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 81, "h": 57 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 250, "y": 350, "w": 80, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 80, "h": 57 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 488, "y": 350, "w": 78, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 6, "w": 78, "h": 58 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 385, "y": 1, "w": 78, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 78, "h": 60 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 312, "y": 125, "w": 76, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 76, "h": 61 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 76, "y": 1, "w": 75, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 75, "h": 63 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 463, "y": 58, "w": 73, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 73, "h": 64 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 536, "y": 58, "w": 73, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 73, "h": 64 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 151, "y": 61, "w": 73, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 73, "h": 64 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 370, "y": 61, "w": 75, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 75, "h": 62 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 236, "y": 125, "w": 76, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 76, "h": 61 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 1, "y": 183, "w": 77, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 77, "h": 60 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 151, "y": 1, "w": 78, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 78, "h": 60 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 76, "y": 125, "w": 80, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 80, "h": 58 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 540, "y": 238, "w": 81, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 81, "h": 57 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 463, "y": 1, "w": 82, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 82, "h": 57 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 445, "y": 122, "w": 83, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 8, "w": 83, "h": 56 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 499, "y": 295, "w": 83, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 9, "w": 83, "h": 55 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 333, "y": 295, "w": 83, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 9, "w": 83, "h": 55 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 250, "y": 295, "w": 83, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 9, "w": 83, "h": 55 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 167, "y": 243, "w": 83, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 9, "w": 83, "h": 55 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0088.png",
+    "frame": { "x": 84, "y": 243, "w": 83, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 9, "w": 83, "h": 55 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0089.png",
+    "frame": { "x": 1, "y": 243, "w": 83, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 9, "w": 83, "h": 55 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0090.png",
+    "frame": { "x": 321, "y": 239, "w": 82, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 8, "w": 82, "h": 56 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0091.png",
+    "frame": { "x": 78, "y": 183, "w": 81, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 81, "h": 57 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0092.png",
+    "frame": { "x": 250, "y": 350, "w": 80, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 80, "h": 57 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0093.png",
+    "frame": { "x": 488, "y": 350, "w": 78, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 6, "w": 78, "h": 58 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0094.png",
+    "frame": { "x": 385, "y": 1, "w": 78, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 78, "h": 60 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0095.png",
+    "frame": { "x": 312, "y": 125, "w": 76, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 76, "h": 61 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0096.png",
+    "frame": { "x": 76, "y": 1, "w": 75, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 75, "h": 63 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0097.png",
+    "frame": { "x": 463, "y": 58, "w": 73, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 73, "h": 64 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0098.png",
+    "frame": { "x": 297, "y": 61, "w": 73, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 73, "h": 64 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0099.png",
+    "frame": { "x": 224, "y": 61, "w": 73, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 73, "h": 64 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0100.png",
+    "frame": { "x": 1, "y": 64, "w": 75, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 75, "h": 62 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0101.png",
+    "frame": { "x": 388, "y": 178, "w": 76, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 76, "h": 61 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0102.png",
+    "frame": { "x": 540, "y": 178, "w": 77, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 77, "h": 60 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0103.png",
+    "frame": { "x": 307, "y": 1, "w": 78, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 78, "h": 60 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0104.png",
+    "frame": { "x": 156, "y": 125, "w": 80, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 80, "h": 58 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0105.png",
+    "frame": { "x": 159, "y": 186, "w": 81, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 81, "h": 57 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0106.png",
+    "frame": { "x": 545, "y": 1, "w": 82, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 82, "h": 57 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0107.png",
+    "frame": { "x": 528, "y": 122, "w": 83, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 8, "w": 83, "h": 56 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0108.png",
+    "frame": { "x": 416, "y": 295, "w": 83, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 9, "w": 83, "h": 55 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0109.png",
+    "frame": { "x": 333, "y": 295, "w": 83, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 9, "w": 83, "h": 55 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0110.png",
+    "frame": { "x": 167, "y": 298, "w": 83, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 9, "w": 83, "h": 55 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0111.png",
+    "frame": { "x": 582, "y": 295, "w": 83, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 9, "w": 83, "h": 55 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0112.png",
+    "frame": { "x": 1, "y": 298, "w": 83, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 9, "w": 83, "h": 55 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0113.png",
+    "frame": { "x": 84, "y": 298, "w": 83, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 9, "w": 83, "h": 55 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0114.png",
+    "frame": { "x": 403, "y": 239, "w": 82, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 8, "w": 82, "h": 56 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0115.png",
+    "frame": { "x": 240, "y": 186, "w": 81, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 81, "h": 57 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0116.png",
+    "frame": { "x": 330, "y": 350, "w": 80, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 80, "h": 57 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0117.png",
+    "frame": { "x": 410, "y": 350, "w": 78, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 6, "w": 78, "h": 58 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0118.png",
+    "frame": { "x": 229, "y": 1, "w": 78, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 78, "h": 60 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0119.png",
+    "frame": { "x": 464, "y": 178, "w": 76, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 76, "h": 61 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0120.png",
+    "frame": { "x": 1, "y": 1, "w": 75, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 75, "h": 63 },
+    "sourceSize": { "w": 83, "h": 64 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.13-x64",
+  "image": "2089.png",
+  "format": "I8",
+  "size": { "w": 666, "h": 409 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/shiny/2089.png b/public/images/pokemon/exp/shiny/2089.png
index f560027e4dd..f60271c3f21 100644
Binary files a/public/images/pokemon/exp/shiny/2089.png and b/public/images/pokemon/exp/shiny/2089.png differ
diff --git a/public/images/pokemon/exp/shiny/248-mega.json b/public/images/pokemon/exp/shiny/248-mega.json
index 6dc54a8aeb2..15243cf5a2d 100644
--- a/public/images/pokemon/exp/shiny/248-mega.json
+++ b/public/images/pokemon/exp/shiny/248-mega.json
@@ -1,272 +1,929 @@
-{
-	"textures": [
-		{
-			"image": "248-mega.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 271,
-				"h": 271
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 91,
-						"h": 85
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 91,
-						"h": 85
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 91,
-						"h": 85
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 91,
-						"h": 85
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 91,
-						"h": 85
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 91,
-						"h": 85
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 91,
-						"h": 85
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 91,
-						"h": 85
-					},
-					"frame": {
-						"x": 91,
-						"y": 0,
-						"w": 91,
-						"h": 85
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 91,
-						"h": 85
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 91,
-						"h": 85
-					},
-					"frame": {
-						"x": 91,
-						"y": 0,
-						"w": 91,
-						"h": 85
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 91,
-						"h": 85
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 91,
-						"h": 85
-					},
-					"frame": {
-						"x": 0,
-						"y": 85,
-						"w": 91,
-						"h": 85
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 91,
-						"h": 85
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 91,
-						"h": 85
-					},
-					"frame": {
-						"x": 0,
-						"y": 85,
-						"w": 91,
-						"h": 85
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 91,
-						"h": 85
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 91,
-						"h": 85
-					},
-					"frame": {
-						"x": 0,
-						"y": 170,
-						"w": 91,
-						"h": 85
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 91,
-						"h": 85
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 91,
-						"h": 85
-					},
-					"frame": {
-						"x": 0,
-						"y": 170,
-						"w": 91,
-						"h": 85
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 91,
-						"h": 85
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 90,
-						"h": 85
-					},
-					"frame": {
-						"x": 91,
-						"y": 85,
-						"w": 90,
-						"h": 85
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 91,
-						"h": 85
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 90,
-						"h": 85
-					},
-					"frame": {
-						"x": 91,
-						"y": 85,
-						"w": 90,
-						"h": 85
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 91,
-						"h": 85
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 90,
-						"h": 85
-					},
-					"frame": {
-						"x": 181,
-						"y": 85,
-						"w": 90,
-						"h": 85
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 91,
-						"h": 85
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 90,
-						"h": 84
-					},
-					"frame": {
-						"x": 91,
-						"y": 170,
-						"w": 90,
-						"h": 84
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:e303fed6273448420d3b88ba11175e8d:629c5a6630efddb6c94efdcd98c81d33:90df97eb431b7162252516cb937a0b9e$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 467, "y": 175, "w": 90, "h": 84 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 90, "h": 84 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 559, "y": 175, "w": 90, "h": 84 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 90, "h": 84 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 374, "y": 261, "w": 91, "h": 83 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 91, "h": 83 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 467, "y": 261, "w": 92, "h": 82 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 5, "w": 92, "h": 82 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 0, "y": 262, "w": 92, "h": 82 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 5, "w": 92, "h": 82 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 91, "y": 431, "w": 90, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 7, "w": 90, "h": 80 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 183, "y": 431, "w": 90, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 7, "w": 90, "h": 80 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 0, "y": 514, "w": 88, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 7, "w": 88, "h": 80 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 182, "y": 513, "w": 89, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 7, "w": 89, "h": 80 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 273, "y": 515, "w": 87, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 7, "w": 87, "h": 80 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 91, "y": 513, "w": 89, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 7, "w": 89, "h": 80 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 364, "y": 513, "w": 88, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 7, "w": 88, "h": 80 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 546, "y": 433, "w": 89, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 7, "w": 89, "h": 80 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 0, "y": 431, "w": 89, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 89, "h": 81 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 365, "y": 430, "w": 90, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 90, "h": 81 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 273, "y": 348, "w": 90, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 90, "h": 81 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 370, "y": 346, "w": 90, "h": 82 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 90, "h": 82 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 186, "y": 262, "w": 90, "h": 83 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 90, "h": 83 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 278, "y": 263, "w": 90, "h": 83 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 90, "h": 83 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 184, "y": 176, "w": 90, "h": 84 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 90, "h": 84 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 559, "y": 175, "w": 90, "h": 84 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 90, "h": 84 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 374, "y": 261, "w": 91, "h": 83 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 91, "h": 83 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 467, "y": 261, "w": 92, "h": 82 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 5, "w": 92, "h": 82 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 0, "y": 262, "w": 92, "h": 82 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 5, "w": 92, "h": 82 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 91, "y": 431, "w": 90, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 7, "w": 90, "h": 80 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 183, "y": 431, "w": 90, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 7, "w": 90, "h": 80 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 0, "y": 514, "w": 88, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 7, "w": 88, "h": 80 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 182, "y": 513, "w": 89, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 7, "w": 89, "h": 80 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 273, "y": 515, "w": 87, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 7, "w": 87, "h": 80 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 91, "y": 513, "w": 89, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 7, "w": 89, "h": 80 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 364, "y": 513, "w": 88, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 7, "w": 88, "h": 80 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 546, "y": 433, "w": 89, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 7, "w": 89, "h": 80 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 0, "y": 431, "w": 89, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 89, "h": 81 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 365, "y": 430, "w": 90, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 90, "h": 81 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 273, "y": 348, "w": 90, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 90, "h": 81 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 370, "y": 346, "w": 90, "h": 82 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 90, "h": 82 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 186, "y": 262, "w": 90, "h": 83 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 90, "h": 83 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 278, "y": 263, "w": 90, "h": 83 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 90, "h": 83 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 184, "y": 176, "w": 90, "h": 84 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 90, "h": 84 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 559, "y": 175, "w": 90, "h": 84 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 90, "h": 84 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 374, "y": 261, "w": 91, "h": 83 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 91, "h": 83 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 467, "y": 261, "w": 92, "h": 82 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 5, "w": 92, "h": 82 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 0, "y": 262, "w": 92, "h": 82 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 5, "w": 92, "h": 82 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 91, "y": 431, "w": 90, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 7, "w": 90, "h": 80 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 183, "y": 431, "w": 90, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 7, "w": 90, "h": 80 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 0, "y": 514, "w": 88, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 7, "w": 88, "h": 80 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 182, "y": 513, "w": 89, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 7, "w": 89, "h": 80 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 273, "y": 515, "w": 87, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 7, "w": 87, "h": 80 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 91, "y": 513, "w": 89, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 7, "w": 89, "h": 80 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 364, "y": 513, "w": 88, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 7, "w": 88, "h": 80 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 546, "y": 433, "w": 89, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 7, "w": 89, "h": 80 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 0, "y": 431, "w": 89, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 89, "h": 81 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 365, "y": 430, "w": 90, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 90, "h": 81 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 273, "y": 348, "w": 90, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 90, "h": 81 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 370, "y": 346, "w": 90, "h": 82 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 90, "h": 82 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 186, "y": 262, "w": 90, "h": 83 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 90, "h": 83 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 278, "y": 263, "w": 90, "h": 83 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 90, "h": 83 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 184, "y": 176, "w": 90, "h": 84 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 90, "h": 84 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 559, "y": 175, "w": 90, "h": 84 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 90, "h": 84 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 374, "y": 261, "w": 91, "h": 83 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 91, "h": 83 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 467, "y": 261, "w": 92, "h": 82 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 5, "w": 92, "h": 82 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 0, "y": 262, "w": 92, "h": 82 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 5, "w": 92, "h": 82 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 91, "y": 431, "w": 90, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 7, "w": 90, "h": 80 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 183, "y": 431, "w": 90, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 7, "w": 90, "h": 80 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 0, "y": 514, "w": 88, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 7, "w": 88, "h": 80 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 182, "y": 513, "w": 89, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 7, "w": 89, "h": 80 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 273, "y": 515, "w": 87, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 7, "w": 87, "h": 80 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 91, "y": 513, "w": 89, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 7, "w": 89, "h": 80 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 364, "y": 513, "w": 88, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 7, "w": 88, "h": 80 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 546, "y": 433, "w": 89, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 7, "w": 89, "h": 80 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 0, "y": 431, "w": 89, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 89, "h": 81 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 365, "y": 430, "w": 90, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 90, "h": 81 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 273, "y": 348, "w": 90, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 90, "h": 81 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 370, "y": 346, "w": 90, "h": 82 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 90, "h": 82 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 186, "y": 262, "w": 90, "h": 83 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 90, "h": 83 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 278, "y": 263, "w": 90, "h": 83 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 90, "h": 83 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 184, "y": 176, "w": 90, "h": 84 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 90, "h": 84 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 0, "y": 176, "w": 90, "h": 84 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 90, "h": 84 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 92, "y": 176, "w": 90, "h": 84 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 90, "h": 84 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 561, "y": 261, "w": 90, "h": 83 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 90, "h": 83 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 0, "y": 346, "w": 89, "h": 83 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 89, "h": 83 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 467, "y": 345, "w": 89, "h": 83 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 89, "h": 83 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 94, "y": 262, "w": 90, "h": 83 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 90, "h": 83 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 91, "y": 347, "w": 89, "h": 82 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 89, "h": 82 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 182, "y": 347, "w": 89, "h": 82 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 89, "h": 82 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 275, "y": 431, "w": 87, "h": 82 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 87, "h": 82 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 457, "y": 430, "w": 87, "h": 83 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 87, "h": 83 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0088.png",
+    "frame": { "x": 558, "y": 346, "w": 86, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 86, "h": 85 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0089.png",
+    "frame": { "x": 283, "y": 175, "w": 89, "h": 86 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 89, "h": 86 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0090.png",
+    "frame": { "x": 189, "y": 88, "w": 92, "h": 86 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 92, "h": 86 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0091.png",
+    "frame": { "x": 0, "y": 0, "w": 93, "h": 87 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 93, "h": 87 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0092.png",
+    "frame": { "x": 380, "y": 0, "w": 92, "h": 86 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 92, "h": 86 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0093.png",
+    "frame": { "x": 95, "y": 88, "w": 92, "h": 86 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 92, "h": 86 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0094.png",
+    "frame": { "x": 474, "y": 0, "w": 92, "h": 86 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 92, "h": 86 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0095.png",
+    "frame": { "x": 190, "y": 0, "w": 93, "h": 86 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 93, "h": 86 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0096.png",
+    "frame": { "x": 95, "y": 0, "w": 93, "h": 86 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 93, "h": 86 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0097.png",
+    "frame": { "x": 285, "y": 0, "w": 93, "h": 86 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 93, "h": 86 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0098.png",
+    "frame": { "x": 473, "y": 88, "w": 93, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 93, "h": 85 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0099.png",
+    "frame": { "x": 378, "y": 88, "w": 93, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 93, "h": 85 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0100.png",
+    "frame": { "x": 283, "y": 88, "w": 93, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 93, "h": 85 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0101.png",
+    "frame": { "x": 0, "y": 89, "w": 93, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 93, "h": 85 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   },
+   {
+    "filename": "0102.png",
+    "frame": { "x": 374, "y": 175, "w": 91, "h": 84 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 91, "h": 84 },
+    "sourceSize": { "w": 94, "h": 87 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "248-mega.png",
+  "format": "I8",
+  "size": { "w": 651, "h": 595 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/shiny/248-mega.png b/public/images/pokemon/exp/shiny/248-mega.png
index eebfa35bbd4..8d9d5fc316c 100644
Binary files a/public/images/pokemon/exp/shiny/248-mega.png and b/public/images/pokemon/exp/shiny/248-mega.png differ
diff --git a/public/images/pokemon/exp/shiny/362-mega.json b/public/images/pokemon/exp/shiny/362-mega.json
index fe381106be4..c69ecfb1903 100644
--- a/public/images/pokemon/exp/shiny/362-mega.json
+++ b/public/images/pokemon/exp/shiny/362-mega.json
@@ -1,272 +1,551 @@
-{
-	"textures": [
-		{
-			"image": "362-mega.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 174,
-				"h": 174
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 58,
-						"h": 72
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 58,
-						"h": 72
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 58,
-						"h": 72
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 58,
-						"h": 72
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 58,
-						"h": 72
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 58,
-						"h": 72
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 58,
-						"h": 72
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 58,
-						"h": 72
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 58,
-						"h": 71
-					},
-					"frame": {
-						"x": 0,
-						"y": 72,
-						"w": 58,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 58,
-						"h": 71
-					},
-					"frame": {
-						"x": 0,
-						"y": 72,
-						"w": 58,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 58,
-						"h": 71
-					},
-					"frame": {
-						"x": 0,
-						"y": 72,
-						"w": 58,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 58,
-						"h": 71
-					},
-					"frame": {
-						"x": 58,
-						"y": 0,
-						"w": 58,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 58,
-						"h": 71
-					},
-					"frame": {
-						"x": 58,
-						"y": 0,
-						"w": 58,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 58,
-						"h": 71
-					},
-					"frame": {
-						"x": 116,
-						"y": 0,
-						"w": 58,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 58,
-						"h": 70
-					},
-					"frame": {
-						"x": 58,
-						"y": 71,
-						"w": 58,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 58,
-						"h": 70
-					},
-					"frame": {
-						"x": 58,
-						"y": 71,
-						"w": 58,
-						"h": 70
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:2d52abc4de24282165212b778dfccd62:be0a830bc1f35d437700a203d1fea184:8a7271a5423838c97ddeb1e6dc343255$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 64, "y": 0, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 7, "w": 58, "h": 66 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 64, "y": 0, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 9, "w": 58, "h": 66 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 64, "y": 0, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 11, "w": 58, "h": 66 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 64, "y": 0, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 14, "w": 58, "h": 66 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 64, "y": 0, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 16, "w": 58, "h": 66 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 64, "y": 0, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 18, "w": 58, "h": 66 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 64, "y": 0, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 15, "w": 58, "h": 66 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 64, "y": 0, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 13, "w": 58, "h": 66 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 64, "y": 0, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 10, "w": 58, "h": 66 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 64, "y": 0, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 8, "w": 58, "h": 66 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 64, "y": 0, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 58, "h": 66 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 64, "y": 0, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 58, "h": 66 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 64, "y": 0, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 58, "h": 66 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 64, "y": 0, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 58, "h": 66 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 64, "y": 0, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 58, "h": 66 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 64, "y": 0, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 7, "w": 58, "h": 66 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 64, "y": 0, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 9, "w": 58, "h": 66 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 64, "y": 0, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 11, "w": 58, "h": 66 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 64, "y": 0, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 14, "w": 58, "h": 66 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 64, "y": 0, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 16, "w": 58, "h": 66 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 64, "y": 0, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 18, "w": 58, "h": 66 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 64, "y": 0, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 15, "w": 58, "h": 66 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 64, "y": 0, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 13, "w": 58, "h": 66 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 64, "y": 0, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 10, "w": 58, "h": 66 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 64, "y": 0, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 8, "w": 58, "h": 66 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 64, "y": 0, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 58, "h": 66 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 64, "y": 0, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 58, "h": 66 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 64, "y": 0, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 58, "h": 66 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 64, "y": 0, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 58, "h": 66 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 64, "y": 0, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 58, "h": 66 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 64, "y": 0, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 7, "w": 58, "h": 66 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 64, "y": 0, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 9, "w": 58, "h": 66 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 64, "y": 0, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 11, "w": 58, "h": 66 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 64, "y": 0, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 14, "w": 58, "h": 66 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 64, "y": 0, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 16, "w": 58, "h": 66 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 64, "y": 0, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 18, "w": 58, "h": 66 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 64, "y": 0, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 15, "w": 58, "h": 66 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 64, "y": 0, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 13, "w": 58, "h": 66 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 64, "y": 0, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 10, "w": 58, "h": 66 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 64, "y": 0, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 8, "w": 58, "h": 66 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 64, "y": 0, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 58, "h": 66 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 64, "y": 0, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 58, "h": 66 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 64, "y": 0, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 58, "h": 66 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 64, "y": 0, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 58, "h": 66 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 64, "y": 0, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 58, "h": 66 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 64, "y": 0, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 58, "h": 66 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 0, "y": 0, "w": 62, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 62, "h": 67 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 0, "y": 69, "w": 55, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 6, "w": 55, "h": 65 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 0, "y": 0, "w": 62, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 62, "h": 67 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 0, "y": 69, "w": 55, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 6, "w": 55, "h": 65 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 0, "y": 0, "w": 62, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 62, "h": 67 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 0, "y": 69, "w": 55, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 6, "w": 55, "h": 65 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 0, "y": 0, "w": 62, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 62, "h": 67 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 0, "y": 69, "w": 55, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 6, "w": 55, "h": 65 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 0, "y": 0, "w": 62, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 62, "h": 67 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 0, "y": 69, "w": 55, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 6, "w": 55, "h": 65 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 0, "y": 0, "w": 62, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 62, "h": 67 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 0, "y": 69, "w": 55, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 6, "w": 55, "h": 65 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 64, "y": 0, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 58, "h": 66 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 64, "y": 0, "w": 58, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 58, "h": 66 },
+    "sourceSize": { "w": 62, "h": 84 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "362-mega.png",
+  "format": "I8",
+  "size": { "w": 122, "h": 134 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/shiny/362-mega.png b/public/images/pokemon/exp/shiny/362-mega.png
index 9d2b9adc7f4..6645ab66cab 100644
Binary files a/public/images/pokemon/exp/shiny/362-mega.png and b/public/images/pokemon/exp/shiny/362-mega.png differ
diff --git a/public/images/pokemon/exp/shiny/484-origin.json b/public/images/pokemon/exp/shiny/484-origin.json
index 97d6a0b5f49..e77754c3b3f 100644
--- a/public/images/pokemon/exp/shiny/484-origin.json
+++ b/public/images/pokemon/exp/shiny/484-origin.json
@@ -4,8 +4,8 @@
 			"image": "484-origin.png",
 			"format": "RGBA8888",
 			"size": {
-				"w": 426,
-				"h": 426
+				"w": 274,
+				"h": 274
 			},
 			"scale": 1,
 			"frames": [
@@ -14,20 +14,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 5,
+						"x": 0,
 						"y": 0,
-						"w": 91,
-						"h": 97
+						"w": 90,
+						"h": 95
 					},
 					"frame": {
 						"x": 0,
 						"y": 0,
-						"w": 91,
-						"h": 97
+						"w": 90,
+						"h": 95
 					}
 				},
 				{
@@ -35,20 +35,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 5,
+						"x": 0,
 						"y": 0,
-						"w": 91,
-						"h": 97
+						"w": 90,
+						"h": 95
 					},
 					"frame": {
 						"x": 0,
 						"y": 0,
-						"w": 91,
-						"h": 97
+						"w": 90,
+						"h": 95
 					}
 				},
 				{
@@ -56,20 +56,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 5,
+						"x": 0,
 						"y": 0,
-						"w": 91,
-						"h": 97
+						"w": 90,
+						"h": 95
 					},
 					"frame": {
 						"x": 0,
 						"y": 0,
-						"w": 91,
-						"h": 97
+						"w": 90,
+						"h": 95
 					}
 				},
 				{
@@ -77,20 +77,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 5,
+						"x": 0,
 						"y": 0,
-						"w": 91,
-						"h": 97
+						"w": 90,
+						"h": 95
 					},
 					"frame": {
 						"x": 0,
 						"y": 0,
-						"w": 91,
-						"h": 97
+						"w": 90,
+						"h": 95
 					}
 				},
 				{
@@ -98,20 +98,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 5,
+						"x": 0,
 						"y": 0,
-						"w": 91,
-						"h": 97
+						"w": 90,
+						"h": 95
 					},
 					"frame": {
 						"x": 0,
 						"y": 0,
-						"w": 91,
-						"h": 97
+						"w": 90,
+						"h": 95
 					}
 				},
 				{
@@ -119,146 +119,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 0,
 						"w": 91,
-						"h": 97
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 91,
-						"h": 97
-					}
-				},
-				{
-					"filename": "0081.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"h": 95
 					},
 					"spriteSourceSize": {
 						"x": 0,
-						"y": 5,
-						"w": 92,
-						"h": 96
-					},
-					"frame": {
-						"x": 91,
-						"y": 0,
-						"w": 92,
-						"h": 96
-					}
-				},
-				{
-					"filename": "0082.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 92,
-						"h": 96
-					},
-					"frame": {
-						"x": 91,
-						"y": 0,
-						"w": 92,
-						"h": 96
-					}
-				},
-				{
-					"filename": "0073.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 5,
 						"y": 0,
 						"w": 90,
-						"h": 97
+						"h": 95
 					},
 					"frame": {
 						"x": 0,
-						"y": 97,
-						"w": 90,
-						"h": 97
-					}
-				},
-				{
-					"filename": "0074.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 5,
 						"y": 0,
 						"w": 90,
-						"h": 97
-					},
-					"frame": {
-						"x": 0,
-						"y": 97,
-						"w": 90,
-						"h": 97
-					}
-				},
-				{
-					"filename": "0083.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 5,
-						"w": 96,
-						"h": 90
-					},
-					"frame": {
-						"x": 183,
-						"y": 0,
-						"w": 96,
-						"h": 90
-					}
-				},
-				{
-					"filename": "0084.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 5,
-						"w": 96,
-						"h": 90
-					},
-					"frame": {
-						"x": 183,
-						"y": 0,
-						"w": 96,
-						"h": 90
+						"h": 95
 					}
 				},
 				{
@@ -266,20 +140,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 6,
-						"y": 2,
+						"x": 0,
+						"y": 1,
 						"w": 90,
-						"h": 95
+						"h": 94
 					},
 					"frame": {
 						"x": 0,
-						"y": 194,
+						"y": 95,
 						"w": 90,
-						"h": 95
+						"h": 94
 					}
 				},
 				{
@@ -287,20 +161,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 6,
-						"y": 2,
+						"x": 0,
+						"y": 1,
 						"w": 90,
-						"h": 95
+						"h": 94
 					},
 					"frame": {
 						"x": 0,
-						"y": 194,
+						"y": 95,
 						"w": 90,
-						"h": 95
+						"h": 94
 					}
 				},
 				{
@@ -308,20 +182,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 6,
-						"y": 2,
+						"x": 0,
+						"y": 1,
 						"w": 90,
-						"h": 95
+						"h": 94
 					},
 					"frame": {
 						"x": 0,
-						"y": 194,
+						"y": 95,
 						"w": 90,
-						"h": 95
+						"h": 94
 					}
 				},
 				{
@@ -329,20 +203,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 6,
-						"y": 2,
+						"x": 0,
+						"y": 1,
 						"w": 90,
-						"h": 95
+						"h": 94
 					},
 					"frame": {
 						"x": 0,
-						"y": 194,
+						"y": 95,
 						"w": 90,
-						"h": 95
+						"h": 94
 					}
 				},
 				{
@@ -350,20 +224,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 6,
-						"y": 2,
+						"x": 0,
+						"y": 1,
 						"w": 90,
-						"h": 95
+						"h": 94
 					},
 					"frame": {
 						"x": 0,
-						"y": 194,
+						"y": 95,
 						"w": 90,
-						"h": 95
+						"h": 94
 					}
 				},
 				{
@@ -371,20 +245,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 6,
-						"y": 2,
+						"x": 0,
+						"y": 1,
 						"w": 90,
-						"h": 95
+						"h": 94
 					},
 					"frame": {
 						"x": 0,
-						"y": 194,
+						"y": 95,
 						"w": 90,
-						"h": 95
+						"h": 94
 					}
 				},
 				{
@@ -392,20 +266,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 6,
-						"y": 2,
+						"x": 0,
+						"y": 1,
 						"w": 90,
-						"h": 95
+						"h": 94
 					},
 					"frame": {
 						"x": 0,
-						"y": 194,
+						"y": 95,
 						"w": 90,
-						"h": 95
+						"h": 94
 					}
 				},
 				{
@@ -413,20 +287,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 6,
-						"y": 2,
+						"x": 0,
+						"y": 1,
 						"w": 90,
-						"h": 95
+						"h": 94
 					},
 					"frame": {
 						"x": 0,
-						"y": 194,
+						"y": 95,
 						"w": 90,
-						"h": 95
+						"h": 94
 					}
 				},
 				{
@@ -434,20 +308,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 6,
-						"y": 2,
+						"x": 0,
+						"y": 1,
 						"w": 90,
-						"h": 95
+						"h": 94
 					},
 					"frame": {
 						"x": 0,
-						"y": 194,
+						"y": 95,
 						"w": 90,
-						"h": 95
+						"h": 94
 					}
 				},
 				{
@@ -455,20 +329,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 6,
-						"y": 2,
+						"x": 0,
+						"y": 1,
 						"w": 90,
-						"h": 95
+						"h": 94
 					},
 					"frame": {
 						"x": 0,
-						"y": 194,
+						"y": 95,
 						"w": 90,
-						"h": 95
+						"h": 94
 					}
 				},
 				{
@@ -476,20 +350,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 6,
-						"y": 2,
+						"x": 0,
+						"y": 1,
 						"w": 90,
-						"h": 95
+						"h": 94
 					},
 					"frame": {
 						"x": 0,
-						"y": 194,
+						"y": 95,
 						"w": 90,
-						"h": 95
+						"h": 94
 					}
 				},
 				{
@@ -497,272 +371,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 2,
-						"w": 90,
+						"w": 91,
 						"h": 95
 					},
-					"frame": {
+					"spriteSourceSize": {
 						"x": 0,
-						"y": 194,
-						"w": 90,
-						"h": 95
-					}
-				},
-				{
-					"filename": "0120.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 2,
-						"w": 90,
-						"h": 95
-					},
-					"frame": {
-						"x": 0,
-						"y": 194,
-						"w": 90,
-						"h": 95
-					}
-				},
-				{
-					"filename": "0075.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 7,
 						"y": 1,
-						"w": 89,
-						"h": 95
+						"w": 90,
+						"h": 94
 					},
 					"frame": {
 						"x": 0,
-						"y": 289,
-						"w": 89,
-						"h": 95
-					}
-				},
-				{
-					"filename": "0076.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 1,
-						"w": 89,
-						"h": 95
-					},
-					"frame": {
-						"x": 0,
-						"y": 289,
-						"w": 89,
-						"h": 95
-					}
-				},
-				{
-					"filename": "0079.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 4,
-						"w": 92,
-						"h": 92
-					},
-					"frame": {
-						"x": 279,
-						"y": 0,
-						"w": 92,
-						"h": 92
-					}
-				},
-				{
-					"filename": "0080.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 4,
-						"w": 92,
-						"h": 92
-					},
-					"frame": {
-						"x": 279,
-						"y": 0,
-						"w": 92,
-						"h": 92
-					}
-				},
-				{
-					"filename": "0089.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 24,
-						"y": 16,
-						"w": 50,
-						"h": 54
-					},
-					"frame": {
-						"x": 371,
-						"y": 0,
-						"w": 50,
-						"h": 54
-					}
-				},
-				{
-					"filename": "0090.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 24,
-						"y": 16,
-						"w": 50,
-						"h": 54
-					},
-					"frame": {
-						"x": 371,
-						"y": 0,
-						"w": 50,
-						"h": 54
-					}
-				},
-				{
-					"filename": "0111.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 24,
-						"y": 16,
-						"w": 50,
-						"h": 54
-					},
-					"frame": {
-						"x": 371,
-						"y": 0,
-						"w": 50,
-						"h": 54
-					}
-				},
-				{
-					"filename": "0112.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 24,
-						"y": 16,
-						"w": 50,
-						"h": 54
-					},
-					"frame": {
-						"x": 371,
-						"y": 0,
-						"w": 50,
-						"h": 54
-					}
-				},
-				{
-					"filename": "0117.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 92,
-						"h": 92
-					},
-					"frame": {
-						"x": 183,
-						"y": 90,
-						"w": 92,
-						"h": 92
-					}
-				},
-				{
-					"filename": "0118.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 92,
-						"h": 92
-					},
-					"frame": {
-						"x": 183,
-						"y": 90,
-						"w": 92,
-						"h": 92
-					}
-				},
-				{
-					"filename": "0119.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 92,
-						"h": 92
-					},
-					"frame": {
-						"x": 183,
-						"y": 90,
-						"w": 92,
-						"h": 92
+						"y": 95,
+						"w": 90,
+						"h": 94
 					}
 				},
 				{
@@ -770,20 +392,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 6,
-						"y": 5,
+						"x": 0,
+						"y": 4,
 						"w": 91,
-						"h": 92
+						"h": 91
 					},
 					"frame": {
-						"x": 275,
-						"y": 92,
+						"x": 90,
+						"y": 0,
 						"w": 91,
-						"h": 92
+						"h": 91
 					}
 				},
 				{
@@ -791,20 +413,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 6,
-						"y": 5,
+						"x": 0,
+						"y": 4,
 						"w": 91,
-						"h": 92
+						"h": 91
 					},
 					"frame": {
-						"x": 275,
-						"y": 92,
+						"x": 90,
+						"y": 0,
 						"w": 91,
-						"h": 92
+						"h": 91
 					}
 				},
 				{
@@ -812,20 +434,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 6,
-						"y": 5,
+						"x": 0,
+						"y": 4,
 						"w": 91,
-						"h": 92
+						"h": 91
 					},
 					"frame": {
-						"x": 275,
-						"y": 92,
+						"x": 90,
+						"y": 0,
 						"w": 91,
-						"h": 92
+						"h": 91
 					}
 				},
 				{
@@ -833,20 +455,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 6,
-						"y": 5,
+						"x": 0,
+						"y": 4,
 						"w": 91,
-						"h": 92
+						"h": 91
 					},
 					"frame": {
-						"x": 275,
-						"y": 92,
+						"x": 90,
+						"y": 0,
 						"w": 91,
-						"h": 92
+						"h": 91
 					}
 				},
 				{
@@ -854,20 +476,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 6,
-						"y": 5,
+						"x": 0,
+						"y": 4,
 						"w": 91,
-						"h": 92
+						"h": 91
 					},
 					"frame": {
-						"x": 275,
-						"y": 92,
+						"x": 90,
+						"y": 0,
 						"w": 91,
-						"h": 92
+						"h": 91
 					}
 				},
 				{
@@ -875,20 +497,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 6,
-						"y": 5,
+						"x": 0,
+						"y": 4,
 						"w": 91,
-						"h": 92
+						"h": 91
 					},
 					"frame": {
-						"x": 275,
-						"y": 92,
+						"x": 90,
+						"y": 0,
 						"w": 91,
-						"h": 92
+						"h": 91
 					}
 				},
 				{
@@ -896,20 +518,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 6,
-						"y": 5,
+						"x": 0,
+						"y": 4,
 						"w": 91,
-						"h": 92
+						"h": 91
 					},
 					"frame": {
-						"x": 275,
-						"y": 92,
+						"x": 90,
+						"y": 0,
 						"w": 91,
-						"h": 92
+						"h": 91
 					}
 				},
 				{
@@ -917,20 +539,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 6,
-						"y": 5,
+						"x": 0,
+						"y": 4,
 						"w": 91,
-						"h": 92
+						"h": 91
 					},
 					"frame": {
-						"x": 275,
-						"y": 92,
+						"x": 90,
+						"y": 0,
 						"w": 91,
-						"h": 92
+						"h": 91
 					}
 				},
 				{
@@ -938,20 +560,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 6,
-						"y": 5,
+						"x": 0,
+						"y": 4,
 						"w": 91,
-						"h": 92
+						"h": 91
 					},
 					"frame": {
-						"x": 275,
-						"y": 92,
+						"x": 90,
+						"y": 0,
 						"w": 91,
-						"h": 92
+						"h": 91
 					}
 				},
 				{
@@ -959,20 +581,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 6,
-						"y": 5,
+						"x": 0,
+						"y": 4,
 						"w": 91,
-						"h": 92
+						"h": 91
 					},
 					"frame": {
-						"x": 275,
-						"y": 92,
+						"x": 90,
+						"y": 0,
 						"w": 91,
-						"h": 92
+						"h": 91
 					}
 				},
 				{
@@ -980,20 +602,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 6,
-						"y": 5,
+						"x": 0,
+						"y": 4,
 						"w": 91,
-						"h": 92
+						"h": 91
 					},
 					"frame": {
-						"x": 275,
-						"y": 92,
+						"x": 90,
+						"y": 0,
 						"w": 91,
-						"h": 92
+						"h": 91
 					}
 				},
 				{
@@ -1001,272 +623,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 5,
 						"w": 91,
-						"h": 92
+						"h": 95
 					},
-					"frame": {
-						"x": 275,
-						"y": 92,
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 4,
 						"w": 91,
-						"h": 92
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 4,
-						"w": 89,
-						"h": 93
-					},
-					"frame": {
-						"x": 89,
-						"y": 289,
-						"w": 89,
-						"h": 93
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 4,
-						"w": 89,
-						"h": 93
-					},
-					"frame": {
-						"x": 89,
-						"y": 289,
-						"w": 89,
-						"h": 93
-					}
-				},
-				{
-					"filename": "0035.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 4,
-						"w": 89,
-						"h": 93
-					},
-					"frame": {
-						"x": 89,
-						"y": 289,
-						"w": 89,
-						"h": 93
-					}
-				},
-				{
-					"filename": "0036.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 4,
-						"w": 89,
-						"h": 93
-					},
-					"frame": {
-						"x": 89,
-						"y": 289,
-						"w": 89,
-						"h": 93
-					}
-				},
-				{
-					"filename": "0039.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 4,
-						"w": 89,
-						"h": 93
-					},
-					"frame": {
-						"x": 89,
-						"y": 289,
-						"w": 89,
-						"h": 93
-					}
-				},
-				{
-					"filename": "0040.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 4,
-						"w": 89,
-						"h": 93
-					},
-					"frame": {
-						"x": 89,
-						"y": 289,
-						"w": 89,
-						"h": 93
-					}
-				},
-				{
-					"filename": "0059.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 4,
-						"w": 89,
-						"h": 93
-					},
-					"frame": {
-						"x": 89,
-						"y": 289,
-						"w": 89,
-						"h": 93
-					}
-				},
-				{
-					"filename": "0060.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 4,
-						"w": 89,
-						"h": 93
-					},
-					"frame": {
-						"x": 89,
-						"y": 289,
-						"w": 89,
-						"h": 93
-					}
-				},
-				{
-					"filename": "0063.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 4,
-						"w": 89,
-						"h": 93
-					},
-					"frame": {
-						"x": 89,
-						"y": 289,
-						"w": 89,
-						"h": 93
-					}
-				},
-				{
-					"filename": "0064.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 4,
-						"w": 89,
-						"h": 93
-					},
-					"frame": {
-						"x": 89,
-						"y": 289,
-						"w": 89,
-						"h": 93
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 4,
-						"w": 89,
-						"h": 93
+						"h": 91
 					},
 					"frame": {
 						"x": 90,
-						"y": 97,
-						"w": 89,
-						"h": 93
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 4,
-						"w": 89,
-						"h": 93
-					},
-					"frame": {
-						"x": 90,
-						"y": 97,
-						"w": 89,
-						"h": 93
+						"y": 0,
+						"w": 91,
+						"h": 91
 					}
 				},
 				{
@@ -1274,20 +644,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 6,
-						"y": 5,
+						"x": 0,
+						"y": 4,
 						"w": 90,
-						"h": 92
+						"h": 91
 					},
 					"frame": {
-						"x": 90,
-						"y": 190,
+						"x": 181,
+						"y": 0,
 						"w": 90,
-						"h": 92
+						"h": 91
 					}
 				},
 				{
@@ -1295,20 +665,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 6,
-						"y": 5,
+						"x": 0,
+						"y": 4,
 						"w": 90,
-						"h": 92
+						"h": 91
 					},
 					"frame": {
-						"x": 90,
-						"y": 190,
+						"x": 181,
+						"y": 0,
 						"w": 90,
-						"h": 92
+						"h": 91
 					}
 				},
 				{
@@ -1316,20 +686,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 6,
-						"y": 5,
+						"x": 0,
+						"y": 4,
 						"w": 90,
-						"h": 92
+						"h": 91
 					},
 					"frame": {
-						"x": 90,
-						"y": 190,
+						"x": 181,
+						"y": 0,
 						"w": 90,
-						"h": 92
+						"h": 91
 					}
 				},
 				{
@@ -1337,20 +707,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 6,
-						"y": 5,
+						"x": 0,
+						"y": 4,
 						"w": 90,
-						"h": 92
+						"h": 91
 					},
 					"frame": {
-						"x": 90,
-						"y": 190,
+						"x": 181,
+						"y": 0,
 						"w": 90,
-						"h": 92
+						"h": 91
 					}
 				},
 				{
@@ -1358,20 +728,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 6,
-						"y": 5,
+						"x": 0,
+						"y": 4,
 						"w": 90,
-						"h": 92
+						"h": 91
 					},
 					"frame": {
-						"x": 90,
-						"y": 190,
+						"x": 181,
+						"y": 0,
 						"w": 90,
-						"h": 92
+						"h": 91
 					}
 				},
 				{
@@ -1379,20 +749,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 6,
-						"y": 5,
+						"x": 0,
+						"y": 4,
 						"w": 90,
-						"h": 92
+						"h": 91
 					},
 					"frame": {
-						"x": 90,
-						"y": 190,
+						"x": 181,
+						"y": 0,
 						"w": 90,
-						"h": 92
+						"h": 91
 					}
 				},
 				{
@@ -1400,20 +770,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 6,
-						"y": 5,
+						"x": 0,
+						"y": 4,
 						"w": 90,
-						"h": 92
+						"h": 91
 					},
 					"frame": {
-						"x": 90,
-						"y": 190,
+						"x": 181,
+						"y": 0,
 						"w": 90,
-						"h": 92
+						"h": 91
 					}
 				},
 				{
@@ -1421,20 +791,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 6,
-						"y": 5,
+						"x": 0,
+						"y": 4,
 						"w": 90,
-						"h": 92
+						"h": 91
 					},
 					"frame": {
-						"x": 90,
-						"y": 190,
+						"x": 181,
+						"y": 0,
 						"w": 90,
-						"h": 92
+						"h": 91
 					}
 				},
 				{
@@ -1442,20 +812,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 6,
-						"y": 5,
+						"x": 0,
+						"y": 4,
 						"w": 90,
-						"h": 92
+						"h": 91
 					},
 					"frame": {
-						"x": 90,
-						"y": 190,
+						"x": 181,
+						"y": 0,
 						"w": 90,
-						"h": 92
+						"h": 91
 					}
 				},
 				{
@@ -1463,20 +833,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 6,
-						"y": 5,
+						"x": 0,
+						"y": 4,
 						"w": 90,
-						"h": 92
+						"h": 91
 					},
 					"frame": {
-						"x": 90,
-						"y": 190,
+						"x": 181,
+						"y": 0,
 						"w": 90,
-						"h": 92
+						"h": 91
 					}
 				},
 				{
@@ -1484,20 +854,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 6,
-						"y": 5,
+						"x": 0,
+						"y": 4,
 						"w": 90,
-						"h": 92
+						"h": 91
 					},
 					"frame": {
-						"x": 90,
-						"y": 190,
+						"x": 181,
+						"y": 0,
 						"w": 90,
-						"h": 92
+						"h": 91
 					}
 				},
 				{
@@ -1505,19 +875,229 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 6,
-						"y": 5,
+						"x": 0,
+						"y": 4,
 						"w": 90,
+						"h": 91
+					},
+					"frame": {
+						"x": 181,
+						"y": 0,
+						"w": 90,
+						"h": 91
+					}
+				},
+				{
+					"filename": "0011.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 91,
+						"h": 95
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 3,
+						"w": 89,
 						"h": 92
 					},
 					"frame": {
 						"x": 90,
-						"y": 190,
-						"w": 90,
+						"y": 91,
+						"w": 89,
+						"h": 92
+					}
+				},
+				{
+					"filename": "0012.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 91,
+						"h": 95
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 3,
+						"w": 89,
+						"h": 92
+					},
+					"frame": {
+						"x": 90,
+						"y": 91,
+						"w": 89,
+						"h": 92
+					}
+				},
+				{
+					"filename": "0035.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 91,
+						"h": 95
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 3,
+						"w": 89,
+						"h": 92
+					},
+					"frame": {
+						"x": 90,
+						"y": 91,
+						"w": 89,
+						"h": 92
+					}
+				},
+				{
+					"filename": "0036.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 91,
+						"h": 95
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 3,
+						"w": 89,
+						"h": 92
+					},
+					"frame": {
+						"x": 90,
+						"y": 91,
+						"w": 89,
+						"h": 92
+					}
+				},
+				{
+					"filename": "0039.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 91,
+						"h": 95
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 3,
+						"w": 89,
+						"h": 92
+					},
+					"frame": {
+						"x": 90,
+						"y": 91,
+						"w": 89,
+						"h": 92
+					}
+				},
+				{
+					"filename": "0040.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 91,
+						"h": 95
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 3,
+						"w": 89,
+						"h": 92
+					},
+					"frame": {
+						"x": 90,
+						"y": 91,
+						"w": 89,
+						"h": 92
+					}
+				},
+				{
+					"filename": "0059.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 91,
+						"h": 95
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 3,
+						"w": 89,
+						"h": 92
+					},
+					"frame": {
+						"x": 90,
+						"y": 91,
+						"w": 89,
+						"h": 92
+					}
+				},
+				{
+					"filename": "0060.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 91,
+						"h": 95
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 3,
+						"w": 89,
+						"h": 92
+					},
+					"frame": {
+						"x": 90,
+						"y": 91,
+						"w": 89,
+						"h": 92
+					}
+				},
+				{
+					"filename": "0063.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 91,
+						"h": 95
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 3,
+						"w": 89,
+						"h": 92
+					},
+					"frame": {
+						"x": 90,
+						"y": 91,
+						"w": 89,
+						"h": 92
+					}
+				},
+				{
+					"filename": "0064.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 91,
+						"h": 95
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 3,
+						"w": 89,
+						"h": 92
+					},
+					"frame": {
+						"x": 90,
+						"y": 91,
+						"w": 89,
 						"h": 92
 					}
 				},
@@ -1526,20 +1106,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 7,
-						"y": 5,
+						"x": 1,
+						"y": 4,
 						"w": 89,
-						"h": 92
+						"h": 91
 					},
 					"frame": {
-						"x": 180,
-						"y": 182,
+						"x": 90,
+						"y": 183,
 						"w": 89,
-						"h": 92
+						"h": 91
 					}
 				},
 				{
@@ -1547,20 +1127,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 7,
-						"y": 5,
+						"x": 1,
+						"y": 4,
 						"w": 89,
-						"h": 92
+						"h": 91
 					},
 					"frame": {
-						"x": 180,
-						"y": 182,
+						"x": 90,
+						"y": 183,
 						"w": 89,
-						"h": 92
+						"h": 91
 					}
 				},
 				{
@@ -1568,20 +1148,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 7,
-						"y": 5,
+						"x": 1,
+						"y": 4,
 						"w": 89,
-						"h": 92
+						"h": 91
 					},
 					"frame": {
-						"x": 180,
-						"y": 182,
+						"x": 90,
+						"y": 183,
 						"w": 89,
-						"h": 92
+						"h": 91
 					}
 				},
 				{
@@ -1589,20 +1169,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 7,
-						"y": 5,
+						"x": 1,
+						"y": 4,
 						"w": 89,
-						"h": 92
+						"h": 91
 					},
 					"frame": {
-						"x": 180,
-						"y": 182,
+						"x": 90,
+						"y": 183,
 						"w": 89,
-						"h": 92
+						"h": 91
 					}
 				},
 				{
@@ -1610,20 +1190,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 7,
-						"y": 5,
+						"x": 1,
+						"y": 4,
 						"w": 89,
-						"h": 92
+						"h": 91
 					},
 					"frame": {
-						"x": 180,
-						"y": 182,
+						"x": 90,
+						"y": 183,
 						"w": 89,
-						"h": 92
+						"h": 91
 					}
 				},
 				{
@@ -1631,20 +1211,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 7,
-						"y": 5,
+						"x": 1,
+						"y": 4,
 						"w": 89,
-						"h": 92
+						"h": 91
 					},
 					"frame": {
-						"x": 180,
-						"y": 182,
+						"x": 90,
+						"y": 183,
 						"w": 89,
-						"h": 92
+						"h": 91
 					}
 				},
 				{
@@ -1652,20 +1232,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 7,
-						"y": 5,
+						"x": 1,
+						"y": 4,
 						"w": 89,
-						"h": 92
+						"h": 91
 					},
 					"frame": {
-						"x": 180,
-						"y": 182,
+						"x": 90,
+						"y": 183,
 						"w": 89,
-						"h": 92
+						"h": 91
 					}
 				},
 				{
@@ -1673,20 +1253,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 7,
-						"y": 5,
+						"x": 1,
+						"y": 4,
 						"w": 89,
-						"h": 92
+						"h": 91
 					},
 					"frame": {
-						"x": 180,
-						"y": 182,
+						"x": 90,
+						"y": 183,
 						"w": 89,
-						"h": 92
+						"h": 91
 					}
 				},
 				{
@@ -1694,20 +1274,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 7,
-						"y": 5,
+						"x": 1,
+						"y": 4,
 						"w": 89,
-						"h": 92
+						"h": 91
 					},
 					"frame": {
-						"x": 180,
-						"y": 182,
+						"x": 90,
+						"y": 183,
 						"w": 89,
-						"h": 92
+						"h": 91
 					}
 				},
 				{
@@ -1715,20 +1295,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 7,
-						"y": 5,
+						"x": 1,
+						"y": 4,
 						"w": 89,
-						"h": 92
+						"h": 91
 					},
 					"frame": {
-						"x": 180,
-						"y": 182,
+						"x": 90,
+						"y": 183,
 						"w": 89,
-						"h": 92
+						"h": 91
 					}
 				},
 				{
@@ -1736,20 +1316,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 7,
-						"y": 5,
+						"x": 1,
+						"y": 4,
 						"w": 89,
-						"h": 92
+						"h": 91
 					},
 					"frame": {
-						"x": 180,
-						"y": 182,
+						"x": 90,
+						"y": 183,
 						"w": 89,
-						"h": 92
+						"h": 91
 					}
 				},
 				{
@@ -1757,62 +1337,62 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 7,
-						"y": 5,
+						"x": 1,
+						"y": 4,
+						"w": 89,
+						"h": 91
+					},
+					"frame": {
+						"x": 90,
+						"y": 183,
+						"w": 89,
+						"h": 91
+					}
+				},
+				{
+					"filename": "0015.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 91,
+						"h": 95
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 3,
 						"w": 89,
 						"h": 92
 					},
 					"frame": {
-						"x": 180,
-						"y": 182,
+						"x": 179,
+						"y": 91,
 						"w": 89,
 						"h": 92
 					}
 				},
 				{
-					"filename": "0077.png",
+					"filename": "0016.png",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 90,
-						"h": 90
+						"x": 2,
+						"y": 3,
+						"w": 89,
+						"h": 92
 					},
 					"frame": {
-						"x": 269,
-						"y": 184,
-						"w": 90,
-						"h": 90
-					}
-				},
-				{
-					"filename": "0078.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 90,
-						"h": 90
-					},
-					"frame": {
-						"x": 269,
-						"y": 184,
-						"w": 90,
-						"h": 90
+						"x": 179,
+						"y": 91,
+						"w": 89,
+						"h": 92
 					}
 				},
 				{
@@ -1820,20 +1400,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 10,
-						"y": 5,
-						"w": 88,
-						"h": 92
+						"x": 4,
+						"y": 4,
+						"w": 87,
+						"h": 91
 					},
 					"frame": {
-						"x": 180,
-						"y": 274,
-						"w": 88,
-						"h": 92
+						"x": 179,
+						"y": 183,
+						"w": 87,
+						"h": 91
 					}
 				},
 				{
@@ -1841,20 +1421,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 10,
-						"y": 5,
-						"w": 88,
-						"h": 92
+						"x": 4,
+						"y": 4,
+						"w": 87,
+						"h": 91
 					},
 					"frame": {
-						"x": 180,
-						"y": 274,
-						"w": 88,
-						"h": 92
+						"x": 179,
+						"y": 183,
+						"w": 87,
+						"h": 91
 					}
 				},
 				{
@@ -1862,20 +1442,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 10,
-						"y": 5,
-						"w": 88,
-						"h": 92
+						"x": 4,
+						"y": 4,
+						"w": 87,
+						"h": 91
 					},
 					"frame": {
-						"x": 180,
-						"y": 274,
-						"w": 88,
-						"h": 92
+						"x": 179,
+						"y": 183,
+						"w": 87,
+						"h": 91
 					}
 				},
 				{
@@ -1883,20 +1463,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 10,
-						"y": 5,
-						"w": 88,
-						"h": 92
+						"x": 4,
+						"y": 4,
+						"w": 87,
+						"h": 91
 					},
 					"frame": {
-						"x": 180,
-						"y": 274,
-						"w": 88,
-						"h": 92
+						"x": 179,
+						"y": 183,
+						"w": 87,
+						"h": 91
 					}
 				},
 				{
@@ -1904,20 +1484,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 10,
-						"y": 5,
-						"w": 88,
-						"h": 92
+						"x": 4,
+						"y": 4,
+						"w": 87,
+						"h": 91
 					},
 					"frame": {
-						"x": 180,
-						"y": 274,
-						"w": 88,
-						"h": 92
+						"x": 179,
+						"y": 183,
+						"w": 87,
+						"h": 91
 					}
 				},
 				{
@@ -1925,608 +1505,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 110,
-						"h": 110
+						"w": 91,
+						"h": 95
 					},
 					"spriteSourceSize": {
-						"x": 10,
-						"y": 5,
-						"w": 88,
-						"h": 92
+						"x": 4,
+						"y": 4,
+						"w": 87,
+						"h": 91
 					},
 					"frame": {
-						"x": 180,
-						"y": 274,
-						"w": 88,
-						"h": 92
-					}
-				},
-				{
-					"filename": "0085.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 15,
-						"y": 7,
-						"w": 79,
-						"h": 86
-					},
-					"frame": {
-						"x": 268,
-						"y": 274,
-						"w": 79,
-						"h": 86
-					}
-				},
-				{
-					"filename": "0086.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 15,
-						"y": 7,
-						"w": 79,
-						"h": 86
-					},
-					"frame": {
-						"x": 268,
-						"y": 274,
-						"w": 79,
-						"h": 86
-					}
-				},
-				{
-					"filename": "0116.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 13,
-						"y": 10,
-						"w": 79,
-						"h": 83
-					},
-					"frame": {
-						"x": 347,
-						"y": 274,
-						"w": 79,
-						"h": 83
-					}
-				},
-				{
-					"filename": "0113.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 20,
-						"y": 11,
-						"w": 71,
-						"h": 69
-					},
-					"frame": {
-						"x": 347,
-						"y": 357,
-						"w": 71,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0114.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 20,
-						"y": 11,
-						"w": 71,
-						"h": 69
-					},
-					"frame": {
-						"x": 347,
-						"y": 357,
-						"w": 71,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0115.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 20,
-						"y": 11,
-						"w": 71,
-						"h": 69
-					},
-					"frame": {
-						"x": 347,
-						"y": 357,
-						"w": 71,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0087.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 20,
-						"y": 12,
-						"w": 59,
-						"h": 70
-					},
-					"frame": {
-						"x": 359,
-						"y": 184,
-						"w": 59,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0088.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 20,
-						"y": 12,
-						"w": 59,
-						"h": 70
-					},
-					"frame": {
-						"x": 359,
-						"y": 184,
-						"w": 59,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0091.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 35,
-						"y": 23,
-						"w": 27,
-						"h": 33
-					},
-					"frame": {
-						"x": 0,
-						"y": 384,
-						"w": 27,
-						"h": 33
-					}
-				},
-				{
-					"filename": "0092.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 35,
-						"y": 23,
-						"w": 27,
-						"h": 33
-					},
-					"frame": {
-						"x": 371,
-						"y": 54,
-						"w": 27,
-						"h": 33
-					}
-				},
-				{
-					"filename": "0093.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 42,
-						"y": 26,
-						"w": 19,
-						"h": 23
-					},
-					"frame": {
-						"x": 27,
-						"y": 384,
-						"w": 19,
-						"h": 23
-					}
-				},
-				{
-					"filename": "0094.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 42,
-						"y": 26,
-						"w": 19,
-						"h": 23
-					},
-					"frame": {
-						"x": 27,
-						"y": 384,
-						"w": 19,
-						"h": 23
-					}
-				},
-				{
-					"filename": "0095.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 42,
-						"y": 35,
-						"w": 14,
-						"h": 10
-					},
-					"frame": {
-						"x": 359,
-						"y": 254,
-						"w": 14,
-						"h": 10
-					}
-				},
-				{
-					"filename": "0096.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 42,
-						"y": 35,
-						"w": 14,
-						"h": 10
-					},
-					"frame": {
-						"x": 359,
-						"y": 254,
-						"w": 14,
-						"h": 10
-					}
-				},
-				{
-					"filename": "0097.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 3,
-						"h": 3
-					},
-					"frame": {
-						"x": 90,
-						"y": 282,
-						"w": 3,
-						"h": 3
-					}
-				},
-				{
-					"filename": "0098.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 3,
-						"h": 3
-					},
-					"frame": {
-						"x": 90,
-						"y": 282,
-						"w": 3,
-						"h": 3
-					}
-				},
-				{
-					"filename": "0099.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 3,
-						"h": 3
-					},
-					"frame": {
-						"x": 90,
-						"y": 282,
-						"w": 3,
-						"h": 3
-					}
-				},
-				{
-					"filename": "0100.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 3,
-						"h": 3
-					},
-					"frame": {
-						"x": 90,
-						"y": 282,
-						"w": 3,
-						"h": 3
-					}
-				},
-				{
-					"filename": "0101.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 3,
-						"h": 3
-					},
-					"frame": {
-						"x": 90,
-						"y": 282,
-						"w": 3,
-						"h": 3
-					}
-				},
-				{
-					"filename": "0102.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 3,
-						"h": 3
-					},
-					"frame": {
-						"x": 90,
-						"y": 282,
-						"w": 3,
-						"h": 3
-					}
-				},
-				{
-					"filename": "0103.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 3,
-						"h": 3
-					},
-					"frame": {
-						"x": 90,
-						"y": 282,
-						"w": 3,
-						"h": 3
-					}
-				},
-				{
-					"filename": "0104.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 3,
-						"h": 3
-					},
-					"frame": {
-						"x": 90,
-						"y": 282,
-						"w": 3,
-						"h": 3
-					}
-				},
-				{
-					"filename": "0105.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 3,
-						"h": 3
-					},
-					"frame": {
-						"x": 90,
-						"y": 282,
-						"w": 3,
-						"h": 3
-					}
-				},
-				{
-					"filename": "0106.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 3,
-						"h": 3
-					},
-					"frame": {
-						"x": 90,
-						"y": 282,
-						"w": 3,
-						"h": 3
-					}
-				},
-				{
-					"filename": "0107.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 3,
-						"h": 3
-					},
-					"frame": {
-						"x": 90,
-						"y": 282,
-						"w": 3,
-						"h": 3
-					}
-				},
-				{
-					"filename": "0108.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 3,
-						"h": 3
-					},
-					"frame": {
-						"x": 90,
-						"y": 282,
-						"w": 3,
-						"h": 3
-					}
-				},
-				{
-					"filename": "0109.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 3,
-						"h": 3
-					},
-					"frame": {
-						"x": 90,
-						"y": 282,
-						"w": 3,
-						"h": 3
-					}
-				},
-				{
-					"filename": "0110.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 110,
-						"h": 110
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 3,
-						"h": 3
-					},
-					"frame": {
-						"x": 90,
-						"y": 282,
-						"w": 3,
-						"h": 3
+						"x": 179,
+						"y": 183,
+						"w": 87,
+						"h": 91
 					}
 				}
 			]
@@ -2535,6 +1527,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:5fbe4aec02bf780bf0fca7dc7138bf7a:5d077386c518cf06786203ad5e3a3aba:5ea3e660bc9c2624f846675d5196db82$"
+		"smartupdate": "$TexturePacker:SmartUpdate:71a487dde0de6f6a7eb1b6e04018892f:49ee3dfe044ad986679a7ce34c28280d:5ea3e660bc9c2624f846675d5196db82$"
 	}
 }
diff --git a/public/images/pokemon/exp/shiny/484-origin.png b/public/images/pokemon/exp/shiny/484-origin.png
index 69e95afe580..bea804ed677 100644
Binary files a/public/images/pokemon/exp/shiny/484-origin.png and b/public/images/pokemon/exp/shiny/484-origin.png differ
diff --git a/public/images/pokemon/exp/shiny/487-origin.json b/public/images/pokemon/exp/shiny/487-origin.json
deleted file mode 100644
index d770a34a1b8..00000000000
--- a/public/images/pokemon/exp/shiny/487-origin.json
+++ /dev/null
@@ -1,293 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "487-origin.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 318,
-				"h": 318
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 91,
-						"h": 87
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 8,
-						"w": 91,
-						"h": 77
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 91,
-						"h": 77
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 91,
-						"h": 87
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 10,
-						"w": 91,
-						"h": 74
-					},
-					"frame": {
-						"x": 91,
-						"y": 0,
-						"w": 91,
-						"h": 74
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 91,
-						"h": 87
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 89,
-						"h": 75
-					},
-					"frame": {
-						"x": 182,
-						"y": 0,
-						"w": 89,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 91,
-						"h": 87
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 89,
-						"h": 75
-					},
-					"frame": {
-						"x": 182,
-						"y": 0,
-						"w": 89,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 91,
-						"h": 87
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 7,
-						"w": 86,
-						"h": 79
-					},
-					"frame": {
-						"x": 91,
-						"y": 74,
-						"w": 86,
-						"h": 79
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 91,
-						"h": 87
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 85,
-						"h": 83
-					},
-					"frame": {
-						"x": 0,
-						"y": 77,
-						"w": 85,
-						"h": 83
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 91,
-						"h": 87
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 85,
-						"h": 82
-					},
-					"frame": {
-						"x": 177,
-						"y": 75,
-						"w": 85,
-						"h": 82
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 91,
-						"h": 87
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 83,
-						"h": 83
-					},
-					"frame": {
-						"x": 85,
-						"y": 153,
-						"w": 83,
-						"h": 83
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 91,
-						"h": 87
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 4,
-						"w": 80,
-						"h": 82
-					},
-					"frame": {
-						"x": 0,
-						"y": 236,
-						"w": 80,
-						"h": 82
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 91,
-						"h": 87
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 4,
-						"w": 83,
-						"h": 76
-					},
-					"frame": {
-						"x": 0,
-						"y": 160,
-						"w": 83,
-						"h": 76
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 91,
-						"h": 87
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 6,
-						"w": 81,
-						"h": 81
-					},
-					"frame": {
-						"x": 80,
-						"y": 236,
-						"w": 81,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 91,
-						"h": 87
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 7,
-						"w": 81,
-						"h": 80
-					},
-					"frame": {
-						"x": 161,
-						"y": 236,
-						"w": 81,
-						"h": 80
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 91,
-						"h": 87
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 2,
-						"w": 81,
-						"h": 79
-					},
-					"frame": {
-						"x": 168,
-						"y": 157,
-						"w": 81,
-						"h": 79
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:00abebb007c47ada81d4e754581d7146:4691e19364eb9392dbee1ee37d737c8b:5d19509f6557fe13b0b6311434ba7e2d$"
-	}
-}
diff --git a/public/images/pokemon/exp/shiny/487-origin.png b/public/images/pokemon/exp/shiny/487-origin.png
deleted file mode 100644
index d0f0fdb6b9b..00000000000
Binary files a/public/images/pokemon/exp/shiny/487-origin.png and /dev/null differ
diff --git a/public/images/pokemon/exp/shiny/569-gigantamax.json b/public/images/pokemon/exp/shiny/569-gigantamax.json
new file mode 100644
index 00000000000..6cda2b0d79a
--- /dev/null
+++ b/public/images/pokemon/exp/shiny/569-gigantamax.json
@@ -0,0 +1,1478 @@
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 0, "y": 170, "w": 96, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 0, "y": 170, "w": 96, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 0, "y": 170, "w": 96, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 0, "y": 170, "w": 96, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 0, "y": 170, "w": 96, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 0, "y": 170, "w": 96, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 0, "y": 170, "w": 96, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 106, "y": 88, "w": 100, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 100, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 106, "y": 88, "w": 100, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 100, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 314, "y": 86, "w": 103, "h": 87 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 103, "h": 87 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 314, "y": 86, "w": 103, "h": 87 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 103, "h": 87 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 314, "y": 86, "w": 103, "h": 87 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 103, "h": 87 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 314, "y": 86, "w": 103, "h": 87 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 103, "h": 87 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 314, "y": 0, "w": 105, "h": 86 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 105, "h": 86 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 314, "y": 0, "w": 105, "h": 86 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 105, "h": 86 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 0, "y": 85, "w": 106, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 106, "h": 85 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 0, "y": 85, "w": 106, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 106, "h": 85 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 0, "y": 85, "w": 106, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 106, "h": 85 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 0, "y": 85, "w": 106, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 106, "h": 85 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 0, "y": 0, "w": 108, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 108, "h": 85 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 0, "y": 0, "w": 108, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 108, "h": 85 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 0, "y": 0, "w": 108, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 108, "h": 85 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 0, "y": 85, "w": 106, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 106, "h": 85 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 0, "y": 85, "w": 106, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 106, "h": 85 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 0, "y": 85, "w": 106, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 106, "h": 85 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 0, "y": 85, "w": 106, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 106, "h": 85 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 314, "y": 0, "w": 105, "h": 86 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 105, "h": 86 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 314, "y": 0, "w": 105, "h": 86 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 105, "h": 86 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 314, "y": 0, "w": 105, "h": 86 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 105, "h": 86 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 314, "y": 86, "w": 103, "h": 87 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 103, "h": 87 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 314, "y": 86, "w": 103, "h": 87 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 103, "h": 87 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 314, "y": 86, "w": 103, "h": 87 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 103, "h": 87 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 106, "y": 88, "w": 100, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 100, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 106, "y": 88, "w": 100, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 100, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 0, "y": 170, "w": 96, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 0, "y": 170, "w": 96, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 0, "y": 170, "w": 96, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 0, "y": 170, "w": 96, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 0, "y": 170, "w": 96, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 0, "y": 170, "w": 96, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 0, "y": 170, "w": 96, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 0, "y": 170, "w": 96, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 106, "y": 88, "w": 100, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 100, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 106, "y": 88, "w": 100, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 100, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 106, "y": 88, "w": 100, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 100, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 314, "y": 86, "w": 103, "h": 87 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 103, "h": 87 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 314, "y": 86, "w": 103, "h": 87 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 103, "h": 87 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 314, "y": 86, "w": 103, "h": 87 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 103, "h": 87 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 314, "y": 0, "w": 105, "h": 86 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 105, "h": 86 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 314, "y": 0, "w": 105, "h": 86 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 105, "h": 86 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 314, "y": 0, "w": 105, "h": 86 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 105, "h": 86 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 0, "y": 85, "w": 106, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 106, "h": 85 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 0, "y": 85, "w": 106, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 106, "h": 85 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 0, "y": 85, "w": 106, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 106, "h": 85 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 0, "y": 0, "w": 108, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 108, "h": 85 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 0, "y": 0, "w": 108, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 108, "h": 85 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 0, "y": 0, "w": 108, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 108, "h": 85 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 0, "y": 85, "w": 106, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 106, "h": 85 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 0, "y": 85, "w": 106, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 106, "h": 85 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 0, "y": 85, "w": 106, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 106, "h": 85 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 314, "y": 0, "w": 105, "h": 86 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 105, "h": 86 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 314, "y": 0, "w": 105, "h": 86 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 105, "h": 86 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 314, "y": 0, "w": 105, "h": 86 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 105, "h": 86 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 314, "y": 86, "w": 103, "h": 87 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 103, "h": 87 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 314, "y": 86, "w": 103, "h": 87 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 103, "h": 87 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 314, "y": 86, "w": 103, "h": 87 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 103, "h": 87 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 106, "y": 88, "w": 100, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 100, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 106, "y": 88, "w": 100, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 100, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 106, "y": 88, "w": 100, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 100, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 0, "y": 170, "w": 96, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 0, "y": 170, "w": 96, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 0, "y": 170, "w": 96, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 305, "y": 173, "w": 96, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 305, "y": 173, "w": 96, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 305, "y": 173, "w": 96, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 206, "y": 88, "w": 99, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 99, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 206, "y": 88, "w": 99, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 99, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 108, "y": 0, "w": 103, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 0, "w": 103, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 108, "y": 0, "w": 103, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 0, "w": 103, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 108, "y": 0, "w": 103, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 0, "w": 103, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 211, "y": 0, "w": 103, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 0, "w": 103, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 211, "y": 0, "w": 103, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 0, "w": 103, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 211, "y": 0, "w": 103, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 0, "w": 103, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 211, "y": 0, "w": 103, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 0, "w": 103, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 211, "y": 0, "w": 103, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 0, "w": 103, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 211, "y": 0, "w": 103, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 0, "w": 103, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 108, "y": 0, "w": 103, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 0, "w": 103, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0088.png",
+    "frame": { "x": 108, "y": 0, "w": 103, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 0, "w": 103, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0089.png",
+    "frame": { "x": 108, "y": 0, "w": 103, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 0, "w": 103, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0090.png",
+    "frame": { "x": 108, "y": 0, "w": 103, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 0, "w": 103, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0091.png",
+    "frame": { "x": 206, "y": 88, "w": 99, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 99, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0092.png",
+    "frame": { "x": 206, "y": 88, "w": 99, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 99, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0093.png",
+    "frame": { "x": 206, "y": 88, "w": 99, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 99, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0094.png",
+    "frame": { "x": 305, "y": 173, "w": 96, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0095.png",
+    "frame": { "x": 0, "y": 170, "w": 96, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0096.png",
+    "frame": { "x": 0, "y": 170, "w": 96, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0097.png",
+    "frame": { "x": 0, "y": 170, "w": 96, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0098.png",
+    "frame": { "x": 0, "y": 170, "w": 96, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0099.png",
+    "frame": { "x": 0, "y": 170, "w": 96, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0100.png",
+    "frame": { "x": 0, "y": 170, "w": 96, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0101.png",
+    "frame": { "x": 0, "y": 170, "w": 96, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0102.png",
+    "frame": { "x": 0, "y": 170, "w": 96, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0103.png",
+    "frame": { "x": 106, "y": 88, "w": 100, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 100, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0104.png",
+    "frame": { "x": 106, "y": 88, "w": 100, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 100, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0105.png",
+    "frame": { "x": 106, "y": 88, "w": 100, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 100, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0106.png",
+    "frame": { "x": 314, "y": 86, "w": 103, "h": 87 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 103, "h": 87 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0107.png",
+    "frame": { "x": 314, "y": 86, "w": 103, "h": 87 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 103, "h": 87 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0108.png",
+    "frame": { "x": 314, "y": 86, "w": 103, "h": 87 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 103, "h": 87 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0109.png",
+    "frame": { "x": 314, "y": 0, "w": 105, "h": 86 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 105, "h": 86 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0110.png",
+    "frame": { "x": 314, "y": 0, "w": 105, "h": 86 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 105, "h": 86 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0111.png",
+    "frame": { "x": 314, "y": 0, "w": 105, "h": 86 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 105, "h": 86 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0112.png",
+    "frame": { "x": 0, "y": 85, "w": 106, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 106, "h": 85 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0113.png",
+    "frame": { "x": 0, "y": 85, "w": 106, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 106, "h": 85 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0114.png",
+    "frame": { "x": 0, "y": 85, "w": 106, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 106, "h": 85 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0115.png",
+    "frame": { "x": 0, "y": 0, "w": 108, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 108, "h": 85 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0116.png",
+    "frame": { "x": 0, "y": 0, "w": 108, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 108, "h": 85 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0117.png",
+    "frame": { "x": 0, "y": 0, "w": 108, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 108, "h": 85 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0118.png",
+    "frame": { "x": 0, "y": 85, "w": 106, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 106, "h": 85 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0119.png",
+    "frame": { "x": 0, "y": 85, "w": 106, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 106, "h": 85 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0120.png",
+    "frame": { "x": 0, "y": 85, "w": 106, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 106, "h": 85 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0121.png",
+    "frame": { "x": 314, "y": 0, "w": 105, "h": 86 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 105, "h": 86 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0122.png",
+    "frame": { "x": 314, "y": 0, "w": 105, "h": 86 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 105, "h": 86 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0123.png",
+    "frame": { "x": 314, "y": 0, "w": 105, "h": 86 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 105, "h": 86 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0124.png",
+    "frame": { "x": 314, "y": 86, "w": 103, "h": 87 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 103, "h": 87 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0125.png",
+    "frame": { "x": 314, "y": 86, "w": 103, "h": 87 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 103, "h": 87 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0126.png",
+    "frame": { "x": 106, "y": 88, "w": 100, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 100, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0127.png",
+    "frame": { "x": 106, "y": 88, "w": 100, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 100, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0128.png",
+    "frame": { "x": 106, "y": 88, "w": 100, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 100, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0129.png",
+    "frame": { "x": 106, "y": 88, "w": 100, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 100, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0130.png",
+    "frame": { "x": 0, "y": 170, "w": 96, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0131.png",
+    "frame": { "x": 0, "y": 170, "w": 96, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0132.png",
+    "frame": { "x": 0, "y": 170, "w": 96, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0133.png",
+    "frame": { "x": 0, "y": 170, "w": 96, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0134.png",
+    "frame": { "x": 0, "y": 170, "w": 96, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0135.png",
+    "frame": { "x": 0, "y": 170, "w": 96, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0136.png",
+    "frame": { "x": 0, "y": 170, "w": 96, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0137.png",
+    "frame": { "x": 0, "y": 170, "w": 96, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 0, "w": 96, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0138.png",
+    "frame": { "x": 106, "y": 88, "w": 100, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 100, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0139.png",
+    "frame": { "x": 106, "y": 88, "w": 100, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 100, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0140.png",
+    "frame": { "x": 314, "y": 86, "w": 103, "h": 87 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 103, "h": 87 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0141.png",
+    "frame": { "x": 314, "y": 86, "w": 103, "h": 87 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 103, "h": 87 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0142.png",
+    "frame": { "x": 314, "y": 86, "w": 103, "h": 87 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 103, "h": 87 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0143.png",
+    "frame": { "x": 314, "y": 0, "w": 105, "h": 86 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 105, "h": 86 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0144.png",
+    "frame": { "x": 314, "y": 0, "w": 105, "h": 86 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 105, "h": 86 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0145.png",
+    "frame": { "x": 314, "y": 0, "w": 105, "h": 86 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 105, "h": 86 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0146.png",
+    "frame": { "x": 0, "y": 85, "w": 106, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 106, "h": 85 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0147.png",
+    "frame": { "x": 0, "y": 85, "w": 106, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 106, "h": 85 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0148.png",
+    "frame": { "x": 0, "y": 85, "w": 106, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 106, "h": 85 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0149.png",
+    "frame": { "x": 0, "y": 85, "w": 106, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 106, "h": 85 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0150.png",
+    "frame": { "x": 0, "y": 0, "w": 108, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 108, "h": 85 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0151.png",
+    "frame": { "x": 0, "y": 0, "w": 108, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 108, "h": 85 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0152.png",
+    "frame": { "x": 0, "y": 85, "w": 106, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 106, "h": 85 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0153.png",
+    "frame": { "x": 0, "y": 85, "w": 106, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 106, "h": 85 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0154.png",
+    "frame": { "x": 0, "y": 85, "w": 106, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 106, "h": 85 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0155.png",
+    "frame": { "x": 314, "y": 0, "w": 105, "h": 86 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 105, "h": 86 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0156.png",
+    "frame": { "x": 314, "y": 0, "w": 105, "h": 86 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 105, "h": 86 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0157.png",
+    "frame": { "x": 314, "y": 0, "w": 105, "h": 86 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 105, "h": 86 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0158.png",
+    "frame": { "x": 314, "y": 86, "w": 103, "h": 87 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 103, "h": 87 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0159.png",
+    "frame": { "x": 314, "y": 86, "w": 103, "h": 87 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 103, "h": 87 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0160.png",
+    "frame": { "x": 314, "y": 86, "w": 103, "h": 87 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 103, "h": 87 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0161.png",
+    "frame": { "x": 314, "y": 86, "w": 103, "h": 87 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 103, "h": 87 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0162.png",
+    "frame": { "x": 106, "y": 88, "w": 100, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 100, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   },
+   {
+    "filename": "0163.png",
+    "frame": { "x": 106, "y": 88, "w": 100, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 100, "h": 88 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 60
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.13-x64",
+  "image": "569-gigantamax.png",
+  "format": "I8",
+  "size": { "w": 419, "h": 261 },
+  "scale": "1"
+ }
+}
diff --git a/public/images/pokemon/exp/shiny/569-gigantamax.png b/public/images/pokemon/exp/shiny/569-gigantamax.png
new file mode 100644
index 00000000000..fc15ecd4585
Binary files /dev/null and b/public/images/pokemon/exp/shiny/569-gigantamax.png differ
diff --git a/public/images/pokemon/exp/shiny/651.json b/public/images/pokemon/exp/shiny/651.json
index 4289441de3d..20bdccd5bd4 100644
--- a/public/images/pokemon/exp/shiny/651.json
+++ b/public/images/pokemon/exp/shiny/651.json
@@ -1,188 +1,713 @@
-{
-	"textures": [
-		{
-			"image": "651.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 116,
-				"h": 116
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 58,
-						"h": 53
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 58,
-						"h": 53
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 58,
-						"h": 53
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 58,
-						"h": 53
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 58,
-						"h": 53
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 58,
-						"h": 53
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 58,
-						"h": 53
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 58,
-						"h": 53
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 58,
-						"h": 53
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 58,
-						"h": 53
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 58,
-						"h": 53
-					},
-					"frame": {
-						"x": 58,
-						"y": 0,
-						"w": 58,
-						"h": 53
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 58,
-						"h": 53
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 58,
-						"h": 53
-					},
-					"frame": {
-						"x": 58,
-						"y": 0,
-						"w": 58,
-						"h": 53
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 58,
-						"h": 53
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 58,
-						"h": 53
-					},
-					"frame": {
-						"x": 0,
-						"y": 53,
-						"w": 58,
-						"h": 53
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 53
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 58,
-						"h": 52
-					},
-					"frame": {
-						"x": 58,
-						"y": 53,
-						"w": 58,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 58,
-						"h": 53
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 58,
-						"h": 52
-					},
-					"frame": {
-						"x": 58,
-						"y": 53,
-						"w": 58,
-						"h": 52
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:53a767b5d08c0b868b90b8a06972f1db:ac5b599a09e8592218deeebb976d4e5c:a93e5fa02e10bf11e3ed8bf6571835ca$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 119, "y": 49, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 55, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 175, "y": 49, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 55, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 355, "y": 49, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 55, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 278, "y": 101, "w": 54, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 54, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 110, "y": 151, "w": 54, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 54, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 56, "y": 101, "w": 53, "h": 51 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 53, "h": 51 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 165, "y": 151, "w": 54, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 54, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 333, "y": 151, "w": 54, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 54, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 287, "y": 50, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 55, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 112, "y": 100, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 55, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 168, "y": 100, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 55, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 0, "y": 152, "w": 54, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 54, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 278, "y": 152, "w": 54, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 54, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 56, "y": 50, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 55, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 231, "y": 50, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 55, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 224, "y": 101, "w": 53, "h": 51 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 53, "h": 51 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 343, "y": 100, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 55, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 0, "y": 50, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 55, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 55, "y": 153, "w": 54, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 54, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 220, "y": 153, "w": 54, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 54, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 119, "y": 49, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 55, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 175, "y": 49, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 55, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 355, "y": 49, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 55, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 278, "y": 101, "w": 54, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 54, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 110, "y": 151, "w": 54, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 54, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 56, "y": 101, "w": 53, "h": 51 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 53, "h": 51 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 165, "y": 151, "w": 54, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 54, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 333, "y": 151, "w": 54, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 54, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 287, "y": 50, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 55, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 112, "y": 100, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 55, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 168, "y": 100, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 55, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 0, "y": 152, "w": 54, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 54, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 278, "y": 152, "w": 54, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 54, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 56, "y": 50, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 55, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 231, "y": 50, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 55, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 224, "y": 101, "w": 53, "h": 51 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 53, "h": 51 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 343, "y": 100, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 55, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 0, "y": 50, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 55, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 55, "y": 153, "w": 54, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 54, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 220, "y": 153, "w": 54, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 54, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 119, "y": 49, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 55, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 175, "y": 49, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 55, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 355, "y": 49, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 55, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 278, "y": 101, "w": 54, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 54, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 110, "y": 151, "w": 54, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 54, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 56, "y": 101, "w": 53, "h": 51 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 53, "h": 51 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 165, "y": 151, "w": 54, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 54, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 333, "y": 151, "w": 54, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 54, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 287, "y": 50, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 55, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 112, "y": 100, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 55, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 168, "y": 100, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 55, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 0, "y": 152, "w": 54, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 54, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 278, "y": 152, "w": 54, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 54, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 56, "y": 50, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 55, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 231, "y": 50, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 55, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 224, "y": 101, "w": 53, "h": 51 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 53, "h": 51 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 343, "y": 100, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 55, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 0, "y": 50, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 55, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 55, "y": 153, "w": 54, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 54, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 220, "y": 153, "w": 54, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 54, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 119, "y": 49, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 55, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 239, "y": 0, "w": 57, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 49 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 60, "y": 0, "w": 58, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 58, "h": 49 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 355, "y": 0, "w": 58, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 58, "h": 48 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 0, "y": 0, "w": 59, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 59, "h": 49 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 119, "y": 0, "w": 59, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 59, "h": 48 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 179, "y": 0, "w": 59, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 5, "w": 59, "h": 48 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 297, "y": 0, "w": 57, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 49 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 0, "y": 101, "w": 55, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 55, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 0, "y": 203, "w": 53, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 53, "h": 49 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 329, "y": 252, "w": 51, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 2, "w": 51, "h": 47 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 109, "y": 252, "w": 51, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 51, "h": 48 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 219, "y": 204, "w": 52, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 2, "w": 52, "h": 49 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 166, "y": 202, "w": 52, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 52, "h": 50 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 275, "y": 203, "w": 53, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 4, "w": 53, "h": 49 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 54, "y": 204, "w": 54, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 54, "h": 48 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 333, "y": 202, "w": 54, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 54, "h": 49 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 110, "y": 202, "w": 55, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 55, "h": 49 },
+    "sourceSize": { "w": 60, "h": 53 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.11-x64",
+  "image": "651.png",
+  "format": "I8",
+  "size": { "w": 413, "h": 300 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/shiny/651.png b/public/images/pokemon/exp/shiny/651.png
index dcd70d11100..1e59bc97587 100644
Binary files a/public/images/pokemon/exp/shiny/651.png and b/public/images/pokemon/exp/shiny/651.png differ
diff --git a/public/images/pokemon/exp/shiny/653.json b/public/images/pokemon/exp/shiny/653.json
index 738762f18c6..a08242f32cf 100644
--- a/public/images/pokemon/exp/shiny/653.json
+++ b/public/images/pokemon/exp/shiny/653.json
@@ -1,1553 +1,947 @@
-{
-	"textures": [
-		{
-			"image": "653.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 180,
-				"h": 180
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 47,
-						"h": 45
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 47,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 47,
-						"h": 45
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 47,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0027.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 47,
-						"h": 45
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 47,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0037.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 47,
-						"h": 45
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 47,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0047.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 47,
-						"h": 45
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 47,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0057.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 47,
-						"h": 45
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 47,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 47,
-						"h": 45
-					},
-					"frame": {
-						"x": 47,
-						"y": 0,
-						"w": 47,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 47,
-						"h": 45
-					},
-					"frame": {
-						"x": 47,
-						"y": 0,
-						"w": 47,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0028.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 47,
-						"h": 45
-					},
-					"frame": {
-						"x": 47,
-						"y": 0,
-						"w": 47,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0038.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 47,
-						"h": 45
-					},
-					"frame": {
-						"x": 47,
-						"y": 0,
-						"w": 47,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0048.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 47,
-						"h": 45
-					},
-					"frame": {
-						"x": 47,
-						"y": 0,
-						"w": 47,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0058.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 47,
-						"h": 45
-					},
-					"frame": {
-						"x": 47,
-						"y": 0,
-						"w": 47,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 43,
-						"h": 49
-					},
-					"frame": {
-						"x": 94,
-						"y": 0,
-						"w": 43,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 43,
-						"h": 49
-					},
-					"frame": {
-						"x": 94,
-						"y": 0,
-						"w": 43,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 43,
-						"h": 49
-					},
-					"frame": {
-						"x": 94,
-						"y": 0,
-						"w": 43,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 43,
-						"h": 49
-					},
-					"frame": {
-						"x": 94,
-						"y": 0,
-						"w": 43,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 43,
-						"h": 49
-					},
-					"frame": {
-						"x": 94,
-						"y": 0,
-						"w": 43,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0029.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 43,
-						"h": 49
-					},
-					"frame": {
-						"x": 94,
-						"y": 0,
-						"w": 43,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0033.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 43,
-						"h": 49
-					},
-					"frame": {
-						"x": 94,
-						"y": 0,
-						"w": 43,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0039.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 43,
-						"h": 49
-					},
-					"frame": {
-						"x": 94,
-						"y": 0,
-						"w": 43,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0043.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 43,
-						"h": 49
-					},
-					"frame": {
-						"x": 94,
-						"y": 0,
-						"w": 43,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0049.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 43,
-						"h": 49
-					},
-					"frame": {
-						"x": 94,
-						"y": 0,
-						"w": 43,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0053.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 43,
-						"h": 49
-					},
-					"frame": {
-						"x": 94,
-						"y": 0,
-						"w": 43,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0059.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 43,
-						"h": 49
-					},
-					"frame": {
-						"x": 94,
-						"y": 0,
-						"w": 43,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 42,
-						"h": 49
-					},
-					"frame": {
-						"x": 137,
-						"y": 0,
-						"w": 42,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 42,
-						"h": 49
-					},
-					"frame": {
-						"x": 137,
-						"y": 0,
-						"w": 42,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 42,
-						"h": 49
-					},
-					"frame": {
-						"x": 137,
-						"y": 0,
-						"w": 42,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0031.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 42,
-						"h": 49
-					},
-					"frame": {
-						"x": 137,
-						"y": 0,
-						"w": 42,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0041.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 42,
-						"h": 49
-					},
-					"frame": {
-						"x": 137,
-						"y": 0,
-						"w": 42,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0051.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 42,
-						"h": 49
-					},
-					"frame": {
-						"x": 137,
-						"y": 0,
-						"w": 42,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 47,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 45,
-						"w": 47,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 47,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 45,
-						"w": 47,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0025.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 47,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 45,
-						"w": 47,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0035.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 47,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 45,
-						"w": 47,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0045.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 47,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 45,
-						"w": 47,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0055.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 47,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 45,
-						"w": 47,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 2,
-						"w": 44,
-						"h": 47
-					},
-					"frame": {
-						"x": 47,
-						"y": 45,
-						"w": 44,
-						"h": 47
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 2,
-						"w": 44,
-						"h": 47
-					},
-					"frame": {
-						"x": 47,
-						"y": 45,
-						"w": 44,
-						"h": 47
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 2,
-						"w": 44,
-						"h": 47
-					},
-					"frame": {
-						"x": 47,
-						"y": 45,
-						"w": 44,
-						"h": 47
-					}
-				},
-				{
-					"filename": "0034.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 2,
-						"w": 44,
-						"h": 47
-					},
-					"frame": {
-						"x": 47,
-						"y": 45,
-						"w": 44,
-						"h": 47
-					}
-				},
-				{
-					"filename": "0044.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 2,
-						"w": 44,
-						"h": 47
-					},
-					"frame": {
-						"x": 47,
-						"y": 45,
-						"w": 44,
-						"h": 47
-					}
-				},
-				{
-					"filename": "0054.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 2,
-						"w": 44,
-						"h": 47
-					},
-					"frame": {
-						"x": 47,
-						"y": 45,
-						"w": 44,
-						"h": 47
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 42,
-						"h": 49
-					},
-					"frame": {
-						"x": 0,
-						"y": 89,
-						"w": 42,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 42,
-						"h": 49
-					},
-					"frame": {
-						"x": 0,
-						"y": 89,
-						"w": 42,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 42,
-						"h": 49
-					},
-					"frame": {
-						"x": 0,
-						"y": 89,
-						"w": 42,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0032.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 42,
-						"h": 49
-					},
-					"frame": {
-						"x": 0,
-						"y": 89,
-						"w": 42,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0042.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 42,
-						"h": 49
-					},
-					"frame": {
-						"x": 0,
-						"y": 89,
-						"w": 42,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0052.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 42,
-						"h": 49
-					},
-					"frame": {
-						"x": 0,
-						"y": 89,
-						"w": 42,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 47,
-						"h": 42
-					},
-					"frame": {
-						"x": 0,
-						"y": 138,
-						"w": 47,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 47,
-						"h": 42
-					},
-					"frame": {
-						"x": 0,
-						"y": 138,
-						"w": 47,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0026.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 47,
-						"h": 42
-					},
-					"frame": {
-						"x": 0,
-						"y": 138,
-						"w": 47,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0036.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 47,
-						"h": 42
-					},
-					"frame": {
-						"x": 0,
-						"y": 138,
-						"w": 47,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0046.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 47,
-						"h": 42
-					},
-					"frame": {
-						"x": 0,
-						"y": 138,
-						"w": 47,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0056.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 47,
-						"h": 42
-					},
-					"frame": {
-						"x": 0,
-						"y": 138,
-						"w": 47,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0063.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 46,
-						"h": 44
-					},
-					"frame": {
-						"x": 42,
-						"y": 92,
-						"w": 46,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0065.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 46,
-						"h": 44
-					},
-					"frame": {
-						"x": 42,
-						"y": 92,
-						"w": 46,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0067.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 46,
-						"h": 44
-					},
-					"frame": {
-						"x": 42,
-						"y": 92,
-						"w": 46,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0069.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 46,
-						"h": 44
-					},
-					"frame": {
-						"x": 42,
-						"y": 92,
-						"w": 46,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0071.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 46,
-						"h": 44
-					},
-					"frame": {
-						"x": 42,
-						"y": 92,
-						"w": 46,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0064.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 47,
-						"h": 42
-					},
-					"frame": {
-						"x": 47,
-						"y": 136,
-						"w": 47,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 42,
-						"h": 49
-					},
-					"frame": {
-						"x": 91,
-						"y": 49,
-						"w": 42,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 42,
-						"h": 49
-					},
-					"frame": {
-						"x": 91,
-						"y": 49,
-						"w": 42,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0030.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 42,
-						"h": 49
-					},
-					"frame": {
-						"x": 91,
-						"y": 49,
-						"w": 42,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0040.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 42,
-						"h": 49
-					},
-					"frame": {
-						"x": 91,
-						"y": 49,
-						"w": 42,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0050.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 42,
-						"h": 49
-					},
-					"frame": {
-						"x": 91,
-						"y": 49,
-						"w": 42,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0060.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 42,
-						"h": 49
-					},
-					"frame": {
-						"x": 91,
-						"y": 49,
-						"w": 42,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0061.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 42,
-						"h": 49
-					},
-					"frame": {
-						"x": 133,
-						"y": 49,
-						"w": 42,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0073.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 42,
-						"h": 49
-					},
-					"frame": {
-						"x": 133,
-						"y": 49,
-						"w": 42,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0062.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 2,
-						"w": 43,
-						"h": 47
-					},
-					"frame": {
-						"x": 94,
-						"y": 98,
-						"w": 43,
-						"h": 47
-					}
-				},
-				{
-					"filename": "0072.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 2,
-						"w": 43,
-						"h": 47
-					},
-					"frame": {
-						"x": 94,
-						"y": 98,
-						"w": 43,
-						"h": 47
-					}
-				},
-				{
-					"filename": "0066.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 43,
-						"h": 46
-					},
-					"frame": {
-						"x": 137,
-						"y": 98,
-						"w": 43,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0068.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 43,
-						"h": 46
-					},
-					"frame": {
-						"x": 137,
-						"y": 98,
-						"w": 43,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0070.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 47,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 43,
-						"h": 46
-					},
-					"frame": {
-						"x": 137,
-						"y": 98,
-						"w": 43,
-						"h": 46
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:ee78bfcc0ba0e0b5534e843718784ee6:a0e7315742d6fef56aa3fa3581440131:a7be961d0230f568aff23d95e7ff0036$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 83, "y": 132, "w": 38, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 38, "h": 43 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 83, "y": 132, "w": 38, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 38, "h": 43 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 83, "y": 132, "w": 38, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 38, "h": 43 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 40, "y": 88, "w": 40, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 40, "y": 88, "w": 40, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 0, "y": 130, "w": 41, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 41, "h": 40 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 0, "y": 130, "w": 41, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 41, "h": 40 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 41, "y": 130, "w": 42, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 6, "w": 42, "h": 39 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 41, "y": 130, "w": 42, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 6, "w": 42, "h": 39 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 0, "y": 130, "w": 41, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 41, "h": 40 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 0, "y": 130, "w": 41, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 41, "h": 40 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 40, "y": 88, "w": 40, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 40, "y": 88, "w": 40, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 80, "y": 88, "w": 40, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 80, "y": 88, "w": 40, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 83, "y": 132, "w": 38, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 38, "h": 43 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 83, "y": 132, "w": 38, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 38, "h": 43 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 83, "y": 132, "w": 38, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 38, "h": 43 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 40, "y": 88, "w": 40, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 40, "y": 88, "w": 40, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 0, "y": 130, "w": 41, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 41, "h": 40 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 0, "y": 130, "w": 41, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 41, "h": 40 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 41, "y": 130, "w": 42, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 6, "w": 42, "h": 39 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 41, "y": 130, "w": 42, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 6, "w": 42, "h": 39 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 0, "y": 130, "w": 41, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 41, "h": 40 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 0, "y": 130, "w": 41, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 41, "h": 40 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 40, "y": 88, "w": 40, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 40, "y": 88, "w": 40, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 80, "y": 88, "w": 40, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 80, "y": 88, "w": 40, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 83, "y": 132, "w": 38, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 38, "h": 43 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 83, "y": 132, "w": 38, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 38, "h": 43 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 83, "y": 132, "w": 38, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 38, "h": 43 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 40, "y": 88, "w": 40, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 40, "y": 88, "w": 40, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 0, "y": 130, "w": 41, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 41, "h": 40 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 0, "y": 130, "w": 41, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 41, "h": 40 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 41, "y": 130, "w": 42, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 6, "w": 42, "h": 39 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 41, "y": 130, "w": 42, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 6, "w": 42, "h": 39 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 0, "y": 130, "w": 41, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 41, "h": 40 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 0, "y": 130, "w": 41, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 41, "h": 40 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 40, "y": 88, "w": 40, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 40, "y": 88, "w": 40, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 80, "y": 88, "w": 40, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 80, "y": 88, "w": 40, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 83, "y": 132, "w": 38, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 38, "h": 43 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 83, "y": 132, "w": 38, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 38, "h": 43 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 83, "y": 132, "w": 38, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 38, "h": 43 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 40, "y": 88, "w": 40, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 40, "y": 88, "w": 40, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 0, "y": 130, "w": 41, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 41, "h": 40 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 0, "y": 130, "w": 41, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 41, "h": 40 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 41, "y": 130, "w": 42, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 6, "w": 42, "h": 39 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 41, "y": 130, "w": 42, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 6, "w": 42, "h": 39 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 0, "y": 130, "w": 41, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 41, "h": 40 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 0, "y": 130, "w": 41, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 41, "h": 40 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 40, "y": 88, "w": 40, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 40, "y": 88, "w": 40, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 80, "y": 88, "w": 40, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 80, "y": 88, "w": 40, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 83, "y": 132, "w": 38, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 38, "h": 43 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 83, "y": 132, "w": 38, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 38, "h": 43 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 83, "y": 132, "w": 38, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 38, "h": 43 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 40, "y": 88, "w": 40, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 40, "y": 88, "w": 40, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 0, "y": 130, "w": 41, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 41, "h": 40 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 0, "y": 130, "w": 41, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 41, "h": 40 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 41, "y": 130, "w": 42, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 6, "w": 42, "h": 39 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 41, "y": 130, "w": 42, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 6, "w": 42, "h": 39 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 0, "y": 130, "w": 41, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 41, "h": 40 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 0, "y": 130, "w": 41, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 41, "h": 40 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 40, "y": 88, "w": 40, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 40, "y": 88, "w": 40, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 80, "y": 88, "w": 40, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 80, "y": 88, "w": 40, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 42 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 83, "y": 132, "w": 38, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 38, "h": 43 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 83, "y": 132, "w": 38, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 38, "h": 43 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 83, "y": 132, "w": 38, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 38, "h": 43 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 120, "y": 88, "w": 38, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 38, "h": 44 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 120, "y": 88, "w": 38, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 38, "h": 44 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 0, "y": 45, "w": 40, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 40, "h": 44 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 0, "y": 45, "w": 40, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 40, "h": 44 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 0, "y": 0, "w": 42, "h": 45 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 42, "h": 45 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 0, "y": 0, "w": 42, "h": 45 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 42, "h": 45 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 42, "y": 0, "w": 42, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 42, "h": 44 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 42, "y": 0, "w": 42, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 42, "h": 44 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 42, "y": 0, "w": 42, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 42, "h": 44 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0088.png",
+    "frame": { "x": 42, "y": 44, "w": 41, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 41, "h": 44 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0089.png",
+    "frame": { "x": 42, "y": 44, "w": 41, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 41, "h": 44 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0090.png",
+    "frame": { "x": 84, "y": 0, "w": 42, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 42, "h": 44 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0091.png",
+    "frame": { "x": 84, "y": 0, "w": 42, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 42, "h": 44 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0092.png",
+    "frame": { "x": 83, "y": 44, "w": 41, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 41, "h": 44 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0093.png",
+    "frame": { "x": 83, "y": 44, "w": 41, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 41, "h": 44 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0094.png",
+    "frame": { "x": 84, "y": 0, "w": 42, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 42, "h": 44 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0095.png",
+    "frame": { "x": 124, "y": 44, "w": 41, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 41, "h": 44 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0096.png",
+    "frame": { "x": 124, "y": 44, "w": 41, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 41, "h": 44 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0097.png",
+    "frame": { "x": 126, "y": 0, "w": 42, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 42, "h": 44 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0098.png",
+    "frame": { "x": 126, "y": 0, "w": 42, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 42, "h": 44 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0099.png",
+    "frame": { "x": 0, "y": 0, "w": 42, "h": 45 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 42, "h": 45 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0100.png",
+    "frame": { "x": 0, "y": 0, "w": 42, "h": 45 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 42, "h": 45 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0101.png",
+    "frame": { "x": 0, "y": 45, "w": 40, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 40, "h": 44 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0102.png",
+    "frame": { "x": 0, "y": 45, "w": 40, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 40, "h": 44 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0103.png",
+    "frame": { "x": 120, "y": 88, "w": 38, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 38, "h": 44 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   },
+   {
+    "filename": "0104.png",
+    "frame": { "x": 120, "y": 88, "w": 38, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 38, "h": 44 },
+    "sourceSize": { "w": 44, "h": 45 },
+    "duration": 50
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "653.png",
+  "format": "I8",
+  "size": { "w": 168, "h": 175 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/shiny/653.png b/public/images/pokemon/exp/shiny/653.png
index 053624e5b7f..b1afebbd6a1 100644
Binary files a/public/images/pokemon/exp/shiny/653.png and b/public/images/pokemon/exp/shiny/653.png differ
diff --git a/public/images/pokemon/exp/shiny/654.json b/public/images/pokemon/exp/shiny/654.json
index 08655169f2a..74019f665ec 100644
--- a/public/images/pokemon/exp/shiny/654.json
+++ b/public/images/pokemon/exp/shiny/654.json
@@ -1,818 +1,695 @@
-{
-	"textures": [
-		{
-			"image": "654.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 390,
-				"h": 390
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 81
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 47,
-						"h": 81
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 47,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 81
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 47,
-						"h": 81
-					},
-					"frame": {
-						"x": 0,
-						"y": 81,
-						"w": 47,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0038.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 81
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 47,
-						"h": 81
-					},
-					"frame": {
-						"x": 0,
-						"y": 162,
-						"w": 47,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0037.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 81
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 47,
-						"h": 80
-					},
-					"frame": {
-						"x": 0,
-						"y": 243,
-						"w": 47,
-						"h": 80
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 81
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 46,
-						"h": 81
-					},
-					"frame": {
-						"x": 47,
-						"y": 0,
-						"w": 46,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 81
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 46,
-						"h": 81
-					},
-					"frame": {
-						"x": 47,
-						"y": 81,
-						"w": 46,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 81
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 46,
-						"h": 81
-					},
-					"frame": {
-						"x": 47,
-						"y": 162,
-						"w": 46,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 81
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 46,
-						"h": 80
-					},
-					"frame": {
-						"x": 47,
-						"y": 243,
-						"w": 46,
-						"h": 80
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 81
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 46,
-						"h": 79
-					},
-					"frame": {
-						"x": 93,
-						"y": 0,
-						"w": 46,
-						"h": 79
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 81
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 46,
-						"h": 79
-					},
-					"frame": {
-						"x": 93,
-						"y": 79,
-						"w": 46,
-						"h": 79
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 81
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 2,
-						"w": 46,
-						"h": 79
-					},
-					"frame": {
-						"x": 93,
-						"y": 158,
-						"w": 46,
-						"h": 79
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 81
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 2,
-						"w": 46,
-						"h": 79
-					},
-					"frame": {
-						"x": 93,
-						"y": 237,
-						"w": 46,
-						"h": 79
-					}
-				},
-				{
-					"filename": "0029.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 81
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 7,
-						"w": 46,
-						"h": 74
-					},
-					"frame": {
-						"x": 93,
-						"y": 316,
-						"w": 46,
-						"h": 74
-					}
-				},
-				{
-					"filename": "0036.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 81
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 2,
-						"w": 46,
-						"h": 79
-					},
-					"frame": {
-						"x": 139,
-						"y": 0,
-						"w": 46,
-						"h": 79
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 81
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 45,
-						"h": 80
-					},
-					"frame": {
-						"x": 139,
-						"y": 79,
-						"w": 45,
-						"h": 80
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 81
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 45,
-						"h": 80
-					},
-					"frame": {
-						"x": 139,
-						"y": 159,
-						"w": 45,
-						"h": 80
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 81
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 3,
-						"w": 46,
-						"h": 78
-					},
-					"frame": {
-						"x": 139,
-						"y": 239,
-						"w": 46,
-						"h": 78
-					}
-				},
-				{
-					"filename": "0031.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 81
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 8,
-						"w": 46,
-						"h": 73
-					},
-					"frame": {
-						"x": 139,
-						"y": 317,
-						"w": 46,
-						"h": 73
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 81
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 45,
-						"h": 79
-					},
-					"frame": {
-						"x": 184,
-						"y": 79,
-						"w": 45,
-						"h": 79
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 81
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 45,
-						"h": 79
-					},
-					"frame": {
-						"x": 185,
-						"y": 0,
-						"w": 45,
-						"h": 79
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 81
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 45,
-						"h": 79
-					},
-					"frame": {
-						"x": 184,
-						"y": 158,
-						"w": 45,
-						"h": 79
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 81
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 45,
-						"h": 79
-					},
-					"frame": {
-						"x": 185,
-						"y": 237,
-						"w": 45,
-						"h": 79
-					}
-				},
-				{
-					"filename": "0030.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 81
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 7,
-						"w": 46,
-						"h": 74
-					},
-					"frame": {
-						"x": 185,
-						"y": 316,
-						"w": 46,
-						"h": 74
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 81
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 45,
-						"h": 79
-					},
-					"frame": {
-						"x": 229,
-						"y": 79,
-						"w": 45,
-						"h": 79
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 81
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 2,
-						"w": 45,
-						"h": 79
-					},
-					"frame": {
-						"x": 230,
-						"y": 0,
-						"w": 45,
-						"h": 79
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 81
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 2,
-						"w": 45,
-						"h": 79
-					},
-					"frame": {
-						"x": 229,
-						"y": 158,
-						"w": 45,
-						"h": 79
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 81
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 45,
-						"h": 79
-					},
-					"frame": {
-						"x": 230,
-						"y": 237,
-						"w": 45,
-						"h": 79
-					}
-				},
-				{
-					"filename": "0032.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 81
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 8,
-						"w": 46,
-						"h": 73
-					},
-					"frame": {
-						"x": 231,
-						"y": 316,
-						"w": 46,
-						"h": 73
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 81
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 4,
-						"w": 46,
-						"h": 77
-					},
-					"frame": {
-						"x": 274,
-						"y": 79,
-						"w": 46,
-						"h": 77
-					}
-				},
-				{
-					"filename": "0028.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 81
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 6,
-						"w": 47,
-						"h": 75
-					},
-					"frame": {
-						"x": 275,
-						"y": 0,
-						"w": 47,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 81
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 3,
-						"w": 45,
-						"h": 78
-					},
-					"frame": {
-						"x": 274,
-						"y": 156,
-						"w": 45,
-						"h": 78
-					}
-				},
-				{
-					"filename": "0035.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 81
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 3,
-						"w": 45,
-						"h": 78
-					},
-					"frame": {
-						"x": 275,
-						"y": 234,
-						"w": 45,
-						"h": 78
-					}
-				},
-				{
-					"filename": "0026.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 81
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 5,
-						"w": 46,
-						"h": 76
-					},
-					"frame": {
-						"x": 319,
-						"y": 156,
-						"w": 46,
-						"h": 76
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 81
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 4,
-						"w": 45,
-						"h": 77
-					},
-					"frame": {
-						"x": 320,
-						"y": 75,
-						"w": 45,
-						"h": 77
-					}
-				},
-				{
-					"filename": "0027.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 81
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 6,
-						"w": 46,
-						"h": 75
-					},
-					"frame": {
-						"x": 322,
-						"y": 0,
-						"w": 46,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0033.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 81
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 6,
-						"w": 46,
-						"h": 75
-					},
-					"frame": {
-						"x": 277,
-						"y": 312,
-						"w": 46,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0025.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 81
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 5,
-						"w": 45,
-						"h": 76
-					},
-					"frame": {
-						"x": 320,
-						"y": 232,
-						"w": 45,
-						"h": 76
-					}
-				},
-				{
-					"filename": "0034.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 54,
-						"h": 81
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 5,
-						"w": 45,
-						"h": 76
-					},
-					"frame": {
-						"x": 323,
-						"y": 308,
-						"w": 45,
-						"h": 76
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:3bc1d6050e2efe57cc85a4e2787f5287:383941fac594bced71237ecb57b89444:1977f50e1ab8a3304ceeb59ee1aa2ba9$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 102, "y": 326, "w": 50, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 2, "w": 50, "h": 67 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 107, "y": 261, "w": 53, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 4, "w": 53, "h": 65 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 0, "y": 196, "w": 54, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 54, "h": 65 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 282, "y": 0, "w": 55, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 55, "h": 66 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 117, "y": 0, "w": 56, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 56, "h": 66 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 60, "y": 0, "w": 57, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 1, "w": 57, "h": 68 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 229, "y": 0, "w": 53, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 53, "h": 69 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 0, "y": 261, "w": 51, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 1, "w": 51, "h": 68 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 102, "y": 326, "w": 50, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 2, "w": 50, "h": 67 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 160, "y": 261, "w": 53, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 4, "w": 53, "h": 65 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 110, "y": 196, "w": 54, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 54, "h": 65 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 0, "y": 65, "w": 55, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 55, "h": 66 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 117, "y": 0, "w": 56, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 56, "h": 66 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 60, "y": 0, "w": 57, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 1, "w": 57, "h": 68 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 229, "y": 0, "w": 53, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 53, "h": 69 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 0, "y": 261, "w": 51, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 1, "w": 51, "h": 68 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 102, "y": 326, "w": 50, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 2, "w": 50, "h": 67 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 107, "y": 261, "w": 53, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 4, "w": 53, "h": 65 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 0, "y": 196, "w": 54, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 54, "h": 65 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 282, "y": 0, "w": 55, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 55, "h": 66 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 117, "y": 0, "w": 56, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 56, "h": 66 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 60, "y": 0, "w": 57, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 1, "w": 57, "h": 68 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 229, "y": 0, "w": 53, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 53, "h": 69 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 0, "y": 261, "w": 51, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 1, "w": 51, "h": 68 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 102, "y": 326, "w": 50, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 2, "w": 50, "h": 67 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 160, "y": 261, "w": 53, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 4, "w": 53, "h": 65 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 110, "y": 196, "w": 54, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 54, "h": 65 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 0, "y": 65, "w": 55, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 55, "h": 66 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 117, "y": 0, "w": 56, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 56, "h": 66 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 60, "y": 0, "w": 57, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 1, "w": 57, "h": 68 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 229, "y": 0, "w": 53, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 53, "h": 69 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 0, "y": 261, "w": 51, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 1, "w": 51, "h": 68 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 102, "y": 326, "w": 50, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 2, "w": 50, "h": 67 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 107, "y": 261, "w": 53, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 4, "w": 53, "h": 65 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 0, "y": 196, "w": 54, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 54, "h": 65 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 282, "y": 0, "w": 55, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 55, "h": 66 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 117, "y": 0, "w": 56, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 56, "h": 66 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 60, "y": 0, "w": 57, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 1, "w": 57, "h": 68 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 229, "y": 0, "w": 53, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 53, "h": 69 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 0, "y": 261, "w": 51, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 1, "w": 51, "h": 68 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 102, "y": 326, "w": 50, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 2, "w": 50, "h": 67 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 160, "y": 261, "w": 53, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 4, "w": 53, "h": 65 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 110, "y": 196, "w": 54, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 54, "h": 65 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 0, "y": 65, "w": 55, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 55, "h": 66 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 117, "y": 0, "w": 56, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 56, "h": 66 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 60, "y": 0, "w": 57, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 1, "w": 57, "h": 68 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 229, "y": 0, "w": 53, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 53, "h": 69 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 0, "y": 261, "w": 51, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 1, "w": 51, "h": 68 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 152, "y": 326, "w": 50, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 2, "w": 50, "h": 67 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 164, "y": 196, "w": 54, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 54, "h": 65 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 117, "y": 66, "w": 55, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 55, "h": 65 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 172, "y": 66, "w": 55, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 55, "h": 65 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 213, "y": 265, "w": 51, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 51, "h": 66 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 282, "y": 66, "w": 55, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 55, "h": 65 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 173, "y": 0, "w": 56, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 56, "h": 66 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 0, "y": 0, "w": 60, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 60, "h": 65 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 55, "y": 68, "w": 55, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 55, "h": 65 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 227, "y": 69, "w": 55, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 55, "h": 65 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 275, "y": 196, "w": 54, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 4, "w": 54, "h": 65 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 55, "y": 68, "w": 55, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 55, "h": 65 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 227, "y": 69, "w": 55, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 55, "h": 65 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 275, "y": 196, "w": 54, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 4, "w": 54, "h": 65 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 55, "y": 68, "w": 55, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 55, "h": 65 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 227, "y": 69, "w": 55, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 55, "h": 65 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 275, "y": 196, "w": 54, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 4, "w": 54, "h": 65 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 55, "y": 68, "w": 55, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 55, "h": 65 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 0, "y": 131, "w": 55, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 55, "h": 65 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 110, "y": 131, "w": 55, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 55, "h": 65 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 165, "y": 131, "w": 55, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 55, "h": 65 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 282, "y": 131, "w": 55, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 55, "h": 65 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 55, "y": 133, "w": 55, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 55, "h": 65 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 220, "y": 134, "w": 55, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 55, "h": 65 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 54, "y": 198, "w": 53, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 53, "h": 66 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 218, "y": 199, "w": 53, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 53, "h": 66 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 271, "y": 261, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 2, "w": 51, "h": 67 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 51, "y": 264, "w": 51, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 2, "w": 51, "h": 67 },
+    "sourceSize": { "w": 63, "h": 69 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "654.png",
+  "format": "I8",
+  "size": { "w": 337, "h": 393 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/shiny/654.png b/public/images/pokemon/exp/shiny/654.png
index f619614c362..bc9177ec918 100644
Binary files a/public/images/pokemon/exp/shiny/654.png and b/public/images/pokemon/exp/shiny/654.png differ
diff --git a/public/images/pokemon/exp/shiny/656.json b/public/images/pokemon/exp/shiny/656.json
index ac9979ad913..3c2051bfe3a 100644
--- a/public/images/pokemon/exp/shiny/656.json
+++ b/public/images/pokemon/exp/shiny/656.json
@@ -1,671 +1,713 @@
-{
-	"textures": [
-		{
-			"image": "656.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 96,
-				"h": 96
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0025.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0026.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 35,
-						"w": 32,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 35,
-						"w": 32,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 35,
-						"w": 32,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 35,
-						"w": 32,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 35,
-						"w": 32,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 35,
-						"w": 32,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 35,
-						"w": 32,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 35,
-						"w": 32,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 35,
-						"w": 32,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 35,
-						"w": 32,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0031.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 35,
-						"w": 32,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					},
-					"frame": {
-						"x": 32,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					},
-					"frame": {
-						"x": 32,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0027.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					},
-					"frame": {
-						"x": 32,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0028.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					},
-					"frame": {
-						"x": 32,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 32,
-						"h": 34
-					},
-					"frame": {
-						"x": 64,
-						"y": 0,
-						"w": 32,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 32,
-						"h": 34
-					},
-					"frame": {
-						"x": 64,
-						"y": 0,
-						"w": 32,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 32,
-						"h": 34
-					},
-					"frame": {
-						"x": 64,
-						"y": 0,
-						"w": 32,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 32,
-						"h": 34
-					},
-					"frame": {
-						"x": 64,
-						"y": 0,
-						"w": 32,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 32,
-						"h": 34
-					},
-					"frame": {
-						"x": 64,
-						"y": 34,
-						"w": 32,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 32,
-						"h": 34
-					},
-					"frame": {
-						"x": 64,
-						"y": 34,
-						"w": 32,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0029.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 32,
-						"h": 34
-					},
-					"frame": {
-						"x": 64,
-						"y": 34,
-						"w": 32,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0030.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 32,
-						"h": 34
-					},
-					"frame": {
-						"x": 64,
-						"y": 34,
-						"w": 32,
-						"h": 34
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:5864efc3a72b67d8dab83f02efd39074:ff0362b6a3d22e42702e1a31a4aec233:9c4d208e6c2f857bfb0b23b8eea3326c$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 129, "y": 42, "w": 32, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 35 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 194, "y": 1, "w": 32, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 35 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 194, "y": 38, "w": 32, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 35 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 172, "y": 112, "w": 32, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 13, "w": 32, "h": 34 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 207, "y": 112, "w": 32, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 13, "w": 32, "h": 34 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 195, "y": 148, "w": 32, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 14, "w": 32, "h": 33 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 195, "y": 183, "w": 32, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 14, "w": 32, "h": 32 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 163, "y": 75, "w": 32, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 11, "w": 32, "h": 35 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 197, "y": 75, "w": 32, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 11, "w": 32, "h": 35 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 98, "y": 116, "w": 32, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 34 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 1, "y": 81, "w": 32, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 35 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 129, "y": 42, "w": 32, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 35 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 194, "y": 1, "w": 32, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 35 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 194, "y": 38, "w": 32, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 35 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 172, "y": 112, "w": 32, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 13, "w": 32, "h": 34 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 207, "y": 112, "w": 32, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 13, "w": 32, "h": 34 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 195, "y": 148, "w": 32, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 14, "w": 32, "h": 33 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 195, "y": 183, "w": 32, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 14, "w": 32, "h": 32 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 163, "y": 75, "w": 32, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 11, "w": 32, "h": 35 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 197, "y": 75, "w": 32, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 11, "w": 32, "h": 35 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 1, "y": 118, "w": 32, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 34 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 1, "y": 81, "w": 32, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 35 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 129, "y": 42, "w": 32, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 35 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 194, "y": 1, "w": 32, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 35 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 194, "y": 38, "w": 32, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 35 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 172, "y": 112, "w": 32, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 13, "w": 32, "h": 34 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 207, "y": 112, "w": 32, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 13, "w": 32, "h": 34 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 195, "y": 148, "w": 32, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 14, "w": 32, "h": 33 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 195, "y": 183, "w": 32, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 14, "w": 32, "h": 32 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 163, "y": 75, "w": 32, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 11, "w": 32, "h": 35 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 197, "y": 75, "w": 32, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 11, "w": 32, "h": 35 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 1, "y": 118, "w": 32, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 34 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 1, "y": 81, "w": 32, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 35 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 129, "y": 42, "w": 32, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 35 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 194, "y": 1, "w": 32, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 35 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 194, "y": 38, "w": 32, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 35 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 172, "y": 112, "w": 32, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 13, "w": 32, "h": 34 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 207, "y": 112, "w": 32, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 13, "w": 32, "h": 34 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 195, "y": 148, "w": 32, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 14, "w": 32, "h": 33 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 195, "y": 183, "w": 32, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 14, "w": 32, "h": 32 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 163, "y": 75, "w": 32, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 11, "w": 32, "h": 35 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 197, "y": 75, "w": 32, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 11, "w": 32, "h": 35 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 1, "y": 118, "w": 32, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 34 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 1, "y": 81, "w": 32, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 35 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 129, "y": 42, "w": 32, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 35 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 194, "y": 1, "w": 32, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 35 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 194, "y": 38, "w": 32, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 35 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 172, "y": 112, "w": 32, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 13, "w": 32, "h": 34 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 207, "y": 112, "w": 32, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 13, "w": 32, "h": 34 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 195, "y": 148, "w": 32, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 14, "w": 32, "h": 33 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 195, "y": 183, "w": 32, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 14, "w": 32, "h": 32 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 163, "y": 75, "w": 32, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 11, "w": 32, "h": 35 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 197, "y": 75, "w": 32, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 11, "w": 32, "h": 35 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 1, "y": 118, "w": 32, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 34 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 1, "y": 81, "w": 32, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 35 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 129, "y": 42, "w": 32, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 35 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 200
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 129, "y": 1, "w": 31, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 31, "h": 38 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 1, "y": 1, "w": 30, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 30, "h": 41 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 33, "y": 1, "w": 30, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 30, "h": 41 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 50
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 65, "y": 1, "w": 30, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 30, "h": 41 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 50
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 97, "y": 1, "w": 30, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 30, "h": 40 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 50
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 162, "y": 1, "w": 30, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 30, "h": 39 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 67, "y": 81, "w": 29, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 29, "h": 38 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 50
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 164, "y": 148, "w": 29, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 29, "h": 37 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 50
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 35, "y": 81, "w": 30, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 7, "w": 30, "h": 37 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 50
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 69, "y": 152, "w": 33, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 14, "w": 33, "h": 32 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 50
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 104, "y": 185, "w": 34, "h": 30 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 16, "w": 34, "h": 30 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 50
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 68, "y": 186, "w": 34, "h": 29 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 17, "w": 34, "h": 29 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 50
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 1, "y": 157, "w": 33, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 14, "w": 33, "h": 32 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 137, "y": 112, "w": 33, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 13, "w": 33, "h": 33 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 750
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 1, "y": 44, "w": 32, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 11, "w": 32, "h": 35 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 132, "y": 147, "w": 30, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 10, "w": 30, "h": 36 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 36, "y": 157, "w": 30, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 10, "w": 30, "h": 35 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 35, "y": 121, "w": 32, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 11, "w": 32, "h": 34 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 35, "y": 44, "w": 32, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 11, "w": 32, "h": 35 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 69, "y": 44, "w": 32, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 35 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 103, "y": 79, "w": 32, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 35 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 129, "y": 42, "w": 32, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 12, "w": 32, "h": 35 },
+    "sourceSize": { "w": 36, "h": 47 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "656.png",
+  "format": "I8",
+  "size": { "w": 240, "h": 216 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/shiny/656.png b/public/images/pokemon/exp/shiny/656.png
index ffbbc8258d1..c0a97924ca7 100644
Binary files a/public/images/pokemon/exp/shiny/656.png and b/public/images/pokemon/exp/shiny/656.png differ
diff --git a/public/images/pokemon/exp/shiny/661.json b/public/images/pokemon/exp/shiny/661.json
index 6dba8b616b3..ba6523f22b1 100644
--- a/public/images/pokemon/exp/shiny/661.json
+++ b/public/images/pokemon/exp/shiny/661.json
@@ -1,356 +1,398 @@
-{
-	"textures": [
-		{
-			"image": "661.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 70,
-				"h": 70
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 35,
-						"w": 32,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 35,
-						"w": 32,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 35,
-						"w": 32,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 35,
-						"w": 32,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 35,
-						"w": 32,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 35,
-						"w": 32,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					},
-					"frame": {
-						"x": 32,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					},
-					"frame": {
-						"x": 32,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					},
-					"frame": {
-						"x": 32,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					},
-					"frame": {
-						"x": 32,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					},
-					"frame": {
-						"x": 32,
-						"y": 35,
-						"w": 32,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					},
-					"frame": {
-						"x": 32,
-						"y": 35,
-						"w": 32,
-						"h": 35
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:f9a4d305d58fcbff383e0da1712abf6a:1bc270d999d234ddb64b1c01d568ad86:186d621a544ea0e0e2e0bd57975a29b1$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 1, "y": 40, "w": 32, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 32, "h": 38 },
+    "sourceSize": { "w": 37, "h": 39 },
+    "duration": 120
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 34, "y": 117, "w": 31, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 31, "h": 39 },
+    "sourceSize": { "w": 37, "h": 39 },
+    "duration": 120
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 36, "y": 38, "w": 32, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 32, "h": 39 },
+    "sourceSize": { "w": 37, "h": 39 },
+    "duration": 120
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 1, "y": 1, "w": 34, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 34, "h": 38 },
+    "sourceSize": { "w": 37, "h": 39 },
+    "duration": 120
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 34, "y": 78, "w": 32, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 32, "h": 38 },
+    "sourceSize": { "w": 37, "h": 39 },
+    "duration": 120
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 1, "y": 40, "w": 32, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 32, "h": 38 },
+    "sourceSize": { "w": 37, "h": 39 },
+    "duration": 120
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 1, "y": 118, "w": 31, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 31, "h": 38 },
+    "sourceSize": { "w": 37, "h": 39 },
+    "duration": 120
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 1, "y": 79, "w": 32, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 32, "h": 38 },
+    "sourceSize": { "w": 37, "h": 39 },
+    "duration": 120
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 72, "y": 1, "w": 34, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 34, "h": 37 },
+    "sourceSize": { "w": 37, "h": 39 },
+    "duration": 120
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 67, "y": 79, "w": 32, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 32, "h": 38 },
+    "sourceSize": { "w": 37, "h": 39 },
+    "duration": 120
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 1, "y": 40, "w": 32, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 32, "h": 38 },
+    "sourceSize": { "w": 37, "h": 39 },
+    "duration": 120
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 34, "y": 117, "w": 31, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 31, "h": 39 },
+    "sourceSize": { "w": 37, "h": 39 },
+    "duration": 120
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 36, "y": 38, "w": 32, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 32, "h": 39 },
+    "sourceSize": { "w": 37, "h": 39 },
+    "duration": 120
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 1, "y": 1, "w": 34, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 34, "h": 38 },
+    "sourceSize": { "w": 37, "h": 39 },
+    "duration": 120
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 34, "y": 78, "w": 32, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 32, "h": 38 },
+    "sourceSize": { "w": 37, "h": 39 },
+    "duration": 120
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 1, "y": 40, "w": 32, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 32, "h": 38 },
+    "sourceSize": { "w": 37, "h": 39 },
+    "duration": 120
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 1, "y": 118, "w": 31, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 31, "h": 38 },
+    "sourceSize": { "w": 37, "h": 39 },
+    "duration": 120
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 1, "y": 79, "w": 32, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 32, "h": 38 },
+    "sourceSize": { "w": 37, "h": 39 },
+    "duration": 120
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 72, "y": 1, "w": 34, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 34, "h": 37 },
+    "sourceSize": { "w": 37, "h": 39 },
+    "duration": 120
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 67, "y": 79, "w": 32, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 32, "h": 38 },
+    "sourceSize": { "w": 37, "h": 39 },
+    "duration": 120
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 1, "y": 40, "w": 32, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 32, "h": 38 },
+    "sourceSize": { "w": 37, "h": 39 },
+    "duration": 120
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 34, "y": 117, "w": 31, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 31, "h": 39 },
+    "sourceSize": { "w": 37, "h": 39 },
+    "duration": 120
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 36, "y": 38, "w": 32, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 32, "h": 39 },
+    "sourceSize": { "w": 37, "h": 39 },
+    "duration": 120
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 1, "y": 1, "w": 34, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 34, "h": 38 },
+    "sourceSize": { "w": 37, "h": 39 },
+    "duration": 120
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 34, "y": 78, "w": 32, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 32, "h": 38 },
+    "sourceSize": { "w": 37, "h": 39 },
+    "duration": 120
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 1, "y": 40, "w": 32, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 32, "h": 38 },
+    "sourceSize": { "w": 37, "h": 39 },
+    "duration": 120
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 1, "y": 118, "w": 31, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 31, "h": 38 },
+    "sourceSize": { "w": 37, "h": 39 },
+    "duration": 120
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 1, "y": 79, "w": 32, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 32, "h": 38 },
+    "sourceSize": { "w": 37, "h": 39 },
+    "duration": 120
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 72, "y": 1, "w": 34, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 34, "h": 37 },
+    "sourceSize": { "w": 37, "h": 39 },
+    "duration": 120
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 67, "y": 79, "w": 32, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 32, "h": 38 },
+    "sourceSize": { "w": 37, "h": 39 },
+    "duration": 120
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 1, "y": 40, "w": 32, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 32, "h": 38 },
+    "sourceSize": { "w": 37, "h": 39 },
+    "duration": 120
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 69, "y": 39, "w": 32, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 32, "h": 39 },
+    "sourceSize": { "w": 37, "h": 39 },
+    "duration": 120
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 69, "y": 39, "w": 32, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 32, "h": 39 },
+    "sourceSize": { "w": 37, "h": 39 },
+    "duration": 120
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 100, "y": 79, "w": 32, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 32, "h": 38 },
+    "sourceSize": { "w": 37, "h": 39 },
+    "duration": 120
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 107, "y": 1, "w": 34, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 34, "h": 37 },
+    "sourceSize": { "w": 37, "h": 39 },
+    "duration": 120
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 36, "y": 1, "w": 35, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 35, "h": 36 },
+    "sourceSize": { "w": 37, "h": 39 },
+    "duration": 120
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 107, "y": 1, "w": 34, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 34, "h": 37 },
+    "sourceSize": { "w": 37, "h": 39 },
+    "duration": 120
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 36, "y": 1, "w": 35, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 35, "h": 36 },
+    "sourceSize": { "w": 37, "h": 39 },
+    "duration": 120
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 107, "y": 1, "w": 34, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 34, "h": 37 },
+    "sourceSize": { "w": 37, "h": 39 },
+    "duration": 120
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 36, "y": 1, "w": 35, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 35, "h": 36 },
+    "sourceSize": { "w": 37, "h": 39 },
+    "duration": 120
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 107, "y": 1, "w": 34, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 34, "h": 37 },
+    "sourceSize": { "w": 37, "h": 39 },
+    "duration": 120
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 102, "y": 39, "w": 32, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 32, "h": 39 },
+    "sourceSize": { "w": 37, "h": 39 },
+    "duration": 120
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 69, "y": 39, "w": 32, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 32, "h": 39 },
+    "sourceSize": { "w": 37, "h": 39 },
+    "duration": 120
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.11-x64",
+  "image": "661.png",
+  "format": "I8",
+  "size": { "w": 142, "h": 157 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/shiny/661.png b/public/images/pokemon/exp/shiny/661.png
index 2b73fb85c54..0e2d5996bc2 100644
Binary files a/public/images/pokemon/exp/shiny/661.png and b/public/images/pokemon/exp/shiny/661.png differ
diff --git a/public/images/pokemon/exp/shiny/662.json b/public/images/pokemon/exp/shiny/662.json
index 9aa396fbae1..3600bbcd38d 100644
--- a/public/images/pokemon/exp/shiny/662.json
+++ b/public/images/pokemon/exp/shiny/662.json
@@ -1,776 +1,254 @@
-{
-	"textures": [
-		{
-			"image": "662.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 167,
-				"h": 167
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 56,
-						"h": 61
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 56,
-						"h": 52
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 56,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 56,
-						"h": 61
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 56,
-						"h": 52
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 56,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 56,
-						"h": 61
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 56,
-						"h": 52
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 56,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 56,
-						"h": 61
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 56,
-						"h": 52
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 56,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 56,
-						"h": 61
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 56,
-						"h": 52
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 56,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 56,
-						"h": 61
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 56,
-						"h": 52
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 56,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 56,
-						"h": 61
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 56,
-						"h": 52
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 56,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 56,
-						"h": 61
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 56,
-						"h": 52
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 56,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 56,
-						"h": 61
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 56,
-						"h": 52
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 56,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 56,
-						"h": 61
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 56,
-						"h": 52
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 56,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0027.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 56,
-						"h": 61
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 56,
-						"h": 52
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 56,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0028.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 56,
-						"h": 61
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 56,
-						"h": 52
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 56,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0033.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 56,
-						"h": 61
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 56,
-						"h": 52
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 56,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0034.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 56,
-						"h": 61
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 56,
-						"h": 52
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 56,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0035.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 56,
-						"h": 61
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 56,
-						"h": 52
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 56,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0036.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 56,
-						"h": 61
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 56,
-						"h": 52
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 56,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 56,
-						"h": 61
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 56,
-						"h": 52
-					},
-					"frame": {
-						"x": 56,
-						"y": 0,
-						"w": 56,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 56,
-						"h": 61
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 56,
-						"h": 52
-					},
-					"frame": {
-						"x": 56,
-						"y": 0,
-						"w": 56,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 56,
-						"h": 61
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 56,
-						"h": 52
-					},
-					"frame": {
-						"x": 56,
-						"y": 0,
-						"w": 56,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 56,
-						"h": 61
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 56,
-						"h": 52
-					},
-					"frame": {
-						"x": 56,
-						"y": 0,
-						"w": 56,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 56,
-						"h": 61
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 16,
-						"w": 55,
-						"h": 37
-					},
-					"frame": {
-						"x": 112,
-						"y": 0,
-						"w": 55,
-						"h": 37
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 56,
-						"h": 61
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 16,
-						"w": 55,
-						"h": 37
-					},
-					"frame": {
-						"x": 112,
-						"y": 0,
-						"w": 55,
-						"h": 37
-					}
-				},
-				{
-					"filename": "0025.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 56,
-						"h": 61
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 16,
-						"w": 55,
-						"h": 37
-					},
-					"frame": {
-						"x": 112,
-						"y": 0,
-						"w": 55,
-						"h": 37
-					}
-				},
-				{
-					"filename": "0026.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 56,
-						"h": 61
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 16,
-						"w": 55,
-						"h": 37
-					},
-					"frame": {
-						"x": 112,
-						"y": 0,
-						"w": 55,
-						"h": 37
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 56,
-						"h": 61
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 56,
-						"h": 51
-					},
-					"frame": {
-						"x": 0,
-						"y": 52,
-						"w": 56,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 56,
-						"h": 61
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 56,
-						"h": 51
-					},
-					"frame": {
-						"x": 0,
-						"y": 52,
-						"w": 56,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0031.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 56,
-						"h": 61
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 56,
-						"h": 51
-					},
-					"frame": {
-						"x": 0,
-						"y": 52,
-						"w": 56,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0032.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 56,
-						"h": 61
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 56,
-						"h": 51
-					},
-					"frame": {
-						"x": 0,
-						"y": 52,
-						"w": 56,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 56,
-						"h": 61
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 56,
-						"h": 50
-					},
-					"frame": {
-						"x": 0,
-						"y": 103,
-						"w": 56,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 56,
-						"h": 61
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 56,
-						"h": 50
-					},
-					"frame": {
-						"x": 0,
-						"y": 103,
-						"w": 56,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0029.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 56,
-						"h": 61
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 56,
-						"h": 50
-					},
-					"frame": {
-						"x": 0,
-						"y": 103,
-						"w": 56,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0030.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 56,
-						"h": 61
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 56,
-						"h": 50
-					},
-					"frame": {
-						"x": 0,
-						"y": 103,
-						"w": 56,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 56,
-						"h": 61
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 17,
-						"w": 56,
-						"h": 44
-					},
-					"frame": {
-						"x": 56,
-						"y": 52,
-						"w": 56,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 56,
-						"h": 61
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 17,
-						"w": 56,
-						"h": 44
-					},
-					"frame": {
-						"x": 56,
-						"y": 52,
-						"w": 56,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 56,
-						"h": 61
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 17,
-						"w": 56,
-						"h": 44
-					},
-					"frame": {
-						"x": 56,
-						"y": 96,
-						"w": 56,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 56,
-						"h": 61
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 17,
-						"w": 56,
-						"h": 44
-					},
-					"frame": {
-						"x": 56,
-						"y": 96,
-						"w": 56,
-						"h": 44
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:3ab37b59d2c6d2f3d8b7379738b89720:769cd0fc38f80c712966ce15da281c1f:e3da2dd0277c18bcc713dc6dd2460c87$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 221, "y": 131, "w": 57, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 17, "w": 57, "h": 61 },
+    "sourceSize": { "w": 75, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 113, "y": 70, "w": 56, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 19, "w": 56, "h": 63 },
+    "sourceSize": { "w": 75, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 335, "y": 136, "w": 49, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 36, "w": 49, "h": 50 },
+    "sourceSize": { "w": 75, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 105, "y": 197, "w": 63, "h": 51 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 33, "w": 63, "h": 51 },
+    "sourceSize": { "w": 75, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 1, "y": 1, "w": 59, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 16, "w": 59, "h": 66 },
+    "sourceSize": { "w": 75, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 119, "y": 1, "w": 56, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 17, "y": 11, "w": 56, "h": 68 },
+    "sourceSize": { "w": 75, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 233, "y": 1, "w": 54, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 7, "w": 54, "h": 70 },
+    "sourceSize": { "w": 75, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 176, "y": 1, "w": 56, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 17, "y": 13, "w": 56, "h": 68 },
+    "sourceSize": { "w": 75, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 288, "y": 1, "w": 59, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 16, "y": 20, "w": 59, "h": 64 },
+    "sourceSize": { "w": 75, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 338, "y": 187, "w": 47, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 30, "w": 47, "h": 48 },
+    "sourceSize": { "w": 75, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 66, "y": 249, "w": 62, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 26, "w": 62, "h": 49 },
+    "sourceSize": { "w": 75, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 1, "y": 68, "w": 58, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 6, "w": 58, "h": 64 },
+    "sourceSize": { "w": 75, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 169, "y": 141, "w": 47, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 19, "y": 17, "w": 47, "h": 49 },
+    "sourceSize": { "w": 75, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 275, "y": 198, "w": 62, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 12, "w": 62, "h": 50 },
+    "sourceSize": { "w": 75, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 61, "y": 1, "w": 57, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 57, "h": 67 },
+    "sourceSize": { "w": 75, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 288, "y": 66, "w": 54, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 2, "w": 54, "h": 69 },
+    "sourceSize": { "w": 75, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 60, "y": 69, "w": 52, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 5, "w": 52, "h": 71 },
+    "sourceSize": { "w": 75, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 170, "y": 70, "w": 50, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 10, "w": 50, "h": 70 },
+    "sourceSize": { "w": 75, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 1, "y": 133, "w": 49, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 13, "w": 49, "h": 70 },
+    "sourceSize": { "w": 75, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 275, "y": 249, "w": 56, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 30, "w": 56, "h": 49 },
+    "sourceSize": { "w": 75, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 1, "y": 205, "w": 64, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 27, "w": 64, "h": 48 },
+    "sourceSize": { "w": 75, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 221, "y": 72, "w": 60, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 13, "w": 60, "h": 58 },
+    "sourceSize": { "w": 75, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 113, "y": 134, "w": 55, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 7, "w": 55, "h": 62 },
+    "sourceSize": { "w": 75, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 223, "y": 193, "w": 51, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 3, "w": 51, "h": 64 },
+    "sourceSize": { "w": 75, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 51, "y": 141, "w": 53, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 7, "w": 53, "h": 63 },
+    "sourceSize": { "w": 75, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 169, "y": 193, "w": 53, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 10, "w": 53, "h": 63 },
+    "sourceSize": { "w": 75, "h": 86 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 279, "y": 136, "w": 55, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 14, "w": 55, "h": 61 },
+    "sourceSize": { "w": 75, "h": 86 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.11-x64",
+  "image": "662.png",
+  "format": "I8",
+  "size": { "w": 386, "h": 299 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/shiny/662.png b/public/images/pokemon/exp/shiny/662.png
index e45e79556c5..4eae91c7855 100644
Binary files a/public/images/pokemon/exp/shiny/662.png and b/public/images/pokemon/exp/shiny/662.png differ
diff --git a/public/images/pokemon/exp/shiny/663.json b/public/images/pokemon/exp/shiny/663.json
index 3af6f5c5875..8c4ef182132 100644
--- a/public/images/pokemon/exp/shiny/663.json
+++ b/public/images/pokemon/exp/shiny/663.json
@@ -1,1700 +1,731 @@
-{
-	"textures": [
-		{
-			"image": "663.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 295,
-				"h": 295
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 27,
-						"w": 121,
-						"h": 58
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 121,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 27,
-						"w": 121,
-						"h": 58
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 121,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 27,
-						"w": 121,
-						"h": 58
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 121,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0034.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 27,
-						"w": 121,
-						"h": 58
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 121,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0044.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 27,
-						"w": 121,
-						"h": 58
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 121,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0054.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 27,
-						"w": 121,
-						"h": 58
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 121,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 27,
-						"w": 116,
-						"h": 64
-					},
-					"frame": {
-						"x": 121,
-						"y": 0,
-						"w": 116,
-						"h": 64
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 27,
-						"w": 116,
-						"h": 64
-					},
-					"frame": {
-						"x": 121,
-						"y": 0,
-						"w": 116,
-						"h": 64
-					}
-				},
-				{
-					"filename": "0025.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 27,
-						"w": 116,
-						"h": 64
-					},
-					"frame": {
-						"x": 121,
-						"y": 0,
-						"w": 116,
-						"h": 64
-					}
-				},
-				{
-					"filename": "0035.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 27,
-						"w": 116,
-						"h": 64
-					},
-					"frame": {
-						"x": 121,
-						"y": 0,
-						"w": 116,
-						"h": 64
-					}
-				},
-				{
-					"filename": "0045.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 27,
-						"w": 116,
-						"h": 64
-					},
-					"frame": {
-						"x": 121,
-						"y": 0,
-						"w": 116,
-						"h": 64
-					}
-				},
-				{
-					"filename": "0055.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 27,
-						"w": 116,
-						"h": 64
-					},
-					"frame": {
-						"x": 121,
-						"y": 0,
-						"w": 116,
-						"h": 64
-					}
-				},
-				{
-					"filename": "0063.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 27,
-						"w": 116,
-						"h": 64
-					},
-					"frame": {
-						"x": 121,
-						"y": 0,
-						"w": 116,
-						"h": 64
-					}
-				},
-				{
-					"filename": "0068.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 27,
-						"w": 116,
-						"h": 64
-					},
-					"frame": {
-						"x": 121,
-						"y": 0,
-						"w": 116,
-						"h": 64
-					}
-				},
-				{
-					"filename": "0073.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 27,
-						"w": 116,
-						"h": 64
-					},
-					"frame": {
-						"x": 121,
-						"y": 0,
-						"w": 116,
-						"h": 64
-					}
-				},
-				{
-					"filename": "0078.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 27,
-						"w": 116,
-						"h": 64
-					},
-					"frame": {
-						"x": 121,
-						"y": 0,
-						"w": 116,
-						"h": 64
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 2,
-						"w": 108,
-						"h": 88
-					},
-					"frame": {
-						"x": 0,
-						"y": 58,
-						"w": 108,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 2,
-						"w": 108,
-						"h": 88
-					},
-					"frame": {
-						"x": 0,
-						"y": 58,
-						"w": 108,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0028.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 2,
-						"w": 108,
-						"h": 88
-					},
-					"frame": {
-						"x": 0,
-						"y": 58,
-						"w": 108,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0038.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 2,
-						"w": 108,
-						"h": 88
-					},
-					"frame": {
-						"x": 0,
-						"y": 58,
-						"w": 108,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0048.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 2,
-						"w": 108,
-						"h": 88
-					},
-					"frame": {
-						"x": 0,
-						"y": 58,
-						"w": 108,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0058.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 2,
-						"w": 108,
-						"h": 88
-					},
-					"frame": {
-						"x": 0,
-						"y": 58,
-						"w": 108,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 19,
-						"y": 0,
-						"w": 87,
-						"h": 92
-					},
-					"frame": {
-						"x": 0,
-						"y": 146,
-						"w": 87,
-						"h": 92
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 19,
-						"y": 0,
-						"w": 87,
-						"h": 92
-					},
-					"frame": {
-						"x": 0,
-						"y": 146,
-						"w": 87,
-						"h": 92
-					}
-				},
-				{
-					"filename": "0030.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 19,
-						"y": 0,
-						"w": 87,
-						"h": 92
-					},
-					"frame": {
-						"x": 0,
-						"y": 146,
-						"w": 87,
-						"h": 92
-					}
-				},
-				{
-					"filename": "0040.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 19,
-						"y": 0,
-						"w": 87,
-						"h": 92
-					},
-					"frame": {
-						"x": 0,
-						"y": 146,
-						"w": 87,
-						"h": 92
-					}
-				},
-				{
-					"filename": "0050.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 19,
-						"y": 0,
-						"w": 87,
-						"h": 92
-					},
-					"frame": {
-						"x": 0,
-						"y": 146,
-						"w": 87,
-						"h": 92
-					}
-				},
-				{
-					"filename": "0060.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 19,
-						"y": 0,
-						"w": 87,
-						"h": 92
-					},
-					"frame": {
-						"x": 0,
-						"y": 146,
-						"w": 87,
-						"h": 92
-					}
-				},
-				{
-					"filename": "0065.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 19,
-						"y": 0,
-						"w": 87,
-						"h": 92
-					},
-					"frame": {
-						"x": 0,
-						"y": 146,
-						"w": 87,
-						"h": 92
-					}
-				},
-				{
-					"filename": "0070.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 19,
-						"y": 0,
-						"w": 87,
-						"h": 92
-					},
-					"frame": {
-						"x": 0,
-						"y": 146,
-						"w": 87,
-						"h": 92
-					}
-				},
-				{
-					"filename": "0075.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 19,
-						"y": 0,
-						"w": 87,
-						"h": 92
-					},
-					"frame": {
-						"x": 0,
-						"y": 146,
-						"w": 87,
-						"h": 92
-					}
-				},
-				{
-					"filename": "0080.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 19,
-						"y": 0,
-						"w": 87,
-						"h": 92
-					},
-					"frame": {
-						"x": 0,
-						"y": 146,
-						"w": 87,
-						"h": 92
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 17,
-						"y": 0,
-						"w": 92,
-						"h": 91
-					},
-					"frame": {
-						"x": 87,
-						"y": 146,
-						"w": 92,
-						"h": 91
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 17,
-						"y": 0,
-						"w": 92,
-						"h": 91
-					},
-					"frame": {
-						"x": 87,
-						"y": 146,
-						"w": 92,
-						"h": 91
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 17,
-						"y": 0,
-						"w": 92,
-						"h": 91
-					},
-					"frame": {
-						"x": 87,
-						"y": 146,
-						"w": 92,
-						"h": 91
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 17,
-						"y": 0,
-						"w": 92,
-						"h": 91
-					},
-					"frame": {
-						"x": 87,
-						"y": 146,
-						"w": 92,
-						"h": 91
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 17,
-						"y": 0,
-						"w": 92,
-						"h": 91
-					},
-					"frame": {
-						"x": 87,
-						"y": 146,
-						"w": 92,
-						"h": 91
-					}
-				},
-				{
-					"filename": "0029.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 17,
-						"y": 0,
-						"w": 92,
-						"h": 91
-					},
-					"frame": {
-						"x": 87,
-						"y": 146,
-						"w": 92,
-						"h": 91
-					}
-				},
-				{
-					"filename": "0031.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 17,
-						"y": 0,
-						"w": 92,
-						"h": 91
-					},
-					"frame": {
-						"x": 87,
-						"y": 146,
-						"w": 92,
-						"h": 91
-					}
-				},
-				{
-					"filename": "0039.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 17,
-						"y": 0,
-						"w": 92,
-						"h": 91
-					},
-					"frame": {
-						"x": 87,
-						"y": 146,
-						"w": 92,
-						"h": 91
-					}
-				},
-				{
-					"filename": "0041.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 17,
-						"y": 0,
-						"w": 92,
-						"h": 91
-					},
-					"frame": {
-						"x": 87,
-						"y": 146,
-						"w": 92,
-						"h": 91
-					}
-				},
-				{
-					"filename": "0049.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 17,
-						"y": 0,
-						"w": 92,
-						"h": 91
-					},
-					"frame": {
-						"x": 87,
-						"y": 146,
-						"w": 92,
-						"h": 91
-					}
-				},
-				{
-					"filename": "0051.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 17,
-						"y": 0,
-						"w": 92,
-						"h": 91
-					},
-					"frame": {
-						"x": 87,
-						"y": 146,
-						"w": 92,
-						"h": 91
-					}
-				},
-				{
-					"filename": "0059.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 17,
-						"y": 0,
-						"w": 92,
-						"h": 91
-					},
-					"frame": {
-						"x": 87,
-						"y": 146,
-						"w": 92,
-						"h": 91
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 33,
-						"w": 99,
-						"h": 58
-					},
-					"frame": {
-						"x": 87,
-						"y": 237,
-						"w": 99,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 33,
-						"w": 99,
-						"h": 58
-					},
-					"frame": {
-						"x": 87,
-						"y": 237,
-						"w": 99,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0027.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 33,
-						"w": 99,
-						"h": 58
-					},
-					"frame": {
-						"x": 87,
-						"y": 237,
-						"w": 99,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0037.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 33,
-						"w": 99,
-						"h": 58
-					},
-					"frame": {
-						"x": 87,
-						"y": 237,
-						"w": 99,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0047.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 33,
-						"w": 99,
-						"h": 58
-					},
-					"frame": {
-						"x": 87,
-						"y": 237,
-						"w": 99,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0057.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 33,
-						"w": 99,
-						"h": 58
-					},
-					"frame": {
-						"x": 87,
-						"y": 237,
-						"w": 99,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0064.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 33,
-						"w": 99,
-						"h": 58
-					},
-					"frame": {
-						"x": 87,
-						"y": 237,
-						"w": 99,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0069.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 33,
-						"w": 99,
-						"h": 58
-					},
-					"frame": {
-						"x": 87,
-						"y": 237,
-						"w": 99,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0074.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 33,
-						"w": 99,
-						"h": 58
-					},
-					"frame": {
-						"x": 87,
-						"y": 237,
-						"w": 99,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0079.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 33,
-						"w": 99,
-						"h": 58
-					},
-					"frame": {
-						"x": 87,
-						"y": 237,
-						"w": 99,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 13,
-						"w": 104,
-						"h": 76
-					},
-					"frame": {
-						"x": 186,
-						"y": 64,
-						"w": 104,
-						"h": 76
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 13,
-						"w": 104,
-						"h": 76
-					},
-					"frame": {
-						"x": 186,
-						"y": 64,
-						"w": 104,
-						"h": 76
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 13,
-						"w": 104,
-						"h": 76
-					},
-					"frame": {
-						"x": 186,
-						"y": 64,
-						"w": 104,
-						"h": 76
-					}
-				},
-				{
-					"filename": "0033.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 13,
-						"w": 104,
-						"h": 76
-					},
-					"frame": {
-						"x": 186,
-						"y": 64,
-						"w": 104,
-						"h": 76
-					}
-				},
-				{
-					"filename": "0043.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 13,
-						"w": 104,
-						"h": 76
-					},
-					"frame": {
-						"x": 186,
-						"y": 64,
-						"w": 104,
-						"h": 76
-					}
-				},
-				{
-					"filename": "0053.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 13,
-						"w": 104,
-						"h": 76
-					},
-					"frame": {
-						"x": 186,
-						"y": 64,
-						"w": 104,
-						"h": 76
-					}
-				},
-				{
-					"filename": "0062.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 13,
-						"w": 104,
-						"h": 76
-					},
-					"frame": {
-						"x": 186,
-						"y": 64,
-						"w": 104,
-						"h": 76
-					}
-				},
-				{
-					"filename": "0067.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 13,
-						"w": 104,
-						"h": 76
-					},
-					"frame": {
-						"x": 186,
-						"y": 64,
-						"w": 104,
-						"h": 76
-					}
-				},
-				{
-					"filename": "0072.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 13,
-						"w": 104,
-						"h": 76
-					},
-					"frame": {
-						"x": 186,
-						"y": 64,
-						"w": 104,
-						"h": 76
-					}
-				},
-				{
-					"filename": "0077.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 13,
-						"w": 104,
-						"h": 76
-					},
-					"frame": {
-						"x": 186,
-						"y": 64,
-						"w": 104,
-						"h": 76
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 29,
-						"w": 103,
-						"h": 64
-					},
-					"frame": {
-						"x": 186,
-						"y": 140,
-						"w": 103,
-						"h": 64
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 29,
-						"w": 103,
-						"h": 64
-					},
-					"frame": {
-						"x": 186,
-						"y": 140,
-						"w": 103,
-						"h": 64
-					}
-				},
-				{
-					"filename": "0026.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 29,
-						"w": 103,
-						"h": 64
-					},
-					"frame": {
-						"x": 186,
-						"y": 140,
-						"w": 103,
-						"h": 64
-					}
-				},
-				{
-					"filename": "0036.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 29,
-						"w": 103,
-						"h": 64
-					},
-					"frame": {
-						"x": 186,
-						"y": 140,
-						"w": 103,
-						"h": 64
-					}
-				},
-				{
-					"filename": "0046.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 29,
-						"w": 103,
-						"h": 64
-					},
-					"frame": {
-						"x": 186,
-						"y": 140,
-						"w": 103,
-						"h": 64
-					}
-				},
-				{
-					"filename": "0056.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 29,
-						"w": 103,
-						"h": 64
-					},
-					"frame": {
-						"x": 186,
-						"y": 140,
-						"w": 103,
-						"h": 64
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 16,
-						"y": 3,
-						"w": 95,
-						"h": 87
-					},
-					"frame": {
-						"x": 186,
-						"y": 204,
-						"w": 95,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 16,
-						"y": 3,
-						"w": 95,
-						"h": 87
-					},
-					"frame": {
-						"x": 186,
-						"y": 204,
-						"w": 95,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 16,
-						"y": 3,
-						"w": 95,
-						"h": 87
-					},
-					"frame": {
-						"x": 186,
-						"y": 204,
-						"w": 95,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0032.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 16,
-						"y": 3,
-						"w": 95,
-						"h": 87
-					},
-					"frame": {
-						"x": 186,
-						"y": 204,
-						"w": 95,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0042.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 16,
-						"y": 3,
-						"w": 95,
-						"h": 87
-					},
-					"frame": {
-						"x": 186,
-						"y": 204,
-						"w": 95,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0052.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 16,
-						"y": 3,
-						"w": 95,
-						"h": 87
-					},
-					"frame": {
-						"x": 186,
-						"y": 204,
-						"w": 95,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0061.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 16,
-						"y": 3,
-						"w": 95,
-						"h": 87
-					},
-					"frame": {
-						"x": 186,
-						"y": 204,
-						"w": 95,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0066.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 16,
-						"y": 3,
-						"w": 95,
-						"h": 87
-					},
-					"frame": {
-						"x": 186,
-						"y": 204,
-						"w": 95,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0071.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 16,
-						"y": 3,
-						"w": 95,
-						"h": 87
-					},
-					"frame": {
-						"x": 186,
-						"y": 204,
-						"w": 95,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0076.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 121,
-						"h": 93
-					},
-					"spriteSourceSize": {
-						"x": 16,
-						"y": 3,
-						"w": 95,
-						"h": 87
-					},
-					"frame": {
-						"x": 186,
-						"y": 204,
-						"w": 95,
-						"h": 87
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:8bf443d425b4203c8adbc0ffad215956:cf5b810e03b096373e0bdd0a7220fc2c:3790d8d72a704a789cc594688d98802e$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 107, "y": 0, "w": 90, "h": 89 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 19, "y": 3, "w": 90, "h": 89 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 198, "y": 0, "w": 93, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 6, "w": 93, "h": 85 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 378, "y": 0, "w": 102, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 16, "w": 102, "h": 74 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 115, "y": 90, "w": 121, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 30, "w": 121, "h": 56 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 0, "y": 90, "w": 114, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 30, "w": 114, "h": 62 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 378, "y": 75, "w": 101, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 32, "w": 101, "h": 63 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 237, "y": 92, "w": 97, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 36, "w": 97, "h": 56 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 0, "y": 0, "w": 106, "h": 86 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 106, "h": 86 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 107, "y": 0, "w": 90, "h": 89 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 19, "y": 3, "w": 90, "h": 89 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 292, "y": 0, "w": 85, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 2, "w": 85, "h": 91 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 107, "y": 0, "w": 90, "h": 89 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 19, "y": 3, "w": 90, "h": 89 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 198, "y": 0, "w": 93, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 6, "w": 93, "h": 85 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 378, "y": 0, "w": 102, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 16, "w": 102, "h": 74 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 115, "y": 90, "w": 121, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 30, "w": 121, "h": 56 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 0, "y": 90, "w": 114, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 30, "w": 114, "h": 62 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 378, "y": 75, "w": 101, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 32, "w": 101, "h": 63 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 237, "y": 92, "w": 97, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 36, "w": 97, "h": 56 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 0, "y": 0, "w": 106, "h": 86 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 106, "h": 86 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 107, "y": 0, "w": 90, "h": 89 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 19, "y": 3, "w": 90, "h": 89 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 292, "y": 0, "w": 85, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 2, "w": 85, "h": 91 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 107, "y": 0, "w": 90, "h": 89 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 19, "y": 3, "w": 90, "h": 89 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 198, "y": 0, "w": 93, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 6, "w": 93, "h": 85 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 378, "y": 0, "w": 102, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 16, "w": 102, "h": 74 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 115, "y": 90, "w": 121, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 30, "w": 121, "h": 56 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 0, "y": 90, "w": 114, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 30, "w": 114, "h": 62 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 378, "y": 75, "w": 101, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 32, "w": 101, "h": 63 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 237, "y": 92, "w": 97, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 36, "w": 97, "h": 56 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 0, "y": 0, "w": 106, "h": 86 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 106, "h": 86 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 107, "y": 0, "w": 90, "h": 89 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 19, "y": 3, "w": 90, "h": 89 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 292, "y": 0, "w": 85, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 2, "w": 85, "h": 91 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 107, "y": 0, "w": 90, "h": 89 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 19, "y": 3, "w": 90, "h": 89 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 198, "y": 0, "w": 93, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 6, "w": 93, "h": 85 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 378, "y": 0, "w": 102, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 16, "w": 102, "h": 74 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 115, "y": 90, "w": 121, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 30, "w": 121, "h": 56 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 0, "y": 90, "w": 114, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 30, "w": 114, "h": 62 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 378, "y": 75, "w": 101, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 32, "w": 101, "h": 63 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 237, "y": 92, "w": 97, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 36, "w": 97, "h": 56 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 0, "y": 0, "w": 106, "h": 86 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 106, "h": 86 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 107, "y": 0, "w": 90, "h": 89 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 19, "y": 3, "w": 90, "h": 89 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 292, "y": 0, "w": 85, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 2, "w": 85, "h": 91 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 107, "y": 0, "w": 90, "h": 89 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 19, "y": 3, "w": 90, "h": 89 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 198, "y": 0, "w": 93, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 6, "w": 93, "h": 85 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 378, "y": 0, "w": 102, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 16, "w": 102, "h": 74 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 115, "y": 90, "w": 121, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 30, "w": 121, "h": 56 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 0, "y": 90, "w": 114, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 30, "w": 114, "h": 62 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 378, "y": 75, "w": 101, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 32, "w": 101, "h": 63 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 237, "y": 92, "w": 97, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 36, "w": 97, "h": 56 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 0, "y": 0, "w": 106, "h": 86 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 106, "h": 86 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 107, "y": 0, "w": 90, "h": 89 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 19, "y": 3, "w": 90, "h": 89 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 292, "y": 0, "w": 85, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 2, "w": 85, "h": 91 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 107, "y": 0, "w": 90, "h": 89 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 19, "y": 3, "w": 90, "h": 89 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 198, "y": 0, "w": 93, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 6, "w": 93, "h": 85 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 378, "y": 0, "w": 102, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 16, "w": 102, "h": 74 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 115, "y": 90, "w": 121, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 30, "w": 121, "h": 56 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 0, "y": 90, "w": 114, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 30, "w": 114, "h": 62 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 378, "y": 75, "w": 101, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 32, "w": 101, "h": 63 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 237, "y": 92, "w": 97, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 36, "w": 97, "h": 56 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 0, "y": 0, "w": 106, "h": 86 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 106, "h": 86 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 107, "y": 0, "w": 90, "h": 89 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 19, "y": 3, "w": 90, "h": 89 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 292, "y": 0, "w": 85, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 2, "w": 85, "h": 91 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 198, "y": 0, "w": 93, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 6, "w": 93, "h": 85 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 378, "y": 0, "w": 102, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 16, "w": 102, "h": 74 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 0, "y": 90, "w": 114, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 30, "w": 114, "h": 62 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 237, "y": 92, "w": 97, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 36, "w": 97, "h": 56 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 292, "y": 0, "w": 85, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 2, "w": 85, "h": 91 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 198, "y": 0, "w": 93, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 6, "w": 93, "h": 85 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 378, "y": 0, "w": 102, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 16, "w": 102, "h": 74 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 0, "y": 90, "w": 114, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 30, "w": 114, "h": 62 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 237, "y": 92, "w": 97, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 36, "w": 97, "h": 56 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 292, "y": 0, "w": 85, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 2, "w": 85, "h": 91 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 198, "y": 0, "w": 93, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 6, "w": 93, "h": 85 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 378, "y": 0, "w": 102, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 16, "w": 102, "h": 74 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 0, "y": 90, "w": 114, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 30, "w": 114, "h": 62 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 237, "y": 92, "w": 97, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 36, "w": 97, "h": 56 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 292, "y": 0, "w": 85, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 2, "w": 85, "h": 91 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 198, "y": 0, "w": 93, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 6, "w": 93, "h": 85 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 378, "y": 0, "w": 102, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 16, "w": 102, "h": 74 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 0, "y": 90, "w": 114, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 30, "w": 114, "h": 62 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 237, "y": 92, "w": 97, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 36, "w": 97, "h": 56 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 292, "y": 0, "w": 85, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 2, "w": 85, "h": 91 },
+    "sourceSize": { "w": 128, "h": 96 },
+    "duration": 80
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "663.png",
+  "format": "I8",
+  "size": { "w": 480, "h": 152 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/shiny/663.png b/public/images/pokemon/exp/shiny/663.png
index 21c1e740e8d..a4e9dad1596 100644
Binary files a/public/images/pokemon/exp/shiny/663.png and b/public/images/pokemon/exp/shiny/663.png differ
diff --git a/public/images/pokemon/exp/shiny/664.json b/public/images/pokemon/exp/shiny/664.json
index 07a901e0d44..5036fe74b0b 100644
--- a/public/images/pokemon/exp/shiny/664.json
+++ b/public/images/pokemon/exp/shiny/664.json
@@ -1,188 +1,110 @@
-{
-	"textures": [
-		{
-			"image": "664.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 84,
-				"h": 84
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 25,
-						"h": 43
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 25,
-						"h": 43
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 25,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 25,
-						"h": 43
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 25,
-						"h": 43
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 25,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 25,
-						"h": 43
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 25,
-						"h": 43
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 25,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 25,
-						"h": 43
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 25,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 43,
-						"w": 25,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 25,
-						"h": 43
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 25,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 43,
-						"w": 25,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 25,
-						"h": 43
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 25,
-						"h": 43
-					},
-					"frame": {
-						"x": 25,
-						"y": 0,
-						"w": 25,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 25,
-						"h": 43
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 25,
-						"h": 43
-					},
-					"frame": {
-						"x": 25,
-						"y": 0,
-						"w": 25,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 25,
-						"h": 43
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 25,
-						"h": 43
-					},
-					"frame": {
-						"x": 50,
-						"y": 0,
-						"w": 25,
-						"h": 43
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:abc9e31ee93d2f27a131cb957fe7fc3c:57e5ff2b24c643697831bc41f9168d6d:596e7d5b15b1bf041c4d7f6707c8ff49$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 0, "y": 46, "w": 26, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 26, "h": 46 },
+    "sourceSize": { "w": 28, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 83, "y": 46, "w": 26, "h": 45 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 26, "h": 45 },
+    "sourceSize": { "w": 28, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 26, "y": 90, "w": 26, "h": 45 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 26, "h": 45 },
+    "sourceSize": { "w": 28, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 52, "y": 91, "w": 26, "h": 45 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 26, "h": 45 },
+    "sourceSize": { "w": 28, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 26, "y": 46, "w": 27, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 27, "h": 44 },
+    "sourceSize": { "w": 28, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 78, "y": 91, "w": 26, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 26, "h": 44 },
+    "sourceSize": { "w": 28, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 56, "y": 0, "w": 28, "h": 45 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 28, "h": 45 },
+    "sourceSize": { "w": 28, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 0, "y": 0, "w": 28, "h": 46 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 28, "h": 46 },
+    "sourceSize": { "w": 28, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 28, "y": 0, "w": 28, "h": 46 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 28, "h": 46 },
+    "sourceSize": { "w": 28, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 84, "y": 0, "w": 27, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 27, "h": 46 },
+    "sourceSize": { "w": 28, "h": 46 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 56, "y": 45, "w": 27, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 27, "h": 46 },
+    "sourceSize": { "w": 28, "h": 46 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "664.png",
+  "format": "I8",
+  "size": { "w": 111, "h": 136 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/shiny/664.png b/public/images/pokemon/exp/shiny/664.png
index 2c10d379388..bfb8bd76371 100644
Binary files a/public/images/pokemon/exp/shiny/664.png and b/public/images/pokemon/exp/shiny/664.png differ
diff --git a/public/images/pokemon/exp/shiny/665.json b/public/images/pokemon/exp/shiny/665.json
index d419d4e9f03..a06b1d10ad0 100644
--- a/public/images/pokemon/exp/shiny/665.json
+++ b/public/images/pokemon/exp/shiny/665.json
@@ -1,188 +1,596 @@
-{
-	"textures": [
-		{
-			"image": "665.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 76,
-				"h": 76
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 38,
-						"h": 36
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 38,
-						"h": 36
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 38,
-						"h": 36
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 38,
-						"h": 36
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 38,
-						"h": 36
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 38,
-						"h": 36
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 38,
-						"h": 36
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 38,
-						"h": 36
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 38,
-						"h": 36
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 38,
-						"h": 36
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 38,
-						"h": 36
-					},
-					"frame": {
-						"x": 38,
-						"y": 0,
-						"w": 38,
-						"h": 36
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 36
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 36,
-						"h": 36
-					},
-					"frame": {
-						"x": 0,
-						"y": 36,
-						"w": 36,
-						"h": 36
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 36
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 36,
-						"h": 36
-					},
-					"frame": {
-						"x": 0,
-						"y": 36,
-						"w": 36,
-						"h": 36
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 36
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 38,
-						"h": 35
-					},
-					"frame": {
-						"x": 36,
-						"y": 36,
-						"w": 38,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 36
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 38,
-						"h": 35
-					},
-					"frame": {
-						"x": 36,
-						"y": 36,
-						"w": 38,
-						"h": 35
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:af761b040cc08a74363c20cbe1eaf31a:5814711e03aeb472bfa3250552523d75:a72e6c94514c750d7462eab6b08ee591$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 125, "y": 68, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 3, "w": 34, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 36, "y": 76, "w": 34, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 4, "w": 34, "h": 34 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 79, "y": 73, "w": 36, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 5, "w": 36, "h": 33 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 0, "y": 76, "w": 36, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 5, "w": 36, "h": 33 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 115, "y": 103, "w": 36, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 6, "w": 36, "h": 32 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 151, "y": 103, "w": 36, "h": 31 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 7, "w": 36, "h": 31 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 115, "y": 103, "w": 36, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 6, "w": 36, "h": 32 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 0, "y": 76, "w": 36, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 5, "w": 36, "h": 33 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 79, "y": 73, "w": 36, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 5, "w": 36, "h": 33 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 36, "y": 76, "w": 34, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 4, "w": 34, "h": 34 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 125, "y": 68, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 3, "w": 34, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 125, "y": 68, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 3, "w": 34, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 125, "y": 68, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 3, "w": 34, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 125, "y": 68, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 3, "w": 34, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 125, "y": 68, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 3, "w": 34, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 36, "y": 76, "w": 34, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 4, "w": 34, "h": 34 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 79, "y": 73, "w": 36, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 5, "w": 36, "h": 33 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 0, "y": 76, "w": 36, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 5, "w": 36, "h": 33 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 115, "y": 103, "w": 36, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 6, "w": 36, "h": 32 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 151, "y": 103, "w": 36, "h": 31 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 7, "w": 36, "h": 31 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 115, "y": 103, "w": 36, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 6, "w": 36, "h": 32 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 0, "y": 76, "w": 36, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 5, "w": 36, "h": 33 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 79, "y": 73, "w": 36, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 5, "w": 36, "h": 33 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 36, "y": 76, "w": 34, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 4, "w": 34, "h": 34 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 125, "y": 68, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 3, "w": 34, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 125, "y": 68, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 3, "w": 34, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 125, "y": 68, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 3, "w": 34, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 125, "y": 68, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 3, "w": 34, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 125, "y": 68, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 3, "w": 34, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 36, "y": 76, "w": 34, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 4, "w": 34, "h": 34 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 79, "y": 73, "w": 36, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 5, "w": 36, "h": 33 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 0, "y": 76, "w": 36, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 5, "w": 36, "h": 33 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 115, "y": 103, "w": 36, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 6, "w": 36, "h": 32 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 151, "y": 103, "w": 36, "h": 31 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 7, "w": 36, "h": 31 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 115, "y": 103, "w": 36, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 6, "w": 36, "h": 32 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 0, "y": 76, "w": 36, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 5, "w": 36, "h": 33 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 79, "y": 73, "w": 36, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 5, "w": 36, "h": 33 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 36, "y": 76, "w": 34, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 4, "w": 34, "h": 34 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 125, "y": 68, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 3, "w": 34, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 125, "y": 68, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 3, "w": 34, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 125, "y": 68, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 3, "w": 34, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 125, "y": 68, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 3, "w": 34, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 125, "y": 68, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 3, "w": 34, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 159, "y": 68, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 3, "w": 34, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 193, "y": 68, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 3, "w": 34, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 159, "y": 68, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 3, "w": 34, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 125, "y": 68, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 3, "w": 34, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 40, "y": 41, "w": 39, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 3, "w": 39, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 80, "y": 38, "w": 45, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 3, "w": 45, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 227, "y": 34, "w": 63, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 4, "w": 63, "h": 34 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 80, "y": 0, "w": 74, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 74, "h": 38 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 154, "y": 0, "w": 81, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 81, "h": 34 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 235, "y": 0, "w": 81, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 81, "h": 34 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 0, "y": 0, "w": 80, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 80, "h": 41 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 154, "y": 34, "w": 73, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 4, "w": 73, "h": 34 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 316, "y": 0, "w": 73, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 4, "w": 73, "h": 37 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 290, "y": 37, "w": 53, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 17, "y": 4, "w": 53, "h": 34 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 343, "y": 37, "w": 46, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 3, "w": 46, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 0, "y": 41, "w": 40, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 3, "w": 40, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 227, "y": 68, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 3, "w": 34, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 261, "y": 71, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 3, "w": 34, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 295, "y": 71, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 3, "w": 34, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 329, "y": 72, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 3, "w": 34, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 363, "y": 72, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 3, "w": 34, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 125, "y": 68, "w": 34, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 3, "w": 34, "h": 35 },
+    "sourceSize": { "w": 81, "h": 45 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "665.png",
+  "format": "I8",
+  "size": { "w": 397, "h": 135 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/shiny/665.png b/public/images/pokemon/exp/shiny/665.png
index 316ad902306..7046825ae59 100644
Binary files a/public/images/pokemon/exp/shiny/665.png and b/public/images/pokemon/exp/shiny/665.png differ
diff --git a/public/images/pokemon/exp/shiny/667.json b/public/images/pokemon/exp/shiny/667.json
index db076b1f465..3fba95afcf9 100644
--- a/public/images/pokemon/exp/shiny/667.json
+++ b/public/images/pokemon/exp/shiny/667.json
@@ -1,272 +1,659 @@
-{
-	"textures": [
-		{
-			"image": "667.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 160,
-				"h": 160
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 40,
-						"h": 46
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 40,
-						"h": 46
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 40,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 40,
-						"h": 46
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 40,
-						"h": 46
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 40,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 40,
-						"h": 46
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 40,
-						"h": 46
-					},
-					"frame": {
-						"x": 0,
-						"y": 46,
-						"w": 40,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 40,
-						"h": 46
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 40,
-						"h": 46
-					},
-					"frame": {
-						"x": 0,
-						"y": 92,
-						"w": 40,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 40,
-						"h": 46
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 40,
-						"h": 46
-					},
-					"frame": {
-						"x": 40,
-						"y": 0,
-						"w": 40,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 40,
-						"h": 46
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 40,
-						"h": 46
-					},
-					"frame": {
-						"x": 80,
-						"y": 0,
-						"w": 40,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 46
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 40,
-						"h": 45
-					},
-					"frame": {
-						"x": 120,
-						"y": 0,
-						"w": 40,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 46
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 40,
-						"h": 45
-					},
-					"frame": {
-						"x": 120,
-						"y": 0,
-						"w": 40,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 46
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 40,
-						"h": 45
-					},
-					"frame": {
-						"x": 120,
-						"y": 45,
-						"w": 40,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 46
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 40,
-						"h": 45
-					},
-					"frame": {
-						"x": 40,
-						"y": 90,
-						"w": 40,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 46
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 40,
-						"h": 44
-					},
-					"frame": {
-						"x": 40,
-						"y": 46,
-						"w": 40,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 46
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 40,
-						"h": 44
-					},
-					"frame": {
-						"x": 80,
-						"y": 46,
-						"w": 40,
-						"h": 44
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:fb79c9185dd67d4776808c312f36f7a4:a6c3c7cc2402b26f23f5ac4e23929ba7:02171d511e760c8a3e1b623ad6bf93f5$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 127, "y": 0, "w": 40, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 40, "h": 47 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 127, "y": 48, "w": 40, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 40, "h": 47 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 0, "y": 50, "w": 39, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 39, "h": 46 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 40, "y": 50, "w": 39, "h": 45 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 39, "h": 45 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 120, "y": 96, "w": 38, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 38, "h": 44 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 80, "y": 96, "w": 39, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 39, "h": 44 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 40, "y": 96, "w": 39, "h": 45 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 39, "h": 45 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 85, "y": 49, "w": 40, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 40, "h": 46 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 127, "y": 0, "w": 40, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 40, "h": 47 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 127, "y": 0, "w": 40, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 40, "h": 47 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 127, "y": 48, "w": 40, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 40, "h": 47 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 0, "y": 50, "w": 39, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 39, "h": 46 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 40, "y": 50, "w": 39, "h": 45 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 39, "h": 45 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 120, "y": 96, "w": 38, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 38, "h": 44 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 80, "y": 96, "w": 39, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 39, "h": 44 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 40, "y": 96, "w": 39, "h": 45 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 39, "h": 45 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 85, "y": 49, "w": 40, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 40, "h": 46 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 127, "y": 0, "w": 40, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 40, "h": 47 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 127, "y": 0, "w": 40, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 40, "h": 47 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 127, "y": 48, "w": 40, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 40, "h": 47 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 0, "y": 50, "w": 39, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 39, "h": 46 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 40, "y": 50, "w": 39, "h": 45 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 39, "h": 45 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 120, "y": 96, "w": 38, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 38, "h": 44 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 80, "y": 96, "w": 39, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 39, "h": 44 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 40, "y": 96, "w": 39, "h": 45 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 39, "h": 45 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 85, "y": 49, "w": 40, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 40, "h": 46 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 127, "y": 0, "w": 40, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 40, "h": 47 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 127, "y": 0, "w": 40, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 40, "h": 47 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 127, "y": 48, "w": 40, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 40, "h": 47 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 0, "y": 50, "w": 39, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 39, "h": 46 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 40, "y": 50, "w": 39, "h": 45 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 39, "h": 45 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 120, "y": 96, "w": 38, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 38, "h": 44 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 80, "y": 96, "w": 39, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 39, "h": 44 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 40, "y": 96, "w": 39, "h": 45 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 39, "h": 45 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 85, "y": 49, "w": 40, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 40, "h": 46 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 127, "y": 0, "w": 40, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 40, "h": 47 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 127, "y": 0, "w": 40, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 40, "h": 47 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 127, "y": 48, "w": 40, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 40, "h": 47 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 0, "y": 50, "w": 39, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 39, "h": 46 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 40, "y": 50, "w": 39, "h": 45 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 39, "h": 45 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 120, "y": 96, "w": 38, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 38, "h": 44 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 80, "y": 96, "w": 39, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 39, "h": 44 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 40, "y": 96, "w": 39, "h": 45 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 39, "h": 45 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 85, "y": 49, "w": 40, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 40, "h": 46 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 127, "y": 0, "w": 40, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 40, "h": 47 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 127, "y": 0, "w": 40, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 40, "h": 47 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 127, "y": 48, "w": 40, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 40, "h": 47 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 0, "y": 50, "w": 39, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 39, "h": 46 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 40, "y": 50, "w": 39, "h": 45 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 39, "h": 45 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 120, "y": 96, "w": 38, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 38, "h": 44 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 80, "y": 96, "w": 39, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 39, "h": 44 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 40, "y": 96, "w": 39, "h": 45 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 39, "h": 45 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 85, "y": 49, "w": 40, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 40, "h": 46 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 127, "y": 0, "w": 40, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 40, "h": 47 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 127, "y": 0, "w": 40, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 40, "h": 47 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 85, "y": 0, "w": 41, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 41, "h": 48 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 0, "y": 0, "w": 42, "h": 49 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 42, "h": 49 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 43, "y": 0, "w": 41, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 41, "h": 49 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 0, "y": 0, "w": 42, "h": 49 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 42, "h": 49 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 43, "y": 0, "w": 41, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 41, "h": 49 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 0, "y": 0, "w": 42, "h": 49 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 42, "h": 49 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 43, "y": 0, "w": 41, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 41, "h": 49 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 0, "y": 0, "w": 42, "h": 49 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 42, "h": 49 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 43, "y": 0, "w": 41, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 41, "h": 49 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 0, "y": 0, "w": 42, "h": 49 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 42, "h": 49 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 43, "y": 0, "w": 41, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 41, "h": 49 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 0, "y": 0, "w": 42, "h": 49 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 42, "h": 49 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 43, "y": 0, "w": 41, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 41, "h": 49 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 0, "y": 0, "w": 42, "h": 49 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 42, "h": 49 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 43, "y": 0, "w": 41, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 41, "h": 49 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 85, "y": 0, "w": 41, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 41, "h": 48 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 127, "y": 0, "w": 40, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 40, "h": 47 },
+    "sourceSize": { "w": 42, "h": 49 },
+    "duration": 110
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.11-x64",
+  "image": "667.png",
+  "format": "I8",
+  "size": { "w": 167, "h": 141 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/shiny/667.png b/public/images/pokemon/exp/shiny/667.png
index a0704b502c9..589f219c472 100644
Binary files a/public/images/pokemon/exp/shiny/667.png and b/public/images/pokemon/exp/shiny/667.png differ
diff --git a/public/images/pokemon/exp/shiny/668.json b/public/images/pokemon/exp/shiny/668.json
index 7e3f88c2276..63671a548a2 100644
--- a/public/images/pokemon/exp/shiny/668.json
+++ b/public/images/pokemon/exp/shiny/668.json
@@ -1,272 +1,821 @@
-{
-	"textures": [
-		{
-			"image": "668.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 205,
-				"h": 205
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 70,
-						"h": 70
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 70,
-						"h": 68
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 70,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 70,
-						"h": 70
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 70,
-						"h": 68
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 70,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 70,
-						"h": 70
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 70,
-						"h": 69
-					},
-					"frame": {
-						"x": 70,
-						"y": 0,
-						"w": 70,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 70,
-						"h": 70
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 70,
-						"h": 69
-					},
-					"frame": {
-						"x": 70,
-						"y": 0,
-						"w": 70,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 70,
-						"h": 70
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 70,
-						"h": 69
-					},
-					"frame": {
-						"x": 70,
-						"y": 0,
-						"w": 70,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 70,
-						"h": 70
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 70,
-						"h": 69
-					},
-					"frame": {
-						"x": 70,
-						"y": 0,
-						"w": 70,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 70,
-						"h": 70
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 70
-					},
-					"frame": {
-						"x": 0,
-						"y": 68,
-						"w": 67,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 70,
-						"h": 70
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 70
-					},
-					"frame": {
-						"x": 0,
-						"y": 68,
-						"w": 67,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 70,
-						"h": 70
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 69,
-						"h": 70
-					},
-					"frame": {
-						"x": 67,
-						"y": 69,
-						"w": 69,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 70,
-						"h": 70
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 69,
-						"h": 70
-					},
-					"frame": {
-						"x": 67,
-						"y": 69,
-						"w": 69,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 70,
-						"h": 70
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 69,
-						"h": 70
-					},
-					"frame": {
-						"x": 67,
-						"y": 69,
-						"w": 69,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 70,
-						"h": 70
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 69,
-						"h": 70
-					},
-					"frame": {
-						"x": 136,
-						"y": 69,
-						"w": 69,
-						"h": 70
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:fe9d35bc9a00c019cb84acf0c89b22a5:7d23425606ae8471a81a61d8fdec2fc9:947bf84d1af493c62e2cef45bb6c19ad$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 67, "y": 222, "w": 70, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 70, "h": 73 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 0, "y": 295, "w": 68, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 68, "h": 73 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 414, "y": 297, "w": 67, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 67, "h": 72 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 196, "y": 367, "w": 65, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 6, "w": 65, "h": 71 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 414, "y": 369, "w": 62, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 5, "w": 62, "h": 72 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 320, "y": 372, "w": 60, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 60, "h": 73 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 380, "y": 441, "w": 58, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 58, "h": 73 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 196, "y": 438, "w": 58, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 58, "h": 73 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 61, "y": 370, "w": 60, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 60, "h": 74 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 350, "y": 296, "w": 64, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 64, "h": 76 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 0, "y": 151, "w": 67, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 0, "w": 67, "h": 77 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 283, "y": 149, "w": 68, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 1, "w": 68, "h": 76 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 434, "y": 149, "w": 68, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 1, "w": 68, "h": 76 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 214, "y": 149, "w": 69, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 69, "h": 75 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 282, "y": 225, "w": 68, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 68, "h": 74 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 67, "y": 222, "w": 70, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 70, "h": 73 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 0, "y": 295, "w": 68, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 68, "h": 73 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 414, "y": 297, "w": 67, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 67, "h": 72 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 196, "y": 367, "w": 65, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 6, "w": 65, "h": 71 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 414, "y": 369, "w": 62, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 5, "w": 62, "h": 72 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 320, "y": 372, "w": 60, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 60, "h": 73 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 380, "y": 441, "w": 58, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 58, "h": 73 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 196, "y": 438, "w": 58, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 58, "h": 73 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 61, "y": 370, "w": 60, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 60, "h": 74 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 350, "y": 296, "w": 64, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 64, "h": 76 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 0, "y": 151, "w": 67, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 0, "w": 67, "h": 77 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 283, "y": 149, "w": 68, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 1, "w": 68, "h": 76 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 434, "y": 149, "w": 68, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 1, "w": 68, "h": 76 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 214, "y": 149, "w": 69, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 69, "h": 75 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 282, "y": 225, "w": 68, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 68, "h": 74 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 67, "y": 222, "w": 70, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 70, "h": 73 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 0, "y": 295, "w": 68, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 68, "h": 73 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 414, "y": 297, "w": 67, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 67, "h": 72 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 196, "y": 367, "w": 65, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 6, "w": 65, "h": 71 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 414, "y": 369, "w": 62, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 5, "w": 62, "h": 72 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 320, "y": 372, "w": 60, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 60, "h": 73 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 380, "y": 441, "w": 58, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 58, "h": 73 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 196, "y": 438, "w": 58, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 58, "h": 73 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 61, "y": 370, "w": 60, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 60, "h": 74 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 350, "y": 296, "w": 64, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 64, "h": 76 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 0, "y": 151, "w": 67, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 0, "w": 67, "h": 77 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 283, "y": 149, "w": 68, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 1, "w": 68, "h": 76 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 434, "y": 149, "w": 68, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 1, "w": 68, "h": 76 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 214, "y": 149, "w": 69, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 69, "h": 75 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 282, "y": 225, "w": 68, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 68, "h": 74 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 67, "y": 222, "w": 70, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 70, "h": 73 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 0, "y": 295, "w": 68, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 68, "h": 73 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 414, "y": 297, "w": 67, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 67, "h": 72 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 196, "y": 367, "w": 65, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 6, "w": 65, "h": 71 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 414, "y": 369, "w": 62, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 5, "w": 62, "h": 72 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 320, "y": 372, "w": 60, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 60, "h": 73 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 380, "y": 441, "w": 58, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 58, "h": 73 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 196, "y": 438, "w": 58, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 58, "h": 73 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 61, "y": 370, "w": 60, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 60, "h": 74 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 350, "y": 296, "w": 64, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 64, "h": 76 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 0, "y": 151, "w": 67, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 0, "w": 67, "h": 77 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 283, "y": 149, "w": 68, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 1, "w": 68, "h": 76 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 434, "y": 149, "w": 68, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 1, "w": 68, "h": 76 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 214, "y": 149, "w": 69, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 69, "h": 75 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 282, "y": 225, "w": 68, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 68, "h": 74 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 351, "y": 151, "w": 70, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 70, "h": 73 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 142, "y": 221, "w": 70, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 70, "h": 73 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 351, "y": 224, "w": 70, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 70, "h": 72 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 421, "y": 225, "w": 69, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 69, "h": 72 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 205, "y": 296, "w": 69, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 69, "h": 71 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 212, "y": 224, "w": 70, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 70, "h": 72 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 137, "y": 294, "w": 68, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 68, "h": 73 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 274, "y": 299, "w": 64, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 64, "h": 73 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 0, "y": 368, "w": 61, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 61, "h": 74 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 0, "y": 442, "w": 55, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 55, "h": 74 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 438, "y": 441, "w": 55, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 55, "h": 75 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 261, "y": 372, "w": 59, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 59, "h": 75 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 134, "y": 367, "w": 62, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 62, "h": 75 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 68, "y": 295, "w": 66, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 66, "h": 75 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 365, "y": 75, "w": 69, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 69, "h": 76 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 0, "y": 75, "w": 71, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 71, "h": 76 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 442, "y": 74, "w": 72, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 72, "h": 75 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 221, "y": 74, "w": 72, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 72, "h": 75 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 369, "y": 0, "w": 73, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 73, "h": 75 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 296, "y": 0, "w": 73, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 73, "h": 75 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 74, "y": 0, "w": 74, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 74, "h": 75 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 0, "y": 0, "w": 74, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 74, "h": 75 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 148, "y": 0, "w": 74, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 74, "h": 74 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 148, "y": 74, "w": 73, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 73, "h": 74 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 222, "y": 0, "w": 74, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 74, "h": 74 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 442, "y": 0, "w": 73, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 73, "h": 74 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 293, "y": 75, "w": 72, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 72, "h": 74 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0088.png",
+    "frame": { "x": 71, "y": 75, "w": 72, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 72, "h": 74 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0089.png",
+    "frame": { "x": 71, "y": 149, "w": 71, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 71, "h": 73 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0090.png",
+    "frame": { "x": 143, "y": 148, "w": 71, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 71, "h": 73 },
+    "sourceSize": { "w": 79, "h": 77 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.11-x64",
+  "image": "668.png",
+  "format": "I8",
+  "size": { "w": 515, "h": 516 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/shiny/668.png b/public/images/pokemon/exp/shiny/668.png
index eaf8428625f..4cac3d1d582 100644
Binary files a/public/images/pokemon/exp/shiny/668.png and b/public/images/pokemon/exp/shiny/668.png differ
diff --git a/public/images/pokemon/exp/shiny/672.json b/public/images/pokemon/exp/shiny/672.json
index 67914bce1a9..f337bef7d29 100644
--- a/public/images/pokemon/exp/shiny/672.json
+++ b/public/images/pokemon/exp/shiny/672.json
@@ -1,965 +1,479 @@
-{
-	"textures": [
-		{
-			"image": "672.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 250,
-				"h": 250
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0033.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 38,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 38,
-						"h": 42
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 38,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0034.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 38,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 38,
-						"h": 42
-					},
-					"frame": {
-						"x": 38,
-						"y": 0,
-						"w": 38,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0035.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 38,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 38,
-						"h": 42
-					},
-					"frame": {
-						"x": 76,
-						"y": 0,
-						"w": 38,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0036.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 38,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 38,
-						"h": 42
-					},
-					"frame": {
-						"x": 114,
-						"y": 0,
-						"w": 38,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0037.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 38,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 38,
-						"h": 42
-					},
-					"frame": {
-						"x": 152,
-						"y": 0,
-						"w": 38,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0038.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 38,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 38,
-						"h": 42
-					},
-					"frame": {
-						"x": 190,
-						"y": 0,
-						"w": 38,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0039.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 38,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 38,
-						"h": 42
-					},
-					"frame": {
-						"x": 0,
-						"y": 42,
-						"w": 38,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0040.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 38,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 38,
-						"h": 42
-					},
-					"frame": {
-						"x": 38,
-						"y": 42,
-						"w": 38,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0041.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 38,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 38,
-						"h": 42
-					},
-					"frame": {
-						"x": 76,
-						"y": 42,
-						"w": 38,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0030.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 42
-					},
-					"frame": {
-						"x": 114,
-						"y": 42,
-						"w": 37,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0031.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 42
-					},
-					"frame": {
-						"x": 151,
-						"y": 42,
-						"w": 37,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0032.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 42
-					},
-					"frame": {
-						"x": 188,
-						"y": 42,
-						"w": 37,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0042.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 37,
-						"h": 42
-					},
-					"frame": {
-						"x": 0,
-						"y": 84,
-						"w": 37,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 36,
-						"h": 42
-					},
-					"frame": {
-						"x": 37,
-						"y": 84,
-						"w": 36,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 36,
-						"h": 42
-					},
-					"frame": {
-						"x": 37,
-						"y": 84,
-						"w": 36,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 36,
-						"h": 42
-					},
-					"frame": {
-						"x": 37,
-						"y": 84,
-						"w": 36,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 36,
-						"h": 42
-					},
-					"frame": {
-						"x": 37,
-						"y": 84,
-						"w": 36,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 36,
-						"h": 42
-					},
-					"frame": {
-						"x": 37,
-						"y": 84,
-						"w": 36,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 36,
-						"h": 42
-					},
-					"frame": {
-						"x": 37,
-						"y": 84,
-						"w": 36,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0045.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 36,
-						"h": 42
-					},
-					"frame": {
-						"x": 37,
-						"y": 84,
-						"w": 36,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 36,
-						"h": 42
-					},
-					"frame": {
-						"x": 73,
-						"y": 84,
-						"w": 36,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 36,
-						"h": 42
-					},
-					"frame": {
-						"x": 73,
-						"y": 84,
-						"w": 36,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 36,
-						"h": 42
-					},
-					"frame": {
-						"x": 73,
-						"y": 84,
-						"w": 36,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 36,
-						"h": 42
-					},
-					"frame": {
-						"x": 109,
-						"y": 84,
-						"w": 36,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 36,
-						"h": 42
-					},
-					"frame": {
-						"x": 109,
-						"y": 84,
-						"w": 36,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 36,
-						"h": 42
-					},
-					"frame": {
-						"x": 145,
-						"y": 84,
-						"w": 36,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 36,
-						"h": 42
-					},
-					"frame": {
-						"x": 181,
-						"y": 84,
-						"w": 36,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0025.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 36,
-						"h": 42
-					},
-					"frame": {
-						"x": 0,
-						"y": 126,
-						"w": 36,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0027.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 36,
-						"h": 42
-					},
-					"frame": {
-						"x": 36,
-						"y": 126,
-						"w": 36,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0028.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 36,
-						"h": 42
-					},
-					"frame": {
-						"x": 72,
-						"y": 126,
-						"w": 36,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0029.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 36,
-						"h": 42
-					},
-					"frame": {
-						"x": 108,
-						"y": 126,
-						"w": 36,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0043.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 36,
-						"h": 42
-					},
-					"frame": {
-						"x": 144,
-						"y": 126,
-						"w": 36,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0044.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 36,
-						"h": 42
-					},
-					"frame": {
-						"x": 180,
-						"y": 126,
-						"w": 36,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 36,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 168,
-						"w": 36,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 36,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 168,
-						"w": 36,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 36,
-						"h": 41
-					},
-					"frame": {
-						"x": 36,
-						"y": 168,
-						"w": 36,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 36,
-						"h": 41
-					},
-					"frame": {
-						"x": 72,
-						"y": 168,
-						"w": 36,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 36,
-						"h": 41
-					},
-					"frame": {
-						"x": 108,
-						"y": 168,
-						"w": 36,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 36,
-						"h": 41
-					},
-					"frame": {
-						"x": 108,
-						"y": 168,
-						"w": 36,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 36,
-						"h": 41
-					},
-					"frame": {
-						"x": 144,
-						"y": 168,
-						"w": 36,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 35,
-						"h": 42
-					},
-					"frame": {
-						"x": 180,
-						"y": 168,
-						"w": 35,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 35,
-						"h": 42
-					},
-					"frame": {
-						"x": 180,
-						"y": 168,
-						"w": 35,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0026.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 35,
-						"h": 42
-					},
-					"frame": {
-						"x": 215,
-						"y": 168,
-						"w": 35,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 36,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 209,
-						"w": 36,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 36,
-						"h": 41
-					},
-					"frame": {
-						"x": 36,
-						"y": 209,
-						"w": 36,
-						"h": 41
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:6fbd68ddc96f5b89a1e22b8dd6bbb4a7:2f673cdac5630b38377caf1ee3b82a60:2e4767b7cd134fc0ab1bb6e9eee82bc7$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 86, "y": 0, "w": 42, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 42, "h": 50 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 127, "y": 50, "w": 42, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 9, "w": 42, "h": 49 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 0, "y": 54, "w": 42, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 10, "w": 42, "h": 48 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 43, "y": 53, "w": 43, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 11, "w": 43, "h": 47 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 124, "y": 148, "w": 43, "h": 45 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 13, "w": 43, "h": 45 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 0, "y": 102, "w": 42, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 11, "w": 42, "h": 47 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 0, "y": 54, "w": 42, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 10, "w": 42, "h": 48 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 127, "y": 99, "w": 41, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 9, "w": 41, "h": 49 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 128, "y": 0, "w": 42, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 42, "h": 50 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 86, "y": 0, "w": 42, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 42, "h": 50 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 86, "y": 0, "w": 42, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 42, "h": 50 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 127, "y": 50, "w": 42, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 9, "w": 42, "h": 49 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 0, "y": 54, "w": 42, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 10, "w": 42, "h": 48 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 43, "y": 53, "w": 43, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 11, "w": 43, "h": 47 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 124, "y": 148, "w": 43, "h": 45 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 13, "w": 43, "h": 45 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 0, "y": 102, "w": 42, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 11, "w": 42, "h": 47 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 0, "y": 54, "w": 42, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 10, "w": 42, "h": 48 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 127, "y": 99, "w": 41, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 9, "w": 41, "h": 49 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 128, "y": 0, "w": 42, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 42, "h": 50 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 86, "y": 0, "w": 42, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 42, "h": 50 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 86, "y": 0, "w": 42, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 42, "h": 50 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 127, "y": 50, "w": 42, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 9, "w": 42, "h": 49 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 0, "y": 54, "w": 42, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 10, "w": 42, "h": 48 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 43, "y": 53, "w": 43, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 11, "w": 43, "h": 47 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 124, "y": 148, "w": 43, "h": 45 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 13, "w": 43, "h": 45 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 0, "y": 102, "w": 42, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 11, "w": 42, "h": 47 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 0, "y": 54, "w": 42, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 10, "w": 42, "h": 48 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 127, "y": 99, "w": 41, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 9, "w": 41, "h": 49 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 128, "y": 0, "w": 42, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 42, "h": 50 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 86, "y": 0, "w": 42, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 42, "h": 50 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 86, "y": 0, "w": 42, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 42, "h": 50 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 127, "y": 50, "w": 42, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 9, "w": 42, "h": 49 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 0, "y": 54, "w": 42, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 10, "w": 42, "h": 48 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 43, "y": 53, "w": 43, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 11, "w": 43, "h": 47 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 124, "y": 148, "w": 43, "h": 45 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 13, "w": 43, "h": 45 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 0, "y": 102, "w": 42, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 11, "w": 42, "h": 47 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 0, "y": 54, "w": 42, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 10, "w": 42, "h": 48 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 127, "y": 99, "w": 41, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 9, "w": 41, "h": 49 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 128, "y": 0, "w": 42, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 42, "h": 50 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 86, "y": 0, "w": 42, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 42, "h": 50 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 86, "y": 0, "w": 42, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 42, "h": 50 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 43, "y": 0, "w": 43, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 43, "h": 53 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 0, "y": 0, "w": 43, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 43, "h": 54 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 42, "y": 100, "w": 41, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 9, "w": 41, "h": 49 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 86, "y": 50, "w": 41, "h": 51 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 41, "h": 51 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 86, "y": 0, "w": 42, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 42, "h": 50 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 86, "y": 0, "w": 42, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 42, "h": 50 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 43, "y": 0, "w": 43, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 43, "h": 53 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 0, "y": 0, "w": 43, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 43, "h": 54 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 83, "y": 101, "w": 41, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 9, "w": 41, "h": 49 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 86, "y": 50, "w": 41, "h": 51 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 41, "h": 51 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 86, "y": 0, "w": 42, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 42, "h": 50 },
+    "sourceSize": { "w": 44, "h": 58 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.11-x64",
+  "image": "672.png",
+  "format": "I8",
+  "size": { "w": 170, "h": 193 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/shiny/672.png b/public/images/pokemon/exp/shiny/672.png
index 51c0e68da6c..605e79f1889 100644
Binary files a/public/images/pokemon/exp/shiny/672.png and b/public/images/pokemon/exp/shiny/672.png differ
diff --git a/public/images/pokemon/exp/shiny/674.json b/public/images/pokemon/exp/shiny/674.json
deleted file mode 100644
index 26013ad137f..00000000000
--- a/public/images/pokemon/exp/shiny/674.json
+++ /dev/null
@@ -1,524 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "674.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 90,
-				"h": 90
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 30,
-						"h": 40
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 30,
-						"h": 40
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 30,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 30,
-						"h": 40
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 30,
-						"h": 40
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 30,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 30,
-						"h": 40
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 30,
-						"h": 40
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 30,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 30,
-						"h": 40
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 30,
-						"h": 40
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 30,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 30,
-						"h": 40
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 30,
-						"h": 40
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 30,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 30,
-						"h": 40
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 30,
-						"h": 40
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 30,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 30,
-						"h": 40
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 30,
-						"h": 39
-					},
-					"frame": {
-						"x": 0,
-						"y": 40,
-						"w": 30,
-						"h": 39
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 30,
-						"h": 40
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 30,
-						"h": 39
-					},
-					"frame": {
-						"x": 0,
-						"y": 40,
-						"w": 30,
-						"h": 39
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 30,
-						"h": 40
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 30,
-						"h": 39
-					},
-					"frame": {
-						"x": 0,
-						"y": 40,
-						"w": 30,
-						"h": 39
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 30,
-						"h": 40
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 30,
-						"h": 39
-					},
-					"frame": {
-						"x": 0,
-						"y": 40,
-						"w": 30,
-						"h": 39
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 30,
-						"h": 40
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 30,
-						"h": 39
-					},
-					"frame": {
-						"x": 0,
-						"y": 40,
-						"w": 30,
-						"h": 39
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 30,
-						"h": 40
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 30,
-						"h": 39
-					},
-					"frame": {
-						"x": 0,
-						"y": 40,
-						"w": 30,
-						"h": 39
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 30,
-						"h": 40
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 30,
-						"h": 39
-					},
-					"frame": {
-						"x": 0,
-						"y": 40,
-						"w": 30,
-						"h": 39
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 30,
-						"h": 40
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 30,
-						"h": 39
-					},
-					"frame": {
-						"x": 0,
-						"y": 40,
-						"w": 30,
-						"h": 39
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 30,
-						"h": 40
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 30,
-						"h": 39
-					},
-					"frame": {
-						"x": 0,
-						"y": 40,
-						"w": 30,
-						"h": 39
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 30,
-						"h": 40
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 30,
-						"h": 39
-					},
-					"frame": {
-						"x": 0,
-						"y": 40,
-						"w": 30,
-						"h": 39
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 30,
-						"h": 40
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 30,
-						"h": 39
-					},
-					"frame": {
-						"x": 30,
-						"y": 0,
-						"w": 30,
-						"h": 39
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 30,
-						"h": 40
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 30,
-						"h": 39
-					},
-					"frame": {
-						"x": 30,
-						"y": 0,
-						"w": 30,
-						"h": 39
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 30,
-						"h": 40
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 30,
-						"h": 37
-					},
-					"frame": {
-						"x": 60,
-						"y": 0,
-						"w": 30,
-						"h": 37
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 30,
-						"h": 40
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 30,
-						"h": 37
-					},
-					"frame": {
-						"x": 60,
-						"y": 0,
-						"w": 30,
-						"h": 37
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 30,
-						"h": 40
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 30,
-						"h": 37
-					},
-					"frame": {
-						"x": 60,
-						"y": 0,
-						"w": 30,
-						"h": 37
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 30,
-						"h": 40
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 30,
-						"h": 37
-					},
-					"frame": {
-						"x": 60,
-						"y": 0,
-						"w": 30,
-						"h": 37
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 30,
-						"h": 40
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 30,
-						"h": 37
-					},
-					"frame": {
-						"x": 60,
-						"y": 37,
-						"w": 30,
-						"h": 37
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 30,
-						"h": 40
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 30,
-						"h": 37
-					},
-					"frame": {
-						"x": 60,
-						"y": 37,
-						"w": 30,
-						"h": 37
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:a2f25cc68caea7219a96b563bb024d37:e8428456d1d23ad84ab9684dafd116b9:b823d10f1c9b4d501296982088ba63d6$"
-	}
-}
diff --git a/public/images/pokemon/exp/shiny/674.png b/public/images/pokemon/exp/shiny/674.png
deleted file mode 100644
index b32b56ecd8d..00000000000
Binary files a/public/images/pokemon/exp/shiny/674.png and /dev/null differ
diff --git a/public/images/pokemon/exp/shiny/692.json b/public/images/pokemon/exp/shiny/692.json
index 6d64cba2430..86b535260ae 100644
--- a/public/images/pokemon/exp/shiny/692.json
+++ b/public/images/pokemon/exp/shiny/692.json
@@ -1,356 +1,794 @@
-{
-	"textures": [
-		{
-			"image": "692.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 162,
-				"h": 162
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 60,
-						"h": 41
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 60,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 60,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 60,
-						"h": 41
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 60,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 60,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 60,
-						"h": 41
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 60,
-						"h": 41
-					},
-					"frame": {
-						"x": 60,
-						"y": 0,
-						"w": 60,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 60,
-						"h": 41
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 60,
-						"h": 41
-					},
-					"frame": {
-						"x": 60,
-						"y": 0,
-						"w": 60,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 60,
-						"h": 41
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 60,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 41,
-						"w": 60,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 60,
-						"h": 41
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 60,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 41,
-						"w": 60,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 60,
-						"h": 41
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 60,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 82,
-						"w": 60,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 60,
-						"h": 41
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 60,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 82,
-						"w": 60,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 60,
-						"h": 41
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 60,
-						"h": 39
-					},
-					"frame": {
-						"x": 0,
-						"y": 123,
-						"w": 60,
-						"h": 39
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 60,
-						"h": 41
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 60,
-						"h": 39
-					},
-					"frame": {
-						"x": 0,
-						"y": 123,
-						"w": 60,
-						"h": 39
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 60,
-						"h": 41
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 60,
-						"h": 39
-					},
-					"frame": {
-						"x": 60,
-						"y": 41,
-						"w": 60,
-						"h": 39
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 60,
-						"h": 41
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 60,
-						"h": 39
-					},
-					"frame": {
-						"x": 60,
-						"y": 41,
-						"w": 60,
-						"h": 39
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 60,
-						"h": 41
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 60,
-						"h": 39
-					},
-					"frame": {
-						"x": 60,
-						"y": 41,
-						"w": 60,
-						"h": 39
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 60,
-						"h": 41
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 60,
-						"h": 39
-					},
-					"frame": {
-						"x": 60,
-						"y": 41,
-						"w": 60,
-						"h": 39
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 60,
-						"h": 41
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 59,
-						"h": 41
-					},
-					"frame": {
-						"x": 60,
-						"y": 80,
-						"w": 59,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 60,
-						"h": 41
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 59,
-						"h": 41
-					},
-					"frame": {
-						"x": 60,
-						"y": 121,
-						"w": 59,
-						"h": 41
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:fc9e6abcf70d6b35f1c403837c5312e8:2e67d61083a20d6c59dae4299718afc0:2880def858c84cd859bedf13b0b49a33$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 121, "y": 36, "w": 56, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 121, "y": 36, "w": 56, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 60, "y": 37, "w": 56, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 181, "y": 1, "w": 57, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 57, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 181, "y": 1, "w": 57, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 57, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 1, "y": 36, "w": 58, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 58, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 1, "y": 36, "w": 58, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 58, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 121, "y": 1, "w": 59, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 59, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 121, "y": 1, "w": 59, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 59, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 1, "y": 36, "w": 58, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 58, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 1, "y": 36, "w": 58, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 58, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 181, "y": 1, "w": 57, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 57, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 181, "y": 1, "w": 57, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 57, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 60, "y": 37, "w": 56, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 121, "y": 36, "w": 56, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 121, "y": 36, "w": 56, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 121, "y": 36, "w": 56, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 121, "y": 36, "w": 56, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 60, "y": 37, "w": 56, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 181, "y": 1, "w": 57, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 57, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 181, "y": 1, "w": 57, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 57, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 1, "y": 36, "w": 58, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 58, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 1, "y": 36, "w": 58, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 58, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 121, "y": 1, "w": 59, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 59, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 121, "y": 1, "w": 59, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 59, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 1, "y": 36, "w": 58, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 58, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 1, "y": 36, "w": 58, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 58, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 181, "y": 1, "w": 57, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 57, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 181, "y": 1, "w": 57, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 57, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 60, "y": 37, "w": 56, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 121, "y": 36, "w": 56, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 121, "y": 36, "w": 56, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 121, "y": 36, "w": 56, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 121, "y": 36, "w": 56, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 60, "y": 37, "w": 56, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 181, "y": 1, "w": 57, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 57, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 181, "y": 1, "w": 57, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 57, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 1, "y": 36, "w": 58, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 58, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 1, "y": 36, "w": 58, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 58, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 121, "y": 1, "w": 59, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 59, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 121, "y": 1, "w": 59, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 59, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 1, "y": 36, "w": 58, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 58, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 1, "y": 36, "w": 58, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 58, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 181, "y": 1, "w": 57, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 57, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 181, "y": 1, "w": 57, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 57, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 60, "y": 37, "w": 56, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 121, "y": 36, "w": 56, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 121, "y": 36, "w": 56, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 121, "y": 36, "w": 56, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 121, "y": 36, "w": 56, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 60, "y": 37, "w": 56, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 181, "y": 1, "w": 57, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 57, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 181, "y": 1, "w": 57, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 57, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 1, "y": 36, "w": 58, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 58, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 1, "y": 36, "w": 58, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 58, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 121, "y": 1, "w": 59, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 59, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 121, "y": 1, "w": 59, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 59, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 1, "y": 36, "w": 58, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 58, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 1, "y": 36, "w": 58, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 58, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 181, "y": 1, "w": 57, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 57, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 181, "y": 1, "w": 57, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 57, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 60, "y": 37, "w": 56, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 121, "y": 36, "w": 56, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 121, "y": 36, "w": 56, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 178, "y": 37, "w": 56, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 178, "y": 37, "w": 56, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 62, "y": 1, "w": 58, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 58, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 62, "y": 1, "w": 58, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 58, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 1, "y": 1, "w": 60, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 60, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 1, "y": 1, "w": 60, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 60, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 1, "y": 1, "w": 60, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 60, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 1, "y": 1, "w": 60, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 60, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 1, "y": 1, "w": 60, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 60, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 1, "y": 71, "w": 57, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 2, "w": 57, "h": 33 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 1, "y": 71, "w": 57, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 2, "w": 57, "h": 33 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 117, "y": 72, "w": 59, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 59, "h": 33 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 1, "y": 1, "w": 60, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 60, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 1, "y": 1, "w": 60, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 60, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 1, "y": 1, "w": 60, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 60, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 1, "y": 1, "w": 60, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 60, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 1, "y": 1, "w": 60, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 60, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 1, "y": 1, "w": 60, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 60, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 1, "y": 1, "w": 60, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 60, "h": 34 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 62, "y": 1, "w": 58, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 58, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 62, "y": 1, "w": 58, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 58, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 178, "y": 37, "w": 56, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 178, "y": 37, "w": 56, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 56, "h": 35 },
+    "sourceSize": { "w": 63, "h": 35 },
+    "duration": 50
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "692.png",
+  "format": "I8",
+  "size": { "w": 239, "h": 106 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/shiny/692.png b/public/images/pokemon/exp/shiny/692.png
index 46cb7ca0f35..d46c585bdfb 100644
Binary files a/public/images/pokemon/exp/shiny/692.png and b/public/images/pokemon/exp/shiny/692.png differ
diff --git a/public/images/pokemon/exp/shiny/693.json b/public/images/pokemon/exp/shiny/693.json
index 991a16f1e53..c8f7763de1d 100644
--- a/public/images/pokemon/exp/shiny/693.json
+++ b/public/images/pokemon/exp/shiny/693.json
@@ -1,272 +1,902 @@
-{
-	"textures": [
-		{
-			"image": "693.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 259,
-				"h": 259
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 92,
-						"h": 89
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 86,
-						"h": 89
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 86,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 92,
-						"h": 89
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 86,
-						"h": 89
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 86,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 92,
-						"h": 89
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 85,
-						"h": 89
-					},
-					"frame": {
-						"x": 0,
-						"y": 89,
-						"w": 85,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 92,
-						"h": 89
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 85,
-						"h": 89
-					},
-					"frame": {
-						"x": 0,
-						"y": 89,
-						"w": 85,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 92,
-						"h": 89
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 85,
-						"h": 89
-					},
-					"frame": {
-						"x": 86,
-						"y": 0,
-						"w": 85,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 92,
-						"h": 89
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 85,
-						"h": 89
-					},
-					"frame": {
-						"x": 86,
-						"y": 0,
-						"w": 85,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 92,
-						"h": 89
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 85,
-						"h": 89
-					},
-					"frame": {
-						"x": 85,
-						"y": 89,
-						"w": 85,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 92,
-						"h": 89
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 85,
-						"h": 88
-					},
-					"frame": {
-						"x": 171,
-						"y": 0,
-						"w": 85,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 92,
-						"h": 89
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 85,
-						"h": 88
-					},
-					"frame": {
-						"x": 171,
-						"y": 0,
-						"w": 85,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 92,
-						"h": 89
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 8,
-						"w": 91,
-						"h": 80
-					},
-					"frame": {
-						"x": 0,
-						"y": 178,
-						"w": 91,
-						"h": 80
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 92,
-						"h": 89
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 5,
-						"w": 89,
-						"h": 83
-					},
-					"frame": {
-						"x": 170,
-						"y": 89,
-						"w": 89,
-						"h": 83
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 92,
-						"h": 89
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 5,
-						"w": 89,
-						"h": 83
-					},
-					"frame": {
-						"x": 170,
-						"y": 89,
-						"w": 89,
-						"h": 83
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:ab498798f30c4ef93c4c30affa037f2e:aef6fdb8988ea3ebf127e38fb4875bad:9c1f9147e693c05eb4655590e9099679$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 208, "y": 78, "w": 95, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 95, "h": 76 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 416, "y": 214, "w": 91, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 1, "w": 91, "h": 76 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 405, "y": 145, "w": 103, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 9, "w": 103, "h": 69 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 207, "y": 344, "w": 105, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 17, "w": 105, "h": 62 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 507, "y": 285, "w": 105, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 18, "w": 105, "h": 63 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 412, "y": 1, "w": 104, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 13, "w": 104, "h": 71 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 1, "y": 145, "w": 99, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 14, "w": 99, "h": 72 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 1, "y": 76, "w": 105, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 21, "w": 105, "h": 69 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 507, "y": 219, "w": 104, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 24, "w": 104, "h": 66 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 1, "y": 283, "w": 102, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 23, "w": 102, "h": 66 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 207, "y": 1, "w": 99, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 10, "w": 99, "h": 77 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 517, "y": 74, "w": 93, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 7, "w": 93, "h": 78 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 106, "y": 78, "w": 102, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 12, "w": 102, "h": 71 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 421, "y": 348, "w": 102, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 19, "w": 102, "h": 63 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 312, "y": 354, "w": 100, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 18, "w": 100, "h": 61 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 208, "y": 78, "w": 95, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 95, "h": 76 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 416, "y": 214, "w": 91, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 1, "w": 91, "h": 76 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 405, "y": 145, "w": 103, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 9, "w": 103, "h": 69 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 207, "y": 344, "w": 105, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 17, "w": 105, "h": 62 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 507, "y": 285, "w": 105, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 18, "w": 105, "h": 63 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 412, "y": 1, "w": 104, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 13, "w": 104, "h": 71 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 1, "y": 145, "w": 99, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 14, "w": 99, "h": 72 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 1, "y": 76, "w": 105, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 21, "w": 105, "h": 69 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 507, "y": 219, "w": 104, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 24, "w": 104, "h": 66 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 1, "y": 283, "w": 102, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 23, "w": 102, "h": 66 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 207, "y": 1, "w": 99, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 10, "w": 99, "h": 77 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 517, "y": 74, "w": 93, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 7, "w": 93, "h": 78 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 106, "y": 78, "w": 102, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 12, "w": 102, "h": 71 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 421, "y": 348, "w": 102, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 19, "w": 102, "h": 63 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 312, "y": 354, "w": 100, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 18, "w": 100, "h": 61 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 208, "y": 78, "w": 95, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 95, "h": 76 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 416, "y": 214, "w": 91, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 1, "w": 91, "h": 76 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 405, "y": 145, "w": 103, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 9, "w": 103, "h": 69 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 207, "y": 344, "w": 105, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 17, "w": 105, "h": 62 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 507, "y": 285, "w": 105, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 18, "w": 105, "h": 63 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 412, "y": 1, "w": 104, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 13, "w": 104, "h": 71 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 1, "y": 145, "w": 99, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 14, "w": 99, "h": 72 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 1, "y": 76, "w": 105, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 21, "w": 105, "h": 69 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 507, "y": 219, "w": 104, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 24, "w": 104, "h": 66 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 1, "y": 283, "w": 102, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 23, "w": 102, "h": 66 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 207, "y": 1, "w": 99, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 10, "w": 99, "h": 77 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 517, "y": 74, "w": 93, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 7, "w": 93, "h": 78 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 106, "y": 78, "w": 102, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 12, "w": 102, "h": 71 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 421, "y": 348, "w": 102, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 19, "w": 102, "h": 63 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 312, "y": 354, "w": 100, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 18, "w": 100, "h": 61 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 208, "y": 78, "w": 95, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 95, "h": 76 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 416, "y": 214, "w": 91, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 1, "w": 91, "h": 76 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 405, "y": 145, "w": 103, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 9, "w": 103, "h": 69 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 207, "y": 344, "w": 105, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 17, "w": 105, "h": 62 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 507, "y": 285, "w": 105, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 18, "w": 105, "h": 63 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 412, "y": 1, "w": 104, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 13, "w": 104, "h": 71 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 1, "y": 145, "w": 99, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 14, "w": 99, "h": 72 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 1, "y": 76, "w": 105, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 21, "w": 105, "h": 69 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 507, "y": 219, "w": 104, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 24, "w": 104, "h": 66 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 1, "y": 283, "w": 102, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 23, "w": 102, "h": 66 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 207, "y": 1, "w": 99, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 10, "w": 99, "h": 77 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 517, "y": 74, "w": 93, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 7, "w": 93, "h": 78 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 106, "y": 78, "w": 102, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 12, "w": 102, "h": 71 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 421, "y": 348, "w": 102, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 19, "w": 102, "h": 63 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 312, "y": 354, "w": 100, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 18, "w": 100, "h": 61 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 208, "y": 78, "w": 95, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 95, "h": 76 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 416, "y": 214, "w": 91, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 1, "w": 91, "h": 76 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 405, "y": 145, "w": 103, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 9, "w": 103, "h": 69 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 207, "y": 344, "w": 105, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 17, "w": 105, "h": 62 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 507, "y": 285, "w": 105, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 18, "w": 105, "h": 63 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 412, "y": 1, "w": 104, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 13, "w": 104, "h": 71 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 1, "y": 145, "w": 99, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 14, "w": 99, "h": 72 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 1, "y": 76, "w": 105, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 21, "w": 105, "h": 69 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 507, "y": 219, "w": 104, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 24, "w": 104, "h": 66 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 1, "y": 283, "w": 102, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 23, "w": 102, "h": 66 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 207, "y": 1, "w": 99, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 10, "w": 99, "h": 77 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 517, "y": 74, "w": 93, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 7, "w": 93, "h": 78 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 106, "y": 78, "w": 102, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 12, "w": 102, "h": 71 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 421, "y": 348, "w": 102, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 19, "w": 102, "h": 63 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 312, "y": 354, "w": 100, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 18, "w": 100, "h": 61 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 208, "y": 78, "w": 95, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 95, "h": 76 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 303, "y": 140, "w": 102, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 5, "w": 102, "h": 70 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 523, "y": 348, "w": 102, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 11, "w": 102, "h": 63 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 318, "y": 290, "w": 103, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 7, "w": 103, "h": 64 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 105, "y": 1, "w": 102, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 0, "w": 102, "h": 75 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 306, "y": 72, "w": 108, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 14, "w": 108, "h": 68 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 108, "y": 276, "w": 105, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 14, "w": 105, "h": 65 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 1, "y": 1, "w": 104, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 8, "w": 104, "h": 74 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 203, "y": 210, "w": 106, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 13, "w": 106, "h": 66 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 508, "y": 152, "w": 106, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 15, "w": 106, "h": 67 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 414, "y": 74, "w": 103, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 8, "w": 103, "h": 71 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 306, "y": 72, "w": 108, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 14, "w": 108, "h": 68 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0088.png",
+    "frame": { "x": 108, "y": 276, "w": 105, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 14, "w": 105, "h": 65 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0089.png",
+    "frame": { "x": 1, "y": 1, "w": 104, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 8, "w": 104, "h": 74 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0090.png",
+    "frame": { "x": 203, "y": 210, "w": 106, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 13, "w": 106, "h": 66 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0091.png",
+    "frame": { "x": 309, "y": 214, "w": 107, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 14, "w": 107, "h": 65 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0092.png",
+    "frame": { "x": 306, "y": 1, "w": 106, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 9, "w": 106, "h": 70 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0093.png",
+    "frame": { "x": 1, "y": 218, "w": 107, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 14, "w": 107, "h": 65 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0094.png",
+    "frame": { "x": 213, "y": 279, "w": 105, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 14, "w": 105, "h": 65 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0095.png",
+    "frame": { "x": 103, "y": 341, "w": 104, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 15, "w": 104, "h": 63 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0096.png",
+    "frame": { "x": 516, "y": 1, "w": 101, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 5, "w": 101, "h": 73 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0097.png",
+    "frame": { "x": 100, "y": 149, "w": 103, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 9, "w": 103, "h": 69 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0098.png",
+    "frame": { "x": 1, "y": 349, "w": 102, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 16, "w": 102, "h": 62 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   },
+   {
+    "filename": "0099.png",
+    "frame": { "x": 103, "y": 404, "w": 100, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 16, "w": 100, "h": 61 },
+    "sourceSize": { "w": 118, "h": 90 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "693.png",
+  "format": "I8",
+  "size": { "w": 626, "h": 466 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/shiny/693.png b/public/images/pokemon/exp/shiny/693.png
index 328c909b196..60f40ad0c40 100644
Binary files a/public/images/pokemon/exp/shiny/693.png and b/public/images/pokemon/exp/shiny/693.png differ
diff --git a/public/images/pokemon/exp/shiny/694.json b/public/images/pokemon/exp/shiny/694.json
deleted file mode 100644
index 2352bb65a43..00000000000
--- a/public/images/pokemon/exp/shiny/694.json
+++ /dev/null
@@ -1,272 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "694.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 140,
-				"h": 140
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 44,
-						"h": 37
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 44,
-						"h": 34
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 44,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 44,
-						"h": 37
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 43,
-						"h": 34
-					},
-					"frame": {
-						"x": 0,
-						"y": 34,
-						"w": 43,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 44,
-						"h": 37
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 43,
-						"h": 34
-					},
-					"frame": {
-						"x": 44,
-						"y": 0,
-						"w": 43,
-						"h": 34
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 44,
-						"h": 37
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 2,
-						"w": 41,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 68,
-						"w": 41,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 44,
-						"h": 37
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 0,
-						"w": 36,
-						"h": 37
-					},
-					"frame": {
-						"x": 0,
-						"y": 103,
-						"w": 36,
-						"h": 37
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 44,
-						"h": 37
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 0,
-						"w": 36,
-						"h": 37
-					},
-					"frame": {
-						"x": 0,
-						"y": 103,
-						"w": 36,
-						"h": 37
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 44,
-						"h": 37
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 0,
-						"w": 34,
-						"h": 37
-					},
-					"frame": {
-						"x": 36,
-						"y": 103,
-						"w": 34,
-						"h": 37
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 44,
-						"h": 37
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 2,
-						"w": 41,
-						"h": 35
-					},
-					"frame": {
-						"x": 87,
-						"y": 0,
-						"w": 41,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 44,
-						"h": 37
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 39,
-						"h": 36
-					},
-					"frame": {
-						"x": 43,
-						"y": 34,
-						"w": 39,
-						"h": 36
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 44,
-						"h": 37
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 39,
-						"h": 36
-					},
-					"frame": {
-						"x": 82,
-						"y": 35,
-						"w": 39,
-						"h": 36
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 44,
-						"h": 37
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 0,
-						"w": 33,
-						"h": 37
-					},
-					"frame": {
-						"x": 70,
-						"y": 71,
-						"w": 33,
-						"h": 37
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 44,
-						"h": 37
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 31,
-						"h": 37
-					},
-					"frame": {
-						"x": 103,
-						"y": 71,
-						"w": 31,
-						"h": 37
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:8a9916d2af3a40f04636cd5b11758f77:333ac780963a12589518f0acf1d61fde:b0990f9650cfe63b836cbed33f0b44d8$"
-	}
-}
diff --git a/public/images/pokemon/exp/shiny/694.png b/public/images/pokemon/exp/shiny/694.png
deleted file mode 100644
index fe927c06742..00000000000
Binary files a/public/images/pokemon/exp/shiny/694.png and /dev/null differ
diff --git a/public/images/pokemon/exp/shiny/696.json b/public/images/pokemon/exp/shiny/696.json
index 0d54e1282c5..7ea3165c669 100644
--- a/public/images/pokemon/exp/shiny/696.json
+++ b/public/images/pokemon/exp/shiny/696.json
@@ -1,692 +1,1055 @@
-{
-	"textures": [
-		{
-			"image": "696.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 135,
-				"h": 135
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 53,
-						"h": 46
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 53,
-						"h": 46
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 53,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 53,
-						"h": 46
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 53,
-						"h": 46
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 53,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 53,
-						"h": 46
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 53,
-						"h": 46
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 53,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 53,
-						"h": 46
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 53,
-						"h": 46
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 53,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 53,
-						"h": 46
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 53,
-						"h": 46
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 53,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 53,
-						"h": 46
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 53,
-						"h": 46
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 53,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 53,
-						"h": 46
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 53,
-						"h": 46
-					},
-					"frame": {
-						"x": 53,
-						"y": 0,
-						"w": 53,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 53,
-						"h": 46
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 53,
-						"h": 46
-					},
-					"frame": {
-						"x": 53,
-						"y": 0,
-						"w": 53,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 53,
-						"h": 46
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 53,
-						"h": 46
-					},
-					"frame": {
-						"x": 53,
-						"y": 0,
-						"w": 53,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 53,
-						"h": 46
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 53,
-						"h": 46
-					},
-					"frame": {
-						"x": 53,
-						"y": 0,
-						"w": 53,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 53,
-						"h": 46
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 53,
-						"h": 46
-					},
-					"frame": {
-						"x": 53,
-						"y": 0,
-						"w": 53,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 53,
-						"h": 46
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 53,
-						"h": 46
-					},
-					"frame": {
-						"x": 53,
-						"y": 0,
-						"w": 53,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 53,
-						"h": 46
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 53,
-						"h": 46
-					},
-					"frame": {
-						"x": 53,
-						"y": 0,
-						"w": 53,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 53,
-						"h": 46
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 53,
-						"h": 46
-					},
-					"frame": {
-						"x": 53,
-						"y": 0,
-						"w": 53,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0031.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 53,
-						"h": 46
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 53,
-						"h": 46
-					},
-					"frame": {
-						"x": 53,
-						"y": 0,
-						"w": 53,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0032.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 53,
-						"h": 46
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 53,
-						"h": 46
-					},
-					"frame": {
-						"x": 53,
-						"y": 0,
-						"w": 53,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 53,
-						"h": 46
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 53,
-						"h": 46
-					},
-					"frame": {
-						"x": 0,
-						"y": 46,
-						"w": 53,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 53,
-						"h": 46
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 53,
-						"h": 46
-					},
-					"frame": {
-						"x": 0,
-						"y": 46,
-						"w": 53,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0025.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 46
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 53,
-						"h": 43
-					},
-					"frame": {
-						"x": 0,
-						"y": 92,
-						"w": 53,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0026.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 46
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 53,
-						"h": 43
-					},
-					"frame": {
-						"x": 0,
-						"y": 92,
-						"w": 53,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 46
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 53,
-						"h": 45
-					},
-					"frame": {
-						"x": 53,
-						"y": 46,
-						"w": 53,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 46
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 53,
-						"h": 45
-					},
-					"frame": {
-						"x": 53,
-						"y": 46,
-						"w": 53,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 46
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 53,
-						"h": 45
-					},
-					"frame": {
-						"x": 53,
-						"y": 46,
-						"w": 53,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 46
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 53,
-						"h": 45
-					},
-					"frame": {
-						"x": 53,
-						"y": 46,
-						"w": 53,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 46
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 53,
-						"h": 45
-					},
-					"frame": {
-						"x": 53,
-						"y": 46,
-						"w": 53,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 46
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 53,
-						"h": 45
-					},
-					"frame": {
-						"x": 53,
-						"y": 46,
-						"w": 53,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0029.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 46
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 53,
-						"h": 45
-					},
-					"frame": {
-						"x": 53,
-						"y": 46,
-						"w": 53,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0030.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 46
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 53,
-						"h": 45
-					},
-					"frame": {
-						"x": 53,
-						"y": 46,
-						"w": 53,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 46
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 53,
-						"h": 44
-					},
-					"frame": {
-						"x": 53,
-						"y": 91,
-						"w": 53,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 46
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 53,
-						"h": 44
-					},
-					"frame": {
-						"x": 53,
-						"y": 91,
-						"w": 53,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0027.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 46
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 53,
-						"h": 44
-					},
-					"frame": {
-						"x": 53,
-						"y": 91,
-						"w": 53,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0028.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 46
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 53,
-						"h": 44
-					},
-					"frame": {
-						"x": 53,
-						"y": 91,
-						"w": 53,
-						"h": 44
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:83a7f65d0ef4a30ff24cb813c97b1fe2:69043b7539e99a45979999a29408221b:58b7763fb9abdd043e9bfa400cfafdef$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 229, "y": 0, "w": 57, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 229, "y": 0, "w": 57, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 114, "y": 0, "w": 57, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 57, "h": 47 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 114, "y": 0, "w": 57, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 57, "h": 47 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 57, "y": 0, "w": 57, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 57, "h": 48 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 57, "y": 0, "w": 57, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 57, "h": 48 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 0, "y": 0, "w": 57, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 57, "h": 50 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 0, "y": 0, "w": 57, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 57, "h": 50 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 114, "y": 0, "w": 57, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 57, "h": 47 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 113, "y": 93, "w": 57, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 57, "h": 44 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 170, "y": 92, "w": 57, "h": 45 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 57, "h": 45 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 229, "y": 0, "w": 57, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 229, "y": 0, "w": 57, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 229, "y": 0, "w": 57, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 56, "y": 94, "w": 57, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 57, "h": 44 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 56, "y": 94, "w": 57, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 57, "h": 44 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 113, "y": 137, "w": 58, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 58, "h": 42 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 113, "y": 137, "w": 58, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 58, "h": 42 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 0, "y": 138, "w": 58, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 58, "h": 40 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 0, "y": 138, "w": 58, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 58, "h": 40 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 56, "y": 94, "w": 57, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 57, "h": 44 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 113, "y": 93, "w": 57, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 57, "h": 44 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 170, "y": 92, "w": 57, "h": 45 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 57, "h": 45 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 229, "y": 0, "w": 57, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 229, "y": 0, "w": 57, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 229, "y": 0, "w": 57, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 229, "y": 0, "w": 57, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 229, "y": 0, "w": 57, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 229, "y": 0, "w": 57, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 229, "y": 0, "w": 57, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 114, "y": 0, "w": 57, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 57, "h": 47 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 114, "y": 0, "w": 57, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 57, "h": 47 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 57, "y": 0, "w": 57, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 57, "h": 48 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 57, "y": 0, "w": 57, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 57, "h": 48 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 0, "y": 0, "w": 57, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 57, "h": 50 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 0, "y": 0, "w": 57, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 57, "h": 50 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 114, "y": 0, "w": 57, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 57, "h": 47 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 113, "y": 93, "w": 57, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 57, "h": 44 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 170, "y": 92, "w": 57, "h": 45 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 57, "h": 45 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 229, "y": 0, "w": 57, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 229, "y": 0, "w": 57, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 229, "y": 0, "w": 57, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 56, "y": 94, "w": 57, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 57, "h": 44 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 56, "y": 94, "w": 57, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 57, "h": 44 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 113, "y": 137, "w": 58, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 58, "h": 42 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 113, "y": 137, "w": 58, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 58, "h": 42 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 0, "y": 138, "w": 58, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 58, "h": 40 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 0, "y": 138, "w": 58, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 58, "h": 40 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 56, "y": 94, "w": 57, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 57, "h": 44 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 113, "y": 93, "w": 57, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 57, "h": 44 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 170, "y": 92, "w": 57, "h": 45 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 57, "h": 45 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 229, "y": 0, "w": 57, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 229, "y": 0, "w": 57, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 229, "y": 0, "w": 57, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 229, "y": 0, "w": 57, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 229, "y": 0, "w": 57, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 229, "y": 0, "w": 57, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 229, "y": 0, "w": 57, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 114, "y": 0, "w": 57, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 57, "h": 47 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 114, "y": 0, "w": 57, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 57, "h": 47 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 57, "y": 0, "w": 57, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 57, "h": 48 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 57, "y": 0, "w": 57, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 57, "h": 48 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 0, "y": 0, "w": 57, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 57, "h": 50 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 0, "y": 0, "w": 57, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 57, "h": 50 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 114, "y": 0, "w": 57, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 57, "h": 47 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 113, "y": 93, "w": 57, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 57, "h": 44 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 170, "y": 92, "w": 57, "h": 45 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 57, "h": 45 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 229, "y": 0, "w": 57, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 229, "y": 0, "w": 57, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 229, "y": 0, "w": 57, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 56, "y": 94, "w": 57, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 57, "h": 44 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 56, "y": 94, "w": 57, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 57, "h": 44 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 113, "y": 137, "w": 58, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 58, "h": 42 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 113, "y": 137, "w": 58, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 58, "h": 42 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 0, "y": 138, "w": 58, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 58, "h": 40 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 0, "y": 138, "w": 58, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 58, "h": 40 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 56, "y": 94, "w": 57, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 57, "h": 44 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 113, "y": 93, "w": 57, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 57, "h": 44 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 170, "y": 92, "w": 57, "h": 45 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 57, "h": 45 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 229, "y": 0, "w": 57, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 229, "y": 0, "w": 57, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 229, "y": 0, "w": 57, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 229, "y": 0, "w": 57, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 229, "y": 0, "w": 57, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 229, "y": 0, "w": 57, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 229, "y": 0, "w": 57, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 227, "y": 92, "w": 55, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 55, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0088.png",
+    "frame": { "x": 227, "y": 92, "w": 55, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 55, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0089.png",
+    "frame": { "x": 228, "y": 46, "w": 56, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 56, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0090.png",
+    "frame": { "x": 228, "y": 46, "w": 56, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 56, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0091.png",
+    "frame": { "x": 114, "y": 47, "w": 56, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 56, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0092.png",
+    "frame": { "x": 114, "y": 47, "w": 56, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 56, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0093.png",
+    "frame": { "x": 171, "y": 0, "w": 58, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 58, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0094.png",
+    "frame": { "x": 171, "y": 0, "w": 58, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 58, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0095.png",
+    "frame": { "x": 171, "y": 46, "w": 57, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 57, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0096.png",
+    "frame": { "x": 57, "y": 48, "w": 56, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 56, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0097.png",
+    "frame": { "x": 57, "y": 48, "w": 56, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 56, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0098.png",
+    "frame": { "x": 0, "y": 50, "w": 56, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 56, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0099.png",
+    "frame": { "x": 0, "y": 50, "w": 56, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 56, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0100.png",
+    "frame": { "x": 229, "y": 0, "w": 57, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0101.png",
+    "frame": { "x": 229, "y": 0, "w": 57, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0102.png",
+    "frame": { "x": 227, "y": 92, "w": 55, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 55, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0103.png",
+    "frame": { "x": 227, "y": 92, "w": 55, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 55, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0104.png",
+    "frame": { "x": 228, "y": 46, "w": 56, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 56, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0105.png",
+    "frame": { "x": 228, "y": 46, "w": 56, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 56, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0106.png",
+    "frame": { "x": 114, "y": 47, "w": 56, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 56, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0107.png",
+    "frame": { "x": 114, "y": 47, "w": 56, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 56, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0108.png",
+    "frame": { "x": 171, "y": 0, "w": 58, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 58, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0109.png",
+    "frame": { "x": 171, "y": 0, "w": 58, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 58, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0110.png",
+    "frame": { "x": 171, "y": 46, "w": 57, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 57, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0111.png",
+    "frame": { "x": 57, "y": 48, "w": 56, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 56, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0112.png",
+    "frame": { "x": 57, "y": 48, "w": 56, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 56, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0113.png",
+    "frame": { "x": 0, "y": 50, "w": 56, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 56, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0114.png",
+    "frame": { "x": 0, "y": 50, "w": 56, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 56, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0115.png",
+    "frame": { "x": 229, "y": 0, "w": 57, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   },
+   {
+    "filename": "0116.png",
+    "frame": { "x": 229, "y": 0, "w": 57, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 },
+    "sourceSize": { "w": 61, "h": 50 },
+    "duration": 50
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.11-x64",
+  "image": "696.png",
+  "format": "I8",
+  "size": { "w": 286, "h": 179 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/shiny/696.png b/public/images/pokemon/exp/shiny/696.png
index 0a11f7b7ec7..86ecac0d371 100644
Binary files a/public/images/pokemon/exp/shiny/696.png and b/public/images/pokemon/exp/shiny/696.png differ
diff --git a/public/images/pokemon/exp/shiny/697.json b/public/images/pokemon/exp/shiny/697.json
index 7d68fbf764e..c56de41946c 100644
--- a/public/images/pokemon/exp/shiny/697.json
+++ b/public/images/pokemon/exp/shiny/697.json
@@ -1,1175 +1,983 @@
-{
-	"textures": [
-		{
-			"image": "697.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 378,
-				"h": 378
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 76,
-						"h": 76
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 76,
-						"h": 76
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 76,
-						"h": 76
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 76,
-						"h": 76
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 76,
-						"h": 76
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 76,
-						"h": 76
-					}
-				},
-				{
-					"filename": "0033.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 76,
-						"h": 76
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 76,
-						"h": 76
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 76,
-						"h": 76
-					},
-					"frame": {
-						"x": 0,
-						"y": 76,
-						"w": 76,
-						"h": 76
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 76,
-						"h": 76
-					},
-					"frame": {
-						"x": 0,
-						"y": 76,
-						"w": 76,
-						"h": 76
-					}
-				},
-				{
-					"filename": "0025.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 76,
-						"h": 76
-					},
-					"frame": {
-						"x": 0,
-						"y": 76,
-						"w": 76,
-						"h": 76
-					}
-				},
-				{
-					"filename": "0034.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 76,
-						"h": 76
-					},
-					"frame": {
-						"x": 0,
-						"y": 76,
-						"w": 76,
-						"h": 76
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 76,
-						"h": 75
-					},
-					"frame": {
-						"x": 76,
-						"y": 0,
-						"w": 76,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 76,
-						"h": 75
-					},
-					"frame": {
-						"x": 76,
-						"y": 0,
-						"w": 76,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 76,
-						"h": 75
-					},
-					"frame": {
-						"x": 76,
-						"y": 0,
-						"w": 76,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0032.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 76,
-						"h": 75
-					},
-					"frame": {
-						"x": 76,
-						"y": 0,
-						"w": 76,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 75,
-						"h": 75
-					},
-					"frame": {
-						"x": 0,
-						"y": 152,
-						"w": 75,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 75,
-						"h": 75
-					},
-					"frame": {
-						"x": 0,
-						"y": 152,
-						"w": 75,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0026.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 75,
-						"h": 75
-					},
-					"frame": {
-						"x": 0,
-						"y": 152,
-						"w": 75,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0035.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 75,
-						"h": 75
-					},
-					"frame": {
-						"x": 0,
-						"y": 152,
-						"w": 75,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0051.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 76,
-						"h": 74
-					},
-					"frame": {
-						"x": 76,
-						"y": 75,
-						"w": 76,
-						"h": 74
-					}
-				},
-				{
-					"filename": "0052.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 75,
-						"h": 75
-					},
-					"frame": {
-						"x": 152,
-						"y": 0,
-						"w": 75,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0053.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 76,
-						"h": 74
-					},
-					"frame": {
-						"x": 227,
-						"y": 0,
-						"w": 76,
-						"h": 74
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 74,
-						"h": 75
-					},
-					"frame": {
-						"x": 0,
-						"y": 227,
-						"w": 74,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 74,
-						"h": 75
-					},
-					"frame": {
-						"x": 0,
-						"y": 227,
-						"w": 74,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0027.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 74,
-						"h": 75
-					},
-					"frame": {
-						"x": 0,
-						"y": 227,
-						"w": 74,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0036.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 74,
-						"h": 75
-					},
-					"frame": {
-						"x": 0,
-						"y": 227,
-						"w": 74,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0037.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 69,
-						"h": 76
-					},
-					"frame": {
-						"x": 0,
-						"y": 302,
-						"w": 69,
-						"h": 76
-					}
-				},
-				{
-					"filename": "0047.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 69,
-						"h": 76
-					},
-					"frame": {
-						"x": 0,
-						"y": 302,
-						"w": 69,
-						"h": 76
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 5,
-						"w": 74,
-						"h": 74
-					},
-					"frame": {
-						"x": 152,
-						"y": 75,
-						"w": 74,
-						"h": 74
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 5,
-						"w": 74,
-						"h": 74
-					},
-					"frame": {
-						"x": 152,
-						"y": 75,
-						"w": 74,
-						"h": 74
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 5,
-						"w": 74,
-						"h": 74
-					},
-					"frame": {
-						"x": 152,
-						"y": 75,
-						"w": 74,
-						"h": 74
-					}
-				},
-				{
-					"filename": "0031.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 5,
-						"w": 74,
-						"h": 74
-					},
-					"frame": {
-						"x": 152,
-						"y": 75,
-						"w": 74,
-						"h": 74
-					}
-				},
-				{
-					"filename": "0049.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 74,
-						"h": 74
-					},
-					"frame": {
-						"x": 303,
-						"y": 0,
-						"w": 74,
-						"h": 74
-					}
-				},
-				{
-					"filename": "0055.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 74,
-						"h": 74
-					},
-					"frame": {
-						"x": 303,
-						"y": 0,
-						"w": 74,
-						"h": 74
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 72,
-						"h": 75
-					},
-					"frame": {
-						"x": 69,
-						"y": 302,
-						"w": 72,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 72,
-						"h": 75
-					},
-					"frame": {
-						"x": 69,
-						"y": 302,
-						"w": 72,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 72,
-						"h": 75
-					},
-					"frame": {
-						"x": 69,
-						"y": 302,
-						"w": 72,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0028.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 72,
-						"h": 75
-					},
-					"frame": {
-						"x": 69,
-						"y": 302,
-						"w": 72,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 71,
-						"h": 75
-					},
-					"frame": {
-						"x": 74,
-						"y": 227,
-						"w": 71,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 71,
-						"h": 75
-					},
-					"frame": {
-						"x": 74,
-						"y": 227,
-						"w": 71,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 71,
-						"h": 75
-					},
-					"frame": {
-						"x": 74,
-						"y": 227,
-						"w": 71,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0029.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 71,
-						"h": 75
-					},
-					"frame": {
-						"x": 74,
-						"y": 227,
-						"w": 71,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 73,
-						"h": 75
-					},
-					"frame": {
-						"x": 75,
-						"y": 152,
-						"w": 73,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 73,
-						"h": 75
-					},
-					"frame": {
-						"x": 75,
-						"y": 152,
-						"w": 73,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 73,
-						"h": 75
-					},
-					"frame": {
-						"x": 75,
-						"y": 152,
-						"w": 73,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0030.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 73,
-						"h": 75
-					},
-					"frame": {
-						"x": 75,
-						"y": 152,
-						"w": 73,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0050.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 74,
-						"h": 75
-					},
-					"frame": {
-						"x": 148,
-						"y": 149,
-						"w": 74,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0054.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 74,
-						"h": 75
-					},
-					"frame": {
-						"x": 148,
-						"y": 149,
-						"w": 74,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0038.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 2,
-						"w": 67,
-						"h": 77
-					},
-					"frame": {
-						"x": 222,
-						"y": 149,
-						"w": 67,
-						"h": 77
-					}
-				},
-				{
-					"filename": "0048.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 72,
-						"h": 75
-					},
-					"frame": {
-						"x": 227,
-						"y": 74,
-						"w": 72,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0046.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 2,
-						"w": 67,
-						"h": 77
-					},
-					"frame": {
-						"x": 299,
-						"y": 74,
-						"w": 67,
-						"h": 77
-					}
-				},
-				{
-					"filename": "0039.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 65,
-						"h": 78
-					},
-					"frame": {
-						"x": 289,
-						"y": 151,
-						"w": 65,
-						"h": 78
-					}
-				},
-				{
-					"filename": "0045.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 65,
-						"h": 78
-					},
-					"frame": {
-						"x": 289,
-						"y": 151,
-						"w": 65,
-						"h": 78
-					}
-				},
-				{
-					"filename": "0040.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 0,
-						"w": 63,
-						"h": 79
-					},
-					"frame": {
-						"x": 145,
-						"y": 227,
-						"w": 63,
-						"h": 79
-					}
-				},
-				{
-					"filename": "0044.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 0,
-						"w": 63,
-						"h": 79
-					},
-					"frame": {
-						"x": 145,
-						"y": 227,
-						"w": 63,
-						"h": 79
-					}
-				},
-				{
-					"filename": "0041.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 0,
-						"w": 61,
-						"h": 79
-					},
-					"frame": {
-						"x": 208,
-						"y": 226,
-						"w": 61,
-						"h": 79
-					}
-				},
-				{
-					"filename": "0043.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 0,
-						"w": 61,
-						"h": 79
-					},
-					"frame": {
-						"x": 208,
-						"y": 226,
-						"w": 61,
-						"h": 79
-					}
-				},
-				{
-					"filename": "0042.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 0,
-						"w": 60,
-						"h": 79
-					},
-					"frame": {
-						"x": 269,
-						"y": 229,
-						"w": 60,
-						"h": 79
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:f5b6396fc735fbaf3881fa6c1e4cdad7:20237f200f066bd1e2f7b8926f0361f1:f4fdd87d2fc1483d8e0a185c2654e3d9$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 384, "y": 77, "w": 92, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 3, "w": 92, "h": 79 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 476, "y": 77, "w": 92, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 3, "w": 92, "h": 79 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 661, "y": 232, "w": 91, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 3, "w": 91, "h": 79 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 281, "y": 312, "w": 91, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 4, "w": 91, "h": 78 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 556, "y": 462, "w": 91, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 5, "w": 91, "h": 77 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 181, "y": 462, "w": 90, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 4, "w": 90, "h": 78 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 88, "y": 464, "w": 90, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 6, "w": 90, "h": 76 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 0, "y": 540, "w": 90, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 6, "w": 90, "h": 76 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 90, "y": 540, "w": 89, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 7, "w": 89, "h": 75 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 179, "y": 540, "w": 89, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 7, "w": 89, "h": 75 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 647, "y": 468, "w": 90, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 6, "w": 90, "h": 76 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 271, "y": 470, "w": 90, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 6, "w": 90, "h": 76 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 536, "y": 539, "w": 90, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 6, "w": 90, "h": 76 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 90, "y": 386, "w": 91, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 4, "w": 91, "h": 78 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 366, "y": 234, "w": 92, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 4, "w": 92, "h": 78 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 275, "y": 233, "w": 91, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 3, "w": 91, "h": 79 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 384, "y": 77, "w": 92, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 3, "w": 92, "h": 79 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 476, "y": 77, "w": 92, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 3, "w": 92, "h": 79 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 661, "y": 232, "w": 91, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 3, "w": 91, "h": 79 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 281, "y": 312, "w": 91, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 4, "w": 91, "h": 78 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 556, "y": 462, "w": 91, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 5, "w": 91, "h": 77 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 181, "y": 462, "w": 90, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 4, "w": 90, "h": 78 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 88, "y": 464, "w": 90, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 6, "w": 90, "h": 76 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 0, "y": 540, "w": 90, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 6, "w": 90, "h": 76 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 90, "y": 540, "w": 89, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 7, "w": 89, "h": 75 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 179, "y": 540, "w": 89, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 7, "w": 89, "h": 75 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 647, "y": 468, "w": 90, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 6, "w": 90, "h": 76 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 271, "y": 470, "w": 90, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 6, "w": 90, "h": 76 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 536, "y": 539, "w": 90, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 6, "w": 90, "h": 76 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 90, "y": 386, "w": 91, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 4, "w": 91, "h": 78 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 366, "y": 234, "w": 92, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 4, "w": 92, "h": 78 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 275, "y": 233, "w": 91, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 3, "w": 91, "h": 79 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 384, "y": 77, "w": 92, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 3, "w": 92, "h": 79 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 476, "y": 77, "w": 92, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 3, "w": 92, "h": 79 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 661, "y": 232, "w": 91, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 3, "w": 91, "h": 79 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 281, "y": 312, "w": 91, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 4, "w": 91, "h": 78 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 556, "y": 462, "w": 91, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 5, "w": 91, "h": 77 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 181, "y": 462, "w": 90, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 4, "w": 90, "h": 78 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 88, "y": 464, "w": 90, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 6, "w": 90, "h": 76 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 0, "y": 540, "w": 90, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 6, "w": 90, "h": 76 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 90, "y": 540, "w": 89, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 7, "w": 89, "h": 75 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 179, "y": 540, "w": 89, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 7, "w": 89, "h": 75 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 647, "y": 468, "w": 90, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 6, "w": 90, "h": 76 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 271, "y": 470, "w": 90, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 6, "w": 90, "h": 76 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 536, "y": 539, "w": 90, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 6, "w": 90, "h": 76 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 90, "y": 386, "w": 91, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 4, "w": 91, "h": 78 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 366, "y": 234, "w": 92, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 4, "w": 92, "h": 78 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 275, "y": 233, "w": 91, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 3, "w": 91, "h": 79 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 384, "y": 77, "w": 92, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 3, "w": 92, "h": 79 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 476, "y": 77, "w": 92, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 3, "w": 92, "h": 79 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 661, "y": 232, "w": 91, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 3, "w": 91, "h": 79 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 281, "y": 312, "w": 91, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 4, "w": 91, "h": 78 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 556, "y": 462, "w": 91, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 5, "w": 91, "h": 77 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 181, "y": 462, "w": 90, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 4, "w": 90, "h": 78 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 88, "y": 464, "w": 90, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 6, "w": 90, "h": 76 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 0, "y": 540, "w": 90, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 6, "w": 90, "h": 76 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 90, "y": 540, "w": 89, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 7, "w": 89, "h": 75 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 179, "y": 540, "w": 89, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 7, "w": 89, "h": 75 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 647, "y": 468, "w": 90, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 6, "w": 90, "h": 76 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 271, "y": 470, "w": 90, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 6, "w": 90, "h": 76 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 536, "y": 539, "w": 90, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 6, "w": 90, "h": 76 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 90, "y": 386, "w": 91, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 4, "w": 91, "h": 78 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 366, "y": 234, "w": 92, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 4, "w": 92, "h": 78 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 275, "y": 233, "w": 91, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 3, "w": 91, "h": 79 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 0, "y": 78, "w": 92, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 3, "w": 92, "h": 79 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 184, "y": 231, "w": 91, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 91, "h": 79 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 94, "y": 157, "w": 90, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 2, "w": 90, "h": 80 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 0, "y": 391, "w": 88, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 88, "h": 80 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 275, "y": 390, "w": 88, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 88, "h": 80 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 363, "y": 463, "w": 86, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 1, "w": 86, "h": 81 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 649, "y": 386, "w": 86, "h": 82 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 0, "w": 86, "h": 82 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 449, "y": 463, "w": 87, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 87, "h": 80 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 0, "y": 312, "w": 90, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 3, "w": 90, "h": 79 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 372, "y": 386, "w": 92, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 5, "w": 92, "h": 77 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 566, "y": 233, "w": 92, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 4, "w": 92, "h": 78 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 566, "y": 233, "w": 92, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 4, "w": 92, "h": 78 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 92, "y": 78, "w": 92, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 3, "w": 92, "h": 79 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 473, "y": 156, "w": 93, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 93, "h": 78 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 556, "y": 386, "w": 93, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 93, "h": 76 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 181, "y": 387, "w": 94, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 94, "h": 75 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 648, "y": 311, "w": 95, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 95, "h": 75 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 186, "y": 312, "w": 95, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 95, "h": 75 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 661, "y": 157, "w": 96, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 96, "h": 75 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 458, "y": 311, "w": 95, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 95, "h": 75 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 669, "y": 0, "w": 93, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 3, "w": 93, "h": 79 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 464, "y": 386, "w": 92, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 5, "w": 92, "h": 77 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 0, "y": 234, "w": 92, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 4, "w": 92, "h": 78 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0088.png",
+    "frame": { "x": 0, "y": 234, "w": 92, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 4, "w": 92, "h": 78 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0089.png",
+    "frame": { "x": 384, "y": 77, "w": 92, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 3, "w": 92, "h": 79 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0090.png",
+    "frame": { "x": 568, "y": 79, "w": 93, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 4, "w": 93, "h": 78 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0091.png",
+    "frame": { "x": 661, "y": 79, "w": 93, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 4, "w": 93, "h": 78 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0092.png",
+    "frame": { "x": 289, "y": 0, "w": 95, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 95, "h": 78 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0093.png",
+    "frame": { "x": 0, "y": 0, "w": 96, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 96, "h": 78 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0094.png",
+    "frame": { "x": 96, "y": 0, "w": 96, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 96, "h": 78 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0095.png",
+    "frame": { "x": 192, "y": 0, "w": 97, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 97, "h": 77 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0096.png",
+    "frame": { "x": 480, "y": 0, "w": 96, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 96, "h": 77 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0097.png",
+    "frame": { "x": 384, "y": 0, "w": 96, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 96, "h": 77 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0098.png",
+    "frame": { "x": 192, "y": 77, "w": 96, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 96, "h": 76 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0099.png",
+    "frame": { "x": 566, "y": 157, "w": 95, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 95, "h": 76 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0100.png",
+    "frame": { "x": 553, "y": 311, "w": 95, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 95, "h": 75 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0101.png",
+    "frame": { "x": 277, "y": 157, "w": 95, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 6, "w": 95, "h": 76 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0102.png",
+    "frame": { "x": 92, "y": 310, "w": 94, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 94, "h": 76 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0103.png",
+    "frame": { "x": 0, "y": 157, "w": 94, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 94, "h": 77 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0104.png",
+    "frame": { "x": 458, "y": 234, "w": 93, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 93, "h": 77 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0105.png",
+    "frame": { "x": 184, "y": 153, "w": 93, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 93, "h": 78 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0106.png",
+    "frame": { "x": 380, "y": 156, "w": 93, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 93, "h": 78 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0107.png",
+    "frame": { "x": 576, "y": 0, "w": 93, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 93, "h": 79 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   },
+   {
+    "filename": "0108.png",
+    "frame": { "x": 288, "y": 78, "w": 92, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 3, "w": 92, "h": 79 },
+    "sourceSize": { "w": 100, "h": 82 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.11-x64",
+  "image": "697.png",
+  "format": "I8",
+  "size": { "w": 762, "h": 616 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/shiny/697.png b/public/images/pokemon/exp/shiny/697.png
index b89902a748f..7f4a0c09327 100644
Binary files a/public/images/pokemon/exp/shiny/697.png and b/public/images/pokemon/exp/shiny/697.png differ
diff --git a/public/images/pokemon/exp/shiny/698.json b/public/images/pokemon/exp/shiny/698.json
deleted file mode 100644
index de4bc49fb04..00000000000
--- a/public/images/pokemon/exp/shiny/698.json
+++ /dev/null
@@ -1,3296 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "698.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 175,
-				"h": 175
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0125.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 0,
-						"w": 32,
-						"h": 60
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0126.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 0,
-						"w": 32,
-						"h": 60
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0151.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 0,
-						"w": 32,
-						"h": 60
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0152.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 0,
-						"w": 32,
-						"h": 60
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0127.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 0,
-						"w": 32,
-						"h": 60
-					},
-					"frame": {
-						"x": 0,
-						"y": 60,
-						"w": 32,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0128.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 0,
-						"w": 32,
-						"h": 60
-					},
-					"frame": {
-						"x": 0,
-						"y": 60,
-						"w": 32,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0027.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 38,
-						"h": 55
-					},
-					"frame": {
-						"x": 0,
-						"y": 120,
-						"w": 38,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0028.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 38,
-						"h": 55
-					},
-					"frame": {
-						"x": 0,
-						"y": 120,
-						"w": 38,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0032.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 38,
-						"h": 55
-					},
-					"frame": {
-						"x": 0,
-						"y": 120,
-						"w": 38,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0033.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 38,
-						"h": 55
-					},
-					"frame": {
-						"x": 0,
-						"y": 120,
-						"w": 38,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0067.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 38,
-						"h": 55
-					},
-					"frame": {
-						"x": 0,
-						"y": 120,
-						"w": 38,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0068.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 38,
-						"h": 55
-					},
-					"frame": {
-						"x": 0,
-						"y": 120,
-						"w": 38,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0072.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 38,
-						"h": 55
-					},
-					"frame": {
-						"x": 0,
-						"y": 120,
-						"w": 38,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0073.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 38,
-						"h": 55
-					},
-					"frame": {
-						"x": 0,
-						"y": 120,
-						"w": 38,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0107.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 38,
-						"h": 55
-					},
-					"frame": {
-						"x": 0,
-						"y": 120,
-						"w": 38,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0108.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 38,
-						"h": 55
-					},
-					"frame": {
-						"x": 0,
-						"y": 120,
-						"w": 38,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0112.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 38,
-						"h": 55
-					},
-					"frame": {
-						"x": 0,
-						"y": 120,
-						"w": 38,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0113.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 38,
-						"h": 55
-					},
-					"frame": {
-						"x": 0,
-						"y": 120,
-						"w": 38,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0129.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 0,
-						"w": 32,
-						"h": 60
-					},
-					"frame": {
-						"x": 32,
-						"y": 0,
-						"w": 32,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0130.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 0,
-						"w": 32,
-						"h": 60
-					},
-					"frame": {
-						"x": 32,
-						"y": 0,
-						"w": 32,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0135.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 0,
-						"w": 32,
-						"h": 60
-					},
-					"frame": {
-						"x": 32,
-						"y": 0,
-						"w": 32,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0136.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 0,
-						"w": 32,
-						"h": 60
-					},
-					"frame": {
-						"x": 32,
-						"y": 0,
-						"w": 32,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0141.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 0,
-						"w": 32,
-						"h": 60
-					},
-					"frame": {
-						"x": 32,
-						"y": 0,
-						"w": 32,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0142.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 0,
-						"w": 32,
-						"h": 60
-					},
-					"frame": {
-						"x": 32,
-						"y": 0,
-						"w": 32,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0147.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 0,
-						"w": 32,
-						"h": 60
-					},
-					"frame": {
-						"x": 32,
-						"y": 0,
-						"w": 32,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0148.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 0,
-						"w": 32,
-						"h": 60
-					},
-					"frame": {
-						"x": 32,
-						"y": 0,
-						"w": 32,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0131.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 0,
-						"w": 32,
-						"h": 60
-					},
-					"frame": {
-						"x": 32,
-						"y": 60,
-						"w": 32,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0132.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 0,
-						"w": 32,
-						"h": 60
-					},
-					"frame": {
-						"x": 32,
-						"y": 60,
-						"w": 32,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0137.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 0,
-						"w": 32,
-						"h": 60
-					},
-					"frame": {
-						"x": 32,
-						"y": 60,
-						"w": 32,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0138.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 0,
-						"w": 32,
-						"h": 60
-					},
-					"frame": {
-						"x": 32,
-						"y": 60,
-						"w": 32,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0143.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 0,
-						"w": 32,
-						"h": 60
-					},
-					"frame": {
-						"x": 32,
-						"y": 60,
-						"w": 32,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0144.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 0,
-						"w": 32,
-						"h": 60
-					},
-					"frame": {
-						"x": 32,
-						"y": 60,
-						"w": 32,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0149.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 0,
-						"w": 32,
-						"h": 60
-					},
-					"frame": {
-						"x": 32,
-						"y": 60,
-						"w": 32,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0150.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 0,
-						"w": 32,
-						"h": 60
-					},
-					"frame": {
-						"x": 32,
-						"y": 60,
-						"w": 32,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 5,
-						"w": 29,
-						"h": 55
-					},
-					"frame": {
-						"x": 38,
-						"y": 120,
-						"w": 29,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 5,
-						"w": 29,
-						"h": 55
-					},
-					"frame": {
-						"x": 38,
-						"y": 120,
-						"w": 29,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 5,
-						"w": 29,
-						"h": 55
-					},
-					"frame": {
-						"x": 38,
-						"y": 120,
-						"w": 29,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0049.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 5,
-						"w": 29,
-						"h": 55
-					},
-					"frame": {
-						"x": 38,
-						"y": 120,
-						"w": 29,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0050.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 5,
-						"w": 29,
-						"h": 55
-					},
-					"frame": {
-						"x": 38,
-						"y": 120,
-						"w": 29,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0051.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 5,
-						"w": 29,
-						"h": 55
-					},
-					"frame": {
-						"x": 38,
-						"y": 120,
-						"w": 29,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0089.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 5,
-						"w": 29,
-						"h": 55
-					},
-					"frame": {
-						"x": 38,
-						"y": 120,
-						"w": 29,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0090.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 5,
-						"w": 29,
-						"h": 55
-					},
-					"frame": {
-						"x": 38,
-						"y": 120,
-						"w": 29,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0091.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 5,
-						"w": 29,
-						"h": 55
-					},
-					"frame": {
-						"x": 38,
-						"y": 120,
-						"w": 29,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0133.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 0,
-						"w": 32,
-						"h": 60
-					},
-					"frame": {
-						"x": 64,
-						"y": 0,
-						"w": 32,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0134.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 0,
-						"w": 32,
-						"h": 60
-					},
-					"frame": {
-						"x": 64,
-						"y": 0,
-						"w": 32,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0139.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 0,
-						"w": 32,
-						"h": 60
-					},
-					"frame": {
-						"x": 64,
-						"y": 0,
-						"w": 32,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0140.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 0,
-						"w": 32,
-						"h": 60
-					},
-					"frame": {
-						"x": 64,
-						"y": 0,
-						"w": 32,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0145.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 0,
-						"w": 32,
-						"h": 60
-					},
-					"frame": {
-						"x": 64,
-						"y": 0,
-						"w": 32,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0146.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 0,
-						"w": 32,
-						"h": 60
-					},
-					"frame": {
-						"x": 64,
-						"y": 0,
-						"w": 32,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0123.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 32,
-						"h": 59
-					},
-					"frame": {
-						"x": 64,
-						"y": 60,
-						"w": 32,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0124.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 32,
-						"h": 59
-					},
-					"frame": {
-						"x": 64,
-						"y": 60,
-						"w": 32,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0153.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 32,
-						"h": 59
-					},
-					"frame": {
-						"x": 64,
-						"y": 60,
-						"w": 32,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0154.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 32,
-						"h": 59
-					},
-					"frame": {
-						"x": 64,
-						"y": 60,
-						"w": 32,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0025.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 37,
-						"h": 56
-					},
-					"frame": {
-						"x": 67,
-						"y": 119,
-						"w": 37,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0026.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 37,
-						"h": 56
-					},
-					"frame": {
-						"x": 67,
-						"y": 119,
-						"w": 37,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0034.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 37,
-						"h": 56
-					},
-					"frame": {
-						"x": 67,
-						"y": 119,
-						"w": 37,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0035.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 37,
-						"h": 56
-					},
-					"frame": {
-						"x": 67,
-						"y": 119,
-						"w": 37,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0065.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 37,
-						"h": 56
-					},
-					"frame": {
-						"x": 67,
-						"y": 119,
-						"w": 37,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0066.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 37,
-						"h": 56
-					},
-					"frame": {
-						"x": 67,
-						"y": 119,
-						"w": 37,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0074.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 37,
-						"h": 56
-					},
-					"frame": {
-						"x": 67,
-						"y": 119,
-						"w": 37,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0075.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 37,
-						"h": 56
-					},
-					"frame": {
-						"x": 67,
-						"y": 119,
-						"w": 37,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0105.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 37,
-						"h": 56
-					},
-					"frame": {
-						"x": 67,
-						"y": 119,
-						"w": 37,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0106.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 37,
-						"h": 56
-					},
-					"frame": {
-						"x": 67,
-						"y": 119,
-						"w": 37,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0114.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 37,
-						"h": 56
-					},
-					"frame": {
-						"x": 67,
-						"y": 119,
-						"w": 37,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0115.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 37,
-						"h": 56
-					},
-					"frame": {
-						"x": 67,
-						"y": 119,
-						"w": 37,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0029.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 38,
-						"h": 54
-					},
-					"frame": {
-						"x": 104,
-						"y": 0,
-						"w": 38,
-						"h": 54
-					}
-				},
-				{
-					"filename": "0030.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 38,
-						"h": 54
-					},
-					"frame": {
-						"x": 104,
-						"y": 0,
-						"w": 38,
-						"h": 54
-					}
-				},
-				{
-					"filename": "0031.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 38,
-						"h": 54
-					},
-					"frame": {
-						"x": 104,
-						"y": 0,
-						"w": 38,
-						"h": 54
-					}
-				},
-				{
-					"filename": "0069.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 38,
-						"h": 54
-					},
-					"frame": {
-						"x": 104,
-						"y": 0,
-						"w": 38,
-						"h": 54
-					}
-				},
-				{
-					"filename": "0070.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 38,
-						"h": 54
-					},
-					"frame": {
-						"x": 104,
-						"y": 0,
-						"w": 38,
-						"h": 54
-					}
-				},
-				{
-					"filename": "0071.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 38,
-						"h": 54
-					},
-					"frame": {
-						"x": 104,
-						"y": 0,
-						"w": 38,
-						"h": 54
-					}
-				},
-				{
-					"filename": "0109.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 38,
-						"h": 54
-					},
-					"frame": {
-						"x": 104,
-						"y": 0,
-						"w": 38,
-						"h": 54
-					}
-				},
-				{
-					"filename": "0110.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 38,
-						"h": 54
-					},
-					"frame": {
-						"x": 104,
-						"y": 0,
-						"w": 38,
-						"h": 54
-					}
-				},
-				{
-					"filename": "0111.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 38,
-						"h": 54
-					},
-					"frame": {
-						"x": 104,
-						"y": 0,
-						"w": 38,
-						"h": 54
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 2,
-						"w": 33,
-						"h": 58
-					},
-					"frame": {
-						"x": 142,
-						"y": 0,
-						"w": 33,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 2,
-						"w": 33,
-						"h": 58
-					},
-					"frame": {
-						"x": 142,
-						"y": 0,
-						"w": 33,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 2,
-						"w": 33,
-						"h": 58
-					},
-					"frame": {
-						"x": 142,
-						"y": 0,
-						"w": 33,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 2,
-						"w": 33,
-						"h": 58
-					},
-					"frame": {
-						"x": 142,
-						"y": 0,
-						"w": 33,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0043.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 2,
-						"w": 33,
-						"h": 58
-					},
-					"frame": {
-						"x": 142,
-						"y": 0,
-						"w": 33,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0044.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 2,
-						"w": 33,
-						"h": 58
-					},
-					"frame": {
-						"x": 142,
-						"y": 0,
-						"w": 33,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0056.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 2,
-						"w": 33,
-						"h": 58
-					},
-					"frame": {
-						"x": 142,
-						"y": 0,
-						"w": 33,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0057.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 2,
-						"w": 33,
-						"h": 58
-					},
-					"frame": {
-						"x": 142,
-						"y": 0,
-						"w": 33,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0083.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 2,
-						"w": 33,
-						"h": 58
-					},
-					"frame": {
-						"x": 142,
-						"y": 0,
-						"w": 33,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0084.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 2,
-						"w": 33,
-						"h": 58
-					},
-					"frame": {
-						"x": 142,
-						"y": 0,
-						"w": 33,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0096.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 2,
-						"w": 33,
-						"h": 58
-					},
-					"frame": {
-						"x": 142,
-						"y": 0,
-						"w": 33,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0097.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 2,
-						"w": 33,
-						"h": 58
-					},
-					"frame": {
-						"x": 142,
-						"y": 0,
-						"w": 33,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 36,
-						"h": 57
-					},
-					"frame": {
-						"x": 104,
-						"y": 54,
-						"w": 36,
-						"h": 57
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 36,
-						"h": 57
-					},
-					"frame": {
-						"x": 104,
-						"y": 54,
-						"w": 36,
-						"h": 57
-					}
-				},
-				{
-					"filename": "0036.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 36,
-						"h": 57
-					},
-					"frame": {
-						"x": 104,
-						"y": 54,
-						"w": 36,
-						"h": 57
-					}
-				},
-				{
-					"filename": "0037.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 36,
-						"h": 57
-					},
-					"frame": {
-						"x": 104,
-						"y": 54,
-						"w": 36,
-						"h": 57
-					}
-				},
-				{
-					"filename": "0063.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 36,
-						"h": 57
-					},
-					"frame": {
-						"x": 104,
-						"y": 54,
-						"w": 36,
-						"h": 57
-					}
-				},
-				{
-					"filename": "0064.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 36,
-						"h": 57
-					},
-					"frame": {
-						"x": 104,
-						"y": 54,
-						"w": 36,
-						"h": 57
-					}
-				},
-				{
-					"filename": "0076.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 36,
-						"h": 57
-					},
-					"frame": {
-						"x": 104,
-						"y": 54,
-						"w": 36,
-						"h": 57
-					}
-				},
-				{
-					"filename": "0077.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 36,
-						"h": 57
-					},
-					"frame": {
-						"x": 104,
-						"y": 54,
-						"w": 36,
-						"h": 57
-					}
-				},
-				{
-					"filename": "0103.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 36,
-						"h": 57
-					},
-					"frame": {
-						"x": 104,
-						"y": 54,
-						"w": 36,
-						"h": 57
-					}
-				},
-				{
-					"filename": "0104.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 36,
-						"h": 57
-					},
-					"frame": {
-						"x": 104,
-						"y": 54,
-						"w": 36,
-						"h": 57
-					}
-				},
-				{
-					"filename": "0116.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 36,
-						"h": 57
-					},
-					"frame": {
-						"x": 104,
-						"y": 54,
-						"w": 36,
-						"h": 57
-					}
-				},
-				{
-					"filename": "0117.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 36,
-						"h": 57
-					},
-					"frame": {
-						"x": 104,
-						"y": 54,
-						"w": 36,
-						"h": 57
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 34,
-						"h": 58
-					},
-					"frame": {
-						"x": 140,
-						"y": 58,
-						"w": 34,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 34,
-						"h": 58
-					},
-					"frame": {
-						"x": 140,
-						"y": 58,
-						"w": 34,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 34,
-						"h": 58
-					},
-					"frame": {
-						"x": 140,
-						"y": 58,
-						"w": 34,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 34,
-						"h": 58
-					},
-					"frame": {
-						"x": 140,
-						"y": 58,
-						"w": 34,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 34,
-						"h": 58
-					},
-					"frame": {
-						"x": 140,
-						"y": 58,
-						"w": 34,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 34,
-						"h": 58
-					},
-					"frame": {
-						"x": 140,
-						"y": 58,
-						"w": 34,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 34,
-						"h": 58
-					},
-					"frame": {
-						"x": 140,
-						"y": 58,
-						"w": 34,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0038.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 34,
-						"h": 58
-					},
-					"frame": {
-						"x": 140,
-						"y": 58,
-						"w": 34,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0039.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 34,
-						"h": 58
-					},
-					"frame": {
-						"x": 140,
-						"y": 58,
-						"w": 34,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0040.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 34,
-						"h": 58
-					},
-					"frame": {
-						"x": 140,
-						"y": 58,
-						"w": 34,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0041.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 34,
-						"h": 58
-					},
-					"frame": {
-						"x": 140,
-						"y": 58,
-						"w": 34,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0042.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 34,
-						"h": 58
-					},
-					"frame": {
-						"x": 140,
-						"y": 58,
-						"w": 34,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0058.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 34,
-						"h": 58
-					},
-					"frame": {
-						"x": 140,
-						"y": 58,
-						"w": 34,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0059.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 34,
-						"h": 58
-					},
-					"frame": {
-						"x": 140,
-						"y": 58,
-						"w": 34,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0060.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 34,
-						"h": 58
-					},
-					"frame": {
-						"x": 140,
-						"y": 58,
-						"w": 34,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0061.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 34,
-						"h": 58
-					},
-					"frame": {
-						"x": 140,
-						"y": 58,
-						"w": 34,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0062.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 34,
-						"h": 58
-					},
-					"frame": {
-						"x": 140,
-						"y": 58,
-						"w": 34,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0078.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 34,
-						"h": 58
-					},
-					"frame": {
-						"x": 140,
-						"y": 58,
-						"w": 34,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0079.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 34,
-						"h": 58
-					},
-					"frame": {
-						"x": 140,
-						"y": 58,
-						"w": 34,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0080.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 34,
-						"h": 58
-					},
-					"frame": {
-						"x": 140,
-						"y": 58,
-						"w": 34,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0081.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 34,
-						"h": 58
-					},
-					"frame": {
-						"x": 140,
-						"y": 58,
-						"w": 34,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0082.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 34,
-						"h": 58
-					},
-					"frame": {
-						"x": 140,
-						"y": 58,
-						"w": 34,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0098.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 34,
-						"h": 58
-					},
-					"frame": {
-						"x": 140,
-						"y": 58,
-						"w": 34,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0099.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 34,
-						"h": 58
-					},
-					"frame": {
-						"x": 140,
-						"y": 58,
-						"w": 34,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0100.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 34,
-						"h": 58
-					},
-					"frame": {
-						"x": 140,
-						"y": 58,
-						"w": 34,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0101.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 34,
-						"h": 58
-					},
-					"frame": {
-						"x": 140,
-						"y": 58,
-						"w": 34,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0102.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 34,
-						"h": 58
-					},
-					"frame": {
-						"x": 140,
-						"y": 58,
-						"w": 34,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0118.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 34,
-						"h": 58
-					},
-					"frame": {
-						"x": 140,
-						"y": 58,
-						"w": 34,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0119.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 34,
-						"h": 58
-					},
-					"frame": {
-						"x": 140,
-						"y": 58,
-						"w": 34,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0120.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 34,
-						"h": 58
-					},
-					"frame": {
-						"x": 140,
-						"y": 58,
-						"w": 34,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0121.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 34,
-						"h": 58
-					},
-					"frame": {
-						"x": 140,
-						"y": 58,
-						"w": 34,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0122.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 34,
-						"h": 58
-					},
-					"frame": {
-						"x": 140,
-						"y": 58,
-						"w": 34,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0155.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 34,
-						"h": 58
-					},
-					"frame": {
-						"x": 140,
-						"y": 58,
-						"w": 34,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0156.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 34,
-						"h": 58
-					},
-					"frame": {
-						"x": 140,
-						"y": 58,
-						"w": 34,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 3,
-						"w": 31,
-						"h": 57
-					},
-					"frame": {
-						"x": 104,
-						"y": 116,
-						"w": 31,
-						"h": 57
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 3,
-						"w": 31,
-						"h": 57
-					},
-					"frame": {
-						"x": 104,
-						"y": 116,
-						"w": 31,
-						"h": 57
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 3,
-						"w": 31,
-						"h": 57
-					},
-					"frame": {
-						"x": 104,
-						"y": 116,
-						"w": 31,
-						"h": 57
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 3,
-						"w": 31,
-						"h": 57
-					},
-					"frame": {
-						"x": 104,
-						"y": 116,
-						"w": 31,
-						"h": 57
-					}
-				},
-				{
-					"filename": "0045.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 3,
-						"w": 31,
-						"h": 57
-					},
-					"frame": {
-						"x": 104,
-						"y": 116,
-						"w": 31,
-						"h": 57
-					}
-				},
-				{
-					"filename": "0046.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 3,
-						"w": 31,
-						"h": 57
-					},
-					"frame": {
-						"x": 104,
-						"y": 116,
-						"w": 31,
-						"h": 57
-					}
-				},
-				{
-					"filename": "0054.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 3,
-						"w": 31,
-						"h": 57
-					},
-					"frame": {
-						"x": 104,
-						"y": 116,
-						"w": 31,
-						"h": 57
-					}
-				},
-				{
-					"filename": "0055.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 3,
-						"w": 31,
-						"h": 57
-					},
-					"frame": {
-						"x": 104,
-						"y": 116,
-						"w": 31,
-						"h": 57
-					}
-				},
-				{
-					"filename": "0085.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 3,
-						"w": 31,
-						"h": 57
-					},
-					"frame": {
-						"x": 104,
-						"y": 116,
-						"w": 31,
-						"h": 57
-					}
-				},
-				{
-					"filename": "0086.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 3,
-						"w": 31,
-						"h": 57
-					},
-					"frame": {
-						"x": 104,
-						"y": 116,
-						"w": 31,
-						"h": 57
-					}
-				},
-				{
-					"filename": "0094.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 3,
-						"w": 31,
-						"h": 57
-					},
-					"frame": {
-						"x": 104,
-						"y": 116,
-						"w": 31,
-						"h": 57
-					}
-				},
-				{
-					"filename": "0095.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 3,
-						"w": 31,
-						"h": 57
-					},
-					"frame": {
-						"x": 104,
-						"y": 116,
-						"w": 31,
-						"h": 57
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 4,
-						"w": 30,
-						"h": 56
-					},
-					"frame": {
-						"x": 135,
-						"y": 116,
-						"w": 30,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 4,
-						"w": 30,
-						"h": 56
-					},
-					"frame": {
-						"x": 135,
-						"y": 116,
-						"w": 30,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 4,
-						"w": 30,
-						"h": 56
-					},
-					"frame": {
-						"x": 135,
-						"y": 116,
-						"w": 30,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 4,
-						"w": 30,
-						"h": 56
-					},
-					"frame": {
-						"x": 135,
-						"y": 116,
-						"w": 30,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0047.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 4,
-						"w": 30,
-						"h": 56
-					},
-					"frame": {
-						"x": 135,
-						"y": 116,
-						"w": 30,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0048.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 4,
-						"w": 30,
-						"h": 56
-					},
-					"frame": {
-						"x": 135,
-						"y": 116,
-						"w": 30,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0052.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 4,
-						"w": 30,
-						"h": 56
-					},
-					"frame": {
-						"x": 135,
-						"y": 116,
-						"w": 30,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0053.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 4,
-						"w": 30,
-						"h": 56
-					},
-					"frame": {
-						"x": 135,
-						"y": 116,
-						"w": 30,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0087.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 4,
-						"w": 30,
-						"h": 56
-					},
-					"frame": {
-						"x": 135,
-						"y": 116,
-						"w": 30,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0088.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 4,
-						"w": 30,
-						"h": 56
-					},
-					"frame": {
-						"x": 135,
-						"y": 116,
-						"w": 30,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0092.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 4,
-						"w": 30,
-						"h": 56
-					},
-					"frame": {
-						"x": 135,
-						"y": 116,
-						"w": 30,
-						"h": 56
-					}
-				},
-				{
-					"filename": "0093.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 38,
-						"h": 60
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 4,
-						"w": 30,
-						"h": 56
-					},
-					"frame": {
-						"x": 135,
-						"y": 116,
-						"w": 30,
-						"h": 56
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:0ae9a601cdaeb2fdd017428d743bace6:a3c21f877838702a0481b1e5447757cd:198087d69fed44d4a642fa3ba5c077d6$"
-	}
-}
diff --git a/public/images/pokemon/exp/shiny/698.png b/public/images/pokemon/exp/shiny/698.png
deleted file mode 100644
index 84d8ba3dac5..00000000000
Binary files a/public/images/pokemon/exp/shiny/698.png and /dev/null differ
diff --git a/public/images/pokemon/exp/shiny/700.json b/public/images/pokemon/exp/shiny/700.json
index 4b7158b6eb9..fd6ef9b1bed 100644
--- a/public/images/pokemon/exp/shiny/700.json
+++ b/public/images/pokemon/exp/shiny/700.json
@@ -1,1070 +1,523 @@
-{
-	"textures": [
-		{
-			"image": "700.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 233,
-				"h": 233
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 53,
-						"h": 58
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 53,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 53,
-						"h": 58
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 53,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0027.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 53,
-						"h": 58
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 53,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0038.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 53,
-						"h": 58
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 53,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 52,
-						"h": 58
-					},
-					"frame": {
-						"x": 0,
-						"y": 58,
-						"w": 52,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 52,
-						"h": 58
-					},
-					"frame": {
-						"x": 0,
-						"y": 58,
-						"w": 52,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0026.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 52,
-						"h": 58
-					},
-					"frame": {
-						"x": 0,
-						"y": 58,
-						"w": 52,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0037.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 52,
-						"h": 58
-					},
-					"frame": {
-						"x": 0,
-						"y": 58,
-						"w": 52,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 52,
-						"h": 58
-					},
-					"frame": {
-						"x": 53,
-						"y": 0,
-						"w": 52,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 52,
-						"h": 58
-					},
-					"frame": {
-						"x": 53,
-						"y": 0,
-						"w": 52,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0028.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 52,
-						"h": 58
-					},
-					"frame": {
-						"x": 53,
-						"y": 0,
-						"w": 52,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0039.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 52,
-						"h": 58
-					},
-					"frame": {
-						"x": 53,
-						"y": 0,
-						"w": 52,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 51,
-						"h": 59
-					},
-					"frame": {
-						"x": 0,
-						"y": 116,
-						"w": 51,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 51,
-						"h": 59
-					},
-					"frame": {
-						"x": 0,
-						"y": 116,
-						"w": 51,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0029.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 51,
-						"h": 59
-					},
-					"frame": {
-						"x": 0,
-						"y": 116,
-						"w": 51,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0040.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 51,
-						"h": 59
-					},
-					"frame": {
-						"x": 0,
-						"y": 116,
-						"w": 51,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0045.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 1,
-						"w": 45,
-						"h": 58
-					},
-					"frame": {
-						"x": 0,
-						"y": 175,
-						"w": 45,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0047.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 1,
-						"w": 45,
-						"h": 58
-					},
-					"frame": {
-						"x": 0,
-						"y": 175,
-						"w": 45,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 50,
-						"h": 59
-					},
-					"frame": {
-						"x": 52,
-						"y": 58,
-						"w": 50,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 50,
-						"h": 59
-					},
-					"frame": {
-						"x": 52,
-						"y": 58,
-						"w": 50,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 50,
-						"h": 59
-					},
-					"frame": {
-						"x": 52,
-						"y": 58,
-						"w": 50,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0034.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 50,
-						"h": 59
-					},
-					"frame": {
-						"x": 52,
-						"y": 58,
-						"w": 50,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0048.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 50,
-						"h": 59
-					},
-					"frame": {
-						"x": 52,
-						"y": 58,
-						"w": 50,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0050.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 50,
-						"h": 59
-					},
-					"frame": {
-						"x": 52,
-						"y": 58,
-						"w": 50,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 50,
-						"h": 59
-					},
-					"frame": {
-						"x": 105,
-						"y": 0,
-						"w": 50,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 50,
-						"h": 59
-					},
-					"frame": {
-						"x": 105,
-						"y": 0,
-						"w": 50,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 50,
-						"h": 59
-					},
-					"frame": {
-						"x": 105,
-						"y": 0,
-						"w": 50,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0035.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 50,
-						"h": 59
-					},
-					"frame": {
-						"x": 105,
-						"y": 0,
-						"w": 50,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 50,
-						"h": 59
-					},
-					"frame": {
-						"x": 155,
-						"y": 0,
-						"w": 50,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 50,
-						"h": 59
-					},
-					"frame": {
-						"x": 155,
-						"y": 0,
-						"w": 50,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0025.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 50,
-						"h": 59
-					},
-					"frame": {
-						"x": 155,
-						"y": 0,
-						"w": 50,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0036.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 50,
-						"h": 59
-					},
-					"frame": {
-						"x": 155,
-						"y": 0,
-						"w": 50,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 50,
-						"h": 59
-					},
-					"frame": {
-						"x": 51,
-						"y": 117,
-						"w": 50,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 50,
-						"h": 59
-					},
-					"frame": {
-						"x": 51,
-						"y": 117,
-						"w": 50,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0031.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 50,
-						"h": 59
-					},
-					"frame": {
-						"x": 51,
-						"y": 117,
-						"w": 50,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0042.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 50,
-						"h": 59
-					},
-					"frame": {
-						"x": 51,
-						"y": 117,
-						"w": 50,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0046.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 2,
-						"w": 42,
-						"h": 57
-					},
-					"frame": {
-						"x": 45,
-						"y": 176,
-						"w": 42,
-						"h": 57
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 50,
-						"h": 59
-					},
-					"frame": {
-						"x": 102,
-						"y": 59,
-						"w": 50,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 50,
-						"h": 59
-					},
-					"frame": {
-						"x": 102,
-						"y": 59,
-						"w": 50,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0032.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 50,
-						"h": 59
-					},
-					"frame": {
-						"x": 102,
-						"y": 59,
-						"w": 50,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0043.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 50,
-						"h": 59
-					},
-					"frame": {
-						"x": 102,
-						"y": 59,
-						"w": 50,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 50,
-						"h": 59
-					},
-					"frame": {
-						"x": 152,
-						"y": 59,
-						"w": 50,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 50,
-						"h": 59
-					},
-					"frame": {
-						"x": 152,
-						"y": 59,
-						"w": 50,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0033.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 50,
-						"h": 59
-					},
-					"frame": {
-						"x": 152,
-						"y": 59,
-						"w": 50,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0044.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 50,
-						"h": 59
-					},
-					"frame": {
-						"x": 152,
-						"y": 59,
-						"w": 50,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0049.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 50,
-						"h": 59
-					},
-					"frame": {
-						"x": 101,
-						"y": 118,
-						"w": 50,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 49,
-						"h": 59
-					},
-					"frame": {
-						"x": 151,
-						"y": 118,
-						"w": 49,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 49,
-						"h": 59
-					},
-					"frame": {
-						"x": 151,
-						"y": 118,
-						"w": 49,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0030.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 49,
-						"h": 59
-					},
-					"frame": {
-						"x": 151,
-						"y": 118,
-						"w": 49,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0041.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 53,
-						"h": 59
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 49,
-						"h": 59
-					},
-					"frame": {
-						"x": 151,
-						"y": 118,
-						"w": 49,
-						"h": 59
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:b88614ce72ee950ea29dcf939b8dfd56:5daab4ddd86f67a34aaa4b7377e3b534:2e4bf5ef1f19e475073f7da10c60b540$"
-	}
+{ "frames": {
+   "0001.png": {
+    "frame": { "x": 180, "y": 183, "w": 43, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 43, "h": 58 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   "0002.png": {
+    "frame": { "x": 136, "y": 238, "w": 43, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 43, "h": 58 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   "0003.png": {
+    "frame": { "x": 44, "y": 181, "w": 44, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 44, "h": 57 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   "0004.png": {
+    "frame": { "x": 88, "y": 239, "w": 44, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 6, "w": 44, "h": 56 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   "0005.png": {
+    "frame": { "x": 180, "y": 242, "w": 43, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 6, "w": 43, "h": 56 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   "0006.png": {
+    "frame": { "x": 93, "y": 119, "w": 45, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 45, "h": 58 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   "0007.png": {
+    "frame": { "x": 99, "y": 60, "w": 46, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 46, "h": 58 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   "0008.png": {
+    "frame": { "x": 139, "y": 119, "w": 45, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 45, "h": 58 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   "0009.png": {
+    "frame": { "x": 180, "y": 183, "w": 43, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 43, "h": 58 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   "0010.png": {
+    "frame": { "x": 136, "y": 238, "w": 43, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 43, "h": 58 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   "0011.png": {
+    "frame": { "x": 44, "y": 181, "w": 44, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 44, "h": 57 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   "0012.png": {
+    "frame": { "x": 88, "y": 239, "w": 44, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 6, "w": 44, "h": 56 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   "0013.png": {
+    "frame": { "x": 180, "y": 242, "w": 43, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 6, "w": 43, "h": 56 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   "0014.png": {
+    "frame": { "x": 0, "y": 120, "w": 45, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 45, "h": 58 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   "0015.png": {
+    "frame": { "x": 146, "y": 60, "w": 46, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 46, "h": 58 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   "0016.png": {
+    "frame": { "x": 46, "y": 122, "w": 45, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 45, "h": 58 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   "0017.png": {
+    "frame": { "x": 180, "y": 183, "w": 43, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 43, "h": 58 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   "0018.png": {
+    "frame": { "x": 136, "y": 238, "w": 43, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 43, "h": 58 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   "0019.png": {
+    "frame": { "x": 44, "y": 181, "w": 44, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 44, "h": 57 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   "0020.png": {
+    "frame": { "x": 88, "y": 239, "w": 44, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 6, "w": 44, "h": 56 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   "0021.png": {
+    "frame": { "x": 180, "y": 242, "w": 43, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 6, "w": 43, "h": 56 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   "0022.png": {
+    "frame": { "x": 93, "y": 119, "w": 45, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 45, "h": 58 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   "0023.png": {
+    "frame": { "x": 99, "y": 60, "w": 46, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 46, "h": 58 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   "0024.png": {
+    "frame": { "x": 139, "y": 119, "w": 45, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 45, "h": 58 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   "0025.png": {
+    "frame": { "x": 180, "y": 183, "w": 43, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 43, "h": 58 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   "0026.png": {
+    "frame": { "x": 136, "y": 238, "w": 43, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 43, "h": 58 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   "0027.png": {
+    "frame": { "x": 44, "y": 181, "w": 44, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 44, "h": 57 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   "0028.png": {
+    "frame": { "x": 88, "y": 239, "w": 44, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 6, "w": 44, "h": 56 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   "0029.png": {
+    "frame": { "x": 180, "y": 242, "w": 43, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 6, "w": 43, "h": 56 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   "0030.png": {
+    "frame": { "x": 0, "y": 120, "w": 45, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 45, "h": 58 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   "0031.png": {
+    "frame": { "x": 146, "y": 60, "w": 46, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 46, "h": 58 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   "0032.png": {
+    "frame": { "x": 46, "y": 122, "w": 45, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 45, "h": 58 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   "0033.png": {
+    "frame": { "x": 180, "y": 183, "w": 43, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 43, "h": 58 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   "0034.png": {
+    "frame": { "x": 136, "y": 238, "w": 43, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 43, "h": 58 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   "0035.png": {
+    "frame": { "x": 44, "y": 181, "w": 44, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 44, "h": 57 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   "0036.png": {
+    "frame": { "x": 88, "y": 239, "w": 44, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 6, "w": 44, "h": 56 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   "0037.png": {
+    "frame": { "x": 180, "y": 242, "w": 43, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 6, "w": 43, "h": 56 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   "0038.png": {
+    "frame": { "x": 93, "y": 119, "w": 45, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 45, "h": 58 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   "0039.png": {
+    "frame": { "x": 99, "y": 60, "w": 46, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 46, "h": 58 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   "0040.png": {
+    "frame": { "x": 139, "y": 119, "w": 45, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 45, "h": 58 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   "0041.png": {
+    "frame": { "x": 180, "y": 183, "w": 43, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 43, "h": 58 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   "0042.png": {
+    "frame": { "x": 136, "y": 238, "w": 43, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 43, "h": 58 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   "0043.png": {
+    "frame": { "x": 44, "y": 181, "w": 44, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 44, "h": 57 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   "0044.png": {
+    "frame": { "x": 88, "y": 239, "w": 44, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 6, "w": 44, "h": 56 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   "0045.png": {
+    "frame": { "x": 180, "y": 242, "w": 43, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 6, "w": 43, "h": 56 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   "0046.png": {
+    "frame": { "x": 0, "y": 120, "w": 45, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 45, "h": 58 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   "0047.png": {
+    "frame": { "x": 146, "y": 60, "w": 46, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 46, "h": 58 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   "0048.png": {
+    "frame": { "x": 46, "y": 122, "w": 45, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 45, "h": 58 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   "0049.png": {
+    "frame": { "x": 0, "y": 239, "w": 43, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 43, "h": 58 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   "0050.png": {
+    "frame": { "x": 193, "y": 60, "w": 43, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 43, "h": 62 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   "0051.png": {
+    "frame": { "x": 99, "y": 0, "w": 47, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 47, "h": 59 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   "0052.png": {
+    "frame": { "x": 147, "y": 0, "w": 47, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 47, "h": 59 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   "0053.png": {
+    "frame": { "x": 0, "y": 0, "w": 51, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 51, "h": 59 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   "0054.png": {
+    "frame": { "x": 0, "y": 60, "w": 46, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 46, "h": 59 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   "0055.png": {
+    "frame": { "x": 92, "y": 178, "w": 43, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 43, "h": 60 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   "0056.png": {
+    "frame": { "x": 195, "y": 0, "w": 47, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 47, "h": 59 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   "0057.png": {
+    "frame": { "x": 52, "y": 0, "w": 46, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 46, "h": 61 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   "0058.png": {
+    "frame": { "x": 136, "y": 178, "w": 43, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 43, "h": 59 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   "0059.png": {
+    "frame": { "x": 195, "y": 0, "w": 47, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 47, "h": 59 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   "0060.png": {
+    "frame": { "x": 52, "y": 0, "w": 46, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 46, "h": 61 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   "0061.png": {
+    "frame": { "x": 0, "y": 179, "w": 43, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 43, "h": 59 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   "0062.png": {
+    "frame": { "x": 185, "y": 123, "w": 44, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 44, "h": 59 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   "0063.png": {
+    "frame": { "x": 47, "y": 62, "w": 45, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 45, "h": 59 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   },
+   "0064.png": {
+    "frame": { "x": 44, "y": 239, "w": 43, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 43, "h": 58 },
+    "sourceSize": { "w": 51, "h": 62 },
+    "duration": 100
+   }
+ },
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.11-x64",
+  "image": "700.png",
+  "format": "I8",
+  "size": { "w": 242, "h": 298 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/shiny/700.png b/public/images/pokemon/exp/shiny/700.png
index 5c809e628f5..f7addc720bf 100644
Binary files a/public/images/pokemon/exp/shiny/700.png and b/public/images/pokemon/exp/shiny/700.png differ
diff --git a/public/images/pokemon/exp/shiny/702.json b/public/images/pokemon/exp/shiny/702.json
index fc28cb19512..0ab95b58c7a 100644
--- a/public/images/pokemon/exp/shiny/702.json
+++ b/public/images/pokemon/exp/shiny/702.json
@@ -1,671 +1,443 @@
-{
-	"textures": [
-		{
-			"image": "702.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 138,
-				"h": 138
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 48,
-						"h": 36
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 48,
-						"h": 36
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 48,
-						"h": 36
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 48,
-						"h": 36
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 48,
-						"h": 36
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 48,
-						"h": 36
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 48,
-						"h": 36
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 48,
-						"h": 36
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 48,
-						"h": 36
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 48,
-						"h": 36
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 48,
-						"h": 36
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 48,
-						"h": 36
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 48,
-						"h": 36
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 48,
-						"h": 36
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 48,
-						"h": 36
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 48,
-						"h": 36
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 48,
-						"h": 36
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 48,
-						"h": 36
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 48,
-						"h": 36
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 48,
-						"h": 36
-					},
-					"frame": {
-						"x": 48,
-						"y": 0,
-						"w": 48,
-						"h": 36
-					}
-				},
-				{
-					"filename": "0031.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 48,
-						"h": 36
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 48,
-						"h": 36
-					},
-					"frame": {
-						"x": 48,
-						"y": 0,
-						"w": 48,
-						"h": 36
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 36
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 47,
-						"h": 36
-					},
-					"frame": {
-						"x": 0,
-						"y": 36,
-						"w": 47,
-						"h": 36
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 36
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 47,
-						"h": 36
-					},
-					"frame": {
-						"x": 0,
-						"y": 36,
-						"w": 47,
-						"h": 36
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 36
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 47,
-						"h": 36
-					},
-					"frame": {
-						"x": 0,
-						"y": 36,
-						"w": 47,
-						"h": 36
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 36
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 47,
-						"h": 36
-					},
-					"frame": {
-						"x": 0,
-						"y": 36,
-						"w": 47,
-						"h": 36
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 36
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 47,
-						"h": 36
-					},
-					"frame": {
-						"x": 0,
-						"y": 36,
-						"w": 47,
-						"h": 36
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 36
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 47,
-						"h": 36
-					},
-					"frame": {
-						"x": 0,
-						"y": 36,
-						"w": 47,
-						"h": 36
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 36
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 45,
-						"h": 36
-					},
-					"frame": {
-						"x": 0,
-						"y": 72,
-						"w": 45,
-						"h": 36
-					}
-				},
-				{
-					"filename": "0030.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 36
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 45,
-						"h": 36
-					},
-					"frame": {
-						"x": 0,
-						"y": 72,
-						"w": 45,
-						"h": 36
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 36
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 48,
-						"h": 35
-					},
-					"frame": {
-						"x": 45,
-						"y": 72,
-						"w": 48,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 36
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 48,
-						"h": 35
-					},
-					"frame": {
-						"x": 45,
-						"y": 72,
-						"w": 48,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 36
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 48,
-						"h": 35
-					},
-					"frame": {
-						"x": 45,
-						"y": 72,
-						"w": 48,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 36
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 48,
-						"h": 35
-					},
-					"frame": {
-						"x": 45,
-						"y": 72,
-						"w": 48,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 36
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 48,
-						"h": 35
-					},
-					"frame": {
-						"x": 45,
-						"y": 72,
-						"w": 48,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 36
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 48,
-						"h": 35
-					},
-					"frame": {
-						"x": 45,
-						"y": 72,
-						"w": 48,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 36
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 44,
-						"h": 35
-					},
-					"frame": {
-						"x": 47,
-						"y": 36,
-						"w": 44,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0026.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 36
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 44,
-						"h": 35
-					},
-					"frame": {
-						"x": 47,
-						"y": 36,
-						"w": 44,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0028.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 36
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 44,
-						"h": 35
-					},
-					"frame": {
-						"x": 47,
-						"y": 36,
-						"w": 44,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 36
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 47,
-						"h": 33
-					},
-					"frame": {
-						"x": 91,
-						"y": 36,
-						"w": 47,
-						"h": 33
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 36
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 47,
-						"h": 33
-					},
-					"frame": {
-						"x": 91,
-						"y": 36,
-						"w": 47,
-						"h": 33
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 36
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 47,
-						"h": 33
-					},
-					"frame": {
-						"x": 91,
-						"y": 36,
-						"w": 47,
-						"h": 33
-					}
-				},
-				{
-					"filename": "0025.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 36
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 44,
-						"h": 35
-					},
-					"frame": {
-						"x": 93,
-						"y": 69,
-						"w": 44,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0027.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 36
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 44,
-						"h": 35
-					},
-					"frame": {
-						"x": 93,
-						"y": 69,
-						"w": 44,
-						"h": 35
-					}
-				},
-				{
-					"filename": "0029.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 36
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 44,
-						"h": 35
-					},
-					"frame": {
-						"x": 93,
-						"y": 69,
-						"w": 44,
-						"h": 35
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:2fc3a964a6785b059da0b8d24f80fbd1:ec3deecdcac6775e64f154a58c36eef3:ba8fdab405d5efab99c4aa1084328e6b$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 144, "y": 0, "w": 46, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 46, "h": 36 },
+    "sourceSize": { "w": 47, "h": 36 },
+    "duration": 110
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 0, "y": 0, "w": 47, "h": 36 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 47, "h": 36 },
+    "sourceSize": { "w": 47, "h": 36 },
+    "duration": 110
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 0, "y": 37, "w": 46, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 46, "h": 36 },
+    "sourceSize": { "w": 47, "h": 36 },
+    "duration": 110
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 0, "y": 111, "w": 46, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 46, "h": 33 },
+    "sourceSize": { "w": 47, "h": 36 },
+    "duration": 110
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 47, "y": 111, "w": 46, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 46, "h": 33 },
+    "sourceSize": { "w": 47, "h": 36 },
+    "duration": 110
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 47, "y": 37, "w": 46, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 46, "h": 36 },
+    "sourceSize": { "w": 47, "h": 36 },
+    "duration": 110
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 94, "y": 37, "w": 46, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 46, "h": 36 },
+    "sourceSize": { "w": 47, "h": 36 },
+    "duration": 110
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 141, "y": 74, "w": 45, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 45, "h": 36 },
+    "sourceSize": { "w": 47, "h": 36 },
+    "duration": 110
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 144, "y": 0, "w": 46, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 46, "h": 36 },
+    "sourceSize": { "w": 47, "h": 36 },
+    "duration": 110
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 0, "y": 0, "w": 47, "h": 36 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 47, "h": 36 },
+    "sourceSize": { "w": 47, "h": 36 },
+    "duration": 110
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 0, "y": 37, "w": 46, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 46, "h": 36 },
+    "sourceSize": { "w": 47, "h": 36 },
+    "duration": 110
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 0, "y": 111, "w": 46, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 46, "h": 33 },
+    "sourceSize": { "w": 47, "h": 36 },
+    "duration": 110
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 47, "y": 111, "w": 46, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 46, "h": 33 },
+    "sourceSize": { "w": 47, "h": 36 },
+    "duration": 110
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 47, "y": 37, "w": 46, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 46, "h": 36 },
+    "sourceSize": { "w": 47, "h": 36 },
+    "duration": 110
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 94, "y": 37, "w": 46, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 46, "h": 36 },
+    "sourceSize": { "w": 47, "h": 36 },
+    "duration": 110
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 141, "y": 74, "w": 45, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 45, "h": 36 },
+    "sourceSize": { "w": 47, "h": 36 },
+    "duration": 110
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 144, "y": 0, "w": 46, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 46, "h": 36 },
+    "sourceSize": { "w": 47, "h": 36 },
+    "duration": 110
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 0, "y": 0, "w": 47, "h": 36 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 47, "h": 36 },
+    "sourceSize": { "w": 47, "h": 36 },
+    "duration": 110
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 0, "y": 37, "w": 46, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 46, "h": 36 },
+    "sourceSize": { "w": 47, "h": 36 },
+    "duration": 110
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 0, "y": 111, "w": 46, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 46, "h": 33 },
+    "sourceSize": { "w": 47, "h": 36 },
+    "duration": 110
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 47, "y": 111, "w": 46, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 46, "h": 33 },
+    "sourceSize": { "w": 47, "h": 36 },
+    "duration": 110
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 47, "y": 37, "w": 46, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 46, "h": 36 },
+    "sourceSize": { "w": 47, "h": 36 },
+    "duration": 110
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 94, "y": 37, "w": 46, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 46, "h": 36 },
+    "sourceSize": { "w": 47, "h": 36 },
+    "duration": 110
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 141, "y": 74, "w": 45, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 45, "h": 36 },
+    "sourceSize": { "w": 47, "h": 36 },
+    "duration": 110
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 144, "y": 0, "w": 46, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 46, "h": 36 },
+    "sourceSize": { "w": 47, "h": 36 },
+    "duration": 110
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 0, "y": 0, "w": 47, "h": 36 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 47, "h": 36 },
+    "sourceSize": { "w": 47, "h": 36 },
+    "duration": 110
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 0, "y": 37, "w": 46, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 46, "h": 36 },
+    "sourceSize": { "w": 47, "h": 36 },
+    "duration": 110
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 0, "y": 111, "w": 46, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 46, "h": 33 },
+    "sourceSize": { "w": 47, "h": 36 },
+    "duration": 110
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 47, "y": 111, "w": 46, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 46, "h": 33 },
+    "sourceSize": { "w": 47, "h": 36 },
+    "duration": 110
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 47, "y": 37, "w": 46, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 46, "h": 36 },
+    "sourceSize": { "w": 47, "h": 36 },
+    "duration": 110
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 94, "y": 37, "w": 46, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 46, "h": 36 },
+    "sourceSize": { "w": 47, "h": 36 },
+    "duration": 110
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 141, "y": 74, "w": 45, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 45, "h": 36 },
+    "sourceSize": { "w": 47, "h": 36 },
+    "duration": 110
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 144, "y": 0, "w": 46, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 46, "h": 36 },
+    "sourceSize": { "w": 47, "h": 36 },
+    "duration": 110
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 0, "y": 0, "w": 47, "h": 36 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 47, "h": 36 },
+    "sourceSize": { "w": 47, "h": 36 },
+    "duration": 110
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 0, "y": 37, "w": 46, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 46, "h": 36 },
+    "sourceSize": { "w": 47, "h": 36 },
+    "duration": 110
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 94, "y": 111, "w": 46, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 46, "h": 33 },
+    "sourceSize": { "w": 47, "h": 36 },
+    "duration": 110
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 141, "y": 111, "w": 46, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 46, "h": 33 },
+    "sourceSize": { "w": 47, "h": 36 },
+    "duration": 110
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 141, "y": 37, "w": 46, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 46, "h": 36 },
+    "sourceSize": { "w": 47, "h": 36 },
+    "duration": 110
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 188, "y": 37, "w": 46, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 46, "h": 36 },
+    "sourceSize": { "w": 47, "h": 36 },
+    "duration": 110
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 144, "y": 0, "w": 46, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 46, "h": 36 },
+    "sourceSize": { "w": 47, "h": 36 },
+    "duration": 110
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 48, "y": 0, "w": 47, "h": 36 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 47, "h": 36 },
+    "sourceSize": { "w": 47, "h": 36 },
+    "duration": 110
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 0, "y": 74, "w": 46, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 46, "h": 36 },
+    "sourceSize": { "w": 47, "h": 36 },
+    "duration": 110
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 188, "y": 111, "w": 46, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 46, "h": 33 },
+    "sourceSize": { "w": 47, "h": 36 },
+    "duration": 110
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 0, "y": 145, "w": 45, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 45, "h": 33 },
+    "sourceSize": { "w": 47, "h": 36 },
+    "duration": 110
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 96, "y": 0, "w": 47, "h": 36 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 47, "h": 36 },
+    "sourceSize": { "w": 47, "h": 36 },
+    "duration": 110
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 47, "y": 74, "w": 46, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 46, "h": 36 },
+    "sourceSize": { "w": 47, "h": 36 },
+    "duration": 110
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 94, "y": 74, "w": 46, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 46, "h": 36 },
+    "sourceSize": { "w": 47, "h": 36 },
+    "duration": 110
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 187, "y": 74, "w": 45, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 45, "h": 36 },
+    "sourceSize": { "w": 47, "h": 36 },
+    "duration": 110
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.11-x64",
+  "image": "702.png",
+  "format": "I8",
+  "size": { "w": 234, "h": 178 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/shiny/702.png b/public/images/pokemon/exp/shiny/702.png
index b7e117c9473..2f7b735a1dc 100644
Binary files a/public/images/pokemon/exp/shiny/702.png and b/public/images/pokemon/exp/shiny/702.png differ
diff --git a/public/images/pokemon/exp/shiny/703.json b/public/images/pokemon/exp/shiny/703.json
deleted file mode 100644
index 4762fa91a2c..00000000000
--- a/public/images/pokemon/exp/shiny/703.json
+++ /dev/null
@@ -1,356 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "703.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 120,
-				"h": 120
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 37,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 37,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 37,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 41,
-						"w": 37,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 37,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 37,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 41,
-						"w": 37,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 37,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 37,
-						"h": 40
-					},
-					"frame": {
-						"x": 37,
-						"y": 0,
-						"w": 37,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 37,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 37,
-						"h": 40
-					},
-					"frame": {
-						"x": 37,
-						"y": 0,
-						"w": 37,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 37,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 37,
-						"h": 40
-					},
-					"frame": {
-						"x": 37,
-						"y": 0,
-						"w": 37,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 37,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 37,
-						"h": 40
-					},
-					"frame": {
-						"x": 37,
-						"y": 0,
-						"w": 37,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 37,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 8,
-						"w": 37,
-						"h": 40
-					},
-					"frame": {
-						"x": 37,
-						"y": 0,
-						"w": 37,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 37,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 8,
-						"w": 37,
-						"h": 40
-					},
-					"frame": {
-						"x": 37,
-						"y": 0,
-						"w": 37,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 37,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 10,
-						"w": 37,
-						"h": 40
-					},
-					"frame": {
-						"x": 37,
-						"y": 0,
-						"w": 37,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 37,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 11,
-						"w": 37,
-						"h": 40
-					},
-					"frame": {
-						"x": 74,
-						"y": 0,
-						"w": 37,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 37,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 35,
-						"h": 41
-					},
-					"frame": {
-						"x": 37,
-						"y": 40,
-						"w": 35,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 37,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 35,
-						"h": 41
-					},
-					"frame": {
-						"x": 37,
-						"y": 40,
-						"w": 35,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 37,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 12,
-						"w": 35,
-						"h": 39
-					},
-					"frame": {
-						"x": 37,
-						"y": 81,
-						"w": 35,
-						"h": 39
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 37,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 40
-					},
-					"frame": {
-						"x": 72,
-						"y": 40,
-						"w": 37,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 37,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 7,
-						"w": 35,
-						"h": 40
-					},
-					"frame": {
-						"x": 72,
-						"y": 80,
-						"w": 35,
-						"h": 40
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:253ca4296d88ee81990e3297ca0f62aa:8f78420201adcea5fb7920c60446c81d:721af8c322ff60159262e9b3017c784d$"
-	}
-}
diff --git a/public/images/pokemon/exp/shiny/703.png b/public/images/pokemon/exp/shiny/703.png
deleted file mode 100644
index 4e4064509ae..00000000000
Binary files a/public/images/pokemon/exp/shiny/703.png and /dev/null differ
diff --git a/public/images/pokemon/exp/shiny/704.json b/public/images/pokemon/exp/shiny/704.json
index d14609ad74c..4241b2d2a8d 100644
--- a/public/images/pokemon/exp/shiny/704.json
+++ b/public/images/pokemon/exp/shiny/704.json
@@ -1,1784 +1,371 @@
-{
-	"textures": [
-		{
-			"image": "704.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 288,
-				"h": 288
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0040.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 43,
-						"h": 48
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 43,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0045.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 43,
-						"h": 48
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 43,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0041.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 43,
-						"h": 48
-					},
-					"frame": {
-						"x": 0,
-						"y": 48,
-						"w": 43,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0044.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 43,
-						"h": 48
-					},
-					"frame": {
-						"x": 0,
-						"y": 48,
-						"w": 43,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0042.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 43,
-						"h": 48
-					},
-					"frame": {
-						"x": 0,
-						"y": 96,
-						"w": 43,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0043.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 43,
-						"h": 48
-					},
-					"frame": {
-						"x": 0,
-						"y": 96,
-						"w": 43,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0039.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 43,
-						"h": 47
-					},
-					"frame": {
-						"x": 0,
-						"y": 144,
-						"w": 43,
-						"h": 47
-					}
-				},
-				{
-					"filename": "0046.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 43,
-						"h": 47
-					},
-					"frame": {
-						"x": 0,
-						"y": 144,
-						"w": 43,
-						"h": 47
-					}
-				},
-				{
-					"filename": "0038.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 41,
-						"h": 46
-					},
-					"frame": {
-						"x": 0,
-						"y": 191,
-						"w": 41,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0047.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 41,
-						"h": 46
-					},
-					"frame": {
-						"x": 0,
-						"y": 191,
-						"w": 41,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0037.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 39,
-						"h": 45
-					},
-					"frame": {
-						"x": 0,
-						"y": 237,
-						"w": 39,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0048.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 39,
-						"h": 45
-					},
-					"frame": {
-						"x": 0,
-						"y": 237,
-						"w": 39,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 41,
-						"h": 44
-					},
-					"frame": {
-						"x": 39,
-						"y": 237,
-						"w": 41,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 41,
-						"h": 44
-					},
-					"frame": {
-						"x": 39,
-						"y": 237,
-						"w": 41,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0055.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 41,
-						"h": 44
-					},
-					"frame": {
-						"x": 39,
-						"y": 237,
-						"w": 41,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0072.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 41,
-						"h": 44
-					},
-					"frame": {
-						"x": 39,
-						"y": 237,
-						"w": 41,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 41,
-						"h": 44
-					},
-					"frame": {
-						"x": 41,
-						"y": 191,
-						"w": 41,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0080.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 41,
-						"h": 44
-					},
-					"frame": {
-						"x": 41,
-						"y": 191,
-						"w": 41,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0030.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 41,
-						"h": 44
-					},
-					"frame": {
-						"x": 80,
-						"y": 235,
-						"w": 41,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 42,
-						"h": 43
-					},
-					"frame": {
-						"x": 121,
-						"y": 0,
-						"w": 42,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0056.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 42,
-						"h": 43
-					},
-					"frame": {
-						"x": 121,
-						"y": 0,
-						"w": 42,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 4,
-						"w": 39,
-						"h": 44
-					},
-					"frame": {
-						"x": 82,
-						"y": 0,
-						"w": 39,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 4,
-						"w": 39,
-						"h": 44
-					},
-					"frame": {
-						"x": 82,
-						"y": 0,
-						"w": 39,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0071.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 4,
-						"w": 39,
-						"h": 44
-					},
-					"frame": {
-						"x": 82,
-						"y": 0,
-						"w": 39,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 4,
-						"w": 39,
-						"h": 44
-					},
-					"frame": {
-						"x": 43,
-						"y": 0,
-						"w": 39,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 42,
-						"h": 43
-					},
-					"frame": {
-						"x": 163,
-						"y": 0,
-						"w": 42,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 42,
-						"h": 43
-					},
-					"frame": {
-						"x": 163,
-						"y": 0,
-						"w": 42,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0029.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 42,
-						"h": 43
-					},
-					"frame": {
-						"x": 163,
-						"y": 0,
-						"w": 42,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0062.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 42,
-						"h": 43
-					},
-					"frame": {
-						"x": 163,
-						"y": 0,
-						"w": 42,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0079.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 42,
-						"h": 43
-					},
-					"frame": {
-						"x": 163,
-						"y": 0,
-						"w": 42,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0073.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 42,
-						"h": 43
-					},
-					"frame": {
-						"x": 205,
-						"y": 0,
-						"w": 42,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0063.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 41,
-						"h": 44
-					},
-					"frame": {
-						"x": 247,
-						"y": 0,
-						"w": 41,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 42,
-						"h": 42
-					},
-					"frame": {
-						"x": 121,
-						"y": 43,
-						"w": 42,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 42,
-						"h": 42
-					},
-					"frame": {
-						"x": 121,
-						"y": 43,
-						"w": 42,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 42,
-						"h": 42
-					},
-					"frame": {
-						"x": 121,
-						"y": 43,
-						"w": 42,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0028.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 42,
-						"h": 42
-					},
-					"frame": {
-						"x": 121,
-						"y": 43,
-						"w": 42,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0057.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 42,
-						"h": 42
-					},
-					"frame": {
-						"x": 121,
-						"y": 43,
-						"w": 42,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0061.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 42,
-						"h": 42
-					},
-					"frame": {
-						"x": 121,
-						"y": 43,
-						"w": 42,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0078.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 42,
-						"h": 42
-					},
-					"frame": {
-						"x": 121,
-						"y": 43,
-						"w": 42,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0031.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 4,
-						"w": 39,
-						"h": 44
-					},
-					"frame": {
-						"x": 82,
-						"y": 44,
-						"w": 39,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0054.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 4,
-						"w": 39,
-						"h": 44
-					},
-					"frame": {
-						"x": 82,
-						"y": 44,
-						"w": 39,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0064.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 4,
-						"w": 39,
-						"h": 44
-					},
-					"frame": {
-						"x": 43,
-						"y": 44,
-						"w": 39,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0081.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 4,
-						"w": 39,
-						"h": 44
-					},
-					"frame": {
-						"x": 43,
-						"y": 44,
-						"w": 39,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0074.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 42,
-						"h": 42
-					},
-					"frame": {
-						"x": 163,
-						"y": 43,
-						"w": 42,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 42,
-						"h": 41
-					},
-					"frame": {
-						"x": 205,
-						"y": 43,
-						"w": 42,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 42,
-						"h": 41
-					},
-					"frame": {
-						"x": 205,
-						"y": 43,
-						"w": 42,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0025.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 42,
-						"h": 41
-					},
-					"frame": {
-						"x": 205,
-						"y": 43,
-						"w": 42,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0027.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 42,
-						"h": 41
-					},
-					"frame": {
-						"x": 205,
-						"y": 43,
-						"w": 42,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0058.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 42,
-						"h": 41
-					},
-					"frame": {
-						"x": 205,
-						"y": 43,
-						"w": 42,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0060.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 42,
-						"h": 41
-					},
-					"frame": {
-						"x": 205,
-						"y": 43,
-						"w": 42,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0075.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 42,
-						"h": 41
-					},
-					"frame": {
-						"x": 205,
-						"y": 43,
-						"w": 42,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0077.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 42,
-						"h": 41
-					},
-					"frame": {
-						"x": 205,
-						"y": 43,
-						"w": 42,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 4,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 247,
-						"y": 44,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 8,
-						"w": 42,
-						"h": 40
-					},
-					"frame": {
-						"x": 205,
-						"y": 84,
-						"w": 42,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0026.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 8,
-						"w": 42,
-						"h": 40
-					},
-					"frame": {
-						"x": 205,
-						"y": 84,
-						"w": 42,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0059.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 8,
-						"w": 42,
-						"h": 40
-					},
-					"frame": {
-						"x": 205,
-						"y": 84,
-						"w": 42,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0032.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 4,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 247,
-						"y": 88,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0053.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 4,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 247,
-						"y": 88,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0049.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 4,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 43,
-						"y": 132,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0065.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 4,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 43,
-						"y": 88,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0082.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 4,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 43,
-						"y": 88,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 81,
-						"y": 132,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 81,
-						"y": 132,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0070.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 81,
-						"y": 132,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0036.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 37,
-						"h": 44
-					},
-					"frame": {
-						"x": 81,
-						"y": 88,
-						"w": 37,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 36,
-						"h": 44
-					},
-					"frame": {
-						"x": 82,
-						"y": 176,
-						"w": 36,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0069.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 36,
-						"h": 44
-					},
-					"frame": {
-						"x": 82,
-						"y": 176,
-						"w": 36,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0076.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 8,
-						"w": 42,
-						"h": 40
-					},
-					"frame": {
-						"x": 121,
-						"y": 85,
-						"w": 42,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 36,
-						"h": 44
-					},
-					"frame": {
-						"x": 163,
-						"y": 85,
-						"w": 36,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 36,
-						"h": 44
-					},
-					"frame": {
-						"x": 121,
-						"y": 125,
-						"w": 36,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0033.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 36,
-						"h": 44
-					},
-					"frame": {
-						"x": 199,
-						"y": 124,
-						"w": 36,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0052.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 36,
-						"h": 44
-					},
-					"frame": {
-						"x": 199,
-						"y": 124,
-						"w": 36,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0066.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 36,
-						"h": 44
-					},
-					"frame": {
-						"x": 157,
-						"y": 129,
-						"w": 36,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0083.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 36,
-						"h": 44
-					},
-					"frame": {
-						"x": 121,
-						"y": 169,
-						"w": 36,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 5,
-						"w": 36,
-						"h": 43
-					},
-					"frame": {
-						"x": 235,
-						"y": 132,
-						"w": 36,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0068.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 5,
-						"w": 36,
-						"h": 43
-					},
-					"frame": {
-						"x": 235,
-						"y": 132,
-						"w": 36,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 5,
-						"w": 36,
-						"h": 43
-					},
-					"frame": {
-						"x": 193,
-						"y": 168,
-						"w": 36,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 5,
-						"w": 36,
-						"h": 43
-					},
-					"frame": {
-						"x": 157,
-						"y": 173,
-						"w": 36,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0034.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 5,
-						"w": 36,
-						"h": 43
-					},
-					"frame": {
-						"x": 121,
-						"y": 213,
-						"w": 36,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0035.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 5,
-						"w": 36,
-						"h": 43
-					},
-					"frame": {
-						"x": 229,
-						"y": 175,
-						"w": 36,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0050.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 5,
-						"w": 36,
-						"h": 43
-					},
-					"frame": {
-						"x": 193,
-						"y": 211,
-						"w": 36,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0051.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 5,
-						"w": 36,
-						"h": 43
-					},
-					"frame": {
-						"x": 157,
-						"y": 216,
-						"w": 36,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0067.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 5,
-						"w": 36,
-						"h": 43
-					},
-					"frame": {
-						"x": 229,
-						"y": 218,
-						"w": 36,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0084.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 43,
-						"h": 48
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 5,
-						"w": 36,
-						"h": 43
-					},
-					"frame": {
-						"x": 229,
-						"y": 218,
-						"w": 36,
-						"h": 43
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:c2301c17b022e36ed40b13f27d705543:87a73272ea48477e6b25b210421da5ec:45bb13be23ae6e2a6654a2a00c450d62$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 0, "y": 0, "w": 26, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 26, "h": 34 },
+    "sourceSize": { "w": 28, "h": 34 },
+    "duration": 150
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 0, "y": 34, "w": 26, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 26, "h": 33 },
+    "sourceSize": { "w": 28, "h": 34 },
+    "duration": 150
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 78, "y": 0, "w": 28, "h": 31 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 28, "h": 31 },
+    "sourceSize": { "w": 28, "h": 34 },
+    "duration": 150
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 0, "y": 34, "w": 26, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 26, "h": 33 },
+    "sourceSize": { "w": 28, "h": 34 },
+    "duration": 150
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 0, "y": 0, "w": 26, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 26, "h": 34 },
+    "sourceSize": { "w": 28, "h": 34 },
+    "duration": 150
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 0, "y": 0, "w": 26, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 26, "h": 34 },
+    "sourceSize": { "w": 28, "h": 34 },
+    "duration": 150
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 78, "y": 62, "w": 26, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 26, "h": 32 },
+    "sourceSize": { "w": 28, "h": 34 },
+    "duration": 150
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 52, "y": 94, "w": 28, "h": 29 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 28, "h": 29 },
+    "sourceSize": { "w": 28, "h": 34 },
+    "duration": 150
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 78, "y": 62, "w": 26, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 26, "h": 32 },
+    "sourceSize": { "w": 28, "h": 34 },
+    "duration": 150
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 0, "y": 0, "w": 26, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 26, "h": 34 },
+    "sourceSize": { "w": 28, "h": 34 },
+    "duration": 150
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 0, "y": 0, "w": 26, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 26, "h": 34 },
+    "sourceSize": { "w": 28, "h": 34 },
+    "duration": 150
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 0, "y": 34, "w": 26, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 26, "h": 33 },
+    "sourceSize": { "w": 28, "h": 34 },
+    "duration": 150
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 78, "y": 0, "w": 28, "h": 31 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 28, "h": 31 },
+    "sourceSize": { "w": 28, "h": 34 },
+    "duration": 150
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 0, "y": 34, "w": 26, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 26, "h": 33 },
+    "sourceSize": { "w": 28, "h": 34 },
+    "duration": 150
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 0, "y": 0, "w": 26, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 26, "h": 34 },
+    "sourceSize": { "w": 28, "h": 34 },
+    "duration": 150
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 0, "y": 0, "w": 26, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 26, "h": 34 },
+    "sourceSize": { "w": 28, "h": 34 },
+    "duration": 150
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 78, "y": 62, "w": 26, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 26, "h": 32 },
+    "sourceSize": { "w": 28, "h": 34 },
+    "duration": 150
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 52, "y": 94, "w": 28, "h": 29 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 28, "h": 29 },
+    "sourceSize": { "w": 28, "h": 34 },
+    "duration": 150
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 78, "y": 62, "w": 26, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 26, "h": 32 },
+    "sourceSize": { "w": 28, "h": 34 },
+    "duration": 150
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 0, "y": 0, "w": 26, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 26, "h": 34 },
+    "sourceSize": { "w": 28, "h": 34 },
+    "duration": 150
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 0, "y": 0, "w": 26, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 26, "h": 34 },
+    "sourceSize": { "w": 28, "h": 34 },
+    "duration": 150
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 0, "y": 34, "w": 26, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 26, "h": 33 },
+    "sourceSize": { "w": 28, "h": 34 },
+    "duration": 150
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 78, "y": 0, "w": 28, "h": 31 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 28, "h": 31 },
+    "sourceSize": { "w": 28, "h": 34 },
+    "duration": 150
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 0, "y": 34, "w": 26, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 26, "h": 33 },
+    "sourceSize": { "w": 28, "h": 34 },
+    "duration": 150
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 0, "y": 0, "w": 26, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 26, "h": 34 },
+    "sourceSize": { "w": 28, "h": 34 },
+    "duration": 150
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 26, "y": 0, "w": 26, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 26, "h": 34 },
+    "sourceSize": { "w": 28, "h": 34 },
+    "duration": 150
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 0, "y": 67, "w": 26, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 26, "h": 32 },
+    "sourceSize": { "w": 28, "h": 34 },
+    "duration": 150
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 80, "y": 94, "w": 28, "h": 29 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 28, "h": 29 },
+    "sourceSize": { "w": 28, "h": 34 },
+    "duration": 150
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 78, "y": 62, "w": 26, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 26, "h": 32 },
+    "sourceSize": { "w": 28, "h": 34 },
+    "duration": 150
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 0, "y": 0, "w": 26, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 26, "h": 34 },
+    "sourceSize": { "w": 28, "h": 34 },
+    "duration": 150
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 0, "y": 0, "w": 26, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 26, "h": 34 },
+    "sourceSize": { "w": 28, "h": 34 },
+    "duration": 150
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 26, "y": 34, "w": 26, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 26, "h": 33 },
+    "sourceSize": { "w": 28, "h": 34 },
+    "duration": 150
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 78, "y": 31, "w": 28, "h": 31 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 28, "h": 31 },
+    "sourceSize": { "w": 28, "h": 34 },
+    "duration": 150
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 52, "y": 34, "w": 26, "h": 33 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 26, "h": 33 },
+    "sourceSize": { "w": 28, "h": 34 },
+    "duration": 150
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 52, "y": 0, "w": 26, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 26, "h": 34 },
+    "sourceSize": { "w": 28, "h": 34 },
+    "duration": 150
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 52, "y": 0, "w": 26, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 26, "h": 34 },
+    "sourceSize": { "w": 28, "h": 34 },
+    "duration": 150
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 26, "y": 67, "w": 26, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 26, "h": 32 },
+    "sourceSize": { "w": 28, "h": 34 },
+    "duration": 150
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 0, "y": 99, "w": 28, "h": 29 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 28, "h": 29 },
+    "sourceSize": { "w": 28, "h": 34 },
+    "duration": 150
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 78, "y": 62, "w": 26, "h": 32 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 26, "h": 32 },
+    "sourceSize": { "w": 28, "h": 34 },
+    "duration": 150
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 0, "y": 0, "w": 26, "h": 34 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 26, "h": 34 },
+    "sourceSize": { "w": 28, "h": 34 },
+    "duration": 150
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "704.png",
+  "format": "RGBA8888",
+  "size": { "w": 108, "h": 128 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/shiny/704.png b/public/images/pokemon/exp/shiny/704.png
index ac31e9da30c..d630d161de1 100644
Binary files a/public/images/pokemon/exp/shiny/704.png and b/public/images/pokemon/exp/shiny/704.png differ
diff --git a/public/images/pokemon/exp/shiny/705.json b/public/images/pokemon/exp/shiny/705.json
index 1d18b10d3a0..bc7b5ff15d3 100644
--- a/public/images/pokemon/exp/shiny/705.json
+++ b/public/images/pokemon/exp/shiny/705.json
@@ -1,272 +1,596 @@
-{
-	"textures": [
-		{
-			"image": "705.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 154,
-				"h": 154
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 46,
-						"h": 58
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 46,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 46,
-						"h": 58
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 46,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 45,
-						"h": 58
-					},
-					"frame": {
-						"x": 46,
-						"y": 0,
-						"w": 45,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 45,
-						"h": 58
-					},
-					"frame": {
-						"x": 46,
-						"y": 0,
-						"w": 45,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 45,
-						"h": 58
-					},
-					"frame": {
-						"x": 91,
-						"y": 0,
-						"w": 45,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 42,
-						"h": 58
-					},
-					"frame": {
-						"x": 0,
-						"y": 58,
-						"w": 42,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 42,
-						"h": 58
-					},
-					"frame": {
-						"x": 0,
-						"y": 58,
-						"w": 42,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 58
-					},
-					"frame": {
-						"x": 42,
-						"y": 58,
-						"w": 41,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 58
-					},
-					"frame": {
-						"x": 42,
-						"y": 58,
-						"w": 41,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 36,
-						"h": 58
-					},
-					"frame": {
-						"x": 83,
-						"y": 58,
-						"w": 36,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 36,
-						"h": 58
-					},
-					"frame": {
-						"x": 83,
-						"y": 58,
-						"w": 36,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 58
-					},
-					"frame": {
-						"x": 119,
-						"y": 58,
-						"w": 35,
-						"h": 58
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:eb2c6abdfceb0458f6389a25d31f9dab:0ef587160e8636cec6566f480554985e:6b57e983626c7fc9144ab67f30c66814$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 38, "y": 186, "w": 40, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 40, "h": 60 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 78, "y": 189, "w": 40, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 40, "h": 59 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 77, "y": 304, "w": 39, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 7, "w": 39, "h": 57 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 197, "y": 246, "w": 41, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 8, "w": 41, "h": 56 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 158, "y": 302, "w": 41, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 9, "w": 41, "h": 55 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 155, "y": 246, "w": 42, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 9, "w": 42, "h": 55 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 199, "y": 302, "w": 41, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 9, "w": 41, "h": 55 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 77, "y": 248, "w": 41, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 41, "h": 56 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 118, "y": 301, "w": 40, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 40, "h": 57 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 38, "y": 246, "w": 39, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 5, "w": 39, "h": 59 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 0, "y": 253, "w": 37, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 37, "h": 60 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 0, "y": 191, "w": 38, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 38, "h": 62 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 118, "y": 189, "w": 37, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 37, "h": 63 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 0, "y": 64, "w": 39, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 39, "h": 63 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 194, "y": 184, "w": 39, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 39, "h": 62 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 156, "y": 120, "w": 40, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 61 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 38, "y": 186, "w": 40, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 40, "h": 60 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 78, "y": 189, "w": 40, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 40, "h": 59 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 77, "y": 304, "w": 39, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 7, "w": 39, "h": 57 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 197, "y": 246, "w": 41, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 8, "w": 41, "h": 56 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 158, "y": 302, "w": 41, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 9, "w": 41, "h": 55 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 155, "y": 246, "w": 42, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 9, "w": 42, "h": 55 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 199, "y": 302, "w": 41, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 9, "w": 41, "h": 55 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 77, "y": 248, "w": 41, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 41, "h": 56 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 118, "y": 301, "w": 40, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 40, "h": 57 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 38, "y": 246, "w": 39, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 5, "w": 39, "h": 59 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 0, "y": 253, "w": 37, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 37, "h": 60 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 0, "y": 191, "w": 38, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 38, "h": 62 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 118, "y": 189, "w": 37, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 37, "h": 63 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 0, "y": 64, "w": 39, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 39, "h": 63 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 194, "y": 184, "w": 39, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 39, "h": 62 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 156, "y": 120, "w": 40, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 61 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 38, "y": 186, "w": 40, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 40, "h": 60 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 78, "y": 189, "w": 40, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 40, "h": 59 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 77, "y": 304, "w": 39, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 7, "w": 39, "h": 57 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 197, "y": 246, "w": 41, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 8, "w": 41, "h": 56 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 158, "y": 302, "w": 41, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 9, "w": 41, "h": 55 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 155, "y": 246, "w": 42, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 9, "w": 42, "h": 55 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 199, "y": 302, "w": 41, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 9, "w": 41, "h": 55 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 77, "y": 248, "w": 41, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 41, "h": 56 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 118, "y": 301, "w": 40, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 40, "h": 57 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 38, "y": 246, "w": 39, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 5, "w": 39, "h": 59 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 0, "y": 253, "w": 37, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 37, "h": 60 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 0, "y": 191, "w": 38, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 38, "h": 62 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 118, "y": 189, "w": 37, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 37, "h": 63 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 0, "y": 64, "w": 39, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 39, "h": 63 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 194, "y": 184, "w": 39, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 39, "h": 62 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 156, "y": 120, "w": 40, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 61 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 159, "y": 0, "w": 41, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 41, "h": 60 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 39, "y": 125, "w": 40, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 61 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 200, "y": 60, "w": 39, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 39, "h": 63 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 39, "y": 62, "w": 39, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 39, "h": 63 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 79, "y": 125, "w": 38, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 38, "h": 64 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 117, "y": 125, "w": 38, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 38, "h": 64 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 0, "y": 127, "w": 38, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 38, "h": 64 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 0, "y": 0, "w": 39, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 39, "h": 64 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 78, "y": 62, "w": 39, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 39, "h": 63 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 117, "y": 62, "w": 39, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 39, "h": 63 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 155, "y": 181, "w": 39, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 39, "h": 62 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 119, "y": 0, "w": 40, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 40, "h": 62 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 79, "y": 0, "w": 40, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 40, "h": 62 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 39, "y": 0, "w": 40, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 40, "h": 62 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 196, "y": 123, "w": 40, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 40, "h": 61 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 200, "y": 0, "w": 41, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 41, "h": 60 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 159, "y": 60, "w": 41, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 41, "h": 60 },
+    "sourceSize": { "w": 44, "h": 64 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "705.png",
+  "format": "I8",
+  "size": { "w": 241, "h": 361 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/shiny/705.png b/public/images/pokemon/exp/shiny/705.png
index 8653de923ec..7fed21b3583 100644
Binary files a/public/images/pokemon/exp/shiny/705.png and b/public/images/pokemon/exp/shiny/705.png differ
diff --git a/public/images/pokemon/exp/shiny/707.json b/public/images/pokemon/exp/shiny/707.json
deleted file mode 100644
index cdc3064d8aa..00000000000
--- a/public/images/pokemon/exp/shiny/707.json
+++ /dev/null
@@ -1,1931 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "707.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 283,
-				"h": 283
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0033.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0059.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 39,
-						"h": 69
-					},
-					"frame": {
-						"x": 41,
-						"y": 0,
-						"w": 39,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0034.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 39,
-						"h": 69
-					},
-					"frame": {
-						"x": 41,
-						"y": 0,
-						"w": 39,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0060.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 39,
-						"h": 69
-					},
-					"frame": {
-						"x": 41,
-						"y": 0,
-						"w": 39,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 69
-					},
-					"frame": {
-						"x": 80,
-						"y": 0,
-						"w": 37,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0035.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 69
-					},
-					"frame": {
-						"x": 80,
-						"y": 0,
-						"w": 37,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0061.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 69
-					},
-					"frame": {
-						"x": 80,
-						"y": 0,
-						"w": 37,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 3,
-						"w": 42,
-						"h": 70
-					},
-					"frame": {
-						"x": 117,
-						"y": 0,
-						"w": 42,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0027.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 3,
-						"w": 42,
-						"h": 70
-					},
-					"frame": {
-						"x": 117,
-						"y": 0,
-						"w": 42,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0053.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 3,
-						"w": 42,
-						"h": 70
-					},
-					"frame": {
-						"x": 117,
-						"y": 0,
-						"w": 42,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0079.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 3,
-						"w": 42,
-						"h": 70
-					},
-					"frame": {
-						"x": 117,
-						"y": 0,
-						"w": 42,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 42,
-						"h": 70
-					},
-					"frame": {
-						"x": 159,
-						"y": 0,
-						"w": 42,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0028.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 42,
-						"h": 70
-					},
-					"frame": {
-						"x": 159,
-						"y": 0,
-						"w": 42,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0054.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 42,
-						"h": 70
-					},
-					"frame": {
-						"x": 159,
-						"y": 0,
-						"w": 42,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0080.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 3,
-						"w": 42,
-						"h": 70
-					},
-					"frame": {
-						"x": 159,
-						"y": 0,
-						"w": 42,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 44,
-						"h": 70
-					},
-					"frame": {
-						"x": 201,
-						"y": 0,
-						"w": 44,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0029.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 44,
-						"h": 70
-					},
-					"frame": {
-						"x": 201,
-						"y": 0,
-						"w": 44,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0055.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 44,
-						"h": 70
-					},
-					"frame": {
-						"x": 201,
-						"y": 0,
-						"w": 44,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 38,
-						"h": 70
-					},
-					"frame": {
-						"x": 245,
-						"y": 0,
-						"w": 38,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 3,
-						"w": 38,
-						"h": 70
-					},
-					"frame": {
-						"x": 245,
-						"y": 0,
-						"w": 38,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0039.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 38,
-						"h": 70
-					},
-					"frame": {
-						"x": 245,
-						"y": 0,
-						"w": 38,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0043.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 3,
-						"w": 38,
-						"h": 70
-					},
-					"frame": {
-						"x": 245,
-						"y": 0,
-						"w": 38,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0065.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 38,
-						"h": 70
-					},
-					"frame": {
-						"x": 245,
-						"y": 0,
-						"w": 38,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0069.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 3,
-						"w": 38,
-						"h": 70
-					},
-					"frame": {
-						"x": 245,
-						"y": 0,
-						"w": 38,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 44,
-						"h": 70
-					},
-					"frame": {
-						"x": 0,
-						"y": 69,
-						"w": 44,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0030.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 44,
-						"h": 70
-					},
-					"frame": {
-						"x": 0,
-						"y": 69,
-						"w": 44,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0056.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 44,
-						"h": 70
-					},
-					"frame": {
-						"x": 0,
-						"y": 69,
-						"w": 44,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 44,
-						"h": 70
-					},
-					"frame": {
-						"x": 44,
-						"y": 69,
-						"w": 44,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0032.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 44,
-						"h": 70
-					},
-					"frame": {
-						"x": 44,
-						"y": 69,
-						"w": 44,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0058.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 44,
-						"h": 70
-					},
-					"frame": {
-						"x": 44,
-						"y": 69,
-						"w": 44,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 38,
-						"h": 70
-					},
-					"frame": {
-						"x": 88,
-						"y": 70,
-						"w": 38,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 3,
-						"w": 38,
-						"h": 70
-					},
-					"frame": {
-						"x": 88,
-						"y": 70,
-						"w": 38,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0040.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 38,
-						"h": 70
-					},
-					"frame": {
-						"x": 88,
-						"y": 70,
-						"w": 38,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0042.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 3,
-						"w": 38,
-						"h": 70
-					},
-					"frame": {
-						"x": 88,
-						"y": 70,
-						"w": 38,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0066.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 38,
-						"h": 70
-					},
-					"frame": {
-						"x": 88,
-						"y": 70,
-						"w": 38,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0068.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 3,
-						"w": 38,
-						"h": 70
-					},
-					"frame": {
-						"x": 88,
-						"y": 70,
-						"w": 38,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 38,
-						"h": 70
-					},
-					"frame": {
-						"x": 126,
-						"y": 70,
-						"w": 38,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0041.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 38,
-						"h": 70
-					},
-					"frame": {
-						"x": 126,
-						"y": 70,
-						"w": 38,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0067.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 38,
-						"h": 70
-					},
-					"frame": {
-						"x": 126,
-						"y": 70,
-						"w": 38,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 0,
-						"w": 38,
-						"h": 70
-					},
-					"frame": {
-						"x": 164,
-						"y": 70,
-						"w": 38,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0047.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 0,
-						"w": 38,
-						"h": 70
-					},
-					"frame": {
-						"x": 164,
-						"y": 70,
-						"w": 38,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0073.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 0,
-						"w": 38,
-						"h": 70
-					},
-					"frame": {
-						"x": 164,
-						"y": 70,
-						"w": 38,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 0,
-						"w": 38,
-						"h": 70
-					},
-					"frame": {
-						"x": 202,
-						"y": 70,
-						"w": 38,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0048.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 0,
-						"w": 38,
-						"h": 70
-					},
-					"frame": {
-						"x": 202,
-						"y": 70,
-						"w": 38,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0074.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 0,
-						"w": 38,
-						"h": 70
-					},
-					"frame": {
-						"x": 202,
-						"y": 70,
-						"w": 38,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 0,
-						"w": 38,
-						"h": 70
-					},
-					"frame": {
-						"x": 240,
-						"y": 70,
-						"w": 38,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0049.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 0,
-						"w": 38,
-						"h": 70
-					},
-					"frame": {
-						"x": 240,
-						"y": 70,
-						"w": 38,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0075.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 0,
-						"w": 38,
-						"h": 70
-					},
-					"frame": {
-						"x": 240,
-						"y": 70,
-						"w": 38,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 0,
-						"w": 38,
-						"h": 70
-					},
-					"frame": {
-						"x": 0,
-						"y": 139,
-						"w": 38,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0050.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 0,
-						"w": 38,
-						"h": 70
-					},
-					"frame": {
-						"x": 0,
-						"y": 139,
-						"w": 38,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0076.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 0,
-						"w": 38,
-						"h": 70
-					},
-					"frame": {
-						"x": 0,
-						"y": 139,
-						"w": 38,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0025.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 1,
-						"w": 40,
-						"h": 70
-					},
-					"frame": {
-						"x": 38,
-						"y": 139,
-						"w": 40,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0051.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 1,
-						"w": 40,
-						"h": 70
-					},
-					"frame": {
-						"x": 38,
-						"y": 139,
-						"w": 40,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0077.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 1,
-						"w": 40,
-						"h": 70
-					},
-					"frame": {
-						"x": 38,
-						"y": 139,
-						"w": 40,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0026.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 2,
-						"w": 42,
-						"h": 70
-					},
-					"frame": {
-						"x": 78,
-						"y": 140,
-						"w": 42,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0052.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 2,
-						"w": 42,
-						"h": 70
-					},
-					"frame": {
-						"x": 78,
-						"y": 140,
-						"w": 42,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0078.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 2,
-						"w": 42,
-						"h": 70
-					},
-					"frame": {
-						"x": 78,
-						"y": 140,
-						"w": 42,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0084.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 1,
-						"w": 42,
-						"h": 70
-					},
-					"frame": {
-						"x": 78,
-						"y": 140,
-						"w": 42,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0086.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 1,
-						"w": 42,
-						"h": 70
-					},
-					"frame": {
-						"x": 78,
-						"y": 140,
-						"w": 42,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0088.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 1,
-						"w": 42,
-						"h": 70
-					},
-					"frame": {
-						"x": 78,
-						"y": 140,
-						"w": 42,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0090.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 1,
-						"w": 42,
-						"h": 70
-					},
-					"frame": {
-						"x": 78,
-						"y": 140,
-						"w": 42,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0082.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 1,
-						"w": 45,
-						"h": 70
-					},
-					"frame": {
-						"x": 120,
-						"y": 140,
-						"w": 45,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0083.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 1,
-						"w": 43,
-						"h": 70
-					},
-					"frame": {
-						"x": 165,
-						"y": 140,
-						"w": 43,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0087.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 1,
-						"w": 43,
-						"h": 70
-					},
-					"frame": {
-						"x": 165,
-						"y": 140,
-						"w": 43,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 45,
-						"h": 71
-					},
-					"frame": {
-						"x": 208,
-						"y": 140,
-						"w": 45,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0031.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 45,
-						"h": 71
-					},
-					"frame": {
-						"x": 208,
-						"y": 140,
-						"w": 45,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0057.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 45,
-						"h": 71
-					},
-					"frame": {
-						"x": 208,
-						"y": 140,
-						"w": 45,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 71
-					},
-					"frame": {
-						"x": 0,
-						"y": 209,
-						"w": 37,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0036.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 71
-					},
-					"frame": {
-						"x": 0,
-						"y": 209,
-						"w": 37,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0062.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 71
-					},
-					"frame": {
-						"x": 0,
-						"y": 209,
-						"w": 37,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 37,
-						"y": 209,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0037.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 37,
-						"y": 209,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0063.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 37,
-						"y": 209,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 75,
-						"y": 210,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0038.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 75,
-						"y": 210,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0064.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 75,
-						"y": 210,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 2,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 113,
-						"y": 210,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 1,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 113,
-						"y": 210,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 0,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 113,
-						"y": 210,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0044.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 2,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 113,
-						"y": 210,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0045.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 1,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 113,
-						"y": 210,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0046.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 0,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 113,
-						"y": 210,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0070.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 2,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 113,
-						"y": 210,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0071.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 1,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 113,
-						"y": 210,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0072.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 0,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 113,
-						"y": 210,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0081.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 2,
-						"w": 45,
-						"h": 71
-					},
-					"frame": {
-						"x": 151,
-						"y": 210,
-						"w": 45,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0085.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 1,
-						"w": 39,
-						"h": 71
-					},
-					"frame": {
-						"x": 196,
-						"y": 211,
-						"w": 39,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0089.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 1,
-						"w": 39,
-						"h": 71
-					},
-					"frame": {
-						"x": 196,
-						"y": 211,
-						"w": 39,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0091.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 2,
-						"w": 44,
-						"h": 71
-					},
-					"frame": {
-						"x": 235,
-						"y": 211,
-						"w": 44,
-						"h": 71
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:26c493d70c41c4104147194dfbbab5b9:b12f3eb3fdd1a69bbf055a44f9557395:8e96b9056ea81e44ced99c97f472a528$"
-	}
-}
diff --git a/public/images/pokemon/exp/shiny/707.png b/public/images/pokemon/exp/shiny/707.png
deleted file mode 100644
index ee0fec17e8c..00000000000
Binary files a/public/images/pokemon/exp/shiny/707.png and /dev/null differ
diff --git a/public/images/pokemon/exp/shiny/708.png b/public/images/pokemon/exp/shiny/708.png
deleted file mode 100644
index bb896a0214c..00000000000
Binary files a/public/images/pokemon/exp/shiny/708.png and /dev/null differ
diff --git a/public/images/pokemon/exp/shiny/712.json b/public/images/pokemon/exp/shiny/712.json
index 80e4e6a13b9..88a49637b7c 100644
--- a/public/images/pokemon/exp/shiny/712.json
+++ b/public/images/pokemon/exp/shiny/712.json
@@ -1,2771 +1,1433 @@
-{
-	"textures": [
-		{
-			"image": "712.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 209,
-				"h": 209
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0037.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0038.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0055.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0056.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0073.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0074.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0091.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0092.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 44,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 44,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 44,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 44,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0039.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 44,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0040.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 44,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0057.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 44,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0058.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 44,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0075.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 44,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0076.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 44,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 88,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 88,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0031.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 88,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0032.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 88,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0049.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 88,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0050.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 88,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0067.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 88,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0068.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 88,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0085.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 88,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0086.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 88,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 132,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 132,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0033.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 132,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0034.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 132,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0051.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 132,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0052.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 132,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0069.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 132,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0070.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 132,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0087.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 132,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0088.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 0,
-						"y": 132,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 38,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 38,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0035.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 38,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0036.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 38,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0053.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 38,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0054.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 38,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0071.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 38,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0072.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 38,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0089.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 38,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0090.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 38,
-						"y": 0,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 38,
-						"h": 43
-					},
-					"frame": {
-						"x": 76,
-						"y": 0,
-						"w": 38,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 38,
-						"h": 43
-					},
-					"frame": {
-						"x": 76,
-						"y": 0,
-						"w": 38,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 38,
-						"h": 43
-					},
-					"frame": {
-						"x": 76,
-						"y": 0,
-						"w": 38,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 38,
-						"h": 43
-					},
-					"frame": {
-						"x": 76,
-						"y": 0,
-						"w": 38,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0041.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 38,
-						"h": 43
-					},
-					"frame": {
-						"x": 76,
-						"y": 0,
-						"w": 38,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0042.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 38,
-						"h": 43
-					},
-					"frame": {
-						"x": 76,
-						"y": 0,
-						"w": 38,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0059.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 38,
-						"h": 43
-					},
-					"frame": {
-						"x": 76,
-						"y": 0,
-						"w": 38,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0060.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 38,
-						"h": 43
-					},
-					"frame": {
-						"x": 76,
-						"y": 0,
-						"w": 38,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0077.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 38,
-						"h": 43
-					},
-					"frame": {
-						"x": 76,
-						"y": 0,
-						"w": 38,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0078.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 38,
-						"h": 43
-					},
-					"frame": {
-						"x": 76,
-						"y": 0,
-						"w": 38,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 38,
-						"h": 43
-					},
-					"frame": {
-						"x": 114,
-						"y": 0,
-						"w": 38,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 38,
-						"h": 43
-					},
-					"frame": {
-						"x": 114,
-						"y": 0,
-						"w": 38,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0025.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 38,
-						"h": 43
-					},
-					"frame": {
-						"x": 114,
-						"y": 0,
-						"w": 38,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0026.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 38,
-						"h": 43
-					},
-					"frame": {
-						"x": 114,
-						"y": 0,
-						"w": 38,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0043.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 38,
-						"h": 43
-					},
-					"frame": {
-						"x": 114,
-						"y": 0,
-						"w": 38,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0044.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 38,
-						"h": 43
-					},
-					"frame": {
-						"x": 114,
-						"y": 0,
-						"w": 38,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0061.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 38,
-						"h": 43
-					},
-					"frame": {
-						"x": 114,
-						"y": 0,
-						"w": 38,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0062.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 38,
-						"h": 43
-					},
-					"frame": {
-						"x": 114,
-						"y": 0,
-						"w": 38,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0079.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 38,
-						"h": 43
-					},
-					"frame": {
-						"x": 114,
-						"y": 0,
-						"w": 38,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0080.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 38,
-						"h": 43
-					},
-					"frame": {
-						"x": 114,
-						"y": 0,
-						"w": 38,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 38,
-						"h": 43
-					},
-					"frame": {
-						"x": 152,
-						"y": 0,
-						"w": 38,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 38,
-						"h": 43
-					},
-					"frame": {
-						"x": 152,
-						"y": 0,
-						"w": 38,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0027.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 38,
-						"h": 43
-					},
-					"frame": {
-						"x": 152,
-						"y": 0,
-						"w": 38,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0028.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 38,
-						"h": 43
-					},
-					"frame": {
-						"x": 152,
-						"y": 0,
-						"w": 38,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0045.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 38,
-						"h": 43
-					},
-					"frame": {
-						"x": 152,
-						"y": 0,
-						"w": 38,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0046.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 38,
-						"h": 43
-					},
-					"frame": {
-						"x": 152,
-						"y": 0,
-						"w": 38,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0063.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 38,
-						"h": 43
-					},
-					"frame": {
-						"x": 152,
-						"y": 0,
-						"w": 38,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0064.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 38,
-						"h": 43
-					},
-					"frame": {
-						"x": 152,
-						"y": 0,
-						"w": 38,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0081.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 38,
-						"h": 43
-					},
-					"frame": {
-						"x": 152,
-						"y": 0,
-						"w": 38,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0082.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 38,
-						"h": 43
-					},
-					"frame": {
-						"x": 152,
-						"y": 0,
-						"w": 38,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0093.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 38,
-						"h": 43
-					},
-					"frame": {
-						"x": 76,
-						"y": 43,
-						"w": 38,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0094.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 38,
-						"h": 43
-					},
-					"frame": {
-						"x": 76,
-						"y": 43,
-						"w": 38,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0131.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 38,
-						"h": 43
-					},
-					"frame": {
-						"x": 76,
-						"y": 43,
-						"w": 38,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 2,
-						"w": 38,
-						"h": 42
-					},
-					"frame": {
-						"x": 38,
-						"y": 44,
-						"w": 38,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 2,
-						"w": 38,
-						"h": 42
-					},
-					"frame": {
-						"x": 38,
-						"y": 44,
-						"w": 38,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0029.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 2,
-						"w": 38,
-						"h": 42
-					},
-					"frame": {
-						"x": 38,
-						"y": 44,
-						"w": 38,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0030.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 2,
-						"w": 38,
-						"h": 42
-					},
-					"frame": {
-						"x": 38,
-						"y": 44,
-						"w": 38,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0047.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 2,
-						"w": 38,
-						"h": 42
-					},
-					"frame": {
-						"x": 38,
-						"y": 44,
-						"w": 38,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0048.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 2,
-						"w": 38,
-						"h": 42
-					},
-					"frame": {
-						"x": 38,
-						"y": 44,
-						"w": 38,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0065.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 2,
-						"w": 38,
-						"h": 42
-					},
-					"frame": {
-						"x": 38,
-						"y": 44,
-						"w": 38,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0066.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 2,
-						"w": 38,
-						"h": 42
-					},
-					"frame": {
-						"x": 38,
-						"y": 44,
-						"w": 38,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0083.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 2,
-						"w": 38,
-						"h": 42
-					},
-					"frame": {
-						"x": 38,
-						"y": 44,
-						"w": 38,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0084.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 2,
-						"w": 38,
-						"h": 42
-					},
-					"frame": {
-						"x": 38,
-						"y": 44,
-						"w": 38,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0095.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 2,
-						"w": 38,
-						"h": 42
-					},
-					"frame": {
-						"x": 114,
-						"y": 43,
-						"w": 38,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0096.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 2,
-						"w": 38,
-						"h": 42
-					},
-					"frame": {
-						"x": 114,
-						"y": 43,
-						"w": 38,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0129.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 2,
-						"w": 38,
-						"h": 42
-					},
-					"frame": {
-						"x": 114,
-						"y": 43,
-						"w": 38,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0130.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 2,
-						"w": 38,
-						"h": 42
-					},
-					"frame": {
-						"x": 114,
-						"y": 43,
-						"w": 38,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0124.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 38,
-						"h": 42
-					},
-					"frame": {
-						"x": 152,
-						"y": 43,
-						"w": 38,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0125.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 38,
-						"h": 42
-					},
-					"frame": {
-						"x": 152,
-						"y": 43,
-						"w": 38,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0097.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 38,
-						"h": 41
-					},
-					"frame": {
-						"x": 114,
-						"y": 85,
-						"w": 38,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0127.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 38,
-						"h": 41
-					},
-					"frame": {
-						"x": 114,
-						"y": 85,
-						"w": 38,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0128.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 38,
-						"h": 41
-					},
-					"frame": {
-						"x": 114,
-						"y": 85,
-						"w": 38,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0098.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 38,
-						"h": 41
-					},
-					"frame": {
-						"x": 152,
-						"y": 85,
-						"w": 38,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0099.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 38,
-						"h": 41
-					},
-					"frame": {
-						"x": 152,
-						"y": 85,
-						"w": 38,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0126.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 38,
-						"h": 41
-					},
-					"frame": {
-						"x": 152,
-						"y": 85,
-						"w": 38,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0100.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 38,
-						"h": 41
-					},
-					"frame": {
-						"x": 38,
-						"y": 86,
-						"w": 38,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0101.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 38,
-						"h": 41
-					},
-					"frame": {
-						"x": 38,
-						"y": 86,
-						"w": 38,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0112.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 38,
-						"h": 41
-					},
-					"frame": {
-						"x": 38,
-						"y": 86,
-						"w": 38,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0113.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 38,
-						"h": 41
-					},
-					"frame": {
-						"x": 38,
-						"y": 86,
-						"w": 38,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0102.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 38,
-						"h": 41
-					},
-					"frame": {
-						"x": 76,
-						"y": 86,
-						"w": 38,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0103.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 38,
-						"h": 41
-					},
-					"frame": {
-						"x": 76,
-						"y": 86,
-						"w": 38,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0110.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 38,
-						"h": 41
-					},
-					"frame": {
-						"x": 76,
-						"y": 86,
-						"w": 38,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0111.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 38,
-						"h": 41
-					},
-					"frame": {
-						"x": 76,
-						"y": 86,
-						"w": 38,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0104.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 38,
-						"h": 41
-					},
-					"frame": {
-						"x": 38,
-						"y": 127,
-						"w": 38,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0105.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 38,
-						"h": 41
-					},
-					"frame": {
-						"x": 38,
-						"y": 127,
-						"w": 38,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0108.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 38,
-						"h": 41
-					},
-					"frame": {
-						"x": 38,
-						"y": 127,
-						"w": 38,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0109.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 38,
-						"h": 41
-					},
-					"frame": {
-						"x": 38,
-						"y": 127,
-						"w": 38,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0114.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 38,
-						"h": 41
-					},
-					"frame": {
-						"x": 38,
-						"y": 168,
-						"w": 38,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0115.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 38,
-						"h": 41
-					},
-					"frame": {
-						"x": 38,
-						"y": 168,
-						"w": 38,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0116.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 38,
-						"h": 41
-					},
-					"frame": {
-						"x": 76,
-						"y": 127,
-						"w": 38,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0117.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 38,
-						"h": 41
-					},
-					"frame": {
-						"x": 76,
-						"y": 127,
-						"w": 38,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0118.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 38,
-						"h": 41
-					},
-					"frame": {
-						"x": 76,
-						"y": 168,
-						"w": 38,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0119.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 38,
-						"h": 41
-					},
-					"frame": {
-						"x": 76,
-						"y": 168,
-						"w": 38,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0120.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 38,
-						"h": 41
-					},
-					"frame": {
-						"x": 114,
-						"y": 126,
-						"w": 38,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0121.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 38,
-						"h": 41
-					},
-					"frame": {
-						"x": 114,
-						"y": 126,
-						"w": 38,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0106.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 37,
-						"h": 41
-					},
-					"frame": {
-						"x": 114,
-						"y": 167,
-						"w": 37,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0107.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 37,
-						"h": 41
-					},
-					"frame": {
-						"x": 114,
-						"y": 167,
-						"w": 37,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0122.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 3,
-						"w": 37,
-						"h": 41
-					},
-					"frame": {
-						"x": 151,
-						"y": 167,
-						"w": 37,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0123.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 42,
-						"h": 44
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 3,
-						"w": 37,
-						"h": 41
-					},
-					"frame": {
-						"x": 151,
-						"y": 167,
-						"w": 37,
-						"h": 41
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:90506cc63998ae2867a3e57df229bc50:f8b5635f0ab8bc294bdbf4d4b4782548:3a1cc69824960d920ca43f8c9376d136$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 74, "y": 0, "w": 36, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 74, "y": 0, "w": 36, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 74, "y": 0, "w": 36, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 111, "y": 0, "w": 36, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 111, "y": 0, "w": 36, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 112, "y": 44, "w": 36, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 36, "h": 42 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 112, "y": 44, "w": 36, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 36, "h": 42 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 149, "y": 44, "w": 36, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 36, "h": 42 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 149, "y": 44, "w": 36, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 36, "h": 42 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 0, "y": 45, "w": 36, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 36, "h": 42 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 0, "y": 45, "w": 36, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 36, "h": 42 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 74, "y": 86, "w": 36, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 36, "h": 41 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 74, "y": 86, "w": 36, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 36, "h": 41 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 148, "y": 0, "w": 36, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 36, "h": 43 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 148, "y": 0, "w": 36, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 36, "h": 43 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 0, "y": 0, "w": 36, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 36, "h": 44 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 0, "y": 0, "w": 36, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 36, "h": 44 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 37, "y": 0, "w": 36, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 36, "h": 44 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 37, "y": 0, "w": 36, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 36, "h": 44 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 74, "y": 0, "w": 36, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 74, "y": 0, "w": 36, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 74, "y": 0, "w": 36, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 74, "y": 0, "w": 36, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 74, "y": 0, "w": 36, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 74, "y": 0, "w": 36, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 111, "y": 0, "w": 36, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 111, "y": 0, "w": 36, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 112, "y": 44, "w": 36, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 36, "h": 42 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 112, "y": 44, "w": 36, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 36, "h": 42 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 149, "y": 44, "w": 36, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 36, "h": 42 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 149, "y": 44, "w": 36, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 36, "h": 42 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 0, "y": 45, "w": 36, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 36, "h": 42 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 0, "y": 45, "w": 36, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 36, "h": 42 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 74, "y": 86, "w": 36, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 36, "h": 41 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 74, "y": 86, "w": 36, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 36, "h": 41 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 148, "y": 0, "w": 36, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 36, "h": 43 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 148, "y": 0, "w": 36, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 36, "h": 43 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 0, "y": 0, "w": 36, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 36, "h": 44 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 0, "y": 0, "w": 36, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 36, "h": 44 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 37, "y": 0, "w": 36, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 36, "h": 44 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 37, "y": 0, "w": 36, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 36, "h": 44 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 74, "y": 0, "w": 36, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 74, "y": 0, "w": 36, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 74, "y": 0, "w": 36, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 74, "y": 0, "w": 36, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 74, "y": 0, "w": 36, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 74, "y": 0, "w": 36, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 111, "y": 0, "w": 36, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 111, "y": 0, "w": 36, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 112, "y": 44, "w": 36, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 36, "h": 42 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 112, "y": 44, "w": 36, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 36, "h": 42 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 149, "y": 44, "w": 36, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 36, "h": 42 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 149, "y": 44, "w": 36, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 36, "h": 42 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 0, "y": 45, "w": 36, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 36, "h": 42 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 0, "y": 45, "w": 36, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 36, "h": 42 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 74, "y": 86, "w": 36, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 36, "h": 41 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 74, "y": 86, "w": 36, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 36, "h": 41 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 148, "y": 0, "w": 36, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 36, "h": 43 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 148, "y": 0, "w": 36, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 36, "h": 43 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 0, "y": 0, "w": 36, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 36, "h": 44 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 0, "y": 0, "w": 36, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 36, "h": 44 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 37, "y": 0, "w": 36, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 36, "h": 44 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 37, "y": 0, "w": 36, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 36, "h": 44 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 74, "y": 0, "w": 36, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 74, "y": 0, "w": 36, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 74, "y": 0, "w": 36, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 74, "y": 0, "w": 36, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 74, "y": 0, "w": 36, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 74, "y": 0, "w": 36, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 111, "y": 0, "w": 36, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 111, "y": 0, "w": 36, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 112, "y": 44, "w": 36, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 36, "h": 42 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 112, "y": 44, "w": 36, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 36, "h": 42 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 149, "y": 44, "w": 36, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 36, "h": 42 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 149, "y": 44, "w": 36, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 36, "h": 42 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 0, "y": 45, "w": 36, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 36, "h": 42 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 0, "y": 45, "w": 36, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 36, "h": 42 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 74, "y": 86, "w": 36, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 36, "h": 41 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 74, "y": 86, "w": 36, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 36, "h": 41 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 148, "y": 0, "w": 36, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 36, "h": 43 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 148, "y": 0, "w": 36, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 36, "h": 43 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 0, "y": 0, "w": 36, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 36, "h": 44 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 0, "y": 0, "w": 36, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 36, "h": 44 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 37, "y": 0, "w": 36, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 36, "h": 44 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 37, "y": 0, "w": 36, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 36, "h": 44 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 74, "y": 0, "w": 36, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 74, "y": 0, "w": 36, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0088.png",
+    "frame": { "x": 74, "y": 0, "w": 36, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0089.png",
+    "frame": { "x": 74, "y": 0, "w": 36, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0090.png",
+    "frame": { "x": 74, "y": 0, "w": 36, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0091.png",
+    "frame": { "x": 74, "y": 0, "w": 36, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0092.png",
+    "frame": { "x": 111, "y": 0, "w": 36, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0093.png",
+    "frame": { "x": 111, "y": 0, "w": 36, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0094.png",
+    "frame": { "x": 112, "y": 44, "w": 36, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 36, "h": 42 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0095.png",
+    "frame": { "x": 112, "y": 44, "w": 36, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 36, "h": 42 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0096.png",
+    "frame": { "x": 149, "y": 44, "w": 36, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 36, "h": 42 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0097.png",
+    "frame": { "x": 149, "y": 44, "w": 36, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 36, "h": 42 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0098.png",
+    "frame": { "x": 0, "y": 45, "w": 36, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 36, "h": 42 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0099.png",
+    "frame": { "x": 0, "y": 45, "w": 36, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 36, "h": 42 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0100.png",
+    "frame": { "x": 74, "y": 86, "w": 36, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 36, "h": 41 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0101.png",
+    "frame": { "x": 74, "y": 86, "w": 36, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 36, "h": 41 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0102.png",
+    "frame": { "x": 148, "y": 0, "w": 36, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 36, "h": 43 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0103.png",
+    "frame": { "x": 148, "y": 0, "w": 36, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 36, "h": 43 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0104.png",
+    "frame": { "x": 0, "y": 0, "w": 36, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 36, "h": 44 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0105.png",
+    "frame": { "x": 0, "y": 0, "w": 36, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 36, "h": 44 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0106.png",
+    "frame": { "x": 37, "y": 0, "w": 36, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 36, "h": 44 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0107.png",
+    "frame": { "x": 37, "y": 0, "w": 36, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 36, "h": 44 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0108.png",
+    "frame": { "x": 74, "y": 0, "w": 36, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0109.png",
+    "frame": { "x": 74, "y": 0, "w": 36, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0110.png",
+    "frame": { "x": 74, "y": 0, "w": 36, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0111.png",
+    "frame": { "x": 74, "y": 0, "w": 36, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0112.png",
+    "frame": { "x": 74, "y": 0, "w": 36, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0113.png",
+    "frame": { "x": 74, "y": 0, "w": 36, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 43 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0114.png",
+    "frame": { "x": 37, "y": 45, "w": 36, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 36, "h": 42 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0115.png",
+    "frame": { "x": 37, "y": 45, "w": 36, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 36, "h": 42 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0116.png",
+    "frame": { "x": 111, "y": 87, "w": 36, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 36, "h": 41 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0117.png",
+    "frame": { "x": 111, "y": 87, "w": 36, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 36, "h": 41 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0118.png",
+    "frame": { "x": 148, "y": 87, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 36, "h": 40 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0119.png",
+    "frame": { "x": 148, "y": 87, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 36, "h": 40 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0120.png",
+    "frame": { "x": 0, "y": 88, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 36, "h": 40 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0121.png",
+    "frame": { "x": 0, "y": 88, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 36, "h": 40 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0122.png",
+    "frame": { "x": 0, "y": 88, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 36, "h": 40 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0123.png",
+    "frame": { "x": 0, "y": 88, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 36, "h": 40 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0124.png",
+    "frame": { "x": 37, "y": 88, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 36, "h": 40 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0125.png",
+    "frame": { "x": 37, "y": 88, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 36, "h": 40 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0126.png",
+    "frame": { "x": 74, "y": 128, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 36, "h": 40 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0127.png",
+    "frame": { "x": 74, "y": 128, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 36, "h": 40 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0128.png",
+    "frame": { "x": 148, "y": 128, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 36, "h": 40 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0129.png",
+    "frame": { "x": 148, "y": 128, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 36, "h": 40 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0130.png",
+    "frame": { "x": 0, "y": 129, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 36, "h": 40 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0131.png",
+    "frame": { "x": 0, "y": 129, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 36, "h": 40 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0132.png",
+    "frame": { "x": 148, "y": 128, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 36, "h": 40 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0133.png",
+    "frame": { "x": 148, "y": 128, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 36, "h": 40 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0134.png",
+    "frame": { "x": 74, "y": 128, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 36, "h": 40 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0135.png",
+    "frame": { "x": 74, "y": 128, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 36, "h": 40 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0136.png",
+    "frame": { "x": 37, "y": 88, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 36, "h": 40 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0137.png",
+    "frame": { "x": 37, "y": 88, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 36, "h": 40 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0138.png",
+    "frame": { "x": 37, "y": 129, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 36, "h": 40 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0139.png",
+    "frame": { "x": 37, "y": 129, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 36, "h": 40 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0140.png",
+    "frame": { "x": 111, "y": 129, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 36, "h": 40 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0141.png",
+    "frame": { "x": 111, "y": 129, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 36, "h": 40 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0142.png",
+    "frame": { "x": 74, "y": 169, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 36, "h": 40 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0143.png",
+    "frame": { "x": 74, "y": 169, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 36, "h": 40 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0144.png",
+    "frame": { "x": 148, "y": 169, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 36, "h": 40 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0145.png",
+    "frame": { "x": 148, "y": 169, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 36, "h": 40 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0146.png",
+    "frame": { "x": 0, "y": 170, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 4, "w": 36, "h": 40 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0147.png",
+    "frame": { "x": 0, "y": 170, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 4, "w": 36, "h": 40 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0148.png",
+    "frame": { "x": 74, "y": 44, "w": 37, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 37, "h": 41 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0149.png",
+    "frame": { "x": 74, "y": 44, "w": 37, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 37, "h": 41 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0150.png",
+    "frame": { "x": 0, "y": 88, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 36, "h": 40 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0151.png",
+    "frame": { "x": 0, "y": 88, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 36, "h": 40 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0152.png",
+    "frame": { "x": 0, "y": 88, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 36, "h": 40 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0153.png",
+    "frame": { "x": 148, "y": 87, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 36, "h": 40 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0154.png",
+    "frame": { "x": 148, "y": 87, "w": 36, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 36, "h": 40 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0155.png",
+    "frame": { "x": 111, "y": 87, "w": 36, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 36, "h": 41 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0156.png",
+    "frame": { "x": 111, "y": 87, "w": 36, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 36, "h": 41 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0157.png",
+    "frame": { "x": 37, "y": 45, "w": 36, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 36, "h": 42 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   },
+   {
+    "filename": "0158.png",
+    "frame": { "x": 37, "y": 45, "w": 36, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 36, "h": 42 },
+    "sourceSize": { "w": 42, "h": 44 },
+    "duration": 50
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.11-x64",
+  "image": "712.png",
+  "format": "I8",
+  "size": { "w": 185, "h": 210 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/shiny/712.png b/public/images/pokemon/exp/shiny/712.png
index 66e28efacd9..2ba0434ad7a 100644
Binary files a/public/images/pokemon/exp/shiny/712.png and b/public/images/pokemon/exp/shiny/712.png differ
diff --git a/public/images/pokemon/exp/shiny/713.json b/public/images/pokemon/exp/shiny/713.json
index c2aab871871..f4fcfa1ff85 100644
--- a/public/images/pokemon/exp/shiny/713.json
+++ b/public/images/pokemon/exp/shiny/713.json
@@ -1,146 +1,1100 @@
-{
-	"textures": [
-		{
-			"image": "713.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 174,
-				"h": 174
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 87,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 87,
-						"h": 71
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 87,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 87,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 87,
-						"h": 72
-					},
-					"frame": {
-						"x": 87,
-						"y": 0,
-						"w": 87,
-						"h": 72
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 87,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 87,
-						"h": 72
-					},
-					"frame": {
-						"x": 87,
-						"y": 0,
-						"w": 87,
-						"h": 72
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 87,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 87,
-						"h": 73
-					},
-					"frame": {
-						"x": 0,
-						"y": 71,
-						"w": 87,
-						"h": 73
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 87,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 87,
-						"h": 73
-					},
-					"frame": {
-						"x": 0,
-						"y": 71,
-						"w": 87,
-						"h": 73
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 87,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 87,
-						"h": 73
-					},
-					"frame": {
-						"x": 87,
-						"y": 72,
-						"w": 87,
-						"h": 73
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:ce42146f2549b65131ae1e38620ec02e:c360691d0dff3de5f5058a576fd05ded:625f70bcfe9c7f2437cb9cad6d2b863c$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 166, "y": 64, "w": 83, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 63 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 249, "y": 64, "w": 83, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 63 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 332, "y": 126, "w": 83, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 83, "h": 62 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 166, "y": 127, "w": 83, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 83, "h": 62 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 0, "y": 128, "w": 83, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 83, "h": 61 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 83, "y": 128, "w": 83, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 83, "h": 61 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 83, "y": 128, "w": 83, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 83, "h": 61 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 83, "y": 128, "w": 83, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 83, "h": 61 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 0, "y": 128, "w": 83, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 83, "h": 61 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 166, "y": 127, "w": 83, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 83, "h": 62 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 332, "y": 126, "w": 83, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 83, "h": 62 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 249, "y": 64, "w": 83, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 63 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 166, "y": 64, "w": 83, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 63 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 166, "y": 0, "w": 83, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 83, "h": 64 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 249, "y": 0, "w": 83, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 83, "h": 64 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 0, "y": 0, "w": 83, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 83, "h": 65 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 83, "y": 0, "w": 83, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 83, "h": 65 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 83, "y": 0, "w": 83, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 83, "h": 65 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 83, "y": 0, "w": 83, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 83, "h": 65 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 83, "y": 0, "w": 83, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 83, "h": 65 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 0, "y": 0, "w": 83, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 83, "h": 65 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 249, "y": 0, "w": 83, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 83, "h": 64 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 166, "y": 0, "w": 83, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 83, "h": 64 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 166, "y": 64, "w": 83, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 63 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 249, "y": 64, "w": 83, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 63 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 332, "y": 126, "w": 83, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 83, "h": 62 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 166, "y": 127, "w": 83, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 83, "h": 62 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 0, "y": 128, "w": 83, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 83, "h": 61 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 83, "y": 128, "w": 83, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 83, "h": 61 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 83, "y": 128, "w": 83, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 83, "h": 61 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 83, "y": 128, "w": 83, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 83, "h": 61 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 0, "y": 128, "w": 83, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 83, "h": 61 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 166, "y": 127, "w": 83, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 83, "h": 62 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 332, "y": 126, "w": 83, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 83, "h": 62 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 249, "y": 64, "w": 83, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 63 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 166, "y": 64, "w": 83, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 63 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 166, "y": 0, "w": 83, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 83, "h": 64 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 249, "y": 0, "w": 83, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 83, "h": 64 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 0, "y": 0, "w": 83, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 83, "h": 65 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 83, "y": 0, "w": 83, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 83, "h": 65 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 83, "y": 0, "w": 83, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 83, "h": 65 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 83, "y": 0, "w": 83, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 83, "h": 65 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 83, "y": 0, "w": 83, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 83, "h": 65 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 0, "y": 0, "w": 83, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 83, "h": 65 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 249, "y": 0, "w": 83, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 83, "h": 64 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 166, "y": 0, "w": 83, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 83, "h": 64 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 166, "y": 64, "w": 83, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 63 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 249, "y": 64, "w": 83, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 63 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 332, "y": 126, "w": 83, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 83, "h": 62 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 166, "y": 127, "w": 83, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 83, "h": 62 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 0, "y": 128, "w": 83, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 83, "h": 61 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 83, "y": 128, "w": 83, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 83, "h": 61 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 83, "y": 128, "w": 83, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 83, "h": 61 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 83, "y": 128, "w": 83, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 83, "h": 61 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 0, "y": 128, "w": 83, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 83, "h": 61 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 166, "y": 127, "w": 83, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 83, "h": 62 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 332, "y": 126, "w": 83, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 83, "h": 62 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 249, "y": 64, "w": 83, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 63 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 166, "y": 64, "w": 83, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 63 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 166, "y": 0, "w": 83, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 83, "h": 64 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 249, "y": 0, "w": 83, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 83, "h": 64 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 0, "y": 0, "w": 83, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 83, "h": 65 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 83, "y": 0, "w": 83, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 83, "h": 65 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 83, "y": 0, "w": 83, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 83, "h": 65 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 83, "y": 0, "w": 83, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 83, "h": 65 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 83, "y": 0, "w": 83, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 83, "h": 65 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 0, "y": 0, "w": 83, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 83, "h": 65 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 249, "y": 0, "w": 83, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 83, "h": 64 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 166, "y": 0, "w": 83, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 83, "h": 64 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 166, "y": 64, "w": 83, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 63 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 249, "y": 64, "w": 83, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 63 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 332, "y": 126, "w": 83, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 83, "h": 62 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 166, "y": 127, "w": 83, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 83, "h": 62 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 0, "y": 128, "w": 83, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 83, "h": 61 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 83, "y": 128, "w": 83, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 83, "h": 61 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 83, "y": 128, "w": 83, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 83, "h": 61 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 83, "y": 128, "w": 83, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 83, "h": 61 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 0, "y": 128, "w": 83, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 83, "h": 61 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 166, "y": 127, "w": 83, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 83, "h": 62 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 332, "y": 126, "w": 83, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 83, "h": 62 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 249, "y": 64, "w": 83, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 63 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 166, "y": 64, "w": 83, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 63 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 166, "y": 0, "w": 83, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 83, "h": 64 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 249, "y": 0, "w": 83, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 83, "h": 64 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 0, "y": 0, "w": 83, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 83, "h": 65 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 83, "y": 0, "w": 83, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 83, "h": 65 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 83, "y": 0, "w": 83, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 83, "h": 65 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0088.png",
+    "frame": { "x": 83, "y": 0, "w": 83, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 83, "h": 65 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0089.png",
+    "frame": { "x": 83, "y": 0, "w": 83, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 83, "h": 65 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0090.png",
+    "frame": { "x": 0, "y": 0, "w": 83, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 83, "h": 65 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0091.png",
+    "frame": { "x": 249, "y": 0, "w": 83, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 83, "h": 64 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0092.png",
+    "frame": { "x": 166, "y": 0, "w": 83, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 83, "h": 64 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0093.png",
+    "frame": { "x": 166, "y": 0, "w": 83, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 83, "h": 64 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0094.png",
+    "frame": { "x": 0, "y": 65, "w": 83, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 63 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0095.png",
+    "frame": { "x": 0, "y": 65, "w": 83, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 63 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0096.png",
+    "frame": { "x": 0, "y": 65, "w": 83, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 63 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0097.png",
+    "frame": { "x": 0, "y": 65, "w": 83, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 63 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0098.png",
+    "frame": { "x": 83, "y": 65, "w": 83, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 63 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0099.png",
+    "frame": { "x": 83, "y": 65, "w": 83, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 63 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0100.png",
+    "frame": { "x": 332, "y": 0, "w": 84, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 84, "h": 63 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0101.png",
+    "frame": { "x": 332, "y": 0, "w": 84, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 84, "h": 63 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0102.png",
+    "frame": { "x": 332, "y": 63, "w": 84, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 84, "h": 63 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0103.png",
+    "frame": { "x": 332, "y": 63, "w": 84, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 84, "h": 63 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0104.png",
+    "frame": { "x": 332, "y": 63, "w": 84, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 84, "h": 63 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0105.png",
+    "frame": { "x": 332, "y": 63, "w": 84, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 84, "h": 63 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0106.png",
+    "frame": { "x": 332, "y": 0, "w": 84, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 84, "h": 63 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0107.png",
+    "frame": { "x": 0, "y": 65, "w": 83, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 83, "h": 63 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0108.png",
+    "frame": { "x": 0, "y": 65, "w": 83, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 83, "h": 63 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0109.png",
+    "frame": { "x": 249, "y": 127, "w": 83, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 62 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0110.png",
+    "frame": { "x": 249, "y": 127, "w": 83, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 62 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0111.png",
+    "frame": { "x": 332, "y": 188, "w": 83, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 59 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0112.png",
+    "frame": { "x": 332, "y": 188, "w": 83, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 59 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0113.png",
+    "frame": { "x": 0, "y": 189, "w": 83, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 58 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0114.png",
+    "frame": { "x": 0, "y": 189, "w": 83, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 58 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0115.png",
+    "frame": { "x": 0, "y": 189, "w": 83, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 58 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0116.png",
+    "frame": { "x": 0, "y": 189, "w": 83, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 58 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0117.png",
+    "frame": { "x": 332, "y": 188, "w": 83, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 59 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0118.png",
+    "frame": { "x": 0, "y": 65, "w": 83, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 83, "h": 63 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0119.png",
+    "frame": { "x": 0, "y": 65, "w": 83, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 83, "h": 63 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0120.png",
+    "frame": { "x": 0, "y": 65, "w": 83, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 83, "h": 63 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   },
+   {
+    "filename": "0121.png",
+    "frame": { "x": 0, "y": 65, "w": 83, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 83, "h": 63 },
+    "sourceSize": { "w": 84, "h": 66 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.11-x64",
+  "image": "713.png",
+  "format": "I8",
+  "size": { "w": 416, "h": 247 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/shiny/713.png b/public/images/pokemon/exp/shiny/713.png
index ded180bdefc..72c06f1d750 100644
Binary files a/public/images/pokemon/exp/shiny/713.png and b/public/images/pokemon/exp/shiny/713.png differ
diff --git a/public/images/pokemon/exp/shiny/714.json b/public/images/pokemon/exp/shiny/714.json
deleted file mode 100644
index dc8d580d33b..00000000000
--- a/public/images/pokemon/exp/shiny/714.json
+++ /dev/null
@@ -1,314 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "714.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 179,
-				"h": 179
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 64,
-						"h": 63
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 63,
-						"h": 60
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 63,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 64,
-						"h": 63
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 63,
-						"h": 60
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 63,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 64,
-						"h": 63
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 64,
-						"h": 59
-					},
-					"frame": {
-						"x": 0,
-						"y": 60,
-						"w": 64,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 64,
-						"h": 63
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 64,
-						"h": 59
-					},
-					"frame": {
-						"x": 0,
-						"y": 60,
-						"w": 64,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 64,
-						"h": 63
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 64,
-						"h": 58
-					},
-					"frame": {
-						"x": 63,
-						"y": 0,
-						"w": 64,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 64,
-						"h": 63
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 0,
-						"w": 60,
-						"h": 61
-					},
-					"frame": {
-						"x": 64,
-						"y": 58,
-						"w": 60,
-						"h": 61
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 64,
-						"h": 63
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 0,
-						"w": 60,
-						"h": 61
-					},
-					"frame": {
-						"x": 64,
-						"y": 58,
-						"w": 60,
-						"h": 61
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 64,
-						"h": 63
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 54,
-						"h": 58
-					},
-					"frame": {
-						"x": 124,
-						"y": 58,
-						"w": 54,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 64,
-						"h": 63
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 54,
-						"h": 58
-					},
-					"frame": {
-						"x": 124,
-						"y": 58,
-						"w": 54,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 64,
-						"h": 63
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 54,
-						"h": 58
-					},
-					"frame": {
-						"x": 124,
-						"y": 116,
-						"w": 54,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 64,
-						"h": 63
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 2,
-						"w": 60,
-						"h": 60
-					},
-					"frame": {
-						"x": 0,
-						"y": 119,
-						"w": 60,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 64,
-						"h": 63
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 2,
-						"w": 60,
-						"h": 60
-					},
-					"frame": {
-						"x": 0,
-						"y": 119,
-						"w": 60,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 64,
-						"h": 63
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 56,
-						"h": 60
-					},
-					"frame": {
-						"x": 60,
-						"y": 119,
-						"w": 56,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 64,
-						"h": 63
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 56,
-						"h": 60
-					},
-					"frame": {
-						"x": 60,
-						"y": 119,
-						"w": 56,
-						"h": 60
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:f10fb65b088005bbceee81a7323b3d04:cc45de39527285e86e95e3dc2425b833:1a07d46e710b0568ec824f54fbc4fe6a$"
-	}
-}
diff --git a/public/images/pokemon/exp/shiny/714.png b/public/images/pokemon/exp/shiny/714.png
deleted file mode 100644
index 53e4a6348be..00000000000
Binary files a/public/images/pokemon/exp/shiny/714.png and /dev/null differ
diff --git a/public/images/pokemon/exp/shiny/718-10.json b/public/images/pokemon/exp/shiny/718-10.json
deleted file mode 100644
index 98f6bbb0f01..00000000000
--- a/public/images/pokemon/exp/shiny/718-10.json
+++ /dev/null
@@ -1,692 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "718-10.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 239,
-				"h": 239
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0028.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 61,
-						"h": 65
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 61,
-						"h": 65
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 0,
-						"w": 59,
-						"h": 67
-					},
-					"frame": {
-						"x": 0,
-						"y": 65,
-						"w": 59,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 0,
-						"w": 59,
-						"h": 67
-					},
-					"frame": {
-						"x": 0,
-						"y": 65,
-						"w": 59,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 0,
-						"w": 59,
-						"h": 67
-					},
-					"frame": {
-						"x": 0,
-						"y": 65,
-						"w": 59,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0029.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 64,
-						"h": 61
-					},
-					"frame": {
-						"x": 0,
-						"y": 132,
-						"w": 64,
-						"h": 61
-					}
-				},
-				{
-					"filename": "0030.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 65,
-						"h": 60
-					},
-					"frame": {
-						"x": 59,
-						"y": 65,
-						"w": 65,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 59,
-						"h": 65
-					},
-					"frame": {
-						"x": 61,
-						"y": 0,
-						"w": 59,
-						"h": 65
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 59,
-						"h": 65
-					},
-					"frame": {
-						"x": 61,
-						"y": 0,
-						"w": 59,
-						"h": 65
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 59,
-						"h": 65
-					},
-					"frame": {
-						"x": 61,
-						"y": 0,
-						"w": 59,
-						"h": 65
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 59,
-						"h": 65
-					},
-					"frame": {
-						"x": 120,
-						"y": 0,
-						"w": 59,
-						"h": 65
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 59,
-						"h": 65
-					},
-					"frame": {
-						"x": 120,
-						"y": 0,
-						"w": 59,
-						"h": 65
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 59,
-						"h": 65
-					},
-					"frame": {
-						"x": 120,
-						"y": 0,
-						"w": 59,
-						"h": 65
-					}
-				},
-				{
-					"filename": "0027.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 1,
-						"w": 59,
-						"h": 66
-					},
-					"frame": {
-						"x": 179,
-						"y": 0,
-						"w": 59,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 58,
-						"h": 67
-					},
-					"frame": {
-						"x": 124,
-						"y": 66,
-						"w": 58,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 58,
-						"h": 67
-					},
-					"frame": {
-						"x": 124,
-						"y": 66,
-						"w": 58,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 58,
-						"h": 67
-					},
-					"frame": {
-						"x": 124,
-						"y": 66,
-						"w": 58,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0031.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 2,
-						"w": 59,
-						"h": 65
-					},
-					"frame": {
-						"x": 64,
-						"y": 125,
-						"w": 59,
-						"h": 65
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 0,
-						"w": 57,
-						"h": 67
-					},
-					"frame": {
-						"x": 182,
-						"y": 66,
-						"w": 57,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 0,
-						"w": 57,
-						"h": 67
-					},
-					"frame": {
-						"x": 182,
-						"y": 66,
-						"w": 57,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 0,
-						"w": 57,
-						"h": 67
-					},
-					"frame": {
-						"x": 182,
-						"y": 66,
-						"w": 57,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 0,
-						"w": 57,
-						"h": 67
-					},
-					"frame": {
-						"x": 182,
-						"y": 66,
-						"w": 57,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 0,
-						"w": 57,
-						"h": 67
-					},
-					"frame": {
-						"x": 182,
-						"y": 66,
-						"w": 57,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 0,
-						"w": 57,
-						"h": 67
-					},
-					"frame": {
-						"x": 182,
-						"y": 66,
-						"w": 57,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0025.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 0,
-						"w": 57,
-						"h": 67
-					},
-					"frame": {
-						"x": 182,
-						"y": 66,
-						"w": 57,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0026.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 0,
-						"w": 57,
-						"h": 67
-					},
-					"frame": {
-						"x": 182,
-						"y": 66,
-						"w": 57,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0032.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 0,
-						"w": 57,
-						"h": 67
-					},
-					"frame": {
-						"x": 182,
-						"y": 66,
-						"w": 57,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 1,
-						"w": 58,
-						"h": 66
-					},
-					"frame": {
-						"x": 123,
-						"y": 133,
-						"w": 58,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 1,
-						"w": 58,
-						"h": 66
-					},
-					"frame": {
-						"x": 123,
-						"y": 133,
-						"w": 58,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 1,
-						"w": 58,
-						"h": 66
-					},
-					"frame": {
-						"x": 123,
-						"y": 133,
-						"w": 58,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 0,
-						"w": 57,
-						"h": 67
-					},
-					"frame": {
-						"x": 181,
-						"y": 133,
-						"w": 57,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 0,
-						"w": 57,
-						"h": 67
-					},
-					"frame": {
-						"x": 181,
-						"y": 133,
-						"w": 57,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 0,
-						"w": 57,
-						"h": 67
-					},
-					"frame": {
-						"x": 181,
-						"y": 133,
-						"w": 57,
-						"h": 67
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:f59f7684ea1f2b8bb14e98d16b18e3e0:a1fa21d4b2b42982b0f0546116b38791:82195cf2a6db620c5643b8162d6e8c5c$"
-	}
-}
diff --git a/public/images/pokemon/exp/shiny/718-10.png b/public/images/pokemon/exp/shiny/718-10.png
deleted file mode 100644
index 26bc2cdc580..00000000000
Binary files a/public/images/pokemon/exp/shiny/718-10.png and /dev/null differ
diff --git a/public/images/pokemon/exp/shiny/718.json b/public/images/pokemon/exp/shiny/718.json
deleted file mode 100644
index 29211eba621..00000000000
--- a/public/images/pokemon/exp/shiny/718.json
+++ /dev/null
@@ -1,230 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "718.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 219,
-				"h": 219
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 75,
-						"h": 89
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 71,
-						"h": 88
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 71,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 75,
-						"h": 89
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 73,
-						"h": 89
-					},
-					"frame": {
-						"x": 71,
-						"y": 0,
-						"w": 73,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 75,
-						"h": 89
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 74,
-						"h": 89
-					},
-					"frame": {
-						"x": 144,
-						"y": 0,
-						"w": 74,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 75,
-						"h": 89
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 74,
-						"h": 89
-					},
-					"frame": {
-						"x": 144,
-						"y": 0,
-						"w": 74,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 75,
-						"h": 89
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 74,
-						"h": 89
-					},
-					"frame": {
-						"x": 0,
-						"y": 89,
-						"w": 74,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 75,
-						"h": 89
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 74,
-						"h": 89
-					},
-					"frame": {
-						"x": 0,
-						"y": 89,
-						"w": 74,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 75,
-						"h": 89
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 73,
-						"h": 89
-					},
-					"frame": {
-						"x": 74,
-						"y": 89,
-						"w": 73,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 75,
-						"h": 89
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 73,
-						"h": 89
-					},
-					"frame": {
-						"x": 74,
-						"y": 89,
-						"w": 73,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 75,
-						"h": 89
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 72,
-						"h": 89
-					},
-					"frame": {
-						"x": 147,
-						"y": 89,
-						"w": 72,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 75,
-						"h": 89
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 72,
-						"h": 89
-					},
-					"frame": {
-						"x": 147,
-						"y": 89,
-						"w": 72,
-						"h": 89
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:5e3b138302e8798c9cc3072d564e3004:76aca0c13999f6d287f1b28f7f386fed:7b4a06b06cbac24b3f39727b0238661b$"
-	}
-}
diff --git a/public/images/pokemon/exp/shiny/718.png b/public/images/pokemon/exp/shiny/718.png
deleted file mode 100644
index 59dde9d4c05..00000000000
Binary files a/public/images/pokemon/exp/shiny/718.png and /dev/null differ
diff --git a/public/images/pokemon/exp/shiny/719.json b/public/images/pokemon/exp/shiny/719.json
deleted file mode 100644
index 9bf72888c33..00000000000
--- a/public/images/pokemon/exp/shiny/719.json
+++ /dev/null
@@ -1,1091 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "719.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 210,
-				"h": 210
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 24,
-						"y": 10,
-						"w": 49,
-						"h": 67
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 49,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 24,
-						"y": 6,
-						"w": 49,
-						"h": 67
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 49,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 24,
-						"y": 10,
-						"w": 49,
-						"h": 67
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 49,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 24,
-						"y": 6,
-						"w": 49,
-						"h": 67
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 49,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0025.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 24,
-						"y": 10,
-						"w": 49,
-						"h": 67
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 49,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0031.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 24,
-						"y": 6,
-						"w": 49,
-						"h": 67
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 49,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0040.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 34,
-						"y": 9,
-						"w": 48,
-						"h": 67
-					},
-					"frame": {
-						"x": 49,
-						"y": 0,
-						"w": 48,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0041.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 22,
-						"y": 5,
-						"w": 48,
-						"h": 67
-					},
-					"frame": {
-						"x": 49,
-						"y": 0,
-						"w": 48,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0042.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 16,
-						"y": 3,
-						"w": 48,
-						"h": 67
-					},
-					"frame": {
-						"x": 49,
-						"y": 0,
-						"w": 48,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0043.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 0,
-						"w": 48,
-						"h": 67
-					},
-					"frame": {
-						"x": 49,
-						"y": 0,
-						"w": 48,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 25,
-						"y": 8,
-						"w": 47,
-						"h": 67
-					},
-					"frame": {
-						"x": 97,
-						"y": 0,
-						"w": 47,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 25,
-						"y": 8,
-						"w": 47,
-						"h": 67
-					},
-					"frame": {
-						"x": 97,
-						"y": 0,
-						"w": 47,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 25,
-						"y": 4,
-						"w": 47,
-						"h": 67
-					},
-					"frame": {
-						"x": 97,
-						"y": 0,
-						"w": 47,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 25,
-						"y": 6,
-						"w": 47,
-						"h": 67
-					},
-					"frame": {
-						"x": 97,
-						"y": 0,
-						"w": 47,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 25,
-						"y": 8,
-						"w": 47,
-						"h": 67
-					},
-					"frame": {
-						"x": 97,
-						"y": 0,
-						"w": 47,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 25,
-						"y": 8,
-						"w": 47,
-						"h": 67
-					},
-					"frame": {
-						"x": 97,
-						"y": 0,
-						"w": 47,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 25,
-						"y": 4,
-						"w": 47,
-						"h": 67
-					},
-					"frame": {
-						"x": 97,
-						"y": 0,
-						"w": 47,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 25,
-						"y": 6,
-						"w": 47,
-						"h": 67
-					},
-					"frame": {
-						"x": 97,
-						"y": 0,
-						"w": 47,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 25,
-						"y": 8,
-						"w": 47,
-						"h": 67
-					},
-					"frame": {
-						"x": 97,
-						"y": 0,
-						"w": 47,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0026.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 25,
-						"y": 8,
-						"w": 47,
-						"h": 67
-					},
-					"frame": {
-						"x": 97,
-						"y": 0,
-						"w": 47,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0030.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 25,
-						"y": 4,
-						"w": 47,
-						"h": 67
-					},
-					"frame": {
-						"x": 97,
-						"y": 0,
-						"w": 47,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0032.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 25,
-						"y": 6,
-						"w": 47,
-						"h": 67
-					},
-					"frame": {
-						"x": 97,
-						"y": 0,
-						"w": 47,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0045.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 5,
-						"w": 46,
-						"h": 67
-					},
-					"frame": {
-						"x": 144,
-						"y": 0,
-						"w": 46,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0044.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 0,
-						"w": 48,
-						"h": 66
-					},
-					"frame": {
-						"x": 0,
-						"y": 67,
-						"w": 48,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0039.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 48,
-						"y": 12,
-						"w": 46,
-						"h": 66
-					},
-					"frame": {
-						"x": 48,
-						"y": 67,
-						"w": 46,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0036.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 45,
-						"y": 1,
-						"w": 45,
-						"h": 67
-					},
-					"frame": {
-						"x": 94,
-						"y": 67,
-						"w": 45,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0048.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 12,
-						"y": 8,
-						"w": 45,
-						"h": 67
-					},
-					"frame": {
-						"x": 94,
-						"y": 67,
-						"w": 45,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0049.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 19,
-						"y": 5,
-						"w": 45,
-						"h": 67
-					},
-					"frame": {
-						"x": 94,
-						"y": 67,
-						"w": 45,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 25,
-						"y": 6,
-						"w": 44,
-						"h": 67
-					},
-					"frame": {
-						"x": 0,
-						"y": 133,
-						"w": 44,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 25,
-						"y": 6,
-						"w": 44,
-						"h": 67
-					},
-					"frame": {
-						"x": 0,
-						"y": 133,
-						"w": 44,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 25,
-						"y": 4,
-						"w": 44,
-						"h": 67
-					},
-					"frame": {
-						"x": 0,
-						"y": 133,
-						"w": 44,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 25,
-						"y": 2,
-						"w": 44,
-						"h": 67
-					},
-					"frame": {
-						"x": 0,
-						"y": 133,
-						"w": 44,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 25,
-						"y": 6,
-						"w": 44,
-						"h": 67
-					},
-					"frame": {
-						"x": 0,
-						"y": 133,
-						"w": 44,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 25,
-						"y": 6,
-						"w": 44,
-						"h": 67
-					},
-					"frame": {
-						"x": 0,
-						"y": 133,
-						"w": 44,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 25,
-						"y": 6,
-						"w": 44,
-						"h": 67
-					},
-					"frame": {
-						"x": 0,
-						"y": 133,
-						"w": 44,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 25,
-						"y": 4,
-						"w": 44,
-						"h": 67
-					},
-					"frame": {
-						"x": 0,
-						"y": 133,
-						"w": 44,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 25,
-						"y": 2,
-						"w": 44,
-						"h": 67
-					},
-					"frame": {
-						"x": 0,
-						"y": 133,
-						"w": 44,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 25,
-						"y": 6,
-						"w": 44,
-						"h": 67
-					},
-					"frame": {
-						"x": 0,
-						"y": 133,
-						"w": 44,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 25,
-						"y": 6,
-						"w": 44,
-						"h": 67
-					},
-					"frame": {
-						"x": 0,
-						"y": 133,
-						"w": 44,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0027.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 25,
-						"y": 6,
-						"w": 44,
-						"h": 67
-					},
-					"frame": {
-						"x": 0,
-						"y": 133,
-						"w": 44,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0028.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 25,
-						"y": 4,
-						"w": 44,
-						"h": 67
-					},
-					"frame": {
-						"x": 0,
-						"y": 133,
-						"w": 44,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0029.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 25,
-						"y": 2,
-						"w": 44,
-						"h": 67
-					},
-					"frame": {
-						"x": 0,
-						"y": 133,
-						"w": 44,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0033.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 25,
-						"y": 6,
-						"w": 44,
-						"h": 67
-					},
-					"frame": {
-						"x": 0,
-						"y": 133,
-						"w": 44,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0034.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 27,
-						"y": 4,
-						"w": 44,
-						"h": 67
-					},
-					"frame": {
-						"x": 0,
-						"y": 133,
-						"w": 44,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0051.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 25,
-						"y": 6,
-						"w": 44,
-						"h": 67
-					},
-					"frame": {
-						"x": 0,
-						"y": 133,
-						"w": 44,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0035.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 36,
-						"y": 2,
-						"w": 42,
-						"h": 67
-					},
-					"frame": {
-						"x": 44,
-						"y": 133,
-						"w": 42,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0037.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 54,
-						"y": 3,
-						"w": 42,
-						"h": 67
-					},
-					"frame": {
-						"x": 139,
-						"y": 67,
-						"w": 42,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0050.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 23,
-						"y": 6,
-						"w": 42,
-						"h": 67
-					},
-					"frame": {
-						"x": 139,
-						"y": 67,
-						"w": 42,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0047.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 12,
-						"w": 42,
-						"h": 66
-					},
-					"frame": {
-						"x": 86,
-						"y": 134,
-						"w": 42,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0038.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 55,
-						"y": 6,
-						"w": 41,
-						"h": 67
-					},
-					"frame": {
-						"x": 128,
-						"y": 134,
-						"w": 41,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0046.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 8,
-						"w": 41,
-						"h": 67
-					},
-					"frame": {
-						"x": 169,
-						"y": 134,
-						"w": 41,
-						"h": 67
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:a418188ec41514bd9ae14eb24912795a:ee144292ee551fc92c6c10944cfe21d9:17a705bb924916761be2495822a53735$"
-	}
-}
diff --git a/public/images/pokemon/exp/shiny/719.png b/public/images/pokemon/exp/shiny/719.png
deleted file mode 100644
index a733b44e4b3..00000000000
Binary files a/public/images/pokemon/exp/shiny/719.png and /dev/null differ
diff --git a/public/images/pokemon/exp/shiny/728.json b/public/images/pokemon/exp/shiny/728.json
index 0ba3fa4002d..9bed3c98376 100644
--- a/public/images/pokemon/exp/shiny/728.json
+++ b/public/images/pokemon/exp/shiny/728.json
@@ -1,1112 +1,775 @@
-{
-	"textures": [
-		{
-			"image": "728.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 165,
-				"h": 165
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0039.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 44,
-						"h": 40
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 44,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0051.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 44,
-						"h": 40
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 44,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 42,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 40,
-						"w": 42,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 42,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 40,
-						"w": 42,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 42,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 40,
-						"w": 42,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 42,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 40,
-						"w": 42,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0026.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 42,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 40,
-						"w": 42,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0036.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 42,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 40,
-						"w": 42,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 42,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 81,
-						"w": 42,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 42,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 81,
-						"w": 42,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 42,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 81,
-						"w": 42,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 42,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 81,
-						"w": 42,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0027.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 42,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 81,
-						"w": 42,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0035.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 42,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 81,
-						"w": 42,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0040.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 44,
-						"h": 39
-					},
-					"frame": {
-						"x": 44,
-						"y": 0,
-						"w": 44,
-						"h": 39
-					}
-				},
-				{
-					"filename": "0050.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 44,
-						"h": 39
-					},
-					"frame": {
-						"x": 44,
-						"y": 0,
-						"w": 44,
-						"h": 39
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 42,
-						"h": 40
-					},
-					"frame": {
-						"x": 0,
-						"y": 122,
-						"w": 42,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 42,
-						"h": 40
-					},
-					"frame": {
-						"x": 0,
-						"y": 122,
-						"w": 42,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0025.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 42,
-						"h": 40
-					},
-					"frame": {
-						"x": 0,
-						"y": 122,
-						"w": 42,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0037.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 42,
-						"h": 40
-					},
-					"frame": {
-						"x": 0,
-						"y": 122,
-						"w": 42,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0041.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 45,
-						"h": 37
-					},
-					"frame": {
-						"x": 88,
-						"y": 0,
-						"w": 45,
-						"h": 37
-					}
-				},
-				{
-					"filename": "0045.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 45,
-						"h": 37
-					},
-					"frame": {
-						"x": 88,
-						"y": 0,
-						"w": 45,
-						"h": 37
-					}
-				},
-				{
-					"filename": "0049.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 45,
-						"h": 37
-					},
-					"frame": {
-						"x": 88,
-						"y": 0,
-						"w": 45,
-						"h": 37
-					}
-				},
-				{
-					"filename": "0042.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 45,
-						"h": 37
-					},
-					"frame": {
-						"x": 88,
-						"y": 37,
-						"w": 45,
-						"h": 37
-					}
-				},
-				{
-					"filename": "0044.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 45,
-						"h": 37
-					},
-					"frame": {
-						"x": 88,
-						"y": 37,
-						"w": 45,
-						"h": 37
-					}
-				},
-				{
-					"filename": "0046.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 45,
-						"h": 37
-					},
-					"frame": {
-						"x": 88,
-						"y": 37,
-						"w": 45,
-						"h": 37
-					}
-				},
-				{
-					"filename": "0048.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 45,
-						"h": 37
-					},
-					"frame": {
-						"x": 88,
-						"y": 37,
-						"w": 45,
-						"h": 37
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 42,
-						"h": 40
-					},
-					"frame": {
-						"x": 44,
-						"y": 39,
-						"w": 42,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 42,
-						"h": 40
-					},
-					"frame": {
-						"x": 44,
-						"y": 39,
-						"w": 42,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 42,
-						"h": 40
-					},
-					"frame": {
-						"x": 44,
-						"y": 39,
-						"w": 42,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 42,
-						"h": 40
-					},
-					"frame": {
-						"x": 44,
-						"y": 39,
-						"w": 42,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0028.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 42,
-						"h": 40
-					},
-					"frame": {
-						"x": 44,
-						"y": 39,
-						"w": 42,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0034.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 42,
-						"h": 40
-					},
-					"frame": {
-						"x": 44,
-						"y": 39,
-						"w": 42,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 42,
-						"h": 40
-					},
-					"frame": {
-						"x": 42,
-						"y": 79,
-						"w": 42,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 42,
-						"h": 40
-					},
-					"frame": {
-						"x": 42,
-						"y": 79,
-						"w": 42,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 42,
-						"h": 40
-					},
-					"frame": {
-						"x": 42,
-						"y": 79,
-						"w": 42,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 42,
-						"h": 40
-					},
-					"frame": {
-						"x": 42,
-						"y": 79,
-						"w": 42,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0029.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 42,
-						"h": 40
-					},
-					"frame": {
-						"x": 42,
-						"y": 79,
-						"w": 42,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0033.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 42,
-						"h": 40
-					},
-					"frame": {
-						"x": 42,
-						"y": 79,
-						"w": 42,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 42,
-						"h": 39
-					},
-					"frame": {
-						"x": 42,
-						"y": 119,
-						"w": 42,
-						"h": 39
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 42,
-						"h": 39
-					},
-					"frame": {
-						"x": 42,
-						"y": 119,
-						"w": 42,
-						"h": 39
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 42,
-						"h": 39
-					},
-					"frame": {
-						"x": 42,
-						"y": 119,
-						"w": 42,
-						"h": 39
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 42,
-						"h": 39
-					},
-					"frame": {
-						"x": 42,
-						"y": 119,
-						"w": 42,
-						"h": 39
-					}
-				},
-				{
-					"filename": "0030.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 42,
-						"h": 39
-					},
-					"frame": {
-						"x": 42,
-						"y": 119,
-						"w": 42,
-						"h": 39
-					}
-				},
-				{
-					"filename": "0032.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 42,
-						"h": 39
-					},
-					"frame": {
-						"x": 42,
-						"y": 119,
-						"w": 42,
-						"h": 39
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 42,
-						"h": 39
-					},
-					"frame": {
-						"x": 86,
-						"y": 74,
-						"w": 42,
-						"h": 39
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 42,
-						"h": 39
-					},
-					"frame": {
-						"x": 86,
-						"y": 74,
-						"w": 42,
-						"h": 39
-					}
-				},
-				{
-					"filename": "0031.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 42,
-						"h": 39
-					},
-					"frame": {
-						"x": 86,
-						"y": 74,
-						"w": 42,
-						"h": 39
-					}
-				},
-				{
-					"filename": "0038.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 40,
-						"h": 40
-					},
-					"frame": {
-						"x": 84,
-						"y": 113,
-						"w": 40,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0052.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 40,
-						"h": 40
-					},
-					"frame": {
-						"x": 84,
-						"y": 113,
-						"w": 40,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0043.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 41,
-						"h": 37
-					},
-					"frame": {
-						"x": 124,
-						"y": 113,
-						"w": 41,
-						"h": 37
-					}
-				},
-				{
-					"filename": "0047.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 41,
-						"h": 37
-					},
-					"frame": {
-						"x": 124,
-						"y": 113,
-						"w": 41,
-						"h": 37
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:ff62847c95025ab843b05a9134e55488:7da27b56213df83850702c3591259733:74218c18c9d392741666ee5c0c28d306$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 40, "y": 94, "w": 40, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 15, "w": 40, "h": 39 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 80, "y": 134, "w": 40, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 16, "w": 40, "h": 38 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 40, "y": 172, "w": 40, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 17, "w": 40, "h": 37 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 120, "y": 173, "w": 39, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 18, "w": 39, "h": 36 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 159, "y": 207, "w": 39, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 19, "w": 39, "h": 36 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 0, "y": 210, "w": 38, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 20, "w": 38, "h": 35 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 40, "y": 209, "w": 39, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 19, "w": 39, "h": 36 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 118, "y": 209, "w": 39, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 19, "w": 39, "h": 35 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 79, "y": 209, "w": 39, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 18, "w": 39, "h": 36 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 80, "y": 172, "w": 40, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 17, "w": 40, "h": 37 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 159, "y": 169, "w": 40, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 16, "w": 40, "h": 38 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 0, "y": 172, "w": 40, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 16, "w": 40, "h": 38 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 80, "y": 95, "w": 40, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 15, "w": 40, "h": 39 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 80, "y": 134, "w": 40, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 16, "w": 40, "h": 38 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 40, "y": 172, "w": 40, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 17, "w": 40, "h": 37 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 120, "y": 173, "w": 39, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 18, "w": 39, "h": 36 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 159, "y": 207, "w": 39, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 19, "w": 39, "h": 36 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 0, "y": 210, "w": 38, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 20, "w": 38, "h": 35 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 40, "y": 209, "w": 39, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 19, "w": 39, "h": 36 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 118, "y": 209, "w": 39, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 19, "w": 39, "h": 35 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 79, "y": 209, "w": 39, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 18, "w": 39, "h": 36 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 80, "y": 172, "w": 40, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 17, "w": 40, "h": 37 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 159, "y": 169, "w": 40, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 16, "w": 40, "h": 38 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 0, "y": 172, "w": 40, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 16, "w": 40, "h": 38 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 80, "y": 95, "w": 40, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 15, "w": 40, "h": 39 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 80, "y": 134, "w": 40, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 16, "w": 40, "h": 38 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 40, "y": 172, "w": 40, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 17, "w": 40, "h": 37 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 120, "y": 173, "w": 39, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 18, "w": 39, "h": 36 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 159, "y": 207, "w": 39, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 19, "w": 39, "h": 36 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 0, "y": 210, "w": 38, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 20, "w": 38, "h": 35 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 40, "y": 209, "w": 39, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 19, "w": 39, "h": 36 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 118, "y": 209, "w": 39, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 19, "w": 39, "h": 35 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 79, "y": 209, "w": 39, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 18, "w": 39, "h": 36 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 80, "y": 172, "w": 40, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 17, "w": 40, "h": 37 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 159, "y": 169, "w": 40, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 16, "w": 40, "h": 38 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 0, "y": 172, "w": 40, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 16, "w": 40, "h": 38 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 80, "y": 95, "w": 40, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 15, "w": 40, "h": 39 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 80, "y": 134, "w": 40, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 16, "w": 40, "h": 38 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 40, "y": 172, "w": 40, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 17, "w": 40, "h": 37 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 120, "y": 173, "w": 39, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 18, "w": 39, "h": 36 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 159, "y": 207, "w": 39, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 19, "w": 39, "h": 36 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 0, "y": 210, "w": 38, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 20, "w": 38, "h": 35 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 40, "y": 209, "w": 39, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 19, "w": 39, "h": 36 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 118, "y": 209, "w": 39, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 19, "w": 39, "h": 35 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 79, "y": 209, "w": 39, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 18, "w": 39, "h": 36 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 80, "y": 172, "w": 40, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 17, "w": 40, "h": 37 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 159, "y": 169, "w": 40, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 16, "w": 40, "h": 38 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 0, "y": 172, "w": 40, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 16, "w": 40, "h": 38 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 80, "y": 95, "w": 40, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 15, "w": 40, "h": 39 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 80, "y": 134, "w": 40, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 16, "w": 40, "h": 38 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 40, "y": 172, "w": 40, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 17, "w": 40, "h": 37 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 120, "y": 173, "w": 39, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 18, "w": 39, "h": 36 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 159, "y": 207, "w": 39, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 19, "w": 39, "h": 36 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 0, "y": 210, "w": 38, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 20, "w": 38, "h": 35 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 40, "y": 209, "w": 39, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 19, "w": 39, "h": 36 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 118, "y": 209, "w": 39, "h": 35 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 19, "w": 39, "h": 35 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 79, "y": 209, "w": 39, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 18, "w": 39, "h": 36 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 80, "y": 172, "w": 40, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 17, "w": 40, "h": 37 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 159, "y": 169, "w": 40, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 16, "w": 40, "h": 38 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 0, "y": 172, "w": 40, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 16, "w": 40, "h": 38 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 40, "y": 94, "w": 40, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 15, "w": 40, "h": 39 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 170, "y": 130, "w": 40, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 15, "w": 40, "h": 39 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 0, "y": 133, "w": 40, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 15, "w": 40, "h": 39 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 40, "y": 133, "w": 40, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 15, "w": 40, "h": 39 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 0, "y": 53, "w": 40, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 14, "w": 40, "h": 40 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 40, "y": 54, "w": 40, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 14, "w": 40, "h": 40 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 170, "y": 90, "w": 40, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 14, "w": 40, "h": 40 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 0, "y": 93, "w": 40, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 14, "w": 40, "h": 40 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 130, "y": 52, "w": 40, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 13, "w": 40, "h": 41 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 90, "y": 52, "w": 40, "h": 43 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 11, "w": 40, "h": 43 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 177, "y": 46, "w": 40, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 10, "w": 40, "h": 44 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 177, "y": 0, "w": 40, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 8, "w": 40, "h": 46 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 90, "y": 0, "w": 45, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 45, "h": 52 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 0, "y": 0, "w": 46, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 46, "h": 53 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 0, "y": 0, "w": 46, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 46, "h": 53 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 0, "y": 0, "w": 46, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 46, "h": 53 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 0, "y": 0, "w": 46, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 46, "h": 53 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 135, "y": 0, "w": 42, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 42, "h": 52 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 46, "y": 0, "w": 44, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 44, "h": 54 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 120, "y": 133, "w": 39, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 14, "w": 39, "h": 40 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 130, "y": 93, "w": 40, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 14, "w": 40, "h": 40 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 0, "y": 53, "w": 40, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 14, "w": 40, "h": 40 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 40, "y": 133, "w": 40, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 15, "w": 40, "h": 39 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 0, "y": 133, "w": 40, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 15, "w": 40, "h": 39 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 170, "y": 130, "w": 40, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 15, "w": 40, "h": 39 },
+    "sourceSize": { "w": 46, "h": 55 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.13-x64",
+  "format": "I8",
+  "size": { "w": 217, "h": 245 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/shiny/728.png b/public/images/pokemon/exp/shiny/728.png
index 0266097b1f3..d3bf6112f30 100644
Binary files a/public/images/pokemon/exp/shiny/728.png and b/public/images/pokemon/exp/shiny/728.png differ
diff --git a/public/images/pokemon/exp/shiny/729.json b/public/images/pokemon/exp/shiny/729.json
index e9fb1aa0faa..ed22b70455c 100644
--- a/public/images/pokemon/exp/shiny/729.json
+++ b/public/images/pokemon/exp/shiny/729.json
@@ -1,272 +1,1055 @@
-{
-	"textures": [
-		{
-			"image": "729.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 141,
-				"h": 141
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 49,
-						"h": 51
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 49,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 49,
-						"h": 51
-					},
-					"frame": {
-						"x": 0,
-						"y": 51,
-						"w": 49,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 49,
-						"h": 51
-					},
-					"frame": {
-						"x": 0,
-						"y": 51,
-						"w": 49,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 48,
-						"h": 50
-					},
-					"frame": {
-						"x": 49,
-						"y": 0,
-						"w": 48,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 48,
-						"h": 50
-					},
-					"frame": {
-						"x": 49,
-						"y": 0,
-						"w": 48,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 42,
-						"h": 47
-					},
-					"frame": {
-						"x": 97,
-						"y": 0,
-						"w": 42,
-						"h": 47
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 42,
-						"h": 47
-					},
-					"frame": {
-						"x": 97,
-						"y": 0,
-						"w": 42,
-						"h": 47
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 40,
-						"h": 47
-					},
-					"frame": {
-						"x": 97,
-						"y": 47,
-						"w": 40,
-						"h": 47
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 46,
-						"h": 48
-					},
-					"frame": {
-						"x": 49,
-						"y": 50,
-						"w": 46,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 46,
-						"h": 48
-					},
-					"frame": {
-						"x": 49,
-						"y": 50,
-						"w": 46,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 45,
-						"h": 47
-					},
-					"frame": {
-						"x": 95,
-						"y": 94,
-						"w": 45,
-						"h": 47
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 45,
-						"h": 47
-					},
-					"frame": {
-						"x": 95,
-						"y": 94,
-						"w": 45,
-						"h": 47
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:443d9818c7a68828a3e681ceb7d9ccd2:3865e964ed12d558fc1c9e3e95c82c69:b2d5dd692ec79c7357afdffa7b3670a9$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 53, "y": 283, "w": 52, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 52, "h": 55 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 105, "y": 286, "w": 51, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 51, "h": 55 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 429, "y": 336, "w": 50, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 10, "w": 50, "h": 54 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 263, "y": 337, "w": 49, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 10, "w": 49, "h": 54 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 0, "y": 345, "w": 48, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 11, "w": 48, "h": 53 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 408, "y": 390, "w": 46, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 10, "w": 46, "h": 55 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 454, "y": 390, "w": 46, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 11, "w": 46, "h": 54 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 48, "y": 391, "w": 46, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 11, "w": 46, "h": 53 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 204, "y": 390, "w": 47, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 10, "w": 47, "h": 54 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 156, "y": 339, "w": 48, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 10, "w": 48, "h": 54 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 462, "y": 226, "w": 50, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 50, "h": 55 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 0, "y": 290, "w": 51, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 51, "h": 55 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 326, "y": 282, "w": 52, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 52, "h": 55 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 164, "y": 229, "w": 53, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 8, "w": 53, "h": 56 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 0, "y": 178, "w": 54, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 8, "w": 54, "h": 56 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 55, "y": 117, "w": 55, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 8, "w": 55, "h": 56 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 109, "y": 175, "w": 55, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 55, "h": 55 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 164, "y": 174, "w": 55, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 55, "h": 55 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 54, "y": 173, "w": 55, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 55, "h": 55 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 236, "y": 171, "w": 55, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 55, "h": 55 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 54, "y": 228, "w": 54, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 54, "h": 55 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 327, "y": 227, "w": 54, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 54, "h": 55 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 381, "y": 281, "w": 53, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 53, "h": 55 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 434, "y": 281, "w": 53, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 53, "h": 55 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 53, "y": 283, "w": 52, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 52, "h": 55 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 105, "y": 286, "w": 51, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 51, "h": 55 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 429, "y": 336, "w": 50, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 10, "w": 50, "h": 54 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 263, "y": 337, "w": 49, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 10, "w": 49, "h": 54 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 0, "y": 345, "w": 48, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 11, "w": 48, "h": 53 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 408, "y": 390, "w": 46, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 10, "w": 46, "h": 55 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 454, "y": 390, "w": 46, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 11, "w": 46, "h": 54 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 48, "y": 391, "w": 46, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 11, "w": 46, "h": 53 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 204, "y": 390, "w": 47, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 10, "w": 47, "h": 54 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 156, "y": 339, "w": 48, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 10, "w": 48, "h": 54 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 462, "y": 226, "w": 50, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 50, "h": 55 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 0, "y": 290, "w": 51, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 51, "h": 55 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 326, "y": 282, "w": 52, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 52, "h": 55 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 164, "y": 229, "w": 53, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 8, "w": 53, "h": 56 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 0, "y": 178, "w": 54, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 8, "w": 54, "h": 56 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 55, "y": 117, "w": 55, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 8, "w": 55, "h": 56 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 109, "y": 175, "w": 55, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 55, "h": 55 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 164, "y": 174, "w": 55, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 55, "h": 55 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 54, "y": 173, "w": 55, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 55, "h": 55 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 236, "y": 171, "w": 55, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 55, "h": 55 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 54, "y": 228, "w": 54, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 54, "h": 55 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 327, "y": 227, "w": 54, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 54, "h": 55 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 381, "y": 281, "w": 53, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 53, "h": 55 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 434, "y": 281, "w": 53, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 53, "h": 55 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 53, "y": 283, "w": 52, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 52, "h": 55 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 105, "y": 286, "w": 51, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 51, "h": 55 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 429, "y": 336, "w": 50, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 10, "w": 50, "h": 54 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 263, "y": 337, "w": 49, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 10, "w": 49, "h": 54 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 0, "y": 345, "w": 48, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 11, "w": 48, "h": 53 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 408, "y": 390, "w": 46, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 10, "w": 46, "h": 55 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 454, "y": 390, "w": 46, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 11, "w": 46, "h": 54 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 48, "y": 391, "w": 46, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 11, "w": 46, "h": 53 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 204, "y": 390, "w": 47, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 10, "w": 47, "h": 54 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 156, "y": 339, "w": 48, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 10, "w": 48, "h": 54 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 462, "y": 226, "w": 50, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 50, "h": 55 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 0, "y": 290, "w": 51, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 51, "h": 55 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 326, "y": 282, "w": 52, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 52, "h": 55 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 164, "y": 229, "w": 53, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 8, "w": 53, "h": 56 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 0, "y": 178, "w": 54, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 8, "w": 54, "h": 56 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 55, "y": 117, "w": 55, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 8, "w": 55, "h": 56 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 109, "y": 175, "w": 55, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 55, "h": 55 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 164, "y": 174, "w": 55, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 55, "h": 55 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 54, "y": 173, "w": 55, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 55, "h": 55 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 236, "y": 171, "w": 55, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 55, "h": 55 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 54, "y": 228, "w": 54, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 54, "h": 55 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 327, "y": 227, "w": 54, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 54, "h": 55 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 381, "y": 281, "w": 53, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 53, "h": 55 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 434, "y": 281, "w": 53, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 53, "h": 55 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 53, "y": 283, "w": 52, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 52, "h": 55 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 408, "y": 226, "w": 54, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 9, "w": 54, "h": 55 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 312, "y": 56, "w": 57, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 8, "w": 57, "h": 56 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 312, "y": 0, "w": 59, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 8, "w": 59, "h": 56 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 244, "y": 116, "w": 56, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 9, "w": 56, "h": 55 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 416, "y": 114, "w": 56, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 9, "w": 56, "h": 55 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 64, "y": 62, "w": 57, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 9, "w": 57, "h": 55 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 371, "y": 0, "w": 58, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 8, "w": 58, "h": 56 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 273, "y": 226, "w": 54, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 9, "w": 54, "h": 55 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 53, "y": 283, "w": 52, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 52, "h": 55 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 161, "y": 285, "w": 52, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 52, "h": 54 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 312, "y": 337, "w": 50, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 10, "w": 50, "h": 52 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 312, "y": 389, "w": 48, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 10, "w": 48, "h": 53 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 51, "y": 338, "w": 49, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 10, "w": 49, "h": 53 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 378, "y": 336, "w": 51, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 10, "w": 51, "h": 53 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0088.png",
+    "frame": { "x": 213, "y": 337, "w": 50, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 10, "w": 50, "h": 53 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0089.png",
+    "frame": { "x": 360, "y": 389, "w": 48, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 48, "h": 53 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0090.png",
+    "frame": { "x": 100, "y": 341, "w": 49, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 10, "w": 49, "h": 52 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0091.png",
+    "frame": { "x": 53, "y": 283, "w": 52, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 52, "h": 55 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0092.png",
+    "frame": { "x": 217, "y": 282, "w": 52, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 52, "h": 55 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0093.png",
+    "frame": { "x": 108, "y": 230, "w": 53, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 8, "w": 53, "h": 56 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0094.png",
+    "frame": { "x": 300, "y": 169, "w": 54, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 7, "w": 54, "h": 57 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0095.png",
+    "frame": { "x": 182, "y": 117, "w": 54, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 7, "w": 54, "h": 57 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0096.png",
+    "frame": { "x": 0, "y": 121, "w": 54, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 7, "w": 54, "h": 57 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0097.png",
+    "frame": { "x": 189, "y": 60, "w": 55, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 7, "w": 55, "h": 57 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0098.png",
+    "frame": { "x": 110, "y": 118, "w": 54, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 7, "w": 54, "h": 57 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0099.png",
+    "frame": { "x": 369, "y": 56, "w": 55, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 7, "w": 55, "h": 57 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0100.png",
+    "frame": { "x": 424, "y": 57, "w": 55, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 7, "w": 55, "h": 57 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0101.png",
+    "frame": { "x": 429, "y": 0, "w": 56, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 7, "w": 56, "h": 57 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0102.png",
+    "frame": { "x": 127, "y": 0, "w": 62, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 62, "h": 61 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0103.png",
+    "frame": { "x": 64, "y": 0, "w": 63, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 63, "h": 62 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0104.png",
+    "frame": { "x": 0, "y": 0, "w": 64, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 64, "h": 64 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0105.png",
+    "frame": { "x": 251, "y": 0, "w": 61, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 61, "h": 59 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0106.png",
+    "frame": { "x": 189, "y": 0, "w": 62, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 62, "h": 60 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0107.png",
+    "frame": { "x": 0, "y": 64, "w": 55, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 7, "w": 55, "h": 57 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0108.png",
+    "frame": { "x": 127, "y": 61, "w": 55, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 7, "w": 55, "h": 57 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0109.png",
+    "frame": { "x": 306, "y": 112, "w": 55, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 7, "w": 55, "h": 57 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0110.png",
+    "frame": { "x": 361, "y": 113, "w": 55, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 7, "w": 55, "h": 57 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0111.png",
+    "frame": { "x": 251, "y": 59, "w": 55, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 7, "w": 55, "h": 57 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0112.png",
+    "frame": { "x": 416, "y": 169, "w": 54, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 7, "w": 54, "h": 57 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0113.png",
+    "frame": { "x": 354, "y": 170, "w": 54, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 7, "w": 54, "h": 57 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0114.png",
+    "frame": { "x": 219, "y": 226, "w": 54, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 8, "w": 54, "h": 56 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0115.png",
+    "frame": { "x": 0, "y": 234, "w": 53, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 8, "w": 53, "h": 56 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   },
+   {
+    "filename": "0116.png",
+    "frame": { "x": 273, "y": 281, "w": 53, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 8, "w": 53, "h": 56 },
+    "sourceSize": { "w": 64, "h": 65 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.13-x64",
+  "image": "729.png",
+  "format": "I8",
+  "size": { "w": 512, "h": 445 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/shiny/729.png b/public/images/pokemon/exp/shiny/729.png
index 41e9e077e2e..66b8a99f34a 100644
Binary files a/public/images/pokemon/exp/shiny/729.png and b/public/images/pokemon/exp/shiny/729.png differ
diff --git a/public/images/pokemon/exp/shiny/730.json b/public/images/pokemon/exp/shiny/730.json
index 874de43f801..b1b6c5189bc 100644
--- a/public/images/pokemon/exp/shiny/730.json
+++ b/public/images/pokemon/exp/shiny/730.json
@@ -1,2309 +1,839 @@
-{
-	"textures": [
-		{
-			"image": "730.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 615,
-				"h": 615
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 83,
-						"h": 81
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 83,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0038.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 83,
-						"h": 81
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 83,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0086.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 83,
-						"h": 81
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 83,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 78,
-						"h": 85
-					},
-					"frame": {
-						"x": 0,
-						"y": 81,
-						"w": 78,
-						"h": 85
-					}
-				},
-				{
-					"filename": "0035.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 78,
-						"h": 85
-					},
-					"frame": {
-						"x": 0,
-						"y": 81,
-						"w": 78,
-						"h": 85
-					}
-				},
-				{
-					"filename": "0083.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 78,
-						"h": 85
-					},
-					"frame": {
-						"x": 0,
-						"y": 81,
-						"w": 78,
-						"h": 85
-					}
-				},
-				{
-					"filename": "0062.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 83,
-						"h": 80
-					},
-					"frame": {
-						"x": 83,
-						"y": 0,
-						"w": 83,
-						"h": 80
-					}
-				},
-				{
-					"filename": "0107.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 8,
-						"w": 83,
-						"h": 80
-					},
-					"frame": {
-						"x": 166,
-						"y": 0,
-						"w": 83,
-						"h": 80
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 74,
-						"h": 88
-					},
-					"frame": {
-						"x": 0,
-						"y": 166,
-						"w": 74,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0034.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 74,
-						"h": 88
-					},
-					"frame": {
-						"x": 0,
-						"y": 166,
-						"w": 74,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0082.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 74,
-						"h": 88
-					},
-					"frame": {
-						"x": 0,
-						"y": 166,
-						"w": 74,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 9,
-						"w": 83,
-						"h": 79
-					},
-					"frame": {
-						"x": 249,
-						"y": 0,
-						"w": 83,
-						"h": 79
-					}
-				},
-				{
-					"filename": "0039.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 9,
-						"w": 83,
-						"h": 79
-					},
-					"frame": {
-						"x": 249,
-						"y": 0,
-						"w": 83,
-						"h": 79
-					}
-				},
-				{
-					"filename": "0087.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 9,
-						"w": 83,
-						"h": 79
-					},
-					"frame": {
-						"x": 249,
-						"y": 0,
-						"w": 83,
-						"h": 79
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 10,
-						"w": 84,
-						"h": 78
-					},
-					"frame": {
-						"x": 332,
-						"y": 0,
-						"w": 84,
-						"h": 78
-					}
-				},
-				{
-					"filename": "0040.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 10,
-						"w": 84,
-						"h": 78
-					},
-					"frame": {
-						"x": 332,
-						"y": 0,
-						"w": 84,
-						"h": 78
-					}
-				},
-				{
-					"filename": "0088.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 10,
-						"w": 84,
-						"h": 78
-					},
-					"frame": {
-						"x": 332,
-						"y": 0,
-						"w": 84,
-						"h": 78
-					}
-				},
-				{
-					"filename": "0064.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 10,
-						"w": 84,
-						"h": 78
-					},
-					"frame": {
-						"x": 416,
-						"y": 0,
-						"w": 84,
-						"h": 78
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 73,
-						"h": 88
-					},
-					"frame": {
-						"x": 0,
-						"y": 254,
-						"w": 73,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0033.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 73,
-						"h": 88
-					},
-					"frame": {
-						"x": 0,
-						"y": 254,
-						"w": 73,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0081.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 73,
-						"h": 88
-					},
-					"frame": {
-						"x": 0,
-						"y": 254,
-						"w": 73,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0063.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 9,
-						"w": 83,
-						"h": 79
-					},
-					"frame": {
-						"x": 500,
-						"y": 0,
-						"w": 83,
-						"h": 79
-					}
-				},
-				{
-					"filename": "0057.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 73,
-						"h": 87
-					},
-					"frame": {
-						"x": 0,
-						"y": 342,
-						"w": 73,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 75,
-						"h": 86
-					},
-					"frame": {
-						"x": 0,
-						"y": 429,
-						"w": 75,
-						"h": 86
-					}
-				},
-				{
-					"filename": "0032.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 75,
-						"h": 86
-					},
-					"frame": {
-						"x": 0,
-						"y": 429,
-						"w": 75,
-						"h": 86
-					}
-				},
-				{
-					"filename": "0080.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 75,
-						"h": 86
-					},
-					"frame": {
-						"x": 0,
-						"y": 429,
-						"w": 75,
-						"h": 86
-					}
-				},
-				{
-					"filename": "0056.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 75,
-						"h": 86
-					},
-					"frame": {
-						"x": 0,
-						"y": 515,
-						"w": 75,
-						"h": 86
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 75,
-						"h": 85
-					},
-					"frame": {
-						"x": 78,
-						"y": 81,
-						"w": 75,
-						"h": 85
-					}
-				},
-				{
-					"filename": "0031.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 75,
-						"h": 85
-					},
-					"frame": {
-						"x": 78,
-						"y": 81,
-						"w": 75,
-						"h": 85
-					}
-				},
-				{
-					"filename": "0079.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 75,
-						"h": 85
-					},
-					"frame": {
-						"x": 78,
-						"y": 81,
-						"w": 75,
-						"h": 85
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 81,
-						"h": 82
-					},
-					"frame": {
-						"x": 153,
-						"y": 80,
-						"w": 81,
-						"h": 82
-					}
-				},
-				{
-					"filename": "0037.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 81,
-						"h": 82
-					},
-					"frame": {
-						"x": 153,
-						"y": 80,
-						"w": 81,
-						"h": 82
-					}
-				},
-				{
-					"filename": "0085.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 81,
-						"h": 82
-					},
-					"frame": {
-						"x": 153,
-						"y": 80,
-						"w": 81,
-						"h": 82
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 80,
-						"h": 82
-					},
-					"frame": {
-						"x": 74,
-						"y": 166,
-						"w": 80,
-						"h": 82
-					}
-				},
-				{
-					"filename": "0036.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 80,
-						"h": 82
-					},
-					"frame": {
-						"x": 74,
-						"y": 166,
-						"w": 80,
-						"h": 82
-					}
-				},
-				{
-					"filename": "0084.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 80,
-						"h": 82
-					},
-					"frame": {
-						"x": 74,
-						"y": 166,
-						"w": 80,
-						"h": 82
-					}
-				},
-				{
-					"filename": "0108.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 80,
-						"h": 81
-					},
-					"frame": {
-						"x": 154,
-						"y": 162,
-						"w": 80,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0055.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 75,
-						"h": 85
-					},
-					"frame": {
-						"x": 234,
-						"y": 80,
-						"w": 75,
-						"h": 85
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 78,
-						"h": 81
-					},
-					"frame": {
-						"x": 234,
-						"y": 165,
-						"w": 78,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0025.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 78,
-						"h": 81
-					},
-					"frame": {
-						"x": 234,
-						"y": 165,
-						"w": 78,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0049.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 78,
-						"h": 81
-					},
-					"frame": {
-						"x": 234,
-						"y": 165,
-						"w": 78,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0073.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 78,
-						"h": 81
-					},
-					"frame": {
-						"x": 234,
-						"y": 165,
-						"w": 78,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0097.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 78,
-						"h": 81
-					},
-					"frame": {
-						"x": 234,
-						"y": 165,
-						"w": 78,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0058.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 74,
-						"h": 85
-					},
-					"frame": {
-						"x": 309,
-						"y": 79,
-						"w": 74,
-						"h": 85
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 78,
-						"h": 82
-					},
-					"frame": {
-						"x": 383,
-						"y": 78,
-						"w": 78,
-						"h": 82
-					}
-				},
-				{
-					"filename": "0028.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 78,
-						"h": 82
-					},
-					"frame": {
-						"x": 383,
-						"y": 78,
-						"w": 78,
-						"h": 82
-					}
-				},
-				{
-					"filename": "0052.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 78,
-						"h": 82
-					},
-					"frame": {
-						"x": 383,
-						"y": 78,
-						"w": 78,
-						"h": 82
-					}
-				},
-				{
-					"filename": "0076.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 78,
-						"h": 82
-					},
-					"frame": {
-						"x": 383,
-						"y": 78,
-						"w": 78,
-						"h": 82
-					}
-				},
-				{
-					"filename": "0059.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 78,
-						"h": 82
-					},
-					"frame": {
-						"x": 312,
-						"y": 164,
-						"w": 78,
-						"h": 82
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 78,
-						"h": 81
-					},
-					"frame": {
-						"x": 390,
-						"y": 160,
-						"w": 78,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0026.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 78,
-						"h": 81
-					},
-					"frame": {
-						"x": 390,
-						"y": 160,
-						"w": 78,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0050.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 78,
-						"h": 81
-					},
-					"frame": {
-						"x": 390,
-						"y": 160,
-						"w": 78,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0074.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 78,
-						"h": 81
-					},
-					"frame": {
-						"x": 390,
-						"y": 160,
-						"w": 78,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 78,
-						"h": 81
-					},
-					"frame": {
-						"x": 461,
-						"y": 79,
-						"w": 78,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0027.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 78,
-						"h": 81
-					},
-					"frame": {
-						"x": 461,
-						"y": 79,
-						"w": 78,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0051.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 78,
-						"h": 81
-					},
-					"frame": {
-						"x": 461,
-						"y": 79,
-						"w": 78,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0075.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 78,
-						"h": 81
-					},
-					"frame": {
-						"x": 461,
-						"y": 79,
-						"w": 78,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 76,
-						"h": 81
-					},
-					"frame": {
-						"x": 539,
-						"y": 79,
-						"w": 76,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0030.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 76,
-						"h": 81
-					},
-					"frame": {
-						"x": 539,
-						"y": 79,
-						"w": 76,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0054.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 76,
-						"h": 81
-					},
-					"frame": {
-						"x": 539,
-						"y": 79,
-						"w": 76,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0078.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 76,
-						"h": 81
-					},
-					"frame": {
-						"x": 539,
-						"y": 79,
-						"w": 76,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0061.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 81,
-						"h": 79
-					},
-					"frame": {
-						"x": 468,
-						"y": 160,
-						"w": 81,
-						"h": 79
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 13,
-						"w": 80,
-						"h": 75
-					},
-					"frame": {
-						"x": 154,
-						"y": 243,
-						"w": 80,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0047.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 13,
-						"w": 80,
-						"h": 75
-					},
-					"frame": {
-						"x": 154,
-						"y": 243,
-						"w": 80,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0095.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 13,
-						"w": 80,
-						"h": 75
-					},
-					"frame": {
-						"x": 154,
-						"y": 243,
-						"w": 80,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 14,
-						"w": 84,
-						"h": 74
-					},
-					"frame": {
-						"x": 234,
-						"y": 246,
-						"w": 84,
-						"h": 74
-					}
-				},
-				{
-					"filename": "0041.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 14,
-						"w": 84,
-						"h": 74
-					},
-					"frame": {
-						"x": 234,
-						"y": 246,
-						"w": 84,
-						"h": 74
-					}
-				},
-				{
-					"filename": "0089.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 14,
-						"w": 84,
-						"h": 74
-					},
-					"frame": {
-						"x": 234,
-						"y": 246,
-						"w": 84,
-						"h": 74
-					}
-				},
-				{
-					"filename": "0060.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 80,
-						"h": 79
-					},
-					"frame": {
-						"x": 74,
-						"y": 248,
-						"w": 80,
-						"h": 79
-					}
-				},
-				{
-					"filename": "0109.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 78,
-						"h": 81
-					},
-					"frame": {
-						"x": 73,
-						"y": 327,
-						"w": 78,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 77,
-						"h": 81
-					},
-					"frame": {
-						"x": 318,
-						"y": 246,
-						"w": 77,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0029.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 77,
-						"h": 81
-					},
-					"frame": {
-						"x": 318,
-						"y": 246,
-						"w": 77,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0053.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 77,
-						"h": 81
-					},
-					"frame": {
-						"x": 318,
-						"y": 246,
-						"w": 77,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0077.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 77,
-						"h": 81
-					},
-					"frame": {
-						"x": 318,
-						"y": 246,
-						"w": 77,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0098.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 9,
-						"w": 78,
-						"h": 79
-					},
-					"frame": {
-						"x": 395,
-						"y": 241,
-						"w": 78,
-						"h": 79
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 10,
-						"w": 78,
-						"h": 78
-					},
-					"frame": {
-						"x": 473,
-						"y": 239,
-						"w": 78,
-						"h": 78
-					}
-				},
-				{
-					"filename": "0048.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 10,
-						"w": 78,
-						"h": 78
-					},
-					"frame": {
-						"x": 473,
-						"y": 239,
-						"w": 78,
-						"h": 78
-					}
-				},
-				{
-					"filename": "0096.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 10,
-						"w": 78,
-						"h": 78
-					},
-					"frame": {
-						"x": 473,
-						"y": 239,
-						"w": 78,
-						"h": 78
-					}
-				},
-				{
-					"filename": "0072.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 10,
-						"w": 78,
-						"h": 78
-					},
-					"frame": {
-						"x": 75,
-						"y": 408,
-						"w": 78,
-						"h": 78
-					}
-				},
-				{
-					"filename": "0099.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 11,
-						"w": 79,
-						"h": 77
-					},
-					"frame": {
-						"x": 75,
-						"y": 486,
-						"w": 79,
-						"h": 77
-					}
-				},
-				{
-					"filename": "0071.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 13,
-						"w": 80,
-						"h": 75
-					},
-					"frame": {
-						"x": 154,
-						"y": 318,
-						"w": 80,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 15,
-						"w": 84,
-						"h": 73
-					},
-					"frame": {
-						"x": 234,
-						"y": 320,
-						"w": 84,
-						"h": 73
-					}
-				},
-				{
-					"filename": "0042.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 15,
-						"w": 84,
-						"h": 73
-					},
-					"frame": {
-						"x": 234,
-						"y": 320,
-						"w": 84,
-						"h": 73
-					}
-				},
-				{
-					"filename": "0090.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 15,
-						"w": 84,
-						"h": 73
-					},
-					"frame": {
-						"x": 234,
-						"y": 320,
-						"w": 84,
-						"h": 73
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 16,
-						"w": 84,
-						"h": 72
-					},
-					"frame": {
-						"x": 318,
-						"y": 327,
-						"w": 84,
-						"h": 72
-					}
-				},
-				{
-					"filename": "0043.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 16,
-						"w": 84,
-						"h": 72
-					},
-					"frame": {
-						"x": 318,
-						"y": 327,
-						"w": 84,
-						"h": 72
-					}
-				},
-				{
-					"filename": "0091.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 16,
-						"w": 84,
-						"h": 72
-					},
-					"frame": {
-						"x": 318,
-						"y": 327,
-						"w": 84,
-						"h": 72
-					}
-				},
-				{
-					"filename": "0065.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 14,
-						"w": 84,
-						"h": 74
-					},
-					"frame": {
-						"x": 153,
-						"y": 393,
-						"w": 84,
-						"h": 74
-					}
-				},
-				{
-					"filename": "0101.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 17,
-						"w": 81,
-						"h": 71
-					},
-					"frame": {
-						"x": 237,
-						"y": 393,
-						"w": 81,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0066.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 15,
-						"w": 84,
-						"h": 73
-					},
-					"frame": {
-						"x": 318,
-						"y": 399,
-						"w": 84,
-						"h": 73
-					}
-				},
-				{
-					"filename": "0106.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 13,
-						"w": 83,
-						"h": 75
-					},
-					"frame": {
-						"x": 402,
-						"y": 320,
-						"w": 83,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0105.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 14,
-						"w": 84,
-						"h": 74
-					},
-					"frame": {
-						"x": 402,
-						"y": 395,
-						"w": 84,
-						"h": 74
-					}
-				},
-				{
-					"filename": "0100.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 14,
-						"w": 80,
-						"h": 74
-					},
-					"frame": {
-						"x": 485,
-						"y": 317,
-						"w": 80,
-						"h": 74
-					}
-				},
-				{
-					"filename": "0104.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 15,
-						"w": 83,
-						"h": 73
-					},
-					"frame": {
-						"x": 486,
-						"y": 391,
-						"w": 83,
-						"h": 73
-					}
-				},
-				{
-					"filename": "0067.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 16,
-						"w": 84,
-						"h": 72
-					},
-					"frame": {
-						"x": 154,
-						"y": 467,
-						"w": 84,
-						"h": 72
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 17,
-						"w": 83,
-						"h": 71
-					},
-					"frame": {
-						"x": 154,
-						"y": 539,
-						"w": 83,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0045.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 17,
-						"w": 83,
-						"h": 71
-					},
-					"frame": {
-						"x": 154,
-						"y": 539,
-						"w": 83,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0093.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 17,
-						"w": 83,
-						"h": 71
-					},
-					"frame": {
-						"x": 154,
-						"y": 539,
-						"w": 83,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 17,
-						"w": 83,
-						"h": 71
-					},
-					"frame": {
-						"x": 486,
-						"y": 464,
-						"w": 83,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0046.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 17,
-						"w": 83,
-						"h": 71
-					},
-					"frame": {
-						"x": 486,
-						"y": 464,
-						"w": 83,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0094.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 17,
-						"w": 83,
-						"h": 71
-					},
-					"frame": {
-						"x": 486,
-						"y": 464,
-						"w": 83,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0069.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 17,
-						"w": 83,
-						"h": 71
-					},
-					"frame": {
-						"x": 402,
-						"y": 469,
-						"w": 83,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0070.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 17,
-						"w": 83,
-						"h": 71
-					},
-					"frame": {
-						"x": 485,
-						"y": 535,
-						"w": 83,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 16,
-						"w": 82,
-						"h": 72
-					},
-					"frame": {
-						"x": 237,
-						"y": 539,
-						"w": 82,
-						"h": 72
-					}
-				},
-				{
-					"filename": "0044.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 16,
-						"w": 82,
-						"h": 72
-					},
-					"frame": {
-						"x": 237,
-						"y": 539,
-						"w": 82,
-						"h": 72
-					}
-				},
-				{
-					"filename": "0092.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 16,
-						"w": 82,
-						"h": 72
-					},
-					"frame": {
-						"x": 237,
-						"y": 539,
-						"w": 82,
-						"h": 72
-					}
-				},
-				{
-					"filename": "0103.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 16,
-						"w": 83,
-						"h": 72
-					},
-					"frame": {
-						"x": 319,
-						"y": 472,
-						"w": 83,
-						"h": 72
-					}
-				},
-				{
-					"filename": "0102.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 18,
-						"w": 82,
-						"h": 70
-					},
-					"frame": {
-						"x": 319,
-						"y": 544,
-						"w": 82,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0068.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 16,
-						"w": 82,
-						"h": 72
-					},
-					"frame": {
-						"x": 402,
-						"y": 540,
-						"w": 82,
-						"h": 72
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:59fe2b59aab6747f8b9c8449f7122d94:f053b5af80accd64fb9a265eb64f806d:fcd0d2cb6b26724e796ae0dcb71fae3f$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 491, "y": 0, "w": 79, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 13, "w": 79, "h": 71 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 341, "y": 0, "w": 77, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 11, "w": 77, "h": 73 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 265, "y": 0, "w": 76, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 76, "h": 75 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 418, "y": 0, "w": 73, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 7, "w": 73, "h": 77 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 159, "y": 68, "w": 69, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 4, "w": 69, "h": 80 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 309, "y": 143, "w": 64, "h": 83 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 1, "w": 64, "h": 83 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 0, "y": 145, "w": 63, "h": 84 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 0, "w": 63, "h": 84 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 63, "y": 147, "w": 63, "h": 84 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 0, "w": 63, "h": 84 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 446, "y": 203, "w": 63, "h": 82 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 63, "h": 82 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 509, "y": 335, "w": 63, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 5, "w": 63, "h": 79 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 74, "y": 375, "w": 66, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 10, "w": 66, "h": 74 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 140, "y": 409, "w": 69, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 15, "w": 69, "h": 69 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 280, "y": 428, "w": 72, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 18, "w": 72, "h": 66 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 353, "y": 416, "w": 74, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 19, "w": 74, "h": 65 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 536, "y": 414, "w": 74, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 19, "w": 74, "h": 65 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 461, "y": 414, "w": 75, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 19, "w": 75, "h": 65 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 385, "y": 351, "w": 76, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 19, "w": 76, "h": 65 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 231, "y": 291, "w": 78, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 19, "w": 78, "h": 65 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 277, "y": 226, "w": 79, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 19, "w": 79, "h": 65 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 485, "y": 137, "w": 81, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 18, "w": 81, "h": 66 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 228, "y": 143, "w": 81, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 18, "w": 81, "h": 66 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 228, "y": 75, "w": 80, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 16, "w": 80, "h": 68 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 491, "y": 0, "w": 79, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 13, "w": 79, "h": 71 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 341, "y": 0, "w": 77, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 11, "w": 77, "h": 73 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 265, "y": 0, "w": 76, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 76, "h": 75 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 418, "y": 0, "w": 73, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 7, "w": 73, "h": 77 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 159, "y": 68, "w": 69, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 4, "w": 69, "h": 80 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 309, "y": 143, "w": 64, "h": 83 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 1, "w": 64, "h": 83 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 0, "y": 145, "w": 63, "h": 84 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 0, "w": 63, "h": 84 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 63, "y": 147, "w": 63, "h": 84 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 0, "w": 63, "h": 84 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 446, "y": 203, "w": 63, "h": 82 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 63, "h": 82 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 509, "y": 335, "w": 63, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 5, "w": 63, "h": 79 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 74, "y": 375, "w": 66, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 10, "w": 66, "h": 74 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 140, "y": 409, "w": 69, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 15, "w": 69, "h": 69 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 280, "y": 428, "w": 72, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 18, "w": 72, "h": 66 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 353, "y": 416, "w": 74, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 19, "w": 74, "h": 65 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 536, "y": 414, "w": 74, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 19, "w": 74, "h": 65 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 461, "y": 414, "w": 75, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 19, "w": 75, "h": 65 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 385, "y": 351, "w": 76, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 19, "w": 76, "h": 65 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 231, "y": 291, "w": 78, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 19, "w": 78, "h": 65 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 277, "y": 226, "w": 79, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 19, "w": 79, "h": 65 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 485, "y": 137, "w": 81, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 18, "w": 81, "h": 66 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 228, "y": 143, "w": 81, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 18, "w": 81, "h": 66 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 228, "y": 75, "w": 80, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 16, "w": 80, "h": 68 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 491, "y": 0, "w": 79, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 13, "w": 79, "h": 71 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 341, "y": 0, "w": 77, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 11, "w": 77, "h": 73 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 265, "y": 0, "w": 76, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 76, "h": 75 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 418, "y": 0, "w": 73, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 7, "w": 73, "h": 77 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 159, "y": 68, "w": 69, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 4, "w": 69, "h": 80 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 309, "y": 143, "w": 64, "h": 83 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 1, "w": 64, "h": 83 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 0, "y": 145, "w": 63, "h": 84 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 0, "w": 63, "h": 84 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 63, "y": 147, "w": 63, "h": 84 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 0, "w": 63, "h": 84 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 446, "y": 203, "w": 63, "h": 82 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 63, "h": 82 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 509, "y": 335, "w": 63, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 5, "w": 63, "h": 79 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 74, "y": 375, "w": 66, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 10, "w": 66, "h": 74 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 140, "y": 409, "w": 69, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 15, "w": 69, "h": 69 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 280, "y": 428, "w": 72, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 18, "w": 72, "h": 66 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 353, "y": 416, "w": 74, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 19, "w": 74, "h": 65 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 536, "y": 414, "w": 74, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 19, "w": 74, "h": 65 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 461, "y": 414, "w": 75, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 19, "w": 75, "h": 65 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 385, "y": 351, "w": 76, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 19, "w": 76, "h": 65 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 231, "y": 291, "w": 78, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 19, "w": 78, "h": 65 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 277, "y": 226, "w": 79, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 19, "w": 79, "h": 65 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 485, "y": 137, "w": 81, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 18, "w": 81, "h": 66 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 228, "y": 143, "w": 81, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 18, "w": 81, "h": 66 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 228, "y": 75, "w": 80, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 16, "w": 80, "h": 68 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 341, "y": 73, "w": 77, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 14, "w": 77, "h": 70 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 373, "y": 157, "w": 73, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 12, "w": 73, "h": 72 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 213, "y": 356, "w": 67, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 11, "w": 67, "h": 73 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 0, "y": 429, "w": 63, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 63, "h": 75 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 76, "y": 297, "w": 64, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 6, "w": 64, "h": 78 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 418, "y": 77, "w": 67, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 67, "h": 80 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 89, "y": 67, "w": 70, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 70, "h": 80 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 0, "y": 68, "w": 72, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 72, "h": 77 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 126, "y": 148, "w": 73, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 12, "w": 73, "h": 72 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 140, "y": 341, "w": 73, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 16, "w": 73, "h": 68 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 280, "y": 361, "w": 73, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 17, "w": 73, "h": 67 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 0, "y": 363, "w": 74, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 18, "w": 74, "h": 66 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 433, "y": 285, "w": 76, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 18, "w": 76, "h": 66 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 509, "y": 269, "w": 77, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 18, "w": 77, "h": 66 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 356, "y": 229, "w": 77, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 18, "w": 77, "h": 66 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 199, "y": 209, "w": 78, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 18, "w": 78, "h": 66 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 509, "y": 203, "w": 78, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 18, "w": 78, "h": 66 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 0, "y": 231, "w": 77, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 18, "w": 77, "h": 66 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 77, "y": 231, "w": 77, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 18, "w": 77, "h": 66 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 0, "y": 297, "w": 76, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 18, "w": 76, "h": 66 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 309, "y": 295, "w": 76, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 18, "w": 76, "h": 66 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0088.png",
+    "frame": { "x": 154, "y": 275, "w": 77, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 18, "w": 77, "h": 66 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0089.png",
+    "frame": { "x": 491, "y": 71, "w": 83, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 18, "w": 83, "h": 66 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0090.png",
+    "frame": { "x": 89, "y": 0, "w": 89, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 17, "w": 89, "h": 67 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0091.png",
+    "frame": { "x": 0, "y": 0, "w": 89, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 16, "w": 89, "h": 68 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   },
+   {
+    "filename": "0092.png",
+    "frame": { "x": 178, "y": 0, "w": 87, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 16, "w": 87, "h": 68 },
+    "sourceSize": { "w": 91, "h": 84 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.13-x64",
+  "image": "730.png",
+  "format": "I8",
+  "size": { "w": 610, "h": 504 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/shiny/730.png b/public/images/pokemon/exp/shiny/730.png
index 95c48184ce1..d11ef725a95 100644
Binary files a/public/images/pokemon/exp/shiny/730.png and b/public/images/pokemon/exp/shiny/730.png differ
diff --git a/public/images/pokemon/exp/shiny/746-school.json b/public/images/pokemon/exp/shiny/746-school.json
index b7f0eb850ce..6c247e5a748 100644
--- a/public/images/pokemon/exp/shiny/746-school.json
+++ b/public/images/pokemon/exp/shiny/746-school.json
@@ -1,272 +1,191 @@
-{
-	"textures": [
-		{
-			"image": "746-school.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 268,
-				"h": 268
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 102,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 95,
-						"h": 73
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 95,
-						"h": 73
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 102,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 94,
-						"h": 73
-					},
-					"frame": {
-						"x": 0,
-						"y": 73,
-						"w": 94,
-						"h": 73
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 102,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 94,
-						"h": 73
-					},
-					"frame": {
-						"x": 0,
-						"y": 73,
-						"w": 94,
-						"h": 73
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 102,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 1,
-						"w": 93,
-						"h": 71
-					},
-					"frame": {
-						"x": 95,
-						"y": 0,
-						"w": 93,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 102,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 1,
-						"w": 93,
-						"h": 71
-					},
-					"frame": {
-						"x": 95,
-						"y": 0,
-						"w": 93,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 102,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 92,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 146,
-						"w": 92,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 102,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 92,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 146,
-						"w": 92,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 102,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 5,
-						"w": 91,
-						"h": 67
-					},
-					"frame": {
-						"x": 95,
-						"y": 71,
-						"w": 91,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 102,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 5,
-						"w": 91,
-						"h": 67
-					},
-					"frame": {
-						"x": 95,
-						"y": 71,
-						"w": 91,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 102,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 91,
-						"h": 66
-					},
-					"frame": {
-						"x": 94,
-						"y": 138,
-						"w": 91,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 102,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 91,
-						"h": 66
-					},
-					"frame": {
-						"x": 94,
-						"y": 138,
-						"w": 91,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 102,
-						"h": 73
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 90,
-						"h": 64
-					},
-					"frame": {
-						"x": 92,
-						"y": 204,
-						"w": 90,
-						"h": 64
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:f61c85d6091a44a8febf21b84b5b2d80:81aec8099fbc1e00afe72d9fc67a0c1e:10f3c9d1f1118f8f9f6e40f37a0eb499$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 399, "y": 250, "w": 94, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 94, "h": 81 },
+    "sourceSize": { "w": 104, "h": 89 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 402, "y": 169, "w": 97, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 6, "w": 97, "h": 81 },
+    "sourceSize": { "w": 104, "h": 89 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 304, "y": 170, "w": 95, "h": 82 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 6, "w": 95, "h": 82 },
+    "sourceSize": { "w": 104, "h": 89 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 402, "y": 86, "w": 99, "h": 83 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 99, "h": 83 },
+    "sourceSize": { "w": 104, "h": 89 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 304, "y": 86, "w": 98, "h": 84 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 98, "h": 84 },
+    "sourceSize": { "w": 104, "h": 89 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 208, "y": 0, "w": 102, "h": 86 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 102, "h": 86 },
+    "sourceSize": { "w": 104, "h": 89 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 310, "y": 0, "w": 102, "h": 86 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 102, "h": 86 },
+    "sourceSize": { "w": 104, "h": 89 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 0, "y": 0, "w": 104, "h": 87 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 104, "h": 87 },
+    "sourceSize": { "w": 104, "h": 89 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 412, "y": 0, "w": 102, "h": 86 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 102, "h": 86 },
+    "sourceSize": { "w": 104, "h": 89 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 104, "y": 0, "w": 104, "h": 86 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 104, "h": 86 },
+    "sourceSize": { "w": 104, "h": 89 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 104, "y": 86, "w": 100, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 100, "h": 85 },
+    "sourceSize": { "w": 104, "h": 89 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 204, "y": 86, "w": 100, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 100, "h": 85 },
+    "sourceSize": { "w": 104, "h": 89 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 0, "y": 87, "w": 95, "h": 83 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 95, "h": 83 },
+    "sourceSize": { "w": 104, "h": 89 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 0, "y": 170, "w": 94, "h": 83 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 94, "h": 83 },
+    "sourceSize": { "w": 104, "h": 89 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 282, "y": 252, "w": 90, "h": 83 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 90, "h": 83 },
+    "sourceSize": { "w": 104, "h": 89 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 187, "y": 253, "w": 89, "h": 82 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 89, "h": 82 },
+    "sourceSize": { "w": 104, "h": 89 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 189, "y": 171, "w": 93, "h": 82 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 6, "w": 93, "h": 82 },
+    "sourceSize": { "w": 104, "h": 89 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 0, "y": 253, "w": 91, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 6, "w": 91, "h": 81 },
+    "sourceSize": { "w": 104, "h": 89 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 94, "y": 252, "w": 93, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 6, "w": 93, "h": 81 },
+    "sourceSize": { "w": 104, "h": 89 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 94, "y": 171, "w": 95, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 95, "h": 81 },
+    "sourceSize": { "w": 104, "h": 89 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.13-x64",
+  "image": "746-school.png",
+  "format": "I8",
+  "size": { "w": 514, "h": 335 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/shiny/746-school.png b/public/images/pokemon/exp/shiny/746-school.png
index 76452380aee..a665f1a61ac 100644
Binary files a/public/images/pokemon/exp/shiny/746-school.png and b/public/images/pokemon/exp/shiny/746-school.png differ
diff --git a/public/images/pokemon/exp/shiny/746.json b/public/images/pokemon/exp/shiny/746.json
index 2f5d3a25ec3..6b775c20176 100644
--- a/public/images/pokemon/exp/shiny/746.json
+++ b/public/images/pokemon/exp/shiny/746.json
@@ -4,156 +4,51 @@
 			"image": "746.png",
 			"format": "RGBA8888",
 			"size": {
-				"w": 134,
-				"h": 134
+				"w": 100,
+				"h": 100
 			},
 			"scale": 1,
 			"frames": [
 				{
 					"filename": "0001.png",
 					"rotated": false,
-					"trimmed": false,
+					"trimmed": true,
 					"sourceSize": {
-						"w": 46,
-						"h": 28
+						"w": 50,
+						"h": 50
 					},
 					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 46,
-						"h": 28
+						"x": 7,
+						"y": 15,
+						"w": 39,
+						"h": 25
 					},
 					"frame": {
 						"x": 0,
 						"y": 0,
-						"w": 46,
-						"h": 28
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 46,
-						"h": 28
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 46,
-						"h": 28
-					},
-					"frame": {
-						"x": 0,
-						"y": 28,
-						"w": 46,
-						"h": 28
+						"w": 39,
+						"h": 25
 					}
 				},
 				{
 					"filename": "0003.png",
 					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 46,
-						"h": 28
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 46,
-						"h": 28
-					},
-					"frame": {
-						"x": 0,
-						"y": 56,
-						"w": 46,
-						"h": 28
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 46,
-						"h": 28
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 46,
-						"h": 28
-					},
-					"frame": {
-						"x": 0,
-						"y": 56,
-						"w": 46,
-						"h": 28
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 46,
-						"h": 28
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 46,
-						"h": 28
-					},
-					"frame": {
-						"x": 0,
-						"y": 84,
-						"w": 46,
-						"h": 28
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 46,
-						"h": 28
+						"w": 50,
+						"h": 50
 					},
 					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 46,
-						"h": 27
+						"x": 7,
+						"y": 15,
+						"w": 39,
+						"h": 25
 					},
 					"frame": {
-						"x": 46,
-						"y": 0,
-						"w": 46,
-						"h": 27
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 28
-					},
-					"spriteSourceSize": {
 						"x": 0,
 						"y": 0,
-						"w": 46,
-						"h": 27
-					},
-					"frame": {
-						"x": 46,
-						"y": 0,
-						"w": 46,
-						"h": 27
+						"w": 39,
+						"h": 25
 					}
 				},
 				{
@@ -161,41 +56,20 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 46,
-						"h": 28
+						"w": 50,
+						"h": 50
 					},
 					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 46,
-						"h": 27
+						"x": 7,
+						"y": 15,
+						"w": 39,
+						"h": 25
 					},
 					"frame": {
-						"x": 46,
-						"y": 27,
-						"w": 46,
-						"h": 27
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 46,
-						"h": 28
-					},
-					"spriteSourceSize": {
 						"x": 0,
-						"y": 1,
-						"w": 46,
-						"h": 27
-					},
-					"frame": {
-						"x": 46,
-						"y": 27,
-						"w": 46,
-						"h": 27
+						"y": 0,
+						"w": 39,
+						"h": 25
 					}
 				},
 				{
@@ -203,41 +77,713 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 46,
-						"h": 28
+						"w": 50,
+						"h": 50
 					},
 					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 46,
-						"h": 27
+						"x": 7,
+						"y": 18,
+						"w": 39,
+						"h": 25
 					},
 					"frame": {
-						"x": 46,
-						"y": 54,
-						"w": 46,
-						"h": 27
+						"x": 0,
+						"y": 0,
+						"w": 39,
+						"h": 25
 					}
 				},
 				{
-					"filename": "0008.png",
+					"filename": "0009.png",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 46,
-						"h": 28
+						"w": 50,
+						"h": 50
 					},
 					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 46,
-						"h": 27
+						"x": 7,
+						"y": 21,
+						"w": 39,
+						"h": 25
 					},
 					"frame": {
-						"x": 46,
-						"y": 81,
-						"w": 46,
-						"h": 27
+						"x": 0,
+						"y": 0,
+						"w": 39,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0011.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 22,
+						"w": 39,
+						"h": 25
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 39,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0013.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 22,
+						"w": 39,
+						"h": 25
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 39,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0015.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 21,
+						"w": 39,
+						"h": 25
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 39,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0017.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 18,
+						"w": 39,
+						"h": 25
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 39,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0019.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 15,
+						"w": 39,
+						"h": 25
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 39,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0021.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 15,
+						"w": 39,
+						"h": 25
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 39,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0023.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 15,
+						"w": 39,
+						"h": 25
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 39,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0025.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 18,
+						"w": 39,
+						"h": 25
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 39,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0027.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 21,
+						"w": 39,
+						"h": 25
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 39,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0029.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 22,
+						"w": 39,
+						"h": 25
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 39,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0031.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 22,
+						"w": 39,
+						"h": 25
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 39,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0033.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 21,
+						"w": 39,
+						"h": 25
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 39,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0035.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 18,
+						"w": 39,
+						"h": 25
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 39,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0037.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 15,
+						"w": 39,
+						"h": 25
+					},
+					"frame": {
+						"x": 39,
+						"y": 0,
+						"w": 39,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0039.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 15,
+						"w": 39,
+						"h": 25
+					},
+					"frame": {
+						"x": 0,
+						"y": 25,
+						"w": 39,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0041.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 15,
+						"w": 39,
+						"h": 25
+					},
+					"frame": {
+						"x": 0,
+						"y": 25,
+						"w": 39,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0043.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 18,
+						"w": 39,
+						"h": 25
+					},
+					"frame": {
+						"x": 0,
+						"y": 25,
+						"w": 39,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0045.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 21,
+						"w": 39,
+						"h": 25
+					},
+					"frame": {
+						"x": 0,
+						"y": 25,
+						"w": 39,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0047.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 22,
+						"w": 39,
+						"h": 25
+					},
+					"frame": {
+						"x": 0,
+						"y": 25,
+						"w": 39,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0049.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 22,
+						"w": 39,
+						"h": 25
+					},
+					"frame": {
+						"x": 0,
+						"y": 25,
+						"w": 39,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0051.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 21,
+						"w": 39,
+						"h": 25
+					},
+					"frame": {
+						"x": 0,
+						"y": 25,
+						"w": 39,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0053.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 18,
+						"w": 39,
+						"h": 25
+					},
+					"frame": {
+						"x": 0,
+						"y": 25,
+						"w": 39,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0055.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 15,
+						"w": 39,
+						"h": 25
+					},
+					"frame": {
+						"x": 0,
+						"y": 25,
+						"w": 39,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0057.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 15,
+						"w": 39,
+						"h": 25
+					},
+					"frame": {
+						"x": 0,
+						"y": 25,
+						"w": 39,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0059.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 18,
+						"w": 39,
+						"h": 25
+					},
+					"frame": {
+						"x": 0,
+						"y": 25,
+						"w": 39,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0061.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 21,
+						"w": 39,
+						"h": 25
+					},
+					"frame": {
+						"x": 0,
+						"y": 25,
+						"w": 39,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0063.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 22,
+						"w": 39,
+						"h": 25
+					},
+					"frame": {
+						"x": 0,
+						"y": 25,
+						"w": 39,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0065.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 22,
+						"w": 39,
+						"h": 25
+					},
+					"frame": {
+						"x": 0,
+						"y": 25,
+						"w": 39,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0067.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 21,
+						"w": 39,
+						"h": 25
+					},
+					"frame": {
+						"x": 0,
+						"y": 25,
+						"w": 39,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0069.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 18,
+						"w": 39,
+						"h": 25
+					},
+					"frame": {
+						"x": 39,
+						"y": 25,
+						"w": 39,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0002.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 15,
+						"w": 35,
+						"h": 25
+					},
+					"frame": {
+						"x": 0,
+						"y": 50,
+						"w": 35,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0004.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 15,
+						"w": 35,
+						"h": 25
+					},
+					"frame": {
+						"x": 0,
+						"y": 50,
+						"w": 35,
+						"h": 25
 					}
 				},
 				{
@@ -245,20 +791,692 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 46,
-						"h": 28
+						"w": 50,
+						"h": 50
 					},
 					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 46,
-						"h": 26
+						"x": 7,
+						"y": 16,
+						"w": 35,
+						"h": 25
 					},
 					"frame": {
-						"x": 46,
-						"y": 108,
-						"w": 46,
-						"h": 26
+						"x": 0,
+						"y": 50,
+						"w": 35,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0008.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 20,
+						"w": 35,
+						"h": 25
+					},
+					"frame": {
+						"x": 0,
+						"y": 50,
+						"w": 35,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0010.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 22,
+						"w": 35,
+						"h": 25
+					},
+					"frame": {
+						"x": 0,
+						"y": 50,
+						"w": 35,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0012.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 22,
+						"w": 35,
+						"h": 25
+					},
+					"frame": {
+						"x": 0,
+						"y": 50,
+						"w": 35,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0014.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 22,
+						"w": 35,
+						"h": 25
+					},
+					"frame": {
+						"x": 0,
+						"y": 50,
+						"w": 35,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0016.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 20,
+						"w": 35,
+						"h": 25
+					},
+					"frame": {
+						"x": 0,
+						"y": 50,
+						"w": 35,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0018.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 16,
+						"w": 35,
+						"h": 25
+					},
+					"frame": {
+						"x": 0,
+						"y": 50,
+						"w": 35,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0020.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 15,
+						"w": 35,
+						"h": 25
+					},
+					"frame": {
+						"x": 0,
+						"y": 50,
+						"w": 35,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0022.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 15,
+						"w": 35,
+						"h": 25
+					},
+					"frame": {
+						"x": 0,
+						"y": 50,
+						"w": 35,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0024.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 16,
+						"w": 35,
+						"h": 25
+					},
+					"frame": {
+						"x": 0,
+						"y": 50,
+						"w": 35,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0026.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 20,
+						"w": 35,
+						"h": 25
+					},
+					"frame": {
+						"x": 0,
+						"y": 50,
+						"w": 35,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0028.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 22,
+						"w": 35,
+						"h": 25
+					},
+					"frame": {
+						"x": 0,
+						"y": 50,
+						"w": 35,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0030.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 22,
+						"w": 35,
+						"h": 25
+					},
+					"frame": {
+						"x": 0,
+						"y": 50,
+						"w": 35,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0032.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 22,
+						"w": 35,
+						"h": 25
+					},
+					"frame": {
+						"x": 0,
+						"y": 50,
+						"w": 35,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0034.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 20,
+						"w": 35,
+						"h": 25
+					},
+					"frame": {
+						"x": 0,
+						"y": 50,
+						"w": 35,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0036.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 16,
+						"w": 35,
+						"h": 25
+					},
+					"frame": {
+						"x": 0,
+						"y": 50,
+						"w": 35,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0038.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 15,
+						"w": 35,
+						"h": 25
+					},
+					"frame": {
+						"x": 0,
+						"y": 75,
+						"w": 35,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0040.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 15,
+						"w": 35,
+						"h": 25
+					},
+					"frame": {
+						"x": 35,
+						"y": 50,
+						"w": 35,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0042.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 16,
+						"w": 35,
+						"h": 25
+					},
+					"frame": {
+						"x": 35,
+						"y": 50,
+						"w": 35,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0044.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 20,
+						"w": 35,
+						"h": 25
+					},
+					"frame": {
+						"x": 35,
+						"y": 50,
+						"w": 35,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0046.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 22,
+						"w": 35,
+						"h": 25
+					},
+					"frame": {
+						"x": 35,
+						"y": 50,
+						"w": 35,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0048.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 22,
+						"w": 35,
+						"h": 25
+					},
+					"frame": {
+						"x": 35,
+						"y": 50,
+						"w": 35,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0050.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 22,
+						"w": 35,
+						"h": 25
+					},
+					"frame": {
+						"x": 35,
+						"y": 50,
+						"w": 35,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0052.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 20,
+						"w": 35,
+						"h": 25
+					},
+					"frame": {
+						"x": 35,
+						"y": 50,
+						"w": 35,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0054.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 15,
+						"w": 35,
+						"h": 25
+					},
+					"frame": {
+						"x": 35,
+						"y": 50,
+						"w": 35,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0056.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 15,
+						"w": 35,
+						"h": 25
+					},
+					"frame": {
+						"x": 35,
+						"y": 50,
+						"w": 35,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0058.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 16,
+						"w": 35,
+						"h": 25
+					},
+					"frame": {
+						"x": 35,
+						"y": 50,
+						"w": 35,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0060.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 20,
+						"w": 35,
+						"h": 25
+					},
+					"frame": {
+						"x": 35,
+						"y": 50,
+						"w": 35,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0062.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 22,
+						"w": 35,
+						"h": 25
+					},
+					"frame": {
+						"x": 35,
+						"y": 50,
+						"w": 35,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0064.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 22,
+						"w": 35,
+						"h": 25
+					},
+					"frame": {
+						"x": 35,
+						"y": 50,
+						"w": 35,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0066.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 22,
+						"w": 35,
+						"h": 25
+					},
+					"frame": {
+						"x": 35,
+						"y": 50,
+						"w": 35,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0068.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 20,
+						"w": 35,
+						"h": 25
+					},
+					"frame": {
+						"x": 35,
+						"y": 50,
+						"w": 35,
+						"h": 25
+					}
+				},
+				{
+					"filename": "0070.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 50,
+						"h": 50
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 16,
+						"w": 35,
+						"h": 25
+					},
+					"frame": {
+						"x": 35,
+						"y": 75,
+						"w": 35,
+						"h": 25
 					}
 				}
 			]
@@ -267,6 +1485,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:04628da78c1edc5312a2f63421c7e3ac:e873c63c890ae42fc6938426a6ebd38d:1a4f7e535d823202c4828f963d5b4404$"
+		"smartupdate": "$TexturePacker:SmartUpdate:82d70bdbeabce2143a84fa5267e07c64:0590ef94a7ae378f20bd2cf4d382106d:1a4f7e535d823202c4828f963d5b4404$"
 	}
 }
diff --git a/public/images/pokemon/exp/shiny/746.png b/public/images/pokemon/exp/shiny/746.png
index 4d85fde2f09..1c897dcbc49 100644
Binary files a/public/images/pokemon/exp/shiny/746.png and b/public/images/pokemon/exp/shiny/746.png differ
diff --git a/public/images/pokemon/exp/shiny/749.json b/public/images/pokemon/exp/shiny/749.json
index 3e66edcc872..d2dc11ec112 100644
--- a/public/images/pokemon/exp/shiny/749.json
+++ b/public/images/pokemon/exp/shiny/749.json
@@ -1,272 +1,1028 @@
-{
-	"textures": [
-		{
-			"image": "749.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 170,
-				"h": 170
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 45,
-						"h": 58
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 45,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 45,
-						"h": 58
-					},
-					"frame": {
-						"x": 45,
-						"y": 0,
-						"w": 45,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 45,
-						"h": 58
-					},
-					"frame": {
-						"x": 45,
-						"y": 0,
-						"w": 45,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 44,
-						"h": 58
-					},
-					"frame": {
-						"x": 90,
-						"y": 0,
-						"w": 44,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 44,
-						"h": 58
-					},
-					"frame": {
-						"x": 90,
-						"y": 0,
-						"w": 44,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 43,
-						"h": 58
-					},
-					"frame": {
-						"x": 0,
-						"y": 58,
-						"w": 43,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 43,
-						"h": 58
-					},
-					"frame": {
-						"x": 0,
-						"y": 58,
-						"w": 43,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 43,
-						"h": 58
-					},
-					"frame": {
-						"x": 43,
-						"y": 58,
-						"w": 43,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 43,
-						"h": 58
-					},
-					"frame": {
-						"x": 43,
-						"y": 58,
-						"w": 43,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 42,
-						"h": 58
-					},
-					"frame": {
-						"x": 86,
-						"y": 58,
-						"w": 42,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 42,
-						"h": 58
-					},
-					"frame": {
-						"x": 86,
-						"y": 58,
-						"w": 42,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 45,
-						"h": 58
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 42,
-						"h": 58
-					},
-					"frame": {
-						"x": 128,
-						"y": 58,
-						"w": 42,
-						"h": 58
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:3750962b7bf97de47e92eb3b3ea2046a:4f6ed853d2816fb61ade7e448ae31f37:d52e05c524384ef985e6339a08b2f938$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 0, "y": 231, "w": 46, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 15, "w": 46, "h": 56 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 0, "y": 175, "w": 47, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 15, "w": 47, "h": 56 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 290, "y": 69, "w": 49, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 16, "w": 49, "h": 55 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 46, "y": 122, "w": 50, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 18, "w": 50, "h": 53 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 239, "y": 69, "w": 51, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 18, "w": 51, "h": 53 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 46, "y": 69, "w": 51, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 18, "w": 51, "h": 53 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 235, "y": 122, "w": 50, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 18, "w": 50, "h": 53 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 186, "y": 119, "w": 49, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 16, "w": 49, "h": 55 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 47, "y": 175, "w": 47, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 15, "w": 47, "h": 56 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 136, "y": 120, "w": 46, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 13, "w": 46, "h": 58 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 136, "y": 178, "w": 45, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 13, "w": 45, "h": 58 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 92, "y": 231, "w": 44, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 13, "w": 44, "h": 58 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 322, "y": 287, "w": 44, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 14, "w": 44, "h": 57 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 231, "y": 175, "w": 46, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 14, "w": 46, "h": 57 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 0, "y": 231, "w": 46, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 15, "w": 46, "h": 56 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 0, "y": 175, "w": 47, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 15, "w": 47, "h": 56 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 290, "y": 69, "w": 49, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 16, "w": 49, "h": 55 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 46, "y": 122, "w": 50, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 18, "w": 50, "h": 53 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 239, "y": 69, "w": 51, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 18, "w": 51, "h": 53 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 46, "y": 69, "w": 51, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 18, "w": 51, "h": 53 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 235, "y": 122, "w": 50, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 18, "w": 50, "h": 53 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 186, "y": 119, "w": 49, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 16, "w": 49, "h": 55 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 47, "y": 175, "w": 47, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 15, "w": 47, "h": 56 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 136, "y": 120, "w": 46, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 13, "w": 46, "h": 58 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 136, "y": 178, "w": 45, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 13, "w": 45, "h": 58 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 92, "y": 231, "w": 44, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 13, "w": 44, "h": 58 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 322, "y": 287, "w": 44, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 14, "w": 44, "h": 57 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 231, "y": 175, "w": 46, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 14, "w": 46, "h": 57 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 0, "y": 231, "w": 46, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 15, "w": 46, "h": 56 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 128, "y": 336, "w": 46, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 17, "w": 46, "h": 54 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 136, "y": 283, "w": 48, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 18, "w": 48, "h": 53 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 219, "y": 340, "w": 45, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 13, "w": 45, "h": 55 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 85, "y": 289, "w": 43, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 43, "h": 58 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 0, "y": 343, "w": 41, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 4, "w": 41, "h": 60 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 174, "y": 338, "w": 45, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 8, "w": 45, "h": 55 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 276, "y": 233, "w": 48, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 12, "w": 48, "h": 53 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 228, "y": 232, "w": 48, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 15, "w": 48, "h": 53 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 184, "y": 285, "w": 48, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 18, "w": 48, "h": 53 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 324, "y": 233, "w": 47, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 17, "w": 47, "h": 54 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 181, "y": 228, "w": 47, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 16, "w": 47, "h": 55 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 0, "y": 231, "w": 46, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 15, "w": 46, "h": 56 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 0, "y": 175, "w": 47, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 15, "w": 47, "h": 56 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 290, "y": 69, "w": 49, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 16, "w": 49, "h": 55 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 46, "y": 122, "w": 50, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 18, "w": 50, "h": 53 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 239, "y": 69, "w": 51, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 18, "w": 51, "h": 53 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 46, "y": 69, "w": 51, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 18, "w": 51, "h": 53 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 235, "y": 122, "w": 50, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 18, "w": 50, "h": 53 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 186, "y": 119, "w": 49, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 16, "w": 49, "h": 55 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 47, "y": 175, "w": 47, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 15, "w": 47, "h": 56 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 136, "y": 120, "w": 46, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 13, "w": 46, "h": 58 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 136, "y": 178, "w": 45, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 13, "w": 45, "h": 58 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 92, "y": 231, "w": 44, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 13, "w": 44, "h": 58 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 322, "y": 287, "w": 44, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 14, "w": 44, "h": 57 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 231, "y": 175, "w": 46, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 14, "w": 46, "h": 57 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 0, "y": 231, "w": 46, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 15, "w": 46, "h": 56 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 128, "y": 336, "w": 46, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 17, "w": 46, "h": 54 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 136, "y": 283, "w": 48, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 18, "w": 48, "h": 53 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 219, "y": 340, "w": 45, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 13, "w": 45, "h": 55 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 85, "y": 289, "w": 43, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 43, "h": 58 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 0, "y": 343, "w": 41, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 4, "w": 41, "h": 60 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 174, "y": 338, "w": 45, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 8, "w": 45, "h": 55 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 276, "y": 233, "w": 48, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 12, "w": 48, "h": 53 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 228, "y": 232, "w": 48, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 15, "w": 48, "h": 53 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 184, "y": 285, "w": 48, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 18, "w": 48, "h": 53 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 324, "y": 233, "w": 47, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 17, "w": 47, "h": 54 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 181, "y": 228, "w": 47, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 16, "w": 47, "h": 55 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 0, "y": 231, "w": 46, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 15, "w": 46, "h": 56 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 128, "y": 336, "w": 46, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 17, "w": 46, "h": 54 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 136, "y": 283, "w": 48, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 18, "w": 48, "h": 53 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 219, "y": 340, "w": 45, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 13, "w": 45, "h": 55 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 85, "y": 289, "w": 43, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 9, "w": 43, "h": 58 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 0, "y": 343, "w": 41, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 4, "w": 41, "h": 60 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 174, "y": 338, "w": 45, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 8, "w": 45, "h": 55 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 276, "y": 233, "w": 48, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 12, "w": 48, "h": 53 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 228, "y": 232, "w": 48, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 15, "w": 48, "h": 53 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 184, "y": 285, "w": 48, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 18, "w": 48, "h": 53 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 324, "y": 233, "w": 47, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 17, "w": 47, "h": 54 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 181, "y": 228, "w": 47, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 16, "w": 47, "h": 55 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 0, "y": 231, "w": 46, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 15, "w": 46, "h": 56 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 0, "y": 175, "w": 47, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 15, "w": 47, "h": 56 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 290, "y": 69, "w": 49, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 16, "w": 49, "h": 55 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 46, "y": 122, "w": 50, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 18, "w": 50, "h": 53 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 239, "y": 69, "w": 51, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 18, "w": 51, "h": 53 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 46, "y": 69, "w": 51, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 18, "w": 51, "h": 53 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 235, "y": 122, "w": 50, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 18, "w": 50, "h": 53 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 186, "y": 119, "w": 49, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 16, "w": 49, "h": 55 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 47, "y": 175, "w": 47, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 15, "w": 47, "h": 56 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0088.png",
+    "frame": { "x": 136, "y": 120, "w": 46, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 13, "w": 46, "h": 58 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0089.png",
+    "frame": { "x": 136, "y": 178, "w": 45, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 13, "w": 45, "h": 58 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0090.png",
+    "frame": { "x": 92, "y": 231, "w": 44, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 13, "w": 44, "h": 58 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0091.png",
+    "frame": { "x": 322, "y": 287, "w": 44, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 14, "w": 44, "h": 57 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0092.png",
+    "frame": { "x": 231, "y": 175, "w": 46, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 14, "w": 46, "h": 57 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0093.png",
+    "frame": { "x": 46, "y": 231, "w": 46, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 15, "w": 46, "h": 56 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0094.png",
+    "frame": { "x": 277, "y": 178, "w": 47, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 16, "w": 47, "h": 55 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0095.png",
+    "frame": { "x": 285, "y": 124, "w": 49, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 17, "w": 49, "h": 54 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0096.png",
+    "frame": { "x": 134, "y": 67, "w": 52, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 18, "w": 52, "h": 53 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0097.png",
+    "frame": { "x": 186, "y": 67, "w": 53, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 19, "w": 53, "h": 52 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0098.png",
+    "frame": { "x": 223, "y": 0, "w": 50, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 14, "w": 50, "h": 57 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0099.png",
+    "frame": { "x": 0, "y": 66, "w": 46, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 10, "w": 46, "h": 59 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0100.png",
+    "frame": { "x": 134, "y": 0, "w": 46, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 6, "w": 46, "h": 63 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0101.png",
+    "frame": { "x": 0, "y": 0, "w": 47, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 3, "w": 47, "h": 66 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0102.png",
+    "frame": { "x": 314, "y": 0, "w": 40, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 0, "w": 40, "h": 69 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0103.png",
+    "frame": { "x": 91, "y": 0, "w": 43, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 0, "w": 43, "h": 69 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0104.png",
+    "frame": { "x": 97, "y": 120, "w": 39, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 0, "w": 39, "h": 69 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0105.png",
+    "frame": { "x": 47, "y": 0, "w": 44, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 0, "w": 44, "h": 69 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0106.png",
+    "frame": { "x": 273, "y": 0, "w": 41, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 0, "w": 41, "h": 69 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0107.png",
+    "frame": { "x": 180, "y": 0, "w": 43, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 43, "h": 67 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0108.png",
+    "frame": { "x": 45, "y": 287, "w": 40, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 6, "w": 40, "h": 63 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0109.png",
+    "frame": { "x": 279, "y": 286, "w": 43, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 10, "w": 43, "h": 59 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0110.png",
+    "frame": { "x": 0, "y": 287, "w": 45, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 14, "w": 45, "h": 56 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0111.png",
+    "frame": { "x": 232, "y": 286, "w": 47, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 17, "w": 47, "h": 54 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0112.png",
+    "frame": { "x": 182, "y": 174, "w": 49, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 17, "w": 49, "h": 54 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0113.png",
+    "frame": { "x": 324, "y": 178, "w": 47, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 16, "w": 47, "h": 55 },
+    "sourceSize": { "w": 54, "h": 71 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.13-x64",
+  "image": "749.png",
+  "format": "I8",
+  "size": { "w": 371, "h": 403 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/shiny/749.png b/public/images/pokemon/exp/shiny/749.png
index 29bf8edad8b..81013d98e58 100644
Binary files a/public/images/pokemon/exp/shiny/749.png and b/public/images/pokemon/exp/shiny/749.png differ
diff --git a/public/images/pokemon/exp/shiny/750.json b/public/images/pokemon/exp/shiny/750.json
index 61f838cfcab..7a9d583081a 100644
--- a/public/images/pokemon/exp/shiny/750.json
+++ b/public/images/pokemon/exp/shiny/750.json
@@ -1,272 +1,929 @@
-{
-	"textures": [
-		{
-			"image": "750.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 230,
-				"h": 230
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 60,
-						"h": 78
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 60,
-						"h": 78
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 60,
-						"h": 78
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 60,
-						"h": 78
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 57,
-						"h": 78
-					},
-					"frame": {
-						"x": 0,
-						"y": 78,
-						"w": 57,
-						"h": 78
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 57,
-						"h": 78
-					},
-					"frame": {
-						"x": 0,
-						"y": 78,
-						"w": 57,
-						"h": 78
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 55,
-						"h": 78
-					},
-					"frame": {
-						"x": 57,
-						"y": 78,
-						"w": 55,
-						"h": 78
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 65,
-						"h": 77
-					},
-					"frame": {
-						"x": 60,
-						"y": 0,
-						"w": 65,
-						"h": 77
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 65,
-						"h": 77
-					},
-					"frame": {
-						"x": 60,
-						"y": 0,
-						"w": 65,
-						"h": 77
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 65,
-						"h": 77
-					},
-					"frame": {
-						"x": 125,
-						"y": 0,
-						"w": 65,
-						"h": 77
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 64,
-						"h": 76
-					},
-					"frame": {
-						"x": 112,
-						"y": 77,
-						"w": 64,
-						"h": 76
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 64,
-						"h": 76
-					},
-					"frame": {
-						"x": 112,
-						"y": 77,
-						"w": 64,
-						"h": 76
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 62,
-						"h": 77
-					},
-					"frame": {
-						"x": 112,
-						"y": 153,
-						"w": 62,
-						"h": 77
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 78
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 62,
-						"h": 77
-					},
-					"frame": {
-						"x": 112,
-						"y": 153,
-						"w": 62,
-						"h": 77
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:7ccf7456c0825db8500c2b84b43d279c:8daa4a0d7b9d5b5d4aa2bab3306e4e87:4ad6abb5f7a40182d2391bde900ad082$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 383, "y": 211, "w": 74, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 16, "w": 74, "h": 68 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 224, "y": 158, "w": 76, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 16, "w": 76, "h": 68 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 463, "y": 210, "w": 77, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 17, "w": 77, "h": 67 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 146, "y": 158, "w": 78, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 17, "w": 78, "h": 67 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 383, "y": 145, "w": 80, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 18, "w": 80, "h": 66 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 0, "y": 145, "w": 81, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 18, "w": 81, "h": 66 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 318, "y": 78, "w": 83, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 18, "w": 83, "h": 66 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 0, "y": 80, "w": 84, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 19, "w": 84, "h": 65 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 84, "y": 80, "w": 84, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 19, "w": 84, "h": 65 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 401, "y": 80, "w": 84, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 19, "w": 84, "h": 65 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 485, "y": 80, "w": 83, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 19, "w": 83, "h": 65 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 463, "y": 145, "w": 81, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 19, "w": 81, "h": 65 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 61, "y": 227, "w": 77, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 19, "w": 77, "h": 65 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 195, "y": 302, "w": 75, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 19, "w": 75, "h": 65 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 270, "y": 346, "w": 72, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 18, "w": 72, "h": 66 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 194, "y": 435, "w": 68, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 17, "w": 68, "h": 67 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 0, "y": 435, "w": 68, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 17, "w": 68, "h": 67 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 262, "y": 479, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 17, "w": 67, "h": 67 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 494, "y": 474, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 17, "w": 67, "h": 67 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 334, "y": 422, "w": 68, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 17, "w": 68, "h": 67 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 425, "y": 413, "w": 69, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 17, "w": 69, "h": 67 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 425, "y": 345, "w": 71, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 16, "w": 71, "h": 68 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 61, "y": 292, "w": 73, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 17, "w": 73, "h": 67 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 383, "y": 211, "w": 74, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 16, "w": 74, "h": 68 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 224, "y": 158, "w": 76, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 16, "w": 76, "h": 68 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 463, "y": 210, "w": 77, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 17, "w": 77, "h": 67 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 146, "y": 158, "w": 78, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 17, "w": 78, "h": 67 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 383, "y": 145, "w": 80, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 18, "w": 80, "h": 66 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 0, "y": 145, "w": 81, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 18, "w": 81, "h": 66 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 318, "y": 78, "w": 83, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 18, "w": 83, "h": 66 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 0, "y": 80, "w": 84, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 19, "w": 84, "h": 65 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 84, "y": 80, "w": 84, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 19, "w": 84, "h": 65 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 401, "y": 80, "w": 84, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 19, "w": 84, "h": 65 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 485, "y": 80, "w": 83, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 19, "w": 83, "h": 65 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 463, "y": 145, "w": 81, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 19, "w": 81, "h": 65 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 61, "y": 227, "w": 77, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 19, "w": 77, "h": 65 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 195, "y": 302, "w": 75, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 19, "w": 75, "h": 65 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 270, "y": 346, "w": 72, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 18, "w": 72, "h": 66 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 194, "y": 435, "w": 68, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 17, "w": 68, "h": 67 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 0, "y": 435, "w": 68, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 17, "w": 68, "h": 67 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 262, "y": 479, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 17, "w": 67, "h": 67 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 494, "y": 474, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 17, "w": 67, "h": 67 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 334, "y": 422, "w": 68, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 17, "w": 68, "h": 67 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 425, "y": 413, "w": 69, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 17, "w": 69, "h": 67 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 425, "y": 345, "w": 71, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 16, "w": 71, "h": 68 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 61, "y": 292, "w": 73, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 17, "w": 73, "h": 67 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 383, "y": 211, "w": 74, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 16, "w": 74, "h": 68 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 224, "y": 158, "w": 76, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 16, "w": 76, "h": 68 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 463, "y": 210, "w": 77, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 17, "w": 77, "h": 67 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 146, "y": 158, "w": 78, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 17, "w": 78, "h": 67 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 383, "y": 145, "w": 80, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 18, "w": 80, "h": 66 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 0, "y": 145, "w": 81, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 18, "w": 81, "h": 66 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 318, "y": 78, "w": 83, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 18, "w": 83, "h": 66 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 0, "y": 80, "w": 84, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 19, "w": 84, "h": 65 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 84, "y": 80, "w": 84, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 19, "w": 84, "h": 65 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 401, "y": 80, "w": 84, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 19, "w": 84, "h": 65 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 485, "y": 80, "w": 83, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 19, "w": 83, "h": 65 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 463, "y": 145, "w": 81, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 19, "w": 81, "h": 65 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 61, "y": 227, "w": 77, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 19, "w": 77, "h": 65 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 195, "y": 302, "w": 75, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 19, "w": 75, "h": 65 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 270, "y": 346, "w": 72, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 18, "w": 72, "h": 66 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 194, "y": 435, "w": 68, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 17, "w": 68, "h": 67 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 0, "y": 435, "w": 68, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 17, "w": 68, "h": 67 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 262, "y": 479, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 17, "w": 67, "h": 67 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 494, "y": 474, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 17, "w": 67, "h": 67 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 334, "y": 422, "w": 68, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 17, "w": 68, "h": 67 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 425, "y": 413, "w": 69, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 17, "w": 69, "h": 67 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 425, "y": 345, "w": 71, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 16, "w": 71, "h": 68 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 61, "y": 292, "w": 73, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 17, "w": 73, "h": 67 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 383, "y": 211, "w": 74, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 16, "w": 74, "h": 68 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 300, "y": 213, "w": 74, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 16, "w": 74, "h": 68 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 374, "y": 279, "w": 75, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 18, "w": 75, "h": 66 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 286, "y": 281, "w": 76, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 20, "w": 76, "h": 65 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 0, "y": 373, "w": 76, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 22, "w": 76, "h": 62 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 496, "y": 412, "w": 75, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 22, "w": 75, "h": 62 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 329, "y": 489, "w": 70, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 20, "w": 70, "h": 64 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 0, "y": 502, "w": 62, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 15, "w": 62, "h": 68 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 134, "y": 373, "w": 60, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 7, "w": 60, "h": 76 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 76, "y": 359, "w": 58, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 2, "w": 58, "h": 81 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 0, "y": 211, "w": 61, "h": 83 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 0, "w": 61, "h": 83 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 81, "y": 145, "w": 65, "h": 82 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 1, "w": 65, "h": 82 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 466, "y": 0, "w": 69, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 69, "h": 80 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 395, "y": 0, "w": 71, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 5, "w": 71, "h": 78 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 235, "y": 81, "w": 70, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 6, "w": 70, "h": 77 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 220, "y": 226, "w": 66, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 7, "w": 66, "h": 76 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 362, "y": 345, "w": 63, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 16, "y": 6, "w": 63, "h": 77 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 0, "y": 294, "w": 60, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 16, "y": 4, "w": 60, "h": 79 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0088.png",
+    "frame": { "x": 134, "y": 293, "w": 61, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 3, "w": 61, "h": 80 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0089.png",
+    "frame": { "x": 168, "y": 77, "w": 67, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 2, "w": 67, "h": 81 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0090.png",
+    "frame": { "x": 242, "y": 0, "w": 76, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 2, "w": 76, "h": 81 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0091.png",
+    "frame": { "x": 82, "y": 0, "w": 80, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 3, "w": 80, "h": 80 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0092.png",
+    "frame": { "x": 0, "y": 0, "w": 82, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 3, "w": 82, "h": 80 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0093.png",
+    "frame": { "x": 162, "y": 0, "w": 80, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 6, "w": 80, "h": 77 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0094.png",
+    "frame": { "x": 318, "y": 0, "w": 77, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 10, "w": 77, "h": 73 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0095.png",
+    "frame": { "x": 305, "y": 144, "w": 78, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 14, "w": 78, "h": 69 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0096.png",
+    "frame": { "x": 457, "y": 277, "w": 73, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 15, "w": 73, "h": 68 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0097.png",
+    "frame": { "x": 402, "y": 480, "w": 67, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 17, "w": 67, "h": 67 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0098.png",
+    "frame": { "x": 68, "y": 449, "w": 68, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 17, "w": 68, "h": 67 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0099.png",
+    "frame": { "x": 195, "y": 367, "w": 69, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 16, "w": 69, "h": 68 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0100.png",
+    "frame": { "x": 264, "y": 412, "w": 70, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 17, "w": 70, "h": 67 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0101.png",
+    "frame": { "x": 496, "y": 345, "w": 72, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 17, "w": 72, "h": 67 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   },
+   {
+    "filename": "0102.png",
+    "frame": { "x": 146, "y": 225, "w": 74, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 16, "w": 74, "h": 68 },
+    "sourceSize": { "w": 90, "h": 85 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.13-x64",
+  "image": "750.png",
+  "format": "I8",
+  "size": { "w": 571, "h": 570 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/shiny/750.png b/public/images/pokemon/exp/shiny/750.png
index e51f6eb7219..b2b3076b55f 100644
Binary files a/public/images/pokemon/exp/shiny/750.png and b/public/images/pokemon/exp/shiny/750.png differ
diff --git a/public/images/pokemon/exp/shiny/780.json b/public/images/pokemon/exp/shiny/780.json
index 83607960307..6a50a444098 100644
--- a/public/images/pokemon/exp/shiny/780.json
+++ b/public/images/pokemon/exp/shiny/780.json
@@ -1,272 +1,884 @@
-{
-	"textures": [
-		{
-			"image": "780.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 244,
-				"h": 244
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 61
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 93,
-						"h": 61
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 93,
-						"h": 61
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 61
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 93,
-						"h": 61
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 93,
-						"h": 61
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 61
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 91,
-						"h": 61
-					},
-					"frame": {
-						"x": 93,
-						"y": 0,
-						"w": 91,
-						"h": 61
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 61
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 91,
-						"h": 61
-					},
-					"frame": {
-						"x": 0,
-						"y": 61,
-						"w": 91,
-						"h": 61
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 61
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 91,
-						"h": 61
-					},
-					"frame": {
-						"x": 0,
-						"y": 61,
-						"w": 91,
-						"h": 61
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 61
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 0,
-						"w": 89,
-						"h": 61
-					},
-					"frame": {
-						"x": 0,
-						"y": 122,
-						"w": 89,
-						"h": 61
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 61
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 0,
-						"w": 89,
-						"h": 61
-					},
-					"frame": {
-						"x": 0,
-						"y": 122,
-						"w": 89,
-						"h": 61
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 61
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 0,
-						"w": 86,
-						"h": 61
-					},
-					"frame": {
-						"x": 0,
-						"y": 183,
-						"w": 86,
-						"h": 61
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 61
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 0,
-						"w": 86,
-						"h": 61
-					},
-					"frame": {
-						"x": 0,
-						"y": 183,
-						"w": 86,
-						"h": 61
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 61
-					},
-					"spriteSourceSize": {
-						"x": 13,
-						"y": 0,
-						"w": 83,
-						"h": 61
-					},
-					"frame": {
-						"x": 86,
-						"y": 183,
-						"w": 83,
-						"h": 61
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 61
-					},
-					"spriteSourceSize": {
-						"x": 13,
-						"y": 0,
-						"w": 83,
-						"h": 61
-					},
-					"frame": {
-						"x": 86,
-						"y": 183,
-						"w": 83,
-						"h": 61
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 61
-					},
-					"spriteSourceSize": {
-						"x": 15,
-						"y": 0,
-						"w": 81,
-						"h": 61
-					},
-					"frame": {
-						"x": 89,
-						"y": 122,
-						"w": 81,
-						"h": 61
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:eb778a8559fd28191282550e6f9ca027:935a960b3e7674c98fe50b4aa5c065a8:9470182902340de73b2565411cb0ab89$"
-	}
+{ "frames": [
+  {
+   "filename": "0001.png",
+   "frame": { "x": 303, "y": 72, "w": 72, "h": 70 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 2, "y": 2, "w": 72, "h": 70 },
+   "sourceSize": { "w": 78, "h": 72 },
+   "duration": 100
+  },
+  {
+   "filename": "0002.png",
+   "frame": { "x": 376, "y": 72, "w": 72, "h": 70 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 2, "y": 2, "w": 72, "h": 70 },
+   "sourceSize": { "w": 78, "h": 72 },
+   "duration": 100
+  },
+  {
+   "filename": "0003.png",
+   "frame": { "x": 449, "y": 72, "w": 72, "h": 70 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 2, "y": 2, "w": 72, "h": 70 },
+   "sourceSize": { "w": 78, "h": 72 },
+   "duration": 100
+  },
+  {
+   "filename": "0004.png",
+   "frame": { "x": 1, "y": 214, "w": 72, "h": 69 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 2, "y": 3, "w": 72, "h": 69 },
+   "sourceSize": { "w": 78, "h": 72 },
+   "duration": 100
+  },
+  {
+   "filename": "0005.png",
+   "frame": { "x": 365, "y": 214, "w": 73, "h": 68 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 2, "y": 4, "w": 73, "h": 68 },
+   "sourceSize": { "w": 78, "h": 72 },
+   "duration": 100
+  },
+  {
+   "filename": "0006.png",
+   "frame": { "x": 292, "y": 284, "w": 72, "h": 68 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 3, "y": 4, "w": 72, "h": 68 },
+   "sourceSize": { "w": 78, "h": 72 },
+   "duration": 100
+  },
+  {
+   "filename": "0007.png",
+   "frame": { "x": 439, "y": 214, "w": 73, "h": 68 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 3, "y": 4, "w": 73, "h": 68 },
+   "sourceSize": { "w": 78, "h": 72 },
+   "duration": 100
+  },
+  {
+   "filename": "0008.png",
+   "frame": { "x": 439, "y": 350, "w": 73, "h": 67 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 3, "y": 5, "w": 73, "h": 67 },
+   "sourceSize": { "w": 78, "h": 72 },
+   "duration": 100
+  },
+  {
+   "filename": "0009.png",
+   "frame": { "x": 223, "y": 353, "w": 74, "h": 66 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 3, "y": 6, "w": 74, "h": 66 },
+   "sourceSize": { "w": 78, "h": 72 },
+   "duration": 100
+  },
+  {
+   "filename": "0010.png",
+   "frame": { "x": 439, "y": 283, "w": 75, "h": 66 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 3, "y": 6, "w": 75, "h": 66 },
+   "sourceSize": { "w": 78, "h": 72 },
+   "duration": 100
+  },
+  {
+   "filename": "0011.png",
+   "frame": { "x": 148, "y": 353, "w": 74, "h": 66 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 4, "y": 6, "w": 74, "h": 66 },
+   "sourceSize": { "w": 78, "h": 72 },
+   "duration": 100
+  },
+  {
+   "filename": "0012.png",
+   "frame": { "x": 73, "y": 351, "w": 74, "h": 66 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 3, "y": 6, "w": 74, "h": 66 },
+   "sourceSize": { "w": 78, "h": 72 },
+   "duration": 100
+  },
+  {
+   "filename": "0013.png",
+   "frame": { "x": 145, "y": 214, "w": 75, "h": 67 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 2, "y": 5, "w": 75, "h": 67 },
+   "sourceSize": { "w": 78, "h": 72 },
+   "duration": 100
+  },
+  {
+   "filename": "0014.png",
+   "frame": { "x": 219, "y": 144, "w": 74, "h": 68 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 2, "y": 4, "w": 74, "h": 68 },
+   "sourceSize": { "w": 78, "h": 72 },
+   "duration": 100
+  },
+  {
+   "filename": "0015.png",
+   "frame": { "x": 365, "y": 283, "w": 73, "h": 68 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 2, "y": 4, "w": 73, "h": 68 },
+   "sourceSize": { "w": 78, "h": 72 },
+   "duration": 100
+  },
+  {
+   "filename": "0016.png",
+   "frame": { "x": 74, "y": 282, "w": 73, "h": 68 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 2, "y": 4, "w": 73, "h": 68 },
+   "sourceSize": { "w": 78, "h": 72 },
+   "duration": 100
+  },
+  {
+   "filename": "0017.png",
+   "frame": { "x": 292, "y": 214, "w": 72, "h": 69 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 2, "y": 3, "w": 72, "h": 69 },
+   "sourceSize": { "w": 78, "h": 72 },
+   "duration": 100
+  },
+  {
+   "filename": "0018.png",
+   "frame": { "x": 367, "y": 143, "w": 72, "h": 70 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 2, "y": 2, "w": 72, "h": 70 },
+   "sourceSize": { "w": 78, "h": 72 },
+   "duration": 100
+  },
+  {
+   "filename": "0019.png",
+   "frame": { "x": 303, "y": 72, "w": 72, "h": 70 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 2, "y": 2, "w": 72, "h": 70 },
+   "sourceSize": { "w": 78, "h": 72 },
+   "duration": 100
+  },
+  {
+   "filename": "0020.png",
+   "frame": { "x": 376, "y": 72, "w": 72, "h": 70 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 2, "y": 2, "w": 72, "h": 70 },
+   "sourceSize": { "w": 78, "h": 72 },
+   "duration": 100
+  },
+  {
+   "filename": "0021.png",
+   "frame": { "x": 449, "y": 72, "w": 72, "h": 70 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 2, "y": 2, "w": 72, "h": 70 },
+   "sourceSize": { "w": 78, "h": 72 },
+   "duration": 100
+  },
+  {
+   "filename": "0022.png",
+   "frame": { "x": 1, "y": 214, "w": 72, "h": 69 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 2, "y": 3, "w": 72, "h": 69 },
+   "sourceSize": { "w": 78, "h": 72 },
+   "duration": 100
+  },
+  {
+   "filename": "0023.png",
+   "frame": { "x": 365, "y": 214, "w": 73, "h": 68 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 2, "y": 4, "w": 73, "h": 68 },
+   "sourceSize": { "w": 78, "h": 72 },
+   "duration": 100
+  },
+  {
+   "filename": "0024.png",
+   "frame": { "x": 292, "y": 284, "w": 72, "h": 68 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 3, "y": 4, "w": 72, "h": 68 },
+   "sourceSize": { "w": 78, "h": 72 },
+   "duration": 100
+  },
+  {
+   "filename": "0025.png",
+   "frame": { "x": 439, "y": 214, "w": 73, "h": 68 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 3, "y": 4, "w": 73, "h": 68 },
+   "sourceSize": { "w": 78, "h": 72 },
+   "duration": 100
+  },
+  {
+   "filename": "0026.png",
+   "frame": { "x": 439, "y": 350, "w": 73, "h": 67 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 3, "y": 5, "w": 73, "h": 67 },
+   "sourceSize": { "w": 78, "h": 72 },
+   "duration": 100
+  },
+  {
+   "filename": "0027.png",
+   "frame": { "x": 223, "y": 353, "w": 74, "h": 66 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 3, "y": 6, "w": 74, "h": 66 },
+   "sourceSize": { "w": 78, "h": 72 },
+   "duration": 100
+  },
+  {
+   "filename": "0028.png",
+   "frame": { "x": 439, "y": 283, "w": 75, "h": 66 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 3, "y": 6, "w": 75, "h": 66 },
+   "sourceSize": { "w": 78, "h": 72 },
+   "duration": 100
+  },
+  {
+   "filename": "0029.png",
+   "frame": { "x": 148, "y": 353, "w": 74, "h": 66 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 4, "y": 6, "w": 74, "h": 66 },
+   "sourceSize": { "w": 78, "h": 72 },
+   "duration": 100
+  },
+  {
+   "filename": "0030.png",
+   "frame": { "x": 73, "y": 351, "w": 74, "h": 66 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 3, "y": 6, "w": 74, "h": 66 },
+   "sourceSize": { "w": 78, "h": 72 },
+   "duration": 100
+  },
+  {
+   "filename": "0031.png",
+   "frame": { "x": 145, "y": 214, "w": 75, "h": 67 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 2, "y": 5, "w": 75, "h": 67 },
+   "sourceSize": { "w": 78, "h": 72 },
+   "duration": 100
+  },
+  {
+   "filename": "0032.png",
+   "frame": { "x": 219, "y": 144, "w": 74, "h": 68 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 2, "y": 4, "w": 74, "h": 68 },
+   "sourceSize": { "w": 78, "h": 72 },
+   "duration": 100
+  },
+  {
+   "filename": "0033.png",
+   "frame": { "x": 365, "y": 283, "w": 73, "h": 68 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 2, "y": 4, "w": 73, "h": 68 },
+   "sourceSize": { "w": 78, "h": 72 },
+   "duration": 100
+  },
+  {
+   "filename": "0034.png",
+   "frame": { "x": 74, "y": 282, "w": 73, "h": 68 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 2, "y": 4, "w": 73, "h": 68 },
+   "sourceSize": { "w": 78, "h": 72 },
+   "duration": 100
+  },
+  {
+   "filename": "0035.png",
+   "frame": { "x": 292, "y": 214, "w": 72, "h": 69 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 2, "y": 3, "w": 72, "h": 69 },
+   "sourceSize": { "w": 78, "h": 72 },
+   "duration": 100
+  },
+  {
+   "filename": "0036.png",
+   "frame": { "x": 367, "y": 143, "w": 72, "h": 70 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 2, "y": 2, "w": 72, "h": 70 },
+   "sourceSize": { "w": 78, "h": 72 },
+   "duration": 100
+  },
+  {
+   "filename": "0037.png",
+   "frame": { "x": 303, "y": 72, "w": 72, "h": 70 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 2, "y": 2, "w": 72, "h": 70 },
+   "sourceSize": { "w": 78, "h": 72 },
+   "duration": 100
+  },
+  {
+   "filename": "0038.png",
+   "frame": { "x": 376, "y": 72, "w": 72, "h": 70 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 2, "y": 2, "w": 72, "h": 70 },
+   "sourceSize": { "w": 78, "h": 72 },
+   "duration": 100
+  },
+  {
+   "filename": "0039.png",
+   "frame": { "x": 449, "y": 72, "w": 72, "h": 70 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 2, "y": 2, "w": 72, "h": 70 },
+   "sourceSize": { "w": 78, "h": 72 },
+   "duration": 100
+  },
+  {
+   "filename": "0040.png",
+   "frame": { "x": 1, "y": 214, "w": 72, "h": 69 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 2, "y": 3, "w": 72, "h": 69 },
+   "sourceSize": { "w": 78, "h": 72 },
+   "duration": 100
+  },
+  {
+   "filename": "0041.png",
+   "frame": { "x": 365, "y": 214, "w": 73, "h": 68 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 2, "y": 4, "w": 73, "h": 68 },
+   "sourceSize": { "w": 78, "h": 72 },
+   "duration": 100
+  },
+  {
+   "filename": "0042.png",
+   "frame": { "x": 292, "y": 284, "w": 72, "h": 68 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 3, "y": 4, "w": 72, "h": 68 },
+   "sourceSize": { "w": 78, "h": 72 },
+   "duration": 100
+  },
+  {
+   "filename": "0043.png",
+   "frame": { "x": 439, "y": 214, "w": 73, "h": 68 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 3, "y": 4, "w": 73, "h": 68 },
+   "sourceSize": { "w": 78, "h": 72 },
+   "duration": 100
+  },
+  {
+   "filename": "0044.png",
+   "frame": { "x": 439, "y": 350, "w": 73, "h": 67 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 3, "y": 5, "w": 73, "h": 67 },
+   "sourceSize": { "w": 78, "h": 72 },
+   "duration": 100
+  },
+  {
+   "filename": "0045.png",
+   "frame": { "x": 223, "y": 353, "w": 74, "h": 66 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 3, "y": 6, "w": 74, "h": 66 },
+   "sourceSize": { "w": 78, "h": 72 },
+   "duration": 100
+  },
+  {
+   "filename": "0046.png",
+   "frame": { "x": 439, "y": 283, "w": 75, "h": 66 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 3, "y": 6, "w": 75, "h": 66 },
+   "sourceSize": { "w": 78, "h": 72 },
+   "duration": 100
+  },
+  {
+   "filename": "0047.png",
+   "frame": { "x": 148, "y": 353, "w": 74, "h": 66 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 4, "y": 6, "w": 74, "h": 66 },
+   "sourceSize": { "w": 78, "h": 72 },
+   "duration": 100
+  },
+  {
+   "filename": "0048.png",
+   "frame": { "x": 73, "y": 351, "w": 74, "h": 66 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 3, "y": 6, "w": 74, "h": 66 },
+   "sourceSize": { "w": 78, "h": 72 },
+   "duration": 100
+  },
+  {
+   "filename": "0049.png",
+   "frame": { "x": 145, "y": 214, "w": 75, "h": 67 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 2, "y": 5, "w": 75, "h": 67 },
+   "sourceSize": { "w": 78, "h": 72 },
+   "duration": 100
+  },
+  {
+   "filename": "0050.png",
+   "frame": { "x": 219, "y": 144, "w": 74, "h": 68 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 2, "y": 4, "w": 74, "h": 68 },
+   "sourceSize": { "w": 78, "h": 72 },
+   "duration": 100
+  },
+  {
+   "filename": "0051.png",
+   "frame": { "x": 365, "y": 283, "w": 73, "h": 68 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 2, "y": 4, "w": 73, "h": 68 },
+   "sourceSize": { "w": 78, "h": 72 },
+   "duration": 100
+  },
+  {
+   "filename": "0052.png",
+   "frame": { "x": 74, "y": 282, "w": 73, "h": 68 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 2, "y": 4, "w": 73, "h": 68 },
+   "sourceSize": { "w": 78, "h": 72 },
+   "duration": 100
+  },
+  {
+   "filename": "0053.png",
+   "frame": { "x": 292, "y": 214, "w": 72, "h": 69 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 2, "y": 3, "w": 72, "h": 69 },
+   "sourceSize": { "w": 78, "h": 72 },
+   "duration": 100
+  },
+  {
+   "filename": "0054.png",
+   "frame": { "x": 367, "y": 143, "w": 72, "h": 70 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 2, "y": 2, "w": 72, "h": 70 },
+   "sourceSize": { "w": 78, "h": 72 },
+   "duration": 100
+  },
+  {
+   "filename": "0055.png",
+   "frame": { "x": 303, "y": 72, "w": 72, "h": 70 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 2, "y": 2, "w": 72, "h": 70 },
+   "sourceSize": { "w": 78, "h": 72 },
+   "duration": 100
+  },
+  {
+   "filename": "0056.png",
+   "frame": { "x": 376, "y": 72, "w": 72, "h": 70 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 2, "y": 2, "w": 72, "h": 70 },
+   "sourceSize": { "w": 78, "h": 72 },
+   "duration": 100
+  },
+  {
+   "filename": "0057.png",
+   "frame": { "x": 449, "y": 72, "w": 72, "h": 70 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 2, "y": 2, "w": 72, "h": 70 },
+   "sourceSize": { "w": 78, "h": 72 },
+   "duration": 100
+  },
+  {
+   "filename": "0058.png",
+   "frame": { "x": 1, "y": 214, "w": 72, "h": 69 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 2, "y": 3, "w": 72, "h": 69 },
+   "sourceSize": { "w": 78, "h": 72 },
+   "duration": 100
+  },
+  {
+   "filename": "0059.png",
+   "frame": { "x": 365, "y": 214, "w": 73, "h": 68 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 2, "y": 4, "w": 73, "h": 68 },
+   "sourceSize": { "w": 78, "h": 72 },
+   "duration": 100
+  },
+  {
+   "filename": "0060.png",
+   "frame": { "x": 292, "y": 284, "w": 72, "h": 68 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 3, "y": 4, "w": 72, "h": 68 },
+   "sourceSize": { "w": 78, "h": 72 },
+   "duration": 100
+  },
+  {
+   "filename": "0061.png",
+   "frame": { "x": 439, "y": 214, "w": 73, "h": 68 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 3, "y": 4, "w": 73, "h": 68 },
+   "sourceSize": { "w": 78, "h": 72 },
+   "duration": 100
+  },
+  {
+   "filename": "0062.png",
+   "frame": { "x": 439, "y": 350, "w": 73, "h": 67 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 3, "y": 5, "w": 73, "h": 67 },
+   "sourceSize": { "w": 78, "h": 72 },
+   "duration": 100
+  },
+  {
+   "filename": "0063.png",
+   "frame": { "x": 223, "y": 353, "w": 74, "h": 66 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 3, "y": 6, "w": 74, "h": 66 },
+   "sourceSize": { "w": 78, "h": 72 },
+   "duration": 100
+  },
+  {
+   "filename": "0064.png",
+   "frame": { "x": 439, "y": 283, "w": 75, "h": 66 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 3, "y": 6, "w": 75, "h": 66 },
+   "sourceSize": { "w": 78, "h": 72 },
+   "duration": 100
+  },
+  {
+   "filename": "0065.png",
+   "frame": { "x": 148, "y": 353, "w": 74, "h": 66 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 4, "y": 6, "w": 74, "h": 66 },
+   "sourceSize": { "w": 78, "h": 72 },
+   "duration": 100
+  },
+  {
+   "filename": "0066.png",
+   "frame": { "x": 73, "y": 351, "w": 74, "h": 66 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 3, "y": 6, "w": 74, "h": 66 },
+   "sourceSize": { "w": 78, "h": 72 },
+   "duration": 100
+  },
+  {
+   "filename": "0067.png",
+   "frame": { "x": 145, "y": 214, "w": 75, "h": 67 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 2, "y": 5, "w": 75, "h": 67 },
+   "sourceSize": { "w": 78, "h": 72 },
+   "duration": 100
+  },
+  {
+   "filename": "0068.png",
+   "frame": { "x": 219, "y": 144, "w": 74, "h": 68 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 2, "y": 4, "w": 74, "h": 68 },
+   "sourceSize": { "w": 78, "h": 72 },
+   "duration": 100
+  },
+  {
+   "filename": "0069.png",
+   "frame": { "x": 365, "y": 283, "w": 73, "h": 68 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 2, "y": 4, "w": 73, "h": 68 },
+   "sourceSize": { "w": 78, "h": 72 },
+   "duration": 100
+  },
+  {
+   "filename": "0070.png",
+   "frame": { "x": 74, "y": 282, "w": 73, "h": 68 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 2, "y": 4, "w": 73, "h": 68 },
+   "sourceSize": { "w": 78, "h": 72 },
+   "duration": 100
+  },
+  {
+   "filename": "0071.png",
+   "frame": { "x": 292, "y": 214, "w": 72, "h": 69 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 2, "y": 3, "w": 72, "h": 69 },
+   "sourceSize": { "w": 78, "h": 72 },
+   "duration": 100
+  },
+  {
+   "filename": "0072.png",
+   "frame": { "x": 367, "y": 143, "w": 72, "h": 70 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 2, "y": 2, "w": 72, "h": 70 },
+   "sourceSize": { "w": 78, "h": 72 },
+   "duration": 100
+  },
+  {
+   "filename": "0073.png",
+   "frame": { "x": 440, "y": 143, "w": 72, "h": 70 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 2, "y": 2, "w": 72, "h": 70 },
+   "sourceSize": { "w": 78, "h": 72 },
+   "duration": 100
+  },
+  {
+   "filename": "0074.png",
+   "frame": { "x": 221, "y": 73, "w": 72, "h": 70 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 2, "y": 2, "w": 72, "h": 70 },
+   "sourceSize": { "w": 78, "h": 72 },
+   "duration": 100
+  },
+  {
+   "filename": "0075.png",
+   "frame": { "x": 377, "y": 1, "w": 73, "h": 70 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 1, "y": 2, "w": 73, "h": 70 },
+   "sourceSize": { "w": 78, "h": 72 },
+   "duration": 100
+  },
+  {
+   "filename": "0076.png",
+   "frame": { "x": 303, "y": 1, "w": 73, "h": 70 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 1, "y": 2, "w": 73, "h": 70 },
+   "sourceSize": { "w": 78, "h": 72 },
+   "duration": 100
+  },
+  {
+   "filename": "0077.png",
+   "frame": { "x": 154, "y": 1, "w": 75, "h": 70 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 0, "y": 2, "w": 75, "h": 70 },
+   "sourceSize": { "w": 78, "h": 72 },
+   "duration": 100
+  },
+  {
+   "filename": "0078.png",
+   "frame": { "x": 78, "y": 1, "w": 75, "h": 70 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 0, "y": 2, "w": 75, "h": 70 },
+   "sourceSize": { "w": 78, "h": 72 },
+   "duration": 100
+  },
+  {
+   "filename": "0079.png",
+   "frame": { "x": 1, "y": 1, "w": 76, "h": 70 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 0, "y": 2, "w": 76, "h": 70 },
+   "sourceSize": { "w": 78, "h": 72 },
+   "duration": 100
+  },
+  {
+   "filename": "0080.png",
+   "frame": { "x": 1, "y": 143, "w": 72, "h": 70 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 2, "y": 2, "w": 72, "h": 70 },
+   "sourceSize": { "w": 78, "h": 72 },
+   "duration": 100
+  },
+  {
+   "filename": "0081.png",
+   "frame": { "x": 230, "y": 1, "w": 72, "h": 71 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 2, "y": 1, "w": 72, "h": 71 },
+   "sourceSize": { "w": 78, "h": 72 },
+   "duration": 100
+  },
+  {
+   "filename": "0082.png",
+   "frame": { "x": 221, "y": 213, "w": 70, "h": 71 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 3, "y": 1, "w": 70, "h": 71 },
+   "sourceSize": { "w": 78, "h": 72 },
+   "duration": 100
+  },
+  {
+   "filename": "0083.png",
+   "frame": { "x": 149, "y": 72, "w": 71, "h": 71 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 3, "y": 1, "w": 71, "h": 71 },
+   "sourceSize": { "w": 78, "h": 72 },
+   "duration": 100
+  },
+  {
+   "filename": "0084.png",
+   "frame": { "x": 74, "y": 143, "w": 70, "h": 72 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 3, "y": 0, "w": 70, "h": 72 },
+   "sourceSize": { "w": 78, "h": 72 },
+   "duration": 100
+  },
+  {
+   "filename": "0085.png",
+   "frame": { "x": 149, "y": 72, "w": 71, "h": 71 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 3, "y": 1, "w": 71, "h": 71 },
+   "sourceSize": { "w": 78, "h": 72 },
+   "duration": 100
+  },
+  {
+   "filename": "0086.png",
+   "frame": { "x": 74, "y": 143, "w": 70, "h": 72 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 3, "y": 0, "w": 70, "h": 72 },
+   "sourceSize": { "w": 78, "h": 72 },
+   "duration": 100
+  },
+  {
+   "filename": "0087.png",
+   "frame": { "x": 149, "y": 72, "w": 71, "h": 71 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 3, "y": 1, "w": 71, "h": 71 },
+   "sourceSize": { "w": 78, "h": 72 },
+   "duration": 100
+  },
+  {
+   "filename": "0088.png",
+   "frame": { "x": 74, "y": 143, "w": 70, "h": 72 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 3, "y": 0, "w": 70, "h": 72 },
+   "sourceSize": { "w": 78, "h": 72 },
+   "duration": 100
+  },
+  {
+   "filename": "0089.png",
+   "frame": { "x": 149, "y": 72, "w": 71, "h": 71 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 3, "y": 1, "w": 71, "h": 71 },
+   "sourceSize": { "w": 78, "h": 72 },
+   "duration": 100
+  },
+  {
+   "filename": "0090.png",
+   "frame": { "x": 148, "y": 282, "w": 70, "h": 70 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 3, "y": 2, "w": 70, "h": 70 },
+   "sourceSize": { "w": 78, "h": 72 },
+   "duration": 100
+  },
+  {
+   "filename": "0091.png",
+   "frame": { "x": 365, "y": 352, "w": 71, "h": 68 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 3, "y": 4, "w": 71, "h": 68 },
+   "sourceSize": { "w": 78, "h": 72 },
+   "duration": 100
+  },
+  {
+   "filename": "0092.png",
+   "frame": { "x": 1, "y": 284, "w": 71, "h": 69 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 3, "y": 3, "w": 71, "h": 69 },
+   "sourceSize": { "w": 78, "h": 72 },
+   "duration": 100
+  },
+  {
+   "filename": "0093.png",
+   "frame": { "x": 145, "y": 144, "w": 73, "h": 69 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 1, "y": 3, "w": 73, "h": 69 },
+   "sourceSize": { "w": 78, "h": 72 },
+   "duration": 100
+  },
+  {
+   "filename": "0094.png",
+   "frame": { "x": 75, "y": 72, "w": 73, "h": 70 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 1, "y": 2, "w": 73, "h": 70 },
+   "sourceSize": { "w": 78, "h": 72 },
+   "duration": 100
+  },
+  {
+   "filename": "0095.png",
+   "frame": { "x": 1, "y": 72, "w": 73, "h": 70 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 1, "y": 2, "w": 73, "h": 70 },
+   "sourceSize": { "w": 78, "h": 72 },
+   "duration": 100
+  },
+  {
+   "filename": "0096.png",
+   "frame": { "x": 451, "y": 1, "w": 73, "h": 70 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 1, "y": 2, "w": 73, "h": 70 },
+   "sourceSize": { "w": 78, "h": 72 },
+   "duration": 100
+  },
+  {
+   "filename": "0097.png",
+   "frame": { "x": 294, "y": 143, "w": 72, "h": 70 },
+   "rotated": false,
+   "trimmed": true,
+   "spriteSourceSize": { "x": 2, "y": 2, "w": 72, "h": 70 },
+   "sourceSize": { "w": 78, "h": 72 },
+   "duration": 100
+  }
+],
+"meta": {
+ "app": "https://www.aseprite.org/",
+ "version": "1.3.13-x64",
+ "image": "780.png",
+ "format": "I8",
+ "size": { "w": 525, "h": 421 },
+ "scale": "1"
+}
 }
diff --git a/public/images/pokemon/exp/shiny/780.png b/public/images/pokemon/exp/shiny/780.png
index cc6cf68a587..4487e9d629c 100644
Binary files a/public/images/pokemon/exp/shiny/780.png and b/public/images/pokemon/exp/shiny/780.png differ
diff --git a/public/images/pokemon/exp/shiny/782.json b/public/images/pokemon/exp/shiny/782.json
deleted file mode 100644
index f06c3d4755e..00000000000
--- a/public/images/pokemon/exp/shiny/782.json
+++ /dev/null
@@ -1,2351 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "782.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 240,
-				"h": 240
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0083.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0111.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0084.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					},
-					"frame": {
-						"x": 0,
-						"y": 52,
-						"w": 48,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0110.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					},
-					"frame": {
-						"x": 0,
-						"y": 52,
-						"w": 48,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0085.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					},
-					"frame": {
-						"x": 0,
-						"y": 104,
-						"w": 48,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0086.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					},
-					"frame": {
-						"x": 0,
-						"y": 156,
-						"w": 48,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 49,
-						"h": 50
-					},
-					"frame": {
-						"x": 48,
-						"y": 0,
-						"w": 49,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 49,
-						"h": 50
-					},
-					"frame": {
-						"x": 48,
-						"y": 0,
-						"w": 49,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0029.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 49,
-						"h": 50
-					},
-					"frame": {
-						"x": 48,
-						"y": 0,
-						"w": 49,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0030.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 49,
-						"h": 50
-					},
-					"frame": {
-						"x": 48,
-						"y": 0,
-						"w": 49,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0045.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 49,
-						"h": 50
-					},
-					"frame": {
-						"x": 48,
-						"y": 0,
-						"w": 49,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0046.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 49,
-						"h": 50
-					},
-					"frame": {
-						"x": 48,
-						"y": 0,
-						"w": 49,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0061.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 49,
-						"h": 50
-					},
-					"frame": {
-						"x": 48,
-						"y": 0,
-						"w": 49,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0062.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 49,
-						"h": 50
-					},
-					"frame": {
-						"x": 48,
-						"y": 0,
-						"w": 49,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0077.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 49,
-						"h": 50
-					},
-					"frame": {
-						"x": 48,
-						"y": 0,
-						"w": 49,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0078.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 49,
-						"h": 50
-					},
-					"frame": {
-						"x": 48,
-						"y": 0,
-						"w": 49,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0089.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					},
-					"frame": {
-						"x": 97,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0090.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					},
-					"frame": {
-						"x": 48,
-						"y": 50,
-						"w": 48,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0091.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					},
-					"frame": {
-						"x": 145,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0108.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					},
-					"frame": {
-						"x": 145,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0087.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 47,
-						"h": 52
-					},
-					"frame": {
-						"x": 193,
-						"y": 0,
-						"w": 47,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0088.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 47,
-						"h": 52
-					},
-					"frame": {
-						"x": 193,
-						"y": 0,
-						"w": 47,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0095.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 47,
-						"h": 52
-					},
-					"frame": {
-						"x": 193,
-						"y": 0,
-						"w": 47,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0096.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 47,
-						"h": 52
-					},
-					"frame": {
-						"x": 193,
-						"y": 0,
-						"w": 47,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0104.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 47,
-						"h": 52
-					},
-					"frame": {
-						"x": 193,
-						"y": 0,
-						"w": 47,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0105.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 47,
-						"h": 52
-					},
-					"frame": {
-						"x": 193,
-						"y": 0,
-						"w": 47,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0092.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					},
-					"frame": {
-						"x": 48,
-						"y": 102,
-						"w": 48,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0099.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					},
-					"frame": {
-						"x": 48,
-						"y": 102,
-						"w": 48,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0100.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					},
-					"frame": {
-						"x": 48,
-						"y": 102,
-						"w": 48,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0093.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					},
-					"frame": {
-						"x": 48,
-						"y": 154,
-						"w": 48,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0094.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					},
-					"frame": {
-						"x": 48,
-						"y": 154,
-						"w": 48,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0101.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					},
-					"frame": {
-						"x": 48,
-						"y": 154,
-						"w": 48,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0102.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					},
-					"frame": {
-						"x": 48,
-						"y": 154,
-						"w": 48,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0103.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					},
-					"frame": {
-						"x": 48,
-						"y": 154,
-						"w": 48,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0097.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					},
-					"frame": {
-						"x": 96,
-						"y": 52,
-						"w": 48,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0098.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					},
-					"frame": {
-						"x": 96,
-						"y": 52,
-						"w": 48,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0106.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					},
-					"frame": {
-						"x": 96,
-						"y": 52,
-						"w": 48,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0107.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					},
-					"frame": {
-						"x": 96,
-						"y": 52,
-						"w": 48,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0109.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 48,
-						"h": 52
-					},
-					"frame": {
-						"x": 144,
-						"y": 52,
-						"w": 48,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 48,
-						"h": 51
-					},
-					"frame": {
-						"x": 192,
-						"y": 52,
-						"w": 48,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 48,
-						"h": 51
-					},
-					"frame": {
-						"x": 192,
-						"y": 52,
-						"w": 48,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 48,
-						"h": 51
-					},
-					"frame": {
-						"x": 192,
-						"y": 52,
-						"w": 48,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 48,
-						"h": 51
-					},
-					"frame": {
-						"x": 192,
-						"y": 52,
-						"w": 48,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0033.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 48,
-						"h": 51
-					},
-					"frame": {
-						"x": 192,
-						"y": 52,
-						"w": 48,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0034.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 48,
-						"h": 51
-					},
-					"frame": {
-						"x": 192,
-						"y": 52,
-						"w": 48,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0049.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 48,
-						"h": 51
-					},
-					"frame": {
-						"x": 192,
-						"y": 52,
-						"w": 48,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0050.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 48,
-						"h": 51
-					},
-					"frame": {
-						"x": 192,
-						"y": 52,
-						"w": 48,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0065.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 48,
-						"h": 51
-					},
-					"frame": {
-						"x": 192,
-						"y": 52,
-						"w": 48,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0066.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 48,
-						"h": 51
-					},
-					"frame": {
-						"x": 192,
-						"y": 52,
-						"w": 48,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0081.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 48,
-						"h": 51
-					},
-					"frame": {
-						"x": 192,
-						"y": 52,
-						"w": 48,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0082.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 48,
-						"h": 51
-					},
-					"frame": {
-						"x": 192,
-						"y": 52,
-						"w": 48,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 48,
-						"h": 51
-					},
-					"frame": {
-						"x": 192,
-						"y": 103,
-						"w": 48,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 48,
-						"h": 51
-					},
-					"frame": {
-						"x": 192,
-						"y": 103,
-						"w": 48,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0031.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 48,
-						"h": 51
-					},
-					"frame": {
-						"x": 192,
-						"y": 103,
-						"w": 48,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0032.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 48,
-						"h": 51
-					},
-					"frame": {
-						"x": 192,
-						"y": 103,
-						"w": 48,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0047.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 48,
-						"h": 51
-					},
-					"frame": {
-						"x": 192,
-						"y": 103,
-						"w": 48,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0048.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 48,
-						"h": 51
-					},
-					"frame": {
-						"x": 192,
-						"y": 103,
-						"w": 48,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0063.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 48,
-						"h": 51
-					},
-					"frame": {
-						"x": 192,
-						"y": 103,
-						"w": 48,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0064.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 48,
-						"h": 51
-					},
-					"frame": {
-						"x": 192,
-						"y": 103,
-						"w": 48,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0079.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 48,
-						"h": 51
-					},
-					"frame": {
-						"x": 192,
-						"y": 103,
-						"w": 48,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0080.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 48,
-						"h": 51
-					},
-					"frame": {
-						"x": 192,
-						"y": 103,
-						"w": 48,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 47,
-						"h": 51
-					},
-					"frame": {
-						"x": 96,
-						"y": 154,
-						"w": 47,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 47,
-						"h": 51
-					},
-					"frame": {
-						"x": 96,
-						"y": 154,
-						"w": 47,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 47,
-						"h": 51
-					},
-					"frame": {
-						"x": 96,
-						"y": 154,
-						"w": 47,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 47,
-						"h": 51
-					},
-					"frame": {
-						"x": 96,
-						"y": 154,
-						"w": 47,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0035.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 47,
-						"h": 51
-					},
-					"frame": {
-						"x": 96,
-						"y": 154,
-						"w": 47,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0036.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 47,
-						"h": 51
-					},
-					"frame": {
-						"x": 96,
-						"y": 154,
-						"w": 47,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0051.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 47,
-						"h": 51
-					},
-					"frame": {
-						"x": 96,
-						"y": 154,
-						"w": 47,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0052.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 47,
-						"h": 51
-					},
-					"frame": {
-						"x": 96,
-						"y": 154,
-						"w": 47,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0067.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 47,
-						"h": 51
-					},
-					"frame": {
-						"x": 96,
-						"y": 154,
-						"w": 47,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0068.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 47,
-						"h": 51
-					},
-					"frame": {
-						"x": 96,
-						"y": 154,
-						"w": 47,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 48,
-						"h": 50
-					},
-					"frame": {
-						"x": 96,
-						"y": 104,
-						"w": 48,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 48,
-						"h": 50
-					},
-					"frame": {
-						"x": 96,
-						"y": 104,
-						"w": 48,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 48,
-						"h": 50
-					},
-					"frame": {
-						"x": 96,
-						"y": 104,
-						"w": 48,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 48,
-						"h": 50
-					},
-					"frame": {
-						"x": 96,
-						"y": 104,
-						"w": 48,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0037.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 48,
-						"h": 50
-					},
-					"frame": {
-						"x": 96,
-						"y": 104,
-						"w": 48,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0038.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 48,
-						"h": 50
-					},
-					"frame": {
-						"x": 96,
-						"y": 104,
-						"w": 48,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0053.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 48,
-						"h": 50
-					},
-					"frame": {
-						"x": 96,
-						"y": 104,
-						"w": 48,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0054.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 48,
-						"h": 50
-					},
-					"frame": {
-						"x": 96,
-						"y": 104,
-						"w": 48,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0069.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 48,
-						"h": 50
-					},
-					"frame": {
-						"x": 96,
-						"y": 104,
-						"w": 48,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0070.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 48,
-						"h": 50
-					},
-					"frame": {
-						"x": 96,
-						"y": 104,
-						"w": 48,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 48,
-						"h": 48
-					},
-					"frame": {
-						"x": 144,
-						"y": 104,
-						"w": 48,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 48,
-						"h": 48
-					},
-					"frame": {
-						"x": 144,
-						"y": 104,
-						"w": 48,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 48,
-						"h": 48
-					},
-					"frame": {
-						"x": 144,
-						"y": 104,
-						"w": 48,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 48,
-						"h": 48
-					},
-					"frame": {
-						"x": 144,
-						"y": 104,
-						"w": 48,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0039.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 48,
-						"h": 48
-					},
-					"frame": {
-						"x": 144,
-						"y": 104,
-						"w": 48,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0040.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 48,
-						"h": 48
-					},
-					"frame": {
-						"x": 144,
-						"y": 104,
-						"w": 48,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0055.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 48,
-						"h": 48
-					},
-					"frame": {
-						"x": 144,
-						"y": 104,
-						"w": 48,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0056.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 48,
-						"h": 48
-					},
-					"frame": {
-						"x": 144,
-						"y": 104,
-						"w": 48,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0071.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 48,
-						"h": 48
-					},
-					"frame": {
-						"x": 144,
-						"y": 104,
-						"w": 48,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0072.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 48,
-						"h": 48
-					},
-					"frame": {
-						"x": 144,
-						"y": 104,
-						"w": 48,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 48,
-						"h": 48
-					},
-					"frame": {
-						"x": 144,
-						"y": 152,
-						"w": 48,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 48,
-						"h": 48
-					},
-					"frame": {
-						"x": 144,
-						"y": 152,
-						"w": 48,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0025.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 48,
-						"h": 48
-					},
-					"frame": {
-						"x": 144,
-						"y": 152,
-						"w": 48,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0026.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 48,
-						"h": 48
-					},
-					"frame": {
-						"x": 144,
-						"y": 152,
-						"w": 48,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0041.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 48,
-						"h": 48
-					},
-					"frame": {
-						"x": 144,
-						"y": 152,
-						"w": 48,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0042.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 48,
-						"h": 48
-					},
-					"frame": {
-						"x": 144,
-						"y": 152,
-						"w": 48,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0057.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 48,
-						"h": 48
-					},
-					"frame": {
-						"x": 144,
-						"y": 152,
-						"w": 48,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0058.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 48,
-						"h": 48
-					},
-					"frame": {
-						"x": 144,
-						"y": 152,
-						"w": 48,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0073.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 48,
-						"h": 48
-					},
-					"frame": {
-						"x": 144,
-						"y": 152,
-						"w": 48,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0074.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 48,
-						"h": 48
-					},
-					"frame": {
-						"x": 144,
-						"y": 152,
-						"w": 48,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 48,
-						"h": 48
-					},
-					"frame": {
-						"x": 192,
-						"y": 154,
-						"w": 48,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 48,
-						"h": 48
-					},
-					"frame": {
-						"x": 192,
-						"y": 154,
-						"w": 48,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0027.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 48,
-						"h": 48
-					},
-					"frame": {
-						"x": 192,
-						"y": 154,
-						"w": 48,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0028.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 48,
-						"h": 48
-					},
-					"frame": {
-						"x": 192,
-						"y": 154,
-						"w": 48,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0043.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 48,
-						"h": 48
-					},
-					"frame": {
-						"x": 192,
-						"y": 154,
-						"w": 48,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0044.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 48,
-						"h": 48
-					},
-					"frame": {
-						"x": 192,
-						"y": 154,
-						"w": 48,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0059.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 48,
-						"h": 48
-					},
-					"frame": {
-						"x": 192,
-						"y": 154,
-						"w": 48,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0060.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 48,
-						"h": 48
-					},
-					"frame": {
-						"x": 192,
-						"y": 154,
-						"w": 48,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0075.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 48,
-						"h": 48
-					},
-					"frame": {
-						"x": 192,
-						"y": 154,
-						"w": 48,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0076.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 49,
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 48,
-						"h": 48
-					},
-					"frame": {
-						"x": 192,
-						"y": 154,
-						"w": 48,
-						"h": 48
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:be0dbbdbd852ebe341842d9712f73e7d:1cd4bec3148a80480f6568f4c8920125:d07862436676aa228a148ee1f1d82a8f$"
-	}
-}
diff --git a/public/images/pokemon/exp/shiny/782.png b/public/images/pokemon/exp/shiny/782.png
deleted file mode 100644
index 5998d9f9d7a..00000000000
Binary files a/public/images/pokemon/exp/shiny/782.png and /dev/null differ
diff --git a/public/images/pokemon/exp/shiny/783.json b/public/images/pokemon/exp/shiny/783.json
deleted file mode 100644
index 440e495598b..00000000000
--- a/public/images/pokemon/exp/shiny/783.json
+++ /dev/null
@@ -1,2204 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "783.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 279,
-				"h": 279
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0077.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 64,
-						"h": 71
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 64,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0082.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 64,
-						"h": 71
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 64,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0087.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 64,
-						"h": 71
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 64,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0092.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 64,
-						"h": 71
-					},
-					"frame": {
-						"x": 64,
-						"y": 0,
-						"w": 64,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0069.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 63,
-						"h": 71
-					},
-					"frame": {
-						"x": 128,
-						"y": 0,
-						"w": 63,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0070.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 63,
-						"h": 71
-					},
-					"frame": {
-						"x": 128,
-						"y": 0,
-						"w": 63,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0071.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 63,
-						"h": 71
-					},
-					"frame": {
-						"x": 191,
-						"y": 0,
-						"w": 63,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0072.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 63,
-						"h": 71
-					},
-					"frame": {
-						"x": 191,
-						"y": 0,
-						"w": 63,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0076.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 63,
-						"h": 71
-					},
-					"frame": {
-						"x": 0,
-						"y": 71,
-						"w": 63,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0081.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 63,
-						"h": 71
-					},
-					"frame": {
-						"x": 0,
-						"y": 71,
-						"w": 63,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0086.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 63,
-						"h": 71
-					},
-					"frame": {
-						"x": 0,
-						"y": 71,
-						"w": 63,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0091.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 63,
-						"h": 71
-					},
-					"frame": {
-						"x": 0,
-						"y": 71,
-						"w": 63,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0078.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 63,
-						"h": 71
-					},
-					"frame": {
-						"x": 63,
-						"y": 71,
-						"w": 63,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0083.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 63,
-						"h": 71
-					},
-					"frame": {
-						"x": 63,
-						"y": 71,
-						"w": 63,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0088.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 63,
-						"h": 71
-					},
-					"frame": {
-						"x": 63,
-						"y": 71,
-						"w": 63,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0093.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 63,
-						"h": 71
-					},
-					"frame": {
-						"x": 126,
-						"y": 71,
-						"w": 63,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0073.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 62,
-						"h": 71
-					},
-					"frame": {
-						"x": 189,
-						"y": 71,
-						"w": 62,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0074.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 62,
-						"h": 71
-					},
-					"frame": {
-						"x": 189,
-						"y": 71,
-						"w": 62,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 63,
-						"h": 70
-					},
-					"frame": {
-						"x": 0,
-						"y": 142,
-						"w": 63,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 63,
-						"h": 70
-					},
-					"frame": {
-						"x": 0,
-						"y": 142,
-						"w": 63,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 63,
-						"h": 70
-					},
-					"frame": {
-						"x": 0,
-						"y": 142,
-						"w": 63,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 63,
-						"h": 70
-					},
-					"frame": {
-						"x": 0,
-						"y": 142,
-						"w": 63,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0037.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 63,
-						"h": 70
-					},
-					"frame": {
-						"x": 0,
-						"y": 142,
-						"w": 63,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0038.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 63,
-						"h": 70
-					},
-					"frame": {
-						"x": 0,
-						"y": 142,
-						"w": 63,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0053.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 63,
-						"h": 70
-					},
-					"frame": {
-						"x": 0,
-						"y": 142,
-						"w": 63,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0054.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 63,
-						"h": 70
-					},
-					"frame": {
-						"x": 0,
-						"y": 142,
-						"w": 63,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0067.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 63,
-						"h": 70
-					},
-					"frame": {
-						"x": 0,
-						"y": 142,
-						"w": 63,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0068.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 63,
-						"h": 70
-					},
-					"frame": {
-						"x": 0,
-						"y": 142,
-						"w": 63,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0094.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 63,
-						"h": 70
-					},
-					"frame": {
-						"x": 0,
-						"y": 142,
-						"w": 63,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0095.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 63,
-						"h": 70
-					},
-					"frame": {
-						"x": 0,
-						"y": 142,
-						"w": 63,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0079.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 62,
-						"h": 71
-					},
-					"frame": {
-						"x": 63,
-						"y": 142,
-						"w": 62,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0084.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 62,
-						"h": 71
-					},
-					"frame": {
-						"x": 63,
-						"y": 142,
-						"w": 62,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0089.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 62,
-						"h": 71
-					},
-					"frame": {
-						"x": 63,
-						"y": 142,
-						"w": 62,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 58,
-						"h": 67
-					},
-					"frame": {
-						"x": 0,
-						"y": 212,
-						"w": 58,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 58,
-						"h": 67
-					},
-					"frame": {
-						"x": 0,
-						"y": 212,
-						"w": 58,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 58,
-						"h": 67
-					},
-					"frame": {
-						"x": 0,
-						"y": 212,
-						"w": 58,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 58,
-						"h": 67
-					},
-					"frame": {
-						"x": 0,
-						"y": 212,
-						"w": 58,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0027.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 58,
-						"h": 67
-					},
-					"frame": {
-						"x": 0,
-						"y": 212,
-						"w": 58,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0028.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 58,
-						"h": 67
-					},
-					"frame": {
-						"x": 0,
-						"y": 212,
-						"w": 58,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0031.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 58,
-						"h": 67
-					},
-					"frame": {
-						"x": 0,
-						"y": 212,
-						"w": 58,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0032.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 58,
-						"h": 67
-					},
-					"frame": {
-						"x": 0,
-						"y": 212,
-						"w": 58,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0043.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 58,
-						"h": 67
-					},
-					"frame": {
-						"x": 0,
-						"y": 212,
-						"w": 58,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0044.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 58,
-						"h": 67
-					},
-					"frame": {
-						"x": 0,
-						"y": 212,
-						"w": 58,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0047.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 58,
-						"h": 67
-					},
-					"frame": {
-						"x": 0,
-						"y": 212,
-						"w": 58,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0048.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 58,
-						"h": 67
-					},
-					"frame": {
-						"x": 0,
-						"y": 212,
-						"w": 58,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0059.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 58,
-						"h": 67
-					},
-					"frame": {
-						"x": 0,
-						"y": 212,
-						"w": 58,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0060.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 58,
-						"h": 67
-					},
-					"frame": {
-						"x": 0,
-						"y": 212,
-						"w": 58,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0063.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 58,
-						"h": 67
-					},
-					"frame": {
-						"x": 0,
-						"y": 212,
-						"w": 58,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0064.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 58,
-						"h": 67
-					},
-					"frame": {
-						"x": 0,
-						"y": 212,
-						"w": 58,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0099.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 58,
-						"h": 67
-					},
-					"frame": {
-						"x": 0,
-						"y": 212,
-						"w": 58,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0100.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 58,
-						"h": 67
-					},
-					"frame": {
-						"x": 0,
-						"y": 212,
-						"w": 58,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0103.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 58,
-						"h": 67
-					},
-					"frame": {
-						"x": 0,
-						"y": 212,
-						"w": 58,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0104.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 58,
-						"h": 67
-					},
-					"frame": {
-						"x": 0,
-						"y": 212,
-						"w": 58,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 62,
-						"h": 69
-					},
-					"frame": {
-						"x": 125,
-						"y": 142,
-						"w": 62,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 62,
-						"h": 69
-					},
-					"frame": {
-						"x": 125,
-						"y": 142,
-						"w": 62,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 62,
-						"h": 69
-					},
-					"frame": {
-						"x": 125,
-						"y": 142,
-						"w": 62,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 62,
-						"h": 69
-					},
-					"frame": {
-						"x": 125,
-						"y": 142,
-						"w": 62,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 62,
-						"h": 69
-					},
-					"frame": {
-						"x": 125,
-						"y": 142,
-						"w": 62,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 62,
-						"h": 69
-					},
-					"frame": {
-						"x": 125,
-						"y": 142,
-						"w": 62,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 62,
-						"h": 69
-					},
-					"frame": {
-						"x": 125,
-						"y": 142,
-						"w": 62,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 62,
-						"h": 69
-					},
-					"frame": {
-						"x": 125,
-						"y": 142,
-						"w": 62,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0035.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 62,
-						"h": 69
-					},
-					"frame": {
-						"x": 125,
-						"y": 142,
-						"w": 62,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0036.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 62,
-						"h": 69
-					},
-					"frame": {
-						"x": 125,
-						"y": 142,
-						"w": 62,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0039.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 62,
-						"h": 69
-					},
-					"frame": {
-						"x": 125,
-						"y": 142,
-						"w": 62,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0040.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 62,
-						"h": 69
-					},
-					"frame": {
-						"x": 125,
-						"y": 142,
-						"w": 62,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0051.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 62,
-						"h": 69
-					},
-					"frame": {
-						"x": 125,
-						"y": 142,
-						"w": 62,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0052.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 62,
-						"h": 69
-					},
-					"frame": {
-						"x": 125,
-						"y": 142,
-						"w": 62,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0055.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 62,
-						"h": 69
-					},
-					"frame": {
-						"x": 125,
-						"y": 142,
-						"w": 62,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0056.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 62,
-						"h": 69
-					},
-					"frame": {
-						"x": 125,
-						"y": 142,
-						"w": 62,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0065.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 62,
-						"h": 69
-					},
-					"frame": {
-						"x": 125,
-						"y": 142,
-						"w": 62,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0066.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 62,
-						"h": 69
-					},
-					"frame": {
-						"x": 125,
-						"y": 142,
-						"w": 62,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0096.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 62,
-						"h": 69
-					},
-					"frame": {
-						"x": 125,
-						"y": 142,
-						"w": 62,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0097.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 62,
-						"h": 69
-					},
-					"frame": {
-						"x": 125,
-						"y": 142,
-						"w": 62,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0075.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 60,
-						"h": 71
-					},
-					"frame": {
-						"x": 187,
-						"y": 142,
-						"w": 60,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0080.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 60,
-						"h": 71
-					},
-					"frame": {
-						"x": 187,
-						"y": 142,
-						"w": 60,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0085.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 60,
-						"h": 71
-					},
-					"frame": {
-						"x": 187,
-						"y": 142,
-						"w": 60,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0090.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 60,
-						"h": 71
-					},
-					"frame": {
-						"x": 187,
-						"y": 142,
-						"w": 60,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 60,
-						"h": 68
-					},
-					"frame": {
-						"x": 125,
-						"y": 211,
-						"w": 60,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 60,
-						"h": 68
-					},
-					"frame": {
-						"x": 125,
-						"y": 211,
-						"w": 60,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 60,
-						"h": 68
-					},
-					"frame": {
-						"x": 125,
-						"y": 211,
-						"w": 60,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 60,
-						"h": 68
-					},
-					"frame": {
-						"x": 125,
-						"y": 211,
-						"w": 60,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 60,
-						"h": 68
-					},
-					"frame": {
-						"x": 125,
-						"y": 211,
-						"w": 60,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 60,
-						"h": 68
-					},
-					"frame": {
-						"x": 125,
-						"y": 211,
-						"w": 60,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0025.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 60,
-						"h": 68
-					},
-					"frame": {
-						"x": 125,
-						"y": 211,
-						"w": 60,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0026.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 60,
-						"h": 68
-					},
-					"frame": {
-						"x": 125,
-						"y": 211,
-						"w": 60,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0033.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 60,
-						"h": 68
-					},
-					"frame": {
-						"x": 125,
-						"y": 211,
-						"w": 60,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0034.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 60,
-						"h": 68
-					},
-					"frame": {
-						"x": 125,
-						"y": 211,
-						"w": 60,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0041.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 60,
-						"h": 68
-					},
-					"frame": {
-						"x": 125,
-						"y": 211,
-						"w": 60,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0042.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 60,
-						"h": 68
-					},
-					"frame": {
-						"x": 125,
-						"y": 211,
-						"w": 60,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0049.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 60,
-						"h": 68
-					},
-					"frame": {
-						"x": 125,
-						"y": 211,
-						"w": 60,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0050.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 60,
-						"h": 68
-					},
-					"frame": {
-						"x": 125,
-						"y": 211,
-						"w": 60,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0057.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 60,
-						"h": 68
-					},
-					"frame": {
-						"x": 125,
-						"y": 211,
-						"w": 60,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0058.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 60,
-						"h": 68
-					},
-					"frame": {
-						"x": 125,
-						"y": 211,
-						"w": 60,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0098.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 60,
-						"h": 68
-					},
-					"frame": {
-						"x": 125,
-						"y": 211,
-						"w": 60,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 55,
-						"h": 65
-					},
-					"frame": {
-						"x": 58,
-						"y": 213,
-						"w": 55,
-						"h": 65
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 55,
-						"h": 65
-					},
-					"frame": {
-						"x": 58,
-						"y": 213,
-						"w": 55,
-						"h": 65
-					}
-				},
-				{
-					"filename": "0029.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 55,
-						"h": 65
-					},
-					"frame": {
-						"x": 58,
-						"y": 213,
-						"w": 55,
-						"h": 65
-					}
-				},
-				{
-					"filename": "0030.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 55,
-						"h": 65
-					},
-					"frame": {
-						"x": 58,
-						"y": 213,
-						"w": 55,
-						"h": 65
-					}
-				},
-				{
-					"filename": "0045.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 55,
-						"h": 65
-					},
-					"frame": {
-						"x": 58,
-						"y": 213,
-						"w": 55,
-						"h": 65
-					}
-				},
-				{
-					"filename": "0046.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 55,
-						"h": 65
-					},
-					"frame": {
-						"x": 58,
-						"y": 213,
-						"w": 55,
-						"h": 65
-					}
-				},
-				{
-					"filename": "0061.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 55,
-						"h": 65
-					},
-					"frame": {
-						"x": 58,
-						"y": 213,
-						"w": 55,
-						"h": 65
-					}
-				},
-				{
-					"filename": "0062.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 55,
-						"h": 65
-					},
-					"frame": {
-						"x": 58,
-						"y": 213,
-						"w": 55,
-						"h": 65
-					}
-				},
-				{
-					"filename": "0101.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 55,
-						"h": 65
-					},
-					"frame": {
-						"x": 58,
-						"y": 213,
-						"w": 55,
-						"h": 65
-					}
-				},
-				{
-					"filename": "0102.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 65,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 55,
-						"h": 65
-					},
-					"frame": {
-						"x": 58,
-						"y": 213,
-						"w": 55,
-						"h": 65
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:0398d2a32d121507cf95d3e4033a4847:6e131e2820d0625f17f5819dbe95feea:aab166e28c744865a0296041224dd01b$"
-	}
-}
diff --git a/public/images/pokemon/exp/shiny/783.png b/public/images/pokemon/exp/shiny/783.png
deleted file mode 100644
index 92ea294de9f..00000000000
Binary files a/public/images/pokemon/exp/shiny/783.png and /dev/null differ
diff --git a/public/images/pokemon/exp/shiny/784.json b/public/images/pokemon/exp/shiny/784.json
deleted file mode 100644
index 0d32fcd217e..00000000000
--- a/public/images/pokemon/exp/shiny/784.json
+++ /dev/null
@@ -1,1826 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "784.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 461,
-				"h": 461
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 96,
-						"h": 88
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 96,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0032.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 96,
-						"h": 88
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 96,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0050.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 96,
-						"h": 88
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 96,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0068.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 96,
-						"h": 88
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 96,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 96,
-						"h": 88
-					},
-					"frame": {
-						"x": 0,
-						"y": 88,
-						"w": 96,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0033.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 96,
-						"h": 88
-					},
-					"frame": {
-						"x": 0,
-						"y": 88,
-						"w": 96,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0051.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 96,
-						"h": 88
-					},
-					"frame": {
-						"x": 0,
-						"y": 88,
-						"w": 96,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0069.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 96,
-						"h": 88
-					},
-					"frame": {
-						"x": 0,
-						"y": 88,
-						"w": 96,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 96,
-						"h": 88
-					},
-					"frame": {
-						"x": 96,
-						"y": 0,
-						"w": 96,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0034.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 96,
-						"h": 88
-					},
-					"frame": {
-						"x": 96,
-						"y": 0,
-						"w": 96,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0052.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 96,
-						"h": 88
-					},
-					"frame": {
-						"x": 96,
-						"y": 0,
-						"w": 96,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0070.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 96,
-						"h": 88
-					},
-					"frame": {
-						"x": 96,
-						"y": 0,
-						"w": 96,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 96,
-						"h": 88
-					},
-					"frame": {
-						"x": 0,
-						"y": 176,
-						"w": 96,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0035.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 96,
-						"h": 88
-					},
-					"frame": {
-						"x": 0,
-						"y": 176,
-						"w": 96,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0053.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 96,
-						"h": 88
-					},
-					"frame": {
-						"x": 0,
-						"y": 176,
-						"w": 96,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0071.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 96,
-						"h": 88
-					},
-					"frame": {
-						"x": 0,
-						"y": 176,
-						"w": 96,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 96,
-						"h": 88
-					},
-					"frame": {
-						"x": 96,
-						"y": 88,
-						"w": 96,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0036.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 96,
-						"h": 88
-					},
-					"frame": {
-						"x": 96,
-						"y": 88,
-						"w": 96,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0054.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 96,
-						"h": 88
-					},
-					"frame": {
-						"x": 96,
-						"y": 88,
-						"w": 96,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0072.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 96,
-						"h": 88
-					},
-					"frame": {
-						"x": 96,
-						"y": 88,
-						"w": 96,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 94,
-						"h": 88
-					},
-					"frame": {
-						"x": 192,
-						"y": 0,
-						"w": 94,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 94,
-						"h": 88
-					},
-					"frame": {
-						"x": 192,
-						"y": 0,
-						"w": 94,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 94,
-						"h": 88
-					},
-					"frame": {
-						"x": 192,
-						"y": 0,
-						"w": 94,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0031.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 94,
-						"h": 88
-					},
-					"frame": {
-						"x": 192,
-						"y": 0,
-						"w": 94,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0037.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 94,
-						"h": 88
-					},
-					"frame": {
-						"x": 192,
-						"y": 0,
-						"w": 94,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0049.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 94,
-						"h": 88
-					},
-					"frame": {
-						"x": 192,
-						"y": 0,
-						"w": 94,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0055.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 94,
-						"h": 88
-					},
-					"frame": {
-						"x": 192,
-						"y": 0,
-						"w": 94,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0067.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 94,
-						"h": 88
-					},
-					"frame": {
-						"x": 192,
-						"y": 0,
-						"w": 94,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0073.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 94,
-						"h": 88
-					},
-					"frame": {
-						"x": 192,
-						"y": 0,
-						"w": 94,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0086.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 94,
-						"h": 88
-					},
-					"frame": {
-						"x": 192,
-						"y": 0,
-						"w": 94,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 92,
-						"h": 89
-					},
-					"frame": {
-						"x": 0,
-						"y": 264,
-						"w": 92,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 92,
-						"h": 89
-					},
-					"frame": {
-						"x": 0,
-						"y": 264,
-						"w": 92,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 92,
-						"h": 89
-					},
-					"frame": {
-						"x": 0,
-						"y": 264,
-						"w": 92,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0029.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 92,
-						"h": 89
-					},
-					"frame": {
-						"x": 0,
-						"y": 264,
-						"w": 92,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0039.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 92,
-						"h": 89
-					},
-					"frame": {
-						"x": 0,
-						"y": 264,
-						"w": 92,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0047.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 92,
-						"h": 89
-					},
-					"frame": {
-						"x": 0,
-						"y": 264,
-						"w": 92,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0057.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 92,
-						"h": 89
-					},
-					"frame": {
-						"x": 0,
-						"y": 264,
-						"w": 92,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0065.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 92,
-						"h": 89
-					},
-					"frame": {
-						"x": 0,
-						"y": 264,
-						"w": 92,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0074.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 92,
-						"h": 89
-					},
-					"frame": {
-						"x": 0,
-						"y": 353,
-						"w": 92,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 92,
-						"h": 88
-					},
-					"frame": {
-						"x": 96,
-						"y": 176,
-						"w": 92,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 92,
-						"h": 88
-					},
-					"frame": {
-						"x": 96,
-						"y": 176,
-						"w": 92,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 92,
-						"h": 88
-					},
-					"frame": {
-						"x": 96,
-						"y": 176,
-						"w": 92,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0030.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 92,
-						"h": 88
-					},
-					"frame": {
-						"x": 96,
-						"y": 176,
-						"w": 92,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0038.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 92,
-						"h": 88
-					},
-					"frame": {
-						"x": 96,
-						"y": 176,
-						"w": 92,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0048.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 92,
-						"h": 88
-					},
-					"frame": {
-						"x": 96,
-						"y": 176,
-						"w": 92,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0056.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 92,
-						"h": 88
-					},
-					"frame": {
-						"x": 96,
-						"y": 176,
-						"w": 92,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0066.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 92,
-						"h": 88
-					},
-					"frame": {
-						"x": 96,
-						"y": 176,
-						"w": 92,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0085.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 92,
-						"h": 89
-					},
-					"frame": {
-						"x": 92,
-						"y": 264,
-						"w": 92,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 90,
-						"h": 90
-					},
-					"frame": {
-						"x": 92,
-						"y": 353,
-						"w": 90,
-						"h": 90
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 90,
-						"h": 90
-					},
-					"frame": {
-						"x": 92,
-						"y": 353,
-						"w": 90,
-						"h": 90
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 90,
-						"h": 90
-					},
-					"frame": {
-						"x": 92,
-						"y": 353,
-						"w": 90,
-						"h": 90
-					}
-				},
-				{
-					"filename": "0028.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 90,
-						"h": 90
-					},
-					"frame": {
-						"x": 92,
-						"y": 353,
-						"w": 90,
-						"h": 90
-					}
-				},
-				{
-					"filename": "0040.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 90,
-						"h": 90
-					},
-					"frame": {
-						"x": 92,
-						"y": 353,
-						"w": 90,
-						"h": 90
-					}
-				},
-				{
-					"filename": "0046.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 90,
-						"h": 90
-					},
-					"frame": {
-						"x": 92,
-						"y": 353,
-						"w": 90,
-						"h": 90
-					}
-				},
-				{
-					"filename": "0058.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 90,
-						"h": 90
-					},
-					"frame": {
-						"x": 92,
-						"y": 353,
-						"w": 90,
-						"h": 90
-					}
-				},
-				{
-					"filename": "0064.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 90,
-						"h": 90
-					},
-					"frame": {
-						"x": 92,
-						"y": 353,
-						"w": 90,
-						"h": 90
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 2,
-						"w": 89,
-						"h": 89
-					},
-					"frame": {
-						"x": 192,
-						"y": 88,
-						"w": 89,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 2,
-						"w": 89,
-						"h": 89
-					},
-					"frame": {
-						"x": 192,
-						"y": 88,
-						"w": 89,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0041.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 2,
-						"w": 89,
-						"h": 89
-					},
-					"frame": {
-						"x": 192,
-						"y": 88,
-						"w": 89,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0059.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 2,
-						"w": 89,
-						"h": 89
-					},
-					"frame": {
-						"x": 192,
-						"y": 88,
-						"w": 89,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 2,
-						"w": 89,
-						"h": 89
-					},
-					"frame": {
-						"x": 286,
-						"y": 0,
-						"w": 89,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0027.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 2,
-						"w": 89,
-						"h": 89
-					},
-					"frame": {
-						"x": 286,
-						"y": 0,
-						"w": 89,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0045.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 2,
-						"w": 89,
-						"h": 89
-					},
-					"frame": {
-						"x": 286,
-						"y": 0,
-						"w": 89,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0063.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 2,
-						"w": 89,
-						"h": 89
-					},
-					"frame": {
-						"x": 286,
-						"y": 0,
-						"w": 89,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0079.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 86,
-						"h": 87
-					},
-					"frame": {
-						"x": 375,
-						"y": 0,
-						"w": 86,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0081.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 86,
-						"h": 87
-					},
-					"frame": {
-						"x": 375,
-						"y": 87,
-						"w": 86,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0075.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 2,
-						"w": 89,
-						"h": 89
-					},
-					"frame": {
-						"x": 188,
-						"y": 177,
-						"w": 89,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0084.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 2,
-						"w": 89,
-						"h": 89
-					},
-					"frame": {
-						"x": 281,
-						"y": 89,
-						"w": 89,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 88,
-						"h": 89
-					},
-					"frame": {
-						"x": 277,
-						"y": 178,
-						"w": 88,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 88,
-						"h": 89
-					},
-					"frame": {
-						"x": 277,
-						"y": 178,
-						"w": 88,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0042.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 88,
-						"h": 89
-					},
-					"frame": {
-						"x": 277,
-						"y": 178,
-						"w": 88,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0060.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 88,
-						"h": 89
-					},
-					"frame": {
-						"x": 277,
-						"y": 178,
-						"w": 88,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 88,
-						"h": 89
-					},
-					"frame": {
-						"x": 184,
-						"y": 266,
-						"w": 88,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0025.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 88,
-						"h": 89
-					},
-					"frame": {
-						"x": 184,
-						"y": 266,
-						"w": 88,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0043.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 88,
-						"h": 89
-					},
-					"frame": {
-						"x": 184,
-						"y": 266,
-						"w": 88,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0061.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 88,
-						"h": 89
-					},
-					"frame": {
-						"x": 184,
-						"y": 266,
-						"w": 88,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 88,
-						"h": 89
-					},
-					"frame": {
-						"x": 182,
-						"y": 355,
-						"w": 88,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0026.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 88,
-						"h": 89
-					},
-					"frame": {
-						"x": 182,
-						"y": 355,
-						"w": 88,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0044.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 88,
-						"h": 89
-					},
-					"frame": {
-						"x": 182,
-						"y": 355,
-						"w": 88,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0062.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 88,
-						"h": 89
-					},
-					"frame": {
-						"x": 182,
-						"y": 355,
-						"w": 88,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0076.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 2,
-						"w": 87,
-						"h": 89
-					},
-					"frame": {
-						"x": 272,
-						"y": 267,
-						"w": 87,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0083.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 2,
-						"w": 87,
-						"h": 89
-					},
-					"frame": {
-						"x": 270,
-						"y": 356,
-						"w": 87,
-						"h": 89
-					}
-				},
-				{
-					"filename": "0077.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 87,
-						"h": 87
-					},
-					"frame": {
-						"x": 359,
-						"y": 267,
-						"w": 87,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0078.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 87,
-						"h": 87
-					},
-					"frame": {
-						"x": 365,
-						"y": 178,
-						"w": 87,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0080.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 87,
-						"h": 87
-					},
-					"frame": {
-						"x": 357,
-						"y": 356,
-						"w": 87,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0082.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 87,
-						"h": 87
-					},
-					"frame": {
-						"x": 357,
-						"y": 356,
-						"w": 87,
-						"h": 87
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:ee5ed94dce71b1b77b0e9e09ac1d01d0:89b096ba9193e9faad415ff12ec9d93c:c2f7ca3ab1075b8c824730653d891244$"
-	}
-}
diff --git a/public/images/pokemon/exp/shiny/784.png b/public/images/pokemon/exp/shiny/784.png
deleted file mode 100644
index 4fe57a70dec..00000000000
Binary files a/public/images/pokemon/exp/shiny/784.png and /dev/null differ
diff --git a/public/images/pokemon/exp/shiny/815-gigantamax.json b/public/images/pokemon/exp/shiny/815-gigantamax.json
new file mode 100644
index 00000000000..d8fb9d62e57
--- /dev/null
+++ b/public/images/pokemon/exp/shiny/815-gigantamax.json
@@ -0,0 +1,659 @@
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 343, "y": 292, "w": 81, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 81, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 357, "y": 1, "w": 86, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 86, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 177, "y": 194, "w": 86, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 4, "w": 86, "h": 94 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 179, "y": 1, "w": 87, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 87, "h": 94 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 85, "y": 292, "w": 82, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 4, "w": 82, "h": 94 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 252, "y": 482, "w": 81, "h": 93 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 81, "h": 93 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 258, "y": 290, "w": 83, "h": 93 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 5, "w": 83, "h": 93 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 416, "y": 484, "w": 79, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 4, "w": 79, "h": 94 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 426, "y": 292, "w": 81, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 3, "w": 81, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 445, "y": 1, "w": 86, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 86, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 179, "y": 97, "w": 86, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 86, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 1, "y": 1, "w": 87, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 87, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 523, "y": 195, "w": 82, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 2, "w": 82, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 509, "y": 292, "w": 81, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 2, "w": 81, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 89, "y": 195, "w": 83, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 83, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 531, "y": 98, "w": 79, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 79, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 343, "y": 292, "w": 81, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 81, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 357, "y": 1, "w": 86, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 86, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 177, "y": 194, "w": 86, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 4, "w": 86, "h": 94 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 179, "y": 1, "w": 87, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 87, "h": 94 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 85, "y": 292, "w": 82, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 4, "w": 82, "h": 94 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 252, "y": 482, "w": 81, "h": 93 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 81, "h": 93 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 258, "y": 290, "w": 83, "h": 93 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 5, "w": 83, "h": 93 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 416, "y": 484, "w": 79, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 4, "w": 79, "h": 94 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 426, "y": 292, "w": 81, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 3, "w": 81, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 445, "y": 1, "w": 86, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 86, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 179, "y": 97, "w": 86, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 86, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 1, "y": 1, "w": 87, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 87, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 523, "y": 195, "w": 82, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 2, "w": 82, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 509, "y": 292, "w": 81, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 2, "w": 81, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 89, "y": 195, "w": 83, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 83, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 531, "y": 98, "w": 79, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 79, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 343, "y": 292, "w": 81, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 81, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 357, "y": 1, "w": 86, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 86, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 177, "y": 194, "w": 86, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 4, "w": 86, "h": 94 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 179, "y": 1, "w": 87, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 87, "h": 94 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 85, "y": 292, "w": 82, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 4, "w": 82, "h": 94 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 252, "y": 482, "w": 81, "h": 93 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 81, "h": 93 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 258, "y": 290, "w": 83, "h": 93 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 5, "w": 83, "h": 93 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 416, "y": 484, "w": 79, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 4, "w": 79, "h": 94 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 426, "y": 292, "w": 81, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 3, "w": 81, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 445, "y": 1, "w": 86, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 86, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 179, "y": 97, "w": 86, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 86, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 1, "y": 1, "w": 87, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 87, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 523, "y": 195, "w": 82, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 2, "w": 82, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 509, "y": 292, "w": 81, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 2, "w": 81, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 89, "y": 195, "w": 83, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 83, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 531, "y": 98, "w": 79, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 79, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 258, "y": 385, "w": 81, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 81, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 267, "y": 97, "w": 86, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 86, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 1, "y": 98, "w": 86, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 86, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 268, "y": 1, "w": 87, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 87, "h": 94 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 426, "y": 389, "w": 82, "h": 93 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 82, "h": 93 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 1, "y": 484, "w": 81, "h": 92 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 6, "w": 81, "h": 92 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 341, "y": 389, "w": 83, "h": 92 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 7, "w": 83, "h": 92 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 84, "y": 485, "w": 79, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 9, "w": 79, "h": 91 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 167, "y": 484, "w": 81, "h": 92 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 7, "w": 81, "h": 92 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 1, "y": 195, "w": 86, "h": 93 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 86, "h": 93 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 265, "y": 194, "w": 86, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 86, "h": 94 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 89, "y": 98, "w": 86, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 86, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 1, "y": 290, "w": 82, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 82, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 1, "y": 387, "w": 81, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 1, "w": 81, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 353, "y": 195, "w": 83, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 0, "w": 83, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 510, "y": 389, "w": 80, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 1, "w": 80, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 169, "y": 387, "w": 81, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 1, "w": 81, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 355, "y": 98, "w": 86, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 1, "w": 86, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 443, "y": 98, "w": 86, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 2, "w": 86, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 90, "y": 1, "w": 87, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 3, "w": 87, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 174, "y": 290, "w": 82, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 82, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 84, "y": 388, "w": 81, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 4, "w": 81, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 438, "y": 195, "w": 83, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 3, "w": 83, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 335, "y": 483, "w": 79, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 2, "w": 79, "h": 95 },
+    "sourceSize": { "w": 100, "h": 100 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.13-x64",
+  "image": "815-gigantamax.png",
+  "format": "I8",
+  "size": { "w": 611, "h": 579 },
+  "scale": "1"
+ }
+}
diff --git a/public/images/pokemon/exp/shiny/815-gigantamax.png b/public/images/pokemon/exp/shiny/815-gigantamax.png
new file mode 100644
index 00000000000..a299119e06f
Binary files /dev/null and b/public/images/pokemon/exp/shiny/815-gigantamax.png differ
diff --git a/public/images/pokemon/exp/shiny/839-gigantamax.json b/public/images/pokemon/exp/shiny/839-gigantamax.json
new file mode 100644
index 00000000000..15a7c122f5d
--- /dev/null
+++ b/public/images/pokemon/exp/shiny/839-gigantamax.json
@@ -0,0 +1,821 @@
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 525, "y": 567, "w": 84, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 0, "w": 84, "h": 96 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 441, "y": 566, "w": 84, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 0, "w": 84, "h": 96 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 609, "y": 567, "w": 83, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 0, "w": 83, "h": 96 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 255, "y": 563, "w": 84, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 0, "w": 84, "h": 96 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 171, "y": 563, "w": 84, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 0, "w": 84, "h": 96 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 0, "y": 569, "w": 83, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 1, "w": 83, "h": 95 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 339, "y": 569, "w": 82, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 1, "w": 82, "h": 95 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 0, "y": 474, "w": 86, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 1, "w": 86, "h": 95 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 464, "y": 375, "w": 89, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 1, "w": 89, "h": 95 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 580, "y": 190, "w": 92, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 92, "h": 95 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 95, "y": 96, "w": 94, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 94, "h": 95 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 198, "y": 95, "w": 95, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 95, "h": 95 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 491, "y": 0, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 96, "h": 95 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 297, "y": 0, "w": 98, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 98, "h": 95 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 0, "y": 0, "w": 100, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 100, "h": 95 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 198, "y": 0, "w": 99, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 99, "h": 95 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 100, "y": 0, "w": 98, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 98, "h": 96 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 395, "y": 0, "w": 96, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 96, "h": 96 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 189, "y": 190, "w": 92, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 0, "w": 92, "h": 96 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 89, "y": 379, "w": 88, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 88, "h": 96 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 525, "y": 567, "w": 84, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 0, "w": 84, "h": 96 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 441, "y": 566, "w": 84, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 0, "w": 84, "h": 96 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 609, "y": 567, "w": 83, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 0, "w": 83, "h": 96 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 255, "y": 563, "w": 84, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 0, "w": 84, "h": 96 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 171, "y": 563, "w": 84, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 0, "w": 84, "h": 96 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 0, "y": 569, "w": 83, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 1, "w": 83, "h": 95 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 339, "y": 569, "w": 82, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 1, "w": 82, "h": 95 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 0, "y": 474, "w": 86, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 1, "w": 86, "h": 95 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 464, "y": 375, "w": 89, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 1, "w": 89, "h": 95 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 580, "y": 190, "w": 92, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 92, "h": 95 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 95, "y": 96, "w": 94, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 94, "h": 95 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 198, "y": 95, "w": 95, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 95, "h": 95 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 491, "y": 0, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 96, "h": 95 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 297, "y": 0, "w": 98, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 98, "h": 95 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 0, "y": 0, "w": 100, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 100, "h": 95 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 198, "y": 0, "w": 99, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 99, "h": 95 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 100, "y": 0, "w": 98, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 98, "h": 96 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 395, "y": 0, "w": 96, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 96, "h": 96 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 189, "y": 190, "w": 92, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 0, "w": 92, "h": 96 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 89, "y": 379, "w": 88, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 88, "h": 96 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 525, "y": 567, "w": 84, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 0, "w": 84, "h": 96 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 441, "y": 566, "w": 84, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 0, "w": 84, "h": 96 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 609, "y": 567, "w": 83, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 0, "w": 83, "h": 96 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 255, "y": 563, "w": 84, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 0, "w": 84, "h": 96 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 171, "y": 563, "w": 84, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 0, "w": 84, "h": 96 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 0, "y": 569, "w": 83, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 1, "w": 83, "h": 95 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 339, "y": 569, "w": 82, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 1, "w": 82, "h": 95 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 0, "y": 474, "w": 86, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 1, "w": 86, "h": 95 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 464, "y": 375, "w": 89, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 1, "w": 89, "h": 95 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 580, "y": 190, "w": 92, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 92, "h": 95 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 95, "y": 96, "w": 94, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 94, "h": 95 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 198, "y": 95, "w": 95, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 95, "h": 95 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 491, "y": 0, "w": 96, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 96, "h": 95 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 297, "y": 0, "w": 98, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 98, "h": 95 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 0, "y": 0, "w": 100, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 100, "h": 95 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 198, "y": 0, "w": 99, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 99, "h": 95 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 100, "y": 0, "w": 98, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 98, "h": 96 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 395, "y": 0, "w": 96, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 96, "h": 96 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 189, "y": 190, "w": 92, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 0, "w": 92, "h": 96 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 89, "y": 379, "w": 88, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 88, "h": 96 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 525, "y": 567, "w": 84, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 0, "w": 84, "h": 96 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 454, "y": 470, "w": 86, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 0, "w": 86, "h": 96 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 0, "y": 379, "w": 89, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 1, "w": 89, "h": 95 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 573, "y": 285, "w": 91, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 1, "w": 91, "h": 95 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 93, "y": 191, "w": 92, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 1, "w": 92, "h": 95 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 390, "y": 96, "w": 94, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 17, "y": 1, "w": 94, "h": 95 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 585, "y": 96, "w": 94, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 17, "y": 2, "w": 94, "h": 94 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 293, "y": 95, "w": 97, "h": 93 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 3, "w": 97, "h": 93 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 484, "y": 190, "w": 96, "h": 92 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 4, "w": 96, "h": 92 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 92, "y": 286, "w": 92, "h": 93 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 3, "w": 92, "h": 93 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 177, "y": 471, "w": 89, "h": 92 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 89, "h": 92 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 177, "y": 379, "w": 91, "h": 92 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 91, "h": 92 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 184, "y": 286, "w": 91, "h": 93 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 91, "h": 93 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 480, "y": 282, "w": 93, "h": 93 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 93, "h": 93 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 281, "y": 281, "w": 93, "h": 93 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 93, "h": 93 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 293, "y": 188, "w": 95, "h": 93 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 95, "h": 93 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 587, "y": 0, "w": 95, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 95, "h": 96 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 0, "y": 95, "w": 95, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 95, "h": 95 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 491, "y": 95, "w": 94, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 94, "h": 95 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 0, "y": 190, "w": 93, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 1, "w": 93, "h": 95 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 388, "y": 191, "w": 92, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 1, "w": 92, "h": 95 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 0, "y": 285, "w": 92, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 2, "w": 92, "h": 94 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 275, "y": 374, "w": 90, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 2, "w": 90, "h": 94 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 374, "y": 286, "w": 90, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 2, "w": 90, "h": 94 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 365, "y": 380, "w": 89, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 2, "w": 89, "h": 94 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 553, "y": 380, "w": 89, "h": 93 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 3, "w": 89, "h": 93 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 540, "y": 473, "w": 87, "h": 94 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 2, "w": 87, "h": 94 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0088.png",
+    "frame": { "x": 268, "y": 468, "w": 87, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 1, "w": 87, "h": 95 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0089.png",
+    "frame": { "x": 355, "y": 474, "w": 86, "h": 95 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 1, "w": 86, "h": 95 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   },
+   {
+    "filename": "0090.png",
+    "frame": { "x": 86, "y": 475, "w": 85, "h": 96 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 0, "w": 85, "h": 96 },
+    "sourceSize": { "w": 111, "h": 96 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.13-x64",
+  "image": "839-gigantamax.png",
+  "format": "I8",
+  "size": { "w": 692, "h": 664 },
+  "scale": "1"
+ }
+}
diff --git a/public/images/pokemon/exp/shiny/839-gigantamax.png b/public/images/pokemon/exp/shiny/839-gigantamax.png
new file mode 100644
index 00000000000..f52de9357b1
Binary files /dev/null and b/public/images/pokemon/exp/shiny/839-gigantamax.png differ
diff --git a/public/images/pokemon/exp/shiny/935.png b/public/images/pokemon/exp/shiny/935.png
deleted file mode 100644
index ce821b4f870..00000000000
Binary files a/public/images/pokemon/exp/shiny/935.png and /dev/null differ
diff --git a/public/images/pokemon/exp/shiny/936.json b/public/images/pokemon/exp/shiny/936.json
deleted file mode 100644
index 550894878b6..00000000000
--- a/public/images/pokemon/exp/shiny/936.json
+++ /dev/null
@@ -1,524 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "936.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 323,
-				"h": 323
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 76,
-						"h": 99
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 76,
-						"h": 99
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 76,
-						"h": 99
-					},
-					"frame": {
-						"x": 0,
-						"y": 99,
-						"w": 76,
-						"h": 99
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 76,
-						"h": 99
-					},
-					"frame": {
-						"x": 0,
-						"y": 198,
-						"w": 76,
-						"h": 99
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 76,
-						"h": 98
-					},
-					"frame": {
-						"x": 76,
-						"y": 0,
-						"w": 76,
-						"h": 98
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 76,
-						"h": 98
-					},
-					"frame": {
-						"x": 152,
-						"y": 0,
-						"w": 76,
-						"h": 98
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 70,
-						"h": 99
-					},
-					"frame": {
-						"x": 228,
-						"y": 0,
-						"w": 70,
-						"h": 99
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 70,
-						"h": 99
-					},
-					"frame": {
-						"x": 76,
-						"y": 98,
-						"w": 70,
-						"h": 99
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 0,
-						"w": 59,
-						"h": 99
-					},
-					"frame": {
-						"x": 146,
-						"y": 98,
-						"w": 59,
-						"h": 99
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 0,
-						"w": 59,
-						"h": 99
-					},
-					"frame": {
-						"x": 146,
-						"y": 98,
-						"w": 59,
-						"h": 99
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 0,
-						"w": 59,
-						"h": 99
-					},
-					"frame": {
-						"x": 146,
-						"y": 98,
-						"w": 59,
-						"h": 99
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 0,
-						"w": 59,
-						"h": 99
-					},
-					"frame": {
-						"x": 76,
-						"y": 197,
-						"w": 59,
-						"h": 99
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 0,
-						"w": 59,
-						"h": 99
-					},
-					"frame": {
-						"x": 76,
-						"y": 197,
-						"w": 59,
-						"h": 99
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 0,
-						"w": 59,
-						"h": 99
-					},
-					"frame": {
-						"x": 76,
-						"y": 197,
-						"w": 59,
-						"h": 99
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 0,
-						"w": 59,
-						"h": 99
-					},
-					"frame": {
-						"x": 76,
-						"y": 197,
-						"w": 59,
-						"h": 99
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 0,
-						"w": 59,
-						"h": 99
-					},
-					"frame": {
-						"x": 135,
-						"y": 197,
-						"w": 59,
-						"h": 99
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 0,
-						"w": 59,
-						"h": 99
-					},
-					"frame": {
-						"x": 135,
-						"y": 197,
-						"w": 59,
-						"h": 99
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 0,
-						"w": 59,
-						"h": 99
-					},
-					"frame": {
-						"x": 135,
-						"y": 197,
-						"w": 59,
-						"h": 99
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 0,
-						"w": 59,
-						"h": 99
-					},
-					"frame": {
-						"x": 194,
-						"y": 197,
-						"w": 59,
-						"h": 99
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 1,
-						"w": 59,
-						"h": 98
-					},
-					"frame": {
-						"x": 205,
-						"y": 99,
-						"w": 59,
-						"h": 98
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 1,
-						"w": 59,
-						"h": 98
-					},
-					"frame": {
-						"x": 205,
-						"y": 99,
-						"w": 59,
-						"h": 98
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 1,
-						"w": 59,
-						"h": 98
-					},
-					"frame": {
-						"x": 205,
-						"y": 99,
-						"w": 59,
-						"h": 98
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 1,
-						"w": 59,
-						"h": 98
-					},
-					"frame": {
-						"x": 205,
-						"y": 99,
-						"w": 59,
-						"h": 98
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 0,
-						"w": 59,
-						"h": 99
-					},
-					"frame": {
-						"x": 264,
-						"y": 99,
-						"w": 59,
-						"h": 99
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 1,
-						"w": 59,
-						"h": 98
-					},
-					"frame": {
-						"x": 253,
-						"y": 198,
-						"w": 59,
-						"h": 98
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:244cdd3e42481041b59c3b67b0c2744d:204f377b772d27af90e7fcb35c29932a:1a0490303f9626f92e787c567cd10feb$"
-	}
-}
diff --git a/public/images/pokemon/exp/shiny/936.png b/public/images/pokemon/exp/shiny/936.png
deleted file mode 100644
index 97856ebb8cc..00000000000
Binary files a/public/images/pokemon/exp/shiny/936.png and /dev/null differ
diff --git a/public/images/pokemon/exp/shiny/937.json b/public/images/pokemon/exp/shiny/937.json
deleted file mode 100644
index be7f920f7cd..00000000000
--- a/public/images/pokemon/exp/shiny/937.json
+++ /dev/null
@@ -1,125 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "937.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 247,
-				"h": 247
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 86,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 83,
-						"h": 98
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 83,
-						"h": 98
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 86,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 81,
-						"h": 99
-					},
-					"frame": {
-						"x": 83,
-						"y": 0,
-						"w": 81,
-						"h": 99
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 86,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 83,
-						"h": 99
-					},
-					"frame": {
-						"x": 164,
-						"y": 0,
-						"w": 83,
-						"h": 99
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 86,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 86,
-						"h": 99
-					},
-					"frame": {
-						"x": 0,
-						"y": 99,
-						"w": 86,
-						"h": 99
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 86,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 86,
-						"h": 99
-					},
-					"frame": {
-						"x": 86,
-						"y": 99,
-						"w": 86,
-						"h": 99
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:d042040d151bc1a4b99bc43297e01fa6:d31a38624e1e937eaab1670f078bcfd7:1d4b4f8d62307c37457ba974879b47d0$"
-	}
-}
diff --git a/public/images/pokemon/exp/shiny/937.png b/public/images/pokemon/exp/shiny/937.png
deleted file mode 100644
index fbf34a76cc2..00000000000
Binary files a/public/images/pokemon/exp/shiny/937.png and /dev/null differ
diff --git a/public/images/pokemon/exp/back/shiny/707.json b/public/images/pokemon/exp/shiny/female/6215.json
similarity index 62%
rename from public/images/pokemon/exp/back/shiny/707.json
rename to public/images/pokemon/exp/shiny/female/6215.json
index 384c57d4102..8c8b4e0cf73 100644
--- a/public/images/pokemon/exp/back/shiny/707.json
+++ b/public/images/pokemon/exp/shiny/female/6215.json
@@ -1,2007 +1,33 @@
 {
 	"textures": [
 		{
-			"image": "707.png",
+			"image": "6215.png",
 			"format": "RGBA8888",
 			"size": {
-				"w": 286,
-				"h": 286
+				"w": 230,
+				"h": 230
 			},
 			"scale": 1,
 			"frames": [
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 1,
-						"w": 38,
-						"h": 72
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 38,
-						"h": 72
-					}
-				},
-				{
-					"filename": "0039.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 1,
-						"w": 38,
-						"h": 72
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 38,
-						"h": 72
-					}
-				},
-				{
-					"filename": "0067.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 1,
-						"w": 38,
-						"h": 72
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 38,
-						"h": 72
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 2,
-						"w": 38,
-						"h": 72
-					},
-					"frame": {
-						"x": 0,
-						"y": 72,
-						"w": 38,
-						"h": 72
-					}
-				},
-				{
-					"filename": "0040.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 2,
-						"w": 38,
-						"h": 72
-					},
-					"frame": {
-						"x": 0,
-						"y": 72,
-						"w": 38,
-						"h": 72
-					}
-				},
-				{
-					"filename": "0068.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 2,
-						"w": 38,
-						"h": 72
-					},
-					"frame": {
-						"x": 0,
-						"y": 72,
-						"w": 38,
-						"h": 72
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 2,
-						"w": 38,
-						"h": 72
-					},
-					"frame": {
-						"x": 0,
-						"y": 144,
-						"w": 38,
-						"h": 72
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 38,
-						"h": 72
-					},
-					"frame": {
-						"x": 0,
-						"y": 144,
-						"w": 38,
-						"h": 72
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 38,
-						"h": 72
-					},
-					"frame": {
-						"x": 0,
-						"y": 144,
-						"w": 38,
-						"h": 72
-					}
-				},
-				{
-					"filename": "0046.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 2,
-						"w": 38,
-						"h": 72
-					},
-					"frame": {
-						"x": 0,
-						"y": 144,
-						"w": 38,
-						"h": 72
-					}
-				},
-				{
-					"filename": "0047.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 38,
-						"h": 72
-					},
-					"frame": {
-						"x": 0,
-						"y": 144,
-						"w": 38,
-						"h": 72
-					}
-				},
-				{
-					"filename": "0048.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 38,
-						"h": 72
-					},
-					"frame": {
-						"x": 0,
-						"y": 144,
-						"w": 38,
-						"h": 72
-					}
-				},
-				{
-					"filename": "0074.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 2,
-						"w": 38,
-						"h": 72
-					},
-					"frame": {
-						"x": 0,
-						"y": 144,
-						"w": 38,
-						"h": 72
-					}
-				},
-				{
-					"filename": "0075.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 38,
-						"h": 72
-					},
-					"frame": {
-						"x": 0,
-						"y": 144,
-						"w": 38,
-						"h": 72
-					}
-				},
-				{
-					"filename": "0076.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 38,
-						"h": 72
-					},
-					"frame": {
-						"x": 0,
-						"y": 144,
-						"w": 38,
-						"h": 72
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 42,
-						"h": 70
-					},
-					"frame": {
-						"x": 0,
-						"y": 216,
-						"w": 42,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0028.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 42,
-						"h": 70
-					},
-					"frame": {
-						"x": 0,
-						"y": 216,
-						"w": 42,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0029.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 42,
-						"h": 70
-					},
-					"frame": {
-						"x": 0,
-						"y": 216,
-						"w": 42,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0056.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 42,
-						"h": 70
-					},
-					"frame": {
-						"x": 0,
-						"y": 216,
-						"w": 42,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0057.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 42,
-						"h": 70
-					},
-					"frame": {
-						"x": 0,
-						"y": 216,
-						"w": 42,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0084.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 42,
-						"h": 70
-					},
-					"frame": {
-						"x": 0,
-						"y": 216,
-						"w": 42,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0091.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 38,
-						"h": 72
-					},
-					"frame": {
-						"x": 38,
-						"y": 0,
-						"w": 38,
-						"h": 72
-					}
-				},
-				{
-					"filename": "0095.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 38,
-						"h": 72
-					},
-					"frame": {
-						"x": 38,
-						"y": 0,
-						"w": 38,
-						"h": 72
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 11,
-						"y": 0,
-						"w": 37,
-						"h": 72
-					},
-					"frame": {
-						"x": 38,
-						"y": 72,
-						"w": 37,
-						"h": 72
-					}
-				},
-				{
-					"filename": "0038.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 11,
-						"y": 0,
-						"w": 37,
-						"h": 72
-					},
-					"frame": {
-						"x": 38,
-						"y": 72,
-						"w": 37,
-						"h": 72
-					}
-				},
-				{
-					"filename": "0066.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 11,
-						"y": 0,
-						"w": 37,
-						"h": 72
-					},
-					"frame": {
-						"x": 38,
-						"y": 72,
-						"w": 37,
-						"h": 72
-					}
-				},
-				{
-					"filename": "0025.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 39,
-						"h": 71
-					},
-					"frame": {
-						"x": 38,
-						"y": 144,
-						"w": 39,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0053.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 39,
-						"h": 71
-					},
-					"frame": {
-						"x": 38,
-						"y": 144,
-						"w": 39,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0081.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 39,
-						"h": 71
-					},
-					"frame": {
-						"x": 38,
-						"y": 144,
-						"w": 39,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 3,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 42,
-						"y": 215,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 42,
-						"y": 215,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0041.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 3,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 42,
-						"y": 215,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0045.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 42,
-						"y": 215,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0069.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 3,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 42,
-						"y": 215,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0073.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 42,
-						"y": 215,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 3,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 75,
-						"y": 72,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 3,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 75,
-						"y": 72,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0042.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 3,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 75,
-						"y": 72,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0044.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 3,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 75,
-						"y": 72,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0070.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 3,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 75,
-						"y": 72,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0072.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 3,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 75,
-						"y": 72,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 3,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 77,
-						"y": 143,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0043.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 3,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 77,
-						"y": 143,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0071.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 3,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 77,
-						"y": 143,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 80,
-						"y": 214,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 80,
-						"y": 214,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0049.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 80,
-						"y": 214,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0050.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 80,
-						"y": 214,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0077.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 80,
-						"y": 214,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0078.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 80,
-						"y": 214,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 76,
-						"y": 0,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0051.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 76,
-						"y": 0,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0079.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 76,
-						"y": 0,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 113,
-						"y": 71,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0052.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 113,
-						"y": 71,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0080.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 113,
-						"y": 71,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 42,
-						"h": 70
-					},
-					"frame": {
-						"x": 114,
-						"y": 0,
-						"w": 42,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0030.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 42,
-						"h": 70
-					},
-					"frame": {
-						"x": 114,
-						"y": 0,
-						"w": 42,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0058.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 42,
-						"h": 70
-					},
-					"frame": {
-						"x": 114,
-						"y": 0,
-						"w": 42,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0085.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 42,
-						"h": 70
-					},
-					"frame": {
-						"x": 115,
-						"y": 142,
-						"w": 42,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0027.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 41,
-						"h": 70
-					},
-					"frame": {
-						"x": 151,
-						"y": 70,
-						"w": 41,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0055.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 41,
-						"h": 70
-					},
-					"frame": {
-						"x": 151,
-						"y": 70,
-						"w": 41,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0083.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 41,
-						"h": 70
-					},
-					"frame": {
-						"x": 151,
-						"y": 70,
-						"w": 41,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0026.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 40,
-						"h": 70
-					},
-					"frame": {
-						"x": 156,
-						"y": 0,
-						"w": 40,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0054.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 40,
-						"h": 70
-					},
-					"frame": {
-						"x": 156,
-						"y": 0,
-						"w": 40,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0082.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 40,
-						"h": 70
-					},
-					"frame": {
-						"x": 156,
-						"y": 0,
-						"w": 40,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 0,
-						"w": 38,
-						"h": 70
-					},
-					"frame": {
-						"x": 118,
-						"y": 212,
-						"w": 38,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0037.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 0,
-						"w": 38,
-						"h": 70
-					},
-					"frame": {
-						"x": 118,
-						"y": 212,
-						"w": 38,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0065.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 0,
-						"w": 38,
-						"h": 70
-					},
-					"frame": {
-						"x": 118,
-						"y": 212,
-						"w": 38,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 44,
-						"h": 69
-					},
-					"frame": {
-						"x": 156,
-						"y": 212,
-						"w": 44,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0033.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 44,
-						"h": 69
-					},
-					"frame": {
-						"x": 156,
-						"y": 212,
-						"w": 44,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0061.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 44,
-						"h": 69
-					},
-					"frame": {
-						"x": 156,
-						"y": 212,
-						"w": 44,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 43,
-						"h": 69
-					},
-					"frame": {
-						"x": 157,
-						"y": 140,
-						"w": 43,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0031.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 43,
-						"h": 69
-					},
-					"frame": {
-						"x": 157,
-						"y": 140,
-						"w": 43,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0059.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 43,
-						"h": 69
-					},
-					"frame": {
-						"x": 157,
-						"y": 140,
-						"w": 43,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 43,
-						"h": 69
-					},
-					"frame": {
-						"x": 192,
-						"y": 70,
-						"w": 43,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0032.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 43,
-						"h": 69
-					},
-					"frame": {
-						"x": 192,
-						"y": 70,
-						"w": 43,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0060.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 43,
-						"h": 69
-					},
-					"frame": {
-						"x": 192,
-						"y": 70,
-						"w": 43,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0090.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 43,
-						"h": 69
-					},
-					"frame": {
-						"x": 192,
-						"y": 70,
-						"w": 43,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0092.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 43,
-						"h": 69
-					},
-					"frame": {
-						"x": 192,
-						"y": 70,
-						"w": 43,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0094.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 43,
-						"h": 69
-					},
-					"frame": {
-						"x": 192,
-						"y": 70,
-						"w": 43,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0096.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 43,
-						"h": 69
-					},
-					"frame": {
-						"x": 192,
-						"y": 70,
-						"w": 43,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0097.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 43,
-						"h": 69
-					},
-					"frame": {
-						"x": 192,
-						"y": 70,
-						"w": 43,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 0,
-						"w": 43,
-						"h": 69
-					},
-					"frame": {
-						"x": 196,
-						"y": 0,
-						"w": 43,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0034.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 0,
-						"w": 43,
-						"h": 69
-					},
-					"frame": {
-						"x": 196,
-						"y": 0,
-						"w": 43,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0062.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 0,
-						"w": 43,
-						"h": 69
-					},
-					"frame": {
-						"x": 196,
-						"y": 0,
-						"w": 43,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0086.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 43,
-						"h": 69
-					},
-					"frame": {
-						"x": 239,
-						"y": 0,
-						"w": 43,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0098.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 43,
-						"h": 69
-					},
-					"frame": {
-						"x": 239,
-						"y": 0,
-						"w": 43,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0087.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 43,
-						"h": 69
-					},
-					"frame": {
-						"x": 235,
-						"y": 69,
-						"w": 43,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0088.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 43,
-						"h": 69
-					},
-					"frame": {
-						"x": 235,
-						"y": 69,
-						"w": 43,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0089.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 42,
-						"h": 69
-					},
-					"frame": {
-						"x": 235,
-						"y": 138,
-						"w": 42,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0093.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 42,
-						"h": 69
-					},
-					"frame": {
-						"x": 235,
-						"y": 138,
-						"w": 42,
-						"h": 69
-					}
-				},
 				{
 					"filename": "0007.png",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 48,
-						"h": 74
+						"w": 56,
+						"h": 54
 					},
 					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 41,
-						"h": 69
+						"x": 1,
+						"y": 1,
+						"w": 55,
+						"h": 50
 					},
 					"frame": {
-						"x": 200,
-						"y": 207,
-						"w": 41,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0035.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
+						"x": 0,
 						"y": 0,
-						"w": 41,
-						"h": 69
-					},
-					"frame": {
-						"x": 200,
-						"y": 207,
-						"w": 41,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0063.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 48,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 41,
-						"h": 69
-					},
-					"frame": {
-						"x": 200,
-						"y": 207,
-						"w": 41,
-						"h": 69
+						"w": 55,
+						"h": 50
 					}
 				},
 				{
@@ -2009,20 +35,1175 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 48,
-						"h": 74
+						"w": 56,
+						"h": 54
 					},
 					"spriteSourceSize": {
-						"x": 8,
-						"y": 0,
-						"w": 40,
-						"h": 69
+						"x": 1,
+						"y": 1,
+						"w": 55,
+						"h": 50
 					},
 					"frame": {
-						"x": 241,
-						"y": 207,
-						"w": 40,
-						"h": 69
+						"x": 0,
+						"y": 0,
+						"w": 55,
+						"h": 50
+					}
+				},
+				{
+					"filename": "0019.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 1,
+						"w": 55,
+						"h": 50
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 55,
+						"h": 50
+					}
+				},
+				{
+					"filename": "0020.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 1,
+						"w": 55,
+						"h": 50
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 55,
+						"h": 50
+					}
+				},
+				{
+					"filename": "0031.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 1,
+						"w": 55,
+						"h": 50
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 55,
+						"h": 50
+					}
+				},
+				{
+					"filename": "0032.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 1,
+						"w": 55,
+						"h": 50
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 55,
+						"h": 50
+					}
+				},
+				{
+					"filename": "0043.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 1,
+						"w": 55,
+						"h": 50
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 55,
+						"h": 50
+					}
+				},
+				{
+					"filename": "0044.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 1,
+						"w": 55,
+						"h": 50
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 55,
+						"h": 50
+					}
+				},
+				{
+					"filename": "0055.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 1,
+						"w": 55,
+						"h": 50
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 55,
+						"h": 50
+					}
+				},
+				{
+					"filename": "0056.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 1,
+						"w": 55,
+						"h": 50
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 55,
+						"h": 50
+					}
+				},
+				{
+					"filename": "0067.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 1,
+						"w": 55,
+						"h": 50
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 55,
+						"h": 50
+					}
+				},
+				{
+					"filename": "0068.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 1,
+						"w": 55,
+						"h": 50
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 55,
+						"h": 50
+					}
+				},
+				{
+					"filename": "0079.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 1,
+						"w": 55,
+						"h": 50
+					},
+					"frame": {
+						"x": 0,
+						"y": 50,
+						"w": 55,
+						"h": 50
+					}
+				},
+				{
+					"filename": "0080.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 1,
+						"w": 55,
+						"h": 50
+					},
+					"frame": {
+						"x": 0,
+						"y": 50,
+						"w": 55,
+						"h": 50
+					}
+				},
+				{
+					"filename": "0003.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 0,
+						"w": 52,
+						"h": 51
+					},
+					"frame": {
+						"x": 55,
+						"y": 0,
+						"w": 52,
+						"h": 51
+					}
+				},
+				{
+					"filename": "0004.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 0,
+						"w": 52,
+						"h": 51
+					},
+					"frame": {
+						"x": 55,
+						"y": 0,
+						"w": 52,
+						"h": 51
+					}
+				},
+				{
+					"filename": "0023.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 0,
+						"w": 52,
+						"h": 51
+					},
+					"frame": {
+						"x": 55,
+						"y": 0,
+						"w": 52,
+						"h": 51
+					}
+				},
+				{
+					"filename": "0024.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 0,
+						"w": 52,
+						"h": 51
+					},
+					"frame": {
+						"x": 55,
+						"y": 0,
+						"w": 52,
+						"h": 51
+					}
+				},
+				{
+					"filename": "0027.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 0,
+						"w": 52,
+						"h": 51
+					},
+					"frame": {
+						"x": 55,
+						"y": 0,
+						"w": 52,
+						"h": 51
+					}
+				},
+				{
+					"filename": "0028.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 0,
+						"w": 52,
+						"h": 51
+					},
+					"frame": {
+						"x": 55,
+						"y": 0,
+						"w": 52,
+						"h": 51
+					}
+				},
+				{
+					"filename": "0047.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 0,
+						"w": 52,
+						"h": 51
+					},
+					"frame": {
+						"x": 55,
+						"y": 0,
+						"w": 52,
+						"h": 51
+					}
+				},
+				{
+					"filename": "0048.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 0,
+						"w": 52,
+						"h": 51
+					},
+					"frame": {
+						"x": 55,
+						"y": 0,
+						"w": 52,
+						"h": 51
+					}
+				},
+				{
+					"filename": "0051.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 0,
+						"w": 52,
+						"h": 51
+					},
+					"frame": {
+						"x": 55,
+						"y": 0,
+						"w": 52,
+						"h": 51
+					}
+				},
+				{
+					"filename": "0052.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 0,
+						"w": 52,
+						"h": 51
+					},
+					"frame": {
+						"x": 55,
+						"y": 0,
+						"w": 52,
+						"h": 51
+					}
+				},
+				{
+					"filename": "0071.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 0,
+						"w": 52,
+						"h": 51
+					},
+					"frame": {
+						"x": 55,
+						"y": 0,
+						"w": 52,
+						"h": 51
+					}
+				},
+				{
+					"filename": "0072.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 0,
+						"w": 52,
+						"h": 51
+					},
+					"frame": {
+						"x": 55,
+						"y": 0,
+						"w": 52,
+						"h": 51
+					}
+				},
+				{
+					"filename": "0075.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 0,
+						"w": 52,
+						"h": 51
+					},
+					"frame": {
+						"x": 55,
+						"y": 0,
+						"w": 52,
+						"h": 51
+					}
+				},
+				{
+					"filename": "0076.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 0,
+						"w": 52,
+						"h": 51
+					},
+					"frame": {
+						"x": 55,
+						"y": 0,
+						"w": 52,
+						"h": 51
+					}
+				},
+				{
+					"filename": "0005.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 1,
+						"w": 53,
+						"h": 50
+					},
+					"frame": {
+						"x": 0,
+						"y": 100,
+						"w": 53,
+						"h": 50
+					}
+				},
+				{
+					"filename": "0006.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 1,
+						"w": 53,
+						"h": 50
+					},
+					"frame": {
+						"x": 0,
+						"y": 100,
+						"w": 53,
+						"h": 50
+					}
+				},
+				{
+					"filename": "0021.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 1,
+						"w": 53,
+						"h": 50
+					},
+					"frame": {
+						"x": 0,
+						"y": 100,
+						"w": 53,
+						"h": 50
+					}
+				},
+				{
+					"filename": "0022.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 1,
+						"w": 53,
+						"h": 50
+					},
+					"frame": {
+						"x": 0,
+						"y": 100,
+						"w": 53,
+						"h": 50
+					}
+				},
+				{
+					"filename": "0029.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 1,
+						"w": 53,
+						"h": 50
+					},
+					"frame": {
+						"x": 0,
+						"y": 100,
+						"w": 53,
+						"h": 50
+					}
+				},
+				{
+					"filename": "0030.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 1,
+						"w": 53,
+						"h": 50
+					},
+					"frame": {
+						"x": 0,
+						"y": 100,
+						"w": 53,
+						"h": 50
+					}
+				},
+				{
+					"filename": "0045.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 1,
+						"w": 53,
+						"h": 50
+					},
+					"frame": {
+						"x": 0,
+						"y": 100,
+						"w": 53,
+						"h": 50
+					}
+				},
+				{
+					"filename": "0046.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 1,
+						"w": 53,
+						"h": 50
+					},
+					"frame": {
+						"x": 0,
+						"y": 100,
+						"w": 53,
+						"h": 50
+					}
+				},
+				{
+					"filename": "0069.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 1,
+						"w": 53,
+						"h": 50
+					},
+					"frame": {
+						"x": 0,
+						"y": 100,
+						"w": 53,
+						"h": 50
+					}
+				},
+				{
+					"filename": "0070.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 1,
+						"w": 53,
+						"h": 50
+					},
+					"frame": {
+						"x": 0,
+						"y": 100,
+						"w": 53,
+						"h": 50
+					}
+				},
+				{
+					"filename": "0077.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 1,
+						"w": 53,
+						"h": 50
+					},
+					"frame": {
+						"x": 0,
+						"y": 100,
+						"w": 53,
+						"h": 50
+					}
+				},
+				{
+					"filename": "0078.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 1,
+						"w": 53,
+						"h": 50
+					},
+					"frame": {
+						"x": 0,
+						"y": 100,
+						"w": 53,
+						"h": 50
+					}
+				},
+				{
+					"filename": "0009.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 2,
+						"w": 54,
+						"h": 49
+					},
+					"frame": {
+						"x": 107,
+						"y": 0,
+						"w": 54,
+						"h": 49
+					}
+				},
+				{
+					"filename": "0010.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 2,
+						"w": 54,
+						"h": 49
+					},
+					"frame": {
+						"x": 107,
+						"y": 0,
+						"w": 54,
+						"h": 49
+					}
+				},
+				{
+					"filename": "0017.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 2,
+						"w": 54,
+						"h": 49
+					},
+					"frame": {
+						"x": 107,
+						"y": 0,
+						"w": 54,
+						"h": 49
+					}
+				},
+				{
+					"filename": "0018.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 2,
+						"w": 54,
+						"h": 49
+					},
+					"frame": {
+						"x": 107,
+						"y": 0,
+						"w": 54,
+						"h": 49
+					}
+				},
+				{
+					"filename": "0033.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 2,
+						"w": 54,
+						"h": 49
+					},
+					"frame": {
+						"x": 107,
+						"y": 0,
+						"w": 54,
+						"h": 49
+					}
+				},
+				{
+					"filename": "0034.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 2,
+						"w": 54,
+						"h": 49
+					},
+					"frame": {
+						"x": 107,
+						"y": 0,
+						"w": 54,
+						"h": 49
+					}
+				},
+				{
+					"filename": "0041.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 2,
+						"w": 54,
+						"h": 49
+					},
+					"frame": {
+						"x": 107,
+						"y": 0,
+						"w": 54,
+						"h": 49
+					}
+				},
+				{
+					"filename": "0042.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 2,
+						"w": 54,
+						"h": 49
+					},
+					"frame": {
+						"x": 107,
+						"y": 0,
+						"w": 54,
+						"h": 49
+					}
+				},
+				{
+					"filename": "0057.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 2,
+						"w": 54,
+						"h": 49
+					},
+					"frame": {
+						"x": 107,
+						"y": 0,
+						"w": 54,
+						"h": 49
+					}
+				},
+				{
+					"filename": "0058.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 2,
+						"w": 54,
+						"h": 49
+					},
+					"frame": {
+						"x": 107,
+						"y": 0,
+						"w": 54,
+						"h": 49
+					}
+				},
+				{
+					"filename": "0065.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 2,
+						"w": 54,
+						"h": 49
+					},
+					"frame": {
+						"x": 107,
+						"y": 0,
+						"w": 54,
+						"h": 49
+					}
+				},
+				{
+					"filename": "0066.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 2,
+						"w": 54,
+						"h": 49
+					},
+					"frame": {
+						"x": 107,
+						"y": 0,
+						"w": 54,
+						"h": 49
+					}
+				},
+				{
+					"filename": "0011.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 2,
+						"w": 54,
+						"h": 49
+					},
+					"frame": {
+						"x": 161,
+						"y": 0,
+						"w": 54,
+						"h": 49
+					}
+				},
+				{
+					"filename": "0012.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 2,
+						"w": 54,
+						"h": 49
+					},
+					"frame": {
+						"x": 161,
+						"y": 0,
+						"w": 54,
+						"h": 49
+					}
+				},
+				{
+					"filename": "0015.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 2,
+						"w": 54,
+						"h": 49
+					},
+					"frame": {
+						"x": 161,
+						"y": 0,
+						"w": 54,
+						"h": 49
+					}
+				},
+				{
+					"filename": "0016.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 2,
+						"w": 54,
+						"h": 49
+					},
+					"frame": {
+						"x": 161,
+						"y": 0,
+						"w": 54,
+						"h": 49
+					}
+				},
+				{
+					"filename": "0035.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 2,
+						"w": 54,
+						"h": 49
+					},
+					"frame": {
+						"x": 161,
+						"y": 0,
+						"w": 54,
+						"h": 49
 					}
 				},
 				{
@@ -2030,20 +1211,125 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 48,
-						"h": 74
+						"w": 56,
+						"h": 54
 					},
 					"spriteSourceSize": {
-						"x": 8,
-						"y": 0,
-						"w": 40,
-						"h": 69
+						"x": 2,
+						"y": 2,
+						"w": 54,
+						"h": 49
 					},
 					"frame": {
-						"x": 241,
-						"y": 207,
-						"w": 40,
-						"h": 69
+						"x": 161,
+						"y": 0,
+						"w": 54,
+						"h": 49
+					}
+				},
+				{
+					"filename": "0039.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 2,
+						"w": 54,
+						"h": 49
+					},
+					"frame": {
+						"x": 161,
+						"y": 0,
+						"w": 54,
+						"h": 49
+					}
+				},
+				{
+					"filename": "0040.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 2,
+						"w": 54,
+						"h": 49
+					},
+					"frame": {
+						"x": 161,
+						"y": 0,
+						"w": 54,
+						"h": 49
+					}
+				},
+				{
+					"filename": "0059.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 2,
+						"w": 54,
+						"h": 49
+					},
+					"frame": {
+						"x": 161,
+						"y": 0,
+						"w": 54,
+						"h": 49
+					}
+				},
+				{
+					"filename": "0060.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 2,
+						"w": 54,
+						"h": 49
+					},
+					"frame": {
+						"x": 161,
+						"y": 0,
+						"w": 54,
+						"h": 49
+					}
+				},
+				{
+					"filename": "0063.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 2,
+						"w": 54,
+						"h": 49
+					},
+					"frame": {
+						"x": 161,
+						"y": 0,
+						"w": 54,
+						"h": 49
 					}
 				},
 				{
@@ -2051,20 +1337,734 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 48,
-						"h": 74
+						"w": 56,
+						"h": 54
 					},
 					"spriteSourceSize": {
-						"x": 8,
-						"y": 0,
-						"w": 40,
-						"h": 69
+						"x": 2,
+						"y": 2,
+						"w": 54,
+						"h": 49
 					},
 					"frame": {
-						"x": 241,
-						"y": 207,
-						"w": 40,
-						"h": 69
+						"x": 161,
+						"y": 0,
+						"w": 54,
+						"h": 49
+					}
+				},
+				{
+					"filename": "0053.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 1,
+						"w": 53,
+						"h": 50
+					},
+					"frame": {
+						"x": 0,
+						"y": 150,
+						"w": 53,
+						"h": 50
+					}
+				},
+				{
+					"filename": "0054.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 1,
+						"w": 53,
+						"h": 50
+					},
+					"frame": {
+						"x": 0,
+						"y": 150,
+						"w": 53,
+						"h": 50
+					}
+				},
+				{
+					"filename": "0081.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 1,
+						"w": 53,
+						"h": 50
+					},
+					"frame": {
+						"x": 55,
+						"y": 51,
+						"w": 53,
+						"h": 50
+					}
+				},
+				{
+					"filename": "0082.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 1,
+						"w": 53,
+						"h": 50
+					},
+					"frame": {
+						"x": 55,
+						"y": 51,
+						"w": 53,
+						"h": 50
+					}
+				},
+				{
+					"filename": "0013.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 3,
+						"w": 54,
+						"h": 48
+					},
+					"frame": {
+						"x": 53,
+						"y": 101,
+						"w": 54,
+						"h": 48
+					}
+				},
+				{
+					"filename": "0014.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 3,
+						"w": 54,
+						"h": 48
+					},
+					"frame": {
+						"x": 53,
+						"y": 101,
+						"w": 54,
+						"h": 48
+					}
+				},
+				{
+					"filename": "0037.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 3,
+						"w": 54,
+						"h": 48
+					},
+					"frame": {
+						"x": 53,
+						"y": 101,
+						"w": 54,
+						"h": 48
+					}
+				},
+				{
+					"filename": "0038.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 3,
+						"w": 54,
+						"h": 48
+					},
+					"frame": {
+						"x": 53,
+						"y": 101,
+						"w": 54,
+						"h": 48
+					}
+				},
+				{
+					"filename": "0061.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 3,
+						"w": 54,
+						"h": 48
+					},
+					"frame": {
+						"x": 53,
+						"y": 101,
+						"w": 54,
+						"h": 48
+					}
+				},
+				{
+					"filename": "0062.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 3,
+						"w": 54,
+						"h": 48
+					},
+					"frame": {
+						"x": 53,
+						"y": 101,
+						"w": 54,
+						"h": 48
+					}
+				},
+				{
+					"filename": "0001.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 0,
+						"w": 50,
+						"h": 51
+					},
+					"frame": {
+						"x": 53,
+						"y": 149,
+						"w": 50,
+						"h": 51
+					}
+				},
+				{
+					"filename": "0002.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 0,
+						"w": 50,
+						"h": 51
+					},
+					"frame": {
+						"x": 53,
+						"y": 149,
+						"w": 50,
+						"h": 51
+					}
+				},
+				{
+					"filename": "0025.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 0,
+						"w": 50,
+						"h": 51
+					},
+					"frame": {
+						"x": 53,
+						"y": 149,
+						"w": 50,
+						"h": 51
+					}
+				},
+				{
+					"filename": "0026.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 0,
+						"w": 50,
+						"h": 51
+					},
+					"frame": {
+						"x": 53,
+						"y": 149,
+						"w": 50,
+						"h": 51
+					}
+				},
+				{
+					"filename": "0049.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 0,
+						"w": 50,
+						"h": 51
+					},
+					"frame": {
+						"x": 53,
+						"y": 149,
+						"w": 50,
+						"h": 51
+					}
+				},
+				{
+					"filename": "0050.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 0,
+						"w": 50,
+						"h": 51
+					},
+					"frame": {
+						"x": 53,
+						"y": 149,
+						"w": 50,
+						"h": 51
+					}
+				},
+				{
+					"filename": "0073.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 0,
+						"w": 50,
+						"h": 51
+					},
+					"frame": {
+						"x": 53,
+						"y": 149,
+						"w": 50,
+						"h": 51
+					}
+				},
+				{
+					"filename": "0074.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 0,
+						"w": 50,
+						"h": 51
+					},
+					"frame": {
+						"x": 53,
+						"y": 149,
+						"w": 50,
+						"h": 51
+					}
+				},
+				{
+					"filename": "0083.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 4,
+						"w": 47,
+						"h": 47
+					},
+					"frame": {
+						"x": 108,
+						"y": 49,
+						"w": 47,
+						"h": 47
+					}
+				},
+				{
+					"filename": "0084.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 4,
+						"w": 47,
+						"h": 47
+					},
+					"frame": {
+						"x": 108,
+						"y": 49,
+						"w": 47,
+						"h": 47
+					}
+				},
+				{
+					"filename": "0097.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 4,
+						"w": 47,
+						"h": 47
+					},
+					"frame": {
+						"x": 155,
+						"y": 49,
+						"w": 47,
+						"h": 47
+					}
+				},
+				{
+					"filename": "0098.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 4,
+						"w": 47,
+						"h": 47
+					},
+					"frame": {
+						"x": 155,
+						"y": 49,
+						"w": 47,
+						"h": 47
+					}
+				},
+				{
+					"filename": "0087.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 7,
+						"w": 47,
+						"h": 44
+					},
+					"frame": {
+						"x": 108,
+						"y": 96,
+						"w": 47,
+						"h": 44
+					}
+				},
+				{
+					"filename": "0088.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 7,
+						"w": 47,
+						"h": 44
+					},
+					"frame": {
+						"x": 108,
+						"y": 96,
+						"w": 47,
+						"h": 44
+					}
+				},
+				{
+					"filename": "0085.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 5,
+						"w": 45,
+						"h": 46
+					},
+					"frame": {
+						"x": 155,
+						"y": 96,
+						"w": 45,
+						"h": 46
+					}
+				},
+				{
+					"filename": "0086.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 5,
+						"w": 45,
+						"h": 46
+					},
+					"frame": {
+						"x": 155,
+						"y": 96,
+						"w": 45,
+						"h": 46
+					}
+				},
+				{
+					"filename": "0089.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 8,
+						"w": 45,
+						"h": 44
+					},
+					"frame": {
+						"x": 107,
+						"y": 140,
+						"w": 45,
+						"h": 44
+					}
+				},
+				{
+					"filename": "0090.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 8,
+						"w": 45,
+						"h": 44
+					},
+					"frame": {
+						"x": 107,
+						"y": 140,
+						"w": 45,
+						"h": 44
+					}
+				},
+				{
+					"filename": "0091.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 8,
+						"w": 39,
+						"h": 46
+					},
+					"frame": {
+						"x": 103,
+						"y": 184,
+						"w": 39,
+						"h": 46
+					}
+				},
+				{
+					"filename": "0092.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 8,
+						"w": 39,
+						"h": 46
+					},
+					"frame": {
+						"x": 103,
+						"y": 184,
+						"w": 39,
+						"h": 46
+					}
+				},
+				{
+					"filename": "0093.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 8,
+						"w": 38,
+						"h": 46
+					},
+					"frame": {
+						"x": 142,
+						"y": 184,
+						"w": 38,
+						"h": 46
+					}
+				},
+				{
+					"filename": "0094.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 8,
+						"w": 38,
+						"h": 46
+					},
+					"frame": {
+						"x": 142,
+						"y": 184,
+						"w": 38,
+						"h": 46
+					}
+				},
+				{
+					"filename": "0095.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 8,
+						"w": 41,
+						"h": 44
+					},
+					"frame": {
+						"x": 180,
+						"y": 142,
+						"w": 41,
+						"h": 44
+					}
+				},
+				{
+					"filename": "0096.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 56,
+						"h": 54
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 8,
+						"w": 41,
+						"h": 44
+					},
+					"frame": {
+						"x": 180,
+						"y": 142,
+						"w": 41,
+						"h": 44
 					}
 				}
 			]
@@ -2073,6 +2073,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:cdbd19c7dad9a1ff1df2740c2ec77705:390b1dd326d02ff6f47617dbaa2be2bb:8e96b9056ea81e44ced99c97f472a528$"
+		"smartupdate": "$TexturePacker:SmartUpdate:edaed3da1123a782356b1ac83d1afd7c:cb0e0681f4dbf68283437f5581a20bb3:736cd88647e79ba7896fc74f9406c2fe$"
 	}
 }
diff --git a/public/images/pokemon/exp/shiny/female/6215.png b/public/images/pokemon/exp/shiny/female/6215.png
new file mode 100644
index 00000000000..4e7ea06c60a
Binary files /dev/null and b/public/images/pokemon/exp/shiny/female/6215.png differ
diff --git a/public/images/pokemon/exp/shiny/female/668.json b/public/images/pokemon/exp/shiny/female/668.json
new file mode 100644
index 00000000000..443f13c0b54
--- /dev/null
+++ b/public/images/pokemon/exp/shiny/female/668.json
@@ -0,0 +1,820 @@
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 0, "y": 219, "w": 63, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 63, "h": 72 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 0, "y": 291, "w": 62, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 7, "w": 62, "h": 71 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 453, "y": 289, "w": 62, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 7, "w": 62, "h": 71 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 441, "y": 360, "w": 61, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 8, "w": 61, "h": 70 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 309, "y": 359, "w": 61, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 8, "w": 61, "h": 70 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 380, "y": 358, "w": 61, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 8, "w": 61, "h": 70 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 317, "y": 289, "w": 63, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 8, "w": 63, "h": 70 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 390, "y": 288, "w": 63, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 8, "w": 63, "h": 70 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 254, "y": 220, "w": 63, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 7, "w": 63, "h": 71 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 63, "y": 220, "w": 63, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 6, "w": 63, "h": 72 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 399, "y": 216, "w": 63, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 6, "w": 63, "h": 72 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 64, "y": 147, "w": 63, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 63, "h": 73 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 138, "y": 74, "w": 63, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 63, "h": 78 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 201, "y": 147, "w": 63, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 63, "h": 73 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 264, "y": 147, "w": 63, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 63, "h": 73 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 0, "y": 219, "w": 63, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 63, "h": 72 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 0, "y": 291, "w": 62, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 7, "w": 62, "h": 71 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 453, "y": 289, "w": 62, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 7, "w": 62, "h": 71 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 441, "y": 360, "w": 61, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 8, "w": 61, "h": 70 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 309, "y": 359, "w": 61, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 8, "w": 61, "h": 70 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 380, "y": 358, "w": 61, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 8, "w": 61, "h": 70 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 317, "y": 289, "w": 63, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 8, "w": 63, "h": 70 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 390, "y": 288, "w": 63, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 8, "w": 63, "h": 70 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 254, "y": 220, "w": 63, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 7, "w": 63, "h": 71 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 63, "y": 220, "w": 63, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 6, "w": 63, "h": 72 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 399, "y": 216, "w": 63, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 6, "w": 63, "h": 72 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 64, "y": 147, "w": 63, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 63, "h": 73 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 138, "y": 74, "w": 63, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 63, "h": 78 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 201, "y": 147, "w": 63, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 63, "h": 73 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 264, "y": 147, "w": 63, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 63, "h": 73 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 0, "y": 219, "w": 63, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 63, "h": 72 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 0, "y": 291, "w": 62, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 7, "w": 62, "h": 71 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 453, "y": 289, "w": 62, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 7, "w": 62, "h": 71 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 441, "y": 360, "w": 61, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 8, "w": 61, "h": 70 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 309, "y": 359, "w": 61, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 8, "w": 61, "h": 70 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 380, "y": 358, "w": 61, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 8, "w": 61, "h": 70 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 317, "y": 289, "w": 63, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 8, "w": 63, "h": 70 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 390, "y": 288, "w": 63, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 8, "w": 63, "h": 70 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 254, "y": 220, "w": 63, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 7, "w": 63, "h": 71 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 63, "y": 220, "w": 63, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 6, "w": 63, "h": 72 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 399, "y": 216, "w": 63, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 6, "w": 63, "h": 72 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 64, "y": 147, "w": 63, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 63, "h": 73 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 138, "y": 74, "w": 63, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 63, "h": 78 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 201, "y": 147, "w": 63, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 63, "h": 73 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 264, "y": 147, "w": 63, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 63, "h": 73 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 0, "y": 219, "w": 63, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 63, "h": 72 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 0, "y": 291, "w": 62, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 7, "w": 62, "h": 71 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 453, "y": 289, "w": 62, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 7, "w": 62, "h": 71 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 441, "y": 360, "w": 61, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 8, "w": 61, "h": 70 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 309, "y": 359, "w": 61, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 8, "w": 61, "h": 70 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 380, "y": 358, "w": 61, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 8, "w": 61, "h": 70 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 317, "y": 289, "w": 63, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 8, "w": 63, "h": 70 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 390, "y": 288, "w": 63, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 8, "w": 63, "h": 70 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 254, "y": 220, "w": 63, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 7, "w": 63, "h": 71 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 63, "y": 220, "w": 63, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 6, "w": 63, "h": 72 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 399, "y": 216, "w": 63, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 6, "w": 63, "h": 72 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 64, "y": 147, "w": 63, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 63, "h": 73 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 138, "y": 74, "w": 63, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 63, "h": 78 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 201, "y": 147, "w": 63, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 63, "h": 73 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 264, "y": 147, "w": 63, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 63, "h": 73 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 0, "y": 219, "w": 63, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 63, "h": 72 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 0, "y": 147, "w": 64, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 64, "h": 72 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 127, "y": 152, "w": 64, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 7, "w": 64, "h": 71 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 465, "y": 146, "w": 65, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 7, "w": 65, "h": 71 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 399, "y": 146, "w": 66, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 8, "w": 66, "h": 70 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 334, "y": 74, "w": 66, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 7, "w": 66, "h": 71 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 191, "y": 220, "w": 63, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 63, "h": 71 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 126, "y": 223, "w": 62, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 62, "h": 72 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 462, "y": 217, "w": 63, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 6, "w": 63, "h": 72 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 188, "y": 291, "w": 61, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 61, "h": 72 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 249, "y": 291, "w": 60, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 60, "h": 73 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 62, "y": 292, "w": 60, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 60, "h": 72 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 122, "y": 295, "w": 60, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 60, "h": 72 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 182, "y": 363, "w": 59, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 6, "w": 59, "h": 72 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 60, "y": 364, "w": 59, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 6, "w": 59, "h": 72 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 0, "y": 362, "w": 60, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 7, "w": 60, "h": 71 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 327, "y": 217, "w": 63, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 6, "w": 63, "h": 72 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 268, "y": 74, "w": 66, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 66, "h": 73 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 0, "y": 74, "w": 69, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 69, "h": 73 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 376, "y": 0, "w": 73, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 73, "h": 74 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 227, "y": 0, "w": 75, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 75, "h": 74 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 76, "y": 0, "w": 76, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 76, "h": 74 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 0, "y": 0, "w": 76, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 76, "h": 74 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 152, "y": 0, "w": 75, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 75, "h": 74 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 302, "y": 0, "w": 74, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 74, "h": 74 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 449, "y": 0, "w": 72, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 72, "h": 73 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 449, "y": 73, "w": 71, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 71, "h": 73 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0088.png",
+    "frame": { "x": 69, "y": 74, "w": 69, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 69, "h": 73 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0089.png",
+    "frame": { "x": 201, "y": 74, "w": 67, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 67, "h": 73 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   },
+   {
+    "filename": "0090.png",
+    "frame": { "x": 334, "y": 145, "w": 65, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 65, "h": 72 },
+    "sourceSize": { "w": 80, "h": 78 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.11-x64",
+  "format": "I8",
+  "size": { "w": 530, "h": 436 },
+  "scale": "1"
+ }
+}
diff --git a/public/images/pokemon/exp/shiny/female/668.png b/public/images/pokemon/exp/shiny/female/668.png
new file mode 100644
index 00000000000..ad84dc50460
Binary files /dev/null and b/public/images/pokemon/exp/shiny/female/668.png differ
diff --git a/public/images/pokemon/female/207.png b/public/images/pokemon/female/207.png
index 071b72f9f07..48662a1a516 100644
Binary files a/public/images/pokemon/female/207.png and b/public/images/pokemon/female/207.png differ
diff --git a/public/images/pokemon/female/332.png b/public/images/pokemon/female/332.png
index 5a199f994eb..2100e4b9a10 100644
Binary files a/public/images/pokemon/female/332.png and b/public/images/pokemon/female/332.png differ
diff --git a/public/images/pokemon/female/396.png b/public/images/pokemon/female/396.png
index 0adaac1fe42..ee7debc27a9 100644
Binary files a/public/images/pokemon/female/396.png and b/public/images/pokemon/female/396.png differ
diff --git a/public/images/pokemon/female/397.png b/public/images/pokemon/female/397.png
index ecf63a03748..109a12dad7c 100644
Binary files a/public/images/pokemon/female/397.png and b/public/images/pokemon/female/397.png differ
diff --git a/public/images/pokemon/female/398.png b/public/images/pokemon/female/398.png
index cd3c1a54df4..d0af82f4f3b 100644
Binary files a/public/images/pokemon/female/398.png and b/public/images/pokemon/female/398.png differ
diff --git a/public/images/pokemon/female/404.png b/public/images/pokemon/female/404.png
index 67e68318f38..d05821148d4 100644
Binary files a/public/images/pokemon/female/404.png and b/public/images/pokemon/female/404.png differ
diff --git a/public/images/pokemon/female/417.png b/public/images/pokemon/female/417.png
index be3a2736e18..5b12e357477 100644
Binary files a/public/images/pokemon/female/417.png and b/public/images/pokemon/female/417.png differ
diff --git a/public/images/pokemon/icons/7/746-school.png b/public/images/pokemon/icons/7/746-school.png
index 837c67d9f63..d421210c2cf 100644
Binary files a/public/images/pokemon/icons/7/746-school.png and b/public/images/pokemon/icons/7/746-school.png differ
diff --git a/public/images/pokemon/icons/7/746.png b/public/images/pokemon/icons/7/746.png
index 5286054780e..3912ab26688 100644
Binary files a/public/images/pokemon/icons/7/746.png and b/public/images/pokemon/icons/7/746.png differ
diff --git a/public/images/pokemon/icons/7/802-zenith.png b/public/images/pokemon/icons/7/802-zenith.png
new file mode 100644
index 00000000000..7e0fee2d609
Binary files /dev/null and b/public/images/pokemon/icons/7/802-zenith.png differ
diff --git a/public/images/pokemon/icons/7/802s-zenith.png b/public/images/pokemon/icons/7/802s-zenith.png
new file mode 100644
index 00000000000..7e0fee2d609
Binary files /dev/null and b/public/images/pokemon/icons/7/802s-zenith.png differ
diff --git a/public/images/pokemon/icons/variant/1/143-gigantamax_2.png b/public/images/pokemon/icons/variant/1/143-gigantamax_2.png
new file mode 100644
index 00000000000..036fe6d230d
Binary files /dev/null and b/public/images/pokemon/icons/variant/1/143-gigantamax_2.png differ
diff --git a/public/images/pokemon/icons/variant/1/143-gigantamax_3.png b/public/images/pokemon/icons/variant/1/143-gigantamax_3.png
new file mode 100644
index 00000000000..5a4fe34da7c
Binary files /dev/null and b/public/images/pokemon/icons/variant/1/143-gigantamax_3.png differ
diff --git a/public/images/pokemon/icons/variant/1/143_2.png b/public/images/pokemon/icons/variant/1/143_2.png
new file mode 100644
index 00000000000..a757c202eb6
Binary files /dev/null and b/public/images/pokemon/icons/variant/1/143_2.png differ
diff --git a/public/images/pokemon/icons/variant/1/143_3.png b/public/images/pokemon/icons/variant/1/143_3.png
new file mode 100644
index 00000000000..0f6da40ca0d
Binary files /dev/null and b/public/images/pokemon/icons/variant/1/143_3.png differ
diff --git a/public/images/pokemon/icons/variant/1/32_2.png b/public/images/pokemon/icons/variant/1/32_2.png
new file mode 100644
index 00000000000..83c7716c509
Binary files /dev/null and b/public/images/pokemon/icons/variant/1/32_2.png differ
diff --git a/public/images/pokemon/icons/variant/1/32_3.png b/public/images/pokemon/icons/variant/1/32_3.png
new file mode 100644
index 00000000000..9bba8f3d9b9
Binary files /dev/null and b/public/images/pokemon/icons/variant/1/32_3.png differ
diff --git a/public/images/pokemon/icons/variant/1/33_2.png b/public/images/pokemon/icons/variant/1/33_2.png
new file mode 100644
index 00000000000..151c2091077
Binary files /dev/null and b/public/images/pokemon/icons/variant/1/33_2.png differ
diff --git a/public/images/pokemon/icons/variant/1/33_3.png b/public/images/pokemon/icons/variant/1/33_3.png
new file mode 100644
index 00000000000..84a8487116b
Binary files /dev/null and b/public/images/pokemon/icons/variant/1/33_3.png differ
diff --git a/public/images/pokemon/icons/variant/1/34_2.png b/public/images/pokemon/icons/variant/1/34_2.png
new file mode 100644
index 00000000000..2d0477f7ff9
Binary files /dev/null and b/public/images/pokemon/icons/variant/1/34_2.png differ
diff --git a/public/images/pokemon/icons/variant/1/34_3.png b/public/images/pokemon/icons/variant/1/34_3.png
new file mode 100644
index 00000000000..8e844c38605
Binary files /dev/null and b/public/images/pokemon/icons/variant/1/34_3.png differ
diff --git a/public/images/pokemon/icons/variant/1/88_2.png b/public/images/pokemon/icons/variant/1/88_2.png
new file mode 100644
index 00000000000..164f98f7d80
Binary files /dev/null and b/public/images/pokemon/icons/variant/1/88_2.png differ
diff --git a/public/images/pokemon/icons/variant/1/88_3.png b/public/images/pokemon/icons/variant/1/88_3.png
new file mode 100644
index 00000000000..6e90ad56d2a
Binary files /dev/null and b/public/images/pokemon/icons/variant/1/88_3.png differ
diff --git a/public/images/pokemon/icons/variant/1/89_2.png b/public/images/pokemon/icons/variant/1/89_2.png
new file mode 100644
index 00000000000..533ebe86c9e
Binary files /dev/null and b/public/images/pokemon/icons/variant/1/89_2.png differ
diff --git a/public/images/pokemon/icons/variant/1/89_3.png b/public/images/pokemon/icons/variant/1/89_3.png
new file mode 100644
index 00000000000..8caf93912d4
Binary files /dev/null and b/public/images/pokemon/icons/variant/1/89_3.png differ
diff --git a/public/images/pokemon/icons/variant/2/187_2.png b/public/images/pokemon/icons/variant/2/187_2.png
new file mode 100644
index 00000000000..c7da6a46115
Binary files /dev/null and b/public/images/pokemon/icons/variant/2/187_2.png differ
diff --git a/public/images/pokemon/icons/variant/2/187_3.png b/public/images/pokemon/icons/variant/2/187_3.png
new file mode 100644
index 00000000000..6f118aed4f4
Binary files /dev/null and b/public/images/pokemon/icons/variant/2/187_3.png differ
diff --git a/public/images/pokemon/icons/variant/2/188_2.png b/public/images/pokemon/icons/variant/2/188_2.png
new file mode 100644
index 00000000000..cbb7b690ff0
Binary files /dev/null and b/public/images/pokemon/icons/variant/2/188_2.png differ
diff --git a/public/images/pokemon/icons/variant/2/188_3.png b/public/images/pokemon/icons/variant/2/188_3.png
new file mode 100644
index 00000000000..2c4e64cc608
Binary files /dev/null and b/public/images/pokemon/icons/variant/2/188_3.png differ
diff --git a/public/images/pokemon/icons/variant/2/189_2.png b/public/images/pokemon/icons/variant/2/189_2.png
new file mode 100644
index 00000000000..ca5e127816a
Binary files /dev/null and b/public/images/pokemon/icons/variant/2/189_2.png differ
diff --git a/public/images/pokemon/icons/variant/2/189_3.png b/public/images/pokemon/icons/variant/2/189_3.png
new file mode 100644
index 00000000000..dfee57baf86
Binary files /dev/null and b/public/images/pokemon/icons/variant/2/189_3.png differ
diff --git a/public/images/pokemon/icons/variant/2/204_2.png b/public/images/pokemon/icons/variant/2/204_2.png
new file mode 100644
index 00000000000..e36cf0af684
Binary files /dev/null and b/public/images/pokemon/icons/variant/2/204_2.png differ
diff --git a/public/images/pokemon/icons/variant/2/204_3.png b/public/images/pokemon/icons/variant/2/204_3.png
new file mode 100644
index 00000000000..5b5c4a70769
Binary files /dev/null and b/public/images/pokemon/icons/variant/2/204_3.png differ
diff --git a/public/images/pokemon/icons/variant/2/205_2.png b/public/images/pokemon/icons/variant/2/205_2.png
new file mode 100644
index 00000000000..5bf3cb2c83e
Binary files /dev/null and b/public/images/pokemon/icons/variant/2/205_2.png differ
diff --git a/public/images/pokemon/icons/variant/2/205_3.png b/public/images/pokemon/icons/variant/2/205_3.png
new file mode 100644
index 00000000000..6e8d2e3dc7d
Binary files /dev/null and b/public/images/pokemon/icons/variant/2/205_3.png differ
diff --git a/public/images/pokemon/icons/variant/2/207_2.png b/public/images/pokemon/icons/variant/2/207_2.png
index 206f38f6a0a..c24b731925e 100644
Binary files a/public/images/pokemon/icons/variant/2/207_2.png and b/public/images/pokemon/icons/variant/2/207_2.png differ
diff --git a/public/images/pokemon/icons/variant/2/207_3.png b/public/images/pokemon/icons/variant/2/207_3.png
index 7a0018836dd..1a5c00992ce 100644
Binary files a/public/images/pokemon/icons/variant/2/207_3.png and b/public/images/pokemon/icons/variant/2/207_3.png differ
diff --git a/public/images/pokemon/icons/variant/3/299_2.png b/public/images/pokemon/icons/variant/3/299_2.png
new file mode 100644
index 00000000000..fa674c3afda
Binary files /dev/null and b/public/images/pokemon/icons/variant/3/299_2.png differ
diff --git a/public/images/pokemon/icons/variant/3/299_3.png b/public/images/pokemon/icons/variant/3/299_3.png
new file mode 100644
index 00000000000..68d8a893316
Binary files /dev/null and b/public/images/pokemon/icons/variant/3/299_3.png differ
diff --git a/public/images/pokemon/icons/variant/3/313_2.png b/public/images/pokemon/icons/variant/3/313_2.png
new file mode 100644
index 00000000000..501bb3f859b
Binary files /dev/null and b/public/images/pokemon/icons/variant/3/313_2.png differ
diff --git a/public/images/pokemon/icons/variant/3/313_3.png b/public/images/pokemon/icons/variant/3/313_3.png
new file mode 100644
index 00000000000..89c81375da8
Binary files /dev/null and b/public/images/pokemon/icons/variant/3/313_3.png differ
diff --git a/public/images/pokemon/icons/variant/3/314_2.png b/public/images/pokemon/icons/variant/3/314_2.png
new file mode 100644
index 00000000000..0242553f41a
Binary files /dev/null and b/public/images/pokemon/icons/variant/3/314_2.png differ
diff --git a/public/images/pokemon/icons/variant/3/314_3.png b/public/images/pokemon/icons/variant/3/314_3.png
new file mode 100644
index 00000000000..716ffccd3f2
Binary files /dev/null and b/public/images/pokemon/icons/variant/3/314_3.png differ
diff --git a/public/images/pokemon/icons/variant/3/325_2.png b/public/images/pokemon/icons/variant/3/325_2.png
new file mode 100644
index 00000000000..0792a8aa840
Binary files /dev/null and b/public/images/pokemon/icons/variant/3/325_2.png differ
diff --git a/public/images/pokemon/icons/variant/3/325_3.png b/public/images/pokemon/icons/variant/3/325_3.png
new file mode 100644
index 00000000000..dfd13bd75be
Binary files /dev/null and b/public/images/pokemon/icons/variant/3/325_3.png differ
diff --git a/public/images/pokemon/icons/variant/3/326_2.png b/public/images/pokemon/icons/variant/3/326_2.png
new file mode 100644
index 00000000000..b23be901c9a
Binary files /dev/null and b/public/images/pokemon/icons/variant/3/326_2.png differ
diff --git a/public/images/pokemon/icons/variant/3/326_3.png b/public/images/pokemon/icons/variant/3/326_3.png
new file mode 100644
index 00000000000..6c4025d0842
Binary files /dev/null and b/public/images/pokemon/icons/variant/3/326_3.png differ
diff --git a/public/images/pokemon/icons/variant/3/331_2.png b/public/images/pokemon/icons/variant/3/331_2.png
new file mode 100644
index 00000000000..19b80296a1e
Binary files /dev/null and b/public/images/pokemon/icons/variant/3/331_2.png differ
diff --git a/public/images/pokemon/icons/variant/3/331_3.png b/public/images/pokemon/icons/variant/3/331_3.png
new file mode 100644
index 00000000000..01b93a1d086
Binary files /dev/null and b/public/images/pokemon/icons/variant/3/331_3.png differ
diff --git a/public/images/pokemon/icons/variant/3/332_2.png b/public/images/pokemon/icons/variant/3/332_2.png
new file mode 100644
index 00000000000..ff9077cec0a
Binary files /dev/null and b/public/images/pokemon/icons/variant/3/332_2.png differ
diff --git a/public/images/pokemon/icons/variant/3/332_3.png b/public/images/pokemon/icons/variant/3/332_3.png
new file mode 100644
index 00000000000..c1c6cee7947
Binary files /dev/null and b/public/images/pokemon/icons/variant/3/332_3.png differ
diff --git a/public/images/pokemon/icons/variant/3/345_2.png b/public/images/pokemon/icons/variant/3/345_2.png
new file mode 100644
index 00000000000..015696265f9
Binary files /dev/null and b/public/images/pokemon/icons/variant/3/345_2.png differ
diff --git a/public/images/pokemon/icons/variant/3/345_3.png b/public/images/pokemon/icons/variant/3/345_3.png
new file mode 100644
index 00000000000..41ba6766c21
Binary files /dev/null and b/public/images/pokemon/icons/variant/3/345_3.png differ
diff --git a/public/images/pokemon/icons/variant/3/346_2.png b/public/images/pokemon/icons/variant/3/346_2.png
new file mode 100644
index 00000000000..71e233c31cc
Binary files /dev/null and b/public/images/pokemon/icons/variant/3/346_2.png differ
diff --git a/public/images/pokemon/icons/variant/3/346_3.png b/public/images/pokemon/icons/variant/3/346_3.png
new file mode 100644
index 00000000000..14514bb6183
Binary files /dev/null and b/public/images/pokemon/icons/variant/3/346_3.png differ
diff --git a/public/images/pokemon/icons/variant/4/396_2.png b/public/images/pokemon/icons/variant/4/396_2.png
new file mode 100644
index 00000000000..d7d23b494ab
Binary files /dev/null and b/public/images/pokemon/icons/variant/4/396_2.png differ
diff --git a/public/images/pokemon/icons/variant/4/396_3.png b/public/images/pokemon/icons/variant/4/396_3.png
new file mode 100644
index 00000000000..6725912b199
Binary files /dev/null and b/public/images/pokemon/icons/variant/4/396_3.png differ
diff --git a/public/images/pokemon/icons/variant/4/397_2.png b/public/images/pokemon/icons/variant/4/397_2.png
new file mode 100644
index 00000000000..f6982eeece4
Binary files /dev/null and b/public/images/pokemon/icons/variant/4/397_2.png differ
diff --git a/public/images/pokemon/icons/variant/4/397_3.png b/public/images/pokemon/icons/variant/4/397_3.png
new file mode 100644
index 00000000000..83c2755599a
Binary files /dev/null and b/public/images/pokemon/icons/variant/4/397_3.png differ
diff --git a/public/images/pokemon/icons/variant/4/398_2.png b/public/images/pokemon/icons/variant/4/398_2.png
new file mode 100644
index 00000000000..bbe04248c7b
Binary files /dev/null and b/public/images/pokemon/icons/variant/4/398_2.png differ
diff --git a/public/images/pokemon/icons/variant/4/398_3.png b/public/images/pokemon/icons/variant/4/398_3.png
new file mode 100644
index 00000000000..a1d47a95b1a
Binary files /dev/null and b/public/images/pokemon/icons/variant/4/398_3.png differ
diff --git a/public/images/pokemon/icons/variant/4/403_2.png b/public/images/pokemon/icons/variant/4/403_2.png
new file mode 100644
index 00000000000..410d3126e54
Binary files /dev/null and b/public/images/pokemon/icons/variant/4/403_2.png differ
diff --git a/public/images/pokemon/icons/variant/4/403_3.png b/public/images/pokemon/icons/variant/4/403_3.png
new file mode 100644
index 00000000000..0064c7d7d3f
Binary files /dev/null and b/public/images/pokemon/icons/variant/4/403_3.png differ
diff --git a/public/images/pokemon/icons/variant/4/404_2.png b/public/images/pokemon/icons/variant/4/404_2.png
new file mode 100644
index 00000000000..9bd7a6ed7bf
Binary files /dev/null and b/public/images/pokemon/icons/variant/4/404_2.png differ
diff --git a/public/images/pokemon/icons/variant/4/404_3.png b/public/images/pokemon/icons/variant/4/404_3.png
new file mode 100644
index 00000000000..5ec14183070
Binary files /dev/null and b/public/images/pokemon/icons/variant/4/404_3.png differ
diff --git a/public/images/pokemon/icons/variant/4/405_2.png b/public/images/pokemon/icons/variant/4/405_2.png
new file mode 100644
index 00000000000..28515b8350b
Binary files /dev/null and b/public/images/pokemon/icons/variant/4/405_2.png differ
diff --git a/public/images/pokemon/icons/variant/4/405_3.png b/public/images/pokemon/icons/variant/4/405_3.png
new file mode 100644
index 00000000000..82f0270bd5b
Binary files /dev/null and b/public/images/pokemon/icons/variant/4/405_3.png differ
diff --git a/public/images/pokemon/icons/variant/4/417_2.png b/public/images/pokemon/icons/variant/4/417_2.png
new file mode 100644
index 00000000000..e1bd9e52bb0
Binary files /dev/null and b/public/images/pokemon/icons/variant/4/417_2.png differ
diff --git a/public/images/pokemon/icons/variant/4/417_3.png b/public/images/pokemon/icons/variant/4/417_3.png
new file mode 100644
index 00000000000..4f9d1936f78
Binary files /dev/null and b/public/images/pokemon/icons/variant/4/417_3.png differ
diff --git a/public/images/pokemon/icons/variant/4/420_2.png b/public/images/pokemon/icons/variant/4/420_2.png
new file mode 100644
index 00000000000..194ae1213e3
Binary files /dev/null and b/public/images/pokemon/icons/variant/4/420_2.png differ
diff --git a/public/images/pokemon/icons/variant/4/420_3.png b/public/images/pokemon/icons/variant/4/420_3.png
new file mode 100644
index 00000000000..71116e40243
Binary files /dev/null and b/public/images/pokemon/icons/variant/4/420_3.png differ
diff --git a/public/images/pokemon/icons/variant/4/421-overcast_2.png b/public/images/pokemon/icons/variant/4/421-overcast_2.png
new file mode 100644
index 00000000000..0a8260baf49
Binary files /dev/null and b/public/images/pokemon/icons/variant/4/421-overcast_2.png differ
diff --git a/public/images/pokemon/icons/variant/4/421-overcast_3.png b/public/images/pokemon/icons/variant/4/421-overcast_3.png
new file mode 100644
index 00000000000..91fb8ef3d5f
Binary files /dev/null and b/public/images/pokemon/icons/variant/4/421-overcast_3.png differ
diff --git a/public/images/pokemon/icons/variant/4/421-sunshine_2.png b/public/images/pokemon/icons/variant/4/421-sunshine_2.png
new file mode 100644
index 00000000000..4872654e4be
Binary files /dev/null and b/public/images/pokemon/icons/variant/4/421-sunshine_2.png differ
diff --git a/public/images/pokemon/icons/variant/4/421-sunshine_3.png b/public/images/pokemon/icons/variant/4/421-sunshine_3.png
new file mode 100644
index 00000000000..d615119bdf2
Binary files /dev/null and b/public/images/pokemon/icons/variant/4/421-sunshine_3.png differ
diff --git a/public/images/pokemon/icons/variant/4/446_2.png b/public/images/pokemon/icons/variant/4/446_2.png
new file mode 100644
index 00000000000..900f3a5996b
Binary files /dev/null and b/public/images/pokemon/icons/variant/4/446_2.png differ
diff --git a/public/images/pokemon/icons/variant/4/446_3.png b/public/images/pokemon/icons/variant/4/446_3.png
new file mode 100644
index 00000000000..04c40204baf
Binary files /dev/null and b/public/images/pokemon/icons/variant/4/446_3.png differ
diff --git a/public/images/pokemon/icons/variant/4/476_2.png b/public/images/pokemon/icons/variant/4/476_2.png
new file mode 100644
index 00000000000..9b36a6f127e
Binary files /dev/null and b/public/images/pokemon/icons/variant/4/476_2.png differ
diff --git a/public/images/pokemon/icons/variant/4/476_3.png b/public/images/pokemon/icons/variant/4/476_3.png
new file mode 100644
index 00000000000..39cb2a72088
Binary files /dev/null and b/public/images/pokemon/icons/variant/4/476_3.png differ
diff --git a/public/images/pokemon/icons/variant/5/498_2.png b/public/images/pokemon/icons/variant/5/498_2.png
new file mode 100644
index 00000000000..568e7ff7670
Binary files /dev/null and b/public/images/pokemon/icons/variant/5/498_2.png differ
diff --git a/public/images/pokemon/icons/variant/5/498_3.png b/public/images/pokemon/icons/variant/5/498_3.png
new file mode 100644
index 00000000000..d592f83c9be
Binary files /dev/null and b/public/images/pokemon/icons/variant/5/498_3.png differ
diff --git a/public/images/pokemon/icons/variant/5/499_2.png b/public/images/pokemon/icons/variant/5/499_2.png
new file mode 100644
index 00000000000..992d5edb00a
Binary files /dev/null and b/public/images/pokemon/icons/variant/5/499_2.png differ
diff --git a/public/images/pokemon/icons/variant/5/499_3.png b/public/images/pokemon/icons/variant/5/499_3.png
new file mode 100644
index 00000000000..151185e4556
Binary files /dev/null and b/public/images/pokemon/icons/variant/5/499_3.png differ
diff --git a/public/images/pokemon/icons/variant/5/500_2.png b/public/images/pokemon/icons/variant/5/500_2.png
new file mode 100644
index 00000000000..e8b8e88c46e
Binary files /dev/null and b/public/images/pokemon/icons/variant/5/500_2.png differ
diff --git a/public/images/pokemon/icons/variant/5/500_3.png b/public/images/pokemon/icons/variant/5/500_3.png
new file mode 100644
index 00000000000..ad82f3d6ced
Binary files /dev/null and b/public/images/pokemon/icons/variant/5/500_3.png differ
diff --git a/public/images/pokemon/icons/variant/5/511_2.png b/public/images/pokemon/icons/variant/5/511_2.png
new file mode 100644
index 00000000000..eea1484725e
Binary files /dev/null and b/public/images/pokemon/icons/variant/5/511_2.png differ
diff --git a/public/images/pokemon/icons/variant/5/511_3.png b/public/images/pokemon/icons/variant/5/511_3.png
new file mode 100644
index 00000000000..fc434170eb2
Binary files /dev/null and b/public/images/pokemon/icons/variant/5/511_3.png differ
diff --git a/public/images/pokemon/icons/variant/5/512_2.png b/public/images/pokemon/icons/variant/5/512_2.png
new file mode 100644
index 00000000000..b9e0a45c06c
Binary files /dev/null and b/public/images/pokemon/icons/variant/5/512_2.png differ
diff --git a/public/images/pokemon/icons/variant/5/512_3.png b/public/images/pokemon/icons/variant/5/512_3.png
new file mode 100644
index 00000000000..1a53cc12d26
Binary files /dev/null and b/public/images/pokemon/icons/variant/5/512_3.png differ
diff --git a/public/images/pokemon/icons/variant/5/513_2.png b/public/images/pokemon/icons/variant/5/513_2.png
new file mode 100644
index 00000000000..305903f3162
Binary files /dev/null and b/public/images/pokemon/icons/variant/5/513_2.png differ
diff --git a/public/images/pokemon/icons/variant/5/513_3.png b/public/images/pokemon/icons/variant/5/513_3.png
new file mode 100644
index 00000000000..6c4592a0f54
Binary files /dev/null and b/public/images/pokemon/icons/variant/5/513_3.png differ
diff --git a/public/images/pokemon/icons/variant/5/514_2.png b/public/images/pokemon/icons/variant/5/514_2.png
new file mode 100644
index 00000000000..5e39da4c7f7
Binary files /dev/null and b/public/images/pokemon/icons/variant/5/514_2.png differ
diff --git a/public/images/pokemon/icons/variant/5/514_3.png b/public/images/pokemon/icons/variant/5/514_3.png
new file mode 100644
index 00000000000..ea6224485ce
Binary files /dev/null and b/public/images/pokemon/icons/variant/5/514_3.png differ
diff --git a/public/images/pokemon/icons/variant/5/515_2.png b/public/images/pokemon/icons/variant/5/515_2.png
new file mode 100644
index 00000000000..3d8af4a569f
Binary files /dev/null and b/public/images/pokemon/icons/variant/5/515_2.png differ
diff --git a/public/images/pokemon/icons/variant/5/515_3.png b/public/images/pokemon/icons/variant/5/515_3.png
new file mode 100644
index 00000000000..bfd1a9e0011
Binary files /dev/null and b/public/images/pokemon/icons/variant/5/515_3.png differ
diff --git a/public/images/pokemon/icons/variant/5/516_2.png b/public/images/pokemon/icons/variant/5/516_2.png
new file mode 100644
index 00000000000..23257ea2c6f
Binary files /dev/null and b/public/images/pokemon/icons/variant/5/516_2.png differ
diff --git a/public/images/pokemon/icons/variant/5/516_3.png b/public/images/pokemon/icons/variant/5/516_3.png
new file mode 100644
index 00000000000..78cb41df064
Binary files /dev/null and b/public/images/pokemon/icons/variant/5/516_3.png differ
diff --git a/public/images/pokemon/icons/variant/5/522_2.png b/public/images/pokemon/icons/variant/5/522_2.png
new file mode 100644
index 00000000000..111054ca1ab
Binary files /dev/null and b/public/images/pokemon/icons/variant/5/522_2.png differ
diff --git a/public/images/pokemon/icons/variant/5/522_3.png b/public/images/pokemon/icons/variant/5/522_3.png
new file mode 100644
index 00000000000..03476f89139
Binary files /dev/null and b/public/images/pokemon/icons/variant/5/522_3.png differ
diff --git a/public/images/pokemon/icons/variant/5/523_2.png b/public/images/pokemon/icons/variant/5/523_2.png
new file mode 100644
index 00000000000..238e8d64594
Binary files /dev/null and b/public/images/pokemon/icons/variant/5/523_2.png differ
diff --git a/public/images/pokemon/icons/variant/5/523_3.png b/public/images/pokemon/icons/variant/5/523_3.png
new file mode 100644
index 00000000000..e2b12513061
Binary files /dev/null and b/public/images/pokemon/icons/variant/5/523_3.png differ
diff --git a/public/images/pokemon/icons/variant/5/535_2.png b/public/images/pokemon/icons/variant/5/535_2.png
new file mode 100644
index 00000000000..6f2f8a77136
Binary files /dev/null and b/public/images/pokemon/icons/variant/5/535_2.png differ
diff --git a/public/images/pokemon/icons/variant/5/535_3.png b/public/images/pokemon/icons/variant/5/535_3.png
new file mode 100644
index 00000000000..b97481faa8f
Binary files /dev/null and b/public/images/pokemon/icons/variant/5/535_3.png differ
diff --git a/public/images/pokemon/icons/variant/5/536_2.png b/public/images/pokemon/icons/variant/5/536_2.png
new file mode 100644
index 00000000000..36a4a17dd2b
Binary files /dev/null and b/public/images/pokemon/icons/variant/5/536_2.png differ
diff --git a/public/images/pokemon/icons/variant/5/536_3.png b/public/images/pokemon/icons/variant/5/536_3.png
new file mode 100644
index 00000000000..282864d38e9
Binary files /dev/null and b/public/images/pokemon/icons/variant/5/536_3.png differ
diff --git a/public/images/pokemon/icons/variant/5/537_2.png b/public/images/pokemon/icons/variant/5/537_2.png
new file mode 100644
index 00000000000..599752ff7f1
Binary files /dev/null and b/public/images/pokemon/icons/variant/5/537_2.png differ
diff --git a/public/images/pokemon/icons/variant/5/537_3.png b/public/images/pokemon/icons/variant/5/537_3.png
new file mode 100644
index 00000000000..229dd83c8ce
Binary files /dev/null and b/public/images/pokemon/icons/variant/5/537_3.png differ
diff --git a/public/images/pokemon/icons/variant/5/554_2.png b/public/images/pokemon/icons/variant/5/554_2.png
new file mode 100644
index 00000000000..8f5df20db65
Binary files /dev/null and b/public/images/pokemon/icons/variant/5/554_2.png differ
diff --git a/public/images/pokemon/icons/variant/5/554_3.png b/public/images/pokemon/icons/variant/5/554_3.png
new file mode 100644
index 00000000000..6827ee2b478
Binary files /dev/null and b/public/images/pokemon/icons/variant/5/554_3.png differ
diff --git a/public/images/pokemon/icons/variant/5/555-zen_2.png b/public/images/pokemon/icons/variant/5/555-zen_2.png
new file mode 100644
index 00000000000..ae18a833759
Binary files /dev/null and b/public/images/pokemon/icons/variant/5/555-zen_2.png differ
diff --git a/public/images/pokemon/icons/variant/5/555-zen_3.png b/public/images/pokemon/icons/variant/5/555-zen_3.png
new file mode 100644
index 00000000000..692e39985a6
Binary files /dev/null and b/public/images/pokemon/icons/variant/5/555-zen_3.png differ
diff --git a/public/images/pokemon/icons/variant/5/555_2.png b/public/images/pokemon/icons/variant/5/555_2.png
new file mode 100644
index 00000000000..f408122171a
Binary files /dev/null and b/public/images/pokemon/icons/variant/5/555_2.png differ
diff --git a/public/images/pokemon/icons/variant/5/555_3.png b/public/images/pokemon/icons/variant/5/555_3.png
new file mode 100644
index 00000000000..2994d3da2cf
Binary files /dev/null and b/public/images/pokemon/icons/variant/5/555_3.png differ
diff --git a/public/images/pokemon/icons/variant/5/566_2.png b/public/images/pokemon/icons/variant/5/566_2.png
new file mode 100644
index 00000000000..927757ac240
Binary files /dev/null and b/public/images/pokemon/icons/variant/5/566_2.png differ
diff --git a/public/images/pokemon/icons/variant/5/566_3.png b/public/images/pokemon/icons/variant/5/566_3.png
new file mode 100644
index 00000000000..450fd247d8b
Binary files /dev/null and b/public/images/pokemon/icons/variant/5/566_3.png differ
diff --git a/public/images/pokemon/icons/variant/5/567_2.png b/public/images/pokemon/icons/variant/5/567_2.png
new file mode 100644
index 00000000000..1050d13123d
Binary files /dev/null and b/public/images/pokemon/icons/variant/5/567_2.png differ
diff --git a/public/images/pokemon/icons/variant/5/567_3.png b/public/images/pokemon/icons/variant/5/567_3.png
new file mode 100644
index 00000000000..c87f3841410
Binary files /dev/null and b/public/images/pokemon/icons/variant/5/567_3.png differ
diff --git a/public/images/pokemon/icons/variant/5/572_2.png b/public/images/pokemon/icons/variant/5/572_2.png
index b6230a17cbc..1da1f6b953a 100644
Binary files a/public/images/pokemon/icons/variant/5/572_2.png and b/public/images/pokemon/icons/variant/5/572_2.png differ
diff --git a/public/images/pokemon/icons/variant/5/572_3.png b/public/images/pokemon/icons/variant/5/572_3.png
index c0848deade2..868b7c38585 100644
Binary files a/public/images/pokemon/icons/variant/5/572_3.png and b/public/images/pokemon/icons/variant/5/572_3.png differ
diff --git a/public/images/pokemon/icons/variant/5/573_2.png b/public/images/pokemon/icons/variant/5/573_2.png
new file mode 100644
index 00000000000..effd7070f7d
Binary files /dev/null and b/public/images/pokemon/icons/variant/5/573_2.png differ
diff --git a/public/images/pokemon/icons/variant/5/573_3.png b/public/images/pokemon/icons/variant/5/573_3.png
new file mode 100644
index 00000000000..019cf83795d
Binary files /dev/null and b/public/images/pokemon/icons/variant/5/573_3.png differ
diff --git a/public/images/pokemon/icons/variant/5/626_2.png b/public/images/pokemon/icons/variant/5/626_2.png
new file mode 100644
index 00000000000..21930c7606e
Binary files /dev/null and b/public/images/pokemon/icons/variant/5/626_2.png differ
diff --git a/public/images/pokemon/icons/variant/5/626_3.png b/public/images/pokemon/icons/variant/5/626_3.png
new file mode 100644
index 00000000000..2183e1426e8
Binary files /dev/null and b/public/images/pokemon/icons/variant/5/626_3.png differ
diff --git a/public/images/pokemon/icons/variant/5/641-incarnate_1.png b/public/images/pokemon/icons/variant/5/641-incarnate_1.png
deleted file mode 100644
index ddd0ca15c0c..00000000000
Binary files a/public/images/pokemon/icons/variant/5/641-incarnate_1.png and /dev/null differ
diff --git a/public/images/pokemon/icons/variant/5/641-therian_1.png b/public/images/pokemon/icons/variant/5/641-therian_1.png
deleted file mode 100644
index 8f6f01fd0d7..00000000000
Binary files a/public/images/pokemon/icons/variant/5/641-therian_1.png and /dev/null differ
diff --git a/public/images/pokemon/icons/variant/5/642-incarnate_1.png b/public/images/pokemon/icons/variant/5/642-incarnate_1.png
deleted file mode 100644
index 55507be70b9..00000000000
Binary files a/public/images/pokemon/icons/variant/5/642-incarnate_1.png and /dev/null differ
diff --git a/public/images/pokemon/icons/variant/5/642-therian_1.png b/public/images/pokemon/icons/variant/5/642-therian_1.png
deleted file mode 100644
index bea360abb95..00000000000
Binary files a/public/images/pokemon/icons/variant/5/642-therian_1.png and /dev/null differ
diff --git a/public/images/pokemon/icons/variant/5/643_2.png b/public/images/pokemon/icons/variant/5/643_2.png
new file mode 100644
index 00000000000..24b7ce28a36
Binary files /dev/null and b/public/images/pokemon/icons/variant/5/643_2.png differ
diff --git a/public/images/pokemon/icons/variant/5/643_3.png b/public/images/pokemon/icons/variant/5/643_3.png
new file mode 100644
index 00000000000..5c124dbb8f6
Binary files /dev/null and b/public/images/pokemon/icons/variant/5/643_3.png differ
diff --git a/public/images/pokemon/icons/variant/5/644_2.png b/public/images/pokemon/icons/variant/5/644_2.png
new file mode 100644
index 00000000000..13ba216e9ce
Binary files /dev/null and b/public/images/pokemon/icons/variant/5/644_2.png differ
diff --git a/public/images/pokemon/icons/variant/5/644_3.png b/public/images/pokemon/icons/variant/5/644_3.png
new file mode 100644
index 00000000000..a071965f32d
Binary files /dev/null and b/public/images/pokemon/icons/variant/5/644_3.png differ
diff --git a/public/images/pokemon/icons/variant/5/645-incarnate_1.png b/public/images/pokemon/icons/variant/5/645-incarnate_1.png
deleted file mode 100644
index 416fa9ca1db..00000000000
Binary files a/public/images/pokemon/icons/variant/5/645-incarnate_1.png and /dev/null differ
diff --git a/public/images/pokemon/icons/variant/5/645-therian_1.png b/public/images/pokemon/icons/variant/5/645-therian_1.png
deleted file mode 100644
index c03d4233e29..00000000000
Binary files a/public/images/pokemon/icons/variant/5/645-therian_1.png and /dev/null differ
diff --git a/public/images/pokemon/icons/variant/5/646-black_2.png b/public/images/pokemon/icons/variant/5/646-black_2.png
new file mode 100644
index 00000000000..825a8bd36c0
Binary files /dev/null and b/public/images/pokemon/icons/variant/5/646-black_2.png differ
diff --git a/public/images/pokemon/icons/variant/5/646-black_3.png b/public/images/pokemon/icons/variant/5/646-black_3.png
new file mode 100644
index 00000000000..6e854d9ea41
Binary files /dev/null and b/public/images/pokemon/icons/variant/5/646-black_3.png differ
diff --git a/public/images/pokemon/icons/variant/5/646-white_2.png b/public/images/pokemon/icons/variant/5/646-white_2.png
new file mode 100644
index 00000000000..e38dc504b21
Binary files /dev/null and b/public/images/pokemon/icons/variant/5/646-white_2.png differ
diff --git a/public/images/pokemon/icons/variant/5/646-white_3.png b/public/images/pokemon/icons/variant/5/646-white_3.png
new file mode 100644
index 00000000000..12bff95a01d
Binary files /dev/null and b/public/images/pokemon/icons/variant/5/646-white_3.png differ
diff --git a/public/images/pokemon/icons/variant/5/646_2.png b/public/images/pokemon/icons/variant/5/646_2.png
new file mode 100644
index 00000000000..064598bfd26
Binary files /dev/null and b/public/images/pokemon/icons/variant/5/646_2.png differ
diff --git a/public/images/pokemon/icons/variant/5/646_3.png b/public/images/pokemon/icons/variant/5/646_3.png
new file mode 100644
index 00000000000..e258eb4ce91
Binary files /dev/null and b/public/images/pokemon/icons/variant/5/646_3.png differ
diff --git a/public/images/pokemon/icons/variant/6/692_2.png b/public/images/pokemon/icons/variant/6/692_2.png
new file mode 100644
index 00000000000..fa6cacc70dd
Binary files /dev/null and b/public/images/pokemon/icons/variant/6/692_2.png differ
diff --git a/public/images/pokemon/icons/variant/6/692_3.png b/public/images/pokemon/icons/variant/6/692_3.png
new file mode 100644
index 00000000000..47d0661babe
Binary files /dev/null and b/public/images/pokemon/icons/variant/6/692_3.png differ
diff --git a/public/images/pokemon/icons/variant/6/693_2.png b/public/images/pokemon/icons/variant/6/693_2.png
new file mode 100644
index 00000000000..9d8ea4f56cd
Binary files /dev/null and b/public/images/pokemon/icons/variant/6/693_2.png differ
diff --git a/public/images/pokemon/icons/variant/6/693_3.png b/public/images/pokemon/icons/variant/6/693_3.png
new file mode 100644
index 00000000000..6f0169bb057
Binary files /dev/null and b/public/images/pokemon/icons/variant/6/693_3.png differ
diff --git a/public/images/pokemon/icons/variant/7/2037_2.png b/public/images/pokemon/icons/variant/7/2037_2.png
new file mode 100644
index 00000000000..528793de5c5
Binary files /dev/null and b/public/images/pokemon/icons/variant/7/2037_2.png differ
diff --git a/public/images/pokemon/icons/variant/7/2037_3.png b/public/images/pokemon/icons/variant/7/2037_3.png
new file mode 100644
index 00000000000..d79fd1c2369
Binary files /dev/null and b/public/images/pokemon/icons/variant/7/2037_3.png differ
diff --git a/public/images/pokemon/icons/variant/7/2038_2.png b/public/images/pokemon/icons/variant/7/2038_2.png
new file mode 100644
index 00000000000..d8295be1baf
Binary files /dev/null and b/public/images/pokemon/icons/variant/7/2038_2.png differ
diff --git a/public/images/pokemon/icons/variant/7/2038_3.png b/public/images/pokemon/icons/variant/7/2038_3.png
new file mode 100644
index 00000000000..645c783b43f
Binary files /dev/null and b/public/images/pokemon/icons/variant/7/2038_3.png differ
diff --git a/public/images/pokemon/icons/variant/7/746-school_2.png b/public/images/pokemon/icons/variant/7/746-school_2.png
new file mode 100644
index 00000000000..94d16db5c42
Binary files /dev/null and b/public/images/pokemon/icons/variant/7/746-school_2.png differ
diff --git a/public/images/pokemon/icons/variant/7/746-school_3.png b/public/images/pokemon/icons/variant/7/746-school_3.png
new file mode 100644
index 00000000000..94d16db5c42
Binary files /dev/null and b/public/images/pokemon/icons/variant/7/746-school_3.png differ
diff --git a/public/images/pokemon/icons/variant/7/746_2.png b/public/images/pokemon/icons/variant/7/746_2.png
new file mode 100644
index 00000000000..d4897e0acf3
Binary files /dev/null and b/public/images/pokemon/icons/variant/7/746_2.png differ
diff --git a/public/images/pokemon/icons/variant/7/746_3.png b/public/images/pokemon/icons/variant/7/746_3.png
new file mode 100644
index 00000000000..8746a45310d
Binary files /dev/null and b/public/images/pokemon/icons/variant/7/746_3.png differ
diff --git a/public/images/pokemon/icons/variant/7/780_2.png b/public/images/pokemon/icons/variant/7/780_2.png
new file mode 100644
index 00000000000..fe40d474146
Binary files /dev/null and b/public/images/pokemon/icons/variant/7/780_2.png differ
diff --git a/public/images/pokemon/icons/variant/7/780_3.png b/public/images/pokemon/icons/variant/7/780_3.png
new file mode 100644
index 00000000000..6d98c750e8e
Binary files /dev/null and b/public/images/pokemon/icons/variant/7/780_3.png differ
diff --git a/public/images/pokemon/icons/variant/7/782_2.png b/public/images/pokemon/icons/variant/7/782_2.png
new file mode 100644
index 00000000000..c036fa45017
Binary files /dev/null and b/public/images/pokemon/icons/variant/7/782_2.png differ
diff --git a/public/images/pokemon/icons/variant/7/782_3.png b/public/images/pokemon/icons/variant/7/782_3.png
new file mode 100644
index 00000000000..bc1e939e14d
Binary files /dev/null and b/public/images/pokemon/icons/variant/7/782_3.png differ
diff --git a/public/images/pokemon/icons/variant/7/783_2.png b/public/images/pokemon/icons/variant/7/783_2.png
new file mode 100644
index 00000000000..1e686e95017
Binary files /dev/null and b/public/images/pokemon/icons/variant/7/783_2.png differ
diff --git a/public/images/pokemon/icons/variant/7/783_3.png b/public/images/pokemon/icons/variant/7/783_3.png
new file mode 100644
index 00000000000..6b61fea7298
Binary files /dev/null and b/public/images/pokemon/icons/variant/7/783_3.png differ
diff --git a/public/images/pokemon/icons/variant/7/784_2.png b/public/images/pokemon/icons/variant/7/784_2.png
new file mode 100644
index 00000000000..5f921735839
Binary files /dev/null and b/public/images/pokemon/icons/variant/7/784_2.png differ
diff --git a/public/images/pokemon/icons/variant/7/784_3.png b/public/images/pokemon/icons/variant/7/784_3.png
new file mode 100644
index 00000000000..077a6253a19
Binary files /dev/null and b/public/images/pokemon/icons/variant/7/784_3.png differ
diff --git a/public/images/pokemon/icons/variant/8/840_2.png b/public/images/pokemon/icons/variant/8/840_2.png
new file mode 100644
index 00000000000..796057e93fb
Binary files /dev/null and b/public/images/pokemon/icons/variant/8/840_2.png differ
diff --git a/public/images/pokemon/icons/variant/8/840_3.png b/public/images/pokemon/icons/variant/8/840_3.png
new file mode 100644
index 00000000000..de8206c7fd7
Binary files /dev/null and b/public/images/pokemon/icons/variant/8/840_3.png differ
diff --git a/public/images/pokemon/icons/variant/8/841-gigantamax_2.png b/public/images/pokemon/icons/variant/8/841-gigantamax_2.png
new file mode 100644
index 00000000000..aaed8081eec
Binary files /dev/null and b/public/images/pokemon/icons/variant/8/841-gigantamax_2.png differ
diff --git a/public/images/pokemon/icons/variant/8/841-gigantamax_3.png b/public/images/pokemon/icons/variant/8/841-gigantamax_3.png
new file mode 100644
index 00000000000..3ae323c8677
Binary files /dev/null and b/public/images/pokemon/icons/variant/8/841-gigantamax_3.png differ
diff --git a/public/images/pokemon/icons/variant/8/841_2.png b/public/images/pokemon/icons/variant/8/841_2.png
new file mode 100644
index 00000000000..d1a57120993
Binary files /dev/null and b/public/images/pokemon/icons/variant/8/841_2.png differ
diff --git a/public/images/pokemon/icons/variant/8/841_3.png b/public/images/pokemon/icons/variant/8/841_3.png
new file mode 100644
index 00000000000..5eaf8ea1c57
Binary files /dev/null and b/public/images/pokemon/icons/variant/8/841_3.png differ
diff --git a/public/images/pokemon/icons/variant/8/842-gigantamax_2.png b/public/images/pokemon/icons/variant/8/842-gigantamax_2.png
new file mode 100644
index 00000000000..aaed8081eec
Binary files /dev/null and b/public/images/pokemon/icons/variant/8/842-gigantamax_2.png differ
diff --git a/public/images/pokemon/icons/variant/8/842-gigantamax_3.png b/public/images/pokemon/icons/variant/8/842-gigantamax_3.png
new file mode 100644
index 00000000000..3ae323c8677
Binary files /dev/null and b/public/images/pokemon/icons/variant/8/842-gigantamax_3.png differ
diff --git a/public/images/pokemon/icons/variant/8/842_2.png b/public/images/pokemon/icons/variant/8/842_2.png
new file mode 100644
index 00000000000..87de609f819
Binary files /dev/null and b/public/images/pokemon/icons/variant/8/842_2.png differ
diff --git a/public/images/pokemon/icons/variant/8/842_3.png b/public/images/pokemon/icons/variant/8/842_3.png
new file mode 100644
index 00000000000..15dfe7ea02c
Binary files /dev/null and b/public/images/pokemon/icons/variant/8/842_3.png differ
diff --git a/public/images/pokemon/icons/variant/8/871_2.png b/public/images/pokemon/icons/variant/8/871_2.png
new file mode 100644
index 00000000000..719ee1eb3a9
Binary files /dev/null and b/public/images/pokemon/icons/variant/8/871_2.png differ
diff --git a/public/images/pokemon/icons/variant/8/871_3.png b/public/images/pokemon/icons/variant/8/871_3.png
new file mode 100644
index 00000000000..0d8227b722a
Binary files /dev/null and b/public/images/pokemon/icons/variant/8/871_3.png differ
diff --git a/public/images/pokemon/icons/variant/9/1011_2.png b/public/images/pokemon/icons/variant/9/1011_2.png
new file mode 100644
index 00000000000..01abc1a8e65
Binary files /dev/null and b/public/images/pokemon/icons/variant/9/1011_2.png differ
diff --git a/public/images/pokemon/icons/variant/9/1011_3.png b/public/images/pokemon/icons/variant/9/1011_3.png
new file mode 100644
index 00000000000..fa5e3e35135
Binary files /dev/null and b/public/images/pokemon/icons/variant/9/1011_3.png differ
diff --git a/public/images/pokemon/icons/variant/9/1019_2.png b/public/images/pokemon/icons/variant/9/1019_2.png
new file mode 100644
index 00000000000..671ae3f6552
Binary files /dev/null and b/public/images/pokemon/icons/variant/9/1019_2.png differ
diff --git a/public/images/pokemon/icons/variant/9/1019_3.png b/public/images/pokemon/icons/variant/9/1019_3.png
new file mode 100644
index 00000000000..0569b3e84b6
Binary files /dev/null and b/public/images/pokemon/icons/variant/9/1019_3.png differ
diff --git a/public/images/pokemon/shiny/261.png b/public/images/pokemon/shiny/261.png
index 6ae6e5838ce..6976a0747e1 100644
Binary files a/public/images/pokemon/shiny/261.png and b/public/images/pokemon/shiny/261.png differ
diff --git a/public/images/pokemon/shiny/335.json b/public/images/pokemon/shiny/335.json
index ca797f1d7a4..80c43b41c12 100644
--- a/public/images/pokemon/shiny/335.json
+++ b/public/images/pokemon/shiny/335.json
@@ -1,1910 +1,523 @@
-{
-	"textures": [
-		{
-			"image": "335.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 366,
-				"h": 366
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 68,
-						"h": 63
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 68,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 68,
-						"h": 63
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 68,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0035.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 68,
-						"h": 63
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 68,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0056.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 68,
-						"h": 63
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 68,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0079.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 0,
-						"w": 65,
-						"h": 66
-					},
-					"frame": {
-						"x": 0,
-						"y": 63,
-						"w": 65,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0077.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 3,
-						"w": 67,
-						"h": 63
-					},
-					"frame": {
-						"x": 68,
-						"y": 0,
-						"w": 67,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0078.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 3,
-						"w": 67,
-						"h": 63
-					},
-					"frame": {
-						"x": 68,
-						"y": 0,
-						"w": 67,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 5,
-						"w": 68,
-						"h": 61
-					},
-					"frame": {
-						"x": 65,
-						"y": 63,
-						"w": 68,
-						"h": 61
-					}
-				},
-				{
-					"filename": "0033.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 5,
-						"w": 68,
-						"h": 61
-					},
-					"frame": {
-						"x": 65,
-						"y": 63,
-						"w": 68,
-						"h": 61
-					}
-				},
-				{
-					"filename": "0034.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 5,
-						"w": 68,
-						"h": 61
-					},
-					"frame": {
-						"x": 65,
-						"y": 63,
-						"w": 68,
-						"h": 61
-					}
-				},
-				{
-					"filename": "0055.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 5,
-						"w": 68,
-						"h": 61
-					},
-					"frame": {
-						"x": 65,
-						"y": 63,
-						"w": 68,
-						"h": 61
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 64,
-						"h": 63
-					},
-					"frame": {
-						"x": 0,
-						"y": 129,
-						"w": 64,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0036.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 64,
-						"h": 63
-					},
-					"frame": {
-						"x": 0,
-						"y": 129,
-						"w": 64,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0057.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 64,
-						"h": 63
-					},
-					"frame": {
-						"x": 0,
-						"y": 129,
-						"w": 64,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0058.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 64,
-						"h": 63
-					},
-					"frame": {
-						"x": 0,
-						"y": 129,
-						"w": 64,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0080.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 61,
-						"h": 66
-					},
-					"frame": {
-						"x": 0,
-						"y": 192,
-						"w": 61,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0085.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 0,
-						"w": 61,
-						"h": 66
-					},
-					"frame": {
-						"x": 0,
-						"y": 258,
-						"w": 61,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0086.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 0,
-						"w": 61,
-						"h": 66
-					},
-					"frame": {
-						"x": 0,
-						"y": 258,
-						"w": 61,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0069.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 64,
-						"h": 62
-					},
-					"frame": {
-						"x": 135,
-						"y": 0,
-						"w": 64,
-						"h": 62
-					}
-				},
-				{
-					"filename": "0070.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 64,
-						"h": 62
-					},
-					"frame": {
-						"x": 135,
-						"y": 0,
-						"w": 64,
-						"h": 62
-					}
-				},
-				{
-					"filename": "0076.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 5,
-						"w": 65,
-						"h": 61
-					},
-					"frame": {
-						"x": 199,
-						"y": 0,
-						"w": 65,
-						"h": 61
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 8,
-						"w": 67,
-						"h": 58
-					},
-					"frame": {
-						"x": 264,
-						"y": 0,
-						"w": 67,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0032.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 8,
-						"w": 67,
-						"h": 58
-					},
-					"frame": {
-						"x": 264,
-						"y": 0,
-						"w": 67,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0053.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 8,
-						"w": 67,
-						"h": 58
-					},
-					"frame": {
-						"x": 264,
-						"y": 0,
-						"w": 67,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0054.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 8,
-						"w": 67,
-						"h": 58
-					},
-					"frame": {
-						"x": 264,
-						"y": 0,
-						"w": 67,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 7,
-						"w": 64,
-						"h": 59
-					},
-					"frame": {
-						"x": 65,
-						"y": 124,
-						"w": 64,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 7,
-						"w": 64,
-						"h": 59
-					},
-					"frame": {
-						"x": 65,
-						"y": 124,
-						"w": 64,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0031.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 7,
-						"w": 64,
-						"h": 59
-					},
-					"frame": {
-						"x": 65,
-						"y": 124,
-						"w": 64,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0052.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 7,
-						"w": 64,
-						"h": 59
-					},
-					"frame": {
-						"x": 65,
-						"y": 124,
-						"w": 64,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0071.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 64,
-						"h": 61
-					},
-					"frame": {
-						"x": 64,
-						"y": 183,
-						"w": 64,
-						"h": 61
-					}
-				},
-				{
-					"filename": "0087.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 62,
-						"h": 65
-					},
-					"frame": {
-						"x": 61,
-						"y": 244,
-						"w": 62,
-						"h": 65
-					}
-				},
-				{
-					"filename": "0075.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 9,
-						"w": 63,
-						"h": 57
-					},
-					"frame": {
-						"x": 61,
-						"y": 309,
-						"w": 63,
-						"h": 57
-					}
-				},
-				{
-					"filename": "0088.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 61,
-						"h": 64
-					},
-					"frame": {
-						"x": 123,
-						"y": 244,
-						"w": 61,
-						"h": 64
-					}
-				},
-				{
-					"filename": "0072.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 8,
-						"w": 63,
-						"h": 58
-					},
-					"frame": {
-						"x": 124,
-						"y": 308,
-						"w": 63,
-						"h": 58
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 5,
-						"w": 61,
-						"h": 61
-					},
-					"frame": {
-						"x": 128,
-						"y": 183,
-						"w": 61,
-						"h": 61
-					}
-				},
-				{
-					"filename": "0029.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 5,
-						"w": 61,
-						"h": 61
-					},
-					"frame": {
-						"x": 128,
-						"y": 183,
-						"w": 61,
-						"h": 61
-					}
-				},
-				{
-					"filename": "0030.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 5,
-						"w": 61,
-						"h": 61
-					},
-					"frame": {
-						"x": 128,
-						"y": 183,
-						"w": 61,
-						"h": 61
-					}
-				},
-				{
-					"filename": "0051.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 5,
-						"w": 61,
-						"h": 61
-					},
-					"frame": {
-						"x": 128,
-						"y": 183,
-						"w": 61,
-						"h": 61
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 60,
-						"h": 63
-					},
-					"frame": {
-						"x": 184,
-						"y": 244,
-						"w": 60,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 60,
-						"h": 63
-					},
-					"frame": {
-						"x": 184,
-						"y": 244,
-						"w": 60,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 60,
-						"h": 63
-					},
-					"frame": {
-						"x": 184,
-						"y": 244,
-						"w": 60,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 60,
-						"h": 63
-					},
-					"frame": {
-						"x": 184,
-						"y": 244,
-						"w": 60,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 60,
-						"h": 63
-					},
-					"frame": {
-						"x": 184,
-						"y": 244,
-						"w": 60,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 60,
-						"h": 63
-					},
-					"frame": {
-						"x": 184,
-						"y": 244,
-						"w": 60,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 60,
-						"h": 63
-					},
-					"frame": {
-						"x": 184,
-						"y": 244,
-						"w": 60,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 60,
-						"h": 63
-					},
-					"frame": {
-						"x": 184,
-						"y": 244,
-						"w": 60,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 60,
-						"h": 63
-					},
-					"frame": {
-						"x": 184,
-						"y": 244,
-						"w": 60,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 60,
-						"h": 63
-					},
-					"frame": {
-						"x": 184,
-						"y": 244,
-						"w": 60,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 60,
-						"h": 63
-					},
-					"frame": {
-						"x": 184,
-						"y": 244,
-						"w": 60,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 60,
-						"h": 63
-					},
-					"frame": {
-						"x": 184,
-						"y": 244,
-						"w": 60,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0025.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 60,
-						"h": 63
-					},
-					"frame": {
-						"x": 184,
-						"y": 244,
-						"w": 60,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0026.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 60,
-						"h": 63
-					},
-					"frame": {
-						"x": 184,
-						"y": 244,
-						"w": 60,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0027.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 60,
-						"h": 63
-					},
-					"frame": {
-						"x": 184,
-						"y": 244,
-						"w": 60,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0028.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 60,
-						"h": 63
-					},
-					"frame": {
-						"x": 184,
-						"y": 244,
-						"w": 60,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0037.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 60,
-						"h": 63
-					},
-					"frame": {
-						"x": 184,
-						"y": 244,
-						"w": 60,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0038.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 60,
-						"h": 63
-					},
-					"frame": {
-						"x": 184,
-						"y": 244,
-						"w": 60,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0043.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 60,
-						"h": 63
-					},
-					"frame": {
-						"x": 184,
-						"y": 244,
-						"w": 60,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0044.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 60,
-						"h": 63
-					},
-					"frame": {
-						"x": 184,
-						"y": 244,
-						"w": 60,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0045.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 60,
-						"h": 63
-					},
-					"frame": {
-						"x": 184,
-						"y": 244,
-						"w": 60,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0046.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 60,
-						"h": 63
-					},
-					"frame": {
-						"x": 184,
-						"y": 244,
-						"w": 60,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0047.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 60,
-						"h": 63
-					},
-					"frame": {
-						"x": 184,
-						"y": 244,
-						"w": 60,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0048.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 60,
-						"h": 63
-					},
-					"frame": {
-						"x": 184,
-						"y": 244,
-						"w": 60,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0049.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 60,
-						"h": 63
-					},
-					"frame": {
-						"x": 184,
-						"y": 244,
-						"w": 60,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0050.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 60,
-						"h": 63
-					},
-					"frame": {
-						"x": 184,
-						"y": 244,
-						"w": 60,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0059.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 60,
-						"h": 63
-					},
-					"frame": {
-						"x": 184,
-						"y": 244,
-						"w": 60,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0064.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 60,
-						"h": 63
-					},
-					"frame": {
-						"x": 184,
-						"y": 244,
-						"w": 60,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0073.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 9,
-						"w": 62,
-						"h": 57
-					},
-					"frame": {
-						"x": 187,
-						"y": 307,
-						"w": 62,
-						"h": 57
-					}
-				},
-				{
-					"filename": "0074.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 9,
-						"w": 62,
-						"h": 57
-					},
-					"frame": {
-						"x": 187,
-						"y": 307,
-						"w": 62,
-						"h": 57
-					}
-				},
-				{
-					"filename": "0068.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 62,
-						"h": 63
-					},
-					"frame": {
-						"x": 264,
-						"y": 58,
-						"w": 62,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 55,
-						"h": 63
-					},
-					"frame": {
-						"x": 133,
-						"y": 63,
-						"w": 55,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 55,
-						"h": 63
-					},
-					"frame": {
-						"x": 133,
-						"y": 63,
-						"w": 55,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0039.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 55,
-						"h": 63
-					},
-					"frame": {
-						"x": 133,
-						"y": 63,
-						"w": 55,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0060.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 55,
-						"h": 63
-					},
-					"frame": {
-						"x": 133,
-						"y": 63,
-						"w": 55,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0081.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 0,
-						"w": 55,
-						"h": 66
-					},
-					"frame": {
-						"x": 188,
-						"y": 62,
-						"w": 55,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0082.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 0,
-						"w": 55,
-						"h": 66
-					},
-					"frame": {
-						"x": 188,
-						"y": 62,
-						"w": 55,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0083.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 0,
-						"w": 58,
-						"h": 66
-					},
-					"frame": {
-						"x": 189,
-						"y": 128,
-						"w": 58,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0084.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 0,
-						"w": 60,
-						"h": 66
-					},
-					"frame": {
-						"x": 247,
-						"y": 121,
-						"w": 60,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 59,
-						"h": 63
-					},
-					"frame": {
-						"x": 307,
-						"y": 121,
-						"w": 59,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0041.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 59,
-						"h": 63
-					},
-					"frame": {
-						"x": 307,
-						"y": 121,
-						"w": 59,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0042.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 59,
-						"h": 63
-					},
-					"frame": {
-						"x": 307,
-						"y": 121,
-						"w": 59,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0063.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 59,
-						"h": 63
-					},
-					"frame": {
-						"x": 307,
-						"y": 121,
-						"w": 59,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0065.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 60,
-						"h": 63
-					},
-					"frame": {
-						"x": 247,
-						"y": 187,
-						"w": 60,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0066.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 60,
-						"h": 63
-					},
-					"frame": {
-						"x": 247,
-						"y": 187,
-						"w": 60,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0089.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 60,
-						"h": 63
-					},
-					"frame": {
-						"x": 247,
-						"y": 187,
-						"w": 60,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0090.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 60,
-						"h": 63
-					},
-					"frame": {
-						"x": 247,
-						"y": 187,
-						"w": 60,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 58,
-						"h": 63
-					},
-					"frame": {
-						"x": 307,
-						"y": 184,
-						"w": 58,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0040.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 58,
-						"h": 63
-					},
-					"frame": {
-						"x": 307,
-						"y": 184,
-						"w": 58,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0061.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 58,
-						"h": 63
-					},
-					"frame": {
-						"x": 307,
-						"y": 184,
-						"w": 58,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0062.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 58,
-						"h": 63
-					},
-					"frame": {
-						"x": 307,
-						"y": 184,
-						"w": 58,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0067.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 74,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 60,
-						"h": 63
-					},
-					"frame": {
-						"x": 249,
-						"y": 250,
-						"w": 60,
-						"h": 63
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:0df67af080306e793f3e63687a642a63:bd66cef8682173381b002070c3411214:40bb9f4809624b12bf79bbfe664bea73$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 314, "y": 126, "w": 58, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 58, "h": 61 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 314, "y": 126, "w": 58, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 58, "h": 61 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 314, "y": 126, "w": 58, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 58, "h": 61 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 314, "y": 126, "w": 58, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 58, "h": 61 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 314, "y": 126, "w": 58, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 58, "h": 61 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 0, "y": 185, "w": 59, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 7, "w": 59, "h": 59 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 119, "y": 182, "w": 62, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 9, "w": 62, "h": 57 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 119, "y": 125, "w": 64, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 10, "w": 64, "h": 57 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 195, "y": 0, "w": 66, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 7, "w": 66, "h": 60 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 129, "y": 0, "w": 66, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 66, "h": 61 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 320, "y": 0, "w": 62, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 62, "h": 61 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 314, "y": 126, "w": 58, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 58, "h": 61 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 0, "y": 244, "w": 53, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 53, "h": 61 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 59, "y": 188, "w": 56, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 56, "h": 61 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 306, "y": 187, "w": 57, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 57, "h": 61 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 314, "y": 126, "w": 58, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 58, "h": 61 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 314, "y": 126, "w": 58, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 58, "h": 61 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 314, "y": 126, "w": 58, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 58, "h": 61 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 314, "y": 126, "w": 58, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 58, "h": 61 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 314, "y": 126, "w": 58, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 58, "h": 61 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 0, "y": 185, "w": 59, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 7, "w": 59, "h": 59 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 119, "y": 182, "w": 62, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 9, "w": 62, "h": 57 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 119, "y": 125, "w": 64, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 10, "w": 64, "h": 57 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 195, "y": 0, "w": 66, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 7, "w": 66, "h": 60 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 129, "y": 0, "w": 66, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 66, "h": 61 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 320, "y": 0, "w": 62, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 62, "h": 61 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 314, "y": 126, "w": 58, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 58, "h": 61 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 0, "y": 244, "w": 53, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 53, "h": 61 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 59, "y": 188, "w": 56, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 56, "h": 61 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 306, "y": 187, "w": 57, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 57, "h": 61 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 314, "y": 126, "w": 58, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 58, "h": 61 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 314, "y": 126, "w": 58, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 58, "h": 61 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 314, "y": 126, "w": 58, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 58, "h": 61 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 314, "y": 126, "w": 58, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 58, "h": 61 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 314, "y": 126, "w": 58, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 58, "h": 61 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 0, "y": 185, "w": 59, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 7, "w": 59, "h": 59 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 119, "y": 182, "w": 62, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 9, "w": 62, "h": 57 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 119, "y": 125, "w": 64, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 10, "w": 64, "h": 57 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 195, "y": 0, "w": 66, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 7, "w": 66, "h": 60 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 129, "y": 0, "w": 66, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 66, "h": 61 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 320, "y": 0, "w": 62, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 62, "h": 61 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 314, "y": 126, "w": 58, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 58, "h": 61 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 0, "y": 244, "w": 53, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 53, "h": 61 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 59, "y": 188, "w": 56, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 56, "h": 61 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 306, "y": 187, "w": 57, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 57, "h": 61 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 314, "y": 126, "w": 58, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 58, "h": 61 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 314, "y": 126, "w": 58, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 58, "h": 61 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 248, "y": 129, "w": 58, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 58, "h": 61 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 188, "y": 123, "w": 60, "h": 61 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 60, "h": 61 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 0, "y": 125, "w": 61, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 6, "w": 61, "h": 60 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 0, "y": 66, "w": 63, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 63, "h": 59 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 234, "y": 190, "w": 61, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 10, "w": 61, "h": 56 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 234, "y": 246, "w": 60, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 11, "w": 60, "h": 55 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 115, "y": 239, "w": 61, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 11, "w": 61, "h": 56 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 63, "y": 62, "w": 62, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 7, "w": 62, "h": 60 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 63, "y": 0, "w": 66, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 4, "w": 66, "h": 62 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 0, "y": 0, "w": 63, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 63, "h": 66 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 261, "y": 0, "w": 59, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 59, "h": 66 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 181, "y": 184, "w": 53, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 0, "w": 53, "h": 66 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 63, "y": 122, "w": 56, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 0, "w": 56, "h": 66 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 320, "y": 61, "w": 58, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 1, "w": 58, "h": 65 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 129, "y": 61, "w": 59, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 59, "h": 64 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 195, "y": 60, "w": 60, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 60, "h": 63 },
+    "sourceSize": { "w": 74, "h": 67 }
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 255, "y": 66, "w": 59, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 59, "h": 63 },
+    "sourceSize": { "w": 74, "h": 67 }
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.9.2-x64",
+  "image": "335.png",
+  "format": "I8",
+  "size": { "w": 382, "h": 305 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/shiny/335.png b/public/images/pokemon/shiny/335.png
index 765344af6fd..fc7c325a469 100644
Binary files a/public/images/pokemon/shiny/335.png and b/public/images/pokemon/shiny/335.png differ
diff --git a/public/images/pokemon/shiny/656.json b/public/images/pokemon/shiny/656.json
index be71c2199a3..3776b4ed7e5 100644
--- a/public/images/pokemon/shiny/656.json
+++ b/public/images/pokemon/shiny/656.json
@@ -1,41 +1,20 @@
-{
-	"textures": [
-		{
-			"image": "656.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 35,
-				"h": 35
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 35
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 35
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:272c02df78d2de4eac23552f4c031224:82f806bb336ca1c034951e96a72caaf5:9c4d208e6c2f857bfb0b23b8eea3326c$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 1, "y": 1, "w": 32, "h": 35 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 32, "h": 35 },
+    "sourceSize": { "w": 32, "h": 35 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "656.png",
+  "format": "I8",
+  "size": { "w": 34, "h": 37 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/shiny/656.png b/public/images/pokemon/shiny/656.png
index 7779f40d332..d65d9ab857d 100644
Binary files a/public/images/pokemon/shiny/656.png and b/public/images/pokemon/shiny/656.png differ
diff --git a/public/images/pokemon/shiny/668-female.json b/public/images/pokemon/shiny/668-female.json
deleted file mode 100644
index ce08b281a62..00000000000
--- a/public/images/pokemon/shiny/668-female.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "668-female.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 72,
-				"h": 72
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 63,
-						"h": 72
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 63,
-						"h": 72
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 63,
-						"h": 72
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:bf61792d4b290b767953cfbbc5b6234f:c16e73a6866720618f3b4f8e3e0a0877:d99ed0e84a0695b54e479aa98271aba1$"
-	}
-}
diff --git a/public/images/pokemon/shiny/668-female.png b/public/images/pokemon/shiny/668-female.png
deleted file mode 100644
index 1f56d13bc4c..00000000000
Binary files a/public/images/pokemon/shiny/668-female.png and /dev/null differ
diff --git a/public/images/pokemon/shiny/668.png b/public/images/pokemon/shiny/668.png
index c8ec7c9caf9..73c11b9a7c7 100644
Binary files a/public/images/pokemon/shiny/668.png and b/public/images/pokemon/shiny/668.png differ
diff --git a/public/images/pokemon/shiny/674.json b/public/images/pokemon/shiny/674.json
index 0ce6a2d9018..86d6cba1b01 100644
--- a/public/images/pokemon/shiny/674.json
+++ b/public/images/pokemon/shiny/674.json
@@ -1,41 +1,506 @@
-{
-	"textures": [
-		{
-			"image": "674.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 42,
-				"h": 42
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 28,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 28,
-						"h": 42
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 28,
-						"h": 42
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:3a00525649c00ed79ef7fff441994eb0:17d95f774222b5d9946bcc63782468e3:b823d10f1c9b4d501296982088ba63d6$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 58, "y": 0, "w": 28, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 28, "h": 42 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 0, "y": 42, "w": 28, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 28, "h": 41 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 70
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 0, "y": 83, "w": 28, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 28, "h": 40 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 28, "y": 120, "w": 28, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 28, "h": 39 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 210
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 0, "y": 83, "w": 28, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 28, "h": 40 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 0, "y": 42, "w": 28, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 28, "h": 41 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 58, "y": 0, "w": 28, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 28, "h": 42 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 0, "y": 42, "w": 28, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 28, "h": 41 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 70
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 0, "y": 83, "w": 28, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 28, "h": 40 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 28, "y": 120, "w": 28, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 28, "h": 39 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 210
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 0, "y": 83, "w": 28, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 28, "h": 40 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 0, "y": 42, "w": 28, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 28, "h": 41 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 58, "y": 0, "w": 28, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 28, "h": 42 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 0, "y": 42, "w": 28, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 28, "h": 41 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 70
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 0, "y": 83, "w": 28, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 28, "h": 40 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 28, "y": 120, "w": 28, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 28, "h": 39 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 210
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 0, "y": 83, "w": 28, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 28, "h": 40 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 0, "y": 42, "w": 28, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 28, "h": 41 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 58, "y": 0, "w": 28, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 28, "h": 42 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 0, "y": 42, "w": 28, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 28, "h": 41 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 70
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 0, "y": 83, "w": 28, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 28, "h": 40 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 28, "y": 120, "w": 28, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 28, "h": 39 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 210
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 0, "y": 83, "w": 28, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 28, "h": 40 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 0, "y": 42, "w": 28, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 28, "h": 41 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 58, "y": 0, "w": 28, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 28, "h": 42 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 0, "y": 42, "w": 28, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 28, "h": 41 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 70
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 0, "y": 83, "w": 28, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 28, "h": 40 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 28, "y": 120, "w": 28, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 28, "h": 39 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 210
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 0, "y": 83, "w": 28, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 28, "h": 40 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 0, "y": 42, "w": 28, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 28, "h": 41 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 58, "y": 0, "w": 28, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 28, "h": 42 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 58, "y": 42, "w": 28, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 28, "h": 41 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 70
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 57, "y": 83, "w": 28, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 28, "h": 40 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 0, "y": 123, "w": 28, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 28, "h": 39 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 210
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 57, "y": 83, "w": 28, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 28, "h": 40 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 86, "y": 42, "w": 28, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 28, "h": 41 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 0, "y": 0, "w": 29, "h": 42 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 29, "y": 0, "w": 29, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 29, "h": 41 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 70
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 29, "y": 41, "w": 29, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 29, "h": 40 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 28, "y": 81, "w": 29, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 29, "h": 39 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 210
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 29, "y": 41, "w": 29, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 29, "h": 40 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 29, "y": 0, "w": 29, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 29, "h": 41 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 0, "y": 0, "w": 29, "h": 42 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 29, "y": 0, "w": 29, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 29, "h": 41 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 70
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 29, "y": 41, "w": 29, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 29, "h": 40 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 28, "y": 81, "w": 29, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 29, "h": 39 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 210
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 29, "y": 41, "w": 29, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 29, "h": 40 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 29, "y": 0, "w": 29, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 29, "h": 41 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 0, "y": 0, "w": 29, "h": 42 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 29, "h": 42 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 86, "y": 42, "w": 28, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 28, "h": 41 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 70
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 57, "y": 83, "w": 28, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 28, "h": 40 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 0, "y": 123, "w": 28, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 28, "h": 39 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 210
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 85, "y": 83, "w": 28, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 28, "h": 40 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 70
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 0, "y": 42, "w": 28, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 28, "h": 41 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 140
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 86, "y": 0, "w": 28, "h": 42 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 28, "h": 42 },
+    "sourceSize": { "w": 29, "h": 42 },
+    "duration": 70
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.11-x64",
+  "image": "674.png",
+  "format": "I8",
+  "size": { "w": 114, "h": 162 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/shiny/674.png b/public/images/pokemon/shiny/674.png
index 097368405fc..7c8e71d5988 100644
Binary files a/public/images/pokemon/shiny/674.png and b/public/images/pokemon/shiny/674.png differ
diff --git a/public/images/pokemon/shiny/694.json b/public/images/pokemon/shiny/694.json
index 0893d62dc10..48e9623d7f4 100644
--- a/public/images/pokemon/shiny/694.json
+++ b/public/images/pokemon/shiny/694.json
@@ -1,41 +1,767 @@
-{
-	"textures": [
-		{
-			"image": "694.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 41,
-				"h": 41
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 41,
-						"h": 38
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 38
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 38
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:bc6e45d13f38b4219ae03e14bb0999b9:7eab0806a2282a4facdb9684c54189e5:b0990f9650cfe63b836cbed33f0b44d8$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 41, "y": 176, "w": 41, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 12, "w": 41, "h": 38 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 158, "y": 137, "w": 42, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 12, "w": 42, "h": 38 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 0, "y": 133, "w": 43, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 12, "w": 43, "h": 38 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 114, "y": 132, "w": 44, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 12, "w": 44, "h": 38 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 0, "y": 95, "w": 45, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 12, "w": 45, "h": 38 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 227, "y": 131, "w": 46, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 13, "w": 46, "h": 37 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 273, "y": 136, "w": 44, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 13, "w": 44, "h": 37 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 82, "y": 208, "w": 41, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 13, "w": 41, "h": 37 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 246, "y": 211, "w": 39, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 13, "w": 39, "h": 37 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 207, "y": 211, "w": 39, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 13, "w": 39, "h": 37 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 285, "y": 211, "w": 38, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 13, "w": 38, "h": 37 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 123, "y": 213, "w": 39, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 14, "w": 39, "h": 36 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 0, "y": 209, "w": 40, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 13, "w": 40, "h": 37 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 167, "y": 206, "w": 40, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 12, "w": 40, "h": 38 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 200, "y": 168, "w": 41, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 12, "w": 41, "h": 38 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 41, "y": 176, "w": 41, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 12, "w": 41, "h": 38 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 158, "y": 137, "w": 42, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 12, "w": 42, "h": 38 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 0, "y": 133, "w": 43, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 12, "w": 43, "h": 38 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 114, "y": 132, "w": 44, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 12, "w": 44, "h": 38 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 0, "y": 95, "w": 45, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 12, "w": 45, "h": 38 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 227, "y": 131, "w": 46, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 13, "w": 46, "h": 37 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 273, "y": 136, "w": 44, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 13, "w": 44, "h": 37 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 82, "y": 208, "w": 41, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 13, "w": 41, "h": 37 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 246, "y": 211, "w": 39, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 13, "w": 39, "h": 37 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 207, "y": 211, "w": 39, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 13, "w": 39, "h": 37 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 285, "y": 211, "w": 38, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 13, "w": 38, "h": 37 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 123, "y": 213, "w": 39, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 14, "w": 39, "h": 36 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 0, "y": 209, "w": 40, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 13, "w": 40, "h": 37 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 167, "y": 206, "w": 40, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 12, "w": 40, "h": 38 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 200, "y": 168, "w": 41, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 12, "w": 41, "h": 38 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 41, "y": 176, "w": 41, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 12, "w": 41, "h": 38 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 158, "y": 137, "w": 42, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 12, "w": 42, "h": 38 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 0, "y": 133, "w": 43, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 12, "w": 43, "h": 38 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 114, "y": 132, "w": 44, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 12, "w": 44, "h": 38 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 0, "y": 95, "w": 45, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 12, "w": 45, "h": 38 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 227, "y": 131, "w": 46, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 13, "w": 46, "h": 37 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 273, "y": 136, "w": 44, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 13, "w": 44, "h": 37 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 82, "y": 208, "w": 41, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 13, "w": 41, "h": 37 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 246, "y": 211, "w": 39, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 13, "w": 39, "h": 37 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 207, "y": 211, "w": 39, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 13, "w": 39, "h": 37 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 285, "y": 211, "w": 38, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 13, "w": 38, "h": 37 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 123, "y": 213, "w": 39, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 14, "w": 39, "h": 36 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 0, "y": 209, "w": 40, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 13, "w": 40, "h": 37 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 167, "y": 206, "w": 40, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 12, "w": 40, "h": 38 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 200, "y": 168, "w": 41, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 12, "w": 41, "h": 38 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 41, "y": 176, "w": 41, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 12, "w": 41, "h": 38 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 158, "y": 137, "w": 42, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 12, "w": 42, "h": 38 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 0, "y": 133, "w": 43, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 12, "w": 43, "h": 38 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 114, "y": 132, "w": 44, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 12, "w": 44, "h": 38 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 0, "y": 95, "w": 45, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 12, "w": 45, "h": 38 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 227, "y": 131, "w": 46, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 13, "w": 46, "h": 37 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 273, "y": 136, "w": 44, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 13, "w": 44, "h": 37 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 82, "y": 208, "w": 41, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 13, "w": 41, "h": 37 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 246, "y": 211, "w": 39, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 13, "w": 39, "h": 37 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 207, "y": 211, "w": 39, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 13, "w": 39, "h": 37 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 285, "y": 211, "w": 38, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 13, "w": 38, "h": 37 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 123, "y": 213, "w": 39, "h": 36 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 14, "w": 39, "h": 36 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 0, "y": 209, "w": 40, "h": 37 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 13, "w": 40, "h": 37 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 167, "y": 206, "w": 40, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 12, "w": 40, "h": 38 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 200, "y": 168, "w": 41, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 12, "w": 41, "h": 38 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 41, "y": 176, "w": 41, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 12, "w": 41, "h": 38 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 282, "y": 173, "w": 41, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 12, "w": 41, "h": 38 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 241, "y": 173, "w": 41, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 12, "w": 41, "h": 38 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 0, "y": 171, "w": 41, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 12, "w": 41, "h": 38 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 85, "y": 170, "w": 41, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 12, "w": 41, "h": 38 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 227, "y": 93, "w": 52, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 12, "w": 52, "h": 38 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 57, "y": 50, "w": 55, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 11, "w": 55, "h": 39 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 56, "y": 0, "w": 56, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 0, "w": 56, "h": 50 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 112, "y": 0, "w": 56, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 56, "h": 49 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 0, "y": 0, "w": 56, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 56, "h": 50 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 224, "y": 47, "w": 57, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 57, "h": 46 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 281, "y": 46, "w": 57, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 57, "h": 46 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 168, "y": 0, "w": 56, "h": 48 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 2, "w": 56, "h": 48 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 281, "y": 0, "w": 57, "h": 46 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 57, "h": 46 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 170, "y": 93, "w": 57, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 57, "h": 44 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 224, "y": 0, "w": 57, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 57, "h": 47 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 0, "y": 50, "w": 57, "h": 45 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 57, "h": 45 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 281, "y": 92, "w": 57, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 6, "w": 57, "h": 44 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 57, "y": 94, "w": 57, "h": 44 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 6, "w": 57, "h": 44 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 112, "y": 49, "w": 58, "h": 45 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 58, "h": 45 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 114, "y": 94, "w": 56, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 12, "w": 56, "h": 38 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 170, "y": 48, "w": 53, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 12, "w": 53, "h": 38 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 126, "y": 175, "w": 41, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 12, "w": 41, "h": 38 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 43, "y": 138, "w": 42, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 12, "w": 42, "h": 38 },
+    "sourceSize": { "w": 62, "h": 50 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.11-x64",
+  "image": "694.png",
+  "format": "I8",
+  "size": { "w": 338, "h": 249 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/shiny/694.png b/public/images/pokemon/shiny/694.png
index a6c87937252..5f65aa5d4ff 100644
Binary files a/public/images/pokemon/shiny/694.png and b/public/images/pokemon/shiny/694.png differ
diff --git a/public/images/pokemon/shiny/698.json b/public/images/pokemon/shiny/698.json
index 707a84c8ca1..6baf41b0ce7 100644
--- a/public/images/pokemon/shiny/698.json
+++ b/public/images/pokemon/shiny/698.json
@@ -1,41 +1,1415 @@
-{
-	"textures": [
-		{
-			"image": "698.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 57,
-				"h": 57
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 32,
-						"h": 57
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 57
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 32,
-						"h": 57
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:46f728cad32ec7681d76168817f7001a:a044b85c8682cf2b3ce52dd5cb859583:198087d69fed44d4a642fa3ba5c077d6$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 93, "y": 56, "w": 32, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 93, "y": 56, "w": 32, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 30, "y": 114, "w": 31, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 31, "h": 57 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 30, "y": 114, "w": 31, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 31, "h": 57 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 123, "y": 113, "w": 29, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 4, "w": 29, "h": 56 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 123, "y": 113, "w": 29, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 4, "w": 29, "h": 56 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 123, "y": 169, "w": 28, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 28, "h": 55 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 123, "y": 169, "w": 28, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 28, "h": 55 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 125, "y": 56, "w": 27, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 6, "w": 27, "h": 54 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 125, "y": 56, "w": 27, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 6, "w": 27, "h": 54 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 125, "y": 56, "w": 27, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 6, "w": 27, "h": 54 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 123, "y": 169, "w": 28, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 28, "h": 55 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 123, "y": 169, "w": 28, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 28, "h": 55 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 123, "y": 113, "w": 29, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 4, "w": 29, "h": 56 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 123, "y": 113, "w": 29, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 4, "w": 29, "h": 56 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 30, "y": 114, "w": 31, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 31, "h": 57 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 30, "y": 114, "w": 31, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 31, "h": 57 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 93, "y": 56, "w": 32, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 93, "y": 56, "w": 32, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 93, "y": 56, "w": 32, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 93, "y": 56, "w": 32, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 93, "y": 56, "w": 32, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 111, "y": 0, "w": 34, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 34, "h": 56 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 111, "y": 0, "w": 34, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 34, "h": 56 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 75, "y": 0, "w": 36, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 36, "h": 55 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 75, "y": 0, "w": 36, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 36, "h": 55 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 38, "y": 0, "w": 37, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 37, "h": 54 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 38, "y": 0, "w": 37, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 37, "h": 54 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 0, "y": 0, "w": 38, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 38, "h": 53 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 0, "y": 0, "w": 38, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 38, "h": 53 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 0, "y": 0, "w": 38, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 38, "h": 53 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 38, "y": 0, "w": 37, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 37, "h": 54 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 38, "y": 0, "w": 37, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 37, "h": 54 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 75, "y": 0, "w": 36, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 36, "h": 55 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 75, "y": 0, "w": 36, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 36, "h": 55 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 111, "y": 0, "w": 34, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 34, "h": 56 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 111, "y": 0, "w": 34, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 34, "h": 56 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 93, "y": 56, "w": 32, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 93, "y": 56, "w": 32, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 93, "y": 56, "w": 32, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 93, "y": 56, "w": 32, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 93, "y": 56, "w": 32, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 30, "y": 114, "w": 31, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 31, "h": 57 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 30, "y": 114, "w": 31, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 31, "h": 57 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 123, "y": 113, "w": 29, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 4, "w": 29, "h": 56 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 123, "y": 113, "w": 29, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 4, "w": 29, "h": 56 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 123, "y": 169, "w": 28, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 28, "h": 55 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 123, "y": 169, "w": 28, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 28, "h": 55 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 125, "y": 56, "w": 27, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 6, "w": 27, "h": 54 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 125, "y": 56, "w": 27, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 6, "w": 27, "h": 54 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 125, "y": 56, "w": 27, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 6, "w": 27, "h": 54 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 123, "y": 169, "w": 28, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 28, "h": 55 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 123, "y": 169, "w": 28, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 28, "h": 55 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 123, "y": 113, "w": 29, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 4, "w": 29, "h": 56 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 123, "y": 113, "w": 29, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 4, "w": 29, "h": 56 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 30, "y": 114, "w": 31, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 31, "h": 57 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 30, "y": 114, "w": 31, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 31, "h": 57 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 93, "y": 56, "w": 32, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 93, "y": 56, "w": 32, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 93, "y": 56, "w": 32, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 93, "y": 56, "w": 32, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 93, "y": 56, "w": 32, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 111, "y": 0, "w": 34, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 34, "h": 56 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 111, "y": 0, "w": 34, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 34, "h": 56 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 75, "y": 0, "w": 36, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 36, "h": 55 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 75, "y": 0, "w": 36, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 36, "h": 55 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 38, "y": 0, "w": 37, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 37, "h": 54 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 38, "y": 0, "w": 37, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 37, "h": 54 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 0, "y": 0, "w": 38, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 38, "h": 53 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 0, "y": 0, "w": 38, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 38, "h": 53 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 0, "y": 0, "w": 38, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 38, "h": 53 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 38, "y": 0, "w": 37, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 37, "h": 54 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 38, "y": 0, "w": 37, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 37, "h": 54 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 75, "y": 0, "w": 36, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 36, "h": 55 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 75, "y": 0, "w": 36, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 36, "h": 55 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 111, "y": 0, "w": 34, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 34, "h": 56 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 111, "y": 0, "w": 34, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 34, "h": 56 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 93, "y": 56, "w": 32, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 93, "y": 56, "w": 32, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 93, "y": 56, "w": 32, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 93, "y": 56, "w": 32, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 93, "y": 56, "w": 32, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 30, "y": 114, "w": 31, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 31, "h": 57 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 30, "y": 114, "w": 31, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 31, "h": 57 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 123, "y": 113, "w": 29, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 4, "w": 29, "h": 56 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 123, "y": 113, "w": 29, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 4, "w": 29, "h": 56 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 123, "y": 169, "w": 28, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 28, "h": 55 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0088.png",
+    "frame": { "x": 123, "y": 169, "w": 28, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 28, "h": 55 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0089.png",
+    "frame": { "x": 125, "y": 56, "w": 27, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 6, "w": 27, "h": 54 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0090.png",
+    "frame": { "x": 125, "y": 56, "w": 27, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 6, "w": 27, "h": 54 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0091.png",
+    "frame": { "x": 125, "y": 56, "w": 27, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 6, "w": 27, "h": 54 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0092.png",
+    "frame": { "x": 123, "y": 169, "w": 28, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 28, "h": 55 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0093.png",
+    "frame": { "x": 123, "y": 169, "w": 28, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 28, "h": 55 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0094.png",
+    "frame": { "x": 123, "y": 113, "w": 29, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 4, "w": 29, "h": 56 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0095.png",
+    "frame": { "x": 123, "y": 113, "w": 29, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 4, "w": 29, "h": 56 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0096.png",
+    "frame": { "x": 30, "y": 114, "w": 31, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 31, "h": 57 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0097.png",
+    "frame": { "x": 30, "y": 114, "w": 31, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 31, "h": 57 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0098.png",
+    "frame": { "x": 93, "y": 56, "w": 32, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0099.png",
+    "frame": { "x": 93, "y": 56, "w": 32, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0100.png",
+    "frame": { "x": 93, "y": 56, "w": 32, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0101.png",
+    "frame": { "x": 93, "y": 56, "w": 32, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0102.png",
+    "frame": { "x": 93, "y": 56, "w": 32, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0103.png",
+    "frame": { "x": 111, "y": 0, "w": 34, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 34, "h": 56 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0104.png",
+    "frame": { "x": 111, "y": 0, "w": 34, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 34, "h": 56 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0105.png",
+    "frame": { "x": 75, "y": 0, "w": 36, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 36, "h": 55 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0106.png",
+    "frame": { "x": 75, "y": 0, "w": 36, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 36, "h": 55 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0107.png",
+    "frame": { "x": 38, "y": 0, "w": 37, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 37, "h": 54 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0108.png",
+    "frame": { "x": 38, "y": 0, "w": 37, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 37, "h": 54 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0109.png",
+    "frame": { "x": 0, "y": 0, "w": 38, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 38, "h": 53 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0110.png",
+    "frame": { "x": 0, "y": 0, "w": 38, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 38, "h": 53 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0111.png",
+    "frame": { "x": 0, "y": 0, "w": 38, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 38, "h": 53 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0112.png",
+    "frame": { "x": 38, "y": 0, "w": 37, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 37, "h": 54 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0113.png",
+    "frame": { "x": 38, "y": 0, "w": 37, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 37, "h": 54 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0114.png",
+    "frame": { "x": 75, "y": 0, "w": 36, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 36, "h": 55 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0115.png",
+    "frame": { "x": 75, "y": 0, "w": 36, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 36, "h": 55 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0116.png",
+    "frame": { "x": 111, "y": 0, "w": 34, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 34, "h": 56 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0117.png",
+    "frame": { "x": 111, "y": 0, "w": 34, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 34, "h": 56 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0118.png",
+    "frame": { "x": 93, "y": 56, "w": 32, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0119.png",
+    "frame": { "x": 93, "y": 56, "w": 32, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0120.png",
+    "frame": { "x": 93, "y": 56, "w": 32, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0121.png",
+    "frame": { "x": 93, "y": 56, "w": 32, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0122.png",
+    "frame": { "x": 93, "y": 56, "w": 32, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0123.png",
+    "frame": { "x": 61, "y": 115, "w": 30, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 30, "h": 58 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0124.png",
+    "frame": { "x": 61, "y": 115, "w": 30, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 30, "h": 58 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0125.png",
+    "frame": { "x": 93, "y": 113, "w": 30, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 1, "w": 30, "h": 59 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0126.png",
+    "frame": { "x": 93, "y": 113, "w": 30, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 1, "w": 30, "h": 59 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0127.png",
+    "frame": { "x": 0, "y": 113, "w": 30, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 30, "h": 60 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0128.png",
+    "frame": { "x": 0, "y": 113, "w": 30, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 30, "h": 60 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0129.png",
+    "frame": { "x": 0, "y": 53, "w": 31, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 31, "h": 60 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0130.png",
+    "frame": { "x": 0, "y": 53, "w": 31, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 31, "h": 60 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0131.png",
+    "frame": { "x": 31, "y": 54, "w": 31, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 31, "h": 60 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0132.png",
+    "frame": { "x": 31, "y": 54, "w": 31, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 31, "h": 60 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0133.png",
+    "frame": { "x": 62, "y": 55, "w": 31, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 31, "h": 60 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0134.png",
+    "frame": { "x": 62, "y": 55, "w": 31, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 31, "h": 60 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0135.png",
+    "frame": { "x": 0, "y": 53, "w": 31, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 31, "h": 60 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0136.png",
+    "frame": { "x": 0, "y": 53, "w": 31, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 31, "h": 60 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0137.png",
+    "frame": { "x": 31, "y": 54, "w": 31, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 31, "h": 60 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0138.png",
+    "frame": { "x": 31, "y": 54, "w": 31, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 31, "h": 60 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0139.png",
+    "frame": { "x": 62, "y": 55, "w": 31, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 31, "h": 60 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0140.png",
+    "frame": { "x": 62, "y": 55, "w": 31, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 31, "h": 60 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0141.png",
+    "frame": { "x": 0, "y": 53, "w": 31, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 31, "h": 60 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0142.png",
+    "frame": { "x": 0, "y": 53, "w": 31, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 31, "h": 60 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0143.png",
+    "frame": { "x": 31, "y": 54, "w": 31, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 31, "h": 60 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0144.png",
+    "frame": { "x": 31, "y": 54, "w": 31, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 31, "h": 60 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0145.png",
+    "frame": { "x": 62, "y": 55, "w": 31, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 31, "h": 60 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0146.png",
+    "frame": { "x": 62, "y": 55, "w": 31, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 31, "h": 60 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0147.png",
+    "frame": { "x": 0, "y": 53, "w": 31, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 31, "h": 60 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0148.png",
+    "frame": { "x": 0, "y": 53, "w": 31, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 31, "h": 60 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0149.png",
+    "frame": { "x": 31, "y": 54, "w": 31, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 31, "h": 60 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0150.png",
+    "frame": { "x": 31, "y": 54, "w": 31, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 31, "h": 60 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0151.png",
+    "frame": { "x": 93, "y": 113, "w": 30, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 1, "w": 30, "h": 59 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0152.png",
+    "frame": { "x": 93, "y": 113, "w": 30, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 1, "w": 30, "h": 59 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0153.png",
+    "frame": { "x": 61, "y": 115, "w": 30, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 30, "h": 58 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0154.png",
+    "frame": { "x": 61, "y": 115, "w": 30, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 30, "h": 58 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0155.png",
+    "frame": { "x": 93, "y": 56, "w": 32, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   },
+   {
+    "filename": "0156.png",
+    "frame": { "x": 93, "y": 56, "w": 32, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 32, "h": 57 },
+    "sourceSize": { "w": 38, "h": 60 },
+    "duration": 50
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.11-x64",
+  "image": "698.png",
+  "format": "I8",
+  "size": { "w": 152, "h": 224 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/shiny/698.png b/public/images/pokemon/shiny/698.png
index c04cc11875d..a861e0c14d5 100644
Binary files a/public/images/pokemon/shiny/698.png and b/public/images/pokemon/shiny/698.png differ
diff --git a/public/images/pokemon/shiny/703.json b/public/images/pokemon/shiny/703.json
index bc3c40dd555..5c0a6230108 100644
--- a/public/images/pokemon/shiny/703.json
+++ b/public/images/pokemon/shiny/703.json
@@ -1,41 +1,569 @@
-{
-	"textures": [
-		{
-			"image": "703.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 38,
-				"h": 38
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 37,
-						"h": 38
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 38
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 38
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:3b9620097a6f8beec26187d7454b0493:5bb102b3070894423e8dff3d1f98cd21:721af8c322ff60159262e9b3017c784d$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 0, "y": 0, "w": 37, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 37, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 37, "y": 0, "w": 37, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 37, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 35, "y": 38, "w": 36, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 36, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 71, "y": 38, "w": 36, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 36, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 107, "y": 38, "w": 36, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 8, "w": 36, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 0, "y": 78, "w": 35, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 9, "w": 35, "h": 39 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 148, "y": 0, "w": 35, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 9, "w": 35, "h": 40 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 0, "y": 38, "w": 35, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 8, "w": 35, "h": 40 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 143, "y": 78, "w": 35, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 7, "w": 35, "h": 39 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 143, "y": 40, "w": 36, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 36, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 35, "y": 76, "w": 36, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 36, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 71, "y": 76, "w": 36, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 0, "y": 0, "w": 37, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 37, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 37, "y": 0, "w": 37, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 37, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 35, "y": 38, "w": 36, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 36, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 71, "y": 38, "w": 36, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 36, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 107, "y": 38, "w": 36, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 8, "w": 36, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 0, "y": 78, "w": 35, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 9, "w": 35, "h": 39 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 148, "y": 0, "w": 35, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 9, "w": 35, "h": 40 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 0, "y": 38, "w": 35, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 8, "w": 35, "h": 40 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 143, "y": 78, "w": 35, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 7, "w": 35, "h": 39 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 143, "y": 40, "w": 36, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 36, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 35, "y": 76, "w": 36, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 36, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 71, "y": 76, "w": 36, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 0, "y": 0, "w": 37, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 37, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 37, "y": 0, "w": 37, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 37, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 35, "y": 38, "w": 36, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 36, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 71, "y": 38, "w": 36, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 36, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 107, "y": 38, "w": 36, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 8, "w": 36, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 0, "y": 78, "w": 35, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 9, "w": 35, "h": 39 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 148, "y": 0, "w": 35, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 9, "w": 35, "h": 40 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 0, "y": 38, "w": 35, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 8, "w": 35, "h": 40 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 143, "y": 78, "w": 35, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 7, "w": 35, "h": 39 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 143, "y": 40, "w": 36, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 36, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 35, "y": 76, "w": 36, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 36, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 71, "y": 76, "w": 36, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 0, "y": 0, "w": 37, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 37, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 37, "y": 0, "w": 37, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 37, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 35, "y": 38, "w": 36, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 36, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 71, "y": 38, "w": 36, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 6, "w": 36, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 107, "y": 38, "w": 36, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 8, "w": 36, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 0, "y": 78, "w": 35, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 9, "w": 35, "h": 39 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 148, "y": 0, "w": 35, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 9, "w": 35, "h": 40 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 0, "y": 38, "w": 35, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 8, "w": 35, "h": 40 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 143, "y": 78, "w": 35, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 7, "w": 35, "h": 39 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 143, "y": 40, "w": 36, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 36, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 35, "y": 76, "w": 36, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 36, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 71, "y": 76, "w": 36, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 1, "w": 36, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 0, "y": 0, "w": 37, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 0, "w": 37, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 74, "y": 0, "w": 37, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 37, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 35, "y": 114, "w": 35, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 35, "h": 39 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 70, "y": 114, "w": 35, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 7, "w": 35, "h": 39 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 105, "y": 114, "w": 35, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 35, "h": 39 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 0, "y": 117, "w": 35, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 6, "w": 35, "h": 39 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 140, "y": 117, "w": 35, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 35, "h": 39 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 0, "y": 117, "w": 35, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 6, "w": 35, "h": 39 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 0, "y": 117, "w": 35, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 35, "h": 39 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 0, "y": 117, "w": 35, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 6, "w": 35, "h": 39 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 35, "y": 153, "w": 35, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 35, "h": 39 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 111, "y": 0, "w": 37, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 37, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 107, "y": 76, "w": 36, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 36, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 107, "y": 76, "w": 36, "h": 38 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 36, "h": 38 },
+    "sourceSize": { "w": 40, "h": 49 },
+    "duration": 110
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.11-x64",
+  "image": "703.png",
+  "format": "I8",
+  "size": { "w": 183, "h": 192 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/shiny/703.png b/public/images/pokemon/shiny/703.png
index 7d0d7999166..44ac529283c 100644
Binary files a/public/images/pokemon/shiny/703.png and b/public/images/pokemon/shiny/703.png differ
diff --git a/public/images/pokemon/shiny/707.json b/public/images/pokemon/shiny/707.json
index f0e0b2053ac..ee5036fb541 100644
--- a/public/images/pokemon/shiny/707.json
+++ b/public/images/pokemon/shiny/707.json
@@ -1,41 +1,1559 @@
-{
-	"textures": [
-		{
-			"image": "707.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 77,
-				"h": 77
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 43,
-						"h": 77
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 43,
-						"h": 77
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 43,
-						"h": 77
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:f2be0784fdc424d853cf61d4ff5ef128:c0a67b3382e00d7635b97e14ca444b8e:8e96b9056ea81e44ced99c97f472a528$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 335, "y": 370, "w": 43, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 36, "y": 18, "w": 43, "h": 77 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 88, "y": 429, "w": 42, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 35, "y": 17, "w": 42, "h": 77 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 532, "y": 448, "w": 41, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 33, "y": 16, "w": 41, "h": 76 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 490, "y": 432, "w": 42, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 31, "y": 16, "w": 42, "h": 76 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 566, "y": 373, "w": 44, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 15, "w": 44, "h": 75 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 652, "y": 426, "w": 44, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 15, "w": 44, "h": 74 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 289, "y": 330, "w": 46, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 13, "w": 46, "h": 74 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 49, "y": 354, "w": 47, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 14, "w": 47, "h": 72 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 195, "y": 280, "w": 49, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 17, "y": 13, "w": 49, "h": 72 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 629, "y": 153, "w": 53, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 12, "w": 53, "h": 71 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 692, "y": 151, "w": 54, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 13, "w": 54, "h": 70 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 195, "y": 209, "w": 52, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 14, "w": 52, "h": 71 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 247, "y": 215, "w": 51, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 13, "w": 51, "h": 72 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 522, "y": 219, "w": 50, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 15, "w": 50, "h": 72 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 618, "y": 224, "w": 49, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 15, "w": 49, "h": 73 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 352, "y": 296, "w": 47, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 16, "w": 47, "h": 74 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 96, "y": 354, "w": 45, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 29, "y": 16, "w": 45, "h": 75 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 378, "y": 372, "w": 44, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 32, "y": 17, "w": 44, "h": 75 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 276, "y": 404, "w": 43, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 34, "y": 18, "w": 43, "h": 76 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 361, "y": 447, "w": 41, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 37, "y": 17, "w": 41, "h": 76 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 233, "y": 365, "w": 43, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 38, "y": 16, "w": 43, "h": 77 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 618, "y": 297, "w": 44, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 41, "y": 16, "w": 44, "h": 78 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 144, "y": 282, "w": 45, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 42, "y": 15, "w": 45, "h": 78 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 378, "y": 218, "w": 47, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 43, "y": 14, "w": 47, "h": 78 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 100, "y": 199, "w": 48, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 45, "y": 13, "w": 48, "h": 78 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 474, "y": 141, "w": 50, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 47, "y": 13, "w": 50, "h": 78 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 422, "y": 69, "w": 52, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 48, "y": 12, "w": 52, "h": 78 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 707, "y": 2, "w": 54, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 50, "y": 11, "w": 54, "h": 78 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 651, "y": 2, "w": 56, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 48, "y": 12, "w": 56, "h": 77 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 2, "y": 65, "w": 54, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 47, "y": 13, "w": 54, "h": 77 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 273, "y": 69, "w": 53, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 45, "y": 13, "w": 53, "h": 78 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 586, "y": 71, "w": 52, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 43, "y": 14, "w": 52, "h": 78 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 2, "y": 142, "w": 50, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 42, "y": 15, "w": 50, "h": 78 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 52, "y": 199, "w": 48, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 41, "y": 16, "w": 48, "h": 78 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 98, "y": 277, "w": 46, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 39, "y": 16, "w": 46, "h": 77 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 712, "y": 296, "w": 45, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 37, "y": 17, "w": 45, "h": 77 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 335, "y": 370, "w": 43, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 36, "y": 18, "w": 43, "h": 77 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 88, "y": 429, "w": 42, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 35, "y": 17, "w": 42, "h": 77 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 532, "y": 448, "w": 41, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 33, "y": 16, "w": 41, "h": 76 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 490, "y": 432, "w": 42, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 31, "y": 16, "w": 42, "h": 76 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 566, "y": 373, "w": 44, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 15, "w": 44, "h": 75 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 652, "y": 426, "w": 44, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 15, "w": 44, "h": 74 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 289, "y": 330, "w": 46, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 13, "w": 46, "h": 74 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 49, "y": 354, "w": 47, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 14, "w": 47, "h": 72 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 195, "y": 280, "w": 49, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 17, "y": 13, "w": 49, "h": 72 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 629, "y": 153, "w": 53, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 12, "w": 53, "h": 71 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 692, "y": 151, "w": 54, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 13, "w": 54, "h": 70 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 195, "y": 209, "w": 52, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 14, "w": 52, "h": 71 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 247, "y": 215, "w": 51, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 13, "w": 51, "h": 72 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 522, "y": 219, "w": 50, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 15, "w": 50, "h": 72 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 618, "y": 224, "w": 49, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 15, "w": 49, "h": 73 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 352, "y": 296, "w": 47, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 16, "w": 47, "h": 74 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 96, "y": 354, "w": 45, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 29, "y": 16, "w": 45, "h": 75 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 378, "y": 372, "w": 44, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 32, "y": 17, "w": 44, "h": 75 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 276, "y": 404, "w": 43, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 34, "y": 18, "w": 43, "h": 76 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 361, "y": 447, "w": 41, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 37, "y": 17, "w": 41, "h": 76 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 233, "y": 365, "w": 43, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 38, "y": 16, "w": 43, "h": 77 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 618, "y": 297, "w": 44, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 41, "y": 16, "w": 44, "h": 78 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 144, "y": 282, "w": 45, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 42, "y": 15, "w": 45, "h": 78 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 378, "y": 218, "w": 47, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 43, "y": 14, "w": 47, "h": 78 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 100, "y": 199, "w": 48, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 45, "y": 13, "w": 48, "h": 78 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 474, "y": 141, "w": 50, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 47, "y": 13, "w": 50, "h": 78 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 422, "y": 69, "w": 52, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 48, "y": 12, "w": 52, "h": 78 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 707, "y": 2, "w": 54, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 50, "y": 11, "w": 54, "h": 78 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 651, "y": 2, "w": 56, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 48, "y": 12, "w": 56, "h": 77 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 2, "y": 65, "w": 54, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 47, "y": 13, "w": 54, "h": 77 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 273, "y": 69, "w": 53, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 45, "y": 13, "w": 53, "h": 78 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 586, "y": 71, "w": 52, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 43, "y": 14, "w": 52, "h": 78 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 2, "y": 142, "w": 50, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 42, "y": 15, "w": 50, "h": 78 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 52, "y": 199, "w": 48, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 41, "y": 16, "w": 48, "h": 78 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 98, "y": 277, "w": 46, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 39, "y": 16, "w": 46, "h": 77 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 712, "y": 296, "w": 45, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 37, "y": 17, "w": 45, "h": 77 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 335, "y": 370, "w": 43, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 36, "y": 18, "w": 43, "h": 77 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 88, "y": 429, "w": 42, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 35, "y": 17, "w": 42, "h": 77 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 532, "y": 448, "w": 41, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 33, "y": 16, "w": 41, "h": 76 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 490, "y": 432, "w": 42, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 31, "y": 16, "w": 42, "h": 76 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 566, "y": 373, "w": 44, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 15, "w": 44, "h": 75 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 652, "y": 426, "w": 44, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 15, "w": 44, "h": 74 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 289, "y": 330, "w": 46, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 13, "w": 46, "h": 74 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 49, "y": 354, "w": 47, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 14, "w": 47, "h": 72 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 195, "y": 280, "w": 49, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 17, "y": 13, "w": 49, "h": 72 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 629, "y": 153, "w": 53, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 12, "w": 53, "h": 71 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 692, "y": 151, "w": 54, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 13, "w": 54, "h": 70 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 195, "y": 209, "w": 52, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 14, "w": 52, "h": 71 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 247, "y": 215, "w": 51, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 13, "w": 51, "h": 72 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 522, "y": 219, "w": 50, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 15, "w": 50, "h": 72 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 618, "y": 224, "w": 49, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 15, "w": 49, "h": 73 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0088.png",
+    "frame": { "x": 352, "y": 296, "w": 47, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 16, "w": 47, "h": 74 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0089.png",
+    "frame": { "x": 96, "y": 354, "w": 45, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 29, "y": 16, "w": 45, "h": 75 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0090.png",
+    "frame": { "x": 378, "y": 372, "w": 44, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 32, "y": 17, "w": 44, "h": 75 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0091.png",
+    "frame": { "x": 276, "y": 404, "w": 43, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 34, "y": 18, "w": 43, "h": 76 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0092.png",
+    "frame": { "x": 361, "y": 447, "w": 41, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 37, "y": 17, "w": 41, "h": 76 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0093.png",
+    "frame": { "x": 233, "y": 365, "w": 43, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 38, "y": 16, "w": 43, "h": 77 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0094.png",
+    "frame": { "x": 618, "y": 297, "w": 44, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 41, "y": 16, "w": 44, "h": 78 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0095.png",
+    "frame": { "x": 144, "y": 282, "w": 45, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 42, "y": 15, "w": 45, "h": 78 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0096.png",
+    "frame": { "x": 378, "y": 218, "w": 47, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 43, "y": 14, "w": 47, "h": 78 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0097.png",
+    "frame": { "x": 100, "y": 199, "w": 48, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 45, "y": 13, "w": 48, "h": 78 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0098.png",
+    "frame": { "x": 474, "y": 141, "w": 50, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 47, "y": 13, "w": 50, "h": 78 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0099.png",
+    "frame": { "x": 422, "y": 69, "w": 52, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 48, "y": 12, "w": 52, "h": 78 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0100.png",
+    "frame": { "x": 707, "y": 2, "w": 54, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 50, "y": 11, "w": 54, "h": 78 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0101.png",
+    "frame": { "x": 651, "y": 2, "w": 56, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 48, "y": 12, "w": 56, "h": 77 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0102.png",
+    "frame": { "x": 2, "y": 65, "w": 54, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 47, "y": 13, "w": 54, "h": 77 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0103.png",
+    "frame": { "x": 273, "y": 69, "w": 53, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 45, "y": 13, "w": 53, "h": 78 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0104.png",
+    "frame": { "x": 586, "y": 71, "w": 52, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 43, "y": 14, "w": 52, "h": 78 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0105.png",
+    "frame": { "x": 2, "y": 142, "w": 50, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 42, "y": 15, "w": 50, "h": 78 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0106.png",
+    "frame": { "x": 52, "y": 199, "w": 48, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 41, "y": 16, "w": 48, "h": 78 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0107.png",
+    "frame": { "x": 98, "y": 277, "w": 46, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 39, "y": 16, "w": 46, "h": 77 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0108.png",
+    "frame": { "x": 712, "y": 296, "w": 45, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 37, "y": 17, "w": 45, "h": 77 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0109.png",
+    "frame": { "x": 335, "y": 370, "w": 43, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 36, "y": 18, "w": 43, "h": 77 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0110.png",
+    "frame": { "x": 578, "y": 149, "w": 51, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 32, "y": 17, "w": 51, "h": 75 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0111.png",
+    "frame": { "x": 95, "y": 62, "w": 59, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 27, "y": 14, "w": 59, "h": 73 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0112.png",
+    "frame": { "x": 519, "y": 2, "w": 67, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 11, "w": 67, "h": 71 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0113.png",
+    "frame": { "x": 280, "y": 2, "w": 82, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 6, "w": 82, "h": 67 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0114.png",
+    "frame": { "x": 2, "y": 2, "w": 93, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 93, "h": 63 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0115.png",
+    "frame": { "x": 95, "y": 2, "w": 95, "h": 60 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 1, "w": 95, "h": 60 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0116.png",
+    "frame": { "x": 190, "y": 2, "w": 90, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 90, "h": 62 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0117.png",
+    "frame": { "x": 362, "y": 2, "w": 83, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 83, "h": 65 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0118.png",
+    "frame": { "x": 445, "y": 2, "w": 74, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 1, "w": 74, "h": 67 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0119.png",
+    "frame": { "x": 586, "y": 2, "w": 65, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 19, "y": 2, "w": 65, "h": 69 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0120.png",
+    "frame": { "x": 2, "y": 220, "w": 50, "h": 72 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 27, "y": 4, "w": 50, "h": 72 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0121.png",
+    "frame": { "x": 319, "y": 447, "w": 42, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 34, "y": 5, "w": 42, "h": 75 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0122.png",
+    "frame": { "x": 447, "y": 489, "w": 41, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 35, "y": 7, "w": 41, "h": 75 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0123.png",
+    "frame": { "x": 614, "y": 500, "w": 41, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 35, "y": 10, "w": 41, "h": 75 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0124.png",
+    "frame": { "x": 573, "y": 453, "w": 41, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 35, "y": 11, "w": 41, "h": 76 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0125.png",
+    "frame": { "x": 267, "y": 480, "w": 41, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 35, "y": 14, "w": 41, "h": 76 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0126.png",
+    "frame": { "x": 184, "y": 429, "w": 42, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 35, "y": 14, "w": 42, "h": 77 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0127.png",
+    "frame": { "x": 2, "y": 443, "w": 41, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 36, "y": 16, "w": 41, "h": 77 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0128.png",
+    "frame": { "x": 226, "y": 442, "w": 41, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 36, "y": 17, "w": 41, "h": 77 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0129.png",
+    "frame": { "x": 130, "y": 438, "w": 41, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 36, "y": 18, "w": 41, "h": 77 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0130.png",
+    "frame": { "x": 2, "y": 366, "w": 43, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 36, "y": 18, "w": 43, "h": 77 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0131.png",
+    "frame": { "x": 52, "y": 277, "w": 46, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 36, "y": 18, "w": 46, "h": 77 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0132.png",
+    "frame": { "x": 682, "y": 221, "w": 48, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 35, "y": 18, "w": 48, "h": 75 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0133.png",
+    "frame": { "x": 519, "y": 361, "w": 47, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 32, "y": 19, "w": 47, "h": 71 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0134.png",
+    "frame": { "x": 43, "y": 502, "w": 44, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 30, "y": 20, "w": 44, "h": 66 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0135.png",
+    "frame": { "x": 714, "y": 505, "w": 41, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 29, "y": 20, "w": 41, "h": 67 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0136.png",
+    "frame": { "x": 402, "y": 489, "w": 45, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 20, "w": 45, "h": 69 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0137.png",
+    "frame": { "x": 471, "y": 219, "w": 51, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 19, "w": 51, "h": 71 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0138.png",
+    "frame": { "x": 692, "y": 80, "w": 56, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 19, "w": 56, "h": 71 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0139.png",
+    "frame": { "x": 389, "y": 147, "w": 54, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 18, "w": 54, "h": 71 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0140.png",
+    "frame": { "x": 399, "y": 297, "w": 46, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 31, "y": 18, "w": 46, "h": 75 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0141.png",
+    "frame": { "x": 610, "y": 375, "w": 42, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 37, "y": 18, "w": 42, "h": 78 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0142.png",
+    "frame": { "x": 141, "y": 360, "w": 43, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 39, "y": 18, "w": 43, "h": 78 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0143.png",
+    "frame": { "x": 638, "y": 79, "w": 54, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 41, "y": 19, "w": 54, "h": 74 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0144.png",
+    "frame": { "x": 362, "y": 67, "w": 60, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 42, "y": 19, "w": 60, "h": 69 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0145.png",
+    "frame": { "x": 474, "y": 73, "w": 59, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 41, "y": 19, "w": 59, "h": 68 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0146.png",
+    "frame": { "x": 264, "y": 147, "w": 57, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 39, "y": 18, "w": 57, "h": 68 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0147.png",
+    "frame": { "x": 298, "y": 264, "w": 54, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 37, "y": 18, "w": 54, "h": 66 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0148.png",
+    "frame": { "x": 524, "y": 148, "w": 54, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 36, "y": 18, "w": 54, "h": 71 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0149.png",
+    "frame": { "x": 211, "y": 135, "w": 53, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 34, "y": 18, "w": 53, "h": 74 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0150.png",
+    "frame": { "x": 471, "y": 290, "w": 48, "h": 73 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 32, "y": 19, "w": 48, "h": 73 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0151.png",
+    "frame": { "x": 569, "y": 302, "w": 48, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 19, "w": 48, "h": 71 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0152.png",
+    "frame": { "x": 154, "y": 134, "w": 57, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 20, "w": 57, "h": 69 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0153.png",
+    "frame": { "x": 154, "y": 64, "w": 60, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 20, "w": 60, "h": 70 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0154.png",
+    "frame": { "x": 214, "y": 64, "w": 59, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 19, "w": 59, "h": 71 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0155.png",
+    "frame": { "x": 2, "y": 292, "w": 47, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 29, "y": 18, "w": 47, "h": 74 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0156.png",
+    "frame": { "x": 696, "y": 426, "w": 41, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 39, "y": 18, "w": 41, "h": 79 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0157.png",
+    "frame": { "x": 533, "y": 73, "w": 53, "h": 75 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 42, "y": 19, "w": 53, "h": 75 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0158.png",
+    "frame": { "x": 56, "y": 135, "w": 62, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 45, "y": 21, "w": 62, "h": 64 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0159.png",
+    "frame": { "x": 662, "y": 373, "w": 62, "h": 53 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 45, "y": 22, "w": 62, "h": 53 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0160.png",
+    "frame": { "x": 655, "y": 505, "w": 59, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 44, "y": 22, "w": 59, "h": 47 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0161.png",
+    "frame": { "x": 422, "y": 437, "w": 61, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 45, "y": 22, "w": 61, "h": 52 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0162.png",
+    "frame": { "x": 326, "y": 136, "w": 63, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 45, "y": 21, "w": 63, "h": 62 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0163.png",
+    "frame": { "x": 321, "y": 198, "w": 57, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 45, "y": 21, "w": 57, "h": 66 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0164.png",
+    "frame": { "x": 519, "y": 291, "w": 50, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 44, "y": 20, "w": 50, "h": 70 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0165.png",
+    "frame": { "x": 445, "y": 363, "w": 45, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 43, "y": 20, "w": 45, "h": 74 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0166.png",
+    "frame": { "x": 45, "y": 426, "w": 43, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 42, "y": 19, "w": 43, "h": 76 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0167.png",
+    "frame": { "x": 189, "y": 352, "w": 44, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 41, "y": 19, "w": 44, "h": 77 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0168.png",
+    "frame": { "x": 667, "y": 296, "w": 45, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 41, "y": 19, "w": 45, "h": 77 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0169.png",
+    "frame": { "x": 425, "y": 218, "w": 46, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 40, "y": 18, "w": 46, "h": 79 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0170.png",
+    "frame": { "x": 148, "y": 203, "w": 47, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 39, "y": 18, "w": 47, "h": 79 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0171.png",
+    "frame": { "x": 572, "y": 224, "w": 46, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 38, "y": 18, "w": 46, "h": 78 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   },
+   {
+    "filename": "0172.png",
+    "frame": { "x": 244, "y": 287, "w": 45, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 37, "y": 18, "w": 45, "h": 78 },
+    "sourceSize": { "w": 108, "h": 97 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "707.png",
+  "format": "I8",
+  "size": { "w": 763, "h": 577 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/shiny/707.png b/public/images/pokemon/shiny/707.png
index 2f4efb3e8cb..7aed21b7873 100644
Binary files a/public/images/pokemon/shiny/707.png and b/public/images/pokemon/shiny/707.png differ
diff --git a/public/images/pokemon/shiny/708.json b/public/images/pokemon/shiny/708.json
index 06631af7cb8..abc8d24db2b 100644
--- a/public/images/pokemon/shiny/708.json
+++ b/public/images/pokemon/shiny/708.json
@@ -1,41 +1,1091 @@
-{
-	"textures": [
-		{
-			"image": "708.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 44,
-				"h": 44
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 44,
-						"h": 40
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 44,
-						"h": 40
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 44,
-						"h": 40
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:5ae7df27c9e36b2c06c09056297b74ab:efbc3a2251be2a5a300a0c333bce242b:796c82c5076b122f2663381836c65843$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 270, "y": 124, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 4, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 45, "y": 166, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 6, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 0, "y": 207, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 7, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 0, "y": 84, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 8, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 45, "y": 84, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 8, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 180, "y": 42, "w": 45, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 45, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 226, "y": 42, "w": 45, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 45, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 90, "y": 84, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 135, "y": 84, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 180, "y": 124, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 225, "y": 124, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 45, "y": 42, "w": 44, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 0, "w": 44, "h": 41 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 90, "y": 42, "w": 44, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 2, "w": 44, "h": 41 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 135, "y": 42, "w": 44, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 4, "w": 44, "h": 41 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 0, "y": 0, "w": 44, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 6, "w": 44, "h": 41 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 45, "y": 0, "w": 44, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 16, "y": 7, "w": 44, "h": 41 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 90, "y": 0, "w": 44, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 8, "w": 44, "h": 41 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 272, "y": 42, "w": 43, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 8, "w": 43, "h": 41 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 180, "y": 0, "w": 44, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 8, "w": 44, "h": 41 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 225, "y": 0, "w": 44, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 5, "w": 44, "h": 41 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 270, "y": 0, "w": 44, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 3, "w": 44, "h": 41 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 0, "y": 42, "w": 44, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 0, "w": 44, "h": 41 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 135, "y": 0, "w": 44, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 0, "w": 44, "h": 41 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 0, "y": 125, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 17, "y": 0, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 45, "y": 125, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 2, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 270, "y": 124, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 4, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 45, "y": 166, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 6, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 0, "y": 207, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 7, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 0, "y": 84, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 8, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 45, "y": 84, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 8, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 180, "y": 42, "w": 45, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 45, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 226, "y": 42, "w": 45, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 45, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 90, "y": 84, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 135, "y": 84, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 180, "y": 124, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 225, "y": 124, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 45, "y": 42, "w": 44, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 0, "w": 44, "h": 41 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 90, "y": 42, "w": 44, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 2, "w": 44, "h": 41 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 135, "y": 42, "w": 44, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 4, "w": 44, "h": 41 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 0, "y": 0, "w": 44, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 6, "w": 44, "h": 41 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 45, "y": 0, "w": 44, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 16, "y": 7, "w": 44, "h": 41 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 90, "y": 0, "w": 44, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 8, "w": 44, "h": 41 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 272, "y": 42, "w": 43, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 8, "w": 43, "h": 41 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 180, "y": 0, "w": 44, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 8, "w": 44, "h": 41 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 225, "y": 0, "w": 44, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 5, "w": 44, "h": 41 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 270, "y": 0, "w": 44, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 3, "w": 44, "h": 41 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 0, "y": 42, "w": 44, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 0, "w": 44, "h": 41 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 135, "y": 0, "w": 44, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 0, "w": 44, "h": 41 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 0, "y": 125, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 17, "y": 0, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 45, "y": 125, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 2, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 270, "y": 124, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 4, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 45, "y": 166, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 6, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 0, "y": 207, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 7, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 0, "y": 84, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 8, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 45, "y": 84, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 8, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 180, "y": 42, "w": 45, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 45, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 226, "y": 42, "w": 45, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 45, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 90, "y": 84, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 135, "y": 84, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 180, "y": 124, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 225, "y": 124, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 45, "y": 42, "w": 44, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 0, "w": 44, "h": 41 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 90, "y": 42, "w": 44, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 2, "w": 44, "h": 41 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 135, "y": 42, "w": 44, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 4, "w": 44, "h": 41 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 0, "y": 0, "w": 44, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 6, "w": 44, "h": 41 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 45, "y": 0, "w": 44, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 16, "y": 7, "w": 44, "h": 41 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 90, "y": 0, "w": 44, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 8, "w": 44, "h": 41 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 272, "y": 42, "w": 43, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 8, "w": 43, "h": 41 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 180, "y": 0, "w": 44, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 8, "w": 44, "h": 41 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 225, "y": 0, "w": 44, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 5, "w": 44, "h": 41 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 270, "y": 0, "w": 44, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 3, "w": 44, "h": 41 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 0, "y": 42, "w": 44, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 0, "w": 44, "h": 41 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 135, "y": 0, "w": 44, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 0, "w": 44, "h": 41 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 0, "y": 125, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 17, "y": 0, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 45, "y": 125, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 2, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 270, "y": 124, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 4, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 45, "y": 166, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 6, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 0, "y": 207, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 7, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 0, "y": 84, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 8, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 45, "y": 84, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 8, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 180, "y": 42, "w": 45, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 7, "w": 45, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 226, "y": 42, "w": 45, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 45, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 90, "y": 84, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 135, "y": 84, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 180, "y": 124, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 225, "y": 124, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 45, "y": 42, "w": 44, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 0, "w": 44, "h": 41 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0088.png",
+    "frame": { "x": 90, "y": 42, "w": 44, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 2, "w": 44, "h": 41 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0089.png",
+    "frame": { "x": 135, "y": 42, "w": 44, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 4, "w": 44, "h": 41 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0090.png",
+    "frame": { "x": 0, "y": 0, "w": 44, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 6, "w": 44, "h": 41 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0091.png",
+    "frame": { "x": 45, "y": 0, "w": 44, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 16, "y": 7, "w": 44, "h": 41 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0092.png",
+    "frame": { "x": 90, "y": 0, "w": 44, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 8, "w": 44, "h": 41 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0093.png",
+    "frame": { "x": 272, "y": 42, "w": 43, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 8, "w": 43, "h": 41 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0094.png",
+    "frame": { "x": 180, "y": 0, "w": 44, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 8, "w": 44, "h": 41 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0095.png",
+    "frame": { "x": 225, "y": 0, "w": 44, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 5, "w": 44, "h": 41 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0096.png",
+    "frame": { "x": 270, "y": 0, "w": 44, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 3, "w": 44, "h": 41 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0097.png",
+    "frame": { "x": 0, "y": 42, "w": 44, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 0, "w": 44, "h": 41 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0098.png",
+    "frame": { "x": 135, "y": 0, "w": 44, "h": 41 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 0, "w": 44, "h": 41 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0099.png",
+    "frame": { "x": 0, "y": 125, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 17, "y": 0, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0100.png",
+    "frame": { "x": 45, "y": 125, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 2, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0101.png",
+    "frame": { "x": 270, "y": 124, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 4, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0102.png",
+    "frame": { "x": 90, "y": 125, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 6, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0103.png",
+    "frame": { "x": 135, "y": 125, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 8, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0104.png",
+    "frame": { "x": 90, "y": 207, "w": 43, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 10, "w": 43, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0105.png",
+    "frame": { "x": 134, "y": 207, "w": 43, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 12, "w": 43, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0106.png",
+    "frame": { "x": 180, "y": 165, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 14, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0107.png",
+    "frame": { "x": 225, "y": 165, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 15, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0108.png",
+    "frame": { "x": 270, "y": 165, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 17, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0109.png",
+    "frame": { "x": 0, "y": 166, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 19, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0110.png",
+    "frame": { "x": 270, "y": 206, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 21, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0111.png",
+    "frame": { "x": 90, "y": 166, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 23, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0112.png",
+    "frame": { "x": 135, "y": 166, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 21, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0113.png",
+    "frame": { "x": 180, "y": 206, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 16, "y": 20, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0114.png",
+    "frame": { "x": 225, "y": 206, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 16, "y": 18, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0115.png",
+    "frame": { "x": 268, "y": 247, "w": 44, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 16, "y": 16, "w": 44, "h": 39 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0116.png",
+    "frame": { "x": 178, "y": 247, "w": 44, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 16, "y": 15, "w": 44, "h": 39 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0117.png",
+    "frame": { "x": 223, "y": 247, "w": 44, "h": 39 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 15, "y": 13, "w": 44, "h": 39 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0118.png",
+    "frame": { "x": 226, "y": 83, "w": 45, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 10, "w": 45, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0119.png",
+    "frame": { "x": 45, "y": 207, "w": 44, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 8, "w": 44, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   },
+   {
+    "filename": "0120.png",
+    "frame": { "x": 180, "y": 83, "w": 45, "h": 40 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 6, "w": 45, "h": 40 },
+    "sourceSize": { "w": 70, "h": 63 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "708.png",
+  "format": "I8",
+  "size": { "w": 315, "h": 286 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/shiny/708.png b/public/images/pokemon/shiny/708.png
index 1da0441109b..d94b1286590 100644
Binary files a/public/images/pokemon/shiny/708.png and b/public/images/pokemon/shiny/708.png differ
diff --git a/public/images/pokemon/shiny/714.json b/public/images/pokemon/shiny/714.json
index 992ff63a393..b43aebd68a1 100644
--- a/public/images/pokemon/shiny/714.json
+++ b/public/images/pokemon/shiny/714.json
@@ -1,41 +1,263 @@
-{
-	"textures": [
-		{
-			"image": "714.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 64,
-				"h": 64
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 64,
-						"h": 57
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 64,
-						"h": 57
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 64,
-						"h": 57
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:0faf41a70733397a2e765b77d2cf3124:ed661ea37221a00e42647a088e380efd:1a07d46e710b0568ec824f54fbc4fe6a$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 1, "y": 1, "w": 64, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 64, "h": 57 },
+    "sourceSize": { "w": 66, "h": 70 },
+    "duration": 50
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 133, "y": 1, "w": 64, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 6, "w": 64, "h": 56 },
+    "sourceSize": { "w": 66, "h": 70 },
+    "duration": 50
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 1, "y": 60, "w": 61, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 8, "w": 61, "h": 55 },
+    "sourceSize": { "w": 66, "h": 70 },
+    "duration": 50
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 184, "y": 117, "w": 32, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 3, "w": 32, "h": 67 },
+    "sourceSize": { "w": 66, "h": 70 },
+    "duration": 50
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 50, "y": 119, "w": 33, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 3, "w": 33, "h": 63 },
+    "sourceSize": { "w": 66, "h": 70 },
+    "duration": 50
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 199, "y": 1, "w": 47, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 1, "w": 47, "h": 56 },
+    "sourceSize": { "w": 66, "h": 70 },
+    "duration": 50
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 64, "y": 60, "w": 47, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 0, "w": 47, "h": 57 },
+    "sourceSize": { "w": 66, "h": 70 },
+    "duration": 50
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 1, "y": 1, "w": 64, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 64, "h": 57 },
+    "sourceSize": { "w": 66, "h": 70 },
+    "duration": 50
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 133, "y": 1, "w": 64, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 6, "w": 64, "h": 56 },
+    "sourceSize": { "w": 66, "h": 70 },
+    "duration": 50
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 1, "y": 60, "w": 61, "h": 55 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 8, "w": 61, "h": 55 },
+    "sourceSize": { "w": 66, "h": 70 },
+    "duration": 50
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 184, "y": 117, "w": 32, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 16, "y": 3, "w": 32, "h": 67 },
+    "sourceSize": { "w": 66, "h": 70 },
+    "duration": 50
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 50, "y": 119, "w": 33, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 3, "w": 33, "h": 63 },
+    "sourceSize": { "w": 66, "h": 70 },
+    "duration": 50
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 199, "y": 1, "w": 47, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 1, "w": 47, "h": 56 },
+    "sourceSize": { "w": 66, "h": 70 },
+    "duration": 50
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 64, "y": 60, "w": 47, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 0, "w": 47, "h": 57 },
+    "sourceSize": { "w": 66, "h": 70 },
+    "duration": 50
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 1, "y": 1, "w": 64, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 64, "h": 57 },
+    "sourceSize": { "w": 66, "h": 70 },
+    "duration": 50
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 133, "y": 1, "w": 64, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 6, "w": 64, "h": 56 },
+    "sourceSize": { "w": 66, "h": 70 },
+    "duration": 50
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 133, "y": 59, "w": 61, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 61, "h": 56 },
+    "sourceSize": { "w": 66, "h": 70 },
+    "duration": 50
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 113, "y": 117, "w": 33, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 33, "h": 68 },
+    "sourceSize": { "w": 66, "h": 70 },
+    "duration": 50
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 148, "y": 117, "w": 34, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 2, "w": 34, "h": 64 },
+    "sourceSize": { "w": 66, "h": 70 },
+    "duration": 50
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 1, "y": 117, "w": 47, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 0, "w": 47, "h": 57 },
+    "sourceSize": { "w": 66, "h": 70 },
+    "duration": 50
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 64, "y": 60, "w": 47, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 0, "w": 47, "h": 57 },
+    "sourceSize": { "w": 66, "h": 70 },
+    "duration": 50
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 1, "y": 1, "w": 64, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 64, "h": 57 },
+    "sourceSize": { "w": 66, "h": 70 },
+    "duration": 50
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 67, "y": 1, "w": 64, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 64, "h": 57 },
+    "sourceSize": { "w": 66, "h": 70 },
+    "duration": 50
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 196, "y": 59, "w": 61, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 7, "w": 61, "h": 56 },
+    "sourceSize": { "w": 66, "h": 70 },
+    "duration": 50
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 113, "y": 117, "w": 33, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 16, "y": 2, "w": 33, "h": 68 },
+    "sourceSize": { "w": 66, "h": 70 },
+    "duration": 50
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 218, "y": 117, "w": 33, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 2, "w": 33, "h": 64 },
+    "sourceSize": { "w": 66, "h": 70 },
+    "duration": 50
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 199, "y": 1, "w": 47, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 1, "w": 47, "h": 56 },
+    "sourceSize": { "w": 66, "h": 70 },
+    "duration": 50
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 64, "y": 60, "w": 47, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 0, "w": 47, "h": 57 },
+    "sourceSize": { "w": 66, "h": 70 },
+    "duration": 50
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "714.png",
+  "format": "I8",
+  "size": { "w": 258, "h": 186 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/shiny/714.png b/public/images/pokemon/shiny/714.png
index 2cde838873a..924c67d3c85 100644
Binary files a/public/images/pokemon/shiny/714.png and b/public/images/pokemon/shiny/714.png differ
diff --git a/public/images/pokemon/shiny/718-10.json b/public/images/pokemon/shiny/718-10.json
index 05c86055ce7..ad273c9ea79 100644
--- a/public/images/pokemon/shiny/718-10.json
+++ b/public/images/pokemon/shiny/718-10.json
@@ -1,41 +1,686 @@
-{
-	"textures": [
-		{
-			"image": "718-10.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 66,
-				"h": 66
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 56,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 56,
-						"h": 66
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 56,
-						"h": 66
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:ddb567f3553fb8f8477733fc8b91dfb8:21520f234fc9684cd172bbced8ed083b:82195cf2a6db620c5643b8162d6e8c5c$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 0, "y": 0, "w": 57, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 57, "h": 67 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 173, "y": 0, "w": 57, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 57, "h": 66 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 230, "y": 0, "w": 57, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 57, "h": 66 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 57, "y": 0, "w": 58, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 58, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 115, "y": 0, "w": 58, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 58, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 171, "y": 66, "w": 58, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 58, "h": 64 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 229, "y": 66, "w": 58, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 58, "h": 64 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 287, "y": 66, "w": 58, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 58, "h": 64 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 171, "y": 130, "w": 58, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 58, "h": 64 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 229, "y": 130, "w": 58, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 58, "h": 64 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 0, "y": 67, "w": 57, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 57, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 287, "y": 0, "w": 57, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 57, "h": 66 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 57, "y": 65, "w": 57, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 57, "h": 66 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 114, "y": 65, "w": 57, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 57, "h": 66 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 0, "y": 0, "w": 57, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 57, "h": 67 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 173, "y": 0, "w": 57, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 57, "h": 66 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 230, "y": 0, "w": 57, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 57, "h": 66 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 57, "y": 0, "w": 58, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 58, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 115, "y": 0, "w": 58, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 58, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 171, "y": 66, "w": 58, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 58, "h": 64 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 229, "y": 66, "w": 58, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 58, "h": 64 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 287, "y": 66, "w": 58, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 58, "h": 64 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 171, "y": 130, "w": 58, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 58, "h": 64 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 229, "y": 130, "w": 58, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 58, "h": 64 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 0, "y": 67, "w": 57, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 57, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 287, "y": 0, "w": 57, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 57, "h": 66 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 57, "y": 65, "w": 57, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 57, "h": 66 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 114, "y": 65, "w": 57, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 57, "h": 66 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 0, "y": 0, "w": 57, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 57, "h": 67 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 173, "y": 0, "w": 57, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 57, "h": 66 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 230, "y": 0, "w": 57, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 57, "h": 66 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 57, "y": 0, "w": 58, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 58, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 115, "y": 0, "w": 58, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 58, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 171, "y": 66, "w": 58, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 58, "h": 64 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 229, "y": 66, "w": 58, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 58, "h": 64 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 287, "y": 66, "w": 58, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 58, "h": 64 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 171, "y": 130, "w": 58, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 58, "h": 64 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 229, "y": 130, "w": 58, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 58, "h": 64 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 0, "y": 67, "w": 57, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 57, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 287, "y": 0, "w": 57, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 57, "h": 66 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 57, "y": 65, "w": 57, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 57, "h": 66 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 114, "y": 65, "w": 57, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 57, "h": 66 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 0, "y": 0, "w": 57, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 57, "h": 67 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 173, "y": 0, "w": 57, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 57, "h": 66 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 230, "y": 0, "w": 57, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 57, "h": 66 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 57, "y": 0, "w": 58, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 58, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 115, "y": 0, "w": 58, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 58, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 171, "y": 66, "w": 58, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 58, "h": 64 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 229, "y": 66, "w": 58, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 58, "h": 64 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 287, "y": 66, "w": 58, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 58, "h": 64 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 171, "y": 130, "w": 58, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 58, "h": 64 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 229, "y": 130, "w": 58, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 58, "h": 64 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 0, "y": 67, "w": 57, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 57, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 287, "y": 0, "w": 57, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 57, "h": 66 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 57, "y": 65, "w": 57, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 57, "h": 66 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 114, "y": 65, "w": 57, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 57, "h": 66 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 287, "y": 130, "w": 56, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 56, "h": 66 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 57, "y": 131, "w": 56, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 56, "h": 66 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 164, "y": 261, "w": 56, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 56, "h": 65 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 0, "y": 327, "w": 56, "h": 64 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 56, "h": 64 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 56, "y": 327, "w": 56, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 4, "w": 56, "h": 63 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 169, "y": 329, "w": 57, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 5, "w": 57, "h": 62 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 112, "y": 326, "w": 57, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 57, "h": 63 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 54, "y": 265, "w": 58, "h": 62 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 58, "h": 62 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 226, "y": 332, "w": 56, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 56, "h": 63 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 220, "y": 261, "w": 53, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 53, "h": 68 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 273, "y": 264, "w": 53, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 0, "w": 53, "h": 68 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 279, "y": 196, "w": 54, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 54, "h": 68 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 56, "y": 197, "w": 54, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 54, "h": 68 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 110, "y": 197, "w": 54, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 54, "h": 68 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 0, "y": 198, "w": 54, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 0, "w": 54, "h": 68 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 169, "y": 194, "w": 55, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 1, "w": 55, "h": 67 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 224, "y": 194, "w": 55, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 55, "h": 67 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 0, "y": 132, "w": 56, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 56, "h": 66 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 113, "y": 131, "w": 56, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 56, "h": 66 },
+    "sourceSize": { "w": 61, "h": 69 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "718-10.png",
+  "format": "I8",
+  "size": { "w": 345, "h": 395 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/shiny/718-10.png b/public/images/pokemon/shiny/718-10.png
index bee16c7ec63..f976d91b4f6 100644
Binary files a/public/images/pokemon/shiny/718-10.png and b/public/images/pokemon/shiny/718-10.png differ
diff --git a/public/images/pokemon/shiny/718.json b/public/images/pokemon/shiny/718.json
index 00e4c68ba00..98053a226cb 100644
--- a/public/images/pokemon/shiny/718.json
+++ b/public/images/pokemon/shiny/718.json
@@ -1,41 +1,803 @@
-{
-	"textures": [
-		{
-			"image": "718.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 88,
-				"h": 88
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 72,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 72,
-						"h": 88
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 72,
-						"h": 88
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:6daa10e13b8729f3ebc27b1a8eb1c6cb:65f7940d781324b41eba39e9e5565cb7:7b4a06b06cbac24b3f39727b0238661b$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 294, "y": 438, "w": 72, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 3, "w": 72, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 0, "y": 442, "w": 71, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 3, "w": 71, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 437, "y": 441, "w": 71, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 71, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 145, "y": 441, "w": 71, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 71, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 366, "y": 440, "w": 71, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 71, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 223, "y": 267, "w": 73, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 73, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 296, "y": 350, "w": 73, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 73, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 384, "y": 177, "w": 75, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 75, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 459, "y": 177, "w": 75, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 75, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 452, "y": 265, "w": 74, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 74, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 76, "y": 178, "w": 75, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 75, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 233, "y": 90, "w": 75, "h": 89 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 75, "h": 89 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 151, "y": 178, "w": 75, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 75, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 0, "y": 179, "w": 75, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 75, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 75, "y": 266, "w": 74, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 74, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 369, "y": 352, "w": 73, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 3, "w": 73, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 294, "y": 438, "w": 72, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 3, "w": 72, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 0, "y": 442, "w": 71, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 3, "w": 71, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 437, "y": 441, "w": 71, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 71, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 145, "y": 441, "w": 71, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 71, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 366, "y": 440, "w": 71, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 71, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 223, "y": 267, "w": 73, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 73, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 296, "y": 350, "w": 73, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 73, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 384, "y": 177, "w": 75, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 75, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 459, "y": 177, "w": 75, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 75, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 452, "y": 265, "w": 74, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 74, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 76, "y": 178, "w": 75, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 75, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 233, "y": 90, "w": 75, "h": 89 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 75, "h": 89 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 151, "y": 178, "w": 75, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 75, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 0, "y": 179, "w": 75, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 75, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 75, "y": 266, "w": 74, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 74, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 369, "y": 352, "w": 73, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 3, "w": 73, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 294, "y": 438, "w": 72, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 3, "w": 72, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 0, "y": 442, "w": 71, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 3, "w": 71, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 437, "y": 441, "w": 71, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 71, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 145, "y": 441, "w": 71, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 71, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 366, "y": 440, "w": 71, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 71, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 223, "y": 267, "w": 73, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 73, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 296, "y": 350, "w": 73, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 73, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 384, "y": 177, "w": 75, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 75, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 459, "y": 177, "w": 75, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 75, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 452, "y": 265, "w": 74, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 74, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 76, "y": 178, "w": 75, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 75, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 233, "y": 90, "w": 75, "h": 89 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 75, "h": 89 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 151, "y": 178, "w": 75, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 75, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 0, "y": 179, "w": 75, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 75, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 75, "y": 266, "w": 74, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 74, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 369, "y": 352, "w": 73, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 3, "w": 73, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 294, "y": 438, "w": 72, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 3, "w": 72, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 0, "y": 442, "w": 71, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 3, "w": 71, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 437, "y": 441, "w": 71, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 71, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 145, "y": 441, "w": 71, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 71, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 366, "y": 440, "w": 71, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 71, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 223, "y": 267, "w": 73, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 73, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 296, "y": 350, "w": 73, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 73, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 384, "y": 177, "w": 75, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 75, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 459, "y": 177, "w": 75, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 75, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 452, "y": 265, "w": 74, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 74, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 76, "y": 178, "w": 75, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 75, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 233, "y": 90, "w": 75, "h": 89 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 75, "h": 89 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 151, "y": 178, "w": 75, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 75, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 0, "y": 179, "w": 75, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 75, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 75, "y": 266, "w": 74, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 74, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 369, "y": 352, "w": 73, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 3, "w": 73, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 222, "y": 355, "w": 72, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 3, "w": 72, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 73, "y": 354, "w": 72, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 3, "w": 72, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 149, "y": 353, "w": 73, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 73, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 442, "y": 353, "w": 73, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 73, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 149, "y": 266, "w": 74, "h": 87 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 74, "h": 87 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 377, "y": 265, "w": 75, "h": 87 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 75, "h": 87 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 308, "y": 177, "w": 76, "h": 87 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 76, "h": 87 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 76, "y": 91, "w": 76, "h": 87 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 76, "h": 87 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 301, "y": 264, "w": 76, "h": 86 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 5, "w": 76, "h": 86 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 0, "y": 267, "w": 74, "h": 87 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 4, "w": 74, "h": 87 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 0, "y": 90, "w": 76, "h": 89 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 2, "w": 76, "h": 89 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 391, "y": 88, "w": 77, "h": 89 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 2, "w": 77, "h": 89 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 79, "y": 0, "w": 78, "h": 91 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 0, "w": 78, "h": 91 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 468, "y": 88, "w": 77, "h": 89 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 77, "h": 89 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 157, "y": 0, "w": 78, "h": 90 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 1, "w": 78, "h": 90 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 313, "y": 0, "w": 78, "h": 89 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 2, "w": 78, "h": 89 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 0, "y": 0, "w": 79, "h": 90 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 1, "w": 79, "h": 90 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 391, "y": 0, "w": 78, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 3, "w": 78, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 235, "y": 0, "w": 78, "h": 90 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 1, "w": 78, "h": 90 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 469, "y": 0, "w": 78, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 3, "w": 78, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 313, "y": 89, "w": 77, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 3, "w": 77, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 157, "y": 90, "w": 76, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 3, "w": 76, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 226, "y": 179, "w": 75, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 75, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   },
+   {
+    "filename": "0088.png",
+    "frame": { "x": 0, "y": 354, "w": 73, "h": 88 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 73, "h": 88 },
+    "sourceSize": { "w": 88, "h": 92 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "718.png",
+  "format": "I8",
+  "size": { "w": 547, "h": 530 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/shiny/718.png b/public/images/pokemon/shiny/718.png
index cdfa42ccec7..778ae8bff07 100644
Binary files a/public/images/pokemon/shiny/718.png and b/public/images/pokemon/shiny/718.png differ
diff --git a/public/images/pokemon/shiny/719.json b/public/images/pokemon/shiny/719.json
index 29e48d3b3be..12a679f029f 100644
--- a/public/images/pokemon/shiny/719.json
+++ b/public/images/pokemon/shiny/719.json
@@ -1,41 +1,875 @@
-{
-	"textures": [
-		{
-			"image": "719.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 65,
-				"h": 65
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 42,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 42,
-						"h": 65
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 42,
-						"h": 65
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:f62b9cce190b10d691ae00fdc87df448:371601e6d1aa56d47c80c70305627ce1:17a705bb924916761be2495822a53735$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 0, "y": 0, "w": 41, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 11, "w": 41, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 41, "y": 0, "w": 41, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 10, "w": 41, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 82, "y": 0, "w": 41, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 8, "w": 41, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 123, "y": 0, "w": 41, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 7, "w": 41, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 164, "y": 0, "w": 41, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 6, "w": 41, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 40, "y": 140, "w": 39, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 4, "w": 39, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 39, "y": 210, "w": 38, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 3, "w": 38, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 77, "y": 210, "w": 38, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 4, "w": 38, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 79, "y": 140, "w": 39, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 5, "w": 39, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 118, "y": 140, "w": 39, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 7, "w": 39, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 82, "y": 70, "w": 40, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 9, "w": 40, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 205, "y": 0, "w": 41, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 10, "w": 41, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 0, "y": 0, "w": 41, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 11, "w": 41, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 41, "y": 0, "w": 41, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 10, "w": 41, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 82, "y": 0, "w": 41, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 8, "w": 41, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 123, "y": 0, "w": 41, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 7, "w": 41, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 164, "y": 0, "w": 41, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 6, "w": 41, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 40, "y": 140, "w": 39, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 4, "w": 39, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 39, "y": 210, "w": 38, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 3, "w": 38, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 77, "y": 210, "w": 38, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 4, "w": 38, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 79, "y": 140, "w": 39, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 5, "w": 39, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 118, "y": 140, "w": 39, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 7, "w": 39, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 82, "y": 70, "w": 40, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 9, "w": 40, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 205, "y": 0, "w": 41, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 10, "w": 41, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 0, "y": 0, "w": 41, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 11, "w": 41, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 41, "y": 0, "w": 41, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 10, "w": 41, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 82, "y": 0, "w": 41, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 8, "w": 41, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 123, "y": 0, "w": 41, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 7, "w": 41, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 164, "y": 0, "w": 41, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 6, "w": 41, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 40, "y": 140, "w": 39, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 4, "w": 39, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 39, "y": 210, "w": 38, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 3, "w": 38, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 77, "y": 210, "w": 38, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 4, "w": 38, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 79, "y": 140, "w": 39, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 5, "w": 39, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 118, "y": 140, "w": 39, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 7, "w": 39, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 82, "y": 70, "w": 40, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 9, "w": 40, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 205, "y": 0, "w": 41, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 10, "w": 41, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 0, "y": 0, "w": 41, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 11, "w": 41, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 41, "y": 0, "w": 41, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 10, "w": 41, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 82, "y": 0, "w": 41, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 8, "w": 41, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 123, "y": 0, "w": 41, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 7, "w": 41, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 164, "y": 0, "w": 41, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 6, "w": 41, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 40, "y": 140, "w": 39, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 4, "w": 39, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 39, "y": 210, "w": 38, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 3, "w": 38, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 77, "y": 210, "w": 38, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 4, "w": 38, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 79, "y": 140, "w": 39, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 5, "w": 39, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 118, "y": 140, "w": 39, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 7, "w": 39, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 82, "y": 70, "w": 40, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 9, "w": 40, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 205, "y": 0, "w": 41, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 10, "w": 41, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 0, "y": 0, "w": 41, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 11, "w": 41, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 122, "y": 70, "w": 40, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 9, "w": 40, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 162, "y": 70, "w": 40, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 7, "w": 40, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 115, "y": 210, "w": 38, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 6, "w": 38, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 153, "y": 210, "w": 38, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 38, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 74, "y": 350, "w": 37, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 37, "h": 69 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 37, "y": 350, "w": 37, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 37, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 111, "y": 350, "w": 35, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 35, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 190, "y": 280, "w": 37, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 191, "y": 210, "w": 38, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 38, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 157, "y": 140, "w": 39, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 8, "w": 39, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 202, "y": 70, "w": 40, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 10, "w": 40, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 0, "y": 0, "w": 41, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 11, "w": 41, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 0, "y": 70, "w": 41, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 10, "w": 41, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 0, "y": 140, "w": 40, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 9, "w": 40, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 196, "y": 140, "w": 39, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 16, "y": 8, "w": 39, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 0, "y": 280, "w": 38, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 6, "w": 38, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 38, "y": 280, "w": 38, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 5, "w": 38, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 76, "y": 280, "w": 38, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 4, "w": 38, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 0, "y": 350, "w": 37, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 4, "w": 37, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 114, "y": 280, "w": 38, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 6, "w": 38, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 152, "y": 280, "w": 38, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 7, "w": 38, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 0, "y": 210, "w": 39, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 9, "w": 39, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 41, "y": 70, "w": 41, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 11, "w": 41, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 0, "y": 0, "w": 41, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 11, "w": 41, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 122, "y": 70, "w": 40, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 9, "w": 40, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 162, "y": 70, "w": 40, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 7, "w": 40, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 115, "y": 210, "w": 38, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 6, "w": 38, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 153, "y": 210, "w": 38, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 38, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 74, "y": 350, "w": 37, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 37, "h": 69 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 37, "y": 350, "w": 37, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 37, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 111, "y": 350, "w": 35, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 1, "w": 35, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 190, "y": 280, "w": 37, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 37, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 191, "y": 210, "w": 38, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 38, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 157, "y": 140, "w": 39, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 8, "w": 39, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 202, "y": 70, "w": 40, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 10, "w": 40, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 0, "y": 0, "w": 41, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 11, "w": 41, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 0, "y": 70, "w": 41, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 10, "w": 41, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 0, "y": 140, "w": 40, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 9, "w": 40, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0088.png",
+    "frame": { "x": 196, "y": 140, "w": 39, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 16, "y": 8, "w": 39, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0089.png",
+    "frame": { "x": 0, "y": 280, "w": 38, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 20, "y": 6, "w": 38, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0090.png",
+    "frame": { "x": 38, "y": 280, "w": 38, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 5, "w": 38, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0091.png",
+    "frame": { "x": 76, "y": 280, "w": 38, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 25, "y": 4, "w": 38, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0092.png",
+    "frame": { "x": 0, "y": 350, "w": 37, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 24, "y": 4, "w": 37, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0093.png",
+    "frame": { "x": 114, "y": 280, "w": 38, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 6, "w": 38, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0094.png",
+    "frame": { "x": 152, "y": 280, "w": 38, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 18, "y": 7, "w": 38, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0095.png",
+    "frame": { "x": 0, "y": 210, "w": 39, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 9, "w": 39, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   },
+   {
+    "filename": "0096.png",
+    "frame": { "x": 41, "y": 70, "w": 41, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 11, "w": 41, "h": 70 },
+    "sourceSize": { "w": 63, "h": 81 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.12-x64",
+  "image": "719.png",
+  "format": "I8",
+  "size": { "w": 246, "h": 420 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/shiny/719.png b/public/images/pokemon/shiny/719.png
index f17e9b23ca8..c466201632a 100644
Binary files a/public/images/pokemon/shiny/719.png and b/public/images/pokemon/shiny/719.png differ
diff --git a/public/images/pokemon/shiny/730.png b/public/images/pokemon/shiny/730.png
index 5cc0a675e08..744d43630e7 100644
Binary files a/public/images/pokemon/shiny/730.png and b/public/images/pokemon/shiny/730.png differ
diff --git a/public/images/pokemon/shiny/782.json b/public/images/pokemon/shiny/782.json
index 0147fd611c2..8b4336549f1 100644
--- a/public/images/pokemon/shiny/782.json
+++ b/public/images/pokemon/shiny/782.json
@@ -1,41 +1,1010 @@
-{
-	"textures": [
-		{
-			"image": "782.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 50,
-				"h": 50
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 46,
-						"h": 50
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 46,
-						"h": 50
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 46,
-						"h": 50
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:a551362c468e8c1d1846087d45955da3:43093a2fa7dce85b50a7790b1ef2c6b0:d07862436676aa228a148ee1f1d82a8f$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 48, "y": 105, "w": 46, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 24, "w": 46, "h": 50 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 48, "y": 105, "w": 46, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 24, "w": 46, "h": 50 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 94, "y": 105, "w": 45, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 24, "w": 45, "h": 50 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 94, "y": 105, "w": 45, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 24, "w": 45, "h": 50 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 47, "y": 155, "w": 46, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 27, "y": 25, "w": 46, "h": 49 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 47, "y": 155, "w": 46, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 27, "y": 25, "w": 46, "h": 49 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 140, "y": 156, "w": 46, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 27, "y": 27, "w": 46, "h": 47 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 140, "y": 156, "w": 46, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 27, "y": 27, "w": 46, "h": 47 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 93, "y": 156, "w": 47, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 27, "w": 47, "h": 47 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 93, "y": 156, "w": 47, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 27, "w": 47, "h": 47 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 186, "y": 156, "w": 46, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 27, "y": 27, "w": 46, "h": 47 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 186, "y": 156, "w": 46, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 27, "y": 27, "w": 46, "h": 47 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 1, "y": 105, "w": 47, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 27, "y": 25, "w": 47, "h": 49 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 1, "y": 105, "w": 47, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 27, "y": 25, "w": 47, "h": 49 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 1, "y": 154, "w": 46, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 24, "w": 46, "h": 50 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 1, "y": 154, "w": 46, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 24, "w": 46, "h": 50 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 48, "y": 105, "w": 46, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 24, "w": 46, "h": 50 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 48, "y": 105, "w": 46, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 24, "w": 46, "h": 50 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 94, "y": 105, "w": 45, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 24, "w": 45, "h": 50 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 94, "y": 105, "w": 45, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 24, "w": 45, "h": 50 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 47, "y": 155, "w": 46, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 27, "y": 25, "w": 46, "h": 49 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 47, "y": 155, "w": 46, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 27, "y": 25, "w": 46, "h": 49 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 140, "y": 156, "w": 46, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 27, "y": 27, "w": 46, "h": 47 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 140, "y": 156, "w": 46, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 27, "y": 27, "w": 46, "h": 47 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 93, "y": 156, "w": 47, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 27, "w": 47, "h": 47 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 93, "y": 156, "w": 47, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 27, "w": 47, "h": 47 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 186, "y": 156, "w": 46, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 27, "y": 27, "w": 46, "h": 47 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 186, "y": 156, "w": 46, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 27, "y": 27, "w": 46, "h": 47 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 1, "y": 105, "w": 47, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 27, "y": 25, "w": 47, "h": 49 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 1, "y": 105, "w": 47, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 27, "y": 25, "w": 47, "h": 49 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 1, "y": 154, "w": 46, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 24, "w": 46, "h": 50 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 1, "y": 154, "w": 46, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 24, "w": 46, "h": 50 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 48, "y": 105, "w": 46, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 24, "w": 46, "h": 50 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 48, "y": 105, "w": 46, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 24, "w": 46, "h": 50 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 94, "y": 105, "w": 45, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 24, "w": 45, "h": 50 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 94, "y": 105, "w": 45, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 24, "w": 45, "h": 50 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 47, "y": 155, "w": 46, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 27, "y": 25, "w": 46, "h": 49 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 47, "y": 155, "w": 46, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 27, "y": 25, "w": 46, "h": 49 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 140, "y": 156, "w": 46, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 27, "y": 27, "w": 46, "h": 47 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 140, "y": 156, "w": 46, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 27, "y": 27, "w": 46, "h": 47 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 93, "y": 156, "w": 47, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 27, "w": 47, "h": 47 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 93, "y": 156, "w": 47, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 27, "w": 47, "h": 47 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 186, "y": 156, "w": 46, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 27, "y": 27, "w": 46, "h": 47 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 186, "y": 156, "w": 46, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 27, "y": 27, "w": 46, "h": 47 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 1, "y": 105, "w": 47, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 27, "y": 25, "w": 47, "h": 49 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 1, "y": 105, "w": 47, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 27, "y": 25, "w": 47, "h": 49 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 1, "y": 154, "w": 46, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 24, "w": 46, "h": 50 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 1, "y": 154, "w": 46, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 24, "w": 46, "h": 50 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 48, "y": 105, "w": 46, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 24, "w": 46, "h": 50 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 48, "y": 105, "w": 46, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 24, "w": 46, "h": 50 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 94, "y": 105, "w": 45, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 24, "w": 45, "h": 50 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 94, "y": 105, "w": 45, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 24, "w": 45, "h": 50 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 47, "y": 155, "w": 46, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 27, "y": 25, "w": 46, "h": 49 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 47, "y": 155, "w": 46, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 27, "y": 25, "w": 46, "h": 49 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 140, "y": 156, "w": 46, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 27, "y": 27, "w": 46, "h": 47 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 140, "y": 156, "w": 46, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 27, "y": 27, "w": 46, "h": 47 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 93, "y": 156, "w": 47, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 27, "w": 47, "h": 47 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 93, "y": 156, "w": 47, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 27, "w": 47, "h": 47 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 186, "y": 156, "w": 46, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 27, "y": 27, "w": 46, "h": 47 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 186, "y": 156, "w": 46, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 27, "y": 27, "w": 46, "h": 47 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 1, "y": 105, "w": 47, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 27, "y": 25, "w": 47, "h": 49 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 1, "y": 105, "w": 47, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 27, "y": 25, "w": 47, "h": 49 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 1, "y": 154, "w": 46, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 24, "w": 46, "h": 50 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 1, "y": 154, "w": 46, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 24, "w": 46, "h": 50 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 48, "y": 105, "w": 46, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 24, "w": 46, "h": 50 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 48, "y": 105, "w": 46, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 24, "w": 46, "h": 50 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 94, "y": 105, "w": 45, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 24, "w": 45, "h": 50 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 94, "y": 105, "w": 45, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 24, "w": 45, "h": 50 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 47, "y": 155, "w": 46, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 27, "y": 25, "w": 46, "h": 49 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 47, "y": 155, "w": 46, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 27, "y": 25, "w": 46, "h": 49 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 140, "y": 156, "w": 46, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 27, "y": 27, "w": 46, "h": 47 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 140, "y": 156, "w": 46, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 27, "y": 27, "w": 46, "h": 47 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 93, "y": 156, "w": 47, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 27, "w": 47, "h": 47 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 93, "y": 156, "w": 47, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 27, "w": 47, "h": 47 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 186, "y": 156, "w": 46, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 27, "y": 27, "w": 46, "h": 47 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 186, "y": 156, "w": 46, "h": 47 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 27, "y": 27, "w": 46, "h": 47 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 1, "y": 105, "w": 47, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 27, "y": 25, "w": 47, "h": 49 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 1, "y": 105, "w": 47, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 27, "y": 25, "w": 47, "h": 49 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 1, "y": 154, "w": 46, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 24, "w": 46, "h": 50 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 1, "y": 154, "w": 46, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 24, "w": 46, "h": 50 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 48, "y": 105, "w": 46, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 24, "w": 46, "h": 50 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 48, "y": 105, "w": 46, "h": 50 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 24, "w": 46, "h": 50 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 142, "y": 1, "w": 47, "h": 51 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 23, "w": 47, "h": 51 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 189, "y": 1, "w": 47, "h": 51 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 23, "w": 47, "h": 51 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 1, "y": 1, "w": 47, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 22, "w": 47, "h": 52 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 48, "y": 1, "w": 47, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 22, "w": 47, "h": 52 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 185, "y": 104, "w": 45, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 22, "w": 45, "h": 52 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0088.png",
+    "frame": { "x": 185, "y": 104, "w": 45, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 22, "w": 45, "h": 52 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0089.png",
+    "frame": { "x": 142, "y": 52, "w": 46, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 22, "w": 46, "h": 52 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0090.png",
+    "frame": { "x": 188, "y": 52, "w": 46, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 22, "w": 46, "h": 52 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0091.png",
+    "frame": { "x": 1, "y": 53, "w": 46, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 22, "w": 46, "h": 52 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0092.png",
+    "frame": { "x": 47, "y": 53, "w": 46, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 22, "w": 46, "h": 52 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0093.png",
+    "frame": { "x": 95, "y": 1, "w": 47, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 22, "w": 47, "h": 52 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0094.png",
+    "frame": { "x": 95, "y": 1, "w": 47, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 22, "w": 47, "h": 52 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0095.png",
+    "frame": { "x": 185, "y": 104, "w": 45, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 22, "w": 45, "h": 52 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0096.png",
+    "frame": { "x": 185, "y": 104, "w": 45, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 22, "w": 45, "h": 52 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0097.png",
+    "frame": { "x": 93, "y": 53, "w": 46, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 22, "w": 46, "h": 52 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0098.png",
+    "frame": { "x": 93, "y": 53, "w": 46, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 22, "w": 46, "h": 52 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0099.png",
+    "frame": { "x": 47, "y": 53, "w": 46, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 22, "w": 46, "h": 52 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0100.png",
+    "frame": { "x": 47, "y": 53, "w": 46, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 22, "w": 46, "h": 52 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0101.png",
+    "frame": { "x": 95, "y": 1, "w": 47, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 22, "w": 47, "h": 52 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0102.png",
+    "frame": { "x": 95, "y": 1, "w": 47, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 22, "w": 47, "h": 52 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0103.png",
+    "frame": { "x": 95, "y": 1, "w": 47, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 22, "w": 47, "h": 52 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0104.png",
+    "frame": { "x": 185, "y": 104, "w": 45, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 22, "w": 45, "h": 52 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0105.png",
+    "frame": { "x": 185, "y": 104, "w": 45, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 22, "w": 45, "h": 52 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0106.png",
+    "frame": { "x": 93, "y": 53, "w": 46, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 22, "w": 46, "h": 52 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0107.png",
+    "frame": { "x": 93, "y": 53, "w": 46, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 22, "w": 46, "h": 52 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0108.png",
+    "frame": { "x": 1, "y": 53, "w": 46, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 22, "w": 46, "h": 52 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0109.png",
+    "frame": { "x": 139, "y": 104, "w": 46, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 22, "w": 46, "h": 52 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0110.png",
+    "frame": { "x": 189, "y": 1, "w": 47, "h": 51 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 23, "w": 47, "h": 51 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   },
+   {
+    "filename": "0111.png",
+    "frame": { "x": 142, "y": 1, "w": 47, "h": 51 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 23, "w": 47, "h": 51 },
+    "sourceSize": { "w": 96, "h": 96 },
+    "duration": 50
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.13-x64",
+  "image": "782.png",
+  "format": "I8",
+  "size": { "w": 237, "h": 205 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/shiny/782.png b/public/images/pokemon/shiny/782.png
index 79ce0d6289a..be4689a7cc5 100644
Binary files a/public/images/pokemon/shiny/782.png and b/public/images/pokemon/shiny/782.png differ
diff --git a/public/images/pokemon/shiny/783.json b/public/images/pokemon/shiny/783.json
index cba4888951b..0d3815a6ecf 100644
--- a/public/images/pokemon/shiny/783.json
+++ b/public/images/pokemon/shiny/783.json
@@ -1,41 +1,965 @@
-{
-	"textures": [
-		{
-			"image": "783.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 69,
-				"h": 69
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 61,
-						"h": 69
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 61,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 61,
-						"h": 69
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:46608dec6728e687aeafbeda288354f0:c18ca883404bc368fe53932c65d95dd1:aab166e28c744865a0296041224dd01b$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 64, "y": 208, "w": 61, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 61, "h": 69 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 326, "y": 142, "w": 62, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 2, "w": 62, "h": 69 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 1, "y": 71, "w": 64, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 1, "w": 64, "h": 70 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 412, "y": 71, "w": 64, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 1, "w": 64, "h": 70 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 276, "y": 68, "w": 64, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 0, "w": 64, "h": 71 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 340, "y": 72, "w": 63, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 1, "w": 63, "h": 70 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 476, "y": 137, "w": 63, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 1, "w": 63, "h": 70 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 403, "y": 141, "w": 62, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 2, "w": 62, "h": 69 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 308, "y": 211, "w": 60, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 60, "h": 69 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 299, "y": 280, "w": 59, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 59, "h": 68 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 471, "y": 412, "w": 56, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 56, "h": 67 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 415, "y": 412, "w": 56, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 56, "h": 67 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 228, "y": 413, "w": 56, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 56, "h": 66 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 1, "y": 412, "w": 56, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 56, "h": 67 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 358, "y": 347, "w": 57, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 57, "h": 67 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 508, "y": 275, "w": 60, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 60, "h": 68 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 64, "y": 208, "w": 61, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 61, "h": 69 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 326, "y": 142, "w": 62, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 2, "w": 62, "h": 69 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 1, "y": 71, "w": 64, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 1, "w": 64, "h": 70 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 412, "y": 71, "w": 64, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 1, "w": 64, "h": 70 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 276, "y": 68, "w": 64, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 0, "w": 64, "h": 71 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 340, "y": 72, "w": 63, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 1, "w": 63, "h": 70 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 476, "y": 137, "w": 63, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 1, "w": 63, "h": 70 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 403, "y": 141, "w": 62, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 2, "w": 62, "h": 69 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 308, "y": 211, "w": 60, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 60, "h": 69 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 299, "y": 280, "w": 59, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 59, "h": 68 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 471, "y": 412, "w": 56, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 56, "h": 67 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 415, "y": 412, "w": 56, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 56, "h": 67 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 228, "y": 413, "w": 56, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 56, "h": 66 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 1, "y": 412, "w": 56, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 56, "h": 67 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 358, "y": 347, "w": 57, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 57, "h": 67 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 508, "y": 275, "w": 60, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 60, "h": 68 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 64, "y": 208, "w": 61, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 61, "h": 69 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 326, "y": 142, "w": 62, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 2, "w": 62, "h": 69 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 1, "y": 71, "w": 64, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 1, "w": 64, "h": 70 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 412, "y": 71, "w": 64, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 1, "w": 64, "h": 70 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 276, "y": 68, "w": 64, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 0, "w": 64, "h": 71 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 340, "y": 72, "w": 63, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 1, "w": 63, "h": 70 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 476, "y": 137, "w": 63, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 1, "w": 63, "h": 70 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 403, "y": 141, "w": 62, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 2, "w": 62, "h": 69 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 308, "y": 211, "w": 60, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 60, "h": 69 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 299, "y": 280, "w": 59, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 59, "h": 68 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 471, "y": 412, "w": 56, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 56, "h": 67 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 415, "y": 412, "w": 56, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 56, "h": 67 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 228, "y": 413, "w": 56, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 56, "h": 66 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 1, "y": 412, "w": 56, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 56, "h": 67 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 358, "y": 347, "w": 57, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 57, "h": 67 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 508, "y": 275, "w": 60, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 60, "h": 68 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 64, "y": 208, "w": 61, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 61, "h": 69 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 326, "y": 142, "w": 62, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 2, "w": 62, "h": 69 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 1, "y": 71, "w": 64, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 1, "w": 64, "h": 70 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 412, "y": 71, "w": 64, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 1, "w": 64, "h": 70 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 276, "y": 68, "w": 64, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 0, "w": 64, "h": 71 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 340, "y": 72, "w": 63, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 1, "w": 63, "h": 70 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 476, "y": 137, "w": 63, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 1, "w": 63, "h": 70 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 403, "y": 141, "w": 62, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 2, "w": 62, "h": 69 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 308, "y": 211, "w": 60, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 60, "h": 69 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 299, "y": 280, "w": 59, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 59, "h": 68 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 471, "y": 412, "w": 56, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 56, "h": 67 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 415, "y": 412, "w": 56, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 56, "h": 67 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 228, "y": 413, "w": 56, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 56, "h": 66 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 1, "y": 412, "w": 56, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 4, "w": 56, "h": 67 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 358, "y": 347, "w": 57, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 4, "w": 57, "h": 67 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 508, "y": 275, "w": 60, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 3, "w": 60, "h": 68 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 247, "y": 208, "w": 61, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 61, "h": 69 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 448, "y": 275, "w": 60, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 60, "h": 68 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 368, "y": 279, "w": 59, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 59, "h": 68 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 173, "y": 346, "w": 57, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 57, "h": 67 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 239, "y": 277, "w": 60, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 60, "h": 67 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 1, "y": 209, "w": 63, "h": 66 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 63, "h": 66 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 478, "y": 1, "w": 68, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 68, "h": 67 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 276, "y": 1, "w": 70, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 70, "h": 67 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 70, "y": 1, "w": 71, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 71, "h": 68 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 208, "y": 1, "w": 68, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 68, "h": 69 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 208, "y": 70, "w": 65, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 65, "h": 69 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 64, "y": 208, "w": 61, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 61, "h": 69 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 65, "y": 138, "w": 63, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 1, "w": 63, "h": 70 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 412, "y": 1, "w": 66, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 66, "h": 70 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 1, "y": 1, "w": 69, "h": 70 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 1, "w": 69, "h": 70 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 141, "y": 1, "w": 67, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 0, "w": 67, "h": 71 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 346, "y": 1, "w": 66, "h": 71 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 0, "w": 66, "h": 71 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 239, "y": 344, "w": 57, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 57, "h": 69 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 57, "y": 414, "w": 54, "h": 67 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 54, "h": 67 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 173, "y": 413, "w": 55, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 3, "w": 55, "h": 68 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 296, "y": 348, "w": 55, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 55, "h": 69 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 59, "y": 345, "w": 57, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 57, "h": 69 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 64, "y": 208, "w": 61, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 61, "h": 69 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0088.png",
+    "frame": { "x": 263, "y": 139, "w": 63, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 63, "h": 69 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0089.png",
+    "frame": { "x": 70, "y": 69, "w": 65, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 2, "w": 65, "h": 69 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0090.png",
+    "frame": { "x": 121, "y": 277, "w": 59, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 59, "h": 69 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0091.png",
+    "frame": { "x": 186, "y": 208, "w": 61, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 61, "h": 69 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0092.png",
+    "frame": { "x": 200, "y": 139, "w": 63, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 63, "h": 69 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0093.png",
+    "frame": { "x": 478, "y": 68, "w": 65, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 65, "h": 69 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0094.png",
+    "frame": { "x": 427, "y": 343, "w": 58, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 58, "h": 69 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0095.png",
+    "frame": { "x": 125, "y": 208, "w": 61, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 2, "w": 61, "h": 69 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0096.png",
+    "frame": { "x": 128, "y": 140, "w": 63, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 63, "h": 68 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0097.png",
+    "frame": { "x": 135, "y": 72, "w": 65, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 65, "h": 68 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0098.png",
+    "frame": { "x": 1, "y": 344, "w": 58, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 58, "h": 68 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0099.png",
+    "frame": { "x": 61, "y": 277, "w": 60, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 3, "w": 60, "h": 68 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0100.png",
+    "frame": { "x": 465, "y": 207, "w": 62, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 62, "h": 68 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0101.png",
+    "frame": { "x": 1, "y": 141, "w": 63, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 63, "h": 68 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0102.png",
+    "frame": { "x": 116, "y": 346, "w": 57, "h": 68 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 3, "w": 57, "h": 68 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0103.png",
+    "frame": { "x": 485, "y": 343, "w": 58, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 58, "h": 69 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0104.png",
+    "frame": { "x": 180, "y": 277, "w": 59, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 59, "h": 69 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0105.png",
+    "frame": { "x": 1, "y": 275, "w": 60, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 2, "w": 60, "h": 69 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   },
+   {
+    "filename": "0106.png",
+    "frame": { "x": 388, "y": 210, "w": 60, "h": 69 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 2, "w": 60, "h": 69 },
+    "sourceSize": { "w": 76, "h": 71 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.13-x64",
+  "image": "783.png",
+  "format": "I8",
+  "size": { "w": 569, "h": 482 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/shiny/783.png b/public/images/pokemon/shiny/783.png
index 6d49131f69d..b14d064e998 100644
Binary files a/public/images/pokemon/shiny/783.png and b/public/images/pokemon/shiny/783.png differ
diff --git a/public/images/pokemon/shiny/784.json b/public/images/pokemon/shiny/784.json
index fdf96d2b111..b69481e9732 100644
--- a/public/images/pokemon/shiny/784.json
+++ b/public/images/pokemon/shiny/784.json
@@ -1,41 +1,812 @@
-{
-	"textures": [
-		{
-			"image": "784.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 81,
-				"h": 81
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 79,
-						"h": 81
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 79,
-						"h": 81
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 79,
-						"h": 81
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:6096bcc779e33e1df807da48a8d58c7f:483f9130a6e530e32c532c6bacf9c317:c2f7ca3ab1075b8c824730653d891244$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 254, "y": 238, "w": 80, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 4, "w": 80, "h": 81 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 373, "y": 162, "w": 84, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 4, "w": 84, "h": 81 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 285, "y": 157, "w": 88, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 4, "w": 88, "h": 81 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 104, "y": 78, "w": 94, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 5, "w": 94, "h": 80 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 414, "y": 1, "w": 99, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 6, "w": 99, "h": 79 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 1, "y": 1, "w": 103, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 7, "w": 103, "h": 78 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 104, "y": 1, "w": 104, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 104, "h": 77 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 208, "y": 1, "w": 102, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 102, "h": 78 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 310, "y": 77, "w": 96, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 5, "w": 96, "h": 80 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 406, "y": 80, "w": 89, "h": 82 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 89, "h": 82 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 495, "y": 161, "w": 82, "h": 83 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 82, "h": 83 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 649, "y": 324, "w": 77, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 77, "h": 81 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 155, "y": 327, "w": 76, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 6, "w": 76, "h": 79 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 394, "y": 325, "w": 77, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 5, "w": 77, "h": 80 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 571, "y": 324, "w": 78, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 78, "h": 80 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 161, "y": 246, "w": 78, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 4, "w": 78, "h": 81 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 254, "y": 238, "w": 80, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 4, "w": 80, "h": 81 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 373, "y": 162, "w": 84, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 4, "w": 84, "h": 81 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 285, "y": 157, "w": 88, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 4, "w": 88, "h": 81 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 104, "y": 78, "w": 94, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 5, "w": 94, "h": 80 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 414, "y": 1, "w": 99, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 6, "w": 99, "h": 79 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 1, "y": 1, "w": 103, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 7, "w": 103, "h": 78 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 104, "y": 1, "w": 104, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 104, "h": 77 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 208, "y": 1, "w": 102, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 102, "h": 78 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 310, "y": 77, "w": 96, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 5, "w": 96, "h": 80 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 406, "y": 80, "w": 89, "h": 82 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 89, "h": 82 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 495, "y": 161, "w": 82, "h": 83 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 82, "h": 83 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 649, "y": 324, "w": 77, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 77, "h": 81 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 155, "y": 327, "w": 76, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 6, "w": 76, "h": 79 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 394, "y": 325, "w": 77, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 5, "w": 77, "h": 80 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 571, "y": 324, "w": 78, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 78, "h": 80 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 161, "y": 246, "w": 78, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 4, "w": 78, "h": 81 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0033.png",
+    "frame": { "x": 254, "y": 238, "w": 80, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 4, "w": 80, "h": 81 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0034.png",
+    "frame": { "x": 373, "y": 162, "w": 84, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 4, "w": 84, "h": 81 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0035.png",
+    "frame": { "x": 285, "y": 157, "w": 88, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 4, "w": 88, "h": 81 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0036.png",
+    "frame": { "x": 104, "y": 78, "w": 94, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 5, "w": 94, "h": 80 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0037.png",
+    "frame": { "x": 414, "y": 1, "w": 99, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 6, "w": 99, "h": 79 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0038.png",
+    "frame": { "x": 1, "y": 1, "w": 103, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 7, "w": 103, "h": 78 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0039.png",
+    "frame": { "x": 104, "y": 1, "w": 104, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 104, "h": 77 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0040.png",
+    "frame": { "x": 208, "y": 1, "w": 102, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 102, "h": 78 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0041.png",
+    "frame": { "x": 310, "y": 77, "w": 96, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 5, "w": 96, "h": 80 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0042.png",
+    "frame": { "x": 406, "y": 80, "w": 89, "h": 82 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 89, "h": 82 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0043.png",
+    "frame": { "x": 495, "y": 161, "w": 82, "h": 83 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 82, "h": 83 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0044.png",
+    "frame": { "x": 649, "y": 324, "w": 77, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 77, "h": 81 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0045.png",
+    "frame": { "x": 155, "y": 327, "w": 76, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 6, "w": 76, "h": 79 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0046.png",
+    "frame": { "x": 394, "y": 325, "w": 77, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 5, "w": 77, "h": 80 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0047.png",
+    "frame": { "x": 571, "y": 324, "w": 78, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 78, "h": 80 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0048.png",
+    "frame": { "x": 161, "y": 246, "w": 78, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 4, "w": 78, "h": 81 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0049.png",
+    "frame": { "x": 254, "y": 238, "w": 80, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 4, "w": 80, "h": 81 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0050.png",
+    "frame": { "x": 373, "y": 162, "w": 84, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 4, "w": 84, "h": 81 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0051.png",
+    "frame": { "x": 285, "y": 157, "w": 88, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 4, "w": 88, "h": 81 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0052.png",
+    "frame": { "x": 104, "y": 78, "w": 94, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 5, "w": 94, "h": 80 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0053.png",
+    "frame": { "x": 414, "y": 1, "w": 99, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 6, "w": 99, "h": 79 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0054.png",
+    "frame": { "x": 1, "y": 1, "w": 103, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 7, "w": 103, "h": 78 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0055.png",
+    "frame": { "x": 104, "y": 1, "w": 104, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 8, "w": 104, "h": 77 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0056.png",
+    "frame": { "x": 208, "y": 1, "w": 102, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 0, "y": 7, "w": 102, "h": 78 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0057.png",
+    "frame": { "x": 310, "y": 77, "w": 96, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 5, "w": 96, "h": 80 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0058.png",
+    "frame": { "x": 406, "y": 80, "w": 89, "h": 82 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 3, "w": 89, "h": 82 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0059.png",
+    "frame": { "x": 495, "y": 161, "w": 82, "h": 83 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 2, "w": 82, "h": 83 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0060.png",
+    "frame": { "x": 649, "y": 324, "w": 77, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 77, "h": 81 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0061.png",
+    "frame": { "x": 155, "y": 327, "w": 76, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 6, "w": 76, "h": 79 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0062.png",
+    "frame": { "x": 394, "y": 325, "w": 77, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 5, "w": 77, "h": 80 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0063.png",
+    "frame": { "x": 571, "y": 324, "w": 78, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 78, "h": 80 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0064.png",
+    "frame": { "x": 161, "y": 246, "w": 78, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 4, "w": 78, "h": 81 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0065.png",
+    "frame": { "x": 81, "y": 240, "w": 80, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 4, "w": 80, "h": 81 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0066.png",
+    "frame": { "x": 577, "y": 162, "w": 83, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 4, "w": 83, "h": 81 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0067.png",
+    "frame": { "x": 1, "y": 158, "w": 89, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 5, "w": 89, "h": 80 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0068.png",
+    "frame": { "x": 1, "y": 79, "w": 95, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 6, "w": 95, "h": 79 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0069.png",
+    "frame": { "x": 612, "y": 1, "w": 100, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 7, "w": 100, "h": 78 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0070.png",
+    "frame": { "x": 310, "y": 1, "w": 104, "h": 76 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 4, "y": 9, "w": 104, "h": 76 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0071.png",
+    "frame": { "x": 513, "y": 1, "w": 99, "h": 79 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 6, "w": 99, "h": 79 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0072.png",
+    "frame": { "x": 495, "y": 80, "w": 90, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 14, "y": 4, "w": 90, "h": 81 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0073.png",
+    "frame": { "x": 612, "y": 79, "w": 88, "h": 83 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 2, "w": 88, "h": 83 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0074.png",
+    "frame": { "x": 198, "y": 79, "w": 87, "h": 85 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 0, "w": 87, "h": 85 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0075.png",
+    "frame": { "x": 90, "y": 158, "w": 84, "h": 82 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 8, "y": 3, "w": 84, "h": 82 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0076.png",
+    "frame": { "x": 471, "y": 325, "w": 76, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 76, "h": 80 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0077.png",
+    "frame": { "x": 77, "y": 403, "w": 75, "h": 74 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 14, "w": 75, "h": 74 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0078.png",
+    "frame": { "x": 231, "y": 400, "w": 75, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 7, "w": 75, "h": 80 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0079.png",
+    "frame": { "x": 1, "y": 402, "w": 76, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 9, "w": 76, "h": 77 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0080.png",
+    "frame": { "x": 317, "y": 325, "w": 77, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 6, "w": 77, "h": 80 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0081.png",
+    "frame": { "x": 239, "y": 319, "w": 78, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 5, "w": 78, "h": 81 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0082.png",
+    "frame": { "x": 174, "y": 164, "w": 80, "h": 82 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 5, "y": 4, "w": 80, "h": 82 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0083.png",
+    "frame": { "x": 1, "y": 238, "w": 80, "h": 82 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 80, "h": 82 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0084.png",
+    "frame": { "x": 334, "y": 243, "w": 79, "h": 82 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 7, "y": 3, "w": 79, "h": 82 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0085.png",
+    "frame": { "x": 1, "y": 320, "w": 77, "h": 82 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 3, "w": 77, "h": 82 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0086.png",
+    "frame": { "x": 78, "y": 321, "w": 77, "h": 82 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 3, "w": 77, "h": 82 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0087.png",
+    "frame": { "x": 413, "y": 243, "w": 79, "h": 82 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 3, "w": 79, "h": 82 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0088.png",
+    "frame": { "x": 577, "y": 243, "w": 79, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 4, "w": 79, "h": 81 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   },
+   {
+    "filename": "0089.png",
+    "frame": { "x": 492, "y": 244, "w": 79, "h": 81 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 4, "w": 79, "h": 81 },
+    "sourceSize": { "w": 108, "h": 88 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.13-x64",
+  "image": "784.png",
+  "format": "I8",
+  "size": { "w": 727, "h": 481 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/shiny/784.png b/public/images/pokemon/shiny/784.png
index 57cf7a67747..f9f5813e1c2 100644
Binary files a/public/images/pokemon/shiny/784.png and b/public/images/pokemon/shiny/784.png differ
diff --git a/public/images/pokemon/shiny/890.json b/public/images/pokemon/shiny/890.json
index 15d4be50370..527f9bbf500 100644
--- a/public/images/pokemon/shiny/890.json
+++ b/public/images/pokemon/shiny/890.json
@@ -4,30 +4,1815 @@
 			"image": "890.png",
 			"format": "RGBA8888",
 			"size": {
-				"w": 92,
-				"h": 88
+				"w": 539,
+				"h": 539
 			},
 			"scale": 1,
 			"frames": [
+				{
+					"filename": "0077.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 96,
+						"h": 89
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 19,
+						"w": 96,
+						"h": 66
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 96,
+						"h": 66
+					}
+				},
+				{
+					"filename": "0078.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 96,
+						"h": 89
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 19,
+						"w": 96,
+						"h": 66
+					},
+					"frame": {
+						"x": 96,
+						"y": 0,
+						"w": 96,
+						"h": 66
+					}
+				},
+				{
+					"filename": "0079.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 96,
+						"h": 89
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 19,
+						"w": 96,
+						"h": 66
+					},
+					"frame": {
+						"x": 192,
+						"y": 0,
+						"w": 96,
+						"h": 66
+					}
+				},
+				{
+					"filename": "0076.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 96,
+						"h": 89
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 19,
+						"w": 96,
+						"h": 67
+					},
+					"frame": {
+						"x": 288,
+						"y": 0,
+						"w": 96,
+						"h": 67
+					}
+				},
+				{
+					"filename": "0080.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 96,
+						"h": 89
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 19,
+						"w": 95,
+						"h": 67
+					},
+					"frame": {
+						"x": 384,
+						"y": 0,
+						"w": 95,
+						"h": 67
+					}
+				},
+				{
+					"filename": "0071.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 96,
+						"h": 89
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 19,
+						"w": 96,
+						"h": 68
+					},
+					"frame": {
+						"x": 0,
+						"y": 66,
+						"w": 96,
+						"h": 68
+					}
+				},
+				{
+					"filename": "0073.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 96,
+						"h": 89
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 19,
+						"w": 96,
+						"h": 68
+					},
+					"frame": {
+						"x": 96,
+						"y": 66,
+						"w": 96,
+						"h": 68
+					}
+				},
+				{
+					"filename": "0075.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 96,
+						"h": 89
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 19,
+						"w": 96,
+						"h": 68
+					},
+					"frame": {
+						"x": 192,
+						"y": 66,
+						"w": 96,
+						"h": 68
+					}
+				},
+				{
+					"filename": "0081.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 96,
+						"h": 89
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 18,
+						"w": 96,
+						"h": 68
+					},
+					"frame": {
+						"x": 288,
+						"y": 67,
+						"w": 96,
+						"h": 68
+					}
+				},
+				{
+					"filename": "0070.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 96,
+						"h": 89
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 19,
+						"w": 96,
+						"h": 69
+					},
+					"frame": {
+						"x": 384,
+						"y": 67,
+						"w": 96,
+						"h": 69
+					}
+				},
+				{
+					"filename": "0072.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 96,
+						"h": 89
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 19,
+						"w": 96,
+						"h": 69
+					},
+					"frame": {
+						"x": 0,
+						"y": 134,
+						"w": 96,
+						"h": 69
+					}
+				},
+				{
+					"filename": "0074.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 96,
+						"h": 89
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 19,
+						"w": 96,
+						"h": 69
+					},
+					"frame": {
+						"x": 96,
+						"y": 134,
+						"w": 96,
+						"h": 69
+					}
+				},
+				{
+					"filename": "0082.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 96,
+						"h": 89
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 16,
+						"w": 96,
+						"h": 71
+					},
+					"frame": {
+						"x": 192,
+						"y": 134,
+						"w": 96,
+						"h": 71
+					}
+				},
+				{
+					"filename": "0068.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 96,
+						"h": 89
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 10,
+						"w": 88,
+						"h": 73
+					},
+					"frame": {
+						"x": 288,
+						"y": 135,
+						"w": 88,
+						"h": 73
+					}
+				},
+				{
+					"filename": "0069.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 96,
+						"h": 89
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 16,
+						"w": 92,
+						"h": 73
+					},
+					"frame": {
+						"x": 376,
+						"y": 136,
+						"w": 92,
+						"h": 73
+					}
+				},
+				{
+					"filename": "0083.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 96,
+						"h": 89
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 13,
+						"w": 95,
+						"h": 74
+					},
+					"frame": {
+						"x": 0,
+						"y": 203,
+						"w": 95,
+						"h": 74
+					}
+				},
+				{
+					"filename": "0009.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 96,
+						"h": 89
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 13,
+						"w": 94,
+						"h": 76
+					},
+					"frame": {
+						"x": 95,
+						"y": 203,
+						"w": 94,
+						"h": 76
+					}
+				},
+				{
+					"filename": "0025.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 96,
+						"h": 89
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 13,
+						"w": 94,
+						"h": 76
+					},
+					"frame": {
+						"x": 95,
+						"y": 203,
+						"w": 94,
+						"h": 76
+					}
+				},
+				{
+					"filename": "0041.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 96,
+						"h": 89
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 13,
+						"w": 94,
+						"h": 76
+					},
+					"frame": {
+						"x": 95,
+						"y": 203,
+						"w": 94,
+						"h": 76
+					}
+				},
+				{
+					"filename": "0057.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 96,
+						"h": 89
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 13,
+						"w": 94,
+						"h": 76
+					},
+					"frame": {
+						"x": 95,
+						"y": 203,
+						"w": 94,
+						"h": 76
+					}
+				},
+				{
+					"filename": "0008.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 96,
+						"h": 89
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 12,
+						"w": 89,
+						"h": 77
+					},
+					"frame": {
+						"x": 189,
+						"y": 205,
+						"w": 89,
+						"h": 77
+					}
+				},
+				{
+					"filename": "0024.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 96,
+						"h": 89
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 12,
+						"w": 89,
+						"h": 77
+					},
+					"frame": {
+						"x": 189,
+						"y": 205,
+						"w": 89,
+						"h": 77
+					}
+				},
+				{
+					"filename": "0040.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 96,
+						"h": 89
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 12,
+						"w": 89,
+						"h": 77
+					},
+					"frame": {
+						"x": 189,
+						"y": 205,
+						"w": 89,
+						"h": 77
+					}
+				},
+				{
+					"filename": "0056.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 96,
+						"h": 89
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 12,
+						"w": 89,
+						"h": 77
+					},
+					"frame": {
+						"x": 189,
+						"y": 205,
+						"w": 89,
+						"h": 77
+					}
+				},
+				{
+					"filename": "0010.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 96,
+						"h": 89
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 11,
+						"w": 94,
+						"h": 77
+					},
+					"frame": {
+						"x": 278,
+						"y": 208,
+						"w": 94,
+						"h": 77
+					}
+				},
+				{
+					"filename": "0026.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 96,
+						"h": 89
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 11,
+						"w": 94,
+						"h": 77
+					},
+					"frame": {
+						"x": 278,
+						"y": 208,
+						"w": 94,
+						"h": 77
+					}
+				},
+				{
+					"filename": "0042.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 96,
+						"h": 89
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 11,
+						"w": 94,
+						"h": 77
+					},
+					"frame": {
+						"x": 278,
+						"y": 208,
+						"w": 94,
+						"h": 77
+					}
+				},
+				{
+					"filename": "0058.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 96,
+						"h": 89
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 11,
+						"w": 94,
+						"h": 77
+					},
+					"frame": {
+						"x": 278,
+						"y": 208,
+						"w": 94,
+						"h": 77
+					}
+				},
+				{
+					"filename": "0084.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 96,
+						"h": 89
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 9,
+						"w": 95,
+						"h": 77
+					},
+					"frame": {
+						"x": 372,
+						"y": 209,
+						"w": 95,
+						"h": 77
+					}
+				},
+				{
+					"filename": "0007.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 96,
+						"h": 89
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 11,
+						"w": 86,
+						"h": 78
+					},
+					"frame": {
+						"x": 0,
+						"y": 277,
+						"w": 86,
+						"h": 78
+					}
+				},
+				{
+					"filename": "0023.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 96,
+						"h": 89
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 11,
+						"w": 86,
+						"h": 78
+					},
+					"frame": {
+						"x": 0,
+						"y": 277,
+						"w": 86,
+						"h": 78
+					}
+				},
+				{
+					"filename": "0039.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 96,
+						"h": 89
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 11,
+						"w": 86,
+						"h": 78
+					},
+					"frame": {
+						"x": 0,
+						"y": 277,
+						"w": 86,
+						"h": 78
+					}
+				},
+				{
+					"filename": "0055.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 96,
+						"h": 89
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 11,
+						"w": 86,
+						"h": 78
+					},
+					"frame": {
+						"x": 0,
+						"y": 277,
+						"w": 86,
+						"h": 78
+					}
+				},
+				{
+					"filename": "0011.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 96,
+						"h": 89
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 8,
+						"w": 92,
+						"h": 78
+					},
+					"frame": {
+						"x": 86,
+						"y": 279,
+						"w": 92,
+						"h": 78
+					}
+				},
+				{
+					"filename": "0027.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 96,
+						"h": 89
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 8,
+						"w": 92,
+						"h": 78
+					},
+					"frame": {
+						"x": 86,
+						"y": 279,
+						"w": 92,
+						"h": 78
+					}
+				},
+				{
+					"filename": "0043.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 96,
+						"h": 89
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 8,
+						"w": 92,
+						"h": 78
+					},
+					"frame": {
+						"x": 86,
+						"y": 279,
+						"w": 92,
+						"h": 78
+					}
+				},
+				{
+					"filename": "0059.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 96,
+						"h": 89
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 8,
+						"w": 92,
+						"h": 78
+					},
+					"frame": {
+						"x": 86,
+						"y": 279,
+						"w": 92,
+						"h": 78
+					}
+				},
+				{
+					"filename": "0012.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 96,
+						"h": 89
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 6,
+						"w": 91,
+						"h": 78
+					},
+					"frame": {
+						"x": 178,
+						"y": 282,
+						"w": 91,
+						"h": 78
+					}
+				},
+				{
+					"filename": "0028.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 96,
+						"h": 89
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 6,
+						"w": 91,
+						"h": 78
+					},
+					"frame": {
+						"x": 178,
+						"y": 282,
+						"w": 91,
+						"h": 78
+					}
+				},
+				{
+					"filename": "0044.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 96,
+						"h": 89
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 6,
+						"w": 91,
+						"h": 78
+					},
+					"frame": {
+						"x": 178,
+						"y": 282,
+						"w": 91,
+						"h": 78
+					}
+				},
+				{
+					"filename": "0060.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 96,
+						"h": 89
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 6,
+						"w": 91,
+						"h": 78
+					},
+					"frame": {
+						"x": 178,
+						"y": 282,
+						"w": 91,
+						"h": 78
+					}
+				},
+				{
+					"filename": "0013.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 96,
+						"h": 89
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 4,
+						"w": 91,
+						"h": 78
+					},
+					"frame": {
+						"x": 269,
+						"y": 285,
+						"w": 91,
+						"h": 78
+					}
+				},
+				{
+					"filename": "0029.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 96,
+						"h": 89
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 4,
+						"w": 91,
+						"h": 78
+					},
+					"frame": {
+						"x": 269,
+						"y": 285,
+						"w": 91,
+						"h": 78
+					}
+				},
+				{
+					"filename": "0045.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 96,
+						"h": 89
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 4,
+						"w": 91,
+						"h": 78
+					},
+					"frame": {
+						"x": 269,
+						"y": 285,
+						"w": 91,
+						"h": 78
+					}
+				},
+				{
+					"filename": "0061.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 96,
+						"h": 89
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 4,
+						"w": 91,
+						"h": 78
+					},
+					"frame": {
+						"x": 269,
+						"y": 285,
+						"w": 91,
+						"h": 78
+					}
+				},
+				{
+					"filename": "0067.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 96,
+						"h": 89
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 5,
+						"w": 86,
+						"h": 78
+					},
+					"frame": {
+						"x": 360,
+						"y": 286,
+						"w": 86,
+						"h": 78
+					}
+				},
+				{
+					"filename": "0006.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 96,
+						"h": 89
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 9,
+						"w": 86,
+						"h": 79
+					},
+					"frame": {
+						"x": 446,
+						"y": 286,
+						"w": 86,
+						"h": 79
+					}
+				},
+				{
+					"filename": "0022.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 96,
+						"h": 89
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 9,
+						"w": 86,
+						"h": 79
+					},
+					"frame": {
+						"x": 446,
+						"y": 286,
+						"w": 86,
+						"h": 79
+					}
+				},
+				{
+					"filename": "0038.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 96,
+						"h": 89
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 9,
+						"w": 86,
+						"h": 79
+					},
+					"frame": {
+						"x": 446,
+						"y": 286,
+						"w": 86,
+						"h": 79
+					}
+				},
+				{
+					"filename": "0054.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 96,
+						"h": 89
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 9,
+						"w": 86,
+						"h": 79
+					},
+					"frame": {
+						"x": 446,
+						"y": 286,
+						"w": 86,
+						"h": 79
+					}
+				},
+				{
+					"filename": "0005.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 96,
+						"h": 89
+					},
+					"spriteSourceSize": {
+						"x": 3,
+						"y": 6,
+						"w": 85,
+						"h": 80
+					},
+					"frame": {
+						"x": 0,
+						"y": 355,
+						"w": 85,
+						"h": 80
+					}
+				},
+				{
+					"filename": "0021.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 96,
+						"h": 89
+					},
+					"spriteSourceSize": {
+						"x": 3,
+						"y": 6,
+						"w": 85,
+						"h": 80
+					},
+					"frame": {
+						"x": 0,
+						"y": 355,
+						"w": 85,
+						"h": 80
+					}
+				},
+				{
+					"filename": "0037.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 96,
+						"h": 89
+					},
+					"spriteSourceSize": {
+						"x": 3,
+						"y": 6,
+						"w": 85,
+						"h": 80
+					},
+					"frame": {
+						"x": 0,
+						"y": 355,
+						"w": 85,
+						"h": 80
+					}
+				},
+				{
+					"filename": "0053.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 96,
+						"h": 89
+					},
+					"spriteSourceSize": {
+						"x": 3,
+						"y": 6,
+						"w": 85,
+						"h": 80
+					},
+					"frame": {
+						"x": 0,
+						"y": 355,
+						"w": 85,
+						"h": 80
+					}
+				},
+				{
+					"filename": "0085.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 96,
+						"h": 89
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 6,
+						"w": 93,
+						"h": 79
+					},
+					"frame": {
+						"x": 85,
+						"y": 357,
+						"w": 93,
+						"h": 79
+					}
+				},
+				{
+					"filename": "0014.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 96,
+						"h": 89
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 2,
+						"w": 90,
+						"h": 80
+					},
+					"frame": {
+						"x": 178,
+						"y": 360,
+						"w": 90,
+						"h": 80
+					}
+				},
+				{
+					"filename": "0030.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 96,
+						"h": 89
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 2,
+						"w": 90,
+						"h": 80
+					},
+					"frame": {
+						"x": 178,
+						"y": 360,
+						"w": 90,
+						"h": 80
+					}
+				},
+				{
+					"filename": "0046.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 96,
+						"h": 89
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 2,
+						"w": 90,
+						"h": 80
+					},
+					"frame": {
+						"x": 178,
+						"y": 360,
+						"w": 90,
+						"h": 80
+					}
+				},
+				{
+					"filename": "0062.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 96,
+						"h": 89
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 2,
+						"w": 90,
+						"h": 80
+					},
+					"frame": {
+						"x": 178,
+						"y": 360,
+						"w": 90,
+						"h": 80
+					}
+				},
+				{
+					"filename": "0004.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 96,
+						"h": 89
+					},
+					"spriteSourceSize": {
+						"x": 3,
+						"y": 4,
+						"w": 86,
+						"h": 81
+					},
+					"frame": {
+						"x": 268,
+						"y": 363,
+						"w": 86,
+						"h": 81
+					}
+				},
+				{
+					"filename": "0020.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 96,
+						"h": 89
+					},
+					"spriteSourceSize": {
+						"x": 3,
+						"y": 4,
+						"w": 86,
+						"h": 81
+					},
+					"frame": {
+						"x": 268,
+						"y": 363,
+						"w": 86,
+						"h": 81
+					}
+				},
+				{
+					"filename": "0036.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 96,
+						"h": 89
+					},
+					"spriteSourceSize": {
+						"x": 3,
+						"y": 4,
+						"w": 86,
+						"h": 81
+					},
+					"frame": {
+						"x": 268,
+						"y": 363,
+						"w": 86,
+						"h": 81
+					}
+				},
+				{
+					"filename": "0052.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 96,
+						"h": 89
+					},
+					"spriteSourceSize": {
+						"x": 3,
+						"y": 4,
+						"w": 86,
+						"h": 81
+					},
+					"frame": {
+						"x": 268,
+						"y": 363,
+						"w": 86,
+						"h": 81
+					}
+				},
+				{
+					"filename": "0002.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 96,
+						"h": 89
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 1,
+						"w": 88,
+						"h": 82
+					},
+					"frame": {
+						"x": 354,
+						"y": 364,
+						"w": 88,
+						"h": 82
+					}
+				},
+				{
+					"filename": "0018.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 96,
+						"h": 89
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 1,
+						"w": 88,
+						"h": 82
+					},
+					"frame": {
+						"x": 354,
+						"y": 364,
+						"w": 88,
+						"h": 82
+					}
+				},
+				{
+					"filename": "0034.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 96,
+						"h": 89
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 1,
+						"w": 88,
+						"h": 82
+					},
+					"frame": {
+						"x": 354,
+						"y": 364,
+						"w": 88,
+						"h": 82
+					}
+				},
+				{
+					"filename": "0050.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 96,
+						"h": 89
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 1,
+						"w": 88,
+						"h": 82
+					},
+					"frame": {
+						"x": 354,
+						"y": 364,
+						"w": 88,
+						"h": 82
+					}
+				},
+				{
+					"filename": "0003.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 96,
+						"h": 89
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 2,
+						"w": 87,
+						"h": 82
+					},
+					"frame": {
+						"x": 442,
+						"y": 365,
+						"w": 87,
+						"h": 82
+					}
+				},
+				{
+					"filename": "0019.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 96,
+						"h": 89
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 2,
+						"w": 87,
+						"h": 82
+					},
+					"frame": {
+						"x": 442,
+						"y": 365,
+						"w": 87,
+						"h": 82
+					}
+				},
+				{
+					"filename": "0035.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 96,
+						"h": 89
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 2,
+						"w": 87,
+						"h": 82
+					},
+					"frame": {
+						"x": 442,
+						"y": 365,
+						"w": 87,
+						"h": 82
+					}
+				},
+				{
+					"filename": "0051.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 96,
+						"h": 89
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 2,
+						"w": 87,
+						"h": 82
+					},
+					"frame": {
+						"x": 442,
+						"y": 365,
+						"w": 87,
+						"h": 82
+					}
+				},
+				{
+					"filename": "0015.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 96,
+						"h": 89
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 1,
+						"w": 91,
+						"h": 82
+					},
+					"frame": {
+						"x": 0,
+						"y": 436,
+						"w": 91,
+						"h": 82
+					}
+				},
+				{
+					"filename": "0031.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 96,
+						"h": 89
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 1,
+						"w": 91,
+						"h": 82
+					},
+					"frame": {
+						"x": 0,
+						"y": 436,
+						"w": 91,
+						"h": 82
+					}
+				},
+				{
+					"filename": "0047.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 96,
+						"h": 89
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 1,
+						"w": 91,
+						"h": 82
+					},
+					"frame": {
+						"x": 0,
+						"y": 436,
+						"w": 91,
+						"h": 82
+					}
+				},
+				{
+					"filename": "0063.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 96,
+						"h": 89
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 1,
+						"w": 91,
+						"h": 82
+					},
+					"frame": {
+						"x": 0,
+						"y": 436,
+						"w": 91,
+						"h": 82
+					}
+				},
+				{
+					"filename": "0066.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 96,
+						"h": 89
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 2,
+						"w": 88,
+						"h": 82
+					},
+					"frame": {
+						"x": 91,
+						"y": 440,
+						"w": 88,
+						"h": 82
+					}
+				},
+				{
+					"filename": "0065.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 96,
+						"h": 89
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 0,
+						"w": 89,
+						"h": 85
+					},
+					"frame": {
+						"x": 179,
+						"y": 440,
+						"w": 89,
+						"h": 85
+					}
+				},
+				{
+					"filename": "0086.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 96,
+						"h": 89
+					},
+					"spriteSourceSize": {
+						"x": 3,
+						"y": 3,
+						"w": 91,
+						"h": 82
+					},
+					"frame": {
+						"x": 268,
+						"y": 446,
+						"w": 91,
+						"h": 82
+					}
+				},
 				{
 					"filename": "0001.png",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
 						"w": 96,
-						"h": 96
+						"h": 89
 					},
 					"spriteSourceSize": {
-						"x": 2,
-						"y": 4,
-						"w": 92,
-						"h": 88
+						"x": 4,
+						"y": 0,
+						"w": 90,
+						"h": 84
 					},
 					"frame": {
-						"x": 0,
+						"x": 359,
+						"y": 447,
+						"w": 90,
+						"h": 84
+					}
+				},
+				{
+					"filename": "0017.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 96,
+						"h": 89
+					},
+					"spriteSourceSize": {
+						"x": 4,
 						"y": 0,
-						"w": 92,
-						"h": 88
+						"w": 90,
+						"h": 84
+					},
+					"frame": {
+						"x": 359,
+						"y": 447,
+						"w": 90,
+						"h": 84
+					}
+				},
+				{
+					"filename": "0033.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 96,
+						"h": 89
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 0,
+						"w": 90,
+						"h": 84
+					},
+					"frame": {
+						"x": 359,
+						"y": 447,
+						"w": 90,
+						"h": 84
+					}
+				},
+				{
+					"filename": "0049.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 96,
+						"h": 89
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 0,
+						"w": 90,
+						"h": 84
+					},
+					"frame": {
+						"x": 359,
+						"y": 447,
+						"w": 90,
+						"h": 84
+					}
+				},
+				{
+					"filename": "0016.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 96,
+						"h": 89
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 0,
+						"w": 90,
+						"h": 84
+					},
+					"frame": {
+						"x": 449,
+						"y": 447,
+						"w": 90,
+						"h": 84
+					}
+				},
+				{
+					"filename": "0032.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 96,
+						"h": 89
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 0,
+						"w": 90,
+						"h": 84
+					},
+					"frame": {
+						"x": 449,
+						"y": 447,
+						"w": 90,
+						"h": 84
+					}
+				},
+				{
+					"filename": "0048.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 96,
+						"h": 89
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 0,
+						"w": 90,
+						"h": 84
+					},
+					"frame": {
+						"x": 449,
+						"y": 447,
+						"w": 90,
+						"h": 84
+					}
+				},
+				{
+					"filename": "0064.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 96,
+						"h": 89
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 0,
+						"w": 90,
+						"h": 84
+					},
+					"frame": {
+						"x": 449,
+						"y": 447,
+						"w": 90,
+						"h": 84
 					}
 				}
 			]
@@ -36,6 +1821,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:15403e46a7a5b364c2a2147d4eb7d7c3:2e867b4ea704cf035cb5af056c17a9c3:cedd2711a12bbacba5623505fe88bd92$"
+		"smartupdate": "$TexturePacker:SmartUpdate:fa96c0e3d65728e89186519f4cb67c52:fea71255f53302925c1d757e4cf5549f:cedd2711a12bbacba5623505fe88bd92$"
 	}
 }
diff --git a/public/images/pokemon/shiny/890.png b/public/images/pokemon/shiny/890.png
index d59419ca66c..98e82b38b21 100644
Binary files a/public/images/pokemon/shiny/890.png and b/public/images/pokemon/shiny/890.png differ
diff --git a/public/images/pokemon/shiny/female/668.png b/public/images/pokemon/shiny/female/668.png
index 1f56d13bc4c..ec0d2338fac 100644
Binary files a/public/images/pokemon/shiny/female/668.png and b/public/images/pokemon/shiny/female/668.png differ
diff --git a/public/images/pokemon/variant/1011.json b/public/images/pokemon/variant/1011.json
new file mode 100644
index 00000000000..cbb4be4e207
--- /dev/null
+++ b/public/images/pokemon/variant/1011.json
@@ -0,0 +1,36 @@
+{
+	"1": {
+		"fd9477": "63b9b9",
+		"e64d3c": "397880",
+		"a28339": "5a4385",
+		"477d45": "67698b",
+		"b09579": "8ea1b4",
+		"f5e279": "f0d3f9",
+		"253922": "232b3a",
+		"345539": "313d4b",
+		"d1b147": "c998e2",
+		"9c1e2a": "272a52",
+		"7eb36a": "9aa0b3",
+		"9fc164": "9aa0b3",
+		"8e9960": "67698b",
+		"c73030": "2b526f",
+		"61071f": "190e2e"
+	},
+	"2": {
+		"fd9477": "f3efde",
+		"e64d3c": "eee0bc",
+		"a28339": "2e2246",
+		"477d45": "903c4e",
+		"b09579": "b49c98",
+		"f5e279": "589df3",
+		"253922": "2e0920",
+		"345539": "4f162a",
+		"d1b147": "354dbf",
+		"9c1e2a": "9c564c",
+		"7eb36a": "e28c95",
+		"9fc164": "e28c95",
+		"8e9960": "b0526f",
+		"c73030": "d1a87e",
+		"61071f": "571818"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/1019.json b/public/images/pokemon/variant/1019.json
new file mode 100644
index 00000000000..2d5a5f699c6
--- /dev/null
+++ b/public/images/pokemon/variant/1019.json
@@ -0,0 +1,46 @@
+{
+	"1": {
+		"9c0808": "70a2c5",
+		"b91d1d": "abd7e2",
+		"746739": "69348b",
+		"6ba835": "7a7c9e",
+		"9ce05f": "9aa0b3",
+		"d43e2d": "4e969e",
+		"841111": "302752",
+		"b11717": "663267",
+		"680606": "065e68",
+		"ff7a59": "69c5c5",
+		"c59588": "9c2e72",
+		"2d6127": "7f58af",
+		"b72629": "2b526f",
+		"b59a7d": "a3b9d0",
+		"82664a": "48476c",
+		"ffce5e": "d69ae8",
+		"3e662b": "313846",
+		"dcbfab": "c55885",
+		"e9cfb3": "dcebf9",
+		"3c9b3e": "e8edff"
+	},
+	"2": {
+		"9c0808": "bfb5ab",
+		"b91d1d": "dcd9d1",
+		"746739": "312374",
+		"6ba835": "a8546e",
+		"9ce05f": "e28c95",
+		"d43e2d": "eedfb8",
+		"841111": "4b211b",
+		"b11717": "63473b",
+		"680606": "68403b",
+		"ff7a59": "f3efde",
+		"c59588": "402622",
+		"2d6127": "2e2b8b",
+		"b72629": "bf9870",
+		"b59a7d": "cbb4af",
+		"82664a": "613838",
+		"ffce5e": "688ce8",
+		"3e662b": "341c1c",
+		"dcbfab": "5d4c45",
+		"e9cfb3": "e2dcd6",
+		"3c9b3e": "5e75e2"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/143-gigantamax.json b/public/images/pokemon/variant/143-gigantamax.json
new file mode 100644
index 00000000000..c6e5312d330
--- /dev/null
+++ b/public/images/pokemon/variant/143-gigantamax.json
@@ -0,0 +1,50 @@
+{
+    "1": {
+        "101010": "101010",
+        "5f3c18": "544a41",
+        "5e3e1d": "351b52",
+        "31573f": "7b59ba",
+        "54792b": "c06386",
+        "103941": "701a55",
+        "315a7b": "943469",
+        "bd3740": "c94489",
+        "a3704e": "522663",
+        "a47352": "6b6357",
+        "ad7f5f": "b56564",
+        "de5656": "d65a8a",
+        "069f5f": "b083de",
+        "89b432": "f1a1b2",
+        "bbe35b": "f1a1b2",
+        "98a0a0": "98a0a0",
+        "a0a0a0": "a0a0a0",
+        "fc8b9f": "ed7794",
+        "e6c5ac": "cf8880",
+        "f6e6bd": "f0beb1",
+        "c9c9c9": "c9c9c9",
+        "f4f4f4": "f4f4f4"
+    },
+    "2": {
+        "101010": "101010",
+        "5f3c18": "ba6632",
+        "5e3e1d": "c2986e",
+        "31573f": "4b4c52",
+        "54792b": "208073",
+        "103941": "93b5c2",
+        "315a7b": "b6d6d9",
+        "bd3740": "9e4619",
+        "a3704e": "e6cda1",
+        "a47352": "cf9d48",
+        "ad7f5f": "284878",
+        "de5656": "bd742b",
+        "069f5f": "7c7c82",
+        "89b432": "37ad82",
+        "bbe35b": "79e0a2",
+        "98a0a0": "53738a",
+        "a0a0a0": "abd1cc",
+        "fc8b9f": "d9a443",
+        "e6c5ac": "27538a",
+        "f6e6bd": "36719c",
+        "c9c9c9": "b4d3d9",
+        "f4f4f4": "f4f4f4"
+    }
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/143.json b/public/images/pokemon/variant/143.json
new file mode 100644
index 00000000000..b4e32403fc6
--- /dev/null
+++ b/public/images/pokemon/variant/143.json
@@ -0,0 +1,38 @@
+{
+    "1": {
+        "000000": "101010",
+        "634221": "351b52",
+        "103a42": "701a55",
+        "3a3d47": "41201e",
+        "3d3d47": "756363",
+        "315a7b": "943469",
+        "8a6455": "91504e",
+        "a67351": "522663",
+        "a57352": "9e5755",
+        "528cad": "ad4b70",
+        "73a5bd": "cc6c84",
+        "e6c5ad": "cf8880",
+        "f7d6bd": "e09f96",
+        "f7e6bd": "f0beb1",
+        "cecece": "cbc4c4",
+        "ffffff": "ffffff"
+    },
+    "2": {
+        "000000": "101010",
+        "634221": "c2986e",
+        "103a42": "85adbc",
+        "3a3d47": "131d39",
+        "3d3d47": "2b2b32",
+        "315a7b": "a3cacd",
+        "8a6455": "192b59",
+        "a67351": "e6cda1",
+        "a57352": "1b2e61",
+        "528cad": "cbe4e2",
+        "73a5bd": "edf5f4",
+        "e6c5ad": "284878",
+        "f7d6bd": "38638f",
+        "f7e6bd": "457ca8",
+        "cecece": "bfc7cb",
+        "ffffff": "ffffff"
+    }
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/187.json b/public/images/pokemon/variant/187.json
new file mode 100644
index 00000000000..7e0d1dca511
--- /dev/null
+++ b/public/images/pokemon/variant/187.json
@@ -0,0 +1,28 @@
+{
+    "1": {
+        "101010": "101010",
+        "425a10": "934200",
+        "52843a": "c27600",
+        "63bd5a": "efac00",
+        "8c083a": "012a3e",
+        "9cde5a": "ffdc46",
+        "b56373": "003e53",
+        "ff7b94": "006d7f",
+        "f79cb5": "00a59b",
+        "ffc500": "e3396c",
+        "ffff00": "ffa8b6"
+    },
+    "2": {
+        "101010": "101010",
+        "425a10": "5f0052",
+        "52843a": "960070",
+        "63bd5a": "960070",
+        "8c083a": "802600",
+        "9cde5a": "e01c75",
+        "b56373": "d8591c",
+        "ff7b94": "fa9600",
+        "f79cb5": "ffc93b",
+        "ffc500": "5ec0ec",
+        "ffff00": "94ecf9"
+    }
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/188.json b/public/images/pokemon/variant/188.json
new file mode 100644
index 00000000000..03edfeb51ff
--- /dev/null
+++ b/public/images/pokemon/variant/188.json
@@ -0,0 +1,30 @@
+{
+    "1": {
+        "000000": "101010",
+        "196b00": "c66b31",
+        "42b521": "e99f23",
+        "63d631": "ffd953",
+        "8c5200": "004269",
+        "8cf74a": "fef579",
+        "b5d6de": "fa9600",
+        "f7a519": "005883",
+        "ff6300": "420c78",
+        "ffd600": "046c90",
+        "ffef00": "007b9a",
+        "ffffff": "ffc93b"
+    },
+    "2": {
+        "000000": "101010",
+        "196b00": "2659ad",
+        "42b521": "5293d5",
+        "63d631": "79d5fa",
+        "8c5200": "5f0052",
+        "8cf74a": "a6eafa",
+        "b5d6de": "fa9600",
+        "f7a519": "960070",
+        "ff6300": "86005c",
+        "ffd600": "ba0071",
+        "ffef00": "e01c75",
+        "ffffff": "ffc93b"
+    }
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/189.json b/public/images/pokemon/variant/189.json
new file mode 100644
index 00000000000..7166d9ac513
--- /dev/null
+++ b/public/images/pokemon/variant/189.json
@@ -0,0 +1,38 @@
+{
+    "1": {
+        "101010": "101010",
+        "194a73": "b64d21",
+        "c53142": "405b8f",
+        "ef4252": "6781a4",
+        "29844a": "83839f",
+        "b58c31": "071a3c",
+        "d6bd5a": "282773",
+        "84ce7b": "c1bdd1",
+        "3a73c5": "e19903",
+        "ded67b": "ded67b",
+        "efe69c": "104f80",
+        "8cb5ff": "f9f870",
+        "ffffde": "2faac4",
+        "ffffee": "ffffee",
+        "fff7b5": "1379a0",
+        "739cff": "fcd936"
+    },
+    "2": {
+        "101010": "101010",
+        "194a73": "680054",
+        "c53142": "3887d2",
+        "ef4252": "58c1ea",
+        "29844a": "3887d3",
+        "b58c31": "da5014",
+        "d6bd5a": "f06f22",
+        "84ce7b": "58c1eb",
+        "3a73c5": "980062",
+        "ded67b": "ded67b",
+        "efe69c": "ffa747",
+        "8cb5ff": "e4486a",
+        "ffffde": "f9f29b",
+        "ffffee": "ffffee",
+        "fff7b5": "ffd45a",
+        "739cff": "d20d6a"
+    }
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/2037.json b/public/images/pokemon/variant/2037.json
new file mode 100644
index 00000000000..2c190d5d36a
--- /dev/null
+++ b/public/images/pokemon/variant/2037.json
@@ -0,0 +1,26 @@
+{
+    "1": {
+        "151515": "101010",
+        "2d57bb": "235dc4",
+        "558b9f": "9f435d",
+        "648082": "6e67b0",
+        "6cb1db": "3daae0",
+        "97bdd2": "ffa8b8",
+        "c1d1d2": "b3b8ea",
+        "d9e9f4": "ffd3e1",
+        "fdfdfd": "d7d9f9",
+        "ffffff": "ffffff"
+    },
+    "2": {
+        "151515": "101010",
+        "2d57bb": "6e1179",
+        "558b9f": "90215e",
+        "648082": "bf4747",
+        "6cb1db": "8832a0",
+        "97bdd2": "da4e75",
+        "c1d1d2": "ffc07b",
+        "d9e9f4": "ff8489",
+        "fdfdfd": "ffe6a0",
+        "ffffff": "ffffff"
+    }
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/2038.json b/public/images/pokemon/variant/2038.json
new file mode 100644
index 00000000000..845c45f7887
--- /dev/null
+++ b/public/images/pokemon/variant/2038.json
@@ -0,0 +1,36 @@
+{
+    "1": {
+        "101010": "101010",
+        "4d5c78": "394880",
+        "516077": "9f435d",
+        "007ab5": "2380c4",
+        "38858d": "e35ea2",
+        "7a8a9c": "6172ab",
+        "66b3d7": "3dbfe0",
+        "86a8c0": "e27495",
+        "81c2c5": "ff89c0",
+        "bdcbd7": "a7ade7",
+        "a1e1de": "ffb6e5",
+        "b0d3ea": "ffa8b8",
+        "eafefe": "ffd3e1",
+        "fdfdfd": "bec6ef",
+        "ffffff": "ffffff"
+    },
+    "2": {
+        "101010": "101010",
+        "4d5c78": "73174a",
+        "516077": "bb3c3c",
+        "007ab5": "882493",
+        "38858d": "572746",
+        "7a8a9c": "90215e",
+        "66b3d7": "a044ab",
+        "86a8c0": "ff824c",
+        "81c2c5": "75355e",
+        "bdcbd7": "da426d",
+        "a1e1de": "93547c",
+        "b0d3ea": "ffbf6b",
+        "eafefe": "ffe28c",
+        "fdfdfd": "ff6f86",
+        "ffffff": "ffffff"
+    }
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/204.json b/public/images/pokemon/variant/204.json
new file mode 100644
index 00000000000..19494090ac5
--- /dev/null
+++ b/public/images/pokemon/variant/204.json
@@ -0,0 +1,20 @@
+{
+	"1": {
+		"84d6d6": "c1cd7d",
+		"b5eff7": "e3e796",
+		"3a73a5": "74a057",
+		"942900": "cc5c1c",
+		"294a7b": "4b7641",
+		"52adb5": "a4b76b",
+		"ff4a3a": "f68b31"
+	},
+	"2": {
+		"84d6d6": "eda6ae",
+		"b5eff7": "f7dcd7",
+		"3a73a5": "b43469",
+		"942900": "1eaaaa",
+		"294a7b": "700a4b",
+		"52adb5": "d46b84",
+		"ff4a3a": "36cfbb"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/205.json b/public/images/pokemon/variant/205.json
new file mode 100644
index 00000000000..06e56b61f61
--- /dev/null
+++ b/public/images/pokemon/variant/205.json
@@ -0,0 +1,26 @@
+{
+	"1": {
+		"847b9c": "103b2c",
+		"f7deef": "5b965b",
+		"e6cef7": "3e7745",
+		"6b6b6b": "53af4a",
+		"ff9c9c": "ffb356",
+		"ffffff": "91c25e",
+		"841031": "af3b11",
+		"f76373": "f68b31",
+		"bd2942": "d8681e",
+		"524263": "04211a",
+		"c5a5de": "205639"
+	},
+	"2": {
+		"847b9c": "962a41",
+		"f7deef": "f7e2d7",
+		"e6cef7": "e9b1a0",
+		"ff9c9c": "b0f5ee",
+		"841031": "0e2667",
+		"f76373": "6bbfd2",
+		"bd2942": "2c6094",
+		"524263": "691338",
+		"c5a5de": "c86554"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/207.json b/public/images/pokemon/variant/207.json
index 63e1098713a..7d1ff05493d 100644
--- a/public/images/pokemon/variant/207.json
+++ b/public/images/pokemon/variant/207.json
@@ -1,32 +1,26 @@
 {
 	"1": {
-		"63314a": "7f4812",
-		"e6a5ce": "f8dd84",
-		"101010": "101010",
-		"ad6394": "b67322",
 		"de84b5": "daa93f",
-		"4a5a73": "4a5a73",
-		"ffffff": "ffffff",
-		"adbdc5": "adbdc5",
-		"bd6b5a": "49a3d2",
+		"e6a5ce": "f8dd84",
+		"63314a": "275487",
 		"4a73bd": "3b426f",
-		"ffa584": "68caed",
 		"294a7b": "1f2142",
-		"6b9cef": "596596"
+		"ad6394": "b67322",
+		"612f48": "7f4812",
+		"6b9cef": "596596",
+		"ffa584": "68caed",
+		"bd6b5a": "49a3d2"
 	},
 	"2": {
-		"63314a": "5f1723",
-		"e6a5ce": "ef6b58",
-		"101010": "101010",
-		"ad6394": "97343c",
 		"de84b5": "c04144",
-		"4a5a73": "4a5a73",
-		"ffffff": "ffffff",
-		"adbdc5": "adbdc5",
-		"bd6b5a": "c86539",
+		"e6a5ce": "ef6b58",
+		"63314a": "752d17",
 		"4a73bd": "42bca0",
-		"ffa584": "f0a452",
 		"294a7b": "33817e",
-		"6b9cef": "81e4b3"
+		"ad6394": "97343c",
+		"612f48": "5f1723",
+		"6b9cef": "81e4b3",
+		"ffa584": "f0a452",
+		"bd6b5a": "c86539"
 	}
 }
\ No newline at end of file
diff --git a/public/images/pokemon/variant/248-mega.json b/public/images/pokemon/variant/248-mega.json
index f515868233f..589b3616079 100644
--- a/public/images/pokemon/variant/248-mega.json
+++ b/public/images/pokemon/variant/248-mega.json
@@ -1,17 +1,34 @@
 {
+	"1": {
+"4a5a39": "533334",
+"821610": "004194",
+"942900": "004194",
+"d0243b": "006fb3",
+"d55200": "0098fc",
+"ff3e40": "0098fc",
+"f24159": "088a72",
+"f55e72": "18b8a0",
+"ff6668": "1cd9ff",
+"739c62": "915957",
+"ff8385": "00e0fc",
+"ffa3a4": "00ffc8",
+"accd9c": "c78482",
+"dee6cd": "dbb1b5"
+	},
 	"2": {
-		"4a5a39": "06092f",
-		"101010": "101010",
-		"dee6cd": "7068b2",
-		"accd9c": "625695",
-		"739c62": "2c3071",
-		"942900": "ee7b06",
-		"fefefe": "fefefe",
-		"c5c5c5": "c5c5c5",
-		"d55200": "ffa904",
-		"d0243b": "ffa904",
-		"ff3e40": "ffef76",
-		"821610": "ee7b06",
-		"737373": "737373"
+"4a5a39": "06092f",
+"821610": "ee7b06",
+"942900": "ee7b06",
+"d0243b": "ffa904",
+"d55200": "ffa904",
+"ff3e40": "ffef76",
+"f24159": "ff9224",
+"f55e72": "ffba36",
+"ff6668": "fff28f",
+"739c62": "2c3071",
+"ff8385": "fff49a",
+"ffa3a4": "fff9ce",
+"accd9c": "625695",
+"dee6cd": "7068b2"
 	}
 }
\ No newline at end of file
diff --git a/public/images/pokemon/variant/248-mega_2.json b/public/images/pokemon/variant/248-mega_2.json
deleted file mode 100644
index 9ef7d417209..00000000000
--- a/public/images/pokemon/variant/248-mega_2.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "248-mega_2.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 90,
-				"h": 90
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 90,
-						"h": 84
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 90,
-						"h": 84
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 90,
-						"h": 84
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:e4a1fe4fbac618754df7eb3fcf91b617:0e98725eab652ee45ee2526551c77350:90df97eb431b7162252516cb937a0b9e$"
-	}
-}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/248-mega_2.png b/public/images/pokemon/variant/248-mega_2.png
deleted file mode 100644
index 1aade727abf..00000000000
Binary files a/public/images/pokemon/variant/248-mega_2.png and /dev/null differ
diff --git a/public/images/pokemon/variant/299.json b/public/images/pokemon/variant/299.json
new file mode 100644
index 00000000000..3b2cd15e3cd
--- /dev/null
+++ b/public/images/pokemon/variant/299.json
@@ -0,0 +1,28 @@
+{
+    "1": {
+        "000000": "101010",
+        "5a1921": "1f3a30",
+        "31314a": "6b2710",
+        "9c314a": "30594a",
+        "de5252": "487c60",
+        "ff6b7b": "5a9170",
+        "42529c": "a14020",
+        "637bbd": "c66831",
+        "ff9494": "7fbc7a",
+        "8ca5e6": "db8644",
+        "adbdf7": "e09a65"
+    },
+    "2": {
+        "000000": "101010",
+        "5a1921": "28163a",
+        "31314a": "38619e",
+        "9c314a": "452b5e",
+        "de5252": "584282",
+        "ff6b7b": "675398",
+        "42529c": "68a2cd",
+        "637bbd": "99e4ee",
+        "ff9494": "7282c4",
+        "8ca5e6": "dcfff8",
+        "adbdf7": "f3fff6"
+    }
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/313.json b/public/images/pokemon/variant/313.json
new file mode 100644
index 00000000000..574574061ce
--- /dev/null
+++ b/public/images/pokemon/variant/313.json
@@ -0,0 +1,36 @@
+{
+	"1": {
+		"4a526b": "9a4013",
+		"4a4a52": "731509",
+		"ffe652": "fffa52",
+		"7b8ca5": "d66d38",
+		"8c314a": "491c22",
+		"8c8c94": "d4301b",
+		"a5b5c5": "eea256",
+		"f7df4d": "c0f79b",
+		"f78473": "864a51",
+		"8c6b52": "845c46",
+		"deb552": "edc81f",
+		"7b5d47": "329c38",
+		"ce3a52": "491c22",
+		"e65263": "652d32",
+		"d0a94c": "65c859"
+	},
+	"2": {
+		"4a526b": "102b2d",
+		"4a4a52": "1e711a",
+		"ffe652": "dde6b1",
+		"7b8ca5": "1e5256",
+		"8c314a": "0b4569",
+		"8c8c94": "0ba905",
+		"a5b5c5": "26686d",
+		"f7df4d": "ffe798",
+		"f78473": "5cc3f5",
+		"8c6b52": "5c713d",
+		"deb552": "b6d479",
+		"7b5d47": "bd7a0c",
+		"ce3a52": "1b8ad0",
+		"e65263": "2ba5f1",
+		"d0a94c": "ffca1a"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/314.json b/public/images/pokemon/variant/314.json
new file mode 100644
index 00000000000..87852b5a6fa
--- /dev/null
+++ b/public/images/pokemon/variant/314.json
@@ -0,0 +1,36 @@
+{
+	"1": {
+		"56687b": "6b4448",
+		"5a6b8c": "9a4013",
+		"8cadce": "d66d38",
+		"adc5ef": "eea256",
+		"fbfafa": "ffffff",
+		"9c52bd": "57272c",
+		"9c8452": "c38c26",
+		"6b5a94": "371c21",
+		"ffe673": "fffa52",
+		"83a4c5": "a3d0f5",
+		"7b7b7b": "b82b18",
+		"e6b54a": "ffda31",
+		"3a3a3a": "710d00",
+		"005ad6": "439fec",
+		"ce8cde": "6a342c"
+	},
+	"2": {
+		"56687b": "4badea",
+		"5a6b8c": "70a84f",
+		"8cadce": "c1db9c",
+		"adc5ef": "e5edcc",
+		"fbfafa": "8bfdea",
+		"9c52bd": "43a3df",
+		"9c8452": "074656",
+		"6b5a94": "255b95",
+		"ffe673": "3dc5d3",
+		"83a4c5": "ffde93",
+		"7b7b7b": "155870",
+		"e6b54a": "019792",
+		"3a3a3a": "0a2934",
+		"005ad6": "edb125",
+		"ce8cde": "77d4ee"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/32.json b/public/images/pokemon/variant/32.json
new file mode 100644
index 00000000000..473edcae2af
--- /dev/null
+++ b/public/images/pokemon/variant/32.json
@@ -0,0 +1,34 @@
+{
+    "1": {
+        "101010": "101010",
+        "006342": "273161",
+        "63426b": "944f25",
+        "b51900": "28678a",
+        "de4229": "42adc1",
+        "ff6b52": "78d6d3",
+        "00a573": "3b4d7a",
+        "9c4aad": "ab5c24",
+        "bd63c5": "cf863e",
+        "19ce9c": "55729e",
+        "e69cd6": "e0c151",
+        "efbdef": "ede4ab",
+        "cecece": "cecece",
+        "ffffff": "ffffff"
+    },
+    "2": {
+        "101010": "101010",
+        "006342": "b0384a",
+        "63426b": "142440",
+        "b51900": "b86527",
+        "de4229": "e1b13b",
+        "ff6b52": "eddd95",
+        "00a573": "d65e64",
+        "9c4aad": "133257",
+        "bd63c5": "253f5e",
+        "19ce9c": "ed938e",
+        "e69cd6": "375c73",
+        "efbdef": "5d91a1",
+        "cecece": "cecece",
+        "ffffff": "ffffff"
+    }
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/325.json b/public/images/pokemon/variant/325.json
new file mode 100644
index 00000000000..e8c6641defc
--- /dev/null
+++ b/public/images/pokemon/variant/325.json
@@ -0,0 +1,26 @@
+{
+	"1": {
+		"ef84ad": "5ca0b5",
+		"f7a5bd": "6ac5c8",
+		"c5637b": "3c6b95",
+		"ffd6e6": "b4e6e7",
+		"6b6b7b": "2e7320",
+		"7b7b8c": "559b43",
+		"5a5a73": "7dbc53",
+		"3a4252": "18340c",
+		"a53a42": "2b4d7d",
+		"a5a5ad": "b5d780"
+	},
+	"2": {
+		"ef84ad": "1f6759",
+		"f7a5bd": "379a85",
+		"c5637b": "144844",
+		"ffd6e6": "8dd6ab",
+		"6b6b7b": "72442d",
+		"7b7b8c": "dca878",
+		"5a5a73": "a7724a",
+		"3a4252": "72442d",
+		"a53a42": "0c2625",
+		"a5a5ad": "fbe3a3"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/326.json b/public/images/pokemon/variant/326.json
new file mode 100644
index 00000000000..11e02009a26
--- /dev/null
+++ b/public/images/pokemon/variant/326.json
@@ -0,0 +1,32 @@
+{
+	"1": {
+		"9c9ca5": "7ecdd1",
+		"d684ce": "7bb15b",
+		"636373": "3c6b95",
+		"ef7b94": "e99e76",
+		"f7bdf7": "bbfcf8",
+		"bd63ad": "559b43",
+		"a5425a": "a84331",
+		"f7a5b5": "f7d1a0",
+		"6b426b": "18340c",
+		"ce5a7b": "d06d50",
+		"e6a5de": "b5d780",
+		"4a4a52": "2b4d7d",
+		"7b7b84": "5ca0b5"
+	},
+	"2": {
+		"9c9ca5": "fffade",
+		"d684ce": "67508c",
+		"636373": "e8bc75",
+		"ef7b94": "379a85",
+		"f7bdf7": "b395de",
+		"bd63ad": "574285",
+		"a5425a": "144844",
+		"f7a5b5": "5cba98",
+		"6b426b": "081f19",
+		"ce5a7b": "1f6759",
+		"e6a5de": "7a649c",
+		"4a4a52": "d08f55",
+		"7b7b84": "fbefb3"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/33.json b/public/images/pokemon/variant/33.json
new file mode 100644
index 00000000000..331220de9ef
--- /dev/null
+++ b/public/images/pokemon/variant/33.json
@@ -0,0 +1,32 @@
+{
+    "1": {
+        "101010": "101010",
+        "5a3a63": "944f25",
+        "b51900": "b51900",
+        "de4229": "de4229",
+        "845a52": "42adc1",
+        "009463": "273161",
+        "945ab5": "cf863e",
+        "4acea5": "55729e",
+        "848484": "848484",
+        "ce84de": "e0c151",
+        "e6adef": "ede4ab",
+        "c5c5c5": "c5c5c5",
+        "ffffff": "ffffff"
+    },
+    "2": {
+        "101010": "101010",
+        "5a3a63": "142440",
+        "b51900": "d98943",
+        "de4229": "edc85a",
+        "845a52": "e1b13b",
+        "009463": "b0384a",
+        "945ab5": "253f5e",
+        "4acea5": "ed938e",
+        "848484": "848484",
+        "ce84de": "375c73",
+        "e6adef": "5d91a1",
+        "c5c5c5": "c5c5c5",
+        "ffffff": "ffffff"
+    }
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/331.json b/public/images/pokemon/variant/331.json
new file mode 100644
index 00000000000..abe5e0cfa6d
--- /dev/null
+++ b/public/images/pokemon/variant/331.json
@@ -0,0 +1,30 @@
+{
+	"1": {
+		"4a7310": "9f2a3f",
+		"ffe63a": "7aa1df",
+		"31944a": "b73736",
+		"215200": "69102c",
+		"003a10": "4e29c6",
+		"f7bd19": "448bc3",
+		"63bd6b": "dd6754",
+		"196b31": "891d2c",
+		"94c552": "d76868",
+		"739c3a": "d74f4f",
+		"8c6b3a": "123a5a",
+		"bdde7b": "e67f7f"
+	},
+	"2": {
+		"4a7310": "6d3494",
+		"ffe63a": "eaa5c6",
+		"31944a": "caac82",
+		"215200": "694426",
+		"003a10": "5e223f",
+		"f7bd19": "d979b2",
+		"63bd6b": "e1d39d",
+		"196b31": "946e51",
+		"94c552": "9364a5",
+		"739c3a": "7c558d",
+		"8c6b3a": "983364",
+		"bdde7b": "a772bd"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/332.json b/public/images/pokemon/variant/332.json
new file mode 100644
index 00000000000..e9b487bca25
--- /dev/null
+++ b/public/images/pokemon/variant/332.json
@@ -0,0 +1,34 @@
+{
+	"1": {
+		"319452": "831a1f",
+		"4a7310": "982443",
+		"7ba563": "b44040",
+		"bdef84": "ec8c8c",
+		"8cbd63": "c54b4b",
+		"215200": "710f2e",
+		"a5d674": "e16363",
+		"196b21": "891222",
+		"f7ce00": "7aa1df",
+		"525252": "123a5a",
+		"63b56b": "b2332f",
+		"a5d673": "df5252",
+		"8c6b3a": "448bc3",
+		"4aa552": "9f2f2c"
+	},
+	"2": {
+		"319452": "b08d72",
+		"4a7310": "4f3956",
+		"7ba563": "704e7e",
+		"bdef84": "a779ba",
+		"8cbd63": "e3d7a6",
+		"215200": "583823",
+		"a5d674": "8c669b",
+		"196b21": "78582c",
+		"f7ce00": "f2aacd",
+		"525252": "a53b6f",
+		"63b56b": "cfc191",
+		"a5d673": "d7cda7",
+		"8c6b3a": "df87bb",
+		"4aa552": "c5a77f"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/34.json b/public/images/pokemon/variant/34.json
new file mode 100644
index 00000000000..748658a6a90
--- /dev/null
+++ b/public/images/pokemon/variant/34.json
@@ -0,0 +1,44 @@
+{
+    "1": {
+        "101010": "101010",
+        "5a296b": "7a411d",
+        "004a63": "273161",
+        "73735a": "3b447a",
+        "73735b": "73735b",
+        "ad1000": "ad1000",
+        "e64231": "e64231",
+        "297b94": "3b4d7a",
+        "a55294": "cf863e",
+        "d673ef": "e0c151",
+        "4294c5": "55729e",
+        "c5c5a5": "6272a8",
+        "c4c4a7": "c4c4a7",
+        "c7c7a9": "c7c7a9",
+        "de94f7": "ede4ab",
+        "e6e6d6": "7687ab",
+        "fafafa": "8fa2c2",
+        "fcfcfc": "fcfcfc",
+        "ffffff": "ffffff"
+    },
+    "2": {
+        "101010": "101010",
+        "5a296b": "142440",
+        "004a63": "b0384a",
+        "73735a": "85204a",
+        "73735b": "a37355",
+        "ad1000": "d98943",
+        "e64231": "edc85a",
+        "297b94": "d65e64",
+        "a55294": "253f5e",
+        "d673ef": "375c73",
+        "4294c5": "ed938e",
+        "c5c5a5": "c43d63",
+        "c4c4a7": "e0b990",
+        "c7c7a9": "c7c7a9",
+        "de94f7": "5d91a1",
+        "e6e6d6": "d15271",
+        "fafafa": "de6476",
+        "fcfcfc": "ede1b4",
+        "ffffff": "ffffff"
+    }
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/345.json b/public/images/pokemon/variant/345.json
new file mode 100644
index 00000000000..dc23adbef64
--- /dev/null
+++ b/public/images/pokemon/variant/345.json
@@ -0,0 +1,28 @@
+{
+	"1": {
+		"633a84": "611746",
+		"6b5221": "679e3a",
+		"efd663": "fcf3a2",
+		"9c84ce": "bd3167",
+		"b5ade6": "ff5289",
+		"d6a531": "d8e374",
+		"efadb5": "b9f0ff",
+		"bd5284": "6084bd",
+		"ce7394": "84aedb",
+		"843a5a": "394287",
+		"7363b5": "801f4c"
+	},
+	"2": {
+		"633a84": "b57c2d",
+		"6b5221": "661634",
+		"efd663": "de463e",
+		"9c84ce": "f5df73",
+		"b5ade6": "fff8a3",
+		"d6a531": "942532",
+		"efadb5": "beed9a",
+		"bd5284": "429949",
+		"ce7394": "7fcc68",
+		"843a5a": "296e47",
+		"7363b5": "dbb34d"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/346.json b/public/images/pokemon/variant/346.json
new file mode 100644
index 00000000000..090feeab922
--- /dev/null
+++ b/public/images/pokemon/variant/346.json
@@ -0,0 +1,32 @@
+{
+	"1": {
+		"ffd6ef": "deffea",
+		"3a6b52": "7f183f",
+		"a57b10": "5e8c29",
+		"a5e68c": "f38460",
+		"944263": "304459",
+		"ce6394": "526f84",
+		"f7d642": "d8e374",
+		"7bc573": "eb564b",
+		"ff9cad": "d2faef",
+		"fff77b": "fcf3a2",
+		"529c5a": "b32843",
+		"cea531": "a7c961",
+		"ef6b8c": "93c6c5"
+	},
+	"2": {
+		"ffd6ef": "a3ffc3",
+		"3a6b52": "96483b",
+		"a57b10": "661634",
+		"a5e68c": "ffe6b5",
+		"944263": "17404a",
+		"ce6394": "32806f",
+		"f7d642": "de463e",
+		"7bc573": "efbd8c",
+		"ff9cad": "7be3b6",
+		"fff77b": "ff754f",
+		"529c5a": "bf815c",
+		"cea531": "942532",
+		"ef6b8c": "53b491"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/396.json b/public/images/pokemon/variant/396.json
new file mode 100644
index 00000000000..1881572247b
--- /dev/null
+++ b/public/images/pokemon/variant/396.json
@@ -0,0 +1,44 @@
+{
+	"1": {
+		"000000": "101010",
+		"3a2129": "07332d",
+		"3f1e27": "b06421",
+		"4a4343": "751e23",
+		"4f4747": "dbb070",
+		"524a4a": "156146",
+		"736363": "28854d",
+		"756565": "144a40",
+		"ff0000": "90cc58",
+		"9c4a21": "db963b",
+		"d67300": "edb651",
+		"8c7373": "bd453c",
+		"ff9429": "ffcf5e",
+		"ad9c9c": "ed7f4c",
+		"b3b3b3": "b3b3b3",
+		"b5b5b5": "d1a562",
+		"d6dede": "e3d09d",
+		"fcfcfc": "f0ebc5",
+		"ffffff": "ffffff"
+	},
+	"2": {
+		"000000": "101010",
+		"3a2129": "111a36",
+		"3f1e27": "451915",
+		"4a4343": "163d4d",
+		"4f4747": "e5c595",
+		"524a4a": "1b2745",
+		"736363": "2f436b",
+		"756565": "e6a647",
+		"ff0000": "c4568a",
+		"9c4a21": "52281f",
+		"d67300": "63362b",
+		"8c7373": "307b82",
+		"ff9429": "8c604c",
+		"ad9c9c": "4da8a1",
+		"b3b3b3": "b3b3b3",
+		"b5b5b5": "debd8c",
+		"d6dede": "f0deaa",
+		"fcfcfc": "fcfad2",
+		"ffffff": "ffffff"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/397.json b/public/images/pokemon/variant/397.json
new file mode 100644
index 00000000000..e5fa30f65bd
--- /dev/null
+++ b/public/images/pokemon/variant/397.json
@@ -0,0 +1,38 @@
+{
+	"1": {
+		"9c4242": "528a3e",
+		"362d36": "0d4539",
+		"f75242": "8bba65",
+		"735a63": "bd453c",
+		"bd6300": "db963b",
+		"362c36": "8f431d",
+		"595759": "256e54",
+		"b5b5b5": "d9c798",
+		"523a4a": "751e23",
+		"5a525a": "28854d",
+		"7b4221": "b06421",
+		"9c848c": "ed7f4c",
+		"3d343d": "144a40",
+		"ff9429": "ffcf5e",
+		"3a3a3a": "156146",
+		"f9f9f9": "f0ebc5"
+	},
+	"2": {
+		"9c4242": "c4568a",
+		"362d36": "162040",
+		"f75242": "f797ad",
+		"735a63": "307b82",
+		"bd6300": "63362b",
+		"362c36": "421917",
+		"595759": "edcf87",
+		"b5b5b5": "debd8c",
+		"523a4a": "163d4d",
+		"5a525a": "2f436b",
+		"7b4221": "52281f",
+		"9c848c": "4da8a1",
+		"3d343d": "e6a647",
+		"ff9429": "8c604c",
+		"3a3a3a": "152039",
+		"f9f9f9": "fcfad2"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/398.json b/public/images/pokemon/variant/398.json
new file mode 100644
index 00000000000..387cddba886
--- /dev/null
+++ b/public/images/pokemon/variant/398.json
@@ -0,0 +1,36 @@
+{
+	"1": {
+		"735a63": "bd453c",
+		"5c545c": "144a40",
+		"5a525a": "156146",
+		"7b6b7b": "28854d",
+		"f75242": "90cc58",
+		"4f3847": "ab5022",
+		"b5b5b5": "d7be89",
+		"9c4242": "5fad3b",
+		"7b4221": "b06421",
+		"fcfcfc": "e8e3b6",
+		"3a3a3a": "07332d",
+		"bd6300": "db963b",
+		"523a4a": "751e23",
+		"9c848c": "ed7f4c",
+		"ff9429": "ffcf5e"
+	},
+	"2": {
+		"735a63": "307b82",
+		"5c545c": "e6a647",
+		"5a525a": "1b2745",
+		"7b6b7b": "293854",
+		"f75242": "e6bd4e",
+		"4f3847": "421917",
+		"b5b5b5": "debd8c",
+		"9c4242": "c4833d",
+		"7b4221": "52281f",
+		"fcfcfc": "fcfad2",
+		"3a3a3a": "080d1f",
+		"bd6300": "63362b",
+		"523a4a": "163d4d",
+		"9c848c": "4da8a1",
+		"ff9429": "8c604c"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/403.json b/public/images/pokemon/variant/403.json
new file mode 100644
index 00000000000..fac493a40e4
--- /dev/null
+++ b/public/images/pokemon/variant/403.json
@@ -0,0 +1,26 @@
+{
+	"1": {
+		"b59c5a": "45babf",
+		"7badf7": "bb5c3a",
+		"943a52": "472614",
+		"637bb5": "903325",
+		"4a4a63": "dcb788",
+		"ffe65a": "59dcd6",
+		"313142": "bf8652",
+		"e64a52": "4f3217",
+		"42426b": "671919",
+		"736352": "267789"
+	},
+	"2": {
+		"b59c5a": "9a31be",
+		"7badf7": "303465",
+		"943a52": "614b9a",
+		"637bb5": "222352",
+		"4a4a63": "bbc2e5",
+		"ffe65a": "e25ce8",
+		"313142": "8883d4",
+		"e64a52": "6f5dac",
+		"42426b": "121031",
+		"736352": "611c7f"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/404.json b/public/images/pokemon/variant/404.json
new file mode 100644
index 00000000000..b6621d02406
--- /dev/null
+++ b/public/images/pokemon/variant/404.json
@@ -0,0 +1,28 @@
+{
+	"1": {
+		"736352": "267789",
+		"4a4a73": "671919",
+		"63637b": "f1dfb1",
+		"b59c5a": "45babf",
+		"637bb5": "903325",
+		"4a4a63": "dcb788",
+		"ffe65a": "59dcd6",
+		"313142": "bf8652",
+		"943a52": "472614",
+		"e64a52": "4f3217",
+		"7badf7": "bb5c3a"
+	},
+	"2": {
+		"736352": "611c7f",
+		"4a4a73": "121031",
+		"63637b": "dee4f4",
+		"b59c5a": "9a31be",
+		"637bb5": "222352",
+		"4a4a63": "bbc2e5",
+		"ffe65a": "e25ce8",
+		"313142": "8883d4",
+		"943a52": "614b9a",
+		"e64a52": "6f5dac",
+		"7badf7": "303465"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/405.json b/public/images/pokemon/variant/405.json
new file mode 100644
index 00000000000..1f6a0590bb8
--- /dev/null
+++ b/public/images/pokemon/variant/405.json
@@ -0,0 +1,28 @@
+{
+	"1": {
+		"b59c5a": "45babf",
+		"7badf7": "bb5c3a",
+		"63637b": "f1dfb1",
+		"637bb5": "903325",
+		"943a52": "472614",
+		"4a4a63": "dcb788",
+		"ffe65a": "59dcd6",
+		"313142": "bf8652",
+		"4a4a73": "671919",
+		"e64a52": "4f3217",
+		"736352": "267789"
+	},
+	"2": {
+		"b59c5a": "9a31be",
+		"7badf7": "303465",
+		"63637b": "dee4f4",
+		"637bb5": "222352",
+		"943a52": "614b9a",
+		"4a4a63": "bbc2e5",
+		"ffe65a": "e25ce8",
+		"313142": "8883d4",
+		"4a4a73": "121031",
+		"e64a52": "6f5dac",
+		"736352": "611c7f"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/417.json b/public/images/pokemon/variant/417.json
new file mode 100644
index 00000000000..27f45e74557
--- /dev/null
+++ b/public/images/pokemon/variant/417.json
@@ -0,0 +1,36 @@
+{
+    "1": {
+        "101010": "101010",
+        "3e364e": "734430",
+        "524941": "732e12",
+        "5a524a": "642f1a",
+        "4a425a": "5f2618",
+        "84523a": "9b314f",
+        "ef845a": "e26e6e",
+        "c5a563": "e95d6c",
+        "ffd663": "f17c7c",
+        "637b9c": "86452b",
+        "7bb5e6": "a25f37",
+        "cec5c5": "e8be64",
+        "f7f7f7": "faeda9",
+        "ffffff": "ffffff",
+        "7b7b84": "8e623c"
+    },
+    "2": {
+        "101010": "101010",
+        "3e364e": "203243",
+        "524941": "2d284c",
+        "5a524a": "0f203a",
+        "4a425a": "23704c",
+        "84523a": "693939",
+        "ef845a": "e1b8ac",
+        "c5a563": "5ae7f6",
+        "ffd663": "8ffaff",
+        "637b9c": "a2dc76",
+        "7bb5e6": "e4fba1",
+        "cec5c5": "357577",
+        "f7f7f7": "5ba297",
+        "ffffff": "ffffff",
+        "7b7b84": "1f3f4e"
+    }
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/420.json b/public/images/pokemon/variant/420.json
new file mode 100644
index 00000000000..6910d49d9d2
--- /dev/null
+++ b/public/images/pokemon/variant/420.json
@@ -0,0 +1,32 @@
+{
+   "1": {
+      "101010": "101010",
+      "423131": "103d47",
+      "6b3a4a": "09303b",
+      "314252": "8f3833",
+      "3a734a": "ab554b",
+      "843152": "185158",
+      "ad426b": "368a7f",
+      "429442": "d98b77",
+      "52a54a": "f7bfa8",
+      "73ce5a": "fcdbc7",
+      "de6384": "51b095",
+      "ff8cad": "73d9ae",
+      "ffffff": "ffffff"
+   },
+   "2": {
+      "101010": "101010",
+      "423131": "390f26",
+      "6b3a4a": "29091b",
+      "314252": "752a4a",
+      "3a734a": "9c4861",
+      "843152": "3b0d21",
+      "ad426b": "571539",
+      "429442": "a86a79",
+      "52a54a": "c29597",
+      "73ce5a": "dec3c3",
+      "de6384": "752648",
+      "ff8cad": "ad5168",
+      "ffffff": "ffffff"
+   }
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/421-overcast.json b/public/images/pokemon/variant/421-overcast.json
new file mode 100644
index 00000000000..77c5c18415d
--- /dev/null
+++ b/public/images/pokemon/variant/421-overcast.json
@@ -0,0 +1,34 @@
+{
+    "1": {
+        "101010": "101010",
+        "105221": "ab554b",
+        "4a2942": "5e1228",
+        "7b294a": "103d47",
+        "7a2a4a": "236e6a",
+        "427b4a": "d98b77",
+        "6b427b": "962a3e",
+        "a53a63": "368a7f",
+        "ce527b": "51b095",
+        "52ad5a": "f7bfa8",
+        "5ac55a": "fcdbc7",
+        "845aad": "c75058",
+        "9c7bbd": "db7f7f",
+        "de7394": "73d9ae"
+    },
+    "2": {
+        "101010": "101010",
+        "105221": "995969",
+        "4a2942": "521d44",
+        "7b294a": "390f26",
+        "7a2a4a": "571539",
+        "427b4a": "ba8087",
+        "6b427b": "8f4270",
+        "a53a63": "611c3b",
+        "ce527b": "752648",
+        "52ad5a": "cf9d9d",
+        "5ac55a": "e3cbca",
+        "845aad": "a86886",
+        "9c7bbd": "d197ac",
+        "de7394": "ad5168"
+    }
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/421-sunshine.json b/public/images/pokemon/variant/421-sunshine.json
new file mode 100644
index 00000000000..096641576c9
--- /dev/null
+++ b/public/images/pokemon/variant/421-sunshine.json
@@ -0,0 +1,40 @@
+{
+    "1": {
+        "101010": "101010",
+        "006310": "e6d590",
+        "941e3f": "103d47",
+        "9c6b10": "c4655a",
+        "941f40": "5c1547",
+        "942142": "591230",
+        "ce3a6b": "751a38",
+        "cf3c6d": "872e5c",
+        "cf3e6e": "368a7f",
+        "19943a": "f0f0bd",
+        "d6b55a": "db8e7d",
+        "f7de73": "f7bfa8",
+        "e66394": "51b095",
+        "de84ad": "962a3e",
+        "ffa5c5": "c75058",
+        "ffe6f7": "d0fdf0",
+        "ffffff": "ffffff"
+    },
+    "2": {
+        "101010": "101010",
+        "006310": "72559e",
+        "941e3f": "390f26",
+        "9c6b10": "4a2942",
+        "941f40": "3a234a",
+        "942142": "804058",
+        "ce3a6b": "995969",
+        "cf3c6d": "563666",
+        "cf3e6e": "571539",
+        "19943a": "9574b3",
+        "d6b55a": "914972",
+        "f7de73": "b35f86",
+        "e66394": "752648",
+        "de84ad": "cf9d9d",
+        "ffa5c5": "e3cbca",
+        "ffe6f7": "d26393",
+        "ffffff": "ffffff"
+    }
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/446.json b/public/images/pokemon/variant/446.json
new file mode 100644
index 00000000000..60d20fba25a
--- /dev/null
+++ b/public/images/pokemon/variant/446.json
@@ -0,0 +1,38 @@
+{
+    "1": {
+        "000000": "101010",
+        "104242": "4d0f3f",
+        "215a73": "701a55",
+        "317b9c": "943469",
+        "3194b5": "ad4b70",  
+        "524a10": "91504e",
+        "73737b": "756363",
+        "7b5a31": "522663",
+        "948442": "351b52",
+        "9c3a42": "714084",
+        "b5b563": "de9494",
+        "cccfce": "cbc4c4",
+        "cecece": "cecece",
+        "de9494": "a270b5",
+        "efe684": "f0beb1",
+        "ffffff": "ffffff"
+    },
+    "2": {
+        "000000": "101010",
+        "104242": "6398b7",
+        "215a73": "a3cacd",
+        "317b9c": "cbe4e2",
+        "3194b5": "edf5f4",  
+        "524a10": "233f69",
+        "73737b": "525266",
+        "7b5a31": "e6cda1",
+        "948442": "c2986e",
+        "9c3a42": "487d43",
+        "b5b563": "38638f",
+        "cccfce": "bfc7cb",
+        "cecece": "cecece",
+        "de9494": "9cb780",
+        "efe684": "4781a8",
+        "ffffff": "ffffff"
+    }
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/472.json b/public/images/pokemon/variant/472.json
index 937ea1334de..9e19b9f2353 100644
--- a/public/images/pokemon/variant/472.json
+++ b/public/images/pokemon/variant/472.json
@@ -1,33 +1,34 @@
 {
 	"1": {
-		"5a63a5": "974d16",
-		"de3a6b": "4c83a9",
-		"293163": "5c2a09",
-		"424252": "2a2752",
-		"ffde00": "84b8ff",
-		"b5a5ff": "e9bb57",
-		"6b6b7b": "48487a",
-		"737bc5": "b86f27",
-		"730800": "143262",
-		"9c8cef": "d28b36",
-		"ad2131": "2a6197",
-		"c55294": "5270c5",
 		"ad9400": "4b64ff",
-		"2a2a2a": "130e27"
+		"c55294": "5270c5",
+		"9c8cef": "d28b36",
+		"424252": "2a2752",
+		"de3a6b": "4c83a9",
+		"2a2a2a": "130e27",
+		"6b6b7b": "48487a",
+		"b5a5ff": "e9bb57",
+		"ffde00": "84b8ff",
+		"ad2131": "2a6197",
+		"737bc5": "b86f27",
+		"5a63a5": "974d16",
+		"293163": "5c2a09",
+		"730800": "143262"
 	},
 	"2": {
-		"5a63a5": "731e37",
-		"de3a6b": "594b6a",
-		"293163": "43050d",
-		"424252": "57b6a6",
-		"ffde00": "6bffd4",
-		"b5a5ff": "eb6a64",
-		"6b6b7b": "81e4c2",
-		"737bc5": "952b41",
-		"730800": "262138",
-		"9c8cef": "b3404a",
-		"ad2131": "453b57",
 		"ad9400": "16a9c0",
-		"2a2a2a": "103f47"
+		"c55294": "e38b3d",
+		"9c8cef": "b3404a",
+		"424252": "57b6a6",
+		"de3a6b": "594b6a",
+		"2a2a2a": "103f47",
+		"6b6b7b": "81e4c2",
+		"b5a5ff": "eb6a64",
+		"ffde00": "6bffd4",
+		"ad2131": "453b57",
+		"737bc5": "952b41",
+		"5a63a5": "731e37",
+		"293163": "43050d",
+		"730800": "262138"
 	}
 }
\ No newline at end of file
diff --git a/public/images/pokemon/variant/476.json b/public/images/pokemon/variant/476.json
new file mode 100644
index 00000000000..5f54f51d1f9
--- /dev/null
+++ b/public/images/pokemon/variant/476.json
@@ -0,0 +1,36 @@
+{
+    "1": {
+        "101010": "101010",
+        "5a2921": "0e291d",
+        "7b3129": "1e3f30",
+        "293a4a": "352310",
+        "3a4a5a": "59452f",
+        "bd3152": "30594a",
+        "e65a63": "578b6b",
+        "194a84": "62230e",
+        "3a63ad": "9d3a18",
+        "5a7bce": "c76227",
+        "ef7b8c": "77b472",
+        "739ce6": "de7f36",
+        "84adf7": "e68c43",
+        "c5cede": "c5cede",
+        "ffffff": "ffffff"
+    },
+    "2": {
+        "101010": "101010",
+        "5a2921": "21132c",
+        "7b3129": "301b3f",
+        "293a4a": "111b28",
+        "3a4a5a": "253142",
+        "bd3152": "482a5e",
+        "e65a63": "6a5394",
+        "194a84": "30578e",
+        "3a63ad": "5b97c1",
+        "5a7bce": "92dee8",
+        "ef7b8c": "747fc4",
+        "739ce6": "dbfff4",
+        "84adf7": "c2efe5",
+        "c5cede": "c5cede",
+        "ffffff": "ffffff"
+    }
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/498.json b/public/images/pokemon/variant/498.json
new file mode 100644
index 00000000000..b23a3afec63
--- /dev/null
+++ b/public/images/pokemon/variant/498.json
@@ -0,0 +1,44 @@
+{
+    "1": {
+        "101010": "101010",
+        "2e1e1e": "b1a385",
+        "2e1f1f": "d1c5ab",
+        "302020": "11241c",
+        "312121": "1e2a4d",
+        "47382f": "472770",
+        "473830": "f7f5e9",
+        "4a3a31": "2d405c",
+        "7a3827": "1c2e1b",
+        "7b3a29": "194737",
+        "947310": "cc955e",
+        "bd6331": "3b805f",
+        "ce423a": "3e4f37",
+        "a54a42": "2d452b",
+        "e66b29": "b5cca5",
+        "efbd08": "f0cc8b",
+        "ef843a": "65b57c",
+        "c5ada5": "c1c5a5",
+        "ffffff": "ffffff"
+    },
+    "2": {
+        "101010": "101010",
+        "2e1e1e": "ac8b61",
+        "2e1f1f": "c4a884",
+        "302020": "111424",
+        "312121": "47150e",
+        "47382f": "456da8",
+        "473830": "e0d3ab",
+        "4a3a31": "733421",
+        "7a3827": "222742",
+        "7b3a29": "522e2e",
+        "947310": "828399",
+        "bd6331": "85564e",
+        "ce423a": "323754",
+        "a54a42": "4c5275",
+        "e66b29": "778aa6",
+        "efbd08": "c7c8d9",
+        "ef843a": "ab8274",
+        "c5ada5": "dddef0",
+        "ffffff": "ffffff"
+    }
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/499.json b/public/images/pokemon/variant/499.json
new file mode 100644
index 00000000000..ad525f3e114
--- /dev/null
+++ b/public/images/pokemon/variant/499.json
@@ -0,0 +1,40 @@
+{
+    "1": {
+        "101010": "101010",
+        "3a2121": "1e2a4d",
+        "3a3a3a": "122b18",
+        "523129": "2d405c",
+        "7a3827": "1c2e1b",
+        "7b3a29": "234f3d",
+        "736310": "ab6441",
+        "4a4a4a": "264524",
+        "bd5a31": "41785a",
+        "ce423a": "3e4f37",
+        "ef7329": "62a174",
+        "b59421": "cc955e",
+        "efc53a": "f0cc8b",
+        "c5ada5": "c5ada5",
+        "c4aea7": "c4aea7",
+        "fcfcfc": "fcfcfc",
+        "ffffff": "ffffff"
+    },
+    "2": {
+        "101010": "101010",
+        "3a2121": "47150e",
+        "3a3a3a": "1c2245",
+        "523129": "733421",
+        "7a3827": "222742",
+        "7b3a29": "533330",
+        "736310": "3c3e5b",
+        "4a4a4a": "272d4f",
+        "bd5a31": "7a5a56",
+        "ce423a": "323754",
+        "ef7329": "967a71",
+        "b59421": "828399",
+        "efc53a": "c7c8d9",
+        "c5ada5": "c4a884",
+        "c4aea7": "c4aea7",
+        "fcfcfc": "e0d3ab",
+        "ffffff": "ffffff"
+    }
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/500.json b/public/images/pokemon/variant/500.json
new file mode 100644
index 00000000000..028639cf6bb
--- /dev/null
+++ b/public/images/pokemon/variant/500.json
@@ -0,0 +1,56 @@
+{
+    "1": {
+        "101010": "101010",
+        "1f1f1f": "0e1a10",
+        "212121": "1e2a4d",
+        "313131": "2d405c",
+        "333333": "2c2f35",
+        "741910": "472770",
+        "7a1910": "1c2e1b",
+        "7b1910": "257036",
+        "7a1a11": "445e3f",
+        "732900": "2c473e",
+        "7b5a08": "ab6441",
+        "a53a31": "3e4f37",
+        "e62a29": "1d1151",
+        "e63127": "58db58",
+        "e63129": "627556",
+        "bd5221": "3e6952",
+        "ef6321": "699676",
+        "b58c21": "cc955e",
+        "ef8c08": "86e677",
+        "efbd08": "f0cc8b",
+        "f0be0a": "c7f797",
+        "adadad": "a3a6ad",
+        "b0b0b0": "b0b0b0",
+        "f7f7f7": "e4eef5",
+        "fafafa": "fafafa"
+    },
+    "2": {
+        "101010": "101010",
+        "1f1f1f": "0f162a",
+        "212121": "47150e",
+        "313131": "733421",
+        "333333": "3b352b",
+        "741910": "456da8",
+        "7a1910": "20243d",
+        "7b1910": "ba843d",
+        "7a1a11": "3c3f59",
+        "732900": "522e2e",
+        "7b5a08": "3c3e5b",
+        "a53a31": "2d3250",
+        "e62a29": "1d3f70",
+        "e63127": "e6ca65",
+        "e63129": "464a66",
+        "bd5221": "7a5a56",
+        "ef6321": "967a71",
+        "b58c21": "828399",
+        "ef8c08": "f2d591",
+        "efbd08": "c7c8d9",
+        "f0be0a": "faefc7",
+        "adadad": "c4a884",
+        "b0b0b0": "b0b0b0",
+        "f7f7f7": "e0d3ab",
+        "fafafa": "fafafa"
+    }
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/511.json b/public/images/pokemon/variant/511.json
new file mode 100644
index 00000000000..5e278b5e0fc
--- /dev/null
+++ b/public/images/pokemon/variant/511.json
@@ -0,0 +1,26 @@
+{
+	"1": {
+		"ffce7b": "edc293",
+		"f79cad": "f77e94",
+		"b5637b": "a3415f",
+		"84ce9c": "e6c545",
+		"194a29": "912f1c",
+		"087331": "c45331",
+		"087030": "8c5915",
+		"cea55a": "d9a177",
+		"735221": "bd7653",
+		"19a552": "d97b41"
+	},
+	"2": {
+		"ffce7b": "8ecaed",
+		"f79cad": "f788cb",
+		"b5637b": "b5539d",
+		"84ce9c": "ffa8dc",
+		"194a29": "4c2d7a",
+		"087331": "683b8c",
+		"087030": "d16fb9",
+		"cea55a": "73acde",
+		"735221": "3f6aa6",
+		"19a552": "8a53a6"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/512.json b/public/images/pokemon/variant/512.json
new file mode 100644
index 00000000000..903ff3906bb
--- /dev/null
+++ b/public/images/pokemon/variant/512.json
@@ -0,0 +1,32 @@
+{
+	"1": {
+		"a57b3a": "a65b3d",
+		"4f4f4f": "a36e46",
+		"087331": "c74638",
+		"194a29": "a12d25",
+		"c5c5c5": "dbc086",
+		"735221": "733224",
+		"ffce7b": "eab68b",
+		"84ce9c": "ebb54b",
+		"fcfcfc": "ebe0ab",
+		"cea55a": "c8895f",
+		"087030": "9e6426",
+		"9c9c9c": "cfa067",
+		"19a552": "ed6f53"
+	},
+	"2": {
+		"a57b3a": "3762bf",
+		"4f4f4f": "3073ab",
+		"087331": "522880",
+		"194a29": "331961",
+		"c5c5c5": "5bc6de",
+		"735221": "2a42a1",
+		"ffce7b": "58aee0",
+		"84ce9c": "ffa8dc",
+		"fcfcfc": "79f7f3",
+		"cea55a": "4686cf",
+		"087030": "d16fb9",
+		"9c9c9c": "4099c2",
+		"19a552": "6e368f"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/513.json b/public/images/pokemon/variant/513.json
new file mode 100644
index 00000000000..9a19fbc4977
--- /dev/null
+++ b/public/images/pokemon/variant/513.json
@@ -0,0 +1,26 @@
+{
+	"1": {
+		"ffce7b": "ffe6c9",
+		"bd423a": "28629c",
+		"e65242": "3d9bbe",
+		"7b3131": "1b3e70",
+		"a57b3a": "e4907f",
+		"cea55a": "f9b9a2",
+		"bd453c": "67bdc7",
+		"735221": "c3635b",
+		"f79442": "a6f5e9"
+	},
+	"2": {
+		"ffce7b": "ed8c7b",
+		"bd423a": "d5b393",
+		"e65242": "f4ecd7",
+		"7b3131": "ad7a63",
+		"a57b3a": "bc2f2f",
+		"525252": "22607d",
+		"cea55a": "d4554c",
+		"bd453c": "e7613c",
+		"848484": "368d9e",
+		"735221": "a1272f",
+		"f79442": "fe934f"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/514.json b/public/images/pokemon/variant/514.json
new file mode 100644
index 00000000000..c42a3878cc1
--- /dev/null
+++ b/public/images/pokemon/variant/514.json
@@ -0,0 +1,37 @@
+{
+	"1": {
+		"999999": "6f94c7",
+		"bd423a": "265494",
+		"e65242": "3a7bb5",
+		"7a3131": "386f94",
+		"3b3b3b": "465f9e",
+		"c5c5c5": "97c0e6",
+		"611b2d": "193170",
+		"ffce7b": "ffe2bf",
+		"f79442": "76e2e8",
+		"fcfcfc": "c0e7fc",
+		"a57b3a": "d99479",
+		"cea55a": "edba9a",
+		"bd4139": "509cbf",
+		"73572d": "ba6a57"
+	},
+	"2": {
+		"999999": "cc762b",
+		"bd423a": "cfb88f",
+		"e65242": "ede9d1",
+		"7a3131": "cc592b",
+		"3b3b3b": "ad4d1d",
+		"c5c5c5": "e3a13d",
+		"611b2d": "a88260",
+		"c7c7c7": "54abb3",
+		"ffce7b": "cc643b",
+		"525252": "22607d",
+		"f79442": "f7ab4d",
+		"fcfcfc": "f7cc57",
+		"a57b3a": "782017",
+		"cea55a": "943722",
+		"bd4139": "e07a3a",
+		"9c9c9c": "368d9e",
+		"73572d": "5c0e0e"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/515.json b/public/images/pokemon/variant/515.json
new file mode 100644
index 00000000000..66d23ed94da
--- /dev/null
+++ b/public/images/pokemon/variant/515.json
@@ -0,0 +1,28 @@
+{
+	"1": {
+		"ffce7b": "fff187",
+		"9ce6ef": "add687",
+		"188bab": "42753d",
+		"a57b3a": "b5893c",
+		"9de8f2": "86e387",
+		"21739c": "136b3b",
+		"198cad": "219448",
+		"29b5de": "34c15e",
+		"cea55a": "e0c265",
+		"735221": "735f21",
+		"003a73": "0a4a2d"
+	},
+	"2": {
+		"ffce7b": "e76092",
+		"9ce6ef": "afc3fe",
+		"188bab": "8490e3",
+		"a57b3a": "b32e77",
+		"9de8f2": "f2bbd7",
+		"21739c": "cc70a4",
+		"198cad": "eb98bf",
+		"29b5de": "ffc9dd",
+		"cea55a": "cc4580",
+		"735221": "8f1f68",
+		"003a73": "a64e8b"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/516.json b/public/images/pokemon/variant/516.json
new file mode 100644
index 00000000000..c7c8ce95eb9
--- /dev/null
+++ b/public/images/pokemon/variant/516.json
@@ -0,0 +1,30 @@
+{
+	"1": {
+		"a57b3a": "9c7935",
+		"106b8c": "08420d",
+		"003a73": "13571a",
+		"c5c5c5": "aecf86",
+		"735221": "7b5e29",
+		"ffce7b": "fadd73",
+		"9ce6ef": "cade6f",
+		"fcfcfc": "edf7c3",
+		"2290a8": "568c30",
+		"218ca5": "3c8c22",
+		"29b5de": "6fad37",
+		"cea55a": "c4a148"
+	},
+	"2": {
+		"a57b3a": "b32e77",
+		"106b8c": "cc70a4",
+		"003a73": "a64e8b",
+		"c5c5c5": "59b7d4",
+		"735221": "8f1f68",
+		"ffce7b": "e76092",
+		"9ce6ef": "afc3fe",
+		"fcfcfc": "7cfcf7",
+		"2290a8": "8490e3",
+		"218ca5": "eb98bf",
+		"29b5de": "ffc9dd",
+		"cea55a": "cc4580"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/522.json b/public/images/pokemon/variant/522.json
new file mode 100644
index 00000000000..ed387dd09bb
--- /dev/null
+++ b/public/images/pokemon/variant/522.json
@@ -0,0 +1,34 @@
+{
+	"1": {
+		"7b7b7b": "505a9b",
+		"525252": "95355d",
+		"cecece": "788bcb",
+		"ffe600": "61e4bf",
+		"a5a5a5": "7e98dc",
+		"005a9c": "75c239",
+		"505050": "3d4488",
+		"ffffff": "b9cfef",
+		"191f1f": "2e0d1f",
+		"3a3a3a": "731f51",
+		"00adde": "b9e96c",
+		"8c7321": "33a08a",
+		"292929": "53173b",
+		"192121": "43172f"
+	},
+	"2": {
+		"7b7b7b": "731515",
+		"525252": "ebc37d",
+		"cecece": "97221a",
+		"ffe600": "36c294",
+		"a5a5a5": "d37047",
+		"005a9c": "30309d",
+		"505050": "4e1416",
+		"ffffff": "c23e2e",
+		"191f1f": "370b0b",
+		"3a3a3a": "d3874e",
+		"00adde": "3e4ddc",
+		"8c7321": "288278",
+		"292929": "914824",
+		"192121": "661212"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/523.json b/public/images/pokemon/variant/523.json
new file mode 100644
index 00000000000..daf0e7ec6d6
--- /dev/null
+++ b/public/images/pokemon/variant/523.json
@@ -0,0 +1,42 @@
+{
+	"1": {
+		"777777": "47548f",
+		"363d3d": "353573",
+		"005a9c": "75c239",
+		"ffffff": "b9cfef",
+		"171f1f": "430f30",
+		"797979": "7080c6",
+		"8c7321": "33a08a",
+		"293131": "6a1d44",
+		"5b5b5b": "3d467d",
+		"8a711e": "33a08a",
+		"3a4242": "84294f",
+		"353535": "43172f",
+		"ffe600": "61e4bf",
+		"3a3a3a": "5d213a",
+		"00adde": "b9e96c",
+		"cecece": "7e91d3",
+		"a5a5a5": "5265a4",
+		"192121": "57163d"
+	},
+	"2": {
+		"777777": "731515",
+		"363d3d": "4e1416",
+		"005a9c": "30309d",
+		"ffffff": "c23e2e",
+		"171f1f": "661212",
+		"797979": "da7248",
+		"8c7321": "288278",
+		"293131": "c89161",
+		"5b5b5b": "641818",
+		"8a711e": "85cd99",
+		"3a4242": "ebc37d",
+		"353535": "501a19",
+		"ffe600": "36c294",
+		"3a3a3a": "682321",
+		"00adde": "3e4ddc",
+		"cecece": "97221a",
+		"a5a5a5": "861816",
+		"192121": "9e533b"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/535.json b/public/images/pokemon/variant/535.json
new file mode 100644
index 00000000000..bc44b1280dd
--- /dev/null
+++ b/public/images/pokemon/variant/535.json
@@ -0,0 +1,31 @@
+{
+	"1": {
+		"6bbdff": "a9c4d7",
+		"5b5959": "801941",
+		"626262": "615757",
+		"3f3f3f": "3e3838",
+		"385f87": "801941",
+		"292929": "420e2d",
+		"6c8ec1": "b53a57",
+		"62b4f6": "d65a5a",
+		"7394c5": "6f8fb1",
+		"424242": "5e1a39",
+		"3a638c": "40567d"
+	},
+	"2": {
+		"6bbdff": "672a23",
+		"5b5959": "d76d39",
+		"626262": "5a6363",
+		"3f3f3f": "363c3e",
+		"385f87": "ac6634",
+		"292929": "7d2414",
+		"6c8ec1": "cd984a",
+		"945a4a": "52809b",
+		"62b4f6": "f3cd69",
+		"ffdebd": "aadfe0",
+		"7394c5": "54131a",
+		"424242": "ac4423",
+		"c59c84": "7fb8c2",
+		"3a638c": "420f1d"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/536.json b/public/images/pokemon/variant/536.json
new file mode 100644
index 00000000000..40d3ea06a02
--- /dev/null
+++ b/public/images/pokemon/variant/536.json
@@ -0,0 +1,44 @@
+{
+    "1": {
+        "000000": "101010",
+        "292929": "400a32",
+        "10427b": "40567d",
+        "196373": "73163a",
+        "424242": "5e1246",
+        "5a5a5a": "58504b",
+        "615f5f": "906f59",
+        "636363": "801c4e",
+        "945a4a": "945a4a",
+        "296bad": "6f8fb1",
+        "52a5b5": "b53a57",
+        "0894d6": "a9c4d7",
+        "c59c84": "c59c84",
+        "ffdebd": "e3c998",
+        "84e6d6": "d65a5a",
+        "c0c0c0": "c9b38b",
+        "c5c5c5": "c08031",
+        "d1d1d1": "ffffff",
+        "ffffff": "e6b854"
+    },
+    "2": {
+        "000000": "101010",
+        "292929": "7d2414",
+        "10427b": "4a1423",
+        "196373": "ac6634",
+        "424242": "ac4423",
+        "5a5a5a": "114232",
+        "615f5f": "467692",
+        "636363": "d76d39",
+        "945a4a": "44718c",
+        "296bad": "5d171e",
+        "52a5b5": "cd984a",
+        "0894d6": "75332b",
+        "c59c84": "7fb8c2",
+        "ffdebd": "aadfe0",
+        "84e6d6": "f3cd69",
+        "c0c0c0": "6fa6be",
+        "c5c5c5": "378c70",
+        "d1d1d1": "ffffff",
+        "ffffff": "5bb186"
+    }
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/537.json b/public/images/pokemon/variant/537.json
new file mode 100644
index 00000000000..99c9aaf0382
--- /dev/null
+++ b/public/images/pokemon/variant/537.json
@@ -0,0 +1,33 @@
+{
+	"1": {
+		"404040": "631739",
+		"196373": "801941",
+		"10427b": "40567d",
+		"52a58c": "b53a57",
+		"636363": "801c4e",
+		"0894d6": "a9c4d7",
+		"ef5a3a": "e6b854",
+		"296bad": "6f8fb1",
+		"b53a21": "c08031",
+		"73e6ce": "d65a5a",
+		"424242": "5e1246",
+		"363636": "400a32",
+		"292929": "440f2f"
+	},
+	"2": {
+		"404040": "323c39",
+		"196373": "883e24",
+		"10427b": "370b10",
+		"52a58c": "bf8d44",
+		"636363": "d76d39",
+		"0894d6": "75332b",
+		"ef5a3a": "5fc592",
+		"296bad": "561b21",
+		"b53a21": "33866c",
+		"73e6ce": "f9d576",
+		"c5c5c5": "ffffff",
+		"424242": "ac4423",
+		"363636": "611d11",
+		"292929": "7b2a17"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/554.json b/public/images/pokemon/variant/554.json
new file mode 100644
index 00000000000..85cee2b5e73
--- /dev/null
+++ b/public/images/pokemon/variant/554.json
@@ -0,0 +1,36 @@
+{
+    "1": {
+        "101010": "101010",
+        "3a2919": "946344",
+        "571515": "2e3573",
+        "5a1919": "a16012",
+        "634231": "b0895f",
+        "5a5a5a": "5a5a5a",
+        "9c2929": "4e5aa3",
+        "ce3131": "6c7ec4",
+        "947310": "bda373",
+        "ad5a29": "d19628",
+        "cea519": "cfc191",
+        "ffce21": "e3e2ba",
+        "ff9452": "e8c661",
+        "a5a5ad": "a5a5ad",
+        "ffffff": "ffffff"
+    }, 
+    "2": {
+        "101010": "101010",
+        "3a2919": "3a2919",
+        "571515": "bf7558",
+        "5a1919": "291d1b",
+        "634231": "941c32",
+        "5a5a5a": "5a5a5a",
+        "9c2929": "d6a376",
+        "ce3131": "f0e2b9",
+        "947310": "9c1c2b",
+        "ad5a29": "4a3021",
+        "cea519": "ba343d",
+        "ffce21": "d14949",
+        "ff9452": "614b38",
+        "a5a5ad": "a5a5ad",
+        "ffffff": "ffffff"
+    }
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/555-zen.json b/public/images/pokemon/variant/555-zen.json
new file mode 100644
index 00000000000..da85df60fdb
--- /dev/null
+++ b/public/images/pokemon/variant/555-zen.json
@@ -0,0 +1,32 @@
+{
+    "1": {
+        "101010": "101010",
+        "215263": "592226",
+        "3a7b8c": "7d3e3d",
+        "425a63": "b5775b",
+        "4a4a52": "4a4a52",
+        "529cad": "8c5b54",
+        "7b5229": "3b3f87",
+        "7ba5bd": "c99d7b",
+        "9c9ca5": "9c9ca5",
+        "ad6b29": "5e65b5",
+        "b5d6ef": "e0c19b",
+        "e6a563": "7b8dd4",
+        "f7f7f7": "f7f7f7"
+    },
+    "2": {
+        "101010": "101010",
+        "215263": "523273",
+        "3a7b8c": "805a9c",
+        "425a63": "2e2a51",
+        "4a4a52": "4a4a52",
+        "529cad": "a278b0",
+        "7b5229": "9e907e",
+        "7ba5bd": "494162",
+        "9c9ca5": "9c9ca5",
+        "ad6b29": "bab5a6",
+        "b5d6ef": "605375",
+        "e6a563": "f5f3e9",
+        "f7f7f7": "f7f7f7"
+    }
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/555.json b/public/images/pokemon/variant/555.json
new file mode 100644
index 00000000000..97d623f0d7d
--- /dev/null
+++ b/public/images/pokemon/variant/555.json
@@ -0,0 +1,36 @@
+{
+    "1": {
+        "101010": "101010",
+        "4a4a52": "4a4a52",
+        "523a21": "a65f33",
+        "631919": "222675",
+        "6b5a10": "b04a21",
+        "8c1929": "2d3685",
+        "8c8c9c": "8c8c9c",
+        "ad2119": "3a4c94",
+        "b57b4a": "d9a455",
+        "bd0000": "cfc191",
+        "bd9429": "c26932",
+        "ef1010": "e3e2ba",
+        "efa56b": "e8cd7b",
+        "efce10": "d9944a",
+        "f7f7f7": "f7f7f7"
+    },
+    "2": {
+        "101010": "101010",
+        "4a4a52": "4a4a52",
+        "523a21": "291b19",
+        "631919": "a86722",
+        "6b5a10": "941c32",
+        "8c1929": "d6993e",
+        "8c8c9c": "8c8c9c",
+        "ad2119": "e8ca5d",
+        "b57b4a": "4a3021",
+        "bd0000": "bab5a6",
+        "bd9429": "ba343d",
+        "ef1010": "f5f3e9",
+        "efa56b": "614b38",
+        "efce10": "d14949",
+        "f7f7f7": "f7f7f7"
+    }
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/566.json b/public/images/pokemon/variant/566.json
new file mode 100644
index 00000000000..cb2601d4a93
--- /dev/null
+++ b/public/images/pokemon/variant/566.json
@@ -0,0 +1,32 @@
+{
+    "1": {
+        "101010": "101010",
+        "10316b": "1c4943",
+        "31529c": "336d60",
+        "3184f7": "4f9279",
+        "3a3a3a": "3a3a3a",
+        "523131": "641b49",
+        "524229": "2f6934",
+        "944242": "aa3c79",
+        "9c9cad": "9c9cad",
+        "bd9452": "66b562",
+        "de524a": "eb7fae",
+        "e6e6e6": "e6e6e6",
+        "f7ce63": "9be08b"
+    },
+    "2": {
+        "101010": "101010",
+        "10316b": "283957",
+        "31529c": "929bdf",
+        "3184f7": "c4d3ff",
+        "3a3a3a": "3a3a3a",
+        "523131": "284452",
+        "524229": "211f69",
+        "944242": "44988f",
+        "9c9cad": "9c9cad",
+        "bd9452": "3b4bad",
+        "de524a": "65cda4",
+        "e6e6e6": "e6e6e6",
+        "f7ce63": "557ecd"
+    }
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/567.json b/public/images/pokemon/variant/567.json
new file mode 100644
index 00000000000..f4bb6a76111
--- /dev/null
+++ b/public/images/pokemon/variant/567.json
@@ -0,0 +1,37 @@
+{
+    "1": { 
+        "101010": "101010",
+        "523131": "454f52",
+        "635229": "2f6934",
+        "10316b": "1c4943",
+        "086b5a": "b3296b",
+        "9c4a4a": "7b8687",
+        "844252": "844252",
+        "de524a": "abb3b3",
+        "bd9452": "66b562",
+        "f7ce63": "9be08b",
+        "31529c": "336d60",
+        "10a594": "ee609d",
+        "3184f7": "4f9279",
+        "9c9cad": "9c9cad",
+        "ffffff": "ffffff"    
+    },
+    "2": {
+        "101010": "101010",
+        "523131": "284452",
+        "635229": "211f69",
+        "10316b": "283957",
+        "086b5a": "462d7e",
+        "9c4a4a": "44988f",
+        "844252": "844252",
+        "de524a": "65cda4",
+        "bd9452": "3b4bad",
+        "f7ce63": "557ecd",
+        "31529c": "929bdf",
+        "10a594": "7346a1",
+        "3184f7": "c4d3ff",
+        "9c9cad": "9c9cad",
+        "ffffff": "ffffff"
+      
+    }
+}
diff --git a/public/images/pokemon/variant/572.json b/public/images/pokemon/variant/572.json
index 87200b60097..84a300c590d 100644
--- a/public/images/pokemon/variant/572.json
+++ b/public/images/pokemon/variant/572.json
@@ -1,24 +1,28 @@
 {
 	"1": {
-		"8c847b": "b2af6e",
-		"524a42": "525042",
-		"ffffff": "ffffff",
-		"decec5": "decec5",
-		"bdb5a5": "dad7a1",
-		"bd2929": "f28989",
-		"101010": "101010",
-		"d65252": "f8c1c1",
-		"ef8484": "fab7b7"
+		"4f473f": "113026",
+		"4d443e": "428066",
+		"918b83": "60a37b",
+		"d65252": "458256",
+		"47403b": "802b50",
+		"faf5f5": "b3e8ba",
+		"8c847b": "b34967",
+		"decec5": "87cc9a",
+		"bdb5a5": "cf6b77",
+		"bd2929": "256145",
+		"ef8484": "63a86a"
 	},
 	"2": {
-		"8c847b": "5f807e",
-		"524a42": "5f807e",
-		"ffffff": "d7e8e6",
-		"decec5": "cbdcda",
-		"bdb5a5": "aec8c6",
-		"bd2929": "b08631",
-		"101010": "101010",
-		"d65252": "e6c88d",
-		"ef8484": "dab977"
+		"4f473f": "19d684",
+		"4d443e": "466336",
+		"918b83": "67824d",
+		"d65252": "82a65e",
+		"47403b": "101931",
+		"faf5f5": "d9e3aa",
+		"8c847b": "193457",
+		"decec5": "7f915e",
+		"bdb5a5": "294a6b",
+		"bd2929": "558f45",
+		"ef8484": "b4cf88"
 	}
 }
\ No newline at end of file
diff --git a/public/images/pokemon/variant/573.json b/public/images/pokemon/variant/573.json
new file mode 100644
index 00000000000..3f4ce9e186f
--- /dev/null
+++ b/public/images/pokemon/variant/573.json
@@ -0,0 +1,26 @@
+{
+	"1": {
+		"bdb5b5": "60a67c",
+		"877e76": "458766",
+		"decec5": "87cc9a",
+		"4f473f": "113026",
+		"bdad9c": "cf6b77",
+		"faf5f5": "b3e8ba",
+		"d65252": "256145",
+		"4d453f": "802b50",
+		"8a8078": "b34967",
+		"ef8484": "58a672"
+	},
+	"2": {
+		"bdb5b5": "597041",
+		"877e76": "3d542d",
+		"decec5": "7f915e",
+		"4f473f": "19d684",
+		"bdad9c": "294a6b",
+		"faf5f5": "d9e3aa",
+		"d65252": "558f45",
+		"4d453f": "101931",
+		"8a8078": "193457",
+		"ef8484": "b4cf88"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/626.json b/public/images/pokemon/variant/626.json
new file mode 100644
index 00000000000..2f23c357b34
--- /dev/null
+++ b/public/images/pokemon/variant/626.json
@@ -0,0 +1,52 @@
+{
+    "1": {
+        "101010": "101010",
+        "2b231c": "342b22",
+        "312921": "303120",
+        "4a3119": "122119",
+        "593b24": "362126",
+        "4a4231": "4a4831",
+        "6b4a29": "565796",
+        "694b2c": "513236",
+        "694b2d": "5f3539",
+        "714d29": "2d4a3a",
+        "3a3a42": "4d150f",
+        "6b6b73": "802d1f",
+        "946b31": "4d6650",
+        "966d34": "983525",
+        "ad8c29": "8580c4",
+        "9c845a": "9e655c",
+        "9c845c": "9e655e",
+        "9c855d": "9e655cx",
+        "bda57b": "bd8c7b",
+        "ffc54a": "c0b5eb",
+        "9ca5a5": "a34933",
+        "f7d69c": "f38d5d",
+        "fff7ce": "fed292"
+    },
+    "2": {
+        "101010": "101010",
+        "2b231c": "443520",
+        "312921": "962430",
+        "4a3119": "855168",
+        "593b24": "905932",
+        "4a4231": "cc4545",
+        "6b4a29": "678db8",
+        "694b2c": "907532",
+        "694b2d": "907d32",
+        "714d29": "c17c95",
+        "3a3a42": "7f5310",
+        "6b6b73": "d49612",
+        "946b31": "e4b3b3",
+        "966d34": "92bcd4",
+        "ad8c29": "ca8928",
+        "9c845a": "beab6c",
+        "9c845c": "d2c084",
+        "9c855d": "db9a39",
+        "bda57b": "efeac2",
+        "ffc54a": "c2e5f0",
+        "9ca5a5": "e9ca5a",
+        "f7d69c": "f5cc51",
+        "fff7ce": "fff1be"
+    }
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/643.json b/public/images/pokemon/variant/643.json
new file mode 100644
index 00000000000..32afc3ef939
--- /dev/null
+++ b/public/images/pokemon/variant/643.json
@@ -0,0 +1,52 @@
+{
+	"1": {
+		"4b4b6b": "a58419",
+		"faf5f5": "7b7e8a",
+		"ff6331": "ffee6b",
+		"3f3e5c": "374052",
+		"f7f8ff": "414659",
+		"616587": "2c2d45",
+		"ffa531": "fcfade",
+		"757b96": "d6c563",
+		"31314d": "1f2230",
+		"6e7491": "212236",
+		"3ab5f7": "e0912f",
+		"454166": "232738",
+		"de2908": "ffca0a",
+		"b8b9d1": "f0edc2",
+		"c1c1d6": "565a69",
+		"686d8c": "596675",
+		"424061": "0d0d1a",
+		"afb1cc": "2f3247",
+		"d6c5b5": "f2f2d8",
+		"afb1c7": "97a5b0",
+		"e6b573": "f2ecaa",
+		"767e9c": "3c4154",
+		"f5ebeb": "e6e7ef"
+	},
+	"2": {
+		"4b4b6b": "19323c",
+		"faf5f5": "7a8fe7",
+		"ff6331": "9df377",
+		"3f3e5c": "19143f",
+		"f7f8ff": "a9bbff",
+		"616587": "2d3984",
+		"ffa531": "5cdca6",
+		"757b96": "3a6d71",
+		"31314d": "160837",
+		"6e7491": "3c50a1",
+		"3ab5f7": "d95486",
+		"454166": "2d3984",
+		"de2908": "3e947c",
+		"b8b9d1": "4f9290",
+		"c1c1d6": "647bd9",
+		"686d8c": "2b2871",
+		"424061": "18225f",
+		"afb1cc": "647bd9",
+		"d6c5b5": "3d8073",
+		"afb1c7": "343d8e",
+		"e6b573": "4ba789",
+		"767e9c": "3c50a1",
+		"f5ebeb": "4459a2"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/643_2.png b/public/images/pokemon/variant/643_2.png
new file mode 100644
index 00000000000..fbd2a6e109c
Binary files /dev/null and b/public/images/pokemon/variant/643_2.png differ
diff --git a/public/images/pokemon/variant/644.json b/public/images/pokemon/variant/644.json
new file mode 100644
index 00000000000..e84e7373389
--- /dev/null
+++ b/public/images/pokemon/variant/644.json
@@ -0,0 +1,48 @@
+{
+	"1": {
+		"1a1a21": "35296b",
+		"2c2c35": "c1c8e8",
+		"103a52": "251076",
+		"191921": "686c99",
+		"22222e": "705ba8",
+		"005da4": "4800e3",
+		"31313a": "cfd0e6",
+		"6bf7ff": "b77dff",
+		"00c5ff": "7626ff",
+		"1a1821": "7888c2",
+		"23232f": "8c9bd1",
+		"ce0000": "a44bf2",
+		"121212": "54428f",
+		"940000": "762fcc",
+		"52525a": "e6e7f2",
+		"003682": "4c29ab",
+		"08528c": "3b1899",
+		"212129": "9b9fc4",
+		"111111": "5b5f8c",
+		"009cde": "dbbaff",
+		"101010": "49568f"
+	},
+	"2": {
+		"1a1a21": "350707",
+		"2c2c35": "9c5fa4",
+		"103a52": "671212",
+		"191921": "843172",
+		"22222e": "350707",
+		"005da4": "c8433a",
+		"31313a": "ef9dae",
+		"6bf7ff": "f5e5da",
+		"00c5ff": "fbd3a8",
+		"1a1821": "5e286f",
+		"23232f": "763e7f",
+		"ce0000": "f3d32c",
+		"121212": "210214",
+		"940000": "aa5d0e",
+		"52525a": "ffc5d1",
+		"003682": "671212",
+		"08528c": "821b1b",
+		"212129": "ca6c94",
+		"111111": "4a1a4c",
+		"009cde": "ef806b",
+		"101010": "3b1a4c"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/646-black.json b/public/images/pokemon/variant/646-black.json
new file mode 100644
index 00000000000..70094ae228b
--- /dev/null
+++ b/public/images/pokemon/variant/646-black.json
@@ -0,0 +1,59 @@
+{
+	"1": {
+		"2f2f38": "112240",
+		"6b8c7b": "2b4366",
+		"524a31": "203c5c",
+		"191921": "6a6a94",
+		"648776": "905dcf",
+		"315a42": "1a2b4d",
+		"e3e3dc": "d4c3f7",
+		"e8e8dc": "e6a18a",
+		"35353d": "c8c9e0",
+		"786655": "5482b0",
+		"ededeb": "ebd4c3",
+		"b3ac8b": "c77161",
+		"006b94": "4c13a1",
+		"3b3b42": "9e463f",
+		"2e5942": "484873",
+		"addec5": "426585",
+		"b59400": "b35a3e",
+		"004b6f": "4c13a1",
+		"7d6d5b": "b2bdd4",
+		"ada584": "78a9cc",
+		"ffff4a": "db966b",
+		"deddd3": "edc9ff",
+		"282830": "9b9bc2",
+		"23232b": "0c142e",
+		"1e1e26": "15213b",
+		"00b5ff": "a033ff",
+		"b6e3ca": "bb8ae3"
+	},
+	"2": {
+		"2f2f38": "550f0f",
+		"6b8c7b": "be6e34",
+		"524a31": "550f0f",
+		"191921": "3d0d38",
+		"648776": "ea93a5",
+		"315a42": "7b2d25",
+		"e3e3dc": "ffadbe",
+		"e8e8dc": "e0e0cc",
+		"35353d": "913a7d",
+		"786655": "982222",
+		"b3ac8b": "cec7a7",
+		"006b94": "6b3773",
+		"3b3b42": "423f30",
+		"2e5942": "ca6c94",
+		"addec5": "e6b45b",
+		"b59400": "166a2d",
+		"004b6f": "411d46",
+		"7d6d5b": "982222",
+		"ada584": "c23232",
+		"ffff4a": "6ae649",
+		"deddd3": "ffc5d1",
+		"282830": "6c245b",
+		"23232b": "521610",
+		"1e1e26": "480b0b",
+		"00b5ff": "b464bf",
+		"b6e3ca": "ea93a5"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/646-white.json b/public/images/pokemon/variant/646-white.json
new file mode 100644
index 00000000000..ff46920d000
--- /dev/null
+++ b/public/images/pokemon/variant/646-white.json
@@ -0,0 +1,52 @@
+{
+	"1": {
+		"101010": "101010",
+		"741a18": "9c5528",
+		"4a4a29": "2a446b",
+		"4a4a2d": "181930",
+		"4c4a2c": "1b2547",
+		"315a42": "1b2547",
+		"7b7b5a": "779fbf",
+		"73737b": "222342",
+		"942921": "d49748",
+		"e64a42": "ffe587",
+		"6b8c7b": "2e466b",
+		"cc9827": "b35a3e",
+		"ffde38": "db966b",
+		"ffde3a": "ffde3a",
+		"ffad63": "fff7c4",
+		"ada584": "b7dbeb",
+		"bdbdc5": "292b40",
+		"addec5": "45678a",
+		"f7f3f3": "f7f3f3",
+		"fbf8f8": "414659",
+		"fdf9f9": "fcfcfc",
+		"fcfcfc": "fcfcfc",
+		"ffffff": "ffffff"
+	},
+	"2": {
+		"101010": "101010",
+		"741a18": "1f504d",
+		"4a4a29": "550f0f",
+		"4a4a2d": "1f1544",
+		"4c4a2c": "7b2d25",
+		"315a42": "7b2d25",
+		"7b7b5a": "982222",
+		"73737b": "2b2871",
+		"942921": "3d8073",
+		"e64a42": "4ba789",
+		"6b8c7b": "be6e34",
+		"cc9827": "166a2d",
+		"ffde38": "6ae649",
+		"ffde3a": "9df377",
+		"ffad63": "5cdca6",
+		"ada584": "c23232",
+		"bdbdc5": "3d458f",
+		"addec5": "e6b45b",
+		"f7f3f3": "f7f3f3",
+		"fbf8f8": "5870c4",
+		"fdf9f9": "4f9290",
+		"fcfcfc": "e2f9b5",
+		"ffffff": "ffffff"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/646.json b/public/images/pokemon/variant/646.json
new file mode 100644
index 00000000000..c8a0453a135
--- /dev/null
+++ b/public/images/pokemon/variant/646.json
@@ -0,0 +1,38 @@
+{
+	"1": {
+		"8c7329": "b35a3e",
+		"949cad": "a6cfe0",
+		"3b3b4a": "39444c",
+		"103a52": "121836",
+		"ffe600": "db966b",
+		"73737b": "6394b0",
+		"373746": "121836",
+		"bde6ff": "3c5878",
+		"424252": "3d6285",
+		"696973": "606a73",
+		"ceb500": "a55c39",
+		"cecece": "bec9ce",
+		"def7ff": "577c96",
+		"6d737b": "a55c39",
+		"6b8494": "1a2647",
+		"ffffff": "edfcff",
+		"a5b5ce": "293c5e"
+	},
+	"2": {
+		"8c7329": "166a2d",
+		"949cad": "c23232",
+		"3b3b4a": "4a3b3b",
+		"103a52": "7b2d25",
+		"ffe600": "6ae649",
+		"73737b": "982222",
+		"373746": "7b2d25",
+		"bde6ff": "e6b45b",
+		"424252": "550f0f",
+		"696973": "736969",
+		"ceb500": "2aac2b",
+		"def7ff": "f7ec88",
+		"6d737b": "2aac2b",
+		"6b8494": "974626",
+		"a5b5ce": "be6e34"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/656.json b/public/images/pokemon/variant/656.json
index 68743a4c9f1..5037f86f22a 100644
--- a/public/images/pokemon/variant/656.json
+++ b/public/images/pokemon/variant/656.json
@@ -3,12 +3,12 @@
 		"838394": "4d7dc5",
 		"62ace6": "8363af",
 		"7bcdff": "9c75c2",
-		"ffec8c": "ddfff9",
+		"fdea88": "ddfff9",
 		"a1a1c4": "7ab7ec",
 		"c9b241": "97d6e2",
-		"dfcf77": "bae7e8",
+		"ccbd70": "bae7e8",
 		"174592": "37408c",
-		"fdfdfd": "b1e5ff",
+		"f8f8f8": "b1e5ff",
 		"9c9cc5": "5385c7",
 		"cdcde6": "7eb7e8",
 		"396a83": "362864",
@@ -18,12 +18,12 @@
 		"838394": "cc6845",
 		"62ace6": "c44848",
 		"7bcdff": "dd6155",
-		"ffec8c": "ddfff9",
+		"fdea88": "ddfff9",
 		"a1a1c4": "f7c685",
 		"c9b241": "97d6e2",
-		"dfcf77": "bae7e8",
+		"ccbd70": "bae7e8",
 		"174592": "198158",
-		"fdfdfd": "fff4bd",
+		"f8f8f8": "fff4bd",
 		"9c9cc5": "c96a48",
 		"cdcde6": "f7b785",
 		"396a83": "5c0d33",
diff --git a/public/images/pokemon/variant/666-continental.json b/public/images/pokemon/variant/666-continental.json
index 67e25fc79b4..92614fb346c 100644
--- a/public/images/pokemon/variant/666-continental.json
+++ b/public/images/pokemon/variant/666-continental.json
@@ -2,6 +2,7 @@
 	"1": {
 		"101010": "101010",
 		"595959": "724b7a",
+		"555353": "724b7a",
 		"d18257": "d18257",
 		"f9bd55": "f9bd55",
 		"303030": "402746",
@@ -15,5 +16,23 @@
 		"c3c3c3": "ffeaff",
 		"811c1c": "811c1c",
 		"e08528": "e08528"
+	},
+	"2": {
+		"101010": "101010",
+		"595959": "8f551e",
+		"555353": "e99b44",
+		"d18257": "d18257",
+		"f9bd55": "f9bd55",
+		"303030": "6d2d0d",
+		"f8f05e": "f8f05e",
+		"d24c3e": "d24c3e",
+		"675220": "9c5c19",
+		"ceab62": "e99b44",
+		"707068": "e99b44",
+		"504a4a": "9c5c19",
+		"aa5844": "aa5844",
+		"c3c3c3": "f8f27f",
+		"811c1c": "811c1c",
+		"308528": "308528"
 	}
 }
\ No newline at end of file
diff --git a/public/images/pokemon/variant/666-continental_3.json b/public/images/pokemon/variant/666-continental_3.json
deleted file mode 100644
index ed0fee105bb..00000000000
--- a/public/images/pokemon/variant/666-continental_3.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "666-continental_3.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 67,
-				"h": 67
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 67,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 67
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 67
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:70eae64f87d7226958d0443e262bab16:5ea86607863e872365dc956f4d819752:23aaac2256d564b9d8a58d7de70397c3$"
-	}
-}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/666-continental_3.png b/public/images/pokemon/variant/666-continental_3.png
deleted file mode 100644
index 24e4c9ab37c..00000000000
Binary files a/public/images/pokemon/variant/666-continental_3.png and /dev/null differ
diff --git a/public/images/pokemon/variant/666-fancy.json b/public/images/pokemon/variant/666-fancy.json
new file mode 100644
index 00000000000..1f31ac6983d
--- /dev/null
+++ b/public/images/pokemon/variant/666-fancy.json
@@ -0,0 +1,38 @@
+{
+    "1": {
+        "101010": "101010",
+        "303030": "402746",
+        "675220": "958c8a",
+        "504a4a": "7f6991",
+        "595959": "724b7a",
+        "707068": "a97cbc",
+        "811c1c": "811c1c",
+        "de4040": "de4040",
+        "5faa3e": "5faa3e",
+        "ceab62": "d9edd4",
+        "b6d26d": "b6d26d",
+        "e9e052": "e9e052",
+        "cf7ef3": "cf7ef3",
+        "c3c3c3": "ffeaff",
+        "f2d4e3": "f2d4e3",
+        "ead2e3": "ffeaff"
+    },
+    "2": {
+        "101010": "101010",
+        "303030": "00771b",
+        "675220": "b9c05a",
+        "504a4a": "b9c05a",
+        "595959": "6f9f42",
+        "707068": "e3e982",
+        "811c1c": "811c1c",
+        "de4040": "de4040",
+        "5faa3e": "5faa3e",
+        "ceab62": "e3e982",
+        "b6d26d": "b6d26d",
+        "e9e052": "e9e052",
+        "cf7ef3": "cf7ef3",
+        "c3c3c3": "fcf1ff",
+        "f2d4e3": "f2d4e3",
+        "ead2e3": "fcf1ff"
+    }
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/666-fancy_2.json b/public/images/pokemon/variant/666-fancy_2.json
deleted file mode 100644
index d2dd365d3ed..00000000000
--- a/public/images/pokemon/variant/666-fancy_2.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "666-fancy_2.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 67,
-				"h": 67
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 67,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 67
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 67
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:2d5276d8c199bae070dbaa73293fd554:a099f55391d8e4bbae565d4a170574c9:6d5edff9a806f43feff031c9919c9aca$"
-	}
-}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/666-fancy_2.png b/public/images/pokemon/variant/666-fancy_2.png
deleted file mode 100644
index 100ba90d7e4..00000000000
Binary files a/public/images/pokemon/variant/666-fancy_2.png and /dev/null differ
diff --git a/public/images/pokemon/variant/666-fancy_3.json b/public/images/pokemon/variant/666-fancy_3.json
deleted file mode 100644
index be0625b1360..00000000000
--- a/public/images/pokemon/variant/666-fancy_3.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "666-fancy_3.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 67,
-				"h": 67
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 67,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 67
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 67
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:2d5276d8c199bae070dbaa73293fd554:a099f55391d8e4bbae565d4a170574c9:6d5edff9a806f43feff031c9919c9aca$"
-	}
-}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/666-fancy_3.png b/public/images/pokemon/variant/666-fancy_3.png
deleted file mode 100644
index a8453d6cbce..00000000000
Binary files a/public/images/pokemon/variant/666-fancy_3.png and /dev/null differ
diff --git a/public/images/pokemon/variant/666-high-plains.json b/public/images/pokemon/variant/666-high-plains.json
index fd26a077f34..85a5eb24cc3 100644
--- a/public/images/pokemon/variant/666-high-plains.json
+++ b/public/images/pokemon/variant/666-high-plains.json
@@ -14,7 +14,8 @@
 		"c3c3c3": "ffeaff",
 		"811c1c": "811c1c",
 		"337543": "337543",
-		"e8c815": "e8c815"
+		"e8c815": "e8c815",
+		"773d21": "773d21"
 	},
 	"2": {
 		"101010": "101010",
@@ -31,6 +32,7 @@
 		"c3c3c3": "edc67c",
 		"811c1c": "811c1c",
 		"337543": "337543",
-		"e8c815": "e8c815"
+		"e8c815": "e8c815",
+		"773d21": "773d21"
 	}
 }
\ No newline at end of file
diff --git a/public/images/pokemon/variant/666-monsoon.json b/public/images/pokemon/variant/666-monsoon.json
index 8aaedab67ca..915d471b2b1 100644
--- a/public/images/pokemon/variant/666-monsoon.json
+++ b/public/images/pokemon/variant/666-monsoon.json
@@ -1,36 +1,33 @@
 {
-	"1": {
-		"101010": "101010",
-		"595959": "724b7a",
-		"f0f0f8": "f0f0f8",
-		"303030": "402746",
-		"675220": "958c8a",
-		"ceab62": "d9edd4",
+    "1": {
+        "101010": "101010",
+        "303030": "402746",
+        "675220": "958c8a",
+        "504a4a": "7f6991",
+        "595959": "724b7a",
+        "707068": "a97cbc",
 		"807676": "807676",
-		"92f4f4": "92f4f4",
-		"989898": "989898",
-		"707068": "a97cbc",
-		"504a4a": "7f6991",
-		"4eccd6": "4eccd6",
+        "ceab62": "d9edd4",
 		"5676de": "5676de",
-		"c3c3c3": "ffeaff",
-		"811c1c": "811c1c"
-	},
-	"2": {
-		"101010": "101010",
-		"595959": "656565",
-		"f0f0f8": "f0f0f8",
-		"303030": "4f4645",
-		"675220": "2c3593",
-		"ceab62": "5857bc",
-		"807676": "807676",
-		"92f4f4": "92f4f4",
-		"989898": "989898",
-		"707068": "5857bc",
-		"504a4a": "2c3593",
-		"4eccd6": "4eccd6",
-		"5676de": "5676de",
-		"c3c3c3": "b8f9f9",
-		"811c1c": "811c1c"
-	}
+        "4eccd6": "4eccd6",
+        "989898": "989898",
+        "c3c3c3": "c3c3c3",
+        "f0f0f8": "f0f0f8"
+    },
+    "2": {
+        "101010": "101010",
+        "303030": "3d3231",
+        "675220": "2c3593",
+        "504a4a": "2c3593",
+        "595959": "4f4645",
+        "707068": "5857bc",
+        "807676": "807676",
+        "ceab62": "5857bc",
+        "5676de": "5676de",
+        "4eccd6": "4eccd6",
+        "989898": "989898",
+        "92f4f4": "92f4f4",
+        "c3c3c3": "b8f9f9",
+        "f0f0f8": "f0f0f8"
+    }
 }
\ No newline at end of file
diff --git a/public/images/pokemon/variant/666-ocean.json b/public/images/pokemon/variant/666-ocean.json
index 975602c6f9e..23f8d48c681 100644
--- a/public/images/pokemon/variant/666-ocean.json
+++ b/public/images/pokemon/variant/666-ocean.json
@@ -22,7 +22,7 @@
 		"e1384d": "e1384d",
 		"f4ad61": "f4ad61",
 		"f8ef6a": "f8ef6a",
-		"303030": "b56208",
+		"303030": "b54908",
 		"675220": "bc601c",
 		"ceab62": "ea8742",
 		"707068": "ea8742",
diff --git a/public/images/pokemon/variant/666-poke-ball.json b/public/images/pokemon/variant/666-poke-ball.json
index e83072c51a5..fe6b42f6ef3 100644
--- a/public/images/pokemon/variant/666-poke-ball.json
+++ b/public/images/pokemon/variant/666-poke-ball.json
@@ -14,6 +14,25 @@
 		"504a4a": "7f6991",
 		"c3c3c3": "ffeaff",
 		"811c1c": "811c1c",
-		"a9a99e": "a9a99e"
+		"a9a99e": "a9a99e",
+		"2c2b2b": "402746"
+	},
+	"2": {
+		"101010": "101010",
+		"f8f8f8": "00006d",
+		"303030": "ae001a",
+		"2c2b2b": "660000",
+        "504a4a": "a70038",
+		"595959": "df0036",
+		"c3c3c3": "f0a6bf",
+		"707068": "d5375a",
+		"a9a99e": "000050",
+		"811c1c": "811c1c",
+		"971d1d": "040046",
+		"b72c2c": "00005e",
+		"dc4b4b": "19007d",
+		"e97e7e": "2e2095",
+		"675220": "a70038",
+		"ceab62": "d5375a"
 	}
 }
\ No newline at end of file
diff --git a/public/images/pokemon/variant/666-poke-ball_3.json b/public/images/pokemon/variant/666-poke-ball_3.json
deleted file mode 100644
index d506cef780e..00000000000
--- a/public/images/pokemon/variant/666-poke-ball_3.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "666-poke-ball_3.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 67,
-				"h": 67
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 67,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 67
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 67
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:7ff5b539e59b71fa67f66f26bb0f2e9d:45bec6d118350401c25850e5f12a25af:8ec14f129d1691b8da504a13b661abed$"
-	}
-}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/666-poke-ball_3.png b/public/images/pokemon/variant/666-poke-ball_3.png
deleted file mode 100644
index e6056246fce..00000000000
Binary files a/public/images/pokemon/variant/666-poke-ball_3.png and /dev/null differ
diff --git a/public/images/pokemon/variant/666-river.json b/public/images/pokemon/variant/666-river.json
index 818e1ee3989..c7e5e288d05 100644
--- a/public/images/pokemon/variant/666-river.json
+++ b/public/images/pokemon/variant/666-river.json
@@ -1,19 +1,40 @@
 {
-	"2": {
-		"101010": "101010",
-		"595959": "8a5702",
-		"ceab62": "d9a666",
-		"303030": "7b2800",
-		"625841": "625841",
-		"bc813f": "bc813f",
-		"9c9143": "9c9143",
-		"675220": "ae7f41",
-		"707068": "d9a666",
-		"504a4a": "ae7f41",
-		"c3c3c3": "e3c384",
-		"811c1c": "811c1c",
-		"279ec2": "279ec2",
-		"59c9d3": "59c9d3",
-		"1d726a": "1d726a"
-	}
+    "1": {
+        "101010": "101010",
+        "303030": "402746",
+        "4a412c": "4a412c",
+        "675220": "958c8a",
+        "634d20": "634d20",
+        "1d726a": "1d726a",
+        "504a4a": "7f6991",
+        "595959": "724b7a",
+        "625841": "625841",
+        "707068": "a97cbc",
+        "bc813f": "bc813f",
+        "9c9143": "9c9143",
+        "ceab62": "ceab62",
+        "279ec2": "279ec2",
+        "59c9d3": "59c9d3",
+        "c3c3c3": "c3c3c3",
+        "d2a862": "d9edd4"
+    },
+    "2": {
+        "101010": "101010",
+        "303030": "7b2800",
+        "4a412c": "4a412c",
+        "675220": "ae7f41",
+        "634d20": "634d20",
+        "1d726a": "1d726a",
+        "504a4a": "ae7f41",
+        "595959": "8a5702",
+        "625841": "625841",
+        "707068": "d9a666",
+        "bc813f": "bc813f",
+        "9c9143": "9c9143",
+        "ceab62": "ceab62",
+        "279ec2": "279ec2",
+        "59c9d3": "59c9d3",
+        "c3c3c3": "e3c384",
+        "d2a862": "d2a862"
+    }
 }
\ No newline at end of file
diff --git a/public/images/pokemon/variant/666-river_2.json b/public/images/pokemon/variant/666-river_2.json
deleted file mode 100644
index 0da0f00b0be..00000000000
--- a/public/images/pokemon/variant/666-river_2.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "666-river_2.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 67,
-				"h": 67
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 67,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 67
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 67
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:39f778a45b20cfcfded5a350ee1a02e9:5d7e7e891b7da588a2ebd23733da6c2d:fa23dc87fc53ba2cfa532cf440553cf5$"
-	}
-}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/666-river_2.png b/public/images/pokemon/variant/666-river_2.png
deleted file mode 100644
index a5a65f4933b..00000000000
Binary files a/public/images/pokemon/variant/666-river_2.png and /dev/null differ
diff --git a/public/images/pokemon/variant/669-red.json b/public/images/pokemon/variant/669-red.json
index 627fdbeb44f..145228a41c2 100644
--- a/public/images/pokemon/variant/669-red.json
+++ b/public/images/pokemon/variant/669-red.json
@@ -1,4 +1,22 @@
 {
+	"1": {
+        "101010": "101010",
+		"3d6629": "094740",
+		"665a1f": "3e0547",
+		"595959": "595959",
+		"686868": "686868",
+		"802d2d": "55061c",
+		"d94c4c": "aa263c",
+		"e15455": "dc6295",
+		"ff7373": "cd4a4a",
+		"65a943": "e493a1",
+		"6bb347": "1d8057",
+		"ccb43d": "6a094f",
+		"ffe14c": "9c235f",
+		"bfbfbf": "bfbfbf",
+		"f8f8f8": "f8f8f8",
+		"fffbfb": "fffbfb"
+	},
 	"2": {
 		"665a1f": "393833",
 		"ffe14c": "fdfffb",
diff --git a/public/images/pokemon/variant/669-red_2.json b/public/images/pokemon/variant/669-red_2.json
deleted file mode 100644
index 33816135db6..00000000000
--- a/public/images/pokemon/variant/669-red_2.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "669-red_2.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 46,
-				"h": 46
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 43,
-						"h": 46
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 43,
-						"h": 46
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 43,
-						"h": 46
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:30be9438b4a7afb54dfbdae88661c2ed:ba8475f09ea3d2213c2462b54bc4a3e0:9f8ada9cf46c4e29f954b2eb815bc4e5$"
-	}
-}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/669-red_2.png b/public/images/pokemon/variant/669-red_2.png
deleted file mode 100644
index 5d30b38b1d4..00000000000
Binary files a/public/images/pokemon/variant/669-red_2.png and /dev/null differ
diff --git a/public/images/pokemon/variant/692.json b/public/images/pokemon/variant/692.json
new file mode 100644
index 00000000000..954dcffb3e9
--- /dev/null
+++ b/public/images/pokemon/variant/692.json
@@ -0,0 +1,26 @@
+{
+	"1": {
+		"b3f2ff": "fada7f",
+		"44a2b4": "af6a37",
+		"2f7280": "783a1d",
+		"cd9d3a": "53be53",
+		"575757": "c85b5b",
+		"72561c": "20734c",
+		"60dbf2": "e1ac53",
+		"b4b4b4": "c8ba6d",
+		"3d3d3d": "7d182d",
+		"ffc549": "a9f076"
+	},
+	"2": {
+		"b3f2ff": "faf8d7",
+		"44a2b4": "968144",
+		"2f7280": "5f3c23",
+		"cd9d3a": "7743be",
+		"575757": "88cd56",
+		"72561c": "371c72",
+		"60dbf2": "e1d6b6",
+		"b4b4b4": "68a7aa",
+		"3d3d3d": "1c873e",
+		"ffc549": "a36feb"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/693.json b/public/images/pokemon/variant/693.json
new file mode 100644
index 00000000000..2e80795d2a0
--- /dev/null
+++ b/public/images/pokemon/variant/693.json
@@ -0,0 +1,30 @@
+{
+	"1": {
+		"23a2c8": "c87a23",
+		"ffc859": "6ccd80",
+		"224b73": "552813",
+		"404040": "3c171b",
+		"262626": "230808",
+		"5f5f5f": "6e2e3b",
+		"cc9c3d": "1b3c17",
+		"61daf2": "f2bd61",
+		"735822": "08230e",
+		"3674b3": "7d3e21",
+		"ffc44c": "426e2e",
+		"4595e5": "aa6839"
+	},
+	"2": {
+		"23a2c8": "beb099",
+		"ffc859": "f5b281",
+		"224b73": "5f463a",
+		"404040": "2a8c53",
+		"262626": "295a1c",
+		"5f5f5f": "51c85d",
+		"cc9c3d": "6259af",
+		"61daf2": "f0eadb",
+		"735822": "36235f",
+		"3674b3": "9b8265",
+		"ffc44c": "a39afa",
+		"4595e5": "c8b493"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/715.json b/public/images/pokemon/variant/715.json
new file mode 100644
index 00000000000..e43af20a0de
--- /dev/null
+++ b/public/images/pokemon/variant/715.json
@@ -0,0 +1,42 @@
+{
+    "1": {
+        "101010": "101010",
+        "2b2b2b": "43167f",
+        "343333": "563d8f",
+        "3b3b3b": "5f32b1",
+        "6a3f73": "0f103c",
+        "287366": "731338",
+        "575757": "7a5ccc",
+        "555454": "9166c8",
+        "801a1a": "5d173d",
+        "e52e2e": "903b78",
+        "ffe14c": "ff8a58",
+        "8e5499": "202558",
+        "bd70cc": "2f386b",
+        "3aa694": "a42c54",
+        "4cd9c1": "d04b6c",
+        "bfbfbf": "bb9adc",
+        "f8f8f8": "f8f8f8",
+        "f7f3f3": "d6c8f1"
+    },
+    "2": {
+        "101010": "101010",
+        "2b2b2b": "5e3932",
+        "343333": "1d060c",
+        "3b3b3b": "c29484",
+        "6a3f73": "3b0c18",
+        "287366": "832714",
+        "575757": "ecd3c3",
+        "555454": "2f0d13",
+        "801a1a": "7c0907",
+        "e52e2e": "ad3419",
+        "ffe14c": "49ffcd",
+        "8e5499": "5b1922",
+        "bd70cc": "7c2928",
+        "3aa694": "b8552c",
+        "4cd9c1": "dd834c",
+        "bfbfbf": "43191e",
+        "f8f8f8": "f8f8f8",
+        "f7f3f3": "5a2a2b"
+    }
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/728.json b/public/images/pokemon/variant/728.json
index 186c61ea7ea..fb17e2c119e 100644
--- a/public/images/pokemon/variant/728.json
+++ b/public/images/pokemon/variant/728.json
@@ -1,34 +1,36 @@
 {
 	"1": {
-		"243a66": "00473d",
-		"436cbf": "009469",
-		"6c90d9": "14af82",
 		"733f50": "a62c20",
+		"243a66": "00473d",
 		"e57ea1": "ff8072",
 		"f8f8f8": "fff6e2",
+		"436cbf": "009469",
 		"b3627d": "e54c41",
-		"314f8c": "006355",
+		"6c90d9": "14af82",
 		"101010": "101010",
-		"bfbfbf": "c2beb4",
 		"808080": "808080",
-		"404040": "404040",
+		"bfbfbf": "c2beb4",
+		"314f8c": "006355",
 		"639ba6": "858d7d",
-		"a1dae5": "92b599"
+		"a1dae5": "92b599",
+		"1e3a66": "363d2f",
+		"2c4f8c": "5a6154"
 	},
 	"2": {
-		"243a66": "54041b",
-		"436cbf": "a6213f",
-		"6c90d9": "be294a",
 		"733f50": "620a33",
+		"243a66": "54041b",
 		"e57ea1": "dd3780",
 		"f8f8f8": "f5edee",
+		"436cbf": "a6213f",
 		"b3627d": "a7225c",
-		"314f8c": "770f29",
+		"6c90d9": "be294a",
 		"101010": "101010",
-		"bfbfbf": "bfb4b9",
 		"808080": "808080",
-		"404040": "404040",
+		"bfbfbf": "bfb4b9",
+		"314f8c": "770f29",
 		"639ba6": "b88389",
-		"a1dae5": "f7c1c5"
+		"a1dae5": "f7c1c5",
+		"1e3a66": "773f46",
+		"2c4f8c": "a45f67"
 	}
 }
\ No newline at end of file
diff --git a/public/images/pokemon/variant/730.json b/public/images/pokemon/variant/730.json
index 871bd52ec9e..eec815b0572 100644
--- a/public/images/pokemon/variant/730.json
+++ b/public/images/pokemon/variant/730.json
@@ -1,36 +1,46 @@
 {
 	"1": {
-		"0e6792": "b54f5f",
-		"6ac8e3": "ffa0a8",
-		"727481": "74312e",
-		"aac7e6": "ea7c5b",
-		"44a0b5": "d87383",
 		"101010": "101010",
-		"82a7b9": "c35861",
 		"8d3f4a": "a62c20",
-		"f8f8f8": "fff2d4",
-		"bdbdc1": "c0b7a1",
-		"ff8496": "ff8072",
 		"c76374": "e54c41",
+		"0e6792": "b54f5f",
 		"1241a1": "006355",
+		"6d7481": "917393",
+		"727481": "a0866f",
 		"1470de": "009469",
-		"64c5e1": "00dc9c"
+		"5a8092": "74312e",
+		"44a0b5": "d87383",
+		"64c5e1": "00dc9c",
+		"6ac8e3": "ffa0a8",
+		"82a7b9": "c35861",
+		"ff8496": "ff8072",
+		"bdbdc1": "c0b7a1",
+		"c0bdc1": "beaac0",
+		"aac7e6": "ea7c5b",
+		"f8f8f8": "fff2d4",
+		"faf8f8": "f1e8f1",
+		"fef8f8": "fef8f8"
 	},
 	"2": {
-		"0e6792": "500518",
-		"6ac8e3": "a6213f",
-		"727481": "5c2141",
-		"aac7e6": "e9a5c0",
-		"44a0b5": "770f29",
 		"101010": "101010",
-		"82a7b9": "c17b97",
 		"8d3f4a": "1d1638",
-		"f8f8f8": "f5edee",
-		"bdbdc1": "bfb4b9",
-		"ff8496": "614388",
 		"c76374": "391e62",
+		"0e6792": "500518",
 		"1241a1": "591945",
+		"6d7481": "81716d",
+		"727481": "9e8193",
 		"1470de": "81387e",
-		"64c5e1": "bd2b6b"
+		"5a8092": "5c2141",
+		"44a0b5": "770f29",
+		"64c5e1": "bd2b6b",
+		"6ac8e3": "a6213f",
+		"82a7b9": "c17b97",
+		"ff8496": "614388",
+		"bdbdc1": "bfb4b9",
+		"c0bdc1": "c0b4a5",
+		"aac7e6": "e9a5c0",
+		"f8f8f8": "f5edee",
+		"faf8f8": "f5f3e3",
+		"fef8f8": "fef8f8"
 	}
 }
\ No newline at end of file
diff --git a/public/images/pokemon/variant/746-school.json b/public/images/pokemon/variant/746-school.json
new file mode 100644
index 00000000000..a76aca2921f
--- /dev/null
+++ b/public/images/pokemon/variant/746-school.json
@@ -0,0 +1,40 @@
+{
+    "1": {
+        "101010": "101010",
+        "0a1627": "5f2112",
+        "113650": "0b3d3a",
+        "123954": "75351b",
+        "10437d": "16574d",
+        "134884": "934f26",
+        "1766c6": "b77736",
+        "3d66d8": "d39c63",
+        "416adf": "2c9572",
+        "79848a": "a67834",
+        "749cf6": "5ce09d",
+        "43ebf3": "824388",
+        "72f0f6": "27133f",
+        "9cd3fd": "78f389",
+        "a6c5f7": "aafe94",
+        "cfd1d3": "d5ab51",
+        "fbfbfb": "f7d76b"
+    },
+    "2": {
+        "101010": "101010",
+        "0a1627": "160523",
+        "113650": "846228",
+        "123954": "28071a",
+        "10437d": "b7904d",
+        "134884": "350b19",
+        "1766c6": "4a1111",
+        "3d66d8": "622222",
+        "416adf": "dec284",
+        "79848a": "4a1111",
+        "749cf6": "f8ecc5",
+        "43ebf3": "4378eb",
+        "72f0f6": "31238e",
+        "9cd3fd": "fefed9",
+        "a6c5f7": "fefeef",
+        "cfd1d3": "5f291c",
+        "fbfbfb": "844232"
+    }
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/746.json b/public/images/pokemon/variant/746.json
new file mode 100644
index 00000000000..5b183b10e5d
--- /dev/null
+++ b/public/images/pokemon/variant/746.json
@@ -0,0 +1,40 @@
+{
+    "1": {
+        "101010": "101010",
+        "1f2161": "16574d",
+        "5d666d": "75391b",
+        "616b72": "a67834",
+        "9c455b": "308c9d",
+        "374793": "2c9572",
+        "4764c9": "5ce09d",
+        "3e9cbb": "27133f",
+        "61c8de": "824388", 
+        "8c9c9d": "935926",
+        "8d9c9d": "c69b3f",
+        "d88394": "65cfe2",
+        "b0c5c6": "d5ab51",
+        "ccd2ce": "b77736",
+        "d8d9da": "d8d9da",
+        "eeeeee": "f7d76b",
+        "fefefe": "fefefe"
+    },
+    "2": {
+        "101010": "101010",
+        "1f2161": "b7904d",
+        "5d666d": "1e0726",
+        "616b72": "4a1111",
+        "9c455b": "b9682d",
+        "374793": "dec284",
+        "4764c9": "f8ecc5",
+        "3e9cbb": "4378eb",
+        "61c8de": "5787f1", 
+        "8c9c9d": "350b19",
+        "8d9c9d": "531917",
+        "d88394": "e4d85f",
+        "b0c5c6": "5f291c",
+        "ccd2ce": "4a1111",
+        "d8d9da": "d8d9da",
+        "eeeeee": "844232",
+        "fefefe": "fefefe"
+    }
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/780.json b/public/images/pokemon/variant/780.json
new file mode 100644
index 00000000000..0399d3567bf
--- /dev/null
+++ b/public/images/pokemon/variant/780.json
@@ -0,0 +1,40 @@
+{
+	"1": {
+		"8d541b": "bd8955",
+		"297b8b": "1a316b",
+		"606f55": "496375",
+		"ffc4d7": "f29d9d",
+		"105262": "0e194a",
+		"b4cda4": "9ab5b8",
+		"f5ae07": "e8c987",
+		"ce5b9b": "cf4654",
+		"faf550": "faf0b1",
+		"e67b9c": "e65757",
+		"bd3983": "bd3341",
+		"eea6bc": "f06e6e",
+		"5aa4a4": "284c80",
+		"b8b7a3": "cf8d38",
+		"726d5c": "a36026",
+		"91a37c": "7798a1",
+		"eeeeee": "e6c15e"
+	},
+	"2": {
+		"8d541b": "157d36",
+		"297b8b": "4e4f73",
+		"606f55": "8f825d",
+		"ffc4d7": "f2e396",
+		"105262": "3f3c61",
+		"b4cda4": "d6dbba",
+		"f5ae07": "24ab2b",
+		"ce5b9b": "d9ae5d",
+		"faf550": "3ec435",
+		"e67b9c": "e3b656",
+		"bd3983": "c27529",
+		"eea6bc": "f2d98d",
+		"5aa4a4": "6a708a",
+		"b8b7a3": "254e59",
+		"726d5c": "162d3d",
+		"91a37c": "b5b48b",
+		"eeeeee": "3e7a76"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/782.json b/public/images/pokemon/variant/782.json
new file mode 100644
index 00000000000..bd04ccc0c70
--- /dev/null
+++ b/public/images/pokemon/variant/782.json
@@ -0,0 +1,34 @@
+{
+	"1": {
+		"f13035": "48bd8c",
+		"bec6cb": "e8cea0",
+		"fdfdfd": "fcf2ca",
+		"f8f236": "e77b57",
+		"504e4b": "2b130b",
+		"aba5ad": "336340",
+		"7b766f": "472d1d",
+		"7a756d": "a67e5b",
+		"726475": "214a33",
+		"4f4d4b": "8a5b41",
+		"940a0d": "258067",
+		"dbdbdb": "4e8759",
+		"957509": "a63424",
+		"fff7cc": "f7c4b5"
+	},
+	"2": {
+		"f13035": "b8c0fc",
+		"bec6cb": "b7ddeb",
+		"fdfdfd": "d5f4f7",
+		"f8f236": "52d9ac",
+		"504e4b": "132040",
+		"aba5ad": "5e3e75",
+		"7b766f": "273959",
+		"7a756d": "8ab7cf",
+		"726475": "412959",
+		"4f4d4b": "567496",
+		"940a0d": "636a94",
+		"dbdbdb": "855d99",
+		"957509": "258085",
+		"fff7cc": "baf7dc"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/783.json b/public/images/pokemon/variant/783.json
new file mode 100644
index 00000000000..0748d5ff79e
--- /dev/null
+++ b/public/images/pokemon/variant/783.json
@@ -0,0 +1,32 @@
+{
+	"1": {
+		"f13035": "48bd8c",
+		"6c6968": "472d1d",
+		"97938c": "2a573e",
+		"4d4644": "2b130b",
+		"940a0d": "258067",
+		"fdfdfd": "fcf2ca",
+		"6e6a69": "8a5b41",
+		"fff5ae": "f7c4b5",
+		"c2c1c0": "42754f",
+		"d7aa22": "c25236",
+		"957509": "a63424",
+		"69625c": "133027",
+		"f4da42": "e77b57"
+	},
+	"2": {
+		"f13035": "d9ddfc",
+		"6c6968": "2e4266",
+		"97938c": "543666",
+		"4d4644": "151e38",
+		"940a0d": "636a94",
+		"fdfdfd": "d5f4f7",
+		"6e6a69": "567496",
+		"fff5ae": "baf7dc",
+		"c2c1c0": "744e87",
+		"d7aa22": "37ad94",
+		"957509": "258085",
+		"69625c": "2d1c3d",
+		"f4da42": "52d9ac"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/784.json b/public/images/pokemon/variant/784.json
new file mode 100644
index 00000000000..0bd28476e98
--- /dev/null
+++ b/public/images/pokemon/variant/784.json
@@ -0,0 +1,50 @@
+{
+	"1": {
+		"c99f21": "c25236",
+		"4b4657": "8a5b41",
+		"544747": "517d37",
+		"d0d2d5": "77a353",
+		"fafafa": "f7c4b5",
+		"d4d6d9": "e8cea0",
+		"9d6702": "9c3c27",
+		"f4da42": "e77b57",
+		"f13035": "48bd8c",
+		"2d2b28": "2b130b",
+		"c59c21": "b5482f",
+		"cb0e12": "258067",
+		"47444e": "472d1d",
+		"f7f7f7": "fcf2ca",
+		"a7a29e": "336142",
+		"807673": "a67e5b",
+		"504444": "123028",
+		"885902": "a63424",
+		"7e7572": "204736",
+		"d7d9db": "548752",
+		"4d4946": "447835",
+		"fdfdfd": "bbd477"
+	},
+	"2": {
+		"c99f21": "37ad94",
+		"4b4657": "567496",
+		"544747": "558ea3",
+		"d0d2d5": "7ec2cc",
+		"fafafa": "daf2e7",
+		"d4d6d9": "b7ddeb",
+		"9d6702": "227880",
+		"f4da42": "52d9ac",
+		"f13035": "d9ddfc",
+		"2d2b28": "151e38",
+		"c59c21": "34a897",
+		"cb0e12": "636a94",
+		"47444e": "2e4266",
+		"f7f7f7": "d5f4f7",
+		"a7a29e": "6c457a",
+		"807673": "8ab7cf",
+		"504444": "2d1840",
+		"885902": "2b8c8b",
+		"7e7572": "4e2e61",
+		"d7d9db": "ac7fb3",
+		"4d4946": "558fa6",
+		"fdfdfd": "adedf0"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/840.json b/public/images/pokemon/variant/840.json
new file mode 100644
index 00000000000..255e2e7689a
--- /dev/null
+++ b/public/images/pokemon/variant/840.json
@@ -0,0 +1,34 @@
+{
+	"1": {
+		"e2244a": "70a2c5",
+		"8d4229": "570749",
+		"94d84a": "e5e8ee",
+		"5fab1d": "7a7c9e",
+		"d39a52": "9c2e72",
+		"e32b50": "4e77a2",
+		"357912": "313846",
+		"fe455c": "abd7e2",
+		"5bab1d": "acb0c3",
+		"247912": "48485d",
+		"a50534": "3e6085",
+		"a4d84a": "9aa0b3",
+		"f2c171": "c55885",
+		"fa6f8b": "c1f3f3"
+	},
+	"2": {
+		"e2244a": "bfb5ab",
+		"8d4229": "230808",
+		"94d84a": "589df3",
+		"5fab1d": "a8546e",
+		"d39a52": "291411",
+		"e32b50": "807770",
+		"357912": "823455",
+		"fe455c": "dcd9d1",
+		"5bab1d": "354dbf",
+		"247912": "2e2246",
+		"a50534": "68645f",
+		"a4d84a": "e28c95",
+		"f2c171": "463731",
+		"fa6f8b": "eeedea"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/841-gigantamax.json b/public/images/pokemon/variant/841-gigantamax.json
new file mode 100644
index 00000000000..5d3b8c49133
--- /dev/null
+++ b/public/images/pokemon/variant/841-gigantamax.json
@@ -0,0 +1,52 @@
+{
+    "1": {
+        "101010": "101010",
+        "772628": "3e6085",
+        "2c4828": "291634",
+        "427638": "7a7c9e",
+        "872d23": "460c4d",
+        "8b3329": "2c255d",
+        "913c3c": "5b4585",
+        "a63139": "70a2c5",
+        "8d4229": "272a52",
+        "bf6c31": "b668a0",
+        "d2394d": "abd7e2",
+        "d54456": "751680",
+        "c57741": "9c2e72",
+        "e84466": "8666ae",
+        "39a43d": "9aa0b3",
+        "b3ac62": "95aec9",
+        "c68a48": "2b526f",
+        "e2bb56": "c55885",
+        "e9c558": "397880",
+        "ffc66a": "eeb4cb",
+        "dad08b": "dcebf9",
+        "fff1ab": "63b9b9",
+        "f9f9f9": "f9f9f9"
+    },
+    "2": {
+        "101010": "101010",
+        "772628": "695d57",
+        "2c4828": "341c1c",
+        "427638": "a54e69",
+        "872d23": "2e2246",
+        "8b3329": "3a2222",
+        "913c3c": "682d2d",
+        "a63139": "baada1",
+        "8d4229": "9c564c",
+        "bf6c31": "354dbf",
+        "d2394d": "dcd9d1",
+        "d54456": "2e38bf",
+        "c57741": "291411",
+        "e84466": "915a41",
+        "39a43d": "e28c95",
+        "b3ac62": "c1a39c",
+        "c68a48": "d1a87e",
+        "e2bb56": "463731",
+        "e9c558": "eee0bc",
+        "ffc66a": "589df3",
+        "dad08b": "e2dcd6",
+        "fff1ab": "fdf3c0",
+        "f9f9f9": "f9f9f9"  
+    }
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/841.json b/public/images/pokemon/variant/841.json
new file mode 100644
index 00000000000..3f1c756da5e
--- /dev/null
+++ b/public/images/pokemon/variant/841.json
@@ -0,0 +1,38 @@
+{
+	"1": {
+		"df6655": "c55885",
+		"b5915b": "34123a",
+		"9b2629": "70a2c5",
+		"8d764b": "110723",
+		"56ab32": "a59ab3",
+		"f0bda6": "c1f3f3",
+		"c3a965": "b3b1d6",
+		"f1c950": "f3c5dd",
+		"ccca71": "e6dcf9",
+		"ccb468": "5d2654",
+		"612324": "3e6085",
+		"d72d31": "abd7e2",
+		"874c23": "613863",
+		"ebe381": "854774",
+		"488235": "8e7a9e",
+		"395a2e": "383146"
+	},
+	"2": {
+		"df6655": "463731",
+		"b5915b": "541711",
+		"9b2629": "bfb5ab",
+		"8d764b": "230313",
+		"56ab32": "e28c95",
+		"f0bda6": "eeedea",
+		"c3a965": "cbb4af",
+		"f1c950": "589df3",
+		"ccca71": "e2dcd6",
+		"ccb468": "8b4332",
+		"612324": "68645f",
+		"d72d31": "dcd9d1",
+		"874c23": "2e2246",
+		"ebe381": "c68862",
+		"488235": "a8546e",
+		"395a2e": "4f0e30"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/842-gigantamax.json b/public/images/pokemon/variant/842-gigantamax.json
new file mode 100644
index 00000000000..5d3b8c49133
--- /dev/null
+++ b/public/images/pokemon/variant/842-gigantamax.json
@@ -0,0 +1,52 @@
+{
+    "1": {
+        "101010": "101010",
+        "772628": "3e6085",
+        "2c4828": "291634",
+        "427638": "7a7c9e",
+        "872d23": "460c4d",
+        "8b3329": "2c255d",
+        "913c3c": "5b4585",
+        "a63139": "70a2c5",
+        "8d4229": "272a52",
+        "bf6c31": "b668a0",
+        "d2394d": "abd7e2",
+        "d54456": "751680",
+        "c57741": "9c2e72",
+        "e84466": "8666ae",
+        "39a43d": "9aa0b3",
+        "b3ac62": "95aec9",
+        "c68a48": "2b526f",
+        "e2bb56": "c55885",
+        "e9c558": "397880",
+        "ffc66a": "eeb4cb",
+        "dad08b": "dcebf9",
+        "fff1ab": "63b9b9",
+        "f9f9f9": "f9f9f9"
+    },
+    "2": {
+        "101010": "101010",
+        "772628": "695d57",
+        "2c4828": "341c1c",
+        "427638": "a54e69",
+        "872d23": "2e2246",
+        "8b3329": "3a2222",
+        "913c3c": "682d2d",
+        "a63139": "baada1",
+        "8d4229": "9c564c",
+        "bf6c31": "354dbf",
+        "d2394d": "dcd9d1",
+        "d54456": "2e38bf",
+        "c57741": "291411",
+        "e84466": "915a41",
+        "39a43d": "e28c95",
+        "b3ac62": "c1a39c",
+        "c68a48": "d1a87e",
+        "e2bb56": "463731",
+        "e9c558": "eee0bc",
+        "ffc66a": "589df3",
+        "dad08b": "e2dcd6",
+        "fff1ab": "fdf3c0",
+        "f9f9f9": "f9f9f9"  
+    }
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/842.json b/public/images/pokemon/variant/842.json
new file mode 100644
index 00000000000..9563715745e
--- /dev/null
+++ b/public/images/pokemon/variant/842.json
@@ -0,0 +1,40 @@
+{
+    "1": {
+        "101010": "101010",
+        "1f4329": "313846",
+        "1f5829": "852560",
+        "2c743e": "7a7c9e",
+        "9f7034": "9aa0b3",
+        "ac6b20": "110723",
+        "af2348": "67829e",
+        "e75574": "70a2c5",
+        "39a45f": "92cbd9",
+        "7de755": "9aa0b3",
+        "e78422": "1f1946",
+        "ffa63b": "2d3d68",
+        "f1cf6d": "a3b9d0",
+        "f9d56d": "698db4",
+        "ffc575": "2b526f",
+        "f18e8e": "c1f3f3",
+        "fcff86": "397880"
+    },
+    "2": {
+        "101010": "101010",
+        "1f4329": "511c2d",
+        "1f5829": "2e2246",
+        "2c743e": "a8546e",
+        "9f7034": "3a130d",
+        "ac6b20": "68645f",
+        "af2348": "bfb5ab",
+        "e75574": "dcd9d1",
+        "39a45f": "e28c95",
+        "7de755": "589df3",
+        "e78422": "4b211b",
+        "ffa63b": "63473b",
+        "f1cf6d": "cbb4af",
+        "f9d56d": "b9937a",
+        "ffc575": "d1a87e",
+        "f18e8e": "eeedea",
+        "fcff86": "eee0bc"
+    }
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/859.json b/public/images/pokemon/variant/859.json
new file mode 100644
index 00000000000..703d5d67218
--- /dev/null
+++ b/public/images/pokemon/variant/859.json
@@ -0,0 +1,30 @@
+{
+	"1": {
+		"e65984": "619544",
+		"8d3856": "376b2d",
+		"ffbff5": "dbe797",
+		"f589c2": "9aba6d",
+		"45366d": "5b1d15",
+		"735aac": "a4332d",
+		"947cd8": "cd643d",
+		"f42252": "f55c14",
+		"101010": "101010",
+		"fdfdfd": "fdfdfd",
+		"c9c9c9": "c9c9c9",
+		"8b73d5": "cc5836"
+	},
+	"2": {
+		"e65984": "4b1736",
+		"8d3856": "30082d",
+		"ffbff5": "904f55",
+		"f589c2": "6b2b3e",
+		"45366d": "794935",
+		"735aac": "f0c475",
+		"947cd8": "d9975b",
+		"f42252": "fc645a",
+		"101010": "101010",
+		"fdfdfd": "fdfdfd",
+		"c9c9c9": "dad6bf",
+		"8b73d5": "f9e9a4"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/859_2.json b/public/images/pokemon/variant/859_2.json
deleted file mode 100644
index 1494c4909f7..00000000000
--- a/public/images/pokemon/variant/859_2.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "859_2.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 51,
-				"h": 51
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 51,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 51,
-						"h": 47
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 51,
-						"h": 47
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:214cad7b549c6f4fdfaf238d82156c4e:50dda7cd3a060b6b559148b2a281e2fe:40139ec0718e207e11a4ee81c686e004$"
-	}
-}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/859_2.png b/public/images/pokemon/variant/859_2.png
deleted file mode 100644
index 82e8be45c39..00000000000
Binary files a/public/images/pokemon/variant/859_2.png and /dev/null differ
diff --git a/public/images/pokemon/variant/859_3.json b/public/images/pokemon/variant/859_3.json
deleted file mode 100644
index e0d6c3779a8..00000000000
--- a/public/images/pokemon/variant/859_3.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "859_3.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 51,
-				"h": 51
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 51,
-						"h": 47
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 51,
-						"h": 47
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 51,
-						"h": 47
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:214cad7b549c6f4fdfaf238d82156c4e:50dda7cd3a060b6b559148b2a281e2fe:40139ec0718e207e11a4ee81c686e004$"
-	}
-}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/859_3.png b/public/images/pokemon/variant/859_3.png
deleted file mode 100644
index 800063f08aa..00000000000
Binary files a/public/images/pokemon/variant/859_3.png and /dev/null differ
diff --git a/public/images/pokemon/variant/871.json b/public/images/pokemon/variant/871.json
new file mode 100644
index 00000000000..5004d3013b5
--- /dev/null
+++ b/public/images/pokemon/variant/871.json
@@ -0,0 +1,32 @@
+{
+    "1": {
+        "101010": "101010",
+        "2e2732": "1b3334",
+        "281f2e": "2a2732",
+        "46384c": "504540",
+        "493d4e": "3a5d57",
+        "665272": "62857c",
+        "544947": "7d320e",
+        "7a7270": "a8501b",
+        "9e9a96": "cd7930",
+        "7b4e1c": "5b0d3f",
+        "d58815": "a02c58",
+        "fdba2f": "c45858",
+        "fdf22f": "f1e8e8"
+    },
+    "2": {
+        "101010": "101010",
+        "2e2732": "8b4738",
+        "281f2e": "212232",
+        "46384c": "504740",
+        "493d4e": "ce8a66",
+        "665272": "eac69b",
+        "544947": "1a1730",
+        "7a7270": "27223b",
+        "9e9a96": "3a3449",
+        "7b4e1c": "222c58",
+        "d58815": "343f7f",
+        "fdba2f": "67729f",
+        "fdf22f": "8e9fc9"
+    }
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/88.json b/public/images/pokemon/variant/88.json
new file mode 100644
index 00000000000..61b7ca3b802
--- /dev/null
+++ b/public/images/pokemon/variant/88.json
@@ -0,0 +1,28 @@
+{
+    "1": {
+        "101010": "101010",
+        "424a5a": "5b3a1d",
+        "5a3173": "6a010c",
+        "848c9c": "9b7c48",
+        "944a9c": "b1160e",
+        "adb5bd": "e9de8c",
+        "bd7bbd": "d55021",
+        "ce8cc5": "e98a47",
+        "d6d6de": "ded7ce",
+        "ffffff": "ffffff",
+        "efade6": "f8be70"
+    },
+    "2": {
+        "101010": "101010",
+        "424a5a": "2d7351",
+        "5a3173": "a21851",
+        "848c9c": "69b17b",
+        "944a9c": "d04569",
+        "adb5bd": "b0e4a9",
+        "bd7bbd": "ed8ea2",
+        "ce8cc5": "f4bfbf",
+        "d6d6de": "d6d6de",
+        "ffffff": "ffffff",
+        "efade6": "f8d8cf"
+    }
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/89.json b/public/images/pokemon/variant/89.json
new file mode 100644
index 00000000000..eda3558d7c2
--- /dev/null
+++ b/public/images/pokemon/variant/89.json
@@ -0,0 +1,30 @@
+{
+    "1": {
+        "101010": "101010",
+        "424a5a": "5b3a1d",
+        "5a3173": "6a010c",
+        "848c9c": "9b7c48",
+        "944a9c": "b1160e",
+        "adb5bd": "e9de8c",
+        "bd7bbd": "d55021",
+        "ce8cc5": "e98a47",
+        "d6d6de": "ded7ce",
+        "ffffff": "ffffff",
+        "efade6": "f8be70",
+        "ad63ad": "c63a17"
+    },
+    "2": {
+        "101010": "101010",
+        "424a5a": "2d7351",
+        "5a3173": "a21851",
+        "848c9c": "69b17b",
+        "944a9c": "d04569",
+        "adb5bd": "b0e4a9",
+        "bd7bbd": "ed8ea2",
+        "ce8cc5": "f4bfbf",
+        "d6d6de": "d6d6de",
+        "ffffff": "ffffff",
+        "efade6": "f8d8cf",
+        "ad63ad": "e5728a"
+    }
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/_exp_masterlist.json b/public/images/pokemon/variant/_exp_masterlist.json
new file mode 100644
index 00000000000..88c6f4a95c1
--- /dev/null
+++ b/public/images/pokemon/variant/_exp_masterlist.json
@@ -0,0 +1,672 @@
+{
+    "3-mega": [0, 2, 2],
+    "6-mega-x": [0, 2, 2],
+    "6-mega-y": [0, 2, 2],
+    "80-mega": [0, 1, 1],
+    "94-mega": [2, 2, 2],
+    "127-mega": [0, 1, 1],
+    "130-mega": [0, 1, 1],
+    "142-mega": [0, 1, 1],
+    "150-mega-x": [0, 1, 1],
+    "150-mega-y": [0, 1, 1],
+    "181-mega": [0, 1, 2],
+    "212-mega": [1, 1, 2],
+    "229-mega": [0, 1, 1],
+    "248-mega": [0, 1, 1],
+    "257-mega": [0, 1, 1],
+    "282-mega": [0, 2, 2],
+    "302-mega": [0, 1, 1],
+    "303-mega": [0, 1, 1],
+    "306-mega": [1, 1, 1],
+    "308-mega": [0, 1, 1],
+    "310-mega": [0, 1, 1],
+    "334-mega": [0, 2, 1],
+    "354-mega": [0, 1, 1],
+    "359-mega": [0, 1, 1],
+    "362-mega": [0, 1, 1],
+    "373-mega": [0, 1, 1],
+    "376-mega": [0, 1, 1],
+    "380-mega": [0, 1, 1],
+    "381-mega": [0, 1, 1],
+    "382-primal": [0, 1, 1],
+    "383-primal": [0, 1, 1],
+    "384-mega": [0, 2, 1],
+    "428-mega": [0, 1, 1],
+    "445-mega": [1, 1, 1],
+    "448-mega": [1, 1, 1],
+    "475-mega": [0, 2, 2],
+    "531-mega": [0, 1, 1],
+    "653": [0, 1, 1],
+    "654": [0, 1, 1],
+    "655": [0, 1, 1],
+    "656": [0, 1, 1],
+    "657": [0, 1, 1],
+    "658": [0, 1, 1],
+    "658-ash": [0, 1, 1],
+    "664": [0, 1, 1],
+    "665": [0, 1, 1],
+    "666-archipelago": [0, 1, 1],
+    "666-continental": [0, 1, 1],
+    "666-elegant": [0, 1, 1],
+    "666-fancy": [0, 1, 1],
+    "666-garden": [0, 1, 1],
+    "666-high-plains": [0, 1, 1],
+    "666-icy-snow": [0, 1, 1],
+    "666-jungle": [0, 1, 1],
+    "666-marine": [0, 1, 1],
+    "666-meadow": [0, 1, 1],
+    "666-modern": [0, 1, 1],
+    "666-monsoon": [0, 1, 1],
+    "666-ocean": [0, 1, 1],
+    "666-poke-ball": [0, 1, 1],
+    "666-polar": [0, 1, 1],
+    "666-river": [0, 1, 1],
+    "666-sandstorm": [0, 1, 1],
+    "666-savanna": [0, 1, 1],
+    "666-sun": [0, 1, 1],
+    "666-tundra": [0, 1, 1],
+    "669-red": [0, 2, 2],
+    "669-blue": [0, 1, 1],
+    "669-white": [0, 1, 1],
+    "669-yellow": [0, 1, 1],
+    "669-orange": [0, 2, 2],
+    "670-white": [0, 1, 1],
+    "670-blue": [0, 1, 1],
+    "670-orange": [0, 1, 1],
+    "670-red": [0, 1, 1],
+    "670-yellow": [0, 1, 1],
+    "671-red": [0, 1, 2],
+    "671-blue": [0, 1, 2],
+    "671-yellow": [0, 1, 1],
+    "671-white": [0, 1, 2],
+    "671-orange": [0, 1, 2],
+    "672": [0, 1, 1],
+    "673": [0, 1, 1],
+    "676": [0, 1, 1],
+    "677": [0, 1, 1],
+    "678-female": [0, 1, 1],
+    "678": [0, 1, 1],
+    "682": [0, 1, 1],
+    "683": [0, 1, 1],
+    "684": [0, 1, 1],
+    "685": [0, 1, 1],
+    "688": [0, 1, 1],
+    "689": [0, 1, 1],
+    "690": [0, 1, 1],
+    "691": [0, 1, 1],
+    "692": [0, 1, 1],
+	"693": [0, 1, 1],
+    "696": [0, 1, 1],
+    "697": [0, 1, 1],
+    "699": [0, 1, 1],
+    "700": [0, 1, 1],
+    "702": [0, 1, 1],
+    "704": [0, 1, 1],
+    "705": [0, 1, 1],
+    "706": [0, 1, 1],
+    "709": [0, 1, 1],
+    "710": [0, 1, 1],
+    "711": [1, 1, 1],
+    "712": [0, 1, 1],
+    "713": [0, 1, 1],
+    "715": [0, 1, 1],
+    "716-active": [0, 1, 1],
+    "716-neutral": [0, 1, 1],
+    "717": [0, 2, 2],
+    "720-unbound": [1, 1, 1],
+    "720": [1, 1, 1],
+    "728": [0, 1, 1],
+    "729": [0, 1, 1],
+    "730": [0, 1, 1],
+    "734": [0, 1, 1],
+    "735": [0, 1, 1],
+    "742": [0, 2, 2],
+    "743": [0, 2, 2],
+    "746": [0, 1, 1],
+    "746-school": [0, 1, 1],
+    "747": [0, 2, 2],
+    "748": [0, 1, 1],
+    "751": [0, 1, 1],
+    "752": [0, 1, 1],
+    "753": [0, 1, 1],
+    "754": [0, 2, 2],
+    "755": [0, 1, 1],
+    "756": [0, 1, 1],
+    "761": [0, 1, 1],
+    "762": [0, 1, 1],
+    "763": [0, 1, 1],
+    "767": [0, 1, 1],
+    "768": [0, 1, 1],
+    "770": [0, 0, 0],
+    "771": [0, 2, 2],
+    "772": [0, 1, 1],
+    "773-fighting": [0, 1, 1],
+    "773-psychic": [0, 1, 1],
+    "773-poison": [0, 1, 1],
+    "773-ground": [0, 1, 1],
+    "773-ghost": [0, 1, 1],
+    "773-steel": [0, 1, 1],
+    "773-rock": [0, 1, 1],
+    "773-grass": [0, 1, 1],
+    "773-dragon": [0, 1, 1],
+    "773-bug": [0, 1, 1],
+    "773-ice": [0, 1, 1],
+    "773-dark": [0, 1, 1],
+    "773": [0, 1, 1],
+    "773-fairy": [0, 1, 1],
+    "773-water": [0, 1, 1],
+    "773-electric": [0, 1, 1],
+    "773-flying": [0, 1, 1],
+    "773-fire": [0, 1, 1],
+    "776": [0, 1, 1],
+    "777": [0, 1, 1],
+    "778-busted": [0, 1, 1],
+    "778-disguised": [0, 1, 1],
+    "779": [0, 1, 1],
+    "780": [0, 1, 1],
+    "789": [1, 1, 1],
+    "790": [0, 1, 1],
+    "791": [2, 1, 1],
+    "792": [0, 1, 1],
+    "793": [0, 2, 2],
+    "797": [0, 1, 1],
+    "798": [0, 1, 1],
+    "800-dawn-wings": [0, 1, 1],
+    "800-dusk-mane": [0, 1, 1],
+    "800-ultra": [0, 1, 1],
+    "800": [0, 1, 1],
+    "802": [1, 1, 1],
+    "803": [0, 1, 1],
+    "804": [0, 1, 1],
+    "807": [0, 1, 1],
+    "808": [0, 1, 1],
+    "809": [0, 1, 1],
+    "816": [0, 1, 1],
+    "817": [0, 1, 1],
+    "818": [1, 1, 1],
+    "821": [0, 2, 2],
+    "822": [0, 1, 1],
+    "823": [0, 1, 1],
+    "829": [0, 1, 1],
+    "830": [0, 1, 1],
+    "835": [0, 1, 1],
+    "836": [0, 2, 2],
+    "840": [0, 1, 1],
+	"841": [0, 1, 1],
+	"842": [0, 1, 1],
+    "850": [0, 1, 1],
+    "851": [0, 1, 1],
+    "854": [0, 1, 1],
+    "855": [0, 1, 1],
+    "856": [0, 1, 1],
+    "857": [0, 2, 2],
+    "858": [0, 1, 1],
+    "859": [0, 1, 1],
+    "860": [0, 1, 1],
+    "861": [0, 1, 1],
+    "862": [0, 1, 1],
+    "863": [0, 1, 1],
+    "864": [0, 1, 1],
+    "867": [0, 1, 1],
+    "871": [0, 1, 1],
+    "872": [1, 1, 1],
+    "873": [1, 1, 1],
+    "876-female": [0, 1, 1],
+    "876": [0, 1, 1],
+    "877-hangry": [1, 1, 1],
+    "877": [1, 1, 1],
+    "880": [0, 1, 1],
+    "881": [0, 1, 1],
+    "882": [0, 2, 1],
+    "883": [0, 1, 1],
+    "884": [0, 1, 1],
+    "885": [1, 1, 1],
+    "886": [1, 1, 1],
+    "887": [1, 1, 1],
+    "888": [0, 1, 1],
+    "888-crowned": [0, 1, 1],
+    "889": [0, 1, 1],
+    "889-crowned": [0, 1, 1],
+    "890": [0, 2, 1],
+    "890-eternamax": [0, 1, 1],
+    "891": [1, 1, 1],
+    "892-rapid-strike": [1, 1, 1],
+    "892": [1, 1, 1],
+    "894": [0, 1, 1],
+    "895": [0, 1, 1],
+    "896": [1, 1, 1],
+    "897": [1, 1, 1],
+    "898": [1, 1, 1],
+    "898-ice": [1, 1, 1],
+    "898-shadow": [1, 1, 1],
+    "900": [0, 1, 1],
+    "901": [0, 1, 1],
+    "903": [0, 1, 1],
+    "909": [0, 1, 1],
+    "910": [0, 2, 2],
+    "911": [0, 2, 2],
+    "912": [0, 1, 2],
+    "913": [0, 1, 2],
+    "914": [0, 2, 1],
+    "919": [1, 1, 1],
+    "920": [1, 1, 1],
+    "924": [1, 1, 1],
+    "925-four": [1, 2, 2],
+    "925-three": [1, 2, 2],
+    "932": [0, 2, 2],
+    "933": [0, 2, 2],
+    "934": [0, 1, 1],
+    "940": [0, 1, 1],
+    "941": [0, 1, 1],
+    "944": [0, 1, 1],
+    "945": [0, 1, 1],
+    "948": [0, 1, 1],
+    "949": [0, 1, 1],
+    "951": [0, 1, 1],
+    "952": [0, 1, 1],
+    "953": [0, 1, 1],
+    "954": [0, 1, 1],
+    "957": [2, 2, 2],
+    "958": [2, 2, 2],
+    "959": [2, 2, 2],
+    "962": [1, 1, 1],
+    "967": [0, 1, 1],
+    "968": [0, 1, 1],
+    "969": [0, 1, 1],
+    "970": [0, 1, 1],
+    "973": [1, 1, 1],
+    "974": [0, 1, 1],
+    "975": [0, 1, 1],
+    "978-curly": [0, 2, 2],
+    "978-droopy": [0, 2, 2],
+    "978-stretchy": [0, 2, 2],
+    "979": [2, 2, 2],
+    "981": [0, 1, 1],
+    "982": [0, 1, 1],
+    "982-three-segment": [0, 1, 1],
+    "987": [1, 1, 1],
+    "988": [0, 1, 2],
+    "993": [0, 1, 1],
+    "994": [0, 1, 2],
+    "995": [0, 1, 1],
+    "996": [0, 1, 1],
+    "997": [0, 2, 2],
+    "998": [0, 2, 2],
+    "999": [2, 1, 1],
+    "1000": [1, 1, 1],
+    "1001": [0, 1, 1],
+    "1003": [0, 1, 1],
+    "1004": [0, 1, 1],
+    "1006": [0, 2, 1],
+    "1007-apex-build": [0, 2, 2],
+    "1008-ultimate-mode": [1, 1, 1],
+    "2026": [0, 1, 1],
+    "2027": [0, 1, 1],
+    "2028": [0, 1, 1],
+    "2037": [0, 1, 1],
+    "2038": [0, 1, 1],
+    "2052": [0, 1, 1],
+    "2053": [0, 1, 0],
+    "2103": [0, 1, 1],
+    "4052": [0, 1, 1],
+    "4077": [0, 1, 1],
+    "4078": [0, 1, 1],
+    "4079": [0, 1, 1],
+    "4080": [2, 1, 1],
+    "4144": [0, 1, 1],
+    "4145": [0, 1, 1],
+    "4146": [0, 1, 1],
+    "4199": [2, 1, 1],
+    "4222": [0, 1, 1],
+    "4263": [0, 1, 1],
+    "4264": [0, 1, 1],
+    "4562": [0, 1, 1],
+    "6100": [0, 1, 1],
+    "6101": [0, 1, 1],
+    "6215": [0, 1, 1],
+    "6503": [0, 1, 1],
+    "6549": [0, 1, 1],
+    "6570": [0, 1, 1],
+    "6571": [0, 1, 1],
+    "6705": [0, 1, 1],
+    "6706": [0, 1, 1],
+    "6713": [0, 1, 1],
+    "female": {
+        "6215": [0, 1, 1]
+    },
+    "back": {
+        "3-mega": [0, 2, 2],
+        "6-mega-x": [0, 2, 2],
+        "6-mega-y": [0, 1, 2],
+        "80-mega": [0, 1, 1],
+        "94-mega": [1, 1, 1],
+        "127-mega": [0, 1, 1],
+        "130-mega": [0, 1, 1],
+        "142-mega": [0, 1, 1],
+        "150-mega-x": [0, 1, 1],
+        "150-mega-y": [0, 1, 1],
+        "181-mega": [0, 1, 2],
+        "212-mega": [1, 2, 2],
+        "229-mega": [0, 1, 1],
+        "248-mega": [0, 1, 1],
+        "257-mega": [0, 1, 1],
+        "282-mega": [0, 1, 1],
+        "302-mega": [0, 1, 1],
+        "303-mega": [0, 1, 1],
+        "306-mega": [1, 1, 1],
+        "308-mega": [0, 1, 1],
+        "310-mega": [0, 1, 1],
+        "334-mega": [0, 1, 1],
+        "354-mega": [0, 1, 1],
+        "359-mega": [0, 1, 1],
+        "362-mega": [0, 1, 1],
+        "373-mega": [0, 1, 1],
+        "376-mega": [0, 1, 1],
+        "380-mega": [0, 1, 1],
+        "381-mega": [0, 1, 1],
+        "382-primal": [0, 1, 1],
+        "383-primal": [0, 1, 1],
+        "384-mega": [0, 1, 1],
+        "428-mega": [0, 1, 1],
+        "445-mega": [1, 1, 1],
+        "448-mega": [1, 1, 1],
+        "475-mega": [0, 2, 2],
+        "531-mega": [0, 1, 1],
+        "653": [0, 1, 1],
+        "654": [0, 1, 1],
+        "655": [0, 1, 1],
+        "656": [0, 1, 1],
+        "657": [0, 1, 1],
+        "658": [0, 1, 1],
+        "658-ash": [0, 1, 1],
+        "664": [0, 1, 1],
+        "665": [0, 1, 1],
+        "666-archipelago": [0, 1, 1],
+        "666-continental": [0, 1, 1],
+        "666-elegant": [0, 1, 1],
+        "666-fancy": [0, 1, 1],
+        "666-garden": [0, 1, 1],
+        "666-high-plains": [0, 1, 1],
+        "666-icy-snow": [0, 1, 1],
+        "666-jungle": [0, 1, 1],
+        "666-marine": [0, 1, 1],
+        "666-meadow": [0, 1, 1],
+        "666-modern": [0, 1, 1],
+        "666-monsoon": [0, 1, 1],
+        "666-ocean": [0, 1, 1],
+        "666-poke-ball": [0, 1, 1],
+        "666-polar": [0, 1, 1],
+        "666-river": [0, 1, 1],
+        "666-sandstorm": [0, 1, 1],
+        "666-savanna": [0, 1, 1],
+        "666-sun": [0, 1, 1],
+        "666-tundra": [0, 1, 1],
+        "669-red": [0, 2, 2],
+        "669-blue": [0, 2, 2],
+        "669-white": [0, 2, 2],
+        "669-yellow": [0, 2, 2],
+        "669-orange": [0, 2, 2],
+        "670-white": [0, 1, 1],
+        "670-blue": [0, 2, 2],
+        "670-orange": [0, 1, 1],
+        "670-red": [0, 1, 1],
+        "670-yellow": [0, 1, 1],
+        "671-red": [0, 1, 1],
+        "671-blue": [0, 1, 1],
+        "671-yellow": [0, 1, 1],
+        "671-white": [0, 1, 1],
+        "671-orange": [0, 1, 1],
+        "672": [0, 1, 1],
+        "673": [0, 1, 1],
+        "676": [0, 1, 1],
+        "677": [0, 1, 1],
+        "678-female": [0, 1, 1],
+        "678": [0, 1, 1],
+        "682": [0, 1, 1],
+        "683": [0, 1, 1],
+        "684": [0, 1, 1],
+        "685": [0, 1, 1],
+        "688": [0, 1, 1],
+        "689": [0, 1, 1],
+        "690": [0, 1, 1],
+        "691": [0, 1, 1],
+        "692": [0, 1, 1],
+        "693": [0, 1, 1],
+        "696": [0, 1, 1],
+        "697": [0, 1, 1],
+        "699": [0, 2, 2],
+        "700": [0, 1, 1],
+        "702": [0, 1, 1],
+        "704": [0, 1, 1],
+        "705": [0, 1, 1],
+        "706": [0, 1, 1],
+        "709": [0, 1, 1],
+        "710": [0, 1, 1],
+        "711": [1, 1, 1],
+        "712": [0, 1, 1],
+        "713": [0, 1, 1],
+        "715": [0, 1, 1],
+        "716-active": [0, 1, 1],
+        "716-neutral": [0, 1, 1],
+        "717": [0, 1, 1],
+        "720-unbound": [1, 1, 1],
+        "720": [1, 1, 1],
+        "728": [0, 1, 1],
+        "729": [0, 1, 1],
+        "730": [0, 1, 1],
+        "734": [0, 1, 1],
+        "735": [0, 1, 1],
+        "742": [0, 2, 2],
+        "743": [0, 2, 2],
+        "746": [0, 1, 1],
+        "746-school": [0, 1, 1],
+        "747": [0, 2, 2],
+        "748": [0, 1, 1],
+        "751": [0, 1, 1],
+        "752": [0, 1, 1],
+        "753": [0, 1, 1],
+        "754": [0, 2, 2],
+        "755": [0, 1, 1],
+        "756": [0, 1, 1],
+        "761": [0, 1, 1],
+        "762": [0, 1, 1],
+        "763": [0, 1, 1],
+        "767": [0, 1, 1],
+        "768": [0, 1, 1],
+        "771": [0, 1, 1],
+        "772": [0, 1, 1],
+        "773-fighting": [0, 1, 1],
+        "773-psychic": [0, 1, 1],
+        "773-poison": [0, 1, 1],
+        "773-ground": [0, 1, 1],
+        "773-ghost": [0, 1, 1],
+        "773-steel": [0, 1, 1],
+        "773-rock": [0, 1, 1],
+        "773-grass": [0, 1, 1],
+        "773-dragon": [0, 1, 1],
+        "773-bug": [0, 1, 1],
+        "773-ice": [0, 1, 1],
+        "773-dark": [0, 1, 1],
+        "773": [0, 1, 1],
+        "773-fairy": [0, 1, 1],
+        "773-water": [0, 1, 1],
+        "773-electric": [0, 1, 1],
+        "773-flying": [0, 1, 1],
+        "773-fire": [0, 1, 1],
+        "776": [0, 2, 2],
+        "777": [0, 1, 1],
+        "778-busted": [0, 1, 1],
+        "778-disguised": [0, 1, 1],
+        "779": [0, 1, 1],
+        "780": [0, 1, 1],
+        "789": [1, 1, 1],
+        "790": [0, 1, 1],
+        "791": [1, 1, 1],
+        "792": [0, 1, 1],
+        "793": [0, 1, 1],
+        "797": [0, 1, 1],
+        "798": [0, 1, 1],
+        "800-dawn-wings": [0, 1, 1],
+        "800-dusk-mane": [0, 1, 1],
+        "800-ultra": [0, 1, 1],
+        "800": [0, 1, 1],
+        "802": [1, 1, 1],
+        "803": [0, 1, 1],
+        "804": [0, 1, 1],
+        "807": [0, 1, 1],
+        "808": [0, 1, 1],
+        "809": [0, 1, 1],
+        "816": [0, 1, 1],
+        "817": [0, 1, 1],
+        "818": [0, 1, 1],
+        "821": [0, 1, 1],
+        "822": [0, 1, 1],
+        "823": [0, 1, 1],
+        "829": [0, 1, 1],
+        "830": [0, 1, 1],
+        "835": [0, 1, 1],
+        "836": [0, 1, 1],
+        "840": [0, 1, 1],
+        "841": [0, 1, 1],
+        "842": [0, 1, 1],
+        "850": [0, 1, 1],
+        "851": [0, 1, 1],
+        "854": [0, 1, 1],
+        "855": [0, 1, 1],
+        "856": [0, 1, 1],
+        "857": [0, 2, 2],
+        "858": [0, 1, 1],
+        "859": [0, 1, 1],
+        "860": [0, 1, 1],
+        "861": [0, 1, 1],
+        "862": [0, 1, 1],
+        "863": [0, 1, 1],
+        "864": [0, 1, 1],
+        "867": [0, 1, 1],
+        "871": [0, 1, 1],
+        "872": [1, 1, 1],
+        "873": [1, 1, 1],
+        "876-female": [0, 1, 1],
+        "876": [0, 1, 1],
+        "877-hangry": [1, 1, 1],
+        "877": [1, 1, 1],
+        "880": [0, 1, 1],
+        "881": [0, 1, 1],
+        "882": [0, 1, 1],
+        "883": [0, 1, 1],
+        "884": [0, 1, 1],
+        "885": [1, 1, 1],
+        "886": [1, 1, 1],
+        "887": [1, 1, 1],
+        "888": [0, 1, 1],
+        "888-crowned": [0, 1, 1],
+        "889": [0, 1, 1],
+        "889-crowned": [0, 1, 1],
+        "890": [0, 1, 1],
+        "891": [1, 1, 1],
+        "892-rapid-strike": [1, 1, 1],
+        "892": [1, 1, 1],
+        "894": [0, 1, 1],
+        "895": [0, 1, 1],
+        "896": [1, 1, 1],
+        "897": [1, 1, 1],
+        "898": [1, 1, 1],
+        "898-ice": [1, 1, 1],
+        "898-shadow": [1, 1, 1],
+        "900": [0, 1, 1],
+        "901": [0, 1, 1],
+        "903": [0, 1, 1],
+        "909": [0, 1, 1],
+        "910": [0, 2, 2],
+        "911": [0, 1, 1],
+        "912": [0, 1, 1],
+        "913": [0, 1, 1],
+        "914": [0, 2, 2],
+        "919": [1, 1, 1],
+        "920": [1, 1, 1],
+        "924": [1, 1, 1],
+        "925-four": [1, 2, 2],
+        "925-three": [1, 2, 2],
+        "932": [0, 1, 1],
+        "933": [0, 1, 1],
+        "934": [0, 1, 1],
+        "940": [0, 1, 1],
+        "941": [0, 1, 1],
+        "944": [0, 1, 1],
+        "945": [0, 1, 1],
+        "948": [0, 1, 1],
+        "949": [0, 1, 1],
+        "951": [0, 1, 1],
+        "952": [0, 2, 1],
+        "953": [0, 1, 1],
+        "954": [0, 1, 1],
+        "957": [1, 1, 1],
+        "958": [1, 1, 1],
+        "959": [1, 1, 1],
+        "962": [1, 1, 1],
+        "967": [0, 1, 1],
+        "968": [0, 2, 2],
+        "969": [0, 1, 1],
+        "970": [0, 1, 1],
+        "973": [1, 1, 1],
+        "974": [0, 1, 1],
+        "975": [0, 1, 1],
+        "978-curly": [0, 2, 2],
+        "978-droopy": [0, 2, 2],
+        "978-stretchy": [0, 1, 1],
+        "979": [1, 1, 1],
+        "981": [0, 1, 1],
+        "982": [0, 1, 1],
+        "982-three-segment": [0, 1, 1],
+        "987": [1, 1, 1],
+        "988": [0, 1, 1],
+        "993": [0, 1, 1],
+        "994": [0, 1, 1],
+        "995": [0, 1, 1],
+        "996": [0, 1, 1],
+        "997": [0, 1, 1],
+        "998": [0, 1, 1],
+        "999": [1, 1, 1],
+        "1000": [1, 1, 1],
+        "1001": [0, 1, 1],
+        "1003": [0, 1, 1],
+        "1004": [0, 1, 1],
+        "1006": [0, 2, 2],
+        "1007-apex-build": [0, 2, 2],
+        "1008-ultimate-mode": [1, 1, 1],
+        "2026": [0, 1, 1],
+        "2027": [0, 1, 1],
+        "2028": [0, 1, 1],
+        "2037": [0, 1, 1],
+        "2038": [0, 1, 1],
+        "2052": [0, 1, 1],
+        "2053": [0, 1, 1],
+        "2103": [0, 1, 1],
+        "4052": [0, 1, 1],
+        "4077": [0, 1, 1],
+        "4078": [0, 1, 1],
+        "4079": [0, 1, 1],
+        "4080": [2, 2, 2],
+        "4144": [0, 1, 1],
+        "4145": [0, 1, 1],
+        "4146": [0, 1, 1],
+        "4199": [2, 1, 1],
+        "4222": [0, 1, 1],
+        "4263": [0, 1, 1],
+        "4264": [0, 1, 1],
+        "4562": [0, 1, 1],
+        "6100": [0, 1, 1],
+        "6101": [0, 1, 1],
+        "6215": [0, 1, 1],
+        "6503": [0, 1, 1],
+        "6549": [0, 1, 1],
+        "6570": [0, 1, 1],
+        "6571": [0, 1, 1],
+        "6705": [0, 1, 1],
+        "6706": [0, 1, 1],
+        "6713": [0, 1, 1],
+        "female": {
+            "6215": [0, 1, 1]
+        }
+    }
+}
diff --git a/public/images/pokemon/variant/_masterlist.json b/public/images/pokemon/variant/_masterlist.json
index 87c9816b8cb..719f3db3d86 100644
--- a/public/images/pokemon/variant/_masterlist.json
+++ b/public/images/pokemon/variant/_masterlist.json
@@ -32,6 +32,9 @@
 	"29": [0, 1, 1],
 	"30": [0, 1, 1],
 	"31": [1, 1, 1],
+	"32": [0, 1, 1],
+	"33": [0, 1, 1],
+	"34": [0, 1, 1],
 	"35": [0, 1, 2],
 	"36": [0, 1, 1],
 	"37": [0, 1, 1],
@@ -67,6 +70,8 @@
 	"85": [1, 1, 1],
 	"86": [1, 1, 1],
 	"87": [1, 1, 1],
+	"88": [0, 1, 1],
+	"89": [0, 1, 1],
 	"92": [2, 2, 2],
 	"93": [1, 1, 1],
 	"94-gigantamax": [1, 2, 2],
@@ -113,6 +118,8 @@
 	"141": [0, 2, 2],
 	"142-mega": [0, 1, 1],
 	"142": [0, 1, 1],
+	"143-gigantamax": [0, 1, 1],
+	"143": [0, 1, 1],
 	"144": [1, 2, 2],
 	"145": [1, 1, 1],
 	"146": [1, 1, 1],
@@ -154,6 +161,9 @@
 	"183": [0, 1, 2],
 	"184": [0, 2, 2],
 	"185": [0, 1, 1],
+    "187": [0, 1, 1],
+	"188": [0, 1, 1],
+	"189": [0, 1, 1],
 	"190": [0, 1, 1],
 	"193": [0, 1, 1],
 	"194": [0, 1, 1],
@@ -192,6 +202,8 @@
 	"201-w": [0, 1, 1],
 	"201-o": [0, 1, 1],
 	"203": [0, 1, 1],
+	"204": [0, 1, 1],
+	"205": [0, 1, 1],
 	"206": [0, 1, 1],
 	"207": [0, 1, 1],
 	"211": [0, 1, 1],
@@ -221,7 +233,7 @@
 	"246": [0, 1, 1],
 	"247": [0, 1, 1],
 	"248": [0, 1, 1],
-	"248-mega": [0, 2, 1],
+	"248-mega": [0, 1, 1],
 	"249": [0, 2, 2],
 	"250": [0, 2, 2],
 	"251": [0, 1, 1],
@@ -247,6 +259,7 @@
 	"291": [2, 2, 2],
 	"292": [2, 1, 2],
 	"298": [0, 2, 2],
+	"299": [0, 1, 1],
 	"300": [1, 1, 1],
 	"301": [1, 1, 1],
 	"302": [0, 1, 1],
@@ -265,13 +278,19 @@
 	"310": [0, 1, 1],
 	"311": [1, 1, 1],
 	"312": [0, 1, 1],
+	"313": [0, 1, 1],
+	"314": [0, 1, 1],
 	"315": [0, 1, 1],
 	"320": [0, 1, 1],
 	"321": [0, 1, 1],
+	"325": [0, 1, 1],
+	"326": [0, 1, 1],
 	"327": [0, 1, 1],
 	"328": [0, 1, 1],
 	"329": [0, 1, 2],
 	"330": [0, 1, 1],
+	"331": [0, 1, 1],
+	"332": [0, 1, 1],  
 	"333": [0, 1, 1],
 	"334-mega": [0, 2, 1],
 	"334": [0, 2, 2],
@@ -283,6 +302,8 @@
 	"340": [0, 1, 2],
 	"341": [0, 2, 2],
 	"342": [0, 2, 2],
+	"345": [0, 1, 1],
+	"346": [0, 1, 1],
 	"351-rainy": [1, 2, 2],
 	"351-snowy": [1, 1, 1],
 	"351-sunny": [1, 2, 2],
@@ -331,10 +352,16 @@
 	"393": [0, 1, 1],
 	"394": [0, 1, 1],
 	"395": [0, 1, 1],
+	"396": [0, 1, 1],
+	"397": [0, 1, 1],
+	"398": [0, 1, 1],
 	"399": [0, 1, 1],
 	"400": [0, 1, 1],
 	"401": [0, 1, 1],
 	"402": [0, 1, 1],
+	"403": [0, 1, 1],
+	"404": [0, 1, 1],
+	"405": [0, 1, 1],
 	"406": [0, 1, 1],
 	"407": [0, 1, 1],
 	"412-sandy": [2, 2, 2],
@@ -344,8 +371,12 @@
 	"413-trash": [1, 1, 1],
 	"413-sandy": [1, 1, 1],
 	"414": [0, 1, 1],
+	"417": [0, 1, 1],
 	"418": [0, 1, 1],
 	"419": [0, 1, 1],
+	"420": [0, 1, 1],
+	"421-overcast": [0, 1, 1],
+	"421-sunshine": [0, 1, 1],
 	"422-west": [1, 1, 1],
 	"422-east": [1, 1, 1],
 	"423-west": [1, 1, 1],
@@ -369,6 +400,7 @@
 	"444": [1, 1, 1],
 	"445-mega": [1, 1, 1],
 	"445": [1, 1, 1],
+	"446": [0, 1, 1],
 	"447": [1, 1, 1],
 	"448-mega": [1, 1, 1],
 	"448": [1, 1, 1],
@@ -392,6 +424,7 @@
 	"474": [0, 1, 1],
 	"475-mega": [0, 2, 2],
 	"475": [0, 1, 1],
+	"476": [0, 1, 1],
 	"478": [0, 2, 1],
 	"479-heat": [0, 1, 1],
 	"479-wash": [0, 1, 1],
@@ -416,11 +449,22 @@
 	"495": [0, 1, 1],
 	"496": [0, 1, 1],
 	"497": [0, 1, 1],
+	"498": [0, 1, 1],
+	"499": [0, 1, 1],
+	"500": [0, 1, 1],
 	"501": [0, 1, 1],
 	"502": [0, 1, 1],
 	"503": [0, 1, 1],
+	"511": [0, 1, 1],
+	"512": [0, 1, 1],
+	"513": [0, 1, 1],
+	"514": [0, 1, 1],
+	"515": [0, 1, 1],
+	"516": [0, 1, 1],
 	"517": [0, 1, 1],
 	"518": [0, 1, 1],
+	"522": [0, 1, 1],
+	"523": [0, 1, 1],
 	"524": [0, 1, 1],
 	"525": [0, 1, 1],
 	"526": [0, 2, 2],
@@ -433,6 +477,9 @@
 	"532": [0, 1, 1],
 	"533": [0, 1, 1],
 	"534": [0, 1, 1],
+	"535": [0, 1, 1],
+	"536": [0, 1, 1],
+	"537": [0, 1, 1],
 	"538": [0, 1, 1],
 	"539": [0, 2, 2],
 	"540": [0, 1, 1],
@@ -448,17 +495,23 @@
 	"551": [0, 1, 1],
 	"552": [0, 1, 1],
 	"553": [0, 1, 1],
+	"554": [0, 1, 1],
+	"555": [0, 1, 1],
+	"555-zen": [0, 1, 1],
 	"556": [0, 1, 1],
 	"559": [1, 1, 1],
 	"560": [1, 1, 1],
 	"562": [0, 1, 1],
 	"563": [0, 1, 1],
+	"566": [0, 1, 1],
+	"567": [0, 1, 1],
 	"568": [0, 2, 2],
 	"569-gigantamax": [0, 1, 1],
 	"569": [0, 1, 1],
 	"570": [0, 1, 1],
 	"571": [0, 1, 1],
 	"572": [0, 1, 1],
+	"573": [0, 1, 1],
 	"577": [1, 1, 1],
 	"578": [1, 1, 1],
 	"579": [1, 1, 1],
@@ -499,6 +552,7 @@
 	"621": [0, 1, 1],
 	"622": [0, 1, 1],
 	"623": [0, 1, 1],
+	"626": [0, 1, 1],
 	"631": [0, 2, 2],
 	"632": [0, 1, 1],
 	"633": [0, 1, 1],
@@ -507,6 +561,11 @@
 	"636": [0, 1, 1],
 	"637": [0, 1, 1],
 	"640": [0, 1, 1],
+	"643": [0, 1, 1],
+	"644": [0, 1, 1],
+	"646-black": [0, 1, 1],
+	"646-white": [0, 1, 1],
+	"646": [0, 1, 1],
 	"647-resolute": [0, 1, 1],
 	"647-ordinary": [0, 1, 1],
 	"648-aria": [0, 1, 1],
@@ -526,9 +585,9 @@
 	"664": [0, 1, 1],
 	"665": [0, 1, 1],
 	"666-archipelago": [0, 1, 1],
-	"666-continental": [0, 1, 2],
+	"666-continental": [0, 1, 1],
 	"666-elegant": [0, 1, 1],
-	"666-fancy": [0, 2, 2],
+	"666-fancy": [0, 1, 1],
 	"666-garden": [0, 1, 1],
 	"666-high-plains": [0, 1, 1],
 	"666-icy-snow": [0, 1, 1],
@@ -538,14 +597,14 @@
 	"666-modern": [0, 1, 1],
 	"666-monsoon": [0, 1, 1],
 	"666-ocean": [0, 1, 1],
-	"666-poke-ball": [0, 1, 2],
+	"666-poke-ball": [0, 1, 1],
 	"666-polar": [0, 1, 1],
-	"666-river": [0, 2, 1],
+	"666-river": [0, 1, 1],
 	"666-sandstorm": [0, 1, 1],
 	"666-savanna": [0, 1, 1],
 	"666-sun": [0, 1, 1],
 	"666-tundra": [0, 1, 1],
-	"669-red": [0, 2, 1],
+	"669-red": [0, 1, 1],
 	"669-blue": [0, 2, 2],
 	"669-white": [0, 1, 1],
 	"669-yellow": [0, 2, 1],
@@ -583,6 +642,8 @@
 	"689": [0, 1, 1],
 	"690": [0, 1, 1],
 	"691": [0, 1, 1],
+	"692": [0, 1, 1],
+	"693": [0, 1, 1],
 	"696": [0, 1, 1],
 	"697": [0, 1, 1],
 	"698": [0, 1, 1],
@@ -600,7 +661,7 @@
 	"712": [0, 1, 1],
 	"713": [0, 1, 1],
 	"714": [0, 1, 1],
-	"715": [0, 2, 2],
+	"715": [0, 1, 1],
 	"716-active": [0, 1, 1],
 	"716-neutral": [0, 1, 1],
 	"717": [0, 1, 1],
@@ -613,6 +674,8 @@
 	"735": [0, 1, 1],
 	"742": [0, 2, 2],
 	"743": [0, 2, 2],
+	"746": [0, 1, 1],
+	"746-school": [0, 1, 1],
 	"747": [0, 1, 1],
 	"748": [0, 1, 1],
 	"751": [0, 1, 1],
@@ -651,6 +714,10 @@
 	"778-busted": [0, 1, 1],
 	"778-disguised": [0, 1, 1],
 	"779": [0, 1, 1],
+	"780": [0, 1, 1],
+	"782": [0, 1, 1],
+	"783": [0, 1, 1],
+	"784": [0, 1, 1],
 	"789": [1, 1, 1],
 	"790": [0, 1, 1],
 	"791-radiant-sun": [0, 1, 1],
@@ -683,6 +750,11 @@
 	"830": [0, 1, 1],
 	"835": [0, 1, 1],
 	"836": [0, 2, 2],
+	"840": [0, 1, 1],
+	"841-gigantamax": [0, 1, 1],
+	"841": [0, 1, 1],
+	"842-gigantamax": [0, 1, 1],
+	"842": [0, 1, 1],
 	"850": [0, 1, 1],
 	"851-gigantamax": [0, 1, 1],
 	"851": [0, 1, 1],
@@ -692,7 +764,7 @@
 	"857": [0, 2, 2],
 	"858-gigantamax": [0, 1, 1],
 	"858": [0, 1, 1],
-	"859": [0, 2, 2],
+	"859": [0, 1, 1],
 	"860": [0, 1, 1],
 	"861-gigantamax": [0, 1, 1],
 	"861": [0, 1, 1],
@@ -700,6 +772,7 @@
 	"863": [0, 1, 1],
 	"864": [0, 1, 1],
 	"867": [0, 1, 1],
+	"871": [0, 1, 1],
 	"872": [1, 1, 1],
 	"873": [1, 1, 1],
 	"876-female": [0, 1, 1],
@@ -798,14 +871,18 @@
 	"1007-apex-build": [0, 2, 2],
 	"1008-ultimate-mode": [1, 1, 1],
 	"1010": [0, 1, 1],
+	"1011": [0, 1, 1],
 	"1012-counterfeit": [0, 1, 1],
 	"1013-unremarkable": [0, 1, 1],
 	"1018": [0, 1, 1],
+	"1019": [0, 1, 1],
 	"1022": [0, 1, 1],
 	"1023": [0, 1, 1],
 	"2026": [0, 1, 1],
 	"2027": [0, 1, 1],
 	"2028": [0, 1, 1],
+	"2037": [0, 1, 1],
+	"2038": [0, 1, 1],
 	"2052": [0, 1, 1],
 	"2053": [0, 1, 1],
 	"2103": [0, 1, 1],
@@ -880,12 +957,20 @@
 		"307": [0, 1, 1],
 		"308": [0, 1, 1],
 		"315": [0, 1, 1],
+		"332": [0, 1, 1], 
 		"369": [0, 1, 1],
+		"396": [0, 1, 1],
+		"397": [0, 1, 1],
+		"398": [0, 1, 1],
 		"399": [0, 1, 1],
 		"400": [0, 1, 1],
 		"401": [0, 1, 1],
 		"402": [0, 2, 2],
+		"403": [0, 1, 1],
+		"404": [0, 1, 1],
+		"405": [0, 1, 1],
 		"407": [0, 1, 1],
+		"417": [0, 1, 1],
 		"418": [0, 1, 1],
 		"419": [0, 2, 1],
 		"424": [0, 1, 1],
@@ -937,6 +1022,9 @@
 		"29": [0, 1, 1],
 		"30": [0, 1, 1],
 		"31": [1, 1, 1],
+		"32": [0, 1, 1],
+	    "33": [0, 1, 1],
+	    "34": [0, 1, 1],
 		"35": [0, 1, 1],
 		"36": [0, 2, 1],
 		"37": [0, 1, 1],
@@ -972,6 +1060,8 @@
 		"85": [1, 1, 1],
 		"86": [1, 1, 1],
 		"87": [1, 1, 1],
+		"88": [0, 1, 1],
+		"89": [0, 1, 1],
 		"92": [2, 2, 2],
 		"93": [1, 1, 1],
 		"94-gigantamax": [1, 1, 1],
@@ -1018,6 +1108,8 @@
 		"141": [0, 1, 1],
 		"142-mega": [0, 1, 1],
 		"142": [0, 1, 1],
+		"143-gigantamax": [0, 1, 1],
+		"143": [0, 1, 1],
 		"144": [1, 1, 1],
 		"145": [1, 1, 1],
 		"146": [1, 1, 1],
@@ -1059,6 +1151,9 @@
 		"183": [0, 1, 1],
 		"184": [0, 1, 1],
 		"185": [0, 1, 1],
+		"187": [0, 1, 1],
+		"188": [0, 1, 1],
+		"189": [0, 1, 1],
 		"190": [0, 1, 1],
 		"193": [0, 1, 1],
 		"194": [0, 1, 1],
@@ -1097,6 +1192,8 @@
 		"201-w": [0, 1, 1],
 		"201-o": [0, 1, 1],
 		"203": [0, 1, 1],
+		"204": [0, 1, 1],
+		"205": [0, 1, 1],
 		"206": [0, 1, 1],
 		"207": [0, 1, 1],
 		"211": [0, 1, 1],
@@ -1152,6 +1249,7 @@
 		"291": [2, 2, 2],
 		"292": [2, 2, 2],
 		"298": [0, 1, 1],
+		"299": [0, 1, 1],
 		"300": [1, 1, 1],
 		"301": [1, 1, 1],
 		"302": [0, 1, 1],
@@ -1170,13 +1268,19 @@
 		"310": [0, 1, 1],
 		"311": [1, 1, 1],
 		"312": [0, 1, 1],
+		"313": [0, 1, 1],
+		"314": [0, 1, 1],
 		"315": [0, 1, 1],
 		"320": [0, 1, 1],
 		"321": [0, 1, 1],
+		"325": [0, 1, 1],
+		"326": [0, 1, 1],
 		"327": [0, 1, 1],
 		"328": [0, 1, 1],
 		"329": [0, 1, 1],
 		"330": [0, 1, 1],
+		"331": [0, 1, 1],
+		"332": [0, 1, 1],  
 		"333": [0, 1, 1],
 		"334-mega": [0, 1, 1],
 		"334": [0, 1, 1],
@@ -1188,6 +1292,8 @@
 		"340": [0, 1, 2],
 		"341": [0, 1, 1],
 		"342": [0, 2, 2],
+		"345": [0, 1, 1],
+		"346": [0, 1, 1],
 		"351-rainy": [1, 1, 1],
 		"351-snowy": [1, 1, 1],
 		"351-sunny": [1, 1, 2],
@@ -1236,10 +1342,16 @@
 		"393": [0, 1, 1],
 		"394": [0, 1, 1],
 		"395": [0, 1, 1],
+		"396": [0, 1, 1],
+		"397": [0, 1, 1],
+		"398": [0, 1, 1],
 		"399": [0, 2, 1],
 		"400": [0, 1, 1],
 		"401": [0, 1, 1],
 		"402": [0, 1, 1],
+		"403": [0, 1, 1],
+		"404": [0, 1, 1],
+		"405": [0, 1, 1],
 		"406": [0, 1, 1],
 		"407": [0, 1, 1],
 		"412-sandy": [2, 2, 2],
@@ -1249,8 +1361,12 @@
 		"413-trash": [1, 1, 1],
 		"413-sandy": [1, 1, 1],
 		"414": [0, 1, 1],
+		"417": [0, 1, 1],
 		"418": [0, 1, 1],
 		"419": [0, 1, 1],
+		"420": [0, 1, 1],
+		"421-overcast": [0, 1, 1],
+		"421-sunshine": [0, 1, 1],
 		"422-west": [1, 1, 1],
 		"422-east": [1, 1, 1],
 		"423-west": [1, 1, 1],
@@ -1274,6 +1390,7 @@
 		"444": [1, 1, 1],
 		"445-mega": [1, 1, 1],
 		"445": [1, 1, 1],
+		"446": [0, 1, 1],
 		"447": [1, 1, 1],
 		"448-mega": [1, 1, 1],
 		"448": [1, 1, 1],
@@ -1297,6 +1414,7 @@
 		"474": [0, 1, 1],
 		"475-mega": [0, 2, 2],
 		"475": [0, 1, 1],
+		"476": [0, 1, 1],
 		"478": [0, 2, 1],
 		"479-heat": [0, 1, 1],
 		"479-wash": [0, 1, 1],
@@ -1307,8 +1425,9 @@
 		"480": [1, 1, 1],
 		"481": [1, 1, 1],
 		"482": [1, 1, 1],
-		"485": [0, 1, 1],	"486": [0, 1 , 1
-		] ,"487-altered": [0, 1, 1],
+		"485": [0, 1, 1],	
+		"486": [0, 1 , 1] ,
+		"487-altered": [0, 1, 1],
 		"487-origin": [0, 1, 1],
 		"488": [0, 1, 1],
 		"489": [1, 1, 1],
@@ -1320,11 +1439,22 @@
 		"495": [0, 1, 1],
 		"496": [0, 1, 1],
 		"497": [0, 1, 1],
+		"498": [0, 1, 1],
+		"499": [0, 1, 1],
+		"500": [0, 1, 1],
 		"501": [0, 1, 1],
 		"502": [0, 1, 1],
 		"503": [0, 1, 1],
+		"511": [0, 1, 1],
+		"512": [0, 1, 1],
+		"513": [0, 1, 1],
+		"514": [0, 1, 1],
+		"515": [0, 1, 1],
+		"516": [0, 1, 1],
 		"517": [0, 1, 1],
 		"518": [0, 1, 1],
+		"522": [0, 1, 1],
+		"523": [0, 1, 1],
 		"524": [0, 1, 1],
 		"525": [0, 1, 1],
 		"526": [0, 1, 1],
@@ -1337,6 +1467,9 @@
 		"532": [0, 1, 1],
 		"533": [0, 1, 1],
 		"534": [0, 1, 1],
+		"535": [0, 1, 1],
+		"536": [0, 1, 1],
+		"537": [0, 1, 1],
 		"538": [0, 1, 1],
 		"539": [0, 2, 2],
 		"540": [0, 1, 1],
@@ -1352,17 +1485,23 @@
 		"551": [0, 1, 1],
 		"552": [0, 1, 1],
 		"553": [0, 1, 1],
+		"554": [0, 1, 1],
+		"555": [0, 1, 1],
+		"555-zen": [0, 1, 1],
 		"556": [0, 1, 1],
 		"559": [1, 1, 1],
 		"560": [1, 1, 1],
 		"562": [0, 1, 1],
 		"563": [0, 1, 1],
+		"566": [0, 1, 1],
+		"567": [0, 1, 1],
 		"568": [0, 1, 1],
 		"569-gigantamax": [0, 1, 1],
 		"569": [0, 1, 1],
 		"570": [0, 1, 1],
 		"571": [0, 1, 1],
 		"572": [0, 1, 1],
+		"573": [0, 1, 1],
 		"577": [1, 1, 1],
 		"578": [1, 1, 1],
 		"579": [1, 1, 1],
@@ -1397,12 +1536,13 @@
 		"612": [0, 1, 1],
 		"616": [0, 1, 1],
 		"617": [0, 1, 1],
-		"618": [0, 2, 2],
+		"618": [0, 1, 1],
 		"619": [0, 1, 1],
 		"620": [0, 1, 1],
 		"621": [0, 1, 1],
 		"622": [0, 1, 1],
 		"623": [0, 1, 1],
+		"626": [0, 1, 1],
 		"631": [0, 2, 2],
 		"632": [0, 1, 1],
 		"633": [0, 1, 1],
@@ -1411,12 +1551,11 @@
 		"636": [0, 1, 1],
 		"637": [0, 1, 1],
 		"640": [0, 1, 1],
-		"641-incarnate": [0, 0, 0],
-		"641-therian": [0, 0, 0],
-		"642-incarnate": [0, 0, 0],
-		"642-therian": [0, 0, 0],
-		"645-incarnate": [0, 0, 0],
-		"645-therian": [0, 0, 0],
+		"643": [0, 1, 1],
+		"644": [0, 1, 1],
+		"646-black": [0, 1, 1],
+		"646-white": [0, 1, 1],
+		"646": [0, 1, 1],
 		"647-resolute": [0, 1, 1],
 		"647-ordinary": [0, 1, 1],
 		"648-aria": [0, 1, 1],
@@ -1438,7 +1577,7 @@
 		"666-archipelago": [0, 1, 1],
 		"666-continental": [0, 1, 1],
 		"666-elegant": [0, 1, 1],
-		"666-fancy": [0, 2, 2],
+		"666-fancy": [0, 1, 1],
 		"666-garden": [0, 1, 1],
 		"666-high-plains": [0, 1, 1],
 		"666-icy-snow": [0, 1, 1],
@@ -1450,7 +1589,7 @@
 		"666-ocean": [0, 1, 1],
 		"666-poke-ball": [0, 1, 1],
 		"666-polar": [0, 1, 1],
-		"666-river": [0, 2, 1],
+		"666-river": [0, 1, 1],
 		"666-sandstorm": [0, 1, 1],
 		"666-savanna": [0, 1, 1],
 		"666-sun": [0, 1, 1],
@@ -1493,6 +1632,8 @@
 		"689": [0, 1, 1],
 		"690": [0, 1, 1],
 		"691": [0, 1, 1],
+		"692": [0, 1, 1],
+		"693": [0, 1, 1],
 		"696": [0, 1, 1],
 		"697": [0, 1, 1],
 		"698": [0, 1, 1],
@@ -1510,7 +1651,7 @@
 		"712": [0, 1, 1],
 		"713": [0, 1, 1],
 		"714": [0, 1, 1],
-		"715": [0, 2, 2],
+		"715": [0, 1, 1],
 		"716-active": [0, 1, 1],
 		"716-neutral": [0, 1, 1],
 		"717": [0, 1, 1],
@@ -1523,6 +1664,8 @@
 		"735": [0, 1, 1],
 		"742": [0, 2, 2],
 		"743": [0, 2, 2],
+		"746": [0, 1, 1],
+		"746-school": [0, 1, 1],
 		"747": [0, 1, 1],
 		"748": [0, 1, 1],
 		"751": [0, 1, 1],
@@ -1561,6 +1704,10 @@
 		"778-busted": [0, 1, 1],
 		"778-disguised": [0, 1, 1],
 		"779": [0, 1, 1],
+		"780": [0, 1, 1],
+		"782": [0, 1, 1],
+		"783": [0, 1, 1],
+		"784": [0, 1, 1],
 		"789": [1, 1, 1],
 		"790": [0, 1, 1],
 		"791-radiant-sun": [0, 1, 1],
@@ -1593,6 +1740,11 @@
 		"830": [0, 1, 1],
 		"835": [0, 1, 1],
 		"836": [0, 1, 1],
+		"840": [0, 1, 1],
+		"841-gigantamax": [0, 1, 1],
+		"841": [0, 1, 1],
+		"842-gigantamax": [0, 1, 1],
+		"842": [0, 1, 1],
 		"850": [0, 1, 1],
 		"851-gigantamax": [0, 1, 1],
 		"851": [0, 1, 1],
@@ -1610,6 +1762,7 @@
 		"863": [0, 1, 1],
 		"864": [0, 1, 1],
 		"867": [0, 1, 1],
+		"871": [0, 1, 1],
 		"872": [1, 1, 1],
 		"873": [1, 1, 1],
 		"876-female": [0, 1, 1],
@@ -1617,7 +1770,7 @@
 		"877-hangry": [1, 1, 1],
 		"877": [1, 1, 1],
 		"880": [0, 1, 1],
-		"881": [0, 2, 2],
+		"881": [0, 1, 1],
 		"882": [0, 1, 1],
 		"883": [0, 1, 1],
 		"884-gigantamax": [0, 1, 1],
@@ -1708,14 +1861,18 @@
 		"1007-apex-build": [0, 2, 2],
 		"1008-ultimate-mode": [1, 1, 1],
 		"1010": [0, 1, 1],
+		"1011": [0, 1, 1],
 		"1012-counterfeit": [0, 1, 1],
 		"1013-unremarkable": [0, 1, 1],
 		"1018": [0, 1, 1],
+		"1019": [0, 1, 1],
 		"1022": [0, 2, 2],
 		"1023": [0, 1, 1],
 		"2026": [0, 1, 1],
 		"2027": [0, 1, 1],
 		"2028": [0, 1, 1],
+		"2037": [0, 1, 1],
+		"2038": [0, 1, 1],
 		"2052": [0, 1, 1],
 		"2053": [0, 1, 1],
 		"2103": [0, 1, 1],
@@ -1790,12 +1947,20 @@
 			"307": [0, 1, 1],
 			"308": [0, 1, 1],
 			"315": [0, 1, 1],
+			"332": [0, 1, 1], 
 			"369": [0, 1, 1],
+			"396": [0, 1, 1],
+			"397": [0, 1, 1],
+			"398": [0, 1, 1],
 			"399": [0, 2, 1],
 			"400": [0, 1, 1],
 			"401": [0, 1, 1],
 			"402": [0, 1, 1],
+			"403": [0, 1, 1],
+			"404": [0, 1, 1],
+			"405": [0, 1, 1],
 			"407": [0, 1, 1],
+			"417": [0, 1, 1],
 			"418": [0, 2, 2],
 			"419": [0, 1, 1],
 			"424": [0, 1, 1],
@@ -1813,664 +1978,5 @@
 			"593": [1, 1, 1],
 			"6215": [0, 1, 1]
 		}
-	},
-	"exp": {
-		"3-mega": [0, 2, 2],
-		"6-mega-x": [0, 2, 2],
-		"6-mega-y": [0, 2, 2],
-		"80-mega": [0, 1, 1],
-		"94-mega": [2, 2, 2],
-		"127-mega": [0, 1, 1],
-		"130-mega": [0, 1, 1],
-		"142-mega": [0, 1, 1],
-		"150-mega-x": [0, 1, 1],
-		"150-mega-y": [0, 1, 1],
-		"181-mega": [0, 1, 2],
-		"212-mega": [1, 1, 2],
-		"229-mega": [0, 1, 1],
-		"248-mega": [0, 1, 1],
-		"257-mega": [0, 1, 1],
-		"282-mega": [0, 2, 2],
-		"302-mega": [0, 1, 1],
-		"303-mega": [0, 1, 1],
-		"306-mega": [1, 1, 1],
-		"308-mega": [0, 1, 1],
-		"310-mega": [0, 1, 1],
-		"334-mega": [0, 2, 1],
-		"354-mega": [0, 1, 1],
-		"359-mega": [0, 1, 1],
-		"362-mega": [0, 1, 1],
-		"373-mega": [0, 1, 1],
-		"376-mega": [0, 1, 1],
-		"380-mega": [0, 1, 1],
-		"381-mega": [0, 1, 1],
-		"382-primal": [0, 1, 1],
-		"383-primal": [0, 1, 1],
-		"384-mega": [0, 2, 1],
-		"428-mega": [0, 1, 1],
-		"445-mega": [1, 1, 1],
-		"448-mega": [1, 1, 1],
-		"475-mega": [0, 2, 2],
-		"531-mega": [0, 1, 1],
-		"653": [0, 1, 1],
-		"654": [0, 1, 1],
-		"655": [0, 1, 1],
-		"656": [0, 1, 1],
-		"657": [0, 1, 1],
-		"658": [0, 1, 1],
-		"658-ash": [0, 1, 1],
-		"664": [0, 1, 1],
-		"665": [0, 1, 1],
-		"666-archipelago": [0, 1, 1],
-		"666-continental": [0, 1, 1],
-		"666-elegant": [0, 1, 1],
-		"666-fancy": [0, 2, 2],
-		"666-garden": [0, 1, 1],
-		"666-high-plains": [0, 1, 1],
-		"666-icy-snow": [0, 1, 1],
-		"666-jungle": [0, 1, 1],
-		"666-marine": [0, 1, 1],
-		"666-meadow": [0, 2, 2],
-		"666-modern": [0, 1, 1],
-		"666-monsoon": [0, 1, 1],
-		"666-ocean": [0, 1, 1],
-		"666-poke-ball": [0, 1, 2],
-		"666-polar": [0, 1, 1],
-		"666-river": [0, 2, 1],
-		"666-sandstorm": [0, 1, 1],
-		"666-savanna": [0, 1, 1],
-		"666-sun": [0, 1, 1],
-		"666-tundra": [0, 1, 1],
-		"669-red": [0, 2, 2],
-		"669-blue": [0, 1, 1],
-		"669-white": [0, 1, 1],
-		"669-yellow": [0, 1, 1],
-		"669-orange": [0, 2, 2],
-		"670-white": [0, 1, 1],
-		"670-blue": [0, 1, 1],
-		"670-orange": [0, 1, 1],
-		"670-red": [0, 1, 1],
-		"670-yellow": [0, 1, 1],
-		"671-red": [0, 1, 2],
-		"671-blue": [0, 1, 2],
-		"671-yellow": [0, 1, 1],
-		"671-white": [0, 1, 2],
-		"671-orange": [0, 1, 2],
-		"672": [0, 1, 1],
-		"673": [0, 1, 1],
-		"676": [0, 1, 1],
-		"677": [0, 1, 1],
-		"678-female": [0, 1, 1],
-		"678": [0, 1, 1],
-		"682": [0, 1, 1],
-		"683": [0, 1, 1],
-		"684": [0, 1, 1],
-		"685": [0, 1, 1],
-		"688": [0, 1, 1],
-		"689": [0, 1, 1],
-		"690": [0, 1, 1],
-		"691": [0, 1, 1],
-		"696": [0, 1, 1],
-		"697": [0, 1, 1],
-		"698": [0, 1, 1],
-		"699": [0, 1, 1],
-		"700": [0, 1, 1],
-		"702": [0, 1, 1],
-		"703": [0, 1, 1],
-		"704": [0, 1, 1],
-		"705": [0, 1, 1],
-		"706": [0, 1, 1],
-		"708": [0, 1, 1],
-		"709": [0, 1, 1],
-		"710": [0, 1, 1],
-		"711": [1, 1, 1],
-		"712": [0, 1, 1],
-		"713": [0, 1, 1],
-		"714": [0, 1, 1],
-		"715": [0, 2, 1],
-		"716-active": [0, 1, 1],
-		"716-neutral": [0, 1, 1],
-		"717": [0, 2, 2],
-		"720-unbound": [1, 1, 1],
-		"720": [1, 1, 1],
-		"728": [0, 1, 1],
-		"729": [0, 2, 2],
-		"730": [0, 2, 1],
-		"734": [0, 1, 1],
-		"735": [0, 1, 1],
-		"742": [0, 2, 2],
-		"743": [0, 2, 2],
-		"747": [0, 2, 2],
-		"748": [0, 1, 1],
-		"751": [0, 1, 1],
-		"752": [0, 1, 1],
-		"753": [0, 1, 1],
-		"754": [0, 2, 2],
-		"755": [0, 1, 1],
-		"756": [0, 1, 1],
-		"761": [0, 1, 1],
-		"762": [0, 1, 1],
-		"763": [0, 1, 1],
-		"767": [0, 1, 1],
-		"768": [0, 1, 1],
-		"770": [0, 0, 0],
-		"771": [0, 2, 2],
-		"772": [0, 1, 1],
-		"773-fighting": [0, 1, 1],
-		"773-psychic": [0, 1, 1],
-		"773-poison": [0, 1, 1],
-		"773-ground": [0, 1, 1],
-		"773-ghost": [0, 1, 1],
-		"773-steel": [0, 1, 1],
-		"773-rock": [0, 1, 1],
-		"773-grass": [0, 1, 1],
-		"773-dragon": [0, 1, 1],
-		"773-bug": [0, 1, 1],
-		"773-ice": [0, 1, 1],
-		"773-dark": [0, 1, 1],
-		"773": [0, 1, 1],
-		"773-fairy": [0, 1, 1],
-		"773-water": [0, 1, 1],
-		"773-electric": [0, 1, 1],
-		"773-flying": [0, 1, 1],
-		"773-fire": [0, 1, 1],
-		"776": [0, 1, 1],
-		"777": [0, 1, 1],
-		"778-busted": [0, 1, 1],
-		"778-disguised": [0, 1, 1],
-		"779": [0, 1, 1],
-		"789": [1, 1, 1],
-		"790": [0, 1, 1],
-		"791": [2, 1, 1],
-		"792": [0, 1, 1],
-		"793": [0, 2, 2],
-		"797": [0, 1, 1],
-		"798": [0, 1, 1],
-		"800-dawn-wings": [0, 1, 1],
-		"800-dusk-mane": [0, 1, 1],
-		"800-ultra": [0, 1, 1],
-		"800": [0, 1, 1],
-		"802": [1, 1, 1],
-		"803": [0, 1, 1],
-		"804": [0, 1, 1],
-		"807": [0, 1, 1],
-		"808": [0, 1, 1],
-		"809": [0, 1, 1],
-		"816": [0, 1, 1],
-		"817": [0, 1, 1],
-		"818": [1, 1, 1],
-		"821": [0, 2, 2],
-		"822": [0, 1, 1],
-		"823": [0, 1, 1],
-		"829": [0, 1, 1],
-		"830": [0, 1, 1],
-		"835": [0, 1, 1],
-		"836": [0, 2, 2],
-		"850": [0, 1, 1],
-		"851": [0, 1, 1],
-		"854": [0, 1, 1],
-		"855": [0, 1, 1],
-		"856": [0, 1, 1],
-		"857": [0, 2, 2],
-		"858": [0, 1, 1],
-		"859": [0, 1, 1],
-		"860": [0, 1, 1],
-		"861": [0, 1, 1],
-		"862": [0, 1, 1],
-		"863": [0, 1, 1],
-		"864": [0, 1, 1],
-		"867": [0, 1, 1],
-		"872": [1, 1, 1],
-		"873": [1, 1, 1],
-		"876-female": [0, 1, 1],
-		"876": [0, 1, 1],
-		"877-hangry": [1, 1, 1],
-		"877": [1, 1, 1],
-		"880": [0, 1, 1],
-		"881": [0, 1, 1],
-		"882": [0, 2, 1],
-		"883": [0, 1, 1],
-		"884": [0, 1, 1],
-		"885": [1, 1, 1],
-		"886": [1, 1, 1],
-		"887": [1, 1, 1],
-		"888": [0, 1, 1],
-		"888-crowned": [0, 1, 1],
-		"889": [0, 1, 1],
-		"889-crowned": [0, 1, 1],
-		"890": [0, 2, 1],
-		"890-eternamax": [0, 1, 1],
-		"891": [1, 1, 1],
-		"892-rapid-strike": [1, 1, 1],
-		"892": [1, 1, 1],
-		"894": [0, 1, 1],
-		"895": [0, 1, 1],
-		"896": [1, 1, 1],
-		"897": [1, 1, 1],
-		"898": [1, 1, 1],
-		"898-ice": [1, 1, 1],
-		"898-shadow": [1, 1, 1],
-		"900": [0, 1, 1],
-		"901": [0, 1, 1],
-		"903": [0, 1, 1],
-		"909": [0, 1, 1],
-		"910": [0, 2, 2],
-		"911": [0, 2, 2],
-		"912": [0, 1, 2],
-		"913": [0, 1, 2],
-		"914": [0, 2, 1],
-		"919": [1, 1, 1],
-		"920": [1, 1, 1],
-		"924": [1, 1, 1],
-		"925-four": [1, 2, 2],
-		"925-three": [1, 2, 2],
-		"932": [0, 2, 2],
-		"933": [0, 2, 2],
-		"934": [0, 1, 1],
-		"935": [1, 1, 2],
-		"936": [2, 2, 2],
-		"937": [2, 2, 2],
-		"940": [0, 1, 1],
-		"941": [0, 1, 1],
-		"944": [0, 1, 1],
-		"945": [0, 1, 1],
-		"948": [0, 1, 1],
-		"949": [0, 1, 1],
-		"951": [0, 1, 1],
-		"952": [0, 1, 1],
-		"953": [0, 1, 1],
-		"954": [0, 1, 1],
-		"957": [2, 2, 2],
-		"958": [2, 2, 2],
-		"959": [2, 2, 2],
-		"962": [1, 1, 1],
-		"967": [0, 1, 1],
-		"968": [0, 1, 1],
-		"969": [0, 1, 1],
-		"970": [0, 1, 1],
-		"973": [1, 1, 1],
-		"974": [0, 1, 1],
-		"975": [0, 1, 1],
-		"978-curly": [0, 2, 2],
-		"978-droopy": [0, 2, 2],
-		"978-stretchy": [0, 2, 2],
-		"979": [2, 2, 2],
-		"981": [0, 1, 1],
-		"982": [0, 1, 1],
-		"982-three-segment": [0, 1, 1],
-		"987": [1, 1, 1],
-		"988": [0, 1, 2],
-		"993": [0, 1, 1],
-		"994": [0, 1, 2],
-		"995": [0, 1, 1],
-		"996": [0, 1, 1],
-		"997": [0, 2, 2],
-		"998": [0, 2, 2],
-		"999": [2, 1, 1],
-		"1000": [1, 1, 1],
-		"1001": [0, 1, 1],
-		"1003": [0, 1, 1],
-		"1004": [0, 1, 1],
-		"1006": [0, 2, 1],
-		"1007-apex-build": [0, 2, 2],
-		"1008-ultimate-mode": [1, 1, 1],
-		"2026": [0, 1, 1],
-		"2027": [0, 1, 1],
-		"2028": [0, 1, 1],
-		"2052": [0, 1, 1],
-		"2053": [0, 1, 0],
-		"2103": [0, 1, 1],
-		"4052": [0, 1, 1],
-		"4077": [0, 1, 1],
-		"4078": [0, 1, 1],
-		"4079": [0, 1, 1],
-		"4080": [2, 1, 1],
-		"4144": [0, 1, 1],
-		"4145": [0, 1, 1],
-		"4146": [0, 1, 1],
-		"4199": [2, 1, 1],
-		"4222": [0, 1, 1],
-		"4263": [0, 1, 1],
-		"4264": [0, 1, 1],
-		"4562": [0, 1, 1],
-		"6100": [0, 1, 1],
-		"6101": [0, 1, 1],
-		"6215": [0, 1, 1],
-		"6503": [0, 1, 1],
-		"6549": [0, 1, 1],
-		"6570": [0, 1, 1],
-		"6571": [0, 1, 1],
-		"6705": [0, 1, 1],
-		"6706": [0, 1, 1],
-		"6713": [0, 1, 1],
-		"female": {},
-		"back": {
-			"3-mega": [0, 2, 2],
-			"6-mega-x": [0, 2, 2],
-			"6-mega-y": [0, 1, 2],
-			"80-mega": [0, 1, 1],
-			"94-mega": [1, 1, 1],
-			"127-mega": [0, 1, 1],
-			"130-mega": [0, 1, 1],
-			"142-mega": [0, 1, 1],
-			"150-mega-x": [0, 1, 1],
-			"150-mega-y": [0, 1, 1],
-			"181-mega": [0, 1, 2],
-			"212-mega": [1, 2, 2],
-			"229-mega": [0, 1, 1],
-			"248-mega": [0, 2, 1],
-			"257-mega": [0, 1, 1],
-			"282-mega": [0, 1, 1],
-			"302-mega": [0, 1, 1],
-			"303-mega": [0, 1, 1],
-			"306-mega": [1, 1, 1],
-			"308-mega": [0, 1, 1],
-			"310-mega": [0, 1, 1],
-			"334-mega": [0, 1, 1],
-			"354-mega": [0, 1, 1],
-			"359-mega": [0, 1, 1],
-			"362-mega": [0, 1, 1],
-			"373-mega": [0, 1, 1],
-			"376-mega": [0, 1, 1],
-			"380-mega": [0, 1, 1],
-			"381-mega": [0, 1, 1],
-			"382-primal": [0, 1, 1],
-			"383-primal": [0, 1, 1],
-			"384-mega": [0, 1, 1],
-			"428-mega": [0, 1, 1],
-			"445-mega": [1, 1, 1],
-			"448-mega": [1, 1, 1],
-			"475-mega": [0, 2, 2],
-			"531-mega": [0, 1, 1],
-			"653": [0, 1, 1],
-			"654": [0, 1, 1],
-			"655": [0, 1, 1],
-			"656": [0, 1, 1],
-			"657": [0, 1, 1],
-			"658": [0, 1, 1],
-			"658-ash": [0, 1, 1],
-			"664": [0, 1, 1],
-			"665": [0, 2, 1],
-			"666-archipelago": [0, 2, 2],
-			"666-continental": [0, 2, 2],
-			"666-elegant": [0, 2, 2],
-			"666-fancy": [0, 2, 2],
-			"666-garden": [0, 2, 2],
-			"666-high-plains": [0, 2, 2],
-			"666-icy-snow": [0, 2, 2],
-			"666-jungle": [0, 2, 2],
-			"666-marine": [0, 2, 2],
-			"666-meadow": [0, 2, 2],
-			"666-modern": [0, 2, 2],
-			"666-monsoon": [0, 2, 2],
-			"666-ocean": [0, 2, 2],
-			"666-poke-ball": [0, 2, 2],
-			"666-polar": [0, 2, 2],
-			"666-river": [0, 2, 2],
-			"666-sandstorm": [0, 2, 2],
-			"666-savanna": [0, 2, 2],
-			"666-sun": [0, 2, 2],
-			"666-tundra": [0, 2, 2],
-			"669-red": [0, 2, 2],
-			"669-blue": [0, 2, 2],
-			"669-white": [0, 2, 2],
-			"669-yellow": [0, 2, 2],
-			"669-orange": [0, 2, 2],
-			"670-white": [0, 1, 1],
-			"670-blue": [0, 2, 2],
-			"670-orange": [0, 1, 1],
-			"670-red": [0, 1, 1],
-			"670-yellow": [0, 1, 1],
-			"671-red": [0, 1, 1],
-			"671-blue": [0, 1, 1],
-			"671-yellow": [0, 1, 1],
-			"671-white": [0, 1, 1],
-			"671-orange": [0, 1, 1],
-			"672": [0, 1, 1],
-			"673": [0, 1, 1],
-			"676": [0, 1, 1],
-			"677": [0, 1, 1],
-			"678-female": [0, 1, 1],
-			"678": [0, 1, 1],
-			"682": [0, 1, 1],
-			"683": [0, 1, 1],
-			"684": [0, 1, 1],
-			"685": [0, 1, 1],
-			"688": [0, 1, 1],
-			"689": [0, 1, 1],
-			"690": [0, 1, 1],
-			"691": [0, 1, 1],
-			"696": [0, 1, 1],
-			"697": [0, 1, 1],
-			"698": [0, 1, 1],
-			"699": [0, 2, 2],
-			"700": [0, 1, 1],
-			"702": [0, 1, 1],
-			"703": [0, 1, 1],
-			"704": [0, 1, 1],
-			"705": [0, 1, 1],
-			"706": [0, 1, 1],
-			"708": [0, 1, 1],
-			"709": [0, 1, 1],
-			"710": [0, 1, 1],
-			"711": [1, 1, 1],
-			"712": [0, 1, 1],
-			"713": [0, 1, 1],
-			"714": [0, 1, 1],
-			"715": [0, 1, 1],
-			"716-active": [0, 1, 1],
-			"716-neutral": [0, 1, 1],
-			"717": [0, 1, 1],
-			"720-unbound": [1, 1, 1],
-			"720": [1, 1, 1],
-			"728": [0, 1, 1],
-			"729": [0, 2, 2],
-			"730": [0, 2, 1],
-			"734": [0, 1, 1],
-			"735": [0, 1, 1],
-			"742": [0, 2, 2],
-			"743": [0, 2, 2],
-			"747": [0, 2, 2],
-			"748": [0, 1, 1],
-			"751": [0, 1, 1],
-			"752": [0, 1, 1],
-			"753": [0, 1, 1],
-			"754": [0, 2, 2],
-			"755": [0, 1, 1],
-			"756": [0, 1, 1],
-			"761": [0, 1, 1],
-			"762": [0, 1, 1],
-			"763": [0, 1, 1],
-			"767": [0, 1, 1],
-			"768": [0, 1, 1],
-			"771": [0, 1, 1],
-			"772": [0, 1, 1],
-			"773-fighting": [0, 1, 1],
-			"773-psychic": [0, 1, 1],
-			"773-poison": [0, 1, 1],
-			"773-ground": [0, 1, 1],
-			"773-ghost": [0, 1, 1],
-			"773-steel": [0, 1, 1],
-			"773-rock": [0, 1, 1],
-			"773-grass": [0, 1, 1],
-			"773-dragon": [0, 1, 1],
-			"773-bug": [0, 1, 1],
-			"773-ice": [0, 1, 1],
-			"773-dark": [0, 1, 1],
-			"773": [0, 1, 1],
-			"773-fairy": [0, 1, 1],
-			"773-water": [0, 1, 1],
-			"773-electric": [0, 1, 1],
-			"773-flying": [0, 1, 1],
-			"773-fire": [0, 1, 1],
-			"776": [0, 2, 2],
-			"777": [0, 1, 1],
-			"778-busted": [0, 1, 1],
-			"778-disguised": [0, 1, 1],
-			"779": [0, 1, 1],
-			"789": [1, 1, 1],
-			"790": [0, 1, 1],
-			"791": [1, 1, 1],
-			"792": [0, 1, 1],
-			"793": [0, 1, 1],
-			"797": [0, 1, 1],
-			"798": [0, 1, 1],
-			"800-dawn-wings": [0, 1, 1],
-			"800-dusk-mane": [0, 1, 1],
-			"800-ultra": [0, 1, 1],
-			"800": [0, 1, 1],
-			"802": [1, 1, 1],
-			"803": [0, 1, 1],
-			"804": [0, 1, 1],
-			"807": [0, 1, 1],
-			"808": [0, 1, 1],
-			"809": [0, 1, 1],
-			"816": [0, 1, 1],
-			"817": [0, 1, 1],
-			"818": [0, 1, 1],
-			"821": [0, 1, 1],
-			"822": [0, 1, 1],
-			"823": [0, 1, 1],
-			"829": [0, 1, 1],
-			"830": [0, 1, 1],
-			"835": [0, 1, 1],
-			"836": [0, 1, 1],
-			"850": [0, 1, 1],
-			"851": [0, 1, 1],
-			"854": [0, 1, 1],
-			"855": [0, 1, 1],
-			"856": [0, 1, 1],
-			"857": [0, 2, 2],
-			"858": [0, 1, 1],
-			"859": [0, 1, 1],
-			"860": [0, 1, 1],
-			"861": [0, 1, 1],
-			"862": [0, 1, 1],
-			"863": [0, 1, 1],
-			"864": [0, 1, 1],
-			"867": [0, 1, 1],
-			"872": [1, 1, 1],
-			"873": [1, 1, 1],
-			"876-female": [0, 1, 1],
-			"876": [0, 1, 1],
-			"877-hangry": [1, 1, 1],
-			"877": [1, 1, 1],
-			"880": [0, 1, 1],
-			"881": [0, 1, 1],
-			"882": [0, 1, 1],
-			"883": [0, 1, 1],
-			"884": [0, 1, 1],
-			"885": [1, 1, 1],
-			"886": [1, 1, 1],
-			"887": [1, 1, 1],
-			"888": [0, 1, 1],
-			"888-crowned": [0, 1, 1],
-			"889": [0, 1, 1],
-			"889-crowned": [0, 1, 1],
-			"890": [0, 1, 1],
-			"891": [1, 1, 1],
-			"892-rapid-strike": [1, 1, 1],
-			"892": [1, 1, 1],
-			"894": [0, 1, 1],
-			"895": [0, 1, 1],
-			"896": [1, 1, 1],
-			"897": [1, 1, 1],
-			"898": [1, 1, 1],
-			"898-ice": [1, 1, 1],
-			"898-shadow": [1, 1, 1],
-			"900": [0, 1, 1],
-			"901": [0, 1, 1],
-			"903": [0, 1, 1],
-			"909": [0, 1, 1],
-			"910": [0, 2, 2],
-			"911": [0, 1, 1],
-			"912": [0, 1, 1],
-			"913": [0, 1, 1],
-			"914": [0, 2, 2],
-			"919": [1, 1, 1],
-			"920": [1, 1, 1],
-			"924": [1, 1, 1],
-			"925-four": [1, 2, 2],
-			"925-three": [1, 2, 2],
-			"932": [0, 1, 1],
-			"933": [0, 1, 1],
-			"934": [0, 1, 1],
-			"935": [2, 2, 2],
-			"936": [2, 2, 2],
-			"937": [2, 2, 2],
-			"940": [0, 1, 1],
-			"941": [0, 1, 1],
-			"944": [0, 1, 1],
-			"945": [0, 1, 1],
-			"948": [0, 1, 1],
-			"949": [0, 1, 1],
-			"951": [0, 1, 1],
-			"952": [0, 2, 1],
-			"953": [0, 1, 1],
-			"954": [0, 1, 1],
-			"957": [1, 1, 1],
-			"958": [1, 1, 1],
-			"959": [1, 1, 1],
-			"962": [1, 1, 1],
-			"967": [0, 1, 1],
-			"968": [0, 2, 2],
-			"969": [0, 1, 1],
-			"970": [0, 1, 1],
-			"973": [1, 1, 1],
-			"974": [0, 1, 1],
-			"975": [0, 1, 1],
-			"978-curly": [0, 2, 2],
-			"978-droopy": [0, 2, 2],
-			"978-stretchy": [0, 1, 1],
-			"979": [1, 1, 1],
-			"981": [0, 1, 1],
-			"982": [0, 1, 1],
-			"982-three-segment": [0, 1, 1],
-			"987": [1, 1, 1],
-			"988": [0, 1, 1],
-			"993": [0, 1, 1],
-			"994": [0, 1, 1],
-			"995": [0, 1, 1],
-			"996": [0, 1, 1],
-			"997": [0, 1, 1],
-			"998": [0, 1, 1],
-			"999": [1, 1, 1],
-			"1000": [1, 1, 1],
-			"1001": [0, 1, 1],
-			"1003": [0, 1, 1],
-			"1004": [0, 1, 1],
-			"1006": [0, 2, 2],
-			"1007-apex-build": [0, 2, 2],
-			"1008-ultimate-mode": [1, 1, 1],
-			"2026": [0, 1, 1],
-			"2027": [0, 1, 1],
-			"2028": [0, 1, 1],
-			"2052": [0, 1, 1],
-			"2053": [0, 1, 1],
-			"2103": [0, 1, 1],
-			"4052": [0, 1, 1],
-			"4077": [0, 1, 1],
-			"4078": [0, 1, 1],
-			"4079": [0, 1, 1],
-			"4080": [2, 2, 2],
-			"4144": [0, 1, 1],
-			"4145": [0, 1, 1],
-			"4146": [0, 1, 1],
-			"4199": [2, 1, 1],
-			"4222": [0, 1, 1],
-			"4263": [0, 1, 1],
-			"4264": [0, 1, 1],
-			"4562": [0, 1, 1],
-			"6100": [0, 1, 1],
-			"6101": [0, 1, 1],
-			"6215": [0, 1, 1],
-			"6503": [0, 1, 1],
-			"6549": [0, 1, 1],
-			"6570": [0, 1, 1],
-			"6571": [0, 1, 1],
-			"6705": [0, 1, 1],
-			"6706": [0, 1, 1],
-			"6713": [0, 1, 1]
-		}
 	}
-}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/1011.json b/public/images/pokemon/variant/back/1011.json
new file mode 100644
index 00000000000..d8cffc4d587
--- /dev/null
+++ b/public/images/pokemon/variant/back/1011.json
@@ -0,0 +1,29 @@
+{
+	"1": {
+		"b09579": "7b91a7",
+		"253922": "232b3a",
+		"fd9477": "63b9b9",
+		"345539": "313d4b",
+		"9c1e2a": "272a52",
+		"7eb36a": "9aa0b3",
+		"9fc164": "9aa0b3",
+		"8e9960": "67698b",
+		"c73030": "2b526f",
+		"e64d3c": "397880",
+		"477d45": "67698b",
+		"61071f": "190e2e"
+	},
+	"2": {
+		"253922": "2e0920",
+		"fd9477": "f3efde",
+		"345539": "4f162a",
+		"9c1e2a": "9c564c",
+		"7eb36a": "e8838d",
+		"9fc164": "e28c95",
+		"8e9960": "9e4553",
+		"c73030": "d1a87e",
+		"e64d3c": "eee0bc",
+		"477d45": "903c4e",
+		"61071f": "4f0a1d"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/1019.json b/public/images/pokemon/variant/back/1019.json
new file mode 100644
index 00000000000..b8e674f2357
--- /dev/null
+++ b/public/images/pokemon/variant/back/1019.json
@@ -0,0 +1,44 @@
+{
+	"1": {
+		"8b1313": "302752",
+		"746739": "582c74",
+		"6ba835": "7a7c9e",
+		"b49779": "9c2e72",
+		"9ce05f": "9aa0b3",
+		"bf2b2e": "abd7e2",
+		"d43e2d": "4e969e",
+		"841111": "302752",
+		"ae2124": "663267",
+		"ff7a59": "69c5c5",
+		"680606": "27103c",
+		"b72629": "2b526f",
+		"b59a7d": "a3b9d0",
+		"3e662b": "313846",
+		"e8cfb4": "c55885",
+		"82664a": "48476c",
+		"a60b0b": "70a2c5",
+		"e9cfb3": "dcebf9",
+		"3c9b3e": "e8edff"
+	},
+	"2": {
+		"8b1313": "413534",
+		"746739": "312374",
+		"6ba835": "a8546e",
+		"b49779": "402622",
+		"9ce05f": "e28c95",
+		"bf2b2e": "e8e5de",
+		"d43e2d": "eedfb8",
+		"841111": "4b211b",
+		"ae2124": "63473b",
+		"ff7a59": "f3efde",
+		"680606": "4b211b",
+		"b72629": "bf9870",
+		"b59a7d": "cbb4af",
+		"3e662b": "341c1c",
+		"e8cfb4": "5d4c45",
+		"82664a": "613838",
+		"a60b0b": "c7c2bc",
+		"e9cfb3": "e2dcd6",
+		"3c9b3e": "5e75e2"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/143-gigantamax.json b/public/images/pokemon/variant/back/143-gigantamax.json
new file mode 100644
index 00000000000..ffe8e7a31cd
--- /dev/null
+++ b/public/images/pokemon/variant/back/143-gigantamax.json
@@ -0,0 +1,62 @@
+{
+    "1": {
+        "101010": "101010",
+        "624120": "544a41",
+        "5e3e1d": "351b52",
+        "31573f": "7b59ba",
+        "54792b": "c06386",
+        "103941": "701a55",
+        "315a7b": "943469",
+        "bd3740": "c94489",
+        "a3704e": "522663",
+        "a47352": "6b6357",
+        "ad7f5f": "b56564",
+        "de5656": "d65a8a",
+        "069f5f": "b083de",
+        "89b432": "f1a1b2",
+        "bbe35b": "f1a1b2",
+        "98a0a0": "98a0a0",
+        "a0a0a0": "a0a0a0",
+        "fc8b9f": "ed7794",
+        "e6c5ac": "cf8880",
+        "f6e6bd": "f0beb1",
+        "c9c9c9": "c9c9c9",
+        "f4f4f4": "f4f4f4",
+        "4d6e27": "5c9bb8",
+        "91ba3d": "6bc7c7",
+        "93bf39": "74c2cf",
+        "bee366": "8de3d7",
+        "d95b7f": "c24a6c",
+        "fc92a6": "fc92a6"
+    },
+    "2": {
+        "101010": "101010",
+        "624120": "ba6632",
+        "5e3e1d": "c2986e",
+        "31573f": "4b4c52",
+        "54792b": "208073",
+        "103941": "93b5c2",
+        "315a7b": "b6d6d9",
+        "bd3740": "9e4619",
+        "a3704e": "e6cda1",
+        "a47352": "cf9d48",
+        "ad7f5f": "284878",
+        "de5656": "bd742b",
+        "069f5f": "7c7c82",
+        "89b432": "37ad82",
+        "bbe35b": "79e0a2",
+        "98a0a0": "53738a",
+        "a0a0a0": "abd1cc",
+        "fc8b9f": "d9a443",
+        "e6c5ac": "27538a",
+        "f6e6bd": "36719c",
+        "c9c9c9": "b4d3d9",
+        "f4f4f4": "f4f4f4",
+        "4d6e27": "964117",
+        "91ba3d": "d9a65b",
+        "93bf39": "d9a250",
+        "bee366": "e6cf5e",
+        "d95b7f": "b77727",
+        "fc92a6": "d9b64c"
+    }
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/143.json b/public/images/pokemon/variant/back/143.json
new file mode 100644
index 00000000000..7dc08d72559
--- /dev/null
+++ b/public/images/pokemon/variant/back/143.json
@@ -0,0 +1,32 @@
+{
+    "1": {
+        "000000": "101010",
+        "103a42": "701a55",
+        "315a7b": "943469",
+        "528cad": "ad4b70",
+        "735a21": "91504e",
+        "737373": "756363",
+        "a57352": "b36462",
+        "c59c5a": "b36462",
+        "cecece": "cbc4c4",
+        "e6c5ad": "cf8880",
+        "f7d6bd": "e09f96",
+        "f7e6bd": "f0beb1",
+        "ffffff": "ffffff"
+    },
+    "2": {
+        "000000": "101010",
+        "103a42": "93b5c2",
+        "315a7b": "b6d6d9",
+        "528cad": "d5e8e7",
+        "735a21": "1b2e61",
+        "737373": "525266",
+        "a57352": "1b2e61",
+        "c59c5a": "20386e",
+        "cecece": "bfc7cb",
+        "e6c5ad": "284878",
+        "f7d6bd": "38638f",
+        "f7e6bd": "457ca8",
+        "ffffff": "ffffff"
+    }
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/187.json b/public/images/pokemon/variant/back/187.json
new file mode 100644
index 00000000000..7e0d1dca511
--- /dev/null
+++ b/public/images/pokemon/variant/back/187.json
@@ -0,0 +1,28 @@
+{
+    "1": {
+        "101010": "101010",
+        "425a10": "934200",
+        "52843a": "c27600",
+        "63bd5a": "efac00",
+        "8c083a": "012a3e",
+        "9cde5a": "ffdc46",
+        "b56373": "003e53",
+        "ff7b94": "006d7f",
+        "f79cb5": "00a59b",
+        "ffc500": "e3396c",
+        "ffff00": "ffa8b6"
+    },
+    "2": {
+        "101010": "101010",
+        "425a10": "5f0052",
+        "52843a": "960070",
+        "63bd5a": "960070",
+        "8c083a": "802600",
+        "9cde5a": "e01c75",
+        "b56373": "d8591c",
+        "ff7b94": "fa9600",
+        "f79cb5": "ffc93b",
+        "ffc500": "5ec0ec",
+        "ffff00": "94ecf9"
+    }
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/188.json b/public/images/pokemon/variant/back/188.json
new file mode 100644
index 00000000000..a674bbf244e
--- /dev/null
+++ b/public/images/pokemon/variant/back/188.json
@@ -0,0 +1,30 @@
+{
+    "1": {
+        "000000": "101010",
+        "196b00": "c66b31",
+        "42b521": "e99f23",
+        "63d631": "ffd953",
+        "8c5200": "004269",
+        "8cf74a": "fef579",
+        "b5d6de": "fa9600",
+        "ce8400": "075976",
+        "f7a519": "005883",
+        "ffd600": "046c90",
+        "ffef00": "007b9a",
+        "ffffff": "ffc93b"
+    },
+    "2": {
+        "000000": "101010",
+        "196b00": "2659ad",
+        "42b521": "5293d5",
+        "63d631": "79d5fa",
+        "8c5200": "5f0052",
+        "8cf74a": "a6eafa",
+        "b5d6de": "fa9600",
+        "ce8400": "9d0562",
+        "f7a519": "960070",
+        "ffd600": "ba0071",
+        "ffef00": "e01c75",
+        "ffffff": "ffc93b"
+    }
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/189.json b/public/images/pokemon/variant/back/189.json
new file mode 100644
index 00000000000..ed1e40ed4b3
--- /dev/null
+++ b/public/images/pokemon/variant/back/189.json
@@ -0,0 +1,32 @@
+{
+    "1": {
+        "101010": "101010",
+        "194a73": "b64d21",
+        "29844a": "83839f",
+        "3a73c5": "e19903",
+        "739cff": "fcd936",
+        "84ce7b": "c1bdd1",
+        "8cb5ff": "f9f870",
+        "b58c31": "071a3c",
+        "d6bd5a": "282773",
+        "ded67b": "2192b2",
+        "efe69c": "104f80",
+        "fff7b5": "1379a0",
+        "ffffde": "2faac4"
+    },
+    "2": {
+        "101010": "101010",
+        "194a73": "680054",
+        "29844a": "3887d3",
+        "3a73c5": "980062",
+        "739cff": "d20d6a",
+        "84ce7b": "58c1eb",
+        "8cb5ff": "e4486a",
+        "b58c31": "da5014",
+        "d6bd5a": "f06f22",
+        "ded67b": "fce37b",
+        "efe69c": "ffa747",
+        "fff7b5": "ffd45a",
+        "ffffde": "f9f29b" 
+    }
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/2037.json b/public/images/pokemon/variant/back/2037.json
new file mode 100644
index 00000000000..0d2c02cf980
--- /dev/null
+++ b/public/images/pokemon/variant/back/2037.json
@@ -0,0 +1,22 @@
+{
+    "1": {
+        "151515": "101010",
+        "558b9f": "9f435d",
+        "648082": "6e67b0",
+        "97bdd2": "ffa8b8",
+        "c1d1d2": "b3b8ea",
+        "d9e9f4": "ffd3e1",
+        "fdfdfd": "d7d9f9",
+        "ffffff": "ffffff"
+    },
+    "2": {
+        "151515": "101010",
+        "558b9f": "90215e",
+        "648082": "bf4747",
+        "97bdd2": "da4e75",
+        "c1d1d2": "ffc07b",
+        "d9e9f4": "ff8489",
+        "fdfdfd": "ffe6a0",
+        "ffffff": "ffffff"
+    }
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/2038.json b/public/images/pokemon/variant/back/2038.json
new file mode 100644
index 00000000000..845c45f7887
--- /dev/null
+++ b/public/images/pokemon/variant/back/2038.json
@@ -0,0 +1,36 @@
+{
+    "1": {
+        "101010": "101010",
+        "4d5c78": "394880",
+        "516077": "9f435d",
+        "007ab5": "2380c4",
+        "38858d": "e35ea2",
+        "7a8a9c": "6172ab",
+        "66b3d7": "3dbfe0",
+        "86a8c0": "e27495",
+        "81c2c5": "ff89c0",
+        "bdcbd7": "a7ade7",
+        "a1e1de": "ffb6e5",
+        "b0d3ea": "ffa8b8",
+        "eafefe": "ffd3e1",
+        "fdfdfd": "bec6ef",
+        "ffffff": "ffffff"
+    },
+    "2": {
+        "101010": "101010",
+        "4d5c78": "73174a",
+        "516077": "bb3c3c",
+        "007ab5": "882493",
+        "38858d": "572746",
+        "7a8a9c": "90215e",
+        "66b3d7": "a044ab",
+        "86a8c0": "ff824c",
+        "81c2c5": "75355e",
+        "bdcbd7": "da426d",
+        "a1e1de": "93547c",
+        "b0d3ea": "ffbf6b",
+        "eafefe": "ffe28c",
+        "fdfdfd": "ff6f86",
+        "ffffff": "ffffff"
+    }
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/204.json b/public/images/pokemon/variant/back/204.json
new file mode 100644
index 00000000000..1e4007149cb
--- /dev/null
+++ b/public/images/pokemon/variant/back/204.json
@@ -0,0 +1,16 @@
+{
+	"1": {
+		"52adb5": "a4b76b",
+		"84d6d6": "c1cd7d",
+		"294a7b": "4b7641",
+		"b5eff7": "e3e796",
+		"3a73a5": "74a057"
+	},
+	"2": {
+		"52adb5": "d46b84",
+		"84d6d6": "eda6ae",
+		"294a7b": "700a4b",
+		"b5eff7": "f7dcd7",
+		"3a73a5": "b43469"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/205.json b/public/images/pokemon/variant/back/205.json
new file mode 100644
index 00000000000..5a3e2d61606
--- /dev/null
+++ b/public/images/pokemon/variant/back/205.json
@@ -0,0 +1,22 @@
+{
+	"1": {
+		"847b9c": "103b2c",
+		"e6cef7": "3e7745",
+		"ff9c9c": "ffb356",
+		"c5a5de": "205639",
+		"f76373": "f68b31",
+		"bd2942": "d8681e",
+		"524263": "04211a",
+		"841031": "af3b11"
+	},
+	"2": {
+		"847b9c": "962a41",
+		"e6cef7": "e9b1a0",
+		"ff9c9c": "b0f5ee",
+		"c5a5de": "c86554",
+		"f76373": "6bbfd2",
+		"bd2942": "2c6094",
+		"524263": "691338",
+		"841031": "0e2667"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/248-mega.json b/public/images/pokemon/variant/back/248-mega.json
index 5def1f5a316..c63b19d7c29 100644
--- a/public/images/pokemon/variant/back/248-mega.json
+++ b/public/images/pokemon/variant/back/248-mega.json
@@ -1,28 +1,28 @@
 {
 	"1": {
-		"101010": "101010",
-		"4a5a39": "533334",
-		"accd9c": "c78482",
-		"739c62": "915957",
-		"c5c5c5": "c5c5c5",
-		"942900": "006fbe",
-		"fefefe": "fefefe",
-		"d55200": "0098fc",
-		"737373": "737373",
-		"821610": "004194",
-		"d0243b": "006fbe"
+		"171717": "101010",
+        "4a5a39": "533334",
+        "4b5a3b": "533334",
+        "727272": "727272",
+        "801c17": "533334",
+        "922d00": "004194",
+        "ce283d": "006fb3",
+        "d35200": "0098fc",
+        "729a62": "915957",
+        "739c62": "915957",
+        "aacb9a": "c78482"
 	},
 	"2": {
-		"101010": "101010",
-		"4a5a39": "06092f",
-		"accd9c": "625695",
-		"739c62": "2c3071",
-		"c5c5c5": "c5c5c5",
-		"942900": "ee7b06",
-		"fefefe": "fefefe",
-		"d55200": "ffa904",
-		"737373": "737373",
-		"821610": "ee7b06",
-		"d0243b": "ffa904"
+	"171717": "101010",
+    "4a5a39": "06092f",
+    "4b5a3b": "06092f",
+    "727272": "727272",
+    "801c17": "ee7b06",
+    "922d00": "ee7b06",
+    "ce283d": "ffa904",
+    "d35200": "ffa904",
+    "729a62": "59417c",
+    "739c62": "59417c",
+    "aacb9a": "625695"	
 	}
 }
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/299.json b/public/images/pokemon/variant/back/299.json
new file mode 100644
index 00000000000..3b2cd15e3cd
--- /dev/null
+++ b/public/images/pokemon/variant/back/299.json
@@ -0,0 +1,28 @@
+{
+    "1": {
+        "000000": "101010",
+        "5a1921": "1f3a30",
+        "31314a": "6b2710",
+        "9c314a": "30594a",
+        "de5252": "487c60",
+        "ff6b7b": "5a9170",
+        "42529c": "a14020",
+        "637bbd": "c66831",
+        "ff9494": "7fbc7a",
+        "8ca5e6": "db8644",
+        "adbdf7": "e09a65"
+    },
+    "2": {
+        "000000": "101010",
+        "5a1921": "28163a",
+        "31314a": "38619e",
+        "9c314a": "452b5e",
+        "de5252": "584282",
+        "ff6b7b": "675398",
+        "42529c": "68a2cd",
+        "637bbd": "99e4ee",
+        "ff9494": "7282c4",
+        "8ca5e6": "dcfff8",
+        "adbdf7": "f3fff6"
+    }
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/313.json b/public/images/pokemon/variant/back/313.json
new file mode 100644
index 00000000000..65a1cfe9eae
--- /dev/null
+++ b/public/images/pokemon/variant/back/313.json
@@ -0,0 +1,28 @@
+{
+	"1": {
+		"a5b5c5": "eea256",
+		"4a4a52": "9c1200",
+		"deb552": "ffda31",
+		"7b8ca5": "d66d38",
+		"ce3a52": "491c22",
+		"f78473": "643a35",
+		"8c6b52": "845c46",
+		"ffe652": "fffa52",
+		"8c314a": "2b1419",
+		"8c8c94": "ff3b21",
+		"e65263": "57272c"
+	},
+	"2": {
+		"a5b5c5": "3a767b",
+		"4a4a52": "175614",
+		"deb552": "b6d479",
+		"7b8ca5": "1e5256",
+		"ce3a52": "1585cc",
+		"f78473": "77d4ee",
+		"8c6b52": "5c713d",
+		"ffe652": "dde6b1",
+		"8c314a": "0c4275",
+		"8c8c94": "0ba905",
+		"e65263": "32b0ff"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/314.json b/public/images/pokemon/variant/back/314.json
new file mode 100644
index 00000000000..f77165c7b15
--- /dev/null
+++ b/public/images/pokemon/variant/back/314.json
@@ -0,0 +1,30 @@
+{
+	"1": {
+		"9c8452": "ac6f0e",
+		"5a6b8c": "9a4013",
+		"8cadce": "d66d38",
+		"ce8cde": "6a342c",
+		"ffe673": "fbf650",
+		"7b7b7b": "b82b18",
+		"e6b54a": "efcb26",
+		"3a3a3a": "6b180d",
+		"9c52bd": "57272c",
+		"adc5ef": "eea256",
+		"3a3152": "2d0723",
+		"6b5a94": "2b1419"
+	},
+	"2": {
+		"9c8452": "074656",
+		"5a6b8c": "70a84f",
+		"8cadce": "c1db9c",
+		"ce8cde": "77d4ee",
+		"ffe673": "3dc5d3",
+		"7b7b7b": "155870",
+		"e6b54a": "019792",
+		"3a3a3a": "0a2934",
+		"9c52bd": "43a3df",
+		"adc5ef": "e5edcc",
+		"3a3152": "051b37",
+		"6b5a94": "255b95"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/32.json b/public/images/pokemon/variant/back/32.json
new file mode 100644
index 00000000000..473edcae2af
--- /dev/null
+++ b/public/images/pokemon/variant/back/32.json
@@ -0,0 +1,34 @@
+{
+    "1": {
+        "101010": "101010",
+        "006342": "273161",
+        "63426b": "944f25",
+        "b51900": "28678a",
+        "de4229": "42adc1",
+        "ff6b52": "78d6d3",
+        "00a573": "3b4d7a",
+        "9c4aad": "ab5c24",
+        "bd63c5": "cf863e",
+        "19ce9c": "55729e",
+        "e69cd6": "e0c151",
+        "efbdef": "ede4ab",
+        "cecece": "cecece",
+        "ffffff": "ffffff"
+    },
+    "2": {
+        "101010": "101010",
+        "006342": "b0384a",
+        "63426b": "142440",
+        "b51900": "b86527",
+        "de4229": "e1b13b",
+        "ff6b52": "eddd95",
+        "00a573": "d65e64",
+        "9c4aad": "133257",
+        "bd63c5": "253f5e",
+        "19ce9c": "ed938e",
+        "e69cd6": "375c73",
+        "efbdef": "5d91a1",
+        "cecece": "cecece",
+        "ffffff": "ffffff"
+    }
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/325.json b/public/images/pokemon/variant/back/325.json
new file mode 100644
index 00000000000..1918b48adfd
--- /dev/null
+++ b/public/images/pokemon/variant/back/325.json
@@ -0,0 +1,24 @@
+{
+	"1": {
+		"ef84ad": "5ca0b5",
+		"f7a5bd": "6ac5c8",
+		"c5637b": "3c6b95",
+		"ffd6e6": "b4e6e7",
+		"7b7b8c": "559b43",
+		"5a5a73": "2e7320",
+		"a5a5ad": "b5d780",
+		"a53a42": "2b4d7d",
+		"3a4252": "18340c"
+	},
+	"2": {
+		"ef84ad": "1f6759",
+		"f7a5bd": "379a85",
+		"c5637b": "144844",
+		"ffd6e6": "8dd6ab",
+		"7b7b8c": "dca878",
+		"5a5a73": "a7724a",
+		"a5a5ad": "fbe3a3",
+		"a53a42": "0c2625",
+		"3a4252": "72442d"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/326.json b/public/images/pokemon/variant/back/326.json
new file mode 100644
index 00000000000..eb1c4954208
--- /dev/null
+++ b/public/images/pokemon/variant/back/326.json
@@ -0,0 +1,30 @@
+{
+	"1": {
+		"9c9ca5": "7ecdd1",
+		"d684ce": "7bb15b",
+		"636373": "3c6b95",
+		"6b426b": "559b43",
+		"ce5a7b": "d06d50",
+		"a5425a": "a84331",
+		"f7a5b5": "f7d1a0",
+		"ef7b94": "e99e76",
+		"bd63ad": "559b43",
+		"e6a5de": "b5d780",
+		"4a4a52": "2b4d7d",
+		"7b7b84": "5ca0b5"
+	},
+	"2": {
+		"9c9ca5": "fffade",
+		"d684ce": "67508c",
+		"636373": "e8bc75",
+		"6b426b": "081f19",
+		"ce5a7b": "1f6759",
+		"a5425a": "144844",
+		"f7a5b5": "5cba98",
+		"ef7b94": "379a85",
+		"bd63ad": "574285",
+		"e6a5de": "7a649c",
+		"4a4a52": "d08f55",
+		"7b7b84": "fbefb3"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/33.json b/public/images/pokemon/variant/back/33.json
new file mode 100644
index 00000000000..331220de9ef
--- /dev/null
+++ b/public/images/pokemon/variant/back/33.json
@@ -0,0 +1,32 @@
+{
+    "1": {
+        "101010": "101010",
+        "5a3a63": "944f25",
+        "b51900": "b51900",
+        "de4229": "de4229",
+        "845a52": "42adc1",
+        "009463": "273161",
+        "945ab5": "cf863e",
+        "4acea5": "55729e",
+        "848484": "848484",
+        "ce84de": "e0c151",
+        "e6adef": "ede4ab",
+        "c5c5c5": "c5c5c5",
+        "ffffff": "ffffff"
+    },
+    "2": {
+        "101010": "101010",
+        "5a3a63": "142440",
+        "b51900": "d98943",
+        "de4229": "edc85a",
+        "845a52": "e1b13b",
+        "009463": "b0384a",
+        "945ab5": "253f5e",
+        "4acea5": "ed938e",
+        "848484": "848484",
+        "ce84de": "375c73",
+        "e6adef": "5d91a1",
+        "c5c5c5": "c5c5c5",
+        "ffffff": "ffffff"
+    }
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/331.json b/public/images/pokemon/variant/back/331.json
new file mode 100644
index 00000000000..7dcb633affb
--- /dev/null
+++ b/public/images/pokemon/variant/back/331.json
@@ -0,0 +1,30 @@
+{
+	"1": {
+		"003a10": "601130",
+		"ffe63a": "7aa1df",
+		"31944a": "b73736",
+		"215200": "69102c",
+		"63bd6b": "dd6754",
+		"f7bd19": "448bc3",
+		"4a7310": "9f2a3f",
+		"196b31": "891d2c",
+		"94c552": "d76868",
+		"739c3a": "d74f4f",
+		"8c6b3a": "123a5a",
+		"bdde7b": "e67f7f"
+	},
+	"2": {
+		"003a10": "684531",
+		"ffe63a": "eaa5c6",
+		"31944a": "c09e6c",
+		"215200": "694426",
+		"63bd6b": "d9c985",
+		"f7bd19": "d979b2",
+		"4a7310": "6d3494",
+		"196b31": "946e51",
+		"94c552": "9364a5",
+		"739c3a": "7c558d",
+		"8c6b3a": "983364",
+		"bdde7b": "a772bd"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/332.json b/public/images/pokemon/variant/back/332.json
new file mode 100644
index 00000000000..c13c07c34b4
--- /dev/null
+++ b/public/images/pokemon/variant/back/332.json
@@ -0,0 +1,28 @@
+{
+	"1": {
+		"319452": "831a1f",
+		"4aa552": "9f2f2c",
+		"7ba563": "b44040",
+		"8cbd63": "c54b4b",
+		"215200": "710f2f",
+		"196b21": "831a1f",
+		"a5d674": "df5252",
+		"4a7310": "982443",
+		"a5d673": "e16363",
+		"63b56b": "b2332f",
+		"215201": "630d28"
+	},
+	"2": {
+		"319452": "b08d72",
+		"4aa552": "c5a77f",
+		"7ba563": "704e7e",
+		"8cbd63": "e3d7a6",
+		"215200": "3f3249",
+		"196b21": "b08d72",
+		"a5d674": "d7cda7",
+		"4a7310": "4f3956",
+		"a5d673": "8c669b",
+		"63b56b": "cfc191",
+		"215201": "583823"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/34.json b/public/images/pokemon/variant/back/34.json
new file mode 100644
index 00000000000..953d0276777
--- /dev/null
+++ b/public/images/pokemon/variant/back/34.json
@@ -0,0 +1,32 @@
+{
+    "1": {
+        "101010": "101010",
+        "5a296b": "7a411d",
+        "73735a": "696342",
+        "73735b": "73735b",
+        "73735c": "3b447a",
+        "a55294": "cf863e",
+        "d673ef": "e0c151",
+        "c5c5a5": "6272a8",
+        "c7c7a9": "c7c7a9",
+        "c4c4a7": "c4c4a7",
+        "de94f7": "ede4ab",
+        "fcfcfc": "fcfcfc",
+        "ffffff": "ffffff"
+    },
+    "2": {
+        "101010": "101010",
+        "5a296b": "142440",
+        "73735a": "a37355",
+        "73735b": "73735b",
+        "73735c": "85204a",
+        "a55294": "253f5e",
+        "d673ef": "375c73",
+        "c5c5a5": "c43d63",
+        "c7c7a9": "e0b990",
+        "c4c4a7": "c4c4a7",
+        "de94f7": "5d91a1",
+        "fcfcfc": "fcfcfc",
+        "ffffff": "ede1b4"
+    }
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/345.json b/public/images/pokemon/variant/back/345.json
new file mode 100644
index 00000000000..c7b0d665e29
--- /dev/null
+++ b/public/images/pokemon/variant/back/345.json
@@ -0,0 +1,28 @@
+{
+	"1": {
+		"633a84": "611746",
+		"efd663": "fcf3a2",
+		"bd5284": "6084bd",
+		"6b5221": "679e3a",
+		"b5ade6": "ff5289",
+		"d6a531": "d8e374",
+		"efadb5": "b9f0ff",
+		"7363b5": "801f4c",
+		"ce7394": "84aedb",
+		"843a5a": "394287",
+		"9c84ce": "bd3167"
+	},
+	"2": {
+		"633a84": "b57c2d",
+		"efd663": "de463e",
+		"bd5284": "429949",
+		"6b5221": "661634",
+		"b5ade6": "fff8a3",
+		"d6a531": "942532",
+		"efadb5": "beed9a",
+		"7363b5": "dbb34d",
+		"ce7394": "7fcc68",
+		"843a5a": "296e47",
+		"9c84ce": "f5df73"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/346.json b/public/images/pokemon/variant/back/346.json
new file mode 100644
index 00000000000..d2b5406f75a
--- /dev/null
+++ b/public/images/pokemon/variant/back/346.json
@@ -0,0 +1,30 @@
+{
+	"1": {
+		"ffd6ef": "deffea",
+		"3a6b52": "7f183f",
+		"a57b10": "5e8c29",
+		"a5e68c": "f38460",
+		"ce6394": "526f84",
+		"ef6b8c": "93c6c5",
+		"7bc573": "eb564b",
+		"ff9cad": "d2faef",
+		"f7d642": "d8e374",
+		"cea531": "a7c961",
+		"944263": "304459",
+		"529c5a": "b32843"
+	},
+	"2": {
+		"ffd6ef": "a3ffc3",
+		"3a6b52": "96483b",
+		"a57b10": "661634",
+		"a5e68c": "ffe6b5",
+		"ce6394": "32806f",
+		"ef6b8c": "53b491",
+		"7bc573": "efbd8c",
+		"ff9cad": "7be3b6",
+		"f7d642": "de463e",
+		"cea531": "942532",
+		"944263": "17404a",
+		"529c5a": "bf815c"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/396.json b/public/images/pokemon/variant/back/396.json
new file mode 100644
index 00000000000..00ffa97fd19
--- /dev/null
+++ b/public/images/pokemon/variant/back/396.json
@@ -0,0 +1,36 @@
+{
+	"1": {
+		"d6dede": "e3d09d",
+		"949494": "dbb070",
+		"736363": "28854d",
+		"ffffff": "f0ecd3",
+		"382028": "751e23",
+		"d67300": "db963b",
+		"b5b5b5": "d4b27f",
+		"808080": "c48c51",
+		"9c4a21": "b06421",
+		"8c7373": "bd453c",
+		"3a2129": "07332d",
+		"524a4a": "156146",
+		"4f4747": "144a40",
+		"ad9c9c": "ed7f4c",
+		"ff9429": "ffcf5e"
+	},
+	"2": {
+		"d6dede": "f0deaa",
+		"949494": "c29b72",
+		"736363": "2f436b",
+		"ffffff": "fcfad2",
+		"382028": "163d4d",
+		"d67300": "52281f",
+		"b5b5b5": "debd8c",
+		"808080": "a67c5d",
+		"9c4a21": "451915",
+		"8c7373": "307b82",
+		"3a2129": "0f1730",
+		"524a4a": "1b2745",
+		"4f4747": "e6a647",
+		"ad9c9c": "4da8a1",
+		"ff9429": "8c604c"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/397.json b/public/images/pokemon/variant/back/397.json
new file mode 100644
index 00000000000..d1f7e646649
--- /dev/null
+++ b/public/images/pokemon/variant/back/397.json
@@ -0,0 +1,36 @@
+{
+	"1": {
+		"735a63": "bd453c",
+		"574f57": "144a40",
+		"5a525a": "28854d",
+		"f75242": "8bba65",
+		"878787": "bda377",
+		"b5b5b5": "d9c798",
+		"ff9429": "ffcf5e",
+		"382f38": "0c3331",
+		"3a313a": "156146",
+		"362d36": "572e14",
+		"fcfcfc": "f0ebc5",
+		"bd6300": "994c1c",
+		"7b4221": "c47a2f",
+		"523a4a": "751e23",
+		"9c848c": "ed7f4c"
+	},
+	"2": {
+		"735a63": "307b82",
+		"574f57": "e6a647",
+		"5a525a": "2f436b",
+		"f75242": "f797ad",
+		"878787": "ba946e",
+		"b5b5b5": "debd8c",
+		"ff9429": "8c604c",
+		"382f38": "c27b34",
+		"3a313a": "1b2745",
+		"362d36": "421917",
+		"fcfcfc": "fcfad2",
+		"bd6300": "63362b",
+		"7b4221": "52281f",
+		"523a4a": "163d4d",
+		"9c848c": "4da8a1"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/398.json b/public/images/pokemon/variant/back/398.json
new file mode 100644
index 00000000000..ed678a4c4f3
--- /dev/null
+++ b/public/images/pokemon/variant/back/398.json
@@ -0,0 +1,35 @@
+{
+	"1": {
+		"9c4242": "5fad3b",
+		"5c545c": "144a40",
+		"3a313a": "0b3634",
+		"7b4221": "b06421",
+		"bd6300": "db963b",
+		"5a525a": "156146",
+		"7b6b7b": "28854d",
+		"f75242": "90cc58",
+		"735a63": "bd453c",
+		"ffffff": "e8e3b6",
+		"523a4a": "751e23",
+		"3a3a3a": "07332d",
+		"b5b5b5": "d7be89",
+		"9c848c": "ed7f4c",
+		"ff9429": "ffcf5e"
+	},
+	"2": {
+		"9c4242": "c4833d",
+		"5c545c": "e6a647",
+		"7b4221": "421917",
+		"bd6300": "63362b",
+		"5a525a": "1b2745",
+		"7b6b7b": "293854",
+		"f75242": "e6bd4e",
+		"735a63": "307b82",
+		"ffffff": "fcfad2",
+		"523a4a": "163d4d",
+		"3a3a3a": "080d1f",
+		"b5b5b5": "debd8c",
+		"9c848c": "4da8a1",
+		"ff9429": "8c604c"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/403.json b/public/images/pokemon/variant/back/403.json
new file mode 100644
index 00000000000..4b8d7b52070
--- /dev/null
+++ b/public/images/pokemon/variant/back/403.json
@@ -0,0 +1,22 @@
+{
+	"1": {
+		"b59c5a": "45babf",
+		"7badf7": "bb5c3a",
+		"637bb5": "903325",
+		"4a4a63": "dcb788",
+		"ffe65a": "59dcd6",
+		"313142": "bf8652",
+		"42426b": "671919",
+		"736352": "267789"
+	},
+	"2": {
+		"b59c5a": "9a31be",
+		"7badf7": "303465",
+		"637bb5": "222352",
+		"4a4a63": "bbc2e5",
+		"ffe65a": "e25ce8",
+		"313142": "8883d4",
+		"42426b": "121031",
+		"736352": "611c7f"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/404.json b/public/images/pokemon/variant/back/404.json
new file mode 100644
index 00000000000..32ab9ea8a1d
--- /dev/null
+++ b/public/images/pokemon/variant/back/404.json
@@ -0,0 +1,24 @@
+{
+	"1": {
+		"736352": "267789",
+		"4a4a73": "671919",
+		"63637b": "f1dfb1",
+		"637bb5": "903325",
+		"4a4a63": "dcb788",
+		"ffe65a": "59dcd6",
+		"313142": "bf8652",
+		"b59c5a": "45babf",
+		"7badf7": "bb5c3a"
+	},
+	"2": {
+		"736352": "611c7f",
+		"4a4a73": "121031",
+		"63637b": "dee4f4",
+		"637bb5": "222352",
+		"4a4a63": "bbc2e5",
+		"ffe65a": "e25ce8",
+		"313142": "8883d4",
+		"b59c5a": "9a31be",
+		"7badf7": "303465"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/405.json b/public/images/pokemon/variant/back/405.json
new file mode 100644
index 00000000000..46a38cfd243
--- /dev/null
+++ b/public/images/pokemon/variant/back/405.json
@@ -0,0 +1,30 @@
+{
+	"1": {
+		"b59c5a": "45babf",
+		"7badf7": "bb5c3a",
+		"63637b": "f1dfb1",
+		"4a4a73": "671919",
+		"637bb5": "903325",
+		"353255": "4a0e15",
+		"4a4a63": "dcb788",
+		"ffe65a": "59dcd6",
+		"313142": "bf8652",
+		"943a52": "472614",
+		"e64a52": "4f3217",
+		"736352": "267789"
+	},
+	"2": {
+		"b59c5a": "9a31be",
+		"7badf7": "303465",
+		"63637b": "dee4f4",
+		"4a4a73": "121031",
+		"637bb5": "222352",
+		"353255": "06051b",
+		"4a4a63": "bbc2e5",
+		"ffe65a": "e25ce8",
+		"313142": "8883d4",
+		"943a52": "614b9a",
+		"e64a52": "6f5dac",
+		"736352": "611c7f"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/417.json b/public/images/pokemon/variant/back/417.json
new file mode 100644
index 00000000000..27f45e74557
--- /dev/null
+++ b/public/images/pokemon/variant/back/417.json
@@ -0,0 +1,36 @@
+{
+    "1": {
+        "101010": "101010",
+        "3e364e": "734430",
+        "524941": "732e12",
+        "5a524a": "642f1a",
+        "4a425a": "5f2618",
+        "84523a": "9b314f",
+        "ef845a": "e26e6e",
+        "c5a563": "e95d6c",
+        "ffd663": "f17c7c",
+        "637b9c": "86452b",
+        "7bb5e6": "a25f37",
+        "cec5c5": "e8be64",
+        "f7f7f7": "faeda9",
+        "ffffff": "ffffff",
+        "7b7b84": "8e623c"
+    },
+    "2": {
+        "101010": "101010",
+        "3e364e": "203243",
+        "524941": "2d284c",
+        "5a524a": "0f203a",
+        "4a425a": "23704c",
+        "84523a": "693939",
+        "ef845a": "e1b8ac",
+        "c5a563": "5ae7f6",
+        "ffd663": "8ffaff",
+        "637b9c": "a2dc76",
+        "7bb5e6": "e4fba1",
+        "cec5c5": "357577",
+        "f7f7f7": "5ba297",
+        "ffffff": "ffffff",
+        "7b7b84": "1f3f4e"
+    }
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/420.json b/public/images/pokemon/variant/back/420.json
new file mode 100644
index 00000000000..3177603d799
--- /dev/null
+++ b/public/images/pokemon/variant/back/420.json
@@ -0,0 +1,32 @@
+{
+    "1": {
+       "101010": "101010",
+       "423131": "103d47",
+       "6b3a4a": "09303b",
+       "314252": "8f3833",
+       "3a734a": "ab554b",
+       "843152": "185158",
+       "ad426b": "368a7f",
+       "429442": "d98b77",
+       "52a54a": "f7bfa8",
+       "73ce5a": "fcdbc7",
+       "de6384": "51b095",
+       "ff8cad": "73d9ae",
+       "ffffff": "ffffff"
+    },
+    "2": {
+       "101010": "101010",
+       "423131": "390f26",
+       "6b3a4a": "29091b",
+       "314252": "752a4a",
+       "3a734a": "9c4861",
+       "843152": "3b0d21",
+       "ad426b": "571539",
+       "429442": "a86a79",
+       "52a54a": "c29597",
+       "73ce5a": "dec3c3",
+       "de6384": "752648",
+       "ff8cad": "ad5168",
+       "ffffff": "ffffff"
+    }
+ }
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/421-overcast.json b/public/images/pokemon/variant/back/421-overcast.json
new file mode 100644
index 00000000000..77c5c18415d
--- /dev/null
+++ b/public/images/pokemon/variant/back/421-overcast.json
@@ -0,0 +1,34 @@
+{
+    "1": {
+        "101010": "101010",
+        "105221": "ab554b",
+        "4a2942": "5e1228",
+        "7b294a": "103d47",
+        "7a2a4a": "236e6a",
+        "427b4a": "d98b77",
+        "6b427b": "962a3e",
+        "a53a63": "368a7f",
+        "ce527b": "51b095",
+        "52ad5a": "f7bfa8",
+        "5ac55a": "fcdbc7",
+        "845aad": "c75058",
+        "9c7bbd": "db7f7f",
+        "de7394": "73d9ae"
+    },
+    "2": {
+        "101010": "101010",
+        "105221": "995969",
+        "4a2942": "521d44",
+        "7b294a": "390f26",
+        "7a2a4a": "571539",
+        "427b4a": "ba8087",
+        "6b427b": "8f4270",
+        "a53a63": "611c3b",
+        "ce527b": "752648",
+        "52ad5a": "cf9d9d",
+        "5ac55a": "e3cbca",
+        "845aad": "a86886",
+        "9c7bbd": "d197ac",
+        "de7394": "ad5168"
+    }
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/421-sunshine.json b/public/images/pokemon/variant/back/421-sunshine.json
new file mode 100644
index 00000000000..096641576c9
--- /dev/null
+++ b/public/images/pokemon/variant/back/421-sunshine.json
@@ -0,0 +1,40 @@
+{
+    "1": {
+        "101010": "101010",
+        "006310": "e6d590",
+        "941e3f": "103d47",
+        "9c6b10": "c4655a",
+        "941f40": "5c1547",
+        "942142": "591230",
+        "ce3a6b": "751a38",
+        "cf3c6d": "872e5c",
+        "cf3e6e": "368a7f",
+        "19943a": "f0f0bd",
+        "d6b55a": "db8e7d",
+        "f7de73": "f7bfa8",
+        "e66394": "51b095",
+        "de84ad": "962a3e",
+        "ffa5c5": "c75058",
+        "ffe6f7": "d0fdf0",
+        "ffffff": "ffffff"
+    },
+    "2": {
+        "101010": "101010",
+        "006310": "72559e",
+        "941e3f": "390f26",
+        "9c6b10": "4a2942",
+        "941f40": "3a234a",
+        "942142": "804058",
+        "ce3a6b": "995969",
+        "cf3c6d": "563666",
+        "cf3e6e": "571539",
+        "19943a": "9574b3",
+        "d6b55a": "914972",
+        "f7de73": "b35f86",
+        "e66394": "752648",
+        "de84ad": "cf9d9d",
+        "ffa5c5": "e3cbca",
+        "ffe6f7": "d26393",
+        "ffffff": "ffffff"
+    }
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/446.json b/public/images/pokemon/variant/back/446.json
new file mode 100644
index 00000000000..1f6d43127bb
--- /dev/null
+++ b/public/images/pokemon/variant/back/446.json
@@ -0,0 +1,38 @@
+{
+    "1": {
+        "000000": "101010",
+        "104242": "4d0f3f",
+        "215a73": "701a55",
+        "317b9c": "943469",
+        "3194b5": "ad4b70",  
+        "524a10": "91504e",
+        "73737b": "756363",
+        "7b5a31": "522663",
+        "948442": "bf777a",
+        "9c3a42": "714084",
+        "b5b563": "de9494",
+        "cccfce": "cbc4c4",
+        "cecece": "cecece",
+        "de9494": "a270b5",
+        "efe684": "f0beb1",
+        "ffffff": "ffffff"
+    },
+    "2": {
+        "000000": "101010",
+        "104242": "6398b7",
+        "215a73": "a3cacd",
+        "317b9c": "cbe4e2",
+        "3194b5": "edf5f4",  
+        "524a10": "233f69",
+        "73737b": "525266",
+        "7b5a31": "e6cda1",
+        "948442": "2f4d80",
+        "9c3a42": "487d43",
+        "b5b563": "38638f",
+        "cccfce": "bfc7cb",
+        "cecece": "cecece",
+        "de9494": "9cb780",
+        "efe684": "4781a8",
+        "ffffff": "ffffff"
+    }
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/476.json b/public/images/pokemon/variant/back/476.json
new file mode 100644
index 00000000000..5f54f51d1f9
--- /dev/null
+++ b/public/images/pokemon/variant/back/476.json
@@ -0,0 +1,36 @@
+{
+    "1": {
+        "101010": "101010",
+        "5a2921": "0e291d",
+        "7b3129": "1e3f30",
+        "293a4a": "352310",
+        "3a4a5a": "59452f",
+        "bd3152": "30594a",
+        "e65a63": "578b6b",
+        "194a84": "62230e",
+        "3a63ad": "9d3a18",
+        "5a7bce": "c76227",
+        "ef7b8c": "77b472",
+        "739ce6": "de7f36",
+        "84adf7": "e68c43",
+        "c5cede": "c5cede",
+        "ffffff": "ffffff"
+    },
+    "2": {
+        "101010": "101010",
+        "5a2921": "21132c",
+        "7b3129": "301b3f",
+        "293a4a": "111b28",
+        "3a4a5a": "253142",
+        "bd3152": "482a5e",
+        "e65a63": "6a5394",
+        "194a84": "30578e",
+        "3a63ad": "5b97c1",
+        "5a7bce": "92dee8",
+        "ef7b8c": "747fc4",
+        "739ce6": "dbfff4",
+        "84adf7": "c2efe5",
+        "c5cede": "c5cede",
+        "ffffff": "ffffff"
+    }
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/498.json b/public/images/pokemon/variant/back/498.json
new file mode 100644
index 00000000000..ecc0ccf7a98
--- /dev/null
+++ b/public/images/pokemon/variant/back/498.json
@@ -0,0 +1,44 @@
+{
+    "1": {
+        "101010": "101010",
+        "2e1e1e": "b1a385",
+        "2e1f1f": "d1c5ab",
+        "302020": "194737",
+        "312121": "1e2a4d",
+        "473830": "f7f5e9",
+        "4a3a31": "2d405c",
+        "7a3827": "1c2e1b",
+        "7b3a29": "194737",
+        "947310": "cc955e",
+        "bd6331": "3b805f",
+        "ce423a": "3e4f37",
+        "a54a42": "2d452b",
+        "e66b29": "b5cca5",
+        "efbd08": "f0cc8b",
+        "ef843a": "65b57c",
+        "c5ada5": "c1c5a5",
+        "ffffff": "ffffff",
+        "47382f": "472770"
+    },
+    "2": {
+        "101010": "101010",
+        "2e1e1e": "ac8b61",
+        "2e1f1f": "c4a884",
+        "302020": "522e2e",
+        "312121": "47150e",
+        "473830": "e0d3ab",
+        "4a3a31": "733421",
+        "7a3827": "222742",
+        "7b3a29": "522e2e",
+        "947310": "828399",
+        "bd6331": "85564e",
+        "ce423a": "323754",
+        "a54a42": "4c5275",
+        "e66b29": "778aa6",
+        "efbd08": "c7c8d9",
+        "ef843a": "ab8274",
+        "c5ada5": "dddef0",
+        "ffffff": "ffffff",
+        "47382f": "456da8"
+    }
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/499.json b/public/images/pokemon/variant/back/499.json
new file mode 100644
index 00000000000..ad525f3e114
--- /dev/null
+++ b/public/images/pokemon/variant/back/499.json
@@ -0,0 +1,40 @@
+{
+    "1": {
+        "101010": "101010",
+        "3a2121": "1e2a4d",
+        "3a3a3a": "122b18",
+        "523129": "2d405c",
+        "7a3827": "1c2e1b",
+        "7b3a29": "234f3d",
+        "736310": "ab6441",
+        "4a4a4a": "264524",
+        "bd5a31": "41785a",
+        "ce423a": "3e4f37",
+        "ef7329": "62a174",
+        "b59421": "cc955e",
+        "efc53a": "f0cc8b",
+        "c5ada5": "c5ada5",
+        "c4aea7": "c4aea7",
+        "fcfcfc": "fcfcfc",
+        "ffffff": "ffffff"
+    },
+    "2": {
+        "101010": "101010",
+        "3a2121": "47150e",
+        "3a3a3a": "1c2245",
+        "523129": "733421",
+        "7a3827": "222742",
+        "7b3a29": "533330",
+        "736310": "3c3e5b",
+        "4a4a4a": "272d4f",
+        "bd5a31": "7a5a56",
+        "ce423a": "323754",
+        "ef7329": "967a71",
+        "b59421": "828399",
+        "efc53a": "c7c8d9",
+        "c5ada5": "c4a884",
+        "c4aea7": "c4aea7",
+        "fcfcfc": "e0d3ab",
+        "ffffff": "ffffff"
+    }
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/500.json b/public/images/pokemon/variant/back/500.json
new file mode 100644
index 00000000000..55e8d8b6548
--- /dev/null
+++ b/public/images/pokemon/variant/back/500.json
@@ -0,0 +1,46 @@
+{
+    "1": {
+    "101010": "101010",
+    "212121": "1e2a4d",
+    "313131": "2d405c",
+    "333333": "2c2f35",
+    "7b1910": "257036",
+    "7a1a11": "1c2e1b",
+    "732900": "2c473e",
+    "7b5a08": "ab6441",
+    "a33a31": "35963e",
+    "a53a31": "3e4f37",
+    "bd5221": "3e6952",
+    "ef6321": "699676",
+    "b58c21": "cc955e",
+    "ef8c08": "86e677",
+    "efbd08": "c7f797",
+    "f0be0a": "f0cc8b",
+    "adadad": "a3a6ad",
+    "f7f7f7": "e4eef5",
+    "e63129": "58db58",
+    "e33229": "627556"
+    },
+    "2": {
+        "101010": "101010",
+        "212121": "47150e",
+        "313131": "733421",
+        "333333": "3b352b",
+        "7b1910": "ba843d",
+        "7a1a11": "20243d",
+        "732900": "522e2e",
+        "7b5a08": "3c3e5b",
+        "a33a31": "cfa255",
+        "a53a31": "2d3250",
+        "bd5221": "7a5a56",
+        "ef6321": "967a71",
+        "b58c21": "828399",
+        "ef8c08": "f2d591",
+        "efbd08": "faefc7",
+        "f0be0a": "c7c8d9",
+        "adadad": "c4a884",
+        "f7f7f7": "e0d3ab",
+        "e63129": "e3c65c",
+        "e33229": "464a66"
+    }
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/511.json b/public/images/pokemon/variant/back/511.json
new file mode 100644
index 00000000000..a5ca6fa862f
--- /dev/null
+++ b/public/images/pokemon/variant/back/511.json
@@ -0,0 +1,20 @@
+{
+	"1": {
+		"a57b3a": "c58869",
+		"ffce7b": "edc293",
+		"735221": "bd7653",
+		"cea55a": "d9a177",
+		"194a29": "912f1c",
+		"087331": "c45331",
+		"19a552": "d97b41"
+	},
+	"2": {
+		"a57b3a": "5580bf",
+		"ffce7b": "8ecaed",
+		"735221": "3f6aa6",
+		"cea55a": "73acde",
+		"194a29": "4c2d7a",
+		"087331": "683b8c",
+		"19a552": "8a53a6"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/512.json b/public/images/pokemon/variant/back/512.json
new file mode 100644
index 00000000000..8d75727c3f0
--- /dev/null
+++ b/public/images/pokemon/variant/back/512.json
@@ -0,0 +1,26 @@
+{
+	"1": {
+		"ffce7b": "eab68b",
+		"525252": "a36e46",
+		"087331": "c74638",
+		"194a29": "a12d25",
+		"ffffff": "dbc086",
+		"a57b3a": "a65b3d",
+		"cea55a": "c8895f",
+		"9c9c9c": "cfa067",
+		"735221": "733224",
+		"19a552": "ed6f53"
+	},
+	"2": {
+		"ffce7b": "58aee0",
+		"525252": "3073ab",
+		"087331": "522880",
+		"194a29": "331961",
+		"ffffff": "5bc6de",
+		"a57b3a": "3762bf",
+		"cea55a": "4686cf",
+		"9c9c9c": "4099c2",
+		"735221": "2a42a1",
+		"19a552": "6e368f"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/513.json b/public/images/pokemon/variant/back/513.json
new file mode 100644
index 00000000000..5a8f4847bc9
--- /dev/null
+++ b/public/images/pokemon/variant/back/513.json
@@ -0,0 +1,20 @@
+{
+	"1": {
+		"a57b3a": "e4907f",
+		"ffce7b": "ffe6c9",
+		"bd423a": "28629c",
+		"e65242": "3d9bbe",
+		"7b3131": "1b3e70",
+		"735221": "c3635b",
+		"cea55a": "f9b9a2"
+	},
+	"2": {
+		"a57b3a": "bc2f2f",
+		"ffce7b": "ed8c7b",
+		"bd423a": "d5b393",
+		"e65242": "f4ecd7",
+		"7b3131": "ad7a63",
+		"735221": "a1272f",
+		"cea55a": "d4554c"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/514.json b/public/images/pokemon/variant/back/514.json
new file mode 100644
index 00000000000..90e7c698f29
--- /dev/null
+++ b/public/images/pokemon/variant/back/514.json
@@ -0,0 +1,27 @@
+{
+	"1": {
+		"ffce7b": "ffe2bf",
+		"bd423a": "265494",
+		"e65242": "3a7bb5",
+		"7b3131": "193170",
+		"ffffff": "c0e7fc",
+		"735221": "ba6a57",
+		"c5c5c5": "97c0e6",
+		"cea55a": "edba9a",
+		"9c9c9c": "6f94c7",
+		"525252": "465f9e"
+	},
+	"2": {
+		"ffce7b": "cc643b",
+		"bd423a": "cfb88f",
+		"e65242": "ede9d1",
+		"7b3131": "a88260",
+		"a57b3a": "782017",
+		"ffffff": "f7cc57",
+		"735221": "5c0e0e",
+		"c5c5c5": "e3a13d",
+		"cea55a": "943722",
+		"9c9c9c": "cc762b",
+		"525252": "ad4d1d"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/515.json b/public/images/pokemon/variant/back/515.json
new file mode 100644
index 00000000000..d8a7c4e9136
--- /dev/null
+++ b/public/images/pokemon/variant/back/515.json
@@ -0,0 +1,22 @@
+{
+	"1": {
+		"ffce7b": "fff187",
+		"003a73": "0a4a2d",
+		"21739c": "136b3b",
+		"198cad": "219448",
+		"29b5de": "34c15e",
+		"cea55a": "e0c265",
+		"735221": "735f21",
+		"a57b3a": "b5893c"
+	},
+	"2": {
+		"ffce7b": "e76092",
+		"003a73": "a64e8b",
+		"21739c": "cc70a4",
+		"198cad": "eb98bf",
+		"29b5de": "ffc9dd",
+		"cea55a": "cc4580",
+		"735221": "8f1f68",
+		"a57b3a": "b32e77"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/516.json b/public/images/pokemon/variant/back/516.json
new file mode 100644
index 00000000000..ae188e87625
--- /dev/null
+++ b/public/images/pokemon/variant/back/516.json
@@ -0,0 +1,24 @@
+{
+	"1": {
+		"ffce7b": "fadd73",
+		"106b8c": "13571a",
+		"003a73": "08420d",
+		"9c9c9c": "aecf86",
+		"a57b3a": "9c7935",
+		"cea55a": "c4a148",
+		"218ca5": "3c8c22",
+		"735221": "7b5e29",
+		"29b5de": "6fad37"
+	},
+	"2": {
+		"ffce7b": "e76092",
+		"106b8c": "cc70a4",
+		"003a73": "a64e8b",
+		"9c9c9c": "59b7d4",
+		"a57b3a": "b32e77",
+		"cea55a": "cc4580",
+		"218ca5": "eb98bf",
+		"735221": "8f1f68",
+		"29b5de": "ffc9dd"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/522.json b/public/images/pokemon/variant/back/522.json
new file mode 100644
index 00000000000..9c301bca713
--- /dev/null
+++ b/public/images/pokemon/variant/back/522.json
@@ -0,0 +1,36 @@
+{
+	"1": {
+		"a5a5a5": "676fc2",
+		"7b7b7b": "505a9b",
+		"525252": "95355d",
+		"cecece": "788bcb",
+		"161d1d": "2e0d1f",
+		"797878": "676fc2",
+		"005a9c": "75c239",
+		"505050": "3d4488",
+		"ffffff": "b9cfef",
+		"ffe600": "61e4bf",
+		"3a3a3a": "731f51",
+		"00adde": "b9e96c",
+		"8c7321": "33a08a",
+		"292929": "53173b",
+		"192121": "43172f"
+	},
+	"2": {
+		"a5a5a5": "cb6a3a",
+		"7b7b7b": "731515",
+		"525252": "ebc37d",
+		"cecece": "97221a",
+		"161d1d": "370b0b",
+		"797878": "cb6a3a",
+		"005a9c": "30309d",
+		"505050": "4e1416",
+		"ffffff": "c23e2e",
+		"ffe600": "36c294",
+		"3a3a3a": "cd8a58",
+		"00adde": "3e4ddc",
+		"8c7321": "288278",
+		"292929": "914824",
+		"192121": "661212"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/523.json b/public/images/pokemon/variant/back/523.json
new file mode 100644
index 00000000000..e8e37d6b7ab
--- /dev/null
+++ b/public/images/pokemon/variant/back/523.json
@@ -0,0 +1,44 @@
+{
+	"1": {
+		"373737": "43172f",
+		"373f3f": "353573",
+		"a5a5a5": "7080c6",
+		"5d4802": "1f8076",
+		"ffffff": "b9cfef",
+		"181f1f": "3d467d",
+		"8c7321": "33a08a",
+		"293131": "6a1d44",
+		"8c721f": "3d9197",
+		"7b7b7b": "5265a4",
+		"797878": "5265a4",
+		"182121": "430f30",
+		"cecece": "7e91d3",
+		"5a5a5a": "47548f",
+		"ffe600": "61e4bf",
+		"3a3a3a": "5d213a",
+		"00adde": "b9e96c",
+		"3a4242": "84294f",
+		"192121": "57163d"
+	},
+	"2": {
+		"373737": "501a19",
+		"373f3f": "4e1416",
+		"a5a5a5": "861816",
+		"5d4802": "145b5d",
+		"ffffff": "c23e2e",
+		"181f1f": "5e1717",
+		"8c7321": "288278",
+		"293131": "c89161",
+		"8c721f": "54a48a",
+		"7b7b7b": "731515",
+		"797878": "da7248",
+		"182121": "661212",
+		"cecece": "97221a",
+		"5a5a5a": "611616",
+		"ffe600": "36c294",
+		"3a3a3a": "682321",
+		"00adde": "3e4ddc",
+		"3a4242": "ebc37d",
+		"192121": "9e533b"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/535.json b/public/images/pokemon/variant/back/535.json
new file mode 100644
index 00000000000..2d1a18e3b9a
--- /dev/null
+++ b/public/images/pokemon/variant/back/535.json
@@ -0,0 +1,26 @@
+{
+	"1": {
+		"6bbdff": "a9c4d7",
+		"366089": "801941",
+		"636363": "8b2b4b",
+		"66bafd": "d65a5a",
+		"3a638c": "40567d",
+		"191919": "330821",
+		"7394c5": "6f8fb1",
+		"6f90c1": "b53a57",
+		"292929": "420e2d",
+		"424242": "671e3f"
+	},
+	"2": {
+		"6bbdff": "672a23",
+		"366089": "ac6634",
+		"636363": "d76d39",
+		"66bafd": "f3cd69",
+		"3a638c": "420f1d",
+		"191919": "4f150a",
+		"7394c5": "54131a",
+		"6f90c1": "cd984a",
+		"292929": "7d2414",
+		"424242": "ac4423"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/536.json b/public/images/pokemon/variant/back/536.json
new file mode 100644
index 00000000000..78a59fb699c
--- /dev/null
+++ b/public/images/pokemon/variant/back/536.json
@@ -0,0 +1,32 @@
+{
+	"1": {
+		"196373": "801941",
+		"404040": "874330",
+		"84e6d6": "d65a5a",
+		"10427b": "40567d",
+		"52a5b5": "b53a57",
+		"292929": "400a32",
+		"5e5e5e": "a96147",
+		"ffffff": "e3c998",
+		"296bad": "6f8fb1",
+		"c5c5c5": "ca9470",
+		"424242": "5e1246",
+		"0894d6": "a9c4d7",
+		"636363": "801c4e"
+	},
+	"2": {
+		"196373": "ac6634",
+		"404040": "365a72",
+		"84e6d6": "f3cd69",
+		"10427b": "4a1423",
+		"52a5b5": "cd984a",
+		"292929": "7d2414",
+		"5e5e5e": "52809b",
+		"ffffff": "aadfe0",
+		"296bad": "5d171e",
+		"c5c5c5": "7fb8c2",
+		"424242": "ac4423",
+		"0894d6": "75332b",
+		"636363": "d76d39"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/537.json b/public/images/pokemon/variant/back/537.json
new file mode 100644
index 00000000000..757d692bd40
--- /dev/null
+++ b/public/images/pokemon/variant/back/537.json
@@ -0,0 +1,24 @@
+{
+	"1": {
+		"196373": "801941",
+		"52a58c": "b53a57",
+		"636363": "801c4e",
+		"10427b": "40567d",
+		"73e6ce": "d65a5a",
+		"292929": "400a32",
+		"424242": "5e1246",
+		"296bad": "6f8fb1",
+		"0894d6": "a9c4d7"
+	},
+	"2": {
+		"196373": "ac6634",
+		"52a58c": "cd984a",
+		"636363": "d76d39",
+		"10427b": "4a1423",
+		"73e6ce": "f3cd69",
+		"292929": "7d2414",
+		"424242": "ac4423",
+		"296bad": "5d171e",
+		"0894d6": "75332b"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/554.json b/public/images/pokemon/variant/back/554.json
new file mode 100644
index 00000000000..803721e4f0d
--- /dev/null
+++ b/public/images/pokemon/variant/back/554.json
@@ -0,0 +1,32 @@
+{
+    "1": {
+        "101010": "101010",
+        "5a1919": "2e3573",
+        "66311a": "a16012",
+        "634231": "946344",
+        "9c2929": "4e5aa3",
+        "ce3131": "6c7ec4",
+        "947310": "b0895f",
+        "ad5a2b": "a17a50",
+        "a75625": "d19628",
+        "cea519": "bda373",
+        "ffce21": "e3e2ba",
+        "ff9452": "e8c661",
+        "b15c29": "a17a50"
+    }, 
+    "2": {
+        "101010": "101010",
+        "5a1919": "bf7558",
+        "66311a": "291d1b",
+        "634231": "75102a",
+        "9c2929": "d6a376",
+        "ce3131": "f0e2b9",
+        "947310": "9c1c2b",
+        "ad5a2b": "4a3021",
+        "a75625": "4a3021",
+        "cea519": "ba343d",
+        "ffce21": "d14949",
+        "ff9452": "614b38",
+        "b15c29": "b15c29"
+    }
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/555-zen.json b/public/images/pokemon/variant/back/555-zen.json
new file mode 100644
index 00000000000..9df761c1833
--- /dev/null
+++ b/public/images/pokemon/variant/back/555-zen.json
@@ -0,0 +1,24 @@
+{
+    "1": {
+        "101010": "101010",
+        "215263": "592226",
+        "3a7b8c": "7d3e3d",
+        "425a63": "b5775b",
+        "529cad": "8c5b54",
+        "7ba5bd": "c99d7b",
+        "ad6b29": "3b3f87",
+        "b5d6ef": "e0c19b",
+        "e6a563": "7b8dd4"
+    },
+    "2": {
+        "101010": "101010",
+        "215263": "523273",
+        "3a7b8c": "805a9c",
+        "425a63": "2e2a51",
+        "529cad": "a278b0",
+        "7ba5bd": "494162",
+        "ad6b29": "9e907e",
+        "b5d6ef": "605375",
+        "e6a563": "f5f3e9"
+    }
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/555.json b/public/images/pokemon/variant/back/555.json
new file mode 100644
index 00000000000..b83ca9fb88b
--- /dev/null
+++ b/public/images/pokemon/variant/back/555.json
@@ -0,0 +1,30 @@
+{
+    "1": {
+        "101010": "101010",
+        "523a21": "a65f33",
+        "631919": "222675",
+        "6b5a10": "b04a21",
+        "8c1929": "2d3685",
+        "ad2119": "3a4c94",
+        "b57b4a": "d9a455",
+        "bd0000": "cfc191",
+        "bd9429": "c26932",
+        "ef1010": "e3e2ba",
+        "efa56b": "e8cd7b",
+        "efce10": "d9944a"
+    },
+    "2": {
+        "101010": "101010",
+        "523a21": "291b19",
+        "631919": "a86722",
+        "6b5a10": "941c32",
+        "8c1929": "d6993e",
+        "ad2119": "e8ca5d",
+        "b57b4a": "4a3021",
+        "bd0000": "bab5a6",
+        "bd9429": "ba343d",
+        "ef1010": "f5f3e9",
+        "efa56b": "614b38",
+        "efce10": "d14949"
+    }
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/566.json b/public/images/pokemon/variant/back/566.json
new file mode 100644
index 00000000000..cb2601d4a93
--- /dev/null
+++ b/public/images/pokemon/variant/back/566.json
@@ -0,0 +1,32 @@
+{
+    "1": {
+        "101010": "101010",
+        "10316b": "1c4943",
+        "31529c": "336d60",
+        "3184f7": "4f9279",
+        "3a3a3a": "3a3a3a",
+        "523131": "641b49",
+        "524229": "2f6934",
+        "944242": "aa3c79",
+        "9c9cad": "9c9cad",
+        "bd9452": "66b562",
+        "de524a": "eb7fae",
+        "e6e6e6": "e6e6e6",
+        "f7ce63": "9be08b"
+    },
+    "2": {
+        "101010": "101010",
+        "10316b": "283957",
+        "31529c": "929bdf",
+        "3184f7": "c4d3ff",
+        "3a3a3a": "3a3a3a",
+        "523131": "284452",
+        "524229": "211f69",
+        "944242": "44988f",
+        "9c9cad": "9c9cad",
+        "bd9452": "3b4bad",
+        "de524a": "65cda4",
+        "e6e6e6": "e6e6e6",
+        "f7ce63": "557ecd"
+    }
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/567.json b/public/images/pokemon/variant/back/567.json
new file mode 100644
index 00000000000..f4bb6a76111
--- /dev/null
+++ b/public/images/pokemon/variant/back/567.json
@@ -0,0 +1,37 @@
+{
+    "1": { 
+        "101010": "101010",
+        "523131": "454f52",
+        "635229": "2f6934",
+        "10316b": "1c4943",
+        "086b5a": "b3296b",
+        "9c4a4a": "7b8687",
+        "844252": "844252",
+        "de524a": "abb3b3",
+        "bd9452": "66b562",
+        "f7ce63": "9be08b",
+        "31529c": "336d60",
+        "10a594": "ee609d",
+        "3184f7": "4f9279",
+        "9c9cad": "9c9cad",
+        "ffffff": "ffffff"    
+    },
+    "2": {
+        "101010": "101010",
+        "523131": "284452",
+        "635229": "211f69",
+        "10316b": "283957",
+        "086b5a": "462d7e",
+        "9c4a4a": "44988f",
+        "844252": "844252",
+        "de524a": "65cda4",
+        "bd9452": "3b4bad",
+        "f7ce63": "557ecd",
+        "31529c": "929bdf",
+        "10a594": "7346a1",
+        "3184f7": "c4d3ff",
+        "9c9cad": "9c9cad",
+        "ffffff": "ffffff"
+      
+    }
+}
diff --git a/public/images/pokemon/variant/back/572.json b/public/images/pokemon/variant/back/572.json
index e305e231ec0..5e74f55850d 100644
--- a/public/images/pokemon/variant/back/572.json
+++ b/public/images/pokemon/variant/back/572.json
@@ -1,18 +1,20 @@
 {
 	"1": {
-		"8c847b": "b2af6e",
-		"524a42": "524a42",
-		"ffffff": "feffd9",
-		"decec5": "decec5",
-		"bdb5a5": "dad7a1",
-		"101010": "101010"
+		"ffffff": "b3e8ba",
+		"4d473d": "802b50",
+		"524940": "428066",
+		"decec5": "87cc9a",
+		"bdb5a5": "cf6b77",
+		"918a83": "60a37b",
+		"8c847b": "b34967"
 	},
 	"2": {
-		"8c847b": "86aaa7",
-		"524a42": "5f807e",
-		"ffffff": "ffffff",
-		"decec5": "d7e8e6",
-		"bdb5a5": "aec8c6",
-		"101010": "101010"
+		"ffffff": "d9e3aa",
+		"4d473d": "101931",
+		"524940": "466336",
+		"decec5": "7f915e",
+		"bdb5a5": "294a6b",
+		"918a83": "67824d",
+		"8c847b": "193457"
 	}
 }
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/573.json b/public/images/pokemon/variant/back/573.json
new file mode 100644
index 00000000000..d3ceaf257b4
--- /dev/null
+++ b/public/images/pokemon/variant/back/573.json
@@ -0,0 +1,24 @@
+{
+	"1": {
+		"524a42": "802b50",
+		"bdb5b5": "60a67c",
+		"847b73": "b34967",
+		"ffffff": "b3e8ba",
+		"bdad9c": "cf6b77",
+		"decec5": "87cc9a",
+		"d65252": "256145",
+		"807871": "458766",
+		"ef8484": "58a672"
+	},
+	"2": {
+		"524a42": "101931",
+		"bdb5b5": "597041",
+		"847b73": "193457",
+		"ffffff": "d9e3aa",
+		"bdad9c": "294a6b",
+		"decec5": "7f915e",
+		"d65252": "558f45",
+		"807871": "3d542d",
+		"ef8484": "b4cf88"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/618.json b/public/images/pokemon/variant/back/618.json
new file mode 100644
index 00000000000..d4db4967946
--- /dev/null
+++ b/public/images/pokemon/variant/back/618.json
@@ -0,0 +1,40 @@
+{
+	"1": {
+		"cebd00": "bdac99",
+		"ffff00": "f3e6dd",
+		"6b6319": "987b6d",
+		"081019": "081019",
+		"52423a": "312118",
+		"6b524a": "4a342a",
+		"bd846b": "8c3841",
+		"846b63": "6b3838",
+		"d69c84": "ad4c4c",
+		"efce42": "eac2bd",
+		"d6cec5": "d6cec5",
+		"ffffff": "ffffff",
+		"081018": "081018",
+		"735a52": "564038",
+		"735a53": "564038",
+		"9c8473": "a08773",
+		"bda59c": "e6dbd6"
+	},
+	"2": {
+		"cebd00": "58536b",
+		"ffff00": "707488",
+		"6b6319": "39314a",
+		"081019": "081019",
+		"52423a": "5a2e2e",
+		"6b524a": "804e48",
+		"bd846b": "cec9b1",
+		"846b63": "9c7765",
+		"d69c84": "f0ead6",
+		"efce42": "9fadb9",
+		"d6cec5": "4c8c4c",
+		"ffffff": "79a962",
+		"081018": "204a29",
+		"735a52": "885011",
+		"735a53": "735555",
+		"9c8473": "c18a2c",
+		"bda59c": "efc44b"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/618_2.json b/public/images/pokemon/variant/back/618_2.json
deleted file mode 100644
index d82c52e26e2..00000000000
--- a/public/images/pokemon/variant/back/618_2.json
+++ /dev/null
@@ -1,2750 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "618_2.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 221,
-				"h": 221
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 77,
-						"h": 30
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 77,
-						"h": 30
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 77,
-						"h": 30
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 77,
-						"h": 30
-					}
-				},
-				{
-					"filename": "0045.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 77,
-						"h": 30
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 77,
-						"h": 30
-					}
-				},
-				{
-					"filename": "0046.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 77,
-						"h": 30
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 77,
-						"h": 30
-					}
-				},
-				{
-					"filename": "0097.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 77,
-						"h": 30
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 77,
-						"h": 30
-					}
-				},
-				{
-					"filename": "0098.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 77,
-						"h": 30
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 77,
-						"h": 30
-					}
-				},
-				{
-					"filename": "0123.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 77,
-						"h": 30
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 77,
-						"h": 30
-					}
-				},
-				{
-					"filename": "0124.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 77,
-						"h": 30
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 77,
-						"h": 30
-					}
-				},
-				{
-					"filename": "0059.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 77,
-						"h": 26
-					},
-					"frame": {
-						"x": 77,
-						"y": 0,
-						"w": 77,
-						"h": 26
-					}
-				},
-				{
-					"filename": "0060.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 77,
-						"h": 26
-					},
-					"frame": {
-						"x": 77,
-						"y": 0,
-						"w": 77,
-						"h": 26
-					}
-				},
-				{
-					"filename": "0063.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 77,
-						"h": 26
-					},
-					"frame": {
-						"x": 77,
-						"y": 0,
-						"w": 77,
-						"h": 26
-					}
-				},
-				{
-					"filename": "0064.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 77,
-						"h": 26
-					},
-					"frame": {
-						"x": 77,
-						"y": 0,
-						"w": 77,
-						"h": 26
-					}
-				},
-				{
-					"filename": "0067.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 77,
-						"h": 26
-					},
-					"frame": {
-						"x": 77,
-						"y": 0,
-						"w": 77,
-						"h": 26
-					}
-				},
-				{
-					"filename": "0068.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 77,
-						"h": 26
-					},
-					"frame": {
-						"x": 77,
-						"y": 0,
-						"w": 77,
-						"h": 26
-					}
-				},
-				{
-					"filename": "0071.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 77,
-						"h": 26
-					},
-					"frame": {
-						"x": 77,
-						"y": 0,
-						"w": 77,
-						"h": 26
-					}
-				},
-				{
-					"filename": "0072.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 77,
-						"h": 26
-					},
-					"frame": {
-						"x": 77,
-						"y": 0,
-						"w": 77,
-						"h": 26
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 76,
-						"h": 32
-					},
-					"frame": {
-						"x": 77,
-						"y": 26,
-						"w": 76,
-						"h": 32
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 76,
-						"h": 32
-					},
-					"frame": {
-						"x": 77,
-						"y": 26,
-						"w": 76,
-						"h": 32
-					}
-				},
-				{
-					"filename": "0041.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 76,
-						"h": 32
-					},
-					"frame": {
-						"x": 77,
-						"y": 26,
-						"w": 76,
-						"h": 32
-					}
-				},
-				{
-					"filename": "0042.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 76,
-						"h": 32
-					},
-					"frame": {
-						"x": 77,
-						"y": 26,
-						"w": 76,
-						"h": 32
-					}
-				},
-				{
-					"filename": "0093.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 76,
-						"h": 32
-					},
-					"frame": {
-						"x": 77,
-						"y": 26,
-						"w": 76,
-						"h": 32
-					}
-				},
-				{
-					"filename": "0094.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 76,
-						"h": 32
-					},
-					"frame": {
-						"x": 77,
-						"y": 26,
-						"w": 76,
-						"h": 32
-					}
-				},
-				{
-					"filename": "0119.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 76,
-						"h": 32
-					},
-					"frame": {
-						"x": 77,
-						"y": 26,
-						"w": 76,
-						"h": 32
-					}
-				},
-				{
-					"filename": "0120.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 76,
-						"h": 32
-					},
-					"frame": {
-						"x": 77,
-						"y": 26,
-						"w": 76,
-						"h": 32
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 76,
-						"h": 31
-					},
-					"frame": {
-						"x": 0,
-						"y": 30,
-						"w": 76,
-						"h": 31
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 76,
-						"h": 31
-					},
-					"frame": {
-						"x": 0,
-						"y": 30,
-						"w": 76,
-						"h": 31
-					}
-				},
-				{
-					"filename": "0043.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 76,
-						"h": 31
-					},
-					"frame": {
-						"x": 0,
-						"y": 30,
-						"w": 76,
-						"h": 31
-					}
-				},
-				{
-					"filename": "0044.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 76,
-						"h": 31
-					},
-					"frame": {
-						"x": 0,
-						"y": 30,
-						"w": 76,
-						"h": 31
-					}
-				},
-				{
-					"filename": "0095.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 76,
-						"h": 31
-					},
-					"frame": {
-						"x": 0,
-						"y": 30,
-						"w": 76,
-						"h": 31
-					}
-				},
-				{
-					"filename": "0096.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 76,
-						"h": 31
-					},
-					"frame": {
-						"x": 0,
-						"y": 30,
-						"w": 76,
-						"h": 31
-					}
-				},
-				{
-					"filename": "0121.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 76,
-						"h": 31
-					},
-					"frame": {
-						"x": 0,
-						"y": 30,
-						"w": 76,
-						"h": 31
-					}
-				},
-				{
-					"filename": "0122.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 76,
-						"h": 31
-					},
-					"frame": {
-						"x": 0,
-						"y": 30,
-						"w": 76,
-						"h": 31
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 76,
-						"h": 29
-					},
-					"frame": {
-						"x": 76,
-						"y": 58,
-						"w": 76,
-						"h": 29
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 76,
-						"h": 29
-					},
-					"frame": {
-						"x": 76,
-						"y": 58,
-						"w": 76,
-						"h": 29
-					}
-				},
-				{
-					"filename": "0047.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 76,
-						"h": 29
-					},
-					"frame": {
-						"x": 76,
-						"y": 58,
-						"w": 76,
-						"h": 29
-					}
-				},
-				{
-					"filename": "0048.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 76,
-						"h": 29
-					},
-					"frame": {
-						"x": 76,
-						"y": 58,
-						"w": 76,
-						"h": 29
-					}
-				},
-				{
-					"filename": "0099.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 76,
-						"h": 29
-					},
-					"frame": {
-						"x": 76,
-						"y": 58,
-						"w": 76,
-						"h": 29
-					}
-				},
-				{
-					"filename": "0100.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 76,
-						"h": 29
-					},
-					"frame": {
-						"x": 76,
-						"y": 58,
-						"w": 76,
-						"h": 29
-					}
-				},
-				{
-					"filename": "0125.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 76,
-						"h": 29
-					},
-					"frame": {
-						"x": 76,
-						"y": 58,
-						"w": 76,
-						"h": 29
-					}
-				},
-				{
-					"filename": "0126.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 76,
-						"h": 29
-					},
-					"frame": {
-						"x": 76,
-						"y": 58,
-						"w": 76,
-						"h": 29
-					}
-				},
-				{
-					"filename": "0057.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 76,
-						"h": 27
-					},
-					"frame": {
-						"x": 0,
-						"y": 61,
-						"w": 76,
-						"h": 27
-					}
-				},
-				{
-					"filename": "0058.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 76,
-						"h": 27
-					},
-					"frame": {
-						"x": 0,
-						"y": 61,
-						"w": 76,
-						"h": 27
-					}
-				},
-				{
-					"filename": "0073.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 76,
-						"h": 27
-					},
-					"frame": {
-						"x": 0,
-						"y": 61,
-						"w": 76,
-						"h": 27
-					}
-				},
-				{
-					"filename": "0074.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 76,
-						"h": 27
-					},
-					"frame": {
-						"x": 0,
-						"y": 61,
-						"w": 76,
-						"h": 27
-					}
-				},
-				{
-					"filename": "0055.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 6,
-						"w": 76,
-						"h": 26
-					},
-					"frame": {
-						"x": 76,
-						"y": 87,
-						"w": 76,
-						"h": 26
-					}
-				},
-				{
-					"filename": "0056.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 6,
-						"w": 76,
-						"h": 26
-					},
-					"frame": {
-						"x": 76,
-						"y": 87,
-						"w": 76,
-						"h": 26
-					}
-				},
-				{
-					"filename": "0075.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 6,
-						"w": 76,
-						"h": 26
-					},
-					"frame": {
-						"x": 76,
-						"y": 87,
-						"w": 76,
-						"h": 26
-					}
-				},
-				{
-					"filename": "0076.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 6,
-						"w": 76,
-						"h": 26
-					},
-					"frame": {
-						"x": 76,
-						"y": 87,
-						"w": 76,
-						"h": 26
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 75,
-						"h": 32
-					},
-					"frame": {
-						"x": 0,
-						"y": 88,
-						"w": 75,
-						"h": 32
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 75,
-						"h": 32
-					},
-					"frame": {
-						"x": 0,
-						"y": 88,
-						"w": 75,
-						"h": 32
-					}
-				},
-				{
-					"filename": "0037.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 75,
-						"h": 32
-					},
-					"frame": {
-						"x": 0,
-						"y": 88,
-						"w": 75,
-						"h": 32
-					}
-				},
-				{
-					"filename": "0038.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 75,
-						"h": 32
-					},
-					"frame": {
-						"x": 0,
-						"y": 88,
-						"w": 75,
-						"h": 32
-					}
-				},
-				{
-					"filename": "0089.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 75,
-						"h": 32
-					},
-					"frame": {
-						"x": 0,
-						"y": 88,
-						"w": 75,
-						"h": 32
-					}
-				},
-				{
-					"filename": "0090.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 75,
-						"h": 32
-					},
-					"frame": {
-						"x": 0,
-						"y": 88,
-						"w": 75,
-						"h": 32
-					}
-				},
-				{
-					"filename": "0115.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 75,
-						"h": 32
-					},
-					"frame": {
-						"x": 0,
-						"y": 88,
-						"w": 75,
-						"h": 32
-					}
-				},
-				{
-					"filename": "0116.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 75,
-						"h": 32
-					},
-					"frame": {
-						"x": 0,
-						"y": 88,
-						"w": 75,
-						"h": 32
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 32
-					},
-					"frame": {
-						"x": 0,
-						"y": 120,
-						"w": 75,
-						"h": 32
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 32
-					},
-					"frame": {
-						"x": 0,
-						"y": 120,
-						"w": 75,
-						"h": 32
-					}
-				},
-				{
-					"filename": "0039.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 32
-					},
-					"frame": {
-						"x": 0,
-						"y": 120,
-						"w": 75,
-						"h": 32
-					}
-				},
-				{
-					"filename": "0040.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 32
-					},
-					"frame": {
-						"x": 0,
-						"y": 120,
-						"w": 75,
-						"h": 32
-					}
-				},
-				{
-					"filename": "0091.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 32
-					},
-					"frame": {
-						"x": 0,
-						"y": 120,
-						"w": 75,
-						"h": 32
-					}
-				},
-				{
-					"filename": "0092.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 32
-					},
-					"frame": {
-						"x": 0,
-						"y": 120,
-						"w": 75,
-						"h": 32
-					}
-				},
-				{
-					"filename": "0117.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 32
-					},
-					"frame": {
-						"x": 0,
-						"y": 120,
-						"w": 75,
-						"h": 32
-					}
-				},
-				{
-					"filename": "0118.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 32
-					},
-					"frame": {
-						"x": 0,
-						"y": 120,
-						"w": 75,
-						"h": 32
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 73,
-						"h": 32
-					},
-					"frame": {
-						"x": 0,
-						"y": 152,
-						"w": 73,
-						"h": 32
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 73,
-						"h": 32
-					},
-					"frame": {
-						"x": 0,
-						"y": 152,
-						"w": 73,
-						"h": 32
-					}
-				},
-				{
-					"filename": "0035.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 73,
-						"h": 32
-					},
-					"frame": {
-						"x": 0,
-						"y": 152,
-						"w": 73,
-						"h": 32
-					}
-				},
-				{
-					"filename": "0036.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 73,
-						"h": 32
-					},
-					"frame": {
-						"x": 0,
-						"y": 152,
-						"w": 73,
-						"h": 32
-					}
-				},
-				{
-					"filename": "0087.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 73,
-						"h": 32
-					},
-					"frame": {
-						"x": 0,
-						"y": 152,
-						"w": 73,
-						"h": 32
-					}
-				},
-				{
-					"filename": "0088.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 73,
-						"h": 32
-					},
-					"frame": {
-						"x": 0,
-						"y": 152,
-						"w": 73,
-						"h": 32
-					}
-				},
-				{
-					"filename": "0113.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 73,
-						"h": 32
-					},
-					"frame": {
-						"x": 0,
-						"y": 152,
-						"w": 73,
-						"h": 32
-					}
-				},
-				{
-					"filename": "0114.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 73,
-						"h": 32
-					},
-					"frame": {
-						"x": 0,
-						"y": 152,
-						"w": 73,
-						"h": 32
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 73,
-						"h": 31
-					},
-					"frame": {
-						"x": 0,
-						"y": 184,
-						"w": 73,
-						"h": 31
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 73,
-						"h": 31
-					},
-					"frame": {
-						"x": 0,
-						"y": 184,
-						"w": 73,
-						"h": 31
-					}
-				},
-				{
-					"filename": "0033.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 73,
-						"h": 31
-					},
-					"frame": {
-						"x": 0,
-						"y": 184,
-						"w": 73,
-						"h": 31
-					}
-				},
-				{
-					"filename": "0034.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 73,
-						"h": 31
-					},
-					"frame": {
-						"x": 0,
-						"y": 184,
-						"w": 73,
-						"h": 31
-					}
-				},
-				{
-					"filename": "0085.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 73,
-						"h": 31
-					},
-					"frame": {
-						"x": 0,
-						"y": 184,
-						"w": 73,
-						"h": 31
-					}
-				},
-				{
-					"filename": "0086.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 73,
-						"h": 31
-					},
-					"frame": {
-						"x": 0,
-						"y": 184,
-						"w": 73,
-						"h": 31
-					}
-				},
-				{
-					"filename": "0111.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 73,
-						"h": 31
-					},
-					"frame": {
-						"x": 0,
-						"y": 184,
-						"w": 73,
-						"h": 31
-					}
-				},
-				{
-					"filename": "0112.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 73,
-						"h": 31
-					},
-					"frame": {
-						"x": 0,
-						"y": 184,
-						"w": 73,
-						"h": 31
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 2,
-						"w": 73,
-						"h": 30
-					},
-					"frame": {
-						"x": 73,
-						"y": 152,
-						"w": 73,
-						"h": 30
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 2,
-						"w": 73,
-						"h": 30
-					},
-					"frame": {
-						"x": 73,
-						"y": 152,
-						"w": 73,
-						"h": 30
-					}
-				},
-				{
-					"filename": "0031.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 2,
-						"w": 73,
-						"h": 30
-					},
-					"frame": {
-						"x": 73,
-						"y": 152,
-						"w": 73,
-						"h": 30
-					}
-				},
-				{
-					"filename": "0032.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 2,
-						"w": 73,
-						"h": 30
-					},
-					"frame": {
-						"x": 73,
-						"y": 152,
-						"w": 73,
-						"h": 30
-					}
-				},
-				{
-					"filename": "0083.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 2,
-						"w": 73,
-						"h": 30
-					},
-					"frame": {
-						"x": 73,
-						"y": 152,
-						"w": 73,
-						"h": 30
-					}
-				},
-				{
-					"filename": "0084.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 2,
-						"w": 73,
-						"h": 30
-					},
-					"frame": {
-						"x": 73,
-						"y": 152,
-						"w": 73,
-						"h": 30
-					}
-				},
-				{
-					"filename": "0109.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 2,
-						"w": 73,
-						"h": 30
-					},
-					"frame": {
-						"x": 73,
-						"y": 152,
-						"w": 73,
-						"h": 30
-					}
-				},
-				{
-					"filename": "0110.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 2,
-						"w": 73,
-						"h": 30
-					},
-					"frame": {
-						"x": 73,
-						"y": 152,
-						"w": 73,
-						"h": 30
-					}
-				},
-				{
-					"filename": "0053.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 4,
-						"w": 75,
-						"h": 27
-					},
-					"frame": {
-						"x": 146,
-						"y": 113,
-						"w": 75,
-						"h": 27
-					}
-				},
-				{
-					"filename": "0054.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 4,
-						"w": 75,
-						"h": 27
-					},
-					"frame": {
-						"x": 146,
-						"y": 113,
-						"w": 75,
-						"h": 27
-					}
-				},
-				{
-					"filename": "0061.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 4,
-						"w": 75,
-						"h": 27
-					},
-					"frame": {
-						"x": 146,
-						"y": 113,
-						"w": 75,
-						"h": 27
-					}
-				},
-				{
-					"filename": "0062.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 4,
-						"w": 75,
-						"h": 27
-					},
-					"frame": {
-						"x": 146,
-						"y": 113,
-						"w": 75,
-						"h": 27
-					}
-				},
-				{
-					"filename": "0065.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 4,
-						"w": 75,
-						"h": 27
-					},
-					"frame": {
-						"x": 146,
-						"y": 113,
-						"w": 75,
-						"h": 27
-					}
-				},
-				{
-					"filename": "0066.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 4,
-						"w": 75,
-						"h": 27
-					},
-					"frame": {
-						"x": 146,
-						"y": 113,
-						"w": 75,
-						"h": 27
-					}
-				},
-				{
-					"filename": "0069.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 4,
-						"w": 75,
-						"h": 27
-					},
-					"frame": {
-						"x": 146,
-						"y": 113,
-						"w": 75,
-						"h": 27
-					}
-				},
-				{
-					"filename": "0070.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 4,
-						"w": 75,
-						"h": 27
-					},
-					"frame": {
-						"x": 146,
-						"y": 113,
-						"w": 75,
-						"h": 27
-					}
-				},
-				{
-					"filename": "0077.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 4,
-						"w": 75,
-						"h": 27
-					},
-					"frame": {
-						"x": 146,
-						"y": 113,
-						"w": 75,
-						"h": 27
-					}
-				},
-				{
-					"filename": "0078.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 4,
-						"w": 75,
-						"h": 27
-					},
-					"frame": {
-						"x": 146,
-						"y": 113,
-						"w": 75,
-						"h": 27
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 74,
-						"h": 28
-					},
-					"frame": {
-						"x": 146,
-						"y": 140,
-						"w": 74,
-						"h": 28
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 74,
-						"h": 28
-					},
-					"frame": {
-						"x": 146,
-						"y": 140,
-						"w": 74,
-						"h": 28
-					}
-				},
-				{
-					"filename": "0049.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 74,
-						"h": 28
-					},
-					"frame": {
-						"x": 146,
-						"y": 140,
-						"w": 74,
-						"h": 28
-					}
-				},
-				{
-					"filename": "0050.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 74,
-						"h": 28
-					},
-					"frame": {
-						"x": 146,
-						"y": 140,
-						"w": 74,
-						"h": 28
-					}
-				},
-				{
-					"filename": "0101.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 74,
-						"h": 28
-					},
-					"frame": {
-						"x": 146,
-						"y": 140,
-						"w": 74,
-						"h": 28
-					}
-				},
-				{
-					"filename": "0102.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 74,
-						"h": 28
-					},
-					"frame": {
-						"x": 146,
-						"y": 140,
-						"w": 74,
-						"h": 28
-					}
-				},
-				{
-					"filename": "0127.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 74,
-						"h": 28
-					},
-					"frame": {
-						"x": 146,
-						"y": 140,
-						"w": 74,
-						"h": 28
-					}
-				},
-				{
-					"filename": "0128.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 74,
-						"h": 28
-					},
-					"frame": {
-						"x": 146,
-						"y": 140,
-						"w": 74,
-						"h": 28
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 73,
-						"h": 29
-					},
-					"frame": {
-						"x": 146,
-						"y": 168,
-						"w": 73,
-						"h": 29
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 73,
-						"h": 29
-					},
-					"frame": {
-						"x": 146,
-						"y": 168,
-						"w": 73,
-						"h": 29
-					}
-				},
-				{
-					"filename": "0029.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 73,
-						"h": 29
-					},
-					"frame": {
-						"x": 146,
-						"y": 168,
-						"w": 73,
-						"h": 29
-					}
-				},
-				{
-					"filename": "0030.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 73,
-						"h": 29
-					},
-					"frame": {
-						"x": 146,
-						"y": 168,
-						"w": 73,
-						"h": 29
-					}
-				},
-				{
-					"filename": "0081.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 73,
-						"h": 29
-					},
-					"frame": {
-						"x": 146,
-						"y": 168,
-						"w": 73,
-						"h": 29
-					}
-				},
-				{
-					"filename": "0082.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 73,
-						"h": 29
-					},
-					"frame": {
-						"x": 146,
-						"y": 168,
-						"w": 73,
-						"h": 29
-					}
-				},
-				{
-					"filename": "0107.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 73,
-						"h": 29
-					},
-					"frame": {
-						"x": 146,
-						"y": 168,
-						"w": 73,
-						"h": 29
-					}
-				},
-				{
-					"filename": "0108.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 73,
-						"h": 29
-					},
-					"frame": {
-						"x": 146,
-						"y": 168,
-						"w": 73,
-						"h": 29
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 73,
-						"h": 28
-					},
-					"frame": {
-						"x": 73,
-						"y": 182,
-						"w": 73,
-						"h": 28
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 73,
-						"h": 28
-					},
-					"frame": {
-						"x": 73,
-						"y": 182,
-						"w": 73,
-						"h": 28
-					}
-				},
-				{
-					"filename": "0025.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 73,
-						"h": 28
-					},
-					"frame": {
-						"x": 73,
-						"y": 182,
-						"w": 73,
-						"h": 28
-					}
-				},
-				{
-					"filename": "0026.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 73,
-						"h": 28
-					},
-					"frame": {
-						"x": 73,
-						"y": 182,
-						"w": 73,
-						"h": 28
-					}
-				},
-				{
-					"filename": "0027.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 73,
-						"h": 28
-					},
-					"frame": {
-						"x": 73,
-						"y": 182,
-						"w": 73,
-						"h": 28
-					}
-				},
-				{
-					"filename": "0028.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 73,
-						"h": 28
-					},
-					"frame": {
-						"x": 73,
-						"y": 182,
-						"w": 73,
-						"h": 28
-					}
-				},
-				{
-					"filename": "0051.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 73,
-						"h": 28
-					},
-					"frame": {
-						"x": 73,
-						"y": 182,
-						"w": 73,
-						"h": 28
-					}
-				},
-				{
-					"filename": "0052.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 73,
-						"h": 28
-					},
-					"frame": {
-						"x": 73,
-						"y": 182,
-						"w": 73,
-						"h": 28
-					}
-				},
-				{
-					"filename": "0079.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 73,
-						"h": 28
-					},
-					"frame": {
-						"x": 73,
-						"y": 182,
-						"w": 73,
-						"h": 28
-					}
-				},
-				{
-					"filename": "0080.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 73,
-						"h": 28
-					},
-					"frame": {
-						"x": 73,
-						"y": 182,
-						"w": 73,
-						"h": 28
-					}
-				},
-				{
-					"filename": "0103.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 73,
-						"h": 28
-					},
-					"frame": {
-						"x": 73,
-						"y": 182,
-						"w": 73,
-						"h": 28
-					}
-				},
-				{
-					"filename": "0104.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 73,
-						"h": 28
-					},
-					"frame": {
-						"x": 73,
-						"y": 182,
-						"w": 73,
-						"h": 28
-					}
-				},
-				{
-					"filename": "0105.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 73,
-						"h": 28
-					},
-					"frame": {
-						"x": 73,
-						"y": 182,
-						"w": 73,
-						"h": 28
-					}
-				},
-				{
-					"filename": "0106.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 73,
-						"h": 28
-					},
-					"frame": {
-						"x": 73,
-						"y": 182,
-						"w": 73,
-						"h": 28
-					}
-				},
-				{
-					"filename": "0129.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 73,
-						"h": 28
-					},
-					"frame": {
-						"x": 73,
-						"y": 182,
-						"w": 73,
-						"h": 28
-					}
-				},
-				{
-					"filename": "0130.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 73,
-						"h": 28
-					},
-					"frame": {
-						"x": 73,
-						"y": 182,
-						"w": 73,
-						"h": 28
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:7ed241f9d4e0679b62ab26da17057d65:739de537da7171a9caf5769b4458f68f:22e585907b89e90c4fc3ab2512d175fd$"
-	}
-}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/618_2.png b/public/images/pokemon/variant/back/618_2.png
deleted file mode 100644
index a0077a1f023..00000000000
Binary files a/public/images/pokemon/variant/back/618_2.png and /dev/null differ
diff --git a/public/images/pokemon/variant/back/618_3.json b/public/images/pokemon/variant/back/618_3.json
deleted file mode 100644
index 17c49c5e59b..00000000000
--- a/public/images/pokemon/variant/back/618_3.json
+++ /dev/null
@@ -1,2750 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "618_3.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 221,
-				"h": 221
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 77,
-						"h": 30
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 77,
-						"h": 30
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 77,
-						"h": 30
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 77,
-						"h": 30
-					}
-				},
-				{
-					"filename": "0045.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 77,
-						"h": 30
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 77,
-						"h": 30
-					}
-				},
-				{
-					"filename": "0046.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 77,
-						"h": 30
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 77,
-						"h": 30
-					}
-				},
-				{
-					"filename": "0097.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 77,
-						"h": 30
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 77,
-						"h": 30
-					}
-				},
-				{
-					"filename": "0098.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 77,
-						"h": 30
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 77,
-						"h": 30
-					}
-				},
-				{
-					"filename": "0123.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 77,
-						"h": 30
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 77,
-						"h": 30
-					}
-				},
-				{
-					"filename": "0124.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 77,
-						"h": 30
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 77,
-						"h": 30
-					}
-				},
-				{
-					"filename": "0059.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 77,
-						"h": 26
-					},
-					"frame": {
-						"x": 77,
-						"y": 0,
-						"w": 77,
-						"h": 26
-					}
-				},
-				{
-					"filename": "0060.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 77,
-						"h": 26
-					},
-					"frame": {
-						"x": 77,
-						"y": 0,
-						"w": 77,
-						"h": 26
-					}
-				},
-				{
-					"filename": "0063.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 77,
-						"h": 26
-					},
-					"frame": {
-						"x": 77,
-						"y": 0,
-						"w": 77,
-						"h": 26
-					}
-				},
-				{
-					"filename": "0064.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 77,
-						"h": 26
-					},
-					"frame": {
-						"x": 77,
-						"y": 0,
-						"w": 77,
-						"h": 26
-					}
-				},
-				{
-					"filename": "0067.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 77,
-						"h": 26
-					},
-					"frame": {
-						"x": 77,
-						"y": 0,
-						"w": 77,
-						"h": 26
-					}
-				},
-				{
-					"filename": "0068.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 77,
-						"h": 26
-					},
-					"frame": {
-						"x": 77,
-						"y": 0,
-						"w": 77,
-						"h": 26
-					}
-				},
-				{
-					"filename": "0071.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 77,
-						"h": 26
-					},
-					"frame": {
-						"x": 77,
-						"y": 0,
-						"w": 77,
-						"h": 26
-					}
-				},
-				{
-					"filename": "0072.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 77,
-						"h": 26
-					},
-					"frame": {
-						"x": 77,
-						"y": 0,
-						"w": 77,
-						"h": 26
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 76,
-						"h": 32
-					},
-					"frame": {
-						"x": 77,
-						"y": 26,
-						"w": 76,
-						"h": 32
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 76,
-						"h": 32
-					},
-					"frame": {
-						"x": 77,
-						"y": 26,
-						"w": 76,
-						"h": 32
-					}
-				},
-				{
-					"filename": "0041.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 76,
-						"h": 32
-					},
-					"frame": {
-						"x": 77,
-						"y": 26,
-						"w": 76,
-						"h": 32
-					}
-				},
-				{
-					"filename": "0042.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 76,
-						"h": 32
-					},
-					"frame": {
-						"x": 77,
-						"y": 26,
-						"w": 76,
-						"h": 32
-					}
-				},
-				{
-					"filename": "0093.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 76,
-						"h": 32
-					},
-					"frame": {
-						"x": 77,
-						"y": 26,
-						"w": 76,
-						"h": 32
-					}
-				},
-				{
-					"filename": "0094.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 76,
-						"h": 32
-					},
-					"frame": {
-						"x": 77,
-						"y": 26,
-						"w": 76,
-						"h": 32
-					}
-				},
-				{
-					"filename": "0119.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 76,
-						"h": 32
-					},
-					"frame": {
-						"x": 77,
-						"y": 26,
-						"w": 76,
-						"h": 32
-					}
-				},
-				{
-					"filename": "0120.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 76,
-						"h": 32
-					},
-					"frame": {
-						"x": 77,
-						"y": 26,
-						"w": 76,
-						"h": 32
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 76,
-						"h": 31
-					},
-					"frame": {
-						"x": 0,
-						"y": 30,
-						"w": 76,
-						"h": 31
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 76,
-						"h": 31
-					},
-					"frame": {
-						"x": 0,
-						"y": 30,
-						"w": 76,
-						"h": 31
-					}
-				},
-				{
-					"filename": "0043.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 76,
-						"h": 31
-					},
-					"frame": {
-						"x": 0,
-						"y": 30,
-						"w": 76,
-						"h": 31
-					}
-				},
-				{
-					"filename": "0044.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 76,
-						"h": 31
-					},
-					"frame": {
-						"x": 0,
-						"y": 30,
-						"w": 76,
-						"h": 31
-					}
-				},
-				{
-					"filename": "0095.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 76,
-						"h": 31
-					},
-					"frame": {
-						"x": 0,
-						"y": 30,
-						"w": 76,
-						"h": 31
-					}
-				},
-				{
-					"filename": "0096.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 76,
-						"h": 31
-					},
-					"frame": {
-						"x": 0,
-						"y": 30,
-						"w": 76,
-						"h": 31
-					}
-				},
-				{
-					"filename": "0121.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 76,
-						"h": 31
-					},
-					"frame": {
-						"x": 0,
-						"y": 30,
-						"w": 76,
-						"h": 31
-					}
-				},
-				{
-					"filename": "0122.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 76,
-						"h": 31
-					},
-					"frame": {
-						"x": 0,
-						"y": 30,
-						"w": 76,
-						"h": 31
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 76,
-						"h": 29
-					},
-					"frame": {
-						"x": 76,
-						"y": 58,
-						"w": 76,
-						"h": 29
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 76,
-						"h": 29
-					},
-					"frame": {
-						"x": 76,
-						"y": 58,
-						"w": 76,
-						"h": 29
-					}
-				},
-				{
-					"filename": "0047.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 76,
-						"h": 29
-					},
-					"frame": {
-						"x": 76,
-						"y": 58,
-						"w": 76,
-						"h": 29
-					}
-				},
-				{
-					"filename": "0048.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 76,
-						"h": 29
-					},
-					"frame": {
-						"x": 76,
-						"y": 58,
-						"w": 76,
-						"h": 29
-					}
-				},
-				{
-					"filename": "0099.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 76,
-						"h": 29
-					},
-					"frame": {
-						"x": 76,
-						"y": 58,
-						"w": 76,
-						"h": 29
-					}
-				},
-				{
-					"filename": "0100.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 76,
-						"h": 29
-					},
-					"frame": {
-						"x": 76,
-						"y": 58,
-						"w": 76,
-						"h": 29
-					}
-				},
-				{
-					"filename": "0125.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 76,
-						"h": 29
-					},
-					"frame": {
-						"x": 76,
-						"y": 58,
-						"w": 76,
-						"h": 29
-					}
-				},
-				{
-					"filename": "0126.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 76,
-						"h": 29
-					},
-					"frame": {
-						"x": 76,
-						"y": 58,
-						"w": 76,
-						"h": 29
-					}
-				},
-				{
-					"filename": "0057.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 76,
-						"h": 27
-					},
-					"frame": {
-						"x": 0,
-						"y": 61,
-						"w": 76,
-						"h": 27
-					}
-				},
-				{
-					"filename": "0058.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 76,
-						"h": 27
-					},
-					"frame": {
-						"x": 0,
-						"y": 61,
-						"w": 76,
-						"h": 27
-					}
-				},
-				{
-					"filename": "0073.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 76,
-						"h": 27
-					},
-					"frame": {
-						"x": 0,
-						"y": 61,
-						"w": 76,
-						"h": 27
-					}
-				},
-				{
-					"filename": "0074.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 76,
-						"h": 27
-					},
-					"frame": {
-						"x": 0,
-						"y": 61,
-						"w": 76,
-						"h": 27
-					}
-				},
-				{
-					"filename": "0055.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 6,
-						"w": 76,
-						"h": 26
-					},
-					"frame": {
-						"x": 76,
-						"y": 87,
-						"w": 76,
-						"h": 26
-					}
-				},
-				{
-					"filename": "0056.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 6,
-						"w": 76,
-						"h": 26
-					},
-					"frame": {
-						"x": 76,
-						"y": 87,
-						"w": 76,
-						"h": 26
-					}
-				},
-				{
-					"filename": "0075.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 6,
-						"w": 76,
-						"h": 26
-					},
-					"frame": {
-						"x": 76,
-						"y": 87,
-						"w": 76,
-						"h": 26
-					}
-				},
-				{
-					"filename": "0076.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 6,
-						"w": 76,
-						"h": 26
-					},
-					"frame": {
-						"x": 76,
-						"y": 87,
-						"w": 76,
-						"h": 26
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 75,
-						"h": 32
-					},
-					"frame": {
-						"x": 0,
-						"y": 88,
-						"w": 75,
-						"h": 32
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 75,
-						"h": 32
-					},
-					"frame": {
-						"x": 0,
-						"y": 88,
-						"w": 75,
-						"h": 32
-					}
-				},
-				{
-					"filename": "0037.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 75,
-						"h": 32
-					},
-					"frame": {
-						"x": 0,
-						"y": 88,
-						"w": 75,
-						"h": 32
-					}
-				},
-				{
-					"filename": "0038.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 75,
-						"h": 32
-					},
-					"frame": {
-						"x": 0,
-						"y": 88,
-						"w": 75,
-						"h": 32
-					}
-				},
-				{
-					"filename": "0089.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 75,
-						"h": 32
-					},
-					"frame": {
-						"x": 0,
-						"y": 88,
-						"w": 75,
-						"h": 32
-					}
-				},
-				{
-					"filename": "0090.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 75,
-						"h": 32
-					},
-					"frame": {
-						"x": 0,
-						"y": 88,
-						"w": 75,
-						"h": 32
-					}
-				},
-				{
-					"filename": "0115.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 75,
-						"h": 32
-					},
-					"frame": {
-						"x": 0,
-						"y": 88,
-						"w": 75,
-						"h": 32
-					}
-				},
-				{
-					"filename": "0116.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 75,
-						"h": 32
-					},
-					"frame": {
-						"x": 0,
-						"y": 88,
-						"w": 75,
-						"h": 32
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 32
-					},
-					"frame": {
-						"x": 0,
-						"y": 120,
-						"w": 75,
-						"h": 32
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 32
-					},
-					"frame": {
-						"x": 0,
-						"y": 120,
-						"w": 75,
-						"h": 32
-					}
-				},
-				{
-					"filename": "0039.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 32
-					},
-					"frame": {
-						"x": 0,
-						"y": 120,
-						"w": 75,
-						"h": 32
-					}
-				},
-				{
-					"filename": "0040.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 32
-					},
-					"frame": {
-						"x": 0,
-						"y": 120,
-						"w": 75,
-						"h": 32
-					}
-				},
-				{
-					"filename": "0091.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 32
-					},
-					"frame": {
-						"x": 0,
-						"y": 120,
-						"w": 75,
-						"h": 32
-					}
-				},
-				{
-					"filename": "0092.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 32
-					},
-					"frame": {
-						"x": 0,
-						"y": 120,
-						"w": 75,
-						"h": 32
-					}
-				},
-				{
-					"filename": "0117.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 32
-					},
-					"frame": {
-						"x": 0,
-						"y": 120,
-						"w": 75,
-						"h": 32
-					}
-				},
-				{
-					"filename": "0118.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 32
-					},
-					"frame": {
-						"x": 0,
-						"y": 120,
-						"w": 75,
-						"h": 32
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 73,
-						"h": 32
-					},
-					"frame": {
-						"x": 0,
-						"y": 152,
-						"w": 73,
-						"h": 32
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 73,
-						"h": 32
-					},
-					"frame": {
-						"x": 0,
-						"y": 152,
-						"w": 73,
-						"h": 32
-					}
-				},
-				{
-					"filename": "0035.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 73,
-						"h": 32
-					},
-					"frame": {
-						"x": 0,
-						"y": 152,
-						"w": 73,
-						"h": 32
-					}
-				},
-				{
-					"filename": "0036.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 73,
-						"h": 32
-					},
-					"frame": {
-						"x": 0,
-						"y": 152,
-						"w": 73,
-						"h": 32
-					}
-				},
-				{
-					"filename": "0087.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 73,
-						"h": 32
-					},
-					"frame": {
-						"x": 0,
-						"y": 152,
-						"w": 73,
-						"h": 32
-					}
-				},
-				{
-					"filename": "0088.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 73,
-						"h": 32
-					},
-					"frame": {
-						"x": 0,
-						"y": 152,
-						"w": 73,
-						"h": 32
-					}
-				},
-				{
-					"filename": "0113.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 73,
-						"h": 32
-					},
-					"frame": {
-						"x": 0,
-						"y": 152,
-						"w": 73,
-						"h": 32
-					}
-				},
-				{
-					"filename": "0114.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 73,
-						"h": 32
-					},
-					"frame": {
-						"x": 0,
-						"y": 152,
-						"w": 73,
-						"h": 32
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 73,
-						"h": 31
-					},
-					"frame": {
-						"x": 0,
-						"y": 184,
-						"w": 73,
-						"h": 31
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 73,
-						"h": 31
-					},
-					"frame": {
-						"x": 0,
-						"y": 184,
-						"w": 73,
-						"h": 31
-					}
-				},
-				{
-					"filename": "0033.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 73,
-						"h": 31
-					},
-					"frame": {
-						"x": 0,
-						"y": 184,
-						"w": 73,
-						"h": 31
-					}
-				},
-				{
-					"filename": "0034.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 73,
-						"h": 31
-					},
-					"frame": {
-						"x": 0,
-						"y": 184,
-						"w": 73,
-						"h": 31
-					}
-				},
-				{
-					"filename": "0085.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 73,
-						"h": 31
-					},
-					"frame": {
-						"x": 0,
-						"y": 184,
-						"w": 73,
-						"h": 31
-					}
-				},
-				{
-					"filename": "0086.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 73,
-						"h": 31
-					},
-					"frame": {
-						"x": 0,
-						"y": 184,
-						"w": 73,
-						"h": 31
-					}
-				},
-				{
-					"filename": "0111.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 73,
-						"h": 31
-					},
-					"frame": {
-						"x": 0,
-						"y": 184,
-						"w": 73,
-						"h": 31
-					}
-				},
-				{
-					"filename": "0112.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 73,
-						"h": 31
-					},
-					"frame": {
-						"x": 0,
-						"y": 184,
-						"w": 73,
-						"h": 31
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 2,
-						"w": 73,
-						"h": 30
-					},
-					"frame": {
-						"x": 73,
-						"y": 152,
-						"w": 73,
-						"h": 30
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 2,
-						"w": 73,
-						"h": 30
-					},
-					"frame": {
-						"x": 73,
-						"y": 152,
-						"w": 73,
-						"h": 30
-					}
-				},
-				{
-					"filename": "0031.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 2,
-						"w": 73,
-						"h": 30
-					},
-					"frame": {
-						"x": 73,
-						"y": 152,
-						"w": 73,
-						"h": 30
-					}
-				},
-				{
-					"filename": "0032.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 2,
-						"w": 73,
-						"h": 30
-					},
-					"frame": {
-						"x": 73,
-						"y": 152,
-						"w": 73,
-						"h": 30
-					}
-				},
-				{
-					"filename": "0083.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 2,
-						"w": 73,
-						"h": 30
-					},
-					"frame": {
-						"x": 73,
-						"y": 152,
-						"w": 73,
-						"h": 30
-					}
-				},
-				{
-					"filename": "0084.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 2,
-						"w": 73,
-						"h": 30
-					},
-					"frame": {
-						"x": 73,
-						"y": 152,
-						"w": 73,
-						"h": 30
-					}
-				},
-				{
-					"filename": "0109.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 2,
-						"w": 73,
-						"h": 30
-					},
-					"frame": {
-						"x": 73,
-						"y": 152,
-						"w": 73,
-						"h": 30
-					}
-				},
-				{
-					"filename": "0110.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 2,
-						"w": 73,
-						"h": 30
-					},
-					"frame": {
-						"x": 73,
-						"y": 152,
-						"w": 73,
-						"h": 30
-					}
-				},
-				{
-					"filename": "0053.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 4,
-						"w": 75,
-						"h": 27
-					},
-					"frame": {
-						"x": 146,
-						"y": 113,
-						"w": 75,
-						"h": 27
-					}
-				},
-				{
-					"filename": "0054.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 4,
-						"w": 75,
-						"h": 27
-					},
-					"frame": {
-						"x": 146,
-						"y": 113,
-						"w": 75,
-						"h": 27
-					}
-				},
-				{
-					"filename": "0061.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 4,
-						"w": 75,
-						"h": 27
-					},
-					"frame": {
-						"x": 146,
-						"y": 113,
-						"w": 75,
-						"h": 27
-					}
-				},
-				{
-					"filename": "0062.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 4,
-						"w": 75,
-						"h": 27
-					},
-					"frame": {
-						"x": 146,
-						"y": 113,
-						"w": 75,
-						"h": 27
-					}
-				},
-				{
-					"filename": "0065.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 4,
-						"w": 75,
-						"h": 27
-					},
-					"frame": {
-						"x": 146,
-						"y": 113,
-						"w": 75,
-						"h": 27
-					}
-				},
-				{
-					"filename": "0066.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 4,
-						"w": 75,
-						"h": 27
-					},
-					"frame": {
-						"x": 146,
-						"y": 113,
-						"w": 75,
-						"h": 27
-					}
-				},
-				{
-					"filename": "0069.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 4,
-						"w": 75,
-						"h": 27
-					},
-					"frame": {
-						"x": 146,
-						"y": 113,
-						"w": 75,
-						"h": 27
-					}
-				},
-				{
-					"filename": "0070.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 4,
-						"w": 75,
-						"h": 27
-					},
-					"frame": {
-						"x": 146,
-						"y": 113,
-						"w": 75,
-						"h": 27
-					}
-				},
-				{
-					"filename": "0077.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 4,
-						"w": 75,
-						"h": 27
-					},
-					"frame": {
-						"x": 146,
-						"y": 113,
-						"w": 75,
-						"h": 27
-					}
-				},
-				{
-					"filename": "0078.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 4,
-						"w": 75,
-						"h": 27
-					},
-					"frame": {
-						"x": 146,
-						"y": 113,
-						"w": 75,
-						"h": 27
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 74,
-						"h": 28
-					},
-					"frame": {
-						"x": 146,
-						"y": 140,
-						"w": 74,
-						"h": 28
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 74,
-						"h": 28
-					},
-					"frame": {
-						"x": 146,
-						"y": 140,
-						"w": 74,
-						"h": 28
-					}
-				},
-				{
-					"filename": "0049.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 74,
-						"h": 28
-					},
-					"frame": {
-						"x": 146,
-						"y": 140,
-						"w": 74,
-						"h": 28
-					}
-				},
-				{
-					"filename": "0050.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 74,
-						"h": 28
-					},
-					"frame": {
-						"x": 146,
-						"y": 140,
-						"w": 74,
-						"h": 28
-					}
-				},
-				{
-					"filename": "0101.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 74,
-						"h": 28
-					},
-					"frame": {
-						"x": 146,
-						"y": 140,
-						"w": 74,
-						"h": 28
-					}
-				},
-				{
-					"filename": "0102.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 74,
-						"h": 28
-					},
-					"frame": {
-						"x": 146,
-						"y": 140,
-						"w": 74,
-						"h": 28
-					}
-				},
-				{
-					"filename": "0127.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 74,
-						"h": 28
-					},
-					"frame": {
-						"x": 146,
-						"y": 140,
-						"w": 74,
-						"h": 28
-					}
-				},
-				{
-					"filename": "0128.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 74,
-						"h": 28
-					},
-					"frame": {
-						"x": 146,
-						"y": 140,
-						"w": 74,
-						"h": 28
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 73,
-						"h": 29
-					},
-					"frame": {
-						"x": 146,
-						"y": 168,
-						"w": 73,
-						"h": 29
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 73,
-						"h": 29
-					},
-					"frame": {
-						"x": 146,
-						"y": 168,
-						"w": 73,
-						"h": 29
-					}
-				},
-				{
-					"filename": "0029.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 73,
-						"h": 29
-					},
-					"frame": {
-						"x": 146,
-						"y": 168,
-						"w": 73,
-						"h": 29
-					}
-				},
-				{
-					"filename": "0030.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 73,
-						"h": 29
-					},
-					"frame": {
-						"x": 146,
-						"y": 168,
-						"w": 73,
-						"h": 29
-					}
-				},
-				{
-					"filename": "0081.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 73,
-						"h": 29
-					},
-					"frame": {
-						"x": 146,
-						"y": 168,
-						"w": 73,
-						"h": 29
-					}
-				},
-				{
-					"filename": "0082.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 73,
-						"h": 29
-					},
-					"frame": {
-						"x": 146,
-						"y": 168,
-						"w": 73,
-						"h": 29
-					}
-				},
-				{
-					"filename": "0107.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 73,
-						"h": 29
-					},
-					"frame": {
-						"x": 146,
-						"y": 168,
-						"w": 73,
-						"h": 29
-					}
-				},
-				{
-					"filename": "0108.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 73,
-						"h": 29
-					},
-					"frame": {
-						"x": 146,
-						"y": 168,
-						"w": 73,
-						"h": 29
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 73,
-						"h": 28
-					},
-					"frame": {
-						"x": 73,
-						"y": 182,
-						"w": 73,
-						"h": 28
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 73,
-						"h": 28
-					},
-					"frame": {
-						"x": 73,
-						"y": 182,
-						"w": 73,
-						"h": 28
-					}
-				},
-				{
-					"filename": "0025.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 73,
-						"h": 28
-					},
-					"frame": {
-						"x": 73,
-						"y": 182,
-						"w": 73,
-						"h": 28
-					}
-				},
-				{
-					"filename": "0026.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 73,
-						"h": 28
-					},
-					"frame": {
-						"x": 73,
-						"y": 182,
-						"w": 73,
-						"h": 28
-					}
-				},
-				{
-					"filename": "0027.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 73,
-						"h": 28
-					},
-					"frame": {
-						"x": 73,
-						"y": 182,
-						"w": 73,
-						"h": 28
-					}
-				},
-				{
-					"filename": "0028.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 73,
-						"h": 28
-					},
-					"frame": {
-						"x": 73,
-						"y": 182,
-						"w": 73,
-						"h": 28
-					}
-				},
-				{
-					"filename": "0051.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 73,
-						"h": 28
-					},
-					"frame": {
-						"x": 73,
-						"y": 182,
-						"w": 73,
-						"h": 28
-					}
-				},
-				{
-					"filename": "0052.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 73,
-						"h": 28
-					},
-					"frame": {
-						"x": 73,
-						"y": 182,
-						"w": 73,
-						"h": 28
-					}
-				},
-				{
-					"filename": "0079.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 73,
-						"h": 28
-					},
-					"frame": {
-						"x": 73,
-						"y": 182,
-						"w": 73,
-						"h": 28
-					}
-				},
-				{
-					"filename": "0080.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 73,
-						"h": 28
-					},
-					"frame": {
-						"x": 73,
-						"y": 182,
-						"w": 73,
-						"h": 28
-					}
-				},
-				{
-					"filename": "0103.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 73,
-						"h": 28
-					},
-					"frame": {
-						"x": 73,
-						"y": 182,
-						"w": 73,
-						"h": 28
-					}
-				},
-				{
-					"filename": "0104.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 73,
-						"h": 28
-					},
-					"frame": {
-						"x": 73,
-						"y": 182,
-						"w": 73,
-						"h": 28
-					}
-				},
-				{
-					"filename": "0105.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 73,
-						"h": 28
-					},
-					"frame": {
-						"x": 73,
-						"y": 182,
-						"w": 73,
-						"h": 28
-					}
-				},
-				{
-					"filename": "0106.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 73,
-						"h": 28
-					},
-					"frame": {
-						"x": 73,
-						"y": 182,
-						"w": 73,
-						"h": 28
-					}
-				},
-				{
-					"filename": "0129.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 73,
-						"h": 28
-					},
-					"frame": {
-						"x": 73,
-						"y": 182,
-						"w": 73,
-						"h": 28
-					}
-				},
-				{
-					"filename": "0130.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 77,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 73,
-						"h": 28
-					},
-					"frame": {
-						"x": 73,
-						"y": 182,
-						"w": 73,
-						"h": 28
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:7ed241f9d4e0679b62ab26da17057d65:739de537da7171a9caf5769b4458f68f:22e585907b89e90c4fc3ab2512d175fd$"
-	}
-}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/618_3.png b/public/images/pokemon/variant/back/618_3.png
deleted file mode 100644
index aaba24cfc58..00000000000
Binary files a/public/images/pokemon/variant/back/618_3.png and /dev/null differ
diff --git a/public/images/pokemon/variant/back/626.json b/public/images/pokemon/variant/back/626.json
new file mode 100644
index 00000000000..3a709763542
--- /dev/null
+++ b/public/images/pokemon/variant/back/626.json
@@ -0,0 +1,46 @@
+{
+    "1": {
+        "101010": "101010",
+        "312921": "303120",
+        "36363c": "362126",
+        "4a3119": "122119",
+        "4a4131": "4a4831",
+        "6b4a29": "2d4a3a",
+        "6b4a2a": "5f3539",
+        "6e4c2a": "565796",
+        "3a3a42": "4d150f",
+        "6b6b73": "802d1f",
+        "946a31": "4d6650",
+        "946a33": "513236",
+        "9a6f33": "716fab",
+        "ad8c29": "8580c4",
+        "9c845a": "9e655c",
+        "9c845c": "9e655c",
+        "bda57b": "bd8c7b",
+        "ffc54a": "c0b5eb",
+        "9ca5a5": "a34933",
+        "f7d69c": "f38d5d"
+    },
+    "2": {
+        "101010": "101010",
+        "312921": "962430",
+        "36363c": "905932",
+        "4a3119": "855168",
+        "4a4131": "cc4545",
+        "6b4a29": "c17c95",
+        "6b4a2a": "907d32",
+        "6e4c2a": "678db8",
+        "3a3a42": "7f5310",
+        "6b6b73": "d49612",
+        "946a31": "e4b3b3",
+        "946a33": "946a33",
+        "9a6f33": "7da2c5",
+        "ad8c29": "92bcd4",
+        "9c845a": "beab6c",
+        "9c845c": "db9a39",
+        "bda57b": "efeac2",
+        "ffc54a": "c2e5f0",
+        "9ca5a5": "e9ca5a",
+        "f7d69c": "f5cc51"
+    }
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/643.json b/public/images/pokemon/variant/back/643.json
new file mode 100644
index 00000000000..08e6a2dd694
--- /dev/null
+++ b/public/images/pokemon/variant/back/643.json
@@ -0,0 +1,50 @@
+{
+	"1": {
+		"196ba5": "e0912f",
+		"857c9c": "3c4154",
+		"54517a": "232738",
+		"c2c1db": "e6e7ef",
+		"fffffa": "fffffc",
+		"767ca8": "97a5b0",
+		"4a4a6b": "0d0d1a",
+		"504f75": "a58419",
+		"c3c1e0": "f0edc2",
+		"ffa531": "fcfade",
+		"767da3": "d6c563",
+		"d3d3e0": "2f3247",
+		"fff5f9": "565a69",
+		"c1c1d6": "454959",
+		"cacadb": "bfbfd6",
+		"ff6331": "ffee6b",
+		"d6c5b5": "f2f2d8",
+		"757d9e": "212236",
+		"e6b573": "f2ecaa",
+		"565280": "596675",
+		"ffffff": "414659",
+		"de2908": "ffca0a"
+	},
+	"2": {
+		"196ba5": "b33a68",
+		"857c9c": "3c50a1",
+		"54517a": "2d3984",
+		"c2c1db": "343d8e",
+		"fffffa": "4459a2",
+		"767ca8": "2b2871",
+		"4a4a6b": "2d3984",
+		"504f75": "19323c",
+		"c3c1e0": "4f9290",
+		"ffa531": "e2f9b5",
+		"767da3": "3a6d71",
+		"d3d3e0": "647bd9",
+		"fff5f9": "a9bbff",
+		"c1c1d6": "647bd9",
+		"cacadb": "ffffff",
+		"ff6331": "9df377",
+		"d6c5b5": "3d8073",
+		"757d9e": "3c50a1",
+		"e6b573": "4ba789",
+		"565280": "19143f",
+		"ffffff": "a9bbff",
+		"de2908": "5cdca6"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/644.json b/public/images/pokemon/variant/back/644.json
new file mode 100644
index 00000000000..01475c838c7
--- /dev/null
+++ b/public/images/pokemon/variant/back/644.json
@@ -0,0 +1,44 @@
+{
+	"1": {
+		"1a1a21": "705ba8",
+		"2c2c35": "c1c8e8",
+		"103a52": "251076",
+		"191921": "686c99",
+		"16161d": "7687c2",
+		"6bf7ff": "dbbaff",
+		"00c5ff": "b77dff",
+		"0f0d13": "49568f",
+		"006bbd": "4800e3",
+		"121212": "54428f",
+		"940000": "762fcc",
+		"52525a": "7175a3",
+		"ce0000": "a44bf2",
+		"31313a": "cfd0e6",
+		"08528c": "3b1899",
+		"004275": "8742ff",
+		"111111": "5b5f8c",
+		"009cde": "7626ff",
+		"212129": "9b9fc4"
+	},
+	"2": {
+		"1a1a21": "350707",
+		"2c2c35": "884290",
+		"103a52": "671212",
+		"191921": "843172",
+		"16161d": "5e286f",
+		"6bf7ff": "f5e5da",
+		"00c5ff": "f5b698",
+		"0f0d13": "3b1a4c",
+		"006bbd": "c8433a",
+		"121212": "210214",
+		"940000": "cc8215",
+		"52525a": "ffc5d1",
+		"ce0000": "f3d32c",
+		"31313a": "ef9dae",
+		"08528c": "821b1b",
+		"004275": "821b1b",
+		"111111": "4a1a4c",
+		"009cde": "ef806b",
+		"212129": "ca6c94"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/646-black.json b/public/images/pokemon/variant/back/646-black.json
new file mode 100644
index 00000000000..28baffd5690
--- /dev/null
+++ b/public/images/pokemon/variant/back/646-black.json
@@ -0,0 +1,49 @@
+{
+	"1": {
+		"ebebe8": "edc9ff",
+		"6b8c7b": "2b4366",
+		"7b6b5a": "5482b0",
+		"315a42": "1a2b4d",
+		"292930": "9b9bc2",
+		"31313a": "c8c9e0",
+		"e6e6de": "e6a18a",
+		"006b94": "4c13a1",
+		"23232b": "1c1c24",
+		"191921": "6a6a94",
+		"addec5": "426585",
+		"b59400": "b35a3e",
+		"355e45": "484873",
+		"2c2c36": "15213b",
+		"00b5ff": "a033ff",
+		"ffff4a": "db966b",
+		"524a31": "112240",
+		"b6e3c7": "bb8ae3",
+		"004b6f": "2f0e75",
+		"1e1e26": "1b1b24",
+		"719180": "905dcf",
+		"ada584": "78a9cc"
+	},
+	"2": {
+		"ebebe8": "ffc5d1",
+		"6b8c7b": "be6e34",
+		"7b6b5a": "982222",
+		"315a42": "7b2d25",
+		"292930": "6c245b",
+		"31313a": "913a7d",
+		"006b94": "6b3773",
+		"23232b": "2b050a",
+		"191921": "3d0d38",
+		"addec5": "e6b45b",
+		"b59400": "166a2d",
+		"355e45": "ca6c94",
+		"2c2c36": "480b0b",
+		"00b5ff": "b464bf",
+		"ffff4a": "6ae649",
+		"524a31": "550f0f",
+		"b6e3c7": "ffadbe",
+		"004b6f": "411d46",
+		"1e1e26": "7b2d25",
+		"719180": "ea93a5",
+		"ada584": "c23232"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/646-white.json b/public/images/pokemon/variant/back/646-white.json
new file mode 100644
index 00000000000..b2951e6fc38
--- /dev/null
+++ b/public/images/pokemon/variant/back/646-white.json
@@ -0,0 +1,46 @@
+{
+    "1": {
+        "101010": "101010",
+        "741a18": "7a3418",
+        "4a4a29": "2a446b",
+        "4c4a2c": "0d0d1a",
+        "4a4a2d": "0d1030",
+        "315a42": "172247",
+        "7b7b5a": "779fbf",
+        "73737b": "120e1f",
+        "942921": "d49748",
+        "e64a42": "ffe587",
+        "6b8c7b": "2e466b",
+        "cc9827": "cc9827",
+        "ffde3a": "f0d897",
+        "ffad63": "fff7c4",
+        "ada584": "b7dbeb",
+        "bdbdc5": "232538",
+        "addec5": "45678a",
+        "e6e8f2": "414659",
+        "f5f5fa": "f5f5fa",
+        "ffffff": "ffffff"
+    },
+    "2": {
+        "101010": "101010",
+        "741a18": "1f504d",
+        "4a4a29": "550f0f",
+        "4c4a2c": "1f1544",
+        "4a4a2d": "7b2d25",
+        "315a42": "7b2d25",
+        "7b7b5a": "982222",
+        "73737b": "2b2871",
+        "942921": "3d8073",
+        "e64a42": "4ba789",
+        "6b8c7b": "be6e34",
+        "cc9827": "166a2d",
+        "ffde3a": "9df377",
+        "ffad63": "5cdca6",
+        "ada584": "c23232",
+        "bdbdc5": "3d458f",
+        "addec5": "e6b45b",
+        "e6e8f2": "5870c4",
+        "f5f5fa": "f5f5fa",
+        "ffffff": "e2f9b5"
+    }
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/646.json b/public/images/pokemon/variant/back/646.json
new file mode 100644
index 00000000000..c509a0cda9c
--- /dev/null
+++ b/public/images/pokemon/variant/back/646.json
@@ -0,0 +1,33 @@
+{
+	"1": {
+		"8c7329": "b35a3e",
+		"949cad": "a6cfe0",
+		"6d737b": "a55c39",
+		"103a52": "121836",
+		"ffe600": "db966b",
+		"73737b": "6394b0",
+		"bde6ff": "3c5878",
+		"424252": "3d6285",
+		"696973": "6394b0",
+		"ceb500": "c46f52",
+		"a5b5ce": "293c5e",
+		"3b3b4a": "3d6285",
+		"6b8494": "1a2647"
+	},
+	"2": {
+		"8c7329": "166a2d",
+		"949cad": "c23232",
+		"6d737b": "1a791b",
+		"103a52": "7b2d25",
+		"ffe600": "6ae649",
+		"73737b": "982222",
+		"bde6ff": "e6b45b",
+		"424252": "550f0f",
+		"696973": "736969",
+		"ceb500": "2aac2b",
+		"def7ff": "f7ec88",
+		"a5b5ce": "be6e34",
+		"3b3b4a": "4a3b3b",
+		"6b8494": "974626"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/656.json b/public/images/pokemon/variant/back/656.json
index 34b11bfab78..f41398f3154 100644
--- a/public/images/pokemon/variant/back/656.json
+++ b/public/images/pokemon/variant/back/656.json
@@ -1,17 +1,17 @@
 {
 	"1": {
-		"838394": "4d7dc5",
+		"848496": "4d7dc5",
 		"7bcdff": "9c75c2",
 		"62ace6": "8363af",
 		"ffffff": "b1e5ff",
 		"396a83": "362864",
 		"9c9cc5": "5385c7",
 		"cdcde6": "7eb7e8",
-		"174592": "198158",
+		"174592": "37408c",
 		"5a94cd": "7054a4"
 	},
 	"2": {
-		"838394": "cc6845",
+		"848496": "cc6845",
 		"7bcdff": "dd6155",
 		"62ace6": "c44848",
 		"ffffff": "fff4bd",
diff --git a/public/images/pokemon/variant/back/666-fancy.json b/public/images/pokemon/variant/back/666-fancy.json
new file mode 100644
index 00000000000..5d368667ae3
--- /dev/null
+++ b/public/images/pokemon/variant/back/666-fancy.json
@@ -0,0 +1,36 @@
+{
+    "1": {
+        "101010": "101010",
+        "303030": "402746",
+        "675220": "958c8a",
+        "504a4a": "7f6991",
+        "595959": "724b7a",
+        "707068": "a97cbc",
+        "de4040": "de4040",
+        "5faa3e": "5faa3e",
+        "ceab62": "d9edd4",
+        "b6d26d": "b6d26d",
+        "e9e052": "e9e052",
+        "cf7ef3": "cf7ef3",
+        "c3c3c3": "ffeaff",
+        "f2d4e3": "f2d4e3",
+        "ead2e3": "ffeaff"
+    },
+    "2": {
+        "101010": "101010",
+        "303030": "00771b",
+        "675220": "b9c05a",
+        "504a4a": "b9c05a",
+        "595959": "6f9f42",
+        "707068": "6f9f42",
+        "de4040": "de4040",
+        "5faa3e": "5faa3e",
+        "ceab62": "e3e982",
+        "b6d26d": "b6d26d",
+        "e9e052": "e9e052",
+        "cf7ef3": "cf7ef3",
+        "c3c3c3": "fcf1ff",
+        "f2d4e3": "f2d4e3",
+        "ead2e3": "fcf1ff"
+    }
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/666-fancy_2.json b/public/images/pokemon/variant/back/666-fancy_2.json
deleted file mode 100644
index 49478186fd7..00000000000
--- a/public/images/pokemon/variant/back/666-fancy_2.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "666-fancy_2.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 67,
-				"h": 67
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 67,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 67
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 67
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:c0935d72f3dd919dfad1f00ce1550c3c:4c9a4c435b13a6c8dbd3fa6eacd260d8:6d5edff9a806f43feff031c9919c9aca$"
-	}
-}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/666-fancy_2.png b/public/images/pokemon/variant/back/666-fancy_2.png
deleted file mode 100644
index a1e23edd659..00000000000
Binary files a/public/images/pokemon/variant/back/666-fancy_2.png and /dev/null differ
diff --git a/public/images/pokemon/variant/back/666-fancy_3.json b/public/images/pokemon/variant/back/666-fancy_3.json
deleted file mode 100644
index f060b4b02c6..00000000000
--- a/public/images/pokemon/variant/back/666-fancy_3.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "666-fancy_3.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 67,
-				"h": 67
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 67,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 67
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 67
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:c0935d72f3dd919dfad1f00ce1550c3c:4c9a4c435b13a6c8dbd3fa6eacd260d8:6d5edff9a806f43feff031c9919c9aca$"
-	}
-}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/666-fancy_3.png b/public/images/pokemon/variant/back/666-fancy_3.png
deleted file mode 100644
index 6d15bc3f680..00000000000
Binary files a/public/images/pokemon/variant/back/666-fancy_3.png and /dev/null differ
diff --git a/public/images/pokemon/variant/back/666-high-plains.json b/public/images/pokemon/variant/back/666-high-plains.json
index acd62e863c1..6ee5c78e6ca 100644
--- a/public/images/pokemon/variant/back/666-high-plains.json
+++ b/public/images/pokemon/variant/back/666-high-plains.json
@@ -13,7 +13,8 @@
 		"504a4a": "7f6991",
 		"c3c3c3": "c3c3c3",
 		"337543": "337543",
-		"e8c815": "e8c815"
+		"e8c815": "e8c815",
+		"773d21": "773d21"
 	},
 	"2": {
 		"101010": "101010",
@@ -29,6 +30,7 @@
 		"504a4a": "c97034",
 		"c3c3c3": "edc67c",
 		"337543": "337543",
-		"e8c815": "e8c815"
+		"e8c815": "e8c815",
+		"773d21": "773d21"
 	}
 }
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/666-monsoon.json b/public/images/pokemon/variant/back/666-monsoon.json
index afb60e0f5ae..915d471b2b1 100644
--- a/public/images/pokemon/variant/back/666-monsoon.json
+++ b/public/images/pokemon/variant/back/666-monsoon.json
@@ -1,34 +1,33 @@
 {
-	"1": {
-		"101010": "101010",
-		"595959": "724b7a",
-		"f0f0f8": "f0f0f8",
-		"303030": "402746",
-		"ceab62": "d9edd4",
-		"675220": "958c8a",
+    "1": {
+        "101010": "101010",
+        "303030": "402746",
+        "675220": "958c8a",
+        "504a4a": "7f6991",
+        "595959": "724b7a",
+        "707068": "a97cbc",
 		"807676": "807676",
-		"92f4f4": "92f4f4",
-		"989898": "989898",
-		"707068": "a97cbc",
+        "ceab62": "d9edd4",
 		"5676de": "5676de",
-		"4eccd6": "4eccd6",
-		"504a4a": "7f6991",
-		"c3c3c3": "c3c3c3"
-	},
-	"2": {
-		"101010": "101010",
-		"595959": "656565",
-		"f0f0f8": "f0f0f8",
-		"303030": "4f4645",
-		"ceab62": "5857bc",
-		"675220": "2c3593",
-		"807676": "807676",
-		"92f4f4": "92f4f4",
-		"989898": "989898",
-		"707068": "5857bc",
-		"5676de": "5676de",
-		"4eccd6": "4eccd6",
-		"504a4a": "2c3593",
-		"c3c3c3": "b8f9f9"
-	}
+        "4eccd6": "4eccd6",
+        "989898": "989898",
+        "c3c3c3": "c3c3c3",
+        "f0f0f8": "f0f0f8"
+    },
+    "2": {
+        "101010": "101010",
+        "303030": "3d3231",
+        "675220": "2c3593",
+        "504a4a": "2c3593",
+        "595959": "4f4645",
+        "707068": "5857bc",
+        "807676": "807676",
+        "ceab62": "5857bc",
+        "5676de": "5676de",
+        "4eccd6": "4eccd6",
+        "989898": "989898",
+        "92f4f4": "92f4f4",
+        "c3c3c3": "b8f9f9",
+        "f0f0f8": "f0f0f8"
+    }
 }
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/666-ocean.json b/public/images/pokemon/variant/back/666-ocean.json
index 51a99de1ea8..8b62b4a8072 100644
--- a/public/images/pokemon/variant/back/666-ocean.json
+++ b/public/images/pokemon/variant/back/666-ocean.json
@@ -21,7 +21,7 @@
 		"e1384d": "e1384d",
 		"f4ad61": "f4ad61",
 		"f8ef6a": "f8ef6a",
-		"303030": "b56208",
+		"303030": "b54908",
 		"ceb362": "ea8742",
 		"675220": "bc601c",
 		"ebcf3f": "ebcf3f",
diff --git a/public/images/pokemon/variant/back/666-river.json b/public/images/pokemon/variant/back/666-river.json
index b3b9671ee75..c7e5e288d05 100644
--- a/public/images/pokemon/variant/back/666-river.json
+++ b/public/images/pokemon/variant/back/666-river.json
@@ -1,18 +1,40 @@
 {
-	"2": {
-		"101010": "101010",
-		"595959": "8a5702",
-		"ceab62": "d9a666",
-		"625841": "625841",
-		"303030": "7b2800",
-		"bc813f": "bc813f",
-		"9c9143": "9c9143",
-		"675220": "ae7f41",
-		"707068": "d9a666",
-		"504a4a": "ae7f41",
-		"c3c3c3": "e3c384",
-		"279ec2": "279ec2",
-		"59c9d3": "59c9d3",
-		"1d726a": "1d726a"
-	}
+    "1": {
+        "101010": "101010",
+        "303030": "402746",
+        "4a412c": "4a412c",
+        "675220": "958c8a",
+        "634d20": "634d20",
+        "1d726a": "1d726a",
+        "504a4a": "7f6991",
+        "595959": "724b7a",
+        "625841": "625841",
+        "707068": "a97cbc",
+        "bc813f": "bc813f",
+        "9c9143": "9c9143",
+        "ceab62": "ceab62",
+        "279ec2": "279ec2",
+        "59c9d3": "59c9d3",
+        "c3c3c3": "c3c3c3",
+        "d2a862": "d9edd4"
+    },
+    "2": {
+        "101010": "101010",
+        "303030": "7b2800",
+        "4a412c": "4a412c",
+        "675220": "ae7f41",
+        "634d20": "634d20",
+        "1d726a": "1d726a",
+        "504a4a": "ae7f41",
+        "595959": "8a5702",
+        "625841": "625841",
+        "707068": "d9a666",
+        "bc813f": "bc813f",
+        "9c9143": "9c9143",
+        "ceab62": "ceab62",
+        "279ec2": "279ec2",
+        "59c9d3": "59c9d3",
+        "c3c3c3": "e3c384",
+        "d2a862": "d2a862"
+    }
 }
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/666-river_2.json b/public/images/pokemon/variant/back/666-river_2.json
deleted file mode 100644
index 710513e4626..00000000000
--- a/public/images/pokemon/variant/back/666-river_2.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "666-river_2.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 67,
-				"h": 67
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 67,
-						"h": 67
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 67
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 67
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:c5c96b8025cde94330c424121707d6d1:0eb4b25134091aa2435bee846468e099:fa23dc87fc53ba2cfa532cf440553cf5$"
-	}
-}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/666-river_2.png b/public/images/pokemon/variant/back/666-river_2.png
deleted file mode 100644
index 8d829e974f4..00000000000
Binary files a/public/images/pokemon/variant/back/666-river_2.png and /dev/null differ
diff --git a/public/images/pokemon/variant/back/692.json b/public/images/pokemon/variant/back/692.json
new file mode 100644
index 00000000000..d4c85f37c9d
--- /dev/null
+++ b/public/images/pokemon/variant/back/692.json
@@ -0,0 +1,28 @@
+{
+	"1": {
+		"337380": "783a1d",
+		"b3b3b3": "c8ba6d",
+		"595959": "c85b5b",
+		"61daf2": "e1ac53",
+		"cc9c3d": "53be53",
+		"404040": "7d182d",
+		"ffc44c": "a9f076",
+		"b2f2ff": "fada7f",
+		"47a1b3": "af6a37",
+		"101010": "070707",
+		"735822": "20734c"
+	},
+	"2": {
+		"337380": "5f3c23",
+		"b3b3b3": "68a7aa",
+		"595959": "88cd56",
+		"61daf2": "e1d6b6",
+		"cc9c3d": "7743be",
+		"404040": "1c873e",
+		"ffc44c": "a36feb",
+		"b2f2ff": "faf8d7",
+		"47a1b3": "968144",
+		"101010": "070707",
+		"735822": "371c72"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/693.json b/public/images/pokemon/variant/back/693.json
new file mode 100644
index 00000000000..3187a81e0c0
--- /dev/null
+++ b/public/images/pokemon/variant/back/693.json
@@ -0,0 +1,28 @@
+{
+	"1": {
+		"224b73": "552813",
+		"4595e5": "aa6839",
+		"23a2c8": "c87a23",
+		"262626": "230808",
+		"cc9c3d": "1b3c17",
+		"404040": "3c171b",
+		"5f5f5f": "6e2e3b",
+		"61daf2": "f2bd61",
+		"3674b3": "7d3e21",
+		"ffc44c": "426e2e",
+		"735822": "08230e"
+	},
+	"2": {
+		"224b73": "5f463a",
+		"4595e5": "c8b493",
+		"23a2c8": "beb099",
+		"262626": "295a1c",
+		"cc9c3d": "6259af",
+		"404040": "2a8c53",
+		"5f5f5f": "51c85d",
+		"61daf2": "f0eadb",
+		"3674b3": "9b8265",
+		"ffc44c": "a39afa",
+		"735822": "36235f"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/715.json b/public/images/pokemon/variant/back/715.json
new file mode 100644
index 00000000000..7ca4d81e5dc
--- /dev/null
+++ b/public/images/pokemon/variant/back/715.json
@@ -0,0 +1,38 @@
+{
+    "1": {
+        "101010": "101010",
+        "287366": "731338",
+        "3aa694": "a42c54",
+        "404040": "542f98",
+        "343434": "3e107b",
+        "252525": "260447",
+        "4cd9c1": "d04b6c",
+        "595959": "7a5ccc",
+        "6a3f73": "0f103c",
+        "737373": "563d8f",
+        "801a1a": "801a1a",
+        "8e5499": "202558",
+        "bd70cc": "2f386b",
+        "bfbfbf": "ab83dd",
+        "e52e2e": "e52e2e",
+        "f8f8f8": "d5bdec"
+    },
+    "2": {
+        "101010": "101010",
+        "287366": "832714",
+        "3aa694": "b8552c",
+        "404040": "b18373",
+        "343434": "906152",
+        "252525": "6c3f39",
+        "4cd9c1": "dd834c",
+        "595959": "e2c7b5",
+        "6a3f73": "3b0c18",
+        "737373": "280911",
+        "801a1a": "801a1a",
+        "8e5499": "5b1922",
+        "bd70cc": "7c2928",
+        "bfbfbf": "43191e",
+        "e52e2e": "e52e2e",
+        "f8f8f8": "5a2a2b"
+    }
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/728.json b/public/images/pokemon/variant/back/728.json
index ba8646ca4ff..fb17e2c119e 100644
--- a/public/images/pokemon/variant/back/728.json
+++ b/public/images/pokemon/variant/back/728.json
@@ -12,7 +12,9 @@
 		"bfbfbf": "c2beb4",
 		"314f8c": "006355",
 		"639ba6": "858d7d",
-		"a1dae5": "92b599"
+		"a1dae5": "92b599",
+		"1e3a66": "363d2f",
+		"2c4f8c": "5a6154"
 	},
 	"2": {
 		"733f50": "620a33",
@@ -27,6 +29,8 @@
 		"bfbfbf": "bfb4b9",
 		"314f8c": "770f29",
 		"639ba6": "b88389",
-		"a1dae5": "f7c1c5"
+		"a1dae5": "f7c1c5",
+		"1e3a66": "773f46",
+		"2c4f8c": "a45f67"
 	}
 }
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/730.json b/public/images/pokemon/variant/back/730.json
index ed6a04cd9f5..eec815b0572 100644
--- a/public/images/pokemon/variant/back/730.json
+++ b/public/images/pokemon/variant/back/730.json
@@ -1,34 +1,46 @@
 {
 	"1": {
-		"0e6792": "b54f5f",
-		"6ac8e3": "ffa0a8",
-		"44a0b5": "d87383",
-		"727481": "74312e",
-		"aac7e6": "ea7c5b",
-		"82a7b9": "c35861",
 		"101010": "101010",
-		"bdbdc1": "c0b7a1",
-		"f8f8f8": "fff2d4",
 		"8d3f4a": "a62c20",
-		"ff8496": "ff8072",
 		"c76374": "e54c41",
+		"0e6792": "b54f5f",
 		"1241a1": "006355",
-		"1470de": "009469"
+		"6d7481": "917393",
+		"727481": "a0866f",
+		"1470de": "009469",
+		"5a8092": "74312e",
+		"44a0b5": "d87383",
+		"64c5e1": "00dc9c",
+		"6ac8e3": "ffa0a8",
+		"82a7b9": "c35861",
+		"ff8496": "ff8072",
+		"bdbdc1": "c0b7a1",
+		"c0bdc1": "beaac0",
+		"aac7e6": "ea7c5b",
+		"f8f8f8": "fff2d4",
+		"faf8f8": "f1e8f1",
+		"fef8f8": "fef8f8"
 	},
 	"2": {
-		"0e6792": "500518",
-		"6ac8e3": "a6213f",
-		"44a0b5": "770f29",
-		"727481": "5c2141",
-		"aac7e6": "e9a5c0",
-		"82a7b9": "c17b97",
 		"101010": "101010",
-		"bdbdc1": "bfb4b9",
-		"f8f8f8": "f5edee",
 		"8d3f4a": "1d1638",
-		"ff8496": "614388",
 		"c76374": "391e62",
+		"0e6792": "500518",
 		"1241a1": "591945",
-		"1470de": "81387e"
+		"6d7481": "81716d",
+		"727481": "9e8193",
+		"1470de": "81387e",
+		"5a8092": "5c2141",
+		"44a0b5": "770f29",
+		"64c5e1": "bd2b6b",
+		"6ac8e3": "a6213f",
+		"82a7b9": "c17b97",
+		"ff8496": "614388",
+		"bdbdc1": "bfb4b9",
+		"c0bdc1": "c0b4a5",
+		"aac7e6": "e9a5c0",
+		"f8f8f8": "f5edee",
+		"faf8f8": "f5f3e3",
+		"fef8f8": "fef8f8"
 	}
 }
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/746-school.json b/public/images/pokemon/variant/back/746-school.json
new file mode 100644
index 00000000000..d8fa61a3829
--- /dev/null
+++ b/public/images/pokemon/variant/back/746-school.json
@@ -0,0 +1,38 @@
+{
+    "1": {
+        "101010": "101010",
+        "0a1627": "5f2112",
+        "123954": "75391b",
+        "134884": "935926",
+        "134d84": "16574d",
+        "1766c6": "b77736",
+        "416adf": "2c9572",
+        "79848a": "a67834",
+        "749cf6": "5ce09d",
+        "73dcf5": "27133f",
+        "73e5f5": "552b64",
+        "72f0f6": "824388",
+        "9cd3fd": "aafe94",
+        "a6c5f7": "78f389",
+        "cfd1d3": "d5ab51",
+        "fbfbfb": "f7d76b"
+    },
+    "2": {
+        "101010": "101010",
+        "0a1627": "0f0523",
+        "123954": "28071a",
+        "134884": "350b19",
+        "134d84": "b7904d",
+        "1766c6": "4a1111",
+        "416adf": "dec284",
+        "79848a": "4a1111",
+        "749cf6": "f8ecc5",
+        "73dcf5": "31238e",
+        "73e5f5": "3a4ebd",
+        "72f0f6": "6492f7",
+        "9cd3fd": "fefeef",
+        "a6c5f7": "fefed9",
+        "cfd1d3": "5f291c",
+        "fbfbfb": "844232"
+    }
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/746.json b/public/images/pokemon/variant/back/746.json
new file mode 100644
index 00000000000..5b183b10e5d
--- /dev/null
+++ b/public/images/pokemon/variant/back/746.json
@@ -0,0 +1,40 @@
+{
+    "1": {
+        "101010": "101010",
+        "1f2161": "16574d",
+        "5d666d": "75391b",
+        "616b72": "a67834",
+        "9c455b": "308c9d",
+        "374793": "2c9572",
+        "4764c9": "5ce09d",
+        "3e9cbb": "27133f",
+        "61c8de": "824388", 
+        "8c9c9d": "935926",
+        "8d9c9d": "c69b3f",
+        "d88394": "65cfe2",
+        "b0c5c6": "d5ab51",
+        "ccd2ce": "b77736",
+        "d8d9da": "d8d9da",
+        "eeeeee": "f7d76b",
+        "fefefe": "fefefe"
+    },
+    "2": {
+        "101010": "101010",
+        "1f2161": "b7904d",
+        "5d666d": "1e0726",
+        "616b72": "4a1111",
+        "9c455b": "b9682d",
+        "374793": "dec284",
+        "4764c9": "f8ecc5",
+        "3e9cbb": "4378eb",
+        "61c8de": "5787f1", 
+        "8c9c9d": "350b19",
+        "8d9c9d": "531917",
+        "d88394": "e4d85f",
+        "b0c5c6": "5f291c",
+        "ccd2ce": "4a1111",
+        "d8d9da": "d8d9da",
+        "eeeeee": "844232",
+        "fefefe": "fefefe"
+    }
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/780.json b/public/images/pokemon/variant/back/780.json
new file mode 100644
index 00000000000..f55158dcabb
--- /dev/null
+++ b/public/images/pokemon/variant/back/780.json
@@ -0,0 +1,28 @@
+{
+	"1": {
+		"8d541b": "bd8955",
+		"297b8b": "1a316b",
+		"5aa4a4": "284c80",
+		"f5ae07": "faf0b1",
+		"606f55": "496375",
+		"726d5c": "a36026",
+		"105262": "0e194a",
+		"b8b7a3": "cf8d38",
+		"b4cda4": "9ab5b8",
+		"91a37c": "7798a1",
+		"eeeeee": "e6c15e"
+	},
+	"2": {
+		"8d541b": "157d36",
+		"297b8b": "4e4f73",
+		"5aa4a4": "6a708a",
+		"f5ae07": "3ec435",
+		"606f55": "8f825d",
+		"726d5c": "162d3d",
+		"105262": "3f3c61",
+		"b8b7a3": "254e59",
+		"b4cda4": "d6dbba",
+		"91a37c": "b5b48b",
+		"eeeeee": "3e7a76"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/782.json b/public/images/pokemon/variant/back/782.json
new file mode 100644
index 00000000000..f2bc20ecfba
--- /dev/null
+++ b/public/images/pokemon/variant/back/782.json
@@ -0,0 +1,30 @@
+{
+	"1": {
+		"f13035": "48bd8c",
+		"f8f236": "e77b57",
+		"504e4b": "472d1d",
+		"aba5ad": "336340",
+		"7b766f": "a67e5b",
+		"fdfdfd": "fcf2ca",
+		"726475": "214a33",
+		"bec6cb": "e8cea0",
+		"957509": "a63424",
+		"dbdbdb": "4e8759",
+		"940a0d": "258067",
+		"4d4b48": "8a5b41"
+	},
+	"2": {
+		"f13035": "b8c0fc",
+		"f8f236": "52d9ac",
+		"504e4b": "273959",
+		"aba5ad": "5e3e75",
+		"7b766f": "8ab7cf",
+		"fdfdfd": "d5f4f7",
+		"726475": "412959",
+		"bec6cb": "b7ddeb",
+		"957509": "258085",
+		"dbdbdb": "855d99",
+		"940a0d": "636a94",
+		"4d4b48": "567496"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/783.json b/public/images/pokemon/variant/back/783.json
new file mode 100644
index 00000000000..d91ccb51133
--- /dev/null
+++ b/public/images/pokemon/variant/back/783.json
@@ -0,0 +1,32 @@
+{
+	"1": {
+		"f13035": "48bd8c",
+		"6c6968": "472d1d",
+		"97938c": "2a573e",
+		"957509": "a63424",
+		"fff5ae": "f7c4b5",
+		"4d4644": "2b130b",
+		"fdfdfd": "fcf2ca",
+		"6b6968": "8a5b41",
+		"940a0d": "258067",
+		"c2c1c0": "42754f",
+		"d7aa22": "c25236",
+		"69625c": "133027",
+		"f4da42": "e77b57"
+	},
+	"2": {
+		"f13035": "d9ddfc",
+		"6c6968": "2e4266",
+		"97938c": "543666",
+		"957509": "258085",
+		"fff5ae": "baf7dc",
+		"4d4644": "151e38",
+		"fdfdfd": "d5f4f7",
+		"6b6968": "567496",
+		"940a0d": "636a94",
+		"c2c1c0": "744e87",
+		"d7aa22": "37ad94",
+		"69625c": "2d1c3d",
+		"f4da42": "52d9ac"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/784.json b/public/images/pokemon/variant/back/784.json
new file mode 100644
index 00000000000..74a18ff0d3d
--- /dev/null
+++ b/public/images/pokemon/variant/back/784.json
@@ -0,0 +1,42 @@
+{
+	"1": {
+		"c99f21": "bf5841",
+		"2d2b28": "2b130b",
+		"d0d2d5": "77a353",
+		"a8a4a0": "517d37",
+		"fafafa": "fcf2ca",
+		"d4d6d9": "e8cea0",
+		"4a4743": "8a5b41",
+		"f4da42": "e77b57",
+		"f13035": "48bd8c",
+		"cb0e12": "258067",
+		"4d4040": "123028",
+		"a7a29e": "336142",
+		"523e41": "447835",
+		"885902": "87281b",
+		"9d6702": "993d26",
+		"7e7572": "204736",
+		"fdfdfd": "bbd477",
+		"4b4845": "472d1d"
+	},
+	"2": {
+		"c99f21": "3aba9c",
+		"2d2b28": "151e38",
+		"d0d2d5": "7ec2cc",
+		"a8a4a0": "558ea3",
+		"fafafa": "d5f4f7",
+		"d4d6d9": "b7ddeb",
+		"4a4743": "567496",
+		"f4da42": "2a918e",
+		"f13035": "d9ddfc",
+		"cb0e12": "636a94",
+		"4d4040": "2d1840",
+		"a7a29e": "6c457a",
+		"523e41": "558fa6",
+		"885902": "1f6b6e",
+		"9d6702": "37ad94",
+		"7e7572": "4e2e61",
+		"fdfdfd": "adedf0",
+		"4b4845": "2e4266"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/840.json b/public/images/pokemon/variant/back/840.json
new file mode 100644
index 00000000000..3129592abb3
--- /dev/null
+++ b/public/images/pokemon/variant/back/840.json
@@ -0,0 +1,28 @@
+{
+	"1": {
+		"e2244a": "70a2c5",
+		"5fab1d": "7a7c9e",
+		"d39a52": "a22f76",
+		"e32b50": "4e77a2",
+		"fe455c": "abd7e2",
+		"fa6f8b": "c1f3f3",
+		"a4d84a": "9aa0b3",
+		"357912": "48485d",
+		"d3ee77": "d2d8df",
+		"8d4229": "741163",
+		"a50534": "3e6085"
+	},
+	"2": {
+		"e2244a": "bfb5ab",
+		"5fab1d": "993c63",
+		"d39a52": "463731",
+		"e32b50": "807770",
+		"fe455c": "dcd9d1",
+		"fa6f8b": "eeedea",
+		"a4d84a": "c76886",
+		"357912": "6b2041",
+		"d3ee77": "e28c95",
+		"8d4229": "291411",
+		"a50534": "68645f"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/841-gigantamax.json b/public/images/pokemon/variant/back/841-gigantamax.json
new file mode 100644
index 00000000000..6526fec9b4d
--- /dev/null
+++ b/public/images/pokemon/variant/back/841-gigantamax.json
@@ -0,0 +1,36 @@
+{
+	"1": {
+		"39a43d": "9aa0b3",
+		"d2394d": "abd7e2",
+		"61112d": "2c255d",
+		"a63139": "70a2c5",
+		"d54456": "8666ae",
+		"427638": "7a7c9e",
+		"c68a48": "9c2e72",
+		"8d4229": "272a52",
+		"eec856": "397880",
+		"cb8a42": "2b526f",
+		"b3ac62": "a3b9d0",
+		"dad08b": "dcebf9",
+		"2c4828": "243c63",
+		"e9c558": "c55885",
+		"772628": "1e1a4a"
+	},
+	"2": {
+		"39a43d": "e28c95",
+		"d2394d": "dcd9d1",
+		"61112d": "3a2222",
+		"a63139": "bfb5ab",
+		"d54456": "915a41",
+		"427638": "b04f6d",
+		"c68a48": "2a1310",
+		"8d4229": "79392f",
+		"eec856": "eee0bc",
+		"cb8a42": "d1a87e",
+		"b3ac62": "cbb4af",
+		"dad08b": "e2dcd6",
+		"2c4828": "2e2246",
+		"e9c558": "463731",
+		"772628": "4f4840"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/841.json b/public/images/pokemon/variant/back/841.json
new file mode 100644
index 00000000000..8cccd7dd76b
--- /dev/null
+++ b/public/images/pokemon/variant/back/841.json
@@ -0,0 +1,34 @@
+{
+	"1": {
+		"df6655": "c1f3f3",
+		"56ab32": "a59ab3",
+		"9b2629": "70a2c5",
+		"488235": "8e7a9e",
+		"ebe381": "854774",
+		"ccb468": "5d2654",
+		"ccca71": "cbb4af",
+		"8d764b": "110723",
+		"612324": "3e6085",
+		"da5245": "c55885",
+		"c3a965": "e2dcd6",
+		"b5915b": "34123a",
+		"d72d31": "abd7e2",
+		"395a2e": "383146"
+	},
+	"2": {
+		"df6655": "e2dcd6",
+		"56ab32": "e28c95",
+		"9b2629": "bfb5ab",
+		"488235": "a8546e",
+		"ebe381": "be7b53",
+		"ccb468": "743527",
+		"ccca71": "cbb4af",
+		"8d764b": "230313",
+		"612324": "68645f",
+		"da5245": "463731",
+		"c3a965": "e2dcd6",
+		"b5915b": "541711",
+		"d72d31": "dcd9d1",
+		"395a2e": "4f0e30"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/842-gigantamax.json b/public/images/pokemon/variant/back/842-gigantamax.json
new file mode 100644
index 00000000000..6526fec9b4d
--- /dev/null
+++ b/public/images/pokemon/variant/back/842-gigantamax.json
@@ -0,0 +1,36 @@
+{
+	"1": {
+		"39a43d": "9aa0b3",
+		"d2394d": "abd7e2",
+		"61112d": "2c255d",
+		"a63139": "70a2c5",
+		"d54456": "8666ae",
+		"427638": "7a7c9e",
+		"c68a48": "9c2e72",
+		"8d4229": "272a52",
+		"eec856": "397880",
+		"cb8a42": "2b526f",
+		"b3ac62": "a3b9d0",
+		"dad08b": "dcebf9",
+		"2c4828": "243c63",
+		"e9c558": "c55885",
+		"772628": "1e1a4a"
+	},
+	"2": {
+		"39a43d": "e28c95",
+		"d2394d": "dcd9d1",
+		"61112d": "3a2222",
+		"a63139": "bfb5ab",
+		"d54456": "915a41",
+		"427638": "b04f6d",
+		"c68a48": "2a1310",
+		"8d4229": "79392f",
+		"eec856": "eee0bc",
+		"cb8a42": "d1a87e",
+		"b3ac62": "cbb4af",
+		"dad08b": "e2dcd6",
+		"2c4828": "2e2246",
+		"e9c558": "463731",
+		"772628": "4f4840"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/842.json b/public/images/pokemon/variant/back/842.json
new file mode 100644
index 00000000000..3fdccc629c8
--- /dev/null
+++ b/public/images/pokemon/variant/back/842.json
@@ -0,0 +1,36 @@
+{
+	"1": {
+		"39a45f": "9aa0b3",
+		"ffcd88": "698db4",
+		"621522": "3e6085",
+		"9f7034": "110723",
+		"f9be6b": "a3b9d0",
+		"fcff86": "397880",
+		"2c743e": "7a7c9e",
+		"af2348": "70a2c5",
+		"1f4329": "313846",
+		"ffc575": "2b526f",
+		"ffa63b": "2d3d68",
+		"275734": "852560",
+		"e78422": "1f1946",
+		"e75574": "abd7e2",
+		"7de755": "d66f9a"
+	},
+	"2": {
+		"39a45f": "e28c95",
+		"ffcd88": "b9937a",
+		"621522": "68645f",
+		"9f7034": "2e0e09",
+		"f9be6b": "cbb4af",
+		"fcff86": "eee0bc",
+		"2c743e": "a8546e",
+		"af2348": "bfb5ab",
+		"1f4329": "341c1c",
+		"ffc575": "d1a87e",
+		"ffa63b": "63473b",
+		"275734": "2e2246",
+		"e78422": "4b211b",
+		"e75574": "dcd9d1",
+		"7de755": "589df3"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/871.json b/public/images/pokemon/variant/back/871.json
new file mode 100644
index 00000000000..5004d3013b5
--- /dev/null
+++ b/public/images/pokemon/variant/back/871.json
@@ -0,0 +1,32 @@
+{
+    "1": {
+        "101010": "101010",
+        "2e2732": "1b3334",
+        "281f2e": "2a2732",
+        "46384c": "504540",
+        "493d4e": "3a5d57",
+        "665272": "62857c",
+        "544947": "7d320e",
+        "7a7270": "a8501b",
+        "9e9a96": "cd7930",
+        "7b4e1c": "5b0d3f",
+        "d58815": "a02c58",
+        "fdba2f": "c45858",
+        "fdf22f": "f1e8e8"
+    },
+    "2": {
+        "101010": "101010",
+        "2e2732": "8b4738",
+        "281f2e": "212232",
+        "46384c": "504740",
+        "493d4e": "ce8a66",
+        "665272": "eac69b",
+        "544947": "1a1730",
+        "7a7270": "27223b",
+        "9e9a96": "3a3449",
+        "7b4e1c": "222c58",
+        "d58815": "343f7f",
+        "fdba2f": "67729f",
+        "fdf22f": "8e9fc9"
+    }
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/88.json b/public/images/pokemon/variant/back/88.json
new file mode 100644
index 00000000000..61b7ca3b802
--- /dev/null
+++ b/public/images/pokemon/variant/back/88.json
@@ -0,0 +1,28 @@
+{
+    "1": {
+        "101010": "101010",
+        "424a5a": "5b3a1d",
+        "5a3173": "6a010c",
+        "848c9c": "9b7c48",
+        "944a9c": "b1160e",
+        "adb5bd": "e9de8c",
+        "bd7bbd": "d55021",
+        "ce8cc5": "e98a47",
+        "d6d6de": "ded7ce",
+        "ffffff": "ffffff",
+        "efade6": "f8be70"
+    },
+    "2": {
+        "101010": "101010",
+        "424a5a": "2d7351",
+        "5a3173": "a21851",
+        "848c9c": "69b17b",
+        "944a9c": "d04569",
+        "adb5bd": "b0e4a9",
+        "bd7bbd": "ed8ea2",
+        "ce8cc5": "f4bfbf",
+        "d6d6de": "d6d6de",
+        "ffffff": "ffffff",
+        "efade6": "f8d8cf"
+    }
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/881.json b/public/images/pokemon/variant/back/881.json
new file mode 100644
index 00000000000..3efad4efe60
--- /dev/null
+++ b/public/images/pokemon/variant/back/881.json
@@ -0,0 +1,42 @@
+{
+	"1": {
+		"e39e1e": "9c1430",
+		"975e17": "5b0610",
+		"ffff84": "ee8563",
+		"ead900": "c6362b",
+		"101010": "101010",
+		"2abbfc": "ceb16f",
+		"09354d": "271014",
+		"9ab8ba": "cea5b9",
+		"edf3f2": "faebc8",
+		"5c7996": "a57185",
+		"07305f": "4d254a",
+		"085d94": "714363",
+		"0981ae": "45242e",
+		"27aed6": "6e4145",
+		"072241": "301636",
+		"097da8": "43222c",
+		"0a3463": "492146",
+		"23abd3": "b59795"
+	},
+	"2": {
+		"e39e1e": "35365e",
+		"975e17": "211b3d",
+		"ffff84": "dceeeb",
+		"ead900": "636287",
+		"101010": "101010",
+		"2abbfc": "26c248",
+		"09354d": "09354d",
+		"9ab8ba": "a3c465",
+		"edf3f2": "fcffe4",
+		"5c7996": "50a751",
+		"07305f": "7b1a5e",
+		"085d94": "ad3b6c",
+		"0981ae": "205e5d",
+		"27aed6": "2d7b65",
+		"072241": "5d0e54",
+		"097da8": "185453",
+		"0a3463": "721957",
+		"23abd3": "d49da9"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/881_2.json b/public/images/pokemon/variant/back/881_2.json
deleted file mode 100644
index 568946ee9f9..00000000000
--- a/public/images/pokemon/variant/back/881_2.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "881_2.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 80,
-				"h": 80
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 66,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 66,
-						"h": 80
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 66,
-						"h": 80
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:08f9e60b28adb0f1c25487a3423af005:e78d63b8a44825ae516935d669e48f61:1f7350865753535cbb572c579820f817$"
-	}
-}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/881_2.png b/public/images/pokemon/variant/back/881_2.png
deleted file mode 100644
index 2060481d855..00000000000
Binary files a/public/images/pokemon/variant/back/881_2.png and /dev/null differ
diff --git a/public/images/pokemon/variant/back/881_3.json b/public/images/pokemon/variant/back/881_3.json
deleted file mode 100644
index b9101d9b13f..00000000000
--- a/public/images/pokemon/variant/back/881_3.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "881_3.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 80,
-				"h": 80
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 66,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 66,
-						"h": 80
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 66,
-						"h": 80
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:08f9e60b28adb0f1c25487a3423af005:e78d63b8a44825ae516935d669e48f61:1f7350865753535cbb572c579820f817$"
-	}
-}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/881_3.png b/public/images/pokemon/variant/back/881_3.png
deleted file mode 100644
index 6ed3c2495ba..00000000000
Binary files a/public/images/pokemon/variant/back/881_3.png and /dev/null differ
diff --git a/public/images/pokemon/variant/back/89.json b/public/images/pokemon/variant/back/89.json
new file mode 100644
index 00000000000..eda3558d7c2
--- /dev/null
+++ b/public/images/pokemon/variant/back/89.json
@@ -0,0 +1,30 @@
+{
+    "1": {
+        "101010": "101010",
+        "424a5a": "5b3a1d",
+        "5a3173": "6a010c",
+        "848c9c": "9b7c48",
+        "944a9c": "b1160e",
+        "adb5bd": "e9de8c",
+        "bd7bbd": "d55021",
+        "ce8cc5": "e98a47",
+        "d6d6de": "ded7ce",
+        "ffffff": "ffffff",
+        "efade6": "f8be70",
+        "ad63ad": "c63a17"
+    },
+    "2": {
+        "101010": "101010",
+        "424a5a": "2d7351",
+        "5a3173": "a21851",
+        "848c9c": "69b17b",
+        "944a9c": "d04569",
+        "adb5bd": "b0e4a9",
+        "bd7bbd": "ed8ea2",
+        "ce8cc5": "f4bfbf",
+        "d6d6de": "d6d6de",
+        "ffffff": "ffffff",
+        "efade6": "f8d8cf",
+        "ad63ad": "e5728a"
+    }
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/female/207.json b/public/images/pokemon/variant/back/female/207.json
index 52c582cf1a8..89ed15e95c5 100644
--- a/public/images/pokemon/variant/back/female/207.json
+++ b/public/images/pokemon/variant/back/female/207.json
@@ -1,16 +1,14 @@
 {
 	"1": {
-		"63314a": "7f4812",
-		"e6a5ce": "f8dd84",
-		"de84b5": "daa93f",
-		"101010": "101010",
-		"ad6394": "b67322"
+		"de84b5": "e3784d",
+		"e6a5ce": "f7a565",
+		"63314a": "802019",
+		"ad6394": "ba4732"
 	},
 	"2": {
-		"63314a": "5f1723",
-		"e6a5ce": "ef6b58",
-		"de84b5": "c04144",
-		"101010": "101010",
-		"ad6394": "97343c"
+		"de84b5": "42bca0",
+		"e6a5ce": "70e0b7",
+		"63314a": "134e5e",
+		"ad6394": "27868a"
 	}
 }
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/female/332.json b/public/images/pokemon/variant/back/female/332.json
new file mode 100644
index 00000000000..9ec50cb7e92
--- /dev/null
+++ b/public/images/pokemon/variant/back/female/332.json
@@ -0,0 +1,28 @@
+{
+	"1": {
+		"319452": "780d4a",
+		"4aa552": "8a1652",
+		"7ba563": "b44040",
+		"8cbd63": "bf3d64",
+		"215200": "710f2f",
+		"196b21": "780d4a",
+		"a5d674": "de5b6f",
+		"4a7310": "982443",
+		"a5d673": "e16363",
+		"63b56b": "9e2056",
+		"215201": "710f2e"
+	},
+	"2": {
+		"319452": "b59c72",
+		"4aa552": "c9b991",
+		"7ba563": "805a9c",
+		"8cbd63": "ebe9ca",
+		"215200": "41334d",
+		"196b21": "b59c72",
+		"a5d674": "f6f7df",
+		"4a7310": "4f3956",
+		"a5d673": "a473ba",
+		"63b56b": "e3ddb8",
+		"215201": "694d37"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/female/396.json b/public/images/pokemon/variant/back/female/396.json
new file mode 100644
index 00000000000..429adbc8791
--- /dev/null
+++ b/public/images/pokemon/variant/back/female/396.json
@@ -0,0 +1,36 @@
+{
+	"1": {
+		"d6dede": "e3d09d",
+		"949494": "dbb070",
+		"736363": "89ad57",
+		"ffffff": "f0ecd3",
+		"382028": "731e22",
+		"d67300": "db963b",
+		"b5b5b5": "d4b27f",
+		"808080": "c48c51",
+		"9c4a21": "b06421",
+		"8c7373": "b53f36",
+		"3a2129": "2a4f19",
+		"524a4a": "558033",
+		"4f4747": "144a40",
+		"ad9c9c": "ed7b61",
+		"ff9429": "ffcf5e"
+	},
+	"2": {
+		"d6dede": "f0deaa",
+		"949494": "cca472",
+		"736363": "4da8a1",
+		"ffffff": "fcfad2",
+		"382028": "0d142e",
+		"d67300": "52281f",
+		"b5b5b5": "debd8c",
+		"808080": "bf8d62",
+		"9c4a21": "451915",
+		"8c7373": "1b2745",
+		"3a2129": "235a6b",
+		"524a4a": "307b82",
+		"4f4747": "e0703d",
+		"ad9c9c": "2f436b",
+		"ff9429": "8c604c"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/female/397.json b/public/images/pokemon/variant/back/female/397.json
new file mode 100644
index 00000000000..0eef3be33d9
--- /dev/null
+++ b/public/images/pokemon/variant/back/female/397.json
@@ -0,0 +1,36 @@
+{
+	"1": {
+		"735a63": "b53f36",
+		"574f57": "144a40",
+		"5a525a": "739e49",
+		"f75242": "8bba65",
+		"878787": "baa277",
+		"b5b5b5": "d9c798",
+		"ff9429": "ffcf5e",
+		"382f38": "0c3330",
+		"3a313a": "496e2e",
+		"362d36": "612e10",
+		"fcfcfc": "f0ebc5",
+		"bd6300": "b06421",
+		"7b4221": "965318",
+		"523a4a": "731e22",
+		"9c848c": "ed7b61"
+	},
+	"2": {
+		"735a63": "1b2745",
+		"574f57": "e0703d",
+		"5a525a": "4da8a1",
+		"f75242": "f797ad",
+		"878787": "d4b885",
+		"b5b5b5": "f0deaa",
+		"ff9429": "8c604c",
+		"382f38": "b04a28",
+		"3a313a": "307b82",
+		"362d36": "421917",
+		"fcfcfc": "fcfad2",
+		"bd6300": "66362b",
+		"7b4221": "52281f",
+		"523a4a": "0d142e",
+		"9c848c": "2f436b"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/female/398.json b/public/images/pokemon/variant/back/female/398.json
new file mode 100644
index 00000000000..0c987cf37b0
--- /dev/null
+++ b/public/images/pokemon/variant/back/female/398.json
@@ -0,0 +1,36 @@
+{
+	"1": {
+		"9c4242": "09302d",
+		"5c545c": "144a40",
+		"3a313a": "0d3236",
+		"7b4221": "965318",
+		"bd6300": "db963b",
+		"5a525a": "558033",
+		"7b6b7b": "89ad57",
+		"f75242": "144a40",
+		"735a63": "d94f45",
+		"ffffff": "e8e3b6",
+		"523a4a": "872328",
+		"3a3a3a": "2a4f19",
+		"b5b5b5": "d7be89",
+		"9c848c": "ed7b61",
+		"ff9429": "ffcf5e"
+	},
+	"2": {
+		"9c4242": "c94a2a",
+		"5c545c": "e0703d",
+		"3a313a": "a64221",
+		"7b4221": "421917",
+		"bd6300": "63362b",
+		"5a525a": "307b82",
+		"7b6b7b": "4da8a1",
+		"f75242": "f78a4a",
+		"735a63": "1b2745",
+		"ffffff": "fcfad2",
+		"523a4a": "080d1f",
+		"3a3a3a": "235a6b",
+		"b5b5b5": "f0deaa",
+		"9c848c": "293854",
+		"ff9429": "8c604c"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/female/403.json b/public/images/pokemon/variant/back/female/403.json
new file mode 100644
index 00000000000..4eb1da93a49
--- /dev/null
+++ b/public/images/pokemon/variant/back/female/403.json
@@ -0,0 +1,22 @@
+{
+	"1": {
+		"b59c5a": "3763b8",
+		"7badf7": "bf403a",
+		"637bb5": "962a2f",
+		"4a4a63": "dcb788",
+		"ffe65a": "4881cc",
+		"313142": "bd8254",
+		"42426b": "63121d",
+		"736352": "234085"
+	},
+	"2": {
+		"b59c5a": "36b88a",
+		"7badf7": "324663",
+		"637bb5": "222f4d",
+		"4a4a63": "bbe5e5",
+		"ffe65a": "46d382",
+		"313142": "73bec9",
+		"42426b": "161b36",
+		"736352": "298e7d"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/female/404.json b/public/images/pokemon/variant/back/female/404.json
new file mode 100644
index 00000000000..1ebec7af6be
--- /dev/null
+++ b/public/images/pokemon/variant/back/female/404.json
@@ -0,0 +1,24 @@
+{
+	"1": {
+		"736352": "234085",
+		"4a4a73": "63121d",
+		"63637b": "f1dbb1",
+		"637bb5": "962a2f",
+		"4a4a63": "dcb788",
+		"ffe65a": "4881cc",
+		"313142": "bd8254",
+		"b59c5a": "3763b8",
+		"7badf7": "bf403a"
+	},
+	"2": {
+		"736352": "298e7d",
+		"4a4a73": "161b36",
+		"63637b": "def4f0",
+		"637bb5": "222f4d",
+		"4a4a63": "bbe5e5",
+		"ffe65a": "46d382",
+		"313142": "73bec9",
+		"b59c5a": "36b88a",
+		"7badf7": "324663"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/female/405.json b/public/images/pokemon/variant/back/female/405.json
new file mode 100644
index 00000000000..c70567e0728
--- /dev/null
+++ b/public/images/pokemon/variant/back/female/405.json
@@ -0,0 +1,30 @@
+{
+	"1": {
+		"b59c5a": "3763b8",
+		"7badf7": "bf403a",
+		"63637b": "f1dbb1",
+		"3a3859": "430917",
+		"637bb5": "962a2f",
+		"4a4a73": "63121d",
+		"4a4a63": "dcb488",
+		"ffe65a": "4881cc",
+		"313142": "bd7e54",
+		"943a52": "5a2d0f",
+		"e64a52": "3e2711",
+		"736352": "234085"
+	},
+	"2": {
+		"b59c5a": "36b88a",
+		"7badf7": "324663",
+		"63637b": "def4f0",
+		"3a3859": "0f0f26",
+		"637bb5": "222f4d",
+		"4a4a73": "161b36",
+		"4a4a63": "bbe5e5",
+		"ffe65a": "46d382",
+		"313142": "73bec9",
+		"943a52": "3a5e80",
+		"e64a52": "4a7c92",
+		"736352": "298e7d"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/female/417.json b/public/images/pokemon/variant/back/female/417.json
new file mode 100644
index 00000000000..42b3180ee3c
--- /dev/null
+++ b/public/images/pokemon/variant/back/female/417.json
@@ -0,0 +1,36 @@
+{
+    "1": {
+        "101010": "101010",
+        "3e364e": "734430",
+        "524941": "732e12",
+        "5a524a": "642f1a",
+        "4a425a": "5f2618",
+        "84523a": "9b314f",
+        "ef845a": "e26e6e",
+        "c5a563": "e95d6c",
+        "ffd663": "f17c7c",
+        "637b9c": "86452b",
+        "7bb5e6": "a25f37",
+        "cec5c5": "e8be64",
+        "f7f7f7": "faeda9",
+        "ffffff": "ffffff",
+        "7b7b84": "8e623c"
+    },
+    "2": {
+        "101010": "101010",
+        "3e364e": "203243",
+        "524941": "2d284c",
+        "5a524a": "0f203a",
+        "4a425a": "23704c",
+        "84523a": "693939",
+        "ef845a": "e1b8ac",
+        "c5a563": "8fecf7",
+        "ffd663": "d0fdff",
+        "637b9c": "a2dc76",
+        "7bb5e6": "e4fba1",
+        "cec5c5": "357577",
+        "f7f7f7": "5ba297",
+        "ffffff": "ffffff",
+        "7b7b84": "1f3f4e"
+    }
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/2037.json b/public/images/pokemon/variant/exp/2037.json
new file mode 100644
index 00000000000..2c190d5d36a
--- /dev/null
+++ b/public/images/pokemon/variant/exp/2037.json
@@ -0,0 +1,26 @@
+{
+    "1": {
+        "151515": "101010",
+        "2d57bb": "235dc4",
+        "558b9f": "9f435d",
+        "648082": "6e67b0",
+        "6cb1db": "3daae0",
+        "97bdd2": "ffa8b8",
+        "c1d1d2": "b3b8ea",
+        "d9e9f4": "ffd3e1",
+        "fdfdfd": "d7d9f9",
+        "ffffff": "ffffff"
+    },
+    "2": {
+        "151515": "101010",
+        "2d57bb": "6e1179",
+        "558b9f": "90215e",
+        "648082": "bf4747",
+        "6cb1db": "8832a0",
+        "97bdd2": "da4e75",
+        "c1d1d2": "ffc07b",
+        "d9e9f4": "ff8489",
+        "fdfdfd": "ffe6a0",
+        "ffffff": "ffffff"
+    }
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/2038.json b/public/images/pokemon/variant/exp/2038.json
new file mode 100644
index 00000000000..845c45f7887
--- /dev/null
+++ b/public/images/pokemon/variant/exp/2038.json
@@ -0,0 +1,36 @@
+{
+    "1": {
+        "101010": "101010",
+        "4d5c78": "394880",
+        "516077": "9f435d",
+        "007ab5": "2380c4",
+        "38858d": "e35ea2",
+        "7a8a9c": "6172ab",
+        "66b3d7": "3dbfe0",
+        "86a8c0": "e27495",
+        "81c2c5": "ff89c0",
+        "bdcbd7": "a7ade7",
+        "a1e1de": "ffb6e5",
+        "b0d3ea": "ffa8b8",
+        "eafefe": "ffd3e1",
+        "fdfdfd": "bec6ef",
+        "ffffff": "ffffff"
+    },
+    "2": {
+        "101010": "101010",
+        "4d5c78": "73174a",
+        "516077": "bb3c3c",
+        "007ab5": "882493",
+        "38858d": "572746",
+        "7a8a9c": "90215e",
+        "66b3d7": "a044ab",
+        "86a8c0": "ff824c",
+        "81c2c5": "75355e",
+        "bdcbd7": "da426d",
+        "a1e1de": "93547c",
+        "b0d3ea": "ffbf6b",
+        "eafefe": "ffe28c",
+        "fdfdfd": "ff6f86",
+        "ffffff": "ffffff"
+    }
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/248-mega.json b/public/images/pokemon/variant/exp/248-mega.json
index f6a6d5bf7ed..0a46ac40a4a 100644
--- a/public/images/pokemon/variant/exp/248-mega.json
+++ b/public/images/pokemon/variant/exp/248-mega.json
@@ -1,32 +1,34 @@
 {
 	"1": {
-		"4a5a39": "533334",
-		"dee6cd": "dbb1b5",
-		"101010": "101010",
-		"accd9c": "c78482",
-		"ffffff": "ffffff",
-		"c5c5c5": "c5c5c5",
-		"739c62": "915957",
-		"d55200": "006fbe",
-		"942900": "004194",
-		"ee5229": "0098fc",
-		"bd3920": "006fbe",
-		"737373": "737373",
-		"6a2000": "004194"
+"4a5a39": "533334",
+"821610": "004194",
+"942900": "004194",
+"d0243b": "006fb3",
+"d55200": "0098fc",
+"ff3e40": "0098fc",
+"f24159": "088a72",
+"f55e72": "18b8a0",
+"ff6668": "1cd9ff",
+"739c62": "915957",
+"ff8385": "00e0fc",
+"ffa3a4": "00ffc8",
+"accd9c": "c78482",
+"dee6cd": "dbb1b5"
 	},
 	"2": {
-		"4a5a39": "06092f",
-		"dee6cd": "7068b2",
-		"101010": "101010",
-		"accd9c": "625695",
-		"ffffff": "ffffff",
-		"c5c5c5": "c5c5c5",
-		"739c62": "2c3071",
-		"d55200": "ffa904",
-		"942900": "ee7b06",
-		"ee5229": "ffef76",
-		"bd3920": "ffa904",
-		"737373": "737373",
-		"6a2000": "ee7b06"
+"4a5a39": "06092f",
+"821610": "ee7b06",
+"942900": "ee7b06",
+"d0243b": "ffa904",
+"d55200": "ffa904",
+"ff3e40": "ffef76",
+"f24159": "ffbf44",
+"f55e72": "ffd380",
+"ff6668": "fef3a1",
+"739c62": "2c3071",
+"ff8385": "fff8c1",
+"ffa3a4": "fffbdd",
+"accd9c": "625695",
+"dee6cd": "7068b2"
 	}
 }
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/362-mega.json b/public/images/pokemon/variant/exp/362-mega.json
index 27f5d6f5afc..3b6e39436e6 100644
--- a/public/images/pokemon/variant/exp/362-mega.json
+++ b/public/images/pokemon/variant/exp/362-mega.json
@@ -1,38 +1,35 @@
-{
-	"1": {
-		"000000": "000000",
+{"1": {
+		"010101": "000000",
 		"2b74a8": "84073c",
-		"a4deff": "ffd287",
-		"7b7b83": "151a57",
-		"62bdee": "fd9b44",
-		"58585f": "0d1146",
-		"faf9fb": "ff937b",
+		"bbeeff": "f9383e",
 		"393941": "0d1146",
+		"7dbbee": "b7113a",
+		"fefefe": "ff937b",
 		"e6e6f6": "a2b7e5",
 		"7b7b94": "151a57",
 		"c5cde6": "6076c6",
 		"acaccd": "2f3c84",
-		"52526a": "0d1146",
+		"2983bd": "d54f14",
+		"62bdee": "fd9b44",
 		"a82f37": "f9ff3d",
-		"324c67": "460025",
-		"ffffff": "ff937b"
+		"afe3f8": "ffd287",
+		"20315e": "460025"
 	},
 	"2": {
-		"000000": "010101",
+		"010101": "010101",
 		"2b74a8": "0c4b3a",
-		"a4deff": "f2ff87",
-		"7b7b83": "4a282a",
-		"62bdee": "c0ee46",
-		"58585f": "221315",
-		"faf9fb": "c8ff9c",
+		"bbeeff": "5ce11a",
 		"393941": "221315",
+		"7dbbee": "009325",
+		"fefefe": "c8ff9c",
 		"e6e6f6": "9b6146",
 		"7b7b94": "4a282a",
 		"c5cde6": "7e4a3f",
 		"acaccd": "613735",
-		"52526a": "221315",
+		"2983bd": "6bb61a",
+		"62bdee": "c0ee46",
 		"a82f37": "ff36b3",
-		"324c67": "0a2a2e",
-		"ffffff": "c8ff9c"
+		"afe3f8": "f2ff87",
+		"20315e": "0a2a2e"
 	}
 }
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/653.json b/public/images/pokemon/variant/exp/653.json
index aa8c032d4e3..be967d6c9c2 100644
--- a/public/images/pokemon/variant/exp/653.json
+++ b/public/images/pokemon/variant/exp/653.json
@@ -1,28 +1,28 @@
 {
 	"1": {
-		"796934": "9f398a",
-		"fee772": "e190c3",
 		"101010": "101010",
-		"cfb458": "c35ba3",
-		"7f2d1b": "3c195c",
-		"ec5631": "794cb7",
-		"b64126": "502c81",
-		"736a65": "68326b",
-		"ffffff": "fbecff",
-		"c5c5ce": "c093c3",
-		"524e4e": "404040"
+		"736028": "9f398a",
+		"ffd659": "e190c3",
+		"ccab47": "c35ba3",
+		"732e17": "3c195c",
+		"f26130": "794cb7",
+		"b34724": "502c81",
+		"737373": "68326b",
+		"f8f8f8": "fbecff",
+		"bfbfbf": "c093c3",
+		"404040": "404040"
 	},
 	"2": {
-		"796934": "172547",
-		"fee772": "3a6a93",
 		"101010": "101010",
-		"cfb458": "264166",
-		"7f2d1b": "005646",
-		"ec5631": "21d170",
-		"b64126": "0aaa77",
-		"736a65": "75553c",
-		"ffffff": "fff8ec",
-		"c5c5ce": "d4b996",
-		"524e4e": "404040"
+		"736028": "172547",
+		"ffd659": "3a6a93",
+		"ccab47": "264166",
+		"732e17": "005646",
+		"f26130": "21d170",
+		"b34724": "0aaa77",
+		"737373": "75553c",
+		"f8f8f8": "fff8ec",
+		"bfbfbf": "d4b996",
+		"404040": "404040"
 	}
 }
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/654.json b/public/images/pokemon/variant/exp/654.json
index a413295bc6c..0f3b2bf3d4e 100644
--- a/public/images/pokemon/variant/exp/654.json
+++ b/public/images/pokemon/variant/exp/654.json
@@ -1,38 +1,38 @@
 {
 	"1": {
-		"983a29": "6231a5",
-		"f07944": "ab6ce0",
 		"101010": "101010",
-		"bf5633": "6231a5",
-		"987028": "061530",
-		"f7e77a": "b55390",
-		"e8b848": "872b59",
-		"56301f": "471b70",
-		"af7045": "6231a5",
-		"8d452e": "c5b3ca",
-		"969696": "262424",
-		"414141": "404040",
+		"736028": "061530",
+		"ffd659": "b55390",
+		"ccab47": "872b59",
+		"732e17": "471b70",
+		"f26130": "ab6ce0",
+		"b34724": "6231a5",
 		"f8f8f8": "f7e4fc",
-		"d8d8c8": "c093c3",
-		"5c5c5c": "262424",
-		"000000": "101010"
+		"737373": "5c255f",
+		"bfbfbf": "c093c3",
+		"804913": "c5b3ca",
+		"262626": "262626",
+		"404040": "404040",
+		"f8cf52": "80f37b",
+		"ffc000": "4fcb61",
+		"ff8700": "207d4e"
 	},
 	"2": {
-		"983a29": "0aaa77",
-		"f07944": "21d170",
 		"101010": "101010",
-		"bf5633": "0aaa77",
-		"987028": "061530",
-		"f7e77a": "2b5f8a",
-		"e8b848": "173864",
-		"56301f": "005646",
-		"af7045": "0aaa77",
-		"8d452e": "098794",
-		"969696": "1a1a22",
-		"414141": "404040",
+		"736028": "061530",
+		"ffd659": "2b5f8a",
+		"ccab47": "173864",
+		"732e17": "005646",
+		"f26130": "21d170",
+		"b34724": "0aaa77",
 		"f8f8f8": "fff2dd",
-		"d8d8c8": "d4b996",
-		"5c5c5c": "1a1a22",
-		"000000": "101010"
+		"737373": "75553c",
+		"bfbfbf": "d4b996",
+		"804913": "098794",
+		"262626": "262626",
+		"404040": "404040",
+		"f8cf52": "c858a4",
+		"ffc000": "75308e",
+		"ff8700": "521364"
 	}
 }
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/656.json b/public/images/pokemon/variant/exp/656.json
index 68743a4c9f1..1d1003f739c 100644
--- a/public/images/pokemon/variant/exp/656.json
+++ b/public/images/pokemon/variant/exp/656.json
@@ -3,12 +3,12 @@
 		"838394": "4d7dc5",
 		"62ace6": "8363af",
 		"7bcdff": "9c75c2",
-		"ffec8c": "ddfff9",
+		"fdea88": "ddfff9",
 		"a1a1c4": "7ab7ec",
 		"c9b241": "97d6e2",
 		"dfcf77": "bae7e8",
 		"174592": "37408c",
-		"fdfdfd": "b1e5ff",
+		"ffffff": "b1e5ff",
 		"9c9cc5": "5385c7",
 		"cdcde6": "7eb7e8",
 		"396a83": "362864",
@@ -18,12 +18,12 @@
 		"838394": "cc6845",
 		"62ace6": "c44848",
 		"7bcdff": "dd6155",
-		"ffec8c": "ddfff9",
+		"fdea88": "ddfff9",
 		"a1a1c4": "f7c685",
 		"c9b241": "97d6e2",
 		"dfcf77": "bae7e8",
 		"174592": "198158",
-		"fdfdfd": "fff4bd",
+		"ffffff": "fff4bd",
 		"9c9cc5": "c96a48",
 		"cdcde6": "f7b785",
 		"396a83": "5c0d33",
diff --git a/public/images/pokemon/variant/exp/664.json b/public/images/pokemon/variant/exp/664.json
index 02633098521..bd4164ca7db 100644
--- a/public/images/pokemon/variant/exp/664.json
+++ b/public/images/pokemon/variant/exp/664.json
@@ -1,30 +1,30 @@
 {
 	"1": {
-		"797987": "9d6260",
-		"f9f8fa": "ffffff",
-		"000000": "000000",
-		"cdcdcd": "e9c7c4",
-		"54544e": "895a9f",
-		"383830": "4c2855",
-		"727272": "a97dbb",
-		"8e5136": "838b53",
-		"f0d5b9": "a0c896",
-		"d8a465": "838b53",
-		"653925": "626649",
-		"383834": "383834"
+		"4d4d4d": "9d6260",
+		"f8f8f8": "ffffff",
+		"101010": "101010",
+		"b3b3b3": "e9c7c4",
+		"363636": "4c2855",
+		"747474": "a97dbb",
+		"4e4e4e": "895a9f",
+		"9d7247": "838b53",
+		"d1bf6b": "a0c896",
+		"b2b2b2": "b2b2b2",
+		"f7f7f7": "f7f7f7",
+		"855d31": "626649"
 	},
 	"2": {
-		"797987": "590015",
-		"f9f8fa": "c83e4c",
-		"000000": "000000",
-		"cdcdcd": "a70d37",
-		"54544e": "377772",
-		"383830": "05312f",
-		"727272": "73bdae",
-		"8e5136": "bf8961",
-		"f0d5b9": "ffe0ba",
-		"d8a465": "dda476",
-		"653925": "05312f",
-		"383834": "383834"
+		"4d4d4d": "590015",
+		"f8f8f8": "c83e4c",
+		"101010": "101010",
+		"b3b3b3": "a70d37",
+		"363636": "05312f",
+		"747474": "73bdae",
+		"4e4e4e": "377772",
+		"9d7247": "dda476",
+		"d1bf6b": "ffe0ba",
+		"b2b2b2": "b2b2b2",
+		"f7f7f7": "f7f7f7",
+		"855d31": "bf8961"
 	}
 }
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/665.json b/public/images/pokemon/variant/exp/665.json
index 02e88015c15..6d828dadb5d 100644
--- a/public/images/pokemon/variant/exp/665.json
+++ b/public/images/pokemon/variant/exp/665.json
@@ -1,36 +1,36 @@
 {
 	"1": {
-		"8e5136": "838b53",
-		"653925": "626649",
-		"52524b": "4c2855",
-		"f0d5b9": "a0c896",
-		"d8a465": "838b53",
-		"838392": "9c615f",
-		"8b8b8b": "a97dbb",
-		"000000": "000000",
-		"cdcdcd": "e9c7c4",
-		"6a6a6a": "895a9f",
-		"ffffff": "ffffff",
-		"f9f8fa": "f9f8fa",
-		"94416a": "005361",
-		"ff94b4": "008aac",
-		"ee5a62": "00aacd"
+		"363636": "4c2855",
+		"d1bf6b": "a0c896",
+		"9d7247": "838b53",
+		"4e4e4e": "895a9f",
+		"747474": "a97dbb",
+		"bfbfbf": "b294be",
+		"101010": "101010",
+		"fdfdfd": "fdfdfd",
+		"8c8c8c": "895a9f",
+		"4d4d4d": "9c615f",
+		"f8f8f8": "ffffff",
+		"b3b3b3": "e9c7c4",
+		"802626": "005361",
+		"ff4c4c": "00aacd",
+		"eed83e": "cae2c3"
 	},
 	"2": {
-		"8e5136": "bf8961",
-		"653925": "bf8961",
-		"52524b": "05312f",
-		"f0d5b9": "ffe0ba",
-		"d8a465": "dda476",
-		"838392": "590015",
-		"8b8b8b": "73bdae",
-		"000000": "000000",
-		"cdcdcd": "a70d37",
-		"6a6a6a": "377772",
-		"ffffff": "c83e4c",
-		"f9f8fa": "c83e4c",
-		"94416a": "004270",
-		"ff94b4": "0092dd",
-		"ee5a62": "0092dd"
+		"363636": "05312f",
+		"d1bf6b": "ffe0ba",
+		"9d7247": "dda476",
+		"4e4e4e": "377772",
+		"747474": "73bdae",
+		"bfbfbf": "a70d37",
+		"101010": "101010",
+		"fdfdfd": "fdfdfd",
+		"8c8c8c": "590015",
+		"4d4d4d": "590015",
+		"f8f8f8": "c83e4c",
+		"b3b3b3": "a70d37",
+		"802626": "004270",
+		"ff4c4c": "0092dd",
+		"eed83e": "ffe0ba"
 	}
 }
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/666-fancy.json b/public/images/pokemon/variant/exp/666-fancy.json
new file mode 100644
index 00000000000..1f31ac6983d
--- /dev/null
+++ b/public/images/pokemon/variant/exp/666-fancy.json
@@ -0,0 +1,38 @@
+{
+    "1": {
+        "101010": "101010",
+        "303030": "402746",
+        "675220": "958c8a",
+        "504a4a": "7f6991",
+        "595959": "724b7a",
+        "707068": "a97cbc",
+        "811c1c": "811c1c",
+        "de4040": "de4040",
+        "5faa3e": "5faa3e",
+        "ceab62": "d9edd4",
+        "b6d26d": "b6d26d",
+        "e9e052": "e9e052",
+        "cf7ef3": "cf7ef3",
+        "c3c3c3": "ffeaff",
+        "f2d4e3": "f2d4e3",
+        "ead2e3": "ffeaff"
+    },
+    "2": {
+        "101010": "101010",
+        "303030": "00771b",
+        "675220": "b9c05a",
+        "504a4a": "b9c05a",
+        "595959": "6f9f42",
+        "707068": "e3e982",
+        "811c1c": "811c1c",
+        "de4040": "de4040",
+        "5faa3e": "5faa3e",
+        "ceab62": "e3e982",
+        "b6d26d": "b6d26d",
+        "e9e052": "e9e052",
+        "cf7ef3": "cf7ef3",
+        "c3c3c3": "fcf1ff",
+        "f2d4e3": "f2d4e3",
+        "ead2e3": "fcf1ff"
+    }
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/666-fancy_2.json b/public/images/pokemon/variant/exp/666-fancy_2.json
deleted file mode 100644
index bcfde0b3dd4..00000000000
--- a/public/images/pokemon/variant/exp/666-fancy_2.json
+++ /dev/null
@@ -1,1280 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "666-fancy_2.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 346,
-				"h": 346
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0027.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0035.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 69,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 69,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 69,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 69,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0029.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 69,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0033.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 69,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0039.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 138,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0041.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 207,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0043.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 276,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0045.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 67,
-						"y": 0,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0047.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 134,
-						"y": 0,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0051.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 201,
-						"y": 0,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0053.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 268,
-						"y": 0,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0055.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 67,
-						"y": 69,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0057.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 67,
-						"y": 138,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0059.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 67,
-						"y": 207,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 67,
-						"y": 276,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 67,
-						"y": 276,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0025.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 67,
-						"y": 276,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0037.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 67,
-						"y": 276,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 134,
-						"y": 69,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 134,
-						"y": 69,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0031.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 134,
-						"y": 69,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0049.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 201,
-						"y": 69,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 268,
-						"y": 69,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 268,
-						"y": 69,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 268,
-						"y": 69,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 268,
-						"y": 69,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0026.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 268,
-						"y": 69,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0036.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 268,
-						"y": 69,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 2,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 134,
-						"y": 137,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 2,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 134,
-						"y": 137,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 2,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 134,
-						"y": 137,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 2,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 134,
-						"y": 137,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0028.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 2,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 134,
-						"y": 137,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0034.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 2,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 134,
-						"y": 137,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 5,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 187,
-						"y": 137,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 5,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 187,
-						"y": 137,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 5,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 187,
-						"y": 137,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 5,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 187,
-						"y": 137,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0030.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 5,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 187,
-						"y": 137,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0032.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 5,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 187,
-						"y": 137,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0038.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 240,
-						"y": 138,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0040.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 2,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 293,
-						"y": 138,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0052.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 2,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 293,
-						"y": 138,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0042.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 4,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 134,
-						"y": 206,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0054.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 4,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 134,
-						"y": 206,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0044.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 4,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 187,
-						"y": 206,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0046.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 2,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 240,
-						"y": 207,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0048.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 134,
-						"y": 275,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0050.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 187,
-						"y": 275,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0056.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 4,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 240,
-						"y": 276,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0058.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 2,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 293,
-						"y": 207,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0060.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 293,
-						"y": 276,
-						"w": 53,
-						"h": 69
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:370e4a87d9d988b8133d25e0b97db22c:d173344c5e41aaa90de937ec3e1b167f:6d5edff9a806f43feff031c9919c9aca$"
-	}
-}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/666-fancy_2.png b/public/images/pokemon/variant/exp/666-fancy_2.png
deleted file mode 100644
index 68af4d0a07a..00000000000
Binary files a/public/images/pokemon/variant/exp/666-fancy_2.png and /dev/null differ
diff --git a/public/images/pokemon/variant/exp/666-fancy_3.json b/public/images/pokemon/variant/exp/666-fancy_3.json
deleted file mode 100644
index 60fd0634e79..00000000000
--- a/public/images/pokemon/variant/exp/666-fancy_3.json
+++ /dev/null
@@ -1,1280 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "666-fancy_3.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 346,
-				"h": 346
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0027.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0035.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 69,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 69,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 69,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 69,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0029.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 69,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0033.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 69,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0039.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 138,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0041.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 207,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0043.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 276,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0045.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 67,
-						"y": 0,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0047.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 134,
-						"y": 0,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0051.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 201,
-						"y": 0,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0053.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 268,
-						"y": 0,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0055.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 67,
-						"y": 69,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0057.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 67,
-						"y": 138,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0059.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 67,
-						"y": 207,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 67,
-						"y": 276,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 67,
-						"y": 276,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0025.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 67,
-						"y": 276,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0037.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 67,
-						"y": 276,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 134,
-						"y": 69,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 134,
-						"y": 69,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0031.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 134,
-						"y": 69,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0049.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 201,
-						"y": 69,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 268,
-						"y": 69,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 268,
-						"y": 69,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 268,
-						"y": 69,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 268,
-						"y": 69,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0026.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 268,
-						"y": 69,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0036.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 268,
-						"y": 69,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 2,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 134,
-						"y": 137,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 2,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 134,
-						"y": 137,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 2,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 134,
-						"y": 137,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 2,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 134,
-						"y": 137,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0028.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 2,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 134,
-						"y": 137,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0034.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 2,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 134,
-						"y": 137,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 5,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 187,
-						"y": 137,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 5,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 187,
-						"y": 137,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 5,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 187,
-						"y": 137,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 5,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 187,
-						"y": 137,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0030.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 5,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 187,
-						"y": 137,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0032.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 5,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 187,
-						"y": 137,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0038.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 240,
-						"y": 138,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0040.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 2,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 293,
-						"y": 138,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0052.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 2,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 293,
-						"y": 138,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0042.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 4,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 134,
-						"y": 206,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0054.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 4,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 134,
-						"y": 206,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0044.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 4,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 187,
-						"y": 206,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0046.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 2,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 240,
-						"y": 207,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0048.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 134,
-						"y": 275,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0050.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 187,
-						"y": 275,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0056.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 4,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 240,
-						"y": 276,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0058.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 2,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 293,
-						"y": 207,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0060.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 293,
-						"y": 276,
-						"w": 53,
-						"h": 69
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:370e4a87d9d988b8133d25e0b97db22c:d173344c5e41aaa90de937ec3e1b167f:6d5edff9a806f43feff031c9919c9aca$"
-	}
-}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/666-fancy_3.png b/public/images/pokemon/variant/exp/666-fancy_3.png
deleted file mode 100644
index a8e39976f2a..00000000000
Binary files a/public/images/pokemon/variant/exp/666-fancy_3.png and /dev/null differ
diff --git a/public/images/pokemon/variant/exp/666-high-plains.json b/public/images/pokemon/variant/exp/666-high-plains.json
index 330d1c39772..f63bb4f81f3 100644
--- a/public/images/pokemon/variant/exp/666-high-plains.json
+++ b/public/images/pokemon/variant/exp/666-high-plains.json
@@ -14,7 +14,8 @@
 		"c3c3c3": "ffeaff",
 		"811c1c": "811c1c",
 		"337543": "337543",
-		"e8c815": "e8c815"
+		"e8c815": "e8c815",
+		"773d21": "773d21"
 	},
 	"2": {
 		"101010": "101010",
@@ -31,6 +32,7 @@
 		"c3c3c3": "edc67c",
 		"811c1c": "811c1c",
 		"337543": "337543",
-		"e8c815": "e8c815"
+		"e8c815": "e8c815",
+		"773d21": "773d21"
 	}
 }
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/666-icy-snow.json b/public/images/pokemon/variant/exp/666-icy-snow.json
index 9cae71418ce..d69d48d89e9 100644
--- a/public/images/pokemon/variant/exp/666-icy-snow.json
+++ b/public/images/pokemon/variant/exp/666-icy-snow.json
@@ -6,12 +6,13 @@
 		"303030": "402746",
 		"cfd9cf": "cfd9cf",
 		"c5c5da": "c5c5da",
-		"ceab62": "d9edd4",
 		"675220": "958c8a",
-		"504a4a": "7f6991",
+		"ceab62": "d9edd4",
 		"707068": "a97cbc",
+		"504a4a": "7f6991",
 		"c3c3c3": "ffeaff",
 		"acacc2": "acacc2",
+		"95a1a1": "95a1a1",
 		"811c1c": "811c1c"
 	},
 	"2": {
@@ -21,12 +22,13 @@
 		"303030": "364051",
 		"cfd9cf": "cfd9cf",
 		"c5c5da": "c5c5da",
-		"ceab62": "8c91a4",
 		"675220": "666b7d",
-		"504a4a": "666b7d",
+		"ceab62": "8c91a4",
 		"707068": "8c91a4",
+		"504a4a": "666b7d",
 		"c3c3c3": "fefeff",
 		"acacc2": "acacc2",
+		"95a1a1": "95a1a1",
 		"811c1c": "811c1c"
 	}
 }
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/666-meadow.json b/public/images/pokemon/variant/exp/666-meadow.json
new file mode 100644
index 00000000000..c766325427b
--- /dev/null
+++ b/public/images/pokemon/variant/exp/666-meadow.json
@@ -0,0 +1,36 @@
+{
+    "1": {
+        "101010": "101010",
+        "303030": "402746",
+        "675220": "958c8a",
+        "504a4a": "7f6991",
+        "595959": "724b7a",
+        "707068": "a97cbc",
+        "811c1c": "811c1c",
+        "b4295a": "b4295a",
+        "da6b7e": "da6b7e",
+        "ceab62": "d9edd4",
+        "e66fad": "e66fad",
+        "2d9b9b": "2d9b9b",
+        "f3a0ca": "f3a0ca",
+        "c3c3c3": "ffeaff",
+        "f2f2f2": "f2f2f2"
+    },
+    "2": {
+        "101010": "101010",
+        "303030": "770921",
+        "675220": "a2275e",
+        "504a4a": "a2275e",
+        "595959": "9e3941",
+        "707068": "ce5283",
+        "811c1c": "811c1c",
+        "b4295a": "b4295a",
+        "da6b7e": "da6b7e",
+        "ceab62": "ce5283",
+        "e66fad": "e66fad",
+        "2d9b9b": "2d9b9b",
+        "f3a0ca": "f3a0ca",
+        "c3c3c3": "f4c2ec",
+        "f2f2f2": "f2f2f2"
+    }
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/666-meadow_2.json b/public/images/pokemon/variant/exp/666-meadow_2.json
deleted file mode 100644
index 4d4d4d16147..00000000000
--- a/public/images/pokemon/variant/exp/666-meadow_2.json
+++ /dev/null
@@ -1,1280 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "666-meadow_2.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 346,
-				"h": 346
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0027.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0035.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 69,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 69,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 69,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 69,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0029.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 69,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0033.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 69,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0039.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 138,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0041.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 207,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0043.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 276,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0045.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 67,
-						"y": 0,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0047.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 134,
-						"y": 0,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0051.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 201,
-						"y": 0,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0053.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 268,
-						"y": 0,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0055.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 67,
-						"y": 69,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0057.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 67,
-						"y": 138,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0059.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 67,
-						"y": 207,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 67,
-						"y": 276,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 67,
-						"y": 276,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0025.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 67,
-						"y": 276,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0037.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 67,
-						"y": 276,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 134,
-						"y": 69,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 134,
-						"y": 69,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0031.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 134,
-						"y": 69,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0049.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 201,
-						"y": 69,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 268,
-						"y": 69,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 268,
-						"y": 69,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 268,
-						"y": 69,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 268,
-						"y": 69,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0026.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 268,
-						"y": 69,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0036.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 268,
-						"y": 69,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 2,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 134,
-						"y": 137,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 2,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 134,
-						"y": 137,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 2,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 134,
-						"y": 137,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 2,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 134,
-						"y": 137,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0028.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 2,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 134,
-						"y": 137,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0034.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 2,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 134,
-						"y": 137,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 5,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 187,
-						"y": 137,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 5,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 187,
-						"y": 137,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 5,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 187,
-						"y": 137,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 5,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 187,
-						"y": 137,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0030.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 5,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 187,
-						"y": 137,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0032.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 5,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 187,
-						"y": 137,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0038.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 240,
-						"y": 138,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0040.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 2,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 293,
-						"y": 138,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0052.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 2,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 293,
-						"y": 138,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0042.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 4,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 134,
-						"y": 206,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0054.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 4,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 134,
-						"y": 206,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0044.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 4,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 187,
-						"y": 206,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0046.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 2,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 240,
-						"y": 207,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0048.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 134,
-						"y": 275,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0050.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 187,
-						"y": 275,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0056.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 4,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 240,
-						"y": 276,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0058.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 2,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 293,
-						"y": 207,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0060.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 293,
-						"y": 276,
-						"w": 53,
-						"h": 69
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:223ce33721ef8da9ff40286099c20de4:b82acd304c2a8b8cebeda2043a3e1f96:f8ac4807b4d6eef2256fa1b93e0f89ba$"
-	}
-}
diff --git a/public/images/pokemon/variant/exp/666-meadow_2.png b/public/images/pokemon/variant/exp/666-meadow_2.png
deleted file mode 100644
index 8aada72636f..00000000000
Binary files a/public/images/pokemon/variant/exp/666-meadow_2.png and /dev/null differ
diff --git a/public/images/pokemon/variant/exp/666-meadow_3.json b/public/images/pokemon/variant/exp/666-meadow_3.json
deleted file mode 100644
index 8af56626a35..00000000000
--- a/public/images/pokemon/variant/exp/666-meadow_3.json
+++ /dev/null
@@ -1,1280 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "666-meadow_3.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 346,
-				"h": 346
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0027.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0035.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 69,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 69,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 69,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 69,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0029.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 69,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0033.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 69,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0039.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 138,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0041.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 207,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0043.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 276,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0045.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 67,
-						"y": 0,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0047.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 134,
-						"y": 0,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0051.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 201,
-						"y": 0,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0053.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 268,
-						"y": 0,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0055.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 67,
-						"y": 69,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0057.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 67,
-						"y": 138,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0059.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 67,
-						"y": 207,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 67,
-						"y": 276,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 67,
-						"y": 276,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0025.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 67,
-						"y": 276,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0037.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 67,
-						"y": 276,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 134,
-						"y": 69,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 134,
-						"y": 69,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0031.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 134,
-						"y": 69,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0049.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 201,
-						"y": 69,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 268,
-						"y": 69,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 268,
-						"y": 69,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 268,
-						"y": 69,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 268,
-						"y": 69,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0026.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 268,
-						"y": 69,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0036.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 268,
-						"y": 69,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 2,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 134,
-						"y": 137,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 2,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 134,
-						"y": 137,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 2,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 134,
-						"y": 137,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 2,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 134,
-						"y": 137,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0028.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 2,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 134,
-						"y": 137,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0034.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 2,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 134,
-						"y": 137,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 5,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 187,
-						"y": 137,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 5,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 187,
-						"y": 137,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 5,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 187,
-						"y": 137,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 5,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 187,
-						"y": 137,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0030.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 5,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 187,
-						"y": 137,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0032.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 5,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 187,
-						"y": 137,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0038.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 240,
-						"y": 138,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0040.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 2,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 293,
-						"y": 138,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0052.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 2,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 293,
-						"y": 138,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0042.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 4,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 134,
-						"y": 206,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0054.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 4,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 134,
-						"y": 206,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0044.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 4,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 187,
-						"y": 206,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0046.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 2,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 240,
-						"y": 207,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0048.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 134,
-						"y": 275,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0050.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 187,
-						"y": 275,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0056.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 4,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 240,
-						"y": 276,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0058.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 2,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 293,
-						"y": 207,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0060.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 293,
-						"y": 276,
-						"w": 53,
-						"h": 69
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:223ce33721ef8da9ff40286099c20de4:b82acd304c2a8b8cebeda2043a3e1f96:f8ac4807b4d6eef2256fa1b93e0f89ba$"
-	}
-}
diff --git a/public/images/pokemon/variant/exp/666-meadow_3.png b/public/images/pokemon/variant/exp/666-meadow_3.png
deleted file mode 100644
index 146ea5e2ba9..00000000000
Binary files a/public/images/pokemon/variant/exp/666-meadow_3.png and /dev/null differ
diff --git a/public/images/pokemon/variant/exp/666-monsoon.json b/public/images/pokemon/variant/exp/666-monsoon.json
index edc2e86427e..915d471b2b1 100644
--- a/public/images/pokemon/variant/exp/666-monsoon.json
+++ b/public/images/pokemon/variant/exp/666-monsoon.json
@@ -1,36 +1,33 @@
 {
-	"1": {
-		"101010": "101010",
-		"595959": "724b7a",
-		"f0f0f8": "f0f0f8",
-		"303030": "402746",
-		"ceab62": "d9edd4",
-		"675220": "958c8a",
+    "1": {
+        "101010": "101010",
+        "303030": "402746",
+        "675220": "958c8a",
+        "504a4a": "7f6991",
+        "595959": "724b7a",
+        "707068": "a97cbc",
 		"807676": "807676",
-		"92f4f4": "92f4f4",
-		"989898": "989898",
-		"504a4a": "7f6991",
-		"707068": "a97cbc",
-		"4eccd6": "4eccd6",
+        "ceab62": "d9edd4",
 		"5676de": "5676de",
-		"c3c3c3": "ffeaff",
-		"811c1c": "811c1c"
-	},
-	"2": {
-		"101010": "101010",
-		"595959": "656565",
-		"f0f0f8": "f0f0f8",
-		"303030": "4f4645",
-		"ceab62": "5857bc",
-		"675220": "2c3593",
-		"807676": "807676",
-		"92f4f4": "92f4f4",
-		"989898": "989898",
-		"504a4a": "2c3593",
-		"707068": "5857bc",
-		"4eccd6": "4eccd6",
-		"5676de": "5676de",
-		"c3c3c3": "b8f9f9",
-		"811c1c": "811c1c"
-	}
+        "4eccd6": "4eccd6",
+        "989898": "989898",
+        "c3c3c3": "c3c3c3",
+        "f0f0f8": "f0f0f8"
+    },
+    "2": {
+        "101010": "101010",
+        "303030": "3d3231",
+        "675220": "2c3593",
+        "504a4a": "2c3593",
+        "595959": "4f4645",
+        "707068": "5857bc",
+        "807676": "807676",
+        "ceab62": "5857bc",
+        "5676de": "5676de",
+        "4eccd6": "4eccd6",
+        "989898": "989898",
+        "92f4f4": "92f4f4",
+        "c3c3c3": "b8f9f9",
+        "f0f0f8": "f0f0f8"
+    }
 }
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/666-ocean.json b/public/images/pokemon/variant/exp/666-ocean.json
index 26a38bad7a8..c468bbcbf1e 100644
--- a/public/images/pokemon/variant/exp/666-ocean.json
+++ b/public/images/pokemon/variant/exp/666-ocean.json
@@ -22,7 +22,7 @@
 		"e1384d": "e1384d",
 		"f3a861": "f3a861",
 		"fcf372": "fcf372",
-		"303030": "b56208",
+		"303030": "b54908",
 		"ceab62": "ea8742",
 		"675220": "bc601c",
 		"504a4a": "bc601c",
diff --git a/public/images/pokemon/variant/exp/666-poke-ball.json b/public/images/pokemon/variant/exp/666-poke-ball.json
index 36cd38b95f0..fe6b42f6ef3 100644
--- a/public/images/pokemon/variant/exp/666-poke-ball.json
+++ b/public/images/pokemon/variant/exp/666-poke-ball.json
@@ -3,17 +3,36 @@
 		"101010": "101010",
 		"595959": "724b7a",
 		"b72c2c": "b72c2c",
-		"303030": "402746",
 		"dc4b4b": "dc4b4b",
-		"ceab62": "d9edd4",
+		"303030": "402746",
 		"675220": "958c8a",
+		"ceab62": "d9edd4",
 		"e97e7e": "e97e7e",
 		"971d1d": "971d1d",
 		"f8f8f8": "f8f8f8",
-		"504a4a": "7f6991",
 		"707068": "a97cbc",
+		"504a4a": "7f6991",
 		"c3c3c3": "ffeaff",
 		"811c1c": "811c1c",
-		"a9a99e": "a9a99e"
+		"a9a99e": "a9a99e",
+		"2c2b2b": "402746"
+	},
+	"2": {
+		"101010": "101010",
+		"f8f8f8": "00006d",
+		"303030": "ae001a",
+		"2c2b2b": "660000",
+        "504a4a": "a70038",
+		"595959": "df0036",
+		"c3c3c3": "f0a6bf",
+		"707068": "d5375a",
+		"a9a99e": "000050",
+		"811c1c": "811c1c",
+		"971d1d": "040046",
+		"b72c2c": "00005e",
+		"dc4b4b": "19007d",
+		"e97e7e": "2e2095",
+		"675220": "a70038",
+		"ceab62": "d5375a"
 	}
 }
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/666-poke-ball_3.json b/public/images/pokemon/variant/exp/666-poke-ball_3.json
deleted file mode 100644
index 3d133124358..00000000000
--- a/public/images/pokemon/variant/exp/666-poke-ball_3.json
+++ /dev/null
@@ -1,1280 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "666-poke-ball_3.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 346,
-				"h": 346
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0027.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0035.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 69,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 69,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 69,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 69,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0029.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 69,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0033.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 69,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0039.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 138,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0041.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 207,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0043.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 276,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0045.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 67,
-						"y": 0,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0047.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 134,
-						"y": 0,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0051.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 201,
-						"y": 0,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0053.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 268,
-						"y": 0,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0055.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 67,
-						"y": 69,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0057.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 67,
-						"y": 138,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0059.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 67,
-						"y": 207,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 67,
-						"y": 276,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 67,
-						"y": 276,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0025.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 67,
-						"y": 276,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0037.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 67,
-						"y": 276,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 134,
-						"y": 69,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 134,
-						"y": 69,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0031.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 134,
-						"y": 69,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0049.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 201,
-						"y": 69,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 268,
-						"y": 69,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 268,
-						"y": 69,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 268,
-						"y": 69,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 268,
-						"y": 69,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0026.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 268,
-						"y": 69,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0036.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 268,
-						"y": 69,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 2,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 134,
-						"y": 137,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 2,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 134,
-						"y": 137,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 2,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 134,
-						"y": 137,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 2,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 134,
-						"y": 137,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0028.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 2,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 134,
-						"y": 137,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0034.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 2,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 134,
-						"y": 137,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 5,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 187,
-						"y": 137,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 5,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 187,
-						"y": 137,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 5,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 187,
-						"y": 137,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 5,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 187,
-						"y": 137,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0030.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 5,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 187,
-						"y": 137,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0032.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 5,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 187,
-						"y": 137,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0038.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 240,
-						"y": 138,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0040.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 2,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 293,
-						"y": 138,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0052.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 2,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 293,
-						"y": 138,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0042.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 4,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 134,
-						"y": 206,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0054.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 4,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 134,
-						"y": 206,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0044.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 4,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 187,
-						"y": 206,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0046.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 2,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 240,
-						"y": 207,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0048.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 134,
-						"y": 275,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0050.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 187,
-						"y": 275,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0056.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 4,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 240,
-						"y": 276,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0058.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 2,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 293,
-						"y": 207,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0060.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 293,
-						"y": 276,
-						"w": 53,
-						"h": 69
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:9b0791af9130022168ad784a59e299ce:b180b141bed2ea965d6f07d9e2cd7ecc:8ec14f129d1691b8da504a13b661abed$"
-	}
-}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/666-poke-ball_3.png b/public/images/pokemon/variant/exp/666-poke-ball_3.png
deleted file mode 100644
index 767a55ab849..00000000000
Binary files a/public/images/pokemon/variant/exp/666-poke-ball_3.png and /dev/null differ
diff --git a/public/images/pokemon/variant/exp/666-river.json b/public/images/pokemon/variant/exp/666-river.json
index df10a73d783..c7e5e288d05 100644
--- a/public/images/pokemon/variant/exp/666-river.json
+++ b/public/images/pokemon/variant/exp/666-river.json
@@ -1,19 +1,40 @@
 {
-	"2": {
-		"101010": "101010",
-		"595959": "8a5702",
-		"ceab62": "d9a666",
-		"303030": "7b2800",
-		"625843": "625843",
-		"bc813f": "bc813f",
-		"9c9143": "9c9143",
-		"675220": "ae7f41",
-		"504a4a": "ae7f41",
-		"707068": "d9a666",
-		"c3c3c3": "e3c384",
-		"811c1c": "811c1c",
-		"59c9d3": "59c9d3",
-		"279ec2": "279ec2",
-		"1d726a": "1d726a"
-	}
+    "1": {
+        "101010": "101010",
+        "303030": "402746",
+        "4a412c": "4a412c",
+        "675220": "958c8a",
+        "634d20": "634d20",
+        "1d726a": "1d726a",
+        "504a4a": "7f6991",
+        "595959": "724b7a",
+        "625841": "625841",
+        "707068": "a97cbc",
+        "bc813f": "bc813f",
+        "9c9143": "9c9143",
+        "ceab62": "ceab62",
+        "279ec2": "279ec2",
+        "59c9d3": "59c9d3",
+        "c3c3c3": "c3c3c3",
+        "d2a862": "d9edd4"
+    },
+    "2": {
+        "101010": "101010",
+        "303030": "7b2800",
+        "4a412c": "4a412c",
+        "675220": "ae7f41",
+        "634d20": "634d20",
+        "1d726a": "1d726a",
+        "504a4a": "ae7f41",
+        "595959": "8a5702",
+        "625841": "625841",
+        "707068": "d9a666",
+        "bc813f": "bc813f",
+        "9c9143": "9c9143",
+        "ceab62": "ceab62",
+        "279ec2": "279ec2",
+        "59c9d3": "59c9d3",
+        "c3c3c3": "e3c384",
+        "d2a862": "d2a862"
+    }
 }
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/666-river_2.json b/public/images/pokemon/variant/exp/666-river_2.json
deleted file mode 100644
index f840b39ccfd..00000000000
--- a/public/images/pokemon/variant/exp/666-river_2.json
+++ /dev/null
@@ -1,1280 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "666-river_2.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 346,
-				"h": 346
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0027.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0035.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 69,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 69,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 69,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 69,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0029.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 69,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0033.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 69,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0039.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 138,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0041.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 207,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0043.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 276,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0045.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 67,
-						"y": 0,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0047.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 134,
-						"y": 0,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0051.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 201,
-						"y": 0,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0053.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 268,
-						"y": 0,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0055.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 67,
-						"y": 69,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0057.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 67,
-						"y": 138,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0059.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 67,
-						"h": 69
-					},
-					"frame": {
-						"x": 67,
-						"y": 207,
-						"w": 67,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 67,
-						"y": 276,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 67,
-						"y": 276,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0025.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 67,
-						"y": 276,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0037.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 67,
-						"y": 276,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 134,
-						"y": 69,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 134,
-						"y": 69,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0031.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 134,
-						"y": 69,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0049.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 201,
-						"y": 69,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 268,
-						"y": 69,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 268,
-						"y": 69,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 268,
-						"y": 69,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 268,
-						"y": 69,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0026.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 268,
-						"y": 69,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0036.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 268,
-						"y": 69,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 2,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 134,
-						"y": 137,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 2,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 134,
-						"y": 137,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 2,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 134,
-						"y": 137,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 2,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 134,
-						"y": 137,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0028.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 2,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 134,
-						"y": 137,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0034.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 2,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 134,
-						"y": 137,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 5,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 187,
-						"y": 137,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 5,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 187,
-						"y": 137,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 5,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 187,
-						"y": 137,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 5,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 187,
-						"y": 137,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0030.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 5,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 187,
-						"y": 137,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0032.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 5,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 187,
-						"y": 137,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0038.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 240,
-						"y": 138,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0040.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 2,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 293,
-						"y": 138,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0052.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 2,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 293,
-						"y": 138,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0042.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 4,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 134,
-						"y": 206,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0054.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 4,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 134,
-						"y": 206,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0044.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 4,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 187,
-						"y": 206,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0046.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 2,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 240,
-						"y": 207,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0048.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 134,
-						"y": 275,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0050.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 187,
-						"y": 275,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0056.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 4,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 240,
-						"y": 276,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0058.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 2,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 293,
-						"y": 207,
-						"w": 53,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0060.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 53,
-						"h": 69
-					},
-					"frame": {
-						"x": 293,
-						"y": 276,
-						"w": 53,
-						"h": 69
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:3ecaf6e3ae563f3da9598e7b18b87b05:e4ece90a3e9880c6499c363b000de8dd:fa23dc87fc53ba2cfa532cf440553cf5$"
-	}
-}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/666-river_2.png b/public/images/pokemon/variant/exp/666-river_2.png
deleted file mode 100644
index 863acbbdc76..00000000000
Binary files a/public/images/pokemon/variant/exp/666-river_2.png and /dev/null differ
diff --git a/public/images/pokemon/variant/exp/692.json b/public/images/pokemon/variant/exp/692.json
new file mode 100644
index 00000000000..954dcffb3e9
--- /dev/null
+++ b/public/images/pokemon/variant/exp/692.json
@@ -0,0 +1,26 @@
+{
+	"1": {
+		"b3f2ff": "fada7f",
+		"44a2b4": "af6a37",
+		"2f7280": "783a1d",
+		"cd9d3a": "53be53",
+		"575757": "c85b5b",
+		"72561c": "20734c",
+		"60dbf2": "e1ac53",
+		"b4b4b4": "c8ba6d",
+		"3d3d3d": "7d182d",
+		"ffc549": "a9f076"
+	},
+	"2": {
+		"b3f2ff": "faf8d7",
+		"44a2b4": "968144",
+		"2f7280": "5f3c23",
+		"cd9d3a": "7743be",
+		"575757": "88cd56",
+		"72561c": "371c72",
+		"60dbf2": "e1d6b6",
+		"b4b4b4": "68a7aa",
+		"3d3d3d": "1c873e",
+		"ffc549": "a36feb"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/693.json b/public/images/pokemon/variant/exp/693.json
new file mode 100644
index 00000000000..2e80795d2a0
--- /dev/null
+++ b/public/images/pokemon/variant/exp/693.json
@@ -0,0 +1,30 @@
+{
+	"1": {
+		"23a2c8": "c87a23",
+		"ffc859": "6ccd80",
+		"224b73": "552813",
+		"404040": "3c171b",
+		"262626": "230808",
+		"5f5f5f": "6e2e3b",
+		"cc9c3d": "1b3c17",
+		"61daf2": "f2bd61",
+		"735822": "08230e",
+		"3674b3": "7d3e21",
+		"ffc44c": "426e2e",
+		"4595e5": "aa6839"
+	},
+	"2": {
+		"23a2c8": "beb099",
+		"ffc859": "f5b281",
+		"224b73": "5f463a",
+		"404040": "2a8c53",
+		"262626": "295a1c",
+		"5f5f5f": "51c85d",
+		"cc9c3d": "6259af",
+		"61daf2": "f0eadb",
+		"735822": "36235f",
+		"3674b3": "9b8265",
+		"ffc44c": "a39afa",
+		"4595e5": "c8b493"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/696.json b/public/images/pokemon/variant/exp/696.json
index 3a4b4480673..677f5d98578 100644
--- a/public/images/pokemon/variant/exp/696.json
+++ b/public/images/pokemon/variant/exp/696.json
@@ -1,40 +1,38 @@
 {
 	"1": {
-        "774411":"5e0b0b",
-        "101010":"101010",
-        "ff8f1f":"a50d0d",
-        "4f2e1d":"023425",
-        "5f4f4f":"0b4c29",
-        "af8f7f":"478136",
-        "3f3f44":"4c3216",
-        "8f6f5f":"1b6430",
-        "f8f7f9":"dfdea7",
-        "bfbfcc":"cbbe8c",
-        "121212":"121212",
-        "8f8f99":"ad8c63",
-        "c2c2cf":"c9bc87",
-        "fbfafc":"dddca1",
-        "772d34":"77452d",
-        "ff9bd5":"c98c68"
-	},
-	"2": {
-        "774411":"395cb7",
-        "101010":"101010",
-        "ff8f1f":"d2e9ff",
-        "4f2e1d":"3e1f18",
-        "5f4f4f":"644943",
-        "af8f7f":"a59e9a",
-        "3f3f44":"250860",
-        "8f6f5f":"83726e",
-        "f8f7f9":"6e46a7",
-        "bfbfcc":"593097",
-        "121212":"decaff",
-        "8f8f99":"411684",
-        "c2c2cf":"7ccad5",
-        "fbfafc":"fbfafc",
-        "772d34":"375ab3",
-        "ff9bd5":"79c8d3"
-	}
+"734517": "5e0b0b",
+"ffa64c": "a50d0d",
+"4a322c": "023425",
+"404040": "4c3216",
+"101010": "101010",
+"65483a": "0b4c29",
+"966858": "1b6430",
+"f8f8f8": "dfdea7",
+"8c8c8c": "ad8c63",
+"bfbfbf": "cbbe8c",
+"000000": "000000",
+"b73b6b": "4c3216",
+"ff949e": "c98c68",
+"b3b9b9": "cbbe8c",
+"3f3d3d": "4c3216"
+},
+"2": {
+"734517": "395cb7",
+"ffa64c": "d2e9ff",
+"4a322c": "3e1f18",
+"404040": "250860",
+"101010": "101010",
+"65483a": "644943",
+"966858": "83726e",
+"f8f8f8": "6e46a7",
+"8c8c8c": "411684",
+"bfbfbf": "593097",
+"000000": "decaff",
+"b73b6b": "395cb7",
+"ff949e": "79c8d3",
+"b3b9b9": "79c8d3",
+"3f3d3d": "395cb7"
+}
 }
 
 
diff --git a/public/images/pokemon/variant/exp/697.json b/public/images/pokemon/variant/exp/697.json
index dae4554a1b7..b8d305022f5 100644
--- a/public/images/pokemon/variant/exp/697.json
+++ b/public/images/pokemon/variant/exp/697.json
@@ -1,42 +1,42 @@
 {
-	"1": {
-        "1f0a0a":"1f0a0a",
-        "471515":"0a1b17",
-        "621e1d":"0b241e",
-        "902e2c":"153626",
-        "b45250":"285234",
-        "d16c6b":"416a45",
-        "653510":"5e0b0b",
-        "b56726":"971c1c",
-        "e39f33":"b52424",
-        "756b66":"ad8c63",
-        "b1b0b5":"cbbe8c",
-        "f0f0f2":"dfdea7",
-        "573b43":"4c3216",
-        "736964":"ab885f",
-        "ac628a":"9d5d18",
-        "aeadb3":"a88860",
-        "ededf0":"dbdaa4"
-	},
-	"2": {
-        "1f0a0a":"1f0a0a",
-        "471515":"191124",
-        "621e1d":"52352f",
-        "902e2c":"83726e",
-        "b45250":"ab9b97",
-        "d16c6b":"c7bcb9",
-        "653510":"9d5390",
-        "b56726":"ce7ecc",
-        "e39f33":"f4dbf6",
-        "756b66":"26173b",
-        "b1b0b5":"33214f",
-        "f0f0f2":"4b2e64",
-        "573b43":"cc7cc9",
-        "736964":"f6dcf7",
-        "ac628a":"eed5f0",
-        "aeadb3":"c779c4",
-        "ededf0":"f8defa"
-	}
+"1": {
+"080808": "080808",
+"32252c": "3e1e17",
+"50131e": "0b241e",
+"722533": "153626",
+"54434c": "4c3216",
+"964b1c": "5e0b0b",
+"963e4e": "285234",
+"bf7545": "971c1c",
+"f19d5a": "b52424",
+"9f9d98": "ad8c63",
+"cccccc": "cbbe8c",
+"fafafa": "dfdea7",
+"cac2c2": "cbbe8c",
+"f7eeee": "dfdea7",
+"53414b": "4c3216",
+"30222a": "3e1e17",
+"53454d": "4c3216"
+},
+"2": {
+"080808": "080808",
+"32252c": "0d0124",
+"50131e": "573b36",
+"722533": "83726e",
+"54434c": "170c25",
+"964b1c": "9d5390",
+"963e4e": "ab9b97",
+"bf7545": "ce7ecc",
+"f19d5a": "f4dbf6",
+"9f9d98": "26173b",
+"cccccc": "33214f",
+"fafafa": "4b2e64",
+"cac2c2": "ce7ecc",
+"f7eeee": "f4dbf6",
+"53414b": "dea5dd",
+"30222a": "ce7ecc",
+"53454d": "f4dbf6"
+}
 }
 
 
diff --git a/public/images/pokemon/variant/exp/698.json b/public/images/pokemon/variant/exp/698.json
deleted file mode 100644
index daf9b8c6f84..00000000000
--- a/public/images/pokemon/variant/exp/698.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-	"1": {
-		"cbaa84": "44827c",
-		"b3747e": "4b7465",
-		"eeffbf": "cdffb5",
-		"dcffb2": "8eeab9",
-		"ffbfca": "43bf8d",
-		"b7ffb2": "72d8ce",
-		"fff2b2": "9bffa9",
-		"85b4cc": "cf755d",
-		"a6e1ff": "efab87",
-		"101010": "101010",
-		"cacaca": "cacaca",
-		"537180": "b04f4b",
-		"2eaeec": "4dc796",
-		"1f75a0": "29988e",
-		"fdfdfd": "fdfdfd",
-		"d197a1": "d197a1",
-		"ffdce6": "ffdce6",
-		"217aa6": "7f99e1",
-		"30b2f2": "b5dcff",
-		"f9f9f9": "e6e3b4",
-		"c0c0c0": "d7cca0"
-	},
-	"2": {
-		"cbaa84": "cc78db",
-		"b3747e": "c452a6",
-		"eeffbf": "ed9ff2",
-		"dcffb2": "d7bbf4",
-		"ffbfca": "faccff",
-		"b7ffb2": "dceeff",
-		"fff2b2": "eb88b9",
-		"85b4cc": "654a8a",
-		"a6e1ff": "936daa",
-		"101010": "101010",
-		"cacaca": "cacaca",
-		"537180": "392d65",
-		"2eaeec": "ad4e6e",
-		"1f75a0": "8d2656",
-		"fdfdfd": "fdfdfd",
-		"d197a1": "d197a1",
-		"ffdce6": "ffdce6",
-		"217aa6": "efaa51",
-		"30b2f2": "ffd169",
-		"f9f9f9": "373453",
-		"c0c0c0": "282747"
-	}
-}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/700.json b/public/images/pokemon/variant/exp/700.json
index 0b6071ad765..1189d463f2b 100644
--- a/public/images/pokemon/variant/exp/700.json
+++ b/public/images/pokemon/variant/exp/700.json
@@ -1,34 +1,32 @@
 {
-	"1": {
-		"9a4557": "452f89",
-		"19657b": "a63071",
-		"fb9cc3": "c7a6ee",
-		"52cbee": "e974db",
-		"000000": "000000",
-		"cb628d": "996cd2",
-		"f7bbd4": "e1cff3",
-		"0d146e": "0d146e",
-		"3744e5": "d648b7",
-		"584f4f": "5c6889",
-		"ffffff": "f7f5ff",
-		"1f337b": "a63071",
-		"cbc0c0": "c3c5d9",
-		"2999b9": "d648b7"
-	},
-	"2": {
-		"9a4557": "197d46",
-		"19657b": "c72537",
-		"fb9cc3": "7dec9d",
-		"52cbee": "ff9a68",
-		"000000": "000000",
-		"cb628d": "5dae7d",
-		"f7bbd4": "f7bbd4",
-		"0d146e": "0d146e",
-		"3744e5": "eb5244",
-		"584f4f": "7f5c89",
-		"ffffff": "fff5fc",
-		"1f337b": "c72537",
-		"cbc0c0": "d9c3d6",
-		"2999b9": "eb5244"
-	}
+"1": {
+"101010": "101010",
+"8a2843": "452f89",
+"235a99": "a63071",
+"895c72": "5c6889",
+"d85a7a": "996cd2",
+"528fcc": "d648b7",
+"a88d8c": "8c8fa8",
+"f18a78": "b52d27",
+"fa8caa": "c7a6ee",
+"64c8f3": "e974db",
+"d9c3c3": "c3c5d9",
+"fff5f5": "f7f5ff",
+"65798c": "65798c"
+},
+"2": {
+"101010": "101010",
+"8a2843": "0e6134",
+"235a99": "900d1b",
+"895c72": "7f5c89",
+"d85a7a": "5dae7d",
+"528fcc": "dd3d4f",
+"a88d8c": "7f5c89",
+"f18a78": "d14ea4",
+"fa8caa": "7dec9d",
+"64c8f3": "ff9a68",
+"d9c3c3": "d9c3d6",
+"fff5f5": "fff5fc",
+"65798c": "65798c"
+}
 }
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/702.json b/public/images/pokemon/variant/exp/702.json
index 1edd126264e..12feb29a0fd 100644
--- a/public/images/pokemon/variant/exp/702.json
+++ b/public/images/pokemon/variant/exp/702.json
@@ -3,30 +3,30 @@
 		"101010": "101010",
 		"262626": "2a3b5e",
 		"4d4d4d": "6789b3",
-		"ccbb99": "a3d1cc",
-		"efefcf": "ddfff5",
-		"704030": "a53c42",
-		"906030": "c9685f",
-		"efbf5f": "ffd3b6",
-		"cf8f4f": "e49f84",
+		"bfbf86": "a3d1cc",
+		"f2f2aa": "ddfff5",
+		"735c2e": "a53c42",
+		"997a3d": "c9685f",
+		"f2c261": "ffd3b6",
+		"bf994c": "e49f84",
 		"1d1d1d": "1a1c45",
-		"fefefe": "fefefe",
+		"f8f8f8": "f8f8f8",
 		"464646": "424b8f",
-		"df7f5f": "7cd6a1"
+		"d97d21": "7cd6a1"
 	},
 	"2": {
 		"101010": "101010",
 		"262626": "072d38",
 		"4d4d4d": "197870",
-		"ccbb99": "aaa8d6",
-		"efefcf": "ece5ff",
-		"704030": "1e0e27",
-		"906030": "2d1533",
-		"efbf5f": "5f3662",
-		"cf8f4f": "432249",
+		"bfbf86": "aaa8d6",
+		"f2f2aa": "ece5ff",
+		"735c2e": "1e0e27",
+		"997a3d": "2d1533",
+		"f2c261": "5f3662",
+		"bf994c": "432249",
 		"1d1d1d": "02172d",
-		"fefefe": "fefefe",
+		"f8f8f8": "f8f8f8",
 		"464646": "17646c",
-		"df7f5f": "d2fff1"
+		"d97d21": "d2fff1"
 	}
 }
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/703.json b/public/images/pokemon/variant/exp/703.json
deleted file mode 100644
index c024feb1b30..00000000000
--- a/public/images/pokemon/variant/exp/703.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-	"1": {
-		"535763": "292638",
-		"306090": "c35b2a",
-		"c3c7d3": "68638e",
-		"88aacc": "e67c37",
-		"fefefe": "fefefe",
-		"a3a7b3": "4d496b",
-		"737783": "37344e",
-		"101010": "101010",
-		"bbddff": "ffa633",
-		"1fbfdf": "ff9b44",
-		"5f6060": "e6ac60",
-		"fcfefe": "ffeed6",
-		"bfbbbb": "ffd3a1"
-	},
-	"2": {
-		"535763": "976ba9",
-		"306090": "a03c69",
-		"c3c7d3": "faecff",
-		"88aacc": "e25493",
-		"fefefe": "ffe2ee",
-		"a3a7b3": "e4cdf9",
-		"737783": "cca1db",
-		"101010": "101010",
-		"bbddff": "f591bd",
-		"1fbfdf": "de5f8e",
-		"5f6060": "5a3d84",
-		"fcfefe": "a473bf",
-		"bfbbbb": "8359a7"
-	}
-}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/704.json b/public/images/pokemon/variant/exp/704.json
index 38e5cdaf70d..e292d6fb41f 100644
--- a/public/images/pokemon/variant/exp/704.json
+++ b/public/images/pokemon/variant/exp/704.json
@@ -1,30 +1,30 @@
 {
 	"1": {
-		"6f5e80": "4e4094",
-		"e0d3e0": "fbb3d2",
-		"010202": "101010",
-		"bbafc4": "c7a1e5",
-		"2f6b38": "4e4094",
-		"74d457": "3aa8c4",
-		"3da84d": "197497",
-		"3f3d5e": "4e4094",
-		"a497c2": "c7a1e5",
-		"766fa6": "8b69c3",
-		"4c3143": "4e4094",
-		"cc93ab": "c7a1e5"
+		"807380": "b93f84",
+		"f2daf2": "fbb3d2",
+		"bfacbf": "e56ca6",
+		"4d454d": "8a2166",
+		"101010": "101010",
+		"4d993d": "197497",
+		"66cc52": "3aa8c4",
+		"b8a1e5": "c7a1e5",
+		"8f7db3": "8b69c3",
+		"665980": "4e4094",
+		"c25054": "c68260",
+		"de817e": "e5e1a1"
 	},
 	"2": {
-		"6f5e80": "274159",
-		"e0d3e0": "92d8c8",
-		"010202": "101010",
-		"bbafc4": "63a99e",
-		"2f6b38": "134557",
-		"74d457": "d27e26",
-		"3da84d": "a34205",
-		"3f3d5e": "134557",
-		"a497c2": "63a99e",
-		"766fa6": "2f667c",
-		"4c3143": "134557",
-		"cc93ab": "63a99e"
+		"807380": "237e7f",
+		"f2daf2": "92d8c8",
+		"bfacbf": "63a99e",
+		"4d454d": "134557",
+		"101010": "101010",
+		"4d993d": "a34205",
+		"66cc52": "d27e26",
+		"b8a1e5": "4a9699",
+		"8f7db3": "2f667c",
+		"665980": "274159",
+		"c25054": "9268a4",
+		"de817e": "f2daf2"
 	}
 }
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/705.json b/public/images/pokemon/variant/exp/705.json
index a29b8f124dc..bf9aa91eb4b 100644
--- a/public/images/pokemon/variant/exp/705.json
+++ b/public/images/pokemon/variant/exp/705.json
@@ -1,33 +1,34 @@
 {
 	"1": {
-        "101010":"101010",
-        "4d454d":"8a2166",
-        "807380":"b93f84",
-        "bfacbf":"e56ca6",
-        "f2daf2":"fbb3d2",
-        "665980":"4e4094",
-        "8f7db3":"8b69c3",
-        "b8a1e5":"c7a1e5",
-        "4d993d":"aa6a00",
-        "66cc52":"ffd047",
-        "4e9c3e":"0c5474",
-        "67cf53":"3aa8c4",
-        "b6f2aa":"63cee1"
+		"807380": "b93f84",
+		"bfacbf": "e56ca6",
+		"f2daf2": "fbb3d2",
+		"4d454d": "8a2166",
+		"307922": "aa6a00",
+		"46b030": "ffd047",
+		"101010": "101010",
+		"98bd51": "197497",
+		"d2e79e": "3aa8c4",
+		"647543": "0c5474",
+		"b8a1e5": "c7a1e5",
+		"665980": "4e4094",
+		"8f7db3": "8b69c3",
+		"ef6f8f": "b93f84"
 	},
 	"2": {
-        "101010":"101010",
-        "4d454d":"194f51",
-        "807380":"2b736f",
-        "bfacbf":"5db6a9",
-        "f2daf2":"9cead8",
-        "665980":"274159",
-        "8f7db3":"2f667c",
-        "b8a1e5":"4a9699",
-        "4d993d":"007d61",
-        "66cc52":"49ffbf",
-        "4e9c3e":"842401",
-        "67cf53":"a34205",
-        "b6f2aa":"d27e26"
+		"807380": "2b736f",
+		"bfacbf": "5db6a9",
+		"f2daf2": "9cead8",
+		"4d454d": "194f51",
+		"307922": "007d61",
+		"46b030": "49ffbf",
+		"101010": "101010",
+		"98bd51": "a34205",
+		"d2e79e": "d27e26",
+		"647543": "842401",
+		"b8a1e5": "4a9699",
+		"665980": "274159",
+		"8f7db3": "2f667c",
+		"3f6f8f": "9268a4"
 	}
-}
-
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/708.json b/public/images/pokemon/variant/exp/708.json
deleted file mode 100644
index b32bbb79cd9..00000000000
--- a/public/images/pokemon/variant/exp/708.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-	"1": {
-		"101010": "101010",
-		"2b2a3a": "722023",
-		"603d2b": "36384f",
-		"215738": "4d362e",
-		"48484a": "a14743",
-		"c18760": "7c808c",
-		"3fa76c": "907f76",
-		"915e45": "575a6a",
-		"0b0c0b": "0b0c0b",
-		"da585b": "5996d2",
-		"ff8c8f": "87d1ff"
-	},
-	"2": {
-		"101010": "101010",
-		"2b2a3a": "6f5f80",
-		"603d2b": "31161d",
-		"215738": "a94079",
-		"48484a": "9c92a4",
-		"c18760": "7e5658",
-		"3fa76c": "da7ea8",
-		"915e45": "56323a",
-		"0b0c0b": "0b0c0b",
-		"da585b": "e18933",
-		"ff8c8f": "ffc875"
-	}
-}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/713.json b/public/images/pokemon/variant/exp/713.json
index d18009819f4..ca45360ecea 100644
--- a/public/images/pokemon/variant/exp/713.json
+++ b/public/images/pokemon/variant/exp/713.json
@@ -1,26 +1,32 @@
 {
 	"1": {
-		"42575f": "994255",
-		"bbeef9": "ffbfda",
-		"ffffff": "ffebf2",
-		"473552": "4c131f",
-		"9e7ac1": "994255",
-		"6a4e7a": "732334",
-		"8db7c7": "d97389",
-		"000000": "000000",
-		"698e9c": "bf566d",
-		"e6c81e": "9dcc3e"
+		"608cba": "bf566d",
+		"bff4ff": "ffbfda",
+		"85d7f2": "f29eb3",
+		"967acc": "732334",
+		"77b8d9": "d97389",
+		"335980": "994255",
+		"f2ffff": "ffebf2",
+		"101010": "101010",
+		"737373": "737373",
+		"bfbfbf": "bfbfbf",
+		"efab34": "9dcc3e",
+		"ffe46a": "cbe696",
+		"f8f8f8": "f8f8f8"
 	},
 	"2": {
-		"42575f": "42575f",
-		"bbeef9": "fcc95c",
-		"ffffff": "fff2ad",
-		"473552": "473552",
-		"9e7ac1": "6cb3ae",
-		"6a4e7a": "006761",
-		"8db7c7": "cc7b1e",
-		"000000": "000000",
-		"698e9c": "a8632a",
-		"e6c81e": "8dd9d4"
+		"608cba": "a8632a",
+		"bff4ff": "fcc95c",
+		"85d7f2": "e69e2b",
+		"967acc": "2c7a75",
+		"77b8d9": "cc7b1e",
+		"335980": "824628",
+		"f2ffff": "fff2ad",
+		"101010": "101010",
+		"737373": "737373",
+		"bfbfbf": "6cb3ae",
+		"efab34": "6cb3ae",
+		"ffe46a": "b9f2ee",
+		"f8f8f8": "b9f2ee"
 	}
 }
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/714.json b/public/images/pokemon/variant/exp/714.json
deleted file mode 100644
index 018366c5381..00000000000
--- a/public/images/pokemon/variant/exp/714.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-	"1": {
-		"6a3f73": "731338",
-		"bd70cc": "a42c54",
-		"101010": "101010",
-		"bfacbf": "7047ba",
-		"8e5499": "8e1d4b",
-		"f2daf2": "8d7be3",
-		"404040": "202558",
-		"665c66": "2f386b",
-		"ccb43d": "ff8a58",
-		"f8f8f8": "8d7be3",
-		"595959": "2f386b",
-		"ffe14c": "ffc182",
-		"000000": "101010"
-	},
-	"2": {
-		"6a3f73": "5f151c",
-		"bd70cc": "c24430",
-		"101010": "101010",
-		"bfacbf": "f9e8dd",
-		"8e5499": "882c27",
-		"f2daf2": "f8f8f8",
-		"404040": "5b1922",
-		"665c66": "7c2928",
-		"ccb43d": "33d8d0",
-		"f8f8f8": "f8f8f8",
-		"595959": "7c2928",
-		"ffe14c": "49ffcd",
-		"000000": "101010"
-	}
-}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/715.json b/public/images/pokemon/variant/exp/715.json
index 4ca2bcad56a..0e97862f10b 100644
--- a/public/images/pokemon/variant/exp/715.json
+++ b/public/images/pokemon/variant/exp/715.json
@@ -1,20 +1,38 @@
 {
+	"1": {
+        "101010": "101010",
+		"404040": "5f32b1",
+		"6a3f73": "0f103c",
+		"287366": "731338",
+		"3aa694": "a42c54",
+		"8e5499": "202558",
+		"bfbfbf": "bb9adc",
+		"595959": "7a5ccc",
+		"801a1a": "5d173d",
+		"4cd9c1": "d04b6c",
+		"bd70cc": "2f386b",
+		"737373": "563d8f",
+		"f8f8f8": "d6c8f1",
+		"e52e2e": "903b78",
+		"000000": "000000",
+		"ffe14c": "ff8a58" 
+	},
 	"2": {
-		"404040": "c29484",
-		"595959": "ecd3c3",
 		"101010": "101010",
-		"287366": "832714",
-		"4cd9c1": "dd834c",
-		"3aa694": "b8552c",
-		"801a1a": "7c0907",
-		"e52e2e": "ad3419",
-		"bd70cc": "5b1922",
-		"6a3f73": "3b0c18",
-		"737373": "1d060c",
-		"8e5499": "7c2928",
-		"bfbfbf": "43191e",
-		"f8f8f8": "5a2a2b",
-		"ffe14c": "49ffcd",
-		"000000": "000000"
+        "404040": "c29484",
+        "6a3f73": "3b0c18",
+        "287366": "832714",
+        "3aa694": "b8552c",
+        "8e5499": "7c2928",
+        "bfbfbf": "43191e",
+        "595959": "ecd3c3",
+        "801a1a": "7c0907",
+        "4cd9c1": "dd834c",
+        "bd70cc": "5b1922",
+        "737373": "1d060c",
+        "f8f8f8": "5a2a2b",
+        "e52e2e": "ad3419",
+        "000000": "000000",
+        "ffe14c": "49ffcd"
 	}
 }
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/728.json b/public/images/pokemon/variant/exp/728.json
index 2439f925d49..a9c7155ec91 100644
--- a/public/images/pokemon/variant/exp/728.json
+++ b/public/images/pokemon/variant/exp/728.json
@@ -1,36 +1,44 @@
 {
 	"1": {
-		"2c316e": "00473d",
-		"536fc3": "009469",
-		"7199db": "14af82",
-		"8d3774": "a62c20",
-		"ef71c0": "ff8072",
-		"ffc8ea": "ffc8ea",
-		"3c4b92": "006355",
-		"171717": "171717",
-		"b95094": "e54c41",
-		"fdfdfd": "fff6e2",
-		"ccc2d0": "c2beb4",
-		"9283a3": "808080",
-		"7090a3": "858d7d",
-		"a1d9e7": "92b599",
-		"3e2d33": "3e2d33"
+		"101010": "101010",
+		"1e3a66": "363d2f",
+		"243a66": "00473d",
+		"733f50": "a62c20",
+		"404040": "404040",
+		"b3627d": "e54c41",
+		"2c4f8c": "5a6154",
+		"314f8c": "006355",
+		"436cbf": "009469",
+		"e57ea1": "ff8072",
+		"5f9ba6": "b56e76",
+		"639ba6": "858d7d",
+		"6c90d9": "14af82",
+		"808080": "808080",
+		"bfbfbf": "c2beb4",
+		"9edae5": "f7c1c5",
+		"a1dae5": "92b599",
+		"f8f8f8": "fff6e2",
+		"fefefe": "fff6e2"
 	},
 	"2": {
-		"2c316e": "54041b",
-		"536fc3": "a6213f",
-		"7199db": "be294a",
-		"8d3774": "620a33",
-		"ef71c0": "dd3780",
-		"ffc8ea": "f5edee",
-		"3c4b92": "770f29",
-		"171717": "171717",
-		"b95094": "a7225c",
-		"fdfdfd": "f5edee",
-		"ccc2d0": "bfb4b9",
-		"9283a3": "808080",
-		"7090a3": "b88389",
-		"a1d9e7": "f7c1c5",
-		"3e2d33": "3e2d33"
+		"101010": "101010",
+		"1e3a66": "773f46",
+		"243a66": "54041b",
+		"733f50": "620a33",
+		"404040": "404040",
+		"b3627d": "a7225c",
+		"2c4f8c": "a45f67",
+		"314f8c": "770f29",
+		"436cbf": "a6213f",
+		"e57ea1": "dd3780",
+		"5f9ba6": "408c62",
+		"639ba6": "b88389",
+		"6c90d9": "be294a",
+		"808080": "808080",
+		"bfbfbf": "bfb4b9",
+		"9edae5": "91e6a2",
+		"a1dae5": "f7c1c5",
+		"f8f8f8": "f5edee",
+		"fefefe": "fff6e2"
 	}
 }
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/729.json b/public/images/pokemon/variant/exp/729.json
index 7d679b135ef..7b196fda526 100644
--- a/public/images/pokemon/variant/exp/729.json
+++ b/public/images/pokemon/variant/exp/729.json
@@ -1,32 +1,46 @@
 {
 	"1": {
-		"808080": "808080",
-		"f8f8f8": "fff6e2",
-		"4d4d4d": "2d2e31",
-		"b3b3b3": "c2beb4",
-		"3d5f66": "3d5f66",
-		"a1dae5": "ffbd98",
-		"639ba6": "be665d",
-		"77b8d9": "0ccfa2",
-		"3f6273": "006b65",
 		"101010": "101010",
-		"5b8da6": "009a88",
+		"2d2e31": "2d2e31",
 		"733f50": "bb402f",
-		"e57ea1": "ff9384"
+		"476d72": "be665d",
+		"b3627d": "fb6051",
+		"326187": "006b65",
+		"e57ea1": "ff9384",
+		"639ba6": "b56e76",
+		"2d8ec4": "009a88",
+		"1eb9ee": "0ccfa2",
+		"808080": "808080",
+		"8dafaf": "ff989e",
+		"bfbfbf": "c2beb4",
+		"bad8d8": "ffbd98",
+		"bae1f1": "f7c1c5",
+		"f8f8f8": "fff6e2",
+		"fdfdfd": "fff6e2",
+		"e17ea1": "ff9384",
+		"ab627d": "fb6051",
+		"6f3f50": "bb402f"
 	},
 	"2": {
-		"808080": "808080",
-		"f8f8f8": "f5edee",
-		"4d4d4d": "4d4d4d",
-		"b3b3b3": "bfb4b9",
-		"3d5f66": "793f5e",
-		"a1dae5": "deabce",
-		"639ba6": "b681a6",
-		"77b8d9": "c6496f",
-		"3f6273": "5a141b",
 		"101010": "101010",
-		"5b8da6": "952c3f",
+		"2d2e31": "2d2e31",
 		"733f50": "620a33",
-		"e57ea1": "dd3780"
+		"476d72": "793f5e",
+		"b3627d": "a7225c",
+		"326187": "5a141b",
+		"e57ea1": "dd3780",
+		"639ba6": "408c62",
+		"2d8ec4": "952c3f",
+		"1eb9ee": "c6496f",
+		"808080": "808080",
+		"8dafaf": "b681a6",
+		"bfbfbf": "bfb4b9",
+		"bad8d8": "deabce",
+		"bae1f1": "91e6a2",
+		"f8f8f8": "f5edee",
+		"fdfdfd": "fff6e2",
+		"e17ea1": "deabce",
+		"ab627d": "b681a6",
+		"6f3f50": "793f5e"
 	}
 }
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/729_2.json b/public/images/pokemon/variant/exp/729_2.json
deleted file mode 100644
index 530888eaf6e..00000000000
--- a/public/images/pokemon/variant/exp/729_2.json
+++ /dev/null
@@ -1,272 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "729_2.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 141,
-				"h": 141
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 49,
-						"h": 51
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 49,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 49,
-						"h": 51
-					},
-					"frame": {
-						"x": 0,
-						"y": 51,
-						"w": 49,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 49,
-						"h": 51
-					},
-					"frame": {
-						"x": 0,
-						"y": 51,
-						"w": 49,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 48,
-						"h": 50
-					},
-					"frame": {
-						"x": 49,
-						"y": 0,
-						"w": 48,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 48,
-						"h": 50
-					},
-					"frame": {
-						"x": 49,
-						"y": 0,
-						"w": 48,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 42,
-						"h": 47
-					},
-					"frame": {
-						"x": 97,
-						"y": 0,
-						"w": 42,
-						"h": 47
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 42,
-						"h": 47
-					},
-					"frame": {
-						"x": 97,
-						"y": 0,
-						"w": 42,
-						"h": 47
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 40,
-						"h": 47
-					},
-					"frame": {
-						"x": 97,
-						"y": 47,
-						"w": 40,
-						"h": 47
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 46,
-						"h": 48
-					},
-					"frame": {
-						"x": 49,
-						"y": 50,
-						"w": 46,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 46,
-						"h": 48
-					},
-					"frame": {
-						"x": 49,
-						"y": 50,
-						"w": 46,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 45,
-						"h": 47
-					},
-					"frame": {
-						"x": 95,
-						"y": 94,
-						"w": 45,
-						"h": 47
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 45,
-						"h": 47
-					},
-					"frame": {
-						"x": 95,
-						"y": 94,
-						"w": 45,
-						"h": 47
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:4df3ec883b357e664a50e3015060795f:29a8d34f9df9fa51691fda1da5961207:b2d5dd692ec79c7357afdffa7b3670a9$"
-	}
-}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/729_2.png b/public/images/pokemon/variant/exp/729_2.png
deleted file mode 100644
index 8349e63c91a..00000000000
Binary files a/public/images/pokemon/variant/exp/729_2.png and /dev/null differ
diff --git a/public/images/pokemon/variant/exp/729_3.json b/public/images/pokemon/variant/exp/729_3.json
deleted file mode 100644
index 632cef739a2..00000000000
--- a/public/images/pokemon/variant/exp/729_3.json
+++ /dev/null
@@ -1,272 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "729_3.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 141,
-				"h": 141
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 49,
-						"h": 51
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 49,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 49,
-						"h": 51
-					},
-					"frame": {
-						"x": 0,
-						"y": 51,
-						"w": 49,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 49,
-						"h": 51
-					},
-					"frame": {
-						"x": 0,
-						"y": 51,
-						"w": 49,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 48,
-						"h": 50
-					},
-					"frame": {
-						"x": 49,
-						"y": 0,
-						"w": 48,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 48,
-						"h": 50
-					},
-					"frame": {
-						"x": 49,
-						"y": 0,
-						"w": 48,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 42,
-						"h": 47
-					},
-					"frame": {
-						"x": 97,
-						"y": 0,
-						"w": 42,
-						"h": 47
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 42,
-						"h": 47
-					},
-					"frame": {
-						"x": 97,
-						"y": 0,
-						"w": 42,
-						"h": 47
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 40,
-						"h": 47
-					},
-					"frame": {
-						"x": 97,
-						"y": 47,
-						"w": 40,
-						"h": 47
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 46,
-						"h": 48
-					},
-					"frame": {
-						"x": 49,
-						"y": 50,
-						"w": 46,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 46,
-						"h": 48
-					},
-					"frame": {
-						"x": 49,
-						"y": 50,
-						"w": 46,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 45,
-						"h": 47
-					},
-					"frame": {
-						"x": 95,
-						"y": 94,
-						"w": 45,
-						"h": 47
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 50,
-						"h": 51
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 45,
-						"h": 47
-					},
-					"frame": {
-						"x": 95,
-						"y": 94,
-						"w": 45,
-						"h": 47
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:4df3ec883b357e664a50e3015060795f:29a8d34f9df9fa51691fda1da5961207:b2d5dd692ec79c7357afdffa7b3670a9$"
-	}
-}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/729_3.png b/public/images/pokemon/variant/exp/729_3.png
deleted file mode 100644
index a4b4197f18a..00000000000
Binary files a/public/images/pokemon/variant/exp/729_3.png and /dev/null differ
diff --git a/public/images/pokemon/variant/exp/730.json b/public/images/pokemon/variant/exp/730.json
index dbc5dda270d..5c8deeb52b2 100644
--- a/public/images/pokemon/variant/exp/730.json
+++ b/public/images/pokemon/variant/exp/730.json
@@ -1,20 +1,52 @@
 {
+	"1": {
+		"101010": "101010",
+		"843843": "a62c20",
+		"8d3f4a": "a62c20",
+		"c46074": "e54c41",
+		"c76374": "e54c41",
+		"0e6792": "b54f5f",
+		"1241a1": "006355",
+		"6d7481": "917393",
+		"727481": "a0866f",
+		"1470de": "009469",
+		"5a8092": "74312e",
+		"44a0b5": "d87383",
+		"64c5e1": "00dc9c",
+		"6ac8e3": "ffa0a8",
+		"82a7b9": "c35861",
+		"fd8196": "ff8072",
+		"ff8496": "ff8072",
+		"bdbdc1": "c0b7a1",
+		"c0bdc1": "beaac0",
+		"aac7e6": "ea7c5b",
+		"f8f8f8": "fff2d4",
+		"faf8f8": "f1e8f1",
+		"fef8f8": "fef8f8"		
+	},
 	"2": {
-		"316a77": "500518",
-		"60dbf5": "a6213f",
-		"6189ac": "5c2141",
-		"cee8ff": "e9a5c0",
-		"499bb9": "770f29",
-		"777171": "5c2141",
-		"cfbdc6": "bfb4b9",
-		"74b3e9": "c17b97",
-		"ffffff": "f5edee",
-		"000000": "000000",
-		"c24262": "1d1638",
-		"e9b9c5": "614388",
-		"ee8ba4": "391e62",
-		"0a3a65": "591945",
-		"1073cc": "81387e",
-		"115591": "591945"
+		"101010": "101010",
+		"843843": "5c2141",
+		"8d3f4a": "1d1638",
+		"c46074": "c17b97",
+		"c76374": "391e62",
+		"0e6792": "500518",
+		"1241a1": "591945",
+		"6d7481": "81716d",
+		"727481": "9e8193",
+		"1470de": "81387e",
+		"5a8092": "5c2141",
+		"44a0b5": "770f29",
+		"64c5e1": "bd2b6b",
+		"6ac8e3": "a6213f",
+		"82a7b9": "c17b97",
+		"fd8196": "e9a5c0",
+		"ff8496": "614388",
+		"bdbdc1": "bfb4b9",
+		"c0bdc1": "c0b4a5",
+		"aac7e6": "e9a5c0",
+		"f8f8f8": "f5edee",
+		"faf8f8": "f5f3e3",
+		"fef8f8": "fef8f8"		
 	}
 }
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/730_2.json b/public/images/pokemon/variant/exp/730_2.json
deleted file mode 100644
index cc806a36b25..00000000000
--- a/public/images/pokemon/variant/exp/730_2.json
+++ /dev/null
@@ -1,2309 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "730_2.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 615,
-				"h": 615
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 83,
-						"h": 81
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 83,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0038.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 83,
-						"h": 81
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 83,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0086.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 83,
-						"h": 81
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 83,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 78,
-						"h": 85
-					},
-					"frame": {
-						"x": 0,
-						"y": 81,
-						"w": 78,
-						"h": 85
-					}
-				},
-				{
-					"filename": "0035.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 78,
-						"h": 85
-					},
-					"frame": {
-						"x": 0,
-						"y": 81,
-						"w": 78,
-						"h": 85
-					}
-				},
-				{
-					"filename": "0083.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 78,
-						"h": 85
-					},
-					"frame": {
-						"x": 0,
-						"y": 81,
-						"w": 78,
-						"h": 85
-					}
-				},
-				{
-					"filename": "0062.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 83,
-						"h": 80
-					},
-					"frame": {
-						"x": 83,
-						"y": 0,
-						"w": 83,
-						"h": 80
-					}
-				},
-				{
-					"filename": "0107.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 8,
-						"w": 83,
-						"h": 80
-					},
-					"frame": {
-						"x": 166,
-						"y": 0,
-						"w": 83,
-						"h": 80
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 74,
-						"h": 88
-					},
-					"frame": {
-						"x": 0,
-						"y": 166,
-						"w": 74,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0034.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 74,
-						"h": 88
-					},
-					"frame": {
-						"x": 0,
-						"y": 166,
-						"w": 74,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0082.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 74,
-						"h": 88
-					},
-					"frame": {
-						"x": 0,
-						"y": 166,
-						"w": 74,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 9,
-						"w": 83,
-						"h": 79
-					},
-					"frame": {
-						"x": 249,
-						"y": 0,
-						"w": 83,
-						"h": 79
-					}
-				},
-				{
-					"filename": "0039.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 9,
-						"w": 83,
-						"h": 79
-					},
-					"frame": {
-						"x": 249,
-						"y": 0,
-						"w": 83,
-						"h": 79
-					}
-				},
-				{
-					"filename": "0087.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 9,
-						"w": 83,
-						"h": 79
-					},
-					"frame": {
-						"x": 249,
-						"y": 0,
-						"w": 83,
-						"h": 79
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 10,
-						"w": 84,
-						"h": 78
-					},
-					"frame": {
-						"x": 332,
-						"y": 0,
-						"w": 84,
-						"h": 78
-					}
-				},
-				{
-					"filename": "0040.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 10,
-						"w": 84,
-						"h": 78
-					},
-					"frame": {
-						"x": 332,
-						"y": 0,
-						"w": 84,
-						"h": 78
-					}
-				},
-				{
-					"filename": "0088.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 10,
-						"w": 84,
-						"h": 78
-					},
-					"frame": {
-						"x": 332,
-						"y": 0,
-						"w": 84,
-						"h": 78
-					}
-				},
-				{
-					"filename": "0064.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 10,
-						"w": 84,
-						"h": 78
-					},
-					"frame": {
-						"x": 416,
-						"y": 0,
-						"w": 84,
-						"h": 78
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 73,
-						"h": 88
-					},
-					"frame": {
-						"x": 0,
-						"y": 254,
-						"w": 73,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0033.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 73,
-						"h": 88
-					},
-					"frame": {
-						"x": 0,
-						"y": 254,
-						"w": 73,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0081.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 73,
-						"h": 88
-					},
-					"frame": {
-						"x": 0,
-						"y": 254,
-						"w": 73,
-						"h": 88
-					}
-				},
-				{
-					"filename": "0063.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 9,
-						"w": 83,
-						"h": 79
-					},
-					"frame": {
-						"x": 500,
-						"y": 0,
-						"w": 83,
-						"h": 79
-					}
-				},
-				{
-					"filename": "0057.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 73,
-						"h": 87
-					},
-					"frame": {
-						"x": 0,
-						"y": 342,
-						"w": 73,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 75,
-						"h": 86
-					},
-					"frame": {
-						"x": 0,
-						"y": 429,
-						"w": 75,
-						"h": 86
-					}
-				},
-				{
-					"filename": "0032.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 75,
-						"h": 86
-					},
-					"frame": {
-						"x": 0,
-						"y": 429,
-						"w": 75,
-						"h": 86
-					}
-				},
-				{
-					"filename": "0080.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 75,
-						"h": 86
-					},
-					"frame": {
-						"x": 0,
-						"y": 429,
-						"w": 75,
-						"h": 86
-					}
-				},
-				{
-					"filename": "0056.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 75,
-						"h": 86
-					},
-					"frame": {
-						"x": 0,
-						"y": 515,
-						"w": 75,
-						"h": 86
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 75,
-						"h": 85
-					},
-					"frame": {
-						"x": 78,
-						"y": 81,
-						"w": 75,
-						"h": 85
-					}
-				},
-				{
-					"filename": "0031.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 75,
-						"h": 85
-					},
-					"frame": {
-						"x": 78,
-						"y": 81,
-						"w": 75,
-						"h": 85
-					}
-				},
-				{
-					"filename": "0079.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 75,
-						"h": 85
-					},
-					"frame": {
-						"x": 78,
-						"y": 81,
-						"w": 75,
-						"h": 85
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 81,
-						"h": 82
-					},
-					"frame": {
-						"x": 153,
-						"y": 80,
-						"w": 81,
-						"h": 82
-					}
-				},
-				{
-					"filename": "0037.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 81,
-						"h": 82
-					},
-					"frame": {
-						"x": 153,
-						"y": 80,
-						"w": 81,
-						"h": 82
-					}
-				},
-				{
-					"filename": "0085.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 81,
-						"h": 82
-					},
-					"frame": {
-						"x": 153,
-						"y": 80,
-						"w": 81,
-						"h": 82
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 80,
-						"h": 82
-					},
-					"frame": {
-						"x": 74,
-						"y": 166,
-						"w": 80,
-						"h": 82
-					}
-				},
-				{
-					"filename": "0036.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 80,
-						"h": 82
-					},
-					"frame": {
-						"x": 74,
-						"y": 166,
-						"w": 80,
-						"h": 82
-					}
-				},
-				{
-					"filename": "0084.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 80,
-						"h": 82
-					},
-					"frame": {
-						"x": 74,
-						"y": 166,
-						"w": 80,
-						"h": 82
-					}
-				},
-				{
-					"filename": "0108.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 80,
-						"h": 81
-					},
-					"frame": {
-						"x": 154,
-						"y": 162,
-						"w": 80,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0055.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 75,
-						"h": 85
-					},
-					"frame": {
-						"x": 234,
-						"y": 80,
-						"w": 75,
-						"h": 85
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 78,
-						"h": 81
-					},
-					"frame": {
-						"x": 234,
-						"y": 165,
-						"w": 78,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0025.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 78,
-						"h": 81
-					},
-					"frame": {
-						"x": 234,
-						"y": 165,
-						"w": 78,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0049.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 78,
-						"h": 81
-					},
-					"frame": {
-						"x": 234,
-						"y": 165,
-						"w": 78,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0073.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 78,
-						"h": 81
-					},
-					"frame": {
-						"x": 234,
-						"y": 165,
-						"w": 78,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0097.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 78,
-						"h": 81
-					},
-					"frame": {
-						"x": 234,
-						"y": 165,
-						"w": 78,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0058.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 74,
-						"h": 85
-					},
-					"frame": {
-						"x": 309,
-						"y": 79,
-						"w": 74,
-						"h": 85
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 78,
-						"h": 82
-					},
-					"frame": {
-						"x": 383,
-						"y": 78,
-						"w": 78,
-						"h": 82
-					}
-				},
-				{
-					"filename": "0028.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 78,
-						"h": 82
-					},
-					"frame": {
-						"x": 383,
-						"y": 78,
-						"w": 78,
-						"h": 82
-					}
-				},
-				{
-					"filename": "0052.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 78,
-						"h": 82
-					},
-					"frame": {
-						"x": 383,
-						"y": 78,
-						"w": 78,
-						"h": 82
-					}
-				},
-				{
-					"filename": "0076.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 78,
-						"h": 82
-					},
-					"frame": {
-						"x": 383,
-						"y": 78,
-						"w": 78,
-						"h": 82
-					}
-				},
-				{
-					"filename": "0059.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 78,
-						"h": 82
-					},
-					"frame": {
-						"x": 312,
-						"y": 164,
-						"w": 78,
-						"h": 82
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 78,
-						"h": 81
-					},
-					"frame": {
-						"x": 390,
-						"y": 160,
-						"w": 78,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0026.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 78,
-						"h": 81
-					},
-					"frame": {
-						"x": 390,
-						"y": 160,
-						"w": 78,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0050.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 78,
-						"h": 81
-					},
-					"frame": {
-						"x": 390,
-						"y": 160,
-						"w": 78,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0074.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 78,
-						"h": 81
-					},
-					"frame": {
-						"x": 390,
-						"y": 160,
-						"w": 78,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 78,
-						"h": 81
-					},
-					"frame": {
-						"x": 461,
-						"y": 79,
-						"w": 78,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0027.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 78,
-						"h": 81
-					},
-					"frame": {
-						"x": 461,
-						"y": 79,
-						"w": 78,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0051.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 78,
-						"h": 81
-					},
-					"frame": {
-						"x": 461,
-						"y": 79,
-						"w": 78,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0075.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 78,
-						"h": 81
-					},
-					"frame": {
-						"x": 461,
-						"y": 79,
-						"w": 78,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 76,
-						"h": 81
-					},
-					"frame": {
-						"x": 539,
-						"y": 79,
-						"w": 76,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0030.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 76,
-						"h": 81
-					},
-					"frame": {
-						"x": 539,
-						"y": 79,
-						"w": 76,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0054.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 76,
-						"h": 81
-					},
-					"frame": {
-						"x": 539,
-						"y": 79,
-						"w": 76,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0078.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 76,
-						"h": 81
-					},
-					"frame": {
-						"x": 539,
-						"y": 79,
-						"w": 76,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0061.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 81,
-						"h": 79
-					},
-					"frame": {
-						"x": 468,
-						"y": 160,
-						"w": 81,
-						"h": 79
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 13,
-						"w": 80,
-						"h": 75
-					},
-					"frame": {
-						"x": 154,
-						"y": 243,
-						"w": 80,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0047.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 13,
-						"w": 80,
-						"h": 75
-					},
-					"frame": {
-						"x": 154,
-						"y": 243,
-						"w": 80,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0095.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 13,
-						"w": 80,
-						"h": 75
-					},
-					"frame": {
-						"x": 154,
-						"y": 243,
-						"w": 80,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 14,
-						"w": 84,
-						"h": 74
-					},
-					"frame": {
-						"x": 234,
-						"y": 246,
-						"w": 84,
-						"h": 74
-					}
-				},
-				{
-					"filename": "0041.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 14,
-						"w": 84,
-						"h": 74
-					},
-					"frame": {
-						"x": 234,
-						"y": 246,
-						"w": 84,
-						"h": 74
-					}
-				},
-				{
-					"filename": "0089.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 14,
-						"w": 84,
-						"h": 74
-					},
-					"frame": {
-						"x": 234,
-						"y": 246,
-						"w": 84,
-						"h": 74
-					}
-				},
-				{
-					"filename": "0060.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 80,
-						"h": 79
-					},
-					"frame": {
-						"x": 74,
-						"y": 248,
-						"w": 80,
-						"h": 79
-					}
-				},
-				{
-					"filename": "0109.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 78,
-						"h": 81
-					},
-					"frame": {
-						"x": 73,
-						"y": 327,
-						"w": 78,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 77,
-						"h": 81
-					},
-					"frame": {
-						"x": 318,
-						"y": 246,
-						"w": 77,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0029.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 77,
-						"h": 81
-					},
-					"frame": {
-						"x": 318,
-						"y": 246,
-						"w": 77,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0053.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 77,
-						"h": 81
-					},
-					"frame": {
-						"x": 318,
-						"y": 246,
-						"w": 77,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0077.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 7,
-						"w": 77,
-						"h": 81
-					},
-					"frame": {
-						"x": 318,
-						"y": 246,
-						"w": 77,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0098.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 9,
-						"w": 78,
-						"h": 79
-					},
-					"frame": {
-						"x": 395,
-						"y": 241,
-						"w": 78,
-						"h": 79
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 10,
-						"w": 78,
-						"h": 78
-					},
-					"frame": {
-						"x": 473,
-						"y": 239,
-						"w": 78,
-						"h": 78
-					}
-				},
-				{
-					"filename": "0048.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 10,
-						"w": 78,
-						"h": 78
-					},
-					"frame": {
-						"x": 473,
-						"y": 239,
-						"w": 78,
-						"h": 78
-					}
-				},
-				{
-					"filename": "0096.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 10,
-						"w": 78,
-						"h": 78
-					},
-					"frame": {
-						"x": 473,
-						"y": 239,
-						"w": 78,
-						"h": 78
-					}
-				},
-				{
-					"filename": "0072.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 10,
-						"w": 78,
-						"h": 78
-					},
-					"frame": {
-						"x": 75,
-						"y": 408,
-						"w": 78,
-						"h": 78
-					}
-				},
-				{
-					"filename": "0099.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 11,
-						"w": 79,
-						"h": 77
-					},
-					"frame": {
-						"x": 75,
-						"y": 486,
-						"w": 79,
-						"h": 77
-					}
-				},
-				{
-					"filename": "0071.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 13,
-						"w": 80,
-						"h": 75
-					},
-					"frame": {
-						"x": 154,
-						"y": 318,
-						"w": 80,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 15,
-						"w": 84,
-						"h": 73
-					},
-					"frame": {
-						"x": 234,
-						"y": 320,
-						"w": 84,
-						"h": 73
-					}
-				},
-				{
-					"filename": "0042.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 15,
-						"w": 84,
-						"h": 73
-					},
-					"frame": {
-						"x": 234,
-						"y": 320,
-						"w": 84,
-						"h": 73
-					}
-				},
-				{
-					"filename": "0090.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 15,
-						"w": 84,
-						"h": 73
-					},
-					"frame": {
-						"x": 234,
-						"y": 320,
-						"w": 84,
-						"h": 73
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 16,
-						"w": 84,
-						"h": 72
-					},
-					"frame": {
-						"x": 318,
-						"y": 327,
-						"w": 84,
-						"h": 72
-					}
-				},
-				{
-					"filename": "0043.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 16,
-						"w": 84,
-						"h": 72
-					},
-					"frame": {
-						"x": 318,
-						"y": 327,
-						"w": 84,
-						"h": 72
-					}
-				},
-				{
-					"filename": "0091.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 16,
-						"w": 84,
-						"h": 72
-					},
-					"frame": {
-						"x": 318,
-						"y": 327,
-						"w": 84,
-						"h": 72
-					}
-				},
-				{
-					"filename": "0065.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 14,
-						"w": 84,
-						"h": 74
-					},
-					"frame": {
-						"x": 153,
-						"y": 393,
-						"w": 84,
-						"h": 74
-					}
-				},
-				{
-					"filename": "0101.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 17,
-						"w": 81,
-						"h": 71
-					},
-					"frame": {
-						"x": 237,
-						"y": 393,
-						"w": 81,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0066.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 15,
-						"w": 84,
-						"h": 73
-					},
-					"frame": {
-						"x": 318,
-						"y": 399,
-						"w": 84,
-						"h": 73
-					}
-				},
-				{
-					"filename": "0106.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 13,
-						"w": 83,
-						"h": 75
-					},
-					"frame": {
-						"x": 402,
-						"y": 320,
-						"w": 83,
-						"h": 75
-					}
-				},
-				{
-					"filename": "0105.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 14,
-						"w": 84,
-						"h": 74
-					},
-					"frame": {
-						"x": 402,
-						"y": 395,
-						"w": 84,
-						"h": 74
-					}
-				},
-				{
-					"filename": "0100.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 14,
-						"w": 80,
-						"h": 74
-					},
-					"frame": {
-						"x": 485,
-						"y": 317,
-						"w": 80,
-						"h": 74
-					}
-				},
-				{
-					"filename": "0104.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 15,
-						"w": 83,
-						"h": 73
-					},
-					"frame": {
-						"x": 486,
-						"y": 391,
-						"w": 83,
-						"h": 73
-					}
-				},
-				{
-					"filename": "0067.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 16,
-						"w": 84,
-						"h": 72
-					},
-					"frame": {
-						"x": 154,
-						"y": 467,
-						"w": 84,
-						"h": 72
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 17,
-						"w": 83,
-						"h": 71
-					},
-					"frame": {
-						"x": 154,
-						"y": 539,
-						"w": 83,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0045.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 17,
-						"w": 83,
-						"h": 71
-					},
-					"frame": {
-						"x": 154,
-						"y": 539,
-						"w": 83,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0093.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 17,
-						"w": 83,
-						"h": 71
-					},
-					"frame": {
-						"x": 154,
-						"y": 539,
-						"w": 83,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 17,
-						"w": 83,
-						"h": 71
-					},
-					"frame": {
-						"x": 486,
-						"y": 464,
-						"w": 83,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0046.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 17,
-						"w": 83,
-						"h": 71
-					},
-					"frame": {
-						"x": 486,
-						"y": 464,
-						"w": 83,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0094.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 17,
-						"w": 83,
-						"h": 71
-					},
-					"frame": {
-						"x": 486,
-						"y": 464,
-						"w": 83,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0069.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 17,
-						"w": 83,
-						"h": 71
-					},
-					"frame": {
-						"x": 402,
-						"y": 469,
-						"w": 83,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0070.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 17,
-						"w": 83,
-						"h": 71
-					},
-					"frame": {
-						"x": 485,
-						"y": 535,
-						"w": 83,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 16,
-						"w": 82,
-						"h": 72
-					},
-					"frame": {
-						"x": 237,
-						"y": 539,
-						"w": 82,
-						"h": 72
-					}
-				},
-				{
-					"filename": "0044.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 16,
-						"w": 82,
-						"h": 72
-					},
-					"frame": {
-						"x": 237,
-						"y": 539,
-						"w": 82,
-						"h": 72
-					}
-				},
-				{
-					"filename": "0092.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 16,
-						"w": 82,
-						"h": 72
-					},
-					"frame": {
-						"x": 237,
-						"y": 539,
-						"w": 82,
-						"h": 72
-					}
-				},
-				{
-					"filename": "0103.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 16,
-						"w": 83,
-						"h": 72
-					},
-					"frame": {
-						"x": 319,
-						"y": 472,
-						"w": 83,
-						"h": 72
-					}
-				},
-				{
-					"filename": "0102.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 18,
-						"w": 82,
-						"h": 70
-					},
-					"frame": {
-						"x": 319,
-						"y": 544,
-						"w": 82,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0068.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 88
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 16,
-						"w": 82,
-						"h": 72
-					},
-					"frame": {
-						"x": 402,
-						"y": 540,
-						"w": 82,
-						"h": 72
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:4329c19087eab420ea4188f3ebf013ba:3f36a5e65803b0f012c6fee4aeaf5df7:fcd0d2cb6b26724e796ae0dcb71fae3f$"
-	}
-}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/730_2.png b/public/images/pokemon/variant/exp/730_2.png
deleted file mode 100644
index f7a1b20a9be..00000000000
Binary files a/public/images/pokemon/variant/exp/730_2.png and /dev/null differ
diff --git a/public/images/pokemon/variant/exp/746-school.json b/public/images/pokemon/variant/exp/746-school.json
new file mode 100644
index 00000000000..a76aca2921f
--- /dev/null
+++ b/public/images/pokemon/variant/exp/746-school.json
@@ -0,0 +1,40 @@
+{
+    "1": {
+        "101010": "101010",
+        "0a1627": "5f2112",
+        "113650": "0b3d3a",
+        "123954": "75351b",
+        "10437d": "16574d",
+        "134884": "934f26",
+        "1766c6": "b77736",
+        "3d66d8": "d39c63",
+        "416adf": "2c9572",
+        "79848a": "a67834",
+        "749cf6": "5ce09d",
+        "43ebf3": "824388",
+        "72f0f6": "27133f",
+        "9cd3fd": "78f389",
+        "a6c5f7": "aafe94",
+        "cfd1d3": "d5ab51",
+        "fbfbfb": "f7d76b"
+    },
+    "2": {
+        "101010": "101010",
+        "0a1627": "160523",
+        "113650": "846228",
+        "123954": "28071a",
+        "10437d": "b7904d",
+        "134884": "350b19",
+        "1766c6": "4a1111",
+        "3d66d8": "622222",
+        "416adf": "dec284",
+        "79848a": "4a1111",
+        "749cf6": "f8ecc5",
+        "43ebf3": "4378eb",
+        "72f0f6": "31238e",
+        "9cd3fd": "fefed9",
+        "a6c5f7": "fefeef",
+        "cfd1d3": "5f291c",
+        "fbfbfb": "844232"
+    }
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/746.json b/public/images/pokemon/variant/exp/746.json
new file mode 100644
index 00000000000..5b183b10e5d
--- /dev/null
+++ b/public/images/pokemon/variant/exp/746.json
@@ -0,0 +1,40 @@
+{
+    "1": {
+        "101010": "101010",
+        "1f2161": "16574d",
+        "5d666d": "75391b",
+        "616b72": "a67834",
+        "9c455b": "308c9d",
+        "374793": "2c9572",
+        "4764c9": "5ce09d",
+        "3e9cbb": "27133f",
+        "61c8de": "824388", 
+        "8c9c9d": "935926",
+        "8d9c9d": "c69b3f",
+        "d88394": "65cfe2",
+        "b0c5c6": "d5ab51",
+        "ccd2ce": "b77736",
+        "d8d9da": "d8d9da",
+        "eeeeee": "f7d76b",
+        "fefefe": "fefefe"
+    },
+    "2": {
+        "101010": "101010",
+        "1f2161": "b7904d",
+        "5d666d": "1e0726",
+        "616b72": "4a1111",
+        "9c455b": "b9682d",
+        "374793": "dec284",
+        "4764c9": "f8ecc5",
+        "3e9cbb": "4378eb",
+        "61c8de": "5787f1", 
+        "8c9c9d": "350b19",
+        "8d9c9d": "531917",
+        "d88394": "e4d85f",
+        "b0c5c6": "5f291c",
+        "ccd2ce": "4a1111",
+        "d8d9da": "d8d9da",
+        "eeeeee": "844232",
+        "fefefe": "fefefe"
+    }
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/780.json b/public/images/pokemon/variant/exp/780.json
new file mode 100644
index 00000000000..0399d3567bf
--- /dev/null
+++ b/public/images/pokemon/variant/exp/780.json
@@ -0,0 +1,40 @@
+{
+	"1": {
+		"8d541b": "bd8955",
+		"297b8b": "1a316b",
+		"606f55": "496375",
+		"ffc4d7": "f29d9d",
+		"105262": "0e194a",
+		"b4cda4": "9ab5b8",
+		"f5ae07": "e8c987",
+		"ce5b9b": "cf4654",
+		"faf550": "faf0b1",
+		"e67b9c": "e65757",
+		"bd3983": "bd3341",
+		"eea6bc": "f06e6e",
+		"5aa4a4": "284c80",
+		"b8b7a3": "cf8d38",
+		"726d5c": "a36026",
+		"91a37c": "7798a1",
+		"eeeeee": "e6c15e"
+	},
+	"2": {
+		"8d541b": "157d36",
+		"297b8b": "4e4f73",
+		"606f55": "8f825d",
+		"ffc4d7": "f2e396",
+		"105262": "3f3c61",
+		"b4cda4": "d6dbba",
+		"f5ae07": "24ab2b",
+		"ce5b9b": "d9ae5d",
+		"faf550": "3ec435",
+		"e67b9c": "e3b656",
+		"bd3983": "c27529",
+		"eea6bc": "f2d98d",
+		"5aa4a4": "6a708a",
+		"b8b7a3": "254e59",
+		"726d5c": "162d3d",
+		"91a37c": "b5b48b",
+		"eeeeee": "3e7a76"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/840.json b/public/images/pokemon/variant/exp/840.json
new file mode 100644
index 00000000000..5a6a81a887e
--- /dev/null
+++ b/public/images/pokemon/variant/exp/840.json
@@ -0,0 +1,34 @@
+{
+	"1": {
+		"e2244a": "70a2c5",
+		"8d4229": "570749",
+		"94d84a": "fefefe",
+		"a4d84a": "9aa0b3",
+		"d39a52": "9c2e72",
+		"e32b50": "4e77a2",
+		"5fab1d": "7a7c9e",
+		"fe455c": "abd7e2",
+		"5bab1d": "acb0c3",
+		"247912": "48485d",
+		"a50534": "3e6085",
+		"357912": "313846",
+		"f2c171": "c55885",
+		"fa6f8b": "c1f3f3"
+	},
+	"2": {
+		"e2244a": "bfb5ab",
+		"8d4229": "230808",
+		"94d84a": "589df3",
+		"a4d84a": "9aa0b3",
+		"d39a52": "291411",
+		"e32b50": "807770",
+		"5fab1d": "7a7c9e",
+		"fe455c": "dcd9d1",
+		"5bab1d": "354dbf",
+		"247912": "2e2246",
+		"a50534": "68645f",
+		"357912": "313846",
+		"f2c171": "463731",
+		"fa6f8b": "eeedea"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/841.json b/public/images/pokemon/variant/exp/841.json
new file mode 100644
index 00000000000..aa68f322f29
--- /dev/null
+++ b/public/images/pokemon/variant/exp/841.json
@@ -0,0 +1,42 @@
+{
+    "1": {
+        "101010": "101010",
+        "612324": "3e6085",
+        "395a2e": "383146",
+        "9b2629": "70a2c5",
+        "d72d31": "abd7e2",
+        "874c23": "453157",
+        "8d764b": "110723",
+        "d9695a": "c55885",
+        "488235": "8e7a9e",
+        "56ab32": "a59ab3",
+        "b08c51": "b3b1d6",
+        "b5915b": "34123a",
+        "ccb468": "5d2654",
+        "f1c950": "f3c5dd",
+        "ccca71": "e6dcf9",
+        "f0bda6": "c1f3f3",
+        "ebe381": "854774",
+        "fcfcfc": "fcfcfc"
+    },
+    "2": {
+        "101010": "101010",
+        "612324": "827466",
+        "395a2e": "4f0e30",
+        "9b2629": "bfb5ab",
+        "d72d31": "dcd9d1",
+        "874c23": "2e2246",
+        "8d764b": "230313",
+        "d9695a": "463731",
+        "488235": "a8546e",
+        "56ab32": "e28c95",
+        "b08c51": "cbb4af",
+        "b5915b": "541711",
+        "ccb468": "8b4332",
+        "f1c950": "589df3",
+        "ccca71": "e2dcd6",
+        "f0bda6": "eeedea",
+        "ebe381": "c68862",
+        "fcfcfc": "fcfcfc"
+    }
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/842.json b/public/images/pokemon/variant/exp/842.json
new file mode 100644
index 00000000000..0629adc139a
--- /dev/null
+++ b/public/images/pokemon/variant/exp/842.json
@@ -0,0 +1,43 @@
+{
+    "1": {
+        "101010": "101010",
+        "1f4329": "313846",
+        "1f5829": "852560",
+        "2c743e": "7a7c9e",
+        "9f7034": "230f47",
+        "ac6b20": "110723",
+        "af2348": "67829e",
+        "e75574": "70a2c5",
+        "39a45f": "92cbd9",
+        "7de755": "d66f9a",
+        "e78422": "1f1946",
+        "ffa63b": "2d3d68",
+        "f1cf6d": "a3b9d0",
+        "f9d56d": "698db4",
+        "ffc575": "2b526f",
+        "f18e8e": "c1f3f3",
+        "fcff86": "397880",
+        "621522": "204063"
+        
+    },
+    "2": {
+        "101010": "101010",
+        "1f4329": "511c2d",
+        "1f5829": "2e2246",
+        "2c743e": "a8546e",
+        "9f7034": "3a130d",
+        "ac6b20": "68645f",
+        "af2348": "bfb5ab",
+        "e75574": "dcd9d1",
+        "39a45f": "e28c95",
+        "7de755": "589df3",
+        "e78422": "4b211b",
+        "ffa63b": "63473b",
+        "f1cf6d": "cbb4af",
+        "f9d56d": "b9937a",
+        "ffc575": "d1a87e",
+        "f18e8e": "eeedea",
+        "fcff86": "eee0bc",
+        "621522": "68645f"
+    }
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/871.json b/public/images/pokemon/variant/exp/871.json
new file mode 100644
index 00000000000..5004d3013b5
--- /dev/null
+++ b/public/images/pokemon/variant/exp/871.json
@@ -0,0 +1,32 @@
+{
+    "1": {
+        "101010": "101010",
+        "2e2732": "1b3334",
+        "281f2e": "2a2732",
+        "46384c": "504540",
+        "493d4e": "3a5d57",
+        "665272": "62857c",
+        "544947": "7d320e",
+        "7a7270": "a8501b",
+        "9e9a96": "cd7930",
+        "7b4e1c": "5b0d3f",
+        "d58815": "a02c58",
+        "fdba2f": "c45858",
+        "fdf22f": "f1e8e8"
+    },
+    "2": {
+        "101010": "101010",
+        "2e2732": "8b4738",
+        "281f2e": "212232",
+        "46384c": "504740",
+        "493d4e": "ce8a66",
+        "665272": "eac69b",
+        "544947": "1a1730",
+        "7a7270": "27223b",
+        "9e9a96": "3a3449",
+        "7b4e1c": "222c58",
+        "d58815": "343f7f",
+        "fdba2f": "67729f",
+        "fdf22f": "8e9fc9"
+    }
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/935.json b/public/images/pokemon/variant/exp/935.json
deleted file mode 100644
index 8aa02017aca..00000000000
--- a/public/images/pokemon/variant/exp/935.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-	"0": {
-		"3681e4": "cfac07",
-		"df00df": "b168ca",
-		"82afee": "fdcd0d",
-		"ff51ff": "e589b5",
-		"ca0d33": "5ba0cc",
-		"ee0d23": "93d6b7",
-		"801313": "212982",
-		"b33630": "4861a5",
-		"0f0f0f": "0f0f0f",
-		"464444": "4d3467",
-		"636161": "885aa3",
-		"f38f07": "b885d6",
-		"8c8a8a": "c79ace",
-		"f32e42": "93d6b7",
-		"1b2123": "1b2123",
-		"c77505": "795bd3",
-		"f3bd03": "a59fdf",
-		"ffffff": "ffffff",
-		"bbb9b9": "bbb9b9",
-		"5c5d64": "5c5d64"
-	},
-	"1": {
-		"3681e4": "a3bfcc",
-		"df00df": "88a0cc",
-		"82afee": "dbf5ff",
-		"ff51ff": "bbccea",
-		"ca0d33": "41accd",
-		"ee0d23": "96f5ff",
-		"801313": "0b3060",
-		"b33630": "205b82",
-		"0f0f0f": "0f0f0f",
-		"464444": "2d2c35",
-		"636161": "3b4149",
-		"f38f07": "e0734c",
-		"8c8a8a": "888989",
-		"f32e42": "87c1e5",
-		"1b2123": "1b2123",
-		"c77505": "d33830",
-		"f3bd03": "f4b766",
-		"ffffff": "ffffff",
-		"bbb9b9": "bbb9b9",
-		"5c5d64": "5c5d64"
-	}
-}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/935_1.png b/public/images/pokemon/variant/exp/935_1.png
deleted file mode 100644
index 06c09657444..00000000000
Binary files a/public/images/pokemon/variant/exp/935_1.png and /dev/null differ
diff --git a/public/images/pokemon/variant/exp/935_2.png b/public/images/pokemon/variant/exp/935_2.png
deleted file mode 100644
index 87d88ad2a74..00000000000
Binary files a/public/images/pokemon/variant/exp/935_2.png and /dev/null differ
diff --git a/public/images/pokemon/variant/exp/935_3.json b/public/images/pokemon/variant/exp/935_3.json
deleted file mode 100644
index 019ec7ab1de..00000000000
--- a/public/images/pokemon/variant/exp/935_3.json
+++ /dev/null
@@ -1,440 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "935_3.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 165,
-				"h": 165
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 35,
-						"h": 55
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 55
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 35,
-						"h": 55
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 55
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 35,
-						"h": 55
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 55
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 35,
-						"h": 55
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 55
-					},
-					"frame": {
-						"x": 0,
-						"y": 55,
-						"w": 35,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 35,
-						"h": 55
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 55
-					},
-					"frame": {
-						"x": 0,
-						"y": 55,
-						"w": 35,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 35,
-						"h": 55
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 55
-					},
-					"frame": {
-						"x": 0,
-						"y": 55,
-						"w": 35,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 35,
-						"h": 55
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 55
-					},
-					"frame": {
-						"x": 0,
-						"y": 110,
-						"w": 35,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 35,
-						"h": 55
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 55
-					},
-					"frame": {
-						"x": 0,
-						"y": 110,
-						"w": 35,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 35,
-						"h": 55
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 55
-					},
-					"frame": {
-						"x": 0,
-						"y": 110,
-						"w": 35,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 35,
-						"h": 55
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 55
-					},
-					"frame": {
-						"x": 35,
-						"y": 0,
-						"w": 35,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 35,
-						"h": 55
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 55
-					},
-					"frame": {
-						"x": 35,
-						"y": 0,
-						"w": 35,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 35,
-						"h": 55
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 55
-					},
-					"frame": {
-						"x": 35,
-						"y": 0,
-						"w": 35,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 35,
-						"h": 55
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 55
-					},
-					"frame": {
-						"x": 35,
-						"y": 55,
-						"w": 35,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 35,
-						"h": 55
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 55
-					},
-					"frame": {
-						"x": 35,
-						"y": 110,
-						"w": 35,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 35,
-						"h": 55
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 55
-					},
-					"frame": {
-						"x": 70,
-						"y": 0,
-						"w": 35,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 35,
-						"h": 55
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 55
-					},
-					"frame": {
-						"x": 105,
-						"y": 0,
-						"w": 35,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 35,
-						"h": 55
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 55
-					},
-					"frame": {
-						"x": 70,
-						"y": 55,
-						"w": 35,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 35,
-						"h": 55
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 55
-					},
-					"frame": {
-						"x": 70,
-						"y": 110,
-						"w": 35,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 35,
-						"h": 55
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 55
-					},
-					"frame": {
-						"x": 105,
-						"y": 55,
-						"w": 35,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 35,
-						"h": 55
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 55
-					},
-					"frame": {
-						"x": 105,
-						"y": 110,
-						"w": 35,
-						"h": 55
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:06750fe617b2ad66c1af576e0074e016:b59cf22eea90e9839062adc1f728c00a:077dcf06dc5fc347497b59afe6126a5e$"
-	}
-}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/935_3.png b/public/images/pokemon/variant/exp/935_3.png
deleted file mode 100644
index 2ffcbac799e..00000000000
Binary files a/public/images/pokemon/variant/exp/935_3.png and /dev/null differ
diff --git a/public/images/pokemon/variant/exp/936_1.json b/public/images/pokemon/variant/exp/936_1.json
deleted file mode 100644
index f3c45278c91..00000000000
--- a/public/images/pokemon/variant/exp/936_1.json
+++ /dev/null
@@ -1,524 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "936_1.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 323,
-				"h": 323
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 76,
-						"h": 99
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 76,
-						"h": 99
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 76,
-						"h": 99
-					},
-					"frame": {
-						"x": 0,
-						"y": 99,
-						"w": 76,
-						"h": 99
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 76,
-						"h": 99
-					},
-					"frame": {
-						"x": 0,
-						"y": 198,
-						"w": 76,
-						"h": 99
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 76,
-						"h": 98
-					},
-					"frame": {
-						"x": 76,
-						"y": 0,
-						"w": 76,
-						"h": 98
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 76,
-						"h": 98
-					},
-					"frame": {
-						"x": 152,
-						"y": 0,
-						"w": 76,
-						"h": 98
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 70,
-						"h": 99
-					},
-					"frame": {
-						"x": 228,
-						"y": 0,
-						"w": 70,
-						"h": 99
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 70,
-						"h": 99
-					},
-					"frame": {
-						"x": 76,
-						"y": 98,
-						"w": 70,
-						"h": 99
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 0,
-						"w": 59,
-						"h": 99
-					},
-					"frame": {
-						"x": 146,
-						"y": 98,
-						"w": 59,
-						"h": 99
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 0,
-						"w": 59,
-						"h": 99
-					},
-					"frame": {
-						"x": 146,
-						"y": 98,
-						"w": 59,
-						"h": 99
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 0,
-						"w": 59,
-						"h": 99
-					},
-					"frame": {
-						"x": 146,
-						"y": 98,
-						"w": 59,
-						"h": 99
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 0,
-						"w": 59,
-						"h": 99
-					},
-					"frame": {
-						"x": 76,
-						"y": 197,
-						"w": 59,
-						"h": 99
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 0,
-						"w": 59,
-						"h": 99
-					},
-					"frame": {
-						"x": 76,
-						"y": 197,
-						"w": 59,
-						"h": 99
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 0,
-						"w": 59,
-						"h": 99
-					},
-					"frame": {
-						"x": 76,
-						"y": 197,
-						"w": 59,
-						"h": 99
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 0,
-						"w": 59,
-						"h": 99
-					},
-					"frame": {
-						"x": 76,
-						"y": 197,
-						"w": 59,
-						"h": 99
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 0,
-						"w": 59,
-						"h": 99
-					},
-					"frame": {
-						"x": 135,
-						"y": 197,
-						"w": 59,
-						"h": 99
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 0,
-						"w": 59,
-						"h": 99
-					},
-					"frame": {
-						"x": 135,
-						"y": 197,
-						"w": 59,
-						"h": 99
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 0,
-						"w": 59,
-						"h": 99
-					},
-					"frame": {
-						"x": 135,
-						"y": 197,
-						"w": 59,
-						"h": 99
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 0,
-						"w": 59,
-						"h": 99
-					},
-					"frame": {
-						"x": 194,
-						"y": 197,
-						"w": 59,
-						"h": 99
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 1,
-						"w": 59,
-						"h": 98
-					},
-					"frame": {
-						"x": 205,
-						"y": 99,
-						"w": 59,
-						"h": 98
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 1,
-						"w": 59,
-						"h": 98
-					},
-					"frame": {
-						"x": 205,
-						"y": 99,
-						"w": 59,
-						"h": 98
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 1,
-						"w": 59,
-						"h": 98
-					},
-					"frame": {
-						"x": 205,
-						"y": 99,
-						"w": 59,
-						"h": 98
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 1,
-						"w": 59,
-						"h": 98
-					},
-					"frame": {
-						"x": 205,
-						"y": 99,
-						"w": 59,
-						"h": 98
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 0,
-						"w": 59,
-						"h": 99
-					},
-					"frame": {
-						"x": 264,
-						"y": 99,
-						"w": 59,
-						"h": 99
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 1,
-						"w": 59,
-						"h": 98
-					},
-					"frame": {
-						"x": 253,
-						"y": 198,
-						"w": 59,
-						"h": 98
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:2943281264e8142bbdb55f3a34167d72:322e92870c690e237c7a5e4a4a5f8e84:1a0490303f9626f92e787c567cd10feb$"
-	}
-}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/936_1.png b/public/images/pokemon/variant/exp/936_1.png
deleted file mode 100644
index cdc333ab841..00000000000
Binary files a/public/images/pokemon/variant/exp/936_1.png and /dev/null differ
diff --git a/public/images/pokemon/variant/exp/936_2.json b/public/images/pokemon/variant/exp/936_2.json
deleted file mode 100644
index dfe48120a67..00000000000
--- a/public/images/pokemon/variant/exp/936_2.json
+++ /dev/null
@@ -1,524 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "936_2.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 323,
-				"h": 323
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 76,
-						"h": 99
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 76,
-						"h": 99
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 76,
-						"h": 99
-					},
-					"frame": {
-						"x": 0,
-						"y": 99,
-						"w": 76,
-						"h": 99
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 76,
-						"h": 99
-					},
-					"frame": {
-						"x": 0,
-						"y": 198,
-						"w": 76,
-						"h": 99
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 76,
-						"h": 98
-					},
-					"frame": {
-						"x": 76,
-						"y": 0,
-						"w": 76,
-						"h": 98
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 76,
-						"h": 98
-					},
-					"frame": {
-						"x": 152,
-						"y": 0,
-						"w": 76,
-						"h": 98
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 70,
-						"h": 99
-					},
-					"frame": {
-						"x": 228,
-						"y": 0,
-						"w": 70,
-						"h": 99
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 70,
-						"h": 99
-					},
-					"frame": {
-						"x": 76,
-						"y": 98,
-						"w": 70,
-						"h": 99
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 0,
-						"w": 59,
-						"h": 99
-					},
-					"frame": {
-						"x": 146,
-						"y": 98,
-						"w": 59,
-						"h": 99
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 0,
-						"w": 59,
-						"h": 99
-					},
-					"frame": {
-						"x": 146,
-						"y": 98,
-						"w": 59,
-						"h": 99
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 0,
-						"w": 59,
-						"h": 99
-					},
-					"frame": {
-						"x": 146,
-						"y": 98,
-						"w": 59,
-						"h": 99
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 0,
-						"w": 59,
-						"h": 99
-					},
-					"frame": {
-						"x": 76,
-						"y": 197,
-						"w": 59,
-						"h": 99
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 0,
-						"w": 59,
-						"h": 99
-					},
-					"frame": {
-						"x": 76,
-						"y": 197,
-						"w": 59,
-						"h": 99
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 0,
-						"w": 59,
-						"h": 99
-					},
-					"frame": {
-						"x": 76,
-						"y": 197,
-						"w": 59,
-						"h": 99
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 0,
-						"w": 59,
-						"h": 99
-					},
-					"frame": {
-						"x": 76,
-						"y": 197,
-						"w": 59,
-						"h": 99
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 0,
-						"w": 59,
-						"h": 99
-					},
-					"frame": {
-						"x": 135,
-						"y": 197,
-						"w": 59,
-						"h": 99
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 0,
-						"w": 59,
-						"h": 99
-					},
-					"frame": {
-						"x": 135,
-						"y": 197,
-						"w": 59,
-						"h": 99
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 0,
-						"w": 59,
-						"h": 99
-					},
-					"frame": {
-						"x": 135,
-						"y": 197,
-						"w": 59,
-						"h": 99
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 0,
-						"w": 59,
-						"h": 99
-					},
-					"frame": {
-						"x": 194,
-						"y": 197,
-						"w": 59,
-						"h": 99
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 1,
-						"w": 59,
-						"h": 98
-					},
-					"frame": {
-						"x": 205,
-						"y": 99,
-						"w": 59,
-						"h": 98
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 1,
-						"w": 59,
-						"h": 98
-					},
-					"frame": {
-						"x": 205,
-						"y": 99,
-						"w": 59,
-						"h": 98
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 1,
-						"w": 59,
-						"h": 98
-					},
-					"frame": {
-						"x": 205,
-						"y": 99,
-						"w": 59,
-						"h": 98
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 1,
-						"w": 59,
-						"h": 98
-					},
-					"frame": {
-						"x": 205,
-						"y": 99,
-						"w": 59,
-						"h": 98
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 0,
-						"w": 59,
-						"h": 99
-					},
-					"frame": {
-						"x": 264,
-						"y": 99,
-						"w": 59,
-						"h": 99
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 1,
-						"w": 59,
-						"h": 98
-					},
-					"frame": {
-						"x": 253,
-						"y": 198,
-						"w": 59,
-						"h": 98
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:2943281264e8142bbdb55f3a34167d72:322e92870c690e237c7a5e4a4a5f8e84:1a0490303f9626f92e787c567cd10feb$"
-	}
-}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/936_2.png b/public/images/pokemon/variant/exp/936_2.png
deleted file mode 100644
index 4d5bfb25268..00000000000
Binary files a/public/images/pokemon/variant/exp/936_2.png and /dev/null differ
diff --git a/public/images/pokemon/variant/exp/936_3.json b/public/images/pokemon/variant/exp/936_3.json
deleted file mode 100644
index e80ca73deb5..00000000000
--- a/public/images/pokemon/variant/exp/936_3.json
+++ /dev/null
@@ -1,524 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "936_3.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 323,
-				"h": 323
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 76,
-						"h": 99
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 76,
-						"h": 99
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 76,
-						"h": 99
-					},
-					"frame": {
-						"x": 0,
-						"y": 99,
-						"w": 76,
-						"h": 99
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 76,
-						"h": 99
-					},
-					"frame": {
-						"x": 0,
-						"y": 198,
-						"w": 76,
-						"h": 99
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 76,
-						"h": 98
-					},
-					"frame": {
-						"x": 76,
-						"y": 0,
-						"w": 76,
-						"h": 98
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 76,
-						"h": 98
-					},
-					"frame": {
-						"x": 152,
-						"y": 0,
-						"w": 76,
-						"h": 98
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 70,
-						"h": 99
-					},
-					"frame": {
-						"x": 228,
-						"y": 0,
-						"w": 70,
-						"h": 99
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 70,
-						"h": 99
-					},
-					"frame": {
-						"x": 76,
-						"y": 98,
-						"w": 70,
-						"h": 99
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 0,
-						"w": 59,
-						"h": 99
-					},
-					"frame": {
-						"x": 146,
-						"y": 98,
-						"w": 59,
-						"h": 99
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 0,
-						"w": 59,
-						"h": 99
-					},
-					"frame": {
-						"x": 146,
-						"y": 98,
-						"w": 59,
-						"h": 99
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 0,
-						"w": 59,
-						"h": 99
-					},
-					"frame": {
-						"x": 146,
-						"y": 98,
-						"w": 59,
-						"h": 99
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 0,
-						"w": 59,
-						"h": 99
-					},
-					"frame": {
-						"x": 76,
-						"y": 197,
-						"w": 59,
-						"h": 99
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 0,
-						"w": 59,
-						"h": 99
-					},
-					"frame": {
-						"x": 76,
-						"y": 197,
-						"w": 59,
-						"h": 99
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 0,
-						"w": 59,
-						"h": 99
-					},
-					"frame": {
-						"x": 76,
-						"y": 197,
-						"w": 59,
-						"h": 99
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 0,
-						"w": 59,
-						"h": 99
-					},
-					"frame": {
-						"x": 76,
-						"y": 197,
-						"w": 59,
-						"h": 99
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 0,
-						"w": 59,
-						"h": 99
-					},
-					"frame": {
-						"x": 135,
-						"y": 197,
-						"w": 59,
-						"h": 99
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 0,
-						"w": 59,
-						"h": 99
-					},
-					"frame": {
-						"x": 135,
-						"y": 197,
-						"w": 59,
-						"h": 99
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 0,
-						"w": 59,
-						"h": 99
-					},
-					"frame": {
-						"x": 135,
-						"y": 197,
-						"w": 59,
-						"h": 99
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 0,
-						"w": 59,
-						"h": 99
-					},
-					"frame": {
-						"x": 194,
-						"y": 197,
-						"w": 59,
-						"h": 99
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 1,
-						"w": 59,
-						"h": 98
-					},
-					"frame": {
-						"x": 205,
-						"y": 99,
-						"w": 59,
-						"h": 98
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 1,
-						"w": 59,
-						"h": 98
-					},
-					"frame": {
-						"x": 205,
-						"y": 99,
-						"w": 59,
-						"h": 98
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 1,
-						"w": 59,
-						"h": 98
-					},
-					"frame": {
-						"x": 205,
-						"y": 99,
-						"w": 59,
-						"h": 98
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 1,
-						"w": 59,
-						"h": 98
-					},
-					"frame": {
-						"x": 205,
-						"y": 99,
-						"w": 59,
-						"h": 98
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 0,
-						"w": 59,
-						"h": 99
-					},
-					"frame": {
-						"x": 264,
-						"y": 99,
-						"w": 59,
-						"h": 99
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 76,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 1,
-						"w": 59,
-						"h": 98
-					},
-					"frame": {
-						"x": 253,
-						"y": 198,
-						"w": 59,
-						"h": 98
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:2943281264e8142bbdb55f3a34167d72:322e92870c690e237c7a5e4a4a5f8e84:1a0490303f9626f92e787c567cd10feb$"
-	}
-}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/936_3.png b/public/images/pokemon/variant/exp/936_3.png
deleted file mode 100644
index 27874a25886..00000000000
Binary files a/public/images/pokemon/variant/exp/936_3.png and /dev/null differ
diff --git a/public/images/pokemon/variant/exp/937_1.json b/public/images/pokemon/variant/exp/937_1.json
deleted file mode 100644
index d8039af99c7..00000000000
--- a/public/images/pokemon/variant/exp/937_1.json
+++ /dev/null
@@ -1,125 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "937_1.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 247,
-				"h": 247
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 86,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 83,
-						"h": 98
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 83,
-						"h": 98
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 86,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 81,
-						"h": 99
-					},
-					"frame": {
-						"x": 83,
-						"y": 0,
-						"w": 81,
-						"h": 99
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 86,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 83,
-						"h": 99
-					},
-					"frame": {
-						"x": 164,
-						"y": 0,
-						"w": 83,
-						"h": 99
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 86,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 86,
-						"h": 99
-					},
-					"frame": {
-						"x": 0,
-						"y": 99,
-						"w": 86,
-						"h": 99
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 86,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 86,
-						"h": 99
-					},
-					"frame": {
-						"x": 86,
-						"y": 99,
-						"w": 86,
-						"h": 99
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:492182e4e32e5cddaa9dfc2c2c08b684:084d0317f824a0d082ba0ffcfebc407b:1d4b4f8d62307c37457ba974879b47d0$"
-	}
-}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/937_1.png b/public/images/pokemon/variant/exp/937_1.png
deleted file mode 100644
index 82fa70b0c5b..00000000000
Binary files a/public/images/pokemon/variant/exp/937_1.png and /dev/null differ
diff --git a/public/images/pokemon/variant/exp/937_2.json b/public/images/pokemon/variant/exp/937_2.json
deleted file mode 100644
index 58792129101..00000000000
--- a/public/images/pokemon/variant/exp/937_2.json
+++ /dev/null
@@ -1,125 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "937_2.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 247,
-				"h": 247
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 86,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 83,
-						"h": 98
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 83,
-						"h": 98
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 86,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 81,
-						"h": 99
-					},
-					"frame": {
-						"x": 83,
-						"y": 0,
-						"w": 81,
-						"h": 99
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 86,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 83,
-						"h": 99
-					},
-					"frame": {
-						"x": 164,
-						"y": 0,
-						"w": 83,
-						"h": 99
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 86,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 86,
-						"h": 99
-					},
-					"frame": {
-						"x": 0,
-						"y": 99,
-						"w": 86,
-						"h": 99
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 86,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 86,
-						"h": 99
-					},
-					"frame": {
-						"x": 86,
-						"y": 99,
-						"w": 86,
-						"h": 99
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:492182e4e32e5cddaa9dfc2c2c08b684:084d0317f824a0d082ba0ffcfebc407b:1d4b4f8d62307c37457ba974879b47d0$"
-	}
-}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/937_2.png b/public/images/pokemon/variant/exp/937_2.png
deleted file mode 100644
index 43e2b060319..00000000000
Binary files a/public/images/pokemon/variant/exp/937_2.png and /dev/null differ
diff --git a/public/images/pokemon/variant/exp/937_3.json b/public/images/pokemon/variant/exp/937_3.json
deleted file mode 100644
index 213c017c1e0..00000000000
--- a/public/images/pokemon/variant/exp/937_3.json
+++ /dev/null
@@ -1,125 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "937_3.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 247,
-				"h": 247
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 86,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 83,
-						"h": 98
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 83,
-						"h": 98
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 86,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 81,
-						"h": 99
-					},
-					"frame": {
-						"x": 83,
-						"y": 0,
-						"w": 81,
-						"h": 99
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 86,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 83,
-						"h": 99
-					},
-					"frame": {
-						"x": 164,
-						"y": 0,
-						"w": 83,
-						"h": 99
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 86,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 86,
-						"h": 99
-					},
-					"frame": {
-						"x": 0,
-						"y": 99,
-						"w": 86,
-						"h": 99
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 86,
-						"h": 99
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 86,
-						"h": 99
-					},
-					"frame": {
-						"x": 86,
-						"y": 99,
-						"w": 86,
-						"h": 99
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:492182e4e32e5cddaa9dfc2c2c08b684:084d0317f824a0d082ba0ffcfebc407b:1d4b4f8d62307c37457ba974879b47d0$"
-	}
-}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/937_3.png b/public/images/pokemon/variant/exp/937_3.png
deleted file mode 100644
index 9a208ba1457..00000000000
Binary files a/public/images/pokemon/variant/exp/937_3.png and /dev/null differ
diff --git a/public/images/pokemon/variant/exp/back/2037.json b/public/images/pokemon/variant/exp/back/2037.json
new file mode 100644
index 00000000000..0d2c02cf980
--- /dev/null
+++ b/public/images/pokemon/variant/exp/back/2037.json
@@ -0,0 +1,22 @@
+{
+    "1": {
+        "151515": "101010",
+        "558b9f": "9f435d",
+        "648082": "6e67b0",
+        "97bdd2": "ffa8b8",
+        "c1d1d2": "b3b8ea",
+        "d9e9f4": "ffd3e1",
+        "fdfdfd": "d7d9f9",
+        "ffffff": "ffffff"
+    },
+    "2": {
+        "151515": "101010",
+        "558b9f": "90215e",
+        "648082": "bf4747",
+        "97bdd2": "da4e75",
+        "c1d1d2": "ffc07b",
+        "d9e9f4": "ff8489",
+        "fdfdfd": "ffe6a0",
+        "ffffff": "ffffff"
+    }
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/back/2038.json b/public/images/pokemon/variant/exp/back/2038.json
new file mode 100644
index 00000000000..845c45f7887
--- /dev/null
+++ b/public/images/pokemon/variant/exp/back/2038.json
@@ -0,0 +1,36 @@
+{
+    "1": {
+        "101010": "101010",
+        "4d5c78": "394880",
+        "516077": "9f435d",
+        "007ab5": "2380c4",
+        "38858d": "e35ea2",
+        "7a8a9c": "6172ab",
+        "66b3d7": "3dbfe0",
+        "86a8c0": "e27495",
+        "81c2c5": "ff89c0",
+        "bdcbd7": "a7ade7",
+        "a1e1de": "ffb6e5",
+        "b0d3ea": "ffa8b8",
+        "eafefe": "ffd3e1",
+        "fdfdfd": "bec6ef",
+        "ffffff": "ffffff"
+    },
+    "2": {
+        "101010": "101010",
+        "4d5c78": "73174a",
+        "516077": "bb3c3c",
+        "007ab5": "882493",
+        "38858d": "572746",
+        "7a8a9c": "90215e",
+        "66b3d7": "a044ab",
+        "86a8c0": "ff824c",
+        "81c2c5": "75355e",
+        "bdcbd7": "da426d",
+        "a1e1de": "93547c",
+        "b0d3ea": "ffbf6b",
+        "eafefe": "ffe28c",
+        "fdfdfd": "ff6f86",
+        "ffffff": "ffffff"
+    }
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/back/248-mega.json b/public/images/pokemon/variant/exp/back/248-mega.json
index f1770cfc32f..f5b58bf5f10 100644
--- a/public/images/pokemon/variant/exp/back/248-mega.json
+++ b/public/images/pokemon/variant/exp/back/248-mega.json
@@ -1,13 +1,28 @@
 {
+	"1": {
+		"171717": "101010",
+        "4a5a39": "533334",
+        "4b5a3b": "533334",
+        "727272": "727272",
+        "801c17": "004194",
+        "922d00": "004194",
+        "ce283d": "006fb3",
+        "d35200": "0098fc",
+        "729a62": "915957",
+        "739c62": "915957",
+        "aacb9a": "c78482"
+	},
 	"2": {
-		"4a5a39": "06092f",
-		"101010": "101010",
-		"accd9c": "625695",
-		"739c62": "2c3071",
-		"ffffff": "ffffff",
-		"6a2000": "ee7b06",
-		"bd3920": "ffa904",
-		"737373": "737373",
-		"000000": "000000"
+	"171717": "101010",
+    "4a5a39": "06092f",
+    "4b5a3b": "06092f",
+    "727272": "727272",
+    "801c17": "ee7b06",
+    "922d00": "ee7b06",
+    "ce283d": "ffa904",
+    "d35200": "ffa904",
+    "729a62": "2c3071",
+    "739c62": "2c3071",
+    "aacb9a": "625695"	
 	}
 }
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/back/248-mega_2.json b/public/images/pokemon/variant/exp/back/248-mega_2.json
deleted file mode 100644
index 7f236a6bb87..00000000000
--- a/public/images/pokemon/variant/exp/back/248-mega_2.json
+++ /dev/null
@@ -1,272 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "248-mega_2.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 292,
-				"h": 292
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 80,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 80,
-						"h": 74
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 80,
-						"h": 74
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 80,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 80,
-						"h": 74
-					},
-					"frame": {
-						"x": 0,
-						"y": 74,
-						"w": 80,
-						"h": 74
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 79,
-						"h": 74
-					},
-					"frame": {
-						"x": 0,
-						"y": 148,
-						"w": 79,
-						"h": 74
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 79,
-						"h": 74
-					},
-					"frame": {
-						"x": 79,
-						"y": 148,
-						"w": 79,
-						"h": 74
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 79,
-						"h": 73
-					},
-					"frame": {
-						"x": 80,
-						"y": 0,
-						"w": 79,
-						"h": 73
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 79,
-						"h": 73
-					},
-					"frame": {
-						"x": 80,
-						"y": 73,
-						"w": 79,
-						"h": 73
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 75,
-						"h": 73
-					},
-					"frame": {
-						"x": 158,
-						"y": 146,
-						"w": 75,
-						"h": 73
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 75,
-						"h": 73
-					},
-					"frame": {
-						"x": 158,
-						"y": 146,
-						"w": 75,
-						"h": 73
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 75,
-						"h": 73
-					},
-					"frame": {
-						"x": 158,
-						"y": 219,
-						"w": 75,
-						"h": 73
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 75,
-						"h": 73
-					},
-					"frame": {
-						"x": 158,
-						"y": 219,
-						"w": 75,
-						"h": 73
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 1,
-						"w": 73,
-						"h": 73
-					},
-					"frame": {
-						"x": 159,
-						"y": 0,
-						"w": 73,
-						"h": 73
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 74
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 1,
-						"w": 73,
-						"h": 73
-					},
-					"frame": {
-						"x": 159,
-						"y": 73,
-						"w": 73,
-						"h": 73
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:625e35ec9f8e731e89fa37587ffb4738:07d356e18baf0312a4e8a36adb76fdd5:90df97eb431b7162252516cb937a0b9e$"
-	}
-}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/back/248-mega_2.png b/public/images/pokemon/variant/exp/back/248-mega_2.png
deleted file mode 100644
index 7971c22d8fe..00000000000
Binary files a/public/images/pokemon/variant/exp/back/248-mega_2.png and /dev/null differ
diff --git a/public/images/pokemon/variant/exp/back/362-mega.json b/public/images/pokemon/variant/exp/back/362-mega.json
index 3eddfcb3ef0..2f3d13a6944 100644
--- a/public/images/pokemon/variant/exp/back/362-mega.json
+++ b/public/images/pokemon/variant/exp/back/362-mega.json
@@ -1,28 +1,26 @@
 {
 	"1": {
-		"000000": "010101",
 		"393941": "050832",
+		"010101": "010101",
 		"2b74a8": "84073c",
-		"7b7b83": "1b205d",
-		"ffffff": "ff937b",
-		"a4deff": "f9383e",
-		"62bdee": "b7113a",
-		"e6e6f6": "a2b7e5",
-		"c5cde6": "6076c6",
+		"bbeeff": "f9383e",
+		"7dbbee": "b7113a",
+		"fefefe": "ff937b",
 		"7b7b94": "1b205d",
-		"acaccd": "2f3c84"
+		"e6e6f6": "a2b7e5",
+		"acaccd": "2f3c84",
+		"c5cde6": "6076c6"
 	},
 	"2": {
-		"000000": "010101",
 		"393941": "221315",
+		"010101": "010101",
 		"2b74a8": "0c4b3a",
-		"7b7b83": "4a282a",
-		"ffffff": "c8ff9c",
-		"a4deff": "5ce11a",
-		"62bdee": "009325",
-		"e6e6f6": "a76344",
-		"c5cde6": "7e4a3f",
+		"bbeeff": "5ce11a",
+		"7dbbee": "009325",
+		"fefefe": "c8ff9c",
 		"7b7b94": "4a282a",
-		"acaccd": "613735"
+		"e6e6f6": "a76344",
+		"acaccd": "613735",
+		"c5cde6": "7e4a3f"
 	}
 }
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/back/654.json b/public/images/pokemon/variant/exp/back/654.json
index c7524e01b9a..0f3b2bf3d4e 100644
--- a/public/images/pokemon/variant/exp/back/654.json
+++ b/public/images/pokemon/variant/exp/back/654.json
@@ -1,34 +1,38 @@
 {
 	"1": {
-		"907020": "481332",
-		"ffe060": "a85789",
-		"e0ad10": "682546",
-		"040404": "101010",
-		"803020": "471b70",
-		"f06030": "ab6ce0",
-		"bf4020": "6231a5",
-		"202020": "262626",
-		"cccccc": "c093c3",
-		"3c3c3c": "404040",
-		"fdfdfd": "e7caef",
-		"a4583e": "6231a5",
-		"414141": "404040",
-		"606060": "5c255f"
+		"101010": "101010",
+		"736028": "061530",
+		"ffd659": "b55390",
+		"ccab47": "872b59",
+		"732e17": "471b70",
+		"f26130": "ab6ce0",
+		"b34724": "6231a5",
+		"f8f8f8": "f7e4fc",
+		"737373": "5c255f",
+		"bfbfbf": "c093c3",
+		"804913": "c5b3ca",
+		"262626": "262626",
+		"404040": "404040",
+		"f8cf52": "80f37b",
+		"ffc000": "4fcb61",
+		"ff8700": "207d4e"
 	},
 	"2": {
-		"907020": "061530",
-		"ffe060": "2b5f8a",
-		"e0ad10": "173864",
-		"040404": "101010",
-		"803020": "005646",
-		"f06030": "21d170",
-		"bf4020": "0aaa77",
-		"202020": "262626",
-		"cccccc": "d4b996",
-		"3c3c3c": "404040",
-		"fdfdfd": "fff2dd",
-		"a4583e": "0aaa77",
-		"414141": "404040",
-		"606060": "75553c"
+		"101010": "101010",
+		"736028": "061530",
+		"ffd659": "2b5f8a",
+		"ccab47": "173864",
+		"732e17": "005646",
+		"f26130": "21d170",
+		"b34724": "0aaa77",
+		"f8f8f8": "fff2dd",
+		"737373": "75553c",
+		"bfbfbf": "d4b996",
+		"804913": "098794",
+		"262626": "262626",
+		"404040": "404040",
+		"f8cf52": "c858a4",
+		"ffc000": "75308e",
+		"ff8700": "521364"
 	}
 }
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/back/656.json b/public/images/pokemon/variant/exp/back/656.json
index 34b11bfab78..f41398f3154 100644
--- a/public/images/pokemon/variant/exp/back/656.json
+++ b/public/images/pokemon/variant/exp/back/656.json
@@ -1,17 +1,17 @@
 {
 	"1": {
-		"838394": "4d7dc5",
+		"848496": "4d7dc5",
 		"7bcdff": "9c75c2",
 		"62ace6": "8363af",
 		"ffffff": "b1e5ff",
 		"396a83": "362864",
 		"9c9cc5": "5385c7",
 		"cdcde6": "7eb7e8",
-		"174592": "198158",
+		"174592": "37408c",
 		"5a94cd": "7054a4"
 	},
 	"2": {
-		"838394": "cc6845",
+		"848496": "cc6845",
 		"7bcdff": "dd6155",
 		"62ace6": "c44848",
 		"ffffff": "fff4bd",
diff --git a/public/images/pokemon/variant/exp/back/664.json b/public/images/pokemon/variant/exp/back/664.json
index 65474e240f3..ae0ec9fc792 100644
--- a/public/images/pokemon/variant/exp/back/664.json
+++ b/public/images/pokemon/variant/exp/back/664.json
@@ -1,28 +1,26 @@
 {
 	"1": {
-		"797987": "9c615f",
-		"f9f8fa": "f9f8fa",
-		"000000": "000000",
-		"ffffff": "ffffff",
-		"cdcdcd": "e9c7c4",
-		"383830": "4c2855",
-		"54544e": "895a9f",
-		"727272": "a97dbb",
-		"d8a465": "838b53",
-		"f0d5b9": "a0c896",
-		"653925": "626649"
+        "101010": "101010",
+		"363636": "4c2855",
+		"4d4d4d": "9d6260",
+		"4e4e4e": "895a9f",
+		"747474": "a97dbb",
+		"855d31": "626649",
+		"9d7247": "838b53",
+		"d1bf6b": "a0c896",
+		"b3b3b3": "e9c7c4",
+		"f8f8f8": "ffffff"
 	},
 	"2": {
-		"797987": "590015",
-		"f9f8fa": "c83e4c",
-		"000000": "000000",
-		"ffffff": "c83e4c",
-		"cdcdcd": "a70d37",
-		"383830": "05312f",
-		"54544e": "377772",
-		"727272": "73bdae",
-		"d8a465": "dda476",
-		"f0d5b9": "ffe0ba",
-		"653925": "bf8961"
+		"101010": "101010",
+		"363636": "05312f",
+		"4d4d4d": "590015",
+		"4e4e4e": "377772",
+		"747474": "73bdae",
+		"855d31": "bf8961",
+		"9d7247": "dda476",
+		"d1bf6b": "ffe0ba",
+		"b3b3b3": "a70d37",
+		"f8f8f8": "c83e4c"	
 	}
 }
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/back/665.json b/public/images/pokemon/variant/exp/back/665.json
index 876adeed0ea..c5defbab5b7 100644
--- a/public/images/pokemon/variant/exp/back/665.json
+++ b/public/images/pokemon/variant/exp/back/665.json
@@ -1,16 +1,30 @@
 {
+	"1": {
+		"363636": "363636",
+		"d1bf6b": "a0c896",
+		"8c8c8c": "895a9f",
+		"bfbfbf": "a97dbb",
+		"9d7247": "838b53",
+		"101010": "101010",
+		"4d4d4d": "9c615f",
+		"b3b3b3": "e9c7c4",
+		"f8f8f8": "ffffff",
+		"802626": "005361",
+		"ff4c4c": "00aacd",
+		"eed83e": "cae2c3"
+	},
 	"2": {
-		"8e5136": "bf8961",
-		"838392": "590015",
-		"d8a465": "dda476",
-		"f0d5b9": "ffe0ba",
-		"cdcdcd": "a70d37",
-		"52524b": "360000",
-		"653925": "bf8961",
-		"000000": "000000",
-		"f9f8fa": "c83e4c",
-		"94416a": "004270",
-		"ee5a62": "0092dd",
-		"6a6a6a": "590015"
+		"363636": "360000",
+		"d1bf6b": "ffe0ba",
+		"8c8c8c": "590015",
+		"bfbfbf": "a70d37",
+		"9d7247": "dda476",
+		"101010": "101010",
+		"4d4d4d": "590015",
+		"b3b3b3": "a70d37",
+		"f8f8f8": "c83e4c",
+		"802626": "004270",
+		"ff4c4c": "0092dd",
+		"eed83e": "ffe0ba"
 	}
 }
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/back/666-archipelago.json b/public/images/pokemon/variant/exp/back/666-archipelago.json
new file mode 100644
index 00000000000..6386464b74e
--- /dev/null
+++ b/public/images/pokemon/variant/exp/back/666-archipelago.json
@@ -0,0 +1,35 @@
+{
+    "1": { 
+        "101010": "101010",
+        "303030": "402746",
+        "675220": "958c8a",
+        "504a4a": "7f6991",
+        "595959": "724b7a",
+        "707068": "a97cbc",
+        "c8373c": "c8373c",
+        "a2523b": "a2523b",
+        "c27351": "c27351",
+        "30c171": "30c171",
+        "b28e67": "b28e67",
+        "ceab62": "d9edd4",
+        "d2bf96": "d2bf96",
+        "c3c3c3": "c3c3c3"
+    },
+    "2": {
+        "101010": "101010",
+        "303030": "642703",
+        "675220": "741300",
+        "504a4a": "741300",
+        "595959": "824719",
+        "707068": "a22414",
+        "c8373c": "c8373c",
+        "a2523b": "a2523b",
+        "c27351": "c27351",
+        "30c171": "30c171",
+        "b28e67": "b28e67",
+        "ceab62": "a22414",
+        "d2bf96": "d2bf96",
+        "c3c3c3": "e7caa5"
+    
+    }
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/back/666-archipelago_2.json b/public/images/pokemon/variant/exp/back/666-archipelago_2.json
deleted file mode 100644
index 8c6fd7bcb91..00000000000
--- a/public/images/pokemon/variant/exp/back/666-archipelago_2.json
+++ /dev/null
@@ -1,104 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "666-archipelago_2.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 136,
-				"h": 136
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 16,
-						"y": 1,
-						"w": 42,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 42,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 16,
-						"y": 1,
-						"w": 42,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 42,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 42,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 42,
-						"y": 68,
-						"w": 67,
-						"h": 68
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:223e2a75aa192f3fb67e18f7f0d6c4c7:ba854fe0d08f005e9aa52e55cdc7eb4e:80cdb6dd219378a41ccf5c2acc7e7786$"
-	}
-}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/back/666-archipelago_2.png b/public/images/pokemon/variant/exp/back/666-archipelago_2.png
deleted file mode 100644
index 86e17e33f11..00000000000
Binary files a/public/images/pokemon/variant/exp/back/666-archipelago_2.png and /dev/null differ
diff --git a/public/images/pokemon/variant/exp/back/666-archipelago_3.json b/public/images/pokemon/variant/exp/back/666-archipelago_3.json
deleted file mode 100644
index 3f9c86ecd75..00000000000
--- a/public/images/pokemon/variant/exp/back/666-archipelago_3.json
+++ /dev/null
@@ -1,104 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "666-archipelago_3.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 136,
-				"h": 136
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 16,
-						"y": 1,
-						"w": 42,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 42,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 16,
-						"y": 1,
-						"w": 42,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 42,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 42,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 42,
-						"y": 68,
-						"w": 67,
-						"h": 68
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:223e2a75aa192f3fb67e18f7f0d6c4c7:ba854fe0d08f005e9aa52e55cdc7eb4e:80cdb6dd219378a41ccf5c2acc7e7786$"
-	}
-}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/back/666-archipelago_3.png b/public/images/pokemon/variant/exp/back/666-archipelago_3.png
deleted file mode 100644
index 7028f550d45..00000000000
Binary files a/public/images/pokemon/variant/exp/back/666-archipelago_3.png and /dev/null differ
diff --git a/public/images/pokemon/variant/exp/back/666-continental.json b/public/images/pokemon/variant/exp/back/666-continental.json
new file mode 100644
index 00000000000..92614fb346c
--- /dev/null
+++ b/public/images/pokemon/variant/exp/back/666-continental.json
@@ -0,0 +1,38 @@
+{
+	"1": {
+		"101010": "101010",
+		"595959": "724b7a",
+		"555353": "724b7a",
+		"d18257": "d18257",
+		"f9bd55": "f9bd55",
+		"303030": "402746",
+		"f8f05e": "f8f05e",
+		"d24c3e": "d24c3e",
+		"675220": "958c8a",
+		"ceab62": "d9edd4",
+		"707068": "a97cbc",
+		"504a4a": "7f6991",
+		"aa5844": "aa5844",
+		"c3c3c3": "ffeaff",
+		"811c1c": "811c1c",
+		"e08528": "e08528"
+	},
+	"2": {
+		"101010": "101010",
+		"595959": "8f551e",
+		"555353": "e99b44",
+		"d18257": "d18257",
+		"f9bd55": "f9bd55",
+		"303030": "6d2d0d",
+		"f8f05e": "f8f05e",
+		"d24c3e": "d24c3e",
+		"675220": "9c5c19",
+		"ceab62": "e99b44",
+		"707068": "e99b44",
+		"504a4a": "9c5c19",
+		"aa5844": "aa5844",
+		"c3c3c3": "f8f27f",
+		"811c1c": "811c1c",
+		"308528": "308528"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/back/666-continental_2.json b/public/images/pokemon/variant/exp/back/666-continental_2.json
deleted file mode 100644
index 371e157ff8a..00000000000
--- a/public/images/pokemon/variant/exp/back/666-continental_2.json
+++ /dev/null
@@ -1,104 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "666-continental_2.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 136,
-				"h": 136
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 13,
-						"y": 1,
-						"w": 46,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 46,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 13,
-						"y": 1,
-						"w": 46,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 46,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 46,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 46,
-						"y": 68,
-						"w": 67,
-						"h": 68
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:89725e18f2e4d97217076ac82b40230b:c83c3d03ad1200fc71d95ecafb54bc03:23aaac2256d564b9d8a58d7de70397c3$"
-	}
-}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/back/666-continental_2.png b/public/images/pokemon/variant/exp/back/666-continental_2.png
deleted file mode 100644
index 3b9a31469af..00000000000
Binary files a/public/images/pokemon/variant/exp/back/666-continental_2.png and /dev/null differ
diff --git a/public/images/pokemon/variant/exp/back/666-continental_3.json b/public/images/pokemon/variant/exp/back/666-continental_3.json
deleted file mode 100644
index ec9c98e6312..00000000000
--- a/public/images/pokemon/variant/exp/back/666-continental_3.json
+++ /dev/null
@@ -1,104 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "666-continental_3.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 136,
-				"h": 136
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 13,
-						"y": 1,
-						"w": 46,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 46,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 13,
-						"y": 1,
-						"w": 46,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 46,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 46,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 46,
-						"y": 68,
-						"w": 67,
-						"h": 68
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:89725e18f2e4d97217076ac82b40230b:c83c3d03ad1200fc71d95ecafb54bc03:23aaac2256d564b9d8a58d7de70397c3$"
-	}
-}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/back/666-continental_3.png b/public/images/pokemon/variant/exp/back/666-continental_3.png
deleted file mode 100644
index b61b16538eb..00000000000
Binary files a/public/images/pokemon/variant/exp/back/666-continental_3.png and /dev/null differ
diff --git a/public/images/pokemon/variant/exp/back/666-elegant.json b/public/images/pokemon/variant/exp/back/666-elegant.json
new file mode 100644
index 00000000000..1b7b9838005
--- /dev/null
+++ b/public/images/pokemon/variant/exp/back/666-elegant.json
@@ -0,0 +1,34 @@
+{
+    "1": {
+        "101010": "101010",
+        "303030": "402746",
+        "675220": "958c8a",
+        "504a4a": "7f6991",
+        "595959": "724b7a",
+        "707068": "a97cbc",
+        "de4040": "de4040",
+        "f8de3f": "f8de3f",
+        "ceab62": "d9edd4",
+        "56479d": "56479d",
+        "875fb5": "875fb5",
+        "cf7ef3": "cf7ef3",
+        "c3c3c3": "c3c3c3",
+        "e6ddf8": "e6ddf8"
+    },
+    "2": {
+        "101010": "101010",
+        "303030": "351262",
+        "675220": "7d1083",
+        "504a4a": "7d1083",
+        "595959": "612776",
+        "707068": "a73fab",
+        "de4040": "de4040",
+        "f8de3f": "f8de3f",
+        "ceab62": "a73fab",
+        "56479d": "56479d",
+        "875fb5": "875fb5",
+        "cf7ef3": "cf7ef3",
+        "c3c3c3": "f0ecff",
+        "e6ddf8": "e6ddf8"
+    }
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/back/666-elegant_2.json b/public/images/pokemon/variant/exp/back/666-elegant_2.json
deleted file mode 100644
index 0894ba3672b..00000000000
--- a/public/images/pokemon/variant/exp/back/666-elegant_2.json
+++ /dev/null
@@ -1,104 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "666-elegant_2.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 136,
-				"h": 136
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 15,
-						"y": 1,
-						"w": 44,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 44,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 15,
-						"y": 1,
-						"w": 44,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 44,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 44,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 44,
-						"y": 68,
-						"w": 67,
-						"h": 68
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:bbba66d69955866664e782205a4af88d:66e99814147be780756a4d4ccd8b31dc:d6b035048c66474f6236a3bc923faa7b$"
-	}
-}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/back/666-elegant_2.png b/public/images/pokemon/variant/exp/back/666-elegant_2.png
deleted file mode 100644
index 315b2fe859d..00000000000
Binary files a/public/images/pokemon/variant/exp/back/666-elegant_2.png and /dev/null differ
diff --git a/public/images/pokemon/variant/exp/back/666-elegant_3.json b/public/images/pokemon/variant/exp/back/666-elegant_3.json
deleted file mode 100644
index 20501609416..00000000000
--- a/public/images/pokemon/variant/exp/back/666-elegant_3.json
+++ /dev/null
@@ -1,104 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "666-elegant_3.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 136,
-				"h": 136
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 15,
-						"y": 1,
-						"w": 44,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 44,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 15,
-						"y": 1,
-						"w": 44,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 44,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 44,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 44,
-						"y": 68,
-						"w": 67,
-						"h": 68
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:bbba66d69955866664e782205a4af88d:66e99814147be780756a4d4ccd8b31dc:d6b035048c66474f6236a3bc923faa7b$"
-	}
-}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/back/666-elegant_3.png b/public/images/pokemon/variant/exp/back/666-elegant_3.png
deleted file mode 100644
index 490bbb5951c..00000000000
Binary files a/public/images/pokemon/variant/exp/back/666-elegant_3.png and /dev/null differ
diff --git a/public/images/pokemon/variant/exp/back/666-fancy.json b/public/images/pokemon/variant/exp/back/666-fancy.json
new file mode 100644
index 00000000000..5d368667ae3
--- /dev/null
+++ b/public/images/pokemon/variant/exp/back/666-fancy.json
@@ -0,0 +1,36 @@
+{
+    "1": {
+        "101010": "101010",
+        "303030": "402746",
+        "675220": "958c8a",
+        "504a4a": "7f6991",
+        "595959": "724b7a",
+        "707068": "a97cbc",
+        "de4040": "de4040",
+        "5faa3e": "5faa3e",
+        "ceab62": "d9edd4",
+        "b6d26d": "b6d26d",
+        "e9e052": "e9e052",
+        "cf7ef3": "cf7ef3",
+        "c3c3c3": "ffeaff",
+        "f2d4e3": "f2d4e3",
+        "ead2e3": "ffeaff"
+    },
+    "2": {
+        "101010": "101010",
+        "303030": "00771b",
+        "675220": "b9c05a",
+        "504a4a": "b9c05a",
+        "595959": "6f9f42",
+        "707068": "6f9f42",
+        "de4040": "de4040",
+        "5faa3e": "5faa3e",
+        "ceab62": "e3e982",
+        "b6d26d": "b6d26d",
+        "e9e052": "e9e052",
+        "cf7ef3": "cf7ef3",
+        "c3c3c3": "fcf1ff",
+        "f2d4e3": "f2d4e3",
+        "ead2e3": "fcf1ff"
+    }
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/back/666-fancy_2.json b/public/images/pokemon/variant/exp/back/666-fancy_2.json
deleted file mode 100644
index 5f8f29308d3..00000000000
--- a/public/images/pokemon/variant/exp/back/666-fancy_2.json
+++ /dev/null
@@ -1,104 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "666-fancy_2.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 137,
-				"h": 137
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 15,
-						"y": 1,
-						"w": 43,
-						"h": 69
-					},
-					"frame": {
-						"x": 67,
-						"y": 0,
-						"w": 43,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 15,
-						"y": 1,
-						"w": 43,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 68,
-						"w": 43,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 43,
-						"y": 69,
-						"w": 67,
-						"h": 68
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:570d1bf9b987c1bf5ebfe39e485464dd:a3c8bebd39c1c84b1bf0fdf600026ea5:6d5edff9a806f43feff031c9919c9aca$"
-	}
-}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/back/666-fancy_2.png b/public/images/pokemon/variant/exp/back/666-fancy_2.png
deleted file mode 100644
index a92f1e7eecf..00000000000
Binary files a/public/images/pokemon/variant/exp/back/666-fancy_2.png and /dev/null differ
diff --git a/public/images/pokemon/variant/exp/back/666-fancy_3.json b/public/images/pokemon/variant/exp/back/666-fancy_3.json
deleted file mode 100644
index c1c35bf083a..00000000000
--- a/public/images/pokemon/variant/exp/back/666-fancy_3.json
+++ /dev/null
@@ -1,104 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "666-fancy_3.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 137,
-				"h": 137
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 15,
-						"y": 1,
-						"w": 43,
-						"h": 69
-					},
-					"frame": {
-						"x": 67,
-						"y": 0,
-						"w": 43,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 15,
-						"y": 1,
-						"w": 43,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 68,
-						"w": 43,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 43,
-						"y": 69,
-						"w": 67,
-						"h": 68
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:570d1bf9b987c1bf5ebfe39e485464dd:a3c8bebd39c1c84b1bf0fdf600026ea5:6d5edff9a806f43feff031c9919c9aca$"
-	}
-}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/back/666-fancy_3.png b/public/images/pokemon/variant/exp/back/666-fancy_3.png
deleted file mode 100644
index 7a54e9bb6cd..00000000000
Binary files a/public/images/pokemon/variant/exp/back/666-fancy_3.png and /dev/null differ
diff --git a/public/images/pokemon/variant/exp/back/666-garden.json b/public/images/pokemon/variant/exp/back/666-garden.json
new file mode 100644
index 00000000000..16fec8bc537
--- /dev/null
+++ b/public/images/pokemon/variant/exp/back/666-garden.json
@@ -0,0 +1,32 @@
+{
+    "1": { 
+        "101010": "101010",
+        "303030": "402746",
+        "675220": "958c8a",
+        "504a4a": "7f6991",
+        "595959": "724b7a",
+        "707068": "a97cbc",
+        "de4040": "de4040",
+        "398351": "398351",
+        "ceab62": "d9edd4",
+        "88d254": "88d254",
+        "3f919a": "3f919a",
+        "3dba96": "3dba96",
+        "c3c3c3": "c3c3c3"
+    },
+    "2": { 
+        "101010": "101010",
+        "303030": "044553",
+        "675220": "055160",
+        "504a4a": "055160",
+        "595959": "006b55",
+        "707068": "227687",
+        "de4040": "de4040",
+        "398351": "398351",
+        "ceab62": "227687",
+        "88d254": "88d254",
+        "3f919a": "3f919a",
+        "3dba96": "3dba96",
+        "c3c3c3": "72d0a3"
+    }
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/back/666-garden_2.json b/public/images/pokemon/variant/exp/back/666-garden_2.json
deleted file mode 100644
index 1c3840b900c..00000000000
--- a/public/images/pokemon/variant/exp/back/666-garden_2.json
+++ /dev/null
@@ -1,104 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "666-garden_2.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 136,
-				"h": 136
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 16,
-						"y": 1,
-						"w": 42,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 42,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 16,
-						"y": 1,
-						"w": 42,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 42,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 42,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 42,
-						"y": 68,
-						"w": 67,
-						"h": 68
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:4b2ac69ef7a99f6cef35d3fd38c74d01:8a4c29615f3bf20e9c5d0bb372a5b210:f13a1a8fa0a411aa91fccb833ac8719c$"
-	}
-}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/back/666-garden_2.png b/public/images/pokemon/variant/exp/back/666-garden_2.png
deleted file mode 100644
index c56ff652c7d..00000000000
Binary files a/public/images/pokemon/variant/exp/back/666-garden_2.png and /dev/null differ
diff --git a/public/images/pokemon/variant/exp/back/666-garden_3.json b/public/images/pokemon/variant/exp/back/666-garden_3.json
deleted file mode 100644
index 5fbdd2097fd..00000000000
--- a/public/images/pokemon/variant/exp/back/666-garden_3.json
+++ /dev/null
@@ -1,104 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "666-garden_3.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 136,
-				"h": 136
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 16,
-						"y": 1,
-						"w": 42,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 42,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 16,
-						"y": 1,
-						"w": 42,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 42,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 42,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 42,
-						"y": 68,
-						"w": 67,
-						"h": 68
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:4b2ac69ef7a99f6cef35d3fd38c74d01:8a4c29615f3bf20e9c5d0bb372a5b210:f13a1a8fa0a411aa91fccb833ac8719c$"
-	}
-}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/back/666-garden_3.png b/public/images/pokemon/variant/exp/back/666-garden_3.png
deleted file mode 100644
index 60c7f5b7d01..00000000000
Binary files a/public/images/pokemon/variant/exp/back/666-garden_3.png and /dev/null differ
diff --git a/public/images/pokemon/variant/exp/back/666-high-plains.json b/public/images/pokemon/variant/exp/back/666-high-plains.json
new file mode 100644
index 00000000000..984055b6a24
--- /dev/null
+++ b/public/images/pokemon/variant/exp/back/666-high-plains.json
@@ -0,0 +1,38 @@
+{
+    "1": {
+        "101010": "101010",
+        "303030": "402746",
+        "675220": "958c8a",
+        "337543": "337543",
+        "504a4a": "7f6991",
+        "595959": "724b7a",
+        "7d4428": "7d4428",
+        "707068": "a97cbc",
+        "9a5a3b": "9a5a3b",
+        "aa4343": "aa4343",
+        "e1764e": "e1764e",
+        "e8c815": "e8c815",
+        "ceab62": "d9edd4",
+        "f3a861": "f3a861",
+        "c3c3c3": "c3c3c3",
+        "773d21": "773d21"
+    },
+    "2": {
+        "101010": "101010",
+        "303030": "8f1d19",
+        "675220": "c97034",
+        "337543": "337543",
+        "504a4a": "c97034",
+        "595959": "a55422",
+        "7d4428": "7d4428",
+        "707068": "f2975a",
+        "9a5a3b": "9a5a3b",
+        "aa4343": "aa4343",
+        "e1764e": "e1764e",
+        "e8c815": "e8c815",
+        "ceab62": "f2975a",
+        "f3a861": "f3a861",
+        "c3c3c3": "edc67c",
+        "773d21": "773d21"
+    }
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/back/666-high-plains_2.json b/public/images/pokemon/variant/exp/back/666-high-plains_2.json
deleted file mode 100644
index 405f2657c8a..00000000000
--- a/public/images/pokemon/variant/exp/back/666-high-plains_2.json
+++ /dev/null
@@ -1,104 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "666-high-plains_2.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 137,
-				"h": 137
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 15,
-						"y": 1,
-						"w": 43,
-						"h": 69
-					},
-					"frame": {
-						"x": 67,
-						"y": 0,
-						"w": 43,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 15,
-						"y": 1,
-						"w": 43,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 68,
-						"w": 43,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 43,
-						"y": 69,
-						"w": 67,
-						"h": 68
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:410c759185f779797422e8f2ce55db4f:6afd0d04b6138fdd57d12681e967b48c:2abdb5d19b2754e3daa24b6ff3ed2c2c$"
-	}
-}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/back/666-high-plains_2.png b/public/images/pokemon/variant/exp/back/666-high-plains_2.png
deleted file mode 100644
index d53634ed092..00000000000
Binary files a/public/images/pokemon/variant/exp/back/666-high-plains_2.png and /dev/null differ
diff --git a/public/images/pokemon/variant/exp/back/666-high-plains_3.json b/public/images/pokemon/variant/exp/back/666-high-plains_3.json
deleted file mode 100644
index 4c91b8fb5a0..00000000000
--- a/public/images/pokemon/variant/exp/back/666-high-plains_3.json
+++ /dev/null
@@ -1,104 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "666-high-plains_3.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 137,
-				"h": 137
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 15,
-						"y": 1,
-						"w": 43,
-						"h": 69
-					},
-					"frame": {
-						"x": 67,
-						"y": 0,
-						"w": 43,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 15,
-						"y": 1,
-						"w": 43,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 68,
-						"w": 43,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 43,
-						"y": 69,
-						"w": 67,
-						"h": 68
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:410c759185f779797422e8f2ce55db4f:6afd0d04b6138fdd57d12681e967b48c:2abdb5d19b2754e3daa24b6ff3ed2c2c$"
-	}
-}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/back/666-high-plains_3.png b/public/images/pokemon/variant/exp/back/666-high-plains_3.png
deleted file mode 100644
index d6c577be131..00000000000
Binary files a/public/images/pokemon/variant/exp/back/666-high-plains_3.png and /dev/null differ
diff --git a/public/images/pokemon/variant/exp/back/666-icy-snow.json b/public/images/pokemon/variant/exp/back/666-icy-snow.json
new file mode 100644
index 00000000000..ec52af1302a
--- /dev/null
+++ b/public/images/pokemon/variant/exp/back/666-icy-snow.json
@@ -0,0 +1,32 @@
+{
+    "1": {
+        "101010": "101010",
+        "303030": "402746",
+        "675220": "958c8a",
+        "504a4a": "7f6991",
+        "595959": "724b7a",
+        "707068": "a97cbc",
+        "ceab62": "d9edd4",
+        "95a1a1": "95a1a1",
+        "acacc2": "acacc2",
+        "c3c3c3": "c3c3c3",
+        "cfd9cf": "cfd9cf",
+        "c5c5da": "c5c5da",
+        "ffffff": "ffffff"
+    },
+    "2": {
+        "101010": "101010",
+        "303030": "364051",
+        "675220": "666b7d",
+        "504a4a": "666b7d",
+        "595959": "60646a",
+        "707068": "8c91a4",
+        "ceab62": "8c91a4",
+        "95a1a1": "95a1a1",
+        "acacc2": "acacc2",
+        "c3c3c3": "c3c3c3",
+        "cfd9cf": "cfd9cf",
+        "c5c5da": "c5c5da",
+        "ffffff": "ffffff"
+    }
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/back/666-icy-snow_2.json b/public/images/pokemon/variant/exp/back/666-icy-snow_2.json
deleted file mode 100644
index a456b34be45..00000000000
--- a/public/images/pokemon/variant/exp/back/666-icy-snow_2.json
+++ /dev/null
@@ -1,104 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "666-icy-snow_2.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 136,
-				"h": 136
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 16,
-						"y": 1,
-						"w": 43,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 43,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 16,
-						"y": 1,
-						"w": 43,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 43,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 43,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 43,
-						"y": 68,
-						"w": 67,
-						"h": 68
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:9f47e6de00b727163c2ffb6870af9c6b:16bfd68007c3798294c7d690e075f679:fb1e8b97806dc5c60ac6adf0ae48199b$"
-	}
-}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/back/666-icy-snow_2.png b/public/images/pokemon/variant/exp/back/666-icy-snow_2.png
deleted file mode 100644
index 02e7e2e61af..00000000000
Binary files a/public/images/pokemon/variant/exp/back/666-icy-snow_2.png and /dev/null differ
diff --git a/public/images/pokemon/variant/exp/back/666-icy-snow_3.json b/public/images/pokemon/variant/exp/back/666-icy-snow_3.json
deleted file mode 100644
index c1b2ff5791d..00000000000
--- a/public/images/pokemon/variant/exp/back/666-icy-snow_3.json
+++ /dev/null
@@ -1,104 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "666-icy-snow_3.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 136,
-				"h": 136
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 16,
-						"y": 1,
-						"w": 43,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 43,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 16,
-						"y": 1,
-						"w": 43,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 43,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 43,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 43,
-						"y": 68,
-						"w": 67,
-						"h": 68
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:9f47e6de00b727163c2ffb6870af9c6b:16bfd68007c3798294c7d690e075f679:fb1e8b97806dc5c60ac6adf0ae48199b$"
-	}
-}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/back/666-icy-snow_3.png b/public/images/pokemon/variant/exp/back/666-icy-snow_3.png
deleted file mode 100644
index 3c247e0d43a..00000000000
Binary files a/public/images/pokemon/variant/exp/back/666-icy-snow_3.png and /dev/null differ
diff --git a/public/images/pokemon/variant/exp/back/666-jungle.json b/public/images/pokemon/variant/exp/back/666-jungle.json
new file mode 100644
index 00000000000..63b998e284e
--- /dev/null
+++ b/public/images/pokemon/variant/exp/back/666-jungle.json
@@ -0,0 +1,34 @@
+{
+    "1": {
+        "101010": "101010",
+        "303030": "402746",
+        "724e28": "724e28",
+        "675220": "958c8a",
+        "504a4a": "7f6991",
+        "595959": "724b7a",
+        "567456": "567456",
+        "707068": "a97cbc",
+        "9a653e": "9a653e",
+        "638c63": "638c63",
+        "c29566": "c29566",
+        "ceab62": "d9edd4",
+        "7cc48b": "7cc48b",
+        "c3c3c3": "c3c3c3"
+    },
+    "2": {
+        "101010": "101010",
+        "303030": "20452e",
+        "724e28": "724e28",
+        "675220": "153922",
+        "504a4a": "153922",
+        "595959": "285b3b",
+        "567456": "567456",
+        "707068": "385c43",
+        "9a653e": "9a653e",
+        "638c63": "638c63",
+        "c29566": "c29566",
+        "ceab62": "385c43",
+        "7cc48b": "7cc48b",
+        "c3c3c3": "a9d9a0"
+    }
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/back/666-jungle_2.json b/public/images/pokemon/variant/exp/back/666-jungle_2.json
deleted file mode 100644
index e941cffbb5e..00000000000
--- a/public/images/pokemon/variant/exp/back/666-jungle_2.json
+++ /dev/null
@@ -1,104 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "666-jungle_2.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 137,
-				"h": 137
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 16,
-						"y": 1,
-						"w": 43,
-						"h": 69
-					},
-					"frame": {
-						"x": 67,
-						"y": 0,
-						"w": 43,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 16,
-						"y": 1,
-						"w": 43,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 68,
-						"w": 43,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 43,
-						"y": 69,
-						"w": 67,
-						"h": 68
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:4d8913bd65ce0b63c5354717532a7d60:39392afb8d9fb30f37b8d68b6cd368ad:c8686bcc5493911384853d54c85bfea1$"
-	}
-}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/back/666-jungle_2.png b/public/images/pokemon/variant/exp/back/666-jungle_2.png
deleted file mode 100644
index d6023a6500f..00000000000
Binary files a/public/images/pokemon/variant/exp/back/666-jungle_2.png and /dev/null differ
diff --git a/public/images/pokemon/variant/exp/back/666-jungle_3.json b/public/images/pokemon/variant/exp/back/666-jungle_3.json
deleted file mode 100644
index 8bbc5571373..00000000000
--- a/public/images/pokemon/variant/exp/back/666-jungle_3.json
+++ /dev/null
@@ -1,104 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "666-jungle_3.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 137,
-				"h": 137
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 16,
-						"y": 1,
-						"w": 43,
-						"h": 69
-					},
-					"frame": {
-						"x": 67,
-						"y": 0,
-						"w": 43,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 16,
-						"y": 1,
-						"w": 43,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 68,
-						"w": 43,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 43,
-						"y": 69,
-						"w": 67,
-						"h": 68
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:4d8913bd65ce0b63c5354717532a7d60:39392afb8d9fb30f37b8d68b6cd368ad:c8686bcc5493911384853d54c85bfea1$"
-	}
-}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/back/666-jungle_3.png b/public/images/pokemon/variant/exp/back/666-jungle_3.png
deleted file mode 100644
index 0f4ca358601..00000000000
Binary files a/public/images/pokemon/variant/exp/back/666-jungle_3.png and /dev/null differ
diff --git a/public/images/pokemon/variant/exp/back/666-marine.json b/public/images/pokemon/variant/exp/back/666-marine.json
new file mode 100644
index 00000000000..0bae2c2067e
--- /dev/null
+++ b/public/images/pokemon/variant/exp/back/666-marine.json
@@ -0,0 +1,32 @@
+{
+    "1": {
+        "101010": "101010",
+        "303030": "402746",
+        "675220": "958c8a",
+        "504a4a": "7f6991",
+        "595959": "724b7a",
+        "707068": "a97cbc",
+        "ceab62": "d9edd4",
+        "315382": "315382",
+        "367cb9": "367cb9",
+        "2f8dc9": "2f8dc9",
+        "5acdf1": "5acdf1",
+        "c3c3c3": "c3c3c3",
+        "f2f2f2": "f2f2f2"
+    },
+    "2": {
+        "101010": "101010",
+        "303030": "16244f",
+        "675220": "264c85",
+        "504a4a": "264c85",
+        "595959": "2a5894",
+        "707068": "3070af",
+        "ceab62": "3070af",
+        "315382": "315382",
+        "367cb9": "367cb9",
+        "2f8dc9": "2f8dc9",
+        "5acdf1": "5acdf1",
+        "c3c3c3": "3070af",
+        "f2f2f2": "f2f2f2"
+    }
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/back/666-marine_2.json b/public/images/pokemon/variant/exp/back/666-marine_2.json
deleted file mode 100644
index 7f85f0176f9..00000000000
--- a/public/images/pokemon/variant/exp/back/666-marine_2.json
+++ /dev/null
@@ -1,104 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "666-marine_2.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 136,
-				"h": 136
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 16,
-						"y": 1,
-						"w": 42,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 42,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 16,
-						"y": 1,
-						"w": 42,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 42,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 42,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 42,
-						"y": 68,
-						"w": 67,
-						"h": 68
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:b061fec5d665439da49159647e0a7d71:7cac8aa51d4531fbcf0f9ea9bf644452:dc240f0acbf3d56fe8729dd1f703009f$"
-	}
-}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/back/666-marine_2.png b/public/images/pokemon/variant/exp/back/666-marine_2.png
deleted file mode 100644
index ffa21823012..00000000000
Binary files a/public/images/pokemon/variant/exp/back/666-marine_2.png and /dev/null differ
diff --git a/public/images/pokemon/variant/exp/back/666-marine_3.json b/public/images/pokemon/variant/exp/back/666-marine_3.json
deleted file mode 100644
index f61b5ed14a9..00000000000
--- a/public/images/pokemon/variant/exp/back/666-marine_3.json
+++ /dev/null
@@ -1,104 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "666-marine_3.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 136,
-				"h": 136
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 16,
-						"y": 1,
-						"w": 42,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 42,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 16,
-						"y": 1,
-						"w": 42,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 42,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 42,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 42,
-						"y": 68,
-						"w": 67,
-						"h": 68
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:b061fec5d665439da49159647e0a7d71:7cac8aa51d4531fbcf0f9ea9bf644452:dc240f0acbf3d56fe8729dd1f703009f$"
-	}
-}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/back/666-marine_3.png b/public/images/pokemon/variant/exp/back/666-marine_3.png
deleted file mode 100644
index ee4c51543ee..00000000000
Binary files a/public/images/pokemon/variant/exp/back/666-marine_3.png and /dev/null differ
diff --git a/public/images/pokemon/variant/exp/back/666-meadow.json b/public/images/pokemon/variant/exp/back/666-meadow.json
new file mode 100644
index 00000000000..4f567cb29ee
--- /dev/null
+++ b/public/images/pokemon/variant/exp/back/666-meadow.json
@@ -0,0 +1,34 @@
+{
+    "1": { 
+        "101010": "101010",
+        "f2f2f2": "f2f2f2",
+        "303030": "402746",
+        "504a4a": "7f6991",
+        "595959": "724b7a",
+        "c3c3c3": "c3c3c3",
+        "707068": "a97cbc",
+        "675220": "958c8a",
+        "ceab62": "d9edd4",
+        "2d9b9b": "2d9b9b",
+        "e66fad": "e66fad",
+        "b4295a": "b4295a",
+        "f3a0ca": "f3a0ca",
+        "da6b7e": "da6b7e"
+    },
+    "2": {
+        "101010": "101010",
+        "f2f2f2": "f2f2f2",
+        "303030": "770921",
+        "504a4a": "a2275e",
+        "595959": "9e3941",
+        "c3c3c3": "f4c2ec",
+        "707068": "ce5283",
+        "675220": "a2275e",
+        "ceab62": "ce5283",
+        "2d9b9b": "2d9b9b",
+        "e66fad": "e66fad",
+        "b4295a": "b4295a",
+        "f3a0ca": "f3a0ca",
+        "da6b7e": "da6b7e"
+    }
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/back/666-meadow_2.json b/public/images/pokemon/variant/exp/back/666-meadow_2.json
deleted file mode 100644
index 7c2cbd58134..00000000000
--- a/public/images/pokemon/variant/exp/back/666-meadow_2.json
+++ /dev/null
@@ -1,524 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "666-meadow_2.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 234,
-				"h": 234
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 78,
-						"h": 87
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 78,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 78,
-						"h": 87
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 78,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 78,
-						"h": 87
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 78,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 78,
-						"h": 87
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 78,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 3,
-						"w": 70,
-						"h": 87
-					},
-					"frame": {
-						"x": 0,
-						"y": 87,
-						"w": 70,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 3,
-						"w": 70,
-						"h": 87
-					},
-					"frame": {
-						"x": 0,
-						"y": 87,
-						"w": 70,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 3,
-						"w": 70,
-						"h": 87
-					},
-					"frame": {
-						"x": 0,
-						"y": 87,
-						"w": 70,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 3,
-						"w": 70,
-						"h": 87
-					},
-					"frame": {
-						"x": 0,
-						"y": 87,
-						"w": 70,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 11,
-						"y": 2,
-						"w": 63,
-						"h": 87
-					},
-					"frame": {
-						"x": 70,
-						"y": 87,
-						"w": 63,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 11,
-						"y": 2,
-						"w": 63,
-						"h": 87
-					},
-					"frame": {
-						"x": 70,
-						"y": 87,
-						"w": 63,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 11,
-						"y": 2,
-						"w": 63,
-						"h": 87
-					},
-					"frame": {
-						"x": 70,
-						"y": 87,
-						"w": 63,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 11,
-						"y": 2,
-						"w": 63,
-						"h": 87
-					},
-					"frame": {
-						"x": 70,
-						"y": 87,
-						"w": 63,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 14,
-						"y": 1,
-						"w": 57,
-						"h": 87
-					},
-					"frame": {
-						"x": 78,
-						"y": 0,
-						"w": 57,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 14,
-						"y": 1,
-						"w": 57,
-						"h": 87
-					},
-					"frame": {
-						"x": 78,
-						"y": 0,
-						"w": 57,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 14,
-						"y": 1,
-						"w": 57,
-						"h": 87
-					},
-					"frame": {
-						"x": 78,
-						"y": 0,
-						"w": 57,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 14,
-						"y": 1,
-						"w": 57,
-						"h": 87
-					},
-					"frame": {
-						"x": 78,
-						"y": 0,
-						"w": 57,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 84,
-						"h": 86
-					},
-					"frame": {
-						"x": 135,
-						"y": 0,
-						"w": 84,
-						"h": 86
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 84,
-						"h": 86
-					},
-					"frame": {
-						"x": 135,
-						"y": 0,
-						"w": 84,
-						"h": 86
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 17,
-						"y": 0,
-						"w": 52,
-						"h": 87
-					},
-					"frame": {
-						"x": 135,
-						"y": 86,
-						"w": 52,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 17,
-						"y": 0,
-						"w": 52,
-						"h": 87
-					},
-					"frame": {
-						"x": 135,
-						"y": 86,
-						"w": 52,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 17,
-						"y": 0,
-						"w": 52,
-						"h": 87
-					},
-					"frame": {
-						"x": 135,
-						"y": 86,
-						"w": 52,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 17,
-						"y": 0,
-						"w": 52,
-						"h": 87
-					},
-					"frame": {
-						"x": 135,
-						"y": 86,
-						"w": 52,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 20,
-						"y": 0,
-						"w": 47,
-						"h": 85
-					},
-					"frame": {
-						"x": 187,
-						"y": 86,
-						"w": 47,
-						"h": 85
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 20,
-						"y": 0,
-						"w": 47,
-						"h": 85
-					},
-					"frame": {
-						"x": 187,
-						"y": 86,
-						"w": 47,
-						"h": 85
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:49698fe6f96ff24d2fe1c7a365f79f1b:f15ccef05dfd7ebb03ac6c66ae05dcef:f8ac4807b4d6eef2256fa1b93e0f89ba$"
-	}
-}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/back/666-meadow_2.png b/public/images/pokemon/variant/exp/back/666-meadow_2.png
deleted file mode 100644
index bb54cac34cd..00000000000
Binary files a/public/images/pokemon/variant/exp/back/666-meadow_2.png and /dev/null differ
diff --git a/public/images/pokemon/variant/exp/back/666-meadow_3.json b/public/images/pokemon/variant/exp/back/666-meadow_3.json
deleted file mode 100644
index 6dcce66c44e..00000000000
--- a/public/images/pokemon/variant/exp/back/666-meadow_3.json
+++ /dev/null
@@ -1,524 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "666-meadow_3.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 234,
-				"h": 234
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 78,
-						"h": 87
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 78,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 78,
-						"h": 87
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 78,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 78,
-						"h": 87
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 78,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 4,
-						"w": 78,
-						"h": 87
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 78,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 3,
-						"w": 70,
-						"h": 87
-					},
-					"frame": {
-						"x": 0,
-						"y": 87,
-						"w": 70,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 3,
-						"w": 70,
-						"h": 87
-					},
-					"frame": {
-						"x": 0,
-						"y": 87,
-						"w": 70,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 3,
-						"w": 70,
-						"h": 87
-					},
-					"frame": {
-						"x": 0,
-						"y": 87,
-						"w": 70,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 3,
-						"w": 70,
-						"h": 87
-					},
-					"frame": {
-						"x": 0,
-						"y": 87,
-						"w": 70,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 11,
-						"y": 2,
-						"w": 63,
-						"h": 87
-					},
-					"frame": {
-						"x": 70,
-						"y": 87,
-						"w": 63,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 11,
-						"y": 2,
-						"w": 63,
-						"h": 87
-					},
-					"frame": {
-						"x": 70,
-						"y": 87,
-						"w": 63,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 11,
-						"y": 2,
-						"w": 63,
-						"h": 87
-					},
-					"frame": {
-						"x": 70,
-						"y": 87,
-						"w": 63,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 11,
-						"y": 2,
-						"w": 63,
-						"h": 87
-					},
-					"frame": {
-						"x": 70,
-						"y": 87,
-						"w": 63,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 14,
-						"y": 1,
-						"w": 57,
-						"h": 87
-					},
-					"frame": {
-						"x": 78,
-						"y": 0,
-						"w": 57,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 14,
-						"y": 1,
-						"w": 57,
-						"h": 87
-					},
-					"frame": {
-						"x": 78,
-						"y": 0,
-						"w": 57,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 14,
-						"y": 1,
-						"w": 57,
-						"h": 87
-					},
-					"frame": {
-						"x": 78,
-						"y": 0,
-						"w": 57,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 14,
-						"y": 1,
-						"w": 57,
-						"h": 87
-					},
-					"frame": {
-						"x": 78,
-						"y": 0,
-						"w": 57,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 84,
-						"h": 86
-					},
-					"frame": {
-						"x": 135,
-						"y": 0,
-						"w": 84,
-						"h": 86
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 84,
-						"h": 86
-					},
-					"frame": {
-						"x": 135,
-						"y": 0,
-						"w": 84,
-						"h": 86
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 17,
-						"y": 0,
-						"w": 52,
-						"h": 87
-					},
-					"frame": {
-						"x": 135,
-						"y": 86,
-						"w": 52,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 17,
-						"y": 0,
-						"w": 52,
-						"h": 87
-					},
-					"frame": {
-						"x": 135,
-						"y": 86,
-						"w": 52,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 17,
-						"y": 0,
-						"w": 52,
-						"h": 87
-					},
-					"frame": {
-						"x": 135,
-						"y": 86,
-						"w": 52,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 17,
-						"y": 0,
-						"w": 52,
-						"h": 87
-					},
-					"frame": {
-						"x": 135,
-						"y": 86,
-						"w": 52,
-						"h": 87
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 20,
-						"y": 0,
-						"w": 47,
-						"h": 85
-					},
-					"frame": {
-						"x": 187,
-						"y": 86,
-						"w": 47,
-						"h": 85
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 84,
-						"h": 91
-					},
-					"spriteSourceSize": {
-						"x": 20,
-						"y": 0,
-						"w": 47,
-						"h": 85
-					},
-					"frame": {
-						"x": 187,
-						"y": 86,
-						"w": 47,
-						"h": 85
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:49698fe6f96ff24d2fe1c7a365f79f1b:f15ccef05dfd7ebb03ac6c66ae05dcef:f8ac4807b4d6eef2256fa1b93e0f89ba$"
-	}
-}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/back/666-meadow_3.png b/public/images/pokemon/variant/exp/back/666-meadow_3.png
deleted file mode 100644
index 865e404c1cd..00000000000
Binary files a/public/images/pokemon/variant/exp/back/666-meadow_3.png and /dev/null differ
diff --git a/public/images/pokemon/variant/exp/back/666-modern.json b/public/images/pokemon/variant/exp/back/666-modern.json
new file mode 100644
index 00000000000..5572a58bfa9
--- /dev/null
+++ b/public/images/pokemon/variant/exp/back/666-modern.json
@@ -0,0 +1,32 @@
+{
+    "1": {
+        "101010": "101010",
+        "303030": "402746",
+        "675220": "958c8a",
+        "504a4a": "7f6991",
+        "595959": "724b7a",
+        "707068": "a97cbc",
+        "b83c3c": "b83c3c",
+        "f44f4f": "f44f4f",
+        "ceab62": "d9edd4",
+        "3b6cbb": "3b6cbb",
+        "405793": "405793",
+        "c3c3c3": "c3c3c3",
+        "cfc5d9": "cfc5d9"
+    },
+    "2":{
+        "101010": "101010",
+        "303030": "4e0000",
+        "675220": "801521",
+        "504a4a": "801521",
+        "595959": "830012",
+        "707068": "ad2640",
+        "b83c3c": "b83c3c",
+        "f44f4f": "f44f4f",
+        "ceab62": "ad2640",
+        "3b6cbb": "3b6cbb",
+        "405793": "405793",
+        "c3c3c3": "ffeae8",
+        "cfc5d9": "cfc5d9"
+    }
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/back/666-modern_2.json b/public/images/pokemon/variant/exp/back/666-modern_2.json
deleted file mode 100644
index 4b0ef1a8a59..00000000000
--- a/public/images/pokemon/variant/exp/back/666-modern_2.json
+++ /dev/null
@@ -1,104 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "666-modern_2.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 136,
-				"h": 136
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 16,
-						"y": 1,
-						"w": 42,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 42,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 16,
-						"y": 1,
-						"w": 42,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 42,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 42,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 42,
-						"y": 68,
-						"w": 67,
-						"h": 68
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:deb5b8b4295c15b4c8718bf2ed9791d1:bbe309a34a59a4e2f74eeba5769476f4:5fc0e8f9a0750c2f3cfb5d6e7eca0d45$"
-	}
-}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/back/666-modern_2.png b/public/images/pokemon/variant/exp/back/666-modern_2.png
deleted file mode 100644
index 4cd5d770881..00000000000
Binary files a/public/images/pokemon/variant/exp/back/666-modern_2.png and /dev/null differ
diff --git a/public/images/pokemon/variant/exp/back/666-modern_3.json b/public/images/pokemon/variant/exp/back/666-modern_3.json
deleted file mode 100644
index 78c496fc208..00000000000
--- a/public/images/pokemon/variant/exp/back/666-modern_3.json
+++ /dev/null
@@ -1,104 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "666-modern_3.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 136,
-				"h": 136
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 16,
-						"y": 1,
-						"w": 42,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 42,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 16,
-						"y": 1,
-						"w": 42,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 42,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 42,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 42,
-						"y": 68,
-						"w": 67,
-						"h": 68
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:deb5b8b4295c15b4c8718bf2ed9791d1:bbe309a34a59a4e2f74eeba5769476f4:5fc0e8f9a0750c2f3cfb5d6e7eca0d45$"
-	}
-}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/back/666-modern_3.png b/public/images/pokemon/variant/exp/back/666-modern_3.png
deleted file mode 100644
index 5795174404f..00000000000
Binary files a/public/images/pokemon/variant/exp/back/666-modern_3.png and /dev/null differ
diff --git a/public/images/pokemon/variant/exp/back/666-monsoon.json b/public/images/pokemon/variant/exp/back/666-monsoon.json
new file mode 100644
index 00000000000..915d471b2b1
--- /dev/null
+++ b/public/images/pokemon/variant/exp/back/666-monsoon.json
@@ -0,0 +1,33 @@
+{
+    "1": {
+        "101010": "101010",
+        "303030": "402746",
+        "675220": "958c8a",
+        "504a4a": "7f6991",
+        "595959": "724b7a",
+        "707068": "a97cbc",
+		"807676": "807676",
+        "ceab62": "d9edd4",
+		"5676de": "5676de",
+        "4eccd6": "4eccd6",
+        "989898": "989898",
+        "c3c3c3": "c3c3c3",
+        "f0f0f8": "f0f0f8"
+    },
+    "2": {
+        "101010": "101010",
+        "303030": "3d3231",
+        "675220": "2c3593",
+        "504a4a": "2c3593",
+        "595959": "4f4645",
+        "707068": "5857bc",
+        "807676": "807676",
+        "ceab62": "5857bc",
+        "5676de": "5676de",
+        "4eccd6": "4eccd6",
+        "989898": "989898",
+        "92f4f4": "92f4f4",
+        "c3c3c3": "b8f9f9",
+        "f0f0f8": "f0f0f8"
+    }
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/back/666-monsoon_2.json b/public/images/pokemon/variant/exp/back/666-monsoon_2.json
deleted file mode 100644
index 344344ec0b2..00000000000
--- a/public/images/pokemon/variant/exp/back/666-monsoon_2.json
+++ /dev/null
@@ -1,104 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "666-monsoon_2.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 137,
-				"h": 137
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 16,
-						"y": 1,
-						"w": 42,
-						"h": 69
-					},
-					"frame": {
-						"x": 67,
-						"y": 0,
-						"w": 42,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 16,
-						"y": 1,
-						"w": 42,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 68,
-						"w": 42,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 42,
-						"y": 69,
-						"w": 67,
-						"h": 68
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:71a24b11bc54be921b67b4376d798e05:f5358aac113e1f7af7eddf984d9692b3:637bea52b465abfb8e5a576310b4dacc$"
-	}
-}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/back/666-monsoon_2.png b/public/images/pokemon/variant/exp/back/666-monsoon_2.png
deleted file mode 100644
index 8f091f4d1de..00000000000
Binary files a/public/images/pokemon/variant/exp/back/666-monsoon_2.png and /dev/null differ
diff --git a/public/images/pokemon/variant/exp/back/666-monsoon_3.json b/public/images/pokemon/variant/exp/back/666-monsoon_3.json
deleted file mode 100644
index 4f7304f6c0c..00000000000
--- a/public/images/pokemon/variant/exp/back/666-monsoon_3.json
+++ /dev/null
@@ -1,104 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "666-monsoon_3.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 137,
-				"h": 137
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 16,
-						"y": 1,
-						"w": 42,
-						"h": 69
-					},
-					"frame": {
-						"x": 67,
-						"y": 0,
-						"w": 42,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 16,
-						"y": 1,
-						"w": 42,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 68,
-						"w": 42,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 42,
-						"y": 69,
-						"w": 67,
-						"h": 68
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:71a24b11bc54be921b67b4376d798e05:f5358aac113e1f7af7eddf984d9692b3:637bea52b465abfb8e5a576310b4dacc$"
-	}
-}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/back/666-monsoon_3.png b/public/images/pokemon/variant/exp/back/666-monsoon_3.png
deleted file mode 100644
index f216010ca99..00000000000
Binary files a/public/images/pokemon/variant/exp/back/666-monsoon_3.png and /dev/null differ
diff --git a/public/images/pokemon/variant/exp/back/666-ocean.json b/public/images/pokemon/variant/exp/back/666-ocean.json
new file mode 100644
index 00000000000..70e7a51c21f
--- /dev/null
+++ b/public/images/pokemon/variant/exp/back/666-ocean.json
@@ -0,0 +1,34 @@
+{
+    "1": {
+        "101010": "101010",
+        "303030": "402746",
+        "675220": "958c8a",
+        "504a4a": "7f6991",
+        "595959": "724b7a",
+        "707068": "a97cbc",
+        "e1384d": "e1384d",
+        "ebcf3f": "ebcf3f",
+        "ceab62": "d9edd4",
+        "f4ad61": "f4ad61",
+        "f8ef6a": "f8ef6a",
+        "4482c9": "4482c9",
+        "6bb2e9": "6bb2e9",
+        "c3c3c3": "c3c3c3"
+    },
+    "2": {
+        "101010": "101010",
+        "303030": "b54908",
+        "675220": "bc601c",
+        "504a4a": "bc601c",
+        "595959": "e99a26",
+        "707068": "ea8742",
+        "e1384d": "e1384d",
+        "ebcf3f": "ebcf3f",
+        "ceab62": "ea8742",
+        "f4ad61": "f4ad61",
+        "f8ef6a": "f8ef6a",
+        "4482c9": "4482c9",
+        "6bb2e9": "6bb2e9",
+        "c3c3c3": "f3c86b"
+    }
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/back/666-ocean_2.json b/public/images/pokemon/variant/exp/back/666-ocean_2.json
deleted file mode 100644
index d5bb27bf592..00000000000
--- a/public/images/pokemon/variant/exp/back/666-ocean_2.json
+++ /dev/null
@@ -1,104 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "666-ocean_2.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 137,
-				"h": 137
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 15,
-						"y": 1,
-						"w": 43,
-						"h": 69
-					},
-					"frame": {
-						"x": 67,
-						"y": 0,
-						"w": 43,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 15,
-						"y": 1,
-						"w": 43,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 68,
-						"w": 43,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 43,
-						"y": 69,
-						"w": 67,
-						"h": 68
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:a1a0079c64e9d91336d227b1380cd9d2:cf159e4653ad9208c0f4633a498a6cd1:e7a0e68eab89c2013a3eb7f3b6fc0b33$"
-	}
-}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/back/666-ocean_2.png b/public/images/pokemon/variant/exp/back/666-ocean_2.png
deleted file mode 100644
index 6f4fefc99f8..00000000000
Binary files a/public/images/pokemon/variant/exp/back/666-ocean_2.png and /dev/null differ
diff --git a/public/images/pokemon/variant/exp/back/666-ocean_3.json b/public/images/pokemon/variant/exp/back/666-ocean_3.json
deleted file mode 100644
index 4ca1832c359..00000000000
--- a/public/images/pokemon/variant/exp/back/666-ocean_3.json
+++ /dev/null
@@ -1,104 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "666-ocean_3.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 137,
-				"h": 137
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 15,
-						"y": 1,
-						"w": 43,
-						"h": 69
-					},
-					"frame": {
-						"x": 67,
-						"y": 0,
-						"w": 43,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 15,
-						"y": 1,
-						"w": 43,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 68,
-						"w": 43,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 43,
-						"y": 69,
-						"w": 67,
-						"h": 68
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:a1a0079c64e9d91336d227b1380cd9d2:cf159e4653ad9208c0f4633a498a6cd1:e7a0e68eab89c2013a3eb7f3b6fc0b33$"
-	}
-}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/back/666-ocean_3.png b/public/images/pokemon/variant/exp/back/666-ocean_3.png
deleted file mode 100644
index 554fcb7b510..00000000000
Binary files a/public/images/pokemon/variant/exp/back/666-ocean_3.png and /dev/null differ
diff --git a/public/images/pokemon/variant/exp/back/666-poke-ball.json b/public/images/pokemon/variant/exp/back/666-poke-ball.json
new file mode 100644
index 00000000000..e21ba03fc1e
--- /dev/null
+++ b/public/images/pokemon/variant/exp/back/666-poke-ball.json
@@ -0,0 +1,34 @@
+{
+    "1": {
+        "101010": "101010",
+        "303030": "402746",
+        "675220": "958c8a",
+        "504a4a": "7f6991",
+        "595959": "724b7a",
+        "707068": "a97cbc",
+        "971d1d": "971d1d",
+        "b72c2c": "b72c2c",
+        "dc4b4b": "dc4b4b",
+        "e97e7e": "e97e7e",
+        "ceab62": "d9edd4",
+        "a9a99e": "a9a99e",
+        "c3c3c3": "c3c3c3",
+        "f8f8f8": "f8f8f8"
+    },
+    "2": {
+        "101010": "101010",
+        "303030": "ae001a",
+        "675220": "a70038",
+        "504a4a": "a70038",
+        "595959": "df0036",
+        "707068": "d5375a",
+        "971d1d": "040046",
+        "b72c2c": "00005e",
+        "dc4b4b": "19007d",
+        "e97e7e": "2e2095",
+        "ceab62": "d5375a",
+        "a9a99e": "000050",
+        "c3c3c3": "f0a6bf",
+        "f8f8f8": "00006d"
+    }
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/back/666-poke-ball_2.json b/public/images/pokemon/variant/exp/back/666-poke-ball_2.json
deleted file mode 100644
index 99da9b9ac29..00000000000
--- a/public/images/pokemon/variant/exp/back/666-poke-ball_2.json
+++ /dev/null
@@ -1,104 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "666-poke-ball_2.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 137,
-				"h": 137
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 16,
-						"y": 1,
-						"w": 43,
-						"h": 69
-					},
-					"frame": {
-						"x": 67,
-						"y": 0,
-						"w": 43,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 16,
-						"y": 1,
-						"w": 43,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 68,
-						"w": 43,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 43,
-						"y": 69,
-						"w": 67,
-						"h": 68
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:e744396a3b647429d050d678017c05ce:ec812f719dffcd362f0481d7d83c3476:8ec14f129d1691b8da504a13b661abed$"
-	}
-}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/back/666-poke-ball_2.png b/public/images/pokemon/variant/exp/back/666-poke-ball_2.png
deleted file mode 100644
index a1bd953a1b3..00000000000
Binary files a/public/images/pokemon/variant/exp/back/666-poke-ball_2.png and /dev/null differ
diff --git a/public/images/pokemon/variant/exp/back/666-poke-ball_3.json b/public/images/pokemon/variant/exp/back/666-poke-ball_3.json
deleted file mode 100644
index de222894738..00000000000
--- a/public/images/pokemon/variant/exp/back/666-poke-ball_3.json
+++ /dev/null
@@ -1,104 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "666-poke-ball_3.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 137,
-				"h": 137
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 16,
-						"y": 1,
-						"w": 43,
-						"h": 69
-					},
-					"frame": {
-						"x": 67,
-						"y": 0,
-						"w": 43,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 16,
-						"y": 1,
-						"w": 43,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 68,
-						"w": 43,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 43,
-						"y": 69,
-						"w": 67,
-						"h": 68
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:e744396a3b647429d050d678017c05ce:ec812f719dffcd362f0481d7d83c3476:8ec14f129d1691b8da504a13b661abed$"
-	}
-}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/back/666-poke-ball_3.png b/public/images/pokemon/variant/exp/back/666-poke-ball_3.png
deleted file mode 100644
index 9e7ff12912d..00000000000
Binary files a/public/images/pokemon/variant/exp/back/666-poke-ball_3.png and /dev/null differ
diff --git a/public/images/pokemon/variant/exp/back/666-polar.json b/public/images/pokemon/variant/exp/back/666-polar.json
new file mode 100644
index 00000000000..f86b4df3dcc
--- /dev/null
+++ b/public/images/pokemon/variant/exp/back/666-polar.json
@@ -0,0 +1,34 @@
+{
+    "1": {
+        "101010": "101010",
+        "303030": "402746",
+        "675220": "958c8a",
+        "2d2d61": "2d2d61",
+        "504a4a": "7f6991",
+        "595959": "724b7a",
+        "707068": "a97cbc",
+        "ceab62": "d9edd4",
+        "3b4b8a": "3b4b8a",
+        "4d6cc1": "4d6cc1",
+        "6aa2dc": "6aa2dc",
+        "bfbfbf": "bfbfbf",
+        "c3c3c3": "c3c3c3",
+        "f0f0f8": "f0f0f8"
+    },
+    "2": {
+        "101010": "101010",
+        "303030": "191b54",
+        "675220": "366098",
+        "2d2d61": "2d2d61",
+        "504a4a": "366098",
+        "595959": "2f3887",
+        "707068": "5f85c1",
+        "ceab62": "5f85c1",
+        "3b4b8a": "3b4b8a",
+        "4d6cc1": "4d6cc1",
+        "6aa2dc": "6aa2dc",
+        "bfbfbf": "bfbfbf",
+        "c3c3c3": "ffffff",
+        "f0f0f8": "f0f0f8"
+    }
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/back/666-polar_2.json b/public/images/pokemon/variant/exp/back/666-polar_2.json
deleted file mode 100644
index e30095c2299..00000000000
--- a/public/images/pokemon/variant/exp/back/666-polar_2.json
+++ /dev/null
@@ -1,104 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "666-polar_2.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 136,
-				"h": 136
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 14,
-						"y": 1,
-						"w": 45,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 45,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 14,
-						"y": 1,
-						"w": 45,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 45,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 45,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 45,
-						"y": 68,
-						"w": 67,
-						"h": 68
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:a3b0453f2d03b9c62472f57a438298a4:81a5a3455ae0c378bdb1dbe3c3323463:eb7086e98f867c6592e4b161835da18b$"
-	}
-}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/back/666-polar_2.png b/public/images/pokemon/variant/exp/back/666-polar_2.png
deleted file mode 100644
index b66daac7d2c..00000000000
Binary files a/public/images/pokemon/variant/exp/back/666-polar_2.png and /dev/null differ
diff --git a/public/images/pokemon/variant/exp/back/666-polar_3.json b/public/images/pokemon/variant/exp/back/666-polar_3.json
deleted file mode 100644
index 76df03f7d08..00000000000
--- a/public/images/pokemon/variant/exp/back/666-polar_3.json
+++ /dev/null
@@ -1,104 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "666-polar_3.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 136,
-				"h": 136
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 14,
-						"y": 1,
-						"w": 45,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 45,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 14,
-						"y": 1,
-						"w": 45,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 45,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 45,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 45,
-						"y": 68,
-						"w": 67,
-						"h": 68
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:a3b0453f2d03b9c62472f57a438298a4:81a5a3455ae0c378bdb1dbe3c3323463:eb7086e98f867c6592e4b161835da18b$"
-	}
-}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/back/666-polar_3.png b/public/images/pokemon/variant/exp/back/666-polar_3.png
deleted file mode 100644
index cab4822a306..00000000000
Binary files a/public/images/pokemon/variant/exp/back/666-polar_3.png and /dev/null differ
diff --git a/public/images/pokemon/variant/exp/back/666-river.json b/public/images/pokemon/variant/exp/back/666-river.json
new file mode 100644
index 00000000000..c7e5e288d05
--- /dev/null
+++ b/public/images/pokemon/variant/exp/back/666-river.json
@@ -0,0 +1,40 @@
+{
+    "1": {
+        "101010": "101010",
+        "303030": "402746",
+        "4a412c": "4a412c",
+        "675220": "958c8a",
+        "634d20": "634d20",
+        "1d726a": "1d726a",
+        "504a4a": "7f6991",
+        "595959": "724b7a",
+        "625841": "625841",
+        "707068": "a97cbc",
+        "bc813f": "bc813f",
+        "9c9143": "9c9143",
+        "ceab62": "ceab62",
+        "279ec2": "279ec2",
+        "59c9d3": "59c9d3",
+        "c3c3c3": "c3c3c3",
+        "d2a862": "d9edd4"
+    },
+    "2": {
+        "101010": "101010",
+        "303030": "7b2800",
+        "4a412c": "4a412c",
+        "675220": "ae7f41",
+        "634d20": "634d20",
+        "1d726a": "1d726a",
+        "504a4a": "ae7f41",
+        "595959": "8a5702",
+        "625841": "625841",
+        "707068": "d9a666",
+        "bc813f": "bc813f",
+        "9c9143": "9c9143",
+        "ceab62": "ceab62",
+        "279ec2": "279ec2",
+        "59c9d3": "59c9d3",
+        "c3c3c3": "e3c384",
+        "d2a862": "d2a862"
+    }
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/back/666-river_2.json b/public/images/pokemon/variant/exp/back/666-river_2.json
deleted file mode 100644
index 4edb4a188f8..00000000000
--- a/public/images/pokemon/variant/exp/back/666-river_2.json
+++ /dev/null
@@ -1,104 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "666-river_2.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 136,
-				"h": 136
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 15,
-						"y": 1,
-						"w": 43,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 43,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 15,
-						"y": 1,
-						"w": 43,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 43,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 43,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 43,
-						"y": 68,
-						"w": 67,
-						"h": 68
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:2bb6d375761e6690eba12cf4d2bc99c9:9db30ec1cf68fe8c1026c243086573f3:fa23dc87fc53ba2cfa532cf440553cf5$"
-	}
-}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/back/666-river_2.png b/public/images/pokemon/variant/exp/back/666-river_2.png
deleted file mode 100644
index c689a6c7150..00000000000
Binary files a/public/images/pokemon/variant/exp/back/666-river_2.png and /dev/null differ
diff --git a/public/images/pokemon/variant/exp/back/666-river_3.json b/public/images/pokemon/variant/exp/back/666-river_3.json
deleted file mode 100644
index 69623e13034..00000000000
--- a/public/images/pokemon/variant/exp/back/666-river_3.json
+++ /dev/null
@@ -1,104 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "666-river_3.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 136,
-				"h": 136
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 15,
-						"y": 1,
-						"w": 43,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 43,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 15,
-						"y": 1,
-						"w": 43,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 43,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 43,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 43,
-						"y": 68,
-						"w": 67,
-						"h": 68
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:2bb6d375761e6690eba12cf4d2bc99c9:9db30ec1cf68fe8c1026c243086573f3:fa23dc87fc53ba2cfa532cf440553cf5$"
-	}
-}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/back/666-river_3.png b/public/images/pokemon/variant/exp/back/666-river_3.png
deleted file mode 100644
index a163e179d0e..00000000000
Binary files a/public/images/pokemon/variant/exp/back/666-river_3.png and /dev/null differ
diff --git a/public/images/pokemon/variant/exp/back/666-sandstorm.json b/public/images/pokemon/variant/exp/back/666-sandstorm.json
new file mode 100644
index 00000000000..6bc91afb34d
--- /dev/null
+++ b/public/images/pokemon/variant/exp/back/666-sandstorm.json
@@ -0,0 +1,34 @@
+{
+    "1": {
+        "101010": "101010",
+        "303030": "402746",
+        "675220": "958c8a",
+        "504a4a": "7f6991",
+        "595959": "724b7a",
+        "625843": "625843",
+        "72604d": "72604d",
+        "707068": "a97cbc",
+        "9b9148": "9b9148",
+        "ba8d68": "ba8d68",
+        "ceab62": "d9edd4",
+        "d9b674": "d9b674",
+        "f1d69e": "f1d69e",
+        "c3c3c3": "c3c3c3"
+    },
+    "2": {
+        "101010": "101010",
+        "303030": "443123",
+        "675220": "9c703b",
+        "504a4a": "9c703b",
+        "595959": "88583e",
+        "625843": "625843",
+        "72604d": "72604d",
+        "707068": "c6975f",
+        "9b9148": "9b9148",
+        "ba8d68": "ba8d68",
+        "ceab62": "c6975f",
+        "d9b674": "d9b674",
+        "f1d69e": "f1d69e",
+        "c3c3c3": "ece1a9"   
+    }
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/back/666-sandstorm_2.json b/public/images/pokemon/variant/exp/back/666-sandstorm_2.json
deleted file mode 100644
index 5651485f6d0..00000000000
--- a/public/images/pokemon/variant/exp/back/666-sandstorm_2.json
+++ /dev/null
@@ -1,104 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "666-sandstorm_2.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 136,
-				"h": 136
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 0,
-						"y": 68,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 17,
-						"y": 2,
-						"w": 40,
-						"h": 68
-					},
-					"frame": {
-						"x": 67,
-						"y": 0,
-						"w": 40,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 17,
-						"y": 2,
-						"w": 40,
-						"h": 68
-					},
-					"frame": {
-						"x": 67,
-						"y": 68,
-						"w": 40,
-						"h": 68
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:e35abed8cd9d0bbf1556fa684995d930:8d765a06a769bbf3d1639f361548cd6f:12f47e779927411662912d6094a9782d$"
-	}
-}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/back/666-sandstorm_2.png b/public/images/pokemon/variant/exp/back/666-sandstorm_2.png
deleted file mode 100644
index 534e96bee13..00000000000
Binary files a/public/images/pokemon/variant/exp/back/666-sandstorm_2.png and /dev/null differ
diff --git a/public/images/pokemon/variant/exp/back/666-sandstorm_3.json b/public/images/pokemon/variant/exp/back/666-sandstorm_3.json
deleted file mode 100644
index d43381578cb..00000000000
--- a/public/images/pokemon/variant/exp/back/666-sandstorm_3.json
+++ /dev/null
@@ -1,104 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "666-sandstorm_3.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 136,
-				"h": 136
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 0,
-						"y": 68,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 17,
-						"y": 2,
-						"w": 40,
-						"h": 68
-					},
-					"frame": {
-						"x": 67,
-						"y": 0,
-						"w": 40,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 17,
-						"y": 2,
-						"w": 40,
-						"h": 68
-					},
-					"frame": {
-						"x": 67,
-						"y": 68,
-						"w": 40,
-						"h": 68
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:e35abed8cd9d0bbf1556fa684995d930:8d765a06a769bbf3d1639f361548cd6f:12f47e779927411662912d6094a9782d$"
-	}
-}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/back/666-sandstorm_3.png b/public/images/pokemon/variant/exp/back/666-sandstorm_3.png
deleted file mode 100644
index 649fa83e025..00000000000
Binary files a/public/images/pokemon/variant/exp/back/666-sandstorm_3.png and /dev/null differ
diff --git a/public/images/pokemon/variant/exp/back/666-savanna.json b/public/images/pokemon/variant/exp/back/666-savanna.json
new file mode 100644
index 00000000000..c261f52dced
--- /dev/null
+++ b/public/images/pokemon/variant/exp/back/666-savanna.json
@@ -0,0 +1,34 @@
+{
+    "1": {
+        "101010": "101010",
+        "303030": "402746",
+        "675220": "958c8a",
+        "504a4a": "7f6991",
+        "595959": "724b7a",
+        "707068": "a97cbc",
+        "dcc433": "dcc433",
+        "ceab62": "d9edd4",
+        "3b67ac": "3b67ac", 
+        "61a0f5": "61a0f5",   
+        "55d3d9": "55d3d9",
+        "6cc6c6": "6cc6c6",
+        "fffd77": "fffd77",
+        "c3c3c3": "c3c3c3"
+    },
+    "2": {
+        "101010": "101010",
+        "303030": "183576",
+        "675220": "1d828b",
+        "504a4a": "1d828b",
+        "595959": "4168bb",
+        "707068": "4faab3",
+        "dcc433": "dcc433",
+        "ceab62": "4faab3",
+        "fffd77": "fffd77",
+        "3b67ac": "3b67ac", 
+        "61a0f5": "61a0f5",   
+        "55d3d9": "55d3d9",
+        "6cc6c6": "6cc6c6",
+        "c3c3c3": "81e7e1"
+    }
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/back/666-savanna_2.json b/public/images/pokemon/variant/exp/back/666-savanna_2.json
deleted file mode 100644
index c1f73f6efc7..00000000000
--- a/public/images/pokemon/variant/exp/back/666-savanna_2.json
+++ /dev/null
@@ -1,104 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "666-savanna_2.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 137,
-				"h": 137
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 16,
-						"y": 1,
-						"w": 43,
-						"h": 69
-					},
-					"frame": {
-						"x": 67,
-						"y": 0,
-						"w": 43,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 16,
-						"y": 1,
-						"w": 43,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 68,
-						"w": 43,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 43,
-						"y": 69,
-						"w": 67,
-						"h": 68
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:1ad0c7c841409c3fd4cb50b399d6e13c:b9406b41d37bc72c57260f9a01a352c8:625a4f0dc001069326a75c6a381f93e6$"
-	}
-}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/back/666-savanna_2.png b/public/images/pokemon/variant/exp/back/666-savanna_2.png
deleted file mode 100644
index b4b8ecedb9e..00000000000
Binary files a/public/images/pokemon/variant/exp/back/666-savanna_2.png and /dev/null differ
diff --git a/public/images/pokemon/variant/exp/back/666-savanna_3.json b/public/images/pokemon/variant/exp/back/666-savanna_3.json
deleted file mode 100644
index 49ab66f6855..00000000000
--- a/public/images/pokemon/variant/exp/back/666-savanna_3.json
+++ /dev/null
@@ -1,104 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "666-savanna_3.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 137,
-				"h": 137
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 16,
-						"y": 1,
-						"w": 43,
-						"h": 69
-					},
-					"frame": {
-						"x": 67,
-						"y": 0,
-						"w": 43,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 16,
-						"y": 1,
-						"w": 43,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 68,
-						"w": 43,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 43,
-						"y": 69,
-						"w": 67,
-						"h": 68
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:1ad0c7c841409c3fd4cb50b399d6e13c:b9406b41d37bc72c57260f9a01a352c8:625a4f0dc001069326a75c6a381f93e6$"
-	}
-}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/back/666-savanna_3.png b/public/images/pokemon/variant/exp/back/666-savanna_3.png
deleted file mode 100644
index 6bc0a0b8363..00000000000
Binary files a/public/images/pokemon/variant/exp/back/666-savanna_3.png and /dev/null differ
diff --git a/public/images/pokemon/variant/exp/back/666-sun.json b/public/images/pokemon/variant/exp/back/666-sun.json
new file mode 100644
index 00000000000..21cf5787ba4
--- /dev/null
+++ b/public/images/pokemon/variant/exp/back/666-sun.json
@@ -0,0 +1,34 @@
+{ 
+    "1": {
+        "101010": "101010",
+        "303030": "402746",
+        "675220": "958c8a",
+        "504a4a": "7f6991",
+        "595959": "724b7a",
+        "707068": "a97cbc",
+        "c94971": "c94971",
+        "e18248": "e18248",
+        "ceab62": "d9edd4",
+        "f1a26a": "f1a26a",
+        "f0ce44": "f0ce44",
+        "fcf372": "fcf372",
+        "f47491": "f47491",
+        "c3c3c3": "c3c3c3"
+    },
+    "2": {
+        "101010": "101010",
+        "303030": "640000",
+        "675220": "8c1850",
+        "504a4a": "8c1850",
+        "595959": "750500",
+        "707068": "b83b74",
+        "c94971": "c94971",
+        "e18248": "e18248",
+        "ceab62": "b83b74",
+        "f1a26a": "f1a26a",
+        "f0ce44": "f0ce44",
+        "fcf372": "fcf372",
+        "f47491": "f47491",
+        "c3c3c3": "fee3e7"
+    }
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/back/666-sun_2.json b/public/images/pokemon/variant/exp/back/666-sun_2.json
deleted file mode 100644
index d7c995a1bc0..00000000000
--- a/public/images/pokemon/variant/exp/back/666-sun_2.json
+++ /dev/null
@@ -1,104 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "666-sun_2.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 137,
-				"h": 137
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 15,
-						"y": 1,
-						"w": 43,
-						"h": 69
-					},
-					"frame": {
-						"x": 67,
-						"y": 0,
-						"w": 43,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 15,
-						"y": 1,
-						"w": 43,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 68,
-						"w": 43,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 43,
-						"y": 69,
-						"w": 67,
-						"h": 68
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:1d3a140bac5951725915aa0b64d1fdc6:e322510cf8386dcc7834a05d57e5368e:8f5fdd0a698701f5391c5a3f67e303d6$"
-	}
-}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/back/666-sun_2.png b/public/images/pokemon/variant/exp/back/666-sun_2.png
deleted file mode 100644
index c9168d5a1c5..00000000000
Binary files a/public/images/pokemon/variant/exp/back/666-sun_2.png and /dev/null differ
diff --git a/public/images/pokemon/variant/exp/back/666-sun_3.json b/public/images/pokemon/variant/exp/back/666-sun_3.json
deleted file mode 100644
index a3f755a4e7c..00000000000
--- a/public/images/pokemon/variant/exp/back/666-sun_3.json
+++ /dev/null
@@ -1,104 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "666-sun_3.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 137,
-				"h": 137
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 15,
-						"y": 1,
-						"w": 43,
-						"h": 69
-					},
-					"frame": {
-						"x": 67,
-						"y": 0,
-						"w": 43,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 15,
-						"y": 1,
-						"w": 43,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 68,
-						"w": 43,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 43,
-						"y": 69,
-						"w": 67,
-						"h": 68
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:1d3a140bac5951725915aa0b64d1fdc6:e322510cf8386dcc7834a05d57e5368e:8f5fdd0a698701f5391c5a3f67e303d6$"
-	}
-}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/back/666-sun_3.png b/public/images/pokemon/variant/exp/back/666-sun_3.png
deleted file mode 100644
index 1a36299851e..00000000000
Binary files a/public/images/pokemon/variant/exp/back/666-sun_3.png and /dev/null differ
diff --git a/public/images/pokemon/variant/exp/back/666-tundra.json b/public/images/pokemon/variant/exp/back/666-tundra.json
new file mode 100644
index 00000000000..b098f776c00
--- /dev/null
+++ b/public/images/pokemon/variant/exp/back/666-tundra.json
@@ -0,0 +1,32 @@
+{
+    "1": {
+        "101010": "101010",
+        "303030": "402746",
+        "675220": "958c8a",
+        "504a4a": "7f6991",
+        "595959": "724b7a",
+        "707068": "a97cbc",
+        "ceab62": "d9edd4",
+        "539ad9": "539ad9",
+        "74bbe9": "74bbe9",
+        "a3def1": "a3def1",
+        "c3c3c3": "c3c3c3",
+        "d0d0d0": "d0d0d0",
+        "f0f0f8": "f0f0f8"
+    },
+    "2": {
+        "101010": "101010",
+        "303030": "003d69",
+        "675220": "3a76a7",
+        "504a4a": "3a76a7",
+        "595959": "225b72",
+        "707068": "659dd0",
+        "ceab62": "659dd0",
+        "539ad9": "539ad9",
+        "74bbe9": "74bbe9",
+        "a3def1": "a3def1",
+        "c3c3c3": "cbfbfb",
+        "d0d0d0": "d0d0d0",
+        "f0f0f8": "f0f0f8"
+    }
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/back/666-tundra_2.json b/public/images/pokemon/variant/exp/back/666-tundra_2.json
deleted file mode 100644
index 3d8ae45a641..00000000000
--- a/public/images/pokemon/variant/exp/back/666-tundra_2.json
+++ /dev/null
@@ -1,104 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "666-tundra_2.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 136,
-				"h": 136
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 13,
-						"y": 1,
-						"w": 46,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 46,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 13,
-						"y": 1,
-						"w": 46,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 46,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 46,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 46,
-						"y": 68,
-						"w": 67,
-						"h": 68
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:40f74f8757cb0f5a2ab7b5f68ea979a0:d062f67571674668b47f6fab68361105:9779ed3adebc298af537dd64dc25fe00$"
-	}
-}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/back/666-tundra_2.png b/public/images/pokemon/variant/exp/back/666-tundra_2.png
deleted file mode 100644
index 49325397d8a..00000000000
Binary files a/public/images/pokemon/variant/exp/back/666-tundra_2.png and /dev/null differ
diff --git a/public/images/pokemon/variant/exp/back/666-tundra_3.json b/public/images/pokemon/variant/exp/back/666-tundra_3.json
deleted file mode 100644
index 65be2910a02..00000000000
--- a/public/images/pokemon/variant/exp/back/666-tundra_3.json
+++ /dev/null
@@ -1,104 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "666-tundra_3.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 136,
-				"h": 136
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 13,
-						"y": 1,
-						"w": 46,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 46,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 13,
-						"y": 1,
-						"w": 46,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 46,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 46,
-						"y": 0,
-						"w": 67,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 71
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 67,
-						"h": 68
-					},
-					"frame": {
-						"x": 46,
-						"y": 68,
-						"w": 67,
-						"h": 68
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:40f74f8757cb0f5a2ab7b5f68ea979a0:d062f67571674668b47f6fab68361105:9779ed3adebc298af537dd64dc25fe00$"
-	}
-}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/back/666-tundra_3.png b/public/images/pokemon/variant/exp/back/666-tundra_3.png
deleted file mode 100644
index 3284e1e637b..00000000000
Binary files a/public/images/pokemon/variant/exp/back/666-tundra_3.png and /dev/null differ
diff --git a/public/images/pokemon/variant/exp/back/692.json b/public/images/pokemon/variant/exp/back/692.json
new file mode 100644
index 00000000000..d4c85f37c9d
--- /dev/null
+++ b/public/images/pokemon/variant/exp/back/692.json
@@ -0,0 +1,28 @@
+{
+	"1": {
+		"337380": "783a1d",
+		"b3b3b3": "c8ba6d",
+		"595959": "c85b5b",
+		"61daf2": "e1ac53",
+		"cc9c3d": "53be53",
+		"404040": "7d182d",
+		"ffc44c": "a9f076",
+		"b2f2ff": "fada7f",
+		"47a1b3": "af6a37",
+		"101010": "070707",
+		"735822": "20734c"
+	},
+	"2": {
+		"337380": "5f3c23",
+		"b3b3b3": "68a7aa",
+		"595959": "88cd56",
+		"61daf2": "e1d6b6",
+		"cc9c3d": "7743be",
+		"404040": "1c873e",
+		"ffc44c": "a36feb",
+		"b2f2ff": "faf8d7",
+		"47a1b3": "968144",
+		"101010": "070707",
+		"735822": "371c72"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/back/693.json b/public/images/pokemon/variant/exp/back/693.json
new file mode 100644
index 00000000000..3187a81e0c0
--- /dev/null
+++ b/public/images/pokemon/variant/exp/back/693.json
@@ -0,0 +1,28 @@
+{
+	"1": {
+		"224b73": "552813",
+		"4595e5": "aa6839",
+		"23a2c8": "c87a23",
+		"262626": "230808",
+		"cc9c3d": "1b3c17",
+		"404040": "3c171b",
+		"5f5f5f": "6e2e3b",
+		"61daf2": "f2bd61",
+		"3674b3": "7d3e21",
+		"ffc44c": "426e2e",
+		"735822": "08230e"
+	},
+	"2": {
+		"224b73": "5f463a",
+		"4595e5": "c8b493",
+		"23a2c8": "beb099",
+		"262626": "295a1c",
+		"cc9c3d": "6259af",
+		"404040": "2a8c53",
+		"5f5f5f": "51c85d",
+		"61daf2": "f0eadb",
+		"3674b3": "9b8265",
+		"ffc44c": "a39afa",
+		"735822": "36235f"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/back/697.json b/public/images/pokemon/variant/exp/back/697.json
index 61a5f16551b..5303995a117 100644
--- a/public/images/pokemon/variant/exp/back/697.json
+++ b/public/images/pokemon/variant/exp/back/697.json
@@ -1,37 +1,34 @@
 {
-	"1": {
-        "080808":"080808",
-        "621e1d":"0b241e",
-        "902f2d":"153626",
-        "b45250":"285234",
-        "653510":"5e0b0b",
-        "b56827":"971c1c",
-        "e39f33":"b52424",
-        "46413f":"4c3216",
-        "766c67":"ad8c63",
-        "adaaae":"cbbe8c",
-        "f0f0f2":"dfdea7",
-        "3d3937":"ab8a61",
-        "786d68":"cfc28f",
-        "afacb0":"c9bd8b",
-        "ededf0":"e0dfa8"
-	},
-	"2": {
-        "080808":"080808",
-        "621e1d":"52352f",
-        "902f2d":"83726e",
-        "b45250":"ab9b97",
-        "653510":"9d5390",
-        "b56827":"ce7ecc",
-        "e39f33":"f4dbf6",
-        "46413f":"170c25",
-        "766c67":"26173b",
-        "adaaae":"33214f",
-        "f0f0f2":"4b2e64",
-        "3d3937":"c97bc7",
-        "786d68":"e5a9ea",
-        "afacb0":"d180ce",
-        "ededf0":"ededf0"
-	}
+	
+"1": {
+"080808": "080808",
+"32252c": "3e1e17",
+"50131e": "0b241e",
+"722533": "153626",
+"54434c": "4c3216",
+"964b1c": "5e0b0b",
+"963e4e": "285234",
+"bf7545": "971c1c",
+"f19d5a": "b52424",
+"9f9d98": "ad8c63",
+"cccccc": "cbbe8c",
+"fafafa": "dfdea7",
+"53454d":"4c3216"
+},
+"2": {
+"080808": "080808",
+"32252c": "0d0124",
+"50131e": "573b36",
+"722533": "83726e",
+"54434c": "170c25",
+"964b1c": "9d5390",
+"963e4e": "ab9b97",
+"bf7545": "ce7ecc",
+"f19d5a": "f4dbf6",
+"9f9d98": "26173b",
+"cccccc": "33214f",
+"fafafa": "4b2e64",
+"53454d": "f4dbf6"
+}
 }
 
diff --git a/public/images/pokemon/variant/exp/back/698.json b/public/images/pokemon/variant/exp/back/698.json
deleted file mode 100644
index af193c3bc0c..00000000000
--- a/public/images/pokemon/variant/exp/back/698.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-	"1": {
-		"b3747e": "4b7465",
-		"ffbfca": "43bf8d",
-		"fff2b2": "9bffa9",
-		"537180": "b04f4b",
-		"a6e1ff": "efab87",
-		"101010": "101010",
-		"85b4cc": "cf755d",
-		"217aa6": "7f99e1",
-		"30b2f2": "b5dcff",
-		"fdfdfd": "fdfdfd",
-		"c0c0c0": "d7cca0",
-		"cacaca": "cacaca",
-		"cbaa84": "44827c",
-		"dcffb2": "8eeab9",
-		"eeffbf": "cdffb5",
-		"b7ffb2": "72d8ce"
-	},
-	"2": {
-		"b3747e": "c452a6",
-		"ffbfca": "faccff",
-		"fff2b2": "eb88b9",
-		"537180": "392d65",
-		"a6e1ff": "936daa",
-		"101010": "101010",
-		"85b4cc": "654a8a",
-		"217aa6": "efaa51",
-		"30b2f2": "ffd169",
-		"fdfdfd": "fdfdfd",
-		"c0c0c0": "282747",
-		"cacaca": "cacaca",
-		"cbaa84": "cc78db",
-		"dcffb2": "d7bbf4",
-		"eeffbf": "ed9ff2",
-		"b7ffb2": "dceeff"
-	}
-}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/back/700.json b/public/images/pokemon/variant/exp/back/700.json
index 4b65fb00405..1189d463f2b 100644
--- a/public/images/pokemon/variant/exp/back/700.json
+++ b/public/images/pokemon/variant/exp/back/700.json
@@ -1,26 +1,32 @@
 {
-	"1": {
-		"107090": "c72537",
-		"af4f6f": "452f89",
-		"7fcfdf": "ff9a68",
-		"ffaebb": "c7a6ee",
-		"101010": "101010",
-		"807070": "5c6889",
-		"ef6f8f": "996cd2",
-		"ffffff": "f7f5ff",
-		"ddcccc": "c3c5d9",
-		"6f8faf": "eb5244"
-	},
-	"2": {
-		"107090": "c72537",
-		"af4f6f": "197d46",
-		"7fcfdf": "ff9a68",
-		"ffaebb": "7dec9d",
-		"101010": "101010",
-		"807070": "7f5c89",
-		"ef6f8f": "5dae7d",
-		"ffffff": "fff5fc",
-		"ddcccc": "d9c3d6",
-		"6f8faf": "eb5244"
-	}
+"1": {
+"101010": "101010",
+"8a2843": "452f89",
+"235a99": "a63071",
+"895c72": "5c6889",
+"d85a7a": "996cd2",
+"528fcc": "d648b7",
+"a88d8c": "8c8fa8",
+"f18a78": "b52d27",
+"fa8caa": "c7a6ee",
+"64c8f3": "e974db",
+"d9c3c3": "c3c5d9",
+"fff5f5": "f7f5ff",
+"65798c": "65798c"
+},
+"2": {
+"101010": "101010",
+"8a2843": "0e6134",
+"235a99": "900d1b",
+"895c72": "7f5c89",
+"d85a7a": "5dae7d",
+"528fcc": "dd3d4f",
+"a88d8c": "7f5c89",
+"f18a78": "d14ea4",
+"fa8caa": "7dec9d",
+"64c8f3": "ff9a68",
+"d9c3c3": "d9c3d6",
+"fff5f5": "fff5fc",
+"65798c": "65798c"
+}
 }
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/back/702.json b/public/images/pokemon/variant/exp/back/702.json
index a5bb32bb790..12feb29a0fd 100644
--- a/public/images/pokemon/variant/exp/back/702.json
+++ b/public/images/pokemon/variant/exp/back/702.json
@@ -1,22 +1,32 @@
 {
 	"1": {
 		"101010": "101010",
-		"4d4d4d": "6789b3",
 		"262626": "2a3b5e",
+		"4d4d4d": "6789b3",
+		"bfbf86": "a3d1cc",
+		"f2f2aa": "ddfff5",
 		"735c2e": "a53c42",
+		"997a3d": "c9685f",
 		"f2c261": "ffd3b6",
 		"bf994c": "e49f84",
-		"997a3d": "c9685f",
-		"000000": "000000"
+		"1d1d1d": "1a1c45",
+		"f8f8f8": "f8f8f8",
+		"464646": "424b8f",
+		"d97d21": "7cd6a1"
 	},
 	"2": {
 		"101010": "101010",
-		"4d4d4d": "197870",
 		"262626": "072d38",
+		"4d4d4d": "197870",
+		"bfbf86": "aaa8d6",
+		"f2f2aa": "ece5ff",
 		"735c2e": "1e0e27",
+		"997a3d": "2d1533",
 		"f2c261": "5f3662",
 		"bf994c": "432249",
-		"997a3d": "2d1533",
-		"000000": "000000"
+		"1d1d1d": "02172d",
+		"f8f8f8": "f8f8f8",
+		"464646": "17646c",
+		"d97d21": "d2fff1"
 	}
 }
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/back/703.json b/public/images/pokemon/variant/exp/back/703.json
deleted file mode 100644
index 376abd466d2..00000000000
--- a/public/images/pokemon/variant/exp/back/703.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-	"1": {
-		"306090": "c35b2a",
-		"88aacc": "e67c37",
-		"fefefe": "fefefe",
-		"535763": "292638",
-		"a3a7b3": "4d496b",
-		"737783": "37344e",
-		"bbddff": "ffa633",
-		"101010": "101010",
-		"5f6060": "e6ac60",
-		"bfbbbb": "ffd3a1",
-		"fcfefe": "ffeed6"
-	},
-	"2": {
-		"306090": "a03c69",
-		"88aacc": "e25493",
-		"fefefe": "ffe2ee",
-		"535763": "976ba9",
-		"a3a7b3": "e4cdf9",
-		"737783": "cca1db",
-		"bbddff": "f591bd",
-		"101010": "101010",
-		"5f6060": "5a3d84",
-		"bfbbbb": "8359a7",
-		"fcfefe": "a473bf"
-	}
-}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/back/704.json b/public/images/pokemon/variant/exp/back/704.json
index 179c06d54ac..1955f425b26 100644
--- a/public/images/pokemon/variant/exp/back/704.json
+++ b/public/images/pokemon/variant/exp/back/704.json
@@ -1,26 +1,30 @@
 {
 	"1": {
-		"766fa6": "7d699d",
-		"010202": "101010",
-		"6f5e80": "4e4094",
-		"e0d3e0": "fbb3d2",
-		"bbafc4": "da75a5",
-		"2f6b38": "033c55",
-		"a497c2": "da75a5",
-		"74d457": "348fa6",
-		"3da84d": "185d83",
-		"3f3d5e": "033c55"
+		"807380": "b93f84",
+		"f2daf2": "fbb3d2",
+		"bfacbf": "e56ca6",
+		"4d454d": "8a2166",
+		"101010": "101010",
+		"4d993d": "197497",
+		"66cc52": "3aa8c4",
+		"b8a1e5": "c7a1e5",
+		"8f7db3": "8b69c3",
+		"665980": "4e4094",
+		"de817e": "e5e1a1",
+		"c25054": "c68260"
 	},
 	"2": {
-		"766fa6": "2f5d6f",
-		"010202": "101010",
-		"6f5e80": "274159",
-		"e0d3e0": "92d8c8",
-		"bbafc4": "5f8d86",
-		"2f6b38": "681b00",
-		"a497c2": "5f8d86",
-		"74d457": "bb7935",
-		"3da84d": "a34205",
-		"3f3d5e": "681b00"
+		"807380": "237e7f",
+		"f2daf2": "92d8c8",
+		"bfacbf": "63a99e",
+		"4d454d": "134557",
+		"101010": "101010",
+		"4d993d": "a34205",
+		"66cc52": "d27e26",
+		"b8a1e5": "4a9699",
+		"8f7db3": "2f667c",
+		"665980": "274159",
+		"de817e": "f2daf2",
+		"c25054": "9268a4"
 	}
 }
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/back/705.json b/public/images/pokemon/variant/exp/back/705.json
index 93f270c6976..72dd07123ea 100644
--- a/public/images/pokemon/variant/exp/back/705.json
+++ b/public/images/pokemon/variant/exp/back/705.json
@@ -1,28 +1,26 @@
 {
 	"1": {
-		"807380": "b93f84",
-		"f2daf2": "fbb3d2",
-		"101010": "101010",
-		"4d454d": "8a2166",
-		"bfacbf": "ca719c",
-		"66cc52": "197497",
-		"b6f2aa": "197497",
-		"4d993d": "0c5474",
-		"665980": "4e4094",
-		"b8a1e5": "c7a1e5",
-		"8f7db3": "8b69c3"
+	   "101010": "101010",
+	   "4d454d": "8a2166",
+	   "647543": "197497",
+	   "98bd51": "3aa8c4",
+	   "665980": "4e4094",
+	   "807380": "b93f84",
+	   "8f7db3": "8b69c3",
+	   "bfacbf": "e56ca6",
+	   "b8a1e5": "c7a1e5",
+	   "f2daf2": "fbb3d2"
 	},
 	"2": {
-		"807380": "20615e",
-		"f2daf2": "9cead8",
-		"101010": "101010",
-		"4d454d": "124143",
-		"bfacbf": "4e9b8f",
-		"66cc52": "a34205",
-		"b6f2aa": "a34205",
-		"4d993d": "842401",
-		"665980": "274159",
-		"b8a1e5": "4a9699",
-		"8f7db3": "2f667c"
+	   "101010": "101010",
+	   "4d454d": "194f51",
+	   "647543": "a34205",
+	   "98bd51": "d27e26",
+	   "665980": "274159",
+	   "807380": "2b736f",
+	   "8f7db3": "2f667c",
+	   "bfacbf": "5db6a9",
+	   "b8a1e5": "4a9699",
+	   "f2daf2": "9cead8"
 	}
 }
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/back/708.json b/public/images/pokemon/variant/exp/back/708.json
deleted file mode 100644
index 7d41d6d24b0..00000000000
--- a/public/images/pokemon/variant/exp/back/708.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-	"1": {
-		"1a1a1c": "1a1a1c",
-		"686665": "646085",
-		"103222": "802c26",
-		"221b17": "221b17",
-		"090606": "090606",
-		"4ab38e": "a14743",
-		"38956f": "a14743",
-		"ab9074": "7c808c",
-		"4e4e4e": "494e5b",
-		"917860": "7c808c",
-		"424244": "2b303c",
-		"78604c": "575a6a",
-		"6b5442": "40435a",
-		"5f4939": "36384f",
-		"4f2a09": "292929",
-		"6c4513": "36384f",
-		"353638": "353638"
-	},
-	"2": {
-		"1a1a1c": "1a1a1c",
-		"686665": "ccc3cf",
-		"103222": "a94079",
-		"221b17": "221b17",
-		"090606": "090606",
-		"4ab38e": "da7ea8",
-		"38956f": "da7ea8",
-		"ab9074": "7e5658",
-		"4e4e4e": "9c92a4",
-		"917860": "7e5658",
-		"424244": "6f5f80",
-		"78604c": "56323a",
-		"6b5442": "47232b",
-		"5f4939": "31161d",
-		"4f2a09": "250e14",
-		"6c4513": "31161d",
-		"353638": "57496b"
-	}
-}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/back/713.json b/public/images/pokemon/variant/exp/back/713.json
index 8c54b0ab776..61977f60470 100644
--- a/public/images/pokemon/variant/exp/back/713.json
+++ b/public/images/pokemon/variant/exp/back/713.json
@@ -1,22 +1,22 @@
 {
 	"1": {
-		"6994bf": "bf566d",
-		"f2ffff": "ffebf2",
-		"335980": "994255",
+		"608cba": "bf566d",
 		"967acc": "732334",
-		"77b8d9": "d97389",
 		"85d7f2": "f29eb3",
 		"bff4ff": "ffbfda",
+		"335980": "994255",
+		"f2ffff": "ffebf2",
+		"77b8d9": "d97389",
 		"101010": "101010"
 	},
 	"2": {
-		"6994bf": "a8632a",
-		"f2ffff": "fff2ad",
-		"335980": "824628",
+		"608cba": "a8632a",
 		"967acc": "2c7a75",
-		"77b8d9": "cc7b1e",
 		"85d7f2": "e69e2b",
 		"bff4ff": "fcc95c",
+		"335980": "824628",
+		"f2ffff": "fff2ad",
+		"77b8d9": "cc7b1e",
 		"101010": "101010"
 	}
 }
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/back/714.json b/public/images/pokemon/variant/exp/back/714.json
deleted file mode 100644
index 22933e71338..00000000000
--- a/public/images/pokemon/variant/exp/back/714.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-	"1": {
-		"101010": "101010",
-		"6a3f73": "500a25",
-		"bd70cc": "a42c54",
-		"8e5499": "8e1d4b",
-		"404040": "202558",
-		"595959": "2f386b",
-		"bfacbf": "8d7be3",
-		"665c66": "2f386b",
-		"f2daf2": "8d7be3"
-	},
-	"2": {
-		"101010": "101010",
-		"6a3f73": "5f151c",
-		"bd70cc": "c24430",
-		"8e5499": "882c27",
-		"404040": "5b1922",
-		"595959": "7c2928",
-		"bfacbf": "f9e8dd",
-		"665c66": "7c2928",
-		"f2daf2": "f9e8dd"
-	}
-}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/back/728.json b/public/images/pokemon/variant/exp/back/728.json
index f736f512525..a9c7155ec91 100644
--- a/public/images/pokemon/variant/exp/back/728.json
+++ b/public/images/pokemon/variant/exp/back/728.json
@@ -1,34 +1,44 @@
 {
 	"1": {
-		"8d3774": "e54c41",
-		"2c316e": "00473d",
-		"ef71c0": "ff8072",
-		"ffc8ea": "fff6e2",
-		"536fc3": "009469",
-		"b95094": "e54c41",
-		"7199db": "14af82",
-		"171717": "171717",
-		"9283a3": "808080",
-		"ccc2d0": "c2beb4",
-		"3c4b92": "006355",
-		"fafafa": "fff6e2",
-		"7090a3": "858d7d",
-		"a1d9e7": "92b599"
+		"101010": "101010",
+		"1e3a66": "363d2f",
+		"243a66": "00473d",
+		"733f50": "a62c20",
+		"404040": "404040",
+		"b3627d": "e54c41",
+		"2c4f8c": "5a6154",
+		"314f8c": "006355",
+		"436cbf": "009469",
+		"e57ea1": "ff8072",
+		"5f9ba6": "b56e76",
+		"639ba6": "858d7d",
+		"6c90d9": "14af82",
+		"808080": "808080",
+		"bfbfbf": "c2beb4",
+		"9edae5": "f7c1c5",
+		"a1dae5": "92b599",
+		"f8f8f8": "fff6e2",
+		"fefefe": "fff6e2"
 	},
 	"2": {
-		"8d3774": "620a33",
-		"2c316e": "54041b",
-		"ef71c0": "dd3780",
-		"ffc8ea": "f5edee",
-		"536fc3": "a6213f",
-		"b95094": "a7225c",
-		"7199db": "be294a",
-		"171717": "171717",
-		"9283a3": "9283a3",
-		"ccc2d0": "bfb4b9",
-		"3c4b92": "770f29",
-		"fafafa": "f5edee",
-		"7090a3": "b88389",
-		"a1d9e7": "f7c1c5"
+		"101010": "101010",
+		"1e3a66": "773f46",
+		"243a66": "54041b",
+		"733f50": "620a33",
+		"404040": "404040",
+		"b3627d": "a7225c",
+		"2c4f8c": "a45f67",
+		"314f8c": "770f29",
+		"436cbf": "a6213f",
+		"e57ea1": "dd3780",
+		"5f9ba6": "408c62",
+		"639ba6": "b88389",
+		"6c90d9": "be294a",
+		"808080": "808080",
+		"bfbfbf": "bfb4b9",
+		"9edae5": "91e6a2",
+		"a1dae5": "f7c1c5",
+		"f8f8f8": "f5edee",
+		"fefefe": "fff6e2"
 	}
 }
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/back/729.json b/public/images/pokemon/variant/exp/back/729.json
new file mode 100644
index 00000000000..a0e40c36aec
--- /dev/null
+++ b/public/images/pokemon/variant/exp/back/729.json
@@ -0,0 +1,40 @@
+{
+	"1": {
+		"101010": "101010",
+		"2d2e31": "2d2e31",
+		"733f50": "bb402f",
+		"476d72": "be665d",
+		"b3627d": "fb6051",
+		"326187": "006b65",
+		"e57ea1": "ff9384",
+		"639ba6": "b56e76",
+		"2d8ec4": "009a88",
+		"1eb9ee": "0ccfa2",
+		"808080": "808080",
+		"8dafaf": "ff989e",
+		"bfbfbf": "c2beb4",
+		"bad8d8": "ffbd98",
+		"bae1f1": "f7c1c5",
+		"f8f8f8": "fff6e2",
+		"fdfdfd": "fff6e2"
+	},
+	"2": {
+		"101010": "101010",
+		"2d2e31": "2d2e31",
+		"733f50": "620a33",
+		"476d72": "793f5e",
+		"b3627d": "a7225c",
+		"326187": "5a141b",
+		"e57ea1": "dd3780",
+		"639ba6": "408c62",
+		"2d8ec4": "952c3f",
+		"1eb9ee": "c6496f",
+		"808080": "808080",
+		"8dafaf": "b681a6",
+		"bfbfbf": "bfb4b9",
+		"bad8d8": "deabce",
+		"bae1f1": "91e6a2",
+		"f8f8f8": "f5edee",
+		"fdfdfd": "fff6e2"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/back/729_2.json b/public/images/pokemon/variant/exp/back/729_2.json
deleted file mode 100644
index 146cac6c9d1..00000000000
--- a/public/images/pokemon/variant/exp/back/729_2.json
+++ /dev/null
@@ -1,230 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "729_2.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 148,
-				"h": 148
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 71,
-						"h": 50
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 70,
-						"h": 50
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 70,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 71,
-						"h": 50
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 70,
-						"h": 49
-					},
-					"frame": {
-						"x": 0,
-						"y": 50,
-						"w": 70,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 71,
-						"h": 50
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 70,
-						"h": 49
-					},
-					"frame": {
-						"x": 0,
-						"y": 50,
-						"w": 70,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 71,
-						"h": 50
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 69,
-						"h": 49
-					},
-					"frame": {
-						"x": 0,
-						"y": 99,
-						"w": 69,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 71,
-						"h": 50
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 69,
-						"h": 49
-					},
-					"frame": {
-						"x": 0,
-						"y": 99,
-						"w": 69,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 71,
-						"h": 50
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 68,
-						"h": 50
-					},
-					"frame": {
-						"x": 70,
-						"y": 0,
-						"w": 68,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 71,
-						"h": 50
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 68,
-						"h": 50
-					},
-					"frame": {
-						"x": 70,
-						"y": 0,
-						"w": 68,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 71,
-						"h": 50
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 50
-					},
-					"frame": {
-						"x": 70,
-						"y": 50,
-						"w": 67,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 71,
-						"h": 50
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 70,
-						"h": 48
-					},
-					"frame": {
-						"x": 69,
-						"y": 100,
-						"w": 70,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 71,
-						"h": 50
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 70,
-						"h": 48
-					},
-					"frame": {
-						"x": 69,
-						"y": 100,
-						"w": 70,
-						"h": 48
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:ca6603181d5c8644f2bdbeecb46551b0:09ccc951204ac93cf598ed13a34f0429:b2d5dd692ec79c7357afdffa7b3670a9$"
-	}
-}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/back/729_2.png b/public/images/pokemon/variant/exp/back/729_2.png
deleted file mode 100644
index d5600f3bee4..00000000000
Binary files a/public/images/pokemon/variant/exp/back/729_2.png and /dev/null differ
diff --git a/public/images/pokemon/variant/exp/back/729_3.json b/public/images/pokemon/variant/exp/back/729_3.json
deleted file mode 100644
index 6a251ba9b19..00000000000
--- a/public/images/pokemon/variant/exp/back/729_3.json
+++ /dev/null
@@ -1,230 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "729_3.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 148,
-				"h": 148
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 71,
-						"h": 50
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 70,
-						"h": 50
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 70,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 71,
-						"h": 50
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 70,
-						"h": 49
-					},
-					"frame": {
-						"x": 0,
-						"y": 50,
-						"w": 70,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 71,
-						"h": 50
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 70,
-						"h": 49
-					},
-					"frame": {
-						"x": 0,
-						"y": 50,
-						"w": 70,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 71,
-						"h": 50
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 69,
-						"h": 49
-					},
-					"frame": {
-						"x": 0,
-						"y": 99,
-						"w": 69,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 71,
-						"h": 50
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 69,
-						"h": 49
-					},
-					"frame": {
-						"x": 0,
-						"y": 99,
-						"w": 69,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 71,
-						"h": 50
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 68,
-						"h": 50
-					},
-					"frame": {
-						"x": 70,
-						"y": 0,
-						"w": 68,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 71,
-						"h": 50
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 68,
-						"h": 50
-					},
-					"frame": {
-						"x": 70,
-						"y": 0,
-						"w": 68,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 71,
-						"h": 50
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 67,
-						"h": 50
-					},
-					"frame": {
-						"x": 70,
-						"y": 50,
-						"w": 67,
-						"h": 50
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 71,
-						"h": 50
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 70,
-						"h": 48
-					},
-					"frame": {
-						"x": 69,
-						"y": 100,
-						"w": 70,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 71,
-						"h": 50
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 70,
-						"h": 48
-					},
-					"frame": {
-						"x": 69,
-						"y": 100,
-						"w": 70,
-						"h": 48
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:ca6603181d5c8644f2bdbeecb46551b0:09ccc951204ac93cf598ed13a34f0429:b2d5dd692ec79c7357afdffa7b3670a9$"
-	}
-}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/back/729_3.png b/public/images/pokemon/variant/exp/back/729_3.png
deleted file mode 100644
index 182d81a0754..00000000000
Binary files a/public/images/pokemon/variant/exp/back/729_3.png and /dev/null differ
diff --git a/public/images/pokemon/variant/exp/back/730.json b/public/images/pokemon/variant/exp/back/730.json
index 8c3238188cf..ae6d464dd3f 100644
--- a/public/images/pokemon/variant/exp/back/730.json
+++ b/public/images/pokemon/variant/exp/back/730.json
@@ -1,18 +1,52 @@
 {
-	"2": {
-		"337287": "500518",
+	"1": {
 		"101010": "101010",
-		"83e6d5": "a6213f",
-		"52a4b4": "770f29",
-		"91b9e1": "c17b97",
-		"bde5ff": "e9a5c0",
-		"bfbfd1": "bfb4b9",
-		"fafafa": "f5edee",
-		"737373": "737373",
-		"8b3959": "1d1638",
-		"ff8193": "614388",
-		"17417f": "3e0f2f",
-		"215ba5": "591945",
-		"2f82eb": "81387e"
+		"843843": "a62c20",
+		"8d3f4a": "a62c20",
+		"c46074": "e54c41",
+		"c76374": "e54c41",
+		"0e6792": "b54f5f",
+		"1241a1": "006355",
+		"6d7481": "917393",
+		"727481": "a0866f",
+		"1470de": "009469",
+		"476d72": "74312e",
+		"44a0b5": "d87383",
+		"64c5e1": "00dc9c",
+		"6ac8e3": "ffa0a8",
+		"82a7b9": "c35861",
+		"fd8196": "ff8072",
+		"ff8496": "ff8072",
+		"bdbdc1": "c0b7a1",
+		"c0bdc1": "beaac0",
+		"aac7e6": "ea7c5b",
+		"f8f8f8": "fff2d4",
+		"faf8f8": "f1e8f1",
+		"fef8f8": "fef8f8"		
+	},
+	"2": {
+		"101010": "101010",
+		"843843": "5c2141",
+		"8d3f4a": "1d1638",
+		"c46074": "c17b97",
+		"c76374": "391e62",
+		"0e6792": "500518",
+		"1241a1": "591945",
+		"6d7481": "81716d",
+		"727481": "9e8193",
+		"1470de": "81387e",
+		"476d72": "5c2141",
+		"44a0b5": "770f29",
+		"64c5e1": "bd2b6b",
+		"6ac8e3": "a6213f",
+		"82a7b9": "c17b97",
+		"fd8196": "e9a5c0",
+		"ff8496": "614388",
+		"bdbdc1": "bfb4b9",
+		"c0bdc1": "c0b4a5",
+		"aac7e6": "e9a5c0",
+		"f8f8f8": "f5edee",
+		"faf8f8": "f5f3e3",
+		"fef8f8": "fef8f8"		
 	}
 }
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/back/730_2.json b/public/images/pokemon/variant/exp/back/730_2.json
deleted file mode 100644
index b1e8fd29a29..00000000000
--- a/public/images/pokemon/variant/exp/back/730_2.json
+++ /dev/null
@@ -1,230 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "730_2.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 206,
-				"h": 206
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 69,
-						"h": 82
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 69,
-						"h": 79
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 69,
-						"h": 79
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 69,
-						"h": 82
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 68,
-						"h": 81
-					},
-					"frame": {
-						"x": 69,
-						"y": 0,
-						"w": 68,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 69,
-						"h": 82
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 68,
-						"h": 81
-					},
-					"frame": {
-						"x": 69,
-						"y": 0,
-						"w": 68,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 69,
-						"h": 82
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 68,
-						"h": 81
-					},
-					"frame": {
-						"x": 0,
-						"y": 79,
-						"w": 68,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 69,
-						"h": 82
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 69,
-						"h": 79
-					},
-					"frame": {
-						"x": 68,
-						"y": 81,
-						"w": 69,
-						"h": 79
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 69,
-						"h": 82
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 69,
-						"h": 79
-					},
-					"frame": {
-						"x": 68,
-						"y": 81,
-						"w": 69,
-						"h": 79
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 69,
-						"h": 82
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 69,
-						"h": 79
-					},
-					"frame": {
-						"x": 137,
-						"y": 0,
-						"w": 69,
-						"h": 79
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 69,
-						"h": 82
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 69,
-						"h": 79
-					},
-					"frame": {
-						"x": 137,
-						"y": 0,
-						"w": 69,
-						"h": 79
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 69,
-						"h": 82
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 69,
-						"h": 78
-					},
-					"frame": {
-						"x": 137,
-						"y": 79,
-						"w": 69,
-						"h": 78
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 69,
-						"h": 82
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 69,
-						"h": 78
-					},
-					"frame": {
-						"x": 137,
-						"y": 79,
-						"w": 69,
-						"h": 78
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:2717094fe274718326c9b0fe3237866b:3ad96e0a8adb3bab17597f2996c3f5cc:fcd0d2cb6b26724e796ae0dcb71fae3f$"
-	}
-}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/back/730_2.png b/public/images/pokemon/variant/exp/back/730_2.png
deleted file mode 100644
index e9090ce19dd..00000000000
Binary files a/public/images/pokemon/variant/exp/back/730_2.png and /dev/null differ
diff --git a/public/images/pokemon/variant/exp/back/746-school.json b/public/images/pokemon/variant/exp/back/746-school.json
new file mode 100644
index 00000000000..d8fa61a3829
--- /dev/null
+++ b/public/images/pokemon/variant/exp/back/746-school.json
@@ -0,0 +1,38 @@
+{
+    "1": {
+        "101010": "101010",
+        "0a1627": "5f2112",
+        "123954": "75391b",
+        "134884": "935926",
+        "134d84": "16574d",
+        "1766c6": "b77736",
+        "416adf": "2c9572",
+        "79848a": "a67834",
+        "749cf6": "5ce09d",
+        "73dcf5": "27133f",
+        "73e5f5": "552b64",
+        "72f0f6": "824388",
+        "9cd3fd": "aafe94",
+        "a6c5f7": "78f389",
+        "cfd1d3": "d5ab51",
+        "fbfbfb": "f7d76b"
+    },
+    "2": {
+        "101010": "101010",
+        "0a1627": "0f0523",
+        "123954": "28071a",
+        "134884": "350b19",
+        "134d84": "b7904d",
+        "1766c6": "4a1111",
+        "416adf": "dec284",
+        "79848a": "4a1111",
+        "749cf6": "f8ecc5",
+        "73dcf5": "31238e",
+        "73e5f5": "3a4ebd",
+        "72f0f6": "6492f7",
+        "9cd3fd": "fefeef",
+        "a6c5f7": "fefed9",
+        "cfd1d3": "5f291c",
+        "fbfbfb": "844232"
+    }
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/back/746.json b/public/images/pokemon/variant/exp/back/746.json
new file mode 100644
index 00000000000..5b183b10e5d
--- /dev/null
+++ b/public/images/pokemon/variant/exp/back/746.json
@@ -0,0 +1,40 @@
+{
+    "1": {
+        "101010": "101010",
+        "1f2161": "16574d",
+        "5d666d": "75391b",
+        "616b72": "a67834",
+        "9c455b": "308c9d",
+        "374793": "2c9572",
+        "4764c9": "5ce09d",
+        "3e9cbb": "27133f",
+        "61c8de": "824388", 
+        "8c9c9d": "935926",
+        "8d9c9d": "c69b3f",
+        "d88394": "65cfe2",
+        "b0c5c6": "d5ab51",
+        "ccd2ce": "b77736",
+        "d8d9da": "d8d9da",
+        "eeeeee": "f7d76b",
+        "fefefe": "fefefe"
+    },
+    "2": {
+        "101010": "101010",
+        "1f2161": "b7904d",
+        "5d666d": "1e0726",
+        "616b72": "4a1111",
+        "9c455b": "b9682d",
+        "374793": "dec284",
+        "4764c9": "f8ecc5",
+        "3e9cbb": "4378eb",
+        "61c8de": "5787f1", 
+        "8c9c9d": "350b19",
+        "8d9c9d": "531917",
+        "d88394": "e4d85f",
+        "b0c5c6": "5f291c",
+        "ccd2ce": "4a1111",
+        "d8d9da": "d8d9da",
+        "eeeeee": "844232",
+        "fefefe": "fefefe"
+    }
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/back/780.json b/public/images/pokemon/variant/exp/back/780.json
new file mode 100644
index 00000000000..f55158dcabb
--- /dev/null
+++ b/public/images/pokemon/variant/exp/back/780.json
@@ -0,0 +1,28 @@
+{
+	"1": {
+		"8d541b": "bd8955",
+		"297b8b": "1a316b",
+		"5aa4a4": "284c80",
+		"f5ae07": "faf0b1",
+		"606f55": "496375",
+		"726d5c": "a36026",
+		"105262": "0e194a",
+		"b8b7a3": "cf8d38",
+		"b4cda4": "9ab5b8",
+		"91a37c": "7798a1",
+		"eeeeee": "e6c15e"
+	},
+	"2": {
+		"8d541b": "157d36",
+		"297b8b": "4e4f73",
+		"5aa4a4": "6a708a",
+		"f5ae07": "3ec435",
+		"606f55": "8f825d",
+		"726d5c": "162d3d",
+		"105262": "3f3c61",
+		"b8b7a3": "254e59",
+		"b4cda4": "d6dbba",
+		"91a37c": "b5b48b",
+		"eeeeee": "3e7a76"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/back/840.json b/public/images/pokemon/variant/exp/back/840.json
new file mode 100644
index 00000000000..c60e9aaa3a7
--- /dev/null
+++ b/public/images/pokemon/variant/exp/back/840.json
@@ -0,0 +1,28 @@
+{
+	"1": {
+		"e2244a": "4e77a2",
+		"5fab1d": "7a7c9e",
+		"d39a52": "c55885",
+		"e32b50": "70a2c5",
+		"fe455c": "abd7e2",
+		"fa6f8b": "c1f3f3",
+		"a4d84a": "9aa0b3",
+		"357912": "313846",
+		"d3ee77": "c0cbd6",
+		"8d4229": "9c2e72",
+		"a50534": "3e6085"
+	},
+	"2": {
+		"e2244a": "bfb5ab",
+		"5fab1d": "7a7c9e",
+		"d39a52": "463731",
+		"e32b50": "807770",
+		"fe455c": "dcd9d1",
+		"fa6f8b": "eeedea",
+		"a4d84a": "9aa0b3",
+		"357912": "313846",
+		"d3ee77": "afc6d2",
+		"8d4229": "291411",
+		"a50534": "68645f"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/back/841.json b/public/images/pokemon/variant/exp/back/841.json
new file mode 100644
index 00000000000..11e45f3fc34
--- /dev/null
+++ b/public/images/pokemon/variant/exp/back/841.json
@@ -0,0 +1,34 @@
+{
+	"1": {
+		"df6655": "c1f3f3",
+		"56ab32": "a59ab3",
+		"9b2629": "70a2c5",
+		"d9695a": "c55885",
+		"ebe381": "854774",
+		"ccb468": "5d2654",
+		"8d764b": "110723",
+		"ccca71": "b3b1d6",
+		"612324": "3e6085",
+		"488235": "8e7a9e",
+		"c3a965": "e6dcf9",
+		"b5915b": "34123a",
+		"d72d31": "abd7e2",
+		"395a2e": "383146"
+	},
+	"2": {
+		"df6655": "eeedea",
+		"56ab32": "e28c95",
+		"9b2629": "bfb5ab",
+		"d9695a": "463731",
+		"ebe381": "854774",
+		"ccb468": "5d2654",
+		"8d764b": "110723",
+		"ccca71": "e2dcd6",
+		"612324": "68645f",
+		"488235": "a8546e",
+		"c3a965": "cbb4af",
+		"b5915b": "34123a",
+		"d72d31": "dcd9d1",
+		"395a2e": "4f0e30"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/back/842.json b/public/images/pokemon/variant/exp/back/842.json
new file mode 100644
index 00000000000..926d558357b
--- /dev/null
+++ b/public/images/pokemon/variant/exp/back/842.json
@@ -0,0 +1,38 @@
+{
+	"1": {
+		"ac6b20": "101010",
+		"1f4329": "313846",
+		"9f7034": "110723",
+		"cfb07a": "a3b9d0",
+		"fcff86": "397880",
+		"7de755": "d66f9a",
+		"244d1f": "852560",
+		"fed26e": "698db4",
+		"39a45f": "9aa0b3",
+		"ffa63b": "2d3d68",
+		"e78422": "1f1946",
+		"e75574": "abd7e2",
+		"af2348": "70a2c5",
+		"621522": "3e6085",
+		"ffc575": "2b526f",
+		"2c743e": "7a7c9e"
+	},
+	"2": {
+		"ac6b20": "101010",
+		"1f4329": "341c1c",
+		"9f7034": "2e0e09",
+		"cfb07a": "cbb4af",
+		"fcff86": "eee0bc",
+		"7de755": "589df3",
+		"244d1f": "2e2246",
+		"fed26e": "b9937a",
+		"39a45f": "e28c95",
+		"ffa63b": "63473b",
+		"e78422": "4b211b",
+		"e75574": "dcd9d1",
+		"af2348": "bfb5ab",
+		"621522": "68645f",
+		"ffc575": "d1a87e",
+		"2c743e": "a8546e"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/back/871.json b/public/images/pokemon/variant/exp/back/871.json
new file mode 100644
index 00000000000..5004d3013b5
--- /dev/null
+++ b/public/images/pokemon/variant/exp/back/871.json
@@ -0,0 +1,32 @@
+{
+    "1": {
+        "101010": "101010",
+        "2e2732": "1b3334",
+        "281f2e": "2a2732",
+        "46384c": "504540",
+        "493d4e": "3a5d57",
+        "665272": "62857c",
+        "544947": "7d320e",
+        "7a7270": "a8501b",
+        "9e9a96": "cd7930",
+        "7b4e1c": "5b0d3f",
+        "d58815": "a02c58",
+        "fdba2f": "c45858",
+        "fdf22f": "f1e8e8"
+    },
+    "2": {
+        "101010": "101010",
+        "2e2732": "8b4738",
+        "281f2e": "212232",
+        "46384c": "504740",
+        "493d4e": "ce8a66",
+        "665272": "eac69b",
+        "544947": "1a1730",
+        "7a7270": "27223b",
+        "9e9a96": "3a3449",
+        "7b4e1c": "222c58",
+        "d58815": "343f7f",
+        "fdba2f": "67729f",
+        "fdf22f": "8e9fc9"
+    }
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/back/935_1.json b/public/images/pokemon/variant/exp/back/935_1.json
deleted file mode 100644
index 8f78d4f4569..00000000000
--- a/public/images/pokemon/variant/exp/back/935_1.json
+++ /dev/null
@@ -1,356 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "935_1.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 133,
-				"h": 133
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 29,
-						"h": 49
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 29,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 29,
-						"h": 49
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 29,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 29,
-						"h": 49
-					},
-					"frame": {
-						"x": 29,
-						"y": 0,
-						"w": 29,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 29,
-						"h": 49
-					},
-					"frame": {
-						"x": 29,
-						"y": 0,
-						"w": 29,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 28,
-						"h": 49
-					},
-					"frame": {
-						"x": 58,
-						"y": 0,
-						"w": 28,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 28,
-						"h": 49
-					},
-					"frame": {
-						"x": 58,
-						"y": 0,
-						"w": 28,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 28,
-						"h": 49
-					},
-					"frame": {
-						"x": 86,
-						"y": 0,
-						"w": 28,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 28,
-						"h": 49
-					},
-					"frame": {
-						"x": 86,
-						"y": 0,
-						"w": 28,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 28,
-						"h": 48
-					},
-					"frame": {
-						"x": 0,
-						"y": 49,
-						"w": 28,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 28,
-						"h": 48
-					},
-					"frame": {
-						"x": 0,
-						"y": 49,
-						"w": 28,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 27,
-						"h": 48
-					},
-					"frame": {
-						"x": 28,
-						"y": 49,
-						"w": 27,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 2,
-						"w": 27,
-						"h": 47
-					},
-					"frame": {
-						"x": 55,
-						"y": 49,
-						"w": 27,
-						"h": 47
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 2,
-						"w": 27,
-						"h": 47
-					},
-					"frame": {
-						"x": 55,
-						"y": 49,
-						"w": 27,
-						"h": 47
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 3,
-						"w": 26,
-						"h": 46
-					},
-					"frame": {
-						"x": 82,
-						"y": 49,
-						"w": 26,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 3,
-						"w": 26,
-						"h": 46
-					},
-					"frame": {
-						"x": 82,
-						"y": 49,
-						"w": 26,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 4,
-						"w": 25,
-						"h": 45
-					},
-					"frame": {
-						"x": 108,
-						"y": 49,
-						"w": 25,
-						"h": 45
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:2880dad5e3c550bb25e02ab0ab8d58c8:9dc0340440df25f20b3f006422b7a238:077dcf06dc5fc347497b59afe6126a5e$"
-	}
-}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/back/935_1.png b/public/images/pokemon/variant/exp/back/935_1.png
deleted file mode 100644
index 6f98dfa371e..00000000000
Binary files a/public/images/pokemon/variant/exp/back/935_1.png and /dev/null differ
diff --git a/public/images/pokemon/variant/exp/back/935_2.json b/public/images/pokemon/variant/exp/back/935_2.json
deleted file mode 100644
index 44fc56f8621..00000000000
--- a/public/images/pokemon/variant/exp/back/935_2.json
+++ /dev/null
@@ -1,356 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "935_2.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 133,
-				"h": 133
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 29,
-						"h": 49
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 29,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 29,
-						"h": 49
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 29,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 29,
-						"h": 49
-					},
-					"frame": {
-						"x": 29,
-						"y": 0,
-						"w": 29,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 29,
-						"h": 49
-					},
-					"frame": {
-						"x": 29,
-						"y": 0,
-						"w": 29,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 28,
-						"h": 49
-					},
-					"frame": {
-						"x": 58,
-						"y": 0,
-						"w": 28,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 28,
-						"h": 49
-					},
-					"frame": {
-						"x": 58,
-						"y": 0,
-						"w": 28,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 28,
-						"h": 49
-					},
-					"frame": {
-						"x": 86,
-						"y": 0,
-						"w": 28,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 28,
-						"h": 49
-					},
-					"frame": {
-						"x": 86,
-						"y": 0,
-						"w": 28,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 28,
-						"h": 48
-					},
-					"frame": {
-						"x": 0,
-						"y": 49,
-						"w": 28,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 28,
-						"h": 48
-					},
-					"frame": {
-						"x": 0,
-						"y": 49,
-						"w": 28,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 27,
-						"h": 48
-					},
-					"frame": {
-						"x": 28,
-						"y": 49,
-						"w": 27,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 2,
-						"w": 27,
-						"h": 47
-					},
-					"frame": {
-						"x": 55,
-						"y": 49,
-						"w": 27,
-						"h": 47
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 2,
-						"w": 27,
-						"h": 47
-					},
-					"frame": {
-						"x": 55,
-						"y": 49,
-						"w": 27,
-						"h": 47
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 3,
-						"w": 26,
-						"h": 46
-					},
-					"frame": {
-						"x": 82,
-						"y": 49,
-						"w": 26,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 3,
-						"w": 26,
-						"h": 46
-					},
-					"frame": {
-						"x": 82,
-						"y": 49,
-						"w": 26,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 4,
-						"w": 25,
-						"h": 45
-					},
-					"frame": {
-						"x": 108,
-						"y": 49,
-						"w": 25,
-						"h": 45
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:2880dad5e3c550bb25e02ab0ab8d58c8:9dc0340440df25f20b3f006422b7a238:077dcf06dc5fc347497b59afe6126a5e$"
-	}
-}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/back/935_2.png b/public/images/pokemon/variant/exp/back/935_2.png
deleted file mode 100644
index 08789758184..00000000000
Binary files a/public/images/pokemon/variant/exp/back/935_2.png and /dev/null differ
diff --git a/public/images/pokemon/variant/exp/back/935_3.json b/public/images/pokemon/variant/exp/back/935_3.json
deleted file mode 100644
index b2d13ca9909..00000000000
--- a/public/images/pokemon/variant/exp/back/935_3.json
+++ /dev/null
@@ -1,356 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "935_3.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 133,
-				"h": 133
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 29,
-						"h": 49
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 29,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 29,
-						"h": 49
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 29,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 29,
-						"h": 49
-					},
-					"frame": {
-						"x": 29,
-						"y": 0,
-						"w": 29,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 29,
-						"h": 49
-					},
-					"frame": {
-						"x": 29,
-						"y": 0,
-						"w": 29,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 28,
-						"h": 49
-					},
-					"frame": {
-						"x": 58,
-						"y": 0,
-						"w": 28,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 28,
-						"h": 49
-					},
-					"frame": {
-						"x": 58,
-						"y": 0,
-						"w": 28,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 28,
-						"h": 49
-					},
-					"frame": {
-						"x": 86,
-						"y": 0,
-						"w": 28,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 28,
-						"h": 49
-					},
-					"frame": {
-						"x": 86,
-						"y": 0,
-						"w": 28,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 28,
-						"h": 48
-					},
-					"frame": {
-						"x": 0,
-						"y": 49,
-						"w": 28,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 28,
-						"h": 48
-					},
-					"frame": {
-						"x": 0,
-						"y": 49,
-						"w": 28,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 27,
-						"h": 48
-					},
-					"frame": {
-						"x": 28,
-						"y": 49,
-						"w": 27,
-						"h": 48
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 2,
-						"w": 27,
-						"h": 47
-					},
-					"frame": {
-						"x": 55,
-						"y": 49,
-						"w": 27,
-						"h": 47
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 2,
-						"w": 27,
-						"h": 47
-					},
-					"frame": {
-						"x": 55,
-						"y": 49,
-						"w": 27,
-						"h": 47
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 3,
-						"w": 26,
-						"h": 46
-					},
-					"frame": {
-						"x": 82,
-						"y": 49,
-						"w": 26,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 3,
-						"w": 26,
-						"h": 46
-					},
-					"frame": {
-						"x": 82,
-						"y": 49,
-						"w": 26,
-						"h": 46
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 49
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 4,
-						"w": 25,
-						"h": 45
-					},
-					"frame": {
-						"x": 108,
-						"y": 49,
-						"w": 25,
-						"h": 45
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:2880dad5e3c550bb25e02ab0ab8d58c8:9dc0340440df25f20b3f006422b7a238:077dcf06dc5fc347497b59afe6126a5e$"
-	}
-}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/back/935_3.png b/public/images/pokemon/variant/exp/back/935_3.png
deleted file mode 100644
index e58a17ead33..00000000000
Binary files a/public/images/pokemon/variant/exp/back/935_3.png and /dev/null differ
diff --git a/public/images/pokemon/variant/exp/back/936_1.json b/public/images/pokemon/variant/exp/back/936_1.json
deleted file mode 100644
index ca0f37cffb2..00000000000
--- a/public/images/pokemon/variant/exp/back/936_1.json
+++ /dev/null
@@ -1,356 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "936_1.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 283,
-				"h": 283
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 0,
-						"w": 59,
-						"h": 97
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 59,
-						"h": 97
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 0,
-						"w": 59,
-						"h": 97
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 59,
-						"h": 97
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 59,
-						"h": 97
-					},
-					"frame": {
-						"x": 0,
-						"y": 97,
-						"w": 59,
-						"h": 97
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 59,
-						"h": 97
-					},
-					"frame": {
-						"x": 0,
-						"y": 97,
-						"w": 59,
-						"h": 97
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 59,
-						"h": 97
-					},
-					"frame": {
-						"x": 59,
-						"y": 0,
-						"w": 59,
-						"h": 97
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 59,
-						"h": 97
-					},
-					"frame": {
-						"x": 59,
-						"y": 0,
-						"w": 59,
-						"h": 97
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 0,
-						"w": 58,
-						"h": 97
-					},
-					"frame": {
-						"x": 59,
-						"y": 97,
-						"w": 58,
-						"h": 97
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 0,
-						"w": 58,
-						"h": 97
-					},
-					"frame": {
-						"x": 59,
-						"y": 97,
-						"w": 58,
-						"h": 97
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 58,
-						"h": 97
-					},
-					"frame": {
-						"x": 117,
-						"y": 97,
-						"w": 58,
-						"h": 97
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 58,
-						"h": 97
-					},
-					"frame": {
-						"x": 117,
-						"y": 97,
-						"w": 58,
-						"h": 97
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 1,
-						"w": 57,
-						"h": 96
-					},
-					"frame": {
-						"x": 118,
-						"y": 0,
-						"w": 57,
-						"h": 96
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 1,
-						"w": 57,
-						"h": 96
-					},
-					"frame": {
-						"x": 118,
-						"y": 0,
-						"w": 57,
-						"h": 96
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 58,
-						"h": 95
-					},
-					"frame": {
-						"x": 175,
-						"y": 0,
-						"w": 58,
-						"h": 95
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 58,
-						"h": 95
-					},
-					"frame": {
-						"x": 175,
-						"y": 0,
-						"w": 58,
-						"h": 95
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 58,
-						"h": 94
-					},
-					"frame": {
-						"x": 175,
-						"y": 95,
-						"w": 58,
-						"h": 94
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 3,
-						"w": 57,
-						"h": 94
-					},
-					"frame": {
-						"x": 175,
-						"y": 189,
-						"w": 57,
-						"h": 94
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:973448a7633a4dceb9828d95556ed3c2:09d8ad02433d8015e4665464587b1259:1a0490303f9626f92e787c567cd10feb$"
-	}
-}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/back/936_1.png b/public/images/pokemon/variant/exp/back/936_1.png
deleted file mode 100644
index 154c4e86364..00000000000
Binary files a/public/images/pokemon/variant/exp/back/936_1.png and /dev/null differ
diff --git a/public/images/pokemon/variant/exp/back/936_2.json b/public/images/pokemon/variant/exp/back/936_2.json
deleted file mode 100644
index 282d9823ab7..00000000000
--- a/public/images/pokemon/variant/exp/back/936_2.json
+++ /dev/null
@@ -1,356 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "936_2.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 283,
-				"h": 283
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 0,
-						"w": 59,
-						"h": 97
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 59,
-						"h": 97
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 0,
-						"w": 59,
-						"h": 97
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 59,
-						"h": 97
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 59,
-						"h": 97
-					},
-					"frame": {
-						"x": 0,
-						"y": 97,
-						"w": 59,
-						"h": 97
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 59,
-						"h": 97
-					},
-					"frame": {
-						"x": 0,
-						"y": 97,
-						"w": 59,
-						"h": 97
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 59,
-						"h": 97
-					},
-					"frame": {
-						"x": 59,
-						"y": 0,
-						"w": 59,
-						"h": 97
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 59,
-						"h": 97
-					},
-					"frame": {
-						"x": 59,
-						"y": 0,
-						"w": 59,
-						"h": 97
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 0,
-						"w": 58,
-						"h": 97
-					},
-					"frame": {
-						"x": 59,
-						"y": 97,
-						"w": 58,
-						"h": 97
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 0,
-						"w": 58,
-						"h": 97
-					},
-					"frame": {
-						"x": 59,
-						"y": 97,
-						"w": 58,
-						"h": 97
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 58,
-						"h": 97
-					},
-					"frame": {
-						"x": 117,
-						"y": 97,
-						"w": 58,
-						"h": 97
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 58,
-						"h": 97
-					},
-					"frame": {
-						"x": 117,
-						"y": 97,
-						"w": 58,
-						"h": 97
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 1,
-						"w": 57,
-						"h": 96
-					},
-					"frame": {
-						"x": 118,
-						"y": 0,
-						"w": 57,
-						"h": 96
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 1,
-						"w": 57,
-						"h": 96
-					},
-					"frame": {
-						"x": 118,
-						"y": 0,
-						"w": 57,
-						"h": 96
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 58,
-						"h": 95
-					},
-					"frame": {
-						"x": 175,
-						"y": 0,
-						"w": 58,
-						"h": 95
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 58,
-						"h": 95
-					},
-					"frame": {
-						"x": 175,
-						"y": 0,
-						"w": 58,
-						"h": 95
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 58,
-						"h": 94
-					},
-					"frame": {
-						"x": 175,
-						"y": 95,
-						"w": 58,
-						"h": 94
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 3,
-						"w": 57,
-						"h": 94
-					},
-					"frame": {
-						"x": 175,
-						"y": 189,
-						"w": 57,
-						"h": 94
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:973448a7633a4dceb9828d95556ed3c2:09d8ad02433d8015e4665464587b1259:1a0490303f9626f92e787c567cd10feb$"
-	}
-}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/back/936_2.png b/public/images/pokemon/variant/exp/back/936_2.png
deleted file mode 100644
index 442abc72971..00000000000
Binary files a/public/images/pokemon/variant/exp/back/936_2.png and /dev/null differ
diff --git a/public/images/pokemon/variant/exp/back/936_3.json b/public/images/pokemon/variant/exp/back/936_3.json
deleted file mode 100644
index 24eeb8e705e..00000000000
--- a/public/images/pokemon/variant/exp/back/936_3.json
+++ /dev/null
@@ -1,356 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "936_3.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 283,
-				"h": 283
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 0,
-						"w": 59,
-						"h": 97
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 59,
-						"h": 97
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 0,
-						"w": 59,
-						"h": 97
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 59,
-						"h": 97
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 59,
-						"h": 97
-					},
-					"frame": {
-						"x": 0,
-						"y": 97,
-						"w": 59,
-						"h": 97
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 0,
-						"w": 59,
-						"h": 97
-					},
-					"frame": {
-						"x": 0,
-						"y": 97,
-						"w": 59,
-						"h": 97
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 59,
-						"h": 97
-					},
-					"frame": {
-						"x": 59,
-						"y": 0,
-						"w": 59,
-						"h": 97
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 59,
-						"h": 97
-					},
-					"frame": {
-						"x": 59,
-						"y": 0,
-						"w": 59,
-						"h": 97
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 0,
-						"w": 58,
-						"h": 97
-					},
-					"frame": {
-						"x": 59,
-						"y": 97,
-						"w": 58,
-						"h": 97
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 0,
-						"w": 58,
-						"h": 97
-					},
-					"frame": {
-						"x": 59,
-						"y": 97,
-						"w": 58,
-						"h": 97
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 58,
-						"h": 97
-					},
-					"frame": {
-						"x": 117,
-						"y": 97,
-						"w": 58,
-						"h": 97
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 58,
-						"h": 97
-					},
-					"frame": {
-						"x": 117,
-						"y": 97,
-						"w": 58,
-						"h": 97
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 1,
-						"w": 57,
-						"h": 96
-					},
-					"frame": {
-						"x": 118,
-						"y": 0,
-						"w": 57,
-						"h": 96
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 1,
-						"w": 57,
-						"h": 96
-					},
-					"frame": {
-						"x": 118,
-						"y": 0,
-						"w": 57,
-						"h": 96
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 58,
-						"h": 95
-					},
-					"frame": {
-						"x": 175,
-						"y": 0,
-						"w": 58,
-						"h": 95
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 58,
-						"h": 95
-					},
-					"frame": {
-						"x": 175,
-						"y": 0,
-						"w": 58,
-						"h": 95
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 58,
-						"h": 94
-					},
-					"frame": {
-						"x": 175,
-						"y": 95,
-						"w": 58,
-						"h": 94
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 67,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 3,
-						"w": 57,
-						"h": 94
-					},
-					"frame": {
-						"x": 175,
-						"y": 189,
-						"w": 57,
-						"h": 94
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:973448a7633a4dceb9828d95556ed3c2:09d8ad02433d8015e4665464587b1259:1a0490303f9626f92e787c567cd10feb$"
-	}
-}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/back/936_3.png b/public/images/pokemon/variant/exp/back/936_3.png
deleted file mode 100644
index db67191d73e..00000000000
Binary files a/public/images/pokemon/variant/exp/back/936_3.png and /dev/null differ
diff --git a/public/images/pokemon/variant/exp/back/937_1.json b/public/images/pokemon/variant/exp/back/937_1.json
deleted file mode 100644
index f7f0201b676..00000000000
--- a/public/images/pokemon/variant/exp/back/937_1.json
+++ /dev/null
@@ -1,650 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "937_1.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 382,
-				"h": 382
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 91,
-						"h": 96
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 91,
-						"h": 96
-					}
-				},
-				{
-					"filename": "0028.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 91,
-						"h": 96
-					},
-					"frame": {
-						"x": 91,
-						"y": 0,
-						"w": 91,
-						"h": 96
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 90,
-						"h": 96
-					},
-					"frame": {
-						"x": 182,
-						"y": 0,
-						"w": 90,
-						"h": 96
-					}
-				},
-				{
-					"filename": "0027.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 90,
-						"h": 96
-					},
-					"frame": {
-						"x": 182,
-						"y": 0,
-						"w": 90,
-						"h": 96
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 89,
-						"h": 96
-					},
-					"frame": {
-						"x": 272,
-						"y": 0,
-						"w": 89,
-						"h": 96
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 89,
-						"h": 96
-					},
-					"frame": {
-						"x": 272,
-						"y": 0,
-						"w": 89,
-						"h": 96
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 91,
-						"h": 95
-					},
-					"frame": {
-						"x": 0,
-						"y": 96,
-						"w": 91,
-						"h": 95
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 91,
-						"h": 95
-					},
-					"frame": {
-						"x": 0,
-						"y": 96,
-						"w": 91,
-						"h": 95
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 89,
-						"h": 95
-					},
-					"frame": {
-						"x": 91,
-						"y": 96,
-						"w": 89,
-						"h": 95
-					}
-				},
-				{
-					"filename": "0026.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 89,
-						"h": 95
-					},
-					"frame": {
-						"x": 91,
-						"y": 96,
-						"w": 89,
-						"h": 95
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 88,
-						"h": 96
-					},
-					"frame": {
-						"x": 180,
-						"y": 96,
-						"w": 88,
-						"h": 96
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 88,
-						"h": 96
-					},
-					"frame": {
-						"x": 180,
-						"y": 96,
-						"w": 88,
-						"h": 96
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 88,
-						"h": 96
-					},
-					"frame": {
-						"x": 0,
-						"y": 191,
-						"w": 88,
-						"h": 96
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 88,
-						"h": 96
-					},
-					"frame": {
-						"x": 0,
-						"y": 191,
-						"w": 88,
-						"h": 96
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 88,
-						"h": 96
-					},
-					"frame": {
-						"x": 88,
-						"y": 191,
-						"w": 88,
-						"h": 96
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 88,
-						"h": 96
-					},
-					"frame": {
-						"x": 88,
-						"y": 191,
-						"w": 88,
-						"h": 96
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 87,
-						"h": 96
-					},
-					"frame": {
-						"x": 176,
-						"y": 192,
-						"w": 87,
-						"h": 96
-					}
-				},
-				{
-					"filename": "0025.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 87,
-						"h": 96
-					},
-					"frame": {
-						"x": 176,
-						"y": 192,
-						"w": 87,
-						"h": 96
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 85,
-						"h": 95
-					},
-					"frame": {
-						"x": 0,
-						"y": 287,
-						"w": 85,
-						"h": 95
-					}
-				},
-				{
-					"filename": "0029.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 85,
-						"h": 95
-					},
-					"frame": {
-						"x": 0,
-						"y": 287,
-						"w": 85,
-						"h": 95
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 85,
-						"h": 94
-					},
-					"frame": {
-						"x": 85,
-						"y": 287,
-						"w": 85,
-						"h": 94
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 85,
-						"h": 94
-					},
-					"frame": {
-						"x": 85,
-						"y": 287,
-						"w": 85,
-						"h": 94
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 82,
-						"h": 96
-					},
-					"frame": {
-						"x": 263,
-						"y": 192,
-						"w": 82,
-						"h": 96
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 82,
-						"h": 96
-					},
-					"frame": {
-						"x": 263,
-						"y": 192,
-						"w": 82,
-						"h": 96
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 3,
-						"w": 85,
-						"h": 93
-					},
-					"frame": {
-						"x": 268,
-						"y": 96,
-						"w": 85,
-						"h": 93
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 3,
-						"w": 85,
-						"h": 93
-					},
-					"frame": {
-						"x": 268,
-						"y": 96,
-						"w": 85,
-						"h": 93
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 81,
-						"h": 94
-					},
-					"frame": {
-						"x": 170,
-						"y": 288,
-						"w": 81,
-						"h": 94
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 81,
-						"h": 94
-					},
-					"frame": {
-						"x": 170,
-						"y": 288,
-						"w": 81,
-						"h": 94
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 80,
-						"h": 94
-					},
-					"frame": {
-						"x": 251,
-						"y": 288,
-						"w": 80,
-						"h": 94
-					}
-				},
-				{
-					"filename": "0030.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 80,
-						"h": 94
-					},
-					"frame": {
-						"x": 251,
-						"y": 288,
-						"w": 80,
-						"h": 94
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:25759b98c1f7867fe6c4ff54c797c3e2:0076c777d18a4f3d780937118dfb6388:1d4b4f8d62307c37457ba974879b47d0$"
-	}
-}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/back/937_1.png b/public/images/pokemon/variant/exp/back/937_1.png
deleted file mode 100644
index 2d0d58b0912..00000000000
Binary files a/public/images/pokemon/variant/exp/back/937_1.png and /dev/null differ
diff --git a/public/images/pokemon/variant/exp/back/937_2.json b/public/images/pokemon/variant/exp/back/937_2.json
deleted file mode 100644
index cda51714b93..00000000000
--- a/public/images/pokemon/variant/exp/back/937_2.json
+++ /dev/null
@@ -1,650 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "937_2.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 382,
-				"h": 382
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 91,
-						"h": 96
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 91,
-						"h": 96
-					}
-				},
-				{
-					"filename": "0028.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 91,
-						"h": 96
-					},
-					"frame": {
-						"x": 91,
-						"y": 0,
-						"w": 91,
-						"h": 96
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 90,
-						"h": 96
-					},
-					"frame": {
-						"x": 182,
-						"y": 0,
-						"w": 90,
-						"h": 96
-					}
-				},
-				{
-					"filename": "0027.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 90,
-						"h": 96
-					},
-					"frame": {
-						"x": 182,
-						"y": 0,
-						"w": 90,
-						"h": 96
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 89,
-						"h": 96
-					},
-					"frame": {
-						"x": 272,
-						"y": 0,
-						"w": 89,
-						"h": 96
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 89,
-						"h": 96
-					},
-					"frame": {
-						"x": 272,
-						"y": 0,
-						"w": 89,
-						"h": 96
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 91,
-						"h": 95
-					},
-					"frame": {
-						"x": 0,
-						"y": 96,
-						"w": 91,
-						"h": 95
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 91,
-						"h": 95
-					},
-					"frame": {
-						"x": 0,
-						"y": 96,
-						"w": 91,
-						"h": 95
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 89,
-						"h": 95
-					},
-					"frame": {
-						"x": 91,
-						"y": 96,
-						"w": 89,
-						"h": 95
-					}
-				},
-				{
-					"filename": "0026.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 89,
-						"h": 95
-					},
-					"frame": {
-						"x": 91,
-						"y": 96,
-						"w": 89,
-						"h": 95
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 88,
-						"h": 96
-					},
-					"frame": {
-						"x": 180,
-						"y": 96,
-						"w": 88,
-						"h": 96
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 88,
-						"h": 96
-					},
-					"frame": {
-						"x": 180,
-						"y": 96,
-						"w": 88,
-						"h": 96
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 88,
-						"h": 96
-					},
-					"frame": {
-						"x": 0,
-						"y": 191,
-						"w": 88,
-						"h": 96
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 88,
-						"h": 96
-					},
-					"frame": {
-						"x": 0,
-						"y": 191,
-						"w": 88,
-						"h": 96
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 88,
-						"h": 96
-					},
-					"frame": {
-						"x": 88,
-						"y": 191,
-						"w": 88,
-						"h": 96
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 88,
-						"h": 96
-					},
-					"frame": {
-						"x": 88,
-						"y": 191,
-						"w": 88,
-						"h": 96
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 87,
-						"h": 96
-					},
-					"frame": {
-						"x": 176,
-						"y": 192,
-						"w": 87,
-						"h": 96
-					}
-				},
-				{
-					"filename": "0025.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 87,
-						"h": 96
-					},
-					"frame": {
-						"x": 176,
-						"y": 192,
-						"w": 87,
-						"h": 96
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 85,
-						"h": 95
-					},
-					"frame": {
-						"x": 0,
-						"y": 287,
-						"w": 85,
-						"h": 95
-					}
-				},
-				{
-					"filename": "0029.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 85,
-						"h": 95
-					},
-					"frame": {
-						"x": 0,
-						"y": 287,
-						"w": 85,
-						"h": 95
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 85,
-						"h": 94
-					},
-					"frame": {
-						"x": 85,
-						"y": 287,
-						"w": 85,
-						"h": 94
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 85,
-						"h": 94
-					},
-					"frame": {
-						"x": 85,
-						"y": 287,
-						"w": 85,
-						"h": 94
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 82,
-						"h": 96
-					},
-					"frame": {
-						"x": 263,
-						"y": 192,
-						"w": 82,
-						"h": 96
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 82,
-						"h": 96
-					},
-					"frame": {
-						"x": 263,
-						"y": 192,
-						"w": 82,
-						"h": 96
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 3,
-						"w": 85,
-						"h": 93
-					},
-					"frame": {
-						"x": 268,
-						"y": 96,
-						"w": 85,
-						"h": 93
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 3,
-						"w": 85,
-						"h": 93
-					},
-					"frame": {
-						"x": 268,
-						"y": 96,
-						"w": 85,
-						"h": 93
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 81,
-						"h": 94
-					},
-					"frame": {
-						"x": 170,
-						"y": 288,
-						"w": 81,
-						"h": 94
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 81,
-						"h": 94
-					},
-					"frame": {
-						"x": 170,
-						"y": 288,
-						"w": 81,
-						"h": 94
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 80,
-						"h": 94
-					},
-					"frame": {
-						"x": 251,
-						"y": 288,
-						"w": 80,
-						"h": 94
-					}
-				},
-				{
-					"filename": "0030.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 80,
-						"h": 94
-					},
-					"frame": {
-						"x": 251,
-						"y": 288,
-						"w": 80,
-						"h": 94
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:25759b98c1f7867fe6c4ff54c797c3e2:0076c777d18a4f3d780937118dfb6388:1d4b4f8d62307c37457ba974879b47d0$"
-	}
-}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/back/937_2.png b/public/images/pokemon/variant/exp/back/937_2.png
deleted file mode 100644
index 7ba1aa09b97..00000000000
Binary files a/public/images/pokemon/variant/exp/back/937_2.png and /dev/null differ
diff --git a/public/images/pokemon/variant/exp/back/937_3.json b/public/images/pokemon/variant/exp/back/937_3.json
deleted file mode 100644
index c5fff6bd743..00000000000
--- a/public/images/pokemon/variant/exp/back/937_3.json
+++ /dev/null
@@ -1,650 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "937_3.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 382,
-				"h": 382
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 91,
-						"h": 96
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 91,
-						"h": 96
-					}
-				},
-				{
-					"filename": "0028.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 91,
-						"h": 96
-					},
-					"frame": {
-						"x": 91,
-						"y": 0,
-						"w": 91,
-						"h": 96
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 90,
-						"h": 96
-					},
-					"frame": {
-						"x": 182,
-						"y": 0,
-						"w": 90,
-						"h": 96
-					}
-				},
-				{
-					"filename": "0027.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 90,
-						"h": 96
-					},
-					"frame": {
-						"x": 182,
-						"y": 0,
-						"w": 90,
-						"h": 96
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 89,
-						"h": 96
-					},
-					"frame": {
-						"x": 272,
-						"y": 0,
-						"w": 89,
-						"h": 96
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 0,
-						"w": 89,
-						"h": 96
-					},
-					"frame": {
-						"x": 272,
-						"y": 0,
-						"w": 89,
-						"h": 96
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 91,
-						"h": 95
-					},
-					"frame": {
-						"x": 0,
-						"y": 96,
-						"w": 91,
-						"h": 95
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 91,
-						"h": 95
-					},
-					"frame": {
-						"x": 0,
-						"y": 96,
-						"w": 91,
-						"h": 95
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 89,
-						"h": 95
-					},
-					"frame": {
-						"x": 91,
-						"y": 96,
-						"w": 89,
-						"h": 95
-					}
-				},
-				{
-					"filename": "0026.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 1,
-						"w": 89,
-						"h": 95
-					},
-					"frame": {
-						"x": 91,
-						"y": 96,
-						"w": 89,
-						"h": 95
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 88,
-						"h": 96
-					},
-					"frame": {
-						"x": 180,
-						"y": 96,
-						"w": 88,
-						"h": 96
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 88,
-						"h": 96
-					},
-					"frame": {
-						"x": 180,
-						"y": 96,
-						"w": 88,
-						"h": 96
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 88,
-						"h": 96
-					},
-					"frame": {
-						"x": 0,
-						"y": 191,
-						"w": 88,
-						"h": 96
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 88,
-						"h": 96
-					},
-					"frame": {
-						"x": 0,
-						"y": 191,
-						"w": 88,
-						"h": 96
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 88,
-						"h": 96
-					},
-					"frame": {
-						"x": 88,
-						"y": 191,
-						"w": 88,
-						"h": 96
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 88,
-						"h": 96
-					},
-					"frame": {
-						"x": 88,
-						"y": 191,
-						"w": 88,
-						"h": 96
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 87,
-						"h": 96
-					},
-					"frame": {
-						"x": 176,
-						"y": 192,
-						"w": 87,
-						"h": 96
-					}
-				},
-				{
-					"filename": "0025.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 87,
-						"h": 96
-					},
-					"frame": {
-						"x": 176,
-						"y": 192,
-						"w": 87,
-						"h": 96
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 85,
-						"h": 95
-					},
-					"frame": {
-						"x": 0,
-						"y": 287,
-						"w": 85,
-						"h": 95
-					}
-				},
-				{
-					"filename": "0029.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 85,
-						"h": 95
-					},
-					"frame": {
-						"x": 0,
-						"y": 287,
-						"w": 85,
-						"h": 95
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 85,
-						"h": 94
-					},
-					"frame": {
-						"x": 85,
-						"y": 287,
-						"w": 85,
-						"h": 94
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 3,
-						"w": 85,
-						"h": 94
-					},
-					"frame": {
-						"x": 85,
-						"y": 287,
-						"w": 85,
-						"h": 94
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 82,
-						"h": 96
-					},
-					"frame": {
-						"x": 263,
-						"y": 192,
-						"w": 82,
-						"h": 96
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 82,
-						"h": 96
-					},
-					"frame": {
-						"x": 263,
-						"y": 192,
-						"w": 82,
-						"h": 96
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 3,
-						"w": 85,
-						"h": 93
-					},
-					"frame": {
-						"x": 268,
-						"y": 96,
-						"w": 85,
-						"h": 93
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 3,
-						"w": 85,
-						"h": 93
-					},
-					"frame": {
-						"x": 268,
-						"y": 96,
-						"w": 85,
-						"h": 93
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 81,
-						"h": 94
-					},
-					"frame": {
-						"x": 170,
-						"y": 288,
-						"w": 81,
-						"h": 94
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 3,
-						"w": 81,
-						"h": 94
-					},
-					"frame": {
-						"x": 170,
-						"y": 288,
-						"w": 81,
-						"h": 94
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 80,
-						"h": 94
-					},
-					"frame": {
-						"x": 251,
-						"y": 288,
-						"w": 80,
-						"h": 94
-					}
-				},
-				{
-					"filename": "0030.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 95,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 80,
-						"h": 94
-					},
-					"frame": {
-						"x": 251,
-						"y": 288,
-						"w": 80,
-						"h": 94
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:25759b98c1f7867fe6c4ff54c797c3e2:0076c777d18a4f3d780937118dfb6388:1d4b4f8d62307c37457ba974879b47d0$"
-	}
-}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/back/937_3.png b/public/images/pokemon/variant/exp/back/937_3.png
deleted file mode 100644
index ee875356334..00000000000
Binary files a/public/images/pokemon/variant/exp/back/937_3.png and /dev/null differ
diff --git a/public/images/pokemon/variant/exp/back/female/6215.json b/public/images/pokemon/variant/exp/back/female/6215.json
new file mode 100644
index 00000000000..a66e3780d12
--- /dev/null
+++ b/public/images/pokemon/variant/exp/back/female/6215.json
@@ -0,0 +1,32 @@
+{
+	"1": {
+		"724ca2": "12968b",
+		"9c9bce": "ae8976",
+		"503678": "0f5d6d",
+		"956cbe": "31dabb",
+		"514a80": "402010",
+		"dcdbf7": "d0b3a4",
+		"080808": "080808",
+		"28234b": "220d0a",
+		"7d6ca4": "672e26",
+		"584d80": "401914",
+		"f6f6ff": "f6f6ff",
+		"bdbdc5": "bdbdc5",
+		"c52973": "ea903f"
+	},
+	"2": {
+		"724ca2": "982e33",
+		"9c9bce": "3c8775",
+		"503678": "601522",
+		"956cbe": "cc5427",
+		"514a80": "14273a",
+		"dcdbf7": "60ae7e",
+		"080808": "080808",
+		"28234b": "0a191e",
+		"7d6ca4": "395962",
+		"584d80": "1c3942",
+		"f6f6ff": "f6f6ff",
+		"bdbdc5": "bdbdc5",
+		"c52973": "f49633"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/female/6215.json b/public/images/pokemon/variant/exp/female/6215.json
new file mode 100644
index 00000000000..3198424563b
--- /dev/null
+++ b/public/images/pokemon/variant/exp/female/6215.json
@@ -0,0 +1,38 @@
+{
+	"1": {
+		"503678": "0f5d6d",
+		"080808": "080808",
+		"514a80": "402010",
+		"956cbe": "31dabb",
+		"9c9bce": "ae8976",
+		"724ca2": "12968b",
+		"dcdbf7": "d0b3a4",
+		"7d6ca4": "853a36",
+		"c58b08": "6e6f6f",
+		"ffde7b": "a7a7a7",
+		"584d80": "562627",
+		"28234b": "220d0a",
+		"c52973": "ea903f",
+		"bdbdc5": "bdbdc5",
+		"f6f6ff": "f6f6ff",
+		"000000": "000000"
+	},
+	"2": {
+		"503678": "601522",
+		"080808": "080808",
+		"514a80": "14273a",
+		"956cbe": "cc5427",
+		"9c9bce": "3c8775",
+		"724ca2": "982e33",
+		"dcdbf7": "60ae7e",
+		"7d6ca4": "395962",
+		"c58b08": "ffa341",
+		"ffde7b": "ffe07e",
+		"584d80": "1c3942",
+		"28234b": "0a191e",
+		"c52973": "f49633",
+		"bdbdc5": "bdbdc5",
+		"f6f6ff": "f6f6ff",
+		"000000": "000000"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/female/207.json b/public/images/pokemon/variant/female/207.json
index b0ae8e84102..b1e3582ae5c 100644
--- a/public/images/pokemon/variant/female/207.json
+++ b/public/images/pokemon/variant/female/207.json
@@ -1,32 +1,26 @@
 {
 	"1": {
-		"63314a": "7f4812",
-		"e6a5ce": "f8dd84",
-		"101010": "101010",
-		"ad6394": "b67322",
-		"de84b5": "daa93f",
-		"4a5a73": "4a5a73",
-		"ffffff": "ffffff",
-		"adbdc5": "adbdc5",
-		"bd6b5a": "bd6b5a",
+		"de84b5": "e3784d",
+		"e6a5ce": "f7a565",
+		"63314a": "2b8199",
 		"4a73bd": "3b426f",
-		"ffa584": "ffa584",
 		"294a7b": "1f2142",
-		"6b9cef": "596596"
+		"ad6394": "ba4732",
+		"612f48": "802019",
+		"6b9cef": "596596",
+		"ffa584": "68edca",
+		"bd6b5a": "44c5c9"
 	},
 	"2": {
-		"63314a": "5f1723",
-		"e6a5ce": "ef6b58",
-		"101010": "101010",
-		"ad6394": "97343c",
-		"de84b5": "c04144",
-		"4a5a73": "4a5a73",
-		"ffffff": "ffffff",
-		"adbdc5": "adbdc5",
-		"bd6b5a": "c86539",
-		"4a73bd": "42bca0",
+		"de84b5": "42bca0",
+		"e6a5ce": "70e0b7",
+		"63314a": "752d17",
+		"4a73bd": "de597e",
+		"294a7b": "8a2b54",
+		"ad6394": "27868a",
+		"612f48": "134e5e",
+		"6b9cef": "f78f96",
 		"ffa584": "f0a452",
-		"294a7b": "33817e",
-		"6b9cef": "81e4b3"
+		"bd6b5a": "c86539"
 	}
 }
\ No newline at end of file
diff --git a/public/images/pokemon/variant/female/332.json b/public/images/pokemon/variant/female/332.json
new file mode 100644
index 00000000000..c86429d13c4
--- /dev/null
+++ b/public/images/pokemon/variant/female/332.json
@@ -0,0 +1,34 @@
+{
+	"1": {
+		"319452": "780d4a",
+		"4a7310": "982443",
+		"7ba563": "b44040",
+		"bdef84": "ec8c8c",
+		"8cbd63": "bf3d64",
+		"215200": "710f2e",
+		"a5d674": "e16363",
+		"196b21": "7d1157",
+		"f7ce00": "5bcfc3",
+		"525252": "20668c",
+		"63b56b": "9e2056",
+		"a5d673": "de5b6f",
+		"8c6b3a": "33a3b0",
+		"4aa552": "8a1652"
+	},
+	"2": {
+		"319452": "b59c72",
+		"4a7310": "4f3956",
+		"7ba563": "805a9c",
+		"bdef84": "c193cf",
+		"8cbd63": "f6f7df",
+		"215200": "694d37",
+		"a5d674": "a473ba",
+		"196b21": "9c805f",
+		"f7ce00": "f2aab6",
+		"525252": "983364",
+		"63b56b": "e3ddb8",
+		"a5d673": "ebe9ca",
+		"8c6b3a": "df879f",
+		"4aa552": "c9b991"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/female/396.json b/public/images/pokemon/variant/female/396.json
new file mode 100644
index 00000000000..f811a4e002d
--- /dev/null
+++ b/public/images/pokemon/variant/female/396.json
@@ -0,0 +1,38 @@
+{
+	"1": {
+		"d6dede": "e3d09d",
+		"736363": "89ad57",
+		"3f1e27": "965318",
+		"d67300": "edb651",
+		"b5b5b5": "d1a562",
+		"9c4a21": "db963b",
+		"ff9429": "ffcf5e",
+		"3a2129": "2a4f19",
+		"524a4a": "558033",
+		"4f4747": "dbb070",
+		"fcfcfc": "f0ebc5",
+		"ff0000": "5da848",
+		"4a4343": "731e22",
+		"ad9c9c": "ed7b61",
+		"756565": "144a40",
+		"8c7373": "b53f36"
+	},
+	"2": {
+		"d6dede": "f0deaa",
+		"736363": "4da8a1",
+		"3f1e27": "451915",
+		"d67300": "63362b",
+		"b5b5b5": "debd8c",
+		"9c4a21": "52281f",
+		"ff9429": "8c604c",
+		"3a2129": "235a6b",
+		"524a4a": "307b82",
+		"4f4747": "e3c896",
+		"fcfcfc": "fcfad2",
+		"ff0000": "c4568a",
+		"4a4343": "0d142e",
+		"ad9c9c": "2f436b",
+		"756565": "e0703d",
+		"8c7373": "1b2745"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/female/397.json b/public/images/pokemon/variant/female/397.json
new file mode 100644
index 00000000000..8f266f191c6
--- /dev/null
+++ b/public/images/pokemon/variant/female/397.json
@@ -0,0 +1,38 @@
+{
+	"1": {
+		"ff9429": "ffcf5e",
+		"3a3a3a": "558033",
+		"7b4221": "965318",
+		"523a4a": "731e22",
+		"9c848c": "ed7b61",
+		"5a525a": "739e49",
+		"735a63": "b53f36",
+		"f75242": "8bba65",
+		"b5b5b5": "d9c798",
+		"bd6300": "db963b",
+		"9c4242": "528a3e",
+		"3b303d": "144a40",
+		"4d464d": "256e54",
+		"2e222e": "3c5e24",
+		"3b333b": "753510",
+		"fcfcfc": "f0ebc5"
+	},
+	"2": {
+		"ff9429": "8c604c",
+		"3a3a3a": "307b82",
+		"7b4221": "52281f",
+		"523a4a": "0d142e",
+		"9c848c": "2f436b",
+		"5a525a": "4da8a1",
+		"735a63": "1b2745",
+		"f75242": "f797ad",
+		"b5b5b5": "f0deaa",
+		"bd6300": "63362b",
+		"9c4242": "c4568a",
+		"3b303d": "e0703d",
+		"4d464d": "e68e57",
+		"2e222e": "235a6b",
+		"3b333b": "421917",
+		"fcfcfc": "fcfad2"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/female/398.json b/public/images/pokemon/variant/female/398.json
new file mode 100644
index 00000000000..d4e72672103
--- /dev/null
+++ b/public/images/pokemon/variant/female/398.json
@@ -0,0 +1,36 @@
+{
+	"1": {
+		"735a63": "b53f36",
+		"5c545c": "144a40",
+		"5a525a": "558033",
+		"7b6b7b": "89ad57",
+		"f75242": "156146",
+		"4f3847": "753510",
+		"b5b5b5": "d7be89",
+		"9c4242": "0c403b",
+		"7b4221": "965318",
+		"fcfcfc": "e8e3b6",
+		"3a3a3a": "2a4f19",
+		"bd6300": "db963b",
+		"523a4a": "731e22",
+		"9c848c": "ed7b61",
+		"ff9429": "ffcf5e"
+	},
+	"2": {
+		"735a63": "1b2745",
+		"5c545c": "e0703d",
+		"5a525a": "307b82",
+		"7b6b7b": "4da8a1",
+		"f75242": "f78a4a",
+		"4f3847": "421917",
+		"b5b5b5": "f0deaa",
+		"9c4242": "c94a2a",
+		"7b4221": "52281f",
+		"fcfcfc": "fcfad2",
+		"3a3a3a": "235a6b",
+		"bd6300": "63362b",
+		"523a4a": "080d1f",
+		"9c848c": "293854",
+		"ff9429": "8c604c"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/female/403.json b/public/images/pokemon/variant/female/403.json
new file mode 100644
index 00000000000..4f8bd43540c
--- /dev/null
+++ b/public/images/pokemon/variant/female/403.json
@@ -0,0 +1,26 @@
+{
+	"1": {
+		"b59c5a": "3763b8",
+		"7badf7": "bf403a",
+		"943a52": "33190a",
+		"637bb5": "962a2f",
+		"4a4a63": "dcb788",
+		"ffe65a": "4881cc",
+		"313142": "bd8254",
+		"e64a52": "3e2711",
+		"42426b": "63121d",
+		"736352": "234085"
+	},
+	"2": {
+		"b59c5a": "36b88a",
+		"7badf7": "324663",
+		"943a52": "3a5e80",
+		"637bb5": "222f4d",
+		"4a4a63": "bbe5e5",
+		"ffe65a": "46d382",
+		"313142": "73bec9",
+		"e64a52": "4a7c92",
+		"42426b": "161b36",
+		"736352": "298e7d"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/female/404.json b/public/images/pokemon/variant/female/404.json
new file mode 100644
index 00000000000..1c96dd11832
--- /dev/null
+++ b/public/images/pokemon/variant/female/404.json
@@ -0,0 +1,28 @@
+{
+	"1": {
+		"736352": "234085",
+		"4a4a73": "63121d",
+		"63637b": "f1dbb1",
+		"b59c5a": "3763b8",
+		"637bb5": "962a2f",
+		"4a4a63": "dcb788",
+		"ffe65a": "4881cc",
+		"313142": "bd8254",
+		"943a52": "5a2d0f",
+		"e64a52": "3e2711",
+		"7badf7": "bf403a"
+	},
+	"2": {
+		"736352": "298e7d",
+		"4a4a73": "161b36",
+		"63637b": "def4f0",
+		"b59c5a": "36b88a",
+		"637bb5": "222f4d",
+		"4a4a63": "bbe5e5",
+		"ffe65a": "46d382",
+		"313142": "73bec9",
+		"943a52": "3a5e80",
+		"e64a52": "4a7c92",
+		"7badf7": "324663"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/female/405.json b/public/images/pokemon/variant/female/405.json
new file mode 100644
index 00000000000..c873cceb259
--- /dev/null
+++ b/public/images/pokemon/variant/female/405.json
@@ -0,0 +1,28 @@
+{
+	"1": {
+		"b59c5a": "3763b8",
+		"7badf7": "bf403a",
+		"63637b": "f1dbb1",
+		"637bb5": "962a2f",
+		"943a52": "5a2d0f",
+		"4a4a63": "dcb488",
+		"ffe65a": "4881cc",
+		"313142": "bd7e54",
+		"4a4a73": "63121d",
+		"e64a52": "3e2711",
+		"736352": "234085"
+	},
+	"2": {
+		"b59c5a": "36b88a",
+		"7badf7": "324663",
+		"63637b": "def4f0",
+		"637bb5": "222f4d",
+		"943a52": "3a5e80",
+		"4a4a63": "bbe5e5",
+		"ffe65a": "46d382",
+		"313142": "73bec9",
+		"4a4a73": "161b36",
+		"e64a52": "4a7c92",
+		"736352": "298e7d"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/female/417.json b/public/images/pokemon/variant/female/417.json
new file mode 100644
index 00000000000..42b3180ee3c
--- /dev/null
+++ b/public/images/pokemon/variant/female/417.json
@@ -0,0 +1,36 @@
+{
+    "1": {
+        "101010": "101010",
+        "3e364e": "734430",
+        "524941": "732e12",
+        "5a524a": "642f1a",
+        "4a425a": "5f2618",
+        "84523a": "9b314f",
+        "ef845a": "e26e6e",
+        "c5a563": "e95d6c",
+        "ffd663": "f17c7c",
+        "637b9c": "86452b",
+        "7bb5e6": "a25f37",
+        "cec5c5": "e8be64",
+        "f7f7f7": "faeda9",
+        "ffffff": "ffffff",
+        "7b7b84": "8e623c"
+    },
+    "2": {
+        "101010": "101010",
+        "3e364e": "203243",
+        "524941": "2d284c",
+        "5a524a": "0f203a",
+        "4a425a": "23704c",
+        "84523a": "693939",
+        "ef845a": "e1b8ac",
+        "c5a563": "8fecf7",
+        "ffd663": "d0fdff",
+        "637b9c": "a2dc76",
+        "7bb5e6": "e4fba1",
+        "cec5c5": "357577",
+        "f7f7f7": "5ba297",
+        "ffffff": "ffffff",
+        "7b7b84": "1f3f4e"
+    }
+}
\ No newline at end of file
diff --git a/public/images/pokemon_icons_1v.json b/public/images/pokemon_icons_1v.json
index de66db65eb7..f5023b98a4b 100644
--- a/public/images/pokemon_icons_1v.json
+++ b/public/images/pokemon_icons_1v.json
@@ -13,2287 +13,6287 @@
 					"filename": "1_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 0, "y": 0, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "1_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 40, "y": 0, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 40,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "2_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 80, "y": 0, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 80,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "2_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 120, "y": 0, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 120,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "3-gigantamax_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 160, "y": 0, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 160,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "3-gigantamax_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 200, "y": 0, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 200,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "3-mega_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 240, "y": 0, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 240,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "3-mega_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 280, "y": 0, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 280,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "3_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 320, "y": 0, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 320,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "3_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 360, "y": 0, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 360,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "4_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 400, "y": 0, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 400,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "4_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 440, "y": 0, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 440,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "5_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 480, "y": 0, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 480,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "5_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 520, "y": 0, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 520,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "6-gigantamax_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 560, "y": 0, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 560,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "6-gigantamax_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 0, "y": 30, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 0,
+						"y": 30,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "6-mega-x_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 40, "y": 30, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 40,
+						"y": 30,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "6-mega-x_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 80, "y": 30, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 80,
+						"y": 30,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "6-mega-y_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 120, "y": 30, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 120,
+						"y": 30,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "6-mega-y_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 160, "y": 30, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 160,
+						"y": 30,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "6_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 200, "y": 30, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 200,
+						"y": 30,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "6_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 240, "y": 30, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 240,
+						"y": 30,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "7_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 280, "y": 30, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 280,
+						"y": 30,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "7_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 320, "y": 30, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 320,
+						"y": 30,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "8_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 360, "y": 30, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 360,
+						"y": 30,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "8_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 400, "y": 30, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 400,
+						"y": 30,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "9-gigantamax_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 440, "y": 30, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 440,
+						"y": 30,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "9-gigantamax_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 480, "y": 30, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 480,
+						"y": 30,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "9-mega_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 520, "y": 30, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 520,
+						"y": 30,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "9-mega_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 560, "y": 30, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 560,
+						"y": 30,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "9_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 0, "y": 60, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 0,
+						"y": 60,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "9_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 40, "y": 60, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 40,
+						"y": 60,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "19_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 80, "y": 60, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 80,
+						"y": 60,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "19_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 120, "y": 60, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 120,
+						"y": 60,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "20_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 160, "y": 60, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 160,
+						"y": 60,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "20_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 200, "y": 60, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 200,
+						"y": 60,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "23_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 240, "y": 60, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 240,
+						"y": 60,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "23_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 280, "y": 60, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 280,
+						"y": 60,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "24_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 320, "y": 60, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 320,
+						"y": 60,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "24_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 360, "y": 60, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 360,
+						"y": 60,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "25-beauty-cosplay_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 400, "y": 60, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 400,
+						"y": 60,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "25-beauty-cosplay_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 440, "y": 60, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 440,
+						"y": 60,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "25-cool-cosplay_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 480, "y": 60, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 480,
+						"y": 60,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "25-cool-cosplay_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 520, "y": 60, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 520,
+						"y": 60,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "25-cosplay_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 560, "y": 60, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 560,
+						"y": 60,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "25-cosplay_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 0, "y": 90, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 0,
+						"y": 90,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "25-cute-cosplay_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 40, "y": 90, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 40,
+						"y": 90,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "25-cute-cosplay_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 80, "y": 90, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 80,
+						"y": 90,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "25-gigantamax_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 120, "y": 90, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 120,
+						"y": 90,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "25-gigantamax_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 160, "y": 90, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 160,
+						"y": 90,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "25-partner_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 200, "y": 90, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 200,
+						"y": 90,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "25-partner_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 240, "y": 90, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 240,
+						"y": 90,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "25-smart-cosplay_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 280, "y": 90, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 280,
+						"y": 90,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "25-smart-cosplay_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 320, "y": 90, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 320,
+						"y": 90,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "25-tough-cosplay_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 360, "y": 90, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 360,
+						"y": 90,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "25-tough-cosplay_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 400, "y": 90, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 400,
+						"y": 90,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "25_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 440, "y": 90, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 440,
+						"y": 90,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "25_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 480, "y": 90, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 480,
+						"y": 90,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "26_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 520, "y": 90, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 520,
+						"y": 90,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "26_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 560, "y": 90, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 560,
+						"y": 90,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "29_1",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 0, "y": 120, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 0,
+						"y": 120,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "29_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 40, "y": 120, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 40,
+						"y": 120,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "29_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 80, "y": 120, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 80,
+						"y": 120,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "30_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 120, "y": 120, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 120,
+						"y": 120,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "30_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 160, "y": 120, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 160,
+						"y": 120,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "31_1",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 200, "y": 120, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 200,
+						"y": 120,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "31_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 240, "y": 120, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 240,
+						"y": 120,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "31_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 280, "y": 120, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 280,
+						"y": 120,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "32_2",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 320,
+						"y": 120,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "32_3",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 360,
+						"y": 120,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "33_2",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 400,
+						"y": 120,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "33_3",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 440,
+						"y": 120,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "34_2",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 480,
+						"y": 120,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "34_3",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 520,
+						"y": 120,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "35_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 320, "y": 120, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 560,
+						"y": 120,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "35_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 360, "y": 120, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 0,
+						"y": 150,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "36_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 400, "y": 120, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 40,
+						"y": 150,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "36_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 440, "y": 120, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 80,
+						"y": 150,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "37_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 480, "y": 120, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 120,
+						"y": 150,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "37_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 520, "y": 120, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 160,
+						"y": 150,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "38_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 560, "y": 120, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 200,
+						"y": 150,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "38_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 0, "y": 150, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 240,
+						"y": 150,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "39_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 40, "y": 150, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 280,
+						"y": 150,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "39_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 80, "y": 150, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 320,
+						"y": 150,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "40_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 120, "y": 150, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 360,
+						"y": 150,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "40_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 160, "y": 150, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 400,
+						"y": 150,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "41_1",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 200, "y": 150, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 440,
+						"y": 150,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "41_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 240, "y": 150, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 480,
+						"y": 150,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "41_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 280, "y": 150, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 520,
+						"y": 150,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "42_1",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 320, "y": 150, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 560,
+						"y": 150,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "42_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 360, "y": 150, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 0,
+						"y": 180,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "42_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 400, "y": 150, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 40,
+						"y": 180,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "43_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 440, "y": 150, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 80,
+						"y": 180,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "43_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 480, "y": 150, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 120,
+						"y": 180,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "44_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 520, "y": 150, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 160,
+						"y": 180,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "44_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 560, "y": 150, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 200,
+						"y": 180,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "45_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 0, "y": 180, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 240,
+						"y": 180,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "45_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 40, "y": 180, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 280,
+						"y": 180,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "46_1",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 80, "y": 180, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 320,
+						"y": 180,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "46_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 120, "y": 180, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 360,
+						"y": 180,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "46_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 160, "y": 180, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 400,
+						"y": 180,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "47_1",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 200, "y": 180, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 440,
+						"y": 180,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "47_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 240, "y": 180, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 480,
+						"y": 180,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "47_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 280, "y": 180, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 520,
+						"y": 180,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "50_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 320, "y": 180, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 560,
+						"y": 180,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "50_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 360, "y": 180, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 0,
+						"y": 210,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "51_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 400, "y": 180, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 40,
+						"y": 210,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "51_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 440, "y": 180, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 80,
+						"y": 210,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "52-gigantamax_1",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 480, "y": 180, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 120,
+						"y": 210,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "52-gigantamax_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 520, "y": 180, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 160,
+						"y": 210,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "52-gigantamax_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 560, "y": 180, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 200,
+						"y": 210,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "52_1",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 0, "y": 210, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 240,
+						"y": 210,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "52_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 40, "y": 210, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 280,
+						"y": 210,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "52_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 80, "y": 210, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 320,
+						"y": 210,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "53_1",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 120, "y": 210, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 360,
+						"y": 210,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "53_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 160, "y": 210, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 400,
+						"y": 210,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "53_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 200, "y": 210, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 440,
+						"y": 210,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "56_1",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 240, "y": 210, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 480,
+						"y": 210,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "56_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 280, "y": 210, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 520,
+						"y": 210,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "56_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 320, "y": 210, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 560,
+						"y": 210,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "57_1",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 360, "y": 210, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 0,
+						"y": 240,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "57_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 400, "y": 210, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 40,
+						"y": 240,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "57_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 440, "y": 210, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 80,
+						"y": 240,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "69_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 480, "y": 210, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 120,
+						"y": 240,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "69_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 520, "y": 210, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 160,
+						"y": 240,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "70_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 560, "y": 210, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 200,
+						"y": 240,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "70_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 0, "y": 240, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 240,
+						"y": 240,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "71_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 40, "y": 240, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 280,
+						"y": 240,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "71_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 80, "y": 240, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 320,
+						"y": 240,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "77_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 120, "y": 240, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 360,
+						"y": 240,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "77_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 160, "y": 240, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 400,
+						"y": 240,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "78_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 200, "y": 240, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 440,
+						"y": 240,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "78_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 240, "y": 240, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 480,
+						"y": 240,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "79_1",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 280, "y": 240, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 520,
+						"y": 240,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "79_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 320, "y": 240, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 560,
+						"y": 240,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "79_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 360, "y": 240, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 0,
+						"y": 270,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "80-mega_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 400, "y": 240, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 40,
+						"y": 270,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "80-mega_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 440, "y": 240, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 80,
+						"y": 270,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "80_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 480, "y": 240, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 120,
+						"y": 270,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "80_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 520, "y": 240, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 160,
+						"y": 270,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "81_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 560, "y": 240, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 200,
+						"y": 270,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "81_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 0, "y": 270, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 240,
+						"y": 270,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "82_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 40, "y": 270, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 280,
+						"y": 270,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "82_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 80, "y": 270, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 320,
+						"y": 270,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "83_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 120, "y": 270, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 360,
+						"y": 270,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "83_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 160, "y": 270, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 400,
+						"y": 270,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "84-f_1",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 200, "y": 270, "w": 40, "h": 30}
-				},
-				{
-					"filename": "84-f_2",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 240, "y": 270, "w": 40, "h": 30}
-				},
-				{
-					"filename": "84-f_3",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 280, "y": 270, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 440,
+						"y": 270,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "84_1",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 320, "y": 270, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 440,
+						"y": 270,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "84-f_2",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 480,
+						"y": 270,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "84-f_3",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 520,
+						"y": 270,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "84_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 360, "y": 270, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 560,
+						"y": 270,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "84_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 400, "y": 270, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 0,
+						"y": 300,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "85-f_1",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 440, "y": 270, "w": 40, "h": 30}
-				},
-				{
-					"filename": "85-f_2",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 480, "y": 270, "w": 40, "h": 30}
-				},
-				{
-					"filename": "85-f_3",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 520, "y": 270, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 40,
+						"y": 300,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "85_1",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 560, "y": 270, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 40,
+						"y": 300,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "85-f_2",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 80,
+						"y": 300,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "85-f_3",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 120,
+						"y": 300,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "85_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 0, "y": 300, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 160,
+						"y": 300,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "85_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 40, "y": 300, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 200,
+						"y": 300,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "86_1",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 80, "y": 300, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 240,
+						"y": 300,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "86_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 120, "y": 300, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 280,
+						"y": 300,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "86_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 160, "y": 300, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 320,
+						"y": 300,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "87_1",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 200, "y": 300, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 360,
+						"y": 300,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "87_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 240, "y": 300, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 400,
+						"y": 300,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "87_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 280, "y": 300, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 440,
+						"y": 300,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "88_2",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 480,
+						"y": 300,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "88_3",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 520,
+						"y": 300,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "89_2",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 560,
+						"y": 300,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "89_3",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 0,
+						"y": 330,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "92_1",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 320, "y": 300, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 40,
+						"y": 330,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "92_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 360, "y": 300, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 80,
+						"y": 330,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "92_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 400, "y": 300, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 120,
+						"y": 330,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "93_1",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 440, "y": 300, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 160,
+						"y": 330,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "93_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 480, "y": 300, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 200,
+						"y": 330,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "93_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 520, "y": 300, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 240,
+						"y": 330,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "94-gigantamax_1",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 560, "y": 300, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 280,
+						"y": 330,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "94-gigantamax_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 0, "y": 330, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 320,
+						"y": 330,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "94-gigantamax_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 40, "y": 330, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 360,
+						"y": 330,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "94-mega_1",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 80, "y": 330, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 400,
+						"y": 330,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "94-mega_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 120, "y": 330, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 440,
+						"y": 330,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "94-mega_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 160, "y": 330, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 480,
+						"y": 330,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "94_1",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 200, "y": 330, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 520,
+						"y": 330,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "94_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 240, "y": 330, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 560,
+						"y": 330,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "94_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 280, "y": 330, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 0,
+						"y": 360,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "98_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 320, "y": 330, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 40,
+						"y": 360,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "98_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 360, "y": 330, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 80,
+						"y": 360,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "99-gigantamax_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 400, "y": 330, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 120,
+						"y": 360,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "99-gigantamax_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 440, "y": 330, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 160,
+						"y": 360,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "99_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 480, "y": 330, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 200,
+						"y": 360,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "99_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 520, "y": 330, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 240,
+						"y": 360,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "100_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 560, "y": 330, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 280,
+						"y": 360,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "100_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 0, "y": 360, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 320,
+						"y": 360,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "101_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 40, "y": 360, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 360,
+						"y": 360,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "101_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 80, "y": 360, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 400,
+						"y": 360,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "102_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 120, "y": 360, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 440,
+						"y": 360,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "102_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 160, "y": 360, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 480,
+						"y": 360,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "103_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 200, "y": 360, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 520,
+						"y": 360,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "103_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 240, "y": 360, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 560,
+						"y": 360,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "111_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 280, "y": 360, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 0,
+						"y": 390,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "111_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 320, "y": 360, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 40,
+						"y": 390,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "112_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 360, "y": 360, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 80,
+						"y": 390,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "112_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 400, "y": 360, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 120,
+						"y": 390,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "113_1",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 440, "y": 360, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 160,
+						"y": 390,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "113_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 480, "y": 360, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 200,
+						"y": 390,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "113_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 520, "y": 360, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 240,
+						"y": 390,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "114_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 560, "y": 360, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 280,
+						"y": 390,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "114_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 0, "y": 390, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 320,
+						"y": 390,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "116_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 40, "y": 390, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 360,
+						"y": 390,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "116_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 80, "y": 390, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 400,
+						"y": 390,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "117_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 120, "y": 390, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 440,
+						"y": 390,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "117_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 160, "y": 390, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 480,
+						"y": 390,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "118_1",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 200, "y": 390, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 520,
+						"y": 390,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "118_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 240, "y": 390, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 560,
+						"y": 390,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "118_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 280, "y": 390, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 0,
+						"y": 420,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "119_1",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 320, "y": 390, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 40,
+						"y": 420,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "119_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 360, "y": 390, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 80,
+						"y": 420,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "119_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 400, "y": 390, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 120,
+						"y": 420,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "120_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 440, "y": 390, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 160,
+						"y": 420,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "120_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 480, "y": 390, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 200,
+						"y": 420,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "121_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 520, "y": 390, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 240,
+						"y": 420,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "121_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 560, "y": 390, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 280,
+						"y": 420,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "123_1",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 0, "y": 420, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 320,
+						"y": 420,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "123_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 40, "y": 420, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 360,
+						"y": 420,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "123_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 80, "y": 420, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 400,
+						"y": 420,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "125_1",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 120, "y": 420, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 440,
+						"y": 420,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "125_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 160, "y": 420, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 480,
+						"y": 420,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "125_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 200, "y": 420, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 520,
+						"y": 420,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "126_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 240, "y": 420, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 560,
+						"y": 420,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "126_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 280, "y": 420, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 0,
+						"y": 450,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "127-mega_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 320, "y": 420, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 40,
+						"y": 450,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "127-mega_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 360, "y": 420, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 80,
+						"y": 450,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "127_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 400, "y": 420, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 120,
+						"y": 450,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "127_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 440, "y": 420, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 160,
+						"y": 450,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "128_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 480, "y": 420, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 200,
+						"y": 450,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "128_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 520, "y": 420, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 240,
+						"y": 450,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "129_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 560, "y": 420, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 280,
+						"y": 450,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "129_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 0, "y": 450, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 320,
+						"y": 450,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "130-mega_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 40, "y": 450, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 360,
+						"y": 450,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "130-mega_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 80, "y": 450, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 400,
+						"y": 450,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "130_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 120, "y": 450, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 440,
+						"y": 450,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "130_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 160, "y": 450, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 480,
+						"y": 450,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "131-gigantamax_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 200, "y": 450, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 520,
+						"y": 450,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "131-gigantamax_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 240, "y": 450, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 560,
+						"y": 450,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "131_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 280, "y": 450, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 0,
+						"y": 480,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "131_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 320, "y": 450, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 40,
+						"y": 480,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "132_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 360, "y": 450, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 80,
+						"y": 480,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "132_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 400, "y": 450, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 120,
+						"y": 480,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "133-partner_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 440, "y": 450, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 160,
+						"y": 480,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "133-partner_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 480, "y": 450, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 200,
+						"y": 480,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "133_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 520, "y": 450, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 240,
+						"y": 480,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "133_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 560, "y": 450, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 280,
+						"y": 480,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "134_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 0, "y": 480, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 320,
+						"y": 480,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "134_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 40, "y": 480, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 360,
+						"y": 480,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "135_1",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 80, "y": 480, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 400,
+						"y": 480,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "135_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 120, "y": 480, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 440,
+						"y": 480,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "135_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 160, "y": 480, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 480,
+						"y": 480,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "136_1",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 200, "y": 480, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 520,
+						"y": 480,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "136_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 240, "y": 480, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 560,
+						"y": 480,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "136_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 280, "y": 480, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 0,
+						"y": 510,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "137_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 320, "y": 480, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 40,
+						"y": 510,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "137_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 360, "y": 480, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 80,
+						"y": 510,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "138_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 400, "y": 480, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 120,
+						"y": 510,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "138_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 440, "y": 480, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 160,
+						"y": 510,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "139_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 480, "y": 480, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 200,
+						"y": 510,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "139_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 520, "y": 480, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 240,
+						"y": 510,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "140_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 560, "y": 480, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 280,
+						"y": 510,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "140_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 0, "y": 510, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 320,
+						"y": 510,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "141_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 40, "y": 510, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 360,
+						"y": 510,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "141_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 80, "y": 510, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 400,
+						"y": 510,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "142-mega_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 120, "y": 510, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 440,
+						"y": 510,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "142-mega_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 160, "y": 510, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 480,
+						"y": 510,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "142_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 200, "y": 510, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 520,
+						"y": 510,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "142_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 240, "y": 510, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 560,
+						"y": 510,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "143-gigantamax_2",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 0,
+						"y": 540,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "143-gigantamax_3",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 40,
+						"y": 540,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "143_2",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 80,
+						"y": 540,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "143_3",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 120,
+						"y": 540,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "144_1",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 280, "y": 510, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 160,
+						"y": 540,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "144_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 320, "y": 510, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 200,
+						"y": 540,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "144_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 360, "y": 510, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 240,
+						"y": 540,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "145_1",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 400, "y": 510, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 280,
+						"y": 540,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "145_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 440, "y": 510, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 320,
+						"y": 540,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "145_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 480, "y": 510, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 360,
+						"y": 540,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "146_1",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 520, "y": 510, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 400,
+						"y": 540,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "146_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 560, "y": 510, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 440,
+						"y": 540,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "146_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 0, "y": 540, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 480,
+						"y": 540,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "147_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 40, "y": 540, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 520,
+						"y": 540,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "147_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 80, "y": 540, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 560,
+						"y": 540,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "148_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 120, "y": 540, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 0,
+						"y": 570,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "148_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 160, "y": 540, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 40,
+						"y": 570,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "149_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 200, "y": 540, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 80,
+						"y": 570,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "149_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 240, "y": 540, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 120,
+						"y": 570,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "150-mega-x_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 280, "y": 540, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 160,
+						"y": 570,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "150-mega-x_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 320, "y": 540, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 200,
+						"y": 570,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "150-mega-y_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 360, "y": 540, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 240,
+						"y": 570,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "150-mega-y_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 400, "y": 540, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 280,
+						"y": 570,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "150_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 440, "y": 540, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 320,
+						"y": 570,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "150_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 480, "y": 540, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 360,
+						"y": 570,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "151_2",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 520, "y": 540, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 400,
+						"y": 570,
+						"w": 40,
+						"h": 30
+					}
 				},
 				{
 					"filename": "151_3",
 					"rotated": false,
 					"trimmed": false,
-					"sourceSize": {"w": 40, "h": 30},
-					"spriteSourceSize": {"x": 0, "y": 0, "w": 40, "h": 30},
-					"frame": {"x": 560, "y": 540, "w": 40, "h": 30}
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 440,
+						"y": 570,
+						"w": 40,
+						"h": 30
+					}
 				}
 			]
 		}
 	],
 	"meta": {
-		"app": "texturepacker",
-		"version": "3.0"
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": "$TexturePacker:SmartUpdate:3447489444000034526be9543e0a03fb:c9244ec22fd9b63bdc7e97bf457f1266:2fc2d7db306a93e9369e20846ccef45c$"
 	}
 }
diff --git a/public/images/pokemon_icons_1v.png b/public/images/pokemon_icons_1v.png
index d6b1bc0cf7e..025c1ab025a 100644
Binary files a/public/images/pokemon_icons_1v.png and b/public/images/pokemon_icons_1v.png differ
diff --git a/public/images/pokemon_icons_2v.json b/public/images/pokemon_icons_2v.json
index 23eec483b42..519ea6c62f2 100644
--- a/public/images/pokemon_icons_2v.json
+++ b/public/images/pokemon_icons_2v.json
@@ -4,8 +4,8 @@
 			"image": "pokemon_icons_2v.png",
 			"format": "RGBA8888",
 			"size": {
-				"w": 520,
-				"h": 520
+				"w": 540,
+				"h": 540
 			},
 			"scale": 1,
 			"frames": [
@@ -1417,7 +1417,7 @@
 					}
 				},
 				{
-					"filename": "190_2",
+					"filename": "187_2",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
@@ -1437,6 +1437,132 @@
 						"h": 30
 					}
 				},
+				{
+					"filename": "187_3",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 120,
+						"y": 150,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "188_2",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 160,
+						"y": 150,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "188_3",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 200,
+						"y": 150,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "189_2",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 240,
+						"y": 150,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "189_3",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 280,
+						"y": 150,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "190_2",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 320,
+						"y": 150,
+						"w": 40,
+						"h": 30
+					}
+				},
 				{
 					"filename": "190_3",
 					"rotated": false,
@@ -1452,7 +1578,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 120,
+						"x": 360,
 						"y": 150,
 						"w": 40,
 						"h": 30
@@ -1473,7 +1599,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 160,
+						"x": 400,
 						"y": 150,
 						"w": 40,
 						"h": 30
@@ -1494,7 +1620,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 200,
+						"x": 440,
 						"y": 150,
 						"w": 40,
 						"h": 30
@@ -1515,7 +1641,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 240,
+						"x": 480,
 						"y": 150,
 						"w": 40,
 						"h": 30
@@ -1536,8 +1662,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 280,
-						"y": 150,
+						"x": 0,
+						"y": 180,
 						"w": 40,
 						"h": 30
 					}
@@ -1557,8 +1683,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 320,
-						"y": 150,
+						"x": 40,
+						"y": 180,
 						"w": 40,
 						"h": 30
 					}
@@ -1578,8 +1704,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 360,
-						"y": 150,
+						"x": 80,
+						"y": 180,
 						"w": 40,
 						"h": 30
 					}
@@ -1599,8 +1725,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 400,
-						"y": 150,
+						"x": 120,
+						"y": 180,
 						"w": 40,
 						"h": 30
 					}
@@ -1620,8 +1746,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 440,
-						"y": 150,
+						"x": 160,
+						"y": 180,
 						"w": 40,
 						"h": 30
 					}
@@ -1641,8 +1767,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 480,
-						"y": 150,
+						"x": 200,
+						"y": 180,
 						"w": 40,
 						"h": 30
 					}
@@ -1662,7 +1788,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 0,
+						"x": 240,
 						"y": 180,
 						"w": 40,
 						"h": 30
@@ -1683,7 +1809,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 40,
+						"x": 280,
 						"y": 180,
 						"w": 40,
 						"h": 30
@@ -1704,7 +1830,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 80,
+						"x": 320,
 						"y": 180,
 						"w": 40,
 						"h": 30
@@ -1725,7 +1851,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 80,
+						"x": 320,
 						"y": 180,
 						"w": 40,
 						"h": 30
@@ -1746,7 +1872,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 120,
+						"x": 360,
 						"y": 180,
 						"w": 40,
 						"h": 30
@@ -1767,7 +1893,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 120,
+						"x": 360,
 						"y": 180,
 						"w": 40,
 						"h": 30
@@ -1788,7 +1914,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 160,
+						"x": 400,
 						"y": 180,
 						"w": 40,
 						"h": 30
@@ -1809,7 +1935,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 200,
+						"x": 440,
 						"y": 180,
 						"w": 40,
 						"h": 30
@@ -1830,7 +1956,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 240,
+						"x": 480,
 						"y": 180,
 						"w": 40,
 						"h": 30
@@ -1851,8 +1977,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 280,
-						"y": 180,
+						"x": 0,
+						"y": 210,
 						"w": 40,
 						"h": 30
 					}
@@ -1872,8 +1998,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 320,
-						"y": 180,
+						"x": 40,
+						"y": 210,
 						"w": 40,
 						"h": 30
 					}
@@ -1893,8 +2019,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 360,
-						"y": 180,
+						"x": 80,
+						"y": 210,
 						"w": 40,
 						"h": 30
 					}
@@ -1914,8 +2040,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 400,
-						"y": 180,
+						"x": 120,
+						"y": 210,
 						"w": 40,
 						"h": 30
 					}
@@ -1935,8 +2061,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 440,
-						"y": 180,
+						"x": 160,
+						"y": 210,
 						"w": 40,
 						"h": 30
 					}
@@ -1956,8 +2082,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 480,
-						"y": 180,
+						"x": 200,
+						"y": 210,
 						"w": 40,
 						"h": 30
 					}
@@ -1977,7 +2103,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 0,
+						"x": 240,
 						"y": 210,
 						"w": 40,
 						"h": 30
@@ -1998,7 +2124,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 40,
+						"x": 280,
 						"y": 210,
 						"w": 40,
 						"h": 30
@@ -2019,7 +2145,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 80,
+						"x": 320,
 						"y": 210,
 						"w": 40,
 						"h": 30
@@ -2040,7 +2166,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 120,
+						"x": 360,
 						"y": 210,
 						"w": 40,
 						"h": 30
@@ -2061,7 +2187,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 160,
+						"x": 400,
 						"y": 210,
 						"w": 40,
 						"h": 30
@@ -2082,7 +2208,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 200,
+						"x": 440,
 						"y": 210,
 						"w": 40,
 						"h": 30
@@ -2103,7 +2229,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 240,
+						"x": 480,
 						"y": 210,
 						"w": 40,
 						"h": 30
@@ -2124,8 +2250,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 280,
-						"y": 210,
+						"x": 0,
+						"y": 240,
 						"w": 40,
 						"h": 30
 					}
@@ -2145,8 +2271,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 320,
-						"y": 210,
+						"x": 40,
+						"y": 240,
 						"w": 40,
 						"h": 30
 					}
@@ -2166,8 +2292,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 360,
-						"y": 210,
+						"x": 80,
+						"y": 240,
 						"w": 40,
 						"h": 30
 					}
@@ -2187,8 +2313,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 400,
-						"y": 210,
+						"x": 120,
+						"y": 240,
 						"w": 40,
 						"h": 30
 					}
@@ -2208,8 +2334,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 440,
-						"y": 210,
+						"x": 160,
+						"y": 240,
 						"w": 40,
 						"h": 30
 					}
@@ -2229,8 +2355,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 480,
-						"y": 210,
+						"x": 200,
+						"y": 240,
 						"w": 40,
 						"h": 30
 					}
@@ -2250,7 +2376,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 0,
+						"x": 240,
 						"y": 240,
 						"w": 40,
 						"h": 30
@@ -2271,7 +2397,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 40,
+						"x": 280,
 						"y": 240,
 						"w": 40,
 						"h": 30
@@ -2292,7 +2418,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 80,
+						"x": 320,
 						"y": 240,
 						"w": 40,
 						"h": 30
@@ -2313,7 +2439,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 120,
+						"x": 360,
 						"y": 240,
 						"w": 40,
 						"h": 30
@@ -2334,7 +2460,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 160,
+						"x": 400,
 						"y": 240,
 						"w": 40,
 						"h": 30
@@ -2355,7 +2481,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 200,
+						"x": 440,
 						"y": 240,
 						"w": 40,
 						"h": 30
@@ -2376,7 +2502,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 240,
+						"x": 480,
 						"y": 240,
 						"w": 40,
 						"h": 30
@@ -2397,8 +2523,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 280,
-						"y": 240,
+						"x": 0,
+						"y": 270,
 						"w": 40,
 						"h": 30
 					}
@@ -2418,8 +2544,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 320,
-						"y": 240,
+						"x": 40,
+						"y": 270,
 						"w": 40,
 						"h": 30
 					}
@@ -2439,8 +2565,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 360,
-						"y": 240,
+						"x": 80,
+						"y": 270,
 						"w": 40,
 						"h": 30
 					}
@@ -2460,8 +2586,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 400,
-						"y": 240,
+						"x": 120,
+						"y": 270,
 						"w": 40,
 						"h": 30
 					}
@@ -2481,8 +2607,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 440,
-						"y": 240,
+						"x": 160,
+						"y": 270,
 						"w": 40,
 						"h": 30
 					}
@@ -2502,8 +2628,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 480,
-						"y": 240,
+						"x": 200,
+						"y": 270,
 						"w": 40,
 						"h": 30
 					}
@@ -2523,7 +2649,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 0,
+						"x": 240,
 						"y": 270,
 						"w": 40,
 						"h": 30
@@ -2544,7 +2670,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 40,
+						"x": 280,
 						"y": 270,
 						"w": 40,
 						"h": 30
@@ -2565,7 +2691,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 80,
+						"x": 320,
 						"y": 270,
 						"w": 40,
 						"h": 30
@@ -2586,7 +2712,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 120,
+						"x": 360,
 						"y": 270,
 						"w": 40,
 						"h": 30
@@ -2607,7 +2733,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 160,
+						"x": 400,
 						"y": 270,
 						"w": 40,
 						"h": 30
@@ -2628,7 +2754,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 200,
+						"x": 440,
 						"y": 270,
 						"w": 40,
 						"h": 30
@@ -2649,7 +2775,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 240,
+						"x": 480,
 						"y": 270,
 						"w": 40,
 						"h": 30
@@ -2670,8 +2796,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 280,
-						"y": 270,
+						"x": 0,
+						"y": 300,
 						"w": 40,
 						"h": 30
 					}
@@ -2691,8 +2817,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 320,
-						"y": 270,
+						"x": 40,
+						"y": 300,
 						"w": 40,
 						"h": 30
 					}
@@ -2712,8 +2838,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 360,
-						"y": 270,
+						"x": 80,
+						"y": 300,
 						"w": 40,
 						"h": 30
 					}
@@ -2733,8 +2859,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 400,
-						"y": 270,
+						"x": 120,
+						"y": 300,
 						"w": 40,
 						"h": 30
 					}
@@ -2754,8 +2880,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 440,
-						"y": 270,
+						"x": 160,
+						"y": 300,
 						"w": 40,
 						"h": 30
 					}
@@ -2775,8 +2901,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 480,
-						"y": 270,
+						"x": 200,
+						"y": 300,
 						"w": 40,
 						"h": 30
 					}
@@ -2796,7 +2922,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 0,
+						"x": 240,
 						"y": 300,
 						"w": 40,
 						"h": 30
@@ -2817,7 +2943,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 40,
+						"x": 280,
 						"y": 300,
 						"w": 40,
 						"h": 30
@@ -2838,7 +2964,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 80,
+						"x": 320,
 						"y": 300,
 						"w": 40,
 						"h": 30
@@ -2859,7 +2985,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 120,
+						"x": 360,
 						"y": 300,
 						"w": 40,
 						"h": 30
@@ -2880,7 +3006,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 160,
+						"x": 400,
 						"y": 300,
 						"w": 40,
 						"h": 30
@@ -2901,7 +3027,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 200,
+						"x": 440,
 						"y": 300,
 						"w": 40,
 						"h": 30
@@ -2922,7 +3048,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 240,
+						"x": 480,
 						"y": 300,
 						"w": 40,
 						"h": 30
@@ -2943,8 +3069,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 280,
-						"y": 300,
+						"x": 0,
+						"y": 330,
 						"w": 40,
 						"h": 30
 					}
@@ -2964,8 +3090,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 320,
-						"y": 300,
+						"x": 40,
+						"y": 330,
 						"w": 40,
 						"h": 30
 					}
@@ -2985,8 +3111,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 360,
-						"y": 300,
+						"x": 80,
+						"y": 330,
 						"w": 40,
 						"h": 30
 					}
@@ -3006,8 +3132,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 400,
-						"y": 300,
+						"x": 120,
+						"y": 330,
 						"w": 40,
 						"h": 30
 					}
@@ -3027,8 +3153,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 440,
-						"y": 300,
+						"x": 160,
+						"y": 330,
 						"w": 40,
 						"h": 30
 					}
@@ -3048,8 +3174,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 480,
-						"y": 300,
+						"x": 200,
+						"y": 330,
 						"w": 40,
 						"h": 30
 					}
@@ -3069,7 +3195,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 0,
+						"x": 240,
 						"y": 330,
 						"w": 40,
 						"h": 30
@@ -3090,7 +3216,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 40,
+						"x": 280,
 						"y": 330,
 						"w": 40,
 						"h": 30
@@ -3111,7 +3237,91 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 80,
+						"x": 320,
+						"y": 330,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "204_2",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 360,
+						"y": 330,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "204_3",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 400,
+						"y": 330,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "205_2",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 440,
+						"y": 330,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "205_3",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 480,
 						"y": 330,
 						"w": 40,
 						"h": 30
@@ -3132,8 +3342,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 120,
-						"y": 330,
+						"x": 0,
+						"y": 360,
 						"w": 40,
 						"h": 30
 					}
@@ -3153,8 +3363,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 160,
-						"y": 330,
+						"x": 40,
+						"y": 360,
 						"w": 40,
 						"h": 30
 					}
@@ -3174,8 +3384,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 200,
-						"y": 330,
+						"x": 80,
+						"y": 360,
 						"w": 40,
 						"h": 30
 					}
@@ -3195,8 +3405,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 240,
-						"y": 330,
+						"x": 120,
+						"y": 360,
 						"w": 40,
 						"h": 30
 					}
@@ -3216,8 +3426,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 280,
-						"y": 330,
+						"x": 160,
+						"y": 360,
 						"w": 40,
 						"h": 30
 					}
@@ -3237,8 +3447,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 320,
-						"y": 330,
+						"x": 200,
+						"y": 360,
 						"w": 40,
 						"h": 30
 					}
@@ -3258,8 +3468,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 360,
-						"y": 330,
+						"x": 240,
+						"y": 360,
 						"w": 40,
 						"h": 30
 					}
@@ -3279,8 +3489,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 400,
-						"y": 330,
+						"x": 280,
+						"y": 360,
 						"w": 40,
 						"h": 30
 					}
@@ -3300,8 +3510,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 440,
-						"y": 330,
+						"x": 320,
+						"y": 360,
 						"w": 40,
 						"h": 30
 					}
@@ -3321,8 +3531,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 480,
-						"y": 330,
+						"x": 360,
+						"y": 360,
 						"w": 40,
 						"h": 30
 					}
@@ -3342,7 +3552,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 0,
+						"x": 400,
 						"y": 360,
 						"w": 40,
 						"h": 30
@@ -3363,7 +3573,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 40,
+						"x": 440,
 						"y": 360,
 						"w": 40,
 						"h": 30
@@ -3384,7 +3594,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 80,
+						"x": 480,
 						"y": 360,
 						"w": 40,
 						"h": 30
@@ -3405,8 +3615,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 120,
-						"y": 360,
+						"x": 0,
+						"y": 390,
 						"w": 40,
 						"h": 30
 					}
@@ -3426,8 +3636,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 160,
-						"y": 360,
+						"x": 40,
+						"y": 390,
 						"w": 40,
 						"h": 30
 					}
@@ -3447,8 +3657,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 200,
-						"y": 360,
+						"x": 80,
+						"y": 390,
 						"w": 40,
 						"h": 30
 					}
@@ -3468,8 +3678,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 240,
-						"y": 360,
+						"x": 120,
+						"y": 390,
 						"w": 40,
 						"h": 30
 					}
@@ -3489,8 +3699,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 280,
-						"y": 360,
+						"x": 160,
+						"y": 390,
 						"w": 40,
 						"h": 30
 					}
@@ -3510,8 +3720,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 320,
-						"y": 360,
+						"x": 200,
+						"y": 390,
 						"w": 40,
 						"h": 30
 					}
@@ -3531,8 +3741,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 360,
-						"y": 360,
+						"x": 240,
+						"y": 390,
 						"w": 40,
 						"h": 30
 					}
@@ -3552,8 +3762,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 400,
-						"y": 360,
+						"x": 280,
+						"y": 390,
 						"w": 40,
 						"h": 30
 					}
@@ -3573,8 +3783,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 440,
-						"y": 360,
+						"x": 320,
+						"y": 390,
 						"w": 40,
 						"h": 30
 					}
@@ -3594,8 +3804,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 480,
-						"y": 360,
+						"x": 360,
+						"y": 390,
 						"w": 40,
 						"h": 30
 					}
@@ -3615,7 +3825,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 0,
+						"x": 400,
 						"y": 390,
 						"w": 40,
 						"h": 30
@@ -3636,7 +3846,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 40,
+						"x": 440,
 						"y": 390,
 						"w": 40,
 						"h": 30
@@ -3657,7 +3867,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 80,
+						"x": 480,
 						"y": 390,
 						"w": 40,
 						"h": 30
@@ -3678,8 +3888,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 120,
-						"y": 390,
+						"x": 0,
+						"y": 420,
 						"w": 40,
 						"h": 30
 					}
@@ -3699,8 +3909,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 160,
-						"y": 390,
+						"x": 40,
+						"y": 420,
 						"w": 40,
 						"h": 30
 					}
@@ -3720,8 +3930,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 200,
-						"y": 390,
+						"x": 80,
+						"y": 420,
 						"w": 40,
 						"h": 30
 					}
@@ -3741,8 +3951,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 240,
-						"y": 390,
+						"x": 120,
+						"y": 420,
 						"w": 40,
 						"h": 30
 					}
@@ -3762,8 +3972,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 280,
-						"y": 390,
+						"x": 160,
+						"y": 420,
 						"w": 40,
 						"h": 30
 					}
@@ -3783,8 +3993,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 320,
-						"y": 390,
+						"x": 200,
+						"y": 420,
 						"w": 40,
 						"h": 30
 					}
@@ -3804,8 +4014,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 360,
-						"y": 390,
+						"x": 240,
+						"y": 420,
 						"w": 40,
 						"h": 30
 					}
@@ -3825,8 +4035,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 400,
-						"y": 390,
+						"x": 280,
+						"y": 420,
 						"w": 40,
 						"h": 30
 					}
@@ -3846,8 +4056,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 440,
-						"y": 390,
+						"x": 320,
+						"y": 420,
 						"w": 40,
 						"h": 30
 					}
@@ -3867,8 +4077,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 480,
-						"y": 390,
+						"x": 360,
+						"y": 420,
 						"w": 40,
 						"h": 30
 					}
@@ -3888,7 +4098,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 0,
+						"x": 400,
 						"y": 420,
 						"w": 40,
 						"h": 30
@@ -3909,7 +4119,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 40,
+						"x": 440,
 						"y": 420,
 						"w": 40,
 						"h": 30
@@ -3930,7 +4140,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 80,
+						"x": 480,
 						"y": 420,
 						"w": 40,
 						"h": 30
@@ -3951,8 +4161,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 120,
-						"y": 420,
+						"x": 0,
+						"y": 450,
 						"w": 40,
 						"h": 30
 					}
@@ -3972,8 +4182,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 160,
-						"y": 420,
+						"x": 40,
+						"y": 450,
 						"w": 40,
 						"h": 30
 					}
@@ -3993,8 +4203,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 200,
-						"y": 420,
+						"x": 80,
+						"y": 450,
 						"w": 40,
 						"h": 30
 					}
@@ -4014,8 +4224,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 240,
-						"y": 420,
+						"x": 120,
+						"y": 450,
 						"w": 40,
 						"h": 30
 					}
@@ -4035,8 +4245,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 280,
-						"y": 420,
+						"x": 160,
+						"y": 450,
 						"w": 40,
 						"h": 30
 					}
@@ -4056,8 +4266,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 320,
-						"y": 420,
+						"x": 200,
+						"y": 450,
 						"w": 40,
 						"h": 30
 					}
@@ -4077,8 +4287,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 360,
-						"y": 420,
+						"x": 240,
+						"y": 450,
 						"w": 40,
 						"h": 30
 					}
@@ -4098,8 +4308,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 400,
-						"y": 420,
+						"x": 280,
+						"y": 450,
 						"w": 40,
 						"h": 30
 					}
@@ -4119,8 +4329,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 440,
-						"y": 420,
+						"x": 320,
+						"y": 450,
 						"w": 40,
 						"h": 30
 					}
@@ -4140,8 +4350,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 480,
-						"y": 420,
+						"x": 360,
+						"y": 450,
 						"w": 40,
 						"h": 30
 					}
@@ -4161,7 +4371,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 0,
+						"x": 400,
 						"y": 450,
 						"w": 40,
 						"h": 30
@@ -4182,7 +4392,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 40,
+						"x": 440,
 						"y": 450,
 						"w": 40,
 						"h": 30
@@ -4203,7 +4413,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 80,
+						"x": 480,
 						"y": 450,
 						"w": 40,
 						"h": 30
@@ -4223,216 +4433,6 @@
 						"w": 40,
 						"h": 30
 					},
-					"frame": {
-						"x": 120,
-						"y": 450,
-						"w": 40,
-						"h": 30
-					}
-				},
-				{
-					"filename": "243_3",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 40,
-						"h": 30
-					},
-					"frame": {
-						"x": 160,
-						"y": 450,
-						"w": 40,
-						"h": 30
-					}
-				},
-				{
-					"filename": "244_2",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 40,
-						"h": 30
-					},
-					"frame": {
-						"x": 200,
-						"y": 450,
-						"w": 40,
-						"h": 30
-					}
-				},
-				{
-					"filename": "244_3",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 40,
-						"h": 30
-					},
-					"frame": {
-						"x": 240,
-						"y": 450,
-						"w": 40,
-						"h": 30
-					}
-				},
-				{
-					"filename": "245_2",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 40,
-						"h": 30
-					},
-					"frame": {
-						"x": 280,
-						"y": 450,
-						"w": 40,
-						"h": 30
-					}
-				},
-				{
-					"filename": "245_3",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 40,
-						"h": 30
-					},
-					"frame": {
-						"x": 320,
-						"y": 450,
-						"w": 40,
-						"h": 30
-					}
-				},
-				{
-					"filename": "246_2",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 40,
-						"h": 30
-					},
-					"frame": {
-						"x": 360,
-						"y": 450,
-						"w": 40,
-						"h": 30
-					}
-				},
-				{
-					"filename": "246_3",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 40,
-						"h": 30
-					},
-					"frame": {
-						"x": 400,
-						"y": 450,
-						"w": 40,
-						"h": 30
-					}
-				},
-				{
-					"filename": "247_2",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 40,
-						"h": 30
-					},
-					"frame": {
-						"x": 440,
-						"y": 450,
-						"w": 40,
-						"h": 30
-					}
-				},
-				{
-					"filename": "247_3",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 40,
-						"h": 30
-					},
-					"frame": {
-						"x": 480,
-						"y": 450,
-						"w": 40,
-						"h": 30
-					}
-				},
-				{
-					"filename": "248-mega_2",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 40,
-						"h": 30
-					},
 					"frame": {
 						"x": 0,
 						"y": 480,
@@ -4441,7 +4441,7 @@
 					}
 				},
 				{
-					"filename": "248-mega_3",
+					"filename": "243_3",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
@@ -4462,7 +4462,7 @@
 					}
 				},
 				{
-					"filename": "248_2",
+					"filename": "244_2",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
@@ -4483,7 +4483,7 @@
 					}
 				},
 				{
-					"filename": "248_3",
+					"filename": "244_3",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
@@ -4504,7 +4504,7 @@
 					}
 				},
 				{
-					"filename": "249_2",
+					"filename": "245_2",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
@@ -4525,7 +4525,7 @@
 					}
 				},
 				{
-					"filename": "249_3",
+					"filename": "245_3",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
@@ -4546,7 +4546,7 @@
 					}
 				},
 				{
-					"filename": "250_2",
+					"filename": "246_2",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
@@ -4567,7 +4567,7 @@
 					}
 				},
 				{
-					"filename": "250_3",
+					"filename": "246_3",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
@@ -4588,7 +4588,7 @@
 					}
 				},
 				{
-					"filename": "251_2",
+					"filename": "247_2",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
@@ -4609,7 +4609,7 @@
 					}
 				},
 				{
-					"filename": "251_3",
+					"filename": "247_3",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
@@ -4628,6 +4628,216 @@
 						"w": 40,
 						"h": 30
 					}
+				},
+				{
+					"filename": "248-mega_2",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 400,
+						"y": 480,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "248-mega_3",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 440,
+						"y": 480,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "248_2",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 480,
+						"y": 480,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "248_3",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 0,
+						"y": 510,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "249_2",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 40,
+						"y": 510,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "249_3",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 80,
+						"y": 510,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "250_2",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 120,
+						"y": 510,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "250_3",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 160,
+						"y": 510,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "251_2",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 200,
+						"y": 510,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "251_3",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 240,
+						"y": 510,
+						"w": 40,
+						"h": 30
+					}
 				}
 			]
 		}
@@ -4635,6 +4845,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:cb87bf48266ab3d893dbbd24a52f875f:d37e73561b49b4fe831e3fcaee67b851:63b368599cdc6e139499267117e91cd5$"
+		"smartupdate": "$TexturePacker:SmartUpdate:9bbc7b4492e80aa5722cc2bf05816872:55b15740d88d2f1d62acee04668f97a7:63b368599cdc6e139499267117e91cd5$"
 	}
 }
diff --git a/public/images/pokemon_icons_2v.png b/public/images/pokemon_icons_2v.png
index e74840b647b..fea0fb339ce 100644
Binary files a/public/images/pokemon_icons_2v.png and b/public/images/pokemon_icons_2v.png differ
diff --git a/public/images/pokemon_icons_3v.json b/public/images/pokemon_icons_3v.json
index 2500eebbff8..e18ce672c4e 100644
--- a/public/images/pokemon_icons_3v.json
+++ b/public/images/pokemon_icons_3v.json
@@ -4,8 +4,8 @@
 			"image": "pokemon_icons_3v.png",
 			"format": "RGBA8888",
 			"size": {
-				"w": 520,
-				"h": 520
+				"w": 560,
+				"h": 560
 			},
 			"scale": 1,
 			"frames": [
@@ -297,8 +297,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 0,
-						"y": 30,
+						"x": 520,
+						"y": 0,
 						"w": 40,
 						"h": 30
 					}
@@ -318,7 +318,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 40,
+						"x": 0,
 						"y": 30,
 						"w": 40,
 						"h": 30
@@ -339,7 +339,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 80,
+						"x": 40,
 						"y": 30,
 						"w": 40,
 						"h": 30
@@ -360,7 +360,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 120,
+						"x": 80,
 						"y": 30,
 						"w": 40,
 						"h": 30
@@ -381,7 +381,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 160,
+						"x": 120,
 						"y": 30,
 						"w": 40,
 						"h": 30
@@ -402,7 +402,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 200,
+						"x": 160,
 						"y": 30,
 						"w": 40,
 						"h": 30
@@ -423,7 +423,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 240,
+						"x": 200,
 						"y": 30,
 						"w": 40,
 						"h": 30
@@ -444,7 +444,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 280,
+						"x": 240,
 						"y": 30,
 						"w": 40,
 						"h": 30
@@ -465,7 +465,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 320,
+						"x": 280,
 						"y": 30,
 						"w": 40,
 						"h": 30
@@ -486,7 +486,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 360,
+						"x": 320,
 						"y": 30,
 						"w": 40,
 						"h": 30
@@ -507,7 +507,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 400,
+						"x": 360,
 						"y": 30,
 						"w": 40,
 						"h": 30
@@ -528,7 +528,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 440,
+						"x": 400,
 						"y": 30,
 						"w": 40,
 						"h": 30
@@ -549,7 +549,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 480,
+						"x": 440,
 						"y": 30,
 						"w": 40,
 						"h": 30
@@ -570,8 +570,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 0,
-						"y": 60,
+						"x": 480,
+						"y": 30,
 						"w": 40,
 						"h": 30
 					}
@@ -591,8 +591,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 40,
-						"y": 60,
+						"x": 520,
+						"y": 30,
 						"w": 40,
 						"h": 30
 					}
@@ -612,7 +612,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 80,
+						"x": 0,
 						"y": 60,
 						"w": 40,
 						"h": 30
@@ -633,7 +633,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 120,
+						"x": 40,
 						"y": 60,
 						"w": 40,
 						"h": 30
@@ -654,7 +654,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 160,
+						"x": 80,
 						"y": 60,
 						"w": 40,
 						"h": 30
@@ -675,7 +675,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 200,
+						"x": 120,
 						"y": 60,
 						"w": 40,
 						"h": 30
@@ -696,7 +696,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 240,
+						"x": 160,
 						"y": 60,
 						"w": 40,
 						"h": 30
@@ -717,7 +717,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 280,
+						"x": 200,
 						"y": 60,
 						"w": 40,
 						"h": 30
@@ -738,7 +738,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 320,
+						"x": 240,
 						"y": 60,
 						"w": 40,
 						"h": 30
@@ -759,7 +759,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 360,
+						"x": 280,
 						"y": 60,
 						"w": 40,
 						"h": 30
@@ -780,7 +780,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 400,
+						"x": 320,
 						"y": 60,
 						"w": 40,
 						"h": 30
@@ -801,7 +801,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 440,
+						"x": 360,
 						"y": 60,
 						"w": 40,
 						"h": 30
@@ -822,7 +822,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 480,
+						"x": 400,
 						"y": 60,
 						"w": 40,
 						"h": 30
@@ -843,8 +843,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 0,
-						"y": 90,
+						"x": 440,
+						"y": 60,
 						"w": 40,
 						"h": 30
 					}
@@ -864,8 +864,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 40,
-						"y": 90,
+						"x": 480,
+						"y": 60,
 						"w": 40,
 						"h": 30
 					}
@@ -885,8 +885,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 80,
-						"y": 90,
+						"x": 520,
+						"y": 60,
 						"w": 40,
 						"h": 30
 					}
@@ -906,7 +906,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 120,
+						"x": 0,
 						"y": 90,
 						"w": 40,
 						"h": 30
@@ -927,7 +927,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 160,
+						"x": 40,
 						"y": 90,
 						"w": 40,
 						"h": 30
@@ -948,7 +948,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 200,
+						"x": 80,
 						"y": 90,
 						"w": 40,
 						"h": 30
@@ -969,7 +969,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 240,
+						"x": 120,
 						"y": 90,
 						"w": 40,
 						"h": 30
@@ -990,7 +990,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 280,
+						"x": 160,
 						"y": 90,
 						"w": 40,
 						"h": 30
@@ -1011,7 +1011,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 320,
+						"x": 200,
 						"y": 90,
 						"w": 40,
 						"h": 30
@@ -1032,7 +1032,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 360,
+						"x": 240,
 						"y": 90,
 						"w": 40,
 						"h": 30
@@ -1053,7 +1053,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 400,
+						"x": 280,
 						"y": 90,
 						"w": 40,
 						"h": 30
@@ -1074,7 +1074,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 440,
+						"x": 320,
 						"y": 90,
 						"w": 40,
 						"h": 30
@@ -1095,7 +1095,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 480,
+						"x": 360,
 						"y": 90,
 						"w": 40,
 						"h": 30
@@ -1116,8 +1116,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 0,
-						"y": 120,
+						"x": 400,
+						"y": 90,
 						"w": 40,
 						"h": 30
 					}
@@ -1137,8 +1137,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 40,
-						"y": 120,
+						"x": 440,
+						"y": 90,
 						"w": 40,
 						"h": 30
 					}
@@ -1158,7 +1158,49 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 80,
+						"x": 480,
+						"y": 90,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "299_2",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 520,
+						"y": 90,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "299_3",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 0,
 						"y": 120,
 						"w": 40,
 						"h": 30
@@ -1179,7 +1221,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 120,
+						"x": 40,
 						"y": 120,
 						"w": 40,
 						"h": 30
@@ -1200,7 +1242,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 160,
+						"x": 80,
 						"y": 120,
 						"w": 40,
 						"h": 30
@@ -1221,7 +1263,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 200,
+						"x": 120,
 						"y": 120,
 						"w": 40,
 						"h": 30
@@ -1242,7 +1284,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 240,
+						"x": 160,
 						"y": 120,
 						"w": 40,
 						"h": 30
@@ -1263,7 +1305,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 280,
+						"x": 200,
 						"y": 120,
 						"w": 40,
 						"h": 30
@@ -1284,7 +1326,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 320,
+						"x": 240,
 						"y": 120,
 						"w": 40,
 						"h": 30
@@ -1305,7 +1347,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 360,
+						"x": 280,
 						"y": 120,
 						"w": 40,
 						"h": 30
@@ -1326,7 +1368,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 400,
+						"x": 320,
 						"y": 120,
 						"w": 40,
 						"h": 30
@@ -1347,7 +1389,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 440,
+						"x": 360,
 						"y": 120,
 						"w": 40,
 						"h": 30
@@ -1368,7 +1410,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 480,
+						"x": 400,
 						"y": 120,
 						"w": 40,
 						"h": 30
@@ -1389,8 +1431,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 0,
-						"y": 150,
+						"x": 440,
+						"y": 120,
 						"w": 40,
 						"h": 30
 					}
@@ -1410,8 +1452,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 40,
-						"y": 150,
+						"x": 480,
+						"y": 120,
 						"w": 40,
 						"h": 30
 					}
@@ -1431,8 +1473,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 80,
-						"y": 150,
+						"x": 520,
+						"y": 120,
 						"w": 40,
 						"h": 30
 					}
@@ -1452,7 +1494,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 120,
+						"x": 0,
 						"y": 150,
 						"w": 40,
 						"h": 30
@@ -1473,7 +1515,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 160,
+						"x": 40,
 						"y": 150,
 						"w": 40,
 						"h": 30
@@ -1494,7 +1536,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 200,
+						"x": 80,
 						"y": 150,
 						"w": 40,
 						"h": 30
@@ -1515,7 +1557,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 240,
+						"x": 120,
 						"y": 150,
 						"w": 40,
 						"h": 30
@@ -1536,7 +1578,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 280,
+						"x": 160,
 						"y": 150,
 						"w": 40,
 						"h": 30
@@ -1557,7 +1599,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 320,
+						"x": 200,
 						"y": 150,
 						"w": 40,
 						"h": 30
@@ -1578,7 +1620,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 360,
+						"x": 240,
 						"y": 150,
 						"w": 40,
 						"h": 30
@@ -1599,7 +1641,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 400,
+						"x": 280,
 						"y": 150,
 						"w": 40,
 						"h": 30
@@ -1620,7 +1662,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 440,
+						"x": 320,
 						"y": 150,
 						"w": 40,
 						"h": 30
@@ -1641,7 +1683,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 480,
+						"x": 360,
 						"y": 150,
 						"w": 40,
 						"h": 30
@@ -1662,8 +1704,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 0,
-						"y": 180,
+						"x": 400,
+						"y": 150,
 						"w": 40,
 						"h": 30
 					}
@@ -1683,8 +1725,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 40,
-						"y": 180,
+						"x": 440,
+						"y": 150,
 						"w": 40,
 						"h": 30
 					}
@@ -1704,8 +1746,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 80,
-						"y": 180,
+						"x": 480,
+						"y": 150,
 						"w": 40,
 						"h": 30
 					}
@@ -1725,8 +1767,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 120,
-						"y": 180,
+						"x": 520,
+						"y": 150,
 						"w": 40,
 						"h": 30
 					}
@@ -1746,7 +1788,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 160,
+						"x": 0,
 						"y": 180,
 						"w": 40,
 						"h": 30
@@ -1767,7 +1809,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 200,
+						"x": 40,
 						"y": 180,
 						"w": 40,
 						"h": 30
@@ -1788,7 +1830,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 240,
+						"x": 80,
 						"y": 180,
 						"w": 40,
 						"h": 30
@@ -1809,7 +1851,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 280,
+						"x": 120,
 						"y": 180,
 						"w": 40,
 						"h": 30
@@ -1830,7 +1872,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 320,
+						"x": 160,
 						"y": 180,
 						"w": 40,
 						"h": 30
@@ -1851,7 +1893,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 360,
+						"x": 200,
 						"y": 180,
 						"w": 40,
 						"h": 30
@@ -1872,7 +1914,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 400,
+						"x": 240,
 						"y": 180,
 						"w": 40,
 						"h": 30
@@ -1893,7 +1935,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 440,
+						"x": 280,
 						"y": 180,
 						"w": 40,
 						"h": 30
@@ -1914,7 +1956,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 480,
+						"x": 320,
 						"y": 180,
 						"w": 40,
 						"h": 30
@@ -1935,8 +1977,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 0,
-						"y": 210,
+						"x": 360,
+						"y": 180,
 						"w": 40,
 						"h": 30
 					}
@@ -1956,8 +1998,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 40,
-						"y": 210,
+						"x": 400,
+						"y": 180,
 						"w": 40,
 						"h": 30
 					}
@@ -1977,8 +2019,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 80,
-						"y": 210,
+						"x": 440,
+						"y": 180,
 						"w": 40,
 						"h": 30
 					}
@@ -1998,8 +2040,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 120,
-						"y": 210,
+						"x": 480,
+						"y": 180,
 						"w": 40,
 						"h": 30
 					}
@@ -2019,8 +2061,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 160,
-						"y": 210,
+						"x": 520,
+						"y": 180,
 						"w": 40,
 						"h": 30
 					}
@@ -2040,7 +2082,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 200,
+						"x": 0,
 						"y": 210,
 						"w": 40,
 						"h": 30
@@ -2061,7 +2103,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 240,
+						"x": 40,
 						"y": 210,
 						"w": 40,
 						"h": 30
@@ -2082,7 +2124,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 280,
+						"x": 80,
 						"y": 210,
 						"w": 40,
 						"h": 30
@@ -2103,7 +2145,91 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 320,
+						"x": 120,
+						"y": 210,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "313_2",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 160,
+						"y": 210,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "313_3",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 200,
+						"y": 210,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "314_2",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 240,
+						"y": 210,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "314_3",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 280,
 						"y": 210,
 						"w": 40,
 						"h": 30
@@ -2124,7 +2250,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 360,
+						"x": 320,
 						"y": 210,
 						"w": 40,
 						"h": 30
@@ -2145,7 +2271,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 400,
+						"x": 360,
 						"y": 210,
 						"w": 40,
 						"h": 30
@@ -2166,7 +2292,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 440,
+						"x": 400,
 						"y": 210,
 						"w": 40,
 						"h": 30
@@ -2187,7 +2313,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 480,
+						"x": 440,
 						"y": 210,
 						"w": 40,
 						"h": 30
@@ -2208,8 +2334,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 0,
-						"y": 240,
+						"x": 480,
+						"y": 210,
 						"w": 40,
 						"h": 30
 					}
@@ -2228,6 +2354,48 @@
 						"w": 40,
 						"h": 30
 					},
+					"frame": {
+						"x": 520,
+						"y": 210,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "325_2",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 0,
+						"y": 240,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "325_3",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
 					"frame": {
 						"x": 40,
 						"y": 240,
@@ -2235,6 +2403,48 @@
 						"h": 30
 					}
 				},
+				{
+					"filename": "326_2",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 80,
+						"y": 240,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "326_3",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 120,
+						"y": 240,
+						"w": 40,
+						"h": 30
+					}
+				},
 				{
 					"filename": "327_2",
 					"rotated": false,
@@ -2250,7 +2460,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 80,
+						"x": 160,
 						"y": 240,
 						"w": 40,
 						"h": 30
@@ -2271,7 +2481,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 120,
+						"x": 200,
 						"y": 240,
 						"w": 40,
 						"h": 30
@@ -2292,7 +2502,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 160,
+						"x": 240,
 						"y": 240,
 						"w": 40,
 						"h": 30
@@ -2313,7 +2523,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 200,
+						"x": 280,
 						"y": 240,
 						"w": 40,
 						"h": 30
@@ -2334,7 +2544,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 240,
+						"x": 320,
 						"y": 240,
 						"w": 40,
 						"h": 30
@@ -2355,7 +2565,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 280,
+						"x": 360,
 						"y": 240,
 						"w": 40,
 						"h": 30
@@ -2376,7 +2586,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 320,
+						"x": 400,
 						"y": 240,
 						"w": 40,
 						"h": 30
@@ -2396,48 +2606,6 @@
 						"w": 40,
 						"h": 30
 					},
-					"frame": {
-						"x": 360,
-						"y": 240,
-						"w": 40,
-						"h": 30
-					}
-				},
-				{
-					"filename": "333_2",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 40,
-						"h": 30
-					},
-					"frame": {
-						"x": 400,
-						"y": 240,
-						"w": 40,
-						"h": 30
-					}
-				},
-				{
-					"filename": "333_3",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 40,
-						"h": 30
-					},
 					"frame": {
 						"x": 440,
 						"y": 240,
@@ -2446,7 +2614,7 @@
 					}
 				},
 				{
-					"filename": "334-mega_2",
+					"filename": "331_2",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
@@ -2467,7 +2635,28 @@
 					}
 				},
 				{
-					"filename": "334-mega_3",
+					"filename": "331_3",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 520,
+						"y": 240,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "332_2",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
@@ -2487,6 +2676,111 @@
 						"h": 30
 					}
 				},
+				{
+					"filename": "332_3",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 40,
+						"y": 270,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "333_2",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 80,
+						"y": 270,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "333_3",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 120,
+						"y": 270,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "334-mega_2",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 160,
+						"y": 270,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "334-mega_3",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 200,
+						"y": 270,
+						"w": 40,
+						"h": 30
+					}
+				},
 				{
 					"filename": "334_2",
 					"rotated": false,
@@ -2502,7 +2796,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 40,
+						"x": 240,
 						"y": 270,
 						"w": 40,
 						"h": 30
@@ -2523,7 +2817,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 80,
+						"x": 280,
 						"y": 270,
 						"w": 40,
 						"h": 30
@@ -2544,7 +2838,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 120,
+						"x": 320,
 						"y": 270,
 						"w": 40,
 						"h": 30
@@ -2565,7 +2859,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 160,
+						"x": 360,
 						"y": 270,
 						"w": 40,
 						"h": 30
@@ -2586,7 +2880,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 200,
+						"x": 400,
 						"y": 270,
 						"w": 40,
 						"h": 30
@@ -2607,7 +2901,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 240,
+						"x": 440,
 						"y": 270,
 						"w": 40,
 						"h": 30
@@ -2628,7 +2922,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 280,
+						"x": 480,
 						"y": 270,
 						"w": 40,
 						"h": 30
@@ -2649,7 +2943,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 320,
+						"x": 520,
 						"y": 270,
 						"w": 40,
 						"h": 30
@@ -2670,8 +2964,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 360,
-						"y": 270,
+						"x": 0,
+						"y": 300,
 						"w": 40,
 						"h": 30
 					}
@@ -2691,8 +2985,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 400,
-						"y": 270,
+						"x": 40,
+						"y": 300,
 						"w": 40,
 						"h": 30
 					}
@@ -2712,8 +3006,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 440,
-						"y": 270,
+						"x": 80,
+						"y": 300,
 						"w": 40,
 						"h": 30
 					}
@@ -2733,8 +3027,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 480,
-						"y": 270,
+						"x": 120,
+						"y": 300,
 						"w": 40,
 						"h": 30
 					}
@@ -2754,7 +3048,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 0,
+						"x": 160,
 						"y": 300,
 						"w": 40,
 						"h": 30
@@ -2775,7 +3069,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 40,
+						"x": 200,
 						"y": 300,
 						"w": 40,
 						"h": 30
@@ -2796,7 +3090,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 80,
+						"x": 240,
 						"y": 300,
 						"w": 40,
 						"h": 30
@@ -2817,7 +3111,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 120,
+						"x": 280,
 						"y": 300,
 						"w": 40,
 						"h": 30
@@ -2838,7 +3132,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 160,
+						"x": 320,
 						"y": 300,
 						"w": 40,
 						"h": 30
@@ -2859,7 +3153,91 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 200,
+						"x": 360,
+						"y": 300,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "345_2",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 400,
+						"y": 300,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "345_3",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 440,
+						"y": 300,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "346_2",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 480,
+						"y": 300,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "346_3",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 520,
 						"y": 300,
 						"w": 40,
 						"h": 30
@@ -2880,8 +3258,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 240,
-						"y": 300,
+						"x": 0,
+						"y": 330,
 						"w": 40,
 						"h": 30
 					}
@@ -2901,8 +3279,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 280,
-						"y": 300,
+						"x": 40,
+						"y": 330,
 						"w": 40,
 						"h": 30
 					}
@@ -2922,8 +3300,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 320,
-						"y": 300,
+						"x": 80,
+						"y": 330,
 						"w": 40,
 						"h": 30
 					}
@@ -2943,8 +3321,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 360,
-						"y": 300,
+						"x": 120,
+						"y": 330,
 						"w": 40,
 						"h": 30
 					}
@@ -2964,8 +3342,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 400,
-						"y": 300,
+						"x": 160,
+						"y": 330,
 						"w": 40,
 						"h": 30
 					}
@@ -2985,8 +3363,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 440,
-						"y": 300,
+						"x": 200,
+						"y": 330,
 						"w": 40,
 						"h": 30
 					}
@@ -3006,8 +3384,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 480,
-						"y": 300,
+						"x": 240,
+						"y": 330,
 						"w": 40,
 						"h": 30
 					}
@@ -3027,7 +3405,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 0,
+						"x": 280,
 						"y": 330,
 						"w": 40,
 						"h": 30
@@ -3048,7 +3426,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 40,
+						"x": 320,
 						"y": 330,
 						"w": 40,
 						"h": 30
@@ -3069,7 +3447,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 80,
+						"x": 360,
 						"y": 330,
 						"w": 40,
 						"h": 30
@@ -3090,7 +3468,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 120,
+						"x": 400,
 						"y": 330,
 						"w": 40,
 						"h": 30
@@ -3111,7 +3489,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 160,
+						"x": 440,
 						"y": 330,
 						"w": 40,
 						"h": 30
@@ -3132,7 +3510,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 200,
+						"x": 480,
 						"y": 330,
 						"w": 40,
 						"h": 30
@@ -3153,7 +3531,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 240,
+						"x": 520,
 						"y": 330,
 						"w": 40,
 						"h": 30
@@ -3174,8 +3552,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 280,
-						"y": 330,
+						"x": 0,
+						"y": 360,
 						"w": 40,
 						"h": 30
 					}
@@ -3195,8 +3573,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 320,
-						"y": 330,
+						"x": 40,
+						"y": 360,
 						"w": 40,
 						"h": 30
 					}
@@ -3216,8 +3594,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 360,
-						"y": 330,
+						"x": 80,
+						"y": 360,
 						"w": 40,
 						"h": 30
 					}
@@ -3237,8 +3615,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 400,
-						"y": 330,
+						"x": 120,
+						"y": 360,
 						"w": 40,
 						"h": 30
 					}
@@ -3258,8 +3636,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 440,
-						"y": 330,
+						"x": 160,
+						"y": 360,
 						"w": 40,
 						"h": 30
 					}
@@ -3279,8 +3657,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 480,
-						"y": 330,
+						"x": 200,
+						"y": 360,
 						"w": 40,
 						"h": 30
 					}
@@ -3300,7 +3678,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 0,
+						"x": 240,
 						"y": 360,
 						"w": 40,
 						"h": 30
@@ -3321,7 +3699,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 40,
+						"x": 280,
 						"y": 360,
 						"w": 40,
 						"h": 30
@@ -3342,7 +3720,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 80,
+						"x": 320,
 						"y": 360,
 						"w": 40,
 						"h": 30
@@ -3363,7 +3741,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 120,
+						"x": 360,
 						"y": 360,
 						"w": 40,
 						"h": 30
@@ -3384,7 +3762,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 160,
+						"x": 400,
 						"y": 360,
 						"w": 40,
 						"h": 30
@@ -3405,7 +3783,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 200,
+						"x": 440,
 						"y": 360,
 						"w": 40,
 						"h": 30
@@ -3426,7 +3804,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 240,
+						"x": 480,
 						"y": 360,
 						"w": 40,
 						"h": 30
@@ -3447,7 +3825,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 280,
+						"x": 520,
 						"y": 360,
 						"w": 40,
 						"h": 30
@@ -3468,8 +3846,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 320,
-						"y": 360,
+						"x": 0,
+						"y": 390,
 						"w": 40,
 						"h": 30
 					}
@@ -3489,8 +3867,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 360,
-						"y": 360,
+						"x": 40,
+						"y": 390,
 						"w": 40,
 						"h": 30
 					}
@@ -3510,8 +3888,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 400,
-						"y": 360,
+						"x": 80,
+						"y": 390,
 						"w": 40,
 						"h": 30
 					}
@@ -3531,8 +3909,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 440,
-						"y": 360,
+						"x": 120,
+						"y": 390,
 						"w": 40,
 						"h": 30
 					}
@@ -3552,8 +3930,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 480,
-						"y": 360,
+						"x": 160,
+						"y": 390,
 						"w": 40,
 						"h": 30
 					}
@@ -3573,7 +3951,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 0,
+						"x": 200,
 						"y": 390,
 						"w": 40,
 						"h": 30
@@ -3594,7 +3972,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 40,
+						"x": 240,
 						"y": 390,
 						"w": 40,
 						"h": 30
@@ -3615,7 +3993,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 80,
+						"x": 280,
 						"y": 390,
 						"w": 40,
 						"h": 30
@@ -3636,7 +4014,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 120,
+						"x": 320,
 						"y": 390,
 						"w": 40,
 						"h": 30
@@ -3657,7 +4035,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 160,
+						"x": 360,
 						"y": 390,
 						"w": 40,
 						"h": 30
@@ -3678,7 +4056,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 200,
+						"x": 400,
 						"y": 390,
 						"w": 40,
 						"h": 30
@@ -3699,7 +4077,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 240,
+						"x": 440,
 						"y": 390,
 						"w": 40,
 						"h": 30
@@ -3720,7 +4098,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 280,
+						"x": 480,
 						"y": 390,
 						"w": 40,
 						"h": 30
@@ -3741,7 +4119,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 320,
+						"x": 520,
 						"y": 390,
 						"w": 40,
 						"h": 30
@@ -3762,8 +4140,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 360,
-						"y": 390,
+						"x": 0,
+						"y": 420,
 						"w": 40,
 						"h": 30
 					}
@@ -3783,8 +4161,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 400,
-						"y": 390,
+						"x": 40,
+						"y": 420,
 						"w": 40,
 						"h": 30
 					}
@@ -3804,8 +4182,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 440,
-						"y": 390,
+						"x": 80,
+						"y": 420,
 						"w": 40,
 						"h": 30
 					}
@@ -3825,8 +4203,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 480,
-						"y": 390,
+						"x": 120,
+						"y": 420,
 						"w": 40,
 						"h": 30
 					}
@@ -3846,7 +4224,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 0,
+						"x": 160,
 						"y": 420,
 						"w": 40,
 						"h": 30
@@ -3867,7 +4245,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 40,
+						"x": 200,
 						"y": 420,
 						"w": 40,
 						"h": 30
@@ -3888,7 +4266,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 80,
+						"x": 240,
 						"y": 420,
 						"w": 40,
 						"h": 30
@@ -3909,7 +4287,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 120,
+						"x": 280,
 						"y": 420,
 						"w": 40,
 						"h": 30
@@ -3930,7 +4308,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 160,
+						"x": 320,
 						"y": 420,
 						"w": 40,
 						"h": 30
@@ -3951,7 +4329,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 200,
+						"x": 360,
 						"y": 420,
 						"w": 40,
 						"h": 30
@@ -3972,7 +4350,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 240,
+						"x": 400,
 						"y": 420,
 						"w": 40,
 						"h": 30
@@ -3993,7 +4371,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 280,
+						"x": 440,
 						"y": 420,
 						"w": 40,
 						"h": 30
@@ -4014,7 +4392,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 320,
+						"x": 480,
 						"y": 420,
 						"w": 40,
 						"h": 30
@@ -4035,7 +4413,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 360,
+						"x": 520,
 						"y": 420,
 						"w": 40,
 						"h": 30
@@ -4056,8 +4434,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 400,
-						"y": 420,
+						"x": 0,
+						"y": 450,
 						"w": 40,
 						"h": 30
 					}
@@ -4077,8 +4455,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 440,
-						"y": 420,
+						"x": 40,
+						"y": 450,
 						"w": 40,
 						"h": 30
 					}
@@ -4098,8 +4476,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 480,
-						"y": 420,
+						"x": 80,
+						"y": 450,
 						"w": 40,
 						"h": 30
 					}
@@ -4119,7 +4497,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 0,
+						"x": 120,
 						"y": 450,
 						"w": 40,
 						"h": 30
@@ -4140,7 +4518,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 40,
+						"x": 160,
 						"y": 450,
 						"w": 40,
 						"h": 30
@@ -4161,7 +4539,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 80,
+						"x": 200,
 						"y": 450,
 						"w": 40,
 						"h": 30
@@ -4182,7 +4560,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 120,
+						"x": 240,
 						"y": 450,
 						"w": 40,
 						"h": 30
@@ -4203,7 +4581,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 160,
+						"x": 280,
 						"y": 450,
 						"w": 40,
 						"h": 30
@@ -4224,7 +4602,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 200,
+						"x": 320,
 						"y": 450,
 						"w": 40,
 						"h": 30
@@ -4245,7 +4623,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 240,
+						"x": 360,
 						"y": 450,
 						"w": 40,
 						"h": 30
@@ -4266,7 +4644,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 280,
+						"x": 400,
 						"y": 450,
 						"w": 40,
 						"h": 30
@@ -4287,7 +4665,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 320,
+						"x": 440,
 						"y": 450,
 						"w": 40,
 						"h": 30
@@ -4308,7 +4686,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 360,
+						"x": 480,
 						"y": 450,
 						"w": 40,
 						"h": 30
@@ -4329,7 +4707,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 400,
+						"x": 520,
 						"y": 450,
 						"w": 40,
 						"h": 30
@@ -4349,48 +4727,6 @@
 						"w": 40,
 						"h": 30
 					},
-					"frame": {
-						"x": 440,
-						"y": 450,
-						"w": 40,
-						"h": 30
-					}
-				},
-				{
-					"filename": "382-primal_3",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 40,
-						"h": 30
-					},
-					"frame": {
-						"x": 480,
-						"y": 450,
-						"w": 40,
-						"h": 30
-					}
-				},
-				{
-					"filename": "382_2",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 40,
-						"h": 30
-					},
 					"frame": {
 						"x": 0,
 						"y": 480,
@@ -4399,7 +4735,7 @@
 					}
 				},
 				{
-					"filename": "382_3",
+					"filename": "382-primal_3",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
@@ -4420,7 +4756,7 @@
 					}
 				},
 				{
-					"filename": "383-primal_2",
+					"filename": "382_2",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
@@ -4441,7 +4777,7 @@
 					}
 				},
 				{
-					"filename": "383-primal_3",
+					"filename": "382_3",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
@@ -4462,7 +4798,7 @@
 					}
 				},
 				{
-					"filename": "383_2",
+					"filename": "383-primal_2",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
@@ -4483,7 +4819,7 @@
 					}
 				},
 				{
-					"filename": "383_3",
+					"filename": "383-primal_3",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
@@ -4504,7 +4840,7 @@
 					}
 				},
 				{
-					"filename": "384-mega_2",
+					"filename": "383_2",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
@@ -4525,7 +4861,7 @@
 					}
 				},
 				{
-					"filename": "384-mega_3",
+					"filename": "383_3",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
@@ -4546,7 +4882,7 @@
 					}
 				},
 				{
-					"filename": "384_2",
+					"filename": "384-mega_2",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
@@ -4567,7 +4903,7 @@
 					}
 				},
 				{
-					"filename": "384_3",
+					"filename": "384-mega_3",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
@@ -4588,7 +4924,7 @@
 					}
 				},
 				{
-					"filename": "385_1",
+					"filename": "384_2",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
@@ -4609,7 +4945,7 @@
 					}
 				},
 				{
-					"filename": "385_2",
+					"filename": "384_3",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
@@ -4630,7 +4966,7 @@
 					}
 				},
 				{
-					"filename": "385_3",
+					"filename": "385_1",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
@@ -4649,6 +4985,48 @@
 						"w": 40,
 						"h": 30
 					}
+				},
+				{
+					"filename": "385_2",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 520,
+						"y": 480,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "385_3",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 0,
+						"y": 510,
+						"w": 40,
+						"h": 30
+					}
 				}
 			]
 		}
@@ -4656,6 +5034,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:673055e796ec5f9913fd1dd04284765c:1804ddee68059c3372bf99289c91dd89:039b026190bf1878996b3e03190bcdf3$"
+		"smartupdate": "$TexturePacker:SmartUpdate:205dbeed0e74aff154166e4664b6771c:8bafe4b4084b51e4e837c213db97e8a4:039b026190bf1878996b3e03190bcdf3$"
 	}
 }
diff --git a/public/images/pokemon_icons_3v.png b/public/images/pokemon_icons_3v.png
index 6b699b3bfa9..b151e36e72c 100644
Binary files a/public/images/pokemon_icons_3v.png and b/public/images/pokemon_icons_3v.png differ
diff --git a/public/images/pokemon_icons_4v.json b/public/images/pokemon_icons_4v.json
index 2f171915e01..ffc36e945c4 100644
--- a/public/images/pokemon_icons_4v.json
+++ b/public/images/pokemon_icons_4v.json
@@ -4,8 +4,8 @@
 			"image": "pokemon_icons_4v.png",
 			"format": "RGBA8888",
 			"size": {
-				"w": 520,
-				"h": 520
+				"w": 540,
+				"h": 540
 			},
 			"scale": 1,
 			"frames": [
@@ -388,7 +388,7 @@
 					}
 				},
 				{
-					"filename": "399_2",
+					"filename": "396_2",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
@@ -408,6 +408,132 @@
 						"h": 30
 					}
 				},
+				{
+					"filename": "396_3",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 240,
+						"y": 30,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "397_2",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 280,
+						"y": 30,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "397_3",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 320,
+						"y": 30,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "398_2",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 360,
+						"y": 30,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "398_3",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 400,
+						"y": 30,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "399_2",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 440,
+						"y": 30,
+						"w": 40,
+						"h": 30
+					}
+				},
 				{
 					"filename": "399_3",
 					"rotated": false,
@@ -423,7 +549,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 240,
+						"x": 480,
 						"y": 30,
 						"w": 40,
 						"h": 30
@@ -444,8 +570,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 280,
-						"y": 30,
+						"x": 0,
+						"y": 60,
 						"w": 40,
 						"h": 30
 					}
@@ -465,8 +591,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 320,
-						"y": 30,
+						"x": 40,
+						"y": 60,
 						"w": 40,
 						"h": 30
 					}
@@ -486,8 +612,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 360,
-						"y": 30,
+						"x": 80,
+						"y": 60,
 						"w": 40,
 						"h": 30
 					}
@@ -507,8 +633,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 400,
-						"y": 30,
+						"x": 120,
+						"y": 60,
 						"w": 40,
 						"h": 30
 					}
@@ -528,8 +654,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 440,
-						"y": 30,
+						"x": 160,
+						"y": 60,
 						"w": 40,
 						"h": 30
 					}
@@ -549,8 +675,134 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 480,
-						"y": 30,
+						"x": 200,
+						"y": 60,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "403_2",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 240,
+						"y": 60,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "403_3",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 280,
+						"y": 60,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "404_2",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 320,
+						"y": 60,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "404_3",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 360,
+						"y": 60,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "405_2",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 400,
+						"y": 60,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "405_3",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 440,
+						"y": 60,
 						"w": 40,
 						"h": 30
 					}
@@ -570,7 +822,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 0,
+						"x": 480,
 						"y": 60,
 						"w": 40,
 						"h": 30
@@ -591,8 +843,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 40,
-						"y": 60,
+						"x": 0,
+						"y": 90,
 						"w": 40,
 						"h": 30
 					}
@@ -612,8 +864,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 80,
-						"y": 60,
+						"x": 40,
+						"y": 90,
 						"w": 40,
 						"h": 30
 					}
@@ -633,8 +885,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 120,
-						"y": 60,
+						"x": 80,
+						"y": 90,
 						"w": 40,
 						"h": 30
 					}
@@ -654,8 +906,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 160,
-						"y": 60,
+						"x": 120,
+						"y": 90,
 						"w": 40,
 						"h": 30
 					}
@@ -675,8 +927,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 200,
-						"y": 60,
+						"x": 160,
+						"y": 90,
 						"w": 40,
 						"h": 30
 					}
@@ -696,8 +948,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 240,
-						"y": 60,
+						"x": 200,
+						"y": 90,
 						"w": 40,
 						"h": 30
 					}
@@ -717,8 +969,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 280,
-						"y": 60,
+						"x": 240,
+						"y": 90,
 						"w": 40,
 						"h": 30
 					}
@@ -738,8 +990,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 320,
-						"y": 60,
+						"x": 280,
+						"y": 90,
 						"w": 40,
 						"h": 30
 					}
@@ -759,8 +1011,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 360,
-						"y": 60,
+						"x": 320,
+						"y": 90,
 						"w": 40,
 						"h": 30
 					}
@@ -780,8 +1032,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 400,
-						"y": 60,
+						"x": 360,
+						"y": 90,
 						"w": 40,
 						"h": 30
 					}
@@ -801,8 +1053,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 440,
-						"y": 60,
+						"x": 400,
+						"y": 90,
 						"w": 40,
 						"h": 30
 					}
@@ -822,8 +1074,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 480,
-						"y": 60,
+						"x": 440,
+						"y": 90,
 						"w": 40,
 						"h": 30
 					}
@@ -843,7 +1095,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 0,
+						"x": 480,
 						"y": 90,
 						"w": 40,
 						"h": 30
@@ -864,8 +1116,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 40,
-						"y": 90,
+						"x": 0,
+						"y": 120,
 						"w": 40,
 						"h": 30
 					}
@@ -885,8 +1137,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 80,
-						"y": 90,
+						"x": 40,
+						"y": 120,
 						"w": 40,
 						"h": 30
 					}
@@ -906,8 +1158,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 120,
-						"y": 90,
+						"x": 80,
+						"y": 120,
 						"w": 40,
 						"h": 30
 					}
@@ -927,8 +1179,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 160,
-						"y": 90,
+						"x": 120,
+						"y": 120,
 						"w": 40,
 						"h": 30
 					}
@@ -948,8 +1200,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 200,
-						"y": 90,
+						"x": 160,
+						"y": 120,
 						"w": 40,
 						"h": 30
 					}
@@ -969,8 +1221,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 240,
-						"y": 90,
+						"x": 200,
+						"y": 120,
 						"w": 40,
 						"h": 30
 					}
@@ -990,8 +1242,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 280,
-						"y": 90,
+						"x": 240,
+						"y": 120,
 						"w": 40,
 						"h": 30
 					}
@@ -1011,8 +1263,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 320,
-						"y": 90,
+						"x": 280,
+						"y": 120,
 						"w": 40,
 						"h": 30
 					}
@@ -1032,8 +1284,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 360,
-						"y": 90,
+						"x": 320,
+						"y": 120,
 						"w": 40,
 						"h": 30
 					}
@@ -1052,9 +1304,51 @@
 						"w": 40,
 						"h": 30
 					},
+					"frame": {
+						"x": 360,
+						"y": 120,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "417_2",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
 					"frame": {
 						"x": 400,
-						"y": 90,
+						"y": 120,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "417_3",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 440,
+						"y": 120,
 						"w": 40,
 						"h": 30
 					}
@@ -1074,8 +1368,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 440,
-						"y": 90,
+						"x": 480,
+						"y": 120,
 						"w": 40,
 						"h": 30
 					}
@@ -1095,8 +1389,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 480,
-						"y": 90,
+						"x": 0,
+						"y": 150,
 						"w": 40,
 						"h": 30
 					}
@@ -1116,8 +1410,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 0,
-						"y": 120,
+						"x": 40,
+						"y": 150,
 						"w": 40,
 						"h": 30
 					}
@@ -1137,8 +1431,134 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 40,
-						"y": 120,
+						"x": 80,
+						"y": 150,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "420_2",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 120,
+						"y": 150,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "420_3",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 160,
+						"y": 150,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "421-overcast_2",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 200,
+						"y": 150,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "421-overcast_3",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 240,
+						"y": 150,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "421-sunshine_2",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 280,
+						"y": 150,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "421-sunshine_3",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 320,
+						"y": 150,
 						"w": 40,
 						"h": 30
 					}
@@ -1158,8 +1578,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 80,
-						"y": 120,
+						"x": 360,
+						"y": 150,
 						"w": 40,
 						"h": 30
 					}
@@ -1179,8 +1599,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 120,
-						"y": 120,
+						"x": 400,
+						"y": 150,
 						"w": 40,
 						"h": 30
 					}
@@ -1200,8 +1620,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 160,
-						"y": 120,
+						"x": 440,
+						"y": 150,
 						"w": 40,
 						"h": 30
 					}
@@ -1221,8 +1641,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 200,
-						"y": 120,
+						"x": 480,
+						"y": 150,
 						"w": 40,
 						"h": 30
 					}
@@ -1242,8 +1662,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 240,
-						"y": 120,
+						"x": 0,
+						"y": 180,
 						"w": 40,
 						"h": 30
 					}
@@ -1263,8 +1683,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 280,
-						"y": 120,
+						"x": 40,
+						"y": 180,
 						"w": 40,
 						"h": 30
 					}
@@ -1284,8 +1704,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 320,
-						"y": 120,
+						"x": 80,
+						"y": 180,
 						"w": 40,
 						"h": 30
 					}
@@ -1305,8 +1725,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 360,
-						"y": 120,
+						"x": 120,
+						"y": 180,
 						"w": 40,
 						"h": 30
 					}
@@ -1326,8 +1746,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 400,
-						"y": 120,
+						"x": 160,
+						"y": 180,
 						"w": 40,
 						"h": 30
 					}
@@ -1347,8 +1767,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 440,
-						"y": 120,
+						"x": 200,
+						"y": 180,
 						"w": 40,
 						"h": 30
 					}
@@ -1368,8 +1788,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 480,
-						"y": 120,
+						"x": 240,
+						"y": 180,
 						"w": 40,
 						"h": 30
 					}
@@ -1389,8 +1809,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 0,
-						"y": 150,
+						"x": 280,
+						"y": 180,
 						"w": 40,
 						"h": 30
 					}
@@ -1410,8 +1830,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 40,
-						"y": 150,
+						"x": 320,
+						"y": 180,
 						"w": 40,
 						"h": 30
 					}
@@ -1431,8 +1851,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 80,
-						"y": 150,
+						"x": 360,
+						"y": 180,
 						"w": 40,
 						"h": 30
 					}
@@ -1452,8 +1872,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 120,
-						"y": 150,
+						"x": 400,
+						"y": 180,
 						"w": 40,
 						"h": 30
 					}
@@ -1473,8 +1893,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 160,
-						"y": 150,
+						"x": 440,
+						"y": 180,
 						"w": 40,
 						"h": 30
 					}
@@ -1494,8 +1914,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 200,
-						"y": 150,
+						"x": 480,
+						"y": 180,
 						"w": 40,
 						"h": 30
 					}
@@ -1515,8 +1935,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 240,
-						"y": 150,
+						"x": 0,
+						"y": 210,
 						"w": 40,
 						"h": 30
 					}
@@ -1536,8 +1956,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 280,
-						"y": 150,
+						"x": 40,
+						"y": 210,
 						"w": 40,
 						"h": 30
 					}
@@ -1557,8 +1977,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 320,
-						"y": 150,
+						"x": 80,
+						"y": 210,
 						"w": 40,
 						"h": 30
 					}
@@ -1578,8 +1998,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 360,
-						"y": 150,
+						"x": 120,
+						"y": 210,
 						"w": 40,
 						"h": 30
 					}
@@ -1599,8 +2019,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 400,
-						"y": 150,
+						"x": 160,
+						"y": 210,
 						"w": 40,
 						"h": 30
 					}
@@ -1620,8 +2040,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 440,
-						"y": 150,
+						"x": 200,
+						"y": 210,
 						"w": 40,
 						"h": 30
 					}
@@ -1641,8 +2061,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 480,
-						"y": 150,
+						"x": 240,
+						"y": 210,
 						"w": 40,
 						"h": 30
 					}
@@ -1662,8 +2082,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 0,
-						"y": 180,
+						"x": 280,
+						"y": 210,
 						"w": 40,
 						"h": 30
 					}
@@ -1683,8 +2103,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 40,
-						"y": 180,
+						"x": 320,
+						"y": 210,
 						"w": 40,
 						"h": 30
 					}
@@ -1704,8 +2124,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 80,
-						"y": 180,
+						"x": 360,
+						"y": 210,
 						"w": 40,
 						"h": 30
 					}
@@ -1725,8 +2145,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 120,
-						"y": 180,
+						"x": 400,
+						"y": 210,
 						"w": 40,
 						"h": 30
 					}
@@ -1746,8 +2166,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 160,
-						"y": 180,
+						"x": 440,
+						"y": 210,
 						"w": 40,
 						"h": 30
 					}
@@ -1767,8 +2187,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 200,
-						"y": 180,
+						"x": 480,
+						"y": 210,
 						"w": 40,
 						"h": 30
 					}
@@ -1788,8 +2208,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 240,
-						"y": 180,
+						"x": 0,
+						"y": 240,
 						"w": 40,
 						"h": 30
 					}
@@ -1809,8 +2229,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 280,
-						"y": 180,
+						"x": 40,
+						"y": 240,
 						"w": 40,
 						"h": 30
 					}
@@ -1830,8 +2250,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 320,
-						"y": 180,
+						"x": 80,
+						"y": 240,
 						"w": 40,
 						"h": 30
 					}
@@ -1851,8 +2271,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 360,
-						"y": 180,
+						"x": 120,
+						"y": 240,
 						"w": 40,
 						"h": 30
 					}
@@ -1872,8 +2292,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 400,
-						"y": 180,
+						"x": 160,
+						"y": 240,
 						"w": 40,
 						"h": 30
 					}
@@ -1893,8 +2313,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 440,
-						"y": 180,
+						"x": 200,
+						"y": 240,
 						"w": 40,
 						"h": 30
 					}
@@ -1914,8 +2334,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 480,
-						"y": 180,
+						"x": 240,
+						"y": 240,
 						"w": 40,
 						"h": 30
 					}
@@ -1935,8 +2355,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 0,
-						"y": 210,
+						"x": 280,
+						"y": 240,
 						"w": 40,
 						"h": 30
 					}
@@ -1956,8 +2376,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 40,
-						"y": 210,
+						"x": 320,
+						"y": 240,
 						"w": 40,
 						"h": 30
 					}
@@ -1977,8 +2397,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 80,
-						"y": 210,
+						"x": 360,
+						"y": 240,
 						"w": 40,
 						"h": 30
 					}
@@ -1998,8 +2418,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 120,
-						"y": 210,
+						"x": 400,
+						"y": 240,
 						"w": 40,
 						"h": 30
 					}
@@ -2019,8 +2439,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 160,
-						"y": 210,
+						"x": 440,
+						"y": 240,
 						"w": 40,
 						"h": 30
 					}
@@ -2040,8 +2460,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 200,
-						"y": 210,
+						"x": 480,
+						"y": 240,
 						"w": 40,
 						"h": 30
 					}
@@ -2061,8 +2481,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 240,
-						"y": 210,
+						"x": 0,
+						"y": 270,
 						"w": 40,
 						"h": 30
 					}
@@ -2082,8 +2502,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 280,
-						"y": 210,
+						"x": 40,
+						"y": 270,
 						"w": 40,
 						"h": 30
 					}
@@ -2103,8 +2523,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 320,
-						"y": 210,
+						"x": 80,
+						"y": 270,
 						"w": 40,
 						"h": 30
 					}
@@ -2124,8 +2544,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 360,
-						"y": 210,
+						"x": 120,
+						"y": 270,
 						"w": 40,
 						"h": 30
 					}
@@ -2145,8 +2565,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 400,
-						"y": 210,
+						"x": 160,
+						"y": 270,
 						"w": 40,
 						"h": 30
 					}
@@ -2166,8 +2586,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 440,
-						"y": 210,
+						"x": 200,
+						"y": 270,
 						"w": 40,
 						"h": 30
 					}
@@ -2187,8 +2607,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 480,
-						"y": 210,
+						"x": 240,
+						"y": 270,
 						"w": 40,
 						"h": 30
 					}
@@ -2208,8 +2628,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 0,
-						"y": 240,
+						"x": 280,
+						"y": 270,
 						"w": 40,
 						"h": 30
 					}
@@ -2229,8 +2649,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 40,
-						"y": 240,
+						"x": 320,
+						"y": 270,
 						"w": 40,
 						"h": 30
 					}
@@ -2250,8 +2670,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 80,
-						"y": 240,
+						"x": 360,
+						"y": 270,
 						"w": 40,
 						"h": 30
 					}
@@ -2271,8 +2691,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 120,
-						"y": 240,
+						"x": 400,
+						"y": 270,
 						"w": 40,
 						"h": 30
 					}
@@ -2292,8 +2712,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 160,
-						"y": 240,
+						"x": 440,
+						"y": 270,
 						"w": 40,
 						"h": 30
 					}
@@ -2313,8 +2733,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 200,
-						"y": 240,
+						"x": 480,
+						"y": 270,
 						"w": 40,
 						"h": 30
 					}
@@ -2334,8 +2754,50 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 240,
-						"y": 240,
+						"x": 0,
+						"y": 300,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "446_2",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 40,
+						"y": 300,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "446_3",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 80,
+						"y": 300,
 						"w": 40,
 						"h": 30
 					}
@@ -2355,8 +2817,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 280,
-						"y": 240,
+						"x": 120,
+						"y": 300,
 						"w": 40,
 						"h": 30
 					}
@@ -2376,8 +2838,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 320,
-						"y": 240,
+						"x": 160,
+						"y": 300,
 						"w": 40,
 						"h": 30
 					}
@@ -2397,8 +2859,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 360,
-						"y": 240,
+						"x": 200,
+						"y": 300,
 						"w": 40,
 						"h": 30
 					}
@@ -2418,8 +2880,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 400,
-						"y": 240,
+						"x": 240,
+						"y": 300,
 						"w": 40,
 						"h": 30
 					}
@@ -2439,8 +2901,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 440,
-						"y": 240,
+						"x": 280,
+						"y": 300,
 						"w": 40,
 						"h": 30
 					}
@@ -2460,8 +2922,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 480,
-						"y": 240,
+						"x": 320,
+						"y": 300,
 						"w": 40,
 						"h": 30
 					}
@@ -2481,8 +2943,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 0,
-						"y": 270,
+						"x": 360,
+						"y": 300,
 						"w": 40,
 						"h": 30
 					}
@@ -2502,8 +2964,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 40,
-						"y": 270,
+						"x": 400,
+						"y": 300,
 						"w": 40,
 						"h": 30
 					}
@@ -2523,8 +2985,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 80,
-						"y": 270,
+						"x": 440,
+						"y": 300,
 						"w": 40,
 						"h": 30
 					}
@@ -2544,8 +3006,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 120,
-						"y": 270,
+						"x": 480,
+						"y": 300,
 						"w": 40,
 						"h": 30
 					}
@@ -2565,8 +3027,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 160,
-						"y": 270,
+						"x": 0,
+						"y": 330,
 						"w": 40,
 						"h": 30
 					}
@@ -2586,8 +3048,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 200,
-						"y": 270,
+						"x": 40,
+						"y": 330,
 						"w": 40,
 						"h": 30
 					}
@@ -2607,8 +3069,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 240,
-						"y": 270,
+						"x": 80,
+						"y": 330,
 						"w": 40,
 						"h": 30
 					}
@@ -2628,8 +3090,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 280,
-						"y": 270,
+						"x": 120,
+						"y": 330,
 						"w": 40,
 						"h": 30
 					}
@@ -2649,8 +3111,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 320,
-						"y": 270,
+						"x": 160,
+						"y": 330,
 						"w": 40,
 						"h": 30
 					}
@@ -2670,8 +3132,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 360,
-						"y": 270,
+						"x": 200,
+						"y": 330,
 						"w": 40,
 						"h": 30
 					}
@@ -2691,8 +3153,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 400,
-						"y": 270,
+						"x": 240,
+						"y": 330,
 						"w": 40,
 						"h": 30
 					}
@@ -2712,8 +3174,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 440,
-						"y": 270,
+						"x": 280,
+						"y": 330,
 						"w": 40,
 						"h": 30
 					}
@@ -2733,8 +3195,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 480,
-						"y": 270,
+						"x": 320,
+						"y": 330,
 						"w": 40,
 						"h": 30
 					}
@@ -2754,8 +3216,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 0,
-						"y": 300,
+						"x": 360,
+						"y": 330,
 						"w": 40,
 						"h": 30
 					}
@@ -2775,8 +3237,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 40,
-						"y": 300,
+						"x": 400,
+						"y": 330,
 						"w": 40,
 						"h": 30
 					}
@@ -2796,8 +3258,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 80,
-						"y": 300,
+						"x": 440,
+						"y": 330,
 						"w": 40,
 						"h": 30
 					}
@@ -2817,8 +3279,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 120,
-						"y": 300,
+						"x": 480,
+						"y": 330,
 						"w": 40,
 						"h": 30
 					}
@@ -2838,8 +3300,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 160,
-						"y": 300,
+						"x": 0,
+						"y": 360,
 						"w": 40,
 						"h": 30
 					}
@@ -2859,8 +3321,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 200,
-						"y": 300,
+						"x": 40,
+						"y": 360,
 						"w": 40,
 						"h": 30
 					}
@@ -2880,8 +3342,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 240,
-						"y": 300,
+						"x": 80,
+						"y": 360,
 						"w": 40,
 						"h": 30
 					}
@@ -2901,8 +3363,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 280,
-						"y": 300,
+						"x": 120,
+						"y": 360,
 						"w": 40,
 						"h": 30
 					}
@@ -2922,8 +3384,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 320,
-						"y": 300,
+						"x": 160,
+						"y": 360,
 						"w": 40,
 						"h": 30
 					}
@@ -2943,8 +3405,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 360,
-						"y": 300,
+						"x": 200,
+						"y": 360,
 						"w": 40,
 						"h": 30
 					}
@@ -2964,8 +3426,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 400,
-						"y": 300,
+						"x": 240,
+						"y": 360,
 						"w": 40,
 						"h": 30
 					}
@@ -2985,8 +3447,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 440,
-						"y": 300,
+						"x": 280,
+						"y": 360,
 						"w": 40,
 						"h": 30
 					}
@@ -3006,8 +3468,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 480,
-						"y": 300,
+						"x": 320,
+						"y": 360,
 						"w": 40,
 						"h": 30
 					}
@@ -3027,8 +3489,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 0,
-						"y": 330,
+						"x": 360,
+						"y": 360,
 						"w": 40,
 						"h": 30
 					}
@@ -3048,8 +3510,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 40,
-						"y": 330,
+						"x": 400,
+						"y": 360,
 						"w": 40,
 						"h": 30
 					}
@@ -3069,8 +3531,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 80,
-						"y": 330,
+						"x": 440,
+						"y": 360,
 						"w": 40,
 						"h": 30
 					}
@@ -3090,8 +3552,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 120,
-						"y": 330,
+						"x": 480,
+						"y": 360,
 						"w": 40,
 						"h": 30
 					}
@@ -3111,8 +3573,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 160,
-						"y": 330,
+						"x": 0,
+						"y": 390,
 						"w": 40,
 						"h": 30
 					}
@@ -3132,8 +3594,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 200,
-						"y": 330,
+						"x": 40,
+						"y": 390,
 						"w": 40,
 						"h": 30
 					}
@@ -3153,8 +3615,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 240,
-						"y": 330,
+						"x": 80,
+						"y": 390,
 						"w": 40,
 						"h": 30
 					}
@@ -3174,8 +3636,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 280,
-						"y": 330,
+						"x": 120,
+						"y": 390,
 						"w": 40,
 						"h": 30
 					}
@@ -3195,8 +3657,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 320,
-						"y": 330,
+						"x": 160,
+						"y": 390,
 						"w": 40,
 						"h": 30
 					}
@@ -3216,8 +3678,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 360,
-						"y": 330,
+						"x": 200,
+						"y": 390,
 						"w": 40,
 						"h": 30
 					}
@@ -3237,8 +3699,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 400,
-						"y": 330,
+						"x": 240,
+						"y": 390,
 						"w": 40,
 						"h": 30
 					}
@@ -3258,8 +3720,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 440,
-						"y": 330,
+						"x": 280,
+						"y": 390,
 						"w": 40,
 						"h": 30
 					}
@@ -3279,8 +3741,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 480,
-						"y": 330,
+						"x": 320,
+						"y": 390,
 						"w": 40,
 						"h": 30
 					}
@@ -3300,8 +3762,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 0,
-						"y": 360,
+						"x": 360,
+						"y": 390,
 						"w": 40,
 						"h": 30
 					}
@@ -3321,8 +3783,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 40,
-						"y": 360,
+						"x": 400,
+						"y": 390,
 						"w": 40,
 						"h": 30
 					}
@@ -3342,8 +3804,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 80,
-						"y": 360,
+						"x": 440,
+						"y": 390,
 						"w": 40,
 						"h": 30
 					}
@@ -3363,8 +3825,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 120,
-						"y": 360,
+						"x": 480,
+						"y": 390,
 						"w": 40,
 						"h": 30
 					}
@@ -3384,8 +3846,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 160,
-						"y": 360,
+						"x": 0,
+						"y": 420,
 						"w": 40,
 						"h": 30
 					}
@@ -3405,8 +3867,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 200,
-						"y": 360,
+						"x": 40,
+						"y": 420,
 						"w": 40,
 						"h": 30
 					}
@@ -3426,8 +3888,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 240,
-						"y": 360,
+						"x": 80,
+						"y": 420,
 						"w": 40,
 						"h": 30
 					}
@@ -3447,8 +3909,50 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 280,
-						"y": 360,
+						"x": 120,
+						"y": 420,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "476_2",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 160,
+						"y": 420,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "476_3",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 200,
+						"y": 420,
 						"w": 40,
 						"h": 30
 					}
@@ -3468,8 +3972,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 320,
-						"y": 360,
+						"x": 240,
+						"y": 420,
 						"w": 40,
 						"h": 30
 					}
@@ -3489,8 +3993,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 360,
-						"y": 360,
+						"x": 280,
+						"y": 420,
 						"w": 40,
 						"h": 30
 					}
@@ -3510,8 +4014,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 400,
-						"y": 360,
+						"x": 320,
+						"y": 420,
 						"w": 40,
 						"h": 30
 					}
@@ -3531,8 +4035,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 440,
-						"y": 360,
+						"x": 360,
+						"y": 420,
 						"w": 40,
 						"h": 30
 					}
@@ -3552,8 +4056,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 480,
-						"y": 360,
+						"x": 400,
+						"y": 420,
 						"w": 40,
 						"h": 30
 					}
@@ -3573,8 +4077,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 0,
-						"y": 390,
+						"x": 440,
+						"y": 420,
 						"w": 40,
 						"h": 30
 					}
@@ -3594,8 +4098,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 40,
-						"y": 390,
+						"x": 480,
+						"y": 420,
 						"w": 40,
 						"h": 30
 					}
@@ -3615,8 +4119,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 80,
-						"y": 390,
+						"x": 0,
+						"y": 450,
 						"w": 40,
 						"h": 30
 					}
@@ -3636,8 +4140,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 120,
-						"y": 390,
+						"x": 40,
+						"y": 450,
 						"w": 40,
 						"h": 30
 					}
@@ -3657,8 +4161,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 160,
-						"y": 390,
+						"x": 80,
+						"y": 450,
 						"w": 40,
 						"h": 30
 					}
@@ -3678,8 +4182,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 200,
-						"y": 390,
+						"x": 120,
+						"y": 450,
 						"w": 40,
 						"h": 30
 					}
@@ -3699,8 +4203,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 240,
-						"y": 390,
+						"x": 160,
+						"y": 450,
 						"w": 40,
 						"h": 30
 					}
@@ -3720,8 +4224,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 280,
-						"y": 390,
+						"x": 200,
+						"y": 450,
 						"w": 40,
 						"h": 30
 					}
@@ -3741,8 +4245,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 320,
-						"y": 390,
+						"x": 240,
+						"y": 450,
 						"w": 40,
 						"h": 30
 					}
@@ -3762,8 +4266,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 360,
-						"y": 390,
+						"x": 280,
+						"y": 450,
 						"w": 40,
 						"h": 30
 					}
@@ -3783,8 +4287,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 400,
-						"y": 390,
+						"x": 320,
+						"y": 450,
 						"w": 40,
 						"h": 30
 					}
@@ -3804,8 +4308,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 440,
-						"y": 390,
+						"x": 360,
+						"y": 450,
 						"w": 40,
 						"h": 30
 					}
@@ -3825,8 +4329,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 480,
-						"y": 390,
+						"x": 400,
+						"y": 450,
 						"w": 40,
 						"h": 30
 					}
@@ -3846,8 +4350,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 0,
-						"y": 420,
+						"x": 440,
+						"y": 450,
 						"w": 40,
 						"h": 30
 					}
@@ -3867,8 +4371,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 40,
-						"y": 420,
+						"x": 480,
+						"y": 450,
 						"w": 40,
 						"h": 30
 					}
@@ -3888,8 +4392,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 80,
-						"y": 420,
+						"x": 0,
+						"y": 480,
 						"w": 40,
 						"h": 30
 					}
@@ -3909,8 +4413,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 120,
-						"y": 420,
+						"x": 40,
+						"y": 480,
 						"w": 40,
 						"h": 30
 					}
@@ -3930,8 +4434,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 160,
-						"y": 420,
+						"x": 80,
+						"y": 480,
 						"w": 40,
 						"h": 30
 					}
@@ -3951,8 +4455,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 200,
-						"y": 420,
+						"x": 120,
+						"y": 480,
 						"w": 40,
 						"h": 30
 					}
@@ -3972,8 +4476,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 240,
-						"y": 420,
+						"x": 160,
+						"y": 480,
 						"w": 40,
 						"h": 30
 					}
@@ -3993,8 +4497,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 280,
-						"y": 420,
+						"x": 200,
+						"y": 480,
 						"w": 40,
 						"h": 30
 					}
@@ -4014,8 +4518,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 320,
-						"y": 420,
+						"x": 240,
+						"y": 480,
 						"w": 40,
 						"h": 30
 					}
@@ -4035,8 +4539,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 360,
-						"y": 420,
+						"x": 280,
+						"y": 480,
 						"w": 40,
 						"h": 30
 					}
@@ -4056,8 +4560,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 400,
-						"y": 420,
+						"x": 320,
+						"y": 480,
 						"w": 40,
 						"h": 30
 					}
@@ -4077,8 +4581,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 440,
-						"y": 420,
+						"x": 360,
+						"y": 480,
 						"w": 40,
 						"h": 30
 					}
@@ -4098,8 +4602,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 480,
-						"y": 420,
+						"x": 400,
+						"y": 480,
 						"w": 40,
 						"h": 30
 					}
@@ -4119,8 +4623,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 0,
-						"y": 450,
+						"x": 440,
+						"y": 480,
 						"w": 40,
 						"h": 30
 					}
@@ -4140,8 +4644,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 40,
-						"y": 450,
+						"x": 480,
+						"y": 480,
 						"w": 40,
 						"h": 30
 					}
@@ -4161,8 +4665,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 80,
-						"y": 450,
+						"x": 0,
+						"y": 510,
 						"w": 40,
 						"h": 30
 					}
@@ -4182,8 +4686,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 120,
-						"y": 450,
+						"x": 40,
+						"y": 510,
 						"w": 40,
 						"h": 30
 					}
@@ -4203,8 +4707,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 160,
-						"y": 450,
+						"x": 80,
+						"y": 510,
 						"w": 40,
 						"h": 30
 					}
@@ -4224,8 +4728,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 200,
-						"y": 450,
+						"x": 120,
+						"y": 510,
 						"w": 40,
 						"h": 30
 					}
@@ -4245,8 +4749,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 240,
-						"y": 450,
+						"x": 160,
+						"y": 510,
 						"w": 40,
 						"h": 30
 					}
@@ -4266,8 +4770,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 280,
-						"y": 450,
+						"x": 200,
+						"y": 510,
 						"w": 40,
 						"h": 30
 					}
@@ -4287,8 +4791,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 320,
-						"y": 450,
+						"x": 240,
+						"y": 510,
 						"w": 40,
 						"h": 30
 					}
@@ -4308,8 +4812,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 360,
-						"y": 450,
+						"x": 280,
+						"y": 510,
 						"w": 40,
 						"h": 30
 					}
@@ -4329,8 +4833,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 400,
-						"y": 450,
+						"x": 320,
+						"y": 510,
 						"w": 40,
 						"h": 30
 					}
@@ -4350,8 +4854,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 440,
-						"y": 450,
+						"x": 360,
+						"y": 510,
 						"w": 40,
 						"h": 30
 					}
@@ -4371,8 +4875,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 480,
-						"y": 450,
+						"x": 400,
+						"y": 510,
 						"w": 40,
 						"h": 30
 					}
@@ -4392,8 +4896,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 0,
-						"y": 480,
+						"x": 440,
+						"y": 510,
 						"w": 40,
 						"h": 30
 					}
@@ -4404,6 +4908,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:2288ca6bd49f36a5ca5b49f1bcaab17a:e83f40529aad7883718910695eafd075:ebc3f8ec5b2480b298192d752b6e57dc$"
+		"smartupdate": "$TexturePacker:SmartUpdate:00a4e5499c11f3abdf9f56423bbf4561:6f365ccd1246c9b5ae27e0e440695926:ebc3f8ec5b2480b298192d752b6e57dc$"
 	}
 }
diff --git a/public/images/pokemon_icons_4v.png b/public/images/pokemon_icons_4v.png
index 7cfab80312a..972bff8b777 100644
Binary files a/public/images/pokemon_icons_4v.png and b/public/images/pokemon_icons_4v.png differ
diff --git a/public/images/pokemon_icons_5v.json b/public/images/pokemon_icons_5v.json
index 7da5a765c0c..d793ed1b650 100644
--- a/public/images/pokemon_icons_5v.json
+++ b/public/images/pokemon_icons_5v.json
@@ -4,8 +4,8 @@
 			"image": "pokemon_icons_5v.png",
 			"format": "RGBA8888",
 			"size": {
-				"w": 520,
-				"h": 520
+				"w": 570,
+				"h": 570
 			},
 			"scale": 1,
 			"frames": [
@@ -178,7 +178,7 @@
 					}
 				},
 				{
-					"filename": "501_2",
+					"filename": "498_2",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
@@ -198,6 +198,132 @@
 						"h": 30
 					}
 				},
+				{
+					"filename": "498_3",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 360,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "499_2",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 400,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "499_3",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 440,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "500_2",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 480,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "500_3",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 520,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "501_2",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 0,
+						"y": 30,
+						"w": 40,
+						"h": 30
+					}
+				},
 				{
 					"filename": "501_3",
 					"rotated": false,
@@ -213,8 +339,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 360,
-						"y": 0,
+						"x": 40,
+						"y": 30,
 						"w": 40,
 						"h": 30
 					}
@@ -234,8 +360,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 400,
-						"y": 0,
+						"x": 80,
+						"y": 30,
 						"w": 40,
 						"h": 30
 					}
@@ -255,8 +381,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 440,
-						"y": 0,
+						"x": 120,
+						"y": 30,
 						"w": 40,
 						"h": 30
 					}
@@ -276,8 +402,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 480,
-						"y": 0,
+						"x": 160,
+						"y": 30,
 						"w": 40,
 						"h": 30
 					}
@@ -297,12 +423,264 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 0,
+						"x": 200,
 						"y": 30,
 						"w": 40,
 						"h": 30
 					}
 				},
+				{
+					"filename": "511_2",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 240,
+						"y": 30,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "511_3",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 280,
+						"y": 30,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "512_2",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 320,
+						"y": 30,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "512_3",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 360,
+						"y": 30,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "513_2",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 400,
+						"y": 30,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "513_3",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 440,
+						"y": 30,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "514_2",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 480,
+						"y": 30,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "514_3",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 520,
+						"y": 30,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "515_2",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 0,
+						"y": 60,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "515_3",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 40,
+						"y": 60,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "516_2",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 80,
+						"y": 60,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "516_3",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 120,
+						"y": 60,
+						"w": 40,
+						"h": 30
+					}
+				},
 				{
 					"filename": "517_2",
 					"rotated": false,
@@ -318,8 +696,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 40,
-						"y": 30,
+						"x": 160,
+						"y": 60,
 						"w": 40,
 						"h": 30
 					}
@@ -339,8 +717,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 80,
-						"y": 30,
+						"x": 200,
+						"y": 60,
 						"w": 40,
 						"h": 30
 					}
@@ -360,8 +738,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 120,
-						"y": 30,
+						"x": 240,
+						"y": 60,
 						"w": 40,
 						"h": 30
 					}
@@ -381,8 +759,92 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 160,
-						"y": 30,
+						"x": 280,
+						"y": 60,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "522_2",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 320,
+						"y": 60,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "522_3",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 360,
+						"y": 60,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "523_2",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 400,
+						"y": 60,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "523_3",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 440,
+						"y": 60,
 						"w": 40,
 						"h": 30
 					}
@@ -402,8 +864,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 200,
-						"y": 30,
+						"x": 480,
+						"y": 60,
 						"w": 40,
 						"h": 30
 					}
@@ -423,8 +885,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 240,
-						"y": 30,
+						"x": 520,
+						"y": 60,
 						"w": 40,
 						"h": 30
 					}
@@ -444,8 +906,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 280,
-						"y": 30,
+						"x": 0,
+						"y": 90,
 						"w": 40,
 						"h": 30
 					}
@@ -465,8 +927,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 320,
-						"y": 30,
+						"x": 40,
+						"y": 90,
 						"w": 40,
 						"h": 30
 					}
@@ -486,8 +948,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 360,
-						"y": 30,
+						"x": 80,
+						"y": 90,
 						"w": 40,
 						"h": 30
 					}
@@ -507,8 +969,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 400,
-						"y": 30,
+						"x": 120,
+						"y": 90,
 						"w": 40,
 						"h": 30
 					}
@@ -528,8 +990,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 440,
-						"y": 30,
+						"x": 160,
+						"y": 90,
 						"w": 40,
 						"h": 30
 					}
@@ -549,8 +1011,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 480,
-						"y": 30,
+						"x": 200,
+						"y": 90,
 						"w": 40,
 						"h": 30
 					}
@@ -570,8 +1032,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 0,
-						"y": 60,
+						"x": 240,
+						"y": 90,
 						"w": 40,
 						"h": 30
 					}
@@ -591,8 +1053,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 40,
-						"y": 60,
+						"x": 280,
+						"y": 90,
 						"w": 40,
 						"h": 30
 					}
@@ -612,8 +1074,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 80,
-						"y": 60,
+						"x": 320,
+						"y": 90,
 						"w": 40,
 						"h": 30
 					}
@@ -633,8 +1095,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 120,
-						"y": 60,
+						"x": 360,
+						"y": 90,
 						"w": 40,
 						"h": 30
 					}
@@ -654,8 +1116,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 160,
-						"y": 60,
+						"x": 400,
+						"y": 90,
 						"w": 40,
 						"h": 30
 					}
@@ -675,8 +1137,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 200,
-						"y": 60,
+						"x": 440,
+						"y": 90,
 						"w": 40,
 						"h": 30
 					}
@@ -696,8 +1158,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 240,
-						"y": 60,
+						"x": 480,
+						"y": 90,
 						"w": 40,
 						"h": 30
 					}
@@ -717,8 +1179,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 280,
-						"y": 60,
+						"x": 520,
+						"y": 90,
 						"w": 40,
 						"h": 30
 					}
@@ -738,8 +1200,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 320,
-						"y": 60,
+						"x": 0,
+						"y": 120,
 						"w": 40,
 						"h": 30
 					}
@@ -759,8 +1221,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 360,
-						"y": 60,
+						"x": 40,
+						"y": 120,
 						"w": 40,
 						"h": 30
 					}
@@ -780,8 +1242,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 400,
-						"y": 60,
+						"x": 80,
+						"y": 120,
 						"w": 40,
 						"h": 30
 					}
@@ -801,8 +1263,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 440,
-						"y": 60,
+						"x": 120,
+						"y": 120,
 						"w": 40,
 						"h": 30
 					}
@@ -822,8 +1284,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 480,
-						"y": 60,
+						"x": 160,
+						"y": 120,
 						"w": 40,
 						"h": 30
 					}
@@ -843,8 +1305,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 0,
-						"y": 90,
+						"x": 200,
+						"y": 120,
 						"w": 40,
 						"h": 30
 					}
@@ -864,8 +1326,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 40,
-						"y": 90,
+						"x": 240,
+						"y": 120,
 						"w": 40,
 						"h": 30
 					}
@@ -885,8 +1347,134 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 80,
-						"y": 90,
+						"x": 280,
+						"y": 120,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "535_2",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 320,
+						"y": 120,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "535_3",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 360,
+						"y": 120,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "536_2",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 400,
+						"y": 120,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "536_3",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 440,
+						"y": 120,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "537_2",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 480,
+						"y": 120,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "537_3",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 520,
+						"y": 120,
 						"w": 40,
 						"h": 30
 					}
@@ -906,8 +1494,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 120,
-						"y": 90,
+						"x": 0,
+						"y": 150,
 						"w": 40,
 						"h": 30
 					}
@@ -927,8 +1515,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 160,
-						"y": 90,
+						"x": 40,
+						"y": 150,
 						"w": 40,
 						"h": 30
 					}
@@ -948,8 +1536,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 200,
-						"y": 90,
+						"x": 80,
+						"y": 150,
 						"w": 40,
 						"h": 30
 					}
@@ -969,8 +1557,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 240,
-						"y": 90,
+						"x": 120,
+						"y": 150,
 						"w": 40,
 						"h": 30
 					}
@@ -990,8 +1578,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 280,
-						"y": 90,
+						"x": 160,
+						"y": 150,
 						"w": 40,
 						"h": 30
 					}
@@ -1011,8 +1599,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 320,
-						"y": 90,
+						"x": 200,
+						"y": 150,
 						"w": 40,
 						"h": 30
 					}
@@ -1032,8 +1620,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 360,
-						"y": 90,
+						"x": 240,
+						"y": 150,
 						"w": 40,
 						"h": 30
 					}
@@ -1053,8 +1641,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 400,
-						"y": 90,
+						"x": 280,
+						"y": 150,
 						"w": 40,
 						"h": 30
 					}
@@ -1074,8 +1662,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 440,
-						"y": 90,
+						"x": 320,
+						"y": 150,
 						"w": 40,
 						"h": 30
 					}
@@ -1095,8 +1683,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 480,
-						"y": 90,
+						"x": 360,
+						"y": 150,
 						"w": 40,
 						"h": 30
 					}
@@ -1116,8 +1704,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 0,
-						"y": 120,
+						"x": 400,
+						"y": 150,
 						"w": 40,
 						"h": 30
 					}
@@ -1137,8 +1725,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 40,
-						"y": 120,
+						"x": 440,
+						"y": 150,
 						"w": 40,
 						"h": 30
 					}
@@ -1158,8 +1746,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 80,
-						"y": 120,
+						"x": 480,
+						"y": 150,
 						"w": 40,
 						"h": 30
 					}
@@ -1179,8 +1767,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 120,
-						"y": 120,
+						"x": 520,
+						"y": 150,
 						"w": 40,
 						"h": 30
 					}
@@ -1200,8 +1788,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 160,
-						"y": 120,
+						"x": 0,
+						"y": 180,
 						"w": 40,
 						"h": 30
 					}
@@ -1221,8 +1809,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 200,
-						"y": 120,
+						"x": 40,
+						"y": 180,
 						"w": 40,
 						"h": 30
 					}
@@ -1242,8 +1830,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 240,
-						"y": 120,
+						"x": 80,
+						"y": 180,
 						"w": 40,
 						"h": 30
 					}
@@ -1263,8 +1851,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 280,
-						"y": 120,
+						"x": 120,
+						"y": 180,
 						"w": 40,
 						"h": 30
 					}
@@ -1284,8 +1872,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 320,
-						"y": 120,
+						"x": 160,
+						"y": 180,
 						"w": 40,
 						"h": 30
 					}
@@ -1305,8 +1893,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 360,
-						"y": 120,
+						"x": 200,
+						"y": 180,
 						"w": 40,
 						"h": 30
 					}
@@ -1326,8 +1914,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 400,
-						"y": 120,
+						"x": 240,
+						"y": 180,
 						"w": 40,
 						"h": 30
 					}
@@ -1347,8 +1935,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 440,
-						"y": 120,
+						"x": 280,
+						"y": 180,
 						"w": 40,
 						"h": 30
 					}
@@ -1368,8 +1956,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 480,
-						"y": 120,
+						"x": 320,
+						"y": 180,
 						"w": 40,
 						"h": 30
 					}
@@ -1389,8 +1977,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 0,
-						"y": 150,
+						"x": 360,
+						"y": 180,
 						"w": 40,
 						"h": 30
 					}
@@ -1410,8 +1998,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 40,
-						"y": 150,
+						"x": 400,
+						"y": 180,
 						"w": 40,
 						"h": 30
 					}
@@ -1431,8 +2019,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 80,
-						"y": 150,
+						"x": 440,
+						"y": 180,
 						"w": 40,
 						"h": 30
 					}
@@ -1452,8 +2040,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 120,
-						"y": 150,
+						"x": 480,
+						"y": 180,
 						"w": 40,
 						"h": 30
 					}
@@ -1473,8 +2061,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 160,
-						"y": 150,
+						"x": 520,
+						"y": 180,
 						"w": 40,
 						"h": 30
 					}
@@ -1494,8 +2082,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 200,
-						"y": 150,
+						"x": 0,
+						"y": 210,
 						"w": 40,
 						"h": 30
 					}
@@ -1515,8 +2103,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 240,
-						"y": 150,
+						"x": 40,
+						"y": 210,
 						"w": 40,
 						"h": 30
 					}
@@ -1535,9 +2123,135 @@
 						"w": 40,
 						"h": 30
 					},
+					"frame": {
+						"x": 80,
+						"y": 210,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "554_2",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 120,
+						"y": 210,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "554_3",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 160,
+						"y": 210,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "555-zen_2",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 200,
+						"y": 210,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "555-zen_3",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 240,
+						"y": 210,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "555_2",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
 					"frame": {
 						"x": 280,
-						"y": 150,
+						"y": 210,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "555_3",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 320,
+						"y": 210,
 						"w": 40,
 						"h": 30
 					}
@@ -1557,8 +2271,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 320,
-						"y": 150,
+						"x": 360,
+						"y": 210,
 						"w": 40,
 						"h": 30
 					}
@@ -1578,8 +2292,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 360,
-						"y": 150,
+						"x": 400,
+						"y": 210,
 						"w": 40,
 						"h": 30
 					}
@@ -1599,8 +2313,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 400,
-						"y": 150,
+						"x": 440,
+						"y": 210,
 						"w": 40,
 						"h": 30
 					}
@@ -1620,8 +2334,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 440,
-						"y": 150,
+						"x": 480,
+						"y": 210,
 						"w": 40,
 						"h": 30
 					}
@@ -1641,8 +2355,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 480,
-						"y": 150,
+						"x": 520,
+						"y": 210,
 						"w": 40,
 						"h": 30
 					}
@@ -1663,7 +2377,7 @@
 					},
 					"frame": {
 						"x": 0,
-						"y": 180,
+						"y": 240,
 						"w": 40,
 						"h": 30
 					}
@@ -1684,7 +2398,7 @@
 					},
 					"frame": {
 						"x": 40,
-						"y": 180,
+						"y": 240,
 						"w": 40,
 						"h": 30
 					}
@@ -1705,7 +2419,7 @@
 					},
 					"frame": {
 						"x": 80,
-						"y": 180,
+						"y": 240,
 						"w": 40,
 						"h": 30
 					}
@@ -1726,7 +2440,7 @@
 					},
 					"frame": {
 						"x": 120,
-						"y": 180,
+						"y": 240,
 						"w": 40,
 						"h": 30
 					}
@@ -1747,7 +2461,7 @@
 					},
 					"frame": {
 						"x": 160,
-						"y": 180,
+						"y": 240,
 						"w": 40,
 						"h": 30
 					}
@@ -1768,7 +2482,7 @@
 					},
 					"frame": {
 						"x": 200,
-						"y": 180,
+						"y": 240,
 						"w": 40,
 						"h": 30
 					}
@@ -1789,7 +2503,91 @@
 					},
 					"frame": {
 						"x": 240,
-						"y": 180,
+						"y": 240,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "566_2",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 280,
+						"y": 240,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "566_3",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 320,
+						"y": 240,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "567_2",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 360,
+						"y": 240,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "567_3",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 400,
+						"y": 240,
 						"w": 40,
 						"h": 30
 					}
@@ -1809,8 +2607,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 280,
-						"y": 180,
+						"x": 440,
+						"y": 240,
 						"w": 40,
 						"h": 30
 					}
@@ -1830,8 +2628,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 320,
-						"y": 180,
+						"x": 480,
+						"y": 240,
 						"w": 40,
 						"h": 30
 					}
@@ -1851,8 +2649,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 360,
-						"y": 180,
+						"x": 520,
+						"y": 240,
 						"w": 40,
 						"h": 30
 					}
@@ -1872,8 +2670,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 400,
-						"y": 180,
+						"x": 0,
+						"y": 270,
 						"w": 40,
 						"h": 30
 					}
@@ -1893,8 +2691,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 440,
-						"y": 180,
+						"x": 40,
+						"y": 270,
 						"w": 40,
 						"h": 30
 					}
@@ -1914,8 +2712,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 480,
-						"y": 180,
+						"x": 80,
+						"y": 270,
 						"w": 40,
 						"h": 30
 					}
@@ -1935,8 +2733,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 0,
-						"y": 210,
+						"x": 120,
+						"y": 270,
 						"w": 40,
 						"h": 30
 					}
@@ -1956,8 +2754,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 40,
-						"y": 210,
+						"x": 160,
+						"y": 270,
 						"w": 40,
 						"h": 30
 					}
@@ -1977,8 +2775,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 80,
-						"y": 210,
+						"x": 200,
+						"y": 270,
 						"w": 40,
 						"h": 30
 					}
@@ -1998,8 +2796,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 120,
-						"y": 210,
+						"x": 240,
+						"y": 270,
 						"w": 40,
 						"h": 30
 					}
@@ -2019,8 +2817,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 160,
-						"y": 210,
+						"x": 280,
+						"y": 270,
 						"w": 40,
 						"h": 30
 					}
@@ -2040,8 +2838,50 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 200,
-						"y": 210,
+						"x": 320,
+						"y": 270,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "573_2",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 360,
+						"y": 270,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "573_3",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 400,
+						"y": 270,
 						"w": 40,
 						"h": 30
 					}
@@ -2061,8 +2901,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 240,
-						"y": 210,
+						"x": 440,
+						"y": 270,
 						"w": 40,
 						"h": 30
 					}
@@ -2082,8 +2922,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 280,
-						"y": 210,
+						"x": 480,
+						"y": 270,
 						"w": 40,
 						"h": 30
 					}
@@ -2103,8 +2943,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 320,
-						"y": 210,
+						"x": 520,
+						"y": 270,
 						"w": 40,
 						"h": 30
 					}
@@ -2124,8 +2964,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 360,
-						"y": 210,
+						"x": 0,
+						"y": 300,
 						"w": 40,
 						"h": 30
 					}
@@ -2145,8 +2985,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 400,
-						"y": 210,
+						"x": 40,
+						"y": 300,
 						"w": 40,
 						"h": 30
 					}
@@ -2166,8 +3006,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 440,
-						"y": 210,
+						"x": 80,
+						"y": 300,
 						"w": 40,
 						"h": 30
 					}
@@ -2187,8 +3027,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 480,
-						"y": 210,
+						"x": 120,
+						"y": 300,
 						"w": 40,
 						"h": 30
 					}
@@ -2208,8 +3048,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 0,
-						"y": 240,
+						"x": 160,
+						"y": 300,
 						"w": 40,
 						"h": 30
 					}
@@ -2229,8 +3069,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 40,
-						"y": 240,
+						"x": 200,
+						"y": 300,
 						"w": 40,
 						"h": 30
 					}
@@ -2250,8 +3090,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 80,
-						"y": 240,
+						"x": 240,
+						"y": 300,
 						"w": 40,
 						"h": 30
 					}
@@ -2271,8 +3111,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 120,
-						"y": 240,
+						"x": 280,
+						"y": 300,
 						"w": 40,
 						"h": 30
 					}
@@ -2292,8 +3132,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 160,
-						"y": 240,
+						"x": 320,
+						"y": 300,
 						"w": 40,
 						"h": 30
 					}
@@ -2313,8 +3153,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 200,
-						"y": 240,
+						"x": 360,
+						"y": 300,
 						"w": 40,
 						"h": 30
 					}
@@ -2334,8 +3174,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 240,
-						"y": 240,
+						"x": 400,
+						"y": 300,
 						"w": 40,
 						"h": 30
 					}
@@ -2355,8 +3195,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 280,
-						"y": 240,
+						"x": 440,
+						"y": 300,
 						"w": 40,
 						"h": 30
 					}
@@ -2376,8 +3216,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 320,
-						"y": 240,
+						"x": 480,
+						"y": 300,
 						"w": 40,
 						"h": 30
 					}
@@ -2397,8 +3237,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 360,
-						"y": 240,
+						"x": 520,
+						"y": 300,
 						"w": 40,
 						"h": 30
 					}
@@ -2418,8 +3258,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 400,
-						"y": 240,
+						"x": 0,
+						"y": 330,
 						"w": 40,
 						"h": 30
 					}
@@ -2439,8 +3279,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 440,
-						"y": 240,
+						"x": 40,
+						"y": 330,
 						"w": 40,
 						"h": 30
 					}
@@ -2460,8 +3300,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 480,
-						"y": 240,
+						"x": 80,
+						"y": 330,
 						"w": 40,
 						"h": 30
 					}
@@ -2481,8 +3321,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 0,
-						"y": 270,
+						"x": 120,
+						"y": 330,
 						"w": 40,
 						"h": 30
 					}
@@ -2502,8 +3342,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 40,
-						"y": 270,
+						"x": 160,
+						"y": 330,
 						"w": 40,
 						"h": 30
 					}
@@ -2523,8 +3363,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 80,
-						"y": 270,
+						"x": 200,
+						"y": 330,
 						"w": 40,
 						"h": 30
 					}
@@ -2544,8 +3384,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 120,
-						"y": 270,
+						"x": 240,
+						"y": 330,
 						"w": 40,
 						"h": 30
 					}
@@ -2565,8 +3405,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 160,
-						"y": 270,
+						"x": 280,
+						"y": 330,
 						"w": 40,
 						"h": 30
 					}
@@ -2586,8 +3426,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 200,
-						"y": 270,
+						"x": 320,
+						"y": 330,
 						"w": 40,
 						"h": 30
 					}
@@ -2607,8 +3447,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 240,
-						"y": 270,
+						"x": 360,
+						"y": 330,
 						"w": 40,
 						"h": 30
 					}
@@ -2628,8 +3468,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 280,
-						"y": 270,
+						"x": 400,
+						"y": 330,
 						"w": 40,
 						"h": 30
 					}
@@ -2649,8 +3489,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 320,
-						"y": 270,
+						"x": 440,
+						"y": 330,
 						"w": 40,
 						"h": 30
 					}
@@ -2670,8 +3510,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 360,
-						"y": 270,
+						"x": 480,
+						"y": 330,
 						"w": 40,
 						"h": 30
 					}
@@ -2691,8 +3531,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 400,
-						"y": 270,
+						"x": 520,
+						"y": 330,
 						"w": 40,
 						"h": 30
 					}
@@ -2712,8 +3552,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 440,
-						"y": 270,
+						"x": 0,
+						"y": 360,
 						"w": 40,
 						"h": 30
 					}
@@ -2733,8 +3573,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 480,
-						"y": 270,
+						"x": 40,
+						"y": 360,
 						"w": 40,
 						"h": 30
 					}
@@ -2754,8 +3594,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 0,
-						"y": 300,
+						"x": 80,
+						"y": 360,
 						"w": 40,
 						"h": 30
 					}
@@ -2775,8 +3615,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 40,
-						"y": 300,
+						"x": 120,
+						"y": 360,
 						"w": 40,
 						"h": 30
 					}
@@ -2796,8 +3636,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 80,
-						"y": 300,
+						"x": 160,
+						"y": 360,
 						"w": 40,
 						"h": 30
 					}
@@ -2817,8 +3657,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 120,
-						"y": 300,
+						"x": 200,
+						"y": 360,
 						"w": 40,
 						"h": 30
 					}
@@ -2838,8 +3678,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 160,
-						"y": 300,
+						"x": 240,
+						"y": 360,
 						"w": 40,
 						"h": 30
 					}
@@ -2859,8 +3699,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 200,
-						"y": 300,
+						"x": 280,
+						"y": 360,
 						"w": 40,
 						"h": 30
 					}
@@ -2880,8 +3720,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 240,
-						"y": 300,
+						"x": 320,
+						"y": 360,
 						"w": 40,
 						"h": 30
 					}
@@ -2901,8 +3741,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 280,
-						"y": 300,
+						"x": 360,
+						"y": 360,
 						"w": 40,
 						"h": 30
 					}
@@ -2922,8 +3762,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 320,
-						"y": 300,
+						"x": 400,
+						"y": 360,
 						"w": 40,
 						"h": 30
 					}
@@ -2943,8 +3783,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 360,
-						"y": 300,
+						"x": 440,
+						"y": 360,
 						"w": 40,
 						"h": 30
 					}
@@ -2964,8 +3804,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 400,
-						"y": 300,
+						"x": 480,
+						"y": 360,
 						"w": 40,
 						"h": 30
 					}
@@ -2985,8 +3825,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 440,
-						"y": 300,
+						"x": 520,
+						"y": 360,
 						"w": 40,
 						"h": 30
 					}
@@ -3006,8 +3846,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 480,
-						"y": 300,
+						"x": 0,
+						"y": 390,
 						"w": 40,
 						"h": 30
 					}
@@ -3027,8 +3867,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 0,
-						"y": 330,
+						"x": 40,
+						"y": 390,
 						"w": 40,
 						"h": 30
 					}
@@ -3048,8 +3888,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 40,
-						"y": 330,
+						"x": 80,
+						"y": 390,
 						"w": 40,
 						"h": 30
 					}
@@ -3069,8 +3909,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 80,
-						"y": 330,
+						"x": 120,
+						"y": 390,
 						"w": 40,
 						"h": 30
 					}
@@ -3090,8 +3930,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 120,
-						"y": 330,
+						"x": 160,
+						"y": 390,
 						"w": 40,
 						"h": 30
 					}
@@ -3111,8 +3951,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 160,
-						"y": 330,
+						"x": 200,
+						"y": 390,
 						"w": 40,
 						"h": 30
 					}
@@ -3132,8 +3972,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 200,
-						"y": 330,
+						"x": 240,
+						"y": 390,
 						"w": 40,
 						"h": 30
 					}
@@ -3153,8 +3993,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 240,
-						"y": 330,
+						"x": 280,
+						"y": 390,
 						"w": 40,
 						"h": 30
 					}
@@ -3174,8 +4014,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 280,
-						"y": 330,
+						"x": 320,
+						"y": 390,
 						"w": 40,
 						"h": 30
 					}
@@ -3195,8 +4035,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 320,
-						"y": 330,
+						"x": 360,
+						"y": 390,
 						"w": 40,
 						"h": 30
 					}
@@ -3216,8 +4056,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 360,
-						"y": 330,
+						"x": 400,
+						"y": 390,
 						"w": 40,
 						"h": 30
 					}
@@ -3237,8 +4077,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 400,
-						"y": 330,
+						"x": 440,
+						"y": 390,
 						"w": 40,
 						"h": 30
 					}
@@ -3258,8 +4098,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 440,
-						"y": 330,
+						"x": 480,
+						"y": 390,
 						"w": 40,
 						"h": 30
 					}
@@ -3279,8 +4119,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 480,
-						"y": 330,
+						"x": 520,
+						"y": 390,
 						"w": 40,
 						"h": 30
 					}
@@ -3301,7 +4141,7 @@
 					},
 					"frame": {
 						"x": 0,
-						"y": 360,
+						"y": 420,
 						"w": 40,
 						"h": 30
 					}
@@ -3322,7 +4162,7 @@
 					},
 					"frame": {
 						"x": 40,
-						"y": 360,
+						"y": 420,
 						"w": 40,
 						"h": 30
 					}
@@ -3343,7 +4183,7 @@
 					},
 					"frame": {
 						"x": 80,
-						"y": 360,
+						"y": 420,
 						"w": 40,
 						"h": 30
 					}
@@ -3364,7 +4204,7 @@
 					},
 					"frame": {
 						"x": 120,
-						"y": 360,
+						"y": 420,
 						"w": 40,
 						"h": 30
 					}
@@ -3385,7 +4225,7 @@
 					},
 					"frame": {
 						"x": 160,
-						"y": 360,
+						"y": 420,
 						"w": 40,
 						"h": 30
 					}
@@ -3406,7 +4246,7 @@
 					},
 					"frame": {
 						"x": 200,
-						"y": 360,
+						"y": 420,
 						"w": 40,
 						"h": 30
 					}
@@ -3427,7 +4267,7 @@
 					},
 					"frame": {
 						"x": 240,
-						"y": 360,
+						"y": 420,
 						"w": 40,
 						"h": 30
 					}
@@ -3448,7 +4288,7 @@
 					},
 					"frame": {
 						"x": 280,
-						"y": 360,
+						"y": 420,
 						"w": 40,
 						"h": 30
 					}
@@ -3469,7 +4309,7 @@
 					},
 					"frame": {
 						"x": 320,
-						"y": 360,
+						"y": 420,
 						"w": 40,
 						"h": 30
 					}
@@ -3490,7 +4330,7 @@
 					},
 					"frame": {
 						"x": 360,
-						"y": 360,
+						"y": 420,
 						"w": 40,
 						"h": 30
 					}
@@ -3511,7 +4351,7 @@
 					},
 					"frame": {
 						"x": 400,
-						"y": 360,
+						"y": 420,
 						"w": 40,
 						"h": 30
 					}
@@ -3532,7 +4372,7 @@
 					},
 					"frame": {
 						"x": 440,
-						"y": 360,
+						"y": 420,
 						"w": 40,
 						"h": 30
 					}
@@ -3553,7 +4393,7 @@
 					},
 					"frame": {
 						"x": 480,
-						"y": 360,
+						"y": 420,
 						"w": 40,
 						"h": 30
 					}
@@ -3573,8 +4413,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 0,
-						"y": 390,
+						"x": 520,
+						"y": 420,
 						"w": 40,
 						"h": 30
 					}
@@ -3594,8 +4434,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 40,
-						"y": 390,
+						"x": 0,
+						"y": 450,
 						"w": 40,
 						"h": 30
 					}
@@ -3615,8 +4455,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 80,
-						"y": 390,
+						"x": 40,
+						"y": 450,
 						"w": 40,
 						"h": 30
 					}
@@ -3636,8 +4476,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 120,
-						"y": 390,
+						"x": 80,
+						"y": 450,
 						"w": 40,
 						"h": 30
 					}
@@ -3657,8 +4497,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 160,
-						"y": 390,
+						"x": 120,
+						"y": 450,
 						"w": 40,
 						"h": 30
 					}
@@ -3678,8 +4518,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 200,
-						"y": 390,
+						"x": 160,
+						"y": 450,
 						"w": 40,
 						"h": 30
 					}
@@ -3699,8 +4539,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 240,
-						"y": 390,
+						"x": 200,
+						"y": 450,
 						"w": 40,
 						"h": 30
 					}
@@ -3720,8 +4560,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 280,
-						"y": 390,
+						"x": 240,
+						"y": 450,
 						"w": 40,
 						"h": 30
 					}
@@ -3741,8 +4581,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 320,
-						"y": 390,
+						"x": 280,
+						"y": 450,
 						"w": 40,
 						"h": 30
 					}
@@ -3762,8 +4602,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 360,
-						"y": 390,
+						"x": 320,
+						"y": 450,
 						"w": 40,
 						"h": 30
 					}
@@ -3782,9 +4622,51 @@
 						"w": 40,
 						"h": 30
 					},
+					"frame": {
+						"x": 360,
+						"y": 450,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "626_2",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
 					"frame": {
 						"x": 400,
-						"y": 390,
+						"y": 450,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "626_3",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 440,
+						"y": 450,
 						"w": 40,
 						"h": 30
 					}
@@ -3804,8 +4686,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 440,
-						"y": 390,
+						"x": 480,
+						"y": 450,
 						"w": 40,
 						"h": 30
 					}
@@ -3825,8 +4707,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 480,
-						"y": 390,
+						"x": 520,
+						"y": 450,
 						"w": 40,
 						"h": 30
 					}
@@ -3847,7 +4729,7 @@
 					},
 					"frame": {
 						"x": 0,
-						"y": 420,
+						"y": 480,
 						"w": 40,
 						"h": 30
 					}
@@ -3868,7 +4750,7 @@
 					},
 					"frame": {
 						"x": 40,
-						"y": 420,
+						"y": 480,
 						"w": 40,
 						"h": 30
 					}
@@ -3889,7 +4771,7 @@
 					},
 					"frame": {
 						"x": 80,
-						"y": 420,
+						"y": 480,
 						"w": 40,
 						"h": 30
 					}
@@ -3910,7 +4792,7 @@
 					},
 					"frame": {
 						"x": 120,
-						"y": 420,
+						"y": 480,
 						"w": 40,
 						"h": 30
 					}
@@ -3931,7 +4813,7 @@
 					},
 					"frame": {
 						"x": 160,
-						"y": 420,
+						"y": 480,
 						"w": 40,
 						"h": 30
 					}
@@ -3952,7 +4834,7 @@
 					},
 					"frame": {
 						"x": 200,
-						"y": 420,
+						"y": 480,
 						"w": 40,
 						"h": 30
 					}
@@ -3973,7 +4855,7 @@
 					},
 					"frame": {
 						"x": 240,
-						"y": 420,
+						"y": 480,
 						"w": 40,
 						"h": 30
 					}
@@ -3994,7 +4876,7 @@
 					},
 					"frame": {
 						"x": 280,
-						"y": 420,
+						"y": 480,
 						"w": 40,
 						"h": 30
 					}
@@ -4015,7 +4897,7 @@
 					},
 					"frame": {
 						"x": 320,
-						"y": 420,
+						"y": 480,
 						"w": 40,
 						"h": 30
 					}
@@ -4036,7 +4918,7 @@
 					},
 					"frame": {
 						"x": 360,
-						"y": 420,
+						"y": 480,
 						"w": 40,
 						"h": 30
 					}
@@ -4057,7 +4939,7 @@
 					},
 					"frame": {
 						"x": 400,
-						"y": 420,
+						"y": 480,
 						"w": 40,
 						"h": 30
 					}
@@ -4078,7 +4960,7 @@
 					},
 					"frame": {
 						"x": 440,
-						"y": 420,
+						"y": 480,
 						"w": 40,
 						"h": 30
 					}
@@ -4099,7 +4981,7 @@
 					},
 					"frame": {
 						"x": 480,
-						"y": 420,
+						"y": 480,
 						"w": 40,
 						"h": 30
 					}
@@ -4119,14 +5001,35 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 0,
-						"y": 450,
+						"x": 520,
+						"y": 480,
 						"w": 40,
 						"h": 30
 					}
 				},
 				{
-					"filename": "641-incarnate_1",
+					"filename": "643_2",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 0,
+						"y": 510,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "643_3",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
@@ -4141,13 +5044,13 @@
 					},
 					"frame": {
 						"x": 40,
-						"y": 450,
+						"y": 510,
 						"w": 40,
 						"h": 30
 					}
 				},
 				{
-					"filename": "641-therian_1",
+					"filename": "644_2",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
@@ -4162,13 +5065,13 @@
 					},
 					"frame": {
 						"x": 80,
-						"y": 450,
+						"y": 510,
 						"w": 40,
 						"h": 30
 					}
 				},
 				{
-					"filename": "642-incarnate_1",
+					"filename": "644_3",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
@@ -4183,13 +5086,13 @@
 					},
 					"frame": {
 						"x": 120,
-						"y": 450,
+						"y": 510,
 						"w": 40,
 						"h": 30
 					}
 				},
 				{
-					"filename": "642-therian_1",
+					"filename": "646-black_2",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
@@ -4204,13 +5107,13 @@
 					},
 					"frame": {
 						"x": 160,
-						"y": 450,
+						"y": 510,
 						"w": 40,
 						"h": 30
 					}
 				},
 				{
-					"filename": "645-incarnate_1",
+					"filename": "646-black_3",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
@@ -4225,13 +5128,13 @@
 					},
 					"frame": {
 						"x": 200,
-						"y": 450,
+						"y": 510,
 						"w": 40,
 						"h": 30
 					}
 				},
 				{
-					"filename": "645-therian_1",
+					"filename": "646-white_2",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
@@ -4246,7 +5149,70 @@
 					},
 					"frame": {
 						"x": 240,
-						"y": 450,
+						"y": 510,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "646-white_3",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 280,
+						"y": 510,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "646_2",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 320,
+						"y": 510,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "646_3",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 360,
+						"y": 510,
 						"w": 40,
 						"h": 30
 					}
@@ -4266,8 +5232,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 280,
-						"y": 450,
+						"x": 400,
+						"y": 510,
 						"w": 40,
 						"h": 30
 					}
@@ -4287,8 +5253,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 320,
-						"y": 450,
+						"x": 440,
+						"y": 510,
 						"w": 40,
 						"h": 30
 					}
@@ -4308,8 +5274,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 360,
-						"y": 450,
+						"x": 480,
+						"y": 510,
 						"w": 40,
 						"h": 30
 					}
@@ -4329,8 +5295,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 400,
-						"y": 450,
+						"x": 520,
+						"y": 510,
 						"w": 40,
 						"h": 30
 					}
@@ -4350,8 +5316,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 440,
-						"y": 450,
+						"x": 0,
+						"y": 540,
 						"w": 40,
 						"h": 30
 					}
@@ -4371,8 +5337,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 480,
-						"y": 450,
+						"x": 40,
+						"y": 540,
 						"w": 40,
 						"h": 30
 					}
@@ -4392,8 +5358,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 0,
-						"y": 480,
+						"x": 80,
+						"y": 540,
 						"w": 40,
 						"h": 30
 					}
@@ -4413,8 +5379,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 40,
-						"y": 480,
+						"x": 120,
+						"y": 540,
 						"w": 40,
 						"h": 30
 					}
@@ -4434,8 +5400,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 80,
-						"y": 480,
+						"x": 160,
+						"y": 540,
 						"w": 40,
 						"h": 30
 					}
@@ -4455,8 +5421,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 120,
-						"y": 480,
+						"x": 200,
+						"y": 540,
 						"w": 40,
 						"h": 30
 					}
@@ -4476,8 +5442,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 160,
-						"y": 480,
+						"x": 240,
+						"y": 540,
 						"w": 40,
 						"h": 30
 					}
@@ -4497,8 +5463,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 200,
-						"y": 480,
+						"x": 280,
+						"y": 540,
 						"w": 40,
 						"h": 30
 					}
@@ -4518,8 +5484,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 240,
-						"y": 480,
+						"x": 320,
+						"y": 540,
 						"w": 40,
 						"h": 30
 					}
@@ -4539,8 +5505,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 280,
-						"y": 480,
+						"x": 360,
+						"y": 540,
 						"w": 40,
 						"h": 30
 					}
@@ -4560,8 +5526,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 320,
-						"y": 480,
+						"x": 400,
+						"y": 540,
 						"w": 40,
 						"h": 30
 					}
@@ -4581,8 +5547,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 360,
-						"y": 480,
+						"x": 440,
+						"y": 540,
 						"w": 40,
 						"h": 30
 					}
@@ -4602,8 +5568,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 400,
-						"y": 480,
+						"x": 480,
+						"y": 540,
 						"w": 40,
 						"h": 30
 					}
@@ -4623,8 +5589,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 440,
-						"y": 480,
+						"x": 520,
+						"y": 540,
 						"w": 40,
 						"h": 30
 					}
@@ -4635,6 +5601,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:b615ea9a62bec26b97d0171030d11a55:35fd8571f91311ef2e9944578f979466:f1931bc28ee7f32dba7543723757cf2a$"
+		"smartupdate": "$TexturePacker:SmartUpdate:d7ba1fabe0180573c58dd3fb1ea6e279:cbff8ace700a0111c2ee3279d01d11e4:f1931bc28ee7f32dba7543723757cf2a$"
 	}
 }
diff --git a/public/images/pokemon_icons_5v.png b/public/images/pokemon_icons_5v.png
index 9dd1b278ac1..ba23de2e3f5 100644
Binary files a/public/images/pokemon_icons_5v.png and b/public/images/pokemon_icons_5v.png differ
diff --git a/public/images/pokemon_icons_6v.json b/public/images/pokemon_icons_6v.json
index 8061ed9152b..8626eddcc1c 100644
--- a/public/images/pokemon_icons_6v.json
+++ b/public/images/pokemon_icons_6v.json
@@ -2824,7 +2824,7 @@
 					}
 				},
 				{
-					"filename": "696_2",
+					"filename": "692_2",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
@@ -2844,6 +2844,90 @@
 						"h": 30
 					}
 				},
+				{
+					"filename": "692_3",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 120,
+						"y": 330,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "693_2",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 160,
+						"y": 330,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "693_3",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 200,
+						"y": 330,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "696_2",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 240,
+						"y": 330,
+						"w": 40,
+						"h": 30
+					}
+				},
 				{
 					"filename": "696_3",
 					"rotated": false,
@@ -2859,7 +2943,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 120,
+						"x": 280,
 						"y": 330,
 						"w": 40,
 						"h": 30
@@ -2880,7 +2964,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 160,
+						"x": 320,
 						"y": 330,
 						"w": 40,
 						"h": 30
@@ -2901,7 +2985,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 200,
+						"x": 360,
 						"y": 330,
 						"w": 40,
 						"h": 30
@@ -2922,7 +3006,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 240,
+						"x": 400,
 						"y": 330,
 						"w": 40,
 						"h": 30
@@ -2943,7 +3027,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 280,
+						"x": 440,
 						"y": 330,
 						"w": 40,
 						"h": 30
@@ -2964,8 +3048,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 320,
-						"y": 330,
+						"x": 0,
+						"y": 360,
 						"w": 40,
 						"h": 30
 					}
@@ -2985,8 +3069,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 360,
-						"y": 330,
+						"x": 40,
+						"y": 360,
 						"w": 40,
 						"h": 30
 					}
@@ -3006,8 +3090,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 400,
-						"y": 330,
+						"x": 80,
+						"y": 360,
 						"w": 40,
 						"h": 30
 					}
@@ -3027,8 +3111,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 440,
-						"y": 330,
+						"x": 120,
+						"y": 360,
 						"w": 40,
 						"h": 30
 					}
@@ -3048,7 +3132,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 0,
+						"x": 160,
 						"y": 360,
 						"w": 40,
 						"h": 30
@@ -3069,7 +3153,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 40,
+						"x": 200,
 						"y": 360,
 						"w": 40,
 						"h": 30
@@ -3090,7 +3174,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 80,
+						"x": 240,
 						"y": 360,
 						"w": 40,
 						"h": 30
@@ -3111,7 +3195,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 120,
+						"x": 280,
 						"y": 360,
 						"w": 40,
 						"h": 30
@@ -3132,7 +3216,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 160,
+						"x": 320,
 						"y": 360,
 						"w": 40,
 						"h": 30
@@ -3153,7 +3237,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 200,
+						"x": 360,
 						"y": 360,
 						"w": 40,
 						"h": 30
@@ -3174,7 +3258,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 240,
+						"x": 400,
 						"y": 360,
 						"w": 40,
 						"h": 30
@@ -3195,7 +3279,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 280,
+						"x": 440,
 						"y": 360,
 						"w": 40,
 						"h": 30
@@ -3216,8 +3300,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 320,
-						"y": 360,
+						"x": 0,
+						"y": 390,
 						"w": 40,
 						"h": 30
 					}
@@ -3237,8 +3321,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 360,
-						"y": 360,
+						"x": 40,
+						"y": 390,
 						"w": 40,
 						"h": 30
 					}
@@ -3258,8 +3342,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 400,
-						"y": 360,
+						"x": 80,
+						"y": 390,
 						"w": 40,
 						"h": 30
 					}
@@ -3279,8 +3363,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 440,
-						"y": 360,
+						"x": 120,
+						"y": 390,
 						"w": 40,
 						"h": 30
 					}
@@ -3300,7 +3384,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 0,
+						"x": 160,
 						"y": 390,
 						"w": 40,
 						"h": 30
@@ -3321,7 +3405,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 40,
+						"x": 200,
 						"y": 390,
 						"w": 40,
 						"h": 30
@@ -3342,7 +3426,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 80,
+						"x": 240,
 						"y": 390,
 						"w": 40,
 						"h": 30
@@ -3363,7 +3447,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 120,
+						"x": 280,
 						"y": 390,
 						"w": 40,
 						"h": 30
@@ -3384,7 +3468,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 160,
+						"x": 320,
 						"y": 390,
 						"w": 40,
 						"h": 30
@@ -3405,7 +3489,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 200,
+						"x": 360,
 						"y": 390,
 						"w": 40,
 						"h": 30
@@ -3426,7 +3510,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 240,
+						"x": 400,
 						"y": 390,
 						"w": 40,
 						"h": 30
@@ -3447,7 +3531,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 280,
+						"x": 440,
 						"y": 390,
 						"w": 40,
 						"h": 30
@@ -3468,8 +3552,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 320,
-						"y": 390,
+						"x": 0,
+						"y": 420,
 						"w": 40,
 						"h": 30
 					}
@@ -3489,8 +3573,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 360,
-						"y": 390,
+						"x": 40,
+						"y": 420,
 						"w": 40,
 						"h": 30
 					}
@@ -3510,8 +3594,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 400,
-						"y": 390,
+						"x": 80,
+						"y": 420,
 						"w": 40,
 						"h": 30
 					}
@@ -3531,8 +3615,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 440,
-						"y": 390,
+						"x": 120,
+						"y": 420,
 						"w": 40,
 						"h": 30
 					}
@@ -3552,7 +3636,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 0,
+						"x": 160,
 						"y": 420,
 						"w": 40,
 						"h": 30
@@ -3573,7 +3657,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 40,
+						"x": 200,
 						"y": 420,
 						"w": 40,
 						"h": 30
@@ -3594,7 +3678,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 80,
+						"x": 240,
 						"y": 420,
 						"w": 40,
 						"h": 30
@@ -3615,7 +3699,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 120,
+						"x": 280,
 						"y": 420,
 						"w": 40,
 						"h": 30
@@ -3636,7 +3720,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 160,
+						"x": 320,
 						"y": 420,
 						"w": 40,
 						"h": 30
@@ -3657,7 +3741,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 200,
+						"x": 360,
 						"y": 420,
 						"w": 40,
 						"h": 30
@@ -3678,7 +3762,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 240,
+						"x": 400,
 						"y": 420,
 						"w": 40,
 						"h": 30
@@ -3699,7 +3783,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 280,
+						"x": 440,
 						"y": 420,
 						"w": 40,
 						"h": 30
@@ -3719,90 +3803,6 @@
 						"w": 40,
 						"h": 30
 					},
-					"frame": {
-						"x": 320,
-						"y": 420,
-						"w": 40,
-						"h": 30
-					}
-				},
-				{
-					"filename": "720-unbound_1",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 40,
-						"h": 30
-					},
-					"frame": {
-						"x": 360,
-						"y": 420,
-						"w": 40,
-						"h": 30
-					}
-				},
-				{
-					"filename": "720-unbound_2",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 40,
-						"h": 30
-					},
-					"frame": {
-						"x": 400,
-						"y": 420,
-						"w": 40,
-						"h": 30
-					}
-				},
-				{
-					"filename": "720-unbound_3",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 40,
-						"h": 30
-					},
-					"frame": {
-						"x": 440,
-						"y": 420,
-						"w": 40,
-						"h": 30
-					}
-				},
-				{
-					"filename": "720_1",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 40,
-						"h": 30
-					},
 					"frame": {
 						"x": 0,
 						"y": 450,
@@ -3811,7 +3811,7 @@
 					}
 				},
 				{
-					"filename": "720_2",
+					"filename": "720-unbound_1",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
@@ -3832,7 +3832,7 @@
 					}
 				},
 				{
-					"filename": "720_3",
+					"filename": "720-unbound_2",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
@@ -3853,7 +3853,7 @@
 					}
 				},
 				{
-					"filename": "2670_2",
+					"filename": "720-unbound_3",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
@@ -3874,7 +3874,7 @@
 					}
 				},
 				{
-					"filename": "2670_3",
+					"filename": "720_1",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
@@ -3893,6 +3893,90 @@
 						"w": 40,
 						"h": 30
 					}
+				},
+				{
+					"filename": "720_2",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 200,
+						"y": 450,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "720_3",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 240,
+						"y": 450,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "2670_2",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 280,
+						"y": 450,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "2670_3",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 320,
+						"y": 450,
+						"w": 40,
+						"h": 30
+					}
 				}
 			]
 		}
@@ -3900,6 +3984,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:41960148e7a74c451d8ed1c46adc4e09:5dc2b45aa8a432e966da6c4070905be6:8a74f769af240f74b0e67390bbb36c14$"
+		"smartupdate": "$TexturePacker:SmartUpdate:5779627583192c7b11ac7da6a39690da:ad2bf1b939fe025e3f14c49511ccf058:8a74f769af240f74b0e67390bbb36c14$"
 	}
 }
diff --git a/public/images/pokemon_icons_6v.png b/public/images/pokemon_icons_6v.png
index 29d00876b50..d8bd10eaa71 100644
Binary files a/public/images/pokemon_icons_6v.png and b/public/images/pokemon_icons_6v.png differ
diff --git a/public/images/pokemon_icons_7.json b/public/images/pokemon_icons_7.json
index 0523a232d79..03eeba88a70 100644
--- a/public/images/pokemon_icons_7.json
+++ b/public/images/pokemon_icons_7.json
@@ -5,7 +5,7 @@
 			"format": "RGBA8888",
 			"size": {
 				"w": 502,
-				"h": 323
+				"h": 325
 			},
 			"scale": 1,
 			"frames": [
@@ -324,48 +324,6 @@
 						"h": 29
 					}
 				},
-				{
-					"filename": "795",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 28,
-						"h": 30
-					},
-					"frame": {
-						"x": 0,
-						"y": 293,
-						"w": 28,
-						"h": 30
-					}
-				},
-				{
-					"filename": "795s",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 28,
-						"h": 30
-					},
-					"frame": {
-						"x": 28,
-						"y": 293,
-						"w": 28,
-						"h": 30
-					}
-				},
 				{
 					"filename": "798s",
 					"rotated": false,
@@ -381,8 +339,8 @@
 						"h": 29
 					},
 					"frame": {
-						"x": 112,
-						"y": 0,
+						"x": 0,
+						"y": 293,
 						"w": 31,
 						"h": 29
 					}
@@ -402,7 +360,7 @@
 						"h": 28
 					},
 					"frame": {
-						"x": 143,
+						"x": 112,
 						"y": 0,
 						"w": 30,
 						"h": 28
@@ -423,8 +381,8 @@
 						"h": 28
 					},
 					"frame": {
-						"x": 173,
-						"y": 0,
+						"x": 108,
+						"y": 28,
 						"w": 30,
 						"h": 28
 					}
@@ -444,7 +402,7 @@
 						"h": 28
 					},
 					"frame": {
-						"x": 203,
+						"x": 142,
 						"y": 0,
 						"w": 29,
 						"h": 28
@@ -465,8 +423,8 @@
 						"h": 28
 					},
 					"frame": {
-						"x": 232,
-						"y": 0,
+						"x": 138,
+						"y": 28,
 						"w": 29,
 						"h": 28
 					}
@@ -486,7 +444,7 @@
 						"h": 27
 					},
 					"frame": {
-						"x": 261,
+						"x": 171,
 						"y": 0,
 						"w": 29,
 						"h": 27
@@ -507,7 +465,7 @@
 						"h": 27
 					},
 					"frame": {
-						"x": 290,
+						"x": 200,
 						"y": 0,
 						"w": 29,
 						"h": 27
@@ -528,7 +486,7 @@
 						"h": 27
 					},
 					"frame": {
-						"x": 319,
+						"x": 229,
 						"y": 0,
 						"w": 28,
 						"h": 27
@@ -549,7 +507,7 @@
 						"h": 27
 					},
 					"frame": {
-						"x": 347,
+						"x": 257,
 						"y": 0,
 						"w": 28,
 						"h": 27
@@ -570,7 +528,7 @@
 						"h": 23
 					},
 					"frame": {
-						"x": 375,
+						"x": 285,
 						"y": 0,
 						"w": 32,
 						"h": 23
@@ -591,14 +549,14 @@
 						"h": 23
 					},
 					"frame": {
-						"x": 407,
+						"x": 317,
 						"y": 0,
 						"w": 32,
 						"h": 23
 					}
 				},
 				{
-					"filename": "800",
+					"filename": "795",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -619,7 +577,7 @@
 					}
 				},
 				{
-					"filename": "800s",
+					"filename": "795s",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -639,6 +597,48 @@
 						"h": 30
 					}
 				},
+				{
+					"filename": "800",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 0,
+						"w": 28,
+						"h": 30
+					},
+					"frame": {
+						"x": 32,
+						"y": 145,
+						"w": 28,
+						"h": 30
+					}
+				},
+				{
+					"filename": "800s",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 0,
+						"w": 28,
+						"h": 30
+					},
+					"frame": {
+						"x": 32,
+						"y": 175,
+						"w": 28,
+						"h": 30
+					}
+				},
 				{
 					"filename": "805",
 					"rotated": false,
@@ -654,8 +654,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 32,
-						"y": 145,
+						"x": 31,
+						"y": 205,
 						"w": 28,
 						"h": 30
 					}
@@ -674,31 +674,10 @@
 						"w": 28,
 						"h": 30
 					},
-					"frame": {
-						"x": 32,
-						"y": 175,
-						"w": 28,
-						"h": 30
-					}
-				},
-				{
-					"filename": "773",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 0,
-						"w": 26,
-						"h": 30
-					},
 					"frame": {
 						"x": 31,
-						"y": 205,
-						"w": 26,
+						"y": 235,
+						"w": 28,
 						"h": 30
 					}
 				},
@@ -718,32 +697,11 @@
 					},
 					"frame": {
 						"x": 31,
-						"y": 235,
+						"y": 265,
 						"w": 26,
 						"h": 30
 					}
 				},
-				{
-					"filename": "792",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 1,
-						"w": 28,
-						"h": 28
-					},
-					"frame": {
-						"x": 31,
-						"y": 265,
-						"w": 28,
-						"h": 28
-					}
-				},
 				{
 					"filename": "773-dark",
 					"rotated": false,
@@ -759,8 +717,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 56,
-						"y": 293,
+						"x": 31,
+						"y": 295,
 						"w": 26,
 						"h": 30
 					}
@@ -780,7 +738,7 @@
 						"h": 25
 					},
 					"frame": {
-						"x": 439,
+						"x": 349,
 						"y": 0,
 						"w": 30,
 						"h": 25
@@ -801,12 +759,75 @@
 						"h": 25
 					},
 					"frame": {
-						"x": 469,
+						"x": 379,
 						"y": 0,
 						"w": 30,
 						"h": 25
 					}
 				},
+				{
+					"filename": "785",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 3,
+						"w": 28,
+						"h": 26
+					},
+					"frame": {
+						"x": 409,
+						"y": 0,
+						"w": 28,
+						"h": 26
+					}
+				},
+				{
+					"filename": "785s",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 3,
+						"w": 28,
+						"h": 26
+					},
+					"frame": {
+						"x": 437,
+						"y": 0,
+						"w": 28,
+						"h": 26
+					}
+				},
+				{
+					"filename": "792",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 1,
+						"w": 28,
+						"h": 28
+					},
+					"frame": {
+						"x": 465,
+						"y": 0,
+						"w": 28,
+						"h": 28
+					}
+				},
 				{
 					"filename": "792s",
 					"rotated": false,
@@ -822,8 +843,8 @@
 						"h": 28
 					},
 					"frame": {
-						"x": 108,
-						"y": 29,
+						"x": 70,
+						"y": 57,
 						"w": 28,
 						"h": 28
 					}
@@ -843,8 +864,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 70,
-						"y": 57,
+						"x": 62,
+						"y": 85,
 						"w": 26,
 						"h": 30
 					}
@@ -864,8 +885,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 96,
-						"y": 57,
+						"x": 62,
+						"y": 115,
 						"w": 26,
 						"h": 30
 					}
@@ -885,8 +906,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 62,
-						"y": 87,
+						"x": 60,
+						"y": 145,
 						"w": 26,
 						"h": 30
 					}
@@ -906,8 +927,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 88,
-						"y": 87,
+						"x": 60,
+						"y": 175,
 						"w": 26,
 						"h": 30
 					}
@@ -927,8 +948,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 62,
-						"y": 117,
+						"x": 59,
+						"y": 205,
 						"w": 26,
 						"h": 30
 					}
@@ -948,8 +969,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 88,
-						"y": 117,
+						"x": 59,
+						"y": 235,
 						"w": 26,
 						"h": 30
 					}
@@ -969,8 +990,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 60,
-						"y": 147,
+						"x": 57,
+						"y": 265,
 						"w": 26,
 						"h": 30
 					}
@@ -990,12 +1011,54 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 86,
-						"y": 147,
+						"x": 57,
+						"y": 295,
 						"w": 26,
 						"h": 30
 					}
 				},
+				{
+					"filename": "764",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 10,
+						"y": 0,
+						"w": 25,
+						"h": 30
+					},
+					"frame": {
+						"x": 88,
+						"y": 85,
+						"w": 25,
+						"h": 30
+					}
+				},
+				{
+					"filename": "764s",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 10,
+						"y": 0,
+						"w": 25,
+						"h": 30
+					},
+					"frame": {
+						"x": 88,
+						"y": 115,
+						"w": 25,
+						"h": 30
+					}
+				},
 				{
 					"filename": "773-ground",
 					"rotated": false,
@@ -1011,8 +1074,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 60,
-						"y": 177,
+						"x": 86,
+						"y": 145,
 						"w": 26,
 						"h": 30
 					}
@@ -1033,7 +1096,7 @@
 					},
 					"frame": {
 						"x": 86,
-						"y": 177,
+						"y": 175,
 						"w": 26,
 						"h": 30
 					}
@@ -1053,8 +1116,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 57,
-						"y": 207,
+						"x": 85,
+						"y": 205,
 						"w": 26,
 						"h": 30
 					}
@@ -1074,54 +1137,12 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 83,
-						"y": 207,
+						"x": 85,
+						"y": 235,
 						"w": 26,
 						"h": 30
 					}
 				},
-				{
-					"filename": "2026",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 1,
-						"w": 26,
-						"h": 28
-					},
-					"frame": {
-						"x": 57,
-						"y": 237,
-						"w": 26,
-						"h": 28
-					}
-				},
-				{
-					"filename": "772",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 2,
-						"w": 25,
-						"h": 28
-					},
-					"frame": {
-						"x": 59,
-						"y": 265,
-						"w": 25,
-						"h": 28
-					}
-				},
 				{
 					"filename": "773-rock",
 					"rotated": false,
@@ -1136,53 +1157,11 @@
 						"w": 26,
 						"h": 30
 					},
-					"frame": {
-						"x": 82,
-						"y": 293,
-						"w": 26,
-						"h": 30
-					}
-				},
-				{
-					"filename": "2026s",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 1,
-						"w": 26,
-						"h": 28
-					},
 					"frame": {
 						"x": 83,
-						"y": 237,
-						"w": 26,
-						"h": 28
-					}
-				},
-				{
-					"filename": "772s",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 2,
-						"w": 25,
-						"h": 28
-					},
-					"frame": {
-						"x": 84,
 						"y": 265,
-						"w": 25,
-						"h": 28
+						"w": 26,
+						"h": 30
 					}
 				},
 				{
@@ -1200,14 +1179,14 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 108,
-						"y": 293,
+						"x": 83,
+						"y": 295,
 						"w": 26,
 						"h": 30
 					}
 				},
 				{
-					"filename": "764",
+					"filename": "772",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -1215,16 +1194,16 @@
 						"h": 30
 					},
 					"spriteSourceSize": {
-						"x": 10,
-						"y": 0,
+						"x": 8,
+						"y": 2,
 						"w": 25,
-						"h": 30
+						"h": 28
 					},
 					"frame": {
-						"x": 122,
+						"x": 98,
 						"y": 57,
 						"w": 25,
-						"h": 30
+						"h": 28
 					}
 				},
 				{
@@ -1242,14 +1221,14 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 114,
-						"y": 87,
+						"x": 123,
+						"y": 56,
 						"w": 26,
 						"h": 30
 					}
 				},
 				{
-					"filename": "773s",
+					"filename": "773",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -1263,8 +1242,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 114,
-						"y": 117,
+						"x": 149,
+						"y": 56,
 						"w": 26,
 						"h": 30
 					}
@@ -1284,8 +1263,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 112,
-						"y": 147,
+						"x": 113,
+						"y": 86,
 						"w": 26,
 						"h": 30
 					}
@@ -1305,8 +1284,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 112,
-						"y": 177,
+						"x": 139,
+						"y": 86,
 						"w": 26,
 						"h": 30
 					}
@@ -1326,8 +1305,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 109,
-						"y": 207,
+						"x": 113,
+						"y": 116,
 						"w": 26,
 						"h": 30
 					}
@@ -1347,33 +1326,12 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 109,
-						"y": 237,
+						"x": 139,
+						"y": 116,
 						"w": 26,
 						"h": 30
 					}
 				},
-				{
-					"filename": "785",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 3,
-						"w": 28,
-						"h": 26
-					},
-					"frame": {
-						"x": 109,
-						"y": 267,
-						"w": 28,
-						"h": 26
-					}
-				},
 				{
 					"filename": "773s-fairy",
 					"rotated": false,
@@ -1389,33 +1347,12 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 134,
-						"y": 293,
+						"x": 112,
+						"y": 146,
 						"w": 26,
 						"h": 30
 					}
 				},
-				{
-					"filename": "801",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 2,
-						"w": 20,
-						"h": 28
-					},
-					"frame": {
-						"x": 136,
-						"y": 29,
-						"w": 20,
-						"h": 28
-					}
-				},
 				{
 					"filename": "773s-fighting",
 					"rotated": false,
@@ -1431,8 +1368,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 156,
-						"y": 28,
+						"x": 138,
+						"y": 146,
 						"w": 26,
 						"h": 30
 					}
@@ -1452,8 +1389,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 182,
-						"y": 28,
+						"x": 112,
+						"y": 176,
 						"w": 26,
 						"h": 30
 					}
@@ -1473,8 +1410,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 208,
-						"y": 28,
+						"x": 138,
+						"y": 176,
 						"w": 26,
 						"h": 30
 					}
@@ -1494,8 +1431,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 234,
-						"y": 28,
+						"x": 111,
+						"y": 206,
 						"w": 26,
 						"h": 30
 					}
@@ -1515,8 +1452,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 147,
-						"y": 58,
+						"x": 137,
+						"y": 206,
 						"w": 26,
 						"h": 30
 					}
@@ -1536,8 +1473,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 173,
-						"y": 58,
+						"x": 111,
+						"y": 236,
 						"w": 26,
 						"h": 30
 					}
@@ -1557,8 +1494,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 199,
-						"y": 58,
+						"x": 137,
+						"y": 236,
 						"w": 26,
 						"h": 30
 					}
@@ -1578,12 +1515,33 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 225,
-						"y": 58,
+						"x": 109,
+						"y": 266,
 						"w": 26,
 						"h": 30
 					}
 				},
+				{
+					"filename": "794",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 1,
+						"w": 25,
+						"h": 29
+					},
+					"frame": {
+						"x": 109,
+						"y": 296,
+						"w": 25,
+						"h": 29
+					}
+				},
 				{
 					"filename": "773s-psychic",
 					"rotated": false,
@@ -1599,12 +1557,54 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 140,
-						"y": 88,
+						"x": 135,
+						"y": 266,
 						"w": 26,
 						"h": 30
 					}
 				},
+				{
+					"filename": "794s",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 1,
+						"w": 25,
+						"h": 29
+					},
+					"frame": {
+						"x": 134,
+						"y": 296,
+						"w": 25,
+						"h": 29
+					}
+				},
+				{
+					"filename": "796",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 10,
+						"y": 1,
+						"w": 18,
+						"h": 29
+					},
+					"frame": {
+						"x": 159,
+						"y": 296,
+						"w": 18,
+						"h": 29
+					}
+				},
 				{
 					"filename": "773s-rock",
 					"rotated": false,
@@ -1620,12 +1620,54 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 166,
-						"y": 88,
+						"x": 161,
+						"y": 266,
 						"w": 26,
 						"h": 30
 					}
 				},
+				{
+					"filename": "796s",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 10,
+						"y": 1,
+						"w": 18,
+						"h": 29
+					},
+					"frame": {
+						"x": 177,
+						"y": 296,
+						"w": 18,
+						"h": 29
+					}
+				},
+				{
+					"filename": "772s",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 2,
+						"w": 25,
+						"h": 28
+					},
+					"frame": {
+						"x": 167,
+						"y": 28,
+						"w": 25,
+						"h": 28
+					}
+				},
 				{
 					"filename": "773s-steel",
 					"rotated": false,
@@ -1642,7 +1684,7 @@
 					},
 					"frame": {
 						"x": 192,
-						"y": 88,
+						"y": 27,
 						"w": 26,
 						"h": 30
 					}
@@ -1663,13 +1705,13 @@
 					},
 					"frame": {
 						"x": 218,
-						"y": 88,
+						"y": 27,
 						"w": 26,
 						"h": 30
 					}
 				},
 				{
-					"filename": "764s",
+					"filename": "773s",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -1677,123 +1719,18 @@
 						"h": 30
 					},
 					"spriteSourceSize": {
-						"x": 10,
+						"x": 7,
 						"y": 0,
-						"w": 25,
+						"w": 26,
 						"h": 30
 					},
 					"frame": {
-						"x": 140,
-						"y": 118,
-						"w": 25,
+						"x": 244,
+						"y": 27,
+						"w": 26,
 						"h": 30
 					}
 				},
-				{
-					"filename": "785s",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 3,
-						"w": 28,
-						"h": 26
-					},
-					"frame": {
-						"x": 165,
-						"y": 118,
-						"w": 28,
-						"h": 26
-					}
-				},
-				{
-					"filename": "2075",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 4,
-						"w": 29,
-						"h": 24
-					},
-					"frame": {
-						"x": 193,
-						"y": 118,
-						"w": 29,
-						"h": 24
-					}
-				},
-				{
-					"filename": "794",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 1,
-						"w": 25,
-						"h": 29
-					},
-					"frame": {
-						"x": 138,
-						"y": 148,
-						"w": 25,
-						"h": 29
-					}
-				},
-				{
-					"filename": "794s",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 1,
-						"w": 25,
-						"h": 29
-					},
-					"frame": {
-						"x": 138,
-						"y": 177,
-						"w": 25,
-						"h": 29
-					}
-				},
-				{
-					"filename": "726",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 4,
-						"w": 23,
-						"h": 24
-					},
-					"frame": {
-						"x": 222,
-						"y": 118,
-						"w": 23,
-						"h": 24
-					}
-				},
 				{
 					"filename": "2103",
 					"rotated": false,
@@ -1809,12 +1746,75 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 251,
-						"y": 58,
+						"x": 270,
+						"y": 27,
 						"w": 21,
 						"h": 30
 					}
 				},
+				{
+					"filename": "2026",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 1,
+						"w": 26,
+						"h": 28
+					},
+					"frame": {
+						"x": 291,
+						"y": 23,
+						"w": 26,
+						"h": 28
+					}
+				},
+				{
+					"filename": "2026s",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 1,
+						"w": 26,
+						"h": 28
+					},
+					"frame": {
+						"x": 317,
+						"y": 23,
+						"w": 26,
+						"h": 28
+					}
+				},
+				{
+					"filename": "2075",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 4,
+						"w": 29,
+						"h": 24
+					},
+					"frame": {
+						"x": 343,
+						"y": 25,
+						"w": 29,
+						"h": 24
+					}
+				},
 				{
 					"filename": "2075s",
 					"rotated": false,
@@ -1830,180 +1830,12 @@
 						"h": 24
 					},
 					"frame": {
-						"x": 244,
-						"y": 88,
+						"x": 372,
+						"y": 25,
 						"w": 29,
 						"h": 24
 					}
 				},
-				{
-					"filename": "748",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 5,
-						"w": 26,
-						"h": 25
-					},
-					"frame": {
-						"x": 245,
-						"y": 112,
-						"w": 26,
-						"h": 25
-					}
-				},
-				{
-					"filename": "2103s",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 0,
-						"w": 21,
-						"h": 30
-					},
-					"frame": {
-						"x": 260,
-						"y": 28,
-						"w": 21,
-						"h": 30
-					}
-				},
-				{
-					"filename": "748s",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 5,
-						"w": 26,
-						"h": 25
-					},
-					"frame": {
-						"x": 281,
-						"y": 27,
-						"w": 26,
-						"h": 25
-					}
-				},
-				{
-					"filename": "2089",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 3,
-						"w": 26,
-						"h": 25
-					},
-					"frame": {
-						"x": 307,
-						"y": 27,
-						"w": 26,
-						"h": 25
-					}
-				},
-				{
-					"filename": "2089s",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 3,
-						"w": 26,
-						"h": 25
-					},
-					"frame": {
-						"x": 333,
-						"y": 27,
-						"w": 26,
-						"h": 25
-					}
-				},
-				{
-					"filename": "724",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 11,
-						"y": 4,
-						"w": 19,
-						"h": 25
-					},
-					"frame": {
-						"x": 359,
-						"y": 27,
-						"w": 19,
-						"h": 25
-					}
-				},
-				{
-					"filename": "745-dusk",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 4,
-						"w": 25,
-						"h": 25
-					},
-					"frame": {
-						"x": 378,
-						"y": 23,
-						"w": 25,
-						"h": 25
-					}
-				},
-				{
-					"filename": "745s-dusk",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 4,
-						"w": 25,
-						"h": 25
-					},
-					"frame": {
-						"x": 403,
-						"y": 23,
-						"w": 25,
-						"h": 25
-					}
-				},
 				{
 					"filename": "746-school",
 					"rotated": false,
@@ -2019,8 +1851,8 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 428,
-						"y": 25,
+						"x": 401,
+						"y": 26,
 						"w": 28,
 						"h": 22
 					}
@@ -2040,14 +1872,14 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 456,
-						"y": 25,
+						"x": 429,
+						"y": 26,
 						"w": 28,
 						"h": 22
 					}
 				},
 				{
-					"filename": "796",
+					"filename": "760",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -2055,20 +1887,20 @@
 						"h": 30
 					},
 					"spriteSourceSize": {
-						"x": 10,
-						"y": 1,
-						"w": 18,
-						"h": 29
+						"x": 13,
+						"y": 4,
+						"w": 17,
+						"h": 24
 					},
 					"frame": {
-						"x": 484,
-						"y": 25,
-						"w": 18,
-						"h": 29
+						"x": 175,
+						"y": 56,
+						"w": 17,
+						"h": 24
 					}
 				},
 				{
-					"filename": "796s",
+					"filename": "748",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -2076,16 +1908,121 @@
 						"h": 30
 					},
 					"spriteSourceSize": {
-						"x": 10,
-						"y": 1,
-						"w": 18,
-						"h": 29
+						"x": 7,
+						"y": 5,
+						"w": 26,
+						"h": 25
 					},
 					"frame": {
-						"x": 272,
-						"y": 58,
-						"w": 18,
-						"h": 29
+						"x": 192,
+						"y": 57,
+						"w": 26,
+						"h": 25
+					}
+				},
+				{
+					"filename": "748s",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 5,
+						"w": 26,
+						"h": 25
+					},
+					"frame": {
+						"x": 218,
+						"y": 57,
+						"w": 26,
+						"h": 25
+					}
+				},
+				{
+					"filename": "2089",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 3,
+						"w": 26,
+						"h": 25
+					},
+					"frame": {
+						"x": 244,
+						"y": 57,
+						"w": 26,
+						"h": 25
+					}
+				},
+				{
+					"filename": "745-dusk",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 4,
+						"w": 25,
+						"h": 25
+					},
+					"frame": {
+						"x": 270,
+						"y": 57,
+						"w": 25,
+						"h": 25
+					}
+				},
+				{
+					"filename": "2089s",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 3,
+						"w": 26,
+						"h": 25
+					},
+					"frame": {
+						"x": 295,
+						"y": 51,
+						"w": 26,
+						"h": 25
+					}
+				},
+				{
+					"filename": "745s-dusk",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 4,
+						"w": 25,
+						"h": 25
+					},
+					"frame": {
+						"x": 321,
+						"y": 51,
+						"w": 25,
+						"h": 25
 					}
 				},
 				{
@@ -2103,8 +2040,8 @@
 						"h": 26
 					},
 					"frame": {
-						"x": 290,
-						"y": 52,
+						"x": 346,
+						"y": 49,
 						"w": 24,
 						"h": 26
 					}
@@ -2124,159 +2061,12 @@
 						"h": 26
 					},
 					"frame": {
-						"x": 314,
-						"y": 52,
+						"x": 370,
+						"y": 49,
 						"w": 24,
 						"h": 26
 					}
 				},
-				{
-					"filename": "750",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 4,
-						"w": 25,
-						"h": 24
-					},
-					"frame": {
-						"x": 338,
-						"y": 52,
-						"w": 25,
-						"h": 24
-					}
-				},
-				{
-					"filename": "724s",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 11,
-						"y": 4,
-						"w": 19,
-						"h": 25
-					},
-					"frame": {
-						"x": 273,
-						"y": 87,
-						"w": 19,
-						"h": 25
-					}
-				},
-				{
-					"filename": "776",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 4,
-						"w": 23,
-						"h": 26
-					},
-					"frame": {
-						"x": 271,
-						"y": 112,
-						"w": 23,
-						"h": 26
-					}
-				},
-				{
-					"filename": "750s",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 4,
-						"w": 25,
-						"h": 24
-					},
-					"frame": {
-						"x": 292,
-						"y": 78,
-						"w": 25,
-						"h": 24
-					}
-				},
-				{
-					"filename": "726s",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 4,
-						"w": 23,
-						"h": 24
-					},
-					"frame": {
-						"x": 317,
-						"y": 78,
-						"w": 23,
-						"h": 24
-					}
-				},
-				{
-					"filename": "776s",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 4,
-						"w": 23,
-						"h": 26
-					},
-					"frame": {
-						"x": 340,
-						"y": 76,
-						"w": 23,
-						"h": 26
-					}
-				},
-				{
-					"filename": "801-original",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 2,
-						"w": 20,
-						"h": 28
-					},
-					"frame": {
-						"x": 363,
-						"y": 52,
-						"w": 20,
-						"h": 28
-					}
-				},
 				{
 					"filename": "765",
 					"rotated": false,
@@ -2292,14 +2082,56 @@
 						"h": 21
 					},
 					"frame": {
-						"x": 383,
-						"y": 48,
+						"x": 457,
+						"y": 28,
 						"w": 28,
 						"h": 21
 					}
 				},
 				{
-					"filename": "727",
+					"filename": "760s",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 13,
+						"y": 4,
+						"w": 17,
+						"h": 24
+					},
+					"frame": {
+						"x": 485,
+						"y": 28,
+						"w": 17,
+						"h": 24
+					}
+				},
+				{
+					"filename": "2103s",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 10,
+						"y": 0,
+						"w": 21,
+						"h": 30
+					},
+					"frame": {
+						"x": 165,
+						"y": 86,
+						"w": 21,
+						"h": 30
+					}
+				},
+				{
+					"filename": "783",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -2308,14 +2140,56 @@
 					},
 					"spriteSourceSize": {
 						"x": 9,
+						"y": 3,
+						"w": 21,
+						"h": 27
+					},
+					"frame": {
+						"x": 165,
+						"y": 116,
+						"w": 21,
+						"h": 27
+					}
+				},
+				{
+					"filename": "750",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 8,
 						"y": 4,
-						"w": 23,
+						"w": 25,
 						"h": 24
 					},
 					"frame": {
-						"x": 363,
-						"y": 80,
-						"w": 23,
+						"x": 186,
+						"y": 82,
+						"w": 25,
+						"h": 24
+					}
+				},
+				{
+					"filename": "750s",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 4,
+						"w": 25,
+						"h": 24
+					},
+					"frame": {
+						"x": 211,
+						"y": 82,
+						"w": 25,
 						"h": 24
 					}
 				},
@@ -2334,159 +2208,12 @@
 						"h": 21
 					},
 					"frame": {
-						"x": 294,
-						"y": 102,
+						"x": 186,
+						"y": 106,
 						"w": 28,
 						"h": 21
 					}
 				},
-				{
-					"filename": "725",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 7,
-						"w": 25,
-						"h": 21
-					},
-					"frame": {
-						"x": 322,
-						"y": 102,
-						"w": 25,
-						"h": 21
-					}
-				},
-				{
-					"filename": "780",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 7,
-						"w": 27,
-						"h": 19
-					},
-					"frame": {
-						"x": 294,
-						"y": 123,
-						"w": 27,
-						"h": 19
-					}
-				},
-				{
-					"filename": "780s",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 7,
-						"w": 27,
-						"h": 19
-					},
-					"frame": {
-						"x": 321,
-						"y": 123,
-						"w": 27,
-						"h": 19
-					}
-				},
-				{
-					"filename": "723",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 11,
-						"y": 5,
-						"w": 17,
-						"h": 22
-					},
-					"frame": {
-						"x": 411,
-						"y": 48,
-						"w": 17,
-						"h": 22
-					}
-				},
-				{
-					"filename": "745",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 6,
-						"w": 25,
-						"h": 23
-					},
-					"frame": {
-						"x": 428,
-						"y": 47,
-						"w": 25,
-						"h": 23
-					}
-				},
-				{
-					"filename": "745s",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 6,
-						"w": 25,
-						"h": 23
-					},
-					"frame": {
-						"x": 453,
-						"y": 47,
-						"w": 25,
-						"h": 23
-					}
-				},
-				{
-					"filename": "768",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 5,
-						"w": 24,
-						"h": 23
-					},
-					"frame": {
-						"x": 478,
-						"y": 54,
-						"w": 24,
-						"h": 23
-					}
-				},
 				{
 					"filename": "2028",
 					"rotated": false,
@@ -2502,8 +2229,8 @@
 						"h": 24
 					},
 					"frame": {
-						"x": 386,
-						"y": 69,
+						"x": 236,
+						"y": 82,
 						"w": 25,
 						"h": 24
 					}
@@ -2523,56 +2250,14 @@
 						"h": 24
 					},
 					"frame": {
-						"x": 411,
-						"y": 70,
+						"x": 261,
+						"y": 82,
 						"w": 25,
 						"h": 24
 					}
 				},
 				{
-					"filename": "727s",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 4,
-						"w": 23,
-						"h": 24
-					},
-					"frame": {
-						"x": 436,
-						"y": 70,
-						"w": 23,
-						"h": 24
-					}
-				},
-				{
-					"filename": "781",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 11,
-						"y": 3,
-						"w": 19,
-						"h": 25
-					},
-					"frame": {
-						"x": 459,
-						"y": 70,
-						"w": 19,
-						"h": 25
-					}
-				},
-				{
-					"filename": "768s",
+					"filename": "725",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -2581,15 +2266,15 @@
 					},
 					"spriteSourceSize": {
 						"x": 8,
-						"y": 5,
-						"w": 24,
-						"h": 23
+						"y": 7,
+						"w": 25,
+						"h": 21
 					},
 					"frame": {
-						"x": 478,
-						"y": 77,
-						"w": 24,
-						"h": 23
+						"x": 214,
+						"y": 106,
+						"w": 25,
+						"h": 21
 					}
 				},
 				{
@@ -2607,14 +2292,14 @@
 						"h": 21
 					},
 					"frame": {
-						"x": 386,
-						"y": 93,
+						"x": 239,
+						"y": 106,
 						"w": 25,
 						"h": 21
 					}
 				},
 				{
-					"filename": "2020",
+					"filename": "726",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -2623,40 +2308,19 @@
 					},
 					"spriteSourceSize": {
 						"x": 8,
-						"y": 6,
-						"w": 25,
-						"h": 22
-					},
-					"frame": {
-						"x": 411,
-						"y": 94,
-						"w": 25,
-						"h": 22
-					}
-				},
-				{
-					"filename": "729",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 11,
-						"y": 5,
+						"y": 4,
 						"w": 23,
 						"h": 24
 					},
 					"frame": {
-						"x": 436,
-						"y": 94,
+						"x": 264,
+						"y": 106,
 						"w": 23,
 						"h": 24
 					}
 				},
 				{
-					"filename": "781s",
+					"filename": "780",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -2664,62 +2328,20 @@
 						"h": 30
 					},
 					"spriteSourceSize": {
-						"x": 11,
-						"y": 3,
-						"w": 19,
-						"h": 25
-					},
-					"frame": {
-						"x": 459,
-						"y": 95,
-						"w": 19,
-						"h": 25
-					}
-				},
-				{
-					"filename": "2105",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 5,
-						"w": 24,
-						"h": 23
-					},
-					"frame": {
-						"x": 478,
-						"y": 100,
-						"w": 24,
-						"h": 23
-					}
-				},
-				{
-					"filename": "761",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 13,
-						"y": 8,
-						"w": 16,
+						"x": 7,
+						"y": 7,
+						"w": 27,
 						"h": 19
 					},
 					"frame": {
-						"x": 347,
-						"y": 102,
-						"w": 16,
+						"x": 186,
+						"y": 127,
+						"w": 27,
 						"h": 19
 					}
 				},
 				{
-					"filename": "729s",
+					"filename": "780s",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -2727,184 +2349,16 @@
 						"h": 30
 					},
 					"spriteSourceSize": {
-						"x": 11,
-						"y": 5,
-						"w": 23,
-						"h": 24
-					},
-					"frame": {
-						"x": 363,
-						"y": 104,
-						"w": 23,
-						"h": 24
-					}
-				},
-				{
-					"filename": "734",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 10,
-						"w": 25,
-						"h": 16
-					},
-					"frame": {
-						"x": 386,
-						"y": 114,
-						"w": 25,
-						"h": 16
-					}
-				},
-				{
-					"filename": "734s",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 10,
-						"w": 25,
-						"h": 16
-					},
-					"frame": {
-						"x": 411,
-						"y": 116,
-						"w": 25,
-						"h": 16
-					}
-				},
-				{
-					"filename": "733",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 8,
+						"x": 7,
 						"y": 7,
-						"w": 23,
-						"h": 21
+						"w": 27,
+						"h": 19
 					},
 					"frame": {
-						"x": 436,
-						"y": 118,
-						"w": 23,
-						"h": 21
-					}
-				},
-				{
-					"filename": "732",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 6,
-						"w": 19,
-						"h": 22
-					},
-					"frame": {
-						"x": 459,
-						"y": 120,
-						"w": 19,
-						"h": 22
-					}
-				},
-				{
-					"filename": "2105s",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 5,
-						"w": 24,
-						"h": 23
-					},
-					"frame": {
-						"x": 478,
-						"y": 123,
-						"w": 24,
-						"h": 23
-					}
-				},
-				{
-					"filename": "2050",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 13,
-						"y": 10,
-						"w": 15,
-						"h": 18
-					},
-					"frame": {
-						"x": 348,
-						"y": 121,
-						"w": 15,
-						"h": 18
-					}
-				},
-				{
-					"filename": "733s",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 7,
-						"w": 23,
-						"h": 21
-					},
-					"frame": {
-						"x": 363,
-						"y": 128,
-						"w": 23,
-						"h": 21
-					}
-				},
-				{
-					"filename": "2020s",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 6,
-						"w": 25,
-						"h": 22
-					},
-					"frame": {
-						"x": 386,
-						"y": 130,
-						"w": 25,
-						"h": 22
+						"x": 213,
+						"y": 127,
+						"w": 27,
+						"h": 19
 					}
 				},
 				{
@@ -2922,14 +2376,14 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 411,
-						"y": 132,
+						"x": 240,
+						"y": 127,
 						"w": 24,
 						"h": 22
 					}
 				},
 				{
-					"filename": "758s",
+					"filename": "726s",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -2937,104 +2391,20 @@
 						"h": 30
 					},
 					"spriteSourceSize": {
-						"x": 11,
-						"y": 6,
-						"w": 24,
-						"h": 22
+						"x": 8,
+						"y": 4,
+						"w": 23,
+						"h": 24
 					},
 					"frame": {
-						"x": 435,
-						"y": 139,
-						"w": 24,
-						"h": 22
+						"x": 264,
+						"y": 130,
+						"w": 23,
+						"h": 24
 					}
 				},
 				{
-					"filename": "732s",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 6,
-						"w": 19,
-						"h": 22
-					},
-					"frame": {
-						"x": 459,
-						"y": 142,
-						"w": 19,
-						"h": 22
-					}
-				},
-				{
-					"filename": "2053",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 6,
-						"w": 24,
-						"h": 22
-					},
-					"frame": {
-						"x": 478,
-						"y": 146,
-						"w": 24,
-						"h": 22
-					}
-				},
-				{
-					"filename": "801s",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 2,
-						"w": 20,
-						"h": 28
-					},
-					"frame": {
-						"x": 135,
-						"y": 207,
-						"w": 20,
-						"h": 28
-					}
-				},
-				{
-					"filename": "801s-original",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 2,
-						"w": 20,
-						"h": 28
-					},
-					"frame": {
-						"x": 135,
-						"y": 235,
-						"w": 20,
-						"h": 28
-					}
-				},
-				{
-					"filename": "783",
+					"filename": "727",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -3043,15 +2413,78 @@
 					},
 					"spriteSourceSize": {
 						"x": 9,
-						"y": 3,
-						"w": 21,
-						"h": 27
+						"y": 4,
+						"w": 23,
+						"h": 24
 					},
 					"frame": {
-						"x": 137,
-						"y": 263,
-						"w": 21,
-						"h": 27
+						"x": 286,
+						"y": 82,
+						"w": 23,
+						"h": 24
+					}
+				},
+				{
+					"filename": "776",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 4,
+						"w": 23,
+						"h": 26
+					},
+					"frame": {
+						"x": 287,
+						"y": 106,
+						"w": 23,
+						"h": 26
+					}
+				},
+				{
+					"filename": "727s",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 9,
+						"y": 4,
+						"w": 23,
+						"h": 24
+					},
+					"frame": {
+						"x": 287,
+						"y": 132,
+						"w": 23,
+						"h": 24
+					}
+				},
+				{
+					"filename": "776s",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 4,
+						"w": 23,
+						"h": 26
+					},
+					"frame": {
+						"x": 309,
+						"y": 76,
+						"w": 23,
+						"h": 26
 					}
 				},
 				{
@@ -3069,8 +2502,8 @@
 						"h": 27
 					},
 					"frame": {
-						"x": 155,
-						"y": 206,
+						"x": 310,
+						"y": 102,
 						"w": 21,
 						"h": 27
 					}
@@ -3090,8 +2523,8 @@
 						"h": 26
 					},
 					"frame": {
-						"x": 155,
-						"y": 233,
+						"x": 310,
+						"y": 129,
 						"w": 22,
 						"h": 26
 					}
@@ -3111,8 +2544,8 @@
 						"h": 26
 					},
 					"frame": {
-						"x": 158,
-						"y": 259,
+						"x": 332,
+						"y": 76,
 						"w": 22,
 						"h": 26
 					}
@@ -3132,12 +2565,306 @@
 						"h": 26
 					},
 					"frame": {
-						"x": 160,
-						"y": 285,
+						"x": 331,
+						"y": 102,
 						"w": 22,
 						"h": 26
 					}
 				},
+				{
+					"filename": "745",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 6,
+						"w": 25,
+						"h": 23
+					},
+					"frame": {
+						"x": 354,
+						"y": 75,
+						"w": 25,
+						"h": 23
+					}
+				},
+				{
+					"filename": "788s",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 9,
+						"y": 2,
+						"w": 22,
+						"h": 26
+					},
+					"frame": {
+						"x": 332,
+						"y": 128,
+						"w": 22,
+						"h": 26
+					}
+				},
+				{
+					"filename": "724",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 11,
+						"y": 4,
+						"w": 19,
+						"h": 25
+					},
+					"frame": {
+						"x": 379,
+						"y": 75,
+						"w": 19,
+						"h": 25
+					}
+				},
+				{
+					"filename": "724s",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 11,
+						"y": 4,
+						"w": 19,
+						"h": 25
+					},
+					"frame": {
+						"x": 394,
+						"y": 49,
+						"w": 19,
+						"h": 25
+					}
+				},
+				{
+					"filename": "745s",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 6,
+						"w": 25,
+						"h": 23
+					},
+					"frame": {
+						"x": 413,
+						"y": 48,
+						"w": 25,
+						"h": 23
+					}
+				},
+				{
+					"filename": "781",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 11,
+						"y": 3,
+						"w": 19,
+						"h": 25
+					},
+					"frame": {
+						"x": 438,
+						"y": 48,
+						"w": 19,
+						"h": 25
+					}
+				},
+				{
+					"filename": "729",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 11,
+						"y": 5,
+						"w": 23,
+						"h": 24
+					},
+					"frame": {
+						"x": 457,
+						"y": 49,
+						"w": 23,
+						"h": 24
+					}
+				},
+				{
+					"filename": "806",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 9,
+						"y": 3,
+						"w": 22,
+						"h": 25
+					},
+					"frame": {
+						"x": 480,
+						"y": 52,
+						"w": 22,
+						"h": 25
+					}
+				},
+				{
+					"filename": "801-original",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 10,
+						"y": 2,
+						"w": 20,
+						"h": 28
+					},
+					"frame": {
+						"x": 398,
+						"y": 74,
+						"w": 20,
+						"h": 28
+					}
+				},
+				{
+					"filename": "801",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 10,
+						"y": 2,
+						"w": 20,
+						"h": 28
+					},
+					"frame": {
+						"x": 418,
+						"y": 71,
+						"w": 20,
+						"h": 28
+					}
+				},
+				{
+					"filename": "803",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 11,
+						"y": 3,
+						"w": 23,
+						"h": 25
+					},
+					"frame": {
+						"x": 438,
+						"y": 73,
+						"w": 23,
+						"h": 25
+					}
+				},
+				{
+					"filename": "781s",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 11,
+						"y": 3,
+						"w": 19,
+						"h": 25
+					},
+					"frame": {
+						"x": 461,
+						"y": 73,
+						"w": 19,
+						"h": 25
+					}
+				},
+				{
+					"filename": "806s",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 9,
+						"y": 3,
+						"w": 22,
+						"h": 25
+					},
+					"frame": {
+						"x": 480,
+						"y": 77,
+						"w": 22,
+						"h": 25
+					}
+				},
+				{
+					"filename": "734",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 9,
+						"y": 10,
+						"w": 25,
+						"h": 16
+					},
+					"frame": {
+						"x": 354,
+						"y": 98,
+						"w": 25,
+						"h": 16
+					}
+				},
 				{
 					"filename": "767",
 					"rotated": false,
@@ -3153,14 +2880,35 @@
 						"h": 14
 					},
 					"frame": {
-						"x": 245,
-						"y": 137,
+						"x": 353,
+						"y": 114,
 						"w": 24,
 						"h": 14
 					}
 				},
 				{
-					"filename": "767s",
+					"filename": "803s",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 11,
+						"y": 3,
+						"w": 23,
+						"h": 25
+					},
+					"frame": {
+						"x": 354,
+						"y": 128,
+						"w": 23,
+						"h": 25
+					}
+				},
+				{
+					"filename": "732",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -3169,15 +2917,603 @@
 					},
 					"spriteSourceSize": {
 						"x": 10,
-						"y": 11,
-						"w": 24,
-						"h": 14
+						"y": 6,
+						"w": 19,
+						"h": 22
 					},
 					"frame": {
-						"x": 269,
-						"y": 138,
+						"x": 379,
+						"y": 100,
+						"w": 19,
+						"h": 22
+					}
+				},
+				{
+					"filename": "801s-original",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 10,
+						"y": 2,
+						"w": 20,
+						"h": 28
+					},
+					"frame": {
+						"x": 377,
+						"y": 122,
+						"w": 20,
+						"h": 28
+					}
+				},
+				{
+					"filename": "729s",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 11,
+						"y": 5,
+						"w": 23,
+						"h": 24
+					},
+					"frame": {
+						"x": 398,
+						"y": 102,
+						"w": 23,
+						"h": 24
+					}
+				},
+				{
+					"filename": "768",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 5,
 						"w": 24,
-						"h": 14
+						"h": 23
+					},
+					"frame": {
+						"x": 397,
+						"y": 126,
+						"w": 24,
+						"h": 23
+					}
+				},
+				{
+					"filename": "801s",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 10,
+						"y": 2,
+						"w": 20,
+						"h": 28
+					},
+					"frame": {
+						"x": 421,
+						"y": 99,
+						"w": 20,
+						"h": 28
+					}
+				},
+				{
+					"filename": "768s",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 5,
+						"w": 24,
+						"h": 23
+					},
+					"frame": {
+						"x": 441,
+						"y": 98,
+						"w": 24,
+						"h": 23
+					}
+				},
+				{
+					"filename": "735",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 11,
+						"y": 4,
+						"w": 20,
+						"h": 24
+					},
+					"frame": {
+						"x": 421,
+						"y": 127,
+						"w": 20,
+						"h": 24
+					}
+				},
+				{
+					"filename": "770",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 9,
+						"y": 4,
+						"w": 23,
+						"h": 24
+					},
+					"frame": {
+						"x": 441,
+						"y": 121,
+						"w": 23,
+						"h": 24
+					}
+				},
+				{
+					"filename": "2050",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 13,
+						"y": 10,
+						"w": 15,
+						"h": 18
+					},
+					"frame": {
+						"x": 465,
+						"y": 98,
+						"w": 15,
+						"h": 18
+					}
+				},
+				{
+					"filename": "756",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 9,
+						"y": 5,
+						"w": 22,
+						"h": 24
+					},
+					"frame": {
+						"x": 480,
+						"y": 102,
+						"w": 22,
+						"h": 24
+					}
+				},
+				{
+					"filename": "2050s",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 13,
+						"y": 10,
+						"w": 15,
+						"h": 18
+					},
+					"frame": {
+						"x": 465,
+						"y": 116,
+						"w": 15,
+						"h": 18
+					}
+				},
+				{
+					"filename": "756s",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 9,
+						"y": 5,
+						"w": 22,
+						"h": 24
+					},
+					"frame": {
+						"x": 480,
+						"y": 126,
+						"w": 22,
+						"h": 24
+					}
+				},
+				{
+					"filename": "761",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 13,
+						"y": 8,
+						"w": 16,
+						"h": 19
+					},
+					"frame": {
+						"x": 464,
+						"y": 134,
+						"w": 16,
+						"h": 19
+					}
+				},
+				{
+					"filename": "802-zenith",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 13,
+						"y": 4,
+						"w": 22,
+						"h": 24
+					},
+					"frame": {
+						"x": 480,
+						"y": 150,
+						"w": 22,
+						"h": 24
+					}
+				},
+				{
+					"filename": "733",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 7,
+						"w": 23,
+						"h": 21
+					},
+					"frame": {
+						"x": 441,
+						"y": 145,
+						"w": 23,
+						"h": 21
+					}
+				},
+				{
+					"filename": "761s",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 13,
+						"y": 8,
+						"w": 16,
+						"h": 19
+					},
+					"frame": {
+						"x": 464,
+						"y": 153,
+						"w": 16,
+						"h": 19
+					}
+				},
+				{
+					"filename": "745-midnight",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 10,
+						"y": 4,
+						"w": 21,
+						"h": 24
+					},
+					"frame": {
+						"x": 165,
+						"y": 143,
+						"w": 21,
+						"h": 24
+					}
+				},
+				{
+					"filename": "2020",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 6,
+						"w": 25,
+						"h": 22
+					},
+					"frame": {
+						"x": 186,
+						"y": 146,
+						"w": 25,
+						"h": 22
+					}
+				},
+				{
+					"filename": "2020s",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 6,
+						"w": 25,
+						"h": 22
+					},
+					"frame": {
+						"x": 211,
+						"y": 146,
+						"w": 25,
+						"h": 22
+					}
+				},
+				{
+					"filename": "802",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 13,
+						"y": 4,
+						"w": 22,
+						"h": 24
+					},
+					"frame": {
+						"x": 164,
+						"y": 167,
+						"w": 22,
+						"h": 24
+					}
+				},
+				{
+					"filename": "2105",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 5,
+						"w": 24,
+						"h": 23
+					},
+					"frame": {
+						"x": 186,
+						"y": 168,
+						"w": 24,
+						"h": 23
+					}
+				},
+				{
+					"filename": "2105s",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 5,
+						"w": 24,
+						"h": 23
+					},
+					"frame": {
+						"x": 210,
+						"y": 168,
+						"w": 24,
+						"h": 23
+					}
+				},
+				{
+					"filename": "734s",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 9,
+						"y": 10,
+						"w": 25,
+						"h": 16
+					},
+					"frame": {
+						"x": 164,
+						"y": 191,
+						"w": 25,
+						"h": 16
+					}
+				},
+				{
+					"filename": "770s",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 9,
+						"y": 4,
+						"w": 23,
+						"h": 24
+					},
+					"frame": {
+						"x": 163,
+						"y": 207,
+						"w": 23,
+						"h": 24
+					}
+				},
+				{
+					"filename": "2051",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 9,
+						"y": 4,
+						"w": 23,
+						"h": 24
+					},
+					"frame": {
+						"x": 163,
+						"y": 231,
+						"w": 23,
+						"h": 24
+					}
+				},
+				{
+					"filename": "758s",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 11,
+						"y": 6,
+						"w": 24,
+						"h": 22
+					},
+					"frame": {
+						"x": 189,
+						"y": 191,
+						"w": 24,
+						"h": 22
+					}
+				},
+				{
+					"filename": "2051s",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 9,
+						"y": 4,
+						"w": 23,
+						"h": 24
+					},
+					"frame": {
+						"x": 186,
+						"y": 213,
+						"w": 23,
+						"h": 24
+					}
+				},
+				{
+					"filename": "745s-midnight",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 10,
+						"y": 4,
+						"w": 21,
+						"h": 24
+					},
+					"frame": {
+						"x": 213,
+						"y": 191,
+						"w": 21,
+						"h": 24
+					}
+				},
+				{
+					"filename": "2053",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 6,
+						"w": 24,
+						"h": 22
+					},
+					"frame": {
+						"x": 209,
+						"y": 215,
+						"w": 24,
+						"h": 22
 					}
 				},
 				{
@@ -3195,8 +3531,8 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 293,
-						"y": 142,
+						"x": 186,
+						"y": 237,
 						"w": 24,
 						"h": 22
 					}
@@ -3216,14 +3552,14 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 317,
-						"y": 142,
+						"x": 210,
+						"y": 237,
 						"w": 23,
 						"h": 22
 					}
 				},
 				{
-					"filename": "769s",
+					"filename": "802s-zenith",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -3231,125 +3567,20 @@
 						"h": 30
 					},
 					"spriteSourceSize": {
-						"x": 8,
-						"y": 6,
-						"w": 23,
-						"h": 22
-					},
-					"frame": {
-						"x": 340,
-						"y": 142,
-						"w": 23,
-						"h": 22
-					}
-				},
-				{
-					"filename": "752",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 8,
-						"w": 23,
-						"h": 18
-					},
-					"frame": {
-						"x": 363,
-						"y": 149,
-						"w": 23,
-						"h": 18
-					}
-				},
-				{
-					"filename": "2074",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 13,
-						"w": 24,
-						"h": 15
-					},
-					"frame": {
-						"x": 386,
-						"y": 152,
-						"w": 24,
-						"h": 15
-					}
-				},
-				{
-					"filename": "2074s",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 13,
-						"w": 24,
-						"h": 15
-					},
-					"frame": {
-						"x": 410,
-						"y": 154,
-						"w": 24,
-						"h": 15
-					}
-				},
-				{
-					"filename": "752s",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 8,
-						"w": 23,
-						"h": 18
-					},
-					"frame": {
-						"x": 434,
-						"y": 161,
-						"w": 23,
-						"h": 18
-					}
-				},
-				{
-					"filename": "745-midnight",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 10,
+						"x": 13,
 						"y": 4,
-						"w": 21,
+						"w": 22,
 						"h": 24
 					},
 					"frame": {
-						"x": 457,
-						"y": 164,
-						"w": 21,
+						"x": 187,
+						"y": 259,
+						"w": 22,
 						"h": 24
 					}
 				},
 				{
-					"filename": "770",
+					"filename": "802s",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -3357,20 +3588,20 @@
 						"h": 30
 					},
 					"spriteSourceSize": {
-						"x": 9,
+						"x": 13,
 						"y": 4,
-						"w": 23,
+						"w": 22,
 						"h": 24
 					},
 					"frame": {
-						"x": 478,
-						"y": 168,
-						"w": 23,
+						"x": 209,
+						"y": 259,
+						"w": 22,
 						"h": 24
 					}
 				},
 				{
-					"filename": "722",
+					"filename": "746",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -3379,19 +3610,40 @@
 					},
 					"spriteSourceSize": {
 						"x": 12,
-						"y": 8,
-						"w": 17,
-						"h": 18
+						"y": 11,
+						"w": 18,
+						"h": 13
 					},
 					"frame": {
-						"x": 163,
-						"y": 188,
-						"w": 17,
-						"h": 18
+						"x": 187,
+						"y": 283,
+						"w": 18,
+						"h": 13
 					}
 				},
 				{
-					"filename": "735",
+					"filename": "733s",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 7,
+						"w": 23,
+						"h": 21
+					},
+					"frame": {
+						"x": 236,
+						"y": 149,
+						"w": 23,
+						"h": 21
+					}
+				},
+				{
+					"filename": "807",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -3401,308 +3653,14 @@
 					"spriteSourceSize": {
 						"x": 11,
 						"y": 4,
-						"w": 20,
-						"h": 24
-					},
-					"frame": {
-						"x": 163,
-						"y": 164,
-						"w": 20,
-						"h": 24
-					}
-				},
-				{
-					"filename": "789",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 6,
-						"w": 23,
-						"h": 20
-					},
-					"frame": {
-						"x": 165,
-						"y": 144,
-						"w": 23,
-						"h": 20
-					}
-				},
-				{
-					"filename": "788s",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 2,
 						"w": 22,
-						"h": 26
+						"h": 24
 					},
 					"frame": {
-						"x": 176,
-						"y": 206,
+						"x": 234,
+						"y": 170,
 						"w": 22,
-						"h": 26
-					}
-				},
-				{
-					"filename": "803",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 11,
-						"y": 3,
-						"w": 23,
-						"h": 25
-					},
-					"frame": {
-						"x": 177,
-						"y": 232,
-						"w": 23,
-						"h": 25
-					}
-				},
-				{
-					"filename": "786",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 11,
-						"y": 3,
-						"w": 20,
-						"h": 25
-					},
-					"frame": {
-						"x": 180,
-						"y": 257,
-						"w": 20,
-						"h": 25
-					}
-				},
-				{
-					"filename": "786s",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 11,
-						"y": 3,
-						"w": 20,
-						"h": 25
-					},
-					"frame": {
-						"x": 182,
-						"y": 282,
-						"w": 20,
-						"h": 25
-					}
-				},
-				{
-					"filename": "778-busted",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 12,
-						"w": 21,
-						"h": 16
-					},
-					"frame": {
-						"x": 182,
-						"y": 307,
-						"w": 21,
-						"h": 16
-					}
-				},
-				{
-					"filename": "757",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 11,
-						"y": 9,
-						"w": 19,
-						"h": 18
-					},
-					"frame": {
-						"x": 180,
-						"y": 188,
-						"w": 19,
-						"h": 18
-					}
-				},
-				{
-					"filename": "735s",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 11,
-						"y": 4,
-						"w": 20,
 						"h": 24
-					},
-					"frame": {
-						"x": 183,
-						"y": 164,
-						"w": 20,
-						"h": 24
-					}
-				},
-				{
-					"filename": "728",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 13,
-						"y": 8,
-						"w": 17,
-						"h": 20
-					},
-					"frame": {
-						"x": 188,
-						"y": 144,
-						"w": 17,
-						"h": 20
-					}
-				},
-				{
-					"filename": "770s",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 4,
-						"w": 23,
-						"h": 24
-					},
-					"frame": {
-						"x": 205,
-						"y": 142,
-						"w": 23,
-						"h": 24
-					}
-				},
-				{
-					"filename": "760",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 13,
-						"y": 4,
-						"w": 17,
-						"h": 24
-					},
-					"frame": {
-						"x": 228,
-						"y": 142,
-						"w": 17,
-						"h": 24
-					}
-				},
-				{
-					"filename": "803s",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 11,
-						"y": 3,
-						"w": 23,
-						"h": 25
-					},
-					"frame": {
-						"x": 203,
-						"y": 166,
-						"w": 23,
-						"h": 25
-					}
-				},
-				{
-					"filename": "806",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 3,
-						"w": 22,
-						"h": 25
-					},
-					"frame": {
-						"x": 226,
-						"y": 166,
-						"w": 22,
-						"h": 25
-					}
-				},
-				{
-					"filename": "789s",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 6,
-						"w": 23,
-						"h": 20
-					},
-					"frame": {
-						"x": 199,
-						"y": 191,
-						"w": 23,
-						"h": 20
 					}
 				},
 				{
@@ -3720,14 +3678,14 @@
 						"h": 21
 					},
 					"frame": {
-						"x": 198,
-						"y": 211,
+						"x": 234,
+						"y": 194,
 						"w": 22,
 						"h": 21
 					}
 				},
 				{
-					"filename": "806s",
+					"filename": "807s",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -3735,125 +3693,20 @@
 						"h": 30
 					},
 					"spriteSourceSize": {
-						"x": 9,
-						"y": 3,
-						"w": 22,
-						"h": 25
-					},
-					"frame": {
-						"x": 200,
-						"y": 232,
-						"w": 22,
-						"h": 25
-					}
-				},
-				{
-					"filename": "756",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 5,
-						"w": 22,
-						"h": 24
-					},
-					"frame": {
-						"x": 200,
-						"y": 257,
-						"w": 22,
-						"h": 24
-					}
-				},
-				{
-					"filename": "745s-midnight",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 10,
+						"x": 11,
 						"y": 4,
-						"w": 21,
+						"w": 22,
 						"h": 24
 					},
 					"frame": {
-						"x": 202,
-						"y": 281,
-						"w": 21,
-						"h": 24
-					}
-				},
-				{
-					"filename": "2027",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 10,
-						"w": 21,
-						"h": 18
-					},
-					"frame": {
-						"x": 203,
-						"y": 305,
-						"w": 21,
-						"h": 18
-					}
-				},
-				{
-					"filename": "2051",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 4,
-						"w": 23,
-						"h": 24
-					},
-					"frame": {
-						"x": 222,
-						"y": 191,
-						"w": 23,
-						"h": 24
-					}
-				},
-				{
-					"filename": "778s-busted",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 12,
-						"w": 21,
-						"h": 16
-					},
-					"frame": {
-						"x": 220,
+						"x": 233,
 						"y": 215,
-						"w": 21,
-						"h": 16
+						"w": 22,
+						"h": 24
 					}
 				},
 				{
-					"filename": "756s",
+					"filename": "738s",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -3862,19 +3715,19 @@
 					},
 					"spriteSourceSize": {
 						"x": 9,
-						"y": 5,
+						"y": 6,
 						"w": 22,
-						"h": 24
+						"h": 21
 					},
 					"frame": {
-						"x": 222,
-						"y": 231,
+						"x": 233,
+						"y": 239,
 						"w": 22,
-						"h": 24
+						"h": 21
 					}
 				},
 				{
-					"filename": "802",
+					"filename": "769s",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -3882,16 +3735,37 @@
 						"h": 30
 					},
 					"spriteSourceSize": {
-						"x": 13,
-						"y": 4,
-						"w": 22,
-						"h": 24
+						"x": 8,
+						"y": 6,
+						"w": 23,
+						"h": 22
 					},
 					"frame": {
-						"x": 222,
-						"y": 255,
-						"w": 22,
-						"h": 24
+						"x": 231,
+						"y": 260,
+						"w": 23,
+						"h": 22
+					}
+				},
+				{
+					"filename": "767s",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 10,
+						"y": 11,
+						"w": 24,
+						"h": 14
+					},
+					"frame": {
+						"x": 205,
+						"y": 283,
+						"w": 24,
+						"h": 14
 					}
 				},
 				{
@@ -3909,8 +3783,71 @@
 						"h": 24
 					},
 					"frame": {
-						"x": 223,
-						"y": 279,
+						"x": 195,
+						"y": 297,
+						"w": 21,
+						"h": 24
+					}
+				},
+				{
+					"filename": "735s",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 11,
+						"y": 4,
+						"w": 20,
+						"h": 24
+					},
+					"frame": {
+						"x": 216,
+						"y": 297,
+						"w": 20,
+						"h": 24
+					}
+				},
+				{
+					"filename": "752",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 10,
+						"y": 8,
+						"w": 23,
+						"h": 18
+					},
+					"frame": {
+						"x": 259,
+						"y": 154,
+						"w": 23,
+						"h": 18
+					}
+				},
+				{
+					"filename": "763s",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 11,
+						"y": 4,
+						"w": 21,
+						"h": 24
+					},
+					"frame": {
+						"x": 256,
+						"y": 172,
 						"w": 21,
 						"h": 24
 					}
@@ -3930,134 +3867,8 @@
 						"h": 20
 					},
 					"frame": {
-						"x": 224,
-						"y": 303,
-						"w": 22,
-						"h": 20
-					}
-				},
-				{
-					"filename": "746",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 12,
-						"y": 11,
-						"w": 18,
-						"h": 13
-					},
-					"frame": {
-						"x": 245,
-						"y": 151,
-						"w": 18,
-						"h": 13
-					}
-				},
-				{
-					"filename": "760s",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 13,
-						"y": 4,
-						"w": 17,
-						"h": 24
-					},
-					"frame": {
-						"x": 248,
-						"y": 164,
-						"w": 17,
-						"h": 24
-					}
-				},
-				{
-					"filename": "2051s",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 4,
-						"w": 23,
-						"h": 24
-					},
-					"frame": {
-						"x": 265,
-						"y": 152,
-						"w": 23,
-						"h": 24
-					}
-				},
-				{
-					"filename": "738s",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 6,
-						"w": 22,
-						"h": 21
-					},
-					"frame": {
-						"x": 265,
-						"y": 176,
-						"w": 22,
-						"h": 21
-					}
-				},
-				{
-					"filename": "743",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 12,
-						"y": 5,
-						"w": 20,
-						"h": 22
-					},
-					"frame": {
-						"x": 245,
-						"y": 191,
-						"w": 20,
-						"h": 22
-					}
-				},
-				{
-					"filename": "747s",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 7,
-						"w": 22,
-						"h": 20
-					},
-					"frame": {
-						"x": 265,
-						"y": 197,
+						"x": 256,
+						"y": 196,
 						"w": 22,
 						"h": 20
 					}
@@ -4077,8 +3888,8 @@
 						"h": 23
 					},
 					"frame": {
-						"x": 288,
-						"y": 164,
+						"x": 255,
+						"y": 216,
 						"w": 22,
 						"h": 23
 					}
@@ -4098,77 +3909,14 @@
 						"h": 23
 					},
 					"frame": {
-						"x": 310,
-						"y": 164,
+						"x": 255,
+						"y": 239,
 						"w": 22,
 						"h": 23
 					}
 				},
 				{
-					"filename": "802s",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 13,
-						"y": 4,
-						"w": 22,
-						"h": 24
-					},
-					"frame": {
-						"x": 287,
-						"y": 187,
-						"w": 22,
-						"h": 24
-					}
-				},
-				{
-					"filename": "807",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 11,
-						"y": 4,
-						"w": 22,
-						"h": 24
-					},
-					"frame": {
-						"x": 309,
-						"y": 187,
-						"w": 22,
-						"h": 24
-					}
-				},
-				{
-					"filename": "807s",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 11,
-						"y": 4,
-						"w": 22,
-						"h": 24
-					},
-					"frame": {
-						"x": 332,
-						"y": 164,
-						"w": 22,
-						"h": 24
-					}
-				},
-				{
-					"filename": "749",
+					"filename": "789",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -4177,19 +3925,61 @@
 					},
 					"spriteSourceSize": {
 						"x": 10,
+						"y": 6,
+						"w": 23,
+						"h": 20
+					},
+					"frame": {
+						"x": 254,
+						"y": 262,
+						"w": 23,
+						"h": 20
+					}
+				},
+				{
+					"filename": "752s",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 10,
+						"y": 8,
+						"w": 23,
+						"h": 18
+					},
+					"frame": {
+						"x": 282,
+						"y": 156,
+						"w": 23,
+						"h": 18
+					}
+				},
+				{
+					"filename": "743",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 12,
 						"y": 5,
-						"w": 21,
-						"h": 23
+						"w": 20,
+						"h": 22
 					},
 					"frame": {
-						"x": 331,
-						"y": 188,
-						"w": 21,
-						"h": 23
+						"x": 277,
+						"y": 174,
+						"w": 20,
+						"h": 22
 					}
 				},
 				{
-					"filename": "2037",
+					"filename": "732s",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -4198,61 +3988,19 @@
 					},
 					"spriteSourceSize": {
 						"x": 10,
-						"y": 7,
-						"w": 22,
-						"h": 21
+						"y": 6,
+						"w": 19,
+						"h": 22
 					},
 					"frame": {
-						"x": 354,
-						"y": 167,
-						"w": 22,
-						"h": 21
+						"x": 278,
+						"y": 196,
+						"w": 19,
+						"h": 22
 					}
 				},
 				{
-					"filename": "749s",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 5,
-						"w": 21,
-						"h": 23
-					},
-					"frame": {
-						"x": 352,
-						"y": 188,
-						"w": 21,
-						"h": 23
-					}
-				},
-				{
-					"filename": "2037s",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 7,
-						"w": 22,
-						"h": 21
-					},
-					"frame": {
-						"x": 376,
-						"y": 167,
-						"w": 22,
-						"h": 21
-					}
-				},
-				{
-					"filename": "763s",
+					"filename": "786",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -4261,15 +4009,57 @@
 					},
 					"spriteSourceSize": {
 						"x": 11,
-						"y": 4,
-						"w": 21,
-						"h": 24
+						"y": 3,
+						"w": 20,
+						"h": 25
 					},
 					"frame": {
-						"x": 373,
-						"y": 188,
-						"w": 21,
-						"h": 24
+						"x": 277,
+						"y": 218,
+						"w": 20,
+						"h": 25
+					}
+				},
+				{
+					"filename": "786s",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 11,
+						"y": 3,
+						"w": 20,
+						"h": 25
+					},
+					"frame": {
+						"x": 277,
+						"y": 243,
+						"w": 20,
+						"h": 25
+					}
+				},
+				{
+					"filename": "739",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 11,
+						"y": 6,
+						"w": 20,
+						"h": 21
+					},
+					"frame": {
+						"x": 277,
+						"y": 268,
+						"w": 20,
+						"h": 21
 					}
 				},
 				{
@@ -4287,54 +4077,12 @@
 						"h": 24
 					},
 					"frame": {
-						"x": 394,
-						"y": 188,
+						"x": 297,
+						"y": 174,
 						"w": 13,
 						"h": 24
 					}
 				},
-				{
-					"filename": "790",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 7,
-						"w": 21,
-						"h": 19
-					},
-					"frame": {
-						"x": 398,
-						"y": 169,
-						"w": 21,
-						"h": 19
-					}
-				},
-				{
-					"filename": "2050s",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 13,
-						"y": 10,
-						"w": 15,
-						"h": 18
-					},
-					"frame": {
-						"x": 419,
-						"y": 169,
-						"w": 15,
-						"h": 18
-					}
-				},
 				{
 					"filename": "755s",
 					"rotated": false,
@@ -4350,8 +4098,8 @@
 						"h": 24
 					},
 					"frame": {
-						"x": 407,
-						"y": 188,
+						"x": 297,
+						"y": 198,
 						"w": 13,
 						"h": 24
 					}
@@ -4371,180 +4119,12 @@
 						"h": 24
 					},
 					"frame": {
-						"x": 420,
-						"y": 187,
+						"x": 297,
+						"y": 222,
 						"w": 21,
 						"h": 24
 					}
 				},
-				{
-					"filename": "761s",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 13,
-						"y": 8,
-						"w": 16,
-						"h": 19
-					},
-					"frame": {
-						"x": 441,
-						"y": 179,
-						"w": 16,
-						"h": 19
-					}
-				},
-				{
-					"filename": "775",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 11,
-						"y": 6,
-						"w": 21,
-						"h": 20
-					},
-					"frame": {
-						"x": 457,
-						"y": 188,
-						"w": 21,
-						"h": 20
-					}
-				},
-				{
-					"filename": "775s",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 11,
-						"y": 6,
-						"w": 21,
-						"h": 20
-					},
-					"frame": {
-						"x": 478,
-						"y": 192,
-						"w": 21,
-						"h": 20
-					}
-				},
-				{
-					"filename": "751",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 13,
-						"y": 8,
-						"w": 14,
-						"h": 20
-					},
-					"frame": {
-						"x": 441,
-						"y": 198,
-						"w": 14,
-						"h": 20
-					}
-				},
-				{
-					"filename": "779",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 7,
-						"w": 21,
-						"h": 20
-					},
-					"frame": {
-						"x": 420,
-						"y": 211,
-						"w": 21,
-						"h": 20
-					}
-				},
-				{
-					"filename": "779s",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 7,
-						"w": 21,
-						"h": 20
-					},
-					"frame": {
-						"x": 455,
-						"y": 208,
-						"w": 21,
-						"h": 20
-					}
-				},
-				{
-					"filename": "751s",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 13,
-						"y": 8,
-						"w": 14,
-						"h": 20
-					},
-					"frame": {
-						"x": 441,
-						"y": 218,
-						"w": 14,
-						"h": 20
-					}
-				},
-				{
-					"filename": "790s",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 7,
-						"w": 21,
-						"h": 19
-					},
-					"frame": {
-						"x": 476,
-						"y": 212,
-						"w": 21,
-						"h": 19
-					}
-				},
 				{
 					"filename": "793s",
 					"rotated": false,
@@ -4560,14 +4140,161 @@
 						"h": 24
 					},
 					"frame": {
-						"x": 455,
-						"y": 228,
+						"x": 297,
+						"y": 246,
 						"w": 21,
 						"h": 24
 					}
 				},
 				{
-					"filename": "2019",
+					"filename": "747s",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 10,
+						"y": 7,
+						"w": 22,
+						"h": 20
+					},
+					"frame": {
+						"x": 297,
+						"y": 270,
+						"w": 22,
+						"h": 20
+					}
+				},
+				{
+					"filename": "2074",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 13,
+						"w": 24,
+						"h": 15
+					},
+					"frame": {
+						"x": 231,
+						"y": 282,
+						"w": 24,
+						"h": 15
+					}
+				},
+				{
+					"filename": "2037",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 10,
+						"y": 7,
+						"w": 22,
+						"h": 21
+					},
+					"frame": {
+						"x": 255,
+						"y": 282,
+						"w": 22,
+						"h": 21
+					}
+				},
+				{
+					"filename": "744",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 11,
+						"y": 6,
+						"w": 19,
+						"h": 22
+					},
+					"frame": {
+						"x": 236,
+						"y": 297,
+						"w": 19,
+						"h": 22
+					}
+				},
+				{
+					"filename": "743s",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 12,
+						"y": 5,
+						"w": 20,
+						"h": 22
+					},
+					"frame": {
+						"x": 255,
+						"y": 303,
+						"w": 20,
+						"h": 22
+					}
+				},
+				{
+					"filename": "754",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 10,
+						"y": 6,
+						"w": 20,
+						"h": 22
+					},
+					"frame": {
+						"x": 275,
+						"y": 303,
+						"w": 20,
+						"h": 22
+					}
+				},
+				{
+					"filename": "746s",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 12,
+						"y": 11,
+						"w": 18,
+						"h": 13
+					},
+					"frame": {
+						"x": 277,
+						"y": 290,
+						"w": 18,
+						"h": 13
+					}
+				},
+				{
+					"filename": "749",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -4578,17 +4305,101 @@
 						"x": 10,
 						"y": 5,
 						"w": 21,
-						"h": 21
+						"h": 23
 					},
 					"frame": {
-						"x": 476,
-						"y": 231,
+						"x": 295,
+						"y": 290,
 						"w": 21,
-						"h": 21
+						"h": 23
 					}
 				},
 				{
-					"filename": "2019s",
+					"filename": "722",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 12,
+						"y": 8,
+						"w": 17,
+						"h": 18
+					},
+					"frame": {
+						"x": 305,
+						"y": 156,
+						"w": 17,
+						"h": 18
+					}
+				},
+				{
+					"filename": "741-sensu",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 13,
+						"y": 5,
+						"w": 17,
+						"h": 23
+					},
+					"frame": {
+						"x": 310,
+						"y": 174,
+						"w": 17,
+						"h": 23
+					}
+				},
+				{
+					"filename": "741s-sensu",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 13,
+						"y": 5,
+						"w": 17,
+						"h": 23
+					},
+					"frame": {
+						"x": 310,
+						"y": 197,
+						"w": 17,
+						"h": 23
+					}
+				},
+				{
+					"filename": "737",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 12,
+						"y": 8,
+						"w": 18,
+						"h": 19
+					},
+					"frame": {
+						"x": 322,
+						"y": 155,
+						"w": 18,
+						"h": 19
+					}
+				},
+				{
+					"filename": "749s",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -4599,55 +4410,13 @@
 						"x": 10,
 						"y": 5,
 						"w": 21,
-						"h": 21
+						"h": 23
 					},
 					"frame": {
-						"x": 287,
-						"y": 211,
+						"x": 327,
+						"y": 174,
 						"w": 21,
-						"h": 21
-					}
-				},
-				{
-					"filename": "2052",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 11,
-						"y": 7,
-						"w": 21,
-						"h": 21
-					},
-					"frame": {
-						"x": 308,
-						"y": 211,
-						"w": 21,
-						"h": 21
-					}
-				},
-				{
-					"filename": "2052s",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 11,
-						"y": 7,
-						"w": 21,
-						"h": 21
-					},
-					"frame": {
-						"x": 329,
-						"y": 211,
-						"w": 21,
-						"h": 21
+						"h": 23
 					}
 				},
 				{
@@ -4665,8 +4434,8 @@
 						"h": 23
 					},
 					"frame": {
-						"x": 350,
-						"y": 211,
+						"x": 327,
+						"y": 197,
 						"w": 21,
 						"h": 23
 					}
@@ -4686,75 +4455,12 @@
 						"h": 23
 					},
 					"frame": {
-						"x": 371,
-						"y": 212,
+						"x": 318,
+						"y": 220,
 						"w": 21,
 						"h": 23
 					}
 				},
-				{
-					"filename": "743s",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 12,
-						"y": 5,
-						"w": 20,
-						"h": 22
-					},
-					"frame": {
-						"x": 392,
-						"y": 212,
-						"w": 20,
-						"h": 22
-					}
-				},
-				{
-					"filename": "739",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 11,
-						"y": 6,
-						"w": 20,
-						"h": 21
-					},
-					"frame": {
-						"x": 245,
-						"y": 213,
-						"w": 20,
-						"h": 21
-					}
-				},
-				{
-					"filename": "754",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 6,
-						"w": 20,
-						"h": 22
-					},
-					"frame": {
-						"x": 244,
-						"y": 234,
-						"w": 20,
-						"h": 22
-					}
-				},
 				{
 					"filename": "754s",
 					"rotated": false,
@@ -4770,12 +4476,33 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 244,
-						"y": 256,
+						"x": 318,
+						"y": 243,
 						"w": 20,
 						"h": 22
 					}
 				},
+				{
+					"filename": "728",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 13,
+						"y": 8,
+						"w": 17,
+						"h": 20
+					},
+					"frame": {
+						"x": 340,
+						"y": 154,
+						"w": 17,
+						"h": 20
+					}
+				},
 				{
 					"filename": "739s",
 					"rotated": false,
@@ -4791,14 +4518,14 @@
 						"h": 21
 					},
 					"frame": {
-						"x": 244,
-						"y": 278,
+						"x": 357,
+						"y": 153,
 						"w": 20,
 						"h": 21
 					}
 				},
 				{
-					"filename": "2027s",
+					"filename": "789s",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -4807,19 +4534,19 @@
 					},
 					"spriteSourceSize": {
 						"x": 10,
-						"y": 10,
-						"w": 21,
-						"h": 18
+						"y": 6,
+						"w": 23,
+						"h": 20
 					},
 					"frame": {
-						"x": 265,
-						"y": 217,
-						"w": 21,
-						"h": 18
+						"x": 348,
+						"y": 174,
+						"w": 23,
+						"h": 20
 					}
 				},
 				{
-					"filename": "744",
+					"filename": "2037s",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -4827,16 +4554,16 @@
 						"h": 30
 					},
 					"spriteSourceSize": {
-						"x": 11,
-						"y": 6,
-						"w": 19,
-						"h": 22
+						"x": 10,
+						"y": 7,
+						"w": 22,
+						"h": 21
 					},
 					"frame": {
-						"x": 264,
-						"y": 235,
-						"w": 19,
-						"h": 22
+						"x": 348,
+						"y": 194,
+						"w": 22,
+						"h": 21
 					}
 				},
 				{
@@ -4854,33 +4581,12 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 264,
-						"y": 257,
+						"x": 377,
+						"y": 150,
 						"w": 19,
 						"h": 22
 					}
 				},
-				{
-					"filename": "741-pompom",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 7,
-						"w": 20,
-						"h": 20
-					},
-					"frame": {
-						"x": 264,
-						"y": 279,
-						"w": 20,
-						"h": 20
-					}
-				},
 				{
 					"filename": "762",
 					"rotated": false,
@@ -4896,8 +4602,8 @@
 						"h": 23
 					},
 					"frame": {
-						"x": 246,
-						"y": 299,
+						"x": 319,
+						"y": 265,
 						"w": 18,
 						"h": 23
 					}
@@ -4917,54 +4623,12 @@
 						"h": 23
 					},
 					"frame": {
-						"x": 264,
-						"y": 299,
+						"x": 339,
+						"y": 220,
 						"w": 18,
 						"h": 23
 					}
 				},
-				{
-					"filename": "741-sensu",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 13,
-						"y": 5,
-						"w": 17,
-						"h": 23
-					},
-					"frame": {
-						"x": 283,
-						"y": 235,
-						"w": 17,
-						"h": 23
-					}
-				},
-				{
-					"filename": "728s",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 13,
-						"y": 8,
-						"w": 17,
-						"h": 20
-					},
-					"frame": {
-						"x": 283,
-						"y": 258,
-						"w": 17,
-						"h": 20
-					}
-				},
 				{
 					"filename": "741-pau",
 					"rotated": false,
@@ -4980,8 +4644,8 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 300,
-						"y": 232,
+						"x": 338,
+						"y": 243,
 						"w": 18,
 						"h": 22
 					}
@@ -5001,35 +4665,14 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 318,
-						"y": 232,
+						"x": 337,
+						"y": 265,
 						"w": 18,
 						"h": 22
 					}
 				},
 				{
-					"filename": "741s-pompom",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 7,
-						"w": 20,
-						"h": 20
-					},
-					"frame": {
-						"x": 300,
-						"y": 254,
-						"w": 20,
-						"h": 20
-					}
-				},
-				{
-					"filename": "723s",
+					"filename": "723",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -5043,14 +4686,14 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 284,
-						"y": 278,
+						"x": 357,
+						"y": 215,
 						"w": 17,
 						"h": 22
 					}
 				},
 				{
-					"filename": "741s-sensu",
+					"filename": "2074s",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -5058,20 +4701,20 @@
 						"h": 30
 					},
 					"spriteSourceSize": {
-						"x": 13,
-						"y": 5,
-						"w": 17,
-						"h": 23
+						"x": 8,
+						"y": 13,
+						"w": 24,
+						"h": 15
 					},
 					"frame": {
-						"x": 282,
-						"y": 300,
-						"w": 17,
-						"h": 23
+						"x": 397,
+						"y": 149,
+						"w": 24,
+						"h": 15
 					}
 				},
 				{
-					"filename": "731",
+					"filename": "741-pompom",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -5079,16 +4722,37 @@
 						"h": 30
 					},
 					"spriteSourceSize": {
-						"x": 12,
+						"x": 10,
+						"y": 7,
+						"w": 20,
+						"h": 20
+					},
+					"frame": {
+						"x": 421,
+						"y": 151,
+						"w": 20,
+						"h": 20
+					}
+				},
+				{
+					"filename": "775",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 11,
 						"y": 6,
-						"w": 17,
-						"h": 22
+						"w": 21,
+						"h": 20
 					},
 					"frame": {
-						"x": 320,
-						"y": 254,
-						"w": 17,
-						"h": 22
+						"x": 396,
+						"y": 164,
+						"w": 21,
+						"h": 20
 					}
 				},
 				{
@@ -5106,14 +4770,119 @@
 						"h": 20
 					},
 					"frame": {
-						"x": 301,
-						"y": 274,
+						"x": 377,
+						"y": 172,
 						"w": 19,
 						"h": 20
 					}
 				},
 				{
-					"filename": "722s",
+					"filename": "775s",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 11,
+						"y": 6,
+						"w": 21,
+						"h": 20
+					},
+					"frame": {
+						"x": 417,
+						"y": 171,
+						"w": 21,
+						"h": 20
+					}
+				},
+				{
+					"filename": "778-busted",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 9,
+						"y": 12,
+						"w": 21,
+						"h": 16
+					},
+					"frame": {
+						"x": 396,
+						"y": 184,
+						"w": 21,
+						"h": 16
+					}
+				},
+				{
+					"filename": "778s-busted",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 9,
+						"y": 12,
+						"w": 21,
+						"h": 16
+					},
+					"frame": {
+						"x": 417,
+						"y": 191,
+						"w": 21,
+						"h": 16
+					}
+				},
+				{
+					"filename": "779",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 10,
+						"y": 7,
+						"w": 21,
+						"h": 20
+					},
+					"frame": {
+						"x": 441,
+						"y": 166,
+						"w": 21,
+						"h": 20
+					}
+				},
+				{
+					"filename": "2019",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 10,
+						"y": 5,
+						"w": 21,
+						"h": 21
+					},
+					"frame": {
+						"x": 438,
+						"y": 186,
+						"w": 21,
+						"h": 21
+					}
+				},
+				{
+					"filename": "737s",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -5123,18 +4892,18 @@
 					"spriteSourceSize": {
 						"x": 12,
 						"y": 8,
-						"w": 17,
-						"h": 18
+						"w": 18,
+						"h": 19
 					},
 					"frame": {
-						"x": 320,
-						"y": 276,
-						"w": 17,
-						"h": 18
+						"x": 462,
+						"y": 172,
+						"w": 18,
+						"h": 19
 					}
 				},
 				{
-					"filename": "753",
+					"filename": "779s",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -5142,20 +4911,125 @@
 						"h": 30
 					},
 					"spriteSourceSize": {
-						"x": 14,
-						"y": 8,
-						"w": 14,
+						"x": 10,
+						"y": 7,
+						"w": 21,
+						"h": 20
+					},
+					"frame": {
+						"x": 480,
+						"y": 174,
+						"w": 21,
+						"h": 20
+					}
+				},
+				{
+					"filename": "790",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 10,
+						"y": 7,
+						"w": 21,
 						"h": 19
 					},
 					"frame": {
-						"x": 336,
-						"y": 232,
-						"w": 14,
+						"x": 459,
+						"y": 191,
+						"w": 21,
 						"h": 19
 					}
 				},
 				{
-					"filename": "2088",
+					"filename": "790s",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 10,
+						"y": 7,
+						"w": 21,
+						"h": 19
+					},
+					"frame": {
+						"x": 480,
+						"y": 194,
+						"w": 21,
+						"h": 19
+					}
+				},
+				{
+					"filename": "2019s",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 10,
+						"y": 5,
+						"w": 21,
+						"h": 21
+					},
+					"frame": {
+						"x": 370,
+						"y": 194,
+						"w": 21,
+						"h": 21
+					}
+				},
+				{
+					"filename": "723s",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 11,
+						"y": 5,
+						"w": 17,
+						"h": 22
+					},
+					"frame": {
+						"x": 374,
+						"y": 215,
+						"w": 17,
+						"h": 22
+					}
+				},
+				{
+					"filename": "2052",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 11,
+						"y": 7,
+						"w": 21,
+						"h": 21
+					},
+					"frame": {
+						"x": 391,
+						"y": 200,
+						"w": 21,
+						"h": 21
+					}
+				},
+				{
+					"filename": "2027",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -5169,14 +5043,56 @@
 						"h": 18
 					},
 					"frame": {
-						"x": 350,
-						"y": 234,
+						"x": 391,
+						"y": 221,
 						"w": 21,
 						"h": 18
 					}
 				},
 				{
-					"filename": "2088s",
+					"filename": "2052s",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 11,
+						"y": 7,
+						"w": 21,
+						"h": 21
+					},
+					"frame": {
+						"x": 412,
+						"y": 207,
+						"w": 21,
+						"h": 21
+					}
+				},
+				{
+					"filename": "741s-pompom",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 10,
+						"y": 7,
+						"w": 20,
+						"h": 20
+					},
+					"frame": {
+						"x": 433,
+						"y": 207,
+						"w": 20,
+						"h": 20
+					}
+				},
+				{
+					"filename": "2027s",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -5190,8 +5106,8 @@
 						"h": 18
 					},
 					"frame": {
-						"x": 371,
-						"y": 235,
+						"x": 412,
+						"y": 228,
 						"w": 21,
 						"h": 18
 					}
@@ -5211,12 +5127,75 @@
 						"h": 20
 					},
 					"frame": {
-						"x": 392,
-						"y": 234,
+						"x": 433,
+						"y": 227,
 						"w": 19,
 						"h": 20
 					}
 				},
+				{
+					"filename": "2088",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 10,
+						"y": 10,
+						"w": 21,
+						"h": 18
+					},
+					"frame": {
+						"x": 453,
+						"y": 210,
+						"w": 21,
+						"h": 18
+					}
+				},
+				{
+					"filename": "2088s",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 10,
+						"y": 10,
+						"w": 21,
+						"h": 18
+					},
+					"frame": {
+						"x": 452,
+						"y": 228,
+						"w": 21,
+						"h": 18
+					}
+				},
+				{
+					"filename": "757",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 11,
+						"y": 9,
+						"w": 19,
+						"h": 18
+					},
+					"frame": {
+						"x": 474,
+						"y": 213,
+						"w": 19,
+						"h": 18
+					}
+				},
 				{
 					"filename": "757s",
 					"rotated": false,
@@ -5232,12 +5211,54 @@
 						"h": 18
 					},
 					"frame": {
-						"x": 301,
-						"y": 294,
+						"x": 473,
+						"y": 231,
 						"w": 19,
 						"h": 18
 					}
 				},
+				{
+					"filename": "731",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 12,
+						"y": 6,
+						"w": 17,
+						"h": 22
+					},
+					"frame": {
+						"x": 316,
+						"y": 290,
+						"w": 17,
+						"h": 22
+					}
+				},
+				{
+					"filename": "771",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 13,
+						"y": 11,
+						"w": 18,
+						"h": 13
+					},
+					"frame": {
+						"x": 316,
+						"y": 312,
+						"w": 18,
+						"h": 13
+					}
+				},
 				{
 					"filename": "731s",
 					"rotated": false,
@@ -5253,12 +5274,33 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 320,
-						"y": 294,
+						"x": 333,
+						"y": 288,
 						"w": 17,
 						"h": 22
 					}
 				},
+				{
+					"filename": "736",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 12,
+						"y": 12,
+						"w": 17,
+						"h": 13
+					},
+					"frame": {
+						"x": 334,
+						"y": 310,
+						"w": 17,
+						"h": 13
+					}
+				},
 				{
 					"filename": "778-disguised",
 					"rotated": false,
@@ -5274,8 +5316,8 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 337,
-						"y": 252,
+						"x": 350,
+						"y": 287,
 						"w": 17,
 						"h": 22
 					}
@@ -5295,54 +5337,12 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 354,
-						"y": 252,
+						"x": 355,
+						"y": 265,
 						"w": 17,
 						"h": 22
 					}
 				},
-				{
-					"filename": "737",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 12,
-						"y": 8,
-						"w": 18,
-						"h": 19
-					},
-					"frame": {
-						"x": 337,
-						"y": 274,
-						"w": 18,
-						"h": 19
-					}
-				},
-				{
-					"filename": "737s",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 12,
-						"y": 8,
-						"w": 18,
-						"h": 19
-					},
-					"frame": {
-						"x": 371,
-						"y": 253,
-						"w": 18,
-						"h": 19
-					}
-				},
 				{
 					"filename": "741",
 					"rotated": false,
@@ -5358,12 +5358,96 @@
 						"h": 19
 					},
 					"frame": {
-						"x": 337,
-						"y": 293,
+						"x": 356,
+						"y": 246,
 						"w": 17,
 						"h": 19
 					}
 				},
+				{
+					"filename": "728s",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 13,
+						"y": 8,
+						"w": 17,
+						"h": 20
+					},
+					"frame": {
+						"x": 373,
+						"y": 237,
+						"w": 17,
+						"h": 20
+					}
+				},
+				{
+					"filename": "722s",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 12,
+						"y": 8,
+						"w": 17,
+						"h": 18
+					},
+					"frame": {
+						"x": 390,
+						"y": 239,
+						"w": 17,
+						"h": 18
+					}
+				},
+				{
+					"filename": "736s",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 12,
+						"y": 12,
+						"w": 17,
+						"h": 13
+					},
+					"frame": {
+						"x": 351,
+						"y": 309,
+						"w": 17,
+						"h": 13
+					}
+				},
+				{
+					"filename": "771s",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 13,
+						"y": 11,
+						"w": 18,
+						"h": 13
+					},
+					"frame": {
+						"x": 373,
+						"y": 257,
+						"w": 18,
+						"h": 13
+					}
+				},
 				{
 					"filename": "741s",
 					"rotated": false,
@@ -5379,8 +5463,8 @@
 						"h": 19
 					},
 					"frame": {
-						"x": 355,
-						"y": 274,
+						"x": 372,
+						"y": 270,
 						"w": 17,
 						"h": 19
 					}
@@ -5400,12 +5484,33 @@
 						"h": 19
 					},
 					"frame": {
-						"x": 354,
-						"y": 293,
+						"x": 367,
+						"y": 289,
 						"w": 17,
 						"h": 19
 					}
 				},
+				{
+					"filename": "808",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 12,
+						"y": 11,
+						"w": 17,
+						"h": 17
+					},
+					"frame": {
+						"x": 368,
+						"y": 308,
+						"w": 17,
+						"h": 17
+					}
+				},
 				{
 					"filename": "759s",
 					"rotated": false,
@@ -5421,96 +5526,12 @@
 						"h": 19
 					},
 					"frame": {
-						"x": 372,
-						"y": 272,
+						"x": 391,
+						"y": 257,
 						"w": 17,
 						"h": 19
 					}
 				},
-				{
-					"filename": "777",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 13,
-						"y": 8,
-						"w": 17,
-						"h": 19
-					},
-					"frame": {
-						"x": 389,
-						"y": 254,
-						"w": 17,
-						"h": 19
-					}
-				},
-				{
-					"filename": "774",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 11,
-						"y": 8,
-						"w": 17,
-						"h": 18
-					},
-					"frame": {
-						"x": 389,
-						"y": 273,
-						"w": 17,
-						"h": 18
-					}
-				},
-				{
-					"filename": "774s",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 11,
-						"y": 8,
-						"w": 17,
-						"h": 18
-					},
-					"frame": {
-						"x": 389,
-						"y": 273,
-						"w": 17,
-						"h": 18
-					}
-				},
-				{
-					"filename": "753s",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 14,
-						"y": 8,
-						"w": 14,
-						"h": 19
-					},
-					"frame": {
-						"x": 406,
-						"y": 254,
-						"w": 14,
-						"h": 19
-					}
-				},
 				{
 					"filename": "774-blue",
 					"rotated": false,
@@ -5526,35 +5547,14 @@
 						"h": 18
 					},
 					"frame": {
-						"x": 406,
-						"y": 273,
+						"x": 389,
+						"y": 276,
 						"w": 17,
 						"h": 18
 					}
 				},
 				{
-					"filename": "746s",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 12,
-						"y": 11,
-						"w": 18,
-						"h": 13
-					},
-					"frame": {
-						"x": 423,
-						"y": 231,
-						"w": 18,
-						"h": 13
-					}
-				},
-				{
-					"filename": "777s",
+					"filename": "777",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -5568,54 +5568,12 @@
 						"h": 19
 					},
 					"frame": {
-						"x": 420,
-						"y": 244,
+						"x": 408,
+						"y": 246,
 						"w": 17,
 						"h": 19
 					}
 				},
-				{
-					"filename": "771",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 13,
-						"y": 11,
-						"w": 18,
-						"h": 13
-					},
-					"frame": {
-						"x": 437,
-						"y": 244,
-						"w": 18,
-						"h": 13
-					}
-				},
-				{
-					"filename": "771s",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 13,
-						"y": 11,
-						"w": 18,
-						"h": 13
-					},
-					"frame": {
-						"x": 437,
-						"y": 257,
-						"w": 18,
-						"h": 13
-					}
-				},
 				{
 					"filename": "774-green",
 					"rotated": false,
@@ -5631,12 +5589,33 @@
 						"h": 18
 					},
 					"frame": {
-						"x": 455,
-						"y": 252,
+						"x": 408,
+						"y": 265,
 						"w": 17,
 						"h": 18
 					}
 				},
+				{
+					"filename": "777s",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 13,
+						"y": 8,
+						"w": 17,
+						"h": 19
+					},
+					"frame": {
+						"x": 425,
+						"y": 247,
+						"w": 17,
+						"h": 19
+					}
+				},
 				{
 					"filename": "774-indigo",
 					"rotated": false,
@@ -5652,14 +5631,14 @@
 						"h": 18
 					},
 					"frame": {
-						"x": 472,
-						"y": 252,
+						"x": 425,
+						"y": 266,
 						"w": 17,
 						"h": 18
 					}
 				},
 				{
-					"filename": "736",
+					"filename": "751",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -5667,37 +5646,16 @@
 						"h": 30
 					},
 					"spriteSourceSize": {
-						"x": 12,
-						"y": 12,
-						"w": 17,
-						"h": 13
+						"x": 13,
+						"y": 8,
+						"w": 14,
+						"h": 20
 					},
 					"frame": {
-						"x": 372,
-						"y": 291,
-						"w": 17,
-						"h": 13
-					}
-				},
-				{
-					"filename": "736s",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 12,
-						"y": 12,
-						"w": 17,
-						"h": 13
-					},
-					"frame": {
-						"x": 389,
-						"y": 291,
-						"w": 17,
-						"h": 13
+						"x": 442,
+						"y": 247,
+						"w": 14,
+						"h": 20
 					}
 				},
 				{
@@ -5715,8 +5673,8 @@
 						"h": 18
 					},
 					"frame": {
-						"x": 406,
-						"y": 291,
+						"x": 456,
+						"y": 246,
 						"w": 17,
 						"h": 18
 					}
@@ -5736,12 +5694,33 @@
 						"h": 18
 					},
 					"frame": {
-						"x": 371,
-						"y": 304,
+						"x": 473,
+						"y": 249,
 						"w": 17,
 						"h": 18
 					}
 				},
+				{
+					"filename": "751s",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 13,
+						"y": 8,
+						"w": 14,
+						"h": 20
+					},
+					"frame": {
+						"x": 442,
+						"y": 267,
+						"w": 14,
+						"h": 20
+					}
+				},
 				{
 					"filename": "774-violet",
 					"rotated": false,
@@ -5757,8 +5736,8 @@
 						"h": 18
 					},
 					"frame": {
-						"x": 388,
-						"y": 304,
+						"x": 456,
+						"y": 264,
 						"w": 17,
 						"h": 18
 					}
@@ -5778,8 +5757,29 @@
 						"h": 18
 					},
 					"frame": {
-						"x": 423,
-						"y": 270,
+						"x": 473,
+						"y": 267,
+						"w": 17,
+						"h": 18
+					}
+				},
+				{
+					"filename": "774",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 11,
+						"y": 8,
+						"w": 17,
+						"h": 18
+					},
+					"frame": {
+						"x": 406,
+						"y": 283,
 						"w": 17,
 						"h": 18
 					}
@@ -5800,32 +5800,11 @@
 					},
 					"frame": {
 						"x": 423,
-						"y": 288,
+						"y": 284,
 						"w": 17,
 						"h": 18
 					}
 				},
-				{
-					"filename": "808",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 12,
-						"y": 11,
-						"w": 17,
-						"h": 17
-					},
-					"frame": {
-						"x": 423,
-						"y": 306,
-						"w": 17,
-						"h": 17
-					}
-				},
 				{
 					"filename": "774s-green",
 					"rotated": false,
@@ -5842,11 +5821,32 @@
 					},
 					"frame": {
 						"x": 440,
-						"y": 270,
+						"y": 287,
 						"w": 17,
 						"h": 18
 					}
 				},
+				{
+					"filename": "753",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 14,
+						"y": 8,
+						"w": 14,
+						"h": 19
+					},
+					"frame": {
+						"x": 457,
+						"y": 282,
+						"w": 14,
+						"h": 19
+					}
+				},
 				{
 					"filename": "774s-indigo",
 					"rotated": false,
@@ -5862,14 +5862,14 @@
 						"h": 18
 					},
 					"frame": {
-						"x": 440,
-						"y": 288,
+						"x": 471,
+						"y": 285,
 						"w": 17,
 						"h": 18
 					}
 				},
 				{
-					"filename": "808s",
+					"filename": "753s",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -5877,16 +5877,16 @@
 						"h": 30
 					},
 					"spriteSourceSize": {
-						"x": 12,
-						"y": 11,
-						"w": 17,
-						"h": 17
+						"x": 14,
+						"y": 8,
+						"w": 14,
+						"h": 19
 					},
 					"frame": {
-						"x": 440,
-						"y": 306,
-						"w": 17,
-						"h": 17
+						"x": 488,
+						"y": 285,
+						"w": 14,
+						"h": 19
 					}
 				},
 				{
@@ -5904,8 +5904,8 @@
 						"h": 18
 					},
 					"frame": {
-						"x": 457,
-						"y": 270,
+						"x": 385,
+						"y": 294,
 						"w": 17,
 						"h": 18
 					}
@@ -5925,8 +5925,8 @@
 						"h": 18
 					},
 					"frame": {
-						"x": 457,
-						"y": 288,
+						"x": 402,
+						"y": 301,
 						"w": 17,
 						"h": 18
 					}
@@ -5946,8 +5946,8 @@
 						"h": 18
 					},
 					"frame": {
-						"x": 474,
-						"y": 270,
+						"x": 419,
+						"y": 302,
 						"w": 17,
 						"h": 18
 					}
@@ -5967,11 +5967,53 @@
 						"h": 18
 					},
 					"frame": {
-						"x": 474,
-						"y": 288,
+						"x": 436,
+						"y": 305,
 						"w": 17,
 						"h": 18
 					}
+				},
+				{
+					"filename": "774s",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 11,
+						"y": 8,
+						"w": 17,
+						"h": 18
+					},
+					"frame": {
+						"x": 453,
+						"y": 305,
+						"w": 17,
+						"h": 18
+					}
+				},
+				{
+					"filename": "808s",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 12,
+						"y": 11,
+						"w": 17,
+						"h": 17
+					},
+					"frame": {
+						"x": 470,
+						"y": 303,
+						"w": 17,
+						"h": 17
+					}
 				}
 			]
 		}
@@ -5979,6 +6021,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:a4de8d1c4f7d4f58c929b8b5479e03f1:3c8ac308e19a7f9420a4df8a78188490:2e7c5873ead8fd8fce82a0b3fcc86b42$"
+		"smartupdate": "$TexturePacker:SmartUpdate:5861cb99c3db0943f1ccef3b0e1b4683:26656a692718930d92be5b6aba391ced:2e7c5873ead8fd8fce82a0b3fcc86b42$"
 	}
 }
diff --git a/public/images/pokemon_icons_7.png b/public/images/pokemon_icons_7.png
index c9a396ed5c6..5e6421360fd 100644
Binary files a/public/images/pokemon_icons_7.png and b/public/images/pokemon_icons_7.png differ
diff --git a/public/images/pokemon_icons_7v.json b/public/images/pokemon_icons_7v.json
index 30e12ce3bb4..6a353fffe94 100644
--- a/public/images/pokemon_icons_7v.json
+++ b/public/images/pokemon_icons_7v.json
@@ -4,8 +4,8 @@
 			"image": "pokemon_icons_7v.png",
 			"format": "RGBA8888",
 			"size": {
-				"w": 440,
-				"h": 440
+				"w": 450,
+				"h": 450
 			},
 			"scale": 1,
 			"frames": [
@@ -304,7 +304,7 @@
 					}
 				},
 				{
-					"filename": "747_2",
+					"filename": "746-school_2",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
@@ -324,6 +324,90 @@
 						"h": 30
 					}
 				},
+				{
+					"filename": "746-school_3",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 160,
+						"y": 30,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "746_2",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 200,
+						"y": 30,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "746_3",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 240,
+						"y": 30,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "747_2",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 280,
+						"y": 30,
+						"w": 40,
+						"h": 30
+					}
+				},
 				{
 					"filename": "747_3",
 					"rotated": false,
@@ -339,7 +423,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 160,
+						"x": 320,
 						"y": 30,
 						"w": 40,
 						"h": 30
@@ -360,7 +444,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 200,
+						"x": 360,
 						"y": 30,
 						"w": 40,
 						"h": 30
@@ -381,7 +465,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 240,
+						"x": 400,
 						"y": 30,
 						"w": 40,
 						"h": 30
@@ -402,8 +486,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 280,
-						"y": 30,
+						"x": 0,
+						"y": 60,
 						"w": 40,
 						"h": 30
 					}
@@ -423,8 +507,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 320,
-						"y": 30,
+						"x": 40,
+						"y": 60,
 						"w": 40,
 						"h": 30
 					}
@@ -444,8 +528,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 360,
-						"y": 30,
+						"x": 80,
+						"y": 60,
 						"w": 40,
 						"h": 30
 					}
@@ -465,8 +549,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 400,
-						"y": 30,
+						"x": 120,
+						"y": 60,
 						"w": 40,
 						"h": 30
 					}
@@ -486,7 +570,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 0,
+						"x": 160,
 						"y": 60,
 						"w": 40,
 						"h": 30
@@ -507,7 +591,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 40,
+						"x": 200,
 						"y": 60,
 						"w": 40,
 						"h": 30
@@ -528,7 +612,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 80,
+						"x": 240,
 						"y": 60,
 						"w": 40,
 						"h": 30
@@ -549,7 +633,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 120,
+						"x": 280,
 						"y": 60,
 						"w": 40,
 						"h": 30
@@ -570,7 +654,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 160,
+						"x": 320,
 						"y": 60,
 						"w": 40,
 						"h": 30
@@ -591,7 +675,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 200,
+						"x": 360,
 						"y": 60,
 						"w": 40,
 						"h": 30
@@ -612,7 +696,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 240,
+						"x": 400,
 						"y": 60,
 						"w": 40,
 						"h": 30
@@ -633,8 +717,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 280,
-						"y": 60,
+						"x": 0,
+						"y": 90,
 						"w": 40,
 						"h": 30
 					}
@@ -654,8 +738,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 320,
-						"y": 60,
+						"x": 40,
+						"y": 90,
 						"w": 40,
 						"h": 30
 					}
@@ -675,8 +759,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 360,
-						"y": 60,
+						"x": 80,
+						"y": 90,
 						"w": 40,
 						"h": 30
 					}
@@ -696,8 +780,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 400,
-						"y": 60,
+						"x": 120,
+						"y": 90,
 						"w": 40,
 						"h": 30
 					}
@@ -717,7 +801,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 0,
+						"x": 160,
 						"y": 90,
 						"w": 40,
 						"h": 30
@@ -738,7 +822,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 40,
+						"x": 200,
 						"y": 90,
 						"w": 40,
 						"h": 30
@@ -759,7 +843,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 80,
+						"x": 240,
 						"y": 90,
 						"w": 40,
 						"h": 30
@@ -780,7 +864,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 120,
+						"x": 280,
 						"y": 90,
 						"w": 40,
 						"h": 30
@@ -801,7 +885,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 160,
+						"x": 320,
 						"y": 90,
 						"w": 40,
 						"h": 30
@@ -822,7 +906,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 200,
+						"x": 360,
 						"y": 90,
 						"w": 40,
 						"h": 30
@@ -843,7 +927,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 240,
+						"x": 400,
 						"y": 90,
 						"w": 40,
 						"h": 30
@@ -864,8 +948,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 280,
-						"y": 90,
+						"x": 0,
+						"y": 120,
 						"w": 40,
 						"h": 30
 					}
@@ -885,8 +969,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 320,
-						"y": 90,
+						"x": 40,
+						"y": 120,
 						"w": 40,
 						"h": 30
 					}
@@ -906,8 +990,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 360,
-						"y": 90,
+						"x": 80,
+						"y": 120,
 						"w": 40,
 						"h": 30
 					}
@@ -927,8 +1011,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 400,
-						"y": 90,
+						"x": 120,
+						"y": 120,
 						"w": 40,
 						"h": 30
 					}
@@ -948,7 +1032,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 0,
+						"x": 160,
 						"y": 120,
 						"w": 40,
 						"h": 30
@@ -969,7 +1053,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 40,
+						"x": 200,
 						"y": 120,
 						"w": 40,
 						"h": 30
@@ -990,7 +1074,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 80,
+						"x": 240,
 						"y": 120,
 						"w": 40,
 						"h": 30
@@ -1011,7 +1095,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 120,
+						"x": 280,
 						"y": 120,
 						"w": 40,
 						"h": 30
@@ -1032,7 +1116,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 160,
+						"x": 320,
 						"y": 120,
 						"w": 40,
 						"h": 30
@@ -1053,7 +1137,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 200,
+						"x": 360,
 						"y": 120,
 						"w": 40,
 						"h": 30
@@ -1074,7 +1158,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 240,
+						"x": 400,
 						"y": 120,
 						"w": 40,
 						"h": 30
@@ -1095,8 +1179,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 280,
-						"y": 120,
+						"x": 0,
+						"y": 150,
 						"w": 40,
 						"h": 30
 					}
@@ -1116,8 +1200,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 320,
-						"y": 120,
+						"x": 40,
+						"y": 150,
 						"w": 40,
 						"h": 30
 					}
@@ -1137,8 +1221,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 360,
-						"y": 120,
+						"x": 80,
+						"y": 150,
 						"w": 40,
 						"h": 30
 					}
@@ -1158,8 +1242,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 400,
-						"y": 120,
+						"x": 120,
+						"y": 150,
 						"w": 40,
 						"h": 30
 					}
@@ -1179,7 +1263,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 0,
+						"x": 160,
 						"y": 150,
 						"w": 40,
 						"h": 30
@@ -1200,7 +1284,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 40,
+						"x": 200,
 						"y": 150,
 						"w": 40,
 						"h": 30
@@ -1221,7 +1305,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 80,
+						"x": 240,
 						"y": 150,
 						"w": 40,
 						"h": 30
@@ -1242,7 +1326,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 120,
+						"x": 280,
 						"y": 150,
 						"w": 40,
 						"h": 30
@@ -1263,7 +1347,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 160,
+						"x": 320,
 						"y": 150,
 						"w": 40,
 						"h": 30
@@ -1284,7 +1368,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 200,
+						"x": 360,
 						"y": 150,
 						"w": 40,
 						"h": 30
@@ -1305,7 +1389,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 240,
+						"x": 400,
 						"y": 150,
 						"w": 40,
 						"h": 30
@@ -1326,8 +1410,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 280,
-						"y": 150,
+						"x": 0,
+						"y": 180,
 						"w": 40,
 						"h": 30
 					}
@@ -1347,8 +1431,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 320,
-						"y": 150,
+						"x": 40,
+						"y": 180,
 						"w": 40,
 						"h": 30
 					}
@@ -1368,8 +1452,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 360,
-						"y": 150,
+						"x": 80,
+						"y": 180,
 						"w": 40,
 						"h": 30
 					}
@@ -1389,8 +1473,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 400,
-						"y": 150,
+						"x": 120,
+						"y": 180,
 						"w": 40,
 						"h": 30
 					}
@@ -1410,7 +1494,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 0,
+						"x": 160,
 						"y": 180,
 						"w": 40,
 						"h": 30
@@ -1431,7 +1515,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 40,
+						"x": 200,
 						"y": 180,
 						"w": 40,
 						"h": 30
@@ -1452,7 +1536,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 80,
+						"x": 240,
 						"y": 180,
 						"w": 40,
 						"h": 30
@@ -1473,7 +1557,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 120,
+						"x": 280,
 						"y": 180,
 						"w": 40,
 						"h": 30
@@ -1494,7 +1578,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 160,
+						"x": 320,
 						"y": 180,
 						"w": 40,
 						"h": 30
@@ -1515,7 +1599,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 200,
+						"x": 360,
 						"y": 180,
 						"w": 40,
 						"h": 30
@@ -1536,7 +1620,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 240,
+						"x": 400,
 						"y": 180,
 						"w": 40,
 						"h": 30
@@ -1557,8 +1641,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 280,
-						"y": 180,
+						"x": 0,
+						"y": 210,
 						"w": 40,
 						"h": 30
 					}
@@ -1578,8 +1662,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 320,
-						"y": 180,
+						"x": 40,
+						"y": 210,
 						"w": 40,
 						"h": 30
 					}
@@ -1599,8 +1683,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 360,
-						"y": 180,
+						"x": 80,
+						"y": 210,
 						"w": 40,
 						"h": 30
 					}
@@ -1620,8 +1704,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 400,
-						"y": 180,
+						"x": 120,
+						"y": 210,
 						"w": 40,
 						"h": 30
 					}
@@ -1641,7 +1725,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 0,
+						"x": 160,
 						"y": 210,
 						"w": 40,
 						"h": 30
@@ -1662,7 +1746,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 40,
+						"x": 200,
 						"y": 210,
 						"w": 40,
 						"h": 30
@@ -1683,7 +1767,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 80,
+						"x": 240,
 						"y": 210,
 						"w": 40,
 						"h": 30
@@ -1704,7 +1788,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 120,
+						"x": 280,
 						"y": 210,
 						"w": 40,
 						"h": 30
@@ -1725,7 +1809,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 160,
+						"x": 320,
 						"y": 210,
 						"w": 40,
 						"h": 30
@@ -1746,7 +1830,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 200,
+						"x": 360,
 						"y": 210,
 						"w": 40,
 						"h": 30
@@ -1767,7 +1851,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 240,
+						"x": 400,
 						"y": 210,
 						"w": 40,
 						"h": 30
@@ -1788,8 +1872,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 280,
-						"y": 210,
+						"x": 0,
+						"y": 240,
 						"w": 40,
 						"h": 30
 					}
@@ -1809,8 +1893,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 320,
-						"y": 210,
+						"x": 40,
+						"y": 240,
 						"w": 40,
 						"h": 30
 					}
@@ -1830,8 +1914,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 360,
-						"y": 210,
+						"x": 80,
+						"y": 240,
 						"w": 40,
 						"h": 30
 					}
@@ -1851,8 +1935,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 400,
-						"y": 210,
+						"x": 120,
+						"y": 240,
 						"w": 40,
 						"h": 30
 					}
@@ -1872,7 +1956,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 0,
+						"x": 160,
 						"y": 240,
 						"w": 40,
 						"h": 30
@@ -1893,12 +1977,180 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 40,
+						"x": 200,
 						"y": 240,
 						"w": 40,
 						"h": 30
 					}
 				},
+				{
+					"filename": "780_2",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 240,
+						"y": 240,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "780_3",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 280,
+						"y": 240,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "782_2",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 320,
+						"y": 240,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "782_3",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 360,
+						"y": 240,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "783_2",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 400,
+						"y": 240,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "783_3",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 0,
+						"y": 270,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "784_2",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 40,
+						"y": 270,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "784_3",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 80,
+						"y": 270,
+						"w": 40,
+						"h": 30
+					}
+				},
 				{
 					"filename": "789_1",
 					"rotated": false,
@@ -1914,8 +2166,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 80,
-						"y": 240,
+						"x": 120,
+						"y": 270,
 						"w": 40,
 						"h": 30
 					}
@@ -1935,8 +2187,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 120,
-						"y": 240,
+						"x": 160,
+						"y": 270,
 						"w": 40,
 						"h": 30
 					}
@@ -1956,8 +2208,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 160,
-						"y": 240,
+						"x": 200,
+						"y": 270,
 						"w": 40,
 						"h": 30
 					}
@@ -1977,8 +2229,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 200,
-						"y": 240,
+						"x": 240,
+						"y": 270,
 						"w": 40,
 						"h": 30
 					}
@@ -1998,8 +2250,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 240,
-						"y": 240,
+						"x": 280,
+						"y": 270,
 						"w": 40,
 						"h": 30
 					}
@@ -2019,8 +2271,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 280,
-						"y": 240,
+						"x": 320,
+						"y": 270,
 						"w": 40,
 						"h": 30
 					}
@@ -2040,8 +2292,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 320,
-						"y": 240,
+						"x": 360,
+						"y": 270,
 						"w": 40,
 						"h": 30
 					}
@@ -2061,8 +2313,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 360,
-						"y": 240,
+						"x": 400,
+						"y": 270,
 						"w": 40,
 						"h": 30
 					}
@@ -2082,8 +2334,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 400,
-						"y": 240,
+						"x": 0,
+						"y": 300,
 						"w": 40,
 						"h": 30
 					}
@@ -2103,8 +2355,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 0,
-						"y": 270,
+						"x": 40,
+						"y": 300,
 						"w": 40,
 						"h": 30
 					}
@@ -2124,8 +2376,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 40,
-						"y": 270,
+						"x": 80,
+						"y": 300,
 						"w": 40,
 						"h": 30
 					}
@@ -2145,8 +2397,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 80,
-						"y": 270,
+						"x": 120,
+						"y": 300,
 						"w": 40,
 						"h": 30
 					}
@@ -2166,8 +2418,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 120,
-						"y": 270,
+						"x": 160,
+						"y": 300,
 						"w": 40,
 						"h": 30
 					}
@@ -2187,8 +2439,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 160,
-						"y": 270,
+						"x": 200,
+						"y": 300,
 						"w": 40,
 						"h": 30
 					}
@@ -2208,8 +2460,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 200,
-						"y": 270,
+						"x": 240,
+						"y": 300,
 						"w": 40,
 						"h": 30
 					}
@@ -2229,8 +2481,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 240,
-						"y": 270,
+						"x": 280,
+						"y": 300,
 						"w": 40,
 						"h": 30
 					}
@@ -2250,8 +2502,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 280,
-						"y": 270,
+						"x": 320,
+						"y": 300,
 						"w": 40,
 						"h": 30
 					}
@@ -2271,8 +2523,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 320,
-						"y": 270,
+						"x": 360,
+						"y": 300,
 						"w": 40,
 						"h": 30
 					}
@@ -2292,8 +2544,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 360,
-						"y": 270,
+						"x": 400,
+						"y": 300,
 						"w": 40,
 						"h": 30
 					}
@@ -2313,8 +2565,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 400,
-						"y": 270,
+						"x": 0,
+						"y": 330,
 						"w": 40,
 						"h": 30
 					}
@@ -2334,8 +2586,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 0,
-						"y": 300,
+						"x": 40,
+						"y": 330,
 						"w": 40,
 						"h": 30
 					}
@@ -2355,8 +2607,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 40,
-						"y": 300,
+						"x": 80,
+						"y": 330,
 						"w": 40,
 						"h": 30
 					}
@@ -2376,8 +2628,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 80,
-						"y": 300,
+						"x": 120,
+						"y": 330,
 						"w": 40,
 						"h": 30
 					}
@@ -2397,8 +2649,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 120,
-						"y": 300,
+						"x": 160,
+						"y": 330,
 						"w": 40,
 						"h": 30
 					}
@@ -2418,8 +2670,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 160,
-						"y": 300,
+						"x": 200,
+						"y": 330,
 						"w": 40,
 						"h": 30
 					}
@@ -2439,8 +2691,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 200,
-						"y": 300,
+						"x": 240,
+						"y": 330,
 						"w": 40,
 						"h": 30
 					}
@@ -2460,8 +2712,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 240,
-						"y": 300,
+						"x": 280,
+						"y": 330,
 						"w": 40,
 						"h": 30
 					}
@@ -2481,8 +2733,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 280,
-						"y": 300,
+						"x": 320,
+						"y": 330,
 						"w": 40,
 						"h": 30
 					}
@@ -2502,8 +2754,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 320,
-						"y": 300,
+						"x": 360,
+						"y": 330,
 						"w": 40,
 						"h": 30
 					}
@@ -2523,8 +2775,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 360,
-						"y": 300,
+						"x": 400,
+						"y": 330,
 						"w": 40,
 						"h": 30
 					}
@@ -2544,8 +2796,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 400,
-						"y": 300,
+						"x": 0,
+						"y": 360,
 						"w": 40,
 						"h": 30
 					}
@@ -2565,8 +2817,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 0,
-						"y": 330,
+						"x": 40,
+						"y": 360,
 						"w": 40,
 						"h": 30
 					}
@@ -2586,8 +2838,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 40,
-						"y": 330,
+						"x": 80,
+						"y": 360,
 						"w": 40,
 						"h": 30
 					}
@@ -2607,8 +2859,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 80,
-						"y": 330,
+						"x": 120,
+						"y": 360,
 						"w": 40,
 						"h": 30
 					}
@@ -2628,8 +2880,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 120,
-						"y": 330,
+						"x": 160,
+						"y": 360,
 						"w": 40,
 						"h": 30
 					}
@@ -2649,8 +2901,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 160,
-						"y": 330,
+						"x": 200,
+						"y": 360,
 						"w": 40,
 						"h": 30
 					}
@@ -2670,8 +2922,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 200,
-						"y": 330,
+						"x": 240,
+						"y": 360,
 						"w": 40,
 						"h": 30
 					}
@@ -2691,8 +2943,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 240,
-						"y": 330,
+						"x": 280,
+						"y": 360,
 						"w": 40,
 						"h": 30
 					}
@@ -2712,8 +2964,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 280,
-						"y": 330,
+						"x": 320,
+						"y": 360,
 						"w": 40,
 						"h": 30
 					}
@@ -2733,8 +2985,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 320,
-						"y": 330,
+						"x": 360,
+						"y": 360,
 						"w": 40,
 						"h": 30
 					}
@@ -2754,8 +3006,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 360,
-						"y": 330,
+						"x": 400,
+						"y": 360,
 						"w": 40,
 						"h": 30
 					}
@@ -2775,8 +3027,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 400,
-						"y": 330,
+						"x": 0,
+						"y": 390,
 						"w": 40,
 						"h": 30
 					}
@@ -2796,8 +3048,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 0,
-						"y": 360,
+						"x": 40,
+						"y": 390,
 						"w": 40,
 						"h": 30
 					}
@@ -2817,8 +3069,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 40,
-						"y": 360,
+						"x": 80,
+						"y": 390,
 						"w": 40,
 						"h": 30
 					}
@@ -2838,8 +3090,92 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 80,
-						"y": 360,
+						"x": 120,
+						"y": 390,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "2037_2",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 160,
+						"y": 390,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "2037_3",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 200,
+						"y": 390,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "2038_2",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 240,
+						"y": 390,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "2038_3",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 280,
+						"y": 390,
 						"w": 40,
 						"h": 30
 					}
@@ -2859,8 +3195,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 120,
-						"y": 360,
+						"x": 320,
+						"y": 390,
 						"w": 40,
 						"h": 30
 					}
@@ -2880,8 +3216,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 160,
-						"y": 360,
+						"x": 360,
+						"y": 390,
 						"w": 40,
 						"h": 30
 					}
@@ -2901,8 +3237,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 200,
-						"y": 360,
+						"x": 400,
+						"y": 390,
 						"w": 40,
 						"h": 30
 					}
@@ -2922,8 +3258,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 240,
-						"y": 360,
+						"x": 0,
+						"y": 420,
 						"w": 40,
 						"h": 30
 					}
@@ -2943,8 +3279,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 280,
-						"y": 360,
+						"x": 40,
+						"y": 420,
 						"w": 40,
 						"h": 30
 					}
@@ -2964,8 +3300,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 320,
-						"y": 360,
+						"x": 80,
+						"y": 420,
 						"w": 40,
 						"h": 30
 					}
@@ -2976,6 +3312,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:914c9869d6dab145bbbe443bdc3f932c:80b9ecf9647b68af17c07b88e1a1856e:d5975df27e1e94206a68aa1fd3c2c8d0$"
+		"smartupdate": "$TexturePacker:SmartUpdate:0780b00fda53c3fbd0b6e554e89a6818:b96a0f88bd707a9967af73e7bdf13031:d5975df27e1e94206a68aa1fd3c2c8d0$"
 	}
 }
diff --git a/public/images/pokemon_icons_7v.png b/public/images/pokemon_icons_7v.png
index 1f7d6e5f826..12c81de925c 100644
Binary files a/public/images/pokemon_icons_7v.png and b/public/images/pokemon_icons_7v.png differ
diff --git a/public/images/pokemon_icons_8v.json b/public/images/pokemon_icons_8v.json
index a33f88e9d9b..4b1877878a5 100644
--- a/public/images/pokemon_icons_8v.json
+++ b/public/images/pokemon_icons_8v.json
@@ -4,8 +4,8 @@
 			"image": "pokemon_icons_8v.png",
 			"format": "RGBA8888",
 			"size": {
-				"w": 510,
-				"h": 510
+				"w": 520,
+				"h": 520
 			},
 			"scale": 1,
 			"frames": [
@@ -276,8 +276,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 0,
-						"y": 30,
+						"x": 480,
+						"y": 0,
 						"w": 40,
 						"h": 30
 					}
@@ -297,7 +297,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 40,
+						"x": 0,
 						"y": 30,
 						"w": 40,
 						"h": 30
@@ -318,7 +318,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 80,
+						"x": 40,
 						"y": 30,
 						"w": 40,
 						"h": 30
@@ -339,7 +339,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 120,
+						"x": 80,
 						"y": 30,
 						"w": 40,
 						"h": 30
@@ -360,7 +360,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 160,
+						"x": 120,
 						"y": 30,
 						"w": 40,
 						"h": 30
@@ -381,7 +381,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 200,
+						"x": 160,
 						"y": 30,
 						"w": 40,
 						"h": 30
@@ -402,7 +402,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 240,
+						"x": 200,
 						"y": 30,
 						"w": 40,
 						"h": 30
@@ -423,7 +423,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 280,
+						"x": 240,
 						"y": 30,
 						"w": 40,
 						"h": 30
@@ -444,7 +444,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 320,
+						"x": 280,
 						"y": 30,
 						"w": 40,
 						"h": 30
@@ -465,7 +465,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 360,
+						"x": 320,
 						"y": 30,
 						"w": 40,
 						"h": 30
@@ -486,7 +486,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 400,
+						"x": 360,
 						"y": 30,
 						"w": 40,
 						"h": 30
@@ -506,6 +506,27 @@
 						"w": 40,
 						"h": 30
 					},
+					"frame": {
+						"x": 400,
+						"y": 30,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "840_2",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
 					"frame": {
 						"x": 440,
 						"y": 30,
@@ -513,6 +534,195 @@
 						"h": 30
 					}
 				},
+				{
+					"filename": "840_3",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 480,
+						"y": 30,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "841-gigantamax_2",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 0,
+						"y": 60,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "842-gigantamax_2",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 0,
+						"y": 60,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "841-gigantamax_3",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 40,
+						"y": 60,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "842-gigantamax_3",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 40,
+						"y": 60,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "841_2",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 80,
+						"y": 60,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "841_3",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 120,
+						"y": 60,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "842_2",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 160,
+						"y": 60,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "842_3",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 200,
+						"y": 60,
+						"w": 40,
+						"h": 30
+					}
+				},
 				{
 					"filename": "850_2",
 					"rotated": false,
@@ -528,7 +738,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 0,
+						"x": 240,
 						"y": 60,
 						"w": 40,
 						"h": 30
@@ -549,7 +759,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 40,
+						"x": 280,
 						"y": 60,
 						"w": 40,
 						"h": 30
@@ -570,7 +780,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 80,
+						"x": 320,
 						"y": 60,
 						"w": 40,
 						"h": 30
@@ -591,7 +801,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 120,
+						"x": 360,
 						"y": 60,
 						"w": 40,
 						"h": 30
@@ -612,7 +822,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 160,
+						"x": 400,
 						"y": 60,
 						"w": 40,
 						"h": 30
@@ -633,7 +843,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 200,
+						"x": 440,
 						"y": 60,
 						"w": 40,
 						"h": 30
@@ -654,7 +864,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 240,
+						"x": 480,
 						"y": 60,
 						"w": 40,
 						"h": 30
@@ -675,8 +885,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 280,
-						"y": 60,
+						"x": 0,
+						"y": 90,
 						"w": 40,
 						"h": 30
 					}
@@ -696,8 +906,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 320,
-						"y": 60,
+						"x": 40,
+						"y": 90,
 						"w": 40,
 						"h": 30
 					}
@@ -717,8 +927,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 360,
-						"y": 60,
+						"x": 80,
+						"y": 90,
 						"w": 40,
 						"h": 30
 					}
@@ -738,8 +948,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 400,
-						"y": 60,
+						"x": 120,
+						"y": 90,
 						"w": 40,
 						"h": 30
 					}
@@ -759,8 +969,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 440,
-						"y": 60,
+						"x": 160,
+						"y": 90,
 						"w": 40,
 						"h": 30
 					}
@@ -780,7 +990,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 0,
+						"x": 200,
 						"y": 90,
 						"w": 40,
 						"h": 30
@@ -801,7 +1011,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 40,
+						"x": 240,
 						"y": 90,
 						"w": 40,
 						"h": 30
@@ -822,7 +1032,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 80,
+						"x": 280,
 						"y": 90,
 						"w": 40,
 						"h": 30
@@ -843,7 +1053,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 120,
+						"x": 320,
 						"y": 90,
 						"w": 40,
 						"h": 30
@@ -864,7 +1074,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 160,
+						"x": 360,
 						"y": 90,
 						"w": 40,
 						"h": 30
@@ -885,7 +1095,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 200,
+						"x": 400,
 						"y": 90,
 						"w": 40,
 						"h": 30
@@ -906,7 +1116,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 240,
+						"x": 440,
 						"y": 90,
 						"w": 40,
 						"h": 30
@@ -927,7 +1137,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 280,
+						"x": 480,
 						"y": 90,
 						"w": 40,
 						"h": 30
@@ -948,8 +1158,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 320,
-						"y": 90,
+						"x": 0,
+						"y": 120,
 						"w": 40,
 						"h": 30
 					}
@@ -969,8 +1179,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 360,
-						"y": 90,
+						"x": 40,
+						"y": 120,
 						"w": 40,
 						"h": 30
 					}
@@ -990,8 +1200,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 400,
-						"y": 90,
+						"x": 80,
+						"y": 120,
 						"w": 40,
 						"h": 30
 					}
@@ -1011,8 +1221,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 440,
-						"y": 90,
+						"x": 120,
+						"y": 120,
 						"w": 40,
 						"h": 30
 					}
@@ -1032,7 +1242,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 0,
+						"x": 160,
 						"y": 120,
 						"w": 40,
 						"h": 30
@@ -1053,7 +1263,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 40,
+						"x": 200,
 						"y": 120,
 						"w": 40,
 						"h": 30
@@ -1074,7 +1284,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 80,
+						"x": 240,
 						"y": 120,
 						"w": 40,
 						"h": 30
@@ -1095,7 +1305,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 120,
+						"x": 280,
 						"y": 120,
 						"w": 40,
 						"h": 30
@@ -1116,7 +1326,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 160,
+						"x": 320,
 						"y": 120,
 						"w": 40,
 						"h": 30
@@ -1137,7 +1347,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 200,
+						"x": 360,
 						"y": 120,
 						"w": 40,
 						"h": 30
@@ -1158,7 +1368,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 240,
+						"x": 400,
 						"y": 120,
 						"w": 40,
 						"h": 30
@@ -1179,7 +1389,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 280,
+						"x": 440,
 						"y": 120,
 						"w": 40,
 						"h": 30
@@ -1200,7 +1410,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 320,
+						"x": 480,
 						"y": 120,
 						"w": 40,
 						"h": 30
@@ -1221,8 +1431,50 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 360,
-						"y": 120,
+						"x": 0,
+						"y": 150,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "871_2",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 40,
+						"y": 150,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "871_3",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 80,
+						"y": 150,
 						"w": 40,
 						"h": 30
 					}
@@ -1242,8 +1494,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 400,
-						"y": 120,
+						"x": 120,
+						"y": 150,
 						"w": 40,
 						"h": 30
 					}
@@ -1263,8 +1515,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 440,
-						"y": 120,
+						"x": 160,
+						"y": 150,
 						"w": 40,
 						"h": 30
 					}
@@ -1284,7 +1536,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 0,
+						"x": 200,
 						"y": 150,
 						"w": 40,
 						"h": 30
@@ -1305,7 +1557,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 40,
+						"x": 240,
 						"y": 150,
 						"w": 40,
 						"h": 30
@@ -1326,7 +1578,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 80,
+						"x": 280,
 						"y": 150,
 						"w": 40,
 						"h": 30
@@ -1347,7 +1599,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 120,
+						"x": 320,
 						"y": 150,
 						"w": 40,
 						"h": 30
@@ -1368,7 +1620,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 160,
+						"x": 360,
 						"y": 150,
 						"w": 40,
 						"h": 30
@@ -1389,7 +1641,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 200,
+						"x": 400,
 						"y": 150,
 						"w": 40,
 						"h": 30
@@ -1410,7 +1662,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 240,
+						"x": 440,
 						"y": 150,
 						"w": 40,
 						"h": 30
@@ -1431,7 +1683,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 280,
+						"x": 480,
 						"y": 150,
 						"w": 40,
 						"h": 30
@@ -1452,8 +1704,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 320,
-						"y": 150,
+						"x": 0,
+						"y": 180,
 						"w": 40,
 						"h": 30
 					}
@@ -1473,8 +1725,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 360,
-						"y": 150,
+						"x": 40,
+						"y": 180,
 						"w": 40,
 						"h": 30
 					}
@@ -1494,8 +1746,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 400,
-						"y": 150,
+						"x": 80,
+						"y": 180,
 						"w": 40,
 						"h": 30
 					}
@@ -1515,8 +1767,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 440,
-						"y": 150,
+						"x": 120,
+						"y": 180,
 						"w": 40,
 						"h": 30
 					}
@@ -1536,7 +1788,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 0,
+						"x": 160,
 						"y": 180,
 						"w": 40,
 						"h": 30
@@ -1557,7 +1809,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 40,
+						"x": 200,
 						"y": 180,
 						"w": 40,
 						"h": 30
@@ -1578,7 +1830,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 80,
+						"x": 240,
 						"y": 180,
 						"w": 40,
 						"h": 30
@@ -1599,7 +1851,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 120,
+						"x": 280,
 						"y": 180,
 						"w": 40,
 						"h": 30
@@ -1620,7 +1872,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 160,
+						"x": 320,
 						"y": 180,
 						"w": 40,
 						"h": 30
@@ -1641,7 +1893,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 200,
+						"x": 360,
 						"y": 180,
 						"w": 40,
 						"h": 30
@@ -1662,7 +1914,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 240,
+						"x": 400,
 						"y": 180,
 						"w": 40,
 						"h": 30
@@ -1683,7 +1935,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 280,
+						"x": 440,
 						"y": 180,
 						"w": 40,
 						"h": 30
@@ -1704,7 +1956,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 320,
+						"x": 480,
 						"y": 180,
 						"w": 40,
 						"h": 30
@@ -1725,8 +1977,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 360,
-						"y": 180,
+						"x": 0,
+						"y": 210,
 						"w": 40,
 						"h": 30
 					}
@@ -1746,8 +1998,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 400,
-						"y": 180,
+						"x": 40,
+						"y": 210,
 						"w": 40,
 						"h": 30
 					}
@@ -1767,8 +2019,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 440,
-						"y": 180,
+						"x": 80,
+						"y": 210,
 						"w": 40,
 						"h": 30
 					}
@@ -1788,7 +2040,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 0,
+						"x": 120,
 						"y": 210,
 						"w": 40,
 						"h": 30
@@ -1809,7 +2061,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 40,
+						"x": 160,
 						"y": 210,
 						"w": 40,
 						"h": 30
@@ -1830,7 +2082,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 80,
+						"x": 200,
 						"y": 210,
 						"w": 40,
 						"h": 30
@@ -1851,7 +2103,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 120,
+						"x": 240,
 						"y": 210,
 						"w": 40,
 						"h": 30
@@ -1872,7 +2124,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 160,
+						"x": 280,
 						"y": 210,
 						"w": 40,
 						"h": 30
@@ -1893,7 +2145,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 200,
+						"x": 320,
 						"y": 210,
 						"w": 40,
 						"h": 30
@@ -1914,7 +2166,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 240,
+						"x": 360,
 						"y": 210,
 						"w": 40,
 						"h": 30
@@ -1935,7 +2187,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 280,
+						"x": 400,
 						"y": 210,
 						"w": 40,
 						"h": 30
@@ -1956,7 +2208,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 320,
+						"x": 440,
 						"y": 210,
 						"w": 40,
 						"h": 30
@@ -1977,7 +2229,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 360,
+						"x": 480,
 						"y": 210,
 						"w": 40,
 						"h": 30
@@ -1998,8 +2250,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 400,
-						"y": 210,
+						"x": 0,
+						"y": 240,
 						"w": 40,
 						"h": 30
 					}
@@ -2019,8 +2271,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 440,
-						"y": 210,
+						"x": 40,
+						"y": 240,
 						"w": 40,
 						"h": 30
 					}
@@ -2040,7 +2292,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 0,
+						"x": 80,
 						"y": 240,
 						"w": 40,
 						"h": 30
@@ -2061,7 +2313,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 40,
+						"x": 120,
 						"y": 240,
 						"w": 40,
 						"h": 30
@@ -2082,7 +2334,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 80,
+						"x": 160,
 						"y": 240,
 						"w": 40,
 						"h": 30
@@ -2103,7 +2355,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 120,
+						"x": 200,
 						"y": 240,
 						"w": 40,
 						"h": 30
@@ -2124,7 +2376,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 160,
+						"x": 240,
 						"y": 240,
 						"w": 40,
 						"h": 30
@@ -2145,7 +2397,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 200,
+						"x": 280,
 						"y": 240,
 						"w": 40,
 						"h": 30
@@ -2166,7 +2418,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 240,
+						"x": 320,
 						"y": 240,
 						"w": 40,
 						"h": 30
@@ -2187,7 +2439,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 280,
+						"x": 360,
 						"y": 240,
 						"w": 40,
 						"h": 30
@@ -2208,7 +2460,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 320,
+						"x": 400,
 						"y": 240,
 						"w": 40,
 						"h": 30
@@ -2229,7 +2481,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 360,
+						"x": 440,
 						"y": 240,
 						"w": 40,
 						"h": 30
@@ -2250,7 +2502,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 400,
+						"x": 480,
 						"y": 240,
 						"w": 40,
 						"h": 30
@@ -2270,27 +2522,6 @@
 						"w": 40,
 						"h": 30
 					},
-					"frame": {
-						"x": 440,
-						"y": 240,
-						"w": 40,
-						"h": 30
-					}
-				},
-				{
-					"filename": "891_2",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 40,
-						"h": 30
-					},
 					"frame": {
 						"x": 0,
 						"y": 270,
@@ -2299,7 +2530,7 @@
 					}
 				},
 				{
-					"filename": "891_3",
+					"filename": "891_2",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
@@ -2320,7 +2551,7 @@
 					}
 				},
 				{
-					"filename": "892-gigantamax-rapid_1",
+					"filename": "891_3",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
@@ -2341,7 +2572,7 @@
 					}
 				},
 				{
-					"filename": "892-gigantamax-rapid_2",
+					"filename": "892-gigantamax-rapid_1",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
@@ -2362,7 +2593,7 @@
 					}
 				},
 				{
-					"filename": "892-gigantamax-rapid_3",
+					"filename": "892-gigantamax-rapid_2",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
@@ -2383,7 +2614,7 @@
 					}
 				},
 				{
-					"filename": "892-gigantamax-single_1",
+					"filename": "892-gigantamax-rapid_3",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
@@ -2404,7 +2635,7 @@
 					}
 				},
 				{
-					"filename": "892-gigantamax-single_2",
+					"filename": "892-gigantamax-single_1",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
@@ -2425,7 +2656,7 @@
 					}
 				},
 				{
-					"filename": "892-gigantamax-single_3",
+					"filename": "892-gigantamax-single_2",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
@@ -2446,7 +2677,7 @@
 					}
 				},
 				{
-					"filename": "892-rapid-strike_1",
+					"filename": "892-gigantamax-single_3",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
@@ -2467,7 +2698,7 @@
 					}
 				},
 				{
-					"filename": "892-rapid-strike_2",
+					"filename": "892-rapid-strike_1",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
@@ -2488,7 +2719,7 @@
 					}
 				},
 				{
-					"filename": "892-rapid-strike_3",
+					"filename": "892-rapid-strike_2",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
@@ -2509,7 +2740,7 @@
 					}
 				},
 				{
-					"filename": "892_1",
+					"filename": "892-rapid-strike_3",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
@@ -2529,6 +2760,27 @@
 						"h": 30
 					}
 				},
+				{
+					"filename": "892_1",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 480,
+						"y": 270,
+						"w": 40,
+						"h": 30
+					}
+				},
 				{
 					"filename": "892_2",
 					"rotated": false,
@@ -2796,8 +3048,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 0,
-						"y": 330,
+						"x": 480,
+						"y": 300,
 						"w": 40,
 						"h": 30
 					}
@@ -2817,7 +3069,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 40,
+						"x": 0,
 						"y": 330,
 						"w": 40,
 						"h": 30
@@ -2838,7 +3090,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 80,
+						"x": 40,
 						"y": 330,
 						"w": 40,
 						"h": 30
@@ -2859,7 +3111,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 120,
+						"x": 80,
 						"y": 330,
 						"w": 40,
 						"h": 30
@@ -2880,7 +3132,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 160,
+						"x": 120,
 						"y": 330,
 						"w": 40,
 						"h": 30
@@ -2901,7 +3153,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 200,
+						"x": 160,
 						"y": 330,
 						"w": 40,
 						"h": 30
@@ -2922,7 +3174,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 240,
+						"x": 200,
 						"y": 330,
 						"w": 40,
 						"h": 30
@@ -2943,7 +3195,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 280,
+						"x": 240,
 						"y": 330,
 						"w": 40,
 						"h": 30
@@ -2964,7 +3216,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 320,
+						"x": 280,
 						"y": 330,
 						"w": 40,
 						"h": 30
@@ -2985,7 +3237,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 360,
+						"x": 320,
 						"y": 330,
 						"w": 40,
 						"h": 30
@@ -3006,7 +3258,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 400,
+						"x": 360,
 						"y": 330,
 						"w": 40,
 						"h": 30
@@ -3027,7 +3279,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 440,
+						"x": 400,
 						"y": 330,
 						"w": 40,
 						"h": 30
@@ -3048,8 +3300,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 0,
-						"y": 360,
+						"x": 440,
+						"y": 330,
 						"w": 40,
 						"h": 30
 					}
@@ -3069,8 +3321,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 40,
-						"y": 360,
+						"x": 480,
+						"y": 330,
 						"w": 40,
 						"h": 30
 					}
@@ -3090,7 +3342,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 80,
+						"x": 0,
 						"y": 360,
 						"w": 40,
 						"h": 30
@@ -3111,7 +3363,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 120,
+						"x": 40,
 						"y": 360,
 						"w": 40,
 						"h": 30
@@ -3132,7 +3384,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 160,
+						"x": 80,
 						"y": 360,
 						"w": 40,
 						"h": 30
@@ -3153,7 +3405,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 200,
+						"x": 120,
 						"y": 360,
 						"w": 40,
 						"h": 30
@@ -3174,7 +3426,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 240,
+						"x": 160,
 						"y": 360,
 						"w": 40,
 						"h": 30
@@ -3195,7 +3447,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 280,
+						"x": 200,
 						"y": 360,
 						"w": 40,
 						"h": 30
@@ -3216,7 +3468,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 320,
+						"x": 240,
 						"y": 360,
 						"w": 40,
 						"h": 30
@@ -3237,7 +3489,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 360,
+						"x": 280,
 						"y": 360,
 						"w": 40,
 						"h": 30
@@ -3258,7 +3510,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 400,
+						"x": 320,
 						"y": 360,
 						"w": 40,
 						"h": 30
@@ -3279,7 +3531,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 440,
+						"x": 360,
 						"y": 360,
 						"w": 40,
 						"h": 30
@@ -3300,8 +3552,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 0,
-						"y": 390,
+						"x": 400,
+						"y": 360,
 						"w": 40,
 						"h": 30
 					}
@@ -3321,8 +3573,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 40,
-						"y": 390,
+						"x": 440,
+						"y": 360,
 						"w": 40,
 						"h": 30
 					}
@@ -3342,8 +3594,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 80,
-						"y": 390,
+						"x": 480,
+						"y": 360,
 						"w": 40,
 						"h": 30
 					}
@@ -3363,7 +3615,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 120,
+						"x": 0,
 						"y": 390,
 						"w": 40,
 						"h": 30
@@ -3384,7 +3636,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 160,
+						"x": 40,
 						"y": 390,
 						"w": 40,
 						"h": 30
@@ -3405,7 +3657,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 200,
+						"x": 80,
 						"y": 390,
 						"w": 40,
 						"h": 30
@@ -3426,7 +3678,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 240,
+						"x": 120,
 						"y": 390,
 						"w": 40,
 						"h": 30
@@ -3447,7 +3699,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 280,
+						"x": 160,
 						"y": 390,
 						"w": 40,
 						"h": 30
@@ -3468,7 +3720,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 320,
+						"x": 200,
 						"y": 390,
 						"w": 40,
 						"h": 30
@@ -3489,7 +3741,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 360,
+						"x": 240,
 						"y": 390,
 						"w": 40,
 						"h": 30
@@ -3510,7 +3762,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 400,
+						"x": 280,
 						"y": 390,
 						"w": 40,
 						"h": 30
@@ -3531,7 +3783,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 440,
+						"x": 320,
 						"y": 390,
 						"w": 40,
 						"h": 30
@@ -3552,8 +3804,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 0,
-						"y": 420,
+						"x": 360,
+						"y": 390,
 						"w": 40,
 						"h": 30
 					}
@@ -3573,8 +3825,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 40,
-						"y": 420,
+						"x": 400,
+						"y": 390,
 						"w": 40,
 						"h": 30
 					}
@@ -3594,8 +3846,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 80,
-						"y": 420,
+						"x": 440,
+						"y": 390,
 						"w": 40,
 						"h": 30
 					}
@@ -3615,8 +3867,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 120,
-						"y": 420,
+						"x": 480,
+						"y": 390,
 						"w": 40,
 						"h": 30
 					}
@@ -3636,7 +3888,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 160,
+						"x": 0,
 						"y": 420,
 						"w": 40,
 						"h": 30
@@ -3657,7 +3909,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 200,
+						"x": 40,
 						"y": 420,
 						"w": 40,
 						"h": 30
@@ -3678,7 +3930,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 240,
+						"x": 80,
 						"y": 420,
 						"w": 40,
 						"h": 30
@@ -3699,7 +3951,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 280,
+						"x": 120,
 						"y": 420,
 						"w": 40,
 						"h": 30
@@ -3720,7 +3972,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 320,
+						"x": 160,
 						"y": 420,
 						"w": 40,
 						"h": 30
@@ -3741,7 +3993,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 360,
+						"x": 200,
 						"y": 420,
 						"w": 40,
 						"h": 30
@@ -3762,7 +4014,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 400,
+						"x": 240,
 						"y": 420,
 						"w": 40,
 						"h": 30
@@ -3783,7 +4035,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 440,
+						"x": 280,
 						"y": 420,
 						"w": 40,
 						"h": 30
@@ -3804,8 +4056,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 0,
-						"y": 450,
+						"x": 320,
+						"y": 420,
 						"w": 40,
 						"h": 30
 					}
@@ -3825,8 +4077,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 40,
-						"y": 450,
+						"x": 360,
+						"y": 420,
 						"w": 40,
 						"h": 30
 					}
@@ -3846,8 +4098,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 80,
-						"y": 450,
+						"x": 400,
+						"y": 420,
 						"w": 40,
 						"h": 30
 					}
@@ -3867,8 +4119,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 120,
-						"y": 450,
+						"x": 440,
+						"y": 420,
 						"w": 40,
 						"h": 30
 					}
@@ -3888,8 +4140,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 160,
-						"y": 450,
+						"x": 480,
+						"y": 420,
 						"w": 40,
 						"h": 30
 					}
@@ -3909,7 +4161,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 200,
+						"x": 0,
 						"y": 450,
 						"w": 40,
 						"h": 30
@@ -3930,7 +4182,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 240,
+						"x": 40,
 						"y": 450,
 						"w": 40,
 						"h": 30
@@ -3951,7 +4203,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 280,
+						"x": 80,
 						"y": 450,
 						"w": 40,
 						"h": 30
@@ -3972,7 +4224,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 320,
+						"x": 120,
 						"y": 450,
 						"w": 40,
 						"h": 30
@@ -3993,7 +4245,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 360,
+						"x": 160,
 						"y": 450,
 						"w": 40,
 						"h": 30
@@ -4014,7 +4266,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 400,
+						"x": 200,
 						"y": 450,
 						"w": 40,
 						"h": 30
@@ -4035,7 +4287,7 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 440,
+						"x": 240,
 						"y": 450,
 						"w": 40,
 						"h": 30
@@ -4056,8 +4308,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 0,
-						"y": 480,
+						"x": 280,
+						"y": 450,
 						"w": 40,
 						"h": 30
 					}
@@ -4077,8 +4329,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 40,
-						"y": 480,
+						"x": 320,
+						"y": 450,
 						"w": 40,
 						"h": 30
 					}
@@ -4098,8 +4350,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 80,
-						"y": 480,
+						"x": 360,
+						"y": 450,
 						"w": 40,
 						"h": 30
 					}
@@ -4110,6 +4362,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:c6192164d1b1971f54a6c5864e11748d:46b3adcf2a25bfb824db3d24cd1c96a9:ec5f05e7f30cd98f74db0c2326109fd3$"
+		"smartupdate": "$TexturePacker:SmartUpdate:8408a38565cd946fb1dcfa1e942bfa70:5d4e77c515d77c2e94d454fb7c52d9fc:ec5f05e7f30cd98f74db0c2326109fd3$"
 	}
 }
diff --git a/public/images/pokemon_icons_8v.png b/public/images/pokemon_icons_8v.png
index 2af86ac656f..4017b0945d6 100644
Binary files a/public/images/pokemon_icons_8v.png and b/public/images/pokemon_icons_8v.png differ
diff --git a/public/images/pokemon_icons_9v.json b/public/images/pokemon_icons_9v.json
index 6c8b93208e3..4b7a7ba4572 100644
--- a/public/images/pokemon_icons_9v.json
+++ b/public/images/pokemon_icons_9v.json
@@ -3013,7 +3013,7 @@
 					}
 				},
 				{
-					"filename": "1012-counterfeit_2",
+					"filename": "1011_2",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
@@ -3034,7 +3034,7 @@
 					}
 				},
 				{
-					"filename": "1012-counterfeit_3",
+					"filename": "1011_3",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
@@ -3055,7 +3055,7 @@
 					}
 				},
 				{
-					"filename": "1013-unremarkable_2",
+					"filename": "1012-counterfeit_2",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
@@ -3076,7 +3076,7 @@
 					}
 				},
 				{
-					"filename": "1013-unremarkable_3",
+					"filename": "1012-counterfeit_3",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
@@ -3097,7 +3097,7 @@
 					}
 				},
 				{
-					"filename": "1018_2",
+					"filename": "1013-unremarkable_2",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
@@ -3118,7 +3118,7 @@
 					}
 				},
 				{
-					"filename": "1018_3",
+					"filename": "1013-unremarkable_3",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
@@ -3139,7 +3139,7 @@
 					}
 				},
 				{
-					"filename": "1022_2",
+					"filename": "1018_2",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
@@ -3160,7 +3160,7 @@
 					}
 				},
 				{
-					"filename": "1022_3",
+					"filename": "1018_3",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
@@ -3181,7 +3181,7 @@
 					}
 				},
 				{
-					"filename": "1023_2",
+					"filename": "1019_2",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
@@ -3202,7 +3202,7 @@
 					}
 				},
 				{
-					"filename": "1023_3",
+					"filename": "1019_3",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
@@ -3223,7 +3223,7 @@
 					}
 				},
 				{
-					"filename": "8901_1",
+					"filename": "1022_2",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
@@ -3244,7 +3244,7 @@
 					}
 				},
 				{
-					"filename": "8901_2",
+					"filename": "1022_3",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
@@ -3265,7 +3265,7 @@
 					}
 				},
 				{
-					"filename": "8901_3",
+					"filename": "1023_2",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
@@ -3284,6 +3284,90 @@
 						"w": 40,
 						"h": 30
 					}
+				},
+				{
+					"filename": "1023_3",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 80,
+						"y": 420,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "8901_1",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 120,
+						"y": 420,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "8901_2",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 160,
+						"y": 420,
+						"w": 40,
+						"h": 30
+					}
+				},
+				{
+					"filename": "8901_3",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 40,
+						"h": 30
+					},
+					"frame": {
+						"x": 200,
+						"y": 420,
+						"w": 40,
+						"h": 30
+					}
 				}
 			]
 		}
@@ -3291,6 +3375,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:c13ec323095f727665fa953e64e98300:e7531bea9b5e1bef44def5b357c81630:3ec5c0bc286c296cfb7fa30a8b06f3da$"
+		"smartupdate": "$TexturePacker:SmartUpdate:a78ab8261d4cd63caee19962a0e01d8a:cb77bcbd2cc296577c3f2ba84b4c50f2:3ec5c0bc286c296cfb7fa30a8b06f3da$"
 	}
 }
diff --git a/public/images/pokemon_icons_9v.png b/public/images/pokemon_icons_9v.png
index f71b6c5ada5..3636c3059d8 100644
Binary files a/public/images/pokemon_icons_9v.png and b/public/images/pokemon_icons_9v.png differ
diff --git a/public/images/statuses_ca-ES.png b/public/images/statuses_ca-ES.png
index d372b989be9..fe05e243f7a 100644
Binary files a/public/images/statuses_ca-ES.png and b/public/images/statuses_ca-ES.png differ
diff --git a/public/images/statuses_es-ES.png b/public/images/statuses_es-ES.png
index d372b989be9..dc845d6fb1f 100644
Binary files a/public/images/statuses_es-ES.png and b/public/images/statuses_es-ES.png differ
diff --git a/public/images/pokemon/exp/back/718-10.json b/public/images/statuses_es-MX.json
similarity index 53%
rename from public/images/pokemon/exp/back/718-10.json
rename to public/images/statuses_es-MX.json
index 03fc4c60ed9..8b09ed391c4 100644
--- a/public/images/pokemon/exp/back/718-10.json
+++ b/public/images/statuses_es-MX.json
@@ -1,180 +1,180 @@
 {
 	"textures": [
 		{
-			"image": "718-10.png",
+			"image": "statuses_es-MX.png",
 			"format": "RGBA8888",
 			"size": {
-				"w": 197,
-				"h": 197
+				"w": 22,
+				"h": 64
 			},
 			"scale": 1,
 			"frames": [
 				{
-					"filename": "0002.png",
+					"filename": "pokerus",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 66,
-						"h": 67
+						"w": 22,
+						"h": 8
 					},
 					"spriteSourceSize": {
 						"x": 0,
 						"y": 0,
-						"w": 66,
-						"h": 67
+						"w": 22,
+						"h": 8
 					},
 					"frame": {
 						"x": 0,
 						"y": 0,
-						"w": 66,
-						"h": 67
+						"w": 22,
+						"h": 8
 					}
 				},
 				{
-					"filename": "0008.png",
+					"filename": "burn",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 66,
-						"h": 67
+						"w": 20,
+						"h": 8
 					},
 					"spriteSourceSize": {
 						"x": 0,
 						"y": 0,
-						"w": 66,
-						"h": 67
+						"w": 20,
+						"h": 8
 					},
 					"frame": {
 						"x": 0,
-						"y": 0,
-						"w": 66,
-						"h": 67
+						"y": 8,
+						"w": 20,
+						"h": 8
 					}
 				},
 				{
-					"filename": "0003.png",
+					"filename": "faint",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 66,
-						"h": 67
+						"w": 20,
+						"h": 8
 					},
 					"spriteSourceSize": {
 						"x": 0,
 						"y": 0,
-						"w": 66,
-						"h": 67
+						"w": 20,
+						"h": 8
 					},
 					"frame": {
 						"x": 0,
-						"y": 67,
-						"w": 66,
-						"h": 67
+						"y": 16,
+						"w": 20,
+						"h": 8
 					}
 				},
 				{
-					"filename": "0007.png",
+					"filename": "freeze",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 66,
-						"h": 67
+						"w": 20,
+						"h": 8
 					},
 					"spriteSourceSize": {
 						"x": 0,
 						"y": 0,
-						"w": 66,
-						"h": 67
+						"w": 20,
+						"h": 8
 					},
 					"frame": {
 						"x": 0,
-						"y": 67,
-						"w": 66,
-						"h": 67
+						"y": 24,
+						"w": 20,
+						"h": 8
 					}
 				},
 				{
-					"filename": "0005.png",
+					"filename": "paralysis",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 66,
-						"h": 67
+						"w": 20,
+						"h": 8
 					},
 					"spriteSourceSize": {
 						"x": 0,
 						"y": 0,
-						"w": 66,
-						"h": 67
+						"w": 20,
+						"h": 8
 					},
 					"frame": {
-						"x": 66,
-						"y": 0,
-						"w": 66,
-						"h": 67
+						"x": 0,
+						"y": 32,
+						"w": 20,
+						"h": 8
 					}
 				},
 				{
-					"filename": "0004.png",
+					"filename": "poison",
 					"rotated": false,
-					"trimmed": true,
+					"trimmed": false,
 					"sourceSize": {
-						"w": 66,
-						"h": 67
+						"w": 20,
+						"h": 8
 					},
 					"spriteSourceSize": {
 						"x": 0,
 						"y": 0,
-						"w": 65,
-						"h": 67
+						"w": 20,
+						"h": 8
 					},
 					"frame": {
-						"x": 132,
-						"y": 0,
-						"w": 65,
-						"h": 67
+						"x": 0,
+						"y": 40,
+						"w": 20,
+						"h": 8
 					}
 				},
 				{
-					"filename": "0006.png",
+					"filename": "sleep",
 					"rotated": false,
-					"trimmed": true,
+					"trimmed": false,
 					"sourceSize": {
-						"w": 66,
-						"h": 67
+						"w": 20,
+						"h": 8
 					},
 					"spriteSourceSize": {
 						"x": 0,
 						"y": 0,
-						"w": 65,
-						"h": 67
+						"w": 20,
+						"h": 8
 					},
 					"frame": {
-						"x": 132,
-						"y": 0,
-						"w": 65,
-						"h": 67
+						"x": 0,
+						"y": 48,
+						"w": 20,
+						"h": 8
 					}
 				},
 				{
-					"filename": "0001.png",
+					"filename": "toxic",
 					"rotated": false,
-					"trimmed": true,
+					"trimmed": false,
 					"sourceSize": {
-						"w": 66,
-						"h": 67
+						"w": 20,
+						"h": 8
 					},
 					"spriteSourceSize": {
 						"x": 0,
-						"y": 2,
-						"w": 66,
-						"h": 65
+						"y": 0,
+						"w": 20,
+						"h": 8
 					},
 					"frame": {
-						"x": 66,
-						"y": 67,
-						"w": 66,
-						"h": 65
+						"x": 0,
+						"y": 56,
+						"w": 20,
+						"h": 8
 					}
 				}
 			]
@@ -183,6 +183,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:bd85fbac35b53b12b06187b29756853b:2478226f2126bdc982b17f3a3acb49c4:82195cf2a6db620c5643b8162d6e8c5c$"
+		"smartupdate": "$TexturePacker:SmartUpdate:37686e85605d17b806f22d43081c1139:70535ffee63ba61b3397d8470c2c8982:e6649238c018d3630e55681417c698ca$"
 	}
 }
diff --git a/public/images/statuses_es-MX.png b/public/images/statuses_es-MX.png
new file mode 100644
index 00000000000..dc845d6fb1f
Binary files /dev/null and b/public/images/statuses_es-MX.png differ
diff --git a/public/images/pokemon/exp/935.json b/public/images/types_ca-ES.json
similarity index 56%
rename from public/images/pokemon/exp/935.json
rename to public/images/types_ca-ES.json
index 95df77f9c54..fa3abaaf259 100644
--- a/public/images/pokemon/exp/935.json
+++ b/public/images/types_ca-ES.json
@@ -1,432 +1,432 @@
 {
 	"textures": [
 		{
-			"image": "935.png",
+			"image": "types_ca-ES.png",
 			"format": "RGBA8888",
 			"size": {
-				"w": 165,
-				"h": 165
+				"w": 32,
+				"h": 280
 			},
 			"scale": 1,
 			"frames": [
 				{
-					"filename": "0001.png",
+					"filename": "unknown",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 35,
-						"h": 55
+						"w": 32,
+						"h": 14
 					},
 					"spriteSourceSize": {
 						"x": 0,
 						"y": 0,
-						"w": 35,
-						"h": 55
+						"w": 32,
+						"h": 14
 					},
 					"frame": {
 						"x": 0,
 						"y": 0,
-						"w": 35,
-						"h": 55
+						"w": 32,
+						"h": 14
 					}
 				},
 				{
-					"filename": "0005.png",
+					"filename": "bug",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 35,
-						"h": 55
+						"w": 32,
+						"h": 14
 					},
 					"spriteSourceSize": {
 						"x": 0,
 						"y": 0,
-						"w": 35,
-						"h": 55
+						"w": 32,
+						"h": 14
 					},
 					"frame": {
 						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 55
+						"y": 14,
+						"w": 32,
+						"h": 14
 					}
 				},
 				{
-					"filename": "0009.png",
+					"filename": "dark",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 35,
-						"h": 55
+						"w": 32,
+						"h": 14
 					},
 					"spriteSourceSize": {
 						"x": 0,
 						"y": 0,
-						"w": 35,
-						"h": 55
+						"w": 32,
+						"h": 14
 					},
 					"frame": {
 						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 55
+						"y": 28,
+						"w": 32,
+						"h": 14
 					}
 				},
 				{
-					"filename": "0002.png",
+					"filename": "dragon",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 35,
-						"h": 55
+						"w": 32,
+						"h": 14
 					},
 					"spriteSourceSize": {
 						"x": 0,
 						"y": 0,
-						"w": 35,
-						"h": 55
+						"w": 32,
+						"h": 14
 					},
 					"frame": {
 						"x": 0,
-						"y": 55,
-						"w": 35,
-						"h": 55
+						"y": 42,
+						"w": 32,
+						"h": 14
 					}
 				},
 				{
-					"filename": "0006.png",
+					"filename": "electric",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 35,
-						"h": 55
+						"w": 32,
+						"h": 14
 					},
 					"spriteSourceSize": {
 						"x": 0,
 						"y": 0,
-						"w": 35,
-						"h": 55
+						"w": 32,
+						"h": 14
 					},
 					"frame": {
 						"x": 0,
-						"y": 55,
-						"w": 35,
-						"h": 55
+						"y": 56,
+						"w": 32,
+						"h": 14
 					}
 				},
 				{
-					"filename": "0010.png",
+					"filename": "fairy",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 35,
-						"h": 55
+						"w": 32,
+						"h": 14
 					},
 					"spriteSourceSize": {
 						"x": 0,
 						"y": 0,
-						"w": 35,
-						"h": 55
+						"w": 32,
+						"h": 14
 					},
 					"frame": {
 						"x": 0,
-						"y": 55,
-						"w": 35,
-						"h": 55
+						"y": 70,
+						"w": 32,
+						"h": 14
 					}
 				},
 				{
-					"filename": "0003.png",
+					"filename": "fighting",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 35,
-						"h": 55
+						"w": 32,
+						"h": 14
 					},
 					"spriteSourceSize": {
 						"x": 0,
 						"y": 0,
-						"w": 35,
-						"h": 55
+						"w": 32,
+						"h": 14
 					},
 					"frame": {
 						"x": 0,
-						"y": 110,
-						"w": 35,
-						"h": 55
+						"y": 84,
+						"w": 32,
+						"h": 14
 					}
 				},
 				{
-					"filename": "0007.png",
+					"filename": "fire",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 35,
-						"h": 55
+						"w": 32,
+						"h": 14
 					},
 					"spriteSourceSize": {
 						"x": 0,
 						"y": 0,
-						"w": 35,
-						"h": 55
+						"w": 32,
+						"h": 14
 					},
 					"frame": {
 						"x": 0,
-						"y": 110,
-						"w": 35,
-						"h": 55
+						"y": 98,
+						"w": 32,
+						"h": 14
 					}
 				},
 				{
-					"filename": "0011.png",
+					"filename": "flying",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 35,
-						"h": 55
+						"w": 32,
+						"h": 14
 					},
 					"spriteSourceSize": {
 						"x": 0,
 						"y": 0,
-						"w": 35,
-						"h": 55
+						"w": 32,
+						"h": 14
 					},
 					"frame": {
 						"x": 0,
-						"y": 110,
-						"w": 35,
-						"h": 55
+						"y": 112,
+						"w": 32,
+						"h": 14
 					}
 				},
 				{
-					"filename": "0004.png",
+					"filename": "ghost",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 35,
-						"h": 55
+						"w": 32,
+						"h": 14
 					},
 					"spriteSourceSize": {
 						"x": 0,
 						"y": 0,
-						"w": 35,
-						"h": 55
+						"w": 32,
+						"h": 14
 					},
 					"frame": {
-						"x": 35,
-						"y": 0,
-						"w": 35,
-						"h": 55
+						"x": 0,
+						"y": 126,
+						"w": 32,
+						"h": 14
 					}
 				},
 				{
-					"filename": "0008.png",
+					"filename": "grass",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 35,
-						"h": 55
+						"w": 32,
+						"h": 14
 					},
 					"spriteSourceSize": {
 						"x": 0,
 						"y": 0,
-						"w": 35,
-						"h": 55
+						"w": 32,
+						"h": 14
 					},
 					"frame": {
-						"x": 35,
-						"y": 0,
-						"w": 35,
-						"h": 55
+						"x": 0,
+						"y": 140,
+						"w": 32,
+						"h": 14
 					}
 				},
 				{
-					"filename": "0012.png",
+					"filename": "ground",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 35,
-						"h": 55
+						"w": 32,
+						"h": 14
 					},
 					"spriteSourceSize": {
 						"x": 0,
 						"y": 0,
-						"w": 35,
-						"h": 55
+						"w": 32,
+						"h": 14
 					},
 					"frame": {
-						"x": 35,
-						"y": 0,
-						"w": 35,
-						"h": 55
+						"x": 0,
+						"y": 154,
+						"w": 32,
+						"h": 14
 					}
 				},
 				{
-					"filename": "0013.png",
+					"filename": "ice",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 35,
-						"h": 55
+						"w": 32,
+						"h": 14
 					},
 					"spriteSourceSize": {
 						"x": 0,
 						"y": 0,
-						"w": 35,
-						"h": 55
+						"w": 32,
+						"h": 14
 					},
 					"frame": {
-						"x": 35,
-						"y": 55,
-						"w": 35,
-						"h": 55
+						"x": 0,
+						"y": 168,
+						"w": 32,
+						"h": 14
 					}
 				},
 				{
-					"filename": "0014.png",
+					"filename": "normal",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 35,
-						"h": 55
+						"w": 32,
+						"h": 14
 					},
 					"spriteSourceSize": {
 						"x": 0,
 						"y": 0,
-						"w": 35,
-						"h": 55
+						"w": 32,
+						"h": 14
 					},
 					"frame": {
-						"x": 35,
-						"y": 110,
-						"w": 35,
-						"h": 55
+						"x": 0,
+						"y": 182,
+						"w": 32,
+						"h": 14
 					}
 				},
 				{
-					"filename": "0015.png",
+					"filename": "poison",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 35,
-						"h": 55
+						"w": 32,
+						"h": 14
 					},
 					"spriteSourceSize": {
 						"x": 0,
 						"y": 0,
-						"w": 35,
-						"h": 55
+						"w": 32,
+						"h": 14
 					},
 					"frame": {
-						"x": 70,
-						"y": 0,
-						"w": 35,
-						"h": 55
+						"x": 0,
+						"y": 196,
+						"w": 32,
+						"h": 14
 					}
 				},
 				{
-					"filename": "0016.png",
+					"filename": "psychic",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 35,
-						"h": 55
+						"w": 32,
+						"h": 14
 					},
 					"spriteSourceSize": {
 						"x": 0,
 						"y": 0,
-						"w": 35,
-						"h": 55
+						"w": 32,
+						"h": 14
 					},
 					"frame": {
-						"x": 105,
-						"y": 0,
-						"w": 35,
-						"h": 55
+						"x": 0,
+						"y": 210,
+						"w": 32,
+						"h": 14
 					}
 				},
 				{
-					"filename": "0017.png",
+					"filename": "rock",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 35,
-						"h": 55
+						"w": 32,
+						"h": 14
 					},
 					"spriteSourceSize": {
 						"x": 0,
 						"y": 0,
-						"w": 35,
-						"h": 55
+						"w": 32,
+						"h": 14
 					},
 					"frame": {
-						"x": 70,
-						"y": 55,
-						"w": 35,
-						"h": 55
+						"x": 0,
+						"y": 224,
+						"w": 32,
+						"h": 14
 					}
 				},
 				{
-					"filename": "0018.png",
+					"filename": "steel",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 35,
-						"h": 55
+						"w": 32,
+						"h": 14
 					},
 					"spriteSourceSize": {
 						"x": 0,
 						"y": 0,
-						"w": 35,
-						"h": 55
+						"w": 32,
+						"h": 14
 					},
 					"frame": {
-						"x": 70,
-						"y": 110,
-						"w": 35,
-						"h": 55
+						"x": 0,
+						"y": 238,
+						"w": 32,
+						"h": 14
 					}
 				},
 				{
-					"filename": "0019.png",
+					"filename": "water",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 35,
-						"h": 55
+						"w": 32,
+						"h": 14
 					},
 					"spriteSourceSize": {
 						"x": 0,
 						"y": 0,
-						"w": 35,
-						"h": 55
+						"w": 32,
+						"h": 14
 					},
 					"frame": {
-						"x": 105,
-						"y": 55,
-						"w": 35,
-						"h": 55
+						"x": 0,
+						"y": 252,
+						"w": 32,
+						"h": 14
 					}
 				},
 				{
-					"filename": "0020.png",
+					"filename": "stellar",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 35,
-						"h": 55
+						"w": 32,
+						"h": 14
 					},
 					"spriteSourceSize": {
 						"x": 0,
 						"y": 0,
-						"w": 35,
-						"h": 55
+						"w": 32,
+						"h": 14
 					},
 					"frame": {
-						"x": 105,
-						"y": 110,
-						"w": 35,
-						"h": 55
+						"x": 0,
+						"y": 266,
+						"w": 32,
+						"h": 14
 					}
 				}
 			]
@@ -435,6 +435,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:06750fe617b2ad66c1af576e0074e016:b59cf22eea90e9839062adc1f728c00a:077dcf06dc5fc347497b59afe6126a5e$"
+		"smartupdate": "$TexturePacker:SmartUpdate:f14cf47d9a8f1d40c8e03aa6ba00fff3:6fc4227b57a95d429a1faad4280f7ec8:5961efbfbf4c56b8745347e7a663a32f$"
 	}
 }
diff --git a/public/images/types_ca-ES.png b/public/images/types_ca-ES.png
new file mode 100644
index 00000000000..e85c84ed9c9
Binary files /dev/null and b/public/images/types_ca-ES.png differ
diff --git a/public/images/types_de.png b/public/images/types_de.png
old mode 100644
new mode 100755
index 62ad3a332bc..a033554029c
Binary files a/public/images/types_de.png and b/public/images/types_de.png differ
diff --git a/public/images/pokemon/exp/shiny/935.json b/public/images/types_es-MX.json
similarity index 56%
rename from public/images/pokemon/exp/shiny/935.json
rename to public/images/types_es-MX.json
index 3b7326364a9..b3dbfcd697f 100644
--- a/public/images/pokemon/exp/shiny/935.json
+++ b/public/images/types_es-MX.json
@@ -1,432 +1,432 @@
 {
 	"textures": [
 		{
-			"image": "935.png",
+			"image": "types_es-MX.png",
 			"format": "RGBA8888",
 			"size": {
-				"w": 165,
-				"h": 165
+				"w": 32,
+				"h": 280
 			},
 			"scale": 1,
 			"frames": [
 				{
-					"filename": "0001.png",
+					"filename": "unknown",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 35,
-						"h": 55
+						"w": 32,
+						"h": 14
 					},
 					"spriteSourceSize": {
 						"x": 0,
 						"y": 0,
-						"w": 35,
-						"h": 55
+						"w": 32,
+						"h": 14
 					},
 					"frame": {
 						"x": 0,
 						"y": 0,
-						"w": 35,
-						"h": 55
+						"w": 32,
+						"h": 14
 					}
 				},
 				{
-					"filename": "0005.png",
+					"filename": "bug",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 35,
-						"h": 55
+						"w": 32,
+						"h": 14
 					},
 					"spriteSourceSize": {
 						"x": 0,
 						"y": 0,
-						"w": 35,
-						"h": 55
+						"w": 32,
+						"h": 14
 					},
 					"frame": {
 						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 55
+						"y": 14,
+						"w": 32,
+						"h": 14
 					}
 				},
 				{
-					"filename": "0009.png",
+					"filename": "dark",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 35,
-						"h": 55
+						"w": 32,
+						"h": 14
 					},
 					"spriteSourceSize": {
 						"x": 0,
 						"y": 0,
-						"w": 35,
-						"h": 55
+						"w": 32,
+						"h": 14
 					},
 					"frame": {
 						"x": 0,
-						"y": 0,
-						"w": 35,
-						"h": 55
+						"y": 28,
+						"w": 32,
+						"h": 14
 					}
 				},
 				{
-					"filename": "0002.png",
+					"filename": "dragon",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 35,
-						"h": 55
+						"w": 32,
+						"h": 14
 					},
 					"spriteSourceSize": {
 						"x": 0,
 						"y": 0,
-						"w": 35,
-						"h": 55
+						"w": 32,
+						"h": 14
 					},
 					"frame": {
 						"x": 0,
-						"y": 55,
-						"w": 35,
-						"h": 55
+						"y": 42,
+						"w": 32,
+						"h": 14
 					}
 				},
 				{
-					"filename": "0006.png",
+					"filename": "electric",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 35,
-						"h": 55
+						"w": 32,
+						"h": 14
 					},
 					"spriteSourceSize": {
 						"x": 0,
 						"y": 0,
-						"w": 35,
-						"h": 55
+						"w": 32,
+						"h": 14
 					},
 					"frame": {
 						"x": 0,
-						"y": 55,
-						"w": 35,
-						"h": 55
+						"y": 56,
+						"w": 32,
+						"h": 14
 					}
 				},
 				{
-					"filename": "0010.png",
+					"filename": "fairy",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 35,
-						"h": 55
+						"w": 32,
+						"h": 14
 					},
 					"spriteSourceSize": {
 						"x": 0,
 						"y": 0,
-						"w": 35,
-						"h": 55
+						"w": 32,
+						"h": 14
 					},
 					"frame": {
 						"x": 0,
-						"y": 55,
-						"w": 35,
-						"h": 55
+						"y": 70,
+						"w": 32,
+						"h": 14
 					}
 				},
 				{
-					"filename": "0003.png",
+					"filename": "fighting",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 35,
-						"h": 55
+						"w": 32,
+						"h": 14
 					},
 					"spriteSourceSize": {
 						"x": 0,
 						"y": 0,
-						"w": 35,
-						"h": 55
+						"w": 32,
+						"h": 14
 					},
 					"frame": {
 						"x": 0,
-						"y": 110,
-						"w": 35,
-						"h": 55
+						"y": 84,
+						"w": 32,
+						"h": 14
 					}
 				},
 				{
-					"filename": "0007.png",
+					"filename": "fire",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 35,
-						"h": 55
+						"w": 32,
+						"h": 14
 					},
 					"spriteSourceSize": {
 						"x": 0,
 						"y": 0,
-						"w": 35,
-						"h": 55
+						"w": 32,
+						"h": 14
 					},
 					"frame": {
 						"x": 0,
-						"y": 110,
-						"w": 35,
-						"h": 55
+						"y": 98,
+						"w": 32,
+						"h": 14
 					}
 				},
 				{
-					"filename": "0011.png",
+					"filename": "flying",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 35,
-						"h": 55
+						"w": 32,
+						"h": 14
 					},
 					"spriteSourceSize": {
 						"x": 0,
 						"y": 0,
-						"w": 35,
-						"h": 55
+						"w": 32,
+						"h": 14
 					},
 					"frame": {
 						"x": 0,
-						"y": 110,
-						"w": 35,
-						"h": 55
+						"y": 112,
+						"w": 32,
+						"h": 14
 					}
 				},
 				{
-					"filename": "0004.png",
+					"filename": "ghost",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 35,
-						"h": 55
+						"w": 32,
+						"h": 14
 					},
 					"spriteSourceSize": {
 						"x": 0,
 						"y": 0,
-						"w": 35,
-						"h": 55
+						"w": 32,
+						"h": 14
 					},
 					"frame": {
-						"x": 35,
-						"y": 0,
-						"w": 35,
-						"h": 55
+						"x": 0,
+						"y": 126,
+						"w": 32,
+						"h": 14
 					}
 				},
 				{
-					"filename": "0008.png",
+					"filename": "grass",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 35,
-						"h": 55
+						"w": 32,
+						"h": 14
 					},
 					"spriteSourceSize": {
 						"x": 0,
 						"y": 0,
-						"w": 35,
-						"h": 55
+						"w": 32,
+						"h": 14
 					},
 					"frame": {
-						"x": 35,
-						"y": 0,
-						"w": 35,
-						"h": 55
+						"x": 0,
+						"y": 140,
+						"w": 32,
+						"h": 14
 					}
 				},
 				{
-					"filename": "0012.png",
+					"filename": "ground",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 35,
-						"h": 55
+						"w": 32,
+						"h": 14
 					},
 					"spriteSourceSize": {
 						"x": 0,
 						"y": 0,
-						"w": 35,
-						"h": 55
+						"w": 32,
+						"h": 14
 					},
 					"frame": {
-						"x": 35,
-						"y": 0,
-						"w": 35,
-						"h": 55
+						"x": 0,
+						"y": 154,
+						"w": 32,
+						"h": 14
 					}
 				},
 				{
-					"filename": "0013.png",
+					"filename": "ice",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 35,
-						"h": 55
+						"w": 32,
+						"h": 14
 					},
 					"spriteSourceSize": {
 						"x": 0,
 						"y": 0,
-						"w": 35,
-						"h": 55
+						"w": 32,
+						"h": 14
 					},
 					"frame": {
-						"x": 35,
-						"y": 55,
-						"w": 35,
-						"h": 55
+						"x": 0,
+						"y": 168,
+						"w": 32,
+						"h": 14
 					}
 				},
 				{
-					"filename": "0014.png",
+					"filename": "normal",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 35,
-						"h": 55
+						"w": 32,
+						"h": 14
 					},
 					"spriteSourceSize": {
 						"x": 0,
 						"y": 0,
-						"w": 35,
-						"h": 55
+						"w": 32,
+						"h": 14
 					},
 					"frame": {
-						"x": 35,
-						"y": 110,
-						"w": 35,
-						"h": 55
+						"x": 0,
+						"y": 182,
+						"w": 32,
+						"h": 14
 					}
 				},
 				{
-					"filename": "0015.png",
+					"filename": "poison",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 35,
-						"h": 55
+						"w": 32,
+						"h": 14
 					},
 					"spriteSourceSize": {
 						"x": 0,
 						"y": 0,
-						"w": 35,
-						"h": 55
+						"w": 32,
+						"h": 14
 					},
 					"frame": {
-						"x": 70,
-						"y": 0,
-						"w": 35,
-						"h": 55
+						"x": 0,
+						"y": 196,
+						"w": 32,
+						"h": 14
 					}
 				},
 				{
-					"filename": "0016.png",
+					"filename": "psychic",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 35,
-						"h": 55
+						"w": 32,
+						"h": 14
 					},
 					"spriteSourceSize": {
 						"x": 0,
 						"y": 0,
-						"w": 35,
-						"h": 55
+						"w": 32,
+						"h": 14
 					},
 					"frame": {
-						"x": 105,
-						"y": 0,
-						"w": 35,
-						"h": 55
+						"x": 0,
+						"y": 210,
+						"w": 32,
+						"h": 14
 					}
 				},
 				{
-					"filename": "0017.png",
+					"filename": "rock",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 35,
-						"h": 55
+						"w": 32,
+						"h": 14
 					},
 					"spriteSourceSize": {
 						"x": 0,
 						"y": 0,
-						"w": 35,
-						"h": 55
+						"w": 32,
+						"h": 14
 					},
 					"frame": {
-						"x": 70,
-						"y": 55,
-						"w": 35,
-						"h": 55
+						"x": 0,
+						"y": 224,
+						"w": 32,
+						"h": 14
 					}
 				},
 				{
-					"filename": "0018.png",
+					"filename": "steel",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 35,
-						"h": 55
+						"w": 32,
+						"h": 14
 					},
 					"spriteSourceSize": {
 						"x": 0,
 						"y": 0,
-						"w": 35,
-						"h": 55
+						"w": 32,
+						"h": 14
 					},
 					"frame": {
-						"x": 70,
-						"y": 110,
-						"w": 35,
-						"h": 55
+						"x": 0,
+						"y": 238,
+						"w": 32,
+						"h": 14
 					}
 				},
 				{
-					"filename": "0019.png",
+					"filename": "water",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 35,
-						"h": 55
+						"w": 32,
+						"h": 14
 					},
 					"spriteSourceSize": {
 						"x": 0,
 						"y": 0,
-						"w": 35,
-						"h": 55
+						"w": 32,
+						"h": 14
 					},
 					"frame": {
-						"x": 105,
-						"y": 55,
-						"w": 35,
-						"h": 55
+						"x": 0,
+						"y": 252,
+						"w": 32,
+						"h": 14
 					}
 				},
 				{
-					"filename": "0020.png",
+					"filename": "stellar",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 35,
-						"h": 55
+						"w": 32,
+						"h": 14
 					},
 					"spriteSourceSize": {
 						"x": 0,
 						"y": 0,
-						"w": 35,
-						"h": 55
+						"w": 32,
+						"h": 14
 					},
 					"frame": {
-						"x": 105,
-						"y": 110,
-						"w": 35,
-						"h": 55
+						"x": 0,
+						"y": 266,
+						"w": 32,
+						"h": 14
 					}
 				}
 			]
@@ -435,6 +435,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:f58bc6c5ab628b520de90b88937784eb:2cb222a4a62936135e43a7f74d7bb852:077dcf06dc5fc347497b59afe6126a5e$"
+		"smartupdate": "$TexturePacker:SmartUpdate:f14cf47d9a8f1d40c8e03aa6ba00fff3:6fc4227b57a95d429a1faad4280f7ec8:5961efbfbf4c56b8745347e7a663a32f$"
 	}
 }
diff --git a/public/images/types_es-MX.png b/public/images/types_es-MX.png
new file mode 100644
index 00000000000..134a68258cc
Binary files /dev/null and b/public/images/types_es-MX.png differ
diff --git a/public/images/ui/button_tera.json b/public/images/ui/button_tera.json
new file mode 100644
index 00000000000..7b64db66ae6
--- /dev/null
+++ b/public/images/ui/button_tera.json
@@ -0,0 +1,158 @@
+{ "frames": {
+   "unknown": {
+    "frame": { "x": 0, "y": 0, "w": 18, "h": 21 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 18, "h": 21 },
+    "sourceSize": { "w": 20, "h": 23 }
+   },
+   "bug": {
+    "frame": { "x": 18, "y": 0, "w": 18, "h": 21 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 18, "h": 21 },
+    "sourceSize": { "w": 20, "h": 23 }
+   },
+   "dark": {
+    "frame": { "x": 36, "y": 0, "w": 18, "h": 21 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 18, "h": 21 },
+    "sourceSize": { "w": 20, "h": 23 }
+   },
+   "dragon": {
+    "frame": { "x": 54, "y": 0, "w": 18, "h": 21 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 18, "h": 21 },
+    "sourceSize": { "w": 20, "h": 23 }
+   },
+   "electric": {
+    "frame": { "x": 72, "y": 0, "w": 18, "h": 21 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 18, "h": 21 },
+    "sourceSize": { "w": 20, "h": 23 }
+   },
+   "fairy": {
+    "frame": { "x": 0, "y": 21, "w": 18, "h": 21 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 18, "h": 21 },
+    "sourceSize": { "w": 20, "h": 23 }
+   },
+   "fighting": {
+    "frame": { "x": 18, "y": 21, "w": 18, "h": 21 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 18, "h": 21 },
+    "sourceSize": { "w": 20, "h": 23 }
+   },
+   "fire": {
+    "frame": { "x": 36, "y": 21, "w": 18, "h": 21 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 18, "h": 21 },
+    "sourceSize": { "w": 20, "h": 23 }
+   },
+   "flying": {
+    "frame": { "x": 54, "y": 21, "w": 18, "h": 21 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 18, "h": 21 },
+    "sourceSize": { "w": 20, "h": 23 }
+   },
+   "ghost": {
+    "frame": { "x": 72, "y": 21, "w": 18, "h": 21 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 18, "h": 21 },
+    "sourceSize": { "w": 20, "h": 23 }
+   },
+   "grass": {
+    "frame": { "x": 0, "y": 42, "w": 18, "h": 21 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 18, "h": 21 },
+    "sourceSize": { "w": 20, "h": 23 }
+   },
+   "ground": {
+    "frame": { "x": 18, "y": 42, "w": 18, "h": 21 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 18, "h": 21 },
+    "sourceSize": { "w": 20, "h": 23 }
+   },
+   "ice": {
+    "frame": { "x": 36, "y": 42, "w": 18, "h": 21 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 18, "h": 21 },
+    "sourceSize": { "w": 20, "h": 23 }
+   },
+   "normal": {
+    "frame": { "x": 54, "y": 42, "w": 18, "h": 21 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 18, "h": 21 },
+    "sourceSize": { "w": 20, "h": 23 }
+   },
+   "poison": {
+    "frame": { "x": 72, "y": 42, "w": 18, "h": 21 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 18, "h": 21 },
+    "sourceSize": { "w": 20, "h": 23 }
+   },
+   "psychic": {
+    "frame": { "x": 0, "y": 63, "w": 18, "h": 21 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 18, "h": 21 },
+    "sourceSize": { "w": 20, "h": 23 }
+   },
+   "rock": {
+    "frame": { "x": 18, "y": 63, "w": 18, "h": 21 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 18, "h": 21 },
+    "sourceSize": { "w": 20, "h": 23 }
+   },
+   "steel": {
+    "frame": { "x": 36, "y": 63, "w": 18, "h": 21 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 18, "h": 21 },
+    "sourceSize": { "w": 20, "h": 23 }
+   },
+   "water": {
+    "frame": { "x": 54, "y": 63, "w": 18, "h": 21 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 18, "h": 21 },
+    "sourceSize": { "w": 20, "h": 23 }
+   },
+   "stellar": {
+    "frame": { "x": 72, "y": 63, "w": 18, "h": 21 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 18, "h": 21 },
+    "sourceSize": { "w": 20, "h": 23 }
+   }
+ },
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.7-dev",
+  "image": "button_tera.png",
+  "format": "RGBA8888",
+  "size": { "w": 90, "h": 84 },
+  "scale": "1",
+  "frameTags": [
+  ],
+  "layers": [
+   { "name": "Sprite Sheet", "opacity": 255, "blendMode": "normal" }
+  ],
+  "slices": [
+  ]
+ }
+}
diff --git a/public/images/ui/button_tera.png b/public/images/ui/button_tera.png
new file mode 100644
index 00000000000..c9672bafa39
Binary files /dev/null and b/public/images/ui/button_tera.png differ
diff --git a/public/images/ui/cursor_tera.png b/public/images/ui/cursor_tera.png
new file mode 100644
index 00000000000..34cbe095895
Binary files /dev/null and b/public/images/ui/cursor_tera.png differ
diff --git a/public/images/ui/legacy/button_tera.json b/public/images/ui/legacy/button_tera.json
new file mode 100644
index 00000000000..7b64db66ae6
--- /dev/null
+++ b/public/images/ui/legacy/button_tera.json
@@ -0,0 +1,158 @@
+{ "frames": {
+   "unknown": {
+    "frame": { "x": 0, "y": 0, "w": 18, "h": 21 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 18, "h": 21 },
+    "sourceSize": { "w": 20, "h": 23 }
+   },
+   "bug": {
+    "frame": { "x": 18, "y": 0, "w": 18, "h": 21 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 18, "h": 21 },
+    "sourceSize": { "w": 20, "h": 23 }
+   },
+   "dark": {
+    "frame": { "x": 36, "y": 0, "w": 18, "h": 21 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 18, "h": 21 },
+    "sourceSize": { "w": 20, "h": 23 }
+   },
+   "dragon": {
+    "frame": { "x": 54, "y": 0, "w": 18, "h": 21 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 18, "h": 21 },
+    "sourceSize": { "w": 20, "h": 23 }
+   },
+   "electric": {
+    "frame": { "x": 72, "y": 0, "w": 18, "h": 21 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 18, "h": 21 },
+    "sourceSize": { "w": 20, "h": 23 }
+   },
+   "fairy": {
+    "frame": { "x": 0, "y": 21, "w": 18, "h": 21 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 18, "h": 21 },
+    "sourceSize": { "w": 20, "h": 23 }
+   },
+   "fighting": {
+    "frame": { "x": 18, "y": 21, "w": 18, "h": 21 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 18, "h": 21 },
+    "sourceSize": { "w": 20, "h": 23 }
+   },
+   "fire": {
+    "frame": { "x": 36, "y": 21, "w": 18, "h": 21 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 18, "h": 21 },
+    "sourceSize": { "w": 20, "h": 23 }
+   },
+   "flying": {
+    "frame": { "x": 54, "y": 21, "w": 18, "h": 21 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 18, "h": 21 },
+    "sourceSize": { "w": 20, "h": 23 }
+   },
+   "ghost": {
+    "frame": { "x": 72, "y": 21, "w": 18, "h": 21 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 18, "h": 21 },
+    "sourceSize": { "w": 20, "h": 23 }
+   },
+   "grass": {
+    "frame": { "x": 0, "y": 42, "w": 18, "h": 21 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 18, "h": 21 },
+    "sourceSize": { "w": 20, "h": 23 }
+   },
+   "ground": {
+    "frame": { "x": 18, "y": 42, "w": 18, "h": 21 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 18, "h": 21 },
+    "sourceSize": { "w": 20, "h": 23 }
+   },
+   "ice": {
+    "frame": { "x": 36, "y": 42, "w": 18, "h": 21 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 18, "h": 21 },
+    "sourceSize": { "w": 20, "h": 23 }
+   },
+   "normal": {
+    "frame": { "x": 54, "y": 42, "w": 18, "h": 21 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 18, "h": 21 },
+    "sourceSize": { "w": 20, "h": 23 }
+   },
+   "poison": {
+    "frame": { "x": 72, "y": 42, "w": 18, "h": 21 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 18, "h": 21 },
+    "sourceSize": { "w": 20, "h": 23 }
+   },
+   "psychic": {
+    "frame": { "x": 0, "y": 63, "w": 18, "h": 21 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 18, "h": 21 },
+    "sourceSize": { "w": 20, "h": 23 }
+   },
+   "rock": {
+    "frame": { "x": 18, "y": 63, "w": 18, "h": 21 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 18, "h": 21 },
+    "sourceSize": { "w": 20, "h": 23 }
+   },
+   "steel": {
+    "frame": { "x": 36, "y": 63, "w": 18, "h": 21 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 18, "h": 21 },
+    "sourceSize": { "w": 20, "h": 23 }
+   },
+   "water": {
+    "frame": { "x": 54, "y": 63, "w": 18, "h": 21 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 18, "h": 21 },
+    "sourceSize": { "w": 20, "h": 23 }
+   },
+   "stellar": {
+    "frame": { "x": 72, "y": 63, "w": 18, "h": 21 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 18, "h": 21 },
+    "sourceSize": { "w": 20, "h": 23 }
+   }
+ },
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.7-dev",
+  "image": "button_tera.png",
+  "format": "RGBA8888",
+  "size": { "w": 90, "h": 84 },
+  "scale": "1",
+  "frameTags": [
+  ],
+  "layers": [
+   { "name": "Sprite Sheet", "opacity": 255, "blendMode": "normal" }
+  ],
+  "slices": [
+  ]
+ }
+}
diff --git a/public/images/ui/legacy/button_tera.png b/public/images/ui/legacy/button_tera.png
new file mode 100644
index 00000000000..c9672bafa39
Binary files /dev/null and b/public/images/ui/legacy/button_tera.png differ
diff --git a/public/images/ui/legacy/cursor_tera.png b/public/images/ui/legacy/cursor_tera.png
new file mode 100644
index 00000000000..f2e77046137
Binary files /dev/null and b/public/images/ui/legacy/cursor_tera.png differ
diff --git a/public/images/ui/legacy/summary_bg.png b/public/images/ui/legacy/summary_bg.png
index e4da2dd5da2..c482b5a1bf1 100644
Binary files a/public/images/ui/legacy/summary_bg.png and b/public/images/ui/legacy/summary_bg.png differ
diff --git a/public/images/ui/legacy/summary_profile.png b/public/images/ui/legacy/summary_profile.png
index 1d184023ca8..77d59dac177 100644
Binary files a/public/images/ui/legacy/summary_profile.png and b/public/images/ui/legacy/summary_profile.png differ
diff --git a/public/images/ui/summary_bg.png b/public/images/ui/summary_bg.png
index b77cdadd2ac..a86a94dd56e 100644
Binary files a/public/images/ui/summary_bg.png and b/public/images/ui/summary_bg.png differ
diff --git a/public/images/ui/summary_profile.png b/public/images/ui/summary_profile.png
index 38bb5e84dfd..55cc70dc4d0 100644
Binary files a/public/images/ui/summary_profile.png and b/public/images/ui/summary_profile.png differ
diff --git a/public/locales b/public/locales
index 5f6fa82c17d..42cd5cf577f 160000
--- a/public/locales
+++ b/public/locales
@@ -1 +1 @@
-Subproject commit 5f6fa82c17d5981eaec15f105880ac2b4c99cc8d
+Subproject commit 42cd5cf577f475c22bc82d55e7ca358eb4f3184f
diff --git a/scripts/find_sprite_variant_mismatches.py b/scripts/find_sprite_variant_mismatches.py
new file mode 100644
index 00000000000..b26058c2de3
--- /dev/null
+++ b/scripts/find_sprite_variant_mismatches.py
@@ -0,0 +1,102 @@
+"""
+Validates the contents of the variant's masterlist file and identifies
+any mismatched entries for the sprite of the same key between front, back, exp, exp back, and female.
+
+This will create a csv file that contains all of the entries with mismatches.
+
+An empty entry means that there was not a mismatch for that version of the sprite (meaning it matches front).
+"""
+
+import sys
+
+if sys.version_info < (3, 7):
+    msg = "This script requires Python 3.7+"
+    raise RuntimeError(msg)
+
+import json
+import os
+import csv
+from dataclasses import dataclass, field
+from typing import Literal as L
+
+MASTERLIST_PATH = os.path.join(
+    os.path.dirname(os.path.dirname(__file__)), "public", "images", "pokemon", "variant", "_masterlist.json"
+)
+EXP_MASTERLIST_PATH = os.path.join(
+    os.path.dirname(os.path.dirname(__file__)), "public", "images", "pokemon", "variant", "_exp_masterlist.json"
+)
+DEFAULT_OUTPUT_PATH = "sprite-mismatches.csv"
+
+
+@dataclass(order=True)
+class Sprite:
+    key: str = field(compare=False)
+    front: list[int] = field(default_factory=list, compare=False)
+    back: list[int] = field(default_factory=list, compare=False)
+    female: list[int] = field(default_factory=list, compare=False)
+    exp: list[int] = field(default_factory=list, compare=False)
+    expback: list[int] = field(default_factory=list, compare=False)
+    sortedKey: tuple[int] | tuple[int, str] = field(init=False, repr=False, compare=True)
+
+    def as_row(self) -> tuple[str, list[int] | L[""], list[int] | L[""], list[int] | L[""], list[int] | L[""], list[int] | L[""]]:
+        """return sprite information as a tuple for csv writing"""
+        return (self.key, self.front or "", self.back or "", self.exp or "", self.expback or "", self.female or "")
+
+    def is_mismatch(self) -> bool:
+        """return True if the female, back, or exp sprites do not match the front"""
+        for val in [self.back, self.exp, self.expback, self.female]:
+            if val != [] and val != self.front:
+                return True
+        return False
+
+    def __post_init__(self):
+        split = self.key.split("-", maxsplit=1)
+        self.sortedKey = (int(split[0]), split[1]) if len(split) == 2 else (int(split[0]),)
+
+
+def make_mismatch_sprite_list(path):
+    with open(path, "r") as f:
+        masterlist: dict = json.load(f)
+
+    # Go through the keys in "front" and "back" and make sure they match the masterlist
+    back_data: dict[str, list[int]] = masterlist.pop("back", {})
+    exp_data: dict[str, list[int]] = masterlist.pop("exp", {})
+    exp_back_data: dict[str, list[int]] = exp_data.get("back", [])
+    female_data: dict[str, list[int]] = masterlist.pop("female", {})
+
+    sprites: list[Sprite] = []
+
+    for key, item in masterlist.items():
+        sprite = Sprite(
+            key, front=item, back=back_data.get(key, []), exp=exp_data.get(key, []), expback=exp_back_data.get(key, []), female=female_data.get(key, [])
+        )
+        if sprite.is_mismatch():
+            sprites.append(sprite)
+
+    return sprites
+
+
+def write_mismatch_csv(filename: str, mismatches: list[Sprite]):
+    with open(filename, "w", newline="") as csvfile:
+        writer = csv.writer(csvfile)
+        writer.writerow(["key", "front", "back", "exp", "expback", "female"])
+        for sprite in sorted(mismatches):
+            writer.writerow(sprite.as_row())
+
+
+if __name__ == "__main__":
+    import argparse
+
+    p = argparse.ArgumentParser("find_sprite_variant_mismatches", description=__doc__)
+
+    p.add_argument(
+        "-o",
+        "--output",
+        default=DEFAULT_OUTPUT_PATH,
+        help=f"The path to a file to save the output file. If not specified, will write to {DEFAULT_OUTPUT_PATH}.",
+    )
+    p.add_argument("--masterlist", default=MASTERLIST_PATH, help=f"The path to the masterlist file to validate. Defaults to {MASTERLIST_PATH}.")
+    p.add_argument("--exp-masterlist", default=EXP_MASTERLIST_PATH, help=f"The path to the exp masterlist file to validate against. Defaults to {EXP_MASTERLIST_PATH}.")
+    args = p.parse_args()
+    mismatches = make_mismatch_sprite_list(args.masterlist)
+    write_mismatch_csv(args.output, mismatches)
diff --git a/src/@types/DexData.ts b/src/@types/DexData.ts
new file mode 100644
index 00000000000..19bb0357471
--- /dev/null
+++ b/src/@types/DexData.ts
@@ -0,0 +1,16 @@
+/**
+ * Dex entry for a single Pokemon Species
+ */
+export interface DexEntry {
+  seenAttr: bigint;
+  caughtAttr: bigint;
+  natureAttr: number;
+  seenCount: number;
+  caughtCount: number;
+  hatchedCount: number;
+  ivs: number[];
+}
+
+export interface DexData {
+  [key: number]: DexEntry;
+}
diff --git a/src/@types/SessionSaveMigrator.ts b/src/@types/SessionSaveMigrator.ts
new file mode 100644
index 00000000000..c4b0ad8dda4
--- /dev/null
+++ b/src/@types/SessionSaveMigrator.ts
@@ -0,0 +1,6 @@
+import type { SessionSaveData } from "#app/system/game-data";
+
+export interface SessionSaveMigrator {
+  version: string;
+  migrate: (data: SessionSaveData) => void;
+}
diff --git a/src/@types/SettingsSaveMigrator.ts b/src/@types/SettingsSaveMigrator.ts
new file mode 100644
index 00000000000..aae3df7cc60
--- /dev/null
+++ b/src/@types/SettingsSaveMigrator.ts
@@ -0,0 +1,5 @@
+export interface SettingsSaveMigrator {
+  version: string;
+  // biome-ignore lint/complexity/noBannedTypes: TODO - refactor settings
+  migrate: (data: Object) => void;
+}
diff --git a/src/@types/SystemSaveMigrator.ts b/src/@types/SystemSaveMigrator.ts
new file mode 100644
index 00000000000..a22b5f6c93d
--- /dev/null
+++ b/src/@types/SystemSaveMigrator.ts
@@ -0,0 +1,6 @@
+import type { SystemSaveData } from "#app/system/game-data";
+
+export interface SystemSaveMigrator {
+  version: string;
+  migrate: (data: SystemSaveData) => void;
+}
diff --git a/src/@types/ability-types.ts b/src/@types/ability-types.ts
new file mode 100644
index 00000000000..5d21aaaa844
--- /dev/null
+++ b/src/@types/ability-types.ts
@@ -0,0 +1,11 @@
+import type { AbAttr } from "#app/data/abilities/ab-attrs/ab-attr";
+import type Move from "#app/data/moves/move";
+import type Pokemon from "#app/field/pokemon";
+import type { BattleStat } from "#enums/stat";
+
+export type AbAttrApplyFunc<TAttr extends AbAttr> = (attr: TAttr, passive: boolean) => void;
+export type AbAttrSuccessFunc<TAttr extends AbAttr> = (attr: TAttr, passive: boolean) => boolean;
+export type AbAttrCondition = (pokemon: Pokemon) => boolean;
+export type PokemonAttackCondition = (user: Pokemon | null, target: Pokemon | null, move: Move) => boolean;
+export type PokemonDefendCondition = (target: Pokemon, user: Pokemon, move: Move) => boolean;
+export type PokemonStatStageChangeCondition = (target: Pokemon, statsChanged: BattleStat[], stages: number) => boolean;
diff --git a/src/account.ts b/src/account.ts
index 4c86595a5e6..3416fa6ed5e 100644
--- a/src/account.ts
+++ b/src/account.ts
@@ -1,20 +1,32 @@
 import { pokerogueApi } from "#app/plugins/api/pokerogue-api";
 import type { UserInfo } from "#app/@types/UserInfo";
-import { bypassLogin } from "./battle-scene";
-import * as Utils from "./utils";
+import { bypassLogin } from "./global-vars/bypass-login";
+import { randomString } from "#app/utils/common";
 
 export let loggedInUser: UserInfo | null = null;
 // This is a random string that is used to identify the client session - unique per session (tab or window) so that the game will only save on the one that the server is expecting
-export const clientSessionId = Utils.randomString(32);
+export const clientSessionId = randomString(32);
 
 export function initLoggedInUser(): void {
-  loggedInUser = { username: "Guest", lastSessionSlot: -1, discordId: "", googleId: "", hasAdminRole: false };
+  loggedInUser = {
+    username: "Guest",
+    lastSessionSlot: -1,
+    discordId: "",
+    googleId: "",
+    hasAdminRole: false,
+  };
 }
 
 export function updateUserInfo(): Promise<[boolean, number]> {
   return new Promise<[boolean, number]>(resolve => {
     if (bypassLogin) {
-      loggedInUser = { username: "Guest", lastSessionSlot: -1, discordId: "", googleId: "", hasAdminRole: false };
+      loggedInUser = {
+        username: "Guest",
+        lastSessionSlot: -1,
+        discordId: "",
+        googleId: "",
+        hasAdminRole: false,
+      };
       let lastSessionSlot = -1;
       for (let s = 0; s < 5; s++) {
         if (localStorage.getItem(`sessionData${s ? s : ""}_${loggedInUser.username}`)) {
@@ -24,7 +36,7 @@ export function updateUserInfo(): Promise<[boolean, number]> {
       }
       loggedInUser.lastSessionSlot = lastSessionSlot;
       // Migrate old data from before the username was appended
-      [ "data", "sessionData", "sessionData1", "sessionData2", "sessionData3", "sessionData4" ].map(d => {
+      ["data", "sessionData", "sessionData1", "sessionData2", "sessionData3", "sessionData4"].map(d => {
         const lsItem = localStorage.getItem(d);
         if (lsItem && !!loggedInUser?.username) {
           const lsUserItem = localStorage.getItem(`${d}_${loggedInUser.username}`);
@@ -35,16 +47,15 @@ export function updateUserInfo(): Promise<[boolean, number]> {
           localStorage.removeItem(d);
         }
       });
-      return resolve([ true, 200 ]);
+      return resolve([true, 200]);
     }
-    pokerogueApi.account.getInfo().then(([ accountInfo, status ]) => {
+    pokerogueApi.account.getInfo().then(([accountInfo, status]) => {
       if (!accountInfo) {
-        resolve([ false, status ]);
+        resolve([false, status]);
         return;
-      } else {
-        loggedInUser = accountInfo;
-        resolve([ true, 200 ]);
       }
+      loggedInUser = accountInfo;
+      resolve([true, 200]);
     });
   });
 }
diff --git a/src/battle-scene.ts b/src/battle-scene.ts
index 9bfa153ef60..5835ee08af5 100644
--- a/src/battle-scene.ts
+++ b/src/battle-scene.ts
@@ -5,32 +5,87 @@ import { EnemyPokemon, PlayerPokemon } from "#app/field/pokemon";
 import type { PokemonSpeciesFilter } from "#app/data/pokemon-species";
 import type PokemonSpecies from "#app/data/pokemon-species";
 import { allSpecies, getPokemonSpecies } from "#app/data/pokemon-species";
-import type { Constructor } from "#app/utils";
-import { isNullOrUndefined, randSeedInt } from "#app/utils";
-import * as Utils from "#app/utils";
+import {
+  fixedInt,
+  getIvsFromId,
+  randSeedInt,
+  getEnumValues,
+  randomString,
+  NumberHolder,
+  shiftCharCodes,
+  formatMoney,
+  isNullOrUndefined,
+  BooleanHolder,
+  type Constructor,
+} from "#app/utils/common";
+import { deepMergeSpriteData } from "#app/utils/data";
 import type { Modifier, ModifierPredicate, TurnHeldItemTransferModifier } from "./modifier/modifier";
-import { ConsumableModifier, ConsumablePokemonModifier, DoubleBattleChanceBoosterModifier, ExpBalanceModifier, ExpShareModifier, FusePokemonModifier, HealingBoosterModifier, ModifierBar, MultipleParticipantExpBonusModifier, PersistentModifier, PokemonExpBoosterModifier, PokemonFormChangeItemModifier, PokemonHeldItemModifier, PokemonHpRestoreModifier, PokemonIncrementingStatModifier, RememberMoveModifier, TerastallizeModifier } from "./modifier/modifier";
+import {
+  ConsumableModifier,
+  ConsumablePokemonModifier,
+  DoubleBattleChanceBoosterModifier,
+  ExpBalanceModifier,
+  ExpShareModifier,
+  FusePokemonModifier,
+  HealingBoosterModifier,
+  ModifierBar,
+  MultipleParticipantExpBonusModifier,
+  PersistentModifier,
+  PokemonExpBoosterModifier,
+  PokemonFormChangeItemModifier,
+  PokemonHeldItemModifier,
+  PokemonHpRestoreModifier,
+  PokemonIncrementingStatModifier,
+  RememberMoveModifier,
+} from "./modifier/modifier";
 import { PokeballType } from "#enums/pokeball";
-import { initCommonAnims, initMoveAnim, loadCommonAnimAssets, loadMoveAnimAssets, populateAnims } from "#app/data/battle-anims";
+import {
+  initCommonAnims,
+  initMoveAnim,
+  loadCommonAnimAssets,
+  loadMoveAnimAssets,
+  populateAnims,
+} from "#app/data/battle-anims";
 import type { Phase } from "#app/phase";
 import { initGameSpeed } from "#app/system/game-speed";
 import { Arena, ArenaBase } from "#app/field/arena";
 import { GameData } from "#app/system/game-data";
 import { addTextObject, getTextColor, TextStyle } from "#app/ui/text";
-import { allMoves } from "#app/data/move";
+import { allMoves } from "#app/data/moves/move";
 import { MusicPreference } from "#app/system/settings/settings";
-import { getDefaultModifierTypeForTier, getEnemyModifierTypesForWave, getLuckString, getLuckTextTint, getModifierPoolForType, getModifierType, getPartyLuckValue, ModifierPoolType, modifierTypes, PokemonHeldItemModifierType } from "#app/modifier/modifier-type";
+import {
+  getDefaultModifierTypeForTier,
+  getEnemyModifierTypesForWave,
+  getLuckString,
+  getLuckTextTint,
+  getModifierPoolForType,
+  getModifierType,
+  getPartyLuckValue,
+  ModifierPoolType,
+  modifierTypes,
+  PokemonHeldItemModifierType,
+} from "#app/modifier/modifier-type";
 import AbilityBar from "#app/ui/ability-bar";
-import { allAbilities, applyAbAttrs, applyPostBattleInitAbAttrs, applyPostItemLostAbAttrs, BlockItemTheftAbAttr, DoubleBattleChanceAbAttr, PostBattleInitAbAttr, PostItemLostAbAttr } from "#app/data/ability";
+import {
+  applyAbAttrs,
+  applyPostBattleInitAbAttrs,
+  applyPostItemLostAbAttrs,
+  BlockItemTheftAbAttr,
+  DoubleBattleChanceAbAttr,
+  PostBattleInitAbAttr,
+  PostItemLostAbAttr,
+} from "#app/data/abilities/ability";
+import { allAbilities } from "./data/data-lists";
 import type { FixedBattleConfig } from "#app/battle";
-import Battle, { BattleType } from "#app/battle";
+import Battle from "#app/battle";
+import { BattleType } from "#enums/battle-type";
 import type { GameMode } from "#app/game-mode";
 import { GameModes, getGameMode } from "#app/game-mode";
 import FieldSpritePipeline from "#app/pipelines/field-sprite";
 import SpritePipeline from "#app/pipelines/sprite";
 import PartyExpBar from "#app/ui/party-exp-bar";
-import type { TrainerSlot } from "#app/data/trainer-config";
-import { trainerConfigs } from "#app/data/trainer-config";
+import type { TrainerSlot } from "./enums/trainer-slot";
+import { trainerConfigs } from "#app/data/trainers/trainer-config";
 import Trainer, { TrainerVariant } from "#app/field/trainer";
 import type TrainerData from "#app/system/trainer-data";
 import SoundFade from "phaser3-rex-plugins/plugins/soundfade";
@@ -47,10 +102,15 @@ import { addUiThemeOverrides } from "#app/ui/ui-theme";
 import type PokemonData from "#app/system/pokemon-data";
 import { Nature } from "#enums/nature";
 import type { SpeciesFormChange, SpeciesFormChangeTrigger } from "#app/data/pokemon-forms";
-import { FormChangeItem, pokemonFormChanges, SpeciesFormChangeManualTrigger, SpeciesFormChangeTimeOfDayTrigger } from "#app/data/pokemon-forms";
+import {
+  FormChangeItem,
+  pokemonFormChanges,
+  SpeciesFormChangeManualTrigger,
+  SpeciesFormChangeTimeOfDayTrigger,
+} from "#app/data/pokemon-forms";
 import { FormChangePhase } from "#app/phases/form-change-phase";
 import { getTypeRgb } from "#app/data/type";
-import { Type } from "#enums/type";
+import { PokemonType } from "#enums/pokemon-type";
 import PokemonSpriteSparkleHandler from "#app/field/pokemon-sprite-sparkle-handler";
 import CharSprite from "#app/ui/char-sprite";
 import DamageNumberHandler from "#app/field/damage-number-handler";
@@ -58,8 +118,8 @@ import PokemonInfoContainer from "#app/ui/pokemon-info-container";
 import { biomeDepths, getBiomeName } from "#app/data/balance/biomes";
 import { SceneBase } from "#app/scene-base";
 import CandyBar from "#app/ui/candy-bar";
-import type { Variant, VariantSet } from "#app/data/variant";
-import { variantColorCache, variantData } from "#app/data/variant";
+import type { Variant } from "#app/sprites/variant";
+import { variantData, clearVariantData } from "#app/sprites/variant";
 import type { Localizable } from "#app/interfaces/locales";
 import Overrides from "#app/overrides";
 import { InputsController } from "#app/inputs-controller";
@@ -91,7 +151,6 @@ import { NextEncounterPhase } from "#app/phases/next-encounter-phase";
 import { PokemonAnimPhase } from "#app/phases/pokemon-anim-phase";
 import { QuietFormChangePhase } from "#app/phases/quiet-form-change-phase";
 import { ReturnPhase } from "#app/phases/return-phase";
-import { SelectBiomePhase } from "#app/phases/select-biome-phase";
 import { ShowTrainerPhase } from "#app/phases/show-trainer-phase";
 import { SummonPhase } from "#app/phases/summon-phase";
 import { SwitchPhase } from "#app/phases/switch-phase";
@@ -100,7 +159,14 @@ import { ToggleDoublePositionPhase } from "#app/phases/toggle-double-position-ph
 import { TurnInitPhase } from "#app/phases/turn-init-phase";
 import { ShopCursorTarget } from "#app/enums/shop-cursor-target";
 import MysteryEncounter from "#app/data/mystery-encounters/mystery-encounter";
-import { allMysteryEncounters, ANTI_VARIANCE_WEIGHT_MODIFIER, AVERAGE_ENCOUNTERS_PER_RUN_TARGET, BASE_MYSTERY_ENCOUNTER_SPAWN_WEIGHT, MYSTERY_ENCOUNTER_SPAWN_MAX_WEIGHT, mysteryEncountersByBiome } from "#app/data/mystery-encounters/mystery-encounters";
+import {
+  allMysteryEncounters,
+  ANTI_VARIANCE_WEIGHT_MODIFIER,
+  AVERAGE_ENCOUNTERS_PER_RUN_TARGET,
+  BASE_MYSTERY_ENCOUNTER_SPAWN_WEIGHT,
+  MYSTERY_ENCOUNTER_SPAWN_MAX_WEIGHT,
+  mysteryEncountersByBiome,
+} from "#app/data/mystery-encounters/mystery-encounters";
 import { MysteryEncounterSaveData } from "#app/data/mystery-encounters/mystery-encounter-save-data";
 import { MysteryEncounterType } from "#enums/mystery-encounter-type";
 import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
@@ -113,35 +179,29 @@ import { BattlerTagType } from "#enums/battler-tag-type";
 import { FRIENDSHIP_GAIN_FROM_BATTLE } from "#app/data/balance/starters";
 import { StatusEffect } from "#enums/status-effect";
 import { initGlobalScene } from "#app/global-scene";
-
-export const bypassLogin = import.meta.env.VITE_BYPASS_LOGIN === "1";
+import { ShowAbilityPhase } from "#app/phases/show-ability-phase";
+import { HideAbilityPhase } from "#app/phases/hide-ability-phase";
+import { expSpriteKeys } from "./sprites/sprite-keys";
+import { hasExpSprite } from "./sprites/sprite-utils";
+import { timedEventManager } from "./global-event-manager";
+import { starterColors } from "./global-vars/starter-colors";
+import { startingWave } from "./starting-wave";
 
 const DEBUG_RNG = false;
 
-const OPP_IVS_OVERRIDE_VALIDATED : number[] = (
-  Array.isArray(Overrides.OPP_IVS_OVERRIDE) ?
-    Overrides.OPP_IVS_OVERRIDE :
-    new Array(6).fill(Overrides.OPP_IVS_OVERRIDE)
-).map(iv => isNaN(iv) || iv === null || iv > 31 ? -1 : iv);
-
-export const startingWave = Overrides.STARTING_WAVE_OVERRIDE || 1;
-
-const expSpriteKeys: string[] = [];
-
-export let starterColors: StarterColors;
-interface StarterColors {
-    [key: string]: [string, string]
-}
+const OPP_IVS_OVERRIDE_VALIDATED: number[] = (
+  Array.isArray(Overrides.OPP_IVS_OVERRIDE) ? Overrides.OPP_IVS_OVERRIDE : new Array(6).fill(Overrides.OPP_IVS_OVERRIDE)
+).map(iv => (Number.isNaN(iv) || iv === null || iv > 31 ? -1 : iv));
 
 export interface PokeballCounts {
-    [pb: string]: number;
+  [pb: string]: number;
 }
 
 export type AnySound = Phaser.Sound.WebAudioSound | Phaser.Sound.HTML5AudioSound | Phaser.Sound.NoAudioSound;
 
 export interface InfoToggle {
-    toggleInfo(force?: boolean): void;
-    isActive(): boolean;
+  toggleInfo(force?: boolean): void;
+  isActive(): boolean;
 }
 
 export default class BattleScene extends SceneBase {
@@ -151,73 +211,73 @@ export default class BattleScene extends SceneBase {
 
   public sessionPlayTime: number | null = null;
   public lastSavePlayTime: number | null = null;
-  public masterVolume: number = 0.5;
-  public bgmVolume: number = 1;
-  public fieldVolume: number = 1;
-  public seVolume: number = 1;
-  public uiVolume: number = 1;
-  public gameSpeed: number = 1;
-  public damageNumbersMode: number = 0;
-  public reroll: boolean = false;
+  public masterVolume = 0.5;
+  public bgmVolume = 1;
+  public fieldVolume = 1;
+  public seVolume = 1;
+  public uiVolume = 1;
+  public gameSpeed = 1;
+  public damageNumbersMode = 0;
+  public reroll = false;
   public shopCursorTarget: number = ShopCursorTarget.REWARDS;
-  public commandCursorMemory: boolean = false;
-  public dexForDevs: boolean = false;
-  public showMovesetFlyout: boolean = true;
-  public showArenaFlyout: boolean = true;
-  public showTimeOfDayWidget: boolean = true;
+  public commandCursorMemory = false;
+  public dexForDevs = false;
+  public showMovesetFlyout = true;
+  public showArenaFlyout = true;
+  public showTimeOfDayWidget = true;
   public timeOfDayAnimation: EaseType = EaseType.NONE;
-  public showLevelUpStats: boolean = true;
+  public showLevelUpStats = true;
   public enableTutorials: boolean = import.meta.env.VITE_BYPASS_TUTORIAL === "1";
-  public enableMoveInfo: boolean = true;
-  public enableRetries: boolean = false;
-  public hideIvs: boolean = false;
+  public enableMoveInfo = true;
+  public enableRetries = false;
+  public hideIvs = false;
   /**
    * Determines the condition for a notification should be shown for Candy Upgrades
    * - 0 = 'Off'
    * - 1 = 'Passives Only'
    * - 2 = 'On'
    */
-  public candyUpgradeNotification: number = 0;
+  public candyUpgradeNotification = 0;
   /**
    * Determines what type of notification is used for Candy Upgrades
    * - 0 = 'Icon'
    * - 1 = 'Animation'
    */
-  public candyUpgradeDisplay: number = 0;
+  public candyUpgradeDisplay = 0;
   public moneyFormat: MoneyFormat = MoneyFormat.NORMAL;
   public uiTheme: UiTheme = UiTheme.DEFAULT;
-  public windowType: number = 0;
-  public experimentalSprites: boolean = false;
+  public windowType = 0;
+  public experimentalSprites = false;
   public musicPreference: number = MusicPreference.ALLGENS;
-  public moveAnimations: boolean = true;
+  public moveAnimations = true;
   public expGainsSpeed: ExpGainsSpeed = ExpGainsSpeed.DEFAULT;
-  public skipSeenDialogues: boolean = false;
+  public skipSeenDialogues = false;
   /**
    * Determines if the egg hatching animation should be skipped
    * - 0 = Never (never skip animation)
    * - 1 = Ask (ask to skip animation when hatching 2 or more eggs)
    * - 2 = Always (automatically skip animation when hatching 2 or more eggs)
    */
-  public eggSkipPreference: number = 0;
+  public eggSkipPreference = 0;
 
   /**
-     * Defines the experience gain display mode.
-     *
-     * @remarks
-     * The `expParty` can have several modes:
-     * - `0` - Default: The normal experience gain display, nothing changed.
-     * - `1` - Level Up Notification: Displays the level up in the small frame instead of a message.
-     * - `2` - Skip: No level up frame nor message.
-     *
-     * Modes `1` and `2` are still compatible with stats display, level up, new move, etc.
-     * @default 0 - Uses the default normal experience gain display.
-     */
+   * Defines the experience gain display mode.
+   *
+   * @remarks
+   * The `expParty` can have several modes:
+   * - `0` - Default: The normal experience gain display, nothing changed.
+   * - `1` - Level Up Notification: Displays the level up in the small frame instead of a message.
+   * - `2` - Skip: No level up frame nor message.
+   *
+   * Modes `1` and `2` are still compatible with stats display, level up, new move, etc.
+   * @default 0 - Uses the default normal experience gain display.
+   */
   public expParty: ExpNotification = 0;
-  public hpBarSpeed: number = 0;
-  public fusionPaletteSwaps: boolean = true;
-  public enableTouchControls: boolean = false;
-  public enableVibration: boolean = false;
-  public showBgmBar: boolean = true;
+  public hpBarSpeed = 0;
+  public fusionPaletteSwaps = true;
+  public enableTouchControls = false;
+  public enableVibration = false;
+  public showBgmBar = true;
 
   /**
    * Determines the selected battle style.
@@ -227,13 +287,13 @@ export default class BattleScene extends SceneBase {
   public battleStyle: number = BattleStyle.SWITCH;
 
   /**
-  * Defines whether or not to show type effectiveness hints
-  * - true: No hints
-  * - false: Show hints for moves
+   * Defines whether or not to show type effectiveness hints
+   * - true: No hints
+   * - false: Show hints for moves
    */
-  public typeHints: boolean = false;
+  public typeHints = false;
 
-  public disableMenu: boolean = false;
+  public disableMenu = false;
 
   public gameData: GameData;
   public sessionSlotId: number;
@@ -291,8 +351,8 @@ export default class BattleScene extends SceneBase {
 
   private fieldOverlay: Phaser.GameObjects.Rectangle;
   private shopOverlay: Phaser.GameObjects.Rectangle;
-  private shopOverlayShown: boolean = false;
-  private shopOverlayOpacity: number = .8;
+  private shopOverlayShown = false;
+  private shopOverlayOpacity = 0.8;
 
   public modifiers: PersistentModifier[];
   private enemyModifiers: PersistentModifier[];
@@ -315,9 +375,9 @@ export default class BattleScene extends SceneBase {
   private bgmCache: Set<string> = new Set();
   private playTimeTimer: Phaser.Time.TimerEvent;
 
-  public rngCounter: number = 0;
-  public rngSeedOverride: string = "";
-  public rngOffset: number = 0;
+  public rngCounter = 0;
+  public rngSeedOverride = "";
+  public rngOffset = 0;
 
   public inputMethod: string;
   private infoToggles: InfoToggle[] = [];
@@ -353,49 +413,24 @@ export default class BattleScene extends SceneBase {
     }
     const variant = atlasPath.includes("variant/") || /_[0-3]$/.test(atlasPath);
     if (experimental) {
-      experimental = this.hasExpSprite(key);
+      experimental = hasExpSprite(key);
     }
     if (variant) {
       atlasPath = atlasPath.replace("variant/", "");
     }
-    this.load.atlas(key, `images/pokemon/${variant ? "variant/" : ""}${experimental ? "exp/" : ""}${atlasPath}.png`,  `images/pokemon/${variant ? "variant/" : ""}${experimental ? "exp/" : ""}${atlasPath}.json`);
-  }
-
-  /**
-   * Load the variant assets for the given sprite and stores them in {@linkcode variantColorCache}
-   */
-  public async loadPokemonVariantAssets(spriteKey: string, fileRoot: string, variant?: Variant): Promise<void> {
-    const useExpSprite = this.experimentalSprites && this.hasExpSprite(spriteKey);
-    if (useExpSprite) {
-      fileRoot = `exp/${fileRoot}`;
-    }
-    let variantConfig = variantData;
-    fileRoot.split("/").map((p) => (variantConfig ? (variantConfig = variantConfig[p]) : null));
-    const variantSet = variantConfig as VariantSet;
-
-    return new Promise<void>((resolve) => {
-      if (variantSet && variant !== undefined && variantSet[variant] === 1) {
-        if (variantColorCache.hasOwnProperty(spriteKey)) {
-          return resolve();
-        }
-        this.cachedFetch(`./images/pokemon/variant/${fileRoot}.json`)
-          .then((res) => res.json())
-          .then((c) => {
-            variantColorCache[spriteKey] = c;
-            resolve();
-          });
-      } else {
-        resolve();
-      }
-    });
+    this.load.atlas(
+      key,
+      `images/pokemon/${variant ? "variant/" : ""}${experimental ? "exp/" : ""}${atlasPath}.png`,
+      `images/pokemon/${variant ? "variant/" : ""}${experimental ? "exp/" : ""}${atlasPath}.json`,
+    );
   }
 
   async preload() {
     if (DEBUG_RNG) {
       const originalRealInRange = Phaser.Math.RND.realInRange;
       Phaser.Math.RND.realInRange = function (min: number, max: number): number {
-        const ret = originalRealInRange.apply(this, [ min, max ]);
-        const args = [ "RNG", ++this.rngCounter, ret / (max - min), `min: ${min} / max: ${max}` ];
+        const ret = originalRealInRange.apply(this, [min, max]);
+        const args = ["RNG", ++this.rngCounter, ret / (max - min), `min: ${min} / max: ${max}`];
         args.push(`seed: ${this.rngSeedOverride || this.waveSeed || this.seed}`);
         if (this.rngOffset) {
           args.push(`offset: ${this.rngOffset}`);
@@ -441,12 +476,12 @@ export default class BattleScene extends SceneBase {
     this.arenaBgTransition = this.add.sprite(0, 0, "plains_bg");
     this.arenaBgTransition.setName("sprite-arena-bg-transition");
 
-    [ this.arenaBgTransition, this.arenaBg ].forEach(a => {
+    for (const a of [this.arenaBgTransition, this.arenaBg]) {
       a.setPipeline(this.fieldSpritePipeline);
       a.setScale(6);
       a.setOrigin(0);
       a.setSize(320, 240);
-    });
+    }
 
     const field = this.add.container(0, 0);
     field.setName("field");
@@ -461,13 +496,16 @@ export default class BattleScene extends SceneBase {
 
     this.fieldUI = fieldUI;
 
-    const transition = this.make.rexTransitionImagePack({
-      x: 0,
-      y: 0,
-      scale: 6,
-      key: "loading_bg",
-      origin: { x: 0, y: 0 }
-    }, true);
+    const transition = this.make.rexTransitionImagePack(
+      {
+        x: 0,
+        y: 0,
+        scale: 6,
+        key: "loading_bg",
+        origin: { x: 0, y: 0 },
+      },
+      true,
+    );
 
     //@ts-ignore (the defined types in the package are incromplete...)
     transition.transit({
@@ -489,7 +527,7 @@ export default class BattleScene extends SceneBase {
     this.uiContainer = uiContainer;
 
     const overlayWidth = this.game.canvas.width / 6;
-    const overlayHeight = (this.game.canvas.height / 6) - 48;
+    const overlayHeight = this.game.canvas.height / 6 - 48;
     this.fieldOverlay = this.add.rectangle(0, overlayHeight * -1 - 48, overlayWidth, overlayHeight, 0x424242);
     this.fieldOverlay.setName("rect-field-overlay");
     this.fieldOverlay.setOrigin(0, 0);
@@ -547,28 +585,39 @@ export default class BattleScene extends SceneBase {
     this.candyBar.setup();
     this.fieldUI.add(this.candyBar);
 
-    this.biomeWaveText = addTextObject((this.game.canvas.width / 6) - 2, 0, startingWave.toString(), TextStyle.BATTLE_INFO);
+    this.biomeWaveText = addTextObject(
+      this.game.canvas.width / 6 - 2,
+      0,
+      startingWave.toString(),
+      TextStyle.BATTLE_INFO,
+    );
     this.biomeWaveText.setName("text-biome-wave");
     this.biomeWaveText.setOrigin(1, 0.5);
     this.fieldUI.add(this.biomeWaveText);
 
-    this.moneyText = addTextObject((this.game.canvas.width / 6) - 2, 0, "", TextStyle.MONEY);
+    this.moneyText = addTextObject(this.game.canvas.width / 6 - 2, 0, "", TextStyle.MONEY);
     this.moneyText.setName("text-money");
     this.moneyText.setOrigin(1, 0.5);
     this.fieldUI.add(this.moneyText);
 
-    this.scoreText = addTextObject((this.game.canvas.width / 6) - 2, 0, "", TextStyle.PARTY, { fontSize: "54px" });
+    this.scoreText = addTextObject(this.game.canvas.width / 6 - 2, 0, "", TextStyle.PARTY, { fontSize: "54px" });
     this.scoreText.setName("text-score");
     this.scoreText.setOrigin(1, 0.5);
     this.fieldUI.add(this.scoreText);
 
-    this.luckText = addTextObject((this.game.canvas.width / 6) - 2, 0, "", TextStyle.PARTY, { fontSize: "54px" });
+    this.luckText = addTextObject(this.game.canvas.width / 6 - 2, 0, "", TextStyle.PARTY, { fontSize: "54px" });
     this.luckText.setName("text-luck");
     this.luckText.setOrigin(1, 0.5);
     this.luckText.setVisible(false);
     this.fieldUI.add(this.luckText);
 
-    this.luckLabelText = addTextObject((this.game.canvas.width / 6) - 2, 0, i18next.t("common:luckIndicator"), TextStyle.PARTY, { fontSize: "54px" });
+    this.luckLabelText = addTextObject(
+      this.game.canvas.width / 6 - 2,
+      0,
+      i18next.t("common:luckIndicator"),
+      TextStyle.PARTY,
+      { fontSize: "54px" },
+    );
     this.luckLabelText.setName("text-luck-label");
     this.luckLabelText.setOrigin(1, 0.5);
     this.luckLabelText.setVisible(false);
@@ -585,7 +634,10 @@ export default class BattleScene extends SceneBase {
     this.spriteSparkleHandler = new PokemonSpriteSparkleHandler();
     this.spriteSparkleHandler.setup();
 
-    this.pokemonInfoContainer = new PokemonInfoContainer((this.game.canvas.width / 6) + 52, -(this.game.canvas.height / 6) + 66);
+    this.pokemonInfoContainer = new PokemonInfoContainer(
+      this.game.canvas.width / 6 + 52,
+      -(this.game.canvas.height / 6) + 66,
+    );
     this.pokemonInfoContainer.setup();
 
     this.fieldUI.add(this.pokemonInfoContainer);
@@ -607,14 +659,18 @@ export default class BattleScene extends SceneBase {
     this.arenaPlayerTransition.setVisible(false);
     this.arenaNextEnemy.setVisible(false);
 
-    [ this.arenaPlayer, this.arenaPlayerTransition, this.arenaEnemy, this.arenaNextEnemy ].forEach(a => {
+    for (const a of [this.arenaPlayer, this.arenaPlayerTransition, this.arenaEnemy, this.arenaNextEnemy]) {
       if (a instanceof Phaser.GameObjects.Sprite) {
         a.setOrigin(0, 0);
       }
       field.add(a);
-    });
+    }
 
-    const trainer = this.addFieldSprite(0, 0, `trainer_${this.gameData.gender === PlayerGender.FEMALE ? "f" : "m"}_back`);
+    const trainer = this.addFieldSprite(
+      0,
+      0,
+      `trainer_${this.gameData.gender === PlayerGender.FEMALE ? "f" : "m"}_back`,
+    );
     trainer.setOrigin(0.5, 1);
     trainer.setName("sprite-trainer");
 
@@ -627,16 +683,19 @@ export default class BattleScene extends SceneBase {
       frames: this.anims.generateFrameNumbers("prompt", { start: 1, end: 4 }),
       frameRate: 6,
       repeat: -1,
-      showOnStart: true
+      showOnStart: true,
     });
 
     this.anims.create({
       key: "tera_sparkle",
-      frames: this.anims.generateFrameNumbers("tera_sparkle", { start: 0, end: 12 }),
+      frames: this.anims.generateFrameNumbers("tera_sparkle", {
+        start: 0,
+        end: 12,
+      }),
       frameRate: 18,
       repeat: 0,
       showOnStart: true,
-      hideOnComplete: true
+      hideOnComplete: true,
     });
 
     this.reset(false, false, true);
@@ -648,13 +707,15 @@ export default class BattleScene extends SceneBase {
 
     ui.setup();
 
-    const defaultMoves = [ Moves.TACKLE, Moves.TAIL_WHIP, Moves.FOCUS_ENERGY, Moves.STRUGGLE ];
+    const defaultMoves = [Moves.TACKLE, Moves.TAIL_WHIP, Moves.FOCUS_ENERGY, Moves.STRUGGLE];
 
     Promise.all([
       Promise.all(loadPokemonAssets),
       initCommonAnims().then(() => loadCommonAnimAssets(true)),
-      Promise.all([ Moves.TACKLE, Moves.TAIL_WHIP, Moves.FOCUS_ENERGY, Moves.STRUGGLE ].map(m => initMoveAnim(m))).then(() => loadMoveAnimAssets(defaultMoves, true)),
-      this.initStarterColors()
+      Promise.all([Moves.TACKLE, Moves.TAIL_WHIP, Moves.FOCUS_ENERGY, Moves.STRUGGLE].map(m => initMoveAnim(m))).then(
+        () => loadMoveAnimAssets(defaultMoves, true),
+      ),
+      this.initStarterColors(),
     ]).then(() => {
       this.pushPhase(new LoginPhase());
       this.pushPhase(new TitlePhase());
@@ -676,7 +737,7 @@ export default class BattleScene extends SceneBase {
     }
 
     this.playTimeTimer = this.time.addEvent({
-      delay: Utils.fixedInt(1000),
+      delay: fixedInt(1000),
       repeat: -1,
       callback: () => {
         if (this.gameData) {
@@ -688,7 +749,7 @@ export default class BattleScene extends SceneBase {
         if (this.lastSavePlayTime !== null) {
           this.lastSavePlayTime++;
         }
-      }
+      },
     });
 
     this.updateBiomeWaveText();
@@ -697,46 +758,38 @@ export default class BattleScene extends SceneBase {
   }
 
   async initExpSprites(): Promise<void> {
-    if (expSpriteKeys.length) {
+    if (expSpriteKeys.size > 0) {
       return;
     }
-    this.cachedFetch("./exp-sprites.json").then(res => res.json()).then(keys => {
-      if (Array.isArray(keys)) {
-        expSpriteKeys.push(...keys);
-      }
-      Promise.resolve();
-    });
-  }
-
-  async initVariantData(): Promise<void> {
-    Object.keys(variantData).forEach(key => delete variantData[key]);
-    await this.cachedFetch("./images/pokemon/variant/_masterlist.json").then(res => res.json())
-      .then(v => {
-        Object.keys(v).forEach(k => variantData[k] = v[k]);
-        if (this.experimentalSprites) {
-          const expVariantData = variantData["exp"];
-          const traverseVariantData = (keys: string[]) => {
-            let variantTree = variantData;
-            let expTree = expVariantData;
-            keys.map((k: string, i: number) => {
-              if (i < keys.length - 1) {
-                variantTree = variantTree[k];
-                expTree = expTree[k];
-              } else if (variantTree.hasOwnProperty(k) && expTree.hasOwnProperty(k)) {
-                if ([ "back", "female" ].includes(k)) {
-                  traverseVariantData(keys.concat(k));
-                } else {
-                  variantTree[k] = expTree[k];
-                }
-              }
-            });
-          };
-          Object.keys(expVariantData).forEach(ek => traverseVariantData([ ek ]));
+    this.cachedFetch("./exp-sprites.json")
+      .then(res => res.json())
+      .then(keys => {
+        if (Array.isArray(keys)) {
+          for (const key of keys) {
+            expSpriteKeys.add(key);
+          }
         }
         Promise.resolve();
       });
   }
 
+  /**
+   * Initialize the variant data.
+   * If experimental sprites are enabled, their entries are replaced via this method.
+   */
+  async initVariantData(): Promise<void> {
+    clearVariantData();
+    const otherVariantData = await this.cachedFetch("./images/pokemon/variant/_masterlist.json").then(r => r.json());
+    for (const k of Object.keys(otherVariantData)) {
+      variantData[k] = otherVariantData[k];
+    }
+    if (!this.experimentalSprites) {
+      return;
+    }
+    const expVariantData = await this.cachedFetch("./images/pokemon/variant/_exp_masterlist.json").then(r => r.json());
+    deepMergeSpriteData(variantData, expVariantData);
+  }
+
   cachedFetch(url: string, init?: RequestInit): Promise<Response> {
     const manifest = this.game["manifest"];
     if (manifest) {
@@ -748,68 +801,15 @@ export default class BattleScene extends SceneBase {
     return fetch(url, init);
   }
 
-  initStarterColors(): Promise<void> {
-    return new Promise(resolve => {
-      if (starterColors) {
-        return resolve();
-      }
-
-      this.cachedFetch("./starter-colors.json").then(res => res.json()).then(sc => {
-        starterColors = {};
-        Object.keys(sc).forEach(key => {
-          starterColors[key] = sc[key];
-        });
-
-        /*const loadPokemonAssets: Promise<void>[] = [];
-
-                for (let s of Object.keys(speciesStarters)) {
-                    const species = getPokemonSpecies(parseInt(s));
-                    loadPokemonAssets.push(species.loadAssets(this, false, 0, false));
-                }
-
-                Promise.all(loadPokemonAssets).then(() => {
-                    const starterCandyColors = {};
-                    const rgbaToHexFunc = (r, g, b) => [r, g, b].map(x => x.toString(16).padStart(2, '0')).join('');
-
-                    for (let s of Object.keys(speciesStarters)) {
-                        const species = getPokemonSpecies(parseInt(s));
-
-                        starterCandyColors[species.speciesId] = species.generateCandyColors(this).map(c => rgbaToHexFunc(c[0], c[1], c[2]));
-                    }
-
-                    console.log(JSON.stringify(starterCandyColors));
-
-                    resolve();
-                });*/
-
-        resolve();
-      });
-    });
-  }
-
-  hasExpSprite(key: string): boolean {
-    const keyMatch = /^pkmn__?(back__)?(shiny__)?(female__)?(\d+)(\-.*?)?(?:_[1-3])?$/g.exec(key);
-    if (!keyMatch) {
-      return false;
+  async initStarterColors(): Promise<void> {
+    if (Object.keys(starterColors).length > 0) {
+      // already initialized
+      return;
     }
-
-    let k = keyMatch[4]!;
-    if (keyMatch[2]) {
-      k += "s";
+    const sc = await this.cachedFetch("./starter-colors.json").then(res => res.json());
+    for (const key of Object.keys(sc)) {
+      starterColors[key] = sc[key];
     }
-    if (keyMatch[1]) {
-      k += "b";
-    }
-    if (keyMatch[3]) {
-      k += "f";
-    }
-    if (keyMatch[5]) {
-      k += keyMatch[5];
-    }
-    if (!expSpriteKeys.includes(k)) {
-      return false;
-    }
-    return true;
   }
 
   public getPlayerParty(): PlayerPokemon[] {
@@ -831,10 +831,11 @@ export default class BattleScene extends SceneBase {
    * or `undefined` if there are no valid pokemon
    * @param includeSwitching Whether a pokemon that is currently switching out is valid, default `true`
    */
-  public getPlayerPokemon(includeSwitching: boolean = true): PlayerPokemon | undefined {
+  public getPlayerPokemon(includeSwitching = true): PlayerPokemon | undefined {
     return this.getPlayerField().find(p => p.isActive() && (includeSwitching || p.switchOutStatus === false));
   }
 
+  // TODO: Add `undefined` to return type
   /**
    * Returns an array of PlayerPokemon of length 1 or 2 depending on if in a double battle or not.
    * Does not actually check if the pokemon are on the field or not.
@@ -850,13 +851,13 @@ export default class BattleScene extends SceneBase {
   }
 
   /**
-   * @returns The first {@linkcode EnemyPokemon} that is {@linkcode getEnemyField on the field}
-   * and {@linkcode EnemyPokemon.isActive is active}
-   * (aka {@linkcode EnemyPokemon.isAllowedInBattle is allowed in battle}),
+   * @returns The first {@linkcode EnemyPokemon} that is {@linkcode getEnemyField | on the field}
+   * and {@linkcode EnemyPokemon.isActive | is active}
+   * (aka {@linkcode EnemyPokemon.isAllowedInBattle | is allowed in battle}),
    * or `undefined` if there are no valid pokemon
    * @param includeSwitching Whether a pokemon that is currently switching out is valid, default `true`
    */
-  public getEnemyPokemon(includeSwitching: boolean = true): EnemyPokemon | undefined {
+  public getEnemyPokemon(includeSwitching = true): EnemyPokemon | undefined {
     return this.getEnemyField().find(p => p.isActive() && (includeSwitching || p.switchOutStatus === false));
   }
 
@@ -873,18 +874,16 @@ export default class BattleScene extends SceneBase {
   /**
    * Returns an array of Pokemon on both sides of the battle - player first, then enemy.
    * Does not actually check if the pokemon are on the field or not, and always has length 4 regardless of battle type.
-   * @param activeOnly Whether to consider only active pokemon
-   * @returns array of {@linkcode Pokemon}
+   * @param activeOnly - Whether to consider only active pokemon; default `false`
+   * @returns An array of {@linkcode Pokemon}, as described above.
    */
-  public getField(activeOnly: boolean = false): Pokemon[] {
+  public getField(activeOnly = false): Pokemon[] {
     const ret = new Array(4).fill(null);
     const playerField = this.getPlayerField();
     const enemyField = this.getEnemyField();
     ret.splice(0, playerField.length, ...playerField);
     ret.splice(2, enemyField.length, ...enemyField);
-    return activeOnly
-      ? ret.filter(p => p?.isActive())
-      : ret;
+    return activeOnly ? ret.filter(p => p?.isActive()) : ret;
   }
 
   /**
@@ -900,7 +899,13 @@ export default class BattleScene extends SceneBase {
     if (allyPokemon?.isActive(true)) {
       let targetingMovePhase: MovePhase;
       do {
-        targetingMovePhase = this.findPhase(mp => mp instanceof MovePhase && mp.targets.length === 1 && mp.targets[0] === removedPokemon.getBattlerIndex() && mp.pokemon.isPlayer() !== allyPokemon.isPlayer()) as MovePhase;
+        targetingMovePhase = this.findPhase(
+          mp =>
+            mp instanceof MovePhase &&
+            mp.targets.length === 1 &&
+            mp.targets[0] === removedPokemon.getBattlerIndex() &&
+            mp.pokemon.isPlayer() !== allyPokemon.isPlayer(),
+        ) as MovePhase;
         if (targetingMovePhase && targetingMovePhase.targets[0] !== allyPokemon.getBattlerIndex()) {
           targetingMovePhase.targets[0] = allyPokemon.getBattlerIndex();
         }
@@ -923,7 +928,7 @@ export default class BattleScene extends SceneBase {
   }
 
   // return the stored info toggles; used by ui-inputs
-  getInfoToggles(activeOnly: boolean = false): InfoToggle[] {
+  getInfoToggles(activeOnly = false): InfoToggle[] {
     return activeOnly ? this.infoToggles.filter(t => t?.isActive()) : this.infoToggles;
   }
 
@@ -932,8 +937,31 @@ export default class BattleScene extends SceneBase {
     return (findInParty(this.getPlayerParty()) || findInParty(this.getEnemyParty())) ?? null;
   }
 
-  addPlayerPokemon(species: PokemonSpecies, level: number, abilityIndex?: number, formIndex?: number, gender?: Gender, shiny?: boolean, variant?: Variant, ivs?: number[], nature?: Nature, dataSource?: Pokemon | PokemonData, postProcess?: (playerPokemon: PlayerPokemon) => void): PlayerPokemon {
-    const pokemon = new PlayerPokemon(species, level, abilityIndex, formIndex, gender, shiny, variant, ivs, nature, dataSource);
+  addPlayerPokemon(
+    species: PokemonSpecies,
+    level: number,
+    abilityIndex?: number,
+    formIndex?: number,
+    gender?: Gender,
+    shiny?: boolean,
+    variant?: Variant,
+    ivs?: number[],
+    nature?: Nature,
+    dataSource?: Pokemon | PokemonData,
+    postProcess?: (playerPokemon: PlayerPokemon) => void,
+  ): PlayerPokemon {
+    const pokemon = new PlayerPokemon(
+      species,
+      level,
+      abilityIndex,
+      formIndex,
+      gender,
+      shiny,
+      variant,
+      ivs,
+      nature,
+      dataSource,
+    );
     if (postProcess) {
       postProcess(pokemon);
     }
@@ -941,7 +969,15 @@ export default class BattleScene extends SceneBase {
     return pokemon;
   }
 
-  addEnemyPokemon(species: PokemonSpecies, level: number, trainerSlot: TrainerSlot, boss: boolean = false, shinyLock: boolean = false, dataSource?: PokemonData, postProcess?: (enemyPokemon: EnemyPokemon) => void): EnemyPokemon {
+  addEnemyPokemon(
+    species: PokemonSpecies,
+    level: number,
+    trainerSlot: TrainerSlot,
+    boss = false,
+    shinyLock = false,
+    dataSource?: PokemonData,
+    postProcess?: (enemyPokemon: EnemyPokemon) => void,
+  ): EnemyPokemon {
     if (Overrides.OPP_LEVEL_OVERRIDE > 0) {
       level = Overrides.OPP_LEVEL_OVERRIDE;
     }
@@ -957,10 +993,16 @@ export default class BattleScene extends SceneBase {
     }
 
     if (boss && !dataSource) {
-      const secondaryIvs = Utils.getIvsFromId(Utils.randSeedInt(4294967296));
+      const secondaryIvs = getIvsFromId(randSeedInt(4294967296));
 
       for (let s = 0; s < pokemon.ivs.length; s++) {
-        pokemon.ivs[s] = Math.round(Phaser.Math.Linear(Math.min(pokemon.ivs[s], secondaryIvs[s]), Math.max(pokemon.ivs[s], secondaryIvs[s]), 0.75));
+        pokemon.ivs[s] = Math.round(
+          Phaser.Math.Linear(
+            Math.min(pokemon.ivs[s], secondaryIvs[s]),
+            Math.max(pokemon.ivs[s], secondaryIvs[s]),
+            0.75,
+          ),
+        );
       }
     }
     if (postProcess) {
@@ -983,7 +1025,7 @@ export default class BattleScene extends SceneBase {
    * @param pokemon
    * @param destroy Default true. If true, will destroy the {@linkcode PlayerPokemon} after removing
    */
-  removePokemonFromPlayerParty(pokemon: PlayerPokemon, destroy: boolean = true) {
+  removePokemonFromPlayerParty(pokemon: PlayerPokemon, destroy = true) {
     if (!pokemon) {
       return;
     }
@@ -997,43 +1039,60 @@ export default class BattleScene extends SceneBase {
     this.updateModifiers(true);
   }
 
-  addPokemonIcon(pokemon: Pokemon, x: number, y: number, originX: number = 0.5, originY: number = 0.5, ignoreOverride: boolean = false): Phaser.GameObjects.Container {
+  addPokemonIcon(
+    pokemon: Pokemon,
+    x: number,
+    y: number,
+    originX = 0.5,
+    originY = 0.5,
+    ignoreOverride = true,
+    useIllusion = false,
+  ): Phaser.GameObjects.Container {
     const container = this.add.container(x, y);
     container.setName(`${pokemon.name}-icon`);
 
-    const icon = this.add.sprite(0, 0, pokemon.getIconAtlasKey(ignoreOverride));
+    const icon = this.add.sprite(0, 0, pokemon.getIconAtlasKey(ignoreOverride, useIllusion));
     icon.setName(`sprite-${pokemon.name}-icon`);
-    icon.setFrame(pokemon.getIconId(true));
+    icon.setFrame(pokemon.getIconId(ignoreOverride, useIllusion));
     // Temporary fix to show pokemon's default icon if variant icon doesn't exist
-    if (icon.frame.name !== pokemon.getIconId(true)) {
+    if (icon.frame.name !== pokemon.getIconId(ignoreOverride, useIllusion)) {
       console.log(`${pokemon.name}'s variant icon does not exist. Replacing with default.`);
       const temp = pokemon.shiny;
       pokemon.shiny = false;
-      icon.setTexture(pokemon.getIconAtlasKey(ignoreOverride));
-      icon.setFrame(pokemon.getIconId(true));
+      icon.setTexture(pokemon.getIconAtlasKey(ignoreOverride, useIllusion));
+      icon.setFrame(pokemon.getIconId(true, useIllusion));
       pokemon.shiny = temp;
     }
     icon.setOrigin(0.5, 0);
 
     container.add(icon);
 
-    if (pokemon.isFusion()) {
-      const fusionIcon = this.add.sprite(0, 0, pokemon.getFusionIconAtlasKey(ignoreOverride));
+    if (pokemon.isFusion(useIllusion)) {
+      const fusionIcon = this.add.sprite(0, 0, pokemon.getFusionIconAtlasKey(ignoreOverride, useIllusion));
       fusionIcon.setName("sprite-fusion-icon");
       fusionIcon.setOrigin(0.5, 0);
-      fusionIcon.setFrame(pokemon.getFusionIconId(true));
+      fusionIcon.setFrame(pokemon.getFusionIconId(ignoreOverride, useIllusion));
 
       const originalWidth = icon.width;
       const originalHeight = icon.height;
       const originalFrame = icon.frame;
 
-      const iconHeight = (icon.frame.cutHeight <= fusionIcon.frame.cutHeight ? Math.ceil : Math.floor)((icon.frame.cutHeight + fusionIcon.frame.cutHeight) / 4);
+      const iconHeight = (icon.frame.cutHeight <= fusionIcon.frame.cutHeight ? Math.ceil : Math.floor)(
+        (icon.frame.cutHeight + fusionIcon.frame.cutHeight) / 4,
+      );
 
       // Inefficient, but for some reason didn't work with only the unique properties as part of the name
       const iconFrameId = `${icon.frame.name}f${fusionIcon.frame.name}`;
 
       if (!icon.frame.texture.has(iconFrameId)) {
-        icon.frame.texture.add(iconFrameId, icon.frame.sourceIndex, icon.frame.cutX, icon.frame.cutY, icon.frame.cutWidth, iconHeight);
+        icon.frame.texture.add(
+          iconFrameId,
+          icon.frame.sourceIndex,
+          icon.frame.cutX,
+          icon.frame.cutY,
+          icon.frame.cutWidth,
+          iconHeight,
+        );
       }
 
       icon.setFrame(iconFrameId);
@@ -1049,7 +1108,14 @@ export default class BattleScene extends SceneBase {
       const fusionIconFrameId = `${fusionIcon.frame.name}f${icon.frame.name}`;
 
       if (!fusionIcon.frame.texture.has(fusionIconFrameId)) {
-        fusionIcon.frame.texture.add(fusionIconFrameId, fusionIcon.frame.sourceIndex, fusionIcon.frame.cutX, fusionIconY, fusionIcon.frame.cutWidth, fusionIconHeight);
+        fusionIcon.frame.texture.add(
+          fusionIconFrameId,
+          fusionIcon.frame.sourceIndex,
+          fusionIcon.frame.cutX,
+          fusionIconY,
+          fusionIcon.frame.cutWidth,
+          fusionIconHeight,
+        );
       }
       fusionIcon.setFrame(fusionIconFrameId);
 
@@ -1062,7 +1128,7 @@ export default class BattleScene extends SceneBase {
         container.x -= originalWidth * (originX - 0.5);
       }
       if (originY !== 0) {
-        container.y -= (originalHeight) * originY;
+        container.y -= originalHeight * originY;
       }
     } else {
       if (originX !== 0.5) {
@@ -1087,17 +1153,17 @@ export default class BattleScene extends SceneBase {
    * Generates a random number using the current battle's seed
    *
    * This calls {@linkcode Battle.randSeedInt}({@linkcode range}, {@linkcode min}) in `src/battle.ts`
-   * which calls {@linkcode Utils.randSeedInt randSeedInt}({@linkcode range}, {@linkcode min}) in `src/utils.ts`
+   * which calls {@linkcode randSeedInt randSeedInt}({@linkcode range}, {@linkcode min}) in `src/utils.ts`
    *
    * @param range How large of a range of random numbers to choose from. If {@linkcode range} <= 1, returns {@linkcode min}
    * @param min The minimum integer to pick, default `0`
    * @returns A random integer between {@linkcode min} and ({@linkcode min} + {@linkcode range} - 1)
    */
-  randBattleSeedInt(range: number, min: number = 0): number {
+  randBattleSeedInt(range: number, min = 0): number {
     return this.currentBattle?.randSeedInt(range, min);
   }
 
-  reset(clearScene: boolean = false, clearData: boolean = false, reloadI18n: boolean = false): void {
+  reset(clearScene = false, clearData = false, reloadI18n = false): void {
     if (clearData) {
       this.gameData = new GameData();
     }
@@ -1111,7 +1177,11 @@ export default class BattleScene extends SceneBase {
 
     this.lockModifierTiers = false;
 
-    this.pokeballCounts = Object.fromEntries(Utils.getEnumValues(PokeballType).filter(p => p <= PokeballType.MASTER_BALL).map(t => [ t, 0 ]));
+    this.pokeballCounts = Object.fromEntries(
+      getEnumValues(PokeballType)
+        .filter(p => p <= PokeballType.MASTER_BALL)
+        .map(t => [t, 0]),
+    );
     this.pokeballCounts[PokeballType.POKEBALL] += 5;
     if (Overrides.POKEBALL_OVERRIDE.active) {
       this.pokeballCounts = Overrides.POKEBALL_OVERRIDE.pokeballs;
@@ -1140,7 +1210,7 @@ export default class BattleScene extends SceneBase {
 
     // Reset RNG after end of game or save & quit.
     // This needs to happen after clearing this.currentBattle or the seed will be affected by the last wave played
-    this.setSeed(Overrides.SEED_OVERRIDE || Utils.randomString(24));
+    this.setSeed(Overrides.SEED_OVERRIDE || randomString(24));
     console.log("Seed:", this.seed);
     this.resetSeed();
 
@@ -1153,7 +1223,7 @@ export default class BattleScene extends SceneBase {
     this.updateScoreText();
     this.scoreText.setVisible(false);
 
-    [ this.luckLabelText, this.luckText ].map(t => t.setVisible(false));
+    [this.luckLabelText, this.luckText].map(t => t.setVisible(false));
 
     this.newArena(Overrides.STARTING_BIOME_OVERRIDE || Biome.TOWN);
 
@@ -1162,7 +1232,8 @@ export default class BattleScene extends SceneBase {
     this.arenaBgTransition.setPosition(0, 0);
     this.arenaPlayer.setPosition(300, 0);
     this.arenaPlayerTransition.setPosition(0, 0);
-    [ this.arenaEnemy, this.arenaNextEnemy ].forEach(a => a.setPosition(-280, 0));
+    this.arenaEnemy.setPosition(-280, 0);
+    this.arenaNextEnemy.setPosition(-280, 0);
     this.arenaNextEnemy.setVisible(false);
 
     this.arena.init();
@@ -1180,7 +1251,15 @@ export default class BattleScene extends SceneBase {
         ...allSpecies,
         ...allMoves,
         ...allAbilities,
-        ...Utils.getEnumValues(ModifierPoolType).map(mpt => getModifierPoolForType(mpt)).map(mp => Object.values(mp).flat().map(mt => mt.modifierType).filter(mt => "localize" in mt).map(lpb => lpb as unknown as Localizable)).flat()
+        ...getEnumValues(ModifierPoolType)
+          .map(mpt => getModifierPoolForType(mpt))
+          .flatMap(mp =>
+            Object.values(mp)
+              .flat()
+              .map(mt => mt.modifierType)
+              .filter(mt => "localize" in mt)
+              .map(lpb => lpb as unknown as Localizable),
+          ),
       ];
       for (const item of localizable) {
         item.localize();
@@ -1193,7 +1272,7 @@ export default class BattleScene extends SceneBase {
 
       this.fadeOutBgm(250, false);
       this.tweens.add({
-        targets: [ this.uiContainer ],
+        targets: [this.uiContainer],
         alpha: 0,
         duration: 250,
         ease: "Sine.easeInOut",
@@ -1206,21 +1285,39 @@ export default class BattleScene extends SceneBase {
           this.children.removeAll(true);
           this.game.domContainer.innerHTML = "";
           this.launchBattle();
-        }
+        },
       });
     }
   }
 
   getDoubleBattleChance(newWaveIndex: number, playerField: PlayerPokemon[]) {
-    const doubleChance = new Utils.IntegerHolder(newWaveIndex % 10 === 0 ? 32 : 8);
+    const doubleChance = new NumberHolder(newWaveIndex % 10 === 0 ? 32 : 8);
     this.applyModifiers(DoubleBattleChanceBoosterModifier, true, doubleChance);
-    playerField.forEach(p => applyAbAttrs(DoubleBattleChanceAbAttr, p, null, false, doubleChance));
+    for (const p of playerField) {
+      applyAbAttrs(DoubleBattleChanceAbAttr, p, null, false, doubleChance);
+    }
     return Math.max(doubleChance.value, 1);
   }
 
-  newBattle(waveIndex?: number, battleType?: BattleType, trainerData?: TrainerData, double?: boolean, mysteryEncounterType?: MysteryEncounterType): Battle | null {
+  isNewBiome(currentBattle = this.currentBattle) {
+    const isWaveIndexMultipleOfTen = !(currentBattle.waveIndex % 10);
+    const isEndlessOrDaily = this.gameMode.hasShortBiomes || this.gameMode.isDaily;
+    const isEndlessFifthWave = this.gameMode.hasShortBiomes && currentBattle.waveIndex % 5 === 0;
+    const isWaveIndexMultipleOfFiftyMinusOne = currentBattle.waveIndex % 50 === 49;
+    const isNewBiome =
+      isWaveIndexMultipleOfTen || isEndlessFifthWave || (isEndlessOrDaily && isWaveIndexMultipleOfFiftyMinusOne);
+    return isNewBiome;
+  }
+
+  newBattle(
+    waveIndex?: number,
+    battleType?: BattleType,
+    trainerData?: TrainerData,
+    double?: boolean,
+    mysteryEncounterType?: MysteryEncounterType,
+  ): Battle {
     const _startingWave = Overrides.STARTING_WAVE_OVERRIDE || startingWave;
-    const newWaveIndex = waveIndex || ((this.currentBattle?.waveIndex || (_startingWave - 1)) + 1);
+    const newWaveIndex = waveIndex || (this.currentBattle?.waveIndex || _startingWave - 1) + 1;
     let newDouble: boolean | undefined;
     let newBattleType: BattleType;
     let newTrainer: Trainer | undefined;
@@ -1235,39 +1332,60 @@ export default class BattleScene extends SceneBase {
       battleConfig = this.gameMode.getFixedBattle(newWaveIndex);
       newDouble = battleConfig.double;
       newBattleType = battleConfig.battleType;
-      this.executeWithSeedOffset(() => newTrainer = battleConfig?.getTrainer(), (battleConfig.seedOffsetWaveIndex || newWaveIndex) << 8);
+      this.executeWithSeedOffset(
+        () => (newTrainer = battleConfig?.getTrainer()),
+        (battleConfig.seedOffsetWaveIndex || newWaveIndex) << 8,
+      );
       if (newTrainer) {
         this.field.add(newTrainer);
       }
     } else {
-      if (!this.gameMode.hasTrainers) {
+      if (
+        !this.gameMode.hasTrainers ||
+        Overrides.BATTLE_TYPE_OVERRIDE === BattleType.WILD ||
+        (Overrides.DISABLE_STANDARD_TRAINERS_OVERRIDE && isNullOrUndefined(trainerData))
+      ) {
         newBattleType = BattleType.WILD;
-      } else if (battleType === undefined) {
-        newBattleType = this.gameMode.isWaveTrainer(newWaveIndex, this.arena) ? BattleType.TRAINER : BattleType.WILD;
       } else {
-        newBattleType = battleType;
+        newBattleType =
+          Overrides.BATTLE_TYPE_OVERRIDE ??
+          battleType ??
+          (this.gameMode.isWaveTrainer(newWaveIndex, this.arena) ? BattleType.TRAINER : BattleType.WILD);
       }
 
       if (newBattleType === BattleType.TRAINER) {
-        const trainerType = this.arena.randomTrainerType(newWaveIndex);
+        const trainerType =
+          Overrides.RANDOM_TRAINER_OVERRIDE?.trainerType ?? this.arena.randomTrainerType(newWaveIndex);
         let doubleTrainer = false;
         if (trainerConfigs[trainerType].doubleOnly) {
           doubleTrainer = true;
         } else if (trainerConfigs[trainerType].hasDouble) {
-          doubleTrainer = !Utils.randSeedInt(this.getDoubleBattleChance(newWaveIndex, playerField));
+          doubleTrainer =
+            Overrides.RANDOM_TRAINER_OVERRIDE?.alwaysDouble ||
+            !randSeedInt(this.getDoubleBattleChance(newWaveIndex, playerField));
           // Add a check that special trainers can't be double except for tate and liza - they should use the normal double chance
-          if (trainerConfigs[trainerType].trainerTypeDouble && ![ TrainerType.TATE, TrainerType.LIZA ].includes(trainerType)) {
+          if (
+            trainerConfigs[trainerType].trainerTypeDouble &&
+            ![TrainerType.TATE, TrainerType.LIZA].includes(trainerType)
+          ) {
             doubleTrainer = false;
           }
         }
-        const variant = doubleTrainer ? TrainerVariant.DOUBLE : (Utils.randSeedInt(2) ? TrainerVariant.FEMALE : TrainerVariant.DEFAULT);
+        const variant = doubleTrainer
+          ? TrainerVariant.DOUBLE
+          : randSeedInt(2)
+            ? TrainerVariant.FEMALE
+            : TrainerVariant.DEFAULT;
         newTrainer = trainerData !== undefined ? trainerData.toTrainer() : new Trainer(trainerType, variant);
         this.field.add(newTrainer);
       }
 
       // Check for mystery encounter
       // Can only occur in place of a standard (non-boss) wild battle, waves 10-180
-      if (this.isWaveMysteryEncounter(newBattleType, newWaveIndex) || newBattleType === BattleType.MYSTERY_ENCOUNTER) {
+      if (
+        !Overrides.BATTLE_TYPE_OVERRIDE &&
+        (this.isWaveMysteryEncounter(newBattleType, newWaveIndex) || newBattleType === BattleType.MYSTERY_ENCOUNTER)
+      ) {
         newBattleType = BattleType.MYSTERY_ENCOUNTER;
         // Reset to base spawn weight
         this.mysteryEncounterSaveData.encounterSpawnChance = BASE_MYSTERY_ENCOUNTER_SPAWN_WEIGHT;
@@ -1276,7 +1394,7 @@ export default class BattleScene extends SceneBase {
 
     if (double === undefined && newWaveIndex > 1) {
       if (newBattleType === BattleType.WILD && !this.gameMode.isWaveFinal(newWaveIndex)) {
-        newDouble = !Utils.randSeedInt(this.getDoubleBattleChance(newWaveIndex, playerField));
+        newDouble = !randSeedInt(this.getDoubleBattleChance(newWaveIndex, playerField));
       } else if (newBattleType === BattleType.TRAINER) {
         newDouble = newTrainer?.variant === TrainerVariant.DOUBLE;
       }
@@ -1289,10 +1407,10 @@ export default class BattleScene extends SceneBase {
       newDouble = false;
     }
 
-    if (!isNullOrUndefined(Overrides.BATTLE_TYPE_OVERRIDE)) {
+    if (!isNullOrUndefined(Overrides.BATTLE_STYLE_OVERRIDE)) {
       let doubleOverrideForWave: "single" | "double" | null = null;
 
-      switch (Overrides.BATTLE_TYPE_OVERRIDE) {
+      switch (Overrides.BATTLE_STYLE_OVERRIDE) {
         case "double":
           doubleOverrideForWave = "double";
           break;
@@ -1300,10 +1418,10 @@ export default class BattleScene extends SceneBase {
           doubleOverrideForWave = "single";
           break;
         case "even-doubles":
-          doubleOverrideForWave = (newWaveIndex % 2) ? "single" : "double";
+          doubleOverrideForWave = newWaveIndex % 2 ? "single" : "double";
           break;
         case "odd-doubles":
-          doubleOverrideForWave = (newWaveIndex % 2) ? "double" : "single";
+          doubleOverrideForWave = newWaveIndex % 2 ? "double" : "single";
           break;
       }
 
@@ -1312,7 +1430,7 @@ export default class BattleScene extends SceneBase {
       }
       /**
        * Override battles into single only if not fighting with trainers.
-       * @see {@link https://github.com/pagefaultgames/pokerogue/issues/1948 | GitHub Issue #1948}
+       * @see {@link https://github.com/pagefaultgames/pokerogue/issues/1948 GitHub Issue #1948}
        */
       if (newBattleType !== BattleType.TRAINER && doubleOverrideForWave === "single") {
         newDouble = false;
@@ -1333,12 +1451,18 @@ export default class BattleScene extends SceneBase {
 
     if (lastBattle?.double && !newDouble) {
       this.tryRemovePhase(p => p instanceof SwitchPhase);
-      this.getPlayerField().forEach(p => p.lapseTag(BattlerTagType.COMMANDED));
+      for (const p of this.getPlayerField()) {
+        p.lapseTag(BattlerTagType.COMMANDED);
+      }
     }
 
-    this.executeWithSeedOffset(() => {
-      this.currentBattle = new Battle(this.gameMode, newWaveIndex, newBattleType, newTrainer, newDouble);
-    }, newWaveIndex << 3, this.waveSeed);
+    this.executeWithSeedOffset(
+      () => {
+        this.currentBattle = new Battle(this.gameMode, newWaveIndex, newBattleType, newTrainer, newDouble);
+      },
+      newWaveIndex << 3,
+      this.waveSeed,
+    );
     this.currentBattle.incrementTurn();
 
     if (newBattleType === BattleType.MYSTERY_ENCOUNTER) {
@@ -1346,24 +1470,25 @@ export default class BattleScene extends SceneBase {
       this.currentBattle.mysteryEncounterType = mysteryEncounterType;
     }
 
-    //this.pushPhase(new TrainerMessageTestPhase(this, TrainerType.RIVAL, TrainerType.RIVAL_2, TrainerType.RIVAL_3, TrainerType.RIVAL_4, TrainerType.RIVAL_5, TrainerType.RIVAL_6));
-
     if (!waveIndex && lastBattle) {
-      const isWaveIndexMultipleOfTen = !(lastBattle.waveIndex % 10);
-      const isEndlessOrDaily = this.gameMode.hasShortBiomes || this.gameMode.isDaily;
-      const isEndlessFifthWave = this.gameMode.hasShortBiomes && (lastBattle.waveIndex % 5) === 0;
-      const isWaveIndexMultipleOfFiftyMinusOne = (lastBattle.waveIndex % 50) === 49;
-      const isNewBiome = isWaveIndexMultipleOfTen || isEndlessFifthWave || (isEndlessOrDaily && isWaveIndexMultipleOfFiftyMinusOne);
-      const resetArenaState = isNewBiome || [ BattleType.TRAINER, BattleType.MYSTERY_ENCOUNTER ].includes(this.currentBattle.battleType) || this.currentBattle.battleSpec === BattleSpec.FINAL_BOSS;
-      this.getEnemyParty().forEach(enemyPokemon => enemyPokemon.destroy());
+      const isNewBiome = this.isNewBiome(lastBattle);
+      const resetArenaState =
+        isNewBiome ||
+        [BattleType.TRAINER, BattleType.MYSTERY_ENCOUNTER].includes(this.currentBattle.battleType) ||
+        this.currentBattle.battleSpec === BattleSpec.FINAL_BOSS;
+      for (const enemyPokemon of this.getEnemyParty()) {
+        enemyPokemon.destroy();
+      }
       this.trySpreadPokerus();
-      if (!isNewBiome && (newWaveIndex % 10) === 5) {
+      if (!isNewBiome && newWaveIndex % 10 === 5) {
         this.arena.updatePoolsForTimeOfDay();
       }
       if (resetArenaState) {
         this.arena.resetArenaEffects();
 
-        playerField.forEach((pokemon) => pokemon.lapseTag(BattlerTagType.COMMANDED));
+        for (const pokemon of playerField) {
+          pokemon.lapseTag(BattlerTagType.COMMANDED);
+        }
 
         playerField.forEach((pokemon, p) => {
           if (pokemon.isOnField()) {
@@ -1372,8 +1497,15 @@ export default class BattleScene extends SceneBase {
         });
 
         for (const pokemon of this.getPlayerParty()) {
-          pokemon.resetBattleData();
+          pokemon.resetBattleAndWaveData();
+          pokemon.resetTera();
           applyPostBattleInitAbAttrs(PostBattleInitAbAttr, pokemon);
+          if (
+            pokemon.hasSpecies(Species.TERAPAGOS) ||
+            (this.gameMode.isClassic && this.currentBattle.waveIndex > 180 && this.currentBattle.waveIndex <= 190)
+          ) {
+            this.arena.playerTerasUsed = 0;
+          }
         }
 
         if (!this.trainer.visible) {
@@ -1388,7 +1520,6 @@ export default class BattleScene extends SceneBase {
       if (!this.gameMode.hasRandomBiomes && !isNewBiome) {
         this.pushPhase(new NextEncounterPhase());
       } else {
-        this.pushPhase(new SelectBiomePhase());
         this.pushPhase(new NewBiomeEncounterPhase());
 
         const newMaxExpLevel = this.getMaxExpLevel();
@@ -1401,26 +1532,34 @@ export default class BattleScene extends SceneBase {
     return this.currentBattle;
   }
 
-  newArena(biome: Biome): Arena {
-    this.arena = new Arena(biome, Biome[biome].toLowerCase());
+  newArena(biome: Biome, playerFaints?: number): Arena {
+    this.arena = new Arena(biome, Biome[biome].toLowerCase(), playerFaints);
     this.eventTarget.dispatchEvent(new NewArenaEvent());
 
-    this.arenaBg.pipelineData = { terrainColorRatio: this.arena.getBgTerrainColorRatioForBiome() };
+    this.arenaBg.pipelineData = {
+      terrainColorRatio: this.arena.getBgTerrainColorRatioForBiome(),
+    };
 
     return this.arena;
   }
 
   updateFieldScale(): Promise<void> {
     return new Promise(resolve => {
-      const fieldScale = Math.floor(Math.pow(1 / this.getField(true)
-        .map(p => p.getSpriteScale())
-        .reduce((highestScale: number, scale: number) => highestScale = Math.max(scale, highestScale), 0), 0.7) * 40
-      ) / 40;
+      const fieldScale =
+        Math.floor(
+          Math.pow(
+            1 /
+              this.getField(true)
+                .map(p => p.getSpriteScale())
+                .reduce((highestScale: number, scale: number) => (highestScale = Math.max(scale, highestScale)), 0),
+            0.7,
+          ) * 40,
+        ) / 40;
       this.setFieldScale(fieldScale).then(() => resolve());
     });
   }
 
-  setFieldScale(scale: number, instant: boolean = false): Promise<void> {
+  setFieldScale(scale: number, instant = false): Promise<void> {
     return new Promise(resolve => {
       scale *= 6;
       if (this.field.scale === scale) {
@@ -1437,9 +1576,9 @@ export default class BattleScene extends SceneBase {
         scale: scale,
         x: (defaultWidth - scaledWidth) / 2,
         y: defaultHeight - scaledHeight,
-        duration: !instant ? Utils.fixedInt(Math.abs(this.field.scale - scale) * 200) : 0,
+        duration: !instant ? fixedInt(Math.abs(this.field.scale - scale) * 200) : 0,
         ease: "Sine.easeInOut",
-        onComplete: () => resolve()
+        onComplete: () => resolve(),
       });
     });
   }
@@ -1449,7 +1588,68 @@ export default class BattleScene extends SceneBase {
       return 0;
     }
 
-    const isEggPhase: boolean = [ "EggLapsePhase", "EggHatchPhase" ].includes(this.getCurrentPhase()?.constructor.name ?? "");
+    const isEggPhase: boolean = ["EggLapsePhase", "EggHatchPhase"].includes(
+      this.getCurrentPhase()?.constructor.name ?? "",
+    );
+
+    if (
+      // Give trainers with specialty types an appropriately-typed form for Wormadam, Rotom, Arceus, Oricorio, Silvally, or Paldean Tauros.
+      !isEggPhase &&
+      this.currentBattle?.battleType === BattleType.TRAINER &&
+      !isNullOrUndefined(this.currentBattle.trainer) &&
+      this.currentBattle.trainer.config.hasSpecialtyType()
+    ) {
+      if (species.speciesId === Species.WORMADAM) {
+        switch (this.currentBattle.trainer.config.specialtyType) {
+          case PokemonType.GROUND:
+            return 1; // Sandy Cloak
+          case PokemonType.STEEL:
+            return 2; // Trash Cloak
+          case PokemonType.GRASS:
+            return 0; // Plant Cloak
+        }
+      }
+      if (species.speciesId === Species.ROTOM) {
+        switch (this.currentBattle.trainer.config.specialtyType) {
+          case PokemonType.FLYING:
+            return 4; // Fan Rotom
+          case PokemonType.GHOST:
+            return 0; // Lightbulb Rotom
+          case PokemonType.FIRE:
+            return 1; // Heat Rotom
+          case PokemonType.GRASS:
+            return 5; // Mow Rotom
+          case PokemonType.WATER:
+            return 2; // Wash Rotom
+          case PokemonType.ICE:
+            return 3; // Frost Rotom
+        }
+      }
+      if (species.speciesId === Species.ORICORIO) {
+        switch (this.currentBattle.trainer.config.specialtyType) {
+          case PokemonType.GHOST:
+            return 3; // Sensu Style
+          case PokemonType.FIRE:
+            return 0; // Baile Style
+          case PokemonType.ELECTRIC:
+            return 1; // Pom-Pom Style
+          case PokemonType.PSYCHIC:
+            return 2; // Pa'u Style
+        }
+      }
+      if (species.speciesId === Species.PALDEA_TAUROS) {
+        switch (this.currentBattle.trainer.config.specialtyType) {
+          case PokemonType.FIRE:
+            return 1; // Blaze Breed
+          case PokemonType.WATER:
+            return 2; // Aqua Breed
+        }
+      }
+      if (species.speciesId === Species.SILVALLY || species.speciesId === Species.ARCEUS) {
+        // Would probably never happen, but might as well
+        return this.currentBattle.trainer.config.specialtyType;
+      }
+    }
 
     switch (species.speciesId) {
       case Species.UNOWN:
@@ -1458,8 +1658,6 @@ export default class BattleScene extends SceneBase {
       case Species.BASCULIN:
       case Species.DEERLING:
       case Species.SAWSBUCK:
-      case Species.FROAKIE:
-      case Species.FROGADIER:
       case Species.SCATTERBUG:
       case Species.SPEWPA:
       case Species.VIVILLON:
@@ -1475,48 +1673,67 @@ export default class BattleScene extends SceneBase {
       case Species.SQUAWKABILLY:
       case Species.TATSUGIRI:
       case Species.PALDEA_TAUROS:
-        return Utils.randSeedInt(species.forms.length);
+        return randSeedInt(species.forms.length);
       case Species.PIKACHU:
         if (this.currentBattle?.battleType === BattleType.TRAINER && this.currentBattle?.waveIndex < 30) {
           return 0; // Ban Cosplay and Partner Pika from Trainers before wave 30
         }
-        return Utils.randSeedInt(8);
+        return randSeedInt(8);
       case Species.EEVEE:
-        if (this.currentBattle?.battleType === BattleType.TRAINER && this.currentBattle?.waveIndex < 30 && !isEggPhase) {
+        if (
+          this.currentBattle?.battleType === BattleType.TRAINER &&
+          this.currentBattle?.waveIndex < 30 &&
+          !isEggPhase
+        ) {
           return 0; // No Partner Eevee for Wave 12 Preschoolers
         }
-        return Utils.randSeedInt(2);
+        return randSeedInt(2);
+      case Species.FROAKIE:
+      case Species.FROGADIER:
       case Species.GRENINJA:
-        if (this.currentBattle?.battleType === BattleType.TRAINER) {
-          return 0; // Don't give trainers Battle Bond Greninja
+        if (this.currentBattle?.battleType === BattleType.TRAINER && !isEggPhase) {
+          return 0; // Don't give trainers Battle Bond Greninja, Froakie or Frogadier
         }
-        return Utils.randSeedInt(2);
+        return randSeedInt(2);
       case Species.URSHIFU:
-        return Utils.randSeedInt(2);
+        return randSeedInt(2);
       case Species.ZYGARDE:
-        return Utils.randSeedInt(4);
+        return randSeedInt(4);
       case Species.MINIOR:
-        return Utils.randSeedInt(7);
+        return randSeedInt(7);
       case Species.ALCREMIE:
-        return Utils.randSeedInt(9);
+        return randSeedInt(9);
       case Species.MEOWSTIC:
       case Species.INDEEDEE:
       case Species.BASCULEGION:
       case Species.OINKOLOGNE:
         return gender === Gender.FEMALE ? 1 : 0;
-      case Species.TOXTRICITY:
-        const lowkeyNatures = [ Nature.LONELY, Nature.BOLD, Nature.RELAXED, Nature.TIMID, Nature.SERIOUS, Nature.MODEST, Nature.MILD, Nature.QUIET, Nature.BASHFUL, Nature.CALM, Nature.GENTLE, Nature.CAREFUL ];
+      case Species.TOXTRICITY: {
+        const lowkeyNatures = [
+          Nature.LONELY,
+          Nature.BOLD,
+          Nature.RELAXED,
+          Nature.TIMID,
+          Nature.SERIOUS,
+          Nature.MODEST,
+          Nature.MILD,
+          Nature.QUIET,
+          Nature.BASHFUL,
+          Nature.CALM,
+          Nature.GENTLE,
+          Nature.CAREFUL,
+        ];
         if (nature !== undefined && lowkeyNatures.indexOf(nature) > -1) {
           return 1;
         }
         return 0;
+      }
       case Species.GIMMIGHOUL:
-      // Chest form can only be found in Mysterious Chest Encounter, if this is a game mode with MEs
+        // Chest form can only be found in Mysterious Chest Encounter, if this is a game mode with MEs
         if (this.gameMode.hasMysteryEncounters && !isEggPhase) {
           return 1; // Wandering form
-        } else {
-          return Utils.randSeedInt(species.forms.length);
         }
+        return randSeedInt(species.forms.length);
     }
 
     if (ignoreArena) {
@@ -1525,7 +1742,7 @@ export default class BattleScene extends SceneBase {
         case Species.WORMADAM:
         case Species.ROTOM:
         case Species.LYCANROC:
-          return Utils.randSeedInt(species.forms.length);
+          return randSeedInt(species.forms.length);
       }
       return 0;
     }
@@ -1535,24 +1752,33 @@ export default class BattleScene extends SceneBase {
 
   private getGeneratedOffsetGym(): boolean {
     let ret = false;
-    this.executeWithSeedOffset(() => {
-      ret = !Utils.randSeedInt(2);
-    }, 0, this.seed.toString());
+    this.executeWithSeedOffset(
+      () => {
+        ret = !randSeedInt(2);
+      },
+      0,
+      this.seed.toString(),
+    );
     return ret;
   }
 
   private getGeneratedWaveCycleOffset(): number {
     let ret = 0;
-    this.executeWithSeedOffset(() => {
-      ret = Utils.randSeedInt(8) * 5;
-    }, 0, this.seed.toString());
+    this.executeWithSeedOffset(
+      () => {
+        ret = randSeedInt(8) * 5;
+      },
+      0,
+      this.seed.toString(),
+    );
     return ret;
   }
 
-  getEncounterBossSegments(waveIndex: number, level: number, species?: PokemonSpecies, forceBoss: boolean = false): number {
+  getEncounterBossSegments(waveIndex: number, level: number, species?: PokemonSpecies, forceBoss = false): number {
     if (Overrides.OPP_HEALTH_SEGMENTS_OVERRIDE > 1) {
       return Overrides.OPP_HEALTH_SEGMENTS_OVERRIDE;
-    } else if (Overrides.OPP_HEALTH_SEGMENTS_OVERRIDE === 1) {
+    }
+    if (Overrides.OPP_HEALTH_SEGMENTS_OVERRIDE === 1) {
       // The rest of the code expects to be returned 0 and not 1 if the enemy is not a boss
       return 0;
     }
@@ -1566,14 +1792,17 @@ export default class BattleScene extends SceneBase {
       isBoss = true;
     } else {
       this.executeWithSeedOffset(() => {
-        isBoss = waveIndex % 10 === 0 || (this.gameMode.hasRandomBosses && Utils.randSeedInt(100) < Math.min(Math.max(Math.ceil((waveIndex - 250) / 50), 0) * 2, 30));
+        isBoss =
+          waveIndex % 10 === 0 ||
+          (this.gameMode.hasRandomBosses &&
+            randSeedInt(100) < Math.min(Math.max(Math.ceil((waveIndex - 250) / 50), 0) * 2, 30));
       }, waveIndex << 2);
     }
     if (!isBoss) {
       return 0;
     }
 
-    let ret: number = 2;
+    let ret = 2;
 
     if (level >= 100) {
       ret++;
@@ -1593,7 +1822,7 @@ export default class BattleScene extends SceneBase {
     const infectedIndexes: number[] = [];
     const spread = (index: number, spreadTo: number) => {
       const partyMember = party[index + spreadTo];
-      if (!partyMember.pokerus && !Utils.randSeedInt(10)) {
+      if (!partyMember.pokerus && !randSeedInt(10)) {
         partyMember.pokerus = true;
         infectedIndexes.push(index + spreadTo);
       }
@@ -1603,26 +1832,34 @@ export default class BattleScene extends SceneBase {
         return;
       }
 
-      this.executeWithSeedOffset(() => {
-        if (p) {
-          spread(p, -1);
-        }
-        if (p < party.length - 1) {
-          spread(p, 1);
-        }
-      }, this.currentBattle.waveIndex + (p << 8));
+      this.executeWithSeedOffset(
+        () => {
+          if (p) {
+            spread(p, -1);
+          }
+          if (p < party.length - 1) {
+            spread(p, 1);
+          }
+        },
+        this.currentBattle.waveIndex + (p << 8),
+      );
     });
   }
 
   resetSeed(waveIndex?: number): void {
     const wave = waveIndex || this.currentBattle?.waveIndex || 0;
-    this.waveSeed = Utils.shiftCharCodes(this.seed, wave);
-    Phaser.Math.RND.sow([ this.waveSeed ]);
+    this.waveSeed = shiftCharCodes(this.seed, wave);
+    Phaser.Math.RND.sow([this.waveSeed]);
     console.log("Wave Seed:", this.waveSeed, wave);
     this.rngCounter = 0;
   }
 
-  executeWithSeedOffset(func: Function, offset: number, seedOverride?: string): void {
+  executeWithSeedOffset(
+    // biome-ignore lint/complexity/noBannedTypes: Refactor to not use Function
+    func: Function,
+    offset: number,
+    seedOverride?: string,
+  ): void {
     if (!func) {
       return;
     }
@@ -1630,7 +1867,7 @@ export default class BattleScene extends SceneBase {
     const tempRngOffset = this.rngOffset;
     const tempRngSeedOverride = this.rngSeedOverride;
     const state = Phaser.Math.RND.state();
-    Phaser.Math.RND.sow([ Utils.shiftCharCodes(seedOverride || this.seed, offset) ]);
+    Phaser.Math.RND.sow([shiftCharCodes(seedOverride || this.seed, offset)]);
     this.rngCounter = 0;
     this.rngOffset = offset;
     this.rngSeedOverride = seedOverride || "";
@@ -1641,7 +1878,13 @@ export default class BattleScene extends SceneBase {
     this.rngSeedOverride = tempRngSeedOverride;
   }
 
-  addFieldSprite(x: number, y: number, texture: string | Phaser.Textures.Texture, frame?: string | number, terrainColorRatio: number = 0): Phaser.GameObjects.Sprite {
+  addFieldSprite(
+    x: number,
+    y: number,
+    texture: string | Phaser.Textures.Texture,
+    frame?: string | number,
+    terrainColorRatio = 0,
+  ): Phaser.GameObjects.Sprite {
     const ret = this.add.sprite(x, y, texture, frame);
     ret.setPipeline(this.fieldSpritePipeline);
     if (terrainColorRatio) {
@@ -1651,14 +1894,33 @@ export default class BattleScene extends SceneBase {
     return ret;
   }
 
-  addPokemonSprite(pokemon: Pokemon, x: number, y: number, texture: string | Phaser.Textures.Texture, frame?: string | number, hasShadow: boolean = false, ignoreOverride: boolean = false): Phaser.GameObjects.Sprite {
+  addPokemonSprite(
+    pokemon: Pokemon,
+    x: number,
+    y: number,
+    texture: string | Phaser.Textures.Texture,
+    frame?: string | number,
+    hasShadow = false,
+    ignoreOverride = false,
+  ): Phaser.GameObjects.Sprite {
     const ret = this.addFieldSprite(x, y, texture, frame);
     this.initPokemonSprite(ret, pokemon, hasShadow, ignoreOverride);
     return ret;
   }
 
-  initPokemonSprite(sprite: Phaser.GameObjects.Sprite, pokemon?: Pokemon, hasShadow: boolean = false, ignoreOverride: boolean = false): Phaser.GameObjects.Sprite {
-    sprite.setPipeline(this.spritePipeline, { tone: [ 0.0, 0.0, 0.0, 0.0 ], hasShadow: hasShadow, ignoreOverride: ignoreOverride, teraColor: pokemon ? getTypeRgb(pokemon.getTeraType()) : undefined });
+  initPokemonSprite(
+    sprite: Phaser.GameObjects.Sprite,
+    pokemon?: Pokemon,
+    hasShadow = false,
+    ignoreOverride = false,
+  ): Phaser.GameObjects.Sprite {
+    sprite.setPipeline(this.spritePipeline, {
+      tone: [0.0, 0.0, 0.0, 0.0],
+      hasShadow: hasShadow,
+      ignoreOverride: ignoreOverride,
+      teraColor: pokemon ? getTypeRgb(pokemon.getTeraType()) : undefined,
+      isTerastallized: pokemon ? pokemon.isTerastallized : false,
+    });
     this.spriteSparkleHandler.add(sprite);
     return sprite;
   }
@@ -1677,7 +1939,7 @@ export default class BattleScene extends SceneBase {
         alpha: 0.5,
         ease: "Sine.easeOut",
         duration: duration,
-        onComplete: () => resolve()
+        onComplete: () => resolve(),
       });
     });
   }
@@ -1689,7 +1951,7 @@ export default class BattleScene extends SceneBase {
         alpha: 0,
         duration: duration,
         ease: "Cubic.easeIn",
-        onComplete: () => resolve()
+        onComplete: () => resolve(),
       });
     });
   }
@@ -1710,7 +1972,7 @@ export default class BattleScene extends SceneBase {
         alpha: this.shopOverlayOpacity,
         ease: "Sine.easeOut",
         duration,
-        onComplete: () => resolve()
+        onComplete: () => resolve(),
       });
     });
   }
@@ -1723,7 +1985,7 @@ export default class BattleScene extends SceneBase {
         alpha: 0,
         duration: duration,
         ease: "Cubic.easeIn",
-        onComplete: () => resolve()
+        onComplete: () => resolve(),
       });
     });
   }
@@ -1740,17 +2002,17 @@ export default class BattleScene extends SceneBase {
     const isBoss = !(this.currentBattle.waveIndex % 10);
     const biomeString: string = getBiomeName(this.arena.biomeType);
     this.fieldUI.moveAbove(this.biomeWaveText, this.luckText);
-    this.biomeWaveText.setText( biomeString + " - " + this.currentBattle.waveIndex.toString());
+    this.biomeWaveText.setText(biomeString + " - " + this.currentBattle.waveIndex.toString());
     this.biomeWaveText.setColor(!isBoss ? "#ffffff" : "#f89890");
     this.biomeWaveText.setShadowColor(!isBoss ? "#636363" : "#984038");
     this.biomeWaveText.setVisible(true);
   }
 
-  updateMoneyText(forceVisible: boolean = true): void {
+  updateMoneyText(forceVisible = true): void {
     if (this.money === undefined) {
       return;
     }
-    const formattedMoney = Utils.formatMoney(this.moneyFormat, this.money);
+    const formattedMoney = formatMoney(this.moneyFormat, this.money);
     this.moneyText.setText(i18next.t("battleScene:moneyOwned", { formattedMoney }));
     this.fieldUI.moveAbove(this.moneyText, this.luckText);
     if (forceVisible) {
@@ -1770,7 +2032,7 @@ export default class BattleScene extends SceneBase {
       scale: this.moneyText.scale + deltaScale,
       loop: 0,
       yoyo: true,
-      onComplete: (_) => this.moneyText.setShadowColor(getTextColor(TextStyle.MONEY, true)),
+      onComplete: _ => this.moneyText.setShadowColor(getTextColor(TextStyle.MONEY, true)),
     });
   }
 
@@ -1784,8 +2046,10 @@ export default class BattleScene extends SceneBase {
    * @param duration The time for this label to fade in, if it is not already visible.
    */
   updateAndShowText(duration: number): void {
-    const labels = [ this.luckLabelText, this.luckText ];
-    labels.forEach(t => t.setAlpha(0));
+    const labels = [this.luckLabelText, this.luckText];
+    for (const label of labels) {
+      label.setAlpha(0);
+    }
     const luckValue = getPartyLuckValue(this.getPlayerParty());
     this.luckText.setText(getLuckString(luckValue));
     if (luckValue < 14) {
@@ -1793,14 +2057,16 @@ export default class BattleScene extends SceneBase {
     } else {
       this.luckText.setTint(0xffef5c, 0x47ff69, 0x6b6bff, 0xff6969);
     }
-    this.luckLabelText.setX((this.game.canvas.width / 6) - 2 - (this.luckText.displayWidth + 2));
+    this.luckLabelText.setX(this.game.canvas.width / 6 - 2 - (this.luckText.displayWidth + 2));
     this.tweens.add({
       targets: labels,
       duration: duration,
       alpha: 1,
       onComplete: () => {
-        labels.forEach(t => t.setVisible(true));
-      }
+        for (const label of labels) {
+          label.setVisible(true);
+        }
+      },
     });
   }
 
@@ -1808,14 +2074,16 @@ export default class BattleScene extends SceneBase {
     if (this.reroll) {
       return;
     }
-    const labels = [ this.luckLabelText, this.luckText ];
+    const labels = [this.luckLabelText, this.luckText];
     this.tweens.add({
       targets: labels,
       duration: duration,
       alpha: 0,
       onComplete: () => {
-        labels.forEach(l => l.setVisible(false));
-      }
+        for (const label of labels) {
+          label.setVisible(false);
+        }
+      },
     });
   }
 
@@ -1823,11 +2091,15 @@ export default class BattleScene extends SceneBase {
     const enemyModifierCount = this.enemyModifiers.filter(m => m.isIconVisible()).length;
     const biomeWaveTextHeight = this.biomeWaveText.getBottomLeft().y - this.biomeWaveText.getTopLeft().y;
     this.biomeWaveText.setY(
-      -(this.game.canvas.height / 6) + (enemyModifierCount ? enemyModifierCount <= 12 ? 15 : 24 : 0) + (biomeWaveTextHeight / 2)
+      -(this.game.canvas.height / 6) +
+        (enemyModifierCount ? (enemyModifierCount <= 12 ? 15 : 24) : 0) +
+        biomeWaveTextHeight / 2,
     );
     this.moneyText.setY(this.biomeWaveText.y + 10);
     this.scoreText.setY(this.moneyText.y + 10);
-    [ this.luckLabelText, this.luckText ].map(l => l.setY((this.scoreText.visible ? this.scoreText : this.moneyText).y + 10));
+    [this.luckLabelText, this.luckText].map(l =>
+      l.setY((this.scoreText.visible ? this.scoreText : this.moneyText).y + 10),
+    );
     const offsetY = (this.scoreText.visible ? this.scoreText : this.moneyText).y + 15;
     this.partyExpBar.setY(offsetY);
     this.candyBar.setY(offsetY + 15);
@@ -1844,18 +2116,24 @@ export default class BattleScene extends SceneBase {
   }
 
   addFaintedEnemyScore(enemy: EnemyPokemon): void {
-    let scoreIncrease = enemy.getSpeciesForm().getBaseExp() * (enemy.level / this.getMaxExpLevel()) * ((enemy.ivs.reduce((iv: number, total: number) => total += iv, 0) / 93) * 0.2 + 0.8);
-    this.findModifiers(m => m instanceof PokemonHeldItemModifier && m.pokemonId === enemy.id, false).map(m => scoreIncrease *= (m as PokemonHeldItemModifier).getScoreMultiplier());
+    let scoreIncrease =
+      enemy.getSpeciesForm().getBaseExp() *
+      (enemy.level / this.getMaxExpLevel()) *
+      ((enemy.ivs.reduce((iv: number, total: number) => (total += iv), 0) / 93) * 0.2 + 0.8);
+    this.findModifiers(m => m instanceof PokemonHeldItemModifier && m.pokemonId === enemy.id, false).map(
+      m => (scoreIncrease *= (m as PokemonHeldItemModifier).getScoreMultiplier()),
+    );
     if (enemy.isBoss()) {
       scoreIncrease *= Math.sqrt(enemy.bossSegments);
     }
     this.currentBattle.battleScore += Math.ceil(scoreIncrease);
   }
 
-  getMaxExpLevel(ignoreLevelCap: boolean = false): number {
+  getMaxExpLevel(ignoreLevelCap = false): number {
     if (Overrides.LEVEL_CAP_OVERRIDE > 0) {
       return Overrides.LEVEL_CAP_OVERRIDE;
-    } else if (ignoreLevelCap || Overrides.LEVEL_CAP_OVERRIDE < 0) {
+    }
+    if (ignoreLevelCap || Overrides.LEVEL_CAP_OVERRIDE < 0) {
       return Number.MAX_SAFE_INTEGER;
     }
     const waveIndex = Math.ceil((this.currentBattle?.waveIndex || 1) / 10) * 10;
@@ -1864,27 +2142,43 @@ export default class BattleScene extends SceneBase {
     return Math.ceil(baseLevel / 2) * 2 + 2;
   }
 
-  randomSpecies(waveIndex: number, level: number, fromArenaPool?: boolean, speciesFilter?: PokemonSpeciesFilter, filterAllEvolutions?: boolean): PokemonSpecies {
+  randomSpecies(
+    waveIndex: number,
+    level: number,
+    fromArenaPool?: boolean,
+    speciesFilter?: PokemonSpeciesFilter,
+    filterAllEvolutions?: boolean,
+  ): PokemonSpecies {
     if (fromArenaPool) {
       return this.arena.randomSpecies(waveIndex, level, undefined, getPartyLuckValue(this.party));
     }
-    const filteredSpecies = speciesFilter ? [ ...new Set(allSpecies.filter(s => s.isCatchable()).filter(speciesFilter).map(s => {
-      if (!filterAllEvolutions) {
-        while (pokemonPrevolutions.hasOwnProperty(s.speciesId)) {
-          s = getPokemonSpecies(pokemonPrevolutions[s.speciesId]);
-        }
-      }
-      return s;
-    })) ] : allSpecies.filter(s => s.isCatchable());
-    return filteredSpecies[Utils.randSeedInt(filteredSpecies.length)];
+    const filteredSpecies = speciesFilter
+      ? [
+          ...new Set(
+            allSpecies
+              .filter(s => s.isCatchable())
+              .filter(speciesFilter)
+              .map(s => {
+                if (!filterAllEvolutions) {
+                  while (pokemonPrevolutions.hasOwnProperty(s.speciesId)) {
+                    s = getPokemonSpecies(pokemonPrevolutions[s.speciesId]);
+                  }
+                }
+                return s;
+              }),
+          ),
+        ]
+      : allSpecies.filter(s => s.isCatchable());
+    return filteredSpecies[randSeedInt(filteredSpecies.length)];
   }
 
   generateRandomBiome(waveIndex: number): Biome {
     const relWave = waveIndex % 250;
-    const biomes = Utils.getEnumValues(Biome).filter(b => b !== Biome.TOWN && b !== Biome.END);
+    const biomes = getEnumValues(Biome).filter(b => b !== Biome.TOWN && b !== Biome.END);
     const maxDepth = biomeDepths[Biome.END][0] - 2;
-    const depthWeights = new Array(maxDepth + 1).fill(null)
-      .map((_, i: number) => ((1 - Math.min(Math.abs((i / (maxDepth - 1)) - (relWave / 250)) + 0.25, 1)) / 0.75) * 250);
+    const depthWeights = new Array(maxDepth + 1)
+      .fill(null)
+      .map((_, i: number) => ((1 - Math.min(Math.abs(i / (maxDepth - 1) - relWave / 250) + 0.25, 1)) / 0.75) * 250);
     const biomeThresholds: number[] = [];
     let totalWeight = 0;
     for (const biome of biomes) {
@@ -1892,7 +2186,7 @@ export default class BattleScene extends SceneBase {
       biomeThresholds.push(totalWeight);
     }
 
-    const randInt = Utils.randSeedInt(totalWeight);
+    const randInt = randSeedInt(totalWeight);
 
     for (let i = 0; i < biomes.length; i++) {
       if (randInt < biomeThresholds[i]) {
@@ -1900,21 +2194,24 @@ export default class BattleScene extends SceneBase {
       }
     }
 
-    return biomes[Utils.randSeedInt(biomes.length)];
+    return biomes[randSeedInt(biomes.length)];
   }
 
   isBgmPlaying(): boolean {
-    return this.bgm && this.bgm.isPlaying;
+    return this.bgm?.isPlaying ?? false;
   }
 
   playBgm(bgmName?: string, fadeOut?: boolean): void {
     if (bgmName === undefined) {
       bgmName = this.currentBattle?.getBgmOverride() || this.arena?.bgm;
     }
+
+    bgmName = timedEventManager.getEventBgmReplacement(bgmName);
+
     if (this.bgm && bgmName === this.bgm.key) {
       if (!this.bgm.isPlaying) {
         this.bgm.play({
-          volume: this.masterVolume * this.bgmVolume
+          volume: this.masterVolume * this.bgmVolume,
         });
       }
       return;
@@ -1925,15 +2222,13 @@ export default class BattleScene extends SceneBase {
     this.bgmCache.add(bgmName);
     this.loadBgm(bgmName);
     let loopPoint = 0;
-    loopPoint = bgmName === this.arena.bgm
-      ? this.arena.getBgmLoopPoint()
-      : this.getBgmLoopPoint(bgmName);
+    loopPoint = bgmName === this.arena.bgm ? this.arena.getBgmLoopPoint() : this.getBgmLoopPoint(bgmName);
     let loaded = false;
     const playNewBgm = () => {
       this.ui.bgmBar.setBgmToBgmBar(bgmName);
       if (bgmName === null && this.bgm && !this.bgm.pendingRemove) {
         this.bgm.play({
-          volume: this.masterVolume * this.bgmVolume
+          volume: this.masterVolume * this.bgmVolume,
         });
         return;
       }
@@ -1942,7 +2237,7 @@ export default class BattleScene extends SceneBase {
       }
       this.bgm = this.sound.add(bgmName, { loop: true });
       this.bgm.play({
-        volume: this.masterVolume * this.bgmVolume
+        volume: this.masterVolume * this.bgmVolume,
       });
       if (loopPoint) {
         this.bgm.on("looped", () => this.bgm.play({ seek: loopPoint }));
@@ -1991,7 +2286,6 @@ export default class BattleScene extends SceneBase {
         } else {
           const soundDetails = sound.key.split("/");
           switch (soundDetails[0]) {
-
             case "battle_anims":
             case "cry":
               if (soundDetails[1].startsWith("PRSFX- ")) {
@@ -2009,7 +2303,7 @@ export default class BattleScene extends SceneBase {
     }
   }
 
-  fadeOutBgm(duration: number = 500, destroy: boolean = true): boolean {
+  fadeOutBgm(duration = 500, destroy = true): boolean {
     if (!this.bgm) {
       return false;
     }
@@ -2028,7 +2322,7 @@ export default class BattleScene extends SceneBase {
    * @param destroy
    * @param delay
    */
-  fadeAndSwitchBgm(newBgmKey: string, destroy: boolean = false, delay: number = 2000) {
+  fadeAndSwitchBgm(newBgmKey: string, destroy = false, delay = 2000) {
     this.fadeOutBgm(delay, destroy);
     this.time.delayedCall(delay, () => {
       this.playBgm(newBgmKey);
@@ -2048,24 +2342,24 @@ export default class BattleScene extends SceneBase {
         case "heal":
         case "evolution":
         case "evolution_fanfare":
-        // These sounds are loaded in as BGM, but played as sound effects
-        // When these sounds are updated in updateVolume(), they are treated as BGM however because they are placed in the BGM Cache through being called by playSoundWithoutBGM()
-          config["volume"] *= (this.masterVolume * this.bgmVolume);
+          // These sounds are loaded in as BGM, but played as sound effects
+          // When these sounds are updated in updateVolume(), they are treated as BGM however because they are placed in the BGM Cache through being called by playSoundWithoutBGM()
+          config["volume"] *= this.masterVolume * this.bgmVolume;
           break;
         case "battle_anims":
         case "cry":
-          config["volume"] *= (this.masterVolume * this.fieldVolume);
+          config["volume"] *= this.masterVolume * this.fieldVolume;
           //PRSFX sound files are unusually loud
           if (keyDetails[1].startsWith("PRSFX- ")) {
             config["volume"] *= 0.5;
           }
           break;
         case "ui":
-        //As of, right now this applies to the "select", "menu_open", "error" sound effects
-          config["volume"] *= (this.masterVolume * this.uiVolume);
+          //As of, right now this applies to the "select", "menu_open", "error" sound effects
+          config["volume"] *= this.masterVolume * this.uiVolume;
           break;
         case "se":
-          config["volume"] *= (this.masterVolume * this.seVolume);
+          config["volume"] *= this.masterVolume * this.seVolume;
           break;
       }
       this.sound.play(key, config);
@@ -2085,7 +2379,7 @@ export default class BattleScene extends SceneBase {
       this.bgmResumeTimer.destroy();
     }
     if (resumeBgm) {
-      this.bgmResumeTimer = this.time.delayedCall((pauseDuration || Utils.fixedInt(sound.totalDuration * 1000)), () => {
+      this.bgmResumeTimer = this.time.delayedCall(pauseDuration || fixedInt(sound.totalDuration * 1000), () => {
         this.resumeBgm();
         this.bgmResumeTimer = null;
       });
@@ -2097,9 +2391,9 @@ export default class BattleScene extends SceneBase {
   getBgmLoopPoint(bgmName: string): number {
     switch (bgmName) {
       case "title": //Firel PokéRogue Title
-        return 46.500;
+        return 46.5;
       case "battle_kanto_champion": //B2W2 Kanto Champion Battle
-        return 13.950;
+        return 13.95;
       case "battle_johto_champion": //B2W2 Johto Champion Battle
         return 23.498;
       case "battle_hoenn_champion_g5": //B2W2 Hoenn Champion Battle
@@ -2113,7 +2407,7 @@ export default class BattleScene extends SceneBase {
       case "battle_champion_iris": //B2W2 Unova Champion Battle
         return 10.145;
       case "battle_kalos_champion": //XY Kalos Champion Battle
-        return 10.380;
+        return 10.38;
       case "battle_champion_kukui": //SM Kukui Battle
         return 15.784;
       case "battle_alola_champion": //USUM Alola Champion Battle
@@ -2129,17 +2423,17 @@ export default class BattleScene extends SceneBase {
       case "battle_champion_kieran": //SV Champion Kieran Battle
         return 7.206;
       case "battle_hoenn_elite": //ORAS Elite Four Battle
-        return 11.350;
+        return 11.35;
       case "battle_unova_elite": //BW Elite Four Battle
-        return 17.730;
+        return 17.73;
       case "battle_kalos_elite": //XY Elite Four Battle
-        return 12.340;
+        return 12.34;
       case "battle_alola_elite": //SM Elite Four Battle
         return 19.212;
       case "battle_galar_elite": //SWSH League Tournament Battle
         return 164.069;
       case "battle_paldea_elite": //SV Elite Four Battle
-        return 12.770;
+        return 12.77;
       case "battle_bb_elite": //SV BB League Elite Four Battle
         return 19.434;
       case "battle_final_encounter": //PMD RTDX Rayquaza's Domain
@@ -2157,7 +2451,7 @@ export default class BattleScene extends SceneBase {
       case "battle_unova_gym": //BW Unova Gym Battle
         return 19.145;
       case "battle_kalos_gym": //XY Kalos Gym Battle
-        return 44.810;
+        return 44.81;
       case "battle_galar_gym": //SWSH Galar Gym Battle
         return 171.262;
       case "battle_paldea_gym": //SV Paldea Gym Battle
@@ -2171,13 +2465,13 @@ export default class BattleScene extends SceneBase {
       case "battle_legendary_suicune": //HGSS Suicune Battle
         return 12.636;
       case "battle_legendary_lugia": //HGSS Lugia Battle
-        return 19.770;
+        return 19.77;
       case "battle_legendary_ho_oh": //HGSS Ho-oh Battle
         return 17.668;
       case "battle_legendary_regis_g5": //B2W2 Legendary Titan Battle
-        return 49.500;
+        return 49.5;
       case "battle_legendary_regis_g6": //ORAS Legendary Titan Battle
-        return 21.130;
+        return 21.13;
       case "battle_legendary_gro_kyo": //ORAS Groudon & Kyogre Battle
         return 10.547;
       case "battle_legendary_rayquaza": //ORAS Rayquaza Battle
@@ -2187,7 +2481,7 @@ export default class BattleScene extends SceneBase {
       case "battle_legendary_lake_trio": //ORAS Lake Guardians Battle
         return 16.887;
       case "battle_legendary_sinnoh": //ORAS Sinnoh Legendary Battle
-        return 22.770;
+        return 22.77;
       case "battle_legendary_dia_pal": //ORAS Dialga & Palkia Battle
         return 16.009;
       case "battle_legendary_origin_forme": //LA Origin Dialga & Palkia Battle
@@ -2205,7 +2499,7 @@ export default class BattleScene extends SceneBase {
       case "battle_legendary_xern_yvel": //XY Xerneas & Yveltal Battle
         return 26.468;
       case "battle_legendary_tapu": //SM Tapu Battle
-        return 0.000;
+        return 0.0;
       case "battle_legendary_sol_lun": //SM Solgaleo & Lunala Battle
         return 6.525;
       case "battle_legendary_ub": //SM Ultra Beast Battle
@@ -2229,7 +2523,7 @@ export default class BattleScene extends SceneBase {
       case "battle_legendary_kor_mir": //SV Depths of Area Zero Battle
         return 6.442;
       case "battle_legendary_loyal_three": //SV Loyal Three Battle
-        return 6.500;
+        return 6.5;
       case "battle_legendary_ogerpon": //SV Ogerpon Battle
         return 14.335;
       case "battle_legendary_terapagos": //SV Terapagos Battle
@@ -2237,7 +2531,7 @@ export default class BattleScene extends SceneBase {
       case "battle_legendary_pecharunt": //SV Pecharunt Battle
         return 6.508;
       case "battle_rival": //BW Rival Battle
-        return 14.110;
+        return 14.11;
       case "battle_rival_2": //BW N Battle
         return 17.714;
       case "battle_rival_3": //BW Final N Battle
@@ -2247,7 +2541,7 @@ export default class BattleScene extends SceneBase {
       case "battle_wild": //BW Wild Battle
         return 12.703;
       case "battle_wild_strong": //BW Strong Wild Battle
-        return 13.940;
+        return 13.94;
       case "end_summit": //PMD RTDX Sky Tower Summit
         return 30.025;
       case "battle_rocket_grunt": //HGSS Team Rocket Battle
@@ -2261,7 +2555,7 @@ export default class BattleScene extends SceneBase {
       case "battle_flare_grunt": //XY Team Flare Battle
         return 4.228;
       case "battle_aether_grunt": // SM Aether Foundation Battle
-        return 16.00;
+        return 16.0;
       case "battle_skull_grunt": // SM Team Skull Battle
         return 20.87;
       case "battle_macro_grunt": // SWSH Trainer Battle
@@ -2275,7 +2569,7 @@ export default class BattleScene extends SceneBase {
       case "battle_skull_admin": //SM Team Skull Admin Battle
         return 15.463;
       case "battle_oleana": //SWSH Oleana Battle
-        return 14.110;
+        return 14.11;
       case "battle_star_admin": //SV Team Star Boss Battle
         return 9.493;
       case "battle_rocket_boss": //USUM Giovanni Battle
@@ -2306,6 +2600,10 @@ export default class BattleScene extends SceneBase {
         return 41.42;
       case "mystery_encounter_delibirdy": // Firel Delibirdy
         return 82.28;
+      case "title_afd": // Andr06 - PokéRogue Title Remix (AFD)
+        return 47.66;
+      case "battle_rival_3_afd": // Andr06 - Final N Battle Remix (AFD)
+        return 49.147;
     }
 
     return 0;
@@ -2328,7 +2626,6 @@ export default class BattleScene extends SceneBase {
     return this.standbyPhase;
   }
 
-
   /**
    * Adds a phase to the conditional queue and ensures it is executed only when the specified condition is met.
    *
@@ -2340,7 +2637,7 @@ export default class BattleScene extends SceneBase {
    *
    */
   pushConditionalPhase(phase: Phase, condition: () => boolean): void {
-    this.conditionalQueue.push([ condition, phase ]);
+    this.conditionalQueue.push([condition, phase]);
   }
 
   /**
@@ -2348,19 +2645,19 @@ export default class BattleScene extends SceneBase {
    * @param phase {@linkcode Phase} the phase to add
    * @param defer boolean on which queue to add to, defaults to false, and adds to phaseQueue
    */
-  pushPhase(phase: Phase, defer: boolean = false): void {
+  pushPhase(phase: Phase, defer = false): void {
     (!defer ? this.phaseQueue : this.nextCommandPhaseQueue).push(phase);
   }
 
   /**
-   * Adds Phase to the end of phaseQueuePrepend, or at phaseQueuePrependSpliceIndex
-   * @param phase {@linkcode Phase} the phase to add
+   * Adds Phase(s) to the end of phaseQueuePrepend, or at phaseQueuePrependSpliceIndex
+   * @param phases {@linkcode Phase} the phase(s) to add
    */
-  unshiftPhase(phase: Phase): void {
+  unshiftPhase(...phases: Phase[]): void {
     if (this.phaseQueuePrependSpliceIndex === -1) {
-      this.phaseQueuePrepend.push(phase);
+      this.phaseQueuePrepend.push(...phases);
     } else {
-      this.phaseQueuePrepend.splice(this.phaseQueuePrependSpliceIndex, 0, phase);
+      this.phaseQueuePrepend.splice(this.phaseQueuePrependSpliceIndex, 0, ...phases);
     }
   }
 
@@ -2371,6 +2668,18 @@ export default class BattleScene extends SceneBase {
     this.phaseQueue.splice(0, this.phaseQueue.length);
   }
 
+  /**
+   * Clears all phase-related stuff, including all phase queues, the current and standby phases, and a splice index
+   */
+  clearAllPhases(): void {
+    for (const queue of [this.phaseQueue, this.phaseQueuePrepend, this.conditionalQueue, this.nextCommandPhaseQueue]) {
+      queue.splice(0, queue.length);
+    }
+    this.currentPhase = null;
+    this.standbyPhase = null;
+    this.clearPhaseQueueSplice();
+  }
+
   /**
    * Used by function unshiftPhase(), sets index to start inserting at current length instead of the end of the array, useful if phaseQueuePrepend gets longer with Phases
    */
@@ -2498,34 +2807,38 @@ export default class BattleScene extends SceneBase {
    * @param targetPhase {@linkcode Phase} the type of phase to search for in phaseQueue
    * @returns boolean if a targetPhase was found and added
    */
-  prependToPhase(phase: Phase, targetPhase: Constructor<Phase>): boolean {
+  prependToPhase(phase: Phase | Phase[], targetPhase: Constructor<Phase>): boolean {
+    if (!Array.isArray(phase)) {
+      phase = [phase];
+    }
     const targetIndex = this.phaseQueue.findIndex(ph => ph instanceof targetPhase);
 
     if (targetIndex !== -1) {
-      this.phaseQueue.splice(targetIndex, 0, phase);
+      this.phaseQueue.splice(targetIndex, 0, ...phase);
       return true;
-    } else {
-      this.unshiftPhase(phase);
-      return false;
     }
+    this.unshiftPhase(...phase);
+    return false;
   }
 
   /**
-   * Tries to add the input phase to index after target phase in the {@linkcode phaseQueue}, else simply calls {@linkcode unshiftPhase()}
-   * @param phase {@linkcode Phase} the phase to be added
+   * Tries to add the input phase(s) to index after target phase in the {@linkcode phaseQueue}, else simply calls {@linkcode unshiftPhase()}
+   * @param phase {@linkcode Phase} the phase(s) to be added
    * @param targetPhase {@linkcode Phase} the type of phase to search for in {@linkcode phaseQueue}
    * @returns `true` if a `targetPhase` was found to append to
    */
-  appendToPhase(phase: Phase, targetPhase: Constructor<Phase>): boolean {
+  appendToPhase(phase: Phase | Phase[], targetPhase: Constructor<Phase>): boolean {
+    if (!Array.isArray(phase)) {
+      phase = [phase];
+    }
     const targetIndex = this.phaseQueue.findIndex(ph => ph instanceof targetPhase);
 
     if (targetIndex !== -1 && this.phaseQueue.length > targetIndex) {
-      this.phaseQueue.splice(targetIndex + 1, 0, phase);
+      this.phaseQueue.splice(targetIndex + 1, 0, ...phase);
       return true;
-    } else {
-      this.unshiftPhase(phase);
-      return false;
     }
+    this.unshiftPhase(...phase);
+    return false;
   }
 
   /**
@@ -2536,7 +2849,13 @@ export default class BattleScene extends SceneBase {
    * @param promptDelay optional param for MessagePhase constructor
    * @param defer boolean for which queue to add it to, false -> add to PhaseQueuePrepend, true -> nextCommandPhaseQueue
    */
-  queueMessage(message: string, callbackDelay?: number | null, prompt?: boolean | null, promptDelay?: number | null, defer?: boolean | null) {
+  queueMessage(
+    message: string,
+    callbackDelay?: number | null,
+    prompt?: boolean | null,
+    promptDelay?: number | null,
+    defer?: boolean | null,
+  ) {
     const phase = new MessagePhase(message, callbackDelay, prompt, promptDelay);
     if (!defer) {
       // adds to the end of PhaseQueuePrepend
@@ -2547,6 +2866,26 @@ export default class BattleScene extends SceneBase {
     }
   }
 
+  /**
+   * Queues an ability bar flyout phase
+   * @param pokemon The pokemon who has the ability
+   * @param passive Whether the ability is a passive
+   * @param show Whether to show or hide the bar
+   */
+  public queueAbilityDisplay(pokemon: Pokemon, passive: boolean, show: boolean): void {
+    this.unshiftPhase(show ? new ShowAbilityPhase(pokemon.getBattlerIndex(), passive) : new HideAbilityPhase());
+    this.clearPhaseQueueSplice();
+  }
+
+  /**
+   * Hides the ability bar if it is currently visible
+   */
+  public hideAbilityBar(): void {
+    if (this.abilityBar.isVisible()) {
+      this.unshiftPhase(new HideAbilityPhase());
+    }
+  }
+
   /**
    * Moves everything from nextCommandPhaseQueue to phaseQueue (keeping order)
    */
@@ -2568,107 +2907,109 @@ export default class BattleScene extends SceneBase {
   getWaveMoneyAmount(moneyMultiplier: number): number {
     const waveIndex = this.currentBattle.waveIndex;
     const waveSetIndex = Math.ceil(waveIndex / 10) - 1;
-    const moneyValue = Math.pow((waveSetIndex + 1 + (0.75 + (((waveIndex - 1) % 10) + 1) / 10)) * 100, 1 + 0.005 * waveSetIndex) * moneyMultiplier;
+    const moneyValue =
+      Math.pow((waveSetIndex + 1 + (0.75 + (((waveIndex - 1) % 10) + 1) / 10)) * 100, 1 + 0.005 * waveSetIndex) *
+      moneyMultiplier;
     return Math.floor(moneyValue / 10) * 10;
   }
 
-  addModifier(modifier: Modifier | null, ignoreUpdate?: boolean, playSound?: boolean, virtual?: boolean, instant?: boolean, cost?: number): Promise<boolean> {
-    if (!modifier) {
-      return Promise.resolve(false);
+  addModifier(
+    modifier: Modifier | null,
+    ignoreUpdate?: boolean,
+    playSound?: boolean,
+    virtual?: boolean,
+    instant?: boolean,
+    cost?: number,
+  ): boolean {
+    // We check against modifier.type to stop a bug related to loading in a pokemon that has a form change item, which prior to some patch
+    // that changed form change modifiers worked, had previously set the `type` field to null.
+    // TODO: This is not the right place to check for this; it should ideally go in a session migrator.
+    if (!modifier || !modifier.type) {
+      return false;
     }
-    return new Promise(resolve => {
-      let success = false;
-      const soundName = modifier.type.soundName;
-      this.validateAchvs(ModifierAchv, modifier);
-      const modifiersToRemove: PersistentModifier[] = [];
-      const modifierPromises: Promise<boolean>[] = [];
-      if (modifier instanceof PersistentModifier) {
-        if (modifier instanceof TerastallizeModifier) {
-          modifiersToRemove.push(...(this.findModifiers(m => m instanceof TerastallizeModifier && m.pokemonId === modifier.pokemonId)));
-        }
-        if ((modifier as PersistentModifier).add(this.modifiers, !!virtual)) {
-          if (modifier instanceof PokemonFormChangeItemModifier || modifier instanceof TerastallizeModifier) {
-            const pokemon = this.getPokemonById(modifier.pokemonId);
-            if (pokemon) {
-              success = modifier.apply(pokemon, true);
-            }
+    let success = false;
+    const soundName = modifier.type.soundName;
+    this.validateAchvs(ModifierAchv, modifier);
+    const modifiersToRemove: PersistentModifier[] = [];
+    if (modifier instanceof PersistentModifier) {
+      if ((modifier as PersistentModifier).add(this.modifiers, !!virtual)) {
+        if (modifier instanceof PokemonFormChangeItemModifier) {
+          const pokemon = this.getPokemonById(modifier.pokemonId);
+          if (pokemon) {
+            success = modifier.apply(pokemon, true);
           }
-          if (playSound && !this.sound.get(soundName)) {
-            this.playSound(soundName);
-          }
-        } else if (!virtual) {
-          const defaultModifierType = getDefaultModifierTypeForTier(modifier.type.tier);
-          this.queueMessage(i18next.t("battle:itemStackFull", { fullItemName: modifier.type.name, itemName: defaultModifierType.name }), undefined, true);
-          return this.addModifier(defaultModifierType.newModifier(), ignoreUpdate, playSound, false, instant).then(success => resolve(success));
         }
-
-        for (const rm of modifiersToRemove) {
-          this.removeModifier(rm);
-        }
-
-        if (!ignoreUpdate && !virtual) {
-          return this.updateModifiers(true, instant).then(() => resolve(success));
-        }
-      } else if (modifier instanceof ConsumableModifier) {
         if (playSound && !this.sound.get(soundName)) {
           this.playSound(soundName);
         }
-
-        if (modifier instanceof ConsumablePokemonModifier) {
-          for (const p in this.party) {
-            const pokemon = this.party[p];
-
-            const args: unknown[] = [];
-            if (modifier instanceof PokemonHpRestoreModifier) {
-              if (!(modifier as PokemonHpRestoreModifier).fainted) {
-                const hpRestoreMultiplier = new Utils.IntegerHolder(1);
-                this.applyModifiers(HealingBoosterModifier, true, hpRestoreMultiplier);
-                args.push(hpRestoreMultiplier.value);
-              } else {
-                args.push(1);
-              }
-            } else if (modifier instanceof FusePokemonModifier) {
-              args.push(this.getPokemonById(modifier.fusePokemonId) as PlayerPokemon);
-            } else if (modifier instanceof RememberMoveModifier && !Utils.isNullOrUndefined(cost)) {
-              args.push(cost);
-            }
-
-            if (modifier.shouldApply(pokemon, ...args)) {
-              const result = modifier.apply(pokemon, ...args);
-              if (result instanceof Promise) {
-                modifierPromises.push(result.then(s => success ||= s));
-              } else {
-                success ||= result;
-              }
-            }
-          }
-
-          return Promise.allSettled([ this.party.map(p => p.updateInfo(instant)), ...modifierPromises ]).then(() => resolve(success));
-        } else {
-          const args = [ this ];
-          if (modifier.shouldApply(...args)) {
-            const result = modifier.apply(...args);
-            if (result instanceof Promise) {
-              return result.then(success => resolve(success));
-            } else {
-              success ||= result;
-            }
-          }
-        }
+      } else if (!virtual) {
+        const defaultModifierType = getDefaultModifierTypeForTier(modifier.type.tier);
+        this.queueMessage(
+          i18next.t("battle:itemStackFull", {
+            fullItemName: modifier.type.name,
+            itemName: defaultModifierType.name,
+          }),
+          undefined,
+          false,
+          3000,
+        );
+        return this.addModifier(defaultModifierType.newModifier(), ignoreUpdate, playSound, false, instant);
       }
 
-      resolve(success);
-    });
+      for (const rm of modifiersToRemove) {
+        this.removeModifier(rm);
+      }
+
+      if (!ignoreUpdate && !virtual) {
+        this.updateModifiers(true, instant);
+      }
+    } else if (modifier instanceof ConsumableModifier) {
+      if (playSound && !this.sound.get(soundName)) {
+        this.playSound(soundName);
+      }
+
+      if (modifier instanceof ConsumablePokemonModifier) {
+        for (const p in this.party) {
+          const pokemon = this.party[p];
+
+          const args: unknown[] = [];
+          if (modifier instanceof PokemonHpRestoreModifier) {
+            if (!(modifier as PokemonHpRestoreModifier).fainted) {
+              const hpRestoreMultiplier = new NumberHolder(1);
+              this.applyModifiers(HealingBoosterModifier, true, hpRestoreMultiplier);
+              args.push(hpRestoreMultiplier.value);
+            } else {
+              args.push(1);
+            }
+          } else if (modifier instanceof FusePokemonModifier) {
+            args.push(this.getPokemonById(modifier.fusePokemonId) as PlayerPokemon);
+          } else if (modifier instanceof RememberMoveModifier && !isNullOrUndefined(cost)) {
+            args.push(cost);
+          }
+
+          if (modifier.shouldApply(pokemon, ...args)) {
+            const result = modifier.apply(pokemon, ...args);
+            success ||= result;
+          }
+        }
+
+        this.party.map(p => p.updateInfo(instant));
+      } else {
+        const args = [this];
+        if (modifier.shouldApply(...args)) {
+          const result = modifier.apply(...args);
+          success ||= result;
+        }
+      }
+    }
+    return success;
   }
 
   addEnemyModifier(modifier: PersistentModifier, ignoreUpdate?: boolean, instant?: boolean): Promise<void> {
     return new Promise(resolve => {
       const modifiersToRemove: PersistentModifier[] = [];
-      if (modifier instanceof TerastallizeModifier) {
-        modifiersToRemove.push(...(this.findModifiers(m => m instanceof TerastallizeModifier && m.pokemonId === modifier.pokemonId, false)));
-      }
       if ((modifier as PersistentModifier).add(this.enemyModifiers, false)) {
-        if (modifier instanceof PokemonFormChangeItemModifier || modifier instanceof TerastallizeModifier) {
+        if (modifier instanceof PokemonFormChangeItemModifier) {
           const pokemon = this.getPokemonById(modifier.pokemonId);
           if (pokemon) {
             modifier.apply(pokemon, true);
@@ -2679,7 +3020,8 @@ export default class BattleScene extends SceneBase {
         }
       }
       if (!ignoreUpdate) {
-        this.updateModifiers(false, instant).then(() => resolve());
+        this.updateModifiers(false, instant);
+        resolve();
       } else {
         resolve();
       }
@@ -2700,76 +3042,128 @@ export default class BattleScene extends SceneBase {
    * @param itemLost If `true`, treat the item's current holder as losing the item (for now, this simply enables Unburden). Default is `true`.
    * @returns `true` if the transfer was successful
    */
-  tryTransferHeldItemModifier(itemModifier: PokemonHeldItemModifier, target: Pokemon, playSound: boolean, transferQuantity: number = 1, instant?: boolean, ignoreUpdate?: boolean, itemLost: boolean = true): Promise<boolean> {
-    return new Promise(resolve => {
-      const source = itemModifier.pokemonId ? itemModifier.getPokemon() : null;
-      const cancelled = new Utils.BooleanHolder(false);
-      Utils.executeIf(!!source && source.isPlayer() !== target.isPlayer(), () => applyAbAttrs(BlockItemTheftAbAttr, source! /* checked in condition*/, cancelled)).then(() => {
-        if (cancelled.value) {
-          return resolve(false);
-        }
-        const newItemModifier = itemModifier.clone() as PokemonHeldItemModifier;
-        newItemModifier.pokemonId = target.id;
-        const matchingModifier = this.findModifier(m => m instanceof PokemonHeldItemModifier
-                    && (m as PokemonHeldItemModifier).matchType(itemModifier) && m.pokemonId === target.id, target.isPlayer()) as PokemonHeldItemModifier;
-        let removeOld = true;
-        if (matchingModifier) {
-          const maxStackCount = matchingModifier.getMaxStackCount();
-          if (matchingModifier.stackCount >= maxStackCount) {
-            return resolve(false);
-          }
-          const countTaken = Math.min(transferQuantity, itemModifier.stackCount, maxStackCount - matchingModifier.stackCount);
-          itemModifier.stackCount -= countTaken;
-          newItemModifier.stackCount = matchingModifier.stackCount + countTaken;
-          removeOld = !itemModifier.stackCount;
-        } else {
-          const countTaken = Math.min(transferQuantity, itemModifier.stackCount);
-          itemModifier.stackCount -= countTaken;
-          newItemModifier.stackCount = countTaken;
-        }
-        removeOld = !itemModifier.stackCount;
-        if (!removeOld || !source || this.removeModifier(itemModifier, !source.isPlayer())) {
-          const addModifier = () => {
-            if (!matchingModifier || this.removeModifier(matchingModifier, !target.isPlayer())) {
-              if (target.isPlayer()) {
-                this.addModifier(newItemModifier, ignoreUpdate, playSound, false, instant).then(() => {
-                  if (source && itemLost) {
-                    applyPostItemLostAbAttrs(PostItemLostAbAttr, source, false);
-                  }
-                  resolve(true);
-                });
-              } else {
-                this.addEnemyModifier(newItemModifier, ignoreUpdate, instant).then(() => {
-                  if (source && itemLost) {
-                    applyPostItemLostAbAttrs(PostItemLostAbAttr, source, false);
-                  }
-                  resolve(true);
-                });
-              }
-            } else {
-              resolve(false);
+  tryTransferHeldItemModifier(
+    itemModifier: PokemonHeldItemModifier,
+    target: Pokemon,
+    playSound: boolean,
+    transferQuantity = 1,
+    instant?: boolean,
+    ignoreUpdate?: boolean,
+    itemLost = true,
+  ): boolean {
+    const source = itemModifier.pokemonId ? itemModifier.getPokemon() : null;
+    const cancelled = new BooleanHolder(false);
+
+    if (source && source.isPlayer() !== target.isPlayer()) {
+      applyAbAttrs(BlockItemTheftAbAttr, source, cancelled);
+    }
+
+    if (cancelled.value) {
+      return false;
+    }
+
+    const newItemModifier = itemModifier.clone() as PokemonHeldItemModifier;
+    newItemModifier.pokemonId = target.id;
+    const matchingModifier = this.findModifier(
+      m => m instanceof PokemonHeldItemModifier && m.matchType(itemModifier) && m.pokemonId === target.id,
+      target.isPlayer(),
+    ) as PokemonHeldItemModifier;
+
+    if (matchingModifier) {
+      const maxStackCount = matchingModifier.getMaxStackCount();
+      if (matchingModifier.stackCount >= maxStackCount) {
+        return false;
+      }
+      const countTaken = Math.min(
+        transferQuantity,
+        itemModifier.stackCount,
+        maxStackCount - matchingModifier.stackCount,
+      );
+      itemModifier.stackCount -= countTaken;
+      newItemModifier.stackCount = matchingModifier.stackCount + countTaken;
+    } else {
+      const countTaken = Math.min(transferQuantity, itemModifier.stackCount);
+      itemModifier.stackCount -= countTaken;
+      newItemModifier.stackCount = countTaken;
+    }
+
+    const removeOld = itemModifier.stackCount === 0;
+
+    if (!removeOld || !source || this.removeModifier(itemModifier, !source.isPlayer())) {
+      const addModifier = () => {
+        if (!matchingModifier || this.removeModifier(matchingModifier, !target.isPlayer())) {
+          if (target.isPlayer()) {
+            this.addModifier(newItemModifier, ignoreUpdate, playSound, false, instant);
+            if (source && itemLost) {
+              applyPostItemLostAbAttrs(PostItemLostAbAttr, source, false);
             }
-          };
-          if (source && source.isPlayer() !== target.isPlayer() && !ignoreUpdate) {
-            this.updateModifiers(source.isPlayer(), instant).then(() => addModifier());
-          } else {
-            addModifier();
+            return true;
           }
-          return;
+          this.addEnemyModifier(newItemModifier, ignoreUpdate, instant);
+          if (source && itemLost) {
+            applyPostItemLostAbAttrs(PostItemLostAbAttr, source, false);
+          }
+          return true;
         }
-        resolve(false);
-      });
-    });
+        return false;
+      };
+      if (source && source.isPlayer() !== target.isPlayer() && !ignoreUpdate) {
+        this.updateModifiers(source.isPlayer(), instant);
+        addModifier();
+      } else {
+        addModifier();
+      }
+      return true;
+    }
+    return false;
+  }
+
+  canTransferHeldItemModifier(itemModifier: PokemonHeldItemModifier, target: Pokemon, transferQuantity = 1): boolean {
+    const mod = itemModifier.clone() as PokemonHeldItemModifier;
+    const source = mod.pokemonId ? mod.getPokemon() : null;
+    const cancelled = new BooleanHolder(false);
+
+    if (source && source.isPlayer() !== target.isPlayer()) {
+      applyAbAttrs(BlockItemTheftAbAttr, source, cancelled);
+    }
+
+    if (cancelled.value) {
+      return false;
+    }
+
+    const matchingModifier = this.findModifier(
+      m => m instanceof PokemonHeldItemModifier && m.matchType(mod) && m.pokemonId === target.id,
+      target.isPlayer(),
+    ) as PokemonHeldItemModifier;
+
+    if (matchingModifier) {
+      const maxStackCount = matchingModifier.getMaxStackCount();
+      if (matchingModifier.stackCount >= maxStackCount) {
+        return false;
+      }
+      const countTaken = Math.min(transferQuantity, mod.stackCount, maxStackCount - matchingModifier.stackCount);
+      mod.stackCount -= countTaken;
+    } else {
+      const countTaken = Math.min(transferQuantity, mod.stackCount);
+      mod.stackCount -= countTaken;
+    }
+
+    const removeOld = mod.stackCount === 0;
+
+    return !removeOld || !source || this.hasModifier(itemModifier, !source.isPlayer());
   }
 
   removePartyMemberModifiers(partyMemberIndex: number): Promise<void> {
     return new Promise(resolve => {
       const pokemonId = this.getPlayerParty()[partyMemberIndex].id;
-      const modifiersToRemove = this.modifiers.filter(m => m instanceof PokemonHeldItemModifier && (m as PokemonHeldItemModifier).pokemonId === pokemonId);
+      const modifiersToRemove = this.modifiers.filter(
+        m => m instanceof PokemonHeldItemModifier && (m as PokemonHeldItemModifier).pokemonId === pokemonId,
+      );
       for (const m of modifiersToRemove) {
         this.modifiers.splice(this.modifiers.indexOf(m), 1);
       }
-      this.updateModifiers().then(() => resolve());
+      this.updateModifiers();
+      resolve();
     });
   }
 
@@ -2796,7 +3190,7 @@ export default class BattleScene extends SceneBase {
 
       party.forEach((enemyPokemon: EnemyPokemon, i: number) => {
         if (heldModifiersConfigs && i < heldModifiersConfigs.length && heldModifiersConfigs[i]) {
-          heldModifiersConfigs[i].forEach(mt => {
+          for (const mt of heldModifiersConfigs[i]) {
             let modifier: PokemonHeldItemModifier;
             if (mt.modifier instanceof PokemonHeldItemModifierType) {
               modifier = mt.modifier.newModifier(enemyPokemon);
@@ -2807,9 +3201,11 @@ export default class BattleScene extends SceneBase {
             modifier.stackCount = mt.stackCount ?? 1;
             modifier.isTransferable = mt.isTransferable ?? modifier.isTransferable;
             this.addEnemyModifier(modifier, true);
-          });
+          }
         } else {
-          const isBoss = enemyPokemon.isBoss() || (this.currentBattle.battleType === BattleType.TRAINER && !!this.currentBattle.trainer?.config.isBoss);
+          const isBoss =
+            enemyPokemon.isBoss() ||
+            (this.currentBattle.battleType === BattleType.TRAINER && !!this.currentBattle.trainer?.config.isBoss);
           let upgradeChance = 32;
           if (isBoss) {
             upgradeChance /= 2;
@@ -2817,113 +3213,123 @@ export default class BattleScene extends SceneBase {
           if (isFinalBoss) {
             upgradeChance /= 8;
           }
-          const modifierChance = this.gameMode.getEnemyModifierChance(isBoss);
-          let pokemonModifierChance = modifierChance;
-          if (this.currentBattle.battleType === BattleType.TRAINER && this.currentBattle.trainer)
-            pokemonModifierChance = Math.ceil(pokemonModifierChance * this.currentBattle.trainer.getPartyMemberModifierChanceMultiplier(i)); // eslint-disable-line
           let count = 0;
           for (let c = 0; c < chances; c++) {
-            if (!Utils.randSeedInt(modifierChance)) {
+            if (!randSeedInt(this.gameMode.getEnemyModifierChance(isBoss))) {
               count++;
             }
           }
           if (isBoss) {
             count = Math.max(count, Math.floor(chances / 2));
           }
-          getEnemyModifierTypesForWave(difficultyWaveIndex, count, [ enemyPokemon ], this.currentBattle.battleType === BattleType.TRAINER ? ModifierPoolType.TRAINER : ModifierPoolType.WILD, upgradeChance)
-            .map(mt => mt.newModifier(enemyPokemon).add(this.enemyModifiers, false));
+          getEnemyModifierTypesForWave(
+            difficultyWaveIndex,
+            count,
+            [enemyPokemon],
+            this.currentBattle.battleType === BattleType.TRAINER ? ModifierPoolType.TRAINER : ModifierPoolType.WILD,
+            upgradeChance,
+          ).map(mt => mt.newModifier(enemyPokemon).add(this.enemyModifiers, false));
         }
         return true;
       });
-      this.updateModifiers(false).then(() => resolve());
+      this.updateModifiers(false);
+      resolve();
     });
   }
 
   /**
-    * Removes all modifiers from enemy pokemon of {@linkcode PersistentModifier} type
-    */
+   * Removes all modifiers from enemy pokemon of {@linkcode PersistentModifier} type
+   */
   clearEnemyModifiers(): void {
     const modifiersToRemove = this.enemyModifiers.filter(m => m instanceof PersistentModifier);
     for (const m of modifiersToRemove) {
       this.enemyModifiers.splice(this.enemyModifiers.indexOf(m), 1);
     }
-    this.updateModifiers(false).then(() => this.updateUIPositions());
+    this.updateModifiers(false);
+    this.updateUIPositions();
   }
 
   /**
-    * Removes all modifiers from enemy pokemon of {@linkcode PokemonHeldItemModifier} type
-    * @param pokemon - If specified, only removes held items from that {@linkcode Pokemon}
-    */
+   * Removes all modifiers from enemy pokemon of {@linkcode PokemonHeldItemModifier} type
+   * @param pokemon - If specified, only removes held items from that {@linkcode Pokemon}
+   */
   clearEnemyHeldItemModifiers(pokemon?: Pokemon): void {
-    const modifiersToRemove = this.enemyModifiers.filter(m => m instanceof PokemonHeldItemModifier && (!pokemon || m.getPokemon() === pokemon));
+    const modifiersToRemove = this.enemyModifiers.filter(
+      m => m instanceof PokemonHeldItemModifier && (!pokemon || m.getPokemon() === pokemon),
+    );
     for (const m of modifiersToRemove) {
       this.enemyModifiers.splice(this.enemyModifiers.indexOf(m), 1);
     }
-    this.updateModifiers(false).then(() => this.updateUIPositions());
+    this.updateModifiers(false);
+    this.updateUIPositions();
   }
 
   setModifiersVisible(visible: boolean) {
-    [ this.modifierBar, this.enemyModifierBar ].map(m => m.setVisible(visible));
+    [this.modifierBar, this.enemyModifierBar].map(m => m.setVisible(visible));
   }
 
-  updateModifiers(player?: boolean, instant?: boolean): Promise<void> {
-    if (player === undefined) {
-      player = true;
+  // TODO: Document this
+  updateModifiers(player = true, instant?: boolean): void {
+    const modifiers = player ? this.modifiers : (this.enemyModifiers as PersistentModifier[]);
+    for (let m = 0; m < modifiers.length; m++) {
+      const modifier = modifiers[m];
+      if (
+        modifier instanceof PokemonHeldItemModifier &&
+        !this.getPokemonById((modifier as PokemonHeldItemModifier).pokemonId)
+      ) {
+        modifiers.splice(m--, 1);
+      }
     }
-    return new Promise(resolve => {
-      const modifiers = player ? this.modifiers : this.enemyModifiers as PersistentModifier[];
-      for (let m = 0; m < modifiers.length; m++) {
-        const modifier = modifiers[m];
-        if (modifier instanceof PokemonHeldItemModifier && !this.getPokemonById((modifier as PokemonHeldItemModifier).pokemonId)) {
-          modifiers.splice(m--, 1);
-        }
-      }
-      for (const modifier of modifiers) {
-        if (modifier instanceof PersistentModifier) {
-          (modifier as PersistentModifier).virtualStackCount = 0;
-        }
+    for (const modifier of modifiers) {
+      if (modifier instanceof PersistentModifier) {
+        (modifier as PersistentModifier).virtualStackCount = 0;
       }
+    }
 
-      const modifiersClone = modifiers.slice(0);
-      for (const modifier of modifiersClone) {
-        if (!modifier.getStackCount()) {
-          modifiers.splice(modifiers.indexOf(modifier), 1);
-        }
+    const modifiersClone = modifiers.slice(0);
+    for (const modifier of modifiersClone) {
+      if (!modifier.getStackCount()) {
+        modifiers.splice(modifiers.indexOf(modifier), 1);
       }
+    }
 
-      this.updatePartyForModifiers(player ? this.getPlayerParty() : this.getEnemyParty(), instant).then(() => {
-        (player ? this.modifierBar : this.enemyModifierBar).updateModifiers(modifiers);
-        if (!player) {
-          this.updateUIPositions();
-        }
-        resolve();
-      });
-    });
+    this.updatePartyForModifiers(player ? this.getPlayerParty() : this.getEnemyParty(), instant);
+    (player ? this.modifierBar : this.enemyModifierBar).updateModifiers(modifiers);
+    if (!player) {
+      this.updateUIPositions();
+    }
   }
 
   updatePartyForModifiers(party: Pokemon[], instant?: boolean): Promise<void> {
     return new Promise(resolve => {
-      Promise.allSettled(party.map(p => {
-        p.calculateStats();
-        return p.updateInfo(instant);
-      })).then(() => resolve());
+      Promise.allSettled(
+        party.map(p => {
+          p.calculateStats();
+          return p.updateInfo(instant);
+        }),
+      ).then(() => resolve());
     });
   }
 
+  hasModifier(modifier: PersistentModifier, enemy = false): boolean {
+    const modifiers = !enemy ? this.modifiers : this.enemyModifiers;
+    return modifiers.indexOf(modifier) > -1;
+  }
+
   /**
    * Removes a currently owned item. If the item is stacked, the entire item stack
    * gets removed. This function does NOT apply in-battle effects, such as Unburden.
    * If in-battle effects are needed, use {@linkcode Pokemon.loseHeldItem} instead.
    * @param modifier The item to be removed.
-   * @param enemy If `true`, remove an item owned by the enemy. If `false`, remove an item owned by the player. Default is `false`.
-   * @returns `true` if the item exists and was successfully removed, `false` otherwise.
+   * @param enemy `true` to remove an item owned by the enemy rather than the player; default `false`.
+   * @returns `true` if the item exists and was successfully removed, `false` otherwise
    */
-  removeModifier(modifier: PersistentModifier, enemy: boolean = false): boolean {
+  removeModifier(modifier: PersistentModifier, enemy = false): boolean {
     const modifiers = !enemy ? this.modifiers : this.enemyModifiers;
     const modifierIndex = modifiers.indexOf(modifier);
     if (modifierIndex > -1) {
       modifiers.splice(modifierIndex, 1);
-      if (modifier instanceof PokemonFormChangeItemModifier || modifier instanceof TerastallizeModifier) {
+      if (modifier instanceof PokemonFormChangeItemModifier) {
         const pokemon = this.getPokemonById(modifier.pokemonId);
         if (pokemon) {
           modifier.apply(pokemon, false);
@@ -2941,7 +3347,7 @@ export default class BattleScene extends SceneBase {
    * @param player Whether to search the player (`true`) or the enemy (`false`); Defaults to `true`
    * @returns the list of all modifiers that matched `modifierType`.
    */
-  getModifiers<T extends PersistentModifier>(modifierType: Constructor<T>, player: boolean = true): T[] {
+  getModifiers<T extends PersistentModifier>(modifierType: Constructor<T>, player = true): T[] {
     return (player ? this.modifiers : this.enemyModifiers).filter((m): m is T => m instanceof modifierType);
   }
 
@@ -2951,7 +3357,7 @@ export default class BattleScene extends SceneBase {
    * @param isPlayer Whether to search the player (`true`) or the enemy (`false`); Defaults to `true`
    * @returns the list of all modifiers that passed the `modifierFilter` function
    */
-  findModifiers(modifierFilter: ModifierPredicate, isPlayer: boolean = true): PersistentModifier[] {
+  findModifiers(modifierFilter: ModifierPredicate, isPlayer = true): PersistentModifier[] {
     return (isPlayer ? this.modifiers : this.enemyModifiers).filter(modifierFilter);
   }
 
@@ -2961,7 +3367,7 @@ export default class BattleScene extends SceneBase {
    * @param player Whether to search the player (`true`) or the enemy (`false`); Defaults to `true`
    * @returns the first modifier that passed the `modifierFilter` function; `undefined` if none passed
    */
-  findModifier(modifierFilter: ModifierPredicate, player: boolean = true): PersistentModifier | undefined {
+  findModifier(modifierFilter: ModifierPredicate, player = true): PersistentModifier | undefined {
     return (player ? this.modifiers : this.enemyModifiers).find(modifierFilter);
   }
 
@@ -2972,18 +3378,28 @@ export default class BattleScene extends SceneBase {
    * @param ...args The list of arguments needed to invoke `modifierType.apply`
    * @returns the list of all modifiers that matched `modifierType` and were applied.
    */
-  applyShuffledModifiers<T extends PersistentModifier>(modifierType: Constructor<T>, player: boolean = true, ...args: Parameters<T["apply"]>): T[] {
-    let modifiers = (player ? this.modifiers : this.enemyModifiers).filter((m): m is T => m instanceof modifierType && m.shouldApply(...args));
-    this.executeWithSeedOffset(() => {
-      const shuffleModifiers = mods => {
-        if (mods.length < 1) {
-          return mods;
-        }
-        const rand = Utils.randSeedInt(mods.length);
-        return [ mods[rand], ...shuffleModifiers(mods.filter((_, i) => i !== rand)) ];
-      };
-      modifiers = shuffleModifiers(modifiers);
-    }, this.currentBattle.turn << 4, this.waveSeed);
+  applyShuffledModifiers<T extends PersistentModifier>(
+    modifierType: Constructor<T>,
+    player = true,
+    ...args: Parameters<T["apply"]>
+  ): T[] {
+    let modifiers = (player ? this.modifiers : this.enemyModifiers).filter(
+      (m): m is T => m instanceof modifierType && m.shouldApply(...args),
+    );
+    this.executeWithSeedOffset(
+      () => {
+        const shuffleModifiers = mods => {
+          if (mods.length < 1) {
+            return mods;
+          }
+          const rand = randSeedInt(mods.length);
+          return [mods[rand], ...shuffleModifiers(mods.filter((_, i) => i !== rand))];
+        };
+        modifiers = shuffleModifiers(modifiers);
+      },
+      this.currentBattle.turn << 4,
+      this.waveSeed,
+    );
     return this.applyModifiersInternal(modifiers, player, args);
   }
 
@@ -2994,13 +3410,23 @@ export default class BattleScene extends SceneBase {
    * @param ...args The list of arguments needed to invoke `modifierType.apply`
    * @returns the list of all modifiers that matched `modifierType` and were applied.
    */
-  applyModifiers<T extends PersistentModifier>(modifierType: Constructor<T>, player: boolean = true, ...args: Parameters<T["apply"]>): T[] {
-    const modifiers = (player ? this.modifiers : this.enemyModifiers).filter((m): m is T => m instanceof modifierType && m.shouldApply(...args));
+  applyModifiers<T extends PersistentModifier>(
+    modifierType: Constructor<T>,
+    player = true,
+    ...args: Parameters<T["apply"]>
+  ): T[] {
+    const modifiers = (player ? this.modifiers : this.enemyModifiers).filter(
+      (m): m is T => m instanceof modifierType && m.shouldApply(...args),
+    );
     return this.applyModifiersInternal(modifiers, player, args);
   }
 
   /** Helper function to apply all passed modifiers */
-  applyModifiersInternal<T extends PersistentModifier>(modifiers: T[], player: boolean, args: Parameters<T["apply"]>): T[] {
+  applyModifiersInternal<T extends PersistentModifier>(
+    modifiers: T[],
+    player: boolean,
+    args: Parameters<T["apply"]>,
+  ): T[] {
     const appliedModifiers: T[] = [];
     for (const modifier of modifiers) {
       if (modifier.apply(...args)) {
@@ -3019,8 +3445,14 @@ export default class BattleScene extends SceneBase {
    * @param ...args The list of arguments needed to invoke `modifierType.apply`
    * @returns the first modifier that matches `modifierType` and was applied; return `null` if none matched
    */
-  applyModifier<T extends PersistentModifier>(modifierType: Constructor<T>, player: boolean = true, ...args: Parameters<T["apply"]>): T | null {
-    const modifiers = (player ? this.modifiers : this.enemyModifiers).filter((m): m is T => m instanceof modifierType && m.shouldApply(...args));
+  applyModifier<T extends PersistentModifier>(
+    modifierType: Constructor<T>,
+    player = true,
+    ...args: Parameters<T["apply"]>
+  ): T | null {
+    const modifiers = (player ? this.modifiers : this.enemyModifiers).filter(
+      (m): m is T => m instanceof modifierType && m.shouldApply(...args),
+    );
     for (const modifier of modifiers) {
       if (modifier.apply(...args)) {
         console.log("Applied", modifier.type.name, !player ? "(enemy)" : "");
@@ -3031,22 +3463,33 @@ export default class BattleScene extends SceneBase {
     return null;
   }
 
-  triggerPokemonFormChange(pokemon: Pokemon, formChangeTriggerType: Constructor<SpeciesFormChangeTrigger>, delayed: boolean = false, modal: boolean = false): boolean {
+  triggerPokemonFormChange(
+    pokemon: Pokemon,
+    formChangeTriggerType: Constructor<SpeciesFormChangeTrigger>,
+    delayed = false,
+    modal = false,
+  ): boolean {
     if (pokemonFormChanges.hasOwnProperty(pokemon.species.speciesId)) {
-
       // in case this is NECROZMA, determine which forms this
-      const matchingFormChangeOpts = pokemonFormChanges[pokemon.species.speciesId].filter(fc => fc.findTrigger(formChangeTriggerType) && fc.canChange(pokemon));
+      const matchingFormChangeOpts = pokemonFormChanges[pokemon.species.speciesId].filter(
+        fc => fc.findTrigger(formChangeTriggerType) && fc.canChange(pokemon),
+      );
       let matchingFormChange: SpeciesFormChange | null;
       if (pokemon.species.speciesId === Species.NECROZMA && matchingFormChangeOpts.length > 1) {
         // Ultra Necrozma is changing its form back, so we need to figure out into which form it devolves.
-        const formChangeItemModifiers = (this.findModifiers(m => m instanceof PokemonFormChangeItemModifier && m.pokemonId === pokemon.id) as PokemonFormChangeItemModifier[]).filter(m => m.active).map(m => m.formChangeItem);
+        const formChangeItemModifiers = (
+          this.findModifiers(
+            m => m instanceof PokemonFormChangeItemModifier && m.pokemonId === pokemon.id,
+          ) as PokemonFormChangeItemModifier[]
+        )
+          .filter(m => m.active)
+          .map(m => m.formChangeItem);
 
-
-        matchingFormChange = formChangeItemModifiers.includes(FormChangeItem.N_LUNARIZER) ?
-          matchingFormChangeOpts[0] :
-          formChangeItemModifiers.includes(FormChangeItem.N_SOLARIZER) ?
-            matchingFormChangeOpts[1] :
-            null;
+        matchingFormChange = formChangeItemModifiers.includes(FormChangeItem.N_LUNARIZER)
+          ? matchingFormChangeOpts[0]
+          : formChangeItemModifiers.includes(FormChangeItem.N_SOLARIZER)
+            ? matchingFormChangeOpts[1]
+            : null;
       } else {
         matchingFormChange = matchingFormChangeOpts[0];
       }
@@ -3071,7 +3514,12 @@ export default class BattleScene extends SceneBase {
     return false;
   }
 
-  triggerPokemonBattleAnim(pokemon: Pokemon, battleAnimType: PokemonAnimType, fieldAssets?: Phaser.GameObjects.Sprite[], delayed: boolean = false): boolean {
+  triggerPokemonBattleAnim(
+    pokemon: Pokemon,
+    battleAnimType: PokemonAnimType,
+    fieldAssets?: Phaser.GameObjects.Sprite[],
+    delayed = false,
+  ): boolean {
     const phase: Phase = new PokemonAnimPhase(battleAnimType, pokemon, fieldAssets);
     if (delayed) {
       this.pushPhase(phase);
@@ -3089,8 +3537,10 @@ export default class BattleScene extends SceneBase {
   }
 
   validateAchv(achv: Achv, args?: unknown[]): boolean {
-    if ((!this.gameData.achvUnlocks.hasOwnProperty(achv.id) || Overrides.ACHIEVEMENTS_REUNLOCK_OVERRIDE)
-      && achv.validate(args)) {
+    if (
+      (!this.gameData.achvUnlocks.hasOwnProperty(achv.id) || Overrides.ACHIEVEMENTS_REUNLOCK_OVERRIDE) &&
+      achv.validate(args)
+    ) {
       this.gameData.achvUnlocks[achv.id] = new Date().getTime();
       this.ui.achvBar.showAchv(achv);
       if (vouchers.hasOwnProperty(achv.id)) {
@@ -3119,18 +3569,21 @@ export default class BattleScene extends SceneBase {
       gameMode: this.currentBattle ? this.gameMode.getName() : "Title",
       biome: this.currentBattle ? getBiomeName(this.arena.biomeType) : "",
       wave: this.currentBattle?.waveIndex ?? 0,
-      party: this.party ? this.party.map((p) => {
-        return {
-          name: p.name,
-          form: p.getFormKey(),
-          types: p.getTypes().map((type) => Type[type]),
-          teraType: p.getTeraType() !== Type.UNKNOWN ? Type[p.getTeraType()] : "",
-          level: p.level,
-          currentHP: p.hp,
-          maxHP: p.getMaxHp(),
-          status: p.status?.effect ? StatusEffect[p.status.effect] : ""
-        };
-      }) : [],
+      party: this.party
+        ? this.party.map(p => {
+            return {
+              name: p.name,
+              form: p.getFormKey(),
+              types: p.getTypes().map(type => PokemonType[type]),
+              teraType: PokemonType[p.getTeraType()],
+              isTerastallized: p.isTerastallized,
+              level: p.level,
+              currentHP: p.hp,
+              maxHP: p.getMaxHp(),
+              status: p.status?.effect ? StatusEffect[p.status.effect] : "",
+            };
+          })
+        : [],
       modeChain: this.ui?.getModeChain() ?? [],
     };
     (window as any).gameInfo = gameInfo;
@@ -3146,7 +3599,7 @@ export default class BattleScene extends SceneBase {
     const keys: string[] = [];
     let activePokemon: (PlayerPokemon | EnemyPokemon)[] = this.getPlayerParty();
     activePokemon = activePokemon.concat(this.getEnemyParty());
-    activePokemon.forEach((p) => {
+    for (const p of activePokemon) {
       keys.push(p.getSpriteKey(true));
       if (p instanceof PlayerPokemon) {
         keys.push(p.getBattleSpriteKey(true, true));
@@ -3155,7 +3608,7 @@ export default class BattleScene extends SceneBase {
       if (p.fusionSpecies) {
         keys.push(p.fusionSpecies.getCryKey(p.fusionFormIndex));
       }
-    });
+    }
     return keys;
   }
 
@@ -3165,25 +3618,32 @@ export default class BattleScene extends SceneBase {
    */
   initFinalBossPhaseTwo(pokemon: Pokemon): void {
     if (pokemon instanceof EnemyPokemon && pokemon.isBoss() && !pokemon.formIndex && pokemon.bossSegmentIndex < 1) {
-      this.fadeOutBgm(Utils.fixedInt(2000), false);
-      this.ui.showDialogue(battleSpecDialogue[BattleSpec.FINAL_BOSS].firstStageWin, pokemon.species.name, undefined, () => {
-        const finalBossMBH = getModifierType(modifierTypes.MINI_BLACK_HOLE).newModifier(pokemon) as TurnHeldItemTransferModifier;
-        finalBossMBH.setTransferrableFalse();
-        this.addEnemyModifier(finalBossMBH, false, true);
-        pokemon.generateAndPopulateMoveset(1);
-        this.setFieldScale(0.75);
-        this.triggerPokemonFormChange(pokemon, SpeciesFormChangeManualTrigger, false);
-        this.currentBattle.double = true;
-        const availablePartyMembers = this.getPlayerParty().filter((p) => p.isAllowedInBattle());
-        if (availablePartyMembers.length > 1) {
-          this.pushPhase(new ToggleDoublePositionPhase(true));
-          if (!availablePartyMembers[1].isOnField()) {
-            this.pushPhase(new SummonPhase(1));
+      this.fadeOutBgm(fixedInt(2000), false);
+      this.ui.showDialogue(
+        battleSpecDialogue[BattleSpec.FINAL_BOSS].firstStageWin,
+        pokemon.species.name,
+        undefined,
+        () => {
+          const finalBossMBH = getModifierType(modifierTypes.MINI_BLACK_HOLE).newModifier(
+            pokemon,
+          ) as TurnHeldItemTransferModifier;
+          finalBossMBH.setTransferrableFalse();
+          this.addEnemyModifier(finalBossMBH, false, true);
+          pokemon.generateAndPopulateMoveset(1);
+          this.setFieldScale(0.75);
+          this.triggerPokemonFormChange(pokemon, SpeciesFormChangeManualTrigger, false);
+          this.currentBattle.double = true;
+          const availablePartyMembers = this.getPlayerParty().filter(p => p.isAllowedInBattle());
+          if (availablePartyMembers.length > 1) {
+            this.pushPhase(new ToggleDoublePositionPhase(true));
+            if (!availablePartyMembers[1].isOnField()) {
+              this.pushPhase(new SummonPhase(1));
+            }
           }
-        }
 
-        this.shiftPhase();
-      });
+          this.shiftPhase();
+        },
+      );
       return;
     }
 
@@ -3197,22 +3657,32 @@ export default class BattleScene extends SceneBase {
    * @param useWaveIndexMultiplier Default false. If true, will multiply expValue by a scaling waveIndex multiplier. Not needed if expValue is already scaled by level/wave
    * @param pokemonParticipantIds Participants. If none are defined, no exp will be given. To spread evenly among the party, should pass all ids of party members.
    */
-  applyPartyExp(expValue: number, pokemonDefeated: boolean, useWaveIndexMultiplier?: boolean, pokemonParticipantIds?: Set<number>): void {
+  applyPartyExp(
+    expValue: number,
+    pokemonDefeated: boolean,
+    useWaveIndexMultiplier?: boolean,
+    pokemonParticipantIds?: Set<number>,
+  ): void {
     const participantIds = pokemonParticipantIds ?? this.currentBattle.playerParticipantIds;
     const party = this.getPlayerParty();
     const expShareModifier = this.findModifier(m => m instanceof ExpShareModifier) as ExpShareModifier;
     const expBalanceModifier = this.findModifier(m => m instanceof ExpBalanceModifier) as ExpBalanceModifier;
-    const multipleParticipantExpBonusModifier = this.findModifier(m => m instanceof MultipleParticipantExpBonusModifier) as MultipleParticipantExpBonusModifier;
+    const multipleParticipantExpBonusModifier = this.findModifier(
+      m => m instanceof MultipleParticipantExpBonusModifier,
+    ) as MultipleParticipantExpBonusModifier;
     const nonFaintedPartyMembers = party.filter(p => p.hp);
     const expPartyMembers = nonFaintedPartyMembers.filter(p => p.level < this.getMaxExpLevel());
     const partyMemberExp: number[] = [];
     // EXP value calculation is based off Pokemon.getExpValue
     if (useWaveIndexMultiplier) {
-      expValue = Math.floor(expValue * this.currentBattle.waveIndex / 5 + 1);
+      expValue = Math.floor((expValue * this.currentBattle.waveIndex) / 5 + 1);
     }
 
     if (participantIds.size > 0) {
-      if (this.currentBattle.battleType === BattleType.TRAINER || this.currentBattle.mysteryEncounter?.encounterMode === MysteryEncounterMode.TRAINER_BATTLE) {
+      if (
+        this.currentBattle.battleType === BattleType.TRAINER ||
+        this.currentBattle.mysteryEncounter?.encounterMode === MysteryEncounterMode.TRAINER_BATTLE
+      ) {
         expValue = Math.floor(expValue * 1.5);
       } else if (this.currentBattle.isBattleMysteryEncounter() && this.currentBattle.mysteryEncounter) {
         expValue = Math.floor(expValue * this.currentBattle.mysteryEncounter.expMultiplier);
@@ -3238,7 +3708,7 @@ export default class BattleScene extends SceneBase {
         }
         let expMultiplier = 0;
         if (participated) {
-          expMultiplier += (1 / participantIds.size);
+          expMultiplier += 1 / participantIds.size;
           if (participantIds.size > 1 && multipleParticipantExpBonusModifier) {
             expMultiplier += multipleParticipantExpBonusModifier.getStackCount() * 0.2;
           }
@@ -3251,7 +3721,7 @@ export default class BattleScene extends SceneBase {
         if (Overrides.XP_MULTIPLIER_OVERRIDE !== null) {
           expMultiplier = Overrides.XP_MULTIPLIER_OVERRIDE;
         }
-        const pokemonExp = new Utils.NumberHolder(expValue * expMultiplier);
+        const pokemonExp = new NumberHolder(expValue * expMultiplier);
         this.applyModifiers(PokemonExpBoosterModifier, true, partyMember, pokemonExp);
         partyMemberExp.push(Math.floor(pokemonExp.value));
       }
@@ -3276,7 +3746,11 @@ export default class BattleScene extends SceneBase {
         const splitExp = Math.floor(totalExp / recipientExpPartyMemberIndexes.length);
 
         expPartyMembers.forEach((_partyMember, pm) => {
-          partyMemberExp[pm] = Phaser.Math.Linear(partyMemberExp[pm], recipientExpPartyMemberIndexes.indexOf(pm) > -1 ? splitExp : 0, 0.2 * expBalanceModifier.getStackCount());
+          partyMemberExp[pm] = Phaser.Math.Linear(
+            partyMemberExp[pm],
+            recipientExpPartyMemberIndexes.indexOf(pm) > -1 ? splitExp : 0,
+            0.2 * expBalanceModifier.getStackCount(),
+          );
         });
       }
 
@@ -3285,7 +3759,11 @@ export default class BattleScene extends SceneBase {
 
         if (exp) {
           const partyMemberIndex = party.indexOf(expPartyMembers[pm]);
-          this.unshiftPhase(expPartyMembers[pm].isOnField() ? new ExpPhase(partyMemberIndex, exp) : new ShowPartyExpBarPhase(partyMemberIndex, exp));
+          this.unshiftPhase(
+            expPartyMembers[pm].isOnField()
+              ? new ExpPhase(partyMemberIndex, exp)
+              : new ShowPartyExpBarPhase(partyMemberIndex, exp),
+          );
         }
       }
     }
@@ -3297,8 +3775,14 @@ export default class BattleScene extends SceneBase {
    * That check is made in {@linkcode BattleScene.isWaveMysteryEncounter} instead.
    */
   isMysteryEncounterValidForWave(battleType: BattleType, waveIndex: number): boolean {
-    const [ lowestMysteryEncounterWave, highestMysteryEncounterWave ] = this.gameMode.getMysteryEncounterLegalWaves();
-    return this.gameMode.hasMysteryEncounters && battleType === BattleType.WILD && !this.gameMode.isBoss(waveIndex) && waveIndex < highestMysteryEncounterWave && waveIndex > lowestMysteryEncounterWave;
+    const [lowestMysteryEncounterWave, highestMysteryEncounterWave] = this.gameMode.getMysteryEncounterLegalWaves();
+    return (
+      this.gameMode.hasMysteryEncounters &&
+      battleType === BattleType.WILD &&
+      !this.gameMode.isBoss(waveIndex) &&
+      waveIndex < highestMysteryEncounterWave &&
+      waveIndex > lowestMysteryEncounterWave
+    );
   }
 
   /**
@@ -3309,7 +3793,7 @@ export default class BattleScene extends SceneBase {
    * @param waveIndex
    */
   private isWaveMysteryEncounter(newBattleType: BattleType, waveIndex: number): boolean {
-    const [ lowestMysteryEncounterWave, highestMysteryEncounterWave ] = this.gameMode.getMysteryEncounterLegalWaves();
+    const [lowestMysteryEncounterWave, highestMysteryEncounterWave] = this.gameMode.getMysteryEncounterLegalWaves();
     if (this.isMysteryEncounterValidForWave(newBattleType, waveIndex)) {
       // Base spawn weight is BASE_MYSTERY_ENCOUNTER_SPAWN_WEIGHT/256, and increases by WEIGHT_INCREMENT_ON_SPAWN_MISS/256 for each missed attempt at spawning an encounter on a valid floor
       const sessionEncounterRate = this.mysteryEncounterSaveData.encounterSpawnChance;
@@ -3318,21 +3802,33 @@ export default class BattleScene extends SceneBase {
       // If total number of encounters is lower than expected for the run, slightly favor a new encounter spawn (reverse as well)
       // Reduces occurrence of runs with total encounters significantly different from AVERAGE_ENCOUNTERS_PER_RUN_TARGET
       // Favored rate changes can never exceed 50%. So if base rate is 15/256 and favored rate would add 200/256, result will be (15 + 128)/256
-      const expectedEncountersByFloor = AVERAGE_ENCOUNTERS_PER_RUN_TARGET / (highestMysteryEncounterWave - lowestMysteryEncounterWave) * (waveIndex - lowestMysteryEncounterWave);
+      const expectedEncountersByFloor =
+        (AVERAGE_ENCOUNTERS_PER_RUN_TARGET / (highestMysteryEncounterWave - lowestMysteryEncounterWave)) *
+        (waveIndex - lowestMysteryEncounterWave);
       const currentRunDiffFromAvg = expectedEncountersByFloor - encounteredEvents.length;
-      const favoredEncounterRate = sessionEncounterRate + Math.min(currentRunDiffFromAvg * ANTI_VARIANCE_WEIGHT_MODIFIER, MYSTERY_ENCOUNTER_SPAWN_MAX_WEIGHT / 2);
+      const favoredEncounterRate =
+        sessionEncounterRate +
+        Math.min(currentRunDiffFromAvg * ANTI_VARIANCE_WEIGHT_MODIFIER, MYSTERY_ENCOUNTER_SPAWN_MAX_WEIGHT / 2);
 
-      const successRate = isNullOrUndefined(Overrides.MYSTERY_ENCOUNTER_RATE_OVERRIDE) ? favoredEncounterRate : Overrides.MYSTERY_ENCOUNTER_RATE_OVERRIDE!;
+      const successRate = isNullOrUndefined(Overrides.MYSTERY_ENCOUNTER_RATE_OVERRIDE)
+        ? favoredEncounterRate
+        : Overrides.MYSTERY_ENCOUNTER_RATE_OVERRIDE!;
 
       // If the most recent ME was 3 or fewer waves ago, can never spawn a ME
-      const canSpawn = encounteredEvents.length === 0 || (waveIndex - encounteredEvents[encounteredEvents.length - 1].waveIndex) > 3 || !isNullOrUndefined(Overrides.MYSTERY_ENCOUNTER_RATE_OVERRIDE);
+      const canSpawn =
+        encounteredEvents.length === 0 ||
+        waveIndex - encounteredEvents[encounteredEvents.length - 1].waveIndex > 3 ||
+        !isNullOrUndefined(Overrides.MYSTERY_ENCOUNTER_RATE_OVERRIDE);
 
       if (canSpawn) {
         let roll = MYSTERY_ENCOUNTER_SPAWN_MAX_WEIGHT;
         // Always rolls the check on the same offset to ensure no RNG changes from reloading session
-        this.executeWithSeedOffset(() => {
-          roll = randSeedInt(MYSTERY_ENCOUNTER_SPAWN_MAX_WEIGHT);
-        }, waveIndex * 3 * 1000);
+        this.executeWithSeedOffset(
+          () => {
+            roll = randSeedInt(MYSTERY_ENCOUNTER_SPAWN_MAX_WEIGHT);
+          },
+          waveIndex * 3 * 1000,
+        );
         return roll < successRate;
       }
     }
@@ -3349,7 +3845,10 @@ export default class BattleScene extends SceneBase {
   getMysteryEncounter(encounterType?: MysteryEncounterType, canBypass?: boolean): MysteryEncounter {
     // Loading override or session encounter
     let encounter: MysteryEncounter | null;
-    if (!isNullOrUndefined(Overrides.MYSTERY_ENCOUNTER_OVERRIDE) && allMysteryEncounters.hasOwnProperty(Overrides.MYSTERY_ENCOUNTER_OVERRIDE)) {
+    if (
+      !isNullOrUndefined(Overrides.MYSTERY_ENCOUNTER_OVERRIDE) &&
+      allMysteryEncounters.hasOwnProperty(Overrides.MYSTERY_ENCOUNTER_OVERRIDE)
+    ) {
       encounter = allMysteryEncounters[Overrides.MYSTERY_ENCOUNTER_OVERRIDE];
       if (canBypass) {
         return encounter;
@@ -3362,12 +3861,16 @@ export default class BattleScene extends SceneBase {
     }
 
     // Check for queued encounters first
-    if (!encounter && this.mysteryEncounterSaveData?.queuedEncounters && this.mysteryEncounterSaveData.queuedEncounters.length > 0) {
+    if (
+      !encounter &&
+      this.mysteryEncounterSaveData?.queuedEncounters &&
+      this.mysteryEncounterSaveData.queuedEncounters.length > 0
+    ) {
       let i = 0;
       while (i < this.mysteryEncounterSaveData.queuedEncounters.length && !!encounter) {
         const candidate = this.mysteryEncounterSaveData.queuedEncounters[i];
         const forcedChance = candidate.spawnPercent;
-        if (Utils.randSeedInt(100) < forcedChance) {
+        if (randSeedInt(100) < forcedChance) {
           encounter = allMysteryEncounters[candidate.type];
         }
 
@@ -3382,53 +3885,78 @@ export default class BattleScene extends SceneBase {
     }
 
     // See Enum values for base tier weights
-    const tierWeights = [ MysteryEncounterTier.COMMON, MysteryEncounterTier.GREAT, MysteryEncounterTier.ULTRA, MysteryEncounterTier.ROGUE ];
+    const tierWeights = [
+      MysteryEncounterTier.COMMON,
+      MysteryEncounterTier.GREAT,
+      MysteryEncounterTier.ULTRA,
+      MysteryEncounterTier.ROGUE,
+    ];
 
     // Adjust tier weights by previously encountered events to lower odds of only Common/Great in run
-    this.mysteryEncounterSaveData.encounteredEvents.forEach(seenEncounterData => {
+    // biome-ignore format: biome sucks at formatting this line
+    for (const seenEncounterData of this.mysteryEncounterSaveData.encounteredEvents) {
       if (seenEncounterData.tier === MysteryEncounterTier.COMMON) {
         tierWeights[0] = tierWeights[0] - 6;
       } else if (seenEncounterData.tier === MysteryEncounterTier.GREAT) {
         tierWeights[1] = tierWeights[1] - 4;
       }
-    });
+    }
 
     const totalWeight = tierWeights.reduce((a, b) => a + b);
-    const tierValue = Utils.randSeedInt(totalWeight);
+    const tierValue = randSeedInt(totalWeight);
     const commonThreshold = totalWeight - tierWeights[0];
     const greatThreshold = totalWeight - tierWeights[0] - tierWeights[1];
     const ultraThreshold = totalWeight - tierWeights[0] - tierWeights[1] - tierWeights[2];
-    let tier: MysteryEncounterTier | null = tierValue > commonThreshold ? MysteryEncounterTier.COMMON : tierValue > greatThreshold ? MysteryEncounterTier.GREAT : tierValue > ultraThreshold ? MysteryEncounterTier.ULTRA : MysteryEncounterTier.ROGUE;
+    let tier: MysteryEncounterTier | null =
+      tierValue > commonThreshold
+        ? MysteryEncounterTier.COMMON
+        : tierValue > greatThreshold
+          ? MysteryEncounterTier.GREAT
+          : tierValue > ultraThreshold
+            ? MysteryEncounterTier.ULTRA
+            : MysteryEncounterTier.ROGUE;
 
     if (!isNullOrUndefined(Overrides.MYSTERY_ENCOUNTER_TIER_OVERRIDE)) {
       tier = Overrides.MYSTERY_ENCOUNTER_TIER_OVERRIDE;
     }
 
     let availableEncounters: MysteryEncounter[] = [];
-    const previousEncounter = this.mysteryEncounterSaveData.encounteredEvents.length > 0 ?
-      this.mysteryEncounterSaveData.encounteredEvents[this.mysteryEncounterSaveData.encounteredEvents.length - 1].type
-      : null;
+    const previousEncounter =
+      this.mysteryEncounterSaveData.encounteredEvents.length > 0
+        ? this.mysteryEncounterSaveData.encounteredEvents[this.mysteryEncounterSaveData.encounteredEvents.length - 1]
+            .type
+        : null;
     const disabledEncounters = this.eventManager.getEventMysteryEncountersDisabled();
-    const biomeMysteryEncounters = mysteryEncountersByBiome.get(this.arena.biomeType)?.filter(enc => !disabledEncounters.includes(enc)) ?? [];
+    const biomeMysteryEncounters =
+      mysteryEncountersByBiome.get(this.arena.biomeType)?.filter(enc => !disabledEncounters.includes(enc)) ?? [];
     // If no valid encounters exist at tier, checks next tier down, continuing until there are some encounters available
     while (availableEncounters.length === 0 && tier !== null) {
       availableEncounters = biomeMysteryEncounters
-        .filter((encounterType) => {
+        .filter(encounterType => {
           const encounterCandidate = allMysteryEncounters[encounterType];
           if (!encounterCandidate) {
             return false;
           }
-          if (this.eventManager.getMysteryEncounterTierForEvent(encounterType, encounterCandidate.encounterTier) !== tier) {
+          if (
+            this.eventManager.getMysteryEncounterTierForEvent(encounterType, encounterCandidate.encounterTier) !== tier
+          ) {
             return false;
           }
           const disallowedGameModes = encounterCandidate.disallowedGameModes;
-          if (disallowedGameModes && disallowedGameModes.length > 0
-            && disallowedGameModes.includes(this.gameMode.modeId)) {
+          if (
+            disallowedGameModes &&
+            disallowedGameModes.length > 0 &&
+            disallowedGameModes.includes(this.gameMode.modeId)
+          ) {
             return false;
           }
           if (this.gameMode.modeId === GameModes.CHALLENGE) {
             const disallowedChallenges = encounterCandidate.disallowedChallenges;
-            if (disallowedChallenges && disallowedChallenges.length > 0 && this.gameMode.challenges.some(challenge => disallowedChallenges.includes(challenge.id))) {
+            if (
+              disallowedChallenges &&
+              disallowedChallenges.length > 0 &&
+              this.gameMode.challenges.some(challenge => disallowedChallenges.includes(challenge.id))
+            ) {
               return false;
             }
           }
@@ -3438,14 +3966,18 @@ export default class BattleScene extends SceneBase {
           if (previousEncounter !== null && encounterType === previousEncounter) {
             return false;
           }
-          if (this.mysteryEncounterSaveData.encounteredEvents.length > 0 &&
-            (encounterCandidate.maxAllowedEncounters && encounterCandidate.maxAllowedEncounters > 0)
-            && this.mysteryEncounterSaveData.encounteredEvents.filter(e => e.type === encounterType).length >= encounterCandidate.maxAllowedEncounters) {
+          if (
+            this.mysteryEncounterSaveData.encounteredEvents.length > 0 &&
+            encounterCandidate.maxAllowedEncounters &&
+            encounterCandidate.maxAllowedEncounters > 0 &&
+            this.mysteryEncounterSaveData.encounteredEvents.filter(e => e.type === encounterType).length >=
+              encounterCandidate.maxAllowedEncounters
+          ) {
             return false;
           }
           return true;
         })
-        .map((m) => (allMysteryEncounters[m]));
+        .map(m => allMysteryEncounters[m]);
       // Decrement tier
       if (tier === MysteryEncounterTier.ROGUE) {
         tier = MysteryEncounterTier.ULTRA;
@@ -3463,7 +3995,7 @@ export default class BattleScene extends SceneBase {
       console.log("No Mystery Encounters found, falling back to Mysterious Challengers.");
       return allMysteryEncounters[MysteryEncounterType.MYSTERIOUS_CHALLENGERS];
     }
-    encounter = availableEncounters[Utils.randSeedInt(availableEncounters.length)];
+    encounter = availableEncounters[randSeedInt(availableEncounters.length)];
     // New encounter object to not dirty flags
     encounter = new MysteryEncounter(encounter);
     encounter.populateDialogueTokensFromRequirements();
diff --git a/src/battle.ts b/src/battle.ts
index fa333040c22..07e520d6bc0 100644
--- a/src/battle.ts
+++ b/src/battle.ts
@@ -1,11 +1,19 @@
 import { globalScene } from "#app/global-scene";
 import type { Command } from "./ui/command-ui-handler";
-import * as Utils from "./utils";
+import {
+  randomString,
+  getEnumValues,
+  NumberHolder,
+  randSeedInt,
+  shiftCharCodes,
+  randSeedItem,
+  randInt,
+} from "#app/utils/common";
 import Trainer, { TrainerVariant } from "./field/trainer";
 import type { GameMode } from "./game-mode";
 import { MoneyMultiplierModifier, PokemonHeldItemModifier } from "./modifier/modifier";
 import type { PokeballType } from "#enums/pokeball";
-import { trainerConfigs } from "#app/data/trainer-config";
+import { trainerConfigs } from "#app/data/trainers/trainer-config";
 import { SpeciesFormKey } from "#enums/species-form-key";
 import type { EnemyPokemon, PlayerPokemon, TurnMove } from "#app/field/pokemon";
 import type Pokemon from "#app/field/pokemon";
@@ -22,61 +30,33 @@ import { MysteryEncounterMode } from "#enums/mystery-encounter-mode";
 import type { CustomModifierSettings } from "#app/modifier/modifier-type";
 import { ModifierTier } from "#app/modifier/modifier-tier";
 import type { MysteryEncounterType } from "#enums/mystery-encounter-type";
-
-export enum ClassicFixedBossWaves {
-  TOWN_YOUNGSTER = 5,
-  RIVAL_1 = 8,
-  RIVAL_2 = 25,
-  EVIL_GRUNT_1 = 35,
-  RIVAL_3 = 55,
-  EVIL_GRUNT_2 = 62,
-  EVIL_GRUNT_3 = 64,
-  EVIL_ADMIN_1 = 66,
-  RIVAL_4 = 95,
-  EVIL_GRUNT_4 = 112,
-  EVIL_ADMIN_2 = 114,
-  EVIL_BOSS_1 = 115,
-  RIVAL_5 = 145,
-  EVIL_BOSS_2 = 165,
-  ELITE_FOUR_1 = 182,
-  ELITE_FOUR_2 = 184,
-  ELITE_FOUR_3 = 186,
-  ELITE_FOUR_4 = 188,
-  CHAMPION = 190,
-  RIVAL_6 = 195,
-}
-
-export enum BattleType {
-  WILD,
-  TRAINER,
-  CLEAR,
-  MYSTERY_ENCOUNTER
-}
+import { BattleType } from "#enums/battle-type";
+import { ClassicFixedBossWaves } from "#enums/fixed-boss-waves";
 
 export enum BattlerIndex {
   ATTACKER = -1,
   PLAYER,
   PLAYER_2,
   ENEMY,
-  ENEMY_2
+  ENEMY_2,
 }
 
 export interface TurnCommand {
-    command: Command;
-    cursor?: number;
-    move?: TurnMove;
-    targets?: BattlerIndex[];
-    skip?: boolean;
-    args?: any[];
+  command: Command;
+  cursor?: number;
+  move?: TurnMove;
+  targets?: BattlerIndex[];
+  skip?: boolean;
+  args?: any[];
 }
 
 export interface FaintLogEntry {
-  pokemon: Pokemon,
-  turn: number
+  pokemon: Pokemon;
+  turn: number;
 }
 
 interface TurnCommands {
-  [key: number]: TurnCommand | null
+  [key: number]: TurnCommand | null;
 }
 
 export default class Battle {
@@ -89,23 +69,29 @@ export default class Battle {
   public enemyParty: EnemyPokemon[] = [];
   public seenEnemyPartyMemberIds: Set<number> = new Set<number>();
   public double: boolean;
-  public started: boolean = false;
-  public enemySwitchCounter: number = 0;
-  public turn: number = 0;
+  public started = false;
+  public enemySwitchCounter = 0;
+  public turn = 0;
+  public preTurnCommands: TurnCommands;
   public turnCommands: TurnCommands;
   public playerParticipantIds: Set<number> = new Set<number>();
-  public battleScore: number = 0;
+  public battleScore = 0;
   public postBattleLoot: PokemonHeldItemModifier[] = [];
-  public escapeAttempts: number = 0;
+  public escapeAttempts = 0;
   public lastMove: Moves;
-  public battleSeed: string = Utils.randomString(16, true);
+  public battleSeed: string = randomString(16, true);
   private battleSeedState: string | null = null;
-  public moneyScattered: number = 0;
+  public moneyScattered = 0;
+  /** Primarily for double battles, keeps track of last enemy and player pokemon that triggered its ability or used a move */
+  public lastEnemyInvolved: number;
+  public lastPlayerInvolved: number;
   public lastUsedPokeball: PokeballType | null = null;
-  /** The number of times a Pokemon on the player's side has fainted this battle */
-  public playerFaints: number = 0;
-  /** The number of times a Pokemon on the enemy's side has fainted this battle */
-  public enemyFaints: number = 0;
+  /**
+   * Saves the number of times a Pokemon on the enemy's side has fainted during this battle.
+   * This is saved here since we encounter a new enemy every wave.
+   * {@linkcode globalScene.arena.playerFaints} is the corresponding faint counter for the player and needs to be save across waves (reset every arena encounter).
+   */
+  public enemyFaints = 0;
   public playerFaintsHistory: FaintLogEntry[] = [];
   public enemyFaintsHistory: FaintLogEntry[] = [];
 
@@ -113,18 +99,19 @@ export default class Battle {
   /** If the current battle is a Mystery Encounter, this will always be defined */
   public mysteryEncounter?: MysteryEncounter;
 
-  private rngCounter: number = 0;
+  private rngCounter = 0;
 
-  constructor(gameMode: GameMode, waveIndex: number, battleType: BattleType, trainer?: Trainer, double?: boolean) {
+  constructor(gameMode: GameMode, waveIndex: number, battleType: BattleType, trainer?: Trainer, double = false) {
     this.gameMode = gameMode;
     this.waveIndex = waveIndex;
     this.battleType = battleType;
     this.trainer = trainer ?? null;
     this.initBattleSpec();
-    this.enemyLevels = battleType !== BattleType.TRAINER
-      ? new Array(double ? 2 : 1).fill(null).map(() => this.getLevelForWave())
-      : trainer?.getPartyLevels(this.waveIndex);
-    this.double = double ?? false;
+    this.enemyLevels =
+      battleType !== BattleType.TRAINER
+        ? new Array(double ? 2 : 1).fill(null).map(() => this.getLevelForWave())
+        : trainer?.getPartyLevels(this.waveIndex);
+    this.double = double;
   }
 
   private initBattleSpec(): void {
@@ -174,7 +161,8 @@ export default class Battle {
 
   incrementTurn(): void {
     this.turn++;
-    this.turnCommands = Object.fromEntries(Utils.getEnumValues(BattlerIndex).map(bt => [ bt, null ]));
+    this.turnCommands = Object.fromEntries(getEnumValues(BattlerIndex).map(bt => [bt, null]));
+    this.preTurnCommands = Object.fromEntries(getEnumValues(BattlerIndex).map(bt => [bt, null]));
     this.battleSeedState = null;
   }
 
@@ -187,16 +175,23 @@ export default class Battle {
   }
 
   addPostBattleLoot(enemyPokemon: EnemyPokemon): void {
-    this.postBattleLoot.push(...globalScene.findModifiers(m => m instanceof PokemonHeldItemModifier && m.pokemonId === enemyPokemon.id && m.isTransferable, false).map(i => {
-      const ret = i as PokemonHeldItemModifier;
-      //@ts-ignore - this is awful to fix/change
-      ret.pokemonId = null;
-      return ret;
-    }));
+    this.postBattleLoot.push(
+      ...globalScene
+        .findModifiers(
+          m => m instanceof PokemonHeldItemModifier && m.pokemonId === enemyPokemon.id && m.isTransferable,
+          false,
+        )
+        .map(i => {
+          const ret = i as PokemonHeldItemModifier;
+          //@ts-ignore - this is awful to fix/change
+          ret.pokemonId = null;
+          return ret;
+        }),
+    );
   }
 
   pickUpScatteredMoney(): void {
-    const moneyAmount = new Utils.IntegerHolder(globalScene.currentBattle.moneyScattered);
+    const moneyAmount = new NumberHolder(globalScene.currentBattle.moneyScattered);
     globalScene.applyModifiers(MoneyMultiplierModifier, true, moneyAmount);
 
     if (globalScene.arena.getTag(ArenaTagType.HAPPY_HOUR)) {
@@ -207,7 +202,9 @@ export default class Battle {
 
     const userLocale = navigator.language || "en-US";
     const formattedMoneyAmount = moneyAmount.value.toLocaleString(userLocale);
-    const message = i18next.t("battle:moneyPickedUp", { moneyAmount: formattedMoneyAmount });
+    const message = i18next.t("battle:moneyPickedUp", {
+      moneyAmount: formattedMoneyAmount,
+    });
     globalScene.queueMessage(message, undefined, true);
 
     globalScene.currentBattle.moneyScattered = 0;
@@ -220,13 +217,17 @@ export default class Battle {
     }
     for (const p of globalScene.getEnemyParty()) {
       if (p.isBoss()) {
-        partyMemberTurnMultiplier *= (p.bossSegments / 1.5) / globalScene.getEnemyParty().length;
+        partyMemberTurnMultiplier *= p.bossSegments / 1.5 / globalScene.getEnemyParty().length;
       }
     }
-    const turnMultiplier = Phaser.Tweens.Builders.GetEaseFunction("Sine.easeIn")(1 - Math.min(this.turn - 2, 10 * partyMemberTurnMultiplier) / (10 * partyMemberTurnMultiplier));
+    const turnMultiplier = Phaser.Tweens.Builders.GetEaseFunction("Sine.easeIn")(
+      1 - Math.min(this.turn - 2, 10 * partyMemberTurnMultiplier) / (10 * partyMemberTurnMultiplier),
+    );
     const finalBattleScore = Math.ceil(this.battleScore * turnMultiplier);
     globalScene.score += finalBattleScore;
-    console.log(`Battle Score: ${finalBattleScore} (${this.turn - 1} Turns x${Math.floor(turnMultiplier * 100) / 100})`);
+    console.log(
+      `Battle Score: ${finalBattleScore} (${this.turn - 1} Turns x${Math.floor(turnMultiplier * 100) / 100})`,
+    );
     console.log(`Total Score: ${globalScene.score}`);
     globalScene.updateScoreText();
   }
@@ -236,16 +237,20 @@ export default class Battle {
       // Music is overridden for MEs during ME onInit()
       // Should not use any BGM overrides before swapping from DEFAULT mode
       return null;
-    } else if (this.battleType === BattleType.TRAINER || this.mysteryEncounter?.encounterMode === MysteryEncounterMode.TRAINER_BATTLE) {
+    }
+    if (
+      this.battleType === BattleType.TRAINER ||
+      this.mysteryEncounter?.encounterMode === MysteryEncounterMode.TRAINER_BATTLE
+    ) {
       if (!this.started && this.trainer?.config.encounterBgm && this.trainer?.getEncounterMessages()?.length) {
         return `encounter_${this.trainer?.getEncounterBgm()}`;
       }
       if (globalScene.musicPreference === MusicPreference.GENFIVE) {
         return this.trainer?.getBattleBgm() ?? null;
-      } else {
-        return this.trainer?.getMixedBattleBgm() ?? null;
       }
-    } else if (this.gameMode.isClassic && this.waveIndex > 195 && this.battleSpec !== BattleSpec.FINAL_BOSS) {
+      return this.trainer?.getMixedBattleBgm() ?? null;
+    }
+    if (this.gameMode.isClassic && this.waveIndex > 195 && this.battleSpec !== BattleSpec.FINAL_BOSS) {
       return "end_summit";
     }
     const wildOpponents = globalScene.getEnemyParty();
@@ -274,7 +279,8 @@ export default class Battle {
               }
               return "battle_legendary_unova";
           }
-        } else if (globalScene.musicPreference === MusicPreference.ALLGENS) {
+        }
+        if (globalScene.musicPreference === MusicPreference.ALLGENS) {
           switch (pokemon.species.speciesId) {
             case Species.ARTICUNO:
             case Species.ZAPDOS:
@@ -422,12 +428,12 @@ export default class Battle {
   }
 
   /**
-   * Generates a random number using the current battle's seed. Calls {@linkcode Utils.randSeedInt}
+   * Generates a random number using the current battle's seed. Calls {@linkcode randSeedInt}
    * @param range How large of a range of random numbers to choose from. If {@linkcode range} <= 1, returns {@linkcode min}
    * @param min The minimum integer to pick, default `0`
    * @returns A random integer between {@linkcode min} and ({@linkcode min} + {@linkcode range} - 1)
    */
-  randSeedInt(range: number, min: number = 0): number {
+  randSeedInt(range: number, min = 0): number {
     if (range <= 1) {
       return min;
     }
@@ -437,12 +443,12 @@ export default class Battle {
     if (this.battleSeedState) {
       Phaser.Math.RND.state(this.battleSeedState);
     } else {
-      Phaser.Math.RND.sow([ Utils.shiftCharCodes(this.battleSeed, this.turn << 6) ]);
+      Phaser.Math.RND.sow([shiftCharCodes(this.battleSeed, this.turn << 6)]);
       console.log("Battle Seed:", this.battleSeed);
     }
     globalScene.rngCounter = this.rngCounter++;
     globalScene.rngSeedOverride = this.battleSeed;
-    const ret = Utils.randSeedInt(range, min);
+    const ret = randSeedInt(range, min);
     this.battleSeedState = Phaser.Math.RND.state();
     Phaser.Math.RND.state(state);
     globalScene.rngCounter = tempRngCounter;
@@ -460,7 +466,13 @@ export default class Battle {
 
 export class FixedBattle extends Battle {
   constructor(waveIndex: number, config: FixedBattleConfig) {
-    super(globalScene.gameMode, waveIndex, config.battleType, config.battleType === BattleType.TRAINER ? config.getTrainer() : undefined, config.double);
+    super(
+      globalScene.gameMode,
+      waveIndex,
+      config.battleType,
+      config.battleType === BattleType.TRAINER ? config.getTrainer() : undefined,
+      config.double,
+    );
     if (config.getEnemyParty) {
       this.enemyParty = config.getEnemyParty();
     }
@@ -509,7 +521,6 @@ export class FixedBattleConfig {
   }
 }
 
-
 /**
  * Helper function to generate a random trainer for evil team trainers and the elite 4/champion
  * @param trainerPool The TrainerType or list of TrainerTypes that can possibly be generated
@@ -517,31 +528,44 @@ export class FixedBattleConfig {
  * @param seedOffset the seed offset to use for the random generation of the trainer
  * @returns the generated trainer
  */
-export function getRandomTrainerFunc(trainerPool: (TrainerType | TrainerType[])[], randomGender: boolean = false, seedOffset: number  = 0): GetTrainerFunc {
+export function getRandomTrainerFunc(
+  trainerPool: (TrainerType | TrainerType[])[],
+  randomGender = false,
+  seedOffset = 0,
+): GetTrainerFunc {
   return () => {
-    const rand = Utils.randSeedInt(trainerPool.length);
+    const rand = randSeedInt(trainerPool.length);
     const trainerTypes: TrainerType[] = [];
 
     globalScene.executeWithSeedOffset(() => {
       for (const trainerPoolEntry of trainerPool) {
-        const trainerType = Array.isArray(trainerPoolEntry)
-          ? Utils.randSeedItem(trainerPoolEntry)
-          : trainerPoolEntry;
+        const trainerType = Array.isArray(trainerPoolEntry) ? randSeedItem(trainerPoolEntry) : trainerPoolEntry;
         trainerTypes.push(trainerType);
       }
     }, seedOffset);
 
     let trainerGender = TrainerVariant.DEFAULT;
     if (randomGender) {
-      trainerGender = (Utils.randInt(2) === 0) ? TrainerVariant.FEMALE : TrainerVariant.DEFAULT;
+      trainerGender = randInt(2) === 0 ? TrainerVariant.FEMALE : TrainerVariant.DEFAULT;
     }
 
     /* 1/3 chance for evil team grunts to be double battles */
-    const evilTeamGrunts = [ TrainerType.ROCKET_GRUNT, TrainerType.MAGMA_GRUNT, TrainerType.AQUA_GRUNT, TrainerType.GALACTIC_GRUNT, TrainerType.PLASMA_GRUNT, TrainerType.FLARE_GRUNT, TrainerType.AETHER_GRUNT, TrainerType.SKULL_GRUNT, TrainerType.MACRO_GRUNT, TrainerType.STAR_GRUNT ];
+    const evilTeamGrunts = [
+      TrainerType.ROCKET_GRUNT,
+      TrainerType.MAGMA_GRUNT,
+      TrainerType.AQUA_GRUNT,
+      TrainerType.GALACTIC_GRUNT,
+      TrainerType.PLASMA_GRUNT,
+      TrainerType.FLARE_GRUNT,
+      TrainerType.AETHER_GRUNT,
+      TrainerType.SKULL_GRUNT,
+      TrainerType.MACRO_GRUNT,
+      TrainerType.STAR_GRUNT,
+    ];
     const isEvilTeamGrunt = evilTeamGrunts.includes(trainerTypes[rand]);
 
     if (trainerConfigs[trainerTypes[rand]].hasDouble && isEvilTeamGrunt) {
-      return new Trainer(trainerTypes[rand], (Utils.randInt(3) === 0) ? TrainerVariant.DOUBLE : trainerGender);
+      return new Trainer(trainerTypes[rand], randInt(3) === 0 ? TrainerVariant.DOUBLE : trainerGender);
     }
 
     return new Trainer(trainerTypes[rand], trainerGender);
@@ -549,7 +573,7 @@ export function getRandomTrainerFunc(trainerPool: (TrainerType | TrainerType[])[
 }
 
 export interface FixedBattleConfigs {
-    [key: number]: FixedBattleConfig
+  [key: number]: FixedBattleConfig;
 }
 /**
  * Youngster/Lass on 5
@@ -561,51 +585,355 @@ export interface FixedBattleConfigs {
  * Champion on 190
  */
 export const classicFixedBattles: FixedBattleConfigs = {
-  [ClassicFixedBossWaves.TOWN_YOUNGSTER]: new FixedBattleConfig().setBattleType(BattleType.TRAINER)
-    .setGetTrainerFunc(() => new Trainer(TrainerType.YOUNGSTER, Utils.randSeedInt(2) ? TrainerVariant.FEMALE : TrainerVariant.DEFAULT)),
-  [ClassicFixedBossWaves.RIVAL_1]: new FixedBattleConfig().setBattleType(BattleType.TRAINER)
-    .setGetTrainerFunc(() => new Trainer(TrainerType.RIVAL, globalScene.gameData.gender === PlayerGender.MALE ? TrainerVariant.FEMALE : TrainerVariant.DEFAULT)),
-  [ClassicFixedBossWaves.RIVAL_2]: new FixedBattleConfig().setBattleType(BattleType.TRAINER)
-    .setGetTrainerFunc(() => new Trainer(TrainerType.RIVAL_2, globalScene.gameData.gender === PlayerGender.MALE ? TrainerVariant.FEMALE : TrainerVariant.DEFAULT))
-    .setCustomModifierRewards({ guaranteedModifierTiers: [ ModifierTier.ULTRA, ModifierTier.GREAT, ModifierTier.GREAT ], allowLuckUpgrades: false }),
-  [ClassicFixedBossWaves.EVIL_GRUNT_1]: new FixedBattleConfig().setBattleType(BattleType.TRAINER)
-    .setGetTrainerFunc(getRandomTrainerFunc([ TrainerType.ROCKET_GRUNT, TrainerType.MAGMA_GRUNT, TrainerType.AQUA_GRUNT, TrainerType.GALACTIC_GRUNT, TrainerType.PLASMA_GRUNT, TrainerType.FLARE_GRUNT, TrainerType.AETHER_GRUNT, TrainerType.SKULL_GRUNT, TrainerType.MACRO_GRUNT, TrainerType.STAR_GRUNT ], true)),
-  [ClassicFixedBossWaves.RIVAL_3]: new FixedBattleConfig().setBattleType(BattleType.TRAINER)
-    .setGetTrainerFunc(() => new Trainer(TrainerType.RIVAL_3, globalScene.gameData.gender === PlayerGender.MALE ? TrainerVariant.FEMALE : TrainerVariant.DEFAULT))
-    .setCustomModifierRewards({ guaranteedModifierTiers: [ ModifierTier.ULTRA, ModifierTier.ULTRA, ModifierTier.GREAT, ModifierTier.GREAT ], allowLuckUpgrades: false }),
-  [ClassicFixedBossWaves.EVIL_GRUNT_2]: new FixedBattleConfig().setBattleType(BattleType.TRAINER).setSeedOffsetWave(ClassicFixedBossWaves.EVIL_GRUNT_1)
-    .setGetTrainerFunc(getRandomTrainerFunc([ TrainerType.ROCKET_GRUNT, TrainerType.MAGMA_GRUNT, TrainerType.AQUA_GRUNT, TrainerType.GALACTIC_GRUNT, TrainerType.PLASMA_GRUNT, TrainerType.FLARE_GRUNT, TrainerType.AETHER_GRUNT, TrainerType.SKULL_GRUNT, TrainerType.MACRO_GRUNT, TrainerType.STAR_GRUNT ], true)),
-  [ClassicFixedBossWaves.EVIL_GRUNT_3]: new FixedBattleConfig().setBattleType(BattleType.TRAINER).setSeedOffsetWave(ClassicFixedBossWaves.EVIL_GRUNT_1)
-    .setGetTrainerFunc(getRandomTrainerFunc([ TrainerType.ROCKET_GRUNT, TrainerType.MAGMA_GRUNT, TrainerType.AQUA_GRUNT, TrainerType.GALACTIC_GRUNT, TrainerType.PLASMA_GRUNT, TrainerType.FLARE_GRUNT, TrainerType.AETHER_GRUNT, TrainerType.SKULL_GRUNT, TrainerType.MACRO_GRUNT, TrainerType.STAR_GRUNT ], true)),
-  [ClassicFixedBossWaves.EVIL_ADMIN_1]: new FixedBattleConfig().setBattleType(BattleType.TRAINER).setSeedOffsetWave(ClassicFixedBossWaves.EVIL_GRUNT_1)
-    .setGetTrainerFunc(getRandomTrainerFunc([[ TrainerType.ARCHER, TrainerType.ARIANA, TrainerType.PROTON, TrainerType.PETREL ], [ TrainerType.TABITHA, TrainerType.COURTNEY ], [ TrainerType.MATT, TrainerType.SHELLY ], [ TrainerType.JUPITER, TrainerType.MARS, TrainerType.SATURN ], [ TrainerType.ZINZOLIN, TrainerType.COLRESS ], [ TrainerType.XEROSIC, TrainerType.BRYONY ], TrainerType.FABA, TrainerType.PLUMERIA, TrainerType.OLEANA, [ TrainerType.GIACOMO, TrainerType.MELA, TrainerType.ATTICUS, TrainerType.ORTEGA, TrainerType.ERI ]], true)),
-  [ClassicFixedBossWaves.RIVAL_4]: new FixedBattleConfig().setBattleType(BattleType.TRAINER)
-    .setGetTrainerFunc(() => new Trainer(TrainerType.RIVAL_4, globalScene.gameData.gender === PlayerGender.MALE ? TrainerVariant.FEMALE : TrainerVariant.DEFAULT))
-    .setCustomModifierRewards({ guaranteedModifierTiers: [ ModifierTier.ULTRA, ModifierTier.ULTRA, ModifierTier.ULTRA, ModifierTier.ULTRA ], allowLuckUpgrades: false }),
-  [ClassicFixedBossWaves.EVIL_GRUNT_4]: new FixedBattleConfig().setBattleType(BattleType.TRAINER).setSeedOffsetWave(ClassicFixedBossWaves.EVIL_GRUNT_1)
-    .setGetTrainerFunc(getRandomTrainerFunc([ TrainerType.ROCKET_GRUNT, TrainerType.MAGMA_GRUNT, TrainerType.AQUA_GRUNT, TrainerType.GALACTIC_GRUNT, TrainerType.PLASMA_GRUNT, TrainerType.FLARE_GRUNT, TrainerType.AETHER_GRUNT, TrainerType.SKULL_GRUNT, TrainerType.MACRO_GRUNT, TrainerType.STAR_GRUNT ], true)),
-  [ClassicFixedBossWaves.EVIL_ADMIN_2]: new FixedBattleConfig().setBattleType(BattleType.TRAINER).setSeedOffsetWave(ClassicFixedBossWaves.EVIL_GRUNT_1)
-    .setGetTrainerFunc(getRandomTrainerFunc([[ TrainerType.ARCHER, TrainerType.ARIANA, TrainerType.PROTON, TrainerType.PETREL ], [ TrainerType.TABITHA, TrainerType.COURTNEY ], [ TrainerType.MATT, TrainerType.SHELLY ], [ TrainerType.JUPITER, TrainerType.MARS, TrainerType.SATURN ], [ TrainerType.ZINZOLIN, TrainerType.COLRESS ], [ TrainerType.XEROSIC, TrainerType.BRYONY ], TrainerType.FABA, TrainerType.PLUMERIA, TrainerType.OLEANA, [ TrainerType.GIACOMO, TrainerType.MELA, TrainerType.ATTICUS, TrainerType.ORTEGA, TrainerType.ERI ]], true, 1)),
-  [ClassicFixedBossWaves.EVIL_BOSS_1]: new FixedBattleConfig().setBattleType(BattleType.TRAINER).setSeedOffsetWave(ClassicFixedBossWaves.EVIL_GRUNT_1)
-    .setGetTrainerFunc(getRandomTrainerFunc([ TrainerType.ROCKET_BOSS_GIOVANNI_1, TrainerType.MAXIE, TrainerType.ARCHIE, TrainerType.CYRUS, TrainerType.GHETSIS, TrainerType.LYSANDRE, TrainerType.LUSAMINE, TrainerType.GUZMA, TrainerType.ROSE, TrainerType.PENNY ]))
-    .setCustomModifierRewards({ guaranteedModifierTiers: [ ModifierTier.ROGUE, ModifierTier.ROGUE, ModifierTier.ULTRA, ModifierTier.ULTRA, ModifierTier.ULTRA ], allowLuckUpgrades: false }),
-  [ClassicFixedBossWaves.RIVAL_5]: new FixedBattleConfig().setBattleType(BattleType.TRAINER)
-    .setGetTrainerFunc(() => new Trainer(TrainerType.RIVAL_5, globalScene.gameData.gender === PlayerGender.MALE ? TrainerVariant.FEMALE : TrainerVariant.DEFAULT))
-    .setCustomModifierRewards({ guaranteedModifierTiers: [ ModifierTier.ROGUE, ModifierTier.ROGUE, ModifierTier.ROGUE, ModifierTier.ULTRA, ModifierTier.ULTRA ], allowLuckUpgrades: false }),
-  [ClassicFixedBossWaves.EVIL_BOSS_2]: new FixedBattleConfig().setBattleType(BattleType.TRAINER).setSeedOffsetWave(ClassicFixedBossWaves.EVIL_GRUNT_1)
-    .setGetTrainerFunc(getRandomTrainerFunc([ TrainerType.ROCKET_BOSS_GIOVANNI_2, TrainerType.MAXIE_2, TrainerType.ARCHIE_2, TrainerType.CYRUS_2, TrainerType.GHETSIS_2, TrainerType.LYSANDRE_2, TrainerType.LUSAMINE_2, TrainerType.GUZMA_2, TrainerType.ROSE_2, TrainerType.PENNY_2 ]))
-    .setCustomModifierRewards({ guaranteedModifierTiers: [ ModifierTier.ROGUE, ModifierTier.ROGUE, ModifierTier.ULTRA, ModifierTier.ULTRA, ModifierTier.ULTRA, ModifierTier.ULTRA ], allowLuckUpgrades: false }),
-  [ClassicFixedBossWaves.ELITE_FOUR_1]: new FixedBattleConfig().setBattleType(BattleType.TRAINER)
-    .setGetTrainerFunc(getRandomTrainerFunc([ TrainerType.LORELEI, TrainerType.WILL, TrainerType.SIDNEY, TrainerType.AARON, TrainerType.SHAUNTAL, TrainerType.MALVA, [ TrainerType.HALA, TrainerType.MOLAYNE ], TrainerType.MARNIE_ELITE, TrainerType.RIKA, TrainerType.CRISPIN ])),
-  [ClassicFixedBossWaves.ELITE_FOUR_2]: new FixedBattleConfig().setBattleType(BattleType.TRAINER).setSeedOffsetWave(ClassicFixedBossWaves.ELITE_FOUR_1)
-    .setGetTrainerFunc(getRandomTrainerFunc([ TrainerType.BRUNO, TrainerType.KOGA, TrainerType.PHOEBE, TrainerType.BERTHA, TrainerType.MARSHAL, TrainerType.SIEBOLD, TrainerType.OLIVIA, TrainerType.NESSA_ELITE, TrainerType.POPPY, TrainerType.AMARYS ])),
-  [ClassicFixedBossWaves.ELITE_FOUR_3]: new FixedBattleConfig().setBattleType(BattleType.TRAINER).setSeedOffsetWave(ClassicFixedBossWaves.ELITE_FOUR_1)
-    .setGetTrainerFunc(getRandomTrainerFunc([ TrainerType.AGATHA, TrainerType.BRUNO, TrainerType.GLACIA, TrainerType.FLINT, TrainerType.GRIMSLEY, TrainerType.WIKSTROM, TrainerType.ACEROLA, [ TrainerType.BEA_ELITE, TrainerType.ALLISTER_ELITE ], TrainerType.LARRY_ELITE, TrainerType.LACEY ])),
-  [ClassicFixedBossWaves.ELITE_FOUR_4]: new FixedBattleConfig().setBattleType(BattleType.TRAINER).setSeedOffsetWave(ClassicFixedBossWaves.ELITE_FOUR_1)
-    .setGetTrainerFunc(getRandomTrainerFunc([ TrainerType.LANCE, TrainerType.KAREN, TrainerType.DRAKE, TrainerType.LUCIAN, TrainerType.CAITLIN, TrainerType.DRASNA, TrainerType.KAHILI, TrainerType.RAIHAN_ELITE, TrainerType.HASSEL, TrainerType.DRAYTON ])),
-  [ClassicFixedBossWaves.CHAMPION]: new FixedBattleConfig().setBattleType(BattleType.TRAINER).setSeedOffsetWave(ClassicFixedBossWaves.ELITE_FOUR_1)
-    .setGetTrainerFunc(getRandomTrainerFunc([ TrainerType.BLUE, [ TrainerType.RED, TrainerType.LANCE_CHAMPION ], [ TrainerType.STEVEN, TrainerType.WALLACE ], TrainerType.CYNTHIA, [ TrainerType.ALDER, TrainerType.IRIS ], TrainerType.DIANTHA, [ TrainerType.KUKUI, TrainerType.HAU ], [ TrainerType.LEON, TrainerType.MUSTARD ], [ TrainerType.GEETA, TrainerType.NEMONA ], TrainerType.KIERAN ])),
-  [ClassicFixedBossWaves.RIVAL_6]: new FixedBattleConfig().setBattleType(BattleType.TRAINER)
-    .setGetTrainerFunc(() => new Trainer(TrainerType.RIVAL_6, globalScene.gameData.gender === PlayerGender.MALE ? TrainerVariant.FEMALE : TrainerVariant.DEFAULT))
-    .setCustomModifierRewards({ guaranteedModifierTiers: [ ModifierTier.ROGUE, ModifierTier.ROGUE, ModifierTier.ULTRA, ModifierTier.ULTRA, ModifierTier.GREAT, ModifierTier.GREAT ], allowLuckUpgrades: false })
+  [ClassicFixedBossWaves.TOWN_YOUNGSTER]: new FixedBattleConfig()
+    .setBattleType(BattleType.TRAINER)
+    .setGetTrainerFunc(
+      () => new Trainer(TrainerType.YOUNGSTER, randSeedInt(2) ? TrainerVariant.FEMALE : TrainerVariant.DEFAULT),
+    ),
+  [ClassicFixedBossWaves.RIVAL_1]: new FixedBattleConfig()
+    .setBattleType(BattleType.TRAINER)
+    .setGetTrainerFunc(
+      () =>
+        new Trainer(
+          TrainerType.RIVAL,
+          globalScene.gameData.gender === PlayerGender.MALE ? TrainerVariant.FEMALE : TrainerVariant.DEFAULT,
+        ),
+    ),
+  [ClassicFixedBossWaves.RIVAL_2]: new FixedBattleConfig()
+    .setBattleType(BattleType.TRAINER)
+    .setGetTrainerFunc(
+      () =>
+        new Trainer(
+          TrainerType.RIVAL_2,
+          globalScene.gameData.gender === PlayerGender.MALE ? TrainerVariant.FEMALE : TrainerVariant.DEFAULT,
+        ),
+    )
+    .setCustomModifierRewards({
+      guaranteedModifierTiers: [ModifierTier.ULTRA, ModifierTier.GREAT, ModifierTier.GREAT],
+      allowLuckUpgrades: false,
+    }),
+  [ClassicFixedBossWaves.EVIL_GRUNT_1]: new FixedBattleConfig()
+    .setBattleType(BattleType.TRAINER)
+    .setGetTrainerFunc(
+      getRandomTrainerFunc(
+        [
+          TrainerType.ROCKET_GRUNT,
+          TrainerType.MAGMA_GRUNT,
+          TrainerType.AQUA_GRUNT,
+          TrainerType.GALACTIC_GRUNT,
+          TrainerType.PLASMA_GRUNT,
+          TrainerType.FLARE_GRUNT,
+          TrainerType.AETHER_GRUNT,
+          TrainerType.SKULL_GRUNT,
+          TrainerType.MACRO_GRUNT,
+          TrainerType.STAR_GRUNT,
+        ],
+        true,
+      ),
+    ),
+  [ClassicFixedBossWaves.RIVAL_3]: new FixedBattleConfig()
+    .setBattleType(BattleType.TRAINER)
+    .setGetTrainerFunc(
+      () =>
+        new Trainer(
+          TrainerType.RIVAL_3,
+          globalScene.gameData.gender === PlayerGender.MALE ? TrainerVariant.FEMALE : TrainerVariant.DEFAULT,
+        ),
+    )
+    .setCustomModifierRewards({
+      guaranteedModifierTiers: [ModifierTier.ULTRA, ModifierTier.ULTRA, ModifierTier.GREAT, ModifierTier.GREAT],
+      allowLuckUpgrades: false,
+    }),
+  [ClassicFixedBossWaves.EVIL_GRUNT_2]: new FixedBattleConfig()
+    .setBattleType(BattleType.TRAINER)
+    .setSeedOffsetWave(ClassicFixedBossWaves.EVIL_GRUNT_1)
+    .setGetTrainerFunc(
+      getRandomTrainerFunc(
+        [
+          TrainerType.ROCKET_GRUNT,
+          TrainerType.MAGMA_GRUNT,
+          TrainerType.AQUA_GRUNT,
+          TrainerType.GALACTIC_GRUNT,
+          TrainerType.PLASMA_GRUNT,
+          TrainerType.FLARE_GRUNT,
+          TrainerType.AETHER_GRUNT,
+          TrainerType.SKULL_GRUNT,
+          TrainerType.MACRO_GRUNT,
+          TrainerType.STAR_GRUNT,
+        ],
+        true,
+      ),
+    ),
+  [ClassicFixedBossWaves.EVIL_GRUNT_3]: new FixedBattleConfig()
+    .setBattleType(BattleType.TRAINER)
+    .setSeedOffsetWave(ClassicFixedBossWaves.EVIL_GRUNT_1)
+    .setGetTrainerFunc(
+      getRandomTrainerFunc(
+        [
+          TrainerType.ROCKET_GRUNT,
+          TrainerType.MAGMA_GRUNT,
+          TrainerType.AQUA_GRUNT,
+          TrainerType.GALACTIC_GRUNT,
+          TrainerType.PLASMA_GRUNT,
+          TrainerType.FLARE_GRUNT,
+          TrainerType.AETHER_GRUNT,
+          TrainerType.SKULL_GRUNT,
+          TrainerType.MACRO_GRUNT,
+          TrainerType.STAR_GRUNT,
+        ],
+        true,
+      ),
+    ),
+  [ClassicFixedBossWaves.EVIL_ADMIN_1]: new FixedBattleConfig()
+    .setBattleType(BattleType.TRAINER)
+    .setSeedOffsetWave(ClassicFixedBossWaves.EVIL_GRUNT_1)
+    .setGetTrainerFunc(
+      getRandomTrainerFunc(
+        [
+          [TrainerType.ARCHER, TrainerType.ARIANA, TrainerType.PROTON, TrainerType.PETREL],
+          [TrainerType.TABITHA, TrainerType.COURTNEY],
+          [TrainerType.MATT, TrainerType.SHELLY],
+          [TrainerType.JUPITER, TrainerType.MARS, TrainerType.SATURN],
+          [TrainerType.ZINZOLIN, TrainerType.COLRESS],
+          [TrainerType.XEROSIC, TrainerType.BRYONY],
+          TrainerType.FABA,
+          TrainerType.PLUMERIA,
+          TrainerType.OLEANA,
+          [TrainerType.GIACOMO, TrainerType.MELA, TrainerType.ATTICUS, TrainerType.ORTEGA, TrainerType.ERI],
+        ],
+        true,
+      ),
+    ),
+  [ClassicFixedBossWaves.RIVAL_4]: new FixedBattleConfig()
+    .setBattleType(BattleType.TRAINER)
+    .setGetTrainerFunc(
+      () =>
+        new Trainer(
+          TrainerType.RIVAL_4,
+          globalScene.gameData.gender === PlayerGender.MALE ? TrainerVariant.FEMALE : TrainerVariant.DEFAULT,
+        ),
+    )
+    .setCustomModifierRewards({
+      guaranteedModifierTiers: [ModifierTier.ULTRA, ModifierTier.ULTRA, ModifierTier.ULTRA, ModifierTier.ULTRA],
+      allowLuckUpgrades: false,
+    }),
+  [ClassicFixedBossWaves.EVIL_GRUNT_4]: new FixedBattleConfig()
+    .setBattleType(BattleType.TRAINER)
+    .setSeedOffsetWave(ClassicFixedBossWaves.EVIL_GRUNT_1)
+    .setGetTrainerFunc(
+      getRandomTrainerFunc(
+        [
+          TrainerType.ROCKET_GRUNT,
+          TrainerType.MAGMA_GRUNT,
+          TrainerType.AQUA_GRUNT,
+          TrainerType.GALACTIC_GRUNT,
+          TrainerType.PLASMA_GRUNT,
+          TrainerType.FLARE_GRUNT,
+          TrainerType.AETHER_GRUNT,
+          TrainerType.SKULL_GRUNT,
+          TrainerType.MACRO_GRUNT,
+          TrainerType.STAR_GRUNT,
+        ],
+        true,
+      ),
+    ),
+  [ClassicFixedBossWaves.EVIL_ADMIN_2]: new FixedBattleConfig()
+    .setBattleType(BattleType.TRAINER)
+    .setSeedOffsetWave(ClassicFixedBossWaves.EVIL_GRUNT_1)
+    .setGetTrainerFunc(
+      getRandomTrainerFunc(
+        [
+          [TrainerType.ARCHER, TrainerType.ARIANA, TrainerType.PROTON, TrainerType.PETREL],
+          [TrainerType.TABITHA, TrainerType.COURTNEY],
+          [TrainerType.MATT, TrainerType.SHELLY],
+          [TrainerType.JUPITER, TrainerType.MARS, TrainerType.SATURN],
+          [TrainerType.ZINZOLIN, TrainerType.COLRESS],
+          [TrainerType.XEROSIC, TrainerType.BRYONY],
+          TrainerType.FABA,
+          TrainerType.PLUMERIA,
+          TrainerType.OLEANA,
+          [TrainerType.GIACOMO, TrainerType.MELA, TrainerType.ATTICUS, TrainerType.ORTEGA, TrainerType.ERI],
+        ],
+        true,
+        1,
+      ),
+    ),
+  [ClassicFixedBossWaves.EVIL_BOSS_1]: new FixedBattleConfig()
+    .setBattleType(BattleType.TRAINER)
+    .setSeedOffsetWave(ClassicFixedBossWaves.EVIL_GRUNT_1)
+    .setGetTrainerFunc(
+      getRandomTrainerFunc([
+        TrainerType.ROCKET_BOSS_GIOVANNI_1,
+        TrainerType.MAXIE,
+        TrainerType.ARCHIE,
+        TrainerType.CYRUS,
+        TrainerType.GHETSIS,
+        TrainerType.LYSANDRE,
+        TrainerType.LUSAMINE,
+        TrainerType.GUZMA,
+        TrainerType.ROSE,
+        TrainerType.PENNY,
+      ]),
+    )
+    .setCustomModifierRewards({
+      guaranteedModifierTiers: [
+        ModifierTier.ROGUE,
+        ModifierTier.ROGUE,
+        ModifierTier.ULTRA,
+        ModifierTier.ULTRA,
+        ModifierTier.ULTRA,
+      ],
+      allowLuckUpgrades: false,
+    }),
+  [ClassicFixedBossWaves.RIVAL_5]: new FixedBattleConfig()
+    .setBattleType(BattleType.TRAINER)
+    .setGetTrainerFunc(
+      () =>
+        new Trainer(
+          TrainerType.RIVAL_5,
+          globalScene.gameData.gender === PlayerGender.MALE ? TrainerVariant.FEMALE : TrainerVariant.DEFAULT,
+        ),
+    )
+    .setCustomModifierRewards({
+      guaranteedModifierTiers: [
+        ModifierTier.ROGUE,
+        ModifierTier.ROGUE,
+        ModifierTier.ROGUE,
+        ModifierTier.ULTRA,
+        ModifierTier.ULTRA,
+      ],
+      allowLuckUpgrades: false,
+    }),
+  [ClassicFixedBossWaves.EVIL_BOSS_2]: new FixedBattleConfig()
+    .setBattleType(BattleType.TRAINER)
+    .setSeedOffsetWave(ClassicFixedBossWaves.EVIL_GRUNT_1)
+    .setGetTrainerFunc(
+      getRandomTrainerFunc([
+        TrainerType.ROCKET_BOSS_GIOVANNI_2,
+        TrainerType.MAXIE_2,
+        TrainerType.ARCHIE_2,
+        TrainerType.CYRUS_2,
+        TrainerType.GHETSIS_2,
+        TrainerType.LYSANDRE_2,
+        TrainerType.LUSAMINE_2,
+        TrainerType.GUZMA_2,
+        TrainerType.ROSE_2,
+        TrainerType.PENNY_2,
+      ]),
+    )
+    .setCustomModifierRewards({
+      guaranteedModifierTiers: [
+        ModifierTier.ROGUE,
+        ModifierTier.ROGUE,
+        ModifierTier.ULTRA,
+        ModifierTier.ULTRA,
+        ModifierTier.ULTRA,
+        ModifierTier.ULTRA,
+      ],
+      allowLuckUpgrades: false,
+    }),
+  [ClassicFixedBossWaves.ELITE_FOUR_1]: new FixedBattleConfig()
+    .setBattleType(BattleType.TRAINER)
+    .setGetTrainerFunc(
+      getRandomTrainerFunc([
+        TrainerType.LORELEI,
+        TrainerType.WILL,
+        TrainerType.SIDNEY,
+        TrainerType.AARON,
+        TrainerType.SHAUNTAL,
+        TrainerType.MALVA,
+        [TrainerType.HALA, TrainerType.MOLAYNE],
+        TrainerType.MARNIE_ELITE,
+        TrainerType.RIKA,
+        TrainerType.CRISPIN,
+      ]),
+    ),
+  [ClassicFixedBossWaves.ELITE_FOUR_2]: new FixedBattleConfig()
+    .setBattleType(BattleType.TRAINER)
+    .setSeedOffsetWave(ClassicFixedBossWaves.ELITE_FOUR_1)
+    .setGetTrainerFunc(
+      getRandomTrainerFunc([
+        TrainerType.BRUNO,
+        TrainerType.KOGA,
+        TrainerType.PHOEBE,
+        TrainerType.BERTHA,
+        TrainerType.MARSHAL,
+        TrainerType.SIEBOLD,
+        TrainerType.OLIVIA,
+        TrainerType.NESSA_ELITE,
+        TrainerType.POPPY,
+        TrainerType.AMARYS,
+      ]),
+    ),
+  [ClassicFixedBossWaves.ELITE_FOUR_3]: new FixedBattleConfig()
+    .setBattleType(BattleType.TRAINER)
+    .setSeedOffsetWave(ClassicFixedBossWaves.ELITE_FOUR_1)
+    .setGetTrainerFunc(
+      getRandomTrainerFunc([
+        TrainerType.AGATHA,
+        TrainerType.BRUNO,
+        TrainerType.GLACIA,
+        TrainerType.FLINT,
+        TrainerType.GRIMSLEY,
+        TrainerType.WIKSTROM,
+        TrainerType.ACEROLA,
+        [TrainerType.BEA_ELITE, TrainerType.ALLISTER_ELITE],
+        TrainerType.LARRY_ELITE,
+        TrainerType.LACEY,
+      ]),
+    ),
+  [ClassicFixedBossWaves.ELITE_FOUR_4]: new FixedBattleConfig()
+    .setBattleType(BattleType.TRAINER)
+    .setSeedOffsetWave(ClassicFixedBossWaves.ELITE_FOUR_1)
+    .setGetTrainerFunc(
+      getRandomTrainerFunc([
+        TrainerType.LANCE,
+        TrainerType.KAREN,
+        TrainerType.DRAKE,
+        TrainerType.LUCIAN,
+        TrainerType.CAITLIN,
+        TrainerType.DRASNA,
+        TrainerType.KAHILI,
+        TrainerType.RAIHAN_ELITE,
+        TrainerType.HASSEL,
+        TrainerType.DRAYTON,
+      ]),
+    ),
+  [ClassicFixedBossWaves.CHAMPION]: new FixedBattleConfig()
+    .setBattleType(BattleType.TRAINER)
+    .setSeedOffsetWave(ClassicFixedBossWaves.ELITE_FOUR_1)
+    .setGetTrainerFunc(
+      getRandomTrainerFunc([
+        TrainerType.BLUE,
+        [TrainerType.RED, TrainerType.LANCE_CHAMPION],
+        [TrainerType.STEVEN, TrainerType.WALLACE],
+        TrainerType.CYNTHIA,
+        [TrainerType.ALDER, TrainerType.IRIS],
+        TrainerType.DIANTHA,
+        [TrainerType.KUKUI, TrainerType.HAU],
+        [TrainerType.LEON, TrainerType.MUSTARD],
+        [TrainerType.GEETA, TrainerType.NEMONA],
+        TrainerType.KIERAN,
+      ]),
+    ),
+  [ClassicFixedBossWaves.RIVAL_6]: new FixedBattleConfig()
+    .setBattleType(BattleType.TRAINER)
+    .setGetTrainerFunc(
+      () =>
+        new Trainer(
+          TrainerType.RIVAL_6,
+          globalScene.gameData.gender === PlayerGender.MALE ? TrainerVariant.FEMALE : TrainerVariant.DEFAULT,
+        ),
+    )
+    .setCustomModifierRewards({
+      guaranteedModifierTiers: [
+        ModifierTier.ROGUE,
+        ModifierTier.ROGUE,
+        ModifierTier.ULTRA,
+        ModifierTier.ULTRA,
+        ModifierTier.GREAT,
+        ModifierTier.GREAT,
+      ],
+      allowLuckUpgrades: false,
+    }),
 };
diff --git a/src/configs/inputs/cfg_keyboard_qwerty.ts b/src/configs/inputs/cfg_keyboard_qwerty.ts
index 5ddc12e8784..4f0353971e0 100644
--- a/src/configs/inputs/cfg_keyboard_qwerty.ts
+++ b/src/configs/inputs/cfg_keyboard_qwerty.ts
@@ -31,6 +31,7 @@ const cfg_keyboard_qwerty = {
     KEY_X: Phaser.Input.Keyboard.KeyCodes.X,
     KEY_Y: Phaser.Input.Keyboard.KeyCodes.Y,
     KEY_Z: Phaser.Input.Keyboard.KeyCodes.Z,
+
     KEY_0: Phaser.Input.Keyboard.KeyCodes.ZERO,
     KEY_1: Phaser.Input.Keyboard.KeyCodes.ONE,
     KEY_2: Phaser.Input.Keyboard.KeyCodes.TWO,
@@ -41,11 +42,7 @@ const cfg_keyboard_qwerty = {
     KEY_7: Phaser.Input.Keyboard.KeyCodes.SEVEN,
     KEY_8: Phaser.Input.Keyboard.KeyCodes.EIGHT,
     KEY_9: Phaser.Input.Keyboard.KeyCodes.NINE,
-    KEY_CTRL: Phaser.Input.Keyboard.KeyCodes.CTRL,
-    KEY_DEL: Phaser.Input.Keyboard.KeyCodes.DELETE,
-    KEY_END: Phaser.Input.Keyboard.KeyCodes.END,
-    KEY_ENTER: Phaser.Input.Keyboard.KeyCodes.ENTER,
-    KEY_ESC: Phaser.Input.Keyboard.KeyCodes.ESC,
+
     KEY_F1: Phaser.Input.Keyboard.KeyCodes.F1,
     KEY_F2: Phaser.Input.Keyboard.KeyCodes.F2,
     KEY_F3: Phaser.Input.Keyboard.KeyCodes.F3,
@@ -58,26 +55,43 @@ const cfg_keyboard_qwerty = {
     KEY_F10: Phaser.Input.Keyboard.KeyCodes.F10,
     KEY_F11: Phaser.Input.Keyboard.KeyCodes.F11,
     KEY_F12: Phaser.Input.Keyboard.KeyCodes.F12,
-    KEY_HOME: Phaser.Input.Keyboard.KeyCodes.HOME,
-    KEY_INSERT: Phaser.Input.Keyboard.KeyCodes.INSERT,
+
     KEY_PAGE_DOWN: Phaser.Input.Keyboard.KeyCodes.PAGE_DOWN,
     KEY_PAGE_UP: Phaser.Input.Keyboard.KeyCodes.PAGE_UP,
+
+    KEY_CTRL: Phaser.Input.Keyboard.KeyCodes.CTRL,
+    KEY_DEL: Phaser.Input.Keyboard.KeyCodes.DELETE,
+    KEY_END: Phaser.Input.Keyboard.KeyCodes.END,
+    KEY_ENTER: Phaser.Input.Keyboard.KeyCodes.ENTER,
+    KEY_ESC: Phaser.Input.Keyboard.KeyCodes.ESC,
+    KEY_HOME: Phaser.Input.Keyboard.KeyCodes.HOME,
+    KEY_INSERT: Phaser.Input.Keyboard.KeyCodes.INSERT,
+
     KEY_PLUS: Phaser.Input.Keyboard.KeyCodes.NUMPAD_ADD, // Assuming numpad plus
     KEY_MINUS: Phaser.Input.Keyboard.KeyCodes.NUMPAD_SUBTRACT, // Assuming numpad minus
     KEY_QUOTATION: Phaser.Input.Keyboard.KeyCodes.QUOTES,
     KEY_SHIFT: Phaser.Input.Keyboard.KeyCodes.SHIFT,
+
     KEY_SPACE: Phaser.Input.Keyboard.KeyCodes.SPACE,
     KEY_TAB: Phaser.Input.Keyboard.KeyCodes.TAB,
     KEY_TILDE: Phaser.Input.Keyboard.KeyCodes.BACKTICK,
+
     KEY_ARROW_UP: Phaser.Input.Keyboard.KeyCodes.UP,
     KEY_ARROW_DOWN: Phaser.Input.Keyboard.KeyCodes.DOWN,
     KEY_ARROW_LEFT: Phaser.Input.Keyboard.KeyCodes.LEFT,
     KEY_ARROW_RIGHT: Phaser.Input.Keyboard.KeyCodes.RIGHT,
+
     KEY_LEFT_BRACKET: Phaser.Input.Keyboard.KeyCodes.OPEN_BRACKET,
     KEY_RIGHT_BRACKET: Phaser.Input.Keyboard.KeyCodes.CLOSED_BRACKET,
+
     KEY_SEMICOLON: Phaser.Input.Keyboard.KeyCodes.SEMICOLON,
+    KEY_COMMA: Phaser.Input.Keyboard.KeyCodes.COMMA,
+    KEY_PERIOD: Phaser.Input.Keyboard.KeyCodes.PERIOD,
+    KEY_BACK_SLASH: Phaser.Input.Keyboard.KeyCodes.BACK_SLASH,
+    KEY_FORWARD_SLASH: Phaser.Input.Keyboard.KeyCodes.FORWARD_SLASH,
+
     KEY_BACKSPACE: Phaser.Input.Keyboard.KeyCodes.BACKSPACE,
-    KEY_ALT: Phaser.Input.Keyboard.KeyCodes.ALT
+    KEY_ALT: Phaser.Input.Keyboard.KeyCodes.ALT,
   },
   icons: {
     KEY_A: "A.png",
@@ -131,7 +145,6 @@ const cfg_keyboard_qwerty = {
     KEY_F11: "F11.png",
     KEY_F12: "F12.png",
 
-
     KEY_PAGE_DOWN: "PAGE_DOWN.png",
     KEY_PAGE_UP: "PAGE_UP.png",
 
@@ -161,9 +174,13 @@ const cfg_keyboard_qwerty = {
     KEY_RIGHT_BRACKET: "RIGHT_BRACKET.png",
 
     KEY_SEMICOLON: "SEMICOLON.png",
+    KEY_COMMA: "COMMA.png",
+    KEY_PERIOD: "PERIOD.png",
+    KEY_BACK_SLASH: "BACK_SLASH.png",
+    KEY_FORWARD_SLASH: "FORWARD_SLASH.png",
 
     KEY_BACKSPACE: "BACK.png",
-    KEY_ALT: "ALT.png"
+    KEY_ALT: "ALT.png",
   },
   settings: {
     [SettingKeyboard.Button_Up]: Button.UP,
@@ -180,9 +197,9 @@ const cfg_keyboard_qwerty = {
     [SettingKeyboard.Button_Cycle_Gender]: Button.CYCLE_GENDER,
     [SettingKeyboard.Button_Cycle_Ability]: Button.CYCLE_ABILITY,
     [SettingKeyboard.Button_Cycle_Nature]: Button.CYCLE_NATURE,
-    [SettingKeyboard.Button_Cycle_Variant]: Button.V,
     [SettingKeyboard.Button_Speed_Up]: Button.SPEED_UP,
     [SettingKeyboard.Button_Slow_Down]: Button.SLOW_DOWN,
+    [SettingKeyboard.Button_Cycle_Tera]: Button.CYCLE_TERA,
     [SettingKeyboard.Alt_Button_Up]: Button.UP,
     [SettingKeyboard.Alt_Button_Down]: Button.DOWN,
     [SettingKeyboard.Alt_Button_Left]: Button.LEFT,
@@ -197,9 +214,9 @@ const cfg_keyboard_qwerty = {
     [SettingKeyboard.Alt_Button_Cycle_Gender]: Button.CYCLE_GENDER,
     [SettingKeyboard.Alt_Button_Cycle_Ability]: Button.CYCLE_ABILITY,
     [SettingKeyboard.Alt_Button_Cycle_Nature]: Button.CYCLE_NATURE,
-    [SettingKeyboard.Alt_Button_Cycle_Variant]: Button.V,
     [SettingKeyboard.Alt_Button_Speed_Up]: Button.SPEED_UP,
     [SettingKeyboard.Alt_Button_Slow_Down]: Button.SLOW_DOWN,
+    [SettingKeyboard.Alt_Button_Cycle_Tera]: Button.CYCLE_TERA,
   },
   default: {
     KEY_ARROW_UP: SettingKeyboard.Button_Up,
@@ -216,7 +233,7 @@ const cfg_keyboard_qwerty = {
     KEY_G: SettingKeyboard.Button_Cycle_Gender,
     KEY_E: SettingKeyboard.Button_Cycle_Ability,
     KEY_N: SettingKeyboard.Button_Cycle_Nature,
-    KEY_V: SettingKeyboard.Button_Cycle_Variant,
+    KEY_V: SettingKeyboard.Button_Cycle_Tera,
     KEY_PLUS: -1,
     KEY_MINUS: -1,
     KEY_A: SettingKeyboard.Alt_Button_Left,
@@ -274,7 +291,7 @@ const cfg_keyboard_qwerty = {
     KEY_LEFT_BRACKET: -1,
     KEY_RIGHT_BRACKET: -1,
     KEY_SEMICOLON: -1,
-    KEY_ALT: -1
+    KEY_ALT: -1,
   },
   blacklist: [
     "KEY_ENTER",
@@ -287,7 +304,7 @@ const cfg_keyboard_qwerty = {
     "KEY_ARROW_RIGHT",
     "KEY_DEL",
     "KEY_HOME",
-  ]
+  ],
 };
 
 export default cfg_keyboard_qwerty;
diff --git a/src/configs/inputs/configHandler.ts b/src/configs/inputs/configHandler.ts
index 50be692cbc3..b896f303cb3 100644
--- a/src/configs/inputs/configHandler.ts
+++ b/src/configs/inputs/configHandler.ts
@@ -93,7 +93,7 @@ export function getIconWithSettingName(config, settingName) {
 }
 
 export function getIconForLatestInput(configs, source, devices, settingName) {
-  let config;
+  let config: any; // TODO: refine type
   if (source === "gamepad") {
     config = configs[devices[Device.GAMEPAD]];
   } else {
@@ -102,7 +102,7 @@ export function getIconForLatestInput(configs, source, devices, settingName) {
   const icon = getIconWithSettingName(config, settingName);
   if (!icon) {
     const isAlt = settingName.includes("ALT_");
-    let altSettingName;
+    let altSettingName: string;
     if (isAlt) {
       altSettingName = settingName.split("ALT_").splice(1)[0];
     } else {
@@ -115,7 +115,10 @@ export function getIconForLatestInput(configs, source, devices, settingName) {
 
 export function assign(config, settingNameTarget, keycode): boolean {
   // first, we need to check if this keycode is already used on another settingName
-  if (!canIAssignThisKey(config, getKeyWithKeycode(config, keycode)) || !canIOverrideThisSetting(config, settingNameTarget)) {
+  if (
+    !canIAssignThisKey(config, getKeyWithKeycode(config, keycode)) ||
+    !canIOverrideThisSetting(config, settingNameTarget)
+  ) {
     return false;
   }
   const previousSettingName = getSettingNameWithKeycode(config, keycode);
diff --git a/src/configs/inputs/pad_dualshock.ts b/src/configs/inputs/pad_dualshock.ts
index 2fbdd0ddfaa..51af1b2defd 100644
--- a/src/configs/inputs/pad_dualshock.ts
+++ b/src/configs/inputs/pad_dualshock.ts
@@ -24,7 +24,7 @@ const pad_dualshock = {
     LC_S: 13,
     LC_W: 14,
     LC_E: 15,
-    TOUCH: 17
+    TOUCH: 17,
   },
   icons: {
     RC_S: "CROSS.png",
@@ -43,7 +43,7 @@ const pad_dualshock = {
     LC_S: "DOWN.png",
     LC_W: "LEFT.png",
     LC_E: "RIGHT.png",
-    TOUCH: "TOUCH.png"
+    TOUCH: "TOUCH.png",
   },
   settings: {
     [SettingGamepad.Button_Up]: Button.UP,
@@ -53,16 +53,16 @@ const pad_dualshock = {
     [SettingGamepad.Button_Action]: Button.ACTION,
     [SettingGamepad.Button_Cancel]: Button.CANCEL,
     [SettingGamepad.Button_Cycle_Nature]: Button.CYCLE_NATURE,
-    [SettingGamepad.Button_Cycle_Variant]: Button.V,
+    [SettingGamepad.Button_Cycle_Tera]: Button.CYCLE_TERA,
     [SettingGamepad.Button_Menu]: Button.MENU,
     [SettingGamepad.Button_Stats]: Button.STATS,
-    [SettingGamepad.Button_Cycle_Form]:  Button.CYCLE_FORM,
+    [SettingGamepad.Button_Cycle_Form]: Button.CYCLE_FORM,
     [SettingGamepad.Button_Cycle_Shiny]: Button.CYCLE_SHINY,
     [SettingGamepad.Button_Cycle_Gender]: Button.CYCLE_GENDER,
     [SettingGamepad.Button_Cycle_Ability]: Button.CYCLE_ABILITY,
     [SettingGamepad.Button_Speed_Up]: Button.SPEED_UP,
     [SettingGamepad.Button_Slow_Down]: Button.SLOW_DOWN,
-    [SettingGamepad.Button_Submit]: Button.SUBMIT
+    [SettingGamepad.Button_Submit]: Button.SUBMIT,
   },
   default: {
     LC_N: SettingGamepad.Button_Up,
@@ -72,7 +72,7 @@ const pad_dualshock = {
     RC_S: SettingGamepad.Button_Action,
     RC_E: SettingGamepad.Button_Cancel,
     RC_W: SettingGamepad.Button_Cycle_Nature,
-    RC_N: SettingGamepad.Button_Cycle_Variant,
+    RC_N: SettingGamepad.Button_Cycle_Tera,
     START: SettingGamepad.Button_Menu,
     SELECT: SettingGamepad.Button_Stats,
     LB: SettingGamepad.Button_Cycle_Form,
diff --git a/src/configs/inputs/pad_generic.ts b/src/configs/inputs/pad_generic.ts
index 256af8f0fe3..e47b7ce1ace 100644
--- a/src/configs/inputs/pad_generic.ts
+++ b/src/configs/inputs/pad_generic.ts
@@ -23,7 +23,7 @@ const pad_generic = {
     LC_N: 12,
     LC_S: 13,
     LC_W: 14,
-    LC_E: 15
+    LC_E: 15,
   },
   icons: {
     RC_S: "XB_Letter_A_OL.png",
@@ -51,15 +51,15 @@ const pad_generic = {
     [SettingGamepad.Button_Action]: Button.ACTION,
     [SettingGamepad.Button_Cancel]: Button.CANCEL,
     [SettingGamepad.Button_Cycle_Nature]: Button.CYCLE_NATURE,
-    [SettingGamepad.Button_Cycle_Variant]: Button.V,
+    [SettingGamepad.Button_Cycle_Tera]: Button.CYCLE_TERA,
     [SettingGamepad.Button_Menu]: Button.MENU,
     [SettingGamepad.Button_Stats]: Button.STATS,
-    [SettingGamepad.Button_Cycle_Form]:  Button.CYCLE_FORM,
+    [SettingGamepad.Button_Cycle_Form]: Button.CYCLE_FORM,
     [SettingGamepad.Button_Cycle_Shiny]: Button.CYCLE_SHINY,
     [SettingGamepad.Button_Cycle_Gender]: Button.CYCLE_GENDER,
     [SettingGamepad.Button_Cycle_Ability]: Button.CYCLE_ABILITY,
     [SettingGamepad.Button_Speed_Up]: Button.SPEED_UP,
-    [SettingGamepad.Button_Slow_Down]: Button.SLOW_DOWN
+    [SettingGamepad.Button_Slow_Down]: Button.SLOW_DOWN,
   },
   default: {
     LC_N: SettingGamepad.Button_Up,
@@ -69,7 +69,7 @@ const pad_generic = {
     RC_S: SettingGamepad.Button_Action,
     RC_E: SettingGamepad.Button_Cancel,
     RC_W: SettingGamepad.Button_Cycle_Nature,
-    RC_N: SettingGamepad.Button_Cycle_Variant,
+    RC_N: SettingGamepad.Button_Cycle_Tera,
     START: SettingGamepad.Button_Menu,
     SELECT: SettingGamepad.Button_Stats,
     LB: SettingGamepad.Button_Cycle_Form,
@@ -77,14 +77,9 @@ const pad_generic = {
     LT: SettingGamepad.Button_Cycle_Gender,
     RT: SettingGamepad.Button_Cycle_Ability,
     LS: SettingGamepad.Button_Speed_Up,
-    RS: SettingGamepad.Button_Slow_Down
+    RS: SettingGamepad.Button_Slow_Down,
   },
-  blacklist: [
-    "LC_N",
-    "LC_S",
-    "LC_W",
-    "LC_E",
-  ]
+  blacklist: ["LC_N", "LC_S", "LC_W", "LC_E"],
 };
 
 export default pad_generic;
diff --git a/src/configs/inputs/pad_procon.ts b/src/configs/inputs/pad_procon.ts
index 98d17c4ef57..61558c7365e 100644
--- a/src/configs/inputs/pad_procon.ts
+++ b/src/configs/inputs/pad_procon.ts
@@ -52,15 +52,15 @@ const pad_procon = {
     [SettingGamepad.Button_Action]: Button.ACTION,
     [SettingGamepad.Button_Cancel]: Button.CANCEL,
     [SettingGamepad.Button_Cycle_Nature]: Button.CYCLE_NATURE,
-    [SettingGamepad.Button_Cycle_Variant]: Button.V,
+    [SettingGamepad.Button_Cycle_Tera]: Button.CYCLE_TERA,
     [SettingGamepad.Button_Menu]: Button.MENU,
     [SettingGamepad.Button_Stats]: Button.STATS,
-    [SettingGamepad.Button_Cycle_Form]:  Button.CYCLE_FORM,
+    [SettingGamepad.Button_Cycle_Form]: Button.CYCLE_FORM,
     [SettingGamepad.Button_Cycle_Shiny]: Button.CYCLE_SHINY,
     [SettingGamepad.Button_Cycle_Gender]: Button.CYCLE_GENDER,
     [SettingGamepad.Button_Cycle_Ability]: Button.CYCLE_ABILITY,
     [SettingGamepad.Button_Speed_Up]: Button.SPEED_UP,
-    [SettingGamepad.Button_Slow_Down]: Button.SLOW_DOWN
+    [SettingGamepad.Button_Slow_Down]: Button.SLOW_DOWN,
   },
   default: {
     LC_N: SettingGamepad.Button_Up,
@@ -70,7 +70,7 @@ const pad_procon = {
     RC_S: SettingGamepad.Button_Action,
     RC_E: SettingGamepad.Button_Cancel,
     RC_W: SettingGamepad.Button_Cycle_Nature,
-    RC_N: SettingGamepad.Button_Cycle_Variant,
+    RC_N: SettingGamepad.Button_Cycle_Tera,
     START: SettingGamepad.Button_Menu,
     SELECT: SettingGamepad.Button_Stats,
     LB: SettingGamepad.Button_Cycle_Form,
@@ -78,7 +78,7 @@ const pad_procon = {
     LT: SettingGamepad.Button_Cycle_Gender,
     RT: SettingGamepad.Button_Cycle_Ability,
     LS: SettingGamepad.Button_Speed_Up,
-    RS: SettingGamepad.Button_Slow_Down
+    RS: SettingGamepad.Button_Slow_Down,
   },
 };
 
diff --git a/src/configs/inputs/pad_unlicensedSNES.ts b/src/configs/inputs/pad_unlicensedSNES.ts
index 77e68e6a644..d0c4f41c8f5 100644
--- a/src/configs/inputs/pad_unlicensedSNES.ts
+++ b/src/configs/inputs/pad_unlicensedSNES.ts
@@ -7,7 +7,7 @@ import { Button } from "#enums/buttons";
 const pad_unlicensedSNES = {
   padID: "081f-e401",
   padType: "xbox",
-  deviceMapping : {
+  deviceMapping: {
     RC_S: 2,
     RC_E: 1,
     RC_W: 3,
@@ -19,7 +19,7 @@ const pad_unlicensedSNES = {
     LC_N: 12,
     LC_S: 13,
     LC_W: 14,
-    LC_E: 15
+    LC_E: 15,
   },
   icons: {
     RC_S: "XB_Letter_A_OL.png",
@@ -43,15 +43,15 @@ const pad_unlicensedSNES = {
     [SettingGamepad.Button_Action]: Button.ACTION,
     [SettingGamepad.Button_Cancel]: Button.CANCEL,
     [SettingGamepad.Button_Cycle_Nature]: Button.CYCLE_NATURE,
-    [SettingGamepad.Button_Cycle_Variant]: Button.V,
+    [SettingGamepad.Button_Cycle_Tera]: Button.CYCLE_TERA,
     [SettingGamepad.Button_Menu]: Button.MENU,
     [SettingGamepad.Button_Stats]: Button.STATS,
-    [SettingGamepad.Button_Cycle_Form]:  Button.CYCLE_FORM,
+    [SettingGamepad.Button_Cycle_Form]: Button.CYCLE_FORM,
     [SettingGamepad.Button_Cycle_Shiny]: Button.CYCLE_SHINY,
     [SettingGamepad.Button_Cycle_Gender]: Button.CYCLE_GENDER,
     [SettingGamepad.Button_Cycle_Ability]: Button.CYCLE_ABILITY,
     [SettingGamepad.Button_Speed_Up]: Button.SPEED_UP,
-    [SettingGamepad.Button_Slow_Down]: Button.SLOW_DOWN
+    [SettingGamepad.Button_Slow_Down]: Button.SLOW_DOWN,
   },
   default: {
     LC_N: SettingGamepad.Button_Up,
@@ -61,7 +61,7 @@ const pad_unlicensedSNES = {
     RC_S: SettingGamepad.Button_Action,
     RC_E: SettingGamepad.Button_Cancel,
     RC_W: SettingGamepad.Button_Cycle_Nature,
-    RC_N: SettingGamepad.Button_Cycle_Variant,
+    RC_N: SettingGamepad.Button_Cycle_Tera,
     START: SettingGamepad.Button_Menu,
     SELECT: SettingGamepad.Button_Stats,
     LB: SettingGamepad.Button_Cycle_Form,
@@ -69,7 +69,7 @@ const pad_unlicensedSNES = {
     LT: -1,
     RT: -1,
     LS: -1,
-    RS: -1
+    RS: -1,
   },
 };
 
diff --git a/src/configs/inputs/pad_xbox360.ts b/src/configs/inputs/pad_xbox360.ts
index 6afc452f50b..60cbd9ab181 100644
--- a/src/configs/inputs/pad_xbox360.ts
+++ b/src/configs/inputs/pad_xbox360.ts
@@ -23,7 +23,7 @@ const pad_xbox360 = {
     LC_N: 12,
     LC_S: 13,
     LC_W: 14,
-    LC_E: 15
+    LC_E: 15,
   },
   icons: {
     RC_S: "XB_Letter_A_OL.png",
@@ -51,15 +51,15 @@ const pad_xbox360 = {
     [SettingGamepad.Button_Action]: Button.ACTION,
     [SettingGamepad.Button_Cancel]: Button.CANCEL,
     [SettingGamepad.Button_Cycle_Nature]: Button.CYCLE_NATURE,
-    [SettingGamepad.Button_Cycle_Variant]: Button.V,
+    [SettingGamepad.Button_Cycle_Tera]: Button.CYCLE_TERA,
     [SettingGamepad.Button_Menu]: Button.MENU,
     [SettingGamepad.Button_Stats]: Button.STATS,
-    [SettingGamepad.Button_Cycle_Form]:  Button.CYCLE_FORM,
+    [SettingGamepad.Button_Cycle_Form]: Button.CYCLE_FORM,
     [SettingGamepad.Button_Cycle_Shiny]: Button.CYCLE_SHINY,
     [SettingGamepad.Button_Cycle_Gender]: Button.CYCLE_GENDER,
     [SettingGamepad.Button_Cycle_Ability]: Button.CYCLE_ABILITY,
     [SettingGamepad.Button_Speed_Up]: Button.SPEED_UP,
-    [SettingGamepad.Button_Slow_Down]: Button.SLOW_DOWN
+    [SettingGamepad.Button_Slow_Down]: Button.SLOW_DOWN,
   },
   default: {
     LC_N: SettingGamepad.Button_Up,
@@ -69,7 +69,7 @@ const pad_xbox360 = {
     RC_S: SettingGamepad.Button_Action,
     RC_E: SettingGamepad.Button_Cancel,
     RC_W: SettingGamepad.Button_Cycle_Nature,
-    RC_N: SettingGamepad.Button_Cycle_Variant,
+    RC_N: SettingGamepad.Button_Cycle_Tera,
     START: SettingGamepad.Button_Menu,
     SELECT: SettingGamepad.Button_Stats,
     LB: SettingGamepad.Button_Cycle_Form,
@@ -77,7 +77,7 @@ const pad_xbox360 = {
     LT: SettingGamepad.Button_Cycle_Gender,
     RT: SettingGamepad.Button_Cycle_Ability,
     LS: SettingGamepad.Button_Speed_Up,
-    RS: SettingGamepad.Button_Slow_Down
+    RS: SettingGamepad.Button_Slow_Down,
   },
 };
 
diff --git a/src/constants.ts b/src/constants.ts
index 63f00b9f33f..d3594c389b6 100644
--- a/src/constants.ts
+++ b/src/constants.ts
@@ -2,10 +2,18 @@
 export const PLAYER_PARTY_MAX_SIZE: number = 6;
 
 /** Whether to use seasonal splash messages in general */
-export const USE_SEASONAL_SPLASH_MESSAGES: boolean = false;
+export const USE_SEASONAL_SPLASH_MESSAGES: boolean = true;
 
 /** Name of the session ID cookie */
 export const SESSION_ID_COOKIE_NAME: string = "pokerogue_sessionId";
 
 /** Max value for an integer attribute in {@linkcode SystemSaveData} */
 export const MAX_INT_ATTR_VALUE = 0x80000000;
+
+/** The min and max waves for mystery encounters to spawn in classic mode */
+export const CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES: [number, number] = [10, 180] as const;
+/** The min and max waves for mystery encounters to spawn in challenge mode */
+export const CHALLENGE_MODE_MYSTERY_ENCOUNTER_WAVES: [number, number] = [10, 180] as const;
+
+/** The raw percentage power boost for type boost items*/
+export const TYPE_BOOST_ITEM_BOOST_PERCENT = 20;
diff --git a/src/data/abilities/ab-attrs/ab-attr.ts b/src/data/abilities/ab-attrs/ab-attr.ts
new file mode 100644
index 00000000000..24fbb6dc338
--- /dev/null
+++ b/src/data/abilities/ab-attrs/ab-attr.ts
@@ -0,0 +1,58 @@
+import type { AbAttrCondition } from "#app/@types/ability-types";
+import type Pokemon from "#app/field/pokemon";
+import type { BooleanHolder } from "#app/utils/common";
+
+export abstract class AbAttr {
+  public showAbility: boolean;
+  private extraCondition: AbAttrCondition;
+
+  /**
+   * @param showAbility - Whether to show this ability as a flyout during battle; default `true`.
+   * Should be kept in parity with mainline where possible.
+   */
+  constructor(showAbility = true) {
+    this.showAbility = showAbility;
+  }
+
+  /**
+   * Applies ability effects without checking conditions
+   * @param _pokemon - The pokemon to apply this ability to
+   * @param _passive - Whether or not the ability is a passive
+   * @param _simulated - Whether the call is simulated
+   * @param _args - Extra args passed to the function. Handled by child classes.
+   * @see {@linkcode canApply}
+   */
+  apply(
+    _pokemon: Pokemon,
+    _passive: boolean,
+    _simulated: boolean,
+    _cancelled: BooleanHolder | null,
+    _args: any[],
+  ): void {}
+
+  getTriggerMessage(_pokemon: Pokemon, _abilityName: string, ..._args: any[]): string | null {
+    return null;
+  }
+
+  getCondition(): AbAttrCondition | null {
+    return this.extraCondition || null;
+  }
+
+  addCondition(condition: AbAttrCondition): AbAttr {
+    this.extraCondition = condition;
+    return this;
+  }
+
+  /**
+   * Returns a boolean describing whether the ability can be applied under current conditions
+   * @param _pokemon - The pokemon to apply this ability to
+   * @param _passive - Whether or not the ability is a passive
+   * @param _simulated - Whether the call is simulated
+   * @param _args - Extra args passed to the function. Handled by child classes.
+   * @returns `true` if the ability can be applied, `false` otherwise
+   * @see {@linkcode apply}
+   */
+  canApply(_pokemon: Pokemon, _passive: boolean, _simulated: boolean, _args: any[]): boolean {
+    return true;
+  }
+}
diff --git a/src/data/abilities/ability-class.ts b/src/data/abilities/ability-class.ts
new file mode 100644
index 00000000000..387c5fb328b
--- /dev/null
+++ b/src/data/abilities/ability-class.ts
@@ -0,0 +1,137 @@
+import { Abilities } from "#enums/abilities";
+import type { AbAttrCondition } from "#app/@types/ability-types";
+import type { AbAttr } from "#app/data/abilities/ab-attrs/ab-attr";
+import i18next from "i18next";
+import type { Localizable } from "#app/interfaces/locales";
+import type { Constructor } from "#app/utils/common";
+
+export class Ability implements Localizable {
+  public id: Abilities;
+
+  private nameAppend: string;
+  public name: string;
+  public description: string;
+  public generation: number;
+  public isBypassFaint: boolean;
+  public isIgnorable: boolean;
+  public isSuppressable = true;
+  public isCopiable = true;
+  public isReplaceable = true;
+  public attrs: AbAttr[];
+  public conditions: AbAttrCondition[];
+
+  constructor(id: Abilities, generation: number) {
+    this.id = id;
+
+    this.nameAppend = "";
+    this.generation = generation;
+    this.attrs = [];
+    this.conditions = [];
+
+    this.isSuppressable = true;
+    this.isCopiable = true;
+    this.isReplaceable = true;
+
+    this.localize();
+  }
+
+  public get isSwappable(): boolean {
+    return this.isCopiable && this.isReplaceable;
+  }
+  localize(): void {
+    const i18nKey = Abilities[this.id]
+      .split("_")
+      .filter(f => f)
+      .map((f, i) => (i ? `${f[0]}${f.slice(1).toLowerCase()}` : f.toLowerCase()))
+      .join("") as string;
+
+    this.name = this.id ? `${i18next.t(`ability:${i18nKey}.name`) as string}${this.nameAppend}` : "";
+    this.description = this.id ? (i18next.t(`ability:${i18nKey}.description`) as string) : "";
+  }
+
+  /**
+   * Get all ability attributes that match `attrType`
+   * @param attrType any attribute that extends {@linkcode AbAttr}
+   * @returns Array of attributes that match `attrType`, Empty Array if none match.
+   */
+  getAttrs<T extends AbAttr>(attrType: Constructor<T>): T[] {
+    return this.attrs.filter((a): a is T => a instanceof attrType);
+  }
+
+  /**
+   * Check if an ability has an attribute that matches `attrType`
+   * @param attrType any attribute that extends {@linkcode AbAttr}
+   * @returns true if the ability has attribute `attrType`
+   */
+  hasAttr<T extends AbAttr>(attrType: Constructor<T>): boolean {
+    return this.attrs.some(attr => attr instanceof attrType);
+  }
+
+  attr<T extends Constructor<AbAttr>>(AttrType: T, ...args: ConstructorParameters<T>): Ability {
+    const attr = new AttrType(...args);
+    this.attrs.push(attr);
+
+    return this;
+  }
+
+  conditionalAttr<T extends Constructor<AbAttr>>(
+    condition: AbAttrCondition,
+    AttrType: T,
+    ...args: ConstructorParameters<T>
+  ): Ability {
+    const attr = new AttrType(...args);
+    attr.addCondition(condition);
+    this.attrs.push(attr);
+
+    return this;
+  }
+
+  bypassFaint(): Ability {
+    this.isBypassFaint = true;
+    return this;
+  }
+
+  ignorable(): Ability {
+    this.isIgnorable = true;
+    return this;
+  }
+
+  unsuppressable(): Ability {
+    this.isSuppressable = false;
+    return this;
+  }
+
+  uncopiable(): Ability {
+    this.isCopiable = false;
+    return this;
+  }
+
+  unreplaceable(): Ability {
+    this.isReplaceable = false;
+    return this;
+  }
+
+  condition(condition: AbAttrCondition): Ability {
+    this.conditions.push(condition);
+
+    return this;
+  }
+
+  partial(): this {
+    this.nameAppend += " (P)";
+    return this;
+  }
+
+  unimplemented(): this {
+    this.nameAppend += " (N)";
+    return this;
+  }
+
+  /**
+   * Internal flag used for developers to document edge cases. When using this, please be sure to document the edge case.
+   * @returns the ability
+   */
+  edgeCase(): this {
+    return this;
+  }
+}
diff --git a/src/data/ability.ts b/src/data/abilities/ability.ts
similarity index 52%
rename from src/data/ability.ts
rename to src/data/abilities/ability.ts
index c19b6fe9ba4..ff86937622b 100644
--- a/src/data/ability.ts
+++ b/src/data/abilities/ability.ts
@@ -1,190 +1,93 @@
-import type { EnemyPokemon } from "../field/pokemon";
-import type Pokemon from "../field/pokemon";
-import { HitResult, MoveResult, PlayerPokemon, PokemonMove } from "../field/pokemon";
-import { Type } from "#enums/type";
-import type { Constructor } from "#app/utils";
-import * as Utils from "../utils";
-import { getPokemonNameWithAffix } from "../messages";
-import type { Weather } from "#app/data/weather";
-import type { BattlerTag } from "./battler-tags";
-import { BattlerTagLapseType, GroundedTag } from "./battler-tags";
+import { HitResult, MoveResult, PlayerPokemon } from "#app/field/pokemon";
+import { BooleanHolder, NumberHolder, toDmgValue, isNullOrUndefined, randSeedItem, randSeedInt, type Constructor } from "#app/utils/common";
+import { getPokemonNameWithAffix } from "#app/messages";
+import { BattlerTagLapseType, GroundedTag } from "#app/data/battler-tags";
 import { getNonVolatileStatusEffects, getStatusEffectDescriptor, getStatusEffectHealText } from "#app/data/status-effect";
-import { Gender } from "./gender";
-import type Move from "./move";
-import { AttackMove, MoveCategory, MoveFlags, MoveTarget, FlinchAttr, OneHitKOAttr, HitHealAttr, allMoves, StatusMove, SelfStatusMove, VariablePowerAttr, applyMoveAttrs, VariableMoveTypeAttr, RandomMovesetMoveAttr, RandomMoveAttr, NaturePowerAttr, CopyMoveAttr, NeutralDamageAgainstFlyingTypeMultiplierAttr, FixedDamageAttr } from "./move";
-import type { ArenaTrapTag } from "./arena-tag";
-import { ArenaTagSide } from "./arena-tag";
-import { BerryModifier, HitHealModifier, PokemonHeldItemModifier } from "../modifier/modifier";
-import { TerrainType } from "./terrain";
-import { SpeciesFormChangeAbilityTrigger, SpeciesFormChangeRevertWeatherFormTrigger, SpeciesFormChangeWeatherTrigger } from "./pokemon-forms";
+import { Gender } from "#app/data/gender";
+import {
+  AttackMove,
+  FlinchAttr,
+  OneHitKOAttr,
+  HitHealAttr,
+  allMoves,
+  StatusMove,
+  SelfStatusMove,
+  VariablePowerAttr,
+  applyMoveAttrs,
+  RandomMovesetMoveAttr,
+  RandomMoveAttr,
+  NaturePowerAttr,
+  CopyMoveAttr,
+  NeutralDamageAgainstFlyingTypeMultiplierAttr,
+  FixedDamageAttr,
+} from "#app/data/moves/move";
+import { ArenaTagSide } from "#app/data/arena-tag";
+import { BerryModifier, HitHealModifier, PokemonHeldItemModifier } from "#app/modifier/modifier";
+import { TerrainType } from "#app/data/terrain";
+import { SpeciesFormChangeAbilityTrigger, SpeciesFormChangeRevertWeatherFormTrigger, SpeciesFormChangeWeatherTrigger } from "#app/data/pokemon-forms";
 import i18next from "i18next";
-import type { Localizable } from "#app/interfaces/locales";
-import { Command } from "../ui/command-ui-handler";
+import { Command } from "#app/ui/command-ui-handler";
 import { BerryModifierType } from "#app/modifier/modifier-type";
-import { getPokeballName } from "./pokeball";
-import type { BattlerIndex } from "#app/battle";
-import { BattleType } from "#app/battle";
-import { Abilities } from "#enums/abilities";
-import { ArenaTagType } from "#enums/arena-tag-type";
-import { BattlerTagType } from "#enums/battler-tag-type";
-import { Moves } from "#enums/moves";
-import { Species } from "#enums/species";
-import { Stat, type BattleStat, type EffectiveStat, BATTLE_STATS, EFFECTIVE_STATS, getStatKey } from "#app/enums/stat";
+import { getPokeballName } from "#app/data/pokeball";
+import { BattleType } from "#enums/battle-type";
 import { MovePhase } from "#app/phases/move-phase";
 import { PokemonHealPhase } from "#app/phases/pokemon-heal-phase";
-import { ShowAbilityPhase } from "#app/phases/show-ability-phase";
 import { StatStageChangePhase } from "#app/phases/stat-stage-change-phase";
 import { globalScene } from "#app/global-scene";
-import { SwitchType } from "#app/enums/switch-type";
 import { SwitchPhase } from "#app/phases/switch-phase";
 import { SwitchSummonPhase } from "#app/phases/switch-summon-phase";
 import { BattleEndPhase } from "#app/phases/battle-end-phase";
 import { NewBattlePhase } from "#app/phases/new-battle-phase";
 import { MoveEndPhase } from "#app/phases/move-end-phase";
+import { PokemonTransformPhase } from "#app/phases/pokemon-transform-phase";
+import { allAbilities } from "#app/data/data-lists";
+import { AbAttr } from "#app/data/abilities/ab-attrs/ab-attr";
+import { Ability } from "#app/data/abilities/ability-class";
+
+// Enum imports
+import { Stat, type BattleStat, BATTLE_STATS, EFFECTIVE_STATS, getStatKey, type EffectiveStat } from "#enums/stat";
+import { PokemonType } from "#enums/pokemon-type";
 import { PokemonAnimType } from "#enums/pokemon-anim-type";
 import { StatusEffect } from "#enums/status-effect";
 import { WeatherType } from "#enums/weather-type";
+import { Abilities } from "#enums/abilities";
+import { ArenaTagType } from "#enums/arena-tag-type";
+import { BattlerTagType } from "#enums/battler-tag-type";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import { SwitchType } from "#enums/switch-type";
+import { MoveFlags } from "#enums/MoveFlags";
+import { MoveTarget } from "#enums/MoveTarget";
+import { MoveCategory } from "#enums/MoveCategory";
+import type { BerryType } from "#enums/berry-type";
+import { CommonAnimPhase } from "#app/phases/common-anim-phase";
+import { CommonAnim } from "../battle-anims";
+import { getBerryEffectFunc } from "../berry";
+import { BerryUsedEvent } from "#app/events/battle-scene";
 
-export class Ability implements Localizable {
-  public id: Abilities;
 
-  private nameAppend: string;
-  public name: string;
-  public description: string;
-  public generation: number;
-  public isBypassFaint: boolean;
-  public isIgnorable: boolean;
-  public attrs: AbAttr[];
-  public conditions: AbAttrCondition[];
-
-  constructor(id: Abilities, generation: number) {
-    this.id = id;
-
-    this.nameAppend = "";
-    this.generation = generation;
-    this.attrs = [];
-    this.conditions = [];
-
-    this.localize();
-  }
-
-  localize(): void {
-    const i18nKey = Abilities[this.id].split("_").filter(f => f).map((f, i) => i ? `${f[0]}${f.slice(1).toLowerCase()}` : f.toLowerCase()).join("") as string;
-
-    this.name = this.id ? `${i18next.t(`ability:${i18nKey}.name`) as string}${this.nameAppend}` : "";
-    this.description = this.id ? i18next.t(`ability:${i18nKey}.description`) as string : "";
-  }
-
-  /**
-   * Get all ability attributes that match `attrType`
-   * @param attrType any attribute that extends {@linkcode AbAttr}
-   * @returns Array of attributes that match `attrType`, Empty Array if none match.
-   */
-  getAttrs<T extends AbAttr>(attrType: Constructor<T> ): T[] {
-    return this.attrs.filter((a): a is T => a instanceof attrType);
-  }
-
-  /**
-   * Check if an ability has an attribute that matches `attrType`
-   * @param attrType any attribute that extends {@linkcode AbAttr}
-   * @returns true if the ability has attribute `attrType`
-   */
-  hasAttr<T extends AbAttr>(attrType: Constructor<T>): boolean {
-    return this.attrs.some((attr) => attr instanceof attrType);
-  }
-
-  attr<T extends Constructor<AbAttr>>(AttrType: T, ...args: ConstructorParameters<T>): Ability {
-    const attr = new AttrType(...args);
-    this.attrs.push(attr);
-
-    return this;
-  }
-
-  conditionalAttr<T extends Constructor<AbAttr>>(condition: AbAttrCondition, AttrType: T, ...args: ConstructorParameters<T>): Ability {
-    const attr = new AttrType(...args);
-    attr.addCondition(condition);
-    this.attrs.push(attr);
-
-    return this;
-  }
-
-  bypassFaint(): Ability {
-    this.isBypassFaint = true;
-    return this;
-  }
-
-  ignorable(): Ability {
-    this.isIgnorable = true;
-    return this;
-  }
-
-  condition(condition: AbAttrCondition): Ability {
-    this.conditions.push(condition);
-
-    return this;
-  }
-
-  partial(): this {
-    this.nameAppend += " (P)";
-    return this;
-  }
-
-  unimplemented(): this {
-    this.nameAppend += " (N)";
-    return this;
-  }
-
-  /**
-   * Internal flag used for developers to document edge cases. When using this, please be sure to document the edge case.
-   * @returns the ability
-   */
-  edgeCase(): this {
-    return this;
-  }
-}
-
-type AbAttrApplyFunc<TAttr extends AbAttr> = (attr: TAttr, passive: boolean) => boolean | Promise<boolean>;
-type AbAttrCondition = (pokemon: Pokemon) => boolean;
-
-// TODO: Can this be improved?
-type PokemonAttackCondition = (user: Pokemon | null, target: Pokemon | null, move: Move) => boolean;
-type PokemonDefendCondition = (target: Pokemon, user: Pokemon, move: Move) => boolean;
-type PokemonStatStageChangeCondition = (target: Pokemon, statsChanged: BattleStat[], stages: number) => boolean;
-
-export abstract class AbAttr {
-  public showAbility: boolean;
-  private extraCondition: AbAttrCondition;
-
-  constructor(showAbility: boolean = true) {
-    this.showAbility = showAbility;
-  }
-
-  apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder | null, args: any[]): boolean | Promise<boolean> {
-    return false;
-  }
-
-  getTriggerMessage(_pokemon: Pokemon, _abilityName: string, ..._args: any[]): string | null {
-    return null;
-  }
-
-  getCondition(): AbAttrCondition | null {
-    return this.extraCondition || null;
-  }
-
-  addCondition(condition: AbAttrCondition): AbAttr {
-    this.extraCondition = condition;
-    return this;
-  }
-}
+// Type imports
+import type { EnemyPokemon, PokemonMove } from "#app/field/pokemon";
+import type Pokemon from "#app/field/pokemon";
+import type { Weather } from "#app/data/weather";
+import type { BattlerTag } from "#app/data/battler-tags";
+import type { AbAttrCondition, PokemonDefendCondition, PokemonStatStageChangeCondition, PokemonAttackCondition, AbAttrApplyFunc, AbAttrSuccessFunc } from "#app/@types/ability-types";
+import type { BattlerIndex } from "#app/battle";
+import type Move from "#app/data/moves/move";
+import type { ArenaTrapTag, SuppressAbilitiesTag } from "#app/data/arena-tag";
+import { SelectBiomePhase } from "#app/phases/select-biome-phase";
+import { noAbilityTypeOverrideMoves } from "../moves/invalid-moves";
 
 export class BlockRecoilDamageAttr extends AbAttr {
-  apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean {
-    cancelled.value = true;
-
-    return true;
+  constructor() {
+    super(false);
   }
 
-  getTriggerMessage(pokemon: Pokemon, abilityName: string, ...args: any[]) {
+  override apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: BooleanHolder, args: any[]): void {
+    cancelled.value = true;
+  }
+
+  getTriggerMessage(pokemon: Pokemon, abilityName: string, ..._args: any[]) {
     return i18next.t("abilityTriggers:blockRecoilDamage", { pokemonName: getPokemonNameWithAffix(pokemon), abilityName: abilityName });
   }
 }
@@ -192,7 +95,7 @@ export class BlockRecoilDamageAttr extends AbAttr {
 /**
  * Attribute for abilities that increase the chance of a double battle
  * occurring.
- * @see apply
+ * @see {@linkcode apply}
  */
 export class DoubleBattleChanceAbAttr extends AbAttr {
   constructor() {
@@ -201,107 +104,161 @@ export class DoubleBattleChanceAbAttr extends AbAttr {
 
   /**
    * Increases the chance of a double battle occurring
-   * @param args [0] {@linkcode Utils.NumberHolder} for double battle chance
-   * @returns true if the ability was applied
+   * @param args [0] {@linkcode NumberHolder} for double battle chance
    */
-  apply(_pokemon: Pokemon, _passive: boolean, _simulated: boolean, _cancelled: Utils.BooleanHolder, args: any[]): boolean {
-    const doubleBattleChance = args[0] as Utils.NumberHolder;
+  override apply(_pokemon: Pokemon, _passive: boolean, _simulated: boolean, _cancelled: BooleanHolder, args: any[]): void {
+    const doubleBattleChance = args[0] as NumberHolder;
     // This is divided because the chance is generated as a number from 0 to doubleBattleChance.value using Utils.randSeedInt
     // A double battle will initiate if the generated number is 0
     doubleBattleChance.value = doubleBattleChance.value / 4;
-
-    return true;
   }
 }
 
 export class PostBattleInitAbAttr extends AbAttr {
-  applyPostBattleInit(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean | Promise<boolean> {
-    return false;
+  canApplyPostBattleInit(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean {
+    return true;
   }
+
+  applyPostBattleInit(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): void {}
 }
 
 export class PostBattleInitFormChangeAbAttr extends PostBattleInitAbAttr {
   private formFunc: (p: Pokemon) => number;
 
   constructor(formFunc: ((p: Pokemon) => number)) {
-    super(true);
+    super(false);
 
     this.formFunc = formFunc;
   }
 
-  applyPostBattleInit(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean {
+  override canApplyPostBattleInit(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean {
     const formIndex = this.formFunc(pokemon);
-    if (formIndex !== pokemon.formIndex && !simulated) {
-      return globalScene.triggerPokemonFormChange(pokemon, SpeciesFormChangeAbilityTrigger, false);
-    }
+    return formIndex !== pokemon.formIndex && !simulated;
+  }
 
-    return false;
+  override applyPostBattleInit(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): void {
+    globalScene.triggerPokemonFormChange(pokemon, SpeciesFormChangeAbilityTrigger, false);
   }
 }
 
-export class PostBattleInitStatStageChangeAbAttr extends PostBattleInitAbAttr {
+export class PostTeraFormChangeStatChangeAbAttr extends AbAttr {
   private stats: BattleStat[];
   private stages: number;
-  private selfTarget: boolean;
 
-  constructor(stats: BattleStat[], stages: number, selfTarget?: boolean) {
+  constructor(stats: BattleStat[], stages: number) {
     super();
 
     this.stats = stats;
     this.stages = stages;
-    this.selfTarget = !!selfTarget;
   }
 
-  applyPostBattleInit(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean {
+  override apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: BooleanHolder | null, args: any[]): void {
     const statStageChangePhases: StatStageChangePhase[] = [];
 
     if (!simulated) {
-      if (this.selfTarget) {
-        statStageChangePhases.push(new StatStageChangePhase(pokemon.getBattlerIndex(), true, this.stats, this.stages));
-      } else {
-        for (const opponent of pokemon.getOpponents()) {
-          statStageChangePhases.push(new StatStageChangePhase(opponent.getBattlerIndex(), false, this.stats, this.stages));
-        }
-      }
+      statStageChangePhases.push(new StatStageChangePhase(pokemon.getBattlerIndex(), true, this.stats, this.stages));
 
       for (const statStageChangePhase of statStageChangePhases) {
-        if (!this.selfTarget && !statStageChangePhase.getPokemon()?.summonData) {
-          globalScene.pushPhase(statStageChangePhase);
-        } else { // TODO: This causes the ability bar to be shown at the wrong time
-          globalScene.unshiftPhase(statStageChangePhase);
-        }
+        globalScene.unshiftPhase(statStageChangePhase);
       }
     }
+  }
+}
 
-    return true;
+/**
+ * Clears a specified weather whenever this attribute is called.
+ */
+export class ClearWeatherAbAttr extends AbAttr {
+  private weather: WeatherType[];
+
+  /**
+   * @param weather {@linkcode WeatherType[]} - the weather to be removed
+   */
+  constructor(weather: WeatherType[]) {
+    super(true);
+
+    this.weather = weather;
+  }
+
+  public override canApply(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean {
+    return globalScene.arena.canSetWeather(WeatherType.NONE);
+  }
+
+  public override apply(pokemon: Pokemon, passive: boolean, simulated:boolean, cancelled: BooleanHolder, args: any[]): void {
+    if (!simulated) {
+      globalScene.arena.trySetWeather(WeatherType.NONE, pokemon);
+    }
+  }
+}
+
+/**
+ * Clears a specified terrain whenever this attribute is called.
+ */
+export class ClearTerrainAbAttr extends AbAttr {
+  private terrain: TerrainType[];
+
+  /**
+   * @param terrain {@linkcode TerrainType[]} - the terrain to be removed
+   */
+  constructor(terrain: TerrainType[]) {
+    super(true);
+
+    this.terrain = terrain;
+  }
+
+  public override canApply(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean {
+    return globalScene.arena.canSetTerrain(TerrainType.NONE);
+  }
+
+  public override apply(pokemon: Pokemon, passive: boolean, simulated:boolean, cancelled: BooleanHolder, args: any[]): void {
+    if (!simulated) {
+      globalScene.arena.trySetTerrain(TerrainType.NONE, true, pokemon);
+    }
   }
 }
 
 type PreDefendAbAttrCondition = (pokemon: Pokemon, attacker: Pokemon, move: Move) => boolean;
 
 export class PreDefendAbAttr extends AbAttr {
-  applyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move | null, cancelled: Utils.BooleanHolder | null, args: any[]): boolean | Promise<boolean> {
-    return false;
+  canApplyPreDefend(
+    pokemon: Pokemon,
+    passive: boolean,
+    simulated: boolean,
+    attacker: Pokemon,
+    move: Move | null,
+    cancelled: BooleanHolder | null,
+    args: any[]): boolean {
+    return true;
   }
+
+  applyPreDefend(
+    pokemon: Pokemon,
+    passive: boolean,
+    simulated: boolean,
+    attacker: Pokemon,
+    move: Move | null,
+    cancelled: BooleanHolder | null,
+    args: any[],
+  ): void {}
 }
 
 export class PreDefendFullHpEndureAbAttr extends PreDefendAbAttr {
-  applyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, cancelled: Utils.BooleanHolder, args: any[]): boolean {
-    if (pokemon.isFullHp()
-        && pokemon.getMaxHp() > 1 //Checks if pokemon has wonder_guard (which forces 1hp)
-        && (args[0] as Utils.NumberHolder).value >= pokemon.hp) { //Damage >= hp
-      return simulated || pokemon.addTag(BattlerTagType.STURDY, 1);
-    }
+  override canApplyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move | null, cancelled: BooleanHolder | null, args: any[]): boolean {
+    return pokemon.isFullHp()
+    && pokemon.getMaxHp() > 1 //Checks if pokemon has wonder_guard (which forces 1hp)
+    && (args[0] as NumberHolder).value >= pokemon.hp; //Damage >= hp
+  }
 
-    return false;
+  override applyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, cancelled: BooleanHolder, args: any[]): void {
+    if (!simulated) {
+      pokemon.addTag(BattlerTagType.STURDY, 1);
+    }
   }
 }
 
 export class BlockItemTheftAbAttr extends AbAttr {
-  apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean {
+  override apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: BooleanHolder, args: any[]): void {
     cancelled.value = true;
-
-    return true;
   }
 
   getTriggerMessage(pokemon: Pokemon, abilityName: string, ...args: any[]) {
@@ -313,13 +270,16 @@ export class BlockItemTheftAbAttr extends AbAttr {
 }
 
 export class StabBoostAbAttr extends AbAttr {
-  apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean {
-    if ((args[0] as Utils.NumberHolder).value > 1) {
-      (args[0] as Utils.NumberHolder).value += 0.5;
-      return true;
-    }
+  constructor() {
+    super(false);
+  }
 
-    return false;
+  override canApply(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean {
+    return (args[0] as NumberHolder).value > 1;
+  }
+
+  override apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: BooleanHolder, args: any[]): void {
+    (args[0] as NumberHolder).value += 0.5;
   }
 }
 
@@ -327,21 +287,19 @@ export class ReceivedMoveDamageMultiplierAbAttr extends PreDefendAbAttr {
   protected condition: PokemonDefendCondition;
   private damageMultiplier: number;
 
-  constructor(condition: PokemonDefendCondition, damageMultiplier: number) {
-    super();
+  constructor(condition: PokemonDefendCondition, damageMultiplier: number, showAbility: boolean = false) {
+    super(showAbility);
 
     this.condition = condition;
     this.damageMultiplier = damageMultiplier;
   }
 
-  applyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, cancelled: Utils.BooleanHolder, args: any[]): boolean {
-    if (this.condition(pokemon, attacker, move)) {
-      (args[0] as Utils.NumberHolder).value = Utils.toDmgValue((args[0] as Utils.NumberHolder).value * this.damageMultiplier);
+  override canApplyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, cancelled: BooleanHolder | null, args: any[]): boolean {
+    return this.condition(pokemon, attacker, move);
+  }
 
-      return true;
-    }
-
-    return false;
+  override applyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, cancelled: BooleanHolder, args: any[]): void {
+    (args[0] as NumberHolder).value = toDmgValue((args[0] as NumberHolder).value * this.damageMultiplier);
   }
 }
 
@@ -360,18 +318,17 @@ export class AlliedFieldDamageReductionAbAttr extends PreDefendAbAttr {
   /**
    * Handles the damage reduction
    * @param args
-   * - `[0]` {@linkcode Utils.NumberHolder} - The damage being dealt
+   * - `[0]` {@linkcode NumberHolder} - The damage being dealt
    */
-  override applyPreDefend(_pokemon: Pokemon, _passive: boolean, _simulated: boolean, _attacker: Pokemon, _move: Move, _cancelled: Utils.BooleanHolder, args: any[]): boolean {
-    const damage = args[0] as Utils.NumberHolder;
-    damage.value = Utils.toDmgValue(damage.value * this.damageMultiplier);
-    return true;
+  override applyPreDefend(_pokemon: Pokemon, _passive: boolean, _simulated: boolean, _attacker: Pokemon, _move: Move, _cancelled: BooleanHolder, args: any[]): void {
+    const damage = args[0] as NumberHolder;
+    damage.value = toDmgValue(damage.value * this.damageMultiplier);
   }
 }
 
 export class ReceivedTypeDamageMultiplierAbAttr extends ReceivedMoveDamageMultiplierAbAttr {
-  constructor(moveType: Type, damageMultiplier: number) {
-    super((target, user, move) => user.getMoveType(move) === moveType, damageMultiplier);
+  constructor(moveType: PokemonType, damageMultiplier: number) {
+    super((target, user, move) => user.getMoveType(move) === moveType, damageMultiplier, false);
   }
 }
 
@@ -382,39 +339,35 @@ export class ReceivedTypeDamageMultiplierAbAttr extends ReceivedMoveDamageMultip
  * @see {@linkcode getCondition}
  */
 export class TypeImmunityAbAttr extends PreDefendAbAttr {
-  private immuneType: Type | null;
+  private immuneType: PokemonType | null;
   private condition: AbAttrCondition | null;
 
-  constructor(immuneType: Type | null, condition?: AbAttrCondition) {
-    super();
+  constructor(immuneType: PokemonType | null, condition?: AbAttrCondition) {
+    super(true);
 
     this.immuneType = immuneType;
     this.condition = condition ?? null;
   }
 
+  override canApplyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, cancelled: BooleanHolder | null, args: any[]): boolean {
+    return ![ MoveTarget.BOTH_SIDES, MoveTarget.ENEMY_SIDE, MoveTarget.USER_SIDE ].includes(move.moveTarget) && attacker !== pokemon && attacker.getMoveType(move) === this.immuneType;
+  }
+
   /**
    * Applies immunity if this ability grants immunity to the type of the given move.
    * @param pokemon {@linkcode Pokemon} The defending Pokemon.
    * @param passive - Whether the ability is passive.
    * @param attacker {@linkcode Pokemon} The attacking Pokemon.
    * @param move {@linkcode Move} The attacking move.
-   * @param cancelled {@linkcode Utils.BooleanHolder} - A holder for a boolean value indicating if the move was cancelled.
-   * @param args [0] {@linkcode Utils.NumberHolder} gets set to 0 if move is immuned by an ability.
+   * @param cancelled {@linkcode BooleanHolder} - A holder for a boolean value indicating if the move was cancelled.
+   * @param args [0] {@linkcode NumberHolder} gets set to 0 if move is immuned by an ability.
    * @param args [1] - Whether the move is simulated.
    */
-  applyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, cancelled: Utils.BooleanHolder, args: any[]): boolean {
-    // Field moves should ignore immunity
-    if ([ MoveTarget.BOTH_SIDES, MoveTarget.ENEMY_SIDE, MoveTarget.USER_SIDE ].includes(move.moveTarget)) {
-      return false;
-    }
-    if (attacker !== pokemon && attacker.getMoveType(move) === this.immuneType) {
-      (args[0] as Utils.NumberHolder).value = 0;
-      return true;
-    }
-    return false;
+  override applyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, cancelled: BooleanHolder, args: any[]): void {
+    (args[0] as NumberHolder).value = 0;
   }
 
-  getImmuneType(): Type | null {
+  getImmuneType(): PokemonType | null {
     return this.immuneType;
   }
 
@@ -424,43 +377,43 @@ export class TypeImmunityAbAttr extends PreDefendAbAttr {
 }
 
 export class AttackTypeImmunityAbAttr extends TypeImmunityAbAttr {
-  constructor(immuneType: Type, condition?: AbAttrCondition) {
+  constructor(immuneType: PokemonType, condition?: AbAttrCondition) {
     super(immuneType, condition);
   }
 
+  override canApplyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, cancelled: BooleanHolder | null, args: any[]): boolean {
+    return move.category !== MoveCategory.STATUS && !move.hasAttr(NeutralDamageAgainstFlyingTypeMultiplierAttr)
+            && super.canApplyPreDefend(pokemon, passive, simulated, attacker, move, cancelled, args);
+  }
+
   /**
    * Applies immunity if the move used is not a status move.
    * Type immunity abilities that do not give additional benefits (HP recovery, stat boosts, etc) are not immune to status moves of the type
    * Example: Levitate
    */
-  applyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, cancelled: Utils.BooleanHolder, args: any[]): boolean {
+  override applyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, cancelled: BooleanHolder, args: any[]): void {
     // this is a hacky way to fix the Levitate/Thousand Arrows interaction, but it works for now...
-    if (move.category !== MoveCategory.STATUS && !move.hasAttr(NeutralDamageAgainstFlyingTypeMultiplierAttr)) {
-      return super.applyPreDefend(pokemon, passive, simulated, attacker, move, cancelled, args);
-    }
-    return false;
+    super.applyPreDefend(pokemon, passive, simulated, attacker, move, cancelled, args);
   }
 }
 
 export class TypeImmunityHealAbAttr extends TypeImmunityAbAttr {
-  constructor(immuneType: Type) {
+  constructor(immuneType: PokemonType) {
     super(immuneType);
   }
 
-  applyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, cancelled: Utils.BooleanHolder, args: any[]): boolean {
-    const ret = super.applyPreDefend(pokemon, passive, simulated, attacker, move, cancelled, args);
+  override canApplyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, cancelled: BooleanHolder | null, args: any[]): boolean {
+    return super.canApplyPreDefend(pokemon, passive, simulated, attacker, move, cancelled, args);
+  }
 
-    if (ret) {
-      if (!pokemon.isFullHp() && !simulated) {
-        const abilityName = (!passive ? pokemon.getAbility() : pokemon.getPassiveAbility()).name;
-        globalScene.unshiftPhase(new PokemonHealPhase(pokemon.getBattlerIndex(),
-          Utils.toDmgValue(pokemon.getMaxHp() / 4), i18next.t("abilityTriggers:typeImmunityHeal", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), abilityName }), true));
-        cancelled.value = true; // Suppresses "No Effect" message
-      }
-      return true;
+  override applyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, cancelled: BooleanHolder, args: any[]): void {
+    super.applyPreDefend(pokemon, passive, simulated, attacker, move, cancelled, args);
+    if (!pokemon.isFullHp() && !simulated) {
+      const abilityName = (!passive ? pokemon.getAbility() : pokemon.getPassiveAbility()).name;
+      globalScene.unshiftPhase(new PokemonHealPhase(pokemon.getBattlerIndex(),
+        toDmgValue(pokemon.getMaxHp() / 4), i18next.t("abilityTriggers:typeImmunityHeal", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), abilityName }), true));
+      cancelled.value = true; // Suppresses "No Effect" message
     }
-
-    return false;
   }
 }
 
@@ -468,24 +421,23 @@ class TypeImmunityStatStageChangeAbAttr extends TypeImmunityAbAttr {
   private stat: BattleStat;
   private stages: number;
 
-  constructor(immuneType: Type, stat: BattleStat, stages: number, condition?: AbAttrCondition) {
+  constructor(immuneType: PokemonType, stat: BattleStat, stages: number, condition?: AbAttrCondition) {
     super(immuneType, condition);
 
     this.stat = stat;
     this.stages = stages;
   }
 
-  applyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, cancelled: Utils.BooleanHolder, args: any[]): boolean {
-    const ret = super.applyPreDefend(pokemon, passive, simulated, attacker, move, cancelled, args);
+  override canApplyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, cancelled: BooleanHolder | null, args: any[]): boolean {
+    return super.canApplyPreDefend(pokemon, passive, simulated, attacker, move, cancelled, args);
+  }
 
-    if (ret) {
-      cancelled.value = true; // Suppresses "No Effect" message
-      if (!simulated) {
-        globalScene.unshiftPhase(new StatStageChangePhase(pokemon.getBattlerIndex(), true, [ this.stat ], this.stages));
-      }
+  override applyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, cancelled: BooleanHolder, args: any[]): void {
+    super.applyPreDefend(pokemon, passive, simulated, attacker, move, cancelled, args);
+    cancelled.value = true; // Suppresses "No Effect" message
+    if (!simulated) {
+      globalScene.unshiftPhase(new StatStageChangePhase(pokemon.getBattlerIndex(), true, [ this.stat ], this.stages));
     }
-
-    return ret;
   }
 }
 
@@ -493,24 +445,23 @@ class TypeImmunityAddBattlerTagAbAttr extends TypeImmunityAbAttr {
   private tagType: BattlerTagType;
   private turnCount: number;
 
-  constructor(immuneType: Type, tagType: BattlerTagType, turnCount: number, condition?: AbAttrCondition) {
+  constructor(immuneType: PokemonType, tagType: BattlerTagType, turnCount: number, condition?: AbAttrCondition) {
     super(immuneType, condition);
 
     this.tagType = tagType;
     this.turnCount = turnCount;
   }
 
-  applyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, cancelled: Utils.BooleanHolder, args: any[]): boolean {
-    const ret = super.applyPreDefend(pokemon, passive, simulated, attacker, move, cancelled, args);
+  override canApplyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, cancelled: BooleanHolder | null, args: any[]): boolean {
+    return super.canApplyPreDefend(pokemon, passive, simulated, attacker, move, cancelled, args);
+  }
 
-    if (ret) {
-      cancelled.value = true; // Suppresses "No Effect" message
-      if (!simulated) {
-        pokemon.addTag(this.tagType, this.turnCount, undefined, pokemon.id);
-      }
+  override applyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, cancelled: BooleanHolder, args: any[]): void {
+    super.applyPreDefend(pokemon, passive, simulated, attacker, move, cancelled, args);
+    cancelled.value = true; // Suppresses "No Effect" message
+    if (!simulated) {
+      pokemon.addTag(this.tagType, this.turnCount, undefined, pokemon.id);
     }
-
-    return ret;
   }
 }
 
@@ -519,18 +470,16 @@ export class NonSuperEffectiveImmunityAbAttr extends TypeImmunityAbAttr {
     super(null, condition);
   }
 
-  applyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, cancelled: Utils.BooleanHolder, args: any[]): boolean {
+  override canApplyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, cancelled: BooleanHolder | null, args: any[]): boolean {
     const modifierValue = args.length > 0
-      ? (args[0] as Utils.NumberHolder).value
+      ? (args[0] as NumberHolder).value
       : pokemon.getAttackTypeEffectiveness(attacker.getMoveType(move), attacker, undefined, undefined, move);
+    return move instanceof AttackMove && modifierValue < 2;
+  }
 
-    if (move instanceof AttackMove && modifierValue < 2) {
-      cancelled.value = true; // Suppresses "No Effect" message
-      (args[0] as Utils.NumberHolder).value = 0;
-      return true;
-    }
-
-    return false;
+  override applyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, cancelled: BooleanHolder, args: any[]): void {
+    cancelled.value = true; // Suppresses "No Effect" message
+    (args[0] as NumberHolder).value = 0;
   }
 
   getTriggerMessage(pokemon: Pokemon, abilityName: string, ...args: any[]): string {
@@ -547,6 +496,12 @@ export class NonSuperEffectiveImmunityAbAttr extends TypeImmunityAbAttr {
  * @extends PreDefendAbAttr
  */
 export class FullHpResistTypeAbAttr extends PreDefendAbAttr {
+
+  override canApplyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move | null, cancelled: BooleanHolder | null, args: any[]): boolean {
+    const typeMultiplier = args[0];
+    return (typeMultiplier && typeMultiplier instanceof NumberHolder) && !(move && move.hasAttr(FixedDamageAttr)) && pokemon.isFullHp() && typeMultiplier.value > 0.5;
+  }
+
   /**
    * Reduces a type multiplier to 0.5 if the source is at full HP.
    * @param pokemon {@linkcode Pokemon} the Pokemon with this ability
@@ -556,24 +511,18 @@ export class FullHpResistTypeAbAttr extends PreDefendAbAttr {
    * @param move {@linkcode Move} the move being used on the source
    * @param cancelled n/a
    * @param args `[0]` a container for the move's current type effectiveness multiplier
-   * @returns `true` if the move's effectiveness is reduced; `false` otherwise
    */
-  applyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move | null, cancelled: Utils.BooleanHolder | null, args: any[]): boolean | Promise<boolean> {
+  override applyPreDefend(
+    pokemon: Pokemon,
+    passive: boolean,
+    simulated: boolean,
+    attacker: Pokemon,
+    move: Move | null,
+    cancelled: BooleanHolder | null,
+    args: any[]): void {
     const typeMultiplier = args[0];
-    if (!(typeMultiplier && typeMultiplier instanceof Utils.NumberHolder)) {
-      return false;
-    }
-
-    if (move && move.hasAttr(FixedDamageAttr)) {
-      return false;
-    }
-
-    if (pokemon.isFullHp() && typeMultiplier.value > 0.5) {
-      typeMultiplier.value = 0.5;
-      pokemon.turnData.moveEffectiveness = 0.5;
-      return true;
-    }
-    return false;
+    typeMultiplier.value = 0.5;
+    pokemon.turnData.moveEffectiveness = 0.5;
   }
 
   getTriggerMessage(pokemon: Pokemon, abilityName: string, ...args: any[]): string {
@@ -584,30 +533,58 @@ export class FullHpResistTypeAbAttr extends PreDefendAbAttr {
 }
 
 export class PostDefendAbAttr extends AbAttr {
-  applyPostDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, hitResult: HitResult | null, args: any[]): boolean | Promise<boolean> {
-    return false;
+  canApplyPostDefend(
+    pokemon: Pokemon,
+    passive: boolean,
+    simulated: boolean,
+    attacker: Pokemon,
+    move: Move,
+    hitResult: HitResult | null,
+    args: any[]): boolean {
+    return true;
   }
+
+  applyPostDefend(
+    pokemon: Pokemon,
+    passive: boolean,
+    simulated: boolean,
+    attacker: Pokemon,
+    move: Move,
+    hitResult: HitResult | null,
+    args: any[],
+  ): void {}
 }
 
 export class FieldPriorityMoveImmunityAbAttr extends PreDefendAbAttr {
-  applyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, cancelled: Utils.BooleanHolder, args: any[]): boolean {
-    if (move.moveTarget === MoveTarget.USER || move.moveTarget === MoveTarget.NEAR_ALLY) {
-      return false;
-    }
 
-    if (move.getPriority(attacker) > 0 && !move.isMultiTarget()) {
-      cancelled.value = true;
-      return true;
-    }
+  override canApplyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, cancelled: BooleanHolder | null, args: any[]): boolean {
+    return !(move.moveTarget === MoveTarget.USER || move.moveTarget === MoveTarget.NEAR_ALLY) && move.getPriority(attacker) > 0 && !move.isMultiTarget();
+  }
 
-    return false;
+  override applyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, cancelled: BooleanHolder, args: any[]): void {
+    cancelled.value = true;
   }
 }
 
 export class PostStatStageChangeAbAttr extends AbAttr {
-  applyPostStatStageChange(pokemon: Pokemon, simulated: boolean, statsChanged: BattleStat[], stagesChanged: number, selfTarget: boolean, args: any[]): boolean | Promise<boolean> {
-    return false;
+  canApplyPostStatStageChange(
+    pokemon: Pokemon,
+    simulated: boolean,
+    statsChanged: BattleStat[],
+    stagesChanged: number,
+    selfTarget: boolean,
+    args: any[]): boolean {
+    return true;
   }
+
+  applyPostStatStageChange(
+    pokemon: Pokemon,
+    simulated: boolean,
+    statsChanged: BattleStat[],
+    stagesChanged: number,
+    selfTarget: boolean,
+    args: any[],
+  ): void {}
 }
 
 export class MoveImmunityAbAttr extends PreDefendAbAttr {
@@ -619,13 +596,12 @@ export class MoveImmunityAbAttr extends PreDefendAbAttr {
     this.immuneCondition = immuneCondition;
   }
 
-  applyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, cancelled: Utils.BooleanHolder, args: any[]): boolean {
-    if (this.immuneCondition(pokemon, attacker, move)) {
-      cancelled.value = true;
-      return true;
-    }
+  override canApplyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, cancelled: BooleanHolder | null, args: any[]): boolean {
+    return this.immuneCondition(pokemon, attacker, move);
+  }
 
-    return false;
+  override applyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, cancelled: BooleanHolder, args: any[]): void {
+    cancelled.value = true;
   }
 
   getTriggerMessage(pokemon: Pokemon, abilityName: string, ...args: any[]): string {
@@ -640,14 +616,19 @@ export class MoveImmunityAbAttr extends PreDefendAbAttr {
  * @extends PreDefendAbAttr
  */
 export class WonderSkinAbAttr extends PreDefendAbAttr {
-  applyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, cancelled: Utils.BooleanHolder, args: any[]): boolean {
-    const moveAccuracy = args[0] as Utils.NumberHolder;
-    if (move.category === MoveCategory.STATUS && moveAccuracy.value >= 50) {
-      moveAccuracy.value = 50;
-      return true;
-    }
 
-    return false;
+  constructor() {
+    super(false);
+  }
+
+  override canApplyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, cancelled: BooleanHolder | null, args: any[]): boolean {
+    const moveAccuracy = args[0] as NumberHolder;
+    return move.category === MoveCategory.STATUS && moveAccuracy.value >= 50;
+  }
+
+  override applyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, cancelled: BooleanHolder, args: any[]): void {
+    const moveAccuracy = args[0] as NumberHolder;
+    moveAccuracy.value = 50;
   }
 }
 
@@ -661,13 +642,13 @@ export class MoveImmunityStatStageChangeAbAttr extends MoveImmunityAbAttr {
     this.stages = stages;
   }
 
-  applyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, cancelled: Utils.BooleanHolder, args: any[]): boolean {
-    const ret = super.applyPreDefend(pokemon, passive, simulated, attacker, move, cancelled, args);
-    if (ret && !simulated) {
-      globalScene.unshiftPhase(new StatStageChangePhase(pokemon.getBattlerIndex(), true, [ this.stat ], this.stages));
-    }
+  override canApplyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, cancelled: BooleanHolder | null, args: any[]): boolean {
+    return !simulated && super.canApplyPreDefend(pokemon, passive, simulated, attacker, move, cancelled, args);
+  }
 
-    return ret;
+  override applyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, cancelled: BooleanHolder, args: any[]): void {
+    super.applyPreDefend(pokemon, passive, simulated, attacker, move, cancelled, args);
+    globalScene.unshiftPhase(new StatStageChangePhase(pokemon.getBattlerIndex(), true, [ this.stat ], this.stages));
   }
 }
 /**
@@ -676,6 +657,11 @@ export class MoveImmunityStatStageChangeAbAttr extends MoveImmunityAbAttr {
  * @see {@linkcode applyPostDefend}
  */
 export class ReverseDrainAbAttr extends PostDefendAbAttr {
+
+  override canApplyPostDefend(_pokemon: Pokemon, _passive: boolean, _simulated: boolean, _attacker: Pokemon, move: Move, _hitResult: HitResult | null, args: any[]): boolean {
+    return move.hasAttr(HitHealAttr);
+  }
+
   /**
    * Determines if a damage and draining move was used to check if this ability should stop the healing.
    * Examples include: Absorb, Draining Kiss, Bitter Blade, etc.
@@ -686,16 +672,11 @@ export class ReverseDrainAbAttr extends PostDefendAbAttr {
    * @param move {@linkcode PokemonMove} that is being used
    * @param _hitResult N/A
    * @param _args N/A
-   * @returns true if healing should be reversed on a healing move, false otherwise.
    */
-  override applyPostDefend(pokemon: Pokemon, _passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, _hitResult: HitResult, _args: any[]): boolean {
-    if (move.hasAttr(HitHealAttr) && !move.hitsSubstitute(attacker, pokemon)) {
-      if (!simulated) {
-        globalScene.queueMessage(i18next.t("abilityTriggers:reverseDrain", { pokemonNameWithAffix: getPokemonNameWithAffix(attacker) }));
-      }
-      return true;
+  override applyPostDefend(pokemon: Pokemon, _passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, _hitResult: HitResult, _args: any[]): void {
+    if (!simulated) {
+      globalScene.queueMessage(i18next.t("abilityTriggers:reverseDrain", { pokemonNameWithAffix: getPokemonNameWithAffix(attacker) }));
     }
-    return false;
   }
 }
 
@@ -706,7 +687,7 @@ export class PostDefendStatStageChangeAbAttr extends PostDefendAbAttr {
   private selfTarget: boolean;
   private allOthers: boolean;
 
-  constructor(condition: PokemonDefendCondition, stat: BattleStat, stages: number, selfTarget: boolean = true, allOthers: boolean = false) {
+  constructor(condition: PokemonDefendCondition, stat: BattleStat, stages: number, selfTarget = true, allOthers = false) {
     super(true);
 
     this.condition = condition;
@@ -716,24 +697,24 @@ export class PostDefendStatStageChangeAbAttr extends PostDefendAbAttr {
     this.allOthers = allOthers;
   }
 
-  override applyPostDefend(pokemon: Pokemon, _passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, _hitResult: HitResult, _args: any[]): boolean {
-    if (this.condition(pokemon, attacker, move) && !move.hitsSubstitute(attacker, pokemon)) {
-      if (simulated) {
-        return true;
-      }
+  override canApplyPostDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, hitResult: HitResult | null, args: any[]): boolean {
+    return this.condition(pokemon, attacker, move);
+  }
 
-      if (this.allOthers) {
-        const otherPokemon = pokemon.getAlly() ? pokemon.getOpponents().concat([ pokemon.getAlly() ]) : pokemon.getOpponents();
-        for (const other of otherPokemon) {
-          globalScene.unshiftPhase(new StatStageChangePhase((other).getBattlerIndex(), false, [ this.stat ], this.stages));
-        }
-        return true;
-      }
-      globalScene.unshiftPhase(new StatStageChangePhase((this.selfTarget ? pokemon : attacker).getBattlerIndex(), this.selfTarget, [ this.stat ], this.stages));
-      return true;
+  override applyPostDefend(pokemon: Pokemon, _passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, _hitResult: HitResult, _args: any[]): void {
+    if (simulated) {
+      return;
     }
 
-    return false;
+    if (this.allOthers) {
+      const ally = pokemon.getAlly();
+      const otherPokemon = !isNullOrUndefined(ally) ? pokemon.getOpponents().concat([ ally ]) : pokemon.getOpponents();
+      for (const other of otherPokemon) {
+        globalScene.unshiftPhase(new StatStageChangePhase((other).getBattlerIndex(), false, [ this.stat ], this.stages));
+      }
+    } else {
+      globalScene.unshiftPhase(new StatStageChangePhase((this.selfTarget ? pokemon : attacker).getBattlerIndex(), this.selfTarget, [ this.stat ], this.stages));
+    }
   }
 }
 
@@ -744,7 +725,7 @@ export class PostDefendHpGatedStatStageChangeAbAttr extends PostDefendAbAttr {
   private stages: number;
   private selfTarget: boolean;
 
-  constructor(condition: PokemonDefendCondition, hpGate: number, stats: BattleStat[], stages: number, selfTarget: boolean = true) {
+  constructor(condition: PokemonDefendCondition, hpGate: number, stats: BattleStat[], stages: number, selfTarget = true) {
     super(true);
 
     this.condition = condition;
@@ -754,19 +735,17 @@ export class PostDefendHpGatedStatStageChangeAbAttr extends PostDefendAbAttr {
     this.selfTarget = selfTarget;
   }
 
-  override applyPostDefend(pokemon: Pokemon, _passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, _hitResult: HitResult, _args: any[]): boolean {
+  override canApplyPostDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, hitResult: HitResult | null, args: any[]): boolean {
     const hpGateFlat: number = Math.ceil(pokemon.getMaxHp() * this.hpGate);
     const lastAttackReceived = pokemon.turnData.attacksReceived[pokemon.turnData.attacksReceived.length - 1];
     const damageReceived = lastAttackReceived?.damage || 0;
+    return this.condition(pokemon, attacker, move) && (pokemon.hp <= hpGateFlat && (pokemon.hp + damageReceived) > hpGateFlat);
+  }
 
-    if (this.condition(pokemon, attacker, move) && (pokemon.hp <= hpGateFlat && (pokemon.hp + damageReceived) > hpGateFlat) && !move.hitsSubstitute(attacker, pokemon)) {
-      if (!simulated) {
-        globalScene.unshiftPhase(new StatStageChangePhase((this.selfTarget ? pokemon : attacker).getBattlerIndex(), true, this.stats, this.stages));
-      }
-      return true;
+  override applyPostDefend(pokemon: Pokemon, _passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, _hitResult: HitResult, _args: any[]): void {
+    if (!simulated) {
+      globalScene.unshiftPhase(new StatStageChangePhase((this.selfTarget ? pokemon : attacker).getBattlerIndex(), true, this.stats, this.stages));
     }
-
-    return false;
   }
 }
 
@@ -781,17 +760,16 @@ export class PostDefendApplyArenaTrapTagAbAttr extends PostDefendAbAttr {
     this.tagType = tagType;
   }
 
-  override applyPostDefend(pokemon: Pokemon, _passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, _hitResult: HitResult, _args: any[]): boolean {
-    if (this.condition(pokemon, attacker, move) && !move.hitsSubstitute(attacker, pokemon)) {
-      const tag = globalScene.arena.getTag(this.tagType) as ArenaTrapTag;
-      if (!globalScene.arena.getTag(this.tagType) || tag.layers < tag.maxLayers) {
-        if (!simulated) {
-          globalScene.arena.addTag(this.tagType, 0, undefined, pokemon.id, pokemon.isPlayer() ? ArenaTagSide.ENEMY : ArenaTagSide.PLAYER);
-        }
-        return true;
-      }
+  override canApplyPostDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, hitResult: HitResult | null, args: any[]): boolean {
+    const tag = globalScene.arena.getTag(this.tagType) as ArenaTrapTag;
+    return (this.condition(pokemon, attacker, move))
+    && (!globalScene.arena.getTag(this.tagType) || tag.layers < tag.maxLayers);
+  }
+
+  override applyPostDefend(pokemon: Pokemon, _passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, _hitResult: HitResult, _args: any[]): void {
+    if (!simulated) {
+      globalScene.arena.addTag(this.tagType, 0, undefined, pokemon.id, pokemon.isPlayer() ? ArenaTagSide.ENEMY : ArenaTagSide.PLAYER);
     }
-    return false;
   }
 }
 
@@ -805,40 +783,37 @@ export class PostDefendApplyBattlerTagAbAttr extends PostDefendAbAttr {
     this.tagType = tagType;
   }
 
-  override applyPostDefend(pokemon: Pokemon, _passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, _hitResult: HitResult, _args: any[]): boolean {
-    if (this.condition(pokemon, attacker, move) && !move.hitsSubstitute(attacker, pokemon)) {
-      if (!pokemon.getTag(this.tagType) && !simulated) {
-        pokemon.addTag(this.tagType, undefined, undefined, pokemon.id);
-        globalScene.queueMessage(i18next.t("abilityTriggers:windPowerCharged", { pokemonName: getPokemonNameWithAffix(pokemon), moveName: move.name }));
-      }
-      return true;
+  override canApplyPostDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, hitResult: HitResult | null, args: any[]): boolean {
+    return this.condition(pokemon, attacker, move);
+  }
+
+  override applyPostDefend(pokemon: Pokemon, _passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, _hitResult: HitResult, _args: any[]): void {
+    if (!pokemon.getTag(this.tagType) && !simulated) {
+      pokemon.addTag(this.tagType, undefined, undefined, pokemon.id);
+      globalScene.queueMessage(i18next.t("abilityTriggers:windPowerCharged", { pokemonName: getPokemonNameWithAffix(pokemon), moveName: move.name }));
     }
-    return false;
   }
 }
 
 export class PostDefendTypeChangeAbAttr extends PostDefendAbAttr {
-  override applyPostDefend(pokemon: Pokemon, _passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, hitResult: HitResult, _args: any[]): boolean {
-    if (hitResult < HitResult.NO_EFFECT && !move.hitsSubstitute(attacker, pokemon)) {
-      if (simulated) {
-        return true;
-      }
-      const type = attacker.getMoveType(move);
-      const pokemonTypes = pokemon.getTypes(true);
-      if (pokemonTypes.length !== 1 || pokemonTypes[0] !== type) {
-        pokemon.summonData.types = [ type ];
-        return true;
-      }
-    }
+  private type: PokemonType;
 
-    return false;
+  override canApplyPostDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, hitResult: HitResult, args: any[]): boolean {
+    this.type = attacker.getMoveType(move);
+    const pokemonTypes = pokemon.getTypes(true);
+    return hitResult < HitResult.NO_EFFECT && (simulated || pokemonTypes.length !== 1 || pokemonTypes[0] !== this.type);
+  }
+
+  override applyPostDefend(pokemon: Pokemon, _passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, hitResult: HitResult, _args: any[]): void {
+    const type = attacker.getMoveType(move);
+    pokemon.summonData.types = [ type ];
   }
 
   override getTriggerMessage(pokemon: Pokemon, abilityName: string, ..._args: any[]): string {
     return i18next.t("abilityTriggers:postDefendTypeChange", {
       pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
       abilityName,
-      typeName: i18next.t(`pokemonInfo:Type.${Type[pokemon.getTypes(true)[0]]}`)
+      typeName: i18next.t(`pokemonInfo:Type.${PokemonType[this.type]}`)
     });
   }
 }
@@ -852,16 +827,14 @@ export class PostDefendTerrainChangeAbAttr extends PostDefendAbAttr {
     this.terrainType = terrainType;
   }
 
-  override applyPostDefend(pokemon: Pokemon, _passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, hitResult: HitResult, _args: any[]): boolean {
-    if (hitResult < HitResult.NO_EFFECT && !move.hitsSubstitute(attacker, pokemon)) {
-      if (simulated) {
-        return globalScene.arena.terrain?.terrainType !== (this.terrainType || undefined);
-      } else {
-        return globalScene.arena.trySetTerrain(this.terrainType, true);
-      }
-    }
+  override canApplyPostDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, hitResult: HitResult, args: any[]): boolean {
+    return hitResult < HitResult.NO_EFFECT && globalScene.arena.canSetTerrain(this.terrainType);
+  }
 
-    return false;
+  override applyPostDefend(pokemon: Pokemon, _passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, hitResult: HitResult, _args: any[]): void {
+    if (!simulated) {
+      globalScene.arena.trySetTerrain(this.terrainType, false, pokemon);
+    }
   }
 }
 
@@ -870,24 +843,22 @@ export class PostDefendContactApplyStatusEffectAbAttr extends PostDefendAbAttr {
   private effects: StatusEffect[];
 
   constructor(chance: number, ...effects: StatusEffect[]) {
-    super();
+    super(true);
 
     this.chance = chance;
     this.effects = effects;
   }
 
-  override applyPostDefend(pokemon: Pokemon, _passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, _hitResult: HitResult, _args: any[]): boolean {
-    if (move.checkFlag(MoveFlags.MAKES_CONTACT, attacker, pokemon) && !attacker.status
-      && (this.chance === -1 || pokemon.randSeedInt(100) < this.chance) && !move.hitsSubstitute(attacker, pokemon)) {
-      const effect = this.effects.length === 1 ? this.effects[0] : this.effects[pokemon.randSeedInt(this.effects.length)];
-      if (simulated) {
-        return attacker.canSetStatus(effect, true, false, pokemon);
-      } else {
-        return attacker.trySetStatus(effect, true, pokemon);
-      }
-    }
+  override canApplyPostDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, hitResult: HitResult | null, args: any[]): boolean {
+    const effect = this.effects.length === 1 ? this.effects[0] : this.effects[pokemon.randBattleSeedInt(this.effects.length)];
+    return move.doesFlagEffectApply({flag: MoveFlags.MAKES_CONTACT, user: attacker, target: pokemon}) && !attacker.status
+      && (this.chance === -1 || pokemon.randBattleSeedInt(100) < this.chance)
+      && attacker.canSetStatus(effect, true, false, pokemon);
+  }
 
-    return false;
+  override applyPostDefend(pokemon: Pokemon, _passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, _hitResult: HitResult, _args: any[]): void {
+    const effect = this.effects.length === 1 ? this.effects[0] : this.effects[pokemon.randBattleSeedInt(this.effects.length)];
+    attacker.trySetStatus(effect, true, pokemon);
   }
 }
 
@@ -896,11 +867,13 @@ export class EffectSporeAbAttr extends PostDefendContactApplyStatusEffectAbAttr
     super(10, StatusEffect.POISON, StatusEffect.PARALYSIS, StatusEffect.SLEEP);
   }
 
-  applyPostDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, hitResult: HitResult, args: any[]): boolean {
-    if (attacker.hasAbility(Abilities.OVERCOAT) || attacker.isOfType(Type.GRASS)) {
-      return false;
-    }
-    return super.applyPostDefend(pokemon, passive, simulated, attacker, move, hitResult, args);
+  override canApplyPostDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, hitResult: HitResult | null, args: any[]): boolean {
+    return !(attacker.hasAbility(Abilities.OVERCOAT) || attacker.isOfType(PokemonType.GRASS))
+      && super.canApplyPostDefend(pokemon, passive, simulated, attacker, move, hitResult, args);
+  }
+
+  override applyPostDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, hitResult: HitResult, args: any[]): void {
+    super.applyPostDefend(pokemon, passive, simulated, attacker, move, hitResult, args);
   }
 }
 
@@ -917,16 +890,15 @@ export class PostDefendContactApplyTagChanceAbAttr extends PostDefendAbAttr {
     this.turnCount = turnCount;
   }
 
-  override applyPostDefend(pokemon: Pokemon, _passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, _hitResult: HitResult, _args: any[]): boolean {
-    if (move.checkFlag(MoveFlags.MAKES_CONTACT, attacker, pokemon) && pokemon.randSeedInt(100) < this.chance && !move.hitsSubstitute(attacker, pokemon)) {
-      if (simulated) {
-        return attacker.canAddTag(this.tagType);
-      } else {
-        return attacker.addTag(this.tagType, this.turnCount, move.id, attacker.id);
-      }
-    }
+  override canApplyPostDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, hitResult: HitResult | null, args: any[]): boolean {
+    return move.doesFlagEffectApply({flag: MoveFlags.MAKES_CONTACT, user: attacker, target: pokemon}) && pokemon.randBattleSeedInt(100) < this.chance
+    && attacker.canAddTag(this.tagType);
+  }
 
-    return false;
+  override applyPostDefend(pokemon: Pokemon, _passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, _hitResult: HitResult, _args: any[]): void {
+    if (!simulated) {
+      attacker.addTag(this.tagType, this.turnCount, move.id, attacker.id);
+    }
   }
 }
 
@@ -941,16 +913,10 @@ export class PostDefendCritStatStageChangeAbAttr extends PostDefendAbAttr {
     this.stages = stages;
   }
 
-  override applyPostDefend(pokemon: Pokemon, _passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, _hitResult: HitResult, _args: any[]): boolean {
-    if (move.hitsSubstitute(attacker, pokemon)) {
-      return false;
-    }
-
+  override applyPostDefend(pokemon: Pokemon, _passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, _hitResult: HitResult, _args: any[]): void {
     if (!simulated) {
       globalScene.unshiftPhase(new StatStageChangePhase(pokemon.getBattlerIndex(), true, [ this.stat ], this.stages));
     }
-
-    return true;
   }
 
   override getCondition(): AbAttrCondition {
@@ -967,15 +933,14 @@ export class PostDefendContactDamageAbAttr extends PostDefendAbAttr {
     this.damageRatio = damageRatio;
   }
 
-  override applyPostDefend(pokemon: Pokemon, _passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, _hitResult: HitResult, _args: any[]): boolean {
-    if (!simulated && move.checkFlag(MoveFlags.MAKES_CONTACT, attacker, pokemon)
-      && !attacker.hasAbilityWithAttr(BlockNonDirectDamageAbAttr) && !move.hitsSubstitute(attacker, pokemon)) {
-      attacker.damageAndUpdate(Utils.toDmgValue(attacker.getMaxHp() * (1 / this.damageRatio)), HitResult.OTHER);
-      attacker.turnData.damageTaken += Utils.toDmgValue(attacker.getMaxHp() * (1 / this.damageRatio));
-      return true;
-    }
+  override canApplyPostDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, hitResult: HitResult | null, args: any[]): boolean {
+    return !simulated && move.doesFlagEffectApply({flag: MoveFlags.MAKES_CONTACT, user: attacker, target: pokemon})
+      && !attacker.hasAbilityWithAttr(BlockNonDirectDamageAbAttr);
+  }
 
-    return false;
+  override applyPostDefend(pokemon: Pokemon, _passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, _hitResult: HitResult, _args: any[]): void {
+    attacker.damageAndUpdate(toDmgValue(attacker.getMaxHp() * (1 / this.damageRatio)), { result: HitResult.INDIRECT });
+    attacker.turnData.damageTaken += toDmgValue(attacker.getMaxHp() * (1 / this.damageRatio));
   }
 
   override getTriggerMessage(pokemon: Pokemon, abilityName: string, ..._args: any[]): string {
@@ -1001,19 +966,15 @@ export class PostDefendPerishSongAbAttr extends PostDefendAbAttr {
     this.turns = turns;
   }
 
-  override applyPostDefend(pokemon: Pokemon, _passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, _hitResult: HitResult, _args: any[]): boolean {
-    if (move.checkFlag(MoveFlags.MAKES_CONTACT, attacker, pokemon) && !move.hitsSubstitute(attacker, pokemon)) {
-      if (pokemon.getTag(BattlerTagType.PERISH_SONG) || attacker.getTag(BattlerTagType.PERISH_SONG)) {
-        return false;
-      } else {
-        if (!simulated) {
-          attacker.addTag(BattlerTagType.PERISH_SONG, this.turns);
-          pokemon.addTag(BattlerTagType.PERISH_SONG, this.turns);
-        }
-        return true;
-      }
+  override canApplyPostDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, hitResult: HitResult | null, args: any[]): boolean {
+    return move.doesFlagEffectApply({flag: MoveFlags.MAKES_CONTACT, user: attacker, target: pokemon}) && !attacker.getTag(BattlerTagType.PERISH_SONG);
+  }
+
+  override applyPostDefend(pokemon: Pokemon, _passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, _hitResult: HitResult, _args: any[]): void {
+    if (!simulated) {
+      attacker.addTag(BattlerTagType.PERISH_SONG, this.turns);
+      pokemon.addTag(BattlerTagType.PERISH_SONG, this.turns);
     }
-    return false;
   }
 
   override getTriggerMessage(pokemon: Pokemon, abilityName: string, ..._args: any[]): string {
@@ -1032,18 +993,15 @@ export class PostDefendWeatherChangeAbAttr extends PostDefendAbAttr {
     this.condition = condition;
   }
 
-  override applyPostDefend(pokemon: Pokemon, _passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, _hitResult: HitResult, _args: any[]): boolean {
-    if (this.condition && !this.condition(pokemon, attacker, move) || move.hitsSubstitute(attacker, pokemon)) {
-      return false;
-    }
-    if (!globalScene.arena.weather?.isImmutable()) {
-      if (simulated) {
-        return globalScene.arena.weather?.weatherType !== this.weatherType;
-      }
-      return globalScene.arena.trySetWeather(this.weatherType, true);
-    }
+  override canApplyPostDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, hitResult: HitResult | null, args: any[]): boolean {
+    return (!(this.condition && !this.condition(pokemon, attacker, move))
+    && !globalScene.arena.weather?.isImmutable() && globalScene.arena.canSetWeather(this.weatherType));
+  }
 
-    return false;
+  override applyPostDefend(pokemon: Pokemon, _passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, _hitResult: HitResult, _args: any[]): void {
+    if (!simulated) {
+      globalScene.arena.trySetWeather(this.weatherType, pokemon);
+    }
   }
 }
 
@@ -1052,18 +1010,17 @@ export class PostDefendAbilitySwapAbAttr extends PostDefendAbAttr {
     super();
   }
 
-  override applyPostDefend(pokemon: Pokemon, _passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, _hitResult: HitResult, args: any[]): boolean {
-    if (move.checkFlag(MoveFlags.MAKES_CONTACT, attacker, pokemon)
-      && !attacker.getAbility().hasAttr(UnswappableAbilityAbAttr) && !move.hitsSubstitute(attacker, pokemon)) {
-      if (!simulated) {
-        const tempAbilityId = attacker.getAbility().id;
-        attacker.summonData.ability = pokemon.getAbility().id;
-        pokemon.summonData.ability = tempAbilityId;
-      }
-      return true;
-    }
+  override canApplyPostDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, hitResult: HitResult | null, args: any[]): boolean {
+    return move.doesFlagEffectApply({flag: MoveFlags.MAKES_CONTACT, user: attacker, target: pokemon})
+      && attacker.getAbility().isSwappable;
+  }
 
-    return false;
+  override applyPostDefend(pokemon: Pokemon, _passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, _hitResult: HitResult, args: any[]): void {
+    if (!simulated) {
+      const tempAbility = attacker.getAbility();
+      attacker.setTempAbility(pokemon.getAbility());
+      pokemon.setTempAbility(tempAbility);
+    }
   }
 
   override getTriggerMessage(pokemon: Pokemon, _abilityName: string, ..._args: any[]): string {
@@ -1079,17 +1036,15 @@ export class PostDefendAbilityGiveAbAttr extends PostDefendAbAttr {
     this.ability = ability;
   }
 
-  override applyPostDefend(pokemon: Pokemon, _passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, _hitResult: HitResult, _args: any[]): boolean {
-    if (move.checkFlag(MoveFlags.MAKES_CONTACT, attacker, pokemon) && !attacker.getAbility().hasAttr(UnsuppressableAbilityAbAttr)
-      && !attacker.getAbility().hasAttr(PostDefendAbilityGiveAbAttr) && !move.hitsSubstitute(attacker, pokemon)) {
-      if (!simulated) {
-        attacker.summonData.ability = this.ability;
-      }
+  override canApplyPostDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, hitResult: HitResult | null, args: any[]): boolean {
+    return move.doesFlagEffectApply({flag: MoveFlags.MAKES_CONTACT, user: attacker, target: pokemon}) && attacker.getAbility().isSuppressable
+      && !attacker.getAbility().hasAttr(PostDefendAbilityGiveAbAttr);
+  }
 
-      return true;
+  override applyPostDefend(_pokemon: Pokemon, _passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, _hitResult: HitResult, _args: any[]): void {
+    if (!simulated) {
+      attacker.setTempAbility(allAbilities[this.ability]);
     }
-
-    return false;
   }
 
   override getTriggerMessage(pokemon: Pokemon, abilityName: string, ..._args: any[]): string {
@@ -1111,20 +1066,17 @@ export class PostDefendMoveDisableAbAttr extends PostDefendAbAttr {
     this.chance = chance;
   }
 
-  override applyPostDefend(pokemon: Pokemon, _passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, _hitResult: HitResult, _args: any[]): boolean {
-    if (attacker.getTag(BattlerTagType.DISABLED) === null && !move.hitsSubstitute(attacker, pokemon)) {
-      if (move.checkFlag(MoveFlags.MAKES_CONTACT, attacker, pokemon) && (this.chance === -1 || pokemon.randSeedInt(100) < this.chance)) {
-        if (simulated) {
-          return true;
-        }
+  override canApplyPostDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, hitResult: HitResult | null, args: any[]): boolean {
+    return attacker.getTag(BattlerTagType.DISABLED) === null
+      && move.doesFlagEffectApply({flag: MoveFlags.MAKES_CONTACT, user: attacker, target: pokemon}) && (this.chance === -1 || pokemon.randBattleSeedInt(100) < this.chance);
+  }
 
-        this.attacker = attacker;
-        this.move = move;
-        this.attacker.addTag(BattlerTagType.DISABLED, 4, 0, pokemon.id);
-        return true;
-      }
+  override applyPostDefend(pokemon: Pokemon, _passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, _hitResult: HitResult, _args: any[]): void {
+    if (!simulated) {
+      this.attacker = attacker;
+      this.move = move;
+      this.attacker.addTag(BattlerTagType.DISABLED, 4, 0, pokemon.id);
     }
-    return false;
   }
 }
 
@@ -1141,22 +1093,36 @@ export class PostStatStageChangeStatStageChangeAbAttr extends PostStatStageChang
     this.stages = stages;
   }
 
-  applyPostStatStageChange(pokemon: Pokemon, simulated: boolean, statStagesChanged: BattleStat[], stagesChanged: number, selfTarget: boolean, args: any[]): boolean {
-    if (this.condition(pokemon, statStagesChanged, stagesChanged) && !selfTarget) {
-      if (!simulated) {
-        globalScene.unshiftPhase(new StatStageChangePhase((pokemon).getBattlerIndex(), true, this.statsToChange, this.stages));
-      }
-      return true;
-    }
+  override canApplyPostStatStageChange(pokemon: Pokemon, simulated: boolean, statStagesChanged: BattleStat[], stagesChanged: integer, selfTarget: boolean, args: any[]): boolean {
+    return this.condition(pokemon, statStagesChanged, stagesChanged) && !selfTarget;
+  }
 
-    return false;
+  override applyPostStatStageChange(pokemon: Pokemon, simulated: boolean, statStagesChanged: BattleStat[], stagesChanged: number, selfTarget: boolean, args: any[]): void {
+    if (!simulated) {
+      globalScene.unshiftPhase(new StatStageChangePhase((pokemon).getBattlerIndex(), true, this.statsToChange, this.stages));
+    }
   }
 }
 
 export class PreAttackAbAttr extends AbAttr {
-  applyPreAttack(pokemon: Pokemon, passive: boolean, simulated: boolean, defender: Pokemon | null, move: Move, args: any[]): boolean | Promise<boolean> {
-    return false;
+  canApplyPreAttack(
+    pokemon: Pokemon,
+    passive: boolean,
+    simulated: boolean,
+    defender: Pokemon | null,
+    move: Move,
+    args: any[]): boolean {
+    return true;
   }
+
+  applyPreAttack(
+    pokemon: Pokemon,
+    passive: boolean,
+    simulated: boolean,
+    defender: Pokemon | null,
+    move: Move,
+    args: any[],
+  ): void {}
 }
 
 /**
@@ -1168,26 +1134,22 @@ export class MoveEffectChanceMultiplierAbAttr extends AbAttr {
   private chanceMultiplier: number;
 
   constructor(chanceMultiplier: number) {
-    super(true);
+    super(false);
     this.chanceMultiplier = chanceMultiplier;
   }
+
+  override canApply(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean {
+    const exceptMoves = [ Moves.ORDER_UP, Moves.ELECTRO_SHOT ];
+    return !((args[0] as NumberHolder).value <= 0 || exceptMoves.includes((args[1] as Move).id));
+  }
+
   /**
-   * @param args [0]: {@linkcode Utils.NumberHolder} Move additional effect chance. Has to be higher than or equal to 0.
+   * @param args [0]: {@linkcode NumberHolder} Move additional effect chance. Has to be higher than or equal to 0.
    *             [1]: {@linkcode Moves } Move used by the ability user.
    */
-  apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean {
-    // Disable showAbility during getTargetBenefitScore
-    this.showAbility = args[4];
-
-    const exceptMoves = [ Moves.ORDER_UP, Moves.ELECTRO_SHOT ];
-    if ((args[0] as Utils.NumberHolder).value <= 0 || exceptMoves.includes((args[1] as Move).id)) {
-      return false;
-    }
-
-    (args[0] as Utils.NumberHolder).value *= this.chanceMultiplier;
-    (args[0] as Utils.NumberHolder).value = Math.min((args[0] as Utils.NumberHolder).value, 100);
-    return true;
-
+  override apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: BooleanHolder, args: any[]): void {
+    (args[0] as NumberHolder).value *= this.chanceMultiplier;
+    (args[0] as NumberHolder).value = Math.min((args[0] as NumberHolder).value, 100);
   }
 }
 
@@ -1197,32 +1159,37 @@ export class MoveEffectChanceMultiplierAbAttr extends AbAttr {
  * @see {@linkcode applyPreDefend}
  */
 export class IgnoreMoveEffectsAbAttr extends PreDefendAbAttr {
+  constructor(showAbility: boolean = false) {
+    super(showAbility);
+  }
+
+  override canApplyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move | null, cancelled: BooleanHolder | null, args: any[]): boolean {
+    return (args[0] as NumberHolder).value > 0;
+  }
+
   /**
-   * @param args [0]: {@linkcode Utils.NumberHolder} Move additional effect chance.
+   * @param args [0]: {@linkcode NumberHolder} Move additional effect chance.
    */
-  applyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, cancelled: Utils.BooleanHolder, args: any[]): boolean {
-
-    if ((args[0] as Utils.NumberHolder).value <= 0) {
-      return false;
-    }
-
-    (args[0] as Utils.NumberHolder).value = 0;
-    return true;
-
+  override applyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, cancelled: BooleanHolder, args: any[]): void {
+    (args[0] as NumberHolder).value = 0;
   }
 }
 
 export class VariableMovePowerAbAttr extends PreAttackAbAttr {
-  applyPreAttack(pokemon: Pokemon, passive: boolean, simulated: boolean, defender: Pokemon, move: Move, args: any[]): boolean {
-    //const power = args[0] as Utils.NumberHolder;
-    return false;
+  override canApplyPreAttack(pokemon: Pokemon, passive: boolean, simulated: boolean, defender: Pokemon, move: Move, args: any[]): boolean {
+    return true;
   }
 }
 
 export class FieldPreventExplosiveMovesAbAttr extends AbAttr {
-  apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean | Promise<boolean> {
+  override apply(
+    pokemon: Pokemon,
+    passive: boolean,
+    simulated: boolean,
+    cancelled: BooleanHolder,
+    args: any[],
+  ): void {
     cancelled.value = true;
-    return true;
   }
 }
 
@@ -1231,14 +1198,14 @@ export class FieldPreventExplosiveMovesAbAttr extends AbAttr {
  * If this ability cannot stack, a BooleanHolder can be used to prevent this from stacking.
  * @see {@link applyFieldStatMultiplierAbAttrs}
  * @see {@link applyFieldStat}
- * @see {@link Utils.BooleanHolder}
+ * @see {@link BooleanHolder}
  */
 export class FieldMultiplyStatAbAttr extends AbAttr {
   private stat: Stat;
   private multiplier: number;
   private canStack: boolean;
 
-  constructor(stat: Stat, multiplier: number, canStack: boolean = false) {
+  constructor(stat: Stat, multiplier: number, canStack = false) {
     super(false);
 
     this.stat = stat;
@@ -1246,100 +1213,122 @@ export class FieldMultiplyStatAbAttr extends AbAttr {
     this.canStack = canStack;
   }
 
+  canApplyFieldStat(pokemon: Pokemon, passive: boolean, simulated: boolean, stat: Stat, statValue: NumberHolder, checkedPokemon: Pokemon, hasApplied: BooleanHolder, args: any[]): boolean {
+    return this.canStack || !hasApplied.value
+      && this.stat === stat && checkedPokemon.getAbilityAttrs(FieldMultiplyStatAbAttr).every(attr => (attr as FieldMultiplyStatAbAttr).stat !== stat);
+  }
+
   /**
    * applyFieldStat: Tries to multiply a Pokemon's Stat
    * @param pokemon {@linkcode Pokemon} the Pokemon using this ability
    * @param passive {@linkcode boolean} unused
    * @param stat {@linkcode Stat} the type of the checked stat
-   * @param statValue {@linkcode Utils.NumberHolder} the value of the checked stat
+   * @param statValue {@linkcode NumberHolder} the value of the checked stat
    * @param checkedPokemon {@linkcode Pokemon} the Pokemon this ability is targeting
-   * @param hasApplied {@linkcode Utils.BooleanHolder} whether or not another multiplier has been applied to this stat
+   * @param hasApplied {@linkcode BooleanHolder} whether or not another multiplier has been applied to this stat
    * @param args {any[]} unused
-   * @returns true if this changed the checked stat, false otherwise.
    */
-  applyFieldStat(pokemon: Pokemon, passive: boolean, simulated: boolean, stat: Stat, statValue: Utils.NumberHolder, checkedPokemon: Pokemon, hasApplied: Utils.BooleanHolder, args: any[]): boolean {
-    if (!this.canStack && hasApplied.value) {
-      return false;
-    }
-
-    if (this.stat === stat && checkedPokemon.getAbilityAttrs(FieldMultiplyStatAbAttr).every(attr => (attr as FieldMultiplyStatAbAttr).stat !== stat)) {
-      statValue.value *= this.multiplier;
-      hasApplied.value = true;
-      return true;
-    }
-    return false;
+  applyFieldStat(pokemon: Pokemon, passive: boolean, simulated: boolean, stat: Stat, statValue: NumberHolder, checkedPokemon: Pokemon, hasApplied: BooleanHolder, args: any[]): void {
+    statValue.value *= this.multiplier;
+    hasApplied.value = true;
   }
 
 }
 
 export class MoveTypeChangeAbAttr extends PreAttackAbAttr {
   constructor(
-    private newType: Type,
+    private newType: PokemonType,
     private powerMultiplier: number,
     private condition?: PokemonAttackCondition
   ) {
-    super(true);
+    super(false);
   }
 
-  // TODO: Decouple this into two attributes (type change / power boost)
-  applyPreAttack(pokemon: Pokemon, passive: boolean, simulated: boolean, defender: Pokemon, move: Move, args: any[]): boolean {
-    if (this.condition && this.condition(pokemon, defender, move)) {
-      if (args[0] && args[0] instanceof Utils.NumberHolder) {
-        args[0].value = this.newType;
-      }
-      if (args[1] && args[1] instanceof Utils.NumberHolder) {
-        args[1].value *= this.powerMultiplier;
-      }
-      return true;
-    }
+  /**
+   * Determine if the move type change attribute can be applied
+   * 
+   * Can be applied if:
+   * - The ability's condition is met, e.g. pixilate only boosts normal moves,
+   * - The move is not forbidden from having its type changed by an ability, e.g. {@linkcode Moves.MULTI_ATTACK}
+   * - The user is not terastallized and using tera blast
+   * - The user is not a terastallized terapagos with tera stellar using tera starstorm
+   * @param pokemon - The pokemon that has the move type changing ability and is using the attacking move
+   * @param _passive - Unused
+   * @param _simulated - Unused
+   * @param _defender - The pokemon being attacked (unused)
+   * @param move - The move being used
+   * @param _args - args[0] holds the type that the move is changed to, args[1] holds the multiplier
+   * @returns whether the move type change attribute can be applied
+   */
+  override canApplyPreAttack(pokemon: Pokemon, _passive: boolean, _simulated: boolean, _defender: Pokemon | null, move: Move, _args: [NumberHolder?, NumberHolder?, ...any]): boolean {
+    return (!this.condition || this.condition(pokemon, _defender, move)) &&
+            !noAbilityTypeOverrideMoves.has(move.id) && 
+            (!pokemon.isTerastallized ||
+              (move.id !== Moves.TERA_BLAST &&
+              (move.id !== Moves.TERA_STARSTORM || pokemon.getTeraType() !== PokemonType.STELLAR || !pokemon.hasSpecies(Species.TERAPAGOS))));
+  }
 
-    return false;
+  /**
+   * @param pokemon - The pokemon that has the move type changing ability and is using the attacking move
+   * @param passive - Unused
+   * @param simulated - Unused
+   * @param defender - The pokemon being attacked (unused)
+   * @param move - The move being used
+   * @param args - args[0] holds the type that the move is changed to, args[1] holds the multiplier
+   */
+  override applyPreAttack(pokemon: Pokemon, passive: boolean, simulated: boolean, defender: Pokemon, move: Move, args: [NumberHolder?, NumberHolder?, ...any]): void {
+    if (args[0] && args[0] instanceof NumberHolder) {
+      args[0].value = this.newType;
+    }
+    if (args[1] && args[1] instanceof NumberHolder) {
+      args[1].value *= this.powerMultiplier;
+    }
   }
 }
 
 /** Ability attribute for changing a pokemon's type before using a move */
 export class PokemonTypeChangeAbAttr extends PreAttackAbAttr {
-  private moveType: Type;
+  private moveType: PokemonType;
 
   constructor() {
     super(true);
   }
 
-  applyPreAttack(pokemon: Pokemon, passive: boolean, simulated: boolean, defender: Pokemon, move: Move, args: any[]): boolean {
-    if (
-      !pokemon.isTerastallized() &&
-      move.id !== Moves.STRUGGLE &&
-      /**
-       * Skip moves that call other moves because these moves generate a following move that will trigger this ability attribute
-       * @see {@link https://bulbapedia.bulbagarden.net/wiki/Category:Moves_that_call_other_moves}
-       */
-      !move.findAttr((attr) =>
-        attr instanceof RandomMovesetMoveAttr ||
-        attr instanceof RandomMoveAttr ||
-        attr instanceof NaturePowerAttr ||
-        attr instanceof CopyMoveAttr
-      )
-    ) {
+  override canApplyPreAttack(pokemon: Pokemon, passive: boolean, simulated: boolean, defender: Pokemon | null, move: Move, args: any[]): boolean {
+    if (!pokemon.isTerastallized &&
+    move.id !== Moves.STRUGGLE &&
+    /**
+     * Skip moves that call other moves because these moves generate a following move that will trigger this ability attribute
+     * @see {@link https://bulbapedia.bulbagarden.net/wiki/Category:Moves_that_call_other_moves}
+     */
+    !move.findAttr((attr) =>
+      attr instanceof RandomMovesetMoveAttr ||
+      attr instanceof RandomMoveAttr ||
+      attr instanceof NaturePowerAttr ||
+      attr instanceof CopyMoveAttr)) {
       const moveType = pokemon.getMoveType(move);
-
       if (pokemon.getTypes().some((t) => t !== moveType)) {
-        if (!simulated) {
-          this.moveType = moveType;
-          pokemon.summonData.types = [ moveType ];
-          pokemon.updateInfo();
-        }
-
+        this.moveType = moveType;
         return true;
       }
     }
-
     return false;
   }
 
+  override applyPreAttack(pokemon: Pokemon, passive: boolean, simulated: boolean, defender: Pokemon, move: Move, args: any[]): void {
+    const moveType = pokemon.getMoveType(move);
+
+    if (!simulated) {
+      this.moveType = moveType;
+      pokemon.summonData.types = [ moveType ];
+      pokemon.updateInfo();
+    }
+  }
+
   getTriggerMessage(pokemon: Pokemon, abilityName: string, ...args: any[]): string {
     return i18next.t("abilityTriggers:pokemonTypeChange", {
       pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
-      moveType: i18next.t(`pokemonInfo:Type.${Type[this.moveType]}`),
+      moveType: i18next.t(`pokemonInfo:Type.${PokemonType[this.moveType]}`),
     });
   }
 }
@@ -1357,6 +1346,10 @@ export class AddSecondStrikeAbAttr extends PreAttackAbAttr {
     this.damageMultiplier = damageMultiplier;
   }
 
+  override canApplyPreAttack(pokemon: Pokemon, passive: boolean, simulated: boolean, defender: Pokemon | null, move: Move, args: any[]): boolean {
+    return move.canBeMultiStrikeEnhanced(pokemon, true);
+  }
+
   /**
    * If conditions are met, this doubles the move's hit count (via args[1])
    * or multiplies the damage of secondary strikes (via args[2])
@@ -1365,26 +1358,19 @@ export class AddSecondStrikeAbAttr extends PreAttackAbAttr {
    * @param defender n/a
    * @param move the {@linkcode Move} used by the ability source
    * @param args Additional arguments:
-   * - `[0]` the number of strikes this move currently has ({@linkcode Utils.NumberHolder})
-   * - `[1]` the damage multiplier for the current strike ({@linkcode Utils.NumberHolder})
-   * @returns
+   * - `[0]` the number of strikes this move currently has ({@linkcode NumberHolder})
+   * - `[1]` the damage multiplier for the current strike ({@linkcode NumberHolder})
    */
-  applyPreAttack(pokemon: Pokemon, passive: boolean, simulated: boolean, defender: Pokemon, move: Move, args: any[]): boolean {
-    const hitCount = args[0] as Utils.NumberHolder;
-    const multiplier = args[1] as Utils.NumberHolder;
-
-    if (move.canBeMultiStrikeEnhanced(pokemon, true)) {
-      this.showAbility = !!hitCount?.value;
-      if (hitCount?.value) {
-        hitCount.value += 1;
-      }
-
-      if (multiplier?.value && pokemon.turnData.hitsLeft === 1) {
-        multiplier.value = this.damageMultiplier;
-      }
-      return true;
+  override applyPreAttack(pokemon: Pokemon, passive: boolean, simulated: boolean, defender: Pokemon, move: Move, args: any[]): void {
+    const hitCount = args[0] as NumberHolder;
+    const multiplier = args[1] as NumberHolder;
+    if (hitCount?.value) {
+      hitCount.value += 1;
+    }
+
+    if (multiplier?.value && pokemon.turnData.hitsLeft === 1) {
+      multiplier.value = this.damageMultiplier;
     }
-    return false;
   }
 }
 
@@ -1399,11 +1385,15 @@ export class DamageBoostAbAttr extends PreAttackAbAttr {
   private condition: PokemonAttackCondition;
 
   constructor(damageMultiplier: number, condition: PokemonAttackCondition) {
-    super(true);
+    super(false);
     this.damageMultiplier = damageMultiplier;
     this.condition = condition;
   }
 
+  override canApplyPreAttack(pokemon: Pokemon, passive: boolean, simulated: boolean, defender: Pokemon | null, move: Move, args: any[]): boolean {
+    return this.condition(pokemon, defender, move);
+  }
+
   /**
    *
    * @param pokemon the attacker pokemon
@@ -1411,16 +1401,10 @@ export class DamageBoostAbAttr extends PreAttackAbAttr {
    * @param defender the target pokemon
    * @param move the move used by the attacker pokemon
    * @param args Utils.NumberHolder as damage
-   * @returns true if the function succeeds
    */
-  applyPreAttack(pokemon: Pokemon, passive: boolean, simulated: boolean, defender: Pokemon, move: Move, args: any[]): boolean {
-    if (this.condition(pokemon, defender, move)) {
-      const power = args[0] as Utils.NumberHolder;
-      power.value = Math.floor(power.value * this.damageMultiplier);
-      return true;
-    }
-
-    return false;
+  override applyPreAttack(pokemon: Pokemon, passive: boolean, simulated: boolean, defender: Pokemon, move: Move, args: any[]): void {
+    const power = args[0] as NumberHolder;
+    power.value = toDmgValue(power.value * this.damageMultiplier);
   }
 }
 
@@ -1428,31 +1412,29 @@ export class MovePowerBoostAbAttr extends VariableMovePowerAbAttr {
   private condition: PokemonAttackCondition;
   private powerMultiplier: number;
 
-  constructor(condition: PokemonAttackCondition, powerMultiplier: number, showAbility: boolean = true) {
+  constructor(condition: PokemonAttackCondition, powerMultiplier: number, showAbility: boolean = false) {
     super(showAbility);
     this.condition = condition;
     this.powerMultiplier = powerMultiplier;
   }
 
-  applyPreAttack(pokemon: Pokemon, passive: boolean, simulated: boolean, defender: Pokemon, move: Move, args: any[]): boolean {
-    if (this.condition(pokemon, defender, move)) {
-      (args[0] as Utils.NumberHolder).value *= this.powerMultiplier;
+  override canApplyPreAttack(pokemon: Pokemon, passive: boolean, simulated: boolean, defender: Pokemon | null, move: Move, args: any[]): boolean {
+    return this.condition(pokemon, defender, move);
+  }
 
-      return true;
-    }
-
-    return false;
+  override applyPreAttack(pokemon: Pokemon, passive: boolean, simulated: boolean, defender: Pokemon, move: Move, args: any[]): void {
+    (args[0] as NumberHolder).value *= this.powerMultiplier;
   }
 }
 
 export class MoveTypePowerBoostAbAttr extends MovePowerBoostAbAttr {
-  constructor(boostedType: Type, powerMultiplier?: number) {
-    super((pokemon, defender, move) => pokemon?.getMoveType(move) === boostedType, powerMultiplier || 1.5);
+  constructor(boostedType: PokemonType, powerMultiplier?: number) {
+    super((pokemon, defender, move) => pokemon?.getMoveType(move) === boostedType, powerMultiplier || 1.5, false);
   }
 }
 
 export class LowHpMoveTypePowerBoostAbAttr extends MoveTypePowerBoostAbAttr {
-  constructor(boostedType: Type) {
+  constructor(boostedType: PokemonType) {
     super(boostedType);
   }
 
@@ -1473,22 +1455,18 @@ export class VariableMovePowerBoostAbAttr extends VariableMovePowerAbAttr {
    * @param mult A function which takes the user, target, and move, and returns the power multiplier. 1 means no multiplier.
    * @param {boolean} showAbility Whether to show the ability when it activates.
    */
-  constructor(mult: (user: Pokemon, target: Pokemon, move: Move) => number, showAbility: boolean = true) {
+  constructor(mult: (user: Pokemon, target: Pokemon, move: Move) => number, showAbility = true) {
     super(showAbility);
     this.mult = mult;
   }
 
-  /**
-   * @override
-   */
-  applyPreAttack(pokemon: Pokemon, passive: boolean, simulated: boolean, defender: Pokemon, move, args: any[]): boolean {
-    const multiplier = this.mult(pokemon, defender, move);
-    if (multiplier !== 1) {
-      (args[0] as Utils.NumberHolder).value *= multiplier;
-      return true;
-    }
+  override canApplyPreAttack(pokemon: Pokemon, passive: boolean, simulated: boolean, defender: Pokemon, move: Move, args: any[]): boolean {
+    return this.mult(pokemon, defender, move) !== 1;
+  }
 
-    return false;
+  override applyPreAttack(pokemon: Pokemon, passive: boolean, simulated: boolean, defender: Pokemon, move: Move, args: any[]): void {
+    const multiplier = this.mult(pokemon, defender, move);
+    (args[0] as NumberHolder).value *= multiplier;
   }
 }
 
@@ -1497,6 +1475,7 @@ export class VariableMovePowerBoostAbAttr extends VariableMovePowerAbAttr {
  * @extends AbAttr
  */
 export class FieldMovePowerBoostAbAttr extends AbAttr {
+  // TODO: Refactor this class? It extends from base AbAttr but has preAttack methods and gets called directly instead of going through applyAbAttrsInternal
   private condition: PokemonAttackCondition;
   private powerMultiplier: number;
 
@@ -1510,14 +1489,14 @@ export class FieldMovePowerBoostAbAttr extends AbAttr {
     this.powerMultiplier = powerMultiplier;
   }
 
-  applyPreAttack(pokemon: Pokemon | null, passive: boolean | null, simulated: boolean, defender: Pokemon | null, move: Move, args: any[]): boolean {
+  canApplyPreAttack(pokemon: Pokemon | null, passive: boolean | null, simulated: boolean, defender: Pokemon | null, move: Move, args: any[]): boolean {
+    return true; // logic for this attr is handled in move.ts instead of normally
+  }
+
+  applyPreAttack(pokemon: Pokemon | null, passive: boolean | null, simulated: boolean, defender: Pokemon | null, move: Move, args: any[]): void {
     if (this.condition(pokemon, defender, move)) {
-      (args[0] as Utils.NumberHolder).value *= this.powerMultiplier;
-
-      return true;
+      (args[0] as NumberHolder).value *= this.powerMultiplier;
     }
-
-    return false;
   }
 }
 
@@ -1530,7 +1509,7 @@ export class PreAttackFieldMoveTypePowerBoostAbAttr extends FieldMovePowerBoostA
    * @param boostedType - The type of move that will receive the power boost.
    * @param powerMultiplier - The multiplier to apply to the move's power, defaults to 1.5 if not provided.
    */
-  constructor(boostedType: Type, powerMultiplier?: number) {
+  constructor(boostedType: PokemonType, powerMultiplier?: number) {
     super((pokemon, defender, move) => pokemon?.getMoveType(move) === boostedType, powerMultiplier || 1.5);
   }
 }
@@ -1574,14 +1553,25 @@ export class StatMultiplierAbAttr extends AbAttr {
     this.condition = condition ?? null;
   }
 
-  applyStatStage(pokemon: Pokemon, _passive: boolean, simulated: boolean, stat: BattleStat, statValue: Utils.NumberHolder, args: any[]): boolean | Promise<boolean> {
+  canApplyStatStage(
+    pokemon: Pokemon,
+    _passive: boolean,
+    simulated: boolean,
+    stat: BattleStat,
+    statValue: NumberHolder,
+    args: any[]): boolean {
     const move = (args[0] as Move);
-    if (stat === this.stat && (!this.condition || this.condition(pokemon, null, move))) {
-      statValue.value *= this.multiplier;
-      return true;
-    }
+    return stat === this.stat && (!this.condition || this.condition(pokemon, null, move));
+  }
 
-    return false;
+  applyStatStage(
+    pokemon: Pokemon,
+    _passive: boolean,
+    simulated: boolean,
+    stat: BattleStat,
+    statValue: NumberHolder,
+    args: any[]): void {
+    statValue.value *= this.multiplier;
   }
 }
 
@@ -1589,32 +1579,93 @@ export class PostAttackAbAttr extends AbAttr {
   private attackCondition: PokemonAttackCondition;
 
   /** The default attackCondition requires that the selected move is a damaging move */
-  constructor(attackCondition: PokemonAttackCondition = (user, target, move) => (move.category !== MoveCategory.STATUS), showAbility: boolean = true) {
+  constructor(attackCondition: PokemonAttackCondition = (user, target, move) => (move.category !== MoveCategory.STATUS), showAbility = true) {
     super(showAbility);
 
     this.attackCondition = attackCondition;
   }
 
   /**
-   * Please override {@link applyPostAttackAfterMoveTypeCheck} instead of this method. By default, this method checks that the move used is a damaging attack before
+   * By default, this method checks that the move used is a damaging attack before
    * applying the effect of any inherited class. This can be changed by providing a different {@link attackCondition} to the constructor. See {@link ConfusionOnStatusEffectAbAttr}
    * for an example of an effect that does not require a damaging move.
    */
-  applyPostAttack(pokemon: Pokemon, passive: boolean, simulated: boolean, defender: Pokemon, move: Move, hitResult: HitResult | null, args: any[]): boolean | Promise<boolean> {
+  canApplyPostAttack(
+    pokemon: Pokemon,
+    passive: boolean,
+    simulated: boolean,
+    defender: Pokemon,
+    move: Move,
+    hitResult: HitResult | null,
+    args: any[]): boolean {
     // When attackRequired is true, we require the move to be an attack move and to deal damage before checking secondary requirements.
     // If attackRequired is false, we always defer to the secondary requirements.
-    if (this.attackCondition(pokemon, defender, move)) {
-      return this.applyPostAttackAfterMoveTypeCheck(pokemon, passive, simulated, defender, move, hitResult, args);
-    } else {
-      return false;
-    }
+    return this.attackCondition(pokemon, defender, move);
+  }
+
+  applyPostAttack(
+    pokemon: Pokemon,
+    passive: boolean,
+    simulated: boolean,
+    defender: Pokemon,
+    move: Move,
+    hitResult: HitResult | null,
+    args: any[]): void {}
+}
+
+/**
+ * Multiplies a Stat from an ally pokemon's ability.
+ * @see {@link applyAllyStatMultiplierAbAttrs}
+ * @see {@link applyAllyStat}
+ */
+export class AllyStatMultiplierAbAttr extends AbAttr {
+  private stat: BattleStat;
+  private multiplier: number;
+  private ignorable: boolean;
+
+  /**
+   * @param stat - The stat being modified
+   * @param multipler - The multiplier to apply to the stat
+   * @param ignorable - Whether the multiplier can be ignored by mold breaker-like moves and abilities
+   */
+  constructor(stat: BattleStat, multiplier: number, ignorable: boolean = true) {
+    super(false);
+
+    this.stat = stat;
+    this.multiplier = multiplier;
+    this.ignorable = ignorable;
   }
 
   /**
-   * This method is only called after {@link applyPostAttack} has already been applied. Use this for handling checks specific to the ability in question.
+   * Multiply a Pokemon's Stat due to an Ally's ability.
+   * @param _pokemon - The ally {@linkcode Pokemon} with the ability (unused)
+   * @param passive - unused
+   * @param _simulated - Whether the ability is being simulated (unused)
+   * @param _stat - The type of the checked {@linkcode Stat} (unused)
+   * @param statValue - {@linkcode NumberHolder} containing the value of the checked stat
+   * @param _checkedPokemon - The {@linkcode Pokemon} this ability is targeting (unused)
+   * @param _ignoreAbility - Whether the ability should be ignored if possible
+   * @param _args - unused
+   * @returns `true` if this changed the checked stat, `false` otherwise.
    */
-  applyPostAttackAfterMoveTypeCheck(pokemon: Pokemon, passive: boolean, simulated: boolean, defender: Pokemon, move: Move, hitResult: HitResult | null, args: any[]): boolean | Promise<boolean> {
-    return false;
+  applyAllyStat(_pokemon: Pokemon, _passive: boolean, _simulated: boolean, _stat: BattleStat, statValue: NumberHolder, _checkedPokemon: Pokemon, _ignoreAbility: boolean, _args: any[]) {
+    statValue.value *= this.multiplier;
+  }
+
+  /**
+   * Check if this ability can apply to the checked stat.
+   * @param pokemon - The ally {@linkcode Pokemon} with the ability (unused)
+   * @param passive - unused
+   * @param simulated - Whether the ability is being simulated (unused)
+   * @param stat - The type of the checked {@linkcode Stat}
+   * @param statValue - {@linkcode NumberHolder} containing the value of the checked stat
+   * @param checkedPokemon - The {@linkcode Pokemon} this ability is targeting (unused)
+   * @param ignoreAbility - Whether the ability should be ignored if possible
+   * @param args - unused
+   * @returns `true` if this can apply to the checked stat, `false` otherwise.
+   */
+  canApplyAllyStat(pokemon: Pokemon, _passive: boolean, simulated: boolean, stat: BattleStat, statValue: NumberHolder, checkedPokemon: Pokemon, ignoreAbility: boolean, args: any[]): boolean {
+    return stat === this.stat && !(ignoreAbility && this.ignorable);
   }
 }
 
@@ -1627,6 +1678,18 @@ export class GorillaTacticsAbAttr extends PostAttackAbAttr {
     super((user, target, move) => true, false);
   }
 
+  override canApplyPostAttack(
+    pokemon: Pokemon,
+    passive: boolean,
+    simulated: boolean,
+    defender: Pokemon,
+    move: Move,
+    hitResult: HitResult | null,
+    args: any[]): boolean {
+    return super.canApplyPostAttack(pokemon, passive, simulated, defender, move, hitResult, args)
+      && simulated || !pokemon.getTag(BattlerTagType.GORILLA_TACTICS);
+  }
+
   /**
    *
    * @param {Pokemon} pokemon the {@linkcode Pokemon} with this ability
@@ -1636,24 +1699,24 @@ export class GorillaTacticsAbAttr extends PostAttackAbAttr {
    * @param move n/a
    * @param hitResult n/a
    * @param args n/a
-   * @returns `true` if the ability is applied
    */
-  applyPostAttackAfterMoveTypeCheck(pokemon: Pokemon, passive: boolean, simulated: boolean, defender: Pokemon, move: Move, hitResult: HitResult | null, args: any[]): boolean | Promise<boolean> {
-    if (simulated) {
-      return simulated;
+  override applyPostAttack(
+    pokemon: Pokemon,
+    passive: boolean,
+    simulated: boolean,
+    defender: Pokemon,
+    move: Move,
+    hitResult: HitResult | null,
+    args: any[]): void {
+    if (!simulated) {
+      pokemon.addTag(BattlerTagType.GORILLA_TACTICS);
     }
-
-    if (pokemon.getTag(BattlerTagType.GORILLA_TACTICS)) {
-      return false;
-    }
-
-    pokemon.addTag(BattlerTagType.GORILLA_TACTICS);
-    return true;
   }
 }
 
 export class PostAttackStealHeldItemAbAttr extends PostAttackAbAttr {
   private stealCondition: PokemonAttackCondition | null;
+  private stolenItem?: PokemonHeldItemModifier;
 
   constructor(stealCondition?: PokemonAttackCondition) {
     super();
@@ -1661,23 +1724,56 @@ export class PostAttackStealHeldItemAbAttr extends PostAttackAbAttr {
     this.stealCondition = stealCondition ?? null;
   }
 
-  applyPostAttackAfterMoveTypeCheck(pokemon: Pokemon, passive: boolean, simulated: boolean, defender: Pokemon, move: Move, hitResult: HitResult, args: any[]): Promise<boolean> {
-    return new Promise<boolean>(resolve => {
-      if (!simulated && hitResult < HitResult.NO_EFFECT && (!this.stealCondition || this.stealCondition(pokemon, defender, move))) {
-        const heldItems = this.getTargetHeldItems(defender).filter(i => i.isTransferable);
-        if (heldItems.length) {
-          const stolenItem = heldItems[pokemon.randSeedInt(heldItems.length)];
-          globalScene.tryTransferHeldItemModifier(stolenItem, pokemon, false).then(success => {
-            if (success) {
-              globalScene.queueMessage(i18next.t("abilityTriggers:postAttackStealHeldItem", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), defenderName: defender.name, stolenItemType: stolenItem.type.name }));
-            }
-            resolve(success);
-          });
-          return;
+  override canApplyPostAttack(
+    pokemon: Pokemon,
+    passive: boolean,
+    simulated: boolean,
+    defender: Pokemon,
+    move: Move,
+    hitResult: HitResult,
+    args: any[]): boolean {
+    if (
+      super.canApplyPostAttack(pokemon, passive, simulated, defender, move, hitResult, args) &&
+      !simulated &&
+      hitResult < HitResult.NO_EFFECT &&
+      (!this.stealCondition || this.stealCondition(pokemon, defender, move))
+    ) {
+      const heldItems = this.getTargetHeldItems(defender).filter((i) => i.isTransferable);
+      if (heldItems.length) {
+        // Ensure that the stolen item in testing is the same as when the effect is applied
+        this.stolenItem = heldItems[pokemon.randBattleSeedInt(heldItems.length)];
+        if (globalScene.canTransferHeldItemModifier(this.stolenItem, pokemon)) {
+          return true;
         }
       }
-      resolve(simulated);
-    });
+    }
+    this.stolenItem = undefined;
+    return false;
+  }
+
+  override applyPostAttack(
+    pokemon: Pokemon,
+    passive: boolean,
+    simulated: boolean,
+    defender: Pokemon,
+    move: Move,
+    hitResult: HitResult,
+    args: any[],
+  ): void {
+    const heldItems = this.getTargetHeldItems(defender).filter((i) => i.isTransferable);
+    if (!this.stolenItem) {
+      this.stolenItem = heldItems[pokemon.randBattleSeedInt(heldItems.length)];
+    }
+    if (globalScene.tryTransferHeldItemModifier(this.stolenItem, pokemon, false)) {
+      globalScene.queueMessage(
+        i18next.t("abilityTriggers:postAttackStealHeldItem", {
+          pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
+          defenderName: defender.name,
+          stolenItemType: this.stolenItem.type.name,
+        }),
+      );
+    }
+    this.stolenItem = undefined;
   }
 
   getTargetHeldItems(target: Pokemon): PokemonHeldItemModifier[] {
@@ -1699,18 +1795,22 @@ export class PostAttackApplyStatusEffectAbAttr extends PostAttackAbAttr {
     this.effects = effects;
   }
 
-  applyPostAttackAfterMoveTypeCheck(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, hitResult: HitResult, args: any[]): boolean {
-    if (pokemon !== attacker && move.hitsSubstitute(attacker, pokemon)) {
-      return false;
+  override canApplyPostAttack(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, hitResult: HitResult | null, args: any[]): boolean {
+    if (
+      super.canApplyPostAttack(pokemon, passive, simulated, attacker, move, hitResult, args)
+      && (simulated || !attacker.hasAbilityWithAttr(IgnoreMoveEffectsAbAttr) && pokemon !== attacker
+      && (!this.contactRequired || move.doesFlagEffectApply({flag: MoveFlags.MAKES_CONTACT, user: attacker, target: pokemon})) && pokemon.randBattleSeedInt(100) < this.chance && !pokemon.status)
+    ) {
+      const effect = this.effects.length === 1 ? this.effects[0] : this.effects[pokemon.randBattleSeedInt(this.effects.length)];
+      return simulated || attacker.canSetStatus(effect, true, false, pokemon);
     }
 
-    /**Status inflicted by abilities post attacking are also considered additional effects.*/
-    if (!attacker.hasAbilityWithAttr(IgnoreMoveEffectsAbAttr) && !simulated && pokemon !== attacker && (!this.contactRequired || move.checkFlag(MoveFlags.MAKES_CONTACT, attacker, pokemon)) && pokemon.randSeedInt(100) < this.chance && !pokemon.status) {
-      const effect = this.effects.length === 1 ? this.effects[0] : this.effects[pokemon.randSeedInt(this.effects.length)];
-      return attacker.trySetStatus(effect, true, pokemon);
-    }
+    return false;
+  }
 
-    return simulated;
+  applyPostAttack(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, hitResult: HitResult, args: any[]): void {
+    const effect = this.effects.length === 1 ? this.effects[0] : this.effects[pokemon.randBattleSeedInt(this.effects.length)];
+    attacker.trySetStatus(effect, true, pokemon);
   }
 }
 
@@ -1727,26 +1827,32 @@ export class PostAttackApplyBattlerTagAbAttr extends PostAttackAbAttr {
 
 
   constructor(contactRequired: boolean, chance: (user: Pokemon, target: Pokemon, move: Move) =>  number, ...effects: BattlerTagType[]) {
-    super();
+    super(undefined, false);
 
     this.contactRequired = contactRequired;
     this.chance = chance;
     this.effects = effects;
   }
 
-  applyPostAttackAfterMoveTypeCheck(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, hitResult: HitResult, args: any[]): boolean {
+  override canApplyPostAttack(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, hitResult: HitResult | null, args: any[]): boolean {
     /**Battler tags inflicted by abilities post attacking are also considered additional effects.*/
-    if (!attacker.hasAbilityWithAttr(IgnoreMoveEffectsAbAttr) && pokemon !== attacker && (!this.contactRequired || move.checkFlag(MoveFlags.MAKES_CONTACT, attacker, pokemon)) && pokemon.randSeedInt(100) < this.chance(attacker, pokemon, move) && !pokemon.status) {
-      const effect = this.effects.length === 1 ? this.effects[0] : this.effects[pokemon.randSeedInt(this.effects.length)];
-      return simulated || attacker.addTag(effect);
-    }
+    return super.canApplyPostAttack(pokemon, passive, simulated, attacker, move, hitResult, args) &&
+      !attacker.hasAbilityWithAttr(IgnoreMoveEffectsAbAttr) && pokemon !== attacker &&
+      (!this.contactRequired || move.doesFlagEffectApply({flag: MoveFlags.MAKES_CONTACT, user: attacker, target: pokemon})) &&
+      pokemon.randBattleSeedInt(100) < this.chance(attacker, pokemon, move) && !pokemon.status;
+  }
 
-    return false;
+  override applyPostAttack(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, hitResult: HitResult, args: any[]): void {
+    if (!simulated) {
+      const effect = this.effects.length === 1 ? this.effects[0] : this.effects[pokemon.randBattleSeedInt(this.effects.length)];
+      attacker.addTag(effect);
+    }
   }
 }
 
 export class PostDefendStealHeldItemAbAttr extends PostDefendAbAttr {
   private condition?: PokemonDefendCondition;
+  private stolenItem?: PokemonHeldItemModifier;
 
   constructor(condition?: PokemonDefendCondition) {
     super();
@@ -1754,23 +1860,47 @@ export class PostDefendStealHeldItemAbAttr extends PostDefendAbAttr {
     this.condition = condition;
   }
 
-  override applyPostDefend(pokemon: Pokemon, _passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, hitResult: HitResult, _args: any[]): Promise<boolean> {
-    return new Promise<boolean>(resolve => {
-      if (!simulated && hitResult < HitResult.NO_EFFECT && (!this.condition || this.condition(pokemon, attacker, move)) && !move.hitsSubstitute(attacker, pokemon)) {
-        const heldItems = this.getTargetHeldItems(attacker).filter(i => i.isTransferable);
-        if (heldItems.length) {
-          const stolenItem = heldItems[pokemon.randSeedInt(heldItems.length)];
-          globalScene.tryTransferHeldItemModifier(stolenItem, pokemon, false).then(success => {
-            if (success) {
-              globalScene.queueMessage(i18next.t("abilityTriggers:postDefendStealHeldItem", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), attackerName: attacker.name, stolenItemType: stolenItem.type.name }));
-            }
-            resolve(success);
-          });
-          return;
+  override canApplyPostDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, hitResult: HitResult, args: any[]): boolean {
+    if (
+      !simulated &&
+      hitResult < HitResult.NO_EFFECT &&
+      (!this.condition || this.condition(pokemon, attacker, move))
+    ) {
+      const heldItems = this.getTargetHeldItems(attacker).filter((i) => i.isTransferable);
+      if (heldItems.length) {
+        this.stolenItem = heldItems[pokemon.randBattleSeedInt(heldItems.length)];
+        if (globalScene.canTransferHeldItemModifier(this.stolenItem, pokemon)) {
+          return true;
         }
       }
-      resolve(simulated);
-    });
+    }
+    return false;
+  }
+
+  override applyPostDefend(
+    pokemon: Pokemon,
+    _passive: boolean,
+    simulated: boolean,
+    attacker: Pokemon,
+    move: Move,
+    hitResult: HitResult,
+    _args: any[],
+  ): void {
+
+    const heldItems = this.getTargetHeldItems(attacker).filter((i) => i.isTransferable);
+    if (!this.stolenItem) {
+      this.stolenItem = heldItems[pokemon.randBattleSeedInt(heldItems.length)];
+    }
+    if (globalScene.tryTransferHeldItemModifier(this.stolenItem, pokemon, false)) {
+      globalScene.queueMessage(
+        i18next.t("abilityTriggers:postDefendStealHeldItem", {
+          pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
+          attackerName: attacker.name,
+          stolenItemType: this.stolenItem.type.name,
+        }),
+      );
+    }
+    this.stolenItem = undefined;
   }
 
   getTargetHeldItems(target: Pokemon): PokemonHeldItemModifier[] {
@@ -1784,6 +1914,16 @@ export class PostDefendStealHeldItemAbAttr extends PostDefendAbAttr {
  * @see {@linkcode applyPostSetStatus()}.
  */
 export class PostSetStatusAbAttr extends AbAttr {
+  canApplyPostSetStatus(
+    pokemon: Pokemon,
+    sourcePokemon: Pokemon | null = null,
+    passive: boolean,
+    effect: StatusEffect,
+    simulated: boolean,
+    rgs: any[]): boolean {
+    return true;
+  }
+
   /**
    * Does nothing after a status condition is set.
    * @param pokemon {@linkcode Pokemon} that status condition was set on.
@@ -1791,11 +1931,15 @@ export class PostSetStatusAbAttr extends AbAttr {
    * @param passive Whether this ability is a passive.
    * @param effect {@linkcode StatusEffect} that was set.
    * @param args Set of unique arguments needed by this attribute.
-   * @returns `true` if application of the ability succeeds.
    */
-  applyPostSetStatus(pokemon: Pokemon, sourcePokemon: Pokemon | null = null, passive: boolean, effect: StatusEffect, simulated: boolean, args: any[]) : boolean | Promise<boolean> {
-    return false;
-  }
+  applyPostSetStatus(
+    pokemon: Pokemon,
+    sourcePokemon: Pokemon | null = null,
+    passive: boolean,
+    effect: StatusEffect,
+    simulated: boolean,
+    args: any[],
+  ): void {}
 }
 
 /**
@@ -1804,17 +1948,7 @@ export class PostSetStatusAbAttr extends AbAttr {
  * ability attribute. For Synchronize ability.
  */
 export class SynchronizeStatusAbAttr extends PostSetStatusAbAttr {
-  /**
-   * If the `StatusEffect` that was set is Burn, Paralysis, Poison, or Toxic, and the status
-   * was set by a source Pokemon, set the source Pokemon's status to the same `StatusEffect`.
-   * @param pokemon {@linkcode Pokemon} that status condition was set on.
-   * @param sourcePokemon {@linkcode Pokemon} that that set the status condition. Is null if status was not set by a Pokemon.
-   * @param passive Whether this ability is a passive.
-   * @param effect {@linkcode StatusEffect} that was set.
-   * @param args Set of unique arguments needed by this attribute.
-   * @returns `true` if application of the ability succeeds.
-   */
-  override applyPostSetStatus(pokemon: Pokemon, sourcePokemon: Pokemon | null = null, passive: boolean, effect: StatusEffect, simulated: boolean, args: any[]): boolean {
+  override canApplyPostSetStatus(pokemon: Pokemon, sourcePokemon: (Pokemon | null) | undefined, passive: boolean, effect: StatusEffect, simulated: boolean, args: any[]): boolean {
     /** Synchronizable statuses */
     const syncStatuses = new Set<StatusEffect>([
       StatusEffect.BURN,
@@ -1823,21 +1957,32 @@ export class SynchronizeStatusAbAttr extends PostSetStatusAbAttr {
       StatusEffect.TOXIC
     ]);
 
-    if (sourcePokemon && syncStatuses.has(effect)) {
-      if (!simulated) {
-        sourcePokemon.trySetStatus(effect, true, pokemon);
-      }
-      return true;
-    }
+    // synchronize does not need to check canSetStatus because the ability shows even if it fails to set the status
+    return ((sourcePokemon ?? false) && syncStatuses.has(effect));
+  }
 
-    return false;
+  /**
+   * If the `StatusEffect` that was set is Burn, Paralysis, Poison, or Toxic, and the status
+   * was set by a source Pokemon, set the source Pokemon's status to the same `StatusEffect`.
+   * @param pokemon {@linkcode Pokemon} that status condition was set on.
+   * @param sourcePokemon {@linkcode Pokemon} that that set the status condition. Is null if status was not set by a Pokemon.
+   * @param passive Whether this ability is a passive.
+   * @param effect {@linkcode StatusEffect} that was set.
+   * @param args Set of unique arguments needed by this attribute.
+   */
+  override applyPostSetStatus(pokemon: Pokemon, sourcePokemon: Pokemon | null = null, passive: boolean, effect: StatusEffect, simulated: boolean, args: any[]): void {
+    if (!simulated && sourcePokemon) {
+      sourcePokemon.trySetStatus(effect, true, pokemon);
+    }
   }
 }
 
 export class PostVictoryAbAttr extends AbAttr {
-  applyPostVictory(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean | Promise<boolean> {
-    return false;
+  canApplyPostVictory(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean {
+    return true;
   }
+
+  applyPostVictory(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): void {}
 }
 
 class PostVictoryStatStageChangeAbAttr extends PostVictoryAbAttr {
@@ -1851,14 +1996,11 @@ class PostVictoryStatStageChangeAbAttr extends PostVictoryAbAttr {
     this.stages = stages;
   }
 
-  applyPostVictory(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean | Promise<boolean> {
-    const stat = typeof this.stat === "function"
-      ? this.stat(pokemon)
-      : this.stat;
+  override applyPostVictory(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): void {
+    const stat = typeof this.stat === "function" ? this.stat(pokemon) : this.stat;
     if (!simulated) {
       globalScene.unshiftPhase(new StatStageChangePhase(pokemon.getBattlerIndex(), true, [ stat ], this.stages));
     }
-    return true;
   }
 }
 
@@ -1871,23 +2013,24 @@ export class PostVictoryFormChangeAbAttr extends PostVictoryAbAttr {
     this.formFunc = formFunc;
   }
 
-  applyPostVictory(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean | Promise<boolean> {
+  override canApplyPostVictory(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean {
     const formIndex = this.formFunc(pokemon);
-    if (formIndex !== pokemon.formIndex) {
-      if (!simulated) {
-        globalScene.triggerPokemonFormChange(pokemon, SpeciesFormChangeAbilityTrigger, false);
-      }
-      return true;
-    }
+    return formIndex !== pokemon.formIndex;
+  }
 
-    return false;
+  override applyPostVictory(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): void {
+    if (!simulated) {
+      globalScene.triggerPokemonFormChange(pokemon, SpeciesFormChangeAbilityTrigger, false);
+    }
   }
 }
 
 export class PostKnockOutAbAttr extends AbAttr {
-  applyPostKnockOut(pokemon: Pokemon, passive: boolean, simulated: boolean, knockedOut: Pokemon, args: any[]): boolean | Promise<boolean> {
-    return false;
+  canApplyPostKnockOut(pokemon: Pokemon, passive: boolean, simulated: boolean, knockedOut: Pokemon, args: any[]): boolean {
+    return true;
   }
+
+  applyPostKnockOut(pokemon: Pokemon, passive: boolean, simulated: boolean, knockedOut: Pokemon, args: any[]): void {}
 }
 
 export class PostKnockOutStatStageChangeAbAttr extends PostKnockOutAbAttr {
@@ -1901,14 +2044,11 @@ export class PostKnockOutStatStageChangeAbAttr extends PostKnockOutAbAttr {
     this.stages = stages;
   }
 
-  applyPostKnockOut(pokemon: Pokemon, passive: boolean, simulated: boolean, knockedOut: Pokemon, args: any[]): boolean | Promise<boolean> {
-    const stat = typeof this.stat === "function"
-      ? this.stat(pokemon)
-      : this.stat;
+  override applyPostKnockOut(pokemon: Pokemon, passive: boolean, simulated: boolean, knockedOut: Pokemon, args: any[]): void {
+    const stat = typeof this.stat === "function" ? this.stat(pokemon) : this.stat;
     if (!simulated) {
       globalScene.unshiftPhase(new StatStageChangePhase(pokemon.getBattlerIndex(), true, [ stat ], this.stages));
     }
-    return true;
   }
 }
 
@@ -1917,16 +2057,15 @@ export class CopyFaintedAllyAbilityAbAttr extends PostKnockOutAbAttr {
     super();
   }
 
-  applyPostKnockOut(pokemon: Pokemon, passive: boolean, simulated: boolean, knockedOut: Pokemon, args: any[]): boolean | Promise<boolean> {
-    if (pokemon.isPlayer() === knockedOut.isPlayer() && !knockedOut.getAbility().hasAttr(UncopiableAbilityAbAttr)) {
-      if (!simulated) {
-        pokemon.summonData.ability = knockedOut.getAbility().id;
-        globalScene.queueMessage(i18next.t("abilityTriggers:copyFaintedAllyAbility", { pokemonNameWithAffix: getPokemonNameWithAffix(knockedOut), abilityName: allAbilities[knockedOut.getAbility().id].name }));
-      }
-      return true;
-    }
+  override canApplyPostKnockOut(pokemon: Pokemon, passive: boolean, simulated: boolean, knockedOut: Pokemon, args: any[]): boolean {
+    return pokemon.isPlayer() === knockedOut.isPlayer() && knockedOut.getAbility().isCopiable;
+  }
 
-    return false;
+  override applyPostKnockOut(pokemon: Pokemon, passive: boolean, simulated: boolean, knockedOut: Pokemon, args: any[]): void {
+    if (!simulated) {
+      pokemon.setTempAbility(knockedOut.getAbility());
+      globalScene.queueMessage(i18next.t("abilityTriggers:copyFaintedAllyAbility", { pokemonNameWithAffix: getPokemonNameWithAffix(knockedOut), abilityName: allAbilities[knockedOut.getAbility().id].name }));
+    }
   }
 }
 
@@ -1943,6 +2082,10 @@ export class IgnoreOpponentStatStagesAbAttr extends AbAttr {
     this.stats = stats ?? BATTLE_STATS;
   }
 
+  override canApply(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean {
+    return this.stats.includes(args[0]);
+  }
+
   /**
    * Modifies a BooleanHolder and returns the result to see if a stat is ignored or not
    * @param _pokemon n/a
@@ -1950,14 +2093,9 @@ export class IgnoreOpponentStatStagesAbAttr extends AbAttr {
    * @param simulated n/a
    * @param _cancelled n/a
    * @param args A BooleanHolder that represents whether or not to ignore a stat's stat changes
-   * @returns true if the stat is ignored, false otherwise
    */
-  apply(_pokemon: Pokemon, _passive: boolean, simulated: boolean, _cancelled: Utils.BooleanHolder, args: any[]) {
-    if (this.stats.includes(args[0])) {
-      (args[1] as Utils.BooleanHolder).value = true;
-      return true;
-    }
-    return false;
+  override apply(_pokemon: Pokemon, _passive: boolean, simulated: boolean, _cancelled: BooleanHolder, args: any[]): void {
+    (args[1] as BooleanHolder).value = true;
   }
 }
 
@@ -1966,9 +2104,8 @@ export class IntimidateImmunityAbAttr extends AbAttr {
     super(false);
   }
 
-  apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean {
+  override apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: BooleanHolder, args: any[]): void {
     cancelled.value = true;
-    return true;
   }
 
   getTriggerMessage(pokemon: Pokemon, abilityName: string, ...args: any[]): string {
@@ -1991,12 +2128,11 @@ export class PostIntimidateStatStageChangeAbAttr extends AbAttr {
     this.overwrites = !!overwrites;
   }
 
-  apply(pokemon: Pokemon, passive: boolean, simulated:boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean {
+  override apply(pokemon: Pokemon, passive: boolean, simulated:boolean, cancelled: BooleanHolder, args: any[]): void {
     if (!simulated) {
       globalScene.pushPhase(new StatStageChangePhase(pokemon.getBattlerIndex(), false, this.stats, this.stages));
     }
     cancelled.value = this.overwrites;
-    return true;
   }
 }
 
@@ -2005,18 +2141,39 @@ export class PostIntimidateStatStageChangeAbAttr extends AbAttr {
  * @see {@linkcode applyPostSummon()}
  */
 export class PostSummonAbAttr extends AbAttr {
+  /** Should the ability activate when gained in battle? This will almost always be true */
+  private activateOnGain: boolean;
+
+  constructor(showAbility = true, activateOnGain = true) {
+    super(showAbility);
+    this.activateOnGain = activateOnGain;
+  }
+
+  /**
+   * @returns Whether the ability should activate when gained in battle
+   */
+  shouldActivateOnGain(): boolean {
+    return this.activateOnGain;
+  }
+
+  canApplyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean {
+    return true;
+  }
+
   /**
    * Applies ability post summon (after switching in)
    * @param pokemon {@linkcode Pokemon} with this ability
    * @param passive Whether this ability is a passive
    * @param args Set of unique arguments needed by this attribute
-   * @returns true if application of the ability succeeds
    */
-  applyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean | Promise<boolean> {
-    return false;
-  }
+  applyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): void {}
 }
 
+/**
+ * Base class for ability attributes which remove an effect on summon
+ */
+export class PostSummonRemoveEffectAbAttr extends PostSummonAbAttr {}
+
 /**
  * Removes specified arena tags when a Pokemon is summoned.
  */
@@ -2032,13 +2189,43 @@ export class PostSummonRemoveArenaTagAbAttr extends PostSummonAbAttr {
     this.arenaTags = arenaTags;
   }
 
-  applyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean | Promise<boolean> {
+  override canApplyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean {
+    return globalScene.arena.tags.some(tag => this.arenaTags.includes(tag.tagType));
+  }
+
+  override applyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): void {
     if (!simulated) {
       for (const arenaTag of this.arenaTags) {
         globalScene.arena.removeTag(arenaTag);
       }
     }
-    return true;
+  }
+}
+
+/**
+ * Generic class to add an arena tag upon switching in
+ */
+export class PostSummonAddArenaTagAbAttr extends PostSummonAbAttr {
+  private readonly tagType: ArenaTagType;
+  private readonly turnCount: number;
+  private readonly side?: ArenaTagSide;
+  private readonly quiet?: boolean;
+  private sourceId: number;
+
+
+  constructor(showAbility: boolean, tagType: ArenaTagType, turnCount: number, side?: ArenaTagSide, quiet?: boolean) {
+    super(showAbility);
+    this.tagType = tagType;
+    this.turnCount = turnCount;
+    this.side = side;
+    this.quiet = quiet;
+  }
+
+  public override applyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): void {
+    this.sourceId = pokemon.id;
+    if (!simulated) {
+      globalScene.arena.addTag(this.tagType, this.turnCount, undefined, this.sourceId, this.side, this.quiet);
+    }
   }
 }
 
@@ -2051,12 +2238,10 @@ export class PostSummonMessageAbAttr extends PostSummonAbAttr {
     this.messageFunc = messageFunc;
   }
 
-  applyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean {
+  override applyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): void {
     if (!simulated) {
       globalScene.queueMessage(this.messageFunc(pokemon));
     }
-
-    return true;
   }
 }
 
@@ -2070,12 +2255,10 @@ export class PostSummonUnnamedMessageAbAttr extends PostSummonAbAttr {
     this.message = message;
   }
 
-  applyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean {
+  override applyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): void {
     if (!simulated) {
       globalScene.queueMessage(this.message);
     }
-
-    return true;
   }
 }
 
@@ -2090,15 +2273,42 @@ export class PostSummonAddBattlerTagAbAttr extends PostSummonAbAttr {
     this.turnCount = turnCount;
   }
 
-  applyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean {
-    if (simulated) {
-      return pokemon.canAddTag(this.tagType);
-    } else {
-      return pokemon.addTag(this.tagType, this.turnCount);
+  override canApplyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean {
+    return pokemon.canAddTag(this.tagType);
+  }
+
+  override applyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): void {
+    if (!simulated) {
+      pokemon.addTag(this.tagType, this.turnCount);
     }
   }
 }
 
+/**
+ * Removes Specific battler tags when a Pokemon is summoned
+ *
+ * This should realistically only ever activate on gain rather than on summon
+ */
+export class PostSummonRemoveBattlerTagAbAttr extends PostSummonRemoveEffectAbAttr {
+  private immuneTags: BattlerTagType[];
+
+  /**
+   * @param immuneTags - The {@linkcode BattlerTagType | battler tags} the Pokémon is immune to.
+   */
+  constructor(...immuneTags: BattlerTagType[]) {
+    super();
+    this.immuneTags = immuneTags;
+  }
+
+  public override canApplyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean {
+    return this.immuneTags.some(tagType => !!pokemon.getTag(tagType));
+  }
+
+  public override applyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): void {
+    this.immuneTags.forEach(tagType => pokemon.removeTag(tagType));
+  }
+}
+
 export class PostSummonStatStageChangeAbAttr extends PostSummonAbAttr {
   private stats: BattleStat[];
   private stages: number;
@@ -2106,7 +2316,7 @@ export class PostSummonStatStageChangeAbAttr extends PostSummonAbAttr {
   private intimidate: boolean;
 
   constructor(stats: BattleStat[], stages: number, selfTarget?: boolean, intimidate?: boolean) {
-    super(false);
+    super(true);
 
     this.stats = stats;
     this.stages = stages;
@@ -2114,33 +2324,31 @@ export class PostSummonStatStageChangeAbAttr extends PostSummonAbAttr {
     this.intimidate = !!intimidate;
   }
 
-  applyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean {
+  override applyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): void {
     if (simulated) {
-      return true;
+      return;
     }
 
-    queueShowAbility(pokemon, passive);  // TODO: Better solution than manually showing the ability here
     if (this.selfTarget) {
       // we unshift the StatStageChangePhase to put it right after the showAbility and not at the end of the
       // phase list (which could be after CommandPhase for example)
       globalScene.unshiftPhase(new StatStageChangePhase(pokemon.getBattlerIndex(), true, this.stats, this.stages));
-      return true;
-    }
-    for (const opponent of pokemon.getOpponents()) {
-      const cancelled = new Utils.BooleanHolder(false);
-      if (this.intimidate) {
-        applyAbAttrs(IntimidateImmunityAbAttr, opponent, cancelled, simulated);
-        applyAbAttrs(PostIntimidateStatStageChangeAbAttr, opponent, cancelled, simulated);
+    } else {
+      for (const opponent of pokemon.getOpponents()) {
+        const cancelled = new BooleanHolder(false);
+        if (this.intimidate) {
+          applyAbAttrs(IntimidateImmunityAbAttr, opponent, cancelled, simulated);
+          applyAbAttrs(PostIntimidateStatStageChangeAbAttr, opponent, cancelled, simulated);
 
-        if (opponent.getTag(BattlerTagType.SUBSTITUTE)) {
-          cancelled.value = true;
+          if (opponent.getTag(BattlerTagType.SUBSTITUTE)) {
+            cancelled.value = true;
+          }
+        }
+        if (!cancelled.value) {
+          globalScene.unshiftPhase(new StatStageChangePhase(opponent.getBattlerIndex(), false, this.stats, this.stages));
         }
       }
-      if (!cancelled.value) {
-        globalScene.unshiftPhase(new StatStageChangePhase(opponent.getBattlerIndex(), false, this.stats, this.stages));
-      }
     }
-    return true;
   }
 }
 
@@ -2148,25 +2356,23 @@ export class PostSummonAllyHealAbAttr extends PostSummonAbAttr {
   private healRatio: number;
   private showAnim: boolean;
 
-  constructor(healRatio: number, showAnim: boolean = false) {
+  constructor(healRatio: number, showAnim = false) {
     super();
 
     this.healRatio = healRatio || 4;
     this.showAnim = showAnim;
   }
 
-  applyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean {
+  override canApplyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean {
+    return pokemon.getAlly()?.isActive(true) ?? false;
+  }
+
+  override applyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): void {
     const target = pokemon.getAlly();
-    if (target?.isActive(true)) {
-      if (!simulated) {
-        globalScene.unshiftPhase(new PokemonHealPhase(target.getBattlerIndex(),
-          Utils.toDmgValue(pokemon.getMaxHp() / this.healRatio), i18next.t("abilityTriggers:postSummonAllyHeal", { pokemonNameWithAffix: getPokemonNameWithAffix(target), pokemonName: pokemon.name }), true, !this.showAnim));
-      }
-
-      return true;
+    if (!simulated && !isNullOrUndefined(target)) {
+      globalScene.unshiftPhase(new PokemonHealPhase(target.getBattlerIndex(),
+        toDmgValue(pokemon.getMaxHp() / this.healRatio), i18next.t("abilityTriggers:postSummonAllyHeal", { pokemonNameWithAffix: getPokemonNameWithAffix(target), pokemonName: pokemon.name }), true, !this.showAnim));
     }
-
-    return false;
   }
 }
 
@@ -2183,21 +2389,19 @@ export class PostSummonClearAllyStatStagesAbAttr extends PostSummonAbAttr {
     super();
   }
 
-  applyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean {
-    const target = pokemon.getAlly();
-    if (target?.isActive(true)) {
-      if (!simulated) {
-        for (const s of BATTLE_STATS) {
-          target.setStatStage(s, 0);
-        }
+  override canApplyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean {
+    return pokemon.getAlly()?.isActive(true) ?? false;
+  }
 
-        globalScene.queueMessage(i18next.t("abilityTriggers:postSummonClearAllyStats", { pokemonNameWithAffix: getPokemonNameWithAffix(target) }));
+  override applyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): void {
+    const target = pokemon.getAlly();
+    if (!simulated && !isNullOrUndefined(target)) {
+      for (const s of BATTLE_STATS) {
+        target.setStatStage(s, 0);
       }
 
-      return true;
+      globalScene.queueMessage(i18next.t("abilityTriggers:postSummonClearAllyStats", { pokemonNameWithAffix: getPokemonNameWithAffix(target) }));
     }
-
-    return false;
   }
 }
 
@@ -2214,15 +2418,7 @@ export class DownloadAbAttr extends PostSummonAbAttr {
   private enemyCountTally: number;
   private stats: BattleStat[];
 
-  /**
-   * Checks to see if it is the opening turn (starting a new game), if so, Download won't work. This is because Download takes into account
-   * vitamins and items, so it needs to use the Stat and the stat alone.
-   * @param {Pokemon} pokemon Pokemon that is using the move, as well as seeing the opposing pokemon.
-   * @param {boolean} passive N/A
-   * @param {any[]} args N/A
-   * @returns Returns true if ability is used successful, false if not.
-   */
-  applyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean {
+  override canApplyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean {
     this.enemyDef = 0;
     this.enemySpDef = 0;
     this.enemyCountTally = 0;
@@ -2234,21 +2430,26 @@ export class DownloadAbAttr extends PostSummonAbAttr {
     }
     this.enemyDef = Math.round(this.enemyDef / this.enemyCountTally);
     this.enemySpDef = Math.round(this.enemySpDef / this.enemyCountTally);
+    return this.enemyDef > 0 && this.enemySpDef > 0;
+  }
 
+  /**
+   * Checks to see if it is the opening turn (starting a new game), if so, Download won't work. This is because Download takes into account
+   * vitamins and items, so it needs to use the Stat and the stat alone.
+   * @param {Pokemon} pokemon Pokemon that is using the move, as well as seeing the opposing pokemon.
+   * @param {boolean} passive N/A
+   * @param {any[]} args N/A
+   */
+  override applyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): void {
     if (this.enemyDef < this.enemySpDef) {
       this.stats = [ Stat.ATK ];
     } else {
       this.stats = [ Stat.SPATK ];
     }
 
-    if (this.enemyDef > 0 && this.enemySpDef > 0) { // only activate if there's actually an enemy to download from
-      if (!simulated) {
-        globalScene.unshiftPhase(new StatStageChangePhase(pokemon.getBattlerIndex(), false, this.stats, 1));
-      }
-      return true;
+    if (!simulated) {
+      globalScene.unshiftPhase(new StatStageChangePhase(pokemon.getBattlerIndex(), false, this.stats, 1));
     }
-
-    return false;
   }
 }
 
@@ -2261,18 +2462,17 @@ export class PostSummonWeatherChangeAbAttr extends PostSummonAbAttr {
     this.weatherType = weatherType;
   }
 
-  applyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean {
-    if ((this.weatherType === WeatherType.HEAVY_RAIN ||
+  override canApplyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean {
+    const weatherReplaceable = (this.weatherType === WeatherType.HEAVY_RAIN ||
       this.weatherType === WeatherType.HARSH_SUN ||
-      this.weatherType === WeatherType.STRONG_WINDS) || !globalScene.arena.weather?.isImmutable()) {
-      if (simulated) {
-        return globalScene.arena.weather?.weatherType !== this.weatherType;
-      } else {
-        return globalScene.arena.trySetWeather(this.weatherType, true);
-      }
-    }
+      this.weatherType === WeatherType.STRONG_WINDS) || !globalScene.arena.weather?.isImmutable();
+    return weatherReplaceable && globalScene.arena.canSetWeather(this.weatherType);
+  }
 
-    return false;
+  override applyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): void {
+    if (!simulated) {
+      globalScene.arena.trySetWeather(this.weatherType, pokemon);
+    }
   }
 }
 
@@ -2285,15 +2485,54 @@ export class PostSummonTerrainChangeAbAttr extends PostSummonAbAttr {
     this.terrainType = terrainType;
   }
 
-  applyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean {
-    if (simulated) {
-      return globalScene.arena.terrain?.terrainType !== this.terrainType;
-    } else {
-      return globalScene.arena.trySetTerrain(this.terrainType, true);
+  override canApplyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean {
+    return globalScene.arena.canSetTerrain(this.terrainType);
+  }
+
+  override applyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): void {
+    if (!simulated) {
+      globalScene.arena.trySetTerrain(this.terrainType, false, pokemon);
     }
   }
 }
 
+/**
+ * Heals a status effect if the Pokemon is afflicted with it upon switch in (or gain)
+ */
+export class PostSummonHealStatusAbAttr extends PostSummonRemoveEffectAbAttr {
+  private immuneEffects: StatusEffect[];
+  private statusHealed: StatusEffect;
+
+  /**
+   * @param immuneEffects - The {@linkcode StatusEffect}s the Pokémon is immune to.
+   */
+  constructor(...immuneEffects: StatusEffect[]) {
+    super();
+    this.immuneEffects = immuneEffects;
+  }
+
+  public override canApplyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean {
+    const status = pokemon.status?.effect;
+    return !isNullOrUndefined(status) && (this.immuneEffects.length < 1 || this.immuneEffects.includes(status))
+  }
+
+  public override applyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): void {
+    const status = pokemon.status?.effect;
+    if (!isNullOrUndefined(status)) {
+      this.statusHealed = status;
+      pokemon.resetStatus(false);
+      pokemon.updateInfo();
+    }
+  }
+
+  public override getTriggerMessage(_pokemon: Pokemon, _abilityName: string, ..._args: any[]): string | null {
+    if (this.statusHealed) {
+      return getStatusEffectHealText(this.statusHealed, getPokemonNameWithAffix(_pokemon));
+    }
+    return null;
+  }
+}
+
 export class PostSummonFormChangeAbAttr extends PostSummonAbAttr {
   private formFunc: (p: Pokemon) => number;
 
@@ -2303,13 +2542,14 @@ export class PostSummonFormChangeAbAttr extends PostSummonAbAttr {
     this.formFunc = formFunc;
   }
 
-  applyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean {
-    const formIndex = this.formFunc(pokemon);
-    if (formIndex !== pokemon.formIndex) {
-      return simulated || globalScene.triggerPokemonFormChange(pokemon, SpeciesFormChangeAbilityTrigger, false);
-    }
+  override canApplyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean {
+    return this.formFunc(pokemon) !== pokemon.formIndex;
+  }
 
-    return false;
+  override applyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): void {
+    if (!simulated) {
+      globalScene.triggerPokemonFormChange(pokemon, SpeciesFormChangeAbilityTrigger, false);
+    }
   }
 }
 
@@ -2318,7 +2558,7 @@ export class PostSummonCopyAbilityAbAttr extends PostSummonAbAttr {
   private target: Pokemon;
   private targetAbilityName: string;
 
-  applyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean {
+  override canApplyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean {
     const targets = pokemon.getOpponents();
     if (!targets.length) {
       return false;
@@ -2326,28 +2566,30 @@ export class PostSummonCopyAbilityAbAttr extends PostSummonAbAttr {
 
     let target: Pokemon;
     if (targets.length > 1) {
-      globalScene.executeWithSeedOffset(() => target = Utils.randSeedItem(targets), globalScene.currentBattle.waveIndex);
+      globalScene.executeWithSeedOffset(() => target = randSeedItem(targets), globalScene.currentBattle.waveIndex);
     } else {
       target = targets[0];
     }
 
     if (
-      target!.getAbility().hasAttr(UncopiableAbilityAbAttr) &&
+      !target!.getAbility().isCopiable &&
       // Wonder Guard is normally uncopiable so has the attribute, but Trace specifically can copy it
       !(pokemon.hasAbility(Abilities.TRACE) && target!.getAbility().id === Abilities.WONDER_GUARD)
     ) {
       return false;
     }
 
+    this.target = target!;
+    this.targetAbilityName = allAbilities[target!.getAbility().id].name;
+    return true;
+  }
+
+  override applyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): void {
     if (!simulated) {
-      this.target = target!;
-      this.targetAbilityName = allAbilities[target!.getAbility().id].name;
-      pokemon.summonData.ability = target!.getAbility().id;
-      setAbilityRevealed(target!);
+      pokemon.setTempAbility(this.target!.getAbility());
+      setAbilityRevealed(this.target!);
       pokemon.updateInfo();
     }
-
-    return true;
   }
 
   getTriggerMessage(pokemon: Pokemon, abilityName: string, ...args: any[]): string {
@@ -2374,22 +2616,22 @@ export class PostSummonUserFieldRemoveStatusEffectAbAttr extends PostSummonAbAtt
     this.statusEffect = statusEffect;
   }
 
+  override canApplyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean {
+    const party = pokemon instanceof PlayerPokemon ? globalScene.getPlayerField() : globalScene.getEnemyField();
+    return party.filter(p => p.isAllowedInBattle()).length > 0;
+  }
+
   /**
    * Removes supplied status effect from the user's field when user of the ability is summoned.
    *
    * @param pokemon - The Pokémon that triggered the ability.
    * @param passive - n/a
    * @param args - n/a
-   * @returns A boolean or a promise that resolves to a boolean indicating the result of the ability application.
    */
-  applyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean | Promise<boolean> {
+  override applyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): void {
     const party = pokemon instanceof PlayerPokemon ? globalScene.getPlayerField() : globalScene.getEnemyField();
     const allowedParty = party.filter(p => p.isAllowedInBattle());
 
-    if (allowedParty.length < 1) {
-      return false;
-    }
-
     if (!simulated) {
       for (const pokemon of allowedParty) {
         if (pokemon.status && this.statusEffect.includes(pokemon.status.effect)) {
@@ -2399,31 +2641,33 @@ export class PostSummonUserFieldRemoveStatusEffectAbAttr extends PostSummonAbAtt
         }
       }
     }
-    return true;
   }
 }
 
 
 /** Attempt to copy the stat changes on an ally pokemon */
 export class PostSummonCopyAllyStatsAbAttr extends PostSummonAbAttr {
-  applyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean {
+  override canApplyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean {
     if (!globalScene.currentBattle.double) {
       return false;
     }
 
     const ally = pokemon.getAlly();
-    if (!ally || ally.getStatStages().every(s => s === 0)) {
+    if (isNullOrUndefined(ally) || ally.getStatStages().every(s => s === 0)) {
       return false;
     }
 
-    if (!simulated) {
+    return true;
+  }
+
+  override applyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): void {
+    const ally = pokemon.getAlly();
+    if (!simulated && !isNullOrUndefined(ally)) {
       for (const s of BATTLE_STATS) {
         pokemon.setStatStage(s, ally.getStatStage(s));
       }
       pokemon.updateInfo();
     }
-
-    return true;
   }
 
   getTriggerMessage(pokemon: Pokemon, abilityName: string, ...args: any[]): string {
@@ -2435,21 +2679,15 @@ export class PostSummonCopyAllyStatsAbAttr extends PostSummonAbAttr {
 }
 
 /**
- * Used by Imposter
+ * Attribute used by {@linkcode Abilities.IMPOSTER} to transform into a random opposing pokemon on entry.
  */
 export class PostSummonTransformAbAttr extends PostSummonAbAttr {
   constructor() {
-    super(true);
+    super(true, false);
   }
 
-  async applyPostSummon(pokemon: Pokemon, _passive: boolean, simulated: boolean, _args: any[]): Promise<boolean> {
-    const targets = pokemon.getOpponents();
-    if (simulated || !targets.length) {
-      return simulated;
-    }
-    const promises: Promise<void>[] = [];
-
-    let target: Pokemon;
+  private getTarget(targets: Pokemon[]): Pokemon {
+    let target: Pokemon = targets[0];
     if (targets.length > 1) {
       globalScene.executeWithSeedOffset(() => {
         // in a double battle, if one of the opposing pokemon is fused the other one will be chosen
@@ -2461,55 +2699,43 @@ export class PostSummonTransformAbAttr extends PostSummonAbAttr {
           target = targets[0];
           return;
         }
-        target = Utils.randSeedItem(targets);
+        target = randSeedItem(targets);
       }, globalScene.currentBattle.waveIndex);
     } else {
       target = targets[0];
     }
+
     target = target!;
 
-    // transforming from or into fusion pokemon causes various problems (including crashes and save corruption)
-    if (target.fusionSpecies || pokemon.fusionSpecies) {
+    return target;
+  }
+
+  override canApplyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean {
+    const targets = pokemon.getOpponents();
+    const target = this.getTarget(targets);
+
+    if (target.summonData.illusion) {
       return false;
     }
 
-    pokemon.summonData.speciesForm = target.getSpeciesForm();
-    pokemon.summonData.ability = target.getAbility().id;
-    pokemon.summonData.gender = target.getGender();
-
-    // Copy all stats (except HP)
-    for (const s of EFFECTIVE_STATS) {
-      pokemon.setStat(s, target.getStat(s, false), false);
+    if (simulated || !targets.length) {
+      return simulated;
     }
 
-    // Copy all stat stages
-    for (const s of BATTLE_STATS) {
-      pokemon.setStatStage(s, target.getStatStage(s));
+    // transforming from or into fusion pokemon causes various problems (including crashes and save corruption)
+    if (this.getTarget(targets).fusionSpecies || pokemon.fusionSpecies) {
+      return false;
     }
 
-    pokemon.summonData.moveset = target.getMoveset().map((m) => {
-      if (m) {
-        // If PP value is less than 5, do nothing. If greater, we need to reduce the value to 5.
-        return new PokemonMove(m.moveId, 0, 0, false, Math.min(m.getMove().pp, 5));
-      } else {
-        console.warn(`Imposter: somehow iterating over a ${m} value when copying moveset!`);
-        return new PokemonMove(Moves.NONE);
-      }
-    });
-    pokemon.summonData.types = target.getTypes();
-    promises.push(pokemon.updateInfo());
-
-    globalScene.queueMessage(i18next.t("abilityTriggers:postSummonTransform", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), targetName: target.name, }));
-    globalScene.playSound("battle_anims/PRSFX- Transform");
-    promises.push(pokemon.loadAssets(false).then(() => {
-      pokemon.playAnim();
-      pokemon.updateInfo();
-    }));
-
-    await Promise.all(promises);
-
     return true;
   }
+
+  override applyPostSummon(pokemon: Pokemon, _passive: boolean, simulated: boolean, _args: any[]): void {
+    const target = this.getTarget(pokemon.getOpponents());
+
+    globalScene.unshiftPhase(new PokemonTransformPhase(pokemon.getBattlerIndex(), target.getBattlerIndex(), true));
+
+  }
 }
 
 /**
@@ -2518,25 +2744,20 @@ export class PostSummonTransformAbAttr extends PostSummonAbAttr {
  * @extends PostSummonAbAttr
  */
 export class PostSummonWeatherSuppressedFormChangeAbAttr extends PostSummonAbAttr {
+  override canApplyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean {
+    return getPokemonWithWeatherBasedForms().length > 0;
+  }
+
   /**
    * Triggers {@linkcode Arena.triggerWeatherBasedFormChangesToNormal | triggerWeatherBasedFormChangesToNormal}
    * @param {Pokemon} pokemon the Pokemon with this ability
    * @param passive n/a
    * @param args n/a
-   * @returns whether a Pokemon was reverted to its normal form
    */
-  applyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]) {
-    const pokemonToTransform = getPokemonWithWeatherBasedForms();
-
-    if (pokemonToTransform.length < 1) {
-      return false;
-    }
-
+  override applyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): void {
     if (!simulated) {
       globalScene.arena.triggerWeatherBasedFormChangesToNormal();
     }
-
-    return true;
   }
 }
 
@@ -2549,11 +2770,17 @@ export class PostSummonFormChangeByWeatherAbAttr extends PostSummonAbAttr {
   private ability: Abilities;
 
   constructor(ability: Abilities) {
-    super(false);
+    super(true);
 
     this.ability = ability;
   }
 
+  override canApplyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean {
+    const isCastformWithForecast = (pokemon.species.speciesId === Species.CASTFORM && this.ability === Abilities.FORECAST);
+    const isCherrimWithFlowerGift = (pokemon.species.speciesId === Species.CHERRIM && this.ability === Abilities.FLOWER_GIFT);
+    return isCastformWithForecast || isCherrimWithFlowerGift;
+  }
+
   /**
    * Calls the {@linkcode BattleScene.triggerPokemonFormChange | triggerPokemonFormChange} for both
    * {@linkcode SpeciesFormChange.SpeciesFormChangeWeatherTrigger | SpeciesFormChangeWeatherTrigger} and
@@ -2562,23 +2789,12 @@ export class PostSummonFormChangeByWeatherAbAttr extends PostSummonAbAttr {
    * @param {Pokemon} pokemon the Pokemon with this ability
    * @param passive n/a
    * @param args n/a
-   * @returns whether the form change was triggered
    */
-  applyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean {
-    const isCastformWithForecast = (pokemon.species.speciesId === Species.CASTFORM && this.ability === Abilities.FORECAST);
-    const isCherrimWithFlowerGift = (pokemon.species.speciesId === Species.CHERRIM && this.ability === Abilities.FLOWER_GIFT);
-
-    if (isCastformWithForecast || isCherrimWithFlowerGift) {
-      if (simulated) {
-        return simulated;
-      }
-
+  override applyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): void {
+    if (!simulated) {
       globalScene.triggerPokemonFormChange(pokemon, SpeciesFormChangeWeatherTrigger);
       globalScene.triggerPokemonFormChange(pokemon, SpeciesFormChangeRevertWeatherFormTrigger);
-      queueShowAbility(pokemon, passive);
-      return true;
     }
-    return false;
   }
 }
 
@@ -2593,49 +2809,116 @@ export class CommanderAbAttr extends AbAttr {
     super(true);
   }
 
-  override apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: null, args: any[]): boolean {
-    // TODO: Should this work with X + Dondozo fusions?
-    if (globalScene.currentBattle?.double && pokemon.getAlly()?.species.speciesId === Species.DONDOZO) {
-      // If the ally Dondozo is fainted or was previously "commanded" by
-      // another Pokemon, this effect cannot apply.
-      if (pokemon.getAlly().isFainted() || pokemon.getAlly().getTag(BattlerTagType.COMMANDED)) {
-        return false;
-      }
+  override canApply(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean {
+    // If the ally Dondozo is fainted or was previously "commanded" by
+    // another Pokemon, this effect cannot apply.
 
-      if (!simulated) {
-        // Lapse the source's semi-invulnerable tags (to avoid visual inconsistencies)
-        pokemon.lapseTags(BattlerTagLapseType.MOVE_EFFECT);
-        // Play an animation of the source jumping into the ally Dondozo's mouth
-        globalScene.triggerPokemonBattleAnim(pokemon, PokemonAnimType.COMMANDER_APPLY);
-        // Apply boosts from this effect to the ally Dondozo
-        pokemon.getAlly().addTag(BattlerTagType.COMMANDED, 0, Moves.NONE, pokemon.id);
-        // Cancel the source Pokemon's next move (if a move is queued)
-        globalScene.tryRemovePhase((phase) => phase instanceof MovePhase && phase.pokemon === pokemon);
-      }
-      return true;
+    // TODO: Should this work with X + Dondozo fusions?
+    const ally = pokemon.getAlly();
+    return globalScene.currentBattle?.double && !isNullOrUndefined(ally) && ally.species.speciesId === Species.DONDOZO
+           && !(ally.isFainted() || ally.getTag(BattlerTagType.COMMANDED));
+  }
+
+  override apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: null, args: any[]): void {
+    if (!simulated) {
+      // Lapse the source's semi-invulnerable tags (to avoid visual inconsistencies)
+      pokemon.lapseTags(BattlerTagLapseType.MOVE_EFFECT);
+      // Play an animation of the source jumping into the ally Dondozo's mouth
+      globalScene.triggerPokemonBattleAnim(pokemon, PokemonAnimType.COMMANDER_APPLY);
+      // Apply boosts from this effect to the ally Dondozo
+      pokemon.getAlly()?.addTag(BattlerTagType.COMMANDED, 0, Moves.NONE, pokemon.id);
+      // Cancel the source Pokemon's next move (if a move is queued)
+      globalScene.tryRemovePhase((phase) => phase instanceof MovePhase && phase.pokemon === pokemon);
     }
-    return false;
   }
 }
 
 export class PreSwitchOutAbAttr extends AbAttr {
-  constructor() {
-    super(true);
+  constructor(showAbility: boolean = true) {
+    super(showAbility);
   }
 
-  applyPreSwitchOut(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean | Promise<boolean> {
-    return false;
+  canApplyPreSwitchOut(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean {
+    return true;
   }
+
+  applyPreSwitchOut(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): void {}
 }
 
 export class PreSwitchOutResetStatusAbAttr extends PreSwitchOutAbAttr {
-  applyPreSwitchOut(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean | Promise<boolean> {
-    if (pokemon.status) {
-      if (!simulated) {
-        pokemon.resetStatus();
-        pokemon.updateInfo();
-      }
+  constructor() {
+    super(false);
+  }
 
+  override canApplyPreSwitchOut(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean {
+    return !isNullOrUndefined(pokemon.status);
+  }
+
+  override applyPreSwitchOut(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): void {
+    if (!simulated) {
+      pokemon.resetStatus();
+      pokemon.updateInfo();
+    }
+  }
+}
+
+/**
+ * Clears Desolate Land/Primordial Sea/Delta Stream upon the Pokemon switching out.
+ */
+export class PreSwitchOutClearWeatherAbAttr extends PreSwitchOutAbAttr {
+  /**
+   * @param pokemon The {@linkcode Pokemon} with the ability
+   * @param passive N/A
+   * @param args N/A
+   * @returns {boolean} Returns true if the weather clears, otherwise false.
+   */
+  override applyPreSwitchOut(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean {
+    const weatherType = globalScene.arena.weather?.weatherType;
+    let turnOffWeather = false;
+
+    // Clear weather only if user's ability matches the weather and no other pokemon has the ability.
+    switch (weatherType) {
+      case WeatherType.HARSH_SUN:
+        if (
+          pokemon.hasAbility(Abilities.DESOLATE_LAND) &&
+          globalScene
+            .getField(true)
+            .filter((p) => p !== pokemon)
+            .filter((p) => p.hasAbility(Abilities.DESOLATE_LAND)).length === 0
+        ) {
+          turnOffWeather = true;
+        }
+        break;
+      case WeatherType.HEAVY_RAIN:
+        if (
+          pokemon.hasAbility(Abilities.PRIMORDIAL_SEA) &&
+          globalScene
+            .getField(true)
+            .filter((p) => p !== pokemon)
+            .filter((p) => p.hasAbility(Abilities.PRIMORDIAL_SEA)).length === 0
+        ) {
+          turnOffWeather = true;
+        }
+        break;
+      case WeatherType.STRONG_WINDS:
+        if (
+          pokemon.hasAbility(Abilities.DELTA_STREAM) &&
+          globalScene
+            .getField(true)
+            .filter((p) => p !== pokemon)
+            .filter((p) => p.hasAbility(Abilities.DELTA_STREAM)).length === 0
+        ) {
+          turnOffWeather = true;
+        }
+        break;
+    }
+
+    if (simulated) {
+      return turnOffWeather;
+    }
+
+    if (turnOffWeather) {
+      globalScene.arena.trySetWeather(WeatherType.NONE);
       return true;
     }
 
@@ -2643,20 +2926,17 @@ export class PreSwitchOutResetStatusAbAttr extends PreSwitchOutAbAttr {
   }
 }
 
-
 export class PreSwitchOutHealAbAttr extends PreSwitchOutAbAttr {
-  applyPreSwitchOut(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean | Promise<boolean> {
-    if (!pokemon.isFullHp()) {
-      if (!simulated) {
-        const healAmount = Utils.toDmgValue(pokemon.getMaxHp() * 0.33);
-        pokemon.heal(healAmount);
-        pokemon.updateInfo();
-      }
+  override canApplyPreSwitchOut(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean {
+    return !pokemon.isFullHp();
+  }
 
-      return true;
+  override applyPreSwitchOut(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): void {
+    if (!simulated) {
+      const healAmount = toDmgValue(pokemon.getMaxHp() * 0.33);
+      pokemon.heal(healAmount);
+      pokemon.updateInfo();
     }
-
-    return false;
   }
 }
 
@@ -2674,85 +2954,147 @@ export class PreSwitchOutFormChangeAbAttr extends PreSwitchOutAbAttr {
     this.formFunc = formFunc;
   }
 
+  override canApplyPreSwitchOut(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean {
+    return this.formFunc(pokemon) !== pokemon.formIndex;
+  }
+
   /**
    * On switch out, trigger the form change to the one defined in the ability
    * @param pokemon The pokemon switching out and changing form {@linkcode Pokemon}
    * @param passive N/A
    * @param args N/A
-   * @returns true if the form change was successful
    */
-  applyPreSwitchOut(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean | Promise<boolean> {
-    const formIndex = this.formFunc(pokemon);
-    if (formIndex !== pokemon.formIndex) {
-      if (!simulated) {
-        globalScene.triggerPokemonFormChange(pokemon, SpeciesFormChangeAbilityTrigger, false);
-      }
-      return true;
+  override applyPreSwitchOut(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): void {
+    if (!simulated) {
+      globalScene.triggerPokemonFormChange(pokemon, SpeciesFormChangeAbilityTrigger, false);
     }
-
-    return false;
   }
 
 }
 
 export class PreLeaveFieldAbAttr extends AbAttr {
-  applyPreLeaveField(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean | Promise<boolean> {
-    return false;
+  canApplyPreLeaveField(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean {
+    return true;
   }
+
+  applyPreLeaveField(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): void {}
 }
 
 /**
  * Clears Desolate Land/Primordial Sea/Delta Stream upon the Pokemon switching out.
  */
 export class PreLeaveFieldClearWeatherAbAttr extends PreLeaveFieldAbAttr {
-  /**
-   * @param pokemon The {@linkcode Pokemon} with the ability
-   * @param passive N/A
-   * @param args N/A
-   * @returns Returns `true` if the weather clears, otherwise `false`.
-   */
-  applyPreLeaveField(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean | Promise<boolean> {
-    const weatherType = globalScene.arena.weather?.weatherType;
-    let turnOffWeather = false;
 
+  override canApplyPreLeaveField(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean {
+    const weatherType = globalScene.arena.weather?.weatherType;
     // Clear weather only if user's ability matches the weather and no other pokemon has the ability.
     switch (weatherType) {
       case (WeatherType.HARSH_SUN):
         if (pokemon.hasAbility(Abilities.DESOLATE_LAND)
           && globalScene.getField(true).filter(p => p !== pokemon).filter(p => p.hasAbility(Abilities.DESOLATE_LAND)).length === 0) {
-          turnOffWeather = true;
+          return true;
         }
         break;
       case (WeatherType.HEAVY_RAIN):
         if (pokemon.hasAbility(Abilities.PRIMORDIAL_SEA)
           && globalScene.getField(true).filter(p => p !== pokemon).filter(p => p.hasAbility(Abilities.PRIMORDIAL_SEA)).length === 0) {
-          turnOffWeather = true;
+          return true;
         }
         break;
       case (WeatherType.STRONG_WINDS):
         if (pokemon.hasAbility(Abilities.DELTA_STREAM)
           && globalScene.getField(true).filter(p => p !== pokemon).filter(p => p.hasAbility(Abilities.DELTA_STREAM)).length === 0) {
-          turnOffWeather = true;
+          return true;
         }
         break;
     }
-
-    if (simulated) {
-      return turnOffWeather;
-    }
-
-    if (turnOffWeather) {
-      globalScene.arena.trySetWeather(WeatherType.NONE, false);
-      return true;
-    }
-
     return false;
   }
+
+  /**
+   * @param pokemon The {@linkcode Pokemon} with the ability
+   * @param passive N/A
+   * @param args N/A
+   */
+  override applyPreLeaveField(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): void {
+    if (!simulated) {
+      globalScene.arena.trySetWeather(WeatherType.NONE);
+    }
+  }
+}
+
+/**
+ * Updates the active {@linkcode SuppressAbilitiesTag} when a pokemon with {@linkcode Abilities.NEUTRALIZING_GAS} leaves the field
+ */
+export class PreLeaveFieldRemoveSuppressAbilitiesSourceAbAttr extends PreLeaveFieldAbAttr {
+  constructor() {
+    super(false);
+  }
+
+  public override canApplyPreLeaveField(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean {
+    return !!globalScene.arena.getTag(ArenaTagType.NEUTRALIZING_GAS);
+  }
+
+  public override applyPreLeaveField(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): void {
+    const suppressTag = globalScene.arena.getTag(ArenaTagType.NEUTRALIZING_GAS) as SuppressAbilitiesTag;
+    suppressTag.onSourceLeave(globalScene.arena);
+  }
 }
 
 export class PreStatStageChangeAbAttr extends AbAttr {
-  applyPreStatStageChange(pokemon: Pokemon | null, passive: boolean, simulated: boolean, stat: BattleStat, cancelled: Utils.BooleanHolder, args: any[]): boolean | Promise<boolean> {
-    return false;
+  canApplyPreStatStageChange(
+    pokemon: Pokemon | null,
+    passive: boolean,
+    simulated: boolean,
+    stat: BattleStat,
+    cancelled: BooleanHolder,
+    args: any[]): boolean {
+    return true;
+  }
+
+  applyPreStatStageChange(
+    pokemon: Pokemon | null,
+    passive: boolean,
+    simulated: boolean,
+    stat: BattleStat,
+    cancelled: BooleanHolder,
+    args: any[],
+  ): void {}
+}
+
+/**
+ * Reflect all {@linkcode BattleStat} reductions caused by other Pokémon's moves and Abilities.
+ * Currently only applies to Mirror Armor.
+ */
+export class ReflectStatStageChangeAbAttr extends PreStatStageChangeAbAttr {
+  /** {@linkcode BattleStat} to reflect */
+  private reflectedStat? : BattleStat;
+
+  /**
+   * Apply the {@linkcode ReflectStatStageChangeAbAttr} to an interaction
+   * @param _pokemon The user pokemon
+   * @param _passive N/A
+   * @param simulated `true` if the ability is being simulated by the AI
+   * @param stat the {@linkcode BattleStat} being affected
+   * @param cancelled The {@linkcode BooleanHolder} that will be set to true due to reflection
+   * @param args
+   */
+  override applyPreStatStageChange(_pokemon: Pokemon, _passive: boolean, simulated: boolean, stat: BattleStat, cancelled: BooleanHolder, args: any[]): void {
+    const attacker: Pokemon = args[0];
+    const stages = args[1];
+    this.reflectedStat = stat;
+    if (!simulated) {
+      globalScene.unshiftPhase(new StatStageChangePhase(attacker.getBattlerIndex(), false, [ stat ], stages, true, false, true, null, true));
+    }
+    cancelled.value = true;
+  }
+
+  getTriggerMessage(pokemon: Pokemon, abilityName: string, ..._args: any[]): string {
+    return i18next.t("abilityTriggers:protectStat", {
+      pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
+      abilityName,
+      statName: this.reflectedStat ? i18next.t(getStatKey(this.reflectedStat)) : i18next.t("battle:stats")
+    });
   }
 }
 
@@ -2769,23 +3111,21 @@ export class ProtectStatAbAttr extends PreStatStageChangeAbAttr {
     this.protectedStat = protectedStat;
   }
 
+  override canApplyPreStatStageChange(pokemon: Pokemon | null, passive: boolean, simulated: boolean, stat: BattleStat, cancelled: BooleanHolder, args: any[]): boolean {
+    return isNullOrUndefined(this.protectedStat) || stat === this.protectedStat;
+  }
+
   /**
    * Apply the {@linkcode ProtectedStatAbAttr} to an interaction
    * @param _pokemon
    * @param _passive
    * @param simulated
    * @param stat the {@linkcode BattleStat} being affected
-   * @param cancelled The {@linkcode Utils.BooleanHolder} that will be set to true if the stat is protected
+   * @param cancelled The {@linkcode BooleanHolder} that will be set to true if the stat is protected
    * @param _args
-   * @returns true if the stat is protected, false otherwise
    */
-  applyPreStatStageChange(_pokemon: Pokemon, _passive: boolean, _simulated: boolean, stat: BattleStat, cancelled: Utils.BooleanHolder, _args: any[]): boolean {
-    if (Utils.isNullOrUndefined(this.protectedStat) || stat === this.protectedStat) {
-      cancelled.value = true;
-      return true;
-    }
-
-    return false;
+  override applyPreStatStageChange(_pokemon: Pokemon, _passive: boolean, _simulated: boolean, stat: BattleStat, cancelled: BooleanHolder, _args: any[]): void {
+    cancelled.value = true;
   }
 
   getTriggerMessage(pokemon: Pokemon, abilityName: string, ..._args: any[]): string {
@@ -2813,6 +3153,13 @@ export class ConfusionOnStatusEffectAbAttr extends PostAttackAbAttr {
     super((user, target, move) => true);
     this.effects = effects;
   }
+
+  override canApplyPostAttack(pokemon: Pokemon, passive: boolean, simulated: boolean, defender: Pokemon, move: Move, hitResult: HitResult | null, args: any[]): boolean {
+    return super.canApplyPostAttack(pokemon, passive, simulated, defender, move, hitResult, args)
+        && this.effects.indexOf(args[0]) > -1 && !defender.isFainted() && defender.canAddTag(BattlerTagType.CONFUSED);
+  }
+
+
   /**
    * Applies confusion to the target pokemon.
    * @param pokemon {@link Pokemon} attacking
@@ -2821,31 +3168,42 @@ export class ConfusionOnStatusEffectAbAttr extends PostAttackAbAttr {
    * @param move {@link Move} used to apply status effect and confusion
    * @param hitResult N/A
    * @param args [0] {@linkcode StatusEffect} applied by move
-   * @returns true if defender is confused
    */
-  applyPostAttackAfterMoveTypeCheck(pokemon: Pokemon, passive: boolean, simulated: boolean, defender: Pokemon, move: Move, hitResult: HitResult, args: any[]): boolean {
-    if (this.effects.indexOf(args[0]) > -1 && !defender.isFainted()) {
-      if (simulated) {
-        return defender.canAddTag(BattlerTagType.CONFUSED);
-      } else {
-        return defender.addTag(BattlerTagType.CONFUSED, pokemon.randSeedIntRange(2, 5), move.id, defender.id);
-      }
+  override applyPostAttack(pokemon: Pokemon, passive: boolean, simulated: boolean, defender: Pokemon, move: Move, hitResult: HitResult, args: any[]): void {
+    if (!simulated) {
+      defender.addTag(BattlerTagType.CONFUSED, pokemon.randBattleSeedIntRange(2, 5), move.id, defender.id);
     }
-    return false;
   }
 }
 
 export class PreSetStatusAbAttr extends AbAttr {
-  applyPreSetStatus(pokemon: Pokemon, passive: boolean, simulated: boolean, effect: StatusEffect | undefined, cancelled: Utils.BooleanHolder, args: any[]): boolean | Promise<boolean> {
-    return false;
+  /** Return whether the ability attribute can be applied */
+  canApplyPreSetStatus(
+    pokemon: Pokemon,
+    passive: boolean,
+    simulated: boolean,
+    effect: StatusEffect | undefined,
+    cancelled: BooleanHolder,
+    args: any[]): boolean {
+    return true;
   }
+
+  applyPreSetStatus(
+    pokemon: Pokemon,
+    passive: boolean,
+    simulated: boolean,
+    effect: StatusEffect | undefined,
+    cancelled: BooleanHolder,
+    args: any[],
+  ): void {}
 }
 
 /**
  * Provides immunity to status effects to specified targets.
  */
 export class PreSetStatusEffectImmunityAbAttr extends PreSetStatusAbAttr {
-  private immuneEffects: StatusEffect[];
+  protected immuneEffects: StatusEffect[];
+  private lastEffect: StatusEffect;
 
   /**
    * @param immuneEffects - The status effects to which the Pokémon is immune.
@@ -2856,6 +3214,10 @@ export class PreSetStatusEffectImmunityAbAttr extends PreSetStatusAbAttr {
     this.immuneEffects = immuneEffects;
   }
 
+  override canApplyPreSetStatus(pokemon: Pokemon, passive: boolean, simulated: boolean, effect: StatusEffect, cancelled: BooleanHolder, args: any[]): boolean {
+    return effect !== StatusEffect.FAINT && this.immuneEffects.length < 1 || this.immuneEffects.includes(effect);
+  }
+
   /**
    * Applies immunity to supplied status effects.
    *
@@ -2864,15 +3226,10 @@ export class PreSetStatusEffectImmunityAbAttr extends PreSetStatusAbAttr {
    * @param effect - The status effect being applied.
    * @param cancelled - A holder for a boolean value indicating if the status application was cancelled.
    * @param args - n/a
-   * @returns A boolean indicating the result of the status application.
    */
-  applyPreSetStatus(pokemon: Pokemon, passive: boolean, simulated: boolean, effect: StatusEffect, cancelled: Utils.BooleanHolder, args: any[]): boolean {
-    if (effect !== StatusEffect.FAINT && this.immuneEffects.length < 1 || this.immuneEffects.includes(effect)) {
-      cancelled.value = true;
-      return true;
-    }
-
-    return false;
+  override applyPreSetStatus(pokemon: Pokemon, passive: boolean, simulated: boolean, effect: StatusEffect, cancelled: BooleanHolder, args: any[]): void {
+    cancelled.value = true;
+    this.lastEffect = effect;
   }
 
   getTriggerMessage(pokemon: Pokemon, abilityName: string, ...args: any[]): string {
@@ -2880,7 +3237,7 @@ export class PreSetStatusEffectImmunityAbAttr extends PreSetStatusAbAttr {
       i18next.t("abilityTriggers:statusEffectImmunityWithName", {
         pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
         abilityName,
-        statusEffectName: getStatusEffectDescriptor(args[0] as StatusEffect)
+        statusEffectName: getStatusEffectDescriptor(this.lastEffect)
       }) :
       i18next.t("abilityTriggers:statusEffectImmunity", {
         pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
@@ -2901,35 +3258,135 @@ export class StatusEffectImmunityAbAttr extends PreSetStatusEffectImmunityAbAttr
  */
 export class UserFieldStatusEffectImmunityAbAttr extends PreSetStatusEffectImmunityAbAttr { }
 
-export class PreApplyBattlerTagAbAttr extends AbAttr {
-  applyPreApplyBattlerTag(pokemon: Pokemon, passive: boolean, simulated: boolean, tag: BattlerTag, cancelled: Utils.BooleanHolder, args: any[]): boolean | Promise<boolean> {
-    return false;
+/**
+ * Conditionally provides immunity to status effects to the user's field.
+ *
+ * Used by {@linkcode Abilities.FLOWER_VEIL | Flower Veil}.
+ * @extends UserFieldStatusEffectImmunityAbAttr
+ *
+ */
+export class ConditionalUserFieldStatusEffectImmunityAbAttr extends UserFieldStatusEffectImmunityAbAttr {
+  /**
+   * The condition for the field immunity to be applied.
+   * @param target The target of the status effect
+   * @param source The source of the status effect
+   */
+  protected condition: (target: Pokemon, source: Pokemon | null) => boolean;
+
+  /**
+   * Evaluate the condition to determine if the {@linkcode ConditionalUserFieldStatusEffectImmunityAbAttr} can be applied.
+   * @param pokemon The pokemon with the ability
+   * @param passive unused
+   * @param simulated Whether the ability is being simulated
+   * @param effect The status effect being applied
+   * @param cancelled Holds whether the status effect was cancelled by a prior effect
+   * @param args `Args[0]` is the target of the status effect, `Args[1]` is the source.
+   * @returns Whether the ability can be applied to cancel the status effect.
+   */
+  override canApplyPreSetStatus(pokemon: Pokemon, passive: boolean, simulated: boolean, effect: StatusEffect, cancelled: BooleanHolder, args: [Pokemon, Pokemon | null, ...any]): boolean {
+    return (!cancelled.value && effect !== StatusEffect.FAINT && this.immuneEffects.length < 1 || this.immuneEffects.includes(effect)) && this.condition(args[0], args[1]);
   }
+
+  constructor(condition: (target: Pokemon, source: Pokemon | null) => boolean, ...immuneEffects: StatusEffect[]) {
+    super(...immuneEffects);
+
+    this.condition = condition;
+  }
+}
+
+/**
+ * Conditionally provides immunity to stat drop effects to the user's field.
+ *
+ * Used by {@linkcode Abilities.FLOWER_VEIL | Flower Veil}.
+ */
+export class ConditionalUserFieldProtectStatAbAttr extends PreStatStageChangeAbAttr {
+  /** {@linkcode BattleStat} to protect or `undefined` if **all** {@linkcode BattleStat} are protected */
+  protected protectedStat?: BattleStat;
+
+  /** If the method evaluates to true, the stat will be protected. */
+  protected condition: (target: Pokemon) => boolean;
+
+  constructor(condition: (target: Pokemon) => boolean, protectedStat?: BattleStat) {
+    super();
+    this.condition = condition;
+  }
+
+  /**
+   * Determine whether the {@linkcode ConditionalUserFieldProtectStatAbAttr} can be applied.
+   * @param pokemon The pokemon with the ability
+   * @param passive unused
+   * @param simulated Unused
+   * @param stat The stat being affected
+   * @param cancelled Holds whether the stat change was already prevented.
+   * @param args Args[0] is the target pokemon of the stat change.
+   * @returns
+   */
+  override canApplyPreStatStageChange(pokemon: Pokemon, passive: boolean, simulated: boolean, stat: BattleStat, cancelled: BooleanHolder, args: [Pokemon, ...any]): boolean {
+    const target = args[0];
+    if (!target) {
+      return false;
+    }
+    return !cancelled.value && (isNullOrUndefined(this.protectedStat) || stat === this.protectedStat) && this.condition(target);
+  }
+
+  /**
+   * Apply the {@linkcode ConditionalUserFieldStatusEffectImmunityAbAttr} to an interaction
+   * @param _pokemon The pokemon the stat change is affecting (unused)
+   * @param _passive unused
+   * @param _simulated unused
+   * @param stat The stat being affected
+   * @param cancelled Will be set to true if the stat change is prevented
+   * @param _args unused
+   */
+  override applyPreStatStageChange(_pokemon: Pokemon, _passive: boolean, _simulated: boolean, _stat: BattleStat, cancelled: BooleanHolder, _args: any[]): void {
+    cancelled.value = true;
+  }
+}
+
+
+export class PreApplyBattlerTagAbAttr extends AbAttr {
+  canApplyPreApplyBattlerTag(
+    pokemon: Pokemon,
+    passive: boolean,
+    simulated: boolean,
+    tag: BattlerTag,
+    cancelled: BooleanHolder,
+    args: any[],
+  ): boolean {
+    return true;
+  }
+
+  applyPreApplyBattlerTag(
+    pokemon: Pokemon,
+    passive: boolean,
+    simulated: boolean,
+    tag: BattlerTag,
+    cancelled: BooleanHolder,
+    args: any[],
+  ): void {}
 }
 
 /**
  * Provides immunity to BattlerTags {@linkcode BattlerTag} to specified targets.
  */
 export class PreApplyBattlerTagImmunityAbAttr extends PreApplyBattlerTagAbAttr {
-  private immuneTagTypes: BattlerTagType[];
-  private battlerTag: BattlerTag;
+  protected immuneTagTypes: BattlerTagType[];
+  protected battlerTag: BattlerTag;
 
   constructor(immuneTagTypes: BattlerTagType | BattlerTagType[]) {
-    super();
+    super(true);
 
     this.immuneTagTypes = Array.isArray(immuneTagTypes) ? immuneTagTypes : [ immuneTagTypes ];
   }
 
-  applyPreApplyBattlerTag(pokemon: Pokemon, passive: boolean, simulated: boolean, tag: BattlerTag, cancelled: Utils.BooleanHolder, args: any[]): boolean {
-    if (this.immuneTagTypes.includes(tag.tagType)) {
-      cancelled.value = true;
-      if (!simulated) {
-        this.battlerTag = tag;
-      }
-      return true;
-    }
+  override canApplyPreApplyBattlerTag(pokemon: Pokemon, passive: boolean, simulated: boolean, tag: BattlerTag, cancelled: BooleanHolder, args: any[]): boolean {
+    this.battlerTag = tag;
 
-    return false;
+    return !cancelled.value && this.immuneTagTypes.includes(tag.tagType);
+  }
+
+  override applyPreApplyBattlerTag(pokemon: Pokemon, passive: boolean, simulated: boolean, tag: BattlerTag, cancelled: BooleanHolder, args: any[]): void {
+    cancelled.value = true;
   }
 
   getTriggerMessage(pokemon: Pokemon, abilityName: string, ...args: any[]): string {
@@ -2953,17 +3410,60 @@ export class BattlerTagImmunityAbAttr extends PreApplyBattlerTagImmunityAbAttr {
  */
 export class UserFieldBattlerTagImmunityAbAttr extends PreApplyBattlerTagImmunityAbAttr { }
 
+export class ConditionalUserFieldBattlerTagImmunityAbAttr extends UserFieldBattlerTagImmunityAbAttr {
+  private condition: (target: Pokemon) => boolean;
+
+  /**
+   * Determine whether the {@linkcode ConditionalUserFieldBattlerTagImmunityAbAttr} can be applied by passing the target pokemon to the condition.
+   * @param pokemon The pokemon owning the ability
+   * @param passive unused
+   * @param simulated whether the ability is being simulated (unused)
+   * @param tag The {@linkcode BattlerTag} being applied
+   * @param cancelled Holds whether the tag was previously cancelled (unused)
+   * @param args Args[0] is the target that the tag is attempting to be applied to
+   * @returns Whether the ability can be used to cancel the battler tag
+   */
+  override canApplyPreApplyBattlerTag(pokemon: Pokemon, passive: boolean, simulated: boolean, tag: BattlerTag, cancelled: BooleanHolder, args: [Pokemon, ...any]): boolean {
+    return super.canApplyPreApplyBattlerTag(pokemon, passive, simulated, tag, cancelled, args) && this.condition(args[0]);
+  }
+
+  constructor(condition: (target: Pokemon) => boolean, immuneTagTypes: BattlerTagType | BattlerTagType[]) {
+    super(immuneTagTypes);
+
+    this.condition = condition;
+  }
+}
+
 export class BlockCritAbAttr extends AbAttr {
-  apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean {
-    (args[0] as Utils.BooleanHolder).value = true;
-    return true;
+  constructor() {
+    super(false);
+  }
+
+  /**
+   * Apply the block crit ability by setting the value in the provided boolean holder to false
+   * @param args - [0] is a boolean holder representing whether the attack can crit
+   */
+  override apply(_pokemon: Pokemon, _passive: boolean, _simulated: boolean, _cancelled: BooleanHolder, args: [BooleanHolder, ...any]): void {
+    (args[0]).value = false;
   }
 }
 
 export class BonusCritAbAttr extends AbAttr {
-  apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean {
-    (args[0] as Utils.BooleanHolder).value = true;
-    return true;
+  constructor() {
+    super(false);
+  }
+
+  /**
+   * Apply the bonus crit ability by increasing the value in the provided number holder by 1
+   *
+   * @param pokemon The pokemon with the BonusCrit ability (unused)
+   * @param passive Unused
+   * @param simulated Unused
+   * @param cancelled Unused
+   * @param args Args[0] is a number holder containing the crit stage.
+   */
+  override apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: BooleanHolder, args: [NumberHolder, ...any]): void {
+    (args[0] as NumberHolder).value += 1;
   }
 }
 
@@ -2971,19 +3471,19 @@ export class MultCritAbAttr extends AbAttr {
   public multAmount: number;
 
   constructor(multAmount: number) {
-    super(true);
+    super(false);
 
     this.multAmount = multAmount;
   }
 
-  apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean {
-    const critMult = args[0] as Utils.NumberHolder;
-    if (critMult.value > 1) {
-      critMult.value *= this.multAmount;
-      return true;
-    }
+  override canApply(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean {
+    const critMult = args[0] as NumberHolder;
+    return critMult.value > 1;
+  }
 
-    return false;
+  override apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: BooleanHolder, args: any[]): void {
+    const critMult = args[0] as NumberHolder;
+    critMult.value *= this.multAmount;
   }
 }
 
@@ -2995,34 +3495,36 @@ export class MultCritAbAttr extends AbAttr {
 export class ConditionalCritAbAttr extends AbAttr {
   private condition: PokemonAttackCondition;
 
-  constructor(condition: PokemonAttackCondition, checkUser?: Boolean) {
-    super();
+  constructor(condition: PokemonAttackCondition, checkUser?: boolean) {
+    super(false);
 
     this.condition = condition;
   }
 
+  override canApply(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean {
+    const target = (args[1] as Pokemon);
+    const move = (args[2] as Move);
+    return this.condition(pokemon, target, move);
+  }
+
   /**
    * @param pokemon {@linkcode Pokemon} user.
-   * @param args [0] {@linkcode Utils.BooleanHolder} If true critical hit is guaranteed.
+   * @param args [0] {@linkcode BooleanHolder} If true critical hit is guaranteed.
    *             [1] {@linkcode Pokemon} Target.
    *             [2] {@linkcode Move} used by ability user.
    */
-  apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean {
-    const target = (args[1] as Pokemon);
-    const move = (args[2] as Move);
-    if (!this.condition(pokemon, target, move)) {
-      return false;
-    }
-
-    (args[0] as Utils.BooleanHolder).value = true;
-    return true;
+  override apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: BooleanHolder, args: any[]): void {
+    (args[0] as BooleanHolder).value = true;
   }
 }
 
 export class BlockNonDirectDamageAbAttr extends AbAttr {
-  apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean {
+  constructor() {
+    super(false);
+  }
+
+  override apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: BooleanHolder, args: any[]): void {
     cancelled.value = true;
-    return true;
   }
 }
 
@@ -3041,26 +3543,27 @@ export class BlockStatusDamageAbAttr extends AbAttr {
     this.effects = effects;
   }
 
-  /**
-   * @param {Pokemon} pokemon The pokemon with the ability
-   * @param {boolean} passive N/A
-   * @param {Utils.BooleanHolder} cancelled Whether to cancel the status damage
-   * @param {any[]} args N/A
-   * @returns Returns true if status damage is blocked
-   */
-  apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean {
+  override canApply(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean {
     if (pokemon.status && this.effects.includes(pokemon.status.effect)) {
-      cancelled.value = true;
       return true;
     }
     return false;
   }
+
+  /**
+   * @param {Pokemon} pokemon The pokemon with the ability
+   * @param {boolean} passive N/A
+   * @param {BooleanHolder} cancelled Whether to cancel the status damage
+   * @param {any[]} args N/A
+   */
+  override apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: BooleanHolder, args: any[]): void {
+    cancelled.value = true;
+  }
 }
 
 export class BlockOneHitKOAbAttr extends AbAttr {
-  apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean {
+  override apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: BooleanHolder, args: any[]): void {
     cancelled.value = true;
-    return true;
   }
 }
 
@@ -3078,28 +3581,42 @@ export class ChangeMovePriorityAbAttr extends AbAttr {
    * @param {number} changeAmount the amount of priority added or subtracted
    */
   constructor(moveFunc: (pokemon: Pokemon, move: Move) => boolean, changeAmount: number) {
-    super(true);
+    super(false);
 
     this.moveFunc = moveFunc;
     this.changeAmount = changeAmount;
   }
 
-  apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean {
-    if (!this.moveFunc(pokemon, args[0] as Move)) {
-      return false;
-    }
+  override canApply(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean {
+    return this.moveFunc(pokemon, args[0] as Move);
+  }
 
-    (args[1] as Utils.IntegerHolder).value += this.changeAmount;
-    return true;
+  override apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: BooleanHolder, args: any[]): void {
+    (args[1] as NumberHolder).value += this.changeAmount;
   }
 }
 
 export class IgnoreContactAbAttr extends AbAttr { }
 
 export class PreWeatherEffectAbAttr extends AbAttr {
-  applyPreWeatherEffect(pokemon: Pokemon, passive: Boolean, simulated: boolean, weather: Weather | null, cancelled: Utils.BooleanHolder, args: any[]): boolean | Promise<boolean> {
-    return false;
+  canApplyPreWeatherEffect(
+    pokemon: Pokemon,
+    passive: Boolean,
+    simulated: boolean,
+    weather: Weather | null,
+    cancelled: BooleanHolder,
+    args: any[]): boolean {
+    return true;
   }
+
+  applyPreWeatherEffect(
+    pokemon: Pokemon,
+    passive: boolean,
+    simulated: boolean,
+    weather: Weather | null,
+    cancelled: BooleanHolder,
+    args: any[],
+  ): void {}
 }
 
 export class PreWeatherDamageAbAttr extends PreWeatherEffectAbAttr { }
@@ -3108,17 +3625,17 @@ export class BlockWeatherDamageAttr extends PreWeatherDamageAbAttr {
   private weatherTypes: WeatherType[];
 
   constructor(...weatherTypes: WeatherType[]) {
-    super();
+    super(false);
 
     this.weatherTypes = weatherTypes;
   }
 
-  applyPreWeatherEffect(pokemon: Pokemon, passive: boolean, simulated: boolean, weather: Weather, cancelled: Utils.BooleanHolder, args: any[]): boolean {
-    if (!this.weatherTypes.length || this.weatherTypes.indexOf(weather?.weatherType) > -1) {
-      cancelled.value = true;
-    }
+  override canApplyPreWeatherEffect(pokemon: Pokemon, passive: Boolean, simulated: boolean, weather: Weather, cancelled: BooleanHolder, args: any[]): boolean {
+    return !this.weatherTypes.length || this.weatherTypes.indexOf(weather?.weatherType) > -1;
+  }
 
-    return true;
+  override applyPreWeatherEffect(pokemon: Pokemon, passive: boolean, simulated: boolean, weather: Weather, cancelled: BooleanHolder, args: any[]): void {
+    cancelled.value = true;
   }
 }
 
@@ -3126,18 +3643,17 @@ export class SuppressWeatherEffectAbAttr extends PreWeatherEffectAbAttr {
   public affectsImmutable: boolean;
 
   constructor(affectsImmutable?: boolean) {
-    super();
+    super(true);
 
     this.affectsImmutable = !!affectsImmutable;
   }
 
-  applyPreWeatherEffect(pokemon: Pokemon, passive: boolean, simulated: boolean, weather: Weather, cancelled: Utils.BooleanHolder, args: any[]): boolean {
-    if (this.affectsImmutable || weather.isImmutable()) {
-      cancelled.value = true;
-      return true;
-    }
+  override canApplyPreWeatherEffect(pokemon: Pokemon, passive: Boolean, simulated: boolean, weather: Weather, cancelled: BooleanHolder, args: any[]): boolean {
+    return this.affectsImmutable || weather.isImmutable();
+  }
 
-    return false;
+  override applyPreWeatherEffect(pokemon: Pokemon, passive: boolean, simulated: boolean, weather: Weather, cancelled: BooleanHolder, args: any[]): void {
+    cancelled.value = true;
   }
 }
 
@@ -3145,14 +3661,10 @@ export class SuppressWeatherEffectAbAttr extends PreWeatherEffectAbAttr {
  * Condition function to applied to abilities related to Sheer Force.
  * Checks if last move used against target was affected by a Sheer Force user and:
  * Disables: Color Change, Pickpocket, Berserk, Anger Shell
- * @returns {AbAttrCondition} If false disables the ability which the condition is applied to.
+ * @returns An {@linkcode AbAttrCondition} to disable the ability under the proper conditions.
  */
 function getSheerForceHitDisableAbCondition(): AbAttrCondition {
   return (pokemon: Pokemon) => {
-    if (!pokemon.turnData) {
-      return true;
-    }
-
     const lastReceivedAttack = pokemon.turnData.attacksReceived[0];
     if (!lastReceivedAttack) {
       return true;
@@ -3163,7 +3675,7 @@ function getSheerForceHitDisableAbCondition(): AbAttrCondition {
       return true;
     }
 
-    /**if the last move chance is greater than or equal to cero, and the last attacker's ability is sheer force*/
+    /** `true` if the last move's chance is above 0 and the last attacker's ability is sheer force */
     const SheerForceAffected = allMoves[lastReceivedAttack.move].chance >= 0 && lastAttacker.hasAbility(Abilities.SHEER_FORCE);
 
     return !SheerForceAffected;
@@ -3209,10 +3721,10 @@ function getAnticipationCondition(): AbAttrCondition {
               + (opponent.ivs[Stat.SPDEF] & 1) * 32) * 15 / 63);
 
           const type = [
-            Type.FIGHTING, Type.FLYING, Type.POISON, Type.GROUND,
-            Type.ROCK, Type.BUG, Type.GHOST, Type.STEEL,
-            Type.FIRE, Type.WATER, Type.GRASS, Type.ELECTRIC,
-            Type.PSYCHIC, Type.ICE, Type.DRAGON, Type.DARK ][iv_val];
+            PokemonType.FIGHTING, PokemonType.FLYING, PokemonType.POISON, PokemonType.GROUND,
+            PokemonType.ROCK, PokemonType.BUG, PokemonType.GHOST, PokemonType.STEEL,
+            PokemonType.FIRE, PokemonType.WATER, PokemonType.GRASS, PokemonType.ELECTRIC,
+            PokemonType.PSYCHIC, PokemonType.ICE, PokemonType.DRAGON, PokemonType.DARK ][iv_val];
 
           if (pokemon.getAttackTypeEffectiveness(type, opponent) >= 2) {
             return true;
@@ -3233,7 +3745,7 @@ function getAnticipationCondition(): AbAttrCondition {
  */
 function getOncePerBattleCondition(ability: Abilities): AbAttrCondition {
   return (pokemon: Pokemon) => {
-    return !pokemon.battleData?.abilitiesApplied.includes(ability);
+    return !pokemon.waveData.abilitiesApplied.has(ability);
   };
 }
 
@@ -3242,7 +3754,7 @@ export class ForewarnAbAttr extends PostSummonAbAttr {
     super(true);
   }
 
-  applyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean {
+  override applyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): void {
     let maxPowerSeen = 0;
     let maxMove = "";
     let movePower = 0;
@@ -3269,7 +3781,6 @@ export class ForewarnAbAttr extends PostSummonAbAttr {
     if (!simulated) {
       globalScene.queueMessage(i18next.t("abilityTriggers:forewarn", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), moveName: maxMove }));
     }
-    return true;
   }
 }
 
@@ -3278,21 +3789,22 @@ export class FriskAbAttr extends PostSummonAbAttr {
     super(true);
   }
 
-  applyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean {
+  override applyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): void {
     if (!simulated) {
       for (const opponent of pokemon.getOpponents()) {
         globalScene.queueMessage(i18next.t("abilityTriggers:frisk", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), opponentName: opponent.name, opponentAbilityName: opponent.getAbility().name }));
         setAbilityRevealed(opponent);
       }
     }
-    return true;
   }
 }
 
 export class PostWeatherChangeAbAttr extends AbAttr {
-  applyPostWeatherChange(pokemon: Pokemon, passive: boolean, simulated: boolean, weather: WeatherType, args: any[]): boolean {
-    return false;
+  canApplyPostWeatherChange(pokemon: Pokemon, passive: boolean, simulated: boolean, weather: WeatherType, args: any[]): boolean {
+    return true;
   }
+
+  applyPostWeatherChange(pokemon: Pokemon, passive: boolean, simulated: boolean, weather: WeatherType, args: any[]): void {}
 }
 
 /**
@@ -3311,6 +3823,13 @@ export class PostWeatherChangeFormChangeAbAttr extends PostWeatherChangeAbAttr {
     this.formRevertingWeathers = formRevertingWeathers;
   }
 
+  override canApplyPostWeatherChange(pokemon: Pokemon, passive: boolean, simulated: boolean, weather: WeatherType, args: any[]): boolean {
+    const isCastformWithForecast = (pokemon.species.speciesId === Species.CASTFORM && this.ability === Abilities.FORECAST);
+    const isCherrimWithFlowerGift = (pokemon.species.speciesId === Species.CHERRIM && this.ability === Abilities.FLOWER_GIFT);
+
+    return isCastformWithForecast || isCherrimWithFlowerGift;
+  }
+
   /**
    * Calls {@linkcode Arena.triggerWeatherBasedFormChangesToNormal | triggerWeatherBasedFormChangesToNormal} when the
    * weather changed to form-reverting weather, otherwise calls {@linkcode Arena.triggerWeatherBasedFormChanges | triggerWeatherBasedFormChanges}
@@ -3318,27 +3837,19 @@ export class PostWeatherChangeFormChangeAbAttr extends PostWeatherChangeAbAttr {
    * @param passive n/a
    * @param weather n/a
    * @param args n/a
-   * @returns whether the form change was triggered
    */
-  applyPostWeatherChange(pokemon: Pokemon, passive: boolean, simulated: boolean, weather: WeatherType, args: any[]): boolean {
-    const isCastformWithForecast = (pokemon.species.speciesId === Species.CASTFORM && this.ability === Abilities.FORECAST);
-    const isCherrimWithFlowerGift = (pokemon.species.speciesId === Species.CHERRIM && this.ability === Abilities.FLOWER_GIFT);
-
-    if (isCastformWithForecast || isCherrimWithFlowerGift) {
-      if (simulated) {
-        return simulated;
-      }
-
-      const weatherType = globalScene.arena.weather?.weatherType;
-
-      if (weatherType && this.formRevertingWeathers.includes(weatherType)) {
-        globalScene.arena.triggerWeatherBasedFormChangesToNormal();
-      } else {
-        globalScene.arena.triggerWeatherBasedFormChanges();
-      }
-      return true;
+  override applyPostWeatherChange(pokemon: Pokemon, passive: boolean, simulated: boolean, weather: WeatherType, args: any[]): void {
+    if (simulated) {
+      return;
+    }
+
+    const weatherType = globalScene.arena.weather?.weatherType;
+
+    if (weatherType && this.formRevertingWeathers.includes(weatherType)) {
+      globalScene.arena.triggerWeatherBasedFormChangesToNormal();
+    } else {
+      globalScene.arena.triggerWeatherBasedFormChanges();
     }
-    return false;
   }
 }
 
@@ -3355,16 +3866,13 @@ export class PostWeatherChangeAddBattlerTagAttr extends PostWeatherChangeAbAttr
     this.weatherTypes = weatherTypes;
   }
 
-  applyPostWeatherChange(pokemon: Pokemon, passive: boolean, simulated: boolean, weather: WeatherType, args: any[]): boolean {
-    console.log(this.weatherTypes.find(w => weather === w), WeatherType[weather]);
-    if (!this.weatherTypes.find(w => weather === w)) {
-      return false;
-    }
+  override canApplyPostWeatherChange(pokemon: Pokemon, passive: boolean, simulated: boolean, weather: WeatherType, args: any[]): boolean {
+    return !!this.weatherTypes.find(w => weather === w) && pokemon.canAddTag(this.tagType);
+  }
 
-    if (simulated) {
-      return pokemon.canAddTag(this.tagType);
-    } else {
-      return pokemon.addTag(this.tagType, this.turnCount);
+  override applyPostWeatherChange(pokemon: Pokemon, passive: boolean, simulated: boolean, weather: WeatherType, args: any[]): void {
+    if (!simulated) {
+      pokemon.addTag(this.tagType, this.turnCount);
     }
   }
 }
@@ -3378,10 +3886,23 @@ export class PostWeatherLapseAbAttr extends AbAttr {
     this.weatherTypes = weatherTypes;
   }
 
-  applyPostWeatherLapse(pokemon: Pokemon, passive: boolean, simulated: boolean, weather: Weather | null, args: any[]): boolean | Promise<boolean> {
-    return false;
+  canApplyPostWeatherLapse(
+    pokemon: Pokemon,
+    passive: boolean,
+    simulated: boolean,
+    weather: Weather | null,
+    args: any[]): boolean {
+    return true;
   }
 
+  applyPostWeatherLapse(
+    pokemon: Pokemon,
+    passive: boolean,
+    simulated: boolean,
+    weather: Weather | null,
+    args: any[],
+  ): void {}
+
   getCondition(): AbAttrCondition {
     return getWeatherCondition(...this.weatherTypes);
   }
@@ -3396,17 +3917,16 @@ export class PostWeatherLapseHealAbAttr extends PostWeatherLapseAbAttr {
     this.healFactor = healFactor;
   }
 
-  applyPostWeatherLapse(pokemon: Pokemon, passive: boolean, simulated: boolean, weather: Weather, args: any[]): boolean {
-    if (!pokemon.isFullHp()) {
-      const abilityName = (!passive ? pokemon.getAbility() : pokemon.getPassiveAbility()).name;
-      if (!simulated) {
-        globalScene.unshiftPhase(new PokemonHealPhase(pokemon.getBattlerIndex(),
-          Utils.toDmgValue(pokemon.getMaxHp() / (16 / this.healFactor)), i18next.t("abilityTriggers:postWeatherLapseHeal", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), abilityName }), true));
-      }
-      return true;
-    }
+  override canApplyPostWeatherLapse(pokemon: Pokemon, passive: boolean, simulated: boolean, weather: Weather | null, args: any[]): boolean {
+    return !pokemon.isFullHp();
+  }
 
-    return false;
+  override applyPostWeatherLapse(pokemon: Pokemon, passive: boolean, simulated: boolean, weather: Weather, args: any[]): void {
+    const abilityName = (!passive ? pokemon.getAbility() : pokemon.getPassiveAbility()).name;
+    if (!simulated) {
+      globalScene.unshiftPhase(new PokemonHealPhase(pokemon.getBattlerIndex(),
+        toDmgValue(pokemon.getMaxHp() / (16 / this.healFactor)), i18next.t("abilityTriggers:postWeatherLapseHeal", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), abilityName }), true));
+    }
   }
 }
 
@@ -3419,25 +3939,25 @@ export class PostWeatherLapseDamageAbAttr extends PostWeatherLapseAbAttr {
     this.damageFactor = damageFactor;
   }
 
-  applyPostWeatherLapse(pokemon: Pokemon, passive: boolean, simulated: boolean, weather: Weather, args: any[]): boolean {
-    if (pokemon.hasAbilityWithAttr(BlockNonDirectDamageAbAttr)) {
-      return false;
-    }
+  override canApplyPostWeatherLapse(pokemon: Pokemon, passive: boolean, simulated: boolean, weather: Weather | null, args: any[]): boolean {
+    return !pokemon.hasAbilityWithAttr(BlockNonDirectDamageAbAttr);
+  }
 
+  override applyPostWeatherLapse(pokemon: Pokemon, passive: boolean, simulated: boolean, weather: Weather, args: any[]): void {
     if (!simulated) {
       const abilityName = (!passive ? pokemon.getAbility() : pokemon.getPassiveAbility()).name;
       globalScene.queueMessage(i18next.t("abilityTriggers:postWeatherLapseDamage", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), abilityName }));
-      pokemon.damageAndUpdate(Utils.toDmgValue(pokemon.getMaxHp() / (16 / this.damageFactor)), HitResult.OTHER);
+      pokemon.damageAndUpdate(toDmgValue(pokemon.getMaxHp() / (16 / this.damageFactor)), { result: HitResult.INDIRECT });
     }
-
-    return true;
   }
 }
 
 export class PostTerrainChangeAbAttr extends AbAttr {
-  applyPostTerrainChange(pokemon: Pokemon, passive: boolean, simulated: boolean, terrain: TerrainType, args: any[]): boolean {
-    return false;
+  canApplyPostTerrainChange(pokemon: Pokemon, passive: boolean, simulated: boolean, terrain: TerrainType, args: any[]): boolean {
+    return true;
   }
+
+  applyPostTerrainChange(pokemon: Pokemon, passive: boolean, simulated: boolean, terrain: TerrainType, args: any[]): void {}
 }
 
 export class PostTerrainChangeAddBattlerTagAttr extends PostTerrainChangeAbAttr {
@@ -3453,15 +3973,13 @@ export class PostTerrainChangeAddBattlerTagAttr extends PostTerrainChangeAbAttr
     this.terrainTypes = terrainTypes;
   }
 
-  applyPostTerrainChange(pokemon: Pokemon, passive: boolean, simulated: boolean, terrain: TerrainType, args: any[]): boolean {
-    if (!this.terrainTypes.find(t => t === terrain)) {
-      return false;
-    }
+  override canApplyPostTerrainChange(pokemon: Pokemon, passive: boolean, simulated: boolean, terrain: TerrainType, args: any[]): boolean {
+    return !!this.terrainTypes.find(t => t === terrain) && pokemon.canAddTag(this.tagType);
+  }
 
-    if (simulated) {
-      return pokemon.canAddTag(this.tagType);
-    } else {
-      return pokemon.addTag(this.tagType, this.turnCount);
+  override applyPostTerrainChange(pokemon: Pokemon, passive: boolean, simulated: boolean, terrain: TerrainType, args: any[]): void {
+    if (!simulated) {
+      pokemon.addTag(this.tagType, this.turnCount);
     }
   }
 }
@@ -3474,9 +3992,11 @@ function getTerrainCondition(...terrainTypes: TerrainType[]): AbAttrCondition {
 }
 
 export class PostTurnAbAttr extends AbAttr {
-  applyPostTurn(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean | Promise<boolean> {
-    return false;
+  canApplyPostTurn(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean {
+    return true;
   }
+
+  applyPostTurn(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): void {}
 }
 
 /**
@@ -3494,138 +4014,205 @@ export class PostTurnStatusHealAbAttr extends PostTurnAbAttr {
     this.effects = effects;
   }
 
+  override canApplyPostTurn(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean {
+    return !isNullOrUndefined(pokemon.status) && this.effects.includes(pokemon.status.effect) && !pokemon.isFullHp();
+  }
+
   /**
    * @param {Pokemon} pokemon The pokemon with the ability that will receive the healing
    * @param {Boolean} passive N/A
    * @param {any[]} args N/A
-   * @returns Returns true if healed from status, false if not
    */
-  applyPostTurn(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean | Promise<boolean> {
-    if (pokemon.status && this.effects.includes(pokemon.status.effect)) {
-      if (!pokemon.isFullHp()) {
-        if (!simulated) {
-          const abilityName = (!passive ? pokemon.getAbility() : pokemon.getPassiveAbility()).name;
-          globalScene.unshiftPhase(new PokemonHealPhase(pokemon.getBattlerIndex(),
-            Utils.toDmgValue(pokemon.getMaxHp() / 8), i18next.t("abilityTriggers:poisonHeal", { pokemonName: getPokemonNameWithAffix(pokemon), abilityName }), true));
-        }
-        return true;
-      }
+  override applyPostTurn(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): void {
+    if (!simulated) {
+      const abilityName = (!passive ? pokemon.getAbility() : pokemon.getPassiveAbility()).name;
+      globalScene.unshiftPhase(new PokemonHealPhase(pokemon.getBattlerIndex(),
+        toDmgValue(pokemon.getMaxHp() / 8), i18next.t("abilityTriggers:poisonHeal", { pokemonName: getPokemonNameWithAffix(pokemon), abilityName }), true));
     }
-    return false;
   }
 }
 
 /**
  * After the turn ends, resets the status of either the ability holder or their ally
- * @param {boolean} allyTarget Whether to target ally, defaults to false (self-target)
+ * @param allyTarget Whether to target ally, defaults to false (self-target)
  */
 export class PostTurnResetStatusAbAttr extends PostTurnAbAttr {
   private allyTarget: boolean;
-  private target: Pokemon;
+  private target: Pokemon | undefined;
 
-  constructor(allyTarget: boolean = false) {
+  constructor(allyTarget = false) {
     super(true);
     this.allyTarget = allyTarget;
   }
 
-  applyPostTurn(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean {
+  override canApplyPostTurn(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean {
     if (this.allyTarget) {
       this.target = pokemon.getAlly();
     } else {
       this.target = pokemon;
     }
-    if (this.target?.status) {
-      if (!simulated) {
-        globalScene.queueMessage(getStatusEffectHealText(this.target.status?.effect, getPokemonNameWithAffix(this.target)));
-        this.target.resetStatus(false);
-        this.target.updateInfo();
-      }
 
-      return true;
+    const effect = this.target?.status?.effect;
+    return !!effect && effect !== StatusEffect.FAINT;
+  }
+
+  override applyPostTurn(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): void {
+    if (!simulated && this.target?.status) {
+      globalScene.queueMessage(getStatusEffectHealText(this.target.status?.effect, getPokemonNameWithAffix(this.target)));
+      this.target.resetStatus(false);
+      this.target.updateInfo();
     }
-
-    return false;
   }
 }
 
 /**
- * After the turn ends, try to create an extra item
+ * Attribute to try and restore eaten berries after the turn ends.
+ * Used by {@linkcode Abilities.HARVEST}.
  */
-export class PostTurnLootAbAttr extends PostTurnAbAttr {
+export class PostTurnRestoreBerryAbAttr extends PostTurnAbAttr {
   /**
-   * @param itemType - The type of item to create
-   * @param procChance - Chance to create an item
-   * @see {@linkcode applyPostTurn()}
+   * Array containing all {@linkcode BerryType | BerryTypes} that are under cap and able to be restored.
+   * Stored inside the class for a minor performance boost
+   */
+  private berriesUnderCap: BerryType[]
+
+  /**
+   * @param procChance - function providing chance to restore an item
+   * @see {@linkcode createEatenBerry()}
    */
   constructor(
-    /** Extend itemType to add more options */
-    private itemType: "EATEN_BERRIES" | "HELD_BERRIES",
     private procChance: (pokemon: Pokemon) => number
   ) {
     super();
   }
 
-  applyPostTurn(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean {
-    const pass = Phaser.Math.RND.realInRange(0, 1);
-    // Clamp procChance to [0, 1]. Skip if didn't proc (less than pass)
-    if (Math.max(Math.min(this.procChance(pokemon), 1), 0) < pass) {
+  override canApplyPostTurn(pokemon: Pokemon, _passive: boolean, _simulated: boolean, _args: any[]): boolean {
+    // Ensure we have at least 1 recoverable berry (at least 1 berry in berriesEaten is not capped)
+    const cappedBerries = new Set(
+      globalScene.getModifiers(BerryModifier, pokemon.isPlayer()).filter(
+        bm => bm.pokemonId === pokemon.id && bm.getCountUnderMax() < 1
+      ).map(bm => bm.berryType)
+    );
+
+    this.berriesUnderCap = pokemon.battleData.berriesEaten.filter(
+      bt => !cappedBerries.has(bt)
+    );
+
+    if (!this.berriesUnderCap.length) {
       return false;
     }
 
-    if (this.itemType === "EATEN_BERRIES") {
-      return this.createEatenBerry(pokemon, simulated);
-    } else {
-      return false;
+    // Clamp procChance to [0, 1]. Skip if didn't proc (less than pass)
+    const pass = Phaser.Math.RND.realInRange(0, 1);
+    return Phaser.Math.Clamp(this.procChance(pokemon), 0, 1) >= pass;
+  }
+
+  override applyPostTurn(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): void {
+    if (!simulated) {
+      this.createEatenBerry(pokemon);
     }
   }
 
   /**
-   * Create a new berry chosen randomly from the berries the pokemon ate this battle
-   * @param pokemon The pokemon with this ability
-   * @param simulated whether the associated ability call is simulated
-   * @returns whether a new berry was created
+   * Create a new berry chosen randomly from all berries the pokemon ate this battle
+   * @param pokemon - The {@linkcode Pokemon} with this ability
+   * @returns `true` if a new berry was created
    */
-  createEatenBerry(pokemon: Pokemon, simulated: boolean): boolean {
-    const berriesEaten = pokemon.battleData.berriesEaten;
-
-    if (!berriesEaten.length) {
-      return false;
-    }
-
-    if (simulated) {
-      return true;
-    }
-
-    const randomIdx = Utils.randSeedInt(berriesEaten.length);
-    const chosenBerryType = berriesEaten[randomIdx];
+  createEatenBerry(pokemon: Pokemon): boolean {
+    // Pick a random available berry to yoink
+    const randomIdx = randSeedInt(this.berriesUnderCap.length);
+    const chosenBerryType = this.berriesUnderCap[randomIdx];
+    pokemon.battleData.berriesEaten.splice(randomIdx, 1); // Remove berry from memory
     const chosenBerry = new BerryModifierType(chosenBerryType);
-    berriesEaten.splice(randomIdx); // Remove berry from memory
 
+    // Add the randomly chosen berry or update the existing one
     const berryModifier = globalScene.findModifier(
-      (m) => m instanceof BerryModifier && m.berryType === chosenBerryType,
+      (m) => m instanceof BerryModifier && m.berryType === chosenBerryType && m.pokemonId == pokemon.id,
       pokemon.isPlayer()
     ) as BerryModifier | undefined;
 
-    if (!berryModifier) {
+    if (berryModifier) {
+      berryModifier.stackCount++
+    } else {
       const newBerry = new BerryModifier(chosenBerry, pokemon.id, chosenBerryType, 1);
       if (pokemon.isPlayer()) {
         globalScene.addModifier(newBerry);
       } else {
         globalScene.addEnemyModifier(newBerry);
       }
-    } else if (berryModifier.stackCount < berryModifier.getMaxHeldItemCount(pokemon)) {
-      berryModifier.stackCount++;
     }
 
-    globalScene.queueMessage(i18next.t("abilityTriggers:postTurnLootCreateEatenBerry", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), berryName: chosenBerry.name }));
     globalScene.updateModifiers(pokemon.isPlayer());
-
+    globalScene.queueMessage(i18next.t("abilityTriggers:postTurnLootCreateEatenBerry", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), berryName: chosenBerry.name }));
     return true;
   }
 }
 
 /**
- * Attribute used for {@linkcode Abilities.MOODY}
+  * Attribute to track and re-trigger last turn's berries at the end of the `BerryPhase`.
+  * Used by {@linkcode Abilities.CUD_CHEW}.
+*/
+export class RepeatBerryNextTurnAbAttr extends PostTurnAbAttr {
+  /**
+   * @returns `true` if the pokemon ate anything last turn
+   */
+  override canApply(pokemon: Pokemon, _passive: boolean, _simulated: boolean, _args: any[]): boolean {
+    // force ability popup for ability triggers on normal turns.
+    // Still not used if ability doesn't proc
+    this.showAbility = true;
+    return !!pokemon.summonData.berriesEatenLast.length;
+  }
+
+  /**
+   * Cause this {@linkcode Pokemon} to regurgitate and eat all berries inside its `berriesEatenLast` array.
+   * Triggers a berry use animation, but does *not* count for other berry or item-related abilities.
+   * @param pokemon - The {@linkcode Pokemon} having a bad tummy ache
+   * @param _passive - N/A
+   * @param _simulated - N/A
+   * @param _cancelled - N/A
+   * @param _args - N/A
+   */
+  override apply(pokemon: Pokemon, _passive: boolean, _simulated: boolean, _cancelled: BooleanHolder | null, _args: any[]): void {
+    globalScene.unshiftPhase(
+      new CommonAnimPhase(pokemon.getBattlerIndex(), pokemon.getBattlerIndex(), CommonAnim.USE_ITEM),
+    );
+
+    // Re-apply effects of all berries previously scarfed.
+    // This doesn't count as "eating" a berry (for unnerve/stuff cheeks/unburden) as no item is consumed.
+    for (const berryType of pokemon.summonData.berriesEatenLast) {
+      getBerryEffectFunc(berryType)(pokemon);
+      const bMod = new BerryModifier(new BerryModifierType(berryType), pokemon.id, berryType, 1);
+      globalScene.eventTarget.dispatchEvent(new BerryUsedEvent(bMod)); // trigger message
+    }
+
+    // uncomment to make cheek pouch work with cud chew
+    // applyAbAttrs(HealFromBerryUseAbAttr, pokemon, new BooleanHolder(false));
+  }
+
+  /**
+   * @returns always `true` as we always want to move berries into summon data
+   */
+  override canApplyPostTurn(pokemon: Pokemon, _passive: boolean, _simulated: boolean, _args: any[]): boolean {
+    this.showAbility = false; // don't show popup for turn end berry moving (should ideally be hidden)
+    return true;
+  }
+
+  /**
+   * Move this {@linkcode Pokemon}'s `berriesEaten` array from `PokemonTurnData`
+   * into `PokemonSummonData` on turn end.
+   * Both arrays are cleared on switch.
+   * @param pokemon - The {@linkcode Pokemon} having a nice snack
+   * @param _passive - N/A
+   * @param _simulated - N/A
+   * @param _args - N/A
+   */
+  override applyPostTurn(pokemon: Pokemon, _passive: boolean, _simulated: boolean, _args: any[]): void {
+    pokemon.summonData.berriesEatenLast = pokemon.turnData.berriesEaten;
+  }
+}
+
+/**
+ * Attribute used for {@linkcode Abilities.MOODY} to randomly raise and lower stats at turn end.
  */
 export class MoodyAbAttr extends PostTurnAbAttr {
   constructor() {
@@ -3637,29 +4224,26 @@ export class MoodyAbAttr extends PostTurnAbAttr {
    * @param passive N/A
    * @param simulated true if applying in a simulated call.
    * @param args N/A
-   * @returns true
    *
    * Any stat stages at +6 or -6 are excluded from being increased or decreased, respectively
    * If the pokemon already has all stat stages raised to 6, it will only decrease one stat stage by 1
    * If the pokemon already has all stat stages lowered to -6, it will only increase one stat stage by 2
    */
-  applyPostTurn(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean {
+  override applyPostTurn(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): void {
     const canRaise = EFFECTIVE_STATS.filter(s => pokemon.getStatStage(s) < 6);
     let canLower = EFFECTIVE_STATS.filter(s => pokemon.getStatStage(s) > -6);
 
     if (!simulated) {
       if (canRaise.length > 0) {
-        const raisedStat = canRaise[pokemon.randSeedInt(canRaise.length)];
+        const raisedStat = canRaise[pokemon.randBattleSeedInt(canRaise.length)];
         canLower = canRaise.filter(s => s !== raisedStat);
         globalScene.unshiftPhase(new StatStageChangePhase(pokemon.getBattlerIndex(), true, [ raisedStat ], 2));
       }
       if (canLower.length > 0) {
-        const loweredStat = canLower[pokemon.randSeedInt(canLower.length)];
+        const loweredStat = canLower[pokemon.randBattleSeedInt(canLower.length)];
         globalScene.unshiftPhase(new StatStageChangePhase(pokemon.getBattlerIndex(), true, [ loweredStat ], -1));
       }
     }
-
-    return true;
   }
 }
 
@@ -3669,31 +4253,26 @@ export class SpeedBoostAbAttr extends PostTurnAbAttr {
     super(true);
   }
 
-  applyPostTurn(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean {
-    if (!simulated) {
-      if (!pokemon.turnData.switchedInThisTurn && !pokemon.turnData.failedRunAway) {
-        globalScene.unshiftPhase(new StatStageChangePhase(pokemon.getBattlerIndex(), true, [ Stat.SPD ], 1));
-      } else {
-        return false;
-      }
-    }
-    return true;
+  override canApplyPostTurn(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean {
+    return simulated || (!pokemon.turnData.switchedInThisTurn && !pokemon.turnData.failedRunAway);
+  }
+
+  override applyPostTurn(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): void {
+    globalScene.unshiftPhase(new StatStageChangePhase(pokemon.getBattlerIndex(), true, [ Stat.SPD ], 1));
   }
 }
 
 export class PostTurnHealAbAttr extends PostTurnAbAttr {
-  applyPostTurn(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean {
-    if (!pokemon.isFullHp()) {
-      if (!simulated) {
-        const abilityName = (!passive ? pokemon.getAbility() : pokemon.getPassiveAbility()).name;
-        globalScene.unshiftPhase(new PokemonHealPhase(pokemon.getBattlerIndex(),
-          Utils.toDmgValue(pokemon.getMaxHp() / 16), i18next.t("abilityTriggers:postTurnHeal", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), abilityName }), true));
-      }
+  override canApplyPostTurn(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean {
+    return !pokemon.isFullHp();
+  }
 
-      return true;
+  override applyPostTurn(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): void {
+    if (!simulated) {
+      const abilityName = (!passive ? pokemon.getAbility() : pokemon.getPassiveAbility()).name;
+      globalScene.unshiftPhase(new PokemonHealPhase(pokemon.getBattlerIndex(),
+        toDmgValue(pokemon.getMaxHp() / 16), i18next.t("abilityTriggers:postTurnHeal", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), abilityName }), true));
     }
-
-    return false;
   }
 }
 
@@ -3706,17 +4285,14 @@ export class PostTurnFormChangeAbAttr extends PostTurnAbAttr {
     this.formFunc = formFunc;
   }
 
-  applyPostTurn(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean {
-    const formIndex = this.formFunc(pokemon);
-    if (formIndex !== pokemon.formIndex) {
-      if (!simulated) {
-        globalScene.triggerPokemonFormChange(pokemon, SpeciesFormChangeAbilityTrigger, false);
-      }
+  override canApplyPostTurn(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean {
+    return this.formFunc(pokemon) !== pokemon.formIndex;
+  }
 
-      return true;
+  override applyPostTurn(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): void {
+    if (!simulated) {
+      globalScene.triggerPokemonFormChange(pokemon, SpeciesFormChangeAbilityTrigger, false);
     }
-
-    return false;
   }
 }
 
@@ -3725,28 +4301,25 @@ export class PostTurnFormChangeAbAttr extends PostTurnAbAttr {
  * Attribute used for abilities (Bad Dreams) that damages the opponents for being asleep
  */
 export class PostTurnHurtIfSleepingAbAttr extends PostTurnAbAttr {
-
+  override canApplyPostTurn(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean {
+    return pokemon.getOpponents().some(opp => (opp.status?.effect === StatusEffect.SLEEP || opp.hasAbility(Abilities.COMATOSE)) && !opp.hasAbilityWithAttr(BlockNonDirectDamageAbAttr) && !opp.switchOutStatus);
+  }
   /**
    * Deals damage to all sleeping opponents equal to 1/8 of their max hp (min 1)
-   * @param pokemon Pokemon that has this ability
+   * @param pokemon {@linkcode Pokemon} with this ability
    * @param passive N/A
    * @param simulated `true` if applying in a simulated call.
    * @param args N/A
-   * @returns `true` if any opponents are sleeping
    */
-  applyPostTurn(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean | Promise<boolean> {
-    let hadEffect: boolean = false;
+  override applyPostTurn(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): void {
     for (const opp of pokemon.getOpponents()) {
       if ((opp.status?.effect === StatusEffect.SLEEP || opp.hasAbility(Abilities.COMATOSE)) && !opp.hasAbilityWithAttr(BlockNonDirectDamageAbAttr) && !opp.switchOutStatus) {
         if (!simulated) {
-          opp.damageAndUpdate(Utils.toDmgValue(opp.getMaxHp() / 8), HitResult.OTHER);
+          opp.damageAndUpdate(toDmgValue(opp.getMaxHp() / 8), { result: HitResult.INDIRECT });
           globalScene.queueMessage(i18next.t("abilityTriggers:badDreams", { pokemonName: getPokemonNameWithAffix(opp) }));
         }
-        hadEffect = true;
       }
-
     }
-    return hadEffect;
   }
 }
 
@@ -3759,25 +4332,22 @@ export class FetchBallAbAttr extends PostTurnAbAttr {
   constructor() {
     super();
   }
+
+  override canApplyPostTurn(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean {
+    return !simulated && !isNullOrUndefined(globalScene.currentBattle.lastUsedPokeball) && !!pokemon.isPlayer;
+  }
+
   /**
    * Adds the last used Pokeball back into the player's inventory
    * @param pokemon {@linkcode Pokemon} with this ability
    * @param passive N/A
    * @param args N/A
-   * @returns true if player has used a pokeball and this pokemon is owned by the player
    */
-  applyPostTurn(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean {
-    if (simulated) {
-      return false;
-    }
+  override applyPostTurn(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): void {
     const lastUsed = globalScene.currentBattle.lastUsedPokeball;
-    if (lastUsed !== null && !!pokemon.isPlayer) {
-      globalScene.pokeballCounts[lastUsed]++;
-      globalScene.currentBattle.lastUsedPokeball = null;
-      globalScene.queueMessage(i18next.t("abilityTriggers:fetchBall", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), pokeballName: getPokeballName(lastUsed) }));
-      return true;
-    }
-    return false;
+    globalScene.pokeballCounts[lastUsed!]++;
+    globalScene.currentBattle.lastUsedPokeball = null;
+    globalScene.queueMessage(i18next.t("abilityTriggers:fetchBall", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), pokeballName: getPokeballName(lastUsed!) }));
   }
 }
 
@@ -3792,16 +4362,14 @@ export class PostBiomeChangeWeatherChangeAbAttr extends PostBiomeChangeAbAttr {
     this.weatherType = weatherType;
   }
 
-  apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean {
-    if (!globalScene.arena.weather?.isImmutable()) {
-      if (simulated) {
-        return globalScene.arena.weather?.weatherType !== this.weatherType;
-      } else {
-        return globalScene.arena.trySetWeather(this.weatherType, true);
-      }
-    }
+  override canApply(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean {
+    return ((globalScene.arena.weather?.isImmutable() ?? false) && globalScene.arena.canSetWeather(this.weatherType));
+  }
 
-    return false;
+  override apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: BooleanHolder, args: any[]): void {
+    if (!simulated) {
+      globalScene.arena.trySetWeather(this.weatherType, pokemon);
+    }
   }
 }
 
@@ -3814,11 +4382,13 @@ export class PostBiomeChangeTerrainChangeAbAttr extends PostBiomeChangeAbAttr {
     this.terrainType = terrainType;
   }
 
-  apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean {
-    if (simulated) {
-      return globalScene.arena.terrain?.terrainType !== this.terrainType;
-    } else {
-      return globalScene.arena.trySetTerrain(this.terrainType, true);
+  override canApply(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean {
+    return globalScene.arena.canSetTerrain(this.terrainType);
+  }
+
+  override apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: BooleanHolder, args: any[]): void {
+    if (!simulated) {
+      globalScene.arena.trySetTerrain(this.terrainType, false, pokemon);
     }
   }
 }
@@ -3828,9 +4398,24 @@ export class PostBiomeChangeTerrainChangeAbAttr extends PostBiomeChangeAbAttr {
  * @extends AbAttr
  */
 export class PostMoveUsedAbAttr extends AbAttr {
-  applyPostMoveUsed(pokemon: Pokemon, move: PokemonMove, source: Pokemon, targets: BattlerIndex[], simulated: boolean, args: any[]): boolean | Promise<boolean> {
-    return false;
+  canApplyPostMoveUsed(
+    pokemon: Pokemon,
+    move: PokemonMove,
+    source: Pokemon,
+    targets: BattlerIndex[],
+    simulated: boolean,
+    args: any[]): boolean {
+    return true;
   }
+
+  applyPostMoveUsed(
+    pokemon: Pokemon,
+    move: PokemonMove,
+    source: Pokemon,
+    targets: BattlerIndex[],
+    simulated: boolean,
+    args: any[],
+  ): void {}
 }
 
 /**
@@ -3838,6 +4423,15 @@ export class PostMoveUsedAbAttr extends AbAttr {
  * @extends PostMoveUsedAbAttr
  */
 export class PostDancingMoveAbAttr extends PostMoveUsedAbAttr {
+  override canApplyPostMoveUsed(dancer: Pokemon, move: PokemonMove, source: Pokemon, targets: BattlerIndex[], simulated: boolean, args: any[]): boolean {
+    // List of tags that prevent the Dancer from replicating the move
+    const forbiddenTags = [ BattlerTagType.FLYING, BattlerTagType.UNDERWATER,
+      BattlerTagType.UNDERGROUND, BattlerTagType.HIDDEN ];
+    // The move to replicate cannot come from the Dancer
+    return source.getBattlerIndex() !== dancer.getBattlerIndex()
+    && !dancer.summonData.tags.some(tag => forbiddenTags.includes(tag.tagType));
+  }
+
   /**
    * Resolves the Dancer ability by replicating the move used by the source of the dance
    * either on the source itself or on the target of the dance
@@ -3846,29 +4440,24 @@ export class PostDancingMoveAbAttr extends PostMoveUsedAbAttr {
    * @param source {@linkcode Pokemon} that used the dancing move
    * @param targets {@linkcode BattlerIndex}Targets of the dancing move
    * @param args N/A
-   *
-   * @return true if the Dancer ability was resolved
    */
-  applyPostMoveUsed(dancer: Pokemon, move: PokemonMove, source: Pokemon, targets: BattlerIndex[], simulated: boolean, args: any[]): boolean | Promise<boolean> {
-    // List of tags that prevent the Dancer from replicating the move
-    const forbiddenTags = [ BattlerTagType.FLYING, BattlerTagType.UNDERWATER,
-      BattlerTagType.UNDERGROUND, BattlerTagType.HIDDEN ];
-    // The move to replicate cannot come from the Dancer
-    if (source.getBattlerIndex() !== dancer.getBattlerIndex()
-        && !dancer.summonData.tags.some(tag => forbiddenTags.includes(tag.tagType))) {
-      if (!simulated) {
-        // If the move is an AttackMove or a StatusMove the Dancer must replicate the move on the source of the Dance
-        if (move.getMove() instanceof AttackMove || move.getMove() instanceof StatusMove) {
-          const target = this.getTarget(dancer, source, targets);
-          globalScene.unshiftPhase(new MovePhase(dancer, target, move, true, true));
-        } else if (move.getMove() instanceof SelfStatusMove) {
-          // If the move is a SelfStatusMove (ie. Swords Dance) the Dancer should replicate it on itself
-          globalScene.unshiftPhase(new MovePhase(dancer, [ dancer.getBattlerIndex() ], move, true, true));
-        }
+  override applyPostMoveUsed(
+    dancer: Pokemon,
+    move: PokemonMove,
+    source: Pokemon,
+    targets: BattlerIndex[],
+    simulated: boolean,
+    args: any[]): void {
+    if (!simulated) {
+      // If the move is an AttackMove or a StatusMove the Dancer must replicate the move on the source of the Dance
+      if (move.getMove() instanceof AttackMove || move.getMove() instanceof StatusMove) {
+        const target = this.getTarget(dancer, source, targets);
+        globalScene.unshiftPhase(new MovePhase(dancer, target, move, true, true));
+      } else if (move.getMove() instanceof SelfStatusMove) {
+        // If the move is a SelfStatusMove (ie. Swords Dance) the Dancer should replicate it on itself
+        globalScene.unshiftPhase(new MovePhase(dancer, [ dancer.getBattlerIndex() ], move, true, true));
       }
-      return true;
     }
-    return false;
   }
 
   /**
@@ -3891,33 +4480,35 @@ export class PostDancingMoveAbAttr extends PostMoveUsedAbAttr {
  * @extends AbAttr
  */
 export class PostItemLostAbAttr extends AbAttr {
-  applyPostItemLost(pokemon: Pokemon, simulated: boolean, args: any[]): boolean | Promise<boolean> {
-    return false;
+  canApplyPostItemLost(pokemon: Pokemon, simulated: boolean, args: any[]): boolean {
+    return true;
   }
+
+  applyPostItemLost(pokemon: Pokemon, simulated: boolean, args: any[]): void {}
 }
 
 /**
- * Applies a Battler Tag to the Pokemon after it loses or consumes item
+ * Applies a Battler Tag to the Pokemon after it loses or consumes an item
  * @extends PostItemLostAbAttr
  */
 export class PostItemLostApplyBattlerTagAbAttr extends PostItemLostAbAttr {
   private tagType: BattlerTagType;
   constructor(tagType: BattlerTagType) {
-    super(true);
+    super(false);
     this.tagType = tagType;
   }
+
+  override canApplyPostItemLost(pokemon: Pokemon, simulated: boolean, args: any[]): boolean {
+    return !pokemon.getTag(this.tagType) && !simulated;
+  }
+
   /**
    * Adds the last used Pokeball back into the player's inventory
    * @param pokemon {@linkcode Pokemon} with this ability
    * @param args N/A
-   * @returns true if BattlerTag was applied
    */
-  applyPostItemLost(pokemon: Pokemon, simulated: boolean, args: any[]): boolean | Promise<boolean> {
-    if (!pokemon.getTag(this.tagType) && !simulated) {
-      pokemon.addTag(this.tagType);
-      return true;
-    }
-    return false;
+  override applyPostItemLost(pokemon: Pokemon, simulated: boolean, args: any[]): void {
+    pokemon.addTag(this.tagType);
   }
 }
 
@@ -3925,24 +4516,27 @@ export class StatStageChangeMultiplierAbAttr extends AbAttr {
   private multiplier: number;
 
   constructor(multiplier: number) {
-    super(true);
+    super(false);
 
     this.multiplier = multiplier;
   }
 
-  override apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean {
-    (args[0] as Utils.IntegerHolder).value *= this.multiplier;
-
-    return true;
+  override apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: BooleanHolder, args: any[]): void {
+    (args[0] as NumberHolder).value *= this.multiplier;
   }
 }
 
 export class StatStageChangeCopyAbAttr extends AbAttr {
-  apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean | Promise<boolean> {
+  override apply(
+    pokemon: Pokemon,
+    passive: boolean,
+    simulated: boolean,
+    cancelled: BooleanHolder,
+    args: any[],
+  ): void {
     if (!simulated) {
       globalScene.unshiftPhase(new StatStageChangePhase(pokemon.getBattlerIndex(), true, (args[0] as BattleStat[]), (args[1] as number), true, false, false));
     }
-    return true;
   }
 }
 
@@ -3951,10 +4545,8 @@ export class BypassBurnDamageReductionAbAttr extends AbAttr {
     super(false);
   }
 
-  apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean {
+  override apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: BooleanHolder, args: any[]): void {
     cancelled.value = true;
-
-    return true;
   }
 }
 
@@ -3972,29 +4564,33 @@ export class ReduceBurnDamageAbAttr extends AbAttr {
    * @param pokemon N/A
    * @param passive N/A
    * @param cancelled N/A
-   * @param args `[0]` {@linkcode Utils.NumberHolder} The damage value being modified
-   * @returns `true`
+   * @param args `[0]` {@linkcode NumberHolder} The damage value being modified
    */
-  apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean {
-    (args[0] as Utils.NumberHolder).value = Utils.toDmgValue((args[0] as Utils.NumberHolder).value * this.multiplier);
-
-    return true;
+  override apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: BooleanHolder, args: any[]): void {
+    (args[0] as NumberHolder).value = toDmgValue((args[0] as NumberHolder).value * this.multiplier);
   }
 }
 
 export class DoubleBerryEffectAbAttr extends AbAttr {
-  apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean {
-    (args[0] as Utils.NumberHolder).value *= 2;
-
-    return true;
+  override apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: BooleanHolder, args: any[]): void {
+    (args[0] as NumberHolder).value *= 2;
   }
 }
 
+/**
+ * Attribute to prevent opposing berry use while on the field.
+ * Used by {@linkcode Abilities.UNNERVE}, {@linkcode Abilities.AS_ONE_GLASTRIER} and {@linkcode Abilities.AS_ONE_SPECTRIER}
+ */
 export class PreventBerryUseAbAttr extends AbAttr {
-  apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean {
+  /**
+   * Prevent use of opposing berries.
+   * @param _pokemon - Unused
+   * @param _passive - Unused
+   * @param _simulated - Unused
+   * @param cancelled - {@linkcode BooleanHolder} containing whether to block berry use
+   */
+  override apply(_pokemon: Pokemon, _passive: boolean, _simulated: boolean, cancelled: BooleanHolder): void {
     cancelled.value = true;
-
-    return true;
   }
 }
 
@@ -4014,27 +4610,26 @@ export class HealFromBerryUseAbAttr extends AbAttr {
     this.healPercent = Math.max(Math.min(healPercent, 1), 0);
   }
 
-  apply(pokemon: Pokemon, passive: boolean, simulated: boolean, ...args: [Utils.BooleanHolder, any[]]): boolean {
+  override apply(pokemon: Pokemon, passive: boolean, simulated: boolean, ...args: [BooleanHolder, any[]]): void {
+    if (simulated) {
+      return;
+    }
+
     const { name: abilityName } = passive ? pokemon.getPassiveAbility() : pokemon.getAbility();
-    if (!simulated) {
-      globalScene.unshiftPhase(
-        new PokemonHealPhase(
-          pokemon.getBattlerIndex(),
-          Utils.toDmgValue(pokemon.getMaxHp() * this.healPercent),
-          i18next.t("abilityTriggers:healFromBerryUse", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), abilityName }),
-          true
+    globalScene.unshiftPhase(
+      new PokemonHealPhase(
+        pokemon.getBattlerIndex(),
+        toDmgValue(pokemon.getMaxHp() * this.healPercent),
+        i18next.t("abilityTriggers:healFromBerryUse", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), abilityName }),
+        true
         )
       );
-    }
-    return true;
   }
 }
 
 export class RunSuccessAbAttr extends AbAttr {
-  apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean {
-    (args[0] as Utils.IntegerHolder).value = 256;
-
-    return true;
+  override apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: BooleanHolder, args: any[]): void {
+    (args[0] as NumberHolder).value = 256;
   }
 }
 
@@ -4054,9 +4649,25 @@ export class CheckTrappedAbAttr extends AbAttr {
     this.arenaTrapCondition = condition;
   }
 
-  applyCheckTrapped(pokemon: Pokemon, passive: boolean, simulated: boolean, trapped: Utils.BooleanHolder, otherPokemon: Pokemon, args: any[]): boolean | Promise<boolean> {
-    return false;
+  canApplyCheckTrapped(
+    pokemon: Pokemon,
+    passive: boolean,
+    simulated: boolean,
+    trapped: BooleanHolder,
+    otherPokemon: Pokemon,
+    args: any[],
+  ): boolean {
+    return true;
   }
+
+  applyCheckTrapped(
+    pokemon: Pokemon,
+    passive: boolean,
+    simulated: boolean,
+    trapped: BooleanHolder,
+    otherPokemon: Pokemon,
+    args: any[],
+  ): void {}
 }
 
 /**
@@ -4066,6 +4677,12 @@ export class CheckTrappedAbAttr extends AbAttr {
  * @see {@linkcode applyCheckTrapped}
  */
 export class ArenaTrapAbAttr extends CheckTrappedAbAttr {
+  override canApplyCheckTrapped(pokemon: Pokemon, passive: boolean, simulated: boolean, trapped: BooleanHolder, otherPokemon: Pokemon, args: any[]): boolean {
+    return this.arenaTrapCondition(pokemon, otherPokemon)
+    && !(otherPokemon.getTypes(true).includes(PokemonType.GHOST) || (otherPokemon.getTypes(true).includes(PokemonType.STELLAR) && otherPokemon.getTypes().includes(PokemonType.GHOST)))
+    && !otherPokemon.hasAbility(Abilities.RUN_AWAY);
+  }
+
   /**
    * Checks if enemy Pokemon is trapped by an Arena Trap-esque ability
    * If the enemy is a Ghost type, it is not trapped
@@ -4074,25 +4691,12 @@ export class ArenaTrapAbAttr extends CheckTrappedAbAttr {
    * If the user has Arena Trap and the enemy is not grounded, it is not trapped.
    * @param pokemon The {@link Pokemon} with this {@link AbAttr}
    * @param passive N/A
-   * @param trapped {@link Utils.BooleanHolder} indicating whether the other Pokemon is trapped or not
+   * @param trapped {@link BooleanHolder} indicating whether the other Pokemon is trapped or not
    * @param otherPokemon The {@link Pokemon} that is affected by an Arena Trap ability
    * @param args N/A
-   * @returns if enemy Pokemon is trapped or not
    */
-  applyCheckTrapped(pokemon: Pokemon, passive: boolean, simulated: boolean, trapped: Utils.BooleanHolder, otherPokemon: Pokemon, args: any[]): boolean {
-    if (this.arenaTrapCondition(pokemon, otherPokemon)) {
-      if (otherPokemon.getTypes(true).includes(Type.GHOST) || (otherPokemon.getTypes(true).includes(Type.STELLAR) && otherPokemon.getTypes().includes(Type.GHOST))) {
-        trapped.value = false;
-        return false;
-      } else if (otherPokemon.hasAbility(Abilities.RUN_AWAY)) {
-        trapped.value = false;
-        return false;
-      }
-      trapped.value = true;
-      return true;
-    }
-    trapped.value = false;
-    return false;
+  override applyCheckTrapped(pokemon: Pokemon, passive: boolean, simulated: boolean, trapped: BooleanHolder, otherPokemon: Pokemon, args: any[]): void {
+    trapped.value = true;
   }
 
   getTriggerMessage(pokemon: Pokemon, abilityName: string, ...args: any[]): string {
@@ -4101,48 +4705,62 @@ export class ArenaTrapAbAttr extends CheckTrappedAbAttr {
 }
 
 export class MaxMultiHitAbAttr extends AbAttr {
-  apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean {
-    (args[0] as Utils.IntegerHolder).value = 0;
+  constructor() {
+    super(false);
+  }
 
-    return true;
+  override apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: BooleanHolder, args: any[]): void {
+    (args[0] as NumberHolder).value = 0;
   }
 }
 
 export class PostBattleAbAttr extends AbAttr {
-  constructor() {
-    super(true);
+  constructor(showAbility: boolean = true) {
+    super(showAbility);
   }
 
-  applyPostBattle(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean {
-    return false;
+  canApplyPostBattle(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean {
+    return true;
   }
+
+  applyPostBattle(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): void {}
 }
 
 export class PostBattleLootAbAttr extends PostBattleAbAttr {
-  /**
-   * @param args - `[0]`: boolean for if the battle ended in a victory
-   * @returns `true` if successful
-   */
-  applyPostBattle(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean {
+  private randItem?: PokemonHeldItemModifier;
+
+  override canApplyPostBattle(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean {
     const postBattleLoot = globalScene.currentBattle.postBattleLoot;
     if (!simulated && postBattleLoot.length && args[0]) {
-      const randItem = Utils.randSeedItem(postBattleLoot);
-      //@ts-ignore - TODO see below
-      if (globalScene.tryTransferHeldItemModifier(randItem, pokemon, true, 1, true, undefined, false)) { // TODO: fix. This is a promise!?
-        postBattleLoot.splice(postBattleLoot.indexOf(randItem), 1);
-        globalScene.queueMessage(i18next.t("abilityTriggers:postBattleLoot", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), itemName: randItem.type.name }));
-        return true;
-      }
+      this.randItem = randSeedItem(postBattleLoot);
+      return globalScene.canTransferHeldItemModifier(this.randItem, pokemon, 1);
+    }
+    return false;
+  }
+
+  /**
+   * @param args - `[0]`: boolean for if the battle ended in a victory
+   */
+  override applyPostBattle(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): void {
+    const postBattleLoot = globalScene.currentBattle.postBattleLoot;
+    if (!this.randItem) {
+      this.randItem = randSeedItem(postBattleLoot);
     }
 
-    return false;
+    if (globalScene.tryTransferHeldItemModifier(this.randItem, pokemon, true, 1, true, undefined, false)) {
+      postBattleLoot.splice(postBattleLoot.indexOf(this.randItem), 1);
+      globalScene.queueMessage(i18next.t("abilityTriggers:postBattleLoot", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), itemName: this.randItem.type.name }));
+    }
+    this.randItem = undefined;
   }
 }
 
 export class PostFaintAbAttr extends AbAttr {
-  applyPostFaint(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker?: Pokemon, move?: Move, hitResult?: HitResult, ...args: any[]): boolean {
-    return false;
+  canApplyPostFaint(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker?: Pokemon, move?: Move, hitResult?: HitResult, ...args: any[]): boolean {
+    return true;
   }
+
+  applyPostFaint(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker?: Pokemon, move?: Move, hitResult?: HitResult, ...args: any[]): void {}
 }
 
 /**
@@ -4151,6 +4769,10 @@ export class PostFaintAbAttr extends AbAttr {
  * @extends PostFaintAbAttr
  */
 export class PostFaintUnsuppressedWeatherFormChangeAbAttr extends PostFaintAbAttr {
+  override canApplyPostFaint(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker?: Pokemon, move?: Move, hitResult?: HitResult, ...args: any[]): boolean {
+    return getPokemonWithWeatherBasedForms().length > 0;
+  }
+
   /**
    * Triggers {@linkcode Arena.triggerWeatherBasedFormChanges | triggerWeatherBasedFormChanges}
    * when the user of the ability faints
@@ -4160,20 +4782,11 @@ export class PostFaintUnsuppressedWeatherFormChangeAbAttr extends PostFaintAbAtt
    * @param move n/a
    * @param hitResult n/a
    * @param args n/a
-   * @returns whether the form change was triggered
    */
-  applyPostFaint(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, hitResult: HitResult, args: any[]): boolean {
-    const pokemonToTransform = getPokemonWithWeatherBasedForms();
-
-    if (pokemonToTransform.length < 1) {
-      return false;
-    }
-
+  override applyPostFaint(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, hitResult: HitResult, args: any[]): void {
     if (!simulated) {
       globalScene.arena.triggerWeatherBasedFormChanges();
     }
-
-    return true;
   }
 }
 
@@ -4181,26 +4794,27 @@ export class PostFaintContactDamageAbAttr extends PostFaintAbAttr {
   private damageRatio: number;
 
   constructor(damageRatio: number) {
-    super();
+    super(true);
 
     this.damageRatio = damageRatio;
   }
 
-  applyPostFaint(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker?: Pokemon, move?: Move, hitResult?: HitResult, ...args: any[]): boolean {
-    if (move !== undefined && attacker !== undefined && move.checkFlag(MoveFlags.MAKES_CONTACT, attacker, pokemon)) {  //If the mon didn't die to indirect damage
-      const cancelled = new Utils.BooleanHolder(false);
-      globalScene.getField(true).map(p => applyAbAttrs(FieldPreventExplosiveMovesAbAttr, p, cancelled, simulated));
-      if (cancelled.value || attacker.hasAbilityWithAttr(BlockNonDirectDamageAbAttr)) {
-        return false;
-      }
-      if (!simulated) {
-        attacker.damageAndUpdate(Utils.toDmgValue(attacker.getMaxHp() * (1 / this.damageRatio)), HitResult.OTHER);
-        attacker.turnData.damageTaken += Utils.toDmgValue(attacker.getMaxHp() * (1 / this.damageRatio));
-      }
-      return true;
+  override canApplyPostFaint(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker?: Pokemon, move?: Move, hitResult?: HitResult, ...args: any[]): boolean {
+    const diedToDirectDamage = move !== undefined && attacker !== undefined && move.doesFlagEffectApply({flag: MoveFlags.MAKES_CONTACT, user: attacker, target: pokemon});
+    const cancelled = new BooleanHolder(false);
+    globalScene.getField(true).map(p => applyAbAttrs(FieldPreventExplosiveMovesAbAttr, p, cancelled, simulated));
+    if (!diedToDirectDamage || cancelled.value || attacker!.hasAbilityWithAttr(BlockNonDirectDamageAbAttr)) {
+      return false;
     }
 
-    return false;
+    return true;
+  }
+
+  override applyPostFaint(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker?: Pokemon, move?: Move, hitResult?: HitResult, ...args: any[]): void {
+    if (!simulated) {
+      attacker!.damageAndUpdate(toDmgValue(attacker!.getMaxHp() * (1 / this.damageRatio)), { result: HitResult.INDIRECT });
+      attacker!.turnData.damageTaken += toDmgValue(attacker!.getMaxHp() * (1 / this.damageRatio));
+    }
   }
 
   getTriggerMessage(pokemon: Pokemon, abilityName: string, ...args: any[]): string {
@@ -4216,13 +4830,12 @@ export class PostFaintHPDamageAbAttr extends PostFaintAbAttr {
     super ();
   }
 
-  applyPostFaint(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker?: Pokemon, move?: Move, hitResult?: HitResult, ...args: any[]): boolean {
+  override applyPostFaint(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker?: Pokemon, move?: Move, hitResult?: HitResult, ...args: any[]): void {
     if (move !== undefined && attacker !== undefined && !simulated) { //If the mon didn't die to indirect damage
       const damage = pokemon.turnData.attacksReceived[0].damage;
-      attacker.damageAndUpdate((damage), HitResult.OTHER);
+      attacker.damageAndUpdate((damage), { result: HitResult.INDIRECT });
       attacker.turnData.damageTaken += damage;
     }
-    return true;
   }
 
   getTriggerMessage(pokemon: Pokemon, abilityName: string, ...args: any[]): string {
@@ -4230,36 +4843,49 @@ export class PostFaintHPDamageAbAttr extends PostFaintAbAttr {
   }
 }
 
+/**
+ * Redirects a move to the pokemon with this ability if it meets the conditions
+ */
 export class RedirectMoveAbAttr extends AbAttr {
-  apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean {
-    if (this.canRedirect(args[0] as Moves)) {
-      const target = args[1] as Utils.IntegerHolder;
-      const newTarget = pokemon.getBattlerIndex();
-      if (target.value !== newTarget) {
-        target.value = newTarget;
-        return true;
-      }
-    }
+  /**
+   * @param pokemon - The Pokemon with the redirection ability
+   * @param args - The args passed to the `AbAttr`:
+   *  - `[0]` - The id of the {@linkcode Move} used
+   *  - `[1]` - The target's battler index (before redirection)
+   *  - `[2]` - The Pokemon that used the move being redirected
+   */
 
-    return false;
+  override canApply(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean {
+    if (!this.canRedirect(args[0] as Moves, args[2] as Pokemon)) {
+      return false;
+    }
+    const target = args[1] as NumberHolder;
+    const newTarget = pokemon.getBattlerIndex();
+    return target.value !== newTarget;
   }
 
-  canRedirect(moveId: Moves): boolean {
+  override apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: BooleanHolder, args: any[]): void {
+    const target = args[1] as NumberHolder;
+    const newTarget = pokemon.getBattlerIndex();
+    target.value = newTarget;
+  }
+
+  canRedirect(moveId: Moves, user: Pokemon): boolean {
     const move = allMoves[moveId];
     return !![ MoveTarget.NEAR_OTHER, MoveTarget.OTHER ].find(t => move.moveTarget === t);
   }
 }
 
 export class RedirectTypeMoveAbAttr extends RedirectMoveAbAttr {
-  public type: Type;
+  public type: PokemonType;
 
-  constructor(type: Type) {
+  constructor(type: PokemonType) {
     super();
     this.type = type;
   }
 
-  canRedirect(moveId: Moves): boolean {
-    return super.canRedirect(moveId) && allMoves[moveId].type === this.type;
+  canRedirect(moveId: Moves, user: Pokemon): boolean {
+    return super.canRedirect(moveId, user) && user.getMoveType(allMoves[moveId]) === this.type;
   }
 }
 
@@ -4274,28 +4900,23 @@ export class ReduceStatusEffectDurationAbAttr extends AbAttr {
   private statusEffect: StatusEffect;
 
   constructor(statusEffect: StatusEffect) {
-    super(true);
+    super(false);
 
     this.statusEffect = statusEffect;
   }
 
+  override canApply(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean {
+    return args[1] instanceof NumberHolder && args[0] === this.statusEffect;
+  }
+
   /**
    * Reduces the number of sleep turns remaining by an extra 1 when applied
    * @param args - The args passed to the `AbAttr`:
    * - `[0]` - The {@linkcode StatusEffect} of the Pokemon
    * - `[1]` - The number of turns remaining until the status is healed
-   * @returns `true` if the ability was applied
    */
-  apply(_pokemon: Pokemon, _passive: boolean, _simulated: boolean, _cancelled: Utils.BooleanHolder, args: any[]): boolean {
-    if (!(args[1] instanceof Utils.NumberHolder)) {
-      return false;
-    }
-    if (args[0] === this.statusEffect) {
-      args[1].value -= 1;
-      return true;
-    }
-
-    return false;
+  override apply(_pokemon: Pokemon, _passive: boolean, _simulated: boolean, _cancelled: BooleanHolder, args: any[]): void {
+    args[1].value -= 1;
   }
 }
 
@@ -4318,37 +4939,33 @@ export class FlinchStatStageChangeAbAttr extends FlinchEffectAbAttr {
     this.stages = stages;
   }
 
-  apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean {
+  override apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: BooleanHolder, args: any[]): void {
     if (!simulated) {
       globalScene.unshiftPhase(new StatStageChangePhase(pokemon.getBattlerIndex(), true, this.stats, this.stages));
     }
-    return true;
   }
 }
 
 export class IncreasePpAbAttr extends AbAttr { }
 
 export class ForceSwitchOutImmunityAbAttr extends AbAttr {
-  apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean {
+  override apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: BooleanHolder, args: any[]): void {
     cancelled.value = true;
-    return true;
   }
 }
 
 export class ReduceBerryUseThresholdAbAttr extends AbAttr {
   constructor() {
-    super();
+    super(false);
   }
 
-  apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean {
+  override canApply(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean {
     const hpRatio = pokemon.getHpRatio();
+    return args[0].value < hpRatio;
+  }
 
-    if (args[0].value < hpRatio) {
-      args[0].value *= 2;
-      return args[0].value >= hpRatio;
-    }
-
-    return false;
+  override apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: BooleanHolder, args: any[]): void {
+    args[0].value *= 2;
   }
 }
 
@@ -4360,15 +4977,13 @@ export class WeightMultiplierAbAttr extends AbAttr {
   private multiplier: number;
 
   constructor(multiplier: number) {
-    super();
+    super(false);
 
     this.multiplier = multiplier;
   }
 
-  apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean {
-    (args[0] as Utils.NumberHolder).value *= this.multiplier;
-
-    return true;
+  override apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: BooleanHolder, args: any[]): void {
+    (args[0] as NumberHolder).value *= this.multiplier;
   }
 }
 
@@ -4377,10 +4992,8 @@ export class SyncEncounterNatureAbAttr extends AbAttr {
     super(false);
   }
 
-  apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean {
+  override apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: BooleanHolder, args: any[]): void {
     (args[0] as Pokemon).setNature(pokemon.getNature());
-
-    return true;
   }
 }
 
@@ -4393,27 +5006,12 @@ export class MoveAbilityBypassAbAttr extends AbAttr {
     this.moveIgnoreFunc = moveIgnoreFunc || ((pokemon, move) => true);
   }
 
-  apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean {
-    if (this.moveIgnoreFunc(pokemon, (args[0] as Move))) {
-      cancelled.value = true;
-      return true;
-    }
-    return false;
-  }
-}
-
-export class SuppressFieldAbilitiesAbAttr extends AbAttr {
-  constructor() {
-    super(false);
+  override canApply(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean {
+    return this.moveIgnoreFunc(pokemon, (args[0] as Move));
   }
 
-  apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean {
-    const ability = (args[0] as Ability);
-    if (!ability.hasAttr(UnsuppressableAbilityAbAttr) && !ability.hasAttr(SuppressFieldAbilitiesAbAttr)) {
-      cancelled.value = true;
-      return true;
-    }
-    return false;
+  override apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: BooleanHolder, args: any[]): void {
+    cancelled.value = true;
   }
 }
 
@@ -4427,42 +5025,34 @@ export class IgnoreProtectOnContactAbAttr extends AbAttr { }
  * Allows the source's moves to bypass the effects of opposing Light Screen, Reflect, Aurora Veil, Safeguard, Mist, and Substitute.
  */
 export class InfiltratorAbAttr extends AbAttr {
+  constructor() {
+    super(false);
+  }
+
+  override canApply(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean {
+    return args[0] instanceof BooleanHolder;
+  }
+
   /**
    * Sets a flag to bypass screens, Substitute, Safeguard, and Mist
    * @param pokemon n/a
    * @param passive n/a
    * @param simulated n/a
    * @param cancelled n/a
-   * @param args `[0]` a {@linkcode Utils.BooleanHolder | BooleanHolder} containing the flag
-   * @returns `true` if the bypass flag was successfully set; `false` otherwise.
+   * @param args `[0]` a {@linkcode BooleanHolder | BooleanHolder} containing the flag
    */
-  override apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: null, args: any[]): boolean {
+  override apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: null, args: any[]): void {
     const bypassed = args[0];
-    if (args[0] instanceof Utils.BooleanHolder) {
-      bypassed.value = true;
-      return true;
-    }
-    return false;
+    bypassed.value = true;
   }
 }
 
-export class UncopiableAbilityAbAttr extends AbAttr {
-  constructor() {
-    super(false);
-  }
-}
-
-export class UnsuppressableAbilityAbAttr extends AbAttr {
-  constructor() {
-    super(false);
-  }
-}
-
-export class UnswappableAbilityAbAttr extends AbAttr {
-  constructor() {
-    super(false);
-  }
-}
+/**
+ * Attribute implementing the effects of {@link https://bulbapedia.bulbagarden.net/wiki/Magic_Bounce_(ability) | Magic Bounce}.
+ * Allows the source to bounce back {@linkcode MoveFlags.REFLECTABLE | Reflectable}
+ *  moves as if the user had used {@linkcode Moves.MAGIC_COAT | Magic Coat}.
+ */
+export class ReflectStatusMoveAbAttr extends AbAttr { }
 
 export class NoTransformAbilityAbAttr extends AbAttr {
   constructor() {
@@ -4477,21 +5067,21 @@ export class NoFusionAbilityAbAttr extends AbAttr {
 }
 
 export class IgnoreTypeImmunityAbAttr extends AbAttr {
-  private defenderType: Type;
-  private allowedMoveTypes: Type[];
+  private defenderType: PokemonType;
+  private allowedMoveTypes: PokemonType[];
 
-  constructor(defenderType: Type, allowedMoveTypes: Type[]) {
-    super(true);
+  constructor(defenderType: PokemonType, allowedMoveTypes: PokemonType[]) {
+    super(false);
     this.defenderType = defenderType;
     this.allowedMoveTypes = allowedMoveTypes;
   }
 
-  apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean {
-    if (this.defenderType === (args[1] as Type) && this.allowedMoveTypes.includes(args[0] as Type)) {
-      cancelled.value = true;
-      return true;
-    }
-    return false;
+  override canApply(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean {
+    return this.defenderType === (args[1] as PokemonType) && this.allowedMoveTypes.includes(args[0] as PokemonType);
+  }
+
+  override apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: BooleanHolder, args: any[]): void {
+    cancelled.value = true;
   }
 }
 
@@ -4500,22 +5090,21 @@ export class IgnoreTypeImmunityAbAttr extends AbAttr {
  */
 export class IgnoreTypeStatusEffectImmunityAbAttr extends AbAttr {
   private statusEffect: StatusEffect[];
-  private defenderType: Type[];
+  private defenderType: PokemonType[];
 
-  constructor(statusEffect: StatusEffect[], defenderType: Type[]) {
-    super(true);
+  constructor(statusEffect: StatusEffect[], defenderType: PokemonType[]) {
+    super(false);
 
     this.statusEffect = statusEffect;
     this.defenderType = defenderType;
   }
 
-  apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean {
-    if (this.statusEffect.includes(args[0] as StatusEffect) && this.defenderType.includes(args[1] as Type)) {
-      cancelled.value = true;
-      return true;
-    }
+  override canApply(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean {
+    return this.statusEffect.includes(args[0] as StatusEffect) && this.defenderType.includes(args[1] as PokemonType);
+  }
 
-    return false;
+  override apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: BooleanHolder, args: any[]): void {
+    cancelled.value = true;
   }
 }
 
@@ -4530,18 +5119,17 @@ export class MoneyAbAttr extends PostBattleAbAttr {
     super();
   }
 
+  override canApplyPostBattle(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean {
+    return !simulated && args[0];
+  }
+
   /**
    * @param pokemon {@linkcode Pokemon} that is the user of this ability.
    * @param passive N/A
    * @param args - `[0]`: boolean for if the battle ended in a victory
-   * @returns `true` if successful
    */
-  applyPostBattle(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean {
-    if (!simulated && args[0]) {
-      globalScene.currentBattle.moneyScattered += globalScene.getWaveMoneyAmount(0.2);
-      return true;
-    }
-    return false;
+  override applyPostBattle(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): void {
+    globalScene.currentBattle.moneyScattered += globalScene.getWaveMoneyAmount(0.2);
   }
 }
 
@@ -4569,6 +5157,12 @@ export class PostSummonStatStageChangeOnArenaAbAttr extends PostSummonStatStageC
     this.tagType = tagType;
   }
 
+  override canApplyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean {
+    const side = pokemon.isPlayer() ? ArenaTagSide.PLAYER : ArenaTagSide.ENEMY;
+    return (globalScene.arena.getTagOnSide(this.tagType, side) ?? false)
+      && super.canApplyPostSummon(pokemon, passive, simulated, args);
+  }
+
   /**
    * Applies the post-summon stat change if the specified arena tag is present on pokemon's side.
    * This is used in Wind Rider ability.
@@ -4576,21 +5170,17 @@ export class PostSummonStatStageChangeOnArenaAbAttr extends PostSummonStatStageC
    * @param {Pokemon} pokemon - The Pokémon being summoned.
    * @param {boolean} passive - Whether the effect is passive.
    * @param {any[]} args - Additional arguments.
-   * @returns {boolean} - Returns true if the stat change was applied, otherwise false.
    */
-  applyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean {
-    const side = pokemon.isPlayer() ? ArenaTagSide.PLAYER : ArenaTagSide.ENEMY;
-
-    if (globalScene.arena.getTagOnSide(this.tagType, side)) {
-      return super.applyPostSummon(pokemon, passive, simulated, args);
-    }
-    return false;
+  override applyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): void {
+    super.applyPostSummon(pokemon, passive, simulated, args);
   }
 }
 
 /**
  * Takes no damage from the first hit of a damaging move.
  * This is used in the Disguise and Ice Face abilities.
+ *
+ * Does not apply to a user's substitute
  * @extends ReceivedMoveDamageMultiplierAbAttr
  */
 export class FormBlockDamageAbAttr extends ReceivedMoveDamageMultiplierAbAttr {
@@ -4608,6 +5198,10 @@ export class FormBlockDamageAbAttr extends ReceivedMoveDamageMultiplierAbAttr {
     this.triggerMessageFunc = triggerMessageFunc;
   }
 
+  override canApplyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, cancelled: BooleanHolder | null, args: any[]): boolean {
+    return this.condition(pokemon, attacker, move) && !move.hitsSubstitute(attacker, pokemon);
+  }
+
   /**
    * Applies the pre-defense ability to the Pokémon.
    * Removes the appropriate `BattlerTagType` when hit by an attack and is in its defense form.
@@ -4618,21 +5212,15 @@ export class FormBlockDamageAbAttr extends ReceivedMoveDamageMultiplierAbAttr {
    * @param move The move being used.
    * @param _cancelled n/a
    * @param args Additional arguments.
-   * @returns `true` if the immunity was applied.
    */
-  override applyPreDefend(pokemon: Pokemon, _passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, _cancelled: Utils.BooleanHolder, args: any[]): boolean {
-    if (this.condition(pokemon, attacker, move) && !move.hitsSubstitute(attacker, pokemon)) {
-      if (!simulated) {
-        (args[0] as Utils.NumberHolder).value = this.multiplier;
-        pokemon.removeTag(this.tagType);
-        if (this.recoilDamageFunc) {
-          pokemon.damageAndUpdate(this.recoilDamageFunc(pokemon), HitResult.OTHER, false, false, true, true);
-        }
+  override applyPreDefend(pokemon: Pokemon, _passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, _cancelled: BooleanHolder, args: any[]): void {
+    if (!simulated) {
+      (args[0] as NumberHolder).value = this.multiplier;
+      pokemon.removeTag(this.tagType);
+      if (this.recoilDamageFunc) {
+        pokemon.damageAndUpdate(this.recoilDamageFunc(pokemon), { result: HitResult.INDIRECT, ignoreSegments: true, ignoreFaintPhase: true });
       }
-      return true;
     }
-
-    return false;
   }
 
   /**
@@ -4647,6 +5235,98 @@ export class FormBlockDamageAbAttr extends ReceivedMoveDamageMultiplierAbAttr {
   }
 }
 
+/**
+ * Base class for defining {@linkcode Ability} attributes before summon
+ * (should use {@linkcode PostSummonAbAttr} for most ability)
+ * @see {@linkcode applyPreSummon()}
+ */
+export class PreSummonAbAttr extends AbAttr {
+  applyPreSummon(pokemon: Pokemon, passive: boolean, args: any[]): void {}
+
+  canApplyPreSummon(pokemon: Pokemon, passive: boolean, args: any[]): boolean {
+    return true;
+  }
+}
+
+export class IllusionPreSummonAbAttr extends PreSummonAbAttr {
+  /**
+   * Apply a new illusion when summoning Zoroark if the illusion is available
+   *
+   * @param pokemon - The Pokémon with the Illusion ability.
+   * @param passive - N/A
+   * @param args - N/A
+   * @returns Whether the illusion was applied.
+   */
+  override applyPreSummon(pokemon: Pokemon, passive: boolean, args: any[]): void {
+    const party: Pokemon[] = (pokemon.isPlayer() ? globalScene.getPlayerParty() : globalScene.getEnemyParty()).filter(p => p.isAllowedInBattle());
+    const lastPokemon: Pokemon = party.filter(p => p !==pokemon).at(-1) || pokemon;
+    pokemon.setIllusion(lastPokemon);
+  }
+
+  override canApplyPreSummon(pokemon: Pokemon, passive: boolean, args: any[]): boolean {
+    if (pokemon.hasTrainer()) {
+      const party: Pokemon[] = (pokemon.isPlayer() ? globalScene.getPlayerParty() : globalScene.getEnemyParty()).filter(p => p.isAllowedInBattle());
+      const lastPokemon: Pokemon = party.filter(p => p !==pokemon).at(-1) || pokemon;
+      const speciesId = lastPokemon.species.speciesId;
+
+      // If the last conscious Pokémon in the party is a Terastallized Ogerpon or Terapagos, Illusion will not activate.
+      // Illusion will also not activate if the Pokémon with Illusion is Terastallized and the last Pokémon in the party is Ogerpon or Terapagos.
+      if (
+        lastPokemon === pokemon ||
+        ((speciesId === Species.OGERPON || speciesId === Species.TERAPAGOS) && (lastPokemon.isTerastallized || pokemon.isTerastallized))
+      ) {
+        return false;
+      }
+    }
+    return !pokemon.summonData.illusionBroken;
+  }
+}
+
+export class IllusionBreakAbAttr extends AbAttr {
+  override apply(pokemon: Pokemon, _passive: boolean, _simulated: boolean, _cancelled: BooleanHolder | null, _args: any[]): void {
+    pokemon.breakIllusion();
+    pokemon.summonData.illusionBroken = true;
+  }
+}
+
+export class PostDefendIllusionBreakAbAttr extends PostDefendAbAttr {
+  /**
+   * Destroy the illusion upon taking damage
+   *
+   * @param pokemon - The Pokémon with the Illusion ability.
+   * @param passive - unused
+   * @param attacker - The attacking Pokémon.
+   * @param move - The move being used.
+   * @param hitResult - The type of hitResult the pokemon got
+   * @param args - unused
+   * @returns - Whether the illusion was destroyed.
+   */
+  override applyPostDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, hitResult: HitResult, args: any[]): void {
+    pokemon.breakIllusion();
+    pokemon.summonData.illusionBroken = true;
+  }
+
+  override canApplyPostDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, hitResult: HitResult, args: any[]): boolean {
+    const breakIllusion: HitResult[] = [ HitResult.EFFECTIVE, HitResult.SUPER_EFFECTIVE, HitResult.NOT_VERY_EFFECTIVE, HitResult.ONE_HIT_KO ];
+    return breakIllusion.includes(hitResult) && !!pokemon.summonData.illusion
+  }
+}
+
+export class IllusionPostBattleAbAttr extends PostBattleAbAttr {
+  /**
+   * Break the illusion once the battle ends
+   *
+   * @param pokemon - The Pokémon with the Illusion ability.
+   * @param passive - Unused
+   * @param args - Unused
+   * @returns - Whether the illusion was applied.
+   */
+  override applyPostBattle(pokemon: Pokemon, passive: boolean, simulated:boolean, args: any[]): void {
+   pokemon.breakIllusion()
+  }
+}
+
+
 /**
  * If a Pokémon with this Ability selects a damaging move, it has a 30% chance of going first in its priority bracket. If the Ability activates, this is announced at the start of the turn (after move selection).
  *
@@ -4663,34 +5343,25 @@ export class BypassSpeedChanceAbAttr extends AbAttr {
     this.chance = chance;
   }
 
+  override canApply(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean {
+    const bypassSpeed = args[0] as BooleanHolder;
+    const turnCommand = globalScene.currentBattle.turnCommands[pokemon.getBattlerIndex()];
+    const isCommandFight = turnCommand?.command === Command.FIGHT;
+    const move = turnCommand?.move?.move ? allMoves[turnCommand.move.move] : null;
+    const isDamageMove = move?.category === MoveCategory.PHYSICAL || move?.category === MoveCategory.SPECIAL;
+    return !simulated && !bypassSpeed.value && pokemon.randBattleSeedInt(100) < this.chance && isCommandFight && isDamageMove;
+  }
+
   /**
    * bypass move order in their priority bracket when pokemon choose damaging move
    * @param {Pokemon} pokemon {@linkcode Pokemon}  the Pokemon applying this ability
    * @param {boolean} passive N/A
-   * @param {Utils.BooleanHolder} cancelled N/A
-   * @param {any[]} args [0] {@linkcode Utils.BooleanHolder} set to true when the ability activated
-   * @returns {boolean} - whether the ability was activated.
+   * @param {BooleanHolder} cancelled N/A
+   * @param {any[]} args [0] {@linkcode BooleanHolder} set to true when the ability activated
    */
-  apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean {
-    if (simulated) {
-      return false;
-    }
-    const bypassSpeed = args[0] as Utils.BooleanHolder;
-
-    if (!bypassSpeed.value && pokemon.randSeedInt(100) < this.chance) {
-      const turnCommand =
-        globalScene.currentBattle.turnCommands[pokemon.getBattlerIndex()];
-      const isCommandFight = turnCommand?.command === Command.FIGHT;
-      const move = turnCommand?.move?.move ? allMoves[turnCommand.move.move] : null;
-      const isDamageMove = move?.category === MoveCategory.PHYSICAL || move?.category === MoveCategory.SPECIAL;
-
-      if (isCommandFight && isDamageMove) {
-        bypassSpeed.value = true;
-        return true;
-      }
-    }
-
-    return false;
+  override apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: BooleanHolder, args: any[]): void {
+    const bypassSpeed = args[0] as BooleanHolder;
+    bypassSpeed.value = true;
   }
 
   getTriggerMessage(pokemon: Pokemon, abilityName: string, ...args: any[]): string {
@@ -4713,23 +5384,22 @@ export class PreventBypassSpeedChanceAbAttr extends AbAttr {
     this.condition = condition;
   }
 
+  override canApply(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean {
+    const turnCommand = globalScene.currentBattle.turnCommands[pokemon.getBattlerIndex()];
+    const isCommandFight = turnCommand?.command === Command.FIGHT;
+    const move = turnCommand?.move?.move ? allMoves[turnCommand.move.move] : null;
+    return isCommandFight && this.condition(pokemon, move!);
+  }
+
   /**
    * @argument {boolean} bypassSpeed - determines if a Pokemon is able to bypass speed at the moment
    * @argument {boolean} canCheckHeldItems - determines if a Pokemon has access to Quick Claw's effects or not
    */
-  apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean {
-    const bypassSpeed = args[0] as Utils.BooleanHolder;
-    const canCheckHeldItems = args[1] as Utils.BooleanHolder;
-
-    const turnCommand = globalScene.currentBattle.turnCommands[pokemon.getBattlerIndex()];
-    const isCommandFight = turnCommand?.command === Command.FIGHT;
-    const move = turnCommand?.move?.move ? allMoves[turnCommand.move.move] : null;
-    if (this.condition(pokemon, move!) && isCommandFight) {
-      bypassSpeed.value = false;
-      canCheckHeldItems.value = false;
-      return false;
-    }
-    return true;
+  override apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: BooleanHolder, args: any[]): void {
+    const bypassSpeed = args[0] as BooleanHolder;
+    const canCheckHeldItems = args[1] as BooleanHolder;
+    bypassSpeed.value = false;
+    canCheckHeldItems.value = false;
   }
 }
 
@@ -4742,12 +5412,13 @@ export class TerrainEventTypeChangeAbAttr extends PostSummonAbAttr {
     super(true);
   }
 
-  override apply(pokemon: Pokemon, _passive: boolean, _simulated: boolean, _cancelled: Utils.BooleanHolder, _args: any[]): boolean {
-    if (pokemon.isTerastallized()) {
-      return false;
-    }
+  override canApply(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean {
+    return !pokemon.isTerastallized;
+  }
+
+  override apply(pokemon: Pokemon, _passive: boolean, _simulated: boolean, _cancelled: BooleanHolder, _args: any[]): void {
     const currentTerrain = globalScene.arena.getTerrainType();
-    const typeChange: Type[] = this.determineTypeChange(pokemon, currentTerrain);
+    const typeChange: PokemonType[] = this.determineTypeChange(pokemon, currentTerrain);
     if (typeChange.length !== 0) {
       if (pokemon.summonData.addedType && typeChange.includes(pokemon.summonData.addedType)) {
         pokemon.summonData.addedType = null;
@@ -4755,7 +5426,6 @@ export class TerrainEventTypeChangeAbAttr extends PostSummonAbAttr {
       pokemon.summonData.types = typeChange;
       pokemon.updateInfo();
     }
-    return true;
   }
 
   /**
@@ -4764,20 +5434,20 @@ export class TerrainEventTypeChangeAbAttr extends PostSummonAbAttr {
    * @param currentTerrain {@linkcode TerrainType}
    * @returns a list of type(s)
    */
-  private determineTypeChange(pokemon: Pokemon, currentTerrain: TerrainType): Type[] {
-    const typeChange: Type[] = [];
+  private determineTypeChange(pokemon: Pokemon, currentTerrain: TerrainType): PokemonType[] {
+    const typeChange: PokemonType[] = [];
     switch (currentTerrain) {
       case TerrainType.ELECTRIC:
-        typeChange.push(Type.ELECTRIC);
+        typeChange.push(PokemonType.ELECTRIC);
         break;
       case TerrainType.MISTY:
-        typeChange.push(Type.FAIRY);
+        typeChange.push(PokemonType.FAIRY);
         break;
       case TerrainType.GRASSY:
-        typeChange.push(Type.GRASS);
+        typeChange.push(PokemonType.GRASS);
         break;
       case TerrainType.PSYCHIC:
-        typeChange.push(Type.PSYCHIC);
+        typeChange.push(PokemonType.PSYCHIC);
         break;
       default:
         pokemon.getTypes(false, false, true).forEach(t => {
@@ -4788,15 +5458,16 @@ export class TerrainEventTypeChangeAbAttr extends PostSummonAbAttr {
     return typeChange;
   }
 
+  override canApplyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean {
+    return globalScene.arena.getTerrainType() !== TerrainType.NONE &&
+      this.canApply(pokemon, passive, simulated, args);
+  }
+
   /**
    * Checks if the Pokemon should change types if summoned into an active terrain
-   * @returns `true` if there is an active terrain requiring a type change | `false` if not
    */
-  override applyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean | Promise<boolean> {
-    if (globalScene.arena.getTerrainType() !== TerrainType.NONE) {
-      return this.apply(pokemon, passive, simulated, new Utils.BooleanHolder(false), []);
-    }
-    return false;
+  override applyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): void {
+    this.apply(pokemon, passive, simulated, new BooleanHolder(false), []);
   }
 
   override getTriggerMessage(pokemon: Pokemon, abilityName: string, ...args: any[]) {
@@ -4805,63 +5476,63 @@ export class TerrainEventTypeChangeAbAttr extends PostSummonAbAttr {
     if (currentTerrain === TerrainType.NONE) {
       return i18next.t("abilityTriggers:pokemonTypeChangeRevert", { pokemonNameWithAffix });
     } else {
-      const moveType = i18next.t(`pokemonInfo:Type.${Type[this.determineTypeChange(pokemon, currentTerrain)[0]]}`);
+      const moveType = i18next.t(`pokemonInfo:Type.${PokemonType[this.determineTypeChange(pokemon, currentTerrain)[0]]}`);
       return i18next.t("abilityTriggers:pokemonTypeChange", { pokemonNameWithAffix, moveType });
     }
   }
 }
 
-async function applyAbAttrsInternal<TAttr extends AbAttr>(
+function applySingleAbAttrs<TAttr extends AbAttr>(
+  pokemon: Pokemon,
+  passive: boolean,
   attrType: Constructor<TAttr>,
-  pokemon: Pokemon | null,
   applyFunc: AbAttrApplyFunc<TAttr>,
+  successFunc: AbAttrSuccessFunc<TAttr>,
   args: any[],
-  showAbilityInstant: boolean = false,
+  gainedMidTurn: boolean = false,
   simulated: boolean = false,
-  messages: string[] = [],
+  messages: string[] = []
 ) {
-  for (const passive of [ false, true ]) {
-    if (!pokemon?.canApplyAbility(passive) || (passive && pokemon.getPassiveAbility().id === pokemon.getAbility().id)) {
+  if (!pokemon?.canApplyAbility(passive) || (passive && (pokemon.getPassiveAbility().id === pokemon.getAbility().id))) {
+    return;
+  }
+
+  const ability = passive ? pokemon.getPassiveAbility() : pokemon.getAbility();
+  if (gainedMidTurn && ability.getAttrs(attrType).some(attr => attr instanceof PostSummonAbAttr && !attr.shouldActivateOnGain())) {
+    return;
+  }
+
+  for (const attr of ability.getAttrs(attrType)) {
+    const condition = attr.getCondition();
+    let abShown = false;
+    if (condition && !condition(pokemon) || !successFunc(attr, passive)) {
       continue;
     }
 
-    const ability = passive ? pokemon.getPassiveAbility() : pokemon.getAbility();
-    for (const attr of ability.getAttrs(attrType)) {
-      const condition = attr.getCondition();
-      if (condition && !condition(pokemon)) {
-        continue;
-      }
+    globalScene.setPhaseQueueSplice();
 
-      globalScene.setPhaseQueueSplice();
-
-      let result = applyFunc(attr, passive);
-      // TODO Remove this when promises get reworked
-      if (result instanceof Promise) {
-        result = await result;
-      }
-      if (result) {
-        if (pokemon.summonData && !pokemon.summonData.abilitiesApplied.includes(ability.id)) {
-          pokemon.summonData.abilitiesApplied.push(ability.id);
-        }
-        if (pokemon.battleData && !simulated && !pokemon.battleData.abilitiesApplied.includes(ability.id)) {
-          pokemon.battleData.abilitiesApplied.push(ability.id);
-        }
-        if (attr.showAbility && !simulated) {
-          if (showAbilityInstant) {
-            globalScene.abilityBar.showAbility(pokemon, passive);
-          } else {
-            queueShowAbility(pokemon, passive);
-          }
-        }
-        const message = attr.getTriggerMessage(pokemon, ability.name, args);
-        if (message) {
-          if (!simulated) {
-            globalScene.queueMessage(message);
-          }
-        }
-        messages.push(message!);
-      }
+    if (attr.showAbility && !simulated) {
+      globalScene.queueAbilityDisplay(pokemon, passive, true);
+      abShown = true;
     }
+    const message = attr.getTriggerMessage(pokemon, ability.name, args);
+    if (message) {
+      if (!simulated) {
+        globalScene.queueMessage(message);
+      }
+      messages.push(message);
+    }
+
+    applyFunc(attr, passive);
+
+    if (abShown) {
+      globalScene.queueAbilityDisplay(pokemon, passive, false);
+    }
+
+    if (!simulated) {
+      pokemon.waveData.abilitiesApplied.add(ability.id);
+    }
+
     globalScene.clearPhaseQueueSplice();
   }
 }
@@ -4911,6 +5582,8 @@ class ForceSwitchOutHelper {
      * It will not flee if it is a Mystery Encounter with fleeing disabled (checked in `getSwitchOutCondition()`) or if it is a wave 10x wild boss
      */
     } else {
+      const allyPokemon = switchOutTarget.getAlly();
+
       if (!globalScene.currentBattle.waveIndex || globalScene.currentBattle.waveIndex % 10 === 0) {
         return false;
       }
@@ -4918,18 +5591,21 @@ class ForceSwitchOutHelper {
       if (switchOutTarget.hp > 0) {
         switchOutTarget.leaveField(false);
         globalScene.queueMessage(i18next.t("moveTriggers:fled", { pokemonName: getPokemonNameWithAffix(switchOutTarget) }), null, true, 500);
-
-        if (globalScene.currentBattle.double) {
-          const allyPokemon = switchOutTarget.getAlly();
+        if (globalScene.currentBattle.double && !isNullOrUndefined(allyPokemon)) {
           globalScene.redirectPokemonMoves(switchOutTarget, allyPokemon);
         }
       }
 
-      if (!switchOutTarget.getAlly()?.isActive(true)) {
+      if (!allyPokemon?.isActive(true)) {
         globalScene.clearEnemyHeldItemModifiers();
 
         if (switchOutTarget.hp) {
           globalScene.pushPhase(new BattleEndPhase(false));
+
+          if (globalScene.gameMode.hasRandomBiomes || globalScene.isNewBiome()) {
+            globalScene.pushPhase(new SelectBiomePhase());
+          }
+
           globalScene.pushPhase(new NewBattlePhase());
         }
       }
@@ -4949,7 +5625,7 @@ class ForceSwitchOutHelper {
     const player = switchOutTarget instanceof PlayerPokemon;
 
     if (player) {
-      const blockedByAbility = new Utils.BooleanHolder(false);
+      const blockedByAbility = new BooleanHolder(false);
       applyAbAttrs(ForceSwitchOutImmunityAbAttr, opponent, blockedByAbility);
       return !blockedByAbility.value;
     }
@@ -4966,8 +5642,8 @@ class ForceSwitchOutHelper {
 
     const party = player ? globalScene.getPlayerParty() : globalScene.getEnemyParty();
     return (!player && globalScene.currentBattle.battleType === BattleType.WILD)
-      || party.filter(p => p.isAllowedInBattle()
-        && (player || (p as EnemyPokemon).trainerSlot === (switchOutTarget as EnemyPokemon).trainerSlot)).length > globalScene.currentBattle.getBattlerCount();
+      || party.filter(p => p.isAllowedInBattle() && !p.isOnField()
+        && (player || (p as EnemyPokemon).trainerSlot === (switchOutTarget as EnemyPokemon).trainerSlot)).length > 0;
   }
 
   /**
@@ -4977,7 +5653,7 @@ class ForceSwitchOutHelper {
    * @returns The failure message, or `null` if no failure.
    */
   public getFailedText(target: Pokemon): string | null {
-    const blockedByAbility = new Utils.BooleanHolder(false);
+    const blockedByAbility = new BooleanHolder(false);
     applyAbAttrs(ForceSwitchOutImmunityAbAttr, target, blockedByAbility);
     return blockedByAbility.value ? i18next.t("moveTriggers:cannotBeSwitchedOut", { pokemonName: getPokemonNameWithAffix(target) }) : null;
   }
@@ -4996,7 +5672,7 @@ class ForceSwitchOutHelper {
 function calculateShellBellRecovery(pokemon: Pokemon): number {
   const shellBellModifier = pokemon.getHeldItems().find(m => m instanceof HitHealModifier);
   if (shellBellModifier) {
-    return Utils.toDmgValue(pokemon.turnData.totalDamageDealt / 8) * shellBellModifier.stackCount;
+    return toDmgValue(pokemon.turnData.totalDamageDealt / 8) * shellBellModifier.stackCount;
   }
   return 0;
 }
@@ -5006,9 +5682,24 @@ function calculateShellBellRecovery(pokemon: Pokemon): number {
  * @extends AbAttr
  */
 export class PostDamageAbAttr extends AbAttr {
-  public applyPostDamage(pokemon: Pokemon, damage: number, passive: boolean, simulated: boolean, args: any[], source?: Pokemon): boolean | Promise<boolean> {
-    return false;
+  public canApplyPostDamage(
+    pokemon: Pokemon,
+    damage: number,
+    passive: boolean,
+    simulated: boolean,
+    args: any[],
+    source?: Pokemon): boolean {
+    return true;
   }
+
+  public applyPostDamage(
+    pokemon: Pokemon,
+    damage: number,
+    passive: boolean,
+    simulated: boolean,
+    args: any[],
+    source?: Pokemon,
+  ): void {}
 }
 
 /**
@@ -5025,25 +5716,19 @@ export class PostDamageForceSwitchAbAttr extends PostDamageAbAttr {
   private helper: ForceSwitchOutHelper = new ForceSwitchOutHelper(SwitchType.SWITCH);
   private hpRatio: number;
 
-  constructor(hpRatio: number = 0.5) {
+  constructor(hpRatio = 0.5) {
     super();
     this.hpRatio = hpRatio;
   }
 
-  /**
-   * Applies the switch-out logic after the Pokémon takes damage.
-   * Checks various conditions based on the moves used by the Pokémon, the opponents' moves, and
-   * the Pokémon's health after damage to determine whether the switch-out should occur.
-   *
-   * @param pokemon The Pokémon that took damage.
-   * @param damage The amount of damage taken by the Pokémon.
-   * @param passive N/A
-   * @param simulated Whether the ability is being simulated.
-   * @param args N/A
-   * @param source The Pokemon that dealt damage
-   * @returns `true` if the switch-out logic was successfully applied
-   */
-  public override applyPostDamage(pokemon: Pokemon, damage: number, passive: boolean, simulated: boolean, args: any[], source?: Pokemon): boolean | Promise<boolean> {
+  // TODO: Refactor to use more early returns
+  public override canApplyPostDamage(
+    pokemon: Pokemon,
+    damage: number,
+    passive: boolean,
+    simulated: boolean,
+    args: any[],
+    source?: Pokemon): boolean {
     const moveHistory = pokemon.getMoveHistory();
     // Will not activate when the Pokémon's HP is lowered by cutting its own HP
     const fordbiddenAttackingMoves = [ Moves.BELLY_DRUM, Moves.SUBSTITUTE, Moves.CURSE, Moves.PAIN_SPLIT ];
@@ -5064,6 +5749,7 @@ export class PostDamageForceSwitchAbAttr extends PostDamageAbAttr {
         if (fordbiddenDefendingMoves.includes(enemyLastMoveUsed.move) || enemyLastMoveUsed.move === Moves.SKY_DROP && enemyLastMoveUsed.result === MoveResult.OTHER) {
           return false;
         // Will not activate if the Pokémon's HP falls below half by a move affected by Sheer Force.
+        // TODO: Make this use the sheer force disable condition
         } else if (allMoves[enemyLastMoveUsed.move].chance >= 0 && source.hasAbility(Abilities.SHEER_FORCE)) {
           return false;
         // Activate only after the last hit of multistrike moves
@@ -5077,7 +5763,6 @@ export class PostDamageForceSwitchAbAttr extends PostDamageAbAttr {
     }
 
     if (pokemon.hp + damage >= pokemon.getMaxHp() * this.hpRatio) {
-      // Activates if it falls below half and recovers back above half from a Shell Bell
       const shellBellHeal = calculateShellBellRecovery(pokemon);
       if (pokemon.hp - shellBellHeal < pokemon.getMaxHp() * this.hpRatio) {
         for (const opponent of pokemon.getOpponents()) {
@@ -5085,56 +5770,210 @@ export class PostDamageForceSwitchAbAttr extends PostDamageAbAttr {
             return false;
           }
         }
-        return this.helper.switchOutLogic(pokemon);
-      } else {
-        return false;
+        return true;
       }
-    } else {
-      return false;
+    }
+
+    return false;
+  }
+
+  /**
+   * Applies the switch-out logic after the Pokémon takes damage.
+   * Checks various conditions based on the moves used by the Pokémon, the opponents' moves, and
+   * the Pokémon's health after damage to determine whether the switch-out should occur.
+   *
+   * @param pokemon The Pokémon that took damage.
+   * @param damage N/A
+   * @param passive N/A
+   * @param simulated Whether the ability is being simulated.
+   * @param args N/A
+   * @param source N/A
+   */
+  public override applyPostDamage(pokemon: Pokemon, damage: number, passive: boolean, simulated: boolean, args: any[], source?: Pokemon): void {
+    this.helper.switchOutLogic(pokemon);
+  }
+}
+function applyAbAttrsInternal<TAttr extends AbAttr>(
+  attrType: Constructor<TAttr>,
+  pokemon: Pokemon | null,
+  applyFunc: AbAttrApplyFunc<TAttr>,
+  successFunc: AbAttrSuccessFunc<TAttr>,
+  args: any[],
+  simulated: boolean = false,
+  messages: string[] = [],
+  gainedMidTurn = false
+) {
+  for (const passive of [ false, true ]) {
+    if (pokemon) {
+      applySingleAbAttrs(pokemon, passive, attrType, applyFunc, successFunc, args, gainedMidTurn, simulated, messages);
+      globalScene.clearPhaseQueueSplice();
     }
   }
-  public getFailedText(user: Pokemon, target: Pokemon, move: Move, cancelled: Utils.BooleanHolder): string | null {
-    return this.helper.getFailedText(target);
-  }
 }
 
-
-export function applyAbAttrs(attrType: Constructor<AbAttr>, pokemon: Pokemon, cancelled: Utils.BooleanHolder | null, simulated: boolean = false, ...args: any[]): Promise<void> {
-  return applyAbAttrsInternal<AbAttr>(attrType, pokemon, (attr, passive) => attr.apply(pokemon, passive, simulated, cancelled, args), args, false, simulated);
+export function applyAbAttrs(
+  attrType: Constructor<AbAttr>,
+  pokemon: Pokemon,
+  cancelled: BooleanHolder | null,
+  simulated = false,
+  ...args: any[]
+): void {
+  applyAbAttrsInternal<AbAttr>(
+    attrType,
+    pokemon,
+    (attr, passive) => attr.apply(pokemon, passive, simulated, cancelled, args),
+    (attr, passive) => attr.canApply(pokemon, passive, simulated, args),
+    args,
+    simulated,
+  );
 }
 
-export function applyPostBattleInitAbAttrs(attrType: Constructor<PostBattleInitAbAttr>,
-  pokemon: Pokemon, simulated: boolean = false, ...args: any[]): Promise<void> {
-  return applyAbAttrsInternal<PostBattleInitAbAttr>(attrType, pokemon, (attr, passive) => attr.applyPostBattleInit(pokemon, passive, simulated, args), args, false, simulated);
+export function applyPostBattleInitAbAttrs(
+  attrType: Constructor<PostBattleInitAbAttr>,
+  pokemon: Pokemon,
+  simulated = false,
+  ...args: any[]
+): void {
+  applyAbAttrsInternal<PostBattleInitAbAttr>(
+    attrType,
+    pokemon,
+    (attr, passive) => attr.applyPostBattleInit(pokemon, passive, simulated, args),
+    (attr, passive) => attr.canApplyPostBattleInit(pokemon, passive, simulated, args),
+    args,
+    simulated,
+  );
 }
 
-export function applyPreDefendAbAttrs(attrType: Constructor<PreDefendAbAttr>,
-  pokemon: Pokemon, attacker: Pokemon, move: Move | null, cancelled: Utils.BooleanHolder | null, simulated: boolean = false, ...args: any[]): Promise<void> {
-  return applyAbAttrsInternal<PreDefendAbAttr>(attrType, pokemon, (attr, passive) => attr.applyPreDefend(pokemon, passive, simulated, attacker, move, cancelled, args), args, false, simulated);
+export function applyPreDefendAbAttrs(
+  attrType: Constructor<PreDefendAbAttr>,
+  pokemon: Pokemon,
+  attacker: Pokemon,
+  move: Move | null,
+  cancelled: BooleanHolder | null,
+  simulated = false,
+  ...args: any[]
+): void {
+  applyAbAttrsInternal<PreDefendAbAttr>(
+    attrType,
+    pokemon,
+    (attr, passive) => attr.applyPreDefend(pokemon, passive, simulated, attacker, move, cancelled, args),
+    (attr, passive) => attr.canApplyPreDefend(pokemon, passive, simulated, attacker, move, cancelled, args),
+    args,
+    simulated,
+  );
 }
 
-export function applyPostDefendAbAttrs(attrType: Constructor<PostDefendAbAttr>,
-  pokemon: Pokemon, attacker: Pokemon, move: Move, hitResult: HitResult | null, simulated: boolean = false, ...args: any[]): Promise<void> {
-  return applyAbAttrsInternal<PostDefendAbAttr>(attrType, pokemon, (attr, passive) => attr.applyPostDefend(pokemon, passive, simulated, attacker, move, hitResult, args), args, false, simulated);
+export function applyPostDefendAbAttrs(
+  attrType: Constructor<PostDefendAbAttr>,
+  pokemon: Pokemon,
+  attacker: Pokemon,
+  move: Move,
+  hitResult: HitResult | null,
+  simulated = false,
+  ...args: any[]
+): void {
+  applyAbAttrsInternal<PostDefendAbAttr>(
+    attrType,
+    pokemon,
+    (attr, passive) => attr.applyPostDefend(pokemon, passive, simulated, attacker, move, hitResult, args),
+    (attr, passive) => attr.canApplyPostDefend(pokemon, passive, simulated, attacker, move, hitResult, args), args,
+    simulated,
+  );
 }
 
-export function applyPostMoveUsedAbAttrs(attrType: Constructor<PostMoveUsedAbAttr>,
-  pokemon: Pokemon, move: PokemonMove, source: Pokemon, targets: BattlerIndex[], simulated: boolean = false, ...args: any[]): Promise<void> {
-  return applyAbAttrsInternal<PostMoveUsedAbAttr>(attrType, pokemon, (attr, passive) => attr.applyPostMoveUsed(pokemon, move, source, targets, simulated, args), args, false, simulated);
+export function applyPostMoveUsedAbAttrs(
+  attrType: Constructor<PostMoveUsedAbAttr>,
+  pokemon: Pokemon,
+  move: PokemonMove,
+  source: Pokemon,
+  targets: BattlerIndex[],
+  simulated = false,
+  ...args: any[]
+): void {
+  applyAbAttrsInternal<PostMoveUsedAbAttr>(
+    attrType,
+    pokemon,
+    (attr, passive) => attr.applyPostMoveUsed(pokemon, move, source, targets, simulated, args),
+    (attr, passive) => attr.canApplyPostMoveUsed(pokemon, move, source, targets, simulated, args),
+    args,
+    simulated,
+  );
 }
 
-export function applyStatMultiplierAbAttrs(attrType: Constructor<StatMultiplierAbAttr>,
-  pokemon: Pokemon, stat: BattleStat, statValue: Utils.NumberHolder, simulated: boolean = false, ...args: any[]): Promise<void> {
-  return applyAbAttrsInternal<StatMultiplierAbAttr>(attrType, pokemon, (attr, passive) => attr.applyStatStage(pokemon, passive, simulated, stat, statValue, args), args);
-}
-export function applyPostSetStatusAbAttrs(attrType: Constructor<PostSetStatusAbAttr>,
-  pokemon: Pokemon, effect: StatusEffect, sourcePokemon?: Pokemon | null, simulated: boolean = false, ...args: any[]): Promise<void> {
-  return applyAbAttrsInternal<PostSetStatusAbAttr>(attrType, pokemon, (attr, passive) => attr.applyPostSetStatus(pokemon, sourcePokemon, passive, effect, simulated, args), args, false, simulated);
+export function applyStatMultiplierAbAttrs(
+  attrType: Constructor<StatMultiplierAbAttr>,
+  pokemon: Pokemon,
+  stat: BattleStat,
+  statValue: NumberHolder,
+  simulated = false,
+  ...args: any[]
+): void {
+  applyAbAttrsInternal<StatMultiplierAbAttr>(
+    attrType,
+    pokemon,
+    (attr, passive) => attr.applyStatStage(pokemon, passive, simulated, stat, statValue, args),
+    (attr, passive) => attr.canApplyStatStage(pokemon, passive, simulated, stat, statValue, args),
+    args,
+  );
 }
 
-export function applyPostDamageAbAttrs(attrType: Constructor<PostDamageAbAttr>,
-  pokemon: Pokemon, damage: number, passive: boolean, simulated: boolean = false, args: any[], source?: Pokemon): Promise<void> {
-  return applyAbAttrsInternal<PostDamageAbAttr>(attrType, pokemon, (attr, passive) => attr.applyPostDamage(pokemon, damage, passive, simulated, args, source), args);
+/**
+ * Applies an ally's Stat multiplier attribute
+ * @param attrType - {@linkcode AllyStatMultiplierAbAttr} should always be AllyStatMultiplierAbAttr for the time being
+ * @param pokemon - The {@linkcode Pokemon} with the ability
+ * @param stat - The type of the checked {@linkcode Stat}
+ * @param statValue - {@linkcode NumberHolder} containing the value of the checked stat
+ * @param checkedPokemon - The {@linkcode Pokemon} with the checked stat
+ * @param ignoreAbility - Whether or not the ability should be ignored by the pokemon or its move.
+ * @param args - unused
+ */
+export function applyAllyStatMultiplierAbAttrs(attrType: Constructor<AllyStatMultiplierAbAttr>,
+  pokemon: Pokemon, stat: BattleStat, statValue: NumberHolder, simulated: boolean = false, checkedPokemon: Pokemon, ignoreAbility: boolean, ...args: any[]
+): void {
+  return applyAbAttrsInternal<AllyStatMultiplierAbAttr>(
+    attrType,
+    pokemon,
+    (attr, passive) => attr.applyAllyStat(pokemon, passive, simulated, stat, statValue, checkedPokemon, ignoreAbility, args),
+    (attr, passive) => attr.canApplyAllyStat(pokemon, passive, simulated, stat, statValue, checkedPokemon, ignoreAbility, args),
+    args,
+    simulated,
+  );
+}
+
+export function applyPostSetStatusAbAttrs(
+  attrType: Constructor<PostSetStatusAbAttr>,
+  pokemon: Pokemon,
+  effect: StatusEffect,
+  sourcePokemon?: Pokemon | null,
+  simulated = false,
+  ...args: any[]
+): void {
+  applyAbAttrsInternal<PostSetStatusAbAttr>(
+    attrType,
+    pokemon,
+    (attr, passive) => attr.applyPostSetStatus(pokemon, sourcePokemon, passive, effect, simulated, args),
+    (attr, passive) => attr.canApplyPostSetStatus(pokemon, sourcePokemon, passive, effect, simulated, args),
+    args,
+    simulated,
+  );
+}
+
+export function applyPostDamageAbAttrs(
+  attrType: Constructor<PostDamageAbAttr>,
+  pokemon: Pokemon,
+  damage: number,
+  passive: boolean,
+  simulated = false,
+  args: any[],
+  source?: Pokemon,
+): void {
+  applyAbAttrsInternal<PostDamageAbAttr>(
+    attrType,
+    pokemon,
+    (attr, passive) => attr.applyPostDamage(pokemon, damage, passive, simulated, args, source),
+    (attr, passive) => attr.canApplyPostDamage(pokemon, damage, passive, simulated, args, source),
+    args,
+  );
 }
 
 /**
@@ -5142,134 +5981,445 @@ export function applyPostDamageAbAttrs(attrType: Constructor<PostDamageAbAttr>,
  * @param attrType {@linkcode FieldMultiplyStatAbAttr} should always be FieldMultiplyBattleStatAbAttr for the time being
  * @param pokemon {@linkcode Pokemon} the Pokemon applying this ability
  * @param stat {@linkcode Stat} the type of the checked stat
- * @param statValue {@linkcode Utils.NumberHolder} the value of the checked stat
+ * @param statValue {@linkcode NumberHolder} the value of the checked stat
  * @param checkedPokemon {@linkcode Pokemon} the Pokemon with the checked stat
- * @param hasApplied {@linkcode Utils.BooleanHolder} whether or not a FieldMultiplyBattleStatAbAttr has already affected this stat
+ * @param hasApplied {@linkcode BooleanHolder} whether or not a FieldMultiplyBattleStatAbAttr has already affected this stat
  * @param args unused
  */
-export function applyFieldStatMultiplierAbAttrs(attrType: Constructor<FieldMultiplyStatAbAttr>,
-  pokemon: Pokemon, stat: Stat, statValue: Utils.NumberHolder, checkedPokemon: Pokemon, hasApplied: Utils.BooleanHolder, simulated: boolean = false, ...args: any[]): Promise<void> {
-  return applyAbAttrsInternal<FieldMultiplyStatAbAttr>(attrType, pokemon, (attr, passive) => attr.applyFieldStat(pokemon, passive, simulated, stat, statValue, checkedPokemon, hasApplied, args), args);
+export function applyFieldStatMultiplierAbAttrs(
+  attrType: Constructor<FieldMultiplyStatAbAttr>,
+  pokemon: Pokemon,
+  stat: Stat,
+  statValue: NumberHolder,
+  checkedPokemon: Pokemon,
+  hasApplied: BooleanHolder,
+  simulated = false,
+  ...args: any[]
+): void {
+  applyAbAttrsInternal<FieldMultiplyStatAbAttr>(
+    attrType,
+    pokemon,
+    (attr, passive) => attr.applyFieldStat(pokemon, passive, simulated, stat, statValue, checkedPokemon, hasApplied, args),
+    (attr, passive) => attr.canApplyFieldStat(pokemon, passive, simulated, stat, statValue, checkedPokemon, hasApplied, args), args,
+  );
 }
 
-export function applyPreAttackAbAttrs(attrType: Constructor<PreAttackAbAttr>,
-  pokemon: Pokemon, defender: Pokemon | null, move: Move, simulated: boolean = false, ...args: any[]): Promise<void> {
-  return applyAbAttrsInternal<PreAttackAbAttr>(attrType, pokemon, (attr, passive) => attr.applyPreAttack(pokemon, passive, simulated, defender, move, args), args, false, simulated);
+export function applyPreAttackAbAttrs(
+  attrType: Constructor<PreAttackAbAttr>,
+  pokemon: Pokemon,
+  defender: Pokemon | null,
+  move: Move,
+  simulated = false,
+  ...args: any[]
+): void {
+  applyAbAttrsInternal<PreAttackAbAttr>(
+    attrType,
+    pokemon,
+    (attr, passive) => attr.applyPreAttack(pokemon, passive, simulated, defender, move, args),
+    (attr, passive) => attr.canApplyPreAttack(pokemon, passive, simulated, defender, move, args),
+    args,
+    simulated,
+  );
 }
 
-export function applyPostAttackAbAttrs(attrType: Constructor<PostAttackAbAttr>,
-  pokemon: Pokemon, defender: Pokemon, move: Move, hitResult: HitResult | null, simulated: boolean = false, ...args: any[]): Promise<void> {
-  return applyAbAttrsInternal<PostAttackAbAttr>(attrType, pokemon, (attr, passive) => attr.applyPostAttack(pokemon, passive, simulated, defender, move, hitResult, args), args, false, simulated);
+export function applyPostAttackAbAttrs(
+  attrType: Constructor<PostAttackAbAttr>,
+  pokemon: Pokemon,
+  defender: Pokemon,
+  move: Move,
+  hitResult: HitResult | null,
+  simulated = false,
+  ...args: any[]
+): void {
+  applyAbAttrsInternal<PostAttackAbAttr>(
+    attrType,
+    pokemon,
+    (attr, passive) => attr.applyPostAttack(pokemon, passive, simulated, defender, move, hitResult, args),
+    (attr, passive) => attr.canApplyPostAttack(pokemon, passive, simulated, defender, move, hitResult, args), args,
+    simulated,
+  );
 }
 
-export function applyPostKnockOutAbAttrs(attrType: Constructor<PostKnockOutAbAttr>,
-  pokemon: Pokemon, knockedOut: Pokemon, simulated: boolean = false, ...args: any[]): Promise<void> {
-  return applyAbAttrsInternal<PostKnockOutAbAttr>(attrType, pokemon, (attr, passive) => attr.applyPostKnockOut(pokemon, passive, simulated, knockedOut, args), args, false, simulated);
+export function applyPostKnockOutAbAttrs(
+  attrType: Constructor<PostKnockOutAbAttr>,
+  pokemon: Pokemon,
+  knockedOut: Pokemon,
+  simulated = false,
+  ...args: any[]
+): void {
+  applyAbAttrsInternal<PostKnockOutAbAttr>(
+    attrType,
+    pokemon,
+    (attr, passive) => attr.applyPostKnockOut(pokemon, passive, simulated, knockedOut, args),
+    (attr, passive) => attr.canApplyPostKnockOut(pokemon, passive, simulated, knockedOut, args),
+    args,
+    simulated,
+  );
 }
 
-export function applyPostVictoryAbAttrs(attrType: Constructor<PostVictoryAbAttr>,
-  pokemon: Pokemon, simulated: boolean = false, ...args: any[]): Promise<void> {
-  return applyAbAttrsInternal<PostVictoryAbAttr>(attrType, pokemon, (attr, passive) => attr.applyPostVictory(pokemon, passive, simulated, args), args, false, simulated);
+export function applyPostVictoryAbAttrs(
+  attrType: Constructor<PostVictoryAbAttr>,
+  pokemon: Pokemon,
+  simulated = false,
+  ...args: any[]
+): void {
+  applyAbAttrsInternal<PostVictoryAbAttr>(
+    attrType,
+    pokemon,
+    (attr, passive) => attr.applyPostVictory(pokemon, passive, simulated, args),
+    (attr, passive) => attr.canApplyPostVictory(pokemon, passive, simulated, args),
+    args,
+    simulated,
+  );
 }
 
-export function applyPostSummonAbAttrs(attrType: Constructor<PostSummonAbAttr>,
-  pokemon: Pokemon, simulated: boolean = false, ...args: any[]): Promise<void> {
-  return applyAbAttrsInternal<PostSummonAbAttr>(attrType, pokemon, (attr, passive) => attr.applyPostSummon(pokemon, passive, simulated, args), args, false, simulated);
+export function applyPostSummonAbAttrs(
+  attrType: Constructor<PostSummonAbAttr>,
+  pokemon: Pokemon,
+  simulated = false,
+  ...args: any[]
+): void {
+  applyAbAttrsInternal<PostSummonAbAttr>(
+    attrType,
+    pokemon,
+    (attr, passive) => attr.applyPostSummon(pokemon, passive, simulated, args),
+    (attr, passive) => attr.canApplyPostSummon(pokemon, passive, simulated, args),
+    args,
+    simulated,
+  );
 }
 
-export function applyPreSwitchOutAbAttrs(attrType: Constructor<PreSwitchOutAbAttr>,
-  pokemon: Pokemon, simulated: boolean = false, ...args: any[]): Promise<void> {
-  return applyAbAttrsInternal<PreSwitchOutAbAttr>(attrType, pokemon, (attr, passive) => attr.applyPreSwitchOut(pokemon, passive, simulated, args), args, true, simulated);
+export function applyPreSummonAbAttrs(
+  attrType: Constructor<PreSummonAbAttr>,
+  pokemon: Pokemon,
+  ...args: any[]
+): void {
+  applyAbAttrsInternal<PreSummonAbAttr>(
+    attrType,
+    pokemon,
+    (attr, passive) => attr.applyPreSummon(pokemon, passive, args),
+    (attr, passive) => attr.canApplyPreSummon(pokemon, passive, args),
+    args
+  );
 }
 
-export function applyPreLeaveFieldAbAttrs(attrType: Constructor<PreLeaveFieldAbAttr>,
-  pokemon: Pokemon, simulated: boolean = false, ...args: any[]): Promise<void> {
-  return applyAbAttrsInternal<PreLeaveFieldAbAttr>(attrType, pokemon, (attr, passive) => attr.applyPreLeaveField(pokemon, passive, simulated, args), args, true, simulated);
+export function applyPreSwitchOutAbAttrs(
+  attrType: Constructor<PreSwitchOutAbAttr>,
+  pokemon: Pokemon,
+  simulated = false,
+  ...args: any[]
+): void {
+  applyAbAttrsInternal<PreSwitchOutAbAttr>(
+    attrType,
+    pokemon,
+    (attr, passive) => attr.applyPreSwitchOut(pokemon, passive, simulated, args),
+    (attr, passive) => attr.canApplyPreSwitchOut(pokemon, passive, simulated, args),
+    args,
+    simulated,
+  );
 }
 
-export function applyPreStatStageChangeAbAttrs(attrType: Constructor<PreStatStageChangeAbAttr>,
-  pokemon: Pokemon | null, stat: BattleStat, cancelled: Utils.BooleanHolder, simulated: boolean = false, ...args: any[]): Promise<void> {
-  return applyAbAttrsInternal<PreStatStageChangeAbAttr>(attrType, pokemon, (attr, passive) => attr.applyPreStatStageChange(pokemon, passive, simulated, stat, cancelled, args), args, false, simulated);
+export function applyPreLeaveFieldAbAttrs(
+  attrType: Constructor<PreLeaveFieldAbAttr>,
+  pokemon: Pokemon,
+  simulated = false,
+  ...args: any[]
+): void {
+  return applyAbAttrsInternal<PreLeaveFieldAbAttr>(
+    attrType,
+    pokemon,
+    (attr, passive) =>
+      attr.applyPreLeaveField(pokemon, passive, simulated, args),
+    (attr, passive) => attr.canApplyPreLeaveField(pokemon, passive, simulated, args),
+    args,
+    simulated
+  );
 }
 
-export function applyPostStatStageChangeAbAttrs(attrType: Constructor<PostStatStageChangeAbAttr>,
-  pokemon: Pokemon, stats: BattleStat[], stages: number, selfTarget: boolean, simulated: boolean = false, ...args: any[]): Promise<void> {
-  return applyAbAttrsInternal<PostStatStageChangeAbAttr>(attrType, pokemon, (attr, _passive) => attr.applyPostStatStageChange(pokemon, simulated, stats, stages, selfTarget, args), args, false, simulated);
+export function applyPreStatStageChangeAbAttrs<T extends PreStatStageChangeAbAttr > (
+  attrType: Constructor<T>,
+  pokemon: Pokemon | null,
+  stat: BattleStat,
+  cancelled: BooleanHolder,
+  simulated = false,
+  ...args: any[]
+): void {
+  applyAbAttrsInternal<T>(
+    attrType,
+    pokemon,
+    (attr, passive) => attr.applyPreStatStageChange(pokemon, passive, simulated, stat, cancelled, args),
+    (attr, passive) => attr.canApplyPreStatStageChange(pokemon, passive, simulated, stat, cancelled, args),
+    args,
+    simulated,
+  );
 }
 
-export function applyPreSetStatusAbAttrs(attrType: Constructor<PreSetStatusAbAttr>,
-  pokemon: Pokemon, effect: StatusEffect | undefined, cancelled: Utils.BooleanHolder, simulated: boolean = false, ...args: any[]): Promise<void> {
-  return applyAbAttrsInternal<PreSetStatusAbAttr>(attrType, pokemon, (attr, passive) => attr.applyPreSetStatus(pokemon, passive, simulated, effect, cancelled, args), args, false, simulated);
+export function applyPostStatStageChangeAbAttrs(
+  attrType: Constructor<PostStatStageChangeAbAttr>,
+  pokemon: Pokemon,
+  stats: BattleStat[],
+  stages: integer,
+  selfTarget: boolean,
+  simulated = false,
+  ...args: any[]
+): void {
+  applyAbAttrsInternal<PostStatStageChangeAbAttr>(
+    attrType,
+    pokemon,
+    (attr, _passive) => attr.applyPostStatStageChange(pokemon, simulated, stats, stages, selfTarget, args),
+    (attr, _passive) => attr.canApplyPostStatStageChange(pokemon, simulated, stats, stages, selfTarget, args), args,
+    simulated,
+  );
 }
 
-export function applyPreApplyBattlerTagAbAttrs(attrType: Constructor<PreApplyBattlerTagAbAttr>,
-  pokemon: Pokemon, tag: BattlerTag, cancelled: Utils.BooleanHolder, simulated: boolean = false, ...args: any[]): Promise<void> {
-  return applyAbAttrsInternal<PreApplyBattlerTagAbAttr>(attrType, pokemon, (attr, passive) => attr.applyPreApplyBattlerTag(pokemon, passive, simulated, tag, cancelled, args), args, false, simulated);
+export function applyPreSetStatusAbAttrs(
+  attrType: Constructor<PreSetStatusAbAttr>,
+  pokemon: Pokemon,
+  effect: StatusEffect | undefined,
+  cancelled: BooleanHolder,
+  simulated = false,
+  ...args: any[]
+): void {
+  applyAbAttrsInternal<PreSetStatusAbAttr>(
+    attrType,
+    pokemon,
+    (attr, passive) => attr.applyPreSetStatus(pokemon, passive, simulated, effect, cancelled, args),
+    (attr, passive) => attr.canApplyPreSetStatus(pokemon, passive, simulated, effect, cancelled, args),
+    args,
+    simulated,
+  );
 }
 
-export function applyPreWeatherEffectAbAttrs(attrType: Constructor<PreWeatherEffectAbAttr>,
-  pokemon: Pokemon, weather: Weather | null, cancelled: Utils.BooleanHolder, simulated: boolean = false, ...args: any[]): Promise<void> {
-  return applyAbAttrsInternal<PreWeatherDamageAbAttr>(attrType, pokemon, (attr, passive) => attr.applyPreWeatherEffect(pokemon, passive, simulated, weather, cancelled, args), args, true, simulated);
+export function applyPreApplyBattlerTagAbAttrs(
+  attrType: Constructor<PreApplyBattlerTagAbAttr>,
+  pokemon: Pokemon,
+  tag: BattlerTag,
+  cancelled: BooleanHolder,
+  simulated = false,
+  ...args: any[]
+): void {
+  applyAbAttrsInternal<PreApplyBattlerTagAbAttr>(
+    attrType,
+    pokemon,
+    (attr, passive) => attr.applyPreApplyBattlerTag(pokemon, passive, simulated, tag, cancelled, args),
+    (attr, passive) => attr.canApplyPreApplyBattlerTag(pokemon, passive, simulated, tag, cancelled, args),
+    args,
+    simulated,
+  );
 }
 
-export function applyPostTurnAbAttrs(attrType: Constructor<PostTurnAbAttr>,
-  pokemon: Pokemon, simulated: boolean = false, ...args: any[]): Promise<void> {
-  return applyAbAttrsInternal<PostTurnAbAttr>(attrType, pokemon, (attr, passive) => attr.applyPostTurn(pokemon, passive, simulated, args), args, false, simulated);
+export function applyPreWeatherEffectAbAttrs(
+  attrType: Constructor<PreWeatherEffectAbAttr>,
+  pokemon: Pokemon,
+  weather: Weather | null,
+  cancelled: BooleanHolder,
+  simulated = false,
+  ...args: any[]
+): void {
+  applyAbAttrsInternal<PreWeatherDamageAbAttr>(
+    attrType,
+    pokemon,
+    (attr, passive) => attr.applyPreWeatherEffect(pokemon, passive, simulated, weather, cancelled, args),
+    (attr, passive) => attr.canApplyPreWeatherEffect(pokemon, passive, simulated, weather, cancelled, args),
+    args,
+    simulated,
+  );
 }
 
-export function applyPostWeatherChangeAbAttrs(attrType: Constructor<PostWeatherChangeAbAttr>,
-  pokemon: Pokemon, weather: WeatherType, simulated: boolean = false, ...args: any[]): Promise<void> {
-  return applyAbAttrsInternal<PostWeatherChangeAbAttr>(attrType, pokemon, (attr, passive) => attr.applyPostWeatherChange(pokemon, passive, simulated, weather, args), args, false, simulated);
+export function applyPostTurnAbAttrs(
+  attrType: Constructor<PostTurnAbAttr>,
+  pokemon: Pokemon,
+  simulated = false,
+  ...args: any[]
+): void {
+  applyAbAttrsInternal<PostTurnAbAttr>(
+    attrType,
+    pokemon,
+    (attr, passive) => attr.applyPostTurn(pokemon, passive, simulated, args),
+    (attr, passive) => attr.canApplyPostTurn(pokemon, passive, simulated, args),
+    args,
+    simulated,
+  );
 }
 
-export function applyPostWeatherLapseAbAttrs(attrType: Constructor<PostWeatherLapseAbAttr>,
-  pokemon: Pokemon, weather: Weather | null, simulated: boolean = false, ...args: any[]): Promise<void> {
-  return applyAbAttrsInternal<PostWeatherLapseAbAttr>(attrType, pokemon, (attr, passive) => attr.applyPostWeatherLapse(pokemon, passive, simulated, weather, args), args, false, simulated);
+export function applyPostWeatherChangeAbAttrs(
+  attrType: Constructor<PostWeatherChangeAbAttr>,
+  pokemon: Pokemon,
+  weather: WeatherType,
+  simulated = false,
+  ...args: any[]
+): void {
+  applyAbAttrsInternal<PostWeatherChangeAbAttr>(
+    attrType,
+    pokemon,
+    (attr, passive) => attr.applyPostWeatherChange(pokemon, passive, simulated, weather, args),
+    (attr, passive) => attr.canApplyPostWeatherChange(pokemon, passive, simulated, weather, args),
+    args,
+    simulated,
+  );
 }
 
-export function applyPostTerrainChangeAbAttrs(attrType: Constructor<PostTerrainChangeAbAttr>,
-  pokemon: Pokemon, terrain: TerrainType, simulated: boolean = false, ...args: any[]): Promise<void> {
-  return applyAbAttrsInternal<PostTerrainChangeAbAttr>(attrType, pokemon, (attr, passive) => attr.applyPostTerrainChange(pokemon, passive, simulated, terrain, args), args, false, simulated);
+export function applyPostWeatherLapseAbAttrs(
+  attrType: Constructor<PostWeatherLapseAbAttr>,
+  pokemon: Pokemon,
+  weather: Weather | null,
+  simulated = false,
+  ...args: any[]
+): void {
+  applyAbAttrsInternal<PostWeatherLapseAbAttr>(
+    attrType,
+    pokemon,
+    (attr, passive) => attr.applyPostWeatherLapse(pokemon, passive, simulated, weather, args),
+    (attr, passive) => attr.canApplyPostWeatherLapse(pokemon, passive, simulated, weather, args),
+    args,
+    simulated,
+  );
 }
 
-export function applyCheckTrappedAbAttrs(attrType: Constructor<CheckTrappedAbAttr>,
-  pokemon: Pokemon, trapped: Utils.BooleanHolder, otherPokemon: Pokemon, messages: string[], simulated: boolean = false, ...args: any[]): Promise<void> {
-  return applyAbAttrsInternal<CheckTrappedAbAttr>(attrType, pokemon, (attr, passive) => attr.applyCheckTrapped(pokemon, passive, simulated, trapped, otherPokemon, args), args, false, simulated, messages);
+export function applyPostTerrainChangeAbAttrs(
+  attrType: Constructor<PostTerrainChangeAbAttr>,
+  pokemon: Pokemon,
+  terrain: TerrainType,
+  simulated = false,
+  ...args: any[]
+): void {
+  applyAbAttrsInternal<PostTerrainChangeAbAttr>(
+    attrType,
+    pokemon,
+    (attr, passive) => attr.applyPostTerrainChange(pokemon, passive, simulated, terrain, args),
+    (attr, passive) => attr.canApplyPostTerrainChange(pokemon, passive, simulated, terrain, args),
+    args,
+    simulated,
+  );
 }
 
-export function applyPostBattleAbAttrs(attrType: Constructor<PostBattleAbAttr>,
-  pokemon: Pokemon, simulated: boolean = false, ...args: any[]): Promise<void> {
-  return applyAbAttrsInternal<PostBattleAbAttr>(attrType, pokemon, (attr, passive) => attr.applyPostBattle(pokemon, passive, simulated, args), args, false, simulated);
+export function applyCheckTrappedAbAttrs(
+  attrType: Constructor<CheckTrappedAbAttr>,
+  pokemon: Pokemon,
+  trapped: BooleanHolder,
+  otherPokemon: Pokemon,
+  messages: string[],
+  simulated = false,
+  ...args: any[]
+): void {
+  applyAbAttrsInternal<CheckTrappedAbAttr>(
+    attrType,
+    pokemon,
+    (attr, passive) => attr.applyCheckTrapped(pokemon, passive, simulated, trapped, otherPokemon, args),
+    (attr, passive) => attr.canApplyCheckTrapped(pokemon, passive, simulated, trapped, otherPokemon, args), args,
+    simulated,
+    messages,
+  );
 }
 
-export function applyPostFaintAbAttrs(attrType: Constructor<PostFaintAbAttr>,
-  pokemon: Pokemon, attacker?: Pokemon, move?: Move, hitResult?: HitResult, simulated: boolean = false, ...args: any[]): Promise<void> {
-  return applyAbAttrsInternal<PostFaintAbAttr>(attrType, pokemon, (attr, passive) => attr.applyPostFaint(pokemon, passive, simulated, attacker, move, hitResult, args), args, false, simulated);
+export function applyPostBattleAbAttrs(
+  attrType: Constructor<PostBattleAbAttr>,
+  pokemon: Pokemon,
+  simulated = false,
+  ...args: any[]
+): void {
+  applyAbAttrsInternal<PostBattleAbAttr>(
+    attrType,
+    pokemon,
+    (attr, passive) => attr.applyPostBattle(pokemon, passive, simulated, args),
+    (attr, passive) => attr.canApplyPostBattle(pokemon, passive, simulated, args),
+    args,
+    simulated,
+  );
 }
 
-export function applyPostItemLostAbAttrs(attrType: Constructor<PostItemLostAbAttr>,
-  pokemon: Pokemon, simulated: boolean = false, ...args: any[]): Promise<void> {
-  return applyAbAttrsInternal<PostItemLostAbAttr>(attrType, pokemon, (attr, passive) => attr.applyPostItemLost(pokemon, simulated, args), args);
+export function applyPostFaintAbAttrs(
+  attrType: Constructor<PostFaintAbAttr>,
+  pokemon: Pokemon,
+  attacker?: Pokemon,
+  move?: Move,
+  hitResult?: HitResult,
+  simulated = false,
+  ...args: any[]
+): void {
+  applyAbAttrsInternal<PostFaintAbAttr>(
+    attrType,
+    pokemon,
+    (attr, passive) => attr.applyPostFaint(pokemon, passive, simulated, attacker, move, hitResult, args),
+    (attr, passive) => attr.canApplyPostFaint(pokemon, passive, simulated, attacker, move, hitResult, args),
+    args,
+    simulated,
+  );
 }
 
-function queueShowAbility(pokemon: Pokemon, passive: boolean): void {
-  globalScene.unshiftPhase(new ShowAbilityPhase(pokemon.id, passive));
-  globalScene.clearPhaseQueueSplice();
+export function applyPostItemLostAbAttrs(
+  attrType: Constructor<PostItemLostAbAttr>,
+  pokemon: Pokemon,
+  simulated = false,
+  ...args: any[]
+): void {
+  applyAbAttrsInternal<PostItemLostAbAttr>(
+    attrType,
+    pokemon,
+    (attr, passive) => attr.applyPostItemLost(pokemon, simulated, args),
+    (attr, passive) => attr.canApplyPostItemLost(pokemon, simulated, args),
+    args,
+  );
+}
+
+/**
+ * Applies abilities when they become active mid-turn (ability switch)
+ *
+ * Ignores passives as they don't change and shouldn't be reapplied when main abilities change
+ */
+export function applyOnGainAbAttrs(
+  pokemon: Pokemon,
+  passive: boolean = false,
+  simulated: boolean = false,
+  ...args: any[]): void {
+  applySingleAbAttrs<PostSummonAbAttr>(
+    pokemon,
+    passive,
+    PostSummonAbAttr,
+    (attr, passive) => attr.applyPostSummon(pokemon, passive, simulated, args),
+    (attr, passive) => attr.canApplyPostSummon(pokemon, passive, simulated, args),
+    args,
+    true,
+    simulated,
+  );
+}
+
+/**
+ * Applies ability attributes which activate when the ability is lost or suppressed (i.e. primal weather)
+ */
+export function applyOnLoseAbAttrs(pokemon: Pokemon, passive = false, simulated = false, ...args: any[]): void {
+  applySingleAbAttrs<PreLeaveFieldAbAttr>(
+    pokemon,
+    passive,
+    PreLeaveFieldAbAttr,
+    (attr, passive) => attr.applyPreLeaveField(pokemon, passive, simulated, [ ...args, true ]),
+    (attr, passive) => attr.canApplyPreLeaveField(pokemon, passive, simulated, [ ...args, true ]),
+    args,
+    true,
+    simulated);
+
+  applySingleAbAttrs<IllusionBreakAbAttr>(
+    pokemon,
+    passive,
+    IllusionBreakAbAttr,
+    (attr, passive) => attr.apply(pokemon, passive, simulated, null, args),
+    (attr, passive) => attr.canApply(pokemon, passive, simulated, args),
+    args,
+    true,
+    simulated
+  )
 }
 
 /**
  * Sets the ability of a Pokémon as revealed.
- *
  * @param pokemon - The Pokémon whose ability is being revealed.
  */
 function setAbilityRevealed(pokemon: Pokemon): void {
-  if (pokemon.battleData) {
-    pokemon.battleData.abilityRevealed = true;
-  }
+  pokemon.waveData.abilityRevealed = true;
 }
 
 /**
- * Returns the Pokemon with weather-based forms
+ * Returns all Pokemon on field with weather-based forms
  */
 function getPokemonWithWeatherBasedForms() {
   return globalScene.getField(true).filter(p =>
@@ -5278,10 +6428,9 @@ function getPokemonWithWeatherBasedForms() {
   );
 }
 
-export const allAbilities = [ new Ability(Abilities.NONE, 3) ];
-
 export function initAbilities() {
   allAbilities.push(
+    new Ability(Abilities.NONE, 3),
     new Ability(Abilities.STENCH, 3)
       .attr(PostAttackApplyBattlerTagAbAttr, false, (user, target, move) => !move.hasAttr(FlinchAttr) && !move.hitsSubstitute(user, target) ? 10 : 0, BattlerTagType.FLINCHED),
     new Ability(Abilities.DRIZZLE, 3)
@@ -5301,6 +6450,7 @@ export function initAbilities() {
       .ignorable(),
     new Ability(Abilities.LIMBER, 3)
       .attr(StatusEffectImmunityAbAttr, StatusEffect.PARALYSIS)
+      .attr(PostSummonHealStatusAbAttr, StatusEffect.PARALYSIS)
       .ignorable(),
     new Ability(Abilities.SAND_VEIL, 3)
       .attr(StatMultiplierAbAttr, Stat.EVA, 1.2)
@@ -5311,13 +6461,14 @@ export function initAbilities() {
       .attr(PostDefendContactApplyStatusEffectAbAttr, 30, StatusEffect.PARALYSIS)
       .bypassFaint(),
     new Ability(Abilities.VOLT_ABSORB, 3)
-      .attr(TypeImmunityHealAbAttr, Type.ELECTRIC)
+      .attr(TypeImmunityHealAbAttr, PokemonType.ELECTRIC)
       .ignorable(),
     new Ability(Abilities.WATER_ABSORB, 3)
-      .attr(TypeImmunityHealAbAttr, Type.WATER)
+      .attr(TypeImmunityHealAbAttr, PokemonType.WATER)
       .ignorable(),
     new Ability(Abilities.OBLIVIOUS, 3)
       .attr(BattlerTagImmunityAbAttr, [ BattlerTagType.INFATUATED, BattlerTagType.TAUNT ])
+      .attr(PostSummonRemoveBattlerTagAbAttr, BattlerTagType.INFATUATED, BattlerTagType.TAUNT)
       .attr(IntimidateImmunityAbAttr)
       .ignorable(),
     new Ability(Abilities.CLOUD_NINE, 3)
@@ -5330,6 +6481,7 @@ export function initAbilities() {
       .attr(StatMultiplierAbAttr, Stat.ACC, 1.3),
     new Ability(Abilities.INSOMNIA, 3)
       .attr(StatusEffectImmunityAbAttr, StatusEffect.SLEEP)
+      .attr(PostSummonHealStatusAbAttr, StatusEffect.SLEEP)
       .attr(BattlerTagImmunityAbAttr, BattlerTagType.DROWSY)
       .ignorable(),
     new Ability(Abilities.COLOR_CHANGE, 3)
@@ -5337,15 +6489,17 @@ export function initAbilities() {
       .condition(getSheerForceHitDisableAbCondition()),
     new Ability(Abilities.IMMUNITY, 3)
       .attr(StatusEffectImmunityAbAttr, StatusEffect.POISON, StatusEffect.TOXIC)
+      .attr(PostSummonHealStatusAbAttr, StatusEffect.POISON, StatusEffect.TOXIC)
       .ignorable(),
     new Ability(Abilities.FLASH_FIRE, 3)
-      .attr(TypeImmunityAddBattlerTagAbAttr, Type.FIRE, BattlerTagType.FIRE_BOOST, 1)
+      .attr(TypeImmunityAddBattlerTagAbAttr, PokemonType.FIRE, BattlerTagType.FIRE_BOOST, 1)
       .ignorable(),
     new Ability(Abilities.SHIELD_DUST, 3)
       .attr(IgnoreMoveEffectsAbAttr)
       .ignorable(),
     new Ability(Abilities.OWN_TEMPO, 3)
       .attr(BattlerTagImmunityAbAttr, BattlerTagType.CONFUSED)
+      .attr(PostSummonRemoveBattlerTagAbAttr, BattlerTagType.CONFUSED)
       .attr(IntimidateImmunityAbAttr)
       .ignorable(),
     new Ability(Abilities.SUCTION_CUPS, 3)
@@ -5365,11 +6519,10 @@ export function initAbilities() {
       .bypassFaint(),
     new Ability(Abilities.WONDER_GUARD, 3)
       .attr(NonSuperEffectiveImmunityAbAttr)
-      .attr(UncopiableAbilityAbAttr)
-      .attr(UnswappableAbilityAbAttr)
+      .uncopiable()
       .ignorable(),
     new Ability(Abilities.LEVITATE, 3)
-      .attr(AttackTypeImmunityAbAttr, Type.GROUND, (pokemon: Pokemon) => !pokemon.getTag(GroundedTag) && !globalScene.arena.getTag(ArenaTagType.GRAVITY))
+      .attr(AttackTypeImmunityAbAttr, PokemonType.GROUND, (pokemon: Pokemon) => !pokemon.getTag(GroundedTag) && !globalScene.arena.getTag(ArenaTagType.GRAVITY))
       .ignorable(),
     new Ability(Abilities.EFFECT_SPORE, 3)
       .attr(EffectSporeAbAttr),
@@ -5382,8 +6535,8 @@ export function initAbilities() {
     new Ability(Abilities.NATURAL_CURE, 3)
       .attr(PreSwitchOutResetStatusAbAttr),
     new Ability(Abilities.LIGHTNING_ROD, 3)
-      .attr(RedirectTypeMoveAbAttr, Type.ELECTRIC)
-      .attr(TypeImmunityStatStageChangeAbAttr, Type.ELECTRIC, Stat.SPATK, 1)
+      .attr(RedirectTypeMoveAbAttr, PokemonType.ELECTRIC)
+      .attr(TypeImmunityStatStageChangeAbAttr, PokemonType.ELECTRIC, Stat.SPATK, 1)
       .ignorable(),
     new Ability(Abilities.SERENE_GRACE, 3)
       .attr(MoveEffectChanceMultiplierAbAttr, 2),
@@ -5400,7 +6553,7 @@ export function initAbilities() {
       .ignorable(),
     new Ability(Abilities.TRACE, 3)
       .attr(PostSummonCopyAbilityAbAttr)
-      .attr(UncopiableAbilityAbAttr),
+      .uncopiable(),
     new Ability(Abilities.HUGE_POWER, 3)
       .attr(StatMultiplierAbAttr, Stat.ATK, 2),
     new Ability(Abilities.POISON_POINT, 3)
@@ -5412,13 +6565,15 @@ export function initAbilities() {
       .ignorable(),
     new Ability(Abilities.MAGMA_ARMOR, 3)
       .attr(StatusEffectImmunityAbAttr, StatusEffect.FREEZE)
+      .attr(PostSummonHealStatusAbAttr, StatusEffect.FREEZE)
       .ignorable(),
     new Ability(Abilities.WATER_VEIL, 3)
       .attr(StatusEffectImmunityAbAttr, StatusEffect.BURN)
+      .attr(PostSummonHealStatusAbAttr, StatusEffect.BURN)
       .ignorable(),
     new Ability(Abilities.MAGNET_PULL, 3)
       .attr(ArenaTrapAbAttr, (user, target) => {
-        if (target.getTypes(true).includes(Type.STEEL) || (target.getTypes(true).includes(Type.STELLAR) && target.getTypes().includes(Type.STEEL))) {
+        if (target.getTypes(true).includes(PokemonType.STEEL) || (target.getTypes(true).includes(PokemonType.STELLAR) && target.getTypes().includes(PokemonType.STEEL))) {
           return true;
         }
         return false;
@@ -5435,8 +6590,8 @@ export function initAbilities() {
       .attr(IncreasePpAbAttr)
       .attr(PostSummonMessageAbAttr, (pokemon: Pokemon) => i18next.t("abilityTriggers:postSummonPressure", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) })),
     new Ability(Abilities.THICK_FAT, 3)
-      .attr(ReceivedTypeDamageMultiplierAbAttr, Type.FIRE, 0.5)
-      .attr(ReceivedTypeDamageMultiplierAbAttr, Type.ICE, 0.5)
+      .attr(ReceivedTypeDamageMultiplierAbAttr, PokemonType.FIRE, 0.5)
+      .attr(ReceivedTypeDamageMultiplierAbAttr, PokemonType.ICE, 0.5)
       .ignorable(),
     new Ability(Abilities.EARLY_BIRD, 3)
       .attr(ReduceStatusEffectDurationAbAttr, StatusEffect.SLEEP),
@@ -5452,7 +6607,8 @@ export function initAbilities() {
       .attr(ProtectStatAbAttr, Stat.ATK)
       .ignorable(),
     new Ability(Abilities.PICKUP, 3)
-      .attr(PostBattleLootAbAttr),
+      .attr(PostBattleLootAbAttr)
+      .unsuppressable(),
     new Ability(Abilities.TRUANT, 3)
       .attr(PostSummonAddBattlerTagAbAttr, BattlerTagType.TRUANT, 1, false),
     new Ability(Abilities.HUSTLE, 3)
@@ -5461,11 +6617,12 @@ export function initAbilities() {
     new Ability(Abilities.CUTE_CHARM, 3)
       .attr(PostDefendContactApplyTagChanceAbAttr, 30, BattlerTagType.INFATUATED),
     new Ability(Abilities.PLUS, 3)
-      .conditionalAttr(p => globalScene.currentBattle.double && [ Abilities.PLUS, Abilities.MINUS ].some(a => p.getAlly().hasAbility(a)), StatMultiplierAbAttr, Stat.SPATK, 1.5),
+      .conditionalAttr(p => globalScene.currentBattle.double && [ Abilities.PLUS, Abilities.MINUS ].some(a => (p.getAlly()?.hasAbility(a) ?? false)), StatMultiplierAbAttr, Stat.SPATK, 1.5),
     new Ability(Abilities.MINUS, 3)
-      .conditionalAttr(p => globalScene.currentBattle.double && [ Abilities.PLUS, Abilities.MINUS ].some(a => p.getAlly().hasAbility(a)), StatMultiplierAbAttr, Stat.SPATK, 1.5),
+      .conditionalAttr(p => globalScene.currentBattle.double && [ Abilities.PLUS, Abilities.MINUS ].some(a => (p.getAlly()?.hasAbility(a) ?? false)), StatMultiplierAbAttr, Stat.SPATK, 1.5),
     new Ability(Abilities.FORECAST, 3)
-      .attr(UncopiableAbilityAbAttr)
+      .uncopiable()
+      .unreplaceable()
       .attr(NoFusionAbilityAbAttr)
       .attr(PostSummonFormChangeByWeatherAbAttr, Abilities.FORECAST)
       .attr(PostWeatherChangeFormChangeAbAttr, Abilities.FORECAST, [ WeatherType.NONE, WeatherType.SANDSTORM, WeatherType.STRONG_WINDS, WeatherType.FOG ]),
@@ -5474,7 +6631,7 @@ export function initAbilities() {
       .bypassFaint()
       .ignorable(),
     new Ability(Abilities.SHED_SKIN, 3)
-      .conditionalAttr(pokemon => !Utils.randSeedInt(3), PostTurnResetStatusAbAttr),
+      .conditionalAttr(pokemon => !randSeedInt(3), PostTurnResetStatusAbAttr),
     new Ability(Abilities.GUTS, 3)
       .attr(BypassBurnDamageReductionAbAttr)
       .conditionalAttr(pokemon => !!pokemon.status || pokemon.hasAbility(Abilities.COMATOSE), StatMultiplierAbAttr, Stat.ATK, 1.5),
@@ -5484,13 +6641,13 @@ export function initAbilities() {
     new Ability(Abilities.LIQUID_OOZE, 3)
       .attr(ReverseDrainAbAttr),
     new Ability(Abilities.OVERGROW, 3)
-      .attr(LowHpMoveTypePowerBoostAbAttr, Type.GRASS),
+      .attr(LowHpMoveTypePowerBoostAbAttr, PokemonType.GRASS),
     new Ability(Abilities.BLAZE, 3)
-      .attr(LowHpMoveTypePowerBoostAbAttr, Type.FIRE),
+      .attr(LowHpMoveTypePowerBoostAbAttr, PokemonType.FIRE),
     new Ability(Abilities.TORRENT, 3)
-      .attr(LowHpMoveTypePowerBoostAbAttr, Type.WATER),
+      .attr(LowHpMoveTypePowerBoostAbAttr, PokemonType.WATER),
     new Ability(Abilities.SWARM, 3)
-      .attr(LowHpMoveTypePowerBoostAbAttr, Type.BUG),
+      .attr(LowHpMoveTypePowerBoostAbAttr, PokemonType.BUG),
     new Ability(Abilities.ROCK_HEAD, 3)
       .attr(BlockRecoilDamageAttr),
     new Ability(Abilities.DROUGHT, 3)
@@ -5506,6 +6663,7 @@ export function initAbilities() {
       .attr(DoubleBattleChanceAbAttr),
     new Ability(Abilities.VITAL_SPIRIT, 3)
       .attr(StatusEffectImmunityAbAttr, StatusEffect.SLEEP)
+      .attr(PostSummonHealStatusAbAttr, StatusEffect.SLEEP)
       .attr(BattlerTagImmunityAbAttr, BattlerTagType.DROWSY)
       .ignorable(),
     new Ability(Abilities.WHITE_SMOKE, 3)
@@ -5526,7 +6684,7 @@ export function initAbilities() {
       .conditionalAttr(pokemon => !!pokemon.getTag(BattlerTagType.CONFUSED), StatMultiplierAbAttr, Stat.EVA, 2)
       .ignorable(),
     new Ability(Abilities.MOTOR_DRIVE, 4)
-      .attr(TypeImmunityStatStageChangeAbAttr, Type.ELECTRIC, Stat.SPD, 1)
+      .attr(TypeImmunityStatStageChangeAbAttr, PokemonType.ELECTRIC, Stat.SPD, 1)
       .ignorable(),
     new Ability(Abilities.RIVALRY, 4)
       .attr(MovePowerBoostAbAttr, (user, target, move) => user?.gender !== Gender.GENDERLESS && target?.gender !== Gender.GENDERLESS && user?.gender === target?.gender, 1.25, true)
@@ -5547,7 +6705,7 @@ export function initAbilities() {
       .bypassFaint() // Allows reviver seed to activate Unburden
       .edgeCase(), // Should not restore Unburden boost if Pokemon loses then regains Unburden ability
     new Ability(Abilities.HEATPROOF, 4)
-      .attr(ReceivedTypeDamageMultiplierAbAttr, Type.FIRE, 0.5)
+      .attr(ReceivedTypeDamageMultiplierAbAttr, PokemonType.FIRE, 0.5)
       .attr(ReduceBurnDamageAbAttr, 0.5)
       .ignorable(),
     new Ability(Abilities.SIMPLE, 4)
@@ -5556,8 +6714,8 @@ export function initAbilities() {
     new Ability(Abilities.DRY_SKIN, 4)
       .attr(PostWeatherLapseDamageAbAttr, 2, WeatherType.SUNNY, WeatherType.HARSH_SUN)
       .attr(PostWeatherLapseHealAbAttr, 2, WeatherType.RAIN, WeatherType.HEAVY_RAIN)
-      .attr(ReceivedTypeDamageMultiplierAbAttr, Type.FIRE, 1.25)
-      .attr(TypeImmunityHealAbAttr, Type.WATER)
+      .attr(ReceivedTypeDamageMultiplierAbAttr, PokemonType.FIRE, 1.25)
+      .attr(TypeImmunityHealAbAttr, PokemonType.WATER)
       .ignorable(),
     new Ability(Abilities.DOWNLOAD, 4)
       .attr(DownloadAbAttr),
@@ -5581,9 +6739,7 @@ export function initAbilities() {
       .conditionalAttr(pokemon => pokemon.status ? pokemon.status.effect === StatusEffect.PARALYSIS : false, StatMultiplierAbAttr, Stat.SPD, 2)
       .conditionalAttr(pokemon => !!pokemon.status || pokemon.hasAbility(Abilities.COMATOSE), StatMultiplierAbAttr, Stat.SPD, 1.5),
     new Ability(Abilities.NORMALIZE, 4)
-      .attr(MoveTypeChangeAbAttr, Type.NORMAL, 1.2, (user, target, move) => {
-        return ![ Moves.HIDDEN_POWER, Moves.WEATHER_BALL, Moves.NATURAL_GIFT, Moves.JUDGMENT, Moves.TECHNO_BLAST ].includes(move.id);
-      }),
+      .attr(MoveTypeChangeAbAttr, PokemonType.NORMAL, 1.2),
     new Ability(Abilities.SNIPER, 4)
       .attr(MultCritAbAttr, 1.5),
     new Ability(Abilities.MAGIC_GUARD, 4)
@@ -5595,7 +6751,7 @@ export function initAbilities() {
       .attr(ChangeMovePriorityAbAttr, (pokemon, move: Move) => true, -0.2),
     new Ability(Abilities.TECHNICIAN, 4)
       .attr(MovePowerBoostAbAttr, (user, target, move) => {
-        const power = new Utils.NumberHolder(move.power);
+        const power = new NumberHolder(move.power);
         applyMoveAttrs(VariablePowerAttr, user, target, move, power);
         return power.value <= 60;
       }, 1.5),
@@ -5628,11 +6784,11 @@ export function initAbilities() {
     new Ability(Abilities.SLOW_START, 4)
       .attr(PostSummonAddBattlerTagAbAttr, BattlerTagType.SLOW_START, 5),
     new Ability(Abilities.SCRAPPY, 4)
-      .attr(IgnoreTypeImmunityAbAttr, Type.GHOST, [ Type.NORMAL, Type.FIGHTING ])
+      .attr(IgnoreTypeImmunityAbAttr, PokemonType.GHOST, [ PokemonType.NORMAL, PokemonType.FIGHTING ])
       .attr(IntimidateImmunityAbAttr),
     new Ability(Abilities.STORM_DRAIN, 4)
-      .attr(RedirectTypeMoveAbAttr, Type.WATER)
-      .attr(TypeImmunityStatStageChangeAbAttr, Type.WATER, Stat.SPATK, 1)
+      .attr(RedirectTypeMoveAbAttr, PokemonType.WATER)
+      .attr(TypeImmunityStatStageChangeAbAttr, PokemonType.WATER, Stat.SPATK, 1)
       .ignorable(),
     new Ability(Abilities.ICE_BODY, 4)
       .attr(BlockWeatherDamageAttr, WeatherType.HAIL)
@@ -5644,33 +6800,36 @@ export function initAbilities() {
       .attr(PostSummonWeatherChangeAbAttr, WeatherType.SNOW)
       .attr(PostBiomeChangeWeatherChangeAbAttr, WeatherType.SNOW),
     new Ability(Abilities.HONEY_GATHER, 4)
-      .attr(MoneyAbAttr),
+      .attr(MoneyAbAttr)
+      .unsuppressable(),
     new Ability(Abilities.FRISK, 4)
       .attr(FriskAbAttr),
     new Ability(Abilities.RECKLESS, 4)
       .attr(MovePowerBoostAbAttr, (user, target, move) => move.hasFlag(MoveFlags.RECKLESS_MOVE), 1.2),
     new Ability(Abilities.MULTITYPE, 4)
-      .attr(UncopiableAbilityAbAttr)
-      .attr(UnswappableAbilityAbAttr)
-      .attr(UnsuppressableAbilityAbAttr)
-      .attr(NoFusionAbilityAbAttr),
+      .attr(NoFusionAbilityAbAttr)
+      .uncopiable()
+      .unsuppressable()
+      .unreplaceable(),
     new Ability(Abilities.FLOWER_GIFT, 4)
       .conditionalAttr(getWeatherCondition(WeatherType.SUNNY || WeatherType.HARSH_SUN), StatMultiplierAbAttr, Stat.ATK, 1.5)
       .conditionalAttr(getWeatherCondition(WeatherType.SUNNY || WeatherType.HARSH_SUN), StatMultiplierAbAttr, Stat.SPDEF, 1.5)
-      .attr(UncopiableAbilityAbAttr)
+      .conditionalAttr(getWeatherCondition(WeatherType.SUNNY || WeatherType.HARSH_SUN), AllyStatMultiplierAbAttr, Stat.ATK, 1.5)
+      .conditionalAttr(getWeatherCondition(WeatherType.SUNNY || WeatherType.HARSH_SUN), AllyStatMultiplierAbAttr, Stat.SPDEF, 1.5)
       .attr(NoFusionAbilityAbAttr)
       .attr(PostSummonFormChangeByWeatherAbAttr, Abilities.FLOWER_GIFT)
       .attr(PostWeatherChangeFormChangeAbAttr, Abilities.FLOWER_GIFT, [ WeatherType.NONE, WeatherType.SANDSTORM, WeatherType.STRONG_WINDS, WeatherType.FOG, WeatherType.HAIL, WeatherType.HEAVY_RAIN, WeatherType.SNOW, WeatherType.RAIN ])
-      .partial() // Should also boosts stats of ally
+      .uncopiable()
+      .unreplaceable()
       .ignorable(),
     new Ability(Abilities.BAD_DREAMS, 4)
       .attr(PostTurnHurtIfSleepingAbAttr),
     new Ability(Abilities.PICKPOCKET, 5)
-      .attr(PostDefendStealHeldItemAbAttr, (target, user, move) => move.hasFlag(MoveFlags.MAKES_CONTACT))
+      .attr(PostDefendStealHeldItemAbAttr, (target, user, move) => move.doesFlagEffectApply({flag: MoveFlags.MAKES_CONTACT, user, target}))
       .condition(getSheerForceHitDisableAbCondition()),
     new Ability(Abilities.SHEER_FORCE, 5)
-      .attr(MovePowerBoostAbAttr, (user, target, move) => move.chance >= 1, 5461 / 4096)
-      .attr(MoveEffectChanceMultiplierAbAttr, 0), // Should disable life orb, eject button, red card, kee/maranga berry if they get implemented
+      .attr(MovePowerBoostAbAttr, (user, target, move) => move.chance >= 1, 1.3)
+      .attr(MoveEffectChanceMultiplierAbAttr, 0), // This attribute does not seem to function - Should disable life orb, eject button, red card, kee/maranga berry if they get implemented
     new Ability(Abilities.CONTRARY, 5)
       .attr(StatStageChangeMultiplierAbAttr, -1)
       .ignorable(),
@@ -5686,7 +6845,7 @@ export function initAbilities() {
       .attr(PostDefendMoveDisableAbAttr, 30)
       .bypassFaint(),
     new Ability(Abilities.HEALER, 5)
-      .conditionalAttr(pokemon => pokemon.getAlly() && Utils.randSeedInt(10) < 3, PostTurnResetStatusAbAttr, true),
+      .conditionalAttr(pokemon => !isNullOrUndefined(pokemon.getAlly()) && randSeedInt(10) < 3, PostTurnResetStatusAbAttr, true),
     new Ability(Abilities.FRIEND_GUARD, 5)
       .attr(AlliedFieldDamageReductionAbAttr, 0.75)
       .ignorable(),
@@ -5708,8 +6867,7 @@ export function initAbilities() {
       .attr(MovePowerBoostAbAttr, (user, target, move) => move.category === MoveCategory.SPECIAL && user?.status?.effect === StatusEffect.BURN, 1.5),
     new Ability(Abilities.HARVEST, 5)
       .attr(
-        PostTurnLootAbAttr,
-        "EATEN_BERRIES",
+        PostTurnRestoreBerryAbAttr,
         /** Rate is doubled when under sun {@link https://dex.pokemonshowdown.com/abilities/harvest} */
         (pokemon) => 0.5 * (getWeatherCondition(WeatherType.SUNNY, WeatherType.HARSH_SUN)(pokemon) ? 2 : 1)
       )
@@ -5740,15 +6898,23 @@ export function initAbilities() {
     new Ability(Abilities.ANALYTIC, 5)
       .attr(MovePowerBoostAbAttr, (user, target, move) => {
         const movePhase = globalScene.findPhase((phase) => phase instanceof MovePhase && phase.pokemon.id !== user?.id);
-        return Utils.isNullOrUndefined(movePhase);
+        return isNullOrUndefined(movePhase);
       }, 1.3),
     new Ability(Abilities.ILLUSION, 5)
-      .attr(UncopiableAbilityAbAttr)
-      .attr(UnswappableAbilityAbAttr)
-      .unimplemented(),
+      // The Pokemon generate an illusion if it's available
+      .attr(IllusionPreSummonAbAttr, false)
+      .attr(IllusionBreakAbAttr)
+      // The Pokemon loses its illusion when damaged by a move
+      .attr(PostDefendIllusionBreakAbAttr, true)
+      // Disable Illusion in fusions
+      .attr(NoFusionAbilityAbAttr)
+      // Illusion is available again after a battle
+      .conditionalAttr((pokemon) => pokemon.isAllowedInBattle(), IllusionPostBattleAbAttr, false)
+      .uncopiable()
+      .bypassFaint(),
     new Ability(Abilities.IMPOSTER, 5)
       .attr(PostSummonTransformAbAttr)
-      .attr(UncopiableAbilityAbAttr),
+      .uncopiable(),
     new Ability(Abilities.INFILTRATOR, 5)
       .attr(InfiltratorAbAttr)
       .partial(), // does not bypass Mist
@@ -5758,26 +6924,29 @@ export function initAbilities() {
     new Ability(Abilities.MOXIE, 5)
       .attr(PostVictoryStatStageChangeAbAttr, Stat.ATK, 1),
     new Ability(Abilities.JUSTIFIED, 5)
-      .attr(PostDefendStatStageChangeAbAttr, (target, user, move) => user.getMoveType(move) === Type.DARK && move.category !== MoveCategory.STATUS, Stat.ATK, 1),
+      .attr(PostDefendStatStageChangeAbAttr, (target, user, move) => user.getMoveType(move) === PokemonType.DARK && move.category !== MoveCategory.STATUS, Stat.ATK, 1),
     new Ability(Abilities.RATTLED, 5)
       .attr(PostDefendStatStageChangeAbAttr, (target, user, move) => {
         const moveType = user.getMoveType(move);
         return move.category !== MoveCategory.STATUS
-          && (moveType === Type.DARK || moveType === Type.BUG || moveType === Type.GHOST);
+          && (moveType === PokemonType.DARK || moveType === PokemonType.BUG || moveType === PokemonType.GHOST);
       }, Stat.SPD, 1)
       .attr(PostIntimidateStatStageChangeAbAttr, [ Stat.SPD ], 1),
     new Ability(Abilities.MAGIC_BOUNCE, 5)
+      .attr(ReflectStatusMoveAbAttr)
       .ignorable()
-      .unimplemented(),
+      // Interactions with stomping tantrum, instruct, encore, and probably other moves that
+      // rely on move history
+      .edgeCase(),
     new Ability(Abilities.SAP_SIPPER, 5)
-      .attr(TypeImmunityStatStageChangeAbAttr, Type.GRASS, Stat.ATK, 1)
+      .attr(TypeImmunityStatStageChangeAbAttr, PokemonType.GRASS, Stat.ATK, 1)
       .ignorable(),
     new Ability(Abilities.PRANKSTER, 5)
       .attr(ChangeMovePriorityAbAttr, (pokemon, move: Move) => move.category === MoveCategory.STATUS, 1),
     new Ability(Abilities.SAND_FORCE, 5)
-      .attr(MoveTypePowerBoostAbAttr, Type.ROCK, 1.3)
-      .attr(MoveTypePowerBoostAbAttr, Type.GROUND, 1.3)
-      .attr(MoveTypePowerBoostAbAttr, Type.STEEL, 1.3)
+      .attr(MoveTypePowerBoostAbAttr, PokemonType.ROCK, 1.3)
+      .attr(MoveTypePowerBoostAbAttr, PokemonType.GROUND, 1.3)
+      .attr(MoveTypePowerBoostAbAttr, PokemonType.STEEL, 1.3)
       .attr(BlockWeatherDamageAttr, WeatherType.SANDSTORM)
       .condition(getWeatherCondition(WeatherType.SANDSTORM)),
     new Ability(Abilities.IRON_BARBS, 5)
@@ -5787,14 +6956,14 @@ export function initAbilities() {
       .attr(PostBattleInitFormChangeAbAttr, () => 0)
       .attr(PostSummonFormChangeAbAttr, p => p.getHpRatio() <= 0.5 ? 1 : 0)
       .attr(PostTurnFormChangeAbAttr, p => p.getHpRatio() <= 0.5 ? 1 : 0)
-      .attr(UncopiableAbilityAbAttr)
-      .attr(UnswappableAbilityAbAttr)
-      .attr(UnsuppressableAbilityAbAttr)
       .attr(NoFusionAbilityAbAttr)
+      .uncopiable()
+      .unreplaceable()
+      .unsuppressable()
       .bypassFaint(),
     new Ability(Abilities.VICTORY_STAR, 5)
       .attr(StatMultiplierAbAttr, Stat.ACC, 1.1)
-      .partial(), // Does not boost ally's accuracy
+      .attr(AllyStatMultiplierAbAttr, Stat.ACC, 1.1, false),
     new Ability(Abilities.TURBOBLAZE, 5)
       .attr(PostSummonMessageAbAttr, (pokemon: Pokemon) => i18next.t("abilityTriggers:postSummonTurboblaze", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }))
       .attr(MoveAbilityBypassAbAttr),
@@ -5805,13 +6974,24 @@ export function initAbilities() {
       .attr(UserFieldBattlerTagImmunityAbAttr, [ BattlerTagType.INFATUATED, BattlerTagType.TAUNT, BattlerTagType.DISABLED, BattlerTagType.TORMENT, BattlerTagType.HEAL_BLOCK ])
       .ignorable(),
     new Ability(Abilities.FLOWER_VEIL, 6)
-      .ignorable()
-      .unimplemented(),
+      .attr(ConditionalUserFieldStatusEffectImmunityAbAttr, (target: Pokemon, source: Pokemon | null) => {
+        return source ? target.getTypes().includes(PokemonType.GRASS) && target.id !== source.id : false;
+      })
+      .attr(ConditionalUserFieldBattlerTagImmunityAbAttr,
+        (target: Pokemon) => {
+          return target.getTypes().includes(PokemonType.GRASS);
+        },
+        [ BattlerTagType.DROWSY ],
+      )
+      .attr(ConditionalUserFieldProtectStatAbAttr, (target: Pokemon) => {
+        return target.getTypes().includes(PokemonType.GRASS);
+      })
+      .ignorable(),
     new Ability(Abilities.CHEEK_POUCH, 6)
       .attr(HealFromBerryUseAbAttr, 1 / 3),
     new Ability(Abilities.PROTEAN, 6)
       .attr(PokemonTypeChangeAbAttr),
-    //.condition((p) => !p.summonData?.abilitiesApplied.includes(Abilities.PROTEAN)), //Gen 9 Implementation
+    //.condition((p) => !p.summonData.abilitiesApplied.includes(Abilities.PROTEAN)), //Gen 9 Implementation
     new Ability(Abilities.FUR_COAT, 6)
       .attr(ReceivedMoveDamageMultiplierAbAttr, (target, user, move) => move.category === MoveCategory.PHYSICAL, 0.5)
       .ignorable(),
@@ -5825,19 +7005,20 @@ export function initAbilities() {
     new Ability(Abilities.STRONG_JAW, 6)
       .attr(MovePowerBoostAbAttr, (user, target, move) => move.hasFlag(MoveFlags.BITING_MOVE), 1.5),
     new Ability(Abilities.REFRIGERATE, 6)
-      .attr(MoveTypeChangeAbAttr, Type.ICE, 1.2, (user, target, move) => move.type === Type.NORMAL && !move.hasAttr(VariableMoveTypeAttr)),
+      .attr(MoveTypeChangeAbAttr, PokemonType.ICE, 1.2, (user, target, move) => move.type === PokemonType.NORMAL),
     new Ability(Abilities.SWEET_VEIL, 6)
       .attr(UserFieldStatusEffectImmunityAbAttr, StatusEffect.SLEEP)
+      .attr(PostSummonUserFieldRemoveStatusEffectAbAttr, StatusEffect.SLEEP)
       .attr(UserFieldBattlerTagImmunityAbAttr, BattlerTagType.DROWSY)
       .ignorable()
       .partial(), // Mold Breaker ally should not be affected by Sweet Veil
     new Ability(Abilities.STANCE_CHANGE, 6)
-      .attr(UncopiableAbilityAbAttr)
-      .attr(UnswappableAbilityAbAttr)
-      .attr(UnsuppressableAbilityAbAttr)
-      .attr(NoFusionAbilityAbAttr),
+      .attr(NoFusionAbilityAbAttr)
+      .uncopiable()
+      .unreplaceable()
+      .unsuppressable(),
     new Ability(Abilities.GALE_WINGS, 6)
-      .attr(ChangeMovePriorityAbAttr, (pokemon, move) => pokemon.isFullHp() && pokemon.getMoveType(move) === Type.FLYING, 1),
+      .attr(ChangeMovePriorityAbAttr, (pokemon, move) => pokemon.isFullHp() && pokemon.getMoveType(move) === PokemonType.FLYING, 1),
     new Ability(Abilities.MEGA_LAUNCHER, 6)
       .attr(MovePowerBoostAbAttr, (user, target, move) => move.hasFlag(MoveFlags.PULSE_MOVE), 1.5),
     new Ability(Abilities.GRASS_PELT, 6)
@@ -5848,23 +7029,23 @@ export function initAbilities() {
     new Ability(Abilities.TOUGH_CLAWS, 6)
       .attr(MovePowerBoostAbAttr, (user, target, move) => move.hasFlag(MoveFlags.MAKES_CONTACT), 1.3),
     new Ability(Abilities.PIXILATE, 6)
-      .attr(MoveTypeChangeAbAttr, Type.FAIRY, 1.2, (user, target, move) => move.type === Type.NORMAL && !move.hasAttr(VariableMoveTypeAttr)),
+      .attr(MoveTypeChangeAbAttr, PokemonType.FAIRY, 1.2, (user, target, move) => move.type === PokemonType.NORMAL),
     new Ability(Abilities.GOOEY, 6)
       .attr(PostDefendStatStageChangeAbAttr, (target, user, move) => move.hasFlag(MoveFlags.MAKES_CONTACT), Stat.SPD, -1, false),
     new Ability(Abilities.AERILATE, 6)
-      .attr(MoveTypeChangeAbAttr, Type.FLYING, 1.2, (user, target, move) => move.type === Type.NORMAL && !move.hasAttr(VariableMoveTypeAttr)),
+      .attr(MoveTypeChangeAbAttr, PokemonType.FLYING, 1.2, (user, target, move) => move.type === PokemonType.NORMAL),
     new Ability(Abilities.PARENTAL_BOND, 6)
       .attr(AddSecondStrikeAbAttr, 0.25),
     new Ability(Abilities.DARK_AURA, 6)
       .attr(PostSummonMessageAbAttr, (pokemon: Pokemon) => i18next.t("abilityTriggers:postSummonDarkAura", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }))
-      .attr(FieldMoveTypePowerBoostAbAttr, Type.DARK, 4 / 3),
+      .attr(FieldMoveTypePowerBoostAbAttr, PokemonType.DARK, 4 / 3),
     new Ability(Abilities.FAIRY_AURA, 6)
       .attr(PostSummonMessageAbAttr, (pokemon: Pokemon) => i18next.t("abilityTriggers:postSummonFairyAura", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }))
-      .attr(FieldMoveTypePowerBoostAbAttr, Type.FAIRY, 4 / 3),
+      .attr(FieldMoveTypePowerBoostAbAttr, PokemonType.FAIRY, 4 / 3),
     new Ability(Abilities.AURA_BREAK, 6)
       .ignorable()
-      .conditionalAttr(pokemon => globalScene.getField(true).some(p => p.hasAbility(Abilities.DARK_AURA)), FieldMoveTypePowerBoostAbAttr, Type.DARK, 9 / 16)
-      .conditionalAttr(pokemon => globalScene.getField(true).some(p => p.hasAbility(Abilities.FAIRY_AURA)), FieldMoveTypePowerBoostAbAttr, Type.FAIRY, 9 / 16)
+      .conditionalAttr(pokemon => globalScene.getField(true).some(p => p.hasAbility(Abilities.DARK_AURA)), FieldMoveTypePowerBoostAbAttr, PokemonType.DARK, 9 / 16)
+      .conditionalAttr(pokemon => globalScene.getField(true).some(p => p.hasAbility(Abilities.FAIRY_AURA)), FieldMoveTypePowerBoostAbAttr, PokemonType.FAIRY, 9 / 16)
       .conditionalAttr(pokemon => globalScene.getField(true).some(p => p.hasAbility(Abilities.DARK_AURA) || p.hasAbility(Abilities.FAIRY_AURA)),
         PostSummonMessageAbAttr, (pokemon: Pokemon) => i18next.t("abilityTriggers:postSummonAuraBreak", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) })),
     new Ability(Abilities.PRIMORDIAL_SEA, 6)
@@ -5891,7 +7072,7 @@ export function initAbilities() {
       .attr(PostDamageForceSwitchAbAttr)
       .edgeCase(), // Should not trigger when hurting itself in confusion, causes Fake Out to fail turn 1 and succeed turn 2 if pokemon is switched out before battle start via playing in Switch Mode
     new Ability(Abilities.WATER_COMPACTION, 7)
-      .attr(PostDefendStatStageChangeAbAttr, (target, user, move) => user.getMoveType(move) === Type.WATER && move.category !== MoveCategory.STATUS, Stat.DEF, 2),
+      .attr(PostDefendStatStageChangeAbAttr, (target, user, move) => user.getMoveType(move) === PokemonType.WATER && move.category !== MoveCategory.STATUS, Stat.DEF, 2),
     new Ability(Abilities.MERCILESS, 7)
       .attr(ConditionalCritAbAttr, (user, target, move) => target?.status?.effect === StatusEffect.TOXIC || target?.status?.effect === StatusEffect.POISON),
     new Ability(Abilities.SHIELDS_DOWN, 7)
@@ -5900,21 +7081,22 @@ export function initAbilities() {
       .attr(PostTurnFormChangeAbAttr, p => p.formIndex % 7 + (p.getHpRatio() <= 0.5 ? 7 : 0))
       .conditionalAttr(p => p.formIndex !== 7, StatusEffectImmunityAbAttr)
       .conditionalAttr(p => p.formIndex !== 7, BattlerTagImmunityAbAttr, BattlerTagType.DROWSY)
-      .attr(UncopiableAbilityAbAttr)
-      .attr(UnswappableAbilityAbAttr)
-      .attr(UnsuppressableAbilityAbAttr)
       .attr(NoFusionAbilityAbAttr)
       .attr(NoTransformAbilityAbAttr)
+      .uncopiable()
+      .unreplaceable()
+      .unsuppressable()
       .bypassFaint(),
     new Ability(Abilities.STAKEOUT, 7)
       .attr(MovePowerBoostAbAttr, (user, target, move) => !!target?.turnData.switchedInThisTurn, 2),
     new Ability(Abilities.WATER_BUBBLE, 7)
-      .attr(ReceivedTypeDamageMultiplierAbAttr, Type.FIRE, 0.5)
-      .attr(MoveTypePowerBoostAbAttr, Type.WATER, 2)
+      .attr(ReceivedTypeDamageMultiplierAbAttr, PokemonType.FIRE, 0.5)
+      .attr(MoveTypePowerBoostAbAttr, PokemonType.WATER, 2)
       .attr(StatusEffectImmunityAbAttr, StatusEffect.BURN)
+      .attr(PostSummonHealStatusAbAttr, StatusEffect.BURN)
       .ignorable(),
     new Ability(Abilities.STEELWORKER, 7)
-      .attr(MoveTypePowerBoostAbAttr, Type.STEEL),
+      .attr(MoveTypePowerBoostAbAttr, PokemonType.STEEL),
     new Ability(Abilities.BERSERK, 7)
       .attr(PostDefendHpGatedStatStageChangeAbAttr, (target, user, move) => move.category !== MoveCategory.STATUS, 0.5, [ Stat.SPATK ], 1)
       .condition(getSheerForceHitDisableAbCondition()),
@@ -5924,26 +7106,23 @@ export function initAbilities() {
     new Ability(Abilities.LONG_REACH, 7)
       .attr(IgnoreContactAbAttr),
     new Ability(Abilities.LIQUID_VOICE, 7)
-      .attr(MoveTypeChangeAbAttr, Type.WATER, 1, (user, target, move) => move.hasFlag(MoveFlags.SOUND_BASED)),
+      .attr(MoveTypeChangeAbAttr, PokemonType.WATER, 1, (user, target, move) => move.hasFlag(MoveFlags.SOUND_BASED)),
     new Ability(Abilities.TRIAGE, 7)
       .attr(ChangeMovePriorityAbAttr, (pokemon, move) => move.hasFlag(MoveFlags.TRIAGE_MOVE), 3),
     new Ability(Abilities.GALVANIZE, 7)
-      .attr(MoveTypeChangeAbAttr, Type.ELECTRIC, 1.2, (user, target, move) => move.type === Type.NORMAL && !move.hasAttr(VariableMoveTypeAttr)),
+      .attr(MoveTypeChangeAbAttr, PokemonType.ELECTRIC, 1.2, (_user, _target, move) => move.type === PokemonType.NORMAL),
     new Ability(Abilities.SURGE_SURFER, 7)
       .conditionalAttr(getTerrainCondition(TerrainType.ELECTRIC), StatMultiplierAbAttr, Stat.SPD, 2),
     new Ability(Abilities.SCHOOLING, 7)
       .attr(PostBattleInitFormChangeAbAttr, () => 0)
       .attr(PostSummonFormChangeAbAttr, p => p.level < 20 || p.getHpRatio() <= 0.25 ? 0 : 1)
       .attr(PostTurnFormChangeAbAttr, p => p.level < 20 || p.getHpRatio() <= 0.25 ? 0 : 1)
-      .attr(UncopiableAbilityAbAttr)
-      .attr(UnswappableAbilityAbAttr)
-      .attr(UnsuppressableAbilityAbAttr)
       .attr(NoFusionAbilityAbAttr)
+      .uncopiable()
+      .unreplaceable()
+      .unsuppressable()
       .bypassFaint(),
     new Ability(Abilities.DISGUISE, 7)
-      .attr(UncopiableAbilityAbAttr)
-      .attr(UnswappableAbilityAbAttr)
-      .attr(UnsuppressableAbilityAbAttr)
       .attr(NoTransformAbilityAbAttr)
       .attr(NoFusionAbilityAbAttr)
       // Add BattlerTagType.DISGUISE if the pokemon is in its disguised form
@@ -5951,17 +7130,20 @@ export function initAbilities() {
       .attr(FormBlockDamageAbAttr,
         (target, user, move) => !!target.getTag(BattlerTagType.DISGUISE) && target.getMoveEffectiveness(user, move) > 0, 0, BattlerTagType.DISGUISE,
         (pokemon, abilityName) => i18next.t("abilityTriggers:disguiseAvoidedDamage", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), abilityName: abilityName }),
-        (pokemon) => Utils.toDmgValue(pokemon.getMaxHp() / 8))
+        (pokemon) => toDmgValue(pokemon.getMaxHp() / 8))
       .attr(PostBattleInitFormChangeAbAttr, () => 0)
+      .uncopiable()
+      .unreplaceable()
+      .unsuppressable()
       .bypassFaint()
       .ignorable(),
     new Ability(Abilities.BATTLE_BOND, 7)
       .attr(PostVictoryFormChangeAbAttr, () => 2)
       .attr(PostBattleInitFormChangeAbAttr, () => 1)
-      .attr(UncopiableAbilityAbAttr)
-      .attr(UnswappableAbilityAbAttr)
-      .attr(UnsuppressableAbilityAbAttr)
       .attr(NoFusionAbilityAbAttr)
+      .uncopiable()
+      .unreplaceable()
+      .unsuppressable()
       .bypassFaint(),
     new Ability(Abilities.POWER_CONSTRUCT, 7)
       .conditionalAttr(pokemon => pokemon.formIndex === 2 || pokemon.formIndex === 4, PostBattleInitFormChangeAbAttr, () => 2)
@@ -5970,20 +7152,20 @@ export function initAbilities() {
       .conditionalAttr(pokemon => pokemon.formIndex === 2 || pokemon.formIndex === 4, PostTurnFormChangeAbAttr, p => p.getHpRatio() <= 0.5 || p.getFormKey() === "complete" ? 4 : 2)
       .conditionalAttr(pokemon => pokemon.formIndex === 3 || pokemon.formIndex === 5, PostSummonFormChangeAbAttr, p => p.getHpRatio() <= 0.5 || p.getFormKey() === "10-complete" ? 5 : 3)
       .conditionalAttr(pokemon => pokemon.formIndex === 3 || pokemon.formIndex === 5, PostTurnFormChangeAbAttr, p => p.getHpRatio() <= 0.5 || p.getFormKey() === "10-complete" ? 5 : 3)
-      .attr(UncopiableAbilityAbAttr)
-      .attr(UnswappableAbilityAbAttr)
-      .attr(UnsuppressableAbilityAbAttr)
       .attr(NoFusionAbilityAbAttr)
+      .uncopiable()
+      .unreplaceable()
+      .unsuppressable()
       .bypassFaint(),
     new Ability(Abilities.CORROSION, 7)
-      .attr(IgnoreTypeStatusEffectImmunityAbAttr, [ StatusEffect.POISON, StatusEffect.TOXIC ], [ Type.STEEL, Type.POISON ])
-      .edgeCase(), // Should interact correctly with magic coat/bounce (not yet implemented) + fling with toxic orb (not implemented yet)
+      .attr(IgnoreTypeStatusEffectImmunityAbAttr, [ StatusEffect.POISON, StatusEffect.TOXIC ], [ PokemonType.STEEL, PokemonType.POISON ])
+      .edgeCase(), // Should poison itself with toxic orb.
     new Ability(Abilities.COMATOSE, 7)
-      .attr(UncopiableAbilityAbAttr)
-      .attr(UnswappableAbilityAbAttr)
-      .attr(UnsuppressableAbilityAbAttr)
       .attr(StatusEffectImmunityAbAttr, ...getNonVolatileStatusEffects())
-      .attr(BattlerTagImmunityAbAttr, BattlerTagType.DROWSY),
+      .attr(BattlerTagImmunityAbAttr, BattlerTagType.DROWSY)
+      .uncopiable()
+      .unreplaceable()
+      .unsuppressable(),
     new Ability(Abilities.QUEENLY_MAJESTY, 7)
       .attr(FieldPriorityMoveImmunityAbAttr)
       .ignorable(),
@@ -5995,8 +7177,8 @@ export function initAbilities() {
     new Ability(Abilities.BATTERY, 7)
       .attr(AllyMoveCategoryPowerBoostAbAttr, [ MoveCategory.SPECIAL ], 1.3),
     new Ability(Abilities.FLUFFY, 7)
-      .attr(ReceivedMoveDamageMultiplierAbAttr, (target, user, move) => move.hasFlag(MoveFlags.MAKES_CONTACT), 0.5)
-      .attr(ReceivedMoveDamageMultiplierAbAttr, (target, user, move) => user.getMoveType(move) === Type.FIRE, 2)
+      .attr(ReceivedMoveDamageMultiplierAbAttr, (target, user, move) => move.doesFlagEffectApply({flag: MoveFlags.MAKES_CONTACT, user, target}), 0.5)
+      .attr(ReceivedMoveDamageMultiplierAbAttr, (target, user, move) => user.getMoveType(move) === PokemonType.FIRE, 2)
       .ignorable(),
     new Ability(Abilities.DAZZLING, 7)
       .attr(FieldPriorityMoveImmunityAbAttr)
@@ -6004,13 +7186,13 @@ export function initAbilities() {
     new Ability(Abilities.SOUL_HEART, 7)
       .attr(PostKnockOutStatStageChangeAbAttr, Stat.SPATK, 1),
     new Ability(Abilities.TANGLING_HAIR, 7)
-      .attr(PostDefendStatStageChangeAbAttr, (target, user, move) => move.hasFlag(MoveFlags.MAKES_CONTACT), Stat.SPD, -1, false),
+      .attr(PostDefendStatStageChangeAbAttr, (target, user, move) => move.doesFlagEffectApply({flag: MoveFlags.MAKES_CONTACT, user, target}), Stat.SPD, -1, false),
     new Ability(Abilities.RECEIVER, 7)
       .attr(CopyFaintedAllyAbilityAbAttr)
-      .attr(UncopiableAbilityAbAttr),
+      .uncopiable(),
     new Ability(Abilities.POWER_OF_ALCHEMY, 7)
       .attr(CopyFaintedAllyAbilityAbAttr)
-      .attr(UncopiableAbilityAbAttr),
+      .uncopiable(),
     new Ability(Abilities.BEAST_BOOST, 7)
       .attr(PostVictoryStatStageChangeAbAttr, p => {
         let highestStat: EffectiveStat;
@@ -6025,10 +7207,10 @@ export function initAbilities() {
         return highestStat!;
       }, 1),
     new Ability(Abilities.RKS_SYSTEM, 7)
-      .attr(UncopiableAbilityAbAttr)
-      .attr(UnswappableAbilityAbAttr)
-      .attr(UnsuppressableAbilityAbAttr)
-      .attr(NoFusionAbilityAbAttr),
+      .attr(NoFusionAbilityAbAttr)
+      .uncopiable()
+      .unreplaceable()
+      .unsuppressable(),
     new Ability(Abilities.ELECTRIC_SURGE, 7)
       .attr(PostSummonTerrainChangeAbAttr, TerrainType.ELECTRIC)
       .attr(PostBiomeChangeTerrainChangeAbAttr, TerrainType.ELECTRIC),
@@ -6055,7 +7237,7 @@ export function initAbilities() {
       .attr(PostSummonStatStageChangeAbAttr, [ Stat.DEF ], 1, true),
     new Ability(Abilities.LIBERO, 8)
       .attr(PokemonTypeChangeAbAttr),
-    //.condition((p) => !p.summonData?.abilitiesApplied.includes(Abilities.LIBERO)), //Gen 9 Implementation
+    //.condition((p) => !p.summonData.abilitiesApplied.includes(Abilities.LIBERO)), //Gen 9 Implementation
     new Ability(Abilities.BALL_FETCH, 8)
       .attr(FetchBallAbAttr)
       .condition(getOncePerBattleCondition(Abilities.BALL_FETCH)),
@@ -6065,8 +7247,8 @@ export function initAbilities() {
     new Ability(Abilities.PROPELLER_TAIL, 8)
       .attr(BlockRedirectAbAttr),
     new Ability(Abilities.MIRROR_ARMOR, 8)
-      .ignorable()
-      .unimplemented(),
+      .attr(ReflectStatStageChangeAbAttr)
+      .ignorable(),
     /**
      * Right now, the logic is attached to Surf and Dive moves. Ideally, the post-defend/hit should be an
      * ability attribute but the current implementation of move effects for BattlerTag does not support this- in the case
@@ -6074,11 +7256,11 @@ export function initAbilities() {
      * @see {@linkcode GulpMissileTagAttr} and {@linkcode GulpMissileTag} for Gulp Missile implementation
      */
     new Ability(Abilities.GULP_MISSILE, 8)
-      .attr(UnsuppressableAbilityAbAttr)
       .attr(NoTransformAbilityAbAttr)
       .attr(NoFusionAbilityAbAttr)
-      .attr(UncopiableAbilityAbAttr)
-      .attr(UnswappableAbilityAbAttr)
+      .unsuppressable()
+      .uncopiable()
+      .unreplaceable()
       .bypassFaint(),
     new Ability(Abilities.STALWART, 8)
       .attr(BlockRedirectAbAttr),
@@ -6086,23 +7268,21 @@ export function initAbilities() {
       .attr(PostDefendStatStageChangeAbAttr, (target, user, move) => {
         const moveType = user.getMoveType(move);
         return move.category !== MoveCategory.STATUS
-          && (moveType === Type.FIRE || moveType === Type.WATER);
+          && (moveType === PokemonType.FIRE || moveType === PokemonType.WATER);
       }, Stat.SPD, 6),
     new Ability(Abilities.PUNK_ROCK, 8)
       .attr(MovePowerBoostAbAttr, (user, target, move) => move.hasFlag(MoveFlags.SOUND_BASED), 1.3)
       .attr(ReceivedMoveDamageMultiplierAbAttr, (target, user, move) => move.hasFlag(MoveFlags.SOUND_BASED), 0.5)
       .ignorable(),
     new Ability(Abilities.SAND_SPIT, 8)
-      .attr(PostDefendWeatherChangeAbAttr, WeatherType.SANDSTORM, (target, user, move) => move.category !== MoveCategory.STATUS),
+      .attr(PostDefendWeatherChangeAbAttr, WeatherType.SANDSTORM, (target, user, move) => move.category !== MoveCategory.STATUS)
+      .bypassFaint(),
     new Ability(Abilities.ICE_SCALES, 8)
       .attr(ReceivedMoveDamageMultiplierAbAttr, (target, user, move) => move.category === MoveCategory.SPECIAL, 0.5)
       .ignorable(),
     new Ability(Abilities.RIPEN, 8)
       .attr(DoubleBerryEffectAbAttr),
     new Ability(Abilities.ICE_FACE, 8)
-      .attr(UncopiableAbilityAbAttr)
-      .attr(UnswappableAbilityAbAttr)
-      .attr(UnsuppressableAbilityAbAttr)
       .attr(NoTransformAbilityAbAttr)
       .attr(NoFusionAbilityAbAttr)
       // Add BattlerTagType.ICE_FACE if the pokemon is in ice face form
@@ -6115,6 +7295,9 @@ export function initAbilities() {
         (target, user, move) => move.category === MoveCategory.PHYSICAL && !!target.getTag(BattlerTagType.ICE_FACE), 0, BattlerTagType.ICE_FACE,
         (pokemon, abilityName) => i18next.t("abilityTriggers:iceFaceAvoidedDamage", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), abilityName: abilityName }))
       .attr(PostBattleInitFormChangeAbAttr, () => 0)
+      .uncopiable()
+      .unreplaceable()
+      .unsuppressable()
       .bypassFaint()
       .ignorable(),
     new Ability(Abilities.POWER_SPOT, 8)
@@ -6124,9 +7307,10 @@ export function initAbilities() {
     new Ability(Abilities.SCREEN_CLEANER, 8)
       .attr(PostSummonRemoveArenaTagAbAttr, [ ArenaTagType.AURORA_VEIL, ArenaTagType.LIGHT_SCREEN, ArenaTagType.REFLECT ]),
     new Ability(Abilities.STEELY_SPIRIT, 8)
-      .attr(UserFieldMoveTypePowerBoostAbAttr, Type.STEEL),
+      .attr(UserFieldMoveTypePowerBoostAbAttr, PokemonType.STEEL),
     new Ability(Abilities.PERISH_BODY, 8)
-      .attr(PostDefendPerishSongAbAttr, 4),
+      .attr(PostDefendPerishSongAbAttr, 4)
+      .bypassFaint(),
     new Ability(Abilities.WANDERING_SPIRIT, 8)
       .attr(PostDefendAbilitySwapAbAttr)
       .bypassFaint()
@@ -6134,12 +7318,11 @@ export function initAbilities() {
     new Ability(Abilities.GORILLA_TACTICS, 8)
       .attr(GorillaTacticsAbAttr),
     new Ability(Abilities.NEUTRALIZING_GAS, 8)
-      .attr(SuppressFieldAbilitiesAbAttr)
-      .attr(UncopiableAbilityAbAttr)
-      .attr(UnswappableAbilityAbAttr)
+      .attr(PostSummonAddArenaTagAbAttr, true, ArenaTagType.NEUTRALIZING_GAS, 0)
+      .attr(PreLeaveFieldRemoveSuppressAbilitiesSourceAbAttr)
+      .uncopiable()
       .attr(NoTransformAbilityAbAttr)
-      .attr(PostSummonMessageAbAttr, (pokemon: Pokemon) => i18next.t("abilityTriggers:postSummonNeutralizingGas", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }))
-      .partial(), // A bunch of weird interactions with other abilities being suppressed then unsuppressed
+      .bypassFaint(),
     new Ability(Abilities.PASTEL_VEIL, 8)
       .attr(PostSummonUserFieldRemoveStatusEffectAbAttr, StatusEffect.POISON, StatusEffect.TOXIC)
       .attr(UserFieldStatusEffectImmunityAbAttr, StatusEffect.POISON, StatusEffect.TOXIC)
@@ -6147,11 +7330,11 @@ export function initAbilities() {
     new Ability(Abilities.HUNGER_SWITCH, 8)
       .attr(PostTurnFormChangeAbAttr, p => p.getFormKey() ? 0 : 1)
       .attr(PostTurnFormChangeAbAttr, p => p.getFormKey() ? 1 : 0)
-      .attr(UncopiableAbilityAbAttr)
-      .attr(UnswappableAbilityAbAttr)
       .attr(NoTransformAbilityAbAttr)
       .attr(NoFusionAbilityAbAttr)
-      .condition((pokemon) => !pokemon.isTerastallized()),
+      .condition((pokemon) => !pokemon.isTerastallized)
+      .uncopiable()
+      .unreplaceable(),
     new Ability(Abilities.QUICK_DRAW, 8)
       .attr(BypassSpeedChanceAbAttr, 30),
     new Ability(Abilities.UNSEEN_FIST, 8)
@@ -6159,9 +7342,9 @@ export function initAbilities() {
     new Ability(Abilities.CURIOUS_MEDICINE, 8)
       .attr(PostSummonClearAllyStatStagesAbAttr),
     new Ability(Abilities.TRANSISTOR, 8)
-      .attr(MoveTypePowerBoostAbAttr, Type.ELECTRIC),
+      .attr(MoveTypePowerBoostAbAttr, PokemonType.ELECTRIC, 1.3),
     new Ability(Abilities.DRAGONS_MAW, 8)
-      .attr(MoveTypePowerBoostAbAttr, Type.DRAGON),
+      .attr(MoveTypePowerBoostAbAttr, PokemonType.DRAGON),
     new Ability(Abilities.CHILLING_NEIGH, 8)
       .attr(PostVictoryStatStageChangeAbAttr, Stat.ATK, 1),
     new Ability(Abilities.GRIM_NEIGH, 8)
@@ -6170,24 +7353,26 @@ export function initAbilities() {
       .attr(PostSummonMessageAbAttr, (pokemon: Pokemon) => i18next.t("abilityTriggers:postSummonAsOneGlastrier", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }))
       .attr(PreventBerryUseAbAttr)
       .attr(PostVictoryStatStageChangeAbAttr, Stat.ATK, 1)
-      .attr(UncopiableAbilityAbAttr)
-      .attr(UnswappableAbilityAbAttr)
-      .attr(UnsuppressableAbilityAbAttr),
+      .uncopiable()
+      .unreplaceable()
+      .unsuppressable(),
     new Ability(Abilities.AS_ONE_SPECTRIER, 8)
       .attr(PostSummonMessageAbAttr, (pokemon: Pokemon) => i18next.t("abilityTriggers:postSummonAsOneSpectrier", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }))
       .attr(PreventBerryUseAbAttr)
       .attr(PostVictoryStatStageChangeAbAttr, Stat.SPATK, 1)
-      .attr(UncopiableAbilityAbAttr)
-      .attr(UnswappableAbilityAbAttr)
-      .attr(UnsuppressableAbilityAbAttr),
+      .uncopiable()
+      .unreplaceable()
+      .unsuppressable(),
     new Ability(Abilities.LINGERING_AROMA, 9)
       .attr(PostDefendAbilityGiveAbAttr, Abilities.LINGERING_AROMA)
       .bypassFaint(),
     new Ability(Abilities.SEED_SOWER, 9)
-      .attr(PostDefendTerrainChangeAbAttr, TerrainType.GRASSY),
+      .attr(PostDefendTerrainChangeAbAttr, TerrainType.GRASSY)
+      .bypassFaint(),
     new Ability(Abilities.THERMAL_EXCHANGE, 9)
-      .attr(PostDefendStatStageChangeAbAttr, (target, user, move) => user.getMoveType(move) === Type.FIRE && move.category !== MoveCategory.STATUS, Stat.ATK, 1)
+      .attr(PostDefendStatStageChangeAbAttr, (target, user, move) => user.getMoveType(move) === PokemonType.FIRE && move.category !== MoveCategory.STATUS, Stat.ATK, 1)
       .attr(StatusEffectImmunityAbAttr, StatusEffect.BURN)
+      .attr(PostSummonHealStatusAbAttr, StatusEffect.BURN)
       .ignorable(),
     new Ability(Abilities.ANGER_SHELL, 9)
       .attr(PostDefendHpGatedStatStageChangeAbAttr, (target, user, move) => move.category !== MoveCategory.STATUS, 0.5, [ Stat.ATK, Stat.SPATK, Stat.SPD ], 1)
@@ -6195,10 +7380,10 @@ export function initAbilities() {
       .condition(getSheerForceHitDisableAbCondition()),
     new Ability(Abilities.PURIFYING_SALT, 9)
       .attr(StatusEffectImmunityAbAttr)
-      .attr(ReceivedTypeDamageMultiplierAbAttr, Type.GHOST, 0.5)
+      .attr(ReceivedTypeDamageMultiplierAbAttr, PokemonType.GHOST, 0.5)
       .ignorable(),
     new Ability(Abilities.WELL_BAKED_BODY, 9)
-      .attr(TypeImmunityStatStageChangeAbAttr, Type.FIRE, Stat.DEF, 2)
+      .attr(TypeImmunityStatStageChangeAbAttr, PokemonType.FIRE, Stat.DEF, 2)
       .ignorable(),
     new Ability(Abilities.WIND_RIDER, 9)
       .attr(MoveImmunityStatStageChangeAbAttr, (pokemon, attacker, move) => pokemon !== attacker && move.hasFlag(MoveFlags.WIND_MOVE) && move.category !== MoveCategory.STATUS, Stat.ATK, 1)
@@ -6209,13 +7394,13 @@ export function initAbilities() {
       .attr(ForceSwitchOutImmunityAbAttr)
       .ignorable(),
     new Ability(Abilities.ROCKY_PAYLOAD, 9)
-      .attr(MoveTypePowerBoostAbAttr, Type.ROCK),
+      .attr(MoveTypePowerBoostAbAttr, PokemonType.ROCK),
     new Ability(Abilities.WIND_POWER, 9)
       .attr(PostDefendApplyBattlerTagAbAttr, (target, user, move) => move.hasFlag(MoveFlags.WIND_MOVE), BattlerTagType.CHARGED),
     new Ability(Abilities.ZERO_TO_HERO, 9)
-      .attr(UncopiableAbilityAbAttr)
-      .attr(UnswappableAbilityAbAttr)
-      .attr(UnsuppressableAbilityAbAttr)
+      .uncopiable()
+      .unreplaceable()
+      .unsuppressable()
       .attr(NoTransformAbilityAbAttr)
       .attr(NoFusionAbilityAbAttr)
       .attr(PostBattleInitFormChangeAbAttr, () => 0)
@@ -6224,25 +7409,21 @@ export function initAbilities() {
     new Ability(Abilities.COMMANDER, 9)
       .attr(CommanderAbAttr)
       .attr(DoubleBattleChanceAbAttr)
-      .attr(UncopiableAbilityAbAttr)
-      .attr(UnswappableAbilityAbAttr)
+      .uncopiable()
+      .unreplaceable()
       .edgeCase(), // Encore, Frenzy, and other non-`TURN_END` tags don't lapse correctly on the commanding Pokemon.
     new Ability(Abilities.ELECTROMORPHOSIS, 9)
       .attr(PostDefendApplyBattlerTagAbAttr, (target, user, move) => move.category !== MoveCategory.STATUS, BattlerTagType.CHARGED),
     new Ability(Abilities.PROTOSYNTHESIS, 9)
       .conditionalAttr(getWeatherCondition(WeatherType.SUNNY, WeatherType.HARSH_SUN), PostSummonAddBattlerTagAbAttr, BattlerTagType.PROTOSYNTHESIS, 0, true)
       .attr(PostWeatherChangeAddBattlerTagAttr, BattlerTagType.PROTOSYNTHESIS, 0, WeatherType.SUNNY, WeatherType.HARSH_SUN)
-      .attr(UncopiableAbilityAbAttr)
-      .attr(UnswappableAbilityAbAttr)
-      .attr(NoTransformAbilityAbAttr)
-      .partial(), // While setting the tag, the getbattlestat should ignore all modifiers to stats except stat stages
+      .uncopiable()
+      .attr(NoTransformAbilityAbAttr),
     new Ability(Abilities.QUARK_DRIVE, 9)
       .conditionalAttr(getTerrainCondition(TerrainType.ELECTRIC), PostSummonAddBattlerTagAbAttr, BattlerTagType.QUARK_DRIVE, 0, true)
       .attr(PostTerrainChangeAddBattlerTagAttr, BattlerTagType.QUARK_DRIVE, 0, TerrainType.ELECTRIC)
-      .attr(UncopiableAbilityAbAttr)
-      .attr(UnswappableAbilityAbAttr)
-      .attr(NoTransformAbilityAbAttr)
-      .partial(), // While setting the tag, the getbattlestat should ignore all modifiers to stats except stat stages
+      .uncopiable()
+      .attr(NoTransformAbilityAbAttr),
     new Ability(Abilities.GOOD_AS_GOLD, 9)
       .attr(MoveImmunityAbAttr, (pokemon, attacker, move) => pokemon !== attacker && move.category === MoveCategory.STATUS && ![ MoveTarget.ENEMY_SIDE, MoveTarget.BOTH_SIDES, MoveTarget.USER_SIDE ].includes(move.moveTarget))
       .ignorable(),
@@ -6271,12 +7452,12 @@ export function initAbilities() {
     new Ability(Abilities.OPPORTUNIST, 9)
       .attr(StatStageChangeCopyAbAttr),
     new Ability(Abilities.CUD_CHEW, 9)
-      .unimplemented(),
+      .attr(RepeatBerryNextTurnAbAttr),
     new Ability(Abilities.SHARPNESS, 9)
       .attr(MovePowerBoostAbAttr, (user, target, move) => move.hasFlag(MoveFlags.SLICING_MOVE), 1.5),
     new Ability(Abilities.SUPREME_OVERLORD, 9)
-      .attr(VariableMovePowerBoostAbAttr, (user, target, move) => 1 + 0.1 * Math.min(user.isPlayer() ? globalScene.currentBattle.playerFaints : globalScene.currentBattle.enemyFaints, 5))
-      .partial(), // Counter resets every wave instead of on arena reset
+      .attr(VariableMovePowerBoostAbAttr, (user, target, move) => 1 + 0.1 * Math.min(user.isPlayer() ? globalScene.arena.playerFaints : globalScene.currentBattle.enemyFaints, 5))
+      .partial(), // Should only boost once, on summon
     new Ability(Abilities.COSTAR, 9)
       .attr(PostSummonCopyAllyStatsAbAttr),
     new Ability(Abilities.TOXIC_DEBRIS, 9)
@@ -6286,14 +7467,14 @@ export function initAbilities() {
       .attr(FieldPriorityMoveImmunityAbAttr)
       .ignorable(),
     new Ability(Abilities.EARTH_EATER, 9)
-      .attr(TypeImmunityHealAbAttr, Type.GROUND)
+      .attr(TypeImmunityHealAbAttr, PokemonType.GROUND)
       .ignorable(),
     new Ability(Abilities.MYCELIUM_MIGHT, 9)
       .attr(ChangeMovePriorityAbAttr, (pokemon, move) => move.category === MoveCategory.STATUS, -0.2)
       .attr(PreventBypassSpeedChanceAbAttr, (pokemon, move) => move.category === MoveCategory.STATUS)
       .attr(MoveAbilityBypassAbAttr, (pokemon, move: Move) => move.category === MoveCategory.STATUS),
     new Ability(Abilities.MINDS_EYE, 9)
-      .attr(IgnoreTypeImmunityAbAttr, Type.GHOST, [ Type.NORMAL, Type.FIGHTING ])
+      .attr(IgnoreTypeImmunityAbAttr, PokemonType.GHOST, [ PokemonType.NORMAL, PokemonType.FIGHTING ])
       .attr(ProtectStatAbAttr, Stat.ACC)
       .attr(IgnoreOpponentStatStagesAbAttr, [ Stat.EVA ])
       .ignorable(),
@@ -6304,48 +7485,46 @@ export function initAbilities() {
     new Ability(Abilities.TOXIC_CHAIN, 9)
       .attr(PostAttackApplyStatusEffectAbAttr, false, 30, StatusEffect.TOXIC),
     new Ability(Abilities.EMBODY_ASPECT_TEAL, 9)
-      .attr(PostBattleInitStatStageChangeAbAttr, [ Stat.SPD ], 1, true)
-      .attr(UncopiableAbilityAbAttr)
-      .attr(UnswappableAbilityAbAttr)
-      .attr(NoTransformAbilityAbAttr)
-      .partial(), // Ogerpon tera interactions
+      .attr(PostTeraFormChangeStatChangeAbAttr, [ Stat.SPD ], 1)
+      .uncopiable()
+      .unreplaceable() // TODO is this true?
+      .attr(NoTransformAbilityAbAttr),
     new Ability(Abilities.EMBODY_ASPECT_WELLSPRING, 9)
-      .attr(PostBattleInitStatStageChangeAbAttr, [ Stat.SPDEF ], 1, true)
-      .attr(UncopiableAbilityAbAttr)
-      .attr(UnswappableAbilityAbAttr)
-      .attr(NoTransformAbilityAbAttr)
-      .partial(),  // Ogerpon tera interactions
+      .attr(PostTeraFormChangeStatChangeAbAttr, [ Stat.SPDEF ], 1)
+      .uncopiable()
+      .unreplaceable()
+      .attr(NoTransformAbilityAbAttr),
     new Ability(Abilities.EMBODY_ASPECT_HEARTHFLAME, 9)
-      .attr(PostBattleInitStatStageChangeAbAttr, [ Stat.ATK ], 1, true)
-      .attr(UncopiableAbilityAbAttr)
-      .attr(UnswappableAbilityAbAttr)
-      .attr(NoTransformAbilityAbAttr)
-      .partial(),  // Ogerpon tera interactions
+      .attr(PostTeraFormChangeStatChangeAbAttr, [ Stat.ATK ], 1)
+      .uncopiable()
+      .unreplaceable()
+      .attr(NoTransformAbilityAbAttr),
     new Ability(Abilities.EMBODY_ASPECT_CORNERSTONE, 9)
-      .attr(PostBattleInitStatStageChangeAbAttr, [ Stat.DEF ], 1, true)
-      .attr(UncopiableAbilityAbAttr)
-      .attr(UnswappableAbilityAbAttr)
-      .attr(NoTransformAbilityAbAttr)
-      .partial(),  // Ogerpon tera interactions
+      .attr(PostTeraFormChangeStatChangeAbAttr, [ Stat.DEF ], 1)
+      .uncopiable()
+      .unreplaceable()
+      .attr(NoTransformAbilityAbAttr),
     new Ability(Abilities.TERA_SHIFT, 9)
       .attr(PostSummonFormChangeAbAttr, p => p.getFormKey() ? 0 : 1)
-      .attr(UncopiableAbilityAbAttr)
-      .attr(UnswappableAbilityAbAttr)
-      .attr(UnsuppressableAbilityAbAttr)
+      .uncopiable()
+      .unreplaceable()
+      .unsuppressable()
       .attr(NoTransformAbilityAbAttr)
       .attr(NoFusionAbilityAbAttr),
     new Ability(Abilities.TERA_SHELL, 9)
       .attr(FullHpResistTypeAbAttr)
-      .attr(UncopiableAbilityAbAttr)
-      .attr(UnswappableAbilityAbAttr)
+      .uncopiable()
+      .unreplaceable()
       .ignorable(),
     new Ability(Abilities.TERAFORM_ZERO, 9)
-      .attr(UncopiableAbilityAbAttr)
-      .attr(UnswappableAbilityAbAttr)
-      .unimplemented(),
+      .attr(ClearWeatherAbAttr, [ WeatherType.SUNNY, WeatherType.RAIN, WeatherType.SANDSTORM, WeatherType.HAIL, WeatherType.SNOW, WeatherType.FOG, WeatherType.HEAVY_RAIN, WeatherType.HARSH_SUN, WeatherType.STRONG_WINDS ])
+      .attr(ClearTerrainAbAttr, [ TerrainType.MISTY, TerrainType.ELECTRIC, TerrainType.GRASSY, TerrainType.PSYCHIC ])
+      .uncopiable()
+      .unreplaceable()
+      .condition(getOncePerBattleCondition(Abilities.TERAFORM_ZERO)),
     new Ability(Abilities.POISON_PUPPETEER, 9)
-      .attr(UncopiableAbilityAbAttr)
-      .attr(UnswappableAbilityAbAttr)
+      .uncopiable()
+      .unreplaceable() // TODO is this true?
       .attr(ConfusionOnStatusEffectAbAttr, StatusEffect.POISON, StatusEffect.TOXIC)
   );
 }
diff --git a/src/data/arena-tag.ts b/src/data/arena-tag.ts
index 816de3e824c..19c94a8a045 100644
--- a/src/data/arena-tag.ts
+++ b/src/data/arena-tag.ts
@@ -1,14 +1,24 @@
 import { globalScene } from "#app/global-scene";
 import type { Arena } from "#app/field/arena";
-import { Type } from "#enums/type";
-import { BooleanHolder, NumberHolder, toDmgValue } from "#app/utils";
-import { MoveCategory, allMoves, MoveTarget } from "#app/data/move";
+import { PokemonType } from "#enums/pokemon-type";
+import { BooleanHolder, NumberHolder, toDmgValue } from "#app/utils/common";
+import { allMoves } from "#app/data/moves/move";
+import { MoveTarget } from "#enums/MoveTarget";
+import { MoveCategory } from "#enums/MoveCategory";
 import { getPokemonNameWithAffix } from "#app/messages";
 import type Pokemon from "#app/field/pokemon";
-import { HitResult, PokemonMove } from "#app/field/pokemon";
+import { HitResult } from "#app/field/pokemon";
 import { StatusEffect } from "#enums/status-effect";
 import type { BattlerIndex } from "#app/battle";
-import { BlockNonDirectDamageAbAttr, InfiltratorAbAttr, ProtectStatAbAttr, applyAbAttrs } from "#app/data/ability";
+import {
+  BlockNonDirectDamageAbAttr,
+  InfiltratorAbAttr,
+  PreLeaveFieldRemoveSuppressAbilitiesSourceAbAttr,
+  ProtectStatAbAttr,
+  applyAbAttrs,
+  applyOnGainAbAttrs,
+  applyOnLoseAbAttrs,
+} from "#app/data/abilities/ability";
 import { Stat } from "#enums/stat";
 import { CommonAnim, CommonBattleAnim } from "#app/data/battle-anims";
 import i18next from "i18next";
@@ -18,14 +28,13 @@ import { BattlerTagType } from "#enums/battler-tag-type";
 import { Moves } from "#enums/moves";
 import { MoveEffectPhase } from "#app/phases/move-effect-phase";
 import { PokemonHealPhase } from "#app/phases/pokemon-heal-phase";
-import { ShowAbilityPhase } from "#app/phases/show-ability-phase";
 import { StatStageChangePhase } from "#app/phases/stat-stage-change-phase";
 import { CommonAnimPhase } from "#app/phases/common-anim-phase";
 
 export enum ArenaTagSide {
   BOTH,
   PLAYER,
-  ENEMY
+  ENEMY,
 }
 
 export abstract class ArenaTag {
@@ -34,31 +43,34 @@ export abstract class ArenaTag {
     public turnCount: number,
     public sourceMove?: Moves,
     public sourceId?: number,
-    public side: ArenaTagSide = ArenaTagSide.BOTH
+    public side: ArenaTagSide = ArenaTagSide.BOTH,
   ) {}
 
-  apply(arena: Arena, simulated: boolean, ...args: unknown[]): boolean {
+  apply(_arena: Arena, _simulated: boolean, ..._args: unknown[]): boolean {
     return true;
   }
 
-  onAdd(arena: Arena, quiet: boolean = false): void { }
+  onAdd(_arena: Arena, _quiet = false): void {}
 
-  onRemove(arena: Arena, quiet: boolean = false): void {
+  onRemove(_arena: Arena, quiet = false): void {
     if (!quiet) {
-      globalScene.queueMessage(i18next.t(`arenaTag:arenaOnRemove${this.side === ArenaTagSide.PLAYER ? "Player" : this.side === ArenaTagSide.ENEMY ? "Enemy" : ""}`, { moveName: this.getMoveName() }));
+      globalScene.queueMessage(
+        i18next.t(
+          `arenaTag:arenaOnRemove${this.side === ArenaTagSide.PLAYER ? "Player" : this.side === ArenaTagSide.ENEMY ? "Enemy" : ""}`,
+          { moveName: this.getMoveName() },
+        ),
+      );
     }
   }
 
-  onOverlap(arena: Arena): void { }
+  onOverlap(_arena: Arena, _source: Pokemon | null): void {}
 
-  lapse(arena: Arena): boolean {
-    return this.turnCount < 1 || !!(--this.turnCount);
+  lapse(_arena: Arena): boolean {
+    return this.turnCount < 1 || !!--this.turnCount;
   }
 
   getMoveName(): string | null {
-    return this.sourceMove
-      ? allMoves[this.sourceMove].name
-      : null;
+    return this.sourceMove ? allMoves[this.sourceMove].name : null;
   }
 
   /**
@@ -66,7 +78,7 @@ export abstract class ArenaTag {
    * This is meant to be inherited from by any arena tag with custom attributes
    * @param {ArenaTag | any} source An arena tag
    */
-  loadTag(source : ArenaTag | any) : void {
+  loadTag(source: ArenaTag | any): void {
     this.turnCount = source.turnCount;
     this.sourceMove = source.sourceMove;
     this.sourceId = source.sourceId;
@@ -107,14 +119,18 @@ export class MistTag extends ArenaTag {
     super(ArenaTagType.MIST, turnCount, Moves.MIST, sourceId, side);
   }
 
-  onAdd(arena: Arena, quiet: boolean = false): void {
+  onAdd(arena: Arena, quiet = false): void {
     super.onAdd(arena);
 
     if (this.sourceId) {
       const source = globalScene.getPokemonById(this.sourceId);
 
       if (!quiet && source) {
-        globalScene.queueMessage(i18next.t("arenaTag:mistOnAdd", { pokemonNameWithAffix: getPokemonNameWithAffix(source) }));
+        globalScene.queueMessage(
+          i18next.t("arenaTag:mistOnAdd", {
+            pokemonNameWithAffix: getPokemonNameWithAffix(source),
+          }),
+        );
       } else if (!quiet) {
         console.warn("Failed to get source for MistTag onAdd");
       }
@@ -123,14 +139,14 @@ export class MistTag extends ArenaTag {
 
   /**
    * Cancels the lowering of stats
-   * @param arena the {@linkcode Arena} containing this effect
+   * @param _arena the {@linkcode Arena} containing this effect
    * @param simulated `true` if the effect should be applied quietly
    * @param attacker the {@linkcode Pokemon} using a move into this effect.
    * @param cancelled a {@linkcode BooleanHolder} whose value is set to `true`
    * to flag the stat reduction as cancelled
    * @returns `true` if a stat reduction was cancelled; `false` otherwise
    */
-  override apply(arena: Arena, simulated: boolean, attacker: Pokemon, cancelled: BooleanHolder): boolean {
+  override apply(_arena: Arena, simulated: boolean, attacker: Pokemon, cancelled: BooleanHolder): boolean {
     // `StatStageChangePhase` currently doesn't have a reference to the source of stat drops,
     // so this code currently has no effect on gameplay.
     if (attacker) {
@@ -169,7 +185,14 @@ export class WeakenMoveScreenTag extends ArenaTag {
    * @param side - The side (player or enemy) the tag affects.
    * @param weakenedCategories - The categories of moves that are weakened by this tag.
    */
-  constructor(tagType: ArenaTagType, turnCount: number, sourceMove: Moves, sourceId: number, side: ArenaTagSide, weakenedCategories: MoveCategory[]) {
+  constructor(
+    tagType: ArenaTagType,
+    turnCount: number,
+    sourceMove: Moves,
+    sourceId: number,
+    side: ArenaTagSide,
+    weakenedCategories: MoveCategory[],
+  ) {
     super(tagType, turnCount, sourceMove, sourceId, side);
 
     this.weakenedCategories = weakenedCategories;
@@ -178,14 +201,20 @@ export class WeakenMoveScreenTag extends ArenaTag {
   /**
    * Applies the weakening effect to the move.
    *
-   * @param arena the {@linkcode Arena} where the move is applied.
-   * @param simulated n/a
+   * @param _arena the {@linkcode Arena} where the move is applied.
+   * @param _simulated n/a
    * @param attacker the attacking {@linkcode Pokemon}
    * @param moveCategory the attacking move's {@linkcode MoveCategory}.
    * @param damageMultiplier A {@linkcode NumberHolder} containing the damage multiplier
    * @returns `true` if the attacking move was weakened; `false` otherwise.
    */
-  override apply(arena: Arena, simulated: boolean, attacker: Pokemon, moveCategory: MoveCategory, damageMultiplier: NumberHolder): boolean {
+  override apply(
+    _arena: Arena,
+    _simulated: boolean,
+    attacker: Pokemon,
+    moveCategory: MoveCategory,
+    damageMultiplier: NumberHolder,
+  ): boolean {
     if (this.weakenedCategories.includes(moveCategory)) {
       const bypassed = new BooleanHolder(false);
       applyAbAttrs(InfiltratorAbAttr, attacker, null, false, bypassed);
@@ -205,12 +234,16 @@ export class WeakenMoveScreenTag extends ArenaTag {
  */
 class ReflectTag extends WeakenMoveScreenTag {
   constructor(turnCount: number, sourceId: number, side: ArenaTagSide) {
-    super(ArenaTagType.REFLECT, turnCount, Moves.REFLECT, sourceId, side, [ MoveCategory.PHYSICAL ]);
+    super(ArenaTagType.REFLECT, turnCount, Moves.REFLECT, sourceId, side, [MoveCategory.PHYSICAL]);
   }
 
-  onAdd(arena: Arena, quiet: boolean = false): void {
+  onAdd(_arena: Arena, quiet = false): void {
     if (!quiet) {
-      globalScene.queueMessage(i18next.t(`arenaTag:reflectOnAdd${this.side === ArenaTagSide.PLAYER ? "Player" : this.side === ArenaTagSide.ENEMY ? "Enemy" : ""}`));
+      globalScene.queueMessage(
+        i18next.t(
+          `arenaTag:reflectOnAdd${this.side === ArenaTagSide.PLAYER ? "Player" : this.side === ArenaTagSide.ENEMY ? "Enemy" : ""}`,
+        ),
+      );
     }
   }
 }
@@ -221,12 +254,16 @@ class ReflectTag extends WeakenMoveScreenTag {
  */
 class LightScreenTag extends WeakenMoveScreenTag {
   constructor(turnCount: number, sourceId: number, side: ArenaTagSide) {
-    super(ArenaTagType.LIGHT_SCREEN, turnCount, Moves.LIGHT_SCREEN, sourceId, side, [ MoveCategory.SPECIAL ]);
+    super(ArenaTagType.LIGHT_SCREEN, turnCount, Moves.LIGHT_SCREEN, sourceId, side, [MoveCategory.SPECIAL]);
   }
 
-  onAdd(arena: Arena, quiet: boolean = false): void {
+  onAdd(_arena: Arena, quiet = false): void {
     if (!quiet) {
-      globalScene.queueMessage(i18next.t(`arenaTag:lightScreenOnAdd${this.side === ArenaTagSide.PLAYER ? "Player" : this.side === ArenaTagSide.ENEMY ? "Enemy" : ""}`));
+      globalScene.queueMessage(
+        i18next.t(
+          `arenaTag:lightScreenOnAdd${this.side === ArenaTagSide.PLAYER ? "Player" : this.side === ArenaTagSide.ENEMY ? "Enemy" : ""}`,
+        ),
+      );
     }
   }
 }
@@ -237,12 +274,19 @@ class LightScreenTag extends WeakenMoveScreenTag {
  */
 class AuroraVeilTag extends WeakenMoveScreenTag {
   constructor(turnCount: number, sourceId: number, side: ArenaTagSide) {
-    super(ArenaTagType.AURORA_VEIL, turnCount, Moves.AURORA_VEIL, sourceId, side, [ MoveCategory.SPECIAL, MoveCategory.PHYSICAL ]);
+    super(ArenaTagType.AURORA_VEIL, turnCount, Moves.AURORA_VEIL, sourceId, side, [
+      MoveCategory.SPECIAL,
+      MoveCategory.PHYSICAL,
+    ]);
   }
 
-  onAdd(arena: Arena, quiet: boolean = false): void {
+  onAdd(_arena: Arena, quiet = false): void {
     if (!quiet) {
-      globalScene.queueMessage(i18next.t(`arenaTag:auroraVeilOnAdd${this.side === ArenaTagSide.PLAYER ? "Player" : this.side === ArenaTagSide.ENEMY ? "Enemy" : ""}`));
+      globalScene.queueMessage(
+        i18next.t(
+          `arenaTag:auroraVeilOnAdd${this.side === ArenaTagSide.PLAYER ? "Player" : this.side === ArenaTagSide.ENEMY ? "Enemy" : ""}`,
+        ),
+      );
     }
   }
 }
@@ -259,19 +303,31 @@ export class ConditionalProtectTag extends ArenaTag {
   /** Does this apply to all moves, including those that ignore other forms of protection? */
   protected ignoresBypass: boolean;
 
-  constructor(tagType: ArenaTagType, sourceMove: Moves, sourceId: number, side: ArenaTagSide, condition: ProtectConditionFunc, ignoresBypass: boolean = false) {
+  constructor(
+    tagType: ArenaTagType,
+    sourceMove: Moves,
+    sourceId: number,
+    side: ArenaTagSide,
+    condition: ProtectConditionFunc,
+    ignoresBypass = false,
+  ) {
     super(tagType, 1, sourceMove, sourceId, side);
 
     this.protectConditionFunc = condition;
     this.ignoresBypass = ignoresBypass;
   }
 
-  onAdd(arena: Arena): void {
-    globalScene.queueMessage(i18next.t(`arenaTag:conditionalProtectOnAdd${this.side === ArenaTagSide.PLAYER ? "Player" : this.side === ArenaTagSide.ENEMY ? "Enemy" : ""}`, { moveName: super.getMoveName() }));
+  onAdd(_arena: Arena): void {
+    globalScene.queueMessage(
+      i18next.t(
+        `arenaTag:conditionalProtectOnAdd${this.side === ArenaTagSide.PLAYER ? "Player" : this.side === ArenaTagSide.ENEMY ? "Enemy" : ""}`,
+        { moveName: super.getMoveName() },
+      ),
+    );
   }
 
   // Removes default message for effect removal
-  onRemove(arena: Arena): void { }
+  onRemove(_arena: Arena): void {}
 
   /**
    * Checks incoming moves against the condition function
@@ -279,24 +335,32 @@ export class ConditionalProtectTag extends ArenaTag {
    * @param arena the {@linkcode Arena} containing this tag
    * @param simulated `true` if the tag is applied quietly; `false` otherwise.
    * @param isProtected a {@linkcode BooleanHolder} used to flag if the move is protected against
-   * @param attacker the attacking {@linkcode Pokemon}
+   * @param _attacker the attacking {@linkcode Pokemon}
    * @param defender the defending {@linkcode Pokemon}
    * @param moveId the {@linkcode Moves | identifier} for the move being used
    * @param ignoresProtectBypass a {@linkcode BooleanHolder} used to flag if a protection effect supercedes effects that ignore protection
    * @returns `true` if this tag protected against the attack; `false` otherwise
    */
-  override apply(arena: Arena, simulated: boolean, isProtected: BooleanHolder, attacker: Pokemon, defender: Pokemon,
-    moveId: Moves, ignoresProtectBypass: BooleanHolder): boolean {
-
-    if ((this.side === ArenaTagSide.PLAYER) === defender.isPlayer()
-        && this.protectConditionFunc(arena, moveId)) {
+  override apply(
+    arena: Arena,
+    simulated: boolean,
+    isProtected: BooleanHolder,
+    _attacker: Pokemon,
+    defender: Pokemon,
+    moveId: Moves,
+    ignoresProtectBypass: BooleanHolder,
+  ): boolean {
+    if ((this.side === ArenaTagSide.PLAYER) === defender.isPlayer() && this.protectConditionFunc(arena, moveId)) {
       if (!isProtected.value) {
         isProtected.value = true;
         if (!simulated) {
-          attacker.stopMultiHit(defender);
-
           new CommonBattleAnim(CommonAnim.PROTECT, defender).play();
-          globalScene.queueMessage(i18next.t("arenaTag:conditionalProtectApply", { moveName: super.getMoveName(), pokemonNameWithAffix: getPokemonNameWithAffix(defender) }));
+          globalScene.queueMessage(
+            i18next.t("arenaTag:conditionalProtectApply", {
+              moveName: super.getMoveName(),
+              pokemonNameWithAffix: getPokemonNameWithAffix(defender),
+            }),
+          );
         }
       }
 
@@ -310,12 +374,12 @@ export class ConditionalProtectTag extends ArenaTag {
 /**
  * Condition function for {@link https://bulbapedia.bulbagarden.net/wiki/Quick_Guard_(move) Quick Guard's}
  * protection effect.
- * @param arena {@linkcode Arena} The arena containing the protection effect
+ * @param _arena {@linkcode Arena} The arena containing the protection effect
  * @param moveId {@linkcode Moves} The move to check against this condition
  * @returns `true` if the incoming move's priority is greater than 0.
  *   This includes moves with modified priorities from abilities (e.g. Prankster)
  */
-const QuickGuardConditionFunc: ProtectConditionFunc = (arena, moveId) => {
+const QuickGuardConditionFunc: ProtectConditionFunc = (_arena, moveId) => {
   const move = allMoves[moveId];
   const effectPhase = globalScene.getCurrentPhase();
 
@@ -341,11 +405,11 @@ class QuickGuardTag extends ConditionalProtectTag {
 /**
  * Condition function for {@link https://bulbapedia.bulbagarden.net/wiki/Wide_Guard_(move) Wide Guard's}
  * protection effect.
- * @param arena {@linkcode Arena} The arena containing the protection effect
+ * @param _arena {@linkcode Arena} The arena containing the protection effect
  * @param moveId {@linkcode Moves} The move to check against this condition
  * @returns `true` if the incoming move is multi-targeted (even if it's only used against one Pokemon).
  */
-const WideGuardConditionFunc: ProtectConditionFunc = (arena, moveId) : boolean => {
+const WideGuardConditionFunc: ProtectConditionFunc = (_arena, moveId): boolean => {
   const move = allMoves[moveId];
 
   switch (move.moveTarget) {
@@ -372,11 +436,11 @@ class WideGuardTag extends ConditionalProtectTag {
 /**
  * Condition function for {@link https://bulbapedia.bulbagarden.net/wiki/Mat_Block_(move) Mat Block's}
  * protection effect.
- * @param arena {@linkcode Arena} The arena containing the protection effect.
+ * @param _arena {@linkcode Arena} The arena containing the protection effect.
  * @param moveId {@linkcode Moves} The move to check against this condition.
  * @returns `true` if the incoming move is not a Status move.
  */
-const MatBlockConditionFunc: ProtectConditionFunc = (arena, moveId) : boolean => {
+const MatBlockConditionFunc: ProtectConditionFunc = (_arena, moveId): boolean => {
   const move = allMoves[moveId];
   return move.category !== MoveCategory.STATUS;
 };
@@ -390,11 +454,15 @@ class MatBlockTag extends ConditionalProtectTag {
     super(ArenaTagType.MAT_BLOCK, Moves.MAT_BLOCK, sourceId, side, MatBlockConditionFunc);
   }
 
-  onAdd(arena: Arena) {
+  onAdd(_arena: Arena) {
     if (this.sourceId) {
       const source = globalScene.getPokemonById(this.sourceId);
       if (source) {
-        globalScene.queueMessage(i18next.t("arenaTag:matBlockOnAdd", { pokemonNameWithAffix: getPokemonNameWithAffix(source) }));
+        globalScene.queueMessage(
+          i18next.t("arenaTag:matBlockOnAdd", {
+            pokemonNameWithAffix: getPokemonNameWithAffix(source),
+          }),
+        );
       } else {
         console.warn("Failed to get source for MatBlockTag onAdd");
       }
@@ -405,24 +473,26 @@ class MatBlockTag extends ConditionalProtectTag {
 /**
  * Condition function for {@link https://bulbapedia.bulbagarden.net/wiki/Crafty_Shield_(move) Crafty Shield's}
  * protection effect.
- * @param arena {@linkcode Arena} The arena containing the protection effect
+ * @param _arena {@linkcode Arena} The arena containing the protection effect
  * @param moveId {@linkcode Moves} The move to check against this condition
  * @returns `true` if the incoming move is a Status move, is not a hazard, and does not target all
  * Pokemon or sides of the field.
  */
-const CraftyShieldConditionFunc: ProtectConditionFunc = (arena, moveId) => {
+const CraftyShieldConditionFunc: ProtectConditionFunc = (_arena, moveId) => {
   const move = allMoves[moveId];
-  return move.category === MoveCategory.STATUS
-    && move.moveTarget !== MoveTarget.ENEMY_SIDE
-    && move.moveTarget !== MoveTarget.BOTH_SIDES
-    && move.moveTarget !== MoveTarget.ALL;
+  return (
+    move.category === MoveCategory.STATUS &&
+    move.moveTarget !== MoveTarget.ENEMY_SIDE &&
+    move.moveTarget !== MoveTarget.BOTH_SIDES &&
+    move.moveTarget !== MoveTarget.ALL
+  );
 };
 
 /**
  * Arena Tag class for {@link https://bulbapedia.bulbagarden.net/wiki/Crafty_Shield_(move) Crafty Shield}
  * Condition: The incoming move is a Status move, is not a hazard, and does
  * not target all Pokemon or sides of the field.
-*/
+ */
 class CraftyShieldTag extends ConditionalProtectTag {
   constructor(sourceId: number, side: ArenaTagSide) {
     super(ArenaTagType.CRAFTY_SHIELD, Moves.CRAFTY_SHIELD, sourceId, side, CraftyShieldConditionFunc, true);
@@ -446,19 +516,23 @@ export class NoCritTag extends ArenaTag {
   }
 
   /** Queues a message upon adding this effect to the field */
-  onAdd(arena: Arena): void {
-    globalScene.queueMessage(i18next.t(`arenaTag:noCritOnAdd${this.side === ArenaTagSide.PLAYER ? "Player" : "Enemy"}`, {
-      moveName: this.getMoveName()
-    }));
+  onAdd(_arena: Arena): void {
+    globalScene.queueMessage(
+      i18next.t(`arenaTag:noCritOnAdd${this.side === ArenaTagSide.PLAYER ? "Player" : "Enemy"}`, {
+        moveName: this.getMoveName(),
+      }),
+    );
   }
 
   /** Queues a message upon removing this effect from the field */
-  onRemove(arena: Arena): void {
+  onRemove(_arena: Arena): void {
     const source = globalScene.getPokemonById(this.sourceId!); // TODO: is this bang correct?
-    globalScene.queueMessage(i18next.t("arenaTag:noCritOnRemove", {
-      pokemonNameWithAffix: getPokemonNameWithAffix(source ?? undefined),
-      moveName: this.getMoveName()
-    }));
+    globalScene.queueMessage(
+      i18next.t("arenaTag:noCritOnRemove", {
+        pokemonNameWithAffix: getPokemonNameWithAffix(source ?? undefined),
+        moveName: this.getMoveName(),
+      }),
+    );
   }
 }
 
@@ -475,12 +549,14 @@ class WishTag extends ArenaTag {
     super(ArenaTagType.WISH, turnCount, Moves.WISH, sourceId, side);
   }
 
-  onAdd(arena: Arena): void {
+  onAdd(_arena: Arena): void {
     if (this.sourceId) {
       const user = globalScene.getPokemonById(this.sourceId);
       if (user) {
         this.battlerIndex = user.getBattlerIndex();
-        this.triggerMessage = i18next.t("arenaTag:wishTagOnAdd", { pokemonNameWithAffix: getPokemonNameWithAffix(user) });
+        this.triggerMessage = i18next.t("arenaTag:wishTagOnAdd", {
+          pokemonNameWithAffix: getPokemonNameWithAffix(user),
+        });
         this.healHp = toDmgValue(user.getMaxHp() / 2);
       } else {
         console.warn("Failed to get source for WishTag onAdd");
@@ -488,7 +564,7 @@ class WishTag extends ArenaTag {
     }
   }
 
-  onRemove(arena: Arena): void {
+  onRemove(_arena: Arena): void {
     const target = globalScene.getField()[this.battlerIndex];
     if (target?.isActive(true)) {
       globalScene.queueMessage(this.triggerMessage);
@@ -501,7 +577,7 @@ class WishTag extends ArenaTag {
  * Abstract class to implement weakened moves of a specific type.
  */
 export class WeakenMoveTypeTag extends ArenaTag {
-  private weakenedType: Type;
+  private weakenedType: PokemonType;
 
   /**
    * Creates a new instance of the WeakenMoveTypeTag class.
@@ -512,7 +588,7 @@ export class WeakenMoveTypeTag extends ArenaTag {
    * @param sourceMove - The move that created the tag.
    * @param sourceId - The ID of the source of the tag.
    */
-  constructor(tagType: ArenaTagType, turnCount: number, type: Type, sourceMove: Moves, sourceId: number) {
+  constructor(tagType: ArenaTagType, turnCount: number, type: PokemonType, sourceMove: Moves, sourceId: number) {
     super(tagType, turnCount, sourceMove, sourceId);
 
     this.weakenedType = type;
@@ -520,13 +596,13 @@ export class WeakenMoveTypeTag extends ArenaTag {
 
   /**
    * Reduces an attack's power by 0.33x if it matches this tag's weakened type.
-   * @param arena n/a
-   * @param simulated n/a
-   * @param type the attack's {@linkcode Type}
+   * @param _arena n/a
+   * @param _simulated n/a
+   * @param type the attack's {@linkcode PokemonType}
    * @param power a {@linkcode NumberHolder} containing the attack's power
    * @returns `true` if the attack's power was reduced; `false` otherwise.
    */
-  override apply(arena: Arena, simulated: boolean, type: Type, power: NumberHolder): boolean {
+  override apply(_arena: Arena, _simulated: boolean, type: PokemonType, power: NumberHolder): boolean {
     if (type === this.weakenedType) {
       power.value *= 0.33;
       return true;
@@ -541,14 +617,14 @@ export class WeakenMoveTypeTag extends ArenaTag {
  */
 class MudSportTag extends WeakenMoveTypeTag {
   constructor(turnCount: number, sourceId: number) {
-    super(ArenaTagType.MUD_SPORT, turnCount, Type.ELECTRIC, Moves.MUD_SPORT, sourceId);
+    super(ArenaTagType.MUD_SPORT, turnCount, PokemonType.ELECTRIC, Moves.MUD_SPORT, sourceId);
   }
 
-  onAdd(arena: Arena): void {
+  onAdd(_arena: Arena): void {
     globalScene.queueMessage(i18next.t("arenaTag:mudSportOnAdd"));
   }
 
-  onRemove(arena: Arena): void {
+  onRemove(_arena: Arena): void {
     globalScene.queueMessage(i18next.t("arenaTag:mudSportOnRemove"));
   }
 }
@@ -559,14 +635,14 @@ class MudSportTag extends WeakenMoveTypeTag {
  */
 class WaterSportTag extends WeakenMoveTypeTag {
   constructor(turnCount: number, sourceId: number) {
-    super(ArenaTagType.WATER_SPORT, turnCount, Type.FIRE, Moves.WATER_SPORT, sourceId);
+    super(ArenaTagType.WATER_SPORT, turnCount, PokemonType.FIRE, Moves.WATER_SPORT, sourceId);
   }
 
-  onAdd(arena: Arena): void {
+  onAdd(_arena: Arena): void {
     globalScene.queueMessage(i18next.t("arenaTag:waterSportOnAdd"));
   }
 
-  onRemove(arena: Arena): void {
+  onRemove(_arena: Arena): void {
     globalScene.queueMessage(i18next.t("arenaTag:waterSportOnRemove"));
   }
 }
@@ -582,22 +658,22 @@ export class IonDelugeTag extends ArenaTag {
   }
 
   /** Queues an on-add message */
-  onAdd(arena: Arena): void {
+  onAdd(_arena: Arena): void {
     globalScene.queueMessage(i18next.t("arenaTag:plasmaFistsOnAdd"));
   }
 
-  onRemove(arena: Arena): void { } // Removes default on-remove message
+  onRemove(_arena: Arena): void {} // Removes default on-remove message
 
   /**
    * Converts Normal-type moves to Electric type
-   * @param arena n/a
-   * @param simulated n/a
-   * @param moveType a {@linkcode NumberHolder} containing a move's {@linkcode Type}
+   * @param _arena n/a
+   * @param _simulated n/a
+   * @param moveType a {@linkcode NumberHolder} containing a move's {@linkcode PokemonType}
    * @returns `true` if the given move type changed; `false` otherwise.
    */
-  override apply(arena: Arena, simulated: boolean, moveType: NumberHolder): boolean {
-    if (moveType.value === Type.NORMAL) {
-      moveType.value = Type.ELECTRIC;
+  override apply(_arena: Arena, _simulated: boolean, moveType: NumberHolder): boolean {
+    if (moveType.value === PokemonType.NORMAL) {
+      moveType.value = PokemonType.ELECTRIC;
       return true;
     }
     return false;
@@ -627,7 +703,7 @@ export class ArenaTrapTag extends ArenaTag {
     this.maxLayers = maxLayers;
   }
 
-  onOverlap(arena: Arena): void {
+  onOverlap(arena: Arena, _source: Pokemon | null): void {
     if (this.layers < this.maxLayers) {
       this.layers++;
 
@@ -637,12 +713,12 @@ export class ArenaTrapTag extends ArenaTag {
 
   /**
    * Activates the hazard effect onto a Pokemon when it enters the field
-   * @param arena the {@linkcode Arena} containing this tag
+   * @param _arena the {@linkcode Arena} containing this tag
    * @param simulated if `true`, only checks if the hazard would activate.
    * @param pokemon the {@linkcode Pokemon} triggering this hazard
    * @returns `true` if this hazard affects the given Pokemon; `false` otherwise.
    */
-  override apply(arena: Arena, simulated: boolean, pokemon: Pokemon): boolean {
+  override apply(_arena: Arena, simulated: boolean, pokemon: Pokemon): boolean {
     if ((this.side === ArenaTagSide.PLAYER) !== pokemon.isPlayer()) {
       return false;
     }
@@ -650,12 +726,14 @@ export class ArenaTrapTag extends ArenaTag {
     return this.activateTrap(pokemon, simulated);
   }
 
-  activateTrap(pokemon: Pokemon, simulated: boolean): boolean {
+  activateTrap(_pokemon: Pokemon, _simulated: boolean): boolean {
     return false;
   }
 
   getMatchupScoreMultiplier(pokemon: Pokemon): number {
-    return pokemon.isGrounded() ? 1 : Phaser.Math.Linear(0, 1 / Math.pow(2, this.layers), Math.min(pokemon.getHpRatio(), 0.5) * 2);
+    return pokemon.isGrounded()
+      ? 1
+      : Phaser.Math.Linear(0, 1 / Math.pow(2, this.layers), Math.min(pokemon.getHpRatio(), 0.5) * 2);
   }
 
   loadTag(source: any): void {
@@ -675,38 +753,42 @@ class SpikesTag extends ArenaTrapTag {
     super(ArenaTagType.SPIKES, Moves.SPIKES, sourceId, side, 3);
   }
 
-  onAdd(arena: Arena, quiet: boolean = false): void {
+  onAdd(arena: Arena, quiet = false): void {
     super.onAdd(arena);
 
     const source = this.sourceId ? globalScene.getPokemonById(this.sourceId) : null;
     if (!quiet && source) {
-      globalScene.queueMessage(i18next.t("arenaTag:spikesOnAdd", { moveName: this.getMoveName(), opponentDesc: source.getOpponentDescriptor() }));
+      globalScene.queueMessage(
+        i18next.t("arenaTag:spikesOnAdd", {
+          moveName: this.getMoveName(),
+          opponentDesc: source.getOpponentDescriptor(),
+        }),
+      );
     }
   }
 
   override activateTrap(pokemon: Pokemon, simulated: boolean): boolean {
-    if (pokemon.isGrounded()) {
-      const cancelled = new BooleanHolder(false);
-      applyAbAttrs(BlockNonDirectDamageAbAttr, pokemon, cancelled);
-
-      if (simulated) {
-        return !cancelled.value;
-      }
-
-      if (!cancelled.value) {
-        const damageHpRatio = 1 / (10 - 2 * this.layers);
-        const damage = toDmgValue(pokemon.getMaxHp() * damageHpRatio);
-
-        globalScene.queueMessage(i18next.t("arenaTag:spikesActivateTrap", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
-        pokemon.damageAndUpdate(damage, HitResult.OTHER);
-        if (pokemon.turnData) {
-          pokemon.turnData.damageTaken += damage;
-        }
-        return true;
-      }
+    if (!pokemon.isGrounded()) {
+      return false;
     }
 
-    return false;
+    const cancelled = new BooleanHolder(false);
+    applyAbAttrs(BlockNonDirectDamageAbAttr, pokemon, cancelled);
+    if (simulated || cancelled.value) {
+      return !cancelled.value;
+    }
+
+    const damageHpRatio = 1 / (10 - 2 * this.layers);
+    const damage = toDmgValue(pokemon.getMaxHp() * damageHpRatio);
+
+    globalScene.queueMessage(
+      i18next.t("arenaTag:spikesActivateTrap", {
+        pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
+      }),
+    );
+    pokemon.damageAndUpdate(damage, { result: HitResult.INDIRECT });
+    pokemon.turnData.damageTaken += damage;
+    return true;
   }
 }
 
@@ -724,12 +806,17 @@ class ToxicSpikesTag extends ArenaTrapTag {
     this.neutralized = false;
   }
 
-  onAdd(arena: Arena, quiet: boolean = false): void {
+  onAdd(arena: Arena, quiet = false): void {
     super.onAdd(arena);
 
     const source = this.sourceId ? globalScene.getPokemonById(this.sourceId) : null;
     if (!quiet && source) {
-      globalScene.queueMessage(i18next.t("arenaTag:toxicSpikesOnAdd", { moveName: this.getMoveName(), opponentDesc: source.getOpponentDescriptor() }));
+      globalScene.queueMessage(
+        i18next.t("arenaTag:toxicSpikesOnAdd", {
+          moveName: this.getMoveName(),
+          opponentDesc: source.getOpponentDescriptor(),
+        }),
+      );
     }
   }
 
@@ -744,15 +831,22 @@ class ToxicSpikesTag extends ArenaTrapTag {
       if (simulated) {
         return true;
       }
-      if (pokemon.isOfType(Type.POISON)) {
+      if (pokemon.isOfType(PokemonType.POISON)) {
         this.neutralized = true;
         if (globalScene.arena.removeTag(this.tagType)) {
-          globalScene.queueMessage(i18next.t("arenaTag:toxicSpikesActivateTrapPoison", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), moveName: this.getMoveName() }));
+          globalScene.queueMessage(
+            i18next.t("arenaTag:toxicSpikesActivateTrapPoison", {
+              pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
+              moveName: this.getMoveName(),
+            }),
+          );
           return true;
         }
       } else if (!pokemon.status) {
         const toxic = this.layers > 1;
-        if (pokemon.trySetStatus(!toxic ? StatusEffect.POISON : StatusEffect.TOXIC, true, null, 0, this.getMoveName())) {
+        if (
+          pokemon.trySetStatus(!toxic ? StatusEffect.POISON : StatusEffect.TOXIC, true, null, 0, this.getMoveName())
+        ) {
           return true;
         }
       }
@@ -765,7 +859,7 @@ class ToxicSpikesTag extends ArenaTrapTag {
     if (pokemon.isGrounded() || !pokemon.canSetStatus(StatusEffect.POISON, true)) {
       return 1;
     }
-    if (pokemon.isOfType(Type.POISON)) {
+    if (pokemon.isOfType(PokemonType.POISON)) {
       return 1.25;
     }
     return super.getMatchupScoreMultiplier(pokemon);
@@ -780,7 +874,13 @@ class ToxicSpikesTag extends ArenaTrapTag {
 export class DelayedAttackTag extends ArenaTag {
   public targetIndex: BattlerIndex;
 
-  constructor(tagType: ArenaTagType, sourceMove: Moves | undefined, sourceId: number, targetIndex: BattlerIndex, side: ArenaTagSide = ArenaTagSide.BOTH) {
+  constructor(
+    tagType: ArenaTagType,
+    sourceMove: Moves | undefined,
+    sourceId: number,
+    targetIndex: BattlerIndex,
+    side: ArenaTagSide = ArenaTagSide.BOTH,
+  ) {
     super(tagType, 3, sourceMove, sourceId, side);
 
     this.targetIndex = targetIndex;
@@ -791,13 +891,15 @@ export class DelayedAttackTag extends ArenaTag {
     const ret = super.lapse(arena);
 
     if (!ret) {
-      globalScene.unshiftPhase(new MoveEffectPhase(this.sourceId!, [ this.targetIndex ], new PokemonMove(this.sourceMove!, 0, 0, true))); // TODO: are those bangs correct?
+      globalScene.unshiftPhase(
+        new MoveEffectPhase(this.sourceId!, [this.targetIndex], allMoves[this.sourceMove!], false, true),
+      ); // TODO: are those bangs correct?
     }
 
     return ret;
   }
 
-  onRemove(arena: Arena): void { }
+  onRemove(_arena: Arena): void {}
 }
 
 /**
@@ -810,19 +912,23 @@ class StealthRockTag extends ArenaTrapTag {
     super(ArenaTagType.STEALTH_ROCK, Moves.STEALTH_ROCK, sourceId, side, 1);
   }
 
-  onAdd(arena: Arena, quiet: boolean = false): void {
+  onAdd(arena: Arena, quiet = false): void {
     super.onAdd(arena);
 
     const source = this.sourceId ? globalScene.getPokemonById(this.sourceId) : null;
     if (!quiet && source) {
-      globalScene.queueMessage(i18next.t("arenaTag:stealthRockOnAdd", { opponentDesc: source.getOpponentDescriptor() }));
+      globalScene.queueMessage(
+        i18next.t("arenaTag:stealthRockOnAdd", {
+          opponentDesc: source.getOpponentDescriptor(),
+        }),
+      );
     }
   }
 
   getDamageHpRatio(pokemon: Pokemon): number {
-    const effectiveness = pokemon.getAttackTypeEffectiveness(Type.ROCK, undefined, true);
+    const effectiveness = pokemon.getAttackTypeEffectiveness(PokemonType.ROCK, undefined, true);
 
-    let damageHpRatio: number = 0;
+    let damageHpRatio = 0;
 
     switch (effectiveness) {
       case 0:
@@ -850,28 +956,29 @@ class StealthRockTag extends ArenaTrapTag {
 
   override activateTrap(pokemon: Pokemon, simulated: boolean): boolean {
     const cancelled = new BooleanHolder(false);
-    applyAbAttrs(BlockNonDirectDamageAbAttr,  pokemon, cancelled);
-
+    applyAbAttrs(BlockNonDirectDamageAbAttr, pokemon, cancelled);
     if (cancelled.value) {
       return false;
     }
 
     const damageHpRatio = this.getDamageHpRatio(pokemon);
+    if (!damageHpRatio) {
+      return false;
+    }
 
-    if (damageHpRatio) {
-      if (simulated) {
-        return true;
-      }
-      const damage = toDmgValue(pokemon.getMaxHp() * damageHpRatio);
-      globalScene.queueMessage(i18next.t("arenaTag:stealthRockActivateTrap", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
-      pokemon.damageAndUpdate(damage, HitResult.OTHER);
-      if (pokemon.turnData) {
-        pokemon.turnData.damageTaken += damage;
-      }
+    if (simulated) {
       return true;
     }
 
-    return false;
+    const damage = toDmgValue(pokemon.getMaxHp() * damageHpRatio);
+    globalScene.queueMessage(
+      i18next.t("arenaTag:stealthRockActivateTrap", {
+        pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
+      }),
+    );
+    pokemon.damageAndUpdate(damage, { result: HitResult.INDIRECT });
+    pokemon.turnData.damageTaken += damage;
+    return true;
   }
 
   getMatchupScoreMultiplier(pokemon: Pokemon): number {
@@ -890,11 +997,16 @@ class StickyWebTag extends ArenaTrapTag {
     super(ArenaTagType.STICKY_WEB, Moves.STICKY_WEB, sourceId, side, 1);
   }
 
-  onAdd(arena: Arena, quiet: boolean = false): void {
+  onAdd(arena: Arena, quiet = false): void {
     super.onAdd(arena);
     const source = this.sourceId ? globalScene.getPokemonById(this.sourceId) : null;
     if (!quiet && source) {
-      globalScene.queueMessage(i18next.t("arenaTag:stickyWebOnAdd", { moveName: this.getMoveName(), opponentDesc: source.getOpponentDescriptor() }));
+      globalScene.queueMessage(
+        i18next.t("arenaTag:stickyWebOnAdd", {
+          moveName: this.getMoveName(),
+          opponentDesc: source.getOpponentDescriptor(),
+        }),
+      );
     }
   }
 
@@ -908,16 +1020,32 @@ class StickyWebTag extends ArenaTrapTag {
       }
 
       if (!cancelled.value) {
-        globalScene.queueMessage(i18next.t("arenaTag:stickyWebActivateTrap", { pokemonName: pokemon.getNameToRender() }));
+        globalScene.queueMessage(
+          i18next.t("arenaTag:stickyWebActivateTrap", {
+            pokemonName: pokemon.getNameToRender(),
+          }),
+        );
         const stages = new NumberHolder(-1);
-        globalScene.unshiftPhase(new StatStageChangePhase(pokemon.getBattlerIndex(), false, [ Stat.SPD ], stages.value));
+        globalScene.unshiftPhase(
+          new StatStageChangePhase(
+            pokemon.getBattlerIndex(),
+            false,
+            [Stat.SPD],
+            stages.value,
+            true,
+            false,
+            true,
+            null,
+            false,
+            true,
+          ),
+        );
         return true;
       }
     }
 
     return false;
   }
-
 }
 
 /**
@@ -932,25 +1060,29 @@ export class TrickRoomTag extends ArenaTag {
 
   /**
    * Reverses Speed-based turn order for all Pokemon on the field
-   * @param arena n/a
-   * @param simulated n/a
+   * @param _arena n/a
+   * @param _simulated n/a
    * @param speedReversed a {@linkcode BooleanHolder} used to flag if Speed-based
    * turn order should be reversed.
    * @returns `true` if turn order is successfully reversed; `false` otherwise
    */
-  override apply(arena: Arena, simulated: boolean, speedReversed: BooleanHolder): boolean {
+  override apply(_arena: Arena, _simulated: boolean, speedReversed: BooleanHolder): boolean {
     speedReversed.value = !speedReversed.value;
     return true;
   }
 
-  onAdd(arena: Arena): void {
+  onAdd(_arena: Arena): void {
     const source = this.sourceId ? globalScene.getPokemonById(this.sourceId) : null;
     if (source) {
-      globalScene.queueMessage(i18next.t("arenaTag:trickRoomOnAdd", { pokemonNameWithAffix: getPokemonNameWithAffix(source) }));
+      globalScene.queueMessage(
+        i18next.t("arenaTag:trickRoomOnAdd", {
+          pokemonNameWithAffix: getPokemonNameWithAffix(source),
+        }),
+      );
     }
   }
 
-  onRemove(arena: Arena): void {
+  onRemove(_arena: Arena): void {
     globalScene.queueMessage(i18next.t("arenaTag:trickRoomOnRemove"));
   }
 }
@@ -965,9 +1097,9 @@ export class GravityTag extends ArenaTag {
     super(ArenaTagType.GRAVITY, turnCount, Moves.GRAVITY);
   }
 
-  onAdd(arena: Arena): void {
+  onAdd(_arena: Arena): void {
     globalScene.queueMessage(i18next.t("arenaTag:gravityOnAdd"));
-    globalScene.getField(true).forEach((pokemon) => {
+    globalScene.getField(true).forEach(pokemon => {
       if (pokemon !== null) {
         pokemon.removeTag(BattlerTagType.FLOATING);
         pokemon.removeTag(BattlerTagType.TELEKINESIS);
@@ -978,7 +1110,7 @@ export class GravityTag extends ArenaTag {
     });
   }
 
-  onRemove(arena: Arena): void {
+  onRemove(_arena: Arena): void {
     globalScene.queueMessage(i18next.t("arenaTag:gravityOnRemove"));
   }
 }
@@ -993,9 +1125,13 @@ class TailwindTag extends ArenaTag {
     super(ArenaTagType.TAILWIND, turnCount, Moves.TAILWIND, sourceId, side);
   }
 
-  onAdd(arena: Arena, quiet: boolean = false): void {
+  onAdd(_arena: Arena, quiet = false): void {
     if (!quiet) {
-      globalScene.queueMessage(i18next.t(`arenaTag:tailwindOnAdd${this.side === ArenaTagSide.PLAYER ? "Player" : this.side === ArenaTagSide.ENEMY ? "Enemy" : ""}`));
+      globalScene.queueMessage(
+        i18next.t(
+          `arenaTag:tailwindOnAdd${this.side === ArenaTagSide.PLAYER ? "Player" : this.side === ArenaTagSide.ENEMY ? "Enemy" : ""}`,
+        ),
+      );
     }
 
     const source = globalScene.getPokemonById(this.sourceId!); //TODO: this bang is questionable!
@@ -1005,19 +1141,30 @@ class TailwindTag extends ArenaTag {
       // Apply the CHARGED tag to party members with the WIND_POWER ability
       if (pokemon.hasAbility(Abilities.WIND_POWER) && !pokemon.getTag(BattlerTagType.CHARGED)) {
         pokemon.addTag(BattlerTagType.CHARGED);
-        globalScene.queueMessage(i18next.t("abilityTriggers:windPowerCharged", { pokemonName: getPokemonNameWithAffix(pokemon), moveName: this.getMoveName() }));
+        globalScene.queueMessage(
+          i18next.t("abilityTriggers:windPowerCharged", {
+            pokemonName: getPokemonNameWithAffix(pokemon),
+            moveName: this.getMoveName(),
+          }),
+        );
       }
       // Raise attack by one stage if party member has WIND_RIDER ability
+      // TODO: Ability displays should be handled by the ability
       if (pokemon.hasAbility(Abilities.WIND_RIDER)) {
-        globalScene.unshiftPhase(new ShowAbilityPhase(pokemon.getBattlerIndex()));
-        globalScene.unshiftPhase(new StatStageChangePhase(pokemon.getBattlerIndex(), true, [ Stat.ATK ], 1, true));
+        globalScene.queueAbilityDisplay(pokemon, false, true);
+        globalScene.unshiftPhase(new StatStageChangePhase(pokemon.getBattlerIndex(), true, [Stat.ATK], 1, true));
+        globalScene.queueAbilityDisplay(pokemon, false, false);
       }
     }
   }
 
-  onRemove(arena: Arena, quiet: boolean = false): void {
+  onRemove(_arena: Arena, quiet = false): void {
     if (!quiet) {
-      globalScene.queueMessage(i18next.t(`arenaTag:tailwindOnRemove${this.side === ArenaTagSide.PLAYER ? "Player" : this.side === ArenaTagSide.ENEMY ? "Enemy" : ""}`));
+      globalScene.queueMessage(
+        i18next.t(
+          `arenaTag:tailwindOnRemove${this.side === ArenaTagSide.PLAYER ? "Player" : this.side === ArenaTagSide.ENEMY ? "Enemy" : ""}`,
+        ),
+      );
     }
   }
 }
@@ -1031,11 +1178,11 @@ class HappyHourTag extends ArenaTag {
     super(ArenaTagType.HAPPY_HOUR, turnCount, Moves.HAPPY_HOUR, sourceId, side);
   }
 
-  onAdd(arena: Arena): void {
+  onAdd(_arena: Arena): void {
     globalScene.queueMessage(i18next.t("arenaTag:happyHourOnAdd"));
   }
 
-  onRemove(arena: Arena): void {
+  onRemove(_arena: Arena): void {
     globalScene.queueMessage(i18next.t("arenaTag:happyHourOnRemove"));
   }
 }
@@ -1045,12 +1192,20 @@ class SafeguardTag extends ArenaTag {
     super(ArenaTagType.SAFEGUARD, turnCount, Moves.SAFEGUARD, sourceId, side);
   }
 
-  onAdd(arena: Arena): void {
-    globalScene.queueMessage(i18next.t(`arenaTag:safeguardOnAdd${this.side === ArenaTagSide.PLAYER ? "Player" : this.side === ArenaTagSide.ENEMY ? "Enemy" : ""}`));
+  onAdd(_arena: Arena): void {
+    globalScene.queueMessage(
+      i18next.t(
+        `arenaTag:safeguardOnAdd${this.side === ArenaTagSide.PLAYER ? "Player" : this.side === ArenaTagSide.ENEMY ? "Enemy" : ""}`,
+      ),
+    );
   }
 
-  onRemove(arena: Arena): void {
-    globalScene.queueMessage(i18next.t(`arenaTag:safeguardOnRemove${this.side === ArenaTagSide.PLAYER ? "Player" : this.side === ArenaTagSide.ENEMY ? "Enemy" : ""}`));
+  onRemove(_arena: Arena): void {
+    globalScene.queueMessage(
+      i18next.t(
+        `arenaTag:safeguardOnRemove${this.side === ArenaTagSide.PLAYER ? "Player" : this.side === ArenaTagSide.ENEMY ? "Enemy" : ""}`,
+      ),
+    );
   }
 }
 
@@ -1077,12 +1232,16 @@ class ImprisonTag extends ArenaTrapTag {
     const source = this.getSourcePokemon();
     if (source) {
       const party = this.getAffectedPokemon();
-      party?.forEach((p: Pokemon ) => {
+      party?.forEach((p: Pokemon) => {
         if (p.isAllowedInBattle()) {
           p.addTag(BattlerTagType.IMPRISON, 1, Moves.IMPRISON, this.sourceId);
         }
       });
-      globalScene.queueMessage(i18next.t("battlerTags:imprisonOnAdd", { pokemonNameWithAffix: getPokemonNameWithAffix(source) }));
+      globalScene.queueMessage(
+        i18next.t("battlerTags:imprisonOnAdd", {
+          pokemonNameWithAffix: getPokemonNameWithAffix(source),
+        }),
+      );
     }
   }
 
@@ -1103,7 +1262,7 @@ class ImprisonTag extends ArenaTrapTag {
    */
   override activateTrap(pokemon: Pokemon): boolean {
     const source = this.getSourcePokemon();
-    if (source && source.isActive(true) && pokemon.isAllowedInBattle()) {
+    if (source?.isActive(true) && pokemon.isAllowedInBattle()) {
       pokemon.addTag(BattlerTagType.IMPRISON, 1, Moves.IMPRISON, this.sourceId);
     }
     return true;
@@ -1133,23 +1292,34 @@ class FireGrassPledgeTag extends ArenaTag {
     super(ArenaTagType.FIRE_GRASS_PLEDGE, 4, Moves.FIRE_PLEDGE, sourceId, side);
   }
 
-  override onAdd(arena: Arena): void {
+  override onAdd(_arena: Arena): void {
     // "A sea of fire enveloped your/the opposing team!"
-    globalScene.queueMessage(i18next.t(`arenaTag:fireGrassPledgeOnAdd${this.side === ArenaTagSide.PLAYER ? "Player" : this.side === ArenaTagSide.ENEMY ? "Enemy" : ""}`));
+    globalScene.queueMessage(
+      i18next.t(
+        `arenaTag:fireGrassPledgeOnAdd${this.side === ArenaTagSide.PLAYER ? "Player" : this.side === ArenaTagSide.ENEMY ? "Enemy" : ""}`,
+      ),
+    );
   }
 
   override lapse(arena: Arena): boolean {
-    const field: Pokemon[] = (this.side === ArenaTagSide.PLAYER)
-      ? globalScene.getPlayerField()
-      : globalScene.getEnemyField();
+    const field: Pokemon[] =
+      this.side === ArenaTagSide.PLAYER ? globalScene.getPlayerField() : globalScene.getEnemyField();
 
-    field.filter(pokemon => !pokemon.isOfType(Type.FIRE) && !pokemon.switchOutStatus).forEach(pokemon => {
-      // "{pokemonNameWithAffix} was hurt by the sea of fire!"
-      globalScene.queueMessage(i18next.t("arenaTag:fireGrassPledgeLapse", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
-      // TODO: Replace this with a proper animation
-      globalScene.unshiftPhase(new CommonAnimPhase(pokemon.getBattlerIndex(), pokemon.getBattlerIndex(), CommonAnim.MAGMA_STORM));
-      pokemon.damageAndUpdate(toDmgValue(pokemon.getMaxHp() / 8));
-    });
+    field
+      .filter(pokemon => !pokemon.isOfType(PokemonType.FIRE) && !pokemon.switchOutStatus)
+      .forEach(pokemon => {
+        // "{pokemonNameWithAffix} was hurt by the sea of fire!"
+        globalScene.queueMessage(
+          i18next.t("arenaTag:fireGrassPledgeLapse", {
+            pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
+          }),
+        );
+        // TODO: Replace this with a proper animation
+        globalScene.unshiftPhase(
+          new CommonAnimPhase(pokemon.getBattlerIndex(), pokemon.getBattlerIndex(), CommonAnim.MAGMA_STORM),
+        );
+        pokemon.damageAndUpdate(toDmgValue(pokemon.getMaxHp() / 8), { result: HitResult.INDIRECT });
+      });
 
     return super.lapse(arena);
   }
@@ -1167,20 +1337,24 @@ class WaterFirePledgeTag extends ArenaTag {
     super(ArenaTagType.WATER_FIRE_PLEDGE, 4, Moves.WATER_PLEDGE, sourceId, side);
   }
 
-  override onAdd(arena: Arena): void {
+  override onAdd(_arena: Arena): void {
     // "A rainbow appeared in the sky on your/the opposing team's side!"
-    globalScene.queueMessage(i18next.t(`arenaTag:waterFirePledgeOnAdd${this.side === ArenaTagSide.PLAYER ? "Player" : this.side === ArenaTagSide.ENEMY ? "Enemy" : ""}`));
+    globalScene.queueMessage(
+      i18next.t(
+        `arenaTag:waterFirePledgeOnAdd${this.side === ArenaTagSide.PLAYER ? "Player" : this.side === ArenaTagSide.ENEMY ? "Enemy" : ""}`,
+      ),
+    );
   }
 
   /**
    * Doubles the chance for the given move's secondary effect(s) to trigger
-   * @param arena the {@linkcode Arena} containing this tag
-   * @param simulated n/a
+   * @param _arena the {@linkcode Arena} containing this tag
+   * @param _simulated n/a
    * @param moveChance a {@linkcode NumberHolder} containing
    * the move's current effect chance
    * @returns `true` if the move's effect chance was doubled (currently always `true`)
    */
-  override apply(arena: Arena, simulated: boolean, moveChance: NumberHolder): boolean {
+  override apply(_arena: Arena, _simulated: boolean, moveChance: NumberHolder): boolean {
     moveChance.value *= 2;
     return true;
   }
@@ -1197,9 +1371,13 @@ class GrassWaterPledgeTag extends ArenaTag {
     super(ArenaTagType.GRASS_WATER_PLEDGE, 4, Moves.GRASS_PLEDGE, sourceId, side);
   }
 
-  override onAdd(arena: Arena): void {
+  override onAdd(_arena: Arena): void {
     // "A swamp enveloped your/the opposing team!"
-    globalScene.queueMessage(i18next.t(`arenaTag:grassWaterPledgeOnAdd${this.side === ArenaTagSide.PLAYER ? "Player" : this.side === ArenaTagSide.ENEMY ? "Enemy" : ""}`));
+    globalScene.queueMessage(
+      i18next.t(
+        `arenaTag:grassWaterPledgeOnAdd${this.side === ArenaTagSide.PLAYER ? "Player" : this.side === ArenaTagSide.ENEMY ? "Enemy" : ""}`,
+      ),
+    );
   }
 }
 
@@ -1215,14 +1393,103 @@ export class FairyLockTag extends ArenaTag {
     super(ArenaTagType.FAIRY_LOCK, turnCount, Moves.FAIRY_LOCK, sourceId);
   }
 
-  onAdd(arena: Arena): void {
+  onAdd(_arena: Arena): void {
     globalScene.queueMessage(i18next.t("arenaTag:fairyLockOnAdd"));
   }
+}
 
+/**
+ * Arena tag class for {@link https://bulbapedia.bulbagarden.net/wiki/Neutralizing_Gas_(Ability) Neutralizing Gas}
+ *
+ * Keeps track of the number of pokemon on the field with Neutralizing Gas - If it drops to zero, the effect is ended and abilities are reactivated
+ *
+ * Additionally ends onLose abilities when it is activated
+ */
+export class SuppressAbilitiesTag extends ArenaTag {
+  private sourceCount: number;
+  private beingRemoved: boolean;
+
+  constructor(sourceId: number) {
+    super(ArenaTagType.NEUTRALIZING_GAS, 0, undefined, sourceId);
+    this.sourceCount = 1;
+    this.beingRemoved = false;
+  }
+
+  public override onAdd(_arena: Arena): void {
+    const pokemon = this.getSourcePokemon();
+    if (pokemon) {
+      this.playActivationMessage(pokemon);
+
+      for (const fieldPokemon of globalScene.getField(true)) {
+        if (fieldPokemon && fieldPokemon.id !== pokemon.id) {
+          [true, false].forEach(passive => applyOnLoseAbAttrs(fieldPokemon, passive));
+        }
+      }
+    }
+  }
+
+  public override onOverlap(_arena: Arena, source: Pokemon | null): void {
+    this.sourceCount++;
+    this.playActivationMessage(source);
+  }
+
+  public onSourceLeave(arena: Arena): void {
+    this.sourceCount--;
+    if (this.sourceCount <= 0) {
+      arena.removeTag(ArenaTagType.NEUTRALIZING_GAS);
+    } else if (this.sourceCount === 1) {
+      // With 1 source left, that pokemon's other abilities should reactivate
+      // This may be confusing for players but would be the most accurate gameplay-wise
+      // Could have a custom message that plays when a specific pokemon's NG ends? This entire thing exists due to passives after all
+      const setter = globalScene
+        .getField()
+        .filter(p => p?.hasAbilityWithAttr(PreLeaveFieldRemoveSuppressAbilitiesSourceAbAttr, false))[0];
+      applyOnGainAbAttrs(setter, setter.getAbility().hasAttr(PreLeaveFieldRemoveSuppressAbilitiesSourceAbAttr));
+    }
+  }
+
+  public override onRemove(_arena: Arena, quiet = false) {
+    this.beingRemoved = true;
+    if (!quiet) {
+      globalScene.queueMessage(i18next.t("arenaTag:neutralizingGasOnRemove"));
+    }
+
+    for (const pokemon of globalScene.getField(true)) {
+      // There is only one pokemon with this attr on the field on removal, so its abilities are already active
+      if (pokemon && !pokemon.hasAbilityWithAttr(PreLeaveFieldRemoveSuppressAbilitiesSourceAbAttr, false)) {
+        [true, false].forEach(passive => applyOnGainAbAttrs(pokemon, passive));
+      }
+    }
+  }
+
+  public shouldApplyToSelf(): boolean {
+    return this.sourceCount > 1;
+  }
+
+  public isBeingRemoved() {
+    return this.beingRemoved;
+  }
+
+  private playActivationMessage(pokemon: Pokemon | null) {
+    if (pokemon) {
+      globalScene.queueMessage(
+        i18next.t("arenaTag:neutralizingGasOnAdd", {
+          pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
+        }),
+      );
+    }
+  }
 }
 
 // TODO: swap `sourceMove` and `sourceId` and make `sourceMove` an optional parameter
-export function getArenaTag(tagType: ArenaTagType, turnCount: number, sourceMove: Moves | undefined, sourceId: number, targetIndex?: BattlerIndex, side: ArenaTagSide = ArenaTagSide.BOTH): ArenaTag | null {
+export function getArenaTag(
+  tagType: ArenaTagType,
+  turnCount: number,
+  sourceMove: Moves | undefined,
+  sourceId: number,
+  targetIndex?: BattlerIndex,
+  side: ArenaTagSide = ArenaTagSide.BOTH,
+): ArenaTag | null {
   switch (tagType) {
     case ArenaTagType.MIST:
       return new MistTag(turnCount, sourceId, side);
@@ -1281,6 +1548,8 @@ export function getArenaTag(tagType: ArenaTagType, turnCount: number, sourceMove
       return new GrassWaterPledgeTag(sourceId, side);
     case ArenaTagType.FAIRY_LOCK:
       return new FairyLockTag(turnCount, sourceId);
+    case ArenaTagType.NEUTRALIZING_GAS:
+      return new SuppressAbilitiesTag(sourceId);
     default:
       return null;
   }
@@ -1292,9 +1561,15 @@ export function getArenaTag(tagType: ArenaTagType, turnCount: number, sourceMove
  * @return {ArenaTag} The valid arena tag
  */
 export function loadArenaTag(source: ArenaTag | any): ArenaTag {
-  const tag = getArenaTag(source.tagType, source.turnCount, source.sourceMove, source.sourceId, source.targetIndex, source.side)
-      ?? new NoneTag();
+  const tag =
+    getArenaTag(
+      source.tagType,
+      source.turnCount,
+      source.sourceMove,
+      source.sourceId,
+      source.targetIndex,
+      source.side,
+    ) ?? new NoneTag();
   tag.loadTag(source);
   return tag;
 }
-
diff --git a/src/data/balance/biomes.ts b/src/data/balance/biomes.ts
index 5b5e69b4042..968164c7902 100644
--- a/src/data/balance/biomes.ts
+++ b/src/data/balance/biomes.ts
@@ -1,5 +1,5 @@
-import { Type } from "#enums/type";
-import * as Utils from "#app/utils";
+import { PokemonType } from "#enums/pokemon-type";
+import { randSeedInt, getEnumValues } from "#app/utils/common";
 import type { SpeciesFormEvolution } from "#app/data/balance/pokemon-evolutions";
 import { pokemonEvolutions } from "#app/data/balance/pokemon-evolutions";
 import i18next from "i18next";
@@ -1659,7 +1659,7 @@ export const biomeTrainerPools: BiomeTrainerPools = {
   },
   [Biome.GRASS]: {
     [BiomePoolTier.COMMON]: [ TrainerType.BREEDER, TrainerType.SCHOOL_KID ],
-    [BiomePoolTier.UNCOMMON]: [ TrainerType.ACE_TRAINER ],
+    [BiomePoolTier.UNCOMMON]: [ TrainerType.ACE_TRAINER, TrainerType.POKEFAN ],
     [BiomePoolTier.RARE]: [ TrainerType.BLACK_BELT ],
     [BiomePoolTier.SUPER_RARE]: [],
     [BiomePoolTier.ULTRA_RARE]: [],
@@ -1680,9 +1680,9 @@ export const biomeTrainerPools: BiomeTrainerPools = {
     [BiomePoolTier.BOSS_ULTRA_RARE]: []
   },
   [Biome.METROPOLIS]: {
-    [BiomePoolTier.COMMON]: [ TrainerType.CLERK, TrainerType.CYCLIST, TrainerType.OFFICER, TrainerType.WAITER ],
+    [BiomePoolTier.COMMON]: [ TrainerType.BEAUTY, TrainerType.CLERK, TrainerType.CYCLIST, TrainerType.OFFICER, TrainerType.WAITER ],
     [BiomePoolTier.UNCOMMON]: [ TrainerType.BREEDER, TrainerType.DEPOT_AGENT, TrainerType.GUITARIST ],
-    [BiomePoolTier.RARE]: [ TrainerType.ARTIST ],
+    [BiomePoolTier.RARE]: [ TrainerType.ARTIST, TrainerType.RICH_KID ],
     [BiomePoolTier.SUPER_RARE]: [],
     [BiomePoolTier.ULTRA_RARE]: [],
     [BiomePoolTier.BOSS]: [ TrainerType.WHITNEY, TrainerType.NORMAN, TrainerType.IONO, TrainerType.LARRY ],
@@ -1702,7 +1702,7 @@ export const biomeTrainerPools: BiomeTrainerPools = {
     [BiomePoolTier.BOSS_ULTRA_RARE]: []
   },
   [Biome.SEA]: {
-    [BiomePoolTier.COMMON]: [ TrainerType.SWIMMER, TrainerType.SAILOR ],
+    [BiomePoolTier.COMMON]: [ TrainerType.SAILOR, TrainerType.SWIMMER ],
     [BiomePoolTier.UNCOMMON]: [],
     [BiomePoolTier.RARE]: [],
     [BiomePoolTier.SUPER_RARE]: [],
@@ -1713,7 +1713,7 @@ export const biomeTrainerPools: BiomeTrainerPools = {
     [BiomePoolTier.BOSS_ULTRA_RARE]: []
   },
   [Biome.SWAMP]: {
-    [BiomePoolTier.COMMON]: [],
+    [BiomePoolTier.COMMON]: [ TrainerType.PARASOL_LADY ],
     [BiomePoolTier.UNCOMMON]: [ TrainerType.ACE_TRAINER ],
     [BiomePoolTier.RARE]: [ TrainerType.BLACK_BELT ],
     [BiomePoolTier.SUPER_RARE]: [],
@@ -1724,7 +1724,7 @@ export const biomeTrainerPools: BiomeTrainerPools = {
     [BiomePoolTier.BOSS_ULTRA_RARE]: []
   },
   [Biome.BEACH]: {
-    [BiomePoolTier.COMMON]: [ TrainerType.FISHERMAN, TrainerType.PARASOL_LADY, TrainerType.SAILOR ],
+    [BiomePoolTier.COMMON]: [ TrainerType.FISHERMAN, TrainerType.SAILOR ],
     [BiomePoolTier.UNCOMMON]: [ TrainerType.ACE_TRAINER, TrainerType.BREEDER ],
     [BiomePoolTier.RARE]: [ TrainerType.BLACK_BELT ],
     [BiomePoolTier.SUPER_RARE]: [],
@@ -1735,7 +1735,7 @@ export const biomeTrainerPools: BiomeTrainerPools = {
     [BiomePoolTier.BOSS_ULTRA_RARE]: []
   },
   [Biome.LAKE]: {
-    [BiomePoolTier.COMMON]: [ TrainerType.BREEDER, TrainerType.FISHERMAN ],
+    [BiomePoolTier.COMMON]: [ TrainerType.BREEDER, TrainerType.FISHERMAN, TrainerType.PARASOL_LADY ],
     [BiomePoolTier.UNCOMMON]: [ TrainerType.ACE_TRAINER ],
     [BiomePoolTier.RARE]: [ TrainerType.BLACK_BELT ],
     [BiomePoolTier.SUPER_RARE]: [],
@@ -1758,7 +1758,7 @@ export const biomeTrainerPools: BiomeTrainerPools = {
   },
   [Biome.MOUNTAIN]: {
     [BiomePoolTier.COMMON]: [ TrainerType.BACKPACKER, TrainerType.BLACK_BELT, TrainerType.HIKER ],
-    [BiomePoolTier.UNCOMMON]: [ TrainerType.ACE_TRAINER ],
+    [BiomePoolTier.UNCOMMON]: [ TrainerType.ACE_TRAINER, TrainerType.PILOT ],
     [BiomePoolTier.RARE]: [],
     [BiomePoolTier.SUPER_RARE]: [],
     [BiomePoolTier.ULTRA_RARE]: [],
@@ -1790,7 +1790,7 @@ export const biomeTrainerPools: BiomeTrainerPools = {
     [BiomePoolTier.BOSS_ULTRA_RARE]: []
   },
   [Biome.DESERT]: {
-    [BiomePoolTier.COMMON]: [ TrainerType.SCIENTIST ],
+    [BiomePoolTier.COMMON]: [ TrainerType.BACKPACKER, TrainerType.SCIENTIST ],
     [BiomePoolTier.UNCOMMON]: [],
     [BiomePoolTier.RARE]: [],
     [BiomePoolTier.SUPER_RARE]: [],
@@ -1812,8 +1812,8 @@ export const biomeTrainerPools: BiomeTrainerPools = {
     [BiomePoolTier.BOSS_ULTRA_RARE]: []
   },
   [Biome.MEADOW]: {
-    [BiomePoolTier.COMMON]: [ TrainerType.PARASOL_LADY ],
-    [BiomePoolTier.UNCOMMON]: [ TrainerType.ACE_TRAINER, TrainerType.BREEDER ],
+    [BiomePoolTier.COMMON]: [ TrainerType.BEAUTY, TrainerType.MUSICIAN, TrainerType.PARASOL_LADY ],
+    [BiomePoolTier.UNCOMMON]: [ TrainerType.ACE_TRAINER, TrainerType.BAKER, TrainerType.BREEDER, TrainerType.POKEFAN ],
     [BiomePoolTier.RARE]: [],
     [BiomePoolTier.SUPER_RARE]: [],
     [BiomePoolTier.ULTRA_RARE]: [],
@@ -1879,7 +1879,7 @@ export const biomeTrainerPools: BiomeTrainerPools = {
   },
   [Biome.RUINS]: {
     [BiomePoolTier.COMMON]: [ TrainerType.PSYCHIC, TrainerType.SCIENTIST ],
-    [BiomePoolTier.UNCOMMON]: [ TrainerType.ACE_TRAINER, TrainerType.BLACK_BELT ],
+    [BiomePoolTier.UNCOMMON]: [ TrainerType.ACE_TRAINER, TrainerType.BLACK_BELT, TrainerType.HEX_MANIAC ],
     [BiomePoolTier.RARE]: [],
     [BiomePoolTier.SUPER_RARE]: [],
     [BiomePoolTier.ULTRA_RARE]: [],
@@ -1967,7 +1967,7 @@ export const biomeTrainerPools: BiomeTrainerPools = {
   },
   [Biome.SLUM]: {
     [BiomePoolTier.COMMON]: [ TrainerType.BIKER, TrainerType.OFFICER, TrainerType.ROUGHNECK ],
-    [BiomePoolTier.UNCOMMON]: [ TrainerType.BAKER ],
+    [BiomePoolTier.UNCOMMON]: [ TrainerType.BAKER, TrainerType.HOOLIGANS ],
     [BiomePoolTier.RARE]: [],
     [BiomePoolTier.SUPER_RARE]: [],
     [BiomePoolTier.ULTRA_RARE]: [],
@@ -1988,8 +1988,8 @@ export const biomeTrainerPools: BiomeTrainerPools = {
     [BiomePoolTier.BOSS_ULTRA_RARE]: []
   },
   [Biome.ISLAND]: {
-    [BiomePoolTier.COMMON]: [],
-    [BiomePoolTier.UNCOMMON]: [],
+    [BiomePoolTier.COMMON]: [ TrainerType.RICH_KID ],
+    [BiomePoolTier.UNCOMMON]: [ TrainerType.RICH ],
     [BiomePoolTier.RARE]: [],
     [BiomePoolTier.SUPER_RARE]: [],
     [BiomePoolTier.ULTRA_RARE]: [],
@@ -2022,450 +2022,451 @@ export const biomeTrainerPools: BiomeTrainerPools = {
   }
 };
 
+// biome-ignore lint/complexity/noExcessiveCognitiveComplexity: init methods are expected to have many lines.
 export function initBiomes() {
   const pokemonBiomes = [
-    [ Species.BULBASAUR, Type.GRASS, Type.POISON, [
+    [ Species.BULBASAUR, PokemonType.GRASS, PokemonType.POISON, [
       [ Biome.GRASS, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.IVYSAUR, Type.GRASS, Type.POISON, [
+    [ Species.IVYSAUR, PokemonType.GRASS, PokemonType.POISON, [
       [ Biome.GRASS, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.VENUSAUR, Type.GRASS, Type.POISON, [
+    [ Species.VENUSAUR, PokemonType.GRASS, PokemonType.POISON, [
       [ Biome.GRASS, BiomePoolTier.RARE ],
       [ Biome.GRASS, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.CHARMANDER, Type.FIRE, -1, [
+    [ Species.CHARMANDER, PokemonType.FIRE, -1, [
       [ Biome.VOLCANO, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.CHARMELEON, Type.FIRE, -1, [
+    [ Species.CHARMELEON, PokemonType.FIRE, -1, [
       [ Biome.VOLCANO, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.CHARIZARD, Type.FIRE, Type.FLYING, [
+    [ Species.CHARIZARD, PokemonType.FIRE, PokemonType.FLYING, [
       [ Biome.VOLCANO, BiomePoolTier.RARE ],
       [ Biome.VOLCANO, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.SQUIRTLE, Type.WATER, -1, [
+    [ Species.SQUIRTLE, PokemonType.WATER, -1, [
       [ Biome.LAKE, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.WARTORTLE, Type.WATER, -1, [
+    [ Species.WARTORTLE, PokemonType.WATER, -1, [
       [ Biome.LAKE, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.BLASTOISE, Type.WATER, -1, [
+    [ Species.BLASTOISE, PokemonType.WATER, -1, [
       [ Biome.LAKE, BiomePoolTier.RARE ],
       [ Biome.LAKE, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.CATERPIE, Type.BUG, -1, [
+    [ Species.CATERPIE, PokemonType.BUG, -1, [
       [ Biome.TOWN, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.METAPOD, Type.BUG, -1, [
+    [ Species.METAPOD, PokemonType.BUG, -1, [
       [ Biome.TOWN, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.BUTTERFREE, Type.BUG, Type.FLYING, [
+    [ Species.BUTTERFREE, PokemonType.BUG, PokemonType.FLYING, [
       [ Biome.FOREST, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.WEEDLE, Type.BUG, Type.POISON, [
+    [ Species.WEEDLE, PokemonType.BUG, PokemonType.POISON, [
       [ Biome.TOWN, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]]
     ]
     ],
-    [ Species.KAKUNA, Type.BUG, Type.POISON, [
+    [ Species.KAKUNA, PokemonType.BUG, PokemonType.POISON, [
       [ Biome.TOWN, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]]
     ]
     ],
-    [ Species.BEEDRILL, Type.BUG, Type.POISON, [
+    [ Species.BEEDRILL, PokemonType.BUG, PokemonType.POISON, [
       [ Biome.FOREST, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]]
     ]
     ],
-    [ Species.PIDGEY, Type.NORMAL, Type.FLYING, [
+    [ Species.PIDGEY, PokemonType.NORMAL, PokemonType.FLYING, [
       [ Biome.TOWN, BiomePoolTier.COMMON ],
       [ Biome.PLAINS, BiomePoolTier.UNCOMMON ],
       [ Biome.MOUNTAIN, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.PIDGEOTTO, Type.NORMAL, Type.FLYING, [
+    [ Species.PIDGEOTTO, PokemonType.NORMAL, PokemonType.FLYING, [
       [ Biome.PLAINS, BiomePoolTier.UNCOMMON ],
       [ Biome.MOUNTAIN, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.PIDGEOT, Type.NORMAL, Type.FLYING, [
+    [ Species.PIDGEOT, PokemonType.NORMAL, PokemonType.FLYING, [
       [ Biome.PLAINS, BiomePoolTier.UNCOMMON ],
       [ Biome.MOUNTAIN, BiomePoolTier.COMMON ],
       [ Biome.MOUNTAIN, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.RATTATA, Type.NORMAL, -1, [
+    [ Species.RATTATA, PokemonType.NORMAL, -1, [
       [ Biome.TOWN, BiomePoolTier.COMMON ],
       [ Biome.METROPOLIS, BiomePoolTier.COMMON ],
       [ Biome.SLUM, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.RATICATE, Type.NORMAL, -1, [
+    [ Species.RATICATE, PokemonType.NORMAL, -1, [
       [ Biome.METROPOLIS, BiomePoolTier.COMMON ],
       [ Biome.SLUM, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.SPEAROW, Type.NORMAL, Type.FLYING, [
+    [ Species.SPEAROW, PokemonType.NORMAL, PokemonType.FLYING, [
       [ Biome.TOWN, BiomePoolTier.COMMON ],
       [ Biome.PLAINS, BiomePoolTier.UNCOMMON ],
       [ Biome.MOUNTAIN, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.FEAROW, Type.NORMAL, Type.FLYING, [
+    [ Species.FEAROW, PokemonType.NORMAL, PokemonType.FLYING, [
       [ Biome.PLAINS, BiomePoolTier.UNCOMMON ],
       [ Biome.MOUNTAIN, BiomePoolTier.COMMON ],
       [ Biome.MOUNTAIN, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.EKANS, Type.POISON, -1, [
+    [ Species.EKANS, PokemonType.POISON, -1, [
       [ Biome.TOWN, BiomePoolTier.UNCOMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]],
       [ Biome.FOREST, BiomePoolTier.UNCOMMON ],
       [ Biome.SWAMP, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.SWAMP, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]]
     ]
     ],
-    [ Species.ARBOK, Type.POISON, -1, [
+    [ Species.ARBOK, PokemonType.POISON, -1, [
       [ Biome.FOREST, BiomePoolTier.UNCOMMON ],
       [ Biome.SWAMP, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.SWAMP, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]],
       [ Biome.SWAMP, BiomePoolTier.BOSS, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]]
     ]
     ],
-    [ Species.PIKACHU, Type.ELECTRIC, -1, [
+    [ Species.PIKACHU, PokemonType.ELECTRIC, -1, [
       [ Biome.PLAINS, BiomePoolTier.UNCOMMON ],
       [ Biome.METROPOLIS, BiomePoolTier.UNCOMMON ],
       [ Biome.POWER_PLANT, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.RAICHU, Type.ELECTRIC, -1, [
+    [ Species.RAICHU, PokemonType.ELECTRIC, -1, [
       [ Biome.POWER_PLANT, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.SANDSHREW, Type.GROUND, -1, [
+    [ Species.SANDSHREW, PokemonType.GROUND, -1, [
       [ Biome.BADLANDS, BiomePoolTier.UNCOMMON ],
       [ Biome.DESERT, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.SANDSLASH, Type.GROUND, -1, [
+    [ Species.SANDSLASH, PokemonType.GROUND, -1, [
       [ Biome.BADLANDS, BiomePoolTier.UNCOMMON ],
       [ Biome.DESERT, BiomePoolTier.COMMON ],
       [ Biome.DESERT, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.NIDORAN_F, Type.POISON, -1, [
+    [ Species.NIDORAN_F, PokemonType.POISON, -1, [
       [ Biome.TOWN, BiomePoolTier.UNCOMMON, TimeOfDay.DAY ],
       [ Biome.TALL_GRASS, BiomePoolTier.COMMON, TimeOfDay.DAY ]
     ]
     ],
-    [ Species.NIDORINA, Type.POISON, -1, [
+    [ Species.NIDORINA, PokemonType.POISON, -1, [
       [ Biome.TALL_GRASS, BiomePoolTier.COMMON, TimeOfDay.DAY ]
     ]
     ],
-    [ Species.NIDOQUEEN, Type.POISON, Type.GROUND, [
+    [ Species.NIDOQUEEN, PokemonType.POISON, PokemonType.GROUND, [
       [ Biome.TALL_GRASS, BiomePoolTier.BOSS, TimeOfDay.DAY ]
     ]
     ],
-    [ Species.NIDORAN_M, Type.POISON, -1, [
+    [ Species.NIDORAN_M, PokemonType.POISON, -1, [
       [ Biome.TOWN, BiomePoolTier.UNCOMMON, TimeOfDay.DAY ],
       [ Biome.TALL_GRASS, BiomePoolTier.COMMON, TimeOfDay.DAY ]
     ]
     ],
-    [ Species.NIDORINO, Type.POISON, -1, [
+    [ Species.NIDORINO, PokemonType.POISON, -1, [
       [ Biome.TALL_GRASS, BiomePoolTier.COMMON, TimeOfDay.DAY ]
     ]
     ],
-    [ Species.NIDOKING, Type.POISON, Type.GROUND, [
+    [ Species.NIDOKING, PokemonType.POISON, PokemonType.GROUND, [
       [ Biome.TALL_GRASS, BiomePoolTier.BOSS, TimeOfDay.DAY ]
     ]
     ],
-    [ Species.CLEFAIRY, Type.FAIRY, -1, [
+    [ Species.CLEFAIRY, PokemonType.FAIRY, -1, [
       [ Biome.FAIRY_CAVE, BiomePoolTier.UNCOMMON ],
       [ Biome.SPACE, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.CLEFABLE, Type.FAIRY, -1, [
+    [ Species.CLEFABLE, PokemonType.FAIRY, -1, [
       [ Biome.SPACE, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.VULPIX, Type.FIRE, -1, [
+    [ Species.VULPIX, PokemonType.FIRE, -1, [
       [ Biome.TALL_GRASS, BiomePoolTier.UNCOMMON ],
       [ Biome.VOLCANO, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.NINETALES, Type.FIRE, -1, [
+    [ Species.NINETALES, PokemonType.FIRE, -1, [
       [ Biome.VOLCANO, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.JIGGLYPUFF, Type.NORMAL, Type.FAIRY, [
+    [ Species.JIGGLYPUFF, PokemonType.NORMAL, PokemonType.FAIRY, [
       [ Biome.MEADOW, BiomePoolTier.UNCOMMON ],
       [ Biome.FAIRY_CAVE, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.WIGGLYTUFF, Type.NORMAL, Type.FAIRY, [
+    [ Species.WIGGLYTUFF, PokemonType.NORMAL, PokemonType.FAIRY, [
       [ Biome.MEADOW, BiomePoolTier.UNCOMMON ],
       [ Biome.FAIRY_CAVE, BiomePoolTier.COMMON ],
       [ Biome.FAIRY_CAVE, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.ZUBAT, Type.POISON, Type.FLYING, [
+    [ Species.ZUBAT, PokemonType.POISON, PokemonType.FLYING, [
       [ Biome.PLAINS, BiomePoolTier.COMMON, TimeOfDay.NIGHT ],
       [ Biome.CAVE, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.GOLBAT, Type.POISON, Type.FLYING, [
+    [ Species.GOLBAT, PokemonType.POISON, PokemonType.FLYING, [
       [ Biome.PLAINS, BiomePoolTier.COMMON, TimeOfDay.NIGHT ],
       [ Biome.CAVE, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.ODDISH, Type.GRASS, Type.POISON, [
+    [ Species.ODDISH, PokemonType.GRASS, PokemonType.POISON, [
       [ Biome.TOWN, BiomePoolTier.UNCOMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]],
       [ Biome.TALL_GRASS, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]]
     ]
     ],
-    [ Species.GLOOM, Type.GRASS, Type.POISON, [
+    [ Species.GLOOM, PokemonType.GRASS, PokemonType.POISON, [
       [ Biome.TALL_GRASS, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]]
     ]
     ],
-    [ Species.VILEPLUME, Type.GRASS, Type.POISON, [
+    [ Species.VILEPLUME, PokemonType.GRASS, PokemonType.POISON, [
       [ Biome.TALL_GRASS, BiomePoolTier.BOSS, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]]
     ]
     ],
-    [ Species.PARAS, Type.BUG, Type.GRASS, [
+    [ Species.PARAS, PokemonType.BUG, PokemonType.GRASS, [
       [ Biome.TOWN, BiomePoolTier.UNCOMMON, TimeOfDay.NIGHT ],
       [ Biome.TALL_GRASS, BiomePoolTier.UNCOMMON, TimeOfDay.NIGHT ],
       [ Biome.CAVE, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.PARASECT, Type.BUG, Type.GRASS, [
+    [ Species.PARASECT, PokemonType.BUG, PokemonType.GRASS, [
       [ Biome.TALL_GRASS, BiomePoolTier.UNCOMMON, TimeOfDay.NIGHT ],
       [ Biome.CAVE, BiomePoolTier.COMMON ],
       [ Biome.CAVE, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.VENONAT, Type.BUG, Type.POISON, [
+    [ Species.VENONAT, PokemonType.BUG, PokemonType.POISON, [
       [ Biome.TOWN, BiomePoolTier.UNCOMMON, TimeOfDay.NIGHT ],
       [ Biome.TALL_GRASS, BiomePoolTier.UNCOMMON, TimeOfDay.NIGHT ],
       [ Biome.FOREST, BiomePoolTier.COMMON, TimeOfDay.NIGHT ]
     ]
     ],
-    [ Species.VENOMOTH, Type.BUG, Type.POISON, [
+    [ Species.VENOMOTH, PokemonType.BUG, PokemonType.POISON, [
       [ Biome.TALL_GRASS, BiomePoolTier.UNCOMMON, TimeOfDay.NIGHT ],
       [ Biome.FOREST, BiomePoolTier.COMMON, TimeOfDay.NIGHT ],
       [ Biome.FOREST, BiomePoolTier.BOSS, TimeOfDay.NIGHT ]
     ]
     ],
-    [ Species.DIGLETT, Type.GROUND, -1, [
+    [ Species.DIGLETT, PokemonType.GROUND, -1, [
       [ Biome.BADLANDS, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.DUGTRIO, Type.GROUND, -1, [
+    [ Species.DUGTRIO, PokemonType.GROUND, -1, [
       [ Biome.BADLANDS, BiomePoolTier.COMMON ],
       [ Biome.BADLANDS, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.MEOWTH, Type.NORMAL, -1, [
+    [ Species.MEOWTH, PokemonType.NORMAL, -1, [
       [ Biome.TOWN, BiomePoolTier.UNCOMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]],
       [ Biome.PLAINS, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]]
     ]
     ],
-    [ Species.PERSIAN, Type.NORMAL, -1, [
+    [ Species.PERSIAN, PokemonType.NORMAL, -1, [
       [ Biome.PLAINS, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]],
       [ Biome.PLAINS, BiomePoolTier.BOSS, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]]
     ]
     ],
-    [ Species.PSYDUCK, Type.WATER, -1, [
+    [ Species.PSYDUCK, PokemonType.WATER, -1, [
       [ Biome.SWAMP, BiomePoolTier.UNCOMMON ],
       [ Biome.LAKE, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.GOLDUCK, Type.WATER, -1, [
+    [ Species.GOLDUCK, PokemonType.WATER, -1, [
       [ Biome.SWAMP, BiomePoolTier.UNCOMMON ],
       [ Biome.LAKE, BiomePoolTier.COMMON ],
       [ Biome.LAKE, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.MANKEY, Type.FIGHTING, -1, [
+    [ Species.MANKEY, PokemonType.FIGHTING, -1, [
       [ Biome.PLAINS, BiomePoolTier.UNCOMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]],
       [ Biome.DOJO, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.PRIMEAPE, Type.FIGHTING, -1, [
+    [ Species.PRIMEAPE, PokemonType.FIGHTING, -1, [
       [ Biome.PLAINS, BiomePoolTier.UNCOMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]],
       [ Biome.DOJO, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.GROWLITHE, Type.FIRE, -1, [
+    [ Species.GROWLITHE, PokemonType.FIRE, -1, [
       [ Biome.GRASS, BiomePoolTier.RARE ],
       [ Biome.VOLCANO, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.ARCANINE, Type.FIRE, -1, [
+    [ Species.ARCANINE, PokemonType.FIRE, -1, [
       [ Biome.VOLCANO, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.POLIWAG, Type.WATER, -1, [
+    [ Species.POLIWAG, PokemonType.WATER, -1, [
       [ Biome.SEA, BiomePoolTier.UNCOMMON ],
       [ Biome.SWAMP, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.POLIWHIRL, Type.WATER, -1, [
+    [ Species.POLIWHIRL, PokemonType.WATER, -1, [
       [ Biome.SEA, BiomePoolTier.UNCOMMON ],
       [ Biome.SWAMP, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.POLIWRATH, Type.WATER, Type.FIGHTING, [
+    [ Species.POLIWRATH, PokemonType.WATER, PokemonType.FIGHTING, [
       [ Biome.SWAMP, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.ABRA, Type.PSYCHIC, -1, [
+    [ Species.ABRA, PokemonType.PSYCHIC, -1, [
       [ Biome.TOWN, BiomePoolTier.RARE ],
       [ Biome.PLAINS, BiomePoolTier.RARE ],
       [ Biome.RUINS, BiomePoolTier.UNCOMMON ]
     ]
     ],
-    [ Species.KADABRA, Type.PSYCHIC, -1, [
+    [ Species.KADABRA, PokemonType.PSYCHIC, -1, [
       [ Biome.PLAINS, BiomePoolTier.RARE ],
       [ Biome.RUINS, BiomePoolTier.UNCOMMON ]
     ]
     ],
-    [ Species.ALAKAZAM, Type.PSYCHIC, -1, [
+    [ Species.ALAKAZAM, PokemonType.PSYCHIC, -1, [
       [ Biome.RUINS, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.MACHOP, Type.FIGHTING, -1, [
+    [ Species.MACHOP, PokemonType.FIGHTING, -1, [
       [ Biome.MOUNTAIN, BiomePoolTier.UNCOMMON ],
       [ Biome.FACTORY, BiomePoolTier.COMMON ],
       [ Biome.CONSTRUCTION_SITE, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.MACHOKE, Type.FIGHTING, -1, [
+    [ Species.MACHOKE, PokemonType.FIGHTING, -1, [
       [ Biome.MOUNTAIN, BiomePoolTier.UNCOMMON ],
       [ Biome.FACTORY, BiomePoolTier.COMMON ],
       [ Biome.CONSTRUCTION_SITE, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.MACHAMP, Type.FIGHTING, -1, [
+    [ Species.MACHAMP, PokemonType.FIGHTING, -1, [
       [ Biome.CONSTRUCTION_SITE, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.BELLSPROUT, Type.GRASS, Type.POISON, [
+    [ Species.BELLSPROUT, PokemonType.GRASS, PokemonType.POISON, [
       [ Biome.TOWN, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.FOREST, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.WEEPINBELL, Type.GRASS, Type.POISON, [
+    [ Species.WEEPINBELL, PokemonType.GRASS, PokemonType.POISON, [
       [ Biome.FOREST, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.VICTREEBEL, Type.GRASS, Type.POISON, [
+    [ Species.VICTREEBEL, PokemonType.GRASS, PokemonType.POISON, [
       [ Biome.FOREST, BiomePoolTier.BOSS, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.TENTACOOL, Type.WATER, Type.POISON, [
+    [ Species.TENTACOOL, PokemonType.WATER, PokemonType.POISON, [
       [ Biome.SEA, BiomePoolTier.COMMON ],
       [ Biome.SEABED, BiomePoolTier.UNCOMMON ]
     ]
     ],
-    [ Species.TENTACRUEL, Type.WATER, Type.POISON, [
+    [ Species.TENTACRUEL, PokemonType.WATER, PokemonType.POISON, [
       [ Biome.SEA, BiomePoolTier.COMMON ],
       [ Biome.SEA, BiomePoolTier.BOSS ],
       [ Biome.SEABED, BiomePoolTier.UNCOMMON ]
     ]
     ],
-    [ Species.GEODUDE, Type.ROCK, Type.GROUND, [
+    [ Species.GEODUDE, PokemonType.ROCK, PokemonType.GROUND, [
       [ Biome.MOUNTAIN, BiomePoolTier.UNCOMMON ],
       [ Biome.BADLANDS, BiomePoolTier.COMMON ],
       [ Biome.CAVE, BiomePoolTier.UNCOMMON ]
     ]
     ],
-    [ Species.GRAVELER, Type.ROCK, Type.GROUND, [
+    [ Species.GRAVELER, PokemonType.ROCK, PokemonType.GROUND, [
       [ Biome.MOUNTAIN, BiomePoolTier.UNCOMMON ],
       [ Biome.BADLANDS, BiomePoolTier.COMMON ],
       [ Biome.CAVE, BiomePoolTier.UNCOMMON ]
     ]
     ],
-    [ Species.GOLEM, Type.ROCK, Type.GROUND, [
+    [ Species.GOLEM, PokemonType.ROCK, PokemonType.GROUND, [
       [ Biome.BADLANDS, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.PONYTA, Type.FIRE, -1, [
+    [ Species.PONYTA, PokemonType.FIRE, -1, [
       [ Biome.MEADOW, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.VOLCANO, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.RAPIDASH, Type.FIRE, -1, [
+    [ Species.RAPIDASH, PokemonType.FIRE, -1, [
       [ Biome.MEADOW, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.VOLCANO, BiomePoolTier.COMMON ],
       [ Biome.VOLCANO, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.SLOWPOKE, Type.WATER, Type.PSYCHIC, [
+    [ Species.SLOWPOKE, PokemonType.WATER, PokemonType.PSYCHIC, [
       [ Biome.SEA, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.SEA, BiomePoolTier.UNCOMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]],
       [ Biome.LAKE, BiomePoolTier.UNCOMMON ]
     ]
     ],
-    [ Species.SLOWBRO, Type.WATER, Type.PSYCHIC, [
+    [ Species.SLOWBRO, PokemonType.WATER, PokemonType.PSYCHIC, [
       [ Biome.SEA, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.SEA, BiomePoolTier.UNCOMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]],
       [ Biome.LAKE, BiomePoolTier.UNCOMMON ],
       [ Biome.LAKE, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.MAGNEMITE, Type.ELECTRIC, Type.STEEL, [
+    [ Species.MAGNEMITE, PokemonType.ELECTRIC, PokemonType.STEEL, [
       [ Biome.POWER_PLANT, BiomePoolTier.COMMON ],
       [ Biome.FACTORY, BiomePoolTier.COMMON ],
       [ Biome.CONSTRUCTION_SITE, BiomePoolTier.COMMON ],
       [ Biome.LABORATORY, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.MAGNETON, Type.ELECTRIC, Type.STEEL, [
+    [ Species.MAGNETON, PokemonType.ELECTRIC, PokemonType.STEEL, [
       [ Biome.POWER_PLANT, BiomePoolTier.COMMON ],
       [ Biome.FACTORY, BiomePoolTier.COMMON ],
       [ Biome.CONSTRUCTION_SITE, BiomePoolTier.COMMON ],
       [ Biome.LABORATORY, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.FARFETCHD, Type.NORMAL, Type.FLYING, [
+    [ Species.FARFETCHD, PokemonType.NORMAL, PokemonType.FLYING, [
       [ Biome.PLAINS, BiomePoolTier.SUPER_RARE ],
       [ Biome.PLAINS, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.DODUO, Type.NORMAL, Type.FLYING, [
+    [ Species.DODUO, PokemonType.NORMAL, PokemonType.FLYING, [
       [ Biome.PLAINS, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.DODRIO, Type.NORMAL, Type.FLYING, [
+    [ Species.DODRIO, PokemonType.NORMAL, PokemonType.FLYING, [
       [ Biome.PLAINS, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.PLAINS, BiomePoolTier.BOSS, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.SEEL, Type.WATER, -1, [
+    [ Species.SEEL, PokemonType.WATER, -1, [
       [ Biome.ICE_CAVE, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.DEWGONG, Type.WATER, Type.ICE, [
+    [ Species.DEWGONG, PokemonType.WATER, PokemonType.ICE, [
       [ Biome.ICE_CAVE, BiomePoolTier.COMMON ],
       [ Biome.ICE_CAVE, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.GRIMER, Type.POISON, -1, [
+    [ Species.GRIMER, PokemonType.POISON, -1, [
       [ Biome.SLUM, BiomePoolTier.COMMON ],
       [ Biome.CONSTRUCTION_SITE, BiomePoolTier.UNCOMMON ],
       [ Biome.LABORATORY, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.MUK, Type.POISON, -1, [
+    [ Species.MUK, PokemonType.POISON, -1, [
       [ Biome.CONSTRUCTION_SITE, BiomePoolTier.UNCOMMON ],
       [ Biome.SLUM, BiomePoolTier.COMMON ],
       [ Biome.SLUM, BiomePoolTier.BOSS ],
@@ -2473,84 +2474,84 @@ export function initBiomes() {
       [ Biome.LABORATORY, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.SHELLDER, Type.WATER, -1, [
+    [ Species.SHELLDER, PokemonType.WATER, -1, [
       [ Biome.SEA, BiomePoolTier.UNCOMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]],
       [ Biome.BEACH, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]],
       [ Biome.SEABED, BiomePoolTier.UNCOMMON ]
     ]
     ],
-    [ Species.CLOYSTER, Type.WATER, Type.ICE, [
+    [ Species.CLOYSTER, PokemonType.WATER, PokemonType.ICE, [
       [ Biome.BEACH, BiomePoolTier.BOSS, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]]
     ]
     ],
-    [ Species.GASTLY, Type.GHOST, Type.POISON, [
+    [ Species.GASTLY, PokemonType.GHOST, PokemonType.POISON, [
       [ Biome.GRAVEYARD, BiomePoolTier.COMMON ],
       [ Biome.TEMPLE, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.HAUNTER, Type.GHOST, Type.POISON, [
+    [ Species.HAUNTER, PokemonType.GHOST, PokemonType.POISON, [
       [ Biome.GRAVEYARD, BiomePoolTier.COMMON ],
       [ Biome.TEMPLE, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.GENGAR, Type.GHOST, Type.POISON, [
+    [ Species.GENGAR, PokemonType.GHOST, PokemonType.POISON, [
       [ Biome.GRAVEYARD, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.ONIX, Type.ROCK, Type.GROUND, [
+    [ Species.ONIX, PokemonType.ROCK, PokemonType.GROUND, [
       [ Biome.BADLANDS, BiomePoolTier.RARE ],
       [ Biome.CAVE, BiomePoolTier.RARE ],
       [ Biome.CAVE, BiomePoolTier.BOSS ],
       [ Biome.CONSTRUCTION_SITE, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.DROWZEE, Type.PSYCHIC, -1, [
+    [ Species.DROWZEE, PokemonType.PSYCHIC, -1, [
       [ Biome.RUINS, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.HYPNO, Type.PSYCHIC, -1, [
+    [ Species.HYPNO, PokemonType.PSYCHIC, -1, [
       [ Biome.RUINS, BiomePoolTier.COMMON ],
       [ Biome.RUINS, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.KRABBY, Type.WATER, -1, [
+    [ Species.KRABBY, PokemonType.WATER, -1, [
       [ Biome.BEACH, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.KINGLER, Type.WATER, -1, [
+    [ Species.KINGLER, PokemonType.WATER, -1, [
       [ Biome.BEACH, BiomePoolTier.COMMON ],
       [ Biome.BEACH, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.VOLTORB, Type.ELECTRIC, -1, [
+    [ Species.VOLTORB, PokemonType.ELECTRIC, -1, [
       [ Biome.POWER_PLANT, BiomePoolTier.COMMON ],
       [ Biome.FACTORY, BiomePoolTier.COMMON ],
       [ Biome.LABORATORY, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.ELECTRODE, Type.ELECTRIC, -1, [
+    [ Species.ELECTRODE, PokemonType.ELECTRIC, -1, [
       [ Biome.POWER_PLANT, BiomePoolTier.COMMON ],
       [ Biome.FACTORY, BiomePoolTier.COMMON ],
       [ Biome.LABORATORY, BiomePoolTier.COMMON ],
       [ Biome.LABORATORY, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.EXEGGCUTE, Type.GRASS, Type.PSYCHIC, [
+    [ Species.EXEGGCUTE, PokemonType.GRASS, PokemonType.PSYCHIC, [
       [ Biome.FOREST, BiomePoolTier.RARE, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.JUNGLE, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.EXEGGUTOR, Type.GRASS, Type.PSYCHIC, [
+    [ Species.EXEGGUTOR, PokemonType.GRASS, PokemonType.PSYCHIC, [
       [ Biome.JUNGLE, BiomePoolTier.BOSS, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.CUBONE, Type.GROUND, -1, [
+    [ Species.CUBONE, PokemonType.GROUND, -1, [
       [ Biome.BADLANDS, BiomePoolTier.COMMON, TimeOfDay.NIGHT ],
       [ Biome.GRAVEYARD, BiomePoolTier.UNCOMMON ],
       [ Biome.TEMPLE, BiomePoolTier.UNCOMMON ]
     ]
     ],
-    [ Species.MAROWAK, Type.GROUND, -1, [
+    [ Species.MAROWAK, PokemonType.GROUND, -1, [
       [ Biome.BADLANDS, BiomePoolTier.COMMON, TimeOfDay.NIGHT ],
       [ Biome.GRAVEYARD, BiomePoolTier.UNCOMMON ],
       [ Biome.TEMPLE, BiomePoolTier.UNCOMMON ],
@@ -2558,143 +2559,143 @@ export function initBiomes() {
       [ Biome.GRAVEYARD, BiomePoolTier.BOSS, [ TimeOfDay.DAWN, TimeOfDay.DAY, TimeOfDay.DUSK ]]
     ]
     ],
-    [ Species.HITMONLEE, Type.FIGHTING, -1, [
+    [ Species.HITMONLEE, PokemonType.FIGHTING, -1, [
       [ Biome.DOJO, BiomePoolTier.RARE ],
       [ Biome.DOJO, BiomePoolTier.BOSS ],
       [ Biome.CONSTRUCTION_SITE, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.HITMONCHAN, Type.FIGHTING, -1, [
+    [ Species.HITMONCHAN, PokemonType.FIGHTING, -1, [
       [ Biome.DOJO, BiomePoolTier.RARE ],
       [ Biome.DOJO, BiomePoolTier.BOSS ],
       [ Biome.CONSTRUCTION_SITE, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.LICKITUNG, Type.NORMAL, -1, [
+    [ Species.LICKITUNG, PokemonType.NORMAL, -1, [
       [ Biome.PLAINS, BiomePoolTier.SUPER_RARE ]
     ]
     ],
-    [ Species.KOFFING, Type.POISON, -1, [
+    [ Species.KOFFING, PokemonType.POISON, -1, [
       [ Biome.SLUM, BiomePoolTier.COMMON ],
       [ Biome.CONSTRUCTION_SITE, BiomePoolTier.UNCOMMON ]
     ]
     ],
-    [ Species.WEEZING, Type.POISON, -1, [
+    [ Species.WEEZING, PokemonType.POISON, -1, [
       [ Biome.SLUM, BiomePoolTier.COMMON ],
       [ Biome.SLUM, BiomePoolTier.BOSS ],
       [ Biome.CONSTRUCTION_SITE, BiomePoolTier.UNCOMMON ]
     ]
     ],
-    [ Species.RHYHORN, Type.GROUND, Type.ROCK, [
+    [ Species.RHYHORN, PokemonType.GROUND, PokemonType.ROCK, [
       [ Biome.MOUNTAIN, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]],
       [ Biome.MOUNTAIN, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.BADLANDS, BiomePoolTier.COMMON ],
       [ Biome.CONSTRUCTION_SITE, BiomePoolTier.UNCOMMON ]
     ]
     ],
-    [ Species.RHYDON, Type.GROUND, Type.ROCK, [
+    [ Species.RHYDON, PokemonType.GROUND, PokemonType.ROCK, [
       [ Biome.MOUNTAIN, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]],
       [ Biome.MOUNTAIN, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.BADLANDS, BiomePoolTier.COMMON ],
       [ Biome.CONSTRUCTION_SITE, BiomePoolTier.UNCOMMON ]
     ]
     ],
-    [ Species.CHANSEY, Type.NORMAL, -1, [
+    [ Species.CHANSEY, PokemonType.NORMAL, -1, [
       [ Biome.PLAINS, BiomePoolTier.SUPER_RARE ],
       [ Biome.MEADOW, BiomePoolTier.SUPER_RARE ]
     ]
     ],
-    [ Species.TANGELA, Type.GRASS, -1, [
+    [ Species.TANGELA, PokemonType.GRASS, -1, [
       [ Biome.JUNGLE, BiomePoolTier.UNCOMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]]
     ]
     ],
-    [ Species.KANGASKHAN, Type.NORMAL, -1, [
+    [ Species.KANGASKHAN, PokemonType.NORMAL, -1, [
       [ Biome.JUNGLE, BiomePoolTier.SUPER_RARE ],
       [ Biome.JUNGLE, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.HORSEA, Type.WATER, -1, [
+    [ Species.HORSEA, PokemonType.WATER, -1, [
       [ Biome.SEA, BiomePoolTier.UNCOMMON ]
     ]
     ],
-    [ Species.SEADRA, Type.WATER, -1, [
+    [ Species.SEADRA, PokemonType.WATER, -1, [
       [ Biome.SEA, BiomePoolTier.UNCOMMON ]
     ]
     ],
-    [ Species.GOLDEEN, Type.WATER, -1, [
+    [ Species.GOLDEEN, PokemonType.WATER, -1, [
       [ Biome.LAKE, BiomePoolTier.COMMON ],
       [ Biome.SEA, BiomePoolTier.UNCOMMON ]
     ]
     ],
-    [ Species.SEAKING, Type.WATER, -1, [
+    [ Species.SEAKING, PokemonType.WATER, -1, [
       [ Biome.LAKE, BiomePoolTier.COMMON ],
       [ Biome.LAKE, BiomePoolTier.BOSS ],
       [ Biome.SEA, BiomePoolTier.UNCOMMON ]
     ]
     ],
-    [ Species.STARYU, Type.WATER, -1, [
+    [ Species.STARYU, PokemonType.WATER, -1, [
       [ Biome.BEACH, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.SEA, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.STARMIE, Type.WATER, Type.PSYCHIC, [
+    [ Species.STARMIE, PokemonType.WATER, PokemonType.PSYCHIC, [
       [ Biome.BEACH, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.BEACH, BiomePoolTier.BOSS, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.SEA, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.MR_MIME, Type.PSYCHIC, Type.FAIRY, [
+    [ Species.MR_MIME, PokemonType.PSYCHIC, PokemonType.FAIRY, [
       [ Biome.RUINS, BiomePoolTier.RARE ],
       [ Biome.RUINS, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.SCYTHER, Type.BUG, Type.FLYING, [
+    [ Species.SCYTHER, PokemonType.BUG, PokemonType.FLYING, [
       [ Biome.TALL_GRASS, BiomePoolTier.SUPER_RARE ],
       [ Biome.FOREST, BiomePoolTier.RARE, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]],
       [ Biome.JUNGLE, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.JYNX, Type.ICE, Type.PSYCHIC, [
+    [ Species.JYNX, PokemonType.ICE, PokemonType.PSYCHIC, [
       [ Biome.ICE_CAVE, BiomePoolTier.RARE ],
       [ Biome.ICE_CAVE, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.ELECTABUZZ, Type.ELECTRIC, -1, [
+    [ Species.ELECTABUZZ, PokemonType.ELECTRIC, -1, [
       [ Biome.POWER_PLANT, BiomePoolTier.UNCOMMON ]
     ]
     ],
-    [ Species.MAGMAR, Type.FIRE, -1, [
+    [ Species.MAGMAR, PokemonType.FIRE, -1, [
       [ Biome.VOLCANO, BiomePoolTier.UNCOMMON ]
     ]
     ],
-    [ Species.PINSIR, Type.BUG, -1, [
+    [ Species.PINSIR, PokemonType.BUG, -1, [
       [ Biome.TALL_GRASS, BiomePoolTier.RARE ],
       [ Biome.TALL_GRASS, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.TAUROS, Type.NORMAL, -1, [
+    [ Species.TAUROS, PokemonType.NORMAL, -1, [
       [ Biome.MEADOW, BiomePoolTier.RARE ],
       [ Biome.MEADOW, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.MAGIKARP, Type.WATER, -1, [
+    [ Species.MAGIKARP, PokemonType.WATER, -1, [
       [ Biome.SEA, BiomePoolTier.COMMON ],
       [ Biome.LAKE, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.GYARADOS, Type.WATER, Type.FLYING, [
+    [ Species.GYARADOS, PokemonType.WATER, PokemonType.FLYING, [
       [ Biome.SEA, BiomePoolTier.COMMON ],
       [ Biome.LAKE, BiomePoolTier.COMMON ],
       [ Biome.LAKE, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.LAPRAS, Type.WATER, Type.ICE, [
+    [ Species.LAPRAS, PokemonType.WATER, PokemonType.ICE, [
       [ Biome.SEA, BiomePoolTier.RARE ],
       [ Biome.ICE_CAVE, BiomePoolTier.RARE ],
       [ Biome.ICE_CAVE, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.DITTO, Type.NORMAL, -1, [
+    [ Species.DITTO, PokemonType.NORMAL, -1, [
       [ Biome.TOWN, BiomePoolTier.ULTRA_RARE ],
       [ Biome.PLAINS, BiomePoolTier.ULTRA_RARE ],
       [ Biome.METROPOLIS, BiomePoolTier.SUPER_RARE ],
@@ -2702,164 +2703,164 @@ export function initBiomes() {
       [ Biome.LABORATORY, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.EEVEE, Type.NORMAL, -1, [
+    [ Species.EEVEE, PokemonType.NORMAL, -1, [
       [ Biome.TOWN, BiomePoolTier.SUPER_RARE ],
       [ Biome.PLAINS, BiomePoolTier.SUPER_RARE ],
       [ Biome.METROPOLIS, BiomePoolTier.SUPER_RARE ],
       [ Biome.MEADOW, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.VAPOREON, Type.WATER, -1, [
+    [ Species.VAPOREON, PokemonType.WATER, -1, [
       [ Biome.LAKE, BiomePoolTier.SUPER_RARE ],
       [ Biome.LAKE, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.JOLTEON, Type.ELECTRIC, -1, [
+    [ Species.JOLTEON, PokemonType.ELECTRIC, -1, [
       [ Biome.POWER_PLANT, BiomePoolTier.SUPER_RARE ],
       [ Biome.POWER_PLANT, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.FLAREON, Type.FIRE, -1, [
+    [ Species.FLAREON, PokemonType.FIRE, -1, [
       [ Biome.VOLCANO, BiomePoolTier.SUPER_RARE ],
       [ Biome.VOLCANO, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.PORYGON, Type.NORMAL, -1, [
+    [ Species.PORYGON, PokemonType.NORMAL, -1, [
       [ Biome.FACTORY, BiomePoolTier.RARE ],
       [ Biome.SPACE, BiomePoolTier.SUPER_RARE ],
       [ Biome.LABORATORY, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.OMANYTE, Type.ROCK, Type.WATER, [
+    [ Species.OMANYTE, PokemonType.ROCK, PokemonType.WATER, [
       [ Biome.SEABED, BiomePoolTier.SUPER_RARE ]
     ]
     ],
-    [ Species.OMASTAR, Type.ROCK, Type.WATER, [
+    [ Species.OMASTAR, PokemonType.ROCK, PokemonType.WATER, [
       [ Biome.SEABED, BiomePoolTier.SUPER_RARE ],
       [ Biome.SEABED, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.KABUTO, Type.ROCK, Type.WATER, [
+    [ Species.KABUTO, PokemonType.ROCK, PokemonType.WATER, [
       [ Biome.SEABED, BiomePoolTier.SUPER_RARE ]
     ]
     ],
-    [ Species.KABUTOPS, Type.ROCK, Type.WATER, [
+    [ Species.KABUTOPS, PokemonType.ROCK, PokemonType.WATER, [
       [ Biome.SEABED, BiomePoolTier.SUPER_RARE ],
       [ Biome.SEABED, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.AERODACTYL, Type.ROCK, Type.FLYING, [
+    [ Species.AERODACTYL, PokemonType.ROCK, PokemonType.FLYING, [
       [ Biome.WASTELAND, BiomePoolTier.SUPER_RARE ],
       [ Biome.WASTELAND, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.SNORLAX, Type.NORMAL, -1, [
+    [ Species.SNORLAX, PokemonType.NORMAL, -1, [
       [ Biome.PLAINS, BiomePoolTier.SUPER_RARE ],
       [ Biome.PLAINS, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.ARTICUNO, Type.ICE, Type.FLYING, [
+    [ Species.ARTICUNO, PokemonType.ICE, PokemonType.FLYING, [
       [ Biome.ICE_CAVE, BiomePoolTier.ULTRA_RARE ],
       [ Biome.ICE_CAVE, BiomePoolTier.BOSS_SUPER_RARE ]
     ]
     ],
-    [ Species.ZAPDOS, Type.ELECTRIC, Type.FLYING, [
+    [ Species.ZAPDOS, PokemonType.ELECTRIC, PokemonType.FLYING, [
       [ Biome.POWER_PLANT, BiomePoolTier.BOSS_SUPER_RARE ]
     ]
     ],
-    [ Species.MOLTRES, Type.FIRE, Type.FLYING, [
+    [ Species.MOLTRES, PokemonType.FIRE, PokemonType.FLYING, [
       [ Biome.VOLCANO, BiomePoolTier.BOSS_SUPER_RARE ]
     ]
     ],
-    [ Species.DRATINI, Type.DRAGON, -1, [
+    [ Species.DRATINI, PokemonType.DRAGON, -1, [
       [ Biome.WASTELAND, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.DRAGONAIR, Type.DRAGON, -1, [
+    [ Species.DRAGONAIR, PokemonType.DRAGON, -1, [
       [ Biome.WASTELAND, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.DRAGONITE, Type.DRAGON, Type.FLYING, [
+    [ Species.DRAGONITE, PokemonType.DRAGON, PokemonType.FLYING, [
       [ Biome.WASTELAND, BiomePoolTier.RARE ],
       [ Biome.WASTELAND, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.MEWTWO, Type.PSYCHIC, -1, [
+    [ Species.MEWTWO, PokemonType.PSYCHIC, -1, [
       [ Biome.LABORATORY, BiomePoolTier.BOSS_ULTRA_RARE ]
     ]
     ],
-    [ Species.MEW, Type.PSYCHIC, -1, [ ]
+    [ Species.MEW, PokemonType.PSYCHIC, -1, [ ]
     ],
-    [ Species.CHIKORITA, Type.GRASS, -1, [
+    [ Species.CHIKORITA, PokemonType.GRASS, -1, [
       [ Biome.TALL_GRASS, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.BAYLEEF, Type.GRASS, -1, [
+    [ Species.BAYLEEF, PokemonType.GRASS, -1, [
       [ Biome.TALL_GRASS, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.MEGANIUM, Type.GRASS, -1, [
+    [ Species.MEGANIUM, PokemonType.GRASS, -1, [
       [ Biome.TALL_GRASS, BiomePoolTier.RARE ],
       [ Biome.TALL_GRASS, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.CYNDAQUIL, Type.FIRE, -1, [
+    [ Species.CYNDAQUIL, PokemonType.FIRE, -1, [
       [ Biome.VOLCANO, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.QUILAVA, Type.FIRE, -1, [
+    [ Species.QUILAVA, PokemonType.FIRE, -1, [
       [ Biome.VOLCANO, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.TYPHLOSION, Type.FIRE, -1, [
+    [ Species.TYPHLOSION, PokemonType.FIRE, -1, [
       [ Biome.VOLCANO, BiomePoolTier.RARE ],
       [ Biome.VOLCANO, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.TOTODILE, Type.WATER, -1, [
+    [ Species.TOTODILE, PokemonType.WATER, -1, [
       [ Biome.SWAMP, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.CROCONAW, Type.WATER, -1, [
+    [ Species.CROCONAW, PokemonType.WATER, -1, [
       [ Biome.SWAMP, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.FERALIGATR, Type.WATER, -1, [
+    [ Species.FERALIGATR, PokemonType.WATER, -1, [
       [ Biome.SWAMP, BiomePoolTier.RARE ],
       [ Biome.SWAMP, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.SENTRET, Type.NORMAL, -1, [
+    [ Species.SENTRET, PokemonType.NORMAL, -1, [
       [ Biome.TOWN, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.PLAINS, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.FURRET, Type.NORMAL, -1, [
+    [ Species.FURRET, PokemonType.NORMAL, -1, [
       [ Biome.PLAINS, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.PLAINS, BiomePoolTier.BOSS, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.HOOTHOOT, Type.NORMAL, Type.FLYING, [
+    [ Species.HOOTHOOT, PokemonType.NORMAL, PokemonType.FLYING, [
       [ Biome.TOWN, BiomePoolTier.COMMON, TimeOfDay.NIGHT ],
       [ Biome.FOREST, BiomePoolTier.UNCOMMON, TimeOfDay.NIGHT ]
     ]
     ],
-    [ Species.NOCTOWL, Type.NORMAL, Type.FLYING, [
+    [ Species.NOCTOWL, PokemonType.NORMAL, PokemonType.FLYING, [
       [ Biome.FOREST, BiomePoolTier.UNCOMMON, TimeOfDay.NIGHT ],
       [ Biome.FOREST, BiomePoolTier.BOSS, TimeOfDay.NIGHT ]
     ]
     ],
-    [ Species.LEDYBA, Type.BUG, Type.FLYING, [
+    [ Species.LEDYBA, PokemonType.BUG, PokemonType.FLYING, [
       [ Biome.TOWN, BiomePoolTier.COMMON, TimeOfDay.DAWN ],
       [ Biome.MEADOW, BiomePoolTier.COMMON, TimeOfDay.DAWN ]
     ]
     ],
-    [ Species.LEDIAN, Type.BUG, Type.FLYING, [
+    [ Species.LEDIAN, PokemonType.BUG, PokemonType.FLYING, [
       [ Biome.MEADOW, BiomePoolTier.COMMON, TimeOfDay.DAWN ],
       [ Biome.MEADOW, BiomePoolTier.BOSS, TimeOfDay.DAWN ]
     ]
     ],
-    [ Species.SPINARAK, Type.BUG, Type.POISON, [
+    [ Species.SPINARAK, PokemonType.BUG, PokemonType.POISON, [
       [ Biome.TOWN, BiomePoolTier.UNCOMMON, TimeOfDay.DUSK ],
       [ Biome.TOWN, BiomePoolTier.COMMON, TimeOfDay.NIGHT ],
       [ Biome.TALL_GRASS, BiomePoolTier.UNCOMMON, TimeOfDay.NIGHT ],
@@ -2869,7 +2870,7 @@ export function initBiomes() {
       [ Biome.JUNGLE, BiomePoolTier.COMMON, TimeOfDay.NIGHT ]
     ]
     ],
-    [ Species.ARIADOS, Type.BUG, Type.POISON, [
+    [ Species.ARIADOS, PokemonType.BUG, PokemonType.POISON, [
       [ Biome.TALL_GRASS, BiomePoolTier.UNCOMMON, TimeOfDay.NIGHT ],
       [ Biome.FOREST, BiomePoolTier.UNCOMMON, TimeOfDay.DUSK ],
       [ Biome.FOREST, BiomePoolTier.COMMON, TimeOfDay.NIGHT ],
@@ -2878,227 +2879,227 @@ export function initBiomes() {
       [ Biome.JUNGLE, BiomePoolTier.COMMON, TimeOfDay.NIGHT ]
     ]
     ],
-    [ Species.CROBAT, Type.POISON, Type.FLYING, [
+    [ Species.CROBAT, PokemonType.POISON, PokemonType.FLYING, [
       [ Biome.CAVE, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.CHINCHOU, Type.WATER, Type.ELECTRIC, [
+    [ Species.CHINCHOU, PokemonType.WATER, PokemonType.ELECTRIC, [
       [ Biome.SEA, BiomePoolTier.UNCOMMON, TimeOfDay.NIGHT ],
       [ Biome.SEABED, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.LANTURN, Type.WATER, Type.ELECTRIC, [
+    [ Species.LANTURN, PokemonType.WATER, PokemonType.ELECTRIC, [
       [ Biome.SEA, BiomePoolTier.UNCOMMON, TimeOfDay.NIGHT ],
       [ Biome.SEABED, BiomePoolTier.COMMON ],
       [ Biome.SEABED, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.PICHU, Type.ELECTRIC, -1, [ ]
+    [ Species.PICHU, PokemonType.ELECTRIC, -1, [ ]
     ],
-    [ Species.CLEFFA, Type.FAIRY, -1, [ ]
+    [ Species.CLEFFA, PokemonType.FAIRY, -1, [ ]
     ],
-    [ Species.IGGLYBUFF, Type.NORMAL, Type.FAIRY, [ ]
+    [ Species.IGGLYBUFF, PokemonType.NORMAL, PokemonType.FAIRY, [ ]
     ],
-    [ Species.TOGEPI, Type.FAIRY, -1, [ ]
+    [ Species.TOGEPI, PokemonType.FAIRY, -1, [ ]
     ],
-    [ Species.TOGETIC, Type.FAIRY, Type.FLYING, [
+    [ Species.TOGETIC, PokemonType.FAIRY, PokemonType.FLYING, [
       [ Biome.FAIRY_CAVE, BiomePoolTier.UNCOMMON ]
     ]
     ],
-    [ Species.NATU, Type.PSYCHIC, Type.FLYING, [
+    [ Species.NATU, PokemonType.PSYCHIC, PokemonType.FLYING, [
       [ Biome.MOUNTAIN, BiomePoolTier.UNCOMMON ],
       [ Biome.RUINS, BiomePoolTier.COMMON ],
       [ Biome.TEMPLE, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.XATU, Type.PSYCHIC, Type.FLYING, [
+    [ Species.XATU, PokemonType.PSYCHIC, PokemonType.FLYING, [
       [ Biome.MOUNTAIN, BiomePoolTier.UNCOMMON ],
       [ Biome.RUINS, BiomePoolTier.COMMON ],
       [ Biome.RUINS, BiomePoolTier.BOSS ],
       [ Biome.TEMPLE, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.MAREEP, Type.ELECTRIC, -1, [
+    [ Species.MAREEP, PokemonType.ELECTRIC, -1, [
       [ Biome.MEADOW, BiomePoolTier.UNCOMMON ],
       [ Biome.POWER_PLANT, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.FLAAFFY, Type.ELECTRIC, -1, [
+    [ Species.FLAAFFY, PokemonType.ELECTRIC, -1, [
       [ Biome.MEADOW, BiomePoolTier.UNCOMMON ],
       [ Biome.POWER_PLANT, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.AMPHAROS, Type.ELECTRIC, -1, [
+    [ Species.AMPHAROS, PokemonType.ELECTRIC, -1, [
       [ Biome.MEADOW, BiomePoolTier.UNCOMMON ],
       [ Biome.POWER_PLANT, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.BELLOSSOM, Type.GRASS, -1, [
+    [ Species.BELLOSSOM, PokemonType.GRASS, -1, [
       [ Biome.TALL_GRASS, BiomePoolTier.BOSS_RARE, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.MARILL, Type.WATER, Type.FAIRY, [
+    [ Species.MARILL, PokemonType.WATER, PokemonType.FAIRY, [
       [ Biome.LAKE, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]],
       [ Biome.FAIRY_CAVE, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.AZUMARILL, Type.WATER, Type.FAIRY, [
+    [ Species.AZUMARILL, PokemonType.WATER, PokemonType.FAIRY, [
       [ Biome.LAKE, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]],
       [ Biome.LAKE, BiomePoolTier.BOSS, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]],
       [ Biome.FAIRY_CAVE, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.SUDOWOODO, Type.ROCK, -1, [
+    [ Species.SUDOWOODO, PokemonType.ROCK, -1, [
       [ Biome.GRASS, BiomePoolTier.SUPER_RARE ],
       [ Biome.GRASS, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.POLITOED, Type.WATER, -1, [
+    [ Species.POLITOED, PokemonType.WATER, -1, [
       [ Biome.SWAMP, BiomePoolTier.SUPER_RARE ],
       [ Biome.SWAMP, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.HOPPIP, Type.GRASS, Type.FLYING, [
+    [ Species.HOPPIP, PokemonType.GRASS, PokemonType.FLYING, [
       [ Biome.TOWN, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.GRASS, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.SKIPLOOM, Type.GRASS, Type.FLYING, [
+    [ Species.SKIPLOOM, PokemonType.GRASS, PokemonType.FLYING, [
       [ Biome.GRASS, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.JUMPLUFF, Type.GRASS, Type.FLYING, [
+    [ Species.JUMPLUFF, PokemonType.GRASS, PokemonType.FLYING, [
       [ Biome.GRASS, BiomePoolTier.BOSS, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.AIPOM, Type.NORMAL, -1, [
+    [ Species.AIPOM, PokemonType.NORMAL, -1, [
       [ Biome.JUNGLE, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.SUNKERN, Type.GRASS, -1, [
+    [ Species.SUNKERN, PokemonType.GRASS, -1, [
       [ Biome.TOWN, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.GRASS, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.SUNFLORA, Type.GRASS, -1, [
+    [ Species.SUNFLORA, PokemonType.GRASS, -1, [
       [ Biome.GRASS, BiomePoolTier.BOSS, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.YANMA, Type.BUG, Type.FLYING, [
+    [ Species.YANMA, PokemonType.BUG, PokemonType.FLYING, [
       [ Biome.JUNGLE, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.WOOPER, Type.WATER, Type.GROUND, [
+    [ Species.WOOPER, PokemonType.WATER, PokemonType.GROUND, [
       [ Biome.LAKE, BiomePoolTier.UNCOMMON ],
       [ Biome.SWAMP, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.QUAGSIRE, Type.WATER, Type.GROUND, [
+    [ Species.QUAGSIRE, PokemonType.WATER, PokemonType.GROUND, [
       [ Biome.LAKE, BiomePoolTier.UNCOMMON ],
       [ Biome.SWAMP, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.SWAMP, BiomePoolTier.BOSS, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.ESPEON, Type.PSYCHIC, -1, [
+    [ Species.ESPEON, PokemonType.PSYCHIC, -1, [
       [ Biome.RUINS, BiomePoolTier.SUPER_RARE, TimeOfDay.DAY ],
       [ Biome.RUINS, BiomePoolTier.BOSS_RARE, TimeOfDay.DAY ]
     ]
     ],
-    [ Species.UMBREON, Type.DARK, -1, [
+    [ Species.UMBREON, PokemonType.DARK, -1, [
       [ Biome.ABYSS, BiomePoolTier.SUPER_RARE ],
       [ Biome.ABYSS, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.MURKROW, Type.DARK, Type.FLYING, [
+    [ Species.MURKROW, PokemonType.DARK, PokemonType.FLYING, [
       [ Biome.MOUNTAIN, BiomePoolTier.RARE, TimeOfDay.NIGHT ],
       [ Biome.ABYSS, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.SLOWKING, Type.WATER, Type.PSYCHIC, [
+    [ Species.SLOWKING, PokemonType.WATER, PokemonType.PSYCHIC, [
       [ Biome.LAKE, BiomePoolTier.SUPER_RARE ],
       [ Biome.LAKE, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.MISDREAVUS, Type.GHOST, -1, [
+    [ Species.MISDREAVUS, PokemonType.GHOST, -1, [
       [ Biome.GRAVEYARD, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.UNOWN, Type.PSYCHIC, -1, [
+    [ Species.UNOWN, PokemonType.PSYCHIC, -1, [
       [ Biome.RUINS, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.WOBBUFFET, Type.PSYCHIC, -1, [
+    [ Species.WOBBUFFET, PokemonType.PSYCHIC, -1, [
       [ Biome.RUINS, BiomePoolTier.RARE ],
       [ Biome.RUINS, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.GIRAFARIG, Type.NORMAL, Type.PSYCHIC, [
+    [ Species.GIRAFARIG, PokemonType.NORMAL, PokemonType.PSYCHIC, [
       [ Biome.TALL_GRASS, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.PINECO, Type.BUG, -1, [
+    [ Species.PINECO, PokemonType.BUG, -1, [
       [ Biome.FOREST, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]]
     ]
     ],
-    [ Species.FORRETRESS, Type.BUG, Type.STEEL, [
+    [ Species.FORRETRESS, PokemonType.BUG, PokemonType.STEEL, [
       [ Biome.FOREST, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]],
       [ Biome.FOREST, BiomePoolTier.BOSS, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]]
     ]
     ],
-    [ Species.DUNSPARCE, Type.NORMAL, -1, [
+    [ Species.DUNSPARCE, PokemonType.NORMAL, -1, [
       [ Biome.PLAINS, BiomePoolTier.SUPER_RARE ]
     ]
     ],
-    [ Species.GLIGAR, Type.GROUND, Type.FLYING, [
+    [ Species.GLIGAR, PokemonType.GROUND, PokemonType.FLYING, [
       [ Biome.BADLANDS, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.STEELIX, Type.STEEL, Type.GROUND, [
+    [ Species.STEELIX, PokemonType.STEEL, PokemonType.GROUND, [
       [ Biome.BADLANDS, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.SNUBBULL, Type.FAIRY, -1, [
+    [ Species.SNUBBULL, PokemonType.FAIRY, -1, [
       [ Biome.MEADOW, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.GRANBULL, Type.FAIRY, -1, [
+    [ Species.GRANBULL, PokemonType.FAIRY, -1, [
       [ Biome.MEADOW, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.MEADOW, BiomePoolTier.BOSS, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.QWILFISH, Type.WATER, Type.POISON, [
+    [ Species.QWILFISH, PokemonType.WATER, PokemonType.POISON, [
       [ Biome.SEABED, BiomePoolTier.RARE ],
       [ Biome.SEABED, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.SCIZOR, Type.BUG, Type.STEEL, [
+    [ Species.SCIZOR, PokemonType.BUG, PokemonType.STEEL, [
       [ Biome.JUNGLE, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.SHUCKLE, Type.BUG, Type.ROCK, [
+    [ Species.SHUCKLE, PokemonType.BUG, PokemonType.ROCK, [
       [ Biome.CAVE, BiomePoolTier.SUPER_RARE ],
       [ Biome.CAVE, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.HERACROSS, Type.BUG, Type.FIGHTING, [
+    [ Species.HERACROSS, PokemonType.BUG, PokemonType.FIGHTING, [
       [ Biome.FOREST, BiomePoolTier.RARE ],
       [ Biome.FOREST, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.SNEASEL, Type.DARK, Type.ICE, [
+    [ Species.SNEASEL, PokemonType.DARK, PokemonType.ICE, [
       [ Biome.ICE_CAVE, BiomePoolTier.UNCOMMON ],
       [ Biome.SNOWY_FOREST, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]],
       [ Biome.SNOWY_FOREST, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.TEDDIURSA, Type.NORMAL, -1, [
+    [ Species.TEDDIURSA, PokemonType.NORMAL, -1, [
       [ Biome.FOREST, BiomePoolTier.UNCOMMON ],
       [ Biome.CAVE, BiomePoolTier.COMMON ],
       [ Biome.SNOWY_FOREST, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]],
       [ Biome.SNOWY_FOREST, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.URSARING, Type.NORMAL, -1, [
+    [ Species.URSARING, PokemonType.NORMAL, -1, [
       [ Biome.FOREST, BiomePoolTier.UNCOMMON ],
       [ Biome.CAVE, BiomePoolTier.COMMON ],
       [ Biome.CAVE, BiomePoolTier.BOSS ],
@@ -3106,926 +3107,926 @@ export function initBiomes() {
       [ Biome.SNOWY_FOREST, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.SLUGMA, Type.FIRE, -1, [
+    [ Species.SLUGMA, PokemonType.FIRE, -1, [
       [ Biome.MOUNTAIN, BiomePoolTier.UNCOMMON ],
       [ Biome.VOLCANO, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.MAGCARGO, Type.FIRE, Type.ROCK, [
+    [ Species.MAGCARGO, PokemonType.FIRE, PokemonType.ROCK, [
       [ Biome.MOUNTAIN, BiomePoolTier.UNCOMMON ],
       [ Biome.VOLCANO, BiomePoolTier.COMMON ],
       [ Biome.VOLCANO, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.SWINUB, Type.ICE, Type.GROUND, [
+    [ Species.SWINUB, PokemonType.ICE, PokemonType.GROUND, [
       [ Biome.ICE_CAVE, BiomePoolTier.COMMON ],
       [ Biome.SNOWY_FOREST, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.PILOSWINE, Type.ICE, Type.GROUND, [
+    [ Species.PILOSWINE, PokemonType.ICE, PokemonType.GROUND, [
       [ Biome.ICE_CAVE, BiomePoolTier.COMMON ],
       [ Biome.SNOWY_FOREST, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.CORSOLA, Type.WATER, Type.ROCK, [
+    [ Species.CORSOLA, PokemonType.WATER, PokemonType.ROCK, [
       [ Biome.SEABED, BiomePoolTier.RARE ],
       [ Biome.SEABED, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.REMORAID, Type.WATER, -1, [
+    [ Species.REMORAID, PokemonType.WATER, -1, [
       [ Biome.SEABED, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.OCTILLERY, Type.WATER, -1, [
+    [ Species.OCTILLERY, PokemonType.WATER, -1, [
       [ Biome.SEABED, BiomePoolTier.RARE ],
       [ Biome.SEABED, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.DELIBIRD, Type.ICE, Type.FLYING, [
+    [ Species.DELIBIRD, PokemonType.ICE, PokemonType.FLYING, [
       [ Biome.ICE_CAVE, BiomePoolTier.SUPER_RARE ],
       [ Biome.SNOWY_FOREST, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.MANTINE, Type.WATER, Type.FLYING, [
+    [ Species.MANTINE, PokemonType.WATER, PokemonType.FLYING, [
       [ Biome.SEABED, BiomePoolTier.RARE ],
       [ Biome.SEABED, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.SKARMORY, Type.STEEL, Type.FLYING, [
+    [ Species.SKARMORY, PokemonType.STEEL, PokemonType.FLYING, [
       [ Biome.MOUNTAIN, BiomePoolTier.RARE ],
       [ Biome.MOUNTAIN, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.HOUNDOUR, Type.DARK, Type.FIRE, [
+    [ Species.HOUNDOUR, PokemonType.DARK, PokemonType.FIRE, [
       [ Biome.METROPOLIS, BiomePoolTier.COMMON, TimeOfDay.NIGHT ],
       [ Biome.ABYSS, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.HOUNDOOM, Type.DARK, Type.FIRE, [
+    [ Species.HOUNDOOM, PokemonType.DARK, PokemonType.FIRE, [
       [ Biome.METROPOLIS, BiomePoolTier.COMMON, TimeOfDay.NIGHT ],
       [ Biome.ABYSS, BiomePoolTier.COMMON ],
       [ Biome.ABYSS, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.KINGDRA, Type.WATER, Type.DRAGON, [
+    [ Species.KINGDRA, PokemonType.WATER, PokemonType.DRAGON, [
       [ Biome.SEA, BiomePoolTier.SUPER_RARE ],
       [ Biome.SEA, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.PHANPY, Type.GROUND, -1, [
+    [ Species.PHANPY, PokemonType.GROUND, -1, [
       [ Biome.BADLANDS, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.DONPHAN, Type.GROUND, -1, [
+    [ Species.DONPHAN, PokemonType.GROUND, -1, [
       [ Biome.BADLANDS, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.BADLANDS, BiomePoolTier.BOSS, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.PORYGON2, Type.NORMAL, -1, [
+    [ Species.PORYGON2, PokemonType.NORMAL, -1, [
       [ Biome.FACTORY, BiomePoolTier.RARE ],
       [ Biome.SPACE, BiomePoolTier.SUPER_RARE ],
       [ Biome.LABORATORY, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.STANTLER, Type.NORMAL, -1, [
+    [ Species.STANTLER, PokemonType.NORMAL, -1, [
       [ Biome.FOREST, BiomePoolTier.RARE, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.FOREST, BiomePoolTier.BOSS_RARE, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.SNOWY_FOREST, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.SMEARGLE, Type.NORMAL, -1, [
+    [ Species.SMEARGLE, PokemonType.NORMAL, -1, [
       [ Biome.METROPOLIS, BiomePoolTier.SUPER_RARE ]
     ]
     ],
-    [ Species.TYROGUE, Type.FIGHTING, -1, [ ]
+    [ Species.TYROGUE, PokemonType.FIGHTING, -1, [ ]
     ],
-    [ Species.HITMONTOP, Type.FIGHTING, -1, [
+    [ Species.HITMONTOP, PokemonType.FIGHTING, -1, [
       [ Biome.DOJO, BiomePoolTier.SUPER_RARE ],
       [ Biome.DOJO, BiomePoolTier.BOSS_RARE ],
       [ Biome.CONSTRUCTION_SITE, BiomePoolTier.SUPER_RARE ]
     ]
     ],
-    [ Species.SMOOCHUM, Type.ICE, Type.PSYCHIC, [ ]
+    [ Species.SMOOCHUM, PokemonType.ICE, PokemonType.PSYCHIC, [ ]
     ],
-    [ Species.ELEKID, Type.ELECTRIC, -1, [ ]
+    [ Species.ELEKID, PokemonType.ELECTRIC, -1, [ ]
     ],
-    [ Species.MAGBY, Type.FIRE, -1, [ ]
+    [ Species.MAGBY, PokemonType.FIRE, -1, [ ]
     ],
-    [ Species.MILTANK, Type.NORMAL, -1, [
+    [ Species.MILTANK, PokemonType.NORMAL, -1, [
       [ Biome.MEADOW, BiomePoolTier.RARE ],
       [ Biome.MEADOW, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.BLISSEY, Type.NORMAL, -1, [
+    [ Species.BLISSEY, PokemonType.NORMAL, -1, [
       [ Biome.MEADOW, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.RAIKOU, Type.ELECTRIC, -1, [
+    [ Species.RAIKOU, PokemonType.ELECTRIC, -1, [
       [ Biome.POWER_PLANT, BiomePoolTier.ULTRA_RARE ],
       [ Biome.POWER_PLANT, BiomePoolTier.BOSS_SUPER_RARE ]
     ]
     ],
-    [ Species.ENTEI, Type.FIRE, -1, [
+    [ Species.ENTEI, PokemonType.FIRE, -1, [
       [ Biome.VOLCANO, BiomePoolTier.ULTRA_RARE ],
       [ Biome.VOLCANO, BiomePoolTier.BOSS_SUPER_RARE ]
     ]
     ],
-    [ Species.SUICUNE, Type.WATER, -1, [
+    [ Species.SUICUNE, PokemonType.WATER, -1, [
       [ Biome.LAKE, BiomePoolTier.ULTRA_RARE ],
       [ Biome.LAKE, BiomePoolTier.BOSS_SUPER_RARE ]
     ]
     ],
-    [ Species.LARVITAR, Type.ROCK, Type.GROUND, [
+    [ Species.LARVITAR, PokemonType.ROCK, PokemonType.GROUND, [
       [ Biome.MOUNTAIN, BiomePoolTier.SUPER_RARE ],
       [ Biome.WASTELAND, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]]
     ]
     ],
-    [ Species.PUPITAR, Type.ROCK, Type.GROUND, [
+    [ Species.PUPITAR, PokemonType.ROCK, PokemonType.GROUND, [
       [ Biome.MOUNTAIN, BiomePoolTier.SUPER_RARE ],
       [ Biome.WASTELAND, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]]
     ]
     ],
-    [ Species.TYRANITAR, Type.ROCK, Type.DARK, [
+    [ Species.TYRANITAR, PokemonType.ROCK, PokemonType.DARK, [
       [ Biome.WASTELAND, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]],
       [ Biome.WASTELAND, BiomePoolTier.BOSS, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]]
     ]
     ],
-    [ Species.LUGIA, Type.PSYCHIC, Type.FLYING, [
+    [ Species.LUGIA, PokemonType.PSYCHIC, PokemonType.FLYING, [
       [ Biome.SEA, BiomePoolTier.BOSS_ULTRA_RARE ]
     ]
     ],
-    [ Species.HO_OH, Type.FIRE, Type.FLYING, [
+    [ Species.HO_OH, PokemonType.FIRE, PokemonType.FLYING, [
       [ Biome.MOUNTAIN, BiomePoolTier.BOSS_ULTRA_RARE ]
     ]
     ],
-    [ Species.CELEBI, Type.PSYCHIC, Type.GRASS, [ ]
+    [ Species.CELEBI, PokemonType.PSYCHIC, PokemonType.GRASS, [ ]
     ],
-    [ Species.TREECKO, Type.GRASS, -1, [
+    [ Species.TREECKO, PokemonType.GRASS, -1, [
       [ Biome.FOREST, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.GROVYLE, Type.GRASS, -1, [
+    [ Species.GROVYLE, PokemonType.GRASS, -1, [
       [ Biome.FOREST, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.SCEPTILE, Type.GRASS, -1, [
+    [ Species.SCEPTILE, PokemonType.GRASS, -1, [
       [ Biome.FOREST, BiomePoolTier.RARE ],
       [ Biome.FOREST, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.TORCHIC, Type.FIRE, -1, [
+    [ Species.TORCHIC, PokemonType.FIRE, -1, [
       [ Biome.MOUNTAIN, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.COMBUSKEN, Type.FIRE, Type.FIGHTING, [
+    [ Species.COMBUSKEN, PokemonType.FIRE, PokemonType.FIGHTING, [
       [ Biome.MOUNTAIN, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.BLAZIKEN, Type.FIRE, Type.FIGHTING, [
+    [ Species.BLAZIKEN, PokemonType.FIRE, PokemonType.FIGHTING, [
       [ Biome.MOUNTAIN, BiomePoolTier.RARE ],
       [ Biome.MOUNTAIN, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.MUDKIP, Type.WATER, -1, [
+    [ Species.MUDKIP, PokemonType.WATER, -1, [
       [ Biome.SWAMP, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.MARSHTOMP, Type.WATER, Type.GROUND, [
+    [ Species.MARSHTOMP, PokemonType.WATER, PokemonType.GROUND, [
       [ Biome.SWAMP, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.SWAMPERT, Type.WATER, Type.GROUND, [
+    [ Species.SWAMPERT, PokemonType.WATER, PokemonType.GROUND, [
       [ Biome.SWAMP, BiomePoolTier.RARE ],
       [ Biome.SWAMP, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.POOCHYENA, Type.DARK, -1, [
+    [ Species.POOCHYENA, PokemonType.DARK, -1, [
       [ Biome.TOWN, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.TOWN, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]],
       [ Biome.PLAINS, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.PLAINS, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]]
     ]
     ],
-    [ Species.MIGHTYENA, Type.DARK, -1, [
+    [ Species.MIGHTYENA, PokemonType.DARK, -1, [
       [ Biome.PLAINS, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.PLAINS, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]],
       [ Biome.PLAINS, BiomePoolTier.BOSS, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]]
     ]
     ],
-    [ Species.ZIGZAGOON, Type.NORMAL, -1, [
+    [ Species.ZIGZAGOON, PokemonType.NORMAL, -1, [
       [ Biome.TOWN, BiomePoolTier.COMMON ],
       [ Biome.PLAINS, BiomePoolTier.COMMON ],
       [ Biome.METROPOLIS, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.LINOONE, Type.NORMAL, -1, [
+    [ Species.LINOONE, PokemonType.NORMAL, -1, [
       [ Biome.PLAINS, BiomePoolTier.COMMON ],
       [ Biome.PLAINS, BiomePoolTier.BOSS ],
       [ Biome.METROPOLIS, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.WURMPLE, Type.BUG, -1, [
+    [ Species.WURMPLE, PokemonType.BUG, -1, [
       [ Biome.TOWN, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.SILCOON, Type.BUG, -1, [
+    [ Species.SILCOON, PokemonType.BUG, -1, [
       [ Biome.TOWN, BiomePoolTier.COMMON, TimeOfDay.DAY ]
     ]
     ],
-    [ Species.BEAUTIFLY, Type.BUG, Type.FLYING, [
+    [ Species.BEAUTIFLY, PokemonType.BUG, PokemonType.FLYING, [
       [ Biome.FOREST, BiomePoolTier.COMMON, TimeOfDay.DAY ],
       [ Biome.FOREST, BiomePoolTier.BOSS, TimeOfDay.DAY ]
     ]
     ],
-    [ Species.CASCOON, Type.BUG, -1, [
+    [ Species.CASCOON, PokemonType.BUG, -1, [
       [ Biome.TOWN, BiomePoolTier.COMMON, TimeOfDay.NIGHT ]
     ]
     ],
-    [ Species.DUSTOX, Type.BUG, Type.POISON, [
+    [ Species.DUSTOX, PokemonType.BUG, PokemonType.POISON, [
       [ Biome.FOREST, BiomePoolTier.COMMON, TimeOfDay.NIGHT ],
       [ Biome.FOREST, BiomePoolTier.BOSS, TimeOfDay.NIGHT ]
     ]
     ],
-    [ Species.LOTAD, Type.WATER, Type.GRASS, [
+    [ Species.LOTAD, PokemonType.WATER, PokemonType.GRASS, [
       [ Biome.TOWN, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.LAKE, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.SWAMP, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.LOMBRE, Type.WATER, Type.GRASS, [
+    [ Species.LOMBRE, PokemonType.WATER, PokemonType.GRASS, [
       [ Biome.LAKE, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.SWAMP, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.LUDICOLO, Type.WATER, Type.GRASS, [
+    [ Species.LUDICOLO, PokemonType.WATER, PokemonType.GRASS, [
       [ Biome.SWAMP, BiomePoolTier.BOSS, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.SEEDOT, Type.GRASS, -1, [
+    [ Species.SEEDOT, PokemonType.GRASS, -1, [
       [ Biome.TOWN, BiomePoolTier.UNCOMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]],
       [ Biome.GRASS, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]],
       [ Biome.FOREST, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]]
     ]
     ],
-    [ Species.NUZLEAF, Type.GRASS, Type.DARK, [
+    [ Species.NUZLEAF, PokemonType.GRASS, PokemonType.DARK, [
       [ Biome.GRASS, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]],
       [ Biome.FOREST, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]]
     ]
     ],
-    [ Species.SHIFTRY, Type.GRASS, Type.DARK, [
+    [ Species.SHIFTRY, PokemonType.GRASS, PokemonType.DARK, [
       [ Biome.FOREST, BiomePoolTier.BOSS, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]]
     ]
     ],
-    [ Species.TAILLOW, Type.NORMAL, Type.FLYING, [
+    [ Species.TAILLOW, PokemonType.NORMAL, PokemonType.FLYING, [
       [ Biome.TOWN, BiomePoolTier.COMMON ],
       [ Biome.MOUNTAIN, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.SWELLOW, Type.NORMAL, Type.FLYING, [
+    [ Species.SWELLOW, PokemonType.NORMAL, PokemonType.FLYING, [
       [ Biome.MOUNTAIN, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.MOUNTAIN, BiomePoolTier.BOSS, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.WINGULL, Type.WATER, Type.FLYING, [
+    [ Species.WINGULL, PokemonType.WATER, PokemonType.FLYING, [
       [ Biome.SEA, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.PELIPPER, Type.WATER, Type.FLYING, [
+    [ Species.PELIPPER, PokemonType.WATER, PokemonType.FLYING, [
       [ Biome.SEA, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.SEA, BiomePoolTier.BOSS, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.RALTS, Type.PSYCHIC, Type.FAIRY, [
+    [ Species.RALTS, PokemonType.PSYCHIC, PokemonType.FAIRY, [
       [ Biome.TOWN, BiomePoolTier.SUPER_RARE ],
       [ Biome.MEADOW, BiomePoolTier.UNCOMMON ],
       [ Biome.FAIRY_CAVE, BiomePoolTier.UNCOMMON ]
     ]
     ],
-    [ Species.KIRLIA, Type.PSYCHIC, Type.FAIRY, [
+    [ Species.KIRLIA, PokemonType.PSYCHIC, PokemonType.FAIRY, [
       [ Biome.MEADOW, BiomePoolTier.UNCOMMON ],
       [ Biome.FAIRY_CAVE, BiomePoolTier.UNCOMMON ]
     ]
     ],
-    [ Species.GARDEVOIR, Type.PSYCHIC, Type.FAIRY, [
+    [ Species.GARDEVOIR, PokemonType.PSYCHIC, PokemonType.FAIRY, [
       [ Biome.MEADOW, BiomePoolTier.UNCOMMON ],
       [ Biome.MEADOW, BiomePoolTier.BOSS ],
       [ Biome.FAIRY_CAVE, BiomePoolTier.UNCOMMON ]
     ]
     ],
-    [ Species.SURSKIT, Type.BUG, Type.WATER, [
+    [ Species.SURSKIT, PokemonType.BUG, PokemonType.WATER, [
       [ Biome.TOWN, BiomePoolTier.RARE ],
       [ Biome.LAKE, BiomePoolTier.UNCOMMON ]
     ]
     ],
-    [ Species.MASQUERAIN, Type.BUG, Type.FLYING, [
+    [ Species.MASQUERAIN, PokemonType.BUG, PokemonType.FLYING, [
       [ Biome.LAKE, BiomePoolTier.UNCOMMON ],
       [ Biome.LAKE, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.SHROOMISH, Type.GRASS, -1, [
+    [ Species.SHROOMISH, PokemonType.GRASS, -1, [
       [ Biome.TOWN, BiomePoolTier.UNCOMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]],
       [ Biome.GRASS, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]],
       [ Biome.FOREST, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]],
       [ Biome.JUNGLE, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]]
     ]
     ],
-    [ Species.BRELOOM, Type.GRASS, Type.FIGHTING, [
+    [ Species.BRELOOM, PokemonType.GRASS, PokemonType.FIGHTING, [
       [ Biome.GRASS, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]],
       [ Biome.FOREST, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]],
       [ Biome.FOREST, BiomePoolTier.BOSS, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]],
       [ Biome.JUNGLE, BiomePoolTier.BOSS, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]]
     ]
     ],
-    [ Species.SLAKOTH, Type.NORMAL, -1, [
+    [ Species.SLAKOTH, PokemonType.NORMAL, -1, [
       [ Biome.JUNGLE, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.VIGOROTH, Type.NORMAL, -1, [
+    [ Species.VIGOROTH, PokemonType.NORMAL, -1, [
       [ Biome.JUNGLE, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.SLAKING, Type.NORMAL, -1, [
+    [ Species.SLAKING, PokemonType.NORMAL, -1, [
       [ Biome.JUNGLE, BiomePoolTier.RARE ],
       [ Biome.JUNGLE, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.NINCADA, Type.BUG, Type.GROUND, [
+    [ Species.NINCADA, PokemonType.BUG, PokemonType.GROUND, [
       [ Biome.TOWN, BiomePoolTier.UNCOMMON ],
       [ Biome.TALL_GRASS, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.NINJASK, Type.BUG, Type.FLYING, [
+    [ Species.NINJASK, PokemonType.BUG, PokemonType.FLYING, [
       [ Biome.TALL_GRASS, BiomePoolTier.COMMON ],
       [ Biome.TALL_GRASS, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.SHEDINJA, Type.BUG, Type.GHOST, [
+    [ Species.SHEDINJA, PokemonType.BUG, PokemonType.GHOST, [
       [ Biome.TALL_GRASS, BiomePoolTier.SUPER_RARE ]
     ]
     ],
-    [ Species.WHISMUR, Type.NORMAL, -1, [
+    [ Species.WHISMUR, PokemonType.NORMAL, -1, [
       [ Biome.TOWN, BiomePoolTier.UNCOMMON ],
       [ Biome.CAVE, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.LOUDRED, Type.NORMAL, -1, [
+    [ Species.LOUDRED, PokemonType.NORMAL, -1, [
       [ Biome.CAVE, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.EXPLOUD, Type.NORMAL, -1, [
+    [ Species.EXPLOUD, PokemonType.NORMAL, -1, [
       [ Biome.CAVE, BiomePoolTier.COMMON ],
       [ Biome.CAVE, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.MAKUHITA, Type.FIGHTING, -1, [
+    [ Species.MAKUHITA, PokemonType.FIGHTING, -1, [
       [ Biome.CAVE, BiomePoolTier.UNCOMMON ],
       [ Biome.DOJO, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.HARIYAMA, Type.FIGHTING, -1, [
+    [ Species.HARIYAMA, PokemonType.FIGHTING, -1, [
       [ Biome.CAVE, BiomePoolTier.UNCOMMON ],
       [ Biome.DOJO, BiomePoolTier.COMMON ],
       [ Biome.DOJO, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.AZURILL, Type.NORMAL, Type.FAIRY, [ ]
+    [ Species.AZURILL, PokemonType.NORMAL, PokemonType.FAIRY, [ ]
     ],
-    [ Species.NOSEPASS, Type.ROCK, -1, [
+    [ Species.NOSEPASS, PokemonType.ROCK, -1, [
       [ Biome.CAVE, BiomePoolTier.UNCOMMON ]
     ]
     ],
-    [ Species.SKITTY, Type.NORMAL, -1, [
+    [ Species.SKITTY, PokemonType.NORMAL, -1, [
       [ Biome.TOWN, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.MEADOW, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.DELCATTY, Type.NORMAL, -1, [
+    [ Species.DELCATTY, PokemonType.NORMAL, -1, [
       [ Biome.MEADOW, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.MEADOW, BiomePoolTier.BOSS, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.SABLEYE, Type.DARK, Type.GHOST, [
+    [ Species.SABLEYE, PokemonType.DARK, PokemonType.GHOST, [
       [ Biome.ABYSS, BiomePoolTier.COMMON ],
       [ Biome.ABYSS, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.MAWILE, Type.STEEL, Type.FAIRY, [
+    [ Species.MAWILE, PokemonType.STEEL, PokemonType.FAIRY, [
       [ Biome.FAIRY_CAVE, BiomePoolTier.COMMON ],
       [ Biome.FAIRY_CAVE, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.ARON, Type.STEEL, Type.ROCK, [
+    [ Species.ARON, PokemonType.STEEL, PokemonType.ROCK, [
       [ Biome.MOUNTAIN, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.MOUNTAIN, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]]
     ]
     ],
-    [ Species.LAIRON, Type.STEEL, Type.ROCK, [
+    [ Species.LAIRON, PokemonType.STEEL, PokemonType.ROCK, [
       [ Biome.MOUNTAIN, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.MOUNTAIN, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]]
     ]
     ],
-    [ Species.AGGRON, Type.STEEL, Type.ROCK, [
+    [ Species.AGGRON, PokemonType.STEEL, PokemonType.ROCK, [
       [ Biome.MOUNTAIN, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.MOUNTAIN, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]],
       [ Biome.MOUNTAIN, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.MEDITITE, Type.FIGHTING, Type.PSYCHIC, [
+    [ Species.MEDITITE, PokemonType.FIGHTING, PokemonType.PSYCHIC, [
       [ Biome.DOJO, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.MEDICHAM, Type.FIGHTING, Type.PSYCHIC, [
+    [ Species.MEDICHAM, PokemonType.FIGHTING, PokemonType.PSYCHIC, [
       [ Biome.DOJO, BiomePoolTier.COMMON ],
       [ Biome.DOJO, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.ELECTRIKE, Type.ELECTRIC, -1, [
+    [ Species.ELECTRIKE, PokemonType.ELECTRIC, -1, [
       [ Biome.POWER_PLANT, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.MANECTRIC, Type.ELECTRIC, -1, [
+    [ Species.MANECTRIC, PokemonType.ELECTRIC, -1, [
       [ Biome.POWER_PLANT, BiomePoolTier.COMMON ],
       [ Biome.POWER_PLANT, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.PLUSLE, Type.ELECTRIC, -1, [
+    [ Species.PLUSLE, PokemonType.ELECTRIC, -1, [
       [ Biome.POWER_PLANT, BiomePoolTier.UNCOMMON ]
     ]
     ],
-    [ Species.MINUN, Type.ELECTRIC, -1, [
+    [ Species.MINUN, PokemonType.ELECTRIC, -1, [
       [ Biome.POWER_PLANT, BiomePoolTier.UNCOMMON ]
     ]
     ],
-    [ Species.VOLBEAT, Type.BUG, -1, [
+    [ Species.VOLBEAT, PokemonType.BUG, -1, [
       [ Biome.MEADOW, BiomePoolTier.RARE, TimeOfDay.NIGHT ]
     ]
     ],
-    [ Species.ILLUMISE, Type.BUG, -1, [
+    [ Species.ILLUMISE, PokemonType.BUG, -1, [
       [ Biome.MEADOW, BiomePoolTier.RARE, TimeOfDay.NIGHT ]
     ]
     ],
-    [ Species.ROSELIA, Type.GRASS, Type.POISON, [
+    [ Species.ROSELIA, PokemonType.GRASS, PokemonType.POISON, [
       [ Biome.FOREST, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.MEADOW, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.GULPIN, Type.POISON, -1, [
+    [ Species.GULPIN, PokemonType.POISON, -1, [
       [ Biome.SWAMP, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.SWALOT, Type.POISON, -1, [
+    [ Species.SWALOT, PokemonType.POISON, -1, [
       [ Biome.SWAMP, BiomePoolTier.COMMON ],
       [ Biome.SWAMP, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.CARVANHA, Type.WATER, Type.DARK, [
+    [ Species.CARVANHA, PokemonType.WATER, PokemonType.DARK, [
       [ Biome.SEA, BiomePoolTier.UNCOMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]]
     ]
     ],
-    [ Species.SHARPEDO, Type.WATER, Type.DARK, [
+    [ Species.SHARPEDO, PokemonType.WATER, PokemonType.DARK, [
       [ Biome.SEA, BiomePoolTier.UNCOMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]],
       [ Biome.SEA, BiomePoolTier.BOSS, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]]
     ]
     ],
-    [ Species.WAILMER, Type.WATER, -1, [
+    [ Species.WAILMER, PokemonType.WATER, -1, [
       [ Biome.SEA, BiomePoolTier.UNCOMMON ],
       [ Biome.SEABED, BiomePoolTier.UNCOMMON ]
     ]
     ],
-    [ Species.WAILORD, Type.WATER, -1, [
+    [ Species.WAILORD, PokemonType.WATER, -1, [
       [ Biome.SEA, BiomePoolTier.UNCOMMON ],
       [ Biome.SEABED, BiomePoolTier.UNCOMMON ],
       [ Biome.SEABED, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.NUMEL, Type.FIRE, Type.GROUND, [
+    [ Species.NUMEL, PokemonType.FIRE, PokemonType.GROUND, [
       [ Biome.BADLANDS, BiomePoolTier.UNCOMMON ],
       [ Biome.VOLCANO, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.CAMERUPT, Type.FIRE, Type.GROUND, [
+    [ Species.CAMERUPT, PokemonType.FIRE, PokemonType.GROUND, [
       [ Biome.BADLANDS, BiomePoolTier.UNCOMMON ],
       [ Biome.VOLCANO, BiomePoolTier.COMMON ],
       [ Biome.VOLCANO, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.TORKOAL, Type.FIRE, -1, [
+    [ Species.TORKOAL, PokemonType.FIRE, -1, [
       [ Biome.VOLCANO, BiomePoolTier.UNCOMMON ],
       [ Biome.VOLCANO, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.SPOINK, Type.PSYCHIC, -1, [
+    [ Species.SPOINK, PokemonType.PSYCHIC, -1, [
       [ Biome.MOUNTAIN, BiomePoolTier.RARE ],
       [ Biome.RUINS, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.GRUMPIG, Type.PSYCHIC, -1, [
+    [ Species.GRUMPIG, PokemonType.PSYCHIC, -1, [
       [ Biome.MOUNTAIN, BiomePoolTier.RARE ],
       [ Biome.RUINS, BiomePoolTier.COMMON ],
       [ Biome.RUINS, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.SPINDA, Type.NORMAL, -1, [
+    [ Species.SPINDA, PokemonType.NORMAL, -1, [
       [ Biome.MEADOW, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.TRAPINCH, Type.GROUND, -1, [
+    [ Species.TRAPINCH, PokemonType.GROUND, -1, [
       [ Biome.DESERT, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.VIBRAVA, Type.GROUND, Type.DRAGON, [
+    [ Species.VIBRAVA, PokemonType.GROUND, PokemonType.DRAGON, [
       [ Biome.DESERT, BiomePoolTier.RARE, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.WASTELAND, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.FLYGON, Type.GROUND, Type.DRAGON, [
+    [ Species.FLYGON, PokemonType.GROUND, PokemonType.DRAGON, [
       [ Biome.DESERT, BiomePoolTier.RARE, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.WASTELAND, BiomePoolTier.COMMON ],
       [ Biome.WASTELAND, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.CACNEA, Type.GRASS, -1, [
+    [ Species.CACNEA, PokemonType.GRASS, -1, [
       [ Biome.DESERT, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]]
     ]
     ],
-    [ Species.CACTURNE, Type.GRASS, Type.DARK, [
+    [ Species.CACTURNE, PokemonType.GRASS, PokemonType.DARK, [
       [ Biome.DESERT, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]],
       [ Biome.DESERT, BiomePoolTier.BOSS, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]]
     ]
     ],
-    [ Species.SWABLU, Type.NORMAL, Type.FLYING, [
+    [ Species.SWABLU, PokemonType.NORMAL, PokemonType.FLYING, [
       [ Biome.MOUNTAIN, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.WASTELAND, BiomePoolTier.UNCOMMON ]
     ]
     ],
-    [ Species.ALTARIA, Type.DRAGON, Type.FLYING, [
+    [ Species.ALTARIA, PokemonType.DRAGON, PokemonType.FLYING, [
       [ Biome.MOUNTAIN, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.MOUNTAIN, BiomePoolTier.BOSS, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.WASTELAND, BiomePoolTier.UNCOMMON ]
     ]
     ],
-    [ Species.ZANGOOSE, Type.NORMAL, -1, [
+    [ Species.ZANGOOSE, PokemonType.NORMAL, -1, [
       [ Biome.TALL_GRASS, BiomePoolTier.RARE ],
       [ Biome.TALL_GRASS, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.SEVIPER, Type.POISON, -1, [
+    [ Species.SEVIPER, PokemonType.POISON, -1, [
       [ Biome.JUNGLE, BiomePoolTier.RARE ],
       [ Biome.JUNGLE, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.LUNATONE, Type.ROCK, Type.PSYCHIC, [
+    [ Species.LUNATONE, PokemonType.ROCK, PokemonType.PSYCHIC, [
       [ Biome.SPACE, BiomePoolTier.COMMON, TimeOfDay.NIGHT ],
       [ Biome.SPACE, BiomePoolTier.BOSS, TimeOfDay.NIGHT ]
     ]
     ],
-    [ Species.SOLROCK, Type.ROCK, Type.PSYCHIC, [
+    [ Species.SOLROCK, PokemonType.ROCK, PokemonType.PSYCHIC, [
       [ Biome.SPACE, BiomePoolTier.COMMON, TimeOfDay.DAY ],
       [ Biome.SPACE, BiomePoolTier.BOSS, TimeOfDay.DAY ]
     ]
     ],
-    [ Species.BARBOACH, Type.WATER, Type.GROUND, [
+    [ Species.BARBOACH, PokemonType.WATER, PokemonType.GROUND, [
       [ Biome.SWAMP, BiomePoolTier.UNCOMMON ]
     ]
     ],
-    [ Species.WHISCASH, Type.WATER, Type.GROUND, [
+    [ Species.WHISCASH, PokemonType.WATER, PokemonType.GROUND, [
       [ Biome.SWAMP, BiomePoolTier.UNCOMMON ],
       [ Biome.SWAMP, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.CORPHISH, Type.WATER, -1, [
+    [ Species.CORPHISH, PokemonType.WATER, -1, [
       [ Biome.BEACH, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.CRAWDAUNT, Type.WATER, Type.DARK, [
+    [ Species.CRAWDAUNT, PokemonType.WATER, PokemonType.DARK, [
       [ Biome.BEACH, BiomePoolTier.COMMON ],
       [ Biome.BEACH, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.BALTOY, Type.GROUND, Type.PSYCHIC, [
+    [ Species.BALTOY, PokemonType.GROUND, PokemonType.PSYCHIC, [
       [ Biome.RUINS, BiomePoolTier.COMMON ],
       [ Biome.SPACE, BiomePoolTier.UNCOMMON ],
       [ Biome.TEMPLE, BiomePoolTier.UNCOMMON ]
     ]
     ],
-    [ Species.CLAYDOL, Type.GROUND, Type.PSYCHIC, [
+    [ Species.CLAYDOL, PokemonType.GROUND, PokemonType.PSYCHIC, [
       [ Biome.RUINS, BiomePoolTier.COMMON ],
       [ Biome.RUINS, BiomePoolTier.BOSS ],
       [ Biome.SPACE, BiomePoolTier.UNCOMMON ],
       [ Biome.TEMPLE, BiomePoolTier.UNCOMMON ]
     ]
     ],
-    [ Species.LILEEP, Type.ROCK, Type.GRASS, [
+    [ Species.LILEEP, PokemonType.ROCK, PokemonType.GRASS, [
       [ Biome.DESERT, BiomePoolTier.SUPER_RARE ]
     ]
     ],
-    [ Species.CRADILY, Type.ROCK, Type.GRASS, [
+    [ Species.CRADILY, PokemonType.ROCK, PokemonType.GRASS, [
       [ Biome.DESERT, BiomePoolTier.SUPER_RARE ],
       [ Biome.DESERT, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.ANORITH, Type.ROCK, Type.BUG, [
+    [ Species.ANORITH, PokemonType.ROCK, PokemonType.BUG, [
       [ Biome.DESERT, BiomePoolTier.SUPER_RARE ]
     ]
     ],
-    [ Species.ARMALDO, Type.ROCK, Type.BUG, [
+    [ Species.ARMALDO, PokemonType.ROCK, PokemonType.BUG, [
       [ Biome.DESERT, BiomePoolTier.SUPER_RARE ],
       [ Biome.DESERT, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.FEEBAS, Type.WATER, -1, [
+    [ Species.FEEBAS, PokemonType.WATER, -1, [
       [ Biome.SEABED, BiomePoolTier.ULTRA_RARE ]
     ]
     ],
-    [ Species.MILOTIC, Type.WATER, -1, [
+    [ Species.MILOTIC, PokemonType.WATER, -1, [
       [ Biome.SEABED, BiomePoolTier.BOSS_SUPER_RARE ]
     ]
     ],
-    [ Species.CASTFORM, Type.NORMAL, -1, [
+    [ Species.CASTFORM, PokemonType.NORMAL, -1, [
       [ Biome.METROPOLIS, BiomePoolTier.ULTRA_RARE ],
       [ Biome.METROPOLIS, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.KECLEON, Type.NORMAL, -1, [
+    [ Species.KECLEON, PokemonType.NORMAL, -1, [
       [ Biome.TALL_GRASS, BiomePoolTier.RARE ],
       [ Biome.TALL_GRASS, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.SHUPPET, Type.GHOST, -1, [
+    [ Species.SHUPPET, PokemonType.GHOST, -1, [
       [ Biome.GRAVEYARD, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.BANETTE, Type.GHOST, -1, [
+    [ Species.BANETTE, PokemonType.GHOST, -1, [
       [ Biome.GRAVEYARD, BiomePoolTier.COMMON ],
       [ Biome.GRAVEYARD, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.DUSKULL, Type.GHOST, -1, [
+    [ Species.DUSKULL, PokemonType.GHOST, -1, [
       [ Biome.GRAVEYARD, BiomePoolTier.COMMON ],
       [ Biome.TEMPLE, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.DUSCLOPS, Type.GHOST, -1, [
+    [ Species.DUSCLOPS, PokemonType.GHOST, -1, [
       [ Biome.GRAVEYARD, BiomePoolTier.COMMON ],
       [ Biome.TEMPLE, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.TROPIUS, Type.GRASS, Type.FLYING, [
+    [ Species.TROPIUS, PokemonType.GRASS, PokemonType.FLYING, [
       [ Biome.TALL_GRASS, BiomePoolTier.RARE ],
       [ Biome.FOREST, BiomePoolTier.RARE ],
       [ Biome.JUNGLE, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.JUNGLE, BiomePoolTier.BOSS, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.CHIMECHO, Type.PSYCHIC, -1, [
+    [ Species.CHIMECHO, PokemonType.PSYCHIC, -1, [
       [ Biome.TEMPLE, BiomePoolTier.UNCOMMON ],
       [ Biome.TEMPLE, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.ABSOL, Type.DARK, -1, [
+    [ Species.ABSOL, PokemonType.DARK, -1, [
       [ Biome.ABYSS, BiomePoolTier.RARE ],
       [ Biome.ABYSS, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.WYNAUT, Type.PSYCHIC, -1, [ ]
+    [ Species.WYNAUT, PokemonType.PSYCHIC, -1, [ ]
     ],
-    [ Species.SNORUNT, Type.ICE, -1, [
+    [ Species.SNORUNT, PokemonType.ICE, -1, [
       [ Biome.ICE_CAVE, BiomePoolTier.UNCOMMON ]
     ]
     ],
-    [ Species.GLALIE, Type.ICE, -1, [
+    [ Species.GLALIE, PokemonType.ICE, -1, [
       [ Biome.ICE_CAVE, BiomePoolTier.UNCOMMON ],
       [ Biome.ICE_CAVE, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.SPHEAL, Type.ICE, Type.WATER, [
+    [ Species.SPHEAL, PokemonType.ICE, PokemonType.WATER, [
       [ Biome.ICE_CAVE, BiomePoolTier.UNCOMMON ]
     ]
     ],
-    [ Species.SEALEO, Type.ICE, Type.WATER, [
+    [ Species.SEALEO, PokemonType.ICE, PokemonType.WATER, [
       [ Biome.ICE_CAVE, BiomePoolTier.UNCOMMON ]
     ]
     ],
-    [ Species.WALREIN, Type.ICE, Type.WATER, [
+    [ Species.WALREIN, PokemonType.ICE, PokemonType.WATER, [
       [ Biome.ICE_CAVE, BiomePoolTier.UNCOMMON ],
       [ Biome.ICE_CAVE, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.CLAMPERL, Type.WATER, -1, [
+    [ Species.CLAMPERL, PokemonType.WATER, -1, [
       [ Biome.SEABED, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.HUNTAIL, Type.WATER, -1, [
+    [ Species.HUNTAIL, PokemonType.WATER, -1, [
       [ Biome.SEABED, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.GOREBYSS, Type.WATER, -1, [
+    [ Species.GOREBYSS, PokemonType.WATER, -1, [
       [ Biome.SEABED, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.RELICANTH, Type.WATER, Type.ROCK, [
+    [ Species.RELICANTH, PokemonType.WATER, PokemonType.ROCK, [
       [ Biome.SEABED, BiomePoolTier.SUPER_RARE ],
       [ Biome.SEABED, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.LUVDISC, Type.WATER, -1, [
+    [ Species.LUVDISC, PokemonType.WATER, -1, [
       [ Biome.SEABED, BiomePoolTier.UNCOMMON ],
       [ Biome.SEABED, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.BAGON, Type.DRAGON, -1, [
+    [ Species.BAGON, PokemonType.DRAGON, -1, [
       [ Biome.WASTELAND, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.SHELGON, Type.DRAGON, -1, [
+    [ Species.SHELGON, PokemonType.DRAGON, -1, [
       [ Biome.WASTELAND, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.SALAMENCE, Type.DRAGON, Type.FLYING, [
+    [ Species.SALAMENCE, PokemonType.DRAGON, PokemonType.FLYING, [
       [ Biome.WASTELAND, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.WASTELAND, BiomePoolTier.BOSS, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.BELDUM, Type.STEEL, Type.PSYCHIC, [
+    [ Species.BELDUM, PokemonType.STEEL, PokemonType.PSYCHIC, [
       [ Biome.FACTORY, BiomePoolTier.SUPER_RARE ],
       [ Biome.SPACE, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.METANG, Type.STEEL, Type.PSYCHIC, [
+    [ Species.METANG, PokemonType.STEEL, PokemonType.PSYCHIC, [
       [ Biome.FACTORY, BiomePoolTier.SUPER_RARE ],
       [ Biome.SPACE, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.METAGROSS, Type.STEEL, Type.PSYCHIC, [
+    [ Species.METAGROSS, PokemonType.STEEL, PokemonType.PSYCHIC, [
       [ Biome.FACTORY, BiomePoolTier.SUPER_RARE ],
       [ Biome.SPACE, BiomePoolTier.RARE ],
       [ Biome.SPACE, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.REGIROCK, Type.ROCK, -1, [
+    [ Species.REGIROCK, PokemonType.ROCK, -1, [
       [ Biome.DESERT, BiomePoolTier.ULTRA_RARE ],
       [ Biome.DESERT, BiomePoolTier.BOSS_SUPER_RARE ]
     ]
     ],
-    [ Species.REGICE, Type.ICE, -1, [
+    [ Species.REGICE, PokemonType.ICE, -1, [
       [ Biome.ICE_CAVE, BiomePoolTier.ULTRA_RARE ],
       [ Biome.ICE_CAVE, BiomePoolTier.BOSS_SUPER_RARE ]
     ]
     ],
-    [ Species.REGISTEEL, Type.STEEL, -1, [
+    [ Species.REGISTEEL, PokemonType.STEEL, -1, [
       [ Biome.RUINS, BiomePoolTier.ULTRA_RARE ],
       [ Biome.RUINS, BiomePoolTier.BOSS_SUPER_RARE ]
     ]
     ],
-    [ Species.LATIAS, Type.DRAGON, Type.PSYCHIC, [
+    [ Species.LATIAS, PokemonType.DRAGON, PokemonType.PSYCHIC, [
       [ Biome.PLAINS, BiomePoolTier.ULTRA_RARE ],
       [ Biome.PLAINS, BiomePoolTier.BOSS_SUPER_RARE ]
     ]
     ],
-    [ Species.LATIOS, Type.DRAGON, Type.PSYCHIC, [
+    [ Species.LATIOS, PokemonType.DRAGON, PokemonType.PSYCHIC, [
       [ Biome.PLAINS, BiomePoolTier.ULTRA_RARE ],
       [ Biome.PLAINS, BiomePoolTier.BOSS_SUPER_RARE ]
     ]
     ],
-    [ Species.KYOGRE, Type.WATER, -1, [
+    [ Species.KYOGRE, PokemonType.WATER, -1, [
       [ Biome.SEABED, BiomePoolTier.BOSS_ULTRA_RARE ]
     ]
     ],
-    [ Species.GROUDON, Type.GROUND, -1, [
+    [ Species.GROUDON, PokemonType.GROUND, -1, [
       [ Biome.BADLANDS, BiomePoolTier.BOSS_ULTRA_RARE ]
     ]
     ],
-    [ Species.RAYQUAZA, Type.DRAGON, Type.FLYING, [
+    [ Species.RAYQUAZA, PokemonType.DRAGON, PokemonType.FLYING, [
       [ Biome.SPACE, BiomePoolTier.BOSS_ULTRA_RARE ]
     ]
     ],
-    [ Species.JIRACHI, Type.STEEL, Type.PSYCHIC, [ ]
+    [ Species.JIRACHI, PokemonType.STEEL, PokemonType.PSYCHIC, [ ]
     ],
-    [ Species.DEOXYS, Type.PSYCHIC, -1, [ ]
+    [ Species.DEOXYS, PokemonType.PSYCHIC, -1, [ ]
     ],
-    [ Species.TURTWIG, Type.GRASS, -1, [
+    [ Species.TURTWIG, PokemonType.GRASS, -1, [
       [ Biome.GRASS, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.GROTLE, Type.GRASS, -1, [
+    [ Species.GROTLE, PokemonType.GRASS, -1, [
       [ Biome.GRASS, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.TORTERRA, Type.GRASS, Type.GROUND, [
+    [ Species.TORTERRA, PokemonType.GRASS, PokemonType.GROUND, [
       [ Biome.GRASS, BiomePoolTier.RARE ],
       [ Biome.GRASS, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.CHIMCHAR, Type.FIRE, -1, [
+    [ Species.CHIMCHAR, PokemonType.FIRE, -1, [
       [ Biome.VOLCANO, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.MONFERNO, Type.FIRE, Type.FIGHTING, [
+    [ Species.MONFERNO, PokemonType.FIRE, PokemonType.FIGHTING, [
       [ Biome.VOLCANO, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.INFERNAPE, Type.FIRE, Type.FIGHTING, [
+    [ Species.INFERNAPE, PokemonType.FIRE, PokemonType.FIGHTING, [
       [ Biome.VOLCANO, BiomePoolTier.RARE ],
       [ Biome.VOLCANO, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.PIPLUP, Type.WATER, -1, [
+    [ Species.PIPLUP, PokemonType.WATER, -1, [
       [ Biome.SEA, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.PRINPLUP, Type.WATER, -1, [
+    [ Species.PRINPLUP, PokemonType.WATER, -1, [
       [ Biome.SEA, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.EMPOLEON, Type.WATER, Type.STEEL, [
+    [ Species.EMPOLEON, PokemonType.WATER, PokemonType.STEEL, [
       [ Biome.SEA, BiomePoolTier.RARE ],
       [ Biome.SEA, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.STARLY, Type.NORMAL, Type.FLYING, [
+    [ Species.STARLY, PokemonType.NORMAL, PokemonType.FLYING, [
       [ Biome.TOWN, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.PLAINS, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.MOUNTAIN, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.STARAVIA, Type.NORMAL, Type.FLYING, [
+    [ Species.STARAVIA, PokemonType.NORMAL, PokemonType.FLYING, [
       [ Biome.PLAINS, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.MOUNTAIN, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.STARAPTOR, Type.NORMAL, Type.FLYING, [
+    [ Species.STARAPTOR, PokemonType.NORMAL, PokemonType.FLYING, [
       [ Biome.PLAINS, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.MOUNTAIN, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.MOUNTAIN, BiomePoolTier.BOSS, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.BIDOOF, Type.NORMAL, -1, [
+    [ Species.BIDOOF, PokemonType.NORMAL, -1, [
       [ Biome.TOWN, BiomePoolTier.COMMON ],
       [ Biome.PLAINS, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.BIBAREL, Type.NORMAL, Type.WATER, [
+    [ Species.BIBAREL, PokemonType.NORMAL, PokemonType.WATER, [
       [ Biome.PLAINS, BiomePoolTier.COMMON ],
       [ Biome.PLAINS, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.KRICKETOT, Type.BUG, -1, [
+    [ Species.KRICKETOT, PokemonType.BUG, -1, [
       [ Biome.TOWN, BiomePoolTier.UNCOMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]],
       [ Biome.TALL_GRASS, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]]
     ]
     ],
-    [ Species.KRICKETUNE, Type.BUG, -1, [
+    [ Species.KRICKETUNE, PokemonType.BUG, -1, [
       [ Biome.TALL_GRASS, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]],
       [ Biome.TALL_GRASS, BiomePoolTier.BOSS, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]]
     ]
     ],
-    [ Species.SHINX, Type.ELECTRIC, -1, [
+    [ Species.SHINX, PokemonType.ELECTRIC, -1, [
       [ Biome.PLAINS, BiomePoolTier.RARE, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]],
       [ Biome.POWER_PLANT, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.LUXIO, Type.ELECTRIC, -1, [
+    [ Species.LUXIO, PokemonType.ELECTRIC, -1, [
       [ Biome.PLAINS, BiomePoolTier.RARE, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]],
       [ Biome.POWER_PLANT, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.LUXRAY, Type.ELECTRIC, -1, [
+    [ Species.LUXRAY, PokemonType.ELECTRIC, -1, [
       [ Biome.PLAINS, BiomePoolTier.RARE, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]],
       [ Biome.POWER_PLANT, BiomePoolTier.COMMON ],
       [ Biome.POWER_PLANT, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.BUDEW, Type.GRASS, Type.POISON, [ ]
+    [ Species.BUDEW, PokemonType.GRASS, PokemonType.POISON, [ ]
     ],
-    [ Species.ROSERADE, Type.GRASS, Type.POISON, [
+    [ Species.ROSERADE, PokemonType.GRASS, PokemonType.POISON, [
       [ Biome.MEADOW, BiomePoolTier.BOSS, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.CRANIDOS, Type.ROCK, -1, [
+    [ Species.CRANIDOS, PokemonType.ROCK, -1, [
       [ Biome.MOUNTAIN, BiomePoolTier.SUPER_RARE ]
     ]
     ],
-    [ Species.RAMPARDOS, Type.ROCK, -1, [
+    [ Species.RAMPARDOS, PokemonType.ROCK, -1, [
       [ Biome.MOUNTAIN, BiomePoolTier.SUPER_RARE ],
       [ Biome.MOUNTAIN, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.SHIELDON, Type.ROCK, Type.STEEL, [
+    [ Species.SHIELDON, PokemonType.ROCK, PokemonType.STEEL, [
       [ Biome.MOUNTAIN, BiomePoolTier.SUPER_RARE ]
     ]
     ],
-    [ Species.BASTIODON, Type.ROCK, Type.STEEL, [
+    [ Species.BASTIODON, PokemonType.ROCK, PokemonType.STEEL, [
       [ Biome.MOUNTAIN, BiomePoolTier.SUPER_RARE ],
       [ Biome.MOUNTAIN, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.BURMY, Type.BUG, -1, [
+    [ Species.BURMY, PokemonType.BUG, -1, [
       [ Biome.FOREST, BiomePoolTier.UNCOMMON ],
       [ Biome.BEACH, BiomePoolTier.UNCOMMON ],
       [ Biome.SLUM, BiomePoolTier.UNCOMMON ]
     ]
     ],
-    [ Species.WORMADAM, Type.BUG, Type.GRASS, [
+    [ Species.WORMADAM, PokemonType.BUG, PokemonType.GRASS, [
       [ Biome.FOREST, BiomePoolTier.UNCOMMON ],
       [ Biome.FOREST, BiomePoolTier.BOSS ],
       [ Biome.BEACH, BiomePoolTier.UNCOMMON ],
@@ -4034,122 +4035,122 @@ export function initBiomes() {
       [ Biome.SLUM, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.MOTHIM, Type.BUG, Type.FLYING, [
+    [ Species.MOTHIM, PokemonType.BUG, PokemonType.FLYING, [
       [ Biome.FOREST, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.FOREST, BiomePoolTier.BOSS, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.COMBEE, Type.BUG, Type.FLYING, [
+    [ Species.COMBEE, PokemonType.BUG, PokemonType.FLYING, [
       [ Biome.TOWN, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.GRASS, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.FOREST, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.JUNGLE, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.VESPIQUEN, Type.BUG, Type.FLYING, [
+    [ Species.VESPIQUEN, PokemonType.BUG, PokemonType.FLYING, [
       [ Biome.GRASS, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.FOREST, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.FOREST, BiomePoolTier.BOSS, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.JUNGLE, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.PACHIRISU, Type.ELECTRIC, -1, [
+    [ Species.PACHIRISU, PokemonType.ELECTRIC, -1, [
       [ Biome.POWER_PLANT, BiomePoolTier.UNCOMMON ]
     ]
     ],
-    [ Species.BUIZEL, Type.WATER, -1, [
+    [ Species.BUIZEL, PokemonType.WATER, -1, [
       [ Biome.SEA, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.FLOATZEL, Type.WATER, -1, [
+    [ Species.FLOATZEL, PokemonType.WATER, -1, [
       [ Biome.SEA, BiomePoolTier.COMMON ],
       [ Biome.SEA, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.CHERUBI, Type.GRASS, -1, [
+    [ Species.CHERUBI, PokemonType.GRASS, -1, [
       [ Biome.TOWN, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.GRASS, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.JUNGLE, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.CHERRIM, Type.GRASS, -1, [
+    [ Species.CHERRIM, PokemonType.GRASS, -1, [
       [ Biome.GRASS, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.JUNGLE, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.JUNGLE, BiomePoolTier.BOSS, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.SHELLOS, Type.WATER, -1, [
+    [ Species.SHELLOS, PokemonType.WATER, -1, [
       [ Biome.SWAMP, BiomePoolTier.COMMON ],
       [ Biome.SEABED, BiomePoolTier.UNCOMMON ]
     ]
     ],
-    [ Species.GASTRODON, Type.WATER, Type.GROUND, [
+    [ Species.GASTRODON, PokemonType.WATER, PokemonType.GROUND, [
       [ Biome.SWAMP, BiomePoolTier.COMMON ],
       [ Biome.SWAMP, BiomePoolTier.BOSS ],
       [ Biome.SEABED, BiomePoolTier.UNCOMMON ]
     ]
     ],
-    [ Species.AMBIPOM, Type.NORMAL, -1, [
+    [ Species.AMBIPOM, PokemonType.NORMAL, -1, [
       [ Biome.JUNGLE, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.DRIFLOON, Type.GHOST, Type.FLYING, [
+    [ Species.DRIFLOON, PokemonType.GHOST, PokemonType.FLYING, [
       [ Biome.GRAVEYARD, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.DRIFBLIM, Type.GHOST, Type.FLYING, [
+    [ Species.DRIFBLIM, PokemonType.GHOST, PokemonType.FLYING, [
       [ Biome.GRAVEYARD, BiomePoolTier.COMMON ],
       [ Biome.GRAVEYARD, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.BUNEARY, Type.NORMAL, -1, [
+    [ Species.BUNEARY, PokemonType.NORMAL, -1, [
       [ Biome.PLAINS, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.LOPUNNY, Type.NORMAL, -1, [
+    [ Species.LOPUNNY, PokemonType.NORMAL, -1, [
       [ Biome.PLAINS, BiomePoolTier.RARE ],
       [ Biome.PLAINS, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.MISMAGIUS, Type.GHOST, -1, [
+    [ Species.MISMAGIUS, PokemonType.GHOST, -1, [
       [ Biome.GRAVEYARD, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.HONCHKROW, Type.DARK, Type.FLYING, [
+    [ Species.HONCHKROW, PokemonType.DARK, PokemonType.FLYING, [
       [ Biome.ABYSS, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.GLAMEOW, Type.NORMAL, -1, [
+    [ Species.GLAMEOW, PokemonType.NORMAL, -1, [
       [ Biome.METROPOLIS, BiomePoolTier.UNCOMMON ],
       [ Biome.MEADOW, BiomePoolTier.UNCOMMON ]
     ]
     ],
-    [ Species.PURUGLY, Type.NORMAL, -1, [
+    [ Species.PURUGLY, PokemonType.NORMAL, -1, [
       [ Biome.METROPOLIS, BiomePoolTier.UNCOMMON ],
       [ Biome.MEADOW, BiomePoolTier.UNCOMMON ],
       [ Biome.MEADOW, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.CHINGLING, Type.PSYCHIC, -1, [
+    [ Species.CHINGLING, PokemonType.PSYCHIC, -1, [
       [ Biome.TEMPLE, BiomePoolTier.UNCOMMON ]
     ]
     ],
-    [ Species.STUNKY, Type.POISON, Type.DARK, [
+    [ Species.STUNKY, PokemonType.POISON, PokemonType.DARK, [
       [ Biome.SLUM, BiomePoolTier.UNCOMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]]
     ]
     ],
-    [ Species.SKUNTANK, Type.POISON, Type.DARK, [
+    [ Species.SKUNTANK, PokemonType.POISON, PokemonType.DARK, [
       [ Biome.SLUM, BiomePoolTier.UNCOMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]],
       [ Biome.SLUM, BiomePoolTier.BOSS, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]]
     ]
     ],
-    [ Species.BRONZOR, Type.STEEL, Type.PSYCHIC, [
+    [ Species.BRONZOR, PokemonType.STEEL, PokemonType.PSYCHIC, [
       [ Biome.FACTORY, BiomePoolTier.UNCOMMON ],
       [ Biome.SPACE, BiomePoolTier.COMMON ],
       [ Biome.LABORATORY, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.BRONZONG, Type.STEEL, Type.PSYCHIC, [
+    [ Species.BRONZONG, PokemonType.STEEL, PokemonType.PSYCHIC, [
       [ Biome.FACTORY, BiomePoolTier.UNCOMMON ],
       [ Biome.SPACE, BiomePoolTier.COMMON ],
       [ Biome.SPACE, BiomePoolTier.BOSS ],
@@ -4157,186 +4158,186 @@ export function initBiomes() {
       [ Biome.LABORATORY, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.BONSLY, Type.ROCK, -1, [ ]
+    [ Species.BONSLY, PokemonType.ROCK, -1, [ ]
     ],
-    [ Species.MIME_JR, Type.PSYCHIC, Type.FAIRY, [ ]
+    [ Species.MIME_JR, PokemonType.PSYCHIC, PokemonType.FAIRY, [ ]
     ],
-    [ Species.HAPPINY, Type.NORMAL, -1, [ ]
+    [ Species.HAPPINY, PokemonType.NORMAL, -1, [ ]
     ],
-    [ Species.CHATOT, Type.NORMAL, Type.FLYING, [
+    [ Species.CHATOT, PokemonType.NORMAL, PokemonType.FLYING, [
       [ Biome.JUNGLE, BiomePoolTier.SUPER_RARE ]
     ]
     ],
-    [ Species.SPIRITOMB, Type.GHOST, Type.DARK, [
+    [ Species.SPIRITOMB, PokemonType.GHOST, PokemonType.DARK, [
       [ Biome.GRAVEYARD, BiomePoolTier.SUPER_RARE ],
       [ Biome.ABYSS, BiomePoolTier.RARE ],
       [ Biome.ABYSS, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.GIBLE, Type.DRAGON, Type.GROUND, [
+    [ Species.GIBLE, PokemonType.DRAGON, PokemonType.GROUND, [
       [ Biome.MOUNTAIN, BiomePoolTier.SUPER_RARE ],
       [ Biome.WASTELAND, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.GABITE, Type.DRAGON, Type.GROUND, [
+    [ Species.GABITE, PokemonType.DRAGON, PokemonType.GROUND, [
       [ Biome.MOUNTAIN, BiomePoolTier.SUPER_RARE ],
       [ Biome.WASTELAND, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.GARCHOMP, Type.DRAGON, Type.GROUND, [
+    [ Species.GARCHOMP, PokemonType.DRAGON, PokemonType.GROUND, [
       [ Biome.MOUNTAIN, BiomePoolTier.SUPER_RARE ],
       [ Biome.WASTELAND, BiomePoolTier.COMMON ],
       [ Biome.WASTELAND, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.MUNCHLAX, Type.NORMAL, -1, [ ]
+    [ Species.MUNCHLAX, PokemonType.NORMAL, -1, [ ]
     ],
-    [ Species.RIOLU, Type.FIGHTING, -1, [ ]
+    [ Species.RIOLU, PokemonType.FIGHTING, -1, [ ]
     ],
-    [ Species.LUCARIO, Type.FIGHTING, Type.STEEL, [
+    [ Species.LUCARIO, PokemonType.FIGHTING, PokemonType.STEEL, [
       [ Biome.DOJO, BiomePoolTier.RARE ],
       [ Biome.DOJO, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.HIPPOPOTAS, Type.GROUND, -1, [
+    [ Species.HIPPOPOTAS, PokemonType.GROUND, -1, [
       [ Biome.DESERT, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.HIPPOWDON, Type.GROUND, -1, [
+    [ Species.HIPPOWDON, PokemonType.GROUND, -1, [
       [ Biome.DESERT, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.DESERT, BiomePoolTier.BOSS, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.SKORUPI, Type.POISON, Type.BUG, [
+    [ Species.SKORUPI, PokemonType.POISON, PokemonType.BUG, [
       [ Biome.SWAMP, BiomePoolTier.UNCOMMON ],
       [ Biome.DESERT, BiomePoolTier.COMMON ],
       [ Biome.TEMPLE, BiomePoolTier.UNCOMMON ]
     ]
     ],
-    [ Species.DRAPION, Type.POISON, Type.DARK, [
+    [ Species.DRAPION, PokemonType.POISON, PokemonType.DARK, [
       [ Biome.SWAMP, BiomePoolTier.UNCOMMON ],
       [ Biome.DESERT, BiomePoolTier.COMMON ],
       [ Biome.DESERT, BiomePoolTier.BOSS ],
       [ Biome.TEMPLE, BiomePoolTier.UNCOMMON ]
     ]
     ],
-    [ Species.CROAGUNK, Type.POISON, Type.FIGHTING, [
+    [ Species.CROAGUNK, PokemonType.POISON, PokemonType.FIGHTING, [
       [ Biome.SWAMP, BiomePoolTier.UNCOMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]],
       [ Biome.DOJO, BiomePoolTier.UNCOMMON ]
     ]
     ],
-    [ Species.TOXICROAK, Type.POISON, Type.FIGHTING, [
+    [ Species.TOXICROAK, PokemonType.POISON, PokemonType.FIGHTING, [
       [ Biome.SWAMP, BiomePoolTier.UNCOMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]],
       [ Biome.DOJO, BiomePoolTier.UNCOMMON ],
       [ Biome.DOJO, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.CARNIVINE, Type.GRASS, -1, [
+    [ Species.CARNIVINE, PokemonType.GRASS, -1, [
       [ Biome.JUNGLE, BiomePoolTier.RARE ],
       [ Biome.JUNGLE, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.FINNEON, Type.WATER, -1, [
+    [ Species.FINNEON, PokemonType.WATER, -1, [
       [ Biome.SEA, BiomePoolTier.COMMON, TimeOfDay.NIGHT ]
     ]
     ],
-    [ Species.LUMINEON, Type.WATER, -1, [
+    [ Species.LUMINEON, PokemonType.WATER, -1, [
       [ Biome.SEA, BiomePoolTier.COMMON, TimeOfDay.NIGHT ],
       [ Biome.SEA, BiomePoolTier.BOSS, TimeOfDay.NIGHT ]
     ]
     ],
-    [ Species.MANTYKE, Type.WATER, Type.FLYING, [
+    [ Species.MANTYKE, PokemonType.WATER, PokemonType.FLYING, [
       [ Biome.SEABED, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.SNOVER, Type.GRASS, Type.ICE, [
+    [ Species.SNOVER, PokemonType.GRASS, PokemonType.ICE, [
       [ Biome.ICE_CAVE, BiomePoolTier.COMMON ],
       [ Biome.SNOWY_FOREST, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.ABOMASNOW, Type.GRASS, Type.ICE, [
+    [ Species.ABOMASNOW, PokemonType.GRASS, PokemonType.ICE, [
       [ Biome.ICE_CAVE, BiomePoolTier.COMMON ],
       [ Biome.SNOWY_FOREST, BiomePoolTier.COMMON ],
       [ Biome.SNOWY_FOREST, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.WEAVILE, Type.DARK, Type.ICE, [
+    [ Species.WEAVILE, PokemonType.DARK, PokemonType.ICE, [
       [ Biome.ICE_CAVE, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.MAGNEZONE, Type.ELECTRIC, Type.STEEL, [
+    [ Species.MAGNEZONE, PokemonType.ELECTRIC, PokemonType.STEEL, [
       [ Biome.POWER_PLANT, BiomePoolTier.BOSS ],
       [ Biome.LABORATORY, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.LICKILICKY, Type.NORMAL, -1, [
+    [ Species.LICKILICKY, PokemonType.NORMAL, -1, [
       [ Biome.PLAINS, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.RHYPERIOR, Type.GROUND, Type.ROCK, [
+    [ Species.RHYPERIOR, PokemonType.GROUND, PokemonType.ROCK, [
       [ Biome.BADLANDS, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.TANGROWTH, Type.GRASS, -1, [
+    [ Species.TANGROWTH, PokemonType.GRASS, -1, [
       [ Biome.JUNGLE, BiomePoolTier.BOSS, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]]
     ]
     ],
-    [ Species.ELECTIVIRE, Type.ELECTRIC, -1, [
+    [ Species.ELECTIVIRE, PokemonType.ELECTRIC, -1, [
       [ Biome.POWER_PLANT, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.MAGMORTAR, Type.FIRE, -1, [
+    [ Species.MAGMORTAR, PokemonType.FIRE, -1, [
       [ Biome.VOLCANO, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.TOGEKISS, Type.FAIRY, Type.FLYING, [
+    [ Species.TOGEKISS, PokemonType.FAIRY, PokemonType.FLYING, [
       [ Biome.FAIRY_CAVE, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.YANMEGA, Type.BUG, Type.FLYING, [
+    [ Species.YANMEGA, PokemonType.BUG, PokemonType.FLYING, [
       [ Biome.JUNGLE, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.LEAFEON, Type.GRASS, -1, [
+    [ Species.LEAFEON, PokemonType.GRASS, -1, [
       [ Biome.JUNGLE, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.GLACEON, Type.ICE, -1, [
+    [ Species.GLACEON, PokemonType.ICE, -1, [
       [ Biome.ICE_CAVE, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.GLISCOR, Type.GROUND, Type.FLYING, [
+    [ Species.GLISCOR, PokemonType.GROUND, PokemonType.FLYING, [
       [ Biome.BADLANDS, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.MAMOSWINE, Type.ICE, Type.GROUND, [
+    [ Species.MAMOSWINE, PokemonType.ICE, PokemonType.GROUND, [
       [ Biome.ICE_CAVE, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.PORYGON_Z, Type.NORMAL, -1, [
+    [ Species.PORYGON_Z, PokemonType.NORMAL, -1, [
       [ Biome.SPACE, BiomePoolTier.BOSS_RARE ],
       [ Biome.LABORATORY, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.GALLADE, Type.PSYCHIC, Type.FIGHTING, [
+    [ Species.GALLADE, PokemonType.PSYCHIC, PokemonType.FIGHTING, [
       [ Biome.DOJO, BiomePoolTier.SUPER_RARE ],
       [ Biome.DOJO, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.PROBOPASS, Type.ROCK, Type.STEEL, [
+    [ Species.PROBOPASS, PokemonType.ROCK, PokemonType.STEEL, [
       [ Biome.CAVE, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.DUSKNOIR, Type.GHOST, -1, [
+    [ Species.DUSKNOIR, PokemonType.GHOST, -1, [
       [ Biome.GRAVEYARD, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.FROSLASS, Type.ICE, Type.GHOST, [
+    [ Species.FROSLASS, PokemonType.ICE, PokemonType.GHOST, [
       [ Biome.ICE_CAVE, BiomePoolTier.RARE ],
       [ Biome.ICE_CAVE, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.ROTOM, Type.ELECTRIC, Type.GHOST, [
+    [ Species.ROTOM, PokemonType.ELECTRIC, PokemonType.GHOST, [
       [ Biome.LABORATORY, BiomePoolTier.SUPER_RARE ],
       [ Biome.LABORATORY, BiomePoolTier.BOSS_SUPER_RARE ],
       [ Biome.VOLCANO, BiomePoolTier.SUPER_RARE ],
@@ -4351,104 +4352,104 @@ export function initBiomes() {
       [ Biome.TALL_GRASS, BiomePoolTier.BOSS_SUPER_RARE ]
     ]
     ],
-    [ Species.UXIE, Type.PSYCHIC, -1, [
+    [ Species.UXIE, PokemonType.PSYCHIC, -1, [
       [ Biome.CAVE, BiomePoolTier.ULTRA_RARE ],
       [ Biome.CAVE, BiomePoolTier.BOSS_SUPER_RARE ]
     ]
     ],
-    [ Species.MESPRIT, Type.PSYCHIC, -1, [
+    [ Species.MESPRIT, PokemonType.PSYCHIC, -1, [
       [ Biome.LAKE, BiomePoolTier.ULTRA_RARE ],
       [ Biome.LAKE, BiomePoolTier.BOSS_SUPER_RARE ]
     ]
     ],
-    [ Species.AZELF, Type.PSYCHIC, -1, [
+    [ Species.AZELF, PokemonType.PSYCHIC, -1, [
       [ Biome.SWAMP, BiomePoolTier.ULTRA_RARE ],
       [ Biome.SWAMP, BiomePoolTier.BOSS_SUPER_RARE ]
     ]
     ],
-    [ Species.DIALGA, Type.STEEL, Type.DRAGON, [
+    [ Species.DIALGA, PokemonType.STEEL, PokemonType.DRAGON, [
       [ Biome.WASTELAND, BiomePoolTier.BOSS_ULTRA_RARE ]
     ]
     ],
-    [ Species.PALKIA, Type.WATER, Type.DRAGON, [
+    [ Species.PALKIA, PokemonType.WATER, PokemonType.DRAGON, [
       [ Biome.ABYSS, BiomePoolTier.BOSS_ULTRA_RARE ]
     ]
     ],
-    [ Species.HEATRAN, Type.FIRE, Type.STEEL, [
+    [ Species.HEATRAN, PokemonType.FIRE, PokemonType.STEEL, [
       [ Biome.VOLCANO, BiomePoolTier.ULTRA_RARE ],
       [ Biome.VOLCANO, BiomePoolTier.BOSS_SUPER_RARE ]
     ]
     ],
-    [ Species.REGIGIGAS, Type.NORMAL, -1, [
+    [ Species.REGIGIGAS, PokemonType.NORMAL, -1, [
       [ Biome.TEMPLE, BiomePoolTier.BOSS_ULTRA_RARE ]
     ]
     ],
-    [ Species.GIRATINA, Type.GHOST, Type.DRAGON, [
+    [ Species.GIRATINA, PokemonType.GHOST, PokemonType.DRAGON, [
       [ Biome.GRAVEYARD, BiomePoolTier.BOSS_ULTRA_RARE ]
     ]
     ],
-    [ Species.CRESSELIA, Type.PSYCHIC, -1, [
+    [ Species.CRESSELIA, PokemonType.PSYCHIC, -1, [
       [ Biome.BEACH, BiomePoolTier.ULTRA_RARE ],
       [ Biome.BEACH, BiomePoolTier.BOSS_SUPER_RARE ]
     ]
     ],
-    [ Species.PHIONE, Type.WATER, -1, [ ]
+    [ Species.PHIONE, PokemonType.WATER, -1, [ ]
     ],
-    [ Species.MANAPHY, Type.WATER, -1, [ ]
+    [ Species.MANAPHY, PokemonType.WATER, -1, [ ]
     ],
-    [ Species.DARKRAI, Type.DARK, -1, [
+    [ Species.DARKRAI, PokemonType.DARK, -1, [
       [ Biome.ABYSS, BiomePoolTier.ULTRA_RARE ],
       [ Biome.ABYSS, BiomePoolTier.BOSS_SUPER_RARE ]
     ]
     ],
-    [ Species.SHAYMIN, Type.GRASS, -1, [
+    [ Species.SHAYMIN, PokemonType.GRASS, -1, [
       [ Biome.MEADOW, BiomePoolTier.BOSS_ULTRA_RARE ]
     ]
     ],
-    [ Species.ARCEUS, Type.NORMAL, -1, [ ]
+    [ Species.ARCEUS, PokemonType.NORMAL, -1, [ ]
     ],
-    [ Species.VICTINI, Type.PSYCHIC, Type.FIRE, [ ]
+    [ Species.VICTINI, PokemonType.PSYCHIC, PokemonType.FIRE, [ ]
     ],
-    [ Species.SNIVY, Type.GRASS, -1, [
+    [ Species.SNIVY, PokemonType.GRASS, -1, [
       [ Biome.JUNGLE, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.SERVINE, Type.GRASS, -1, [
+    [ Species.SERVINE, PokemonType.GRASS, -1, [
       [ Biome.JUNGLE, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.SERPERIOR, Type.GRASS, -1, [
+    [ Species.SERPERIOR, PokemonType.GRASS, -1, [
       [ Biome.JUNGLE, BiomePoolTier.RARE ],
       [ Biome.JUNGLE, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.TEPIG, Type.FIRE, -1, [
+    [ Species.TEPIG, PokemonType.FIRE, -1, [
       [ Biome.VOLCANO, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.PIGNITE, Type.FIRE, Type.FIGHTING, [
+    [ Species.PIGNITE, PokemonType.FIRE, PokemonType.FIGHTING, [
       [ Biome.VOLCANO, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.EMBOAR, Type.FIRE, Type.FIGHTING, [
+    [ Species.EMBOAR, PokemonType.FIRE, PokemonType.FIGHTING, [
       [ Biome.VOLCANO, BiomePoolTier.RARE ],
       [ Biome.VOLCANO, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.OSHAWOTT, Type.WATER, -1, [
+    [ Species.OSHAWOTT, PokemonType.WATER, -1, [
       [ Biome.LAKE, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.DEWOTT, Type.WATER, -1, [
+    [ Species.DEWOTT, PokemonType.WATER, -1, [
       [ Biome.LAKE, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.SAMUROTT, Type.WATER, -1, [
+    [ Species.SAMUROTT, PokemonType.WATER, -1, [
       [ Biome.LAKE, BiomePoolTier.RARE ],
       [ Biome.LAKE, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.PATRAT, Type.NORMAL, -1, [
+    [ Species.PATRAT, PokemonType.NORMAL, -1, [
       [ Biome.TOWN, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.TOWN, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]],
       [ Biome.METROPOLIS, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
@@ -4456,437 +4457,437 @@ export function initBiomes() {
       [ Biome.SLUM, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]]
     ]
     ],
-    [ Species.WATCHOG, Type.NORMAL, -1, [
+    [ Species.WATCHOG, PokemonType.NORMAL, -1, [
       [ Biome.METROPOLIS, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.METROPOLIS, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]],
       [ Biome.SLUM, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]],
       [ Biome.SLUM, BiomePoolTier.BOSS, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]]
     ]
     ],
-    [ Species.LILLIPUP, Type.NORMAL, -1, [
+    [ Species.LILLIPUP, PokemonType.NORMAL, -1, [
       [ Biome.TOWN, BiomePoolTier.COMMON ],
       [ Biome.METROPOLIS, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.HERDIER, Type.NORMAL, -1, [
+    [ Species.HERDIER, PokemonType.NORMAL, -1, [
       [ Biome.METROPOLIS, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.STOUTLAND, Type.NORMAL, -1, [
+    [ Species.STOUTLAND, PokemonType.NORMAL, -1, [
       [ Biome.METROPOLIS, BiomePoolTier.COMMON ],
       [ Biome.METROPOLIS, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.PURRLOIN, Type.DARK, -1, [
+    [ Species.PURRLOIN, PokemonType.DARK, -1, [
       [ Biome.TOWN, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]],
       [ Biome.ABYSS, BiomePoolTier.COMMON ],
       [ Biome.JUNGLE, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]]
     ]
     ],
-    [ Species.LIEPARD, Type.DARK, -1, [
+    [ Species.LIEPARD, PokemonType.DARK, -1, [
       [ Biome.ABYSS, BiomePoolTier.COMMON ],
       [ Biome.ABYSS, BiomePoolTier.BOSS ],
       [ Biome.JUNGLE, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]]
     ]
     ],
-    [ Species.PANSAGE, Type.GRASS, -1, [
+    [ Species.PANSAGE, PokemonType.GRASS, -1, [
       [ Biome.FOREST, BiomePoolTier.UNCOMMON ],
       [ Biome.JUNGLE, BiomePoolTier.UNCOMMON ]
     ]
     ],
-    [ Species.SIMISAGE, Type.GRASS, -1, [
+    [ Species.SIMISAGE, PokemonType.GRASS, -1, [
       [ Biome.FOREST, BiomePoolTier.UNCOMMON ],
       [ Biome.FOREST, BiomePoolTier.BOSS ],
       [ Biome.JUNGLE, BiomePoolTier.UNCOMMON ]
     ]
     ],
-    [ Species.PANSEAR, Type.FIRE, -1, [
+    [ Species.PANSEAR, PokemonType.FIRE, -1, [
       [ Biome.VOLCANO, BiomePoolTier.UNCOMMON ],
       [ Biome.JUNGLE, BiomePoolTier.UNCOMMON ]
     ]
     ],
-    [ Species.SIMISEAR, Type.FIRE, -1, [
+    [ Species.SIMISEAR, PokemonType.FIRE, -1, [
       [ Biome.VOLCANO, BiomePoolTier.UNCOMMON ],
       [ Biome.VOLCANO, BiomePoolTier.BOSS ],
       [ Biome.JUNGLE, BiomePoolTier.UNCOMMON ]
     ]
     ],
-    [ Species.PANPOUR, Type.WATER, -1, [
+    [ Species.PANPOUR, PokemonType.WATER, -1, [
       [ Biome.SEA, BiomePoolTier.UNCOMMON ],
       [ Biome.JUNGLE, BiomePoolTier.UNCOMMON ]
     ]
     ],
-    [ Species.SIMIPOUR, Type.WATER, -1, [
+    [ Species.SIMIPOUR, PokemonType.WATER, -1, [
       [ Biome.SEA, BiomePoolTier.UNCOMMON ],
       [ Biome.SEA, BiomePoolTier.BOSS ],
       [ Biome.JUNGLE, BiomePoolTier.UNCOMMON ]
     ]
     ],
-    [ Species.MUNNA, Type.PSYCHIC, -1, [
+    [ Species.MUNNA, PokemonType.PSYCHIC, -1, [
       [ Biome.SPACE, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.MUSHARNA, Type.PSYCHIC, -1, [
+    [ Species.MUSHARNA, PokemonType.PSYCHIC, -1, [
       [ Biome.SPACE, BiomePoolTier.COMMON ],
       [ Biome.SPACE, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.PIDOVE, Type.NORMAL, Type.FLYING, [
+    [ Species.PIDOVE, PokemonType.NORMAL, PokemonType.FLYING, [
       [ Biome.TOWN, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.PLAINS, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.MOUNTAIN, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.TRANQUILL, Type.NORMAL, Type.FLYING, [
+    [ Species.TRANQUILL, PokemonType.NORMAL, PokemonType.FLYING, [
       [ Biome.PLAINS, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.MOUNTAIN, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.UNFEZANT, Type.NORMAL, Type.FLYING, [
+    [ Species.UNFEZANT, PokemonType.NORMAL, PokemonType.FLYING, [
       [ Biome.PLAINS, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.MOUNTAIN, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.MOUNTAIN, BiomePoolTier.BOSS, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.BLITZLE, Type.ELECTRIC, -1, [
+    [ Species.BLITZLE, PokemonType.ELECTRIC, -1, [
       [ Biome.MEADOW, BiomePoolTier.COMMON ],
       [ Biome.JUNGLE, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.ZEBSTRIKA, Type.ELECTRIC, -1, [
+    [ Species.ZEBSTRIKA, PokemonType.ELECTRIC, -1, [
       [ Biome.MEADOW, BiomePoolTier.COMMON ],
       [ Biome.MEADOW, BiomePoolTier.BOSS ],
       [ Biome.JUNGLE, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.ROGGENROLA, Type.ROCK, -1, [
+    [ Species.ROGGENROLA, PokemonType.ROCK, -1, [
       [ Biome.MOUNTAIN, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.MOUNTAIN, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]],
       [ Biome.BADLANDS, BiomePoolTier.UNCOMMON ],
       [ Biome.CAVE, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.BOLDORE, Type.ROCK, -1, [
+    [ Species.BOLDORE, PokemonType.ROCK, -1, [
       [ Biome.MOUNTAIN, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.MOUNTAIN, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]],
       [ Biome.BADLANDS, BiomePoolTier.UNCOMMON ],
       [ Biome.CAVE, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.GIGALITH, Type.ROCK, -1, [
+    [ Species.GIGALITH, PokemonType.ROCK, -1, [
       [ Biome.CAVE, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.WOOBAT, Type.PSYCHIC, Type.FLYING, [
+    [ Species.WOOBAT, PokemonType.PSYCHIC, PokemonType.FLYING, [
       [ Biome.CAVE, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.SWOOBAT, Type.PSYCHIC, Type.FLYING, [
+    [ Species.SWOOBAT, PokemonType.PSYCHIC, PokemonType.FLYING, [
       [ Biome.CAVE, BiomePoolTier.COMMON ],
       [ Biome.CAVE, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.DRILBUR, Type.GROUND, -1, [
+    [ Species.DRILBUR, PokemonType.GROUND, -1, [
       [ Biome.BADLANDS, BiomePoolTier.COMMON ],
       [ Biome.CONSTRUCTION_SITE, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.EXCADRILL, Type.GROUND, Type.STEEL, [
+    [ Species.EXCADRILL, PokemonType.GROUND, PokemonType.STEEL, [
       [ Biome.BADLANDS, BiomePoolTier.COMMON ],
       [ Biome.BADLANDS, BiomePoolTier.BOSS ],
       [ Biome.CONSTRUCTION_SITE, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.AUDINO, Type.NORMAL, -1, [
+    [ Species.AUDINO, PokemonType.NORMAL, -1, [
       [ Biome.FAIRY_CAVE, BiomePoolTier.RARE ],
       [ Biome.FAIRY_CAVE, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.TIMBURR, Type.FIGHTING, -1, [
+    [ Species.TIMBURR, PokemonType.FIGHTING, -1, [
       [ Biome.FACTORY, BiomePoolTier.COMMON ],
       [ Biome.CONSTRUCTION_SITE, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.GURDURR, Type.FIGHTING, -1, [
+    [ Species.GURDURR, PokemonType.FIGHTING, -1, [
       [ Biome.FACTORY, BiomePoolTier.COMMON ],
       [ Biome.CONSTRUCTION_SITE, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.CONKELDURR, Type.FIGHTING, -1, [
+    [ Species.CONKELDURR, PokemonType.FIGHTING, -1, [
       [ Biome.CONSTRUCTION_SITE, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.TYMPOLE, Type.WATER, -1, [
+    [ Species.TYMPOLE, PokemonType.WATER, -1, [
       [ Biome.SWAMP, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.PALPITOAD, Type.WATER, Type.GROUND, [
+    [ Species.PALPITOAD, PokemonType.WATER, PokemonType.GROUND, [
       [ Biome.SWAMP, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.SEISMITOAD, Type.WATER, Type.GROUND, [
+    [ Species.SEISMITOAD, PokemonType.WATER, PokemonType.GROUND, [
       [ Biome.SWAMP, BiomePoolTier.COMMON ],
       [ Biome.SWAMP, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.THROH, Type.FIGHTING, -1, [
+    [ Species.THROH, PokemonType.FIGHTING, -1, [
       [ Biome.DOJO, BiomePoolTier.RARE ],
       [ Biome.DOJO, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.SAWK, Type.FIGHTING, -1, [
+    [ Species.SAWK, PokemonType.FIGHTING, -1, [
       [ Biome.DOJO, BiomePoolTier.RARE ],
       [ Biome.DOJO, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.SEWADDLE, Type.BUG, Type.GRASS, [
+    [ Species.SEWADDLE, PokemonType.BUG, PokemonType.GRASS, [
       [ Biome.FOREST, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.JUNGLE, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.SWADLOON, Type.BUG, Type.GRASS, [
+    [ Species.SWADLOON, PokemonType.BUG, PokemonType.GRASS, [
       [ Biome.FOREST, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.JUNGLE, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.LEAVANNY, Type.BUG, Type.GRASS, [
+    [ Species.LEAVANNY, PokemonType.BUG, PokemonType.GRASS, [
       [ Biome.FOREST, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.JUNGLE, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.JUNGLE, BiomePoolTier.BOSS, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.VENIPEDE, Type.BUG, Type.POISON, [
+    [ Species.VENIPEDE, PokemonType.BUG, PokemonType.POISON, [
       [ Biome.TOWN, BiomePoolTier.UNCOMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]],
       [ Biome.FOREST, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]]
     ]
     ],
-    [ Species.WHIRLIPEDE, Type.BUG, Type.POISON, [
+    [ Species.WHIRLIPEDE, PokemonType.BUG, PokemonType.POISON, [
       [ Biome.FOREST, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]]
     ]
     ],
-    [ Species.SCOLIPEDE, Type.BUG, Type.POISON, [
+    [ Species.SCOLIPEDE, PokemonType.BUG, PokemonType.POISON, [
       [ Biome.FOREST, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]],
       [ Biome.FOREST, BiomePoolTier.BOSS, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]]
     ]
     ],
-    [ Species.COTTONEE, Type.GRASS, Type.FAIRY, [
+    [ Species.COTTONEE, PokemonType.GRASS, PokemonType.FAIRY, [
       [ Biome.TOWN, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.GRASS, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.MEADOW, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.WHIMSICOTT, Type.GRASS, Type.FAIRY, [
+    [ Species.WHIMSICOTT, PokemonType.GRASS, PokemonType.FAIRY, [
       [ Biome.GRASS, BiomePoolTier.BOSS, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.PETILIL, Type.GRASS, -1, [
+    [ Species.PETILIL, PokemonType.GRASS, -1, [
       [ Biome.GRASS, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.FOREST, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.LILLIGANT, Type.GRASS, -1, [
+    [ Species.LILLIGANT, PokemonType.GRASS, -1, [
       [ Biome.FOREST, BiomePoolTier.BOSS, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.BASCULIN, Type.WATER, -1, [
+    [ Species.BASCULIN, PokemonType.WATER, -1, [
       [ Biome.SEABED, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.SANDILE, Type.GROUND, Type.DARK, [
+    [ Species.SANDILE, PokemonType.GROUND, PokemonType.DARK, [
       [ Biome.DESERT, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.DESERT, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]]
     ]
     ],
-    [ Species.KROKOROK, Type.GROUND, Type.DARK, [
+    [ Species.KROKOROK, PokemonType.GROUND, PokemonType.DARK, [
       [ Biome.DESERT, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.DESERT, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]]
     ]
     ],
-    [ Species.KROOKODILE, Type.GROUND, Type.DARK, [
+    [ Species.KROOKODILE, PokemonType.GROUND, PokemonType.DARK, [
       [ Biome.DESERT, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.DESERT, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]],
       [ Biome.DESERT, BiomePoolTier.BOSS, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]]
     ]
     ],
-    [ Species.DARUMAKA, Type.FIRE, -1, [
+    [ Species.DARUMAKA, PokemonType.FIRE, -1, [
       [ Biome.DESERT, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.DARMANITAN, Type.FIRE, -1, [
+    [ Species.DARMANITAN, PokemonType.FIRE, -1, [
       [ Biome.DESERT, BiomePoolTier.RARE ],
       [ Biome.DESERT, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.MARACTUS, Type.GRASS, -1, [
+    [ Species.MARACTUS, PokemonType.GRASS, -1, [
       [ Biome.DESERT, BiomePoolTier.UNCOMMON ],
       [ Biome.DESERT, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.DWEBBLE, Type.BUG, Type.ROCK, [
+    [ Species.DWEBBLE, PokemonType.BUG, PokemonType.ROCK, [
       [ Biome.BEACH, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.CRUSTLE, Type.BUG, Type.ROCK, [
+    [ Species.CRUSTLE, PokemonType.BUG, PokemonType.ROCK, [
       [ Biome.BEACH, BiomePoolTier.COMMON ],
       [ Biome.BEACH, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.SCRAGGY, Type.DARK, Type.FIGHTING, [
+    [ Species.SCRAGGY, PokemonType.DARK, PokemonType.FIGHTING, [
       [ Biome.DOJO, BiomePoolTier.UNCOMMON ],
       [ Biome.CONSTRUCTION_SITE, BiomePoolTier.UNCOMMON ]
     ]
     ],
-    [ Species.SCRAFTY, Type.DARK, Type.FIGHTING, [
+    [ Species.SCRAFTY, PokemonType.DARK, PokemonType.FIGHTING, [
       [ Biome.DOJO, BiomePoolTier.UNCOMMON ],
       [ Biome.DOJO, BiomePoolTier.BOSS ],
       [ Biome.CONSTRUCTION_SITE, BiomePoolTier.UNCOMMON ]
     ]
     ],
-    [ Species.SIGILYPH, Type.PSYCHIC, Type.FLYING, [
+    [ Species.SIGILYPH, PokemonType.PSYCHIC, PokemonType.FLYING, [
       [ Biome.RUINS, BiomePoolTier.UNCOMMON ],
       [ Biome.RUINS, BiomePoolTier.BOSS ],
       [ Biome.SPACE, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.YAMASK, Type.GHOST, -1, [
+    [ Species.YAMASK, PokemonType.GHOST, -1, [
       [ Biome.GRAVEYARD, BiomePoolTier.UNCOMMON ],
       [ Biome.TEMPLE, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.COFAGRIGUS, Type.GHOST, -1, [
+    [ Species.COFAGRIGUS, PokemonType.GHOST, -1, [
       [ Biome.GRAVEYARD, BiomePoolTier.UNCOMMON ],
       [ Biome.TEMPLE, BiomePoolTier.COMMON ],
       [ Biome.TEMPLE, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.TIRTOUGA, Type.WATER, Type.ROCK, [
+    [ Species.TIRTOUGA, PokemonType.WATER, PokemonType.ROCK, [
       [ Biome.SEA, BiomePoolTier.SUPER_RARE ],
       [ Biome.BEACH, BiomePoolTier.SUPER_RARE ]
     ]
     ],
-    [ Species.CARRACOSTA, Type.WATER, Type.ROCK, [
+    [ Species.CARRACOSTA, PokemonType.WATER, PokemonType.ROCK, [
       [ Biome.SEA, BiomePoolTier.SUPER_RARE ],
       [ Biome.BEACH, BiomePoolTier.SUPER_RARE ],
       [ Biome.BEACH, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.ARCHEN, Type.ROCK, Type.FLYING, [
+    [ Species.ARCHEN, PokemonType.ROCK, PokemonType.FLYING, [
       [ Biome.RUINS, BiomePoolTier.SUPER_RARE ]
     ]
     ],
-    [ Species.ARCHEOPS, Type.ROCK, Type.FLYING, [
+    [ Species.ARCHEOPS, PokemonType.ROCK, PokemonType.FLYING, [
       [ Biome.MOUNTAIN, BiomePoolTier.SUPER_RARE ],
       [ Biome.RUINS, BiomePoolTier.SUPER_RARE ],
       [ Biome.RUINS, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.TRUBBISH, Type.POISON, -1, [
+    [ Species.TRUBBISH, PokemonType.POISON, -1, [
       [ Biome.SLUM, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.GARBODOR, Type.POISON, -1, [
+    [ Species.GARBODOR, PokemonType.POISON, -1, [
       [ Biome.SLUM, BiomePoolTier.COMMON ],
       [ Biome.SLUM, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.ZORUA, Type.DARK, -1, [
+    [ Species.ZORUA, PokemonType.DARK, -1, [
       [ Biome.ABYSS, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.ZOROARK, Type.DARK, -1, [
+    [ Species.ZOROARK, PokemonType.DARK, -1, [
       [ Biome.ABYSS, BiomePoolTier.RARE ],
       [ Biome.ABYSS, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.MINCCINO, Type.NORMAL, -1, [
+    [ Species.MINCCINO, PokemonType.NORMAL, -1, [
       [ Biome.TOWN, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.MEADOW, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.CINCCINO, Type.NORMAL, -1, [
+    [ Species.CINCCINO, PokemonType.NORMAL, -1, [
       [ Biome.MEADOW, BiomePoolTier.BOSS, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.GOTHITA, Type.PSYCHIC, -1, [
+    [ Species.GOTHITA, PokemonType.PSYCHIC, -1, [
       [ Biome.RUINS, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.GOTHORITA, Type.PSYCHIC, -1, [
+    [ Species.GOTHORITA, PokemonType.PSYCHIC, -1, [
       [ Biome.RUINS, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.GOTHITELLE, Type.PSYCHIC, -1, [
+    [ Species.GOTHITELLE, PokemonType.PSYCHIC, -1, [
       [ Biome.RUINS, BiomePoolTier.RARE ],
       [ Biome.RUINS, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.SOLOSIS, Type.PSYCHIC, -1, [
+    [ Species.SOLOSIS, PokemonType.PSYCHIC, -1, [
       [ Biome.SPACE, BiomePoolTier.RARE ],
       [ Biome.LABORATORY, BiomePoolTier.UNCOMMON ]
     ]
     ],
-    [ Species.DUOSION, Type.PSYCHIC, -1, [
+    [ Species.DUOSION, PokemonType.PSYCHIC, -1, [
       [ Biome.SPACE, BiomePoolTier.RARE ],
       [ Biome.LABORATORY, BiomePoolTier.UNCOMMON ]
     ]
     ],
-    [ Species.REUNICLUS, Type.PSYCHIC, -1, [
+    [ Species.REUNICLUS, PokemonType.PSYCHIC, -1, [
       [ Biome.SPACE, BiomePoolTier.RARE ],
       [ Biome.SPACE, BiomePoolTier.BOSS ],
       [ Biome.LABORATORY, BiomePoolTier.UNCOMMON ],
       [ Biome.LABORATORY, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.DUCKLETT, Type.WATER, Type.FLYING, [
+    [ Species.DUCKLETT, PokemonType.WATER, PokemonType.FLYING, [
       [ Biome.LAKE, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.SWANNA, Type.WATER, Type.FLYING, [
+    [ Species.SWANNA, PokemonType.WATER, PokemonType.FLYING, [
       [ Biome.LAKE, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.LAKE, BiomePoolTier.BOSS, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.VANILLITE, Type.ICE, -1, [
+    [ Species.VANILLITE, PokemonType.ICE, -1, [
       [ Biome.ICE_CAVE, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.VANILLISH, Type.ICE, -1, [
+    [ Species.VANILLISH, PokemonType.ICE, -1, [
       [ Biome.ICE_CAVE, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.VANILLUXE, Type.ICE, -1, [
+    [ Species.VANILLUXE, PokemonType.ICE, -1, [
       [ Biome.ICE_CAVE, BiomePoolTier.COMMON ],
       [ Biome.ICE_CAVE, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.DEERLING, Type.NORMAL, Type.GRASS, [
+    [ Species.DEERLING, PokemonType.NORMAL, PokemonType.GRASS, [
       [ Biome.FOREST, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.SAWSBUCK, Type.NORMAL, Type.GRASS, [
+    [ Species.SAWSBUCK, PokemonType.NORMAL, PokemonType.GRASS, [
       [ Biome.FOREST, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.FOREST, BiomePoolTier.BOSS, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.EMOLGA, Type.ELECTRIC, Type.FLYING, [
+    [ Species.EMOLGA, PokemonType.ELECTRIC, PokemonType.FLYING, [
       [ Biome.POWER_PLANT, BiomePoolTier.UNCOMMON ]
     ]
     ],
-    [ Species.KARRABLAST, Type.BUG, -1, [
+    [ Species.KARRABLAST, PokemonType.BUG, -1, [
       [ Biome.FOREST, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.ESCAVALIER, Type.BUG, Type.STEEL, [
+    [ Species.ESCAVALIER, PokemonType.BUG, PokemonType.STEEL, [
       [ Biome.FOREST, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.FOONGUS, Type.GRASS, Type.POISON, [
+    [ Species.FOONGUS, PokemonType.GRASS, PokemonType.POISON, [
       [ Biome.GRASS, BiomePoolTier.UNCOMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]],
       [ Biome.JUNGLE, BiomePoolTier.RARE, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.JUNGLE, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]]
     ]
     ],
-    [ Species.AMOONGUSS, Type.GRASS, Type.POISON, [
+    [ Species.AMOONGUSS, PokemonType.GRASS, PokemonType.POISON, [
       [ Biome.GRASS, BiomePoolTier.UNCOMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]],
       [ Biome.JUNGLE, BiomePoolTier.RARE, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.JUNGLE, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]],
@@ -4894,712 +4895,712 @@ export function initBiomes() {
       [ Biome.JUNGLE, BiomePoolTier.BOSS, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]]
     ]
     ],
-    [ Species.FRILLISH, Type.WATER, Type.GHOST, [
+    [ Species.FRILLISH, PokemonType.WATER, PokemonType.GHOST, [
       [ Biome.SEABED, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.JELLICENT, Type.WATER, Type.GHOST, [
+    [ Species.JELLICENT, PokemonType.WATER, PokemonType.GHOST, [
       [ Biome.SEABED, BiomePoolTier.COMMON ],
       [ Biome.SEABED, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.ALOMOMOLA, Type.WATER, -1, [
+    [ Species.ALOMOMOLA, PokemonType.WATER, -1, [
       [ Biome.SEABED, BiomePoolTier.RARE ],
       [ Biome.SEABED, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.JOLTIK, Type.BUG, Type.ELECTRIC, [
+    [ Species.JOLTIK, PokemonType.BUG, PokemonType.ELECTRIC, [
       [ Biome.JUNGLE, BiomePoolTier.UNCOMMON ]
     ]
     ],
-    [ Species.GALVANTULA, Type.BUG, Type.ELECTRIC, [
+    [ Species.GALVANTULA, PokemonType.BUG, PokemonType.ELECTRIC, [
       [ Biome.JUNGLE, BiomePoolTier.UNCOMMON ],
       [ Biome.JUNGLE, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.FERROSEED, Type.GRASS, Type.STEEL, [
+    [ Species.FERROSEED, PokemonType.GRASS, PokemonType.STEEL, [
       [ Biome.CAVE, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.FERROTHORN, Type.GRASS, Type.STEEL, [
+    [ Species.FERROTHORN, PokemonType.GRASS, PokemonType.STEEL, [
       [ Biome.CAVE, BiomePoolTier.RARE ],
       [ Biome.CAVE, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.KLINK, Type.STEEL, -1, [
+    [ Species.KLINK, PokemonType.STEEL, -1, [
       [ Biome.FACTORY, BiomePoolTier.COMMON ],
       [ Biome.LABORATORY, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.KLANG, Type.STEEL, -1, [
+    [ Species.KLANG, PokemonType.STEEL, -1, [
       [ Biome.FACTORY, BiomePoolTier.COMMON ],
       [ Biome.LABORATORY, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.KLINKLANG, Type.STEEL, -1, [
+    [ Species.KLINKLANG, PokemonType.STEEL, -1, [
       [ Biome.FACTORY, BiomePoolTier.COMMON ],
       [ Biome.FACTORY, BiomePoolTier.BOSS ],
       [ Biome.LABORATORY, BiomePoolTier.COMMON ],
       [ Biome.LABORATORY, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.TYNAMO, Type.ELECTRIC, -1, [
+    [ Species.TYNAMO, PokemonType.ELECTRIC, -1, [
       [ Biome.SEABED, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.EELEKTRIK, Type.ELECTRIC, -1, [
+    [ Species.EELEKTRIK, PokemonType.ELECTRIC, -1, [
       [ Biome.SEABED, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.EELEKTROSS, Type.ELECTRIC, -1, [
+    [ Species.EELEKTROSS, PokemonType.ELECTRIC, -1, [
       [ Biome.SEABED, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.ELGYEM, Type.PSYCHIC, -1, [
+    [ Species.ELGYEM, PokemonType.PSYCHIC, -1, [
       [ Biome.RUINS, BiomePoolTier.COMMON ],
       [ Biome.SPACE, BiomePoolTier.UNCOMMON ]
     ]
     ],
-    [ Species.BEHEEYEM, Type.PSYCHIC, -1, [
+    [ Species.BEHEEYEM, PokemonType.PSYCHIC, -1, [
       [ Biome.RUINS, BiomePoolTier.COMMON ],
       [ Biome.RUINS, BiomePoolTier.BOSS ],
       [ Biome.SPACE, BiomePoolTier.UNCOMMON ]
     ]
     ],
-    [ Species.LITWICK, Type.GHOST, Type.FIRE, [
+    [ Species.LITWICK, PokemonType.GHOST, PokemonType.FIRE, [
       [ Biome.GRAVEYARD, BiomePoolTier.COMMON ],
       [ Biome.TEMPLE, BiomePoolTier.UNCOMMON ]
     ]
     ],
-    [ Species.LAMPENT, Type.GHOST, Type.FIRE, [
+    [ Species.LAMPENT, PokemonType.GHOST, PokemonType.FIRE, [
       [ Biome.GRAVEYARD, BiomePoolTier.COMMON ],
       [ Biome.TEMPLE, BiomePoolTier.UNCOMMON ]
     ]
     ],
-    [ Species.CHANDELURE, Type.GHOST, Type.FIRE, [
+    [ Species.CHANDELURE, PokemonType.GHOST, PokemonType.FIRE, [
       [ Biome.GRAVEYARD, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.AXEW, Type.DRAGON, -1, [
+    [ Species.AXEW, PokemonType.DRAGON, -1, [
       [ Biome.MOUNTAIN, BiomePoolTier.SUPER_RARE ],
       [ Biome.WASTELAND, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.FRAXURE, Type.DRAGON, -1, [
+    [ Species.FRAXURE, PokemonType.DRAGON, -1, [
       [ Biome.MOUNTAIN, BiomePoolTier.SUPER_RARE ],
       [ Biome.WASTELAND, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.HAXORUS, Type.DRAGON, -1, [
+    [ Species.HAXORUS, PokemonType.DRAGON, -1, [
       [ Biome.WASTELAND, BiomePoolTier.COMMON ],
       [ Biome.WASTELAND, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.CUBCHOO, Type.ICE, -1, [
+    [ Species.CUBCHOO, PokemonType.ICE, -1, [
       [ Biome.ICE_CAVE, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.BEARTIC, Type.ICE, -1, [
+    [ Species.BEARTIC, PokemonType.ICE, -1, [
       [ Biome.ICE_CAVE, BiomePoolTier.COMMON ],
       [ Biome.ICE_CAVE, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.CRYOGONAL, Type.ICE, -1, [
+    [ Species.CRYOGONAL, PokemonType.ICE, -1, [
       [ Biome.ICE_CAVE, BiomePoolTier.RARE ],
       [ Biome.ICE_CAVE, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.SHELMET, Type.BUG, -1, [
+    [ Species.SHELMET, PokemonType.BUG, -1, [
       [ Biome.FOREST, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.ACCELGOR, Type.BUG, -1, [
+    [ Species.ACCELGOR, PokemonType.BUG, -1, [
       [ Biome.FOREST, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.STUNFISK, Type.GROUND, Type.ELECTRIC, [
+    [ Species.STUNFISK, PokemonType.GROUND, PokemonType.ELECTRIC, [
       [ Biome.SWAMP, BiomePoolTier.UNCOMMON ],
       [ Biome.SWAMP, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.MIENFOO, Type.FIGHTING, -1, [
+    [ Species.MIENFOO, PokemonType.FIGHTING, -1, [
       [ Biome.DOJO, BiomePoolTier.UNCOMMON ]
     ]
     ],
-    [ Species.MIENSHAO, Type.FIGHTING, -1, [
+    [ Species.MIENSHAO, PokemonType.FIGHTING, -1, [
       [ Biome.DOJO, BiomePoolTier.UNCOMMON ],
       [ Biome.DOJO, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.DRUDDIGON, Type.DRAGON, -1, [
+    [ Species.DRUDDIGON, PokemonType.DRAGON, -1, [
       [ Biome.WASTELAND, BiomePoolTier.SUPER_RARE ],
       [ Biome.WASTELAND, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.GOLETT, Type.GROUND, Type.GHOST, [
+    [ Species.GOLETT, PokemonType.GROUND, PokemonType.GHOST, [
       [ Biome.TEMPLE, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.GOLURK, Type.GROUND, Type.GHOST, [
+    [ Species.GOLURK, PokemonType.GROUND, PokemonType.GHOST, [
       [ Biome.TEMPLE, BiomePoolTier.COMMON ],
       [ Biome.TEMPLE, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.PAWNIARD, Type.DARK, Type.STEEL, [
+    [ Species.PAWNIARD, PokemonType.DARK, PokemonType.STEEL, [
       [ Biome.ABYSS, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.BISHARP, Type.DARK, Type.STEEL, [
+    [ Species.BISHARP, PokemonType.DARK, PokemonType.STEEL, [
       [ Biome.ABYSS, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.BOUFFALANT, Type.NORMAL, -1, [
+    [ Species.BOUFFALANT, PokemonType.NORMAL, -1, [
       [ Biome.MEADOW, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.MEADOW, BiomePoolTier.BOSS, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.RUFFLET, Type.NORMAL, Type.FLYING, [
+    [ Species.RUFFLET, PokemonType.NORMAL, PokemonType.FLYING, [
       [ Biome.MOUNTAIN, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.BRAVIARY, Type.NORMAL, Type.FLYING, [
+    [ Species.BRAVIARY, PokemonType.NORMAL, PokemonType.FLYING, [
       [ Biome.MOUNTAIN, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.MOUNTAIN, BiomePoolTier.BOSS, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.VULLABY, Type.DARK, Type.FLYING, [
+    [ Species.VULLABY, PokemonType.DARK, PokemonType.FLYING, [
       [ Biome.MOUNTAIN, BiomePoolTier.UNCOMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]]
     ]
     ],
-    [ Species.MANDIBUZZ, Type.DARK, Type.FLYING, [
+    [ Species.MANDIBUZZ, PokemonType.DARK, PokemonType.FLYING, [
       [ Biome.MOUNTAIN, BiomePoolTier.UNCOMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]],
       [ Biome.MOUNTAIN, BiomePoolTier.BOSS, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]]
     ]
     ],
-    [ Species.HEATMOR, Type.FIRE, -1, [
+    [ Species.HEATMOR, PokemonType.FIRE, -1, [
       [ Biome.VOLCANO, BiomePoolTier.UNCOMMON ],
       [ Biome.VOLCANO, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.DURANT, Type.BUG, Type.STEEL, [
+    [ Species.DURANT, PokemonType.BUG, PokemonType.STEEL, [
       [ Biome.FOREST, BiomePoolTier.SUPER_RARE ],
       [ Biome.FOREST, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.DEINO, Type.DARK, Type.DRAGON, [
+    [ Species.DEINO, PokemonType.DARK, PokemonType.DRAGON, [
       [ Biome.WASTELAND, BiomePoolTier.UNCOMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]],
       [ Biome.ABYSS, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.ZWEILOUS, Type.DARK, Type.DRAGON, [
+    [ Species.ZWEILOUS, PokemonType.DARK, PokemonType.DRAGON, [
       [ Biome.WASTELAND, BiomePoolTier.UNCOMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]],
       [ Biome.ABYSS, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.HYDREIGON, Type.DARK, Type.DRAGON, [
+    [ Species.HYDREIGON, PokemonType.DARK, PokemonType.DRAGON, [
       [ Biome.WASTELAND, BiomePoolTier.UNCOMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]],
       [ Biome.ABYSS, BiomePoolTier.RARE ],
       [ Biome.ABYSS, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.LARVESTA, Type.BUG, Type.FIRE, [
+    [ Species.LARVESTA, PokemonType.BUG, PokemonType.FIRE, [
       [ Biome.VOLCANO, BiomePoolTier.SUPER_RARE ]
     ]
     ],
-    [ Species.VOLCARONA, Type.BUG, Type.FIRE, [
+    [ Species.VOLCARONA, PokemonType.BUG, PokemonType.FIRE, [
       [ Biome.VOLCANO, BiomePoolTier.SUPER_RARE ],
       [ Biome.VOLCANO, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.COBALION, Type.STEEL, Type.FIGHTING, [
+    [ Species.COBALION, PokemonType.STEEL, PokemonType.FIGHTING, [
       [ Biome.CONSTRUCTION_SITE, BiomePoolTier.ULTRA_RARE ],
       [ Biome.CONSTRUCTION_SITE, BiomePoolTier.BOSS_SUPER_RARE ]
     ]
     ],
-    [ Species.TERRAKION, Type.ROCK, Type.FIGHTING, [
+    [ Species.TERRAKION, PokemonType.ROCK, PokemonType.FIGHTING, [
       [ Biome.DOJO, BiomePoolTier.ULTRA_RARE ],
       [ Biome.DOJO, BiomePoolTier.BOSS_SUPER_RARE ]
     ]
     ],
-    [ Species.VIRIZION, Type.GRASS, Type.FIGHTING, [
+    [ Species.VIRIZION, PokemonType.GRASS, PokemonType.FIGHTING, [
       [ Biome.GRASS, BiomePoolTier.ULTRA_RARE ],
       [ Biome.GRASS, BiomePoolTier.BOSS_SUPER_RARE ]
     ]
     ],
-    [ Species.TORNADUS, Type.FLYING, -1, [
+    [ Species.TORNADUS, PokemonType.FLYING, -1, [
       [ Biome.MOUNTAIN, BiomePoolTier.ULTRA_RARE ],
       [ Biome.MOUNTAIN, BiomePoolTier.BOSS_SUPER_RARE ]
     ]
     ],
-    [ Species.THUNDURUS, Type.ELECTRIC, Type.FLYING, [
+    [ Species.THUNDURUS, PokemonType.ELECTRIC, PokemonType.FLYING, [
       [ Biome.POWER_PLANT, BiomePoolTier.ULTRA_RARE ],
       [ Biome.POWER_PLANT, BiomePoolTier.BOSS_SUPER_RARE ]
     ]
     ],
-    [ Species.RESHIRAM, Type.DRAGON, Type.FIRE, [
+    [ Species.RESHIRAM, PokemonType.DRAGON, PokemonType.FIRE, [
       [ Biome.VOLCANO, BiomePoolTier.BOSS_ULTRA_RARE ]
     ]
     ],
-    [ Species.ZEKROM, Type.DRAGON, Type.ELECTRIC, [
+    [ Species.ZEKROM, PokemonType.DRAGON, PokemonType.ELECTRIC, [
       [ Biome.POWER_PLANT, BiomePoolTier.BOSS_ULTRA_RARE ]
     ]
     ],
-    [ Species.LANDORUS, Type.GROUND, Type.FLYING, [
+    [ Species.LANDORUS, PokemonType.GROUND, PokemonType.FLYING, [
       [ Biome.BADLANDS, BiomePoolTier.ULTRA_RARE ],
       [ Biome.BADLANDS, BiomePoolTier.BOSS_SUPER_RARE ]
     ]
     ],
-    [ Species.KYUREM, Type.DRAGON, Type.ICE, [
+    [ Species.KYUREM, PokemonType.DRAGON, PokemonType.ICE, [
       [ Biome.ICE_CAVE, BiomePoolTier.BOSS_ULTRA_RARE ]
     ]
     ],
-    [ Species.KELDEO, Type.WATER, Type.FIGHTING, [
+    [ Species.KELDEO, PokemonType.WATER, PokemonType.FIGHTING, [
       [ Biome.BEACH, BiomePoolTier.ULTRA_RARE ],
       [ Biome.BEACH, BiomePoolTier.BOSS_SUPER_RARE ]
     ]
     ],
-    [ Species.MELOETTA, Type.NORMAL, Type.PSYCHIC, [
+    [ Species.MELOETTA, PokemonType.NORMAL, PokemonType.PSYCHIC, [
       [ Biome.MEADOW, BiomePoolTier.ULTRA_RARE ],
       [ Biome.MEADOW, BiomePoolTier.BOSS_SUPER_RARE ]
     ]
     ],
-    [ Species.GENESECT, Type.BUG, Type.STEEL, [
+    [ Species.GENESECT, PokemonType.BUG, PokemonType.STEEL, [
       [ Biome.FACTORY, BiomePoolTier.ULTRA_RARE ],
       [ Biome.FACTORY, BiomePoolTier.BOSS_SUPER_RARE ]
     ]
     ],
-    [ Species.CHESPIN, Type.GRASS, -1, [
+    [ Species.CHESPIN, PokemonType.GRASS, -1, [
       [ Biome.FOREST, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.QUILLADIN, Type.GRASS, -1, [
+    [ Species.QUILLADIN, PokemonType.GRASS, -1, [
       [ Biome.FOREST, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.CHESNAUGHT, Type.GRASS, Type.FIGHTING, [
+    [ Species.CHESNAUGHT, PokemonType.GRASS, PokemonType.FIGHTING, [
       [ Biome.FOREST, BiomePoolTier.RARE ],
       [ Biome.FOREST, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.FENNEKIN, Type.FIRE, -1, [
+    [ Species.FENNEKIN, PokemonType.FIRE, -1, [
       [ Biome.VOLCANO, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.BRAIXEN, Type.FIRE, -1, [
+    [ Species.BRAIXEN, PokemonType.FIRE, -1, [
       [ Biome.VOLCANO, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.DELPHOX, Type.FIRE, Type.PSYCHIC, [
+    [ Species.DELPHOX, PokemonType.FIRE, PokemonType.PSYCHIC, [
       [ Biome.VOLCANO, BiomePoolTier.RARE ],
       [ Biome.VOLCANO, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.FROAKIE, Type.WATER, -1, [
+    [ Species.FROAKIE, PokemonType.WATER, -1, [
       [ Biome.LAKE, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.FROGADIER, Type.WATER, -1, [
+    [ Species.FROGADIER, PokemonType.WATER, -1, [
       [ Biome.LAKE, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.GRENINJA, Type.WATER, Type.DARK, [
+    [ Species.GRENINJA, PokemonType.WATER, PokemonType.DARK, [
       [ Biome.LAKE, BiomePoolTier.RARE ],
       [ Biome.LAKE, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.BUNNELBY, Type.NORMAL, -1, [
+    [ Species.BUNNELBY, PokemonType.NORMAL, -1, [
       [ Biome.CAVE, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.DIGGERSBY, Type.NORMAL, Type.GROUND, [
+    [ Species.DIGGERSBY, PokemonType.NORMAL, PokemonType.GROUND, [
       [ Biome.CAVE, BiomePoolTier.COMMON ],
       [ Biome.CAVE, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.FLETCHLING, Type.NORMAL, Type.FLYING, [
+    [ Species.FLETCHLING, PokemonType.NORMAL, PokemonType.FLYING, [
       [ Biome.TOWN, BiomePoolTier.COMMON ],
       [ Biome.PLAINS, BiomePoolTier.UNCOMMON ],
       [ Biome.MOUNTAIN, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.FLETCHINDER, Type.FIRE, Type.FLYING, [
+    [ Species.FLETCHINDER, PokemonType.FIRE, PokemonType.FLYING, [
       [ Biome.PLAINS, BiomePoolTier.UNCOMMON ],
       [ Biome.MOUNTAIN, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.TALONFLAME, Type.FIRE, Type.FLYING, [
+    [ Species.TALONFLAME, PokemonType.FIRE, PokemonType.FLYING, [
       [ Biome.PLAINS, BiomePoolTier.UNCOMMON ],
       [ Biome.MOUNTAIN, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.MOUNTAIN, BiomePoolTier.BOSS, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.SCATTERBUG, Type.BUG, -1, [
+    [ Species.SCATTERBUG, PokemonType.BUG, -1, [
       [ Biome.TOWN, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.SPEWPA, Type.BUG, -1, [
+    [ Species.SPEWPA, PokemonType.BUG, -1, [
       [ Biome.TOWN, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.VIVILLON, Type.BUG, Type.FLYING, [
+    [ Species.VIVILLON, PokemonType.BUG, PokemonType.FLYING, [
       [ Biome.FOREST, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.LITLEO, Type.FIRE, Type.NORMAL, [
+    [ Species.LITLEO, PokemonType.FIRE, PokemonType.NORMAL, [
       [ Biome.JUNGLE, BiomePoolTier.UNCOMMON ]
     ]
     ],
-    [ Species.PYROAR, Type.FIRE, Type.NORMAL, [
+    [ Species.PYROAR, PokemonType.FIRE, PokemonType.NORMAL, [
       [ Biome.JUNGLE, BiomePoolTier.UNCOMMON ],
       [ Biome.JUNGLE, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.FLABEBE, Type.FAIRY, -1, [
+    [ Species.FLABEBE, PokemonType.FAIRY, -1, [
       [ Biome.MEADOW, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.FLOETTE, Type.FAIRY, -1, [
+    [ Species.FLOETTE, PokemonType.FAIRY, -1, [
       [ Biome.MEADOW, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.FLORGES, Type.FAIRY, -1, [
+    [ Species.FLORGES, PokemonType.FAIRY, -1, [
       [ Biome.MEADOW, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.SKIDDO, Type.GRASS, -1, [
+    [ Species.SKIDDO, PokemonType.GRASS, -1, [
       [ Biome.MOUNTAIN, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.GOGOAT, Type.GRASS, -1, [
+    [ Species.GOGOAT, PokemonType.GRASS, -1, [
       [ Biome.MOUNTAIN, BiomePoolTier.COMMON ],
       [ Biome.MOUNTAIN, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.PANCHAM, Type.FIGHTING, -1, [
+    [ Species.PANCHAM, PokemonType.FIGHTING, -1, [
       [ Biome.DOJO, BiomePoolTier.RARE ],
       [ Biome.JUNGLE, BiomePoolTier.UNCOMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]]
     ]
     ],
-    [ Species.PANGORO, Type.FIGHTING, Type.DARK, [
+    [ Species.PANGORO, PokemonType.FIGHTING, PokemonType.DARK, [
       [ Biome.DOJO, BiomePoolTier.RARE ],
       [ Biome.DOJO, BiomePoolTier.BOSS_RARE ],
       [ Biome.JUNGLE, BiomePoolTier.UNCOMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]],
       [ Biome.JUNGLE, BiomePoolTier.BOSS, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]]
     ]
     ],
-    [ Species.FURFROU, Type.NORMAL, -1, [
+    [ Species.FURFROU, PokemonType.NORMAL, -1, [
       [ Biome.METROPOLIS, BiomePoolTier.UNCOMMON ],
       [ Biome.METROPOLIS, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.ESPURR, Type.PSYCHIC, -1, [
+    [ Species.ESPURR, PokemonType.PSYCHIC, -1, [
       [ Biome.METROPOLIS, BiomePoolTier.UNCOMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]]
     ]
     ],
-    [ Species.MEOWSTIC, Type.PSYCHIC, -1, [
+    [ Species.MEOWSTIC, PokemonType.PSYCHIC, -1, [
       [ Biome.METROPOLIS, BiomePoolTier.UNCOMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]],
       [ Biome.METROPOLIS, BiomePoolTier.BOSS, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]]
     ]
     ],
-    [ Species.HONEDGE, Type.STEEL, Type.GHOST, [
+    [ Species.HONEDGE, PokemonType.STEEL, PokemonType.GHOST, [
       [ Biome.TEMPLE, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.DOUBLADE, Type.STEEL, Type.GHOST, [
+    [ Species.DOUBLADE, PokemonType.STEEL, PokemonType.GHOST, [
       [ Biome.TEMPLE, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.AEGISLASH, Type.STEEL, Type.GHOST, [
+    [ Species.AEGISLASH, PokemonType.STEEL, PokemonType.GHOST, [
       [ Biome.TEMPLE, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.SPRITZEE, Type.FAIRY, -1, [
+    [ Species.SPRITZEE, PokemonType.FAIRY, -1, [
       [ Biome.FAIRY_CAVE, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.AROMATISSE, Type.FAIRY, -1, [
+    [ Species.AROMATISSE, PokemonType.FAIRY, -1, [
       [ Biome.FAIRY_CAVE, BiomePoolTier.COMMON ],
       [ Biome.FAIRY_CAVE, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.SWIRLIX, Type.FAIRY, -1, [
+    [ Species.SWIRLIX, PokemonType.FAIRY, -1, [
       [ Biome.FAIRY_CAVE, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.SLURPUFF, Type.FAIRY, -1, [
+    [ Species.SLURPUFF, PokemonType.FAIRY, -1, [
       [ Biome.FAIRY_CAVE, BiomePoolTier.COMMON ],
       [ Biome.FAIRY_CAVE, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.INKAY, Type.DARK, Type.PSYCHIC, [
+    [ Species.INKAY, PokemonType.DARK, PokemonType.PSYCHIC, [
       [ Biome.SEA, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]]
     ]
     ],
-    [ Species.MALAMAR, Type.DARK, Type.PSYCHIC, [
+    [ Species.MALAMAR, PokemonType.DARK, PokemonType.PSYCHIC, [
       [ Biome.SEA, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]],
       [ Biome.SEA, BiomePoolTier.BOSS, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]]
     ]
     ],
-    [ Species.BINACLE, Type.ROCK, Type.WATER, [
+    [ Species.BINACLE, PokemonType.ROCK, PokemonType.WATER, [
       [ Biome.BEACH, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.BARBARACLE, Type.ROCK, Type.WATER, [
+    [ Species.BARBARACLE, PokemonType.ROCK, PokemonType.WATER, [
       [ Biome.BEACH, BiomePoolTier.COMMON ],
       [ Biome.BEACH, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.SKRELP, Type.POISON, Type.WATER, [
+    [ Species.SKRELP, PokemonType.POISON, PokemonType.WATER, [
       [ Biome.SEABED, BiomePoolTier.UNCOMMON ]
     ]
     ],
-    [ Species.DRAGALGE, Type.POISON, Type.DRAGON, [
+    [ Species.DRAGALGE, PokemonType.POISON, PokemonType.DRAGON, [
       [ Biome.SEABED, BiomePoolTier.UNCOMMON ],
       [ Biome.SEABED, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.CLAUNCHER, Type.WATER, -1, [
+    [ Species.CLAUNCHER, PokemonType.WATER, -1, [
       [ Biome.BEACH, BiomePoolTier.UNCOMMON ]
     ]
     ],
-    [ Species.CLAWITZER, Type.WATER, -1, [
+    [ Species.CLAWITZER, PokemonType.WATER, -1, [
       [ Biome.BEACH, BiomePoolTier.UNCOMMON ],
       [ Biome.BEACH, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.HELIOPTILE, Type.ELECTRIC, Type.NORMAL, [
+    [ Species.HELIOPTILE, PokemonType.ELECTRIC, PokemonType.NORMAL, [
       [ Biome.DESERT, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.HELIOLISK, Type.ELECTRIC, Type.NORMAL, [
+    [ Species.HELIOLISK, PokemonType.ELECTRIC, PokemonType.NORMAL, [
       [ Biome.DESERT, BiomePoolTier.BOSS, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.TYRUNT, Type.ROCK, Type.DRAGON, [
+    [ Species.TYRUNT, PokemonType.ROCK, PokemonType.DRAGON, [
       [ Biome.WASTELAND, BiomePoolTier.SUPER_RARE ]
     ]
     ],
-    [ Species.TYRANTRUM, Type.ROCK, Type.DRAGON, [
+    [ Species.TYRANTRUM, PokemonType.ROCK, PokemonType.DRAGON, [
       [ Biome.WASTELAND, BiomePoolTier.SUPER_RARE ],
       [ Biome.WASTELAND, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.AMAURA, Type.ROCK, Type.ICE, [
+    [ Species.AMAURA, PokemonType.ROCK, PokemonType.ICE, [
       [ Biome.ICE_CAVE, BiomePoolTier.SUPER_RARE ]
     ]
     ],
-    [ Species.AURORUS, Type.ROCK, Type.ICE, [
+    [ Species.AURORUS, PokemonType.ROCK, PokemonType.ICE, [
       [ Biome.ICE_CAVE, BiomePoolTier.SUPER_RARE ],
       [ Biome.ICE_CAVE, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.SYLVEON, Type.FAIRY, -1, [
+    [ Species.SYLVEON, PokemonType.FAIRY, -1, [
       [ Biome.MEADOW, BiomePoolTier.SUPER_RARE ],
       [ Biome.MEADOW, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.HAWLUCHA, Type.FIGHTING, Type.FLYING, [
+    [ Species.HAWLUCHA, PokemonType.FIGHTING, PokemonType.FLYING, [
       [ Biome.MOUNTAIN, BiomePoolTier.RARE ],
       [ Biome.MOUNTAIN, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.DEDENNE, Type.ELECTRIC, Type.FAIRY, [
+    [ Species.DEDENNE, PokemonType.ELECTRIC, PokemonType.FAIRY, [
       [ Biome.POWER_PLANT, BiomePoolTier.COMMON ],
       [ Biome.POWER_PLANT, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.CARBINK, Type.ROCK, Type.FAIRY, [
+    [ Species.CARBINK, PokemonType.ROCK, PokemonType.FAIRY, [
       [ Biome.CAVE, BiomePoolTier.RARE ],
       [ Biome.FAIRY_CAVE, BiomePoolTier.UNCOMMON ],
       [ Biome.FAIRY_CAVE, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.GOOMY, Type.DRAGON, -1, [
+    [ Species.GOOMY, PokemonType.DRAGON, -1, [
       [ Biome.WASTELAND, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.SLIGGOO, Type.DRAGON, -1, [
+    [ Species.SLIGGOO, PokemonType.DRAGON, -1, [
       [ Biome.WASTELAND, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.GOODRA, Type.DRAGON, -1, [
+    [ Species.GOODRA, PokemonType.DRAGON, -1, [
       [ Biome.WASTELAND, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.WASTELAND, BiomePoolTier.BOSS, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.KLEFKI, Type.STEEL, Type.FAIRY, [
+    [ Species.KLEFKI, PokemonType.STEEL, PokemonType.FAIRY, [
       [ Biome.FACTORY, BiomePoolTier.UNCOMMON ],
       [ Biome.FACTORY, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.PHANTUMP, Type.GHOST, Type.GRASS, [
+    [ Species.PHANTUMP, PokemonType.GHOST, PokemonType.GRASS, [
       [ Biome.GRAVEYARD, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.TREVENANT, Type.GHOST, Type.GRASS, [
+    [ Species.TREVENANT, PokemonType.GHOST, PokemonType.GRASS, [
       [ Biome.GRAVEYARD, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.PUMPKABOO, Type.GHOST, Type.GRASS, [
+    [ Species.PUMPKABOO, PokemonType.GHOST, PokemonType.GRASS, [
       [ Biome.GRAVEYARD, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.GOURGEIST, Type.GHOST, Type.GRASS, [
+    [ Species.GOURGEIST, PokemonType.GHOST, PokemonType.GRASS, [
       [ Biome.GRAVEYARD, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.BERGMITE, Type.ICE, -1, [
+    [ Species.BERGMITE, PokemonType.ICE, -1, [
       [ Biome.ICE_CAVE, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.AVALUGG, Type.ICE, -1, [
+    [ Species.AVALUGG, PokemonType.ICE, -1, [
       [ Biome.ICE_CAVE, BiomePoolTier.COMMON ],
       [ Biome.ICE_CAVE, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.NOIBAT, Type.FLYING, Type.DRAGON, [
+    [ Species.NOIBAT, PokemonType.FLYING, PokemonType.DRAGON, [
       [ Biome.CAVE, BiomePoolTier.UNCOMMON ]
     ]
     ],
-    [ Species.NOIVERN, Type.FLYING, Type.DRAGON, [
+    [ Species.NOIVERN, PokemonType.FLYING, PokemonType.DRAGON, [
       [ Biome.CAVE, BiomePoolTier.UNCOMMON ],
       [ Biome.CAVE, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.XERNEAS, Type.FAIRY, -1, [
+    [ Species.XERNEAS, PokemonType.FAIRY, -1, [
       [ Biome.FAIRY_CAVE, BiomePoolTier.BOSS_ULTRA_RARE ]
     ]
     ],
-    [ Species.YVELTAL, Type.DARK, Type.FLYING, [
+    [ Species.YVELTAL, PokemonType.DARK, PokemonType.FLYING, [
       [ Biome.ABYSS, BiomePoolTier.BOSS_ULTRA_RARE ]
     ]
     ],
-    [ Species.ZYGARDE, Type.DRAGON, Type.GROUND, [
+    [ Species.ZYGARDE, PokemonType.DRAGON, PokemonType.GROUND, [
       [ Biome.LABORATORY, BiomePoolTier.BOSS_SUPER_RARE ]
     ]
     ],
-    [ Species.DIANCIE, Type.ROCK, Type.FAIRY, [
+    [ Species.DIANCIE, PokemonType.ROCK, PokemonType.FAIRY, [
       [ Biome.FAIRY_CAVE, BiomePoolTier.ULTRA_RARE ],
       [ Biome.FAIRY_CAVE, BiomePoolTier.BOSS_SUPER_RARE ]
     ]
     ],
-    [ Species.HOOPA, Type.PSYCHIC, Type.GHOST, [
+    [ Species.HOOPA, PokemonType.PSYCHIC, PokemonType.GHOST, [
       [ Biome.TEMPLE, BiomePoolTier.ULTRA_RARE ],
       [ Biome.TEMPLE, BiomePoolTier.BOSS_SUPER_RARE ]
     ]
     ],
-    [ Species.VOLCANION, Type.FIRE, Type.WATER, [
+    [ Species.VOLCANION, PokemonType.FIRE, PokemonType.WATER, [
       [ Biome.VOLCANO, BiomePoolTier.ULTRA_RARE ],
       [ Biome.VOLCANO, BiomePoolTier.BOSS_SUPER_RARE ]
     ]
     ],
-    [ Species.ROWLET, Type.GRASS, Type.FLYING, [
+    [ Species.ROWLET, PokemonType.GRASS, PokemonType.FLYING, [
       [ Biome.FOREST, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.DARTRIX, Type.GRASS, Type.FLYING, [
+    [ Species.DARTRIX, PokemonType.GRASS, PokemonType.FLYING, [
       [ Biome.FOREST, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.DECIDUEYE, Type.GRASS, Type.GHOST, [
+    [ Species.DECIDUEYE, PokemonType.GRASS, PokemonType.GHOST, [
       [ Biome.FOREST, BiomePoolTier.RARE ],
       [ Biome.FOREST, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.LITTEN, Type.FIRE, -1, [
+    [ Species.LITTEN, PokemonType.FIRE, -1, [
       [ Biome.VOLCANO, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.TORRACAT, Type.FIRE, -1, [
+    [ Species.TORRACAT, PokemonType.FIRE, -1, [
       [ Biome.VOLCANO, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.INCINEROAR, Type.FIRE, Type.DARK, [
+    [ Species.INCINEROAR, PokemonType.FIRE, PokemonType.DARK, [
       [ Biome.VOLCANO, BiomePoolTier.RARE ],
       [ Biome.VOLCANO, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.POPPLIO, Type.WATER, -1, [
+    [ Species.POPPLIO, PokemonType.WATER, -1, [
       [ Biome.SEA, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.BRIONNE, Type.WATER, -1, [
+    [ Species.BRIONNE, PokemonType.WATER, -1, [
       [ Biome.SEA, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.PRIMARINA, Type.WATER, Type.FAIRY, [
+    [ Species.PRIMARINA, PokemonType.WATER, PokemonType.FAIRY, [
       [ Biome.SEA, BiomePoolTier.RARE ],
       [ Biome.SEA, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.PIKIPEK, Type.NORMAL, Type.FLYING, [
+    [ Species.PIKIPEK, PokemonType.NORMAL, PokemonType.FLYING, [
       [ Biome.JUNGLE, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.TRUMBEAK, Type.NORMAL, Type.FLYING, [
+    [ Species.TRUMBEAK, PokemonType.NORMAL, PokemonType.FLYING, [
       [ Biome.JUNGLE, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.TOUCANNON, Type.NORMAL, Type.FLYING, [
+    [ Species.TOUCANNON, PokemonType.NORMAL, PokemonType.FLYING, [
       [ Biome.JUNGLE, BiomePoolTier.COMMON ],
       [ Biome.JUNGLE, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.YUNGOOS, Type.NORMAL, -1, [
+    [ Species.YUNGOOS, PokemonType.NORMAL, -1, [
       [ Biome.TOWN, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.PLAINS, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.GUMSHOOS, Type.NORMAL, -1, [
+    [ Species.GUMSHOOS, PokemonType.NORMAL, -1, [
       [ Biome.PLAINS, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.PLAINS, BiomePoolTier.BOSS, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.GRUBBIN, Type.BUG, -1, [
+    [ Species.GRUBBIN, PokemonType.BUG, -1, [
       [ Biome.POWER_PLANT, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.CHARJABUG, Type.BUG, Type.ELECTRIC, [
+    [ Species.CHARJABUG, PokemonType.BUG, PokemonType.ELECTRIC, [
       [ Biome.POWER_PLANT, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.VIKAVOLT, Type.BUG, Type.ELECTRIC, [
+    [ Species.VIKAVOLT, PokemonType.BUG, PokemonType.ELECTRIC, [
       [ Biome.POWER_PLANT, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.CRABRAWLER, Type.FIGHTING, -1, [
+    [ Species.CRABRAWLER, PokemonType.FIGHTING, -1, [
       [ Biome.ICE_CAVE, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.CRABOMINABLE, Type.FIGHTING, Type.ICE, [
+    [ Species.CRABOMINABLE, PokemonType.FIGHTING, PokemonType.ICE, [
       [ Biome.ICE_CAVE, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.ORICORIO, Type.FIRE, Type.FLYING, [
+    [ Species.ORICORIO, PokemonType.FIRE, PokemonType.FLYING, [
       [ Biome.MEADOW, BiomePoolTier.UNCOMMON ],
       [ Biome.ISLAND, BiomePoolTier.COMMON ],
       [ Biome.ISLAND, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.CUTIEFLY, Type.BUG, Type.FAIRY, [
+    [ Species.CUTIEFLY, PokemonType.BUG, PokemonType.FAIRY, [
       [ Biome.MEADOW, BiomePoolTier.COMMON ],
       [ Biome.FAIRY_CAVE, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.RIBOMBEE, Type.BUG, Type.FAIRY, [
+    [ Species.RIBOMBEE, PokemonType.BUG, PokemonType.FAIRY, [
       [ Biome.MEADOW, BiomePoolTier.COMMON ],
       [ Biome.MEADOW, BiomePoolTier.BOSS ],
       [ Biome.FAIRY_CAVE, BiomePoolTier.COMMON ],
       [ Biome.FAIRY_CAVE, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.ROCKRUFF, Type.ROCK, -1, [
+    [ Species.ROCKRUFF, PokemonType.ROCK, -1, [
       [ Biome.PLAINS, BiomePoolTier.UNCOMMON, TimeOfDay.DAY ],
       [ Biome.FOREST, BiomePoolTier.UNCOMMON, TimeOfDay.NIGHT ],
       [ Biome.CAVE, BiomePoolTier.UNCOMMON, TimeOfDay.DUSK ]
     ]
     ],
-    [ Species.LYCANROC, Type.ROCK, -1, [
+    [ Species.LYCANROC, PokemonType.ROCK, -1, [
       [ Biome.PLAINS, BiomePoolTier.UNCOMMON, TimeOfDay.DAY ],
       [ Biome.PLAINS, BiomePoolTier.BOSS_RARE, TimeOfDay.DAY ],
       [ Biome.FOREST, BiomePoolTier.UNCOMMON, TimeOfDay.NIGHT ],
@@ -5608,1529 +5609,1529 @@ export function initBiomes() {
       [ Biome.CAVE, BiomePoolTier.BOSS_RARE, TimeOfDay.DUSK ]
     ]
     ],
-    [ Species.WISHIWASHI, Type.WATER, -1, [
+    [ Species.WISHIWASHI, PokemonType.WATER, -1, [
       [ Biome.LAKE, BiomePoolTier.UNCOMMON ],
       [ Biome.LAKE, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.MAREANIE, Type.POISON, Type.WATER, [
+    [ Species.MAREANIE, PokemonType.POISON, PokemonType.WATER, [
       [ Biome.BEACH, BiomePoolTier.COMMON ],
       [ Biome.SWAMP, BiomePoolTier.UNCOMMON ]
     ]
     ],
-    [ Species.TOXAPEX, Type.POISON, Type.WATER, [
+    [ Species.TOXAPEX, PokemonType.POISON, PokemonType.WATER, [
       [ Biome.BEACH, BiomePoolTier.COMMON ],
       [ Biome.BEACH, BiomePoolTier.BOSS ],
       [ Biome.SWAMP, BiomePoolTier.UNCOMMON ],
       [ Biome.SWAMP, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.MUDBRAY, Type.GROUND, -1, [
+    [ Species.MUDBRAY, PokemonType.GROUND, -1, [
       [ Biome.BADLANDS, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.MUDSDALE, Type.GROUND, -1, [
+    [ Species.MUDSDALE, PokemonType.GROUND, -1, [
       [ Biome.BADLANDS, BiomePoolTier.COMMON ],
       [ Biome.BADLANDS, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.DEWPIDER, Type.WATER, Type.BUG, [
+    [ Species.DEWPIDER, PokemonType.WATER, PokemonType.BUG, [
       [ Biome.LAKE, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.ARAQUANID, Type.WATER, Type.BUG, [
+    [ Species.ARAQUANID, PokemonType.WATER, PokemonType.BUG, [
       [ Biome.LAKE, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.LAKE, BiomePoolTier.BOSS, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.FOMANTIS, Type.GRASS, -1, [
+    [ Species.FOMANTIS, PokemonType.GRASS, -1, [
       [ Biome.TALL_GRASS, BiomePoolTier.COMMON ],
       [ Biome.JUNGLE, BiomePoolTier.UNCOMMON ]
     ]
     ],
-    [ Species.LURANTIS, Type.GRASS, -1, [
+    [ Species.LURANTIS, PokemonType.GRASS, -1, [
       [ Biome.TALL_GRASS, BiomePoolTier.COMMON ],
       [ Biome.TALL_GRASS, BiomePoolTier.BOSS ],
       [ Biome.JUNGLE, BiomePoolTier.UNCOMMON ],
       [ Biome.JUNGLE, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.MORELULL, Type.GRASS, Type.FAIRY, [
+    [ Species.MORELULL, PokemonType.GRASS, PokemonType.FAIRY, [
       [ Biome.FAIRY_CAVE, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.SHIINOTIC, Type.GRASS, Type.FAIRY, [
+    [ Species.SHIINOTIC, PokemonType.GRASS, PokemonType.FAIRY, [
       [ Biome.FAIRY_CAVE, BiomePoolTier.COMMON ],
       [ Biome.FAIRY_CAVE, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.SALANDIT, Type.POISON, Type.FIRE, [
+    [ Species.SALANDIT, PokemonType.POISON, PokemonType.FIRE, [
       [ Biome.VOLCANO, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.SALAZZLE, Type.POISON, Type.FIRE, [
+    [ Species.SALAZZLE, PokemonType.POISON, PokemonType.FIRE, [
       [ Biome.VOLCANO, BiomePoolTier.COMMON ],
       [ Biome.VOLCANO, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.STUFFUL, Type.NORMAL, Type.FIGHTING, [
+    [ Species.STUFFUL, PokemonType.NORMAL, PokemonType.FIGHTING, [
       [ Biome.DOJO, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.BEWEAR, Type.NORMAL, Type.FIGHTING, [
+    [ Species.BEWEAR, PokemonType.NORMAL, PokemonType.FIGHTING, [
       [ Biome.DOJO, BiomePoolTier.COMMON ],
       [ Biome.DOJO, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.BOUNSWEET, Type.GRASS, -1, [
+    [ Species.BOUNSWEET, PokemonType.GRASS, -1, [
       [ Biome.TALL_GRASS, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.STEENEE, Type.GRASS, -1, [
+    [ Species.STEENEE, PokemonType.GRASS, -1, [
       [ Biome.TALL_GRASS, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.TSAREENA, Type.GRASS, -1, [
+    [ Species.TSAREENA, PokemonType.GRASS, -1, [
       [ Biome.TALL_GRASS, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.TALL_GRASS, BiomePoolTier.BOSS, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.COMFEY, Type.FAIRY, -1, [
+    [ Species.COMFEY, PokemonType.FAIRY, -1, [
       [ Biome.FAIRY_CAVE, BiomePoolTier.UNCOMMON ],
       [ Biome.FAIRY_CAVE, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.ORANGURU, Type.NORMAL, Type.PSYCHIC, [
+    [ Species.ORANGURU, PokemonType.NORMAL, PokemonType.PSYCHIC, [
       [ Biome.JUNGLE, BiomePoolTier.RARE, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]]
     ]
     ],
-    [ Species.PASSIMIAN, Type.FIGHTING, -1, [
+    [ Species.PASSIMIAN, PokemonType.FIGHTING, -1, [
       [ Biome.JUNGLE, BiomePoolTier.RARE, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.WIMPOD, Type.BUG, Type.WATER, [
+    [ Species.WIMPOD, PokemonType.BUG, PokemonType.WATER, [
       [ Biome.CAVE, BiomePoolTier.UNCOMMON ]
     ]
     ],
-    [ Species.GOLISOPOD, Type.BUG, Type.WATER, [
+    [ Species.GOLISOPOD, PokemonType.BUG, PokemonType.WATER, [
       [ Biome.CAVE, BiomePoolTier.UNCOMMON ],
       [ Biome.CAVE, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.SANDYGAST, Type.GHOST, Type.GROUND, [
+    [ Species.SANDYGAST, PokemonType.GHOST, PokemonType.GROUND, [
       [ Biome.BEACH, BiomePoolTier.UNCOMMON ]
     ]
     ],
-    [ Species.PALOSSAND, Type.GHOST, Type.GROUND, [
+    [ Species.PALOSSAND, PokemonType.GHOST, PokemonType.GROUND, [
       [ Biome.BEACH, BiomePoolTier.UNCOMMON ],
       [ Biome.BEACH, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.PYUKUMUKU, Type.WATER, -1, [
+    [ Species.PYUKUMUKU, PokemonType.WATER, -1, [
       [ Biome.SEABED, BiomePoolTier.SUPER_RARE ],
       [ Biome.SEABED, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.TYPE_NULL, Type.NORMAL, -1, [
+    [ Species.TYPE_NULL, PokemonType.NORMAL, -1, [
       [ Biome.LABORATORY, BiomePoolTier.ULTRA_RARE ]
     ]
     ],
-    [ Species.SILVALLY, Type.NORMAL, -1, [
+    [ Species.SILVALLY, PokemonType.NORMAL, -1, [
       [ Biome.LABORATORY, BiomePoolTier.BOSS_SUPER_RARE ]
     ]
     ],
-    [ Species.MINIOR, Type.ROCK, Type.FLYING, [
+    [ Species.MINIOR, PokemonType.ROCK, PokemonType.FLYING, [
       [ Biome.SPACE, BiomePoolTier.COMMON ],
       [ Biome.SPACE, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.KOMALA, Type.NORMAL, -1, [
+    [ Species.KOMALA, PokemonType.NORMAL, -1, [
       [ Biome.JUNGLE, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.JUNGLE, BiomePoolTier.BOSS, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.TURTONATOR, Type.FIRE, Type.DRAGON, [
+    [ Species.TURTONATOR, PokemonType.FIRE, PokemonType.DRAGON, [
       [ Biome.VOLCANO, BiomePoolTier.UNCOMMON ],
       [ Biome.VOLCANO, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.TOGEDEMARU, Type.ELECTRIC, Type.STEEL, [
+    [ Species.TOGEDEMARU, PokemonType.ELECTRIC, PokemonType.STEEL, [
       [ Biome.POWER_PLANT, BiomePoolTier.UNCOMMON ],
       [ Biome.POWER_PLANT, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.MIMIKYU, Type.GHOST, Type.FAIRY, [
+    [ Species.MIMIKYU, PokemonType.GHOST, PokemonType.FAIRY, [
       [ Biome.GRAVEYARD, BiomePoolTier.RARE ],
       [ Biome.GRAVEYARD, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.BRUXISH, Type.WATER, Type.PSYCHIC, [
+    [ Species.BRUXISH, PokemonType.WATER, PokemonType.PSYCHIC, [
       [ Biome.ISLAND, BiomePoolTier.UNCOMMON ],
       [ Biome.ISLAND, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.DRAMPA, Type.NORMAL, Type.DRAGON, [
+    [ Species.DRAMPA, PokemonType.NORMAL, PokemonType.DRAGON, [
       [ Biome.WASTELAND, BiomePoolTier.UNCOMMON ],
       [ Biome.WASTELAND, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.DHELMISE, Type.GHOST, Type.GRASS, [
+    [ Species.DHELMISE, PokemonType.GHOST, PokemonType.GRASS, [
       [ Biome.SEABED, BiomePoolTier.RARE ],
       [ Biome.SEABED, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.JANGMO_O, Type.DRAGON, -1, [
+    [ Species.JANGMO_O, PokemonType.DRAGON, -1, [
       [ Biome.WASTELAND, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.HAKAMO_O, Type.DRAGON, Type.FIGHTING, [
+    [ Species.HAKAMO_O, PokemonType.DRAGON, PokemonType.FIGHTING, [
       [ Biome.WASTELAND, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.KOMMO_O, Type.DRAGON, Type.FIGHTING, [
+    [ Species.KOMMO_O, PokemonType.DRAGON, PokemonType.FIGHTING, [
       [ Biome.WASTELAND, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.WASTELAND, BiomePoolTier.BOSS, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.TAPU_KOKO, Type.ELECTRIC, Type.FAIRY, [
+    [ Species.TAPU_KOKO, PokemonType.ELECTRIC, PokemonType.FAIRY, [
       [ Biome.TEMPLE, BiomePoolTier.ULTRA_RARE ],
       [ Biome.TEMPLE, BiomePoolTier.BOSS_SUPER_RARE ]
     ]
     ],
-    [ Species.TAPU_LELE, Type.PSYCHIC, Type.FAIRY, [
+    [ Species.TAPU_LELE, PokemonType.PSYCHIC, PokemonType.FAIRY, [
       [ Biome.JUNGLE, BiomePoolTier.ULTRA_RARE ],
       [ Biome.JUNGLE, BiomePoolTier.BOSS_SUPER_RARE ]
     ]
     ],
-    [ Species.TAPU_BULU, Type.GRASS, Type.FAIRY, [
+    [ Species.TAPU_BULU, PokemonType.GRASS, PokemonType.FAIRY, [
       [ Biome.DESERT, BiomePoolTier.ULTRA_RARE ],
       [ Biome.DESERT, BiomePoolTier.BOSS_SUPER_RARE ]
     ]
     ],
-    [ Species.TAPU_FINI, Type.WATER, Type.FAIRY, [
+    [ Species.TAPU_FINI, PokemonType.WATER, PokemonType.FAIRY, [
       [ Biome.BEACH, BiomePoolTier.ULTRA_RARE ],
       [ Biome.BEACH, BiomePoolTier.BOSS_SUPER_RARE ]
     ]
     ],
-    [ Species.COSMOG, Type.PSYCHIC, -1, [
+    [ Species.COSMOG, PokemonType.PSYCHIC, -1, [
       [ Biome.SPACE, BiomePoolTier.ULTRA_RARE ]
     ]
     ],
-    [ Species.COSMOEM, Type.PSYCHIC, -1, [
+    [ Species.COSMOEM, PokemonType.PSYCHIC, -1, [
       [ Biome.SPACE, BiomePoolTier.ULTRA_RARE ]
     ]
     ],
-    [ Species.SOLGALEO, Type.PSYCHIC, Type.STEEL, [
+    [ Species.SOLGALEO, PokemonType.PSYCHIC, PokemonType.STEEL, [
       [ Biome.SPACE, BiomePoolTier.BOSS_ULTRA_RARE, TimeOfDay.DAY ]
     ]
     ],
-    [ Species.LUNALA, Type.PSYCHIC, Type.GHOST, [
+    [ Species.LUNALA, PokemonType.PSYCHIC, PokemonType.GHOST, [
       [ Biome.SPACE, BiomePoolTier.BOSS_ULTRA_RARE, TimeOfDay.NIGHT ]
     ]
     ],
-    [ Species.NIHILEGO, Type.ROCK, Type.POISON, [
+    [ Species.NIHILEGO, PokemonType.ROCK, PokemonType.POISON, [
       [ Biome.SEABED, BiomePoolTier.ULTRA_RARE ],
       [ Biome.SEABED, BiomePoolTier.BOSS_SUPER_RARE ]
     ]
     ],
-    [ Species.BUZZWOLE, Type.BUG, Type.FIGHTING, [
+    [ Species.BUZZWOLE, PokemonType.BUG, PokemonType.FIGHTING, [
       [ Biome.JUNGLE, BiomePoolTier.ULTRA_RARE ],
       [ Biome.JUNGLE, BiomePoolTier.BOSS_SUPER_RARE ]
     ]
     ],
-    [ Species.PHEROMOSA, Type.BUG, Type.FIGHTING, [
+    [ Species.PHEROMOSA, PokemonType.BUG, PokemonType.FIGHTING, [
       [ Biome.DESERT, BiomePoolTier.ULTRA_RARE ],
       [ Biome.DESERT, BiomePoolTier.BOSS_SUPER_RARE ]
     ]
     ],
-    [ Species.XURKITREE, Type.ELECTRIC, -1, [
+    [ Species.XURKITREE, PokemonType.ELECTRIC, -1, [
       [ Biome.POWER_PLANT, BiomePoolTier.ULTRA_RARE ],
       [ Biome.POWER_PLANT, BiomePoolTier.BOSS_SUPER_RARE ]
     ]
     ],
-    [ Species.CELESTEELA, Type.STEEL, Type.FLYING, [
+    [ Species.CELESTEELA, PokemonType.STEEL, PokemonType.FLYING, [
       [ Biome.SPACE, BiomePoolTier.ULTRA_RARE ],
       [ Biome.SPACE, BiomePoolTier.BOSS_SUPER_RARE ]
     ]
     ],
-    [ Species.KARTANA, Type.GRASS, Type.STEEL, [
+    [ Species.KARTANA, PokemonType.GRASS, PokemonType.STEEL, [
       [ Biome.FOREST, BiomePoolTier.ULTRA_RARE ],
       [ Biome.FOREST, BiomePoolTier.BOSS_SUPER_RARE ]
     ]
     ],
-    [ Species.GUZZLORD, Type.DARK, Type.DRAGON, [
+    [ Species.GUZZLORD, PokemonType.DARK, PokemonType.DRAGON, [
       [ Biome.SLUM, BiomePoolTier.ULTRA_RARE ],
       [ Biome.SLUM, BiomePoolTier.BOSS_SUPER_RARE ]
     ]
     ],
-    [ Species.NECROZMA, Type.PSYCHIC, -1, [
+    [ Species.NECROZMA, PokemonType.PSYCHIC, -1, [
       [ Biome.SPACE, BiomePoolTier.BOSS_ULTRA_RARE ]
     ]
     ],
-    [ Species.MAGEARNA, Type.STEEL, Type.FAIRY, [
+    [ Species.MAGEARNA, PokemonType.STEEL, PokemonType.FAIRY, [
       [ Biome.FACTORY, BiomePoolTier.ULTRA_RARE ],
       [ Biome.FACTORY, BiomePoolTier.BOSS_SUPER_RARE ]
     ]
     ],
-    [ Species.MARSHADOW, Type.FIGHTING, Type.GHOST, [
+    [ Species.MARSHADOW, PokemonType.FIGHTING, PokemonType.GHOST, [
       [ Biome.GRAVEYARD, BiomePoolTier.ULTRA_RARE ],
       [ Biome.GRAVEYARD, BiomePoolTier.BOSS_SUPER_RARE ]
     ]
     ],
-    [ Species.POIPOLE, Type.POISON, -1, [
+    [ Species.POIPOLE, PokemonType.POISON, -1, [
       [ Biome.SWAMP, BiomePoolTier.ULTRA_RARE ]
     ]
     ],
-    [ Species.NAGANADEL, Type.POISON, Type.DRAGON, [
+    [ Species.NAGANADEL, PokemonType.POISON, PokemonType.DRAGON, [
       [ Biome.SWAMP, BiomePoolTier.BOSS_SUPER_RARE ]
     ]
     ],
-    [ Species.STAKATAKA, Type.ROCK, Type.STEEL, [
+    [ Species.STAKATAKA, PokemonType.ROCK, PokemonType.STEEL, [
       [ Biome.CONSTRUCTION_SITE, BiomePoolTier.ULTRA_RARE ],
       [ Biome.CONSTRUCTION_SITE, BiomePoolTier.BOSS_SUPER_RARE ]
     ]
     ],
-    [ Species.BLACEPHALON, Type.FIRE, Type.GHOST, [
+    [ Species.BLACEPHALON, PokemonType.FIRE, PokemonType.GHOST, [
       [ Biome.ISLAND, BiomePoolTier.ULTRA_RARE ],
       [ Biome.ISLAND, BiomePoolTier.BOSS_SUPER_RARE ]
     ]
     ],
-    [ Species.ZERAORA, Type.ELECTRIC, -1, [
+    [ Species.ZERAORA, PokemonType.ELECTRIC, -1, [
       [ Biome.POWER_PLANT, BiomePoolTier.ULTRA_RARE ],
       [ Biome.POWER_PLANT, BiomePoolTier.BOSS_SUPER_RARE ]
     ]
     ],
-    [ Species.MELTAN, Type.STEEL, -1, [ ]
+    [ Species.MELTAN, PokemonType.STEEL, -1, [ ]
     ],
-    [ Species.MELMETAL, Type.STEEL, -1, [ ]
+    [ Species.MELMETAL, PokemonType.STEEL, -1, [ ]
     ],
-    [ Species.GROOKEY, Type.GRASS, -1, [
+    [ Species.GROOKEY, PokemonType.GRASS, -1, [
       [ Biome.JUNGLE, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.THWACKEY, Type.GRASS, -1, [
+    [ Species.THWACKEY, PokemonType.GRASS, -1, [
       [ Biome.JUNGLE, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.RILLABOOM, Type.GRASS, -1, [
+    [ Species.RILLABOOM, PokemonType.GRASS, -1, [
       [ Biome.JUNGLE, BiomePoolTier.RARE ],
       [ Biome.JUNGLE, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.SCORBUNNY, Type.FIRE, -1, [
+    [ Species.SCORBUNNY, PokemonType.FIRE, -1, [
       [ Biome.VOLCANO, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.RABOOT, Type.FIRE, -1, [
+    [ Species.RABOOT, PokemonType.FIRE, -1, [
       [ Biome.VOLCANO, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.CINDERACE, Type.FIRE, -1, [
+    [ Species.CINDERACE, PokemonType.FIRE, -1, [
       [ Biome.VOLCANO, BiomePoolTier.RARE ],
       [ Biome.VOLCANO, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.SOBBLE, Type.WATER, -1, [
+    [ Species.SOBBLE, PokemonType.WATER, -1, [
       [ Biome.LAKE, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.DRIZZILE, Type.WATER, -1, [
+    [ Species.DRIZZILE, PokemonType.WATER, -1, [
       [ Biome.LAKE, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.INTELEON, Type.WATER, -1, [
+    [ Species.INTELEON, PokemonType.WATER, -1, [
       [ Biome.LAKE, BiomePoolTier.RARE ],
       [ Biome.LAKE, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.SKWOVET, Type.NORMAL, -1, [
+    [ Species.SKWOVET, PokemonType.NORMAL, -1, [
       [ Biome.TOWN, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.PLAINS, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.GREEDENT, Type.NORMAL, -1, [
+    [ Species.GREEDENT, PokemonType.NORMAL, -1, [
       [ Biome.PLAINS, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.PLAINS, BiomePoolTier.BOSS, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.ROOKIDEE, Type.FLYING, -1, [
+    [ Species.ROOKIDEE, PokemonType.FLYING, -1, [
       [ Biome.TOWN, BiomePoolTier.RARE ],
       [ Biome.PLAINS, BiomePoolTier.RARE ],
       [ Biome.MOUNTAIN, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.CORVISQUIRE, Type.FLYING, -1, [
+    [ Species.CORVISQUIRE, PokemonType.FLYING, -1, [
       [ Biome.PLAINS, BiomePoolTier.RARE ],
       [ Biome.MOUNTAIN, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.CORVIKNIGHT, Type.FLYING, Type.STEEL, [
+    [ Species.CORVIKNIGHT, PokemonType.FLYING, PokemonType.STEEL, [
       [ Biome.PLAINS, BiomePoolTier.RARE ],
       [ Biome.MOUNTAIN, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.MOUNTAIN, BiomePoolTier.BOSS, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.BLIPBUG, Type.BUG, -1, [
+    [ Species.BLIPBUG, PokemonType.BUG, -1, [
       [ Biome.TOWN, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]]
     ]
     ],
-    [ Species.DOTTLER, Type.BUG, Type.PSYCHIC, [
+    [ Species.DOTTLER, PokemonType.BUG, PokemonType.PSYCHIC, [
       [ Biome.FOREST, BiomePoolTier.UNCOMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]]
     ]
     ],
-    [ Species.ORBEETLE, Type.BUG, Type.PSYCHIC, [
+    [ Species.ORBEETLE, PokemonType.BUG, PokemonType.PSYCHIC, [
       [ Biome.FOREST, BiomePoolTier.UNCOMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]],
       [ Biome.FOREST, BiomePoolTier.BOSS, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]]
     ]
     ],
-    [ Species.NICKIT, Type.DARK, -1, [
+    [ Species.NICKIT, PokemonType.DARK, -1, [
       [ Biome.ABYSS, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.THIEVUL, Type.DARK, -1, [
+    [ Species.THIEVUL, PokemonType.DARK, -1, [
       [ Biome.ABYSS, BiomePoolTier.COMMON ],
       [ Biome.ABYSS, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.GOSSIFLEUR, Type.GRASS, -1, [
+    [ Species.GOSSIFLEUR, PokemonType.GRASS, -1, [
       [ Biome.MEADOW, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.ELDEGOSS, Type.GRASS, -1, [
+    [ Species.ELDEGOSS, PokemonType.GRASS, -1, [
       [ Biome.MEADOW, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.WOOLOO, Type.NORMAL, -1, [
+    [ Species.WOOLOO, PokemonType.NORMAL, -1, [
       [ Biome.TOWN, BiomePoolTier.COMMON ],
       [ Biome.MEADOW, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.DUBWOOL, Type.NORMAL, -1, [
+    [ Species.DUBWOOL, PokemonType.NORMAL, -1, [
       [ Biome.MEADOW, BiomePoolTier.COMMON ],
       [ Biome.MEADOW, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.CHEWTLE, Type.WATER, -1, [
+    [ Species.CHEWTLE, PokemonType.WATER, -1, [
       [ Biome.LAKE, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.DREDNAW, Type.WATER, Type.ROCK, [
+    [ Species.DREDNAW, PokemonType.WATER, PokemonType.ROCK, [
       [ Biome.LAKE, BiomePoolTier.COMMON ],
       [ Biome.LAKE, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.YAMPER, Type.ELECTRIC, -1, [
+    [ Species.YAMPER, PokemonType.ELECTRIC, -1, [
       [ Biome.METROPOLIS, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.BOLTUND, Type.ELECTRIC, -1, [
+    [ Species.BOLTUND, PokemonType.ELECTRIC, -1, [
       [ Biome.METROPOLIS, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.METROPOLIS, BiomePoolTier.BOSS, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.ROLYCOLY, Type.ROCK, -1, [
+    [ Species.ROLYCOLY, PokemonType.ROCK, -1, [
       [ Biome.VOLCANO, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.CARKOL, Type.ROCK, Type.FIRE, [
+    [ Species.CARKOL, PokemonType.ROCK, PokemonType.FIRE, [
       [ Biome.VOLCANO, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.COALOSSAL, Type.ROCK, Type.FIRE, [
+    [ Species.COALOSSAL, PokemonType.ROCK, PokemonType.FIRE, [
       [ Biome.VOLCANO, BiomePoolTier.COMMON ],
       [ Biome.VOLCANO, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.APPLIN, Type.GRASS, Type.DRAGON, [
+    [ Species.APPLIN, PokemonType.GRASS, PokemonType.DRAGON, [
       [ Biome.MEADOW, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.FLAPPLE, Type.GRASS, Type.DRAGON, [
+    [ Species.FLAPPLE, PokemonType.GRASS, PokemonType.DRAGON, [
       [ Biome.MEADOW, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.APPLETUN, Type.GRASS, Type.DRAGON, [
+    [ Species.APPLETUN, PokemonType.GRASS, PokemonType.DRAGON, [
       [ Biome.MEADOW, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.SILICOBRA, Type.GROUND, -1, [
+    [ Species.SILICOBRA, PokemonType.GROUND, -1, [
       [ Biome.DESERT, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.SANDACONDA, Type.GROUND, -1, [
+    [ Species.SANDACONDA, PokemonType.GROUND, -1, [
       [ Biome.DESERT, BiomePoolTier.COMMON ],
       [ Biome.DESERT, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.CRAMORANT, Type.FLYING, Type.WATER, [
+    [ Species.CRAMORANT, PokemonType.FLYING, PokemonType.WATER, [
       [ Biome.SEA, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.SEA, BiomePoolTier.BOSS, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.ARROKUDA, Type.WATER, -1, [
+    [ Species.ARROKUDA, PokemonType.WATER, -1, [
       [ Biome.SEABED, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.BARRASKEWDA, Type.WATER, -1, [
+    [ Species.BARRASKEWDA, PokemonType.WATER, -1, [
       [ Biome.SEABED, BiomePoolTier.COMMON ],
       [ Biome.SEABED, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.TOXEL, Type.ELECTRIC, Type.POISON, [ ]
+    [ Species.TOXEL, PokemonType.ELECTRIC, PokemonType.POISON, [ ]
     ],
-    [ Species.TOXTRICITY, Type.ELECTRIC, Type.POISON, [
+    [ Species.TOXTRICITY, PokemonType.ELECTRIC, PokemonType.POISON, [
       [ Biome.SLUM, BiomePoolTier.RARE, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]],
       [ Biome.SLUM, BiomePoolTier.BOSS_RARE, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]]
     ]
     ],
-    [ Species.SIZZLIPEDE, Type.FIRE, Type.BUG, [
+    [ Species.SIZZLIPEDE, PokemonType.FIRE, PokemonType.BUG, [
       [ Biome.BADLANDS, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.CENTISKORCH, Type.FIRE, Type.BUG, [
+    [ Species.CENTISKORCH, PokemonType.FIRE, PokemonType.BUG, [
       [ Biome.BADLANDS, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.BADLANDS, BiomePoolTier.BOSS, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.CLOBBOPUS, Type.FIGHTING, -1, [
+    [ Species.CLOBBOPUS, PokemonType.FIGHTING, -1, [
       [ Biome.DOJO, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.GRAPPLOCT, Type.FIGHTING, -1, [
+    [ Species.GRAPPLOCT, PokemonType.FIGHTING, -1, [
       [ Biome.DOJO, BiomePoolTier.COMMON ],
       [ Biome.DOJO, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.SINISTEA, Type.GHOST, -1, [
+    [ Species.SINISTEA, PokemonType.GHOST, -1, [
       [ Biome.GRAVEYARD, BiomePoolTier.UNCOMMON ]
     ]
     ],
-    [ Species.POLTEAGEIST, Type.GHOST, -1, [
+    [ Species.POLTEAGEIST, PokemonType.GHOST, -1, [
       [ Biome.GRAVEYARD, BiomePoolTier.UNCOMMON ],
       [ Biome.GRAVEYARD, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.HATENNA, Type.PSYCHIC, -1, [
+    [ Species.HATENNA, PokemonType.PSYCHIC, -1, [
       [ Biome.FAIRY_CAVE, BiomePoolTier.UNCOMMON ]
     ]
     ],
-    [ Species.HATTREM, Type.PSYCHIC, -1, [
+    [ Species.HATTREM, PokemonType.PSYCHIC, -1, [
       [ Biome.FAIRY_CAVE, BiomePoolTier.UNCOMMON ]
     ]
     ],
-    [ Species.HATTERENE, Type.PSYCHIC, Type.FAIRY, [
+    [ Species.HATTERENE, PokemonType.PSYCHIC, PokemonType.FAIRY, [
       [ Biome.FAIRY_CAVE, BiomePoolTier.UNCOMMON ],
       [ Biome.FAIRY_CAVE, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.IMPIDIMP, Type.DARK, Type.FAIRY, [
+    [ Species.IMPIDIMP, PokemonType.DARK, PokemonType.FAIRY, [
       [ Biome.ABYSS, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.MORGREM, Type.DARK, Type.FAIRY, [
+    [ Species.MORGREM, PokemonType.DARK, PokemonType.FAIRY, [
       [ Biome.ABYSS, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.GRIMMSNARL, Type.DARK, Type.FAIRY, [
+    [ Species.GRIMMSNARL, PokemonType.DARK, PokemonType.FAIRY, [
       [ Biome.ABYSS, BiomePoolTier.COMMON ],
       [ Biome.ABYSS, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.OBSTAGOON, Type.DARK, Type.NORMAL, [
+    [ Species.OBSTAGOON, PokemonType.DARK, PokemonType.NORMAL, [
       [ Biome.SLUM, BiomePoolTier.RARE, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]],
       [ Biome.SLUM, BiomePoolTier.BOSS_RARE, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]]
     ]
     ],
-    [ Species.PERRSERKER, Type.STEEL, -1, [
+    [ Species.PERRSERKER, PokemonType.STEEL, -1, [
       [ Biome.CONSTRUCTION_SITE, BiomePoolTier.RARE, TimeOfDay.DUSK ],
       [ Biome.CONSTRUCTION_SITE, BiomePoolTier.BOSS_RARE, TimeOfDay.DUSK ]
     ]
     ],
-    [ Species.CURSOLA, Type.GHOST, -1, [
+    [ Species.CURSOLA, PokemonType.GHOST, -1, [
       [ Biome.SEABED, BiomePoolTier.SUPER_RARE ],
       [ Biome.SEABED, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.SIRFETCHD, Type.FIGHTING, -1, [
+    [ Species.SIRFETCHD, PokemonType.FIGHTING, -1, [
       [ Biome.DOJO, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.MR_RIME, Type.ICE, Type.PSYCHIC, [
+    [ Species.MR_RIME, PokemonType.ICE, PokemonType.PSYCHIC, [
       [ Biome.SNOWY_FOREST, BiomePoolTier.SUPER_RARE ],
       [ Biome.SNOWY_FOREST, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.RUNERIGUS, Type.GROUND, Type.GHOST, [
+    [ Species.RUNERIGUS, PokemonType.GROUND, PokemonType.GHOST, [
       [ Biome.RUINS, BiomePoolTier.SUPER_RARE, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]],
       [ Biome.RUINS, BiomePoolTier.BOSS_RARE, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]]
     ]
     ],
-    [ Species.MILCERY, Type.FAIRY, -1, [
+    [ Species.MILCERY, PokemonType.FAIRY, -1, [
       [ Biome.FAIRY_CAVE, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.ALCREMIE, Type.FAIRY, -1, [
+    [ Species.ALCREMIE, PokemonType.FAIRY, -1, [
       [ Biome.FAIRY_CAVE, BiomePoolTier.COMMON ],
       [ Biome.FAIRY_CAVE, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.FALINKS, Type.FIGHTING, -1, [
+    [ Species.FALINKS, PokemonType.FIGHTING, -1, [
       [ Biome.JUNGLE, BiomePoolTier.UNCOMMON ],
       [ Biome.JUNGLE, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.PINCURCHIN, Type.ELECTRIC, -1, [
+    [ Species.PINCURCHIN, PokemonType.ELECTRIC, -1, [
       [ Biome.SEABED, BiomePoolTier.UNCOMMON ]
     ]
     ],
-    [ Species.SNOM, Type.ICE, Type.BUG, [
+    [ Species.SNOM, PokemonType.ICE, PokemonType.BUG, [
       [ Biome.ICE_CAVE, BiomePoolTier.COMMON ],
       [ Biome.SNOWY_FOREST, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]]
     ]
     ],
-    [ Species.FROSMOTH, Type.ICE, Type.BUG, [
+    [ Species.FROSMOTH, PokemonType.ICE, PokemonType.BUG, [
       [ Biome.ICE_CAVE, BiomePoolTier.COMMON ],
       [ Biome.SNOWY_FOREST, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]],
       [ Biome.SNOWY_FOREST, BiomePoolTier.BOSS, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]]
     ]
     ],
-    [ Species.STONJOURNER, Type.ROCK, -1, [
+    [ Species.STONJOURNER, PokemonType.ROCK, -1, [
       [ Biome.RUINS, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.EISCUE, Type.ICE, -1, [
+    [ Species.EISCUE, PokemonType.ICE, -1, [
       [ Biome.ICE_CAVE, BiomePoolTier.UNCOMMON ],
       [ Biome.SNOWY_FOREST, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.INDEEDEE, Type.PSYCHIC, Type.NORMAL, [
+    [ Species.INDEEDEE, PokemonType.PSYCHIC, PokemonType.NORMAL, [
       [ Biome.METROPOLIS, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.MORPEKO, Type.ELECTRIC, Type.DARK, [
+    [ Species.MORPEKO, PokemonType.ELECTRIC, PokemonType.DARK, [
       [ Biome.METROPOLIS, BiomePoolTier.RARE, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]]
     ]
     ],
-    [ Species.CUFANT, Type.STEEL, -1, [
+    [ Species.CUFANT, PokemonType.STEEL, -1, [
       [ Biome.BADLANDS, BiomePoolTier.UNCOMMON ]
     ]
     ],
-    [ Species.COPPERAJAH, Type.STEEL, -1, [
+    [ Species.COPPERAJAH, PokemonType.STEEL, -1, [
       [ Biome.BADLANDS, BiomePoolTier.UNCOMMON ],
       [ Biome.BADLANDS, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.DRACOZOLT, Type.ELECTRIC, Type.DRAGON, [
+    [ Species.DRACOZOLT, PokemonType.ELECTRIC, PokemonType.DRAGON, [
       [ Biome.WASTELAND, BiomePoolTier.SUPER_RARE ],
       [ Biome.WASTELAND, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.ARCTOZOLT, Type.ELECTRIC, Type.ICE, [
+    [ Species.ARCTOZOLT, PokemonType.ELECTRIC, PokemonType.ICE, [
       [ Biome.SNOWY_FOREST, BiomePoolTier.SUPER_RARE ],
       [ Biome.SNOWY_FOREST, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.DRACOVISH, Type.WATER, Type.DRAGON, [
+    [ Species.DRACOVISH, PokemonType.WATER, PokemonType.DRAGON, [
       [ Biome.WASTELAND, BiomePoolTier.SUPER_RARE ],
       [ Biome.WASTELAND, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.ARCTOVISH, Type.WATER, Type.ICE, [
+    [ Species.ARCTOVISH, PokemonType.WATER, PokemonType.ICE, [
       [ Biome.SEABED, BiomePoolTier.SUPER_RARE ],
       [ Biome.SEABED, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.DURALUDON, Type.STEEL, Type.DRAGON, [
+    [ Species.DURALUDON, PokemonType.STEEL, PokemonType.DRAGON, [
       [ Biome.CONSTRUCTION_SITE, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.DREEPY, Type.DRAGON, Type.GHOST, [
+    [ Species.DREEPY, PokemonType.DRAGON, PokemonType.GHOST, [
       [ Biome.WASTELAND, BiomePoolTier.RARE, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]]
     ]
     ],
-    [ Species.DRAKLOAK, Type.DRAGON, Type.GHOST, [
+    [ Species.DRAKLOAK, PokemonType.DRAGON, PokemonType.GHOST, [
       [ Biome.WASTELAND, BiomePoolTier.RARE, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]]
     ]
     ],
-    [ Species.DRAGAPULT, Type.DRAGON, Type.GHOST, [
+    [ Species.DRAGAPULT, PokemonType.DRAGON, PokemonType.GHOST, [
       [ Biome.WASTELAND, BiomePoolTier.RARE, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]],
       [ Biome.WASTELAND, BiomePoolTier.BOSS, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]]
     ]
     ],
-    [ Species.ZACIAN, Type.FAIRY, -1, [
+    [ Species.ZACIAN, PokemonType.FAIRY, -1, [
       [ Biome.SNOWY_FOREST, BiomePoolTier.BOSS_ULTRA_RARE ]
     ]
     ],
-    [ Species.ZAMAZENTA, Type.FIGHTING, -1, [
+    [ Species.ZAMAZENTA, PokemonType.FIGHTING, -1, [
       [ Biome.DOJO, BiomePoolTier.BOSS_ULTRA_RARE ]
     ]
     ],
-    [ Species.ETERNATUS, Type.POISON, Type.DRAGON, [
+    [ Species.ETERNATUS, PokemonType.POISON, PokemonType.DRAGON, [
       [ Biome.END, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.KUBFU, Type.FIGHTING, -1, [
+    [ Species.KUBFU, PokemonType.FIGHTING, -1, [
       [ Biome.DOJO, BiomePoolTier.ULTRA_RARE ]
     ]
     ],
-    [ Species.URSHIFU, Type.FIGHTING, Type.DARK, [
+    [ Species.URSHIFU, PokemonType.FIGHTING, PokemonType.DARK, [
       [ Biome.DOJO, BiomePoolTier.BOSS_SUPER_RARE ]
     ]
     ],
-    [ Species.ZARUDE, Type.DARK, Type.GRASS, [
+    [ Species.ZARUDE, PokemonType.DARK, PokemonType.GRASS, [
       [ Biome.JUNGLE, BiomePoolTier.ULTRA_RARE ],
       [ Biome.JUNGLE, BiomePoolTier.BOSS_SUPER_RARE ]
     ]
     ],
-    [ Species.REGIELEKI, Type.ELECTRIC, -1, [
+    [ Species.REGIELEKI, PokemonType.ELECTRIC, -1, [
       [ Biome.POWER_PLANT, BiomePoolTier.ULTRA_RARE ],
       [ Biome.POWER_PLANT, BiomePoolTier.BOSS_SUPER_RARE ]
     ]
     ],
-    [ Species.REGIDRAGO, Type.DRAGON, -1, [
+    [ Species.REGIDRAGO, PokemonType.DRAGON, -1, [
       [ Biome.WASTELAND, BiomePoolTier.ULTRA_RARE ],
       [ Biome.WASTELAND, BiomePoolTier.BOSS_SUPER_RARE ]
     ]
     ],
-    [ Species.GLASTRIER, Type.ICE, -1, [
+    [ Species.GLASTRIER, PokemonType.ICE, -1, [
       [ Biome.SNOWY_FOREST, BiomePoolTier.ULTRA_RARE ],
       [ Biome.SNOWY_FOREST, BiomePoolTier.BOSS_SUPER_RARE ]
     ]
     ],
-    [ Species.SPECTRIER, Type.GHOST, -1, [
+    [ Species.SPECTRIER, PokemonType.GHOST, -1, [
       [ Biome.GRAVEYARD, BiomePoolTier.ULTRA_RARE ],
       [ Biome.GRAVEYARD, BiomePoolTier.BOSS_SUPER_RARE ]
     ]
     ],
-    [ Species.CALYREX, Type.PSYCHIC, Type.GRASS, [
+    [ Species.CALYREX, PokemonType.PSYCHIC, PokemonType.GRASS, [
       [ Biome.FOREST, BiomePoolTier.BOSS_ULTRA_RARE ]
     ]
     ],
-    [ Species.WYRDEER, Type.NORMAL, Type.PSYCHIC, [
+    [ Species.WYRDEER, PokemonType.NORMAL, PokemonType.PSYCHIC, [
       [ Biome.SNOWY_FOREST, BiomePoolTier.BOSS, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.KLEAVOR, Type.BUG, Type.ROCK, [
+    [ Species.KLEAVOR, PokemonType.BUG, PokemonType.ROCK, [
       [ Biome.JUNGLE, BiomePoolTier.SUPER_RARE ],
       [ Biome.JUNGLE, BiomePoolTier.BOSS_ULTRA_RARE ]
     ]
     ],
-    [ Species.URSALUNA, Type.GROUND, Type.NORMAL, [
+    [ Species.URSALUNA, PokemonType.GROUND, PokemonType.NORMAL, [
       [ Biome.SNOWY_FOREST, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.BASCULEGION, Type.WATER, Type.GHOST, [
+    [ Species.BASCULEGION, PokemonType.WATER, PokemonType.GHOST, [
       [ Biome.SEABED, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.SNEASLER, Type.FIGHTING, Type.POISON, [
+    [ Species.SNEASLER, PokemonType.FIGHTING, PokemonType.POISON, [
       [ Biome.SNOWY_FOREST, BiomePoolTier.BOSS_RARE, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.OVERQWIL, Type.DARK, Type.POISON, [
+    [ Species.OVERQWIL, PokemonType.DARK, PokemonType.POISON, [
       [ Biome.SEABED, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.ENAMORUS, Type.FAIRY, Type.FLYING, [
+    [ Species.ENAMORUS, PokemonType.FAIRY, PokemonType.FLYING, [
       [ Biome.FAIRY_CAVE, BiomePoolTier.ULTRA_RARE ],
       [ Biome.FAIRY_CAVE, BiomePoolTier.BOSS_SUPER_RARE ]
     ]
     ],
-    [ Species.SPRIGATITO, Type.GRASS, -1, [
+    [ Species.SPRIGATITO, PokemonType.GRASS, -1, [
       [ Biome.MEADOW, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.FLORAGATO, Type.GRASS, -1, [
+    [ Species.FLORAGATO, PokemonType.GRASS, -1, [
       [ Biome.MEADOW, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.MEOWSCARADA, Type.GRASS, Type.DARK, [
+    [ Species.MEOWSCARADA, PokemonType.GRASS, PokemonType.DARK, [
       [ Biome.MEADOW, BiomePoolTier.RARE ],
       [ Biome.MEADOW, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.FUECOCO, Type.FIRE, -1, [
+    [ Species.FUECOCO, PokemonType.FIRE, -1, [
       [ Biome.GRAVEYARD, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.CROCALOR, Type.FIRE, -1, [
+    [ Species.CROCALOR, PokemonType.FIRE, -1, [
       [ Biome.GRAVEYARD, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.SKELEDIRGE, Type.FIRE, Type.GHOST, [
+    [ Species.SKELEDIRGE, PokemonType.FIRE, PokemonType.GHOST, [
       [ Biome.GRAVEYARD, BiomePoolTier.RARE ],
       [ Biome.GRAVEYARD, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.QUAXLY, Type.WATER, -1, [
+    [ Species.QUAXLY, PokemonType.WATER, -1, [
       [ Biome.BEACH, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.QUAXWELL, Type.WATER, -1, [
+    [ Species.QUAXWELL, PokemonType.WATER, -1, [
       [ Biome.BEACH, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.QUAQUAVAL, Type.WATER, Type.FIGHTING, [
+    [ Species.QUAQUAVAL, PokemonType.WATER, PokemonType.FIGHTING, [
       [ Biome.BEACH, BiomePoolTier.RARE ],
       [ Biome.BEACH, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.LECHONK, Type.NORMAL, -1, [
+    [ Species.LECHONK, PokemonType.NORMAL, -1, [
       [ Biome.TOWN, BiomePoolTier.COMMON ],
       [ Biome.PLAINS, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.OINKOLOGNE, Type.NORMAL, -1, [
+    [ Species.OINKOLOGNE, PokemonType.NORMAL, -1, [
       [ Biome.PLAINS, BiomePoolTier.COMMON ],
       [ Biome.PLAINS, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.TAROUNTULA, Type.BUG, -1, [
+    [ Species.TAROUNTULA, PokemonType.BUG, -1, [
       [ Biome.FOREST, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.SPIDOPS, Type.BUG, -1, [
+    [ Species.SPIDOPS, PokemonType.BUG, -1, [
       [ Biome.FOREST, BiomePoolTier.COMMON ],
       [ Biome.FOREST, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.NYMBLE, Type.BUG, -1, [
+    [ Species.NYMBLE, PokemonType.BUG, -1, [
       [ Biome.TALL_GRASS, BiomePoolTier.COMMON ],
       [ Biome.FOREST, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.LOKIX, Type.BUG, Type.DARK, [
+    [ Species.LOKIX, PokemonType.BUG, PokemonType.DARK, [
       [ Biome.TALL_GRASS, BiomePoolTier.COMMON ],
       [ Biome.TALL_GRASS, BiomePoolTier.BOSS ],
       [ Biome.FOREST, BiomePoolTier.COMMON ],
       [ Biome.FOREST, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.PAWMI, Type.ELECTRIC, -1, [
+    [ Species.PAWMI, PokemonType.ELECTRIC, -1, [
       [ Biome.TOWN, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.PLAINS, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.POWER_PLANT, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.PAWMO, Type.ELECTRIC, Type.FIGHTING, [
+    [ Species.PAWMO, PokemonType.ELECTRIC, PokemonType.FIGHTING, [
       [ Biome.PLAINS, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.POWER_PLANT, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.PAWMOT, Type.ELECTRIC, Type.FIGHTING, [
+    [ Species.PAWMOT, PokemonType.ELECTRIC, PokemonType.FIGHTING, [
       [ Biome.PLAINS, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.PLAINS, BiomePoolTier.BOSS_RARE, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.POWER_PLANT, BiomePoolTier.COMMON ],
       [ Biome.POWER_PLANT, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.TANDEMAUS, Type.NORMAL, -1, [
+    [ Species.TANDEMAUS, PokemonType.NORMAL, -1, [
       [ Biome.TOWN, BiomePoolTier.RARE, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.METROPOLIS, BiomePoolTier.RARE, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.MAUSHOLD, Type.NORMAL, -1, [
+    [ Species.MAUSHOLD, PokemonType.NORMAL, -1, [
       [ Biome.METROPOLIS, BiomePoolTier.RARE, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.METROPOLIS, BiomePoolTier.BOSS_RARE, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.FIDOUGH, Type.FAIRY, -1, [
+    [ Species.FIDOUGH, PokemonType.FAIRY, -1, [
       [ Biome.TOWN, BiomePoolTier.UNCOMMON ],
       [ Biome.METROPOLIS, BiomePoolTier.UNCOMMON ]
     ]
     ],
-    [ Species.DACHSBUN, Type.FAIRY, -1, [
+    [ Species.DACHSBUN, PokemonType.FAIRY, -1, [
       [ Biome.METROPOLIS, BiomePoolTier.UNCOMMON ],
       [ Biome.METROPOLIS, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.SMOLIV, Type.GRASS, Type.NORMAL, [
+    [ Species.SMOLIV, PokemonType.GRASS, PokemonType.NORMAL, [
       [ Biome.MEADOW, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.DOLLIV, Type.GRASS, Type.NORMAL, [
+    [ Species.DOLLIV, PokemonType.GRASS, PokemonType.NORMAL, [
       [ Biome.MEADOW, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.ARBOLIVA, Type.GRASS, Type.NORMAL, [
+    [ Species.ARBOLIVA, PokemonType.GRASS, PokemonType.NORMAL, [
       [ Biome.MEADOW, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.MEADOW, BiomePoolTier.BOSS, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.SQUAWKABILLY, Type.NORMAL, Type.FLYING, [
+    [ Species.SQUAWKABILLY, PokemonType.NORMAL, PokemonType.FLYING, [
       [ Biome.METROPOLIS, BiomePoolTier.UNCOMMON ],
       [ Biome.FOREST, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.NACLI, Type.ROCK, -1, [
+    [ Species.NACLI, PokemonType.ROCK, -1, [
       [ Biome.MOUNTAIN, BiomePoolTier.UNCOMMON ],
       [ Biome.CAVE, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.NACLSTACK, Type.ROCK, -1, [
+    [ Species.NACLSTACK, PokemonType.ROCK, -1, [
       [ Biome.MOUNTAIN, BiomePoolTier.UNCOMMON ],
       [ Biome.CAVE, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.GARGANACL, Type.ROCK, -1, [
+    [ Species.GARGANACL, PokemonType.ROCK, -1, [
       [ Biome.MOUNTAIN, BiomePoolTier.UNCOMMON ],
       [ Biome.MOUNTAIN, BiomePoolTier.BOSS ],
       [ Biome.CAVE, BiomePoolTier.COMMON ],
       [ Biome.CAVE, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.CHARCADET, Type.FIRE, -1, [
+    [ Species.CHARCADET, PokemonType.FIRE, -1, [
       [ Biome.VOLCANO, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.ARMAROUGE, Type.FIRE, Type.PSYCHIC, [
+    [ Species.ARMAROUGE, PokemonType.FIRE, PokemonType.PSYCHIC, [
       [ Biome.VOLCANO, BiomePoolTier.RARE ],
       [ Biome.VOLCANO, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.CERULEDGE, Type.FIRE, Type.GHOST, [
+    [ Species.CERULEDGE, PokemonType.FIRE, PokemonType.GHOST, [
       [ Biome.GRAVEYARD, BiomePoolTier.RARE ],
       [ Biome.GRAVEYARD, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.TADBULB, Type.ELECTRIC, -1, [
+    [ Species.TADBULB, PokemonType.ELECTRIC, -1, [
       [ Biome.POWER_PLANT, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.BELLIBOLT, Type.ELECTRIC, -1, [
+    [ Species.BELLIBOLT, PokemonType.ELECTRIC, -1, [
       [ Biome.POWER_PLANT, BiomePoolTier.COMMON ],
       [ Biome.POWER_PLANT, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.WATTREL, Type.ELECTRIC, Type.FLYING, [
+    [ Species.WATTREL, PokemonType.ELECTRIC, PokemonType.FLYING, [
       [ Biome.SEA, BiomePoolTier.UNCOMMON ]
     ]
     ],
-    [ Species.KILOWATTREL, Type.ELECTRIC, Type.FLYING, [
+    [ Species.KILOWATTREL, PokemonType.ELECTRIC, PokemonType.FLYING, [
       [ Biome.SEA, BiomePoolTier.UNCOMMON ],
       [ Biome.SEA, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.MASCHIFF, Type.DARK, -1, [
+    [ Species.MASCHIFF, PokemonType.DARK, -1, [
       [ Biome.ABYSS, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.MABOSSTIFF, Type.DARK, -1, [
+    [ Species.MABOSSTIFF, PokemonType.DARK, -1, [
       [ Biome.ABYSS, BiomePoolTier.COMMON ],
       [ Biome.ABYSS, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.SHROODLE, Type.POISON, Type.NORMAL, [
+    [ Species.SHROODLE, PokemonType.POISON, PokemonType.NORMAL, [
       [ Biome.FOREST, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.GRAFAIAI, Type.POISON, Type.NORMAL, [
+    [ Species.GRAFAIAI, PokemonType.POISON, PokemonType.NORMAL, [
       [ Biome.FOREST, BiomePoolTier.COMMON ],
       [ Biome.FOREST, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.BRAMBLIN, Type.GRASS, Type.GHOST, [
+    [ Species.BRAMBLIN, PokemonType.GRASS, PokemonType.GHOST, [
       [ Biome.DESERT, BiomePoolTier.UNCOMMON ]
     ]
     ],
-    [ Species.BRAMBLEGHAST, Type.GRASS, Type.GHOST, [
+    [ Species.BRAMBLEGHAST, PokemonType.GRASS, PokemonType.GHOST, [
       [ Biome.DESERT, BiomePoolTier.UNCOMMON ],
       [ Biome.DESERT, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.TOEDSCOOL, Type.GROUND, Type.GRASS, [
+    [ Species.TOEDSCOOL, PokemonType.GROUND, PokemonType.GRASS, [
       [ Biome.FOREST, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.TOEDSCRUEL, Type.GROUND, Type.GRASS, [
+    [ Species.TOEDSCRUEL, PokemonType.GROUND, PokemonType.GRASS, [
       [ Biome.FOREST, BiomePoolTier.RARE ],
       [ Biome.FOREST, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.KLAWF, Type.ROCK, -1, [
+    [ Species.KLAWF, PokemonType.ROCK, -1, [
       [ Biome.MOUNTAIN, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.CAPSAKID, Type.GRASS, -1, [
+    [ Species.CAPSAKID, PokemonType.GRASS, -1, [
       [ Biome.BADLANDS, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.SCOVILLAIN, Type.GRASS, Type.FIRE, [
+    [ Species.SCOVILLAIN, PokemonType.GRASS, PokemonType.FIRE, [
       [ Biome.BADLANDS, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.BADLANDS, BiomePoolTier.BOSS, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.RELLOR, Type.BUG, -1, [
+    [ Species.RELLOR, PokemonType.BUG, -1, [
       [ Biome.DESERT, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.RABSCA, Type.BUG, Type.PSYCHIC, [
+    [ Species.RABSCA, PokemonType.BUG, PokemonType.PSYCHIC, [
       [ Biome.DESERT, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.DESERT, BiomePoolTier.BOSS, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.FLITTLE, Type.PSYCHIC, -1, [
+    [ Species.FLITTLE, PokemonType.PSYCHIC, -1, [
       [ Biome.MOUNTAIN, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.ESPATHRA, Type.PSYCHIC, -1, [
+    [ Species.ESPATHRA, PokemonType.PSYCHIC, -1, [
       [ Biome.MOUNTAIN, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.MOUNTAIN, BiomePoolTier.BOSS, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.TINKATINK, Type.FAIRY, Type.STEEL, [
+    [ Species.TINKATINK, PokemonType.FAIRY, PokemonType.STEEL, [
       [ Biome.RUINS, BiomePoolTier.UNCOMMON ]
     ]
     ],
-    [ Species.TINKATUFF, Type.FAIRY, Type.STEEL, [
+    [ Species.TINKATUFF, PokemonType.FAIRY, PokemonType.STEEL, [
       [ Biome.RUINS, BiomePoolTier.UNCOMMON ]
     ]
     ],
-    [ Species.TINKATON, Type.FAIRY, Type.STEEL, [
+    [ Species.TINKATON, PokemonType.FAIRY, PokemonType.STEEL, [
       [ Biome.RUINS, BiomePoolTier.UNCOMMON ],
       [ Biome.RUINS, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.WIGLETT, Type.WATER, -1, [
+    [ Species.WIGLETT, PokemonType.WATER, -1, [
       [ Biome.BEACH, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.WUGTRIO, Type.WATER, -1, [
+    [ Species.WUGTRIO, PokemonType.WATER, -1, [
       [ Biome.BEACH, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.BOMBIRDIER, Type.FLYING, Type.DARK, [
+    [ Species.BOMBIRDIER, PokemonType.FLYING, PokemonType.DARK, [
       [ Biome.MOUNTAIN, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.FINIZEN, Type.WATER, -1, [
+    [ Species.FINIZEN, PokemonType.WATER, -1, [
       [ Biome.SEA, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.PALAFIN, Type.WATER, -1, [
+    [ Species.PALAFIN, PokemonType.WATER, -1, [
       [ Biome.SEA, BiomePoolTier.COMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.SEA, BiomePoolTier.BOSS, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.VAROOM, Type.STEEL, Type.POISON, [
+    [ Species.VAROOM, PokemonType.STEEL, PokemonType.POISON, [
       [ Biome.METROPOLIS, BiomePoolTier.RARE ],
       [ Biome.SLUM, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.REVAVROOM, Type.STEEL, Type.POISON, [
+    [ Species.REVAVROOM, PokemonType.STEEL, PokemonType.POISON, [
       [ Biome.METROPOLIS, BiomePoolTier.RARE ],
       [ Biome.METROPOLIS, BiomePoolTier.BOSS_RARE ],
       [ Biome.SLUM, BiomePoolTier.RARE ],
       [ Biome.SLUM, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.CYCLIZAR, Type.DRAGON, Type.NORMAL, [
+    [ Species.CYCLIZAR, PokemonType.DRAGON, PokemonType.NORMAL, [
       [ Biome.WASTELAND, BiomePoolTier.UNCOMMON ]
     ]
     ],
-    [ Species.ORTHWORM, Type.STEEL, -1, [
+    [ Species.ORTHWORM, PokemonType.STEEL, -1, [
       [ Biome.DESERT, BiomePoolTier.UNCOMMON ]
     ]
     ],
-    [ Species.GLIMMET, Type.ROCK, Type.POISON, [
+    [ Species.GLIMMET, PokemonType.ROCK, PokemonType.POISON, [
       [ Biome.CAVE, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.GLIMMORA, Type.ROCK, Type.POISON, [
+    [ Species.GLIMMORA, PokemonType.ROCK, PokemonType.POISON, [
       [ Biome.CAVE, BiomePoolTier.RARE ],
       [ Biome.CAVE, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.GREAVARD, Type.GHOST, -1, [
+    [ Species.GREAVARD, PokemonType.GHOST, -1, [
       [ Biome.GRAVEYARD, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.HOUNDSTONE, Type.GHOST, -1, [
+    [ Species.HOUNDSTONE, PokemonType.GHOST, -1, [
       [ Biome.GRAVEYARD, BiomePoolTier.COMMON ],
       [ Biome.GRAVEYARD, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.FLAMIGO, Type.FLYING, Type.FIGHTING, [
+    [ Species.FLAMIGO, PokemonType.FLYING, PokemonType.FIGHTING, [
       [ Biome.LAKE, BiomePoolTier.UNCOMMON ]
     ]
     ],
-    [ Species.CETODDLE, Type.ICE, -1, [
+    [ Species.CETODDLE, PokemonType.ICE, -1, [
       [ Biome.ICE_CAVE, BiomePoolTier.UNCOMMON ]
     ]
     ],
-    [ Species.CETITAN, Type.ICE, -1, [
+    [ Species.CETITAN, PokemonType.ICE, -1, [
       [ Biome.ICE_CAVE, BiomePoolTier.UNCOMMON ],
       [ Biome.ICE_CAVE, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.VELUZA, Type.WATER, Type.PSYCHIC, [
+    [ Species.VELUZA, PokemonType.WATER, PokemonType.PSYCHIC, [
       [ Biome.SEABED, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.DONDOZO, Type.WATER, -1, [
+    [ Species.DONDOZO, PokemonType.WATER, -1, [
       [ Biome.SEABED, BiomePoolTier.UNCOMMON ],
       [ Biome.SEABED, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.TATSUGIRI, Type.DRAGON, Type.WATER, [
+    [ Species.TATSUGIRI, PokemonType.DRAGON, PokemonType.WATER, [
       [ Biome.BEACH, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.ANNIHILAPE, Type.FIGHTING, Type.GHOST, [
+    [ Species.ANNIHILAPE, PokemonType.FIGHTING, PokemonType.GHOST, [
       [ Biome.PLAINS, BiomePoolTier.UNCOMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]],
       [ Biome.DOJO, BiomePoolTier.COMMON ],
       [ Biome.DOJO, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.CLODSIRE, Type.POISON, Type.GROUND, [
+    [ Species.CLODSIRE, PokemonType.POISON, PokemonType.GROUND, [
       [ Biome.SWAMP, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]],
       [ Biome.SWAMP, BiomePoolTier.BOSS, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]]
     ]
     ],
-    [ Species.FARIGIRAF, Type.NORMAL, Type.PSYCHIC, [
+    [ Species.FARIGIRAF, PokemonType.NORMAL, PokemonType.PSYCHIC, [
       [ Biome.TALL_GRASS, BiomePoolTier.RARE ],
       [ Biome.TALL_GRASS, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.DUDUNSPARCE, Type.NORMAL, -1, [
+    [ Species.DUDUNSPARCE, PokemonType.NORMAL, -1, [
       [ Biome.PLAINS, BiomePoolTier.SUPER_RARE ],
       [ Biome.PLAINS, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.KINGAMBIT, Type.DARK, Type.STEEL, [
+    [ Species.KINGAMBIT, PokemonType.DARK, PokemonType.STEEL, [
       [ Biome.ABYSS, BiomePoolTier.COMMON ],
       [ Biome.ABYSS, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.GREAT_TUSK, Type.GROUND, Type.FIGHTING, [
+    [ Species.GREAT_TUSK, PokemonType.GROUND, PokemonType.FIGHTING, [
       [ Biome.END, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.SCREAM_TAIL, Type.FAIRY, Type.PSYCHIC, [
+    [ Species.SCREAM_TAIL, PokemonType.FAIRY, PokemonType.PSYCHIC, [
       [ Biome.END, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.BRUTE_BONNET, Type.GRASS, Type.DARK, [
+    [ Species.BRUTE_BONNET, PokemonType.GRASS, PokemonType.DARK, [
       [ Biome.END, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.FLUTTER_MANE, Type.GHOST, Type.FAIRY, [
+    [ Species.FLUTTER_MANE, PokemonType.GHOST, PokemonType.FAIRY, [
       [ Biome.END, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.SLITHER_WING, Type.BUG, Type.FIGHTING, [
+    [ Species.SLITHER_WING, PokemonType.BUG, PokemonType.FIGHTING, [
       [ Biome.END, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.SANDY_SHOCKS, Type.ELECTRIC, Type.GROUND, [
+    [ Species.SANDY_SHOCKS, PokemonType.ELECTRIC, PokemonType.GROUND, [
       [ Biome.END, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.IRON_TREADS, Type.GROUND, Type.STEEL, [
+    [ Species.IRON_TREADS, PokemonType.GROUND, PokemonType.STEEL, [
       [ Biome.END, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.IRON_BUNDLE, Type.ICE, Type.WATER, [
+    [ Species.IRON_BUNDLE, PokemonType.ICE, PokemonType.WATER, [
       [ Biome.END, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.IRON_HANDS, Type.FIGHTING, Type.ELECTRIC, [
+    [ Species.IRON_HANDS, PokemonType.FIGHTING, PokemonType.ELECTRIC, [
       [ Biome.END, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.IRON_JUGULIS, Type.DARK, Type.FLYING, [
+    [ Species.IRON_JUGULIS, PokemonType.DARK, PokemonType.FLYING, [
       [ Biome.END, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.IRON_MOTH, Type.FIRE, Type.POISON, [
+    [ Species.IRON_MOTH, PokemonType.FIRE, PokemonType.POISON, [
       [ Biome.END, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.IRON_THORNS, Type.ROCK, Type.ELECTRIC, [
+    [ Species.IRON_THORNS, PokemonType.ROCK, PokemonType.ELECTRIC, [
       [ Biome.END, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.FRIGIBAX, Type.DRAGON, Type.ICE, [
+    [ Species.FRIGIBAX, PokemonType.DRAGON, PokemonType.ICE, [
       [ Biome.WASTELAND, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.ARCTIBAX, Type.DRAGON, Type.ICE, [
+    [ Species.ARCTIBAX, PokemonType.DRAGON, PokemonType.ICE, [
       [ Biome.WASTELAND, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.BAXCALIBUR, Type.DRAGON, Type.ICE, [
+    [ Species.BAXCALIBUR, PokemonType.DRAGON, PokemonType.ICE, [
       [ Biome.WASTELAND, BiomePoolTier.RARE ],
       [ Biome.WASTELAND, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.GIMMIGHOUL, Type.GHOST, -1, [
+    [ Species.GIMMIGHOUL, PokemonType.GHOST, -1, [
       [ Biome.TEMPLE, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.GHOLDENGO, Type.STEEL, Type.GHOST, [
+    [ Species.GHOLDENGO, PokemonType.STEEL, PokemonType.GHOST, [
       [ Biome.TEMPLE, BiomePoolTier.RARE ],
       [ Biome.TEMPLE, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.WO_CHIEN, Type.DARK, Type.GRASS, [
+    [ Species.WO_CHIEN, PokemonType.DARK, PokemonType.GRASS, [
       [ Biome.FOREST, BiomePoolTier.ULTRA_RARE ],
       [ Biome.FOREST, BiomePoolTier.BOSS_SUPER_RARE ]
     ]
     ],
-    [ Species.CHIEN_PAO, Type.DARK, Type.ICE, [
+    [ Species.CHIEN_PAO, PokemonType.DARK, PokemonType.ICE, [
       [ Biome.SNOWY_FOREST, BiomePoolTier.ULTRA_RARE ],
       [ Biome.SNOWY_FOREST, BiomePoolTier.BOSS_SUPER_RARE ]
     ]
     ],
-    [ Species.TING_LU, Type.DARK, Type.GROUND, [
+    [ Species.TING_LU, PokemonType.DARK, PokemonType.GROUND, [
       [ Biome.MOUNTAIN, BiomePoolTier.ULTRA_RARE ],
       [ Biome.MOUNTAIN, BiomePoolTier.BOSS_SUPER_RARE ]
     ]
     ],
-    [ Species.CHI_YU, Type.DARK, Type.FIRE, [
+    [ Species.CHI_YU, PokemonType.DARK, PokemonType.FIRE, [
       [ Biome.VOLCANO, BiomePoolTier.ULTRA_RARE ],
       [ Biome.VOLCANO, BiomePoolTier.BOSS_SUPER_RARE ]
     ]
     ],
-    [ Species.ROARING_MOON, Type.DRAGON, Type.DARK, [
+    [ Species.ROARING_MOON, PokemonType.DRAGON, PokemonType.DARK, [
       [ Biome.END, BiomePoolTier.UNCOMMON ]
     ]
     ],
-    [ Species.IRON_VALIANT, Type.FAIRY, Type.FIGHTING, [
+    [ Species.IRON_VALIANT, PokemonType.FAIRY, PokemonType.FIGHTING, [
       [ Biome.END, BiomePoolTier.UNCOMMON ]
     ]
     ],
-    [ Species.KORAIDON, Type.FIGHTING, Type.DRAGON, [
+    [ Species.KORAIDON, PokemonType.FIGHTING, PokemonType.DRAGON, [
       [ Biome.RUINS, BiomePoolTier.BOSS_ULTRA_RARE ]
     ]
     ],
-    [ Species.MIRAIDON, Type.ELECTRIC, Type.DRAGON, [
+    [ Species.MIRAIDON, PokemonType.ELECTRIC, PokemonType.DRAGON, [
       [ Biome.LABORATORY, BiomePoolTier.BOSS_ULTRA_RARE ]
     ]
     ],
-    [ Species.WALKING_WAKE, Type.WATER, Type.DRAGON, [
+    [ Species.WALKING_WAKE, PokemonType.WATER, PokemonType.DRAGON, [
       [ Biome.END, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.IRON_LEAVES, Type.GRASS, Type.PSYCHIC, [
+    [ Species.IRON_LEAVES, PokemonType.GRASS, PokemonType.PSYCHIC, [
       [ Biome.END, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.DIPPLIN, Type.GRASS, Type.DRAGON, [
+    [ Species.DIPPLIN, PokemonType.GRASS, PokemonType.DRAGON, [
       [ Biome.MEADOW, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.POLTCHAGEIST, Type.GRASS, Type.GHOST, [
+    [ Species.POLTCHAGEIST, PokemonType.GRASS, PokemonType.GHOST, [
       [ Biome.BADLANDS, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.SINISTCHA, Type.GRASS, Type.GHOST, [
+    [ Species.SINISTCHA, PokemonType.GRASS, PokemonType.GHOST, [
       [ Biome.BADLANDS, BiomePoolTier.RARE ],
       [ Biome.BADLANDS, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.OKIDOGI, Type.POISON, Type.FIGHTING, [
+    [ Species.OKIDOGI, PokemonType.POISON, PokemonType.FIGHTING, [
       [ Biome.BADLANDS, BiomePoolTier.ULTRA_RARE ],
       [ Biome.BADLANDS, BiomePoolTier.BOSS_SUPER_RARE ]
     ]
     ],
-    [ Species.MUNKIDORI, Type.POISON, Type.PSYCHIC, [
+    [ Species.MUNKIDORI, PokemonType.POISON, PokemonType.PSYCHIC, [
       [ Biome.JUNGLE, BiomePoolTier.ULTRA_RARE ],
       [ Biome.JUNGLE, BiomePoolTier.BOSS_SUPER_RARE ]
     ]
     ],
-    [ Species.FEZANDIPITI, Type.POISON, Type.FAIRY, [
+    [ Species.FEZANDIPITI, PokemonType.POISON, PokemonType.FAIRY, [
       [ Biome.RUINS, BiomePoolTier.ULTRA_RARE ],
       [ Biome.RUINS, BiomePoolTier.BOSS_SUPER_RARE ]
     ]
     ],
-    [ Species.OGERPON, Type.GRASS, -1, [
+    [ Species.OGERPON, PokemonType.GRASS, -1, [
       [ Biome.MOUNTAIN, BiomePoolTier.ULTRA_RARE ],
       [ Biome.MOUNTAIN, BiomePoolTier.BOSS_SUPER_RARE ]
     ]
     ],
-    [ Species.ARCHALUDON, Type.STEEL, Type.DRAGON, [
+    [ Species.ARCHALUDON, PokemonType.STEEL, PokemonType.DRAGON, [
       [ Biome.CONSTRUCTION_SITE, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.HYDRAPPLE, Type.GRASS, Type.DRAGON, [
+    [ Species.HYDRAPPLE, PokemonType.GRASS, PokemonType.DRAGON, [
       [ Biome.MEADOW, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.GOUGING_FIRE, Type.FIRE, Type.DRAGON, [
+    [ Species.GOUGING_FIRE, PokemonType.FIRE, PokemonType.DRAGON, [
       [ Biome.END, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.RAGING_BOLT, Type.ELECTRIC, Type.DRAGON, [
+    [ Species.RAGING_BOLT, PokemonType.ELECTRIC, PokemonType.DRAGON, [
       [ Biome.END, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.IRON_BOULDER, Type.ROCK, Type.PSYCHIC, [
+    [ Species.IRON_BOULDER, PokemonType.ROCK, PokemonType.PSYCHIC, [
       [ Biome.END, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.IRON_CROWN, Type.STEEL, Type.PSYCHIC, [
+    [ Species.IRON_CROWN, PokemonType.STEEL, PokemonType.PSYCHIC, [
       [ Biome.END, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.TERAPAGOS, Type.NORMAL, -1, [
+    [ Species.TERAPAGOS, PokemonType.NORMAL, -1, [
       [ Biome.CAVE, BiomePoolTier.BOSS_ULTRA_RARE ]
     ]
     ],
-    [ Species.PECHARUNT, Type.POISON, Type.GHOST, [ ]
+    [ Species.PECHARUNT, PokemonType.POISON, PokemonType.GHOST, [ ]
     ],
-    [ Species.ALOLA_RATTATA, Type.DARK, Type.NORMAL, [
+    [ Species.ALOLA_RATTATA, PokemonType.DARK, PokemonType.NORMAL, [
       [ Biome.ISLAND, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]]
     ]
     ],
-    [ Species.ALOLA_RATICATE, Type.DARK, Type.NORMAL, [
+    [ Species.ALOLA_RATICATE, PokemonType.DARK, PokemonType.NORMAL, [
       [ Biome.ISLAND, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]],
       [ Biome.ISLAND, BiomePoolTier.BOSS, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]]
     ]
     ],
-    [ Species.ALOLA_RAICHU, Type.ELECTRIC, Type.PSYCHIC, [
+    [ Species.ALOLA_RAICHU, PokemonType.ELECTRIC, PokemonType.PSYCHIC, [
       [ Biome.ISLAND, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.ISLAND, BiomePoolTier.BOSS, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.ALOLA_SANDSHREW, Type.ICE, Type.STEEL, [
+    [ Species.ALOLA_SANDSHREW, PokemonType.ICE, PokemonType.STEEL, [
       [ Biome.ISLAND, BiomePoolTier.COMMON ],
       [ Biome.SNOWY_FOREST, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.ALOLA_SANDSLASH, Type.ICE, Type.STEEL, [
+    [ Species.ALOLA_SANDSLASH, PokemonType.ICE, PokemonType.STEEL, [
       [ Biome.ISLAND, BiomePoolTier.COMMON ],
       [ Biome.ISLAND, BiomePoolTier.BOSS ],
       [ Biome.SNOWY_FOREST, BiomePoolTier.RARE ],
       [ Biome.SNOWY_FOREST, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.ALOLA_VULPIX, Type.ICE, -1, [
+    [ Species.ALOLA_VULPIX, PokemonType.ICE, -1, [
       [ Biome.ISLAND, BiomePoolTier.COMMON ],
       [ Biome.SNOWY_FOREST, BiomePoolTier.RARE ]
     ]
     ],
-    [ Species.ALOLA_NINETALES, Type.ICE, Type.FAIRY, [
+    [ Species.ALOLA_NINETALES, PokemonType.ICE, PokemonType.FAIRY, [
       [ Biome.ISLAND, BiomePoolTier.COMMON ],
       [ Biome.ISLAND, BiomePoolTier.BOSS ],
       [ Biome.SNOWY_FOREST, BiomePoolTier.RARE ],
       [ Biome.SNOWY_FOREST, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.ALOLA_DIGLETT, Type.GROUND, Type.STEEL, [
+    [ Species.ALOLA_DIGLETT, PokemonType.GROUND, PokemonType.STEEL, [
       [ Biome.ISLAND, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.ALOLA_DUGTRIO, Type.GROUND, Type.STEEL, [
+    [ Species.ALOLA_DUGTRIO, PokemonType.GROUND, PokemonType.STEEL, [
       [ Biome.ISLAND, BiomePoolTier.COMMON ],
       [ Biome.ISLAND, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.ALOLA_MEOWTH, Type.DARK, -1, [
+    [ Species.ALOLA_MEOWTH, PokemonType.DARK, -1, [
       [ Biome.ISLAND, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]]
     ]
     ],
-    [ Species.ALOLA_PERSIAN, Type.DARK, -1, [
+    [ Species.ALOLA_PERSIAN, PokemonType.DARK, -1, [
       [ Biome.ISLAND, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]],
       [ Biome.ISLAND, BiomePoolTier.BOSS, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]]
     ]
     ],
-    [ Species.ALOLA_GEODUDE, Type.ROCK, Type.ELECTRIC, [
+    [ Species.ALOLA_GEODUDE, PokemonType.ROCK, PokemonType.ELECTRIC, [
       [ Biome.ISLAND, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.ALOLA_GRAVELER, Type.ROCK, Type.ELECTRIC, [
+    [ Species.ALOLA_GRAVELER, PokemonType.ROCK, PokemonType.ELECTRIC, [
       [ Biome.ISLAND, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.ALOLA_GOLEM, Type.ROCK, Type.ELECTRIC, [
+    [ Species.ALOLA_GOLEM, PokemonType.ROCK, PokemonType.ELECTRIC, [
       [ Biome.ISLAND, BiomePoolTier.COMMON ],
       [ Biome.ISLAND, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.ALOLA_GRIMER, Type.POISON, Type.DARK, [
+    [ Species.ALOLA_GRIMER, PokemonType.POISON, PokemonType.DARK, [
       [ Biome.ISLAND, BiomePoolTier.COMMON ]
     ]
     ],
-    [ Species.ALOLA_MUK, Type.POISON, Type.DARK, [
+    [ Species.ALOLA_MUK, PokemonType.POISON, PokemonType.DARK, [
       [ Biome.ISLAND, BiomePoolTier.COMMON ],
       [ Biome.ISLAND, BiomePoolTier.BOSS ]
     ]
     ],
-    [ Species.ALOLA_EXEGGUTOR, Type.GRASS, Type.DRAGON, [
+    [ Species.ALOLA_EXEGGUTOR, PokemonType.GRASS, PokemonType.DRAGON, [
       [ Biome.ISLAND, BiomePoolTier.UNCOMMON, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.ISLAND, BiomePoolTier.BOSS, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.ALOLA_MAROWAK, Type.FIRE, Type.GHOST, [
+    [ Species.ALOLA_MAROWAK, PokemonType.FIRE, PokemonType.GHOST, [
       [ Biome.ISLAND, BiomePoolTier.UNCOMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]],
       [ Biome.ISLAND, BiomePoolTier.BOSS, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]]
     ]
     ],
-    [ Species.ETERNAL_FLOETTE, Type.FAIRY, -1, [
+    [ Species.ETERNAL_FLOETTE, PokemonType.FAIRY, -1, [
       [ Biome.FAIRY_CAVE, BiomePoolTier.RARE ],
       [ Biome.FAIRY_CAVE, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.GALAR_MEOWTH, Type.STEEL, -1, [
+    [ Species.GALAR_MEOWTH, PokemonType.STEEL, -1, [
       [ Biome.CONSTRUCTION_SITE, BiomePoolTier.RARE, TimeOfDay.DUSK ]
     ]
     ],
-    [ Species.GALAR_PONYTA, Type.PSYCHIC, -1, [
+    [ Species.GALAR_PONYTA, PokemonType.PSYCHIC, -1, [
       [ Biome.JUNGLE, BiomePoolTier.RARE, TimeOfDay.DAWN ]
     ]
     ],
-    [ Species.GALAR_RAPIDASH, Type.PSYCHIC, Type.FAIRY, [
+    [ Species.GALAR_RAPIDASH, PokemonType.PSYCHIC, PokemonType.FAIRY, [
       [ Biome.JUNGLE, BiomePoolTier.RARE, TimeOfDay.DAWN ],
       [ Biome.JUNGLE, BiomePoolTier.BOSS_RARE, TimeOfDay.DAWN ]
     ]
     ],
-    [ Species.GALAR_SLOWPOKE, Type.PSYCHIC, -1, [
+    [ Species.GALAR_SLOWPOKE, PokemonType.PSYCHIC, -1, [
       [ Biome.SWAMP, BiomePoolTier.SUPER_RARE, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.GALAR_SLOWBRO, Type.POISON, Type.PSYCHIC, [
+    [ Species.GALAR_SLOWBRO, PokemonType.POISON, PokemonType.PSYCHIC, [
       [ Biome.SWAMP, BiomePoolTier.SUPER_RARE, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.SWAMP, BiomePoolTier.BOSS_RARE, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.GALAR_FARFETCHD, Type.FIGHTING, -1, [
+    [ Species.GALAR_FARFETCHD, PokemonType.FIGHTING, -1, [
       [ Biome.DOJO, BiomePoolTier.SUPER_RARE ]
     ]
     ],
-    [ Species.GALAR_WEEZING, Type.POISON, Type.FAIRY, [
+    [ Species.GALAR_WEEZING, PokemonType.POISON, PokemonType.FAIRY, [
       [ Biome.SLUM, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.GALAR_MR_MIME, Type.ICE, Type.PSYCHIC, [
+    [ Species.GALAR_MR_MIME, PokemonType.ICE, PokemonType.PSYCHIC, [
       [ Biome.SNOWY_FOREST, BiomePoolTier.SUPER_RARE ]
     ]
     ],
-    [ Species.GALAR_ARTICUNO, Type.PSYCHIC, Type.FLYING, [
+    [ Species.GALAR_ARTICUNO, PokemonType.PSYCHIC, PokemonType.FLYING, [
       [ Biome.SNOWY_FOREST, BiomePoolTier.ULTRA_RARE ],
       [ Biome.SNOWY_FOREST, BiomePoolTier.BOSS_ULTRA_RARE ]
     ]
     ],
-    [ Species.GALAR_ZAPDOS, Type.FIGHTING, Type.FLYING, [
+    [ Species.GALAR_ZAPDOS, PokemonType.FIGHTING, PokemonType.FLYING, [
       [ Biome.DOJO, BiomePoolTier.ULTRA_RARE ],
       [ Biome.DOJO, BiomePoolTier.BOSS_ULTRA_RARE ]
     ]
     ],
-    [ Species.GALAR_MOLTRES, Type.DARK, Type.FLYING, [
+    [ Species.GALAR_MOLTRES, PokemonType.DARK, PokemonType.FLYING, [
       [ Biome.ABYSS, BiomePoolTier.ULTRA_RARE ],
       [ Biome.ABYSS, BiomePoolTier.BOSS_ULTRA_RARE ]
     ]
     ],
-    [ Species.GALAR_SLOWKING, Type.POISON, Type.PSYCHIC, [
+    [ Species.GALAR_SLOWKING, PokemonType.POISON, PokemonType.PSYCHIC, [
       [ Biome.SWAMP, BiomePoolTier.BOSS_RARE, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.GALAR_CORSOLA, Type.GHOST, -1, [
+    [ Species.GALAR_CORSOLA, PokemonType.GHOST, -1, [
       [ Biome.SEABED, BiomePoolTier.SUPER_RARE ]
     ]
     ],
-    [ Species.GALAR_ZIGZAGOON, Type.DARK, Type.NORMAL, [
+    [ Species.GALAR_ZIGZAGOON, PokemonType.DARK, PokemonType.NORMAL, [
       [ Biome.SLUM, BiomePoolTier.RARE, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]]
     ]
     ],
-    [ Species.GALAR_LINOONE, Type.DARK, Type.NORMAL, [
+    [ Species.GALAR_LINOONE, PokemonType.DARK, PokemonType.NORMAL, [
       [ Biome.SLUM, BiomePoolTier.RARE, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]]
     ]
     ],
-    [ Species.GALAR_DARUMAKA, Type.ICE, -1, [
+    [ Species.GALAR_DARUMAKA, PokemonType.ICE, -1, [
       [ Biome.SNOWY_FOREST, BiomePoolTier.RARE, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.GALAR_DARMANITAN, Type.ICE, -1, [
+    [ Species.GALAR_DARMANITAN, PokemonType.ICE, -1, [
       [ Biome.SNOWY_FOREST, BiomePoolTier.RARE, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.SNOWY_FOREST, BiomePoolTier.BOSS_RARE, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.GALAR_YAMASK, Type.GROUND, Type.GHOST, [
+    [ Species.GALAR_YAMASK, PokemonType.GROUND, PokemonType.GHOST, [
       [ Biome.RUINS, BiomePoolTier.SUPER_RARE, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]]
     ]
     ],
-    [ Species.GALAR_STUNFISK, Type.GROUND, Type.STEEL, [
+    [ Species.GALAR_STUNFISK, PokemonType.GROUND, PokemonType.STEEL, [
       [ Biome.SWAMP, BiomePoolTier.SUPER_RARE ],
       [ Biome.SWAMP, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.HISUI_GROWLITHE, Type.FIRE, Type.ROCK, [
+    [ Species.HISUI_GROWLITHE, PokemonType.FIRE, PokemonType.ROCK, [
       [ Biome.VOLCANO, BiomePoolTier.SUPER_RARE ]
     ]
     ],
-    [ Species.HISUI_ARCANINE, Type.FIRE, Type.ROCK, [
+    [ Species.HISUI_ARCANINE, PokemonType.FIRE, PokemonType.ROCK, [
       [ Biome.VOLCANO, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.HISUI_VOLTORB, Type.ELECTRIC, Type.GRASS, [
+    [ Species.HISUI_VOLTORB, PokemonType.ELECTRIC, PokemonType.GRASS, [
       [ Biome.POWER_PLANT, BiomePoolTier.SUPER_RARE ]
     ]
     ],
-    [ Species.HISUI_ELECTRODE, Type.ELECTRIC, Type.GRASS, [
+    [ Species.HISUI_ELECTRODE, PokemonType.ELECTRIC, PokemonType.GRASS, [
       [ Biome.POWER_PLANT, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.HISUI_TYPHLOSION, Type.FIRE, Type.GHOST, [
+    [ Species.HISUI_TYPHLOSION, PokemonType.FIRE, PokemonType.GHOST, [
       [ Biome.GRAVEYARD, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.HISUI_QWILFISH, Type.DARK, Type.POISON, [
+    [ Species.HISUI_QWILFISH, PokemonType.DARK, PokemonType.POISON, [
       [ Biome.SEABED, BiomePoolTier.SUPER_RARE ]
     ]
     ],
-    [ Species.HISUI_SNEASEL, Type.FIGHTING, Type.POISON, [
+    [ Species.HISUI_SNEASEL, PokemonType.FIGHTING, PokemonType.POISON, [
       [ Biome.SNOWY_FOREST, BiomePoolTier.SUPER_RARE, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.HISUI_SAMUROTT, Type.WATER, Type.DARK, [
+    [ Species.HISUI_SAMUROTT, PokemonType.WATER, PokemonType.DARK, [
       [ Biome.ABYSS, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.HISUI_LILLIGANT, Type.GRASS, Type.FIGHTING, [
+    [ Species.HISUI_LILLIGANT, PokemonType.GRASS, PokemonType.FIGHTING, [
       [ Biome.MEADOW, BiomePoolTier.BOSS_RARE, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.HISUI_ZORUA, Type.NORMAL, Type.GHOST, [
+    [ Species.HISUI_ZORUA, PokemonType.NORMAL, PokemonType.GHOST, [
       [ Biome.SNOWY_FOREST, BiomePoolTier.SUPER_RARE, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]]
     ]
     ],
-    [ Species.HISUI_ZOROARK, Type.NORMAL, Type.GHOST, [
+    [ Species.HISUI_ZOROARK, PokemonType.NORMAL, PokemonType.GHOST, [
       [ Biome.SNOWY_FOREST, BiomePoolTier.SUPER_RARE, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]],
       [ Biome.SNOWY_FOREST, BiomePoolTier.BOSS_RARE, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]]
     ]
     ],
-    [ Species.HISUI_BRAVIARY, Type.PSYCHIC, Type.FLYING, [
+    [ Species.HISUI_BRAVIARY, PokemonType.PSYCHIC, PokemonType.FLYING, [
       [ Biome.MOUNTAIN, BiomePoolTier.BOSS_RARE, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.HISUI_SLIGGOO, Type.STEEL, Type.DRAGON, [
+    [ Species.HISUI_SLIGGOO, PokemonType.STEEL, PokemonType.DRAGON, [
       [ Biome.SWAMP, BiomePoolTier.SUPER_RARE, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.HISUI_GOODRA, Type.STEEL, Type.DRAGON, [
+    [ Species.HISUI_GOODRA, PokemonType.STEEL, PokemonType.DRAGON, [
       [ Biome.SWAMP, BiomePoolTier.SUPER_RARE, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.SWAMP, BiomePoolTier.BOSS_RARE, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.HISUI_AVALUGG, Type.ICE, Type.ROCK, [
+    [ Species.HISUI_AVALUGG, PokemonType.ICE, PokemonType.ROCK, [
       [ Biome.SNOWY_FOREST, BiomePoolTier.SUPER_RARE ]
     ]
     ],
-    [ Species.HISUI_DECIDUEYE, Type.GRASS, Type.FIGHTING, [
+    [ Species.HISUI_DECIDUEYE, PokemonType.GRASS, PokemonType.FIGHTING, [
       [ Biome.DOJO, BiomePoolTier.BOSS_RARE ]
     ]
     ],
-    [ Species.PALDEA_TAUROS, Type.FIGHTING, -1, [
+    [ Species.PALDEA_TAUROS, PokemonType.FIGHTING, -1, [
       [ Biome.PLAINS, BiomePoolTier.RARE, [ TimeOfDay.DAWN, TimeOfDay.DAY ]],
       [ Biome.PLAINS, BiomePoolTier.BOSS_RARE, [ TimeOfDay.DAWN, TimeOfDay.DAY ]]
     ]
     ],
-    [ Species.PALDEA_WOOPER, Type.POISON, Type.GROUND, [
+    [ Species.PALDEA_WOOPER, PokemonType.POISON, PokemonType.GROUND, [
       [ Biome.SWAMP, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ]]
     ]
     ],
-    [ Species.BLOODMOON_URSALUNA, Type.GROUND, Type.NORMAL, [
+    [ Species.BLOODMOON_URSALUNA, PokemonType.GROUND, PokemonType.NORMAL, [
       [ Biome.FOREST, BiomePoolTier.SUPER_RARE, TimeOfDay.NIGHT ],
       [ Biome.FOREST, BiomePoolTier.BOSS_RARE, TimeOfDay.NIGHT ]
     ]
@@ -7164,16 +7165,21 @@ export function initBiomes() {
       [ Biome.MOUNTAIN, BiomePoolTier.COMMON ],
       [ Biome.CAVE, BiomePoolTier.COMMON ],
       [ Biome.BADLANDS, BiomePoolTier.COMMON ],
-      [ Biome.JUNGLE, BiomePoolTier.COMMON ]
+      [ Biome.JUNGLE, BiomePoolTier.COMMON ],
+      [ Biome.DESERT, BiomePoolTier.COMMON ]
     ]
     ],
     [ TrainerType.BAKER, [
-      [ Biome.SLUM, BiomePoolTier.UNCOMMON ]
+      [ Biome.SLUM, BiomePoolTier.UNCOMMON ],
+      [ Biome.MEADOW, BiomePoolTier.UNCOMMON ]
     ]
     ],
     [ TrainerType.BEAUTY, [
+      [ Biome.METROPOLIS, BiomePoolTier.COMMON ],
+      [ Biome.MEADOW, BiomePoolTier.COMMON ],
       [ Biome.FAIRY_CAVE, BiomePoolTier.COMMON ]
-    ]],
+    ]
+    ],
     [ TrainerType.BIKER, [
       [ Biome.SLUM, BiomePoolTier.COMMON ]
     ]
@@ -7203,7 +7209,8 @@ export function initBiomes() {
     ],
     [ TrainerType.CLERK, [
       [ Biome.METROPOLIS, BiomePoolTier.COMMON ]
-    ]],
+    ]
+    ],
     [ TrainerType.CYCLIST, [
       [ Biome.PLAINS, BiomePoolTier.UNCOMMON ],
       [ Biome.METROPOLIS, BiomePoolTier.COMMON ]
@@ -7212,18 +7219,23 @@ export function initBiomes() {
     [ TrainerType.DANCER, []],
     [ TrainerType.DEPOT_AGENT, [
       [ Biome.METROPOLIS, BiomePoolTier.UNCOMMON ]
-    ]],
+    ]
+    ],
     [ TrainerType.DOCTOR, []],
+    [ TrainerType.FIREBREATHER, [
+      [ Biome.VOLCANO, BiomePoolTier.COMMON ]
+    ]
+    ],
     [ TrainerType.FISHERMAN, [
       [ Biome.LAKE, BiomePoolTier.COMMON ],
       [ Biome.BEACH, BiomePoolTier.COMMON ]
     ]
     ],
-    [ TrainerType.RICH, []],
     [ TrainerType.GUITARIST, [
       [ Biome.METROPOLIS, BiomePoolTier.UNCOMMON ],
       [ Biome.POWER_PLANT, BiomePoolTier.COMMON ]
-    ]],
+    ]
+    ],
     [ TrainerType.HARLEQUIN, []],
     [ TrainerType.HIKER, [
       [ Biome.MOUNTAIN, BiomePoolTier.COMMON ],
@@ -7231,13 +7243,24 @@ export function initBiomes() {
       [ Biome.BADLANDS, BiomePoolTier.COMMON ]
     ]
     ],
-    [ TrainerType.HOOLIGANS, []],
+    [ TrainerType.HOOLIGANS, [
+      [ Biome.SLUM, BiomePoolTier.UNCOMMON ]
+    ]
+    ],
     [ TrainerType.HOOPSTER, []],
     [ TrainerType.INFIELDER, []],
     [ TrainerType.JANITOR, []],
     [ TrainerType.LINEBACKER, []],
     [ TrainerType.MAID, []],
-    [ TrainerType.MUSICIAN, []],
+    [ TrainerType.MUSICIAN, [
+      [ Biome.MEADOW, BiomePoolTier.COMMON ]
+    ]
+    ],
+    [ TrainerType.HEX_MANIAC, [
+      [ Biome.RUINS, BiomePoolTier.UNCOMMON ],
+      [ Biome.GRAVEYARD, BiomePoolTier.UNCOMMON ]
+    ]
+    ],
     [ TrainerType.NURSERY_AIDE, []],
     [ TrainerType.OFFICER, [
       [ Biome.METROPOLIS, BiomePoolTier.COMMON ],
@@ -7246,12 +7269,20 @@ export function initBiomes() {
     ]
     ],
     [ TrainerType.PARASOL_LADY, [
-      [ Biome.BEACH, BiomePoolTier.COMMON ],
+      [ Biome.SWAMP, BiomePoolTier.COMMON ],
+      [ Biome.LAKE, BiomePoolTier.COMMON ],
       [ Biome.MEADOW, BiomePoolTier.COMMON ]
     ]
     ],
-    [ TrainerType.PILOT, []],
-    [ TrainerType.POKEFAN, []],
+    [ TrainerType.PILOT, [
+      [ Biome.MOUNTAIN, BiomePoolTier.UNCOMMON ]
+    ]
+    ],
+    [ TrainerType.POKEFAN, [
+      [ Biome.GRASS, BiomePoolTier.UNCOMMON ],
+      [ Biome.MEADOW, BiomePoolTier.UNCOMMON ]
+    ]
+    ],
     [ TrainerType.PRESCHOOLER, []],
     [ TrainerType.PSYCHIC, [
       [ Biome.GRAVEYARD, BiomePoolTier.COMMON ],
@@ -7264,11 +7295,24 @@ export function initBiomes() {
       [ Biome.JUNGLE, BiomePoolTier.COMMON ]
     ]
     ],
-    [ TrainerType.RICH_KID, []],
+    [ TrainerType.RICH, [
+      [ Biome.ISLAND, BiomePoolTier.UNCOMMON ]
+    ]
+    ],
+    [ TrainerType.RICH_KID, [
+      [ Biome.METROPOLIS, BiomePoolTier.RARE ],
+      [ Biome.ISLAND, BiomePoolTier.COMMON ]
+    ]
+    ],
     [ TrainerType.ROUGHNECK, [
       [ Biome.SLUM, BiomePoolTier.COMMON ]
     ]
     ],
+    [ TrainerType.SAILOR, [
+      [ Biome.SEA, BiomePoolTier.COMMON ],
+      [ Biome.BEACH, BiomePoolTier.COMMON ]
+    ]
+    ],
     [ TrainerType.SCIENTIST, [
       [ Biome.DESERT, BiomePoolTier.COMMON ],
       [ Biome.RUINS, BiomePoolTier.COMMON ]
@@ -7311,19 +7355,6 @@ export function initBiomes() {
       [ Biome.TOWN, BiomePoolTier.COMMON ]
     ]
     ],
-    [ TrainerType.HEX_MANIAC, [
-      [ Biome.GRAVEYARD, BiomePoolTier.UNCOMMON ]
-    ]
-    ],
-    [ TrainerType.FIREBREATHER, [
-      [ Biome.VOLCANO, BiomePoolTier.COMMON ]
-    ]
-    ],
-    [ TrainerType.SAILOR, [
-      [ Biome.SEA, BiomePoolTier.COMMON ],
-      [ Biome.BEACH, BiomePoolTier.COMMON ]
-    ]
-    ],
     [ TrainerType.BROCK, [
       [ Biome.CAVE, BiomePoolTier.BOSS ]
     ]
@@ -7677,9 +7708,9 @@ export function initBiomes() {
 
   const traverseBiome = (biome: Biome, depth: number) => {
     if (biome === Biome.END) {
-      const biomeList = Object.keys(Biome).filter(key => !isNaN(Number(key)));
+      const biomeList = Object.keys(Biome).filter(key => !Number.isNaN(Number(key)));
       biomeList.pop(); // Removes Biome.END from the list
-      const randIndex = Utils.randSeedInt(biomeList.length, 1); // Will never be Biome.TOWN
+      const randIndex = randSeedInt(biomeList.length, 1); // Will never be Biome.TOWN
       biome = Biome[biomeList[randIndex]];
     }
     const linkedBiomes: (Biome | [ Biome, number ])[] = Array.isArray(biomeLinks[biome])
@@ -7702,15 +7733,15 @@ export function initBiomes() {
   traverseBiome(Biome.TOWN, 0);
   biomeDepths[Biome.END] = [ Object.values(biomeDepths).map(d => d[0]).reduce((max: number, value: number) => Math.max(max, value), 0) + 1, 1 ];
 
-  for (const biome of Utils.getEnumValues(Biome)) {
+  for (const biome of getEnumValues(Biome)) {
     biomePokemonPools[biome] = {};
     biomeTrainerPools[biome] = {};
 
-    for (const tier of Utils.getEnumValues(BiomePoolTier)) {
+    for (const tier of getEnumValues(BiomePoolTier)) {
       biomePokemonPools[biome][tier] = {};
       biomeTrainerPools[biome][tier] = [];
 
-      for (const tod of Utils.getEnumValues(TimeOfDay)) {
+      for (const tod of getEnumValues(TimeOfDay)) {
         biomePokemonPools[biome][tier][tod] = [];
       }
     }
@@ -7764,7 +7795,8 @@ export function initBiomes() {
               treeIndex = t;
               arrayIndex = es + 1;
               break;
-            } else if (speciesEvolutions && speciesEvolutions.find(se => se.speciesId === existingSpeciesId)) {
+            }
+            if (speciesEvolutions?.find(se => se.speciesId === existingSpeciesId)) {
               treeIndex = t;
               arrayIndex = es;
               break;
@@ -7786,7 +7818,7 @@ export function initBiomes() {
 
   for (const b of Object.keys(biomePokemonPools)) {
     for (const t of Object.keys(biomePokemonPools[b])) {
-      const tier = parseInt(t) as BiomePoolTier;
+      const tier = Number.parseInt(t) as BiomePoolTier;
       for (const tod of Object.keys(biomePokemonPools[b][t])) {
         const biomeTierTimePool = biomePokemonPools[b][t][tod];
         for (let e = 0; e < biomeTierTimePool.length; e++) {
@@ -7799,7 +7831,7 @@ export function initBiomes() {
             };
             for (let s = 1; s < entry.length; s++) {
               const speciesId = entry[s];
-              const prevolution = entry.map(s => pokemonEvolutions[s]).flat().find(e => e && e.speciesId === speciesId);
+              const prevolution = entry.flatMap((s: string | number) => pokemonEvolutions[s]).find(e => e && e.speciesId === speciesId);
               const level = prevolution.level - (prevolution.level === 1 ? 1 : 0) + (prevolution.wildDelay * 10) - (tier >= BiomePoolTier.BOSS ? 10 : 0);
               if (!newEntry.hasOwnProperty(level)) {
                 newEntry[level] = [ speciesId ];
diff --git a/src/data/balance/egg-moves.ts b/src/data/balance/egg-moves.ts
index 35ec6f934a4..289ac60bcc5 100644
--- a/src/data/balance/egg-moves.ts
+++ b/src/data/balance/egg-moves.ts
@@ -1,5 +1,5 @@
-import { allMoves } from "#app/data/move";
-import * as Utils from "#app/utils";
+import { allMoves } from "#app/data/moves/move";
+import { getEnumKeys, getEnumValues } from "#app/utils/common";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 
@@ -12,7 +12,7 @@ export const speciesEggMoves = {
   [Species.WEEDLE]: [ Moves.THOUSAND_ARROWS, Moves.NOXIOUS_TORQUE, Moves.ATTACK_ORDER, Moves.VICTORY_DANCE ],
   [Species.PIDGEY]: [ Moves.BLEAKWIND_STORM, Moves.SANDSEAR_STORM, Moves.CALM_MIND, Moves.BOOMBURST ],
   [Species.RATTATA]: [ Moves.HYPER_FANG, Moves.PSYCHIC_FANGS, Moves.FIRE_FANG, Moves.EXTREME_SPEED ],
-  [Species.SPEAROW]: [ Moves.FLOATY_FALL, Moves.HYPER_DRILL, Moves.TIDY_UP, Moves.TRIPLE_ARROWS ],
+  [Species.SPEAROW]: [ Moves.FLOATY_FALL, Moves.EXTREME_SPEED, Moves.KNOCK_OFF, Moves.TRIPLE_ARROWS ],
   [Species.EKANS]: [ Moves.NOXIOUS_TORQUE, Moves.DRAGON_DANCE, Moves.SLACK_OFF, Moves.SHED_TAIL ],
   [Species.SANDSHREW]: [ Moves.HIGH_HORSEPOWER, Moves.DIRE_CLAW, Moves.SHORE_UP, Moves.MIGHTY_CLEAVE ],
   [Species.NIDORAN_F]: [ Moves.CALM_MIND, Moves.MOONLIGHT, Moves.MALIGNANT_CHAIN, Moves.SANDSEAR_STORM ],
@@ -46,27 +46,27 @@ export const speciesEggMoves = {
   [Species.DROWZEE]: [ Moves.BADDY_BAD, Moves.STRENGTH_SAP, Moves.LUMINA_CRASH, Moves.DARK_VOID ],
   [Species.KRABBY]: [ Moves.DIRE_CLAW, Moves.DRAGON_HAMMER, Moves.IVY_CUDGEL, Moves.JET_PUNCH ],
   [Species.VOLTORB]: [ Moves.NASTY_PLOT, Moves.FUSION_FLARE, Moves.FROST_BREATH, Moves.ELECTRO_DRIFT ],
-  [Species.EXEGGCUTE]: [ Moves.FICKLE_BEAM, Moves.APPLE_ACID, Moves.TRICK_ROOM, Moves.LUMINA_CRASH ],
+  [Species.EXEGGCUTE]: [ Moves.FICKLE_BEAM, Moves.APPLE_ACID, Moves.HEAT_WAVE, Moves.LUMINA_CRASH ],
   [Species.CUBONE]: [ Moves.HEAD_SMASH, Moves.WOOD_HAMMER, Moves.SHADOW_SNEAK, Moves.BITTER_BLADE ],
   [Species.LICKITUNG]: [ Moves.CRUSH_GRIP, Moves.FIRE_LASH, Moves.SLACK_OFF, Moves.MAGICAL_TORQUE ],
   [Species.KOFFING]: [ Moves.SCALD, Moves.RECOVER, Moves.BODY_PRESS, Moves.MALIGNANT_CHAIN ],
   [Species.RHYHORN]: [ Moves.SHORE_UP, Moves.ICE_HAMMER, Moves.ACCELEROCK, Moves.HEAD_SMASH ],
   [Species.TANGELA]: [ Moves.NATURES_MADNESS, Moves.SNAP_TRAP, Moves.PARTING_SHOT, Moves.SAPPY_SEED ],
   [Species.KANGASKHAN]: [ Moves.POWER_UP_PUNCH, Moves.TRAILBLAZE, Moves.COVET, Moves.SEISMIC_TOSS ],
-  [Species.HORSEA]: [ Moves.SNIPE_SHOT, Moves.FROST_BREATH, Moves.SLUDGE_BOMB, Moves.CLANGING_SCALES ],
+  [Species.HORSEA]: [ Moves.SNIPE_SHOT, Moves.TAKE_HEART, Moves.SHELL_SIDE_ARM, Moves.DRAGON_ENERGY ],
   [Species.GOLDEEN]: [ Moves.GLACIAL_LANCE, Moves.SUPERCELL_SLAM, Moves.DRAGON_DANCE, Moves.FISHIOUS_REND ],
   [Species.STARYU]: [ Moves.CALM_MIND, Moves.BOUNCY_BUBBLE, Moves.MOONBLAST, Moves.MYSTICAL_POWER ],
   [Species.SCYTHER]: [ Moves.MIGHTY_CLEAVE, Moves.GEAR_GRIND, Moves.STORM_THROW, Moves.BITTER_BLADE ],
   [Species.PINSIR]: [ Moves.HEADLONG_RUSH, Moves.LEECH_LIFE, Moves.CRUSH_GRIP, Moves.EXTREME_SPEED ],
   [Species.TAUROS]: [ Moves.SWORDS_DANCE, Moves.FIRE_LASH, Moves.WICKED_TORQUE, Moves.COLLISION_COURSE ],
-  [Species.MAGIKARP]: [ Moves.FLIP_TURN, Moves.ICE_SPINNER, Moves.DRAGON_ASCENT, Moves.SURGING_STRIKES ],
+  [Species.MAGIKARP]: [ Moves.FLIP_TURN, Moves.ICE_SPINNER, Moves.KNOCK_OFF, Moves.DRAGON_ASCENT ],
   [Species.LAPRAS]: [ Moves.RECOVER, Moves.FREEZE_DRY, Moves.SCALD, Moves.SHELL_SMASH ],
   [Species.DITTO]: [ Moves.MIMIC, Moves.SKETCH, Moves.METRONOME, Moves.IMPRISON ],
   [Species.EEVEE]: [ Moves.WISH, Moves.NO_RETREAT, Moves.ZIPPY_ZAP, Moves.BOOMBURST ],
   [Species.PORYGON]: [ Moves.THUNDERCLAP, Moves.AURA_SPHERE, Moves.FLAMETHROWER, Moves.TECHNO_BLAST ],
   [Species.OMANYTE]: [ Moves.FREEZE_DRY, Moves.GIGA_DRAIN, Moves.POWER_GEM, Moves.STEAM_ERUPTION ],
   [Species.KABUTO]: [ Moves.CEASELESS_EDGE, Moves.HIGH_HORSEPOWER, Moves.CRABHAMMER, Moves.MIGHTY_CLEAVE ],
-  [Species.AERODACTYL]: [ Moves.FLOATY_FALL, Moves.FLARE_BLITZ, Moves.SWORDS_DANCE, Moves.MIGHTY_CLEAVE ],
+  [Species.AERODACTYL]: [ Moves.FLOATY_FALL, Moves.HIGH_HORSEPOWER, Moves.STONE_AXE, Moves.SWORDS_DANCE ],
   [Species.ARTICUNO]: [ Moves.EARTH_POWER, Moves.CALM_MIND, Moves.AURORA_VEIL, Moves.AEROBLAST ],
   [Species.ZAPDOS]: [ Moves.BLEAKWIND_STORM, Moves.CALM_MIND, Moves.SANDSEAR_STORM, Moves.ELECTRO_SHOT ],
   [Species.MOLTRES]: [ Moves.EARTH_POWER, Moves.CALM_MIND, Moves.AEROBLAST, Moves.TORCH_SONG ],
@@ -76,9 +76,9 @@ export const speciesEggMoves = {
 
   [Species.CHIKORITA]: [ Moves.SAPPY_SEED, Moves.STONE_AXE, Moves.DRAGON_DANCE, Moves.SPORE ],
   [Species.CYNDAQUIL]: [ Moves.NASTY_PLOT, Moves.EARTH_POWER, Moves.FIERY_DANCE, Moves.ELECTRO_DRIFT ],
-  [Species.TOTODILE]: [ Moves.THUNDER_PUNCH, Moves.DRAGON_DANCE, Moves.TRIPLE_AXEL, Moves.SURGING_STRIKES ],
+  [Species.TOTODILE]: [ Moves.THUNDER_PUNCH, Moves.DRAGON_DANCE, Moves.PLAY_ROUGH, Moves.SURGING_STRIKES ],
   [Species.SENTRET]: [ Moves.TIDY_UP, Moves.FAKE_OUT, Moves.NUZZLE, Moves.EXTREME_SPEED ],
-  [Species.HOOTHOOT]: [ Moves.CALM_MIND, Moves.ESPER_WING, Moves.AEROBLAST, Moves.BOOMBURST ],
+  [Species.HOOTHOOT]: [ Moves.TAKE_HEART, Moves.ESPER_WING, Moves.AEROBLAST, Moves.BOOMBURST ],
   [Species.LEDYBA]: [ Moves.POLLEN_PUFF, Moves.MAT_BLOCK, Moves.PARTING_SHOT, Moves.SPORE ],
   [Species.SPINARAK]: [ Moves.PARTING_SHOT, Moves.ATTACK_ORDER, Moves.GASTRO_ACID, Moves.STRENGTH_SAP ],
   [Species.CHINCHOU]: [ Moves.THUNDERCLAP, Moves.BOUNCY_BUBBLE, Moves.THUNDER_CAGE, Moves.TAIL_GLOW ],
@@ -103,7 +103,7 @@ export const speciesEggMoves = {
   [Species.SNUBBULL]: [ Moves.FACADE, Moves.HIGH_HORSEPOWER, Moves.SWORDS_DANCE, Moves.EXTREME_SPEED ],
   [Species.QWILFISH]: [ Moves.BARB_BARRAGE, Moves.BANEFUL_BUNKER, Moves.RECOVER, Moves.FISHIOUS_REND ],
   [Species.SHUCKLE]: [ Moves.STUFF_CHEEKS, Moves.HEAL_ORDER, Moves.BODY_PRESS, Moves.SALT_CURE ],
-  [Species.HERACROSS]: [ Moves.ROCK_BLAST, Moves.FIRST_IMPRESSION, Moves.ICICLE_SPEAR, Moves.TIDY_UP ],
+  [Species.HERACROSS]: [ Moves.ROCK_BLAST, Moves.STORM_THROW, Moves.ICICLE_SPEAR, Moves.SCALE_SHOT ],
   [Species.SNEASEL]: [ Moves.DIRE_CLAW, Moves.DARKEST_LARIAT, Moves.TRIPLE_AXEL, Moves.CLOSE_COMBAT ],
   [Species.TEDDIURSA]: [ Moves.MOUNTAIN_GALE, Moves.FAKE_OUT, Moves.SLACK_OFF, Moves.PRECIPICE_BLADES ],
   [Species.SLUGMA]: [ Moves.BURNING_BULWARK, Moves.POWER_GEM, Moves.SOLAR_BEAM, Moves.MAGMA_STORM ],
@@ -143,14 +143,14 @@ export const speciesEggMoves = {
   [Species.SURSKIT]: [ Moves.POLLEN_PUFF, Moves.FIERY_DANCE, Moves.BOUNCY_BUBBLE, Moves.AEROBLAST ],
   [Species.SHROOMISH]: [ Moves.ACCELEROCK, Moves.TRAILBLAZE, Moves.STORM_THROW, Moves.SAPPY_SEED ],
   [Species.SLAKOTH]: [ Moves.FACADE, Moves.DRAIN_PUNCH, Moves.KNOCK_OFF, Moves.SKILL_SWAP ],
-  [Species.NINCADA]: [ Moves.ATTACK_ORDER, Moves.STICKY_WEB, Moves.SPIRIT_SHACKLE, Moves.SHELL_SMASH ],
+  [Species.NINCADA]: [ Moves.BULLDOZE, Moves.STICKY_WEB, Moves.SHADOW_BONE, Moves.SHELL_SMASH ],
   [Species.WHISMUR]: [ Moves.ALLURING_VOICE, Moves.SHIFT_GEAR, Moves.SPARKLING_ARIA, Moves.TORCH_SONG ],
   [Species.MAKUHITA]: [ Moves.COMBAT_TORQUE, Moves.SLACK_OFF, Moves.HEAT_CRASH, Moves.DOUBLE_IRON_BASH ],
   [Species.AZURILL]: [ Moves.JET_PUNCH, Moves.MAGICAL_TORQUE, Moves.SWORDS_DANCE, Moves.SURGING_STRIKES ],
   [Species.NOSEPASS]: [ Moves.SHORE_UP, Moves.BODY_PRESS, Moves.CALM_MIND, Moves.TACHYON_CUTTER ],
   [Species.SKITTY]: [ Moves.THUNDEROUS_KICK, Moves.ENTRAINMENT, Moves.TIDY_UP, Moves.V_CREATE ],
   [Species.SABLEYE]: [ Moves.RECOVER, Moves.TOPSY_TURVY, Moves.CURSE, Moves.SALT_CURE ],
-  [Species.MAWILE]: [ Moves.BULLET_PUNCH, Moves.MAGICAL_TORQUE, Moves.EARTHQUAKE, Moves.SHIFT_GEAR ],
+  [Species.MAWILE]: [ Moves.BULLET_PUNCH, Moves.HORN_LEECH, Moves.EARTHQUAKE, Moves.MAGICAL_TORQUE ],
   [Species.ARON]: [ Moves.HEAD_SMASH, Moves.BODY_PRESS, Moves.SHORE_UP, Moves.SALT_CURE ],
   [Species.MEDITITE]: [ Moves.THUNDEROUS_KICK, Moves.SUCKER_PUNCH, Moves.BULLET_PUNCH, Moves.PHOTON_GEYSER ],
   [Species.ELECTRIKE]: [ Moves.FROST_BREATH, Moves.HEAT_WAVE, Moves.NASTY_PLOT, Moves.ELECTRO_DRIFT ],
@@ -159,14 +159,14 @@ export const speciesEggMoves = {
   [Species.VOLBEAT]: [ Moves.BATON_PASS, Moves.STICKY_WEB, Moves.DECORATE, Moves.VICTORY_DANCE ],
   [Species.ILLUMISE]: [ Moves.PARTING_SHOT, Moves.GLITZY_GLOW, Moves.POWDER, Moves.QUIVER_DANCE ],
   [Species.GULPIN]: [ Moves.MALIGNANT_CHAIN, Moves.EARTH_POWER, Moves.CALM_MIND, Moves.STRENGTH_SAP ],
-  [Species.CARVANHA]: [ Moves.THUNDER_FANG, Moves.SWORDS_DANCE, Moves.OBSTRUCT, Moves.SURGING_STRIKES ],
+  [Species.CARVANHA]: [ Moves.THUNDER_FANG, Moves.GUNK_SHOT, Moves.OBSTRUCT, Moves.SURGING_STRIKES ],
   [Species.WAILMER]: [ Moves.TAKE_HEART, Moves.COMEUPPANCE, Moves.SLACK_OFF, Moves.STEAM_ERUPTION ],
   [Species.NUMEL]: [ Moves.TRICK_ROOM, Moves.ENERGY_BALL, Moves.SLACK_OFF, Moves.BLUE_FLARE ],
   [Species.TORKOAL]: [ Moves.MORNING_SUN, Moves.BURNING_BULWARK, Moves.BODY_PRESS, Moves.HYDRO_STEAM ],
   [Species.SPOINK]: [ Moves.AURA_SPHERE, Moves.MILK_DRINK, Moves.EXPANDING_FORCE, Moves.TAIL_GLOW ],
   [Species.SPINDA]: [ Moves.SUPERPOWER, Moves.SLACK_OFF, Moves.FLEUR_CANNON, Moves.V_CREATE ],
   [Species.TRAPINCH]: [ Moves.FIRE_LASH, Moves.DRAGON_DARTS, Moves.THOUSAND_ARROWS, Moves.DRAGON_ENERGY ],
-  [Species.CACNEA]: [ Moves.EARTH_POWER, Moves.CEASELESS_EDGE, Moves.NIGHT_DAZE, Moves.SAPPY_SEED ],
+  [Species.CACNEA]: [ Moves.EARTH_POWER, Moves.CEASELESS_EDGE, Moves.NIGHT_DAZE, Moves.IVY_CUDGEL ],
   [Species.SWABLU]: [ Moves.ROOST, Moves.NASTY_PLOT, Moves.FLOATY_FALL, Moves.BOOMBURST ],
   [Species.ZANGOOSE]: [ Moves.FACADE, Moves.HIGH_HORSEPOWER, Moves.EXTREME_SPEED, Moves.TIDY_UP ],
   [Species.SEVIPER]: [ Moves.ICE_BEAM, Moves.BITTER_BLADE, Moves.SUCKER_PUNCH, Moves.NO_RETREAT ],
@@ -191,7 +191,7 @@ export const speciesEggMoves = {
   [Species.RELICANTH]: [ Moves.DRAGON_DANCE, Moves.SHORE_UP, Moves.WAVE_CRASH, Moves.DIAMOND_STORM ],
   [Species.LUVDISC]: [ Moves.BATON_PASS, Moves.HEART_SWAP, Moves.GLITZY_GLOW, Moves.REVIVAL_BLESSING ],
   [Species.BAGON]: [ Moves.HEADLONG_RUSH, Moves.FIRE_LASH, Moves.DRAGON_DANCE, Moves.DRAGON_DARTS ],
-  [Species.BELDUM]: [ Moves.HEADLONG_RUSH, Moves.DRAIN_PUNCH, Moves.TRIPLE_AXEL, Moves.SHIFT_GEAR ],
+  [Species.BELDUM]: [ Moves.HEADLONG_RUSH, Moves.DRAIN_PUNCH, Moves.ICE_SPINNER, Moves.SHIFT_GEAR ],
   [Species.REGIROCK]: [ Moves.STONE_AXE, Moves.BODY_PRESS, Moves.SHORE_UP, Moves.SALT_CURE ],
   [Species.REGICE]: [ Moves.EARTH_POWER, Moves.TAKE_HEART, Moves.RECOVER, Moves.FREEZE_DRY ],
   [Species.REGISTEEL]: [ Moves.BODY_PRESS, Moves.SIZZLY_SLIDE, Moves.RECOVER, Moves.GIGATON_HAMMER ],
@@ -222,7 +222,7 @@ export const speciesEggMoves = {
   [Species.DRIFLOON]: [ Moves.PSYCHO_SHIFT, Moves.MIND_BLOWN, Moves.CALM_MIND, Moves.OBLIVION_WING ],
   [Species.BUNEARY]: [ Moves.TRIPLE_AXEL, Moves.EXTREME_SPEED, Moves.THUNDEROUS_KICK, Moves.SWORDS_DANCE ],
   [Species.GLAMEOW]: [ Moves.PARTING_SHOT, Moves.HIGH_HORSEPOWER, Moves.SWORDS_DANCE, Moves.EXTREME_SPEED ],
-  [Species.CHINGLING]: [ Moves.BUZZY_BUZZ, Moves.EERIE_SPELL, Moves.TORCH_SONG, Moves.BOOMBURST ],
+  [Species.CHINGLING]: [ Moves.ALLURING_VOICE, Moves.EERIE_SPELL, Moves.TORCH_SONG, Moves.BOOMBURST ],
   [Species.STUNKY]: [ Moves.CEASELESS_EDGE, Moves.FIRE_LASH, Moves.RECOVER, Moves.DIRE_CLAW ],
   [Species.BRONZOR]: [ Moves.RECOVER, Moves.TACHYON_CUTTER, Moves.GLARE, Moves.LUMINA_CRASH ],
   [Species.BONSLY]: [ Moves.ACCELEROCK, Moves.SWORDS_DANCE, Moves.STRENGTH_SAP, Moves.SAPPY_SEED ],
@@ -230,12 +230,12 @@ export const speciesEggMoves = {
   [Species.HAPPINY]: [ Moves.COTTON_GUARD, Moves.SEISMIC_TOSS, Moves.SIZZLY_SLIDE, Moves.REVIVAL_BLESSING ],
   [Species.CHATOT]: [ Moves.SPARKLING_ARIA, Moves.BOOMBURST, Moves.BATON_PASS, Moves.TORCH_SONG ],
   [Species.SPIRITOMB]: [ Moves.PARTING_SHOT, Moves.BADDY_BAD, Moves.STRENGTH_SAP, Moves.SPECTRAL_THIEF ],
-  [Species.GIBLE]: [ Moves.DRAGON_DANCE, Moves.BITTER_BLADE, Moves.DRAGON_HAMMER, Moves.PRECIPICE_BLADES ],
+  [Species.GIBLE]: [ Moves.METEOR_MASH, Moves.BITTER_BLADE, Moves.LANDS_WRATH, Moves.DRAGON_DANCE ],
   [Species.MUNCHLAX]: [ Moves.STUFF_CHEEKS, Moves.GRAV_APPLE, Moves.SLACK_OFF, Moves.EXTREME_SPEED ],
   [Species.RIOLU]: [ Moves.THUNDEROUS_KICK, Moves.TACHYON_CUTTER, Moves.TRIPLE_AXEL, Moves.SUNSTEEL_STRIKE ],
   [Species.HIPPOPOTAS]: [ Moves.SHORE_UP, Moves.STONE_AXE, Moves.BULK_UP, Moves.SALT_CURE ],
   [Species.SKORUPI]: [ Moves.COIL, Moves.DIRE_CLAW, Moves.CRABHAMMER, Moves.WICKED_BLOW ],
-  [Species.CROAGUNK]: [ Moves.DIRE_CLAW, Moves.ICE_SPINNER, Moves.THUNDEROUS_KICK, Moves.VICTORY_DANCE ],
+  [Species.CROAGUNK]: [ Moves.DIRE_CLAW, Moves.TRIPLE_AXEL, Moves.THUNDEROUS_KICK, Moves.VICTORY_DANCE ],
   [Species.CARNIVINE]: [ Moves.STRENGTH_SAP, Moves.FIRE_LASH, Moves.COIL, Moves.SAPPY_SEED ],
   [Species.FINNEON]: [ Moves.QUIVER_DANCE, Moves.SPLISHY_SPLASH, Moves.FREEZE_DRY, Moves.OBLIVION_WING ],
   [Species.MANTYKE]: [ Moves.SPLISHY_SPLASH, Moves.FREEZY_FROST, Moves.NASTY_PLOT, Moves.OBLIVION_WING ],
@@ -246,7 +246,7 @@ export const speciesEggMoves = {
   [Species.AZELF]: [ Moves.PSYSTRIKE, Moves.AURA_SPHERE, Moves.ICE_BEAM, Moves.TAIL_GLOW ],
   [Species.DIALGA]: [ Moves.CORE_ENFORCER, Moves.TAKE_HEART, Moves.RECOVER, Moves.MAKE_IT_RAIN ],
   [Species.PALKIA]: [ Moves.MALIGNANT_CHAIN, Moves.TAKE_HEART, Moves.RECOVER, Moves.ORIGIN_PULSE ],
-  [Species.HEATRAN]: [ Moves.MATCHA_GOTCHA, Moves.RECOVER, Moves.ERUPTION, Moves.TACHYON_CUTTER ],
+  [Species.HEATRAN]: [ Moves.ENERGY_BALL, Moves.RECOVER, Moves.ERUPTION, Moves.TACHYON_CUTTER ],
   [Species.REGIGIGAS]: [ Moves.SKILL_SWAP, Moves.RECOVER, Moves.EXTREME_SPEED, Moves.GIGATON_HAMMER ],
   [Species.GIRATINA]: [ Moves.DRAGON_DANCE, Moves.SPECTRAL_THIEF, Moves.RECOVER, Moves.COLLISION_COURSE ],
   [Species.CRESSELIA]: [ Moves.COSMIC_POWER, Moves.BODY_PRESS, Moves.SIZZLY_SLIDE, Moves.LUMINA_CRASH ],
@@ -259,7 +259,7 @@ export const speciesEggMoves = {
   [Species.VICTINI]: [ Moves.BLUE_FLARE, Moves.BOLT_STRIKE, Moves.LUSTER_PURGE, Moves.VICTORY_DANCE ],
   [Species.SNIVY]: [ Moves.FLAMETHROWER, Moves.CLANGING_SCALES, Moves.MAKE_IT_RAIN, Moves.FLEUR_CANNON ],
   [Species.TEPIG]: [ Moves.WAVE_CRASH, Moves.VOLT_TACKLE, Moves.AXE_KICK, Moves.VICTORY_DANCE ],
-  [Species.OSHAWOTT]: [ Moves.TRIPLE_AXEL, Moves.SHELL_SIDE_ARM, Moves.SACRED_SWORD, Moves.SHELL_SMASH ],
+  [Species.OSHAWOTT]: [ Moves.FREEZE_DRY, Moves.SHELL_SIDE_ARM, Moves.SACRED_SWORD, Moves.SHELL_SMASH ],
   [Species.PATRAT]: [ Moves.FAKE_OUT, Moves.SWORDS_DANCE, Moves.DYNAMIC_PUNCH, Moves.EXTREME_SPEED ],
   [Species.LILLIPUP]: [ Moves.CLOSE_COMBAT, Moves.BODY_SLAM, Moves.HIGH_HORSEPOWER, Moves.LAST_RESPECTS ],
   [Species.PURRLOIN]: [ Moves.ENCORE, Moves.OBSTRUCT, Moves.PARTING_SHOT, Moves.WICKED_BLOW ],
@@ -267,7 +267,7 @@ export const speciesEggMoves = {
   [Species.PANSEAR]: [ Moves.NASTY_PLOT, Moves.HYDRO_STEAM, Moves.EARTH_POWER, Moves.ERUPTION ],
   [Species.PANPOUR]: [ Moves.NASTY_PLOT, Moves.ENERGY_BALL, Moves.EARTH_POWER, Moves.WATER_SPOUT ],
   [Species.MUNNA]: [ Moves.COSMIC_POWER, Moves.AURA_SPHERE, Moves.LUNAR_BLESSING, Moves.MYSTICAL_POWER ],
-  [Species.PIDOVE]: [ Moves.GUNK_SHOT, Moves.TIDY_UP, Moves.FLOATY_FALL, Moves.TRIPLE_ARROWS ],
+  [Species.PIDOVE]: [ Moves.SLASH, Moves.TIDY_UP, Moves.FLOATY_FALL, Moves.TRIPLE_ARROWS ],
   [Species.BLITZLE]: [ Moves.HORN_LEECH, Moves.SWORDS_DANCE, Moves.FLARE_BLITZ, Moves.BOLT_STRIKE ],
   [Species.ROGGENROLA]: [ Moves.BODY_PRESS, Moves.CURSE, Moves.SHORE_UP, Moves.DIAMOND_STORM ],
   [Species.WOOBAT]: [ Moves.ESPER_WING, Moves.STORED_POWER, Moves.MYSTICAL_FIRE, Moves.OBLIVION_WING ],
@@ -282,12 +282,12 @@ export const speciesEggMoves = {
   [Species.COTTONEE]: [ Moves.POLLEN_PUFF, Moves.PARTING_SHOT, Moves.SLEEP_POWDER, Moves.SEED_FLARE ],
   [Species.PETILIL]: [ Moves.THUNDEROUS_KICK, Moves.SPARKLING_ARIA, Moves.FIERY_DANCE, Moves.FLOWER_TRICK ],
   [Species.BASCULIN]: [ Moves.LAST_RESPECTS, Moves.CLOSE_COMBAT, Moves.SPLISHY_SPLASH, Moves.NO_RETREAT ],
-  [Species.SANDILE]: [ Moves.DIRE_CLAW, Moves.HEADLONG_RUSH, Moves.FIRE_LASH, Moves.WICKED_BLOW ],
+  [Species.SANDILE]: [ Moves.DIRE_CLAW, Moves.SUCKER_PUNCH, Moves.FIRE_LASH, Moves.HEADLONG_RUSH ],
   [Species.DARUMAKA]: [ Moves.DRAIN_PUNCH, Moves.ZIPPY_ZAP, Moves.HEADLONG_RUSH, Moves.PYRO_BALL ],
-  [Species.MARACTUS]: [ Moves.EARTH_POWER, Moves.QUIVER_DANCE, Moves.FIERY_DANCE, Moves.SEED_FLARE ],
+  [Species.MARACTUS]: [ Moves.EARTH_POWER, Moves.SIZZLY_SLIDE, Moves.FIERY_DANCE, Moves.QUIVER_DANCE ],
   [Species.DWEBBLE]: [ Moves.CRABHAMMER, Moves.STONE_AXE, Moves.LEECH_LIFE, Moves.MIGHTY_CLEAVE ],
   [Species.SCRAGGY]: [ Moves.SUCKER_PUNCH, Moves.BULLET_PUNCH, Moves.NOXIOUS_TORQUE, Moves.VICTORY_DANCE ],
-  [Species.SIGILYPH]: [ Moves.MOONBLAST, Moves.CALM_MIND, Moves.ESPER_WING, Moves.OBLIVION_WING ],
+  [Species.SIGILYPH]: [ Moves.MOONBLAST, Moves.PSYCHO_SHIFT, Moves.ESPER_WING, Moves.OBLIVION_WING ],
   [Species.YAMASK]: [ Moves.STRENGTH_SAP, Moves.GLARE, Moves.AURA_SPHERE, Moves.ASTRAL_BARRAGE ],
   [Species.TIRTOUGA]: [ Moves.ICE_SPINNER, Moves.AQUA_STEP, Moves.SHORE_UP, Moves.MIGHTY_CLEAVE ],
   [Species.ARCHEN]: [ Moves.ROOST, Moves.EARTHQUAKE, Moves.FLOATY_FALL, Moves.MIGHTY_CLEAVE ],
@@ -319,7 +319,7 @@ export const speciesEggMoves = {
   [Species.DRUDDIGON]: [ Moves.FIRE_LASH, Moves.MORNING_SUN, Moves.DRAGON_DARTS, Moves.CLANGOROUS_SOUL ],
   [Species.GOLETT]: [ Moves.SHIFT_GEAR, Moves.DRAIN_PUNCH, Moves.HEADLONG_RUSH, Moves.RAGE_FIST ],
   [Species.PAWNIARD]: [ Moves.SUCKER_PUNCH, Moves.CEASELESS_EDGE, Moves.BITTER_BLADE, Moves.LAST_RESPECTS ],
-  [Species.BOUFFALANT]: [ Moves.SLACK_OFF, Moves.HIGH_JUMP_KICK, Moves.HEAD_SMASH, Moves.FLARE_BLITZ ],
+  [Species.BOUFFALANT]: [ Moves.HORN_LEECH, Moves.HIGH_JUMP_KICK, Moves.HEAD_SMASH, Moves.FLARE_BLITZ ],
   [Species.RUFFLET]: [ Moves.FLOATY_FALL, Moves.AURA_SPHERE, Moves.NO_RETREAT, Moves.BOLT_BEAK ],
   [Species.VULLABY]: [ Moves.FOUL_PLAY, Moves.BODY_PRESS, Moves.ROOST, Moves.RUINATION ],
   [Species.HEATMOR]: [ Moves.EARTH_POWER, Moves.OVERHEAT, Moves.THUNDERBOLT, Moves.V_CREATE ],
@@ -327,8 +327,8 @@ export const speciesEggMoves = {
   [Species.DEINO]: [ Moves.FIERY_WRATH, Moves.ESPER_WING, Moves.SLUDGE_BOMB, Moves.FICKLE_BEAM ],
   [Species.LARVESTA]: [ Moves.THUNDERBOLT, Moves.DAZZLING_GLEAM, Moves.EARTH_POWER, Moves.HYDRO_STEAM ],
   [Species.COBALION]: [ Moves.BEHEMOTH_BLADE, Moves.MIGHTY_CLEAVE, Moves.CEASELESS_EDGE, Moves.VICTORY_DANCE ],
-  [Species.TERRAKION]: [ Moves.MIGHTY_CLEAVE, Moves.HEADLONG_RUSH, Moves.CEASELESS_EDGE, Moves.VICTORY_DANCE ],
-  [Species.VIRIZION]: [ Moves.SAPPY_SEED, Moves.PSYBLADE, Moves.CEASELESS_EDGE, Moves.VICTORY_DANCE ],
+  [Species.TERRAKION]: [ Moves.MIGHTY_CLEAVE, Moves.HEADLONG_RUSH, Moves.KNOCK_OFF, Moves.VICTORY_DANCE ],
+  [Species.VIRIZION]: [ Moves.SAPPY_SEED, Moves.PSYBLADE, Moves.STONE_AXE, Moves.VICTORY_DANCE ],
   [Species.TORNADUS]: [ Moves.SANDSEAR_STORM, Moves.PARTING_SHOT, Moves.SPLISHY_SPLASH, Moves.OBLIVION_WING ],
   [Species.THUNDURUS]: [ Moves.SANDSEAR_STORM, Moves.HURRICANE, Moves.FROST_BREATH, Moves.ELECTRO_SHOT ],
   [Species.RESHIRAM]: [ Moves.ENERGY_BALL, Moves.TAKE_HEART, Moves.FICKLE_BEAM, Moves.ERUPTION ],
@@ -336,13 +336,13 @@ export const speciesEggMoves = {
   [Species.LANDORUS]: [ Moves.STONE_AXE, Moves.FLOATY_FALL, Moves.ROOST, Moves.BLEAKWIND_STORM ],
   [Species.KYUREM]: [ Moves.DRAGON_DARTS, Moves.GLACIAL_LANCE, Moves.NO_RETREAT, Moves.DRAGON_ENERGY ],
   [Species.KELDEO]: [ Moves.BOUNCY_BUBBLE, Moves.THUNDERBOLT, Moves.ICE_BEAM, Moves.STEAM_ERUPTION ],
-  [Species.MELOETTA]: [ Moves.BODY_SLAM, Moves.TORCH_SONG, Moves.TRIPLE_ARROWS, Moves.BOOMBURST ],
+  [Species.MELOETTA]: [ Moves.BODY_SLAM, Moves.PSYCHIC_NOISE, Moves.TRIPLE_ARROWS, Moves.TORCH_SONG ],
   [Species.GENESECT]: [ Moves.EXTREME_SPEED, Moves.SHIFT_GEAR, Moves.BEHEMOTH_BASH, Moves.TACHYON_CUTTER ],
 
   [Species.CHESPIN]: [ Moves.COMBAT_TORQUE, Moves.SYNTHESIS, Moves.CEASELESS_EDGE, Moves.SAPPY_SEED ],
   [Species.FENNEKIN]: [ Moves.TWIN_BEAM, Moves.FIERY_DANCE, Moves.THUNDERBOLT, Moves.SPARKLY_SWIRL ],
   [Species.FROAKIE]: [ Moves.MOONBLAST, Moves.SHELL_SIDE_ARM, Moves.FIERY_WRATH, Moves.STEAM_ERUPTION ],
-  [Species.BUNNELBY]: [ Moves.DRAIN_PUNCH, Moves.TIDY_UP, Moves.FACADE, Moves.EXTREME_SPEED ],
+  [Species.BUNNELBY]: [ Moves.DRAIN_PUNCH, Moves.TIDY_UP, Moves.LANDS_WRATH, Moves.EXTREME_SPEED ],
   [Species.FLETCHLING]: [ Moves.DRILL_RUN, Moves.BURNING_BULWARK, Moves.HEAD_SMASH, Moves.VOLT_TACKLE ],
   [Species.SCATTERBUG]: [ Moves.FOCUS_BLAST, Moves.AFTER_YOU, Moves.DECORATE, Moves.BLIZZARD ],
   [Species.LITLEO]: [ Moves.EARTH_POWER, Moves.NASTY_PLOT, Moves.BURNING_BULWARK, Moves.BLUE_FLARE ],
@@ -360,7 +360,7 @@ export const speciesEggMoves = {
   [Species.CLAUNCHER]: [ Moves.SHELL_SMASH, Moves.ARMOR_CANNON, Moves.ENERGY_BALL, Moves.ORIGIN_PULSE ],
   [Species.HELIOPTILE]: [ Moves.WEATHER_BALL, Moves.HYDRO_STEAM, Moves.EARTH_POWER, Moves.BOOMBURST ],
   [Species.TYRUNT]: [ Moves.DRAGON_HAMMER, Moves.FLARE_BLITZ, Moves.VOLT_TACKLE, Moves.SHIFT_GEAR ],
-  [Species.AMAURA]: [ Moves.RECOVER, Moves.WRING_OUT, Moves.POWER_GEM, Moves.GEOMANCY ],
+  [Species.AMAURA]: [ Moves.RECOVER, Moves.TERA_STARSTORM, Moves.POWER_GEM, Moves.GEOMANCY ],
   [Species.HAWLUCHA]: [ Moves.TRIPLE_AXEL, Moves.HIGH_HORSEPOWER, Moves.FLOATY_FALL, Moves.WICKED_BLOW ],
   [Species.DEDENNE]: [ Moves.BOOMBURST, Moves.FAKE_OUT, Moves.NASTY_PLOT, Moves.REVIVAL_BLESSING ],
   [Species.CARBINK]: [ Moves.BODY_PRESS, Moves.SHORE_UP, Moves.SPARKLY_SWIRL, Moves.DIAMOND_STORM ],
@@ -370,9 +370,9 @@ export const speciesEggMoves = {
   [Species.PUMPKABOO]: [ Moves.SPIRIT_SHACKLE, Moves.FIRE_LASH, Moves.DIRE_CLAW, Moves.SAPPY_SEED ],
   [Species.BERGMITE]: [ Moves.STONE_AXE, Moves.METAL_BURST, Moves.BODY_PRESS, Moves.GLACIAL_LANCE ],
   [Species.NOIBAT]: [ Moves.AEROBLAST, Moves.OVERDRIVE, Moves.NASTY_PLOT, Moves.CLANGING_SCALES ],
-  [Species.XERNEAS]: [ Moves.EARTH_POWER, Moves.SPRINGTIDE_STORM, Moves.STRENGTH_SAP, Moves.TAIL_GLOW ],
+  [Species.XERNEAS]: [ Moves.EARTH_POWER, Moves.SPRINGTIDE_STORM, Moves.STORED_POWER, Moves.STRENGTH_SAP ],
   [Species.YVELTAL]: [ Moves.SLUDGE_WAVE, Moves.POWER_TRIP, Moves.FIERY_WRATH, Moves.CLANGOROUS_SOUL ],
-  [Species.ZYGARDE]: [ Moves.DRAGON_DARTS, Moves.HEAL_ORDER, Moves.CLANGOROUS_SOUL, Moves.DOUBLE_IRON_BASH ],
+  [Species.ZYGARDE]: [ Moves.DRAGON_DARTS, Moves.V_CREATE, Moves.CLANGOROUS_SOUL, Moves.HEAL_ORDER ],
   [Species.DIANCIE]: [ Moves.MAGICAL_TORQUE, Moves.FIERY_DANCE, Moves.SHORE_UP, Moves.GEOMANCY ],
   [Species.HOOPA]: [ Moves.PHOTON_GEYSER, Moves.SECRET_SWORD, Moves.FIERY_WRATH, Moves.SHELL_SMASH ],
   [Species.VOLCANION]: [ Moves.HYDRO_STEAM, Moves.CALM_MIND, Moves.SEARING_SHOT, Moves.THUNDERCLAP ],
@@ -383,7 +383,7 @@ export const speciesEggMoves = {
   [Species.POPPLIO]: [ Moves.PSYCHIC_NOISE, Moves.MOONLIGHT, Moves.OVERDRIVE, Moves.TORCH_SONG ],
   [Species.PIKIPEK]: [ Moves.DUAL_WINGBEAT, Moves.BONE_RUSH, Moves.BURNING_BULWARK, Moves.POPULATION_BOMB ],
   [Species.YUNGOOS]: [ Moves.EXTREME_SPEED, Moves.KNOCK_OFF, Moves.TIDY_UP, Moves.MULTI_ATTACK ],
-  [Species.GRUBBIN]: [ Moves.ICE_BEAM, Moves.EARTH_POWER, Moves.THUNDERCLAP, Moves.QUIVER_DANCE ],
+  [Species.GRUBBIN]: [ Moves.ICE_BEAM, Moves.EARTH_POWER, Moves.CALM_MIND, Moves.THUNDERCLAP ],
   [Species.CRABRAWLER]: [ Moves.JET_PUNCH, Moves.SHORE_UP, Moves.MACH_PUNCH, Moves.SURGING_STRIKES ],
   [Species.ORICORIO]: [ Moves.QUIVER_DANCE, Moves.FIERY_DANCE, Moves.THUNDERCLAP, Moves.OBLIVION_WING ],
   [Species.CUTIEFLY]: [ Moves.STICKY_WEB, Moves.SLEEP_POWDER, Moves.HEAT_WAVE, Moves.SPARKLY_SWIRL ],
@@ -404,7 +404,7 @@ export const speciesEggMoves = {
   [Species.SANDYGAST]: [ Moves.BITTER_MALICE, Moves.SPLISHY_SPLASH, Moves.TAKE_HEART, Moves.SALT_CURE ],
   [Species.PYUKUMUKU]: [ Moves.COMEUPPANCE, Moves.BANEFUL_BUNKER, Moves.TOXIC_SPIKES, Moves.SALT_CURE ],
   [Species.TYPE_NULL]: [ Moves.DIRE_CLAW, Moves.RECOVER, Moves.COMBAT_TORQUE, Moves.NO_RETREAT ],
-  [Species.MINIOR]: [ Moves.EARTH_POWER, Moves.FLOATY_FALL, Moves.ZING_ZAP, Moves.DIAMOND_STORM ],
+  [Species.MINIOR]: [ Moves.EARTH_POWER, Moves.FLOATY_FALL, Moves.TRI_ATTACK, Moves.DIAMOND_STORM ],
   [Species.KOMALA]: [ Moves.SLACK_OFF, Moves.EXTREME_SPEED, Moves.KNOCK_OFF, Moves.COLLISION_COURSE ],
   [Species.TURTONATOR]: [ Moves.BURNING_BULWARK, Moves.MORNING_SUN, Moves.BODY_PRESS, Moves.CORE_ENFORCER ],
   [Species.TOGEDEMARU]: [ Moves.FAKE_OUT, Moves.METAL_BURST, Moves.METEOR_MASH, Moves.AURA_WHEEL ],
@@ -415,7 +415,7 @@ export const speciesEggMoves = {
   [Species.JANGMO_O]: [ Moves.BODY_PRESS, Moves.SHELL_SIDE_ARM, Moves.SECRET_SWORD, Moves.GLAIVE_RUSH ],
   [Species.TAPU_KOKO]: [ Moves.MAGICAL_TORQUE, Moves.TRIPLE_AXEL, Moves.SWORDS_DANCE, Moves.BOLT_STRIKE ],
   [Species.TAPU_LELE]: [ Moves.MOONLIGHT, Moves.NASTY_PLOT, Moves.HEAT_WAVE, Moves.EXPANDING_FORCE ],
-  [Species.TAPU_BULU]: [ Moves.SAPPY_SEED, Moves.DRAIN_PUNCH, Moves.MAGICAL_TORQUE, Moves.VICTORY_DANCE ],
+  [Species.TAPU_BULU]: [ Moves.SAPPY_SEED, Moves.LANDS_WRATH, Moves.MAGICAL_TORQUE, Moves.VICTORY_DANCE ],
   [Species.TAPU_FINI]: [ Moves.SPRINGTIDE_STORM, Moves.EARTH_POWER, Moves.RECOVER, Moves.QUIVER_DANCE ],
   [Species.COSMOG]: [ Moves.PHOTON_GEYSER, Moves.PRECIPICE_BLADES, Moves.SACRED_FIRE, Moves.ASTRAL_BARRAGE ],
   [Species.NIHILEGO]: [ Moves.STRENGTH_SAP, Moves.MALIGNANT_CHAIN, Moves.EARTH_POWER, Moves.QUIVER_DANCE ],
@@ -423,7 +423,7 @@ export const speciesEggMoves = {
   [Species.PHEROMOSA]: [ Moves.SECRET_SWORD, Moves.MAKE_IT_RAIN, Moves.ATTACK_ORDER, Moves.DIAMOND_STORM ],
   [Species.XURKITREE]: [ Moves.FLAMETHROWER, Moves.GIGA_DRAIN, Moves.TAIL_GLOW, Moves.THUNDERCLAP ],
   [Species.CELESTEELA]: [ Moves.RECOVER, Moves.BUZZY_BUZZ, Moves.EARTH_POWER, Moves.OBLIVION_WING ],
-  [Species.KARTANA]: [ Moves.MIGHTY_CLEAVE, Moves.PSYBLADE, Moves.BITTER_BLADE, Moves.BEHEMOTH_BLADE ],
+  [Species.KARTANA]: [ Moves.MIGHTY_CLEAVE, Moves.DUAL_CHOP, Moves.BITTER_BLADE, Moves.BEHEMOTH_BLADE ],
   [Species.GUZZLORD]: [ Moves.SUCKER_PUNCH, Moves.COMEUPPANCE, Moves.SLACK_OFF, Moves.SHED_TAIL ],
   [Species.NECROZMA]: [ Moves.DYNAMAX_CANNON, Moves.SACRED_FIRE, Moves.ASTRAL_BARRAGE, Moves.CLANGOROUS_SOUL ],
   [Species.MAGEARNA]: [ Moves.STRENGTH_SAP, Moves.EARTH_POWER, Moves.MOONBLAST, Moves.MAKE_IT_RAIN ],
@@ -435,13 +435,13 @@ export const speciesEggMoves = {
   [Species.MELTAN]: [ Moves.BULLET_PUNCH, Moves.DRAIN_PUNCH, Moves.BULK_UP, Moves.PLASMA_FISTS ],
   [Species.ALOLA_RATTATA]: [ Moves.FALSE_SURRENDER, Moves.PSYCHIC_FANGS, Moves.COIL, Moves.EXTREME_SPEED ],
   [Species.ALOLA_SANDSHREW]: [ Moves.SPIKY_SHIELD, Moves.LIQUIDATION, Moves.SHIFT_GEAR, Moves.GLACIAL_LANCE ],
-  [Species.ALOLA_VULPIX]: [ Moves.MOONBLAST, Moves.PARTING_SHOT, Moves.EARTH_POWER, Moves.REVIVAL_BLESSING ],
-  [Species.ALOLA_DIGLETT]: [ Moves.THOUSAND_WAVES, Moves.SWORDS_DANCE, Moves.TRIPLE_DIVE, Moves.MOUNTAIN_GALE ],
+  [Species.ALOLA_VULPIX]: [ Moves.MOONBLAST, Moves.GLARE, Moves.MYSTICAL_FIRE, Moves.REVIVAL_BLESSING ],
+  [Species.ALOLA_DIGLETT]: [ Moves.THOUSAND_WAVES, Moves.SWORDS_DANCE, Moves.TRIPLE_DIVE, Moves.PYRO_BALL ],
   [Species.ALOLA_MEOWTH]: [ Moves.BADDY_BAD, Moves.BUZZY_BUZZ, Moves.PARTING_SHOT, Moves.MAKE_IT_RAIN ],
   [Species.ALOLA_GEODUDE]: [ Moves.THOUSAND_WAVES, Moves.BULK_UP, Moves.STONE_AXE, Moves.EXTREME_SPEED ],
   [Species.ALOLA_GRIMER]: [ Moves.SUCKER_PUNCH, Moves.BARB_BARRAGE, Moves.RECOVER, Moves.SURGING_STRIKES ],
 
-  [Species.GROOKEY]: [ Moves.HIGH_HORSEPOWER, Moves.CLANGOROUS_SOUL, Moves.GRASSY_GLIDE, Moves.SAPPY_SEED ],
+  [Species.GROOKEY]: [ Moves.ROCK_SLIDE, Moves.PLAY_ROUGH, Moves.GRASSY_GLIDE, Moves.CLANGOROUS_SOUL ],
   [Species.SCORBUNNY]: [ Moves.EXTREME_SPEED, Moves.HIGH_JUMP_KICK, Moves.TRIPLE_AXEL, Moves.BOLT_STRIKE ],
   [Species.SOBBLE]: [ Moves.AEROBLAST, Moves.FROST_BREATH, Moves.ENERGY_BALL, Moves.NASTY_PLOT ],
   [Species.SKWOVET]: [ Moves.SUCKER_PUNCH, Moves.SLACK_OFF, Moves.COIL, Moves.POPULATION_BOMB ],
@@ -453,18 +453,18 @@ export const speciesEggMoves = {
   [Species.CHEWTLE]: [ Moves.ICE_FANG, Moves.PSYCHIC_FANGS, Moves.SHELL_SMASH, Moves.MIGHTY_CLEAVE ],
   [Species.YAMPER]: [ Moves.ICE_FANG, Moves.SWORDS_DANCE, Moves.THUNDER_FANG, Moves.BOLT_STRIKE ],
   [Species.ROLYCOLY]: [ Moves.BITTER_BLADE, Moves.BODY_PRESS, Moves.BULK_UP, Moves.DIAMOND_STORM ],
-  [Species.APPLIN]: [ Moves.CORE_ENFORCER, Moves.DRAGON_HAMMER, Moves.FLOWER_TRICK, Moves.MATCHA_GOTCHA ],
+  [Species.APPLIN]: [ Moves.CORE_ENFORCER, Moves.COMBAT_TORQUE, Moves.SAPPY_SEED, Moves.MATCHA_GOTCHA ],
   [Species.SILICOBRA]: [ Moves.SHORE_UP, Moves.SHED_TAIL, Moves.MOUNTAIN_GALE, Moves.THOUSAND_ARROWS ],
   [Species.CRAMORANT]: [ Moves.APPLE_ACID, Moves.SURF, Moves.BOLT_BEAK, Moves.OBLIVION_WING ],
   [Species.ARROKUDA]: [ Moves.SUPERCELL_SLAM, Moves.TRIPLE_DIVE, Moves.ICE_SPINNER, Moves.SWORDS_DANCE ],
-  [Species.TOXEL]: [ Moves.NASTY_PLOT, Moves.BUG_BUZZ, Moves.SPARKLING_ARIA, Moves.TORCH_SONG ],
+  [Species.TOXEL]: [ Moves.BUZZY_BUZZ, Moves.BUG_BUZZ, Moves.SPARKLING_ARIA, Moves.TORCH_SONG ],
   [Species.SIZZLIPEDE]: [ Moves.BURNING_BULWARK, Moves.ZING_ZAP, Moves.FIRST_IMPRESSION, Moves.BITTER_BLADE ],
   [Species.CLOBBOPUS]: [ Moves.STORM_THROW, Moves.JET_PUNCH, Moves.MACH_PUNCH, Moves.SURGING_STRIKES ],
   [Species.SINISTEA]: [ Moves.SPLISHY_SPLASH, Moves.MATCHA_GOTCHA, Moves.DRAINING_KISS, Moves.MOONGEIST_BEAM ],
   [Species.HATENNA]: [ Moves.RECOVER, Moves.MOONBLAST, Moves.BUZZY_BUZZ, Moves.TORCH_SONG ],
   [Species.IMPIDIMP]: [ Moves.SLACK_OFF, Moves.PARTING_SHOT, Moves.OCTOLOCK, Moves.WICKED_BLOW ],
   [Species.MILCERY]: [ Moves.MOONBLAST, Moves.CHILLY_RECEPTION, Moves.EARTH_POWER, Moves.GEOMANCY ],
-  [Species.FALINKS]: [ Moves.BATON_PASS, Moves.POWER_TRIP, Moves.HEAL_ORDER, Moves.COMBAT_TORQUE ],
+  [Species.FALINKS]: [ Moves.BATON_PASS, Moves.POWER_TRIP, Moves.COMBAT_TORQUE, Moves.HEAL_ORDER ],
   [Species.PINCURCHIN]: [ Moves.TRICK_ROOM, Moves.VOLT_SWITCH, Moves.STRENGTH_SAP, Moves.THUNDERCLAP ],
   [Species.SNOM]: [ Moves.FROST_BREATH, Moves.HEAL_ORDER, Moves.EARTH_POWER, Moves.SPORE ],
   [Species.STONJOURNER]: [ Moves.BODY_PRESS, Moves.HELPING_HAND, Moves.ACCELEROCK, Moves.DIAMOND_STORM ],
@@ -503,9 +503,9 @@ export const speciesEggMoves = {
   [Species.GALAR_STUNFISK]: [ Moves.SPIKY_SHIELD, Moves.THOUSAND_ARROWS, Moves.STRENGTH_SAP, Moves.DOUBLE_IRON_BASH ],
   [Species.HISUI_GROWLITHE]: [ Moves.WAVE_CRASH, Moves.HEAD_SMASH, Moves.VOLT_TACKLE, Moves.DRAGON_DANCE ],
   [Species.HISUI_VOLTORB]: [ Moves.FROST_BREATH, Moves.NASTY_PLOT, Moves.APPLE_ACID, Moves.ELECTRO_DRIFT ],
-  [Species.HISUI_QWILFISH]: [ Moves.CEASELESS_EDGE, Moves.KNOCK_OFF, Moves.RECOVER, Moves.FISHIOUS_REND ],
+  [Species.HISUI_QWILFISH]: [ Moves.CEASELESS_EDGE, Moves.BANEFUL_BUNKER, Moves.RECOVER, Moves.FISHIOUS_REND ],
   [Species.HISUI_SNEASEL]: [ Moves.DRAIN_PUNCH, Moves.KNOCK_OFF, Moves.PSYCHIC_FANGS, Moves.TRIPLE_AXEL ],
-  [Species.HISUI_ZORUA]: [ Moves.MOONBLAST, Moves.HYPER_VOICE, Moves.PARTING_SHOT, Moves.BLOOD_MOON ],
+  [Species.HISUI_ZORUA]: [ Moves.MOONBLAST, Moves.SECRET_SWORD, Moves.PARTING_SHOT, Moves.BLOOD_MOON ],
 
   [Species.SPRIGATITO]: [ Moves.FIRE_LASH, Moves.TRIPLE_AXEL, Moves.SUCKER_PUNCH, Moves.WICKED_BLOW ],
   [Species.FUECOCO]: [ Moves.ALLURING_VOICE, Moves.SLACK_OFF, Moves.OVERDRIVE, Moves.MOONGEIST_BEAM ],
@@ -521,7 +521,7 @@ export const speciesEggMoves = {
   [Species.NACLI]: [ Moves.BODY_PRESS, Moves.TOXIC, Moves.CURSE, Moves.DIAMOND_STORM ],
   [Species.CHARCADET]: [ Moves.SACRED_SWORD, Moves.PHOTON_GEYSER, Moves.MOONBLAST, Moves.SPECTRAL_THIEF ],
   [Species.TADBULB]: [ Moves.PARABOLIC_CHARGE, Moves.SCALD, Moves.EARTH_POWER, Moves.ELECTRO_SHOT ],
-  [Species.WATTREL]: [ Moves.NASTY_PLOT, Moves.SPLISHY_SPLASH, Moves.SANDSEAR_STORM, Moves.ELECTRO_SHOT ],
+  [Species.WATTREL]: [ Moves.NASTY_PLOT, Moves.SPLISHY_SPLASH, Moves.SANDSEAR_STORM, Moves.WILDBOLT_STORM ],
   [Species.MASCHIFF]: [ Moves.PARTING_SHOT, Moves.COMBAT_TORQUE, Moves.PSYCHIC_FANGS, Moves.NO_RETREAT ],
   [Species.SHROODLE]: [ Moves.GASTRO_ACID, Moves.PARTING_SHOT, Moves.TOXIC, Moves.SKETCH ],
   [Species.BRAMBLIN]: [ Moves.TAILWIND, Moves.STRENGTH_SAP, Moves.FLOWER_TRICK, Moves.LAST_RESPECTS ],
@@ -538,7 +538,7 @@ export const speciesEggMoves = {
   [Species.CYCLIZAR]: [ Moves.PARTING_SHOT, Moves.FIRE_LASH, Moves.MAGICAL_TORQUE, Moves.GLAIVE_RUSH ],
   [Species.ORTHWORM]: [ Moves.SIZZLY_SLIDE, Moves.COIL, Moves.BODY_PRESS, Moves.SHORE_UP ],
   [Species.GLIMMET]: [ Moves.CALM_MIND, Moves.GIGA_DRAIN, Moves.FIERY_DANCE, Moves.MALIGNANT_CHAIN ],
-  [Species.GREAVARD]: [ Moves.SHADOW_BONE, Moves.YAWN, Moves.SHORE_UP, Moves.COLLISION_COURSE ],
+  [Species.GREAVARD]: [ Moves.SHADOW_BONE, Moves.SIZZLY_SLIDE, Moves.SHORE_UP, Moves.COLLISION_COURSE ],
   [Species.FLAMIGO]: [ Moves.THUNDEROUS_KICK, Moves.TRIPLE_AXEL, Moves.FLOATY_FALL, Moves.VICTORY_DANCE ],
   [Species.CETODDLE]: [ Moves.ZING_ZAP, Moves.HIGH_HORSEPOWER, Moves.SLACK_OFF, Moves.DRAGON_DANCE ],
   [Species.VELUZA]: [ Moves.PSYBLADE, Moves.LEAF_BLADE, Moves.CEASELESS_EDGE, Moves.BITTER_BLADE ],
@@ -550,7 +550,7 @@ export const speciesEggMoves = {
   [Species.FLUTTER_MANE]: [ Moves.MOONLIGHT, Moves.NASTY_PLOT, Moves.EARTH_POWER, Moves.MOONGEIST_BEAM ],
   [Species.SLITHER_WING]: [ Moves.MIGHTY_CLEAVE, Moves.THUNDEROUS_KICK, Moves.FIRE_LASH, Moves.VICTORY_DANCE ],
   [Species.SANDY_SHOCKS]: [ Moves.MORNING_SUN, Moves.ICE_BEAM, Moves.NASTY_PLOT, Moves.THUNDERCLAP ],
-  [Species.IRON_TREADS]: [ Moves.FUSION_BOLT, Moves.BULK_UP, Moves.SHORE_UP, Moves.SUNSTEEL_STRIKE ],
+  [Species.IRON_TREADS]: [ Moves.FUSION_BOLT, Moves.SHIFT_GEAR, Moves.SHORE_UP, Moves.SUNSTEEL_STRIKE ],
   [Species.IRON_BUNDLE]: [ Moves.EARTH_POWER, Moves.SPLISHY_SPLASH, Moves.VOLT_SWITCH, Moves.NASTY_PLOT ],
   [Species.IRON_HANDS]: [ Moves.DRAIN_PUNCH, Moves.BULK_UP, Moves.PLASMA_FISTS, Moves.ICE_HAMMER ],
   [Species.IRON_JUGULIS]: [ Moves.FIERY_WRATH, Moves.ROOST, Moves.NASTY_PLOT, Moves.OBLIVION_WING ],
@@ -562,22 +562,22 @@ export const speciesEggMoves = {
   [Species.CHIEN_PAO]: [ Moves.KNOCK_OFF, Moves.PARTING_SHOT, Moves.TRIPLE_AXEL, Moves.BITTER_BLADE ],
   [Species.TING_LU]: [ Moves.SHORE_UP, Moves.CEASELESS_EDGE, Moves.SAPPY_SEED, Moves.PRECIPICE_BLADES ],
   [Species.CHI_YU]: [ Moves.FIERY_WRATH, Moves.HYDRO_STEAM, Moves.MORNING_SUN, Moves.BLUE_FLARE ],
-  [Species.ROARING_MOON]: [ Moves.FIRE_LASH, Moves.DRAGON_HAMMER, Moves.SUCKER_PUNCH, Moves.WICKED_BLOW ],
+  [Species.ROARING_MOON]: [ Moves.FIRE_LASH, Moves.DRAGON_HAMMER, Moves.METEOR_MASH, Moves.DRAGON_ASCENT ],
   [Species.IRON_VALIANT]: [ Moves.PLASMA_FISTS, Moves.NO_RETREAT, Moves.SECRET_SWORD, Moves.MAGICAL_TORQUE ],
   [Species.KORAIDON]: [ Moves.SUNSTEEL_STRIKE, Moves.SOLAR_BLADE, Moves.DRAGON_DARTS, Moves.BITTER_BLADE ],
-  [Species.MIRAIDON]: [ Moves.ICE_BEAM, Moves.CLANGOROUS_SOUL, Moves.CORE_ENFORCER, Moves.RISING_VOLTAGE ],
+  [Species.MIRAIDON]: [ Moves.FROST_BREATH, Moves.WILDBOLT_STORM, Moves.SPACIAL_REND, Moves.RISING_VOLTAGE ],
   [Species.WALKING_WAKE]: [ Moves.BOUNCY_BUBBLE, Moves.FUSION_FLARE, Moves.SLUDGE_WAVE, Moves.CORE_ENFORCER ],
   [Species.IRON_LEAVES]: [ Moves.BITTER_BLADE, Moves.U_TURN, Moves.MIGHTY_CLEAVE, Moves.VICTORY_DANCE ],
   [Species.POLTCHAGEIST]: [ Moves.PARABOLIC_CHARGE, Moves.BOUNCY_BUBBLE, Moves.LEECH_SEED, Moves.SPARKLY_SWIRL ],
   [Species.OKIDOGI]: [ Moves.COMBAT_TORQUE, Moves.TIDY_UP, Moves.DIRE_CLAW, Moves.WICKED_BLOW ],
-  [Species.MUNKIDORI]: [ Moves.PSYSTRIKE, Moves.HEAT_WAVE, Moves.EARTH_POWER, Moves.MALIGNANT_CHAIN ],
+  [Species.MUNKIDORI]: [ Moves.TWIN_BEAM, Moves.HEAT_WAVE, Moves.EARTH_POWER, Moves.MALIGNANT_CHAIN ],
   [Species.FEZANDIPITI]: [ Moves.BARB_BARRAGE, Moves.BONEMERANG, Moves.TRIPLE_AXEL, Moves.VICTORY_DANCE ],
   [Species.OGERPON]: [ Moves.SLEEP_POWDER, Moves.BONEMERANG, Moves.TRIPLE_AXEL, Moves.FLOWER_TRICK ],
   [Species.GOUGING_FIRE]: [ Moves.EXTREME_SPEED, Moves.BULK_UP, Moves.SACRED_FIRE, Moves.GLAIVE_RUSH ],
   [Species.RAGING_BOLT]: [ Moves.NASTY_PLOT, Moves.FLAMETHROWER, Moves.MORNING_SUN, Moves.ELECTRO_DRIFT ],
   [Species.IRON_BOULDER]: [ Moves.PSYBLADE, Moves.KOWTOW_CLEAVE, Moves.STONE_AXE, Moves.BITTER_BLADE ],
   [Species.IRON_CROWN]: [ Moves.NASTY_PLOT, Moves.SECRET_SWORD, Moves.PSYSTRIKE, Moves.ELECTRO_DRIFT ],
-  [Species.TERAPAGOS]: [ Moves.MOONBLAST, Moves.RECOVER, Moves.ICE_BEAM, Moves.SHELL_SMASH ],
+  [Species.TERAPAGOS]: [ Moves.MOONBLAST, Moves.NASTY_PLOT, Moves.ASTRAL_BARRAGE, Moves.RECOVER ],
   [Species.PECHARUNT]: [ Moves.TAKE_HEART, Moves.BODY_PRESS, Moves.SAPPY_SEED, Moves.ASTRAL_BARRAGE ],
   [Species.PALDEA_TAUROS]: [ Moves.NO_RETREAT, Moves.BLAZING_TORQUE, Moves.AQUA_STEP, Moves.THUNDEROUS_KICK ],
   [Species.PALDEA_WOOPER]: [ Moves.STONE_AXE, Moves.RECOVER, Moves.BANEFUL_BUNKER, Moves.BARB_BARRAGE ],
@@ -587,11 +587,11 @@ export const speciesEggMoves = {
 function parseEggMoves(content: string): void {
   let output = "";
 
-  const speciesNames = Utils.getEnumKeys(Species);
-  const speciesValues = Utils.getEnumValues(Species);
+  const speciesNames = getEnumKeys(Species);
+  const speciesValues = getEnumValues(Species);
   const lines = content.split(/\n/g);
 
-  lines.forEach((line, l) => {
+  for (const line of lines) {
     const cols = line.split(",").slice(0, 5);
     const moveNames = allMoves.map(m => m.name.replace(/ \([A-Z]\)$/, "").toLowerCase());
     const enumSpeciesName = cols[0].toUpperCase().replace(/[ -]/g, "_");
@@ -612,7 +612,7 @@ function parseEggMoves(content: string): void {
     if (eggMoves.find(m => m !== Moves.NONE)) {
       output += `[Species.${Species[species]}]: [ ${eggMoves.map(m => `Moves.${Moves[m]}`).join(", ")} ],\n`;
     }
-  });
+  }
 
   console.log(output);
 }
diff --git a/src/data/balance/passives.ts b/src/data/balance/passives.ts
index df347909d49..73310cc2116 100644
--- a/src/data/balance/passives.ts
+++ b/src/data/balance/passives.ts
@@ -11,580 +11,1093 @@ interface StarterPassiveAbilities {
 
 export const starterPassiveAbilities: StarterPassiveAbilities = {
   [Species.BULBASAUR]: { 0: Abilities.GRASSY_SURGE },
-  [Species.CHARMANDER]: { 0: Abilities.BEAST_BOOST },
+  [Species.IVYSAUR]: { 0: Abilities.GRASSY_SURGE },
+  [Species.VENUSAUR]: { 0: Abilities.GRASSY_SURGE, 1: Abilities.SEED_SOWER, 2: Abilities.FLOWER_VEIL },
+  [Species.CHARMANDER]: { 0: Abilities.SHEER_FORCE },
+  [Species.CHARMELEON]: { 0: Abilities.BEAST_BOOST },
+  [Species.CHARIZARD]: { 0: Abilities.BEAST_BOOST, 1: Abilities.LEVITATE, 2: Abilities.TURBOBLAZE, 3: Abilities.UNNERVE },
   [Species.SQUIRTLE]: { 0: Abilities.DAUNTLESS_SHIELD },
-  [Species.CATERPIE]: { 0: Abilities.MAGICIAN },
-  [Species.WEEDLE]: { 0: Abilities.TINTED_LENS },
+  [Species.WARTORTLE]: { 0: Abilities.DAUNTLESS_SHIELD },
+  [Species.BLASTOISE]: { 0: Abilities.DAUNTLESS_SHIELD, 1: Abilities.BULLETPROOF, 2: Abilities.BULLETPROOF },
+  [Species.CATERPIE]: { 0: Abilities.GLUTTONY },
+  [Species.METAPOD]: { 0: Abilities.STURDY },
+  [Species.BUTTERFREE]: { 0: Abilities.MAGICIAN, 1: Abilities.MAGICIAN },
+  [Species.WEEDLE]: { 0: Abilities.POISON_TOUCH },
+  [Species.KAKUNA]: { 0: Abilities.STURDY },
+  [Species.BEEDRILL]: { 0: Abilities.ADAPTABILITY, 1: Abilities.TINTED_LENS },
   [Species.PIDGEY]: { 0: Abilities.SHEER_FORCE },
+  [Species.PIDGEOTTO]: { 0: Abilities.SHEER_FORCE },
+  [Species.PIDGEOT]: { 0: Abilities.SHEER_FORCE, 1: Abilities.SHEER_FORCE },
   [Species.RATTATA]: { 0: Abilities.STRONG_JAW },
+  [Species.RATICATE]: { 0: Abilities.STRONG_JAW },
   [Species.SPEAROW]: { 0: Abilities.MOXIE },
+  [Species.FEAROW]: { 0: Abilities.MOXIE },
   [Species.EKANS]: { 0: Abilities.REGENERATOR },
+  [Species.ARBOK]: { 0: Abilities.REGENERATOR },
   [Species.SANDSHREW]: { 0: Abilities.TOUGH_CLAWS },
+  [Species.SANDSLASH]: { 0: Abilities.TOUGH_CLAWS },
   [Species.NIDORAN_F]: { 0: Abilities.FLARE_BOOST },
+  [Species.NIDORINA]: { 0: Abilities.FLARE_BOOST },
+  [Species.NIDOQUEEN]: { 0: Abilities.FLARE_BOOST },
   [Species.NIDORAN_M]: { 0: Abilities.GUTS },
+  [Species.NIDORINO]: { 0: Abilities.GUTS },
+  [Species.NIDOKING]: { 0: Abilities.GUTS },
   [Species.VULPIX]: { 0: Abilities.FUR_COAT },
+  [Species.NINETALES]: { 0: Abilities.FUR_COAT },
   [Species.ZUBAT]: { 0: Abilities.INTIMIDATE },
+  [Species.GOLBAT]: { 0: Abilities.INTIMIDATE },
+  [Species.CROBAT]: { 0: Abilities.INTIMIDATE },
   [Species.ODDISH]: { 0: Abilities.TRIAGE },
+  [Species.GLOOM]: { 0: Abilities.TRIAGE },
+  [Species.VILEPLUME]: { 0: Abilities.TRIAGE },
+  [Species.BELLOSSOM]: { 0: Abilities.TRIAGE },
   [Species.PARAS]: { 0: Abilities.TRIAGE },
-  [Species.VENONAT]: { 0: Abilities.SIMPLE },
+  [Species.PARASECT]: { 0: Abilities.TRIAGE },
+  [Species.VENONAT]: { 0: Abilities.FLUFFY },
+  [Species.VENOMOTH]: { 0: Abilities.SIMPLE },
   [Species.DIGLETT]: { 0: Abilities.STURDY },
-  [Species.MEOWTH]: { 0: Abilities.TOUGH_CLAWS },
+  [Species.DUGTRIO]: { 0: Abilities.STURDY },
+  [Species.MEOWTH]: { 0: Abilities.TOUGH_CLAWS, 1: Abilities.TOUGH_CLAWS },
+  [Species.PERSIAN]: { 0: Abilities.TOUGH_CLAWS },
   [Species.PSYDUCK]: { 0: Abilities.SIMPLE },
+  [Species.GOLDUCK]: { 0: Abilities.SIMPLE },
   [Species.MANKEY]: { 0: Abilities.IRON_FIST },
+  [Species.PRIMEAPE]: { 0: Abilities.IRON_FIST },
+  [Species.ANNIHILAPE]: { 0: Abilities.IRON_FIST },
   [Species.GROWLITHE]: { 0: Abilities.FLUFFY },
+  [Species.ARCANINE]: { 0: Abilities.FLUFFY },
   [Species.POLIWAG]: { 0: Abilities.NO_GUARD },
-  [Species.ABRA]: { 0: Abilities.MAGICIAN },
+  [Species.POLIWHIRL]: { 0: Abilities.NO_GUARD },
+  [Species.POLIWRATH]: { 0: Abilities.NO_GUARD },
+  [Species.POLITOED]: { 0: Abilities.NO_GUARD },
+  [Species.ABRA]: { 0: Abilities.COMATOSE },
+  [Species.KADABRA]: { 0: Abilities.MAGICIAN },
+  [Species.ALAKAZAM]: { 0: Abilities.MAGICIAN, 1: Abilities.MAGICIAN },
   [Species.MACHOP]: { 0: Abilities.QUICK_FEET },
+  [Species.MACHOKE]: { 0: Abilities.QUICK_FEET },
+  [Species.MACHAMP]: { 0: Abilities.QUICK_FEET, 1: Abilities.QUICK_FEET },
   [Species.BELLSPROUT]: { 0: Abilities.FLOWER_GIFT },
+  [Species.WEEPINBELL]: { 0: Abilities.FLOWER_GIFT },
+  [Species.VICTREEBEL]: { 0: Abilities.FLOWER_GIFT },
   [Species.TENTACOOL]: { 0: Abilities.TOXIC_CHAIN },
+  [Species.TENTACRUEL]: { 0: Abilities.TOXIC_CHAIN },
   [Species.GEODUDE]: { 0: Abilities.DRY_SKIN },
+  [Species.GRAVELER]: { 0: Abilities.DRY_SKIN },
+  [Species.GOLEM]: { 0: Abilities.DRY_SKIN },
   [Species.PONYTA]: { 0: Abilities.MAGIC_GUARD },
+  [Species.RAPIDASH]: { 0: Abilities.MAGIC_GUARD },
   [Species.SLOWPOKE]: { 0: Abilities.UNAWARE },
+  [Species.SLOWBRO]: { 0: Abilities.UNAWARE, 1: Abilities.REGENERATOR },
+  [Species.SLOWKING]: { 0: Abilities.UNAWARE },
   [Species.MAGNEMITE]: { 0: Abilities.LEVITATE },
+  [Species.MAGNETON]: { 0: Abilities.LEVITATE },
+  [Species.MAGNEZONE]: { 0: Abilities.LEVITATE },
   [Species.FARFETCHD]: { 0: Abilities.SNIPER },
   [Species.DODUO]: { 0: Abilities.PARENTAL_BOND },
+  [Species.DODRIO]: { 0: Abilities.PARENTAL_BOND },
   [Species.SEEL]: { 0: Abilities.WATER_BUBBLE },
+  [Species.DEWGONG]: { 0: Abilities.WATER_BUBBLE },
   [Species.GRIMER]: { 0: Abilities.WATER_ABSORB },
-  [Species.SHELLDER]: { 0: Abilities.ICE_SCALES },
+  [Species.MUK]: { 0: Abilities.WATER_ABSORB },
+  [Species.SHELLDER]: { 0: Abilities.STURDY },
+  [Species.CLOYSTER]: { 0: Abilities.ICE_SCALES },
   [Species.GASTLY]: { 0: Abilities.SHADOW_SHIELD },
+  [Species.HAUNTER]: { 0: Abilities.SHADOW_SHIELD },
+  [Species.GENGAR]: { 0: Abilities.SHADOW_SHIELD, 1: Abilities.UNNERVE, 2: Abilities.GLUTTONY },
   [Species.ONIX]: { 0: Abilities.ROCKY_PAYLOAD },
+  [Species.STEELIX]: { 0: Abilities.ROCKY_PAYLOAD, 1: Abilities.SAND_SPIT },
   [Species.DROWZEE]: { 0: Abilities.MAGICIAN },
+  [Species.HYPNO]: { 0: Abilities.MAGICIAN },
   [Species.KRABBY]: { 0: Abilities.UNBURDEN },
+  [Species.KINGLER]: { 0: Abilities.UNBURDEN, 1: Abilities.UNBURDEN },
   [Species.VOLTORB]: { 0: Abilities.TRANSISTOR },
+  [Species.ELECTRODE]: { 0: Abilities.TRANSISTOR },
   [Species.EXEGGCUTE]: { 0: Abilities.RIPEN },
+  [Species.EXEGGUTOR]: { 0: Abilities.RIPEN },
+  [Species.ALOLA_EXEGGUTOR]: { 0: Abilities.UNBURDEN },
   [Species.CUBONE]: { 0: Abilities.PARENTAL_BOND },
+  [Species.MAROWAK]: { 0: Abilities.PARENTAL_BOND },
+  [Species.ALOLA_MAROWAK]: { 0: Abilities.PARENTAL_BOND },
   [Species.LICKITUNG]: { 0: Abilities.CHEEK_POUCH },
-  [Species.KOFFING]: { 0: Abilities.PARENTAL_BOND },
-  [Species.RHYHORN]: { 0: Abilities.FILTER },
+  [Species.LICKILICKY]: { 0: Abilities.CHEEK_POUCH },
+  [Species.KOFFING]: { 0: Abilities.WHITE_SMOKE },
+  [Species.WEEZING]: { 0: Abilities.PARENTAL_BOND },
+  [Species.GALAR_WEEZING]: { 0: Abilities.PARENTAL_BOND },
+  [Species.RHYHORN]: { 0: Abilities.SOLID_ROCK },
+  [Species.RHYDON]: { 0: Abilities.SOLID_ROCK },
+  [Species.RHYPERIOR]: { 0: Abilities.FILTER },
   [Species.TANGELA]: { 0: Abilities.SEED_SOWER },
-  [Species.KANGASKHAN]: { 0: Abilities.TECHNICIAN },
+  [Species.TANGROWTH]: { 0: Abilities.SEED_SOWER },
+  [Species.KANGASKHAN]: { 0: Abilities.TECHNICIAN, 1: Abilities.TECHNICIAN },
   [Species.HORSEA]: { 0: Abilities.DRAGONS_MAW },
+  [Species.SEADRA]: { 0: Abilities.DRAGONS_MAW },
+  [Species.KINGDRA]: { 0: Abilities.MULTISCALE },
   [Species.GOLDEEN]: { 0: Abilities.MULTISCALE },
+  [Species.SEAKING]: { 0: Abilities.MULTISCALE },
   [Species.STARYU]: { 0: Abilities.REGENERATOR },
+  [Species.STARMIE]: { 0: Abilities.REGENERATOR },
   [Species.SCYTHER]: { 0: Abilities.TINTED_LENS },
-  [Species.PINSIR]: { 0: Abilities.TINTED_LENS },
+  [Species.SCIZOR]: { 0: Abilities.TOUGH_CLAWS, 1: Abilities.TOUGH_CLAWS },
+  [Species.KLEAVOR]: { 0: Abilities.WEAK_ARMOR },
+  [Species.PINSIR]: { 0: Abilities.TINTED_LENS, 1: Abilities.MOLD_BREAKER },
   [Species.TAUROS]: { 0: Abilities.STAMINA },
   [Species.MAGIKARP]: { 0: Abilities.MULTISCALE },
-  [Species.LAPRAS]: { 0: Abilities.LIGHTNING_ROD },
+  [Species.GYARADOS]: { 0: Abilities.MULTISCALE, 1: Abilities.MULTISCALE },
+  [Species.LAPRAS]: { 0: Abilities.FILTER, 1: Abilities.FILTER },
   [Species.DITTO]: { 0: Abilities.ADAPTABILITY },
-  [Species.EEVEE]: { 0: Abilities.PICKUP },
-  [Species.PORYGON]: { 0: Abilities.PROTEAN },
+  [Species.EEVEE]: { 0: Abilities.PICKUP, 1: Abilities.PICKUP, 2: Abilities.FLUFFY },
+  [Species.VAPOREON]: { 0: Abilities.REGENERATOR },
+  [Species.JOLTEON]: { 0: Abilities.TRANSISTOR },
+  [Species.FLAREON]: { 0: Abilities.FUR_COAT },
+  [Species.ESPEON]: { 0: Abilities.MAGICIAN },
+  [Species.UMBREON]: { 0: Abilities.TOXIC_CHAIN },
+  [Species.LEAFEON]: { 0: Abilities.GRASSY_SURGE },
+  [Species.GLACEON]: { 0: Abilities.SNOW_WARNING },
+  [Species.SYLVEON]: { 0: Abilities.COMPETITIVE },
+  [Species.PORYGON]: { 0: Abilities.TRANSISTOR },
+  [Species.PORYGON2]: { 0: Abilities.TRANSISTOR },
+  [Species.PORYGON_Z]: { 0: Abilities.PROTEAN },
   [Species.OMANYTE]: { 0: Abilities.STURDY },
+  [Species.OMASTAR]: { 0: Abilities.STURDY },
   [Species.KABUTO]: { 0: Abilities.TOUGH_CLAWS },
-  [Species.AERODACTYL]: { 0: Abilities.ORICHALCUM_PULSE },
+  [Species.KABUTOPS]: { 0: Abilities.TOUGH_CLAWS },
+  [Species.AERODACTYL]: { 0: Abilities.INTIMIDATE, 1: Abilities.ROCKY_PAYLOAD },
   [Species.ARTICUNO]: { 0: Abilities.SNOW_WARNING },
   [Species.ZAPDOS]: { 0: Abilities.DRIZZLE },
   [Species.MOLTRES]: { 0: Abilities.DROUGHT },
-  [Species.DRATINI]: { 0: Abilities.AERILATE },
-  [Species.MEWTWO]: { 0: Abilities.NEUROFORCE },
+  [Species.DRATINI]: { 0: Abilities.MULTISCALE },
+  [Species.DRAGONAIR]: { 0: Abilities.MULTISCALE },
+  [Species.DRAGONITE]: { 0: Abilities.AERILATE },
+  [Species.MEWTWO]: { 0: Abilities.NEUROFORCE, 1: Abilities.NEUROFORCE, 2: Abilities.NEUROFORCE },
   [Species.MEW]: { 0: Abilities.PROTEAN },
 
-  [Species.CHIKORITA]: { 0: Abilities.THICK_FAT },
-  [Species.CYNDAQUIL]: { 0: Abilities.DROUGHT },
+  [Species.CHIKORITA]: { 0: Abilities.CUTE_CHARM },
+  [Species.BAYLEEF]: { 0: Abilities.THICK_FAT },
+  [Species.MEGANIUM]: { 0: Abilities.THICK_FAT },
+  [Species.CYNDAQUIL]: { 0: Abilities.WHITE_SMOKE },
+  [Species.QUILAVA]: { 0: Abilities.DROUGHT },
+  [Species.TYPHLOSION]: { 0: Abilities.DROUGHT },
+  [Species.HISUI_TYPHLOSION]: { 0: Abilities.DROUGHT },
   [Species.TOTODILE]: { 0: Abilities.TOUGH_CLAWS },
+  [Species.CROCONAW]: { 0: Abilities.TOUGH_CLAWS },
+  [Species.FERALIGATR]: { 0: Abilities.TOUGH_CLAWS },
   [Species.SENTRET]: { 0: Abilities.PICKUP },
+  [Species.FURRET]: { 0: Abilities.PICKUP },
   [Species.HOOTHOOT]: { 0: Abilities.AERILATE },
+  [Species.NOCTOWL]: { 0: Abilities.AERILATE },
   [Species.LEDYBA]: { 0: Abilities.PRANKSTER },
+  [Species.LEDIAN]: { 0: Abilities.PRANKSTER },
   [Species.SPINARAK]: { 0: Abilities.PRANKSTER },
+  [Species.ARIADOS]: { 0: Abilities.PRANKSTER },
   [Species.CHINCHOU]: { 0: Abilities.REGENERATOR },
-  [Species.PICHU]: { 0: Abilities.ELECTRIC_SURGE },
-  [Species.CLEFFA]: { 0: Abilities.ANALYTIC },
+  [Species.LANTURN]: { 0: Abilities.REGENERATOR },
+  [Species.PICHU]: { 0: Abilities.ELECTRIC_SURGE, 1: Abilities.STURDY },
+  [Species.PIKACHU]: { 0: Abilities.ELECTRIC_SURGE, 1: Abilities.STURDY, 2: Abilities.COSTAR, 3: Abilities.IRON_FIST, 4: Abilities.QUEENLY_MAJESTY, 5: Abilities.MISTY_SURGE, 6: Abilities.TINTED_LENS, 7: Abilities.LIBERO, 8: Abilities.THICK_FAT },
+  [Species.RAICHU]: { 0: Abilities.ELECTRIC_SURGE },
+  [Species.ALOLA_RAICHU]: { 0: Abilities.ELECTRIC_SURGE },
+  [Species.CLEFFA]: { 0: Abilities.PRANKSTER },
+  [Species.CLEFAIRY]: { 0: Abilities.PRANKSTER },
+  [Species.CLEFABLE]: { 0: Abilities.ANALYTIC },
   [Species.IGGLYBUFF]: { 0: Abilities.HUGE_POWER },
+  [Species.JIGGLYPUFF]: { 0: Abilities.HUGE_POWER },
+  [Species.WIGGLYTUFF]: { 0: Abilities.HUGE_POWER },
   [Species.TOGEPI]: { 0: Abilities.PIXILATE },
-  [Species.NATU]: { 0: Abilities.SHEER_FORCE },
+  [Species.TOGETIC]: { 0: Abilities.PIXILATE },
+  [Species.TOGEKISS]: { 0: Abilities.PIXILATE },
+  [Species.NATU]: { 0: Abilities.TINTED_LENS },
+  [Species.XATU]: { 0: Abilities.SHEER_FORCE },
   [Species.MAREEP]: { 0: Abilities.ELECTROMORPHOSIS },
-  [Species.HOPPIP]: { 0: Abilities.FLUFFY },
+  [Species.FLAAFFY]: { 0: Abilities.ELECTROMORPHOSIS },
+  [Species.AMPHAROS]: { 0: Abilities.ELECTROMORPHOSIS, 1: Abilities.ELECTROMORPHOSIS },
+  [Species.HOPPIP]: { 0: Abilities.WIND_RIDER },
+  [Species.SKIPLOOM]: { 0: Abilities.WIND_RIDER },
+  [Species.JUMPLUFF]: { 0: Abilities.FLUFFY },
   [Species.AIPOM]: { 0: Abilities.SCRAPPY },
+  [Species.AMBIPOM]: { 0: Abilities.SCRAPPY },
   [Species.SUNKERN]: { 0: Abilities.DROUGHT },
-  [Species.YANMA]: { 0: Abilities.SHEER_FORCE },
-  [Species.WOOPER]: { 0: Abilities.COMATOSE },
+  [Species.SUNFLORA]: { 0: Abilities.DROUGHT },
+  [Species.YANMA]: { 0: Abilities.TECHNICIAN },
+  [Species.YANMEGA]: { 0: Abilities.SHEER_FORCE },
+  [Species.WOOPER]: { 0: Abilities.WATER_VEIL },
+  [Species.QUAGSIRE]: { 0: Abilities.COMATOSE },
   [Species.MURKROW]: { 0: Abilities.DARK_AURA },
+  [Species.HONCHKROW]: { 0: Abilities.DARK_AURA },
   [Species.MISDREAVUS]: { 0: Abilities.BEADS_OF_RUIN },
-  [Species.UNOWN]: { 0: Abilities.PICKUP },
+  [Species.MISMAGIUS]: { 0: Abilities.BEADS_OF_RUIN },
+  [Species.UNOWN]: { 0: Abilities.ADAPTABILITY, 1: Abilities.BEAST_BOOST, 2: Abilities.CONTRARY, 3: Abilities.DAZZLING, 4: Abilities.EMERGENCY_EXIT, 5: Abilities.FRIEND_GUARD, 6: Abilities.GOOD_AS_GOLD, 7: Abilities.HONEY_GATHER, 8: Abilities.IMPOSTER, 9: Abilities.JUSTIFIED, 10: Abilities.KLUTZ, 11: Abilities.LIBERO, 12: Abilities.MOODY, 13: Abilities.NEUTRALIZING_GAS, 14: Abilities.OPPORTUNIST, 15: Abilities.PICKUP, 16: Abilities.QUICK_DRAW, 17: Abilities.RUN_AWAY, 18: Abilities.SIMPLE, 19: Abilities.TRACE, 20: Abilities.UNNERVE, 21: Abilities.VICTORY_STAR, 22: Abilities.WANDERING_SPIRIT, 23: Abilities.FAIRY_AURA, 24: Abilities.DARK_AURA, 25: Abilities.AURA_BREAK, 26: Abilities.PURE_POWER, 27: Abilities.UNAWARE },
   [Species.GIRAFARIG]: { 0: Abilities.PARENTAL_BOND },
-  [Species.PINECO]: { 0: Abilities.IRON_BARBS },
+  [Species.FARIGIRAF]: { 0: Abilities.PARENTAL_BOND },
+  [Species.PINECO]: { 0: Abilities.ROUGH_SKIN },
+  [Species.FORRETRESS]: { 0: Abilities.IRON_BARBS },
   [Species.DUNSPARCE]: { 0: Abilities.UNAWARE },
-  [Species.GLIGAR]: { 0: Abilities.TOXIC_BOOST },
+  [Species.DUDUNSPARCE]: { 0: Abilities.UNAWARE, 1: Abilities.UNAWARE },
+  [Species.GLIGAR]: { 0: Abilities.POISON_TOUCH },
+  [Species.GLISCOR]: { 0: Abilities.TOXIC_BOOST },
   [Species.SNUBBULL]: { 0: Abilities.PIXILATE },
+  [Species.GRANBULL]: { 0: Abilities.PIXILATE },
   [Species.QWILFISH]: { 0: Abilities.TOXIC_DEBRIS },
   [Species.SHUCKLE]: { 0: Abilities.HARVEST },
-  [Species.HERACROSS]: { 0: Abilities.TECHNICIAN },
+  [Species.HERACROSS]: { 0: Abilities.TECHNICIAN, 1: Abilities.TECHNICIAN },
   [Species.SNEASEL]: { 0: Abilities.TOUGH_CLAWS },
-  [Species.TEDDIURSA]: { 0: Abilities.THICK_FAT },
-  [Species.SLUGMA]: { 0: Abilities.DESOLATE_LAND },
-  [Species.SWINUB]: { 0: Abilities.SLUSH_RUSH },
+  [Species.WEAVILE]: { 0: Abilities.TOUGH_CLAWS },
+  [Species.TEDDIURSA]: { 0: Abilities.RUN_AWAY },
+  [Species.URSARING]: { 0: Abilities.THICK_FAT },
+  [Species.URSALUNA]: { 0: Abilities.THICK_FAT },
+  [Species.SLUGMA]: { 0: Abilities.DROUGHT },
+  [Species.MAGCARGO]: { 0: Abilities.DESOLATE_LAND },
+  [Species.SWINUB]: { 0: Abilities.UNAWARE },
+  [Species.PILOSWINE]: { 0: Abilities.UNAWARE },
+  [Species.MAMOSWINE]: { 0: Abilities.SLUSH_RUSH },
   [Species.CORSOLA]: { 0: Abilities.STORM_DRAIN },
   [Species.REMORAID]: { 0: Abilities.SIMPLE },
+  [Species.OCTILLERY]: { 0: Abilities.SIMPLE },
   [Species.DELIBIRD]: { 0: Abilities.HUGE_POWER },
   [Species.SKARMORY]: { 0: Abilities.LIGHTNING_ROD },
-  [Species.HOUNDOUR]: { 0: Abilities.LIGHTNING_ROD },
-  [Species.PHANPY]: { 0: Abilities.SPEED_BOOST },
+  [Species.HOUNDOUR]: { 0: Abilities.BALL_FETCH },
+  [Species.HOUNDOOM]: { 0: Abilities.LIGHTNING_ROD, 1: Abilities.LIGHTNING_ROD },
+  [Species.PHANPY]: { 0: Abilities.STURDY },
+  [Species.DONPHAN]: { 0: Abilities.SPEED_BOOST },
   [Species.STANTLER]: { 0: Abilities.SPEED_BOOST },
+  [Species.WYRDEER]: { 0: Abilities.SPEED_BOOST },
   [Species.SMEARGLE]: { 0: Abilities.PRANKSTER },
-  [Species.TYROGUE]: { 0: Abilities.MOXIE },
+  [Species.TYROGUE]: { 0: Abilities.DEFIANT },
+  [Species.HITMONLEE]: { 0: Abilities.SHEER_FORCE },
+  [Species.HITMONCHAN]: { 0: Abilities.MOXIE },
+  [Species.HITMONTOP]: { 0: Abilities.SPEED_BOOST },
   [Species.SMOOCHUM]: { 0: Abilities.PSYCHIC_SURGE },
+  [Species.JYNX]: { 0: Abilities.PSYCHIC_SURGE },
   [Species.ELEKID]: { 0: Abilities.SHEER_FORCE },
+  [Species.ELECTABUZZ]: { 0: Abilities.SHEER_FORCE },
+  [Species.ELECTIVIRE]: { 0: Abilities.SHEER_FORCE },
   [Species.MAGBY]: { 0: Abilities.SHEER_FORCE },
+  [Species.MAGMAR]: { 0: Abilities.SHEER_FORCE },
+  [Species.MAGMORTAR]: { 0: Abilities.SHEER_FORCE },
   [Species.MILTANK]: { 0: Abilities.STAMINA },
   [Species.RAIKOU]: { 0: Abilities.BEAST_BOOST },
   [Species.ENTEI]: { 0: Abilities.BEAST_BOOST },
   [Species.SUICUNE]: { 0: Abilities.BEAST_BOOST },
   [Species.LARVITAR]: { 0: Abilities.SOLID_ROCK },
+  [Species.PUPITAR]: { 0: Abilities.SOLID_ROCK },
+  [Species.TYRANITAR]: { 0: Abilities.SOLID_ROCK, 1: Abilities.SOLID_ROCK },
   [Species.LUGIA]: { 0: Abilities.DELTA_STREAM },
   [Species.HO_OH]: { 0: Abilities.MAGIC_GUARD },
   [Species.CELEBI]: { 0: Abilities.PSYCHIC_SURGE },
 
   [Species.TREECKO]: { 0: Abilities.TINTED_LENS },
+  [Species.GROVYLE]: { 0: Abilities.TINTED_LENS },
+  [Species.SCEPTILE]: { 0: Abilities.TINTED_LENS, 1: Abilities.TINTED_LENS },
   [Species.TORCHIC]: { 0: Abilities.DEFIANT },
-  [Species.MUDKIP]: { 0: Abilities.DRIZZLE },
+  [Species.COMBUSKEN]: { 0: Abilities.DEFIANT },
+  [Species.BLAZIKEN]: { 0: Abilities.DEFIANT, 1: Abilities.DEFIANT },
+  [Species.MUDKIP]: { 0: Abilities.REGENERATOR },
+  [Species.MARSHTOMP]: { 0: Abilities.REGENERATOR },
+  [Species.SWAMPERT]: { 0: Abilities.REGENERATOR, 1: Abilities.DRIZZLE },
   [Species.POOCHYENA]: { 0: Abilities.TOUGH_CLAWS },
+  [Species.MIGHTYENA]: { 0: Abilities.TOUGH_CLAWS },
   [Species.ZIGZAGOON]: { 0: Abilities.RUN_AWAY },
-  [Species.WURMPLE]: { 0: Abilities.SIMPLE },
+  [Species.LINOONE]: { 0: Abilities.RUN_AWAY },
+  [Species.WURMPLE]: { 0: Abilities.GLUTTONY },
+  [Species.SILCOON]: { 0: Abilities.STURDY },
+  [Species.BEAUTIFLY]: { 0: Abilities.SIMPLE },
+  [Species.CASCOON]: { 0: Abilities.STURDY },
+  [Species.DUSTOX]: { 0: Abilities.SIMPLE },
   [Species.LOTAD]: { 0: Abilities.DRIZZLE },
-  [Species.SEEDOT]: { 0: Abilities.SHARPNESS },
+  [Species.LOMBRE]: { 0: Abilities.DRIZZLE },
+  [Species.LUDICOLO]: { 0: Abilities.DRIZZLE },
+  [Species.SEEDOT]: { 0: Abilities.STURDY },
+  [Species.NUZLEAF]: { 0: Abilities.SHARPNESS },
+  [Species.SHIFTRY]: { 0: Abilities.SHARPNESS },
   [Species.TAILLOW]: { 0: Abilities.AERILATE },
-  [Species.WINGULL]: { 0: Abilities.SWIFT_SWIM },
-  [Species.RALTS]: { 0: Abilities.PSYCHIC_SURGE },
+  [Species.SWELLOW]: { 0: Abilities.AERILATE },
+  [Species.WINGULL]: { 0: Abilities.WATER_ABSORB },
+  [Species.PELIPPER]: { 0: Abilities.SWIFT_SWIM },
+  [Species.RALTS]: { 0: Abilities.NEUROFORCE },
+  [Species.KIRLIA]: { 0: Abilities.NEUROFORCE },
+  [Species.GARDEVOIR]: { 0: Abilities.NEUROFORCE, 1: Abilities.PSYCHIC_SURGE },
+  [Species.GALLADE]: { 0: Abilities.NEUROFORCE, 1: Abilities.SHARPNESS },
   [Species.SURSKIT]: { 0: Abilities.WATER_BUBBLE },
+  [Species.MASQUERAIN]: { 0: Abilities.WATER_BUBBLE },
   [Species.SHROOMISH]: { 0: Abilities.GUTS },
+  [Species.BRELOOM]: { 0: Abilities.GUTS },
   [Species.SLAKOTH]: { 0: Abilities.GUTS },
-  [Species.NINCADA]: { 0: Abilities.MAGIC_GUARD },
+  [Species.VIGOROTH]: { 0: Abilities.GUTS },
+  [Species.SLAKING]: { 0: Abilities.GUTS },
+  [Species.NINCADA]: { 0: Abilities.TECHNICIAN },
+  [Species.NINJASK]: { 0: Abilities.TECHNICIAN },
+  [Species.SHEDINJA]: { 0: Abilities.MAGIC_GUARD },
   [Species.WHISMUR]: { 0: Abilities.PUNK_ROCK },
+  [Species.LOUDRED]: { 0: Abilities.PUNK_ROCK },
+  [Species.EXPLOUD]: { 0: Abilities.PUNK_ROCK },
   [Species.MAKUHITA]: { 0: Abilities.STAMINA },
+  [Species.HARIYAMA]: { 0: Abilities.STAMINA },
   [Species.AZURILL]: { 0: Abilities.MISTY_SURGE },
-  [Species.NOSEPASS]: { 0: Abilities.LEVITATE },
+  [Species.MARILL]: { 0: Abilities.MISTY_SURGE },
+  [Species.AZUMARILL]: { 0: Abilities.MISTY_SURGE },
+  [Species.NOSEPASS]: { 0: Abilities.SOLID_ROCK },
+  [Species.PROBOPASS]: { 0: Abilities.LEVITATE },
   [Species.SKITTY]: { 0: Abilities.SCRAPPY },
-  [Species.SABLEYE]: { 0: Abilities.UNNERVE },
-  [Species.MAWILE]: { 0: Abilities.UNNERVE },
+  [Species.DELCATTY]: { 0: Abilities.SCRAPPY },
+  [Species.SABLEYE]: { 0: Abilities.UNNERVE, 1: Abilities.UNNERVE },
+  [Species.MAWILE]: { 0: Abilities.ADAPTABILITY, 1: Abilities.INTIMIDATE },
   [Species.ARON]: { 0: Abilities.EARTH_EATER },
+  [Species.LAIRON]: { 0: Abilities.EARTH_EATER },
+  [Species.AGGRON]: { 0: Abilities.EARTH_EATER, 1: Abilities.ROCKY_PAYLOAD },
   [Species.MEDITITE]: { 0: Abilities.MINDS_EYE },
-  [Species.ELECTRIKE]: { 0: Abilities.FLASH_FIRE },
+  [Species.MEDICHAM]: { 0: Abilities.MINDS_EYE, 1: Abilities.MINDS_EYE },
+  [Species.ELECTRIKE]: { 0: Abilities.BALL_FETCH },
+  [Species.MANECTRIC]: { 0: Abilities.FLASH_FIRE, 1: Abilities.FLASH_FIRE },
   [Species.PLUSLE]: { 0: Abilities.POWER_SPOT },
   [Species.MINUN]: { 0: Abilities.POWER_SPOT },
   [Species.VOLBEAT]: { 0: Abilities.HONEY_GATHER },
   [Species.ILLUMISE]: { 0: Abilities.HONEY_GATHER },
   [Species.GULPIN]: { 0: Abilities.EARTH_EATER },
+  [Species.SWALOT]: { 0: Abilities.EARTH_EATER },
   [Species.CARVANHA]: { 0: Abilities.SHEER_FORCE },
+  [Species.SHARPEDO]: { 0: Abilities.SHEER_FORCE, 1: Abilities.SPEED_BOOST },
   [Species.WAILMER]: { 0: Abilities.LEVITATE },
-  [Species.NUMEL]: { 0: Abilities.FUR_COAT },
+  [Species.WAILORD]: { 0: Abilities.LEVITATE },
+  [Species.NUMEL]: { 0: Abilities.SOLID_ROCK },
+  [Species.CAMERUPT]: { 0: Abilities.FUR_COAT, 1: Abilities.STAMINA },
   [Species.TORKOAL]: { 0: Abilities.ANALYTIC },
   [Species.SPOINK]: { 0: Abilities.PSYCHIC_SURGE },
+  [Species.GRUMPIG]: { 0: Abilities.PSYCHIC_SURGE },
   [Species.SPINDA]: { 0: Abilities.SIMPLE },
   [Species.TRAPINCH]: { 0: Abilities.ADAPTABILITY },
+  [Species.VIBRAVA]: { 0: Abilities.ADAPTABILITY },
+  [Species.FLYGON]: { 0: Abilities.ADAPTABILITY },
   [Species.CACNEA]: { 0: Abilities.SAND_RUSH },
+  [Species.CACTURNE]: { 0: Abilities.SAND_RUSH },
   [Species.SWABLU]: { 0: Abilities.FLUFFY },
+  [Species.ALTARIA]: { 0: Abilities.FLUFFY, 1: Abilities.FLUFFY },
   [Species.ZANGOOSE]: { 0: Abilities.POISON_HEAL },
   [Species.SEVIPER]: { 0: Abilities.MULTISCALE },
   [Species.LUNATONE]: { 0: Abilities.SHADOW_SHIELD },
   [Species.SOLROCK]: { 0: Abilities.DROUGHT },
   [Species.BARBOACH]: { 0: Abilities.SIMPLE },
+  [Species.WHISCASH]: { 0: Abilities.SIMPLE },
   [Species.CORPHISH]: { 0: Abilities.TOUGH_CLAWS },
+  [Species.CRAWDAUNT]: { 0: Abilities.TOUGH_CLAWS },
   [Species.BALTOY]: { 0: Abilities.WELL_BAKED_BODY },
+  [Species.CLAYDOL]: { 0: Abilities.WELL_BAKED_BODY },
   [Species.LILEEP]: { 0: Abilities.SEED_SOWER },
+  [Species.CRADILY]: { 0: Abilities.SEED_SOWER },
   [Species.ANORITH]: { 0: Abilities.WATER_ABSORB },
-  [Species.FEEBAS]: { 0: Abilities.MAGIC_GUARD },
-  [Species.CASTFORM]: { 0: Abilities.ADAPTABILITY },
+  [Species.ARMALDO]: { 0: Abilities.WATER_ABSORB },
+  [Species.FEEBAS]: { 0: Abilities.MULTISCALE },
+  [Species.MILOTIC]: { 0: Abilities.MAGIC_GUARD },
+  [Species.CASTFORM]: { 0: Abilities.ADAPTABILITY, 1: Abilities.ADAPTABILITY, 2: Abilities.ADAPTABILITY, 3: Abilities.ADAPTABILITY },
   [Species.KECLEON]: { 0: Abilities.ADAPTABILITY },
   [Species.SHUPPET]: { 0: Abilities.SHADOW_SHIELD },
+  [Species.BANETTE]: { 0: Abilities.SHADOW_SHIELD, 1: Abilities.SHADOW_SHIELD },
   [Species.DUSKULL]: { 0: Abilities.UNNERVE },
+  [Species.DUSCLOPS]: { 0: Abilities.UNNERVE },
+  [Species.DUSKNOIR]: { 0: Abilities.UNNERVE },
   [Species.TROPIUS]: { 0: Abilities.RIPEN },
-  [Species.ABSOL]: { 0: Abilities.SHARPNESS },
+  [Species.ABSOL]: { 0: Abilities.SHARPNESS, 1: Abilities.SHARPNESS },
   [Species.WYNAUT]: { 0: Abilities.STURDY },
+  [Species.WOBBUFFET]: { 0: Abilities.STURDY },
   [Species.SNORUNT]: { 0: Abilities.SNOW_WARNING },
+  [Species.GLALIE]: { 0: Abilities.SNOW_WARNING, 1: Abilities.SNOW_WARNING },
+  [Species.FROSLASS]: { 0: Abilities.SNOW_WARNING },
   [Species.SPHEAL]: { 0: Abilities.UNAWARE },
-  [Species.CLAMPERL]: { 0: Abilities.ARENA_TRAP },
+  [Species.SEALEO]: { 0: Abilities.UNAWARE },
+  [Species.WALREIN]: { 0: Abilities.UNAWARE },
+  [Species.CLAMPERL]: { 0: Abilities.DAUNTLESS_SHIELD },
+  [Species.GOREBYSS]: { 0: Abilities.ARENA_TRAP },
+  [Species.HUNTAIL]: { 0: Abilities.ARENA_TRAP },
   [Species.RELICANTH]: { 0: Abilities.PRIMORDIAL_SEA },
   [Species.LUVDISC]: { 0: Abilities.MULTISCALE },
-  [Species.BAGON]: { 0: Abilities.MOLD_BREAKER },
+  [Species.BAGON]: { 0: Abilities.INTIMIDATE },
+  [Species.SHELGON]: { 0: Abilities.ANGER_SHELL },
+  [Species.SALAMENCE]: { 0: Abilities.GALE_WINGS, 1: Abilities.ROCK_HEAD },
   [Species.BELDUM]: { 0: Abilities.LEVITATE },
+  [Species.METANG]: { 0: Abilities.LEVITATE },
+  [Species.METAGROSS]: { 0: Abilities.LEVITATE, 1: Abilities.FULL_METAL_BODY },
   [Species.REGIROCK]: { 0: Abilities.SAND_STREAM },
   [Species.REGICE]: { 0: Abilities.SNOW_WARNING },
   [Species.REGISTEEL]: { 0: Abilities.STEELY_SPIRIT },
-  [Species.LATIAS]: { 0: Abilities.PRISM_ARMOR },
-  [Species.LATIOS]: { 0: Abilities.TINTED_LENS },
-  [Species.KYOGRE]: { 0: Abilities.MOLD_BREAKER },
-  [Species.GROUDON]: { 0: Abilities.TURBOBLAZE },
-  [Species.RAYQUAZA]: { 0: Abilities.UNNERVE },
+  [Species.LATIAS]: { 0: Abilities.SPEED_BOOST, 1: Abilities.PRISM_ARMOR },
+  [Species.LATIOS]: { 0: Abilities.SPEED_BOOST, 1: Abilities.TINTED_LENS },
+  [Species.KYOGRE]: { 0: Abilities.MOLD_BREAKER, 1: Abilities.TERAVOLT },
+  [Species.GROUDON]: { 0: Abilities.MOLD_BREAKER, 1: Abilities.TURBOBLAZE },
+  [Species.RAYQUAZA]: { 0: Abilities.UNNERVE, 1: Abilities.UNNERVE },
   [Species.JIRACHI]: { 0: Abilities.COMATOSE },
-  [Species.DEOXYS]: { 0: Abilities.PROTEAN },
+  [Species.DEOXYS]: { 0: Abilities.PROTEAN, 1: Abilities.ADAPTABILITY, 2: Abilities.REGENERATOR, 3: Abilities.SHADOW_SHIELD },
 
-  [Species.TURTWIG]: { 0: Abilities.THICK_FAT },
-  [Species.CHIMCHAR]: { 0: Abilities.BEAST_BOOST },
-  [Species.PIPLUP]: { 0: Abilities.DRIZZLE },
-  [Species.STARLY]: { 0: Abilities.ROCK_HEAD },
+  [Species.TURTWIG]: { 0: Abilities.SOLID_ROCK },
+  [Species.GROTLE]: { 0: Abilities.SOLID_ROCK },
+  [Species.TORTERRA]: { 0: Abilities.THICK_FAT },
+  [Species.CHIMCHAR]: { 0: Abilities.UNNERVE },
+  [Species.MONFERNO]: { 0: Abilities.BEAST_BOOST },
+  [Species.INFERNAPE]: { 0: Abilities.BEAST_BOOST },
+  [Species.PIPLUP]: { 0: Abilities.CUTE_CHARM },
+  [Species.PRINPLUP]: { 0: Abilities.DRIZZLE },
+  [Species.EMPOLEON]: { 0: Abilities.DRIZZLE },
+  [Species.STARLY]: { 0: Abilities.INTIMIDATE },
+  [Species.STARAVIA]: { 0: Abilities.ROCK_HEAD },
+  [Species.STARAPTOR]: { 0: Abilities.ROCK_HEAD },
   [Species.BIDOOF]: { 0: Abilities.SAP_SIPPER },
-  [Species.KRICKETOT]: { 0: Abilities.SHARPNESS },
+  [Species.BIBAREL]: { 0: Abilities.SAP_SIPPER },
+  [Species.KRICKETOT]: { 0: Abilities.HONEY_GATHER },
+  [Species.KRICKETUNE]: { 0: Abilities.SHARPNESS },
   [Species.SHINX]: { 0: Abilities.SPEED_BOOST },
-  [Species.BUDEW]: { 0: Abilities.GRASSY_SURGE },
+  [Species.LUXIO]: { 0: Abilities.SPEED_BOOST },
+  [Species.LUXRAY]: { 0: Abilities.SPEED_BOOST },
+  [Species.BUDEW]: { 0: Abilities.SEED_SOWER },
+  [Species.ROSELIA]: { 0: Abilities.GRASSY_SURGE },
+  [Species.ROSERADE]: { 0: Abilities.GRASSY_SURGE },
   [Species.CRANIDOS]: { 0: Abilities.ROCK_HEAD },
+  [Species.RAMPARDOS]: { 0: Abilities.ROCK_HEAD },
   [Species.SHIELDON]: { 0: Abilities.EARTH_EATER },
-  [Species.BURMY]: { 0: Abilities.STURDY },
-  [Species.COMBEE]: { 0: Abilities.INTIMIDATE },
+  [Species.BASTIODON]: { 0: Abilities.EARTH_EATER },
+  [Species.BURMY]: { 0: Abilities.STURDY, 1: Abilities.STURDY, 2: Abilities.STURDY },
+  [Species.WORMADAM]: { 0: Abilities.STURDY, 1: Abilities.STURDY, 2: Abilities.STURDY },
+  [Species.MOTHIM]: { 0: Abilities.SPEED_BOOST },
+  [Species.COMBEE]: { 0: Abilities.RUN_AWAY },
+  [Species.VESPIQUEN]: { 0: Abilities.INTIMIDATE },
   [Species.PACHIRISU]: { 0: Abilities.HONEY_GATHER },
   [Species.BUIZEL]: { 0: Abilities.MOXIE },
-  [Species.CHERUBI]: { 0: Abilities.ORICHALCUM_PULSE },
-  [Species.SHELLOS]: { 0: Abilities.REGENERATOR },
+  [Species.FLOATZEL]: { 0: Abilities.MOXIE },
+  [Species.CHERUBI]: { 0: Abilities.DROUGHT },
+  [Species.CHERRIM]: { 0: Abilities.ORICHALCUM_PULSE, 1: Abilities.ORICHALCUM_PULSE },
+  [Species.SHELLOS]: { 0: Abilities.REGENERATOR, 1: Abilities.REGENERATOR },
+  [Species.GASTRODON]: { 0: Abilities.REGENERATOR, 1: Abilities.REGENERATOR },
   [Species.DRIFLOON]: { 0: Abilities.MAGIC_GUARD },
+  [Species.DRIFBLIM]: { 0: Abilities.MAGIC_GUARD },
   [Species.BUNEARY]: { 0: Abilities.ADAPTABILITY },
+  [Species.LOPUNNY]: { 0: Abilities.ADAPTABILITY, 1: Abilities.ADAPTABILITY },
   [Species.GLAMEOW]: { 0: Abilities.INTIMIDATE },
+  [Species.PURUGLY]: { 0: Abilities.INTIMIDATE },
   [Species.CHINGLING]: { 0: Abilities.PUNK_ROCK },
+  [Species.CHIMECHO]: { 0: Abilities.PUNK_ROCK },
   [Species.STUNKY]: { 0: Abilities.NEUTRALIZING_GAS },
+  [Species.SKUNTANK]: { 0: Abilities.NEUTRALIZING_GAS },
   [Species.BRONZOR]: { 0: Abilities.MIRROR_ARMOR },
+  [Species.BRONZONG]: { 0: Abilities.MIRROR_ARMOR },
   [Species.BONSLY]: { 0: Abilities.SAP_SIPPER },
+  [Species.SUDOWOODO]: { 0: Abilities.SAP_SIPPER },
   [Species.MIME_JR]: { 0: Abilities.PRANKSTER },
-  [Species.HAPPINY]: { 0: Abilities.FUR_COAT },
+  [Species.MR_MIME]: { 0: Abilities.PRANKSTER },
+  [Species.GALAR_MR_MIME]: { 0: Abilities.PRANKSTER },
+  [Species.MR_RIME]: { 0: Abilities.PRANKSTER },
+  [Species.HAPPINY]: { 0: Abilities.HOSPITALITY },
+  [Species.CHANSEY]: { 0: Abilities.FRIEND_GUARD },
+  [Species.BLISSEY]: { 0: Abilities.FUR_COAT },
   [Species.CHATOT]: { 0: Abilities.PUNK_ROCK },
   [Species.SPIRITOMB]: { 0: Abilities.VESSEL_OF_RUIN },
-  [Species.GIBLE]: { 0: Abilities.SAND_STREAM },
-  [Species.MUNCHLAX]: { 0: Abilities.RIPEN },
+  [Species.GIBLE]: { 0: Abilities.ARENA_TRAP },
+  [Species.GABITE]: { 0: Abilities.ARENA_TRAP },
+  [Species.GARCHOMP]: { 0: Abilities.ARENA_TRAP, 1: Abilities.SAND_RUSH },
+  [Species.MUNCHLAX]: { 0: Abilities.CHEEK_POUCH },
+  [Species.SNORLAX]: { 0: Abilities.CHEEK_POUCH, 1: Abilities.RIPEN },
   [Species.RIOLU]: { 0: Abilities.MINDS_EYE },
+  [Species.LUCARIO]: { 0: Abilities.MINDS_EYE, 1: Abilities.MINDS_EYE },
   [Species.HIPPOPOTAS]: { 0: Abilities.UNAWARE },
+  [Species.HIPPOWDON]: { 0: Abilities.UNAWARE },
   [Species.SKORUPI]: { 0: Abilities.SUPER_LUCK },
+  [Species.DRAPION]: { 0: Abilities.SUPER_LUCK },
   [Species.CROAGUNK]: { 0: Abilities.MOXIE },
+  [Species.TOXICROAK]: { 0: Abilities.MOXIE },
   [Species.CARNIVINE]: { 0: Abilities.ARENA_TRAP },
   [Species.FINNEON]: { 0: Abilities.WATER_BUBBLE },
+  [Species.LUMINEON]: { 0: Abilities.WATER_BUBBLE },
   [Species.MANTYKE]: { 0: Abilities.UNAWARE },
-  [Species.SNOVER]: { 0: Abilities.GRASSY_SURGE },
-  [Species.ROTOM]: { 0: Abilities.HADRON_ENGINE },
-  [Species.UXIE]: { 0: Abilities.UNNERVE },
+  [Species.MANTINE]: { 0: Abilities.UNAWARE },
+  [Species.SNOVER]: { 0: Abilities.SLUSH_RUSH },
+  [Species.ABOMASNOW]: { 0: Abilities.SLUSH_RUSH, 1: Abilities.SEED_SOWER },
+  [Species.ROTOM]: { 0: Abilities.HADRON_ENGINE, 1: Abilities.HADRON_ENGINE, 2: Abilities.HADRON_ENGINE, 3: Abilities.HADRON_ENGINE, 4: Abilities.HADRON_ENGINE, 5: Abilities.HADRON_ENGINE },
+  [Species.UXIE]: { 0: Abilities.ILLUSION },
   [Species.MESPRIT]: { 0: Abilities.MOODY },
   [Species.AZELF]: { 0: Abilities.NEUROFORCE },
-  [Species.DIALGA]: { 0: Abilities.BERSERK },
-  [Species.PALKIA]: { 0: Abilities.BERSERK },
+  [Species.DIALGA]: { 0: Abilities.BERSERK, 1: Abilities.BERSERK },
+  [Species.PALKIA]: { 0: Abilities.BERSERK, 1: Abilities.BERSERK },
   [Species.HEATRAN]: { 0: Abilities.EARTH_EATER },
   [Species.REGIGIGAS]: { 0: Abilities.SCRAPPY },
-  [Species.GIRATINA]: { 0: Abilities.SHADOW_SHIELD },
+  [Species.GIRATINA]: { 0: Abilities.SHADOW_SHIELD, 1: Abilities.SHADOW_SHIELD },
   [Species.CRESSELIA]: { 0: Abilities.SHADOW_SHIELD },
   [Species.PHIONE]: { 0: Abilities.SIMPLE },
   [Species.MANAPHY]: { 0: Abilities.PRIMORDIAL_SEA },
   [Species.DARKRAI]: { 0: Abilities.UNNERVE },
-  [Species.SHAYMIN]: { 0: Abilities.WIND_RIDER },
-  [Species.ARCEUS]: { 0: Abilities.ADAPTABILITY },
+  [Species.SHAYMIN]: { 0: Abilities.GRASSY_SURGE, 1: Abilities.DELTA_STREAM },
+  [Species.ARCEUS]: { 0: Abilities.ADAPTABILITY, 1: Abilities.ADAPTABILITY, 2: Abilities.ADAPTABILITY, 3: Abilities.ADAPTABILITY, 4: Abilities.ADAPTABILITY, 5: Abilities.ADAPTABILITY, 6: Abilities.ADAPTABILITY, 7: Abilities.ADAPTABILITY, 8: Abilities.ADAPTABILITY, 9: Abilities.ADAPTABILITY, 10: Abilities.ADAPTABILITY, 11: Abilities.ADAPTABILITY, 12: Abilities.ADAPTABILITY, 13: Abilities.ADAPTABILITY, 14: Abilities.ADAPTABILITY, 15: Abilities.ADAPTABILITY, 16: Abilities.ADAPTABILITY, 17: Abilities.ADAPTABILITY },
 
   [Species.VICTINI]: { 0: Abilities.SHEER_FORCE },
   [Species.SNIVY]: { 0: Abilities.MULTISCALE },
-  [Species.TEPIG]: { 0: Abilities.ROCK_HEAD },
-  [Species.OSHAWOTT]: { 0: Abilities.INTREPID_SWORD },
+  [Species.SERVINE]: { 0: Abilities.MULTISCALE },
+  [Species.SERPERIOR]: { 0: Abilities.MULTISCALE },
+  [Species.TEPIG]: { 0: Abilities.GLUTTONY },
+  [Species.PIGNITE]: { 0: Abilities.ROCK_HEAD },
+  [Species.EMBOAR]: { 0: Abilities.ROCK_HEAD },
+  [Species.OSHAWOTT]: { 0: Abilities.MOLD_BREAKER },
+  [Species.DEWOTT]: { 0: Abilities.MOLD_BREAKER },
+  [Species.SAMUROTT]: { 0: Abilities.LIGHTNING_ROD },
+  [Species.HISUI_SAMUROTT]: { 0: Abilities.MOLD_BREAKER },
   [Species.PATRAT]: { 0: Abilities.NO_GUARD },
-  [Species.LILLIPUP]: { 0: Abilities.FUR_COAT },
+  [Species.WATCHOG]: { 0: Abilities.NO_GUARD },
+  [Species.LILLIPUP]: { 0: Abilities.BALL_FETCH },
+  [Species.HERDIER]: { 0: Abilities.FUR_COAT },
+  [Species.STOUTLAND]: { 0: Abilities.FUR_COAT },
   [Species.PURRLOIN]: { 0: Abilities.PICKUP },
+  [Species.LIEPARD]: { 0: Abilities.PICKUP },
   [Species.PANSAGE]: { 0: Abilities.WELL_BAKED_BODY },
+  [Species.SIMISAGE]: { 0: Abilities.WELL_BAKED_BODY },
   [Species.PANSEAR]: { 0: Abilities.WATER_ABSORB },
+  [Species.SIMISEAR]: { 0: Abilities.WATER_ABSORB },
   [Species.PANPOUR]: { 0: Abilities.SAP_SIPPER },
+  [Species.SIMIPOUR]: { 0: Abilities.SAP_SIPPER },
   [Species.MUNNA]: { 0: Abilities.NEUTRALIZING_GAS },
+  [Species.MUSHARNA]: { 0: Abilities.NEUTRALIZING_GAS },
   [Species.PIDOVE]: { 0: Abilities.SNIPER },
+  [Species.TRANQUILL]: { 0: Abilities.SNIPER },
+  [Species.UNFEZANT]: { 0: Abilities.SNIPER },
   [Species.BLITZLE]: { 0: Abilities.ELECTRIC_SURGE },
+  [Species.ZEBSTRIKA]: { 0: Abilities.ELECTRIC_SURGE },
   [Species.ROGGENROLA]: { 0: Abilities.SOLID_ROCK },
+  [Species.BOLDORE]: { 0: Abilities.SOLID_ROCK },
+  [Species.GIGALITH]: { 0: Abilities.SOLID_ROCK },
   [Species.WOOBAT]: { 0: Abilities.OPPORTUNIST },
+  [Species.SWOOBAT]: { 0: Abilities.OPPORTUNIST },
   [Species.DRILBUR]: { 0: Abilities.STURDY },
-  [Species.AUDINO]: { 0: Abilities.FRIEND_GUARD },
+  [Species.EXCADRILL]: { 0: Abilities.STURDY },
+  [Species.AUDINO]: { 0: Abilities.FRIEND_GUARD, 1: Abilities.FAIRY_AURA },
   [Species.TIMBURR]: { 0: Abilities.ROCKY_PAYLOAD },
+  [Species.GURDURR]: { 0: Abilities.ROCKY_PAYLOAD },
+  [Species.CONKELDURR]: { 0: Abilities.ROCKY_PAYLOAD },
   [Species.TYMPOLE]: { 0: Abilities.POISON_HEAL },
+  [Species.PALPITOAD]: { 0: Abilities.POISON_HEAL },
+  [Species.SEISMITOAD]: { 0: Abilities.POISON_HEAL },
   [Species.THROH]: { 0: Abilities.STAMINA },
   [Species.SAWK]: { 0: Abilities.SCRAPPY },
-  [Species.SEWADDLE]: { 0: Abilities.SHARPNESS },
+  [Species.SEWADDLE]: { 0: Abilities.SHIELD_DUST },
+  [Species.SWADLOON]: { 0: Abilities.SHIELD_DUST },
+  [Species.LEAVANNY]: { 0: Abilities.SHARPNESS },
   [Species.VENIPEDE]: { 0: Abilities.STAMINA },
+  [Species.WHIRLIPEDE]: { 0: Abilities.STAMINA },
+  [Species.SCOLIPEDE]: { 0: Abilities.STAMINA },
   [Species.COTTONEE]: { 0: Abilities.FLUFFY },
+  [Species.WHIMSICOTT]: { 0: Abilities.FLUFFY },
   [Species.PETILIL]: { 0: Abilities.FLOWER_VEIL },
-  [Species.BASCULIN]: { 0: Abilities.SUPREME_OVERLORD },
+  [Species.LILLIGANT]: { 0: Abilities.GRASSY_SURGE },
+  [Species.HISUI_LILLIGANT]: { 0: Abilities.FLOWER_VEIL },
+  [Species.BASCULIN]: { 0: Abilities.ROCK_HEAD, 1: Abilities.RECKLESS, 2: Abilities.SUPREME_OVERLORD },
+  [Species.BASCULEGION]: { 0: Abilities.SUPREME_OVERLORD, 1: Abilities.SUPREME_OVERLORD },
   [Species.SANDILE]: { 0: Abilities.TOUGH_CLAWS },
+  [Species.KROKOROK]: { 0: Abilities.TOUGH_CLAWS },
+  [Species.KROOKODILE]: { 0: Abilities.TOUGH_CLAWS },
   [Species.DARUMAKA]: { 0: Abilities.GORILLA_TACTICS },
+  [Species.DARMANITAN]: { 0: Abilities.GORILLA_TACTICS, 1: Abilities.SOLID_ROCK },
   [Species.MARACTUS]: { 0: Abilities.WELL_BAKED_BODY },
   [Species.DWEBBLE]: { 0: Abilities.ROCKY_PAYLOAD },
+  [Species.CRUSTLE]: { 0: Abilities.ROCKY_PAYLOAD },
   [Species.SCRAGGY]: { 0: Abilities.PROTEAN },
+  [Species.SCRAFTY]: { 0: Abilities.PROTEAN },
   [Species.SIGILYPH]: { 0: Abilities.FLARE_BOOST },
   [Species.YAMASK]: { 0: Abilities.PURIFYING_SALT },
+  [Species.COFAGRIGUS]: { 0: Abilities.PURIFYING_SALT },
   [Species.TIRTOUGA]: { 0: Abilities.WATER_ABSORB },
+  [Species.CARRACOSTA]: { 0: Abilities.WATER_ABSORB },
   [Species.ARCHEN]: { 0: Abilities.MULTISCALE },
+  [Species.ARCHEOPS]: { 0: Abilities.MULTISCALE },
   [Species.TRUBBISH]: { 0: Abilities.NEUTRALIZING_GAS },
-  [Species.ZORUA]: { 0: Abilities.DARK_AURA },
+  [Species.GARBODOR]: { 0: Abilities.NEUTRALIZING_GAS, 1: Abilities.NEUTRALIZING_GAS },
+  [Species.ZORUA]: { 0: Abilities.ADAPTABILITY },
+  [Species.ZOROARK]: { 0: Abilities.ADAPTABILITY },
   [Species.MINCCINO]: { 0: Abilities.FUR_COAT },
+  [Species.CINCCINO]: { 0: Abilities.FUR_COAT },
   [Species.GOTHITA]: { 0: Abilities.UNNERVE },
+  [Species.GOTHORITA]: { 0: Abilities.UNNERVE },
+  [Species.GOTHITELLE]: { 0: Abilities.UNNERVE },
   [Species.SOLOSIS]: { 0: Abilities.PSYCHIC_SURGE },
+  [Species.DUOSION]: { 0: Abilities.PSYCHIC_SURGE },
+  [Species.REUNICLUS]: { 0: Abilities.PSYCHIC_SURGE },
   [Species.DUCKLETT]: { 0: Abilities.DRIZZLE },
-  [Species.VANILLITE]: { 0: Abilities.SLUSH_RUSH },
-  [Species.DEERLING]: { 0: Abilities.FUR_COAT },
+  [Species.SWANNA]: { 0: Abilities.DRIZZLE },
+  [Species.VANILLITE]: { 0: Abilities.REFRIGERATE },
+  [Species.VANILLISH]: { 0: Abilities.REFRIGERATE },
+  [Species.VANILLUXE]: { 0: Abilities.SLUSH_RUSH },
+  [Species.DEERLING]: { 0: Abilities.FLOWER_VEIL, 1: Abilities.CUD_CHEW, 2: Abilities.HARVEST, 3: Abilities.FUR_COAT },
+  [Species.SAWSBUCK]: { 0: Abilities.FLOWER_VEIL, 1: Abilities.CUD_CHEW, 2: Abilities.HARVEST, 3: Abilities.FUR_COAT },
   [Species.EMOLGA]: { 0: Abilities.SERENE_GRACE },
   [Species.KARRABLAST]: { 0: Abilities.QUICK_DRAW },
-  [Species.FOONGUS]: { 0: Abilities.THICK_FAT },
+  [Species.ESCAVALIER]: { 0: Abilities.QUICK_DRAW },
+  [Species.FOONGUS]: { 0: Abilities.MYCELIUM_MIGHT },
+  [Species.AMOONGUSS]: { 0: Abilities.THICK_FAT },
   [Species.FRILLISH]: { 0: Abilities.POISON_HEAL },
+  [Species.JELLICENT]: { 0: Abilities.POISON_HEAL },
   [Species.ALOMOMOLA]: { 0: Abilities.MULTISCALE },
   [Species.JOLTIK]: { 0: Abilities.TRANSISTOR },
+  [Species.GALVANTULA]: { 0: Abilities.TRANSISTOR },
   [Species.FERROSEED]: { 0: Abilities.ROUGH_SKIN },
+  [Species.FERROTHORN]: { 0: Abilities.ROUGH_SKIN },
   [Species.KLINK]: { 0: Abilities.STEELY_SPIRIT },
+  [Species.KLANG]: { 0: Abilities.STEELY_SPIRIT },
+  [Species.KLINKLANG]: { 0: Abilities.STEELY_SPIRIT },
   [Species.TYNAMO]: { 0: Abilities.POISON_HEAL },
+  [Species.EELEKTRIK]: { 0: Abilities.POISON_HEAL },
+  [Species.EELEKTROSS]: { 0: Abilities.POISON_HEAL },
   [Species.ELGYEM]: { 0: Abilities.BEADS_OF_RUIN },
+  [Species.BEHEEYEM]: { 0: Abilities.BEADS_OF_RUIN },
   [Species.LITWICK]: { 0: Abilities.SHADOW_TAG },
+  [Species.LAMPENT]: { 0: Abilities.SHADOW_TAG },
+  [Species.CHANDELURE]: { 0: Abilities.SHADOW_TAG },
   [Species.AXEW]: { 0: Abilities.DRAGONS_MAW },
+  [Species.FRAXURE]: { 0: Abilities.DRAGONS_MAW },
+  [Species.HAXORUS]: { 0: Abilities.DRAGONS_MAW },
   [Species.CUBCHOO]: { 0: Abilities.FUR_COAT },
+  [Species.BEARTIC]: { 0: Abilities.FUR_COAT },
   [Species.CRYOGONAL]: { 0: Abilities.SNOW_WARNING },
-  [Species.SHELMET]: { 0: Abilities.PROTEAN },
+  [Species.SHELMET]: { 0: Abilities.STAMINA },
+  [Species.ACCELGOR]: { 0: Abilities.PROTEAN },
   [Species.STUNFISK]: { 0: Abilities.STORM_DRAIN },
   [Species.MIENFOO]: { 0: Abilities.NO_GUARD },
+  [Species.MIENSHAO]: { 0: Abilities.NO_GUARD },
   [Species.DRUDDIGON]: { 0: Abilities.INTIMIDATE },
   [Species.GOLETT]: { 0: Abilities.SHADOW_SHIELD },
+  [Species.GOLURK]: { 0: Abilities.SHADOW_SHIELD },
   [Species.PAWNIARD]: { 0: Abilities.SWORD_OF_RUIN },
+  [Species.BISHARP]: { 0: Abilities.SWORD_OF_RUIN },
+  [Species.KINGAMBIT]: { 0: Abilities.SWORD_OF_RUIN },
   [Species.BOUFFALANT]: { 0: Abilities.ROCK_HEAD },
   [Species.RUFFLET]: { 0: Abilities.SPEED_BOOST },
+  [Species.BRAVIARY]: { 0: Abilities.SPEED_BOOST },
+  [Species.HISUI_BRAVIARY]: { 0: Abilities.SPEED_BOOST },
   [Species.VULLABY]: { 0: Abilities.THICK_FAT },
+  [Species.MANDIBUZZ]: { 0: Abilities.THICK_FAT },
   [Species.HEATMOR]: { 0: Abilities.CONTRARY },
   [Species.DURANT]: { 0: Abilities.COMPOUND_EYES },
-  [Species.DEINO]: { 0: Abilities.PARENTAL_BOND },
-  [Species.LARVESTA]: { 0: Abilities.DROUGHT },
+  [Species.DEINO]: { 0: Abilities.NO_GUARD },
+  [Species.ZWEILOUS]: { 0: Abilities.NO_GUARD },
+  [Species.HYDREIGON]: { 0: Abilities.PARENTAL_BOND },
+  [Species.LARVESTA]: { 0: Abilities.FLASH_FIRE },
+  [Species.VOLCARONA]: { 0: Abilities.DROUGHT },
   [Species.COBALION]: { 0: Abilities.INTREPID_SWORD },
   [Species.TERRAKION]: { 0: Abilities.ROCKY_PAYLOAD },
   [Species.VIRIZION]: { 0: Abilities.SHARPNESS },
-  [Species.TORNADUS]: { 0: Abilities.DRIZZLE },
-  [Species.THUNDURUS]: { 0: Abilities.DRIZZLE },
+  [Species.TORNADUS]: { 0: Abilities.DRIZZLE, 1: Abilities.DRIZZLE },
+  [Species.THUNDURUS]: { 0: Abilities.DRIZZLE, 1: Abilities.DRIZZLE },
   [Species.RESHIRAM]: { 0: Abilities.ORICHALCUM_PULSE },
   [Species.ZEKROM]: { 0: Abilities.HADRON_ENGINE },
-  [Species.LANDORUS]: { 0: Abilities.STORM_DRAIN },
-  [Species.KYUREM]: { 0: Abilities.SNOW_WARNING },
-  [Species.KELDEO]: { 0: Abilities.GRIM_NEIGH },
-  [Species.MELOETTA]: { 0: Abilities.MINDS_EYE },
-  [Species.GENESECT]: { 0: Abilities.PROTEAN },
+  [Species.LANDORUS]: { 0: Abilities.STORM_DRAIN, 1: Abilities.STORM_DRAIN },
+  [Species.KYUREM]: { 0: Abilities.SNOW_WARNING, 1: Abilities.HADRON_ENGINE, 2: Abilities.ORICHALCUM_PULSE },
+  [Species.KELDEO]: { 0: Abilities.GRIM_NEIGH, 1: Abilities.GRIM_NEIGH },
+  [Species.MELOETTA]: { 0: Abilities.PUNK_ROCK, 1: Abilities.SCRAPPY },
+  [Species.GENESECT]: { 0: Abilities.PROTEAN, 1: Abilities.PROTEAN, 2: Abilities.PROTEAN, 3: Abilities.PROTEAN, 4: Abilities.PROTEAN },
 
-  [Species.CHESPIN]: { 0: Abilities.DAUNTLESS_SHIELD },
-  [Species.FENNEKIN]: { 0: Abilities.PSYCHIC_SURGE },
-  [Species.FROAKIE]: { 0: Abilities.STAKEOUT },
-  [Species.BUNNELBY]: { 0: Abilities.THICK_FAT },
-  [Species.FLETCHLING]: { 0: Abilities.MAGIC_GUARD },
-  [Species.SCATTERBUG]: { 0: Abilities.PRANKSTER },
+  [Species.CHESPIN]: { 0: Abilities.ROUGH_SKIN },
+  [Species.QUILLADIN]: { 0: Abilities.DAUNTLESS_SHIELD },
+  [Species.CHESNAUGHT]: { 0: Abilities.DAUNTLESS_SHIELD },
+  [Species.FENNEKIN]: { 0: Abilities.FLUFFY },
+  [Species.BRAIXEN]: { 0: Abilities.PSYCHIC_SURGE },
+  [Species.DELPHOX]: { 0: Abilities.PSYCHIC_SURGE },
+  [Species.FROAKIE]: { 0: Abilities.STAKEOUT, 1: Abilities.STAKEOUT },
+  [Species.FROGADIER]: { 0: Abilities.STAKEOUT, 1: Abilities.STAKEOUT },
+  [Species.GRENINJA]: { 0: Abilities.STAKEOUT, 1: Abilities.STAKEOUT, 2: Abilities.STAKEOUT },
+  [Species.BUNNELBY]: { 0: Abilities.INNER_FOCUS },
+  [Species.DIGGERSBY]: { 0: Abilities.THICK_FAT },
+  [Species.FLETCHLING]: { 0: Abilities.FLAME_BODY },
+  [Species.FLETCHINDER]: { 0: Abilities.MAGIC_GUARD },
+  [Species.TALONFLAME]: { 0: Abilities.MAGIC_GUARD },
+  [Species.SCATTERBUG]: { 0: Abilities.RUN_AWAY, 1: Abilities.RUN_AWAY, 2: Abilities.RUN_AWAY, 3: Abilities.RUN_AWAY, 4: Abilities.RUN_AWAY, 5: Abilities.RUN_AWAY, 6: Abilities.RUN_AWAY, 7: Abilities.RUN_AWAY, 8: Abilities.RUN_AWAY, 9: Abilities.RUN_AWAY, 10: Abilities.RUN_AWAY, 11: Abilities.RUN_AWAY, 12: Abilities.RUN_AWAY, 13: Abilities.RUN_AWAY, 14: Abilities.RUN_AWAY, 15: Abilities.RUN_AWAY, 16: Abilities.RUN_AWAY, 17: Abilities.RUN_AWAY, 18: Abilities.RUN_AWAY, 19: Abilities.RUN_AWAY },
+  [Species.SPEWPA]: { 0: Abilities.COMPOUND_EYES, 1: Abilities.COMPOUND_EYES, 2: Abilities.COMPOUND_EYES, 3: Abilities.COMPOUND_EYES, 4: Abilities.COMPOUND_EYES, 5: Abilities.COMPOUND_EYES, 6: Abilities.COMPOUND_EYES, 7: Abilities.COMPOUND_EYES, 8: Abilities.COMPOUND_EYES, 9: Abilities.COMPOUND_EYES, 10: Abilities.COMPOUND_EYES, 11: Abilities.COMPOUND_EYES, 12: Abilities.COMPOUND_EYES, 13: Abilities.COMPOUND_EYES, 14: Abilities.COMPOUND_EYES, 15: Abilities.COMPOUND_EYES, 16: Abilities.COMPOUND_EYES, 17: Abilities.COMPOUND_EYES, 18: Abilities.COMPOUND_EYES, 19: Abilities.COMPOUND_EYES },
+  [Species.VIVILLON]: { 0: Abilities.PRANKSTER, 1: Abilities.PRANKSTER, 2: Abilities.PRANKSTER, 3: Abilities.PRANKSTER, 4: Abilities.PRANKSTER, 5: Abilities.PRANKSTER, 6: Abilities.PRANKSTER, 7: Abilities.PRANKSTER, 8: Abilities.PRANKSTER, 9: Abilities.PRANKSTER, 10: Abilities.PRANKSTER, 11: Abilities.PRANKSTER, 12: Abilities.PRANKSTER, 13: Abilities.PRANKSTER, 14: Abilities.PRANKSTER, 15: Abilities.PRANKSTER, 16: Abilities.PRANKSTER, 17: Abilities.PRANKSTER, 18: Abilities.PRANKSTER, 19: Abilities.PRANKSTER },
   [Species.LITLEO]: { 0: Abilities.BEAST_BOOST },
-  [Species.FLABEBE]: { 0: Abilities.GRASSY_SURGE },
+  [Species.PYROAR]: { 0: Abilities.BEAST_BOOST },
+  [Species.FLABEBE]: { 0: Abilities.GRASSY_SURGE, 1: Abilities.GRASSY_SURGE, 2: Abilities.GRASSY_SURGE, 3: Abilities.GRASSY_SURGE, 4: Abilities.GRASSY_SURGE },
+  [Species.FLOETTE]: { 0: Abilities.GRASSY_SURGE, 1: Abilities.GRASSY_SURGE, 2: Abilities.GRASSY_SURGE, 3: Abilities.GRASSY_SURGE, 4: Abilities.GRASSY_SURGE },
+  [Species.FLORGES]: { 0: Abilities.GRASSY_SURGE, 1: Abilities.GRASSY_SURGE, 2: Abilities.GRASSY_SURGE, 3: Abilities.GRASSY_SURGE, 4: Abilities.GRASSY_SURGE },
   [Species.SKIDDO]: { 0: Abilities.SEED_SOWER },
-  [Species.PANCHAM]: { 0: Abilities.FUR_COAT },
-  [Species.FURFROU]: { 0: Abilities.FLUFFY },
-  [Species.ESPURR]: { 0: Abilities.FUR_COAT },
+  [Species.GOGOAT]: { 0: Abilities.SEED_SOWER },
+  [Species.PANCHAM]: { 0: Abilities.TECHNICIAN },
+  [Species.PANGORO]: { 0: Abilities.FUR_COAT },
+  [Species.FURFROU]: { 0: Abilities.FLUFFY, 1: Abilities.FLUFFY, 2: Abilities.FLUFFY, 3: Abilities.FLUFFY, 4: Abilities.FLUFFY, 5: Abilities.FLUFFY, 6: Abilities.FLUFFY, 7: Abilities.FLUFFY, 8: Abilities.FLUFFY, 9: Abilities.FLUFFY },
+  [Species.ESPURR]: { 0: Abilities.PRANKSTER },
+  [Species.MEOWSTIC]: { 0: Abilities.FUR_COAT, 1: Abilities.NEUROFORCE },
   [Species.HONEDGE]: { 0: Abilities.SHARPNESS },
+  [Species.DOUBLADE]: { 0: Abilities.SHARPNESS },
+  [Species.AEGISLASH]: { 0: Abilities.SHARPNESS, 1: Abilities.SHARPNESS },
   [Species.SPRITZEE]: { 0: Abilities.FUR_COAT },
+  [Species.AROMATISSE]: { 0: Abilities.FUR_COAT },
   [Species.SWIRLIX]: { 0: Abilities.RIPEN },
-  [Species.INKAY]: { 0: Abilities.UNNERVE },
+  [Species.SLURPUFF]: { 0: Abilities.RIPEN },
+  [Species.INKAY]: { 0: Abilities.SHADOW_SHIELD },
+  [Species.MALAMAR]: { 0: Abilities.SHADOW_SHIELD },
   [Species.BINACLE]: { 0: Abilities.SAP_SIPPER },
-  [Species.SKRELP]: { 0: Abilities.DRAGONS_MAW },
+  [Species.BARBARACLE]: { 0: Abilities.SAP_SIPPER },
+  [Species.SKRELP]: { 0: Abilities.WATER_BUBBLE },
+  [Species.DRAGALGE]: { 0: Abilities.DRAGONS_MAW },
   [Species.CLAUNCHER]: { 0: Abilities.PROTEAN },
+  [Species.CLAWITZER]: { 0: Abilities.PROTEAN },
   [Species.HELIOPTILE]: { 0: Abilities.PROTEAN },
-  [Species.TYRUNT]: { 0: Abilities.RECKLESS },
+  [Species.HELIOLISK]: { 0: Abilities.PROTEAN },
+  [Species.TYRUNT]: { 0: Abilities.SHEER_FORCE },
+  [Species.TYRANTRUM]: { 0: Abilities.SHEER_FORCE },
   [Species.AMAURA]: { 0: Abilities.ICE_SCALES },
+  [Species.AURORUS]: { 0: Abilities.ICE_SCALES },
   [Species.HAWLUCHA]: { 0: Abilities.MOXIE },
   [Species.DEDENNE]: { 0: Abilities.PIXILATE },
   [Species.CARBINK]: { 0: Abilities.SOLID_ROCK },
   [Species.GOOMY]: { 0: Abilities.REGENERATOR },
+  [Species.SLIGGOO]: { 0: Abilities.POISON_HEAL },
+  [Species.GOODRA]: { 0: Abilities.POISON_HEAL },
+  [Species.HISUI_SLIGGOO]: { 0: Abilities.REGENERATOR },
+  [Species.HISUI_GOODRA]: { 0: Abilities.REGENERATOR },
   [Species.KLEFKI]: { 0: Abilities.LEVITATE },
   [Species.PHANTUMP]: { 0: Abilities.SHADOW_TAG },
-  [Species.PUMPKABOO]: { 0: Abilities.WELL_BAKED_BODY },
+  [Species.TREVENANT]: { 0: Abilities.SHADOW_TAG },
+  [Species.PUMPKABOO]: { 0: Abilities.ILLUMINATE, 1: Abilities.ADAPTABILITY, 2: Abilities.WELL_BAKED_BODY, 3: Abilities.SEED_SOWER },
+  [Species.GOURGEIST]: { 0: Abilities.ILLUMINATE, 1: Abilities.ADAPTABILITY, 2: Abilities.WELL_BAKED_BODY, 3: Abilities.SEED_SOWER },
   [Species.BERGMITE]: { 0: Abilities.ICE_SCALES },
-  [Species.NOIBAT]: { 0: Abilities.PUNK_ROCK },
-  [Species.XERNEAS]: { 0: Abilities.HARVEST },
+  [Species.AVALUGG]: { 0: Abilities.ICE_SCALES },
+  [Species.HISUI_AVALUGG]: { 0: Abilities.ICE_SCALES },
+  [Species.NOIBAT]: { 0: Abilities.CHEEK_POUCH },
+  [Species.NOIVERN]: { 0: Abilities.PUNK_ROCK },
+  [Species.XERNEAS]: { 0: Abilities.HARVEST, 1: Abilities.HARVEST },
   [Species.YVELTAL]: { 0: Abilities.SOUL_HEART },
-  [Species.ZYGARDE]: { 0: Abilities.ADAPTABILITY },
-  [Species.DIANCIE]: { 0: Abilities.PRISM_ARMOR },
-  [Species.HOOPA]: { 0: Abilities.OPPORTUNIST },
+  [Species.ZYGARDE]: { 0: Abilities.UNNERVE, 1: Abilities.MOXIE, 2: Abilities.UNNERVE, 3: Abilities.MOXIE, 4: Abilities.ADAPTABILITY, 5: Abilities.ADAPTABILITY },
+  [Species.DIANCIE]: { 0: Abilities.SOLID_ROCK, 1: Abilities.PRISM_ARMOR },
+  [Species.HOOPA]: { 0: Abilities.OPPORTUNIST, 1: Abilities.OPPORTUNIST },
   [Species.VOLCANION]: { 0: Abilities.NEUTRALIZING_GAS },
   [Species.ETERNAL_FLOETTE]: { 0: Abilities.MAGIC_GUARD },
 
-  [Species.ROWLET]: { 0: Abilities.SNIPER },
+  [Species.ROWLET]: { 0: Abilities.WIND_RIDER },
+  [Species.DARTRIX]: { 0: Abilities.WIND_RIDER },
+  [Species.DECIDUEYE]: { 0: Abilities.SNIPER },
+  [Species.HISUI_DECIDUEYE]: { 0: Abilities.SNIPER },
   [Species.LITTEN]: { 0: Abilities.OPPORTUNIST },
+  [Species.TORRACAT]: { 0: Abilities.OPPORTUNIST },
+  [Species.INCINEROAR]: { 0: Abilities.OPPORTUNIST },
   [Species.POPPLIO]: { 0: Abilities.PUNK_ROCK },
+  [Species.BRIONNE]: { 0: Abilities.PUNK_ROCK },
+  [Species.PRIMARINA]: { 0: Abilities.PUNK_ROCK },
   [Species.PIKIPEK]: { 0: Abilities.TECHNICIAN },
+  [Species.TRUMBEAK]: { 0: Abilities.TECHNICIAN },
+  [Species.TOUCANNON]: { 0: Abilities.TECHNICIAN },
   [Species.YUNGOOS]: { 0: Abilities.TOUGH_CLAWS },
-  [Species.GRUBBIN]: { 0: Abilities.SPEED_BOOST },
+  [Species.GUMSHOOS]: { 0: Abilities.TOUGH_CLAWS },
+  [Species.GRUBBIN]: { 0: Abilities.SHIELD_DUST },
+  [Species.CHARJABUG]: { 0: Abilities.POWER_SPOT },
+  [Species.VIKAVOLT]: { 0: Abilities.SPEED_BOOST },
   [Species.CRABRAWLER]: { 0: Abilities.WATER_BUBBLE },
-  [Species.ORICORIO]: { 0: Abilities.ADAPTABILITY },
-  [Species.CUTIEFLY]: { 0: Abilities.TINTED_LENS },
-  [Species.ROCKRUFF]: { 0: Abilities.ROCKY_PAYLOAD },
-  [Species.WISHIWASHI]: { 0: Abilities.REGENERATOR },
+  [Species.CRABOMINABLE]: { 0: Abilities.WATER_BUBBLE },
+  [Species.ORICORIO]: { 0: Abilities.ADAPTABILITY, 1: Abilities.ADAPTABILITY, 2: Abilities.ADAPTABILITY, 3: Abilities.ADAPTABILITY },
+  [Species.CUTIEFLY]: { 0: Abilities.PICKUP },
+  [Species.RIBOMBEE]: { 0: Abilities.PICKUP },
+  [Species.ROCKRUFF]: { 0: Abilities.PICKUP, 1: Abilities.PICKUP },
+  [Species.LYCANROC]: { 0: Abilities.STURDY, 1: Abilities.INTIMIDATE, 2: Abilities.STAKEOUT },
+  [Species.WISHIWASHI]: { 0: Abilities.REGENERATOR, 1: Abilities.REGENERATOR },
   [Species.MAREANIE]: { 0: Abilities.TOXIC_DEBRIS },
+  [Species.TOXAPEX]: { 0: Abilities.TOXIC_DEBRIS },
   [Species.MUDBRAY]: { 0: Abilities.SAP_SIPPER },
+  [Species.MUDSDALE]: { 0: Abilities.SAP_SIPPER },
   [Species.DEWPIDER]: { 0: Abilities.TINTED_LENS },
+  [Species.ARAQUANID]: { 0: Abilities.TINTED_LENS },
   [Species.FOMANTIS]: { 0: Abilities.SHARPNESS },
+  [Species.LURANTIS]: { 0: Abilities.SHARPNESS },
   [Species.MORELULL]: { 0: Abilities.TRIAGE },
-  [Species.SALANDIT]: { 0: Abilities.DRAGONS_MAW },
+  [Species.SHIINOTIC]: { 0: Abilities.TRIAGE },
+  [Species.SALANDIT]: { 0: Abilities.PICKUP },
+  [Species.SALAZZLE]: { 0: Abilities.DRAGONS_MAW },
   [Species.STUFFUL]: { 0: Abilities.SCRAPPY },
-  [Species.BOUNSWEET]: { 0: Abilities.MOXIE },
+  [Species.BEWEAR]: { 0: Abilities.SCRAPPY },
+  [Species.BOUNSWEET]: { 0: Abilities.SIMPLE },
+  [Species.STEENEE]: { 0: Abilities.SIMPLE },
+  [Species.TSAREENA]: { 0: Abilities.MOXIE },
   [Species.COMFEY]: { 0: Abilities.FRIEND_GUARD },
   [Species.ORANGURU]: { 0: Abilities.POWER_SPOT },
   [Species.PASSIMIAN]: { 0: Abilities.LIBERO },
   [Species.WIMPOD]: { 0: Abilities.REGENERATOR },
+  [Species.GOLISOPOD]: { 0: Abilities.REGENERATOR },
   [Species.SANDYGAST]: { 0: Abilities.SAND_SPIT },
+  [Species.PALOSSAND]: { 0: Abilities.SAND_SPIT },
   [Species.PYUKUMUKU]: { 0: Abilities.PURIFYING_SALT },
-  [Species.TYPE_NULL]: { 0: Abilities.ADAPTABILITY },
-  [Species.MINIOR]: { 0: Abilities.STURDY },
+  [Species.TYPE_NULL]: { 0: Abilities.CLEAR_BODY },
+  [Species.SILVALLY]: { 0: Abilities.ADAPTABILITY, 1: Abilities.ADAPTABILITY, 2: Abilities.ADAPTABILITY, 3: Abilities.ADAPTABILITY, 4: Abilities.ADAPTABILITY, 5: Abilities.ADAPTABILITY, 6: Abilities.ADAPTABILITY, 7: Abilities.ADAPTABILITY, 8: Abilities.ADAPTABILITY, 9: Abilities.ADAPTABILITY, 10: Abilities.ADAPTABILITY, 11: Abilities.ADAPTABILITY, 12: Abilities.ADAPTABILITY, 13: Abilities.ADAPTABILITY, 14: Abilities.ADAPTABILITY, 15: Abilities.ADAPTABILITY, 16: Abilities.ADAPTABILITY, 17: Abilities.ADAPTABILITY },
+  [Species.MINIOR]: { 0: Abilities.STURDY, 1: Abilities.STURDY, 2: Abilities.STURDY, 3: Abilities.STURDY, 4: Abilities.STURDY, 5: Abilities.STURDY, 6: Abilities.STURDY, 7: Abilities.AERILATE, 8: Abilities.AERILATE, 9: Abilities.AERILATE, 10: Abilities.AERILATE, 11: Abilities.AERILATE, 12: Abilities.AERILATE, 13: Abilities.AERILATE },
   [Species.KOMALA]: { 0: Abilities.GUTS },
   [Species.TURTONATOR]: { 0: Abilities.DAUNTLESS_SHIELD },
   [Species.TOGEDEMARU]: { 0: Abilities.ROUGH_SKIN },
-  [Species.MIMIKYU]: { 0: Abilities.TOUGH_CLAWS },
+  [Species.MIMIKYU]: { 0: Abilities.TOUGH_CLAWS, 1: Abilities.TOUGH_CLAWS },
   [Species.BRUXISH]: { 0: Abilities.MULTISCALE },
   [Species.DRAMPA]: { 0: Abilities.THICK_FAT },
   [Species.DHELMISE]: { 0: Abilities.WATER_BUBBLE },
   [Species.JANGMO_O]: { 0: Abilities.DAUNTLESS_SHIELD },
+  [Species.HAKAMO_O]: { 0: Abilities.DAUNTLESS_SHIELD },
+  [Species.KOMMO_O]: { 0: Abilities.DAUNTLESS_SHIELD },
   [Species.TAPU_KOKO]: { 0: Abilities.DAUNTLESS_SHIELD },
   [Species.TAPU_LELE]: { 0: Abilities.BERSERK },
   [Species.TAPU_BULU]: { 0: Abilities.FLOWER_VEIL },
   [Species.TAPU_FINI]: { 0: Abilities.FAIRY_AURA },
-  [Species.COSMOG]: { 0: Abilities.BEAST_BOOST },
+  [Species.COSMOG]: { 0: Abilities.PICKUP },
+  [Species.COSMOEM]: { 0: Abilities.POWER_SPOT },
+  [Species.SOLGALEO]: { 0: Abilities.BEAST_BOOST },
+  [Species.LUNALA]: { 0: Abilities.BEAST_BOOST },
   [Species.NIHILEGO]: { 0: Abilities.LEVITATE },
   [Species.BUZZWOLE]: { 0: Abilities.MOXIE },
   [Species.PHEROMOSA]: { 0: Abilities.TINTED_LENS },
   [Species.XURKITREE]: { 0: Abilities.TRANSISTOR },
   [Species.CELESTEELA]: { 0: Abilities.HEATPROOF },
-  [Species.KARTANA]: { 0: Abilities.LONG_REACH },
+  [Species.KARTANA]: { 0: Abilities.TECHNICIAN },
   [Species.GUZZLORD]: { 0: Abilities.POISON_HEAL },
-  [Species.NECROZMA]: { 0: Abilities.BEAST_BOOST },
-  [Species.MAGEARNA]: { 0: Abilities.STEELY_SPIRIT },
+  [Species.NECROZMA]: { 0: Abilities.BEAST_BOOST, 1: Abilities.FULL_METAL_BODY, 2: Abilities.SHADOW_SHIELD, 3: Abilities.UNNERVE },
+  [Species.MAGEARNA]: { 0: Abilities.STEELY_SPIRIT, 1: Abilities.STEELY_SPIRIT },
   [Species.MARSHADOW]: { 0: Abilities.IRON_FIST },
   [Species.POIPOLE]: { 0: Abilities.LEVITATE },
+  [Species.NAGANADEL]: { 0: Abilities.LEVITATE },
   [Species.STAKATAKA]: { 0: Abilities.SOLID_ROCK },
   [Species.BLACEPHALON]: { 0: Abilities.MAGIC_GUARD },
   [Species.ZERAORA]: { 0: Abilities.TOUGH_CLAWS },
   [Species.MELTAN]: { 0: Abilities.HEATPROOF },
+  [Species.MELMETAL]: { 0: Abilities.HEATPROOF, 1: Abilities.FULL_METAL_BODY },
   [Species.ALOLA_RATTATA]: { 0: Abilities.ADAPTABILITY },
+  [Species.ALOLA_RATICATE]: { 0: Abilities.ADAPTABILITY },
   [Species.ALOLA_SANDSHREW]: { 0: Abilities.ICE_SCALES },
-  [Species.ALOLA_VULPIX]: { 0: Abilities.SHEER_FORCE },
+  [Species.ALOLA_SANDSLASH]: { 0: Abilities.ICE_SCALES },
+  [Species.ALOLA_VULPIX]: { 0: Abilities.ICE_BODY },
+  [Species.ALOLA_NINETALES]: { 0: Abilities.ICE_BODY },
   [Species.ALOLA_DIGLETT]: { 0: Abilities.STURDY },
+  [Species.ALOLA_DUGTRIO]: { 0: Abilities.STURDY },
   [Species.ALOLA_MEOWTH]: { 0: Abilities.DARK_AURA },
+  [Species.ALOLA_PERSIAN]: { 0: Abilities.DARK_AURA },
   [Species.ALOLA_GEODUDE]: { 0: Abilities.DRY_SKIN },
+  [Species.ALOLA_GRAVELER]: { 0: Abilities.DRY_SKIN },
+  [Species.ALOLA_GOLEM]: { 0: Abilities.DRY_SKIN },
   [Species.ALOLA_GRIMER]: { 0: Abilities.TOXIC_DEBRIS },
+  [Species.ALOLA_MUK]: { 0: Abilities.TOXIC_DEBRIS },
 
-  [Species.GROOKEY]: { 0: Abilities.GRASS_PELT },
-  [Species.SCORBUNNY]: { 0: Abilities.NO_GUARD },
+  [Species.GROOKEY]: { 0: Abilities.PICKPOCKET },
+  [Species.THWACKEY]: { 0: Abilities.PICKPOCKET },
+  [Species.RILLABOOM]: { 0: Abilities.GRASS_PELT, 1: Abilities.GRASS_PELT },
+  [Species.SCORBUNNY]: { 0: Abilities.SHEER_FORCE },
+  [Species.RABOOT]: { 0: Abilities.SHEER_FORCE },
+  [Species.CINDERACE]: { 0: Abilities.NO_GUARD, 1: Abilities.NO_GUARD },
   [Species.SOBBLE]: { 0: Abilities.SUPER_LUCK },
+  [Species.DRIZZILE]: { 0: Abilities.SUPER_LUCK },
+  [Species.INTELEON]: { 0: Abilities.SUPER_LUCK, 1: Abilities.SUPER_LUCK },
   [Species.SKWOVET]: { 0: Abilities.HARVEST },
-  [Species.ROOKIDEE]: { 0: Abilities.IRON_BARBS },
-  [Species.BLIPBUG]: { 0: Abilities.PSYCHIC_SURGE },
+  [Species.GREEDENT]: { 0: Abilities.HARVEST },
+  [Species.ROOKIDEE]: { 0: Abilities.GALE_WINGS },
+  [Species.CORVISQUIRE]: { 0: Abilities.GALE_WINGS },
+  [Species.CORVIKNIGHT]: { 0: Abilities.IRON_BARBS, 1: Abilities.IRON_BARBS },
+  [Species.BLIPBUG]: { 0: Abilities.RUN_AWAY },
+  [Species.DOTTLER]: { 0: Abilities.PSYCHIC_SURGE },
+  [Species.ORBEETLE]: { 0: Abilities.PSYCHIC_SURGE, 1: Abilities.PSYCHIC_SURGE },
   [Species.NICKIT]: { 0: Abilities.MAGICIAN },
-  [Species.GOSSIFLEUR]: { 0: Abilities.GRASSY_SURGE },
+  [Species.THIEVUL]: { 0: Abilities.MAGICIAN },
+  [Species.GOSSIFLEUR]: { 0: Abilities.SEED_SOWER },
+  [Species.ELDEGOSS]: { 0: Abilities.GRASSY_SURGE },
   [Species.WOOLOO]: { 0: Abilities.SCRAPPY },
-  [Species.CHEWTLE]: { 0: Abilities.ROCKY_PAYLOAD },
-  [Species.YAMPER]: { 0: Abilities.SHEER_FORCE },
+  [Species.DUBWOOL]: { 0: Abilities.SCRAPPY },
+  [Species.CHEWTLE]: { 0: Abilities.SOLID_ROCK },
+  [Species.DREDNAW]: { 0: Abilities.SOLID_ROCK, 1: Abilities.SOLID_ROCK },
+  [Species.YAMPER]: { 0: Abilities.PICKUP },
+  [Species.BOLTUND]: { 0: Abilities.SHEER_FORCE },
   [Species.ROLYCOLY]: { 0: Abilities.SOLID_ROCK },
-  [Species.APPLIN]: { 0: Abilities.DRAGONS_MAW },
+  [Species.CARKOL]: { 0: Abilities.SOLID_ROCK },
+  [Species.COALOSSAL]: { 0: Abilities.SOLID_ROCK, 1: Abilities.SOLID_ROCK },
+  [Species.APPLIN]: { 0: Abilities.STURDY },
+  [Species.FLAPPLE]: { 0: Abilities.NO_GUARD, 1: Abilities.NO_GUARD },
+  [Species.APPLETUN]: { 0: Abilities.WELL_BAKED_BODY, 1: Abilities.WELL_BAKED_BODY },
+  [Species.DIPPLIN]: { 0: Abilities.PARENTAL_BOND },
+  [Species.HYDRAPPLE]: { 0: Abilities.PARENTAL_BOND },
   [Species.SILICOBRA]: { 0: Abilities.SAND_RUSH },
-  [Species.CRAMORANT]: { 0: Abilities.LIGHTNING_ROD },
-  [Species.ARROKUDA]: { 0: Abilities.INTIMIDATE },
+  [Species.SANDACONDA]: { 0: Abilities.SAND_RUSH, 1: Abilities.SAND_RUSH },
+  [Species.CRAMORANT]: { 0: Abilities.LIGHTNING_ROD, 1: Abilities.LIGHTNING_ROD, 2: Abilities.LIGHTNING_ROD },
+  [Species.ARROKUDA]: { 0: Abilities.SPEED_BOOST },
+  [Species.BARRASKEWDA]: { 0: Abilities.INTIMIDATE },
   [Species.TOXEL]: { 0: Abilities.ELECTRIC_SURGE },
-  [Species.SIZZLIPEDE]: { 0: Abilities.SPEED_BOOST },
+  [Species.TOXTRICITY]: { 0: Abilities.ELECTRIC_SURGE, 1: Abilities.ELECTRIC_SURGE, 2: Abilities.ELECTRIC_SURGE },
+  [Species.SIZZLIPEDE]: { 0: Abilities.HUSTLE },
+  [Species.CENTISKORCH]: { 0: Abilities.HUSTLE, 1: Abilities.HUSTLE },
   [Species.CLOBBOPUS]: { 0: Abilities.WATER_BUBBLE },
-  [Species.SINISTEA]: { 0: Abilities.SHADOW_SHIELD },
+  [Species.GRAPPLOCT]: { 0: Abilities.WATER_BUBBLE },
+  [Species.SINISTEA]: { 0: Abilities.SHADOW_SHIELD, 1: Abilities.SHADOW_SHIELD },
+  [Species.POLTEAGEIST]: { 0: Abilities.SHADOW_SHIELD, 1: Abilities.SHADOW_SHIELD },
   [Species.HATENNA]: { 0: Abilities.FAIRY_AURA },
+  [Species.HATTREM]: { 0: Abilities.FAIRY_AURA },
+  [Species.HATTERENE]: { 0: Abilities.FAIRY_AURA, 1: Abilities.FAIRY_AURA },
   [Species.IMPIDIMP]: { 0: Abilities.INTIMIDATE },
+  [Species.MORGREM]: { 0: Abilities.INTIMIDATE },
+  [Species.GRIMMSNARL]: { 0: Abilities.INTIMIDATE, 1: Abilities.INTIMIDATE },
   [Species.MILCERY]: { 0: Abilities.REGENERATOR },
-  [Species.FALINKS]: { 0: Abilities.PARENTAL_BOND },
+  [Species.ALCREMIE]: { 0: Abilities.REGENERATOR, 1: Abilities.REGENERATOR, 2: Abilities.REGENERATOR, 3: Abilities.REGENERATOR, 4: Abilities.REGENERATOR, 5: Abilities.REGENERATOR, 6: Abilities.REGENERATOR, 7: Abilities.REGENERATOR, 8: Abilities.REGENERATOR, 9: Abilities.REGENERATOR },
+  [Species.FALINKS]: { 0: Abilities.DAUNTLESS_SHIELD },
   [Species.PINCURCHIN]: { 0: Abilities.ELECTROMORPHOSIS },
   [Species.SNOM]: { 0: Abilities.SNOW_WARNING },
+  [Species.FROSMOTH]: { 0: Abilities.SNOW_WARNING },
   [Species.STONJOURNER]: { 0: Abilities.STURDY },
-  [Species.EISCUE]: { 0: Abilities.ICE_SCALES },
-  [Species.INDEEDEE]: { 0: Abilities.FRIEND_GUARD },
-  [Species.MORPEKO]: { 0: Abilities.MOODY },
+  [Species.EISCUE]: { 0: Abilities.ICE_SCALES, 1: Abilities.ICE_SCALES },
+  [Species.INDEEDEE]: { 0: Abilities.HOSPITALITY, 1: Abilities.FRIEND_GUARD },
+  [Species.MORPEKO]: { 0: Abilities.MOODY, 1: Abilities.MOODY },
   [Species.CUFANT]: { 0: Abilities.EARTH_EATER },
+  [Species.COPPERAJAH]: { 0: Abilities.EARTH_EATER, 1: Abilities.EARTH_EATER },
   [Species.DRACOZOLT]: { 0: Abilities.NO_GUARD },
   [Species.ARCTOZOLT]: { 0: Abilities.WATER_ABSORB },
-  [Species.DRACOVISH]: { 0: Abilities.SWIFT_SWIM },
+  [Species.DRACOVISH]: { 0: Abilities.THERMAL_EXCHANGE },
   [Species.ARCTOVISH]: { 0: Abilities.STRONG_JAW },
-  [Species.DURALUDON]: { 0: Abilities.STEELWORKER },
-  [Species.DREEPY]: { 0: Abilities.PARENTAL_BOND },
-  [Species.ZACIAN]: { 0: Abilities.UNNERVE },
-  [Species.ZAMAZENTA]: { 0: Abilities.UNNERVE },
-  [Species.ETERNATUS]: { 0: Abilities.NEUTRALIZING_GAS },
+  [Species.DURALUDON]: { 0: Abilities.FILTER, 1: Abilities.UNAWARE },
+  [Species.ARCHALUDON]: { 0: Abilities.TRANSISTOR },
+  [Species.DREEPY]: { 0: Abilities.TECHNICIAN },
+  [Species.DRAKLOAK]: { 0: Abilities.PARENTAL_BOND },
+  [Species.DRAGAPULT]: { 0: Abilities.PARENTAL_BOND },
+  [Species.ZACIAN]: { 0: Abilities.UNNERVE, 1: Abilities.UNNERVE },
+  [Species.ZAMAZENTA]: { 0: Abilities.UNNERVE, 1: Abilities.UNNERVE },
+  [Species.ETERNATUS]: { 0: Abilities.NEUTRALIZING_GAS, 1: Abilities.NEUTRALIZING_GAS },
   [Species.KUBFU]: { 0: Abilities.IRON_FIST },
-  [Species.ZARUDE]: { 0: Abilities.TOUGH_CLAWS },
+  [Species.URSHIFU]: { 0: Abilities.IRON_FIST, 1: Abilities.IRON_FIST, 2: Abilities.IRON_FIST, 3: Abilities.IRON_FIST },
+  [Species.ZARUDE]: { 0: Abilities.TOUGH_CLAWS, 1: Abilities.TOUGH_CLAWS },
   [Species.REGIELEKI]: { 0: Abilities.ELECTRIC_SURGE },
   [Species.REGIDRAGO]: { 0: Abilities.MULTISCALE },
   [Species.GLASTRIER]: { 0: Abilities.FILTER },
-  [Species.SPECTRIER]: { 0: Abilities.SHADOW_SHIELD },
-  [Species.CALYREX]: { 0: Abilities.HARVEST },
-  [Species.ENAMORUS]: { 0: Abilities.FAIRY_AURA },
+  [Species.SPECTRIER]: { 0: Abilities.DAZZLING },
+  [Species.CALYREX]: { 0: Abilities.HARVEST, 1: Abilities.FILTER, 2: Abilities.DAZZLING },
+  [Species.ENAMORUS]: { 0: Abilities.FAIRY_AURA, 1: Abilities.FAIRY_AURA },
   [Species.GALAR_MEOWTH]: { 0: Abilities.UNBURDEN },
+  [Species.PERRSERKER]: { 0: Abilities.UNBURDEN },
   [Species.GALAR_PONYTA]: { 0: Abilities.CHILLING_NEIGH },
-  [Species.GALAR_SLOWPOKE]: { 0: Abilities.UNAWARE },
-  [Species.GALAR_FARFETCHD]: { 0: Abilities.INTREPID_SWORD },
+  [Species.GALAR_RAPIDASH]: { 0: Abilities.CHILLING_NEIGH },
+  [Species.GALAR_SLOWPOKE]: { 0: Abilities.OBLIVIOUS },
+  [Species.GALAR_SLOWBRO]: { 0: Abilities.NEUROFORCE },
+  [Species.GALAR_SLOWKING]: { 0: Abilities.INTIMIDATE },
+  [Species.GALAR_FARFETCHD]: { 0: Abilities.STAKEOUT },
+  [Species.SIRFETCHD]: { 0: Abilities.INTREPID_SWORD },
   [Species.GALAR_ARTICUNO]: { 0: Abilities.SERENE_GRACE },
   [Species.GALAR_ZAPDOS]: { 0: Abilities.TOUGH_CLAWS },
   [Species.GALAR_MOLTRES]: { 0: Abilities.DARK_AURA },
   [Species.GALAR_CORSOLA]: { 0: Abilities.SHADOW_SHIELD },
+  [Species.CURSOLA]: { 0: Abilities.SHADOW_SHIELD },
   [Species.GALAR_ZIGZAGOON]: { 0: Abilities.POISON_HEAL },
+  [Species.GALAR_LINOONE]: { 0: Abilities.POISON_HEAL },
+  [Species.OBSTAGOON]: { 0: Abilities.POISON_HEAL },
   [Species.GALAR_DARUMAKA]: { 0: Abilities.FLASH_FIRE },
+  [Species.GALAR_DARMANITAN]: { 0: Abilities.FLASH_FIRE, 1: Abilities.FLASH_FIRE },
   [Species.GALAR_YAMASK]: { 0: Abilities.TABLETS_OF_RUIN },
+  [Species.RUNERIGUS]: { 0: Abilities.TABLETS_OF_RUIN },
   [Species.GALAR_STUNFISK]: { 0: Abilities.ARENA_TRAP },
   [Species.HISUI_GROWLITHE]: { 0: Abilities.RECKLESS },
+  [Species.HISUI_ARCANINE]: { 0: Abilities.RECKLESS },
   [Species.HISUI_VOLTORB]: { 0: Abilities.TRANSISTOR },
+  [Species.HISUI_ELECTRODE]: { 0: Abilities.TRANSISTOR },
   [Species.HISUI_QWILFISH]: { 0: Abilities.MERCILESS },
+  [Species.OVERQWIL]: { 0: Abilities.MERCILESS },
   [Species.HISUI_SNEASEL]: { 0: Abilities.SCRAPPY },
-  [Species.HISUI_ZORUA]: { 0: Abilities.ADAPTABILITY },
+  [Species.SNEASLER]: { 0: Abilities.SCRAPPY },
+  [Species.HISUI_ZORUA]: { 0: Abilities.SHADOW_SHIELD },
+  [Species.HISUI_ZOROARK]: { 0: Abilities.SHADOW_SHIELD },
 
-  [Species.SPRIGATITO]: { 0: Abilities.MAGICIAN },
-  [Species.FUECOCO]: { 0: Abilities.PUNK_ROCK },
+  [Species.SPRIGATITO]: { 0: Abilities.PICKUP },
+  [Species.FLORAGATO]: { 0: Abilities.MAGICIAN },
+  [Species.MEOWSCARADA]: { 0: Abilities.MAGICIAN },
+  [Species.FUECOCO]: { 0: Abilities.GLUTTONY },
+  [Species.CROCALOR]: { 0: Abilities.PUNK_ROCK },
+  [Species.SKELEDIRGE]: { 0: Abilities.PUNK_ROCK },
   [Species.QUAXLY]: { 0: Abilities.OPPORTUNIST },
+  [Species.QUAXWELL]: { 0: Abilities.OPPORTUNIST },
+  [Species.QUAQUAVAL]: { 0: Abilities.OPPORTUNIST },
   [Species.LECHONK]: { 0: Abilities.SIMPLE },
+  [Species.OINKOLOGNE]: { 0: Abilities.SIMPLE, 1: Abilities.SIMPLE },
   [Species.TAROUNTULA]: { 0: Abilities.HONEY_GATHER },
-  [Species.NYMBLE]: { 0: Abilities.GUTS },
+  [Species.SPIDOPS]: { 0: Abilities.HONEY_GATHER },
+  [Species.NYMBLE]: { 0: Abilities.TECHNICIAN },
+  [Species.LOKIX]: { 0: Abilities.GUTS },
   [Species.PAWMI]: { 0: Abilities.TRANSISTOR },
-  [Species.TANDEMAUS]: { 0: Abilities.SCRAPPY },
+  [Species.PAWMO]: { 0: Abilities.TRANSISTOR },
+  [Species.PAWMOT]: { 0: Abilities.TRANSISTOR },
+  [Species.TANDEMAUS]: { 0: Abilities.FRIEND_GUARD },
+  [Species.MAUSHOLD]: { 0: Abilities.SCRAPPY, 1: Abilities.SCRAPPY },
   [Species.FIDOUGH]: { 0: Abilities.WATER_ABSORB },
+  [Species.DACHSBUN]: { 0: Abilities.WATER_ABSORB },
   [Species.SMOLIV]: { 0: Abilities.RIPEN },
-  [Species.SQUAWKABILLY]: { 0: Abilities.MOXIE },
+  [Species.DOLLIV]: { 0: Abilities.RIPEN },
+  [Species.ARBOLIVA]: { 0: Abilities.RIPEN },
+  [Species.SQUAWKABILLY]: { 0: Abilities.MOXIE, 1: Abilities.MOXIE, 2: Abilities.MOXIE, 3: Abilities.MOXIE },
   [Species.NACLI]: { 0: Abilities.SOLID_ROCK },
-  [Species.CHARCADET]: { 0: Abilities.PRISM_ARMOR },
-  [Species.TADBULB]: { 0: Abilities.STAMINA },
+  [Species.NACLSTACK]: { 0: Abilities.SOLID_ROCK },
+  [Species.GARGANACL]: { 0: Abilities.SOLID_ROCK },
+  [Species.CHARCADET]: { 0: Abilities.BATTLE_ARMOR },
+  [Species.ARMAROUGE]: { 0: Abilities.PRISM_ARMOR },
+  [Species.CERULEDGE]: { 0: Abilities.PRISM_ARMOR },
+  [Species.TADBULB]: { 0: Abilities.LEVITATE },
+  [Species.BELLIBOLT]: { 0: Abilities.STAMINA },
   [Species.WATTREL]: { 0: Abilities.SHEER_FORCE },
+  [Species.KILOWATTREL]: { 0: Abilities.SHEER_FORCE },
   [Species.MASCHIFF]: { 0: Abilities.STRONG_JAW },
+  [Species.MABOSSTIFF]: { 0: Abilities.STRONG_JAW },
   [Species.SHROODLE]: { 0: Abilities.CORROSION },
-  [Species.BRAMBLIN]: { 0: Abilities.SHADOW_SHIELD },
-  [Species.TOEDSCOOL]: { 0: Abilities.PRANKSTER },
+  [Species.GRAFAIAI]: { 0: Abilities.CORROSION },
+  [Species.BRAMBLIN]: { 0: Abilities.WANDERING_SPIRIT },
+  [Species.BRAMBLEGHAST]: { 0: Abilities.SHADOW_SHIELD },
+  [Species.TOEDSCOOL]: { 0: Abilities.RUN_AWAY },
+  [Species.TOEDSCRUEL]: { 0: Abilities.PRANKSTER },
   [Species.KLAWF]: { 0: Abilities.WATER_ABSORB },
-  [Species.CAPSAKID]: { 0: Abilities.PARENTAL_BOND },
+  [Species.CAPSAKID]: { 0: Abilities.FLOWER_GIFT },
+  [Species.SCOVILLAIN]: { 0: Abilities.PARENTAL_BOND },
   [Species.RELLOR]: { 0: Abilities.PRANKSTER },
+  [Species.RABSCA]: { 0: Abilities.PRANKSTER },
   [Species.FLITTLE]: { 0: Abilities.DAZZLING },
+  [Species.ESPATHRA]: { 0: Abilities.DAZZLING },
   [Species.TINKATINK]: { 0: Abilities.STEELWORKER },
+  [Species.TINKATUFF]: { 0: Abilities.STEELWORKER },
+  [Species.TINKATON]: { 0: Abilities.STEELWORKER },
   [Species.WIGLETT]: { 0: Abilities.STURDY },
+  [Species.WUGTRIO]: { 0: Abilities.STURDY },
   [Species.BOMBIRDIER]: { 0: Abilities.UNBURDEN },
-  [Species.FINIZEN]: { 0: Abilities.IRON_FIST },
+  [Species.FINIZEN]: { 0: Abilities.SWIFT_SWIM },
+  [Species.PALAFIN]: { 0: Abilities.EMERGENCY_EXIT, 1: Abilities.IRON_FIST },
   [Species.VAROOM]: { 0: Abilities.LEVITATE },
+  [Species.REVAVROOM]: { 0: Abilities.LEVITATE, 1: Abilities.DARK_AURA, 2: Abilities.FLASH_FIRE, 3: Abilities.MERCILESS, 4: Abilities.FILTER, 5: Abilities.SCRAPPY },
   [Species.CYCLIZAR]: { 0: Abilities.PROTEAN },
   [Species.ORTHWORM]: { 0: Abilities.REGENERATOR },
-  [Species.GLIMMET]: { 0: Abilities.TERA_SHELL },
+  [Species.GLIMMET]: { 0: Abilities.STURDY },
+  [Species.GLIMMORA]: { 0: Abilities.TERA_SHELL },
   [Species.GREAVARD]: { 0: Abilities.UNAWARE },
+  [Species.HOUNDSTONE]: { 0: Abilities.UNAWARE },
   [Species.FLAMIGO]: { 0: Abilities.MOXIE },
   [Species.CETODDLE]: { 0: Abilities.REFRIGERATE },
+  [Species.CETITAN]: { 0: Abilities.REFRIGERATE },
   [Species.VELUZA]: { 0: Abilities.SUPER_LUCK },
   [Species.DONDOZO]: { 0: Abilities.DRAGONS_MAW },
-  [Species.TATSUGIRI]: { 0: Abilities.FLUFFY },
+  [Species.TATSUGIRI]: { 0: Abilities.FLUFFY, 1: Abilities.FLUFFY, 2: Abilities.FLUFFY },
   [Species.GREAT_TUSK]: { 0: Abilities.INTIMIDATE },
   [Species.SCREAM_TAIL]: { 0: Abilities.UNAWARE },
   [Species.BRUTE_BONNET]: { 0: Abilities.CHLOROPHYLL },
   [Species.FLUTTER_MANE]: { 0: Abilities.DAZZLING },
   [Species.SLITHER_WING]: { 0: Abilities.SCRAPPY },
   [Species.SANDY_SHOCKS]: { 0: Abilities.ELECTRIC_SURGE },
-  [Species.IRON_TREADS]: { 0: Abilities.STEELY_SPIRIT },
+  [Species.IRON_TREADS]: { 0: Abilities.DAUNTLESS_SHIELD },
   [Species.IRON_BUNDLE]: { 0: Abilities.SNOW_WARNING },
   [Species.IRON_HANDS]: { 0: Abilities.IRON_FIST },
   [Species.IRON_JUGULIS]: { 0: Abilities.LIGHTNING_ROD },
   [Species.IRON_MOTH]: { 0: Abilities.LEVITATE },
   [Species.IRON_THORNS]: { 0: Abilities.SAND_STREAM },
   [Species.FRIGIBAX]: { 0: Abilities.INTIMIDATE },
-  [Species.GIMMIGHOUL]: { 0: Abilities.HONEY_GATHER },
+  [Species.ARCTIBAX]: { 0: Abilities.INTIMIDATE },
+  [Species.BAXCALIBUR]: { 0: Abilities.INTIMIDATE },
+  [Species.GIMMIGHOUL]: { 0: Abilities.HONEY_GATHER, 1: Abilities.HONEY_GATHER },
+  [Species.GHOLDENGO]: { 0: Abilities.HONEY_GATHER },
   [Species.WO_CHIEN]: { 0: Abilities.VESSEL_OF_RUIN },
   [Species.CHIEN_PAO]: { 0: Abilities.INTIMIDATE },
   [Species.TING_LU]: { 0: Abilities.STAMINA },
   [Species.CHI_YU]: { 0: Abilities.BERSERK },
-  [Species.ROARING_MOON]: { 0: Abilities.TOUGH_CLAWS },
+  [Species.ROARING_MOON]: { 0: Abilities.INTIMIDATE },
   [Species.IRON_VALIANT]: { 0: Abilities.NEUROFORCE },
-  [Species.KORAIDON]: { 0: Abilities.OPPORTUNIST },
-  [Species.MIRAIDON]: { 0: Abilities.OPPORTUNIST },
+  [Species.KORAIDON]: { 0: Abilities.THERMAL_EXCHANGE },
+  [Species.MIRAIDON]: { 0: Abilities.COMPOUND_EYES },
   [Species.WALKING_WAKE]: { 0: Abilities.BEAST_BOOST },
   [Species.IRON_LEAVES]: { 0: Abilities.SHARPNESS },
-  [Species.POLTCHAGEIST]: { 0: Abilities.TRIAGE },
+  [Species.POLTCHAGEIST]: { 0: Abilities.TRIAGE, 1: Abilities.TRIAGE },
+  [Species.SINISTCHA]: { 0: Abilities.TRIAGE, 1: Abilities.TRIAGE },
   [Species.OKIDOGI]: { 0: Abilities.DARK_AURA },
   [Species.MUNKIDORI]: { 0: Abilities.MAGICIAN },
   [Species.FEZANDIPITI]: { 0: Abilities.PIXILATE },
-  [Species.OGERPON]: { 0: Abilities.OPPORTUNIST },
+  [Species.OGERPON]: { 0: Abilities.OPPORTUNIST, 1: Abilities.SUPER_LUCK, 2: Abilities.FLASH_FIRE, 3: Abilities.MAGIC_GUARD, 4: Abilities.OPPORTUNIST, 5: Abilities.SUPER_LUCK, 6: Abilities.FLASH_FIRE, 7: Abilities.MAGIC_GUARD },
   [Species.GOUGING_FIRE]: { 0: Abilities.BEAST_BOOST },
   [Species.RAGING_BOLT]: { 0: Abilities.BEAST_BOOST },
   [Species.IRON_BOULDER]: { 0: Abilities.SHARPNESS },
   [Species.IRON_CROWN]: { 0: Abilities.SHARPNESS },
-  [Species.TERAPAGOS]: { 0: Abilities.SOUL_HEART },
+  [Species.TERAPAGOS]: { 0: Abilities.SHIELD_DUST, 1: Abilities.SHIELD_DUST, 2: Abilities.SHIELD_DUST },
   [Species.PECHARUNT]: { 0: Abilities.TOXIC_CHAIN },
-  [Species.PALDEA_TAUROS]: { 0: Abilities.ADAPTABILITY },
-  [Species.PALDEA_WOOPER]: { 0: Abilities.THICK_FAT },
+  [Species.PALDEA_TAUROS]: { 0: Abilities.STAMINA, 1: Abilities.ADAPTABILITY, 2: Abilities.ADAPTABILITY },
+  [Species.PALDEA_WOOPER]: { 0: Abilities.POISON_TOUCH },
+  [Species.CLODSIRE]: { 0: Abilities.THICK_FAT },
   [Species.BLOODMOON_URSALUNA]: { 0: Abilities.BERSERK }
 };
diff --git a/src/data/balance/pokemon-evolutions.ts b/src/data/balance/pokemon-evolutions.ts
index 0e101c7155b..64409c3c989 100644
--- a/src/data/balance/pokemon-evolutions.ts
+++ b/src/data/balance/pokemon-evolutions.ts
@@ -2,8 +2,8 @@ import { globalScene } from "#app/global-scene";
 import { Gender } from "#app/data/gender";
 import { PokeballType } from "#enums/pokeball";
 import type Pokemon from "#app/field/pokemon";
-import { Type } from "#enums/type";
-import * as Utils from "#app/utils";
+import { PokemonType } from "#enums/pokemon-type";
+import { randSeedInt } from "#app/utils/common";
 import { WeatherType } from "#enums/weather-type";
 import { Nature } from "#enums/nature";
 import { Biome } from "#enums/biome";
@@ -14,6 +14,7 @@ import { DamageMoneyRewardModifier, ExtraModifierModifier, MoneyMultiplierModifi
 import { SpeciesFormKey } from "#enums/species-form-key";
 import { speciesStarterCosts } from "./starters";
 import i18next from "i18next";
+import { initI18n } from "#app/plugins/i18n";
 
 
 export enum SpeciesWildEvolutionDelay {
@@ -92,9 +93,12 @@ export class SpeciesFormEvolution {
   public item: EvolutionItem | null;
   public condition: SpeciesEvolutionCondition | null;
   public wildDelay: SpeciesWildEvolutionDelay;
-  public description: string = "";
+  public description = "";
 
   constructor(speciesId: Species, preFormKey: string | null, evoFormKey: string | null, level: number, item: EvolutionItem | null, condition: SpeciesEvolutionCondition | null, wildDelay?: SpeciesWildEvolutionDelay) {
+    if (!i18next.isInitialized) {
+      initI18n();
+    }
     this.speciesId = speciesId;
     this.preFormKey = preFormKey;
     this.evoFormKey = evoFormKey;
@@ -179,7 +183,7 @@ class TimeOfDayEvolutionCondition extends SpeciesEvolutionCondition {
 class MoveEvolutionCondition extends SpeciesEvolutionCondition {
   public move: Moves;
   constructor(move: Moves) {
-    super(p => p.moveset.filter(m => m?.moveId === move).length > 0);
+    super(p => p.moveset.filter(m => m.moveId === move).length > 0);
     this.move = move;
     const moveKey = Moves[this.move].split("_").filter(f => f).map((f, i) => i ? `${f[0]}${f.slice(1).toLowerCase()}` : f.toLowerCase()).join("");
     this.description = i18next.t("pokemonEvolutions:move", { move: i18next.t(`move:${moveKey}.name`) });
@@ -206,7 +210,7 @@ class FriendshipTimeOfDayEvolutionCondition extends SpeciesEvolutionCondition {
       super(p => p.friendship >= amount && (globalScene.arena.getTimeOfDay() === TimeOfDay.DUSK || globalScene.arena.getTimeOfDay() === TimeOfDay.NIGHT));
       this.timesOfDay = [ TimeOfDay.DUSK, TimeOfDay.NIGHT ];
     } else {
-      super(p => false);
+      super(_p => false);
       this.timesOfDay = [];
     }
     this.amount = amount;
@@ -216,12 +220,12 @@ class FriendshipTimeOfDayEvolutionCondition extends SpeciesEvolutionCondition {
 
 class FriendshipMoveTypeEvolutionCondition extends SpeciesEvolutionCondition {
   public amount: number;
-  public type: Type;
-  constructor(amount: number, type: Type) {
+  public type: PokemonType;
+  constructor(amount: number, type: PokemonType) {
     super(p => p.friendship >= amount && !!p.getMoveset().find(m => m?.getMove().type === type));
     this.amount = amount;
     this.type = type;
-    this.description = i18next.t("pokemonEvolutions:friendshipMoveType", { type: i18next.t(`pokemonInfo:Type.${Type[this.type]}`) });
+    this.description = i18next.t("pokemonEvolutions:friendshipMoveType", { type: i18next.t(`pokemonInfo:Type.${PokemonType[this.type]}`) });
   }
 }
 
@@ -233,11 +237,11 @@ class ShedinjaEvolutionCondition extends SpeciesEvolutionCondition {
 }
 
 class PartyTypeEvolutionCondition extends SpeciesEvolutionCondition {
-  public type: Type;
-  constructor(type: Type) {
+  public type: PokemonType;
+  constructor(type: PokemonType) {
     super(() => !!globalScene.getPlayerParty().find(p => p.getTypes(false, false, true).indexOf(type) > -1));
     this.type = type;
-    this.description = i18next.t("pokemonEvolutions:partyType", { type: i18next.t(`pokemonInfo:Type.${Type[this.type]}`) });
+    this.description = i18next.t("pokemonEvolutions:partyType", { type: i18next.t(`pokemonInfo:Type.${PokemonType[this.type]}`) });
   }
 }
 
@@ -260,11 +264,11 @@ class WeatherEvolutionCondition extends SpeciesEvolutionCondition {
 }
 
 class MoveTypeEvolutionCondition extends SpeciesEvolutionCondition {
-  public type: Type;
-  constructor(type: Type) {
+  public type: PokemonType;
+  constructor(type: PokemonType) {
     super(p => p.moveset.filter(m => m?.getMove().type === type).length > 0);
     this.type = type;
-    this.description = i18next.t("pokemonEvolutions:moveType", { type: i18next.t(`pokemonInfo:Type.${Type[this.type]}`) });
+    this.description = i18next.t("pokemonEvolutions:moveType", { type: i18next.t(`pokemonInfo:Type.${PokemonType[this.type]}`) });
   }
 }
 
@@ -282,7 +286,7 @@ class TyrogueEvolutionCondition extends SpeciesEvolutionCondition {
   public move: Moves;
   constructor(move: Moves) {
     super(p =>
-      p.getMoveset(true).find(m => m && [ Moves.LOW_SWEEP, Moves.MACH_PUNCH, Moves.RAPID_SPIN ].includes(m?.moveId))?.moveId === move);
+      p.getMoveset(true).find(m => m && [ Moves.LOW_SWEEP, Moves.MACH_PUNCH, Moves.RAPID_SPIN ].includes(m.moveId))?.moveId === move);
     this.move = move;
     const moveKey = Moves[this.move].split("_").filter(f => f).map((f, i) => i ? `${f[0]}${f.slice(1).toLowerCase()}` : f.toLowerCase()).join("");
     this.description = i18next.t("pokemonEvolutions:move", { move: i18next.t(`move:${moveKey}.name`) });
@@ -303,11 +307,11 @@ class MoveTimeOfDayEvolutionCondition extends SpeciesEvolutionCondition {
   public timesOfDay: TimeOfDay[];
   constructor(move: Moves, tod: "day" | "night") {
     if (tod === "day") {
-      super(p => p.moveset.filter(m => m?.moveId === move).length > 0 && (globalScene.arena.getTimeOfDay() === TimeOfDay.DAWN || globalScene.arena.getTimeOfDay() === TimeOfDay.DAY));
+      super(p => p.moveset.filter(m => m.moveId === move).length > 0 && (globalScene.arena.getTimeOfDay() === TimeOfDay.DAWN || globalScene.arena.getTimeOfDay() === TimeOfDay.DAY));
       this.move = move;
       this.timesOfDay = [ TimeOfDay.DAWN, TimeOfDay.DAY ];
     } else if (tod === "night") {
-      super(p => p.moveset.filter(m => m?.moveId === move).length > 0 && (globalScene.arena.getTimeOfDay() === TimeOfDay.DUSK || globalScene.arena.getTimeOfDay() === TimeOfDay.NIGHT));
+      super(p => p.moveset.filter(m => m.moveId === move).length > 0 && (globalScene.arena.getTimeOfDay() === TimeOfDay.DUSK || globalScene.arena.getTimeOfDay() === TimeOfDay.NIGHT));
       this.move = move;
       this.timesOfDay = [ TimeOfDay.DUSK, TimeOfDay.NIGHT ];
     } else {
@@ -332,8 +336,8 @@ class DunsparceEvolutionCondition extends SpeciesEvolutionCondition {
   constructor() {
     super(p => {
       let ret = false;
-      if (p.moveset.filter(m => m?.moveId === Moves.HYPER_DRILL).length > 0) {
-        globalScene.executeWithSeedOffset(() => ret = !Utils.randSeedInt(4), p.id);
+      if (p.moveset.filter(m => m.moveId === Moves.HYPER_DRILL).length > 0) {
+        globalScene.executeWithSeedOffset(() => ret = !randSeedInt(4), p.id);
       }
       return ret;
     });
@@ -346,7 +350,7 @@ class TandemausEvolutionCondition extends SpeciesEvolutionCondition {
   constructor() {
     super(p => {
       let ret = false;
-      globalScene.executeWithSeedOffset(() => ret = !Utils.randSeedInt(4), p.id);
+      globalScene.executeWithSeedOffset(() => ret = !randSeedInt(4), p.id);
       return ret;
     });
   }
@@ -1103,7 +1107,7 @@ export const pokemonEvolutions: PokemonEvolutions = {
     new SpeciesEvolution(Species.GOGOAT, 32, null, null)
   ],
   [Species.PANCHAM]: [
-    new SpeciesEvolution(Species.PANGORO, 32, null, new PartyTypeEvolutionCondition(Type.DARK), SpeciesWildEvolutionDelay.MEDIUM)
+    new SpeciesEvolution(Species.PANGORO, 32, null, new PartyTypeEvolutionCondition(PokemonType.DARK), SpeciesWildEvolutionDelay.MEDIUM)
   ],
   [Species.ESPURR]: [
     new SpeciesFormEvolution(Species.MEOWSTIC, "", "female", 25, null, new GenderEvolutionCondition(Gender.FEMALE)),
@@ -1519,8 +1523,8 @@ export const pokemonEvolutions: PokemonEvolutions = {
     new SpeciesEvolution(Species.STARMIE, 1, EvolutionItem.WATER_STONE, null, SpeciesWildEvolutionDelay.LONG)
   ],
   [Species.EEVEE]: [
-    new SpeciesFormEvolution(Species.SYLVEON, "", "", 1, null, new FriendshipMoveTypeEvolutionCondition(120, Type.FAIRY), SpeciesWildEvolutionDelay.LONG),
-    new SpeciesFormEvolution(Species.SYLVEON, "partner", "", 1, null, new FriendshipMoveTypeEvolutionCondition(120, Type.FAIRY), SpeciesWildEvolutionDelay.LONG),
+    new SpeciesFormEvolution(Species.SYLVEON, "", "", 1, null, new FriendshipMoveTypeEvolutionCondition(120, PokemonType.FAIRY), SpeciesWildEvolutionDelay.LONG),
+    new SpeciesFormEvolution(Species.SYLVEON, "partner", "", 1, null, new FriendshipMoveTypeEvolutionCondition(120, PokemonType.FAIRY), SpeciesWildEvolutionDelay.LONG),
     new SpeciesFormEvolution(Species.ESPEON, "", "", 1, null, new FriendshipTimeOfDayEvolutionCondition(120, "day"), SpeciesWildEvolutionDelay.LONG),
     new SpeciesFormEvolution(Species.ESPEON, "partner", "", 1, null, new FriendshipTimeOfDayEvolutionCondition(120, "day"), SpeciesWildEvolutionDelay.LONG),
     new SpeciesFormEvolution(Species.UMBREON, "", "", 1, null, new FriendshipTimeOfDayEvolutionCondition(120, "night"), SpeciesWildEvolutionDelay.LONG),
@@ -1540,13 +1544,13 @@ export const pokemonEvolutions: PokemonEvolutions = {
     new SpeciesEvolution(Species.TOGEKISS, 1, EvolutionItem.SHINY_STONE, null, SpeciesWildEvolutionDelay.VERY_LONG)
   ],
   [Species.AIPOM]: [
-    new SpeciesEvolution(Species.AMBIPOM, 32, null,  new MoveEvolutionCondition(Moves.DOUBLE_HIT), SpeciesWildEvolutionDelay.LONG)
+    new SpeciesEvolution(Species.AMBIPOM, 32, null, new MoveEvolutionCondition(Moves.DOUBLE_HIT), SpeciesWildEvolutionDelay.LONG)
   ],
   [Species.SUNKERN]: [
     new SpeciesEvolution(Species.SUNFLORA, 1, EvolutionItem.SUN_STONE, null, SpeciesWildEvolutionDelay.LONG)
   ],
   [Species.YANMA]: [
-    new SpeciesEvolution(Species.YANMEGA, 33, null,  new MoveEvolutionCondition(Moves.ANCIENT_POWER), SpeciesWildEvolutionDelay.LONG)
+    new SpeciesEvolution(Species.YANMEGA, 33, null, new MoveEvolutionCondition(Moves.ANCIENT_POWER), SpeciesWildEvolutionDelay.LONG)
   ],
   [Species.MURKROW]: [
     new SpeciesEvolution(Species.HONCHKROW, 1, EvolutionItem.DUSK_STONE, null, SpeciesWildEvolutionDelay.VERY_LONG)
@@ -1555,11 +1559,11 @@ export const pokemonEvolutions: PokemonEvolutions = {
     new SpeciesEvolution(Species.MISMAGIUS, 1, EvolutionItem.DUSK_STONE, null, SpeciesWildEvolutionDelay.VERY_LONG)
   ],
   [Species.GIRAFARIG]: [
-    new SpeciesEvolution(Species.FARIGIRAF, 32, null,  new MoveEvolutionCondition(Moves.TWIN_BEAM), SpeciesWildEvolutionDelay.LONG)
+    new SpeciesEvolution(Species.FARIGIRAF, 32, null, new MoveEvolutionCondition(Moves.TWIN_BEAM), SpeciesWildEvolutionDelay.LONG)
   ],
   [Species.DUNSPARCE]: [
     new SpeciesFormEvolution(Species.DUDUNSPARCE, "", "three-segment", 32, null, new DunsparceEvolutionCondition(), SpeciesWildEvolutionDelay.LONG),
-    new SpeciesFormEvolution(Species.DUDUNSPARCE, "", "two-segment", 32, null,  new MoveEvolutionCondition(Moves.HYPER_DRILL), SpeciesWildEvolutionDelay.LONG)
+    new SpeciesFormEvolution(Species.DUDUNSPARCE, "", "two-segment", 32, null, new MoveEvolutionCondition(Moves.HYPER_DRILL), SpeciesWildEvolutionDelay.LONG)
   ],
   [Species.GLIGAR]: [
     new SpeciesEvolution(Species.GLISCOR, 1, EvolutionItem.RAZOR_FANG, new TimeOfDayEvolutionCondition("night") /* Razor fang at night*/, SpeciesWildEvolutionDelay.VERY_LONG)
@@ -1571,10 +1575,10 @@ export const pokemonEvolutions: PokemonEvolutions = {
     new SpeciesEvolution(Species.URSALUNA, 1, EvolutionItem.PEAT_BLOCK, null, SpeciesWildEvolutionDelay.VERY_LONG) //Ursaring does not evolve into Bloodmoon Ursaluna
   ],
   [Species.PILOSWINE]: [
-    new SpeciesEvolution(Species.MAMOSWINE, 1, null,  new MoveEvolutionCondition(Moves.ANCIENT_POWER), SpeciesWildEvolutionDelay.VERY_LONG)
+    new SpeciesEvolution(Species.MAMOSWINE, 1, null, new MoveEvolutionCondition(Moves.ANCIENT_POWER), SpeciesWildEvolutionDelay.VERY_LONG)
   ],
   [Species.STANTLER]: [
-    new SpeciesEvolution(Species.WYRDEER, 25, null,  new MoveEvolutionCondition(Moves.PSYSHIELD_BASH), SpeciesWildEvolutionDelay.VERY_LONG)
+    new SpeciesEvolution(Species.WYRDEER, 25, null, new MoveEvolutionCondition(Moves.PSYSHIELD_BASH), SpeciesWildEvolutionDelay.VERY_LONG)
   ],
   [Species.LOMBRE]: [
     new SpeciesEvolution(Species.LUDICOLO, 1, EvolutionItem.WATER_STONE, null, SpeciesWildEvolutionDelay.LONG)
@@ -1592,7 +1596,7 @@ export const pokemonEvolutions: PokemonEvolutions = {
     new SpeciesEvolution(Species.ROSERADE, 1, EvolutionItem.SHINY_STONE, null, SpeciesWildEvolutionDelay.VERY_LONG)
   ],
   [Species.BONSLY]: [
-    new SpeciesEvolution(Species.SUDOWOODO, 1, null,  new MoveEvolutionCondition(Moves.MIMIC), SpeciesWildEvolutionDelay.MEDIUM)
+    new SpeciesEvolution(Species.SUDOWOODO, 1, null, new MoveEvolutionCondition(Moves.MIMIC), SpeciesWildEvolutionDelay.MEDIUM)
   ],
   [Species.MIME_JR]: [
     new SpeciesEvolution(Species.GALAR_MR_MIME, 1, null, new MoveTimeOfDayEvolutionCondition(Moves.MIMIC, "night"), SpeciesWildEvolutionDelay.MEDIUM),
@@ -1651,10 +1655,10 @@ export const pokemonEvolutions: PokemonEvolutions = {
     new SpeciesFormEvolution(Species.LYCANROC, "", "midnight", 25, null, new TimeOfDayEvolutionCondition("night"))
   ],
   [Species.STEENEE]: [
-    new SpeciesEvolution(Species.TSAREENA, 28, null,  new MoveEvolutionCondition(Moves.STOMP), SpeciesWildEvolutionDelay.LONG)
+    new SpeciesEvolution(Species.TSAREENA, 28, null, new MoveEvolutionCondition(Moves.STOMP), SpeciesWildEvolutionDelay.LONG)
   ],
   [Species.POIPOLE]: [
-    new SpeciesEvolution(Species.NAGANADEL, 1, null,  new MoveEvolutionCondition(Moves.DRAGON_PULSE), SpeciesWildEvolutionDelay.LONG)
+    new SpeciesEvolution(Species.NAGANADEL, 1, null, new MoveEvolutionCondition(Moves.DRAGON_PULSE), SpeciesWildEvolutionDelay.LONG)
   ],
   [Species.ALOLA_SANDSHREW]: [
     new SpeciesEvolution(Species.ALOLA_SANDSLASH, 1, EvolutionItem.ICE_STONE, null, SpeciesWildEvolutionDelay.LONG)
@@ -1720,7 +1724,7 @@ export const pokemonEvolutions: PokemonEvolutions = {
     new SpeciesEvolution(Species.HISUI_ELECTRODE, 1, EvolutionItem.LEAF_STONE, null, SpeciesWildEvolutionDelay.LONG)
   ],
   [Species.HISUI_QWILFISH]: [
-    new SpeciesEvolution(Species.OVERQWIL, 28, null,  new MoveEvolutionCondition(Moves.BARB_BARRAGE), SpeciesWildEvolutionDelay.LONG)
+    new SpeciesEvolution(Species.OVERQWIL, 28, null, new MoveEvolutionCondition(Moves.BARB_BARRAGE), SpeciesWildEvolutionDelay.LONG)
   ],
   [Species.HISUI_SNEASEL]: [
     new SpeciesEvolution(Species.SNEASLER, 1, EvolutionItem.RAZOR_CLAW, new TimeOfDayEvolutionCondition("day") /* Razor claw at day*/, SpeciesWildEvolutionDelay.VERY_LONG)
@@ -1758,7 +1762,7 @@ export const pokemonEvolutions: PokemonEvolutions = {
     new SpeciesEvolution(Species.GENGAR, 1, EvolutionItem.LINKING_CORD, null, SpeciesWildEvolutionDelay.VERY_LONG)
   ],
   [Species.ONIX]: [
-    new SpeciesEvolution(Species.STEELIX, 1, EvolutionItem.LINKING_CORD, new MoveTypeEvolutionCondition(Type.STEEL), SpeciesWildEvolutionDelay.VERY_LONG)
+    new SpeciesEvolution(Species.STEELIX, 1, EvolutionItem.LINKING_CORD, new MoveTypeEvolutionCondition(PokemonType.STEEL), SpeciesWildEvolutionDelay.VERY_LONG)
   ],
   [Species.RHYDON]: [
     new SpeciesEvolution(Species.RHYPERIOR, 1, EvolutionItem.PROTECTOR, null, SpeciesWildEvolutionDelay.VERY_LONG)
@@ -1767,7 +1771,7 @@ export const pokemonEvolutions: PokemonEvolutions = {
     new SpeciesEvolution(Species.KINGDRA, 1, EvolutionItem.DRAGON_SCALE, null, SpeciesWildEvolutionDelay.VERY_LONG)
   ],
   [Species.SCYTHER]: [
-    new SpeciesEvolution(Species.SCIZOR, 1, EvolutionItem.LINKING_CORD, new MoveTypeEvolutionCondition(Type.STEEL), SpeciesWildEvolutionDelay.VERY_LONG),
+    new SpeciesEvolution(Species.SCIZOR, 1, EvolutionItem.LINKING_CORD, new MoveTypeEvolutionCondition(PokemonType.STEEL), SpeciesWildEvolutionDelay.VERY_LONG),
     new SpeciesEvolution(Species.KLEAVOR, 1, EvolutionItem.BLACK_AUGURITE, null, SpeciesWildEvolutionDelay.VERY_LONG)
   ],
   [Species.ELECTABUZZ]: [
@@ -1898,7 +1902,7 @@ export function initPokemonPrevolutions(): void {
       if (ev.evoFormKey && megaFormKeys.indexOf(ev.evoFormKey) > -1) {
         continue;
       }
-      pokemonPrevolutions[ev.speciesId] = parseInt(pk) as Species;
+      pokemonPrevolutions[ev.speciesId] = Number.parseInt(pk) as Species;
     }
   });
 }
diff --git a/src/data/balance/pokemon-level-moves.ts b/src/data/balance/pokemon-level-moves.ts
index dcbc2fb0c0d..0b0ba1b5f71 100644
--- a/src/data/balance/pokemon-level-moves.ts
+++ b/src/data/balance/pokemon-level-moves.ts
@@ -19383,6 +19383,44 @@ export const pokemonFormLevelMoves: PokemonSpeciesFormLevelMoves = {
       [ 100, Moves.SEED_FLARE ],
     ]
   },
+  [Species.BASCULIN]: {
+    1: [
+      [ 1, Moves.TAIL_WHIP ],
+      [ 1, Moves.WATER_GUN ],
+      [ 4, Moves.TACKLE ],
+      [ 8, Moves.FLAIL ],
+      [ 12, Moves.AQUA_JET ],
+      [ 16, Moves.BITE ],
+      [ 20, Moves.SCARY_FACE ],
+      [ 24, Moves.HEADBUTT ],
+      [ 28, Moves.SOAK ],
+      [ 32, Moves.CRUNCH ],
+      [ 36, Moves.TAKE_DOWN ],
+      [ 40, Moves.FINAL_GAMBIT ],
+      [ 44, Moves.WAVE_CRASH ],
+      [ 48, Moves.THRASH ],
+      [ 52, Moves.DOUBLE_EDGE ],
+      [ 56, Moves.HEAD_SMASH ],
+    ],
+    2: [
+      [ 1, Moves.TAIL_WHIP ],
+      [ 1, Moves.WATER_GUN ],
+      [ 4, Moves.TACKLE ],
+      [ 8, Moves.FLAIL ],
+      [ 12, Moves.AQUA_JET ],
+      [ 16, Moves.BITE ],
+      [ 20, Moves.SCARY_FACE ],
+      [ 24, Moves.HEADBUTT ],
+      [ 28, Moves.SOAK ],
+      [ 32, Moves.CRUNCH ],
+      [ 36, Moves.TAKE_DOWN ],
+      [ 40, Moves.UPROAR ],
+      [ 44, Moves.WAVE_CRASH ],
+      [ 48, Moves.THRASH ],
+      [ 52, Moves.DOUBLE_EDGE ],
+      [ 56, Moves.HEAD_SMASH ],
+    ]
+  },
   [Species.KYUREM]: {
     1: [
       [ 1, Moves.DRAGON_BREATH ],
diff --git a/src/data/balance/signature-species.ts b/src/data/balance/signature-species.ts
new file mode 100644
index 00000000000..04749a67521
--- /dev/null
+++ b/src/data/balance/signature-species.ts
@@ -0,0 +1,106 @@
+import { Species } from "#enums/species";
+
+export type SignatureSpecies = {
+  [key in string]: (Species | Species[])[];
+};
+
+/**
+ * The signature species for each Gym Leader, Elite Four member, and Champion.
+ * The key is the trainer type, and the value is an array of Species or Species arrays.
+ * This is in a separate const so it can be accessed from other places and not just the trainerConfigs
+ *
+ * @remarks
+ * The `Proxy` object allows us to define a handler that will intercept
+ * the property access and return an empty array if the property does not exist in the object.
+ *
+ * This means that accessing `signatureSpecies` will not throw an error if the property does not exist,
+ * but instead default to an empty array.
+ */
+export const signatureSpecies: SignatureSpecies = new Proxy({
+  // Gym Leaders- Kanto
+  BROCK: [Species.ONIX, Species.GEODUDE, [Species.OMANYTE, Species.KABUTO], Species.AERODACTYL],
+  MISTY: [Species.STARYU, Species.PSYDUCK, Species.WOOPER, Species.LAPRAS],
+  LT_SURGE: [Species.PICHU, Species.VOLTORB, Species.ELEKID, Species.JOLTEON],
+  ERIKA: [Species.ODDISH, Species.BELLSPROUT, Species.TANGELA, Species.HOPPIP],
+  JANINE: [Species.VENONAT, Species.SPINARAK, Species.ZUBAT, Species.KOFFING],
+  SABRINA: [Species.ABRA, Species.MR_MIME, Species.SMOOCHUM, Species.ESPEON],
+  BLAINE: [Species.GROWLITHE, Species.PONYTA, Species.MAGBY, Species.VULPIX],
+  GIOVANNI: [Species.RHYHORN, Species.MEOWTH, [Species.NIDORAN_F, Species.NIDORAN_M], Species.DIGLETT], // Tera Ground Meowth
+  // Gym Leaders- Johto
+  FALKNER: [Species.PIDGEY, Species.HOOTHOOT, Species.NATU, Species.MURKROW],
+  BUGSY: [Species.SCYTHER, Species.SHUCKLE, Species.YANMA, [Species.PINSIR, Species.HERACROSS]],
+  WHITNEY: [Species.MILTANK, Species.AIPOM, Species.IGGLYBUFF, [Species.GIRAFARIG, Species.STANTLER]],
+  MORTY: [Species.GASTLY, Species.MISDREAVUS, Species.DUSKULL, Species.SABLEYE],
+  CHUCK: [Species.POLIWRATH, Species.MANKEY, Species.TYROGUE, Species.MACHOP],
+  JASMINE: [Species.STEELIX, Species.MAGNEMITE, Species.PINECO, Species.SKARMORY],
+  PRYCE: [Species.SWINUB, Species.SEEL, Species.SHELLDER, Species.SNEASEL],
+  CLAIR: [Species.HORSEA, Species.DRATINI, Species.MAGIKARP, Species.DRUDDIGON], // Tera Dragon Magikarp
+  // Gym Leaders- Hoenn
+  ROXANNE: [Species.NOSEPASS, Species.GEODUDE, [Species.LILEEP, Species.ANORITH], Species.ARON],
+  BRAWLY: [Species.MAKUHITA, Species.MACHOP, Species.MEDITITE, Species.SHROOMISH],
+  WATTSON: [Species.ELECTRIKE, Species.VOLTORB, Species.MAGNEMITE, [Species.PLUSLE, Species.MINUN]],
+  FLANNERY: [Species.TORKOAL, Species.SLUGMA, Species.NUMEL, Species.HOUNDOUR],
+  NORMAN: [Species.SLAKOTH, Species.KECLEON, Species.WHISMUR, Species.ZANGOOSE],
+  WINONA: [Species.SWABLU, Species.WINGULL, Species.TROPIUS, Species.SKARMORY],
+  TATE: [Species.SOLROCK, Species.NATU, Species.CHINGLING, Species.GALLADE],
+  LIZA: [Species.LUNATONE, Species.BALTOY, Species.SPOINK, Species.GARDEVOIR],
+  JUAN: [Species.HORSEA, Species.SPHEAL, Species.BARBOACH, Species.CORPHISH],
+  // Gym Leaders- Sinnoh
+  ROARK: [Species.CRANIDOS, Species.GEODUDE, Species.NOSEPASS, Species.LARVITAR],
+  GARDENIA: [Species.BUDEW, Species.CHERUBI, Species.TURTWIG, Species.LEAFEON],
+  MAYLENE: [Species.RIOLU, Species.MEDITITE, Species.CHIMCHAR, Species.CROAGUNK],
+  CRASHER_WAKE: [Species.BUIZEL, Species.WOOPER, Species.PIPLUP, Species.MAGIKARP],
+  FANTINA: [Species.MISDREAVUS, Species.DRIFLOON, Species.DUSKULL, Species.SPIRITOMB],
+  BYRON: [Species.SHIELDON, Species.BRONZOR, Species.ARON, Species.SKARMORY],
+  CANDICE: [Species.FROSLASS, Species.SNOVER, Species.SNEASEL, Species.GLACEON],
+  VOLKNER: [Species.ELEKID, Species.SHINX, Species.CHINCHOU, Species.ROTOM],
+  // Gym Leaders- Unova
+  CILAN: [Species.PANSAGE, Species.SNIVY, Species.MARACTUS, Species.FERROSEED],
+  CHILI: [Species.PANSEAR, Species.TEPIG, Species.HEATMOR, Species.DARUMAKA],
+  CRESS: [Species.PANPOUR, Species.OSHAWOTT, Species.BASCULIN, Species.TYMPOLE],
+  CHEREN: [Species.LILLIPUP, Species.MINCCINO, Species.PIDOVE, Species.BOUFFALANT],
+  LENORA: [Species.PATRAT, Species.DEERLING, Species.AUDINO, Species.BRAVIARY],
+  ROXIE: [Species.VENIPEDE, Species.KOFFING, Species.TRUBBISH, Species.TOXEL],
+  BURGH: [Species.SEWADDLE, Species.DWEBBLE, [Species.KARRABLAST, Species.SHELMET], Species.DURANT],
+  ELESA: [Species.BLITZLE, Species.EMOLGA, Species.JOLTIK, Species.TYNAMO],
+  CLAY: [Species.DRILBUR, Species.SANDILE, Species.TYMPOLE, Species.GOLETT],
+  SKYLA: [Species.DUCKLETT, Species.WOOBAT, [Species.RUFFLET, Species.VULLABY], Species.ARCHEN],
+  BRYCEN: [Species.CRYOGONAL, Species.VANILLITE, Species.CUBCHOO, Species.GALAR_DARUMAKA],
+  DRAYDEN: [Species.AXEW, Species.DRUDDIGON, Species.TRAPINCH, Species.DEINO],
+  MARLON: [Species.FRILLISH, Species.TIRTOUGA, Species.WAILMER, Species.MANTYKE],
+  // Gym Leaders- Kalos
+  VIOLA: [Species.SCATTERBUG, Species.SURSKIT, Species.CUTIEFLY, Species.BLIPBUG],
+  GRANT: [Species.TYRUNT, Species.AMAURA, Species.BINACLE, Species.DWEBBLE],
+  KORRINA: [Species.RIOLU, Species.MIENFOO, Species.HAWLUCHA, Species.PANCHAM],
+  RAMOS: [Species.SKIDDO, Species.HOPPIP, Species.BELLSPROUT, [Species.PHANTUMP, Species.PUMPKABOO]],
+  CLEMONT: [Species.HELIOPTILE, Species.MAGNEMITE, Species.DEDENNE, Species.ROTOM],
+  VALERIE: [Species.SYLVEON, Species.MAWILE, Species.MR_MIME, [Species.SPRITZEE, Species.SWIRLIX]],
+  OLYMPIA: [Species.ESPURR, Species.SIGILYPH, Species.INKAY, Species.SLOWKING],
+  WULFRIC: [Species.BERGMITE, Species.SNOVER, Species.CRYOGONAL, Species.SWINUB],
+  // Gym Leaders- Galar
+  MILO: [Species.GOSSIFLEUR, Species.SEEDOT, Species.APPLIN, Species.LOTAD],
+  NESSA: [Species.CHEWTLE, Species.WIMPOD, Species.ARROKUDA, Species.MAREANIE],
+  KABU: [Species.SIZZLIPEDE, Species.VULPIX, Species.GROWLITHE, Species.TORKOAL],
+  BEA: [Species.MACHOP, Species.GALAR_FARFETCHD, Species.CLOBBOPUS, Species.FALINKS],
+  ALLISTER: [Species.GASTLY, Species.GALAR_YAMASK, Species.GALAR_CORSOLA, Species.SINISTEA],
+  OPAL: [Species.MILCERY, Species.GALAR_WEEZING, Species.TOGEPI, Species.MAWILE],
+  BEDE: [Species.HATENNA, Species.GALAR_PONYTA, Species.GARDEVOIR, Species.SYLVEON],
+  GORDIE: [Species.ROLYCOLY, [Species.SHUCKLE, Species.BINACLE], Species.STONJOURNER, Species.LARVITAR],
+  MELONY: [Species.LAPRAS, Species.SNOM, Species.EISCUE, [Species.GALAR_MR_MIME, Species.GALAR_DARUMAKA]],
+  PIERS: [Species.GALAR_ZIGZAGOON, Species.SCRAGGY, Species.TOXEL, Species.INKAY], // Tera Dark Toxel
+  MARNIE: [Species.IMPIDIMP, Species.MORPEKO, Species.PURRLOIN, Species.CROAGUNK], // Tera Dark Croagunk
+  RAIHAN: [Species.DURALUDON, Species.TRAPINCH, Species.GOOMY, Species.TURTONATOR],
+  // Gym Leaders- Paldea; First slot is Tera
+  KATY: [Species.TEDDIURSA, Species.NYMBLE, Species.TAROUNTULA, Species.RELLOR], // Tera Bug Teddiursa
+  BRASSIUS: [Species.BONSLY, Species.SMOLIV, Species.BRAMBLIN, Species.SUNKERN], // Tera Grass Bonsly
+  IONO: [Species.MISDREAVUS, Species.TADBULB, Species.WATTREL, Species.MAGNEMITE], // Tera Ghost Misdreavus
+  KOFU: [Species.CRABRAWLER, Species.VELUZA, Species.WIGLETT, Species.WINGULL], // Tera Water Crabrawler
+  LARRY: [Species.STARLY, Species.DUNSPARCE, Species.LECHONK, Species.KOMALA], // Tera Normal Starly
+  RYME: [Species.TOXEL, Species.GREAVARD, Species.SHUPPET, Species.MIMIKYU], // Tera Ghost Toxel
+  TULIP: [Species.FLABEBE, Species.FLITTLE, Species.RALTS, Species.GIRAFARIG], // Tera Psychic Flabebe
+  GRUSHA: [Species.SWABLU, Species.CETODDLE, Species.SNOM, Species.CUBCHOO], // Tera Ice Swablu
+}, {
+  get(target, prop: string) {
+    return target[prop as keyof SignatureSpecies] ?? [];
+  }
+});
diff --git a/src/data/balance/species-egg-tiers.ts b/src/data/balance/species-egg-tiers.ts
index fee48695565..0db2c917589 100644
--- a/src/data/balance/species-egg-tiers.ts
+++ b/src/data/balance/species-egg-tiers.ts
@@ -169,7 +169,7 @@ export const speciesEggTiers = {
   [Species.CACNEA]: EggTier.COMMON,
   [Species.SWABLU]: EggTier.COMMON,
   [Species.ZANGOOSE]: EggTier.RARE,
-  [Species.SEVIPER]: EggTier.COMMON,
+  [Species.SEVIPER]: EggTier.RARE,
   [Species.LUNATONE]: EggTier.COMMON,
   [Species.SOLROCK]: EggTier.COMMON,
   [Species.BARBOACH]: EggTier.COMMON,
diff --git a/src/data/balance/starters.ts b/src/data/balance/starters.ts
index dcf0766d005..3468163c988 100644
--- a/src/data/balance/starters.ts
+++ b/src/data/balance/starters.ts
@@ -290,7 +290,7 @@ export const speciesStarterCosts = {
   [Species.SHAYMIN]: 6,
   [Species.ARCEUS]: 9,
 
-  [Species.VICTINI]: 7,
+  [Species.VICTINI]: 6,
   [Species.SNIVY]: 3,
   [Species.TEPIG]: 3,
   [Species.OSHAWOTT]: 3,
@@ -461,7 +461,7 @@ export const speciesStarterCosts = {
   [Species.GUZZLORD]: 6,
   [Species.NECROZMA]: 8,
   [Species.MAGEARNA]: 7,
-  [Species.MARSHADOW]: 7,
+  [Species.MARSHADOW]: 8,
   [Species.POIPOLE]: 8,
   [Species.STAKATAKA]: 6,
   [Species.BLACEPHALON]: 7,
@@ -611,7 +611,7 @@ export const speciesStarterCosts = {
   [Species.RAGING_BOLT]: 7,
   [Species.IRON_BOULDER]: 7,
   [Species.IRON_CROWN]: 7,
-  [Species.TERAPAGOS]: 8,
+  [Species.TERAPAGOS]: 9,
   [Species.PECHARUNT]: 6,
   [Species.PALDEA_TAUROS]: 5,
   [Species.PALDEA_WOOPER]: 3,
diff --git a/src/data/balance/tms.ts b/src/data/balance/tms.ts
index 788ffd4f273..06d191c3b2a 100644
--- a/src/data/balance/tms.ts
+++ b/src/data/balance/tms.ts
@@ -5724,7 +5724,6 @@ export const tmSpecies: TmSpecies = {
     Species.SCOLIPEDE,
     Species.WHIMSICOTT,
     Species.LILLIGANT,
-    Species.BASCULIN,
     Species.KROOKODILE,
     Species.DARMANITAN,
     Species.CRUSTLE,
@@ -6023,6 +6022,11 @@ export const tmSpecies: TmSpecies = {
     Species.HISUI_DECIDUEYE,
     Species.PALDEA_TAUROS,
     Species.BLOODMOON_URSALUNA,
+    [
+      Species.BASCULIN,
+      "blue-striped",
+      "red-striped",
+    ]
   ],
   [Moves.LOW_KICK]: [
     Species.SANDSHREW,
@@ -19053,8 +19057,15 @@ export const tmSpecies: TmSpecies = {
     Species.SLAKING,
     Species.HARIYAMA,
     Species.NOSEPASS,
+    Species.ARON,
+    Species.LAIRON,
+    Species.AGGRON,
+    Species.ELECTRIKE,
+    Species.MANECTRIC,
     Species.GULPIN,
     Species.SWALOT,
+    Species.WAILMER,
+    Species.WAILORD,
     Species.NUMEL,
     Species.CAMERUPT,
     Species.TORKOAL,
@@ -19063,18 +19074,28 @@ export const tmSpecies: TmSpecies = {
     Species.ZANGOOSE,
     Species.SEVIPER,
     Species.WHISCASH,
+    Species.LILEEP,
+    Species.CRADILY,
+    Species.ANORITH,
+    Species.ARMALDO,
     Species.SHUPPET,
     Species.BANETTE,
     Species.DUSKULL,
     Species.DUSCLOPS,
     Species.TROPIUS,
     Species.CHIMECHO,
+    Species.ABSOL,
+    Species.SPHEAL,
+    Species.SEALEO,
+    Species.WALREIN,
     Species.REGIROCK,
     Species.REGICE,
     Species.REGISTEEL,
     Species.TURTWIG,
     Species.GROTLE,
     Species.TORTERRA,
+    Species.BIDOOF,
+    Species.BIBAREL,
     Species.CRANIDOS,
     Species.RAMPARDOS,
     Species.SHIELDON,
@@ -19116,6 +19137,11 @@ export const tmSpecies: TmSpecies = {
     Species.TEPIG,
     Species.PIGNITE,
     Species.EMBOAR,
+    Species.MUNNA,
+    Species.MUSHARNA,
+    Species.ROGGENROLA,
+    Species.BOLDORE,
+    Species.GIGALITH,
     Species.DRILBUR,
     Species.EXCADRILL,
     Species.TIMBURR,
@@ -19124,26 +19150,44 @@ export const tmSpecies: TmSpecies = {
     Species.SANDILE,
     Species.KROKOROK,
     Species.KROOKODILE,
+    Species.DWEBBLE,
+    Species.CRUSTLE,
     Species.SCRAGGY,
     Species.SCRAFTY,
+    Species.YAMASK,
+    Species.COFAGRIGUS,
+    Species.TRUBBISH,
+    Species.GARBODOR,
     Species.SAWSBUCK,
+    Species.FERROSEED,
+    Species.FERROTHORN,
     Species.LITWICK,
     Species.LAMPENT,
     Species.CHANDELURE,
     Species.BEARTIC,
+    Species.SHELMET,
+    Species.ACCELGOR,
+    Species.STUNFISK,
     Species.GOLETT,
     Species.GOLURK,
+    Species.HEATMOR,
     Species.CHESPIN,
     Species.QUILLADIN,
     Species.CHESNAUGHT,
+    Species.TYRUNT,
+    Species.TYRANTRUM,
     Species.SYLVEON,
     Species.GOOMY,
     Species.SLIGGOO,
     Species.GOODRA,
     Species.PHANTUMP,
     Species.TREVENANT,
+    Species.PUMPKABOO,
+    Species.GOURGEIST,
     Species.BERGMITE,
     Species.AVALUGG,
+    Species.ROWLET,
+    Species.DARTRIX,
     Species.DECIDUEYE,
     Species.GUMSHOOS,
     Species.MUDBRAY,
@@ -19151,7 +19195,9 @@ export const tmSpecies: TmSpecies = {
     Species.PASSIMIAN,
     Species.SANDYGAST,
     Species.PALOSSAND,
+    Species.PYUKUMUKU,
     Species.KOMALA,
+    Species.TURTONATOR,
     Species.MIMIKYU,
     Species.SKWOVET,
     Species.GREEDENT,
@@ -19163,6 +19209,8 @@ export const tmSpecies: TmSpecies = {
     Species.SINISTEA,
     Species.POLTEAGEIST,
     Species.PERRSERKER,
+    Species.CURSOLA,
+    Species.RUNERIGUS,
     Species.PINCURCHIN,
     Species.STONJOURNER,
     Species.CUFANT,
@@ -19228,6 +19276,8 @@ export const tmSpecies: TmSpecies = {
     Species.GALAR_SLOWBRO,
     Species.GALAR_WEEZING,
     Species.GALAR_SLOWKING,
+    Species.GALAR_YAMASK,
+    Species.GALAR_STUNFISK,
     Species.HISUI_ELECTRODE,
     Species.HISUI_TYPHLOSION,
     Species.HISUI_QWILFISH,
@@ -19331,7 +19381,6 @@ export const tmSpecies: TmSpecies = {
     Species.CONKELDURR,
     Species.THROH,
     Species.SAWK,
-    Species.BASCULIN,
     Species.DARMANITAN,
     Species.SCRAFTY,
     Species.ESCAVALIER,
@@ -19445,6 +19494,11 @@ export const tmSpecies: TmSpecies = {
     Species.HISUI_BRAVIARY,
     Species.HISUI_DECIDUEYE,
     Species.PALDEA_TAUROS,
+    [
+      Species.BASCULIN,
+      "blue-striped",
+      "red-striped",
+    ],
   ],
   [Moves.SPITE]: [
     Species.EKANS,
@@ -30922,6 +30976,7 @@ export const tmSpecies: TmSpecies = {
     Species.MURKROW,
     Species.SLOWKING,
     Species.MISDREAVUS,
+    Species.UNOWN,
     Species.GIRAFARIG,
     Species.PINECO,
     Species.FORRETRESS,
@@ -40134,6 +40189,8 @@ export const tmSpecies: TmSpecies = {
     Species.MEOWSTIC,
     Species.SPRITZEE,
     Species.AROMATISSE,
+    Species.INKAY,
+    Species.MALAMAR,
     Species.SYLVEON,
     Species.CARBINK,
     Species.PHANTUMP,
@@ -49173,6 +49230,7 @@ export const tmSpecies: TmSpecies = {
     Species.KANGASKHAN,
     Species.GOLDEEN,
     Species.SEAKING,
+    Species.GYARADOS,
     Species.LAPRAS,
     Species.VAPOREON,
     Species.KABUTOPS,
@@ -51333,7 +51391,6 @@ export const tmSpecies: TmSpecies = {
     Species.SCOLIPEDE,
     Species.WHIMSICOTT,
     Species.LILLIGANT,
-    Species.BASCULIN,
     Species.KROOKODILE,
     Species.DARMANITAN,
     Species.CRUSTLE,
@@ -51647,6 +51704,11 @@ export const tmSpecies: TmSpecies = {
     Species.HISUI_DECIDUEYE,
     Species.PALDEA_TAUROS,
     Species.BLOODMOON_URSALUNA,
+    [
+      Species.BASCULIN,
+      "blue-striped",
+      "red-striped",
+    ],
   ],
   [Moves.NASTY_PLOT]: [
     Species.PIKACHU,
@@ -52587,6 +52649,7 @@ export const tmSpecies: TmSpecies = {
     Species.SNORLAX,
     Species.MEWTWO,
     Species.MEW,
+    Species.MEGANIUM,
     Species.CYNDAQUIL,
     Species.QUILAVA,
     Species.TYPHLOSION,
@@ -66205,7 +66268,11 @@ export const tmSpecies: TmSpecies = {
     Species.SQUIRTLE,
     Species.WARTORTLE,
     Species.BLASTOISE,
+    Species.CATERPIE,
+    Species.METAPOD,
     Species.BUTTERFREE,
+    Species.WEEDLE,
+    Species.KAKUNA,
     Species.BEEDRILL,
     Species.PIDGEY,
     Species.PIDGEOTTO,
@@ -66451,7 +66518,10 @@ export const tmSpecies: TmSpecies = {
     Species.MIGHTYENA,
     Species.ZIGZAGOON,
     Species.LINOONE,
+    Species.WURMPLE,
+    Species.SILCOON,
     Species.BEAUTIFLY,
+    Species.CASCOON,
     Species.DUSTOX,
     Species.LOTAD,
     Species.LOMBRE,
@@ -66987,6 +67057,8 @@ export const tmSpecies: TmSpecies = {
     Species.STAKATAKA,
     Species.BLACEPHALON,
     Species.ZERAORA,
+    Species.MELTAN,
+    Species.MELMETAL,
     Species.ALOLA_RATTATA,
     Species.ALOLA_RATICATE,
     Species.ALOLA_RAICHU,
@@ -67020,8 +67092,19 @@ export const tmSpecies: TmSpecies = {
     Species.ROOKIDEE,
     Species.CORVISQUIRE,
     Species.CORVIKNIGHT,
+    Species.BLIPBUG,
+    Species.DOTTLER,
+    Species.ORBEETLE,
+    Species.NICKIT,
+    Species.THIEVUL,
+    Species.GOSSIFLEUR,
+    Species.ELDEGOSS,
+    Species.WOOLOO,
+    Species.DUBWOOL,
     Species.CHEWTLE,
     Species.DREDNAW,
+    Species.YAMPER,
+    Species.BOLTUND,
     Species.ROLYCOLY,
     Species.CARKOL,
     Species.COALOSSAL,
@@ -67035,6 +67118,10 @@ export const tmSpecies: TmSpecies = {
     Species.BARRASKEWDA,
     Species.TOXEL,
     Species.TOXTRICITY,
+    Species.SIZZLIPEDE,
+    Species.CENTISKORCH,
+    Species.CLOBBOPUS,
+    Species.GRAPPLOCT,
     Species.SINISTEA,
     Species.POLTEAGEIST,
     Species.HATENNA,
@@ -67043,7 +67130,14 @@ export const tmSpecies: TmSpecies = {
     Species.IMPIDIMP,
     Species.MORGREM,
     Species.GRIMMSNARL,
+    Species.OBSTAGOON,
     Species.PERRSERKER,
+    Species.CURSOLA,
+    Species.SIRFETCHD,
+    Species.MR_RIME,
+    Species.RUNERIGUS,
+    Species.MILCERY,
+    Species.ALCREMIE,
     Species.FALINKS,
     Species.PINCURCHIN,
     Species.SNOM,
@@ -67054,6 +67148,11 @@ export const tmSpecies: TmSpecies = {
     Species.MORPEKO,
     Species.CUFANT,
     Species.COPPERAJAH,
+    Species.DRACOZOLT,
+    Species.ARCTOZOLT,
+    Species.DRACOVISH,
+    Species.ARCTOVISH,
+    Species.DURALUDON,
     Species.DREEPY,
     Species.DRAKLOAK,
     Species.DRAGAPULT,
@@ -67195,13 +67294,24 @@ export const tmSpecies: TmSpecies = {
     Species.IRON_CROWN,
     Species.PECHARUNT,
     Species.GALAR_MEOWTH,
+    Species.GALAR_PONYTA,
+    Species.GALAR_RAPIDASH,
     Species.GALAR_SLOWPOKE,
     Species.GALAR_SLOWBRO,
+    Species.GALAR_FARFETCHD,
     Species.GALAR_WEEZING,
+    Species.GALAR_MR_MIME,
     Species.GALAR_ARTICUNO,
     Species.GALAR_ZAPDOS,
     Species.GALAR_MOLTRES,
     Species.GALAR_SLOWKING,
+    Species.GALAR_CORSOLA,
+    Species.GALAR_ZIGZAGOON,
+    Species.GALAR_LINOONE,
+    Species.GALAR_DARUMAKA,
+    Species.GALAR_DARMANITAN,
+    Species.GALAR_YAMASK,
+    Species.GALAR_STUNFISK,
     Species.HISUI_GROWLITHE,
     Species.HISUI_ARCANINE,
     Species.HISUI_VOLTORB,
diff --git a/src/data/battle-anims.ts b/src/data/battle-anims.ts
index 99e9e82d4a6..454bd40130c 100644
--- a/src/data/battle-anims.ts
+++ b/src/data/battle-anims.ts
@@ -1,108 +1,109 @@
 import { globalScene } from "#app/global-scene";
-import { AttackMove, BeakBlastHeaderAttr, DelayedAttackAttr, MoveFlags, SelfStatusMove, allMoves } from "./move";
+import { AttackMove, BeakBlastHeaderAttr, DelayedAttackAttr, SelfStatusMove, allMoves } from "./moves/move";
+import { MoveFlags } from "#enums/MoveFlags";
 import type Pokemon from "../field/pokemon";
-import * as Utils from "../utils";
+import { type nil, getFrameMs, getEnumKeys, getEnumValues, animationFileName } from "../utils/common";
 import type { BattlerIndex } from "../battle";
-import type { Element } from "json-stable-stringify";
 import { Moves } from "#enums/moves";
 import { SubstituteTag } from "./battler-tags";
-import { isNullOrUndefined } from "../utils";
+import { isNullOrUndefined } from "../utils/common";
 import Phaser from "phaser";
 import { EncounterAnim } from "#enums/encounter-anims";
 
 export enum AnimFrameTarget {
-    USER,
-    TARGET,
-    GRAPHIC
+  USER,
+  TARGET,
+  GRAPHIC,
 }
 
 enum AnimFocus {
-    TARGET = 1,
-    USER,
-    USER_TARGET,
-    SCREEN
+  TARGET = 1,
+  USER,
+  USER_TARGET,
+  SCREEN,
 }
 
 enum AnimBlendType {
-    NORMAL,
-    ADD,
-    SUBTRACT
+  NORMAL,
+  ADD,
+  SUBTRACT,
 }
 
 export enum ChargeAnim {
-    FLY_CHARGING = 1000,
-    BOUNCE_CHARGING,
-    DIG_CHARGING,
-    FUTURE_SIGHT_CHARGING,
-    DIVE_CHARGING,
-    SOLAR_BEAM_CHARGING,
-    SHADOW_FORCE_CHARGING,
-    SKULL_BASH_CHARGING,
-    FREEZE_SHOCK_CHARGING,
-    SKY_DROP_CHARGING,
-    SKY_ATTACK_CHARGING,
-    ICE_BURN_CHARGING,
-    DOOM_DESIRE_CHARGING,
-    RAZOR_WIND_CHARGING,
-    PHANTOM_FORCE_CHARGING,
-    GEOMANCY_CHARGING,
-    SHADOW_BLADE_CHARGING,
-    SOLAR_BLADE_CHARGING,
-    BEAK_BLAST_CHARGING,
-    METEOR_BEAM_CHARGING,
-    ELECTRO_SHOT_CHARGING
+  FLY_CHARGING = 1000,
+  BOUNCE_CHARGING,
+  DIG_CHARGING,
+  FUTURE_SIGHT_CHARGING,
+  DIVE_CHARGING,
+  SOLAR_BEAM_CHARGING,
+  SHADOW_FORCE_CHARGING,
+  SKULL_BASH_CHARGING,
+  FREEZE_SHOCK_CHARGING,
+  SKY_DROP_CHARGING,
+  SKY_ATTACK_CHARGING,
+  ICE_BURN_CHARGING,
+  DOOM_DESIRE_CHARGING,
+  RAZOR_WIND_CHARGING,
+  PHANTOM_FORCE_CHARGING,
+  GEOMANCY_CHARGING,
+  SHADOW_BLADE_CHARGING,
+  SOLAR_BLADE_CHARGING,
+  BEAK_BLAST_CHARGING,
+  METEOR_BEAM_CHARGING,
+  ELECTRO_SHOT_CHARGING,
 }
 
 export enum CommonAnim {
-    USE_ITEM = 2000,
-    HEALTH_UP,
-    POISON = 2010,
-    TOXIC,
-    PARALYSIS,
-    SLEEP,
-    FROZEN,
-    BURN,
-    CONFUSION,
-    ATTRACT,
-    BIND,
-    WRAP,
-    CURSE_NO_GHOST,
-    LEECH_SEED,
-    FIRE_SPIN,
-    PROTECT,
-    COVET,
-    WHIRLPOOL,
-    BIDE,
-    SAND_TOMB,
-    QUICK_GUARD,
-    WIDE_GUARD,
-    CURSE,
-    MAGMA_STORM,
-    CLAMP,
-    SNAP_TRAP,
-    THUNDER_CAGE,
-    INFESTATION,
-    ORDER_UP_CURLY,
-    ORDER_UP_DROOPY,
-    ORDER_UP_STRETCHY,
-    RAGING_BULL_FIRE,
-    RAGING_BULL_WATER,
-    SALT_CURE,
-    POWDER,
-    SUNNY = 2100,
-    RAIN,
-    SANDSTORM,
-    HAIL,
-    SNOW,
-    WIND,
-    HEAVY_RAIN,
-    HARSH_SUN,
-    STRONG_WINDS,
-    MISTY_TERRAIN = 2110,
-    ELECTRIC_TERRAIN,
-    GRASSY_TERRAIN,
-    PSYCHIC_TERRAIN,
-    LOCK_ON = 2120
+  USE_ITEM = 2000,
+  HEALTH_UP,
+  TERASTALLIZE,
+  POISON = 2010,
+  TOXIC,
+  PARALYSIS,
+  SLEEP,
+  FROZEN,
+  BURN,
+  CONFUSION,
+  ATTRACT,
+  BIND,
+  WRAP,
+  CURSE_NO_GHOST,
+  LEECH_SEED,
+  FIRE_SPIN,
+  PROTECT,
+  COVET,
+  WHIRLPOOL,
+  BIDE,
+  SAND_TOMB,
+  QUICK_GUARD,
+  WIDE_GUARD,
+  CURSE,
+  MAGMA_STORM,
+  CLAMP,
+  SNAP_TRAP,
+  THUNDER_CAGE,
+  INFESTATION,
+  ORDER_UP_CURLY,
+  ORDER_UP_DROOPY,
+  ORDER_UP_STRETCHY,
+  RAGING_BULL_FIRE,
+  RAGING_BULL_WATER,
+  SALT_CURE,
+  POWDER,
+  SUNNY = 2100,
+  RAIN,
+  SANDSTORM,
+  HAIL,
+  SNOW,
+  WIND,
+  HEAVY_RAIN,
+  HARSH_SUN,
+  STRONG_WINDS,
+  MISTY_TERRAIN = 2110,
+  ELECTRIC_TERRAIN,
+  GRASSY_TERRAIN,
+  PSYCHIC_TERRAIN,
+  LOCK_ON = 2120,
 }
 
 export class AnimConfig {
@@ -114,7 +115,7 @@ export class AnimConfig {
   public hue: number;
 
   constructor(source?: any) {
-    this.frameTimedEvents = new Map<number, AnimTimedEvent[]>;
+    this.frameTimedEvents = new Map<number, AnimTimedEvent[]>();
 
     if (source) {
       this.id = source.id;
@@ -146,7 +147,7 @@ export class AnimConfig {
 
           timedEvent && timedEvents.push(timedEvent);
         }
-        this.frameTimedEvents.set(parseInt(fte), timedEvents);
+        this.frameTimedEvents.set(Number.parseInt(fte), timedEvents);
       }
 
       this.position = source.position;
@@ -204,9 +205,34 @@ class AnimFrame {
   public priority: number;
   public focus: AnimFocus;
 
-  constructor(x: number, y: number, zoomX: number, zoomY: number, angle: number, mirror: boolean, visible: boolean, blendType: AnimBlendType, pattern: number,
-    opacity: number, colorR: number, colorG: number, colorB: number, colorA: number, toneR: number, toneG: number, toneB: number, toneA: number,
-    flashR: number, flashG: number, flashB: number, flashA: number, locked: boolean, priority: number, focus: AnimFocus, init?: boolean) {
+  constructor(
+    x: number,
+    y: number,
+    zoomX: number,
+    zoomY: number,
+    angle: number,
+    mirror: boolean,
+    visible: boolean,
+    blendType: AnimBlendType,
+    pattern: number,
+    opacity: number,
+    colorR: number,
+    colorG: number,
+    colorB: number,
+    colorA: number,
+    toneR: number,
+    toneG: number,
+    toneB: number,
+    toneA: number,
+    flashR: number,
+    flashG: number,
+    flashB: number,
+    flashA: number,
+    locked: boolean,
+    priority: number,
+    focus: AnimFocus,
+    init?: boolean,
+  ) {
     this.x = !init ? ((x || 0) - 128) * 0.5 : x;
     this.y = !init ? ((y || 0) - 224) * 0.5 : y;
     if (zoomX) {
@@ -258,19 +284,19 @@ class AnimFrame {
       this.opacity = 0;
     }
     if (colorR || colorG || colorB || colorA) {
-      this.color = [ colorR || 0, colorG || 0, colorB || 0, colorA || 0 ];
+      this.color = [colorR || 0, colorG || 0, colorB || 0, colorA || 0];
     } else if (init) {
-      this.color = [ 0, 0, 0, 0 ];
+      this.color = [0, 0, 0, 0];
     }
     if (toneR || toneG || toneB || toneA) {
-      this.tone = [ toneR || 0, toneG || 0, toneB || 0, toneA || 0 ];
+      this.tone = [toneR || 0, toneG || 0, toneB || 0, toneA || 0];
     } else if (init) {
-      this.tone = [ 0, 0, 0, 0 ];
+      this.tone = [0, 0, 0, 0];
     }
     if (flashR || flashG || flashB || flashA) {
-      this.flash = [ flashR || 0, flashG || 0, flashB || 0, flashA || 0 ];
+      this.flash = [flashR || 0, flashG || 0, flashB || 0, flashA || 0];
     } else if (init) {
-      this.flash = [ 0, 0, 0, 0 ];
+      this.flash = [0, 0, 0, 0];
     }
     if (locked) {
       this.locked = locked;
@@ -288,10 +314,37 @@ class AnimFrame {
 
 class ImportedAnimFrame extends AnimFrame {
   constructor(source: any) {
-    const color: number[] = source.color || [ 0, 0, 0, 0 ];
-    const tone: number[] = source.tone || [ 0, 0, 0, 0 ];
-    const flash: number[] = source.flash || [ 0, 0, 0, 0 ];
-    super(source.x, source.y, source.zoomX, source.zoomY, source.angle, source.mirror, source.visible, source.blendType, source.graphicFrame, source.opacity, color[0], color[1], color[2], color[3], tone[0], tone[1], tone[2], tone[3], flash[0], flash[1], flash[2], flash[3], source.locked, source.priority, source.focus, true);
+    const color: number[] = source.color || [0, 0, 0, 0];
+    const tone: number[] = source.tone || [0, 0, 0, 0];
+    const flash: number[] = source.flash || [0, 0, 0, 0];
+    super(
+      source.x,
+      source.y,
+      source.zoomX,
+      source.zoomY,
+      source.angle,
+      source.mirror,
+      source.visible,
+      source.blendType,
+      source.graphicFrame,
+      source.opacity,
+      color[0],
+      color[1],
+      color[2],
+      color[3],
+      tone[0],
+      tone[1],
+      tone[2],
+      tone[3],
+      flash[0],
+      flash[1],
+      flash[2],
+      flash[3],
+      source.locked,
+      source.priority,
+      source.focus,
+      true,
+    );
     this.target = source.target;
     this.graphicFrame = source.graphicFrame;
   }
@@ -306,14 +359,14 @@ abstract class AnimTimedEvent {
     this.resourceName = resourceName;
   }
 
-    abstract execute(battleAnim: BattleAnim, priority?: number): number;
+  abstract execute(battleAnim: BattleAnim, priority?: number): number;
 
-    abstract getEventType(): string;
+  abstract getEventType(): string;
 }
 
 class AnimTimedSoundEvent extends AnimTimedEvent {
-  public volume: number = 100;
-  public pitch: number = 100;
+  public volume = 100;
+  public pitch = 100;
 
   constructor(frameIndex: number, resourceName: string, source?: any) {
     super(frameIndex, resourceName);
@@ -324,8 +377,8 @@ class AnimTimedSoundEvent extends AnimTimedEvent {
     }
   }
 
-  execute(battleAnim: BattleAnim, priority?: number): number {
-    const soundConfig = { rate: (this.pitch * 0.01), volume: (this.volume * 0.01) };
+  execute(battleAnim: BattleAnim): number {
+    const soundConfig = { rate: this.pitch * 0.01, volume: this.volume * 0.01 };
     if (this.resourceName) {
       try {
         globalScene.playSound(`battle_anims/${this.resourceName}`, soundConfig);
@@ -333,9 +386,8 @@ class AnimTimedSoundEvent extends AnimTimedEvent {
         console.error(err);
       }
       return Math.ceil((globalScene.sound.get(`battle_anims/${this.resourceName}`).totalDuration * 1000) / 33.33);
-    } else {
-      return Math.ceil((battleAnim.user!.cry(soundConfig).totalDuration * 1000) / 33.33); // TODO: is the bang behind user correct?
     }
+    return Math.ceil((battleAnim.user!.cry(soundConfig).totalDuration * 1000) / 33.33); // TODO: is the bang behind user correct?
   }
 
   getEventType(): string {
@@ -344,14 +396,14 @@ class AnimTimedSoundEvent extends AnimTimedEvent {
 }
 
 abstract class AnimTimedBgEvent extends AnimTimedEvent {
-  public bgX: number = 0;
-  public bgY: number = 0;
-  public opacity: number = 0;
+  public bgX = 0;
+  public bgY = 0;
+  public opacity = 0;
   /*public colorRed: number = 0;
     public colorGreen: number = 0;
     public colorBlue: number = 0;
     public colorAlpha: number = 0;*/
-  public duration: number = 0;
+  public duration = 0;
   /*public flashScope: number = 0;
     public flashRed: number = 0;
     public flashGreen: number = 0;
@@ -359,7 +411,7 @@ abstract class AnimTimedBgEvent extends AnimTimedEvent {
     public flashAlpha: number = 0;
     public flashDuration: number = 0;*/
 
-  constructor(frameIndex: number, resourceName: string, source: any) {
+  constructor(frameIndex: number, resourceName: string, source?: any) {
     super(frameIndex, resourceName);
 
     if (source) {
@@ -382,26 +434,28 @@ abstract class AnimTimedBgEvent extends AnimTimedEvent {
 }
 
 class AnimTimedUpdateBgEvent extends AnimTimedBgEvent {
-  constructor(frameIndex: number, resourceName: string, source?: any) {
-    super(frameIndex, resourceName, source);
-  }
-
+  // biome-ignore lint/correctness/noUnusedVariables: seems intentional
   execute(moveAnim: MoveAnim, priority?: number): number {
     const tweenProps = {};
     if (this.bgX !== undefined) {
-      tweenProps["x"] = (this.bgX * 0.5) - 320;
+      tweenProps["x"] = this.bgX * 0.5 - 320;
     }
     if (this.bgY !== undefined) {
-      tweenProps["y"] = (this.bgY * 0.5) - 284;
+      tweenProps["y"] = this.bgY * 0.5 - 284;
     }
     if (this.opacity !== undefined) {
       tweenProps["alpha"] = (this.opacity || 0) / 255;
     }
     if (Object.keys(tweenProps).length) {
-      globalScene.tweens.add(Object.assign({
-        targets: moveAnim.bgSprite,
-        duration: Utils.getFrameMs(this.duration * 3)
-      }, tweenProps));
+      globalScene.tweens.add(
+        Object.assign(
+          {
+            targets: moveAnim.bgSprite,
+            duration: getFrameMs(this.duration * 3),
+          },
+          tweenProps,
+        ),
+      );
     }
     return this.duration * 2;
   }
@@ -412,10 +466,6 @@ class AnimTimedUpdateBgEvent extends AnimTimedBgEvent {
 }
 
 class AnimTimedAddBgEvent extends AnimTimedBgEvent {
-  constructor(frameIndex: number, resourceName: string, source?: any) {
-    super(frameIndex, resourceName, source);
-  }
-
   execute(moveAnim: MoveAnim, priority?: number): number {
     if (moveAnim.bgSprite) {
       moveAnim.bgSprite.destroy();
@@ -436,7 +486,7 @@ class AnimTimedAddBgEvent extends AnimTimedBgEvent {
 
     globalScene.tweens.add({
       targets: moveAnim.bgSprite,
-      duration: Utils.getFrameMs(this.duration * 3)
+      duration: getFrameMs(this.duration * 3),
     });
 
     return this.duration * 2;
@@ -454,14 +504,17 @@ export const encounterAnims = new Map<EncounterAnim, AnimConfig>();
 
 export function initCommonAnims(): Promise<void> {
   return new Promise(resolve => {
-    const commonAnimNames = Utils.getEnumKeys(CommonAnim);
-    const commonAnimIds = Utils.getEnumValues(CommonAnim);
+    const commonAnimNames = getEnumKeys(CommonAnim);
+    const commonAnimIds = getEnumValues(CommonAnim);
     const commonAnimFetches: Promise<Map<CommonAnim, AnimConfig>>[] = [];
     for (let ca = 0; ca < commonAnimIds.length; ca++) {
       const commonAnimId = commonAnimIds[ca];
-      commonAnimFetches.push(globalScene.cachedFetch(`./battle-anims/common-${commonAnimNames[ca].toLowerCase().replace(/\_/g, "-")}.json`)
-        .then(response => response.json())
-        .then(cas => commonAnims.set(commonAnimId, new AnimConfig(cas))));
+      commonAnimFetches.push(
+        globalScene
+          .cachedFetch(`./battle-anims/common-${commonAnimNames[ca].toLowerCase().replace(/\_/g, "-")}.json`)
+          .then(response => response.json())
+          .then(cas => commonAnims.set(commonAnimId, new AnimConfig(cas))),
+      );
     }
     Promise.allSettled(commonAnimFetches).then(() => resolve());
   });
@@ -475,10 +528,9 @@ export function initMoveAnim(move: Moves): Promise<void> {
       } else {
         const loadedCheckTimer = setInterval(() => {
           if (moveAnims.get(move) !== null) {
-            const chargeAnimSource = (allMoves[move].isChargingMove())
+            const chargeAnimSource = allMoves[move].isChargingMove()
               ? allMoves[move]
-              : (allMoves[move].getAttrs(DelayedAttackAttr)[0]
-                ?? allMoves[move].getAttrs(BeakBlastHeaderAttr)[0]);
+              : (allMoves[move].getAttrs(DelayedAttackAttr)[0] ?? allMoves[move].getAttrs(BeakBlastHeaderAttr)[0]);
             if (chargeAnimSource && chargeAnims.get(chargeAnimSource.chargeAnim) === null) {
               return;
             }
@@ -489,10 +541,16 @@ export function initMoveAnim(move: Moves): Promise<void> {
       }
     } else {
       moveAnims.set(move, null);
-      const defaultMoveAnim = allMoves[move] instanceof AttackMove ? Moves.TACKLE : allMoves[move] instanceof SelfStatusMove ? Moves.FOCUS_ENERGY : Moves.TAIL_WHIP;
+      const defaultMoveAnim =
+        allMoves[move] instanceof AttackMove
+          ? Moves.TACKLE
+          : allMoves[move] instanceof SelfStatusMove
+            ? Moves.FOCUS_ENERGY
+            : Moves.TAIL_WHIP;
 
       const fetchAnimAndResolve = (move: Moves) => {
-        globalScene.cachedFetch(`./battle-anims/${Utils.animationFileName(move)}.json`)
+        globalScene
+          .cachedFetch(`./battle-anims/${animationFileName(move)}.json`)
           .then(response => {
             const contentType = response.headers.get("content-type");
             if (!response.ok || contentType?.indexOf("application/json") === -1) {
@@ -509,10 +567,9 @@ export function initMoveAnim(move: Moves): Promise<void> {
             } else {
               populateMoveAnim(move, ba);
             }
-            const chargeAnimSource = (allMoves[move].isChargingMove())
+            const chargeAnimSource = allMoves[move].isChargingMove()
               ? allMoves[move]
-              : (allMoves[move].getAttrs(DelayedAttackAttr)[0]
-                  ?? allMoves[move].getAttrs(BeakBlastHeaderAttr)[0]);
+              : (allMoves[move].getAttrs(DelayedAttackAttr)[0] ?? allMoves[move].getAttrs(BeakBlastHeaderAttr)[0]);
             if (chargeAnimSource) {
               initMoveChargeAnim(chargeAnimSource.chargeAnim).then(() => resolve());
             } else {
@@ -549,7 +606,7 @@ function useDefaultAnim(move: Moves, defaultMoveAnim: Moves) {
  * @remarks use {@linkcode useDefaultAnim} to use a default animation
  */
 function logMissingMoveAnim(move: Moves, ...optionalParams: any[]) {
-  const moveName = Utils.animationFileName(move);
+  const moveName = animationFileName(move);
   console.warn(`Could not load animation file for move '${moveName}'`, ...optionalParams);
 }
 
@@ -558,16 +615,19 @@ function logMissingMoveAnim(move: Moves, ...optionalParams: any[]) {
  * @param encounterAnim one or more animations to fetch
  */
 export async function initEncounterAnims(encounterAnim: EncounterAnim | EncounterAnim[]): Promise<void> {
-  const anims = Array.isArray(encounterAnim) ? encounterAnim : [ encounterAnim ];
-  const encounterAnimNames = Utils.getEnumKeys(EncounterAnim);
+  const anims = Array.isArray(encounterAnim) ? encounterAnim : [encounterAnim];
+  const encounterAnimNames = getEnumKeys(EncounterAnim);
   const encounterAnimFetches: Promise<Map<EncounterAnim, AnimConfig>>[] = [];
   for (const anim of anims) {
     if (encounterAnims.has(anim) && !isNullOrUndefined(encounterAnims.get(anim))) {
       continue;
     }
-    encounterAnimFetches.push(globalScene.cachedFetch(`./battle-anims/encounter-${encounterAnimNames[anim].toLowerCase().replace(/\_/g, "-")}.json`)
-      .then(response => response.json())
-      .then(cas => encounterAnims.set(anim, new AnimConfig(cas))));
+    encounterAnimFetches.push(
+      globalScene
+        .cachedFetch(`./battle-anims/encounter-${encounterAnimNames[anim].toLowerCase().replace(/\_/g, "-")}.json`)
+        .then(response => response.json())
+        .then(cas => encounterAnims.set(anim, new AnimConfig(cas))),
+    );
   }
   await Promise.allSettled(encounterAnimFetches);
 }
@@ -587,7 +647,8 @@ export function initMoveChargeAnim(chargeAnim: ChargeAnim): Promise<void> {
       }
     } else {
       chargeAnims.set(chargeAnim, null);
-      globalScene.cachedFetch(`./battle-anims/${ChargeAnim[chargeAnim].toLowerCase().replace(/\_/g, "-")}.json`)
+      globalScene
+        .cachedFetch(`./battle-anims/${ChargeAnim[chargeAnim].toLowerCase().replace(/\_/g, "-")}.json`)
         .then(response => response.json())
         .then(ca => {
           if (Array.isArray(ca)) {
@@ -608,7 +669,7 @@ function populateMoveAnim(move: Moves, animSource: any): void {
     moveAnims.set(move, moveAnim);
     return;
   }
-  moveAnims.set(move, [ moveAnims.get(move) as AnimConfig, moveAnim ]);
+  moveAnims.set(move, [moveAnims.get(move) as AnimConfig, moveAnim]);
 }
 
 function populateMoveChargeAnim(chargeAnim: ChargeAnim, animSource: any) {
@@ -617,7 +678,7 @@ function populateMoveChargeAnim(chargeAnim: ChargeAnim, animSource: any) {
     chargeAnims.set(chargeAnim, moveChargeAnim);
     return;
   }
-  chargeAnims.set(chargeAnim, [ chargeAnims.get(chargeAnim) as AnimConfig, moveChargeAnim ]);
+  chargeAnims.set(chargeAnim, [chargeAnims.get(chargeAnim) as AnimConfig, moveChargeAnim]);
 }
 
 export function loadCommonAnimAssets(startLoad?: boolean): Promise<void> {
@@ -637,12 +698,11 @@ export async function loadEncounterAnimAssets(startLoad?: boolean): Promise<void
 
 export function loadMoveAnimAssets(moveIds: Moves[], startLoad?: boolean): Promise<void> {
   return new Promise(resolve => {
-    const moveAnimations = moveIds.map(m => moveAnims.get(m) as AnimConfig).flat();
+    const moveAnimations = moveIds.flatMap(m => moveAnims.get(m) as AnimConfig);
     for (const moveId of moveIds) {
-      const chargeAnimSource = (allMoves[moveId].isChargingMove())
+      const chargeAnimSource = allMoves[moveId].isChargingMove()
         ? allMoves[moveId]
-        : (allMoves[moveId].getAttrs(DelayedAttackAttr)[0]
-                  ?? allMoves[moveId].getAttrs(BeakBlastHeaderAttr)[0]);
+        : (allMoves[moveId].getAttrs(DelayedAttackAttr)[0] ?? allMoves[moveId].getAttrs(BeakBlastHeaderAttr)[0]);
       if (chargeAnimSource) {
         const moveChargeAnims = chargeAnims.get(chargeAnimSource.chargeAnim);
         moveAnimations.push(moveChargeAnims instanceof AnimConfig ? moveChargeAnims : moveChargeAnims![0]); // TODO: is the bang correct?
@@ -693,11 +753,11 @@ function loadAnimAssets(anims: AnimConfig[], startLoad?: boolean): Promise<void>
 }
 
 interface GraphicFrameData {
-    x: number,
-    y: number,
-    scaleX: number,
-    scaleY: number,
-    angle: number
+  x: number;
+  y: number;
+  scaleX: number;
+  scaleY: number;
+  angle: number;
 }
 
 const userFocusX = 106;
@@ -705,25 +765,43 @@ const userFocusY = 148 - 32;
 const targetFocusX = 234;
 const targetFocusY = 84 - 32;
 
-function transformPoint(x1: number, y1: number, x2: number, y2: number, x3: number, y3: number, x4: number, y4: number, px: number, py: number): [ x: number, y: number ] {
+function transformPoint(
+  x1: number,
+  y1: number,
+  x2: number,
+  y2: number,
+  x3: number,
+  y3: number,
+  x4: number,
+  y4: number,
+  px: number,
+  py: number,
+): [x: number, y: number] {
   const yIntersect = yAxisIntersect(x1, y1, x2, y2, px, py);
   return repositionY(x3, y3, x4, y4, yIntersect[0], yIntersect[1]);
 }
 
-function yAxisIntersect(x1: number, y1: number, x2: number, y2: number, px: number, py: number): [ x: number, y: number ] {
+function yAxisIntersect(
+  x1: number,
+  y1: number,
+  x2: number,
+  y2: number,
+  px: number,
+  py: number,
+): [x: number, y: number] {
   const dx = x2 - x1;
   const dy = y2 - y1;
   const x = dx === 0 ? 0 : (px - x1) / dx;
   const y = dy === 0 ? 0 : (py - y1) / dy;
-  return [ x, y ];
+  return [x, y];
 }
 
-function repositionY(x1: number, y1: number, x2: number, y2: number, tx: number, ty: number): [ x: number, y: number ]  {
+function repositionY(x1: number, y1: number, x2: number, y2: number, tx: number, ty: number): [x: number, y: number] {
   const dx = x2 - x1;
   const dy = y2 - y1;
-  const x = x1 + (tx * dx);
-  const y = y1 + (ty * dy);
-  return [ x, y ];
+  const x = x1 + tx * dx;
+  const y = y1 + ty * dy;
+  return [x, y];
 }
 
 function isReversed(src1: number, src2: number, dst1: number, dst2: number) {
@@ -737,7 +815,7 @@ function isReversed(src1: number, src2: number, dst1: number, dst2: number) {
 }
 
 interface SpriteCache {
-    [key: number]: Phaser.GameObjects.Sprite[]
+  [key: number]: Phaser.GameObjects.Sprite[];
 }
 
 export abstract class BattleAnim {
@@ -755,516 +833,589 @@ export abstract class BattleAnim {
   private srcLine: number[];
   private dstLine: number[];
 
-  constructor(user?: Pokemon, target?: Pokemon, playRegardlessOfIssues: boolean = false) {
+  constructor(user?: Pokemon, target?: Pokemon, playRegardlessOfIssues = false) {
     this.user = user ?? null;
     this.target = target ?? null;
     this.sprites = [];
     this.playRegardlessOfIssues = playRegardlessOfIssues;
   }
 
-    abstract getAnim(): AnimConfig | null;
+  abstract getAnim(): AnimConfig | null;
 
-    abstract isOppAnim(): boolean;
+  abstract isOppAnim(): boolean;
 
-    protected isHideUser(): boolean {
-      return false;
-    }
+  protected isHideUser(): boolean {
+    return false;
+  }
 
-    protected isHideTarget(): boolean {
-      return false;
-    }
+  protected isHideTarget(): boolean {
+    return false;
+  }
 
-    private getGraphicFrameData(frames: AnimFrame[], onSubstitute?: boolean): Map<number, Map<AnimFrameTarget, GraphicFrameData>> {
-      const ret: Map<number, Map<AnimFrameTarget, GraphicFrameData>> = new Map([
-        [ AnimFrameTarget.GRAPHIC, new Map<AnimFrameTarget, GraphicFrameData>() ],
-        [ AnimFrameTarget.USER, new Map<AnimFrameTarget, GraphicFrameData>() ],
-        [ AnimFrameTarget.TARGET, new Map<AnimFrameTarget, GraphicFrameData>() ]
-      ]);
+  private getGraphicFrameData(
+    frames: AnimFrame[],
+    onSubstitute?: boolean,
+  ): Map<number, Map<AnimFrameTarget, GraphicFrameData>> {
+    const ret: Map<number, Map<AnimFrameTarget, GraphicFrameData>> = new Map([
+      [AnimFrameTarget.GRAPHIC, new Map<AnimFrameTarget, GraphicFrameData>()],
+      [AnimFrameTarget.USER, new Map<AnimFrameTarget, GraphicFrameData>()],
+      [AnimFrameTarget.TARGET, new Map<AnimFrameTarget, GraphicFrameData>()],
+    ]);
 
-      const isOppAnim = this.isOppAnim();
-      const user = !isOppAnim ? this.user : this.target;
-      const target = !isOppAnim ? this.target : this.user;
+    const isOppAnim = this.isOppAnim();
+    const user = !isOppAnim ? this.user : this.target;
+    const target = !isOppAnim ? this.target : this.user;
 
-      const targetSubstitute = (onSubstitute && user !== target) ? target!.getTag(SubstituteTag) : null;
+    const targetSubstitute = onSubstitute && user !== target ? target!.getTag(SubstituteTag) : null;
 
-      const userInitialX = user!.x; // TODO: is this bang correct?
-      const userInitialY = user!.y; // TODO: is this bang correct?
-      const userHalfHeight = user!.getSprite().displayHeight! / 2; // TODO: is this bang correct?
+    const userInitialX = user!.x; // TODO: is this bang correct?
+    const userInitialY = user!.y; // TODO: is this bang correct?
+    const userHalfHeight = user!.getSprite().displayHeight! / 2; // TODO: is this bang correct?
 
-      const targetInitialX = targetSubstitute?.sprite?.x ?? target!.x; // TODO: is this bang correct?
-      const targetInitialY = targetSubstitute?.sprite?.y ?? target!.y; // TODO: is this bang correct?
-      const targetHalfHeight = (targetSubstitute?.sprite ?? target!.getSprite()).displayHeight! / 2; // TODO: is this bang correct?
+    const targetInitialX = targetSubstitute?.sprite?.x ?? target!.x; // TODO: is this bang correct?
+    const targetInitialY = targetSubstitute?.sprite?.y ?? target!.y; // TODO: is this bang correct?
+    const targetHalfHeight = (targetSubstitute?.sprite ?? target!.getSprite()).displayHeight! / 2; // TODO: is this bang correct?
 
-      let g = 0;
-      let u = 0;
-      let t = 0;
+    let g = 0;
+    let u = 0;
+    let t = 0;
 
-      for (const frame of frames) {
-        let x = frame.x + 106;
-        let y = frame.y + 116;
-        let scaleX = (frame.zoomX / 100) * (!frame.mirror ? 1 : -1);
-        const scaleY = (frame.zoomY / 100);
-        switch (frame.focus) {
-          case AnimFocus.TARGET:
-            x += targetInitialX - targetFocusX;
-            y += (targetInitialY - targetHalfHeight) - targetFocusY;
-            break;
-          case AnimFocus.USER:
-            x += userInitialX - userFocusX;
-            y += (userInitialY - userHalfHeight) - userFocusY;
-            break;
-          case AnimFocus.USER_TARGET:
-            const point = transformPoint(this.srcLine[0], this.srcLine[1], this.srcLine[2], this.srcLine[3],
-              this.dstLine[0], this.dstLine[1] - userHalfHeight, this.dstLine[2], this.dstLine[3] - targetHalfHeight, x, y);
+    for (const frame of frames) {
+      let x = frame.x + 106;
+      let y = frame.y + 116;
+      let scaleX = (frame.zoomX / 100) * (!frame.mirror ? 1 : -1);
+      const scaleY = frame.zoomY / 100;
+      switch (frame.focus) {
+        case AnimFocus.TARGET:
+          x += targetInitialX - targetFocusX;
+          y += targetInitialY - targetHalfHeight - targetFocusY;
+          break;
+        case AnimFocus.USER:
+          x += userInitialX - userFocusX;
+          y += userInitialY - userHalfHeight - userFocusY;
+          break;
+        case AnimFocus.USER_TARGET:
+          {
+            const point = transformPoint(
+              this.srcLine[0],
+              this.srcLine[1],
+              this.srcLine[2],
+              this.srcLine[3],
+              this.dstLine[0],
+              this.dstLine[1] - userHalfHeight,
+              this.dstLine[2],
+              this.dstLine[3] - targetHalfHeight,
+              x,
+              y,
+            );
             x = point[0];
             y = point[1];
-            if (frame.target === AnimFrameTarget.GRAPHIC && isReversed(this.srcLine[0], this.srcLine[2], this.dstLine[0], this.dstLine[2])) {
+            if (
+              frame.target === AnimFrameTarget.GRAPHIC &&
+              isReversed(this.srcLine[0], this.srcLine[2], this.dstLine[0], this.dstLine[2])
+            ) {
               scaleX = scaleX * -1;
             }
-            break;
-        }
-        const angle = -frame.angle;
-        const key = frame.target === AnimFrameTarget.GRAPHIC ? g++ : frame.target === AnimFrameTarget.USER ? u++ : t++;
-        ret.get(frame.target)!.set(key, { x: x, y: y, scaleX: scaleX, scaleY: scaleY, angle: angle }); // TODO: is the bang correct?
+          }
+          break;
       }
-
-      return ret;
+      const angle = -frame.angle;
+      const key = frame.target === AnimFrameTarget.GRAPHIC ? g++ : frame.target === AnimFrameTarget.USER ? u++ : t++;
+      ret.get(frame.target)!.set(key, { x: x, y: y, scaleX: scaleX, scaleY: scaleY, angle: angle }); // TODO: is the bang correct?
     }
 
-    play(onSubstitute?: boolean, callback?: Function) {
-      const isOppAnim = this.isOppAnim();
-      const user = !isOppAnim ? this.user! : this.target!; // TODO: are those bangs correct?
-      const target = !isOppAnim ? this.target! : this.user!;
+    return ret;
+  }
 
-      if (!target?.isOnField() && !this.playRegardlessOfIssues) {
-        if (callback) {
-          callback();
-        }
-        return;
+  // biome-ignore lint/complexity/noBannedTypes: callback is used liberally
+  play(onSubstitute?: boolean, callback?: Function) {
+    const isOppAnim = this.isOppAnim();
+    const user = !isOppAnim ? this.user! : this.target!; // TODO: are those bangs correct?
+    const target = !isOppAnim ? this.target! : this.user!;
+
+    if (!target?.isOnField() && !this.playRegardlessOfIssues) {
+      if (callback) {
+        callback();
       }
-
-      const targetSubstitute = (!!onSubstitute && user !== target) ? target.getTag(SubstituteTag) : null;
-
-      const userSprite = user.getSprite();
-      const targetSprite = targetSubstitute?.sprite ?? target.getSprite();
-
-      const spriteCache: SpriteCache = {
-        [AnimFrameTarget.GRAPHIC]: [],
-        [AnimFrameTarget.USER]: [],
-        [AnimFrameTarget.TARGET]: []
-      };
-      const spritePriorities: number[] = [];
-
-      const cleanUpAndComplete = () => {
-        userSprite.setPosition(0, 0);
-        userSprite.setScale(1);
-        userSprite.setAlpha(1);
-        userSprite.pipelineData["tone"] = [ 0.0, 0.0, 0.0, 0.0 ];
-        userSprite.setAngle(0);
-        if (!targetSubstitute) {
-          targetSprite.setPosition(0, 0);
-          targetSprite.setScale(1);
-          targetSprite.setAlpha(1);
-        } else {
-          targetSprite.setPosition(
-            target.x - target.getSubstituteOffset()[0],
-            target.y - target.getSubstituteOffset()[1]
-          );
-          targetSprite.setScale(target.getSpriteScale() * (target.isPlayer() ? 0.5 : 1));
-          targetSprite.setAlpha(1);
-        }
-        targetSprite.pipelineData["tone"] = [ 0.0, 0.0, 0.0, 0.0 ];
-        targetSprite.setAngle(0);
-
-        /**
-         * This and `targetSpriteToShow` are used to restore context lost
-         * from the `isOppAnim` swap. Using these references instead of `this.user`
-         * and `this.target` prevent the target's Substitute doll from disappearing
-         * after being the target of an animation.
-         */
-        const userSpriteToShow = !isOppAnim ? userSprite : targetSprite;
-        const targetSpriteToShow = !isOppAnim ? targetSprite : userSprite;
-        if (!this.isHideUser() && userSpriteToShow) {
-          userSpriteToShow.setVisible(true);
-        }
-        if (!this.isHideTarget() && (targetSpriteToShow !== userSpriteToShow || !this.isHideUser())) {
-          targetSpriteToShow.setVisible(true);
-        }
-        for (const ms of Object.values(spriteCache).flat()) {
-          if (ms) {
-            ms.destroy();
-          }
-        }
-        if (this.bgSprite) {
-          this.bgSprite.destroy();
-        }
-        if (callback) {
-          callback();
-        }
-      };
-
-      if (!globalScene.moveAnimations && !this.playRegardlessOfIssues) {
-        return cleanUpAndComplete();
-      }
-
-      const anim = this.getAnim();
-
-      const userInitialX = user.x;
-      const userInitialY = user.y;
-      const targetInitialX = targetSubstitute?.sprite?.x ?? target.x;
-      const targetInitialY = targetSubstitute?.sprite?.y ?? target.y;
-
-      this.srcLine = [ userFocusX, userFocusY, targetFocusX, targetFocusY ];
-      this.dstLine = [ userInitialX, userInitialY, targetInitialX, targetInitialY ];
-
-      let r = anim?.frames.length ?? 0;
-      let f = 0;
-
-      globalScene.tweens.addCounter({
-        duration: Utils.getFrameMs(3),
-        repeat: anim?.frames.length ?? 0,
-        onRepeat: () => {
-          if (!f) {
-            userSprite.setVisible(false);
-            targetSprite.setVisible(false);
-          }
-
-          const spriteFrames = anim!.frames[f]; // TODO: is the bang correcT?
-          const frameData = this.getGraphicFrameData(anim!.frames[f], onSubstitute); // TODO: is the bang correct?
-          let u = 0;
-          let t = 0;
-          let g = 0;
-          for (const frame of spriteFrames) {
-            if (frame.target !== AnimFrameTarget.GRAPHIC) {
-              const isUser = frame.target === AnimFrameTarget.USER;
-              if (isUser && target === user) {
-                continue;
-              } else if (this.playRegardlessOfIssues && frame.target === AnimFrameTarget.TARGET && !target.isOnField()) {
-                continue;
-              }
-              const sprites = spriteCache[isUser ? AnimFrameTarget.USER : AnimFrameTarget.TARGET];
-              const spriteSource = isUser ? userSprite : targetSprite;
-              if ((isUser ? u : t) === sprites.length) {
-                if (isUser || !targetSubstitute) {
-                  const sprite = globalScene.addPokemonSprite(isUser ? user! : target, 0, 0, spriteSource!.texture, spriteSource!.frame.name, true); // TODO: are those bangs correct?
-                  [ "spriteColors", "fusionSpriteColors" ].map(k => sprite.pipelineData[k] = (isUser ? user! : target).getSprite().pipelineData[k]); // TODO: are those bangs correct?
-                  sprite.setPipelineData("spriteKey", (isUser ? user! : target).getBattleSpriteKey());
-                  sprite.setPipelineData("shiny", (isUser ? user : target).shiny);
-                  sprite.setPipelineData("variant", (isUser ? user : target).variant);
-                  sprite.setPipelineData("ignoreFieldPos", true);
-                  spriteSource.on("animationupdate", (_anim, frame) => sprite.setFrame(frame.textureFrame));
-                  globalScene.field.add(sprite);
-                  sprites.push(sprite);
-                } else {
-                  const sprite = globalScene.addFieldSprite(spriteSource.x, spriteSource.y, spriteSource.texture);
-                  spriteSource.on("animationupdate", (_anim, frame) => sprite.setFrame(frame.textureFrame));
-                  globalScene.field.add(sprite);
-                  sprites.push(sprite);
-                }
-              }
-
-              const spriteIndex = isUser ? u++ : t++;
-              const pokemonSprite = sprites[spriteIndex];
-              const graphicFrameData = frameData.get(frame.target)!.get(spriteIndex)!; // TODO: are the bangs correct?
-              const spriteSourceScale = (isUser || !targetSubstitute)
-                ? spriteSource.parentContainer.scale
-                : target.getSpriteScale() * (target.isPlayer() ? 0.5 : 1);
-              pokemonSprite.setPosition(graphicFrameData.x, graphicFrameData.y - ((spriteSource.height / 2) * (spriteSourceScale - 1)));
-
-              pokemonSprite.setAngle(graphicFrameData.angle);
-              pokemonSprite.setScale(graphicFrameData.scaleX * spriteSourceScale,  graphicFrameData.scaleY * spriteSourceScale);
-
-              pokemonSprite.setData("locked", frame.locked);
-
-              pokemonSprite.setAlpha(frame.opacity / 255);
-              pokemonSprite.pipelineData["tone"] = frame.tone;
-              pokemonSprite.setVisible(frame.visible && (isUser ? user.visible : target.visible));
-              pokemonSprite.setBlendMode(frame.blendType === AnimBlendType.NORMAL ? Phaser.BlendModes.NORMAL : frame.blendType === AnimBlendType.ADD ? Phaser.BlendModes.ADD : Phaser.BlendModes.DIFFERENCE);
-            } else {
-              const sprites = spriteCache[AnimFrameTarget.GRAPHIC];
-              if (g === sprites.length) {
-                const newSprite: Phaser.GameObjects.Sprite = globalScene.addFieldSprite(0, 0, anim!.graphic, 1); // TODO: is the bang correct?
-                sprites.push(newSprite);
-                globalScene.field.add(newSprite);
-                spritePriorities.push(1);
-              }
-
-              const graphicIndex = g++;
-              const moveSprite = sprites[graphicIndex];
-              if (spritePriorities[graphicIndex] !== frame.priority) {
-                spritePriorities[graphicIndex] = frame.priority;
-                const setSpritePriority = (priority: number) => {
-                  switch (priority) {
-                    case 0:
-                      globalScene.field.moveBelow(moveSprite as Phaser.GameObjects.GameObject, globalScene.getEnemyPokemon(false) ?? globalScene.getPlayerPokemon(false)!); // TODO: is this bang correct?
-                      break;
-                    case 1:
-                      globalScene.field.moveTo(moveSprite, globalScene.field.getAll().length - 1);
-                      break;
-                    case 2:
-                      switch (frame.focus) {
-                        case AnimFocus.USER:
-                          if (this.bgSprite) {
-                            globalScene.field.moveAbove(moveSprite as Phaser.GameObjects.GameObject, this.bgSprite);
-                          } else {
-                            globalScene.field.moveBelow(moveSprite as Phaser.GameObjects.GameObject, this.user!); // TODO: is this bang correct?
-                          }
-                          break;
-                        case AnimFocus.TARGET:
-                          globalScene.field.moveBelow(moveSprite as Phaser.GameObjects.GameObject, this.target!); // TODO: is this bang correct?
-                          break;
-                        default:
-                          setSpritePriority(1);
-                          break;
-                      }
-                      break;
-                    case 3:
-                      switch (frame.focus) {
-                        case AnimFocus.USER:
-                          globalScene.field.moveAbove(moveSprite as Phaser.GameObjects.GameObject, this.user!); // TODO: is this bang correct?
-                          break;
-                        case AnimFocus.TARGET:
-                          globalScene.field.moveAbove(moveSprite as Phaser.GameObjects.GameObject, this.target!); // TODO: is this bang correct?
-                          break;
-                        default:
-                          setSpritePriority(1);
-                          break;
-                      }
-                      break;
-                    default:
-                      setSpritePriority(1);
-                  }
-                };
-                setSpritePriority(frame.priority);
-              }
-              moveSprite.setFrame(frame.graphicFrame);
-              //console.log(AnimFocus[frame.focus]);
-
-              const graphicFrameData = frameData.get(frame.target)!.get(graphicIndex)!; // TODO: are those bangs correct?
-              moveSprite.setPosition(graphicFrameData.x, graphicFrameData.y);
-              moveSprite.setAngle(graphicFrameData.angle);
-              moveSprite.setScale(graphicFrameData.scaleX,  graphicFrameData.scaleY);
-
-              moveSprite.setAlpha(frame.opacity / 255);
-              moveSprite.setVisible(frame.visible);
-              moveSprite.setBlendMode(frame.blendType === AnimBlendType.NORMAL ? Phaser.BlendModes.NORMAL : frame.blendType === AnimBlendType.ADD ? Phaser.BlendModes.ADD : Phaser.BlendModes.DIFFERENCE);
-            }
-          }
-          if (anim?.frameTimedEvents.has(f)) {
-            for (const event of anim.frameTimedEvents.get(f)!) { // TODO: is this bang correct?
-              r = Math.max((anim.frames.length - f) + event.execute(this), r);
-            }
-          }
-          const targets = Utils.getEnumValues(AnimFrameTarget);
-          for (const i of targets) {
-            const count = i === AnimFrameTarget.GRAPHIC ? g : i === AnimFrameTarget.USER ? u : t;
-            if (count < spriteCache[i].length) {
-              const spritesToRemove = spriteCache[i].slice(count, spriteCache[i].length);
-              for (const rs of spritesToRemove) {
-                if (!rs.getData("locked") as boolean) {
-                  const spriteCacheIndex = spriteCache[i].indexOf(rs);
-                  spriteCache[i].splice(spriteCacheIndex, 1);
-                  if (i === AnimFrameTarget.GRAPHIC) {
-                    spritePriorities.splice(spriteCacheIndex, 1);
-                  }
-                  rs.destroy();
-                }
-              }
-            }
-          }
-          f++;
-          r--;
-        },
-        onComplete: () => {
-          for (const ms of Object.values(spriteCache).flat()) {
-            if (ms && !ms.getData("locked")) {
-              ms.destroy();
-            }
-          }
-          if (r) {
-            globalScene.tweens.addCounter({
-              duration: Utils.getFrameMs(r),
-              onComplete: () => cleanUpAndComplete()
-            });
-          } else {
-            cleanUpAndComplete();
-          }
-        }
-      });
+      return;
     }
 
-    private getGraphicFrameDataWithoutTarget(frames: AnimFrame[], targetInitialX: number, targetInitialY: number): Map<number, Map<AnimFrameTarget, GraphicFrameData>> {
-      const ret: Map<number, Map<AnimFrameTarget, GraphicFrameData>> = new Map([
-        [ AnimFrameTarget.GRAPHIC, new Map<AnimFrameTarget, GraphicFrameData>() ],
-        [ AnimFrameTarget.USER, new Map<AnimFrameTarget, GraphicFrameData>() ],
-        [ AnimFrameTarget.TARGET, new Map<AnimFrameTarget, GraphicFrameData>() ]
-      ]);
+    const targetSubstitute = !!onSubstitute && user !== target ? target.getTag(SubstituteTag) : null;
 
-      let g = 0;
-      let u = 0;
-      let t = 0;
+    const userSprite = user.getSprite();
+    const targetSprite = targetSubstitute?.sprite ?? target.getSprite();
 
-      for (const frame of frames) {
-        let { x, y } = frame;
-        const scaleX = (frame.zoomX / 100) * (!frame.mirror ? 1 : -1);
-        const scaleY = (frame.zoomY / 100);
-        x += targetInitialX;
-        y += targetInitialY;
-        const angle = -frame.angle;
-        const key = frame.target === AnimFrameTarget.GRAPHIC ? g++ : frame.target === AnimFrameTarget.USER ? u++ : t++;
-        ret.get(frame.target)?.set(key, { x: x, y: y, scaleX: scaleX, scaleY: scaleY, angle: angle });
+    const spriteCache: SpriteCache = {
+      [AnimFrameTarget.GRAPHIC]: [],
+      [AnimFrameTarget.USER]: [],
+      [AnimFrameTarget.TARGET]: [],
+    };
+    const spritePriorities: number[] = [];
+
+    const cleanUpAndComplete = () => {
+      userSprite.setPosition(0, 0);
+      userSprite.setScale(1);
+      userSprite.setAlpha(1);
+      userSprite.pipelineData["tone"] = [0.0, 0.0, 0.0, 0.0];
+      userSprite.setAngle(0);
+      if (!targetSubstitute) {
+        targetSprite.setPosition(0, 0);
+        targetSprite.setScale(1);
+        targetSprite.setAlpha(1);
+      } else {
+        targetSprite.setPosition(
+          target.x - target.getSubstituteOffset()[0],
+          target.y - target.getSubstituteOffset()[1],
+        );
+        targetSprite.setScale(target.getSpriteScale() * (target.isPlayer() ? 0.5 : 1));
+        targetSprite.setAlpha(1);
       }
+      targetSprite.pipelineData["tone"] = [0.0, 0.0, 0.0, 0.0];
+      targetSprite.setAngle(0);
 
-      return ret;
+      /**
+       * This and `targetSpriteToShow` are used to restore context lost
+       * from the `isOppAnim` swap. Using these references instead of `this.user`
+       * and `this.target` prevent the target's Substitute doll from disappearing
+       * after being the target of an animation.
+       */
+      const userSpriteToShow = !isOppAnim ? userSprite : targetSprite;
+      const targetSpriteToShow = !isOppAnim ? targetSprite : userSprite;
+      if (!this.isHideUser() && userSpriteToShow) {
+        userSpriteToShow.setVisible(true);
+      }
+      if (!this.isHideTarget() && (targetSpriteToShow !== userSpriteToShow || !this.isHideUser())) {
+        targetSpriteToShow.setVisible(true);
+      }
+      for (const ms of Object.values(spriteCache).flat()) {
+        if (ms) {
+          ms.destroy();
+        }
+      }
+      if (this.bgSprite) {
+        this.bgSprite.destroy();
+      }
+      if (callback) {
+        callback();
+      }
+    };
+
+    if (!globalScene.moveAnimations && !this.playRegardlessOfIssues) {
+      return cleanUpAndComplete();
     }
 
-    /**
-     * @param targetInitialX
-     * @param targetInitialY
-     * @param frameTimeMult
-     * @param frameTimedEventPriority
-     * - 0 is behind all other sprites (except BG)
-     * - 1 on top of player field
-     * - 3 is on top of both fields
-     * - 5 is on top of player sprite
-     * @param callback
-     */
-    playWithoutTargets(targetInitialX: number, targetInitialY: number, frameTimeMult: number, frameTimedEventPriority?: 0 | 1 | 3 | 5, callback?: Function) {
-      const spriteCache: SpriteCache = {
-        [AnimFrameTarget.GRAPHIC]: [],
-        [AnimFrameTarget.USER]: [],
-        [AnimFrameTarget.TARGET]: []
-      };
+    const anim = this.getAnim();
 
-      const cleanUpAndComplete = () => {
-        for (const ms of Object.values(spriteCache).flat()) {
-          if (ms) {
-            ms.destroy();
-          }
+    const userInitialX = user.x;
+    const userInitialY = user.y;
+    const targetInitialX = targetSubstitute?.sprite?.x ?? target.x;
+    const targetInitialY = targetSubstitute?.sprite?.y ?? target.y;
+
+    this.srcLine = [userFocusX, userFocusY, targetFocusX, targetFocusY];
+    this.dstLine = [userInitialX, userInitialY, targetInitialX, targetInitialY];
+
+    let r = anim?.frames.length ?? 0;
+    let f = 0;
+
+    globalScene.tweens.addCounter({
+      duration: getFrameMs(3),
+      repeat: anim?.frames.length ?? 0,
+      onRepeat: () => {
+        if (!f) {
+          userSprite.setVisible(false);
+          targetSprite.setVisible(false);
         }
-        if (this.bgSprite) {
-          this.bgSprite.destroy();
-        }
-        if (callback) {
-          callback();
-        }
-      };
 
-      if (!globalScene.moveAnimations && !this.playRegardlessOfIssues) {
-        return cleanUpAndComplete();
-      }
-
-      const anim = this.getAnim();
-
-      this.srcLine = [ userFocusX, userFocusY, targetFocusX, targetFocusY ];
-      this.dstLine = [ 150, 75, targetInitialX, targetInitialY ];
-
-      let totalFrames = anim!.frames.length;
-      let frameCount = 0;
-
-      let existingFieldSprites = globalScene.field.getAll().slice(0);
-
-      globalScene.tweens.addCounter({
-        duration: Utils.getFrameMs(3) * frameTimeMult,
-        repeat: anim!.frames.length,
-        onRepeat: () => {
-          existingFieldSprites = globalScene.field.getAll().slice(0);
-          const spriteFrames = anim!.frames[frameCount];
-          const frameData = this.getGraphicFrameDataWithoutTarget(anim!.frames[frameCount], targetInitialX, targetInitialY);
-          let graphicFrameCount = 0;
-          for (const frame of spriteFrames) {
-            if (frame.target !== AnimFrameTarget.GRAPHIC) {
-              console.log("Encounter animations do not support targets");
+        const spriteFrames = anim!.frames[f]; // TODO: is the bang correcT?
+        const frameData = this.getGraphicFrameData(anim!.frames[f], onSubstitute); // TODO: is the bang correct?
+        let u = 0;
+        let t = 0;
+        let g = 0;
+        for (const frame of spriteFrames) {
+          if (frame.target !== AnimFrameTarget.GRAPHIC) {
+            const isUser = frame.target === AnimFrameTarget.USER;
+            if (isUser && target === user) {
               continue;
             }
-
-            const sprites = spriteCache[AnimFrameTarget.GRAPHIC];
-            if (graphicFrameCount === sprites.length) {
-              const newSprite: Phaser.GameObjects.Sprite = globalScene.addFieldSprite(0, 0, anim!.graphic, 1);
-              sprites.push(newSprite);
-              globalScene.field.add(newSprite);
+            if (this.playRegardlessOfIssues && frame.target === AnimFrameTarget.TARGET && !target.isOnField()) {
+              continue;
+            }
+            const sprites = spriteCache[isUser ? AnimFrameTarget.USER : AnimFrameTarget.TARGET];
+            const spriteSource = isUser ? userSprite : targetSprite;
+            if ((isUser ? u : t) === sprites.length) {
+              if (isUser || !targetSubstitute) {
+                const sprite = globalScene.addPokemonSprite(
+                  isUser ? user! : target,
+                  0,
+                  0,
+                  spriteSource!.texture,
+                  spriteSource!.frame.name,
+                  true,
+                ); // TODO: are those bangs correct?
+                ["spriteColors", "fusionSpriteColors"].map(
+                  k => (sprite.pipelineData[k] = (isUser ? user! : target).getSprite().pipelineData[k]),
+                ); // TODO: are those bangs correct?
+                sprite.setPipelineData("spriteKey", (isUser ? user! : target).getBattleSpriteKey());
+                sprite.setPipelineData("shiny", (isUser ? user : target).shiny);
+                sprite.setPipelineData("variant", (isUser ? user : target).variant);
+                sprite.setPipelineData("ignoreFieldPos", true);
+                spriteSource.on("animationupdate", (_anim, frame) => sprite.setFrame(frame.textureFrame));
+                globalScene.field.add(sprite);
+                sprites.push(sprite);
+              } else {
+                const sprite = globalScene.addFieldSprite(spriteSource.x, spriteSource.y, spriteSource.texture);
+                spriteSource.on("animationupdate", (_anim, frame) => sprite.setFrame(frame.textureFrame));
+                globalScene.field.add(sprite);
+                sprites.push(sprite);
+              }
             }
 
-            const graphicIndex = graphicFrameCount++;
+            const spriteIndex = isUser ? u++ : t++;
+            const pokemonSprite = sprites[spriteIndex];
+            const graphicFrameData = frameData.get(frame.target)!.get(spriteIndex)!; // TODO: are the bangs correct?
+            const spriteSourceScale =
+              isUser || !targetSubstitute
+                ? spriteSource.parentContainer.scale
+                : target.getSpriteScale() * (target.isPlayer() ? 0.5 : 1);
+            pokemonSprite.setPosition(
+              graphicFrameData.x,
+              graphicFrameData.y - (spriteSource.height / 2) * (spriteSourceScale - 1),
+            );
+
+            pokemonSprite.setAngle(graphicFrameData.angle);
+            pokemonSprite.setScale(
+              graphicFrameData.scaleX * spriteSourceScale,
+              graphicFrameData.scaleY * spriteSourceScale,
+            );
+
+            pokemonSprite.setData("locked", frame.locked);
+
+            pokemonSprite.setAlpha(frame.opacity / 255);
+            pokemonSprite.pipelineData["tone"] = frame.tone;
+            pokemonSprite.setVisible(frame.visible && (isUser ? user.visible : target.visible));
+            pokemonSprite.setBlendMode(
+              frame.blendType === AnimBlendType.NORMAL
+                ? Phaser.BlendModes.NORMAL
+                : frame.blendType === AnimBlendType.ADD
+                  ? Phaser.BlendModes.ADD
+                  : Phaser.BlendModes.DIFFERENCE,
+            );
+          } else {
+            const sprites = spriteCache[AnimFrameTarget.GRAPHIC];
+            if (g === sprites.length) {
+              const newSprite: Phaser.GameObjects.Sprite = globalScene.addFieldSprite(0, 0, anim!.graphic, 1); // TODO: is the bang correct?
+              sprites.push(newSprite);
+              globalScene.field.add(newSprite);
+              spritePriorities.push(1);
+            }
+
+            const graphicIndex = g++;
             const moveSprite = sprites[graphicIndex];
-            if (!isNullOrUndefined(frame.priority)) {
+            if (spritePriorities[graphicIndex] !== frame.priority) {
+              spritePriorities[graphicIndex] = frame.priority;
+              /** Move the position that the moveSprite is rendered in based on the priority.
+               * @param priority The priority level to draw the sprite.
+               * - 0: Draw the sprite in front of the pokemon on the field.
+               * - 1: Draw the sprite in front of the user pokemon.
+               * - 2: Draw the sprite in front of its `bgSprite` (if it has one), or its
+               * `AnimFocus` (if that is user/target), otherwise behind everything.
+               * - 3: Draw the sprite behind its `AnimFocus` (if that is user/target), otherwise in front of everything.
+               */
               const setSpritePriority = (priority: number) => {
-                if (existingFieldSprites.length > priority) {
-                  // Move to specified priority index
-                  const index = globalScene.field.getIndex(existingFieldSprites[priority]);
-                  globalScene.field.moveTo(moveSprite, index);
-                } else {
-                  // Move to top of scene
-                  globalScene.field.moveTo(moveSprite, globalScene.field.getAll().length - 1);
+                /** The sprite we are moving the moveSprite in relation to */
+                let targetSprite: Phaser.GameObjects.GameObject | nil;
+                /** The method that is being used to move the sprite.*/
+                let moveFunc:
+                  | ((sprite: Phaser.GameObjects.GameObject, target: Phaser.GameObjects.GameObject) => void)
+                  | ((sprite: Phaser.GameObjects.GameObject) => void) = globalScene.field.bringToTop;
+
+                if (priority === 0) {
+                  // Place the sprite in front of the pokemon on the field.
+                  targetSprite = globalScene.getEnemyField().find(p => p) ?? globalScene.getPlayerField().find(p => p);
+                  moveFunc = globalScene.field.moveBelow;
+                } else if (priority === 2 && this.bgSprite) {
+                  moveFunc = globalScene.field.moveAbove;
+                  targetSprite = this.bgSprite;
+                } else if (priority === 2 || priority === 3) {
+                  moveFunc = priority === 2 ? globalScene.field.moveBelow : globalScene.field.moveAbove;
+                  if (frame.focus === AnimFocus.USER) {
+                    targetSprite = this.user;
+                  } else if (frame.focus === AnimFocus.TARGET) {
+                    targetSprite = this.target;
+                  }
                 }
+                // If target sprite is not undefined and exists in the field container, then move the sprite using the moveFunc.
+                // Otherwise, default to just bringing it to the top.
+                targetSprite && globalScene.field.exists(targetSprite)
+                  ? moveFunc.bind(globalScene.field)(moveSprite as Phaser.GameObjects.GameObject, targetSprite)
+                  : globalScene.field.bringToTop(moveSprite as Phaser.GameObjects.GameObject);
               };
               setSpritePriority(frame.priority);
             }
             moveSprite.setFrame(frame.graphicFrame);
+            //console.log(AnimFocus[frame.focus]);
 
-            const graphicFrameData = frameData.get(frame.target)?.get(graphicIndex);
-            if (graphicFrameData) {
-              moveSprite.setPosition(graphicFrameData.x, graphicFrameData.y);
-              moveSprite.setAngle(graphicFrameData.angle);
-              moveSprite.setScale(graphicFrameData.scaleX,  graphicFrameData.scaleY);
+            const graphicFrameData = frameData.get(frame.target)!.get(graphicIndex)!; // TODO: are those bangs correct?
+            moveSprite.setPosition(graphicFrameData.x, graphicFrameData.y);
+            moveSprite.setAngle(graphicFrameData.angle);
+            moveSprite.setScale(graphicFrameData.scaleX, graphicFrameData.scaleY);
 
-              moveSprite.setAlpha(frame.opacity / 255);
-              moveSprite.setVisible(frame.visible);
-              moveSprite.setBlendMode(frame.blendType === AnimBlendType.NORMAL ? Phaser.BlendModes.NORMAL : frame.blendType === AnimBlendType.ADD ? Phaser.BlendModes.ADD : Phaser.BlendModes.DIFFERENCE);
-            }
+            moveSprite.setAlpha(frame.opacity / 255);
+            moveSprite.setVisible(frame.visible);
+            moveSprite.setBlendMode(
+              frame.blendType === AnimBlendType.NORMAL
+                ? Phaser.BlendModes.NORMAL
+                : frame.blendType === AnimBlendType.ADD
+                  ? Phaser.BlendModes.ADD
+                  : Phaser.BlendModes.DIFFERENCE,
+            );
           }
-          if (anim?.frameTimedEvents.get(frameCount)) {
-            for (const event of anim.frameTimedEvents.get(frameCount)!) {
-              totalFrames = Math.max((anim.frames.length - frameCount) + event.execute(this, frameTimedEventPriority), totalFrames);
-            }
+        }
+        if (anim?.frameTimedEvents.has(f)) {
+          const base = anim.frames.length - f;
+          // Bang is correct due to `has` check above, which cannot return true for an undefined / null `f`
+          for (const event of anim.frameTimedEvents.get(f)!) {
+            r = Math.max(base + event.execute(this), r);
           }
-          const targets = Utils.getEnumValues(AnimFrameTarget);
-          for (const i of targets) {
-            const count = graphicFrameCount;
-            if (count < spriteCache[i].length) {
-              const spritesToRemove = spriteCache[i].slice(count, spriteCache[i].length);
-              for (const sprite of spritesToRemove) {
-                if (!sprite.getData("locked") as boolean) {
-                  const spriteCacheIndex = spriteCache[i].indexOf(sprite);
-                  spriteCache[i].splice(spriteCacheIndex, 1);
-                  sprite.destroy();
+        }
+        const targets = getEnumValues(AnimFrameTarget);
+        for (const i of targets) {
+          const count = i === AnimFrameTarget.GRAPHIC ? g : i === AnimFrameTarget.USER ? u : t;
+          if (count < spriteCache[i].length) {
+            const spritesToRemove = spriteCache[i].slice(count, spriteCache[i].length);
+            for (const rs of spritesToRemove) {
+              if (!rs.getData("locked") as boolean) {
+                const spriteCacheIndex = spriteCache[i].indexOf(rs);
+                spriteCache[i].splice(spriteCacheIndex, 1);
+                if (i === AnimFrameTarget.GRAPHIC) {
+                  spritePriorities.splice(spriteCacheIndex, 1);
                 }
+                rs.destroy();
               }
             }
           }
-          frameCount++;
-          totalFrames--;
-        },
-        onComplete: () => {
-          for (const sprite of Object.values(spriteCache).flat()) {
-            if (sprite && !sprite.getData("locked")) {
-              sprite.destroy();
-            }
-          }
-          if (totalFrames) {
-            globalScene.tweens.addCounter({
-              duration: Utils.getFrameMs(totalFrames),
-              onComplete: () => cleanUpAndComplete()
-            });
-          } else {
-            cleanUpAndComplete();
+        }
+        f++;
+        r--;
+      },
+      onComplete: () => {
+        for (const ms of Object.values(spriteCache).flat()) {
+          if (ms && !ms.getData("locked")) {
+            ms.destroy();
           }
         }
+        if (r) {
+          globalScene.tweens.addCounter({
+            duration: getFrameMs(r),
+            onComplete: () => cleanUpAndComplete(),
+          });
+        } else {
+          cleanUpAndComplete();
+        }
+      },
+    });
+  }
+
+  private getGraphicFrameDataWithoutTarget(
+    frames: AnimFrame[],
+    targetInitialX: number,
+    targetInitialY: number,
+  ): Map<number, Map<AnimFrameTarget, GraphicFrameData>> {
+    const ret: Map<number, Map<AnimFrameTarget, GraphicFrameData>> = new Map([
+      [AnimFrameTarget.GRAPHIC, new Map<AnimFrameTarget, GraphicFrameData>()],
+      [AnimFrameTarget.USER, new Map<AnimFrameTarget, GraphicFrameData>()],
+      [AnimFrameTarget.TARGET, new Map<AnimFrameTarget, GraphicFrameData>()],
+    ]);
+
+    let g = 0;
+    let u = 0;
+    let t = 0;
+
+    for (const frame of frames) {
+      let { x, y } = frame;
+      const scaleX = (frame.zoomX / 100) * (!frame.mirror ? 1 : -1);
+      const scaleY = frame.zoomY / 100;
+      x += targetInitialX;
+      y += targetInitialY;
+      const angle = -frame.angle;
+      const key = frame.target === AnimFrameTarget.GRAPHIC ? g++ : frame.target === AnimFrameTarget.USER ? u++ : t++;
+      ret.get(frame.target)?.set(key, {
+        x: x,
+        y: y,
+        scaleX: scaleX,
+        scaleY: scaleY,
+        angle: angle,
       });
     }
+
+    return ret;
+  }
+
+  /**
+   * @param targetInitialX
+   * @param targetInitialY
+   * @param frameTimeMult
+   * @param frameTimedEventPriority
+   * - 0 is behind all other sprites (except BG)
+   * - 1 on top of player field
+   * - 3 is on top of both fields
+   * - 5 is on top of player sprite
+   * @param callback
+   */
+  playWithoutTargets(
+    targetInitialX: number,
+    targetInitialY: number,
+    frameTimeMult: number,
+    frameTimedEventPriority?: 0 | 1 | 3 | 5,
+    // biome-ignore lint/complexity/noBannedTypes: callback is used liberally
+    callback?: Function,
+  ) {
+    const spriteCache: SpriteCache = {
+      [AnimFrameTarget.GRAPHIC]: [],
+      [AnimFrameTarget.USER]: [],
+      [AnimFrameTarget.TARGET]: [],
+    };
+
+    const cleanUpAndComplete = () => {
+      for (const ms of Object.values(spriteCache).flat()) {
+        if (ms) {
+          ms.destroy();
+        }
+      }
+      if (this.bgSprite) {
+        this.bgSprite.destroy();
+      }
+      if (callback) {
+        callback();
+      }
+    };
+
+    if (!globalScene.moveAnimations && !this.playRegardlessOfIssues) {
+      return cleanUpAndComplete();
+    }
+
+    const anim = this.getAnim();
+
+    this.srcLine = [userFocusX, userFocusY, targetFocusX, targetFocusY];
+    this.dstLine = [150, 75, targetInitialX, targetInitialY];
+
+    let totalFrames = anim!.frames.length;
+    let frameCount = 0;
+
+    let existingFieldSprites = globalScene.field.getAll().slice(0);
+
+    globalScene.tweens.addCounter({
+      duration: getFrameMs(3) * frameTimeMult,
+      repeat: anim!.frames.length,
+      onRepeat: () => {
+        existingFieldSprites = globalScene.field.getAll().slice(0);
+        const spriteFrames = anim!.frames[frameCount];
+        const frameData = this.getGraphicFrameDataWithoutTarget(
+          anim!.frames[frameCount],
+          targetInitialX,
+          targetInitialY,
+        );
+        let graphicFrameCount = 0;
+        for (const frame of spriteFrames) {
+          if (frame.target !== AnimFrameTarget.GRAPHIC) {
+            console.log("Encounter animations do not support targets");
+            continue;
+          }
+
+          const sprites = spriteCache[AnimFrameTarget.GRAPHIC];
+          if (graphicFrameCount === sprites.length) {
+            const newSprite: Phaser.GameObjects.Sprite = globalScene.addFieldSprite(0, 0, anim!.graphic, 1);
+            sprites.push(newSprite);
+            globalScene.field.add(newSprite);
+          }
+
+          const graphicIndex = graphicFrameCount++;
+          const moveSprite = sprites[graphicIndex];
+          if (!isNullOrUndefined(frame.priority)) {
+            const setSpritePriority = (priority: number) => {
+              if (existingFieldSprites.length > priority) {
+                // Move to specified priority index
+                const index = globalScene.field.getIndex(existingFieldSprites[priority]);
+                globalScene.field.moveTo(moveSprite, index);
+              } else {
+                // Move to top of scene
+                globalScene.field.moveTo(moveSprite, globalScene.field.getAll().length - 1);
+              }
+            };
+            setSpritePriority(frame.priority);
+          }
+          moveSprite.setFrame(frame.graphicFrame);
+
+          const graphicFrameData = frameData.get(frame.target)?.get(graphicIndex);
+          if (graphicFrameData) {
+            moveSprite.setPosition(graphicFrameData.x, graphicFrameData.y);
+            moveSprite.setAngle(graphicFrameData.angle);
+            moveSprite.setScale(graphicFrameData.scaleX, graphicFrameData.scaleY);
+
+            moveSprite.setAlpha(frame.opacity / 255);
+            moveSprite.setVisible(frame.visible);
+            moveSprite.setBlendMode(
+              frame.blendType === AnimBlendType.NORMAL
+                ? Phaser.BlendModes.NORMAL
+                : frame.blendType === AnimBlendType.ADD
+                  ? Phaser.BlendModes.ADD
+                  : Phaser.BlendModes.DIFFERENCE,
+            );
+          }
+        }
+        if (anim?.frameTimedEvents.get(frameCount)) {
+          const base = anim.frames.length - frameCount;
+          for (const event of anim.frameTimedEvents.get(frameCount)!) {
+            totalFrames = Math.max(base + event.execute(this, frameTimedEventPriority), totalFrames);
+          }
+        }
+        const targets = getEnumValues(AnimFrameTarget);
+        for (const i of targets) {
+          const count = graphicFrameCount;
+          if (count < spriteCache[i].length) {
+            const spritesToRemove = spriteCache[i].slice(count, spriteCache[i].length);
+            for (const sprite of spritesToRemove) {
+              if (!sprite.getData("locked") as boolean) {
+                const spriteCacheIndex = spriteCache[i].indexOf(sprite);
+                spriteCache[i].splice(spriteCacheIndex, 1);
+                sprite.destroy();
+              }
+            }
+          }
+        }
+        frameCount++;
+        totalFrames--;
+      },
+      onComplete: () => {
+        for (const sprite of Object.values(spriteCache).flat()) {
+          if (sprite && !sprite.getData("locked")) {
+            sprite.destroy();
+          }
+        }
+        if (totalFrames) {
+          globalScene.tweens.addCounter({
+            duration: getFrameMs(totalFrames),
+            onComplete: () => cleanUpAndComplete(),
+          });
+        } else {
+          cleanUpAndComplete();
+        }
+      },
+    });
+  }
 }
 
 export class CommonBattleAnim extends BattleAnim {
   public commonAnim: CommonAnim | null;
 
-  constructor(commonAnim: CommonAnim | null, user: Pokemon, target?: Pokemon, playOnEmptyField: boolean = false) {
+  constructor(commonAnim: CommonAnim | null, user: Pokemon, target?: Pokemon, playOnEmptyField = false) {
     super(user, target || user, playOnEmptyField);
 
     this.commonAnim = commonAnim;
   }
 
   getAnim(): AnimConfig | null {
-    return this.commonAnim ? commonAnims.get(this.commonAnim) ?? null : null;
+    return this.commonAnim ? (commonAnims.get(this.commonAnim) ?? null) : null;
   }
 
   isOppAnim(): boolean {
@@ -1275,16 +1426,17 @@ export class CommonBattleAnim extends BattleAnim {
 export class MoveAnim extends BattleAnim {
   public move: Moves;
 
-  constructor(move: Moves, user: Pokemon, target: BattlerIndex, playOnEmptyField: boolean = false) {
-    super(user, globalScene.getField()[target], playOnEmptyField);
+  constructor(move: Moves, user: Pokemon, target: BattlerIndex, playOnEmptyField = false) {
+    // Set target to the user pokemon if no target is found to avoid crashes
+    super(user, globalScene.getField()[target] ?? user, playOnEmptyField);
 
     this.move = move;
   }
 
   getAnim(): AnimConfig {
     return moveAnims.get(this.move) instanceof AnimConfig
-      ? moveAnims.get(this.move) as AnimConfig
-      : moveAnims.get(this.move)?.[this.user?.isPlayer() ? 0 : 1] as AnimConfig;
+      ? (moveAnims.get(this.move) as AnimConfig)
+      : (moveAnims.get(this.move)?.[this.user?.isPlayer() ? 0 : 1] as AnimConfig);
   }
 
   isOppAnim(): boolean {
@@ -1315,8 +1467,8 @@ export class MoveChargeAnim extends MoveAnim {
 
   getAnim(): AnimConfig {
     return chargeAnims.get(this.chargeAnim) instanceof AnimConfig
-      ? chargeAnims.get(this.chargeAnim) as AnimConfig
-      : chargeAnims.get(this.chargeAnim)?.[this.user?.isPlayer() ? 0 : 1] as AnimConfig;
+      ? (chargeAnims.get(this.chargeAnim) as AnimConfig)
+      : (chargeAnims.get(this.chargeAnim)?.[this.user?.isPlayer() ? 0 : 1] as AnimConfig);
   }
 }
 
@@ -1341,22 +1493,22 @@ export class EncounterBattleAnim extends BattleAnim {
 }
 
 export async function populateAnims() {
-  const commonAnimNames = Utils.getEnumKeys(CommonAnim).map(k => k.toLowerCase());
+  const commonAnimNames = getEnumKeys(CommonAnim).map(k => k.toLowerCase());
   const commonAnimMatchNames = commonAnimNames.map(k => k.replace(/\_/g, ""));
-  const commonAnimIds = Utils.getEnumValues(CommonAnim) as CommonAnim[];
-  const chargeAnimNames = Utils.getEnumKeys(ChargeAnim).map(k => k.toLowerCase());
+  const commonAnimIds = getEnumValues(CommonAnim) as CommonAnim[];
+  const chargeAnimNames = getEnumKeys(ChargeAnim).map(k => k.toLowerCase());
   const chargeAnimMatchNames = chargeAnimNames.map(k => k.replace(/\_/g, " "));
-  const chargeAnimIds = Utils.getEnumValues(ChargeAnim) as ChargeAnim[];
+  const chargeAnimIds = getEnumValues(ChargeAnim) as ChargeAnim[];
   const commonNamePattern = /name: (?:Common:)?(Opp )?(.*)/;
   const moveNameToId = {};
-  for (const move of Utils.getEnumValues(Moves).slice(1)) {
+  for (const move of getEnumValues(Moves).slice(1)) {
     const moveName = Moves[move].toUpperCase().replace(/\_/g, "");
     moveNameToId[moveName] = move;
   }
 
-  const seNames: string[] = [];//(await fs.readdir('./public/audio/se/battle_anims/')).map(se => se.toString());
+  const seNames: string[] = []; //(await fs.readdir('./public/audio/se/battle_anims/')).map(se => se.toString());
 
-  const animsData : any[] = [];//battleAnimRawData.split('!ruby/array:PBAnimation').slice(1); // TODO: add a proper type
+  const animsData: any[] = []; //battleAnimRawData.split('!ruby/array:PBAnimation').slice(1); // TODO: add a proper type
   for (let a = 0; a < animsData.length; a++) {
     const fields = animsData[a].split("@").slice(1);
 
@@ -1387,51 +1539,84 @@ export async function populateAnims() {
     if (commonAnimId) {
       commonAnims.set(commonAnimId, anim);
     } else if (chargeAnimId) {
-      chargeAnims.set(chargeAnimId, !isOppMove ? anim : [ chargeAnims.get(chargeAnimId) as AnimConfig, anim ]);
+      chargeAnims.set(chargeAnimId, !isOppMove ? anim : [chargeAnims.get(chargeAnimId) as AnimConfig, anim]);
     } else {
-      moveAnims.set(moveNameToId[animName], !isOppMove ? anim as AnimConfig : [ moveAnims.get(moveNameToId[animName]) as AnimConfig, anim as AnimConfig ]);
+      moveAnims.set(
+        moveNameToId[animName],
+        !isOppMove ? (anim as AnimConfig) : [moveAnims.get(moveNameToId[animName]) as AnimConfig, anim as AnimConfig],
+      );
     }
     for (let f = 0; f < fields.length; f++) {
       const field = fields[f];
       const fieldName = field.slice(0, field.indexOf(":"));
       const fieldData = field.slice(fieldName.length + 1, field.lastIndexOf("\n")).trim();
       switch (fieldName) {
-        case "array":
+        case "array": {
           const framesData = fieldData.split("  - - - ").slice(1);
           for (let fd = 0; fd < framesData.length; fd++) {
             anim.frames.push([]);
             const frameData = framesData[fd];
             const focusFramesData = frameData.split("    - - ");
             for (let tf = 0; tf < focusFramesData.length; tf++) {
-              const values = focusFramesData[tf].replace(/      \- /g, "").split("\n");
-              const targetFrame = new AnimFrame(parseFloat(values[0]), parseFloat(values[1]), parseFloat(values[2]), parseFloat(values[11]), parseFloat(values[3]),
-                parseInt(values[4]) === 1, parseInt(values[6]) === 1, parseInt(values[5]), parseInt(values[7]), parseInt(values[8]), parseInt(values[12]), parseInt(values[13]),
-                parseInt(values[14]), parseInt(values[15]), parseInt(values[16]), parseInt(values[17]), parseInt(values[18]), parseInt(values[19]),
-                parseInt(values[21]), parseInt(values[22]), parseInt(values[23]), parseInt(values[24]), parseInt(values[20]) === 1, parseInt(values[25]), parseInt(values[26]) as AnimFocus);
+              const values = focusFramesData[tf].replace(/ {6}\- /g, "").split("\n");
+              const targetFrame = new AnimFrame(
+                Number.parseFloat(values[0]),
+                Number.parseFloat(values[1]),
+                Number.parseFloat(values[2]),
+                Number.parseFloat(values[11]),
+                Number.parseFloat(values[3]),
+                Number.parseInt(values[4]) === 1,
+                Number.parseInt(values[6]) === 1,
+                Number.parseInt(values[5]),
+                Number.parseInt(values[7]),
+                Number.parseInt(values[8]),
+                Number.parseInt(values[12]),
+                Number.parseInt(values[13]),
+                Number.parseInt(values[14]),
+                Number.parseInt(values[15]),
+                Number.parseInt(values[16]),
+                Number.parseInt(values[17]),
+                Number.parseInt(values[18]),
+                Number.parseInt(values[19]),
+                Number.parseInt(values[21]),
+                Number.parseInt(values[22]),
+                Number.parseInt(values[23]),
+                Number.parseInt(values[24]),
+                Number.parseInt(values[20]) === 1,
+                Number.parseInt(values[25]),
+                Number.parseInt(values[26]) as AnimFocus,
+              );
               anim.frames[fd].push(targetFrame);
             }
           }
           break;
-        case "graphic":
+        }
+        case "graphic": {
           const graphic = fieldData !== "''" ? fieldData : "";
-          anim.graphic = graphic.indexOf(".") > -1
-            ? graphic.slice(0, fieldData.indexOf("."))
-            : graphic;
+          anim.graphic = graphic.indexOf(".") > -1 ? graphic.slice(0, fieldData.indexOf(".")) : graphic;
           break;
-        case "timing":
+        }
+        case "timing": {
           const timingEntries = fieldData.split("- !ruby/object:PBAnimTiming ").slice(1);
           for (let t = 0; t < timingEntries.length; t++) {
-            const timingData = timingEntries[t].replace(/\n/g, " ").replace(/[ ]{2,}/g, " ").replace(/[a-z]+: ! '', /ig, "").replace(/name: (.*?),/, "name: \"$1\",")
-              .replace(/flashColor: !ruby\/object:Color { alpha: ([\d\.]+), blue: ([\d\.]+), green: ([\d\.]+), red: ([\d\.]+)}/, "flashRed: $4, flashGreen: $3, flashBlue: $2, flashAlpha: $1");
-            const frameIndex = parseInt(/frame: (\d+)/.exec(timingData)![1]); // TODO: is the bang correct?
+            const timingData = timingEntries[t]
+              .replace(/\n/g, " ")
+              .replace(/[ ]{2,}/g, " ")
+              .replace(/[a-z]+: ! '', /gi, "")
+              .replace(/name: (.*?),/, 'name: "$1",')
+              .replace(
+                /flashColor: !ruby\/object:Color { alpha: ([\d\.]+), blue: ([\d\.]+), green: ([\d\.]+), red: ([\d\.]+)}/,
+                "flashRed: $4, flashGreen: $3, flashBlue: $2, flashAlpha: $1",
+              );
+            const frameIndex = Number.parseInt(/frame: (\d+)/.exec(timingData)![1]); // TODO: is the bang correct?
             let resourceName = /name: "(.*?)"/.exec(timingData)![1].replace("''", ""); // TODO: is the bang correct?
-            const timingType = parseInt(/timingType: (\d)/.exec(timingData)![1]); // TODO: is the bang correct?
+            const timingType = Number.parseInt(/timingType: (\d)/.exec(timingData)![1]); // TODO: is the bang correct?
             let timedEvent: AnimTimedEvent | undefined;
             switch (timingType) {
               case 0:
                 if (resourceName && resourceName.indexOf(".") === -1) {
                   let ext: string | undefined;
-                  [ "wav", "mp3", "m4a" ].every(e => {
+                  ["wav", "mp3", "m4a"].every(e => {
                     if (seNames.indexOf(`${resourceName}.${e}`) > -1) {
                       ext = e;
                       return false;
@@ -1455,15 +1640,16 @@ export async function populateAnims() {
             if (!timedEvent) {
               continue;
             }
-            const propPattern = /([a-z]+): (.*?)(?:,|\})/ig;
+            const propPattern = /([a-z]+): (.*?)(?:,|\})/gi;
             let propMatch: RegExpExecArray;
-            while ((propMatch = propPattern.exec(timingData)!)) { // TODO: is this bang correct?
+            while ((propMatch = propPattern.exec(timingData)!)) {
+              // TODO: is this bang correct?
               const prop = propMatch[1];
               let value: any = propMatch[2];
               switch (prop) {
                 case "bgX":
                 case "bgY":
-                  value = parseFloat(value);
+                  value = Number.parseFloat(value);
                   break;
                 case "volume":
                 case "pitch":
@@ -1479,7 +1665,7 @@ export async function populateAnims() {
                 case "flashBlue":
                 case "flashAlpha":
                 case "flashDuration":
-                  value = parseInt(value);
+                  value = Number.parseInt(value);
                   break;
               }
               if (timedEvent.hasOwnProperty(prop)) {
@@ -1489,21 +1675,21 @@ export async function populateAnims() {
             if (!anim.frameTimedEvents.has(frameIndex)) {
               anim.frameTimedEvents.set(frameIndex, []);
             }
-          anim.frameTimedEvents.get(frameIndex)!.push(timedEvent); // TODO: is this bang correct?
+            anim.frameTimedEvents.get(frameIndex)!.push(timedEvent); // TODO: is this bang correct?
           }
           break;
+        }
         case "position":
-          anim.position = parseInt(fieldData);
+          anim.position = Number.parseInt(fieldData);
           break;
         case "hue":
-          anim.hue = parseInt(fieldData);
+          anim.hue = Number.parseInt(fieldData);
           break;
       }
     }
   }
 
-  // used in commented code
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  // biome-ignore lint/correctness/noUnusedVariables: used in commented code
   const animReplacer = (k, v) => {
     if (k === "id" && !v) {
       return undefined;
@@ -1517,20 +1703,39 @@ export async function populateAnims() {
     return v;
   };
 
-  const animConfigProps = [ "id", "graphic", "frames", "frameTimedEvents", "position", "hue" ];
-  const animFrameProps = [ "x", "y", "zoomX", "zoomY", "angle", "mirror", "visible", "blendType", "target", "graphicFrame", "opacity", "color", "tone", "flash", "locked", "priority", "focus" ];
-  const propSets = [ animConfigProps, animFrameProps ];
+  const animConfigProps = ["id", "graphic", "frames", "frameTimedEvents", "position", "hue"];
+  const animFrameProps = [
+    "x",
+    "y",
+    "zoomX",
+    "zoomY",
+    "angle",
+    "mirror",
+    "visible",
+    "blendType",
+    "target",
+    "graphicFrame",
+    "opacity",
+    "color",
+    "tone",
+    "flash",
+    "locked",
+    "priority",
+    "focus",
+  ];
+  const propSets = [animConfigProps, animFrameProps];
 
-  // used in commented code
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  // biome-ignore lint/correctness/noUnusedVariables: used in commented code
   const animComparator = (a: Element, b: Element) => {
     let props: string[];
     for (let p = 0; p < propSets.length; p++) {
       props = propSets[p];
+      // @ts-ignore TODO
       const ai = props.indexOf(a.key);
       if (ai === -1) {
         continue;
       }
+      // @ts-ignore TODO
       const bi = props.indexOf(b.key);
 
       return ai < bi ? -1 : ai > bi ? 1 : 0;
diff --git a/src/data/battler-tags.ts b/src/data/battler-tags.ts
index c399a9bb595..34fdd5409c8 100644
--- a/src/data/battler-tags.ts
+++ b/src/data/battler-tags.ts
@@ -1,27 +1,29 @@
 import { globalScene } from "#app/global-scene";
+import Overrides from "#app/overrides";
 import {
-  allAbilities,
   applyAbAttrs,
   BlockNonDirectDamageAbAttr,
   FlinchEffectAbAttr,
   ProtectStatAbAttr,
-  ReverseDrainAbAttr
-} from "#app/data/ability";
+  ConditionalUserFieldProtectStatAbAttr,
+  ReverseDrainAbAttr,
+} from "#app/data/abilities/ability";
+import { allAbilities } from "./data-lists";
 import { ChargeAnim, CommonAnim, CommonBattleAnim, MoveChargeAnim } from "#app/data/battle-anims";
-import type Move from "#app/data/move";
+import type Move from "#app/data/moves/move";
 import {
   allMoves,
   applyMoveAttrs,
   ConsecutiveUseDoublePowerAttr,
   HealOnAllyAttr,
-  MoveCategory,
-  MoveFlags,
-  StatusCategoryOnAllyAttr
-} from "#app/data/move";
+  StatusCategoryOnAllyAttr,
+} from "#app/data/moves/move";
+import { MoveFlags } from "#enums/MoveFlags";
+import { MoveCategory } from "#enums/MoveCategory";
 import { SpeciesFormChangeAbilityTrigger } from "#app/data/pokemon-forms";
 import { getStatusEffectHealText } from "#app/data/status-effect";
 import { TerrainType } from "#app/data/terrain";
-import { Type } from "#enums/type";
+import { PokemonType } from "#enums/pokemon-type";
 import type Pokemon from "#app/field/pokemon";
 import { HitResult, MoveResult } from "#app/field/pokemon";
 import { getPokemonNameWithAffix } from "#app/messages";
@@ -29,11 +31,10 @@ import { CommonAnimPhase } from "#app/phases/common-anim-phase";
 import { MoveEffectPhase } from "#app/phases/move-effect-phase";
 import { MovePhase } from "#app/phases/move-phase";
 import { PokemonHealPhase } from "#app/phases/pokemon-heal-phase";
-import { ShowAbilityPhase } from "#app/phases/show-ability-phase";
 import type { StatStageChangeCallback } from "#app/phases/stat-stage-change-phase";
 import { StatStageChangePhase } from "#app/phases/stat-stage-change-phase";
 import i18next from "#app/plugins/i18n";
-import { BooleanHolder, getFrameMs, NumberHolder, toDmgValue } from "#app/utils";
+import { BooleanHolder, getFrameMs, NumberHolder, toDmgValue } from "#app/utils/common";
 import { Abilities } from "#enums/abilities";
 import { BattlerTagType } from "#enums/battler-tag-type";
 import { Moves } from "#enums/moves";
@@ -42,6 +43,7 @@ import { Species } from "#enums/species";
 import { EFFECTIVE_STATS, getStatKey, Stat, type BattleStat, type EffectiveStat } from "#enums/stat";
 import { StatusEffect } from "#enums/status-effect";
 import { WeatherType } from "#enums/weather-type";
+import { isNullOrUndefined } from "#app/utils/common";
 
 export enum BattlerTagLapseType {
   FAINT,
@@ -51,8 +53,9 @@ export enum BattlerTagLapseType {
   MOVE_EFFECT,
   TURN_END,
   HIT,
+  /** Tag lapses AFTER_HIT, applying its effects even if the user faints */
   AFTER_HIT,
-  CUSTOM
+  CUSTOM,
 }
 
 export class BattlerTag {
@@ -63,26 +66,38 @@ export class BattlerTag {
   public sourceId?: number;
   public isBatonPassable: boolean;
 
-  constructor(tagType: BattlerTagType, lapseType: BattlerTagLapseType | BattlerTagLapseType[], turnCount: number, sourceMove?: Moves, sourceId?: number, isBatonPassable: boolean = false) {
+  constructor(
+    tagType: BattlerTagType,
+    lapseType: BattlerTagLapseType | BattlerTagLapseType[],
+    turnCount: number,
+    sourceMove?: Moves,
+    sourceId?: number,
+    isBatonPassable = false,
+  ) {
     this.tagType = tagType;
-    this.lapseTypes = Array.isArray(lapseType) ? lapseType : [ lapseType ];
+    this.lapseTypes = Array.isArray(lapseType) ? lapseType : [lapseType];
     this.turnCount = turnCount;
     this.sourceMove = sourceMove!; // TODO: is this bang correct?
     this.sourceId = sourceId;
     this.isBatonPassable = isBatonPassable;
   }
 
-  canAdd(pokemon: Pokemon): boolean {
+  canAdd(_pokemon: Pokemon): boolean {
     return true;
   }
 
-  onAdd(pokemon: Pokemon): void { }
+  onAdd(_pokemon: Pokemon): void {}
 
-  onRemove(pokemon: Pokemon): void { }
+  onRemove(_pokemon: Pokemon): void {}
 
-  onOverlap(pokemon: Pokemon): void { }
+  onOverlap(_pokemon: Pokemon): void {}
 
-  lapse(pokemon: Pokemon, lapseType: BattlerTagLapseType): boolean {
+  /**
+   * Tick down this {@linkcode BattlerTag}'s duration.
+   * @returns `true` if the tag should be kept (`turnCount` > 0`)
+   */
+  lapse(_pokemon: Pokemon, _lapseType: BattlerTagLapseType): boolean {
+    // TODO: Maybe flip this (return `true` if tag needs removal)
     return --this.turnCount > 0;
   }
 
@@ -95,16 +110,14 @@ export class BattlerTag {
   }
 
   getMoveName(): string | null {
-    return this.sourceMove
-      ? allMoves[this.sourceMove].name
-      : null;
+    return this.sourceMove ? allMoves[this.sourceMove].name : null;
   }
 
   /**
-  * When given a battler tag or json representing one, load the data for it.
-  * This is meant to be inherited from by any battler tag with custom attributes
-  * @param {BattlerTag | any} source A battler tag
-  */
+   * Load the data for a given {@linkcode BattlerTag} or JSON representation thereof.
+   * Should be inherited from by any battler tag with custom attributes.
+   * @param source The battler tag to load
+   */
   loadTag(source: BattlerTag | any): void {
     this.turnCount = source.turnCount;
     this.sourceMove = source.sourceMove;
@@ -113,7 +126,7 @@ export class BattlerTag {
 
   /**
    * Helper function that retrieves the source Pokemon object
-   * @returns The source {@linkcode Pokemon} or `null` if none is found
+   * @returns The source {@linkcode Pokemon}, or `null` if none is found
    */
   public getSourcePokemon(): Pokemon | null {
     return this.sourceId ? globalScene.getPokemonById(this.sourceId) : null;
@@ -133,11 +146,17 @@ export interface TerrainBattlerTag {
  * in-game. This is not to be confused with {@linkcode Moves.DISABLE}.
  *
  * Descendants can override {@linkcode isMoveRestricted} to restrict moves that
- * match a condition. A restricted move gets cancelled before it is used. Players and enemies should not be allowed
- * to select restricted moves.
+ * match a condition. A restricted move gets cancelled before it is used.
+ * Players and enemies should not be allowed to select restricted moves.
  */
 export abstract class MoveRestrictionBattlerTag extends BattlerTag {
-  constructor(tagType: BattlerTagType, lapseType: BattlerTagLapseType | BattlerTagLapseType[], turnCount: number, sourceMove?: Moves, sourceId?: number) {
+  constructor(
+    tagType: BattlerTagType,
+    lapseType: BattlerTagLapseType | BattlerTagLapseType[],
+    turnCount: number,
+    sourceMove?: Moves,
+    sourceId?: number,
+  ) {
     super(tagType, lapseType, turnCount, sourceMove, sourceId);
   }
 
@@ -173,12 +192,12 @@ export abstract class MoveRestrictionBattlerTag extends BattlerTag {
   /**
    * Checks if this tag is restricting a move based on a user's decisions during the target selection phase
    *
-   * @param {Moves} move {@linkcode Moves} move ID to check restriction for
-   * @param {Pokemon} user {@linkcode Pokemon} the user of the above move
-   * @param {Pokemon} target {@linkcode Pokemon} the target of the above move
+   * @param {Moves} _move {@linkcode Moves} move ID to check restriction for
+   * @param {Pokemon} _user {@linkcode Pokemon} the user of the above move
+   * @param {Pokemon} _target {@linkcode Pokemon} the target of the above move
    * @returns {boolean} `false` unless overridden by the child tag
    */
-  isMoveTargetRestricted(move: Moves, user: Pokemon, target: Pokemon): boolean {
+  isMoveTargetRestricted(_move: Moves, _user: Pokemon, _target: Pokemon): boolean {
     return false;
   }
 
@@ -196,11 +215,11 @@ export abstract class MoveRestrictionBattlerTag extends BattlerTag {
    * Because restriction effects also prevent selection of the move, this situation can only arise if a
    * pokemon first selects a move, then gets outsped by a pokemon using a move that restricts the selected move.
    *
-   * @param {Pokemon} pokemon {@linkcode Pokemon} attempting to use the restricted move
-   * @param {Moves} move {@linkcode Moves} ID of the move being interrupted
+   * @param {Pokemon} _pokemon {@linkcode Pokemon} attempting to use the restricted move
+   * @param {Moves} _move {@linkcode Moves} ID of the move being interrupted
    * @returns {string} text to display when the move is interrupted
    */
-  interruptedText(pokemon: Pokemon, move: Moves): string {
+  interruptedText(_pokemon: Pokemon, _move: Moves): string {
     return "";
   }
 }
@@ -212,7 +231,12 @@ export abstract class MoveRestrictionBattlerTag extends BattlerTag {
  */
 export class ThroatChoppedTag extends MoveRestrictionBattlerTag {
   constructor() {
-    super(BattlerTagType.THROAT_CHOPPED, [ BattlerTagLapseType.TURN_END, BattlerTagLapseType.PRE_MOVE ], 2, Moves.THROAT_CHOP);
+    super(
+      BattlerTagType.THROAT_CHOPPED,
+      [BattlerTagLapseType.TURN_END, BattlerTagLapseType.PRE_MOVE],
+      2,
+      Moves.THROAT_CHOP,
+    );
   }
 
   /**
@@ -228,23 +252,27 @@ export class ThroatChoppedTag extends MoveRestrictionBattlerTag {
   /**
    * Shows a message when the player attempts to select a move that is restricted by Throat Chop.
    * @override
-   * @param {Pokemon} pokemon the {@linkcode Pokemon} that is attempting to select the restricted move
+   * @param {Pokemon} _pokemon the {@linkcode Pokemon} that is attempting to select the restricted move
    * @param {Moves} move the {@linkcode Moves | move} that is being restricted
    * @returns the message to display when the player attempts to select the restricted move
    */
-  override selectionDeniedText(pokemon: Pokemon, move: Moves): string {
-    return i18next.t("battle:moveCannotBeSelected", { moveName: allMoves[move].name });
+  override selectionDeniedText(_pokemon: Pokemon, move: Moves): string {
+    return i18next.t("battle:moveCannotBeSelected", {
+      moveName: allMoves[move].name,
+    });
   }
 
   /**
    * Shows a message when a move is interrupted by Throat Chop.
    * @override
    * @param {Pokemon} pokemon the interrupted {@linkcode Pokemon}
-   * @param {Moves} move the {@linkcode Moves | move} that was interrupted
+   * @param {Moves} _move the {@linkcode Moves | move} that was interrupted
    * @returns the message to display when the move is interrupted
    */
-  override interruptedText(pokemon: Pokemon, move: Moves): string {
-    return i18next.t("battle:throatChopInterruptedMove", { pokemonName: getPokemonNameWithAffix(pokemon) });
+  override interruptedText(pokemon: Pokemon, _move: Moves): string {
+    return i18next.t("battle:throatChopInterruptedMove", {
+      pokemonName: getPokemonNameWithAffix(pokemon),
+    });
   }
 }
 
@@ -257,7 +285,13 @@ export class DisabledTag extends MoveRestrictionBattlerTag {
   private moveId: Moves = Moves.NONE;
 
   constructor(sourceId: number) {
-    super(BattlerTagType.DISABLED, [ BattlerTagLapseType.PRE_MOVE, BattlerTagLapseType.TURN_END ], 4, Moves.DISABLE, sourceId);
+    super(
+      BattlerTagType.DISABLED,
+      [BattlerTagLapseType.PRE_MOVE, BattlerTagLapseType.TURN_END],
+      4,
+      Moves.DISABLE,
+      sourceId,
+    );
   }
 
   /** @override */
@@ -274,26 +308,35 @@ export class DisabledTag extends MoveRestrictionBattlerTag {
   override onAdd(pokemon: Pokemon): void {
     super.onAdd(pokemon);
 
-    const move = pokemon.getLastXMoves()
-      .find(m => m.move !== Moves.NONE && m.move !== Moves.STRUGGLE && !m.virtual);
-    if (move === undefined) {
+    const move = pokemon.getLastXMoves(-1).find(m => !m.virtual);
+    if (isNullOrUndefined(move) || move.move === Moves.STRUGGLE || move.move === Moves.NONE) {
       return;
     }
 
     this.moveId = move.move;
 
-    globalScene.queueMessage(i18next.t("battlerTags:disabledOnAdd", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), moveName: allMoves[this.moveId].name }));
+    globalScene.queueMessage(
+      i18next.t("battlerTags:disabledOnAdd", {
+        pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
+        moveName: allMoves[this.moveId].name,
+      }),
+    );
   }
 
   /** @override */
   override onRemove(pokemon: Pokemon): void {
     super.onRemove(pokemon);
 
-    globalScene.queueMessage(i18next.t("battlerTags:disabledLapse", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), moveName: allMoves[this.moveId].name }));
+    globalScene.queueMessage(
+      i18next.t("battlerTags:disabledLapse", {
+        pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
+        moveName: allMoves[this.moveId].name,
+      }),
+    );
   }
 
   /** @override */
-  override selectionDeniedText(pokemon: Pokemon, move: Moves): string {
+  override selectionDeniedText(_pokemon: Pokemon, move: Moves): string {
     return i18next.t("battle:moveDisabled", { moveName: allMoves[move].name });
   }
 
@@ -304,7 +347,10 @@ export class DisabledTag extends MoveRestrictionBattlerTag {
    * @returns {string} text to display when the move is interrupted
    */
   override interruptedText(pokemon: Pokemon, move: Moves): string {
-    return i18next.t("battle:disableInterruptedMove", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), moveName: allMoves[move].name });
+    return i18next.t("battle:disableInterruptedMove", {
+      pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
+      moveName: allMoves[move].name,
+    });
   }
 
   /** @override */
@@ -336,7 +382,7 @@ export class GorillaTacticsTag extends MoveRestrictionBattlerTag {
    * @returns `true` if the pokemon has a valid move and no existing {@linkcode GorillaTacticsTag}; `false` otherwise
    */
   override canAdd(pokemon: Pokemon): boolean {
-    return (this.getLastValidMove(pokemon) !== undefined) && !pokemon.getTag(GorillaTacticsTag);
+    return this.getLastValidMove(pokemon) !== undefined && !pokemon.getTag(GorillaTacticsTag);
   }
 
   /**
@@ -370,11 +416,14 @@ export class GorillaTacticsTag extends MoveRestrictionBattlerTag {
    *
    * @override
    * @param {Pokemon} pokemon n/a
-   * @param {Moves} move {@linkcode Moves} ID of the move being denied
+   * @param {Moves} _move {@linkcode Moves} ID of the move being denied
    * @returns {string} text to display when the move is denied
-  */
-  override selectionDeniedText(pokemon: Pokemon, move: Moves): string {
-    return i18next.t("battle:canOnlyUseMove", { moveName: allMoves[this.moveId].name, pokemonName: getPokemonNameWithAffix(pokemon) });
+   */
+  override selectionDeniedText(pokemon: Pokemon, _move: Moves): string {
+    return i18next.t("battle:canOnlyUseMove", {
+      moveName: allMoves[this.moveId].name,
+      pokemonName: getPokemonNameWithAffix(pokemon),
+    });
   }
 
   /**
@@ -383,8 +432,7 @@ export class GorillaTacticsTag extends MoveRestrictionBattlerTag {
    * @returns {Moves | undefined} the last valid move from the pokemon's move history
    */
   getLastValidMove(pokemon: Pokemon): Moves | undefined {
-    const move = pokemon.getLastXMoves()
-      .find(m => m.move !== Moves.NONE && m.move !== Moves.STRUGGLE && !m.virtual);
+    const move = pokemon.getLastXMoves().find(m => m.move !== Moves.NONE && m.move !== Moves.STRUGGLE && !m.virtual);
 
     return move?.move;
   }
@@ -395,20 +443,24 @@ export class GorillaTacticsTag extends MoveRestrictionBattlerTag {
  */
 export class RechargingTag extends BattlerTag {
   constructor(sourceMove: Moves) {
-    super(BattlerTagType.RECHARGING, [ BattlerTagLapseType.PRE_MOVE, BattlerTagLapseType.TURN_END ], 2, sourceMove);
+    super(BattlerTagType.RECHARGING, [BattlerTagLapseType.PRE_MOVE, BattlerTagLapseType.TURN_END], 2, sourceMove);
   }
 
   onAdd(pokemon: Pokemon): void {
     super.onAdd(pokemon);
 
     // Queue a placeholder move for the Pokemon to "use" next turn
-    pokemon.getMoveQueue().push({ move: Moves.NONE, targets: []});
+    pokemon.getMoveQueue().push({ move: Moves.NONE, targets: [] });
   }
 
   /** Cancels the source's move this turn and queues a "__ must recharge!" message */
   lapse(pokemon: Pokemon, lapseType: BattlerTagLapseType): boolean {
     if (lapseType === BattlerTagLapseType.PRE_MOVE) {
-      globalScene.queueMessage(i18next.t("battlerTags:rechargingLapse", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
+      globalScene.queueMessage(
+        i18next.t("battlerTags:rechargingLapse", {
+          pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
+        }),
+      );
       (globalScene.getCurrentPhase() as MovePhase).cancel();
       pokemon.getMoveQueue().shift();
     }
@@ -423,7 +475,12 @@ export class RechargingTag extends BattlerTag {
  */
 export class BeakBlastChargingTag extends BattlerTag {
   constructor() {
-    super(BattlerTagType.BEAK_BLAST_CHARGING, [ BattlerTagLapseType.PRE_MOVE, BattlerTagLapseType.TURN_END, BattlerTagLapseType.AFTER_HIT ], 1, Moves.BEAK_BLAST);
+    super(
+      BattlerTagType.BEAK_BLAST_CHARGING,
+      [BattlerTagLapseType.PRE_MOVE, BattlerTagLapseType.TURN_END, BattlerTagLapseType.AFTER_HIT],
+      1,
+      Moves.BEAK_BLAST,
+    );
   }
 
   onAdd(pokemon: Pokemon): void {
@@ -431,7 +488,11 @@ export class BeakBlastChargingTag extends BattlerTag {
     new MoveChargeAnim(ChargeAnim.BEAK_BLAST_CHARGING, this.sourceMove, pokemon).play();
 
     // Queue Beak Blast's header message
-    globalScene.queueMessage(i18next.t("moveTriggers:startedHeatingUpBeak", { pokemonName: getPokemonNameWithAffix(pokemon) }));
+    globalScene.queueMessage(
+      i18next.t("moveTriggers:startedHeatingUpBeak", {
+        pokemonName: getPokemonNameWithAffix(pokemon),
+      }),
+    );
   }
 
   /**
@@ -444,7 +505,13 @@ export class BeakBlastChargingTag extends BattlerTag {
   lapse(pokemon: Pokemon, lapseType: BattlerTagLapseType): boolean {
     if (lapseType === BattlerTagLapseType.AFTER_HIT) {
       const phaseData = getMoveEffectPhaseData(pokemon);
-      if (phaseData?.move.hasFlag(MoveFlags.MAKES_CONTACT)) {
+      if (
+        phaseData?.move.doesFlagEffectApply({
+          flag: MoveFlags.MAKES_CONTACT,
+          user: phaseData.attacker,
+          target: pokemon,
+        })
+      ) {
         phaseData.attacker.trySetStatus(StatusEffect.BURN, true, pokemon);
       }
       return true;
@@ -459,14 +526,18 @@ export class BeakBlastChargingTag extends BattlerTag {
  * @see {@link https://bulbapedia.bulbagarden.net/wiki/Shell_Trap_(move) | Shell Trap}
  */
 export class ShellTrapTag extends BattlerTag {
-  public activated: boolean = false;
+  public activated = false;
 
   constructor() {
-    super(BattlerTagType.SHELL_TRAP, [ BattlerTagLapseType.TURN_END, BattlerTagLapseType.AFTER_HIT ], 1);
+    super(BattlerTagType.SHELL_TRAP, [BattlerTagLapseType.TURN_END, BattlerTagLapseType.AFTER_HIT], 1);
   }
 
   onAdd(pokemon: Pokemon): void {
-    globalScene.queueMessage(i18next.t("moveTriggers:setUpShellTrap", { pokemonName: getPokemonNameWithAffix(pokemon) }));
+    globalScene.queueMessage(
+      i18next.t("moveTriggers:setUpShellTrap", {
+        pokemonName: getPokemonNameWithAffix(pokemon),
+      }),
+    );
   }
 
   /**
@@ -482,11 +553,9 @@ export class ShellTrapTag extends BattlerTag {
       // Trap should only be triggered by opponent's Physical moves
       if (phaseData?.move.category === MoveCategory.PHYSICAL && pokemon.isOpponent(phaseData.attacker)) {
         const shellTrapPhaseIndex = globalScene.phaseQueue.findIndex(
-          phase => phase instanceof MovePhase && phase.pokemon === pokemon
-        );
-        const firstMovePhaseIndex = globalScene.phaseQueue.findIndex(
-          phase => phase instanceof MovePhase
+          phase => phase instanceof MovePhase && phase.pokemon === pokemon,
         );
+        const firstMovePhaseIndex = globalScene.phaseQueue.findIndex(phase => phase instanceof MovePhase);
 
         // Only shift MovePhase timing if it's not already next up
         if (shellTrapPhaseIndex !== -1 && shellTrapPhaseIndex !== firstMovePhaseIndex) {
@@ -505,7 +574,13 @@ export class ShellTrapTag extends BattlerTag {
 }
 
 export class TrappedTag extends BattlerTag {
-  constructor(tagType: BattlerTagType, lapseType: BattlerTagLapseType, turnCount: number, sourceMove: Moves, sourceId: number) {
+  constructor(
+    tagType: BattlerTagType,
+    lapseType: BattlerTagLapseType,
+    turnCount: number,
+    sourceMove: Moves,
+    sourceId: number,
+  ) {
     super(tagType, lapseType, turnCount, sourceMove, sourceId, true);
   }
 
@@ -513,7 +588,7 @@ export class TrappedTag extends BattlerTag {
     const source = globalScene.getPokemonById(this.sourceId!)!;
     const move = allMoves[this.sourceMove];
 
-    const isGhost = pokemon.isOfType(Type.GHOST);
+    const isGhost = pokemon.isOfType(PokemonType.GHOST);
     const isTrapped = pokemon.getTag(TrappedTag);
     const hasSubstitute = move.hitsSubstitute(source, pokemon);
 
@@ -529,10 +604,12 @@ export class TrappedTag extends BattlerTag {
   onRemove(pokemon: Pokemon): void {
     super.onRemove(pokemon);
 
-    globalScene.queueMessage(i18next.t("battlerTags:trappedOnRemove", {
-      pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
-      moveName: this.getMoveName()
-    }));
+    globalScene.queueMessage(
+      i18next.t("battlerTags:trappedOnRemove", {
+        pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
+        moveName: this.getMoveName(),
+      }),
+    );
   }
 
   getDescriptor(): string {
@@ -544,7 +621,9 @@ export class TrappedTag extends BattlerTag {
   }
 
   getTrapMessage(pokemon: Pokemon): string {
-    return i18next.t("battlerTags:trappedOnAdd", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) });
+    return i18next.t("battlerTags:trappedOnAdd", {
+      pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
+    });
   }
 }
 
@@ -570,7 +649,7 @@ class NoRetreatTag extends TrappedTag {
  */
 export class FlinchedTag extends BattlerTag {
   constructor(sourceMove: Moves) {
-    super(BattlerTagType.FLINCHED, [ BattlerTagLapseType.PRE_MOVE, BattlerTagLapseType.TURN_END ], 0, sourceMove);
+    super(BattlerTagType.FLINCHED, [BattlerTagLapseType.PRE_MOVE, BattlerTagLapseType.TURN_END], 0, sourceMove);
   }
 
   onAdd(pokemon: Pokemon): void {
@@ -588,7 +667,11 @@ export class FlinchedTag extends BattlerTag {
   lapse(pokemon: Pokemon, lapseType: BattlerTagLapseType): boolean {
     if (lapseType === BattlerTagLapseType.PRE_MOVE) {
       (globalScene.getCurrentPhase() as MovePhase).cancel();
-      globalScene.queueMessage(i18next.t("battlerTags:flinchedLapse", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
+      globalScene.queueMessage(
+        i18next.t("battlerTags:flinchedLapse", {
+          pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
+        }),
+      );
     }
 
     return super.lapse(pokemon, lapseType);
@@ -612,7 +695,11 @@ export class InterruptedTag extends BattlerTag {
     super.onAdd(pokemon);
 
     pokemon.getMoveQueue().shift();
-    pokemon.pushMoveHistory({ move: Moves.NONE, result: MoveResult.OTHER, targets: []});
+    pokemon.pushMoveHistory({
+      move: Moves.NONE,
+      result: MoveResult.OTHER,
+      targets: [],
+    });
   }
 
   lapse(pokemon: Pokemon, lapseType: BattlerTagLapseType): boolean {
@@ -637,41 +724,61 @@ export class ConfusedTag extends BattlerTag {
     super.onAdd(pokemon);
 
     globalScene.unshiftPhase(new CommonAnimPhase(pokemon.getBattlerIndex(), undefined, CommonAnim.CONFUSION));
-    globalScene.queueMessage(i18next.t("battlerTags:confusedOnAdd", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
+    globalScene.queueMessage(
+      i18next.t("battlerTags:confusedOnAdd", {
+        pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
+      }),
+    );
   }
 
   onRemove(pokemon: Pokemon): void {
     super.onRemove(pokemon);
 
-    globalScene.queueMessage(i18next.t("battlerTags:confusedOnRemove", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
+    globalScene.queueMessage(
+      i18next.t("battlerTags:confusedOnRemove", {
+        pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
+      }),
+    );
   }
 
   onOverlap(pokemon: Pokemon): void {
     super.onOverlap(pokemon);
 
-    globalScene.queueMessage(i18next.t("battlerTags:confusedOnOverlap", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
+    globalScene.queueMessage(
+      i18next.t("battlerTags:confusedOnOverlap", {
+        pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
+      }),
+    );
   }
 
   lapse(pokemon: Pokemon, lapseType: BattlerTagLapseType): boolean {
-    const ret = lapseType !== BattlerTagLapseType.CUSTOM && super.lapse(pokemon, lapseType);
+    const shouldLapse = lapseType !== BattlerTagLapseType.CUSTOM && super.lapse(pokemon, lapseType);
 
-    if (ret) {
-      globalScene.queueMessage(i18next.t("battlerTags:confusedLapse", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
-      globalScene.unshiftPhase(new CommonAnimPhase(pokemon.getBattlerIndex(), undefined, CommonAnim.CONFUSION));
-
-      // 1/3 chance of hitting self with a 40 base power move
-      if (pokemon.randSeedInt(3) === 0) {
-        const atk = pokemon.getEffectiveStat(Stat.ATK);
-        const def = pokemon.getEffectiveStat(Stat.DEF);
-        const damage = toDmgValue(((((2 * pokemon.level / 5 + 2) * 40 * atk / def) / 50) + 2) * (pokemon.randSeedIntRange(85, 100) / 100));
-        globalScene.queueMessage(i18next.t("battlerTags:confusedLapseHurtItself"));
-        pokemon.damageAndUpdate(damage);
-        pokemon.battleData.hitCount++;
-        (globalScene.getCurrentPhase() as MovePhase).cancel();
-      }
+    if (!shouldLapse) {
+      return false;
     }
 
-    return ret;
+    globalScene.queueMessage(
+      i18next.t("battlerTags:confusedLapse", {
+        pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
+      }),
+    );
+    globalScene.unshiftPhase(new CommonAnimPhase(pokemon.getBattlerIndex(), undefined, CommonAnim.CONFUSION));
+
+    // 1/3 chance of hitting self with a 40 base power move
+    if (pokemon.randBattleSeedInt(3) === 0 || Overrides.CONFUSION_ACTIVATION_OVERRIDE === true) {
+      const atk = pokemon.getEffectiveStat(Stat.ATK);
+      const def = pokemon.getEffectiveStat(Stat.DEF);
+      const damage = toDmgValue(
+        ((((2 * pokemon.level) / 5 + 2) * 40 * atk) / def / 50 + 2) * (pokemon.randBattleSeedIntRange(85, 100) / 100),
+      );
+      // Intentionally don't increment rage fist's hitCount
+      globalScene.queueMessage(i18next.t("battlerTags:confusedLapseHurtItself"));
+      pokemon.damageAndUpdate(damage, { result: HitResult.CONFUSION });
+      (globalScene.getCurrentPhase() as MovePhase).cancel();
+    }
+
+    return true;
   }
 
   getDescriptor(): string {
@@ -712,17 +819,21 @@ export class DestinyBondTag extends BattlerTag {
     }
 
     if (pokemon.isBossImmune()) {
-      globalScene.queueMessage(i18next.t("battlerTags:destinyBondLapseIsBoss", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
+      globalScene.queueMessage(
+        i18next.t("battlerTags:destinyBondLapseIsBoss", {
+          pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
+        }),
+      );
       return false;
     }
 
     globalScene.queueMessage(
       i18next.t("battlerTags:destinyBondLapse", {
         pokemonNameWithAffix: getPokemonNameWithAffix(source),
-        pokemonNameWithAffix2: getPokemonNameWithAffix(pokemon)
-      })
+        pokemonNameWithAffix2: getPokemonNameWithAffix(pokemon),
+      }),
     );
-    pokemon.damageAndUpdate(pokemon.hp, HitResult.ONE_HIT_KO, false, false, true);
+    pokemon.damageAndUpdate(pokemon.hp, { result: HitResult.INDIRECT_KO, ignoreSegments: true });
     return false;
   }
 }
@@ -738,14 +849,12 @@ export class InfatuatedTag extends BattlerTag {
 
       if (pkm) {
         return pokemon.isOppositeGender(pkm);
-      } else  {
-        console.warn("canAdd: this.sourceId is not a valid pokemon id!", this.sourceId);
-        return false;
       }
-    } else {
-      console.warn("canAdd: this.sourceId is undefined");
+      console.warn("canAdd: this.sourceId is not a valid pokemon id!", this.sourceId);
       return false;
     }
+    console.warn("canAdd: this.sourceId is undefined");
+    return false;
   }
 
   onAdd(pokemon: Pokemon): void {
@@ -754,15 +863,19 @@ export class InfatuatedTag extends BattlerTag {
     globalScene.queueMessage(
       i18next.t("battlerTags:infatuatedOnAdd", {
         pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
-        sourcePokemonName: getPokemonNameWithAffix(globalScene.getPokemonById(this.sourceId!) ?? undefined) // TODO: is that bang correct?
-      })
+        sourcePokemonName: getPokemonNameWithAffix(globalScene.getPokemonById(this.sourceId!) ?? undefined), // TODO: is that bang correct?
+      }),
     );
   }
 
   onOverlap(pokemon: Pokemon): void {
     super.onOverlap(pokemon);
 
-    globalScene.queueMessage(i18next.t("battlerTags:infatuatedOnOverlap", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
+    globalScene.queueMessage(
+      i18next.t("battlerTags:infatuatedOnOverlap", {
+        pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
+      }),
+    );
   }
 
   lapse(pokemon: Pokemon, lapseType: BattlerTagLapseType): boolean {
@@ -772,13 +885,17 @@ export class InfatuatedTag extends BattlerTag {
       globalScene.queueMessage(
         i18next.t("battlerTags:infatuatedLapse", {
           pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
-          sourcePokemonName: getPokemonNameWithAffix(globalScene.getPokemonById(this.sourceId!) ?? undefined) // TODO: is that bang correct?
-        })
+          sourcePokemonName: getPokemonNameWithAffix(globalScene.getPokemonById(this.sourceId!) ?? undefined), // TODO: is that bang correct?
+        }),
       );
       globalScene.unshiftPhase(new CommonAnimPhase(pokemon.getBattlerIndex(), undefined, CommonAnim.ATTRACT));
 
-      if (pokemon.randSeedInt(2)) {
-        globalScene.queueMessage(i18next.t("battlerTags:infatuatedLapseImmobilize", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
+      if (pokemon.randBattleSeedInt(2)) {
+        globalScene.queueMessage(
+          i18next.t("battlerTags:infatuatedLapseImmobilize", {
+            pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
+          }),
+        );
         (globalScene.getCurrentPhase() as MovePhase).cancel();
       }
     }
@@ -789,7 +906,11 @@ export class InfatuatedTag extends BattlerTag {
   onRemove(pokemon: Pokemon): void {
     super.onRemove(pokemon);
 
-    globalScene.queueMessage(i18next.t("battlerTags:infatuatedOnRemove", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
+    globalScene.queueMessage(
+      i18next.t("battlerTags:infatuatedOnRemove", {
+        pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
+      }),
+    );
   }
 
   isSourceLinked(): boolean {
@@ -809,22 +930,26 @@ export class SeedTag extends BattlerTag {
   }
 
   /**
-  * When given a battler tag or json representing one, load the data for it.
-  * @param {BattlerTag | any} source A battler tag
-  */
+   * When given a battler tag or json representing one, load the data for it.
+   * @param {BattlerTag | any} source A battler tag
+   */
   loadTag(source: BattlerTag | any): void {
     super.loadTag(source);
     this.sourceIndex = source.sourceIndex;
   }
 
   canAdd(pokemon: Pokemon): boolean {
-    return !pokemon.isOfType(Type.GRASS);
+    return !pokemon.isOfType(PokemonType.GRASS);
   }
 
   onAdd(pokemon: Pokemon): void {
     super.onAdd(pokemon);
 
-    globalScene.queueMessage(i18next.t("battlerTags:seededOnAdd", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
+    globalScene.queueMessage(
+      i18next.t("battlerTags:seededOnAdd", {
+        pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
+      }),
+    );
     this.sourceIndex = globalScene.getPokemonById(this.sourceId!)!.getBattlerIndex(); // TODO: are those bangs correct?
   }
 
@@ -838,14 +963,27 @@ export class SeedTag extends BattlerTag {
         applyAbAttrs(BlockNonDirectDamageAbAttr, pokemon, cancelled);
 
         if (!cancelled.value) {
-          globalScene.unshiftPhase(new CommonAnimPhase(source.getBattlerIndex(), pokemon.getBattlerIndex(), CommonAnim.LEECH_SEED));
+          globalScene.unshiftPhase(
+            new CommonAnimPhase(source.getBattlerIndex(), pokemon.getBattlerIndex(), CommonAnim.LEECH_SEED),
+          );
 
-          const damage = pokemon.damageAndUpdate(toDmgValue(pokemon.getMaxHp() / 8));
+          const damage = pokemon.damageAndUpdate(toDmgValue(pokemon.getMaxHp() / 8), { result: HitResult.INDIRECT });
           const reverseDrain = pokemon.hasAbilityWithAttr(ReverseDrainAbAttr, false);
-          globalScene.unshiftPhase(new PokemonHealPhase(source.getBattlerIndex(),
-            !reverseDrain ? damage : damage * -1,
-            !reverseDrain ? i18next.t("battlerTags:seededLapse", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }) : i18next.t("battlerTags:seededLapseShed", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }),
-            false, true));
+          globalScene.unshiftPhase(
+            new PokemonHealPhase(
+              source.getBattlerIndex(),
+              !reverseDrain ? damage : damage * -1,
+              !reverseDrain
+                ? i18next.t("battlerTags:seededLapse", {
+                    pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
+                  })
+                : i18next.t("battlerTags:seededLapseShed", {
+                    pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
+                  }),
+              false,
+              true,
+            ),
+          );
         }
       }
     }
@@ -865,14 +1003,18 @@ export class SeedTag extends BattlerTag {
  */
 export class PowderTag extends BattlerTag {
   constructor() {
-    super(BattlerTagType.POWDER, [ BattlerTagLapseType.PRE_MOVE, BattlerTagLapseType.TURN_END ], 1);
+    super(BattlerTagType.POWDER, [BattlerTagLapseType.PRE_MOVE, BattlerTagLapseType.TURN_END], 1);
   }
 
   onAdd(pokemon: Pokemon): void {
     super.onAdd(pokemon);
 
     // "{Pokemon} is covered in powder!"
-    globalScene.queueMessage(i18next.t("battlerTags:powderOnAdd", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
+    globalScene.queueMessage(
+      i18next.t("battlerTags:powderOnAdd", {
+        pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
+      }),
+    );
   }
 
   /**
@@ -888,16 +1030,21 @@ export class PowderTag extends BattlerTag {
       if (movePhase instanceof MovePhase) {
         const move = movePhase.move.getMove();
         const weather = globalScene.arena.weather;
-        if (pokemon.getMoveType(move) === Type.FIRE && !(weather && weather.weatherType === WeatherType.HEAVY_RAIN && !weather.isEffectSuppressed())) {
+        if (
+          pokemon.getMoveType(move) === PokemonType.FIRE &&
+          !(weather && weather.weatherType === WeatherType.HEAVY_RAIN && !weather.isEffectSuppressed())
+        ) {
           movePhase.fail();
           movePhase.showMoveText();
 
-          globalScene.unshiftPhase(new CommonAnimPhase(pokemon.getBattlerIndex(), pokemon.getBattlerIndex(), CommonAnim.POWDER));
+          globalScene.unshiftPhase(
+            new CommonAnimPhase(pokemon.getBattlerIndex(), pokemon.getBattlerIndex(), CommonAnim.POWDER),
+          );
 
           const cancelDamage = new BooleanHolder(false);
           applyAbAttrs(BlockNonDirectDamageAbAttr, pokemon, cancelDamage);
           if (!cancelDamage.value) {
-            pokemon.damageAndUpdate(Math.floor(pokemon.getMaxHp() / 4), HitResult.OTHER);
+            pokemon.damageAndUpdate(Math.floor(pokemon.getMaxHp() / 4), { result: HitResult.INDIRECT });
           }
 
           // "When the flame touched the powder\non the Pokémon, it exploded!"
@@ -905,9 +1052,8 @@ export class PowderTag extends BattlerTag {
         }
       }
       return true;
-    } else {
-      return super.lapse(pokemon, lapseType);
     }
+    return super.lapse(pokemon, lapseType);
   }
 }
 
@@ -919,27 +1065,39 @@ export class NightmareTag extends BattlerTag {
   onAdd(pokemon: Pokemon): void {
     super.onAdd(pokemon);
 
-    globalScene.queueMessage(i18next.t("battlerTags:nightmareOnAdd", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
+    globalScene.queueMessage(
+      i18next.t("battlerTags:nightmareOnAdd", {
+        pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
+      }),
+    );
   }
 
   onOverlap(pokemon: Pokemon): void {
     super.onOverlap(pokemon);
 
-    globalScene.queueMessage(i18next.t("battlerTags:nightmareOnOverlap", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
+    globalScene.queueMessage(
+      i18next.t("battlerTags:nightmareOnOverlap", {
+        pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
+      }),
+    );
   }
 
   lapse(pokemon: Pokemon, lapseType: BattlerTagLapseType): boolean {
     const ret = lapseType !== BattlerTagLapseType.CUSTOM || super.lapse(pokemon, lapseType);
 
     if (ret) {
-      globalScene.queueMessage(i18next.t("battlerTags:nightmareLapse", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
+      globalScene.queueMessage(
+        i18next.t("battlerTags:nightmareLapse", {
+          pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
+        }),
+      );
       globalScene.unshiftPhase(new CommonAnimPhase(pokemon.getBattlerIndex(), undefined, CommonAnim.CURSE)); // TODO: Update animation type
 
       const cancelled = new BooleanHolder(false);
       applyAbAttrs(BlockNonDirectDamageAbAttr, pokemon, cancelled);
 
       if (!cancelled.value) {
-        pokemon.damageAndUpdate(toDmgValue(pokemon.getMaxHp() / 4));
+        pokemon.damageAndUpdate(toDmgValue(pokemon.getMaxHp() / 4), { result: HitResult.INDIRECT });
       }
     }
 
@@ -959,27 +1117,30 @@ export class FrenzyTag extends BattlerTag {
   onRemove(pokemon: Pokemon): void {
     super.onRemove(pokemon);
 
-    if (this.turnCount < 2) { // Only add CONFUSED tag if a disruption occurs on the final confusion-inducing turn of FRENZY
-      pokemon.addTag(BattlerTagType.CONFUSED, pokemon.randSeedIntRange(2, 4));
+    if (this.turnCount < 2) {
+      // Only add CONFUSED tag if a disruption occurs on the final confusion-inducing turn of FRENZY
+      pokemon.addTag(BattlerTagType.CONFUSED, pokemon.randBattleSeedIntRange(2, 4));
     }
   }
 }
 
 /**
- * Applies the effects of the move Encore onto the target Pokemon
- * Encore forces the target Pokemon to use its most-recent move for 3 turns
+ * Applies the effects of {@linkcode Moves.ENCORE} onto the target Pokemon.
+ * Encore forces the target Pokemon to use its most-recent move for 3 turns.
  */
 export class EncoreTag extends MoveRestrictionBattlerTag {
   public moveId: Moves;
 
   constructor(sourceId: number) {
-    super(BattlerTagType.ENCORE, [ BattlerTagLapseType.CUSTOM, BattlerTagLapseType.AFTER_MOVE ], 3, Moves.ENCORE, sourceId);
+    super(
+      BattlerTagType.ENCORE,
+      [BattlerTagLapseType.CUSTOM, BattlerTagLapseType.AFTER_MOVE],
+      3,
+      Moves.ENCORE,
+      sourceId,
+    );
   }
 
-  /**
-  * When given a battler tag or json representing one, load the data for it.
-  * @param {BattlerTag | any} source A battler tag
-  */
   loadTag(source: BattlerTag | any): void {
     super.loadTag(source);
     this.moveId = source.moveId as Moves;
@@ -1016,15 +1177,21 @@ export class EncoreTag extends MoveRestrictionBattlerTag {
   onAdd(pokemon: Pokemon): void {
     super.onRemove(pokemon);
 
-    globalScene.queueMessage(i18next.t("battlerTags:encoreOnAdd", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
+    globalScene.queueMessage(
+      i18next.t("battlerTags:encoreOnAdd", {
+        pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
+      }),
+    );
 
     const movePhase = globalScene.findPhase(m => m instanceof MovePhase && m.pokemon === pokemon);
     if (movePhase) {
-      const movesetMove = pokemon.getMoveset().find(m => m!.moveId === this.moveId); // TODO: is this bang correct?
+      const movesetMove = pokemon.getMoveset().find(m => m.moveId === this.moveId);
       if (movesetMove) {
         const lastMove = pokemon.getLastXMoves(1)[0];
-        globalScene.tryReplacePhase((m => m instanceof MovePhase && m.pokemon === pokemon),
-          new MovePhase(pokemon, lastMove.targets!, movesetMove)); // TODO: is this bang correct?
+        globalScene.tryReplacePhase(
+          m => m instanceof MovePhase && m.pokemon === pokemon,
+          new MovePhase(pokemon, lastMove.targets ?? [], movesetMove),
+        );
       }
     }
   }
@@ -1035,14 +1202,13 @@ export class EncoreTag extends MoveRestrictionBattlerTag {
    */
   override lapse(pokemon: Pokemon, lapseType: BattlerTagLapseType): boolean {
     if (lapseType === BattlerTagLapseType.CUSTOM) {
-      const encoredMove = pokemon.getMoveset().find(m => m?.moveId === this.moveId);
+      const encoredMove = pokemon.getMoveset().find(m => m.moveId === this.moveId);
       if (encoredMove && encoredMove?.getPpRatio() > 0) {
         return true;
       }
       return false;
-    } else {
-      return super.lapse(pokemon, lapseType);
     }
+    return super.lapse(pokemon, lapseType);
   }
 
   /**
@@ -1065,7 +1231,11 @@ export class EncoreTag extends MoveRestrictionBattlerTag {
   onRemove(pokemon: Pokemon): void {
     super.onRemove(pokemon);
 
-    globalScene.queueMessage(i18next.t("battlerTags:encoreOnRemove", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
+    globalScene.queueMessage(
+      i18next.t("battlerTags:encoreOnRemove", {
+        pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
+      }),
+    );
   }
 }
 
@@ -1078,8 +1248,8 @@ export class HelpingHandTag extends BattlerTag {
     globalScene.queueMessage(
       i18next.t("battlerTags:helpingHandOnAdd", {
         pokemonNameWithAffix: getPokemonNameWithAffix(globalScene.getPokemonById(this.sourceId!) ?? undefined), // TODO: is that bang correct?
-        pokemonName: getPokemonNameWithAffix(pokemon)
-      })
+        pokemonName: getPokemonNameWithAffix(pokemon),
+      }),
     );
   }
 }
@@ -1112,9 +1282,11 @@ export class IngrainTag extends TrappedTag {
         new PokemonHealPhase(
           pokemon.getBattlerIndex(),
           toDmgValue(pokemon.getMaxHp() / 16),
-          i18next.t("battlerTags:ingrainLapse", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }),
-          true
-        )
+          i18next.t("battlerTags:ingrainLapse", {
+            pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
+          }),
+          true,
+        ),
       );
     }
 
@@ -1122,7 +1294,9 @@ export class IngrainTag extends TrappedTag {
   }
 
   getTrapMessage(pokemon: Pokemon): string {
-    return i18next.t("battlerTags:ingrainOnTrap", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) });
+    return i18next.t("battlerTags:ingrainOnTrap", {
+      pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
+    });
   }
 
   getDescriptor(): string {
@@ -1143,7 +1317,7 @@ export class OctolockTag extends TrappedTag {
     const shouldLapse = lapseType !== BattlerTagLapseType.CUSTOM || super.lapse(pokemon, lapseType);
 
     if (shouldLapse) {
-      globalScene.unshiftPhase(new StatStageChangePhase(pokemon.getBattlerIndex(), false, [ Stat.DEF, Stat.SPDEF ], -1));
+      globalScene.unshiftPhase(new StatStageChangePhase(pokemon.getBattlerIndex(), false, [Stat.DEF, Stat.SPDEF], -1));
       return true;
     }
 
@@ -1159,7 +1333,11 @@ export class AquaRingTag extends BattlerTag {
   onAdd(pokemon: Pokemon): void {
     super.onAdd(pokemon);
 
-    globalScene.queueMessage(i18next.t("battlerTags:aquaRingOnAdd", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
+    globalScene.queueMessage(
+      i18next.t("battlerTags:aquaRingOnAdd", {
+        pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
+      }),
+    );
   }
 
   lapse(pokemon: Pokemon, lapseType: BattlerTagLapseType): boolean {
@@ -1172,9 +1350,11 @@ export class AquaRingTag extends BattlerTag {
           toDmgValue(pokemon.getMaxHp() / 16),
           i18next.t("battlerTags:aquaRingLapse", {
             moveName: this.getMoveName(),
-            pokemonName: getPokemonNameWithAffix(pokemon)
+            pokemonName: getPokemonNameWithAffix(pokemon),
           }),
-          true));
+          true,
+        ),
+      );
     }
 
     return ret;
@@ -1212,7 +1392,11 @@ export class DrowsyTag extends BattlerTag {
   onAdd(pokemon: Pokemon): void {
     super.onAdd(pokemon);
 
-    globalScene.queueMessage(i18next.t("battlerTags:drowsyOnAdd", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
+    globalScene.queueMessage(
+      i18next.t("battlerTags:drowsyOnAdd", {
+        pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
+      }),
+    );
   }
 
   lapse(pokemon: Pokemon, lapseType: BattlerTagLapseType): boolean {
@@ -1239,9 +1423,9 @@ export abstract class DamagingTrapTag extends TrappedTag {
   }
 
   /**
-  * When given a battler tag or json representing one, load the data for it.
-  * @param {BattlerTag | any} source A battler tag
-  */
+   * When given a battler tag or json representing one, load the data for it.
+   * @param {BattlerTag | any} source A battler tag
+   */
   loadTag(source: BattlerTag | any): void {
     super.loadTag(source);
     this.commonAnim = source.commonAnim as CommonAnim;
@@ -1258,8 +1442,8 @@ export abstract class DamagingTrapTag extends TrappedTag {
       globalScene.queueMessage(
         i18next.t("battlerTags:damagingTrapLapse", {
           pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
-          moveName: this.getMoveName()
-        })
+          moveName: this.getMoveName(),
+        }),
       );
       globalScene.unshiftPhase(new CommonAnimPhase(pokemon.getBattlerIndex(), undefined, this.commonAnim));
 
@@ -1267,7 +1451,7 @@ export abstract class DamagingTrapTag extends TrappedTag {
       applyAbAttrs(BlockNonDirectDamageAbAttr, pokemon, cancelled);
 
       if (!cancelled.value) {
-        pokemon.damageAndUpdate(toDmgValue(pokemon.getMaxHp() / 8));
+        pokemon.damageAndUpdate(toDmgValue(pokemon.getMaxHp() / 8), { result: HitResult.INDIRECT });
       }
     }
 
@@ -1284,7 +1468,7 @@ export class BindTag extends DamagingTrapTag {
     return i18next.t("battlerTags:bindOnTrap", {
       pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
       sourcePokemonName: getPokemonNameWithAffix(globalScene.getPokemonById(this.sourceId!) ?? undefined), // TODO: is that bang correct?
-      moveName: this.getMoveName()
+      moveName: this.getMoveName(),
     });
   }
 }
@@ -1308,7 +1492,9 @@ export abstract class VortexTrapTag extends DamagingTrapTag {
   }
 
   getTrapMessage(pokemon: Pokemon): string {
-    return i18next.t("battlerTags:vortexOnTrap", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) });
+    return i18next.t("battlerTags:vortexOnTrap", {
+      pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
+    });
   }
 }
 
@@ -1345,7 +1531,7 @@ export class SandTombTag extends DamagingTrapTag {
   getTrapMessage(pokemon: Pokemon): string {
     return i18next.t("battlerTags:sandTombOnTrap", {
       pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
-      moveName: this.getMoveName()
+      moveName: this.getMoveName(),
     });
   }
 }
@@ -1356,7 +1542,9 @@ export class MagmaStormTag extends DamagingTrapTag {
   }
 
   getTrapMessage(pokemon: Pokemon): string {
-    return i18next.t("battlerTags:magmaStormOnTrap", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) });
+    return i18next.t("battlerTags:magmaStormOnTrap", {
+      pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
+    });
   }
 }
 
@@ -1366,7 +1554,9 @@ export class SnapTrapTag extends DamagingTrapTag {
   }
 
   getTrapMessage(pokemon: Pokemon): string {
-    return i18next.t("battlerTags:snapTrapOnTrap", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) });
+    return i18next.t("battlerTags:snapTrapOnTrap", {
+      pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
+    });
   }
 }
 
@@ -1396,7 +1586,6 @@ export class InfestationTag extends DamagingTrapTag {
   }
 }
 
-
 export class ProtectedTag extends BattlerTag {
   constructor(sourceMove: Moves, tagType: BattlerTagType = BattlerTagType.PROTECTED) {
     super(tagType, BattlerTagLapseType.TURN_END, 0, sourceMove);
@@ -1405,13 +1594,21 @@ export class ProtectedTag extends BattlerTag {
   onAdd(pokemon: Pokemon): void {
     super.onAdd(pokemon);
 
-    globalScene.queueMessage(i18next.t("battlerTags:protectedOnAdd", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
+    globalScene.queueMessage(
+      i18next.t("battlerTags:protectedOnAdd", {
+        pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
+      }),
+    );
   }
 
   lapse(pokemon: Pokemon, lapseType: BattlerTagLapseType): boolean {
     if (lapseType === BattlerTagLapseType.CUSTOM) {
       new CommonBattleAnim(CommonAnim.PROTECT, pokemon).play();
-      globalScene.queueMessage(i18next.t("battlerTags:protectedLapse", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
+      globalScene.queueMessage(
+        i18next.t("battlerTags:protectedLapse", {
+          pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
+        }),
+      );
 
       // Stop multi-hit moves early
       const effectPhase = globalScene.getCurrentPhase();
@@ -1425,45 +1622,102 @@ export class ProtectedTag extends BattlerTag {
   }
 }
 
-/** Base class for `BattlerTag`s that block damaging moves but not status moves */
-export class DamageProtectedTag extends ProtectedTag {}
+/** Class for `BattlerTag`s that apply some effect when hit by a contact move */
+export class ContactProtectedTag extends ProtectedTag {
+  /**
+   * Function to call when a contact move hits the pokemon with this tag.
+   * @param _attacker - The pokemon using the contact move
+   * @param _user - The pokemon that is being attacked and has the tag
+   * @param _move - The move used by the attacker
+   */
+  onContact(_attacker: Pokemon, _user: Pokemon) {}
+
+  /**
+   * Lapse the tag and apply `onContact` if the move makes contact and
+   * `lapseType` is custom, respecting the move's flags and the pokemon's
+   * abilities, and whether the lapseType is custom.
+   *
+   * @param pokemon - The pokemon with the tag
+   * @param lapseType - The type of lapse to apply. If this is not {@linkcode BattlerTagLapseType.CUSTOM CUSTOM}, no effect will be applied.
+   * @returns Whether the tag continues to exist after the lapse.
+   */
+  lapse(pokemon: Pokemon, lapseType: BattlerTagLapseType): boolean {
+    const ret = super.lapse(pokemon, lapseType);
+
+    const moveData = getMoveEffectPhaseData(pokemon);
+    if (
+      lapseType === BattlerTagLapseType.CUSTOM &&
+      moveData &&
+      moveData.move.doesFlagEffectApply({ flag: MoveFlags.MAKES_CONTACT, user: moveData.attacker, target: pokemon })
+    ) {
+      this.onContact(moveData.attacker, pokemon);
+    }
+
+    return ret;
+  }
+}
 
 /**
  * `BattlerTag` class for moves that block damaging moves damage the enemy if the enemy's move makes contact
  * Used by {@linkcode Moves.SPIKY_SHIELD}
  */
-export class ContactDamageProtectedTag extends ProtectedTag {
+export class ContactDamageProtectedTag extends ContactProtectedTag {
   private damageRatio: number;
 
   constructor(sourceMove: Moves, damageRatio: number) {
     super(sourceMove, BattlerTagType.SPIKY_SHIELD);
-
     this.damageRatio = damageRatio;
   }
 
   /**
-  * When given a battler tag or json representing one, load the data for it.
-  * @param {BattlerTag | any} source A battler tag
-  */
+   * When given a battler tag or json representing one, load the data for it.
+   * @param {BattlerTag | any} source A battler tag
+   */
   loadTag(source: BattlerTag | any): void {
     super.loadTag(source);
     this.damageRatio = source.damageRatio;
   }
 
-  lapse(pokemon: Pokemon, lapseType: BattlerTagLapseType): boolean {
-    const ret = super.lapse(pokemon, lapseType);
-
-    if (lapseType === BattlerTagLapseType.CUSTOM) {
-      const effectPhase = globalScene.getCurrentPhase();
-      if (effectPhase instanceof MoveEffectPhase && effectPhase.move.getMove().hasFlag(MoveFlags.MAKES_CONTACT)) {
-        const attacker = effectPhase.getPokemon();
-        if (!attacker.hasAbilityWithAttr(BlockNonDirectDamageAbAttr)) {
-          attacker.damageAndUpdate(toDmgValue(attacker.getMaxHp() * (1 / this.damageRatio)), HitResult.OTHER);
-        }
-      }
+  /**
+   * Damage the attacker by `this.damageRatio` of the target's max HP
+   * @param attacker - The pokemon using the contact move
+   * @param user - The pokemon that is being attacked and has the tag
+   */
+  override onContact(attacker: Pokemon, user: Pokemon): void {
+    const cancelled = new BooleanHolder(false);
+    applyAbAttrs(BlockNonDirectDamageAbAttr, user, cancelled);
+    if (!cancelled.value) {
+      attacker.damageAndUpdate(toDmgValue(attacker.getMaxHp() * (1 / this.damageRatio)), {
+        result: HitResult.INDIRECT,
+      });
     }
+  }
+}
 
-    return ret;
+/** Base class for `BattlerTag`s that block damaging moves but not status moves */
+export class DamageProtectedTag extends ContactProtectedTag {}
+
+export class ContactSetStatusProtectedTag extends DamageProtectedTag {
+  /**
+   * @param sourceMove The move that caused the tag to be applied
+   * @param tagType The type of the tag
+   * @param statusEffect The status effect to apply to the attacker
+   */
+  constructor(
+    sourceMove: Moves,
+    tagType: BattlerTagType,
+    private statusEffect: StatusEffect,
+  ) {
+    super(sourceMove, tagType);
+  }
+
+  /**
+   * Set the status effect on the attacker
+   * @param attacker - The pokemon using the contact move
+   * @param user - The pokemon that is being attacked and has the tag
+   */
+  override onContact(attacker: Pokemon, user: Pokemon): void {
+    attacker.trySetStatus(this.statusEffect, true, user);
   }
 }
 
@@ -1483,71 +1737,22 @@ export class ContactStatStageChangeProtectedTag extends DamageProtectedTag {
   }
 
   /**
-  * When given a battler tag or json representing one, load the data for it.
-  * @param {BattlerTag | any} source A battler tag
-  */
-  loadTag(source: BattlerTag | any): void {
+   * When given a battler tag or json representing one, load the data for it.
+   * @param {BattlerTag | any} source A battler tag
+   */
+  override loadTag(source: BattlerTag | any): void {
     super.loadTag(source);
     this.stat = source.stat;
     this.levels = source.levels;
   }
 
-  lapse(pokemon: Pokemon, lapseType: BattlerTagLapseType): boolean {
-    const ret = super.lapse(pokemon, lapseType);
-
-    if (lapseType === BattlerTagLapseType.CUSTOM) {
-      const effectPhase = globalScene.getCurrentPhase();
-      if (effectPhase instanceof MoveEffectPhase && effectPhase.move.getMove().hasFlag(MoveFlags.MAKES_CONTACT)) {
-        const attacker = effectPhase.getPokemon();
-        globalScene.unshiftPhase(new StatStageChangePhase(attacker.getBattlerIndex(), false, [ this.stat ], this.levels));
-      }
-    }
-
-    return ret;
-  }
-}
-
-export class ContactPoisonProtectedTag extends ProtectedTag {
-  constructor(sourceMove: Moves) {
-    super(sourceMove, BattlerTagType.BANEFUL_BUNKER);
-  }
-
-  lapse(pokemon: Pokemon, lapseType: BattlerTagLapseType): boolean {
-    const ret = super.lapse(pokemon, lapseType);
-
-    if (lapseType === BattlerTagLapseType.CUSTOM) {
-      const effectPhase = globalScene.getCurrentPhase();
-      if (effectPhase instanceof MoveEffectPhase && effectPhase.move.getMove().hasFlag(MoveFlags.MAKES_CONTACT)) {
-        const attacker = effectPhase.getPokemon();
-        attacker.trySetStatus(StatusEffect.POISON, true, pokemon);
-      }
-    }
-
-    return ret;
-  }
-}
-
-/**
- * `BattlerTag` class for moves that block damaging moves and burn the enemy if the enemy's move makes contact
- * Used by {@linkcode Moves.BURNING_BULWARK}
- */
-export class ContactBurnProtectedTag extends DamageProtectedTag {
-  constructor(sourceMove: Moves) {
-    super(sourceMove, BattlerTagType.BURNING_BULWARK);
-  }
-
-  lapse(pokemon: Pokemon, lapseType: BattlerTagLapseType): boolean {
-    const ret = super.lapse(pokemon, lapseType);
-
-    if (lapseType === BattlerTagLapseType.CUSTOM) {
-      const effectPhase = globalScene.getCurrentPhase();
-      if (effectPhase instanceof MoveEffectPhase && effectPhase.move.getMove().hasFlag(MoveFlags.MAKES_CONTACT)) {
-        const attacker = effectPhase.getPokemon();
-        attacker.trySetStatus(StatusEffect.BURN, true);
-      }
-    }
-
-    return ret;
+  /**
+   * Initiate the stat stage change on the attacker
+   * @param attacker - The pokemon using the contact move
+   * @param user - The pokemon that is being attacked and has the tag
+   */
+  override onContact(attacker: Pokemon, _user: Pokemon): void {
+    globalScene.unshiftPhase(new StatStageChangePhase(attacker.getBattlerIndex(), false, [this.stat], this.levels));
   }
 }
 
@@ -1564,12 +1769,20 @@ export class EnduringTag extends BattlerTag {
   onAdd(pokemon: Pokemon): void {
     super.onAdd(pokemon);
 
-    globalScene.queueMessage(i18next.t("battlerTags:enduringOnAdd", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
+    globalScene.queueMessage(
+      i18next.t("battlerTags:enduringOnAdd", {
+        pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
+      }),
+    );
   }
 
   lapse(pokemon: Pokemon, lapseType: BattlerTagLapseType): boolean {
     if (lapseType === BattlerTagLapseType.CUSTOM) {
-      globalScene.queueMessage(i18next.t("battlerTags:enduringLapse", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
+      globalScene.queueMessage(
+        i18next.t("battlerTags:enduringLapse", {
+          pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
+        }),
+      );
       return true;
     }
 
@@ -1584,7 +1797,11 @@ export class SturdyTag extends BattlerTag {
 
   lapse(pokemon: Pokemon, lapseType: BattlerTagLapseType): boolean {
     if (lapseType === BattlerTagLapseType.CUSTOM) {
-      globalScene.queueMessage(i18next.t("battlerTags:sturdyLapse", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
+      globalScene.queueMessage(
+        i18next.t("battlerTags:sturdyLapse", {
+          pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
+        }),
+      );
       return true;
     }
 
@@ -1608,11 +1825,11 @@ export class PerishSongTag extends BattlerTag {
       globalScene.queueMessage(
         i18next.t("battlerTags:perishSongLapse", {
           pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
-          turnCount: this.turnCount
-        })
+          turnCount: this.turnCount,
+        }),
       );
     } else {
-      pokemon.damageAndUpdate(pokemon.hp, HitResult.ONE_HIT_KO, false, true, true);
+      pokemon.damageAndUpdate(pokemon.hp, { result: HitResult.INDIRECT_KO, ignoreSegments: true });
     }
 
     return ret;
@@ -1629,7 +1846,7 @@ export class CenterOfAttentionTag extends BattlerTag {
   constructor(sourceMove: Moves) {
     super(BattlerTagType.CENTER_OF_ATTENTION, BattlerTagLapseType.TURN_END, 1, sourceMove);
 
-    this.powder = (this.sourceMove === Moves.RAGE_POWDER);
+    this.powder = this.sourceMove === Moves.RAGE_POWDER;
   }
 
   /** "Center of Attention" can't be added if an ally is already the Center of Attention. */
@@ -1642,7 +1859,11 @@ export class CenterOfAttentionTag extends BattlerTag {
   onAdd(pokemon: Pokemon): void {
     super.onAdd(pokemon);
 
-    globalScene.queueMessage(i18next.t("battlerTags:centerOfAttentionOnAdd", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
+    globalScene.queueMessage(
+      i18next.t("battlerTags:centerOfAttentionOnAdd", {
+        pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
+      }),
+    );
   }
 }
 
@@ -1656,9 +1877,9 @@ export class AbilityBattlerTag extends BattlerTag {
   }
 
   /**
-  * When given a battler tag or json representing one, load the data for it.
-  * @param {BattlerTag | any} source A battler tag
-  */
+   * When given a battler tag or json representing one, load the data for it.
+   * @param {BattlerTag | any} source A battler tag
+   */
   loadTag(source: BattlerTag | any): void {
     super.loadTag(source);
     this.ability = source.ability as Abilities;
@@ -1696,8 +1917,14 @@ export class TruantTag extends AbilityBattlerTag {
 
     if (lastMove && lastMove.move !== Moves.NONE) {
       (globalScene.getCurrentPhase() as MovePhase).cancel();
-      globalScene.unshiftPhase(new ShowAbilityPhase(pokemon.id, passive));
-      globalScene.queueMessage(i18next.t("battlerTags:truantLapse", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
+      // TODO: Ability displays should be handled by the ability
+      globalScene.queueAbilityDisplay(pokemon, passive, true);
+      globalScene.queueMessage(
+        i18next.t("battlerTags:truantLapse", {
+          pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
+        }),
+      );
+      globalScene.queueAbilityDisplay(pokemon, passive, false);
     }
 
     return true;
@@ -1712,7 +1939,11 @@ export class SlowStartTag extends AbilityBattlerTag {
   onAdd(pokemon: Pokemon): void {
     super.onAdd(pokemon);
 
-    globalScene.queueMessage(i18next.t("battlerTags:slowStartOnAdd", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }), null, false, null, true);
+    globalScene.queueMessage(
+      i18next.t("battlerTags:slowStartOnAdd", {
+        pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
+      }),
+    );
   }
 
   lapse(pokemon: Pokemon, lapseType: BattlerTagLapseType): boolean {
@@ -1726,7 +1957,14 @@ export class SlowStartTag extends AbilityBattlerTag {
   onRemove(pokemon: Pokemon): void {
     super.onRemove(pokemon);
 
-    globalScene.queueMessage(i18next.t("battlerTags:slowStartOnRemove", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }), null, false, null);
+    globalScene.queueMessage(
+      i18next.t("battlerTags:slowStartOnRemove", {
+        pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
+      }),
+      null,
+      false,
+      null,
+    );
   }
 }
 
@@ -1739,9 +1977,9 @@ export class HighestStatBoostTag extends AbilityBattlerTag {
   }
 
   /**
-  * When given a battler tag or json representing one, load the data for it.
-  * @param {BattlerTag | any} source A battler tag
-  */
+   * When given a battler tag or json representing one, load the data for it.
+   * @param {BattlerTag | any} source A battler tag
+   */
   loadTag(source: BattlerTag | any): void {
     super.loadTag(source);
     this.stat = source.stat as Stat;
@@ -1752,7 +1990,9 @@ export class HighestStatBoostTag extends AbilityBattlerTag {
     super.onAdd(pokemon);
 
     let highestStat: EffectiveStat;
-    EFFECTIVE_STATS.map(s => pokemon.getEffectiveStat(s)).reduce((highestValue: number, value: number, i: number) => {
+    EFFECTIVE_STATS.map(s =>
+      pokemon.getEffectiveStat(s, undefined, undefined, undefined, undefined, undefined, undefined, undefined, true),
+    ).reduce((highestValue: number, value: number, i: number) => {
       if (value > highestValue) {
         highestStat = EFFECTIVE_STATS[i];
         return value;
@@ -1763,22 +2003,28 @@ export class HighestStatBoostTag extends AbilityBattlerTag {
     highestStat = highestStat!; // tell TS compiler it's defined!
     this.stat = highestStat;
 
-    switch (this.stat) {
-      case Stat.SPD:
-        this.multiplier = 1.5;
-        break;
-      default:
-        this.multiplier = 1.3;
-        break;
-    }
-
-    globalScene.queueMessage(i18next.t("battlerTags:highestStatBoostOnAdd", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), statName: i18next.t(getStatKey(highestStat)) }), null, false, null, true);
+    this.multiplier = this.stat === Stat.SPD ? 1.5 : 1.3;
+    globalScene.queueMessage(
+      i18next.t("battlerTags:highestStatBoostOnAdd", {
+        pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
+        statName: i18next.t(getStatKey(highestStat)),
+      }),
+      null,
+      false,
+      null,
+      true,
+    );
   }
 
   onRemove(pokemon: Pokemon): void {
     super.onRemove(pokemon);
 
-    globalScene.queueMessage(i18next.t("battlerTags:highestStatBoostOnRemove", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), abilityName: allAbilities[this.ability].name }));
+    globalScene.queueMessage(
+      i18next.t("battlerTags:highestStatBoostOnRemove", {
+        pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
+        abilityName: allAbilities[this.ability].name,
+      }),
+    );
   }
 }
 
@@ -1791,9 +2037,9 @@ export class WeatherHighestStatBoostTag extends HighestStatBoostTag implements W
   }
 
   /**
-  * When given a battler tag or json representing one, load the data for it.
-  * @param {BattlerTag | any} source A battler tag
-  */
+   * When given a battler tag or json representing one, load the data for it.
+   * @param {BattlerTag | any} source A battler tag
+   */
   loadTag(source: BattlerTag | any): void {
     super.loadTag(source);
     this.weatherTypes = source.weatherTypes.map(w => w as WeatherType);
@@ -1809,9 +2055,9 @@ export class TerrainHighestStatBoostTag extends HighestStatBoostTag implements T
   }
 
   /**
-  * When given a battler tag or json representing one, load the data for it.
-  * @param {BattlerTag | any} source A battler tag
-  */
+   * When given a battler tag or json representing one, load the data for it.
+   * @param {BattlerTag | any} source A battler tag
+   */
   loadTag(source: BattlerTag | any): void {
     super.loadTag(source);
     this.terrainTypes = source.terrainTypes.map(w => w as TerrainType);
@@ -1833,27 +2079,27 @@ export class SemiInvulnerableTag extends BattlerTag {
     // Wait 2 frames before setting visible for battle animations that don't immediately show the sprite invisible
     globalScene.tweens.addCounter({
       duration: getFrameMs(2),
-      onComplete: () => pokemon.setVisible(true)
+      onComplete: () => pokemon.setVisible(true),
     });
   }
 }
 
 export class TypeImmuneTag extends BattlerTag {
-  public immuneType: Type;
+  public immuneType: PokemonType;
 
-  constructor(tagType: BattlerTagType, sourceMove: Moves, immuneType: Type, length: number = 1) {
+  constructor(tagType: BattlerTagType, sourceMove: Moves, immuneType: PokemonType, length = 1) {
     super(tagType, BattlerTagLapseType.TURN_END, length, sourceMove, undefined, true);
 
     this.immuneType = immuneType;
   }
 
   /**
-  * When given a battler tag or json representing one, load the data for it.
-  * @param {BattlerTag | any} source A battler tag
-  */
+   * When given a battler tag or json representing one, load the data for it.
+   * @param {BattlerTag | any} source A battler tag
+   */
   loadTag(source: BattlerTag | any): void {
     super.loadTag(source);
-    this.immuneType = source.immuneType as Type;
+    this.immuneType = source.immuneType as PokemonType;
   }
 }
 
@@ -1864,32 +2110,45 @@ export class TypeImmuneTag extends BattlerTag {
  */
 export class FloatingTag extends TypeImmuneTag {
   constructor(tagType: BattlerTagType, sourceMove: Moves, turnCount: number) {
-    super(tagType, sourceMove, Type.GROUND, turnCount);
+    super(tagType, sourceMove, PokemonType.GROUND, turnCount);
   }
 
   onAdd(pokemon: Pokemon): void {
     super.onAdd(pokemon);
 
     if (this.sourceMove === Moves.MAGNET_RISE) {
-      globalScene.queueMessage(i18next.t("battlerTags:magnetRisenOnAdd", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
+      globalScene.queueMessage(
+        i18next.t("battlerTags:magnetRisenOnAdd", {
+          pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
+        }),
+      );
     }
-
   }
 
   onRemove(pokemon: Pokemon): void {
     super.onRemove(pokemon);
     if (this.sourceMove === Moves.MAGNET_RISE) {
-      globalScene.queueMessage(i18next.t("battlerTags:magnetRisenOnRemove", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
+      globalScene.queueMessage(
+        i18next.t("battlerTags:magnetRisenOnRemove", {
+          pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
+        }),
+      );
     }
   }
 }
 
 export class TypeBoostTag extends BattlerTag {
-  public boostedType: Type;
+  public boostedType: PokemonType;
   public boostValue: number;
   public oneUse: boolean;
 
-  constructor(tagType: BattlerTagType, sourceMove: Moves, boostedType: Type, boostValue: number, oneUse: boolean) {
+  constructor(
+    tagType: BattlerTagType,
+    sourceMove: Moves,
+    boostedType: PokemonType,
+    boostValue: number,
+    oneUse: boolean,
+  ) {
     super(tagType, BattlerTagLapseType.TURN_END, 1, sourceMove);
 
     this.boostedType = boostedType;
@@ -1898,12 +2157,12 @@ export class TypeBoostTag extends BattlerTag {
   }
 
   /**
-  * When given a battler tag or json representing one, load the data for it.
-  * @param {BattlerTag | any} source A battler tag
-  */
+   * When given a battler tag or json representing one, load the data for it.
+   * @param {BattlerTag | any} source A battler tag
+   */
   loadTag(source: BattlerTag | any): void {
     super.loadTag(source);
-    this.boostedType = source.boostedType as Type;
+    this.boostedType = source.boostedType as PokemonType;
     this.boostValue = source.boostValue;
     this.oneUse = source.oneUse;
   }
@@ -1911,6 +2170,21 @@ export class TypeBoostTag extends BattlerTag {
   lapse(pokemon: Pokemon, lapseType: BattlerTagLapseType): boolean {
     return lapseType !== BattlerTagLapseType.CUSTOM || super.lapse(pokemon, lapseType);
   }
+
+  override onAdd(pokemon: Pokemon): void {
+    globalScene.queueMessage(
+      i18next.t("abilityTriggers:typeImmunityPowerBoost", {
+        pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
+        typeName: i18next.t(`pokemonInfo:Type.${PokemonType[this.boostedType]}`),
+      }),
+    );
+  }
+
+  override onOverlap(pokemon: Pokemon): void {
+    globalScene.queueMessage(
+      i18next.t("abilityTriggers:moveImmunity", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }),
+    );
+  }
 }
 
 export class CritBoostTag extends BattlerTag {
@@ -1921,7 +2195,11 @@ export class CritBoostTag extends BattlerTag {
   onAdd(pokemon: Pokemon): void {
     super.onAdd(pokemon);
 
-    globalScene.queueMessage(i18next.t("battlerTags:critBoostOnAdd", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
+    globalScene.queueMessage(
+      i18next.t("battlerTags:critBoostOnAdd", {
+        pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
+      }),
+    );
   }
 
   lapse(pokemon: Pokemon, lapseType: BattlerTagLapseType): boolean {
@@ -1931,7 +2209,11 @@ export class CritBoostTag extends BattlerTag {
   onRemove(pokemon: Pokemon): void {
     super.onRemove(pokemon);
 
-    globalScene.queueMessage(i18next.t("battlerTags:critBoostOnRemove", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
+    globalScene.queueMessage(
+      i18next.t("battlerTags:critBoostOnRemove", {
+        pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
+      }),
+    );
   }
 }
 
@@ -1941,7 +2223,7 @@ export class CritBoostTag extends BattlerTag {
  */
 export class DragonCheerTag extends CritBoostTag {
   /** The types of the user's ally when the tag is added */
-  public typesOnAdd: Type[];
+  public typesOnAdd: PokemonType[];
 
   constructor() {
     super(BattlerTagType.CRIT_BOOST, Moves.DRAGON_CHEER);
@@ -1962,9 +2244,9 @@ export class SaltCuredTag extends BattlerTag {
   }
 
   /**
-  * When given a battler tag or json representing one, load the data for it.
-  * @param {BattlerTag | any} source A battler tag
-  */
+   * When given a battler tag or json representing one, load the data for it.
+   * @param {BattlerTag | any} source A battler tag
+   */
   loadTag(source: BattlerTag | any): void {
     super.loadTag(source);
     this.sourceIndex = source.sourceIndex;
@@ -1973,7 +2255,11 @@ export class SaltCuredTag extends BattlerTag {
   onAdd(pokemon: Pokemon): void {
     super.onAdd(pokemon);
 
-    globalScene.queueMessage(i18next.t("battlerTags:saltCuredOnAdd", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
+    globalScene.queueMessage(
+      i18next.t("battlerTags:saltCuredOnAdd", {
+        pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
+      }),
+    );
     this.sourceIndex = globalScene.getPokemonById(this.sourceId!)!.getBattlerIndex(); // TODO: are those bangs correct?
   }
 
@@ -1981,20 +2267,24 @@ export class SaltCuredTag extends BattlerTag {
     const ret = lapseType !== BattlerTagLapseType.CUSTOM || super.lapse(pokemon, lapseType);
 
     if (ret) {
-      globalScene.unshiftPhase(new CommonAnimPhase(pokemon.getBattlerIndex(), pokemon.getBattlerIndex(), CommonAnim.SALT_CURE));
+      globalScene.unshiftPhase(
+        new CommonAnimPhase(pokemon.getBattlerIndex(), pokemon.getBattlerIndex(), CommonAnim.SALT_CURE),
+      );
 
       const cancelled = new BooleanHolder(false);
       applyAbAttrs(BlockNonDirectDamageAbAttr, pokemon, cancelled);
 
       if (!cancelled.value) {
-        const pokemonSteelOrWater = pokemon.isOfType(Type.STEEL) || pokemon.isOfType(Type.WATER);
-        pokemon.damageAndUpdate(toDmgValue(pokemonSteelOrWater ? pokemon.getMaxHp() / 4 : pokemon.getMaxHp() / 8));
+        const pokemonSteelOrWater = pokemon.isOfType(PokemonType.STEEL) || pokemon.isOfType(PokemonType.WATER);
+        pokemon.damageAndUpdate(toDmgValue(pokemonSteelOrWater ? pokemon.getMaxHp() / 4 : pokemon.getMaxHp() / 8), {
+          result: HitResult.INDIRECT,
+        });
 
         globalScene.queueMessage(
           i18next.t("battlerTags:saltCuredLapse", {
             pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
-            moveName: this.getMoveName()
-          })
+            moveName: this.getMoveName(),
+          }),
         );
       }
     }
@@ -2011,9 +2301,9 @@ export class CursedTag extends BattlerTag {
   }
 
   /**
-  * When given a battler tag or json representing one, load the data for it.
-  * @param {BattlerTag | any} source A battler tag
-  */
+   * When given a battler tag or json representing one, load the data for it.
+   * @param {BattlerTag | any} source A battler tag
+   */
   loadTag(source: BattlerTag | any): void {
     super.loadTag(source);
     this.sourceIndex = source.sourceIndex;
@@ -2028,14 +2318,20 @@ export class CursedTag extends BattlerTag {
     const ret = lapseType !== BattlerTagLapseType.CUSTOM || super.lapse(pokemon, lapseType);
 
     if (ret) {
-      globalScene.unshiftPhase(new CommonAnimPhase(pokemon.getBattlerIndex(), pokemon.getBattlerIndex(), CommonAnim.SALT_CURE));
+      globalScene.unshiftPhase(
+        new CommonAnimPhase(pokemon.getBattlerIndex(), pokemon.getBattlerIndex(), CommonAnim.SALT_CURE),
+      );
 
       const cancelled = new BooleanHolder(false);
       applyAbAttrs(BlockNonDirectDamageAbAttr, pokemon, cancelled);
 
       if (!cancelled.value) {
-        pokemon.damageAndUpdate(toDmgValue(pokemon.getMaxHp() / 4));
-        globalScene.queueMessage(i18next.t("battlerTags:cursedLapse", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
+        pokemon.damageAndUpdate(toDmgValue(pokemon.getMaxHp() / 4), { result: HitResult.INDIRECT });
+        globalScene.queueMessage(
+          i18next.t("battlerTags:cursedLapse", {
+            pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
+          }),
+        );
       }
     }
 
@@ -2067,8 +2363,8 @@ export class GroundedTag extends BattlerTag {
  */
 
 export class RoostedTag extends BattlerTag {
-  private isBaseFlying : boolean;
-  private isBasePureFlying : boolean;
+  private isBaseFlying: boolean;
+  private isBasePureFlying: boolean;
 
   constructor() {
     super(BattlerTagType.ROOSTED, BattlerTagLapseType.TURN_END, 1, Moves.ROOST);
@@ -2078,21 +2374,23 @@ export class RoostedTag extends BattlerTag {
     const currentTypes = pokemon.getTypes();
     const baseTypes = pokemon.getTypes(false, false, true);
 
-    const forestsCurseApplied: boolean = currentTypes.includes(Type.GRASS) && !baseTypes.includes(Type.GRASS);
-    const trickOrTreatApplied: boolean = currentTypes.includes(Type.GHOST) && !baseTypes.includes(Type.GHOST);
+    const forestsCurseApplied: boolean =
+      currentTypes.includes(PokemonType.GRASS) && !baseTypes.includes(PokemonType.GRASS);
+    const trickOrTreatApplied: boolean =
+      currentTypes.includes(PokemonType.GHOST) && !baseTypes.includes(PokemonType.GHOST);
 
     if (this.isBaseFlying) {
-      let modifiedTypes: Type[] = [];
+      let modifiedTypes: PokemonType[] = [];
       if (this.isBasePureFlying) {
         if (forestsCurseApplied || trickOrTreatApplied) {
-          modifiedTypes = currentTypes.filter(type => type !== Type.NORMAL);
-          modifiedTypes.push(Type.FLYING);
+          modifiedTypes = currentTypes.filter(type => type !== PokemonType.NORMAL);
+          modifiedTypes.push(PokemonType.FLYING);
         } else {
-          modifiedTypes = [ Type.FLYING ];
+          modifiedTypes = [PokemonType.FLYING];
         }
       } else {
-        modifiedTypes = [ ...currentTypes ];
-        modifiedTypes.push(Type.FLYING);
+        modifiedTypes = [...currentTypes];
+        modifiedTypes.push(PokemonType.FLYING);
       }
       pokemon.summonData.types = modifiedTypes;
       pokemon.updateInfo();
@@ -2105,18 +2403,18 @@ export class RoostedTag extends BattlerTag {
 
     const isOriginallyDualType = baseTypes.length === 2;
     const isCurrentlyDualType = currentTypes.length === 2;
-    this.isBaseFlying = baseTypes.includes(Type.FLYING);
-    this.isBasePureFlying = baseTypes[0] === Type.FLYING && baseTypes.length === 1;
+    this.isBaseFlying = baseTypes.includes(PokemonType.FLYING);
+    this.isBasePureFlying = baseTypes[0] === PokemonType.FLYING && baseTypes.length === 1;
 
     if (this.isBaseFlying) {
-      let modifiedTypes: Type[];
+      let modifiedTypes: PokemonType[];
       if (this.isBasePureFlying && !isCurrentlyDualType) {
-        modifiedTypes = [ Type.NORMAL ];
+        modifiedTypes = [PokemonType.NORMAL];
       } else {
         if (!!pokemon.getTag(RemovedTypeTag) && isOriginallyDualType && !isCurrentlyDualType) {
-          modifiedTypes = [ Type.UNKNOWN ];
+          modifiedTypes = [PokemonType.UNKNOWN];
         } else {
-          modifiedTypes = currentTypes.filter(type => type !== Type.FLYING);
+          modifiedTypes = currentTypes.filter(type => type !== PokemonType.FLYING);
         }
       }
       pokemon.summonData.types = modifiedTypes;
@@ -2166,10 +2464,6 @@ export class FormBlockDamageTag extends BattlerTag {
 }
 /** Provides the additional weather-based effects of the Ice Face ability */
 export class IceFaceBlockDamageTag extends FormBlockDamageTag {
-  constructor(tagType: BattlerTagType) {
-    super(tagType);
-  }
-
   /**
    * Determines if the tag can be added to the Pokémon.
    * @param {Pokemon} pokemon The Pokémon to which the tag might be added.
@@ -2201,7 +2495,14 @@ export class CommandedTag extends BattlerTag {
   /** Caches the Tatsugiri's form key and sharply boosts the tagged Pokemon's stats */
   override onAdd(pokemon: Pokemon): void {
     this._tatsugiriFormKey = this.getSourcePokemon()?.getFormKey() ?? "curly";
-    globalScene.unshiftPhase(new StatStageChangePhase(pokemon.getBattlerIndex(), true, [ Stat.ATK, Stat.DEF, Stat.SPATK, Stat.SPDEF, Stat.SPD ], 2));
+    globalScene.unshiftPhase(
+      new StatStageChangePhase(
+        pokemon.getBattlerIndex(),
+        true,
+        [Stat.ATK, Stat.DEF, Stat.SPATK, Stat.SPDEF, Stat.SPD],
+        2,
+      ),
+    );
   }
 
   /** Triggers an {@linkcode PokemonAnimType | animation} of the tagged Pokemon "spitting out" Tatsugiri */
@@ -2228,10 +2529,10 @@ export class CommandedTag extends BattlerTag {
  *     the stat when added.
  */
 export class StockpilingTag extends BattlerTag {
-  public stockpiledCount: number = 0;
+  public stockpiledCount = 0;
   public statChangeCounts: { [Stat.DEF]: number; [Stat.SPDEF]: number } = {
     [Stat.DEF]: 0,
-    [Stat.SPDEF]: 0
+    [Stat.SPDEF]: 0,
   };
 
   constructor(sourceMove: Moves = Moves.NONE) {
@@ -2269,16 +2570,26 @@ export class StockpilingTag extends BattlerTag {
     if (this.stockpiledCount < 3) {
       this.stockpiledCount++;
 
-      globalScene.queueMessage(i18next.t("battlerTags:stockpilingOnAdd", {
-        pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
-        stockpiledCount: this.stockpiledCount
-      }));
+      globalScene.queueMessage(
+        i18next.t("battlerTags:stockpilingOnAdd", {
+          pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
+          stockpiledCount: this.stockpiledCount,
+        }),
+      );
 
       // Attempt to increase DEF and SPDEF by one stage, keeping track of successful changes.
-      globalScene.unshiftPhase(new StatStageChangePhase(
-        pokemon.getBattlerIndex(), true,
-        [ Stat.SPDEF, Stat.DEF ], 1, true, false, true, this.onStatStagesChanged
-      ));
+      globalScene.unshiftPhase(
+        new StatStageChangePhase(
+          pokemon.getBattlerIndex(),
+          true,
+          [Stat.SPDEF, Stat.DEF],
+          1,
+          true,
+          false,
+          true,
+          this.onStatStagesChanged,
+        ),
+      );
     }
   }
 
@@ -2295,11 +2606,15 @@ export class StockpilingTag extends BattlerTag {
     const spDefChange = this.statChangeCounts[Stat.SPDEF];
 
     if (defChange) {
-      globalScene.unshiftPhase(new StatStageChangePhase(pokemon.getBattlerIndex(), true, [ Stat.DEF ], -defChange, true, false, true));
+      globalScene.unshiftPhase(
+        new StatStageChangePhase(pokemon.getBattlerIndex(), true, [Stat.DEF], -defChange, true, false, true),
+      );
     }
 
     if (spDefChange) {
-      globalScene.unshiftPhase(new StatStageChangePhase(pokemon.getBattlerIndex(), true, [ Stat.SPDEF ], -spDefChange, true, false, true));
+      globalScene.unshiftPhase(
+        new StatStageChangePhase(pokemon.getBattlerIndex(), true, [Stat.SPDEF], -spDefChange, true, false, true),
+      );
     }
   }
 }
@@ -2313,7 +2628,7 @@ export class GulpMissileTag extends BattlerTag {
     super(tagType, BattlerTagLapseType.HIT, 0, sourceMove);
   }
 
-  override lapse(pokemon: Pokemon, lapseType: BattlerTagLapseType): boolean {
+  override lapse(pokemon: Pokemon, _lapseType: BattlerTagLapseType): boolean {
     if (pokemon.getTag(BattlerTagType.UNDERWATER)) {
       return true;
     }
@@ -2326,7 +2641,7 @@ export class GulpMissileTag extends BattlerTag {
         return false;
       }
 
-      if (moveEffectPhase.move.getMove().hitsSubstitute(attacker, pokemon)) {
+      if (moveEffectPhase.move.hitsSubstitute(attacker, pokemon)) {
         return true;
       }
 
@@ -2334,11 +2649,11 @@ export class GulpMissileTag extends BattlerTag {
       applyAbAttrs(BlockNonDirectDamageAbAttr, attacker, cancelled);
 
       if (!cancelled.value) {
-        attacker.damageAndUpdate(Math.max(1, Math.floor(attacker.getMaxHp() / 4)), HitResult.OTHER);
+        attacker.damageAndUpdate(Math.max(1, Math.floor(attacker.getMaxHp() / 4)), { result: HitResult.INDIRECT });
       }
 
       if (this.tagType === BattlerTagType.GULP_MISSILE_ARROKUDA) {
-        globalScene.unshiftPhase(new StatStageChangePhase(attacker.getBattlerIndex(), false, [ Stat.DEF ], -1));
+        globalScene.unshiftPhase(new StatStageChangePhase(attacker.getBattlerIndex(), false, [Stat.DEF], -1));
       } else {
         attacker.trySetStatus(StatusEffect.PARALYSIS, true, pokemon);
       }
@@ -2352,8 +2667,11 @@ export class GulpMissileTag extends BattlerTag {
    * @returns Whether the BattlerTag can be added.
    */
   canAdd(pokemon: Pokemon): boolean {
-    const isSurfOrDive = [ Moves.SURF, Moves.DIVE ].includes(this.sourceMove);
-    const isNormalForm = pokemon.formIndex === 0 && !pokemon.getTag(BattlerTagType.GULP_MISSILE_ARROKUDA) && !pokemon.getTag(BattlerTagType.GULP_MISSILE_PIKACHU);
+    const isSurfOrDive = [Moves.SURF, Moves.DIVE].includes(this.sourceMove);
+    const isNormalForm =
+      pokemon.formIndex === 0 &&
+      !pokemon.getTag(BattlerTagType.GULP_MISSILE_ARROKUDA) &&
+      !pokemon.getTag(BattlerTagType.GULP_MISSILE_PIKACHU);
     const isCramorant = pokemon.species.speciesId === Species.CRAMORANT;
 
     return isSurfOrDive && isNormalForm && isCramorant;
@@ -2381,31 +2699,31 @@ export class GulpMissileTag extends BattlerTag {
  * @see {@linkcode ignoreImmunity}
  */
 export class ExposedTag extends BattlerTag {
-  private defenderType: Type;
-  private allowedTypes: Type[];
+  private defenderType: PokemonType;
+  private allowedTypes: PokemonType[];
 
-  constructor(tagType: BattlerTagType, sourceMove: Moves, defenderType: Type, allowedTypes: Type[]) {
+  constructor(tagType: BattlerTagType, sourceMove: Moves, defenderType: PokemonType, allowedTypes: PokemonType[]) {
     super(tagType, BattlerTagLapseType.CUSTOM, 1, sourceMove);
     this.defenderType = defenderType;
     this.allowedTypes = allowedTypes;
   }
 
   /**
-  * When given a battler tag or json representing one, load the data for it.
-  * @param {BattlerTag | any} source A battler tag
-  */
+   * When given a battler tag or json representing one, load the data for it.
+   * @param {BattlerTag | any} source A battler tag
+   */
   loadTag(source: BattlerTag | any): void {
     super.loadTag(source);
-    this.defenderType = source.defenderType as Type;
-    this.allowedTypes = source.allowedTypes as Type[];
+    this.defenderType = source.defenderType as PokemonType;
+    this.allowedTypes = source.allowedTypes as PokemonType[];
   }
 
   /**
-   * @param types {@linkcode Type} of the defending Pokemon
-   * @param moveType {@linkcode Type} of the move targetting it
+   * @param types {@linkcode PokemonType} of the defending Pokemon
+   * @param moveType {@linkcode PokemonType} of the move targetting it
    * @returns `true` if the move should be allowed to target the defender.
    */
-  ignoreImmunity(type: Type, moveType: Type): boolean {
+  ignoreImmunity(type: PokemonType, moveType: PokemonType): boolean {
     return type === this.defenderType && this.allowedTypes.includes(moveType);
   }
 }
@@ -2418,11 +2736,18 @@ export class ExposedTag extends BattlerTag {
  */
 export class HealBlockTag extends MoveRestrictionBattlerTag {
   constructor(turnCount: number, sourceMove: Moves) {
-    super(BattlerTagType.HEAL_BLOCK, [ BattlerTagLapseType.PRE_MOVE, BattlerTagLapseType.TURN_END ], turnCount, sourceMove);
+    super(
+      BattlerTagType.HEAL_BLOCK,
+      [BattlerTagLapseType.PRE_MOVE, BattlerTagLapseType.TURN_END],
+      turnCount,
+      sourceMove,
+    );
   }
 
   onActivation(pokemon: Pokemon): string {
-    return i18next.t("battle:battlerTagsHealBlock", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) });
+    return i18next.t("battle:battlerTagsHealBlock", {
+      pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
+    });
   }
 
   /**
@@ -2448,7 +2773,7 @@ export class HealBlockTag extends MoveRestrictionBattlerTag {
   override isMoveTargetRestricted(move: Moves, user: Pokemon, target: Pokemon) {
     const moveCategory = new NumberHolder(allMoves[move].category);
     applyMoveAttrs(StatusCategoryOnAllyAttr, user, target, allMoves[move], moveCategory);
-    if (allMoves[move].hasAttr(HealOnAllyAttr) && moveCategory.value === MoveCategory.STATUS ) {
+    if (allMoves[move].hasAttr(HealOnAllyAttr) && moveCategory.value === MoveCategory.STATUS) {
       return true;
     }
     return false;
@@ -2458,7 +2783,11 @@ export class HealBlockTag extends MoveRestrictionBattlerTag {
    * Uses its own unique selectionDeniedText() message
    */
   override selectionDeniedText(pokemon: Pokemon, move: Moves): string {
-    return i18next.t("battle:moveDisabledHealBlock", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), moveName: allMoves[move].name, healBlockName: allMoves[Moves.HEAL_BLOCK].name });
+    return i18next.t("battle:moveDisabledHealBlock", {
+      pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
+      moveName: allMoves[move].name,
+      healBlockName: allMoves[Moves.HEAL_BLOCK].name,
+    });
   }
 
   /**
@@ -2468,13 +2797,24 @@ export class HealBlockTag extends MoveRestrictionBattlerTag {
    * @returns {string} text to display when the move is interrupted
    */
   override interruptedText(pokemon: Pokemon, move: Moves): string {
-    return i18next.t("battle:moveDisabledHealBlock", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), moveName: allMoves[move].name, healBlockName: allMoves[Moves.HEAL_BLOCK].name });
+    return i18next.t("battle:moveDisabledHealBlock", {
+      pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
+      moveName: allMoves[move].name,
+      healBlockName: allMoves[Moves.HEAL_BLOCK].name,
+    });
   }
 
   override onRemove(pokemon: Pokemon): void {
     super.onRemove(pokemon);
 
-    globalScene.queueMessage(i18next.t("battle:battlerTagsHealBlockOnRemove", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }), null, false, null);
+    globalScene.queueMessage(
+      i18next.t("battle:battlerTagsHealBlockOnRemove", {
+        pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
+      }),
+      null,
+      false,
+      null,
+    );
   }
 }
 
@@ -2493,11 +2833,15 @@ export class TarShotTag extends BattlerTag {
    * @returns whether the tag is applied
    */
   override canAdd(pokemon: Pokemon): boolean {
-    return !pokemon.isTerastallized();
+    return !pokemon.isTerastallized;
   }
 
   override onAdd(pokemon: Pokemon): void {
-    globalScene.queueMessage(i18next.t("battlerTags:tarShotOnAdd", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
+    globalScene.queueMessage(
+      i18next.t("battlerTags:tarShotOnAdd", {
+        pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
+      }),
+    );
   }
 }
 
@@ -2512,7 +2856,11 @@ export class ElectrifiedTag extends BattlerTag {
 
   override onAdd(pokemon: Pokemon): void {
     // "{pokemonNameWithAffix}'s moves have been electrified!"
-    globalScene.queueMessage(i18next.t("battlerTags:electrifiedOnAdd", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
+    globalScene.queueMessage(
+      i18next.t("battlerTags:electrifiedOnAdd", {
+        pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
+      }),
+    );
   }
 }
 
@@ -2521,7 +2869,7 @@ export class ElectrifiedTag extends BattlerTag {
  * Each count of Autotomization reduces the weight by 100kg
  */
 export class AutotomizedTag extends BattlerTag {
-  public autotomizeCount: number = 0;
+  public autotomizeCount = 0;
   constructor(sourceMove: Moves = Moves.AUTOTOMIZE) {
     super(BattlerTagType.AUTOTOMIZED, BattlerTagLapseType.CUSTOM, 1, sourceMove);
   }
@@ -2534,9 +2882,11 @@ export class AutotomizedTag extends BattlerTag {
   onAdd(pokemon: Pokemon): void {
     const minWeight = 0.1;
     if (pokemon.getWeight() > minWeight) {
-      globalScene.queueMessage(i18next.t("battlerTags:autotomizeOnAdd", {
-        pokemonNameWithAffix: getPokemonNameWithAffix(pokemon)
-      }));
+      globalScene.queueMessage(
+        i18next.t("battlerTags:autotomizeOnAdd", {
+          pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
+        }),
+      );
     }
     this.autotomizeCount += 1;
   }
@@ -2560,7 +2910,14 @@ export class SubstituteTag extends BattlerTag {
   public sourceInFocus: boolean;
 
   constructor(sourceMove: Moves, sourceId: number) {
-    super(BattlerTagType.SUBSTITUTE, [ BattlerTagLapseType.PRE_MOVE, BattlerTagLapseType.AFTER_MOVE, BattlerTagLapseType.HIT ], 0, sourceMove, sourceId, true);
+    super(
+      BattlerTagType.SUBSTITUTE,
+      [BattlerTagLapseType.PRE_MOVE, BattlerTagLapseType.AFTER_MOVE, BattlerTagLapseType.HIT],
+      0,
+      sourceMove,
+      sourceId,
+      true,
+    );
   }
 
   /** Sets the Substitute's HP and queues an on-add battle animation that initializes the Substitute's sprite. */
@@ -2571,9 +2928,19 @@ export class SubstituteTag extends BattlerTag {
     // Queue battle animation and message
     globalScene.triggerPokemonBattleAnim(pokemon, PokemonAnimType.SUBSTITUTE_ADD);
     if (this.sourceMove === Moves.SHED_TAIL) {
-      globalScene.queueMessage(i18next.t("battlerTags:shedTailOnAdd", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }), 1500);
+      globalScene.queueMessage(
+        i18next.t("battlerTags:shedTailOnAdd", {
+          pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
+        }),
+        1500,
+      );
     } else {
-      globalScene.queueMessage(i18next.t("battlerTags:substituteOnAdd", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }), 1500);
+      globalScene.queueMessage(
+        i18next.t("battlerTags:substituteOnAdd", {
+          pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
+        }),
+        1500,
+      );
     }
 
     // Remove any binding effects from the user
@@ -2584,11 +2951,15 @@ export class SubstituteTag extends BattlerTag {
   onRemove(pokemon: Pokemon): void {
     // Only play the animation if the cause of removal isn't from the source's own move
     if (!this.sourceInFocus) {
-      globalScene.triggerPokemonBattleAnim(pokemon, PokemonAnimType.SUBSTITUTE_REMOVE, [ this.sprite ]);
+      globalScene.triggerPokemonBattleAnim(pokemon, PokemonAnimType.SUBSTITUTE_REMOVE, [this.sprite]);
     } else {
       this.sprite.destroy();
     }
-    globalScene.queueMessage(i18next.t("battlerTags:substituteOnRemove", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
+    globalScene.queueMessage(
+      i18next.t("battlerTags:substituteOnRemove", {
+        pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
+      }),
+    );
   }
 
   lapse(pokemon: Pokemon, lapseType: BattlerTagLapseType): boolean {
@@ -2608,13 +2979,13 @@ export class SubstituteTag extends BattlerTag {
 
   /** Triggers an animation that brings the Pokemon into focus before it uses a move */
   onPreMove(pokemon: Pokemon): void {
-    globalScene.triggerPokemonBattleAnim(pokemon, PokemonAnimType.SUBSTITUTE_PRE_MOVE, [ this.sprite ]);
+    globalScene.triggerPokemonBattleAnim(pokemon, PokemonAnimType.SUBSTITUTE_PRE_MOVE, [this.sprite]);
     this.sourceInFocus = true;
   }
 
   /** Triggers an animation that brings the Pokemon out of focus after it uses a move */
   onAfterMove(pokemon: Pokemon): void {
-    globalScene.triggerPokemonBattleAnim(pokemon, PokemonAnimType.SUBSTITUTE_POST_MOVE, [ this.sprite ]);
+    globalScene.triggerPokemonBattleAnim(pokemon, PokemonAnimType.SUBSTITUTE_POST_MOVE, [this.sprite]);
     this.sourceInFocus = false;
   }
 
@@ -2626,19 +2997,23 @@ export class SubstituteTag extends BattlerTag {
       if (!attacker) {
         return;
       }
-      const move = moveEffectPhase.move.getMove();
-      const firstHit = (attacker.turnData.hitCount === attacker.turnData.hitsLeft);
+      const move = moveEffectPhase.move;
+      const firstHit = attacker.turnData.hitCount === attacker.turnData.hitsLeft;
 
       if (firstHit && move.hitsSubstitute(attacker, pokemon)) {
-        globalScene.queueMessage(i18next.t("battlerTags:substituteOnHit", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
+        globalScene.queueMessage(
+          i18next.t("battlerTags:substituteOnHit", {
+            pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
+          }),
+        );
       }
     }
   }
 
   /**
-  * When given a battler tag or json representing one, load the data for it.
-  * @param {BattlerTag | any} source A battler tag
-  */
+   * When given a battler tag or json representing one, load the data for it.
+   * @param {BattlerTag | any} source A battler tag
+   */
   loadTag(source: BattlerTag | any): void {
     super.loadTag(source);
     this.hp = source.hp;
@@ -2668,6 +3043,7 @@ export class MysteryEncounterPostSummonTag extends BattlerTag {
     if (lapseType === BattlerTagLapseType.CUSTOM) {
       const cancelled = new BooleanHolder(false);
       applyAbAttrs(ProtectStatAbAttr, pokemon, cancelled);
+      applyAbAttrs(ConditionalUserFieldProtectStatAbAttr, pokemon, cancelled, false, pokemon);
       if (!cancelled.value) {
         if (pokemon.mysteryEncounterBattleEffects) {
           pokemon.mysteryEncounterBattleEffects(pokemon);
@@ -2702,7 +3078,12 @@ export class TormentTag extends MoveRestrictionBattlerTag {
    */
   override onAdd(pokemon: Pokemon) {
     super.onAdd(pokemon);
-    globalScene.queueMessage(i18next.t("battlerTags:tormentOnAdd", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }), 1500);
+    globalScene.queueMessage(
+      i18next.t("battlerTags:tormentOnAdd", {
+        pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
+      }),
+      1500,
+    );
   }
 
   /**
@@ -2725,14 +3106,14 @@ export class TormentTag extends MoveRestrictionBattlerTag {
       return false;
     }
     const lastMove = user.getLastXMoves(1)[0];
-    if ( !lastMove ) {
+    if (!lastMove) {
       return false;
     }
     // This checks for locking / momentum moves like Rollout and Hydro Cannon + if the user is under the influence of BattlerTagType.FRENZY
     // Because Uproar's unique behavior is not implemented, it does not check for Uproar. Torment has been marked as partial in moves.ts
     const moveObj = allMoves[lastMove.move];
     const isUnaffected = moveObj.hasAttr(ConsecutiveUseDoublePowerAttr) || user.getTag(BattlerTagType.FRENZY);
-    const validLastMoveResult = (lastMove.result === MoveResult.SUCCESS) || (lastMove.result === MoveResult.MISS);
+    const validLastMoveResult = lastMove.result === MoveResult.SUCCESS || lastMove.result === MoveResult.MISS;
     if (lastMove.move === move && validLastMoveResult && lastMove.move !== Moves.STRUGGLE && !isUnaffected) {
       return true;
     }
@@ -2740,7 +3121,9 @@ export class TormentTag extends MoveRestrictionBattlerTag {
   }
 
   override selectionDeniedText(pokemon: Pokemon, _move: Moves): string {
-    return i18next.t("battle:moveDisabledTorment", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) });
+    return i18next.t("battle:moveDisabledTorment", {
+      pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
+    });
   }
 }
 
@@ -2751,12 +3134,27 @@ export class TormentTag extends MoveRestrictionBattlerTag {
  */
 export class TauntTag extends MoveRestrictionBattlerTag {
   constructor() {
-    super(BattlerTagType.TAUNT, [ BattlerTagLapseType.PRE_MOVE, BattlerTagLapseType.AFTER_MOVE ], 4, Moves.TAUNT);
+    super(BattlerTagType.TAUNT, [BattlerTagLapseType.PRE_MOVE, BattlerTagLapseType.AFTER_MOVE], 4, Moves.TAUNT);
   }
 
   override onAdd(pokemon: Pokemon) {
     super.onAdd(pokemon);
-    globalScene.queueMessage(i18next.t("battlerTags:tauntOnAdd", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }), 1500);
+    globalScene.queueMessage(
+      i18next.t("battlerTags:tauntOnAdd", {
+        pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
+      }),
+      1500,
+    );
+  }
+
+  public override onRemove(pokemon: Pokemon): void {
+    super.onRemove(pokemon);
+
+    globalScene.queueMessage(
+      i18next.t("battlerTags:tauntOnRemove", {
+        pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
+      }),
+    );
   }
 
   /**
@@ -2769,11 +3167,17 @@ export class TauntTag extends MoveRestrictionBattlerTag {
   }
 
   override selectionDeniedText(pokemon: Pokemon, move: Moves): string {
-    return i18next.t("battle:moveDisabledTaunt", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), moveName: allMoves[move].name });
+    return i18next.t("battle:moveDisabledTaunt", {
+      pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
+      moveName: allMoves[move].name,
+    });
   }
 
   override interruptedText(pokemon: Pokemon, move: Moves): string {
-    return i18next.t("battle:moveDisabledTaunt", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), moveName: allMoves[move].name });
+    return i18next.t("battle:moveDisabledTaunt", {
+      pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
+      moveName: allMoves[move].name,
+    });
   }
 }
 
@@ -2784,7 +3188,13 @@ export class TauntTag extends MoveRestrictionBattlerTag {
  */
 export class ImprisonTag extends MoveRestrictionBattlerTag {
   constructor(sourceId: number) {
-    super(BattlerTagType.IMPRISON, [ BattlerTagLapseType.PRE_MOVE, BattlerTagLapseType.AFTER_MOVE ], 1, Moves.IMPRISON, sourceId);
+    super(
+      BattlerTagType.IMPRISON,
+      [BattlerTagLapseType.PRE_MOVE, BattlerTagLapseType.AFTER_MOVE],
+      1,
+      Moves.IMPRISON,
+      sourceId,
+    );
   }
 
   /**
@@ -2798,9 +3208,8 @@ export class ImprisonTag extends MoveRestrictionBattlerTag {
     if (source) {
       if (lapseType === BattlerTagLapseType.PRE_MOVE) {
         return super.lapse(pokemon, lapseType) && source.isActive(true);
-      } else {
-        return source.isActive(true);
       }
+      return source.isActive(true);
     }
     return false;
   }
@@ -2811,21 +3220,27 @@ export class ImprisonTag extends MoveRestrictionBattlerTag {
    * @param {Moves} move the move under investigation
    * @returns `false` if either condition is not met
    */
-  public override isMoveRestricted(move: Moves, user: Pokemon): boolean {
+  public override isMoveRestricted(move: Moves, _user: Pokemon): boolean {
     const source = this.getSourcePokemon();
     if (source) {
-      const sourceMoveset = source.getMoveset().map(m => m!.moveId);
+      const sourceMoveset = source.getMoveset().map(m => m.moveId);
       return sourceMoveset?.includes(move) && source.isActive(true);
     }
     return false;
   }
 
   override selectionDeniedText(pokemon: Pokemon, move: Moves): string {
-    return i18next.t("battle:moveDisabledImprison", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), moveName: allMoves[move].name });
+    return i18next.t("battle:moveDisabledImprison", {
+      pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
+      moveName: allMoves[move].name,
+    });
   }
 
   override interruptedText(pokemon: Pokemon, move: Moves): string {
-    return i18next.t("battle:moveDisabledImprison", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), moveName: allMoves[move].name });
+    return i18next.t("battle:moveDisabledImprison", {
+      pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
+      moveName: allMoves[move].name,
+    });
   }
 }
 
@@ -2845,7 +3260,11 @@ export class SyrupBombTag extends BattlerTag {
    */
   override onAdd(pokemon: Pokemon) {
     super.onAdd(pokemon);
-    globalScene.queueMessage(i18next.t("battlerTags:syrupBombOnAdd", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
+    globalScene.queueMessage(
+      i18next.t("battlerTags:syrupBombOnAdd", {
+        pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
+      }),
+    );
   }
 
   /**
@@ -2859,11 +3278,14 @@ export class SyrupBombTag extends BattlerTag {
       return false;
     }
     // Custom message in lieu of an animation in mainline
-    globalScene.queueMessage(i18next.t("battlerTags:syrupBombLapse", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
-    globalScene.unshiftPhase(new StatStageChangePhase(
-      pokemon.getBattlerIndex(), true,
-      [ Stat.SPD ], -1, true, false, true
-    ));
+    globalScene.queueMessage(
+      i18next.t("battlerTags:syrupBombLapse", {
+        pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
+      }),
+    );
+    globalScene.unshiftPhase(
+      new StatStageChangePhase(pokemon.getBattlerIndex(), true, [Stat.SPD], -1, true, false, true),
+    );
     return --this.turnCount > 0;
   }
 }
@@ -2876,11 +3298,22 @@ export class SyrupBombTag extends BattlerTag {
  */
 export class TelekinesisTag extends BattlerTag {
   constructor(sourceMove: Moves) {
-    super(BattlerTagType.TELEKINESIS, [ BattlerTagLapseType.PRE_MOVE, BattlerTagLapseType.AFTER_MOVE ], 3, sourceMove, undefined, true);
+    super(
+      BattlerTagType.TELEKINESIS,
+      [BattlerTagLapseType.PRE_MOVE, BattlerTagLapseType.AFTER_MOVE],
+      3,
+      sourceMove,
+      undefined,
+      true,
+    );
   }
 
-  override onAdd(pokemon: Pokemon)  {
-    globalScene.queueMessage(i18next.t("battlerTags:telekinesisOnAdd", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
+  override onAdd(pokemon: Pokemon) {
+    globalScene.queueMessage(
+      i18next.t("battlerTags:telekinesisOnAdd", {
+        pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
+      }),
+    );
   }
 }
 
@@ -2895,12 +3328,20 @@ export class PowerTrickTag extends BattlerTag {
 
   onAdd(pokemon: Pokemon): void {
     this.swapStat(pokemon);
-    globalScene.queueMessage(i18next.t("battlerTags:powerTrickActive", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
+    globalScene.queueMessage(
+      i18next.t("battlerTags:powerTrickActive", {
+        pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
+      }),
+    );
   }
 
   onRemove(pokemon: Pokemon): void {
     this.swapStat(pokemon);
-    globalScene.queueMessage(i18next.t("battlerTags:powerTrickActive", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
+    globalScene.queueMessage(
+      i18next.t("battlerTags:powerTrickActive", {
+        pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
+      }),
+    );
   }
 
   /**
@@ -2929,12 +3370,16 @@ export class PowerTrickTag extends BattlerTag {
  */
 export class GrudgeTag extends BattlerTag {
   constructor() {
-    super(BattlerTagType.GRUDGE, [ BattlerTagLapseType.CUSTOM, BattlerTagLapseType.PRE_MOVE ], 1, Moves.GRUDGE);
+    super(BattlerTagType.GRUDGE, [BattlerTagLapseType.CUSTOM, BattlerTagLapseType.PRE_MOVE], 1, Moves.GRUDGE);
   }
 
   onAdd(pokemon: Pokemon) {
     super.onAdd(pokemon);
-    globalScene.queueMessage(i18next.t("battlerTags:grudgeOnAdd", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
+    globalScene.queueMessage(
+      i18next.t("battlerTags:grudgeOnAdd", {
+        pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
+      }),
+    );
   }
 
   /**
@@ -2948,16 +3393,20 @@ export class GrudgeTag extends BattlerTag {
     if (lapseType === BattlerTagLapseType.CUSTOM && sourcePokemon) {
       if (sourcePokemon.isActive() && pokemon.isOpponent(sourcePokemon)) {
         const lastMove = pokemon.turnData.attacksReceived[0];
-        const lastMoveData = sourcePokemon.getMoveset().find(m => m?.moveId === lastMove.move);
+        const lastMoveData = sourcePokemon.getMoveset().find(m => m.moveId === lastMove.move);
         if (lastMoveData && lastMove.move !== Moves.STRUGGLE) {
           lastMoveData.ppUsed = lastMoveData.getMovePp();
-          globalScene.queueMessage(i18next.t("battlerTags:grudgeLapse", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), moveName: lastMoveData.getName() }));
+          globalScene.queueMessage(
+            i18next.t("battlerTags:grudgeLapse", {
+              pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
+              moveName: lastMoveData.getName(),
+            }),
+          );
         }
       }
       return false;
-    } else {
-      return super.lapse(pokemon, lapseType);
     }
+    return super.lapse(pokemon, lapseType);
   }
 }
 
@@ -2983,12 +3432,39 @@ export class PsychoShiftTag extends BattlerTag {
   }
 }
 
+/**
+ * Tag associated with the move Magic Coat.
+ */
+export class MagicCoatTag extends BattlerTag {
+  constructor() {
+    super(BattlerTagType.MAGIC_COAT, BattlerTagLapseType.TURN_END, 1, Moves.MAGIC_COAT);
+  }
+
+  /**
+   * Queues the "[PokemonName] shrouded itself with Magic Coat" message when the tag is added.
+   * @param pokemon - The target {@linkcode Pokemon}
+   */
+  override onAdd(pokemon: Pokemon) {
+    // "{pokemonNameWithAffix} shrouded itself with Magic Coat!"
+    globalScene.queueMessage(
+      i18next.t("battlerTags:magicCoatOnAdd", {
+        pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
+      }),
+    );
+  }
+}
+
 /**
  * Retrieves a {@linkcode BattlerTag} based on the provided tag type, turn count, source move, and source ID.
  * @param sourceId - The ID of the pokemon adding the tag
  * @returns The corresponding {@linkcode BattlerTag} object.
  */
-export function getBattlerTag(tagType: BattlerTagType, turnCount: number, sourceMove: Moves, sourceId: number): BattlerTag {
+export function getBattlerTag(
+  tagType: BattlerTagType,
+  turnCount: number,
+  sourceMove: Moves,
+  sourceId: number,
+): BattlerTag {
   switch (tagType) {
     case BattlerTagType.RECHARGING:
       return new RechargingTag(sourceMove);
@@ -3059,9 +3535,9 @@ export function getBattlerTag(tagType: BattlerTagType, turnCount: number, source
     case BattlerTagType.SILK_TRAP:
       return new ContactStatStageChangeProtectedTag(sourceMove, tagType, Stat.SPD, -1);
     case BattlerTagType.BANEFUL_BUNKER:
-      return new ContactPoisonProtectedTag(sourceMove);
+      return new ContactSetStatusProtectedTag(sourceMove, tagType, StatusEffect.POISON);
     case BattlerTagType.BURNING_BULWARK:
-      return new ContactBurnProtectedTag(sourceMove);
+      return new ContactSetStatusProtectedTag(sourceMove, tagType, StatusEffect.BURN);
     case BattlerTagType.ENDURING:
       return new EnduringTag(tagType, BattlerTagLapseType.TURN_END, sourceMove);
     case BattlerTagType.ENDURE_TOKEN:
@@ -3077,7 +3553,12 @@ export function getBattlerTag(tagType: BattlerTagType, turnCount: number, source
     case BattlerTagType.SLOW_START:
       return new SlowStartTag();
     case BattlerTagType.PROTOSYNTHESIS:
-      return new WeatherHighestStatBoostTag(tagType, Abilities.PROTOSYNTHESIS, WeatherType.SUNNY, WeatherType.HARSH_SUN);
+      return new WeatherHighestStatBoostTag(
+        tagType,
+        Abilities.PROTOSYNTHESIS,
+        WeatherType.SUNNY,
+        WeatherType.HARSH_SUN,
+      );
     case BattlerTagType.QUARK_DRIVE:
       return new TerrainHighestStatBoostTag(tagType, Abilities.QUARK_DRIVE, TerrainType.ELECTRIC);
     case BattlerTagType.FLYING:
@@ -3086,7 +3567,7 @@ export function getBattlerTag(tagType: BattlerTagType, turnCount: number, source
     case BattlerTagType.HIDDEN:
       return new SemiInvulnerableTag(tagType, turnCount, sourceMove);
     case BattlerTagType.FIRE_BOOST:
-      return new TypeBoostTag(tagType, sourceMove, Type.FIRE, 1.5, false);
+      return new TypeBoostTag(tagType, sourceMove, PokemonType.FIRE, 1.5, false);
     case BattlerTagType.CRIT_BOOST:
       return new CritBoostTag(tagType, sourceMove);
     case BattlerTagType.DRAGON_CHEER:
@@ -3112,7 +3593,7 @@ export function getBattlerTag(tagType: BattlerTagType, turnCount: number, source
     case BattlerTagType.CURSED:
       return new CursedTag(sourceId);
     case BattlerTagType.CHARGED:
-      return new TypeBoostTag(tagType, sourceMove, Type.ELECTRIC, 2, true);
+      return new TypeBoostTag(tagType, sourceMove, PokemonType.ELECTRIC, 2, true);
     case BattlerTagType.FLOATING:
       return new FloatingTag(tagType, sourceMove, turnCount);
     case BattlerTagType.MINIMIZED:
@@ -3132,9 +3613,9 @@ export function getBattlerTag(tagType: BattlerTagType, turnCount: number, source
     case BattlerTagType.DISABLED:
       return new DisabledTag(sourceId);
     case BattlerTagType.IGNORE_GHOST:
-      return new ExposedTag(tagType, sourceMove, Type.GHOST, [ Type.NORMAL, Type.FIGHTING ]);
+      return new ExposedTag(tagType, sourceMove, PokemonType.GHOST, [PokemonType.NORMAL, PokemonType.FIGHTING]);
     case BattlerTagType.IGNORE_DARK:
-      return new ExposedTag(tagType, sourceMove, Type.DARK, [ Type.PSYCHIC ]);
+      return new ExposedTag(tagType, sourceMove, PokemonType.DARK, [PokemonType.PSYCHIC]);
     case BattlerTagType.GULP_MISSILE_ARROKUDA:
     case BattlerTagType.GULP_MISSILE_PIKACHU:
       return new GulpMissileTag(tagType, sourceMove);
@@ -3172,6 +3653,8 @@ export function getBattlerTag(tagType: BattlerTagType, turnCount: number, source
       return new GrudgeTag();
     case BattlerTagType.PSYCHO_SHIFT:
       return new PsychoShiftTag();
+    case BattlerTagType.MAGIC_COAT:
+      return new MagicCoatTag();
     case BattlerTagType.NONE:
     default:
       return new BattlerTag(tagType, BattlerTagLapseType.CUSTOM, turnCount, sourceMove, sourceId);
@@ -3179,10 +3662,10 @@ export function getBattlerTag(tagType: BattlerTagType, turnCount: number, source
 }
 
 /**
-* When given a battler tag or json representing one, creates an actual BattlerTag object with the same data.
-* @param {BattlerTag | any} source A battler tag
-* @return {BattlerTag} The valid battler tag
-*/
+ * When given a battler tag or json representing one, creates an actual BattlerTag object with the same data.
+ * @param {BattlerTag | any} source A battler tag
+ * @return {BattlerTag} The valid battler tag
+ */
 export function loadBattlerTag(source: BattlerTag | any): BattlerTag {
   const tag = getBattlerTag(source.tagType, source.turnCount, source.sourceMove, source.sourceId);
   tag.loadTag(source);
@@ -3192,17 +3675,17 @@ export function loadBattlerTag(source: BattlerTag | any): BattlerTag {
 /**
  * Helper function to verify that the current phase is a MoveEffectPhase and provide quick access to commonly used fields
  *
- * @param pokemon {@linkcode Pokemon} The Pokémon used to access the current phase
+ * @param _pokemon {@linkcode Pokemon} The Pokémon used to access the current phase
  * @returns null if current phase is not MoveEffectPhase, otherwise Object containing the {@linkcode MoveEffectPhase}, and its
  * corresponding {@linkcode Move} and user {@linkcode Pokemon}
  */
-function getMoveEffectPhaseData(pokemon: Pokemon): {phase: MoveEffectPhase, attacker: Pokemon, move: Move} | null {
+function getMoveEffectPhaseData(_pokemon: Pokemon): { phase: MoveEffectPhase; attacker: Pokemon; move: Move } | null {
   const phase = globalScene.getCurrentPhase();
   if (phase instanceof MoveEffectPhase) {
     return {
-      phase     : phase,
-      attacker  : phase.getPokemon(),
-      move      : phase.move.getMove()
+      phase: phase,
+      attacker: phase.getPokemon(),
+      move: phase.move,
     };
   }
   return null;
diff --git a/src/data/berry.ts b/src/data/berry.ts
index 06f52b2f38b..ecc3e92ca64 100644
--- a/src/data/berry.ts
+++ b/src/data/berry.ts
@@ -2,8 +2,12 @@ import { getPokemonNameWithAffix } from "../messages";
 import type Pokemon from "../field/pokemon";
 import { HitResult } from "../field/pokemon";
 import { getStatusEffectHealText } from "./status-effect";
-import * as Utils from "../utils";
-import { DoubleBerryEffectAbAttr, PostItemLostAbAttr, ReduceBerryUseThresholdAbAttr, applyAbAttrs, applyPostItemLostAbAttrs } from "./ability";
+import { NumberHolder, toDmgValue, randSeedInt } from "#app/utils/common";
+import {
+  DoubleBerryEffectAbAttr,
+  ReduceBerryUseThresholdAbAttr,
+  applyAbAttrs,
+} from "./abilities/ability";
 import i18next from "i18next";
 import { BattlerTagType } from "#enums/battler-tag-type";
 import { BerryType } from "#enums/berry-type";
@@ -29,14 +33,15 @@ export function getBerryPredicate(berryType: BerryType): BerryPredicate {
     case BerryType.LUM:
       return (pokemon: Pokemon) => !!pokemon.status || !!pokemon.getTag(BattlerTagType.CONFUSED);
     case BerryType.ENIGMA:
-      return (pokemon: Pokemon) => !!pokemon.turnData.attacksReceived.filter(a => a.result === HitResult.SUPER_EFFECTIVE).length;
+      return (pokemon: Pokemon) =>
+        !!pokemon.turnData.attacksReceived.filter(a => a.result === HitResult.SUPER_EFFECTIVE).length;
     case BerryType.LIECHI:
     case BerryType.GANLON:
     case BerryType.PETAYA:
     case BerryType.APICOT:
     case BerryType.SALAC:
       return (pokemon: Pokemon) => {
-        const threshold = new Utils.NumberHolder(0.25);
+        const threshold = new NumberHolder(0.25);
         // Offset BerryType such that LIECHI -> Stat.ATK = 1, GANLON -> Stat.DEF = 2, so on and so forth
         const stat: BattleStat = berryType - BerryType.ENIGMA;
         applyAbAttrs(ReduceBerryUseThresholdAbAttr, pokemon, null, false, threshold);
@@ -44,99 +49,113 @@ export function getBerryPredicate(berryType: BerryType): BerryPredicate {
       };
     case BerryType.LANSAT:
       return (pokemon: Pokemon) => {
-        const threshold = new Utils.NumberHolder(0.25);
+        const threshold = new NumberHolder(0.25);
         applyAbAttrs(ReduceBerryUseThresholdAbAttr, pokemon, null, false, threshold);
         return pokemon.getHpRatio() < 0.25 && !pokemon.getTag(BattlerTagType.CRIT_BOOST);
       };
     case BerryType.STARF:
       return (pokemon: Pokemon) => {
-        const threshold = new Utils.NumberHolder(0.25);
+        const threshold = new NumberHolder(0.25);
         applyAbAttrs(ReduceBerryUseThresholdAbAttr, pokemon, null, false, threshold);
         return pokemon.getHpRatio() < 0.25;
       };
     case BerryType.LEPPA:
       return (pokemon: Pokemon) => {
-        const threshold = new Utils.NumberHolder(0.25);
+        const threshold = new NumberHolder(0.25);
         applyAbAttrs(ReduceBerryUseThresholdAbAttr, pokemon, null, false, threshold);
-        return !!pokemon.getMoveset().find(m => !m?.getPpRatio());
+        return !!pokemon.getMoveset().find(m => !m.getPpRatio());
       };
   }
 }
 
-export type BerryEffectFunc = (pokemon: Pokemon, berryOwner?: Pokemon) => void;
+export type BerryEffectFunc = (consumer: Pokemon) => void;
 
 export function getBerryEffectFunc(berryType: BerryType): BerryEffectFunc {
-  switch (berryType) {
-    case BerryType.SITRUS:
-    case BerryType.ENIGMA:
-      return (pokemon: Pokemon, berryOwner?: Pokemon) => {
-        if (pokemon.battleData) {
-          pokemon.battleData.berriesEaten.push(berryType);
+  return (consumer: Pokemon) => {
+    // Apply an effect pertaining to what berry we're using
+    switch (berryType) {
+      case BerryType.SITRUS:
+      case BerryType.ENIGMA:
+        {
+          const hpHealed = new NumberHolder(toDmgValue(consumer.getMaxHp() / 4));
+          applyAbAttrs(DoubleBerryEffectAbAttr, consumer, null, false, hpHealed);
+          globalScene.unshiftPhase(
+            new PokemonHealPhase(
+              consumer.getBattlerIndex(),
+              hpHealed.value,
+              i18next.t("battle:hpHealBerry", {
+                pokemonNameWithAffix: getPokemonNameWithAffix(consumer),
+                berryName: getBerryName(berryType),
+              }),
+              true,
+            ),
+          );
         }
-        const hpHealed = new Utils.NumberHolder(Utils.toDmgValue(pokemon.getMaxHp() / 4));
-        applyAbAttrs(DoubleBerryEffectAbAttr, pokemon, null, false, hpHealed);
-        globalScene.unshiftPhase(new PokemonHealPhase(pokemon.getBattlerIndex(),
-          hpHealed.value, i18next.t("battle:hpHealBerry", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), berryName: getBerryName(berryType) }), true));
-        applyPostItemLostAbAttrs(PostItemLostAbAttr, berryOwner ?? pokemon, false);
-      };
-    case BerryType.LUM:
-      return (pokemon: Pokemon, berryOwner?: Pokemon) => {
-        if (pokemon.battleData) {
-          pokemon.battleData.berriesEaten.push(berryType);
+        break;
+      case BerryType.LUM:
+        {
+          if (consumer.status) {
+            globalScene.queueMessage(
+              getStatusEffectHealText(consumer.status.effect, getPokemonNameWithAffix(consumer)),
+            );
+          }
+          consumer.resetStatus(true, true);
+          consumer.updateInfo();
         }
-        if (pokemon.status) {
-          globalScene.queueMessage(getStatusEffectHealText(pokemon.status.effect, getPokemonNameWithAffix(pokemon)));
+        break;
+      case BerryType.LIECHI:
+      case BerryType.GANLON:
+      case BerryType.PETAYA:
+      case BerryType.APICOT:
+      case BerryType.SALAC:
+        {
+          // Offset BerryType such that LIECHI --> Stat.ATK = 1, GANLON --> Stat.DEF = 2, etc etc.
+          const stat: BattleStat = berryType - BerryType.ENIGMA;
+          const statStages = new NumberHolder(1);
+          applyAbAttrs(DoubleBerryEffectAbAttr, consumer, null, false, statStages);
+          globalScene.unshiftPhase(
+            new StatStageChangePhase(consumer.getBattlerIndex(), true, [stat], statStages.value),
+          );
         }
-        pokemon.resetStatus(true, true);
-        pokemon.updateInfo();
-        applyPostItemLostAbAttrs(PostItemLostAbAttr, berryOwner ?? pokemon, false);
-      };
-    case BerryType.LIECHI:
-    case BerryType.GANLON:
-    case BerryType.PETAYA:
-    case BerryType.APICOT:
-    case BerryType.SALAC:
-      return (pokemon: Pokemon, berryOwner?: Pokemon) => {
-        if (pokemon.battleData) {
-          pokemon.battleData.berriesEaten.push(berryType);
+        break;
+
+      case BerryType.LANSAT:
+        {
+          consumer.addTag(BattlerTagType.CRIT_BOOST);
         }
-        // Offset BerryType such that LIECHI -> Stat.ATK = 1, GANLON -> Stat.DEF = 2, so on and so forth
-        const stat: BattleStat = berryType - BerryType.ENIGMA;
-        const statStages = new Utils.NumberHolder(1);
-        applyAbAttrs(DoubleBerryEffectAbAttr, pokemon, null, false, statStages);
-        globalScene.unshiftPhase(new StatStageChangePhase(pokemon.getBattlerIndex(), true, [ stat ], statStages.value));
-        applyPostItemLostAbAttrs(PostItemLostAbAttr, berryOwner ?? pokemon, false);
-      };
-    case BerryType.LANSAT:
-      return (pokemon: Pokemon, berryOwner?: Pokemon) => {
-        if (pokemon.battleData) {
-          pokemon.battleData.berriesEaten.push(berryType);
+        break;
+
+      case BerryType.STARF:
+        {
+          const randStat = randSeedInt(Stat.SPD, Stat.ATK);
+          const stages = new NumberHolder(2);
+          applyAbAttrs(DoubleBerryEffectAbAttr, consumer, null, false, stages);
+          globalScene.unshiftPhase(
+            new StatStageChangePhase(consumer.getBattlerIndex(), true, [randStat], stages.value),
+          );
         }
-        pokemon.addTag(BattlerTagType.CRIT_BOOST);
-        applyPostItemLostAbAttrs(PostItemLostAbAttr, berryOwner ?? pokemon, false);
-      };
-    case BerryType.STARF:
-      return (pokemon: Pokemon, berryOwner?: Pokemon) => {
-        if (pokemon.battleData) {
-          pokemon.battleData.berriesEaten.push(berryType);
+        break;
+
+      case BerryType.LEPPA:
+        {
+          // Pick the first move completely out of PP, or else the first one that has any PP missing
+          const ppRestoreMove =
+            consumer.getMoveset().find(m => m.ppUsed === m.getMovePp()) ??
+            consumer.getMoveset().find(m => m.ppUsed < m.getMovePp());
+          if (ppRestoreMove) {
+            ppRestoreMove.ppUsed = Math.max(ppRestoreMove.ppUsed - 10, 0);
+            globalScene.queueMessage(
+              i18next.t("battle:ppHealBerry", {
+                pokemonNameWithAffix: getPokemonNameWithAffix(consumer),
+                moveName: ppRestoreMove.getName(),
+                berryName: getBerryName(berryType),
+              }),
+            );
+          }
         }
-        const randStat = Utils.randSeedInt(Stat.SPD, Stat.ATK);
-        const stages = new Utils.NumberHolder(2);
-        applyAbAttrs(DoubleBerryEffectAbAttr, pokemon, null, false, stages);
-        globalScene.unshiftPhase(new StatStageChangePhase(pokemon.getBattlerIndex(), true, [ randStat ], stages.value));
-        applyPostItemLostAbAttrs(PostItemLostAbAttr, berryOwner ?? pokemon, false);
-      };
-    case BerryType.LEPPA:
-      return (pokemon: Pokemon, berryOwner?: Pokemon) => {
-        if (pokemon.battleData) {
-          pokemon.battleData.berriesEaten.push(berryType);
-        }
-        const ppRestoreMove = pokemon.getMoveset().find(m => !m?.getPpRatio()) ? pokemon.getMoveset().find(m => !m?.getPpRatio()) : pokemon.getMoveset().find(m => m!.getPpRatio() < 1); // TODO: is this bang correct?
-        if (ppRestoreMove !== undefined) {
-        ppRestoreMove!.ppUsed = Math.max(ppRestoreMove!.ppUsed - 10, 0);
-        globalScene.queueMessage(i18next.t("battle:ppHealBerry", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), moveName: ppRestoreMove!.getName(), berryName: getBerryName(berryType) }));
-        applyPostItemLostAbAttrs(PostItemLostAbAttr, berryOwner ?? pokemon, false);
-        }
-      };
-  }
+        break;
+      default:
+        console.error("Incorrect BerryType %d passed to GetBerryEffectFunc", berryType);
+    }
+  };
 }
diff --git a/src/data/challenge.ts b/src/data/challenge.ts
index 10fb9c55d3d..b4b8db2cc10 100644
--- a/src/data/challenge.ts
+++ b/src/data/challenge.ts
@@ -1,4 +1,5 @@
-import * as Utils from "#app/utils";
+import { BooleanHolder, type NumberHolder, randSeedItem } from "#app/utils/common";
+import { deepCopy } from "#app/utils/data";
 import i18next from "i18next";
 import type { DexAttrProps, GameData } from "#app/system/game-data";
 import { defaultStarterSpecies } from "#app/system/game-data";
@@ -8,19 +9,21 @@ import { speciesStarterCosts } from "#app/data/balance/starters";
 import type Pokemon from "#app/field/pokemon";
 import { PokemonMove } from "#app/field/pokemon";
 import type { FixedBattleConfig } from "#app/battle";
-import { ClassicFixedBossWaves, BattleType, getRandomTrainerFunc } from "#app/battle";
+import { getRandomTrainerFunc } from "#app/battle";
+import { ClassicFixedBossWaves } from "#enums/fixed-boss-waves";
+import { BattleType } from "#enums/battle-type";
 import Trainer, { TrainerVariant } from "#app/field/trainer";
-import type { GameMode } from "#app/game-mode";
-import { Type } from "#enums/type";
+import { PokemonType } from "#enums/pokemon-type";
 import { Challenges } from "#enums/challenges";
 import { Species } from "#enums/species";
 import { TrainerType } from "#enums/trainer-type";
 import { Nature } from "#enums/nature";
 import type { Moves } from "#enums/moves";
 import { TypeColor, TypeShadow } from "#enums/color";
-import { pokemonEvolutions } from "#app/data/balance/pokemon-evolutions";
-import { pokemonFormChanges } from "#app/data/pokemon-forms";
 import { ModifierTier } from "#app/modifier/modifier-tier";
+import { globalScene } from "#app/global-scene";
+import { pokemonFormChanges } from "./pokemon-forms";
+import { pokemonEvolutions } from "./balance/pokemon-evolutions";
 
 /** A constant for the default max cost of the starting party before a run */
 const DEFAULT_PARTY_MAX_COST = 10;
@@ -33,37 +36,37 @@ export enum ChallengeType {
   /**
    * Challenges which modify what starters you can choose
    * @see {@link Challenge.applyStarterChoice}
-  */
+   */
   STARTER_CHOICE,
   /**
    * Challenges which modify how many starter points you have
    * @see {@link Challenge.applyStarterPoints}
-  */
+   */
   STARTER_POINTS,
   /**
    * Challenges which modify how many starter points you have
    * @see {@link Challenge.applyStarterPointCost}
-  */
+   */
   STARTER_COST,
   /**
    * Challenges which modify your starters in some way
    * @see {@link Challenge.applyStarterModify}
-  */
+   */
   STARTER_MODIFY,
   /**
    * Challenges which limit which pokemon you can have in battle.
    * @see {@link Challenge.applyPokemonInBattle}
-  */
+   */
   POKEMON_IN_BATTLE,
   /**
    * Adds or modifies the fixed battles in a run
    * @see {@link Challenge.applyFixedBattle}
-  */
+   */
   FIXED_BATTLES,
   /**
    * Modifies the effectiveness of Type matchups in battle
    * @see {@linkcode Challenge.applyTypeEffectiveness}
-  */
+   */
   TYPE_EFFECTIVENESS,
   /**
    * Modifies what level the AI pokemon are. UNIMPLEMENTED.
@@ -93,7 +96,6 @@ export enum ChallengeType {
    * Modifies what the pokemon stats for Flip Stat Mode.
    */
   FLIP_STAT,
-
 }
 
 /**
@@ -106,7 +108,7 @@ export enum MoveSourceType {
   GREAT_TM,
   ULTRA_TM,
   COMMON_EGG,
-  RARE_EGG
+  RARE_EGG,
 }
 
 /**
@@ -148,7 +150,10 @@ export abstract class Challenge {
    * @returns {@link string} The i18n key for this challenge
    */
   geti18nKey(): string {
-    return Challenges[this.id].split("_").map((f, i) => i ? `${f[0]}${f.slice(1).toLowerCase()}` : f.toLowerCase()).join("");
+    return Challenges[this.id]
+      .split("_")
+      .map((f, i) => (i ? `${f[0]}${f.slice(1).toLowerCase()}` : f.toLowerCase()))
+      .join("");
   }
 
   /**
@@ -195,7 +200,7 @@ export abstract class Challenge {
    */
   getDescription(overrideValue?: number): string {
     const value = overrideValue ?? this.value;
-    return `${i18next.t([ `challenges:${this.geti18nKey()}.desc.${value}`, `challenges:${this.geti18nKey()}.desc` ])}`;
+    return `${i18next.t([`challenges:${this.geti18nKey()}.desc.${value}`, `challenges:${this.geti18nKey()}.desc`])}`;
   }
 
   /**
@@ -274,151 +279,149 @@ export abstract class Challenge {
    * @param source The source challenge or json.
    * @returns This challenge.
    */
-  static loadChallenge(source: Challenge | any): Challenge {
+  static loadChallenge(_source: Challenge | any): Challenge {
     throw new Error("Method not implemented! Use derived class");
   }
 
   /**
    * An apply function for STARTER_CHOICE challenges. Derived classes should alter this.
-   * @param pokemon {@link PokemonSpecies} The pokemon to check the validity of.
-   * @param valid {@link Utils.BooleanHolder} A BooleanHolder, the value gets set to false if the pokemon isn't allowed.
-   * @param dexAttr {@link DexAttrProps} The dex attributes of the pokemon.
-   * @param soft {@link boolean} If true, allow it if it could become a valid pokemon.
+   * @param _pokemon {@link PokemonSpecies} The pokemon to check the validity of.
+   * @param _valid {@link BooleanHolder} A BooleanHolder, the value gets set to false if the pokemon isn't allowed.
+   * @param _dexAttr {@link DexAttrProps} The dex attributes of the pokemon.
    * @returns {@link boolean} Whether this function did anything.
    */
-  applyStarterChoice(pokemon: PokemonSpecies, valid: Utils.BooleanHolder, dexAttr: DexAttrProps, soft: boolean = false): boolean {
+  applyStarterChoice(_pokemon: PokemonSpecies, _valid: BooleanHolder, _dexAttr: DexAttrProps): boolean {
     return false;
   }
 
   /**
    * An apply function for STARTER_POINTS challenges. Derived classes should alter this.
-   * @param points {@link Utils.NumberHolder} The amount of points you have available.
+   * @param _points {@link NumberHolder} The amount of points you have available.
    * @returns {@link boolean} Whether this function did anything.
    */
-  applyStarterPoints(points: Utils.NumberHolder): boolean {
+  applyStarterPoints(_points: NumberHolder): boolean {
     return false;
   }
 
   /**
    * An apply function for STARTER_COST challenges. Derived classes should alter this.
-   * @param species {@link Species} The pokemon to change the cost of.
-   * @param cost {@link Utils.NumberHolder} The cost of the starter.
+   * @param _species {@link Species} The pokemon to change the cost of.
+   * @param _cost {@link NumberHolder} The cost of the starter.
    * @returns {@link boolean} Whether this function did anything.
    */
-  applyStarterCost(species: Species, cost: Utils.NumberHolder): boolean {
+  applyStarterCost(_species: Species, _cost: NumberHolder): boolean {
     return false;
   }
 
   /**
    * An apply function for STARTER_MODIFY challenges. Derived classes should alter this.
-   * @param pokemon {@link Pokemon} The starter pokemon to modify.
+   * @param _pokemon {@link Pokemon} The starter pokemon to modify.
    * @returns {@link boolean} Whether this function did anything.
    */
-  applyStarterModify(pokemon: Pokemon): boolean {
+  applyStarterModify(_pokemon: Pokemon): boolean {
     return false;
   }
 
   /**
    * An apply function for POKEMON_IN_BATTLE challenges. Derived classes should alter this.
-   * @param pokemon {@link Pokemon} The pokemon to check the validity of.
-   * @param valid {@link Utils.BooleanHolder} A BooleanHolder, the value gets set to false if the pokemon isn't allowed.
+   * @param _pokemon {@link Pokemon} The pokemon to check the validity of.
+   * @param _valid {@link BooleanHolder} A BooleanHolder, the value gets set to false if the pokemon isn't allowed.
    * @returns {@link boolean} Whether this function did anything.
    */
-  applyPokemonInBattle(pokemon: Pokemon, valid: Utils.BooleanHolder): boolean {
+  applyPokemonInBattle(_pokemon: Pokemon, _valid: BooleanHolder): boolean {
     return false;
   }
 
   /**
    * An apply function for FIXED_BATTLE challenges. Derived classes should alter this.
-   * @param waveIndex {@link Number} The current wave index.
-   * @param battleConfig {@link FixedBattleConfig} The battle config to modify.
+   * @param _waveIndex {@link Number} The current wave index.
+   * @param _battleConfig {@link FixedBattleConfig} The battle config to modify.
    * @returns {@link boolean} Whether this function did anything.
    */
-  applyFixedBattle(waveIndex: Number, battleConfig: FixedBattleConfig): boolean {
+  applyFixedBattle(_waveIndex: number, _battleConfig: FixedBattleConfig): boolean {
     return false;
   }
 
   /**
    * An apply function for TYPE_EFFECTIVENESS challenges. Derived classes should alter this.
-   * @param effectiveness {@linkcode Utils.NumberHolder} The current effectiveness of the move.
+   * @param _effectiveness {@linkcode NumberHolder} The current effectiveness of the move.
    * @returns Whether this function did anything.
    */
-  applyTypeEffectiveness(effectiveness: Utils.NumberHolder): boolean {
+  applyTypeEffectiveness(_effectiveness: NumberHolder): boolean {
     return false;
   }
 
   /**
    * An apply function for AI_LEVEL challenges. Derived classes should alter this.
-   * @param level {@link Utils.IntegerHolder} The generated level.
-   * @param levelCap {@link Number} The current level cap.
-   * @param isTrainer {@link Boolean} Whether this is a trainer pokemon.
-   * @param isBoss {@link Boolean} Whether this is a non-trainer boss pokemon.
+   * @param _level {@link NumberHolder} The generated level.
+   * @param _levelCap {@link Number} The current level cap.
+   * @param _isTrainer {@link Boolean} Whether this is a trainer pokemon.
+   * @param _isBoss {@link Boolean} Whether this is a non-trainer boss pokemon.
    * @returns {@link boolean} Whether this function did anything.
    */
-  applyLevelChange(level: Utils.IntegerHolder, levelCap: number, isTrainer: boolean, isBoss: boolean): boolean {
+  applyLevelChange(_level: NumberHolder, _levelCap: number, _isTrainer: boolean, _isBoss: boolean): boolean {
     return false;
   }
 
   /**
    * An apply function for AI_MOVE_SLOTS challenges. Derived classes should alter this.
    * @param pokemon {@link Pokemon} The pokemon that is being considered.
-   * @param moveSlots {@link Utils.IntegerHolder} The amount of move slots.
+   * @param moveSlots {@link NumberHolder} The amount of move slots.
    * @returns {@link boolean} Whether this function did anything.
    */
-  applyMoveSlot(pokemon: Pokemon, moveSlots: Utils.IntegerHolder): boolean {
+  applyMoveSlot(_pokemon: Pokemon, _moveSlots: NumberHolder): boolean {
     return false;
   }
 
   /**
    * An apply function for PASSIVE_ACCESS challenges. Derived classes should alter this.
    * @param pokemon {@link Pokemon} The pokemon to change.
-   * @param hasPassive {@link Utils.BooleanHolder} Whether it should have its passive.
+   * @param hasPassive {@link BooleanHolder} Whether it should have its passive.
    * @returns {@link boolean} Whether this function did anything.
    */
-  applyPassiveAccess(pokemon: Pokemon, hasPassive: Utils.BooleanHolder): boolean {
+  applyPassiveAccess(_pokemon: Pokemon, _hasPassive: BooleanHolder): boolean {
     return false;
   }
 
   /**
    * An apply function for GAME_MODE_MODIFY challenges. Derived classes should alter this.
-   * @param gameMode {@link GameMode} The current game mode.
    * @returns {@link boolean} Whether this function did anything.
    */
-  applyGameModeModify(gameMode: GameMode): boolean {
+  applyGameModeModify(): boolean {
     return false;
   }
 
   /**
    * An apply function for MOVE_ACCESS. Derived classes should alter this.
-   * @param pokemon {@link Pokemon} What pokemon would learn the move.
-   * @param moveSource {@link MoveSourceType} What source the pokemon would get the move from.
-   * @param move {@link Moves} The move in question.
-   * @param level {@link Utils.IntegerHolder} The level threshold for access.
+   * @param _pokemon {@link Pokemon} What pokemon would learn the move.
+   * @param _moveSource {@link MoveSourceType} What source the pokemon would get the move from.
+   * @param _move {@link Moves} The move in question.
+   * @param _level {@link NumberHolder} The level threshold for access.
    * @returns {@link boolean} Whether this function did anything.
    */
-  applyMoveAccessLevel(pokemon: Pokemon, moveSource: MoveSourceType, move: Moves, level: Utils.IntegerHolder): boolean {
+  applyMoveAccessLevel(_pokemon: Pokemon, _moveSource: MoveSourceType, _move: Moves, _level: NumberHolder): boolean {
     return false;
   }
 
   /**
    * An apply function for MOVE_WEIGHT. Derived classes should alter this.
-   * @param pokemon {@link Pokemon} What pokemon would learn the move.
-   * @param moveSource {@link MoveSourceType} What source the pokemon would get the move from.
-   * @param move {@link Moves} The move in question.
-   * @param weight {@link Utils.IntegerHolder} The base weight of the move
+   * @param _pokemon {@link Pokemon} What pokemon would learn the move.
+   * @param _moveSource {@link MoveSourceType} What source the pokemon would get the move from.
+   * @param _move {@link Moves} The move in question.
+   * @param _weight {@link NumberHolder} The base weight of the move
    * @returns {@link boolean} Whether this function did anything.
    */
-  applyMoveWeight(pokemon: Pokemon, moveSource: MoveSourceType, move: Moves, level: Utils.IntegerHolder): boolean {
+  applyMoveWeight(_pokemon: Pokemon, _moveSource: MoveSourceType, _move: Moves, _level: NumberHolder): boolean {
     return false;
   }
 
   /**
    * An apply function for FlipStats. Derived classes should alter this.
-   * @param pokemon {@link Pokemon} What pokemon would learn the move.
-   * @param baseStats  What are the stats to flip.
+   * @param _pokemon {@link Pokemon} What pokemon would learn the move.
+   * @param _baseStats  What are the stats to flip.
    * @returns {@link boolean} Whether this function did anything.
    */
-  applyFlipStat(pokemon: Pokemon, baseStats: number[]) {
+  applyFlipStat(_pokemon: Pokemon, _baseStats: number[]) {
     return false;
   }
 }
@@ -433,32 +436,21 @@ export class SingleGenerationChallenge extends Challenge {
     super(Challenges.SINGLE_GENERATION, 9);
   }
 
-  applyStarterChoice(pokemon: PokemonSpecies, valid: Utils.BooleanHolder, dexAttr: DexAttrProps, soft: boolean = false): boolean {
-    const generations = [ pokemon.generation ];
-    if (soft) {
-      const speciesToCheck = [ pokemon.speciesId ];
-      while (speciesToCheck.length) {
-        const checking = speciesToCheck.pop();
-        if (checking && pokemonEvolutions.hasOwnProperty(checking)) {
-          pokemonEvolutions[checking].forEach(e => {
-            speciesToCheck.push(e.speciesId);
-            generations.push(getPokemonSpecies(e.speciesId).generation);
-          });
-        }
-      }
-    }
-
-    if (!generations.includes(this.value)) {
+  applyStarterChoice(pokemon: PokemonSpecies, valid: BooleanHolder): boolean {
+    if (pokemon.generation !== this.value) {
       valid.value = false;
       return true;
     }
     return false;
   }
 
-  applyPokemonInBattle(pokemon: Pokemon, valid: Utils.BooleanHolder): boolean {
-    const baseGeneration = pokemon.species.speciesId === Species.VICTINI ? 5 : getPokemonSpecies(pokemon.species.speciesId).generation;
-    const fusionGeneration = pokemon.isFusion() ? pokemon.fusionSpecies?.speciesId === Species.VICTINI ? 5 : getPokemonSpecies(pokemon.fusionSpecies!.speciesId).generation : 0; // TODO: is the bang on fusionSpecies correct?
-    if (pokemon.isPlayer() && (baseGeneration !== this.value || (pokemon.isFusion() && fusionGeneration !== this.value))) {
+  applyPokemonInBattle(pokemon: Pokemon, valid: BooleanHolder): boolean {
+    const baseGeneration = getPokemonSpecies(pokemon.species.speciesId).generation;
+    const fusionGeneration = pokemon.isFusion() ? getPokemonSpecies(pokemon.fusionSpecies!.speciesId).generation : 0;
+    if (
+      pokemon.isPlayer() &&
+      (baseGeneration !== this.value || (pokemon.isFusion() && fusionGeneration !== this.value))
+    ) {
       valid.value = false;
       return true;
     }
@@ -467,11 +459,63 @@ export class SingleGenerationChallenge extends Challenge {
 
   applyFixedBattle(waveIndex: number, battleConfig: FixedBattleConfig): boolean {
     let trainerTypes: (TrainerType | TrainerType[])[] = [];
-    const evilTeamWaves: number[] = [ ClassicFixedBossWaves.EVIL_GRUNT_1, ClassicFixedBossWaves.EVIL_GRUNT_2, ClassicFixedBossWaves.EVIL_GRUNT_3, ClassicFixedBossWaves.EVIL_ADMIN_1, ClassicFixedBossWaves.EVIL_GRUNT_4, ClassicFixedBossWaves.EVIL_ADMIN_2, ClassicFixedBossWaves.EVIL_BOSS_1, ClassicFixedBossWaves.EVIL_BOSS_2 ];
-    const evilTeamGrunts = [[ TrainerType.ROCKET_GRUNT ], [ TrainerType.ROCKET_GRUNT ], [ TrainerType.MAGMA_GRUNT, TrainerType.AQUA_GRUNT ], [ TrainerType.GALACTIC_GRUNT ], [ TrainerType.PLASMA_GRUNT ], [ TrainerType.FLARE_GRUNT ], [ TrainerType.AETHER_GRUNT, TrainerType.SKULL_GRUNT ], [ TrainerType.MACRO_GRUNT ], [ TrainerType.STAR_GRUNT ]];
-    const evilTeamAdmins = [[ TrainerType.ARCHER, TrainerType.ARIANA, TrainerType.PROTON, TrainerType.PETREL ], [ TrainerType.ARCHER, TrainerType.ARIANA, TrainerType.PROTON, TrainerType.PETREL ], [[ TrainerType.TABITHA, TrainerType.COURTNEY ], [ TrainerType.MATT, TrainerType.SHELLY ]], [ TrainerType.JUPITER, TrainerType.MARS, TrainerType.SATURN ], [ TrainerType.ZINZOLIN, TrainerType.COLRESS ], [ TrainerType.XEROSIC, TrainerType.BRYONY ], [ TrainerType.FABA, TrainerType.PLUMERIA ], [ TrainerType.OLEANA ], [ TrainerType.GIACOMO, TrainerType.MELA, TrainerType.ATTICUS, TrainerType.ORTEGA, TrainerType.ERI ]];
-    const evilTeamBosses = [[ TrainerType.ROCKET_BOSS_GIOVANNI_1 ], [ TrainerType.ROCKET_BOSS_GIOVANNI_1 ], [ TrainerType.MAXIE, TrainerType.ARCHIE ], [ TrainerType.CYRUS ], [ TrainerType.GHETSIS ], [ TrainerType.LYSANDRE ], [ TrainerType.LUSAMINE, TrainerType.GUZMA ], [ TrainerType.ROSE ], [ TrainerType.PENNY ]];
-    const evilTeamBossRematches = [[ TrainerType.ROCKET_BOSS_GIOVANNI_2 ], [ TrainerType.ROCKET_BOSS_GIOVANNI_2 ], [ TrainerType.MAXIE_2, TrainerType.ARCHIE_2 ], [ TrainerType.CYRUS_2 ], [ TrainerType.GHETSIS_2 ], [ TrainerType.LYSANDRE_2 ], [ TrainerType.LUSAMINE_2, TrainerType.GUZMA_2 ], [ TrainerType.ROSE_2 ], [ TrainerType.PENNY_2 ]];
+    const evilTeamWaves: number[] = [
+      ClassicFixedBossWaves.EVIL_GRUNT_1,
+      ClassicFixedBossWaves.EVIL_GRUNT_2,
+      ClassicFixedBossWaves.EVIL_GRUNT_3,
+      ClassicFixedBossWaves.EVIL_ADMIN_1,
+      ClassicFixedBossWaves.EVIL_GRUNT_4,
+      ClassicFixedBossWaves.EVIL_ADMIN_2,
+      ClassicFixedBossWaves.EVIL_BOSS_1,
+      ClassicFixedBossWaves.EVIL_BOSS_2,
+    ];
+    const evilTeamGrunts = [
+      [TrainerType.ROCKET_GRUNT],
+      [TrainerType.ROCKET_GRUNT],
+      [TrainerType.MAGMA_GRUNT, TrainerType.AQUA_GRUNT],
+      [TrainerType.GALACTIC_GRUNT],
+      [TrainerType.PLASMA_GRUNT],
+      [TrainerType.FLARE_GRUNT],
+      [TrainerType.AETHER_GRUNT, TrainerType.SKULL_GRUNT],
+      [TrainerType.MACRO_GRUNT],
+      [TrainerType.STAR_GRUNT],
+    ];
+    const evilTeamAdmins = [
+      [TrainerType.ARCHER, TrainerType.ARIANA, TrainerType.PROTON, TrainerType.PETREL],
+      [TrainerType.ARCHER, TrainerType.ARIANA, TrainerType.PROTON, TrainerType.PETREL],
+      [
+        [TrainerType.TABITHA, TrainerType.COURTNEY],
+        [TrainerType.MATT, TrainerType.SHELLY],
+      ],
+      [TrainerType.JUPITER, TrainerType.MARS, TrainerType.SATURN],
+      [TrainerType.ZINZOLIN, TrainerType.COLRESS],
+      [TrainerType.XEROSIC, TrainerType.BRYONY],
+      [TrainerType.FABA, TrainerType.PLUMERIA],
+      [TrainerType.OLEANA],
+      [TrainerType.GIACOMO, TrainerType.MELA, TrainerType.ATTICUS, TrainerType.ORTEGA, TrainerType.ERI],
+    ];
+    const evilTeamBosses = [
+      [TrainerType.ROCKET_BOSS_GIOVANNI_1],
+      [TrainerType.ROCKET_BOSS_GIOVANNI_1],
+      [TrainerType.MAXIE, TrainerType.ARCHIE],
+      [TrainerType.CYRUS],
+      [TrainerType.GHETSIS],
+      [TrainerType.LYSANDRE],
+      [TrainerType.LUSAMINE, TrainerType.GUZMA],
+      [TrainerType.ROSE],
+      [TrainerType.PENNY],
+    ];
+    const evilTeamBossRematches = [
+      [TrainerType.ROCKET_BOSS_GIOVANNI_2],
+      [TrainerType.ROCKET_BOSS_GIOVANNI_2],
+      [TrainerType.MAXIE_2, TrainerType.ARCHIE_2],
+      [TrainerType.CYRUS_2],
+      [TrainerType.GHETSIS_2],
+      [TrainerType.LYSANDRE_2],
+      [TrainerType.LUSAMINE_2, TrainerType.GUZMA_2],
+      [TrainerType.ROSE_2],
+      [TrainerType.PENNY_2],
+    ];
     switch (waveIndex) {
       case ClassicFixedBossWaves.EVIL_GRUNT_1:
         trainerTypes = evilTeamGrunts[this.value - 1];
@@ -488,42 +532,123 @@ export class SingleGenerationChallenge extends Challenge {
         break;
       case ClassicFixedBossWaves.EVIL_BOSS_1:
         trainerTypes = evilTeamBosses[this.value - 1];
-        battleConfig.setBattleType(BattleType.TRAINER).setSeedOffsetWave(ClassicFixedBossWaves.EVIL_GRUNT_1).setGetTrainerFunc(getRandomTrainerFunc(trainerTypes, true))
-          .setCustomModifierRewards({ guaranteedModifierTiers: [ ModifierTier.ROGUE, ModifierTier.ROGUE, ModifierTier.ULTRA, ModifierTier.ULTRA, ModifierTier.ULTRA ], allowLuckUpgrades: false });
+        battleConfig
+          .setBattleType(BattleType.TRAINER)
+          .setSeedOffsetWave(ClassicFixedBossWaves.EVIL_GRUNT_1)
+          .setGetTrainerFunc(getRandomTrainerFunc(trainerTypes, true))
+          .setCustomModifierRewards({
+            guaranteedModifierTiers: [
+              ModifierTier.ROGUE,
+              ModifierTier.ROGUE,
+              ModifierTier.ULTRA,
+              ModifierTier.ULTRA,
+              ModifierTier.ULTRA,
+            ],
+            allowLuckUpgrades: false,
+          });
         return true;
       case ClassicFixedBossWaves.EVIL_BOSS_2:
         trainerTypes = evilTeamBossRematches[this.value - 1];
-        battleConfig.setBattleType(BattleType.TRAINER).setSeedOffsetWave(ClassicFixedBossWaves.EVIL_GRUNT_1).setGetTrainerFunc(getRandomTrainerFunc(trainerTypes, true))
-          .setCustomModifierRewards({ guaranteedModifierTiers: [ ModifierTier.ROGUE, ModifierTier.ROGUE, ModifierTier.ULTRA, ModifierTier.ULTRA, ModifierTier.ULTRA, ModifierTier.ULTRA ], allowLuckUpgrades: false });
+        battleConfig
+          .setBattleType(BattleType.TRAINER)
+          .setSeedOffsetWave(ClassicFixedBossWaves.EVIL_GRUNT_1)
+          .setGetTrainerFunc(getRandomTrainerFunc(trainerTypes, true))
+          .setCustomModifierRewards({
+            guaranteedModifierTiers: [
+              ModifierTier.ROGUE,
+              ModifierTier.ROGUE,
+              ModifierTier.ULTRA,
+              ModifierTier.ULTRA,
+              ModifierTier.ULTRA,
+              ModifierTier.ULTRA,
+            ],
+            allowLuckUpgrades: false,
+          });
         return true;
       case ClassicFixedBossWaves.ELITE_FOUR_1:
-        trainerTypes = [ TrainerType.LORELEI, TrainerType.WILL, TrainerType.SIDNEY, TrainerType.AARON, TrainerType.SHAUNTAL, TrainerType.MALVA, Utils.randSeedItem([ TrainerType.HALA, TrainerType.MOLAYNE ]), TrainerType.MARNIE_ELITE, TrainerType.RIKA ];
+        trainerTypes = [
+          TrainerType.LORELEI,
+          TrainerType.WILL,
+          TrainerType.SIDNEY,
+          TrainerType.AARON,
+          TrainerType.SHAUNTAL,
+          TrainerType.MALVA,
+          randSeedItem([TrainerType.HALA, TrainerType.MOLAYNE]),
+          TrainerType.MARNIE_ELITE,
+          TrainerType.RIKA,
+        ];
         break;
       case ClassicFixedBossWaves.ELITE_FOUR_2:
-        trainerTypes = [ TrainerType.BRUNO, TrainerType.KOGA, TrainerType.PHOEBE, TrainerType.BERTHA, TrainerType.MARSHAL, TrainerType.SIEBOLD, TrainerType.OLIVIA, TrainerType.NESSA_ELITE, TrainerType.POPPY ];
+        trainerTypes = [
+          TrainerType.BRUNO,
+          TrainerType.KOGA,
+          TrainerType.PHOEBE,
+          TrainerType.BERTHA,
+          TrainerType.MARSHAL,
+          TrainerType.SIEBOLD,
+          TrainerType.OLIVIA,
+          TrainerType.NESSA_ELITE,
+          TrainerType.POPPY,
+        ];
         break;
       case ClassicFixedBossWaves.ELITE_FOUR_3:
-        trainerTypes = [ TrainerType.AGATHA, TrainerType.BRUNO, TrainerType.GLACIA, TrainerType.FLINT, TrainerType.GRIMSLEY, TrainerType.WIKSTROM, TrainerType.ACEROLA, Utils.randSeedItem([ TrainerType.BEA_ELITE, TrainerType.ALLISTER_ELITE ]), TrainerType.LARRY_ELITE ];
+        trainerTypes = [
+          TrainerType.AGATHA,
+          TrainerType.BRUNO,
+          TrainerType.GLACIA,
+          TrainerType.FLINT,
+          TrainerType.GRIMSLEY,
+          TrainerType.WIKSTROM,
+          TrainerType.ACEROLA,
+          randSeedItem([TrainerType.BEA_ELITE, TrainerType.ALLISTER_ELITE]),
+          TrainerType.LARRY_ELITE,
+        ];
         break;
       case ClassicFixedBossWaves.ELITE_FOUR_4:
-        trainerTypes = [ TrainerType.LANCE, TrainerType.KAREN, TrainerType.DRAKE, TrainerType.LUCIAN, TrainerType.CAITLIN, TrainerType.DRASNA, TrainerType.KAHILI, TrainerType.RAIHAN_ELITE, TrainerType.HASSEL ];
+        trainerTypes = [
+          TrainerType.LANCE,
+          TrainerType.KAREN,
+          TrainerType.DRAKE,
+          TrainerType.LUCIAN,
+          TrainerType.CAITLIN,
+          TrainerType.DRASNA,
+          TrainerType.KAHILI,
+          TrainerType.RAIHAN_ELITE,
+          TrainerType.HASSEL,
+        ];
         break;
       case ClassicFixedBossWaves.CHAMPION:
-        trainerTypes = [ TrainerType.BLUE, Utils.randSeedItem([ TrainerType.RED, TrainerType.LANCE_CHAMPION ]), Utils.randSeedItem([ TrainerType.STEVEN, TrainerType.WALLACE ]), TrainerType.CYNTHIA, Utils.randSeedItem([ TrainerType.ALDER, TrainerType.IRIS ]), TrainerType.DIANTHA, Utils.randSeedItem([ TrainerType.KUKUI, TrainerType.HAU ]), Utils.randSeedItem([ TrainerType.LEON, TrainerType.MUSTARD ]), Utils.randSeedItem([ TrainerType.GEETA, TrainerType.NEMONA ]) ];
+        trainerTypes = [
+          TrainerType.BLUE,
+          randSeedItem([TrainerType.RED, TrainerType.LANCE_CHAMPION]),
+          randSeedItem([TrainerType.STEVEN, TrainerType.WALLACE]),
+          TrainerType.CYNTHIA,
+          randSeedItem([TrainerType.ALDER, TrainerType.IRIS]),
+          TrainerType.DIANTHA,
+          randSeedItem([TrainerType.KUKUI, TrainerType.HAU]),
+          randSeedItem([TrainerType.LEON, TrainerType.MUSTARD]),
+          randSeedItem([TrainerType.GEETA, TrainerType.NEMONA]),
+        ];
         break;
     }
     if (trainerTypes.length === 0) {
       return false;
-    } else if (evilTeamWaves.includes(waveIndex)) {
-      battleConfig.setBattleType(BattleType.TRAINER).setSeedOffsetWave(ClassicFixedBossWaves.EVIL_GRUNT_1).setGetTrainerFunc(getRandomTrainerFunc(trainerTypes, true));
-      return true;
-    } else if (waveIndex >= ClassicFixedBossWaves.ELITE_FOUR_1 && waveIndex <= ClassicFixedBossWaves.CHAMPION) {
-      const ttypes = trainerTypes as TrainerType[];
-      battleConfig.setBattleType(BattleType.TRAINER).setGetTrainerFunc(() => new Trainer(ttypes[this.value - 1], TrainerVariant.DEFAULT));
-      return true;
-    } else {
-      return false;
     }
+    if (evilTeamWaves.includes(waveIndex)) {
+      battleConfig
+        .setBattleType(BattleType.TRAINER)
+        .setSeedOffsetWave(ClassicFixedBossWaves.EVIL_GRUNT_1)
+        .setGetTrainerFunc(getRandomTrainerFunc(trainerTypes, true));
+      return true;
+    }
+    if (waveIndex >= ClassicFixedBossWaves.ELITE_FOUR_1 && waveIndex <= ClassicFixedBossWaves.CHAMPION) {
+      const ttypes = trainerTypes as TrainerType[];
+      battleConfig
+        .setBattleType(BattleType.TRAINER)
+        .setGetTrainerFunc(() => new Trainer(ttypes[this.value - 1], TrainerVariant.DEFAULT));
+      return true;
+    }
+    return false;
   }
 
   /**
@@ -556,10 +681,11 @@ export class SingleGenerationChallenge extends Challenge {
     if (value === 0) {
       return i18next.t("challenges:singleGeneration.desc_default");
     }
-    return i18next.t("challenges:singleGeneration.desc", { gen: i18next.t(`challenges:singleGeneration.gen_${value}`) });
+    return i18next.t("challenges:singleGeneration.desc", {
+      gen: i18next.t(`challenges:singleGeneration.gen_${value}`),
+    });
   }
 
-
   static loadChallenge(source: SingleGenerationChallenge | any): SingleGenerationChallenge {
     const newChallenge = new SingleGenerationChallenge();
     newChallenge.value = source.value;
@@ -572,7 +698,7 @@ interface monotypeOverride {
   /** The species to override */
   species: Species;
   /** The type to count as */
-  type: Type;
+  type: PokemonType;
   /** If part of a fusion, should we check the fused species instead of the base species? */
   fusion: boolean;
 }
@@ -582,39 +708,17 @@ interface monotypeOverride {
  */
 export class SingleTypeChallenge extends Challenge {
   private static TYPE_OVERRIDES: monotypeOverride[] = [
-    { species: Species.CASTFORM, type: Type.NORMAL, fusion: false },
+    { species: Species.CASTFORM, type: PokemonType.NORMAL, fusion: false },
   ];
   // TODO: Find a solution for all Pokemon with this ssui issue, including Basculin and Burmy
-  private static SPECIES_OVERRIDES: Species[] = [ Species.MELOETTA ];
 
   constructor() {
     super(Challenges.SINGLE_TYPE, 18);
   }
 
-  override applyStarterChoice(pokemon: PokemonSpecies, valid: Utils.BooleanHolder, dexAttr: DexAttrProps, soft: boolean = false): boolean {
+  override applyStarterChoice(pokemon: PokemonSpecies, valid: BooleanHolder, dexAttr: DexAttrProps): boolean {
     const speciesForm = getPokemonSpeciesForm(pokemon.speciesId, dexAttr.formIndex);
-    const types = [ speciesForm.type1, speciesForm.type2 ];
-    if (soft && !SingleTypeChallenge.SPECIES_OVERRIDES.includes(pokemon.speciesId)) {
-      const speciesToCheck = [ pokemon.speciesId ];
-      while (speciesToCheck.length) {
-        const checking = speciesToCheck.pop();
-        if (checking && pokemonEvolutions.hasOwnProperty(checking)) {
-          pokemonEvolutions[checking].forEach(e => {
-            speciesToCheck.push(e.speciesId);
-            types.push(getPokemonSpecies(e.speciesId).type1, getPokemonSpecies(e.speciesId).type2);
-          });
-        }
-        if (checking && pokemonFormChanges.hasOwnProperty(checking)) {
-          pokemonFormChanges[checking].forEach(f1 => {
-            getPokemonSpecies(checking).forms.forEach(f2 => {
-              if (f1.formKey === f2.formKey) {
-                types.push(f2.type1, f2.type2);
-              }
-            });
-          });
-        }
-      }
-    }
+    const types = [speciesForm.type1, speciesForm.type2];
     if (!types.includes(this.value - 1)) {
       valid.value = false;
       return true;
@@ -622,9 +726,17 @@ export class SingleTypeChallenge extends Challenge {
     return false;
   }
 
-  applyPokemonInBattle(pokemon: Pokemon, valid: Utils.BooleanHolder): boolean {
-    if (pokemon.isPlayer() && !pokemon.isOfType(this.value - 1, false, false, true)
-      && !SingleTypeChallenge.TYPE_OVERRIDES.some(o => o.type === (this.value - 1) && (pokemon.isFusion() && o.fusion ? pokemon.fusionSpecies! : pokemon.species).speciesId === o.species)) { // TODO: is the bang on fusionSpecies correct?
+  applyPokemonInBattle(pokemon: Pokemon, valid: BooleanHolder): boolean {
+    if (
+      pokemon.isPlayer() &&
+      !pokemon.isOfType(this.value - 1, false, false, true) &&
+      !SingleTypeChallenge.TYPE_OVERRIDES.some(
+        o =>
+          o.type === this.value - 1 &&
+          (pokemon.isFusion() && o.fusion ? pokemon.fusionSpecies! : pokemon.species).speciesId === o.species,
+      )
+    ) {
+      // TODO: is the bang on fusionSpecies correct?
       valid.value = false;
       return true;
     }
@@ -647,7 +759,7 @@ export class SingleTypeChallenge extends Challenge {
     if (overrideValue === undefined) {
       overrideValue = this.value;
     }
-    return Type[this.value - 1].toLowerCase();
+    return PokemonType[this.value - 1].toLowerCase();
   }
 
   /**
@@ -659,10 +771,12 @@ export class SingleTypeChallenge extends Challenge {
     if (overrideValue === undefined) {
       overrideValue = this.value;
     }
-    const type = i18next.t(`pokemonInfo:Type.${Type[this.value - 1]}`);
-    const typeColor = `[color=${TypeColor[Type[this.value - 1]]}][shadow=${TypeShadow[Type[this.value - 1]]}]${type}[/shadow][/color]`;
+    const type = i18next.t(`pokemonInfo:Type.${PokemonType[this.value - 1]}`);
+    const typeColor = `[color=${TypeColor[PokemonType[this.value - 1]]}][shadow=${TypeShadow[PokemonType[this.value - 1]]}]${type}[/shadow][/color]`;
     const defaultDesc = i18next.t("challenges:singleType.desc_default");
-    const typeDesc = i18next.t("challenges:singleType.desc", { type: typeColor });
+    const typeDesc = i18next.t("challenges:singleType.desc", {
+      type: typeColor,
+    });
     return this.value === 0 ? defaultDesc : typeDesc;
   }
 
@@ -682,7 +796,7 @@ export class FreshStartChallenge extends Challenge {
     super(Challenges.FRESH_START, 1);
   }
 
-  applyStarterChoice(pokemon: PokemonSpecies, valid: Utils.BooleanHolder): boolean {
+  applyStarterChoice(pokemon: PokemonSpecies, valid: BooleanHolder): boolean {
     if (!defaultStarterSpecies.includes(pokemon.speciesId)) {
       valid.value = false;
       return true;
@@ -690,7 +804,7 @@ export class FreshStartChallenge extends Challenge {
     return false;
   }
 
-  applyStarterCost(species: Species, cost: Utils.NumberHolder): boolean {
+  applyStarterCost(species: Species, cost: NumberHolder): boolean {
     if (defaultStarterSpecies.includes(species)) {
       cost.value = speciesStarterCosts[species];
       return true;
@@ -702,12 +816,18 @@ export class FreshStartChallenge extends Challenge {
     pokemon.abilityIndex = 0; // Always base ability, not hidden ability
     pokemon.passive = false; // Passive isn't unlocked
     pokemon.nature = Nature.HARDY; // Neutral nature
-    pokemon.moveset = pokemon.species.getLevelMoves().filter(m => m[0] <= 5).map(lm => lm[1]).slice(0, 4).map(m => new PokemonMove(m)); // No egg moves
+    pokemon.moveset = pokemon.species
+      .getLevelMoves()
+      .filter(m => m[0] <= 5)
+      .map(lm => lm[1])
+      .slice(0, 4)
+      .map(m => new PokemonMove(m)); // No egg moves
     pokemon.luck = 0; // No luck
     pokemon.shiny = false; // Not shiny
     pokemon.variant = 0; // Not shiny
     pokemon.formIndex = 0; // Froakie should be base form
-    pokemon.ivs = [ 15, 15, 15, 15, 15, 15 ]; // Default IVs of 15 for all stats (Updated to 15 from 10 in 1.2.0)
+    pokemon.ivs = [15, 15, 15, 15, 15, 15]; // Default IVs of 15 for all stats (Updated to 15 from 10 in 1.2.0)
+    pokemon.teraType = pokemon.species.type1; // Always primary tera type
     return true;
   }
 
@@ -742,11 +862,12 @@ export class InverseBattleChallenge extends Challenge {
     return 0;
   }
 
-  applyTypeEffectiveness(effectiveness: Utils.NumberHolder): boolean {
+  applyTypeEffectiveness(effectiveness: NumberHolder): boolean {
     if (effectiveness.value < 1) {
       effectiveness.value = 2;
       return true;
-    } else if (effectiveness.value > 1) {
+    }
+    if (effectiveness.value > 1) {
       effectiveness.value = 0.5;
       return true;
     }
@@ -763,8 +884,8 @@ export class FlipStatChallenge extends Challenge {
     super(Challenges.FLIP_STAT, 1);
   }
 
-  override applyFlipStat(pokemon: Pokemon, baseStats: number[]) {
-    const origStats = Utils.deepCopy(baseStats);
+  override applyFlipStat(_pokemon: Pokemon, baseStats: number[]) {
+    const origStats = deepCopy(baseStats);
     baseStats[0] = origStats[5];
     baseStats[1] = origStats[4];
     baseStats[2] = origStats[3];
@@ -800,7 +921,7 @@ export class LowerStarterMaxCostChallenge extends Challenge {
     return (DEFAULT_PARTY_MAX_COST - overrideValue).toString();
   }
 
-  applyStarterChoice(pokemon: PokemonSpecies, valid: Utils.BooleanHolder): boolean {
+  applyStarterChoice(pokemon: PokemonSpecies, valid: BooleanHolder): boolean {
     if (speciesStarterCosts[pokemon.speciesId] > DEFAULT_PARTY_MAX_COST - this.value) {
       valid.value = false;
       return true;
@@ -834,7 +955,7 @@ export class LowerStarterPointsChallenge extends Challenge {
     return (DEFAULT_PARTY_MAX_COST - overrideValue).toString();
   }
 
-  applyStarterPoints(points: Utils.NumberHolder): boolean {
+  applyStarterPoints(points: NumberHolder): boolean {
     points.value -= this.value;
     return true;
   }
@@ -849,134 +970,163 @@ export class LowerStarterPointsChallenge extends Challenge {
 
 /**
  * Apply all challenges that modify starter choice.
- * @param gameMode {@link GameMode} The current gameMode
  * @param challengeType {@link ChallengeType} ChallengeType.STARTER_CHOICE
  * @param pokemon {@link PokemonSpecies} The pokemon to check the validity of.
- * @param valid {@link Utils.BooleanHolder} A BooleanHolder, the value gets set to false if the pokemon isn't allowed.
+ * @param valid {@link BooleanHolder} A BooleanHolder, the value gets set to false if the pokemon isn't allowed.
  * @param dexAttr {@link DexAttrProps} The dex attributes of the pokemon.
- * @param soft {@link boolean} If true, allow it if it could become a valid pokemon.
  * @returns True if any challenge was successfully applied.
  */
-export function applyChallenges(gameMode: GameMode, challengeType: ChallengeType.STARTER_CHOICE, pokemon: PokemonSpecies, valid: Utils.BooleanHolder, dexAttr: DexAttrProps, soft: boolean): boolean;
+export function applyChallenges(
+  challengeType: ChallengeType.STARTER_CHOICE,
+  pokemon: PokemonSpecies,
+  valid: BooleanHolder,
+  dexAttr: DexAttrProps,
+): boolean;
 /**
  * Apply all challenges that modify available total starter points.
- * @param gameMode {@link GameMode} The current gameMode
  * @param challengeType {@link ChallengeType} ChallengeType.STARTER_POINTS
- * @param points {@link Utils.NumberHolder} The amount of points you have available.
+ * @param points {@link NumberHolder} The amount of points you have available.
  * @returns True if any challenge was successfully applied.
  */
-export function applyChallenges(gameMode: GameMode, challengeType: ChallengeType.STARTER_POINTS, points: Utils.NumberHolder): boolean;
+export function applyChallenges(challengeType: ChallengeType.STARTER_POINTS, points: NumberHolder): boolean;
 /**
  * Apply all challenges that modify the cost of a starter.
- * @param gameMode {@link GameMode} The current gameMode
  * @param challengeType {@link ChallengeType} ChallengeType.STARTER_COST
  * @param species {@link Species} The pokemon to change the cost of.
- * @param points {@link Utils.NumberHolder} The cost of the pokemon.
+ * @param points {@link NumberHolder} The cost of the pokemon.
  * @returns True if any challenge was successfully applied.
  */
-export function applyChallenges(gameMode: GameMode, challengeType: ChallengeType.STARTER_COST, species: Species, cost: Utils.NumberHolder): boolean;
+export function applyChallenges(
+  challengeType: ChallengeType.STARTER_COST,
+  species: Species,
+  cost: NumberHolder,
+): boolean;
 /**
  * Apply all challenges that modify a starter after selection.
- * @param gameMode {@link GameMode} The current gameMode
  * @param challengeType {@link ChallengeType} ChallengeType.STARTER_MODIFY
  * @param pokemon {@link Pokemon} The starter pokemon to modify.
  * @returns True if any challenge was successfully applied.
  */
-export function applyChallenges(gameMode: GameMode, challengeType: ChallengeType.STARTER_MODIFY, pokemon: Pokemon): boolean;
+export function applyChallenges(challengeType: ChallengeType.STARTER_MODIFY, pokemon: Pokemon): boolean;
 /**
  * Apply all challenges that what pokemon you can have in battle.
- * @param gameMode {@link GameMode} The current gameMode
  * @param challengeType {@link ChallengeType} ChallengeType.POKEMON_IN_BATTLE
  * @param pokemon {@link Pokemon} The pokemon to check the validity of.
- * @param valid {@link Utils.BooleanHolder} A BooleanHolder, the value gets set to false if the pokemon isn't allowed.
+ * @param valid {@link BooleanHolder} A BooleanHolder, the value gets set to false if the pokemon isn't allowed.
  * @returns True if any challenge was successfully applied.
  */
-export function applyChallenges(gameMode: GameMode, challengeType: ChallengeType.POKEMON_IN_BATTLE, pokemon: Pokemon, valid: Utils.BooleanHolder): boolean;
+export function applyChallenges(
+  challengeType: ChallengeType.POKEMON_IN_BATTLE,
+  pokemon: Pokemon,
+  valid: BooleanHolder,
+): boolean;
 /**
  * Apply all challenges that modify what fixed battles there are.
- * @param gameMode {@link GameMode} The current gameMode
  * @param challengeType {@link ChallengeType} ChallengeType.FIXED_BATTLES
  * @param waveIndex {@link Number} The current wave index.
  * @param battleConfig {@link FixedBattleConfig} The battle config to modify.
  * @returns True if any challenge was successfully applied.
  */
-export function applyChallenges(gameMode: GameMode, challengeType: ChallengeType.FIXED_BATTLES, waveIndex: Number, battleConfig: FixedBattleConfig): boolean;
+export function applyChallenges(
+  challengeType: ChallengeType.FIXED_BATTLES,
+  waveIndex: number,
+  battleConfig: FixedBattleConfig,
+): boolean;
 /**
  * Apply all challenges that modify type effectiveness.
- * @param gameMode {@linkcode GameMode} The current gameMode
  * @param challengeType {@linkcode ChallengeType} ChallengeType.TYPE_EFFECTIVENESS
- * @param effectiveness {@linkcode Utils.NumberHolder} The current effectiveness of the move.
+ * @param effectiveness {@linkcode NumberHolder} The current effectiveness of the move.
  * @returns True if any challenge was successfully applied.
  */
-export function applyChallenges(gameMode: GameMode, challengeType: ChallengeType.TYPE_EFFECTIVENESS, effectiveness: Utils.NumberHolder): boolean;
+export function applyChallenges(challengeType: ChallengeType.TYPE_EFFECTIVENESS, effectiveness: NumberHolder): boolean;
 /**
  * Apply all challenges that modify what level AI are.
- * @param gameMode {@link GameMode} The current gameMode
  * @param challengeType {@link ChallengeType} ChallengeType.AI_LEVEL
- * @param level {@link Utils.IntegerHolder} The generated level of the pokemon.
+ * @param level {@link NumberHolder} The generated level of the pokemon.
  * @param levelCap {@link Number} The maximum level cap for the current wave.
  * @param isTrainer {@link Boolean} Whether this is a trainer pokemon.
  * @param isBoss {@link Boolean} Whether this is a non-trainer boss pokemon.
  * @returns True if any challenge was successfully applied.
  */
-export function applyChallenges(gameMode: GameMode, challengeType: ChallengeType.AI_LEVEL, level: Utils.IntegerHolder, levelCap: number, isTrainer: boolean, isBoss: boolean): boolean;
+export function applyChallenges(
+  challengeType: ChallengeType.AI_LEVEL,
+  level: NumberHolder,
+  levelCap: number,
+  isTrainer: boolean,
+  isBoss: boolean,
+): boolean;
 /**
  * Apply all challenges that modify how many move slots the AI has.
- * @param gameMode {@link GameMode} The current gameMode
  * @param challengeType {@link ChallengeType} ChallengeType.AI_MOVE_SLOTS
  * @param pokemon {@link Pokemon} The pokemon being considered.
- * @param moveSlots {@link Utils.IntegerHolder} The amount of move slots.
+ * @param moveSlots {@link NumberHolder} The amount of move slots.
  * @returns True if any challenge was successfully applied.
  */
-export function applyChallenges(gameMode: GameMode, challengeType: ChallengeType.AI_MOVE_SLOTS, pokemon: Pokemon, moveSlots: Utils.IntegerHolder): boolean;
+export function applyChallenges(
+  challengeType: ChallengeType.AI_MOVE_SLOTS,
+  pokemon: Pokemon,
+  moveSlots: NumberHolder,
+): boolean;
 /**
  * Apply all challenges that modify whether a pokemon has its passive.
- * @param gameMode {@link GameMode} The current gameMode
  * @param challengeType {@link ChallengeType} ChallengeType.PASSIVE_ACCESS
  * @param pokemon {@link Pokemon} The pokemon to modify.
- * @param hasPassive {@link Utils.BooleanHolder} Whether it has its passive.
+ * @param hasPassive {@link BooleanHolder} Whether it has its passive.
  * @returns True if any challenge was successfully applied.
  */
-export function applyChallenges(gameMode: GameMode, challengeType: ChallengeType.PASSIVE_ACCESS, pokemon: Pokemon, hasPassive: Utils.BooleanHolder): boolean;
+export function applyChallenges(
+  challengeType: ChallengeType.PASSIVE_ACCESS,
+  pokemon: Pokemon,
+  hasPassive: BooleanHolder,
+): boolean;
 /**
  * Apply all challenges that modify the game modes settings.
- * @param gameMode {@link GameMode} The current gameMode
  * @param challengeType {@link ChallengeType} ChallengeType.GAME_MODE_MODIFY
  * @returns True if any challenge was successfully applied.
  */
-export function applyChallenges(gameMode: GameMode, challengeType: ChallengeType.GAME_MODE_MODIFY): boolean;
+export function applyChallenges(challengeType: ChallengeType.GAME_MODE_MODIFY): boolean;
 /**
  * Apply all challenges that modify what level a pokemon can access a move.
- * @param gameMode {@link GameMode} The current gameMode
  * @param challengeType {@link ChallengeType} ChallengeType.MOVE_ACCESS
  * @param pokemon {@link Pokemon} What pokemon would learn the move.
  * @param moveSource {@link MoveSourceType} What source the pokemon would get the move from.
  * @param move {@link Moves} The move in question.
- * @param level {@link Utils.IntegerHolder} The level threshold for access.
+ * @param level {@link NumberHolder} The level threshold for access.
  * @returns True if any challenge was successfully applied.
  */
-export function applyChallenges(gameMode: GameMode, challengeType: ChallengeType.MOVE_ACCESS, pokemon: Pokemon, moveSource: MoveSourceType, move: Moves, level: Utils.IntegerHolder): boolean;
+export function applyChallenges(
+  challengeType: ChallengeType.MOVE_ACCESS,
+  pokemon: Pokemon,
+  moveSource: MoveSourceType,
+  move: Moves,
+  level: NumberHolder,
+): boolean;
 /**
  * Apply all challenges that modify what weight a pokemon gives to move generation
- * @param gameMode {@link GameMode} The current gameMode
  * @param challengeType {@link ChallengeType} ChallengeType.MOVE_WEIGHT
  * @param pokemon {@link Pokemon} What pokemon would learn the move.
  * @param moveSource {@link MoveSourceType} What source the pokemon would get the move from.
  * @param move {@link Moves} The move in question.
- * @param weight {@link Utils.IntegerHolder} The weight of the move.
+ * @param weight {@link NumberHolder} The weight of the move.
  * @returns True if any challenge was successfully applied.
  */
-export function applyChallenges(gameMode: GameMode, challengeType: ChallengeType.MOVE_WEIGHT, pokemon: Pokemon, moveSource: MoveSourceType, move: Moves, weight: Utils.IntegerHolder): boolean;
+export function applyChallenges(
+  challengeType: ChallengeType.MOVE_WEIGHT,
+  pokemon: Pokemon,
+  moveSource: MoveSourceType,
+  move: Moves,
+  weight: NumberHolder,
+): boolean;
 
-export function applyChallenges(gameMode: GameMode, challengeType: ChallengeType.FLIP_STAT, pokemon: Pokemon, baseStats: number[]): boolean;
+export function applyChallenges(challengeType: ChallengeType.FLIP_STAT, pokemon: Pokemon, baseStats: number[]): boolean;
 
-export function applyChallenges(gameMode: GameMode, challengeType: ChallengeType, ...args: any[]): boolean {
+export function applyChallenges(challengeType: ChallengeType, ...args: any[]): boolean {
   let ret = false;
-  gameMode.challenges.forEach(c => {
+  globalScene.gameMode.challenges.forEach(c => {
     if (c.value !== 0) {
       switch (challengeType) {
         case ChallengeType.STARTER_CHOICE:
-          ret ||= c.applyStarterChoice(args[0], args[1], args[2], args[3]);
+          ret ||= c.applyStarterChoice(args[0], args[1], args[2]);
           break;
         case ChallengeType.STARTER_POINTS:
           ret ||= c.applyStarterPoints(args[0]);
@@ -1006,7 +1156,7 @@ export function applyChallenges(gameMode: GameMode, challengeType: ChallengeType
           ret ||= c.applyPassiveAccess(args[0], args[1]);
           break;
         case ChallengeType.GAME_MODE_MODIFY:
-          ret ||= c.applyGameModeModify(gameMode);
+          ret ||= c.applyGameModeModify();
           break;
         case ChallengeType.MOVE_ACCESS:
           ret ||= c.applyMoveAccessLevel(args[0], args[1], args[2], args[3]);
@@ -1056,6 +1206,83 @@ export function initChallenges() {
     new SingleTypeChallenge(),
     new FreshStartChallenge(),
     new InverseBattleChallenge(),
-    new FlipStatChallenge()
+    new FlipStatChallenge(),
   );
 }
+
+/**
+ * Apply all challenges to the given starter (and form) to check its validity.
+ * Differs from {@linkcode checkSpeciesValidForChallenge} which only checks form changes.
+ * @param species - The {@linkcode PokemonSpecies} to check the validity of.
+ * @param dexAttr - The {@linkcode DexAttrProps | dex attributes} of the species, including its form index.
+ * @param soft - If `true`, allow it if it could become valid through evolution or form change.
+ * @returns `true` if the species is considered valid.
+ */
+export function checkStarterValidForChallenge(species: PokemonSpecies, props: DexAttrProps, soft: boolean) {
+  if (!soft) {
+    const isValidForChallenge = new BooleanHolder(true);
+    applyChallenges(ChallengeType.STARTER_CHOICE, species, isValidForChallenge, props);
+    return isValidForChallenge.value;
+  }
+  // We check the validity of every evolution and form change, and require that at least one is valid
+  const speciesToCheck = [species.speciesId];
+  while (speciesToCheck.length) {
+    const checking = speciesToCheck.pop();
+    // Linter complains if we don't handle this
+    if (!checking) {
+      return false;
+    }
+    const checkingSpecies = getPokemonSpecies(checking);
+    if (checkSpeciesValidForChallenge(checkingSpecies, props, true)) {
+      return true;
+    }
+    if (checking && pokemonEvolutions.hasOwnProperty(checking)) {
+      pokemonEvolutions[checking].forEach(e => {
+        // Form check to deal with cases such as Basculin -> Basculegion
+        // TODO: does this miss anything if checking forms of a stage 2 Pokémon?
+        if (!e?.preFormKey || e.preFormKey === species.forms[props.formIndex].formKey) {
+          speciesToCheck.push(e.speciesId);
+        }
+      });
+    }
+  }
+  return false;
+}
+
+/**
+ * Apply all challenges to the given species (and form) to check its validity.
+ * Differs from {@linkcode checkStarterValidForChallenge} which also checks evolutions.
+ * @param species - The {@linkcode PokemonSpecies} to check the validity of.
+ * @param dexAttr - The {@linkcode DexAttrProps | dex attributes} of the species, including its form index.
+ * @param soft - If `true`, allow it if it could become valid through a form change.
+ * @returns `true` if the species is considered valid.
+ */
+function checkSpeciesValidForChallenge(species: PokemonSpecies, props: DexAttrProps, soft: boolean) {
+  const isValidForChallenge = new BooleanHolder(true);
+  applyChallenges(ChallengeType.STARTER_CHOICE, species, isValidForChallenge, props);
+  if (!soft || !pokemonFormChanges.hasOwnProperty(species.speciesId)) {
+    return isValidForChallenge.value;
+  }
+  // If the form in props is valid, return true before checking other form changes
+  if (soft && isValidForChallenge.value) {
+    return true;
+  }
+
+  const result = pokemonFormChanges[species.speciesId].some(f1 => {
+    // Exclude form changes that require the mon to be on the field to begin with
+    if (!("item" in f1.trigger)) {
+      return false;
+    }
+
+    return species.forms.some((f2, formIndex) => {
+      if (f1.formKey === f2.formKey) {
+        const formProps = { ...props, formIndex };
+        const isFormValidForChallenge = new BooleanHolder(true);
+        applyChallenges(ChallengeType.STARTER_CHOICE, species, isFormValidForChallenge, formProps);
+        return isFormValidForChallenge.value;
+      }
+      return false;
+    });
+  });
+  return result;
+}
diff --git a/src/data/custom-pokemon-data.ts b/src/data/custom-pokemon-data.ts
index 4a5eb89aeed..20f6ea96174 100644
--- a/src/data/custom-pokemon-data.ts
+++ b/src/data/custom-pokemon-data.ts
@@ -1,36 +1,31 @@
 import type { Abilities } from "#enums/abilities";
-import type { Type } from "#enums/type";
-import { isNullOrUndefined } from "#app/utils";
+import type { PokemonType } from "#enums/pokemon-type";
 import type { Nature } from "#enums/nature";
 
 /**
- * Data that can customize a Pokemon in non-standard ways from its Species
- * Used by Mystery Encounters and Mints
- * Also used as a counter how often a Pokemon got hit until new arena encounter
+ * Data that can customize a Pokemon in non-standard ways from its Species.
+ * Includes abilities, nature, changed types, etc.
  */
 export class CustomPokemonData {
-  public spriteScale: number;
+  // TODO: Change the default value for all these from -1 to something a bit more sensible
+  /**
+   * The scale at which to render this Pokemon's sprite.
+   */
+  public spriteScale = -1;
   public ability: Abilities | -1;
   public passive: Abilities | -1;
   public nature: Nature | -1;
-  public types: Type[];
-  /** `hitsReceivedCount` aka `hitsRecCount` saves how often the pokemon got hit until a new arena encounter (used for Rage Fist) */
-  public hitsRecCount: number;
+  public types: PokemonType[];
+  /** Deprecated but needed for session save migration */
+  // TODO: Remove this once pre-session migration is implemented
+  public hitsRecCount: number | null = null;
 
   constructor(data?: CustomPokemonData | Partial<CustomPokemonData>) {
-    if (!isNullOrUndefined(data)) {
-      Object.assign(this, data);
-    }
-
-    this.spriteScale = this.spriteScale ?? -1;
-    this.ability = this.ability ?? -1;
-    this.passive = this.passive ?? -1;
-    this.nature = this.nature ?? -1;
-    this.types = this.types ?? [];
-    this.hitsRecCount = this.hitsRecCount ?? 0;
-  }
-
-  resetHitReceivedCount(): void {
-    this.hitsRecCount = 0;
+    this.spriteScale = data?.spriteScale ?? -1;
+    this.ability = data?.ability ?? -1;
+    this.passive = data?.passive ?? -1;
+    this.nature = data?.nature ?? -1;
+    this.types = data?.types ?? [];
+    this.hitsRecCount = data?.hitsRecCount ?? null;
   }
 }
diff --git a/src/data/daily-run.ts b/src/data/daily-run.ts
index df6c08fc0f0..8a1632ce160 100644
--- a/src/data/daily-run.ts
+++ b/src/data/daily-run.ts
@@ -3,7 +3,7 @@ import type { Species } from "#enums/species";
 import { globalScene } from "#app/global-scene";
 import { PlayerPokemon } from "#app/field/pokemon";
 import type { Starter } from "#app/ui/starter-select-ui-handler";
-import * as Utils from "#app/utils";
+import { randSeedGauss, randSeedInt, randSeedItem, getEnumValues } from "#app/utils/common";
 import type { PokemonSpeciesForm } from "#app/data/pokemon-species";
 import PokemonSpecies, { getPokemonSpecies, getPokemonSpeciesForm } from "#app/data/pokemon-species";
 import { speciesStarterCosts } from "#app/data/balance/starters";
@@ -16,7 +16,7 @@ export interface DailyRunConfig {
 }
 
 export function fetchDailyRunSeed(): Promise<string | null> {
-  return new Promise<string | null>((resolve, reject) => {
+  return new Promise<string | null>((resolve, _reject) => {
     pokerogueApi.daily.getSeed().then(dailySeed => {
       resolve(dailySeed);
     });
@@ -26,55 +26,76 @@ export function fetchDailyRunSeed(): Promise<string | null> {
 export function getDailyRunStarters(seed: string): Starter[] {
   const starters: Starter[] = [];
 
-  globalScene.executeWithSeedOffset(() => {
-    const startingLevel = globalScene.gameMode.getStartingLevel();
+  globalScene.executeWithSeedOffset(
+    () => {
+      const startingLevel = globalScene.gameMode.getStartingLevel();
 
-    if (/\d{18}$/.test(seed)) {
-      for (let s = 0; s < 3; s++) {
-        const offset = 6 + s * 6;
-        const starterSpeciesForm = getPokemonSpeciesForm(parseInt(seed.slice(offset, offset + 4)) as Species, parseInt(seed.slice(offset + 4, offset + 6)));
-        starters.push(getDailyRunStarter(starterSpeciesForm, startingLevel));
+      if (/\d{18}$/.test(seed)) {
+        for (let s = 0; s < 3; s++) {
+          const offset = 6 + s * 6;
+          const starterSpeciesForm = getPokemonSpeciesForm(
+            Number.parseInt(seed.slice(offset, offset + 4)) as Species,
+            Number.parseInt(seed.slice(offset + 4, offset + 6)),
+          );
+          starters.push(getDailyRunStarter(starterSpeciesForm, startingLevel));
+        }
+        return;
       }
-      return;
-    }
 
-    const starterCosts: number[] = [];
-    starterCosts.push(Math.min(Math.round(3.5 + Math.abs(Utils.randSeedGauss(1))), 8));
-    starterCosts.push(Utils.randSeedInt(9 - starterCosts[0], 1));
-    starterCosts.push(10 - (starterCosts[0] + starterCosts[1]));
+      const starterCosts: number[] = [];
+      starterCosts.push(Math.min(Math.round(3.5 + Math.abs(randSeedGauss(1))), 8));
+      starterCosts.push(randSeedInt(9 - starterCosts[0], 1));
+      starterCosts.push(10 - (starterCosts[0] + starterCosts[1]));
 
-    for (let c = 0; c < starterCosts.length; c++) {
-      const cost = starterCosts[c];
-      const costSpecies = Object.keys(speciesStarterCosts)
-        .map(s => parseInt(s) as Species)
-        .filter(s => speciesStarterCosts[s] === cost);
-      const randPkmSpecies = getPokemonSpecies(Utils.randSeedItem(costSpecies));
-      const starterSpecies = getPokemonSpecies(randPkmSpecies.getTrainerSpeciesForLevel(startingLevel, true, PartyMemberStrength.STRONGER));
-      starters.push(getDailyRunStarter(starterSpecies, startingLevel));
-    }
-  }, 0, seed);
+      for (let c = 0; c < starterCosts.length; c++) {
+        const cost = starterCosts[c];
+        const costSpecies = Object.keys(speciesStarterCosts)
+          .map(s => Number.parseInt(s) as Species)
+          .filter(s => speciesStarterCosts[s] === cost);
+        const randPkmSpecies = getPokemonSpecies(randSeedItem(costSpecies));
+        const starterSpecies = getPokemonSpecies(
+          randPkmSpecies.getTrainerSpeciesForLevel(startingLevel, true, PartyMemberStrength.STRONGER),
+        );
+        starters.push(getDailyRunStarter(starterSpecies, startingLevel));
+      }
+    },
+    0,
+    seed,
+  );
 
   return starters;
 }
 
 function getDailyRunStarter(starterSpeciesForm: PokemonSpeciesForm, startingLevel: number): Starter {
-  const starterSpecies = starterSpeciesForm instanceof PokemonSpecies ? starterSpeciesForm : getPokemonSpecies(starterSpeciesForm.speciesId);
+  const starterSpecies =
+    starterSpeciesForm instanceof PokemonSpecies ? starterSpeciesForm : getPokemonSpecies(starterSpeciesForm.speciesId);
   const formIndex = starterSpeciesForm instanceof PokemonSpecies ? undefined : starterSpeciesForm.formIndex;
-  const pokemon = new PlayerPokemon(starterSpecies, startingLevel, undefined, formIndex, undefined, undefined, undefined, undefined, undefined, undefined);
+  const pokemon = new PlayerPokemon(
+    starterSpecies,
+    startingLevel,
+    undefined,
+    formIndex,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+  );
   const starter: Starter = {
     species: starterSpecies,
     dexAttr: pokemon.getDexAttr(),
     abilityIndex: pokemon.abilityIndex,
     passive: false,
     nature: pokemon.getNature(),
-    pokerus: pokemon.pokerus
+    pokerus: pokemon.pokerus,
   };
   pokemon.destroy();
   return starter;
 }
 
 interface BiomeWeights {
-  [key: number]: number
+  [key: number]: number;
 }
 
 // Initially weighted by amount of exits each biome has
@@ -122,7 +143,7 @@ const dailyBiomeWeights: BiomeWeights = {
 };
 
 export function getDailyStartingBiome(): Biome {
-  const biomes = Utils.getEnumValues(Biome).filter(b => b !== Biome.TOWN && b !== Biome.END);
+  const biomes = getEnumValues(Biome).filter(b => b !== Biome.TOWN && b !== Biome.END);
 
   let totalWeight = 0;
   const biomeThresholds: number[] = [];
@@ -134,7 +155,7 @@ export function getDailyStartingBiome(): Biome {
     biomeThresholds.push(totalWeight);
   }
 
-  const randInt = Utils.randSeedInt(totalWeight);
+  const randInt = randSeedInt(totalWeight);
 
   for (let i = 0; i < biomes.length; i++) {
     if (randInt < biomeThresholds[i]) {
@@ -143,5 +164,5 @@ export function getDailyStartingBiome(): Biome {
   }
 
   // Fallback in case something went wrong
-  return biomes[Utils.randSeedInt(biomes.length)];
+  return biomes[randSeedInt(biomes.length)];
 }
diff --git a/src/data/data-lists.ts b/src/data/data-lists.ts
new file mode 100644
index 00000000000..d3c31abc851
--- /dev/null
+++ b/src/data/data-lists.ts
@@ -0,0 +1,3 @@
+import type { Ability } from "./abilities/ability-class";
+
+export const allAbilities: Ability[] = [];
diff --git a/src/data/dialogue.ts b/src/data/dialogue.ts
index f4933a070fd..fa640e92b00 100644
--- a/src/data/dialogue.ts
+++ b/src/data/dialogue.ts
@@ -1,15 +1,15 @@
 import { BattleSpec } from "#enums/battle-spec";
 import { TrainerType } from "#enums/trainer-type";
-import { trainerConfigs } from "./trainer-config";
+import { trainerConfigs } from "./trainers/trainer-config";
 
 export interface TrainerTypeMessages {
-    encounter?: string | string[],
-    victory?: string | string[],
-    defeat?: string | string[]
+  encounter?: string | string[];
+  victory?: string | string[];
+  defeat?: string | string[];
 }
 
 export interface TrainerTypeDialogue {
-    [key: number]: TrainerTypeMessages | Array<TrainerTypeMessages>
+  [key: number]: TrainerTypeMessages | Array<TrainerTypeMessages>;
 }
 
 export function getTrainerTypeDialogue(): TrainerTypeDialogue {
@@ -32,7 +32,7 @@ export const trainerTypeDialogue: TrainerTypeDialogue = {
         "dialogue:youngster.encounter.10",
         "dialogue:youngster.encounter.11",
         "dialogue:youngster.encounter.12",
-        "dialogue:youngster.encounter.13"
+        "dialogue:youngster.encounter.13",
       ],
       victory: [
         "dialogue:youngster.victory.1",
@@ -48,7 +48,7 @@ export const trainerTypeDialogue: TrainerTypeDialogue = {
         "dialogue:youngster.victory.11",
         "dialogue:youngster.victory.12",
         "dialogue:youngster.victory.13",
-      ]
+      ],
     },
     //LASS
     {
@@ -61,7 +61,7 @@ export const trainerTypeDialogue: TrainerTypeDialogue = {
         "dialogue:lass.encounter.6",
         "dialogue:lass.encounter.7",
         "dialogue:lass.encounter.8",
-        "dialogue:lass.encounter.9"
+        "dialogue:lass.encounter.9",
       ],
       victory: [
         "dialogue:lass.victory.1",
@@ -72,27 +72,15 @@ export const trainerTypeDialogue: TrainerTypeDialogue = {
         "dialogue:lass.victory.6",
         "dialogue:lass.victory.7",
         "dialogue:lass.victory.8",
-        "dialogue:lass.victory.9"
-      ]
-    }
+        "dialogue:lass.victory.9",
+      ],
+    },
   ],
   [TrainerType.BREEDER]: [
     {
-      encounter: [
-        "dialogue:breeder.encounter.1",
-        "dialogue:breeder.encounter.2",
-        "dialogue:breeder.encounter.3",
-      ],
-      victory: [
-        "dialogue:breeder.victory.1",
-        "dialogue:breeder.victory.2",
-        "dialogue:breeder.victory.3",
-      ],
-      defeat: [
-        "dialogue:breeder.defeat.1",
-        "dialogue:breeder.defeat.2",
-        "dialogue:breeder.defeat.3",
-      ]
+      encounter: ["dialogue:breeder.encounter.1", "dialogue:breeder.encounter.2", "dialogue:breeder.encounter.3"],
+      victory: ["dialogue:breeder.victory.1", "dialogue:breeder.victory.2", "dialogue:breeder.victory.3"],
+      defeat: ["dialogue:breeder.defeat.1", "dialogue:breeder.defeat.2", "dialogue:breeder.defeat.3"],
     },
     {
       encounter: [
@@ -109,21 +97,13 @@ export const trainerTypeDialogue: TrainerTypeDialogue = {
         "dialogue:breeder_female.defeat.1",
         "dialogue:breeder_female.defeat.2",
         "dialogue:breeder_female.defeat.3",
-      ]
-    }
+      ],
+    },
   ],
   [TrainerType.FISHERMAN]: [
     {
-      encounter: [
-        "dialogue:fisherman.encounter.1",
-        "dialogue:fisherman.encounter.2",
-        "dialogue:fisherman.encounter.3",
-      ],
-      victory: [
-        "dialogue:fisherman.victory.1",
-        "dialogue:fisherman.victory.2",
-        "dialogue:fisherman.victory.3",
-      ]
+      encounter: ["dialogue:fisherman.encounter.1", "dialogue:fisherman.encounter.2", "dialogue:fisherman.encounter.3"],
+      victory: ["dialogue:fisherman.victory.1", "dialogue:fisherman.victory.2", "dialogue:fisherman.victory.3"],
     },
     {
       encounter: [
@@ -135,22 +115,14 @@ export const trainerTypeDialogue: TrainerTypeDialogue = {
         "dialogue:fisherman_female.victory.1",
         "dialogue:fisherman_female.victory.2",
         "dialogue:fisherman_female.victory.3",
-      ]
-    }
+      ],
+    },
   ],
   [TrainerType.SWIMMER]: [
     {
-      encounter: [
-        "dialogue:swimmer.encounter.1",
-        "dialogue:swimmer.encounter.2",
-        "dialogue:swimmer.encounter.3",
-      ],
-      victory: [
-        "dialogue:swimmer.victory.1",
-        "dialogue:swimmer.victory.2",
-        "dialogue:swimmer.victory.3",
-      ]
-    }
+      encounter: ["dialogue:swimmer.encounter.1", "dialogue:swimmer.encounter.2", "dialogue:swimmer.encounter.3"],
+      victory: ["dialogue:swimmer.victory.1", "dialogue:swimmer.victory.2", "dialogue:swimmer.victory.3"],
+    },
   ],
   [TrainerType.BACKPACKER]: [
     {
@@ -165,8 +137,8 @@ export const trainerTypeDialogue: TrainerTypeDialogue = {
         "dialogue:backpacker.victory.2",
         "dialogue:backpacker.victory.3",
         "dialogue:backpacker.victory.4",
-      ]
-    }
+      ],
+    },
   ],
   [TrainerType.ACE_TRAINER]: [
     {
@@ -187,258 +159,138 @@ export const trainerTypeDialogue: TrainerTypeDialogue = {
         "dialogue:ace_trainer.defeat.2",
         "dialogue:ace_trainer.defeat.3",
         "dialogue:ace_trainer.defeat.4",
-      ]
-    }
+      ],
+    },
   ],
   [TrainerType.PARASOL_LADY]: [
     {
-      encounter: [
-        "dialogue:parasol_lady.encounter.1",
-      ],
-      victory: [
-        "dialogue:parasol_lady.victory.1",
-      ]
-    }
+      encounter: ["dialogue:parasol_lady.encounter.1"],
+      victory: ["dialogue:parasol_lady.victory.1"],
+    },
   ],
   [TrainerType.TWINS]: [
     {
-      encounter: [
-        "dialogue:twins.encounter.1",
-        "dialogue:twins.encounter.2",
-        "dialogue:twins.encounter.3",
-      ],
-      victory: [
-        "dialogue:twins.victory.1",
-        "dialogue:twins.victory.2",
-        "dialogue:twins.victory.3",
-      ],
-      defeat: [
-        "dialogue:twins.defeat.1",
-        "dialogue:twins.defeat.2",
-        "dialogue:twins.defeat.3",
-      ],
-    }
+      encounter: ["dialogue:twins.encounter.1", "dialogue:twins.encounter.2", "dialogue:twins.encounter.3"],
+      victory: ["dialogue:twins.victory.1", "dialogue:twins.victory.2", "dialogue:twins.victory.3"],
+      defeat: ["dialogue:twins.defeat.1", "dialogue:twins.defeat.2", "dialogue:twins.defeat.3"],
+    },
   ],
   [TrainerType.CYCLIST]: [
     {
-      encounter: [
-        "dialogue:cyclist.encounter.1",
-        "dialogue:cyclist.encounter.2",
-        "dialogue:cyclist.encounter.3",
-      ],
-      victory: [
-        "dialogue:cyclist.victory.1",
-        "dialogue:cyclist.victory.2",
-        "dialogue:cyclist.victory.3",
-      ]
-    }
+      encounter: ["dialogue:cyclist.encounter.1", "dialogue:cyclist.encounter.2", "dialogue:cyclist.encounter.3"],
+      victory: ["dialogue:cyclist.victory.1", "dialogue:cyclist.victory.2", "dialogue:cyclist.victory.3"],
+    },
   ],
   [TrainerType.BLACK_BELT]: [
     {
-      encounter: [
-        "dialogue:black_belt.encounter.1",
-        "dialogue:black_belt.encounter.2",
-      ],
-      victory: [
-        "dialogue:black_belt.victory.1",
-        "dialogue:black_belt.victory.2",
-      ]
+      encounter: ["dialogue:black_belt.encounter.1", "dialogue:black_belt.encounter.2"],
+      victory: ["dialogue:black_belt.victory.1", "dialogue:black_belt.victory.2"],
     },
     //BATTLE GIRL
     {
-      encounter: [
-        "dialogue:battle_girl.encounter.1",
-      ],
-      victory: [
-        "dialogue:battle_girl.victory.1",
-      ]
-    }
+      encounter: ["dialogue:battle_girl.encounter.1"],
+      victory: ["dialogue:battle_girl.victory.1"],
+    },
   ],
   [TrainerType.HIKER]: [
     {
-      encounter: [
-        "dialogue:hiker.encounter.1",
-        "dialogue:hiker.encounter.2",
-      ],
-      victory: [
-        "dialogue:hiker.victory.1",
-        "dialogue:hiker.victory.2",
-      ]
-    }
+      encounter: ["dialogue:hiker.encounter.1", "dialogue:hiker.encounter.2"],
+      victory: ["dialogue:hiker.victory.1", "dialogue:hiker.victory.2"],
+    },
   ],
   [TrainerType.RANGER]: [
     {
-      encounter: [
-        "dialogue:ranger.encounter.1",
-        "dialogue:ranger.encounter.2",
-      ],
-      victory: [
-        "dialogue:ranger.victory.1",
-        "dialogue:ranger.victory.2",
-      ],
-      defeat: [
-        "dialogue:ranger.defeat.1",
-        "dialogue:ranger.defeat.2",
-      ]
-    }
+      encounter: ["dialogue:ranger.encounter.1", "dialogue:ranger.encounter.2"],
+      victory: ["dialogue:ranger.victory.1", "dialogue:ranger.victory.2"],
+      defeat: ["dialogue:ranger.defeat.1", "dialogue:ranger.defeat.2"],
+    },
   ],
   [TrainerType.SCIENTIST]: [
     {
-      encounter: [
-        "dialogue:scientist.encounter.1",
-      ],
-      victory: [
-        "dialogue:scientist.victory.1",
-      ]
-    }
+      encounter: ["dialogue:scientist.encounter.1"],
+      victory: ["dialogue:scientist.victory.1"],
+    },
   ],
   [TrainerType.SCHOOL_KID]: [
     {
-      encounter: [
-        "dialogue:school_kid.encounter.1",
-        "dialogue:school_kid.encounter.2",
-      ],
-      victory: [
-        "dialogue:school_kid.victory.1",
-        "dialogue:school_kid.victory.2",
-      ]
-    }
+      encounter: ["dialogue:school_kid.encounter.1", "dialogue:school_kid.encounter.2"],
+      victory: ["dialogue:school_kid.victory.1", "dialogue:school_kid.victory.2"],
+    },
   ],
   [TrainerType.ARTIST]: [
     {
-      encounter: [
-        "dialogue:artist.encounter.1",
-      ],
-      victory: [
-        "dialogue:artist.victory.1",
-      ]
-    }
+      encounter: ["dialogue:artist.encounter.1"],
+      victory: ["dialogue:artist.victory.1"],
+    },
   ],
   [TrainerType.GUITARIST]: [
     {
-      encounter: [
-        "dialogue:guitarist.encounter.1",
-      ],
-      victory: [
-        "dialogue:guitarist.victory.1",
-      ]
-    }
+      encounter: ["dialogue:guitarist.encounter.1"],
+      victory: ["dialogue:guitarist.victory.1"],
+    },
   ],
   [TrainerType.WORKER]: [
     {
-      encounter: [
-        "dialogue:worker.encounter.1",
-      ],
-      victory: [
-        "dialogue:worker.victory.1",
-      ]
+      encounter: ["dialogue:worker.encounter.1"],
+      victory: ["dialogue:worker.victory.1"],
     },
     {
-      encounter: [
-        "dialogue:worker_female.encounter.1",
-      ],
-      victory: [
-        "dialogue:worker_female.victory.1",
-      ],
-      defeat: [
-        "dialogue:worker_female.defeat.1",
-      ]
+      encounter: ["dialogue:worker_female.encounter.1"],
+      victory: ["dialogue:worker_female.victory.1"],
+      defeat: ["dialogue:worker_female.defeat.1"],
     },
     {
-      encounter: [
-        "dialogue:worker_double.encounter.1",
-      ],
-      victory: [
-        "dialogue:worker_double.victory.1",
-      ]
+      encounter: ["dialogue:worker_double.encounter.1"],
+      victory: ["dialogue:worker_double.victory.1"],
     },
   ],
   // Defeat dialogue in the language .JSONS exist as translated or placeholders; (en, fr, it, es, de, ja, ko, zh_cn, zh_tw, pt_br)
   [TrainerType.SNOW_WORKER]: [
     {
-      encounter: [
-        "dialogue:snow_worker.encounter.1",
-      ],
-      victory: [
-        "dialogue:snow_worker.victory.1",
-      ]
+      encounter: ["dialogue:snow_worker.encounter.1"],
+      victory: ["dialogue:snow_worker.victory.1"],
     },
     {
-      encounter: [
-        "dialogue:snow_worker_double.encounter.1",
-      ],
-      victory: [
-        "dialogue:snow_worker_double.victory.1",
-      ]
+      encounter: ["dialogue:snow_worker_double.encounter.1"],
+      victory: ["dialogue:snow_worker_double.victory.1"],
     },
   ],
   [TrainerType.HEX_MANIAC]: [
     {
-      encounter: [
-        "dialogue:hex_maniac.encounter.1",
-        "dialogue:hex_maniac.encounter.2",
-      ],
-      victory: [
-        "dialogue:hex_maniac.victory.1",
-        "dialogue:hex_maniac.victory.2",
-      ],
-      defeat: [
-        "dialogue:hex_maniac.defeat.1",
-        "dialogue:hex_maniac.defeat.2",
-      ]
-    }
+      encounter: ["dialogue:hex_maniac.encounter.1", "dialogue:hex_maniac.encounter.2"],
+      victory: ["dialogue:hex_maniac.victory.1", "dialogue:hex_maniac.victory.2"],
+      defeat: ["dialogue:hex_maniac.defeat.1", "dialogue:hex_maniac.defeat.2"],
+    },
   ],
   [TrainerType.PSYCHIC]: [
     {
-      encounter: [
-        "dialogue:psychic.encounter.1",
-      ],
-      victory: [
-        "dialogue:psychic.victory.1",
-      ]
-    }
+      encounter: ["dialogue:psychic.encounter.1"],
+      victory: ["dialogue:psychic.victory.1"],
+    },
   ],
   [TrainerType.OFFICER]: [
     {
-      encounter: [
-        "dialogue:officer.encounter.1",
-        "dialogue:officer.encounter.2",
-      ],
-      victory: [
-        "dialogue:officer.victory.1",
-        "dialogue:officer.victory.2",
-      ],
-    }
+      encounter: ["dialogue:officer.encounter.1", "dialogue:officer.encounter.2"],
+      victory: ["dialogue:officer.victory.1", "dialogue:officer.victory.2"],
+    },
   ],
   [TrainerType.BEAUTY]: [
     {
-      encounter: [
-        "dialogue:beauty.encounter.1",
-      ],
-      victory: [
-        "dialogue:beauty.victory.1",
-      ]
-    }
+      encounter: ["dialogue:beauty.encounter.1"],
+      victory: ["dialogue:beauty.victory.1"],
+    },
   ],
   [TrainerType.BAKER]: [
     {
-      encounter: [
-        "dialogue:baker.encounter.1",
-      ],
-      victory: [
-        "dialogue:baker.victory.1",
-      ]
-    }
+      encounter: ["dialogue:baker.encounter.1"],
+      victory: ["dialogue:baker.victory.1"],
+    },
   ],
   [TrainerType.BIKER]: [
     {
-      encounter: [
-        "dialogue:biker.encounter.1",
-      ],
-      victory: [
-        "dialogue:biker.victory.1",
-      ]
-    }
+      encounter: ["dialogue:biker.encounter.1"],
+      victory: ["dialogue:biker.victory.1"],
+    },
   ],
   [TrainerType.FIREBREATHER]: [
     {
@@ -451,22 +303,121 @@ export const trainerTypeDialogue: TrainerTypeDialogue = {
         "dialogue:firebreather.victory.1",
         "dialogue:firebreather.victory.2",
         "dialogue:firebreather.victory.3",
-      ]
-    }
+      ],
+    },
   ],
   [TrainerType.SAILOR]: [
+    {
+      encounter: ["dialogue:sailor.encounter.1", "dialogue:sailor.encounter.2", "dialogue:sailor.encounter.3"],
+      victory: ["dialogue:sailor.victory.1", "dialogue:sailor.victory.2", "dialogue:sailor.victory.3"],
+    },
+  ],
+  [TrainerType.CLERK]: [
+    {
+      encounter: ["dialogue:clerk.encounter.1", "dialogue:clerk.encounter.2", "dialogue:clerk.encounter.3"],
+      victory: ["dialogue:clerk.victory.1", "dialogue:clerk.victory.2", "dialogue:clerk.victory.3"],
+    },
     {
       encounter: [
-        "dialogue:sailor.encounter.1",
-        "dialogue:sailor.encounter.2",
-        "dialogue:sailor.encounter.3",
+        "dialogue:clerk_female.encounter.1",
+        "dialogue:clerk_female.encounter.2",
+        "dialogue:clerk_female.encounter.3",
       ],
       victory: [
-        "dialogue:sailor.victory.1",
-        "dialogue:sailor.victory.2",
-        "dialogue:sailor.victory.3",
-      ]
-    }
+        "dialogue:clerk_female.victory.1",
+        "dialogue:clerk_female.victory.2",
+        "dialogue:clerk_female.victory.3",
+      ],
+    },
+  ],
+  [TrainerType.HOOLIGANS]: [
+    {
+      encounter: ["dialogue:hooligans.encounter.1", "dialogue:hooligans.encounter.2"],
+      victory: ["dialogue:hooligans.victory.1", "dialogue:hooligans.victory.2"],
+    },
+  ],
+  [TrainerType.MUSICIAN]: [
+    {
+      encounter: [
+        "dialogue:musician.encounter.1",
+        "dialogue:musician.encounter.2",
+        "dialogue:musician.encounter.3",
+        "dialogue:musician.encounter.4",
+      ],
+      victory: ["dialogue:musician.victory.1", "dialogue:musician.victory.2", "dialogue:musician.victory.3"],
+    },
+  ],
+  [TrainerType.PILOT]: [
+    {
+      encounter: [
+        "dialogue:pilot.encounter.1",
+        "dialogue:pilot.encounter.2",
+        "dialogue:pilot.encounter.3",
+        "dialogue:pilot.encounter.4",
+      ],
+      victory: [
+        "dialogue:pilot.victory.1",
+        "dialogue:pilot.victory.2",
+        "dialogue:pilot.victory.3",
+        "dialogue:pilot.victory.4",
+      ],
+    },
+  ],
+  [TrainerType.POKEFAN]: [
+    {
+      encounter: ["dialogue:pokefan.encounter.1", "dialogue:pokefan.encounter.2", "dialogue:pokefan.encounter.3"],
+      victory: ["dialogue:pokefan.victory.1", "dialogue:pokefan.victory.2", "dialogue:pokefan.victory.3"],
+    },
+    {
+      encounter: [
+        "dialogue:pokefan_female.encounter.1",
+        "dialogue:pokefan_female.encounter.2",
+        "dialogue:pokefan_female.encounter.3",
+      ],
+      victory: [
+        "dialogue:pokefan_female.victory.1",
+        "dialogue:pokefan_female.victory.2",
+        "dialogue:pokefan_female.victory.3",
+      ],
+    },
+  ],
+  [TrainerType.RICH]: [
+    {
+      encounter: ["dialogue:rich.encounter.1", "dialogue:rich.encounter.2", "dialogue:rich.encounter.3"],
+      victory: ["dialogue:rich.victory.1", "dialogue:rich.victory.2", "dialogue:rich.victory.3"],
+    },
+    {
+      encounter: [
+        "dialogue:rich_female.encounter.1",
+        "dialogue:rich_female.encounter.2",
+        "dialogue:rich_female.encounter.3",
+      ],
+      victory: ["dialogue:rich_female.victory.1", "dialogue:rich_female.victory.2", "dialogue:rich_female.victory.3"],
+    },
+  ],
+  [TrainerType.RICH_KID]: [
+    {
+      encounter: ["dialogue:rich_kid.encounter.1", "dialogue:rich_kid.encounter.2", "dialogue:rich_kid.encounter.3"],
+      victory: [
+        "dialogue:rich_kid.victory.1",
+        "dialogue:rich_kid.victory.2",
+        "dialogue:rich_kid.victory.3",
+        "dialogue:rich_kid.victory.4",
+      ],
+    },
+    {
+      encounter: [
+        "dialogue:rich_kid_female.encounter.1",
+        "dialogue:rich_kid_female.encounter.2",
+        "dialogue:rich_kid_female.encounter.3",
+      ],
+      victory: [
+        "dialogue:rich_kid_female.victory.1",
+        "dialogue:rich_kid_female.victory.2",
+        "dialogue:rich_kid_female.victory.3",
+        "dialogue:rich_kid_female.victory.4",
+      ],
+    },
   ],
   [TrainerType.ROCKET_GRUNT]: [
     {
@@ -483,64 +434,32 @@ export const trainerTypeDialogue: TrainerTypeDialogue = {
         "dialogue:rocket_grunt.victory.3",
         "dialogue:rocket_grunt.victory.4",
         "dialogue:rocket_grunt.victory.5",
-      ]
-    }
+      ],
+    },
   ],
   [TrainerType.ARCHER]: [
     {
-      encounter: [
-        "dialogue:archer.encounter.1",
-        "dialogue:archer.encounter.2",
-        "dialogue:archer.encounter.3",
-      ],
-      victory: [
-        "dialogue:archer.victory.1",
-        "dialogue:archer.victory.2",
-        "dialogue:archer.victory.3",
-      ]
-    }
+      encounter: ["dialogue:archer.encounter.1", "dialogue:archer.encounter.2", "dialogue:archer.encounter.3"],
+      victory: ["dialogue:archer.victory.1", "dialogue:archer.victory.2", "dialogue:archer.victory.3"],
+    },
   ],
   [TrainerType.ARIANA]: [
     {
-      encounter: [
-        "dialogue:ariana.encounter.1",
-        "dialogue:ariana.encounter.2",
-        "dialogue:ariana.encounter.3",
-      ],
-      victory: [
-        "dialogue:ariana.victory.1",
-        "dialogue:ariana.victory.2",
-        "dialogue:ariana.victory.3",
-      ]
-    }
+      encounter: ["dialogue:ariana.encounter.1", "dialogue:ariana.encounter.2", "dialogue:ariana.encounter.3"],
+      victory: ["dialogue:ariana.victory.1", "dialogue:ariana.victory.2", "dialogue:ariana.victory.3"],
+    },
   ],
   [TrainerType.PROTON]: [
     {
-      encounter: [
-        "dialogue:proton.encounter.1",
-        "dialogue:proton.encounter.2",
-        "dialogue:proton.encounter.3",
-      ],
-      victory: [
-        "dialogue:proton.victory.1",
-        "dialogue:proton.victory.2",
-        "dialogue:proton.victory.3",
-      ]
-    }
+      encounter: ["dialogue:proton.encounter.1", "dialogue:proton.encounter.2", "dialogue:proton.encounter.3"],
+      victory: ["dialogue:proton.victory.1", "dialogue:proton.victory.2", "dialogue:proton.victory.3"],
+    },
   ],
   [TrainerType.PETREL]: [
     {
-      encounter: [
-        "dialogue:petrel.encounter.1",
-        "dialogue:petrel.encounter.2",
-        "dialogue:petrel.encounter.3",
-      ],
-      victory: [
-        "dialogue:petrel.victory.1",
-        "dialogue:petrel.victory.2",
-        "dialogue:petrel.victory.3",
-      ]
-    }
+      encounter: ["dialogue:petrel.encounter.1", "dialogue:petrel.encounter.2", "dialogue:petrel.encounter.3"],
+      victory: ["dialogue:petrel.victory.1", "dialogue:petrel.victory.2", "dialogue:petrel.victory.3"],
+    },
   ],
   [TrainerType.MAGMA_GRUNT]: [
     {
@@ -557,36 +476,20 @@ export const trainerTypeDialogue: TrainerTypeDialogue = {
         "dialogue:magma_grunt.victory.3",
         "dialogue:magma_grunt.victory.4",
         "dialogue:magma_grunt.victory.5",
-      ]
-    }
+      ],
+    },
   ],
   [TrainerType.TABITHA]: [
     {
-      encounter: [
-        "dialogue:tabitha.encounter.1",
-        "dialogue:tabitha.encounter.2",
-        "dialogue:tabitha.encounter.3",
-      ],
-      victory: [
-        "dialogue:tabitha.victory.1",
-        "dialogue:tabitha.victory.2",
-        "dialogue:tabitha.victory.3",
-      ]
-    }
+      encounter: ["dialogue:tabitha.encounter.1", "dialogue:tabitha.encounter.2", "dialogue:tabitha.encounter.3"],
+      victory: ["dialogue:tabitha.victory.1", "dialogue:tabitha.victory.2", "dialogue:tabitha.victory.3"],
+    },
   ],
   [TrainerType.COURTNEY]: [
     {
-      encounter: [
-        "dialogue:courtney.encounter.1",
-        "dialogue:courtney.encounter.2",
-        "dialogue:courtney.encounter.3",
-      ],
-      victory: [
-        "dialogue:courtney.victory.1",
-        "dialogue:courtney.victory.2",
-        "dialogue:courtney.victory.3",
-      ]
-    }
+      encounter: ["dialogue:courtney.encounter.1", "dialogue:courtney.encounter.2", "dialogue:courtney.encounter.3"],
+      victory: ["dialogue:courtney.victory.1", "dialogue:courtney.victory.2", "dialogue:courtney.victory.3"],
+    },
   ],
   [TrainerType.AQUA_GRUNT]: [
     {
@@ -603,36 +506,20 @@ export const trainerTypeDialogue: TrainerTypeDialogue = {
         "dialogue:aqua_grunt.victory.3",
         "dialogue:aqua_grunt.victory.4",
         "dialogue:aqua_grunt.victory.5",
-      ]
-    }
+      ],
+    },
   ],
   [TrainerType.MATT]: [
     {
-      encounter: [
-        "dialogue:matt.encounter.1",
-        "dialogue:matt.encounter.2",
-        "dialogue:matt.encounter.3",
-      ],
-      victory: [
-        "dialogue:matt.victory.1",
-        "dialogue:matt.victory.2",
-        "dialogue:matt.victory.3",
-      ]
-    }
+      encounter: ["dialogue:matt.encounter.1", "dialogue:matt.encounter.2", "dialogue:matt.encounter.3"],
+      victory: ["dialogue:matt.victory.1", "dialogue:matt.victory.2", "dialogue:matt.victory.3"],
+    },
   ],
   [TrainerType.SHELLY]: [
     {
-      encounter: [
-        "dialogue:shelly.encounter.1",
-        "dialogue:shelly.encounter.2",
-        "dialogue:shelly.encounter.3",
-      ],
-      victory: [
-        "dialogue:shelly.victory.1",
-        "dialogue:shelly.victory.2",
-        "dialogue:shelly.victory.3",
-      ]
-    }
+      encounter: ["dialogue:shelly.encounter.1", "dialogue:shelly.encounter.2", "dialogue:shelly.encounter.3"],
+      victory: ["dialogue:shelly.victory.1", "dialogue:shelly.victory.2", "dialogue:shelly.victory.3"],
+    },
   ],
   [TrainerType.GALACTIC_GRUNT]: [
     {
@@ -649,50 +536,26 @@ export const trainerTypeDialogue: TrainerTypeDialogue = {
         "dialogue:galactic_grunt.victory.3",
         "dialogue:galactic_grunt.victory.4",
         "dialogue:galactic_grunt.victory.5",
-      ]
-    }
+      ],
+    },
   ],
   [TrainerType.JUPITER]: [
     {
-      encounter: [
-        "dialogue:jupiter.encounter.1",
-        "dialogue:jupiter.encounter.2",
-        "dialogue:jupiter.encounter.3",
-      ],
-      victory: [
-        "dialogue:jupiter.victory.1",
-        "dialogue:jupiter.victory.2",
-        "dialogue:jupiter.victory.3",
-      ]
-    }
+      encounter: ["dialogue:jupiter.encounter.1", "dialogue:jupiter.encounter.2", "dialogue:jupiter.encounter.3"],
+      victory: ["dialogue:jupiter.victory.1", "dialogue:jupiter.victory.2", "dialogue:jupiter.victory.3"],
+    },
   ],
   [TrainerType.MARS]: [
     {
-      encounter: [
-        "dialogue:mars.encounter.1",
-        "dialogue:mars.encounter.2",
-        "dialogue:mars.encounter.3",
-      ],
-      victory: [
-        "dialogue:mars.victory.1",
-        "dialogue:mars.victory.2",
-        "dialogue:mars.victory.3",
-      ]
-    }
+      encounter: ["dialogue:mars.encounter.1", "dialogue:mars.encounter.2", "dialogue:mars.encounter.3"],
+      victory: ["dialogue:mars.victory.1", "dialogue:mars.victory.2", "dialogue:mars.victory.3"],
+    },
   ],
   [TrainerType.SATURN]: [
     {
-      encounter: [
-        "dialogue:saturn.encounter.1",
-        "dialogue:saturn.encounter.2",
-        "dialogue:saturn.encounter.3",
-      ],
-      victory: [
-        "dialogue:saturn.victory.1",
-        "dialogue:saturn.victory.2",
-        "dialogue:saturn.victory.3",
-      ]
-    }
+      encounter: ["dialogue:saturn.encounter.1", "dialogue:saturn.encounter.2", "dialogue:saturn.encounter.3"],
+      victory: ["dialogue:saturn.victory.1", "dialogue:saturn.victory.2", "dialogue:saturn.victory.3"],
+    },
   ],
   [TrainerType.PLASMA_GRUNT]: [
     {
@@ -709,36 +572,20 @@ export const trainerTypeDialogue: TrainerTypeDialogue = {
         "dialogue:plasma_grunt.victory.3",
         "dialogue:plasma_grunt.victory.4",
         "dialogue:plasma_grunt.victory.5",
-      ]
-    }
+      ],
+    },
   ],
   [TrainerType.ZINZOLIN]: [
     {
-      encounter: [
-        "dialogue:zinzolin.encounter.1",
-        "dialogue:zinzolin.encounter.2",
-        "dialogue:zinzolin.encounter.3",
-      ],
-      victory: [
-        "dialogue:zinzolin.victory.1",
-        "dialogue:zinzolin.victory.2",
-        "dialogue:zinzolin.victory.3",
-      ]
-    }
+      encounter: ["dialogue:zinzolin.encounter.1", "dialogue:zinzolin.encounter.2", "dialogue:zinzolin.encounter.3"],
+      victory: ["dialogue:zinzolin.victory.1", "dialogue:zinzolin.victory.2", "dialogue:zinzolin.victory.3"],
+    },
   ],
   [TrainerType.COLRESS]: [
     {
-      encounter: [
-        "dialogue:colress.encounter.1",
-        "dialogue:colress.encounter.2",
-        "dialogue:colress.encounter.3",
-      ],
-      victory: [
-        "dialogue:colress.victory.1",
-        "dialogue:colress.victory.2",
-        "dialogue:colress.victory.3",
-      ]
-    }
+      encounter: ["dialogue:colress.encounter.1", "dialogue:colress.encounter.2", "dialogue:colress.encounter.3"],
+      victory: ["dialogue:colress.victory.1", "dialogue:colress.victory.2", "dialogue:colress.victory.3"],
+    },
   ],
   [TrainerType.FLARE_GRUNT]: [
     {
@@ -755,36 +602,20 @@ export const trainerTypeDialogue: TrainerTypeDialogue = {
         "dialogue:flare_grunt.victory.3",
         "dialogue:flare_grunt.victory.4",
         "dialogue:flare_grunt.victory.5",
-      ]
-    }
+      ],
+    },
   ],
   [TrainerType.BRYONY]: [
     {
-      encounter: [
-        "dialogue:bryony.encounter.1",
-        "dialogue:bryony.encounter.2",
-        "dialogue:bryony.encounter.3",
-      ],
-      victory: [
-        "dialogue:bryony.victory.1",
-        "dialogue:bryony.victory.2",
-        "dialogue:bryony.victory.3",
-      ]
-    }
+      encounter: ["dialogue:bryony.encounter.1", "dialogue:bryony.encounter.2", "dialogue:bryony.encounter.3"],
+      victory: ["dialogue:bryony.victory.1", "dialogue:bryony.victory.2", "dialogue:bryony.victory.3"],
+    },
   ],
   [TrainerType.XEROSIC]: [
     {
-      encounter: [
-        "dialogue:xerosic.encounter.1",
-        "dialogue:xerosic.encounter.2",
-        "dialogue:xerosic.encounter.3",
-      ],
-      victory: [
-        "dialogue:xerosic.victory.1",
-        "dialogue:xerosic.victory.2",
-        "dialogue:xerosic.victory.3",
-      ]
-    }
+      encounter: ["dialogue:xerosic.encounter.1", "dialogue:xerosic.encounter.2", "dialogue:xerosic.encounter.3"],
+      victory: ["dialogue:xerosic.victory.1", "dialogue:xerosic.victory.2", "dialogue:xerosic.victory.3"],
+    },
   ],
   [TrainerType.AETHER_GRUNT]: [
     {
@@ -801,22 +632,14 @@ export const trainerTypeDialogue: TrainerTypeDialogue = {
         "dialogue:aether_grunt.victory.3",
         "dialogue:aether_grunt.victory.4",
         "dialogue:aether_grunt.victory.5",
-      ]
-    }
+      ],
+    },
   ],
   [TrainerType.FABA]: [
     {
-      encounter: [
-        "dialogue:faba.encounter.1",
-        "dialogue:faba.encounter.2",
-        "dialogue:faba.encounter.3",
-      ],
-      victory: [
-        "dialogue:faba.victory.1",
-        "dialogue:faba.victory.2",
-        "dialogue:faba.victory.3",
-      ]
-    }
+      encounter: ["dialogue:faba.encounter.1", "dialogue:faba.encounter.2", "dialogue:faba.encounter.3"],
+      victory: ["dialogue:faba.victory.1", "dialogue:faba.victory.2", "dialogue:faba.victory.3"],
+    },
   ],
   [TrainerType.SKULL_GRUNT]: [
     {
@@ -833,22 +656,14 @@ export const trainerTypeDialogue: TrainerTypeDialogue = {
         "dialogue:skull_grunt.victory.3",
         "dialogue:skull_grunt.victory.4",
         "dialogue:skull_grunt.victory.5",
-      ]
-    }
+      ],
+    },
   ],
   [TrainerType.PLUMERIA]: [
     {
-      encounter: [
-        "dialogue:plumeria.encounter.1",
-        "dialogue:plumeria.encounter.2",
-        "dialogue:plumeria.encounter.3",
-      ],
-      victory: [
-        "dialogue:plumeria.victory.1",
-        "dialogue:plumeria.victory.2",
-        "dialogue:plumeria.victory.3",
-      ]
-    }
+      encounter: ["dialogue:plumeria.encounter.1", "dialogue:plumeria.encounter.2", "dialogue:plumeria.encounter.3"],
+      victory: ["dialogue:plumeria.victory.1", "dialogue:plumeria.victory.2", "dialogue:plumeria.victory.3"],
+    },
   ],
   [TrainerType.MACRO_GRUNT]: [
     {
@@ -865,22 +680,14 @@ export const trainerTypeDialogue: TrainerTypeDialogue = {
         "dialogue:macro_grunt.victory.3",
         "dialogue:macro_grunt.victory.4",
         "dialogue:macro_grunt.victory.5",
-      ]
-    }
+      ],
+    },
   ],
   [TrainerType.OLEANA]: [
     {
-      encounter: [
-        "dialogue:oleana.encounter.1",
-        "dialogue:oleana.encounter.2",
-        "dialogue:oleana.encounter.3",
-      ],
-      victory: [
-        "dialogue:oleana.victory.1",
-        "dialogue:oleana.victory.2",
-        "dialogue:oleana.victory.3",
-      ]
-    }
+      encounter: ["dialogue:oleana.encounter.1", "dialogue:oleana.encounter.2", "dialogue:oleana.encounter.3"],
+      victory: ["dialogue:oleana.victory.1", "dialogue:oleana.victory.2", "dialogue:oleana.victory.3"],
+    },
   ],
   [TrainerType.STAR_GRUNT]: [
     {
@@ -897,509 +704,258 @@ export const trainerTypeDialogue: TrainerTypeDialogue = {
         "dialogue:star_grunt.victory.3",
         "dialogue:star_grunt.victory.4",
         "dialogue:star_grunt.victory.5",
-      ]
-    }
+      ],
+    },
   ],
   [TrainerType.GIACOMO]: [
     {
-      encounter: [
-        "dialogue:giacomo.encounter.1",
-        "dialogue:giacomo.encounter.2",
-      ],
-      victory: [
-        "dialogue:giacomo.victory.1",
-        "dialogue:giacomo.victory.2",
-      ]
-    }
+      encounter: ["dialogue:giacomo.encounter.1", "dialogue:giacomo.encounter.2"],
+      victory: ["dialogue:giacomo.victory.1", "dialogue:giacomo.victory.2"],
+    },
   ],
   [TrainerType.MELA]: [
     {
-      encounter: [
-        "dialogue:mela.encounter.1",
-        "dialogue:mela.encounter.2",
-      ],
-      victory: [
-        "dialogue:mela.victory.1",
-        "dialogue:mela.victory.2",
-      ]
-    }
+      encounter: ["dialogue:mela.encounter.1", "dialogue:mela.encounter.2"],
+      victory: ["dialogue:mela.victory.1", "dialogue:mela.victory.2"],
+    },
   ],
   [TrainerType.ATTICUS]: [
     {
-      encounter: [
-        "dialogue:atticus.encounter.1",
-        "dialogue:atticus.encounter.2",
-      ],
-      victory: [
-        "dialogue:atticus.victory.1",
-        "dialogue:atticus.victory.2",
-      ]
-    }
+      encounter: ["dialogue:atticus.encounter.1", "dialogue:atticus.encounter.2"],
+      victory: ["dialogue:atticus.victory.1", "dialogue:atticus.victory.2"],
+    },
   ],
   [TrainerType.ORTEGA]: [
     {
-      encounter: [
-        "dialogue:ortega.encounter.1",
-        "dialogue:ortega.encounter.2",
-      ],
-      victory: [
-        "dialogue:ortega.victory.1",
-        "dialogue:ortega.victory.2",
-      ]
-    }
+      encounter: ["dialogue:ortega.encounter.1", "dialogue:ortega.encounter.2"],
+      victory: ["dialogue:ortega.victory.1", "dialogue:ortega.victory.2"],
+    },
   ],
   [TrainerType.ERI]: [
     {
-      encounter: [
-        "dialogue:eri.encounter.1",
-        "dialogue:eri.encounter.2",
-      ],
-      victory: [
-        "dialogue:eri.victory.1",
-        "dialogue:eri.victory.2",
-      ]
-    }
+      encounter: ["dialogue:eri.encounter.1", "dialogue:eri.encounter.2"],
+      victory: ["dialogue:eri.victory.1", "dialogue:eri.victory.2"],
+    },
   ],
   [TrainerType.ROCKET_BOSS_GIOVANNI_1]: [
     {
-      encounter: [
-        "dialogue:rocket_boss_giovanni_1.encounter.1"
-      ],
-      victory: [
-        "dialogue:rocket_boss_giovanni_1.victory.1"
-      ],
-      defeat: [
-        "dialogue:rocket_boss_giovanni_1.defeat.1"
-      ]
-    }
+      encounter: ["dialogue:rocket_boss_giovanni_1.encounter.1"],
+      victory: ["dialogue:rocket_boss_giovanni_1.victory.1"],
+      defeat: ["dialogue:rocket_boss_giovanni_1.defeat.1"],
+    },
   ],
   [TrainerType.ROCKET_BOSS_GIOVANNI_2]: [
     {
-      encounter: [
-        "dialogue:rocket_boss_giovanni_2.encounter.1"
-      ],
-      victory: [
-        "dialogue:rocket_boss_giovanni_2.victory.1"
-      ],
-      defeat: [
-        "dialogue:rocket_boss_giovanni_2.defeat.1"
-      ]
-    }
+      encounter: ["dialogue:rocket_boss_giovanni_2.encounter.1"],
+      victory: ["dialogue:rocket_boss_giovanni_2.victory.1"],
+      defeat: ["dialogue:rocket_boss_giovanni_2.defeat.1"],
+    },
   ],
   [TrainerType.MAXIE]: [
     {
-      encounter: [
-        "dialogue:magma_boss_maxie_1.encounter.1"
-      ],
-      victory: [
-        "dialogue:magma_boss_maxie_1.victory.1"
-      ],
-      defeat: [
-        "dialogue:magma_boss_maxie_1.defeat.1"
-      ]
-    }
+      encounter: ["dialogue:magma_boss_maxie_1.encounter.1"],
+      victory: ["dialogue:magma_boss_maxie_1.victory.1"],
+      defeat: ["dialogue:magma_boss_maxie_1.defeat.1"],
+    },
   ],
   [TrainerType.MAXIE_2]: [
     {
-      encounter: [
-        "dialogue:magma_boss_maxie_2.encounter.1"
-      ],
-      victory: [
-        "dialogue:magma_boss_maxie_2.victory.1"
-      ],
-      defeat: [
-        "dialogue:magma_boss_maxie_2.defeat.1"
-      ]
-    }
+      encounter: ["dialogue:magma_boss_maxie_2.encounter.1"],
+      victory: ["dialogue:magma_boss_maxie_2.victory.1"],
+      defeat: ["dialogue:magma_boss_maxie_2.defeat.1"],
+    },
   ],
   [TrainerType.ARCHIE]: [
     {
-      encounter: [
-        "dialogue:aqua_boss_archie_1.encounter.1"
-      ],
-      victory: [
-        "dialogue:aqua_boss_archie_1.victory.1"
-      ],
-      defeat: [
-        "dialogue:aqua_boss_archie_1.defeat.1"
-      ]
-    }
+      encounter: ["dialogue:aqua_boss_archie_1.encounter.1"],
+      victory: ["dialogue:aqua_boss_archie_1.victory.1"],
+      defeat: ["dialogue:aqua_boss_archie_1.defeat.1"],
+    },
   ],
   [TrainerType.ARCHIE_2]: [
     {
-      encounter: [
-        "dialogue:aqua_boss_archie_2.encounter.1"
-      ],
-      victory: [
-        "dialogue:aqua_boss_archie_2.victory.1"
-      ],
-      defeat: [
-        "dialogue:aqua_boss_archie_2.defeat.1"
-      ]
-    }
+      encounter: ["dialogue:aqua_boss_archie_2.encounter.1"],
+      victory: ["dialogue:aqua_boss_archie_2.victory.1"],
+      defeat: ["dialogue:aqua_boss_archie_2.defeat.1"],
+    },
   ],
   [TrainerType.CYRUS]: [
     {
-      encounter: [
-        "dialogue:galactic_boss_cyrus_1.encounter.1"
-      ],
-      victory: [
-        "dialogue:galactic_boss_cyrus_1.victory.1"
-      ],
-      defeat: [
-        "dialogue:galactic_boss_cyrus_1.defeat.1"
-      ]
-    }
+      encounter: ["dialogue:galactic_boss_cyrus_1.encounter.1"],
+      victory: ["dialogue:galactic_boss_cyrus_1.victory.1"],
+      defeat: ["dialogue:galactic_boss_cyrus_1.defeat.1"],
+    },
   ],
   [TrainerType.CYRUS_2]: [
     {
-      encounter: [
-        "dialogue:galactic_boss_cyrus_2.encounter.1"
-      ],
-      victory: [
-        "dialogue:galactic_boss_cyrus_2.victory.1"
-      ],
-      defeat: [
-        "dialogue:galactic_boss_cyrus_2.defeat.1"
-      ]
-    }
+      encounter: ["dialogue:galactic_boss_cyrus_2.encounter.1"],
+      victory: ["dialogue:galactic_boss_cyrus_2.victory.1"],
+      defeat: ["dialogue:galactic_boss_cyrus_2.defeat.1"],
+    },
   ],
   [TrainerType.GHETSIS]: [
     {
-      encounter: [
-        "dialogue:plasma_boss_ghetsis_1.encounter.1"
-      ],
-      victory: [
-        "dialogue:plasma_boss_ghetsis_1.victory.1"
-      ],
-      defeat: [
-        "dialogue:plasma_boss_ghetsis_1.defeat.1"
-      ]
-    }
+      encounter: ["dialogue:plasma_boss_ghetsis_1.encounter.1"],
+      victory: ["dialogue:plasma_boss_ghetsis_1.victory.1"],
+      defeat: ["dialogue:plasma_boss_ghetsis_1.defeat.1"],
+    },
   ],
   [TrainerType.GHETSIS_2]: [
     {
-      encounter: [
-        "dialogue:plasma_boss_ghetsis_2.encounter.1"
-      ],
-      victory: [
-        "dialogue:plasma_boss_ghetsis_2.victory.1"
-      ],
-      defeat: [
-        "dialogue:plasma_boss_ghetsis_2.defeat.1"
-      ]
-    }
+      encounter: ["dialogue:plasma_boss_ghetsis_2.encounter.1"],
+      victory: ["dialogue:plasma_boss_ghetsis_2.victory.1"],
+      defeat: ["dialogue:plasma_boss_ghetsis_2.defeat.1"],
+    },
   ],
   [TrainerType.LYSANDRE]: [
     {
-      encounter: [
-        "dialogue:flare_boss_lysandre_1.encounter.1"
-      ],
-      victory: [
-        "dialogue:flare_boss_lysandre_1.victory.1"
-      ],
-      defeat: [
-        "dialogue:flare_boss_lysandre_1.defeat.1"
-      ]
-    }
+      encounter: ["dialogue:flare_boss_lysandre_1.encounter.1"],
+      victory: ["dialogue:flare_boss_lysandre_1.victory.1"],
+      defeat: ["dialogue:flare_boss_lysandre_1.defeat.1"],
+    },
   ],
   [TrainerType.LYSANDRE_2]: [
     {
-      encounter: [
-        "dialogue:flare_boss_lysandre_2.encounter.1"
-      ],
-      victory: [
-        "dialogue:flare_boss_lysandre_2.victory.1"
-      ],
-      defeat: [
-        "dialogue:flare_boss_lysandre_2.defeat.1"
-      ]
-    }
+      encounter: ["dialogue:flare_boss_lysandre_2.encounter.1"],
+      victory: ["dialogue:flare_boss_lysandre_2.victory.1"],
+      defeat: ["dialogue:flare_boss_lysandre_2.defeat.1"],
+    },
   ],
   [TrainerType.LUSAMINE]: [
     {
-      encounter: [
-        "dialogue:aether_boss_lusamine_1.encounter.1"
-      ],
-      victory: [
-        "dialogue:aether_boss_lusamine_1.victory.1"
-      ],
-      defeat: [
-        "dialogue:aether_boss_lusamine_1.defeat.1"
-      ]
-    }
+      encounter: ["dialogue:aether_boss_lusamine_1.encounter.1"],
+      victory: ["dialogue:aether_boss_lusamine_1.victory.1"],
+      defeat: ["dialogue:aether_boss_lusamine_1.defeat.1"],
+    },
   ],
   [TrainerType.LUSAMINE_2]: [
     {
-      encounter: [
-        "dialogue:aether_boss_lusamine_2.encounter.1"
-      ],
-      victory: [
-        "dialogue:aether_boss_lusamine_2.victory.1"
-      ],
-      defeat: [
-        "dialogue:aether_boss_lusamine_2.defeat.1"
-      ]
-    }
+      encounter: ["dialogue:aether_boss_lusamine_2.encounter.1"],
+      victory: ["dialogue:aether_boss_lusamine_2.victory.1"],
+      defeat: ["dialogue:aether_boss_lusamine_2.defeat.1"],
+    },
   ],
   [TrainerType.GUZMA]: [
     {
-      encounter: [
-        "dialogue:skull_boss_guzma_1.encounter.1"
-      ],
-      victory: [
-        "dialogue:skull_boss_guzma_1.victory.1"
-      ],
-      defeat: [
-        "dialogue:skull_boss_guzma_1.defeat.1"
-      ]
-    }
+      encounter: ["dialogue:skull_boss_guzma_1.encounter.1"],
+      victory: ["dialogue:skull_boss_guzma_1.victory.1"],
+      defeat: ["dialogue:skull_boss_guzma_1.defeat.1"],
+    },
   ],
   [TrainerType.GUZMA_2]: [
     {
-      encounter: [
-        "dialogue:skull_boss_guzma_2.encounter.1"
-      ],
-      victory: [
-        "dialogue:skull_boss_guzma_2.victory.1"
-      ],
-      defeat: [
-        "dialogue:skull_boss_guzma_2.defeat.1"
-      ]
-    }
+      encounter: ["dialogue:skull_boss_guzma_2.encounter.1"],
+      victory: ["dialogue:skull_boss_guzma_2.victory.1"],
+      defeat: ["dialogue:skull_boss_guzma_2.defeat.1"],
+    },
   ],
   [TrainerType.ROSE]: [
     {
-      encounter: [
-        "dialogue:macro_boss_rose_1.encounter.1"
-      ],
-      victory: [
-        "dialogue:macro_boss_rose_1.victory.1"
-      ],
-      defeat: [
-        "dialogue:macro_boss_rose_1.defeat.1"
-      ]
-    }
+      encounter: ["dialogue:macro_boss_rose_1.encounter.1"],
+      victory: ["dialogue:macro_boss_rose_1.victory.1"],
+      defeat: ["dialogue:macro_boss_rose_1.defeat.1"],
+    },
   ],
   [TrainerType.ROSE_2]: [
     {
-      encounter: [
-        "dialogue:macro_boss_rose_2.encounter.1"
-      ],
-      victory: [
-        "dialogue:macro_boss_rose_2.victory.1"
-      ],
-      defeat: [
-        "dialogue:macro_boss_rose_2.defeat.1"
-      ]
-    }
+      encounter: ["dialogue:macro_boss_rose_2.encounter.1"],
+      victory: ["dialogue:macro_boss_rose_2.victory.1"],
+      defeat: ["dialogue:macro_boss_rose_2.defeat.1"],
+    },
   ],
   [TrainerType.PENNY]: [
     {
-      encounter: [
-        "dialogue:star_boss_penny_1.encounter.1"
-      ],
-      victory: [
-        "dialogue:star_boss_penny_1.victory.1"
-      ],
-      defeat: [
-        "dialogue:star_boss_penny_1.defeat.1"
-      ]
-    }
+      encounter: ["dialogue:star_boss_penny_1.encounter.1"],
+      victory: ["dialogue:star_boss_penny_1.victory.1"],
+      defeat: ["dialogue:star_boss_penny_1.defeat.1"],
+    },
   ],
   [TrainerType.PENNY_2]: [
     {
-      encounter: [
-        "dialogue:star_boss_penny_2.encounter.1"
-      ],
-      victory: [
-        "dialogue:star_boss_penny_2.victory.1"
-      ],
-      defeat: [
-        "dialogue:star_boss_penny_2.defeat.1"
-      ]
-    }
+      encounter: ["dialogue:star_boss_penny_2.encounter.1"],
+      victory: ["dialogue:star_boss_penny_2.victory.1"],
+      defeat: ["dialogue:star_boss_penny_2.defeat.1"],
+    },
   ],
   [TrainerType.BUCK]: [
     {
-      encounter: [
-        "dialogue:stat_trainer_buck.encounter.1",
-        "dialogue:stat_trainer_buck.encounter.2"
-      ],
-      victory: [
-        "dialogue:stat_trainer_buck.victory.1",
-        "dialogue:stat_trainer_buck.victory.2"
-      ],
-      defeat: [
-        "dialogue:stat_trainer_buck.defeat.1",
-        "dialogue:stat_trainer_buck.defeat.2"
-      ]
-    }
+      encounter: ["dialogue:stat_trainer_buck.encounter.1", "dialogue:stat_trainer_buck.encounter.2"],
+      victory: ["dialogue:stat_trainer_buck.victory.1", "dialogue:stat_trainer_buck.victory.2"],
+      defeat: ["dialogue:stat_trainer_buck.defeat.1", "dialogue:stat_trainer_buck.defeat.2"],
+    },
   ],
   [TrainerType.CHERYL]: [
     {
-      encounter: [
-        "dialogue:stat_trainer_cheryl.encounter.1",
-        "dialogue:stat_trainer_cheryl.encounter.2"
-      ],
-      victory: [
-        "dialogue:stat_trainer_cheryl.victory.1",
-        "dialogue:stat_trainer_cheryl.victory.2"
-      ],
-      defeat: [
-        "dialogue:stat_trainer_cheryl.defeat.1",
-        "dialogue:stat_trainer_cheryl.defeat.2"
-      ]
-    }
+      encounter: ["dialogue:stat_trainer_cheryl.encounter.1", "dialogue:stat_trainer_cheryl.encounter.2"],
+      victory: ["dialogue:stat_trainer_cheryl.victory.1", "dialogue:stat_trainer_cheryl.victory.2"],
+      defeat: ["dialogue:stat_trainer_cheryl.defeat.1", "dialogue:stat_trainer_cheryl.defeat.2"],
+    },
   ],
   [TrainerType.MARLEY]: [
     {
-      encounter: [
-        "dialogue:stat_trainer_marley.encounter.1",
-        "dialogue:stat_trainer_marley.encounter.2"
-      ],
-      victory: [
-        "dialogue:stat_trainer_marley.victory.1",
-        "dialogue:stat_trainer_marley.victory.2"
-      ],
-      defeat: [
-        "dialogue:stat_trainer_marley.defeat.1",
-        "dialogue:stat_trainer_marley.defeat.2"
-      ]
-    }
+      encounter: ["dialogue:stat_trainer_marley.encounter.1", "dialogue:stat_trainer_marley.encounter.2"],
+      victory: ["dialogue:stat_trainer_marley.victory.1", "dialogue:stat_trainer_marley.victory.2"],
+      defeat: ["dialogue:stat_trainer_marley.defeat.1", "dialogue:stat_trainer_marley.defeat.2"],
+    },
   ],
   [TrainerType.MIRA]: [
     {
-      encounter: [
-        "dialogue:stat_trainer_mira.encounter.1",
-        "dialogue:stat_trainer_mira.encounter.2"
-      ],
-      victory: [
-        "dialogue:stat_trainer_mira.victory.1",
-        "dialogue:stat_trainer_mira.victory.2"
-      ],
-      defeat: [
-        "dialogue:stat_trainer_mira.defeat.1",
-        "dialogue:stat_trainer_mira.defeat.2"
-      ]
-    }
+      encounter: ["dialogue:stat_trainer_mira.encounter.1", "dialogue:stat_trainer_mira.encounter.2"],
+      victory: ["dialogue:stat_trainer_mira.victory.1", "dialogue:stat_trainer_mira.victory.2"],
+      defeat: ["dialogue:stat_trainer_mira.defeat.1", "dialogue:stat_trainer_mira.defeat.2"],
+    },
   ],
   [TrainerType.RILEY]: [
     {
-      encounter: [
-        "dialogue:stat_trainer_riley.encounter.1",
-        "dialogue:stat_trainer_riley.encounter.2"
-      ],
-      victory: [
-        "dialogue:stat_trainer_riley.victory.1",
-        "dialogue:stat_trainer_riley.victory.2"
-      ],
-      defeat: [
-        "dialogue:stat_trainer_riley.defeat.1",
-        "dialogue:stat_trainer_riley.defeat.2"
-      ]
-    }
+      encounter: ["dialogue:stat_trainer_riley.encounter.1", "dialogue:stat_trainer_riley.encounter.2"],
+      victory: ["dialogue:stat_trainer_riley.victory.1", "dialogue:stat_trainer_riley.victory.2"],
+      defeat: ["dialogue:stat_trainer_riley.defeat.1", "dialogue:stat_trainer_riley.defeat.2"],
+    },
   ],
   [TrainerType.VICTOR]: [
     {
-      encounter: [
-        "dialogue:winstrates_victor.encounter.1",
-      ],
-      victory: [
-        "dialogue:winstrates_victor.victory.1"
-      ],
-    }
+      encounter: ["dialogue:winstrates_victor.encounter.1"],
+      victory: ["dialogue:winstrates_victor.victory.1"],
+    },
   ],
   [TrainerType.VICTORIA]: [
     {
-      encounter: [
-        "dialogue:winstrates_victoria.encounter.1",
-      ],
-      victory: [
-        "dialogue:winstrates_victoria.victory.1"
-      ],
-    }
+      encounter: ["dialogue:winstrates_victoria.encounter.1"],
+      victory: ["dialogue:winstrates_victoria.victory.1"],
+    },
   ],
   [TrainerType.VIVI]: [
     {
-      encounter: [
-        "dialogue:winstrates_vivi.encounter.1",
-      ],
-      victory: [
-        "dialogue:winstrates_vivi.victory.1"
-      ],
-    }
+      encounter: ["dialogue:winstrates_vivi.encounter.1"],
+      victory: ["dialogue:winstrates_vivi.victory.1"],
+    },
   ],
   [TrainerType.VICKY]: [
     {
-      encounter: [
-        "dialogue:winstrates_vicky.encounter.1",
-      ],
-      victory: [
-        "dialogue:winstrates_vicky.victory.1"
-      ],
-    }
+      encounter: ["dialogue:winstrates_vicky.encounter.1"],
+      victory: ["dialogue:winstrates_vicky.victory.1"],
+    },
   ],
   [TrainerType.VITO]: [
     {
-      encounter: [
-        "dialogue:winstrates_vito.encounter.1",
-      ],
-      victory: [
-        "dialogue:winstrates_vito.victory.1"
-      ],
-    }
+      encounter: ["dialogue:winstrates_vito.encounter.1"],
+      victory: ["dialogue:winstrates_vito.victory.1"],
+    },
   ],
   [TrainerType.BROCK]: {
-    encounter: [
-      "dialogue:brock.encounter.1",
-      "dialogue:brock.encounter.2",
-      "dialogue:brock.encounter.3",
-    ],
-    victory: [
-      "dialogue:brock.victory.1",
-      "dialogue:brock.victory.2",
-      "dialogue:brock.victory.3",
-    ],
-    defeat: [
-      "dialogue:brock.defeat.1",
-      "dialogue:brock.defeat.2",
-      "dialogue:brock.defeat.3",
-    ]
+    encounter: ["dialogue:brock.encounter.1", "dialogue:brock.encounter.2", "dialogue:brock.encounter.3"],
+    victory: ["dialogue:brock.victory.1", "dialogue:brock.victory.2", "dialogue:brock.victory.3"],
+    defeat: ["dialogue:brock.defeat.1", "dialogue:brock.defeat.2", "dialogue:brock.defeat.3"],
   },
   [TrainerType.MISTY]: {
-    encounter: [
-      "dialogue:misty.encounter.1",
-      "dialogue:misty.encounter.2",
-      "dialogue:misty.encounter.3",
-    ],
-    victory: [
-      "dialogue:misty.victory.1",
-      "dialogue:misty.victory.2",
-      "dialogue:misty.victory.3",
-    ],
-    defeat: [
-      "dialogue:misty.defeat.1",
-      "dialogue:misty.defeat.2",
-      "dialogue:misty.defeat.3",
-    ]
+    encounter: ["dialogue:misty.encounter.1", "dialogue:misty.encounter.2", "dialogue:misty.encounter.3"],
+    victory: ["dialogue:misty.victory.1", "dialogue:misty.victory.2", "dialogue:misty.victory.3"],
+    defeat: ["dialogue:misty.defeat.1", "dialogue:misty.defeat.2", "dialogue:misty.defeat.3"],
   },
   [TrainerType.LT_SURGE]: {
-    encounter: [
-      "dialogue:lt_surge.encounter.1",
-      "dialogue:lt_surge.encounter.2",
-      "dialogue:lt_surge.encounter.3",
-    ],
-    victory: [
-      "dialogue:lt_surge.victory.1",
-      "dialogue:lt_surge.victory.2",
-      "dialogue:lt_surge.victory.3",
-    ],
-    defeat: [
-      "dialogue:lt_surge.defeat.1",
-      "dialogue:lt_surge.defeat.2",
-      "dialogue:lt_surge.defeat.3",
-    ]
+    encounter: ["dialogue:lt_surge.encounter.1", "dialogue:lt_surge.encounter.2", "dialogue:lt_surge.encounter.3"],
+    victory: ["dialogue:lt_surge.victory.1", "dialogue:lt_surge.victory.2", "dialogue:lt_surge.victory.3"],
+    defeat: ["dialogue:lt_surge.defeat.1", "dialogue:lt_surge.defeat.2", "dialogue:lt_surge.defeat.3"],
   },
   [TrainerType.ERIKA]: {
     encounter: [
@@ -1419,420 +975,151 @@ export const trainerTypeDialogue: TrainerTypeDialogue = {
       "dialogue:erika.defeat.2",
       "dialogue:erika.defeat.3",
       "dialogue:erika.defeat.4",
-    ]
+    ],
   },
   [TrainerType.JANINE]: {
-    encounter: [
-      "dialogue:janine.encounter.1",
-      "dialogue:janine.encounter.2",
-      "dialogue:janine.encounter.3",
-    ],
-    victory: [
-      "dialogue:janine.victory.1",
-      "dialogue:janine.victory.2",
-      "dialogue:janine.victory.3",
-    ],
-    defeat: [
-      "dialogue:janine.defeat.1",
-      "dialogue:janine.defeat.2",
-      "dialogue:janine.defeat.3",
-    ]
+    encounter: ["dialogue:janine.encounter.1", "dialogue:janine.encounter.2", "dialogue:janine.encounter.3"],
+    victory: ["dialogue:janine.victory.1", "dialogue:janine.victory.2", "dialogue:janine.victory.3"],
+    defeat: ["dialogue:janine.defeat.1", "dialogue:janine.defeat.2", "dialogue:janine.defeat.3"],
   },
   [TrainerType.SABRINA]: {
-    encounter: [
-      "dialogue:sabrina.encounter.1",
-      "dialogue:sabrina.encounter.2",
-      "dialogue:sabrina.encounter.3",
-    ],
-    victory: [
-      "dialogue:sabrina.victory.1",
-      "dialogue:sabrina.victory.2",
-      "dialogue:sabrina.victory.3",
-    ],
-    defeat: [
-      "dialogue:sabrina.defeat.1",
-      "dialogue:sabrina.defeat.2",
-      "dialogue:sabrina.defeat.3",
-    ]
+    encounter: ["dialogue:sabrina.encounter.1", "dialogue:sabrina.encounter.2", "dialogue:sabrina.encounter.3"],
+    victory: ["dialogue:sabrina.victory.1", "dialogue:sabrina.victory.2", "dialogue:sabrina.victory.3"],
+    defeat: ["dialogue:sabrina.defeat.1", "dialogue:sabrina.defeat.2", "dialogue:sabrina.defeat.3"],
   },
   [TrainerType.BLAINE]: {
-    encounter: [
-      "dialogue:blaine.encounter.1",
-      "dialogue:blaine.encounter.2",
-      "dialogue:blaine.encounter.3",
-    ],
-    victory: [
-      "dialogue:blaine.victory.1",
-      "dialogue:blaine.victory.2",
-      "dialogue:blaine.victory.3",
-    ],
-    defeat: [
-      "dialogue:blaine.defeat.1",
-      "dialogue:blaine.defeat.2",
-      "dialogue:blaine.defeat.3",
-    ]
+    encounter: ["dialogue:blaine.encounter.1", "dialogue:blaine.encounter.2", "dialogue:blaine.encounter.3"],
+    victory: ["dialogue:blaine.victory.1", "dialogue:blaine.victory.2", "dialogue:blaine.victory.3"],
+    defeat: ["dialogue:blaine.defeat.1", "dialogue:blaine.defeat.2", "dialogue:blaine.defeat.3"],
   },
   [TrainerType.GIOVANNI]: {
-    encounter: [
-      "dialogue:giovanni.encounter.1",
-      "dialogue:giovanni.encounter.2",
-      "dialogue:giovanni.encounter.3",
-    ],
-    victory: [
-      "dialogue:giovanni.victory.1",
-      "dialogue:giovanni.victory.2",
-      "dialogue:giovanni.victory.3",
-    ],
-    defeat: [
-      "dialogue:giovanni.defeat.1",
-      "dialogue:giovanni.defeat.2",
-      "dialogue:giovanni.defeat.3",
-    ]
+    encounter: ["dialogue:giovanni.encounter.1", "dialogue:giovanni.encounter.2", "dialogue:giovanni.encounter.3"],
+    victory: ["dialogue:giovanni.victory.1", "dialogue:giovanni.victory.2", "dialogue:giovanni.victory.3"],
+    defeat: ["dialogue:giovanni.defeat.1", "dialogue:giovanni.defeat.2", "dialogue:giovanni.defeat.3"],
   },
   [TrainerType.ROXANNE]: {
-    encounter: [
-      "dialogue:roxanne.encounter.1",
-      "dialogue:roxanne.encounter.2",
-      "dialogue:roxanne.encounter.3"
-    ],
-    victory: [
-      "dialogue:roxanne.victory.1",
-      "dialogue:roxanne.victory.2",
-      "dialogue:roxanne.victory.3"
-    ],
-    defeat: [
-      "dialogue:roxanne.defeat.1",
-      "dialogue:roxanne.defeat.2",
-      "dialogue:roxanne.defeat.3"
-    ]
+    encounter: ["dialogue:roxanne.encounter.1", "dialogue:roxanne.encounter.2", "dialogue:roxanne.encounter.3"],
+    victory: ["dialogue:roxanne.victory.1", "dialogue:roxanne.victory.2", "dialogue:roxanne.victory.3"],
+    defeat: ["dialogue:roxanne.defeat.1", "dialogue:roxanne.defeat.2", "dialogue:roxanne.defeat.3"],
   },
   [TrainerType.BRAWLY]: {
-    encounter: [
-      "dialogue:brawly.encounter.1",
-      "dialogue:brawly.encounter.2",
-      "dialogue:brawly.encounter.3"
-    ],
-    victory: [
-      "dialogue:brawly.victory.1",
-      "dialogue:brawly.victory.2",
-      "dialogue:brawly.victory.3"
-    ],
-    defeat: [
-      "dialogue:brawly.defeat.1",
-      "dialogue:brawly.defeat.2",
-      "dialogue:brawly.defeat.3"
-    ]
+    encounter: ["dialogue:brawly.encounter.1", "dialogue:brawly.encounter.2", "dialogue:brawly.encounter.3"],
+    victory: ["dialogue:brawly.victory.1", "dialogue:brawly.victory.2", "dialogue:brawly.victory.3"],
+    defeat: ["dialogue:brawly.defeat.1", "dialogue:brawly.defeat.2", "dialogue:brawly.defeat.3"],
   },
   [TrainerType.WATTSON]: {
-    encounter: [
-      "dialogue:wattson.encounter.1",
-      "dialogue:wattson.encounter.2",
-      "dialogue:wattson.encounter.3"
-    ],
-    victory: [
-      "dialogue:wattson.victory.1",
-      "dialogue:wattson.victory.2",
-      "dialogue:wattson.victory.3"
-    ],
-    defeat: [
-      "dialogue:wattson.defeat.1",
-      "dialogue:wattson.defeat.2",
-      "dialogue:wattson.defeat.3"
-    ]
+    encounter: ["dialogue:wattson.encounter.1", "dialogue:wattson.encounter.2", "dialogue:wattson.encounter.3"],
+    victory: ["dialogue:wattson.victory.1", "dialogue:wattson.victory.2", "dialogue:wattson.victory.3"],
+    defeat: ["dialogue:wattson.defeat.1", "dialogue:wattson.defeat.2", "dialogue:wattson.defeat.3"],
   },
   [TrainerType.FLANNERY]: {
-    encounter: [
-      "dialogue:flannery.encounter.1",
-      "dialogue:flannery.encounter.2",
-      "dialogue:flannery.encounter.3"
-    ],
-    victory: [
-      "dialogue:flannery.victory.1",
-      "dialogue:flannery.victory.2",
-      "dialogue:flannery.victory.3"
-    ],
-    defeat: [
-      "dialogue:flannery.defeat.1",
-      "dialogue:flannery.defeat.2",
-      "dialogue:flannery.defeat.3"
-    ]
+    encounter: ["dialogue:flannery.encounter.1", "dialogue:flannery.encounter.2", "dialogue:flannery.encounter.3"],
+    victory: ["dialogue:flannery.victory.1", "dialogue:flannery.victory.2", "dialogue:flannery.victory.3"],
+    defeat: ["dialogue:flannery.defeat.1", "dialogue:flannery.defeat.2", "dialogue:flannery.defeat.3"],
   },
   [TrainerType.NORMAN]: {
-    encounter: [
-      "dialogue:norman.encounter.1",
-      "dialogue:norman.encounter.2",
-      "dialogue:norman.encounter.3"
-    ],
-    victory: [
-      "dialogue:norman.victory.1",
-      "dialogue:norman.victory.2",
-      "dialogue:norman.victory.3"
-    ],
-    defeat: [
-      "dialogue:norman.defeat.1",
-      "dialogue:norman.defeat.2",
-      "dialogue:norman.defeat.3"
-    ]
+    encounter: ["dialogue:norman.encounter.1", "dialogue:norman.encounter.2", "dialogue:norman.encounter.3"],
+    victory: ["dialogue:norman.victory.1", "dialogue:norman.victory.2", "dialogue:norman.victory.3"],
+    defeat: ["dialogue:norman.defeat.1", "dialogue:norman.defeat.2", "dialogue:norman.defeat.3"],
   },
   [TrainerType.WINONA]: {
-    encounter: [
-      "dialogue:winona.encounter.1",
-      "dialogue:winona.encounter.2",
-      "dialogue:winona.encounter.3"
-    ],
-    victory: [
-      "dialogue:winona.victory.1",
-      "dialogue:winona.victory.2",
-      "dialogue:winona.victory.3"
-    ],
-    defeat: [
-      "dialogue:winona.defeat.1",
-      "dialogue:winona.defeat.2",
-      "dialogue:winona.defeat.3"
-    ]
+    encounter: ["dialogue:winona.encounter.1", "dialogue:winona.encounter.2", "dialogue:winona.encounter.3"],
+    victory: ["dialogue:winona.victory.1", "dialogue:winona.victory.2", "dialogue:winona.victory.3"],
+    defeat: ["dialogue:winona.defeat.1", "dialogue:winona.defeat.2", "dialogue:winona.defeat.3"],
   },
   [TrainerType.TATE]: {
-    encounter: [
-      "dialogue:tate.encounter.1",
-      "dialogue:tate.encounter.2",
-      "dialogue:tate.encounter.3"
-    ],
-    victory: [
-      "dialogue:tate.victory.1",
-      "dialogue:tate.victory.2",
-      "dialogue:tate.victory.3"
-    ],
-    defeat: [
-      "dialogue:tate.defeat.1",
-      "dialogue:tate.defeat.2",
-      "dialogue:tate.defeat.3"
-    ]
+    encounter: ["dialogue:tate.encounter.1", "dialogue:tate.encounter.2", "dialogue:tate.encounter.3"],
+    victory: ["dialogue:tate.victory.1", "dialogue:tate.victory.2", "dialogue:tate.victory.3"],
+    defeat: ["dialogue:tate.defeat.1", "dialogue:tate.defeat.2", "dialogue:tate.defeat.3"],
   },
   [TrainerType.LIZA]: {
-    encounter: [
-      "dialogue:liza.encounter.1",
-      "dialogue:liza.encounter.2",
-      "dialogue:liza.encounter.3"
-    ],
-    victory: [
-      "dialogue:liza.victory.1",
-      "dialogue:liza.victory.2",
-      "dialogue:liza.victory.3"
-    ],
-    defeat: [
-      "dialogue:liza.defeat.1",
-      "dialogue:liza.defeat.2",
-      "dialogue:liza.defeat.3"
-    ]
+    encounter: ["dialogue:liza.encounter.1", "dialogue:liza.encounter.2", "dialogue:liza.encounter.3"],
+    victory: ["dialogue:liza.victory.1", "dialogue:liza.victory.2", "dialogue:liza.victory.3"],
+    defeat: ["dialogue:liza.defeat.1", "dialogue:liza.defeat.2", "dialogue:liza.defeat.3"],
   },
   [TrainerType.JUAN]: {
     encounter: [
       "dialogue:juan.encounter.1",
       "dialogue:juan.encounter.2",
       "dialogue:juan.encounter.3",
-      "dialogue:juan.encounter.4"
+      "dialogue:juan.encounter.4",
     ],
     victory: [
       "dialogue:juan.victory.1",
       "dialogue:juan.victory.2",
       "dialogue:juan.victory.3",
-      "dialogue:juan.victory.4"
+      "dialogue:juan.victory.4",
     ],
-    defeat: [
-      "dialogue:juan.defeat.1",
-      "dialogue:juan.defeat.2",
-      "dialogue:juan.defeat.3",
-      "dialogue:juan.defeat.4"
-    ]
+    defeat: ["dialogue:juan.defeat.1", "dialogue:juan.defeat.2", "dialogue:juan.defeat.3", "dialogue:juan.defeat.4"],
   },
   [TrainerType.CRASHER_WAKE]: {
     encounter: [
       "dialogue:crasher_wake.encounter.1",
       "dialogue:crasher_wake.encounter.2",
-      "dialogue:crasher_wake.encounter.3"
+      "dialogue:crasher_wake.encounter.3",
     ],
-    victory: [
-      "dialogue:crasher_wake.victory.1",
-      "dialogue:crasher_wake.victory.2",
-      "dialogue:crasher_wake.victory.3"
-    ],
-    defeat: [
-      "dialogue:crasher_wake.defeat.1",
-      "dialogue:crasher_wake.defeat.2",
-      "dialogue:crasher_wake.defeat.3"
-    ]
+    victory: ["dialogue:crasher_wake.victory.1", "dialogue:crasher_wake.victory.2", "dialogue:crasher_wake.victory.3"],
+    defeat: ["dialogue:crasher_wake.defeat.1", "dialogue:crasher_wake.defeat.2", "dialogue:crasher_wake.defeat.3"],
   },
   [TrainerType.FALKNER]: {
-    encounter: [
-      "dialogue:falkner.encounter.1",
-      "dialogue:falkner.encounter.2",
-      "dialogue:falkner.encounter.3"
-    ],
-    victory: [
-      "dialogue:falkner.victory.1",
-      "dialogue:falkner.victory.2",
-      "dialogue:falkner.victory.3"
-    ],
-    defeat: [
-      "dialogue:falkner.defeat.1",
-      "dialogue:falkner.defeat.2",
-      "dialogue:falkner.defeat.3"
-    ]
+    encounter: ["dialogue:falkner.encounter.1", "dialogue:falkner.encounter.2", "dialogue:falkner.encounter.3"],
+    victory: ["dialogue:falkner.victory.1", "dialogue:falkner.victory.2", "dialogue:falkner.victory.3"],
+    defeat: ["dialogue:falkner.defeat.1", "dialogue:falkner.defeat.2", "dialogue:falkner.defeat.3"],
   },
   [TrainerType.NESSA]: {
-    encounter: [
-      "dialogue:nessa.encounter.1",
-      "dialogue:nessa.encounter.2",
-      "dialogue:nessa.encounter.3"
-    ],
-    victory: [
-      "dialogue:nessa.victory.1",
-      "dialogue:nessa.victory.2",
-      "dialogue:nessa.victory.3"
-    ],
-    defeat: [
-      "dialogue:nessa.defeat.1",
-      "dialogue:nessa.defeat.2",
-      "dialogue:nessa.defeat.3"
-    ]
+    encounter: ["dialogue:nessa.encounter.1", "dialogue:nessa.encounter.2", "dialogue:nessa.encounter.3"],
+    victory: ["dialogue:nessa.victory.1", "dialogue:nessa.victory.2", "dialogue:nessa.victory.3"],
+    defeat: ["dialogue:nessa.defeat.1", "dialogue:nessa.defeat.2", "dialogue:nessa.defeat.3"],
   },
   [TrainerType.MELONY]: {
-    encounter: [
-      "dialogue:melony.encounter.1",
-      "dialogue:melony.encounter.2",
-      "dialogue:melony.encounter.3"
-    ],
-    victory: [
-      "dialogue:melony.victory.1",
-      "dialogue:melony.victory.2",
-      "dialogue:melony.victory.3"
-    ],
-    defeat: [
-      "dialogue:melony.defeat.1",
-      "dialogue:melony.defeat.2",
-      "dialogue:melony.defeat.3"
-    ]
+    encounter: ["dialogue:melony.encounter.1", "dialogue:melony.encounter.2", "dialogue:melony.encounter.3"],
+    victory: ["dialogue:melony.victory.1", "dialogue:melony.victory.2", "dialogue:melony.victory.3"],
+    defeat: ["dialogue:melony.defeat.1", "dialogue:melony.defeat.2", "dialogue:melony.defeat.3"],
   },
   [TrainerType.MARLON]: {
-    encounter: [
-      "dialogue:marlon.encounter.1",
-      "dialogue:marlon.encounter.2",
-      "dialogue:marlon.encounter.3"
-    ],
-    victory: [
-      "dialogue:marlon.victory.1",
-      "dialogue:marlon.victory.2",
-      "dialogue:marlon.victory.3"
-    ],
-    defeat: [
-      "dialogue:marlon.defeat.1",
-      "dialogue:marlon.defeat.2",
-      "dialogue:marlon.defeat.3"
-    ]
+    encounter: ["dialogue:marlon.encounter.1", "dialogue:marlon.encounter.2", "dialogue:marlon.encounter.3"],
+    victory: ["dialogue:marlon.victory.1", "dialogue:marlon.victory.2", "dialogue:marlon.victory.3"],
+    defeat: ["dialogue:marlon.defeat.1", "dialogue:marlon.defeat.2", "dialogue:marlon.defeat.3"],
   },
   [TrainerType.SHAUNTAL]: {
-    encounter: [
-      "dialogue:shauntal.encounter.1",
-      "dialogue:shauntal.encounter.2",
-      "dialogue:shauntal.encounter.3"
-    ],
-    victory: [
-      "dialogue:shauntal.victory.1",
-      "dialogue:shauntal.victory.2",
-      "dialogue:shauntal.victory.3"
-    ],
-    defeat: [
-      "dialogue:shauntal.defeat.1",
-      "dialogue:shauntal.defeat.2",
-      "dialogue:shauntal.defeat.3"
-    ]
+    encounter: ["dialogue:shauntal.encounter.1", "dialogue:shauntal.encounter.2", "dialogue:shauntal.encounter.3"],
+    victory: ["dialogue:shauntal.victory.1", "dialogue:shauntal.victory.2", "dialogue:shauntal.victory.3"],
+    defeat: ["dialogue:shauntal.defeat.1", "dialogue:shauntal.defeat.2", "dialogue:shauntal.defeat.3"],
   },
   [TrainerType.MARSHAL]: {
-    encounter: [
-      "dialogue:marshal.encounter.1",
-      "dialogue:marshal.encounter.2",
-      "dialogue:marshal.encounter.3"
-    ],
-    victory: [
-      "dialogue:marshal.victory.1",
-      "dialogue:marshal.victory.2",
-      "dialogue:marshal.victory.3"
-    ],
-    defeat: [
-      "dialogue:marshal.defeat.1",
-      "dialogue:marshal.defeat.2",
-      "dialogue:marshal.defeat.3"
-    ]
+    encounter: ["dialogue:marshal.encounter.1", "dialogue:marshal.encounter.2", "dialogue:marshal.encounter.3"],
+    victory: ["dialogue:marshal.victory.1", "dialogue:marshal.victory.2", "dialogue:marshal.victory.3"],
+    defeat: ["dialogue:marshal.defeat.1", "dialogue:marshal.defeat.2", "dialogue:marshal.defeat.3"],
   },
   [TrainerType.CHEREN]: {
-    encounter: [
-      "dialogue:cheren.encounter.1",
-      "dialogue:cheren.encounter.2",
-      "dialogue:cheren.encounter.3"
-    ],
-    victory: [
-      "dialogue:cheren.victory.1",
-      "dialogue:cheren.victory.2",
-      "dialogue:cheren.victory.3"
-    ],
-    defeat: [
-      "dialogue:cheren.defeat.1",
-      "dialogue:cheren.defeat.2",
-      "dialogue:cheren.defeat.3"
-    ]
+    encounter: ["dialogue:cheren.encounter.1", "dialogue:cheren.encounter.2", "dialogue:cheren.encounter.3"],
+    victory: ["dialogue:cheren.victory.1", "dialogue:cheren.victory.2", "dialogue:cheren.victory.3"],
+    defeat: ["dialogue:cheren.defeat.1", "dialogue:cheren.defeat.2", "dialogue:cheren.defeat.3"],
   },
   [TrainerType.CHILI]: {
-    encounter: [
-      "dialogue:chili.encounter.1",
-      "dialogue:chili.encounter.2",
-      "dialogue:chili.encounter.3"
-    ],
-    victory: [
-      "dialogue:chili.victory.1",
-      "dialogue:chili.victory.2",
-      "dialogue:chili.victory.3"
-    ],
-    defeat: [
-      "dialogue:chili.defeat.1",
-      "dialogue:chili.defeat.2",
-      "dialogue:chili.defeat.3"
-    ]
+    encounter: ["dialogue:chili.encounter.1", "dialogue:chili.encounter.2", "dialogue:chili.encounter.3"],
+    victory: ["dialogue:chili.victory.1", "dialogue:chili.victory.2", "dialogue:chili.victory.3"],
+    defeat: ["dialogue:chili.defeat.1", "dialogue:chili.defeat.2", "dialogue:chili.defeat.3"],
   },
   [TrainerType.CILAN]: {
-    encounter: [
-      "dialogue:cilan.encounter.1",
-      "dialogue:cilan.encounter.2",
-      "dialogue:cilan.encounter.3"
-    ],
-    victory: [
-      "dialogue:cilan.victory.1",
-      "dialogue:cilan.victory.2",
-      "dialogue:cilan.victory.3"
-    ],
-    defeat: [
-      "dialogue:cilan.defeat.1",
-      "dialogue:cilan.defeat.2",
-      "dialogue:cilan.defeat.3"
-    ]
+    encounter: ["dialogue:cilan.encounter.1", "dialogue:cilan.encounter.2", "dialogue:cilan.encounter.3"],
+    victory: ["dialogue:cilan.victory.1", "dialogue:cilan.victory.2", "dialogue:cilan.victory.3"],
+    defeat: ["dialogue:cilan.defeat.1", "dialogue:cilan.defeat.2", "dialogue:cilan.defeat.3"],
   },
   [TrainerType.ROARK]: {
     encounter: [
       "dialogue:roark.encounter.1",
       "dialogue:roark.encounter.2",
       "dialogue:roark.encounter.3",
-      "dialogue:roark.encounter.4"
+      "dialogue:roark.encounter.4",
     ],
     victory: [
       "dialogue:roark.victory.1",
       "dialogue:roark.victory.2",
       "dialogue:roark.victory.3",
-      "dialogue:roark.victory.4"
+      "dialogue:roark.victory.4",
     ],
-    defeat: [
-      "dialogue:roark.defeat.1",
-      "dialogue:roark.defeat.2",
-      "dialogue:roark.defeat.3"
-    ]
+    defeat: ["dialogue:roark.defeat.1", "dialogue:roark.defeat.2", "dialogue:roark.defeat.3"],
   },
   [TrainerType.MORTY]: {
     encounter: [
@@ -1841,7 +1128,7 @@ export const trainerTypeDialogue: TrainerTypeDialogue = {
       "dialogue:morty.encounter.3",
       "dialogue:morty.encounter.4",
       "dialogue:morty.encounter.5",
-      "dialogue:morty.encounter.6"
+      "dialogue:morty.encounter.6",
     ],
     victory: [
       "dialogue:morty.victory.1",
@@ -1849,7 +1136,7 @@ export const trainerTypeDialogue: TrainerTypeDialogue = {
       "dialogue:morty.victory.3",
       "dialogue:morty.victory.4",
       "dialogue:morty.victory.5",
-      "dialogue:morty.victory.6"
+      "dialogue:morty.victory.6",
     ],
     defeat: [
       "dialogue:morty.defeat.1",
@@ -1857,1335 +1144,626 @@ export const trainerTypeDialogue: TrainerTypeDialogue = {
       "dialogue:morty.defeat.3",
       "dialogue:morty.defeat.4",
       "dialogue:morty.defeat.5",
-      "dialogue:morty.defeat.6"
-    ]
+      "dialogue:morty.defeat.6",
+    ],
   },
   [TrainerType.CRISPIN]: {
-    encounter: [
-      "dialogue:crispin.encounter.1",
-      "dialogue:crispin.encounter.2"
-    ],
-    victory: [
-      "dialogue:crispin.victory.1",
-      "dialogue:crispin.victory.2"
-    ],
-    defeat: [
-      "dialogue:crispin.defeat.1",
-      "dialogue:crispin.defeat.2"
-    ]
+    encounter: ["dialogue:crispin.encounter.1", "dialogue:crispin.encounter.2"],
+    victory: ["dialogue:crispin.victory.1", "dialogue:crispin.victory.2"],
+    defeat: ["dialogue:crispin.defeat.1", "dialogue:crispin.defeat.2"],
   },
   [TrainerType.AMARYS]: {
-    encounter: [
-      "dialogue:amarys.encounter.1"
-    ],
-    victory: [
-      "dialogue:amarys.victory.1"
-    ],
-    defeat: [
-      "dialogue:amarys.defeat.1"
-    ]
+    encounter: ["dialogue:amarys.encounter.1"],
+    victory: ["dialogue:amarys.victory.1"],
+    defeat: ["dialogue:amarys.defeat.1"],
   },
   [TrainerType.LACEY]: {
-    encounter: [
-      "dialogue:lacey.encounter.1"
-    ],
-    victory: [
-      "dialogue:lacey.victory.1"
-    ],
-    defeat: [
-      "dialogue:lacey.defeat.1"
-    ]
+    encounter: ["dialogue:lacey.encounter.1"],
+    victory: ["dialogue:lacey.victory.1"],
+    defeat: ["dialogue:lacey.defeat.1"],
   },
   [TrainerType.DRAYTON]: {
-    encounter: [
-      "dialogue:drayton.encounter.1"
-    ],
-    victory: [
-      "dialogue:drayton.victory.1"
-    ],
-    defeat: [
-      "dialogue:drayton.defeat.1"
-    ]
+    encounter: ["dialogue:drayton.encounter.1"],
+    victory: ["dialogue:drayton.victory.1"],
+    defeat: ["dialogue:drayton.defeat.1"],
   },
   [TrainerType.RAMOS]: {
-    encounter: [
-      "dialogue:ramos.encounter.1"
-    ],
-    victory: [
-      "dialogue:ramos.victory.1"
-    ],
-    defeat: [
-      "dialogue:ramos.defeat.1"
-    ]
+    encounter: ["dialogue:ramos.encounter.1"],
+    victory: ["dialogue:ramos.victory.1"],
+    defeat: ["dialogue:ramos.defeat.1"],
   },
   [TrainerType.VIOLA]: {
-    encounter: [
-      "dialogue:viola.encounter.1",
-      "dialogue:viola.encounter.2"
-    ],
-    victory: [
-      "dialogue:viola.victory.1",
-      "dialogue:viola.victory.2"
-    ],
-    defeat: [
-      "dialogue:viola.defeat.1",
-      "dialogue:viola.defeat.2"
-    ]
+    encounter: ["dialogue:viola.encounter.1", "dialogue:viola.encounter.2"],
+    victory: ["dialogue:viola.victory.1", "dialogue:viola.victory.2"],
+    defeat: ["dialogue:viola.defeat.1", "dialogue:viola.defeat.2"],
   },
   [TrainerType.CANDICE]: {
-    encounter: [
-      "dialogue:candice.encounter.1",
-      "dialogue:candice.encounter.2"
-    ],
-    victory: [
-      "dialogue:candice.victory.1",
-      "dialogue:candice.victory.2"
-    ],
-    defeat: [
-      "dialogue:candice.defeat.1",
-      "dialogue:candice.defeat.2"
-    ]
+    encounter: ["dialogue:candice.encounter.1", "dialogue:candice.encounter.2"],
+    victory: ["dialogue:candice.victory.1", "dialogue:candice.victory.2"],
+    defeat: ["dialogue:candice.defeat.1", "dialogue:candice.defeat.2"],
   },
   [TrainerType.GARDENIA]: {
-    encounter: [
-      "dialogue:gardenia.encounter.1"
-    ],
-    victory: [
-      "dialogue:gardenia.victory.1"
-    ],
-    defeat: [
-      "dialogue:gardenia.defeat.1"
-    ]
+    encounter: ["dialogue:gardenia.encounter.1"],
+    victory: ["dialogue:gardenia.victory.1"],
+    defeat: ["dialogue:gardenia.defeat.1"],
   },
   [TrainerType.AARON]: {
-    encounter: [
-      "dialogue:aaron.encounter.1"
-    ],
-    victory: [
-      "dialogue:aaron.victory.1"
-    ],
-    defeat: [
-      "dialogue:aaron.defeat.1"
-    ]
+    encounter: ["dialogue:aaron.encounter.1"],
+    victory: ["dialogue:aaron.victory.1"],
+    defeat: ["dialogue:aaron.defeat.1"],
   },
   [TrainerType.CRESS]: {
-    encounter: [
-      "dialogue:cress.encounter.1"
-    ],
-    victory: [
-      "dialogue:cress.victory.1"
-    ],
-    defeat: [
-      "dialogue:cress.defeat.1"
-    ]
+    encounter: ["dialogue:cress.encounter.1"],
+    victory: ["dialogue:cress.victory.1"],
+    defeat: ["dialogue:cress.defeat.1"],
   },
   [TrainerType.ALLISTER]: {
-    encounter: [
-      "dialogue:allister.encounter.1"
-    ],
-    victory: [
-      "dialogue:allister.victory.1"
-    ],
-    defeat: [
-      "dialogue:allister.defeat.1"
-    ]
+    encounter: ["dialogue:allister.encounter.1"],
+    victory: ["dialogue:allister.victory.1"],
+    defeat: ["dialogue:allister.defeat.1"],
   },
   [TrainerType.CLAY]: {
-    encounter: [
-      "dialogue:clay.encounter.1"
-    ],
-    victory: [
-      "dialogue:clay.victory.1"
-    ],
-    defeat: [
-      "dialogue:clay.defeat.1"
-    ]
+    encounter: ["dialogue:clay.encounter.1"],
+    victory: ["dialogue:clay.victory.1"],
+    defeat: ["dialogue:clay.defeat.1"],
   },
   [TrainerType.KOFU]: {
-    encounter: [
-      "dialogue:kofu.encounter.1"
-    ],
-    victory: [
-      "dialogue:kofu.victory.1"
-    ],
-    defeat: [
-      "dialogue:kofu.defeat.1"
-    ]
+    encounter: ["dialogue:kofu.encounter.1"],
+    victory: ["dialogue:kofu.victory.1"],
+    defeat: ["dialogue:kofu.defeat.1"],
   },
   [TrainerType.TULIP]: {
-    encounter: [
-      "dialogue:tulip.encounter.1"
-    ],
-    victory: [
-      "dialogue:tulip.victory.1"
-    ],
-    defeat: [
-      "dialogue:tulip.defeat.1"
-    ]
+    encounter: ["dialogue:tulip.encounter.1"],
+    victory: ["dialogue:tulip.victory.1"],
+    defeat: ["dialogue:tulip.defeat.1"],
   },
   [TrainerType.SIDNEY]: {
-    encounter: [
-      "dialogue:sidney.encounter.1"
-    ],
-    victory: [
-      "dialogue:sidney.victory.1"
-    ],
-    defeat: [
-      "dialogue:sidney.defeat.1"
-    ]
+    encounter: ["dialogue:sidney.encounter.1"],
+    victory: ["dialogue:sidney.victory.1"],
+    defeat: ["dialogue:sidney.defeat.1"],
   },
   [TrainerType.PHOEBE]: {
-    encounter: [
-      "dialogue:phoebe.encounter.1"
-    ],
-    victory: [
-      "dialogue:phoebe.victory.1"
-    ],
-    defeat: [
-      "dialogue:phoebe.defeat.1"
-    ]
+    encounter: ["dialogue:phoebe.encounter.1"],
+    victory: ["dialogue:phoebe.victory.1"],
+    defeat: ["dialogue:phoebe.defeat.1"],
   },
   [TrainerType.GLACIA]: {
-    encounter: [
-      "dialogue:glacia.encounter.1"
-    ],
-    victory: [
-      "dialogue:glacia.victory.1"
-    ],
-    defeat: [
-      "dialogue:glacia.defeat.1"
-    ]
+    encounter: ["dialogue:glacia.encounter.1"],
+    victory: ["dialogue:glacia.victory.1"],
+    defeat: ["dialogue:glacia.defeat.1"],
   },
   [TrainerType.DRAKE]: {
-    encounter: [
-      "dialogue:drake.encounter.1"
-    ],
-    victory: [
-      "dialogue:drake.victory.1"
-    ],
-    defeat: [
-      "dialogue:drake.defeat.1"
-    ]
+    encounter: ["dialogue:drake.encounter.1"],
+    victory: ["dialogue:drake.victory.1"],
+    defeat: ["dialogue:drake.defeat.1"],
   },
   [TrainerType.WALLACE]: {
-    encounter: [
-      "dialogue:wallace.encounter.1"
-    ],
-    victory: [
-      "dialogue:wallace.victory.1"
-    ],
-    defeat: [
-      "dialogue:wallace.defeat.1"
-    ]
+    encounter: ["dialogue:wallace.encounter.1"],
+    victory: ["dialogue:wallace.victory.1"],
+    defeat: ["dialogue:wallace.defeat.1"],
   },
   [TrainerType.LORELEI]: {
-    encounter: [
-      "dialogue:lorelei.encounter.1"
-    ],
-    victory: [
-      "dialogue:lorelei.victory.1"
-    ],
-    defeat: [
-      "dialogue:lorelei.defeat.1"
-    ]
+    encounter: ["dialogue:lorelei.encounter.1"],
+    victory: ["dialogue:lorelei.victory.1"],
+    defeat: ["dialogue:lorelei.defeat.1"],
   },
   [TrainerType.WILL]: {
-    encounter: [
-      "dialogue:will.encounter.1"
-    ],
-    victory: [
-      "dialogue:will.victory.1"
-    ],
-    defeat: [
-      "dialogue:will.defeat.1"
-    ]
+    encounter: ["dialogue:will.encounter.1"],
+    victory: ["dialogue:will.victory.1"],
+    defeat: ["dialogue:will.defeat.1"],
   },
   [TrainerType.MALVA]: {
-    encounter: [
-      "dialogue:malva.encounter.1"
-    ],
-    victory: [
-      "dialogue:malva.victory.1"
-    ],
-    defeat: [
-      "dialogue:malva.defeat.1"
-    ]
+    encounter: ["dialogue:malva.encounter.1"],
+    victory: ["dialogue:malva.victory.1"],
+    defeat: ["dialogue:malva.defeat.1"],
   },
   [TrainerType.HALA]: {
-    encounter: [
-      "dialogue:hala.encounter.1"
-    ],
-    victory: [
-      "dialogue:hala.victory.1"
-    ],
-    defeat: [
-      "dialogue:hala.defeat.1"
-    ]
+    encounter: ["dialogue:hala.encounter.1"],
+    victory: ["dialogue:hala.victory.1"],
+    defeat: ["dialogue:hala.defeat.1"],
   },
   [TrainerType.MOLAYNE]: {
-    encounter: [
-      "dialogue:molayne.encounter.1"
-    ],
-    victory: [
-      "dialogue:molayne.victory.1"
-    ],
-    defeat: [
-      "dialogue:molayne.defeat.1"
-    ]
+    encounter: ["dialogue:molayne.encounter.1"],
+    victory: ["dialogue:molayne.victory.1"],
+    defeat: ["dialogue:molayne.defeat.1"],
   },
   [TrainerType.RIKA]: {
-    encounter: [
-      "dialogue:rika.encounter.1"
-    ],
-    victory: [
-      "dialogue:rika.victory.1"
-    ],
-    defeat: [
-      "dialogue:rika.defeat.1"
-    ]
+    encounter: ["dialogue:rika.encounter.1"],
+    victory: ["dialogue:rika.victory.1"],
+    defeat: ["dialogue:rika.defeat.1"],
   },
   [TrainerType.BRUNO]: {
-    encounter: [
-      "dialogue:bruno.encounter.1"
-    ],
-    victory: [
-      "dialogue:bruno.victory.1"
-    ],
-    defeat: [
-      "dialogue:bruno.defeat.1"
-    ]
+    encounter: ["dialogue:bruno.encounter.1"],
+    victory: ["dialogue:bruno.victory.1"],
+    defeat: ["dialogue:bruno.defeat.1"],
   },
   [TrainerType.BUGSY]: {
-    encounter: [
-      "dialogue:bugsy.encounter.1"
-    ],
-    victory: [
-      "dialogue:bugsy.victory.1"
-    ],
-    defeat: [
-      "dialogue:bugsy.defeat.1"
-    ]
+    encounter: ["dialogue:bugsy.encounter.1"],
+    victory: ["dialogue:bugsy.victory.1"],
+    defeat: ["dialogue:bugsy.defeat.1"],
   },
   [TrainerType.KOGA]: {
-    encounter: [
-      "dialogue:koga.encounter.1"
-    ],
-    victory: [
-      "dialogue:koga.victory.1"
-    ],
-    defeat: [
-      "dialogue:koga.defeat.1"
-    ]
+    encounter: ["dialogue:koga.encounter.1"],
+    victory: ["dialogue:koga.victory.1"],
+    defeat: ["dialogue:koga.defeat.1"],
   },
   [TrainerType.BERTHA]: {
-    encounter: [
-      "dialogue:bertha.encounter.1"
-    ],
-    victory: [
-      "dialogue:bertha.victory.1"
-    ],
-    defeat: [
-      "dialogue:bertha.defeat.1"
-    ]
+    encounter: ["dialogue:bertha.encounter.1"],
+    victory: ["dialogue:bertha.victory.1"],
+    defeat: ["dialogue:bertha.defeat.1"],
   },
   [TrainerType.LENORA]: {
-    encounter: [
-      "dialogue:lenora.encounter.1"
-    ],
-    victory: [
-      "dialogue:lenora.victory.1"
-    ],
-    defeat: [
-      "dialogue:lenora.defeat.1"
-    ]
+    encounter: ["dialogue:lenora.encounter.1"],
+    victory: ["dialogue:lenora.victory.1"],
+    defeat: ["dialogue:lenora.defeat.1"],
   },
   [TrainerType.SIEBOLD]: {
-    encounter: [
-      "dialogue:siebold.encounter.1"
-    ],
-    victory: [
-      "dialogue:siebold.victory.1"
-    ],
-    defeat: [
-      "dialogue:siebold.defeat.1"
-    ]
+    encounter: ["dialogue:siebold.encounter.1"],
+    victory: ["dialogue:siebold.victory.1"],
+    defeat: ["dialogue:siebold.defeat.1"],
   },
   [TrainerType.ROXIE]: {
-    encounter: [
-      "dialogue:roxie.encounter.1"
-    ],
-    victory: [
-      "dialogue:roxie.victory.1"
-    ],
-    defeat: [
-      "dialogue:roxie.defeat.1"
-    ]
+    encounter: ["dialogue:roxie.encounter.1"],
+    victory: ["dialogue:roxie.victory.1"],
+    defeat: ["dialogue:roxie.defeat.1"],
   },
   [TrainerType.OLIVIA]: {
-    encounter: [
-      "dialogue:olivia.encounter.1"
-    ],
-    victory: [
-      "dialogue:olivia.victory.1"
-    ],
-    defeat: [
-      "dialogue:olivia.defeat.1"
-    ]
+    encounter: ["dialogue:olivia.encounter.1"],
+    victory: ["dialogue:olivia.victory.1"],
+    defeat: ["dialogue:olivia.defeat.1"],
   },
   [TrainerType.POPPY]: {
-    encounter: [
-      "dialogue:poppy.encounter.1"
-    ],
-    victory: [
-      "dialogue:poppy.victory.1"
-    ],
-    defeat: [
-      "dialogue:poppy.defeat.1"
-    ]
+    encounter: ["dialogue:poppy.encounter.1"],
+    victory: ["dialogue:poppy.victory.1"],
+    defeat: ["dialogue:poppy.defeat.1"],
   },
   [TrainerType.AGATHA]: {
-    encounter: [
-      "dialogue:agatha.encounter.1"
-    ],
-    victory: [
-      "dialogue:agatha.victory.1"
-    ],
-    defeat: [
-      "dialogue:agatha.defeat.1"
-    ]
+    encounter: ["dialogue:agatha.encounter.1"],
+    victory: ["dialogue:agatha.victory.1"],
+    defeat: ["dialogue:agatha.defeat.1"],
   },
   [TrainerType.FLINT]: {
-    encounter: [
-      "dialogue:flint.encounter.1"
-    ],
-    victory: [
-      "dialogue:flint.victory.1"
-    ],
-    defeat: [
-      "dialogue:flint.defeat.1"
-    ]
+    encounter: ["dialogue:flint.encounter.1"],
+    victory: ["dialogue:flint.victory.1"],
+    defeat: ["dialogue:flint.defeat.1"],
   },
   [TrainerType.GRIMSLEY]: {
-    encounter: [
-      "dialogue:grimsley.encounter.1"
-    ],
-    victory: [
-      "dialogue:grimsley.victory.1"
-    ],
-    defeat: [
-      "dialogue:grimsley.defeat.1"
-    ]
+    encounter: ["dialogue:grimsley.encounter.1"],
+    victory: ["dialogue:grimsley.victory.1"],
+    defeat: ["dialogue:grimsley.defeat.1"],
   },
   [TrainerType.CAITLIN]: {
-    encounter: [
-      "dialogue:caitlin.encounter.1"
-    ],
-    victory: [
-      "dialogue:caitlin.victory.1"
-    ],
-    defeat: [
-      "dialogue:caitlin.defeat.1"
-    ]
+    encounter: ["dialogue:caitlin.encounter.1"],
+    victory: ["dialogue:caitlin.victory.1"],
+    defeat: ["dialogue:caitlin.defeat.1"],
   },
   [TrainerType.DIANTHA]: {
-    encounter: [
-      "dialogue:diantha.encounter.1"
-    ],
-    victory: [
-      "dialogue:diantha.victory.1"
-    ],
-    defeat: [
-      "dialogue:diantha.defeat.1"
-    ]
+    encounter: ["dialogue:diantha.encounter.1"],
+    victory: ["dialogue:diantha.victory.1"],
+    defeat: ["dialogue:diantha.defeat.1"],
   },
   [TrainerType.WIKSTROM]: {
-    encounter: [
-      "dialogue:wikstrom.encounter.1"
-    ],
-    victory: [
-      "dialogue:wikstrom.victory.1"
-    ],
-    defeat: [
-      "dialogue:wikstrom.defeat.1"
-    ]
+    encounter: ["dialogue:wikstrom.encounter.1"],
+    victory: ["dialogue:wikstrom.victory.1"],
+    defeat: ["dialogue:wikstrom.defeat.1"],
   },
   [TrainerType.ACEROLA]: {
-    encounter: [
-      "dialogue:acerola.encounter.1"
-    ],
-    victory: [
-      "dialogue:acerola.victory.1"
-    ],
-    defeat: [
-      "dialogue:acerola.defeat.1"
-    ]
+    encounter: ["dialogue:acerola.encounter.1"],
+    victory: ["dialogue:acerola.victory.1"],
+    defeat: ["dialogue:acerola.defeat.1"],
   },
   [TrainerType.LARRY_ELITE]: {
-    encounter: [
-      "dialogue:larry_elite.encounter.1"
-    ],
-    victory: [
-      "dialogue:larry_elite.victory.1"
-    ],
-    defeat: [
-      "dialogue:larry_elite.defeat.1"
-    ]
+    encounter: ["dialogue:larry_elite.encounter.1"],
+    victory: ["dialogue:larry_elite.victory.1"],
+    defeat: ["dialogue:larry_elite.defeat.1"],
   },
   [TrainerType.LANCE]: {
-    encounter: [
-      "dialogue:lance.encounter.1",
-      "dialogue:lance.encounter.2"
-    ],
-    victory: [
-      "dialogue:lance.victory.1",
-      "dialogue:lance.victory.2"
-    ],
-    defeat: [
-      "dialogue:lance.defeat.1",
-      "dialogue:lance.defeat.2"
-    ]
+    encounter: ["dialogue:lance.encounter.1", "dialogue:lance.encounter.2"],
+    victory: ["dialogue:lance.victory.1", "dialogue:lance.victory.2"],
+    defeat: ["dialogue:lance.defeat.1", "dialogue:lance.defeat.2"],
   },
   [TrainerType.KAREN]: {
-    encounter: [
-      "dialogue:karen.encounter.1",
-      "dialogue:karen.encounter.2",
-      "dialogue:karen.encounter.3"
-    ],
-    victory: [
-      "dialogue:karen.victory.1",
-      "dialogue:karen.victory.2",
-      "dialogue:karen.victory.3"
-    ],
-    defeat: [
-      "dialogue:karen.defeat.1",
-      "dialogue:karen.defeat.2",
-      "dialogue:karen.defeat.3"
-    ]
+    encounter: ["dialogue:karen.encounter.1", "dialogue:karen.encounter.2", "dialogue:karen.encounter.3"],
+    victory: ["dialogue:karen.victory.1", "dialogue:karen.victory.2", "dialogue:karen.victory.3"],
+    defeat: ["dialogue:karen.defeat.1", "dialogue:karen.defeat.2", "dialogue:karen.defeat.3"],
   },
   [TrainerType.MILO]: {
-    encounter: [
-      "dialogue:milo.encounter.1"
-    ],
-    victory: [
-      "dialogue:milo.victory.1"
-    ],
-    defeat: [
-      "dialogue:milo.defeat.1"
-    ]
+    encounter: ["dialogue:milo.encounter.1"],
+    victory: ["dialogue:milo.victory.1"],
+    defeat: ["dialogue:milo.defeat.1"],
   },
   [TrainerType.LUCIAN]: {
-    encounter: [
-      "dialogue:lucian.encounter.1"
-    ],
-    victory: [
-      "dialogue:lucian.victory.1"
-    ],
-    defeat: [
-      "dialogue:lucian.defeat.1"
-    ]
+    encounter: ["dialogue:lucian.encounter.1"],
+    victory: ["dialogue:lucian.victory.1"],
+    defeat: ["dialogue:lucian.defeat.1"],
   },
   [TrainerType.DRASNA]: {
-    encounter: [
-      "dialogue:drasna.encounter.1"
-    ],
-    victory: [
-      "dialogue:drasna.victory.1"
-    ],
-    defeat: [
-      "dialogue:drasna.defeat.1"
-    ]
+    encounter: ["dialogue:drasna.encounter.1"],
+    victory: ["dialogue:drasna.victory.1"],
+    defeat: ["dialogue:drasna.defeat.1"],
   },
   [TrainerType.KAHILI]: {
-    encounter: [
-      "dialogue:kahili.encounter.1"
-    ],
-    victory: [
-      "dialogue:kahili.victory.1"
-    ],
-    defeat: [
-      "dialogue:kahili.defeat.1"
-    ]
+    encounter: ["dialogue:kahili.encounter.1"],
+    victory: ["dialogue:kahili.victory.1"],
+    defeat: ["dialogue:kahili.defeat.1"],
   },
   [TrainerType.HASSEL]: {
-    encounter: [
-      "dialogue:hassel.encounter.1"
-    ],
-    victory: [
-      "dialogue:hassel.victory.1"
-    ],
-    defeat: [
-      "dialogue:hassel.defeat.1"
-    ]
+    encounter: ["dialogue:hassel.encounter.1"],
+    victory: ["dialogue:hassel.victory.1"],
+    defeat: ["dialogue:hassel.defeat.1"],
   },
   [TrainerType.BLUE]: {
-    encounter: [
-      "dialogue:blue.encounter.1"
-    ],
-    victory: [
-      "dialogue:blue.victory.1"
-    ],
-    defeat: [
-      "dialogue:blue.defeat.1"
-    ]
+    encounter: ["dialogue:blue.encounter.1"],
+    victory: ["dialogue:blue.victory.1"],
+    defeat: ["dialogue:blue.defeat.1"],
   },
   [TrainerType.PIERS]: {
-    encounter: [
-      "dialogue:piers.encounter.1"
-    ],
-    victory: [
-      "dialogue:piers.victory.1"
-    ],
-    defeat: [
-      "dialogue:piers.defeat.1"
-    ]
+    encounter: ["dialogue:piers.encounter.1"],
+    victory: ["dialogue:piers.victory.1"],
+    defeat: ["dialogue:piers.defeat.1"],
   },
   [TrainerType.RED]: {
-    encounter: [
-      "dialogue:red.encounter.1"
-    ],
-    victory: [
-      "dialogue:red.victory.1"
-    ],
-    defeat: [
-      "dialogue:red.defeat.1"
-    ]
+    encounter: ["dialogue:red.encounter.1"],
+    victory: ["dialogue:red.victory.1"],
+    defeat: ["dialogue:red.defeat.1"],
   },
   [TrainerType.JASMINE]: {
-    encounter: [
-      "dialogue:jasmine.encounter.1"
-    ],
-    victory: [
-      "dialogue:jasmine.victory.1"
-    ],
-    defeat: [
-      "dialogue:jasmine.defeat.1"
-    ]
+    encounter: ["dialogue:jasmine.encounter.1"],
+    victory: ["dialogue:jasmine.victory.1"],
+    defeat: ["dialogue:jasmine.defeat.1"],
   },
   [TrainerType.LANCE_CHAMPION]: {
-    encounter: [
-      "dialogue:lance_champion.encounter.1"
-    ],
-    victory: [
-      "dialogue:lance_champion.victory.1"
-    ],
-    defeat: [
-      "dialogue:lance_champion.defeat.1"
-    ]
+    encounter: ["dialogue:lance_champion.encounter.1"],
+    victory: ["dialogue:lance_champion.victory.1"],
+    defeat: ["dialogue:lance_champion.defeat.1"],
   },
   [TrainerType.STEVEN]: {
-    encounter: [
-      "dialogue:steven.encounter.1"
-    ],
-    victory: [
-      "dialogue:steven.victory.1"
-    ],
-    defeat: [
-      "dialogue:steven.defeat.1"
-    ]
+    encounter: ["dialogue:steven.encounter.1"],
+    victory: ["dialogue:steven.victory.1"],
+    defeat: ["dialogue:steven.defeat.1"],
   },
   [TrainerType.CYNTHIA]: {
-    encounter: [
-      "dialogue:cynthia.encounter.1"
-    ],
-    victory: [
-      "dialogue:cynthia.victory.1"
-    ],
-    defeat: [
-      "dialogue:cynthia.defeat.1"
-    ]
+    encounter: ["dialogue:cynthia.encounter.1"],
+    victory: ["dialogue:cynthia.victory.1"],
+    defeat: ["dialogue:cynthia.defeat.1"],
   },
   [TrainerType.IRIS]: {
-    encounter: [
-      "dialogue:iris.encounter.1"
-    ],
-    victory: [
-      "dialogue:iris.victory.1"
-    ],
-    defeat: [
-      "dialogue:iris.defeat.1"
-    ]
+    encounter: ["dialogue:iris.encounter.1"],
+    victory: ["dialogue:iris.victory.1"],
+    defeat: ["dialogue:iris.defeat.1"],
   },
   [TrainerType.KUKUI]: {
-    encounter: [
-      "dialogue:kukui.encounter.1"
-    ],
-    victory: [
-      "dialogue:kukui.victory.1"
-    ],
-    defeat: [
-      "dialogue:kukui.defeat.1"
-    ]
+    encounter: ["dialogue:kukui.encounter.1"],
+    victory: ["dialogue:kukui.victory.1"],
+    defeat: ["dialogue:kukui.defeat.1"],
   },
   [TrainerType.HAU]: {
-    encounter: [
-      "dialogue:hau.encounter.1"
-    ],
-    victory: [
-      "dialogue:hau.victory.1"
-    ],
-    defeat: [
-      "dialogue:hau.defeat.1"
-    ]
+    encounter: ["dialogue:hau.encounter.1"],
+    victory: ["dialogue:hau.victory.1"],
+    defeat: ["dialogue:hau.defeat.1"],
   },
   [TrainerType.GEETA]: {
-    encounter: [
-      "dialogue:geeta.encounter.1"
-    ],
-    victory: [
-      "dialogue:geeta.victory.1"
-    ],
-    defeat: [
-      "dialogue:geeta.defeat.1"
-    ]
+    encounter: ["dialogue:geeta.encounter.1"],
+    victory: ["dialogue:geeta.victory.1"],
+    defeat: ["dialogue:geeta.defeat.1"],
   },
   [TrainerType.NEMONA]: {
-    encounter: [
-      "dialogue:nemona.encounter.1"
-    ],
-    victory: [
-      "dialogue:nemona.victory.1"
-    ],
-    defeat: [
-      "dialogue:nemona.defeat.1"
-    ]
+    encounter: ["dialogue:nemona.encounter.1"],
+    victory: ["dialogue:nemona.victory.1"],
+    defeat: ["dialogue:nemona.defeat.1"],
   },
   [TrainerType.LEON]: {
-    encounter: [
-      "dialogue:leon.encounter.1"
-    ],
-    victory: [
-      "dialogue:leon.victory.1"
-    ],
-    defeat: [
-      "dialogue:leon.defeat.1"
-    ]
+    encounter: ["dialogue:leon.encounter.1"],
+    victory: ["dialogue:leon.victory.1"],
+    defeat: ["dialogue:leon.defeat.1"],
   },
   [TrainerType.MUSTARD]: {
-    encounter: [
-      "dialogue:mustard.encounter.1"
-    ],
-    victory: [
-      "dialogue:mustard.victory.1"
-    ],
-    defeat: [
-      "dialogue:mustard.defeat.1"
-    ]
+    encounter: ["dialogue:mustard.encounter.1"],
+    victory: ["dialogue:mustard.victory.1"],
+    defeat: ["dialogue:mustard.defeat.1"],
   },
   [TrainerType.WHITNEY]: {
-    encounter: [
-      "dialogue:whitney.encounter.1"
-    ],
-    victory: [
-      "dialogue:whitney.victory.1"
-    ],
-    defeat: [
-      "dialogue:whitney.defeat.1"
-    ]
+    encounter: ["dialogue:whitney.encounter.1"],
+    victory: ["dialogue:whitney.victory.1"],
+    defeat: ["dialogue:whitney.defeat.1"],
   },
   [TrainerType.CHUCK]: {
-    encounter: [
-      "dialogue:chuck.encounter.1"
-    ],
-    victory: [
-      "dialogue:chuck.victory.1"
-    ],
-    defeat: [
-      "dialogue:chuck.defeat.1"
-    ]
+    encounter: ["dialogue:chuck.encounter.1"],
+    victory: ["dialogue:chuck.victory.1"],
+    defeat: ["dialogue:chuck.defeat.1"],
   },
   [TrainerType.KATY]: {
-    encounter: [
-      "dialogue:katy.encounter.1"
-    ],
-    victory: [
-      "dialogue:katy.victory.1"
-    ],
-    defeat: [
-      "dialogue:katy.defeat.1"
-    ]
+    encounter: ["dialogue:katy.encounter.1"],
+    victory: ["dialogue:katy.victory.1"],
+    defeat: ["dialogue:katy.defeat.1"],
   },
   [TrainerType.PRYCE]: {
-    encounter: [
-      "dialogue:pryce.encounter.1"
-    ],
-    victory: [
-      "dialogue:pryce.victory.1"
-    ],
-    defeat: [
-      "dialogue:pryce.defeat.1"
-    ]
+    encounter: ["dialogue:pryce.encounter.1"],
+    victory: ["dialogue:pryce.victory.1"],
+    defeat: ["dialogue:pryce.defeat.1"],
   },
   [TrainerType.CLAIR]: {
-    encounter: [
-      "dialogue:clair.encounter.1"
-    ],
-    victory: [
-      "dialogue:clair.victory.1"
-    ],
-    defeat: [
-      "dialogue:clair.defeat.1"
-    ]
+    encounter: ["dialogue:clair.encounter.1"],
+    victory: ["dialogue:clair.victory.1"],
+    defeat: ["dialogue:clair.defeat.1"],
   },
   [TrainerType.MAYLENE]: {
-    encounter: [
-      "dialogue:maylene.encounter.1"
-    ],
-    victory: [
-      "dialogue:maylene.victory.1"
-    ],
-    defeat: [
-      "dialogue:maylene.defeat.1"
-    ]
+    encounter: ["dialogue:maylene.encounter.1"],
+    victory: ["dialogue:maylene.victory.1"],
+    defeat: ["dialogue:maylene.defeat.1"],
   },
   [TrainerType.FANTINA]: {
-    encounter: [
-      "dialogue:fantina.encounter.1"
-    ],
-    victory: [
-      "dialogue:fantina.victory.1"
-    ],
-    defeat: [
-      "dialogue:fantina.defeat.1"
-    ]
+    encounter: ["dialogue:fantina.encounter.1"],
+    victory: ["dialogue:fantina.victory.1"],
+    defeat: ["dialogue:fantina.defeat.1"],
   },
   [TrainerType.BYRON]: {
-    encounter: [
-      "dialogue:byron.encounter.1"
-    ],
-    victory: [
-      "dialogue:byron.victory.1"
-    ],
-    defeat: [
-      "dialogue:byron.defeat.1"
-    ]
+    encounter: ["dialogue:byron.encounter.1"],
+    victory: ["dialogue:byron.victory.1"],
+    defeat: ["dialogue:byron.defeat.1"],
   },
   [TrainerType.OLYMPIA]: {
-    encounter: [
-      "dialogue:olympia.encounter.1"
-    ],
-    victory: [
-      "dialogue:olympia.victory.1"
-    ],
-    defeat: [
-      "dialogue:olympia.defeat.1"
-    ]
+    encounter: ["dialogue:olympia.encounter.1"],
+    victory: ["dialogue:olympia.victory.1"],
+    defeat: ["dialogue:olympia.defeat.1"],
   },
   [TrainerType.VOLKNER]: {
-    encounter: [
-      "dialogue:volkner.encounter.1"
-    ],
-    victory: [
-      "dialogue:volkner.victory.1"
-    ],
-    defeat: [
-      "dialogue:volkner.defeat.1"
-    ]
+    encounter: ["dialogue:volkner.encounter.1"],
+    victory: ["dialogue:volkner.victory.1"],
+    defeat: ["dialogue:volkner.defeat.1"],
   },
   [TrainerType.BURGH]: {
-    encounter: [
-      "dialogue:burgh.encounter.1",
-      "dialogue:burgh.encounter.2"
-    ],
-    victory: [
-      "dialogue:burgh.victory.1",
-      "dialogue:burgh.victory.2"
-    ],
-    defeat: [
-      "dialogue:burgh.defeat.1",
-      "dialogue:burgh.defeat.2"
-    ]
+    encounter: ["dialogue:burgh.encounter.1", "dialogue:burgh.encounter.2"],
+    victory: ["dialogue:burgh.victory.1", "dialogue:burgh.victory.2"],
+    defeat: ["dialogue:burgh.defeat.1", "dialogue:burgh.defeat.2"],
   },
   [TrainerType.ELESA]: {
-    encounter: [
-      "dialogue:elesa.encounter.1"
-    ],
-    victory: [
-      "dialogue:elesa.victory.1"
-    ],
-    defeat: [
-      "dialogue:elesa.defeat.1"
-    ]
+    encounter: ["dialogue:elesa.encounter.1"],
+    victory: ["dialogue:elesa.victory.1"],
+    defeat: ["dialogue:elesa.defeat.1"],
   },
   [TrainerType.SKYLA]: {
-    encounter: [
-      "dialogue:skyla.encounter.1"
-    ],
-    victory: [
-      "dialogue:skyla.victory.1"
-    ],
-    defeat: [
-      "dialogue:skyla.defeat.1"
-    ]
+    encounter: ["dialogue:skyla.encounter.1"],
+    victory: ["dialogue:skyla.victory.1"],
+    defeat: ["dialogue:skyla.defeat.1"],
   },
   [TrainerType.BRYCEN]: {
-    encounter: [
-      "dialogue:brycen.encounter.1"
-    ],
-    victory: [
-      "dialogue:brycen.victory.1"
-    ],
-    defeat: [
-      "dialogue:brycen.defeat.1"
-    ]
+    encounter: ["dialogue:brycen.encounter.1"],
+    victory: ["dialogue:brycen.victory.1"],
+    defeat: ["dialogue:brycen.defeat.1"],
   },
   [TrainerType.DRAYDEN]: {
-    encounter: [
-      "dialogue:drayden.encounter.1"
-    ],
-    victory: [
-      "dialogue:drayden.victory.1"
-    ],
-    defeat: [
-      "dialogue:drayden.defeat.1"
-    ]
+    encounter: ["dialogue:drayden.encounter.1"],
+    victory: ["dialogue:drayden.victory.1"],
+    defeat: ["dialogue:drayden.defeat.1"],
   },
   [TrainerType.GRANT]: {
-    encounter: [
-      "dialogue:grant.encounter.1"
-    ],
-    victory: [
-      "dialogue:grant.victory.1"
-    ],
-    defeat: [
-      "dialogue:grant.defeat.1"
-    ]
+    encounter: ["dialogue:grant.encounter.1"],
+    victory: ["dialogue:grant.victory.1"],
+    defeat: ["dialogue:grant.defeat.1"],
   },
   [TrainerType.KORRINA]: {
-    encounter: [
-      "dialogue:korrina.encounter.1"
-    ],
-    victory: [
-      "dialogue:korrina.victory.1"
-    ],
-    defeat: [
-      "dialogue:korrina.defeat.1"
-    ]
+    encounter: ["dialogue:korrina.encounter.1"],
+    victory: ["dialogue:korrina.victory.1"],
+    defeat: ["dialogue:korrina.defeat.1"],
   },
   [TrainerType.CLEMONT]: {
-    encounter: [
-      "dialogue:clemont.encounter.1"
-    ],
-    victory: [
-      "dialogue:clemont.victory.1"
-    ],
-    defeat: [
-      "dialogue:clemont.defeat.1"
-    ]
+    encounter: ["dialogue:clemont.encounter.1"],
+    victory: ["dialogue:clemont.victory.1"],
+    defeat: ["dialogue:clemont.defeat.1"],
   },
   [TrainerType.VALERIE]: {
-    encounter: [
-      "dialogue:valerie.encounter.1"
-    ],
-    victory: [
-      "dialogue:valerie.victory.1"
-    ],
-    defeat: [
-      "dialogue:valerie.defeat.1"
-    ]
+    encounter: ["dialogue:valerie.encounter.1"],
+    victory: ["dialogue:valerie.victory.1"],
+    defeat: ["dialogue:valerie.defeat.1"],
   },
   [TrainerType.WULFRIC]: {
-    encounter: [
-      "dialogue:wulfric.encounter.1"
-    ],
-    victory: [
-      "dialogue:wulfric.victory.1"
-    ],
-    defeat: [
-      "dialogue:wulfric.defeat.1"
-    ]
+    encounter: ["dialogue:wulfric.encounter.1"],
+    victory: ["dialogue:wulfric.victory.1"],
+    defeat: ["dialogue:wulfric.defeat.1"],
   },
   [TrainerType.KABU]: {
-    encounter: [
-      "dialogue:kabu.encounter.1"
-    ],
-    victory: [
-      "dialogue:kabu.victory.1"
-    ],
-    defeat: [
-      "dialogue:kabu.defeat.1"
-    ]
+    encounter: ["dialogue:kabu.encounter.1"],
+    victory: ["dialogue:kabu.victory.1"],
+    defeat: ["dialogue:kabu.defeat.1"],
   },
   [TrainerType.BEA]: {
-    encounter: [
-      "dialogue:bea.encounter.1"
-    ],
-    victory: [
-      "dialogue:bea.victory.1"
-    ],
-    defeat: [
-      "dialogue:bea.defeat.1"
-    ]
+    encounter: ["dialogue:bea.encounter.1"],
+    victory: ["dialogue:bea.victory.1"],
+    defeat: ["dialogue:bea.defeat.1"],
   },
   [TrainerType.OPAL]: {
-    encounter: [
-      "dialogue:opal.encounter.1"
-    ],
-    victory: [
-      "dialogue:opal.victory.1"
-    ],
-    defeat: [
-      "dialogue:opal.defeat.1"
-    ]
+    encounter: ["dialogue:opal.encounter.1"],
+    victory: ["dialogue:opal.victory.1"],
+    defeat: ["dialogue:opal.defeat.1"],
   },
   [TrainerType.BEDE]: {
-    encounter: [
-      "dialogue:bede.encounter.1"
-    ],
-    victory: [
-      "dialogue:bede.victory.1"
-    ],
-    defeat: [
-      "dialogue:bede.defeat.1"
-    ]
+    encounter: ["dialogue:bede.encounter.1"],
+    victory: ["dialogue:bede.victory.1"],
+    defeat: ["dialogue:bede.defeat.1"],
   },
   [TrainerType.GORDIE]: {
-    encounter: [
-      "dialogue:gordie.encounter.1"
-    ],
-    victory: [
-      "dialogue:gordie.victory.1"
-    ],
-    defeat: [
-      "dialogue:gordie.defeat.1"
-    ]
+    encounter: ["dialogue:gordie.encounter.1"],
+    victory: ["dialogue:gordie.victory.1"],
+    defeat: ["dialogue:gordie.defeat.1"],
   },
   [TrainerType.MARNIE]: {
-    encounter: [
-      "dialogue:marnie.encounter.1"
-    ],
-    victory: [
-      "dialogue:marnie.victory.1"
-    ],
-    defeat: [
-      "dialogue:marnie.defeat.1"
-    ]
+    encounter: ["dialogue:marnie.encounter.1"],
+    victory: ["dialogue:marnie.victory.1"],
+    defeat: ["dialogue:marnie.defeat.1"],
   },
   [TrainerType.RAIHAN]: {
-    encounter: [
-      "dialogue:raihan.encounter.1"
-    ],
-    victory: [
-      "dialogue:raihan.victory.1"
-    ],
-    defeat: [
-      "dialogue:raihan.defeat.1"
-    ]
+    encounter: ["dialogue:raihan.encounter.1"],
+    victory: ["dialogue:raihan.victory.1"],
+    defeat: ["dialogue:raihan.defeat.1"],
   },
   [TrainerType.BRASSIUS]: {
-    encounter: [
-      "dialogue:brassius.encounter.1"
-    ],
-    victory: [
-      "dialogue:brassius.victory.1"
-    ],
-    defeat: [
-      "dialogue:brassius.defeat.1"
-    ]
+    encounter: ["dialogue:brassius.encounter.1"],
+    victory: ["dialogue:brassius.victory.1"],
+    defeat: ["dialogue:brassius.defeat.1"],
   },
   [TrainerType.IONO]: {
-    encounter: [
-      "dialogue:iono.encounter.1"
-    ],
-    victory: [
-      "dialogue:iono.victory.1"
-    ],
-    defeat: [
-      "dialogue:iono.defeat.1"
-    ]
+    encounter: ["dialogue:iono.encounter.1"],
+    victory: ["dialogue:iono.victory.1"],
+    defeat: ["dialogue:iono.defeat.1"],
   },
   [TrainerType.LARRY]: {
-    encounter: [
-      "dialogue:larry.encounter.1"
-    ],
-    victory: [
-      "dialogue:larry.victory.1"
-    ],
-    defeat: [
-      "dialogue:larry.defeat.1"
-    ]
+    encounter: ["dialogue:larry.encounter.1"],
+    victory: ["dialogue:larry.victory.1"],
+    defeat: ["dialogue:larry.defeat.1"],
   },
   [TrainerType.RYME]: {
-    encounter: [
-      "dialogue:ryme.encounter.1"
-    ],
-    victory: [
-      "dialogue:ryme.victory.1"
-    ],
-    defeat: [
-      "dialogue:ryme.defeat.1"
-    ]
+    encounter: ["dialogue:ryme.encounter.1"],
+    victory: ["dialogue:ryme.victory.1"],
+    defeat: ["dialogue:ryme.defeat.1"],
   },
   [TrainerType.GRUSHA]: {
-    encounter: [
-      "dialogue:grusha.encounter.1"
-    ],
-    victory: [
-      "dialogue:grusha.victory.1"
-    ],
-    defeat: [
-      "dialogue:grusha.defeat.1"
-    ]
+    encounter: ["dialogue:grusha.encounter.1"],
+    victory: ["dialogue:grusha.victory.1"],
+    defeat: ["dialogue:grusha.defeat.1"],
   },
   [TrainerType.MARNIE_ELITE]: {
-    encounter: [
-      "dialogue:marnie_elite.encounter.1",
-      "dialogue:marnie_elite.encounter.2"
-    ],
-    victory: [
-      "dialogue:marnie_elite.victory.1",
-      "dialogue:marnie_elite.victory.2"
-    ],
-    defeat: [
-      "dialogue:marnie_elite.defeat.1",
-      "dialogue:marnie_elite.defeat.2"
-    ]
+    encounter: ["dialogue:marnie_elite.encounter.1", "dialogue:marnie_elite.encounter.2"],
+    victory: ["dialogue:marnie_elite.victory.1", "dialogue:marnie_elite.victory.2"],
+    defeat: ["dialogue:marnie_elite.defeat.1", "dialogue:marnie_elite.defeat.2"],
   },
   [TrainerType.NESSA_ELITE]: {
-    encounter: [
-      "dialogue:nessa_elite.encounter.1",
-      "dialogue:nessa_elite.encounter.2"
-    ],
-    victory: [
-      "dialogue:nessa_elite.victory.1",
-      "dialogue:nessa_elite.victory.2"
-    ],
-    defeat: [
-      "dialogue:nessa_elite.defeat.1",
-      "dialogue:nessa_elite.defeat.2"
-    ]
+    encounter: ["dialogue:nessa_elite.encounter.1", "dialogue:nessa_elite.encounter.2"],
+    victory: ["dialogue:nessa_elite.victory.1", "dialogue:nessa_elite.victory.2"],
+    defeat: ["dialogue:nessa_elite.defeat.1", "dialogue:nessa_elite.defeat.2"],
   },
   [TrainerType.BEA_ELITE]: {
-    encounter: [
-      "dialogue:bea_elite.encounter.1",
-      "dialogue:bea_elite.encounter.2"
-    ],
-    victory: [
-      "dialogue:bea_elite.victory.1",
-      "dialogue:bea_elite.victory.2"
-    ],
-    defeat: [
-      "dialogue:bea_elite.defeat.1",
-      "dialogue:bea_elite.defeat.2"
-    ]
+    encounter: ["dialogue:bea_elite.encounter.1", "dialogue:bea_elite.encounter.2"],
+    victory: ["dialogue:bea_elite.victory.1", "dialogue:bea_elite.victory.2"],
+    defeat: ["dialogue:bea_elite.defeat.1", "dialogue:bea_elite.defeat.2"],
   },
   [TrainerType.ALLISTER_ELITE]: {
-    encounter: [
-      "dialogue:allister_elite.encounter.1",
-      "dialogue:allister_elite.encounter.2"
-    ],
-    victory: [
-      "dialogue:allister_elite.victory.1",
-      "dialogue:allister_elite.victory.2"
-    ],
-    defeat: [
-      "dialogue:allister_elite.defeat.1",
-      "dialogue:allister_elite.defeat.2"
-    ]
+    encounter: ["dialogue:allister_elite.encounter.1", "dialogue:allister_elite.encounter.2"],
+    victory: ["dialogue:allister_elite.victory.1", "dialogue:allister_elite.victory.2"],
+    defeat: ["dialogue:allister_elite.defeat.1", "dialogue:allister_elite.defeat.2"],
   },
   [TrainerType.RAIHAN_ELITE]: {
-    encounter: [
-      "dialogue:raihan_elite.encounter.1",
-      "dialogue:raihan_elite.encounter.2"
-    ],
-    victory: [
-      "dialogue:raihan_elite.victory.1",
-      "dialogue:raihan_elite.victory.2"
-    ],
-    defeat: [
-      "dialogue:raihan_elite.defeat.1",
-      "dialogue:raihan_elite.defeat.2"
-    ]
+    encounter: ["dialogue:raihan_elite.encounter.1", "dialogue:raihan_elite.encounter.2"],
+    victory: ["dialogue:raihan_elite.victory.1", "dialogue:raihan_elite.victory.2"],
+    defeat: ["dialogue:raihan_elite.defeat.1", "dialogue:raihan_elite.defeat.2"],
   },
   [TrainerType.ALDER]: {
-    encounter: [
-      "dialogue:alder.encounter.1"
-    ],
-    victory: [
-      "dialogue:alder.victory.1"
-    ],
-    defeat: [
-      "dialogue:alder.defeat.1"
-    ]
+    encounter: ["dialogue:alder.encounter.1"],
+    victory: ["dialogue:alder.victory.1"],
+    defeat: ["dialogue:alder.defeat.1"],
   },
   [TrainerType.KIERAN]: {
-    encounter: [
-      "dialogue:kieran.encounter.1"
-    ],
-    victory: [
-      "dialogue:kieran.victory.1"
-    ],
-    defeat: [
-      "dialogue:kieran.defeat.1"
-    ]
+    encounter: ["dialogue:kieran.encounter.1"],
+    victory: ["dialogue:kieran.victory.1"],
+    defeat: ["dialogue:kieran.defeat.1"],
   },
   [TrainerType.RIVAL]: [
     {
-      encounter: [
-        "dialogue:rival.encounter.1",
-      ],
-      victory: [
-        "dialogue:rival.victory.1",
-      ],
-
+      encounter: ["dialogue:rival.encounter.1"],
+      victory: ["dialogue:rival.victory.1"],
     },
     {
-      encounter: [
-        "dialogue:rival_female.encounter.1",
-      ],
-      victory: [
-        "dialogue:rival_female.victory.1",
-      ]
-    }
+      encounter: ["dialogue:rival_female.encounter.1"],
+      victory: ["dialogue:rival_female.victory.1"],
+    },
   ],
   [TrainerType.RIVAL_2]: [
     {
-      encounter: [
-        "dialogue:rival_2.encounter.1",
-      ],
-      victory: [
-        "dialogue:rival_2.victory.1",
-      ],
-
+      encounter: ["dialogue:rival_2.encounter.1"],
+      victory: ["dialogue:rival_2.victory.1"],
     },
     {
-      encounter: [
-        "dialogue:rival_2_female.encounter.1",
-      ],
-      victory: [
-        "dialogue:rival_2_female.victory.1",
-      ],
-      defeat: [
-        "dialogue:rival_2_female.defeat.1",
-      ]
+      encounter: ["dialogue:rival_2_female.encounter.1"],
+      victory: ["dialogue:rival_2_female.victory.1"],
+      defeat: ["dialogue:rival_2_female.defeat.1"],
     },
   ],
   [TrainerType.RIVAL_3]: [
     {
-      encounter: [
-        "dialogue:rival_3.encounter.1",
-      ],
-      victory: [
-        "dialogue:rival_3.victory.1",
-      ]
+      encounter: ["dialogue:rival_3.encounter.1"],
+      victory: ["dialogue:rival_3.victory.1"],
     },
     {
-      encounter: [
-        "dialogue:rival_3_female.encounter.1",
-      ],
-      victory: [
-        "dialogue:rival_3_female.victory.1",
-      ],
-      defeat: [
-        "dialogue:rival_3_female.defeat.1",
-      ]
-    }
+      encounter: ["dialogue:rival_3_female.encounter.1"],
+      victory: ["dialogue:rival_3_female.victory.1"],
+      defeat: ["dialogue:rival_3_female.defeat.1"],
+    },
   ],
   [TrainerType.RIVAL_4]: [
     {
-      encounter: [
-        "dialogue:rival_4.encounter.1",
-      ],
-      victory: [
-        "dialogue:rival_4.victory.1",
-      ]
+      encounter: ["dialogue:rival_4.encounter.1"],
+      victory: ["dialogue:rival_4.victory.1"],
     },
     {
-      encounter: [
-        "dialogue:rival_4_female.encounter.1",
-      ],
-      victory: [
-        "dialogue:rival_4_female.victory.1",
-      ],
-      defeat: [
-        "dialogue:rival_4_female.defeat.1",
-      ]
-    }
+      encounter: ["dialogue:rival_4_female.encounter.1"],
+      victory: ["dialogue:rival_4_female.victory.1"],
+      defeat: ["dialogue:rival_4_female.defeat.1"],
+    },
   ],
   [TrainerType.RIVAL_5]: [
     {
-      encounter: [
-        "dialogue:rival_5.encounter.1",
-      ],
-      victory: [
-        "dialogue:rival_5.victory.1",
-      ]
+      encounter: ["dialogue:rival_5.encounter.1"],
+      victory: ["dialogue:rival_5.victory.1"],
     },
     {
-      encounter: [
-        "dialogue:rival_5_female.encounter.1",
-      ],
-      victory: [
-        "dialogue:rival_5_female.victory.1",
-      ],
-      defeat: [
-        "dialogue:rival_5_female.defeat.1",
-      ]
-    }
+      encounter: ["dialogue:rival_5_female.encounter.1"],
+      victory: ["dialogue:rival_5_female.victory.1"],
+      defeat: ["dialogue:rival_5_female.defeat.1"],
+    },
   ],
   [TrainerType.RIVAL_6]: [
     {
-      encounter: [
-        "dialogue:rival_6.encounter.1",
-      ],
-      victory: [
-        "dialogue:rival_6.victory.1",
-      ]
+      encounter: ["dialogue:rival_6.encounter.1"],
+      victory: ["dialogue:rival_6.victory.1"],
     },
     {
-      encounter: [
-        "dialogue:rival_6_female.encounter.1",
-      ],
-      victory: [
-        "dialogue:rival_6_female.victory.1",
-      ],
-    }
-  ]
+      encounter: ["dialogue:rival_6_female.encounter.1"],
+      victory: ["dialogue:rival_6_female.victory.1"],
+    },
+  ],
 };
 
-
 export const doubleBattleDialogue = {
-  "blue_red_double": {
-    encounter: [ "doubleBattleDialogue:blue_red_double.encounter.1" ],
-    victory: [ "doubleBattleDialogue:blue_red_double.victory.1" ]
+  blue_red_double: {
+    encounter: ["doubleBattleDialogue:blue_red_double.encounter.1"],
+    victory: ["doubleBattleDialogue:blue_red_double.victory.1"],
   },
-  "red_blue_double": {
-    encounter: [ "doubleBattleDialogue:red_blue_double.encounter.1" ],
-    victory: [ "doubleBattleDialogue:red_blue_double.victory.1" ]
+  red_blue_double: {
+    encounter: ["doubleBattleDialogue:red_blue_double.encounter.1"],
+    victory: ["doubleBattleDialogue:red_blue_double.victory.1"],
   },
-  "tate_liza_double": {
-    encounter: [ "doubleBattleDialogue:tate_liza_double.encounter.1" ],
-    victory: [ "doubleBattleDialogue:tate_liza_double.victory.1" ]
+  tate_liza_double: {
+    encounter: ["doubleBattleDialogue:tate_liza_double.encounter.1"],
+    victory: ["doubleBattleDialogue:tate_liza_double.victory.1"],
   },
-  "liza_tate_double": {
-    encounter: [ "doubleBattleDialogue:liza_tate_double.encounter.1" ],
-    victory: [ "doubleBattleDialogue:liza_tate_double.victory.1" ]
+  liza_tate_double: {
+    encounter: ["doubleBattleDialogue:liza_tate_double.encounter.1"],
+    victory: ["doubleBattleDialogue:liza_tate_double.victory.1"],
   },
-  "wallace_steven_double": {
-    encounter: [ "doubleBattleDialogue:wallace_steven_double.encounter.1" ],
-    victory: [ "doubleBattleDialogue:wallace_steven_double.victory.1" ]
+  wallace_steven_double: {
+    encounter: ["doubleBattleDialogue:wallace_steven_double.encounter.1"],
+    victory: ["doubleBattleDialogue:wallace_steven_double.victory.1"],
   },
-  "steven_wallace_double": {
-    encounter: [ "doubleBattleDialogue:steven_wallace_double.encounter.1" ],
-    victory: [ "doubleBattleDialogue:steven_wallace_double.victory.1" ]
+  steven_wallace_double: {
+    encounter: ["doubleBattleDialogue:steven_wallace_double.encounter.1"],
+    victory: ["doubleBattleDialogue:steven_wallace_double.victory.1"],
   },
-  "alder_iris_double": {
-    encounter: [ "doubleBattleDialogue:alder_iris_double.encounter.1" ],
-    victory: [ "doubleBattleDialogue:alder_iris_double.victory.1" ]
+  alder_iris_double: {
+    encounter: ["doubleBattleDialogue:alder_iris_double.encounter.1"],
+    victory: ["doubleBattleDialogue:alder_iris_double.victory.1"],
   },
-  "iris_alder_double": {
-    encounter: [ "doubleBattleDialogue:iris_alder_double.encounter.1" ],
-    victory: [ "doubleBattleDialogue:iris_alder_double.victory.1" ]
+  iris_alder_double: {
+    encounter: ["doubleBattleDialogue:iris_alder_double.encounter.1"],
+    victory: ["doubleBattleDialogue:iris_alder_double.victory.1"],
   },
-  "marnie_piers_double": {
-    encounter: [ "doubleBattleDialogue:marnie_piers_double.encounter.1" ],
-    victory: [ "doubleBattleDialogue:marnie_piers_double.victory.1" ]
+  marnie_piers_double: {
+    encounter: ["doubleBattleDialogue:marnie_piers_double.encounter.1"],
+    victory: ["doubleBattleDialogue:marnie_piers_double.victory.1"],
   },
-  "piers_marnie_double": {
-    encounter: [ "doubleBattleDialogue:piers_marnie_double.encounter.1" ],
-    victory: [ "doubleBattleDialogue:piers_marnie_double.victory.1" ]
+  piers_marnie_double: {
+    encounter: ["doubleBattleDialogue:piers_marnie_double.encounter.1"],
+    victory: ["doubleBattleDialogue:piers_marnie_double.victory.1"],
   },
-
-
 };
 
 export const battleSpecDialogue = {
@@ -3193,14 +1771,11 @@ export const battleSpecDialogue = {
     encounter: "battleSpecDialogue:encounter",
     firstStageWin: "battleSpecDialogue:firstStageWin",
     secondStageWin: "battleSpecDialogue:secondStageWin",
-  }
+  },
 };
 
 export const miscDialogue = {
-  ending: [
-    "miscDialogue:ending",
-    "miscDialogue:ending_female"
-  ]
+  ending: ["miscDialogue:ending", "miscDialogue:ending_female"],
 };
 
 export function getCharVariantFromDialogue(message: string): string {
@@ -3212,17 +1787,18 @@ export function getCharVariantFromDialogue(message: string): string {
 }
 
 export function initTrainerTypeDialogue(): void {
-  const trainerTypes = Object.keys(trainerTypeDialogue).map(t => parseInt(t) as TrainerType);
+  const trainerTypes = Object.keys(trainerTypeDialogue).map(t => Number.parseInt(t) as TrainerType);
   for (const trainerType of trainerTypes) {
     const messages = trainerTypeDialogue[trainerType];
-    const messageTypes = [ "encounter", "victory", "defeat" ];
+    const messageTypes = ["encounter", "victory", "defeat"];
     for (const messageType of messageTypes) {
       if (Array.isArray(messages)) {
         if (messages[0][messageType]) {
           trainerConfigs[trainerType][`${messageType}Messages`] = messages[0][messageType];
         }
         if (messages.length > 1) {
-          trainerConfigs[trainerType][`female${messageType.slice(0, 1).toUpperCase()}${messageType.slice(1)}Messages`] = messages[1][messageType];
+          trainerConfigs[trainerType][`female${messageType.slice(0, 1).toUpperCase()}${messageType.slice(1)}Messages`] =
+            messages[1][messageType];
         }
       } else {
         trainerConfigs[trainerType][`${messageType}Messages`] = messages[messageType];
diff --git a/src/data/egg-hatch-data.ts b/src/data/egg-hatch-data.ts
index 37ee9bede09..949ed1af063 100644
--- a/src/data/egg-hatch-data.ts
+++ b/src/data/egg-hatch-data.ts
@@ -24,17 +24,17 @@ export class EggHatchData {
   }
 
   /**
-     * Sets the boolean for if the egg move for the hatch is a new unlock
-     * @param unlocked True if the EM is new
-     */
+   * Sets the boolean for if the egg move for the hatch is a new unlock
+   * @param unlocked True if the EM is new
+   */
   setEggMoveUnlocked(unlocked: boolean) {
-    this.eggMoveUnlocked  = unlocked;
+    this.eggMoveUnlocked = unlocked;
   }
 
   /**
-     * Stores a copy of the current DexEntry of the pokemon and StarterDataEntry of its starter
-     * Used before updating the dex, so comparing the pokemon to these entries will show the new attributes
-     */
+   * Stores a copy of the current DexEntry of the pokemon and StarterDataEntry of its starter
+   * Used before updating the dex, so comparing the pokemon to these entries will show the new attributes
+   */
   setDex() {
     const currDexEntry = globalScene.gameData.dexData[this.pokemon.species.speciesId];
     const currStarterDataEntry = globalScene.gameData.starterData[this.pokemon.species.getRootSpeciesId()];
@@ -45,7 +45,7 @@ export class EggHatchData {
       seenCount: currDexEntry.seenCount,
       caughtCount: currDexEntry.caughtCount,
       hatchedCount: currDexEntry.hatchedCount,
-      ivs: [ ...currDexEntry.ivs ]
+      ivs: [...currDexEntry.ivs],
     };
     this.starterDataEntryBeforeUpdate = {
       moveset: currStarterDataEntry.moveset,
@@ -55,37 +55,37 @@ export class EggHatchData {
       abilityAttr: currStarterDataEntry.abilityAttr,
       passiveAttr: currStarterDataEntry.passiveAttr,
       valueReduction: currStarterDataEntry.valueReduction,
-      classicWinCount: currStarterDataEntry.classicWinCount
+      classicWinCount: currStarterDataEntry.classicWinCount,
     };
   }
 
   /**
-     * Gets the dex entry before update
-     * @returns Dex Entry corresponding to this pokemon before the pokemon was added / updated to dex
-     */
+   * Gets the dex entry before update
+   * @returns Dex Entry corresponding to this pokemon before the pokemon was added / updated to dex
+   */
   getDex(): DexEntry {
     return this.dexEntryBeforeUpdate;
   }
 
   /**
-     * Gets the starter dex entry before update
-     * @returns Starter Dex Entry corresponding to this pokemon before the pokemon was added / updated to dex
-     */
+   * Gets the starter dex entry before update
+   * @returns Starter Dex Entry corresponding to this pokemon before the pokemon was added / updated to dex
+   */
   getStarterEntry(): StarterDataEntry {
     return this.starterDataEntryBeforeUpdate;
   }
 
   /**
-     * Update the pokedex data corresponding with the new hatch's pokemon data
-     * Also sets whether the egg move is a new unlock or not
-     * @param showMessage boolean to show messages for the new catches and egg moves (false by default)
-     * @returns
-     */
-  updatePokemon(showMessage : boolean = false) {
+   * Update the pokedex data corresponding with the new hatch's pokemon data
+   * Also sets whether the egg move is a new unlock or not
+   * @param showMessage boolean to show messages for the new catches and egg moves (false by default)
+   * @returns
+   */
+  updatePokemon(showMessage = false) {
     return new Promise<void>(resolve => {
       globalScene.gameData.setPokemonCaught(this.pokemon, true, true, showMessage).then(() => {
         globalScene.gameData.updateSpeciesDexIvs(this.pokemon.species.speciesId, this.pokemon.ivs);
-        globalScene.gameData.setEggMoveUnlocked(this.pokemon.species, this.eggMoveIndex, showMessage).then((value) => {
+        globalScene.gameData.setEggMoveUnlocked(this.pokemon.species, this.eggMoveIndex, showMessage).then(value => {
           this.setEggMoveUnlocked(value);
           resolve();
         });
diff --git a/src/data/egg.ts b/src/data/egg.ts
index 380b5ddabfe..0b7733bf199 100644
--- a/src/data/egg.ts
+++ b/src/data/egg.ts
@@ -4,7 +4,7 @@ import type PokemonSpecies from "#app/data/pokemon-species";
 import { getPokemonSpecies } from "#app/data/pokemon-species";
 import { speciesStarterCosts } from "#app/data/balance/starters";
 import { VariantTier } from "#enums/variant-tier";
-import * as Utils from "#app/utils";
+import { randInt, randomString, randSeedInt, getIvsFromId } from "#app/utils/common";
 import Overrides from "#app/overrides";
 import { pokemonPrevolutions } from "#app/data/balance/pokemon-evolutions";
 import type { PlayerPokemon } from "#app/field/pokemon";
@@ -12,7 +12,31 @@ import i18next from "i18next";
 import { EggTier } from "#enums/egg-type";
 import { Species } from "#enums/species";
 import { EggSourceType } from "#enums/egg-source-types";
-import { MANAPHY_EGG_MANAPHY_RATE, SAME_SPECIES_EGG_HA_RATE, GACHA_EGG_HA_RATE, GACHA_DEFAULT_RARE_EGGMOVE_RATE, SAME_SPECIES_EGG_RARE_EGGMOVE_RATE, GACHA_MOVE_UP_RARE_EGGMOVE_RATE, GACHA_DEFAULT_SHINY_RATE, GACHA_SHINY_UP_SHINY_RATE, SAME_SPECIES_EGG_SHINY_RATE, EGG_PITY_LEGENDARY_THRESHOLD, EGG_PITY_EPIC_THRESHOLD, EGG_PITY_RARE_THRESHOLD, SHINY_VARIANT_CHANCE, SHINY_EPIC_CHANCE, GACHA_DEFAULT_COMMON_EGG_THRESHOLD, GACHA_DEFAULT_RARE_EGG_THRESHOLD, GACHA_DEFAULT_EPIC_EGG_THRESHOLD, GACHA_LEGENDARY_UP_THRESHOLD_OFFSET, HATCH_WAVES_MANAPHY_EGG, HATCH_WAVES_COMMON_EGG, HATCH_WAVES_RARE_EGG, HATCH_WAVES_EPIC_EGG, HATCH_WAVES_LEGENDARY_EGG } from "#app/data/balance/rates";
+import {
+  MANAPHY_EGG_MANAPHY_RATE,
+  SAME_SPECIES_EGG_HA_RATE,
+  GACHA_EGG_HA_RATE,
+  GACHA_DEFAULT_RARE_EGGMOVE_RATE,
+  SAME_SPECIES_EGG_RARE_EGGMOVE_RATE,
+  GACHA_MOVE_UP_RARE_EGGMOVE_RATE,
+  GACHA_DEFAULT_SHINY_RATE,
+  GACHA_SHINY_UP_SHINY_RATE,
+  SAME_SPECIES_EGG_SHINY_RATE,
+  EGG_PITY_LEGENDARY_THRESHOLD,
+  EGG_PITY_EPIC_THRESHOLD,
+  EGG_PITY_RARE_THRESHOLD,
+  SHINY_VARIANT_CHANCE,
+  SHINY_EPIC_CHANCE,
+  GACHA_DEFAULT_COMMON_EGG_THRESHOLD,
+  GACHA_DEFAULT_RARE_EGG_THRESHOLD,
+  GACHA_DEFAULT_EPIC_EGG_THRESHOLD,
+  GACHA_LEGENDARY_UP_THRESHOLD_OFFSET,
+  HATCH_WAVES_MANAPHY_EGG,
+  HATCH_WAVES_COMMON_EGG,
+  HATCH_WAVES_RARE_EGG,
+  HATCH_WAVES_EPIC_EGG,
+  HATCH_WAVES_LEGENDARY_EGG,
+} from "#app/data/balance/rates";
 import { speciesEggTiers } from "#app/data/balance/species-egg-tiers";
 
 export const EGG_SEED = 1073741824;
@@ -60,7 +84,6 @@ export interface IEggOptions {
 }
 
 export class Egg {
-
   ////
   // #region Private properties
   ////
@@ -141,14 +164,14 @@ export class Egg {
 
       this._sourceType = eggOptions?.sourceType!; // TODO: is this bang correct?
       // Ensure _sourceType is defined before invoking rollEggTier(), as it is referenced
-      this._tier = eggOptions?.tier ?? (Overrides.EGG_TIER_OVERRIDE ?? this.rollEggTier());
+      this._tier = eggOptions?.tier ?? Overrides.EGG_TIER_OVERRIDE ?? this.rollEggTier();
       // If egg was pulled, check if egg pity needs to override the egg tier
       if (eggOptions?.pulled) {
         // Needs this._tier and this._sourceType to work
         this.checkForPityTierOverrides();
       }
 
-      this._id = eggOptions?.id ?? Utils.randInt(EGG_SEED, EGG_SEED * this._tier);
+      this._id = eggOptions?.id ?? randInt(EGG_SEED, EGG_SEED * this._tier);
 
       this._sourceType = eggOptions?.sourceType ?? undefined;
       this._hatchWaves = eggOptions?.hatchWaves ?? this.getEggTierDefaultHatchWaves();
@@ -156,7 +179,7 @@ export class Egg {
 
       // First roll shiny and variant so we can filter if species with an variant exist
       this._isShiny = eggOptions?.isShiny ?? (Overrides.EGG_SHINY_OVERRIDE || this.rollShiny());
-      this._variantTier = eggOptions?.variantTier ?? (Overrides.EGG_VARIANT_OVERRIDE ?? this.rollVariant());
+      this._variantTier = eggOptions?.variantTier ?? Overrides.EGG_VARIANT_OVERRIDE ?? this.rollVariant();
       this._species = eggOptions?.species ?? this.rollSpecies()!; // TODO: Is this bang correct?
 
       this._overrideHiddenAbility = eggOptions?.overrideHiddenAbility ?? false;
@@ -180,10 +203,14 @@ export class Egg {
       }
     };
 
-    const seedOverride = Utils.randomString(24);
-    globalScene.executeWithSeedOffset(() => {
-      generateEggProperties(eggOptions);
-    }, 0, seedOverride);
+    const seedOverride = randomString(24);
+    globalScene.executeWithSeedOffset(
+      () => {
+        generateEggProperties(eggOptions);
+      },
+      0,
+      seedOverride,
+    );
 
     this._eggDescriptor = eggOptions?.eggDescriptor;
   }
@@ -193,8 +220,11 @@ export class Egg {
   ////
 
   public isManaphyEgg(): boolean {
-    return (this._species === Species.PHIONE || this._species === Species.MANAPHY) ||
-       this._tier === EggTier.COMMON && !(this._id % 204) && !this._species;
+    return (
+      this._species === Species.PHIONE ||
+      this._species === Species.MANAPHY ||
+      (this._tier === EggTier.COMMON && !(this._id % 204) && !this._species)
+    );
   }
 
   public getKey(): string {
@@ -218,14 +248,15 @@ export class Egg {
       let pokemonSpecies = getPokemonSpecies(this._species);
       // Special condition to have Phione eggs also have a chance of generating Manaphy
       if (this._species === Species.PHIONE && this._sourceType === EggSourceType.SAME_SPECIES_EGG) {
-        pokemonSpecies = getPokemonSpecies(Utils.randSeedInt(MANAPHY_EGG_MANAPHY_RATE) ? Species.PHIONE : Species.MANAPHY);
+        pokemonSpecies = getPokemonSpecies(randSeedInt(MANAPHY_EGG_MANAPHY_RATE) ? Species.PHIONE : Species.MANAPHY);
       }
 
       // Sets the hidden ability if a hidden ability exists and
       // the override is set or the egg hits the chance
       let abilityIndex: number | undefined = undefined;
-      const sameSpeciesEggHACheck = (this._sourceType === EggSourceType.SAME_SPECIES_EGG && !Utils.randSeedInt(SAME_SPECIES_EGG_HA_RATE));
-      const gachaEggHACheck = (!(this._sourceType === EggSourceType.SAME_SPECIES_EGG) && !Utils.randSeedInt(GACHA_EGG_HA_RATE));
+      const sameSpeciesEggHACheck =
+        this._sourceType === EggSourceType.SAME_SPECIES_EGG && !randSeedInt(SAME_SPECIES_EGG_HA_RATE);
+      const gachaEggHACheck = !(this._sourceType === EggSourceType.SAME_SPECIES_EGG) && !randSeedInt(GACHA_EGG_HA_RATE);
       if (pokemonSpecies.abilityHidden && (this._overrideHiddenAbility || sameSpeciesEggHACheck || gachaEggHACheck)) {
         abilityIndex = 2;
       }
@@ -235,17 +266,21 @@ export class Egg {
       ret.shiny = this._isShiny;
       ret.variant = this._variantTier;
 
-      const secondaryIvs = Utils.getIvsFromId(Utils.randSeedInt(4294967295));
+      const secondaryIvs = getIvsFromId(randSeedInt(4294967295));
 
       for (let s = 0; s < ret.ivs.length; s++) {
         ret.ivs[s] = Math.max(ret.ivs[s], secondaryIvs[s]);
       }
     };
 
-    ret = ret!;  // Tell TS compiler it's defined now
-    globalScene.executeWithSeedOffset(() => {
-      generatePlayerPokemonHelper();
-    }, this._id, EGG_SEED.toString());
+    ret = ret!; // Tell TS compiler it's defined now
+    globalScene.executeWithSeedOffset(
+      () => {
+        generatePlayerPokemonHelper();
+      },
+      this._id,
+      EGG_SEED.toString(),
+    );
 
     return ret;
   }
@@ -287,9 +322,17 @@ export class Egg {
   public getEggTypeDescriptor(): string {
     switch (this.sourceType) {
       case EggSourceType.SAME_SPECIES_EGG:
-        return this._eggDescriptor ?? i18next.t("egg:sameSpeciesEgg", { species: getPokemonSpecies(this._species).getName() });
+        return (
+          this._eggDescriptor ??
+          i18next.t("egg:sameSpeciesEgg", {
+            species: getPokemonSpecies(this._species).getName(),
+          })
+        );
       case EggSourceType.GACHA_LEGENDARY:
-        return this._eggDescriptor ?? `${i18next.t("egg:gachaTypeLegendary")} (${getPokemonSpecies(getLegendaryGachaSpeciesForTimestamp(this.timestamp)).getName()})`;
+        return (
+          this._eggDescriptor ??
+          `${i18next.t("egg:gachaTypeLegendary")} (${getPokemonSpecies(getLegendaryGachaSpeciesForTimestamp(this.timestamp)).getName()})`
+        );
       case EggSourceType.GACHA_SHINY:
         return this._eggDescriptor ?? i18next.t("egg:gachaTypeShiny");
       case EggSourceType.GACHA_MOVE:
@@ -324,7 +367,7 @@ export class Egg {
     }
 
     const tierMultiplier = this.isManaphyEgg() ? 2 : Math.pow(2, 3 - this.tier);
-    return Utils.randSeedInt(baseChance * tierMultiplier) ? Utils.randSeedInt(3) : 3;
+    return randSeedInt(baseChance * tierMultiplier) ? randSeedInt(3) : 3;
   }
 
   private getEggTierDefaultHatchWaves(eggTier?: EggTier): number {
@@ -344,9 +387,16 @@ export class Egg {
   }
 
   private rollEggTier(): EggTier {
-    const tierValueOffset = this._sourceType === EggSourceType.GACHA_LEGENDARY ? GACHA_LEGENDARY_UP_THRESHOLD_OFFSET : 0;
-    const tierValue = Utils.randInt(256);
-    return tierValue >= GACHA_DEFAULT_COMMON_EGG_THRESHOLD + tierValueOffset ? EggTier.COMMON : tierValue >= GACHA_DEFAULT_RARE_EGG_THRESHOLD + tierValueOffset ? EggTier.RARE : tierValue >= GACHA_DEFAULT_EPIC_EGG_THRESHOLD + tierValueOffset ? EggTier.EPIC : EggTier.LEGENDARY;
+    const tierValueOffset =
+      this._sourceType === EggSourceType.GACHA_LEGENDARY ? GACHA_LEGENDARY_UP_THRESHOLD_OFFSET : 0;
+    const tierValue = randInt(256);
+    return tierValue >= GACHA_DEFAULT_COMMON_EGG_THRESHOLD + tierValueOffset
+      ? EggTier.COMMON
+      : tierValue >= GACHA_DEFAULT_RARE_EGG_THRESHOLD + tierValueOffset
+        ? EggTier.RARE
+        : tierValue >= GACHA_DEFAULT_EPIC_EGG_THRESHOLD + tierValueOffset
+          ? EggTier.EPIC
+          : EggTier.LEGENDARY;
   }
 
   private rollSpecies(): Species | null {
@@ -364,11 +414,11 @@ export class Egg {
        * when Utils.randSeedInt(8) = 1, and by making the generatePlayerPokemon() species
        * check pass when Utils.randSeedInt(8) = 0, we can tell them apart during tests.
        */
-      const rand = (Utils.randSeedInt(MANAPHY_EGG_MANAPHY_RATE) !== 1);
+      const rand = randSeedInt(MANAPHY_EGG_MANAPHY_RATE) !== 1;
       return rand ? Species.PHIONE : Species.MANAPHY;
-    } else if (this.tier === EggTier.LEGENDARY
-      && this._sourceType === EggSourceType.GACHA_LEGENDARY) {
-      if (!Utils.randSeedInt(2)) {
+    }
+    if (this.tier === EggTier.LEGENDARY && this._sourceType === EggSourceType.GACHA_LEGENDARY) {
+      if (!randSeedInt(2)) {
         return getLegendaryGachaSpeciesForTimestamp(this.timestamp);
       }
     }
@@ -395,17 +445,25 @@ export class Egg {
         break;
     }
 
-    const ignoredSpecies = [ Species.PHIONE, Species.MANAPHY, Species.ETERNATUS ];
+    const ignoredSpecies = [Species.PHIONE, Species.MANAPHY, Species.ETERNATUS];
 
     let speciesPool = Object.keys(speciesEggTiers)
       .filter(s => speciesEggTiers[s] === this.tier)
-      .map(s => parseInt(s) as Species)
-      .filter(s => !pokemonPrevolutions.hasOwnProperty(s) && getPokemonSpecies(s).isObtainable() && ignoredSpecies.indexOf(s) === -1);
+      .map(s => Number.parseInt(s) as Species)
+      .filter(
+        s =>
+          !pokemonPrevolutions.hasOwnProperty(s) &&
+          getPokemonSpecies(s).isObtainable() &&
+          ignoredSpecies.indexOf(s) === -1,
+      );
 
     // If this is the 10th egg without unlocking something new, attempt to force it.
     if (globalScene.gameData.unlockPity[this.tier] >= 9) {
-      const lockedPool = speciesPool.filter(s => !globalScene.gameData.dexData[s].caughtAttr && !globalScene.gameData.eggs.some(e => e.species === s));
-      if (lockedPool.length) { // Skip this if everything is unlocked
+      const lockedPool = speciesPool.filter(
+        s => !globalScene.gameData.dexData[s].caughtAttr && !globalScene.gameData.eggs.some(e => e.species === s),
+      );
+      if (lockedPool.length) {
+        // Skip this if everything is unlocked
         speciesPool = lockedPool;
       }
     }
@@ -427,18 +485,20 @@ export class Egg {
      * and being the same each time
      */
     let totalWeight = 0;
-    const speciesWeights : number[] = [];
+    const speciesWeights: number[] = [];
     for (const speciesId of speciesPool) {
       // Accounts for species that have starter costs outside of the normal range for their EggTier
       const speciesCostClamped = Phaser.Math.Clamp(speciesStarterCosts[speciesId], minStarterValue, maxStarterValue);
-      const weight = Math.floor((((maxStarterValue - speciesCostClamped) / ((maxStarterValue - minStarterValue) + 1)) * 1.5 + 1) * 100);
+      const weight = Math.floor(
+        (((maxStarterValue - speciesCostClamped) / (maxStarterValue - minStarterValue + 1)) * 1.5 + 1) * 100,
+      );
       speciesWeights.push(totalWeight + weight);
       totalWeight += weight;
     }
 
     let species: Species;
 
-    const rand = Utils.randSeedInt(totalWeight);
+    const rand = randSeedInt(totalWeight);
     for (let s = 0; s < speciesWeights.length; s++) {
       if (rand < speciesWeights[s]) {
         species = speciesPool[s];
@@ -447,7 +507,10 @@ export class Egg {
     }
     species = species!; // tell TS compiled it's defined now!
 
-    if (globalScene.gameData.dexData[species].caughtAttr || globalScene.gameData.eggs.some(e => e.species === species)) {
+    if (
+      globalScene.gameData.dexData[species].caughtAttr ||
+      globalScene.gameData.eggs.some(e => e.species === species)
+    ) {
       globalScene.gameData.unlockPity[this.tier] = Math.min(globalScene.gameData.unlockPity[this.tier] + 1, 10);
     } else {
       globalScene.gameData.unlockPity[this.tier] = 0;
@@ -457,9 +520,9 @@ export class Egg {
   }
 
   /**
-  * Rolls whether the egg is shiny or not.
-  * @returns `true` if the egg is shiny
-  **/
+   * Rolls whether the egg is shiny or not.
+   * @returns `true` if the egg is shiny
+   **/
   private rollShiny(): boolean {
     let shinyChance = GACHA_DEFAULT_SHINY_RATE;
     switch (this._sourceType) {
@@ -473,7 +536,7 @@ export class Egg {
         break;
     }
 
-    return !Utils.randSeedInt(shinyChance);
+    return !randSeedInt(shinyChance);
   }
 
   // Uses the same logic as pokemon.generateVariant(). I would like to only have this logic in one
@@ -484,23 +547,27 @@ export class Egg {
       return VariantTier.STANDARD;
     }
 
-    const rand = Utils.randSeedInt(10);
+    const rand = randSeedInt(10);
     if (rand >= SHINY_VARIANT_CHANCE) {
       return VariantTier.STANDARD; // 6/10
-    } else if (rand >= SHINY_EPIC_CHANCE) {
-      return VariantTier.RARE;   // 3/10
-    } else {
-      return VariantTier.EPIC;   // 1/10
     }
+    if (rand >= SHINY_EPIC_CHANCE) {
+      return VariantTier.RARE; // 3/10
+    }
+    return VariantTier.EPIC; // 1/10
   }
 
   private checkForPityTierOverrides(): void {
-    const tierValueOffset = this._sourceType === EggSourceType.GACHA_LEGENDARY ? GACHA_LEGENDARY_UP_THRESHOLD_OFFSET : 0;
+    const tierValueOffset =
+      this._sourceType === EggSourceType.GACHA_LEGENDARY ? GACHA_LEGENDARY_UP_THRESHOLD_OFFSET : 0;
     globalScene.gameData.eggPity[EggTier.RARE] += 1;
     globalScene.gameData.eggPity[EggTier.EPIC] += 1;
     globalScene.gameData.eggPity[EggTier.LEGENDARY] += 1 + tierValueOffset;
     // These numbers are roughly the 80% mark. That is, 80% of the time you'll get an egg before this gets triggered.
-    if (globalScene.gameData.eggPity[EggTier.LEGENDARY] >= EGG_PITY_LEGENDARY_THRESHOLD && this._tier === EggTier.COMMON) {
+    if (
+      globalScene.gameData.eggPity[EggTier.LEGENDARY] >= EGG_PITY_LEGENDARY_THRESHOLD &&
+      this._tier === EggTier.COMMON
+    ) {
       this._tier = EggTier.LEGENDARY;
     } else if (globalScene.gameData.eggPity[EggTier.EPIC] >= EGG_PITY_EPIC_THRESHOLD && this._tier === EggTier.COMMON) {
       this._tier = EggTier.EPIC;
@@ -531,7 +598,7 @@ export class Egg {
   }
 
   private getEggTier(): EggTier {
-    return speciesEggTiers[this.species];
+    return speciesEggTiers[this.species] ?? EggTier.COMMON;
   }
 
   ////
@@ -539,10 +606,10 @@ export class Egg {
   ////
 }
 
-export function getValidLegendaryGachaSpecies() : Species[] {
+export function getValidLegendaryGachaSpecies(): Species[] {
   return Object.entries(speciesEggTiers)
     .filter(s => s[1] === EggTier.LEGENDARY)
-    .map(s => parseInt(s[0]))
+    .map(s => Number.parseInt(s[0]))
     .filter(s => getPokemonSpecies(s).isObtainable() && s !== Species.ETERNATUS);
 }
 
@@ -557,9 +624,13 @@ export function getLegendaryGachaSpeciesForTimestamp(timestamp: number): Species
   const offset = Math.floor(Math.floor(dayTimestamp / 86400000) / legendarySpecies.length); // Cycle number
   const index = Math.floor(dayTimestamp / 86400000) % legendarySpecies.length; // Index within cycle
 
-  globalScene.executeWithSeedOffset(() => {
-    ret = Phaser.Math.RND.shuffle(legendarySpecies)[index];
-  }, offset, EGG_SEED.toString());
+  globalScene.executeWithSeedOffset(
+    () => {
+      ret = Phaser.Math.RND.shuffle(legendarySpecies)[index];
+    },
+    offset,
+    EGG_SEED.toString(),
+  );
   ret = ret!; // tell TS compiler it's
 
   return ret;
@@ -570,6 +641,6 @@ export function getLegendaryGachaSpeciesForTimestamp(timestamp: number): Species
  * @param pokemonSpecies - Species for wich we will check the egg tier it belongs to
  * @returns The egg tier of a given pokemon species
  */
-export function getEggTierForSpecies(pokemonSpecies :PokemonSpecies): EggTier {
+export function getEggTierForSpecies(pokemonSpecies: PokemonSpecies): EggTier {
   return speciesEggTiers[pokemonSpecies.getRootSpeciesId()];
 }
diff --git a/src/data/exp.ts b/src/data/exp.ts
index 0f5d3e62cef..9f8ccce6d88 100644
--- a/src/data/exp.ts
+++ b/src/data/exp.ts
@@ -4,16 +4,64 @@ export enum GrowthRate {
   MEDIUM_FAST,
   MEDIUM_SLOW,
   SLOW,
-  FLUCTUATING
+  FLUCTUATING,
 }
 
 const expLevels = [
-  [ 0, 15, 52, 122, 237, 406, 637, 942, 1326, 1800, 2369, 3041, 3822, 4719, 5737, 6881, 8155, 9564, 11111, 12800, 14632, 16610, 18737, 21012, 23437, 26012, 28737, 31610, 34632, 37800, 41111, 44564, 48155, 51881, 55737, 59719, 63822, 68041, 72369, 76800, 81326, 85942, 90637, 95406, 100237, 105122, 110052, 115015, 120001, 125000, 131324, 137795, 144410, 151165, 158056, 165079, 172229, 179503, 186894, 194400, 202013, 209728, 217540, 225443, 233431, 241496, 249633, 257834, 267406, 276458, 286328, 296358, 305767, 316074, 326531, 336255, 346965, 357812, 367807, 378880, 390077, 400293, 411686, 423190, 433572, 445239, 457001, 467489, 479378, 491346, 501878, 513934, 526049, 536557, 548720, 560922, 571333, 583539, 591882, 600000 ],
-  [ 0, 6, 21, 51, 100, 172, 274, 409, 583, 800, 1064, 1382, 1757, 2195, 2700, 3276, 3930, 4665, 5487, 6400, 7408, 8518, 9733, 11059, 12500, 14060, 15746, 17561, 19511, 21600, 23832, 26214, 28749, 31443, 34300, 37324, 40522, 43897, 47455, 51200, 55136, 59270, 63605, 68147, 72900, 77868, 83058, 88473, 94119, 100000, 106120, 112486, 119101, 125971, 133100, 140492, 148154, 156089, 164303, 172800, 181584, 190662, 200037, 209715, 219700, 229996, 240610, 251545, 262807, 274400, 286328, 298598, 311213, 324179, 337500, 351180, 365226, 379641, 394431, 409600, 425152, 441094, 457429, 474163, 491300, 508844, 526802, 545177, 563975, 583200, 602856, 622950, 643485, 664467, 685900, 707788, 730138, 752953, 776239, 800000 ],
-  [ 0, 8, 27, 64, 125, 216, 343, 512, 729, 1000, 1331, 1728, 2197, 2744, 3375, 4096, 4913, 5832, 6859, 8000, 9261, 10648, 12167, 13824, 15625, 17576, 19683, 21952, 24389, 27000, 29791, 32768, 35937, 39304, 42875, 46656, 50653, 54872, 59319, 64000, 68921, 74088, 79507, 85184, 91125, 97336, 103823, 110592, 117649, 125000, 132651, 140608, 148877, 157464, 166375, 175616, 185193, 195112, 205379, 216000, 226981, 238328, 250047, 262144, 274625, 287496, 300763, 314432, 328509, 343000, 357911, 373248, 389017, 405224, 421875, 438976, 456533, 474552, 493039, 512000, 531441, 551368, 571787, 592704, 614125, 636056, 658503, 681472, 704969, 729000, 753571, 778688, 804357, 830584, 857375, 884736, 912673, 941192, 970299, 1000000 ],
-  [ 0, 9, 57, 96, 135, 179, 236, 314, 419, 560, 742, 973, 1261, 1612, 2035, 2535, 3120, 3798, 4575, 5460, 6458, 7577, 8825, 10208, 11735, 13411, 15244, 17242, 19411, 21760, 24294, 27021, 29949, 33084, 36435, 40007, 43808, 47846, 52127, 56660, 61450, 66505, 71833, 77440, 83335, 89523, 96012, 102810, 109923, 117360, 125126, 133229, 141677, 150476, 159635, 169159, 179056, 189334, 199999, 211060, 222522, 234393, 246681, 259392, 272535, 286115, 300140, 314618, 329555, 344960, 360838, 377197, 394045, 411388, 429235, 447591, 466464, 485862, 505791, 526260, 547274, 568841, 590969, 613664, 636935, 660787, 685228, 710266, 735907, 762160, 789030, 816525, 844653, 873420, 902835, 932903, 963632, 995030, 1027103, 1059860 ],
-  [ 0, 10, 33, 80, 156, 270, 428, 640, 911, 1250, 1663, 2160, 2746, 3430, 4218, 5120, 6141, 7290, 8573, 10000, 11576, 13310, 15208, 17280, 19531, 21970, 24603, 27440, 30486, 33750, 37238, 40960, 44921, 49130, 53593, 58320, 63316, 68590, 74148, 80000, 86151, 92610, 99383, 106480, 113906, 121670, 129778, 138240, 147061, 156250, 165813, 175760, 186096, 196830, 207968, 219520, 231491, 243890, 256723, 270000, 283726, 297910, 312558, 327680, 343281, 359370, 375953, 393040, 410636, 428750, 447388, 466560, 486271, 506530, 527343, 548720, 570666, 593190, 616298, 640000, 664301, 689210, 714733, 740880, 767656, 795070, 823128, 851840, 881211, 911250, 941963, 973360, 1005446, 1038230, 1071718, 1105920, 1140841, 1176490, 1212873, 1250000 ],
-  [ 0, 4, 13, 32, 65, 112, 178, 276, 393, 540, 745, 967, 1230, 1591, 1957, 2457, 3046, 3732, 4526, 5440, 6482, 7666, 9003, 10506, 12187, 14060, 16140, 18439, 20974, 23760, 26811, 30146, 33780, 37731, 42017, 46656, 50653, 55969, 60505, 66560, 71677, 78533, 84277, 91998, 98415, 107069, 114205, 123863, 131766, 142500, 151222, 163105, 172697, 185807, 196322, 210739, 222231, 238036, 250562, 267840, 281456, 300293, 315059, 335544, 351520, 373744, 390991, 415050, 433631, 459620, 479600, 507617, 529063, 559209, 582187, 614566, 639146, 673863, 700115, 737280, 765275, 804997, 834809, 877201, 908905, 954084, 987754, 1035837, 1071552, 1122660, 1160499, 1214753, 1254796, 1312322, 1354652, 1415577, 1460276, 1524731, 1571884, 1640000 ]
+  [
+    0, 15, 52, 122, 237, 406, 637, 942, 1326, 1800, 2369, 3041, 3822, 4719, 5737, 6881, 8155, 9564, 11111, 12800, 14632,
+    16610, 18737, 21012, 23437, 26012, 28737, 31610, 34632, 37800, 41111, 44564, 48155, 51881, 55737, 59719, 63822,
+    68041, 72369, 76800, 81326, 85942, 90637, 95406, 100237, 105122, 110052, 115015, 120001, 125000, 131324, 137795,
+    144410, 151165, 158056, 165079, 172229, 179503, 186894, 194400, 202013, 209728, 217540, 225443, 233431, 241496,
+    249633, 257834, 267406, 276458, 286328, 296358, 305767, 316074, 326531, 336255, 346965, 357812, 367807, 378880,
+    390077, 400293, 411686, 423190, 433572, 445239, 457001, 467489, 479378, 491346, 501878, 513934, 526049, 536557,
+    548720, 560922, 571333, 583539, 591882, 600000,
+  ],
+  [
+    0, 6, 21, 51, 100, 172, 274, 409, 583, 800, 1064, 1382, 1757, 2195, 2700, 3276, 3930, 4665, 5487, 6400, 7408, 8518,
+    9733, 11059, 12500, 14060, 15746, 17561, 19511, 21600, 23832, 26214, 28749, 31443, 34300, 37324, 40522, 43897,
+    47455, 51200, 55136, 59270, 63605, 68147, 72900, 77868, 83058, 88473, 94119, 100000, 106120, 112486, 119101, 125971,
+    133100, 140492, 148154, 156089, 164303, 172800, 181584, 190662, 200037, 209715, 219700, 229996, 240610, 251545,
+    262807, 274400, 286328, 298598, 311213, 324179, 337500, 351180, 365226, 379641, 394431, 409600, 425152, 441094,
+    457429, 474163, 491300, 508844, 526802, 545177, 563975, 583200, 602856, 622950, 643485, 664467, 685900, 707788,
+    730138, 752953, 776239, 800000,
+  ],
+  [
+    0, 8, 27, 64, 125, 216, 343, 512, 729, 1000, 1331, 1728, 2197, 2744, 3375, 4096, 4913, 5832, 6859, 8000, 9261,
+    10648, 12167, 13824, 15625, 17576, 19683, 21952, 24389, 27000, 29791, 32768, 35937, 39304, 42875, 46656, 50653,
+    54872, 59319, 64000, 68921, 74088, 79507, 85184, 91125, 97336, 103823, 110592, 117649, 125000, 132651, 140608,
+    148877, 157464, 166375, 175616, 185193, 195112, 205379, 216000, 226981, 238328, 250047, 262144, 274625, 287496,
+    300763, 314432, 328509, 343000, 357911, 373248, 389017, 405224, 421875, 438976, 456533, 474552, 493039, 512000,
+    531441, 551368, 571787, 592704, 614125, 636056, 658503, 681472, 704969, 729000, 753571, 778688, 804357, 830584,
+    857375, 884736, 912673, 941192, 970299, 1000000,
+  ],
+  [
+    0, 9, 57, 96, 135, 179, 236, 314, 419, 560, 742, 973, 1261, 1612, 2035, 2535, 3120, 3798, 4575, 5460, 6458, 7577,
+    8825, 10208, 11735, 13411, 15244, 17242, 19411, 21760, 24294, 27021, 29949, 33084, 36435, 40007, 43808, 47846,
+    52127, 56660, 61450, 66505, 71833, 77440, 83335, 89523, 96012, 102810, 109923, 117360, 125126, 133229, 141677,
+    150476, 159635, 169159, 179056, 189334, 199999, 211060, 222522, 234393, 246681, 259392, 272535, 286115, 300140,
+    314618, 329555, 344960, 360838, 377197, 394045, 411388, 429235, 447591, 466464, 485862, 505791, 526260, 547274,
+    568841, 590969, 613664, 636935, 660787, 685228, 710266, 735907, 762160, 789030, 816525, 844653, 873420, 902835,
+    932903, 963632, 995030, 1027103, 1059860,
+  ],
+  [
+    0, 10, 33, 80, 156, 270, 428, 640, 911, 1250, 1663, 2160, 2746, 3430, 4218, 5120, 6141, 7290, 8573, 10000, 11576,
+    13310, 15208, 17280, 19531, 21970, 24603, 27440, 30486, 33750, 37238, 40960, 44921, 49130, 53593, 58320, 63316,
+    68590, 74148, 80000, 86151, 92610, 99383, 106480, 113906, 121670, 129778, 138240, 147061, 156250, 165813, 175760,
+    186096, 196830, 207968, 219520, 231491, 243890, 256723, 270000, 283726, 297910, 312558, 327680, 343281, 359370,
+    375953, 393040, 410636, 428750, 447388, 466560, 486271, 506530, 527343, 548720, 570666, 593190, 616298, 640000,
+    664301, 689210, 714733, 740880, 767656, 795070, 823128, 851840, 881211, 911250, 941963, 973360, 1005446, 1038230,
+    1071718, 1105920, 1140841, 1176490, 1212873, 1250000,
+  ],
+  [
+    0, 4, 13, 32, 65, 112, 178, 276, 393, 540, 745, 967, 1230, 1591, 1957, 2457, 3046, 3732, 4526, 5440, 6482, 7666,
+    9003, 10506, 12187, 14060, 16140, 18439, 20974, 23760, 26811, 30146, 33780, 37731, 42017, 46656, 50653, 55969,
+    60505, 66560, 71677, 78533, 84277, 91998, 98415, 107069, 114205, 123863, 131766, 142500, 151222, 163105, 172697,
+    185807, 196322, 210739, 222231, 238036, 250562, 267840, 281456, 300293, 315059, 335544, 351520, 373744, 390991,
+    415050, 433631, 459620, 479600, 507617, 529063, 559209, 582187, 614566, 639146, 673863, 700115, 737280, 765275,
+    804997, 834809, 877201, 908905, 954084, 987754, 1035837, 1071552, 1122660, 1160499, 1214753, 1254796, 1312322,
+    1354652, 1415577, 1460276, 1524731, 1571884, 1640000,
+  ],
 ];
 
 export function getLevelTotalExp(level: number, growthRate: GrowthRate): number {
@@ -29,22 +77,22 @@ export function getLevelTotalExp(level: number, growthRate: GrowthRate): number
 
   switch (growthRate) {
     case GrowthRate.ERRATIC:
-      ret = (Math.pow(level, 4) + (Math.pow(level, 3) * 2000)) / 3500;
+      ret = (Math.pow(level, 4) + Math.pow(level, 3) * 2000) / 3500;
       break;
     case GrowthRate.FAST:
-      ret = Math.pow(level, 3) * 4 / 5;
+      ret = (Math.pow(level, 3) * 4) / 5;
       break;
     case GrowthRate.MEDIUM_FAST:
       ret = Math.pow(level, 3);
       break;
     case GrowthRate.MEDIUM_SLOW:
-      ret = (Math.pow(level, 3) * 6 / 5) - (15 * Math.pow(level, 2)) + (100 * level) - 140;
+      ret = (Math.pow(level, 3) * 6) / 5 - 15 * Math.pow(level, 2) + 100 * level - 140;
       break;
     case GrowthRate.SLOW:
-      ret = Math.pow(level, 3) * 5 / 4;
+      ret = (Math.pow(level, 3) * 5) / 4;
       break;
     case GrowthRate.FLUCTUATING:
-      ret = (Math.pow(level, 3) * ((level / 2) + 8)) * 4 / (100 + level);
+      ret = (Math.pow(level, 3) * (level / 2 + 8) * 4) / (100 + level);
       break;
   }
 
diff --git a/src/data/gender.ts b/src/data/gender.ts
index dae7723dd85..5a835c2e786 100644
--- a/src/data/gender.ts
+++ b/src/data/gender.ts
@@ -1,7 +1,7 @@
 export enum Gender {
-    GENDERLESS = -1,
-    MALE,
-    FEMALE
+  GENDERLESS = -1,
+  MALE,
+  FEMALE,
 }
 
 export function getGenderSymbol(gender: Gender) {
diff --git a/src/data/moves/invalid-moves.ts b/src/data/moves/invalid-moves.ts
new file mode 100644
index 00000000000..025c0383f43
--- /dev/null
+++ b/src/data/moves/invalid-moves.ts
@@ -0,0 +1,257 @@
+import { Moves } from "#enums/moves";
+
+/** Set of moves that cannot be called by {@linkcode Moves.METRONOME Metronome} */
+export const invalidMetronomeMoves: ReadonlySet<Moves> = new Set([
+  Moves.AFTER_YOU,
+  Moves.ASSIST,
+  Moves.BANEFUL_BUNKER,
+  Moves.BEAK_BLAST,
+  Moves.BELCH,
+  Moves.BESTOW,
+  Moves.COMEUPPANCE,
+  Moves.COPYCAT,
+  Moves.COUNTER,
+  Moves.CRAFTY_SHIELD,
+  Moves.DESTINY_BOND,
+  Moves.DETECT,
+  Moves.ENDURE,
+  Moves.FEINT,
+  Moves.FOCUS_PUNCH,
+  Moves.FOLLOW_ME,
+  Moves.HELPING_HAND,
+  Moves.INSTRUCT,
+  Moves.KINGS_SHIELD,
+  Moves.MAT_BLOCK,
+  Moves.ME_FIRST,
+  Moves.METRONOME,
+  Moves.MIMIC,
+  Moves.MIRROR_COAT,
+  Moves.MIRROR_MOVE,
+  Moves.OBSTRUCT,
+  Moves.PROTECT,
+  Moves.QUASH,
+  Moves.QUICK_GUARD,
+  Moves.RAGE_POWDER,
+  Moves.REVIVAL_BLESSING,
+  Moves.SHELL_TRAP,
+  Moves.SILK_TRAP,
+  Moves.SKETCH,
+  Moves.SLEEP_TALK,
+  Moves.SNATCH,
+  Moves.SNORE,
+  Moves.SPIKY_SHIELD,
+  Moves.SPOTLIGHT,
+  Moves.STRUGGLE,
+  Moves.TRANSFORM,
+  Moves.WIDE_GUARD,
+]);
+
+/** Set of moves that cannot be called by {@linkcode Moves.ASSIST Assist} */
+export const invalidAssistMoves: ReadonlySet<Moves> = new Set([
+  Moves.ASSIST,
+  Moves.BANEFUL_BUNKER,
+  Moves.BEAK_BLAST,
+  Moves.BELCH,
+  Moves.BESTOW,
+  Moves.BOUNCE,
+  Moves.CELEBRATE,
+  Moves.CHATTER,
+  Moves.CIRCLE_THROW,
+  Moves.COPYCAT,
+  Moves.COUNTER,
+  Moves.DESTINY_BOND,
+  Moves.DETECT,
+  Moves.DIG,
+  Moves.DIVE,
+  Moves.DRAGON_TAIL,
+  Moves.ENDURE,
+  Moves.FEINT,
+  Moves.FLY,
+  Moves.FOCUS_PUNCH,
+  Moves.FOLLOW_ME,
+  Moves.HELPING_HAND,
+  Moves.HOLD_HANDS,
+  Moves.KINGS_SHIELD,
+  Moves.MAT_BLOCK,
+  Moves.ME_FIRST,
+  Moves.METRONOME,
+  Moves.MIMIC,
+  Moves.MIRROR_COAT,
+  Moves.MIRROR_MOVE,
+  Moves.NATURE_POWER,
+  Moves.PHANTOM_FORCE,
+  Moves.PROTECT,
+  Moves.RAGE_POWDER,
+  Moves.ROAR,
+  Moves.SHADOW_FORCE,
+  Moves.SHELL_TRAP,
+  Moves.SKETCH,
+  Moves.SKY_DROP,
+  Moves.SLEEP_TALK,
+  Moves.SNATCH,
+  Moves.SPIKY_SHIELD,
+  Moves.SPOTLIGHT,
+  Moves.STRUGGLE,
+  Moves.SWITCHEROO,
+  Moves.TRANSFORM,
+  Moves.TRICK,
+  Moves.WHIRLWIND,
+]);
+
+/** Set of moves that cannot be called by {@linkcode Moves.SLEEP_TALK Sleep Talk} */
+export const invalidSleepTalkMoves: ReadonlySet<Moves> = new Set([
+  Moves.ASSIST,
+  Moves.BELCH,
+  Moves.BEAK_BLAST,
+  Moves.BIDE,
+  Moves.BOUNCE,
+  Moves.COPYCAT,
+  Moves.DIG,
+  Moves.DIVE,
+  Moves.FREEZE_SHOCK,
+  Moves.FLY,
+  Moves.FOCUS_PUNCH,
+  Moves.GEOMANCY,
+  Moves.ICE_BURN,
+  Moves.ME_FIRST,
+  Moves.METRONOME,
+  Moves.MIRROR_MOVE,
+  Moves.MIMIC,
+  Moves.PHANTOM_FORCE,
+  Moves.RAZOR_WIND,
+  Moves.SHADOW_FORCE,
+  Moves.SHELL_TRAP,
+  Moves.SKETCH,
+  Moves.SKULL_BASH,
+  Moves.SKY_ATTACK,
+  Moves.SKY_DROP,
+  Moves.SLEEP_TALK,
+  Moves.SOLAR_BLADE,
+  Moves.SOLAR_BEAM,
+  Moves.STRUGGLE,
+  Moves.UPROAR,
+]);
+
+/** Set of moves that cannot be copied by {@linkcode Moves.COPYCAT Copycat} */
+export const invalidCopycatMoves: ReadonlySet<Moves> = new Set([
+  Moves.ASSIST,
+  Moves.BANEFUL_BUNKER,
+  Moves.BEAK_BLAST,
+  Moves.BESTOW,
+  Moves.CELEBRATE,
+  Moves.CHATTER,
+  Moves.CIRCLE_THROW,
+  Moves.COPYCAT,
+  Moves.COUNTER,
+  Moves.DESTINY_BOND,
+  Moves.DETECT,
+  Moves.DRAGON_TAIL,
+  Moves.ENDURE,
+  Moves.FEINT,
+  Moves.FOCUS_PUNCH,
+  Moves.FOLLOW_ME,
+  Moves.HELPING_HAND,
+  Moves.HOLD_HANDS,
+  Moves.KINGS_SHIELD,
+  Moves.MAT_BLOCK,
+  Moves.ME_FIRST,
+  Moves.METRONOME,
+  Moves.MIMIC,
+  Moves.MIRROR_COAT,
+  Moves.MIRROR_MOVE,
+  Moves.PROTECT,
+  Moves.RAGE_POWDER,
+  Moves.ROAR,
+  Moves.SHELL_TRAP,
+  Moves.SKETCH,
+  Moves.SLEEP_TALK,
+  Moves.SNATCH,
+  Moves.SPIKY_SHIELD,
+  Moves.SPOTLIGHT,
+  Moves.STRUGGLE,
+  Moves.SWITCHEROO,
+  Moves.TRANSFORM,
+  Moves.TRICK,
+  Moves.WHIRLWIND,
+]);
+
+export const invalidMirrorMoveMoves: ReadonlySet<Moves> = new Set([
+  Moves.ACUPRESSURE,
+  Moves.AFTER_YOU,
+  Moves.AROMATIC_MIST,
+  Moves.BEAK_BLAST,
+  Moves.BELCH,
+  Moves.CHILLY_RECEPTION,
+  Moves.COACHING,
+  Moves.CONVERSION_2,
+  Moves.COUNTER,
+  Moves.CRAFTY_SHIELD,
+  Moves.CURSE,
+  Moves.DECORATE,
+  Moves.DOODLE,
+  Moves.DOOM_DESIRE,
+  Moves.DRAGON_CHEER,
+  Moves.ELECTRIC_TERRAIN,
+  Moves.FINAL_GAMBIT,
+  Moves.FLORAL_HEALING,
+  Moves.FLOWER_SHIELD,
+  Moves.FOCUS_PUNCH,
+  Moves.FUTURE_SIGHT,
+  Moves.GEAR_UP,
+  Moves.GRASSY_TERRAIN,
+  Moves.GRAVITY,
+  Moves.GUARD_SPLIT,
+  Moves.HAIL,
+  Moves.HAZE,
+  Moves.HEAL_PULSE,
+  Moves.HELPING_HAND,
+  Moves.HOLD_HANDS,
+  Moves.INSTRUCT,
+  Moves.ION_DELUGE,
+  Moves.MAGNETIC_FLUX,
+  Moves.MAT_BLOCK,
+  Moves.ME_FIRST,
+  Moves.MIMIC,
+  Moves.MIRROR_COAT,
+  Moves.MIRROR_MOVE,
+  Moves.MIST,
+  Moves.MISTY_TERRAIN,
+  Moves.MUD_SPORT,
+  Moves.PERISH_SONG,
+  Moves.POWER_SPLIT,
+  Moves.PSYCH_UP,
+  Moves.PSYCHIC_TERRAIN,
+  Moves.PURIFY,
+  Moves.QUICK_GUARD,
+  Moves.RAIN_DANCE,
+  Moves.REFLECT_TYPE,
+  Moves.ROLE_PLAY,
+  Moves.ROTOTILLER,
+  Moves.SANDSTORM,
+  Moves.SHELL_TRAP,
+  Moves.SKETCH,
+  Moves.SNOWSCAPE,
+  Moves.SPIT_UP,
+  Moves.SPOTLIGHT,
+  Moves.STRUGGLE,
+  Moves.SUNNY_DAY,
+  Moves.TEATIME,
+  Moves.TRANSFORM,
+  Moves.WATER_SPORT,
+  Moves.WIDE_GUARD,
+]);
+
+/** Set of moves that can never have their type overridden by an ability like Pixilate or Normalize
+ *
+ * Excludes tera blast and tera starstorm, as these are only conditionally forbidden
+ */
+export const noAbilityTypeOverrideMoves: ReadonlySet<Moves> = new Set([
+  Moves.WEATHER_BALL,
+  Moves.JUDGMENT,
+  Moves.REVELATION_DANCE,
+  Moves.MULTI_ATTACK,
+  Moves.TERRAIN_PULSE,
+  Moves.NATURAL_GIFT,
+  Moves.TECHNO_BLAST,
+  Moves.HIDDEN_POWER,
+]);
diff --git a/src/data/moves/move-utils.ts b/src/data/moves/move-utils.ts
new file mode 100644
index 00000000000..3323d6f4a0c
--- /dev/null
+++ b/src/data/moves/move-utils.ts
@@ -0,0 +1,20 @@
+import { MoveTarget } from "#enums/MoveTarget";
+import type Move from "./move";
+
+/**
+ * Return whether the move targets the field
+ *
+ * Examples include
+ * - Hazard moves like spikes
+ * - Weather moves like rain dance
+ * - User side moves like reflect and safeguard
+ */
+export function isFieldTargeted(move: Move): boolean {
+  switch (move.moveTarget) {
+    case MoveTarget.BOTH_SIDES:
+    case MoveTarget.USER_SIDE:
+    case MoveTarget.ENEMY_SIDE:
+      return true;
+  }
+  return false;
+}
diff --git a/src/data/move.ts b/src/data/moves/move.ts
similarity index 65%
rename from src/data/move.ts
rename to src/data/moves/move.ts
index 4114c208dbf..f1484e3beac 100644
--- a/src/data/move.ts
+++ b/src/data/moves/move.ts
@@ -1,28 +1,89 @@
-import { ChargeAnim, initMoveAnim, loadMoveAnimAssets, MoveChargeAnim } from "./battle-anims";
-import { CommandedTag, EncoreTag, GulpMissileTag, HelpingHandTag, SemiInvulnerableTag, ShellTrapTag, StockpilingTag, SubstituteTag, TrappedTag, TypeBoostTag } from "./battler-tags";
-import { getPokemonNameWithAffix } from "../messages";
-import type { AttackMoveResult, TurnMove } from "../field/pokemon";
-import type Pokemon from "../field/pokemon";
-import { EnemyPokemon, HitResult, MoveResult, PlayerPokemon, PokemonMove } from "../field/pokemon";
-import { getNonVolatileStatusEffects, getStatusEffectHealText, isNonVolatileStatusEffect } from "./status-effect";
-import { getTypeDamageMultiplier } from "./type";
-import { Type } from "#enums/type";
-import type { Constructor } from "#app/utils";
-import { NumberHolder } from "#app/utils";
-import * as Utils from "../utils";
+import { ChargeAnim, MoveChargeAnim } from "../battle-anims";
+import {
+  CommandedTag,
+  EncoreTag,
+  GulpMissileTag,
+  HelpingHandTag,
+  SemiInvulnerableTag,
+  ShellTrapTag,
+  StockpilingTag,
+  SubstituteTag,
+  TrappedTag,
+  TypeBoostTag,
+} from "../battler-tags";
+import { getPokemonNameWithAffix } from "../../messages";
+import type { AttackMoveResult, TurnMove } from "../../field/pokemon";
+import type Pokemon from "../../field/pokemon";
+import {
+  EnemyPokemon,
+  FieldPosition,
+  HitResult,
+  MoveResult,
+  PlayerPokemon,
+  PokemonMove,
+} from "../../field/pokemon";
+import {
+  getNonVolatileStatusEffects,
+  getStatusEffectHealText,
+  isNonVolatileStatusEffect,
+} from "../status-effect";
+import { getTypeDamageMultiplier } from "../type";
+import { PokemonType } from "#enums/pokemon-type";
+import { BooleanHolder, NumberHolder, isNullOrUndefined, toDmgValue, randSeedItem, randSeedInt, getEnumValues, toReadableString } from "#app/utils/common";
+import { type Constructor, type nil} from "#app/utils/common";
 import { WeatherType } from "#enums/weather-type";
-import type { ArenaTrapTag } from "./arena-tag";
-import { ArenaTagSide, WeakenMoveTypeTag } from "./arena-tag";
-import { allAbilities, AllyMoveCategoryPowerBoostAbAttr, applyAbAttrs, applyPostAttackAbAttrs, applyPostItemLostAbAttrs, applyPreAttackAbAttrs, applyPreDefendAbAttrs, BlockItemTheftAbAttr, BlockNonDirectDamageAbAttr, BlockOneHitKOAbAttr, BlockRecoilDamageAttr, ChangeMovePriorityAbAttr, ConfusionOnStatusEffectAbAttr, FieldMoveTypePowerBoostAbAttr, FieldPreventExplosiveMovesAbAttr, ForceSwitchOutImmunityAbAttr, HealFromBerryUseAbAttr, IgnoreContactAbAttr, IgnoreMoveEffectsAbAttr, IgnoreProtectOnContactAbAttr, InfiltratorAbAttr, MaxMultiHitAbAttr, MoveAbilityBypassAbAttr, MoveEffectChanceMultiplierAbAttr, MoveTypeChangeAbAttr, PostDamageForceSwitchAbAttr, PostItemLostAbAttr, ReverseDrainAbAttr, UncopiableAbilityAbAttr, UnsuppressableAbilityAbAttr, UnswappableAbilityAbAttr, UserFieldMoveTypePowerBoostAbAttr, VariableMovePowerAbAttr, WonderSkinAbAttr } from "./ability";
-import { AttackTypeBoosterModifier, BerryModifier, PokemonHeldItemModifier, PokemonMoveAccuracyBoosterModifier, PokemonMultiHitModifier, PreserveBerryModifier } from "../modifier/modifier";
-import type { BattlerIndex } from "../battle";
-import { BattleType } from "../battle";
-import { TerrainType } from "./terrain";
+import type { ArenaTrapTag } from "../arena-tag";
+import { ArenaTagSide, WeakenMoveTypeTag } from "../arena-tag";
+import {
+  AllyMoveCategoryPowerBoostAbAttr,
+  applyAbAttrs,
+  applyPostAttackAbAttrs,
+  applyPostItemLostAbAttrs,
+  applyPreAttackAbAttrs,
+  applyPreDefendAbAttrs,
+  BlockItemTheftAbAttr,
+  BlockNonDirectDamageAbAttr,
+  BlockOneHitKOAbAttr,
+  BlockRecoilDamageAttr,
+  ChangeMovePriorityAbAttr,
+  ConfusionOnStatusEffectAbAttr,
+  FieldMoveTypePowerBoostAbAttr,
+  FieldPreventExplosiveMovesAbAttr,
+  ForceSwitchOutImmunityAbAttr,
+  HealFromBerryUseAbAttr,
+  IgnoreContactAbAttr,
+  IgnoreMoveEffectsAbAttr,
+  IgnoreProtectOnContactAbAttr,
+  InfiltratorAbAttr,
+  MaxMultiHitAbAttr,
+  MoveAbilityBypassAbAttr,
+  MoveEffectChanceMultiplierAbAttr,
+  MoveTypeChangeAbAttr,
+  PostDamageForceSwitchAbAttr,
+  PostItemLostAbAttr,
+  ReflectStatusMoveAbAttr,
+  ReverseDrainAbAttr,
+  UserFieldMoveTypePowerBoostAbAttr,
+  VariableMovePowerAbAttr,
+  WonderSkinAbAttr,
+} from "../abilities/ability";
+import { allAbilities } from "../data-lists";
+import {
+  AttackTypeBoosterModifier,
+  BerryModifier,
+  PokemonHeldItemModifier,
+  PokemonMoveAccuracyBoosterModifier,
+  PokemonMultiHitModifier,
+  PreserveBerryModifier,
+} from "../../modifier/modifier";
+import type { BattlerIndex } from "../../battle";
+import { BattleType } from "#enums/battle-type";
+import { TerrainType } from "../terrain";
 import { ModifierPoolType } from "#app/modifier/modifier-type";
-import { Command } from "../ui/command-ui-handler";
+import { Command } from "../../ui/command-ui-handler";
 import i18next from "i18next";
 import type { Localizable } from "#app/interfaces/locales";
-import { getBerryEffectFunc } from "./berry";
+import { getBerryEffectFunc } from "../berry";
 import { Abilities } from "#enums/abilities";
 import { ArenaTagType } from "#enums/arena-tag-type";
 import { BattlerTagType } from "#enums/battler-tag-type";
@@ -30,7 +91,13 @@ import { Biome } from "#enums/biome";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { MoveUsedEvent } from "#app/events/battle-scene";
-import { BATTLE_STATS, type BattleStat, EFFECTIVE_STATS, type EffectiveStat, getStatKey, Stat } from "#app/enums/stat";
+import {
+  BATTLE_STATS,
+  type BattleStat,
+  type EffectiveStat,
+  getStatKey,
+  Stat,
+} from "#app/enums/stat";
 import { BattleEndPhase } from "#app/phases/battle-end-phase";
 import { MoveEndPhase } from "#app/phases/move-end-phase";
 import { MovePhase } from "#app/phases/move-phase";
@@ -39,94 +106,24 @@ import { PokemonHealPhase } from "#app/phases/pokemon-heal-phase";
 import { StatStageChangePhase } from "#app/phases/stat-stage-change-phase";
 import { SwitchPhase } from "#app/phases/switch-phase";
 import { SwitchSummonPhase } from "#app/phases/switch-summon-phase";
-import { ShowAbilityPhase } from "#app/phases/show-ability-phase";
-import { SpeciesFormChangeRevertWeatherFormTrigger } from "./pokemon-forms";
+import { SpeciesFormChangeRevertWeatherFormTrigger } from "../pokemon-forms";
 import type { GameMode } from "#app/game-mode";
-import { applyChallenges, ChallengeType } from "./challenge";
+import { applyChallenges, ChallengeType } from "../challenge";
 import { SwitchType } from "#enums/switch-type";
 import { StatusEffect } from "#enums/status-effect";
 import { globalScene } from "#app/global-scene";
-
-export enum MoveCategory {
-  PHYSICAL,
-  SPECIAL,
-  STATUS
-}
-
-export enum MoveTarget {
-  /** {@link https://bulbapedia.bulbagarden.net/wiki/Category:Moves_that_target_the_user Moves that target the User} */
-  USER,
-  OTHER,
-  ALL_OTHERS,
-  NEAR_OTHER,
-  /** {@link https://bulbapedia.bulbagarden.net/wiki/Category:Moves_that_target_all_adjacent_Pok%C3%A9mon Moves that target all adjacent Pokemon} */
-  ALL_NEAR_OTHERS,
-  NEAR_ENEMY,
-  /** {@link https://bulbapedia.bulbagarden.net/wiki/Category:Moves_that_target_all_adjacent_foes Moves that target all adjacent foes} */
-  ALL_NEAR_ENEMIES,
-  RANDOM_NEAR_ENEMY,
-  ALL_ENEMIES,
-  /** {@link https://bulbapedia.bulbagarden.net/wiki/Category:Counterattacks Counterattacks} */
-  ATTACKER,
-  /** {@link https://bulbapedia.bulbagarden.net/wiki/Category:Moves_that_target_one_adjacent_ally Moves that target one adjacent ally} */
-  NEAR_ALLY,
-  ALLY,
-  USER_OR_NEAR_ALLY,
-  USER_AND_ALLIES,
-  /** {@link https://bulbapedia.bulbagarden.net/wiki/Category:Moves_that_target_all_Pok%C3%A9mon Moves that target all Pokemon} */
-  ALL,
-  USER_SIDE,
-  /** {@link https://bulbapedia.bulbagarden.net/wiki/Category:Entry_hazard-creating_moves Entry hazard-creating moves} */
-  ENEMY_SIDE,
-  BOTH_SIDES,
-  PARTY,
-  CURSE
-}
-
-export enum MoveFlags {
-  NONE              = 0,
-  MAKES_CONTACT     = 1 << 0,
-  IGNORE_PROTECT    = 1 << 1,
-  /**
-   * Sound-based moves have the following effects:
-   * - Pokemon with the {@linkcode Abilities.SOUNDPROOF Soundproof Ability} are unaffected by other Pokemon's sound-based moves.
-   * - Pokemon affected by {@linkcode Moves.THROAT_CHOP Throat Chop} cannot use sound-based moves for two turns.
-   * - Sound-based moves used by a Pokemon with {@linkcode Abilities.LIQUID_VOICE Liquid Voice} become Water-type moves.
-   * - Sound-based moves used by a Pokemon with {@linkcode Abilities.PUNK_ROCK Punk Rock} are boosted by 30%. Pokemon with Punk Rock also take half damage from sound-based moves.
-   * - All sound-based moves (except Howl) can hit Pokemon behind an active {@linkcode Moves.SUBSTITUTE Substitute}.
-   *
-   * cf https://bulbapedia.bulbagarden.net/wiki/Sound-based_move
-   */
-  SOUND_BASED       = 1 << 2,
-  HIDE_USER         = 1 << 3,
-  HIDE_TARGET       = 1 << 4,
-  BITING_MOVE       = 1 << 5,
-  PULSE_MOVE        = 1 << 6,
-  PUNCHING_MOVE     = 1 << 7,
-  SLICING_MOVE      = 1 << 8,
-  /**
-   * Indicates a move should be affected by {@linkcode Abilities.RECKLESS}
-   * @see {@linkcode Move.recklessMove()}
-   */
-  RECKLESS_MOVE     = 1 << 9,
-  /** Indicates a move should be affected by {@linkcode Abilities.BULLETPROOF} */
-  BALLBOMB_MOVE     = 1 << 10,
-  /** Grass types and pokemon with {@linkcode Abilities.OVERCOAT} are immune to powder moves */
-  POWDER_MOVE       = 1 << 11,
-  /** Indicates a move should trigger {@linkcode Abilities.DANCER} */
-  DANCE_MOVE        = 1 << 12,
-  /** Indicates a move should trigger {@linkcode Abilities.WIND_RIDER} */
-  WIND_MOVE         = 1 << 13,
-  /** Indicates a move should trigger {@linkcode Abilities.TRIAGE} */
-  TRIAGE_MOVE       = 1 << 14,
-  IGNORE_ABILITIES  = 1 << 15,
-  /** Enables all hits of a multi-hit move to be accuracy checked individually */
-  CHECK_ALL_HITS    = 1 << 16,
-  /** Indicates a move is able to bypass its target's Substitute (if the target has one) */
-  IGNORE_SUBSTITUTE = 1 << 17,
-  /** Indicates a move is able to be redirected to allies in a double battle if the attacker faints */
-  REDIRECT_COUNTER = 1 << 18,
-}
+import { RevivalBlessingPhase } from "#app/phases/revival-blessing-phase";
+import { LoadMoveAnimPhase } from "#app/phases/load-move-anim-phase";
+import { PokemonTransformPhase } from "#app/phases/pokemon-transform-phase";
+import { MoveAnimPhase } from "#app/phases/move-anim-phase";
+import { loggedInUser } from "#app/account";
+import { MoveCategory } from "#enums/MoveCategory";
+import { MoveTarget } from "#enums/MoveTarget";
+import { MoveFlags } from "#enums/MoveFlags";
+import { MoveEffectTrigger } from "#enums/MoveEffectTrigger";
+import { MultiHitType } from "#enums/MultiHitType";
+import { invalidAssistMoves, invalidCopycatMoves, invalidMetronomeMoves, invalidMirrorMoveMoves, invalidSleepTalkMoves } from "./invalid-moves";
+import { SelectBiomePhase } from "#app/phases/select-biome-phase";
 
 type MoveConditionFunc = (user: Pokemon, target: Pokemon, move: Move) => boolean;
 type UserMoveConditionFunc = (user: Pokemon, move: Move) => boolean;
@@ -134,7 +131,7 @@ type UserMoveConditionFunc = (user: Pokemon, move: Move) => boolean;
 export default class Move implements Localizable {
   public id: Moves;
   public name: string;
-  private _type: Type;
+  private _type: PokemonType;
   private _category: MoveCategory;
   public moveTarget: MoveTarget;
   public power: number;
@@ -151,7 +148,7 @@ export default class Move implements Localizable {
   private flags: number = 0;
   private nameAppend: string = "";
 
-  constructor(id: Moves, type: Type, category: MoveCategory, defaultMoveTarget: MoveTarget, power: number, accuracy: number, pp: number, chance: number, priority: number, generation: number) {
+  constructor(id: Moves, type: PokemonType, category: MoveCategory, defaultMoveTarget: MoveTarget, power: number, accuracy: number, pp: number, chance: number, priority: number, generation: number) {
     this.id = id;
     this._type = type;
     this._category = category;
@@ -321,21 +318,21 @@ export default class Move implements Localizable {
    * Currently looks at cases of Grass types with powder moves and Dark types with moves affected by Prankster.
    * @param {Pokemon} user the source of this move
    * @param {Pokemon} target the target of this move
-   * @param {Type} type the type of the move's target
+   * @param {PokemonType} type the type of the move's target
    * @returns boolean
    */
-  isTypeImmune(user: Pokemon, target: Pokemon, type: Type): boolean {
+  isTypeImmune(user: Pokemon, target: Pokemon, type: PokemonType): boolean {
     if (this.moveTarget === MoveTarget.USER) {
       return false;
     }
 
     switch (type) {
-      case Type.GRASS:
+      case PokemonType.GRASS:
         if (this.hasFlag(MoveFlags.POWDER_MOVE)) {
           return true;
         }
         break;
-      case Type.DARK:
+      case PokemonType.DARK:
         if (user.hasAbility(Abilities.PRANKSTER) && this.category === MoveCategory.STATUS && (user.isPlayer() !== target.isPlayer())) {
           return true;
         }
@@ -350,13 +347,13 @@ export default class Move implements Localizable {
    * @param target The {@linkcode Pokemon} targeted by this move
    * @returns `true` if the move can bypass the target's Substitute; `false` otherwise.
    */
-  hitsSubstitute(user: Pokemon, target: Pokemon | null): boolean {
+  hitsSubstitute(user: Pokemon, target?: Pokemon): boolean {
     if ([ MoveTarget.USER, MoveTarget.USER_SIDE, MoveTarget.ENEMY_SIDE, MoveTarget.BOTH_SIDES ].includes(this.moveTarget)
         || !target?.getTag(BattlerTagType.SUBSTITUTE)) {
       return false;
     }
 
-    const bypassed = new Utils.BooleanHolder(false);
+    const bypassed = new BooleanHolder(false);
     // TODO: Allow this to be simulated
     applyAbAttrs(InfiltratorAbAttr, user, null, false, bypassed);
 
@@ -610,14 +607,42 @@ export default class Move implements Localizable {
     return this;
   }
 
+  /**
+   * Sets the {@linkcode MoveFlags.REFLECTABLE} flag for the calling Move
+   * @see {@linkcode Moves.ATTRACT}
+   * @returns The {@linkcode Move} that called this function
+   */
+  reflectable(): this {
+    this.setFlag(MoveFlags.REFLECTABLE, true);
+    return this;
+  }
+
   /**
    * Checks if the move flag applies to the pokemon(s) using/receiving the move
+   *
+   * This method will take the `user`'s ability into account when reporting flags, e.g.
+   * calling this method for {@linkcode MoveFlags.MAKES_CONTACT | MAKES_CONTACT}
+   * will return `false` if the user has a {@linkcode Abilities.LONG_REACH} that is not being suppressed.
+   *
+   * **Note:** This method only checks if the move should have effectively have the flag applied to its use.
+   * It does *not* check whether the flag will trigger related effects.
+   * For example using this method to check {@linkcode MoveFlags.WIND_MOVE}
+   * will not consider {@linkcode Abilities.WIND_RIDER | Wind Rider }.
+   *
+   * To simply check whether the move has a flag, use {@linkcode hasFlag}.
    * @param flag {@linkcode MoveFlags} MoveFlag to check on user and/or target
    * @param user {@linkcode Pokemon} the Pokemon using the move
    * @param target {@linkcode Pokemon} the Pokemon receiving the move
+   * @param isFollowUp (defaults to `false`) `true` if the move was used as a follow up
    * @returns boolean
+   * @see {@linkcode hasFlag}
    */
-  checkFlag(flag: MoveFlags, user: Pokemon, target: Pokemon | null): boolean {
+  doesFlagEffectApply({ flag, user, target, isFollowUp = false }: {
+    flag: MoveFlags;
+    user: Pokemon;
+    target?: Pokemon;
+    isFollowUp?: boolean;
+  }): boolean {
     // special cases below, eg: if the move flag is MAKES_CONTACT, and the user pokemon has an ability that ignores contact (like "Long Reach"), then overrides and move does not make contact
     switch (flag) {
       case MoveFlags.MAKES_CONTACT:
@@ -627,19 +652,32 @@ export default class Move implements Localizable {
         break;
       case MoveFlags.IGNORE_ABILITIES:
         if (user.hasAbilityWithAttr(MoveAbilityBypassAbAttr)) {
-          const abilityEffectsIgnored = new Utils.BooleanHolder(false);
+          const abilityEffectsIgnored = new BooleanHolder(false);
           applyAbAttrs(MoveAbilityBypassAbAttr, user, abilityEffectsIgnored, false, this);
           if (abilityEffectsIgnored.value) {
             return true;
           }
+          // Sunsteel strike, Moongeist beam, and photon geyser will not ignore abilities if invoked
+          // by another move, such as via metronome.
         }
-        break;
+        return this.hasFlag(MoveFlags.IGNORE_ABILITIES) && !isFollowUp;
       case MoveFlags.IGNORE_PROTECT:
         if (user.hasAbilityWithAttr(IgnoreProtectOnContactAbAttr)
-          && this.checkFlag(MoveFlags.MAKES_CONTACT, user, null)) {
+          && this.doesFlagEffectApply({ flag: MoveFlags.MAKES_CONTACT, user })) {
           return true;
         }
         break;
+      case MoveFlags.REFLECTABLE:
+        // If the target is not semi-invulnerable and either has magic coat active or an unignored magic bounce ability
+        if (
+          target?.getTag(SemiInvulnerableTag) ||
+          !(target?.getTag(BattlerTagType.MAGIC_COAT) ||
+            (!this.doesFlagEffectApply({ flag: MoveFlags.IGNORE_ABILITIES, user, target }) &&
+              target?.hasAbilityWithAttr(ReflectStatusMoveAbAttr)))
+        ) {
+          return false;
+        }
+        break;
     }
 
     return !!(this.flags & flag);
@@ -665,19 +703,17 @@ export default class Move implements Localizable {
   /**
    * Sees if a move has a custom failure text (by looking at each {@linkcode MoveAttr} of this move)
    * @param user {@linkcode Pokemon} using the move
-   * @param target {@linkcode Pokemon} receiving the move
-   * @param move {@linkcode Move} using the move
-   * @param cancelled {@linkcode Utils.BooleanHolder} to hold boolean value
+   * @param target {@linkcode Pokemon} target of the move
+   * @param move {@linkcode Move} with this attribute
    * @returns string of the custom failure text, or `null` if it uses the default text ("But it failed!")
    */
-  getFailedText(user: Pokemon, target: Pokemon, move: Move, cancelled: Utils.BooleanHolder): string | null {
+  getFailedText(user: Pokemon, target: Pokemon, move: Move): string | undefined {
     for (const attr of this.attrs) {
-      const failedText = attr.getFailedText(user, target, move, cancelled);
-      if (failedText !== null) {
+      const failedText = attr.getFailedText(user, target, move);
+      if (failedText) {
         return failedText;
       }
     }
-    return null;
   }
 
   /**
@@ -731,7 +767,7 @@ export default class Move implements Localizable {
    * @returns The calculated accuracy of the move.
    */
   calculateBattleAccuracy(user: Pokemon, target: Pokemon, simulated: boolean = false) {
-    const moveAccuracy = new Utils.NumberHolder(this.accuracy);
+    const moveAccuracy = new NumberHolder(this.accuracy);
 
     applyMoveAttrs(VariableAccuracyAttr, user, target, this, moveAccuracy);
     applyPreDefendAbAttrs(WonderSkinAbAttr, target, user, this, { value: false }, simulated, moveAccuracy);
@@ -773,20 +809,21 @@ export default class Move implements Localizable {
       return -1;
     }
 
-    const power = new Utils.NumberHolder(this.power);
-    const typeChangeMovePowerMultiplier = new Utils.NumberHolder(1);
+    const power = new NumberHolder(this.power);
+    const typeChangeMovePowerMultiplier = new NumberHolder(1);
+    const typeChangeHolder = new NumberHolder(this.type);
 
-    applyPreAttackAbAttrs(MoveTypeChangeAbAttr, source, target, this, true, null, typeChangeMovePowerMultiplier);
+    applyPreAttackAbAttrs(MoveTypeChangeAbAttr, source, target, this, true, typeChangeHolder, typeChangeMovePowerMultiplier);
 
     const sourceTeraType = source.getTeraType();
-    if (sourceTeraType !== Type.UNKNOWN && sourceTeraType === this.type && power.value < 60 && this.priority <= 0 && !this.hasAttr(MultiHitAttr) && !globalScene.findModifier(m => m instanceof PokemonMultiHitModifier && m.pokemonId === source.id)) {
+    if (source.isTerastallized && sourceTeraType === this.type && power.value < 60 && this.priority <= 0 && !this.hasAttr(MultiHitAttr) && !globalScene.findModifier(m => m instanceof PokemonMultiHitModifier && m.pokemonId === source.id)) {
       power.value = 60;
     }
 
     applyPreAttackAbAttrs(VariableMovePowerAbAttr, source, target, this, simulated, power);
-
-    if (source.getAlly()) {
-      applyPreAttackAbAttrs(AllyMoveCategoryPowerBoostAbAttr, source.getAlly(), target, this, simulated, power);
+    const ally = source.getAlly();
+    if (!isNullOrUndefined(ally)) {
+      applyPreAttackAbAttrs(AllyMoveCategoryPowerBoostAbAttr, ally, target, this, simulated, power);
     }
 
     const fieldAuras = new Set(
@@ -806,7 +843,7 @@ export default class Move implements Localizable {
 
     power.value *= typeChangeMovePowerMultiplier.value;
 
-    const typeBoost = source.findTag(t => t instanceof TypeBoostTag && t.boostedType === this.type) as TypeBoostTag;
+    const typeBoost = source.findTag(t => t instanceof TypeBoostTag && t.boostedType === typeChangeHolder.value) as TypeBoostTag;
     if (typeBoost) {
       power.value *= typeBoost.boostValue;
     }
@@ -814,8 +851,8 @@ export default class Move implements Localizable {
     applyMoveAttrs(VariablePowerAttr, source, target, this, power);
 
     if (!this.hasAttr(TypelessAttr)) {
-      globalScene.arena.applyTags(WeakenMoveTypeTag, simulated, this.type, power);
-      globalScene.applyModifiers(AttackTypeBoosterModifier, source.isPlayer(), source, this.type, power);
+      globalScene.arena.applyTags(WeakenMoveTypeTag, simulated, typeChangeHolder.value, power);
+      globalScene.applyModifiers(AttackTypeBoosterModifier, source.isPlayer(), source, typeChangeHolder.value, power);
     }
 
     if (source.getTag(HelpingHandTag)) {
@@ -826,7 +863,7 @@ export default class Move implements Localizable {
   }
 
   getPriority(user: Pokemon, simulated: boolean = true) {
-    const priority = new Utils.NumberHolder(this.priority);
+    const priority = new NumberHolder(this.priority);
 
     applyMoveAttrs(IncrementMovePriorityAttr, user, null, this, priority);
     applyAbAttrs(ChangeMovePriorityAbAttr, user, null, simulated, this, priority);
@@ -834,6 +871,46 @@ export default class Move implements Localizable {
     return priority.value;
   }
 
+  /**
+   * Calculate the [Expected Power](https://en.wikipedia.org/wiki/Expected_value) per turn
+   * of this move, taking into account multi hit moves, accuracy, and the number of turns it
+   * takes to execute.
+   *
+   * Does not (yet) consider the current field effects or the user's abilities.
+   */
+  calculateEffectivePower(): number {
+    let effectivePower: number;
+    // Triple axel and triple kick are easier to special case.
+    if (this.id === Moves.TRIPLE_AXEL) {
+      effectivePower = 94.14;
+    } else if (this.id === Moves.TRIPLE_KICK) {
+      effectivePower = 47.07;
+    } else {
+      const multiHitAttr = this.getAttrs(MultiHitAttr)[0];
+      if (multiHitAttr) {
+        effectivePower = multiHitAttr.calculateExpectedHitCount(this) * this.power;
+      } else {
+        effectivePower = this.power * (this.accuracy === -1 ? 1 : this.accuracy / 100);
+      }
+    }
+    /** The number of turns the user must commit to for this move's damage */
+    let numTurns = 1;
+
+    // These are intentionally not else-if statements even though there are no
+    // pokemon moves that have more than one of these attributes. This allows
+    // the function to future proof new moves / custom move behaviors.
+    if (this.hasAttr(DelayedAttackAttr)) {
+      numTurns += 2;
+    }
+    if (this.hasAttr(RechargeAttr)) {
+      numTurns += 1;
+    }
+    if (this.isChargingMove()) {
+      numTurns += 1;
+    }
+    return effectivePower / numTurns;
+  }
+
   /**
    * Returns `true` if this move can be given additional strikes
    * by enhancing effects.
@@ -857,7 +934,7 @@ export default class Move implements Localizable {
       SacrificialAttrOnHit
     ];
 
-    // ...and cannot enhance these specific moves.
+    // ...and cannot enhance these specific moves
     const exceptMoves: Moves[] = [
       Moves.FLING,
       Moves.UPROAR,
@@ -866,79 +943,74 @@ export default class Move implements Localizable {
       Moves.ENDEAVOR
     ];
 
+    // ...and cannot enhance Pollen Puff when targeting an ally.
+    const ally = user.getAlly();
+    const exceptPollenPuffAlly: boolean = this.id === Moves.POLLEN_PUFF && !isNullOrUndefined(ally) && targets.includes(ally.getBattlerIndex())
+
     return (!restrictSpread || !isMultiTarget)
       && !this.isChargingMove()
       && !exceptAttrs.some(attr => this.hasAttr(attr))
       && !exceptMoves.some(id => this.id === id)
+      && !exceptPollenPuffAlly
       && this.category !== MoveCategory.STATUS;
   }
 }
 
 export class AttackMove extends Move {
-  constructor(id: Moves, type: Type, category: MoveCategory, power: number, accuracy: number, pp: number, chance: number, priority: number, generation: number) {
+  constructor(id: Moves, type: PokemonType, category: MoveCategory, power: number, accuracy: number, pp: number, chance: number, priority: number, generation: number) {
     super(id, type, category, MoveTarget.NEAR_OTHER, power, accuracy, pp, chance, priority, generation);
 
     /**
      * {@link https://bulbapedia.bulbagarden.net/wiki/Freeze_(status_condition)}
      * > All damaging Fire-type moves can now thaw a frozen target, regardless of whether or not they have a chance to burn;
      */
-    if (this.type === Type.FIRE) {
+    if (this.type === PokemonType.FIRE) {
       this.addAttr(new HealStatusEffectAttr(false, StatusEffect.FREEZE));
     }
   }
 
+  /**
+   * Compute the benefit score of this move based on the offensive stat used and the move's power.
+   * @param user The Pokemon using the move
+   * @param target The Pokemon targeted by the move
+   * @param move The move being used
+   * @returns The benefit score of using this move
+   */
   getTargetBenefitScore(user: Pokemon, target: Pokemon, move: Move): number {
-    let ret = super.getTargetBenefitScore(user, target, move);
-
+    // TODO: Properly handle foul play, body press, and opponent stat stages.
+    const ret = super.getTargetBenefitScore(user, target, move);
     let attackScore = 0;
 
     const effectiveness = target.getAttackTypeEffectiveness(this.type, user, undefined, undefined, this);
-    attackScore = Math.pow(effectiveness - 1, 2) * effectiveness < 1 ? -2 : 2;
-    if (attackScore) {
-      if (this.category === MoveCategory.PHYSICAL) {
-        const atk = new Utils.IntegerHolder(user.getEffectiveStat(Stat.ATK, target));
-        applyMoveAttrs(VariableAtkAttr, user, target, move, atk);
-        if (atk.value > user.getEffectiveStat(Stat.SPATK, target)) {
-          const statRatio = user.getEffectiveStat(Stat.SPATK, target) / atk.value;
-          if (statRatio <= 0.75) {
-            attackScore *= 2;
-          } else if (statRatio <= 0.875) {
-            attackScore *= 1.5;
-          }
-        }
-      } else {
-        const spAtk = new Utils.IntegerHolder(user.getEffectiveStat(Stat.SPATK, target));
-        applyMoveAttrs(VariableAtkAttr, user, target, move, spAtk);
-        if (spAtk.value > user.getEffectiveStat(Stat.ATK, target)) {
-          const statRatio = user.getEffectiveStat(Stat.ATK, target) / spAtk.value;
-          if (statRatio <= 0.75) {
-            attackScore *= 2;
-          } else if (statRatio <= 0.875) {
-            attackScore *= 1.5;
-          }
-        }
-      }
-
-      const power = new Utils.NumberHolder(this.power);
-      applyMoveAttrs(VariablePowerAttr, user, target, move, power);
-
-      attackScore += Math.floor(power.value / 5);
+    attackScore = Math.pow(effectiveness - 1, 2) * (effectiveness < 1 ? -2 : 2);
+    const [ thisStat, offStat ]: EffectiveStat[] = this.category === MoveCategory.PHYSICAL ? [ Stat.ATK, Stat.SPATK ] : [ Stat.SPATK, Stat.ATK ];
+    const statHolder = new NumberHolder(user.getEffectiveStat(thisStat, target));
+    const offStatValue = user.getEffectiveStat(offStat, target);
+    applyMoveAttrs(VariableAtkAttr, user, target, move, statHolder);
+    const statRatio = offStatValue / statHolder.value;
+    if (statRatio <= 0.75) {
+      attackScore *= 2;
+    } else if (statRatio <= 0.875) {
+      attackScore *= 1.5;
     }
 
-    ret -= attackScore;
+    const power = new NumberHolder(this.calculateEffectivePower());
+    applyMoveAttrs(VariablePowerAttr, user, target, move, power);
 
-    return ret;
+    attackScore += Math.floor(power.value / 5);
+
+    return ret - attackScore;
   }
 }
 
 export class StatusMove extends Move {
-  constructor(id: Moves, type: Type, accuracy: number, pp: number, chance: number, priority: number, generation: number) {
+  constructor(id: Moves, type: PokemonType, accuracy: number, pp: number, chance: number, priority: number, generation: number) {
     super(id, type, MoveCategory.STATUS, MoveTarget.NEAR_OTHER, -1, accuracy, pp, chance, priority, generation);
   }
 }
 
 export class SelfStatusMove extends Move {
-  constructor(id: Moves, type: Type, accuracy: number, pp: number, chance: number, priority: number, generation: number) {
+  constructor(id: Moves, type: PokemonType, accuracy: number, pp: number, chance: number, priority: number, generation: number) {
     super(id, type, MoveCategory.STATUS, MoveTarget.USER, -1, accuracy, pp, chance, priority, generation);
   }
 }
@@ -1045,7 +1117,7 @@ export abstract class MoveAttr {
    * @param args Set of unique arguments needed by this attribute
    * @returns true if application of the ability succeeds
    */
-  apply(user: Pokemon | null, target: Pokemon | null, move: Move, args: any[]): boolean | Promise<boolean> {
+  apply(user: Pokemon | null, target: Pokemon | null, move: Move, args: any[]): boolean {
     return true;
   }
 
@@ -1062,11 +1134,10 @@ export abstract class MoveAttr {
    * @param user {@linkcode Pokemon} using the move
    * @param target {@linkcode Pokemon} target of the move
    * @param move {@linkcode Move} with this attribute
-   * @param cancelled {@linkcode Utils.BooleanHolder} which stores if the move should fail
    * @returns the string representing failure of this {@linkcode Move}
    */
-  getFailedText(user: Pokemon, target: Pokemon, move: Move, cancelled: Utils.BooleanHolder): string | null {
-    return null;
+  getFailedText(user: Pokemon, target: Pokemon, move: Move): string | undefined {
+    return;
   }
 
   /**
@@ -1088,14 +1159,6 @@ export abstract class MoveAttr {
   }
 }
 
-export enum MoveEffectTrigger {
-  PRE_APPLY,
-  POST_APPLY,
-  HIT,
-  /** Triggers one time after all target effects have applied */
-  POST_TARGET,
-}
-
 interface MoveEffectAttrOptions {
   /**
    * Defines when this effect should trigger in the move's effect order
@@ -1184,11 +1247,11 @@ export class MoveEffectAttr extends MoveAttr {
   canApply(user: Pokemon, target: Pokemon, move: Move, args?: any[]) {
     return !! (this.selfTarget ? user.hp && !user.getTag(BattlerTagType.FRENZY) : target.hp)
            && (this.selfTarget || !target.getTag(BattlerTagType.PROTECTED) ||
-                move.checkFlag(MoveFlags.IGNORE_PROTECT, user, target));
+                move.doesFlagEffectApply({ flag: MoveFlags.IGNORE_PROTECT, user, target }));
   }
 
   /** Applies move effects so long as they are able based on {@linkcode canApply} */
-  apply(user: Pokemon, target: Pokemon, move: Move, args?: any[]): boolean | Promise<boolean> {
+  apply(user: Pokemon, target: Pokemon, move: Move, args?: any[]): boolean {
     return this.canApply(user, target, move, args);
   }
 
@@ -1202,9 +1265,9 @@ export class MoveEffectAttr extends MoveAttr {
    * @returns Move effect chance value.
    */
   getMoveChance(user: Pokemon, target: Pokemon, move: Move, selfEffect?: Boolean, showAbility?: Boolean): number {
-    const moveChance = new Utils.NumberHolder(this.effectChanceOverride ?? move.chance);
+    const moveChance = new NumberHolder(this.effectChanceOverride ?? move.chance);
 
-    applyAbAttrs(MoveEffectChanceMultiplierAbAttr, user, null, false, moveChance, move, target, selfEffect, showAbility);
+    applyAbAttrs(MoveEffectChanceMultiplierAbAttr, user, null, !showAbility, moveChance, move);
 
     if ((!move.hasAttr(FlinchAttr) || moveChance.value <= move.chance) && !move.hasAttr(SecretPowerAttr)) {
       const userSide = user.isPlayer() ? ArenaTagSide.PLAYER : ArenaTagSide.ENEMY;
@@ -1212,7 +1275,7 @@ export class MoveEffectAttr extends MoveAttr {
     }
 
     if (!selfEffect) {
-      applyPreDefendAbAttrs(IgnoreMoveEffectsAbAttr, target, user, null, null, false, moveChance);
+      applyPreDefendAbAttrs(IgnoreMoveEffectsAbAttr, target, user, null, null, !showAbility, moveChance);
     }
     return moveChance.value;
   }
@@ -1308,6 +1371,54 @@ export class PreMoveMessageAttr extends MoveAttr {
   }
 }
 
+/**
+ * Attribute for moves that can be conditionally interrupted to be considered to
+ * have failed before their "useMove" message is displayed. Currently used by
+ * Focus Punch.
+ * @extends MoveAttr
+ */
+export class PreUseInterruptAttr extends MoveAttr {
+  protected message?: string | ((user: Pokemon, target: Pokemon, move: Move) => string);
+  protected overridesFailedMessage: boolean;
+  protected conditionFunc: MoveConditionFunc;
+
+  /**
+   * Create a new MoveInterruptedMessageAttr.
+   * @param message The message to display when the move is interrupted, or a function that formats the message based on the user, target, and move.
+   */
+  constructor(message?: string | ((user: Pokemon, target: Pokemon, move: Move) => string), conditionFunc?: MoveConditionFunc) {
+    super();
+    this.message = message;
+    this.conditionFunc = conditionFunc ?? (() => true);
+  }
+
+  /**
+   * Message to display when a move is interrupted.
+   * @param user {@linkcode Pokemon} using the move
+   * @param target {@linkcode Pokemon} target of the move
+   * @param move {@linkcode Move} with this attribute
+   */
+  override apply(user: Pokemon, target: Pokemon, move: Move): boolean {
+    return this.conditionFunc(user, target, move);
+  }
+
+  /**
+   * Message to display when a move is interrupted.
+   * @param user {@linkcode Pokemon} using the move
+   * @param target {@linkcode Pokemon} target of the move
+   * @param move {@linkcode Move} with this attribute
+   */
+  override getFailedText(user: Pokemon, target: Pokemon, move: Move): string | undefined {
+    if (this.message && this.conditionFunc(user, target, move)) {
+      const message =
+        typeof this.message === "string"
+          ? (this.message as string)
+          : this.message(user, target, move);
+      return message;
+    }
+  }
+}
+
 /**
  * Attribute for Status moves that take attack type effectiveness
  * into consideration (i.e. {@linkcode https://bulbapedia.bulbagarden.net/wiki/Thunder_Wave_(move) | Thunder Wave})
@@ -1317,7 +1428,7 @@ export class RespectAttackTypeImmunityAttr extends MoveAttr { }
 
 export class IgnoreOpponentStatStagesAttr extends MoveAttr {
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
-    (args[0] as Utils.BooleanHolder).value = true;
+    (args[0] as BooleanHolder).value = true;
 
     return true;
   }
@@ -1325,7 +1436,7 @@ export class IgnoreOpponentStatStagesAttr extends MoveAttr {
 
 export class HighCritAttr extends MoveAttr {
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
-    (args[0] as Utils.IntegerHolder).value++;
+    (args[0] as NumberHolder).value++;
 
     return true;
   }
@@ -1337,7 +1448,7 @@ export class HighCritAttr extends MoveAttr {
 
 export class CritOnlyAttr extends MoveAttr {
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
-    (args[0] as Utils.BooleanHolder).value = true;
+    (args[0] as BooleanHolder).value = true;
 
     return true;
   }
@@ -1357,7 +1468,7 @@ export class FixedDamageAttr extends MoveAttr {
   }
 
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
-    (args[0] as Utils.IntegerHolder).value = this.getDamage(user, target, move);
+    (args[0] as NumberHolder).value = this.getDamage(user, target, move);
 
     return true;
   }
@@ -1373,7 +1484,7 @@ export class UserHpDamageAttr extends FixedDamageAttr {
   }
 
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
-    (args[0] as Utils.IntegerHolder).value = user.hp;
+    (args[0] as NumberHolder).value = user.hp;
 
     return true;
   }
@@ -1394,7 +1505,7 @@ export class TargetHalfHpDamageAttr extends FixedDamageAttr {
     const lensCount = user.getHeldItems().find(i => i instanceof PokemonMultiHitModifier)?.getStackCount() ?? 0;
     if (lensCount <= 0) {
       // no multi lenses; we can just halve the target's hp and call it a day
-      (args[0] as Utils.NumberHolder).value = Utils.toDmgValue(target.hp / 2);
+      (args[0] as NumberHolder).value = toDmgValue(target.hp / 2);
       return true;
     }
 
@@ -1405,11 +1516,11 @@ export class TargetHalfHpDamageAttr extends FixedDamageAttr {
         this.initialHp = target.hp;
       default:
         // multi lens added hit; use initialHp tracker to ensure correct damage
-        (args[0] as Utils.NumberHolder).value = Utils.toDmgValue(this.initialHp / 2);
+        (args[0] as NumberHolder).value = toDmgValue(this.initialHp / 2);
         return true;
       case lensCount + 1:
         // parental bond added hit; calc damage as normal
-        (args[0] as Utils.NumberHolder).value = Utils.toDmgValue(target.hp / 2);
+        (args[0] as NumberHolder).value = toDmgValue(target.hp / 2);
         return true;
     }
   }
@@ -1425,7 +1536,7 @@ export class MatchHpAttr extends FixedDamageAttr {
   }
 
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
-    (args[0] as Utils.IntegerHolder).value = target.hp - user.hp;
+    (args[0] as NumberHolder).value = target.hp - user.hp;
 
     return true;
   }
@@ -1455,7 +1566,7 @@ export class CounterDamageAttr extends FixedDamageAttr {
 
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
     const damage = user.turnData.attacksReceived.filter(ar => this.moveFilter(allMoves[ar.move])).reduce((total: number, ar: AttackMoveResult) => total + ar.damage, 0);
-    (args[0] as Utils.IntegerHolder).value = Utils.toDmgValue(damage * this.multiplier);
+    (args[0] as NumberHolder).value = toDmgValue(damage * this.multiplier);
 
     return true;
   }
@@ -1481,13 +1592,13 @@ export class RandomLevelDamageAttr extends FixedDamageAttr {
   }
 
   getDamage(user: Pokemon, target: Pokemon, move: Move): number {
-    return Utils.toDmgValue(user.level * (user.randSeedIntRange(50, 150) * 0.01));
+    return toDmgValue(user.level * (user.randBattleSeedIntRange(50, 150) * 0.01));
   }
 }
 
 export class ModifiedDamageAttr extends MoveAttr {
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
-    const initialDamage = args[0] as Utils.IntegerHolder;
+    const initialDamage = args[0] as NumberHolder;
     initialDamage.value = this.getModifiedDamage(user, target, move, initialDamage.value);
 
     return true;
@@ -1503,15 +1614,25 @@ export class SurviveDamageAttr extends ModifiedDamageAttr {
     return Math.min(damage, target.hp - 1);
   }
 
-  getCondition(): MoveConditionFunc {
-    return (user, target, move) => target.hp > 1;
-  }
-
   getUserBenefitScore(user: Pokemon, target: Pokemon, move: Move): number {
     return target.hp > 1 ? 0 : -20;
   }
 }
 
+export class SplashAttr extends MoveEffectAttr {
+  apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
+    globalScene.queueMessage(i18next.t("moveTriggers:splash"));
+    return true;
+  }
+}
+
+export class CelebrateAttr extends MoveEffectAttr {
+  apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
+    globalScene.queueMessage(i18next.t("moveTriggers:celebrate", { playerName: loggedInUser?.username }));
+    return true;
+  }
+}
+
 export class RecoilAttr extends MoveEffectAttr {
   private useHp: boolean;
   private damageRatio: number;
@@ -1530,7 +1651,7 @@ export class RecoilAttr extends MoveEffectAttr {
       return false;
     }
 
-    const cancelled = new Utils.BooleanHolder(false);
+    const cancelled = new BooleanHolder(false);
     if (!this.unblockable) {
       applyAbAttrs(BlockRecoilDamageAttr, user, cancelled);
       applyAbAttrs(BlockNonDirectDamageAbAttr, user, cancelled);
@@ -1547,7 +1668,7 @@ export class RecoilAttr extends MoveEffectAttr {
 
     const damageValue = (!this.useHp ? user.turnData.totalDamageDealt : user.getMaxHp()) * this.damageRatio;
     const minValue = user.turnData.totalDamageDealt ? 1 : 0;
-    const recoilDamage = Utils.toDmgValue(damageValue, minValue);
+    const recoilDamage = toDmgValue(damageValue, minValue);
     if (!recoilDamage) {
       return false;
     }
@@ -1556,7 +1677,7 @@ export class RecoilAttr extends MoveEffectAttr {
       return false;
     }
 
-    user.damageAndUpdate(recoilDamage, HitResult.OTHER, false, true, true);
+    user.damageAndUpdate(recoilDamage, { result: HitResult.INDIRECT, ignoreSegments: true });
     globalScene.queueMessage(i18next.t("moveTriggers:hitWithRecoil", { pokemonName: getPokemonNameWithAffix(user) }));
     user.turnData.damageTaken += recoilDamage;
 
@@ -1588,7 +1709,7 @@ export class SacrificialAttr extends MoveEffectAttr {
    * @returns true if the function succeeds
    **/
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
-    user.damageAndUpdate(user.hp, HitResult.OTHER, false, true, true);
+    user.damageAndUpdate(user.hp, { result: HitResult.INDIRECT, ignoreSegments: true });
 	  user.turnData.damageTaken += user.hp;
 
     return true;
@@ -1609,7 +1730,7 @@ export class SacrificialAttr extends MoveEffectAttr {
  **/
 export class SacrificialAttrOnHit extends MoveEffectAttr {
   constructor() {
-    super(true, { trigger: MoveEffectTrigger.HIT });
+    super(true);
   }
 
   /**
@@ -1626,7 +1747,7 @@ export class SacrificialAttrOnHit extends MoveEffectAttr {
       return false;
     }
 
-    user.damageAndUpdate(user.hp, HitResult.OTHER, false, true, true);
+    user.damageAndUpdate(user.hp, { result: HitResult.INDIRECT, ignoreSegments: true });
     user.turnData.damageTaken += user.hp;
 
     return true;
@@ -1664,11 +1785,11 @@ export class HalfSacrificialAttr extends MoveEffectAttr {
       return false;
     }
 
-    const cancelled = new Utils.BooleanHolder(false);
+    const cancelled = new BooleanHolder(false);
     // Check to see if the Pokemon has an ability that blocks non-direct damage
     applyAbAttrs(BlockNonDirectDamageAbAttr, user, cancelled);
     if (!cancelled.value) {
-      user.damageAndUpdate(Utils.toDmgValue(user.getMaxHp() / 2), HitResult.OTHER, false, true, true);
+      user.damageAndUpdate(toDmgValue(user.getMaxHp() / 2), { result: HitResult.INDIRECT, ignoreSegments: true });
       globalScene.queueMessage(i18next.t("moveTriggers:cutHpPowerUpMove", { pokemonName: getPokemonNameWithAffix(user) })); // Queue recoil message
     }
     return true;
@@ -1683,35 +1804,36 @@ export class HalfSacrificialAttr extends MoveEffectAttr {
 }
 
 /**
- * Attribute to put in a {@link https://bulbapedia.bulbagarden.net/wiki/Substitute_(doll) | Substitute Doll}
- * for the user.
- * @extends MoveEffectAttr
- * @see {@linkcode apply}
+ * Attribute to put in a {@link https://bulbapedia.bulbagarden.net/wiki/Substitute_(doll) | Substitute Doll} for the user.
  */
 export class AddSubstituteAttr extends MoveEffectAttr {
   /** The ratio of the user's max HP that is required to apply this effect */
   private hpCost: number;
+  /** Whether the damage taken should be rounded up (Shed Tail rounds up) */
+  private roundUp: boolean;
 
-  constructor(hpCost: number = 0.25) {
+  constructor(hpCost: number, roundUp: boolean) {
     super(true);
 
     this.hpCost = hpCost;
+    this.roundUp = roundUp;
   }
 
   /**
    * Removes 1/4 of the user's maximum HP (rounded down) to create a substitute for the user
-   * @param user the {@linkcode Pokemon} that used the move.
-   * @param target n/a
-   * @param move the {@linkcode Move} with this attribute.
-   * @param args n/a
-   * @returns true if the attribute successfully applies, false otherwise
+   * @param user - The {@linkcode Pokemon} that used the move.
+   * @param target - n/a
+   * @param move - The {@linkcode Move} with this attribute.
+   * @param args - n/a
+   * @returns `true` if the attribute successfully applies, `false` otherwise
    */
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
     if (!super.apply(user, target, move, args)) {
       return false;
     }
 
-    user.damageAndUpdate(Math.floor(user.getMaxHp() * this.hpCost), HitResult.OTHER, false, true, true);
+    const damageTaken = this.roundUp ? Math.ceil(user.getMaxHp() * this.hpCost) : Math.floor(user.getMaxHp() * this.hpCost);
+    user.damageAndUpdate(damageTaken, { result: HitResult.INDIRECT, ignoreSegments: true, ignoreFaintPhase: true });
     user.addTag(BattlerTagType.SUBSTITUTE, 0, move.id, user.id);
     return true;
   }
@@ -1724,28 +1846,23 @@ export class AddSubstituteAttr extends MoveEffectAttr {
   }
 
   getCondition(): MoveConditionFunc {
-    return (user, target, move) => !user.getTag(SubstituteTag) && user.hp > Math.floor(user.getMaxHp() * this.hpCost) && user.getMaxHp() > 1;
+    return (user, _target, _move) => !user.getTag(SubstituteTag) && user.hp > (this.roundUp ? Math.ceil(user.getMaxHp() * this.hpCost) : Math.floor(user.getMaxHp() * this.hpCost)) && user.getMaxHp() > 1;
   }
 
-  getFailedText(user: Pokemon, target: Pokemon, move: Move, cancelled: Utils.BooleanHolder): string | null {
+  /**
+   * Get the substitute-specific failure message if one should be displayed.
+   * @param user - The pokemon using the move.
+   * @returns The substitute-specific failure message if the conditions apply, otherwise `undefined`
+   */
+  getFailedText(user: Pokemon, _target: Pokemon, _move: Move): string | undefined {
     if (user.getTag(SubstituteTag)) {
       return i18next.t("moveTriggers:substituteOnOverlap", { pokemonName: getPokemonNameWithAffix(user) });
     } else if (user.hp <= Math.floor(user.getMaxHp() / 4) || user.getMaxHp() === 1) {
       return i18next.t("moveTriggers:substituteNotEnoughHp");
-    } else {
-      return i18next.t("battle:attackFailed");
     }
   }
 }
 
-export enum MultiHitType {
-  _2,
-  _2_TO_5,
-  _3,
-  _10,
-  BEAT_UP,
-}
-
 /**
  * Heals the user or target by {@linkcode healRatio} depending on the value of {@linkcode selfTarget}
  * @extends MoveEffectAttr
@@ -1775,7 +1892,7 @@ export class HealAttr extends MoveEffectAttr {
    */
   addHealPhase(target: Pokemon, healRatio: number) {
     globalScene.unshiftPhase(new PokemonHealPhase(target.getBattlerIndex(),
-      Utils.toDmgValue(target.getMaxHp() * healRatio), i18next.t("moveTriggers:healHp", { pokemonName: getPokemonNameWithAffix(target) }), true, !this.showAnim));
+      toDmgValue(target.getMaxHp() * healRatio), i18next.t("moveTriggers:healHp", { pokemonName: getPokemonNameWithAffix(target) }), true, !this.showAnim));
   }
 
   getTargetBenefitScore(user: Pokemon, target: Pokemon, move: Move): number {
@@ -1791,14 +1908,14 @@ export class HealAttr extends MoveEffectAttr {
  */
 export class PartyStatusCureAttr extends MoveEffectAttr {
   /** Message to display after using move */
-  private message: string;
+  private message: string | null;
   /** Skips mons with this ability, ie. Soundproof */
   private abilityCondition: Abilities;
 
   constructor(message: string | null, abilityCondition: Abilities) {
     super();
 
-    this.message = message!; // TODO: is this bang correct?
+    this.message = message;
     this.abilityCondition = abilityCondition;
   }
 
@@ -1837,7 +1954,9 @@ export class PartyStatusCureAttr extends MoveEffectAttr {
       pokemon.resetStatus();
       pokemon.updateInfo();
     } else {
-      globalScene.unshiftPhase(new ShowAbilityPhase(pokemon.id, pokemon.getPassiveAbility()?.id === this.abilityCondition));
+      // TODO: Ability displays should be handled by the ability
+      globalScene.queueAbilityDisplay(pokemon, pokemon.getPassiveAbility()?.id === this.abilityCondition, true);
+      globalScene.queueAbilityDisplay(pokemon, pokemon.getPassiveAbility()?.id === this.abilityCondition, false);
     }
   }
 }
@@ -1847,6 +1966,14 @@ export class PartyStatusCureAttr extends MoveEffectAttr {
  * @extends MoveEffectAttr
  */
 export class FlameBurstAttr extends MoveEffectAttr {
+  constructor() {
+    /**
+     * This is self-targeted to bypass immunity to target-facing secondary
+     * effects when the target has an active Substitute doll.
+     * TODO: Find a more intuitive way to implement Substitute bypassing.
+     */
+    super(true);
+  }
   /**
    * @param user - n/a
    * @param target - The target Pokémon.
@@ -1854,11 +1981,11 @@ export class FlameBurstAttr extends MoveEffectAttr {
    * @param args - n/a
    * @returns A boolean indicating whether the effect was successfully applied.
    */
-  apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean | Promise<boolean> {
+  apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
     const targetAlly = target.getAlly();
-    const cancelled = new Utils.BooleanHolder(false);
+    const cancelled = new BooleanHolder(false);
 
-    if (targetAlly) {
+    if (!isNullOrUndefined(targetAlly)) {
       applyAbAttrs(BlockNonDirectDamageAbAttr, targetAlly, cancelled);
     }
 
@@ -1866,12 +1993,12 @@ export class FlameBurstAttr extends MoveEffectAttr {
       return false;
     }
 
-    targetAlly.damageAndUpdate(Math.max(1, Math.floor(1 / 16 * targetAlly.getMaxHp())), HitResult.OTHER);
+    targetAlly.damageAndUpdate(Math.max(1, Math.floor(1 / 16 * targetAlly.getMaxHp())), { result: HitResult.INDIRECT });
     return true;
   }
 
   getTargetBenefitScore(user: Pokemon, target: Pokemon, move: Move): number {
-    return target.getAlly() ? -5 : 0;
+    return !isNullOrUndefined(target.getAlly()) ? -5 : 0;
   }
 }
 
@@ -1939,11 +2066,11 @@ export class IgnoreWeatherTypeDebuffAttr extends MoveAttr {
    * @param user {@linkcode Pokemon} that used the move
    * @param target N/A
    * @param move {@linkcode Move} with this attribute
-   * @param args [0] {@linkcode Utils.NumberHolder} for arenaAttackTypeMultiplier
+   * @param args [0] {@linkcode NumberHolder} for arenaAttackTypeMultiplier
    * @returns true if the function succeeds
    */
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
-    const weatherModifier = args[0] as Utils.NumberHolder;
+    const weatherModifier = args[0] as NumberHolder;
     //If the type-based attack power modifier due to weather (e.g. Water moves in Sun) is below 1, set it to 1
     if (globalScene.arena.weather?.weatherType === this.weather) {
       weatherModifier.value = Math.max(weatherModifier.value, 1);
@@ -2013,10 +2140,10 @@ export class BoostHealAttr extends HealAttr {
   /** The lambda expression to check against when boosting the healing value */
   private condition?: MoveConditionFunc;
 
-  constructor(normalHealRatio?: number, boostedHealRatio?: number, showAnim?: boolean, selfTarget?: boolean, condition?: MoveConditionFunc) {
+  constructor(normalHealRatio: number = 0.5, boostedHealRatio: number = 2 / 3, showAnim?: boolean, selfTarget?: boolean, condition?: MoveConditionFunc) {
     super(normalHealRatio, showAnim, selfTarget);
-    this.normalHealRatio = normalHealRatio!; // TODO: is this bang correct?
-    this.boostedHealRatio = boostedHealRatio!; // TODO: is this bang correct?
+    this.normalHealRatio = normalHealRatio;
+    this.boostedHealRatio = boostedHealRatio;
     this.condition = condition;
   }
 
@@ -2069,7 +2196,7 @@ export class HitHealAttr extends MoveEffectAttr {
   private healStat: EffectiveStat | null;
 
   constructor(healRatio?: number | null, healStat?: EffectiveStat) {
-    super(true, { trigger: MoveEffectTrigger.HIT });
+    super(true);
 
     this.healRatio = healRatio ?? 0.5;
     this.healStat = healStat ?? null;
@@ -2094,7 +2221,7 @@ export class HitHealAttr extends MoveEffectAttr {
       message = i18next.t("battle:drainMessage", { pokemonName: getPokemonNameWithAffix(target) });
     } else {
       // Default healing formula used by draining moves like Absorb, Draining Kiss, Bitter Blade, etc.
-      healAmount = Utils.toDmgValue(user.turnData.singleHitDamageDealt * this.healRatio);
+      healAmount = toDmgValue(user.turnData.singleHitDamageDealt * this.healRatio);
       message = i18next.t("battle:regainHealth", { pokemonName: getPokemonNameWithAffix(user) });
     }
     if (reverseDrain) {
@@ -2152,7 +2279,7 @@ export class IncrementMovePriorityAttr extends MoveAttr {
    * @param user {@linkcode Pokemon} using this move
    * @param target {@linkcode Pokemon} target of this move
    * @param move {@linkcode Move} being used
-   * @param args [0] {@linkcode Utils.IntegerHolder} for move priority.
+   * @param args [0] {@linkcode NumberHolder} for move priority.
    * @returns true if function succeeds
    */
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
@@ -2160,7 +2287,7 @@ export class IncrementMovePriorityAttr extends MoveAttr {
       return false;
     }
 
-    (args[0] as Utils.IntegerHolder).value += this.increaseAmount;
+    (args[0] as NumberHolder).value += this.increaseAmount;
     return true;
   }
 }
@@ -2198,15 +2325,15 @@ export class MultiHitAttr extends MoveAttr {
    * @param user {@linkcode Pokemon} that used the attack
    * @param target {@linkcode Pokemon} targeted by the attack
    * @param move {@linkcode Move} being used
-   * @param args [0] {@linkcode Utils.IntegerHolder} storing the hit count of the attack
+   * @param args [0] {@linkcode NumberHolder} storing the hit count of the attack
    * @returns True
    */
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
-    const hitType = new Utils.NumberHolder(this.intrinsicMultiHitType);
+    const hitType = new NumberHolder(this.intrinsicMultiHitType);
     applyMoveAttrs(ChangeMultiHitTypeAttr, user, target, move, hitType);
     this.multiHitType = hitType.value;
 
-    (args[0] as Utils.NumberHolder).value = this.getHitCount(user, target);
+    (args[0] as NumberHolder).value = this.getHitCount(user, target);
     return true;
   }
 
@@ -2226,8 +2353,8 @@ export class MultiHitAttr extends MoveAttr {
     switch (this.multiHitType) {
       case MultiHitType._2_TO_5:
       {
-        const rand = user.randSeedInt(20);
-        const hitValue = new Utils.NumberHolder(rand);
+        const rand = user.randBattleSeedInt(20);
+        const hitValue = new NumberHolder(rand);
         applyAbAttrs(MaxMultiHitAbAttr, user, null, false, hitValue);
         if (hitValue.value >= 13) {
           return 2;
@@ -2253,6 +2380,46 @@ export class MultiHitAttr extends MoveAttr {
         }, 0);
     }
   }
+
+  /**
+   * Calculate the expected number of hits given this attribute's {@linkcode MultiHitType},
+   * the move's accuracy, and a number of situational parameters.
+   *
+   * @param move - The move that this attribtue is applied to
+   * @param partySize - The size of the user's party, used for {@linkcode Moves.BEAT_UP | Beat Up} (default: `1`)
+   * @param maxMultiHit - Whether the move should always hit the maximum number of times, e.g. due to {@linkcode Abilities.SKILL_LINK | Skill Link} (default: `false`)
+   * @param ignoreAcc - `true` if the move should ignore accuracy checks, e.g. due to  {@linkcode Abilities.NO_GUARD | No Guard} (default: `false`)
+   */
+  calculateExpectedHitCount(move: Move, { ignoreAcc = false, maxMultiHit = false, partySize = 1 }: {ignoreAcc?: boolean, maxMultiHit?: boolean, partySize?: number} = {}): number {
+    let expectedHits: number;
+    switch (this.multiHitType) {
+      case MultiHitType._2_TO_5:
+        expectedHits = maxMultiHit ? 5 : 3.1;
+        break;
+      case MultiHitType._2:
+        expectedHits = 2;
+        break;
+      case MultiHitType._3:
+        expectedHits = 3;
+        break;
+      case MultiHitType._10:
+        expectedHits = 10;
+        break;
+      case MultiHitType.BEAT_UP:
+        // Estimate that half of the party can contribute to beat up.
+        expectedHits = Math.max(1, partySize / 2);
+        break;
+    }
+    if (ignoreAcc || move.accuracy === -1) {
+      return expectedHits;
+    }
+    const acc = move.accuracy / 100;
+    if (move.hasFlag(MoveFlags.CHECK_ALL_HITS) && !maxMultiHit) {
+      // N.B. No moves should be the _2_TO_5 variant and have the CHECK_ALL_HITS flag.
+      return acc * (1 - Math.pow(acc, expectedHits)) / (1 - acc);
+    }
+    return expectedHits *= acc;
+  }
 }
 
 export class ChangeMultiHitTypeAttr extends MoveAttr {
@@ -2265,7 +2432,7 @@ export class ChangeMultiHitTypeAttr extends MoveAttr {
 export class WaterShurikenMultiHitTypeAttr extends ChangeMultiHitTypeAttr {
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
     if (user.species.speciesId === Species.GRENINJA && user.hasAbility(Abilities.BATTLE_BOND) && user.formIndex === 2) {
-      (args[0] as Utils.IntegerHolder).value = MultiHitType._3;
+      (args[0] as NumberHolder).value = MultiHitType._3;
       return true;
     }
     return false;
@@ -2278,7 +2445,7 @@ export class StatusEffectAttr extends MoveEffectAttr {
   public overrideStatus: boolean = false;
 
   constructor(effect: StatusEffect, selfTarget?: boolean, turnsRemaining?: number, overrideStatus: boolean = false) {
-    super(selfTarget, { trigger: MoveEffectTrigger.HIT });
+    super(selfTarget);
 
     this.effect = effect;
     this.turnsRemaining = turnsRemaining;
@@ -2286,30 +2453,16 @@ export class StatusEffectAttr extends MoveEffectAttr {
   }
 
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
-    if (!this.selfTarget && move.hitsSubstitute(user, target)) {
-      return false;
-    }
-
     const moveChance = this.getMoveChance(user, target, move, this.selfTarget, true);
-    const statusCheck = moveChance < 0 || moveChance === 100 || user.randSeedInt(100) < moveChance;
+    const statusCheck = moveChance < 0 || moveChance === 100 || user.randBattleSeedInt(100) < moveChance;
+    const quiet = move.category !== MoveCategory.STATUS;
     if (statusCheck) {
       const pokemon = this.selfTarget ? user : target;
-      if (pokemon.status) {
-        if (this.overrideStatus) {
-          pokemon.resetStatus();
-        } else {
-          return false;
-        }
-      }
-
-      if (user !== target && target.isSafeguarded(user)) {
-        if (move.category === MoveCategory.STATUS) {
-          globalScene.queueMessage(i18next.t("moveTriggers:safeguard", { targetName: getPokemonNameWithAffix(target) }));
-        }
+      if (user !== target && move.category === MoveCategory.STATUS && !target.canSetStatus(this.effect, quiet, false, user, true)) {
         return false;
       }
-      if ((!pokemon.status || (pokemon.status.effect === this.effect && moveChance < 0))
-        && pokemon.trySetStatus(this.effect, true, user, this.turnsRemaining)) {
+      if (((!pokemon.status || this.overrideStatus) || (pokemon.status.effect === this.effect && moveChance < 0))
+        && pokemon.trySetStatus(this.effect, true, user, this.turnsRemaining, null, this.overrideStatus, quiet)) {
         applyPostAttackAbAttrs(ConfusionOnStatusEffectAbAttr, user, target, move, null, false, this.effect);
         return true;
       }
@@ -2335,7 +2488,7 @@ export class MultiStatusEffectAttr extends StatusEffectAttr {
   }
 
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
-    this.effect = Utils.randSeedItem(this.effects);
+    this.effect = randSeedItem(this.effects);
     const result = super.apply(user, target, move, args);
     return result;
   }
@@ -2351,7 +2504,7 @@ export class MultiStatusEffectAttr extends StatusEffectAttr {
 
 export class PsychoShiftEffectAttr extends MoveEffectAttr {
   constructor() {
-    super(false, { trigger: MoveEffectTrigger.HIT });
+    super(false);
   }
 
   /**
@@ -2381,45 +2534,40 @@ export class PsychoShiftEffectAttr extends MoveEffectAttr {
     return !target.status && target.canSetStatus(user.status?.effect, true, false, user) ? -10 : 0;
   }
 }
+
 /**
- * The following needs to be implemented for Thief
- * "If the user faints due to the target's Ability (Rough Skin or Iron Barbs) or held Rocky Helmet, it cannot remove the target's held item."
- * "If Knock Off causes a Pokémon with the Sticky Hold Ability to faint, it can now remove that Pokémon's held item."
+ * Attribute to steal items upon this move's use.
+ * Used for {@linkcode Moves.THIEF} and {@linkcode Moves.COVET}.
  */
 export class StealHeldItemChanceAttr extends MoveEffectAttr {
   private chance: number;
 
   constructor(chance: number) {
-    super(false, { trigger: MoveEffectTrigger.HIT });
+    super(false);
     this.chance = chance;
   }
 
-  apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): Promise<boolean> {
-    return new Promise<boolean>(resolve => {
-      if (move.hitsSubstitute(user, target)) {
-        return resolve(false);
-      }
-      const rand = Phaser.Math.RND.realInRange(0, 1);
-      if (rand >= this.chance) {
-        return resolve(false);
-      }
-      const heldItems = this.getTargetHeldItems(target).filter(i => i.isTransferable);
-      if (heldItems.length) {
-        const poolType = target.isPlayer() ? ModifierPoolType.PLAYER : target.hasTrainer() ? ModifierPoolType.TRAINER : ModifierPoolType.WILD;
-        const highestItemTier = heldItems.map(m => m.type.getOrInferTier(poolType)).reduce((highestTier, tier) => Math.max(tier!, highestTier), 0); // TODO: is the bang after tier correct?
-        const tierHeldItems = heldItems.filter(m => m.type.getOrInferTier(poolType) === highestItemTier);
-        const stolenItem = tierHeldItems[user.randSeedInt(tierHeldItems.length)];
-        globalScene.tryTransferHeldItemModifier(stolenItem, user, false).then(success => {
-          if (success) {
-            globalScene.queueMessage(i18next.t("moveTriggers:stoleItem", { pokemonName: getPokemonNameWithAffix(user), targetName: getPokemonNameWithAffix(target), itemName: stolenItem.type.name }));
-          }
-          resolve(success);
-        });
-        return;
-      }
+  apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
+    const rand = Phaser.Math.RND.realInRange(0, 1);
+    if (rand >= this.chance) {
+      return false;
+    }
 
-      resolve(false);
-    });
+    const heldItems = this.getTargetHeldItems(target).filter((i) => i.isTransferable);
+    if (!heldItems.length) {
+      return false;
+    }
+
+    const poolType = target.isPlayer() ? ModifierPoolType.PLAYER : target.hasTrainer() ? ModifierPoolType.TRAINER : ModifierPoolType.WILD;
+    const highestItemTier = heldItems.map((m) => m.type.getOrInferTier(poolType)).reduce((highestTier, tier) => Math.max(tier!, highestTier), 0); // TODO: is the bang after tier correct?
+    const tierHeldItems = heldItems.filter((m) => m.type.getOrInferTier(poolType) === highestItemTier);
+    const stolenItem = tierHeldItems[user.randBattleSeedInt(tierHeldItems.length)];
+    if (!globalScene.tryTransferHeldItemModifier(stolenItem, user, false)) {
+      return false;
+    }
+
+    globalScene.queueMessage(i18next.t("moveTriggers:stoleItem", { pokemonName: getPokemonNameWithAffix(user), targetName: getPokemonNameWithAffix(target), itemName: stolenItem.type.name }));
+    return true;
   }
 
   getTargetHeldItems(target: Pokemon): PokemonHeldItemModifier[] {
@@ -2443,62 +2591,62 @@ export class StealHeldItemChanceAttr extends MoveEffectAttr {
  * Used for Incinerate and Knock Off.
  * Not Implemented Cases: (Same applies for Thief)
  * "If the user faints due to the target's Ability (Rough Skin or Iron Barbs) or held Rocky Helmet, it cannot remove the target's held item."
- * "If Knock Off causes a Pokémon with the Sticky Hold Ability to faint, it can now remove that Pokémon's held item."
+ * "If the Pokémon is knocked out by the attack, Sticky Hold does not protect the held item.""
  */
 export class RemoveHeldItemAttr extends MoveEffectAttr {
 
-  /** Optional restriction for item pool to berries only i.e. Differentiating Incinerate and Knock Off */
+  /** Optional restriction for item pool to berries only; i.e. Incinerate */
   private berriesOnly: boolean;
 
-  constructor(berriesOnly: boolean) {
-    super(false, { trigger: MoveEffectTrigger.HIT });
+  constructor(berriesOnly: boolean = false) {
+    super(false);
     this.berriesOnly = berriesOnly;
   }
 
   /**
-   *
-   * @param user {@linkcode Pokemon} that used the move
-   * @param target Target {@linkcode Pokemon} that the moves applies to
-   * @param move {@linkcode Move} that is used
+   * Attempt to permanently remove a held
+   * @param user - The {@linkcode Pokemon} that used the move
+   * @param target - The {@linkcode Pokemon} targeted by the move
+   * @param move - N/A
    * @param args N/A
-   * @returns {boolean} True if an item was removed
+   * @returns `true` if an item was able to be removed
    */
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
     if (!this.berriesOnly && target.isPlayer()) { // "Wild Pokemon cannot knock off Player Pokemon's held items" (See Bulbapedia)
       return false;
     }
 
-    if (move.hitsSubstitute(user, target)) {
+    // Check for abilities that block item theft
+    // TODO: This should not trigger if the target would faint beforehand
+    const cancelled = new BooleanHolder(false);
+    applyAbAttrs(BlockItemTheftAbAttr, target, cancelled);
+
+    if (cancelled.value) {
       return false;
     }
 
-    const cancelled = new Utils.BooleanHolder(false);
-    applyAbAttrs(BlockItemTheftAbAttr, target, cancelled); // Check for abilities that block item theft
-
-    if (cancelled.value === true) {
-      return false;
-    }
-
-    // Considers entire transferrable item pool by default (Knock Off). Otherwise berries only if specified (Incinerate).
+    // Considers entire transferrable item pool by default (Knock Off).
+    // Otherwise only consider berries (Incinerate).
     let heldItems = this.getTargetHeldItems(target).filter(i => i.isTransferable);
 
     if (this.berriesOnly) {
       heldItems = heldItems.filter(m => m instanceof BerryModifier && m.pokemonId === target.id, target.isPlayer());
     }
 
-    if (heldItems.length) {
-      const removedItem = heldItems[user.randSeedInt(heldItems.length)];
+    if (!heldItems.length) {
+      return false;
+    }
 
-      // Decrease item amount and update icon
-      target.loseHeldItem(removedItem);
-      globalScene.updateModifiers(target.isPlayer());
+    const removedItem = heldItems[user.randBattleSeedInt(heldItems.length)];
 
+    // Decrease item amount and update icon
+    target.loseHeldItem(removedItem);
+    globalScene.updateModifiers(target.isPlayer());
 
-      if (this.berriesOnly) {
-        globalScene.queueMessage(i18next.t("moveTriggers:incineratedItem", { pokemonName: getPokemonNameWithAffix(user), targetName: getPokemonNameWithAffix(target), itemName: removedItem.type.name }));
-      } else {
-        globalScene.queueMessage(i18next.t("moveTriggers:knockedOffItem", { pokemonName: getPokemonNameWithAffix(user), targetName: getPokemonNameWithAffix(target), itemName: removedItem.type.name }));
-      }
+    if (this.berriesOnly) {
+      globalScene.queueMessage(i18next.t("moveTriggers:incineratedItem", { pokemonName: getPokemonNameWithAffix(user), targetName: getPokemonNameWithAffix(target), itemName: removedItem.type.name }));
+    } else {
+      globalScene.queueMessage(i18next.t("moveTriggers:knockedOffItem", { pokemonName: getPokemonNameWithAffix(user), targetName: getPokemonNameWithAffix(target), itemName: removedItem.type.name }));
     }
 
     return true;
@@ -2524,34 +2672,43 @@ export class RemoveHeldItemAttr extends MoveEffectAttr {
  * Attribute that causes targets of the move to eat a berry. Used for Teatime, Stuff Cheeks
  */
 export class EatBerryAttr extends MoveEffectAttr {
-  protected chosenBerry: BerryModifier | undefined;
-  constructor() {
-    super(true, { trigger: MoveEffectTrigger.HIT });
+  protected chosenBerry: BerryModifier;
+  constructor(selfTarget: boolean) {
+    super(selfTarget);
   }
+
   /**
    * Causes the target to eat a berry.
-   * @param user {@linkcode Pokemon} Pokemon that used the move
-   * @param target {@linkcode Pokemon} Pokemon that will eat a berry
-   * @param move {@linkcode Move} The move being used
+   * @param user The {@linkcode Pokemon} Pokemon that used the move
+   * @param target The {@linkcode Pokemon} Pokemon that will eat the berry
+   * @param move The {@linkcode Move} being used
    * @param args Unused
-   * @returns {boolean} true if the function succeeds
+   * @returns `true` if the function succeeds
    */
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
     if (!super.apply(user, target, move, args)) {
       return false;
     }
 
-    const heldBerries = this.getTargetHeldBerries(target);
+    const pokemon = this.selfTarget ? user : target;
+
+    const heldBerries = this.getTargetHeldBerries(pokemon);
     if (heldBerries.length <= 0) {
       return false;
     }
-    this.chosenBerry = heldBerries[user.randSeedInt(heldBerries.length)];
-    const preserve = new Utils.BooleanHolder(false);
-    globalScene.applyModifiers(PreserveBerryModifier, target.isPlayer(), target, preserve); // check for berry pouch preservation
+
+    // pick a random berry to gobble and check if we preserve it
+    this.chosenBerry = heldBerries[user.randBattleSeedInt(heldBerries.length)];
+    const preserve = new BooleanHolder(false);
+    // check for berry pouch preservation
+    globalScene.applyModifiers(PreserveBerryModifier, pokemon.isPlayer(), pokemon, preserve);
     if (!preserve.value) {
-      this.reduceBerryModifier(target);
+      this.reduceBerryModifier(pokemon);
     }
-    this.eatBerry(target);
+
+    // Don't update harvest for berries preserved via Berry pouch (no item dupes lol)
+    this.eatBerry(target, undefined, !preserve.value);
+
     return true;
   }
 
@@ -2567,49 +2724,64 @@ export class EatBerryAttr extends MoveEffectAttr {
     globalScene.updateModifiers(target.isPlayer());
   }
 
-  eatBerry(consumer: Pokemon, berryOwner?: Pokemon) {
-    getBerryEffectFunc(this.chosenBerry!.berryType)(consumer, berryOwner); // consumer eats the berry
-    applyAbAttrs(HealFromBerryUseAbAttr, consumer, new Utils.BooleanHolder(false));
+
+  /**
+   * Internal function to apply berry effects.
+   *
+   * @param consumer - The {@linkcode Pokemon} eating the berry; assumed to also be owner if `berryOwner` is omitted
+   * @param berryOwner - The {@linkcode Pokemon} whose berry is being eaten; defaults to `consumer` if not specified.
+   * @param updateHarvest - Whether to prevent harvest from tracking berries;
+   * defaults to whether `consumer` equals `berryOwner` (i.e. consuming own berry).
+   */
+   protected eatBerry(consumer: Pokemon, berryOwner: Pokemon = consumer, updateHarvest = consumer === berryOwner) {
+     // consumer eats berry, owner triggers unburden and similar effects
+    getBerryEffectFunc(this.chosenBerry.berryType)(consumer);
+    applyPostItemLostAbAttrs(PostItemLostAbAttr, berryOwner, false);
+    applyAbAttrs(HealFromBerryUseAbAttr, consumer, new BooleanHolder(false));
+    consumer.recordEatenBerry(this.chosenBerry.berryType, updateHarvest);
   }
 }
 
 /**
- *  Attribute used for moves that steal a random berry from the target. The user then eats the stolen berry.
- *  Used for Pluck & Bug Bite.
+ * Attribute used for moves that steal and eat a random berry from the target.
+ * Used for {@linkcode Moves.PLUCK} & {@linkcode Moves.BUG_BITE}.
  */
 export class StealEatBerryAttr extends EatBerryAttr {
   constructor() {
-    super();
+    super(false);
   }
+
   /**
    * User steals a random berry from the target and then eats it.
-   * @param {Pokemon} user Pokemon that used the move and will eat the stolen berry
-   * @param {Pokemon} target Pokemon that will have its berry stolen
-   * @param {Move} move Move being used
-   * @param {any[]} args Unused
-   * @returns {boolean} true if the function succeeds
+   * @param user - The {@linkcode Pokemon} using the move; will eat the stolen berry
+   * @param target - The {@linkcode Pokemon} having its berry stolen
+   * @param move - The {@linkcode Move} being used
+   * @param args N/A
+   * @returns `true` if the function succeeds
    */
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
-    if (move.hitsSubstitute(user, target)) {
-      return false;
-    }
-    const cancelled = new Utils.BooleanHolder(false);
-    applyAbAttrs(BlockItemTheftAbAttr, target, cancelled); // check for abilities that block item theft
+    // check for abilities that block item theft
+    const cancelled = new BooleanHolder(false);
+    applyAbAttrs(BlockItemTheftAbAttr, target, cancelled);
     if (cancelled.value === true) {
       return false;
     }
 
+    // check if the target even _has_ a berry in the first place
+    // TODO: Check on cart if Pluck displays messages when used against sticky hold mons w/o berries
     const heldBerries = this.getTargetHeldBerries(target);
     if (heldBerries.length <= 0) {
       return false;
     }
-    // if the target has berries, pick a random berry and steal it
-    this.chosenBerry = heldBerries[user.randSeedInt(heldBerries.length)];
+
+    // pick a random berry and eat it
+    this.chosenBerry = heldBerries[user.randBattleSeedInt(heldBerries.length)];
     applyPostItemLostAbAttrs(PostItemLostAbAttr, target, false);
     const message = i18next.t("battle:stealEatBerry", { pokemonName: user.name, targetName: target.name, berryName: this.chosenBerry.type.name });
     globalScene.queueMessage(message);
     this.reduceBerryModifier(target);
     this.eatBerry(user, target);
+
     return true;
   }
 }
@@ -2643,10 +2815,6 @@ export class HealStatusEffectAttr extends MoveEffectAttr {
       return false;
     }
 
-    if (!this.selfTarget && move.hitsSubstitute(user, target)) {
-      return false;
-    }
-
     // Special edge case for shield dust blocking Sparkling Aria curing burn
     const moveTargets = getMoveTargets(user, move.id);
     if (target.hasAbilityWithAttr(IgnoreMoveEffectsAbAttr) && move.id === Moves.SPARKLING_ARIA && moveTargets.targets.length === 1) {
@@ -2706,11 +2874,11 @@ export class BypassBurnDamageReductionAttr extends MoveAttr {
    * @param user N/A
    * @param target N/A
    * @param move {@linkcode Move} with this attribute
-   * @param args [0] {@linkcode Utils.BooleanHolder} for burnDamageReductionCancelled
+   * @param args [0] {@linkcode BooleanHolder} for burnDamageReductionCancelled
    * @returns true if the function succeeds
    */
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
-    (args[0] as Utils.BooleanHolder).value = true;
+    (args[0] as BooleanHolder).value = true;
 
     return true;
   }
@@ -2726,7 +2894,7 @@ export class WeatherChangeAttr extends MoveEffectAttr {
   }
 
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
-    return globalScene.arena.trySetWeather(this.weatherType, true);
+    return globalScene.arena.trySetWeather(this.weatherType, user);
   }
 
   getCondition(): MoveConditionFunc {
@@ -2745,7 +2913,7 @@ export class ClearWeatherAttr extends MoveEffectAttr {
 
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
     if (globalScene.arena.weather?.weatherType === this.weatherType) {
-      return globalScene.arena.trySetWeather(WeatherType.NONE, true);
+      return globalScene.arena.trySetWeather(WeatherType.NONE, user);
     }
 
     return false;
@@ -2762,7 +2930,7 @@ export class TerrainChangeAttr extends MoveEffectAttr {
   }
 
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
-    return globalScene.arena.trySetTerrain(this.terrainType, true, true);
+    return globalScene.arena.trySetTerrain(this.terrainType, true, user);
   }
 
   getCondition(): MoveConditionFunc {
@@ -2781,7 +2949,7 @@ export class ClearTerrainAttr extends MoveEffectAttr {
   }
 
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
-    return globalScene.arena.trySetTerrain(TerrainType.NONE, true, true);
+    return globalScene.arena.trySetTerrain(TerrainType.NONE, true, user);
   }
 }
 
@@ -2791,14 +2959,14 @@ export class OneHitKOAttr extends MoveAttr {
       return false;
     }
 
-    (args[0] as Utils.BooleanHolder).value = true;
+    (args[0] as BooleanHolder).value = true;
 
     return true;
   }
 
   getCondition(): MoveConditionFunc {
     return (user, target, move) => {
-      const cancelled = new Utils.BooleanHolder(false);
+      const cancelled = new BooleanHolder(false);
       applyAbAttrs(BlockOneHitKOAbAttr, target, cancelled);
       return !cancelled.value && user.level >= target.level;
     };
@@ -2825,12 +2993,12 @@ export class InstantChargeAttr extends MoveAttr {
    * @param target n/a
    * @param move the {@linkcode Move} associated with this attribute
    * @param args
-   *  - `[0]` a {@linkcode Utils.BooleanHolder | BooleanHolder} for the "instant charge" flag
+   *  - `[0]` a {@linkcode BooleanHolder | BooleanHolder} for the "instant charge" flag
    * @returns `true` if the instant charge condition is met; `false` otherwise.
    */
   override apply(user: Pokemon, target: Pokemon | null, move: Move, args: any[]): boolean {
     const instantCharge = args[0];
-    if (!(instantCharge instanceof Utils.BooleanHolder)) {
+    if (!(instantCharge instanceof BooleanHolder)) {
       return false;
     }
 
@@ -2852,7 +3020,7 @@ export class WeatherInstantChargeAttr extends InstantChargeAttr {
     super((user, move) => {
       const currentWeather = globalScene.arena.weather;
 
-      if (Utils.isNullOrUndefined(currentWeather?.weatherType)) {
+      if (isNullOrUndefined(currentWeather?.weatherType)) {
         return false;
       } else {
         return !currentWeather?.isEffectSuppressed()
@@ -2863,9 +3031,7 @@ export class WeatherInstantChargeAttr extends InstantChargeAttr {
 }
 
 export class OverrideMoveEffectAttr extends MoveAttr {
-  apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean | Promise<boolean> {
-    //const overridden = args[0] as Utils.BooleanHolder;
-    //const virtual = arg[1] as boolean;
+  apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
     return true;
   }
 }
@@ -2891,26 +3057,27 @@ export class DelayedAttackAttr extends OverrideMoveEffectAttr {
     this.chargeText = chargeText;
   }
 
-  apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): Promise<boolean> {
+  apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
     // Edge case for the move applied on a pokemon that has fainted
     if (!target) {
-      return Promise.resolve(true);
+      return true;
     }
-    const side = target.isPlayer() ? ArenaTagSide.PLAYER : ArenaTagSide.ENEMY;
-    return new Promise(resolve => {
-      if (args.length < 2 || !args[1]) {
-        new MoveChargeAnim(this.chargeAnim, move.id, user).play(false, () => {
-          (args[0] as Utils.BooleanHolder).value = true;
-          globalScene.queueMessage(this.chargeText.replace("{TARGET}", getPokemonNameWithAffix(target)).replace("{USER}", getPokemonNameWithAffix(user)));
-          user.pushMoveHistory({ move: move.id, targets: [ target.getBattlerIndex() ], result: MoveResult.OTHER });
-          globalScene.arena.addTag(this.tagType, 3, move.id, user.id, side, false, target.getBattlerIndex());
 
-          resolve(true);
-        });
-      } else {
-        globalScene.ui.showText(i18next.t("moveTriggers:tookMoveAttack", { pokemonName: getPokemonNameWithAffix(globalScene.getPokemonById(target.id) ?? undefined), moveName: move.name }), null, () => resolve(true));
-      }
-    });
+    const overridden = args[0] as BooleanHolder;
+    const virtual = args[1] as boolean;
+
+    if (!virtual) {
+      overridden.value = true;
+      globalScene.unshiftPhase(new MoveAnimPhase(new MoveChargeAnim(this.chargeAnim, move.id, user)));
+      globalScene.queueMessage(this.chargeText.replace("{TARGET}", getPokemonNameWithAffix(target)).replace("{USER}", getPokemonNameWithAffix(user)));
+      user.pushMoveHistory({ move: move.id, targets: [ target.getBattlerIndex() ], result: MoveResult.OTHER });
+      const side = target.isPlayer() ? ArenaTagSide.PLAYER : ArenaTagSide.ENEMY;
+      globalScene.arena.addTag(this.tagType, 3, move.id, user.id, side, false, target.getBattlerIndex());
+    } else {
+      globalScene.queueMessage(i18next.t("moveTriggers:tookMoveAttack", { pokemonName: getPokemonNameWithAffix(globalScene.getPokemonById(target.id) ?? undefined), moveName: move.name }));
+    }
+
+    return true;
   }
 }
 
@@ -2930,7 +3097,7 @@ export class AwaitCombinedPledgeAttr extends OverrideMoveEffectAttr {
    * @param target n/a
    * @param move the {@linkcode Move} being used
    * @param args
-   * - [0] a {@linkcode Utils.BooleanHolder} indicating whether the move's base
+   * - [0] a {@linkcode BooleanHolder} indicating whether the move's base
    * effects should be overridden this turn.
    * @returns `true` if base move effects were overridden; `false` otherwise
    */
@@ -2941,7 +3108,7 @@ export class AwaitCombinedPledgeAttr extends OverrideMoveEffectAttr {
       return false;
     }
 
-    const overridden = args[0] as Utils.BooleanHolder;
+    const overridden = args[0] as BooleanHolder;
 
     const allyMovePhase = globalScene.findPhase<MovePhase>((phase) => phase instanceof MovePhase && phase.pokemon.isPlayer() === user.isPlayer());
     if (allyMovePhase) {
@@ -3025,14 +3192,6 @@ export class StatStageChangeAttr extends MoveEffectAttr {
     return this.options?.showMessage ?? true;
   }
 
-  /**
-   * Indicates when the stat change should trigger
-   * @default MoveEffectTrigger.HIT
-   */
-  public override get trigger () {
-    return this.options?.trigger ?? MoveEffectTrigger.HIT;
-  }
-
   /**
    * Attempts to change stats of the user or target (depending on value of selfTarget) if conditions are met
    * @param user {@linkcode Pokemon} the user of the move
@@ -3041,17 +3200,13 @@ export class StatStageChangeAttr extends MoveEffectAttr {
    * @param args unused
    * @returns whether stat stages were changed
    */
-  apply(user: Pokemon, target: Pokemon, move: Move, args?: any[]): boolean | Promise<boolean> {
+  apply(user: Pokemon, target: Pokemon, move: Move, args?: any[]): boolean {
     if (!super.apply(user, target, move, args) || (this.condition && !this.condition(user, target, move))) {
       return false;
     }
 
-    if (!this.selfTarget && move.hitsSubstitute(user, target)) {
-      return false;
-    }
-
     const moveChance = this.getMoveChance(user, target, move, this.selfTarget, true);
-    if (moveChance < 0 || moveChance === 100 || user.randSeedInt(100) < moveChance) {
+    if (moveChance < 0 || moveChance === 100 || user.randBattleSeedInt(100) < moveChance) {
       const stages = this.getLevels(user);
       globalScene.unshiftPhase(new StatStageChangePhase((this.selfTarget ? user : target).getBattlerIndex(), this.selfTarget, this.stats, stages, this.showMessage));
       return true;
@@ -3119,7 +3274,7 @@ export class SecretPowerAttr extends MoveEffectAttr {
    * Used to apply the secondary effect to the target Pokemon
    * @returns `true` if a secondary effect is successfully applied
    */
-  override apply(user: Pokemon, target: Pokemon, move: Move, args?: any[]): boolean | Promise<boolean> {
+  override apply(user: Pokemon, target: Pokemon, move: Move, args?: any[]): boolean {
     if (!super.apply(user, target, move, args)) {
       return false;
     }
@@ -3250,14 +3405,14 @@ export class SecretPowerAttr extends MoveEffectAttr {
 export class PostVictoryStatStageChangeAttr extends MoveAttr {
   private stats: BattleStat[];
   private stages: number;
-  private condition: MoveConditionFunc | null;
+  private condition?: MoveConditionFunc;
   private showMessage: boolean;
 
   constructor(stats: BattleStat[], stages: number, selfTarget?: boolean, condition?: MoveConditionFunc, showMessage: boolean = true, firstHitOnly: boolean = false) {
     super();
     this.stats = stats;
     this.stages = stages;
-    this.condition = condition!; // TODO: is this bang correct?
+    this.condition = condition;
     this.showMessage = showMessage;
   }
   applyPostVictory(user: Pokemon, target: Pokemon, move: Move): void {
@@ -3274,10 +3429,10 @@ export class AcupressureStatStageChangeAttr extends MoveEffectAttr {
     super();
   }
 
-  apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean | Promise<boolean> {
-    const randStats = BATTLE_STATS.filter(s => target.getStatStage(s) < 6);
+  override apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
+    const randStats = BATTLE_STATS.filter((s) => target.getStatStage(s) < 6);
     if (randStats.length > 0) {
-      const boostStat = [ randStats[user.randSeedInt(randStats.length)] ];
+      const boostStat = [ randStats[user.randBattleSeedInt(randStats.length)] ];
       globalScene.unshiftPhase(new StatStageChangePhase(target.getBattlerIndex(), this.selfTarget, boostStat, 2));
       return true;
     }
@@ -3311,18 +3466,14 @@ export class CutHpStatStageBoostAttr extends StatStageChangeAttr {
     this.cutRatio = cutRatio;
     this.messageCallback = messageCallback;
   }
-
-  apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): Promise<boolean> {
-    return new Promise<boolean>(resolve => {
-      user.damageAndUpdate(Utils.toDmgValue(user.getMaxHp() / this.cutRatio), HitResult.OTHER, false, true);
-      user.updateInfo().then(() => {
-        const ret = super.apply(user, target, move, args);
-        if (this.messageCallback) {
-          this.messageCallback(user);
-        }
-        resolve(ret);
-      });
-    });
+  override apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
+    user.damageAndUpdate(toDmgValue(user.getMaxHp() / this.cutRatio), { result: HitResult.INDIRECT });
+    user.updateInfo();
+    const ret = super.apply(user, target, move, args);
+    if (this.messageCallback) {
+      this.messageCallback(user);
+    }
+    return ret;
   }
 
   getCondition(): MoveConditionFunc {
@@ -3338,7 +3489,7 @@ export class CutHpStatStageBoostAttr extends StatStageChangeAttr {
  */
 export class OrderUpStatBoostAttr extends MoveEffectAttr {
   constructor() {
-    super(true, { trigger: MoveEffectTrigger.HIT });
+    super(true);
   }
 
   override apply(user: Pokemon, target: Pokemon, move: Move, args?: any[]): boolean {
@@ -3414,28 +3565,25 @@ export class ResetStatsAttr extends MoveEffectAttr {
     super();
     this.targetAllPokemon = targetAllPokemon;
   }
-  async apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): Promise<boolean> {
-    const promises: Promise<void>[] = [];
-    if (this.targetAllPokemon) { // Target all pokemon on the field when Freezy Frost or Haze are used
+
+  override apply(_user: Pokemon, target: Pokemon, _move: Move, _args: any[]): boolean {
+    if (this.targetAllPokemon) {
+      // Target all pokemon on the field when Freezy Frost or Haze are used
       const activePokemon = globalScene.getField(true);
-      activePokemon.forEach(p => promises.push(this.resetStats(p)));
+      activePokemon.forEach((p) => this.resetStats(p));
       globalScene.queueMessage(i18next.t("moveTriggers:statEliminated"));
     } else { // Affects only the single target when Clear Smog is used
-      if (!move.hitsSubstitute(user, target)) {
-        promises.push(this.resetStats(target));
-        globalScene.queueMessage(i18next.t("moveTriggers:resetStats", { pokemonName: getPokemonNameWithAffix(target) }));
-      }
+      this.resetStats(target);
+      globalScene.queueMessage(i18next.t("moveTriggers:resetStats", { pokemonName: getPokemonNameWithAffix(target) }));
     }
-
-    await Promise.all(promises);
     return true;
   }
 
-  async resetStats(pokemon: Pokemon): Promise<void> {
+  private resetStats(pokemon: Pokemon): void {
     for (const s of BATTLE_STATS) {
       pokemon.setStatStage(s, 0);
     }
-    return pokemon.updateInfo();
+    pokemon.updateInfo();
   }
 }
 
@@ -3491,43 +3639,28 @@ export class SwapStatStagesAttr extends MoveEffectAttr {
 }
 
 export class HpSplitAttr extends MoveEffectAttr {
-  apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): Promise<boolean> {
-    return new Promise(resolve => {
-      if (!super.apply(user, target, move, args)) {
-        return resolve(false);
-      }
+  apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
+    if (!super.apply(user, target, move, args)) {
+      return false;
+    }
 
-      const infoUpdates: Promise<void>[] = [];
-
-      const hpValue = Math.floor((target.hp + user.hp) / 2);
-      if (user.hp < hpValue) {
-        const healing = user.heal(hpValue - user.hp);
+    const hpValue = Math.floor((target.hp + user.hp) / 2);
+    [ user, target ].forEach((p) => {
+      if (p.hp < hpValue) {
+        const healing = p.heal(hpValue - p.hp);
         if (healing) {
-          globalScene.damageNumberHandler.add(user, healing, HitResult.HEAL);
+          globalScene.damageNumberHandler.add(p, healing, HitResult.HEAL);
         }
-      } else if (user.hp > hpValue) {
-        const damage = user.damage(user.hp - hpValue, true);
+      } else if (p.hp > hpValue) {
+        const damage = p.damage(p.hp - hpValue, true);
         if (damage) {
-          globalScene.damageNumberHandler.add(user, damage);
+          globalScene.damageNumberHandler.add(p, damage);
         }
       }
-      infoUpdates.push(user.updateInfo());
-
-      if (target.hp < hpValue) {
-        const healing = target.heal(hpValue - target.hp);
-        if (healing) {
-          globalScene.damageNumberHandler.add(user, healing, HitResult.HEAL);
-        }
-      } else if (target.hp > hpValue) {
-        const damage = target.damage(target.hp - hpValue, true);
-        if (damage) {
-          globalScene.damageNumberHandler.add(target, damage);
-        }
-      }
-      infoUpdates.push(target.updateInfo());
-
-      return Promise.all(infoUpdates).then(() => resolve(true));
+      p.updateInfo();
     });
+
+    return true;
   }
 }
 
@@ -3544,12 +3677,12 @@ export class LessPPMorePowerAttr extends VariablePowerAttr {
    * @param user {@linkcode Pokemon} using this move
    * @param target {@linkcode Pokemon} target of this move
    * @param move {@linkcode Move} being used
-   * @param args [0] {@linkcode Utils.NumberHolder} of power
+   * @param args [0] {@linkcode NumberHolder} of power
    * @returns true if the function succeeds
    */
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
     const ppMax = move.pp;
-    const ppUsed = user.moveset.find((m) => m?.moveId === move.id)?.ppUsed!; // TODO: is the bang correct?
+    const ppUsed = user.moveset.find((m) => m.moveId === move.id)?.ppUsed ?? 0;
 
     let ppRemains = ppMax - ppUsed;
     /** Reduce to 0 to avoid negative numbers if user has 1PP before attack and target has Ability.PRESSURE */
@@ -3557,7 +3690,7 @@ export class LessPPMorePowerAttr extends VariablePowerAttr {
       ppRemains = 0;
     }
 
-    const power = args[0] as Utils.NumberHolder;
+    const power = args[0] as NumberHolder;
 
     switch (ppRemains) {
       case 0:
@@ -3590,7 +3723,7 @@ export class MovePowerMultiplierAttr extends VariablePowerAttr {
   }
 
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
-    const power = args[0] as Utils.NumberHolder;
+    const power = args[0] as NumberHolder;
     power.value *= this.powerMultiplierFunc(user, target, move);
 
     return true;
@@ -3630,7 +3763,7 @@ export class BeatUpAttr extends VariablePowerAttr {
    * @returns true if the function succeeds
    */
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
-    const power = args[0] as Utils.NumberHolder;
+    const power = args[0] as NumberHolder;
 
     const party = user.isPlayer() ? globalScene.getPlayerParty() : globalScene.getEnemyParty();
     const allyCount = party.filter(pokemon => {
@@ -3645,7 +3778,7 @@ export class BeatUpAttr extends VariablePowerAttr {
 const doublePowerChanceMessageFunc = (user: Pokemon, target: Pokemon, move: Move) => {
   let message: string = "";
   globalScene.executeWithSeedOffset(() => {
-    const rand = Utils.randSeedInt(100);
+    const rand = randSeedInt(100);
     if (rand < move.chance) {
       message = i18next.t("moveTriggers:goingAllOutForAttack", { pokemonName: getPokemonNameWithAffix(user) });
     }
@@ -3656,9 +3789,9 @@ const doublePowerChanceMessageFunc = (user: Pokemon, target: Pokemon, move: Move
 export class DoublePowerChanceAttr extends VariablePowerAttr {
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
     let rand: number;
-    globalScene.executeWithSeedOffset(() => rand = Utils.randSeedInt(100), globalScene.currentBattle.turn << 6, globalScene.waveSeed);
+    globalScene.executeWithSeedOffset(() => rand = randSeedInt(100), globalScene.currentBattle.turn << 6, globalScene.waveSeed);
     if (rand! < move.chance) {
-      const power = args[0] as Utils.NumberHolder;
+      const power = args[0] as NumberHolder;
       power.value *= 2;
       return true;
     }
@@ -3675,7 +3808,13 @@ export abstract class ConsecutiveUsePowerMultiplierAttr extends MovePowerMultipl
       let count = 0;
       let turnMove: TurnMove | undefined;
 
-      while (((turnMove = moveHistory.shift())?.move === move.id || (comboMoves.length && comboMoves.includes(turnMove?.move!))) && (!resetOnFail || turnMove?.result === MoveResult.SUCCESS)) { // TODO: is this bang correct?
+      while (
+        (
+          (turnMove = moveHistory.shift())?.move === move.id
+          || (comboMoves.length && comboMoves.includes(turnMove?.move ?? Moves.NONE))
+        )
+        && (!resetOnFail || turnMove?.result === MoveResult.SUCCESS)
+      ) {
         if (count < (limit - 1)) {
           count++;
         } else if (resetOnLimit) {
@@ -3706,7 +3845,7 @@ export class ConsecutiveUseMultiBasePowerAttr extends ConsecutiveUsePowerMultipl
 
 export class WeightPowerAttr extends VariablePowerAttr {
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
-    const power = args[0] as Utils.NumberHolder;
+    const power = args[0] as NumberHolder;
 
     const targetWeight = target.getWeight();
     const weightThresholds = [ 10, 25, 50, 100, 200 ];
@@ -3740,7 +3879,7 @@ export class ElectroBallPowerAttr extends VariablePowerAttr {
    * @returns true if the function succeeds
    */
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
-    const power = args[0] as Utils.NumberHolder;
+    const power = args[0] as NumberHolder;
 
     const statRatio = target.getEffectiveStat(Stat.SPD) / user.getEffectiveStat(Stat.SPD);
     const statThresholds = [ 0.25, 1 / 3, 0.5, 1, -1 ];
@@ -3775,7 +3914,7 @@ export class GyroBallPowerAttr extends VariablePowerAttr {
    * @returns true if the function succeeds
    */
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
-    const power = args[0] as Utils.NumberHolder;
+    const power = args[0] as NumberHolder;
     const userSpeed = user.getEffectiveStat(Stat.SPD);
     if (userSpeed < 1) {
       // Gen 6+ always have 1 base power
@@ -3790,7 +3929,7 @@ export class GyroBallPowerAttr extends VariablePowerAttr {
 
 export class LowHpPowerAttr extends VariablePowerAttr {
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
-    const power = args[0] as Utils.NumberHolder;
+    const power = args[0] as NumberHolder;
     const hpRatio = user.getHpRatio();
 
     switch (true) {
@@ -3820,7 +3959,7 @@ export class LowHpPowerAttr extends VariablePowerAttr {
 
 export class CompareWeightPowerAttr extends VariablePowerAttr {
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
-    const power = args[0] as Utils.NumberHolder;
+    const power = args[0] as NumberHolder;
     const userWeight = user.getWeight();
     const targetWeight = target.getWeight();
 
@@ -3854,7 +3993,7 @@ export class CompareWeightPowerAttr extends VariablePowerAttr {
 
 export class HpPowerAttr extends VariablePowerAttr {
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
-    (args[0] as Utils.NumberHolder).value = Utils.toDmgValue(150 * user.getHpRatio());
+    (args[0] as NumberHolder).value = toDmgValue(150 * user.getHpRatio());
 
     return true;
   }
@@ -3882,7 +4021,7 @@ export class OpponentHighHpPowerAttr extends VariablePowerAttr {
    * @returns true
    */
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
-    (args[0] as Utils.NumberHolder).value = Utils.toDmgValue(this.maxBasePower * target.getHpRatio());
+    (args[0] as NumberHolder).value = toDmgValue(this.maxBasePower * target.getHpRatio());
 
     return true;
   }
@@ -3892,7 +4031,7 @@ export class FirstAttackDoublePowerAttr extends VariablePowerAttr {
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
     console.log(target.getLastXMoves(1), globalScene.currentBattle.turn);
     if (!target.getLastXMoves(1).find(m => m.turn === globalScene.currentBattle.turn)) {
-      (args[0] as Utils.NumberHolder).value *= 2;
+      (args[0] as NumberHolder).value *= 2;
       return true;
     }
 
@@ -3904,7 +4043,7 @@ export class FirstAttackDoublePowerAttr extends VariablePowerAttr {
 export class TurnDamagedDoublePowerAttr extends VariablePowerAttr {
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
     if (user.turnData.attacksReceived.find(r => r.damage && r.sourceId === target.id)) {
-      (args[0] as Utils.NumberHolder).value *= 2;
+      (args[0] as NumberHolder).value *= 2;
       return true;
     }
 
@@ -3917,7 +4056,7 @@ const magnitudeMessageFunc = (user: Pokemon, target: Pokemon, move: Move) => {
   globalScene.executeWithSeedOffset(() => {
     const magnitudeThresholds = [ 5, 15, 35, 65, 75, 95 ];
 
-    const rand = Utils.randSeedInt(100);
+    const rand = randSeedInt(100);
 
     let m = 0;
     for (; m < magnitudeThresholds.length; m++) {
@@ -3933,14 +4072,14 @@ const magnitudeMessageFunc = (user: Pokemon, target: Pokemon, move: Move) => {
 
 export class MagnitudePowerAttr extends VariablePowerAttr {
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
-    const power = args[0] as Utils.NumberHolder;
+    const power = args[0] as NumberHolder;
 
     const magnitudeThresholds = [ 5, 15, 35, 65, 75, 95 ];
     const magnitudePowers = [ 10, 30, 50, 70, 90, 100, 110, 150 ];
 
     let rand: number;
 
-    globalScene.executeWithSeedOffset(() => rand = Utils.randSeedInt(100), globalScene.currentBattle.turn << 6, globalScene.waveSeed);
+    globalScene.executeWithSeedOffset(() => rand = randSeedInt(100), globalScene.currentBattle.turn << 6, globalScene.waveSeed);
 
     let m = 0;
     for (; m < magnitudeThresholds.length; m++) {
@@ -3958,7 +4097,7 @@ export class MagnitudePowerAttr extends VariablePowerAttr {
 export class AntiSunlightPowerDecreaseAttr extends VariablePowerAttr {
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
     if (!globalScene.arena.weather?.isEffectSuppressed()) {
-      const power = args[0] as Utils.NumberHolder;
+      const power = args[0] as NumberHolder;
       const weatherType = globalScene.arena.weather?.weatherType || WeatherType.NONE;
       switch (weatherType) {
         case WeatherType.RAIN:
@@ -3985,7 +4124,7 @@ export class FriendshipPowerAttr extends VariablePowerAttr {
   }
 
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
-    const power = args[0] as Utils.NumberHolder;
+    const power = args[0] as NumberHolder;
 
     const friendshipPower = Math.floor(Math.min(user instanceof PlayerPokemon ? user.friendship : user.species.baseFriendship, 255) / 2.5);
     power.value = Math.max(!this.invert ? friendshipPower : 102 - friendshipPower, 1);
@@ -3996,30 +4135,23 @@ export class FriendshipPowerAttr extends VariablePowerAttr {
 
 /**
  * This Attribute calculates the current power of {@linkcode Moves.RAGE_FIST}.
- * The counter for power calculation does not reset on every wave but on every new arena encounter
+ * The counter for power calculation does not reset on every wave but on every new arena encounter.
+ * Self-inflicted confusion damage and hits taken by a Subsitute are ignored.
  */
 export class RageFistPowerAttr extends VariablePowerAttr {
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
-    const { hitCount, prevHitCount } = user.battleData;
-    const basePower: Utils.NumberHolder = args[0];
-
-    this.updateHitReceivedCount(user, hitCount, prevHitCount);
-
-    basePower.value = 50 + (Math.min(user.customPokemonData.hitsRecCount, 6) * 50);
+    /* Reasons this works correctly:
+     * Confusion calls user.damageAndUpdate() directly (no counter increment),
+     * Substitute hits call user.damageAndUpdate() with a damage value of 0, also causing
+      no counter increment
+    */
+    const hitCount = user.battleData.hitCount;
+    const basePower: NumberHolder = args[0];
 
+    basePower.value = 50 * (1 + Math.min(hitCount, 6));
     return true;
   }
 
-  /**
-   * Updates the number of hits the Pokemon has taken in battle
-   * @param user Pokemon calling Rage Fist
-   * @param hitCount The number of received hits this battle
-   * @param previousHitCount The number of received hits this battle since last time Rage Fist was used
-   */
-  protected updateHitReceivedCount(user: Pokemon, hitCount: number, previousHitCount: number): void {
-    user.customPokemonData.hitsRecCount += (hitCount - previousHitCount);
-    user.battleData.prevHitCount = hitCount;
-  }
 }
 
 /**
@@ -4046,7 +4178,7 @@ export class PositiveStatStagePowerAttr extends VariablePowerAttr {
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
     const positiveStatStages: number = countPositiveStatStages(user);
 
-    (args[0] as Utils.NumberHolder).value += positiveStatStages * 20;
+    (args[0] as NumberHolder).value += positiveStatStages * 20;
     return true;
   }
 }
@@ -4069,7 +4201,7 @@ export class PunishmentPowerAttr extends VariablePowerAttr {
      */
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
     const positiveStatStages: number = countPositiveStatStages(target);
-    (args[0] as Utils.NumberHolder).value = Math.min(
+    (args[0] as NumberHolder).value = Math.min(
       this.PUNISHMENT_MAX_BASE_POWER,
       this.PUNISHMENT_MIN_BASE_POWER + positiveStatStages * 20
     );
@@ -4085,18 +4217,19 @@ export class PresentPowerAttr extends VariablePowerAttr {
      */
     const firstHit = (user.turnData.hitCount === user.turnData.hitsLeft);
 
-    const powerSeed = Utils.randSeedInt(firstHit ? 100 : 80);
+    const powerSeed = randSeedInt(firstHit ? 100 : 80);
     if (powerSeed <= 40) {
-      (args[0] as Utils.NumberHolder).value = 40;
+      (args[0] as NumberHolder).value = 40;
     } else if (40 < powerSeed && powerSeed <= 70) {
-      (args[0] as Utils.NumberHolder).value = 80;
+      (args[0] as NumberHolder).value = 80;
     } else if (70 < powerSeed && powerSeed <= 80) {
-      (args[0] as Utils.NumberHolder).value = 120;
+      (args[0] as NumberHolder).value = 120;
     } else if (80 < powerSeed && powerSeed <= 100) {
       // If this move is multi-hit, disable all other hits
-      user.stopMultiHit();
+      user.turnData.hitCount = 1;
+      user.turnData.hitsLeft = 1;
       globalScene.unshiftPhase(new PokemonHealPhase(target.getBattlerIndex(),
-        Utils.toDmgValue(target.getMaxHp() / 4), i18next.t("moveTriggers:regainedHealth", { pokemonName: getPokemonNameWithAffix(target) }), true));
+        toDmgValue(target.getMaxHp() / 4), i18next.t("moveTriggers:regainedHealth", { pokemonName: getPokemonNameWithAffix(target) }), true));
     }
 
     return true;
@@ -4106,7 +4239,7 @@ export class PresentPowerAttr extends VariablePowerAttr {
 export class WaterShurikenPowerAttr extends VariablePowerAttr {
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
     if (user.species.speciesId === Species.GRENINJA && user.hasAbility(Abilities.BATTLE_BOND) && user.formIndex === 2) {
-      (args[0] as Utils.IntegerHolder).value = 20;
+      (args[0] as NumberHolder).value = 20;
       return true;
     }
     return false;
@@ -4128,7 +4261,7 @@ export class SpitUpPowerAttr extends VariablePowerAttr {
     const stockpilingTag = user.getTag(StockpilingTag);
 
     if (stockpilingTag && stockpilingTag.stockpiledCount > 0) {
-      const power = args[0] as Utils.IntegerHolder;
+      const power = args[0] as NumberHolder;
       power.value = this.multiplier * stockpilingTag.stockpiledCount;
       return true;
     }
@@ -4196,12 +4329,12 @@ export class MultiHitPowerIncrementAttr extends VariablePowerAttr {
    * @param user {@linkcode Pokemon} that used the move
    * @param target {@linkcode Pokemon} that the move was used on
    * @param move {@linkcode Move} with this attribute
-   * @param args [0] {@linkcode Utils.NumberHolder} for final calculated power of move
+   * @param args [0] {@linkcode NumberHolder} for final calculated power of move
    * @returns true if attribute application succeeds
    */
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
     const hitsTotal = user.turnData.hitCount - Math.max(user.turnData.hitsLeft, 0);
-    const power = args[0] as Utils.NumberHolder;
+    const power = args[0] as NumberHolder;
 
     power.value = move.power * (1 + hitsTotal % this.maxHits);
 
@@ -4233,11 +4366,11 @@ export class LastMoveDoublePowerAttr extends VariablePowerAttr {
    * @param user {@linkcode Pokemon} that used the move
    * @param target N/A
    * @param move N/A
-   * @param args [0] {@linkcode Utils.NumberHolder} that holds the resulting power of the move
+   * @param args [0] {@linkcode NumberHolder} that holds the resulting power of the move
    * @returns true if attribute application succeeds, false otherwise
    */
   apply(user: Pokemon, _target: Pokemon, _move: Move, args: any[]): boolean {
-    const power = args[0] as Utils.NumberHolder;
+    const power = args[0] as NumberHolder;
     const enemy = user.getOpponent(0);
     const pokemonActed: Pokemon[] = [];
 
@@ -4249,10 +4382,10 @@ export class LastMoveDoublePowerAttr extends VariablePowerAttr {
       const userAlly = user.getAlly();
       const enemyAlly = enemy?.getAlly();
 
-      if (userAlly && userAlly.turnData.acted) {
+      if (userAlly?.turnData.acted) {
         pokemonActed.push(userAlly);
       }
-      if (enemyAlly && enemyAlly.turnData.acted) {
+      if (enemyAlly?.turnData.acted) {
         pokemonActed.push(enemyAlly);
       }
     }
@@ -4261,8 +4394,8 @@ export class LastMoveDoublePowerAttr extends VariablePowerAttr {
 
     for (const p of pokemonActed) {
       const [ lastMove ] = p.getLastXMoves(1);
-      if (lastMove?.result !== MoveResult.FAIL) {
-        if ((lastMove?.result === MoveResult.SUCCESS) && (lastMove?.move === this.move)) {
+      if (lastMove.result !== MoveResult.FAIL) {
+        if ((lastMove.result === MoveResult.SUCCESS) && (lastMove.move === this.move)) {
           power.value *= 2;
           return true;
         } else {
@@ -4282,7 +4415,7 @@ export class LastMoveDoublePowerAttr extends VariablePowerAttr {
 export class CombinedPledgePowerAttr extends VariablePowerAttr {
   override apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
     const power = args[0];
-    if (!(power instanceof Utils.NumberHolder)) {
+    if (!(power instanceof NumberHolder)) {
       return false;
     }
     const combinedPledgeMove = user.turnData.combiningPledge;
@@ -4301,7 +4434,7 @@ export class CombinedPledgePowerAttr extends VariablePowerAttr {
 export class CombinedPledgeStabBoostAttr extends MoveAttr {
   override apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
     const stabMultiplier = args[0];
-    if (!(stabMultiplier instanceof Utils.NumberHolder)) {
+    if (!(stabMultiplier instanceof NumberHolder)) {
       return false;
     }
     const combinedPledgeMove = user.turnData.combiningPledge;
@@ -4320,13 +4453,10 @@ export class CombinedPledgeStabBoostAttr extends MoveAttr {
  * @extends VariablePowerAttr
  */
 export class RoundPowerAttr extends VariablePowerAttr {
-  override apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
+  override apply(user: Pokemon, target: Pokemon, move: Move, args: [NumberHolder]): boolean {
     const power = args[0];
-    if (!(power instanceof Utils.NumberHolder)) {
-      return false;
-    }
 
-    if (user.turnData?.joinedRound) {
+    if (user.turnData.joinedRound) {
       power.value *= 2;
       return true;
     }
@@ -4368,13 +4498,76 @@ export class CueNextRoundAttr extends MoveEffectAttr {
   }
 }
 
+/**
+ * Attribute that changes stat stages before the damage is calculated
+ */
+export class StatChangeBeforeDmgCalcAttr extends MoveAttr {
+  /**
+   * Applies Stat Changes before damage is calculated
+   *
+   * @param user {@linkcode Pokemon} that called {@linkcode move}
+   * @param target {@linkcode Pokemon} that is the target of {@linkcode move}
+   * @param move {@linkcode Move} called by {@linkcode user}
+   * @param args N/A
+   *
+   * @returns true if stat stages where correctly applied
+   */
+  apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
+    return false;
+  }
+}
+
+/**
+ * Steals the postitive Stat stages of the target before damage calculation so stat changes
+ * apply to damage calculation (e.g. {@linkcode Moves.SPECTRAL_THIEF})
+ * {@link https://bulbapedia.bulbagarden.net/wiki/Spectral_Thief_(move) | Spectral Thief}
+ */
+export class SpectralThiefAttr extends StatChangeBeforeDmgCalcAttr {
+  /**
+   * steals max amount of positive stats of the target while not exceeding the limit of max 6 stat stages
+   *
+   * @param user {@linkcode Pokemon} that called {@linkcode move}
+   * @param target {@linkcode Pokemon} that is the target of {@linkcode move}
+   * @param move {@linkcode Move} called by {@linkcode user}
+   * @param args N/A
+   *
+   * @returns true if stat stages where correctly stolen
+   */
+  apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
+    /**
+     * Copy all positive stat stages to user and reduce copied stat stages on target.
+     */
+    for (const s of BATTLE_STATS) {
+      const statStageValueTarget = target.getStatStage(s);
+      const statStageValueUser = user.getStatStage(s);
+
+      if (statStageValueTarget > 0) {
+        /**
+         * Only value of up to 6 can be stolen (stat stages don't exceed 6)
+         */
+        const availableToSteal = Math.min(statStageValueTarget, 6 - statStageValueUser);
+
+        globalScene.unshiftPhase(new StatStageChangePhase(user.getBattlerIndex(), this.selfTarget, [ s ], availableToSteal));
+        target.setStatStage(s, statStageValueTarget - availableToSteal);
+      }
+    }
+
+    target.updateInfo();
+    user.updateInfo();
+    globalScene.queueMessage(i18next.t("moveTriggers:stealPositiveStats", { pokemonName: getPokemonNameWithAffix(user), targetName: getPokemonNameWithAffix(target) }));
+
+    return true;
+  }
+
+}
+
 export class VariableAtkAttr extends MoveAttr {
   constructor() {
     super();
   }
 
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
-    //const atk = args[0] as Utils.IntegerHolder;
+    //const atk = args[0] as Utils.NumberHolder;
     return false;
   }
 }
@@ -4384,7 +4577,7 @@ export class TargetAtkUserAtkAttr extends VariableAtkAttr {
     super();
   }
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
-    (args[0] as Utils.IntegerHolder).value = target.getEffectiveStat(Stat.ATK, target);
+    (args[0] as NumberHolder).value = target.getEffectiveStat(Stat.ATK, target);
     return true;
   }
 }
@@ -4395,7 +4588,7 @@ export class DefAtkAttr extends VariableAtkAttr {
   }
 
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
-    (args[0] as Utils.IntegerHolder).value = user.getEffectiveStat(Stat.DEF, target);
+    (args[0] as NumberHolder).value = user.getEffectiveStat(Stat.DEF, target);
     return true;
   }
 }
@@ -4406,7 +4599,7 @@ export class VariableDefAttr extends MoveAttr {
   }
 
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
-    //const def = args[0] as Utils.IntegerHolder;
+    //const def = args[0] as Utils.NumberHolder;
     return false;
   }
 }
@@ -4417,7 +4610,7 @@ export class DefDefAttr extends VariableDefAttr {
   }
 
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
-    (args[0] as Utils.IntegerHolder).value = target.getEffectiveStat(Stat.DEF, user);
+    (args[0] as NumberHolder).value = target.getEffectiveStat(Stat.DEF, user);
     return true;
   }
 }
@@ -4435,7 +4628,7 @@ export class VariableAccuracyAttr extends MoveAttr {
 export class ThunderAccuracyAttr extends VariableAccuracyAttr {
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
     if (!globalScene.arena.weather?.isEffectSuppressed()) {
-      const accuracy = args[0] as Utils.NumberHolder;
+      const accuracy = args[0] as NumberHolder;
       const weatherType = globalScene.arena.weather?.weatherType || WeatherType.NONE;
       switch (weatherType) {
         case WeatherType.SUNNY:
@@ -4461,7 +4654,7 @@ export class ThunderAccuracyAttr extends VariableAccuracyAttr {
 export class StormAccuracyAttr extends VariableAccuracyAttr {
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
     if (!globalScene.arena.weather?.isEffectSuppressed()) {
-      const accuracy = args[0] as Utils.NumberHolder;
+      const accuracy = args[0] as NumberHolder;
       const weatherType = globalScene.arena.weather?.weatherType || WeatherType.NONE;
       switch (weatherType) {
         case WeatherType.RAIN:
@@ -4492,7 +4685,7 @@ export class AlwaysHitMinimizeAttr extends VariableAccuracyAttr {
    */
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
     if (target.getTag(BattlerTagType.MINIMIZED)) {
-      const accuracy = args[0] as Utils.NumberHolder;
+      const accuracy = args[0] as NumberHolder;
       accuracy.value = -1;
 
       return true;
@@ -4504,8 +4697,8 @@ export class AlwaysHitMinimizeAttr extends VariableAccuracyAttr {
 
 export class ToxicAccuracyAttr extends VariableAccuracyAttr {
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
-    if (user.isOfType(Type.POISON)) {
-      const accuracy = args[0] as Utils.NumberHolder;
+    if (user.isOfType(PokemonType.POISON)) {
+      const accuracy = args[0] as NumberHolder;
       accuracy.value = -1;
       return true;
     }
@@ -4517,7 +4710,7 @@ export class ToxicAccuracyAttr extends VariableAccuracyAttr {
 export class BlizzardAccuracyAttr extends VariableAccuracyAttr {
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
     if (!globalScene.arena.weather?.isEffectSuppressed()) {
-      const accuracy = args[0] as Utils.NumberHolder;
+      const accuracy = args[0] as NumberHolder;
       const weatherType = globalScene.arena.weather?.weatherType || WeatherType.NONE;
       if (weatherType === WeatherType.HAIL || weatherType === WeatherType.SNOW) {
         accuracy.value = -1;
@@ -4537,7 +4730,7 @@ export class VariableMoveCategoryAttr extends MoveAttr {
 
 export class PhotonGeyserCategoryAttr extends VariableMoveCategoryAttr {
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
-    const category = (args[0] as Utils.NumberHolder);
+    const category = (args[0] as NumberHolder);
 
     if (user.getEffectiveStat(Stat.ATK, target, move) > user.getEffectiveStat(Stat.SPATK, target, move)) {
       category.value = MoveCategory.PHYSICAL;
@@ -4557,9 +4750,10 @@ export class PhotonGeyserCategoryAttr extends VariableMoveCategoryAttr {
  */
 export class TeraMoveCategoryAttr extends VariableMoveCategoryAttr {
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
-    const category = (args[0] as Utils.NumberHolder);
+    const category = (args[0] as NumberHolder);
 
-    if (user.isTerastallized() && user.getEffectiveStat(Stat.ATK, target, move) > user.getEffectiveStat(Stat.SPATK, target, move)) {
+    if (user.isTerastallized && user.getEffectiveStat(Stat.ATK, target, move, true, true, false, false, true) >
+    user.getEffectiveStat(Stat.SPATK, target, move, true, true, false, false, true)) {
       category.value = MoveCategory.PHYSICAL;
       return true;
     }
@@ -4580,13 +4774,13 @@ export class TeraBlastPowerAttr extends VariablePowerAttr {
    * @param target n/a
    * @param move {@linkcode Move} the Move with this attribute (i.e. Tera Blast)
    * @param args
-   *   - [0] {@linkcode Utils.NumberHolder} the applied move's power, factoring in
+   *   - [0] {@linkcode NumberHolder} the applied move's power, factoring in
    *       previously applied power modifiers.
    * @returns
    */
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
-    const power = args[0] as Utils.NumberHolder;
-    if (user.isTerastallized() && user.getTeraType() === Type.STELLAR) {
+    const power = args[0] as NumberHolder;
+    if (user.isTerastallized && user.getTeraType() === PokemonType.STELLAR) {
       power.value = 100;
       return true;
     }
@@ -4605,11 +4799,11 @@ export class StatusCategoryOnAllyAttr extends VariableMoveCategoryAttr {
    * @param user {@linkcode Pokemon} using the move
    * @param target {@linkcode Pokemon} target of the move
    * @param move {@linkcode Move} with this attribute
-   * @param args [0] {@linkcode Utils.NumberHolder} The category of the move
+   * @param args [0] {@linkcode NumberHolder} The category of the move
    * @returns true if the function succeeds
    */
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
-    const category = (args[0] as Utils.NumberHolder);
+    const category = (args[0] as NumberHolder);
 
     if (user.getAlly() === target) {
       category.value = MoveCategory.STATUS;
@@ -4622,15 +4816,15 @@ export class StatusCategoryOnAllyAttr extends VariableMoveCategoryAttr {
 
 export class ShellSideArmCategoryAttr extends VariableMoveCategoryAttr {
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
-    const category = (args[0] as Utils.NumberHolder);
+    const category = (args[0] as NumberHolder);
 
-    const predictedPhysDmg = target.getBaseDamage(user, move, MoveCategory.PHYSICAL, true, true);
-    const predictedSpecDmg = target.getBaseDamage(user, move, MoveCategory.SPECIAL, true, true);
+    const predictedPhysDmg = target.getBaseDamage({source: user, move, moveCategory: MoveCategory.PHYSICAL, ignoreAbility: true, ignoreSourceAbility: true, ignoreAllyAbility: true, ignoreSourceAllyAbility: true, simulated: true});
+    const predictedSpecDmg = target.getBaseDamage({source: user, move, moveCategory: MoveCategory.SPECIAL, ignoreAbility: true, ignoreSourceAbility: true, ignoreAllyAbility: true, ignoreSourceAllyAbility: true, simulated: true});
 
     if (predictedPhysDmg > predictedSpecDmg) {
       category.value = MoveCategory.PHYSICAL;
       return true;
-    } else if (predictedPhysDmg === predictedSpecDmg && user.randSeedInt(2) === 0) {
+    } else if (predictedPhysDmg === predictedSpecDmg && user.randBattleSeedInt(2) === 0) {
       category.value = MoveCategory.PHYSICAL;
       return true;
     }
@@ -4651,52 +4845,33 @@ export class VariableMoveTypeAttr extends MoveAttr {
  * @extends VariablePowerAttr
  */
 export class NaturalGiftPowerAttr extends VariablePowerAttr {
-  private randomBerry;
-
   /**
-   * Overrides the power of Natural Gift depending on the consumed berry.
-   * This also removes the berry.
+   * Overrides the power of Natural Gift depending on the berry that has been selected.
+   * 
+   * @remarks
+   * The berry is not consumed until the move has been successfully used
+   * which has a {@linkcode MoveEffectTrigger.POST_TARGET} trigger.
+   * 
    * @param user - The Pokémon using the move.
-   * @param target - The target Pokémon.
-   * @param move - The move being used.
-   * @param args - {@linkcode Utils.NumberHolder} the power of user's move
+   * @param _target - The target Pokémon (unused)
+   * @param _move - The move being used (unused)
+   * @param args - args[0] holds the power of user's move
    * @returns A boolean indicating whether the move was successfully applied.
    */
-  apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
+  apply(user: Pokemon, _target: Pokemon, _move: Move, args: [NumberHolder]): boolean {
     const power = args[0];
-    if (!(power instanceof Utils.NumberHolder)) {
+    if (!(power instanceof NumberHolder)) {
       return false;
     }
 
-    this.randomBerry = NaturalGiftBerrySelector.getRandomBerry(user);
+    const randomBerry = NaturalGiftBerrySelector.getRandomBerry(user);
 
-    if (this.randomBerry) {
-      power.value = this.randomBerry.getNaturalGiftPower();
-
-      /** Berries do not get eaten during specific weather conditions */
-      const weather = globalScene.arena.weather;
-      if (!weather?.isEffectSuppressed()) {
-        if (weather?.weatherType === WeatherType.HEAVY_RAIN && this.randomBerry.getNaturalGiftType === Type.FIRE) {
-          NaturalGiftBerrySelector.resetBerry();
-          return true;
-        } else if (weather?.weatherType === WeatherType.HARSH_SUN && this.randomBerry.getNaturalGiftType === Type.WATER) {
-          NaturalGiftBerrySelector.resetBerry();
-          return true;
-        }
-      }
-      /** If user used {@linkcode Moves.POWDER} and Natural Gift turns fire type the berry is not confused*/
-      if (user.getTag(BattlerTagType.POWDER) && this.randomBerry.getNaturalGiftType === Type.FIRE) {
-        NaturalGiftBerrySelector.resetBerry();
-        return true;
-      }
-
-      user.loseHeldItem(this.randomBerry, user.isPlayer());
-      globalScene.updateModifiers(user.isPlayer());
-      NaturalGiftBerrySelector.resetBerry();
-
-      return true;
+    if (!randomBerry) {
+      return false;
     }
-    return false;
+
+    power.value = randomBerry.getNaturalGiftPower();
+    return true;
   }
 }
 
@@ -4707,109 +4882,130 @@ export class NaturalGiftPowerAttr extends VariablePowerAttr {
  * @extends VariableMoveTypeAttr
  */
 export class NaturalGiftTypeAttr extends VariableMoveTypeAttr {
-  private randomBerry;
 
   /**
    * Overrides the type of Natural Gift depending on the consumed berry.
-   * The item used for the move is not removed here but in {@linkcode NaturalGiftPowerAttr}
-   * since it is called last.
+   * The item used for the move is not removed here but in {@linkcode MoveEndPhase}
+   * to ensure 
    * @param user - The Pokémon using the move.
    * @param target - The target Pokémon.
    * @param move - The move being used.
-   * @param args - {@linkcode Utils.NumberHolder} the move type
+   * @param args - args[0] NumberHolder with the move's type.
    * @returns A boolean indicating whether the move was successfully applied.
    */
-  apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
+  apply(user: Pokemon, target: Pokemon, move: Move, args: [NumberHolder]): boolean {
     const moveType = args[0];
-    if (!(moveType instanceof Utils.NumberHolder)) {
+    if (!(moveType instanceof NumberHolder)) {
       return false;
     }
 
-    this.randomBerry = NaturalGiftBerrySelector.getRandomBerry(user);
+    const randomBerry = NaturalGiftBerrySelector.getRandomBerry(user) as BerryModifier;
+    // Force repick if the berry is somehow not owned by the user
+    if (!randomBerry) {
+      return false;
+    }
 
-    if (this.randomBerry) {
-      moveType.value = this.randomBerry.getNaturalGiftType();
+    // If the berry is not in the user's held items, repick it
+
+    if (randomBerry) {
+      moveType.value = randomBerry.getNaturalGiftType();
       return true;
     }
     return false;
   }
 }
 
+/**
+ * Attribute used to consume the berry selected by {@linkcode NaturalGiftBerrySelector}
+ */
+export class NaturalGiftConsumeBerryAttr extends MoveEffectAttr {
+  /**
+   * 
+   * @param user - The Pokemon using the move
+   * @param _target - The target Pokemon (unused)
+   * @param _move - unused
+   * @param args - unused
+   * @returns 
+   */
+  apply(user: Pokemon, _target: Pokemon, _move: Move, args: any[]): boolean {
+    const berry = NaturalGiftBerrySelector.getSelectedBerry();
+    if (isNullOrUndefined(berry)) {
+      return false;
+    }
+    user.loseHeldItem(berry, user.isPlayer());
+    // Natural gift counts as berries eaten for the purpose of harvest, but not for the purpose of cud chew.
+    user.battleData.berriesEaten.push(berry.berryType);
+    globalScene.updateModifiers(user.isPlayer());
+    NaturalGiftBerrySelector.resetBerry();
+    return true;
+  }
 
-class NaturalGiftBerrySelector {
-  private static selectedBerry;
+  constructor() {
+    // POST_TARGET is used to ensure the berry is consumed only if the move was invoked successfully, regardless of whether or not it hit.
+    super(true, { lastHitOnly: true, trigger: MoveEffectTrigger.POST_TARGET });
+  }
+
+}
+
+export class NaturalGiftBerrySelector {
+  private static selectedBerry: BerryModifier | null;
 
   /**
    * select random berry from user
-   * @param user Pokemon using Natural Gift
+   * @param user - The Pokemon using Natural Gift
    * @returns A random berry to use in {@linkcode NaturalGiftPowerAttr} and {@linkcode NaturalGiftTypeAttr}
    */
-  public static getRandomBerry(user: Pokemon): BerryModifier {
-    if (!this.selectedBerry) {
+  public static getRandomBerry(user: Pokemon): BerryModifier | null {
+    // Rechoose the berry if it is null or if the user does not have it.
+    if (isNullOrUndefined(this.selectedBerry) || !user.getHeldItems().some(item => this.selectedBerry?.match(item))) {
       const berries =  globalScene.findModifiers(
         m => m instanceof BerryModifier && m.pokemonId === user.id,
         user.isPlayer()
       ) as BerryModifier[];
-      this.selectedBerry = berries.at(user.randSeedInt(berries.length)) ?? null;
+      this.selectedBerry = berries.at(user.randBattleSeedInt(berries.length)) ?? null;
     }
     return this.selectedBerry;
   }
 
+  public static getSelectedBerry(): BerryModifier | null {
+    return this.selectedBerry;
+  }
+
   /**
    * Reset the selected berry
    */
   public static resetBerry() {
-    this.selectedBerry = undefined;
-  }
-}
-
-
-/**
- * Attribute used for Tera Starstorm that changes the move type to Stellar
- * @extends VariableMoveTypeAttr
- */
-export class TeraStarstormTypeAttr extends VariableMoveTypeAttr {
-  /**
-   *
-   * @param user the {@linkcode Pokemon} using the move
-   * @param target n/a
-   * @param move n/a
-   * @param args[0] {@linkcode Utils.NumberHolder} the move type
-   * @returns `true` if the move type is changed to {@linkcode Type.STELLAR}, `false` otherwise
-   */
-  override apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
-    if (user.isTerastallized() && (user.hasFusionSpecies(Species.TERAPAGOS) || user.species.speciesId === Species.TERAPAGOS)) {
-      const moveType = args[0] as Utils.NumberHolder;
-
-      moveType.value = Type.STELLAR;
-      return true;
-    }
-    return false;
+    this.selectedBerry = null;
   }
 }
 
 export class FormChangeItemTypeAttr extends VariableMoveTypeAttr {
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
     const moveType = args[0];
-    if (!(moveType instanceof Utils.NumberHolder)) {
+    if (!(moveType instanceof NumberHolder)) {
       return false;
     }
 
     if ([ user.species.speciesId, user.fusionSpecies?.speciesId ].includes(Species.ARCEUS) || [ user.species.speciesId, user.fusionSpecies?.speciesId ].includes(Species.SILVALLY)) {
       const form = user.species.speciesId === Species.ARCEUS || user.species.speciesId === Species.SILVALLY ? user.formIndex : user.fusionSpecies?.formIndex!;
 
-      moveType.value = Type[Type[form]];
+      moveType.value = PokemonType[PokemonType[form]];
       return true;
     }
 
-    return false;
+    // Force move to have its original typing if it changed
+    if (moveType.value === move.type) {
+      return false;
+    }
+    moveType.value = move.type
+    return true;
   }
 }
 
 export class TechnoBlastTypeAttr extends VariableMoveTypeAttr {
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
     const moveType = args[0];
-    if (!(moveType instanceof Utils.NumberHolder)) {
+    if (!(moveType instanceof NumberHolder)) {
       return false;
     }
 
@@ -4818,19 +5014,19 @@ export class TechnoBlastTypeAttr extends VariableMoveTypeAttr {
 
       switch (form) {
         case 1: // Shock Drive
-          moveType.value = Type.ELECTRIC;
+          moveType.value = PokemonType.ELECTRIC;
           break;
         case 2: // Burn Drive
-          moveType.value = Type.FIRE;
+          moveType.value = PokemonType.FIRE;
           break;
         case 3: // Chill Drive
-          moveType.value = Type.ICE;
+          moveType.value = PokemonType.ICE;
           break;
         case 4: // Douse Drive
-          moveType.value = Type.WATER;
+          moveType.value = PokemonType.WATER;
           break;
         default:
-          moveType.value = Type.NORMAL;
+          moveType.value = PokemonType.NORMAL;
           break;
       }
       return true;
@@ -4843,7 +5039,7 @@ export class TechnoBlastTypeAttr extends VariableMoveTypeAttr {
 export class AuraWheelTypeAttr extends VariableMoveTypeAttr {
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
     const moveType = args[0];
-    if (!(moveType instanceof Utils.NumberHolder)) {
+    if (!(moveType instanceof NumberHolder)) {
       return false;
     }
 
@@ -4852,10 +5048,10 @@ export class AuraWheelTypeAttr extends VariableMoveTypeAttr {
 
       switch (form) {
         case 1: // Hangry Mode
-          moveType.value = Type.DARK;
+          moveType.value = PokemonType.DARK;
           break;
         default: // Full Belly Mode
-          moveType.value = Type.ELECTRIC;
+          moveType.value = PokemonType.ELECTRIC;
           break;
       }
       return true;
@@ -4868,7 +5064,7 @@ export class AuraWheelTypeAttr extends VariableMoveTypeAttr {
 export class RagingBullTypeAttr extends VariableMoveTypeAttr {
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
     const moveType = args[0];
-    if (!(moveType instanceof Utils.NumberHolder)) {
+    if (!(moveType instanceof NumberHolder)) {
       return false;
     }
 
@@ -4877,13 +5073,13 @@ export class RagingBullTypeAttr extends VariableMoveTypeAttr {
 
       switch (form) {
         case 1: // Blaze breed
-          moveType.value = Type.FIRE;
+          moveType.value = PokemonType.FIRE;
           break;
         case 2: // Aqua breed
-          moveType.value = Type.WATER;
+          moveType.value = PokemonType.WATER;
           break;
         default:
-          moveType.value = Type.FIGHTING;
+          moveType.value = PokemonType.FIGHTING;
           break;
       }
       return true;
@@ -4896,7 +5092,7 @@ export class RagingBullTypeAttr extends VariableMoveTypeAttr {
 export class IvyCudgelTypeAttr extends VariableMoveTypeAttr {
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
     const moveType = args[0];
-    if (!(moveType instanceof Utils.NumberHolder)) {
+    if (!(moveType instanceof NumberHolder)) {
       return false;
     }
 
@@ -4906,19 +5102,19 @@ export class IvyCudgelTypeAttr extends VariableMoveTypeAttr {
       switch (form) {
         case 1: // Wellspring Mask
         case 5: // Wellspring Mask Tera
-          moveType.value = Type.WATER;
+          moveType.value = PokemonType.WATER;
           break;
         case 2: // Hearthflame Mask
         case 6: // Hearthflame Mask Tera
-          moveType.value = Type.FIRE;
+          moveType.value = PokemonType.FIRE;
           break;
         case 3: // Cornerstone Mask
         case 7: // Cornerstone Mask Tera
-          moveType.value = Type.ROCK;
+          moveType.value = PokemonType.ROCK;
           break;
         case 4: // Teal Mask Tera
         default:
-          moveType.value = Type.GRASS;
+          moveType.value = PokemonType.GRASS;
           break;
       }
       return true;
@@ -4931,7 +5127,7 @@ export class IvyCudgelTypeAttr extends VariableMoveTypeAttr {
 export class WeatherBallTypeAttr extends VariableMoveTypeAttr {
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
     const moveType = args[0];
-    if (!(moveType instanceof Utils.NumberHolder)) {
+    if (!(moveType instanceof NumberHolder)) {
       return false;
     }
 
@@ -4939,21 +5135,25 @@ export class WeatherBallTypeAttr extends VariableMoveTypeAttr {
       switch (globalScene.arena.weather?.weatherType) {
         case WeatherType.SUNNY:
         case WeatherType.HARSH_SUN:
-          moveType.value = Type.FIRE;
+          moveType.value = PokemonType.FIRE;
           break;
         case WeatherType.RAIN:
         case WeatherType.HEAVY_RAIN:
-          moveType.value = Type.WATER;
+          moveType.value = PokemonType.WATER;
           break;
         case WeatherType.SANDSTORM:
-          moveType.value = Type.ROCK;
+          moveType.value = PokemonType.ROCK;
           break;
         case WeatherType.HAIL:
         case WeatherType.SNOW:
-          moveType.value = Type.ICE;
+          moveType.value = PokemonType.ICE;
           break;
         default:
-          return false;
+          if (moveType.value === move.type) {
+            return false;
+          }
+          moveType.value = move.type;
+          break;
       }
       return true;
     }
@@ -4973,12 +5173,12 @@ export class TerrainPulseTypeAttr extends VariableMoveTypeAttr {
    * @param user {@linkcode Pokemon} using this move
    * @param target N/A
    * @param move N/A
-   * @param args [0] {@linkcode Utils.NumberHolder} The move's type to be modified
+   * @param args [0] {@linkcode NumberHolder} The move's type to be modified
    * @returns true if the function succeeds
    */
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
     const moveType = args[0];
-    if (!(moveType instanceof Utils.NumberHolder)) {
+    if (!(moveType instanceof NumberHolder)) {
       return false;
     }
 
@@ -4989,19 +5189,24 @@ export class TerrainPulseTypeAttr extends VariableMoveTypeAttr {
     const currentTerrain = globalScene.arena.getTerrainType();
     switch (currentTerrain) {
       case TerrainType.MISTY:
-        moveType.value = Type.FAIRY;
+        moveType.value = PokemonType.FAIRY;
         break;
       case TerrainType.ELECTRIC:
-        moveType.value = Type.ELECTRIC;
+        moveType.value = PokemonType.ELECTRIC;
         break;
       case TerrainType.GRASSY:
-        moveType.value = Type.GRASS;
+        moveType.value = PokemonType.GRASS;
         break;
       case TerrainType.PSYCHIC:
-        moveType.value = Type.PSYCHIC;
+        moveType.value = PokemonType.PSYCHIC;
         break;
       default:
-        return false;
+        if (moveType.value === move.type) {
+          return false;
+        }
+        // force move to have its original typing if it was changed
+        moveType.value = move.type;
+        break;
     }
     return true;
   }
@@ -5014,7 +5219,7 @@ export class TerrainPulseTypeAttr extends VariableMoveTypeAttr {
 export class HiddenPowerTypeAttr extends VariableMoveTypeAttr {
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
     const moveType = args[0];
-    if (!(moveType instanceof Utils.NumberHolder)) {
+    if (!(moveType instanceof NumberHolder)) {
       return false;
     }
 
@@ -5026,10 +5231,10 @@ export class HiddenPowerTypeAttr extends VariableMoveTypeAttr {
       + (user.ivs[Stat.SPDEF] & 1) * 32) * 15 / 63);
 
     moveType.value = [
-      Type.FIGHTING, Type.FLYING, Type.POISON, Type.GROUND,
-      Type.ROCK, Type.BUG, Type.GHOST, Type.STEEL,
-      Type.FIRE, Type.WATER, Type.GRASS, Type.ELECTRIC,
-      Type.PSYCHIC, Type.ICE, Type.DRAGON, Type.DARK ][iv_val];
+      PokemonType.FIGHTING, PokemonType.FLYING, PokemonType.POISON, PokemonType.GROUND,
+      PokemonType.ROCK, PokemonType.BUG, PokemonType.GHOST, PokemonType.STEEL,
+      PokemonType.FIRE, PokemonType.WATER, PokemonType.GRASS, PokemonType.ELECTRIC,
+      PokemonType.PSYCHIC, PokemonType.ICE, PokemonType.DRAGON, PokemonType.DARK ][iv_val];
 
     return true;
   }
@@ -5049,11 +5254,11 @@ export class TeraBlastTypeAttr extends VariableMoveTypeAttr {
    */
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
     const moveType = args[0];
-    if (!(moveType instanceof Utils.NumberHolder)) {
+    if (!(moveType instanceof NumberHolder)) {
       return false;
     }
 
-    if (user.isTerastallized()) {
+    if (user.isTerastallized) {
       moveType.value = user.getTeraType(); // changes move type to tera type
       return true;
     }
@@ -5062,15 +5267,39 @@ export class TeraBlastTypeAttr extends VariableMoveTypeAttr {
   }
 }
 
+/**
+ * Attribute used for Tera Starstorm that changes the move type to Stellar
+ * @extends VariableMoveTypeAttr
+ */
+export class TeraStarstormTypeAttr extends VariableMoveTypeAttr {
+  /**
+   *
+   * @param user the {@linkcode Pokemon} using the move
+   * @param target n/a
+   * @param move n/a
+   * @param args[0] {@linkcode NumberHolder} the move type
+   * @returns `true` if the move type is changed to {@linkcode PokemonType.STELLAR}, `false` otherwise
+   */
+  override apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
+    if (user.isTerastallized && user.hasSpecies(Species.TERAPAGOS)) {
+      const moveType = args[0] as NumberHolder;
+
+      moveType.value = PokemonType.STELLAR;
+      return true;
+    }
+    return false;
+  }
+}
+
 export class MatchUserTypeAttr extends VariableMoveTypeAttr {
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
     const moveType = args[0];
-    if (!(moveType instanceof Utils.NumberHolder)) {
+    if (!(moveType instanceof NumberHolder)) {
       return false;
     }
     const userTypes = user.getTypes(true);
 
-    if (userTypes.includes(Type.STELLAR)) { // will not change to stellar type
+    if (userTypes.includes(PokemonType.STELLAR)) { // will not change to stellar type
       const nonTeraTypes = user.getTypes();
       moveType.value = nonTeraTypes[0];
       return true;
@@ -5091,11 +5320,11 @@ export class MatchUserTypeAttr extends VariableMoveTypeAttr {
 export class CombinedPledgeTypeAttr extends VariableMoveTypeAttr {
   override apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
     const moveType = args[0];
-    if (!(moveType instanceof Utils.NumberHolder)) {
+    if (!(moveType instanceof NumberHolder)) {
       return false;
     }
 
-    const combinedPledgeMove = user.turnData.combiningPledge;
+    const combinedPledgeMove = user?.turnData?.combiningPledge;
     if (!combinedPledgeMove) {
       return false;
     }
@@ -5103,19 +5332,19 @@ export class CombinedPledgeTypeAttr extends VariableMoveTypeAttr {
     switch (move.id) {
       case Moves.FIRE_PLEDGE:
         if (combinedPledgeMove === Moves.WATER_PLEDGE) {
-          moveType.value = Type.WATER;
+          moveType.value = PokemonType.WATER;
           return true;
         }
         return false;
       case Moves.WATER_PLEDGE:
         if (combinedPledgeMove === Moves.GRASS_PLEDGE) {
-          moveType.value = Type.GRASS;
+          moveType.value = PokemonType.GRASS;
           return true;
         }
         return false;
       case Moves.GRASS_PLEDGE:
         if (combinedPledgeMove === Moves.FIRE_PLEDGE) {
-          moveType.value = Type.FIRE;
+          moveType.value = PokemonType.FIRE;
           return true;
         }
         return false;
@@ -5134,9 +5363,9 @@ export class VariableMoveTypeMultiplierAttr extends MoveAttr {
 export class NeutralDamageAgainstFlyingTypeMultiplierAttr extends VariableMoveTypeMultiplierAttr {
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
     if (!target.getTag(BattlerTagType.IGNORE_FLYING)) {
-      const multiplier = args[0] as Utils.NumberHolder;
+      const multiplier = args[0] as NumberHolder;
       //When a flying type is hit, the first hit is always 1x multiplier.
-      if (target.isOfType(Type.FLYING)) {
+      if (target.isOfType(PokemonType.FLYING)) {
         multiplier.value = 1;
       }
       return true;
@@ -5152,12 +5381,12 @@ export class IceNoEffectTypeAttr extends VariableMoveTypeMultiplierAttr {
    * @param user n/a
    * @param target The {@linkcode Pokemon} targeted by the move
    * @param move n/a
-   * @param args `[0]` a {@linkcode Utils.NumberHolder | NumberHolder} containing a type effectiveness multiplier
+   * @param args `[0]` a {@linkcode NumberHolder | NumberHolder} containing a type effectiveness multiplier
    * @returns `true` if this Ice-type immunity applies; `false` otherwise
    */
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
-    const multiplier = args[0] as Utils.NumberHolder;
-    if (target.isOfType(Type.ICE)) {
+    const multiplier = args[0] as NumberHolder;
+    if (target.isOfType(PokemonType.ICE)) {
       multiplier.value = 0;
       return true;
     }
@@ -5167,8 +5396,8 @@ export class IceNoEffectTypeAttr extends VariableMoveTypeMultiplierAttr {
 
 export class FlyingTypeMultiplierAttr extends VariableMoveTypeMultiplierAttr {
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
-    const multiplier = args[0] as Utils.NumberHolder;
-    multiplier.value *= target.getAttackTypeEffectiveness(Type.FLYING, user);
+    const multiplier = args[0] as NumberHolder;
+    multiplier.value *= target.getAttackTypeEffectiveness(PokemonType.FLYING, user);
     return true;
   }
 }
@@ -5196,10 +5425,10 @@ export class VariableMoveTypeChartAttr extends MoveAttr {
  */
 export class FreezeDryAttr extends VariableMoveTypeChartAttr {
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
-    const multiplier = args[0] as Utils.NumberHolder;
-    const defType = args[1] as Type;
+    const multiplier = args[0] as NumberHolder;
+    const defType = args[1] as PokemonType;
 
-    if (defType === Type.WATER) {
+    if (defType === PokemonType.WATER) {
       multiplier.value = 2;
       return true;
     } else {
@@ -5210,7 +5439,7 @@ export class FreezeDryAttr extends VariableMoveTypeChartAttr {
 
 export class OneHitKOAccuracyAttr extends VariableAccuracyAttr {
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
-    const accuracy = args[0] as Utils.NumberHolder;
+    const accuracy = args[0] as NumberHolder;
     if (user.level < target.level) {
       accuracy.value = 0;
     } else {
@@ -5232,11 +5461,11 @@ export class SheerColdAccuracyAttr extends OneHitKOAccuracyAttr {
    * @returns Returns true if move is successful, false if misses.
    */
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
-    const accuracy = args[0] as Utils.NumberHolder;
+    const accuracy = args[0] as NumberHolder;
     if (user.level < target.level) {
       accuracy.value = 0;
     } else {
-      const baseAccuracy = user.isOfType(Type.ICE) ? 30 : 20;
+      const baseAccuracy = user.isOfType(PokemonType.ICE) ? 30 : 20;
       accuracy.value = Math.min(Math.max(baseAccuracy + 100 * (1 - target.level / user.level), 0), 100);
     }
     return true;
@@ -5274,15 +5503,15 @@ export class NoEffectAttr extends MoveAttr {
 }
 
 const crashDamageFunc = (user: Pokemon, move: Move) => {
-  const cancelled = new Utils.BooleanHolder(false);
+  const cancelled = new BooleanHolder(false);
   applyAbAttrs(BlockNonDirectDamageAbAttr, user, cancelled);
   if (cancelled.value) {
     return false;
   }
 
-  user.damageAndUpdate(Utils.toDmgValue(user.getMaxHp() / 2), HitResult.OTHER, false, true);
+  user.damageAndUpdate(toDmgValue(user.getMaxHp() / 2), { result: HitResult.INDIRECT });
   globalScene.queueMessage(i18next.t("moveTriggers:keptGoingAndCrashed", { pokemonName: getPokemonNameWithAffix(user) }));
-  user.turnData.damageTaken += Utils.toDmgValue(user.getMaxHp() / 2);
+  user.turnData.damageTaken += toDmgValue(user.getMaxHp() / 2);
 
   return true;
 };
@@ -5304,7 +5533,7 @@ export class BypassRedirectAttr extends MoveAttr {
 
 export class FrenzyAttr extends MoveEffectAttr {
   constructor() {
-    super(true, { trigger: MoveEffectTrigger.HIT, lastHitOnly: true });
+    super(true, { lastHitOnly: true });
   }
 
   canApply(user: Pokemon, target: Pokemon, move: Move, args: any[]) {
@@ -5317,7 +5546,7 @@ export class FrenzyAttr extends MoveEffectAttr {
     }
 
     if (!user.getTag(BattlerTagType.FRENZY) && !user.getMoveQueue().length) {
-      const turnCount = user.randSeedIntRange(1, 2);
+      const turnCount = user.randBattleSeedIntRange(1, 2);
       new Array(turnCount).fill(null).map(() => user.getMoveQueue().push({ move: move.id, targets: [ target.getBattlerIndex() ], ignorePP: true }));
       user.addTag(BattlerTagType.FRENZY, turnCount, move.id, user.id);
     } else {
@@ -5376,22 +5605,20 @@ export class AddBattlerTagAttr extends MoveEffectAttr {
   protected cancelOnFail: boolean;
   private failOnOverlap: boolean;
 
-  constructor(tagType: BattlerTagType, selfTarget: boolean = false, failOnOverlap: boolean = false, turnCountMin: number = 0, turnCountMax?: number, lastHitOnly: boolean = false, cancelOnFail: boolean = false) {
+  constructor(tagType: BattlerTagType, selfTarget: boolean = false, failOnOverlap: boolean = false, turnCountMin: number = 0, turnCountMax?: number, lastHitOnly: boolean = false) {
     super(selfTarget, { lastHitOnly: lastHitOnly });
 
     this.tagType = tagType;
     this.turnCountMin = turnCountMin;
     this.turnCountMax = turnCountMax !== undefined ? turnCountMax : turnCountMin;
     this.failOnOverlap = !!failOnOverlap;
-    this.cancelOnFail = cancelOnFail;
   }
 
   canApply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
-    if (!super.canApply(user, target, move, args) || (this.cancelOnFail === true && user.getLastXMoves(1)[0]?.result === MoveResult.FAIL)) {
+    if (!super.canApply(user, target, move, args)) {
       return false;
-    } else {
-      return true;
     }
+    return true;
   }
 
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
@@ -5400,8 +5627,8 @@ export class AddBattlerTagAttr extends MoveEffectAttr {
     }
 
     const moveChance = this.getMoveChance(user, target, move, this.selfTarget, true);
-    if (moveChance < 0 || moveChance === 100 || user.randSeedInt(100) < moveChance) {
-      return (this.selfTarget ? user : target).addTag(this.tagType,  user.randSeedIntRange(this.turnCountMin, this.turnCountMax), move.id, user.id);
+    if (moveChance < 0 || moveChance === 100 || user.randBattleSeedInt(100) < moveChance) {
+      return (this.selfTarget ? user : target).addTag(this.tagType,  user.randBattleSeedIntRange(this.turnCountMin, this.turnCountMax), move.id, user.id);
     }
 
     return false;
@@ -5413,7 +5640,7 @@ export class AddBattlerTagAttr extends MoveEffectAttr {
       : null;
   }
 
-  getTagTargetBenefitScore(user: Pokemon, target: Pokemon, move: Move): number | void {
+  getTagTargetBenefitScore(): number {
     switch (this.tagType) {
       case BattlerTagType.RECHARGING:
       case BattlerTagType.PERISH_SONG:
@@ -5451,12 +5678,16 @@ export class AddBattlerTagAttr extends MoveEffectAttr {
       case BattlerTagType.INGRAIN:
       case BattlerTagType.IGNORE_ACCURACY:
       case BattlerTagType.AQUA_RING:
+      case BattlerTagType.MAGIC_COAT:
         return 3;
       case BattlerTagType.PROTECTED:
       case BattlerTagType.FLYING:
       case BattlerTagType.CRIT_BOOST:
       case BattlerTagType.ALWAYS_CRIT:
         return 5;
+      default:
+        console.warn(`BattlerTag ${BattlerTagType[this.tagType]} is missing a score!`);
+        return 0;
     }
   }
 
@@ -5465,7 +5696,7 @@ export class AddBattlerTagAttr extends MoveEffectAttr {
     if (moveChance < 0) {
       moveChance = 100;
     }
-    return Math.floor(this.getTagTargetBenefitScore(user, target, move)! * (moveChance / 100)); // TODO: is the bang correct?
+    return Math.floor(this.getTagTargetBenefitScore() * (moveChance / 100));
   }
 }
 
@@ -5478,9 +5709,19 @@ export class LeechSeedAttr extends AddBattlerTagAttr {
   constructor() {
     super(BattlerTagType.SEEDED);
   }
+}
+
+/**
+ * Adds the appropriate battler tag for Smack Down and Thousand arrows
+ * @extends AddBattlerTagAttr
+ */
+export class FallDownAttr extends AddBattlerTagAttr {
+  constructor() {
+    super(BattlerTagType.IGNORE_FLYING, false, false, 1, 1, true);
+  }
 
   /**
-   * Adds a Seeding effect to the target if the target does not have an active Substitute.
+   * Adds Grounded Tag to the target and checks if fallDown message should be displayed
    * @param user the {@linkcode Pokemon} using the move
    * @param target the {@linkcode Pokemon} targeted by the move
    * @param move the {@linkcode Move} invoking this effect
@@ -5488,8 +5729,10 @@ export class LeechSeedAttr extends AddBattlerTagAttr {
    * @returns `true` if the effect successfully applies; `false` otherwise
    */
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
-    return !move.hitsSubstitute(user, target)
-      && super.apply(user, target, move, args);
+    if (!target.isGrounded()) {
+      globalScene.queueMessage(i18next.t("moveTriggers:fallDown", { targetPokemonName: getPokemonNameWithAffix(target) }));
+    }
+    return super.apply(user, target, move, args);
   }
 }
 
@@ -5553,7 +5796,7 @@ export class JawLockAttr extends AddBattlerTagAttr {
     }
 
     const moveChance = this.getMoveChance(user, target, move, this.selfTarget);
-    if (moveChance < 0 || moveChance === 100 || user.randSeedInt(100) < moveChance) {
+    if (moveChance < 0 || moveChance === 100 || user.randBattleSeedInt(100) < moveChance) {
       /**
        * Add the tag to both the user and the target.
        * The target's tag source is considered to be the user and vice versa
@@ -5569,13 +5812,13 @@ export class JawLockAttr extends AddBattlerTagAttr {
 export class CurseAttr extends MoveEffectAttr {
 
   apply(user: Pokemon, target: Pokemon, move:Move, args: any[]): boolean {
-    if (user.getTypes(true).includes(Type.GHOST)) {
+    if (user.getTypes(true).includes(PokemonType.GHOST)) {
       if (target.getTag(BattlerTagType.CURSED)) {
         globalScene.queueMessage(i18next.t("battle:attackFailed"));
         return false;
       }
       const curseRecoilDamage = Math.max(1, Math.floor(user.getMaxHp() / 2));
-      user.damageAndUpdate(curseRecoilDamage, HitResult.OTHER, false, true, true);
+      user.damageAndUpdate(curseRecoilDamage, { result: HitResult.INDIRECT, ignoreSegments: true });
       globalScene.queueMessage(
         i18next.t("battlerTags:cursedOnAdd", {
           pokemonNameWithAffix: getPokemonNameWithAffix(user),
@@ -5641,13 +5884,6 @@ export class FlinchAttr extends AddBattlerTagAttr {
   constructor() {
     super(BattlerTagType.FLINCHED, false);
   }
-
-  apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
-    if (!move.hitsSubstitute(user, target)) {
-      return super.apply(user, target, move, args);
-    }
-    return false;
-  }
 }
 
 export class ConfuseAttr extends AddBattlerTagAttr {
@@ -5663,16 +5899,13 @@ export class ConfuseAttr extends AddBattlerTagAttr {
       return false;
     }
 
-    if (!move.hitsSubstitute(user, target)) {
-      return super.apply(user, target, move, args);
-    }
-    return false;
+    return super.apply(user, target, move, args);
   }
 }
 
 export class RechargeAttr extends AddBattlerTagAttr {
   constructor() {
-    super(BattlerTagType.RECHARGING, true, false, 1, 1, true, true);
+    super(BattlerTagType.RECHARGING, true, false, 1, 1, true);
   }
 }
 
@@ -5695,13 +5928,13 @@ export class ProtectAttr extends AddBattlerTagAttr {
 
       while (moveHistory.length) {
         turnMove = moveHistory.shift();
-        if (!allMoves[turnMove?.move!].hasAttr(ProtectAttr) || turnMove?.result !== MoveResult.SUCCESS) { // TODO: is the bang correct?
+        if (!allMoves[turnMove?.move ?? Moves.NONE].hasAttr(ProtectAttr) || turnMove?.result !== MoveResult.SUCCESS) {
           break;
         }
         timesUsed++;
       }
       if (timesUsed) {
-        return !user.randSeedInt(Math.pow(3, timesUsed));
+        return !user.randBattleSeedInt(Math.pow(3, timesUsed));
       }
       return true;
     });
@@ -5825,8 +6058,8 @@ export class AddArenaTagAttr extends MoveEffectAttr {
       return false;
     }
 
-    if ((move.chance < 0 || move.chance === 100 || user.randSeedInt(100) < move.chance) && user.getLastXMoves(1)[0]?.result === MoveResult.SUCCESS) {
-      const side = (this.selfSideTarget ? user : target).isPlayer() ? ArenaTagSide.PLAYER : ArenaTagSide.ENEMY;
+    if ((move.chance < 0 || move.chance === 100 || user.randBattleSeedInt(100) < move.chance) && user.getLastXMoves(1)[0]?.result === MoveResult.SUCCESS) {
+      const side = ((this.selfSideTarget ? user : target).isPlayer() !== (move.hasAttr(AddArenaTrapTagAttr) && target === user)) ? ArenaTagSide.PLAYER : ArenaTagSide.ENEMY;
       globalScene.arena.addTag(this.tagType, this.turnCount, move.id, user.id, side);
       return true;
     }
@@ -5875,7 +6108,7 @@ export class RemoveArenaTagsAttr extends MoveEffectAttr {
 export class AddArenaTrapTagAttr extends AddArenaTagAttr {
   getCondition(): MoveConditionFunc {
     return (user, target, move) => {
-      const side = (this.selfSideTarget ? user : target).isPlayer() ? ArenaTagSide.PLAYER : ArenaTagSide.ENEMY;
+      const side = (this.selfSideTarget !== user.isPlayer()) ? ArenaTagSide.ENEMY : ArenaTagSide.PLAYER;
       const tag = globalScene.arena.getTagOnSide(this.tagType, side) as ArenaTrapTag;
       if (!tag) {
         return true;
@@ -5901,7 +6134,7 @@ export class AddArenaTrapTagHitAttr extends AddArenaTagAttr {
     const moveChance = this.getMoveChance(user, target, move, this.selfTarget, true);
     const side = (this.selfSideTarget ? user : target).isPlayer() ? ArenaTagSide.PLAYER : ArenaTagSide.ENEMY;
     const tag = globalScene.arena.getTagOnSide(this.tagType, side) as ArenaTrapTag;
-    if ((moveChance < 0 || moveChance === 100 || user.randSeedInt(100) < moveChance) && user.getLastXMoves(1)[0]?.result === MoveResult.SUCCESS) {
+    if ((moveChance < 0 || moveChance === 100 || user.randBattleSeedInt(100) < moveChance) && user.getLastXMoves(1)[0]?.result === MoveResult.SUCCESS) {
       globalScene.arena.addTag(this.tagType, 0, move.id, user.id, side);
       if (!tag) {
         return true;
@@ -6055,7 +6288,7 @@ export class AddPledgeEffectAttr extends AddArenaTagAttr {
  * @see {@linkcode apply}
  */
 export class RevivalBlessingAttr extends MoveEffectAttr {
-  constructor(user?: boolean) {
+  constructor() {
     super(true);
   }
 
@@ -6067,44 +6300,50 @@ export class RevivalBlessingAttr extends MoveEffectAttr {
    * @param args N/A
    * @returns Promise, true if function succeeds.
    */
-  apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): Promise<boolean> {
-    return new Promise(resolve => {
-      // If user is player, checks if the user has fainted pokemon
-      if (user instanceof PlayerPokemon
-        && globalScene.getPlayerParty().findIndex(p => p.isFainted()) > -1) {
-        (user as PlayerPokemon).revivalBlessing().then(() => {
-          resolve(true);
-        });
-      // If user is enemy, checks that it is a trainer, and it has fainted non-boss pokemon in party
-      } else if (user instanceof EnemyPokemon
-        && user.hasTrainer()
-        && globalScene.getEnemyParty().findIndex(p => p.isFainted() && !p.isBoss()) > -1) {
-        // Selects a random fainted pokemon
-        const faintedPokemon = globalScene.getEnemyParty().filter(p => p.isFainted() && !p.isBoss());
-        const pokemon = faintedPokemon[user.randSeedInt(faintedPokemon.length)];
-        const slotIndex = globalScene.getEnemyParty().findIndex(p => pokemon.id === p.id);
-        pokemon.resetStatus();
-        pokemon.heal(Math.min(Utils.toDmgValue(0.5 * pokemon.getMaxHp()), pokemon.getMaxHp()));
-        globalScene.queueMessage(i18next.t("moveTriggers:revivalBlessing", { pokemonName: getPokemonNameWithAffix(pokemon) }), 0, true);
-
-        if (globalScene.currentBattle.double && globalScene.getEnemyParty().length > 1) {
-          const allyPokemon = user.getAlly();
-          if (slotIndex <= 1) {
-            globalScene.unshiftPhase(new SwitchSummonPhase(SwitchType.SWITCH, pokemon.getFieldIndex(), slotIndex, false, false));
-          } else if (allyPokemon.isFainted()) {
-            globalScene.unshiftPhase(new SwitchSummonPhase(SwitchType.SWITCH, allyPokemon.getFieldIndex(), slotIndex, false, false));
+  override apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
+    // If user is player, checks if the user has fainted pokemon
+    if (user instanceof PlayerPokemon) {
+      globalScene.unshiftPhase(new RevivalBlessingPhase(user));
+      return true;
+    } else if (user instanceof EnemyPokemon && user.hasTrainer() && globalScene.getEnemyParty().findIndex((p) => p.isFainted() && !p.isBoss()) > -1) {
+      // If used by an enemy trainer with at least one fainted non-boss Pokemon, this
+      // revives one of said Pokemon selected at random.
+      const faintedPokemon = globalScene.getEnemyParty().filter((p) => p.isFainted() && !p.isBoss());
+      const pokemon = faintedPokemon[user.randBattleSeedInt(faintedPokemon.length)];
+      const slotIndex = globalScene.getEnemyParty().findIndex((p) => pokemon.id === p.id);
+      pokemon.resetStatus(true, false, false, true);
+      pokemon.heal(Math.min(toDmgValue(0.5 * pokemon.getMaxHp()), pokemon.getMaxHp()));
+      globalScene.queueMessage(i18next.t("moveTriggers:revivalBlessing", { pokemonName: getPokemonNameWithAffix(pokemon) }), 0, true);
+      const allyPokemon = user.getAlly();
+      if (globalScene.currentBattle.double && globalScene.getEnemyParty().length > 1 && !isNullOrUndefined(allyPokemon)) {
+        // Handle cases where revived pokemon needs to get switched in on same turn
+        if (allyPokemon.isFainted() || allyPokemon === pokemon) {
+          // Enemy switch phase should be removed and replaced with the revived pkmn switching in
+          globalScene.tryRemovePhase((phase: SwitchSummonPhase) => phase instanceof SwitchSummonPhase && phase.getPokemon() === pokemon);
+          // If the pokemon being revived was alive earlier in the turn, cancel its move
+          // (revived pokemon can't move in the turn they're brought back)
+          globalScene.findPhase((phase: MovePhase) => phase.pokemon === pokemon)?.cancel();
+          if (user.fieldPosition === FieldPosition.CENTER) {
+            user.setFieldPosition(FieldPosition.LEFT);
           }
+          globalScene.unshiftPhase(new SwitchSummonPhase(SwitchType.SWITCH, allyPokemon.getFieldIndex(), slotIndex, false, false));
         }
-        resolve(true);
-      } else {
-        globalScene.queueMessage(i18next.t("battle:attackFailed"));
-        resolve(false);
       }
-    });
+      return true;
+    }
+    return false;
   }
 
-  getUserBenefitScore(user: Pokemon, target: Pokemon, move: Move): number {
-    if (user.hasTrainer() && globalScene.getEnemyParty().findIndex(p => p.isFainted() && !p.isBoss()) > -1) {
+  getCondition(): MoveConditionFunc {
+    return (user, target, move) =>
+      (user instanceof PlayerPokemon && globalScene.getPlayerParty().some((p) => p.isFainted())) ||
+      (user instanceof EnemyPokemon &&
+        user.hasTrainer() &&
+        globalScene.getEnemyParty().some((p) => p.isFainted() && !p.isBoss()));
+  }
+
+  override getUserBenefitScore(user: Pokemon, _target: Pokemon, _move: Move): number {
+    if (user.hasTrainer() && globalScene.getEnemyParty().some((p) => p.isFainted() && !p.isBoss())) {
       return 20;
     }
 
@@ -6166,7 +6405,7 @@ export class ForceSwitchOutAttr extends MoveEffectAttr {
       if (switchOutTarget.hp > 0) {
         if (this.switchType === SwitchType.FORCE_SWITCH) {
           switchOutTarget.leaveField(true);
-          const slotIndex = eligibleNewIndices[user.randSeedInt(eligibleNewIndices.length)];
+          const slotIndex = eligibleNewIndices[user.randBattleSeedInt(eligibleNewIndices.length)];
           globalScene.prependToPhase(
             new SwitchSummonPhase(
               this.switchType,
@@ -6194,9 +6433,10 @@ export class ForceSwitchOutAttr extends MoveEffectAttr {
       return false;
     } else if (globalScene.currentBattle.battleType !== BattleType.WILD) { // Switch out logic for enemy trainers
       // Find indices of off-field Pokemon that are eligible to be switched into
+      const isPartnerTrainer = globalScene.currentBattle.trainer?.isPartner();
       const eligibleNewIndices: number[] = [];
       globalScene.getEnemyParty().forEach((pokemon, index) => {
-        if (pokemon.isAllowedInBattle() && !pokemon.isOnField()) {
+        if (pokemon.isAllowedInBattle() && !pokemon.isOnField() && (!isPartnerTrainer || pokemon.trainerSlot === (switchOutTarget as EnemyPokemon).trainerSlot)) {
           eligibleNewIndices.push(index);
         }
       });
@@ -6208,7 +6448,7 @@ export class ForceSwitchOutAttr extends MoveEffectAttr {
       if (switchOutTarget.hp > 0) {
         if (this.switchType === SwitchType.FORCE_SWITCH) {
           switchOutTarget.leaveField(true);
-          const slotIndex = eligibleNewIndices[user.randSeedInt(eligibleNewIndices.length)];
+          const slotIndex = eligibleNewIndices[user.randBattleSeedInt(eligibleNewIndices.length)];
           globalScene.prependToPhase(
             new SwitchSummonPhase(
               this.switchType,
@@ -6246,33 +6486,29 @@ export class ForceSwitchOutAttr extends MoveEffectAttr {
         }
       }
 
-      if (globalScene.currentBattle.waveIndex % 10 === 0) {
-        return false;
-      }
-
-      // Don't allow wild mons to flee with U-turn et al.
-      if (this.selfSwitch && !user.isPlayer() && move.category !== MoveCategory.STATUS) {
-        return false;
-      }
+      const allyPokemon = switchOutTarget.getAlly();
 
       if (switchOutTarget.hp > 0) {
         switchOutTarget.leaveField(false);
         globalScene.queueMessage(i18next.t("moveTriggers:fled", { pokemonName: getPokemonNameWithAffix(switchOutTarget) }), null, true, 500);
 
         // in double battles redirect potential moves off fled pokemon
-        if (globalScene.currentBattle.double) {
-          const allyPokemon = switchOutTarget.getAlly();
+        if (globalScene.currentBattle.double && !isNullOrUndefined(allyPokemon)) {
           globalScene.redirectPokemonMoves(switchOutTarget, allyPokemon);
         }
       }
 
-      if (!switchOutTarget.getAlly()?.isActive(true)) {
-        globalScene.clearEnemyHeldItemModifiers();
+      // clear out enemy held item modifiers of the switch out target
+      globalScene.clearEnemyHeldItemModifiers(switchOutTarget);
 
-        if (switchOutTarget.hp) {
+      if (!allyPokemon?.isActive(true) && switchOutTarget.hp) {
           globalScene.pushPhase(new BattleEndPhase(false));
+
+          if (globalScene.gameMode.hasRandomBiomes || globalScene.isNewBiome()) {
+            globalScene.pushPhase(new SelectBiomePhase());
+          }
+
           globalScene.pushPhase(new NewBattlePhase());
-        }
       }
     }
 
@@ -6283,22 +6519,36 @@ export class ForceSwitchOutAttr extends MoveEffectAttr {
     return (user, target, move) => (move.category !== MoveCategory.STATUS || this.getSwitchOutCondition()(user, target, move));
   }
 
-  getFailedText(user: Pokemon, target: Pokemon, move: Move, cancelled: Utils.BooleanHolder): string | null {
-    const blockedByAbility = new Utils.BooleanHolder(false);
+  getFailedText(_user: Pokemon, target: Pokemon, _move: Move): string | undefined {
+    const blockedByAbility = new BooleanHolder(false);
     applyAbAttrs(ForceSwitchOutImmunityAbAttr, target, blockedByAbility);
-    return blockedByAbility.value ? i18next.t("moveTriggers:cannotBeSwitchedOut", { pokemonName: getPokemonNameWithAffix(target) }) : null;
+    if (blockedByAbility.value) {
+      return i18next.t("moveTriggers:cannotBeSwitchedOut", { pokemonName: getPokemonNameWithAffix(target) });
+    }
   }
 
+
   getSwitchOutCondition(): MoveConditionFunc {
     return (user, target, move) => {
       const switchOutTarget = (this.selfSwitch ? user : target);
       const player = switchOutTarget instanceof PlayerPokemon;
+      const forceSwitchAttr = move.getAttrs(ForceSwitchOutAttr).find(attr => attr.switchType === SwitchType.FORCE_SWITCH);
 
       if (!this.selfSwitch) {
         if (move.hitsSubstitute(user, target)) {
           return false;
         }
 
+        // Check if the move is Roar or Whirlwind and if there is a trainer with only Pokémon left.
+        if (forceSwitchAttr && globalScene.currentBattle.trainer) {
+        const enemyParty = globalScene.getEnemyParty();
+        // Filter out any Pokémon that are not allowed in battle (e.g. fainted ones)
+        const remainingPokemon = enemyParty.filter(p => p.hp > 0 && p.isAllowedInBattle());
+          if (remainingPokemon.length <= 1) {
+            return false;
+          }
+        }
+
         // Dondozo with an allied Tatsugiri in its mouth cannot be forced out
         const commandedTag = switchOutTarget.getTag(BattlerTagType.COMMANDED);
         if (commandedTag?.getSourcePokemon()?.isActive(true)) {
@@ -6310,25 +6560,25 @@ export class ForceSwitchOutAttr extends MoveEffectAttr {
           return false;
         }
 
-        const blockedByAbility = new Utils.BooleanHolder(false);
+        const blockedByAbility = new BooleanHolder(false);
         applyAbAttrs(ForceSwitchOutImmunityAbAttr, target, blockedByAbility);
-        return !blockedByAbility.value;
+        if (blockedByAbility.value) {
+          return false;
+        }
       }
 
+
       if (!player && globalScene.currentBattle.battleType === BattleType.WILD) {
-        if (this.isBatonPass()) {
-          return false;
-        }
-        // Don't allow wild opponents to flee on the boss stage since it can ruin a run early on
-        if (globalScene.currentBattle.waveIndex % 10 === 0) {
-          return false;
-        }
+        // wild pokemon cannot switch out with baton pass.
+        return !this.isBatonPass()
+                && globalScene.currentBattle.waveIndex % 10 !== 0
+                // Don't allow wild mons to flee with U-turn et al.
+                && !(this.selfSwitch && MoveCategory.STATUS !== move.category);
       }
 
       const party = player ? globalScene.getPlayerParty() : globalScene.getEnemyParty();
-      return (!player && !globalScene.currentBattle.battleType)
-        || party.filter(p => p.isAllowedInBattle()
-          && (player || (p as EnemyPokemon).trainerSlot === (switchOutTarget as EnemyPokemon).trainerSlot)).length > globalScene.currentBattle.getBattlerCount();
+      return party.filter(p => p.isAllowedInBattle() && !p.isOnField()
+          && (player || (p as EnemyPokemon).trainerSlot === (switchOutTarget as EnemyPokemon).trainerSlot)).length > 0;
     };
   }
 
@@ -6362,7 +6612,7 @@ export class ForceSwitchOutAttr extends MoveEffectAttr {
 
 export class ChillyReceptionAttr extends ForceSwitchOutAttr {
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
-    globalScene.arena.trySetWeather(WeatherType.SNOW, true);
+    globalScene.arena.trySetWeather(WeatherType.SNOW, user);
     return super.apply(user, target, move, args);
   }
 
@@ -6371,12 +6621,13 @@ export class ChillyReceptionAttr extends ForceSwitchOutAttr {
     return (user, target, move) => globalScene.arena.weather?.weatherType !== WeatherType.SNOW || super.getSwitchOutCondition()(user, target, move);
   }
 }
+
 export class RemoveTypeAttr extends MoveEffectAttr {
 
-  private removedType: Type;
+  private removedType: PokemonType;
   private messageCallback: ((user: Pokemon) => void) | undefined;
 
-  constructor(removedType: Type, messageCallback?: (user: Pokemon) => void) {
+  constructor(removedType: PokemonType, messageCallback?: (user: Pokemon) => void) {
     super(true, { trigger: MoveEffectTrigger.POST_TARGET });
     this.removedType = removedType;
     this.messageCallback = messageCallback;
@@ -6388,14 +6639,14 @@ export class RemoveTypeAttr extends MoveEffectAttr {
       return false;
     }
 
-    if (user.isTerastallized() && user.getTeraType() === this.removedType) { // active tera types cannot be removed
+    if (user.isTerastallized && user.getTeraType() === this.removedType) { // active tera types cannot be removed
       return false;
     }
 
     const userTypes = user.getTypes(true);
     const modifiedTypes = userTypes.filter(type => type !== this.removedType);
     if (modifiedTypes.length === 0) {
-      modifiedTypes.push(Type.UNKNOWN);
+      modifiedTypes.push(PokemonType.UNKNOWN);
     }
     user.summonData.types = modifiedTypes;
     user.updateInfo();
@@ -6420,8 +6671,8 @@ export class CopyTypeAttr extends MoveEffectAttr {
     }
 
     const targetTypes = target.getTypes(true);
-    if (targetTypes.includes(Type.UNKNOWN) && targetTypes.indexOf(Type.UNKNOWN) > -1) {
-      targetTypes[targetTypes.indexOf(Type.UNKNOWN)] = Type.NORMAL;
+    if (targetTypes.includes(PokemonType.UNKNOWN) && targetTypes.indexOf(PokemonType.UNKNOWN) > -1) {
+      targetTypes[targetTypes.indexOf(PokemonType.UNKNOWN)] = PokemonType.NORMAL;
     }
     user.summonData.types = targetTypes;
     user.updateInfo();
@@ -6432,7 +6683,7 @@ export class CopyTypeAttr extends MoveEffectAttr {
   }
 
   getCondition(): MoveConditionFunc {
-    return (user, target, move) => target.getTypes()[0] !== Type.UNKNOWN || target.summonData.addedType !== null;
+    return (user, target, move) => target.getTypes()[0] !== PokemonType.UNKNOWN || target.summonData.addedType !== null;
   }
 }
 
@@ -6447,7 +6698,7 @@ export class CopyBiomeTypeAttr extends MoveEffectAttr {
     }
 
     const terrainType = globalScene.arena.getTerrainType();
-    let typeChange: Type;
+    let typeChange: PokemonType;
     if (terrainType !== TerrainType.NONE) {
       typeChange = this.getTypeForTerrain(globalScene.arena.getTerrainType());
     } else {
@@ -6457,7 +6708,7 @@ export class CopyBiomeTypeAttr extends MoveEffectAttr {
     user.summonData.types = [ typeChange ];
     user.updateInfo();
 
-    globalScene.queueMessage(i18next.t("moveTriggers:transformedIntoType", { pokemonName: getPokemonNameWithAffix(user), typeName: i18next.t(`pokemonInfo:Type.${Type[typeChange]}`) }));
+    globalScene.queueMessage(i18next.t("moveTriggers:transformedIntoType", { pokemonName: getPokemonNameWithAffix(user), typeName: i18next.t(`pokemonInfo:Type.${PokemonType[typeChange]}`) }));
 
     return true;
   }
@@ -6467,19 +6718,19 @@ export class CopyBiomeTypeAttr extends MoveEffectAttr {
    * @param terrainType {@linkcode TerrainType}
    * @returns {@linkcode Type}
    */
-  private getTypeForTerrain(terrainType: TerrainType): Type {
+  private getTypeForTerrain(terrainType: TerrainType): PokemonType {
     switch (terrainType) {
       case TerrainType.ELECTRIC:
-        return Type.ELECTRIC;
+        return PokemonType.ELECTRIC;
       case TerrainType.MISTY:
-        return Type.FAIRY;
+        return PokemonType.FAIRY;
       case TerrainType.GRASSY:
-        return Type.GRASS;
+        return PokemonType.GRASS;
       case TerrainType.PSYCHIC:
-        return Type.PSYCHIC;
+        return PokemonType.PSYCHIC;
       case TerrainType.NONE:
       default:
-        return Type.UNKNOWN;
+        return PokemonType.UNKNOWN;
     }
   }
 
@@ -6488,72 +6739,72 @@ export class CopyBiomeTypeAttr extends MoveEffectAttr {
    * @param biomeType {@linkcode Biome}
    * @returns {@linkcode Type}
    */
-  private getTypeForBiome(biomeType: Biome): Type {
+  private getTypeForBiome(biomeType: Biome): PokemonType {
     switch (biomeType) {
       case Biome.TOWN:
       case Biome.PLAINS:
       case Biome.METROPOLIS:
-        return Type.NORMAL;
+        return PokemonType.NORMAL;
       case Biome.GRASS:
       case Biome.TALL_GRASS:
-        return Type.GRASS;
+        return PokemonType.GRASS;
       case Biome.FOREST:
       case Biome.JUNGLE:
-        return Type.BUG;
+        return PokemonType.BUG;
       case Biome.SLUM:
       case Biome.SWAMP:
-        return Type.POISON;
+        return PokemonType.POISON;
       case Biome.SEA:
       case Biome.BEACH:
       case Biome.LAKE:
       case Biome.SEABED:
-        return Type.WATER;
+        return PokemonType.WATER;
       case Biome.MOUNTAIN:
-        return Type.FLYING;
+        return PokemonType.FLYING;
       case Biome.BADLANDS:
-        return Type.GROUND;
+        return PokemonType.GROUND;
       case Biome.CAVE:
       case Biome.DESERT:
-        return Type.ROCK;
+        return PokemonType.ROCK;
       case Biome.ICE_CAVE:
       case Biome.SNOWY_FOREST:
-        return Type.ICE;
+        return PokemonType.ICE;
       case Biome.MEADOW:
       case Biome.FAIRY_CAVE:
       case Biome.ISLAND:
-        return Type.FAIRY;
+        return PokemonType.FAIRY;
       case Biome.POWER_PLANT:
-        return Type.ELECTRIC;
+        return PokemonType.ELECTRIC;
       case Biome.VOLCANO:
-        return Type.FIRE;
+        return PokemonType.FIRE;
       case Biome.GRAVEYARD:
       case Biome.TEMPLE:
-        return Type.GHOST;
+        return PokemonType.GHOST;
       case Biome.DOJO:
       case Biome.CONSTRUCTION_SITE:
-        return Type.FIGHTING;
+        return PokemonType.FIGHTING;
       case Biome.FACTORY:
       case Biome.LABORATORY:
-        return Type.STEEL;
+        return PokemonType.STEEL;
       case Biome.RUINS:
       case Biome.SPACE:
-        return Type.PSYCHIC;
+        return PokemonType.PSYCHIC;
       case Biome.WASTELAND:
       case Biome.END:
-        return Type.DRAGON;
+        return PokemonType.DRAGON;
       case Biome.ABYSS:
-        return Type.DARK;
+        return PokemonType.DARK;
       default:
-        return Type.UNKNOWN;
+        return PokemonType.UNKNOWN;
     }
   }
 }
 
 export class ChangeTypeAttr extends MoveEffectAttr {
-  private type: Type;
+  private type: PokemonType;
 
-  constructor(type: Type) {
-    super(false, { trigger: MoveEffectTrigger.HIT });
+  constructor(type: PokemonType) {
+    super(false);
 
     this.type = type;
   }
@@ -6562,21 +6813,21 @@ export class ChangeTypeAttr extends MoveEffectAttr {
     target.summonData.types = [ this.type ];
     target.updateInfo();
 
-    globalScene.queueMessage(i18next.t("moveTriggers:transformedIntoType", { pokemonName: getPokemonNameWithAffix(target), typeName: i18next.t(`pokemonInfo:Type.${Type[this.type]}`) }));
+    globalScene.queueMessage(i18next.t("moveTriggers:transformedIntoType", { pokemonName: getPokemonNameWithAffix(target), typeName: i18next.t(`pokemonInfo:Type.${PokemonType[this.type]}`) }));
 
     return true;
   }
 
   getCondition(): MoveConditionFunc {
-    return (user, target, move) => !target.isTerastallized() && !target.hasAbility(Abilities.MULTITYPE) && !target.hasAbility(Abilities.RKS_SYSTEM) && !(target.getTypes().length === 1 && target.getTypes()[0] === this.type);
+    return (user, target, move) => !target.isTerastallized && !target.hasAbility(Abilities.MULTITYPE) && !target.hasAbility(Abilities.RKS_SYSTEM) && !(target.getTypes().length === 1 && target.getTypes()[0] === this.type);
   }
 }
 
 export class AddTypeAttr extends MoveEffectAttr {
-  private type: Type;
+  private type: PokemonType;
 
-  constructor(type: Type) {
-    super(false, { trigger: MoveEffectTrigger.HIT });
+  constructor(type: PokemonType) {
+    super(false);
 
     this.type = type;
   }
@@ -6585,13 +6836,13 @@ export class AddTypeAttr extends MoveEffectAttr {
     target.summonData.addedType = this.type;
     target.updateInfo();
 
-    globalScene.queueMessage(i18next.t("moveTriggers:addType", { typeName: i18next.t(`pokemonInfo:Type.${Type[this.type]}`), pokemonName: getPokemonNameWithAffix(target) }));
+    globalScene.queueMessage(i18next.t("moveTriggers:addType", { typeName: i18next.t(`pokemonInfo:Type.${PokemonType[this.type]}`), pokemonName: getPokemonNameWithAffix(target) }));
 
     return true;
   }
 
   getCondition(): MoveConditionFunc {
-    return (user, target, move) => !target.isTerastallized() && !target.getTypes().includes(this.type);
+    return (user, target, move) => !target.isTerastallized && !target.getTypes().includes(this.type);
   }
 }
 
@@ -6605,9 +6856,9 @@ export class FirstMoveTypeAttr extends MoveEffectAttr {
       return false;
     }
 
-    const firstMoveType = target.getMoveset()[0]?.getMove().type!; // TODO: is this bang correct?
+    const firstMoveType = target.getMoveset()[0].getMove().type;
     user.summonData.types = [ firstMoveType ];
-    globalScene.queueMessage(i18next.t("battle:transformedIntoType", { pokemonName: getPokemonNameWithAffix(user), type: i18next.t(`pokemonInfo:Type.${Type[firstMoveType]}`) }));
+    globalScene.queueMessage(i18next.t("battle:transformedIntoType", { pokemonName: getPokemonNameWithAffix(user), type: i18next.t(`pokemonInfo:Type.${PokemonType[firstMoveType]}`) }));
 
     return true;
   }
@@ -6620,23 +6871,22 @@ export class FirstMoveTypeAttr extends MoveEffectAttr {
  * @extends OverrideMoveEffectAttr
  */
 class CallMoveAttr extends OverrideMoveEffectAttr {
-  protected invalidMoves: Moves[];
+  protected invalidMoves: ReadonlySet<Moves>;
   protected hasTarget: boolean;
-  async apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): Promise<boolean> {
+  apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
     const replaceMoveTarget = move.moveTarget === MoveTarget.NEAR_OTHER ? MoveTarget.NEAR_ENEMY : undefined;
     const moveTargets = getMoveTargets(user, move.id, replaceMoveTarget);
     if (moveTargets.targets.length === 0) {
+      globalScene.queueMessage(i18next.t("battle:attackFailed"));
+      console.log("CallMoveAttr failed due to no targets.");
       return false;
     }
     const targets = moveTargets.multiple || moveTargets.targets.length === 1
       ? moveTargets.targets
-      : [ this.hasTarget ? target.getBattlerIndex() : moveTargets.targets[user.randSeedInt(moveTargets.targets.length)] ]; // account for Mirror Move having a target already
+      : [ this.hasTarget ? target.getBattlerIndex() : moveTargets.targets[user.randBattleSeedInt(moveTargets.targets.length)] ]; // account for Mirror Move having a target already
     user.getMoveQueue().push({ move: move.id, targets: targets, virtual: true, ignorePP: true });
+    globalScene.unshiftPhase(new LoadMoveAnimPhase(move.id));
     globalScene.unshiftPhase(new MovePhase(user, targets, new PokemonMove(move.id, 0, 0, true), true, true));
-
-    await Promise.resolve(initMoveAnim(move.id).then(() => {
-      loadMoveAnimAssets([ move.id ], true);
-    }));
     return true;
   }
 }
@@ -6648,7 +6898,7 @@ class CallMoveAttr extends OverrideMoveEffectAttr {
  * @extends CallMoveAttr to call a selected move
  */
 export class RandomMoveAttr extends CallMoveAttr {
-  constructor(invalidMoves: Moves[]) {
+  constructor(invalidMoves: ReadonlySet<Moves>) {
     super();
     this.invalidMoves = invalidMoves;
   }
@@ -6669,11 +6919,11 @@ export class RandomMoveAttr extends CallMoveAttr {
    * @param move Move being used
    * @param args Unused
    */
-  apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): Promise<boolean> {
-    const moveIds = Utils.getEnumValues(Moves).map(m => !this.invalidMoves.includes(m) && !allMoves[m].name.endsWith(" (N)") ? m : Moves.NONE);
+  override apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
+    const moveIds = getEnumValues(Moves).map(m => !this.invalidMoves.has(m) && !allMoves[m].name.endsWith(" (N)") ? m : Moves.NONE);
     let moveId: Moves = Moves.NONE;
     do {
-      moveId = this.getMoveOverride() ?? moveIds[user.randSeedInt(moveIds.length)];
+      moveId = this.getMoveOverride() ?? moveIds[user.randBattleSeedInt(moveIds.length)];
     }
     while (moveId === Moves.NONE);
     return super.apply(user, target, allMoves[moveId], args);
@@ -6693,7 +6943,7 @@ export class RandomMoveAttr extends CallMoveAttr {
 export class RandomMovesetMoveAttr extends CallMoveAttr {
   private includeParty: boolean;
   private moveId: number;
-  constructor(invalidMoves: Moves[], includeParty: boolean = false) {
+  constructor(invalidMoves: ReadonlySet<Moves>, includeParty: boolean = false) {
     super();
     this.includeParty = includeParty;
     this.invalidMoves = invalidMoves;
@@ -6706,7 +6956,7 @@ export class RandomMovesetMoveAttr extends CallMoveAttr {
    * @param move Move being used
    * @param args Unused
    */
-  apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): Promise<boolean> {
+  apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
     return super.apply(user, target, allMoves[this.moveId], args);
   }
 
@@ -6720,433 +6970,153 @@ export class RandomMovesetMoveAttr extends CallMoveAttr {
         allies = [ user ];
       }
       const partyMoveset = allies.map(p => p.moveset).flat();
-      const moves = partyMoveset.filter(m => !this.invalidMoves.includes(m!.moveId) && !m!.getMove().name.endsWith(" (N)"));
+      const moves = partyMoveset.filter(m => !this.invalidMoves.has(m!.moveId) && !m!.getMove().name.endsWith(" (N)"));
       if (moves.length === 0) {
         return false;
       }
 
-      this.moveId = moves[user.randSeedInt(moves.length)]!.moveId;
+      this.moveId = moves[user.randBattleSeedInt(moves.length)]!.moveId;
       return true;
     };
   }
 }
 
-const invalidMetronomeMoves: Moves[] = [
-  Moves.AFTER_YOU,
-  Moves.APPLE_ACID,
-  Moves.ARMOR_CANNON,
-  Moves.ASSIST,
-  Moves.ASTRAL_BARRAGE,
-  Moves.AURA_WHEEL,
-  Moves.BANEFUL_BUNKER,
-  Moves.BEAK_BLAST,
-  Moves.BEHEMOTH_BASH,
-  Moves.BEHEMOTH_BLADE,
-  Moves.BELCH,
-  Moves.BESTOW,
-  Moves.BLAZING_TORQUE,
-  Moves.BODY_PRESS,
-  Moves.BRANCH_POKE,
-  Moves.BREAKING_SWIPE,
-  Moves.CELEBRATE,
-  Moves.CHATTER,
-  Moves.CHILLING_WATER,
-  Moves.CHILLY_RECEPTION,
-  Moves.CLANGOROUS_SOUL,
-  Moves.COLLISION_COURSE,
-  Moves.COMBAT_TORQUE,
-  Moves.COMEUPPANCE,
-  Moves.COPYCAT,
-  Moves.COUNTER,
-  Moves.COVET,
-  Moves.CRAFTY_SHIELD,
-  Moves.DECORATE,
-  Moves.DESTINY_BOND,
-  Moves.DETECT,
-  Moves.DIAMOND_STORM,
-  Moves.DOODLE,
-  Moves.DOUBLE_IRON_BASH,
-  Moves.DOUBLE_SHOCK,
-  Moves.DRAGON_ASCENT,
-  Moves.DRAGON_ENERGY,
-  Moves.DRUM_BEATING,
-  Moves.DYNAMAX_CANNON,
-  Moves.ELECTRO_DRIFT,
-  Moves.ENDURE,
-  Moves.ETERNABEAM,
-  Moves.FALSE_SURRENDER,
-  Moves.FEINT,
-  Moves.FIERY_WRATH,
-  Moves.FILLET_AWAY,
-  Moves.FLEUR_CANNON,
-  Moves.FOCUS_PUNCH,
-  Moves.FOLLOW_ME,
-  Moves.FREEZE_SHOCK,
-  Moves.FREEZING_GLARE,
-  Moves.GLACIAL_LANCE,
-  Moves.GRAV_APPLE,
-  Moves.HELPING_HAND,
-  Moves.HOLD_HANDS,
-  Moves.HYPER_DRILL,
-  Moves.HYPERSPACE_FURY,
-  Moves.HYPERSPACE_HOLE,
-  Moves.ICE_BURN,
-  Moves.INSTRUCT,
-  Moves.JET_PUNCH,
-  Moves.JUNGLE_HEALING,
-  Moves.KINGS_SHIELD,
-  Moves.LIFE_DEW,
-  Moves.LIGHT_OF_RUIN,
-  Moves.MAKE_IT_RAIN,
-  Moves.MAGICAL_TORQUE,
-  Moves.MAT_BLOCK,
-  Moves.ME_FIRST,
-  Moves.METEOR_ASSAULT,
-  Moves.METRONOME,
-  Moves.MIMIC,
-  Moves.MIND_BLOWN,
-  Moves.MIRROR_COAT,
-  Moves.MIRROR_MOVE,
-  Moves.MOONGEIST_BEAM,
-  Moves.NATURE_POWER,
-  Moves.NATURES_MADNESS,
-  Moves.NOXIOUS_TORQUE,
-  Moves.OBSTRUCT,
-  Moves.ORDER_UP,
-  Moves.ORIGIN_PULSE,
-  Moves.OVERDRIVE,
-  Moves.PHOTON_GEYSER,
-  Moves.PLASMA_FISTS,
-  Moves.POPULATION_BOMB,
-  Moves.POUNCE,
-  Moves.POWER_SHIFT,
-  Moves.PRECIPICE_BLADES,
-  Moves.PROTECT,
-  Moves.PYRO_BALL,
-  Moves.QUASH,
-  Moves.QUICK_GUARD,
-  Moves.RAGE_FIST,
-  Moves.RAGE_POWDER,
-  Moves.RAGING_BULL,
-  Moves.RAGING_FURY,
-  Moves.RELIC_SONG,
-  Moves.REVIVAL_BLESSING,
-  Moves.RUINATION,
-  Moves.SALT_CURE,
-  Moves.SECRET_SWORD,
-  Moves.SHED_TAIL,
-  Moves.SHELL_TRAP,
-  Moves.SILK_TRAP,
-  Moves.SKETCH,
-  Moves.SLEEP_TALK,
-  Moves.SNAP_TRAP,
-  Moves.SNARL,
-  Moves.SNATCH,
-  Moves.SNORE,
-  Moves.SNOWSCAPE,
-  Moves.SPECTRAL_THIEF,
-  Moves.SPICY_EXTRACT,
-  Moves.SPIKY_SHIELD,
-  Moves.SPIRIT_BREAK,
-  Moves.SPOTLIGHT,
-  Moves.STEAM_ERUPTION,
-  Moves.STEEL_BEAM,
-  Moves.STRANGE_STEAM,
-  Moves.STRUGGLE,
-  Moves.SUNSTEEL_STRIKE,
-  Moves.SURGING_STRIKES,
-  Moves.SWITCHEROO,
-  Moves.TECHNO_BLAST,
-  Moves.TERA_STARSTORM,
-  Moves.THIEF,
-  Moves.THOUSAND_ARROWS,
-  Moves.THOUSAND_WAVES,
-  Moves.THUNDER_CAGE,
-  Moves.THUNDEROUS_KICK,
-  Moves.TIDY_UP,
-  Moves.TRAILBLAZE,
-  Moves.TRANSFORM,
-  Moves.TRICK,
-  Moves.TWIN_BEAM,
-  Moves.V_CREATE,
-  Moves.WICKED_BLOW,
-  Moves.WICKED_TORQUE,
-  Moves.WIDE_GUARD,
-];
-
-const invalidAssistMoves: Moves[] = [
-  Moves.ASSIST,
-  Moves.BANEFUL_BUNKER,
-  Moves.BEAK_BLAST,
-  Moves.BELCH,
-  Moves.BESTOW,
-  Moves.BOUNCE,
-  Moves.CELEBRATE,
-  Moves.CHATTER,
-  Moves.CIRCLE_THROW,
-  Moves.COPYCAT,
-  Moves.COUNTER,
-  Moves.COVET,
-  Moves.DESTINY_BOND,
-  Moves.DETECT,
-  Moves.DIG,
-  Moves.DIVE,
-  Moves.DRAGON_TAIL,
-  Moves.ENDURE,
-  Moves.FEINT,
-  Moves.FLY,
-  Moves.FOCUS_PUNCH,
-  Moves.FOLLOW_ME,
-  Moves.HELPING_HAND,
-  Moves.HOLD_HANDS,
-  Moves.KINGS_SHIELD,
-  Moves.MAT_BLOCK,
-  Moves.ME_FIRST,
-  Moves.METRONOME,
-  Moves.MIMIC,
-  Moves.MIRROR_COAT,
-  Moves.MIRROR_MOVE,
-  Moves.NATURE_POWER,
-  Moves.PHANTOM_FORCE,
-  Moves.PROTECT,
-  Moves.RAGE_POWDER,
-  Moves.ROAR,
-  Moves.SHADOW_FORCE,
-  Moves.SHELL_TRAP,
-  Moves.SKETCH,
-  Moves.SKY_DROP,
-  Moves.SLEEP_TALK,
-  Moves.SNATCH,
-  Moves.SPIKY_SHIELD,
-  Moves.SPOTLIGHT,
-  Moves.STRUGGLE,
-  Moves.SWITCHEROO,
-  Moves.THIEF,
-  Moves.TRANSFORM,
-  Moves.TRICK,
-  Moves.WHIRLWIND,
-];
-
-const invalidSleepTalkMoves: Moves[] = [
-  Moves.ASSIST,
-  Moves.BELCH,
-  Moves.BEAK_BLAST,
-  Moves.BIDE,
-  Moves.BOUNCE,
-  Moves.COPYCAT,
-  Moves.DIG,
-  Moves.DIVE,
-  Moves.DYNAMAX_CANNON,
-  Moves.FREEZE_SHOCK,
-  Moves.FLY,
-  Moves.FOCUS_PUNCH,
-  Moves.GEOMANCY,
-  Moves.ICE_BURN,
-  Moves.ME_FIRST,
-  Moves.METRONOME,
-  Moves.MIRROR_MOVE,
-  Moves.MIMIC,
-  Moves.PHANTOM_FORCE,
-  Moves.RAZOR_WIND,
-  Moves.SHADOW_FORCE,
-  Moves.SHELL_TRAP,
-  Moves.SKETCH,
-  Moves.SKULL_BASH,
-  Moves.SKY_ATTACK,
-  Moves.SKY_DROP,
-  Moves.SLEEP_TALK,
-  Moves.SOLAR_BLADE,
-  Moves.SOLAR_BEAM,
-  Moves.STRUGGLE,
-  Moves.UPROAR,
-];
-
-const invalidCopycatMoves = [
-  Moves.ASSIST,
-  Moves.BANEFUL_BUNKER,
-  Moves.BEAK_BLAST,
-  Moves.BEHEMOTH_BASH,
-  Moves.BEHEMOTH_BLADE,
-  Moves.BESTOW,
-  Moves.CELEBRATE,
-  Moves.CHATTER,
-  Moves.CIRCLE_THROW,
-  Moves.COPYCAT,
-  Moves.COUNTER,
-  Moves.COVET,
-  Moves.DESTINY_BOND,
-  Moves.DETECT,
-  Moves.DRAGON_TAIL,
-  Moves.ENDURE,
-  Moves.FEINT,
-  Moves.FOCUS_PUNCH,
-  Moves.FOLLOW_ME,
-  Moves.HELPING_HAND,
-  Moves.HOLD_HANDS,
-  Moves.KINGS_SHIELD,
-  Moves.MAT_BLOCK,
-  Moves.ME_FIRST,
-  Moves.METRONOME,
-  Moves.MIMIC,
-  Moves.MIRROR_COAT,
-  Moves.MIRROR_MOVE,
-  Moves.PROTECT,
-  Moves.RAGE_POWDER,
-  Moves.ROAR,
-  Moves.SHELL_TRAP,
-  Moves.SKETCH,
-  Moves.SLEEP_TALK,
-  Moves.SNATCH,
-  Moves.SPIKY_SHIELD,
-  Moves.SPOTLIGHT,
-  Moves.STRUGGLE,
-  Moves.SWITCHEROO,
-  Moves.THIEF,
-  Moves.TRANSFORM,
-  Moves.TRICK,
-  Moves.WHIRLWIND,
-];
-
 export class NaturePowerAttr extends OverrideMoveEffectAttr {
-  apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): Promise<boolean> {
-    return new Promise(resolve => {
-      let moveId;
-      switch (globalScene.arena.getTerrainType()) {
-      // this allows terrains to 'override' the biome move
-        case TerrainType.NONE:
-          switch (globalScene.arena.biomeType) {
-            case Biome.TOWN:
-              moveId = Moves.ROUND;
-              break;
-            case Biome.METROPOLIS:
-              moveId = Moves.TRI_ATTACK;
-              break;
-            case Biome.SLUM:
-              moveId = Moves.SLUDGE_BOMB;
-              break;
-            case Biome.PLAINS:
-              moveId = Moves.SILVER_WIND;
-              break;
-            case Biome.GRASS:
-              moveId = Moves.GRASS_KNOT;
-              break;
-            case Biome.TALL_GRASS:
-              moveId = Moves.POLLEN_PUFF;
-              break;
-            case Biome.MEADOW:
-              moveId = Moves.GIGA_DRAIN;
-              break;
-            case Biome.FOREST:
-              moveId = Moves.BUG_BUZZ;
-              break;
-            case Biome.JUNGLE:
-              moveId = Moves.LEAF_STORM;
-              break;
-            case Biome.SEA:
-              moveId = Moves.HYDRO_PUMP;
-              break;
-            case Biome.SWAMP:
-              moveId = Moves.MUD_BOMB;
-              break;
-            case Biome.BEACH:
-              moveId = Moves.SCALD;
-              break;
-            case Biome.LAKE:
-              moveId = Moves.BUBBLE_BEAM;
-              break;
-            case Biome.SEABED:
-              moveId = Moves.BRINE;
-              break;
-            case Biome.ISLAND:
-              moveId = Moves.LEAF_TORNADO;
-              break;
-            case Biome.MOUNTAIN:
-              moveId = Moves.AIR_SLASH;
-              break;
-            case Biome.BADLANDS:
-              moveId = Moves.EARTH_POWER;
-              break;
-            case Biome.DESERT:
-              moveId = Moves.SCORCHING_SANDS;
-              break;
-            case Biome.WASTELAND:
-              moveId = Moves.DRAGON_PULSE;
-              break;
-            case Biome.CONSTRUCTION_SITE:
-              moveId = Moves.STEEL_BEAM;
-              break;
-            case Biome.CAVE:
-              moveId = Moves.POWER_GEM;
-              break;
-            case Biome.ICE_CAVE:
-              moveId = Moves.ICE_BEAM;
-              break;
-            case Biome.SNOWY_FOREST:
-              moveId = Moves.FROST_BREATH;
-              break;
-            case Biome.VOLCANO:
-              moveId = Moves.LAVA_PLUME;
-              break;
-            case Biome.GRAVEYARD:
-              moveId = Moves.SHADOW_BALL;
-              break;
-            case Biome.RUINS:
-              moveId = Moves.ANCIENT_POWER;
-              break;
-            case Biome.TEMPLE:
-              moveId = Moves.EXTRASENSORY;
-              break;
-            case Biome.DOJO:
-              moveId = Moves.FOCUS_BLAST;
-              break;
-            case Biome.FAIRY_CAVE:
-              moveId = Moves.ALLURING_VOICE;
-              break;
-            case Biome.ABYSS:
-              moveId = Moves.OMINOUS_WIND;
-              break;
-            case Biome.SPACE:
-              moveId = Moves.DRACO_METEOR;
-              break;
-            case Biome.FACTORY:
-              moveId = Moves.FLASH_CANNON;
-              break;
-            case Biome.LABORATORY:
-              moveId = Moves.ZAP_CANNON;
-              break;
-            case Biome.POWER_PLANT:
-              moveId = Moves.CHARGE_BEAM;
-              break;
-            case Biome.END:
-              moveId = Moves.ETERNABEAM;
-              break;
-          }
-          break;
-        case TerrainType.MISTY:
-          moveId = Moves.MOONBLAST;
-          break;
-        case TerrainType.ELECTRIC:
-          moveId = Moves.THUNDERBOLT;
-          break;
-        case TerrainType.GRASSY:
-          moveId = Moves.ENERGY_BALL;
-          break;
-        case TerrainType.PSYCHIC:
-          moveId = Moves.PSYCHIC;
-          break;
-        default:
-        // Just in case there's no match
-          moveId = Moves.TRI_ATTACK;
-          break;
-      }
+  apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
+    let moveId;
+    switch (globalScene.arena.getTerrainType()) {
+    // this allows terrains to 'override' the biome move
+      case TerrainType.NONE:
+        switch (globalScene.arena.biomeType) {
+          case Biome.TOWN:
+            moveId = Moves.ROUND;
+            break;
+          case Biome.METROPOLIS:
+            moveId = Moves.TRI_ATTACK;
+            break;
+          case Biome.SLUM:
+            moveId = Moves.SLUDGE_BOMB;
+            break;
+          case Biome.PLAINS:
+            moveId = Moves.SILVER_WIND;
+            break;
+          case Biome.GRASS:
+            moveId = Moves.GRASS_KNOT;
+            break;
+          case Biome.TALL_GRASS:
+            moveId = Moves.POLLEN_PUFF;
+            break;
+          case Biome.MEADOW:
+            moveId = Moves.GIGA_DRAIN;
+            break;
+          case Biome.FOREST:
+            moveId = Moves.BUG_BUZZ;
+            break;
+          case Biome.JUNGLE:
+            moveId = Moves.LEAF_STORM;
+            break;
+          case Biome.SEA:
+            moveId = Moves.HYDRO_PUMP;
+            break;
+          case Biome.SWAMP:
+            moveId = Moves.MUD_BOMB;
+            break;
+          case Biome.BEACH:
+            moveId = Moves.SCALD;
+            break;
+          case Biome.LAKE:
+            moveId = Moves.BUBBLE_BEAM;
+            break;
+          case Biome.SEABED:
+            moveId = Moves.BRINE;
+            break;
+          case Biome.ISLAND:
+            moveId = Moves.LEAF_TORNADO;
+            break;
+          case Biome.MOUNTAIN:
+            moveId = Moves.AIR_SLASH;
+            break;
+          case Biome.BADLANDS:
+            moveId = Moves.EARTH_POWER;
+            break;
+          case Biome.DESERT:
+            moveId = Moves.SCORCHING_SANDS;
+            break;
+          case Biome.WASTELAND:
+            moveId = Moves.DRAGON_PULSE;
+            break;
+          case Biome.CONSTRUCTION_SITE:
+            moveId = Moves.STEEL_BEAM;
+            break;
+          case Biome.CAVE:
+            moveId = Moves.POWER_GEM;
+            break;
+          case Biome.ICE_CAVE:
+            moveId = Moves.ICE_BEAM;
+            break;
+          case Biome.SNOWY_FOREST:
+            moveId = Moves.FROST_BREATH;
+            break;
+          case Biome.VOLCANO:
+            moveId = Moves.LAVA_PLUME;
+            break;
+          case Biome.GRAVEYARD:
+            moveId = Moves.SHADOW_BALL;
+            break;
+          case Biome.RUINS:
+            moveId = Moves.ANCIENT_POWER;
+            break;
+          case Biome.TEMPLE:
+            moveId = Moves.EXTRASENSORY;
+            break;
+          case Biome.DOJO:
+            moveId = Moves.FOCUS_BLAST;
+            break;
+          case Biome.FAIRY_CAVE:
+            moveId = Moves.ALLURING_VOICE;
+            break;
+          case Biome.ABYSS:
+            moveId = Moves.OMINOUS_WIND;
+            break;
+          case Biome.SPACE:
+            moveId = Moves.DRACO_METEOR;
+            break;
+          case Biome.FACTORY:
+            moveId = Moves.FLASH_CANNON;
+            break;
+          case Biome.LABORATORY:
+            moveId = Moves.ZAP_CANNON;
+            break;
+          case Biome.POWER_PLANT:
+            moveId = Moves.CHARGE_BEAM;
+            break;
+          case Biome.END:
+            moveId = Moves.ETERNABEAM;
+            break;
+        }
+        break;
+      case TerrainType.MISTY:
+        moveId = Moves.MOONBLAST;
+        break;
+      case TerrainType.ELECTRIC:
+        moveId = Moves.THUNDERBOLT;
+        break;
+      case TerrainType.GRASSY:
+        moveId = Moves.ENERGY_BALL;
+        break;
+      case TerrainType.PSYCHIC:
+        moveId = Moves.PSYCHIC;
+        break;
+      default:
+      // Just in case there's no match
+        moveId = Moves.TRI_ATTACK;
+        break;
+    }
 
-      user.getMoveQueue().push({ move: moveId, targets: [ target.getBattlerIndex() ], ignorePP: true });
-      globalScene.unshiftPhase(new MovePhase(user, [ target.getBattlerIndex() ], new PokemonMove(moveId, 0, 0, true), true));
-      initMoveAnim(moveId).then(() => {
-        loadMoveAnimAssets([ moveId ], true)
-          .then(() => resolve(true));
-      });
-    });
+    user.getMoveQueue().push({ move: moveId, targets: [ target.getBattlerIndex() ], ignorePP: true });
+    globalScene.unshiftPhase(new LoadMoveAnimPhase(moveId));
+    globalScene.unshiftPhase(new MovePhase(user, [ target.getBattlerIndex() ], new PokemonMove(moveId, 0, 0, true), true));
+    return true;
   }
 }
 
@@ -7158,13 +7128,13 @@ export class NaturePowerAttr extends OverrideMoveEffectAttr {
  */
 export class CopyMoveAttr extends CallMoveAttr {
   private mirrorMove: boolean;
-  constructor(mirrorMove: boolean, invalidMoves: Moves[] = []) {
+  constructor(mirrorMove: boolean, invalidMoves: ReadonlySet<Moves> = new Set()) {
     super();
     this.mirrorMove = mirrorMove;
     this.invalidMoves = invalidMoves;
   }
 
-  apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): Promise<boolean> {
+  apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
     this.hasTarget = this.mirrorMove;
     const lastMove = this.mirrorMove ? target.getLastXMoves()[0].move : globalScene.currentBattle.lastMove;
     return super.apply(user, target, allMoves[lastMove], args);
@@ -7173,10 +7143,11 @@ export class CopyMoveAttr extends CallMoveAttr {
   getCondition(): MoveConditionFunc {
     return (user, target, move) => {
       if (this.mirrorMove) {
-        return target.getMoveHistory().length !== 0;
+        const lastMove = target.getLastXMoves()[0]?.move;
+        return !!lastMove && !this.invalidMoves.has(lastMove);
       } else {
         const lastMove = globalScene.currentBattle.lastMove;
-        return lastMove !== undefined && !this.invalidMoves.includes(lastMove);
+        return lastMove !== undefined && !this.invalidMoves.has(lastMove);
       }
     };
   }
@@ -7204,7 +7175,7 @@ export class RepeatMoveAttr extends MoveEffectAttr {
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
     // get the last move used (excluding status based failures) as well as the corresponding moveset slot
     const lastMove = target.getLastXMoves(-1).find(m => m.move !== Moves.NONE)!;
-    const movesetMove = target.getMoveset().find(m => m?.moveId === lastMove.move)!;
+    const movesetMove = target.getMoveset().find(m => m.moveId === lastMove.move)!;
     // If the last move used can hit more than one target or has variable targets,
     // re-compute the targets for the attack
     // (mainly for alternating double/single battle shenanigans)
@@ -7220,7 +7191,7 @@ export class RepeatMoveAttr extends MoveEffectAttr {
     const firstTarget = globalScene.getField()[moveTargets[0]];
     if (globalScene.currentBattle.double && moveTargets.length === 1 && firstTarget.isFainted() && firstTarget !== target.getAlly()) {
       const ally = firstTarget.getAlly();
-      if (ally.isActive()) { // ally exists, is not dead and can sponge the blast
+      if (!isNullOrUndefined(ally) && ally.isActive()) { // ally exists, is not dead and can sponge the blast
         moveTargets = [ ally.getBattlerIndex() ];
       }
     }
@@ -7238,7 +7209,7 @@ export class RepeatMoveAttr extends MoveEffectAttr {
   getCondition(): MoveConditionFunc {
     return (user, target, move) => {
       const lastMove = target.getLastXMoves(-1).find(m => m.move !== Moves.NONE);
-      const movesetMove = target.getMoveset().find(m => m?.moveId === lastMove?.move);
+      const movesetMove = target.getMoveset().find(m => m.moveId === lastMove?.move);
       const uninstructableMoves = [
         // Locking/Continually Executed moves
         Moves.OUTRAGE,
@@ -7333,19 +7304,19 @@ export class ReducePpMoveAttr extends MoveEffectAttr {
    *
    * @param user {@linkcode Pokemon} that used the attack
    * @param target {@linkcode Pokemon} targeted by the attack
-   * @param move {@linkcode Move} being used
+   * @param move N/A
    * @param args N/A
-   * @returns {boolean} true
+   * @returns `true`
    */
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
     // Null checks can be skipped due to condition function
-    const lastMove = target.getLastXMoves().find(() => true);
-    const movesetMove = target.getMoveset().find(m => m?.moveId === lastMove?.move);
-    const lastPpUsed = movesetMove?.ppUsed!; // TODO: is the bang correct?
-    movesetMove!.ppUsed = Math.min((movesetMove?.ppUsed!) + this.reduction, movesetMove?.getMovePp()!); // TODO: is the bang correct?
+    const lastMove = target.getLastXMoves()[0];
+    const movesetMove = target.getMoveset().find(m => m.moveId === lastMove.move)!;
+    const lastPpUsed = movesetMove.ppUsed;
+    movesetMove.ppUsed = Math.min((lastPpUsed) + this.reduction, movesetMove.getMovePp());
 
-    const message = i18next.t("battle:ppReduced", { targetName: getPokemonNameWithAffix(target), moveName: movesetMove?.getName(), reduction: (movesetMove?.ppUsed!) - lastPpUsed }); // TODO: is the bang correct?
-    globalScene.eventTarget.dispatchEvent(new MoveUsedEvent(target?.id, movesetMove?.getMove()!, movesetMove?.ppUsed!)); // TODO: are these bangs correct?
+    const message = i18next.t("battle:ppReduced", { targetName: getPokemonNameWithAffix(target), moveName: movesetMove.getName(), reduction: (movesetMove.ppUsed) - lastPpUsed });
+    globalScene.eventTarget.dispatchEvent(new MoveUsedEvent(target.id, movesetMove.getMove(), movesetMove.ppUsed));
     globalScene.queueMessage(message);
 
     return true;
@@ -7353,9 +7324,9 @@ export class ReducePpMoveAttr extends MoveEffectAttr {
 
   getCondition(): MoveConditionFunc {
     return (user, target, move) => {
-      const lastMove = target.getLastXMoves().find(() => true);
+      const lastMove = target.getLastXMoves()[0];
       if (lastMove) {
-        const movesetMove = target.getMoveset().find(m => m?.moveId === lastMove.move);
+        const movesetMove = target.getMoveset().find(m => m.moveId === lastMove.move);
         return !!movesetMove?.getPpRatio();
       }
       return false;
@@ -7363,9 +7334,9 @@ export class ReducePpMoveAttr extends MoveEffectAttr {
   }
 
   getTargetBenefitScore(user: Pokemon, target: Pokemon, move: Move): number {
-    const lastMove = target.getLastXMoves().find(() => true);
+    const lastMove = target.getLastXMoves()[0];
     if (lastMove) {
-      const movesetMove = target.getMoveset().find(m => m?.moveId === lastMove.move);
+      const movesetMove = target.getMoveset().find(m => m.moveId === lastMove.move);
       if (movesetMove) {
         const maxPp = movesetMove.getMovePp();
         const ppLeft = maxPp - movesetMove.ppUsed;
@@ -7402,7 +7373,7 @@ export class AttackReducePpMoveAttr extends ReducePpMoveAttr {
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
     const lastMove = target.getLastXMoves().find(() => true);
     if (lastMove) {
-      const movesetMove = target.getMoveset().find(m => m?.moveId === lastMove.move);
+      const movesetMove = target.getMoveset().find(m => m.moveId === lastMove.move);
       if (Boolean(movesetMove?.getPpRatio())) {
         super.apply(user, target, move, args);
       }
@@ -7448,7 +7419,7 @@ export class MovesetCopyMoveAttr extends OverrideMoveEffectAttr {
 
     const copiedMove = allMoves[targetMoves[0].move];
 
-    const thisMoveIndex = user.getMoveset().findIndex(m => m?.moveId === move.id);
+    const thisMoveIndex = user.getMoveset().findIndex(m => m.moveId === move.id);
 
     if (thisMoveIndex === -1) {
       return false;
@@ -7500,7 +7471,7 @@ export class SketchAttr extends MoveEffectAttr {
     }
 
     const sketchedMove = allMoves[targetMove.move];
-    const sketchIndex = user.getMoveset().findIndex(m => m?.moveId === move.id);
+    const sketchIndex = user.getMoveset().findIndex(m => m.moveId === move.id);
     if (sketchIndex === -1) {
       return false;
     }
@@ -7539,7 +7510,7 @@ export class SketchAttr extends MoveEffectAttr {
         return false;
       }
 
-      if (user.getMoveset().find(m => m?.moveId === targetMove.move)) {
+      if (user.getMoveset().find(m => m.moveId === targetMove.move)) {
         return false;
       }
 
@@ -7552,7 +7523,7 @@ export class AbilityChangeAttr extends MoveEffectAttr {
   public ability: Abilities;
 
   constructor(ability: Abilities, selfTarget?: boolean) {
-    super(selfTarget, { trigger: MoveEffectTrigger.HIT });
+    super(selfTarget);
 
     this.ability = ability;
   }
@@ -7564,16 +7535,18 @@ export class AbilityChangeAttr extends MoveEffectAttr {
 
     const moveTarget = this.selfTarget ? user : target;
 
-    moveTarget.summonData.ability = this.ability;
     globalScene.triggerPokemonFormChange(moveTarget, SpeciesFormChangeRevertWeatherFormTrigger);
-
-    globalScene.queueMessage(i18next.t("moveTriggers:acquiredAbility", { pokemonName: getPokemonNameWithAffix((this.selfTarget ? user : target)), abilityName: allAbilities[this.ability].name }));
-
+    if (moveTarget.breakIllusion()) {
+      globalScene.queueMessage(i18next.t("abilityTriggers:illusionBreak", { pokemonName: getPokemonNameWithAffix(moveTarget) }));
+    }
+    globalScene.queueMessage(i18next.t("moveTriggers:acquiredAbility", { pokemonName: getPokemonNameWithAffix(moveTarget), abilityName: allAbilities[this.ability].name }));
+    moveTarget.setTempAbility(allAbilities[this.ability]);
+    globalScene.triggerPokemonFormChange(moveTarget, SpeciesFormChangeRevertWeatherFormTrigger);
     return true;
   }
 
   getCondition(): MoveConditionFunc {
-    return (user, target, move) => !(this.selfTarget ? user : target).getAbility().hasAttr(UnsuppressableAbilityAbAttr) && (this.selfTarget ? user : target).getAbility().id !== this.ability;
+    return (user, target, move) => (this.selfTarget ? user : target).getAbility().isReplaceable && (this.selfTarget ? user : target).getAbility().id !== this.ability;
   }
 }
 
@@ -7581,7 +7554,7 @@ export class AbilityCopyAttr extends MoveEffectAttr {
   public copyToPartner: boolean;
 
   constructor(copyToPartner: boolean = false) {
-    super(false, { trigger: MoveEffectTrigger.HIT });
+    super(false);
 
     this.copyToPartner = copyToPartner;
   }
@@ -7591,13 +7564,14 @@ export class AbilityCopyAttr extends MoveEffectAttr {
       return false;
     }
 
-    user.summonData.ability = target.getAbility().id;
-
     globalScene.queueMessage(i18next.t("moveTriggers:copiedTargetAbility", { pokemonName: getPokemonNameWithAffix(user), targetName: getPokemonNameWithAffix(target), abilityName: allAbilities[target.getAbility().id].name }));
 
-    if (this.copyToPartner && globalScene.currentBattle?.double && user.getAlly().hp) {
-      user.getAlly().summonData.ability = target.getAbility().id;
-      globalScene.queueMessage(i18next.t("moveTriggers:copiedTargetAbility", { pokemonName: getPokemonNameWithAffix(user.getAlly()), targetName: getPokemonNameWithAffix(target), abilityName: allAbilities[target.getAbility().id].name }));
+    user.setTempAbility(target.getAbility());
+    const ally = user.getAlly();
+
+    if (this.copyToPartner && globalScene.currentBattle?.double && !isNullOrUndefined(ally) && ally.hp) { // TODO is this the best way to check that the ally is active?
+      globalScene.queueMessage(i18next.t("moveTriggers:copiedTargetAbility", { pokemonName: getPokemonNameWithAffix(ally), targetName: getPokemonNameWithAffix(target), abilityName: allAbilities[target.getAbility().id].name }));
+      ally.setTempAbility(target.getAbility());
     }
 
     return true;
@@ -7605,9 +7579,10 @@ export class AbilityCopyAttr extends MoveEffectAttr {
 
   getCondition(): MoveConditionFunc {
     return (user, target, move) => {
-      let ret = !target.getAbility().hasAttr(UncopiableAbilityAbAttr) && !user.getAbility().hasAttr(UnsuppressableAbilityAbAttr);
+      const ally = user.getAlly();
+      let ret = target.getAbility().isCopiable && user.getAbility().isReplaceable;
       if (this.copyToPartner && globalScene.currentBattle?.double) {
-        ret = ret && (!user.getAlly().hp || !user.getAlly().getAbility().hasAttr(UnsuppressableAbilityAbAttr));
+        ret = ret && (!ally?.hp || ally?.getAbility().isReplaceable);
       } else {
         ret = ret && user.getAbility().id !== target.getAbility().id;
       }
@@ -7620,7 +7595,7 @@ export class AbilityGiveAttr extends MoveEffectAttr {
   public copyToPartner: boolean;
 
   constructor() {
-    super(false, { trigger: MoveEffectTrigger.HIT });
+    super(false);
   }
 
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
@@ -7628,15 +7603,15 @@ export class AbilityGiveAttr extends MoveEffectAttr {
       return false;
     }
 
-    target.summonData.ability = user.getAbility().id;
-
     globalScene.queueMessage(i18next.t("moveTriggers:acquiredAbility", { pokemonName: getPokemonNameWithAffix(target), abilityName: allAbilities[user.getAbility().id].name }));
 
+    target.setTempAbility(user.getAbility());
+
     return true;
   }
 
   getCondition(): MoveConditionFunc {
-    return (user, target, move) => !user.getAbility().hasAttr(UncopiableAbilityAbAttr) && !target.getAbility().hasAttr(UnsuppressableAbilityAbAttr) && user.getAbility().id !== target.getAbility().id;
+    return (user, target, move) => user.getAbility().isCopiable && target.getAbility().isReplaceable && user.getAbility().id !== target.getAbility().id;
   }
 }
 
@@ -7646,21 +7621,20 @@ export class SwitchAbilitiesAttr extends MoveEffectAttr {
       return false;
     }
 
-    const tempAbilityId = user.getAbility().id;
-    user.summonData.ability = target.getAbility().id;
-    target.summonData.ability = tempAbilityId;
+    const tempAbility = user.getAbility();
 
     globalScene.queueMessage(i18next.t("moveTriggers:swappedAbilitiesWithTarget", { pokemonName: getPokemonNameWithAffix(user) }));
+
+    user.setTempAbility(target.getAbility());
+    target.setTempAbility(tempAbility);
     // Swaps Forecast/Flower Gift from Castform/Cherrim
     globalScene.arena.triggerWeatherBasedFormChangesToNormal();
-    // Swaps Forecast/Flower Gift to Castform/Cherrim (edge case)
-    globalScene.arena.triggerWeatherBasedFormChanges();
 
     return true;
   }
 
   getCondition(): MoveConditionFunc {
-    return (user, target, move) => !user.getAbility().hasAttr(UnswappableAbilityAbAttr) && !target.getAbility().hasAttr(UnswappableAbilityAbAttr);
+    return (user, target, move) => [user, target].every(pkmn => pkmn.getAbility().isSwappable);
   }
 }
 
@@ -7679,17 +7653,18 @@ export class SuppressAbilitiesAttr extends MoveEffectAttr {
       return false;
     }
 
-    target.summonData.abilitySuppressed = true;
-    globalScene.arena.triggerWeatherBasedFormChangesToNormal();
-
     globalScene.queueMessage(i18next.t("moveTriggers:suppressAbilities", { pokemonName: getPokemonNameWithAffix(target) }));
 
+    target.suppressAbility();
+
+    globalScene.arena.triggerWeatherBasedFormChangesToNormal();
+
     return true;
   }
 
   /** Causes the effect to fail when the target's ability is unsupressable or already suppressed. */
   getCondition(): MoveConditionFunc {
-    return (user, target, move) => !target.getAbility().hasAttr(UnsuppressableAbilityAbAttr) && !target.summonData.abilitySuppressed;
+    return (user, target, move) => target.getAbility().isSuppressable && !target.summonData.abilitySuppressed;
   }
 }
 
@@ -7726,49 +7701,15 @@ export class SuppressAbilitiesIfActedAttr extends MoveEffectAttr {
  * Used by Transform
  */
 export class TransformAttr extends MoveEffectAttr {
-  async apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): Promise<boolean> {
+  override apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
     if (!super.apply(user, target, move, args)) {
       return false;
     }
 
-    const promises: Promise<void>[] = [];
-    user.summonData.speciesForm = target.getSpeciesForm();
-    user.summonData.ability = target.getAbility().id;
-    user.summonData.gender = target.getGender();
-
-    // Power Trick's effect will not preserved after using Transform
-    user.removeTag(BattlerTagType.POWER_TRICK);
-
-    // Copy all stats (except HP)
-    for (const s of EFFECTIVE_STATS) {
-      user.setStat(s, target.getStat(s, false), false);
-    }
-
-    // Copy all stat stages
-    for (const s of BATTLE_STATS) {
-      user.setStatStage(s, target.getStatStage(s));
-    }
-
-    user.summonData.moveset = target.getMoveset().map((m) => {
-      if (m) {
-        // If PP value is less than 5, do nothing. If greater, we need to reduce the value to 5.
-        return new PokemonMove(m.moveId, 0, 0, false, Math.min(m.getMove().pp, 5));
-      } else {
-        console.warn(`Transform: somehow iterating over a ${m} value when copying moveset!`);
-        return new PokemonMove(Moves.NONE);
-      }
-    });
-    user.summonData.types = target.getTypes();
-    promises.push(user.updateInfo());
+    globalScene.unshiftPhase(new PokemonTransformPhase(user.getBattlerIndex(), target.getBattlerIndex()));
 
     globalScene.queueMessage(i18next.t("moveTriggers:transformedIntoTarget", { pokemonName: getPokemonNameWithAffix(user), targetName: getPokemonNameWithAffix(target) }));
 
-    promises.push(user.loadAssets(false).then(() => {
-      user.playAnim();
-      user.updateInfo();
-    }));
-
-    await Promise.all(promises);
     return true;
   }
 }
@@ -7917,23 +7858,9 @@ export class AverageStatsAttr extends MoveEffectAttr {
   }
 }
 
-export class DiscourageFrequentUseAttr extends MoveAttr {
-  getUserBenefitScore(user: Pokemon, target: Pokemon, move: Move): number {
-    const lastMoves = user.getLastXMoves(4);
-    console.log(lastMoves);
-    for (let m = 0; m < lastMoves.length; m++) {
-      if (lastMoves[m].move === move.id) {
-        return (4 - (m + 1)) * -10;
-      }
-    }
-
-    return 0;
-  }
-}
-
 export class MoneyAttr extends MoveEffectAttr {
   constructor() {
-    super(true, { trigger: MoveEffectTrigger.HIT, firstHitOnly: true });
+    super(true, {firstHitOnly: true });
   }
 
   apply(user: Pokemon, target: Pokemon, move: Move): boolean {
@@ -8000,7 +7927,7 @@ export class StatusIfBoostedAttr extends MoveEffectAttr {
   public effect: StatusEffect;
 
   constructor(effect: StatusEffect) {
-    super(true, { trigger: MoveEffectTrigger.HIT });
+    super(true);
     this.effect = effect;
   }
 
@@ -8019,17 +7946,27 @@ export class StatusIfBoostedAttr extends MoveEffectAttr {
   }
 }
 
+/**
+ * Attribute to fail move usage unless all of the user's other moves have been used at least once.
+ * Used by {@linkcode Moves.LAST_RESORT}.
+ */
 export class LastResortAttr extends MoveAttr {
+  // TODO: Verify behavior as Bulbapedia page is _extremely_ poorly documented
   getCondition(): MoveConditionFunc {
-    return (user: Pokemon, target: Pokemon, move: Move) => {
-      const uniqueUsedMoveIds = new Set<Moves>();
-      const movesetMoveIds = user.getMoveset().map(m => m?.moveId);
-      user.getMoveHistory().map(m => {
-        if (m.move !== move.id && movesetMoveIds.find(mm => mm === m.move)) {
-          uniqueUsedMoveIds.add(m.move);
-        }
-      });
-      return uniqueUsedMoveIds.size >= movesetMoveIds.length - 1;
+    return (user: Pokemon, _target: Pokemon, move: Move) => {
+      const movesInMoveset = new Set<Moves>(user.getMoveset().map(m => m.moveId));
+      if (!movesInMoveset.delete(move.id) || !movesInMoveset.size) {
+        return false; // Last resort fails if used when not in user's moveset or no other moves exist
+      }
+
+      const movesInHistory = new Set(
+        user.getMoveHistory()
+        .filter(m => !m.virtual) // TODO: Change to (m) => m < MoveUseType.INDIRECT after Dancer PR refactors virtual into enum
+        .map(m => m.move)
+      );
+
+      // Since `Set.intersection()` is only present in ESNext, we have to coerce it to an array to check inclusion
+      return [...movesInMoveset].every(m => movesInHistory.has(m))
     };
   }
 }
@@ -8044,7 +7981,7 @@ export class VariableTargetAttr extends MoveAttr {
   }
 
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
-    const targetVal = args[0] as Utils.NumberHolder;
+    const targetVal = args[0] as NumberHolder;
     targetVal.value = this.targetChangeFunc(user, target, move);
     return true;
   }
@@ -8078,6 +8015,56 @@ export class AfterYouAttr extends MoveEffectAttr {
   }
 }
 
+/**
+ * Move effect to force the target to move last, ignoring priority.
+ * If applied to multiple targets, they move in speed order after all other moves.
+ * @extends MoveEffectAttr
+ */
+export class ForceLastAttr extends MoveEffectAttr {
+  /**
+   * Forces the target of this move to move last.
+   *
+   * @param user {@linkcode Pokemon} that is using the move.
+   * @param target {@linkcode Pokemon} that will be forced to move last.
+   * @param move {@linkcode Move} {@linkcode Moves.QUASH}
+   * @param _args N/A
+   * @returns true
+   */
+  override apply(user: Pokemon, target: Pokemon, _move: Move, _args: any[]): boolean {
+    globalScene.queueMessage(i18next.t("moveTriggers:forceLast", { targetPokemonName: getPokemonNameWithAffix(target) }));
+
+    const targetMovePhase = globalScene.findPhase<MovePhase>((phase) => phase.pokemon === target);
+    if (targetMovePhase && !targetMovePhase.isForcedLast() && globalScene.tryRemovePhase((phase: MovePhase) => phase.pokemon === target)) {
+      // Finding the phase to insert the move in front of -
+      // Either the end of the turn or in front of another, slower move which has also been forced last
+      const prependPhase = globalScene.findPhase((phase) =>
+        [ MovePhase, MoveEndPhase ].every(cls => !(phase instanceof cls))
+        || (phase instanceof MovePhase) && phaseForcedSlower(phase, target, !!globalScene.arena.getTag(ArenaTagType.TRICK_ROOM))
+      );
+      if (prependPhase) {
+        globalScene.phaseQueue.splice(
+          globalScene.phaseQueue.indexOf(prependPhase),
+          0,
+          new MovePhase(target, [ ...targetMovePhase.targets ], targetMovePhase.move, false, false, false, true)
+        );
+      }
+    }
+    return true;
+  }
+}
+
+/** Returns whether a {@linkcode MovePhase} has been forced last and the corresponding pokemon is slower than {@linkcode target} */
+const phaseForcedSlower = (phase: MovePhase, target: Pokemon, trickRoom: boolean): boolean => {
+  let slower: boolean;
+  // quashed pokemon still have speed ties
+  if (phase.pokemon.getEffectiveStat(Stat.SPD) === target.getEffectiveStat(Stat.SPD)) {
+    slower = !!target.randBattleSeedInt(2);
+  } else {
+    slower = !trickRoom ? phase.pokemon.getEffectiveStat(Stat.SPD) < target.getEffectiveStat(Stat.SPD) : phase.pokemon.getEffectiveStat(Stat.SPD) > target.getEffectiveStat(Stat.SPD);
+  }
+  return phase.isForcedLast() && slower;
+};
+
 const failOnGravityCondition: MoveConditionFunc = (user, target, move) => !globalScene.arena.getTag(ArenaTagType.GRAVITY);
 
 const failOnBossCondition: MoveConditionFunc = (user, target, move) => !target.isBossImmune();
@@ -8085,7 +8072,7 @@ const failOnBossCondition: MoveConditionFunc = (user, target, move) => !target.i
 const failIfSingleBattle: MoveConditionFunc = (user, target, move) => globalScene.currentBattle.double;
 
 const failIfDampCondition: MoveConditionFunc = (user, target, move) => {
-  const cancelled = new Utils.BooleanHolder(false);
+  const cancelled = new BooleanHolder(false);
   globalScene.getField(true).map(p=>applyAbAttrs(FieldPreventExplosiveMovesAbAttr, p, cancelled));
   // Queue a message if an ability prevented usage of the move
   if (cancelled.value) {
@@ -8105,7 +8092,7 @@ const failIfLastInPartyCondition: MoveConditionFunc = (user: Pokemon, target: Po
   return party.some(pokemon => pokemon.isActive() && !pokemon.isOnField());
 };
 
-const failIfGhostTypeCondition: MoveConditionFunc = (user: Pokemon, target: Pokemon, move: Move) => !target.isOfType(Type.GHOST);
+const failIfGhostTypeCondition: MoveConditionFunc = (user: Pokemon, target: Pokemon, move: Move) => !target.isOfType(PokemonType.GHOST);
 
 const failIfNoTargetHeldItemsCondition: MoveConditionFunc = (user: Pokemon, target: Pokemon, move: Move) => target.getHeldItems().filter(i => i.isTransferable)?.length > 0;
 
@@ -8121,44 +8108,54 @@ const attackedByItemMessageFunc = (user: Pokemon, target: Pokemon, move: Move) =
 
 export type MoveAttrFilter = (attr: MoveAttr) => boolean;
 
-function applyMoveAttrsInternal(attrFilter: MoveAttrFilter, user: Pokemon | null, target: Pokemon | null, move: Move, args: any[]): Promise<void> {
-  return new Promise(resolve => {
-    const attrPromises: Promise<boolean>[] = [];
-    const moveAttrs = move.attrs.filter(a => attrFilter(a));
-    for (const attr of moveAttrs) {
-      const result = attr.apply(user, target, move, args);
-      if (result instanceof Promise) {
-        attrPromises.push(result);
-      }
-    }
-    Promise.allSettled(attrPromises).then(() => resolve());
-  });
+function applyMoveAttrsInternal(
+  attrFilter: MoveAttrFilter,
+  user: Pokemon | null,
+  target: Pokemon | null,
+  move: Move,
+  args: any[],
+): void {
+  move.attrs.filter((attr) => attrFilter(attr)).forEach((attr) => attr.apply(user, target, move, args));
 }
 
-function applyMoveChargeAttrsInternal(attrFilter: MoveAttrFilter, user: Pokemon | null, target: Pokemon | null, move: ChargingMove, args: any[]): Promise<void> {
-  return new Promise(resolve => {
-    const chargeAttrPromises: Promise<boolean>[] = [];
-    const chargeMoveAttrs = move.chargeAttrs.filter(a => attrFilter(a));
-    for (const attr of chargeMoveAttrs) {
-      const result = attr.apply(user, target, move, args);
-      if (result instanceof Promise) {
-        chargeAttrPromises.push(result);
-      }
-    }
-    Promise.allSettled(chargeAttrPromises).then(() => resolve());
-  });
+function applyMoveChargeAttrsInternal(
+  attrFilter: MoveAttrFilter,
+  user: Pokemon | null,
+  target: Pokemon | null,
+  move: ChargingMove,
+  args: any[],
+): void {
+  move.chargeAttrs.filter((attr) => attrFilter(attr)).forEach((attr) => attr.apply(user, target, move, args));
 }
 
-export function applyMoveAttrs(attrType: Constructor<MoveAttr>, user: Pokemon | null, target: Pokemon | null, move: Move, ...args: any[]): Promise<void> {
-  return applyMoveAttrsInternal((attr: MoveAttr) => attr instanceof attrType, user, target, move, args);
+export function applyMoveAttrs(
+  attrType: Constructor<MoveAttr>,
+  user: Pokemon | null,
+  target: Pokemon | null,
+  move: Move,
+  ...args: any[]
+): void {
+  applyMoveAttrsInternal((attr: MoveAttr) => attr instanceof attrType, user, target, move, args);
 }
 
-export function applyFilteredMoveAttrs(attrFilter: MoveAttrFilter, user: Pokemon, target: Pokemon | null, move: Move, ...args: any[]): Promise<void> {
-  return applyMoveAttrsInternal(attrFilter, user, target, move, args);
+export function applyFilteredMoveAttrs(
+  attrFilter: MoveAttrFilter,
+  user: Pokemon,
+  target: Pokemon | null,
+  move: Move,
+  ...args: any[]
+): void {
+  applyMoveAttrsInternal(attrFilter, user, target, move, args);
 }
 
-export function applyMoveChargeAttrs(attrType: Constructor<MoveAttr>, user: Pokemon | null, target: Pokemon | null, move: ChargingMove, ...args: any[]): Promise<void> {
-  return applyMoveChargeAttrsInternal((attr: MoveAttr) => attr instanceof attrType, user, target, move, args);
+export function applyMoveChargeAttrs(
+  attrType: Constructor<MoveAttr>,
+  user: Pokemon | null,
+  target: Pokemon | null,
+  move: ChargingMove,
+  ...args: any[]
+): void {
+  applyMoveChargeAttrsInternal((attr: MoveAttr) => attr instanceof attrType, user, target, move, args);
 }
 
 export class MoveCondition {
@@ -8177,13 +8174,18 @@ export class MoveCondition {
   }
 }
 
+/**
+ * Condition to allow a move's use only on the first turn this Pokemon is sent into battle
+ * (or the start of a new wave, whichever comes first).
+ */
+
 export class FirstMoveCondition extends MoveCondition {
   constructor() {
-    super((user, target, move) => user.battleSummonData?.waveTurnCount === 1);
+    super((user, _target, _move) => user.tempSummonData.waveTurnCount === 1);
   }
 
-  getUserBenefitScore(user: Pokemon, target: Pokemon, move: Move): number {
-    return this.apply(user, target, move) ? 10 : -20;
+  getUserBenefitScore(user: Pokemon, _target: Pokemon, _move: Move): number {
+    return this.apply(user, _target, _move) ? 10 : -20;
   }
 }
 
@@ -8208,10 +8210,10 @@ export class UpperHandCondition extends MoveCondition {
   }
 }
 
-export class hitsSameTypeAttr extends VariableMoveTypeMultiplierAttr {
+export class HitsSameTypeAttr extends VariableMoveTypeMultiplierAttr {
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
-    const multiplier = args[0] as Utils.NumberHolder;
-    if (!user.getTypes().some(type => target.getTypes().includes(type))) {
+    const multiplier = args[0] as NumberHolder;
+    if (!user.getTypes(true).some(type => target.getTypes(true).includes(type))) {
       multiplier.value = 0;
       return true;
     }
@@ -8251,7 +8253,7 @@ export class ResistLastMoveTypeAttr extends MoveEffectAttr {
     }
 
     const moveData = allMoves[targetMove.move];
-    if (moveData.type === Type.STELLAR || moveData.type === Type.UNKNOWN) {
+    if (moveData.type === PokemonType.STELLAR || moveData.type === PokemonType.UNKNOWN) {
       return false;
     }
     const userTypes = user.getTypes();
@@ -8259,9 +8261,9 @@ export class ResistLastMoveTypeAttr extends MoveEffectAttr {
     if (!validTypes.length) {
       return false;
     }
-    const type = validTypes[user.randSeedInt(validTypes.length)];
+    const type = validTypes[user.randBattleSeedInt(validTypes.length)];
     user.summonData.types = [ type ];
-    globalScene.queueMessage(i18next.t("battle:transformedIntoType", { pokemonName: getPokemonNameWithAffix(user), type: Utils.toReadableString(Type[type]) }));
+    globalScene.queueMessage(i18next.t("battle:transformedIntoType", { pokemonName: getPokemonNameWithAffix(user), type: toReadableString(PokemonType[type]) }));
     user.updateInfo();
 
     return true;
@@ -8271,13 +8273,13 @@ export class ResistLastMoveTypeAttr extends MoveEffectAttr {
    * Retrieve the types resisting a given type. Used by Conversion 2
    * @returns An array populated with Types, or an empty array if no resistances exist (Unknown or Stellar type)
    */
-  getTypeResistances(gameMode: GameMode, type: number): Type[] {
-    const typeResistances: Type[] = [];
+  getTypeResistances(gameMode: GameMode, type: number): PokemonType[] {
+    const typeResistances: PokemonType[] = [];
 
-    for (let i = 0; i < Object.keys(Type).length; i++) {
+    for (let i = 0; i < Object.keys(PokemonType).length; i++) {
       const multiplier = new NumberHolder(1);
       multiplier.value = getTypeDamageMultiplier(type, i);
-      applyChallenges(gameMode, ChallengeType.TYPE_EFFECTIVENESS, multiplier);
+      applyChallenges(ChallengeType.TYPE_EFFECTIVENESS, multiplier);
       if (multiplier.value < 1) {
         typeResistances.push(i);
       }
@@ -8327,7 +8329,7 @@ export class ExposedMoveAttr extends AddBattlerTagAttr {
 }
 
 
-const unknownTypeCondition: MoveConditionFunc = (user, target, move) => !user.getTypes().includes(Type.UNKNOWN);
+const unknownTypeCondition: MoveConditionFunc = (user, target, move) => !user.getTypes().includes(PokemonType.UNKNOWN);
 
 export type MoveTargetSet = {
   targets: BattlerIndex[];
@@ -8335,8 +8337,8 @@ export type MoveTargetSet = {
 };
 
 export function getMoveTargets(user: Pokemon, move: Moves, replaceTarget?: MoveTarget): MoveTargetSet {
-  const variableTarget = new Utils.NumberHolder(0);
-  user.getOpponents().forEach(p => applyMoveAttrs(VariableTargetAttr, user, p, allMoves[move], variableTarget));
+  const variableTarget = new NumberHolder(0);
+  user.getOpponents(false).forEach(p => applyMoveAttrs(VariableTargetAttr, user, p, allMoves[move], variableTarget));
 
   let moveTarget: MoveTarget | undefined;
   if (allMoves[move].hasAttr(VariableTargetAttr)) {
@@ -8348,10 +8350,11 @@ export function getMoveTargets(user: Pokemon, move: Moves, replaceTarget?: MoveT
   } else if (move === undefined) {
     moveTarget = MoveTarget.NEAR_ENEMY;
   }
-  const opponents = user.getOpponents();
+  const opponents = user.getOpponents(false);
 
   let set: Pokemon[] = [];
   let multiple = false;
+  const ally: Pokemon | undefined = user.getAlly();
 
   switch (moveTarget) {
     case MoveTarget.USER:
@@ -8362,7 +8365,7 @@ export function getMoveTargets(user: Pokemon, move: Moves, replaceTarget?: MoveT
     case MoveTarget.OTHER:
     case MoveTarget.ALL_NEAR_OTHERS:
     case MoveTarget.ALL_OTHERS:
-      set = (opponents.concat([ user.getAlly() ]));
+      set = !isNullOrUndefined(ally) ? (opponents.concat([ ally ])) : opponents;
       multiple = moveTarget === MoveTarget.ALL_NEAR_OTHERS || moveTarget === MoveTarget.ALL_OTHERS;
       break;
     case MoveTarget.NEAR_ENEMY:
@@ -8373,27 +8376,28 @@ export function getMoveTargets(user: Pokemon, move: Moves, replaceTarget?: MoveT
       multiple = moveTarget !== MoveTarget.NEAR_ENEMY;
       break;
     case MoveTarget.RANDOM_NEAR_ENEMY:
-      set = [ opponents[user.randSeedInt(opponents.length)] ];
+      set = [ opponents[user.randBattleSeedInt(opponents.length)] ];
       break;
     case MoveTarget.ATTACKER:
       return { targets: [ -1 as BattlerIndex ], multiple: false };
     case MoveTarget.NEAR_ALLY:
     case MoveTarget.ALLY:
-      set = [ user.getAlly() ];
+      set = !isNullOrUndefined(ally) ? [ ally ] : [];
       break;
     case MoveTarget.USER_OR_NEAR_ALLY:
     case MoveTarget.USER_AND_ALLIES:
     case MoveTarget.USER_SIDE:
-      set = [ user, user.getAlly() ];
+      set = !isNullOrUndefined(ally) ? [ user, ally ] : [ user ];
       multiple = moveTarget !== MoveTarget.USER_OR_NEAR_ALLY;
       break;
     case MoveTarget.ALL:
     case MoveTarget.BOTH_SIDES:
-      set = [ user, user.getAlly() ].concat(opponents);
+      set = (!isNullOrUndefined(ally) ? [ user, ally ] : [ user ]).concat(opponents);
       multiple = true;
       break;
     case MoveTarget.CURSE:
-      set = user.getTypes(true).includes(Type.GHOST) ? (opponents.concat([ user.getAlly() ])) : [ user ];
+      const extraTargets = !isNullOrUndefined(ally) ? [ ally ] : [];
+      set = user.getTypes(true).includes(PokemonType.GHOST) ? (opponents.concat(extraTargets)) : [ user ];
       break;
   }
 
@@ -8401,540 +8405,584 @@ export function getMoveTargets(user: Pokemon, move: Moves, replaceTarget?: MoveT
 }
 
 export const allMoves: Move[] = [
-  new SelfStatusMove(Moves.NONE, Type.NORMAL, MoveCategory.STATUS, -1, -1, 0, 1),
+  new SelfStatusMove(Moves.NONE, PokemonType.NORMAL, MoveCategory.STATUS, -1, -1, 0, 1),
 ];
 
 export const selfStatLowerMoves: Moves[] = [];
 
 export function initMoves() {
   allMoves.push(
-    new AttackMove(Moves.POUND, Type.NORMAL, MoveCategory.PHYSICAL, 40, 100, 35, -1, 0, 1),
-    new AttackMove(Moves.KARATE_CHOP, Type.FIGHTING, MoveCategory.PHYSICAL, 50, 100, 25, -1, 0, 1)
+    new AttackMove(Moves.POUND, PokemonType.NORMAL, MoveCategory.PHYSICAL, 40, 100, 35, -1, 0, 1),
+    new AttackMove(Moves.KARATE_CHOP, PokemonType.FIGHTING, MoveCategory.PHYSICAL, 50, 100, 25, -1, 0, 1)
       .attr(HighCritAttr),
-    new AttackMove(Moves.DOUBLE_SLAP, Type.NORMAL, MoveCategory.PHYSICAL, 15, 85, 10, -1, 0, 1)
+    new AttackMove(Moves.DOUBLE_SLAP, PokemonType.NORMAL, MoveCategory.PHYSICAL, 15, 85, 10, -1, 0, 1)
       .attr(MultiHitAttr),
-    new AttackMove(Moves.COMET_PUNCH, Type.NORMAL, MoveCategory.PHYSICAL, 18, 85, 15, -1, 0, 1)
+    new AttackMove(Moves.COMET_PUNCH, PokemonType.NORMAL, MoveCategory.PHYSICAL, 18, 85, 15, -1, 0, 1)
       .attr(MultiHitAttr)
       .punchingMove(),
-    new AttackMove(Moves.MEGA_PUNCH, Type.NORMAL, MoveCategory.PHYSICAL, 80, 85, 20, -1, 0, 1)
+    new AttackMove(Moves.MEGA_PUNCH, PokemonType.NORMAL, MoveCategory.PHYSICAL, 80, 85, 20, -1, 0, 1)
       .punchingMove(),
-    new AttackMove(Moves.PAY_DAY, Type.NORMAL, MoveCategory.PHYSICAL, 40, 100, 20, -1, 0, 1)
+    new AttackMove(Moves.PAY_DAY, PokemonType.NORMAL, MoveCategory.PHYSICAL, 40, 100, 20, -1, 0, 1)
       .attr(MoneyAttr)
       .makesContact(false),
-    new AttackMove(Moves.FIRE_PUNCH, Type.FIRE, MoveCategory.PHYSICAL, 75, 100, 15, 10, 0, 1)
+    new AttackMove(Moves.FIRE_PUNCH, PokemonType.FIRE, MoveCategory.PHYSICAL, 75, 100, 15, 10, 0, 1)
       .attr(StatusEffectAttr, StatusEffect.BURN)
       .punchingMove(),
-    new AttackMove(Moves.ICE_PUNCH, Type.ICE, MoveCategory.PHYSICAL, 75, 100, 15, 10, 0, 1)
+    new AttackMove(Moves.ICE_PUNCH, PokemonType.ICE, MoveCategory.PHYSICAL, 75, 100, 15, 10, 0, 1)
       .attr(StatusEffectAttr, StatusEffect.FREEZE)
       .punchingMove(),
-    new AttackMove(Moves.THUNDER_PUNCH, Type.ELECTRIC, MoveCategory.PHYSICAL, 75, 100, 15, 10, 0, 1)
+    new AttackMove(Moves.THUNDER_PUNCH, PokemonType.ELECTRIC, MoveCategory.PHYSICAL, 75, 100, 15, 10, 0, 1)
       .attr(StatusEffectAttr, StatusEffect.PARALYSIS)
       .punchingMove(),
-    new AttackMove(Moves.SCRATCH, Type.NORMAL, MoveCategory.PHYSICAL, 40, 100, 35, -1, 0, 1),
-    new AttackMove(Moves.VISE_GRIP, Type.NORMAL, MoveCategory.PHYSICAL, 55, 100, 30, -1, 0, 1),
-    new AttackMove(Moves.GUILLOTINE, Type.NORMAL, MoveCategory.PHYSICAL, 200, 30, 5, -1, 0, 1)
+    new AttackMove(Moves.SCRATCH, PokemonType.NORMAL, MoveCategory.PHYSICAL, 40, 100, 35, -1, 0, 1),
+    new AttackMove(Moves.VISE_GRIP, PokemonType.NORMAL, MoveCategory.PHYSICAL, 55, 100, 30, -1, 0, 1),
+    new AttackMove(Moves.GUILLOTINE, PokemonType.NORMAL, MoveCategory.PHYSICAL, 200, 30, 5, -1, 0, 1)
       .attr(OneHitKOAttr)
       .attr(OneHitKOAccuracyAttr),
-    new ChargingAttackMove(Moves.RAZOR_WIND, Type.NORMAL, MoveCategory.SPECIAL, 80, 100, 10, -1, 0, 1)
+    new ChargingAttackMove(Moves.RAZOR_WIND, PokemonType.NORMAL, MoveCategory.SPECIAL, 80, 100, 10, -1, 0, 1)
       .chargeText(i18next.t("moveTriggers:whippedUpAWhirlwind", { pokemonName: "{USER}" }))
       .attr(HighCritAttr)
       .windMove()
       .target(MoveTarget.ALL_NEAR_ENEMIES),
-    new SelfStatusMove(Moves.SWORDS_DANCE, Type.NORMAL, -1, 20, -1, 0, 1)
+    new SelfStatusMove(Moves.SWORDS_DANCE, PokemonType.NORMAL, -1, 20, -1, 0, 1)
       .attr(StatStageChangeAttr, [ Stat.ATK ], 2, true)
       .danceMove(),
-    new AttackMove(Moves.CUT, Type.NORMAL, MoveCategory.PHYSICAL, 50, 95, 30, -1, 0, 1)
+    new AttackMove(Moves.CUT, PokemonType.NORMAL, MoveCategory.PHYSICAL, 50, 95, 30, -1, 0, 1)
       .slicingMove(),
-    new AttackMove(Moves.GUST, Type.FLYING, MoveCategory.SPECIAL, 40, 100, 35, -1, 0, 1)
+    new AttackMove(Moves.GUST, PokemonType.FLYING, MoveCategory.SPECIAL, 40, 100, 35, -1, 0, 1)
       .attr(HitsTagForDoubleDamageAttr, BattlerTagType.FLYING)
       .windMove(),
-    new AttackMove(Moves.WING_ATTACK, Type.FLYING, MoveCategory.PHYSICAL, 60, 100, 35, -1, 0, 1),
-    new StatusMove(Moves.WHIRLWIND, Type.NORMAL, -1, 20, -1, -6, 1)
+    new AttackMove(Moves.WING_ATTACK, PokemonType.FLYING, MoveCategory.PHYSICAL, 60, 100, 35, -1, 0, 1),
+    new StatusMove(Moves.WHIRLWIND, PokemonType.NORMAL, -1, 20, -1, -6, 1)
       .attr(ForceSwitchOutAttr, false, SwitchType.FORCE_SWITCH)
       .ignoresSubstitute()
       .hidesTarget()
-      .windMove(),
-    new ChargingAttackMove(Moves.FLY, Type.FLYING, MoveCategory.PHYSICAL, 90, 95, 15, -1, 0, 1)
+      .windMove()
+      .reflectable(),
+    new ChargingAttackMove(Moves.FLY, PokemonType.FLYING, MoveCategory.PHYSICAL, 90, 95, 15, -1, 0, 1)
       .chargeText(i18next.t("moveTriggers:flewUpHigh", { pokemonName: "{USER}" }))
       .chargeAttr(SemiInvulnerableAttr, BattlerTagType.FLYING)
       .condition(failOnGravityCondition),
-    new AttackMove(Moves.BIND, Type.NORMAL, MoveCategory.PHYSICAL, 15, 85, 20, -1, 0, 1)
+    new AttackMove(Moves.BIND, PokemonType.NORMAL, MoveCategory.PHYSICAL, 15, 85, 20, -1, 0, 1)
       .attr(TrapAttr, BattlerTagType.BIND),
-    new AttackMove(Moves.SLAM, Type.NORMAL, MoveCategory.PHYSICAL, 80, 75, 20, -1, 0, 1),
-    new AttackMove(Moves.VINE_WHIP, Type.GRASS, MoveCategory.PHYSICAL, 45, 100, 25, -1, 0, 1),
-    new AttackMove(Moves.STOMP, Type.NORMAL, MoveCategory.PHYSICAL, 65, 100, 20, 30, 0, 1)
+    new AttackMove(Moves.SLAM, PokemonType.NORMAL, MoveCategory.PHYSICAL, 80, 75, 20, -1, 0, 1),
+    new AttackMove(Moves.VINE_WHIP, PokemonType.GRASS, MoveCategory.PHYSICAL, 45, 100, 25, -1, 0, 1),
+    new AttackMove(Moves.STOMP, PokemonType.NORMAL, MoveCategory.PHYSICAL, 65, 100, 20, 30, 0, 1)
       .attr(AlwaysHitMinimizeAttr)
       .attr(HitsTagForDoubleDamageAttr, BattlerTagType.MINIMIZED)
       .attr(FlinchAttr),
-    new AttackMove(Moves.DOUBLE_KICK, Type.FIGHTING, MoveCategory.PHYSICAL, 30, 100, 30, -1, 0, 1)
+    new AttackMove(Moves.DOUBLE_KICK, PokemonType.FIGHTING, MoveCategory.PHYSICAL, 30, 100, 30, -1, 0, 1)
       .attr(MultiHitAttr, MultiHitType._2),
-    new AttackMove(Moves.MEGA_KICK, Type.NORMAL, MoveCategory.PHYSICAL, 120, 75, 5, -1, 0, 1),
-    new AttackMove(Moves.JUMP_KICK, Type.FIGHTING, MoveCategory.PHYSICAL, 100, 95, 10, -1, 0, 1)
+    new AttackMove(Moves.MEGA_KICK, PokemonType.NORMAL, MoveCategory.PHYSICAL, 120, 75, 5, -1, 0, 1),
+    new AttackMove(Moves.JUMP_KICK, PokemonType.FIGHTING, MoveCategory.PHYSICAL, 100, 95, 10, -1, 0, 1)
       .attr(MissEffectAttr, crashDamageFunc)
       .attr(NoEffectAttr, crashDamageFunc)
       .condition(failOnGravityCondition)
       .recklessMove(),
-    new AttackMove(Moves.ROLLING_KICK, Type.FIGHTING, MoveCategory.PHYSICAL, 60, 85, 15, 30, 0, 1)
+    new AttackMove(Moves.ROLLING_KICK, PokemonType.FIGHTING, MoveCategory.PHYSICAL, 60, 85, 15, 30, 0, 1)
       .attr(FlinchAttr),
-    new StatusMove(Moves.SAND_ATTACK, Type.GROUND, 100, 15, -1, 0, 1)
-      .attr(StatStageChangeAttr, [ Stat.ACC ], -1),
-    new AttackMove(Moves.HEADBUTT, Type.NORMAL, MoveCategory.PHYSICAL, 70, 100, 15, 30, 0, 1)
+    new StatusMove(Moves.SAND_ATTACK, PokemonType.GROUND, 100, 15, -1, 0, 1)
+      .attr(StatStageChangeAttr, [ Stat.ACC ], -1)
+      .reflectable(),
+    new AttackMove(Moves.HEADBUTT, PokemonType.NORMAL, MoveCategory.PHYSICAL, 70, 100, 15, 30, 0, 1)
       .attr(FlinchAttr),
-    new AttackMove(Moves.HORN_ATTACK, Type.NORMAL, MoveCategory.PHYSICAL, 65, 100, 25, -1, 0, 1),
-    new AttackMove(Moves.FURY_ATTACK, Type.NORMAL, MoveCategory.PHYSICAL, 15, 85, 20, -1, 0, 1)
+    new AttackMove(Moves.HORN_ATTACK, PokemonType.NORMAL, MoveCategory.PHYSICAL, 65, 100, 25, -1, 0, 1),
+    new AttackMove(Moves.FURY_ATTACK, PokemonType.NORMAL, MoveCategory.PHYSICAL, 15, 85, 20, -1, 0, 1)
       .attr(MultiHitAttr),
-    new AttackMove(Moves.HORN_DRILL, Type.NORMAL, MoveCategory.PHYSICAL, 200, 30, 5, -1, 0, 1)
+    new AttackMove(Moves.HORN_DRILL, PokemonType.NORMAL, MoveCategory.PHYSICAL, 200, 30, 5, -1, 0, 1)
       .attr(OneHitKOAttr)
       .attr(OneHitKOAccuracyAttr),
-    new AttackMove(Moves.TACKLE, Type.NORMAL, MoveCategory.PHYSICAL, 40, 100, 35, -1, 0, 1),
-    new AttackMove(Moves.BODY_SLAM, Type.NORMAL, MoveCategory.PHYSICAL, 85, 100, 15, 30, 0, 1)
+    new AttackMove(Moves.TACKLE, PokemonType.NORMAL, MoveCategory.PHYSICAL, 40, 100, 35, -1, 0, 1),
+    new AttackMove(Moves.BODY_SLAM, PokemonType.NORMAL, MoveCategory.PHYSICAL, 85, 100, 15, 30, 0, 1)
       .attr(AlwaysHitMinimizeAttr)
       .attr(HitsTagForDoubleDamageAttr, BattlerTagType.MINIMIZED)
       .attr(StatusEffectAttr, StatusEffect.PARALYSIS),
-    new AttackMove(Moves.WRAP, Type.NORMAL, MoveCategory.PHYSICAL, 15, 90, 20, -1, 0, 1)
+    new AttackMove(Moves.WRAP, PokemonType.NORMAL, MoveCategory.PHYSICAL, 15, 90, 20, -1, 0, 1)
       .attr(TrapAttr, BattlerTagType.WRAP),
-    new AttackMove(Moves.TAKE_DOWN, Type.NORMAL, MoveCategory.PHYSICAL, 90, 85, 20, -1, 0, 1)
+    new AttackMove(Moves.TAKE_DOWN, PokemonType.NORMAL, MoveCategory.PHYSICAL, 90, 85, 20, -1, 0, 1)
       .attr(RecoilAttr)
       .recklessMove(),
-    new AttackMove(Moves.THRASH, Type.NORMAL, MoveCategory.PHYSICAL, 120, 100, 10, -1, 0, 1)
+    new AttackMove(Moves.THRASH, PokemonType.NORMAL, MoveCategory.PHYSICAL, 120, 100, 10, -1, 0, 1)
       .attr(FrenzyAttr)
       .attr(MissEffectAttr, frenzyMissFunc)
       .attr(NoEffectAttr, frenzyMissFunc)
       .target(MoveTarget.RANDOM_NEAR_ENEMY),
-    new AttackMove(Moves.DOUBLE_EDGE, Type.NORMAL, MoveCategory.PHYSICAL, 120, 100, 15, -1, 0, 1)
+    new AttackMove(Moves.DOUBLE_EDGE, PokemonType.NORMAL, MoveCategory.PHYSICAL, 120, 100, 15, -1, 0, 1)
       .attr(RecoilAttr, false, 0.33)
       .recklessMove(),
-    new StatusMove(Moves.TAIL_WHIP, Type.NORMAL, 100, 30, -1, 0, 1)
+    new StatusMove(Moves.TAIL_WHIP, PokemonType.NORMAL, 100, 30, -1, 0, 1)
       .attr(StatStageChangeAttr, [ Stat.DEF ], -1)
-      .target(MoveTarget.ALL_NEAR_ENEMIES),
-    new AttackMove(Moves.POISON_STING, Type.POISON, MoveCategory.PHYSICAL, 15, 100, 35, 30, 0, 1)
+      .target(MoveTarget.ALL_NEAR_ENEMIES)
+      .reflectable(),
+    new AttackMove(Moves.POISON_STING, PokemonType.POISON, MoveCategory.PHYSICAL, 15, 100, 35, 30, 0, 1)
       .attr(StatusEffectAttr, StatusEffect.POISON)
       .makesContact(false),
-    new AttackMove(Moves.TWINEEDLE, Type.BUG, MoveCategory.PHYSICAL, 25, 100, 20, 20, 0, 1)
+    new AttackMove(Moves.TWINEEDLE, PokemonType.BUG, MoveCategory.PHYSICAL, 25, 100, 20, 20, 0, 1)
       .attr(MultiHitAttr, MultiHitType._2)
       .attr(StatusEffectAttr, StatusEffect.POISON)
       .makesContact(false),
-    new AttackMove(Moves.PIN_MISSILE, Type.BUG, MoveCategory.PHYSICAL, 25, 95, 20, -1, 0, 1)
+    new AttackMove(Moves.PIN_MISSILE, PokemonType.BUG, MoveCategory.PHYSICAL, 25, 95, 20, -1, 0, 1)
       .attr(MultiHitAttr)
       .makesContact(false),
-    new StatusMove(Moves.LEER, Type.NORMAL, 100, 30, -1, 0, 1)
+    new StatusMove(Moves.LEER, PokemonType.NORMAL, 100, 30, -1, 0, 1)
       .attr(StatStageChangeAttr, [ Stat.DEF ], -1)
-      .target(MoveTarget.ALL_NEAR_ENEMIES),
-    new AttackMove(Moves.BITE, Type.DARK, MoveCategory.PHYSICAL, 60, 100, 25, 30, 0, 1)
+      .target(MoveTarget.ALL_NEAR_ENEMIES)
+      .reflectable(),
+    new AttackMove(Moves.BITE, PokemonType.DARK, MoveCategory.PHYSICAL, 60, 100, 25, 30, 0, 1)
       .attr(FlinchAttr)
       .bitingMove(),
-    new StatusMove(Moves.GROWL, Type.NORMAL, 100, 40, -1, 0, 1)
+    new StatusMove(Moves.GROWL, PokemonType.NORMAL, 100, 40, -1, 0, 1)
       .attr(StatStageChangeAttr, [ Stat.ATK ], -1)
       .soundBased()
-      .target(MoveTarget.ALL_NEAR_ENEMIES),
-    new StatusMove(Moves.ROAR, Type.NORMAL, -1, 20, -1, -6, 1)
+      .target(MoveTarget.ALL_NEAR_ENEMIES)
+      .reflectable(),
+    new StatusMove(Moves.ROAR, PokemonType.NORMAL, -1, 20, -1, -6, 1)
       .attr(ForceSwitchOutAttr, false, SwitchType.FORCE_SWITCH)
       .soundBased()
-      .hidesTarget(),
-    new StatusMove(Moves.SING, Type.NORMAL, 55, 15, -1, 0, 1)
+      .hidesTarget()
+      .reflectable(),
+    new StatusMove(Moves.SING, PokemonType.NORMAL, 55, 15, -1, 0, 1)
       .attr(StatusEffectAttr, StatusEffect.SLEEP)
-      .soundBased(),
-    new StatusMove(Moves.SUPERSONIC, Type.NORMAL, 55, 20, -1, 0, 1)
+      .soundBased()
+      .reflectable(),
+    new StatusMove(Moves.SUPERSONIC, PokemonType.NORMAL, 55, 20, -1, 0, 1)
       .attr(ConfuseAttr)
-      .soundBased(),
-    new AttackMove(Moves.SONIC_BOOM, Type.NORMAL, MoveCategory.SPECIAL, -1, 90, 20, -1, 0, 1)
+      .soundBased()
+      .reflectable(),
+    new AttackMove(Moves.SONIC_BOOM, PokemonType.NORMAL, MoveCategory.SPECIAL, -1, 90, 20, -1, 0, 1)
       .attr(FixedDamageAttr, 20),
-    new StatusMove(Moves.DISABLE, Type.NORMAL, 100, 20, -1, 0, 1)
+    new StatusMove(Moves.DISABLE, PokemonType.NORMAL, 100, 20, -1, 0, 1)
       .attr(AddBattlerTagAttr, BattlerTagType.DISABLED, false, true)
-      .condition((user, target, move) => target.getMoveHistory().reverse().find(m => m.move !== Moves.NONE && m.move !== Moves.STRUGGLE && !m.virtual) !== undefined)
-      .ignoresSubstitute(),
-    new AttackMove(Moves.ACID, Type.POISON, MoveCategory.SPECIAL, 40, 100, 30, 10, 0, 1)
+      .condition((user, target, move) => {
+        const lastRealMove = target.getLastXMoves(-1).find(m => !m.virtual);
+        return !isNullOrUndefined(lastRealMove) && lastRealMove.move !== Moves.NONE && lastRealMove.move !== Moves.STRUGGLE;
+      })
+      .ignoresSubstitute()
+      .reflectable(),
+    new AttackMove(Moves.ACID, PokemonType.POISON, MoveCategory.SPECIAL, 40, 100, 30, 10, 0, 1)
       .attr(StatStageChangeAttr, [ Stat.SPDEF ], -1)
       .target(MoveTarget.ALL_NEAR_ENEMIES),
-    new AttackMove(Moves.EMBER, Type.FIRE, MoveCategory.SPECIAL, 40, 100, 25, 10, 0, 1)
+    new AttackMove(Moves.EMBER, PokemonType.FIRE, MoveCategory.SPECIAL, 40, 100, 25, 10, 0, 1)
       .attr(StatusEffectAttr, StatusEffect.BURN),
-    new AttackMove(Moves.FLAMETHROWER, Type.FIRE, MoveCategory.SPECIAL, 90, 100, 15, 10, 0, 1)
+    new AttackMove(Moves.FLAMETHROWER, PokemonType.FIRE, MoveCategory.SPECIAL, 90, 100, 15, 10, 0, 1)
       .attr(StatusEffectAttr, StatusEffect.BURN),
-    new StatusMove(Moves.MIST, Type.ICE, -1, 30, -1, 0, 1)
+    new StatusMove(Moves.MIST, PokemonType.ICE, -1, 30, -1, 0, 1)
       .attr(AddArenaTagAttr, ArenaTagType.MIST, 5, true)
       .target(MoveTarget.USER_SIDE),
-    new AttackMove(Moves.WATER_GUN, Type.WATER, MoveCategory.SPECIAL, 40, 100, 25, -1, 0, 1),
-    new AttackMove(Moves.HYDRO_PUMP, Type.WATER, MoveCategory.SPECIAL, 110, 80, 5, -1, 0, 1),
-    new AttackMove(Moves.SURF, Type.WATER, MoveCategory.SPECIAL, 90, 100, 15, -1, 0, 1)
+    new AttackMove(Moves.WATER_GUN, PokemonType.WATER, MoveCategory.SPECIAL, 40, 100, 25, -1, 0, 1),
+    new AttackMove(Moves.HYDRO_PUMP, PokemonType.WATER, MoveCategory.SPECIAL, 110, 80, 5, -1, 0, 1),
+    new AttackMove(Moves.SURF, PokemonType.WATER, MoveCategory.SPECIAL, 90, 100, 15, -1, 0, 1)
       .target(MoveTarget.ALL_NEAR_OTHERS)
       .attr(HitsTagForDoubleDamageAttr, BattlerTagType.UNDERWATER)
       .attr(GulpMissileTagAttr),
-    new AttackMove(Moves.ICE_BEAM, Type.ICE, MoveCategory.SPECIAL, 90, 100, 10, 10, 0, 1)
+    new AttackMove(Moves.ICE_BEAM, PokemonType.ICE, MoveCategory.SPECIAL, 90, 100, 10, 10, 0, 1)
       .attr(StatusEffectAttr, StatusEffect.FREEZE),
-    new AttackMove(Moves.BLIZZARD, Type.ICE, MoveCategory.SPECIAL, 110, 70, 5, 10, 0, 1)
+    new AttackMove(Moves.BLIZZARD, PokemonType.ICE, MoveCategory.SPECIAL, 110, 70, 5, 10, 0, 1)
       .attr(BlizzardAccuracyAttr)
       .attr(StatusEffectAttr, StatusEffect.FREEZE)
       .windMove()
       .target(MoveTarget.ALL_NEAR_ENEMIES),
-    new AttackMove(Moves.PSYBEAM, Type.PSYCHIC, MoveCategory.SPECIAL, 65, 100, 20, 10, 0, 1)
+    new AttackMove(Moves.PSYBEAM, PokemonType.PSYCHIC, MoveCategory.SPECIAL, 65, 100, 20, 10, 0, 1)
       .attr(ConfuseAttr),
-    new AttackMove(Moves.BUBBLE_BEAM, Type.WATER, MoveCategory.SPECIAL, 65, 100, 20, 10, 0, 1)
+    new AttackMove(Moves.BUBBLE_BEAM, PokemonType.WATER, MoveCategory.SPECIAL, 65, 100, 20, 10, 0, 1)
       .attr(StatStageChangeAttr, [ Stat.SPD ], -1),
-    new AttackMove(Moves.AURORA_BEAM, Type.ICE, MoveCategory.SPECIAL, 65, 100, 20, 10, 0, 1)
+    new AttackMove(Moves.AURORA_BEAM, PokemonType.ICE, MoveCategory.SPECIAL, 65, 100, 20, 10, 0, 1)
       .attr(StatStageChangeAttr, [ Stat.ATK ], -1),
-    new AttackMove(Moves.HYPER_BEAM, Type.NORMAL, MoveCategory.SPECIAL, 150, 90, 5, -1, 0, 1)
+    new AttackMove(Moves.HYPER_BEAM, PokemonType.NORMAL, MoveCategory.SPECIAL, 150, 90, 5, -1, 0, 1)
       .attr(RechargeAttr),
-    new AttackMove(Moves.PECK, Type.FLYING, MoveCategory.PHYSICAL, 35, 100, 35, -1, 0, 1),
-    new AttackMove(Moves.DRILL_PECK, Type.FLYING, MoveCategory.PHYSICAL, 80, 100, 20, -1, 0, 1),
-    new AttackMove(Moves.SUBMISSION, Type.FIGHTING, MoveCategory.PHYSICAL, 80, 80, 20, -1, 0, 1)
+    new AttackMove(Moves.PECK, PokemonType.FLYING, MoveCategory.PHYSICAL, 35, 100, 35, -1, 0, 1),
+    new AttackMove(Moves.DRILL_PECK, PokemonType.FLYING, MoveCategory.PHYSICAL, 80, 100, 20, -1, 0, 1),
+    new AttackMove(Moves.SUBMISSION, PokemonType.FIGHTING, MoveCategory.PHYSICAL, 80, 80, 20, -1, 0, 1)
       .attr(RecoilAttr)
       .recklessMove(),
-    new AttackMove(Moves.LOW_KICK, Type.FIGHTING, MoveCategory.PHYSICAL, -1, 100, 20, -1, 0, 1)
+    new AttackMove(Moves.LOW_KICK, PokemonType.FIGHTING, MoveCategory.PHYSICAL, -1, 100, 20, -1, 0, 1)
       .attr(WeightPowerAttr),
-    new AttackMove(Moves.COUNTER, Type.FIGHTING, MoveCategory.PHYSICAL, -1, 100, 20, -1, -5, 1)
+    new AttackMove(Moves.COUNTER, PokemonType.FIGHTING, MoveCategory.PHYSICAL, -1, 100, 20, -1, -5, 1)
       .attr(CounterDamageAttr, (move: Move) => move.category === MoveCategory.PHYSICAL, 2)
       .target(MoveTarget.ATTACKER),
-    new AttackMove(Moves.SEISMIC_TOSS, Type.FIGHTING, MoveCategory.PHYSICAL, -1, 100, 20, -1, 0, 1)
+    new AttackMove(Moves.SEISMIC_TOSS, PokemonType.FIGHTING, MoveCategory.PHYSICAL, -1, 100, 20, -1, 0, 1)
       .attr(LevelDamageAttr),
-    new AttackMove(Moves.STRENGTH, Type.NORMAL, MoveCategory.PHYSICAL, 80, 100, 15, -1, 0, 1),
-    new AttackMove(Moves.ABSORB, Type.GRASS, MoveCategory.SPECIAL, 20, 100, 25, -1, 0, 1)
+    new AttackMove(Moves.STRENGTH, PokemonType.NORMAL, MoveCategory.PHYSICAL, 80, 100, 15, -1, 0, 1),
+    new AttackMove(Moves.ABSORB, PokemonType.GRASS, MoveCategory.SPECIAL, 20, 100, 25, -1, 0, 1)
       .attr(HitHealAttr)
       .triageMove(),
-    new AttackMove(Moves.MEGA_DRAIN, Type.GRASS, MoveCategory.SPECIAL, 40, 100, 15, -1, 0, 1)
+    new AttackMove(Moves.MEGA_DRAIN, PokemonType.GRASS, MoveCategory.SPECIAL, 40, 100, 15, -1, 0, 1)
       .attr(HitHealAttr)
       .triageMove(),
-    new StatusMove(Moves.LEECH_SEED, Type.GRASS, 90, 10, -1, 0, 1)
+    new StatusMove(Moves.LEECH_SEED, PokemonType.GRASS, 90, 10, -1, 0, 1)
       .attr(LeechSeedAttr)
-      .condition((user, target, move) => !target.getTag(BattlerTagType.SEEDED) && !target.isOfType(Type.GRASS)),
-    new SelfStatusMove(Moves.GROWTH, Type.NORMAL, -1, 20, -1, 0, 1)
+      .condition((user, target, move) => !target.getTag(BattlerTagType.SEEDED) && !target.isOfType(PokemonType.GRASS))
+      .reflectable(),
+    new SelfStatusMove(Moves.GROWTH, PokemonType.NORMAL, -1, 20, -1, 0, 1)
       .attr(GrowthStatStageChangeAttr),
-    new AttackMove(Moves.RAZOR_LEAF, Type.GRASS, MoveCategory.PHYSICAL, 55, 95, 25, -1, 0, 1)
+    new AttackMove(Moves.RAZOR_LEAF, PokemonType.GRASS, MoveCategory.PHYSICAL, 55, 95, 25, -1, 0, 1)
       .attr(HighCritAttr)
       .makesContact(false)
       .slicingMove()
       .target(MoveTarget.ALL_NEAR_ENEMIES),
-    new ChargingAttackMove(Moves.SOLAR_BEAM, Type.GRASS, MoveCategory.SPECIAL, 120, 100, 10, -1, 0, 1)
+    new ChargingAttackMove(Moves.SOLAR_BEAM, PokemonType.GRASS, MoveCategory.SPECIAL, 120, 100, 10, -1, 0, 1)
       .chargeText(i18next.t("moveTriggers:tookInSunlight", { pokemonName: "{USER}" }))
       .chargeAttr(WeatherInstantChargeAttr, [ WeatherType.SUNNY, WeatherType.HARSH_SUN ])
       .attr(AntiSunlightPowerDecreaseAttr),
-    new StatusMove(Moves.POISON_POWDER, Type.POISON, 75, 35, -1, 0, 1)
+    new StatusMove(Moves.POISON_POWDER, PokemonType.POISON, 75, 35, -1, 0, 1)
       .attr(StatusEffectAttr, StatusEffect.POISON)
-      .powderMove(),
-    new StatusMove(Moves.STUN_SPORE, Type.GRASS, 75, 30, -1, 0, 1)
+      .powderMove()
+      .reflectable(),
+    new StatusMove(Moves.STUN_SPORE, PokemonType.GRASS, 75, 30, -1, 0, 1)
       .attr(StatusEffectAttr, StatusEffect.PARALYSIS)
-      .powderMove(),
-    new StatusMove(Moves.SLEEP_POWDER, Type.GRASS, 75, 15, -1, 0, 1)
+      .powderMove()
+      .reflectable(),
+    new StatusMove(Moves.SLEEP_POWDER, PokemonType.GRASS, 75, 15, -1, 0, 1)
       .attr(StatusEffectAttr, StatusEffect.SLEEP)
-      .powderMove(),
-    new AttackMove(Moves.PETAL_DANCE, Type.GRASS, MoveCategory.SPECIAL, 120, 100, 10, -1, 0, 1)
+      .powderMove()
+      .reflectable(),
+    new AttackMove(Moves.PETAL_DANCE, PokemonType.GRASS, MoveCategory.SPECIAL, 120, 100, 10, -1, 0, 1)
       .attr(FrenzyAttr)
       .attr(MissEffectAttr, frenzyMissFunc)
       .attr(NoEffectAttr, frenzyMissFunc)
       .makesContact()
       .danceMove()
       .target(MoveTarget.RANDOM_NEAR_ENEMY),
-    new StatusMove(Moves.STRING_SHOT, Type.BUG, 95, 40, -1, 0, 1)
+    new StatusMove(Moves.STRING_SHOT, PokemonType.BUG, 95, 40, -1, 0, 1)
       .attr(StatStageChangeAttr, [ Stat.SPD ], -2)
-      .target(MoveTarget.ALL_NEAR_ENEMIES),
-    new AttackMove(Moves.DRAGON_RAGE, Type.DRAGON, MoveCategory.SPECIAL, -1, 100, 10, -1, 0, 1)
+      .target(MoveTarget.ALL_NEAR_ENEMIES)
+      .reflectable(),
+    new AttackMove(Moves.DRAGON_RAGE, PokemonType.DRAGON, MoveCategory.SPECIAL, -1, 100, 10, -1, 0, 1)
       .attr(FixedDamageAttr, 40),
-    new AttackMove(Moves.FIRE_SPIN, Type.FIRE, MoveCategory.SPECIAL, 35, 85, 15, -1, 0, 1)
+    new AttackMove(Moves.FIRE_SPIN, PokemonType.FIRE, MoveCategory.SPECIAL, 35, 85, 15, -1, 0, 1)
       .attr(TrapAttr, BattlerTagType.FIRE_SPIN),
-    new AttackMove(Moves.THUNDER_SHOCK, Type.ELECTRIC, MoveCategory.SPECIAL, 40, 100, 30, 10, 0, 1)
+    new AttackMove(Moves.THUNDER_SHOCK, PokemonType.ELECTRIC, MoveCategory.SPECIAL, 40, 100, 30, 10, 0, 1)
       .attr(StatusEffectAttr, StatusEffect.PARALYSIS),
-    new AttackMove(Moves.THUNDERBOLT, Type.ELECTRIC, MoveCategory.SPECIAL, 90, 100, 15, 10, 0, 1)
+    new AttackMove(Moves.THUNDERBOLT, PokemonType.ELECTRIC, MoveCategory.SPECIAL, 90, 100, 15, 10, 0, 1)
       .attr(StatusEffectAttr, StatusEffect.PARALYSIS),
-    new StatusMove(Moves.THUNDER_WAVE, Type.ELECTRIC, 90, 20, -1, 0, 1)
+    new StatusMove(Moves.THUNDER_WAVE, PokemonType.ELECTRIC, 90, 20, -1, 0, 1)
       .attr(StatusEffectAttr, StatusEffect.PARALYSIS)
-      .attr(RespectAttackTypeImmunityAttr),
-    new AttackMove(Moves.THUNDER, Type.ELECTRIC, MoveCategory.SPECIAL, 110, 70, 10, 30, 0, 1)
+      .attr(RespectAttackTypeImmunityAttr)
+      .reflectable(),
+    new AttackMove(Moves.THUNDER, PokemonType.ELECTRIC, MoveCategory.SPECIAL, 110, 70, 10, 30, 0, 1)
       .attr(StatusEffectAttr, StatusEffect.PARALYSIS)
       .attr(ThunderAccuracyAttr)
       .attr(HitsTagAttr, BattlerTagType.FLYING),
-    new AttackMove(Moves.ROCK_THROW, Type.ROCK, MoveCategory.PHYSICAL, 50, 90, 15, -1, 0, 1)
+    new AttackMove(Moves.ROCK_THROW, PokemonType.ROCK, MoveCategory.PHYSICAL, 50, 90, 15, -1, 0, 1)
       .makesContact(false),
-    new AttackMove(Moves.EARTHQUAKE, Type.GROUND, MoveCategory.PHYSICAL, 100, 100, 10, -1, 0, 1)
+    new AttackMove(Moves.EARTHQUAKE, PokemonType.GROUND, MoveCategory.PHYSICAL, 100, 100, 10, -1, 0, 1)
       .attr(HitsTagForDoubleDamageAttr, BattlerTagType.UNDERGROUND)
       .attr(MovePowerMultiplierAttr, (user, target, move) => globalScene.arena.getTerrainType() === TerrainType.GRASSY && target.isGrounded() ? 0.5 : 1)
       .makesContact(false)
       .target(MoveTarget.ALL_NEAR_OTHERS),
-    new AttackMove(Moves.FISSURE, Type.GROUND, MoveCategory.PHYSICAL, 200, 30, 5, -1, 0, 1)
+    new AttackMove(Moves.FISSURE, PokemonType.GROUND, MoveCategory.PHYSICAL, 200, 30, 5, -1, 0, 1)
       .attr(OneHitKOAttr)
       .attr(OneHitKOAccuracyAttr)
       .attr(HitsTagAttr, BattlerTagType.UNDERGROUND)
       .makesContact(false),
-    new ChargingAttackMove(Moves.DIG, Type.GROUND, MoveCategory.PHYSICAL, 80, 100, 10, -1, 0, 1)
+    new ChargingAttackMove(Moves.DIG, PokemonType.GROUND, MoveCategory.PHYSICAL, 80, 100, 10, -1, 0, 1)
       .chargeText(i18next.t("moveTriggers:dugAHole", { pokemonName: "{USER}" }))
       .chargeAttr(SemiInvulnerableAttr, BattlerTagType.UNDERGROUND),
-    new StatusMove(Moves.TOXIC, Type.POISON, 90, 10, -1, 0, 1)
+    new StatusMove(Moves.TOXIC, PokemonType.POISON, 90, 10, -1, 0, 1)
       .attr(StatusEffectAttr, StatusEffect.TOXIC)
-      .attr(ToxicAccuracyAttr),
-    new AttackMove(Moves.CONFUSION, Type.PSYCHIC, MoveCategory.SPECIAL, 50, 100, 25, 10, 0, 1)
+      .attr(ToxicAccuracyAttr)
+      .reflectable(),
+    new AttackMove(Moves.CONFUSION, PokemonType.PSYCHIC, MoveCategory.SPECIAL, 50, 100, 25, 10, 0, 1)
       .attr(ConfuseAttr),
-    new AttackMove(Moves.PSYCHIC, Type.PSYCHIC, MoveCategory.SPECIAL, 90, 100, 10, 10, 0, 1)
+    new AttackMove(Moves.PSYCHIC, PokemonType.PSYCHIC, MoveCategory.SPECIAL, 90, 100, 10, 10, 0, 1)
       .attr(StatStageChangeAttr, [ Stat.SPDEF ], -1),
-    new StatusMove(Moves.HYPNOSIS, Type.PSYCHIC, 60, 20, -1, 0, 1)
-      .attr(StatusEffectAttr, StatusEffect.SLEEP),
-    new SelfStatusMove(Moves.MEDITATE, Type.PSYCHIC, -1, 40, -1, 0, 1)
+    new StatusMove(Moves.HYPNOSIS, PokemonType.PSYCHIC, 60, 20, -1, 0, 1)
+      .attr(StatusEffectAttr, StatusEffect.SLEEP)
+      .reflectable(),
+    new SelfStatusMove(Moves.MEDITATE, PokemonType.PSYCHIC, -1, 40, -1, 0, 1)
       .attr(StatStageChangeAttr, [ Stat.ATK ], 1, true),
-    new SelfStatusMove(Moves.AGILITY, Type.PSYCHIC, -1, 30, -1, 0, 1)
+    new SelfStatusMove(Moves.AGILITY, PokemonType.PSYCHIC, -1, 30, -1, 0, 1)
       .attr(StatStageChangeAttr, [ Stat.SPD ], 2, true),
-    new AttackMove(Moves.QUICK_ATTACK, Type.NORMAL, MoveCategory.PHYSICAL, 40, 100, 30, -1, 1, 1),
-    new AttackMove(Moves.RAGE, Type.NORMAL, MoveCategory.PHYSICAL, 20, 100, 20, -1, 0, 1)
+    new AttackMove(Moves.QUICK_ATTACK, PokemonType.NORMAL, MoveCategory.PHYSICAL, 40, 100, 30, -1, 1, 1),
+    new AttackMove(Moves.RAGE, PokemonType.NORMAL, MoveCategory.PHYSICAL, 20, 100, 20, -1, 0, 1)
       .partial(), // No effect implemented
-    new SelfStatusMove(Moves.TELEPORT, Type.PSYCHIC, -1, 20, -1, -6, 1)
+    new SelfStatusMove(Moves.TELEPORT, PokemonType.PSYCHIC, -1, 20, -1, -6, 1)
       .attr(ForceSwitchOutAttr, true)
       .hidesUser(),
-    new AttackMove(Moves.NIGHT_SHADE, Type.GHOST, MoveCategory.SPECIAL, -1, 100, 15, -1, 0, 1)
+    new AttackMove(Moves.NIGHT_SHADE, PokemonType.GHOST, MoveCategory.SPECIAL, -1, 100, 15, -1, 0, 1)
       .attr(LevelDamageAttr),
-    new StatusMove(Moves.MIMIC, Type.NORMAL, -1, 10, -1, 0, 1)
+    new StatusMove(Moves.MIMIC, PokemonType.NORMAL, -1, 10, -1, 0, 1)
       .attr(MovesetCopyMoveAttr)
       .ignoresSubstitute(),
-    new StatusMove(Moves.SCREECH, Type.NORMAL, 85, 40, -1, 0, 1)
+    new StatusMove(Moves.SCREECH, PokemonType.NORMAL, 85, 40, -1, 0, 1)
       .attr(StatStageChangeAttr, [ Stat.DEF ], -2)
-      .soundBased(),
-    new SelfStatusMove(Moves.DOUBLE_TEAM, Type.NORMAL, -1, 15, -1, 0, 1)
+      .soundBased()
+      .reflectable(),
+    new SelfStatusMove(Moves.DOUBLE_TEAM, PokemonType.NORMAL, -1, 15, -1, 0, 1)
       .attr(StatStageChangeAttr, [ Stat.EVA ], 1, true),
-    new SelfStatusMove(Moves.RECOVER, Type.NORMAL, -1, 5, -1, 0, 1)
+    new SelfStatusMove(Moves.RECOVER, PokemonType.NORMAL, -1, 5, -1, 0, 1)
       .attr(HealAttr, 0.5)
       .triageMove(),
-    new SelfStatusMove(Moves.HARDEN, Type.NORMAL, -1, 30, -1, 0, 1)
+    new SelfStatusMove(Moves.HARDEN, PokemonType.NORMAL, -1, 30, -1, 0, 1)
       .attr(StatStageChangeAttr, [ Stat.DEF ], 1, true),
-    new SelfStatusMove(Moves.MINIMIZE, Type.NORMAL, -1, 10, -1, 0, 1)
+    new SelfStatusMove(Moves.MINIMIZE, PokemonType.NORMAL, -1, 10, -1, 0, 1)
       .attr(AddBattlerTagAttr, BattlerTagType.MINIMIZED, true, false)
       .attr(StatStageChangeAttr, [ Stat.EVA ], 2, true),
-    new StatusMove(Moves.SMOKESCREEN, Type.NORMAL, 100, 20, -1, 0, 1)
-      .attr(StatStageChangeAttr, [ Stat.ACC ], -1),
-    new StatusMove(Moves.CONFUSE_RAY, Type.GHOST, 100, 10, -1, 0, 1)
-      .attr(ConfuseAttr),
-    new SelfStatusMove(Moves.WITHDRAW, Type.WATER, -1, 40, -1, 0, 1)
+    new StatusMove(Moves.SMOKESCREEN, PokemonType.NORMAL, 100, 20, -1, 0, 1)
+      .attr(StatStageChangeAttr, [ Stat.ACC ], -1)
+      .reflectable(),
+    new StatusMove(Moves.CONFUSE_RAY, PokemonType.GHOST, 100, 10, -1, 0, 1)
+      .attr(ConfuseAttr)
+      .reflectable(),
+    new SelfStatusMove(Moves.WITHDRAW, PokemonType.WATER, -1, 40, -1, 0, 1)
       .attr(StatStageChangeAttr, [ Stat.DEF ], 1, true),
-    new SelfStatusMove(Moves.DEFENSE_CURL, Type.NORMAL, -1, 40, -1, 0, 1)
+    new SelfStatusMove(Moves.DEFENSE_CURL, PokemonType.NORMAL, -1, 40, -1, 0, 1)
       .attr(StatStageChangeAttr, [ Stat.DEF ], 1, true),
-    new SelfStatusMove(Moves.BARRIER, Type.PSYCHIC, -1, 20, -1, 0, 1)
+    new SelfStatusMove(Moves.BARRIER, PokemonType.PSYCHIC, -1, 20, -1, 0, 1)
       .attr(StatStageChangeAttr, [ Stat.DEF ], 2, true),
-    new StatusMove(Moves.LIGHT_SCREEN, Type.PSYCHIC, -1, 30, -1, 0, 1)
+    new StatusMove(Moves.LIGHT_SCREEN, PokemonType.PSYCHIC, -1, 30, -1, 0, 1)
       .attr(AddArenaTagAttr, ArenaTagType.LIGHT_SCREEN, 5, true)
       .target(MoveTarget.USER_SIDE),
-    new SelfStatusMove(Moves.HAZE, Type.ICE, -1, 30, -1, 0, 1)
+    new SelfStatusMove(Moves.HAZE, PokemonType.ICE, -1, 30, -1, 0, 1)
       .ignoresSubstitute()
       .attr(ResetStatsAttr, true),
-    new StatusMove(Moves.REFLECT, Type.PSYCHIC, -1, 20, -1, 0, 1)
+    new StatusMove(Moves.REFLECT, PokemonType.PSYCHIC, -1, 20, -1, 0, 1)
       .attr(AddArenaTagAttr, ArenaTagType.REFLECT, 5, true)
       .target(MoveTarget.USER_SIDE),
-    new SelfStatusMove(Moves.FOCUS_ENERGY, Type.NORMAL, -1, 30, -1, 0, 1)
+    new SelfStatusMove(Moves.FOCUS_ENERGY, PokemonType.NORMAL, -1, 30, -1, 0, 1)
       .attr(AddBattlerTagAttr, BattlerTagType.CRIT_BOOST, true, true),
-    new AttackMove(Moves.BIDE, Type.NORMAL, MoveCategory.PHYSICAL, -1, -1, 10, -1, 1, 1)
+    new AttackMove(Moves.BIDE, PokemonType.NORMAL, MoveCategory.PHYSICAL, -1, -1, 10, -1, 1, 1)
       .target(MoveTarget.USER)
       .unimplemented(),
-    new SelfStatusMove(Moves.METRONOME, Type.NORMAL, -1, 10, -1, 0, 1)
+    new SelfStatusMove(Moves.METRONOME, PokemonType.NORMAL, -1, 10, -1, 0, 1)
       .attr(RandomMoveAttr, invalidMetronomeMoves),
-    new StatusMove(Moves.MIRROR_MOVE, Type.FLYING, -1, 20, -1, 0, 1)
-      .attr(CopyMoveAttr, true),
-    new AttackMove(Moves.SELF_DESTRUCT, Type.NORMAL, MoveCategory.PHYSICAL, 200, 100, 5, -1, 0, 1)
+    new StatusMove(Moves.MIRROR_MOVE, PokemonType.FLYING, -1, 20, -1, 0, 1)
+      .attr(CopyMoveAttr, true, invalidMirrorMoveMoves),
+    new AttackMove(Moves.SELF_DESTRUCT, PokemonType.NORMAL, MoveCategory.PHYSICAL, 200, 100, 5, -1, 0, 1)
       .attr(SacrificialAttr)
       .makesContact(false)
       .condition(failIfDampCondition)
       .target(MoveTarget.ALL_NEAR_OTHERS),
-    new AttackMove(Moves.EGG_BOMB, Type.NORMAL, MoveCategory.PHYSICAL, 100, 75, 10, -1, 0, 1)
+    new AttackMove(Moves.EGG_BOMB, PokemonType.NORMAL, MoveCategory.PHYSICAL, 100, 75, 10, -1, 0, 1)
       .makesContact(false)
       .ballBombMove(),
-    new AttackMove(Moves.LICK, Type.GHOST, MoveCategory.PHYSICAL, 30, 100, 30, 30, 0, 1)
+    new AttackMove(Moves.LICK, PokemonType.GHOST, MoveCategory.PHYSICAL, 30, 100, 30, 30, 0, 1)
       .attr(StatusEffectAttr, StatusEffect.PARALYSIS),
-    new AttackMove(Moves.SMOG, Type.POISON, MoveCategory.SPECIAL, 30, 70, 20, 40, 0, 1)
+    new AttackMove(Moves.SMOG, PokemonType.POISON, MoveCategory.SPECIAL, 30, 70, 20, 40, 0, 1)
       .attr(StatusEffectAttr, StatusEffect.POISON),
-    new AttackMove(Moves.SLUDGE, Type.POISON, MoveCategory.SPECIAL, 65, 100, 20, 30, 0, 1)
+    new AttackMove(Moves.SLUDGE, PokemonType.POISON, MoveCategory.SPECIAL, 65, 100, 20, 30, 0, 1)
       .attr(StatusEffectAttr, StatusEffect.POISON),
-    new AttackMove(Moves.BONE_CLUB, Type.GROUND, MoveCategory.PHYSICAL, 65, 85, 20, 10, 0, 1)
+    new AttackMove(Moves.BONE_CLUB, PokemonType.GROUND, MoveCategory.PHYSICAL, 65, 85, 20, 10, 0, 1)
       .attr(FlinchAttr)
       .makesContact(false),
-    new AttackMove(Moves.FIRE_BLAST, Type.FIRE, MoveCategory.SPECIAL, 110, 85, 5, 10, 0, 1)
+    new AttackMove(Moves.FIRE_BLAST, PokemonType.FIRE, MoveCategory.SPECIAL, 110, 85, 5, 10, 0, 1)
       .attr(StatusEffectAttr, StatusEffect.BURN),
-    new AttackMove(Moves.WATERFALL, Type.WATER, MoveCategory.PHYSICAL, 80, 100, 15, 20, 0, 1)
+    new AttackMove(Moves.WATERFALL, PokemonType.WATER, MoveCategory.PHYSICAL, 80, 100, 15, 20, 0, 1)
       .attr(FlinchAttr),
-    new AttackMove(Moves.CLAMP, Type.WATER, MoveCategory.PHYSICAL, 35, 85, 15, -1, 0, 1)
+    new AttackMove(Moves.CLAMP, PokemonType.WATER, MoveCategory.PHYSICAL, 35, 85, 15, -1, 0, 1)
       .attr(TrapAttr, BattlerTagType.CLAMP),
-    new AttackMove(Moves.SWIFT, Type.NORMAL, MoveCategory.SPECIAL, 60, -1, 20, -1, 0, 1)
+    new AttackMove(Moves.SWIFT, PokemonType.NORMAL, MoveCategory.SPECIAL, 60, -1, 20, -1, 0, 1)
       .target(MoveTarget.ALL_NEAR_ENEMIES),
-    new ChargingAttackMove(Moves.SKULL_BASH, Type.NORMAL, MoveCategory.PHYSICAL, 130, 100, 10, -1, 0, 1)
+    new ChargingAttackMove(Moves.SKULL_BASH, PokemonType.NORMAL, MoveCategory.PHYSICAL, 130, 100, 10, -1, 0, 1)
       .chargeText(i18next.t("moveTriggers:loweredItsHead", { pokemonName: "{USER}" }))
       .chargeAttr(StatStageChangeAttr, [ Stat.DEF ], 1, true),
-    new AttackMove(Moves.SPIKE_CANNON, Type.NORMAL, MoveCategory.PHYSICAL, 20, 100, 15, -1, 0, 1)
+    new AttackMove(Moves.SPIKE_CANNON, PokemonType.NORMAL, MoveCategory.PHYSICAL, 20, 100, 15, -1, 0, 1)
       .attr(MultiHitAttr)
       .makesContact(false),
-    new AttackMove(Moves.CONSTRICT, Type.NORMAL, MoveCategory.PHYSICAL, 10, 100, 35, 10, 0, 1)
+    new AttackMove(Moves.CONSTRICT, PokemonType.NORMAL, MoveCategory.PHYSICAL, 10, 100, 35, 10, 0, 1)
       .attr(StatStageChangeAttr, [ Stat.SPD ], -1),
-    new SelfStatusMove(Moves.AMNESIA, Type.PSYCHIC, -1, 20, -1, 0, 1)
+    new SelfStatusMove(Moves.AMNESIA, PokemonType.PSYCHIC, -1, 20, -1, 0, 1)
       .attr(StatStageChangeAttr, [ Stat.SPDEF ], 2, true),
-    new StatusMove(Moves.KINESIS, Type.PSYCHIC, 80, 15, -1, 0, 1)
-      .attr(StatStageChangeAttr, [ Stat.ACC ], -1),
-    new SelfStatusMove(Moves.SOFT_BOILED, Type.NORMAL, -1, 5, -1, 0, 1)
+    new StatusMove(Moves.KINESIS, PokemonType.PSYCHIC, 80, 15, -1, 0, 1)
+      .attr(StatStageChangeAttr, [ Stat.ACC ], -1)
+      .reflectable(),
+    new SelfStatusMove(Moves.SOFT_BOILED, PokemonType.NORMAL, -1, 5, -1, 0, 1)
       .attr(HealAttr, 0.5)
       .triageMove(),
-    new AttackMove(Moves.HIGH_JUMP_KICK, Type.FIGHTING, MoveCategory.PHYSICAL, 130, 90, 10, -1, 0, 1)
+    new AttackMove(Moves.HIGH_JUMP_KICK, PokemonType.FIGHTING, MoveCategory.PHYSICAL, 130, 90, 10, -1, 0, 1)
       .attr(MissEffectAttr, crashDamageFunc)
       .attr(NoEffectAttr, crashDamageFunc)
       .condition(failOnGravityCondition)
       .recklessMove(),
-    new StatusMove(Moves.GLARE, Type.NORMAL, 100, 30, -1, 0, 1)
-      .attr(StatusEffectAttr, StatusEffect.PARALYSIS),
-    new AttackMove(Moves.DREAM_EATER, Type.PSYCHIC, MoveCategory.SPECIAL, 100, 100, 15, -1, 0, 1)
+    new StatusMove(Moves.GLARE, PokemonType.NORMAL, 100, 30, -1, 0, 1)
+      .attr(StatusEffectAttr, StatusEffect.PARALYSIS)
+      .reflectable(),
+    new AttackMove(Moves.DREAM_EATER, PokemonType.PSYCHIC, MoveCategory.SPECIAL, 100, 100, 15, -1, 0, 1)
       .attr(HitHealAttr)
       .condition(targetSleptOrComatoseCondition)
       .triageMove(),
-    new StatusMove(Moves.POISON_GAS, Type.POISON, 90, 40, -1, 0, 1)
+    new StatusMove(Moves.POISON_GAS, PokemonType.POISON, 90, 40, -1, 0, 1)
       .attr(StatusEffectAttr, StatusEffect.POISON)
-      .target(MoveTarget.ALL_NEAR_ENEMIES),
-    new AttackMove(Moves.BARRAGE, Type.NORMAL, MoveCategory.PHYSICAL, 15, 85, 20, -1, 0, 1)
+      .target(MoveTarget.ALL_NEAR_ENEMIES)
+      .reflectable(),
+    new AttackMove(Moves.BARRAGE, PokemonType.NORMAL, MoveCategory.PHYSICAL, 15, 85, 20, -1, 0, 1)
       .attr(MultiHitAttr)
       .makesContact(false)
       .ballBombMove(),
-    new AttackMove(Moves.LEECH_LIFE, Type.BUG, MoveCategory.PHYSICAL, 80, 100, 10, -1, 0, 1)
+    new AttackMove(Moves.LEECH_LIFE, PokemonType.BUG, MoveCategory.PHYSICAL, 80, 100, 10, -1, 0, 1)
       .attr(HitHealAttr)
       .triageMove(),
-    new StatusMove(Moves.LOVELY_KISS, Type.NORMAL, 75, 10, -1, 0, 1)
-      .attr(StatusEffectAttr, StatusEffect.SLEEP),
-    new ChargingAttackMove(Moves.SKY_ATTACK, Type.FLYING, MoveCategory.PHYSICAL, 140, 90, 5, 30, 0, 1)
+    new StatusMove(Moves.LOVELY_KISS, PokemonType.NORMAL, 75, 10, -1, 0, 1)
+      .attr(StatusEffectAttr, StatusEffect.SLEEP)
+      .reflectable(),
+    new ChargingAttackMove(Moves.SKY_ATTACK, PokemonType.FLYING, MoveCategory.PHYSICAL, 140, 90, 5, 30, 0, 1)
       .chargeText(i18next.t("moveTriggers:isGlowing", { pokemonName: "{USER}" }))
       .attr(HighCritAttr)
       .attr(FlinchAttr)
       .makesContact(false),
-    new StatusMove(Moves.TRANSFORM, Type.NORMAL, -1, 10, -1, 0, 1)
+    new StatusMove(Moves.TRANSFORM, PokemonType.NORMAL, -1, 10, -1, 0, 1)
       .attr(TransformAttr)
+      .condition((user, target, move) => !target.getTag(BattlerTagType.SUBSTITUTE))
+      .condition((user, target, move) => !target.summonData.illusion && !user.summonData.illusion)
       // transforming from or into fusion pokemon causes various problems (such as crashes)
       .condition((user, target, move) => !target.getTag(BattlerTagType.SUBSTITUTE) && !user.fusionSpecies && !target.fusionSpecies)
-      .ignoresProtect(),
-    new AttackMove(Moves.BUBBLE, Type.WATER, MoveCategory.SPECIAL, 40, 100, 30, 10, 0, 1)
+      .ignoresProtect()
+      // Transforming should copy the target's rage fist hit count
+      .edgeCase(),
+    new AttackMove(Moves.BUBBLE, PokemonType.WATER, MoveCategory.SPECIAL, 40, 100, 30, 10, 0, 1)
       .attr(StatStageChangeAttr, [ Stat.SPD ], -1)
       .target(MoveTarget.ALL_NEAR_ENEMIES),
-    new AttackMove(Moves.DIZZY_PUNCH, Type.NORMAL, MoveCategory.PHYSICAL, 70, 100, 10, 20, 0, 1)
+    new AttackMove(Moves.DIZZY_PUNCH, PokemonType.NORMAL, MoveCategory.PHYSICAL, 70, 100, 10, 20, 0, 1)
       .attr(ConfuseAttr)
       .punchingMove(),
-    new StatusMove(Moves.SPORE, Type.GRASS, 100, 15, -1, 0, 1)
+    new StatusMove(Moves.SPORE, PokemonType.GRASS, 100, 15, -1, 0, 1)
       .attr(StatusEffectAttr, StatusEffect.SLEEP)
-      .powderMove(),
-    new StatusMove(Moves.FLASH, Type.NORMAL, 100, 20, -1, 0, 1)
-      .attr(StatStageChangeAttr, [ Stat.ACC ], -1),
-    new AttackMove(Moves.PSYWAVE, Type.PSYCHIC, MoveCategory.SPECIAL, -1, 100, 15, -1, 0, 1)
+      .powderMove()
+      .reflectable(),
+    new StatusMove(Moves.FLASH, PokemonType.NORMAL, 100, 20, -1, 0, 1)
+      .attr(StatStageChangeAttr, [ Stat.ACC ], -1)
+      .reflectable(),
+    new AttackMove(Moves.PSYWAVE, PokemonType.PSYCHIC, MoveCategory.SPECIAL, -1, 100, 15, -1, 0, 1)
       .attr(RandomLevelDamageAttr),
-    new SelfStatusMove(Moves.SPLASH, Type.NORMAL, -1, 40, -1, 0, 1)
+    new SelfStatusMove(Moves.SPLASH, PokemonType.NORMAL, -1, 40, -1, 0, 1)
+      .attr(SplashAttr)
       .condition(failOnGravityCondition),
-    new SelfStatusMove(Moves.ACID_ARMOR, Type.POISON, -1, 20, -1, 0, 1)
+    new SelfStatusMove(Moves.ACID_ARMOR, PokemonType.POISON, -1, 20, -1, 0, 1)
       .attr(StatStageChangeAttr, [ Stat.DEF ], 2, true),
-    new AttackMove(Moves.CRABHAMMER, Type.WATER, MoveCategory.PHYSICAL, 100, 90, 10, -1, 0, 1)
+    new AttackMove(Moves.CRABHAMMER, PokemonType.WATER, MoveCategory.PHYSICAL, 100, 90, 10, -1, 0, 1)
       .attr(HighCritAttr),
-    new AttackMove(Moves.EXPLOSION, Type.NORMAL, MoveCategory.PHYSICAL, 250, 100, 5, -1, 0, 1)
+    new AttackMove(Moves.EXPLOSION, PokemonType.NORMAL, MoveCategory.PHYSICAL, 250, 100, 5, -1, 0, 1)
       .condition(failIfDampCondition)
       .attr(SacrificialAttr)
       .makesContact(false)
       .target(MoveTarget.ALL_NEAR_OTHERS),
-    new AttackMove(Moves.FURY_SWIPES, Type.NORMAL, MoveCategory.PHYSICAL, 18, 80, 15, -1, 0, 1)
+    new AttackMove(Moves.FURY_SWIPES, PokemonType.NORMAL, MoveCategory.PHYSICAL, 18, 80, 15, -1, 0, 1)
       .attr(MultiHitAttr),
-    new AttackMove(Moves.BONEMERANG, Type.GROUND, MoveCategory.PHYSICAL, 50, 90, 10, -1, 0, 1)
+    new AttackMove(Moves.BONEMERANG, PokemonType.GROUND, MoveCategory.PHYSICAL, 50, 90, 10, -1, 0, 1)
       .attr(MultiHitAttr, MultiHitType._2)
       .makesContact(false),
-    new SelfStatusMove(Moves.REST, Type.PSYCHIC, -1, 5, -1, 0, 1)
+    new SelfStatusMove(Moves.REST, PokemonType.PSYCHIC, -1, 5, -1, 0, 1)
       .attr(StatusEffectAttr, StatusEffect.SLEEP, true, 3, true)
       .attr(HealAttr, 1, true)
-      .condition((user, target, move) => !user.isFullHp() && user.canSetStatus(StatusEffect.SLEEP, true, true))
+      .condition((user, target, move) => !user.isFullHp() && user.canSetStatus(StatusEffect.SLEEP, true, true, user))
       .triageMove(),
-    new AttackMove(Moves.ROCK_SLIDE, Type.ROCK, MoveCategory.PHYSICAL, 75, 90, 10, 30, 0, 1)
+    new AttackMove(Moves.ROCK_SLIDE, PokemonType.ROCK, MoveCategory.PHYSICAL, 75, 90, 10, 30, 0, 1)
       .attr(FlinchAttr)
       .makesContact(false)
       .target(MoveTarget.ALL_NEAR_ENEMIES),
-    new AttackMove(Moves.HYPER_FANG, Type.NORMAL, MoveCategory.PHYSICAL, 80, 90, 15, 10, 0, 1)
+    new AttackMove(Moves.HYPER_FANG, PokemonType.NORMAL, MoveCategory.PHYSICAL, 80, 90, 15, 10, 0, 1)
       .attr(FlinchAttr)
       .bitingMove(),
-    new SelfStatusMove(Moves.SHARPEN, Type.NORMAL, -1, 30, -1, 0, 1)
+    new SelfStatusMove(Moves.SHARPEN, PokemonType.NORMAL, -1, 30, -1, 0, 1)
       .attr(StatStageChangeAttr, [ Stat.ATK ], 1, true),
-    new SelfStatusMove(Moves.CONVERSION, Type.NORMAL, -1, 30, -1, 0, 1)
+    new SelfStatusMove(Moves.CONVERSION, PokemonType.NORMAL, -1, 30, -1, 0, 1)
       .attr(FirstMoveTypeAttr),
-    new AttackMove(Moves.TRI_ATTACK, Type.NORMAL, MoveCategory.SPECIAL, 80, 100, 10, 20, 0, 1)
+    new AttackMove(Moves.TRI_ATTACK, PokemonType.NORMAL, MoveCategory.SPECIAL, 80, 100, 10, 20, 0, 1)
       .attr(MultiStatusEffectAttr, [ StatusEffect.BURN, StatusEffect.FREEZE, StatusEffect.PARALYSIS ]),
-    new AttackMove(Moves.SUPER_FANG, Type.NORMAL, MoveCategory.PHYSICAL, -1, 90, 10, -1, 0, 1)
+    new AttackMove(Moves.SUPER_FANG, PokemonType.NORMAL, MoveCategory.PHYSICAL, -1, 90, 10, -1, 0, 1)
       .attr(TargetHalfHpDamageAttr),
-    new AttackMove(Moves.SLASH, Type.NORMAL, MoveCategory.PHYSICAL, 70, 100, 20, -1, 0, 1)
+    new AttackMove(Moves.SLASH, PokemonType.NORMAL, MoveCategory.PHYSICAL, 70, 100, 20, -1, 0, 1)
       .attr(HighCritAttr)
       .slicingMove(),
-    new SelfStatusMove(Moves.SUBSTITUTE, Type.NORMAL, -1, 10, -1, 0, 1)
-      .attr(AddSubstituteAttr),
-    new AttackMove(Moves.STRUGGLE, Type.NORMAL, MoveCategory.PHYSICAL, 50, -1, 1, -1, 0, 1)
+    new SelfStatusMove(Moves.SUBSTITUTE, PokemonType.NORMAL, -1, 10, -1, 0, 1)
+      .attr(AddSubstituteAttr, 0.25, false),
+    new AttackMove(Moves.STRUGGLE, PokemonType.NORMAL, MoveCategory.PHYSICAL, 50, -1, 1, -1, 0, 1)
       .attr(RecoilAttr, true, 0.25, true)
       .attr(TypelessAttr)
       .target(MoveTarget.RANDOM_NEAR_ENEMY),
-    new StatusMove(Moves.SKETCH, Type.NORMAL, -1, 1, -1, 0, 2)
+    new StatusMove(Moves.SKETCH, PokemonType.NORMAL, -1, 1, -1, 0, 2)
       .ignoresSubstitute()
       .attr(SketchAttr),
-    new AttackMove(Moves.TRIPLE_KICK, Type.FIGHTING, MoveCategory.PHYSICAL, 10, 90, 10, -1, 0, 2)
+    new AttackMove(Moves.TRIPLE_KICK, PokemonType.FIGHTING, MoveCategory.PHYSICAL, 10, 90, 10, -1, 0, 2)
       .attr(MultiHitAttr, MultiHitType._3)
       .attr(MultiHitPowerIncrementAttr, 3)
       .checkAllHits(),
-    new AttackMove(Moves.THIEF, Type.DARK, MoveCategory.PHYSICAL, 60, 100, 25, -1, 0, 2)
-      .attr(StealHeldItemChanceAttr, 0.3),
-    new StatusMove(Moves.SPIDER_WEB, Type.BUG, -1, 10, -1, 0, 2)
+    new AttackMove(Moves.THIEF, PokemonType.DARK, MoveCategory.PHYSICAL, 60, 100, 25, -1, 0, 2)
+      .attr(StealHeldItemChanceAttr, 0.3)
+      .edgeCase(),
+      // Should not be able to steal held item if user faints due to Rough Skin, Iron Barbs, etc.
+      // Should be able to steal items from pokemon with Sticky Hold if the damage causes them to faint
+    new StatusMove(Moves.SPIDER_WEB, PokemonType.BUG, -1, 10, -1, 0, 2)
       .condition(failIfGhostTypeCondition)
-      .attr(AddBattlerTagAttr, BattlerTagType.TRAPPED, false, true, 1),
-    new StatusMove(Moves.MIND_READER, Type.NORMAL, -1, 5, -1, 0, 2)
+      .attr(AddBattlerTagAttr, BattlerTagType.TRAPPED, false, true, 1)
+      .reflectable(),
+    new StatusMove(Moves.MIND_READER, PokemonType.NORMAL, -1, 5, -1, 0, 2)
       .attr(IgnoreAccuracyAttr),
-    new StatusMove(Moves.NIGHTMARE, Type.GHOST, 100, 15, -1, 0, 2)
+    new StatusMove(Moves.NIGHTMARE, PokemonType.GHOST, 100, 15, -1, 0, 2)
       .attr(AddBattlerTagAttr, BattlerTagType.NIGHTMARE)
       .condition(targetSleptOrComatoseCondition),
-    new AttackMove(Moves.FLAME_WHEEL, Type.FIRE, MoveCategory.PHYSICAL, 60, 100, 25, 10, 0, 2)
+    new AttackMove(Moves.FLAME_WHEEL, PokemonType.FIRE, MoveCategory.PHYSICAL, 60, 100, 25, 10, 0, 2)
       .attr(HealStatusEffectAttr, true, StatusEffect.FREEZE)
       .attr(StatusEffectAttr, StatusEffect.BURN),
-    new AttackMove(Moves.SNORE, Type.NORMAL, MoveCategory.SPECIAL, 50, 100, 15, 30, 0, 2)
+    new AttackMove(Moves.SNORE, PokemonType.NORMAL, MoveCategory.SPECIAL, 50, 100, 15, 30, 0, 2)
       .attr(BypassSleepAttr)
       .attr(FlinchAttr)
       .condition(userSleptOrComatoseCondition)
       .soundBased(),
-    new StatusMove(Moves.CURSE, Type.GHOST, -1, 10, -1, 0, 2)
+    new StatusMove(Moves.CURSE, PokemonType.GHOST, -1, 10, -1, 0, 2)
       .attr(CurseAttr)
       .ignoresSubstitute()
       .ignoresProtect()
       .target(MoveTarget.CURSE),
-    new AttackMove(Moves.FLAIL, Type.NORMAL, MoveCategory.PHYSICAL, -1, 100, 15, -1, 0, 2)
+    new AttackMove(Moves.FLAIL, PokemonType.NORMAL, MoveCategory.PHYSICAL, -1, 100, 15, -1, 0, 2)
       .attr(LowHpPowerAttr),
-    new StatusMove(Moves.CONVERSION_2, Type.NORMAL, -1, 30, -1, 0, 2)
+    new StatusMove(Moves.CONVERSION_2, PokemonType.NORMAL, -1, 30, -1, 0, 2)
       .attr(ResistLastMoveTypeAttr)
       .ignoresSubstitute()
       .partial(), // Checks the move's original typing and not if its type is changed through some other means
-    new AttackMove(Moves.AEROBLAST, Type.FLYING, MoveCategory.SPECIAL, 100, 95, 5, -1, 0, 2)
+    new AttackMove(Moves.AEROBLAST, PokemonType.FLYING, MoveCategory.SPECIAL, 100, 95, 5, -1, 0, 2)
       .windMove()
       .attr(HighCritAttr),
-    new StatusMove(Moves.COTTON_SPORE, Type.GRASS, 100, 40, -1, 0, 2)
+    new StatusMove(Moves.COTTON_SPORE, PokemonType.GRASS, 100, 40, -1, 0, 2)
       .attr(StatStageChangeAttr, [ Stat.SPD ], -2)
       .powderMove()
-      .target(MoveTarget.ALL_NEAR_ENEMIES),
-    new AttackMove(Moves.REVERSAL, Type.FIGHTING, MoveCategory.PHYSICAL, -1, 100, 15, -1, 0, 2)
+      .target(MoveTarget.ALL_NEAR_ENEMIES)
+      .reflectable(),
+    new AttackMove(Moves.REVERSAL, PokemonType.FIGHTING, MoveCategory.PHYSICAL, -1, 100, 15, -1, 0, 2)
       .attr(LowHpPowerAttr),
-    new StatusMove(Moves.SPITE, Type.GHOST, 100, 10, -1, 0, 2)
+    new StatusMove(Moves.SPITE, PokemonType.GHOST, 100, 10, -1, 0, 2)
       .ignoresSubstitute()
-      .attr(ReducePpMoveAttr, 4),
-    new AttackMove(Moves.POWDER_SNOW, Type.ICE, MoveCategory.SPECIAL, 40, 100, 25, 10, 0, 2)
+      .attr(ReducePpMoveAttr, 4)
+      .reflectable(),
+    new AttackMove(Moves.POWDER_SNOW, PokemonType.ICE, MoveCategory.SPECIAL, 40, 100, 25, 10, 0, 2)
       .attr(StatusEffectAttr, StatusEffect.FREEZE)
       .target(MoveTarget.ALL_NEAR_ENEMIES),
-    new SelfStatusMove(Moves.PROTECT, Type.NORMAL, -1, 10, -1, 4, 2)
+    new SelfStatusMove(Moves.PROTECT, PokemonType.NORMAL, -1, 10, -1, 4, 2)
       .attr(ProtectAttr)
       .condition(failIfLastCondition),
-    new AttackMove(Moves.MACH_PUNCH, Type.FIGHTING, MoveCategory.PHYSICAL, 40, 100, 30, -1, 1, 2)
+    new AttackMove(Moves.MACH_PUNCH, PokemonType.FIGHTING, MoveCategory.PHYSICAL, 40, 100, 30, -1, 1, 2)
       .punchingMove(),
-    new StatusMove(Moves.SCARY_FACE, Type.NORMAL, 100, 10, -1, 0, 2)
-      .attr(StatStageChangeAttr, [ Stat.SPD ], -2),
-    new AttackMove(Moves.FEINT_ATTACK, Type.DARK, MoveCategory.PHYSICAL, 60, -1, 20, -1, 0, 2),
-    new StatusMove(Moves.SWEET_KISS, Type.FAIRY, 75, 10, -1, 0, 2)
-      .attr(ConfuseAttr),
-    new SelfStatusMove(Moves.BELLY_DRUM, Type.NORMAL, -1, 10, -1, 0, 2)
+    new StatusMove(Moves.SCARY_FACE, PokemonType.NORMAL, 100, 10, -1, 0, 2)
+      .attr(StatStageChangeAttr, [ Stat.SPD ], -2)
+      .reflectable(),
+    new AttackMove(Moves.FEINT_ATTACK, PokemonType.DARK, MoveCategory.PHYSICAL, 60, -1, 20, -1, 0, 2),
+    new StatusMove(Moves.SWEET_KISS, PokemonType.FAIRY, 75, 10, -1, 0, 2)
+      .attr(ConfuseAttr)
+      .reflectable(),
+    new SelfStatusMove(Moves.BELLY_DRUM, PokemonType.NORMAL, -1, 10, -1, 0, 2)
       .attr(CutHpStatStageBoostAttr, [ Stat.ATK ], 12, 2, (user) => {
         globalScene.queueMessage(i18next.t("moveTriggers:cutOwnHpAndMaximizedStat", { pokemonName: getPokemonNameWithAffix(user), statName: i18next.t(getStatKey(Stat.ATK)) }));
       }),
-    new AttackMove(Moves.SLUDGE_BOMB, Type.POISON, MoveCategory.SPECIAL, 90, 100, 10, 30, 0, 2)
+    new AttackMove(Moves.SLUDGE_BOMB, PokemonType.POISON, MoveCategory.SPECIAL, 90, 100, 10, 30, 0, 2)
       .attr(StatusEffectAttr, StatusEffect.POISON)
       .ballBombMove(),
-    new AttackMove(Moves.MUD_SLAP, Type.GROUND, MoveCategory.SPECIAL, 20, 100, 10, 100, 0, 2)
+    new AttackMove(Moves.MUD_SLAP, PokemonType.GROUND, MoveCategory.SPECIAL, 20, 100, 10, 100, 0, 2)
       .attr(StatStageChangeAttr, [ Stat.ACC ], -1),
-    new AttackMove(Moves.OCTAZOOKA, Type.WATER, MoveCategory.SPECIAL, 65, 85, 10, 50, 0, 2)
+    new AttackMove(Moves.OCTAZOOKA, PokemonType.WATER, MoveCategory.SPECIAL, 65, 85, 10, 50, 0, 2)
       .attr(StatStageChangeAttr, [ Stat.ACC ], -1)
       .ballBombMove(),
-    new StatusMove(Moves.SPIKES, Type.GROUND, -1, 20, -1, 0, 2)
+    new StatusMove(Moves.SPIKES, PokemonType.GROUND, -1, 20, -1, 0, 2)
       .attr(AddArenaTrapTagAttr, ArenaTagType.SPIKES)
-      .target(MoveTarget.ENEMY_SIDE),
-    new AttackMove(Moves.ZAP_CANNON, Type.ELECTRIC, MoveCategory.SPECIAL, 120, 50, 5, 100, 0, 2)
+      .target(MoveTarget.ENEMY_SIDE)
+      .reflectable(),
+    new AttackMove(Moves.ZAP_CANNON, PokemonType.ELECTRIC, MoveCategory.SPECIAL, 120, 50, 5, 100, 0, 2)
       .attr(StatusEffectAttr, StatusEffect.PARALYSIS)
       .ballBombMove(),
-    new StatusMove(Moves.FORESIGHT, Type.NORMAL, -1, 40, -1, 0, 2)
+    new StatusMove(Moves.FORESIGHT, PokemonType.NORMAL, -1, 40, -1, 0, 2)
       .attr(ExposedMoveAttr, BattlerTagType.IGNORE_GHOST)
-      .ignoresSubstitute(),
-    new SelfStatusMove(Moves.DESTINY_BOND, Type.GHOST, -1, 5, -1, 0, 2)
+      .ignoresSubstitute()
+      .reflectable(),
+    new SelfStatusMove(Moves.DESTINY_BOND, PokemonType.GHOST, -1, 5, -1, 0, 2)
       .ignoresProtect()
       .attr(DestinyBondAttr)
       .condition((user, target, move) => {
@@ -8946,115 +8994,120 @@ export function initMoves() {
         // - the previous move was unsuccessful
         return lastTurnMove.length === 0 || lastTurnMove[0].move !== move.id || lastTurnMove[0].result !== MoveResult.SUCCESS;
       }),
-    new StatusMove(Moves.PERISH_SONG, Type.NORMAL, -1, 5, -1, 0, 2)
+    new StatusMove(Moves.PERISH_SONG, PokemonType.NORMAL, -1, 5, -1, 0, 2)
       .attr(FaintCountdownAttr)
       .ignoresProtect()
       .soundBased()
       .condition(failOnBossCondition)
       .target(MoveTarget.ALL),
-    new AttackMove(Moves.ICY_WIND, Type.ICE, MoveCategory.SPECIAL, 55, 95, 15, 100, 0, 2)
+    new AttackMove(Moves.ICY_WIND, PokemonType.ICE, MoveCategory.SPECIAL, 55, 95, 15, 100, 0, 2)
       .attr(StatStageChangeAttr, [ Stat.SPD ], -1)
       .windMove()
       .target(MoveTarget.ALL_NEAR_ENEMIES),
-    new SelfStatusMove(Moves.DETECT, Type.FIGHTING, -1, 5, -1, 4, 2)
+    new SelfStatusMove(Moves.DETECT, PokemonType.FIGHTING, -1, 5, -1, 4, 2)
       .attr(ProtectAttr)
       .condition(failIfLastCondition),
-    new AttackMove(Moves.BONE_RUSH, Type.GROUND, MoveCategory.PHYSICAL, 25, 90, 10, -1, 0, 2)
+    new AttackMove(Moves.BONE_RUSH, PokemonType.GROUND, MoveCategory.PHYSICAL, 25, 90, 10, -1, 0, 2)
       .attr(MultiHitAttr)
       .makesContact(false),
-    new StatusMove(Moves.LOCK_ON, Type.NORMAL, -1, 5, -1, 0, 2)
+    new StatusMove(Moves.LOCK_ON, PokemonType.NORMAL, -1, 5, -1, 0, 2)
       .attr(IgnoreAccuracyAttr),
-    new AttackMove(Moves.OUTRAGE, Type.DRAGON, MoveCategory.PHYSICAL, 120, 100, 10, -1, 0, 2)
+    new AttackMove(Moves.OUTRAGE, PokemonType.DRAGON, MoveCategory.PHYSICAL, 120, 100, 10, -1, 0, 2)
       .attr(FrenzyAttr)
       .attr(MissEffectAttr, frenzyMissFunc)
       .attr(NoEffectAttr, frenzyMissFunc)
       .target(MoveTarget.RANDOM_NEAR_ENEMY),
-    new StatusMove(Moves.SANDSTORM, Type.ROCK, -1, 10, -1, 0, 2)
+    new StatusMove(Moves.SANDSTORM, PokemonType.ROCK, -1, 10, -1, 0, 2)
       .attr(WeatherChangeAttr, WeatherType.SANDSTORM)
       .target(MoveTarget.BOTH_SIDES),
-    new AttackMove(Moves.GIGA_DRAIN, Type.GRASS, MoveCategory.SPECIAL, 75, 100, 10, -1, 0, 2)
+    new AttackMove(Moves.GIGA_DRAIN, PokemonType.GRASS, MoveCategory.SPECIAL, 75, 100, 10, -1, 0, 2)
       .attr(HitHealAttr)
       .triageMove(),
-    new SelfStatusMove(Moves.ENDURE, Type.NORMAL, -1, 10, -1, 4, 2)
+    new SelfStatusMove(Moves.ENDURE, PokemonType.NORMAL, -1, 10, -1, 4, 2)
       .attr(ProtectAttr, BattlerTagType.ENDURING)
       .condition(failIfLastCondition),
-    new StatusMove(Moves.CHARM, Type.FAIRY, 100, 20, -1, 0, 2)
-      .attr(StatStageChangeAttr, [ Stat.ATK ], -2),
-    new AttackMove(Moves.ROLLOUT, Type.ROCK, MoveCategory.PHYSICAL, 30, 90, 20, -1, 0, 2)
+    new StatusMove(Moves.CHARM, PokemonType.FAIRY, 100, 20, -1, 0, 2)
+      .attr(StatStageChangeAttr, [ Stat.ATK ], -2)
+      .reflectable(),
+    new AttackMove(Moves.ROLLOUT, PokemonType.ROCK, MoveCategory.PHYSICAL, 30, 90, 20, -1, 0, 2)
       .partial() // Does not lock the user, also does not increase damage properly
       .attr(ConsecutiveUseDoublePowerAttr, 5, true, true, Moves.DEFENSE_CURL),
-    new AttackMove(Moves.FALSE_SWIPE, Type.NORMAL, MoveCategory.PHYSICAL, 40, 100, 40, -1, 0, 2)
+    new AttackMove(Moves.FALSE_SWIPE, PokemonType.NORMAL, MoveCategory.PHYSICAL, 40, 100, 40, -1, 0, 2)
       .attr(SurviveDamageAttr),
-    new StatusMove(Moves.SWAGGER, Type.NORMAL, 85, 15, -1, 0, 2)
+    new StatusMove(Moves.SWAGGER, PokemonType.NORMAL, 85, 15, -1, 0, 2)
       .attr(StatStageChangeAttr, [ Stat.ATK ], 2)
-      .attr(ConfuseAttr),
-    new SelfStatusMove(Moves.MILK_DRINK, Type.NORMAL, -1, 5, -1, 0, 2)
+      .attr(ConfuseAttr)
+      .reflectable(),
+    new SelfStatusMove(Moves.MILK_DRINK, PokemonType.NORMAL, -1, 5, -1, 0, 2)
       .attr(HealAttr, 0.5)
       .triageMove(),
-    new AttackMove(Moves.SPARK, Type.ELECTRIC, MoveCategory.PHYSICAL, 65, 100, 20, 30, 0, 2)
+    new AttackMove(Moves.SPARK, PokemonType.ELECTRIC, MoveCategory.PHYSICAL, 65, 100, 20, 30, 0, 2)
       .attr(StatusEffectAttr, StatusEffect.PARALYSIS),
-    new AttackMove(Moves.FURY_CUTTER, Type.BUG, MoveCategory.PHYSICAL, 40, 95, 20, -1, 0, 2)
+    new AttackMove(Moves.FURY_CUTTER, PokemonType.BUG, MoveCategory.PHYSICAL, 40, 95, 20, -1, 0, 2)
       .attr(ConsecutiveUseDoublePowerAttr, 3, true)
       .slicingMove(),
-    new AttackMove(Moves.STEEL_WING, Type.STEEL, MoveCategory.PHYSICAL, 70, 90, 25, 10, 0, 2)
+    new AttackMove(Moves.STEEL_WING, PokemonType.STEEL, MoveCategory.PHYSICAL, 70, 90, 25, 10, 0, 2)
       .attr(StatStageChangeAttr, [ Stat.DEF ], 1, true),
-    new StatusMove(Moves.MEAN_LOOK, Type.NORMAL, -1, 5, -1, 0, 2)
+    new StatusMove(Moves.MEAN_LOOK, PokemonType.NORMAL, -1, 5, -1, 0, 2)
       .condition(failIfGhostTypeCondition)
-      .attr(AddBattlerTagAttr, BattlerTagType.TRAPPED, false, true, 1),
-    new StatusMove(Moves.ATTRACT, Type.NORMAL, 100, 15, -1, 0, 2)
+      .attr(AddBattlerTagAttr, BattlerTagType.TRAPPED, false, true, 1)
+      .reflectable(),
+    new StatusMove(Moves.ATTRACT, PokemonType.NORMAL, 100, 15, -1, 0, 2)
       .attr(AddBattlerTagAttr, BattlerTagType.INFATUATED)
       .ignoresSubstitute()
-      .condition((user, target, move) => user.isOppositeGender(target)),
-    new SelfStatusMove(Moves.SLEEP_TALK, Type.NORMAL, -1, 10, -1, 0, 2)
+      .condition((user, target, move) => user.isOppositeGender(target))
+      .reflectable(),
+    new SelfStatusMove(Moves.SLEEP_TALK, PokemonType.NORMAL, -1, 10, -1, 0, 2)
       .attr(BypassSleepAttr)
       .attr(RandomMovesetMoveAttr, invalidSleepTalkMoves, false)
       .condition(userSleptOrComatoseCondition)
       .target(MoveTarget.NEAR_ENEMY),
-    new StatusMove(Moves.HEAL_BELL, Type.NORMAL, -1, 5, -1, 0, 2)
+    new StatusMove(Moves.HEAL_BELL, PokemonType.NORMAL, -1, 5, -1, 0, 2)
       .attr(PartyStatusCureAttr, i18next.t("moveTriggers:bellChimed"), Abilities.SOUNDPROOF)
       .soundBased()
       .target(MoveTarget.PARTY),
-    new AttackMove(Moves.RETURN, Type.NORMAL, MoveCategory.PHYSICAL, -1, 100, 20, -1, 0, 2)
+    new AttackMove(Moves.RETURN, PokemonType.NORMAL, MoveCategory.PHYSICAL, -1, 100, 20, -1, 0, 2)
       .attr(FriendshipPowerAttr),
-    new AttackMove(Moves.PRESENT, Type.NORMAL, MoveCategory.PHYSICAL, -1, 90, 15, -1, 0, 2)
+    new AttackMove(Moves.PRESENT, PokemonType.NORMAL, MoveCategory.PHYSICAL, -1, 90, 15, -1, 0, 2)
       .attr(PresentPowerAttr)
       .makesContact(false),
-    new AttackMove(Moves.FRUSTRATION, Type.NORMAL, MoveCategory.PHYSICAL, -1, 100, 20, -1, 0, 2)
+    new AttackMove(Moves.FRUSTRATION, PokemonType.NORMAL, MoveCategory.PHYSICAL, -1, 100, 20, -1, 0, 2)
       .attr(FriendshipPowerAttr, true),
-    new StatusMove(Moves.SAFEGUARD, Type.NORMAL, -1, 25, -1, 0, 2)
+    new StatusMove(Moves.SAFEGUARD, PokemonType.NORMAL, -1, 25, -1, 0, 2)
       .target(MoveTarget.USER_SIDE)
       .attr(AddArenaTagAttr, ArenaTagType.SAFEGUARD, 5, true, true),
-    new StatusMove(Moves.PAIN_SPLIT, Type.NORMAL, -1, 20, -1, 0, 2)
+    new StatusMove(Moves.PAIN_SPLIT, PokemonType.NORMAL, -1, 20, -1, 0, 2)
       .attr(HpSplitAttr)
       .condition(failOnBossCondition),
-    new AttackMove(Moves.SACRED_FIRE, Type.FIRE, MoveCategory.PHYSICAL, 100, 95, 5, 50, 0, 2)
+    new AttackMove(Moves.SACRED_FIRE, PokemonType.FIRE, MoveCategory.PHYSICAL, 100, 95, 5, 50, 0, 2)
       .attr(HealStatusEffectAttr, true, StatusEffect.FREEZE)
       .attr(StatusEffectAttr, StatusEffect.BURN)
       .makesContact(false),
-    new AttackMove(Moves.MAGNITUDE, Type.GROUND, MoveCategory.PHYSICAL, -1, 100, 30, -1, 0, 2)
+    new AttackMove(Moves.MAGNITUDE, PokemonType.GROUND, MoveCategory.PHYSICAL, -1, 100, 30, -1, 0, 2)
       .attr(PreMoveMessageAttr, magnitudeMessageFunc)
       .attr(MagnitudePowerAttr)
       .attr(MovePowerMultiplierAttr, (user, target, move) => globalScene.arena.getTerrainType() === TerrainType.GRASSY && target.isGrounded() ? 0.5 : 1)
       .attr(HitsTagForDoubleDamageAttr, BattlerTagType.UNDERGROUND)
       .makesContact(false)
       .target(MoveTarget.ALL_NEAR_OTHERS),
-    new AttackMove(Moves.DYNAMIC_PUNCH, Type.FIGHTING, MoveCategory.PHYSICAL, 100, 50, 5, 100, 0, 2)
+    new AttackMove(Moves.DYNAMIC_PUNCH, PokemonType.FIGHTING, MoveCategory.PHYSICAL, 100, 50, 5, 100, 0, 2)
       .attr(ConfuseAttr)
       .punchingMove(),
-    new AttackMove(Moves.MEGAHORN, Type.BUG, MoveCategory.PHYSICAL, 120, 85, 10, -1, 0, 2),
-    new AttackMove(Moves.DRAGON_BREATH, Type.DRAGON, MoveCategory.SPECIAL, 60, 100, 20, 30, 0, 2)
+    new AttackMove(Moves.MEGAHORN, PokemonType.BUG, MoveCategory.PHYSICAL, 120, 85, 10, -1, 0, 2),
+    new AttackMove(Moves.DRAGON_BREATH, PokemonType.DRAGON, MoveCategory.SPECIAL, 60, 100, 20, 30, 0, 2)
       .attr(StatusEffectAttr, StatusEffect.PARALYSIS),
-    new SelfStatusMove(Moves.BATON_PASS, Type.NORMAL, -1, 40, -1, 0, 2)
+    new SelfStatusMove(Moves.BATON_PASS, PokemonType.NORMAL, -1, 40, -1, 0, 2)
       .attr(ForceSwitchOutAttr, true, SwitchType.BATON_PASS)
       .condition(failIfLastInPartyCondition)
       .hidesUser(),
-    new StatusMove(Moves.ENCORE, Type.NORMAL, 100, 5, -1, 0, 2)
+    new StatusMove(Moves.ENCORE, PokemonType.NORMAL, 100, 5, -1, 0, 2)
       .attr(AddBattlerTagAttr, BattlerTagType.ENCORE, false, true)
       .ignoresSubstitute()
-      .condition((user, target, move) => new EncoreTag(user.id).canAdd(target)),
-    new AttackMove(Moves.PURSUIT, Type.DARK, MoveCategory.PHYSICAL, 40, 100, 20, -1, 0, 2)
+      .condition((user, target, move) => new EncoreTag(user.id).canAdd(target))
+      .reflectable(),
+    new AttackMove(Moves.PURSUIT, PokemonType.DARK, MoveCategory.PHYSICAL, 40, 100, 20, -1, 0, 2)
       .partial(), // No effect implemented
-    new AttackMove(Moves.RAPID_SPIN, Type.NORMAL, MoveCategory.PHYSICAL, 50, 100, 40, 100, 0, 2)
+    new AttackMove(Moves.RAPID_SPIN, PokemonType.NORMAL, MoveCategory.PHYSICAL, 50, 100, 40, 100, 0, 2)
       .attr(StatStageChangeAttr, [ Stat.SPD ], 1, true)
       .attr(RemoveBattlerTagAttr, [
         BattlerTagType.BIND,
@@ -9070,429 +9123,467 @@ export function initMoves() {
         BattlerTagType.INFESTATION
       ], true)
       .attr(RemoveArenaTrapAttr),
-    new StatusMove(Moves.SWEET_SCENT, Type.NORMAL, 100, 20, -1, 0, 2)
+    new StatusMove(Moves.SWEET_SCENT, PokemonType.NORMAL, 100, 20, -1, 0, 2)
       .attr(StatStageChangeAttr, [ Stat.EVA ], -2)
-      .target(MoveTarget.ALL_NEAR_ENEMIES),
-    new AttackMove(Moves.IRON_TAIL, Type.STEEL, MoveCategory.PHYSICAL, 100, 75, 15, 30, 0, 2)
+      .target(MoveTarget.ALL_NEAR_ENEMIES)
+      .reflectable(),
+    new AttackMove(Moves.IRON_TAIL, PokemonType.STEEL, MoveCategory.PHYSICAL, 100, 75, 15, 30, 0, 2)
       .attr(StatStageChangeAttr, [ Stat.DEF ], -1),
-    new AttackMove(Moves.METAL_CLAW, Type.STEEL, MoveCategory.PHYSICAL, 50, 95, 35, 10, 0, 2)
+    new AttackMove(Moves.METAL_CLAW, PokemonType.STEEL, MoveCategory.PHYSICAL, 50, 95, 35, 10, 0, 2)
       .attr(StatStageChangeAttr, [ Stat.ATK ], 1, true),
-    new AttackMove(Moves.VITAL_THROW, Type.FIGHTING, MoveCategory.PHYSICAL, 70, -1, 10, -1, -1, 2),
-    new SelfStatusMove(Moves.MORNING_SUN, Type.NORMAL, -1, 5, -1, 0, 2)
+    new AttackMove(Moves.VITAL_THROW, PokemonType.FIGHTING, MoveCategory.PHYSICAL, 70, -1, 10, -1, -1, 2),
+    new SelfStatusMove(Moves.MORNING_SUN, PokemonType.NORMAL, -1, 5, -1, 0, 2)
       .attr(PlantHealAttr)
       .triageMove(),
-    new SelfStatusMove(Moves.SYNTHESIS, Type.GRASS, -1, 5, -1, 0, 2)
+    new SelfStatusMove(Moves.SYNTHESIS, PokemonType.GRASS, -1, 5, -1, 0, 2)
       .attr(PlantHealAttr)
       .triageMove(),
-    new SelfStatusMove(Moves.MOONLIGHT, Type.FAIRY, -1, 5, -1, 0, 2)
+    new SelfStatusMove(Moves.MOONLIGHT, PokemonType.FAIRY, -1, 5, -1, 0, 2)
       .attr(PlantHealAttr)
       .triageMove(),
-    new AttackMove(Moves.HIDDEN_POWER, Type.NORMAL, MoveCategory.SPECIAL, 60, 100, 15, -1, 0, 2)
+    new AttackMove(Moves.HIDDEN_POWER, PokemonType.NORMAL, MoveCategory.SPECIAL, 60, 100, 15, -1, 0, 2)
       .attr(HiddenPowerTypeAttr),
-    new AttackMove(Moves.CROSS_CHOP, Type.FIGHTING, MoveCategory.PHYSICAL, 100, 80, 5, -1, 0, 2)
+    new AttackMove(Moves.CROSS_CHOP, PokemonType.FIGHTING, MoveCategory.PHYSICAL, 100, 80, 5, -1, 0, 2)
       .attr(HighCritAttr),
-    new AttackMove(Moves.TWISTER, Type.DRAGON, MoveCategory.SPECIAL, 40, 100, 20, 20, 0, 2)
+    new AttackMove(Moves.TWISTER, PokemonType.DRAGON, MoveCategory.SPECIAL, 40, 100, 20, 20, 0, 2)
       .attr(HitsTagForDoubleDamageAttr, BattlerTagType.FLYING)
       .attr(FlinchAttr)
       .windMove()
       .target(MoveTarget.ALL_NEAR_ENEMIES),
-    new StatusMove(Moves.RAIN_DANCE, Type.WATER, -1, 5, -1, 0, 2)
+    new StatusMove(Moves.RAIN_DANCE, PokemonType.WATER, -1, 5, -1, 0, 2)
       .attr(WeatherChangeAttr, WeatherType.RAIN)
       .target(MoveTarget.BOTH_SIDES),
-    new StatusMove(Moves.SUNNY_DAY, Type.FIRE, -1, 5, -1, 0, 2)
+    new StatusMove(Moves.SUNNY_DAY, PokemonType.FIRE, -1, 5, -1, 0, 2)
       .attr(WeatherChangeAttr, WeatherType.SUNNY)
       .target(MoveTarget.BOTH_SIDES),
-    new AttackMove(Moves.CRUNCH, Type.DARK, MoveCategory.PHYSICAL, 80, 100, 15, 20, 0, 2)
+    new AttackMove(Moves.CRUNCH, PokemonType.DARK, MoveCategory.PHYSICAL, 80, 100, 15, 20, 0, 2)
       .attr(StatStageChangeAttr, [ Stat.DEF ], -1)
       .bitingMove(),
-    new AttackMove(Moves.MIRROR_COAT, Type.PSYCHIC, MoveCategory.SPECIAL, -1, 100, 20, -1, -5, 2)
+    new AttackMove(Moves.MIRROR_COAT, PokemonType.PSYCHIC, MoveCategory.SPECIAL, -1, 100, 20, -1, -5, 2)
       .attr(CounterDamageAttr, (move: Move) => move.category === MoveCategory.SPECIAL, 2)
       .target(MoveTarget.ATTACKER),
-    new StatusMove(Moves.PSYCH_UP, Type.NORMAL, -1, 10, -1, 0, 2)
+    new StatusMove(Moves.PSYCH_UP, PokemonType.NORMAL, -1, 10, -1, 0, 2)
       .ignoresSubstitute()
       .attr(CopyStatsAttr),
-    new AttackMove(Moves.EXTREME_SPEED, Type.NORMAL, MoveCategory.PHYSICAL, 80, 100, 5, -1, 2, 2),
-    new AttackMove(Moves.ANCIENT_POWER, Type.ROCK, MoveCategory.SPECIAL, 60, 100, 5, 10, 0, 2)
+    new AttackMove(Moves.EXTREME_SPEED, PokemonType.NORMAL, MoveCategory.PHYSICAL, 80, 100, 5, -1, 2, 2),
+    new AttackMove(Moves.ANCIENT_POWER, PokemonType.ROCK, MoveCategory.SPECIAL, 60, 100, 5, 10, 0, 2)
       .attr(StatStageChangeAttr, [ Stat.ATK, Stat.DEF, Stat.SPATK, Stat.SPDEF, Stat.SPD ], 1, true),
-    new AttackMove(Moves.SHADOW_BALL, Type.GHOST, MoveCategory.SPECIAL, 80, 100, 15, 20, 0, 2)
+    new AttackMove(Moves.SHADOW_BALL, PokemonType.GHOST, MoveCategory.SPECIAL, 80, 100, 15, 20, 0, 2)
       .attr(StatStageChangeAttr, [ Stat.SPDEF ], -1)
       .ballBombMove(),
-    new AttackMove(Moves.FUTURE_SIGHT, Type.PSYCHIC, MoveCategory.SPECIAL, 120, 100, 10, -1, 0, 2)
+    new AttackMove(Moves.FUTURE_SIGHT, PokemonType.PSYCHIC, MoveCategory.SPECIAL, 120, 100, 10, -1, 0, 2)
       .partial() // cannot be used on multiple Pokemon on the same side in a double battle, hits immediately when called by Metronome/etc, should not apply abilities or held items if user is off the field
       .ignoresProtect()
       .attr(DelayedAttackAttr, ArenaTagType.FUTURE_SIGHT, ChargeAnim.FUTURE_SIGHT_CHARGING, i18next.t("moveTriggers:foresawAnAttack", { pokemonName: "{USER}" })),
-    new AttackMove(Moves.ROCK_SMASH, Type.FIGHTING, MoveCategory.PHYSICAL, 40, 100, 15, 50, 0, 2)
+    new AttackMove(Moves.ROCK_SMASH, PokemonType.FIGHTING, MoveCategory.PHYSICAL, 40, 100, 15, 50, 0, 2)
       .attr(StatStageChangeAttr, [ Stat.DEF ], -1),
-    new AttackMove(Moves.WHIRLPOOL, Type.WATER, MoveCategory.SPECIAL, 35, 85, 15, -1, 0, 2)
+    new AttackMove(Moves.WHIRLPOOL, PokemonType.WATER, MoveCategory.SPECIAL, 35, 85, 15, -1, 0, 2)
       .attr(TrapAttr, BattlerTagType.WHIRLPOOL)
       .attr(HitsTagForDoubleDamageAttr, BattlerTagType.UNDERWATER),
-    new AttackMove(Moves.BEAT_UP, Type.DARK, MoveCategory.PHYSICAL, -1, 100, 10, -1, 0, 2)
+    new AttackMove(Moves.BEAT_UP, PokemonType.DARK, MoveCategory.PHYSICAL, -1, 100, 10, -1, 0, 2)
       .attr(MultiHitAttr, MultiHitType.BEAT_UP)
       .attr(BeatUpAttr)
       .makesContact(false),
-    new AttackMove(Moves.FAKE_OUT, Type.NORMAL, MoveCategory.PHYSICAL, 40, 100, 10, 100, 3, 3)
+    new AttackMove(Moves.FAKE_OUT, PokemonType.NORMAL, MoveCategory.PHYSICAL, 40, 100, 10, 100, 3, 3)
       .attr(FlinchAttr)
       .condition(new FirstMoveCondition()),
-    new AttackMove(Moves.UPROAR, Type.NORMAL, MoveCategory.SPECIAL, 90, 100, 10, -1, 0, 3)
+    new AttackMove(Moves.UPROAR, PokemonType.NORMAL, MoveCategory.SPECIAL, 90, 100, 10, -1, 0, 3)
       .soundBased()
       .target(MoveTarget.RANDOM_NEAR_ENEMY)
       .partial(), // Does not lock the user, does not stop Pokemon from sleeping
-    new SelfStatusMove(Moves.STOCKPILE, Type.NORMAL, -1, 20, -1, 0, 3)
+      // Likely can make use of FrenzyAttr and an ArenaTag (just without the FrenzyMissFunc)
+    new SelfStatusMove(Moves.STOCKPILE, PokemonType.NORMAL, -1, 20, -1, 0, 3)
       .condition(user => (user.getTag(StockpilingTag)?.stockpiledCount ?? 0) < 3)
       .attr(AddBattlerTagAttr, BattlerTagType.STOCKPILING, true),
-    new AttackMove(Moves.SPIT_UP, Type.NORMAL, MoveCategory.SPECIAL, -1, -1, 10, -1, 0, 3)
+    new AttackMove(Moves.SPIT_UP, PokemonType.NORMAL, MoveCategory.SPECIAL, -1, -1, 10, -1, 0, 3)
       .condition(hasStockpileStacksCondition)
       .attr(SpitUpPowerAttr, 100)
       .attr(RemoveBattlerTagAttr, [ BattlerTagType.STOCKPILING ], true),
-    new SelfStatusMove(Moves.SWALLOW, Type.NORMAL, -1, 10, -1, 0, 3)
+    new SelfStatusMove(Moves.SWALLOW, PokemonType.NORMAL, -1, 10, -1, 0, 3)
       .condition(hasStockpileStacksCondition)
       .attr(SwallowHealAttr)
       .attr(RemoveBattlerTagAttr, [ BattlerTagType.STOCKPILING ], true)
       .triageMove(),
-    new AttackMove(Moves.HEAT_WAVE, Type.FIRE, MoveCategory.SPECIAL, 95, 90, 10, 10, 0, 3)
+    new AttackMove(Moves.HEAT_WAVE, PokemonType.FIRE, MoveCategory.SPECIAL, 95, 90, 10, 10, 0, 3)
       .attr(HealStatusEffectAttr, true, StatusEffect.FREEZE)
       .attr(StatusEffectAttr, StatusEffect.BURN)
       .windMove()
       .target(MoveTarget.ALL_NEAR_ENEMIES),
-    new StatusMove(Moves.HAIL, Type.ICE, -1, 10, -1, 0, 3)
+    new StatusMove(Moves.HAIL, PokemonType.ICE, -1, 10, -1, 0, 3)
       .attr(WeatherChangeAttr, WeatherType.HAIL)
       .target(MoveTarget.BOTH_SIDES),
-    new StatusMove(Moves.TORMENT, Type.DARK, 100, 15, -1, 0, 3)
+    new StatusMove(Moves.TORMENT, PokemonType.DARK, 100, 15, -1, 0, 3)
       .ignoresSubstitute()
       .edgeCase() // Incomplete implementation because of Uproar's partial implementation
-      .attr(AddBattlerTagAttr, BattlerTagType.TORMENT, false, true, 1),
-    new StatusMove(Moves.FLATTER, Type.DARK, 100, 15, -1, 0, 3)
+      .attr(AddBattlerTagAttr, BattlerTagType.TORMENT, false, true, 1)
+      .reflectable(),
+    new StatusMove(Moves.FLATTER, PokemonType.DARK, 100, 15, -1, 0, 3)
       .attr(StatStageChangeAttr, [ Stat.SPATK ], 1)
-      .attr(ConfuseAttr),
-    new StatusMove(Moves.WILL_O_WISP, Type.FIRE, 85, 15, -1, 0, 3)
-      .attr(StatusEffectAttr, StatusEffect.BURN),
-    new StatusMove(Moves.MEMENTO, Type.DARK, 100, 10, -1, 0, 3)
+      .attr(ConfuseAttr)
+      .reflectable(),
+    new StatusMove(Moves.WILL_O_WISP, PokemonType.FIRE, 85, 15, -1, 0, 3)
+      .attr(StatusEffectAttr, StatusEffect.BURN)
+      .reflectable(),
+    new StatusMove(Moves.MEMENTO, PokemonType.DARK, 100, 10, -1, 0, 3)
       .attr(SacrificialAttrOnHit)
       .attr(StatStageChangeAttr, [ Stat.ATK, Stat.SPATK ], -2),
-    new AttackMove(Moves.FACADE, Type.NORMAL, MoveCategory.PHYSICAL, 70, 100, 20, -1, 0, 3)
+    new AttackMove(Moves.FACADE, PokemonType.NORMAL, MoveCategory.PHYSICAL, 70, 100, 20, -1, 0, 3)
       .attr(MovePowerMultiplierAttr, (user, target, move) => user.status
         && (user.status.effect === StatusEffect.BURN || user.status.effect === StatusEffect.POISON || user.status.effect === StatusEffect.TOXIC || user.status.effect === StatusEffect.PARALYSIS) ? 2 : 1)
       .attr(BypassBurnDamageReductionAttr),
-    new AttackMove(Moves.FOCUS_PUNCH, Type.FIGHTING, MoveCategory.PHYSICAL, 150, 100, 20, -1, -3, 3)
+    new AttackMove(Moves.FOCUS_PUNCH, PokemonType.FIGHTING, MoveCategory.PHYSICAL, 150, 100, 20, -1, -3, 3)
       .attr(MessageHeaderAttr, (user, move) => i18next.t("moveTriggers:isTighteningFocus", { pokemonName: getPokemonNameWithAffix(user) }))
-      .punchingMove()
-      .condition((user, target, move) => !user.turnData.attacksReceived.find(r => r.damage)),
-    new AttackMove(Moves.SMELLING_SALTS, Type.NORMAL, MoveCategory.PHYSICAL, 70, 100, 10, -1, 0, 3)
+      .attr(PreUseInterruptAttr, (user, target, move) => i18next.t("moveTriggers:lostFocus", { pokemonName: getPokemonNameWithAffix(user) }), user => !!user.turnData.attacksReceived.find(r => r.damage))
+      .punchingMove(),
+    new AttackMove(Moves.SMELLING_SALTS, PokemonType.NORMAL, MoveCategory.PHYSICAL, 70, 100, 10, -1, 0, 3)
       .attr(MovePowerMultiplierAttr, (user, target, move) => target.status?.effect === StatusEffect.PARALYSIS ? 2 : 1)
       .attr(HealStatusEffectAttr, true, StatusEffect.PARALYSIS),
-    new SelfStatusMove(Moves.FOLLOW_ME, Type.NORMAL, -1, 20, -1, 2, 3)
+    new SelfStatusMove(Moves.FOLLOW_ME, PokemonType.NORMAL, -1, 20, -1, 2, 3)
       .attr(AddBattlerTagAttr, BattlerTagType.CENTER_OF_ATTENTION, true),
-    new StatusMove(Moves.NATURE_POWER, Type.NORMAL, -1, 20, -1, 0, 3)
+    new StatusMove(Moves.NATURE_POWER, PokemonType.NORMAL, -1, 20, -1, 0, 3)
       .attr(NaturePowerAttr),
-    new SelfStatusMove(Moves.CHARGE, Type.ELECTRIC, -1, 20, -1, 0, 3)
+    new SelfStatusMove(Moves.CHARGE, PokemonType.ELECTRIC, -1, 20, -1, 0, 3)
       .attr(StatStageChangeAttr, [ Stat.SPDEF ], 1, true)
       .attr(AddBattlerTagAttr, BattlerTagType.CHARGED, true, false),
-    new StatusMove(Moves.TAUNT, Type.DARK, 100, 20, -1, 0, 3)
+    new StatusMove(Moves.TAUNT, PokemonType.DARK, 100, 20, -1, 0, 3)
       .ignoresSubstitute()
-      .attr(AddBattlerTagAttr, BattlerTagType.TAUNT, false, true, 4),
-    new StatusMove(Moves.HELPING_HAND, Type.NORMAL, -1, 20, -1, 5, 3)
+      .attr(AddBattlerTagAttr, BattlerTagType.TAUNT, false, true, 4)
+      .reflectable(),
+    new StatusMove(Moves.HELPING_HAND, PokemonType.NORMAL, -1, 20, -1, 5, 3)
       .attr(AddBattlerTagAttr, BattlerTagType.HELPING_HAND)
       .ignoresSubstitute()
       .target(MoveTarget.NEAR_ALLY)
       .condition(failIfSingleBattle),
-    new StatusMove(Moves.TRICK, Type.PSYCHIC, 100, 10, -1, 0, 3)
+    new StatusMove(Moves.TRICK, PokemonType.PSYCHIC, 100, 10, -1, 0, 3)
       .unimplemented(),
-    new StatusMove(Moves.ROLE_PLAY, Type.PSYCHIC, -1, 10, -1, 0, 3)
+    new StatusMove(Moves.ROLE_PLAY, PokemonType.PSYCHIC, -1, 10, -1, 0, 3)
       .ignoresSubstitute()
       .attr(AbilityCopyAttr),
-    new SelfStatusMove(Moves.WISH, Type.NORMAL, -1, 10, -1, 0, 3)
+    new SelfStatusMove(Moves.WISH, PokemonType.NORMAL, -1, 10, -1, 0, 3)
       .triageMove()
       .attr(AddArenaTagAttr, ArenaTagType.WISH, 2, true),
-    new SelfStatusMove(Moves.ASSIST, Type.NORMAL, -1, 20, -1, 0, 3)
+    new SelfStatusMove(Moves.ASSIST, PokemonType.NORMAL, -1, 20, -1, 0, 3)
       .attr(RandomMovesetMoveAttr, invalidAssistMoves, true),
-    new SelfStatusMove(Moves.INGRAIN, Type.GRASS, -1, 20, -1, 0, 3)
+    new SelfStatusMove(Moves.INGRAIN, PokemonType.GRASS, -1, 20, -1, 0, 3)
       .attr(AddBattlerTagAttr, BattlerTagType.INGRAIN, true, true)
       .attr(AddBattlerTagAttr, BattlerTagType.IGNORE_FLYING, true, true)
       .attr(RemoveBattlerTagAttr, [ BattlerTagType.FLOATING ], true),
-    new AttackMove(Moves.SUPERPOWER, Type.FIGHTING, MoveCategory.PHYSICAL, 120, 100, 5, -1, 0, 3)
+    new AttackMove(Moves.SUPERPOWER, PokemonType.FIGHTING, MoveCategory.PHYSICAL, 120, 100, 5, -1, 0, 3)
       .attr(StatStageChangeAttr, [ Stat.ATK, Stat.DEF ], -1, true),
-    new SelfStatusMove(Moves.MAGIC_COAT, Type.PSYCHIC, -1, 15, -1, 4, 3)
+    new SelfStatusMove(Moves.MAGIC_COAT, PokemonType.PSYCHIC, -1, 15, -1, 4, 3)
+      .attr(AddBattlerTagAttr, BattlerTagType.MAGIC_COAT, true, true, 0)
+      .condition(failIfLastCondition)
+      // Interactions with stomping tantrum, instruct, and other moves that
+      // rely on move history
+      // Also will not reflect roar / whirlwind if the target has ForceSwitchOutImmunityAbAttr
+      .edgeCase(),
+    new SelfStatusMove(Moves.RECYCLE, PokemonType.NORMAL, -1, 10, -1, 0, 3)
       .unimplemented(),
-    new SelfStatusMove(Moves.RECYCLE, Type.NORMAL, -1, 10, -1, 0, 3)
-      .unimplemented(),
-    new AttackMove(Moves.REVENGE, Type.FIGHTING, MoveCategory.PHYSICAL, 60, 100, 10, -1, -4, 3)
+    new AttackMove(Moves.REVENGE, PokemonType.FIGHTING, MoveCategory.PHYSICAL, 60, 100, 10, -1, -4, 3)
       .attr(TurnDamagedDoublePowerAttr),
-    new AttackMove(Moves.BRICK_BREAK, Type.FIGHTING, MoveCategory.PHYSICAL, 75, 100, 15, -1, 0, 3)
+    new AttackMove(Moves.BRICK_BREAK, PokemonType.FIGHTING, MoveCategory.PHYSICAL, 75, 100, 15, -1, 0, 3)
       .attr(RemoveScreensAttr),
-    new StatusMove(Moves.YAWN, Type.NORMAL, -1, 10, -1, 0, 3)
+    new StatusMove(Moves.YAWN, PokemonType.NORMAL, -1, 10, -1, 0, 3)
       .attr(AddBattlerTagAttr, BattlerTagType.DROWSY, false, true)
-      .condition((user, target, move) => !target.status && !target.isSafeguarded(user)),
-    new AttackMove(Moves.KNOCK_OFF, Type.DARK, MoveCategory.PHYSICAL, 65, 100, 20, -1, 0, 3)
+      .condition((user, target, move) => !target.status && !target.isSafeguarded(user))
+      .reflectable(),
+    new AttackMove(Moves.KNOCK_OFF, PokemonType.DARK, MoveCategory.PHYSICAL, 65, 100, 20, -1, 0, 3)
       .attr(MovePowerMultiplierAttr, (user, target, move) => target.getHeldItems().filter(i => i.isTransferable).length > 0 ? 1.5 : 1)
-      .attr(RemoveHeldItemAttr, false),
-    new AttackMove(Moves.ENDEAVOR, Type.NORMAL, MoveCategory.PHYSICAL, -1, 100, 5, -1, 0, 3)
+      .attr(RemoveHeldItemAttr, false)
+      .edgeCase(),
+      // Should not be able to remove held item if user faints due to Rough Skin, Iron Barbs, etc.
+      // Should be able to remove items from pokemon with Sticky Hold if the damage causes them to faint
+    new AttackMove(Moves.ENDEAVOR, PokemonType.NORMAL, MoveCategory.PHYSICAL, -1, 100, 5, -1, 0, 3)
       .attr(MatchHpAttr)
       .condition(failOnBossCondition),
-    new AttackMove(Moves.ERUPTION, Type.FIRE, MoveCategory.SPECIAL, 150, 100, 5, -1, 0, 3)
+    new AttackMove(Moves.ERUPTION, PokemonType.FIRE, MoveCategory.SPECIAL, 150, 100, 5, -1, 0, 3)
       .attr(HpPowerAttr)
       .target(MoveTarget.ALL_NEAR_ENEMIES),
-    new StatusMove(Moves.SKILL_SWAP, Type.PSYCHIC, -1, 10, -1, 0, 3)
+    new StatusMove(Moves.SKILL_SWAP, PokemonType.PSYCHIC, -1, 10, -1, 0, 3)
       .ignoresSubstitute()
       .attr(SwitchAbilitiesAttr),
-    new StatusMove(Moves.IMPRISON, Type.PSYCHIC, 100, 10, -1, 0, 3)
+    new StatusMove(Moves.IMPRISON, PokemonType.PSYCHIC, 100, 10, -1, 0, 3)
       .ignoresSubstitute()
       .attr(AddArenaTagAttr, ArenaTagType.IMPRISON, 1, true, false)
       .target(MoveTarget.ENEMY_SIDE),
-    new SelfStatusMove(Moves.REFRESH, Type.NORMAL, -1, 20, -1, 0, 3)
+    new SelfStatusMove(Moves.REFRESH, PokemonType.NORMAL, -1, 20, -1, 0, 3)
       .attr(HealStatusEffectAttr, true, [ StatusEffect.PARALYSIS, StatusEffect.POISON, StatusEffect.TOXIC, StatusEffect.BURN ])
       .condition((user, target, move) => !!user.status && (user.status.effect === StatusEffect.PARALYSIS || user.status.effect === StatusEffect.POISON || user.status.effect === StatusEffect.TOXIC || user.status.effect === StatusEffect.BURN)),
-    new SelfStatusMove(Moves.GRUDGE, Type.GHOST, -1, 5, -1, 0, 3)
+    new SelfStatusMove(Moves.GRUDGE, PokemonType.GHOST, -1, 5, -1, 0, 3)
       .attr(AddBattlerTagAttr, BattlerTagType.GRUDGE, true, undefined, 1),
-    new SelfStatusMove(Moves.SNATCH, Type.DARK, -1, 10, -1, 4, 3)
+    new SelfStatusMove(Moves.SNATCH, PokemonType.DARK, -1, 10, -1, 4, 3)
       .unimplemented(),
-    new AttackMove(Moves.SECRET_POWER, Type.NORMAL, MoveCategory.PHYSICAL, 70, 100, 20, 30, 0, 3)
+    new AttackMove(Moves.SECRET_POWER, PokemonType.NORMAL, MoveCategory.PHYSICAL, 70, 100, 20, 30, 0, 3)
       .makesContact(false)
       .attr(SecretPowerAttr),
-    new ChargingAttackMove(Moves.DIVE, Type.WATER, MoveCategory.PHYSICAL, 80, 100, 10, -1, 0, 3)
+    new ChargingAttackMove(Moves.DIVE, PokemonType.WATER, MoveCategory.PHYSICAL, 80, 100, 10, -1, 0, 3)
       .chargeText(i18next.t("moveTriggers:hidUnderwater", { pokemonName: "{USER}" }))
       .chargeAttr(SemiInvulnerableAttr, BattlerTagType.UNDERWATER)
       .chargeAttr(GulpMissileTagAttr),
-    new AttackMove(Moves.ARM_THRUST, Type.FIGHTING, MoveCategory.PHYSICAL, 15, 100, 20, -1, 0, 3)
+    new AttackMove(Moves.ARM_THRUST, PokemonType.FIGHTING, MoveCategory.PHYSICAL, 15, 100, 20, -1, 0, 3)
       .attr(MultiHitAttr),
-    new SelfStatusMove(Moves.CAMOUFLAGE, Type.NORMAL, -1, 20, -1, 0, 3)
+    new SelfStatusMove(Moves.CAMOUFLAGE, PokemonType.NORMAL, -1, 20, -1, 0, 3)
       .attr(CopyBiomeTypeAttr),
-    new SelfStatusMove(Moves.TAIL_GLOW, Type.BUG, -1, 20, -1, 0, 3)
+    new SelfStatusMove(Moves.TAIL_GLOW, PokemonType.BUG, -1, 20, -1, 0, 3)
       .attr(StatStageChangeAttr, [ Stat.SPATK ], 3, true),
-    new AttackMove(Moves.LUSTER_PURGE, Type.PSYCHIC, MoveCategory.SPECIAL, 95, 100, 5, 50, 0, 3)
+    new AttackMove(Moves.LUSTER_PURGE, PokemonType.PSYCHIC, MoveCategory.SPECIAL, 95, 100, 5, 50, 0, 3)
       .attr(StatStageChangeAttr, [ Stat.SPDEF ], -1),
-    new AttackMove(Moves.MIST_BALL, Type.PSYCHIC, MoveCategory.SPECIAL, 95, 100, 5, 50, 0, 3)
+    new AttackMove(Moves.MIST_BALL, PokemonType.PSYCHIC, MoveCategory.SPECIAL, 95, 100, 5, 50, 0, 3)
       .attr(StatStageChangeAttr, [ Stat.SPATK ], -1)
       .ballBombMove(),
-    new StatusMove(Moves.FEATHER_DANCE, Type.FLYING, 100, 15, -1, 0, 3)
+    new StatusMove(Moves.FEATHER_DANCE, PokemonType.FLYING, 100, 15, -1, 0, 3)
       .attr(StatStageChangeAttr, [ Stat.ATK ], -2)
-      .danceMove(),
-    new StatusMove(Moves.TEETER_DANCE, Type.NORMAL, 100, 20, -1, 0, 3)
+      .danceMove()
+      .reflectable(),
+    new StatusMove(Moves.TEETER_DANCE, PokemonType.NORMAL, 100, 20, -1, 0, 3)
       .attr(ConfuseAttr)
       .danceMove()
       .target(MoveTarget.ALL_NEAR_OTHERS),
-    new AttackMove(Moves.BLAZE_KICK, Type.FIRE, MoveCategory.PHYSICAL, 85, 90, 10, 10, 0, 3)
+    new AttackMove(Moves.BLAZE_KICK, PokemonType.FIRE, MoveCategory.PHYSICAL, 85, 90, 10, 10, 0, 3)
       .attr(HighCritAttr)
       .attr(StatusEffectAttr, StatusEffect.BURN),
-    new StatusMove(Moves.MUD_SPORT, Type.GROUND, -1, 15, -1, 0, 3)
+    new StatusMove(Moves.MUD_SPORT, PokemonType.GROUND, -1, 15, -1, 0, 3)
       .ignoresProtect()
       .attr(AddArenaTagAttr, ArenaTagType.MUD_SPORT, 5)
       .target(MoveTarget.BOTH_SIDES),
-    new AttackMove(Moves.ICE_BALL, Type.ICE, MoveCategory.PHYSICAL, 30, 90, 20, -1, 0, 3)
+    new AttackMove(Moves.ICE_BALL, PokemonType.ICE, MoveCategory.PHYSICAL, 30, 90, 20, -1, 0, 3)
       .partial() // Does not lock the user properly, does not increase damage correctly
       .attr(ConsecutiveUseDoublePowerAttr, 5, true, true, Moves.DEFENSE_CURL)
       .ballBombMove(),
-    new AttackMove(Moves.NEEDLE_ARM, Type.GRASS, MoveCategory.PHYSICAL, 60, 100, 15, 30, 0, 3)
+    new AttackMove(Moves.NEEDLE_ARM, PokemonType.GRASS, MoveCategory.PHYSICAL, 60, 100, 15, 30, 0, 3)
       .attr(FlinchAttr),
-    new SelfStatusMove(Moves.SLACK_OFF, Type.NORMAL, -1, 5, -1, 0, 3)
+    new SelfStatusMove(Moves.SLACK_OFF, PokemonType.NORMAL, -1, 5, -1, 0, 3)
       .attr(HealAttr, 0.5)
       .triageMove(),
-    new AttackMove(Moves.HYPER_VOICE, Type.NORMAL, MoveCategory.SPECIAL, 90, 100, 10, -1, 0, 3)
+    new AttackMove(Moves.HYPER_VOICE, PokemonType.NORMAL, MoveCategory.SPECIAL, 90, 100, 10, -1, 0, 3)
       .soundBased()
       .target(MoveTarget.ALL_NEAR_ENEMIES),
-    new AttackMove(Moves.POISON_FANG, Type.POISON, MoveCategory.PHYSICAL, 50, 100, 15, 50, 0, 3)
+    new AttackMove(Moves.POISON_FANG, PokemonType.POISON, MoveCategory.PHYSICAL, 50, 100, 15, 50, 0, 3)
       .attr(StatusEffectAttr, StatusEffect.TOXIC)
       .bitingMove(),
-    new AttackMove(Moves.CRUSH_CLAW, Type.NORMAL, MoveCategory.PHYSICAL, 75, 95, 10, 50, 0, 3)
+    new AttackMove(Moves.CRUSH_CLAW, PokemonType.NORMAL, MoveCategory.PHYSICAL, 75, 95, 10, 50, 0, 3)
       .attr(StatStageChangeAttr, [ Stat.DEF ], -1),
-    new AttackMove(Moves.BLAST_BURN, Type.FIRE, MoveCategory.SPECIAL, 150, 90, 5, -1, 0, 3)
+    new AttackMove(Moves.BLAST_BURN, PokemonType.FIRE, MoveCategory.SPECIAL, 150, 90, 5, -1, 0, 3)
       .attr(RechargeAttr),
-    new AttackMove(Moves.HYDRO_CANNON, Type.WATER, MoveCategory.SPECIAL, 150, 90, 5, -1, 0, 3)
+    new AttackMove(Moves.HYDRO_CANNON, PokemonType.WATER, MoveCategory.SPECIAL, 150, 90, 5, -1, 0, 3)
       .attr(RechargeAttr),
-    new AttackMove(Moves.METEOR_MASH, Type.STEEL, MoveCategory.PHYSICAL, 90, 90, 10, 20, 0, 3)
+    new AttackMove(Moves.METEOR_MASH, PokemonType.STEEL, MoveCategory.PHYSICAL, 90, 90, 10, 20, 0, 3)
       .attr(StatStageChangeAttr, [ Stat.ATK ], 1, true)
       .punchingMove(),
-    new AttackMove(Moves.ASTONISH, Type.GHOST, MoveCategory.PHYSICAL, 30, 100, 15, 30, 0, 3)
+    new AttackMove(Moves.ASTONISH, PokemonType.GHOST, MoveCategory.PHYSICAL, 30, 100, 15, 30, 0, 3)
       .attr(FlinchAttr),
-    new AttackMove(Moves.WEATHER_BALL, Type.NORMAL, MoveCategory.SPECIAL, 50, 100, 10, -1, 0, 3)
+    new AttackMove(Moves.WEATHER_BALL, PokemonType.NORMAL, MoveCategory.SPECIAL, 50, 100, 10, -1, 0, 3)
       .attr(WeatherBallTypeAttr)
-      .attr(MovePowerMultiplierAttr, (user, target, move) => [ WeatherType.SUNNY, WeatherType.RAIN, WeatherType.SANDSTORM, WeatherType.HAIL, WeatherType.SNOW, WeatherType.FOG, WeatherType.HEAVY_RAIN, WeatherType.HARSH_SUN ].includes(globalScene.arena.weather?.weatherType!) && !globalScene.arena.weather?.isEffectSuppressed() ? 2 : 1) // TODO: is this bang correct?
+      .attr(MovePowerMultiplierAttr, (user, target, move) => {
+        const weather = globalScene.arena.weather;
+        if (!weather) {
+          return 1;
+        }
+        const weatherTypes = [ WeatherType.SUNNY, WeatherType.RAIN, WeatherType.SANDSTORM, WeatherType.HAIL, WeatherType.SNOW, WeatherType.FOG, WeatherType.HEAVY_RAIN, WeatherType.HARSH_SUN ];
+        if (weatherTypes.includes(weather.weatherType) && !weather.isEffectSuppressed()) {
+          return 2;
+        }
+        return 1;
+      })
       .ballBombMove(),
-    new StatusMove(Moves.AROMATHERAPY, Type.GRASS, -1, 5, -1, 0, 3)
+    new StatusMove(Moves.AROMATHERAPY, PokemonType.GRASS, -1, 5, -1, 0, 3)
       .attr(PartyStatusCureAttr, i18next.t("moveTriggers:soothingAromaWaftedThroughArea"), Abilities.SAP_SIPPER)
       .target(MoveTarget.PARTY),
-    new StatusMove(Moves.FAKE_TEARS, Type.DARK, 100, 20, -1, 0, 3)
-      .attr(StatStageChangeAttr, [ Stat.SPDEF ], -2),
-    new AttackMove(Moves.AIR_CUTTER, Type.FLYING, MoveCategory.SPECIAL, 60, 95, 25, -1, 0, 3)
+    new StatusMove(Moves.FAKE_TEARS, PokemonType.DARK, 100, 20, -1, 0, 3)
+      .attr(StatStageChangeAttr, [ Stat.SPDEF ], -2)
+      .reflectable(),
+    new AttackMove(Moves.AIR_CUTTER, PokemonType.FLYING, MoveCategory.SPECIAL, 60, 95, 25, -1, 0, 3)
       .attr(HighCritAttr)
       .slicingMove()
       .windMove()
       .target(MoveTarget.ALL_NEAR_ENEMIES),
-    new AttackMove(Moves.OVERHEAT, Type.FIRE, MoveCategory.SPECIAL, 130, 90, 5, -1, 0, 3)
+    new AttackMove(Moves.OVERHEAT, PokemonType.FIRE, MoveCategory.SPECIAL, 130, 90, 5, -1, 0, 3)
       .attr(StatStageChangeAttr, [ Stat.SPATK ], -2, true)
       .attr(HealStatusEffectAttr, true, StatusEffect.FREEZE),
-    new StatusMove(Moves.ODOR_SLEUTH, Type.NORMAL, -1, 40, -1, 0, 3)
+    new StatusMove(Moves.ODOR_SLEUTH, PokemonType.NORMAL, -1, 40, -1, 0, 3)
       .attr(ExposedMoveAttr, BattlerTagType.IGNORE_GHOST)
-      .ignoresSubstitute(),
-    new AttackMove(Moves.ROCK_TOMB, Type.ROCK, MoveCategory.PHYSICAL, 60, 95, 15, 100, 0, 3)
+      .ignoresSubstitute()
+      .reflectable(),
+    new AttackMove(Moves.ROCK_TOMB, PokemonType.ROCK, MoveCategory.PHYSICAL, 60, 95, 15, 100, 0, 3)
       .attr(StatStageChangeAttr, [ Stat.SPD ], -1)
       .makesContact(false),
-    new AttackMove(Moves.SILVER_WIND, Type.BUG, MoveCategory.SPECIAL, 60, 100, 5, 10, 0, 3)
+    new AttackMove(Moves.SILVER_WIND, PokemonType.BUG, MoveCategory.SPECIAL, 60, 100, 5, 10, 0, 3)
       .attr(StatStageChangeAttr, [ Stat.ATK, Stat.DEF, Stat.SPATK, Stat.SPDEF, Stat.SPD ], 1, true)
       .windMove(),
-    new StatusMove(Moves.METAL_SOUND, Type.STEEL, 85, 40, -1, 0, 3)
+    new StatusMove(Moves.METAL_SOUND, PokemonType.STEEL, 85, 40, -1, 0, 3)
       .attr(StatStageChangeAttr, [ Stat.SPDEF ], -2)
-      .soundBased(),
-    new StatusMove(Moves.GRASS_WHISTLE, Type.GRASS, 55, 15, -1, 0, 3)
+      .soundBased()
+      .reflectable(),
+    new StatusMove(Moves.GRASS_WHISTLE, PokemonType.GRASS, 55, 15, -1, 0, 3)
       .attr(StatusEffectAttr, StatusEffect.SLEEP)
-      .soundBased(),
-    new StatusMove(Moves.TICKLE, Type.NORMAL, 100, 20, -1, 0, 3)
-      .attr(StatStageChangeAttr, [ Stat.ATK, Stat.DEF ], -1),
-    new SelfStatusMove(Moves.COSMIC_POWER, Type.PSYCHIC, -1, 20, -1, 0, 3)
+      .soundBased()
+      .reflectable(),
+    new StatusMove(Moves.TICKLE, PokemonType.NORMAL, 100, 20, -1, 0, 3)
+      .attr(StatStageChangeAttr, [ Stat.ATK, Stat.DEF ], -1)
+      .reflectable(),
+    new SelfStatusMove(Moves.COSMIC_POWER, PokemonType.PSYCHIC, -1, 20, -1, 0, 3)
       .attr(StatStageChangeAttr, [ Stat.DEF, Stat.SPDEF ], 1, true),
-    new AttackMove(Moves.WATER_SPOUT, Type.WATER, MoveCategory.SPECIAL, 150, 100, 5, -1, 0, 3)
+    new AttackMove(Moves.WATER_SPOUT, PokemonType.WATER, MoveCategory.SPECIAL, 150, 100, 5, -1, 0, 3)
       .attr(HpPowerAttr)
       .target(MoveTarget.ALL_NEAR_ENEMIES),
-    new AttackMove(Moves.SIGNAL_BEAM, Type.BUG, MoveCategory.SPECIAL, 75, 100, 15, 10, 0, 3)
+    new AttackMove(Moves.SIGNAL_BEAM, PokemonType.BUG, MoveCategory.SPECIAL, 75, 100, 15, 10, 0, 3)
       .attr(ConfuseAttr),
-    new AttackMove(Moves.SHADOW_PUNCH, Type.GHOST, MoveCategory.PHYSICAL, 60, -1, 20, -1, 0, 3)
+    new AttackMove(Moves.SHADOW_PUNCH, PokemonType.GHOST, MoveCategory.PHYSICAL, 60, -1, 20, -1, 0, 3)
       .punchingMove(),
-    new AttackMove(Moves.EXTRASENSORY, Type.PSYCHIC, MoveCategory.SPECIAL, 80, 100, 20, 10, 0, 3)
+    new AttackMove(Moves.EXTRASENSORY, PokemonType.PSYCHIC, MoveCategory.SPECIAL, 80, 100, 20, 10, 0, 3)
       .attr(FlinchAttr),
-    new AttackMove(Moves.SKY_UPPERCUT, Type.FIGHTING, MoveCategory.PHYSICAL, 85, 90, 15, -1, 0, 3)
+    new AttackMove(Moves.SKY_UPPERCUT, PokemonType.FIGHTING, MoveCategory.PHYSICAL, 85, 90, 15, -1, 0, 3)
       .attr(HitsTagAttr, BattlerTagType.FLYING)
       .punchingMove(),
-    new AttackMove(Moves.SAND_TOMB, Type.GROUND, MoveCategory.PHYSICAL, 35, 85, 15, -1, 0, 3)
+    new AttackMove(Moves.SAND_TOMB, PokemonType.GROUND, MoveCategory.PHYSICAL, 35, 85, 15, -1, 0, 3)
       .attr(TrapAttr, BattlerTagType.SAND_TOMB)
       .makesContact(false),
-    new AttackMove(Moves.SHEER_COLD, Type.ICE, MoveCategory.SPECIAL, 200, 20, 5, -1, 0, 3)
+    new AttackMove(Moves.SHEER_COLD, PokemonType.ICE, MoveCategory.SPECIAL, 200, 20, 5, -1, 0, 3)
       .attr(IceNoEffectTypeAttr)
       .attr(OneHitKOAttr)
       .attr(SheerColdAccuracyAttr),
-    new AttackMove(Moves.MUDDY_WATER, Type.WATER, MoveCategory.SPECIAL, 90, 85, 10, 30, 0, 3)
+    new AttackMove(Moves.MUDDY_WATER, PokemonType.WATER, MoveCategory.SPECIAL, 90, 85, 10, 30, 0, 3)
       .attr(StatStageChangeAttr, [ Stat.ACC ], -1)
       .target(MoveTarget.ALL_NEAR_ENEMIES),
-    new AttackMove(Moves.BULLET_SEED, Type.GRASS, MoveCategory.PHYSICAL, 25, 100, 30, -1, 0, 3)
+    new AttackMove(Moves.BULLET_SEED, PokemonType.GRASS, MoveCategory.PHYSICAL, 25, 100, 30, -1, 0, 3)
       .attr(MultiHitAttr)
       .makesContact(false)
       .ballBombMove(),
-    new AttackMove(Moves.AERIAL_ACE, Type.FLYING, MoveCategory.PHYSICAL, 60, -1, 20, -1, 0, 3)
+    new AttackMove(Moves.AERIAL_ACE, PokemonType.FLYING, MoveCategory.PHYSICAL, 60, -1, 20, -1, 0, 3)
       .slicingMove(),
-    new AttackMove(Moves.ICICLE_SPEAR, Type.ICE, MoveCategory.PHYSICAL, 25, 100, 30, -1, 0, 3)
+    new AttackMove(Moves.ICICLE_SPEAR, PokemonType.ICE, MoveCategory.PHYSICAL, 25, 100, 30, -1, 0, 3)
       .attr(MultiHitAttr)
       .makesContact(false),
-    new SelfStatusMove(Moves.IRON_DEFENSE, Type.STEEL, -1, 15, -1, 0, 3)
+    new SelfStatusMove(Moves.IRON_DEFENSE, PokemonType.STEEL, -1, 15, -1, 0, 3)
       .attr(StatStageChangeAttr, [ Stat.DEF ], 2, true),
-    new StatusMove(Moves.BLOCK, Type.NORMAL, -1, 5, -1, 0, 3)
+    new StatusMove(Moves.BLOCK, PokemonType.NORMAL, -1, 5, -1, 0, 3)
       .condition(failIfGhostTypeCondition)
-      .attr(AddBattlerTagAttr, BattlerTagType.TRAPPED, false, true, 1),
-    new StatusMove(Moves.HOWL, Type.NORMAL, -1, 40, -1, 0, 3)
+      .attr(AddBattlerTagAttr, BattlerTagType.TRAPPED, false, true, 1)
+      .reflectable(),
+    new StatusMove(Moves.HOWL, PokemonType.NORMAL, -1, 40, -1, 0, 3)
       .attr(StatStageChangeAttr, [ Stat.ATK ], 1)
       .soundBased()
       .target(MoveTarget.USER_AND_ALLIES),
-    new AttackMove(Moves.DRAGON_CLAW, Type.DRAGON, MoveCategory.PHYSICAL, 80, 100, 15, -1, 0, 3),
-    new AttackMove(Moves.FRENZY_PLANT, Type.GRASS, MoveCategory.SPECIAL, 150, 90, 5, -1, 0, 3)
+    new AttackMove(Moves.DRAGON_CLAW, PokemonType.DRAGON, MoveCategory.PHYSICAL, 80, 100, 15, -1, 0, 3),
+    new AttackMove(Moves.FRENZY_PLANT, PokemonType.GRASS, MoveCategory.SPECIAL, 150, 90, 5, -1, 0, 3)
       .attr(RechargeAttr),
-    new SelfStatusMove(Moves.BULK_UP, Type.FIGHTING, -1, 20, -1, 0, 3)
+    new SelfStatusMove(Moves.BULK_UP, PokemonType.FIGHTING, -1, 20, -1, 0, 3)
       .attr(StatStageChangeAttr, [ Stat.ATK, Stat.DEF ], 1, true),
-    new ChargingAttackMove(Moves.BOUNCE, Type.FLYING, MoveCategory.PHYSICAL, 85, 85, 5, 30, 0, 3)
+    new ChargingAttackMove(Moves.BOUNCE, PokemonType.FLYING, MoveCategory.PHYSICAL, 85, 85, 5, 30, 0, 3)
       .chargeText(i18next.t("moveTriggers:sprangUp", { pokemonName: "{USER}" }))
       .chargeAttr(SemiInvulnerableAttr, BattlerTagType.FLYING)
       .attr(StatusEffectAttr, StatusEffect.PARALYSIS)
       .condition(failOnGravityCondition),
-    new AttackMove(Moves.MUD_SHOT, Type.GROUND, MoveCategory.SPECIAL, 55, 95, 15, 100, 0, 3)
+    new AttackMove(Moves.MUD_SHOT, PokemonType.GROUND, MoveCategory.SPECIAL, 55, 95, 15, 100, 0, 3)
       .attr(StatStageChangeAttr, [ Stat.SPD ], -1),
-    new AttackMove(Moves.POISON_TAIL, Type.POISON, MoveCategory.PHYSICAL, 50, 100, 25, 10, 0, 3)
+    new AttackMove(Moves.POISON_TAIL, PokemonType.POISON, MoveCategory.PHYSICAL, 50, 100, 25, 10, 0, 3)
       .attr(HighCritAttr)
       .attr(StatusEffectAttr, StatusEffect.POISON),
-    new AttackMove(Moves.COVET, Type.NORMAL, MoveCategory.PHYSICAL, 60, 100, 25, -1, 0, 3)
-      .attr(StealHeldItemChanceAttr, 0.3),
-    new AttackMove(Moves.VOLT_TACKLE, Type.ELECTRIC, MoveCategory.PHYSICAL, 120, 100, 15, 10, 0, 3)
+    new AttackMove(Moves.COVET, PokemonType.NORMAL, MoveCategory.PHYSICAL, 60, 100, 25, -1, 0, 3)
+      .attr(StealHeldItemChanceAttr, 0.3)
+      .edgeCase(),
+      // Should not be able to steal held item if user faints due to Rough Skin, Iron Barbs, etc.
+      // Should be able to steal items from pokemon with Sticky Hold if the damage causes them to faint
+    new AttackMove(Moves.VOLT_TACKLE, PokemonType.ELECTRIC, MoveCategory.PHYSICAL, 120, 100, 15, 10, 0, 3)
       .attr(RecoilAttr, false, 0.33)
       .attr(StatusEffectAttr, StatusEffect.PARALYSIS)
       .recklessMove(),
-    new AttackMove(Moves.MAGICAL_LEAF, Type.GRASS, MoveCategory.SPECIAL, 60, -1, 20, -1, 0, 3),
-    new StatusMove(Moves.WATER_SPORT, Type.WATER, -1, 15, -1, 0, 3)
+    new AttackMove(Moves.MAGICAL_LEAF, PokemonType.GRASS, MoveCategory.SPECIAL, 60, -1, 20, -1, 0, 3),
+    new StatusMove(Moves.WATER_SPORT, PokemonType.WATER, -1, 15, -1, 0, 3)
       .ignoresProtect()
       .attr(AddArenaTagAttr, ArenaTagType.WATER_SPORT, 5)
       .target(MoveTarget.BOTH_SIDES),
-    new SelfStatusMove(Moves.CALM_MIND, Type.PSYCHIC, -1, 20, -1, 0, 3)
+    new SelfStatusMove(Moves.CALM_MIND, PokemonType.PSYCHIC, -1, 20, -1, 0, 3)
       .attr(StatStageChangeAttr, [ Stat.SPATK, Stat.SPDEF ], 1, true),
-    new AttackMove(Moves.LEAF_BLADE, Type.GRASS, MoveCategory.PHYSICAL, 90, 100, 15, -1, 0, 3)
+    new AttackMove(Moves.LEAF_BLADE, PokemonType.GRASS, MoveCategory.PHYSICAL, 90, 100, 15, -1, 0, 3)
       .attr(HighCritAttr)
       .slicingMove(),
-    new SelfStatusMove(Moves.DRAGON_DANCE, Type.DRAGON, -1, 20, -1, 0, 3)
+    new SelfStatusMove(Moves.DRAGON_DANCE, PokemonType.DRAGON, -1, 20, -1, 0, 3)
       .attr(StatStageChangeAttr, [ Stat.ATK, Stat.SPD ], 1, true)
       .danceMove(),
-    new AttackMove(Moves.ROCK_BLAST, Type.ROCK, MoveCategory.PHYSICAL, 25, 90, 10, -1, 0, 3)
+    new AttackMove(Moves.ROCK_BLAST, PokemonType.ROCK, MoveCategory.PHYSICAL, 25, 90, 10, -1, 0, 3)
       .attr(MultiHitAttr)
       .makesContact(false)
       .ballBombMove(),
-    new AttackMove(Moves.SHOCK_WAVE, Type.ELECTRIC, MoveCategory.SPECIAL, 60, -1, 20, -1, 0, 3),
-    new AttackMove(Moves.WATER_PULSE, Type.WATER, MoveCategory.SPECIAL, 60, 100, 20, 20, 0, 3)
+    new AttackMove(Moves.SHOCK_WAVE, PokemonType.ELECTRIC, MoveCategory.SPECIAL, 60, -1, 20, -1, 0, 3),
+    new AttackMove(Moves.WATER_PULSE, PokemonType.WATER, MoveCategory.SPECIAL, 60, 100, 20, 20, 0, 3)
       .attr(ConfuseAttr)
       .pulseMove(),
-    new AttackMove(Moves.DOOM_DESIRE, Type.STEEL, MoveCategory.SPECIAL, 140, 100, 5, -1, 0, 3)
+    new AttackMove(Moves.DOOM_DESIRE, PokemonType.STEEL, MoveCategory.SPECIAL, 140, 100, 5, -1, 0, 3)
       .partial() // cannot be used on multiple Pokemon on the same side in a double battle, hits immediately when called by Metronome/etc, should not apply abilities or held items if user is off the field
       .ignoresProtect()
       .attr(DelayedAttackAttr, ArenaTagType.DOOM_DESIRE, ChargeAnim.DOOM_DESIRE_CHARGING, i18next.t("moveTriggers:choseDoomDesireAsDestiny", { pokemonName: "{USER}" })),
-    new AttackMove(Moves.PSYCHO_BOOST, Type.PSYCHIC, MoveCategory.SPECIAL, 140, 90, 5, -1, 0, 3)
+    new AttackMove(Moves.PSYCHO_BOOST, PokemonType.PSYCHIC, MoveCategory.SPECIAL, 140, 90, 5, -1, 0, 3)
       .attr(StatStageChangeAttr, [ Stat.SPATK ], -2, true),
-    new SelfStatusMove(Moves.ROOST, Type.FLYING, -1, 5, -1, 0, 4)
+    new SelfStatusMove(Moves.ROOST, PokemonType.FLYING, -1, 5, -1, 0, 4)
       .attr(HealAttr, 0.5)
       .attr(AddBattlerTagAttr, BattlerTagType.ROOSTED, true, false)
       .triageMove(),
-    new StatusMove(Moves.GRAVITY, Type.PSYCHIC, -1, 5, -1, 0, 4)
+    new StatusMove(Moves.GRAVITY, PokemonType.PSYCHIC, -1, 5, -1, 0, 4)
       .ignoresProtect()
       .attr(AddArenaTagAttr, ArenaTagType.GRAVITY, 5)
       .target(MoveTarget.BOTH_SIDES),
-    new StatusMove(Moves.MIRACLE_EYE, Type.PSYCHIC, -1, 40, -1, 0, 4)
+    new StatusMove(Moves.MIRACLE_EYE, PokemonType.PSYCHIC, -1, 40, -1, 0, 4)
       .attr(ExposedMoveAttr, BattlerTagType.IGNORE_DARK)
-      .ignoresSubstitute(),
-    new AttackMove(Moves.WAKE_UP_SLAP, Type.FIGHTING, MoveCategory.PHYSICAL, 70, 100, 10, -1, 0, 4)
+      .ignoresSubstitute()
+      .reflectable(),
+    new AttackMove(Moves.WAKE_UP_SLAP, PokemonType.FIGHTING, MoveCategory.PHYSICAL, 70, 100, 10, -1, 0, 4)
       .attr(MovePowerMultiplierAttr, (user, target, move) => targetSleptOrComatoseCondition(user, target, move) ? 2 : 1)
       .attr(HealStatusEffectAttr, false, StatusEffect.SLEEP),
-    new AttackMove(Moves.HAMMER_ARM, Type.FIGHTING, MoveCategory.PHYSICAL, 100, 90, 10, -1, 0, 4)
+    new AttackMove(Moves.HAMMER_ARM, PokemonType.FIGHTING, MoveCategory.PHYSICAL, 100, 90, 10, -1, 0, 4)
       .attr(StatStageChangeAttr, [ Stat.SPD ], -1, true)
       .punchingMove(),
-    new AttackMove(Moves.GYRO_BALL, Type.STEEL, MoveCategory.PHYSICAL, -1, 100, 5, -1, 0, 4)
+    new AttackMove(Moves.GYRO_BALL, PokemonType.STEEL, MoveCategory.PHYSICAL, -1, 100, 5, -1, 0, 4)
       .attr(GyroBallPowerAttr)
       .ballBombMove(),
-    new SelfStatusMove(Moves.HEALING_WISH, Type.PSYCHIC, -1, 10, -1, 0, 4)
+    new SelfStatusMove(Moves.HEALING_WISH, PokemonType.PSYCHIC, -1, 10, -1, 0, 4)
       .attr(SacrificialFullRestoreAttr, false, "moveTriggers:sacrificialFullRestore")
-      .triageMove(),
-    new AttackMove(Moves.BRINE, Type.WATER, MoveCategory.SPECIAL, 65, 100, 10, -1, 0, 4)
+      .triageMove()
+      .condition(failIfLastInPartyCondition),
+    new AttackMove(Moves.BRINE, PokemonType.WATER, MoveCategory.SPECIAL, 65, 100, 10, -1, 0, 4)
       .attr(MovePowerMultiplierAttr, (user, target, move) => target.getHpRatio() < 0.5 ? 2 : 1),
-    new AttackMove(Moves.NATURAL_GIFT, Type.NORMAL, MoveCategory.PHYSICAL, -1, 100, 15, -1, 0, 4)
+    new AttackMove(Moves.NATURAL_GIFT, PokemonType.NORMAL, MoveCategory.PHYSICAL, -1, 100, 15, -1, 0, 4)
       .attr(NaturalGiftPowerAttr)
       .attr(NaturalGiftTypeAttr)
+      .attr(NaturalGiftConsumeBerryAttr)
       .condition((user) => {
-        const userBerries = globalScene.findModifiers(m => m instanceof BerryModifier, user.isPlayer());
-        return userBerries.length > 0;
+        return user.getHeldItems().some(i => i instanceof BerryModifier);
       })
       .makesContact(false),
-    new AttackMove(Moves.FEINT, Type.NORMAL, MoveCategory.PHYSICAL, 30, 100, 10, -1, 2, 4)
+    new AttackMove(Moves.FEINT, PokemonType.NORMAL, MoveCategory.PHYSICAL, 30, 100, 10, -1, 2, 4)
       .attr(RemoveBattlerTagAttr, [ BattlerTagType.PROTECTED ])
       .attr(RemoveArenaTagsAttr, [ ArenaTagType.QUICK_GUARD, ArenaTagType.WIDE_GUARD, ArenaTagType.MAT_BLOCK, ArenaTagType.CRAFTY_SHIELD ], false)
       .makesContact(false)
       .ignoresProtect(),
-    new AttackMove(Moves.PLUCK, Type.FLYING, MoveCategory.PHYSICAL, 60, 100, 20, -1, 0, 4)
+    new AttackMove(Moves.PLUCK, PokemonType.FLYING, MoveCategory.PHYSICAL, 60, 100, 20, -1, 0, 4)
       .attr(StealEatBerryAttr),
-    new StatusMove(Moves.TAILWIND, Type.FLYING, -1, 15, -1, 0, 4)
+    new StatusMove(Moves.TAILWIND, PokemonType.FLYING, -1, 15, -1, 0, 4)
       .windMove()
       .attr(AddArenaTagAttr, ArenaTagType.TAILWIND, 4, true)
       .target(MoveTarget.USER_SIDE),
-    new StatusMove(Moves.ACUPRESSURE, Type.NORMAL, -1, 30, -1, 0, 4)
+    new StatusMove(Moves.ACUPRESSURE, PokemonType.NORMAL, -1, 30, -1, 0, 4)
       .attr(AcupressureStatStageChangeAttr)
       .target(MoveTarget.USER_OR_NEAR_ALLY),
-    new AttackMove(Moves.METAL_BURST, Type.STEEL, MoveCategory.PHYSICAL, -1, 100, 10, -1, 0, 4)
+    new AttackMove(Moves.METAL_BURST, PokemonType.STEEL, MoveCategory.PHYSICAL, -1, 100, 10, -1, 0, 4)
       .attr(CounterDamageAttr, (move: Move) => (move.category === MoveCategory.PHYSICAL || move.category === MoveCategory.SPECIAL), 1.5)
       .redirectCounter()
       .makesContact(false)
       .target(MoveTarget.ATTACKER),
-    new AttackMove(Moves.U_TURN, Type.BUG, MoveCategory.PHYSICAL, 70, 100, 20, -1, 0, 4)
+    new AttackMove(Moves.U_TURN, PokemonType.BUG, MoveCategory.PHYSICAL, 70, 100, 20, -1, 0, 4)
       .attr(ForceSwitchOutAttr, true),
-    new AttackMove(Moves.CLOSE_COMBAT, Type.FIGHTING, MoveCategory.PHYSICAL, 120, 100, 5, -1, 0, 4)
+    new AttackMove(Moves.CLOSE_COMBAT, PokemonType.FIGHTING, MoveCategory.PHYSICAL, 120, 100, 5, -1, 0, 4)
       .attr(StatStageChangeAttr, [ Stat.DEF, Stat.SPDEF ], -1, true),
-    new AttackMove(Moves.PAYBACK, Type.DARK, MoveCategory.PHYSICAL, 50, 100, 10, -1, 0, 4)
+    new AttackMove(Moves.PAYBACK, PokemonType.DARK, MoveCategory.PHYSICAL, 50, 100, 10, -1, 0, 4)
       .attr(MovePowerMultiplierAttr, (user, target, move) => target.getLastXMoves(1).find(m => m.turn === globalScene.currentBattle.turn) || globalScene.currentBattle.turnCommands[target.getBattlerIndex()]?.command === Command.BALL ? 2 : 1),
-    new AttackMove(Moves.ASSURANCE, Type.DARK, MoveCategory.PHYSICAL, 60, 100, 10, -1, 0, 4)
+    new AttackMove(Moves.ASSURANCE, PokemonType.DARK, MoveCategory.PHYSICAL, 60, 100, 10, -1, 0, 4)
       .attr(MovePowerMultiplierAttr, (user, target, move) => target.turnData.damageTaken > 0 ? 2 : 1),
-    new StatusMove(Moves.EMBARGO, Type.DARK, 100, 15, -1, 0, 4)
+    new StatusMove(Moves.EMBARGO, PokemonType.DARK, 100, 15, -1, 0, 4)
+      .reflectable()
       .unimplemented(),
-    new AttackMove(Moves.FLING, Type.DARK, MoveCategory.PHYSICAL, -1, 100, 10, -1, 0, 4)
+    new AttackMove(Moves.FLING, PokemonType.DARK, MoveCategory.PHYSICAL, -1, 100, 10, -1, 0, 4)
       .makesContact(false)
       .unimplemented(),
-    new StatusMove(Moves.PSYCHO_SHIFT, Type.PSYCHIC, 100, 10, -1, 0, 4)
+    new StatusMove(Moves.PSYCHO_SHIFT, PokemonType.PSYCHIC, 100, 10, -1, 0, 4)
       .attr(PsychoShiftEffectAttr)
       .condition((user, target, move) => {
         let statusToApply = user.hasAbility(Abilities.COMATOSE) ? StatusEffect.SLEEP : undefined;
@@ -9502,397 +9593,421 @@ export function initMoves() {
         return !!statusToApply && target.canSetStatus(statusToApply, false, false, user);
       }
       ),
-    new AttackMove(Moves.TRUMP_CARD, Type.NORMAL, MoveCategory.SPECIAL, -1, -1, 5, -1, 0, 4)
+    new AttackMove(Moves.TRUMP_CARD, PokemonType.NORMAL, MoveCategory.SPECIAL, -1, -1, 5, -1, 0, 4)
       .makesContact()
       .attr(LessPPMorePowerAttr),
-    new StatusMove(Moves.HEAL_BLOCK, Type.PSYCHIC, 100, 15, -1, 0, 4)
+    new StatusMove(Moves.HEAL_BLOCK, PokemonType.PSYCHIC, 100, 15, -1, 0, 4)
       .attr(AddBattlerTagAttr, BattlerTagType.HEAL_BLOCK, false, true, 5)
-      .target(MoveTarget.ALL_NEAR_ENEMIES),
-    new AttackMove(Moves.WRING_OUT, Type.NORMAL, MoveCategory.SPECIAL, -1, 100, 5, -1, 0, 4)
+      .target(MoveTarget.ALL_NEAR_ENEMIES)
+      .reflectable(),
+    new AttackMove(Moves.WRING_OUT, PokemonType.NORMAL, MoveCategory.SPECIAL, -1, 100, 5, -1, 0, 4)
       .attr(OpponentHighHpPowerAttr, 120)
       .makesContact(),
-    new SelfStatusMove(Moves.POWER_TRICK, Type.PSYCHIC, -1, 10, -1, 0, 4)
+    new SelfStatusMove(Moves.POWER_TRICK, PokemonType.PSYCHIC, -1, 10, -1, 0, 4)
       .attr(AddBattlerTagAttr, BattlerTagType.POWER_TRICK, true),
-    new StatusMove(Moves.GASTRO_ACID, Type.POISON, 100, 10, -1, 0, 4)
-      .attr(SuppressAbilitiesAttr),
-    new StatusMove(Moves.LUCKY_CHANT, Type.NORMAL, -1, 30, -1, 0, 4)
+    new StatusMove(Moves.GASTRO_ACID, PokemonType.POISON, 100, 10, -1, 0, 4)
+      .attr(SuppressAbilitiesAttr)
+      .reflectable(),
+    new StatusMove(Moves.LUCKY_CHANT, PokemonType.NORMAL, -1, 30, -1, 0, 4)
       .attr(AddArenaTagAttr, ArenaTagType.NO_CRIT, 5, true, true)
       .target(MoveTarget.USER_SIDE),
-    new StatusMove(Moves.ME_FIRST, Type.NORMAL, -1, 20, -1, 0, 4)
+    new StatusMove(Moves.ME_FIRST, PokemonType.NORMAL, -1, 20, -1, 0, 4)
       .ignoresSubstitute()
       .target(MoveTarget.NEAR_ENEMY)
       .unimplemented(),
-    new SelfStatusMove(Moves.COPYCAT, Type.NORMAL, -1, 20, -1, 0, 4)
+    new SelfStatusMove(Moves.COPYCAT, PokemonType.NORMAL, -1, 20, -1, 0, 4)
       .attr(CopyMoveAttr, false, invalidCopycatMoves),
-    new StatusMove(Moves.POWER_SWAP, Type.PSYCHIC, -1, 10, 100, 0, 4)
+    new StatusMove(Moves.POWER_SWAP, PokemonType.PSYCHIC, -1, 10, 100, 0, 4)
       .attr(SwapStatStagesAttr, [ Stat.ATK, Stat.SPATK ])
       .ignoresSubstitute(),
-    new StatusMove(Moves.GUARD_SWAP, Type.PSYCHIC, -1, 10, 100, 0, 4)
+    new StatusMove(Moves.GUARD_SWAP, PokemonType.PSYCHIC, -1, 10, 100, 0, 4)
       .attr(SwapStatStagesAttr, [ Stat.DEF, Stat.SPDEF ])
       .ignoresSubstitute(),
-    new AttackMove(Moves.PUNISHMENT, Type.DARK, MoveCategory.PHYSICAL, -1, 100, 5, -1, 0, 4)
+    new AttackMove(Moves.PUNISHMENT, PokemonType.DARK, MoveCategory.PHYSICAL, -1, 100, 5, -1, 0, 4)
       .makesContact(true)
       .attr(PunishmentPowerAttr),
-    new AttackMove(Moves.LAST_RESORT, Type.NORMAL, MoveCategory.PHYSICAL, 140, 100, 5, -1, 0, 4)
-      .attr(LastResortAttr),
-    new StatusMove(Moves.WORRY_SEED, Type.GRASS, 100, 10, -1, 0, 4)
-      .attr(AbilityChangeAttr, Abilities.INSOMNIA),
-    new AttackMove(Moves.SUCKER_PUNCH, Type.DARK, MoveCategory.PHYSICAL, 70, 100, 5, -1, 1, 4)
-      .condition((user, target, move) => globalScene.currentBattle.turnCommands[target.getBattlerIndex()]?.command === Command.FIGHT && !target.turnData.acted && allMoves[globalScene.currentBattle.turnCommands[target.getBattlerIndex()]?.move?.move!].category !== MoveCategory.STATUS), // TODO: is this bang correct?
-    new StatusMove(Moves.TOXIC_SPIKES, Type.POISON, -1, 20, -1, 0, 4)
+    new AttackMove(Moves.LAST_RESORT, PokemonType.NORMAL, MoveCategory.PHYSICAL, 140, 100, 5, -1, 0, 4)
+      .attr(LastResortAttr)
+      .edgeCase(), // May or may not need to ignore remotely called moves depending on how it works
+    new StatusMove(Moves.WORRY_SEED, PokemonType.GRASS, 100, 10, -1, 0, 4)
+      .attr(AbilityChangeAttr, Abilities.INSOMNIA)
+      .reflectable(),
+    new AttackMove(Moves.SUCKER_PUNCH, PokemonType.DARK, MoveCategory.PHYSICAL, 70, 100, 5, -1, 1, 4)
+      .condition((user, target, move) => {
+        const turnCommand = globalScene.currentBattle.turnCommands[target.getBattlerIndex()];
+        if (!turnCommand || !turnCommand.move) {
+          return false;
+        }
+        return (turnCommand.command === Command.FIGHT && !target.turnData.acted && allMoves[turnCommand.move.move].category !== MoveCategory.STATUS);
+      }),
+    new StatusMove(Moves.TOXIC_SPIKES, PokemonType.POISON, -1, 20, -1, 0, 4)
       .attr(AddArenaTrapTagAttr, ArenaTagType.TOXIC_SPIKES)
-      .target(MoveTarget.ENEMY_SIDE),
-    new StatusMove(Moves.HEART_SWAP, Type.PSYCHIC, -1, 10, -1, 0, 4)
+      .target(MoveTarget.ENEMY_SIDE)
+      .reflectable(),
+    new StatusMove(Moves.HEART_SWAP, PokemonType.PSYCHIC, -1, 10, -1, 0, 4)
       .attr(SwapStatStagesAttr, BATTLE_STATS)
       .ignoresSubstitute(),
-    new SelfStatusMove(Moves.AQUA_RING, Type.WATER, -1, 20, -1, 0, 4)
+    new SelfStatusMove(Moves.AQUA_RING, PokemonType.WATER, -1, 20, -1, 0, 4)
       .attr(AddBattlerTagAttr, BattlerTagType.AQUA_RING, true, true),
-    new SelfStatusMove(Moves.MAGNET_RISE, Type.ELECTRIC, -1, 10, -1, 0, 4)
+    new SelfStatusMove(Moves.MAGNET_RISE, PokemonType.ELECTRIC, -1, 10, -1, 0, 4)
       .attr(AddBattlerTagAttr, BattlerTagType.FLOATING, true, true, 5)
       .condition((user, target, move) => !globalScene.arena.getTag(ArenaTagType.GRAVITY) && [ BattlerTagType.FLOATING, BattlerTagType.IGNORE_FLYING, BattlerTagType.INGRAIN ].every((tag) => !user.getTag(tag))),
-    new AttackMove(Moves.FLARE_BLITZ, Type.FIRE, MoveCategory.PHYSICAL, 120, 100, 15, 10, 0, 4)
+    new AttackMove(Moves.FLARE_BLITZ, PokemonType.FIRE, MoveCategory.PHYSICAL, 120, 100, 15, 10, 0, 4)
       .attr(RecoilAttr, false, 0.33)
       .attr(HealStatusEffectAttr, true, StatusEffect.FREEZE)
       .attr(StatusEffectAttr, StatusEffect.BURN)
       .recklessMove(),
-    new AttackMove(Moves.FORCE_PALM, Type.FIGHTING, MoveCategory.PHYSICAL, 60, 100, 10, 30, 0, 4)
+    new AttackMove(Moves.FORCE_PALM, PokemonType.FIGHTING, MoveCategory.PHYSICAL, 60, 100, 10, 30, 0, 4)
       .attr(StatusEffectAttr, StatusEffect.PARALYSIS),
-    new AttackMove(Moves.AURA_SPHERE, Type.FIGHTING, MoveCategory.SPECIAL, 80, -1, 20, -1, 0, 4)
+    new AttackMove(Moves.AURA_SPHERE, PokemonType.FIGHTING, MoveCategory.SPECIAL, 80, -1, 20, -1, 0, 4)
       .pulseMove()
       .ballBombMove(),
-    new SelfStatusMove(Moves.ROCK_POLISH, Type.ROCK, -1, 20, -1, 0, 4)
+    new SelfStatusMove(Moves.ROCK_POLISH, PokemonType.ROCK, -1, 20, -1, 0, 4)
       .attr(StatStageChangeAttr, [ Stat.SPD ], 2, true),
-    new AttackMove(Moves.POISON_JAB, Type.POISON, MoveCategory.PHYSICAL, 80, 100, 20, 30, 0, 4)
+    new AttackMove(Moves.POISON_JAB, PokemonType.POISON, MoveCategory.PHYSICAL, 80, 100, 20, 30, 0, 4)
       .attr(StatusEffectAttr, StatusEffect.POISON),
-    new AttackMove(Moves.DARK_PULSE, Type.DARK, MoveCategory.SPECIAL, 80, 100, 15, 20, 0, 4)
+    new AttackMove(Moves.DARK_PULSE, PokemonType.DARK, MoveCategory.SPECIAL, 80, 100, 15, 20, 0, 4)
       .attr(FlinchAttr)
       .pulseMove(),
-    new AttackMove(Moves.NIGHT_SLASH, Type.DARK, MoveCategory.PHYSICAL, 70, 100, 15, -1, 0, 4)
+    new AttackMove(Moves.NIGHT_SLASH, PokemonType.DARK, MoveCategory.PHYSICAL, 70, 100, 15, -1, 0, 4)
       .attr(HighCritAttr)
       .slicingMove(),
-    new AttackMove(Moves.AQUA_TAIL, Type.WATER, MoveCategory.PHYSICAL, 90, 90, 10, -1, 0, 4),
-    new AttackMove(Moves.SEED_BOMB, Type.GRASS, MoveCategory.PHYSICAL, 80, 100, 15, -1, 0, 4)
+    new AttackMove(Moves.AQUA_TAIL, PokemonType.WATER, MoveCategory.PHYSICAL, 90, 90, 10, -1, 0, 4),
+    new AttackMove(Moves.SEED_BOMB, PokemonType.GRASS, MoveCategory.PHYSICAL, 80, 100, 15, -1, 0, 4)
       .makesContact(false)
       .ballBombMove(),
-    new AttackMove(Moves.AIR_SLASH, Type.FLYING, MoveCategory.SPECIAL, 75, 95, 15, 30, 0, 4)
+    new AttackMove(Moves.AIR_SLASH, PokemonType.FLYING, MoveCategory.SPECIAL, 75, 95, 15, 30, 0, 4)
       .attr(FlinchAttr)
       .slicingMove(),
-    new AttackMove(Moves.X_SCISSOR, Type.BUG, MoveCategory.PHYSICAL, 80, 100, 15, -1, 0, 4)
+    new AttackMove(Moves.X_SCISSOR, PokemonType.BUG, MoveCategory.PHYSICAL, 80, 100, 15, -1, 0, 4)
       .slicingMove(),
-    new AttackMove(Moves.BUG_BUZZ, Type.BUG, MoveCategory.SPECIAL, 90, 100, 10, 10, 0, 4)
+    new AttackMove(Moves.BUG_BUZZ, PokemonType.BUG, MoveCategory.SPECIAL, 90, 100, 10, 10, 0, 4)
       .attr(StatStageChangeAttr, [ Stat.SPDEF ], -1)
       .soundBased(),
-    new AttackMove(Moves.DRAGON_PULSE, Type.DRAGON, MoveCategory.SPECIAL, 85, 100, 10, -1, 0, 4)
+    new AttackMove(Moves.DRAGON_PULSE, PokemonType.DRAGON, MoveCategory.SPECIAL, 85, 100, 10, -1, 0, 4)
       .pulseMove(),
-    new AttackMove(Moves.DRAGON_RUSH, Type.DRAGON, MoveCategory.PHYSICAL, 100, 75, 10, 20, 0, 4)
+    new AttackMove(Moves.DRAGON_RUSH, PokemonType.DRAGON, MoveCategory.PHYSICAL, 100, 75, 10, 20, 0, 4)
       .attr(AlwaysHitMinimizeAttr)
       .attr(HitsTagForDoubleDamageAttr, BattlerTagType.MINIMIZED)
       .attr(FlinchAttr),
-    new AttackMove(Moves.POWER_GEM, Type.ROCK, MoveCategory.SPECIAL, 80, 100, 20, -1, 0, 4),
-    new AttackMove(Moves.DRAIN_PUNCH, Type.FIGHTING, MoveCategory.PHYSICAL, 75, 100, 10, -1, 0, 4)
+    new AttackMove(Moves.POWER_GEM, PokemonType.ROCK, MoveCategory.SPECIAL, 80, 100, 20, -1, 0, 4),
+    new AttackMove(Moves.DRAIN_PUNCH, PokemonType.FIGHTING, MoveCategory.PHYSICAL, 75, 100, 10, -1, 0, 4)
       .attr(HitHealAttr)
       .punchingMove()
       .triageMove(),
-    new AttackMove(Moves.VACUUM_WAVE, Type.FIGHTING, MoveCategory.SPECIAL, 40, 100, 30, -1, 1, 4),
-    new AttackMove(Moves.FOCUS_BLAST, Type.FIGHTING, MoveCategory.SPECIAL, 120, 70, 5, 10, 0, 4)
+    new AttackMove(Moves.VACUUM_WAVE, PokemonType.FIGHTING, MoveCategory.SPECIAL, 40, 100, 30, -1, 1, 4),
+    new AttackMove(Moves.FOCUS_BLAST, PokemonType.FIGHTING, MoveCategory.SPECIAL, 120, 70, 5, 10, 0, 4)
       .attr(StatStageChangeAttr, [ Stat.SPDEF ], -1)
       .ballBombMove(),
-    new AttackMove(Moves.ENERGY_BALL, Type.GRASS, MoveCategory.SPECIAL, 90, 100, 10, 10, 0, 4)
+    new AttackMove(Moves.ENERGY_BALL, PokemonType.GRASS, MoveCategory.SPECIAL, 90, 100, 10, 10, 0, 4)
       .attr(StatStageChangeAttr, [ Stat.SPDEF ], -1)
       .ballBombMove(),
-    new AttackMove(Moves.BRAVE_BIRD, Type.FLYING, MoveCategory.PHYSICAL, 120, 100, 15, -1, 0, 4)
+    new AttackMove(Moves.BRAVE_BIRD, PokemonType.FLYING, MoveCategory.PHYSICAL, 120, 100, 15, -1, 0, 4)
       .attr(RecoilAttr, false, 0.33)
       .recklessMove(),
-    new AttackMove(Moves.EARTH_POWER, Type.GROUND, MoveCategory.SPECIAL, 90, 100, 10, 10, 0, 4)
+    new AttackMove(Moves.EARTH_POWER, PokemonType.GROUND, MoveCategory.SPECIAL, 90, 100, 10, 10, 0, 4)
       .attr(StatStageChangeAttr, [ Stat.SPDEF ], -1),
-    new StatusMove(Moves.SWITCHEROO, Type.DARK, 100, 10, -1, 0, 4)
+    new StatusMove(Moves.SWITCHEROO, PokemonType.DARK, 100, 10, -1, 0, 4)
       .unimplemented(),
-    new AttackMove(Moves.GIGA_IMPACT, Type.NORMAL, MoveCategory.PHYSICAL, 150, 90, 5, -1, 0, 4)
+    new AttackMove(Moves.GIGA_IMPACT, PokemonType.NORMAL, MoveCategory.PHYSICAL, 150, 90, 5, -1, 0, 4)
       .attr(RechargeAttr),
-    new SelfStatusMove(Moves.NASTY_PLOT, Type.DARK, -1, 20, -1, 0, 4)
+    new SelfStatusMove(Moves.NASTY_PLOT, PokemonType.DARK, -1, 20, -1, 0, 4)
       .attr(StatStageChangeAttr, [ Stat.SPATK ], 2, true),
-    new AttackMove(Moves.BULLET_PUNCH, Type.STEEL, MoveCategory.PHYSICAL, 40, 100, 30, -1, 1, 4)
+    new AttackMove(Moves.BULLET_PUNCH, PokemonType.STEEL, MoveCategory.PHYSICAL, 40, 100, 30, -1, 1, 4)
       .punchingMove(),
-    new AttackMove(Moves.AVALANCHE, Type.ICE, MoveCategory.PHYSICAL, 60, 100, 10, -1, -4, 4)
+    new AttackMove(Moves.AVALANCHE, PokemonType.ICE, MoveCategory.PHYSICAL, 60, 100, 10, -1, -4, 4)
       .attr(TurnDamagedDoublePowerAttr),
-    new AttackMove(Moves.ICE_SHARD, Type.ICE, MoveCategory.PHYSICAL, 40, 100, 30, -1, 1, 4)
+    new AttackMove(Moves.ICE_SHARD, PokemonType.ICE, MoveCategory.PHYSICAL, 40, 100, 30, -1, 1, 4)
       .makesContact(false),
-    new AttackMove(Moves.SHADOW_CLAW, Type.GHOST, MoveCategory.PHYSICAL, 70, 100, 15, -1, 0, 4)
+    new AttackMove(Moves.SHADOW_CLAW, PokemonType.GHOST, MoveCategory.PHYSICAL, 70, 100, 15, -1, 0, 4)
       .attr(HighCritAttr),
-    new AttackMove(Moves.THUNDER_FANG, Type.ELECTRIC, MoveCategory.PHYSICAL, 65, 95, 15, 10, 0, 4)
+    new AttackMove(Moves.THUNDER_FANG, PokemonType.ELECTRIC, MoveCategory.PHYSICAL, 65, 95, 15, 10, 0, 4)
       .attr(FlinchAttr)
       .attr(StatusEffectAttr, StatusEffect.PARALYSIS)
       .bitingMove(),
-    new AttackMove(Moves.ICE_FANG, Type.ICE, MoveCategory.PHYSICAL, 65, 95, 15, 10, 0, 4)
+    new AttackMove(Moves.ICE_FANG, PokemonType.ICE, MoveCategory.PHYSICAL, 65, 95, 15, 10, 0, 4)
       .attr(FlinchAttr)
       .attr(StatusEffectAttr, StatusEffect.FREEZE)
       .bitingMove(),
-    new AttackMove(Moves.FIRE_FANG, Type.FIRE, MoveCategory.PHYSICAL, 65, 95, 15, 10, 0, 4)
+    new AttackMove(Moves.FIRE_FANG, PokemonType.FIRE, MoveCategory.PHYSICAL, 65, 95, 15, 10, 0, 4)
       .attr(FlinchAttr)
       .attr(StatusEffectAttr, StatusEffect.BURN)
       .bitingMove(),
-    new AttackMove(Moves.SHADOW_SNEAK, Type.GHOST, MoveCategory.PHYSICAL, 40, 100, 30, -1, 1, 4),
-    new AttackMove(Moves.MUD_BOMB, Type.GROUND, MoveCategory.SPECIAL, 65, 85, 10, 30, 0, 4)
+    new AttackMove(Moves.SHADOW_SNEAK, PokemonType.GHOST, MoveCategory.PHYSICAL, 40, 100, 30, -1, 1, 4),
+    new AttackMove(Moves.MUD_BOMB, PokemonType.GROUND, MoveCategory.SPECIAL, 65, 85, 10, 30, 0, 4)
       .attr(StatStageChangeAttr, [ Stat.ACC ], -1)
       .ballBombMove(),
-    new AttackMove(Moves.PSYCHO_CUT, Type.PSYCHIC, MoveCategory.PHYSICAL, 70, 100, 20, -1, 0, 4)
+    new AttackMove(Moves.PSYCHO_CUT, PokemonType.PSYCHIC, MoveCategory.PHYSICAL, 70, 100, 20, -1, 0, 4)
       .attr(HighCritAttr)
       .slicingMove()
       .makesContact(false),
-    new AttackMove(Moves.ZEN_HEADBUTT, Type.PSYCHIC, MoveCategory.PHYSICAL, 80, 90, 15, 20, 0, 4)
+    new AttackMove(Moves.ZEN_HEADBUTT, PokemonType.PSYCHIC, MoveCategory.PHYSICAL, 80, 90, 15, 20, 0, 4)
       .attr(FlinchAttr),
-    new AttackMove(Moves.MIRROR_SHOT, Type.STEEL, MoveCategory.SPECIAL, 65, 85, 10, 30, 0, 4)
+    new AttackMove(Moves.MIRROR_SHOT, PokemonType.STEEL, MoveCategory.SPECIAL, 65, 85, 10, 30, 0, 4)
       .attr(StatStageChangeAttr, [ Stat.ACC ], -1),
-    new AttackMove(Moves.FLASH_CANNON, Type.STEEL, MoveCategory.SPECIAL, 80, 100, 10, 10, 0, 4)
+    new AttackMove(Moves.FLASH_CANNON, PokemonType.STEEL, MoveCategory.SPECIAL, 80, 100, 10, 10, 0, 4)
       .attr(StatStageChangeAttr, [ Stat.SPDEF ], -1),
-    new AttackMove(Moves.ROCK_CLIMB, Type.NORMAL, MoveCategory.PHYSICAL, 90, 85, 20, 20, 0, 4)
+    new AttackMove(Moves.ROCK_CLIMB, PokemonType.NORMAL, MoveCategory.PHYSICAL, 90, 85, 20, 20, 0, 4)
       .attr(ConfuseAttr),
-    new StatusMove(Moves.DEFOG, Type.FLYING, -1, 15, -1, 0, 4)
+    new StatusMove(Moves.DEFOG, PokemonType.FLYING, -1, 15, -1, 0, 4)
       .attr(StatStageChangeAttr, [ Stat.EVA ], -1)
       .attr(ClearWeatherAttr, WeatherType.FOG)
       .attr(ClearTerrainAttr)
       .attr(RemoveScreensAttr, false)
       .attr(RemoveArenaTrapAttr, true)
-      .attr(RemoveArenaTagsAttr, [ ArenaTagType.MIST, ArenaTagType.SAFEGUARD ], false),
-    new StatusMove(Moves.TRICK_ROOM, Type.PSYCHIC, -1, 5, -1, -7, 4)
+      .attr(RemoveArenaTagsAttr, [ ArenaTagType.MIST, ArenaTagType.SAFEGUARD ], false)
+      .reflectable(),
+    new StatusMove(Moves.TRICK_ROOM, PokemonType.PSYCHIC, -1, 5, -1, -7, 4)
       .attr(AddArenaTagAttr, ArenaTagType.TRICK_ROOM, 5)
       .ignoresProtect()
       .target(MoveTarget.BOTH_SIDES),
-    new AttackMove(Moves.DRACO_METEOR, Type.DRAGON, MoveCategory.SPECIAL, 130, 90, 5, -1, 0, 4)
+    new AttackMove(Moves.DRACO_METEOR, PokemonType.DRAGON, MoveCategory.SPECIAL, 130, 90, 5, -1, 0, 4)
       .attr(StatStageChangeAttr, [ Stat.SPATK ], -2, true),
-    new AttackMove(Moves.DISCHARGE, Type.ELECTRIC, MoveCategory.SPECIAL, 80, 100, 15, 30, 0, 4)
+    new AttackMove(Moves.DISCHARGE, PokemonType.ELECTRIC, MoveCategory.SPECIAL, 80, 100, 15, 30, 0, 4)
       .attr(StatusEffectAttr, StatusEffect.PARALYSIS)
       .target(MoveTarget.ALL_NEAR_OTHERS),
-    new AttackMove(Moves.LAVA_PLUME, Type.FIRE, MoveCategory.SPECIAL, 80, 100, 15, 30, 0, 4)
+    new AttackMove(Moves.LAVA_PLUME, PokemonType.FIRE, MoveCategory.SPECIAL, 80, 100, 15, 30, 0, 4)
       .attr(StatusEffectAttr, StatusEffect.BURN)
       .target(MoveTarget.ALL_NEAR_OTHERS),
-    new AttackMove(Moves.LEAF_STORM, Type.GRASS, MoveCategory.SPECIAL, 130, 90, 5, -1, 0, 4)
+    new AttackMove(Moves.LEAF_STORM, PokemonType.GRASS, MoveCategory.SPECIAL, 130, 90, 5, -1, 0, 4)
       .attr(StatStageChangeAttr, [ Stat.SPATK ], -2, true),
-    new AttackMove(Moves.POWER_WHIP, Type.GRASS, MoveCategory.PHYSICAL, 120, 85, 10, -1, 0, 4),
-    new AttackMove(Moves.ROCK_WRECKER, Type.ROCK, MoveCategory.PHYSICAL, 150, 90, 5, -1, 0, 4)
+    new AttackMove(Moves.POWER_WHIP, PokemonType.GRASS, MoveCategory.PHYSICAL, 120, 85, 10, -1, 0, 4),
+    new AttackMove(Moves.ROCK_WRECKER, PokemonType.ROCK, MoveCategory.PHYSICAL, 150, 90, 5, -1, 0, 4)
       .attr(RechargeAttr)
       .makesContact(false)
       .ballBombMove(),
-    new AttackMove(Moves.CROSS_POISON, Type.POISON, MoveCategory.PHYSICAL, 70, 100, 20, 10, 0, 4)
+    new AttackMove(Moves.CROSS_POISON, PokemonType.POISON, MoveCategory.PHYSICAL, 70, 100, 20, 10, 0, 4)
       .attr(HighCritAttr)
       .attr(StatusEffectAttr, StatusEffect.POISON)
       .slicingMove(),
-    new AttackMove(Moves.GUNK_SHOT, Type.POISON, MoveCategory.PHYSICAL, 120, 80, 5, 30, 0, 4)
+    new AttackMove(Moves.GUNK_SHOT, PokemonType.POISON, MoveCategory.PHYSICAL, 120, 80, 5, 30, 0, 4)
       .attr(StatusEffectAttr, StatusEffect.POISON)
       .makesContact(false),
-    new AttackMove(Moves.IRON_HEAD, Type.STEEL, MoveCategory.PHYSICAL, 80, 100, 15, 30, 0, 4)
+    new AttackMove(Moves.IRON_HEAD, PokemonType.STEEL, MoveCategory.PHYSICAL, 80, 100, 15, 30, 0, 4)
       .attr(FlinchAttr),
-    new AttackMove(Moves.MAGNET_BOMB, Type.STEEL, MoveCategory.PHYSICAL, 60, -1, 20, -1, 0, 4)
+    new AttackMove(Moves.MAGNET_BOMB, PokemonType.STEEL, MoveCategory.PHYSICAL, 60, -1, 20, -1, 0, 4)
       .makesContact(false)
       .ballBombMove(),
-    new AttackMove(Moves.STONE_EDGE, Type.ROCK, MoveCategory.PHYSICAL, 100, 80, 5, -1, 0, 4)
+    new AttackMove(Moves.STONE_EDGE, PokemonType.ROCK, MoveCategory.PHYSICAL, 100, 80, 5, -1, 0, 4)
       .attr(HighCritAttr)
       .makesContact(false),
-    new StatusMove(Moves.CAPTIVATE, Type.NORMAL, 100, 20, -1, 0, 4)
+    new StatusMove(Moves.CAPTIVATE, PokemonType.NORMAL, 100, 20, -1, 0, 4)
       .attr(StatStageChangeAttr, [ Stat.SPATK ], -2)
       .condition((user, target, move) => target.isOppositeGender(user))
-      .target(MoveTarget.ALL_NEAR_ENEMIES),
-    new StatusMove(Moves.STEALTH_ROCK, Type.ROCK, -1, 20, -1, 0, 4)
+      .target(MoveTarget.ALL_NEAR_ENEMIES)
+      .reflectable(),
+    new StatusMove(Moves.STEALTH_ROCK, PokemonType.ROCK, -1, 20, -1, 0, 4)
       .attr(AddArenaTrapTagAttr, ArenaTagType.STEALTH_ROCK)
-      .target(MoveTarget.ENEMY_SIDE),
-    new AttackMove(Moves.GRASS_KNOT, Type.GRASS, MoveCategory.SPECIAL, -1, 100, 20, -1, 0, 4)
+      .target(MoveTarget.ENEMY_SIDE)
+      .reflectable(),
+    new AttackMove(Moves.GRASS_KNOT, PokemonType.GRASS, MoveCategory.SPECIAL, -1, 100, 20, -1, 0, 4)
       .attr(WeightPowerAttr)
       .makesContact(),
-    new AttackMove(Moves.CHATTER, Type.FLYING, MoveCategory.SPECIAL, 65, 100, 20, 100, 0, 4)
+    new AttackMove(Moves.CHATTER, PokemonType.FLYING, MoveCategory.SPECIAL, 65, 100, 20, 100, 0, 4)
       .attr(ConfuseAttr)
       .soundBased(),
-    new AttackMove(Moves.JUDGMENT, Type.NORMAL, MoveCategory.SPECIAL, 100, 100, 10, -1, 0, 4)
+    new AttackMove(Moves.JUDGMENT, PokemonType.NORMAL, MoveCategory.SPECIAL, 100, 100, 10, -1, 0, 4)
       .attr(FormChangeItemTypeAttr),
-    new AttackMove(Moves.BUG_BITE, Type.BUG, MoveCategory.PHYSICAL, 60, 100, 20, -1, 0, 4)
+    new AttackMove(Moves.BUG_BITE, PokemonType.BUG, MoveCategory.PHYSICAL, 60, 100, 20, -1, 0, 4)
       .attr(StealEatBerryAttr),
-    new AttackMove(Moves.CHARGE_BEAM, Type.ELECTRIC, MoveCategory.SPECIAL, 50, 90, 10, 70, 0, 4)
+    new AttackMove(Moves.CHARGE_BEAM, PokemonType.ELECTRIC, MoveCategory.SPECIAL, 50, 90, 10, 70, 0, 4)
       .attr(StatStageChangeAttr, [ Stat.SPATK ], 1, true),
-    new AttackMove(Moves.WOOD_HAMMER, Type.GRASS, MoveCategory.PHYSICAL, 120, 100, 15, -1, 0, 4)
+    new AttackMove(Moves.WOOD_HAMMER, PokemonType.GRASS, MoveCategory.PHYSICAL, 120, 100, 15, -1, 0, 4)
       .attr(RecoilAttr, false, 0.33)
       .recklessMove(),
-    new AttackMove(Moves.AQUA_JET, Type.WATER, MoveCategory.PHYSICAL, 40, 100, 20, -1, 1, 4),
-    new AttackMove(Moves.ATTACK_ORDER, Type.BUG, MoveCategory.PHYSICAL, 90, 100, 15, -1, 0, 4)
+    new AttackMove(Moves.AQUA_JET, PokemonType.WATER, MoveCategory.PHYSICAL, 40, 100, 20, -1, 1, 4),
+    new AttackMove(Moves.ATTACK_ORDER, PokemonType.BUG, MoveCategory.PHYSICAL, 90, 100, 15, -1, 0, 4)
       .attr(HighCritAttr)
       .makesContact(false),
-    new SelfStatusMove(Moves.DEFEND_ORDER, Type.BUG, -1, 10, -1, 0, 4)
+    new SelfStatusMove(Moves.DEFEND_ORDER, PokemonType.BUG, -1, 10, -1, 0, 4)
       .attr(StatStageChangeAttr, [ Stat.DEF, Stat.SPDEF ], 1, true),
-    new SelfStatusMove(Moves.HEAL_ORDER, Type.BUG, -1, 5, -1, 0, 4)
+    new SelfStatusMove(Moves.HEAL_ORDER, PokemonType.BUG, -1, 5, -1, 0, 4)
       .attr(HealAttr, 0.5)
       .triageMove(),
-    new AttackMove(Moves.HEAD_SMASH, Type.ROCK, MoveCategory.PHYSICAL, 150, 80, 5, -1, 0, 4)
+    new AttackMove(Moves.HEAD_SMASH, PokemonType.ROCK, MoveCategory.PHYSICAL, 150, 80, 5, -1, 0, 4)
       .attr(RecoilAttr, false, 0.5)
       .recklessMove(),
-    new AttackMove(Moves.DOUBLE_HIT, Type.NORMAL, MoveCategory.PHYSICAL, 35, 90, 10, -1, 0, 4)
+    new AttackMove(Moves.DOUBLE_HIT, PokemonType.NORMAL, MoveCategory.PHYSICAL, 35, 90, 10, -1, 0, 4)
       .attr(MultiHitAttr, MultiHitType._2),
-    new AttackMove(Moves.ROAR_OF_TIME, Type.DRAGON, MoveCategory.SPECIAL, 150, 90, 5, -1, 0, 4)
+    new AttackMove(Moves.ROAR_OF_TIME, PokemonType.DRAGON, MoveCategory.SPECIAL, 150, 90, 5, -1, 0, 4)
       .attr(RechargeAttr),
-    new AttackMove(Moves.SPACIAL_REND, Type.DRAGON, MoveCategory.SPECIAL, 100, 95, 5, -1, 0, 4)
+    new AttackMove(Moves.SPACIAL_REND, PokemonType.DRAGON, MoveCategory.SPECIAL, 100, 95, 5, -1, 0, 4)
       .attr(HighCritAttr),
-    new SelfStatusMove(Moves.LUNAR_DANCE, Type.PSYCHIC, -1, 10, -1, 0, 4)
+    new SelfStatusMove(Moves.LUNAR_DANCE, PokemonType.PSYCHIC, -1, 10, -1, 0, 4)
       .attr(SacrificialFullRestoreAttr, true, "moveTriggers:lunarDanceRestore")
       .danceMove()
-      .triageMove(),
-    new AttackMove(Moves.CRUSH_GRIP, Type.NORMAL, MoveCategory.PHYSICAL, -1, 100, 5, -1, 0, 4)
+      .triageMove()
+      .condition(failIfLastInPartyCondition),
+    new AttackMove(Moves.CRUSH_GRIP, PokemonType.NORMAL, MoveCategory.PHYSICAL, -1, 100, 5, -1, 0, 4)
       .attr(OpponentHighHpPowerAttr, 120),
-    new AttackMove(Moves.MAGMA_STORM, Type.FIRE, MoveCategory.SPECIAL, 100, 75, 5, -1, 0, 4)
+    new AttackMove(Moves.MAGMA_STORM, PokemonType.FIRE, MoveCategory.SPECIAL, 100, 75, 5, -1, 0, 4)
       .attr(TrapAttr, BattlerTagType.MAGMA_STORM),
-    new StatusMove(Moves.DARK_VOID, Type.DARK, 80, 10, -1, 0, 4)  //Accuracy from Generations 4-6
+    new StatusMove(Moves.DARK_VOID, PokemonType.DARK, 80, 10, -1, 0, 4)  //Accuracy from Generations 4-6
       .attr(StatusEffectAttr, StatusEffect.SLEEP)
-      .target(MoveTarget.ALL_NEAR_ENEMIES),
-    new AttackMove(Moves.SEED_FLARE, Type.GRASS, MoveCategory.SPECIAL, 120, 85, 5, 40, 0, 4)
+      .target(MoveTarget.ALL_NEAR_ENEMIES)
+      .reflectable(),
+    new AttackMove(Moves.SEED_FLARE, PokemonType.GRASS, MoveCategory.SPECIAL, 120, 85, 5, 40, 0, 4)
       .attr(StatStageChangeAttr, [ Stat.SPDEF ], -2),
-    new AttackMove(Moves.OMINOUS_WIND, Type.GHOST, MoveCategory.SPECIAL, 60, 100, 5, 10, 0, 4)
+    new AttackMove(Moves.OMINOUS_WIND, PokemonType.GHOST, MoveCategory.SPECIAL, 60, 100, 5, 10, 0, 4)
       .attr(StatStageChangeAttr, [ Stat.ATK, Stat.DEF, Stat.SPATK, Stat.SPDEF, Stat.SPD ], 1, true)
       .windMove(),
-    new ChargingAttackMove(Moves.SHADOW_FORCE, Type.GHOST, MoveCategory.PHYSICAL, 120, 100, 5, -1, 0, 4)
+    new ChargingAttackMove(Moves.SHADOW_FORCE, PokemonType.GHOST, MoveCategory.PHYSICAL, 120, 100, 5, -1, 0, 4)
       .chargeText(i18next.t("moveTriggers:vanishedInstantly", { pokemonName: "{USER}" }))
       .chargeAttr(SemiInvulnerableAttr, BattlerTagType.HIDDEN)
       .ignoresProtect(),
-    new SelfStatusMove(Moves.HONE_CLAWS, Type.DARK, -1, 15, -1, 0, 5)
+    new SelfStatusMove(Moves.HONE_CLAWS, PokemonType.DARK, -1, 15, -1, 0, 5)
       .attr(StatStageChangeAttr, [ Stat.ATK, Stat.ACC ], 1, true),
-    new StatusMove(Moves.WIDE_GUARD, Type.ROCK, -1, 10, -1, 3, 5)
+    new StatusMove(Moves.WIDE_GUARD, PokemonType.ROCK, -1, 10, -1, 3, 5)
       .target(MoveTarget.USER_SIDE)
       .attr(AddArenaTagAttr, ArenaTagType.WIDE_GUARD, 1, true, true)
       .condition(failIfLastCondition),
-    new StatusMove(Moves.GUARD_SPLIT, Type.PSYCHIC, -1, 10, -1, 0, 5)
+    new StatusMove(Moves.GUARD_SPLIT, PokemonType.PSYCHIC, -1, 10, -1, 0, 5)
       .attr(AverageStatsAttr, [ Stat.DEF, Stat.SPDEF ], "moveTriggers:sharedGuard"),
-    new StatusMove(Moves.POWER_SPLIT, Type.PSYCHIC, -1, 10, -1, 0, 5)
+    new StatusMove(Moves.POWER_SPLIT, PokemonType.PSYCHIC, -1, 10, -1, 0, 5)
       .attr(AverageStatsAttr, [ Stat.ATK, Stat.SPATK ], "moveTriggers:sharedPower"),
-    new StatusMove(Moves.WONDER_ROOM, Type.PSYCHIC, -1, 10, -1, 0, 5)
+    new StatusMove(Moves.WONDER_ROOM, PokemonType.PSYCHIC, -1, 10, -1, 0, 5)
       .ignoresProtect()
       .target(MoveTarget.BOTH_SIDES)
       .unimplemented(),
-    new AttackMove(Moves.PSYSHOCK, Type.PSYCHIC, MoveCategory.SPECIAL, 80, 100, 10, -1, 0, 5)
+    new AttackMove(Moves.PSYSHOCK, PokemonType.PSYCHIC, MoveCategory.SPECIAL, 80, 100, 10, -1, 0, 5)
       .attr(DefDefAttr),
-    new AttackMove(Moves.VENOSHOCK, Type.POISON, MoveCategory.SPECIAL, 65, 100, 10, -1, 0, 5)
+    new AttackMove(Moves.VENOSHOCK, PokemonType.POISON, MoveCategory.SPECIAL, 65, 100, 10, -1, 0, 5)
       .attr(MovePowerMultiplierAttr, (user, target, move) => target.status && (target.status.effect === StatusEffect.POISON || target.status.effect === StatusEffect.TOXIC) ? 2 : 1),
-    new SelfStatusMove(Moves.AUTOTOMIZE, Type.STEEL, -1, 15, -1, 0, 5)
+    new SelfStatusMove(Moves.AUTOTOMIZE, PokemonType.STEEL, -1, 15, -1, 0, 5)
       .attr(StatStageChangeAttr, [ Stat.SPD ], 2, true)
       .attr(AddBattlerTagAttr, BattlerTagType.AUTOTOMIZED, true),
-    new SelfStatusMove(Moves.RAGE_POWDER, Type.BUG, -1, 20, -1, 2, 5)
+    new SelfStatusMove(Moves.RAGE_POWDER, PokemonType.BUG, -1, 20, -1, 2, 5)
       .powderMove()
       .attr(AddBattlerTagAttr, BattlerTagType.CENTER_OF_ATTENTION, true),
-    new StatusMove(Moves.TELEKINESIS, Type.PSYCHIC, -1, 15, -1, 0, 5)
+    new StatusMove(Moves.TELEKINESIS, PokemonType.PSYCHIC, -1, 15, -1, 0, 5)
       .condition(failOnGravityCondition)
       .condition((_user, target, _move) => ![ Species.DIGLETT, Species.DUGTRIO, Species.ALOLA_DIGLETT, Species.ALOLA_DUGTRIO, Species.SANDYGAST, Species.PALOSSAND, Species.WIGLETT, Species.WUGTRIO ].includes(target.species.speciesId))
       .condition((_user, target, _move) => !(target.species.speciesId === Species.GENGAR && target.getFormKey() === "mega"))
-      .condition((_user, target, _move) => Utils.isNullOrUndefined(target.getTag(BattlerTagType.INGRAIN)) && Utils.isNullOrUndefined(target.getTag(BattlerTagType.IGNORE_FLYING)))
+      .condition((_user, target, _move) => isNullOrUndefined(target.getTag(BattlerTagType.INGRAIN)) && isNullOrUndefined(target.getTag(BattlerTagType.IGNORE_FLYING)))
       .attr(AddBattlerTagAttr, BattlerTagType.TELEKINESIS, false, true, 3)
-      .attr(AddBattlerTagAttr, BattlerTagType.FLOATING, false, true, 3),
-    new StatusMove(Moves.MAGIC_ROOM, Type.PSYCHIC, -1, 10, -1, 0, 5)
+      .attr(AddBattlerTagAttr, BattlerTagType.FLOATING, false, true, 3)
+      .reflectable(),
+    new StatusMove(Moves.MAGIC_ROOM, PokemonType.PSYCHIC, -1, 10, -1, 0, 5)
       .ignoresProtect()
       .target(MoveTarget.BOTH_SIDES)
       .unimplemented(),
-    new AttackMove(Moves.SMACK_DOWN, Type.ROCK, MoveCategory.PHYSICAL, 50, 100, 15, 100, 0, 5)
-      .attr(AddBattlerTagAttr, BattlerTagType.IGNORE_FLYING, false, false, 1, 1, true)
+    new AttackMove(Moves.SMACK_DOWN, PokemonType.ROCK, MoveCategory.PHYSICAL, 50, 100, 15, -1, 0, 5)
+      .attr(FallDownAttr)
       .attr(AddBattlerTagAttr, BattlerTagType.INTERRUPTED)
       .attr(RemoveBattlerTagAttr, [ BattlerTagType.FLYING, BattlerTagType.FLOATING, BattlerTagType.TELEKINESIS ])
       .attr(HitsTagAttr, BattlerTagType.FLYING)
       .makesContact(false),
-    new AttackMove(Moves.STORM_THROW, Type.FIGHTING, MoveCategory.PHYSICAL, 60, 100, 10, -1, 0, 5)
+    new AttackMove(Moves.STORM_THROW, PokemonType.FIGHTING, MoveCategory.PHYSICAL, 60, 100, 10, -1, 0, 5)
       .attr(CritOnlyAttr),
-    new AttackMove(Moves.FLAME_BURST, Type.FIRE, MoveCategory.SPECIAL, 70, 100, 15, -1, 0, 5)
+    new AttackMove(Moves.FLAME_BURST, PokemonType.FIRE, MoveCategory.SPECIAL, 70, 100, 15, -1, 0, 5)
       .attr(FlameBurstAttr),
-    new AttackMove(Moves.SLUDGE_WAVE, Type.POISON, MoveCategory.SPECIAL, 95, 100, 10, 10, 0, 5)
+    new AttackMove(Moves.SLUDGE_WAVE, PokemonType.POISON, MoveCategory.SPECIAL, 95, 100, 10, 10, 0, 5)
       .attr(StatusEffectAttr, StatusEffect.POISON)
       .target(MoveTarget.ALL_NEAR_OTHERS),
-    new SelfStatusMove(Moves.QUIVER_DANCE, Type.BUG, -1, 20, -1, 0, 5)
+    new SelfStatusMove(Moves.QUIVER_DANCE, PokemonType.BUG, -1, 20, -1, 0, 5)
       .attr(StatStageChangeAttr, [ Stat.SPATK, Stat.SPDEF, Stat.SPD ], 1, true)
       .danceMove(),
-    new AttackMove(Moves.HEAVY_SLAM, Type.STEEL, MoveCategory.PHYSICAL, -1, 100, 10, -1, 0, 5)
+    new AttackMove(Moves.HEAVY_SLAM, PokemonType.STEEL, MoveCategory.PHYSICAL, -1, 100, 10, -1, 0, 5)
       .attr(AlwaysHitMinimizeAttr)
       .attr(CompareWeightPowerAttr)
       .attr(HitsTagForDoubleDamageAttr, BattlerTagType.MINIMIZED),
-    new AttackMove(Moves.SYNCHRONOISE, Type.PSYCHIC, MoveCategory.SPECIAL, 120, 100, 10, -1, 0, 5)
+    new AttackMove(Moves.SYNCHRONOISE, PokemonType.PSYCHIC, MoveCategory.SPECIAL, 120, 100, 10, -1, 0, 5)
       .target(MoveTarget.ALL_NEAR_OTHERS)
       .condition(unknownTypeCondition)
-      .attr(hitsSameTypeAttr),
-    new AttackMove(Moves.ELECTRO_BALL, Type.ELECTRIC, MoveCategory.SPECIAL, -1, 100, 10, -1, 0, 5)
+      .attr(HitsSameTypeAttr),
+    new AttackMove(Moves.ELECTRO_BALL, PokemonType.ELECTRIC, MoveCategory.SPECIAL, -1, 100, 10, -1, 0, 5)
       .attr(ElectroBallPowerAttr)
       .ballBombMove(),
-    new StatusMove(Moves.SOAK, Type.WATER, 100, 20, -1, 0, 5)
-      .attr(ChangeTypeAttr, Type.WATER),
-    new AttackMove(Moves.FLAME_CHARGE, Type.FIRE, MoveCategory.PHYSICAL, 50, 100, 20, 100, 0, 5)
+    new StatusMove(Moves.SOAK, PokemonType.WATER, 100, 20, -1, 0, 5)
+      .attr(ChangeTypeAttr, PokemonType.WATER)
+      .reflectable(),
+    new AttackMove(Moves.FLAME_CHARGE, PokemonType.FIRE, MoveCategory.PHYSICAL, 50, 100, 20, 100, 0, 5)
       .attr(StatStageChangeAttr, [ Stat.SPD ], 1, true),
-    new SelfStatusMove(Moves.COIL, Type.POISON, -1, 20, -1, 0, 5)
+    new SelfStatusMove(Moves.COIL, PokemonType.POISON, -1, 20, -1, 0, 5)
       .attr(StatStageChangeAttr, [ Stat.ATK, Stat.DEF, Stat.ACC ], 1, true),
-    new AttackMove(Moves.LOW_SWEEP, Type.FIGHTING, MoveCategory.PHYSICAL, 65, 100, 20, 100, 0, 5)
+    new AttackMove(Moves.LOW_SWEEP, PokemonType.FIGHTING, MoveCategory.PHYSICAL, 65, 100, 20, 100, 0, 5)
       .attr(StatStageChangeAttr, [ Stat.SPD ], -1),
-    new AttackMove(Moves.ACID_SPRAY, Type.POISON, MoveCategory.SPECIAL, 40, 100, 20, 100, 0, 5)
+    new AttackMove(Moves.ACID_SPRAY, PokemonType.POISON, MoveCategory.SPECIAL, 40, 100, 20, 100, 0, 5)
       .attr(StatStageChangeAttr, [ Stat.SPDEF ], -2)
       .ballBombMove(),
-    new AttackMove(Moves.FOUL_PLAY, Type.DARK, MoveCategory.PHYSICAL, 95, 100, 15, -1, 0, 5)
+    new AttackMove(Moves.FOUL_PLAY, PokemonType.DARK, MoveCategory.PHYSICAL, 95, 100, 15, -1, 0, 5)
       .attr(TargetAtkUserAtkAttr),
-    new StatusMove(Moves.SIMPLE_BEAM, Type.NORMAL, 100, 15, -1, 0, 5)
-      .attr(AbilityChangeAttr, Abilities.SIMPLE),
-    new StatusMove(Moves.ENTRAINMENT, Type.NORMAL, 100, 15, -1, 0, 5)
-      .attr(AbilityGiveAttr),
-    new StatusMove(Moves.AFTER_YOU, Type.NORMAL, -1, 15, -1, 0, 5)
+    new StatusMove(Moves.SIMPLE_BEAM, PokemonType.NORMAL, 100, 15, -1, 0, 5)
+      .attr(AbilityChangeAttr, Abilities.SIMPLE)
+      .reflectable(),
+    new StatusMove(Moves.ENTRAINMENT, PokemonType.NORMAL, 100, 15, -1, 0, 5)
+      .attr(AbilityGiveAttr)
+      .reflectable(),
+    new StatusMove(Moves.AFTER_YOU, PokemonType.NORMAL, -1, 15, -1, 0, 5)
       .ignoresProtect()
       .ignoresSubstitute()
       .target(MoveTarget.NEAR_OTHER)
       .condition(failIfSingleBattle)
       .condition((user, target, move) => !target.turnData.acted)
       .attr(AfterYouAttr),
-    new AttackMove(Moves.ROUND, Type.NORMAL, MoveCategory.SPECIAL, 60, 100, 15, -1, 0, 5)
+    new AttackMove(Moves.ROUND, PokemonType.NORMAL, MoveCategory.SPECIAL, 60, 100, 15, -1, 0, 5)
       .attr(CueNextRoundAttr)
       .attr(RoundPowerAttr)
       .soundBased(),
-    new AttackMove(Moves.ECHOED_VOICE, Type.NORMAL, MoveCategory.SPECIAL, 40, 100, 15, -1, 0, 5)
+    new AttackMove(Moves.ECHOED_VOICE, PokemonType.NORMAL, MoveCategory.SPECIAL, 40, 100, 15, -1, 0, 5)
       .attr(ConsecutiveUseMultiBasePowerAttr, 5, false)
       .soundBased(),
-    new AttackMove(Moves.CHIP_AWAY, Type.NORMAL, MoveCategory.PHYSICAL, 70, 100, 20, -1, 0, 5)
+    new AttackMove(Moves.CHIP_AWAY, PokemonType.NORMAL, MoveCategory.PHYSICAL, 70, 100, 20, -1, 0, 5)
       .attr(IgnoreOpponentStatStagesAttr),
-    new AttackMove(Moves.CLEAR_SMOG, Type.POISON, MoveCategory.SPECIAL, 50, -1, 15, -1, 0, 5)
+    new AttackMove(Moves.CLEAR_SMOG, PokemonType.POISON, MoveCategory.SPECIAL, 50, -1, 15, -1, 0, 5)
       .attr(ResetStatsAttr, false),
-    new AttackMove(Moves.STORED_POWER, Type.PSYCHIC, MoveCategory.SPECIAL, 20, 100, 10, -1, 0, 5)
+    new AttackMove(Moves.STORED_POWER, PokemonType.PSYCHIC, MoveCategory.SPECIAL, 20, 100, 10, -1, 0, 5)
       .attr(PositiveStatStagePowerAttr),
-    new StatusMove(Moves.QUICK_GUARD, Type.FIGHTING, -1, 15, -1, 3, 5)
+    new StatusMove(Moves.QUICK_GUARD, PokemonType.FIGHTING, -1, 15, -1, 3, 5)
       .target(MoveTarget.USER_SIDE)
       .attr(AddArenaTagAttr, ArenaTagType.QUICK_GUARD, 1, true, true)
       .condition(failIfLastCondition),
-    new SelfStatusMove(Moves.ALLY_SWITCH, Type.PSYCHIC, -1, 15, -1, 2, 5)
+    new SelfStatusMove(Moves.ALLY_SWITCH, PokemonType.PSYCHIC, -1, 15, -1, 2, 5)
       .ignoresProtect()
       .unimplemented(),
-    new AttackMove(Moves.SCALD, Type.WATER, MoveCategory.SPECIAL, 80, 100, 15, 30, 0, 5)
+    new AttackMove(Moves.SCALD, PokemonType.WATER, MoveCategory.SPECIAL, 80, 100, 15, 30, 0, 5)
       .attr(HealStatusEffectAttr, false, StatusEffect.FREEZE)
       .attr(HealStatusEffectAttr, true, StatusEffect.FREEZE)
       .attr(StatusEffectAttr, StatusEffect.BURN),
-    new SelfStatusMove(Moves.SHELL_SMASH, Type.NORMAL, -1, 15, -1, 0, 5)
+    new SelfStatusMove(Moves.SHELL_SMASH, PokemonType.NORMAL, -1, 15, -1, 0, 5)
       .attr(StatStageChangeAttr, [ Stat.ATK, Stat.SPATK, Stat.SPD ], 2, true)
       .attr(StatStageChangeAttr, [ Stat.DEF, Stat.SPDEF ], -1, true),
-    new StatusMove(Moves.HEAL_PULSE, Type.PSYCHIC, -1, 10, -1, 0, 5)
+    new StatusMove(Moves.HEAL_PULSE, PokemonType.PSYCHIC, -1, 10, -1, 0, 5)
       .attr(HealAttr, 0.5, false, false)
       .pulseMove()
-      .triageMove(),
-    new AttackMove(Moves.HEX, Type.GHOST, MoveCategory.SPECIAL, 65, 100, 10, -1, 0, 5)
+      .triageMove()
+      .reflectable(),
+    new AttackMove(Moves.HEX, PokemonType.GHOST, MoveCategory.SPECIAL, 65, 100, 10, -1, 0, 5)
       .attr(
         MovePowerMultiplierAttr,
         (user, target, move) =>  target.status || target.hasAbility(Abilities.COMATOSE) ? 2 : 1),
-    new ChargingAttackMove(Moves.SKY_DROP, Type.FLYING, MoveCategory.PHYSICAL, 60, 100, 10, -1, 0, 5)
+    new ChargingAttackMove(Moves.SKY_DROP, PokemonType.FLYING, MoveCategory.PHYSICAL, 60, 100, 10, -1, 0, 5)
       .chargeText(i18next.t("moveTriggers:tookTargetIntoSky", { pokemonName: "{USER}", targetName: "{TARGET}" }))
       .chargeAttr(SemiInvulnerableAttr, BattlerTagType.FLYING)
       .condition(failOnGravityCondition)
       .condition((user, target, move) => !target.getTag(BattlerTagType.SUBSTITUTE))
       .partial(), // Should immobilize the target, Flying types should take no damage. cf https://bulbapedia.bulbagarden.net/wiki/Sky_Drop_(move) and https://www.smogon.com/dex/sv/moves/sky-drop/
-    new SelfStatusMove(Moves.SHIFT_GEAR, Type.STEEL, -1, 10, -1, 0, 5)
+    new SelfStatusMove(Moves.SHIFT_GEAR, PokemonType.STEEL, -1, 10, -1, 0, 5)
       .attr(StatStageChangeAttr, [ Stat.ATK ], 1, true)
       .attr(StatStageChangeAttr, [ Stat.SPD ], 2, true),
-    new AttackMove(Moves.CIRCLE_THROW, Type.FIGHTING, MoveCategory.PHYSICAL, 60, 90, 10, -1, -6, 5)
+    new AttackMove(Moves.CIRCLE_THROW, PokemonType.FIGHTING, MoveCategory.PHYSICAL, 60, 90, 10, -1, -6, 5)
       .attr(ForceSwitchOutAttr, false, SwitchType.FORCE_SWITCH)
       .hidesTarget(),
-    new AttackMove(Moves.INCINERATE, Type.FIRE, MoveCategory.SPECIAL, 60, 100, 15, -1, 0, 5)
+    new AttackMove(Moves.INCINERATE, PokemonType.FIRE, MoveCategory.SPECIAL, 60, 100, 15, -1, 0, 5)
       .target(MoveTarget.ALL_NEAR_ENEMIES)
-      .attr(RemoveHeldItemAttr, true),
-    new StatusMove(Moves.QUASH, Type.DARK, 100, 15, -1, 0, 5)
+      .attr(RemoveHeldItemAttr, true)
+      .edgeCase(),
+      // Should be able to remove items from pokemon with Sticky Hold if the damage causes them to faint
+    new StatusMove(Moves.QUASH, PokemonType.DARK, 100, 15, -1, 0, 5)
       .condition(failIfSingleBattle)
-      .unimplemented(),
-    new AttackMove(Moves.ACROBATICS, Type.FLYING, MoveCategory.PHYSICAL, 55, 100, 15, -1, 0, 5)
+      .condition((user, target, move) => !target.turnData.acted)
+      .attr(ForceLastAttr),
+    new AttackMove(Moves.ACROBATICS, PokemonType.FLYING, MoveCategory.PHYSICAL, 55, 100, 15, -1, 0, 5)
       .attr(MovePowerMultiplierAttr, (user, target, move) => Math.max(1, 2 - 0.2 * user.getHeldItems().filter(i => i.isTransferable).reduce((v, m) => v + m.stackCount, 0))),
-    new StatusMove(Moves.REFLECT_TYPE, Type.NORMAL, -1, 15, -1, 0, 5)
+    new StatusMove(Moves.REFLECT_TYPE, PokemonType.NORMAL, -1, 15, -1, 0, 5)
       .ignoresSubstitute()
       .attr(CopyTypeAttr),
-    new AttackMove(Moves.RETALIATE, Type.NORMAL, MoveCategory.PHYSICAL, 70, 100, 5, -1, 0, 5)
+    new AttackMove(Moves.RETALIATE, PokemonType.NORMAL, MoveCategory.PHYSICAL, 70, 100, 5, -1, 0, 5)
       .attr(MovePowerMultiplierAttr, (user, target, move) => {
         const turn = globalScene.currentBattle.turn;
         const lastPlayerFaint = globalScene.currentBattle.playerFaintsHistory[globalScene.currentBattle.playerFaintsHistory.length - 1];
@@ -9902,16 +10017,16 @@ export function initMoves() {
           (lastEnemyFaint !== undefined && turn - lastEnemyFaint.turn === 1 && !user.isPlayer())
         ) ? 2 : 1;
       }),
-    new AttackMove(Moves.FINAL_GAMBIT, Type.FIGHTING, MoveCategory.SPECIAL, -1, 100, 5, -1, 0, 5)
+    new AttackMove(Moves.FINAL_GAMBIT, PokemonType.FIGHTING, MoveCategory.SPECIAL, -1, 100, 5, -1, 0, 5)
       .attr(UserHpDamageAttr)
       .attr(SacrificialAttrOnHit),
-    new StatusMove(Moves.BESTOW, Type.NORMAL, -1, 15, -1, 0, 5)
+    new StatusMove(Moves.BESTOW, PokemonType.NORMAL, -1, 15, -1, 0, 5)
       .ignoresProtect()
       .ignoresSubstitute()
       .unimplemented(),
-    new AttackMove(Moves.INFERNO, Type.FIRE, MoveCategory.SPECIAL, 100, 50, 5, 100, 0, 5)
+    new AttackMove(Moves.INFERNO, PokemonType.FIRE, MoveCategory.SPECIAL, 100, 50, 5, 100, 0, 5)
       .attr(StatusEffectAttr, StatusEffect.BURN),
-    new AttackMove(Moves.WATER_PLEDGE, Type.WATER, MoveCategory.SPECIAL, 80, 100, 10, -1, 0, 5)
+    new AttackMove(Moves.WATER_PLEDGE, PokemonType.WATER, MoveCategory.SPECIAL, 80, 100, 10, -1, 0, 5)
       .attr(AwaitCombinedPledgeAttr)
       .attr(CombinedPledgeTypeAttr)
       .attr(CombinedPledgePowerAttr)
@@ -9919,7 +10034,7 @@ export function initMoves() {
       .attr(AddPledgeEffectAttr, ArenaTagType.WATER_FIRE_PLEDGE, Moves.FIRE_PLEDGE, true)
       .attr(AddPledgeEffectAttr, ArenaTagType.GRASS_WATER_PLEDGE, Moves.GRASS_PLEDGE)
       .attr(BypassRedirectAttr, true),
-    new AttackMove(Moves.FIRE_PLEDGE, Type.FIRE, MoveCategory.SPECIAL, 80, 100, 10, -1, 0, 5)
+    new AttackMove(Moves.FIRE_PLEDGE, PokemonType.FIRE, MoveCategory.SPECIAL, 80, 100, 10, -1, 0, 5)
       .attr(AwaitCombinedPledgeAttr)
       .attr(CombinedPledgeTypeAttr)
       .attr(CombinedPledgePowerAttr)
@@ -9927,7 +10042,7 @@ export function initMoves() {
       .attr(AddPledgeEffectAttr, ArenaTagType.FIRE_GRASS_PLEDGE, Moves.GRASS_PLEDGE)
       .attr(AddPledgeEffectAttr, ArenaTagType.WATER_FIRE_PLEDGE, Moves.WATER_PLEDGE, true)
       .attr(BypassRedirectAttr, true),
-    new AttackMove(Moves.GRASS_PLEDGE, Type.GRASS, MoveCategory.SPECIAL, 80, 100, 10, -1, 0, 5)
+    new AttackMove(Moves.GRASS_PLEDGE, PokemonType.GRASS, MoveCategory.SPECIAL, 80, 100, 10, -1, 0, 5)
       .attr(AwaitCombinedPledgeAttr)
       .attr(CombinedPledgeTypeAttr)
       .attr(CombinedPledgePowerAttr)
@@ -9935,655 +10050,678 @@ export function initMoves() {
       .attr(AddPledgeEffectAttr, ArenaTagType.GRASS_WATER_PLEDGE, Moves.WATER_PLEDGE)
       .attr(AddPledgeEffectAttr, ArenaTagType.FIRE_GRASS_PLEDGE, Moves.FIRE_PLEDGE)
       .attr(BypassRedirectAttr, true),
-    new AttackMove(Moves.VOLT_SWITCH, Type.ELECTRIC, MoveCategory.SPECIAL, 70, 100, 20, -1, 0, 5)
+    new AttackMove(Moves.VOLT_SWITCH, PokemonType.ELECTRIC, MoveCategory.SPECIAL, 70, 100, 20, -1, 0, 5)
       .attr(ForceSwitchOutAttr, true),
-    new AttackMove(Moves.STRUGGLE_BUG, Type.BUG, MoveCategory.SPECIAL, 50, 100, 20, 100, 0, 5)
+    new AttackMove(Moves.STRUGGLE_BUG, PokemonType.BUG, MoveCategory.SPECIAL, 50, 100, 20, 100, 0, 5)
       .attr(StatStageChangeAttr, [ Stat.SPATK ], -1)
       .target(MoveTarget.ALL_NEAR_ENEMIES),
-    new AttackMove(Moves.BULLDOZE, Type.GROUND, MoveCategory.PHYSICAL, 60, 100, 20, 100, 0, 5)
+    new AttackMove(Moves.BULLDOZE, PokemonType.GROUND, MoveCategory.PHYSICAL, 60, 100, 20, 100, 0, 5)
       .attr(StatStageChangeAttr, [ Stat.SPD ], -1)
       .attr(MovePowerMultiplierAttr, (user, target, move) => globalScene.arena.getTerrainType() === TerrainType.GRASSY && target.isGrounded() ? 0.5 : 1)
       .makesContact(false)
       .target(MoveTarget.ALL_NEAR_OTHERS),
-    new AttackMove(Moves.FROST_BREATH, Type.ICE, MoveCategory.SPECIAL, 60, 90, 10, 100, 0, 5)
+    new AttackMove(Moves.FROST_BREATH, PokemonType.ICE, MoveCategory.SPECIAL, 60, 90, 10, -1, 0, 5)
       .attr(CritOnlyAttr),
-    new AttackMove(Moves.DRAGON_TAIL, Type.DRAGON, MoveCategory.PHYSICAL, 60, 90, 10, -1, -6, 5)
+    new AttackMove(Moves.DRAGON_TAIL, PokemonType.DRAGON, MoveCategory.PHYSICAL, 60, 90, 10, -1, -6, 5)
       .attr(ForceSwitchOutAttr, false, SwitchType.FORCE_SWITCH)
       .hidesTarget(),
-    new SelfStatusMove(Moves.WORK_UP, Type.NORMAL, -1, 30, -1, 0, 5)
+    new SelfStatusMove(Moves.WORK_UP, PokemonType.NORMAL, -1, 30, -1, 0, 5)
       .attr(StatStageChangeAttr, [ Stat.ATK, Stat.SPATK ], 1, true),
-    new AttackMove(Moves.ELECTROWEB, Type.ELECTRIC, MoveCategory.SPECIAL, 55, 95, 15, 100, 0, 5)
+    new AttackMove(Moves.ELECTROWEB, PokemonType.ELECTRIC, MoveCategory.SPECIAL, 55, 95, 15, 100, 0, 5)
       .attr(StatStageChangeAttr, [ Stat.SPD ], -1)
       .target(MoveTarget.ALL_NEAR_ENEMIES),
-    new AttackMove(Moves.WILD_CHARGE, Type.ELECTRIC, MoveCategory.PHYSICAL, 90, 100, 15, -1, 0, 5)
+    new AttackMove(Moves.WILD_CHARGE, PokemonType.ELECTRIC, MoveCategory.PHYSICAL, 90, 100, 15, -1, 0, 5)
       .attr(RecoilAttr)
       .recklessMove(),
-    new AttackMove(Moves.DRILL_RUN, Type.GROUND, MoveCategory.PHYSICAL, 80, 95, 10, -1, 0, 5)
+    new AttackMove(Moves.DRILL_RUN, PokemonType.GROUND, MoveCategory.PHYSICAL, 80, 95, 10, -1, 0, 5)
       .attr(HighCritAttr),
-    new AttackMove(Moves.DUAL_CHOP, Type.DRAGON, MoveCategory.PHYSICAL, 40, 90, 15, -1, 0, 5)
+    new AttackMove(Moves.DUAL_CHOP, PokemonType.DRAGON, MoveCategory.PHYSICAL, 40, 90, 15, -1, 0, 5)
       .attr(MultiHitAttr, MultiHitType._2),
-    new AttackMove(Moves.HEART_STAMP, Type.PSYCHIC, MoveCategory.PHYSICAL, 60, 100, 25, 30, 0, 5)
+    new AttackMove(Moves.HEART_STAMP, PokemonType.PSYCHIC, MoveCategory.PHYSICAL, 60, 100, 25, 30, 0, 5)
       .attr(FlinchAttr),
-    new AttackMove(Moves.HORN_LEECH, Type.GRASS, MoveCategory.PHYSICAL, 75, 100, 10, -1, 0, 5)
+    new AttackMove(Moves.HORN_LEECH, PokemonType.GRASS, MoveCategory.PHYSICAL, 75, 100, 10, -1, 0, 5)
       .attr(HitHealAttr)
       .triageMove(),
-    new AttackMove(Moves.SACRED_SWORD, Type.FIGHTING, MoveCategory.PHYSICAL, 90, 100, 15, -1, 0, 5)
+    new AttackMove(Moves.SACRED_SWORD, PokemonType.FIGHTING, MoveCategory.PHYSICAL, 90, 100, 15, -1, 0, 5)
       .attr(IgnoreOpponentStatStagesAttr)
       .slicingMove(),
-    new AttackMove(Moves.RAZOR_SHELL, Type.WATER, MoveCategory.PHYSICAL, 75, 95, 10, 50, 0, 5)
+    new AttackMove(Moves.RAZOR_SHELL, PokemonType.WATER, MoveCategory.PHYSICAL, 75, 95, 10, 50, 0, 5)
       .attr(StatStageChangeAttr, [ Stat.DEF ], -1)
       .slicingMove(),
-    new AttackMove(Moves.HEAT_CRASH, Type.FIRE, MoveCategory.PHYSICAL, -1, 100, 10, -1, 0, 5)
+    new AttackMove(Moves.HEAT_CRASH, PokemonType.FIRE, MoveCategory.PHYSICAL, -1, 100, 10, -1, 0, 5)
       .attr(AlwaysHitMinimizeAttr)
       .attr(CompareWeightPowerAttr)
       .attr(HitsTagForDoubleDamageAttr, BattlerTagType.MINIMIZED),
-    new AttackMove(Moves.LEAF_TORNADO, Type.GRASS, MoveCategory.SPECIAL, 65, 90, 10, 50, 0, 5)
+    new AttackMove(Moves.LEAF_TORNADO, PokemonType.GRASS, MoveCategory.SPECIAL, 65, 90, 10, 50, 0, 5)
       .attr(StatStageChangeAttr, [ Stat.ACC ], -1),
-    new AttackMove(Moves.STEAMROLLER, Type.BUG, MoveCategory.PHYSICAL, 65, 100, 20, 30, 0, 5)
+    new AttackMove(Moves.STEAMROLLER, PokemonType.BUG, MoveCategory.PHYSICAL, 65, 100, 20, 30, 0, 5)
       .attr(AlwaysHitMinimizeAttr)
       .attr(HitsTagForDoubleDamageAttr, BattlerTagType.MINIMIZED)
       .attr(FlinchAttr),
-    new SelfStatusMove(Moves.COTTON_GUARD, Type.GRASS, -1, 10, -1, 0, 5)
+    new SelfStatusMove(Moves.COTTON_GUARD, PokemonType.GRASS, -1, 10, -1, 0, 5)
       .attr(StatStageChangeAttr, [ Stat.DEF ], 3, true),
-    new AttackMove(Moves.NIGHT_DAZE, Type.DARK, MoveCategory.SPECIAL, 85, 95, 10, 40, 0, 5)
+    new AttackMove(Moves.NIGHT_DAZE, PokemonType.DARK, MoveCategory.SPECIAL, 85, 95, 10, 40, 0, 5)
       .attr(StatStageChangeAttr, [ Stat.ACC ], -1),
-    new AttackMove(Moves.PSYSTRIKE, Type.PSYCHIC, MoveCategory.SPECIAL, 100, 100, 10, -1, 0, 5)
+    new AttackMove(Moves.PSYSTRIKE, PokemonType.PSYCHIC, MoveCategory.SPECIAL, 100, 100, 10, -1, 0, 5)
       .attr(DefDefAttr),
-    new AttackMove(Moves.TAIL_SLAP, Type.NORMAL, MoveCategory.PHYSICAL, 25, 85, 10, -1, 0, 5)
+    new AttackMove(Moves.TAIL_SLAP, PokemonType.NORMAL, MoveCategory.PHYSICAL, 25, 85, 10, -1, 0, 5)
       .attr(MultiHitAttr),
-    new AttackMove(Moves.HURRICANE, Type.FLYING, MoveCategory.SPECIAL, 110, 70, 10, 30, 0, 5)
+    new AttackMove(Moves.HURRICANE, PokemonType.FLYING, MoveCategory.SPECIAL, 110, 70, 10, 30, 0, 5)
       .attr(ThunderAccuracyAttr)
       .attr(ConfuseAttr)
       .attr(HitsTagAttr, BattlerTagType.FLYING)
       .windMove(),
-    new AttackMove(Moves.HEAD_CHARGE, Type.NORMAL, MoveCategory.PHYSICAL, 120, 100, 15, -1, 0, 5)
+    new AttackMove(Moves.HEAD_CHARGE, PokemonType.NORMAL, MoveCategory.PHYSICAL, 120, 100, 15, -1, 0, 5)
       .attr(RecoilAttr)
       .recklessMove(),
-    new AttackMove(Moves.GEAR_GRIND, Type.STEEL, MoveCategory.PHYSICAL, 50, 85, 15, -1, 0, 5)
+    new AttackMove(Moves.GEAR_GRIND, PokemonType.STEEL, MoveCategory.PHYSICAL, 50, 85, 15, -1, 0, 5)
       .attr(MultiHitAttr, MultiHitType._2),
-    new AttackMove(Moves.SEARING_SHOT, Type.FIRE, MoveCategory.SPECIAL, 100, 100, 5, 30, 0, 5)
+    new AttackMove(Moves.SEARING_SHOT, PokemonType.FIRE, MoveCategory.SPECIAL, 100, 100, 5, 30, 0, 5)
       .attr(StatusEffectAttr, StatusEffect.BURN)
       .ballBombMove()
       .target(MoveTarget.ALL_NEAR_OTHERS),
-    new AttackMove(Moves.TECHNO_BLAST, Type.NORMAL, MoveCategory.SPECIAL, 120, 100, 5, -1, 0, 5)
+    new AttackMove(Moves.TECHNO_BLAST, PokemonType.NORMAL, MoveCategory.SPECIAL, 120, 100, 5, -1, 0, 5)
       .attr(TechnoBlastTypeAttr),
-    new AttackMove(Moves.RELIC_SONG, Type.NORMAL, MoveCategory.SPECIAL, 75, 100, 10, 10, 0, 5)
+    new AttackMove(Moves.RELIC_SONG, PokemonType.NORMAL, MoveCategory.SPECIAL, 75, 100, 10, 10, 0, 5)
       .attr(StatusEffectAttr, StatusEffect.SLEEP)
       .soundBased()
       .target(MoveTarget.ALL_NEAR_ENEMIES),
-    new AttackMove(Moves.SECRET_SWORD, Type.FIGHTING, MoveCategory.SPECIAL, 85, 100, 10, -1, 0, 5)
+    new AttackMove(Moves.SECRET_SWORD, PokemonType.FIGHTING, MoveCategory.SPECIAL, 85, 100, 10, -1, 0, 5)
       .attr(DefDefAttr)
       .slicingMove(),
-    new AttackMove(Moves.GLACIATE, Type.ICE, MoveCategory.SPECIAL, 65, 95, 10, 100, 0, 5)
+    new AttackMove(Moves.GLACIATE, PokemonType.ICE, MoveCategory.SPECIAL, 65, 95, 10, 100, 0, 5)
       .attr(StatStageChangeAttr, [ Stat.SPD ], -1)
       .target(MoveTarget.ALL_NEAR_ENEMIES),
-    new AttackMove(Moves.BOLT_STRIKE, Type.ELECTRIC, MoveCategory.PHYSICAL, 130, 85, 5, 20, 0, 5)
+    new AttackMove(Moves.BOLT_STRIKE, PokemonType.ELECTRIC, MoveCategory.PHYSICAL, 130, 85, 5, 20, 0, 5)
       .attr(StatusEffectAttr, StatusEffect.PARALYSIS),
-    new AttackMove(Moves.BLUE_FLARE, Type.FIRE, MoveCategory.SPECIAL, 130, 85, 5, 20, 0, 5)
+    new AttackMove(Moves.BLUE_FLARE, PokemonType.FIRE, MoveCategory.SPECIAL, 130, 85, 5, 20, 0, 5)
       .attr(StatusEffectAttr, StatusEffect.BURN),
-    new AttackMove(Moves.FIERY_DANCE, Type.FIRE, MoveCategory.SPECIAL, 80, 100, 10, 50, 0, 5)
+    new AttackMove(Moves.FIERY_DANCE, PokemonType.FIRE, MoveCategory.SPECIAL, 80, 100, 10, 50, 0, 5)
       .attr(StatStageChangeAttr, [ Stat.SPATK ], 1, true)
       .danceMove(),
-    new ChargingAttackMove(Moves.FREEZE_SHOCK, Type.ICE, MoveCategory.PHYSICAL, 140, 90, 5, 30, 0, 5)
+    new ChargingAttackMove(Moves.FREEZE_SHOCK, PokemonType.ICE, MoveCategory.PHYSICAL, 140, 90, 5, 30, 0, 5)
       .chargeText(i18next.t("moveTriggers:becameCloakedInFreezingLight", { pokemonName: "{USER}" }))
       .attr(StatusEffectAttr, StatusEffect.PARALYSIS)
       .makesContact(false),
-    new ChargingAttackMove(Moves.ICE_BURN, Type.ICE, MoveCategory.SPECIAL, 140, 90, 5, 30, 0, 5)
+    new ChargingAttackMove(Moves.ICE_BURN, PokemonType.ICE, MoveCategory.SPECIAL, 140, 90, 5, 30, 0, 5)
       .chargeText(i18next.t("moveTriggers:becameCloakedInFreezingAir", { pokemonName: "{USER}" }))
       .attr(StatusEffectAttr, StatusEffect.BURN),
-    new AttackMove(Moves.SNARL, Type.DARK, MoveCategory.SPECIAL, 55, 95, 15, 100, 0, 5)
+    new AttackMove(Moves.SNARL, PokemonType.DARK, MoveCategory.SPECIAL, 55, 95, 15, 100, 0, 5)
       .attr(StatStageChangeAttr, [ Stat.SPATK ], -1)
       .soundBased()
       .target(MoveTarget.ALL_NEAR_ENEMIES),
-    new AttackMove(Moves.ICICLE_CRASH, Type.ICE, MoveCategory.PHYSICAL, 85, 90, 10, 30, 0, 5)
+    new AttackMove(Moves.ICICLE_CRASH, PokemonType.ICE, MoveCategory.PHYSICAL, 85, 90, 10, 30, 0, 5)
       .attr(FlinchAttr)
       .makesContact(false),
-    new AttackMove(Moves.V_CREATE, Type.FIRE, MoveCategory.PHYSICAL, 180, 95, 5, -1, 0, 5)
+    new AttackMove(Moves.V_CREATE, PokemonType.FIRE, MoveCategory.PHYSICAL, 180, 95, 5, -1, 0, 5)
       .attr(StatStageChangeAttr, [ Stat.DEF, Stat.SPDEF, Stat.SPD ], -1, true),
-    new AttackMove(Moves.FUSION_FLARE, Type.FIRE, MoveCategory.SPECIAL, 100, 100, 5, -1, 0, 5)
+    new AttackMove(Moves.FUSION_FLARE, PokemonType.FIRE, MoveCategory.SPECIAL, 100, 100, 5, -1, 0, 5)
       .attr(HealStatusEffectAttr, true, StatusEffect.FREEZE)
       .attr(LastMoveDoublePowerAttr, Moves.FUSION_BOLT),
-    new AttackMove(Moves.FUSION_BOLT, Type.ELECTRIC, MoveCategory.PHYSICAL, 100, 100, 5, -1, 0, 5)
+    new AttackMove(Moves.FUSION_BOLT, PokemonType.ELECTRIC, MoveCategory.PHYSICAL, 100, 100, 5, -1, 0, 5)
       .attr(LastMoveDoublePowerAttr, Moves.FUSION_FLARE)
       .makesContact(false),
-    new AttackMove(Moves.FLYING_PRESS, Type.FIGHTING, MoveCategory.PHYSICAL, 100, 95, 10, -1, 0, 6)
+    new AttackMove(Moves.FLYING_PRESS, PokemonType.FIGHTING, MoveCategory.PHYSICAL, 100, 95, 10, -1, 0, 6)
       .attr(AlwaysHitMinimizeAttr)
       .attr(FlyingTypeMultiplierAttr)
       .attr(HitsTagForDoubleDamageAttr, BattlerTagType.MINIMIZED)
       .condition(failOnGravityCondition),
-    new StatusMove(Moves.MAT_BLOCK, Type.FIGHTING, -1, 10, -1, 0, 6)
+    new StatusMove(Moves.MAT_BLOCK, PokemonType.FIGHTING, -1, 10, -1, 0, 6)
       .target(MoveTarget.USER_SIDE)
       .attr(AddArenaTagAttr, ArenaTagType.MAT_BLOCK, 1, true, true)
       .condition(new FirstMoveCondition())
       .condition(failIfLastCondition),
-    new AttackMove(Moves.BELCH, Type.POISON, MoveCategory.SPECIAL, 120, 90, 10, -1, 0, 6)
-      .condition((user, target, move) => user.battleData.berriesEaten.length > 0),
-    new StatusMove(Moves.ROTOTILLER, Type.GROUND, -1, 10, -1, 0, 6)
+    new AttackMove(Moves.BELCH, PokemonType.POISON, MoveCategory.SPECIAL, 120, 90, 10, -1, 0, 6)
+      .condition((user, target, move) => user.battleData.hasEatenBerry),
+    new StatusMove(Moves.ROTOTILLER, PokemonType.GROUND, -1, 10, -1, 0, 6)
       .target(MoveTarget.ALL)
       .condition((user, target, move) => {
         // If any fielded pokémon is grass-type and grounded.
-        return [ ...globalScene.getEnemyParty(), ...globalScene.getPlayerParty() ].some((poke) => poke.isOfType(Type.GRASS) && poke.isGrounded());
+        return [ ...globalScene.getEnemyParty(), ...globalScene.getPlayerParty() ].some((poke) => poke.isOfType(PokemonType.GRASS) && poke.isGrounded());
       })
-      .attr(StatStageChangeAttr, [ Stat.ATK, Stat.SPATK ], 1, false, { condition: (user, target, move) => target.isOfType(Type.GRASS) && target.isGrounded() }),
-    new StatusMove(Moves.STICKY_WEB, Type.BUG, -1, 20, -1, 0, 6)
+      .attr(StatStageChangeAttr, [ Stat.ATK, Stat.SPATK ], 1, false, { condition: (user, target, move) => target.isOfType(PokemonType.GRASS) && target.isGrounded() }),
+    new StatusMove(Moves.STICKY_WEB, PokemonType.BUG, -1, 20, -1, 0, 6)
       .attr(AddArenaTrapTagAttr, ArenaTagType.STICKY_WEB)
-      .target(MoveTarget.ENEMY_SIDE),
-    new AttackMove(Moves.FELL_STINGER, Type.BUG, MoveCategory.PHYSICAL, 50, 100, 25, -1, 0, 6)
+      .target(MoveTarget.ENEMY_SIDE)
+      .reflectable(),
+    new AttackMove(Moves.FELL_STINGER, PokemonType.BUG, MoveCategory.PHYSICAL, 50, 100, 25, -1, 0, 6)
       .attr(PostVictoryStatStageChangeAttr, [ Stat.ATK ], 3, true ),
-    new ChargingAttackMove(Moves.PHANTOM_FORCE, Type.GHOST, MoveCategory.PHYSICAL, 90, 100, 10, -1, 0, 6)
+    new ChargingAttackMove(Moves.PHANTOM_FORCE, PokemonType.GHOST, MoveCategory.PHYSICAL, 90, 100, 10, -1, 0, 6)
       .chargeText(i18next.t("moveTriggers:vanishedInstantly", { pokemonName: "{USER}" }))
       .chargeAttr(SemiInvulnerableAttr, BattlerTagType.HIDDEN)
       .ignoresProtect(),
-    new StatusMove(Moves.TRICK_OR_TREAT, Type.GHOST, 100, 20, -1, 0, 6)
-      .attr(AddTypeAttr, Type.GHOST),
-    new StatusMove(Moves.NOBLE_ROAR, Type.NORMAL, 100, 30, -1, 0, 6)
+    new StatusMove(Moves.TRICK_OR_TREAT, PokemonType.GHOST, 100, 20, -1, 0, 6)
+      .attr(AddTypeAttr, PokemonType.GHOST)
+      .reflectable(),
+    new StatusMove(Moves.NOBLE_ROAR, PokemonType.NORMAL, 100, 30, -1, 0, 6)
       .attr(StatStageChangeAttr, [ Stat.ATK, Stat.SPATK ], -1)
-      .soundBased(),
-    new StatusMove(Moves.ION_DELUGE, Type.ELECTRIC, -1, 25, -1, 1, 6)
+      .soundBased()
+      .reflectable(),
+    new StatusMove(Moves.ION_DELUGE, PokemonType.ELECTRIC, -1, 25, -1, 1, 6)
       .attr(AddArenaTagAttr, ArenaTagType.ION_DELUGE)
       .target(MoveTarget.BOTH_SIDES),
-    new AttackMove(Moves.PARABOLIC_CHARGE, Type.ELECTRIC, MoveCategory.SPECIAL, 65, 100, 20, -1, 0, 6)
+    new AttackMove(Moves.PARABOLIC_CHARGE, PokemonType.ELECTRIC, MoveCategory.SPECIAL, 65, 100, 20, -1, 0, 6)
       .attr(HitHealAttr)
       .target(MoveTarget.ALL_NEAR_OTHERS)
       .triageMove(),
-    new StatusMove(Moves.FORESTS_CURSE, Type.GRASS, 100, 20, -1, 0, 6)
-      .attr(AddTypeAttr, Type.GRASS),
-    new AttackMove(Moves.PETAL_BLIZZARD, Type.GRASS, MoveCategory.PHYSICAL, 90, 100, 15, -1, 0, 6)
+    new StatusMove(Moves.FORESTS_CURSE, PokemonType.GRASS, 100, 20, -1, 0, 6)
+      .attr(AddTypeAttr, PokemonType.GRASS)
+      .reflectable(),
+    new AttackMove(Moves.PETAL_BLIZZARD, PokemonType.GRASS, MoveCategory.PHYSICAL, 90, 100, 15, -1, 0, 6)
       .windMove()
       .makesContact(false)
       .target(MoveTarget.ALL_NEAR_OTHERS),
-    new AttackMove(Moves.FREEZE_DRY, Type.ICE, MoveCategory.SPECIAL, 70, 100, 20, 10, 0, 6)
+    new AttackMove(Moves.FREEZE_DRY, PokemonType.ICE, MoveCategory.SPECIAL, 70, 100, 20, 10, 0, 6)
       .attr(StatusEffectAttr, StatusEffect.FREEZE)
       .attr(FreezeDryAttr),
-    new AttackMove(Moves.DISARMING_VOICE, Type.FAIRY, MoveCategory.SPECIAL, 40, -1, 15, -1, 0, 6)
+    new AttackMove(Moves.DISARMING_VOICE, PokemonType.FAIRY, MoveCategory.SPECIAL, 40, -1, 15, -1, 0, 6)
       .soundBased()
       .target(MoveTarget.ALL_NEAR_ENEMIES),
-    new StatusMove(Moves.PARTING_SHOT, Type.DARK, 100, 20, -1, 0, 6)
+    new StatusMove(Moves.PARTING_SHOT, PokemonType.DARK, 100, 20, -1, 0, 6)
       .attr(StatStageChangeAttr, [ Stat.ATK, Stat.SPATK ], -1, false, { trigger: MoveEffectTrigger.PRE_APPLY })
       .attr(ForceSwitchOutAttr, true)
-      .soundBased(),
-    new StatusMove(Moves.TOPSY_TURVY, Type.DARK, -1, 20, -1, 0, 6)
-      .attr(InvertStatsAttr),
-    new AttackMove(Moves.DRAINING_KISS, Type.FAIRY, MoveCategory.SPECIAL, 50, 100, 10, -1, 0, 6)
+      .soundBased()
+      .reflectable(),
+    new StatusMove(Moves.TOPSY_TURVY, PokemonType.DARK, -1, 20, -1, 0, 6)
+      .attr(InvertStatsAttr)
+      .reflectable(),
+    new AttackMove(Moves.DRAINING_KISS, PokemonType.FAIRY, MoveCategory.SPECIAL, 50, 100, 10, -1, 0, 6)
       .attr(HitHealAttr, 0.75)
       .makesContact()
       .triageMove(),
-    new StatusMove(Moves.CRAFTY_SHIELD, Type.FAIRY, -1, 10, -1, 3, 6)
+    new StatusMove(Moves.CRAFTY_SHIELD, PokemonType.FAIRY, -1, 10, -1, 3, 6)
       .target(MoveTarget.USER_SIDE)
       .attr(AddArenaTagAttr, ArenaTagType.CRAFTY_SHIELD, 1, true, true)
       .condition(failIfLastCondition),
-    new StatusMove(Moves.FLOWER_SHIELD, Type.FAIRY, -1, 10, -1, 0, 6)
+    new StatusMove(Moves.FLOWER_SHIELD, PokemonType.FAIRY, -1, 10, -1, 0, 6)
       .target(MoveTarget.ALL)
-      .attr(StatStageChangeAttr, [ Stat.DEF ], 1, false, { condition: (user, target, move) => target.getTypes().includes(Type.GRASS) && !target.getTag(SemiInvulnerableTag) }),
-    new StatusMove(Moves.GRASSY_TERRAIN, Type.GRASS, -1, 10, -1, 0, 6)
+      .attr(StatStageChangeAttr, [ Stat.DEF ], 1, false, { condition: (user, target, move) => target.getTypes().includes(PokemonType.GRASS) && !target.getTag(SemiInvulnerableTag) }),
+    new StatusMove(Moves.GRASSY_TERRAIN, PokemonType.GRASS, -1, 10, -1, 0, 6)
       .attr(TerrainChangeAttr, TerrainType.GRASSY)
       .target(MoveTarget.BOTH_SIDES),
-    new StatusMove(Moves.MISTY_TERRAIN, Type.FAIRY, -1, 10, -1, 0, 6)
+    new StatusMove(Moves.MISTY_TERRAIN, PokemonType.FAIRY, -1, 10, -1, 0, 6)
       .attr(TerrainChangeAttr, TerrainType.MISTY)
       .target(MoveTarget.BOTH_SIDES),
-    new StatusMove(Moves.ELECTRIFY, Type.ELECTRIC, -1, 20, -1, 0, 6)
+    new StatusMove(Moves.ELECTRIFY, PokemonType.ELECTRIC, -1, 20, -1, 0, 6)
       .attr(AddBattlerTagAttr, BattlerTagType.ELECTRIFIED, false, true),
-    new AttackMove(Moves.PLAY_ROUGH, Type.FAIRY, MoveCategory.PHYSICAL, 90, 90, 10, 10, 0, 6)
+    new AttackMove(Moves.PLAY_ROUGH, PokemonType.FAIRY, MoveCategory.PHYSICAL, 90, 90, 10, 10, 0, 6)
       .attr(StatStageChangeAttr, [ Stat.ATK ], -1),
-    new AttackMove(Moves.FAIRY_WIND, Type.FAIRY, MoveCategory.SPECIAL, 40, 100, 30, -1, 0, 6)
+    new AttackMove(Moves.FAIRY_WIND, PokemonType.FAIRY, MoveCategory.SPECIAL, 40, 100, 30, -1, 0, 6)
       .windMove(),
-    new AttackMove(Moves.MOONBLAST, Type.FAIRY, MoveCategory.SPECIAL, 95, 100, 15, 30, 0, 6)
+    new AttackMove(Moves.MOONBLAST, PokemonType.FAIRY, MoveCategory.SPECIAL, 95, 100, 15, 30, 0, 6)
       .attr(StatStageChangeAttr, [ Stat.SPATK ], -1),
-    new AttackMove(Moves.BOOMBURST, Type.NORMAL, MoveCategory.SPECIAL, 140, 100, 10, -1, 0, 6)
+    new AttackMove(Moves.BOOMBURST, PokemonType.NORMAL, MoveCategory.SPECIAL, 140, 100, 10, -1, 0, 6)
       .soundBased()
       .target(MoveTarget.ALL_NEAR_OTHERS),
-    new StatusMove(Moves.FAIRY_LOCK, Type.FAIRY, -1, 10, -1, 0, 6)
+    new StatusMove(Moves.FAIRY_LOCK, PokemonType.FAIRY, -1, 10, -1, 0, 6)
       .ignoresSubstitute()
       .ignoresProtect()
       .target(MoveTarget.BOTH_SIDES)
       .attr(AddArenaTagAttr, ArenaTagType.FAIRY_LOCK, 2, true),
-    new SelfStatusMove(Moves.KINGS_SHIELD, Type.STEEL, -1, 10, -1, 4, 6)
+    new SelfStatusMove(Moves.KINGS_SHIELD, PokemonType.STEEL, -1, 10, -1, 4, 6)
       .attr(ProtectAttr, BattlerTagType.KINGS_SHIELD)
       .condition(failIfLastCondition),
-    new StatusMove(Moves.PLAY_NICE, Type.NORMAL, -1, 20, -1, 0, 6)
+    new StatusMove(Moves.PLAY_NICE, PokemonType.NORMAL, -1, 20, -1, 0, 6)
       .attr(StatStageChangeAttr, [ Stat.ATK ], -1)
-      .ignoresSubstitute(),
-    new StatusMove(Moves.CONFIDE, Type.NORMAL, -1, 20, -1, 0, 6)
+      .ignoresSubstitute()
+      .reflectable(),
+    new StatusMove(Moves.CONFIDE, PokemonType.NORMAL, -1, 20, -1, 0, 6)
       .attr(StatStageChangeAttr, [ Stat.SPATK ], -1)
-      .soundBased(),
-    new AttackMove(Moves.DIAMOND_STORM, Type.ROCK, MoveCategory.PHYSICAL, 100, 95, 5, 50, 0, 6)
+      .soundBased()
+      .reflectable(),
+    new AttackMove(Moves.DIAMOND_STORM, PokemonType.ROCK, MoveCategory.PHYSICAL, 100, 95, 5, 50, 0, 6)
       .attr(StatStageChangeAttr, [ Stat.DEF ], 2, true, { firstTargetOnly: true })
       .makesContact(false)
       .target(MoveTarget.ALL_NEAR_ENEMIES),
-    new AttackMove(Moves.STEAM_ERUPTION, Type.WATER, MoveCategory.SPECIAL, 110, 95, 5, 30, 0, 6)
+    new AttackMove(Moves.STEAM_ERUPTION, PokemonType.WATER, MoveCategory.SPECIAL, 110, 95, 5, 30, 0, 6)
       .attr(HealStatusEffectAttr, true, StatusEffect.FREEZE)
       .attr(HealStatusEffectAttr, false, StatusEffect.FREEZE)
       .attr(StatusEffectAttr, StatusEffect.BURN),
-    new AttackMove(Moves.HYPERSPACE_HOLE, Type.PSYCHIC, MoveCategory.SPECIAL, 80, -1, 5, -1, 0, 6)
+    new AttackMove(Moves.HYPERSPACE_HOLE, PokemonType.PSYCHIC, MoveCategory.SPECIAL, 80, -1, 5, -1, 0, 6)
       .ignoresProtect()
       .ignoresSubstitute(),
-    new AttackMove(Moves.WATER_SHURIKEN, Type.WATER, MoveCategory.SPECIAL, 15, 100, 20, -1, 1, 6)
+    new AttackMove(Moves.WATER_SHURIKEN, PokemonType.WATER, MoveCategory.SPECIAL, 15, 100, 20, -1, 1, 6)
       .attr(MultiHitAttr)
       .attr(WaterShurikenPowerAttr)
       .attr(WaterShurikenMultiHitTypeAttr),
-    new AttackMove(Moves.MYSTICAL_FIRE, Type.FIRE, MoveCategory.SPECIAL, 75, 100, 10, 100, 0, 6)
+    new AttackMove(Moves.MYSTICAL_FIRE, PokemonType.FIRE, MoveCategory.SPECIAL, 75, 100, 10, 100, 0, 6)
       .attr(StatStageChangeAttr, [ Stat.SPATK ], -1),
-    new SelfStatusMove(Moves.SPIKY_SHIELD, Type.GRASS, -1, 10, -1, 4, 6)
+    new SelfStatusMove(Moves.SPIKY_SHIELD, PokemonType.GRASS, -1, 10, -1, 4, 6)
       .attr(ProtectAttr, BattlerTagType.SPIKY_SHIELD)
       .condition(failIfLastCondition),
-    new StatusMove(Moves.AROMATIC_MIST, Type.FAIRY, -1, 20, -1, 0, 6)
+    new StatusMove(Moves.AROMATIC_MIST, PokemonType.FAIRY, -1, 20, -1, 0, 6)
       .attr(StatStageChangeAttr, [ Stat.SPDEF ], 1)
       .ignoresSubstitute()
       .condition(failIfSingleBattle)
       .target(MoveTarget.NEAR_ALLY),
-    new StatusMove(Moves.EERIE_IMPULSE, Type.ELECTRIC, 100, 15, -1, 0, 6)
-      .attr(StatStageChangeAttr, [ Stat.SPATK ], -2),
-    new StatusMove(Moves.VENOM_DRENCH, Type.POISON, 100, 20, -1, 0, 6)
+    new StatusMove(Moves.EERIE_IMPULSE, PokemonType.ELECTRIC, 100, 15, -1, 0, 6)
+      .attr(StatStageChangeAttr, [ Stat.SPATK ], -2)
+      .reflectable(),
+    new StatusMove(Moves.VENOM_DRENCH, PokemonType.POISON, 100, 20, -1, 0, 6)
       .attr(StatStageChangeAttr, [ Stat.ATK, Stat.SPATK, Stat.SPD ], -1, false, { condition: (user, target, move) => target.status?.effect === StatusEffect.POISON || target.status?.effect === StatusEffect.TOXIC })
-      .target(MoveTarget.ALL_NEAR_ENEMIES),
-    new StatusMove(Moves.POWDER, Type.BUG, 100, 20, -1, 1, 6)
+      .target(MoveTarget.ALL_NEAR_ENEMIES)
+      .reflectable(),
+    new StatusMove(Moves.POWDER, PokemonType.BUG, 100, 20, -1, 1, 6)
       .attr(AddBattlerTagAttr, BattlerTagType.POWDER, false, true)
       .ignoresSubstitute()
-      .powderMove(),
-    new ChargingSelfStatusMove(Moves.GEOMANCY, Type.FAIRY, -1, 10, -1, 0, 6)
+      .powderMove()
+      .reflectable(),
+    new ChargingSelfStatusMove(Moves.GEOMANCY, PokemonType.FAIRY, -1, 10, -1, 0, 6)
       .chargeText(i18next.t("moveTriggers:isChargingPower", { pokemonName: "{USER}" }))
       .attr(StatStageChangeAttr, [ Stat.SPATK, Stat.SPDEF, Stat.SPD ], 2, true),
-    new StatusMove(Moves.MAGNETIC_FLUX, Type.ELECTRIC, -1, 20, -1, 0, 6)
+    new StatusMove(Moves.MAGNETIC_FLUX, PokemonType.ELECTRIC, -1, 20, -1, 0, 6)
       .attr(StatStageChangeAttr, [ Stat.DEF, Stat.SPDEF ], 1, false, { condition: (user, target, move) => !![ Abilities.PLUS, Abilities.MINUS ].find(a => target.hasAbility(a, false)) })
       .ignoresSubstitute()
       .target(MoveTarget.USER_AND_ALLIES)
-      .condition((user, target, move) => !![ user, user.getAlly() ].filter(p => p?.isActive()).find(p => !![ Abilities.PLUS, Abilities.MINUS ].find(a => p.hasAbility(a, false)))),
-    new StatusMove(Moves.HAPPY_HOUR, Type.NORMAL, -1, 30, -1, 0, 6) // No animation
+      .condition((user, target, move) => !![ user, user.getAlly() ].filter(p => p?.isActive()).find(p => !![ Abilities.PLUS, Abilities.MINUS ].find(a => p?.hasAbility(a, false)))),
+    new StatusMove(Moves.HAPPY_HOUR, PokemonType.NORMAL, -1, 30, -1, 0, 6) // No animation
       .attr(AddArenaTagAttr, ArenaTagType.HAPPY_HOUR, null, true)
       .target(MoveTarget.USER_SIDE),
-    new StatusMove(Moves.ELECTRIC_TERRAIN, Type.ELECTRIC, -1, 10, -1, 0, 6)
+    new StatusMove(Moves.ELECTRIC_TERRAIN, PokemonType.ELECTRIC, -1, 10, -1, 0, 6)
       .attr(TerrainChangeAttr, TerrainType.ELECTRIC)
       .target(MoveTarget.BOTH_SIDES),
-    new AttackMove(Moves.DAZZLING_GLEAM, Type.FAIRY, MoveCategory.SPECIAL, 80, 100, 10, -1, 0, 6)
+    new AttackMove(Moves.DAZZLING_GLEAM, PokemonType.FAIRY, MoveCategory.SPECIAL, 80, 100, 10, -1, 0, 6)
       .target(MoveTarget.ALL_NEAR_ENEMIES),
-    new SelfStatusMove(Moves.CELEBRATE, Type.NORMAL, -1, 40, -1, 0, 6),
-    new StatusMove(Moves.HOLD_HANDS, Type.NORMAL, -1, 40, -1, 0, 6)
+    new SelfStatusMove(Moves.CELEBRATE, PokemonType.NORMAL, -1, 40, -1, 0, 6)
+      .attr(CelebrateAttr),
+    new StatusMove(Moves.HOLD_HANDS, PokemonType.NORMAL, -1, 40, -1, 0, 6)
       .ignoresSubstitute()
       .target(MoveTarget.NEAR_ALLY),
-    new StatusMove(Moves.BABY_DOLL_EYES, Type.FAIRY, 100, 30, -1, 1, 6)
-      .attr(StatStageChangeAttr, [ Stat.ATK ], -1),
-    new AttackMove(Moves.NUZZLE, Type.ELECTRIC, MoveCategory.PHYSICAL, 20, 100, 20, 100, 0, 6)
+    new StatusMove(Moves.BABY_DOLL_EYES, PokemonType.FAIRY, 100, 30, -1, 1, 6)
+      .attr(StatStageChangeAttr, [ Stat.ATK ], -1)
+      .reflectable(),
+    new AttackMove(Moves.NUZZLE, PokemonType.ELECTRIC, MoveCategory.PHYSICAL, 20, 100, 20, 100, 0, 6)
       .attr(StatusEffectAttr, StatusEffect.PARALYSIS),
-    new AttackMove(Moves.HOLD_BACK, Type.NORMAL, MoveCategory.PHYSICAL, 40, 100, 40, -1, 0, 6)
+    new AttackMove(Moves.HOLD_BACK, PokemonType.NORMAL, MoveCategory.PHYSICAL, 40, 100, 40, -1, 0, 6)
       .attr(SurviveDamageAttr),
-    new AttackMove(Moves.INFESTATION, Type.BUG, MoveCategory.SPECIAL, 20, 100, 20, -1, 0, 6)
+    new AttackMove(Moves.INFESTATION, PokemonType.BUG, MoveCategory.SPECIAL, 20, 100, 20, -1, 0, 6)
       .makesContact()
       .attr(TrapAttr, BattlerTagType.INFESTATION),
-    new AttackMove(Moves.POWER_UP_PUNCH, Type.FIGHTING, MoveCategory.PHYSICAL, 40, 100, 20, 100, 0, 6)
+    new AttackMove(Moves.POWER_UP_PUNCH, PokemonType.FIGHTING, MoveCategory.PHYSICAL, 40, 100, 20, 100, 0, 6)
       .attr(StatStageChangeAttr, [ Stat.ATK ], 1, true)
       .punchingMove(),
-    new AttackMove(Moves.OBLIVION_WING, Type.FLYING, MoveCategory.SPECIAL, 80, 100, 10, -1, 0, 6)
+    new AttackMove(Moves.OBLIVION_WING, PokemonType.FLYING, MoveCategory.SPECIAL, 80, 100, 10, -1, 0, 6)
       .attr(HitHealAttr, 0.75)
       .triageMove(),
-    new AttackMove(Moves.THOUSAND_ARROWS, Type.GROUND, MoveCategory.PHYSICAL, 90, 100, 10, -1, 0, 6)
+    new AttackMove(Moves.THOUSAND_ARROWS, PokemonType.GROUND, MoveCategory.PHYSICAL, 90, 100, 10, -1, 0, 6)
       .attr(NeutralDamageAgainstFlyingTypeMultiplierAttr)
-      .attr(AddBattlerTagAttr, BattlerTagType.IGNORE_FLYING, false, false, 1, 1, true)
+      .attr(FallDownAttr)
       .attr(HitsTagAttr, BattlerTagType.FLYING)
       .attr(HitsTagAttr, BattlerTagType.FLOATING)
       .attr(AddBattlerTagAttr, BattlerTagType.INTERRUPTED)
       .attr(RemoveBattlerTagAttr, [ BattlerTagType.FLYING, BattlerTagType.FLOATING, BattlerTagType.TELEKINESIS ])
       .makesContact(false)
       .target(MoveTarget.ALL_NEAR_ENEMIES),
-    new AttackMove(Moves.THOUSAND_WAVES, Type.GROUND, MoveCategory.PHYSICAL, 90, 100, 10, -1, 0, 6)
+    new AttackMove(Moves.THOUSAND_WAVES, PokemonType.GROUND, MoveCategory.PHYSICAL, 90, 100, 10, -1, 0, 6)
       .attr(AddBattlerTagAttr, BattlerTagType.TRAPPED, false, false, 1, 1, true)
       .makesContact(false)
       .target(MoveTarget.ALL_NEAR_ENEMIES),
-    new AttackMove(Moves.LANDS_WRATH, Type.GROUND, MoveCategory.PHYSICAL, 90, 100, 10, -1, 0, 6)
+    new AttackMove(Moves.LANDS_WRATH, PokemonType.GROUND, MoveCategory.PHYSICAL, 90, 100, 10, -1, 0, 6)
       .makesContact(false)
       .target(MoveTarget.ALL_NEAR_ENEMIES),
-    new AttackMove(Moves.LIGHT_OF_RUIN, Type.FAIRY, MoveCategory.SPECIAL, 140, 90, 5, -1, 0, 6)
+    new AttackMove(Moves.LIGHT_OF_RUIN, PokemonType.FAIRY, MoveCategory.SPECIAL, 140, 90, 5, -1, 0, 6)
       .attr(RecoilAttr, false, 0.5)
       .recklessMove(),
-    new AttackMove(Moves.ORIGIN_PULSE, Type.WATER, MoveCategory.SPECIAL, 110, 85, 10, -1, 0, 6)
+    new AttackMove(Moves.ORIGIN_PULSE, PokemonType.WATER, MoveCategory.SPECIAL, 110, 85, 10, -1, 0, 6)
       .pulseMove()
       .target(MoveTarget.ALL_NEAR_ENEMIES),
-    new AttackMove(Moves.PRECIPICE_BLADES, Type.GROUND, MoveCategory.PHYSICAL, 120, 85, 10, -1, 0, 6)
+    new AttackMove(Moves.PRECIPICE_BLADES, PokemonType.GROUND, MoveCategory.PHYSICAL, 120, 85, 10, -1, 0, 6)
       .makesContact(false)
       .target(MoveTarget.ALL_NEAR_ENEMIES),
-    new AttackMove(Moves.DRAGON_ASCENT, Type.FLYING, MoveCategory.PHYSICAL, 120, 100, 5, -1, 0, 6)
+    new AttackMove(Moves.DRAGON_ASCENT, PokemonType.FLYING, MoveCategory.PHYSICAL, 120, 100, 5, -1, 0, 6)
       .attr(StatStageChangeAttr, [ Stat.DEF, Stat.SPDEF ], -1, true),
-    new AttackMove(Moves.HYPERSPACE_FURY, Type.DARK, MoveCategory.PHYSICAL, 100, -1, 5, -1, 0, 6)
+    new AttackMove(Moves.HYPERSPACE_FURY, PokemonType.DARK, MoveCategory.PHYSICAL, 100, -1, 5, -1, 0, 6)
       .attr(StatStageChangeAttr, [ Stat.DEF ], -1, true)
       .ignoresSubstitute()
       .makesContact(false)
       .ignoresProtect(),
     /* Unused */
-    new AttackMove(Moves.BREAKNECK_BLITZ__PHYSICAL, Type.NORMAL, MoveCategory.PHYSICAL, -1, -1, 1, -1, 0, 7)
+    new AttackMove(Moves.BREAKNECK_BLITZ__PHYSICAL, PokemonType.NORMAL, MoveCategory.PHYSICAL, -1, -1, 1, -1, 0, 7)
       .unimplemented(),
-    new AttackMove(Moves.BREAKNECK_BLITZ__SPECIAL, Type.NORMAL, MoveCategory.SPECIAL, -1, -1, 1, -1, 0, 7)
+    new AttackMove(Moves.BREAKNECK_BLITZ__SPECIAL, PokemonType.NORMAL, MoveCategory.SPECIAL, -1, -1, 1, -1, 0, 7)
       .unimplemented(),
-    new AttackMove(Moves.ALL_OUT_PUMMELING__PHYSICAL, Type.FIGHTING, MoveCategory.PHYSICAL, -1, -1, 1, -1, 0, 7)
+    new AttackMove(Moves.ALL_OUT_PUMMELING__PHYSICAL, PokemonType.FIGHTING, MoveCategory.PHYSICAL, -1, -1, 1, -1, 0, 7)
       .unimplemented(),
-    new AttackMove(Moves.ALL_OUT_PUMMELING__SPECIAL, Type.FIGHTING, MoveCategory.SPECIAL, -1, -1, 1, -1, 0, 7)
+    new AttackMove(Moves.ALL_OUT_PUMMELING__SPECIAL, PokemonType.FIGHTING, MoveCategory.SPECIAL, -1, -1, 1, -1, 0, 7)
       .unimplemented(),
-    new AttackMove(Moves.SUPERSONIC_SKYSTRIKE__PHYSICAL, Type.FLYING, MoveCategory.PHYSICAL, -1, -1, 1, -1, 0, 7)
+    new AttackMove(Moves.SUPERSONIC_SKYSTRIKE__PHYSICAL, PokemonType.FLYING, MoveCategory.PHYSICAL, -1, -1, 1, -1, 0, 7)
       .unimplemented(),
-    new AttackMove(Moves.SUPERSONIC_SKYSTRIKE__SPECIAL, Type.FLYING, MoveCategory.SPECIAL, -1, -1, 1, -1, 0, 7)
+    new AttackMove(Moves.SUPERSONIC_SKYSTRIKE__SPECIAL, PokemonType.FLYING, MoveCategory.SPECIAL, -1, -1, 1, -1, 0, 7)
       .unimplemented(),
-    new AttackMove(Moves.ACID_DOWNPOUR__PHYSICAL, Type.POISON, MoveCategory.PHYSICAL, -1, -1, 1, -1, 0, 7)
+    new AttackMove(Moves.ACID_DOWNPOUR__PHYSICAL, PokemonType.POISON, MoveCategory.PHYSICAL, -1, -1, 1, -1, 0, 7)
       .unimplemented(),
-    new AttackMove(Moves.ACID_DOWNPOUR__SPECIAL, Type.POISON, MoveCategory.SPECIAL, -1, -1, 1, -1, 0, 7)
+    new AttackMove(Moves.ACID_DOWNPOUR__SPECIAL, PokemonType.POISON, MoveCategory.SPECIAL, -1, -1, 1, -1, 0, 7)
       .unimplemented(),
-    new AttackMove(Moves.TECTONIC_RAGE__PHYSICAL, Type.GROUND, MoveCategory.PHYSICAL, -1, -1, 1, -1, 0, 7)
+    new AttackMove(Moves.TECTONIC_RAGE__PHYSICAL, PokemonType.GROUND, MoveCategory.PHYSICAL, -1, -1, 1, -1, 0, 7)
       .unimplemented(),
-    new AttackMove(Moves.TECTONIC_RAGE__SPECIAL, Type.GROUND, MoveCategory.SPECIAL, -1, -1, 1, -1, 0, 7)
+    new AttackMove(Moves.TECTONIC_RAGE__SPECIAL, PokemonType.GROUND, MoveCategory.SPECIAL, -1, -1, 1, -1, 0, 7)
       .unimplemented(),
-    new AttackMove(Moves.CONTINENTAL_CRUSH__PHYSICAL, Type.ROCK, MoveCategory.PHYSICAL, -1, -1, 1, -1, 0, 7)
+    new AttackMove(Moves.CONTINENTAL_CRUSH__PHYSICAL, PokemonType.ROCK, MoveCategory.PHYSICAL, -1, -1, 1, -1, 0, 7)
       .unimplemented(),
-    new AttackMove(Moves.CONTINENTAL_CRUSH__SPECIAL, Type.ROCK, MoveCategory.SPECIAL, -1, -1, 1, -1, 0, 7)
+    new AttackMove(Moves.CONTINENTAL_CRUSH__SPECIAL, PokemonType.ROCK, MoveCategory.SPECIAL, -1, -1, 1, -1, 0, 7)
       .unimplemented(),
-    new AttackMove(Moves.SAVAGE_SPIN_OUT__PHYSICAL, Type.BUG, MoveCategory.PHYSICAL, -1, -1, 1, -1, 0, 7)
+    new AttackMove(Moves.SAVAGE_SPIN_OUT__PHYSICAL, PokemonType.BUG, MoveCategory.PHYSICAL, -1, -1, 1, -1, 0, 7)
       .unimplemented(),
-    new AttackMove(Moves.SAVAGE_SPIN_OUT__SPECIAL, Type.BUG, MoveCategory.SPECIAL, -1, -1, 1, -1, 0, 7)
+    new AttackMove(Moves.SAVAGE_SPIN_OUT__SPECIAL, PokemonType.BUG, MoveCategory.SPECIAL, -1, -1, 1, -1, 0, 7)
       .unimplemented(),
-    new AttackMove(Moves.NEVER_ENDING_NIGHTMARE__PHYSICAL, Type.GHOST, MoveCategory.PHYSICAL, -1, -1, 1, -1, 0, 7)
+    new AttackMove(Moves.NEVER_ENDING_NIGHTMARE__PHYSICAL, PokemonType.GHOST, MoveCategory.PHYSICAL, -1, -1, 1, -1, 0, 7)
       .unimplemented(),
-    new AttackMove(Moves.NEVER_ENDING_NIGHTMARE__SPECIAL, Type.GHOST, MoveCategory.SPECIAL, -1, -1, 1, -1, 0, 7)
+    new AttackMove(Moves.NEVER_ENDING_NIGHTMARE__SPECIAL, PokemonType.GHOST, MoveCategory.SPECIAL, -1, -1, 1, -1, 0, 7)
       .unimplemented(),
-    new AttackMove(Moves.CORKSCREW_CRASH__PHYSICAL, Type.STEEL, MoveCategory.PHYSICAL, -1, -1, 1, -1, 0, 7)
+    new AttackMove(Moves.CORKSCREW_CRASH__PHYSICAL, PokemonType.STEEL, MoveCategory.PHYSICAL, -1, -1, 1, -1, 0, 7)
       .unimplemented(),
-    new AttackMove(Moves.CORKSCREW_CRASH__SPECIAL, Type.STEEL, MoveCategory.SPECIAL, -1, -1, 1, -1, 0, 7)
+    new AttackMove(Moves.CORKSCREW_CRASH__SPECIAL, PokemonType.STEEL, MoveCategory.SPECIAL, -1, -1, 1, -1, 0, 7)
       .unimplemented(),
-    new AttackMove(Moves.INFERNO_OVERDRIVE__PHYSICAL, Type.FIRE, MoveCategory.PHYSICAL, -1, -1, 1, -1, 0, 7)
+    new AttackMove(Moves.INFERNO_OVERDRIVE__PHYSICAL, PokemonType.FIRE, MoveCategory.PHYSICAL, -1, -1, 1, -1, 0, 7)
       .unimplemented(),
-    new AttackMove(Moves.INFERNO_OVERDRIVE__SPECIAL, Type.FIRE, MoveCategory.SPECIAL, -1, -1, 1, -1, 0, 7)
+    new AttackMove(Moves.INFERNO_OVERDRIVE__SPECIAL, PokemonType.FIRE, MoveCategory.SPECIAL, -1, -1, 1, -1, 0, 7)
       .unimplemented(),
-    new AttackMove(Moves.HYDRO_VORTEX__PHYSICAL, Type.WATER, MoveCategory.PHYSICAL, -1, -1, 1, -1, 0, 7)
+    new AttackMove(Moves.HYDRO_VORTEX__PHYSICAL, PokemonType.WATER, MoveCategory.PHYSICAL, -1, -1, 1, -1, 0, 7)
       .unimplemented(),
-    new AttackMove(Moves.HYDRO_VORTEX__SPECIAL, Type.WATER, MoveCategory.SPECIAL, -1, -1, 1, -1, 0, 7)
+    new AttackMove(Moves.HYDRO_VORTEX__SPECIAL, PokemonType.WATER, MoveCategory.SPECIAL, -1, -1, 1, -1, 0, 7)
       .unimplemented(),
-    new AttackMove(Moves.BLOOM_DOOM__PHYSICAL, Type.GRASS, MoveCategory.PHYSICAL, -1, -1, 1, -1, 0, 7)
+    new AttackMove(Moves.BLOOM_DOOM__PHYSICAL, PokemonType.GRASS, MoveCategory.PHYSICAL, -1, -1, 1, -1, 0, 7)
       .unimplemented(),
-    new AttackMove(Moves.BLOOM_DOOM__SPECIAL, Type.GRASS, MoveCategory.SPECIAL, -1, -1, 1, -1, 0, 7)
+    new AttackMove(Moves.BLOOM_DOOM__SPECIAL, PokemonType.GRASS, MoveCategory.SPECIAL, -1, -1, 1, -1, 0, 7)
       .unimplemented(),
-    new AttackMove(Moves.GIGAVOLT_HAVOC__PHYSICAL, Type.ELECTRIC, MoveCategory.PHYSICAL, -1, -1, 1, -1, 0, 7)
+    new AttackMove(Moves.GIGAVOLT_HAVOC__PHYSICAL, PokemonType.ELECTRIC, MoveCategory.PHYSICAL, -1, -1, 1, -1, 0, 7)
       .unimplemented(),
-    new AttackMove(Moves.GIGAVOLT_HAVOC__SPECIAL, Type.ELECTRIC, MoveCategory.SPECIAL, -1, -1, 1, -1, 0, 7)
+    new AttackMove(Moves.GIGAVOLT_HAVOC__SPECIAL, PokemonType.ELECTRIC, MoveCategory.SPECIAL, -1, -1, 1, -1, 0, 7)
       .unimplemented(),
-    new AttackMove(Moves.SHATTERED_PSYCHE__PHYSICAL, Type.PSYCHIC, MoveCategory.PHYSICAL, -1, -1, 1, -1, 0, 7)
+    new AttackMove(Moves.SHATTERED_PSYCHE__PHYSICAL, PokemonType.PSYCHIC, MoveCategory.PHYSICAL, -1, -1, 1, -1, 0, 7)
       .unimplemented(),
-    new AttackMove(Moves.SHATTERED_PSYCHE__SPECIAL, Type.PSYCHIC, MoveCategory.SPECIAL, -1, -1, 1, -1, 0, 7)
+    new AttackMove(Moves.SHATTERED_PSYCHE__SPECIAL, PokemonType.PSYCHIC, MoveCategory.SPECIAL, -1, -1, 1, -1, 0, 7)
       .unimplemented(),
-    new AttackMove(Moves.SUBZERO_SLAMMER__PHYSICAL, Type.ICE, MoveCategory.PHYSICAL, -1, -1, 1, -1, 0, 7)
+    new AttackMove(Moves.SUBZERO_SLAMMER__PHYSICAL, PokemonType.ICE, MoveCategory.PHYSICAL, -1, -1, 1, -1, 0, 7)
       .unimplemented(),
-    new AttackMove(Moves.SUBZERO_SLAMMER__SPECIAL, Type.ICE, MoveCategory.SPECIAL, -1, -1, 1, -1, 0, 7)
+    new AttackMove(Moves.SUBZERO_SLAMMER__SPECIAL, PokemonType.ICE, MoveCategory.SPECIAL, -1, -1, 1, -1, 0, 7)
       .unimplemented(),
-    new AttackMove(Moves.DEVASTATING_DRAKE__PHYSICAL, Type.DRAGON, MoveCategory.PHYSICAL, -1, -1, 1, -1, 0, 7)
+    new AttackMove(Moves.DEVASTATING_DRAKE__PHYSICAL, PokemonType.DRAGON, MoveCategory.PHYSICAL, -1, -1, 1, -1, 0, 7)
       .unimplemented(),
-    new AttackMove(Moves.DEVASTATING_DRAKE__SPECIAL, Type.DRAGON, MoveCategory.SPECIAL, -1, -1, 1, -1, 0, 7)
+    new AttackMove(Moves.DEVASTATING_DRAKE__SPECIAL, PokemonType.DRAGON, MoveCategory.SPECIAL, -1, -1, 1, -1, 0, 7)
       .unimplemented(),
-    new AttackMove(Moves.BLACK_HOLE_ECLIPSE__PHYSICAL, Type.DARK, MoveCategory.PHYSICAL, -1, -1, 1, -1, 0, 7)
+    new AttackMove(Moves.BLACK_HOLE_ECLIPSE__PHYSICAL, PokemonType.DARK, MoveCategory.PHYSICAL, -1, -1, 1, -1, 0, 7)
       .unimplemented(),
-    new AttackMove(Moves.BLACK_HOLE_ECLIPSE__SPECIAL, Type.DARK, MoveCategory.SPECIAL, -1, -1, 1, -1, 0, 7)
+    new AttackMove(Moves.BLACK_HOLE_ECLIPSE__SPECIAL, PokemonType.DARK, MoveCategory.SPECIAL, -1, -1, 1, -1, 0, 7)
       .unimplemented(),
-    new AttackMove(Moves.TWINKLE_TACKLE__PHYSICAL, Type.FAIRY, MoveCategory.PHYSICAL, -1, -1, 1, -1, 0, 7)
+    new AttackMove(Moves.TWINKLE_TACKLE__PHYSICAL, PokemonType.FAIRY, MoveCategory.PHYSICAL, -1, -1, 1, -1, 0, 7)
       .unimplemented(),
-    new AttackMove(Moves.TWINKLE_TACKLE__SPECIAL, Type.FAIRY, MoveCategory.SPECIAL, -1, -1, 1, -1, 0, 7)
+    new AttackMove(Moves.TWINKLE_TACKLE__SPECIAL, PokemonType.FAIRY, MoveCategory.SPECIAL, -1, -1, 1, -1, 0, 7)
       .unimplemented(),
-    new AttackMove(Moves.CATASTROPIKA, Type.ELECTRIC, MoveCategory.PHYSICAL, 210, -1, 1, -1, 0, 7)
+    new AttackMove(Moves.CATASTROPIKA, PokemonType.ELECTRIC, MoveCategory.PHYSICAL, 210, -1, 1, -1, 0, 7)
       .unimplemented(),
     /* End Unused */
-    new SelfStatusMove(Moves.SHORE_UP, Type.GROUND, -1, 5, -1, 0, 7)
+    new SelfStatusMove(Moves.SHORE_UP, PokemonType.GROUND, -1, 5, -1, 0, 7)
       .attr(SandHealAttr)
       .triageMove(),
-    new AttackMove(Moves.FIRST_IMPRESSION, Type.BUG, MoveCategory.PHYSICAL, 90, 100, 10, -1, 2, 7)
+    new AttackMove(Moves.FIRST_IMPRESSION, PokemonType.BUG, MoveCategory.PHYSICAL, 90, 100, 10, -1, 2, 7)
       .condition(new FirstMoveCondition()),
-    new SelfStatusMove(Moves.BANEFUL_BUNKER, Type.POISON, -1, 10, -1, 4, 7)
+    new SelfStatusMove(Moves.BANEFUL_BUNKER, PokemonType.POISON, -1, 10, -1, 4, 7)
       .attr(ProtectAttr, BattlerTagType.BANEFUL_BUNKER)
       .condition(failIfLastCondition),
-    new AttackMove(Moves.SPIRIT_SHACKLE, Type.GHOST, MoveCategory.PHYSICAL, 80, 100, 10, 100, 0, 7)
+    new AttackMove(Moves.SPIRIT_SHACKLE, PokemonType.GHOST, MoveCategory.PHYSICAL, 80, 100, 10, 100, 0, 7)
       .attr(AddBattlerTagAttr, BattlerTagType.TRAPPED, false, false, 1, 1, true)
       .makesContact(false),
-    new AttackMove(Moves.DARKEST_LARIAT, Type.DARK, MoveCategory.PHYSICAL, 85, 100, 10, -1, 0, 7)
+    new AttackMove(Moves.DARKEST_LARIAT, PokemonType.DARK, MoveCategory.PHYSICAL, 85, 100, 10, -1, 0, 7)
       .attr(IgnoreOpponentStatStagesAttr),
-    new AttackMove(Moves.SPARKLING_ARIA, Type.WATER, MoveCategory.SPECIAL, 90, 100, 10, 100, 0, 7)
+    new AttackMove(Moves.SPARKLING_ARIA, PokemonType.WATER, MoveCategory.SPECIAL, 90, 100, 10, 100, 0, 7)
       .attr(HealStatusEffectAttr, false, StatusEffect.BURN)
       .soundBased()
       .target(MoveTarget.ALL_NEAR_OTHERS),
-    new AttackMove(Moves.ICE_HAMMER, Type.ICE, MoveCategory.PHYSICAL, 100, 90, 10, -1, 0, 7)
+    new AttackMove(Moves.ICE_HAMMER, PokemonType.ICE, MoveCategory.PHYSICAL, 100, 90, 10, -1, 0, 7)
       .attr(StatStageChangeAttr, [ Stat.SPD ], -1, true)
       .punchingMove(),
-    new StatusMove(Moves.FLORAL_HEALING, Type.FAIRY, -1, 10, -1, 0, 7)
+    new StatusMove(Moves.FLORAL_HEALING, PokemonType.FAIRY, -1, 10, -1, 0, 7)
       .attr(BoostHealAttr, 0.5, 2 / 3, true, false, (user, target, move) => globalScene.arena.terrain?.terrainType === TerrainType.GRASSY)
-      .triageMove(),
-    new AttackMove(Moves.HIGH_HORSEPOWER, Type.GROUND, MoveCategory.PHYSICAL, 95, 95, 10, -1, 0, 7),
-    new StatusMove(Moves.STRENGTH_SAP, Type.GRASS, 100, 10, -1, 0, 7)
+      .triageMove()
+      .reflectable(),
+    new AttackMove(Moves.HIGH_HORSEPOWER, PokemonType.GROUND, MoveCategory.PHYSICAL, 95, 95, 10, -1, 0, 7),
+    new StatusMove(Moves.STRENGTH_SAP, PokemonType.GRASS, 100, 10, -1, 0, 7)
       .attr(HitHealAttr, null, Stat.ATK)
       .attr(StatStageChangeAttr, [ Stat.ATK ], -1)
       .condition((user, target, move) => target.getStatStage(Stat.ATK) > -6)
-      .triageMove(),
-    new ChargingAttackMove(Moves.SOLAR_BLADE, Type.GRASS, MoveCategory.PHYSICAL, 125, 100, 10, -1, 0, 7)
+      .triageMove()
+      .reflectable(),
+    new ChargingAttackMove(Moves.SOLAR_BLADE, PokemonType.GRASS, MoveCategory.PHYSICAL, 125, 100, 10, -1, 0, 7)
       .chargeText(i18next.t("moveTriggers:isGlowing", { pokemonName: "{USER}" }))
       .chargeAttr(WeatherInstantChargeAttr, [ WeatherType.SUNNY, WeatherType.HARSH_SUN ])
       .attr(AntiSunlightPowerDecreaseAttr)
       .slicingMove(),
-    new AttackMove(Moves.LEAFAGE, Type.GRASS, MoveCategory.PHYSICAL, 40, 100, 40, -1, 0, 7)
+    new AttackMove(Moves.LEAFAGE, PokemonType.GRASS, MoveCategory.PHYSICAL, 40, 100, 40, -1, 0, 7)
       .makesContact(false),
-    new StatusMove(Moves.SPOTLIGHT, Type.NORMAL, -1, 15, -1, 3, 7)
+    new StatusMove(Moves.SPOTLIGHT, PokemonType.NORMAL, -1, 15, -1, 3, 7)
       .attr(AddBattlerTagAttr, BattlerTagType.CENTER_OF_ATTENTION, false)
-      .condition(failIfSingleBattle),
-    new StatusMove(Moves.TOXIC_THREAD, Type.POISON, 100, 20, -1, 0, 7)
+      .condition(failIfSingleBattle)
+      .reflectable(),
+    new StatusMove(Moves.TOXIC_THREAD, PokemonType.POISON, 100, 20, -1, 0, 7)
       .attr(StatusEffectAttr, StatusEffect.POISON)
-      .attr(StatStageChangeAttr, [ Stat.SPD ], -1),
-    new SelfStatusMove(Moves.LASER_FOCUS, Type.NORMAL, -1, 30, -1, 0, 7)
+      .attr(StatStageChangeAttr, [ Stat.SPD ], -1)
+      .reflectable(),
+    new SelfStatusMove(Moves.LASER_FOCUS, PokemonType.NORMAL, -1, 30, -1, 0, 7)
       .attr(AddBattlerTagAttr, BattlerTagType.ALWAYS_CRIT, true, false),
-    new StatusMove(Moves.GEAR_UP, Type.STEEL, -1, 20, -1, 0, 7)
+    new StatusMove(Moves.GEAR_UP, PokemonType.STEEL, -1, 20, -1, 0, 7)
       .attr(StatStageChangeAttr, [ Stat.ATK, Stat.SPATK ], 1, false, { condition: (user, target, move) => !![ Abilities.PLUS, Abilities.MINUS ].find(a => target.hasAbility(a, false)) })
       .ignoresSubstitute()
       .target(MoveTarget.USER_AND_ALLIES)
-      .condition((user, target, move) => !![ user, user.getAlly() ].filter(p => p?.isActive()).find(p => !![ Abilities.PLUS, Abilities.MINUS ].find(a => p.hasAbility(a, false)))),
-    new AttackMove(Moves.THROAT_CHOP, Type.DARK, MoveCategory.PHYSICAL, 80, 100, 15, 100, 0, 7)
+      .condition((user, target, move) => !![ user, user.getAlly() ].filter(p => p?.isActive()).find(p => !![ Abilities.PLUS, Abilities.MINUS ].find(a => p?.hasAbility(a, false)))),
+    new AttackMove(Moves.THROAT_CHOP, PokemonType.DARK, MoveCategory.PHYSICAL, 80, 100, 15, 100, 0, 7)
       .attr(AddBattlerTagAttr, BattlerTagType.THROAT_CHOPPED),
-    new AttackMove(Moves.POLLEN_PUFF, Type.BUG, MoveCategory.SPECIAL, 90, 100, 15, -1, 0, 7)
+    new AttackMove(Moves.POLLEN_PUFF, PokemonType.BUG, MoveCategory.SPECIAL, 90, 100, 15, -1, 0, 7)
       .attr(StatusCategoryOnAllyAttr)
       .attr(HealOnAllyAttr, 0.5, true, false)
       .ballBombMove(),
-    new AttackMove(Moves.ANCHOR_SHOT, Type.STEEL, MoveCategory.PHYSICAL, 80, 100, 20, 100, 0, 7)
+    new AttackMove(Moves.ANCHOR_SHOT, PokemonType.STEEL, MoveCategory.PHYSICAL, 80, 100, 20, 100, 0, 7)
       .attr(AddBattlerTagAttr, BattlerTagType.TRAPPED, false, false, 1, 1, true),
-    new StatusMove(Moves.PSYCHIC_TERRAIN, Type.PSYCHIC, -1, 10, -1, 0, 7)
+    new StatusMove(Moves.PSYCHIC_TERRAIN, PokemonType.PSYCHIC, -1, 10, -1, 0, 7)
       .attr(TerrainChangeAttr, TerrainType.PSYCHIC)
       .target(MoveTarget.BOTH_SIDES),
-    new AttackMove(Moves.LUNGE, Type.BUG, MoveCategory.PHYSICAL, 80, 100, 15, 100, 0, 7)
+    new AttackMove(Moves.LUNGE, PokemonType.BUG, MoveCategory.PHYSICAL, 80, 100, 15, 100, 0, 7)
       .attr(StatStageChangeAttr, [ Stat.ATK ], -1),
-    new AttackMove(Moves.FIRE_LASH, Type.FIRE, MoveCategory.PHYSICAL, 80, 100, 15, 100, 0, 7)
+    new AttackMove(Moves.FIRE_LASH, PokemonType.FIRE, MoveCategory.PHYSICAL, 80, 100, 15, 100, 0, 7)
       .attr(StatStageChangeAttr, [ Stat.DEF ], -1),
-    new AttackMove(Moves.POWER_TRIP, Type.DARK, MoveCategory.PHYSICAL, 20, 100, 10, -1, 0, 7)
+    new AttackMove(Moves.POWER_TRIP, PokemonType.DARK, MoveCategory.PHYSICAL, 20, 100, 10, -1, 0, 7)
       .attr(PositiveStatStagePowerAttr),
-    new AttackMove(Moves.BURN_UP, Type.FIRE, MoveCategory.SPECIAL, 130, 100, 5, -1, 0, 7)
+    new AttackMove(Moves.BURN_UP, PokemonType.FIRE, MoveCategory.SPECIAL, 130, 100, 5, -1, 0, 7)
       .condition((user) => {
         const userTypes = user.getTypes(true);
-        return userTypes.includes(Type.FIRE);
+        return userTypes.includes(PokemonType.FIRE);
       })
       .attr(HealStatusEffectAttr, true, StatusEffect.FREEZE)
       .attr(AddBattlerTagAttr, BattlerTagType.BURNED_UP, true, false)
-      .attr(RemoveTypeAttr, Type.FIRE, (user) => {
+      .attr(RemoveTypeAttr, PokemonType.FIRE, (user) => {
         globalScene.queueMessage(i18next.t("moveTriggers:burnedItselfOut", { pokemonName: getPokemonNameWithAffix(user) }));
       }),
-    new StatusMove(Moves.SPEED_SWAP, Type.PSYCHIC, -1, 10, -1, 0, 7)
+    new StatusMove(Moves.SPEED_SWAP, PokemonType.PSYCHIC, -1, 10, -1, 0, 7)
       .attr(SwapStatAttr, Stat.SPD)
       .ignoresSubstitute(),
-    new AttackMove(Moves.SMART_STRIKE, Type.STEEL, MoveCategory.PHYSICAL, 70, -1, 10, -1, 0, 7),
-    new StatusMove(Moves.PURIFY, Type.POISON, -1, 20, -1, 0, 7)
-      .condition(
-        (user: Pokemon, target: Pokemon, move: Move) => isNonVolatileStatusEffect(target.status?.effect!)) // TODO: is this bang correct?
+    new AttackMove(Moves.SMART_STRIKE, PokemonType.STEEL, MoveCategory.PHYSICAL, 70, -1, 10, -1, 0, 7),
+    new StatusMove(Moves.PURIFY, PokemonType.POISON, -1, 20, -1, 0, 7)
+      .condition((user, target, move) => {
+        if (!target.status) {
+          return false;
+        }
+        return isNonVolatileStatusEffect(target.status.effect);
+      })
       .attr(HealAttr, 0.5)
       .attr(HealStatusEffectAttr, false, getNonVolatileStatusEffects())
-      .triageMove(),
-    new AttackMove(Moves.REVELATION_DANCE, Type.NORMAL, MoveCategory.SPECIAL, 90, 100, 15, -1, 0, 7)
+      .triageMove()
+      .reflectable(),
+    new AttackMove(Moves.REVELATION_DANCE, PokemonType.NORMAL, MoveCategory.SPECIAL, 90, 100, 15, -1, 0, 7)
       .danceMove()
       .attr(MatchUserTypeAttr),
-    new AttackMove(Moves.CORE_ENFORCER, Type.DRAGON, MoveCategory.SPECIAL, 100, 100, 10, -1, 0, 7)
+    new AttackMove(Moves.CORE_ENFORCER, PokemonType.DRAGON, MoveCategory.SPECIAL, 100, 100, 10, -1, 0, 7)
       .target(MoveTarget.ALL_NEAR_ENEMIES)
       .attr(SuppressAbilitiesIfActedAttr),
-    new AttackMove(Moves.TROP_KICK, Type.GRASS, MoveCategory.PHYSICAL, 70, 100, 15, 100, 0, 7)
+    new AttackMove(Moves.TROP_KICK, PokemonType.GRASS, MoveCategory.PHYSICAL, 70, 100, 15, 100, 0, 7)
       .attr(StatStageChangeAttr, [ Stat.ATK ], -1),
-    new StatusMove(Moves.INSTRUCT, Type.PSYCHIC, -1, 15, -1, 0, 7)
+    new StatusMove(Moves.INSTRUCT, PokemonType.PSYCHIC, -1, 15, -1, 0, 7)
       .ignoresSubstitute()
       .attr(RepeatMoveAttr)
       // incorrect interactions with Gigaton Hammer, Blood Moon & Torment
       // Also has incorrect interactions with Dancer due to the latter
       // erroneously adding copied moves to move history.
       .edgeCase(),
-    new AttackMove(Moves.BEAK_BLAST, Type.FLYING, MoveCategory.PHYSICAL, 100, 100, 15, -1, -3, 7)
+    new AttackMove(Moves.BEAK_BLAST, PokemonType.FLYING, MoveCategory.PHYSICAL, 100, 100, 15, -1, -3, 7)
       .attr(BeakBlastHeaderAttr)
       .ballBombMove()
       .makesContact(false),
-    new AttackMove(Moves.CLANGING_SCALES, Type.DRAGON, MoveCategory.SPECIAL, 110, 100, 5, -1, 0, 7)
+    new AttackMove(Moves.CLANGING_SCALES, PokemonType.DRAGON, MoveCategory.SPECIAL, 110, 100, 5, -1, 0, 7)
       .attr(StatStageChangeAttr, [ Stat.DEF ], -1, true, { firstTargetOnly: true })
       .soundBased()
       .target(MoveTarget.ALL_NEAR_ENEMIES),
-    new AttackMove(Moves.DRAGON_HAMMER, Type.DRAGON, MoveCategory.PHYSICAL, 90, 100, 15, -1, 0, 7),
-    new AttackMove(Moves.BRUTAL_SWING, Type.DARK, MoveCategory.PHYSICAL, 60, 100, 20, -1, 0, 7)
+    new AttackMove(Moves.DRAGON_HAMMER, PokemonType.DRAGON, MoveCategory.PHYSICAL, 90, 100, 15, -1, 0, 7),
+    new AttackMove(Moves.BRUTAL_SWING, PokemonType.DARK, MoveCategory.PHYSICAL, 60, 100, 20, -1, 0, 7)
       .target(MoveTarget.ALL_NEAR_OTHERS),
-    new StatusMove(Moves.AURORA_VEIL, Type.ICE, -1, 20, -1, 0, 7)
+    new StatusMove(Moves.AURORA_VEIL, PokemonType.ICE, -1, 20, -1, 0, 7)
       .condition((user, target, move) => (globalScene.arena.weather?.weatherType === WeatherType.HAIL || globalScene.arena.weather?.weatherType === WeatherType.SNOW) && !globalScene.arena.weather?.isEffectSuppressed())
       .attr(AddArenaTagAttr, ArenaTagType.AURORA_VEIL, 5, true)
       .target(MoveTarget.USER_SIDE),
     /* Unused */
-    new AttackMove(Moves.SINISTER_ARROW_RAID, Type.GHOST, MoveCategory.PHYSICAL, 180, -1, 1, -1, 0, 7)
+    new AttackMove(Moves.SINISTER_ARROW_RAID, PokemonType.GHOST, MoveCategory.PHYSICAL, 180, -1, 1, -1, 0, 7)
       .unimplemented()
       .makesContact(false)
       .edgeCase(), // I assume it's because the user needs spirit shackle and decidueye
-    new AttackMove(Moves.MALICIOUS_MOONSAULT, Type.DARK, MoveCategory.PHYSICAL, 180, -1, 1, -1, 0, 7)
+    new AttackMove(Moves.MALICIOUS_MOONSAULT, PokemonType.DARK, MoveCategory.PHYSICAL, 180, -1, 1, -1, 0, 7)
       .unimplemented()
       .attr(AlwaysHitMinimizeAttr)
       .attr(HitsTagAttr, BattlerTagType.MINIMIZED, true)
       .edgeCase(), // I assume it's because it needs darkest lariat and incineroar
-    new AttackMove(Moves.OCEANIC_OPERETTA, Type.WATER, MoveCategory.SPECIAL, 195, -1, 1, -1, 0, 7)
+    new AttackMove(Moves.OCEANIC_OPERETTA, PokemonType.WATER, MoveCategory.SPECIAL, 195, -1, 1, -1, 0, 7)
       .unimplemented()
       .edgeCase(), // I assume it's because it needs sparkling aria and primarina
-    new AttackMove(Moves.GUARDIAN_OF_ALOLA, Type.FAIRY, MoveCategory.SPECIAL, -1, -1, 1, -1, 0, 7)
+    new AttackMove(Moves.GUARDIAN_OF_ALOLA, PokemonType.FAIRY, MoveCategory.SPECIAL, -1, -1, 1, -1, 0, 7)
       .unimplemented(),
-    new AttackMove(Moves.SOUL_STEALING_7_STAR_STRIKE, Type.GHOST, MoveCategory.PHYSICAL, 195, -1, 1, -1, 0, 7)
+    new AttackMove(Moves.SOUL_STEALING_7_STAR_STRIKE, PokemonType.GHOST, MoveCategory.PHYSICAL, 195, -1, 1, -1, 0, 7)
       .unimplemented(),
-    new AttackMove(Moves.STOKED_SPARKSURFER, Type.ELECTRIC, MoveCategory.SPECIAL, 175, -1, 1, 100, 0, 7)
+    new AttackMove(Moves.STOKED_SPARKSURFER, PokemonType.ELECTRIC, MoveCategory.SPECIAL, 175, -1, 1, 100, 0, 7)
       .unimplemented()
       .edgeCase(), // I assume it's because it needs thunderbolt and Alola Raichu
-    new AttackMove(Moves.PULVERIZING_PANCAKE, Type.NORMAL, MoveCategory.PHYSICAL, 210, -1, 1, -1, 0, 7)
+    new AttackMove(Moves.PULVERIZING_PANCAKE, PokemonType.NORMAL, MoveCategory.PHYSICAL, 210, -1, 1, -1, 0, 7)
       .unimplemented()
       .edgeCase(), // I assume it's because it needs giga impact and snorlax
-    new SelfStatusMove(Moves.EXTREME_EVOBOOST, Type.NORMAL, -1, 1, -1, 0, 7)
+    new SelfStatusMove(Moves.EXTREME_EVOBOOST, PokemonType.NORMAL, -1, 1, -1, 0, 7)
       .unimplemented()
       .attr(StatStageChangeAttr, [ Stat.ATK, Stat.DEF, Stat.SPATK, Stat.SPDEF, Stat.SPD ], 2, true),
-    new AttackMove(Moves.GENESIS_SUPERNOVA, Type.PSYCHIC, MoveCategory.SPECIAL, 185, -1, 1, 100, 0, 7)
+    new AttackMove(Moves.GENESIS_SUPERNOVA, PokemonType.PSYCHIC, MoveCategory.SPECIAL, 185, -1, 1, 100, 0, 7)
       .unimplemented()
       .attr(TerrainChangeAttr, TerrainType.PSYCHIC),
     /* End Unused */
-    new AttackMove(Moves.SHELL_TRAP, Type.FIRE, MoveCategory.SPECIAL, 150, 100, 5, -1, -3, 7)
+    new AttackMove(Moves.SHELL_TRAP, PokemonType.FIRE, MoveCategory.SPECIAL, 150, 100, 5, -1, -3, 7)
       .attr(AddBattlerTagHeaderAttr, BattlerTagType.SHELL_TRAP)
       .target(MoveTarget.ALL_NEAR_ENEMIES)
       // Fails if the user was not hit by a physical attack during the turn
       .condition((user, target, move) => user.getTag(ShellTrapTag)?.activated === true),
-    new AttackMove(Moves.FLEUR_CANNON, Type.FAIRY, MoveCategory.SPECIAL, 130, 90, 5, -1, 0, 7)
+    new AttackMove(Moves.FLEUR_CANNON, PokemonType.FAIRY, MoveCategory.SPECIAL, 130, 90, 5, -1, 0, 7)
       .attr(StatStageChangeAttr, [ Stat.SPATK ], -2, true),
-    new AttackMove(Moves.PSYCHIC_FANGS, Type.PSYCHIC, MoveCategory.PHYSICAL, 85, 100, 10, -1, 0, 7)
+    new AttackMove(Moves.PSYCHIC_FANGS, PokemonType.PSYCHIC, MoveCategory.PHYSICAL, 85, 100, 10, -1, 0, 7)
       .bitingMove()
       .attr(RemoveScreensAttr),
-    new AttackMove(Moves.STOMPING_TANTRUM, Type.GROUND, MoveCategory.PHYSICAL, 75, 100, 10, -1, 0, 7)
+    new AttackMove(Moves.STOMPING_TANTRUM, PokemonType.GROUND, MoveCategory.PHYSICAL, 75, 100, 10, -1, 0, 7)
       .attr(MovePowerMultiplierAttr, (user, target, move) => user.getLastXMoves(2)[1]?.result === MoveResult.MISS || user.getLastXMoves(2)[1]?.result === MoveResult.FAIL ? 2 : 1),
-    new AttackMove(Moves.SHADOW_BONE, Type.GHOST, MoveCategory.PHYSICAL, 85, 100, 10, 20, 0, 7)
+    new AttackMove(Moves.SHADOW_BONE, PokemonType.GHOST, MoveCategory.PHYSICAL, 85, 100, 10, 20, 0, 7)
       .attr(StatStageChangeAttr, [ Stat.DEF ], -1)
       .makesContact(false),
-    new AttackMove(Moves.ACCELEROCK, Type.ROCK, MoveCategory.PHYSICAL, 40, 100, 20, -1, 1, 7),
-    new AttackMove(Moves.LIQUIDATION, Type.WATER, MoveCategory.PHYSICAL, 85, 100, 10, 20, 0, 7)
+    new AttackMove(Moves.ACCELEROCK, PokemonType.ROCK, MoveCategory.PHYSICAL, 40, 100, 20, -1, 1, 7),
+    new AttackMove(Moves.LIQUIDATION, PokemonType.WATER, MoveCategory.PHYSICAL, 85, 100, 10, 20, 0, 7)
       .attr(StatStageChangeAttr, [ Stat.DEF ], -1),
-    new AttackMove(Moves.PRISMATIC_LASER, Type.PSYCHIC, MoveCategory.SPECIAL, 160, 100, 10, -1, 0, 7)
+    new AttackMove(Moves.PRISMATIC_LASER, PokemonType.PSYCHIC, MoveCategory.SPECIAL, 160, 100, 10, -1, 0, 7)
       .attr(RechargeAttr),
-    new AttackMove(Moves.SPECTRAL_THIEF, Type.GHOST, MoveCategory.PHYSICAL, 90, 100, 10, -1, 0, 7)
-      .ignoresSubstitute()
-      .partial(), // Does not steal stats
-    new AttackMove(Moves.SUNSTEEL_STRIKE, Type.STEEL, MoveCategory.PHYSICAL, 100, 100, 5, -1, 0, 7)
+    new AttackMove(Moves.SPECTRAL_THIEF, PokemonType.GHOST, MoveCategory.PHYSICAL, 90, 100, 10, -1, 0, 7)
+      .attr(SpectralThiefAttr)
+      .ignoresSubstitute(),
+    new AttackMove(Moves.SUNSTEEL_STRIKE, PokemonType.STEEL, MoveCategory.PHYSICAL, 100, 100, 5, -1, 0, 7)
       .ignoresAbilities(),
-    new AttackMove(Moves.MOONGEIST_BEAM, Type.GHOST, MoveCategory.SPECIAL, 100, 100, 5, -1, 0, 7)
+    new AttackMove(Moves.MOONGEIST_BEAM, PokemonType.GHOST, MoveCategory.SPECIAL, 100, 100, 5, -1, 0, 7)
       .ignoresAbilities(),
-    new StatusMove(Moves.TEARFUL_LOOK, Type.NORMAL, -1, 20, -1, 0, 7)
-      .attr(StatStageChangeAttr, [ Stat.ATK, Stat.SPATK ], -1),
-    new AttackMove(Moves.ZING_ZAP, Type.ELECTRIC, MoveCategory.PHYSICAL, 80, 100, 10, 30, 0, 7)
+    new StatusMove(Moves.TEARFUL_LOOK, PokemonType.NORMAL, -1, 20, -1, 0, 7)
+      .attr(StatStageChangeAttr, [ Stat.ATK, Stat.SPATK ], -1)
+      .reflectable(),
+    new AttackMove(Moves.ZING_ZAP, PokemonType.ELECTRIC, MoveCategory.PHYSICAL, 80, 100, 10, 30, 0, 7)
       .attr(FlinchAttr),
-    new AttackMove(Moves.NATURES_MADNESS, Type.FAIRY, MoveCategory.SPECIAL, -1, 90, 10, -1, 0, 7)
+    new AttackMove(Moves.NATURES_MADNESS, PokemonType.FAIRY, MoveCategory.SPECIAL, -1, 90, 10, -1, 0, 7)
       .attr(TargetHalfHpDamageAttr),
-    new AttackMove(Moves.MULTI_ATTACK, Type.NORMAL, MoveCategory.PHYSICAL, 120, 100, 10, -1, 0, 7)
+    new AttackMove(Moves.MULTI_ATTACK, PokemonType.NORMAL, MoveCategory.PHYSICAL, 120, 100, 10, -1, 0, 7)
       .attr(FormChangeItemTypeAttr),
     /* Unused */
-    new AttackMove(Moves.TEN_MILLION_VOLT_THUNDERBOLT, Type.ELECTRIC, MoveCategory.SPECIAL, 195, -1, 1, -1, 0, 7)
+    new AttackMove(Moves.TEN_MILLION_VOLT_THUNDERBOLT, PokemonType.ELECTRIC, MoveCategory.SPECIAL, 195, -1, 1, -1, 0, 7)
       .unimplemented()
       .edgeCase(), // I assume it's because it needs thunderbolt and pikachu in a cap
     /* End Unused */
-    new AttackMove(Moves.MIND_BLOWN, Type.FIRE, MoveCategory.SPECIAL, 150, 100, 5, -1, 0, 7)
+    new AttackMove(Moves.MIND_BLOWN, PokemonType.FIRE, MoveCategory.SPECIAL, 150, 100, 5, -1, 0, 7)
       .condition(failIfDampCondition)
       .attr(HalfSacrificialAttr)
       .target(MoveTarget.ALL_NEAR_OTHERS),
-    new AttackMove(Moves.PLASMA_FISTS, Type.ELECTRIC, MoveCategory.PHYSICAL, 100, 100, 15, -1, 0, 7)
+    new AttackMove(Moves.PLASMA_FISTS, PokemonType.ELECTRIC, MoveCategory.PHYSICAL, 100, 100, 15, -1, 0, 7)
       .attr(AddArenaTagAttr, ArenaTagType.ION_DELUGE, 1)
       .punchingMove(),
-    new AttackMove(Moves.PHOTON_GEYSER, Type.PSYCHIC, MoveCategory.SPECIAL, 100, 100, 5, -1, 0, 7)
+    new AttackMove(Moves.PHOTON_GEYSER, PokemonType.PSYCHIC, MoveCategory.SPECIAL, 100, 100, 5, -1, 0, 7)
       .attr(PhotonGeyserCategoryAttr)
       .ignoresAbilities(),
     /* Unused */
-    new AttackMove(Moves.LIGHT_THAT_BURNS_THE_SKY, Type.PSYCHIC, MoveCategory.SPECIAL, 200, -1, 1, -1, 0, 7)
+    new AttackMove(Moves.LIGHT_THAT_BURNS_THE_SKY, PokemonType.PSYCHIC, MoveCategory.SPECIAL, 200, -1, 1, -1, 0, 7)
       .unimplemented()
       .attr(PhotonGeyserCategoryAttr)
       .ignoresAbilities(),
-    new AttackMove(Moves.SEARING_SUNRAZE_SMASH, Type.STEEL, MoveCategory.PHYSICAL, 200, -1, 1, -1, 0, 7)
+    new AttackMove(Moves.SEARING_SUNRAZE_SMASH, PokemonType.STEEL, MoveCategory.PHYSICAL, 200, -1, 1, -1, 0, 7)
       .unimplemented()
       .ignoresAbilities(),
-    new AttackMove(Moves.MENACING_MOONRAZE_MAELSTROM, Type.GHOST, MoveCategory.SPECIAL, 200, -1, 1, -1, 0, 7)
+    new AttackMove(Moves.MENACING_MOONRAZE_MAELSTROM, PokemonType.GHOST, MoveCategory.SPECIAL, 200, -1, 1, -1, 0, 7)
       .unimplemented()
       .ignoresAbilities(),
-    new AttackMove(Moves.LETS_SNUGGLE_FOREVER, Type.FAIRY, MoveCategory.PHYSICAL, 190, -1, 1, -1, 0, 7)
+    new AttackMove(Moves.LETS_SNUGGLE_FOREVER, PokemonType.FAIRY, MoveCategory.PHYSICAL, 190, -1, 1, -1, 0, 7)
       .unimplemented()
       .edgeCase(), // I assume it needs play rough and mimikyu
-    new AttackMove(Moves.SPLINTERED_STORMSHARDS, Type.ROCK, MoveCategory.PHYSICAL, 190, -1, 1, -1, 0, 7)
+    new AttackMove(Moves.SPLINTERED_STORMSHARDS, PokemonType.ROCK, MoveCategory.PHYSICAL, 190, -1, 1, -1, 0, 7)
       .unimplemented()
       .attr(ClearTerrainAttr)
       .makesContact(false),
-    new AttackMove(Moves.CLANGOROUS_SOULBLAZE, Type.DRAGON, MoveCategory.SPECIAL, 185, -1, 1, 100, 0, 7)
+    new AttackMove(Moves.CLANGOROUS_SOULBLAZE, PokemonType.DRAGON, MoveCategory.SPECIAL, 185, -1, 1, 100, 0, 7)
       .unimplemented()
       .attr(StatStageChangeAttr, [ Stat.ATK, Stat.DEF, Stat.SPATK, Stat.SPDEF, Stat.SPD ], 1, true, { firstTargetOnly: true })
       .soundBased()
       .target(MoveTarget.ALL_NEAR_ENEMIES)
       .edgeCase(), // I assume it needs clanging scales and Kommo-O
     /* End Unused */
-    new AttackMove(Moves.ZIPPY_ZAP, Type.ELECTRIC, MoveCategory.PHYSICAL, 50, 100, 15, -1, 2, 7) // LGPE Implementation
+    new AttackMove(Moves.ZIPPY_ZAP, PokemonType.ELECTRIC, MoveCategory.PHYSICAL, 50, 100, 15, -1, 2, 7) // LGPE Implementation
       .attr(CritOnlyAttr),
-    new AttackMove(Moves.SPLISHY_SPLASH, Type.WATER, MoveCategory.SPECIAL, 90, 100, 15, 30, 0, 7)
+    new AttackMove(Moves.SPLISHY_SPLASH, PokemonType.WATER, MoveCategory.SPECIAL, 90, 100, 15, 30, 0, 7)
       .attr(StatusEffectAttr, StatusEffect.PARALYSIS)
       .target(MoveTarget.ALL_NEAR_ENEMIES),
-    new AttackMove(Moves.FLOATY_FALL, Type.FLYING, MoveCategory.PHYSICAL, 90, 95, 15, 30, 0, 7)
+    new AttackMove(Moves.FLOATY_FALL, PokemonType.FLYING, MoveCategory.PHYSICAL, 90, 95, 15, 30, 0, 7)
       .attr(FlinchAttr),
-    new AttackMove(Moves.PIKA_PAPOW, Type.ELECTRIC, MoveCategory.SPECIAL, -1, -1, 20, -1, 0, 7)
+    new AttackMove(Moves.PIKA_PAPOW, PokemonType.ELECTRIC, MoveCategory.SPECIAL, -1, -1, 20, -1, 0, 7)
       .attr(FriendshipPowerAttr),
-    new AttackMove(Moves.BOUNCY_BUBBLE, Type.WATER, MoveCategory.SPECIAL, 60, 100, 20, -1, 0, 7)
+    new AttackMove(Moves.BOUNCY_BUBBLE, PokemonType.WATER, MoveCategory.SPECIAL, 60, 100, 20, -1, 0, 7)
       .attr(HitHealAttr, 1)
       .triageMove(),
-    new AttackMove(Moves.BUZZY_BUZZ, Type.ELECTRIC, MoveCategory.SPECIAL, 60, 100, 20, 100, 0, 7)
+    new AttackMove(Moves.BUZZY_BUZZ, PokemonType.ELECTRIC, MoveCategory.SPECIAL, 60, 100, 20, 100, 0, 7)
       .attr(StatusEffectAttr, StatusEffect.PARALYSIS),
-    new AttackMove(Moves.SIZZLY_SLIDE, Type.FIRE, MoveCategory.PHYSICAL, 60, 100, 20, 100, 0, 7)
+    new AttackMove(Moves.SIZZLY_SLIDE, PokemonType.FIRE, MoveCategory.PHYSICAL, 60, 100, 20, 100, 0, 7)
       .attr(StatusEffectAttr, StatusEffect.BURN),
-    new AttackMove(Moves.GLITZY_GLOW, Type.PSYCHIC, MoveCategory.SPECIAL, 80, 95, 15, -1, 0, 7)
+    new AttackMove(Moves.GLITZY_GLOW, PokemonType.PSYCHIC, MoveCategory.SPECIAL, 80, 95, 15, -1, 0, 7)
       .attr(AddArenaTagAttr, ArenaTagType.LIGHT_SCREEN, 5, false, true),
-    new AttackMove(Moves.BADDY_BAD, Type.DARK, MoveCategory.SPECIAL, 80, 95, 15, -1, 0, 7)
+    new AttackMove(Moves.BADDY_BAD, PokemonType.DARK, MoveCategory.SPECIAL, 80, 95, 15, -1, 0, 7)
       .attr(AddArenaTagAttr, ArenaTagType.REFLECT, 5, false, true),
-    new AttackMove(Moves.SAPPY_SEED, Type.GRASS, MoveCategory.PHYSICAL, 100, 90, 10, 100, 0, 7)
+    new AttackMove(Moves.SAPPY_SEED, PokemonType.GRASS, MoveCategory.PHYSICAL, 100, 90, 10, -1, 0, 7)
       .attr(LeechSeedAttr)
       .makesContact(false),
-    new AttackMove(Moves.FREEZY_FROST, Type.ICE, MoveCategory.SPECIAL, 100, 90, 10, -1, 0, 7)
+    new AttackMove(Moves.FREEZY_FROST, PokemonType.ICE, MoveCategory.SPECIAL, 100, 90, 10, -1, 0, 7)
       .attr(ResetStatsAttr, true),
-    new AttackMove(Moves.SPARKLY_SWIRL, Type.FAIRY, MoveCategory.SPECIAL, 120, 85, 5, -1, 0, 7)
+    new AttackMove(Moves.SPARKLY_SWIRL, PokemonType.FAIRY, MoveCategory.SPECIAL, 120, 85, 5, -1, 0, 7)
       .attr(PartyStatusCureAttr, null, Abilities.NONE),
-    new AttackMove(Moves.VEEVEE_VOLLEY, Type.NORMAL, MoveCategory.PHYSICAL, -1, -1, 20, -1, 0, 7)
+    new AttackMove(Moves.VEEVEE_VOLLEY, PokemonType.NORMAL, MoveCategory.PHYSICAL, -1, -1, 20, -1, 0, 7)
       .attr(FriendshipPowerAttr),
-    new AttackMove(Moves.DOUBLE_IRON_BASH, Type.STEEL, MoveCategory.PHYSICAL, 60, 100, 5, 30, 0, 7)
+    new AttackMove(Moves.DOUBLE_IRON_BASH, PokemonType.STEEL, MoveCategory.PHYSICAL, 60, 100, 5, 30, 0, 7)
       .attr(MultiHitAttr, MultiHitType._2)
       .attr(FlinchAttr)
       .punchingMove(),
     /* Unused */
-    new SelfStatusMove(Moves.MAX_GUARD, Type.NORMAL, -1, 10, -1, 4, 8)
+    new SelfStatusMove(Moves.MAX_GUARD, PokemonType.NORMAL, -1, 10, -1, 4, 8)
       .unimplemented()
       .attr(ProtectAttr)
       .condition(failIfLastCondition),
     /* End Unused */
-    new AttackMove(Moves.DYNAMAX_CANNON, Type.DRAGON, MoveCategory.SPECIAL, 100, 100, 5, -1, 0, 8)
+    new AttackMove(Moves.DYNAMAX_CANNON, PokemonType.DRAGON, MoveCategory.SPECIAL, 100, 100, 5, -1, 0, 8)
       .attr(MovePowerMultiplierAttr, (user, target, move) => {
       // Move is only stronger against overleveled foes.
         if (target.level > globalScene.getMaxExpLevel()) {
@@ -10593,340 +10731,342 @@ export function initMoves() {
         } else {
           return 1;
         }
-      })
-      .attr(DiscourageFrequentUseAttr),
+      }),
 
-    new AttackMove(Moves.SNIPE_SHOT, Type.WATER, MoveCategory.SPECIAL, 80, 100, 15, -1, 0, 8)
+    new AttackMove(Moves.SNIPE_SHOT, PokemonType.WATER, MoveCategory.SPECIAL, 80, 100, 15, -1, 0, 8)
       .attr(HighCritAttr)
       .attr(BypassRedirectAttr),
-    new AttackMove(Moves.JAW_LOCK, Type.DARK, MoveCategory.PHYSICAL, 80, 100, 10, -1, 0, 8)
+    new AttackMove(Moves.JAW_LOCK, PokemonType.DARK, MoveCategory.PHYSICAL, 80, 100, 10, -1, 0, 8)
       .attr(JawLockAttr)
       .bitingMove(),
-    new SelfStatusMove(Moves.STUFF_CHEEKS, Type.NORMAL, -1, 10, -1, 0, 8)
-      .attr(EatBerryAttr)
+    new SelfStatusMove(Moves.STUFF_CHEEKS, PokemonType.NORMAL, -1, 10, -1, 0, 8)
+      .attr(EatBerryAttr, true)
       .attr(StatStageChangeAttr, [ Stat.DEF ], 2, true)
       .condition((user) => {
         const userBerries = globalScene.findModifiers(m => m instanceof BerryModifier, user.isPlayer());
         return userBerries.length > 0;
       })
       .edgeCase(), // Stuff Cheeks should not be selectable when the user does not have a berry, see wiki
-    new SelfStatusMove(Moves.NO_RETREAT, Type.FIGHTING, -1, 5, -1, 0, 8)
+    new SelfStatusMove(Moves.NO_RETREAT, PokemonType.FIGHTING, -1, 5, -1, 0, 8)
       .attr(StatStageChangeAttr, [ Stat.ATK, Stat.DEF, Stat.SPATK, Stat.SPDEF, Stat.SPD ], 1, true)
       .attr(AddBattlerTagAttr, BattlerTagType.NO_RETREAT, true, false)
       .condition((user, target, move) => user.getTag(TrappedTag)?.sourceMove !== Moves.NO_RETREAT), // fails if the user is currently trapped by No Retreat
-    new StatusMove(Moves.TAR_SHOT, Type.ROCK, 100, 15, -1, 0, 8)
+    new StatusMove(Moves.TAR_SHOT, PokemonType.ROCK, 100, 15, -1, 0, 8)
       .attr(StatStageChangeAttr, [ Stat.SPD ], -1)
-      .attr(AddBattlerTagAttr, BattlerTagType.TAR_SHOT, false),
-    new StatusMove(Moves.MAGIC_POWDER, Type.PSYCHIC, 100, 20, -1, 0, 8)
-      .attr(ChangeTypeAttr, Type.PSYCHIC)
-      .powderMove(),
-    new AttackMove(Moves.DRAGON_DARTS, Type.DRAGON, MoveCategory.PHYSICAL, 50, 100, 10, -1, 0, 8)
+      .attr(AddBattlerTagAttr, BattlerTagType.TAR_SHOT, false)
+      .reflectable(),
+    new StatusMove(Moves.MAGIC_POWDER, PokemonType.PSYCHIC, 100, 20, -1, 0, 8)
+      .attr(ChangeTypeAttr, PokemonType.PSYCHIC)
+      .powderMove()
+      .reflectable(),
+    new AttackMove(Moves.DRAGON_DARTS, PokemonType.DRAGON, MoveCategory.PHYSICAL, 50, 100, 10, -1, 0, 8)
       .attr(MultiHitAttr, MultiHitType._2)
       .makesContact(false)
       .partial(), // smart targetting is unimplemented
-    new StatusMove(Moves.TEATIME, Type.NORMAL, -1, 10, -1, 0, 8)
-      .attr(EatBerryAttr)
+    new StatusMove(Moves.TEATIME, PokemonType.NORMAL, -1, 10, -1, 0, 8)
+      .attr(EatBerryAttr, false)
       .target(MoveTarget.ALL),
-    new StatusMove(Moves.OCTOLOCK, Type.FIGHTING, 100, 15, -1, 0, 8)
+    new StatusMove(Moves.OCTOLOCK, PokemonType.FIGHTING, 100, 15, -1, 0, 8)
       .condition(failIfGhostTypeCondition)
       .attr(AddBattlerTagAttr, BattlerTagType.OCTOLOCK, false, true, 1),
-    new AttackMove(Moves.BOLT_BEAK, Type.ELECTRIC, MoveCategory.PHYSICAL, 85, 100, 10, -1, 0, 8)
+    new AttackMove(Moves.BOLT_BEAK, PokemonType.ELECTRIC, MoveCategory.PHYSICAL, 85, 100, 10, -1, 0, 8)
       .attr(FirstAttackDoublePowerAttr),
-    new AttackMove(Moves.FISHIOUS_REND, Type.WATER, MoveCategory.PHYSICAL, 85, 100, 10, -1, 0, 8)
+    new AttackMove(Moves.FISHIOUS_REND, PokemonType.WATER, MoveCategory.PHYSICAL, 85, 100, 10, -1, 0, 8)
       .attr(FirstAttackDoublePowerAttr)
       .bitingMove(),
-    new StatusMove(Moves.COURT_CHANGE, Type.NORMAL, 100, 10, -1, 0, 8)
+    new StatusMove(Moves.COURT_CHANGE, PokemonType.NORMAL, 100, 10, -1, 0, 8)
       .attr(SwapArenaTagsAttr, [ ArenaTagType.AURORA_VEIL, ArenaTagType.LIGHT_SCREEN, ArenaTagType.MIST, ArenaTagType.REFLECT, ArenaTagType.SPIKES, ArenaTagType.STEALTH_ROCK, ArenaTagType.STICKY_WEB, ArenaTagType.TAILWIND, ArenaTagType.TOXIC_SPIKES ]),
     /* Unused */
-    new AttackMove(Moves.MAX_FLARE, Type.FIRE, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8)
+    new AttackMove(Moves.MAX_FLARE, PokemonType.FIRE, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8)
       .target(MoveTarget.NEAR_ENEMY)
       .unimplemented(),
-    new AttackMove(Moves.MAX_FLUTTERBY, Type.BUG, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8)
+    new AttackMove(Moves.MAX_FLUTTERBY, PokemonType.BUG, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8)
       .target(MoveTarget.NEAR_ENEMY)
       .unimplemented(),
-    new AttackMove(Moves.MAX_LIGHTNING, Type.ELECTRIC, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8)
+    new AttackMove(Moves.MAX_LIGHTNING, PokemonType.ELECTRIC, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8)
       .target(MoveTarget.NEAR_ENEMY)
       .unimplemented(),
-    new AttackMove(Moves.MAX_STRIKE, Type.NORMAL, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8)
+    new AttackMove(Moves.MAX_STRIKE, PokemonType.NORMAL, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8)
       .target(MoveTarget.NEAR_ENEMY)
       .unimplemented(),
-    new AttackMove(Moves.MAX_KNUCKLE, Type.FIGHTING, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8)
+    new AttackMove(Moves.MAX_KNUCKLE, PokemonType.FIGHTING, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8)
       .target(MoveTarget.NEAR_ENEMY)
       .unimplemented(),
-    new AttackMove(Moves.MAX_PHANTASM, Type.GHOST, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8)
+    new AttackMove(Moves.MAX_PHANTASM, PokemonType.GHOST, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8)
       .target(MoveTarget.NEAR_ENEMY)
       .unimplemented(),
-    new AttackMove(Moves.MAX_HAILSTORM, Type.ICE, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8)
+    new AttackMove(Moves.MAX_HAILSTORM, PokemonType.ICE, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8)
       .target(MoveTarget.NEAR_ENEMY)
       .unimplemented(),
-    new AttackMove(Moves.MAX_OOZE, Type.POISON, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8)
+    new AttackMove(Moves.MAX_OOZE, PokemonType.POISON, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8)
       .target(MoveTarget.NEAR_ENEMY)
       .unimplemented(),
-    new AttackMove(Moves.MAX_GEYSER, Type.WATER, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8)
+    new AttackMove(Moves.MAX_GEYSER, PokemonType.WATER, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8)
       .target(MoveTarget.NEAR_ENEMY)
       .unimplemented(),
-    new AttackMove(Moves.MAX_AIRSTREAM, Type.FLYING, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8)
+    new AttackMove(Moves.MAX_AIRSTREAM, PokemonType.FLYING, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8)
       .target(MoveTarget.NEAR_ENEMY)
       .unimplemented(),
-    new AttackMove(Moves.MAX_STARFALL, Type.FAIRY, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8)
+    new AttackMove(Moves.MAX_STARFALL, PokemonType.FAIRY, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8)
       .target(MoveTarget.NEAR_ENEMY)
       .unimplemented(),
-    new AttackMove(Moves.MAX_WYRMWIND, Type.DRAGON, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8)
+    new AttackMove(Moves.MAX_WYRMWIND, PokemonType.DRAGON, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8)
       .target(MoveTarget.NEAR_ENEMY)
       .unimplemented(),
-    new AttackMove(Moves.MAX_MINDSTORM, Type.PSYCHIC, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8)
+    new AttackMove(Moves.MAX_MINDSTORM, PokemonType.PSYCHIC, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8)
       .target(MoveTarget.NEAR_ENEMY)
       .unimplemented(),
-    new AttackMove(Moves.MAX_ROCKFALL, Type.ROCK, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8)
+    new AttackMove(Moves.MAX_ROCKFALL, PokemonType.ROCK, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8)
       .target(MoveTarget.NEAR_ENEMY)
       .unimplemented(),
-    new AttackMove(Moves.MAX_QUAKE, Type.GROUND, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8)
+    new AttackMove(Moves.MAX_QUAKE, PokemonType.GROUND, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8)
       .target(MoveTarget.NEAR_ENEMY)
       .unimplemented(),
-    new AttackMove(Moves.MAX_DARKNESS, Type.DARK, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8)
+    new AttackMove(Moves.MAX_DARKNESS, PokemonType.DARK, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8)
       .target(MoveTarget.NEAR_ENEMY)
       .unimplemented(),
-    new AttackMove(Moves.MAX_OVERGROWTH, Type.GRASS, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8)
+    new AttackMove(Moves.MAX_OVERGROWTH, PokemonType.GRASS, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8)
       .target(MoveTarget.NEAR_ENEMY)
       .unimplemented(),
-    new AttackMove(Moves.MAX_STEELSPIKE, Type.STEEL, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8)
+    new AttackMove(Moves.MAX_STEELSPIKE, PokemonType.STEEL, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8)
       .target(MoveTarget.NEAR_ENEMY)
       .unimplemented(),
     /* End Unused */
-    new SelfStatusMove(Moves.CLANGOROUS_SOUL, Type.DRAGON, 100, 5, -1, 0, 8)
+    new SelfStatusMove(Moves.CLANGOROUS_SOUL, PokemonType.DRAGON, 100, 5, -1, 0, 8)
       .attr(CutHpStatStageBoostAttr, [ Stat.ATK, Stat.DEF, Stat.SPATK, Stat.SPDEF, Stat.SPD ], 1, 3)
       .soundBased()
       .danceMove(),
-    new AttackMove(Moves.BODY_PRESS, Type.FIGHTING, MoveCategory.PHYSICAL, 80, 100, 10, -1, 0, 8)
+    new AttackMove(Moves.BODY_PRESS, PokemonType.FIGHTING, MoveCategory.PHYSICAL, 80, 100, 10, -1, 0, 8)
       .attr(DefAtkAttr),
-    new StatusMove(Moves.DECORATE, Type.FAIRY, -1, 15, -1, 0, 8)
+    new StatusMove(Moves.DECORATE, PokemonType.FAIRY, -1, 15, -1, 0, 8)
       .attr(StatStageChangeAttr, [ Stat.ATK, Stat.SPATK ], 2)
       .ignoresProtect(),
-    new AttackMove(Moves.DRUM_BEATING, Type.GRASS, MoveCategory.PHYSICAL, 80, 100, 10, 100, 0, 8)
+    new AttackMove(Moves.DRUM_BEATING, PokemonType.GRASS, MoveCategory.PHYSICAL, 80, 100, 10, 100, 0, 8)
       .attr(StatStageChangeAttr, [ Stat.SPD ], -1)
       .makesContact(false),
-    new AttackMove(Moves.SNAP_TRAP, Type.GRASS, MoveCategory.PHYSICAL, 35, 100, 15, -1, 0, 8)
+    new AttackMove(Moves.SNAP_TRAP, PokemonType.GRASS, MoveCategory.PHYSICAL, 35, 100, 15, -1, 0, 8)
       .attr(TrapAttr, BattlerTagType.SNAP_TRAP),
-    new AttackMove(Moves.PYRO_BALL, Type.FIRE, MoveCategory.PHYSICAL, 120, 90, 5, 10, 0, 8)
+    new AttackMove(Moves.PYRO_BALL, PokemonType.FIRE, MoveCategory.PHYSICAL, 120, 90, 5, 10, 0, 8)
       .attr(HealStatusEffectAttr, true, StatusEffect.FREEZE)
       .attr(StatusEffectAttr, StatusEffect.BURN)
       .ballBombMove()
       .makesContact(false),
-    new AttackMove(Moves.BEHEMOTH_BLADE, Type.STEEL, MoveCategory.PHYSICAL, 100, 100, 5, -1, 0, 8)
+    new AttackMove(Moves.BEHEMOTH_BLADE, PokemonType.STEEL, MoveCategory.PHYSICAL, 100, 100, 5, -1, 0, 8)
       .slicingMove(),
-    new AttackMove(Moves.BEHEMOTH_BASH, Type.STEEL, MoveCategory.PHYSICAL, 100, 100, 5, -1, 0, 8),
-    new AttackMove(Moves.AURA_WHEEL, Type.ELECTRIC, MoveCategory.PHYSICAL, 110, 100, 10, 100, 0, 8)
+    new AttackMove(Moves.BEHEMOTH_BASH, PokemonType.STEEL, MoveCategory.PHYSICAL, 100, 100, 5, -1, 0, 8),
+    new AttackMove(Moves.AURA_WHEEL, PokemonType.ELECTRIC, MoveCategory.PHYSICAL, 110, 100, 10, 100, 0, 8)
       .attr(StatStageChangeAttr, [ Stat.SPD ], 1, true)
       .makesContact(false)
       .attr(AuraWheelTypeAttr),
-    new AttackMove(Moves.BREAKING_SWIPE, Type.DRAGON, MoveCategory.PHYSICAL, 60, 100, 15, 100, 0, 8)
+    new AttackMove(Moves.BREAKING_SWIPE, PokemonType.DRAGON, MoveCategory.PHYSICAL, 60, 100, 15, 100, 0, 8)
       .target(MoveTarget.ALL_NEAR_ENEMIES)
       .attr(StatStageChangeAttr, [ Stat.ATK ], -1),
-    new AttackMove(Moves.BRANCH_POKE, Type.GRASS, MoveCategory.PHYSICAL, 40, 100, 40, -1, 0, 8),
-    new AttackMove(Moves.OVERDRIVE, Type.ELECTRIC, MoveCategory.SPECIAL, 80, 100, 10, -1, 0, 8)
+    new AttackMove(Moves.BRANCH_POKE, PokemonType.GRASS, MoveCategory.PHYSICAL, 40, 100, 40, -1, 0, 8),
+    new AttackMove(Moves.OVERDRIVE, PokemonType.ELECTRIC, MoveCategory.SPECIAL, 80, 100, 10, -1, 0, 8)
       .soundBased()
       .target(MoveTarget.ALL_NEAR_ENEMIES),
-    new AttackMove(Moves.APPLE_ACID, Type.GRASS, MoveCategory.SPECIAL, 80, 100, 10, 100, 0, 8)
+    new AttackMove(Moves.APPLE_ACID, PokemonType.GRASS, MoveCategory.SPECIAL, 80, 100, 10, 100, 0, 8)
       .attr(StatStageChangeAttr, [ Stat.SPDEF ], -1),
-    new AttackMove(Moves.GRAV_APPLE, Type.GRASS, MoveCategory.PHYSICAL, 80, 100, 10, 100, 0, 8)
+    new AttackMove(Moves.GRAV_APPLE, PokemonType.GRASS, MoveCategory.PHYSICAL, 80, 100, 10, 100, 0, 8)
       .attr(StatStageChangeAttr, [ Stat.DEF ], -1)
       .attr(MovePowerMultiplierAttr, (user, target, move) => globalScene.arena.getTag(ArenaTagType.GRAVITY) ? 1.5 : 1)
       .makesContact(false),
-    new AttackMove(Moves.SPIRIT_BREAK, Type.FAIRY, MoveCategory.PHYSICAL, 75, 100, 15, 100, 0, 8)
+    new AttackMove(Moves.SPIRIT_BREAK, PokemonType.FAIRY, MoveCategory.PHYSICAL, 75, 100, 15, 100, 0, 8)
       .attr(StatStageChangeAttr, [ Stat.SPATK ], -1),
-    new AttackMove(Moves.STRANGE_STEAM, Type.FAIRY, MoveCategory.SPECIAL, 90, 95, 10, 20, 0, 8)
+    new AttackMove(Moves.STRANGE_STEAM, PokemonType.FAIRY, MoveCategory.SPECIAL, 90, 95, 10, 20, 0, 8)
       .attr(ConfuseAttr),
-    new StatusMove(Moves.LIFE_DEW, Type.WATER, -1, 10, -1, 0, 8)
+    new StatusMove(Moves.LIFE_DEW, PokemonType.WATER, -1, 10, -1, 0, 8)
       .attr(HealAttr, 0.25, true, false)
       .target(MoveTarget.USER_AND_ALLIES)
       .ignoresProtect(),
-    new SelfStatusMove(Moves.OBSTRUCT, Type.DARK, 100, 10, -1, 4, 8)
+    new SelfStatusMove(Moves.OBSTRUCT, PokemonType.DARK, 100, 10, -1, 4, 8)
       .attr(ProtectAttr, BattlerTagType.OBSTRUCT)
       .condition(failIfLastCondition),
-    new AttackMove(Moves.FALSE_SURRENDER, Type.DARK, MoveCategory.PHYSICAL, 80, -1, 10, -1, 0, 8),
-    new AttackMove(Moves.METEOR_ASSAULT, Type.FIGHTING, MoveCategory.PHYSICAL, 150, 100, 5, -1, 0, 8)
+    new AttackMove(Moves.FALSE_SURRENDER, PokemonType.DARK, MoveCategory.PHYSICAL, 80, -1, 10, -1, 0, 8),
+    new AttackMove(Moves.METEOR_ASSAULT, PokemonType.FIGHTING, MoveCategory.PHYSICAL, 150, 100, 5, -1, 0, 8)
       .attr(RechargeAttr)
       .makesContact(false),
-    new AttackMove(Moves.ETERNABEAM, Type.DRAGON, MoveCategory.SPECIAL, 160, 90, 5, -1, 0, 8)
+    new AttackMove(Moves.ETERNABEAM, PokemonType.DRAGON, MoveCategory.SPECIAL, 160, 90, 5, -1, 0, 8)
       .attr(RechargeAttr),
-    new AttackMove(Moves.STEEL_BEAM, Type.STEEL, MoveCategory.SPECIAL, 140, 95, 5, -1, 0, 8)
+    new AttackMove(Moves.STEEL_BEAM, PokemonType.STEEL, MoveCategory.SPECIAL, 140, 95, 5, -1, 0, 8)
       .attr(HalfSacrificialAttr),
-    new AttackMove(Moves.EXPANDING_FORCE, Type.PSYCHIC, MoveCategory.SPECIAL, 80, 100, 10, -1, 0, 8)
+    new AttackMove(Moves.EXPANDING_FORCE, PokemonType.PSYCHIC, MoveCategory.SPECIAL, 80, 100, 10, -1, 0, 8)
       .attr(MovePowerMultiplierAttr, (user, target, move) => globalScene.arena.getTerrainType() === TerrainType.PSYCHIC && user.isGrounded() ? 1.5 : 1)
       .attr(VariableTargetAttr, (user, target, move) => globalScene.arena.getTerrainType() === TerrainType.PSYCHIC && user.isGrounded() ? MoveTarget.ALL_NEAR_ENEMIES : MoveTarget.NEAR_OTHER),
-    new AttackMove(Moves.STEEL_ROLLER, Type.STEEL, MoveCategory.PHYSICAL, 130, 100, 5, -1, 0, 8)
+    new AttackMove(Moves.STEEL_ROLLER, PokemonType.STEEL, MoveCategory.PHYSICAL, 130, 100, 5, -1, 0, 8)
       .attr(ClearTerrainAttr)
       .condition((user, target, move) => !!globalScene.arena.terrain),
-    new AttackMove(Moves.SCALE_SHOT, Type.DRAGON, MoveCategory.PHYSICAL, 25, 90, 20, -1, 0, 8)
+    new AttackMove(Moves.SCALE_SHOT, PokemonType.DRAGON, MoveCategory.PHYSICAL, 25, 90, 20, -1, 0, 8)
       .attr(StatStageChangeAttr, [ Stat.SPD ], 1, true, { lastHitOnly: true })
       .attr(StatStageChangeAttr, [ Stat.DEF ], -1, true, { lastHitOnly: true })
       .attr(MultiHitAttr)
       .makesContact(false),
-    new ChargingAttackMove(Moves.METEOR_BEAM, Type.ROCK, MoveCategory.SPECIAL, 120, 90, 10, -1, 0, 8)
+    new ChargingAttackMove(Moves.METEOR_BEAM, PokemonType.ROCK, MoveCategory.SPECIAL, 120, 90, 10, -1, 0, 8)
       .chargeText(i18next.t("moveTriggers:isOverflowingWithSpacePower", { pokemonName: "{USER}" }))
       .chargeAttr(StatStageChangeAttr, [ Stat.SPATK ], 1, true),
-    new AttackMove(Moves.SHELL_SIDE_ARM, Type.POISON, MoveCategory.SPECIAL, 90, 100, 10, 20, 0, 8)
+    new AttackMove(Moves.SHELL_SIDE_ARM, PokemonType.POISON, MoveCategory.SPECIAL, 90, 100, 10, 20, 0, 8)
       .attr(ShellSideArmCategoryAttr)
       .attr(StatusEffectAttr, StatusEffect.POISON)
       .partial(), // Physical version of the move does not make contact
-    new AttackMove(Moves.MISTY_EXPLOSION, Type.FAIRY, MoveCategory.SPECIAL, 100, 100, 5, -1, 0, 8)
+    new AttackMove(Moves.MISTY_EXPLOSION, PokemonType.FAIRY, MoveCategory.SPECIAL, 100, 100, 5, -1, 0, 8)
       .attr(SacrificialAttr)
       .target(MoveTarget.ALL_NEAR_OTHERS)
       .attr(MovePowerMultiplierAttr, (user, target, move) => globalScene.arena.getTerrainType() === TerrainType.MISTY && user.isGrounded() ? 1.5 : 1)
       .condition(failIfDampCondition)
       .makesContact(false),
-    new AttackMove(Moves.GRASSY_GLIDE, Type.GRASS, MoveCategory.PHYSICAL, 55, 100, 20, -1, 0, 8)
+    new AttackMove(Moves.GRASSY_GLIDE, PokemonType.GRASS, MoveCategory.PHYSICAL, 55, 100, 20, -1, 0, 8)
       .attr(IncrementMovePriorityAttr, (user, target, move) => globalScene.arena.getTerrainType() === TerrainType.GRASSY && user.isGrounded()),
-    new AttackMove(Moves.RISING_VOLTAGE, Type.ELECTRIC, MoveCategory.SPECIAL, 70, 100, 20, -1, 0, 8)
+    new AttackMove(Moves.RISING_VOLTAGE, PokemonType.ELECTRIC, MoveCategory.SPECIAL, 70, 100, 20, -1, 0, 8)
       .attr(MovePowerMultiplierAttr, (user, target, move) => globalScene.arena.getTerrainType() === TerrainType.ELECTRIC && target.isGrounded() ? 2 : 1),
-    new AttackMove(Moves.TERRAIN_PULSE, Type.NORMAL, MoveCategory.SPECIAL, 50, 100, 10, -1, 0, 8)
+    new AttackMove(Moves.TERRAIN_PULSE, PokemonType.NORMAL, MoveCategory.SPECIAL, 50, 100, 10, -1, 0, 8)
       .attr(TerrainPulseTypeAttr)
       .attr(MovePowerMultiplierAttr, (user, target, move) => globalScene.arena.getTerrainType() !== TerrainType.NONE && user.isGrounded() ? 2 : 1)
       .pulseMove(),
-    new AttackMove(Moves.SKITTER_SMACK, Type.BUG, MoveCategory.PHYSICAL, 70, 90, 10, 100, 0, 8)
+    new AttackMove(Moves.SKITTER_SMACK, PokemonType.BUG, MoveCategory.PHYSICAL, 70, 90, 10, 100, 0, 8)
       .attr(StatStageChangeAttr, [ Stat.SPATK ], -1),
-    new AttackMove(Moves.BURNING_JEALOUSY, Type.FIRE, MoveCategory.SPECIAL, 70, 100, 5, 100, 0, 8)
+    new AttackMove(Moves.BURNING_JEALOUSY, PokemonType.FIRE, MoveCategory.SPECIAL, 70, 100, 5, 100, 0, 8)
       .attr(StatusIfBoostedAttr, StatusEffect.BURN)
       .target(MoveTarget.ALL_NEAR_ENEMIES),
-    new AttackMove(Moves.LASH_OUT, Type.DARK, MoveCategory.PHYSICAL, 75, 100, 5, -1, 0, 8)
+    new AttackMove(Moves.LASH_OUT, PokemonType.DARK, MoveCategory.PHYSICAL, 75, 100, 5, -1, 0, 8)
       .attr(MovePowerMultiplierAttr, (user, _target, _move) => user.turnData.statStagesDecreased ? 2 : 1),
-    new AttackMove(Moves.POLTERGEIST, Type.GHOST, MoveCategory.PHYSICAL, 110, 90, 5, -1, 0, 8)
+    new AttackMove(Moves.POLTERGEIST, PokemonType.GHOST, MoveCategory.PHYSICAL, 110, 90, 5, -1, 0, 8)
       .condition(failIfNoTargetHeldItemsCondition)
       .attr(PreMoveMessageAttr, attackedByItemMessageFunc)
       .makesContact(false),
-    new StatusMove(Moves.CORROSIVE_GAS, Type.POISON, 100, 40, -1, 0, 8)
+    new StatusMove(Moves.CORROSIVE_GAS, PokemonType.POISON, 100, 40, -1, 0, 8)
       .target(MoveTarget.ALL_NEAR_OTHERS)
+      .reflectable()
       .unimplemented(),
-    new StatusMove(Moves.COACHING, Type.FIGHTING, -1, 10, -1, 0, 8)
+    new StatusMove(Moves.COACHING, PokemonType.FIGHTING, -1, 10, -1, 0, 8)
       .attr(StatStageChangeAttr, [ Stat.ATK, Stat.DEF ], 1)
       .target(MoveTarget.NEAR_ALLY)
       .condition(failIfSingleBattle),
-    new AttackMove(Moves.FLIP_TURN, Type.WATER, MoveCategory.PHYSICAL, 60, 100, 20, -1, 0, 8)
+    new AttackMove(Moves.FLIP_TURN, PokemonType.WATER, MoveCategory.PHYSICAL, 60, 100, 20, -1, 0, 8)
       .attr(ForceSwitchOutAttr, true),
-    new AttackMove(Moves.TRIPLE_AXEL, Type.ICE, MoveCategory.PHYSICAL, 20, 90, 10, -1, 0, 8)
+    new AttackMove(Moves.TRIPLE_AXEL, PokemonType.ICE, MoveCategory.PHYSICAL, 20, 90, 10, -1, 0, 8)
       .attr(MultiHitAttr, MultiHitType._3)
       .attr(MultiHitPowerIncrementAttr, 3)
       .checkAllHits(),
-    new AttackMove(Moves.DUAL_WINGBEAT, Type.FLYING, MoveCategory.PHYSICAL, 40, 90, 10, -1, 0, 8)
+    new AttackMove(Moves.DUAL_WINGBEAT, PokemonType.FLYING, MoveCategory.PHYSICAL, 40, 90, 10, -1, 0, 8)
       .attr(MultiHitAttr, MultiHitType._2),
-    new AttackMove(Moves.SCORCHING_SANDS, Type.GROUND, MoveCategory.SPECIAL, 70, 100, 10, 30, 0, 8)
+    new AttackMove(Moves.SCORCHING_SANDS, PokemonType.GROUND, MoveCategory.SPECIAL, 70, 100, 10, 30, 0, 8)
       .attr(HealStatusEffectAttr, true, StatusEffect.FREEZE)
       .attr(HealStatusEffectAttr, false, StatusEffect.FREEZE)
       .attr(StatusEffectAttr, StatusEffect.BURN),
-    new StatusMove(Moves.JUNGLE_HEALING, Type.GRASS, -1, 10, -1, 0, 8)
+    new StatusMove(Moves.JUNGLE_HEALING, PokemonType.GRASS, -1, 10, -1, 0, 8)
       .attr(HealAttr, 0.25, true, false)
       .attr(HealStatusEffectAttr, false, getNonVolatileStatusEffects())
       .target(MoveTarget.USER_AND_ALLIES),
-    new AttackMove(Moves.WICKED_BLOW, Type.DARK, MoveCategory.PHYSICAL, 75, 100, 5, -1, 0, 8)
+    new AttackMove(Moves.WICKED_BLOW, PokemonType.DARK, MoveCategory.PHYSICAL, 75, 100, 5, -1, 0, 8)
       .attr(CritOnlyAttr)
       .punchingMove(),
-    new AttackMove(Moves.SURGING_STRIKES, Type.WATER, MoveCategory.PHYSICAL, 25, 100, 5, -1, 0, 8)
+    new AttackMove(Moves.SURGING_STRIKES, PokemonType.WATER, MoveCategory.PHYSICAL, 25, 100, 5, -1, 0, 8)
       .attr(MultiHitAttr, MultiHitType._3)
       .attr(CritOnlyAttr)
       .punchingMove(),
-    new AttackMove(Moves.THUNDER_CAGE, Type.ELECTRIC, MoveCategory.SPECIAL, 80, 90, 15, -1, 0, 8)
+    new AttackMove(Moves.THUNDER_CAGE, PokemonType.ELECTRIC, MoveCategory.SPECIAL, 80, 90, 15, -1, 0, 8)
       .attr(TrapAttr, BattlerTagType.THUNDER_CAGE),
-    new AttackMove(Moves.DRAGON_ENERGY, Type.DRAGON, MoveCategory.SPECIAL, 150, 100, 5, -1, 0, 8)
+    new AttackMove(Moves.DRAGON_ENERGY, PokemonType.DRAGON, MoveCategory.SPECIAL, 150, 100, 5, -1, 0, 8)
       .attr(HpPowerAttr)
       .target(MoveTarget.ALL_NEAR_ENEMIES),
-    new AttackMove(Moves.FREEZING_GLARE, Type.PSYCHIC, MoveCategory.SPECIAL, 90, 100, 10, 10, 0, 8)
+    new AttackMove(Moves.FREEZING_GLARE, PokemonType.PSYCHIC, MoveCategory.SPECIAL, 90, 100, 10, 10, 0, 8)
       .attr(StatusEffectAttr, StatusEffect.FREEZE),
-    new AttackMove(Moves.FIERY_WRATH, Type.DARK, MoveCategory.SPECIAL, 90, 100, 10, 20, 0, 8)
+    new AttackMove(Moves.FIERY_WRATH, PokemonType.DARK, MoveCategory.SPECIAL, 90, 100, 10, 20, 0, 8)
       .attr(FlinchAttr)
       .target(MoveTarget.ALL_NEAR_ENEMIES),
-    new AttackMove(Moves.THUNDEROUS_KICK, Type.FIGHTING, MoveCategory.PHYSICAL, 90, 100, 10, 100, 0, 8)
+    new AttackMove(Moves.THUNDEROUS_KICK, PokemonType.FIGHTING, MoveCategory.PHYSICAL, 90, 100, 10, 100, 0, 8)
       .attr(StatStageChangeAttr, [ Stat.DEF ], -1),
-    new AttackMove(Moves.GLACIAL_LANCE, Type.ICE, MoveCategory.PHYSICAL, 120, 100, 5, -1, 0, 8)
+    new AttackMove(Moves.GLACIAL_LANCE, PokemonType.ICE, MoveCategory.PHYSICAL, 120, 100, 5, -1, 0, 8)
       .target(MoveTarget.ALL_NEAR_ENEMIES)
       .makesContact(false),
-    new AttackMove(Moves.ASTRAL_BARRAGE, Type.GHOST, MoveCategory.SPECIAL, 120, 100, 5, -1, 0, 8)
+    new AttackMove(Moves.ASTRAL_BARRAGE, PokemonType.GHOST, MoveCategory.SPECIAL, 120, 100, 5, -1, 0, 8)
       .target(MoveTarget.ALL_NEAR_ENEMIES),
-    new AttackMove(Moves.EERIE_SPELL, Type.PSYCHIC, MoveCategory.SPECIAL, 80, 100, 5, 100, 0, 8)
+    new AttackMove(Moves.EERIE_SPELL, PokemonType.PSYCHIC, MoveCategory.SPECIAL, 80, 100, 5, 100, 0, 8)
       .attr(AttackReducePpMoveAttr, 3)
       .soundBased(),
-    new AttackMove(Moves.DIRE_CLAW, Type.POISON, MoveCategory.PHYSICAL, 80, 100, 15, 50, 0, 8)
+    new AttackMove(Moves.DIRE_CLAW, PokemonType.POISON, MoveCategory.PHYSICAL, 80, 100, 15, 50, 0, 8)
       .attr(MultiStatusEffectAttr, [ StatusEffect.POISON, StatusEffect.PARALYSIS, StatusEffect.SLEEP ]),
-    new AttackMove(Moves.PSYSHIELD_BASH, Type.PSYCHIC, MoveCategory.PHYSICAL, 70, 90, 10, 100, 0, 8)
+    new AttackMove(Moves.PSYSHIELD_BASH, PokemonType.PSYCHIC, MoveCategory.PHYSICAL, 70, 90, 10, 100, 0, 8)
       .attr(StatStageChangeAttr, [ Stat.DEF ], 1, true),
-    new SelfStatusMove(Moves.POWER_SHIFT, Type.NORMAL, -1, 10, -1, 0, 8)
+    new SelfStatusMove(Moves.POWER_SHIFT, PokemonType.NORMAL, -1, 10, -1, 0, 8)
       .target(MoveTarget.USER)
       .attr(ShiftStatAttr, Stat.ATK, Stat.DEF),
-    new AttackMove(Moves.STONE_AXE, Type.ROCK, MoveCategory.PHYSICAL, 65, 90, 15, 100, 0, 8)
+    new AttackMove(Moves.STONE_AXE, PokemonType.ROCK, MoveCategory.PHYSICAL, 65, 90, 15, 100, 0, 8)
       .attr(AddArenaTrapTagHitAttr, ArenaTagType.STEALTH_ROCK)
       .slicingMove(),
-    new AttackMove(Moves.SPRINGTIDE_STORM, Type.FAIRY, MoveCategory.SPECIAL, 100, 80, 5, 30, 0, 8)
+    new AttackMove(Moves.SPRINGTIDE_STORM, PokemonType.FAIRY, MoveCategory.SPECIAL, 100, 80, 5, 30, 0, 8)
       .attr(StatStageChangeAttr, [ Stat.ATK ], -1)
       .windMove()
       .target(MoveTarget.ALL_NEAR_ENEMIES),
-    new AttackMove(Moves.MYSTICAL_POWER, Type.PSYCHIC, MoveCategory.SPECIAL, 70, 90, 10, 100, 0, 8)
+    new AttackMove(Moves.MYSTICAL_POWER, PokemonType.PSYCHIC, MoveCategory.SPECIAL, 70, 90, 10, 100, 0, 8)
       .attr(StatStageChangeAttr, [ Stat.SPATK ], 1, true),
-    new AttackMove(Moves.RAGING_FURY, Type.FIRE, MoveCategory.PHYSICAL, 120, 100, 10, -1, 0, 8)
+    new AttackMove(Moves.RAGING_FURY, PokemonType.FIRE, MoveCategory.PHYSICAL, 120, 100, 10, -1, 0, 8)
       .makesContact(false)
       .attr(FrenzyAttr)
       .attr(MissEffectAttr, frenzyMissFunc)
       .attr(NoEffectAttr, frenzyMissFunc)
       .target(MoveTarget.RANDOM_NEAR_ENEMY),
-    new AttackMove(Moves.WAVE_CRASH, Type.WATER, MoveCategory.PHYSICAL, 120, 100, 10, -1, 0, 8)
+    new AttackMove(Moves.WAVE_CRASH, PokemonType.WATER, MoveCategory.PHYSICAL, 120, 100, 10, -1, 0, 8)
       .attr(RecoilAttr, false, 0.33)
       .recklessMove(),
-    new AttackMove(Moves.CHLOROBLAST, Type.GRASS, MoveCategory.SPECIAL, 150, 95, 5, -1, 0, 8)
+    new AttackMove(Moves.CHLOROBLAST, PokemonType.GRASS, MoveCategory.SPECIAL, 150, 95, 5, -1, 0, 8)
       .attr(RecoilAttr, true, 0.5),
-    new AttackMove(Moves.MOUNTAIN_GALE, Type.ICE, MoveCategory.PHYSICAL, 100, 85, 10, 30, 0, 8)
+    new AttackMove(Moves.MOUNTAIN_GALE, PokemonType.ICE, MoveCategory.PHYSICAL, 100, 85, 10, 30, 0, 8)
       .makesContact(false)
       .attr(FlinchAttr),
-    new SelfStatusMove(Moves.VICTORY_DANCE, Type.FIGHTING, -1, 10, -1, 0, 8)
+    new SelfStatusMove(Moves.VICTORY_DANCE, PokemonType.FIGHTING, -1, 10, -1, 0, 8)
       .attr(StatStageChangeAttr, [ Stat.ATK, Stat.DEF, Stat.SPD ], 1, true)
       .danceMove(),
-    new AttackMove(Moves.HEADLONG_RUSH, Type.GROUND, MoveCategory.PHYSICAL, 120, 100, 5, -1, 0, 8)
+    new AttackMove(Moves.HEADLONG_RUSH, PokemonType.GROUND, MoveCategory.PHYSICAL, 120, 100, 5, -1, 0, 8)
       .attr(StatStageChangeAttr, [ Stat.DEF, Stat.SPDEF ], -1, true)
       .punchingMove(),
-    new AttackMove(Moves.BARB_BARRAGE, Type.POISON, MoveCategory.PHYSICAL, 60, 100, 10, 50, 0, 8)
+    new AttackMove(Moves.BARB_BARRAGE, PokemonType.POISON, MoveCategory.PHYSICAL, 60, 100, 10, 50, 0, 8)
       .makesContact(false)
       .attr(MovePowerMultiplierAttr, (user, target, move) => target.status && (target.status.effect === StatusEffect.POISON || target.status.effect === StatusEffect.TOXIC) ? 2 : 1)
       .attr(StatusEffectAttr, StatusEffect.POISON),
-    new AttackMove(Moves.ESPER_WING, Type.PSYCHIC, MoveCategory.SPECIAL, 80, 100, 10, 100, 0, 8)
+    new AttackMove(Moves.ESPER_WING, PokemonType.PSYCHIC, MoveCategory.SPECIAL, 80, 100, 10, 100, 0, 8)
       .attr(HighCritAttr)
       .attr(StatStageChangeAttr, [ Stat.SPD ], 1, true),
-    new AttackMove(Moves.BITTER_MALICE, Type.GHOST, MoveCategory.SPECIAL, 75, 100, 10, 100, 0, 8)
+    new AttackMove(Moves.BITTER_MALICE, PokemonType.GHOST, MoveCategory.SPECIAL, 75, 100, 10, 100, 0, 8)
       .attr(StatStageChangeAttr, [ Stat.ATK ], -1),
-    new SelfStatusMove(Moves.SHELTER, Type.STEEL, -1, 10, 100, 0, 8)
+    new SelfStatusMove(Moves.SHELTER, PokemonType.STEEL, -1, 10, -1, 0, 8)
       .attr(StatStageChangeAttr, [ Stat.DEF ], 2, true),
-    new AttackMove(Moves.TRIPLE_ARROWS, Type.FIGHTING, MoveCategory.PHYSICAL, 90, 100, 10, 30, 0, 8)
+    new AttackMove(Moves.TRIPLE_ARROWS, PokemonType.FIGHTING, MoveCategory.PHYSICAL, 90, 100, 10, 30, 0, 8)
       .makesContact(false)
       .attr(HighCritAttr)
       .attr(StatStageChangeAttr, [ Stat.DEF ], -1, false, { effectChanceOverride: 50 })
       .attr(FlinchAttr),
-    new AttackMove(Moves.INFERNAL_PARADE, Type.GHOST, MoveCategory.SPECIAL, 60, 100, 15, 30, 0, 8)
+    new AttackMove(Moves.INFERNAL_PARADE, PokemonType.GHOST, MoveCategory.SPECIAL, 60, 100, 15, 30, 0, 8)
       .attr(StatusEffectAttr, StatusEffect.BURN)
       .attr(MovePowerMultiplierAttr, (user, target, move) => target.status ? 2 : 1),
-    new AttackMove(Moves.CEASELESS_EDGE, Type.DARK, MoveCategory.PHYSICAL, 65, 90, 15, 100, 0, 8)
+    new AttackMove(Moves.CEASELESS_EDGE, PokemonType.DARK, MoveCategory.PHYSICAL, 65, 90, 15, 100, 0, 8)
       .attr(AddArenaTrapTagHitAttr, ArenaTagType.SPIKES)
       .slicingMove(),
-    new AttackMove(Moves.BLEAKWIND_STORM, Type.FLYING, MoveCategory.SPECIAL, 100, 80, 10, 30, 0, 8)
+    new AttackMove(Moves.BLEAKWIND_STORM, PokemonType.FLYING, MoveCategory.SPECIAL, 100, 80, 10, 30, 0, 8)
       .attr(StormAccuracyAttr)
       .attr(StatStageChangeAttr, [ Stat.SPD ], -1)
       .windMove()
       .target(MoveTarget.ALL_NEAR_ENEMIES),
-    new AttackMove(Moves.WILDBOLT_STORM, Type.ELECTRIC, MoveCategory.SPECIAL, 100, 80, 10, 20, 0, 8)
+    new AttackMove(Moves.WILDBOLT_STORM, PokemonType.ELECTRIC, MoveCategory.SPECIAL, 100, 80, 10, 20, 0, 8)
       .attr(StormAccuracyAttr)
       .attr(StatusEffectAttr, StatusEffect.PARALYSIS)
       .windMove()
       .target(MoveTarget.ALL_NEAR_ENEMIES),
-    new AttackMove(Moves.SANDSEAR_STORM, Type.GROUND, MoveCategory.SPECIAL, 100, 80, 10, 20, 0, 8)
+    new AttackMove(Moves.SANDSEAR_STORM, PokemonType.GROUND, MoveCategory.SPECIAL, 100, 80, 10, 20, 0, 8)
       .attr(StormAccuracyAttr)
       .attr(StatusEffectAttr, StatusEffect.BURN)
       .windMove()
       .target(MoveTarget.ALL_NEAR_ENEMIES),
-    new StatusMove(Moves.LUNAR_BLESSING, Type.PSYCHIC, -1, 5, -1, 0, 8)
+    new StatusMove(Moves.LUNAR_BLESSING, PokemonType.PSYCHIC, -1, 5, -1, 0, 8)
       .attr(HealAttr, 0.25, true, false)
       .attr(HealStatusEffectAttr, false, getNonVolatileStatusEffects())
       .target(MoveTarget.USER_AND_ALLIES)
       .triageMove(),
-    new SelfStatusMove(Moves.TAKE_HEART, Type.PSYCHIC, -1, 10, -1, 0, 8)
+    new SelfStatusMove(Moves.TAKE_HEART, PokemonType.PSYCHIC, -1, 10, -1, 0, 8)
       .attr(StatStageChangeAttr, [ Stat.SPATK, Stat.SPDEF ], 1, true)
       .attr(HealStatusEffectAttr, true, [ StatusEffect.PARALYSIS, StatusEffect.POISON, StatusEffect.TOXIC, StatusEffect.BURN, StatusEffect.SLEEP ]),
     /* Unused
-    new AttackMove(Moves.G_MAX_WILDFIRE, Type.FIRE, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8)
+    new AttackMove(Moves.G_MAX_WILDFIRE, PokemonType.Fire, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8)
       .target(MoveTarget.ALL_NEAR_ENEMIES)
       .unimplemented(),
     new AttackMove(Moves.G_MAX_BEFUDDLE, Type.BUG, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8)
@@ -11001,7 +11141,7 @@ export function initMoves() {
     new AttackMove(Moves.G_MAX_FOAM_BURST, Type.WATER, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8)
       .target(MoveTarget.ALL_NEAR_ENEMIES)
       .unimplemented(),
-    new AttackMove(Moves.G_MAX_CENTIFERNO, Type.FIRE, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8)
+    new AttackMove(Moves.G_MAX_CENTIFERNO, PokemonType.Fire, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8)
       .target(MoveTarget.ALL_NEAR_ENEMIES)
       .unimplemented(),
     new AttackMove(Moves.G_MAX_VINE_LASH, Type.GRASS, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8)
@@ -11013,7 +11153,7 @@ export function initMoves() {
     new AttackMove(Moves.G_MAX_DRUM_SOLO, Type.GRASS, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8)
       .target(MoveTarget.ALL_NEAR_ENEMIES)
       .unimplemented(),
-    new AttackMove(Moves.G_MAX_FIREBALL, Type.FIRE, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8)
+    new AttackMove(Moves.G_MAX_FIREBALL, PokemonType.Fire, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8)
       .target(MoveTarget.ALL_NEAR_ENEMIES)
       .unimplemented(),
     new AttackMove(Moves.G_MAX_HYDROSNIPE, Type.WATER, MoveCategory.PHYSICAL, 10, -1, 10, -1, 0, 8)
@@ -11026,58 +11166,56 @@ export function initMoves() {
       .target(MoveTarget.ALL_NEAR_ENEMIES)
       .unimplemented(),
     End Unused */
-    new AttackMove(Moves.TERA_BLAST, Type.NORMAL, MoveCategory.SPECIAL, 80, 100, 10, -1, 0, 9)
+    new AttackMove(Moves.TERA_BLAST, PokemonType.NORMAL, MoveCategory.SPECIAL, 80, 100, 10, -1, 0, 9)
       .attr(TeraMoveCategoryAttr)
       .attr(TeraBlastTypeAttr)
       .attr(TeraBlastPowerAttr)
-      .attr(StatStageChangeAttr, [ Stat.ATK, Stat.SPATK ], -1, true, { condition: (user, target, move) => user.isTerastallized() && user.isOfType(Type.STELLAR) })
-      .partial(), /** Does not ignore abilities that affect stats, relevant in determining the move's category {@see TeraMoveCategoryAttr} */
-    new SelfStatusMove(Moves.SILK_TRAP, Type.BUG, -1, 10, -1, 4, 9)
+      .attr(StatStageChangeAttr, [ Stat.ATK, Stat.SPATK ], -1, true, { condition: (user, target, move) => user.isTerastallized && user.isOfType(PokemonType.STELLAR) }),
+    new SelfStatusMove(Moves.SILK_TRAP, PokemonType.BUG, -1, 10, -1, 4, 9)
       .attr(ProtectAttr, BattlerTagType.SILK_TRAP)
       .condition(failIfLastCondition),
-    new AttackMove(Moves.AXE_KICK, Type.FIGHTING, MoveCategory.PHYSICAL, 120, 90, 10, 30, 0, 9)
+    new AttackMove(Moves.AXE_KICK, PokemonType.FIGHTING, MoveCategory.PHYSICAL, 120, 90, 10, 30, 0, 9)
       .attr(MissEffectAttr, crashDamageFunc)
       .attr(NoEffectAttr, crashDamageFunc)
       .attr(ConfuseAttr)
       .recklessMove(),
-    new AttackMove(Moves.LAST_RESPECTS, Type.GHOST, MoveCategory.PHYSICAL, 50, 100, 10, -1, 0, 9)
-      .partial() // Counter resets every wave instead of on arena reset
-      .attr(MovePowerMultiplierAttr, (user, target, move) => 1 + Math.min(user.isPlayer() ? globalScene.currentBattle.playerFaints : globalScene.currentBattle.enemyFaints, 100))
+    new AttackMove(Moves.LAST_RESPECTS, PokemonType.GHOST, MoveCategory.PHYSICAL, 50, 100, 10, -1, 0, 9)
+      .attr(MovePowerMultiplierAttr, (user, target, move) => 1 + Math.min(user.isPlayer() ? globalScene.arena.playerFaints : globalScene.currentBattle.enemyFaints, 100))
       .makesContact(false),
-    new AttackMove(Moves.LUMINA_CRASH, Type.PSYCHIC, MoveCategory.SPECIAL, 80, 100, 10, 100, 0, 9)
+    new AttackMove(Moves.LUMINA_CRASH, PokemonType.PSYCHIC, MoveCategory.SPECIAL, 80, 100, 10, 100, 0, 9)
       .attr(StatStageChangeAttr, [ Stat.SPDEF ], -2),
-    new AttackMove(Moves.ORDER_UP, Type.DRAGON, MoveCategory.PHYSICAL, 80, 100, 10, 100, 0, 9)
+    new AttackMove(Moves.ORDER_UP, PokemonType.DRAGON, MoveCategory.PHYSICAL, 80, 100, 10, 100, 0, 9)
       .attr(OrderUpStatBoostAttr)
       .makesContact(false),
-    new AttackMove(Moves.JET_PUNCH, Type.WATER, MoveCategory.PHYSICAL, 60, 100, 15, -1, 1, 9)
+    new AttackMove(Moves.JET_PUNCH, PokemonType.WATER, MoveCategory.PHYSICAL, 60, 100, 15, -1, 1, 9)
       .punchingMove(),
-    new StatusMove(Moves.SPICY_EXTRACT, Type.GRASS, -1, 15, -1, 0, 9)
+    new StatusMove(Moves.SPICY_EXTRACT, PokemonType.GRASS, -1, 15, -1, 0, 9)
       .attr(StatStageChangeAttr, [ Stat.ATK ], 2)
       .attr(StatStageChangeAttr, [ Stat.DEF ], -2),
-    new AttackMove(Moves.SPIN_OUT, Type.STEEL, MoveCategory.PHYSICAL, 100, 100, 5, -1, 0, 9)
+    new AttackMove(Moves.SPIN_OUT, PokemonType.STEEL, MoveCategory.PHYSICAL, 100, 100, 5, -1, 0, 9)
       .attr(StatStageChangeAttr, [ Stat.SPD ], -2, true),
-    new AttackMove(Moves.POPULATION_BOMB, Type.NORMAL, MoveCategory.PHYSICAL, 20, 90, 10, -1, 0, 9)
+    new AttackMove(Moves.POPULATION_BOMB, PokemonType.NORMAL, MoveCategory.PHYSICAL, 20, 90, 10, -1, 0, 9)
       .attr(MultiHitAttr, MultiHitType._10)
       .slicingMove()
       .checkAllHits(),
-    new AttackMove(Moves.ICE_SPINNER, Type.ICE, MoveCategory.PHYSICAL, 80, 100, 15, -1, 0, 9)
+    new AttackMove(Moves.ICE_SPINNER, PokemonType.ICE, MoveCategory.PHYSICAL, 80, 100, 15, -1, 0, 9)
       .attr(ClearTerrainAttr),
-    new AttackMove(Moves.GLAIVE_RUSH, Type.DRAGON, MoveCategory.PHYSICAL, 120, 100, 5, -1, 0, 9)
+    new AttackMove(Moves.GLAIVE_RUSH, PokemonType.DRAGON, MoveCategory.PHYSICAL, 120, 100, 5, -1, 0, 9)
       .attr(AddBattlerTagAttr, BattlerTagType.ALWAYS_GET_HIT, true, false, 0, 0, true)
       .attr(AddBattlerTagAttr, BattlerTagType.RECEIVE_DOUBLE_DAMAGE, true, false, 0, 0, true)
       .condition((user, target, move) => {
         return !(target.getTag(BattlerTagType.PROTECTED)?.tagType === "PROTECTED" || globalScene.arena.getTag(ArenaTagType.MAT_BLOCK)?.tagType === "MAT_BLOCK");
       }),
-    new StatusMove(Moves.REVIVAL_BLESSING, Type.NORMAL, -1, 1, -1, 0, 9)
+    new StatusMove(Moves.REVIVAL_BLESSING, PokemonType.NORMAL, -1, 1, -1, 0, 9)
       .triageMove()
       .attr(RevivalBlessingAttr)
       .target(MoveTarget.USER),
-    new AttackMove(Moves.SALT_CURE, Type.ROCK, MoveCategory.PHYSICAL, 40, 100, 15, 100, 0, 9)
+    new AttackMove(Moves.SALT_CURE, PokemonType.ROCK, MoveCategory.PHYSICAL, 40, 100, 15, 100, 0, 9)
       .attr(AddBattlerTagAttr, BattlerTagType.SALT_CURED)
       .makesContact(false),
-    new AttackMove(Moves.TRIPLE_DIVE, Type.WATER, MoveCategory.PHYSICAL, 30, 95, 10, -1, 0, 9)
+    new AttackMove(Moves.TRIPLE_DIVE, PokemonType.WATER, MoveCategory.PHYSICAL, 30, 95, 10, -1, 0, 9)
       .attr(MultiHitAttr, MultiHitType._3),
-    new AttackMove(Moves.MORTAL_SPIN, Type.POISON, MoveCategory.PHYSICAL, 30, 100, 15, 100, 0, 9)
+    new AttackMove(Moves.MORTAL_SPIN, PokemonType.POISON, MoveCategory.PHYSICAL, 30, 100, 15, 100, 0, 9)
       .attr(LapseBattlerTagAttr, [
         BattlerTagType.BIND,
         BattlerTagType.WRAP,
@@ -11094,176 +11232,190 @@ export function initMoves() {
       .attr(StatusEffectAttr, StatusEffect.POISON)
       .attr(RemoveArenaTrapAttr)
       .target(MoveTarget.ALL_NEAR_ENEMIES),
-    new StatusMove(Moves.DOODLE, Type.NORMAL, 100, 10, -1, 0, 9)
+    new StatusMove(Moves.DOODLE, PokemonType.NORMAL, 100, 10, -1, 0, 9)
       .attr(AbilityCopyAttr, true),
-    new SelfStatusMove(Moves.FILLET_AWAY, Type.NORMAL, -1, 10, -1, 0, 9)
+    new SelfStatusMove(Moves.FILLET_AWAY, PokemonType.NORMAL, -1, 10, -1, 0, 9)
       .attr(CutHpStatStageBoostAttr, [ Stat.ATK, Stat.SPATK, Stat.SPD ], 2, 2),
-    new AttackMove(Moves.KOWTOW_CLEAVE, Type.DARK, MoveCategory.PHYSICAL, 85, -1, 10, -1, 0, 9)
+    new AttackMove(Moves.KOWTOW_CLEAVE, PokemonType.DARK, MoveCategory.PHYSICAL, 85, -1, 10, -1, 0, 9)
       .slicingMove(),
-    new AttackMove(Moves.FLOWER_TRICK, Type.GRASS, MoveCategory.PHYSICAL, 70, -1, 10, 100, 0, 9)
+    new AttackMove(Moves.FLOWER_TRICK, PokemonType.GRASS, MoveCategory.PHYSICAL, 70, -1, 10, -1, 0, 9)
       .attr(CritOnlyAttr)
       .makesContact(false),
-    new AttackMove(Moves.TORCH_SONG, Type.FIRE, MoveCategory.SPECIAL, 80, 100, 10, 100, 0, 9)
+    new AttackMove(Moves.TORCH_SONG, PokemonType.FIRE, MoveCategory.SPECIAL, 80, 100, 10, 100, 0, 9)
       .attr(StatStageChangeAttr, [ Stat.SPATK ], 1, true)
       .soundBased(),
-    new AttackMove(Moves.AQUA_STEP, Type.WATER, MoveCategory.PHYSICAL, 80, 100, 10, 100, 0, 9)
+    new AttackMove(Moves.AQUA_STEP, PokemonType.WATER, MoveCategory.PHYSICAL, 80, 100, 10, 100, 0, 9)
       .attr(StatStageChangeAttr, [ Stat.SPD ], 1, true)
       .danceMove(),
-    new AttackMove(Moves.RAGING_BULL, Type.NORMAL, MoveCategory.PHYSICAL, 90, 100, 10, -1, 0, 9)
+    new AttackMove(Moves.RAGING_BULL, PokemonType.NORMAL, MoveCategory.PHYSICAL, 90, 100, 10, -1, 0, 9)
       .attr(RagingBullTypeAttr)
       .attr(RemoveScreensAttr),
-    new AttackMove(Moves.MAKE_IT_RAIN, Type.STEEL, MoveCategory.SPECIAL, 120, 100, 5, -1, 0, 9)
+    new AttackMove(Moves.MAKE_IT_RAIN, PokemonType.STEEL, MoveCategory.SPECIAL, 120, 100, 5, -1, 0, 9)
       .attr(MoneyAttr)
       .attr(StatStageChangeAttr, [ Stat.SPATK ], -1, true, { firstTargetOnly: true })
       .target(MoveTarget.ALL_NEAR_ENEMIES),
-    new AttackMove(Moves.PSYBLADE, Type.PSYCHIC, MoveCategory.PHYSICAL, 80, 100, 15, -1, 0, 9)
+    new AttackMove(Moves.PSYBLADE, PokemonType.PSYCHIC, MoveCategory.PHYSICAL, 80, 100, 15, -1, 0, 9)
       .attr(MovePowerMultiplierAttr, (user, target, move) => globalScene.arena.getTerrainType() === TerrainType.ELECTRIC && user.isGrounded() ? 1.5 : 1)
       .slicingMove(),
-    new AttackMove(Moves.HYDRO_STEAM, Type.WATER, MoveCategory.SPECIAL, 80, 100, 15, -1, 0, 9)
+    new AttackMove(Moves.HYDRO_STEAM, PokemonType.WATER, MoveCategory.SPECIAL, 80, 100, 15, -1, 0, 9)
       .attr(IgnoreWeatherTypeDebuffAttr, WeatherType.SUNNY)
-      .attr(MovePowerMultiplierAttr, (user, target, move) => [ WeatherType.SUNNY, WeatherType.HARSH_SUN ].includes(globalScene.arena.weather?.weatherType!) && !globalScene.arena.weather?.isEffectSuppressed() ? 1.5 : 1), // TODO: is this bang correct?
-    new AttackMove(Moves.RUINATION, Type.DARK, MoveCategory.SPECIAL, -1, 90, 10, -1, 0, 9)
+      .attr(MovePowerMultiplierAttr, (user, target, move) => {
+        const weather = globalScene.arena.weather;
+        if (!weather) {
+          return 1;
+        }
+        return [ WeatherType.SUNNY, WeatherType.HARSH_SUN ].includes(weather.weatherType) && !weather.isEffectSuppressed() ? 1.5 : 1;
+      }),
+    new AttackMove(Moves.RUINATION, PokemonType.DARK, MoveCategory.SPECIAL, -1, 90, 10, -1, 0, 9)
       .attr(TargetHalfHpDamageAttr),
-    new AttackMove(Moves.COLLISION_COURSE, Type.FIGHTING, MoveCategory.PHYSICAL, 100, 100, 5, -1, 0, 9)
+    new AttackMove(Moves.COLLISION_COURSE, PokemonType.FIGHTING, MoveCategory.PHYSICAL, 100, 100, 5, -1, 0, 9)
       .attr(MovePowerMultiplierAttr, (user, target, move) => target.getAttackTypeEffectiveness(move.type, user) >= 2 ? 5461 / 4096 : 1),
-    new AttackMove(Moves.ELECTRO_DRIFT, Type.ELECTRIC, MoveCategory.SPECIAL, 100, 100, 5, -1, 0, 9)
+    new AttackMove(Moves.ELECTRO_DRIFT, PokemonType.ELECTRIC, MoveCategory.SPECIAL, 100, 100, 5, -1, 0, 9)
       .attr(MovePowerMultiplierAttr, (user, target, move) => target.getAttackTypeEffectiveness(move.type, user) >= 2 ? 5461 / 4096 : 1)
       .makesContact(),
-    new SelfStatusMove(Moves.SHED_TAIL, Type.NORMAL, -1, 10, -1, 0, 9)
-      .attr(AddSubstituteAttr, 0.5)
+    new SelfStatusMove(Moves.SHED_TAIL, PokemonType.NORMAL, -1, 10, -1, 0, 9)
+      .attr(AddSubstituteAttr, 0.5, true)
       .attr(ForceSwitchOutAttr, true, SwitchType.SHED_TAIL)
       .condition(failIfLastInPartyCondition),
-    new SelfStatusMove(Moves.CHILLY_RECEPTION, Type.ICE, -1, 10, -1, 0, 9)
+    new SelfStatusMove(Moves.CHILLY_RECEPTION, PokemonType.ICE, -1, 10, -1, 0, 9)
       .attr(PreMoveMessageAttr, (user, move) => i18next.t("moveTriggers:chillyReception", { pokemonName: getPokemonNameWithAffix(user) }))
       .attr(ChillyReceptionAttr, true),
-    new SelfStatusMove(Moves.TIDY_UP, Type.NORMAL, -1, 10, -1, 0, 9)
+    new SelfStatusMove(Moves.TIDY_UP, PokemonType.NORMAL, -1, 10, -1, 0, 9)
       .attr(StatStageChangeAttr, [ Stat.ATK, Stat.SPD ], 1, true)
       .attr(RemoveArenaTrapAttr, true)
       .attr(RemoveAllSubstitutesAttr),
-    new StatusMove(Moves.SNOWSCAPE, Type.ICE, -1, 10, -1, 0, 9)
+    new StatusMove(Moves.SNOWSCAPE, PokemonType.ICE, -1, 10, -1, 0, 9)
       .attr(WeatherChangeAttr, WeatherType.SNOW)
       .target(MoveTarget.BOTH_SIDES),
-    new AttackMove(Moves.POUNCE, Type.BUG, MoveCategory.PHYSICAL, 50, 100, 20, 100, 0, 9)
+    new AttackMove(Moves.POUNCE, PokemonType.BUG, MoveCategory.PHYSICAL, 50, 100, 20, 100, 0, 9)
       .attr(StatStageChangeAttr, [ Stat.SPD ], -1),
-    new AttackMove(Moves.TRAILBLAZE, Type.GRASS, MoveCategory.PHYSICAL, 50, 100, 20, 100, 0, 9)
+    new AttackMove(Moves.TRAILBLAZE, PokemonType.GRASS, MoveCategory.PHYSICAL, 50, 100, 20, 100, 0, 9)
       .attr(StatStageChangeAttr, [ Stat.SPD ], 1, true),
-    new AttackMove(Moves.CHILLING_WATER, Type.WATER, MoveCategory.SPECIAL, 50, 100, 20, 100, 0, 9)
+    new AttackMove(Moves.CHILLING_WATER, PokemonType.WATER, MoveCategory.SPECIAL, 50, 100, 20, 100, 0, 9)
       .attr(StatStageChangeAttr, [ Stat.ATK ], -1),
-    new AttackMove(Moves.HYPER_DRILL, Type.NORMAL, MoveCategory.PHYSICAL, 100, 100, 5, -1, 0, 9)
+    new AttackMove(Moves.HYPER_DRILL, PokemonType.NORMAL, MoveCategory.PHYSICAL, 100, 100, 5, -1, 0, 9)
       .ignoresProtect(),
-    new AttackMove(Moves.TWIN_BEAM, Type.PSYCHIC, MoveCategory.SPECIAL, 40, 100, 10, -1, 0, 9)
+    new AttackMove(Moves.TWIN_BEAM, PokemonType.PSYCHIC, MoveCategory.SPECIAL, 40, 100, 10, -1, 0, 9)
       .attr(MultiHitAttr, MultiHitType._2),
-    new AttackMove(Moves.RAGE_FIST, Type.GHOST, MoveCategory.PHYSICAL, 50, 100, 10, -1, 0, 9)
-      .edgeCase() // Counter incorrectly increases on confusion self-hits
+    new AttackMove(Moves.RAGE_FIST, PokemonType.GHOST, MoveCategory.PHYSICAL, 50, 100, 10, -1, 0, 9)
       .attr(RageFistPowerAttr)
       .punchingMove(),
-    new AttackMove(Moves.ARMOR_CANNON, Type.FIRE, MoveCategory.SPECIAL, 120, 100, 5, -1, 0, 9)
+    new AttackMove(Moves.ARMOR_CANNON, PokemonType.FIRE, MoveCategory.SPECIAL, 120, 100, 5, -1, 0, 9)
       .attr(StatStageChangeAttr, [ Stat.DEF, Stat.SPDEF ], -1, true),
-    new AttackMove(Moves.BITTER_BLADE, Type.FIRE, MoveCategory.PHYSICAL, 90, 100, 10, -1, 0, 9)
+    new AttackMove(Moves.BITTER_BLADE, PokemonType.FIRE, MoveCategory.PHYSICAL, 90, 100, 10, -1, 0, 9)
       .attr(HitHealAttr)
       .slicingMove()
       .triageMove(),
-    new AttackMove(Moves.DOUBLE_SHOCK, Type.ELECTRIC, MoveCategory.PHYSICAL, 120, 100, 5, -1, 0, 9)
+    new AttackMove(Moves.DOUBLE_SHOCK, PokemonType.ELECTRIC, MoveCategory.PHYSICAL, 120, 100, 5, -1, 0, 9)
       .condition((user) => {
         const userTypes = user.getTypes(true);
-        return userTypes.includes(Type.ELECTRIC);
+        return userTypes.includes(PokemonType.ELECTRIC);
       })
       .attr(AddBattlerTagAttr, BattlerTagType.DOUBLE_SHOCKED, true, false)
-      .attr(RemoveTypeAttr, Type.ELECTRIC, (user) => {
+      .attr(RemoveTypeAttr, PokemonType.ELECTRIC, (user) => {
         globalScene.queueMessage(i18next.t("moveTriggers:usedUpAllElectricity", { pokemonName: getPokemonNameWithAffix(user) }));
       }),
-    new AttackMove(Moves.GIGATON_HAMMER, Type.STEEL, MoveCategory.PHYSICAL, 160, 100, 5, -1, 0, 9)
+    new AttackMove(Moves.GIGATON_HAMMER, PokemonType.STEEL, MoveCategory.PHYSICAL, 160, 100, 5, -1, 0, 9)
       .makesContact(false)
       .condition((user, target, move) => {
         const turnMove = user.getLastXMoves(1);
         return !turnMove.length || turnMove[0].move !== move.id || turnMove[0].result !== MoveResult.SUCCESS;
       }), // TODO Add Instruct/Encore interaction
-    new AttackMove(Moves.COMEUPPANCE, Type.DARK, MoveCategory.PHYSICAL, -1, 100, 10, -1, 0, 9)
+    new AttackMove(Moves.COMEUPPANCE, PokemonType.DARK, MoveCategory.PHYSICAL, -1, 100, 10, -1, 0, 9)
       .attr(CounterDamageAttr, (move: Move) => (move.category === MoveCategory.PHYSICAL || move.category === MoveCategory.SPECIAL), 1.5)
       .redirectCounter()
       .target(MoveTarget.ATTACKER),
-    new AttackMove(Moves.AQUA_CUTTER, Type.WATER, MoveCategory.PHYSICAL, 70, 100, 20, -1, 0, 9)
+    new AttackMove(Moves.AQUA_CUTTER, PokemonType.WATER, MoveCategory.PHYSICAL, 70, 100, 20, -1, 0, 9)
       .attr(HighCritAttr)
       .slicingMove()
       .makesContact(false),
-    new AttackMove(Moves.BLAZING_TORQUE, Type.FIRE, MoveCategory.PHYSICAL, 80, 100, 10, 30, 0, 9)
+    new AttackMove(Moves.BLAZING_TORQUE, PokemonType.FIRE, MoveCategory.PHYSICAL, 80, 100, 10, 30, 0, 9)
       .attr(StatusEffectAttr, StatusEffect.BURN)
       .makesContact(false),
-    new AttackMove(Moves.WICKED_TORQUE, Type.DARK, MoveCategory.PHYSICAL, 80, 100, 10, 10, 0, 9)
+    new AttackMove(Moves.WICKED_TORQUE, PokemonType.DARK, MoveCategory.PHYSICAL, 80, 100, 10, 10, 0, 9)
       .attr(StatusEffectAttr, StatusEffect.SLEEP)
       .makesContact(false),
-    new AttackMove(Moves.NOXIOUS_TORQUE, Type.POISON, MoveCategory.PHYSICAL, 100, 100, 10, 30, 0, 9)
+    new AttackMove(Moves.NOXIOUS_TORQUE, PokemonType.POISON, MoveCategory.PHYSICAL, 100, 100, 10, 30, 0, 9)
       .attr(StatusEffectAttr, StatusEffect.POISON)
       .makesContact(false),
-    new AttackMove(Moves.COMBAT_TORQUE, Type.FIGHTING, MoveCategory.PHYSICAL, 100, 100, 10, 30, 0, 9)
+    new AttackMove(Moves.COMBAT_TORQUE, PokemonType.FIGHTING, MoveCategory.PHYSICAL, 100, 100, 10, 30, 0, 9)
       .attr(StatusEffectAttr, StatusEffect.PARALYSIS)
       .makesContact(false),
-    new AttackMove(Moves.MAGICAL_TORQUE, Type.FAIRY, MoveCategory.PHYSICAL, 100, 100, 10, 30, 0, 9)
+    new AttackMove(Moves.MAGICAL_TORQUE, PokemonType.FAIRY, MoveCategory.PHYSICAL, 100, 100, 10, 30, 0, 9)
       .attr(ConfuseAttr)
       .makesContact(false),
-    new AttackMove(Moves.BLOOD_MOON, Type.NORMAL, MoveCategory.SPECIAL, 140, 100, 5, -1, 0, 9)
+    new AttackMove(Moves.BLOOD_MOON, PokemonType.NORMAL, MoveCategory.SPECIAL, 140, 100, 5, -1, 0, 9)
       .condition((user, target, move) => {
         const turnMove = user.getLastXMoves(1);
         return !turnMove.length || turnMove[0].move !== move.id || turnMove[0].result !== MoveResult.SUCCESS;
       }), // TODO Add Instruct/Encore interaction
-    new AttackMove(Moves.MATCHA_GOTCHA, Type.GRASS, MoveCategory.SPECIAL, 80, 90, 15, 20, 0, 9)
+    new AttackMove(Moves.MATCHA_GOTCHA, PokemonType.GRASS, MoveCategory.SPECIAL, 80, 90, 15, 20, 0, 9)
       .attr(HitHealAttr)
       .attr(HealStatusEffectAttr, true, StatusEffect.FREEZE)
       .attr(HealStatusEffectAttr, false, StatusEffect.FREEZE)
       .attr(StatusEffectAttr, StatusEffect.BURN)
       .target(MoveTarget.ALL_NEAR_ENEMIES)
       .triageMove(),
-    new AttackMove(Moves.SYRUP_BOMB, Type.GRASS, MoveCategory.SPECIAL, 60, 85, 10, -1, 0, 9)
+    new AttackMove(Moves.SYRUP_BOMB, PokemonType.GRASS, MoveCategory.SPECIAL, 60, 85, 10, 100, 0, 9)
       .attr(AddBattlerTagAttr, BattlerTagType.SYRUP_BOMB, false, false, 3)
       .ballBombMove(),
-    new AttackMove(Moves.IVY_CUDGEL, Type.GRASS, MoveCategory.PHYSICAL, 100, 100, 10, -1, 0, 9)
+    new AttackMove(Moves.IVY_CUDGEL, PokemonType.GRASS, MoveCategory.PHYSICAL, 100, 100, 10, -1, 0, 9)
       .attr(IvyCudgelTypeAttr)
       .attr(HighCritAttr)
       .makesContact(false),
-    new ChargingAttackMove(Moves.ELECTRO_SHOT, Type.ELECTRIC, MoveCategory.SPECIAL, 130, 100, 10, 100, 0, 9)
+    new ChargingAttackMove(Moves.ELECTRO_SHOT, PokemonType.ELECTRIC, MoveCategory.SPECIAL, 130, 100, 10, 100, 0, 9)
       .chargeText(i18next.t("moveTriggers:absorbedElectricity", { pokemonName: "{USER}" }))
       .chargeAttr(StatStageChangeAttr, [ Stat.SPATK ], 1, true)
       .chargeAttr(WeatherInstantChargeAttr, [ WeatherType.RAIN, WeatherType.HEAVY_RAIN ]),
-    new AttackMove(Moves.TERA_STARSTORM, Type.NORMAL, MoveCategory.SPECIAL, 120, 100, 5, -1, 0, 9)
+    new AttackMove(Moves.TERA_STARSTORM, PokemonType.NORMAL, MoveCategory.SPECIAL, 120, 100, 5, -1, 0, 9)
       .attr(TeraMoveCategoryAttr)
       .attr(TeraStarstormTypeAttr)
-      .attr(VariableTargetAttr, (user, target, move) => (user.hasFusionSpecies(Species.TERAPAGOS) || user.species.speciesId === Species.TERAPAGOS) && user.isTerastallized() ? MoveTarget.ALL_NEAR_ENEMIES : MoveTarget.NEAR_OTHER)
+      .attr(VariableTargetAttr, (user, target, move) => user.hasSpecies(Species.TERAPAGOS) && (user.isTerastallized || globalScene.currentBattle.preTurnCommands[user.getFieldIndex()]?.command === Command.TERA) ? MoveTarget.ALL_NEAR_ENEMIES : MoveTarget.NEAR_OTHER)
       .partial(), /** Does not ignore abilities that affect stats, relevant in determining the move's category {@see TeraMoveCategoryAttr} */
-    new AttackMove(Moves.FICKLE_BEAM, Type.DRAGON, MoveCategory.SPECIAL, 80, 100, 5, 30, 0, 9)
+    new AttackMove(Moves.FICKLE_BEAM, PokemonType.DRAGON, MoveCategory.SPECIAL, 80, 100, 5, 30, 0, 9)
       .attr(PreMoveMessageAttr, doublePowerChanceMessageFunc)
-      .attr(DoublePowerChanceAttr),
-    new SelfStatusMove(Moves.BURNING_BULWARK, Type.FIRE, -1, 10, -1, 4, 9)
+      .attr(DoublePowerChanceAttr)
+      .edgeCase(), // Should not interact with Sheer Force
+    new SelfStatusMove(Moves.BURNING_BULWARK, PokemonType.FIRE, -1, 10, -1, 4, 9)
       .attr(ProtectAttr, BattlerTagType.BURNING_BULWARK)
       .condition(failIfLastCondition),
-    new AttackMove(Moves.THUNDERCLAP, Type.ELECTRIC, MoveCategory.SPECIAL, 70, 100, 5, -1, 1, 9)
-      .condition((user, target, move) => globalScene.currentBattle.turnCommands[target.getBattlerIndex()]?.command === Command.FIGHT && !target.turnData.acted && allMoves[globalScene.currentBattle.turnCommands[target.getBattlerIndex()]?.move?.move!].category !== MoveCategory.STATUS), // TODO: is this bang correct?
-    new AttackMove(Moves.MIGHTY_CLEAVE, Type.ROCK, MoveCategory.PHYSICAL, 95, 100, 5, -1, 0, 9)
+    new AttackMove(Moves.THUNDERCLAP, PokemonType.ELECTRIC, MoveCategory.SPECIAL, 70, 100, 5, -1, 1, 9)
+      .condition((user, target, move) => {
+        const turnCommand = globalScene.currentBattle.turnCommands[target.getBattlerIndex()];
+        if (!turnCommand || !turnCommand.move) {
+          return false;
+        }
+        return (turnCommand.command === Command.FIGHT && !target.turnData.acted && allMoves[turnCommand.move.move].category !== MoveCategory.STATUS);
+      }),
+    new AttackMove(Moves.MIGHTY_CLEAVE, PokemonType.ROCK, MoveCategory.PHYSICAL, 95, 100, 5, -1, 0, 9)
       .slicingMove()
       .ignoresProtect(),
-    new AttackMove(Moves.TACHYON_CUTTER, Type.STEEL, MoveCategory.SPECIAL, 50, -1, 10, -1, 0, 9)
+    new AttackMove(Moves.TACHYON_CUTTER, PokemonType.STEEL, MoveCategory.SPECIAL, 50, -1, 10, -1, 0, 9)
       .attr(MultiHitAttr, MultiHitType._2)
       .slicingMove(),
-    new AttackMove(Moves.HARD_PRESS, Type.STEEL, MoveCategory.PHYSICAL, -1, 100, 10, -1, 0, 9)
+    new AttackMove(Moves.HARD_PRESS, PokemonType.STEEL, MoveCategory.PHYSICAL, -1, 100, 10, -1, 0, 9)
       .attr(OpponentHighHpPowerAttr, 100),
-    new StatusMove(Moves.DRAGON_CHEER, Type.DRAGON, -1, 15, -1, 0, 9)
+    new StatusMove(Moves.DRAGON_CHEER, PokemonType.DRAGON, -1, 15, -1, 0, 9)
       .attr(AddBattlerTagAttr, BattlerTagType.DRAGON_CHEER, false, true)
       .target(MoveTarget.NEAR_ALLY),
-    new AttackMove(Moves.ALLURING_VOICE, Type.FAIRY, MoveCategory.SPECIAL, 80, 100, 10, -1, 0, 9)
+    new AttackMove(Moves.ALLURING_VOICE, PokemonType.FAIRY, MoveCategory.SPECIAL, 80, 100, 10, 100, 0, 9)
       .attr(AddBattlerTagIfBoostedAttr, BattlerTagType.CONFUSED)
       .soundBased(),
-    new AttackMove(Moves.TEMPER_FLARE, Type.FIRE, MoveCategory.PHYSICAL, 75, 100, 10, -1, 0, 9)
+    new AttackMove(Moves.TEMPER_FLARE, PokemonType.FIRE, MoveCategory.PHYSICAL, 75, 100, 10, -1, 0, 9)
       .attr(MovePowerMultiplierAttr, (user, target, move) => user.getLastXMoves(2)[1]?.result === MoveResult.MISS || user.getLastXMoves(2)[1]?.result === MoveResult.FAIL ? 2 : 1),
-    new AttackMove(Moves.SUPERCELL_SLAM, Type.ELECTRIC, MoveCategory.PHYSICAL, 100, 95, 15, -1, 0, 9)
+    new AttackMove(Moves.SUPERCELL_SLAM, PokemonType.ELECTRIC, MoveCategory.PHYSICAL, 100, 95, 15, -1, 0, 9)
+      .attr(AlwaysHitMinimizeAttr)
+      .attr(HitsTagForDoubleDamageAttr, BattlerTagType.MINIMIZED)
       .attr(MissEffectAttr, crashDamageFunc)
       .attr(NoEffectAttr, crashDamageFunc)
       .recklessMove(),
-    new AttackMove(Moves.PSYCHIC_NOISE, Type.PSYCHIC, MoveCategory.SPECIAL, 75, 100, 10, -1, 0, 9)
+    new AttackMove(Moves.PSYCHIC_NOISE, PokemonType.PSYCHIC, MoveCategory.SPECIAL, 75, 100, 10, 100, 0, 9)
       .soundBased()
       .attr(AddBattlerTagAttr, BattlerTagType.HEAL_BLOCK, false, false, 2),
-    new AttackMove(Moves.UPPER_HAND, Type.FIGHTING, MoveCategory.PHYSICAL, 65, 100, 15, 100, 3, 9)
+    new AttackMove(Moves.UPPER_HAND, PokemonType.FIGHTING, MoveCategory.PHYSICAL, 65, 100, 15, 100, 3, 9)
       .attr(FlinchAttr)
       .condition(new UpperHandCondition()),
-    new AttackMove(Moves.MALIGNANT_CHAIN, Type.POISON, MoveCategory.SPECIAL, 100, 100, 5, 50, 0, 9)
+    new AttackMove(Moves.MALIGNANT_CHAIN, PokemonType.POISON, MoveCategory.SPECIAL, 100, 100, 5, 50, 0, 9)
       .attr(StatusEffectAttr, StatusEffect.TOXIC)
   );
   allMoves.map(m => {
diff --git a/src/data/mystery-encounters/encounters/a-trainers-test-encounter.ts b/src/data/mystery-encounters/encounters/a-trainers-test-encounter.ts
index 407644ee939..48b36369190 100644
--- a/src/data/mystery-encounters/encounters/a-trainers-test-encounter.ts
+++ b/src/data/mystery-encounters/encounters/a-trainers-test-encounter.ts
@@ -1,7 +1,12 @@
 import { globalScene } from "#app/global-scene";
 import type { EnemyPartyConfig } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
-import { initBattleWithEnemyConfig, leaveEncounterWithoutBattle, setEncounterRewards, transitionMysteryEncounterIntroVisuals, } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
-import { trainerConfigs, } from "#app/data/trainer-config";
+import {
+  initBattleWithEnemyConfig,
+  leaveEncounterWithoutBattle,
+  setEncounterRewards,
+  transitionMysteryEncounterIntroVisuals,
+} from "#app/data/mystery-encounters/utils/encounter-phase-utils";
+import { trainerConfigs } from "#app/data/trainers/trainer-config";
 import { MysteryEncounterType } from "#enums/mystery-encounter-type";
 import type MysteryEncounter from "#app/data/mystery-encounters/mystery-encounter";
 import { MysteryEncounterBuilder } from "#app/data/mystery-encounters/mystery-encounter";
@@ -9,7 +14,7 @@ import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
 import { TrainerType } from "#enums/trainer-type";
 import { Species } from "#enums/species";
 import { getSpriteKeysFromSpecies } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils";
-import { randSeedInt } from "#app/utils";
+import { randSeedInt } from "#app/utils/common";
 import i18next from "i18next";
 import type { IEggOptions } from "#app/data/egg";
 import { EggSourceType } from "#enums/egg-source-types";
@@ -17,7 +22,7 @@ import { EggTier } from "#enums/egg-type";
 import { PartyHealPhase } from "#app/phases/party-heal-phase";
 import { ModifierTier } from "#app/modifier/modifier-tier";
 import { modifierTypes } from "#app/modifier/modifier-type";
-import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/game-mode";
+import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants";
 
 /** the i18n namespace for the encounter */
 const namespace = "mysteryEncounters/aTrainersTest";
@@ -27,161 +32,172 @@ const namespace = "mysteryEncounters/aTrainersTest";
  * @see {@link https://github.com/pagefaultgames/pokerogue/issues/3816 | GitHub Issue #3816}
  * @see For biome requirements check {@linkcode mysteryEncountersByBiome}
  */
-export const ATrainersTestEncounter: MysteryEncounter =
-  MysteryEncounterBuilder.withEncounterType(MysteryEncounterType.A_TRAINERS_TEST)
-    .withEncounterTier(MysteryEncounterTier.ROGUE)
-    .withSceneWaveRangeRequirement(100, CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES[1])
-    .withIntroSpriteConfigs([]) // These are set in onInit()
-    .withIntroDialogue([
+export const ATrainersTestEncounter: MysteryEncounter = MysteryEncounterBuilder.withEncounterType(
+  MysteryEncounterType.A_TRAINERS_TEST,
+)
+  .withEncounterTier(MysteryEncounterTier.ROGUE)
+  .withSceneWaveRangeRequirement(100, CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES[1])
+  .withIntroSpriteConfigs([]) // These are set in onInit()
+  .withIntroDialogue([
+    {
+      text: `${namespace}:intro`,
+    },
+  ])
+  .withAutoHideIntroVisuals(false)
+  .withOnInit(() => {
+    const encounter = globalScene.currentBattle.mysteryEncounter!;
+
+    // Randomly pick from 1 of the 5 stat trainers to spawn
+    let trainerType: TrainerType;
+    let spriteKeys: { spriteKey: any; fileRoot: any };
+    let trainerNameKey: string;
+    switch (randSeedInt(5)) {
+      case 1:
+        trainerType = TrainerType.CHERYL;
+        spriteKeys = getSpriteKeysFromSpecies(Species.BLISSEY);
+        trainerNameKey = "cheryl";
+        break;
+      case 2:
+        trainerType = TrainerType.MARLEY;
+        spriteKeys = getSpriteKeysFromSpecies(Species.ARCANINE);
+        trainerNameKey = "marley";
+        break;
+      case 3:
+        trainerType = TrainerType.MIRA;
+        spriteKeys = getSpriteKeysFromSpecies(Species.ALAKAZAM, false, 1);
+        trainerNameKey = "mira";
+        break;
+      case 4:
+        trainerType = TrainerType.RILEY;
+        spriteKeys = getSpriteKeysFromSpecies(Species.LUCARIO, false, 1);
+        trainerNameKey = "riley";
+        break;
+      default:
+        trainerType = TrainerType.BUCK;
+        spriteKeys = getSpriteKeysFromSpecies(Species.CLAYDOL);
+        trainerNameKey = "buck";
+        break;
+    }
+
+    // Dialogue and tokens for trainer
+    encounter.dialogue.intro = [
       {
-        text: `${namespace}:intro`,
+        speaker: `trainerNames:${trainerNameKey}`,
+        text: `${namespace}:${trainerNameKey}.intro_dialogue`,
       },
-    ])
-    .withAutoHideIntroVisuals(false)
-    .withOnInit(() => {
+    ];
+    encounter.options[0].dialogue!.selected = [
+      {
+        speaker: `trainerNames:${trainerNameKey}`,
+        text: `${namespace}:${trainerNameKey}.accept`,
+      },
+    ];
+    encounter.options[1].dialogue!.selected = [
+      {
+        speaker: `trainerNames:${trainerNameKey}`,
+        text: `${namespace}:${trainerNameKey}.decline`,
+      },
+    ];
+
+    encounter.setDialogueToken("statTrainerName", i18next.t(`trainerNames:${trainerNameKey}`));
+    const eggDescription = `${i18next.t(`${namespace}:title`)}:\n${i18next.t(`trainerNames:${trainerNameKey}`)}`;
+    encounter.misc = {
+      trainerType,
+      trainerNameKey,
+      trainerEggDescription: eggDescription,
+    };
+
+    // Trainer config
+    const trainerConfig = trainerConfigs[trainerType].clone();
+    const trainerSpriteKey = trainerConfig.getSpriteKey();
+    encounter.enemyPartyConfigs.push({
+      levelAdditiveModifier: 1,
+      trainerConfig: trainerConfig,
+    });
+
+    encounter.spriteConfigs = [
+      {
+        spriteKey: spriteKeys.spriteKey,
+        fileRoot: spriteKeys.fileRoot,
+        hasShadow: true,
+        repeat: true,
+        isPokemon: true,
+        x: 22,
+        y: -2,
+        yShadow: -2,
+      },
+      {
+        spriteKey: trainerSpriteKey,
+        fileRoot: "trainer",
+        hasShadow: true,
+        disableAnimation: true,
+        x: -24,
+        y: 4,
+        yShadow: 4,
+      },
+    ];
+
+    return true;
+  })
+  .setLocalizationKey(`${namespace}`)
+  .withTitle(`${namespace}:title`)
+  .withDescription(`${namespace}:description`)
+  .withQuery(`${namespace}:query`)
+  .withIntroDialogue()
+  .withSimpleOption(
+    {
+      buttonLabel: `${namespace}:option.1.label`,
+      buttonTooltip: `${namespace}:option.1.tooltip`,
+    },
+    async () => {
       const encounter = globalScene.currentBattle.mysteryEncounter!;
+      // Battle the stat trainer for an Egg and great rewards
+      const config: EnemyPartyConfig = encounter.enemyPartyConfigs[0];
 
-      // Randomly pick from 1 of the 5 stat trainers to spawn
-      let trainerType: TrainerType;
-      let spriteKeys;
-      let trainerNameKey: string;
-      switch (randSeedInt(5)) {
-        default:
-        case 0:
-          trainerType = TrainerType.BUCK;
-          spriteKeys = getSpriteKeysFromSpecies(Species.CLAYDOL);
-          trainerNameKey = "buck";
-          break;
-        case 1:
-          trainerType = TrainerType.CHERYL;
-          spriteKeys = getSpriteKeysFromSpecies(Species.BLISSEY);
-          trainerNameKey = "cheryl";
-          break;
-        case 2:
-          trainerType = TrainerType.MARLEY;
-          spriteKeys = getSpriteKeysFromSpecies(Species.ARCANINE);
-          trainerNameKey = "marley";
-          break;
-        case 3:
-          trainerType = TrainerType.MIRA;
-          spriteKeys = getSpriteKeysFromSpecies(Species.ALAKAZAM, false, 1);
-          trainerNameKey = "mira";
-          break;
-        case 4:
-          trainerType = TrainerType.RILEY;
-          spriteKeys = getSpriteKeysFromSpecies(Species.LUCARIO, false, 1);
-          trainerNameKey = "riley";
-          break;
-      }
+      await transitionMysteryEncounterIntroVisuals();
 
-      // Dialogue and tokens for trainer
-      encounter.dialogue.intro = [
+      const eggOptions: IEggOptions = {
+        pulled: false,
+        sourceType: EggSourceType.EVENT,
+        eggDescriptor: encounter.misc.trainerEggDescription,
+        tier: EggTier.EPIC,
+      };
+      encounter.setDialogueToken("eggType", i18next.t(`${namespace}:eggTypes.epic`));
+      setEncounterRewards(
         {
-          speaker: `trainerNames:${trainerNameKey}`,
-          text: `${namespace}:${trainerNameKey}.intro_dialogue`
-        }
-      ];
-      encounter.options[0].dialogue!.selected = [
-        {
-          speaker: `trainerNames:${trainerNameKey}`,
-          text: `${namespace}:${trainerNameKey}.accept`
-        }
-      ];
-      encounter.options[1].dialogue!.selected = [
-        {
-          speaker: `trainerNames:${trainerNameKey}`,
-          text: `${namespace}:${trainerNameKey}.decline`
-        }
-      ];
-
-      encounter.setDialogueToken("statTrainerName", i18next.t(`trainerNames:${trainerNameKey}`));
-      const eggDescription = i18next.t(`${namespace}:title`) + ":\n" + i18next.t(`trainerNames:${trainerNameKey}`);
-      encounter.misc = { trainerType, trainerNameKey, trainerEggDescription: eggDescription };
-
-      // Trainer config
-      const trainerConfig = trainerConfigs[trainerType].clone();
-      const trainerSpriteKey = trainerConfig.getSpriteKey();
-      encounter.enemyPartyConfigs.push({
-        levelAdditiveModifier: 1,
-        trainerConfig: trainerConfig
-      });
-
-      encounter.spriteConfigs = [
-        {
-          spriteKey: spriteKeys.spriteKey,
-          fileRoot: spriteKeys.fileRoot,
-          hasShadow: true,
-          repeat: true,
-          isPokemon: true,
-          x: 22,
-          y: -2,
-          yShadow: -2
+          guaranteedModifierTypeFuncs: [modifierTypes.SACRED_ASH],
+          guaranteedModifierTiers: [ModifierTier.ROGUE, ModifierTier.ULTRA],
+          fillRemaining: true,
         },
-        {
-          spriteKey: trainerSpriteKey,
-          fileRoot: "trainer",
-          hasShadow: true,
-          disableAnimation: true,
-          x: -24,
-          y: 4,
-          yShadow: 4
-        }
-      ];
+        [eggOptions],
+      );
+      await initBattleWithEnemyConfig(config);
+    },
+  )
+  .withSimpleOption(
+    {
+      buttonLabel: `${namespace}:option.2.label`,
+      buttonTooltip: `${namespace}:option.2.tooltip`,
+    },
+    async () => {
+      const encounter = globalScene.currentBattle.mysteryEncounter!;
+      // Full heal party
+      globalScene.unshiftPhase(new PartyHealPhase(true));
 
-      return true;
-    })
-    .setLocalizationKey(`${namespace}`)
-    .withTitle(`${namespace}:title`)
-    .withDescription(`${namespace}:description`)
-    .withQuery(`${namespace}:query`)
-    .withIntroDialogue()
-    .withSimpleOption(
-      {
-        buttonLabel: `${namespace}:option.1.label`,
-        buttonTooltip: `${namespace}:option.1.tooltip`
-      },
-      async () => {
-        const encounter = globalScene.currentBattle.mysteryEncounter!;
-        // Battle the stat trainer for an Egg and great rewards
-        const config: EnemyPartyConfig = encounter.enemyPartyConfigs[0];
-
-        await transitionMysteryEncounterIntroVisuals();
-
-        const eggOptions: IEggOptions = {
-          pulled: false,
-          sourceType: EggSourceType.EVENT,
-          eggDescriptor: encounter.misc.trainerEggDescription,
-          tier: EggTier.EPIC
-        };
-        encounter.setDialogueToken("eggType", i18next.t(`${namespace}:eggTypes.epic`));
-        setEncounterRewards({ guaranteedModifierTypeFuncs: [ modifierTypes.SACRED_ASH ], guaranteedModifierTiers: [ ModifierTier.ROGUE, ModifierTier.ULTRA ], fillRemaining: true }, [ eggOptions ]);
-        await initBattleWithEnemyConfig(config);
-      }
-    )
-    .withSimpleOption(
-      {
-        buttonLabel: `${namespace}:option.2.label`,
-        buttonTooltip: `${namespace}:option.2.tooltip`
-      },
-      async () => {
-        const encounter = globalScene.currentBattle.mysteryEncounter!;
-        // Full heal party
-        globalScene.unshiftPhase(new PartyHealPhase(true));
-
-        const eggOptions: IEggOptions = {
-          pulled: false,
-          sourceType: EggSourceType.EVENT,
-          eggDescriptor: encounter.misc.trainerEggDescription,
-          tier: EggTier.RARE
-        };
-        encounter.setDialogueToken("eggType", i18next.t(`${namespace}:eggTypes.rare`));
-        setEncounterRewards({ fillRemaining: false, rerollMultiplier: -1 }, [ eggOptions ]);
-        leaveEncounterWithoutBattle();
-      }
-    )
-    .withOutroDialogue([
-      {
-        text: `${namespace}:outro`
-      }
-    ])
-    .build();
+      const eggOptions: IEggOptions = {
+        pulled: false,
+        sourceType: EggSourceType.EVENT,
+        eggDescriptor: encounter.misc.trainerEggDescription,
+        tier: EggTier.RARE,
+      };
+      encounter.setDialogueToken("eggType", i18next.t(`${namespace}:eggTypes.rare`));
+      setEncounterRewards({ fillRemaining: false, rerollMultiplier: -1 }, [eggOptions]);
+      leaveEncounterWithoutBattle();
+    },
+  )
+  .withOutroDialogue([
+    {
+      text: `${namespace}:outro`,
+    },
+  ])
+  .build();
diff --git a/src/data/mystery-encounters/encounters/absolute-avarice-encounter.ts b/src/data/mystery-encounters/encounters/absolute-avarice-encounter.ts
index 1499d953941..acfc8cb16a1 100644
--- a/src/data/mystery-encounters/encounters/absolute-avarice-encounter.ts
+++ b/src/data/mystery-encounters/encounters/absolute-avarice-encounter.ts
@@ -1,5 +1,11 @@
 import type { EnemyPartyConfig } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
-import { generateModifierType, initBattleWithEnemyConfig, leaveEncounterWithoutBattle, setEncounterRewards, transitionMysteryEncounterIntroVisuals, } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
+import {
+  generateModifierType,
+  initBattleWithEnemyConfig,
+  leaveEncounterWithoutBattle,
+  setEncounterRewards,
+  transitionMysteryEncounterIntroVisuals,
+} from "#app/data/mystery-encounters/utils/encounter-phase-utils";
 import type Pokemon from "#app/field/pokemon";
 import { EnemyPokemon, PokemonMove } from "#app/field/pokemon";
 import type { BerryModifierType, PokemonHeldItemModifierType } from "#app/modifier/modifier-type";
@@ -18,16 +24,19 @@ import { BerryModifier, PokemonInstantReviveModifier } from "#app/modifier/modif
 import { getPokemonSpecies } from "#app/data/pokemon-species";
 import { Moves } from "#enums/moves";
 import { BattlerTagType } from "#enums/battler-tag-type";
-import { randInt } from "#app/utils";
+import { randInt } from "#app/utils/common";
 import { BattlerIndex } from "#app/battle";
-import { applyModifierTypeToPlayerPokemon, catchPokemon, getHighestLevelPlayerPokemon } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils";
-import { TrainerSlot } from "#app/data/trainer-config";
+import {
+  applyModifierTypeToPlayerPokemon,
+  catchPokemon,
+  getHighestLevelPlayerPokemon,
+} from "#app/data/mystery-encounters/utils/encounter-pokemon-utils";
+import { TrainerSlot } from "#enums/trainer-slot";
 import { PokeballType } from "#enums/pokeball";
 import type HeldModifierConfig from "#app/interfaces/held-modifier-config";
 import type { BerryType } from "#enums/berry-type";
 import { StatStageChangePhase } from "#app/phases/stat-stage-change-phase";
 import { Stat } from "#enums/stat";
-import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/game-mode";
 import i18next from "i18next";
 
 /** the i18n namespace for this encounter */
@@ -38,339 +47,348 @@ const namespace = "mysteryEncounters/absoluteAvarice";
  * @see {@link https://github.com/pagefaultgames/pokerogue/issues/3805 | GitHub Issue #3805}
  * @see For biome requirements check {@linkcode mysteryEncountersByBiome}
  */
-export const AbsoluteAvariceEncounter: MysteryEncounter =
-  MysteryEncounterBuilder.withEncounterType(MysteryEncounterType.ABSOLUTE_AVARICE)
-    .withEncounterTier(MysteryEncounterTier.GREAT)
-    .withSceneWaveRangeRequirement(...CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES)
-    .withSceneRequirement(new PersistentModifierRequirement("BerryModifier", 4)) // Must have at least 4 berries to spawn
-    .withFleeAllowed(false)
-    .withIntroSpriteConfigs([
-      {
-        // This sprite has the shadow
-        spriteKey: "",
-        fileRoot: "",
-        species: Species.GREEDENT,
-        hasShadow: true,
-        alpha: 0.001,
-        repeat: true,
-        x: -5
-      },
-      {
-        spriteKey: "",
-        fileRoot: "",
-        species: Species.GREEDENT,
-        hasShadow: false,
-        repeat: true,
-        x: -5
-      },
-      {
-        spriteKey: "lum_berry",
-        fileRoot: "items",
-        isItem: true,
-        x: 7,
-        y: -14,
-        hidden: true,
-        disableAnimation: true
-      },
-      {
-        spriteKey: "salac_berry",
-        fileRoot: "items",
-        isItem: true,
-        x: 2,
-        y: 4,
-        hidden: true,
-        disableAnimation: true
-      },
-      {
-        spriteKey: "lansat_berry",
-        fileRoot: "items",
-        isItem: true,
-        x: 32,
-        y: 5,
-        hidden: true,
-        disableAnimation: true
-      },
-      {
-        spriteKey: "liechi_berry",
-        fileRoot: "items",
-        isItem: true,
-        x: 6,
-        y: -5,
-        hidden: true,
-        disableAnimation: true
-      },
-      {
-        spriteKey: "sitrus_berry",
-        fileRoot: "items",
-        isItem: true,
-        x: 7,
-        y: 8,
-        hidden: true,
-        disableAnimation: true
-      },
-      {
-        spriteKey: "enigma_berry",
-        fileRoot: "items",
-        isItem: true,
-        x: 26,
-        y: -4,
-        hidden: true,
-        disableAnimation: true
-      },
-      {
-        spriteKey: "leppa_berry",
-        fileRoot: "items",
-        isItem: true,
-        x: 16,
-        y: -27,
-        hidden: true,
-        disableAnimation: true
-      },
-      {
-        spriteKey: "petaya_berry",
-        fileRoot: "items",
-        isItem: true,
-        x: 30,
-        y: -17,
-        hidden: true,
-        disableAnimation: true
-      },
-      {
-        spriteKey: "ganlon_berry",
-        fileRoot: "items",
-        isItem: true,
-        x: 16,
-        y: -11,
-        hidden: true,
-        disableAnimation: true
-      },
-      {
-        spriteKey: "apicot_berry",
-        fileRoot: "items",
-        isItem: true,
-        x: 14,
-        y: -2,
-        hidden: true,
-        disableAnimation: true
-      },
-      {
-        spriteKey: "starf_berry",
-        fileRoot: "items",
-        isItem: true,
-        x: 18,
-        y: 9,
-        hidden: true,
-        disableAnimation: true
-      },
-    ])
-    .withHideWildIntroMessage(true)
-    .withAutoHideIntroVisuals(false)
-    .withIntroDialogue([
-      {
-        text: `${namespace}:intro`,
+export const AbsoluteAvariceEncounter: MysteryEncounter = MysteryEncounterBuilder.withEncounterType(
+  MysteryEncounterType.ABSOLUTE_AVARICE,
+)
+  .withEncounterTier(MysteryEncounterTier.GREAT)
+  .withSceneWaveRangeRequirement(20, 180)
+  .withSceneRequirement(new PersistentModifierRequirement("BerryModifier", 6)) // Must have at least 6 berries to spawn
+  .withFleeAllowed(false)
+  .withIntroSpriteConfigs([
+    {
+      // This sprite has the shadow
+      spriteKey: "",
+      fileRoot: "",
+      species: Species.GREEDENT,
+      hasShadow: true,
+      alpha: 0.001,
+      repeat: true,
+      x: -5,
+    },
+    {
+      spriteKey: "",
+      fileRoot: "",
+      species: Species.GREEDENT,
+      hasShadow: false,
+      repeat: true,
+      x: -5,
+    },
+    {
+      spriteKey: "lum_berry",
+      fileRoot: "items",
+      isItem: true,
+      x: 7,
+      y: -14,
+      hidden: true,
+      disableAnimation: true,
+    },
+    {
+      spriteKey: "salac_berry",
+      fileRoot: "items",
+      isItem: true,
+      x: 2,
+      y: 4,
+      hidden: true,
+      disableAnimation: true,
+    },
+    {
+      spriteKey: "lansat_berry",
+      fileRoot: "items",
+      isItem: true,
+      x: 32,
+      y: 5,
+      hidden: true,
+      disableAnimation: true,
+    },
+    {
+      spriteKey: "liechi_berry",
+      fileRoot: "items",
+      isItem: true,
+      x: 6,
+      y: -5,
+      hidden: true,
+      disableAnimation: true,
+    },
+    {
+      spriteKey: "sitrus_berry",
+      fileRoot: "items",
+      isItem: true,
+      x: 7,
+      y: 8,
+      hidden: true,
+      disableAnimation: true,
+    },
+    {
+      spriteKey: "enigma_berry",
+      fileRoot: "items",
+      isItem: true,
+      x: 26,
+      y: -4,
+      hidden: true,
+      disableAnimation: true,
+    },
+    {
+      spriteKey: "leppa_berry",
+      fileRoot: "items",
+      isItem: true,
+      x: 16,
+      y: -27,
+      hidden: true,
+      disableAnimation: true,
+    },
+    {
+      spriteKey: "petaya_berry",
+      fileRoot: "items",
+      isItem: true,
+      x: 30,
+      y: -17,
+      hidden: true,
+      disableAnimation: true,
+    },
+    {
+      spriteKey: "ganlon_berry",
+      fileRoot: "items",
+      isItem: true,
+      x: 16,
+      y: -11,
+      hidden: true,
+      disableAnimation: true,
+    },
+    {
+      spriteKey: "apicot_berry",
+      fileRoot: "items",
+      isItem: true,
+      x: 14,
+      y: -2,
+      hidden: true,
+      disableAnimation: true,
+    },
+    {
+      spriteKey: "starf_berry",
+      fileRoot: "items",
+      isItem: true,
+      x: 18,
+      y: 9,
+      hidden: true,
+      disableAnimation: true,
+    },
+  ])
+  .withHideWildIntroMessage(true)
+  .withAutoHideIntroVisuals(false)
+  .withIntroDialogue([
+    {
+      text: `${namespace}:intro`,
+    },
+  ])
+  .setLocalizationKey(`${namespace}`)
+  .withTitle(`${namespace}:title`)
+  .withDescription(`${namespace}:description`)
+  .withQuery(`${namespace}:query`)
+  .withOnInit(() => {
+    const encounter = globalScene.currentBattle.mysteryEncounter!;
+
+    globalScene.loadSe("PRSFX- Bug Bite", "battle_anims", "PRSFX- Bug Bite.wav");
+    globalScene.loadSe("Follow Me", "battle_anims", "Follow Me.mp3");
+
+    // Get all player berry items, remove from party, and store reference
+    const berryItems = globalScene.findModifiers(m => m instanceof BerryModifier) as BerryModifier[];
+
+    // Sort berries by party member ID to more easily re-add later if necessary
+    const berryItemsMap = new Map<number, BerryModifier[]>();
+    globalScene.getPlayerParty().forEach(pokemon => {
+      const pokemonBerries = berryItems.filter(b => b.pokemonId === pokemon.id);
+      if (pokemonBerries?.length > 0) {
+        berryItemsMap.set(pokemon.id, pokemonBerries);
       }
-    ])
-    .setLocalizationKey(`${namespace}`)
-    .withTitle(`${namespace}:title`)
-    .withDescription(`${namespace}:description`)
-    .withQuery(`${namespace}:query`)
-    .withOnInit(() => {
-      const encounter = globalScene.currentBattle.mysteryEncounter!;
+    });
 
-      globalScene.loadSe("PRSFX- Bug Bite", "battle_anims", "PRSFX- Bug Bite.wav");
-      globalScene.loadSe("Follow Me", "battle_anims", "Follow Me.mp3");
+    encounter.misc = { berryItemsMap };
 
-      // Get all player berry items, remove from party, and store reference
-      const berryItems = globalScene.findModifiers(m => m instanceof BerryModifier) as BerryModifier[];
+    // Generates copies of the stolen berries to put on the Greedent
+    const bossModifierConfigs: HeldModifierConfig[] = [];
+    berryItems.forEach(berryMod => {
+      // Can't define stack count on a ModifierType, have to just create separate instances for each stack
+      // Overflow berries will be "lost" on the boss, but it's un-catchable anyway
+      for (let i = 0; i < berryMod.stackCount; i++) {
+        const modifierType = generateModifierType(modifierTypes.BERRY, [
+          berryMod.berryType,
+        ]) as PokemonHeldItemModifierType;
+        bossModifierConfigs.push({ modifier: modifierType });
+      }
+    });
 
-      // Sort berries by party member ID to more easily re-add later if necessary
-      const berryItemsMap = new Map<number, BerryModifier[]>();
-      globalScene.getPlayerParty().forEach(pokemon => {
-        const pokemonBerries = berryItems.filter(b => b.pokemonId === pokemon.id);
-        if (pokemonBerries?.length > 0) {
-          berryItemsMap.set(pokemon.id, pokemonBerries);
-        }
-      });
+    // Do NOT remove the real berries yet or else it will be persisted in the session data
 
-      encounter.misc = { berryItemsMap };
+    // +1 SpDef below wave 50, SpDef and Speed otherwise
+    const statChangesForBattle: (Stat.ATK | Stat.DEF | Stat.SPATK | Stat.SPDEF | Stat.SPD | Stat.ACC | Stat.EVA)[] =
+      globalScene.currentBattle.waveIndex < 50 ? [Stat.SPDEF] : [Stat.SPDEF, Stat.SPD];
 
-      // Generates copies of the stolen berries to put on the Greedent
-      const bossModifierConfigs: HeldModifierConfig[] = [];
-      berryItems.forEach(berryMod => {
-        // Can't define stack count on a ModifierType, have to just create separate instances for each stack
-        // Overflow berries will be "lost" on the boss, but it's un-catchable anyway
-        for (let i = 0; i < berryMod.stackCount; i++) {
-          const modifierType = generateModifierType(modifierTypes.BERRY, [ berryMod.berryType ]) as PokemonHeldItemModifierType;
-          bossModifierConfigs.push({ modifier: modifierType });
-        }
-      });
+    // Calculate boss mon
+    const config: EnemyPartyConfig = {
+      levelAdditiveModifier: 1,
+      pokemonConfigs: [
+        {
+          species: getPokemonSpecies(Species.GREEDENT),
+          isBoss: true,
+          bossSegments: 3,
+          shiny: false, // Shiny lock because of consistency issues between the different options
+          moveSet: [Moves.THRASH, Moves.CRUNCH, Moves.BODY_PRESS, Moves.SLACK_OFF],
+          modifierConfigs: bossModifierConfigs,
+          tags: [BattlerTagType.MYSTERY_ENCOUNTER_POST_SUMMON],
+          mysteryEncounterBattleEffects: (pokemon: Pokemon) => {
+            queueEncounterMessage(`${namespace}:option.1.boss_enraged`);
+            globalScene.unshiftPhase(
+              new StatStageChangePhase(pokemon.getBattlerIndex(), true, statChangesForBattle, 1),
+            );
+          },
+        },
+      ],
+    };
 
-      // Do NOT remove the real berries yet or else it will be persisted in the session data
+    encounter.enemyPartyConfigs = [config];
+    encounter.setDialogueToken("greedentName", getPokemonSpecies(Species.GREEDENT).getName());
 
-      // SpDef buff below wave 50, +1 to all stats otherwise
-      const statChangesForBattle: (Stat.ATK | Stat.DEF | Stat.SPATK | Stat.SPDEF | Stat.SPD | Stat.ACC | Stat.EVA)[] = globalScene.currentBattle.waveIndex < 50 ?
-        [ Stat.SPDEF ] :
-        [ Stat.ATK, Stat.DEF, Stat.SPATK, Stat.SPDEF, Stat.SPD ];
+    return true;
+  })
+  .withOnVisualsStart(() => {
+    doGreedentSpriteSteal();
+    doBerrySpritePile();
 
-      // Calculate boss mon
-      const config: EnemyPartyConfig = {
-        levelAdditiveModifier: 1,
-        pokemonConfigs: [
+    // Remove the berries from the party
+    // Session has been safely saved at this point, so data won't be lost
+    const berryItems = globalScene.findModifiers(m => m instanceof BerryModifier) as BerryModifier[];
+    berryItems.forEach(berryMod => {
+      globalScene.removeModifier(berryMod);
+    });
+
+    globalScene.updateModifiers(true);
+
+    return true;
+  })
+  .withOption(
+    MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DEFAULT)
+      .withDialogue({
+        buttonLabel: `${namespace}:option.1.label`,
+        buttonTooltip: `${namespace}:option.1.tooltip`,
+        selected: [
           {
-            species: getPokemonSpecies(Species.GREEDENT),
-            isBoss: true,
-            bossSegments: 3,
-            shiny: false, // Shiny lock because of consistency issues between the different options
-            moveSet: [ Moves.THRASH, Moves.BODY_PRESS, Moves.STUFF_CHEEKS, Moves.CRUNCH ],
-            modifierConfigs: bossModifierConfigs,
-            tags: [ BattlerTagType.MYSTERY_ENCOUNTER_POST_SUMMON ],
-            mysteryEncounterBattleEffects: (pokemon: Pokemon) => {
-              queueEncounterMessage(`${namespace}:option.1.boss_enraged`);
-              globalScene.unshiftPhase(new StatStageChangePhase(pokemon.getBattlerIndex(), true, statChangesForBattle, 1));
+            text: `${namespace}:option.1.selected`,
+          },
+        ],
+      })
+      .withOptionPhase(async () => {
+        // Pick battle
+        const encounter = globalScene.currentBattle.mysteryEncounter!;
+
+        // Provides 1x Reviver Seed to each party member at end of battle
+        const revSeed = generateModifierType(modifierTypes.REVIVER_SEED);
+        encounter.setDialogueToken(
+          "foodReward",
+          revSeed?.name ?? i18next.t("modifierType:ModifierType.REVIVER_SEED.name"),
+        );
+        const givePartyPokemonReviverSeeds = () => {
+          const party = globalScene.getPlayerParty();
+          party.forEach(p => {
+            const heldItems = p.getHeldItems();
+            if (revSeed && !heldItems.some(item => item instanceof PokemonInstantReviveModifier)) {
+              const seedModifier = revSeed.newModifier(p);
+              globalScene.addModifier(seedModifier, false, false, false, true);
+            }
+          });
+          queueEncounterMessage(`${namespace}:option.1.food_stash`);
+        };
+
+        setEncounterRewards({ fillRemaining: true }, undefined, givePartyPokemonReviverSeeds);
+        encounter.startOfBattleEffects.push({
+          sourceBattlerIndex: BattlerIndex.ENEMY,
+          targets: [BattlerIndex.ENEMY],
+          move: new PokemonMove(Moves.STUFF_CHEEKS),
+          ignorePp: true,
+        });
+
+        await transitionMysteryEncounterIntroVisuals(true, true, 500);
+        await initBattleWithEnemyConfig(encounter.enemyPartyConfigs[0]);
+      })
+      .build(),
+  )
+  .withOption(
+    MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DEFAULT)
+      .withDialogue({
+        buttonLabel: `${namespace}:option.2.label`,
+        buttonTooltip: `${namespace}:option.2.tooltip`,
+        selected: [
+          {
+            text: `${namespace}:option.2.selected`,
+          },
+        ],
+      })
+      .withOptionPhase(async () => {
+        const encounter = globalScene.currentBattle.mysteryEncounter!;
+        const berryMap = encounter.misc.berryItemsMap;
+
+        // Returns 2/5 of the berries stolen to each Pokemon
+        const party = globalScene.getPlayerParty();
+        party.forEach(pokemon => {
+          const stolenBerries: BerryModifier[] = berryMap.get(pokemon.id);
+          const berryTypesAsArray: BerryType[] = [];
+          stolenBerries?.forEach(bMod => berryTypesAsArray.push(...new Array(bMod.stackCount).fill(bMod.berryType)));
+          const returnedBerryCount = Math.floor(((berryTypesAsArray.length ?? 0) * 2) / 5);
+
+          if (returnedBerryCount > 0) {
+            for (let i = 0; i < returnedBerryCount; i++) {
+              // Shuffle remaining berry types and pop
+              Phaser.Math.RND.shuffle(berryTypesAsArray);
+              const randBerryType = berryTypesAsArray.pop();
+
+              const berryModType = generateModifierType(modifierTypes.BERRY, [randBerryType]) as BerryModifierType;
+              applyModifierTypeToPlayerPokemon(pokemon, berryModType);
             }
           }
+        });
+        await globalScene.updateModifiers(true);
+
+        await transitionMysteryEncounterIntroVisuals(true, true, 500);
+        leaveEncounterWithoutBattle(true);
+      })
+      .build(),
+  )
+  .withOption(
+    MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DEFAULT)
+      .withDialogue({
+        buttonLabel: `${namespace}:option.3.label`,
+        buttonTooltip: `${namespace}:option.3.tooltip`,
+        selected: [
+          {
+            text: `${namespace}:option.3.selected`,
+          },
         ],
-      };
+      })
+      .withPreOptionPhase(async () => {
+        // Animate berries being eaten
+        doGreedentEatBerries();
+        doBerrySpritePile(true);
+        return true;
+      })
+      .withOptionPhase(async () => {
+        // Let it have the food
+        // Greedent joins the team, level equal to 2 below highest party member (shiny locked)
+        const level = getHighestLevelPlayerPokemon(false, true).level - 2;
+        const greedent = new EnemyPokemon(getPokemonSpecies(Species.GREEDENT), level, TrainerSlot.NONE, false, true);
+        greedent.moveset = [
+          new PokemonMove(Moves.THRASH),
+          new PokemonMove(Moves.BODY_PRESS),
+          new PokemonMove(Moves.STUFF_CHEEKS),
+          new PokemonMove(Moves.SLACK_OFF),
+        ];
+        greedent.passive = true;
 
-      encounter.enemyPartyConfigs = [ config ];
-      encounter.setDialogueToken("greedentName", getPokemonSpecies(Species.GREEDENT).getName());
-
-      return true;
-    })
-    .withOnVisualsStart(() => {
-      doGreedentSpriteSteal();
-      doBerrySpritePile();
-
-      // Remove the berries from the party
-      // Session has been safely saved at this point, so data won't be lost
-      const berryItems = globalScene.findModifiers(m => m instanceof BerryModifier) as BerryModifier[];
-      berryItems.forEach(berryMod => {
-        globalScene.removeModifier(berryMod);
-      });
-
-      globalScene.updateModifiers(true);
-
-      return true;
-    })
-    .withOption(
-      MysteryEncounterOptionBuilder
-        .newOptionWithMode(MysteryEncounterOptionMode.DEFAULT)
-        .withDialogue({
-          buttonLabel: `${namespace}:option.1.label`,
-          buttonTooltip: `${namespace}:option.1.tooltip`,
-          selected: [
-            {
-              text: `${namespace}:option.1.selected`,
-            },
-          ],
-        })
-        .withOptionPhase(async () => {
-          // Pick battle
-          const encounter = globalScene.currentBattle.mysteryEncounter!;
-
-          // Provides 1x Reviver Seed to each party member at end of battle
-          const revSeed = generateModifierType(modifierTypes.REVIVER_SEED);
-          encounter.setDialogueToken("foodReward", revSeed?.name ?? i18next.t("modifierType:ModifierType.REVIVER_SEED.name"));
-          const givePartyPokemonReviverSeeds = () => {
-            const party = globalScene.getPlayerParty();
-            party.forEach(p => {
-              const heldItems = p.getHeldItems();
-              if (revSeed && !heldItems.some(item => item instanceof PokemonInstantReviveModifier)) {
-                const seedModifier = revSeed.newModifier(p);
-                globalScene.addModifier(seedModifier, false, false, false, true);
-              }
-            });
-            queueEncounterMessage(`${namespace}:option.1.food_stash`);
-          };
-
-          setEncounterRewards({ fillRemaining: true }, undefined, givePartyPokemonReviverSeeds);
-          encounter.startOfBattleEffects.push({
-            sourceBattlerIndex: BattlerIndex.ENEMY,
-            targets: [ BattlerIndex.ENEMY ],
-            move: new PokemonMove(Moves.STUFF_CHEEKS),
-            ignorePp: true
-          });
-
-          await transitionMysteryEncounterIntroVisuals(true, true, 500);
-          await initBattleWithEnemyConfig(encounter.enemyPartyConfigs[0]);
-        })
-        .build()
-    )
-    .withOption(
-      MysteryEncounterOptionBuilder
-        .newOptionWithMode(MysteryEncounterOptionMode.DEFAULT)
-        .withDialogue({
-          buttonLabel: `${namespace}:option.2.label`,
-          buttonTooltip: `${namespace}:option.2.tooltip`,
-          selected: [
-            {
-              text: `${namespace}:option.2.selected`,
-            },
-          ],
-        })
-        .withOptionPhase(async () => {
-          const encounter = globalScene.currentBattle.mysteryEncounter!;
-          const berryMap = encounter.misc.berryItemsMap;
-
-          // Returns 2/5 of the berries stolen to each Pokemon
-          const party = globalScene.getPlayerParty();
-          party.forEach(pokemon => {
-            const stolenBerries: BerryModifier[] = berryMap.get(pokemon.id);
-            const berryTypesAsArray: BerryType[] = [];
-            stolenBerries?.forEach(bMod => berryTypesAsArray.push(...new Array(bMod.stackCount).fill(bMod.berryType)));
-            const returnedBerryCount = Math.floor((berryTypesAsArray.length ?? 0) * 2 / 5);
-
-            if (returnedBerryCount > 0) {
-              for (let i = 0; i < returnedBerryCount; i++) {
-                // Shuffle remaining berry types and pop
-                Phaser.Math.RND.shuffle(berryTypesAsArray);
-                const randBerryType = berryTypesAsArray.pop();
-
-                const berryModType = generateModifierType(modifierTypes.BERRY, [ randBerryType ]) as BerryModifierType;
-                applyModifierTypeToPlayerPokemon(pokemon, berryModType);
-              }
-            }
-          });
-          await globalScene.updateModifiers(true);
-
-          await transitionMysteryEncounterIntroVisuals(true, true, 500);
-          leaveEncounterWithoutBattle(true);
-        })
-        .build()
-    )
-    .withOption(
-      MysteryEncounterOptionBuilder
-        .newOptionWithMode(MysteryEncounterOptionMode.DEFAULT)
-        .withDialogue({
-          buttonLabel: `${namespace}:option.3.label`,
-          buttonTooltip: `${namespace}:option.3.tooltip`,
-          selected: [
-            {
-              text: `${namespace}:option.3.selected`,
-            },
-          ],
-        })
-        .withPreOptionPhase(async () => {
-          // Animate berries being eaten
-          doGreedentEatBerries();
-          doBerrySpritePile(true);
-          return true;
-        })
-        .withOptionPhase(async () => {
-          // Let it have the food
-          // Greedent joins the team, level equal to 2 below highest party member (shiny locked)
-          const level = getHighestLevelPlayerPokemon(false, true).level - 2;
-          const greedent = new EnemyPokemon(getPokemonSpecies(Species.GREEDENT), level, TrainerSlot.NONE, false, true);
-          greedent.moveset = [ new PokemonMove(Moves.THRASH), new PokemonMove(Moves.BODY_PRESS), new PokemonMove(Moves.STUFF_CHEEKS), new PokemonMove(Moves.SLACK_OFF) ];
-          greedent.passive = true;
-
-          await transitionMysteryEncounterIntroVisuals(true, true, 500);
-          await catchPokemon(greedent, null, PokeballType.POKEBALL, false);
-          leaveEncounterWithoutBattle(true);
-        })
-        .build()
-    )
-    .build();
+        await transitionMysteryEncounterIntroVisuals(true, true, 500);
+        await catchPokemon(greedent, null, PokeballType.POKEBALL, false);
+        leaveEncounterWithoutBattle(true);
+      })
+      .build(),
+  )
+  .build();
 
 function doGreedentSpriteSteal() {
   const shakeDelay = 50;
@@ -382,70 +400,79 @@ function doGreedentSpriteSteal() {
   globalScene.tweens.chain({
     targets: greedentSprites,
     tweens: [
-      { // Slide Greedent diagonally
+      {
+        // Slide Greedent diagonally
         duration: slideDelay,
         ease: "Cubic.easeOut",
         y: "+=75",
         x: "-=65",
-        scale: 1.1
+        scale: 1.1,
       },
-      { // Shake
+      {
+        // Shake
         duration: shakeDelay,
         ease: "Cubic.easeOut",
         yoyo: true,
         x: (randInt(2) > 0 ? "-=" : "+=") + 5,
         y: (randInt(2) > 0 ? "-=" : "+=") + 5,
       },
-      { // Shake
+      {
+        // Shake
         duration: shakeDelay,
         ease: "Cubic.easeOut",
         yoyo: true,
         x: (randInt(2) > 0 ? "-=" : "+=") + 5,
         y: (randInt(2) > 0 ? "-=" : "+=") + 5,
       },
-      { // Shake
+      {
+        // Shake
         duration: shakeDelay,
         ease: "Cubic.easeOut",
         yoyo: true,
         x: (randInt(2) > 0 ? "-=" : "+=") + 5,
         y: (randInt(2) > 0 ? "-=" : "+=") + 5,
       },
-      { // Shake
+      {
+        // Shake
         duration: shakeDelay,
         ease: "Cubic.easeOut",
         yoyo: true,
         x: (randInt(2) > 0 ? "-=" : "+=") + 5,
         y: (randInt(2) > 0 ? "-=" : "+=") + 5,
       },
-      { // Shake
+      {
+        // Shake
         duration: shakeDelay,
         ease: "Cubic.easeOut",
         yoyo: true,
         x: (randInt(2) > 0 ? "-=" : "+=") + 5,
         y: (randInt(2) > 0 ? "-=" : "+=") + 5,
       },
-      { // Shake
+      {
+        // Shake
         duration: shakeDelay,
         ease: "Cubic.easeOut",
         yoyo: true,
         x: (randInt(2) > 0 ? "-=" : "+=") + 5,
         y: (randInt(2) > 0 ? "-=" : "+=") + 5,
       },
-      { // Slide Greedent diagonally
+      {
+        // Slide Greedent diagonally
         duration: slideDelay,
         ease: "Cubic.easeOut",
         y: "-=75",
         x: "+=65",
-        scale: 1
+        scale: 1,
       },
-      { // Bounce at the end
+      {
+        // Bounce at the end
         duration: 300,
         ease: "Cubic.easeOut",
         yoyo: true,
         y: "-=20",
         loop: 1,
-      }
-    ]
+      },
+    ],
   });
 }
 
@@ -467,16 +494,28 @@ function doGreedentEatBerries() {
         globalScene.playSound("battle_anims/PRSFX- Bug Bite");
       }
       index++;
-    }
+    },
   });
 }
 
 /**
  * @param isEat Default false. Will "create" pile when false, and remove pile when true.
  */
-function doBerrySpritePile(isEat: boolean = false) {
+function doBerrySpritePile(isEat = false) {
   const berryAddDelay = 150;
-  let animationOrder = [ "starf", "sitrus", "lansat", "salac", "apicot", "enigma", "liechi", "ganlon", "lum", "petaya", "leppa" ];
+  let animationOrder = [
+    "starf",
+    "sitrus",
+    "lansat",
+    "salac",
+    "apicot",
+    "enigma",
+    "liechi",
+    "ganlon",
+    "lum",
+    "petaya",
+    "leppa",
+  ];
   if (isEat) {
     animationOrder = animationOrder.reverse();
   }
@@ -500,7 +539,7 @@ function doBerrySpritePile(isEat: boolean = false) {
       // Animate Petaya berry falling off the pile
       if (berry === "petaya" && sprite && tintSprite && !isEat) {
         globalScene.time.delayedCall(200, () => {
-          doBerryBounce([ sprite, tintSprite ], 30, 500);
+          doBerryBounce([sprite, tintSprite], 30, 500);
         });
       }
     });
@@ -515,7 +554,7 @@ function doBerryBounce(berrySprites: Phaser.GameObjects.Sprite[], yd: number, ba
     globalScene.tweens.add({
       targets: berrySprites,
       y: "+=" + bounceYOffset,
-      x: { value: "+=" + (bouncePower * bouncePower * 10), ease: "Linear" },
+      x: { value: "+=" + bouncePower * bouncePower * 10, ease: "Linear" },
       duration: bouncePower * baseBounceDuration,
       ease: "Cubic.easeIn",
       onComplete: () => {
@@ -527,13 +566,13 @@ function doBerryBounce(berrySprites: Phaser.GameObjects.Sprite[], yd: number, ba
           globalScene.tweens.add({
             targets: berrySprites,
             y: "-=" + bounceYOffset,
-            x: { value: "+=" + (bouncePower * bouncePower * 10), ease: "Linear" },
+            x: { value: "+=" + bouncePower * bouncePower * 10, ease: "Linear" },
             duration: bouncePower * baseBounceDuration,
             ease: "Cubic.easeOut",
-            onComplete: () => doBounce()
+            onComplete: () => doBounce(),
           });
         }
-      }
+      },
     });
   };
 
diff --git a/src/data/mystery-encounters/encounters/an-offer-you-cant-refuse-encounter.ts b/src/data/mystery-encounters/encounters/an-offer-you-cant-refuse-encounter.ts
index 671eb3d3ab8..b403c5f291c 100644
--- a/src/data/mystery-encounters/encounters/an-offer-you-cant-refuse-encounter.ts
+++ b/src/data/mystery-encounters/encounters/an-offer-you-cant-refuse-encounter.ts
@@ -1,4 +1,9 @@
-import { generateModifierType, leaveEncounterWithoutBattle, setEncounterExp, updatePlayerMoney, } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
+import {
+  generateModifierType,
+  leaveEncounterWithoutBattle,
+  setEncounterExp,
+  updatePlayerMoney,
+} from "#app/data/mystery-encounters/utils/encounter-phase-utils";
 import { modifierTypes } from "#app/modifier/modifier-type";
 import { MysteryEncounterType } from "#enums/mystery-encounter-type";
 import { Species } from "#enums/species";
@@ -6,7 +11,11 @@ import { globalScene } from "#app/global-scene";
 import type MysteryEncounter from "#app/data/mystery-encounters/mystery-encounter";
 import { MysteryEncounterBuilder } from "#app/data/mystery-encounters/mystery-encounter";
 import { MysteryEncounterOptionBuilder } from "#app/data/mystery-encounters/mystery-encounter-option";
-import { AbilityRequirement, CombinationPokemonRequirement, MoveRequirement } from "#app/data/mystery-encounters/mystery-encounter-requirements";
+import {
+  AbilityRequirement,
+  CombinationPokemonRequirement,
+  MoveRequirement,
+} from "#app/data/mystery-encounters/mystery-encounter-requirements";
 import { getHighestStatTotalPlayerPokemon } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils";
 import { EXTORTION_ABILITIES, EXTORTION_MOVES } from "#app/data/mystery-encounters/requirements/requirement-groups";
 import { getPokemonSpecies } from "#app/data/pokemon-species";
@@ -14,7 +23,7 @@ import { speciesStarterCosts } from "#app/data/balance/starters";
 import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
 import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
 import { ModifierRewardPhase } from "#app/phases/modifier-reward-phase";
-import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/game-mode";
+import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants";
 import i18next from "i18next";
 
 /** the i18n namespace for this encounter */
@@ -33,153 +42,152 @@ const MONEY_MAXIMUM_MULTIPLIER = 30;
  * @see {@link https://github.com/pagefaultgames/pokerogue/issues/3808 | GitHub Issue #3808}
  * @see For biome requirements check {@linkcode mysteryEncountersByBiome}
  */
-export const AnOfferYouCantRefuseEncounter: MysteryEncounter =
-  MysteryEncounterBuilder.withEncounterType(MysteryEncounterType.AN_OFFER_YOU_CANT_REFUSE)
-    .withEncounterTier(MysteryEncounterTier.GREAT)
-    .withSceneWaveRangeRequirement(...CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES)
-    .withScenePartySizeRequirement(2, 6, true) // Must have at least 2 pokemon in party
-    .withIntroSpriteConfigs([
-      {
-        spriteKey: Species.LIEPARD.toString(),
-        fileRoot: "pokemon",
-        hasShadow: true,
-        repeat: true,
-        x: 0,
-        y: -4,
-        yShadow: -4
-      },
-      {
-        spriteKey: "rich_kid_m",
-        fileRoot: "trainer",
-        hasShadow: true,
-        x: 2,
-        y: 5,
-        yShadow: 5
-      },
-    ])
-    .withIntroDialogue([
-      {
-        text: `${namespace}:intro`,
-      },
-      {
-        text: `${namespace}:intro_dialogue`,
-        speaker: `${namespace}:speaker`,
-      },
-    ])
-    .setLocalizationKey(`${namespace}`)
-    .withTitle(`${namespace}:title`)
-    .withDescription(`${namespace}:description`)
-    .withQuery(`${namespace}:query`)
-    .withOnInit(() => {
-      const encounter = globalScene.currentBattle.mysteryEncounter!;
-      const pokemon = getHighestStatTotalPlayerPokemon(true, true);
+export const AnOfferYouCantRefuseEncounter: MysteryEncounter = MysteryEncounterBuilder.withEncounterType(
+  MysteryEncounterType.AN_OFFER_YOU_CANT_REFUSE,
+)
+  .withEncounterTier(MysteryEncounterTier.GREAT)
+  .withSceneWaveRangeRequirement(...CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES)
+  .withScenePartySizeRequirement(2, 6, true) // Must have at least 2 pokemon in party
+  .withIntroSpriteConfigs([
+    {
+      spriteKey: Species.LIEPARD.toString(),
+      fileRoot: "pokemon",
+      hasShadow: true,
+      repeat: true,
+      x: 0,
+      y: -4,
+      yShadow: -4,
+    },
+    {
+      spriteKey: "rich_kid_m",
+      fileRoot: "trainer",
+      hasShadow: true,
+      x: 2,
+      y: 5,
+      yShadow: 5,
+    },
+  ])
+  .withIntroDialogue([
+    {
+      text: `${namespace}:intro`,
+    },
+    {
+      text: `${namespace}:intro_dialogue`,
+      speaker: `${namespace}:speaker`,
+    },
+  ])
+  .setLocalizationKey(`${namespace}`)
+  .withTitle(`${namespace}:title`)
+  .withDescription(`${namespace}:description`)
+  .withQuery(`${namespace}:query`)
+  .withOnInit(() => {
+    const encounter = globalScene.currentBattle.mysteryEncounter!;
+    const pokemon = getHighestStatTotalPlayerPokemon(true, true);
 
-      const baseSpecies = pokemon.getSpeciesForm().getRootSpeciesId();
-      const starterValue: number = speciesStarterCosts[baseSpecies] ?? 1;
-      const multiplier = Math.max(MONEY_MAXIMUM_MULTIPLIER / 10 * starterValue, MONEY_MINIMUM_MULTIPLIER);
-      const price = globalScene.getWaveMoneyAmount(multiplier);
+    const baseSpecies = pokemon.getSpeciesForm().getRootSpeciesId();
+    const starterValue: number = speciesStarterCosts[baseSpecies] ?? 1;
+    const multiplier = Math.max((MONEY_MAXIMUM_MULTIPLIER / 10) * starterValue, MONEY_MINIMUM_MULTIPLIER);
+    const price = globalScene.getWaveMoneyAmount(multiplier);
 
-      encounter.setDialogueToken("strongestPokemon", pokemon.getNameToRender());
-      encounter.setDialogueToken("price", price.toString());
+    encounter.setDialogueToken("strongestPokemon", pokemon.getNameToRender());
+    encounter.setDialogueToken("price", price.toString());
 
-      // Store pokemon and price
-      encounter.misc = {
-        pokemon: pokemon,
-        price: price
-      };
+    // Store pokemon and price
+    encounter.misc = {
+      pokemon: pokemon,
+      price: price,
+    };
 
-      // If player meets the combo OR requirements for option 2, populate the token
-      const opt2Req = encounter.options[1].primaryPokemonRequirements[0];
-      if (opt2Req.meetsRequirement()) {
-        const abilityToken = encounter.dialogueTokens["option2PrimaryAbility"];
-        const moveToken = encounter.dialogueTokens["option2PrimaryMove"];
-        if (abilityToken) {
-          encounter.setDialogueToken("moveOrAbility", abilityToken);
-        } else if (moveToken) {
-          encounter.setDialogueToken("moveOrAbility", moveToken);
-        }
+    // If player meets the combo OR requirements for option 2, populate the token
+    const opt2Req = encounter.options[1].primaryPokemonRequirements[0];
+    if (opt2Req.meetsRequirement()) {
+      const abilityToken = encounter.dialogueTokens["option2PrimaryAbility"];
+      const moveToken = encounter.dialogueTokens["option2PrimaryMove"];
+      if (abilityToken) {
+        encounter.setDialogueToken("moveOrAbility", abilityToken);
+      } else if (moveToken) {
+        encounter.setDialogueToken("moveOrAbility", moveToken);
       }
+    }
 
-      const shinyCharm = generateModifierType(modifierTypes.SHINY_CHARM);
-      encounter.setDialogueToken("itemName", shinyCharm?.name ?? i18next.t("modifierType:ModifierType.SHINY_CHARM.name"));
-      encounter.setDialogueToken("liepardName", getPokemonSpecies(Species.LIEPARD).getName());
+    const shinyCharm = generateModifierType(modifierTypes.SHINY_CHARM);
+    encounter.setDialogueToken("itemName", shinyCharm?.name ?? i18next.t("modifierType:ModifierType.SHINY_CHARM.name"));
+    encounter.setDialogueToken("liepardName", getPokemonSpecies(Species.LIEPARD).getName());
 
-      return true;
-    })
-    .withOption(
-      MysteryEncounterOptionBuilder
-        .newOptionWithMode(MysteryEncounterOptionMode.DEFAULT)
-        .withDialogue({
-          buttonLabel: `${namespace}:option.1.label`,
-          buttonTooltip: `${namespace}:option.1.tooltip`,
-          selected: [
-            {
-              text: `${namespace}:option.1.selected`,
-              speaker: `${namespace}:speaker`,
-            },
-          ],
-        })
-        .withPreOptionPhase(async (): Promise<boolean> => {
-          const encounter = globalScene.currentBattle.mysteryEncounter!;
-          // Update money and remove pokemon from party
-          updatePlayerMoney(encounter.misc.price);
-          globalScene.removePokemonFromPlayerParty(encounter.misc.pokemon);
-          return true;
-        })
-        .withOptionPhase(async () => {
-          // Give the player a Shiny Charm
-          globalScene.unshiftPhase(new ModifierRewardPhase(modifierTypes.SHINY_CHARM));
-          leaveEncounterWithoutBattle(true);
-        })
-        .build()
-    )
-    .withOption(
-      MysteryEncounterOptionBuilder
-        .newOptionWithMode(MysteryEncounterOptionMode.DISABLED_OR_SPECIAL)
-        .withPrimaryPokemonRequirement(
-          CombinationPokemonRequirement.Some(
-            new MoveRequirement(EXTORTION_MOVES, true),
-            new AbilityRequirement(EXTORTION_ABILITIES, true)
-          )
-        )
-        .withDialogue({
-          buttonLabel: `${namespace}:option.2.label`,
-          buttonTooltip: `${namespace}:option.2.tooltip`,
-          disabledButtonTooltip: `${namespace}:option.2.tooltip_disabled`,
-          selected: [
-            {
-              speaker: `${namespace}:speaker`,
-              text: `${namespace}:option.2.selected`,
-            },
-          ],
-        })
-        .withOptionPhase(async () => {
-          // Extort the rich kid for money
-          const encounter = globalScene.currentBattle.mysteryEncounter!;
-          // Update money and remove pokemon from party
-          updatePlayerMoney(encounter.misc.price);
-
-          setEncounterExp(encounter.options[1].primaryPokemon!.id, getPokemonSpecies(Species.LIEPARD).baseExp, true);
-
-          leaveEncounterWithoutBattle(true);
-        })
-        .build()
-    )
-    .withSimpleOption(
-      {
-        buttonLabel: `${namespace}:option.3.label`,
-        buttonTooltip: `${namespace}:option.3.tooltip`,
+    return true;
+  })
+  .withOption(
+    MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DEFAULT)
+      .withDialogue({
+        buttonLabel: `${namespace}:option.1.label`,
+        buttonTooltip: `${namespace}:option.1.tooltip`,
+        selected: [
+          {
+            text: `${namespace}:option.1.selected`,
+            speaker: `${namespace}:speaker`,
+          },
+        ],
+      })
+      .withPreOptionPhase(async (): Promise<boolean> => {
+        const encounter = globalScene.currentBattle.mysteryEncounter!;
+        // Update money and remove pokemon from party
+        updatePlayerMoney(encounter.misc.price);
+        globalScene.removePokemonFromPlayerParty(encounter.misc.pokemon);
+        return true;
+      })
+      .withOptionPhase(async () => {
+        // Give the player a Shiny Charm
+        globalScene.unshiftPhase(new ModifierRewardPhase(modifierTypes.SHINY_CHARM));
+        leaveEncounterWithoutBattle(true);
+      })
+      .build(),
+  )
+  .withOption(
+    MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DISABLED_OR_SPECIAL)
+      .withPrimaryPokemonRequirement(
+        CombinationPokemonRequirement.Some(
+          new MoveRequirement(EXTORTION_MOVES, true),
+          new AbilityRequirement(EXTORTION_ABILITIES, true),
+        ),
+      )
+      .withDialogue({
+        buttonLabel: `${namespace}:option.2.label`,
+        buttonTooltip: `${namespace}:option.2.tooltip`,
+        disabledButtonTooltip: `${namespace}:option.2.tooltip_disabled`,
         selected: [
           {
             speaker: `${namespace}:speaker`,
-            text: `${namespace}:option.3.selected`,
+            text: `${namespace}:option.2.selected`,
           },
         ],
-      },
-      async () => {
-        // Leave encounter with no rewards or exp
+      })
+      .withOptionPhase(async () => {
+        // Extort the rich kid for money
+        const encounter = globalScene.currentBattle.mysteryEncounter!;
+        // Update money and remove pokemon from party
+        updatePlayerMoney(encounter.misc.price);
+
+        setEncounterExp(encounter.options[1].primaryPokemon!.id, getPokemonSpecies(Species.LIEPARD).baseExp, true);
+
         leaveEncounterWithoutBattle(true);
-        return true;
-      }
-    )
-    .build();
+      })
+      .build(),
+  )
+  .withSimpleOption(
+    {
+      buttonLabel: `${namespace}:option.3.label`,
+      buttonTooltip: `${namespace}:option.3.tooltip`,
+      selected: [
+        {
+          speaker: `${namespace}:speaker`,
+          text: `${namespace}:option.3.selected`,
+        },
+      ],
+    },
+    async () => {
+      // Leave encounter with no rewards or exp
+      leaveEncounterWithoutBattle(true);
+      return true;
+    },
+  )
+  .build();
diff --git a/src/data/mystery-encounters/encounters/berries-abound-encounter.ts b/src/data/mystery-encounters/encounters/berries-abound-encounter.ts
index 550d9bd4f13..7f54e51565e 100644
--- a/src/data/mystery-encounters/encounters/berries-abound-encounter.ts
+++ b/src/data/mystery-encounters/encounters/berries-abound-encounter.ts
@@ -1,6 +1,5 @@
 import { MysteryEncounterOptionBuilder } from "#app/data/mystery-encounters/mystery-encounter-option";
-import type {
-  EnemyPartyConfig } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
+import type { EnemyPartyConfig } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
 import {
   generateModifierType,
   generateModifierTypeOption,
@@ -8,19 +7,13 @@ import {
   initBattleWithEnemyConfig,
   leaveEncounterWithoutBattle,
   setEncounterExp,
-  setEncounterRewards
+  setEncounterRewards,
 } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
 import type { PlayerPokemon } from "#app/field/pokemon";
 import type Pokemon from "#app/field/pokemon";
-import type {
-  BerryModifierType,
-  ModifierTypeOption } from "#app/modifier/modifier-type";
-import {
-  ModifierPoolType,
-  modifierTypes,
-  regenerateModifierPoolThresholds,
-} from "#app/modifier/modifier-type";
-import { randSeedInt } from "#app/utils";
+import type { BerryModifierType, ModifierTypeOption } from "#app/modifier/modifier-type";
+import { ModifierPoolType, modifierTypes, regenerateModifierPoolThresholds } from "#app/modifier/modifier-type";
+import { randSeedInt } from "#app/utils/common";
 import { BattlerTagType } from "#enums/battler-tag-type";
 import { MysteryEncounterType } from "#enums/mystery-encounter-type";
 import { globalScene } from "#app/global-scene";
@@ -30,14 +23,20 @@ import { queueEncounterMessage, showEncounterText } from "#app/data/mystery-enco
 import { getPokemonNameWithAffix } from "#app/messages";
 import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
 import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
-import { applyModifierTypeToPlayerPokemon, getEncounterPokemonLevelForWave, getHighestStatPlayerPokemon, getSpriteKeysFromPokemon, STANDARD_ENCOUNTER_BOOSTED_LEVEL_MODIFIER } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils";
+import {
+  applyModifierTypeToPlayerPokemon,
+  getEncounterPokemonLevelForWave,
+  getHighestStatPlayerPokemon,
+  getSpriteKeysFromPokemon,
+  STANDARD_ENCOUNTER_BOOSTED_LEVEL_MODIFIER,
+} from "#app/data/mystery-encounters/utils/encounter-pokemon-utils";
 import PokemonData from "#app/system/pokemon-data";
 import { BerryModifier } from "#app/modifier/modifier";
 import i18next from "#app/plugins/i18n";
 import { BerryType } from "#enums/berry-type";
 import { PERMANENT_STATS, Stat } from "#enums/stat";
 import { StatStageChangePhase } from "#app/phases/stat-stage-change-phase";
-import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/game-mode";
+import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants";
 
 /** the i18n namespace for the encounter */
 const namespace = "mysteryEncounters/berriesAbound";
@@ -47,107 +46,150 @@ const namespace = "mysteryEncounters/berriesAbound";
  * @see {@link https://github.com/pagefaultgames/pokerogue/issues/3810 | GitHub Issue #3810}
  * @see For biome requirements check {@linkcode mysteryEncountersByBiome}
  */
-export const BerriesAboundEncounter: MysteryEncounter =
-  MysteryEncounterBuilder.withEncounterType(MysteryEncounterType.BERRIES_ABOUND)
-    .withEncounterTier(MysteryEncounterTier.COMMON)
-    .withSceneWaveRangeRequirement(...CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES)
-    .withCatchAllowed(true)
-    .withHideWildIntroMessage(true)
-    .withFleeAllowed(false)
-    .withIntroSpriteConfigs([]) // Set in onInit()
-    .withIntroDialogue([
-      {
-        text: `${namespace}:intro`,
-      },
-    ])
-    .withOnInit(() => {
-      const encounter = globalScene.currentBattle.mysteryEncounter!;
+export const BerriesAboundEncounter: MysteryEncounter = MysteryEncounterBuilder.withEncounterType(
+  MysteryEncounterType.BERRIES_ABOUND,
+)
+  .withEncounterTier(MysteryEncounterTier.COMMON)
+  .withSceneWaveRangeRequirement(...CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES)
+  .withCatchAllowed(true)
+  .withHideWildIntroMessage(true)
+  .withFleeAllowed(false)
+  .withIntroSpriteConfigs([]) // Set in onInit()
+  .withIntroDialogue([
+    {
+      text: `${namespace}:intro`,
+    },
+  ])
+  .withOnInit(() => {
+    const encounter = globalScene.currentBattle.mysteryEncounter!;
 
-      // Calculate boss mon
-      const level = getEncounterPokemonLevelForWave(STANDARD_ENCOUNTER_BOOSTED_LEVEL_MODIFIER);
-      const bossPokemon = getRandomEncounterSpecies(level, true);
-      encounter.setDialogueToken("enemyPokemon", getPokemonNameWithAffix(bossPokemon));
-      const config: EnemyPartyConfig = {
-        pokemonConfigs: [{
+    // Calculate boss mon
+    const level = getEncounterPokemonLevelForWave(STANDARD_ENCOUNTER_BOOSTED_LEVEL_MODIFIER);
+    const bossPokemon = getRandomEncounterSpecies(level, true);
+    encounter.setDialogueToken("enemyPokemon", getPokemonNameWithAffix(bossPokemon));
+    const config: EnemyPartyConfig = {
+      pokemonConfigs: [
+        {
           level: level,
           species: bossPokemon.species,
           dataSource: new PokemonData(bossPokemon),
-          isBoss: true
-        }],
-      };
-      encounter.enemyPartyConfigs = [ config ];
-
-      // Calculate the number of extra berries that player receives
-      // 10-40: 2, 40-120: 4, 120-160: 5, 160-180: 7
-      const numBerries =
-        globalScene.currentBattle.waveIndex > 160 ? 7
-          : globalScene.currentBattle.waveIndex > 120 ? 5
-            : globalScene.currentBattle.waveIndex > 40 ? 4 : 2;
-      regenerateModifierPoolThresholds(globalScene.getPlayerParty(), ModifierPoolType.PLAYER, 0);
-      encounter.misc = { numBerries };
-
-      const { spriteKey, fileRoot } = getSpriteKeysFromPokemon(bossPokemon);
-      encounter.spriteConfigs = [
-        {
-          spriteKey: "berries_abound_bush",
-          fileRoot: "mystery-encounters",
-          x: 25,
-          y: -6,
-          yShadow: -7,
-          disableAnimation: true,
-          hasShadow: true
+          isBoss: true,
         },
-        {
-          spriteKey: spriteKey,
-          fileRoot: fileRoot,
-          hasShadow: true,
-          tint: 0.25,
-          x: -5,
-          repeat: true,
-          isPokemon: true,
-          isShiny: bossPokemon.shiny,
-          variant: bossPokemon.variant
-        }
-      ];
+      ],
+    };
+    encounter.enemyPartyConfigs = [config];
 
-      // Get fastest party pokemon for option 2
-      const fastestPokemon = getHighestStatPlayerPokemon(PERMANENT_STATS[Stat.SPD], true, false);
-      encounter.misc.fastestPokemon = fastestPokemon;
-      encounter.misc.enemySpeed = bossPokemon.getStat(Stat.SPD);
-      encounter.setDialogueToken("fastestPokemon", fastestPokemon.getNameToRender());
+    // Calculate the number of extra berries that player receives
+    // 10-40: 2, 40-120: 4, 120-160: 5, 160-180: 7
+    const numBerries =
+      globalScene.currentBattle.waveIndex > 160
+        ? 7
+        : globalScene.currentBattle.waveIndex > 120
+          ? 5
+          : globalScene.currentBattle.waveIndex > 40
+            ? 4
+            : 2;
+    regenerateModifierPoolThresholds(globalScene.getPlayerParty(), ModifierPoolType.PLAYER, 0);
+    encounter.misc = { numBerries };
 
-      return true;
-    })
-    .setLocalizationKey(`${namespace}`)
-    .withTitle(`${namespace}:title`)
-    .withDescription(`${namespace}:description`)
-    .withQuery(`${namespace}:query`)
-    .withSimpleOption(
+    const { spriteKey, fileRoot } = getSpriteKeysFromPokemon(bossPokemon);
+    encounter.spriteConfigs = [
       {
-        buttonLabel: `${namespace}:option.1.label`,
-        buttonTooltip: `${namespace}:option.1.tooltip`,
-        selected: [
-          {
-            text: `${namespace}:option.1.selected`,
-          },
-        ],
+        spriteKey: "berries_abound_bush",
+        fileRoot: "mystery-encounters",
+        x: 25,
+        y: -6,
+        yShadow: -7,
+        disableAnimation: true,
+        hasShadow: true,
       },
-      async () => {
-        // Pick battle
+      {
+        spriteKey: spriteKey,
+        fileRoot: fileRoot,
+        hasShadow: true,
+        tint: 0.25,
+        x: -5,
+        repeat: true,
+        isPokemon: true,
+        isShiny: bossPokemon.shiny,
+        variant: bossPokemon.variant,
+      },
+    ];
+
+    // Get fastest party pokemon for option 2
+    const fastestPokemon = getHighestStatPlayerPokemon(PERMANENT_STATS[Stat.SPD], true, false);
+    encounter.misc.fastestPokemon = fastestPokemon;
+    encounter.misc.enemySpeed = bossPokemon.getStat(Stat.SPD);
+    encounter.setDialogueToken("fastestPokemon", fastestPokemon.getNameToRender());
+
+    return true;
+  })
+  .setLocalizationKey(`${namespace}`)
+  .withTitle(`${namespace}:title`)
+  .withDescription(`${namespace}:description`)
+  .withQuery(`${namespace}:query`)
+  .withSimpleOption(
+    {
+      buttonLabel: `${namespace}:option.1.label`,
+      buttonTooltip: `${namespace}:option.1.tooltip`,
+      selected: [
+        {
+          text: `${namespace}:option.1.selected`,
+        },
+      ],
+    },
+    async () => {
+      // Pick battle
+      const encounter = globalScene.currentBattle.mysteryEncounter!;
+      const numBerries = encounter.misc.numBerries;
+
+      const doBerryRewards = () => {
+        const berryText = i18next.t(`${namespace}:berries`);
+
+        globalScene.playSound("item_fanfare");
+        queueEncounterMessage(
+          i18next.t("battle:rewardGainCount", {
+            modifierName: berryText,
+            count: numBerries,
+          }),
+        );
+
+        // Generate a random berry and give it to the first Pokemon with room for it
+        for (let i = 0; i < numBerries; i++) {
+          tryGiveBerry();
+        }
+      };
+
+      const shopOptions: ModifierTypeOption[] = [];
+      for (let i = 0; i < 5; i++) {
+        // Generate shop berries
+        const mod = generateModifierTypeOption(modifierTypes.BERRY);
+        if (mod) {
+          shopOptions.push(mod);
+        }
+      }
+
+      setEncounterRewards(
+        { guaranteedModifierTypeOptions: shopOptions, fillRemaining: false },
+        undefined,
+        doBerryRewards,
+      );
+      await initBattleWithEnemyConfig(globalScene.currentBattle.mysteryEncounter!.enemyPartyConfigs[0]);
+    },
+  )
+  .withOption(
+    MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DEFAULT)
+      .withDialogue({
+        buttonLabel: `${namespace}:option.2.label`,
+        buttonTooltip: `${namespace}:option.2.tooltip`,
+      })
+      .withOptionPhase(async () => {
+        // Pick race for berries
         const encounter = globalScene.currentBattle.mysteryEncounter!;
-        const numBerries = encounter.misc.numBerries;
-
-        const doBerryRewards = () => {
-          const berryText = i18next.t(`${namespace}:berries`);
-
-          globalScene.playSound("item_fanfare");
-          queueEncounterMessage(i18next.t("battle:rewardGainCount", { modifierName: berryText, count: numBerries }));
-
-          // Generate a random berry and give it to the first Pokemon with room for it
-          for (let i = 0; i < numBerries; i++) {
-            tryGiveBerry();
-          }
-        };
+        const fastestPokemon: PlayerPokemon = encounter.misc.fastestPokemon;
+        const enemySpeed: number = encounter.misc.enemySpeed;
+        const speedDiff = fastestPokemon.getStat(Stat.SPD) / (enemySpeed * 1.1);
+        const numBerries: number = encounter.misc.numBerries;
 
         const shopOptions: ModifierTypeOption[] = [];
         for (let i = 0; i < 5; i++) {
@@ -158,115 +200,126 @@ export const BerriesAboundEncounter: MysteryEncounter =
           }
         }
 
-        setEncounterRewards({ guaranteedModifierTypeOptions: shopOptions, fillRemaining: false }, undefined, doBerryRewards);
-        await initBattleWithEnemyConfig(globalScene.currentBattle.mysteryEncounter!.enemyPartyConfigs[0]);
-      }
-    )
-    .withOption(
-      MysteryEncounterOptionBuilder
-        .newOptionWithMode(MysteryEncounterOptionMode.DEFAULT)
-        .withDialogue({
-          buttonLabel: `${namespace}:option.2.label`,
-          buttonTooltip: `${namespace}:option.2.tooltip`
-        })
-        .withOptionPhase(async () => {
-          // Pick race for berries
-          const encounter = globalScene.currentBattle.mysteryEncounter!;
-          const fastestPokemon: PlayerPokemon = encounter.misc.fastestPokemon;
-          const enemySpeed: number = encounter.misc.enemySpeed;
-          const speedDiff = fastestPokemon.getStat(Stat.SPD) / (enemySpeed * 1.1);
-          const numBerries: number = encounter.misc.numBerries;
+        if (speedDiff < 1) {
+          // Caught and attacked by boss, gets +1 to all stats at start of fight
+          const doBerryRewards = () => {
+            const berryText = i18next.t(`${namespace}:berries`);
 
-          const shopOptions: ModifierTypeOption[] = [];
-          for (let i = 0; i < 5; i++) {
-            // Generate shop berries
-            const mod = generateModifierTypeOption(modifierTypes.BERRY);
-            if (mod) {
-              shopOptions.push(mod);
+            globalScene.playSound("item_fanfare");
+            queueEncounterMessage(
+              i18next.t("battle:rewardGainCount", {
+                modifierName: berryText,
+                count: numBerries,
+              }),
+            );
+
+            // Generate a random berry and give it to the first Pokemon with room for it
+            for (let i = 0; i < numBerries; i++) {
+              tryGiveBerry();
             }
+          };
+
+          // Defense/Spd buffs below wave 50, +1 to all stats otherwise
+          const statChangesForBattle: (
+            | Stat.ATK
+            | Stat.DEF
+            | Stat.SPATK
+            | Stat.SPDEF
+            | Stat.SPD
+            | Stat.ACC
+            | Stat.EVA
+          )[] =
+            globalScene.currentBattle.waveIndex < 50
+              ? [Stat.DEF, Stat.SPDEF, Stat.SPD]
+              : [Stat.ATK, Stat.DEF, Stat.SPATK, Stat.SPDEF, Stat.SPD];
+
+          const config = globalScene.currentBattle.mysteryEncounter!.enemyPartyConfigs[0];
+          config.pokemonConfigs![0].tags = [BattlerTagType.MYSTERY_ENCOUNTER_POST_SUMMON];
+          config.pokemonConfigs![0].mysteryEncounterBattleEffects = (pokemon: Pokemon) => {
+            queueEncounterMessage(`${namespace}:option.2.boss_enraged`);
+            globalScene.unshiftPhase(
+              new StatStageChangePhase(pokemon.getBattlerIndex(), true, statChangesForBattle, 1),
+            );
+          };
+          setEncounterRewards(
+            {
+              guaranteedModifierTypeOptions: shopOptions,
+              fillRemaining: false,
+            },
+            undefined,
+            doBerryRewards,
+          );
+          await showEncounterText(`${namespace}:option.2.selected_bad`);
+          await initBattleWithEnemyConfig(config);
+          return;
+        }
+        // Gains 1 berry for every 10% faster the player's pokemon is than the enemy, up to a max of numBerries, minimum of 2
+        const numBerriesGrabbed = Math.max(Math.min(Math.round((speedDiff - 1) / 0.08), numBerries), 2);
+        encounter.setDialogueToken("numBerries", String(numBerriesGrabbed));
+        const doFasterBerryRewards = () => {
+          const berryText = i18next.t(`${namespace}:berries`);
+
+          globalScene.playSound("item_fanfare");
+          queueEncounterMessage(
+            i18next.t("battle:rewardGainCount", {
+              modifierName: berryText,
+              count: numBerriesGrabbed,
+            }),
+          );
+
+          // Generate a random berry and give it to the first Pokemon with room for it (trying to give to fastest first)
+          for (let i = 0; i < numBerriesGrabbed; i++) {
+            tryGiveBerry(fastestPokemon);
           }
+        };
 
-          if (speedDiff < 1) {
-            // Caught and attacked by boss, gets +1 to all stats at start of fight
-            const doBerryRewards = () => {
-              const berryText = i18next.t(`${namespace}:berries`);
-
-              globalScene.playSound("item_fanfare");
-              queueEncounterMessage(i18next.t("battle:rewardGainCount", { modifierName: berryText, count: numBerries }));
-
-              // Generate a random berry and give it to the first Pokemon with room for it
-              for (let i = 0; i < numBerries; i++) {
-                tryGiveBerry();
-              }
-            };
-
-            // Defense/Spd buffs below wave 50, +1 to all stats otherwise
-            const statChangesForBattle: (Stat.ATK | Stat.DEF | Stat.SPATK | Stat.SPDEF | Stat.SPD | Stat.ACC | Stat.EVA)[] = globalScene.currentBattle.waveIndex < 50 ?
-              [ Stat.DEF, Stat.SPDEF, Stat.SPD ] :
-              [ Stat.ATK, Stat.DEF, Stat.SPATK, Stat.SPDEF, Stat.SPD ];
-
-            const config = globalScene.currentBattle.mysteryEncounter!.enemyPartyConfigs[0];
-            config.pokemonConfigs![0].tags = [ BattlerTagType.MYSTERY_ENCOUNTER_POST_SUMMON ];
-            config.pokemonConfigs![0].mysteryEncounterBattleEffects = (pokemon: Pokemon) => {
-              queueEncounterMessage(`${namespace}:option.2.boss_enraged`);
-              globalScene.unshiftPhase(new StatStageChangePhase(pokemon.getBattlerIndex(), true, statChangesForBattle, 1));
-            };
-            setEncounterRewards({ guaranteedModifierTypeOptions: shopOptions, fillRemaining: false }, undefined, doBerryRewards);
-            await showEncounterText(`${namespace}:option.2.selected_bad`);
-            await initBattleWithEnemyConfig(config);
-            return;
-          } else {
-            // Gains 1 berry for every 10% faster the player's pokemon is than the enemy, up to a max of numBerries, minimum of 2
-            const numBerriesGrabbed = Math.max(Math.min(Math.round((speedDiff - 1) / 0.08), numBerries), 2);
-            encounter.setDialogueToken("numBerries", String(numBerriesGrabbed));
-            const doFasterBerryRewards = () => {
-              const berryText = i18next.t(`${namespace}:berries`);
-
-              globalScene.playSound("item_fanfare");
-              queueEncounterMessage(i18next.t("battle:rewardGainCount", { modifierName: berryText, count: numBerriesGrabbed }));
-
-              // Generate a random berry and give it to the first Pokemon with room for it (trying to give to fastest first)
-              for (let i = 0; i < numBerriesGrabbed; i++) {
-                tryGiveBerry(fastestPokemon);
-              }
-            };
-
-            setEncounterExp(fastestPokemon.id, encounter.enemyPartyConfigs[0].pokemonConfigs![0].species.baseExp);
-            setEncounterRewards({ guaranteedModifierTypeOptions: shopOptions, fillRemaining: false }, undefined, doFasterBerryRewards);
-            await showEncounterText(`${namespace}:option.2.selected`);
-            leaveEncounterWithoutBattle();
-          }
-        })
-        .build()
-    )
-    .withSimpleOption(
-      {
-        buttonLabel: `${namespace}:option.3.label`,
-        buttonTooltip: `${namespace}:option.3.tooltip`,
-        selected: [
+        setEncounterExp(fastestPokemon.id, encounter.enemyPartyConfigs[0].pokemonConfigs![0].species.baseExp);
+        setEncounterRewards(
           {
-            text: `${namespace}:option.3.selected`,
+            guaranteedModifierTypeOptions: shopOptions,
+            fillRemaining: false,
           },
-        ],
-      },
-      async () => {
-        // Leave encounter with no rewards or exp
-        leaveEncounterWithoutBattle(true);
-        return true;
-      }
-    )
-    .build();
+          undefined,
+          doFasterBerryRewards,
+        );
+        await showEncounterText(`${namespace}:option.2.selected`);
+        leaveEncounterWithoutBattle();
+      })
+      .build(),
+  )
+  .withSimpleOption(
+    {
+      buttonLabel: `${namespace}:option.3.label`,
+      buttonTooltip: `${namespace}:option.3.tooltip`,
+      selected: [
+        {
+          text: `${namespace}:option.3.selected`,
+        },
+      ],
+    },
+    async () => {
+      // Leave encounter with no rewards or exp
+      leaveEncounterWithoutBattle(true);
+      return true;
+    },
+  )
+  .build();
 
 function tryGiveBerry(prioritizedPokemon?: PlayerPokemon) {
-  const berryType = randSeedInt(Object.keys(BerryType).filter(s => !isNaN(Number(s))).length) as BerryType;
-  const berry = generateModifierType(modifierTypes.BERRY, [ berryType ]) as BerryModifierType;
+  const berryType = randSeedInt(Object.keys(BerryType).filter(s => !Number.isNaN(Number(s))).length) as BerryType;
+  const berry = generateModifierType(modifierTypes.BERRY, [berryType]) as BerryModifierType;
 
   const party = globalScene.getPlayerParty();
 
   // Will try to apply to prioritized pokemon first, then do normal application method if it fails
   if (prioritizedPokemon) {
-    const heldBerriesOfType = globalScene.findModifier(m => m instanceof BerryModifier
-      && m.pokemonId === prioritizedPokemon.id && (m as BerryModifier).berryType === berryType, true) as BerryModifier;
+    const heldBerriesOfType = globalScene.findModifier(
+      m =>
+        m instanceof BerryModifier &&
+        m.pokemonId === prioritizedPokemon.id &&
+        (m as BerryModifier).berryType === berryType,
+      true,
+    ) as BerryModifier;
 
     if (!heldBerriesOfType || heldBerriesOfType.getStackCount() < heldBerriesOfType.getMaxStackCount()) {
       applyModifierTypeToPlayerPokemon(prioritizedPokemon, berry);
@@ -276,8 +329,10 @@ function tryGiveBerry(prioritizedPokemon?: PlayerPokemon) {
 
   // Iterate over the party until berry was successfully given
   for (const pokemon of party) {
-    const heldBerriesOfType = globalScene.findModifier(m => m instanceof BerryModifier
-      && m.pokemonId === pokemon.id && (m as BerryModifier).berryType === berryType, true) as BerryModifier;
+    const heldBerriesOfType = globalScene.findModifier(
+      m => m instanceof BerryModifier && m.pokemonId === pokemon.id && (m as BerryModifier).berryType === berryType,
+      true,
+    ) as BerryModifier;
 
     if (!heldBerriesOfType || heldBerriesOfType.getStackCount() < heldBerriesOfType.getMaxStackCount()) {
       applyModifierTypeToPlayerPokemon(pokemon, berry);
diff --git a/src/data/mystery-encounters/encounters/bug-type-superfan-encounter.ts b/src/data/mystery-encounters/encounters/bug-type-superfan-encounter.ts
index 209cc7a7ec5..87b223d5245 100644
--- a/src/data/mystery-encounters/encounters/bug-type-superfan-encounter.ts
+++ b/src/data/mystery-encounters/encounters/bug-type-superfan-encounter.ts
@@ -1,5 +1,4 @@
-import type {
-  EnemyPartyConfig } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
+import type { EnemyPartyConfig } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
 import {
   generateModifierType,
   generateModifierTypeOption,
@@ -10,17 +9,14 @@ import {
   setEncounterRewards,
   transitionMysteryEncounterIntroVisuals,
 } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
-import {
-  getRandomPartyMemberFunc,
-  trainerConfigs,
-  TrainerPartyCompoundTemplate,
-  TrainerPartyTemplate,
-  TrainerSlot,
-} from "#app/data/trainer-config";
+import { getRandomPartyMemberFunc, trainerConfigs } from "#app/data/trainers/trainer-config";
+import { TrainerPartyCompoundTemplate } from "#app/data/trainers/TrainerPartyTemplate";
+import { TrainerPartyTemplate } from "#app/data/trainers/TrainerPartyTemplate";
+import { TrainerSlot } from "#enums/trainer-slot";
 import { MysteryEncounterType } from "#enums/mystery-encounter-type";
 import { PartyMemberStrength } from "#enums/party-member-strength";
 import { globalScene } from "#app/global-scene";
-import { isNullOrUndefined, randSeedInt, randSeedShuffle } from "#app/utils";
+import { isNullOrUndefined, randSeedInt, randSeedShuffle } from "#app/utils/common";
 import type MysteryEncounter from "#app/data/mystery-encounters/mystery-encounter";
 import { MysteryEncounterBuilder } from "#app/data/mystery-encounters/mystery-encounter";
 import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
@@ -39,26 +35,24 @@ import {
   AttackTypeBoosterHeldItemTypeRequirement,
   CombinationPokemonRequirement,
   HeldItemRequirement,
-  TypeRequirement
+  TypeRequirement,
 } from "#app/data/mystery-encounters/mystery-encounter-requirements";
-import { Type } from "#enums/type";
+import { PokemonType } from "#enums/pokemon-type";
 import type { AttackTypeBoosterModifierType, ModifierTypeOption } from "#app/modifier/modifier-type";
 import { modifierTypes } from "#app/modifier/modifier-type";
-import type {
-  PokemonHeldItemModifier
-} from "#app/modifier/modifier";
+import type { PokemonHeldItemModifier } from "#app/modifier/modifier";
 import {
   AttackTypeBoosterModifier,
   BypassSpeedChanceModifier,
   ContactHeldItemTransferChanceModifier,
   GigantamaxAccessModifier,
-  MegaEvolutionAccessModifier
+  MegaEvolutionAccessModifier,
 } from "#app/modifier/modifier";
 import i18next from "i18next";
 import MoveInfoOverlay from "#app/ui/move-info-overlay";
-import { allMoves } from "#app/data/move";
+import { allMoves } from "#app/data/moves/move";
 import { ModifierTier } from "#app/modifier/modifier-tier";
-import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/game-mode";
+import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants";
 import { getSpriteKeysFromSpecies } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils";
 
 /** the i18n namespace for the encounter */
@@ -87,7 +81,7 @@ const POOL_1_POKEMON = [
   Species.CHARJABUG,
   Species.RIBOMBEE,
   Species.SPIDOPS,
-  Species.LOKIX
+  Species.LOKIX,
 ];
 
 const POOL_2_POKEMON = [
@@ -116,26 +110,26 @@ const POOL_2_POKEMON = [
   Species.KLEAVOR,
 ];
 
-const POOL_3_POKEMON: { species: Species, formIndex?: number }[] = [
+const POOL_3_POKEMON: { species: Species; formIndex?: number }[] = [
   {
     species: Species.PINSIR,
-    formIndex: 1
+    formIndex: 1,
   },
   {
     species: Species.SCIZOR,
-    formIndex: 1
+    formIndex: 1,
   },
   {
     species: Species.HERACROSS,
-    formIndex: 1
+    formIndex: 1,
   },
   {
     species: Species.ORBEETLE,
-    formIndex: 1
+    formIndex: 1,
   },
   {
     species: Species.CENTISKORCH,
-    formIndex: 1
+    formIndex: 1,
   },
   {
     species: Species.DURANT,
@@ -148,203 +142,203 @@ const POOL_3_POKEMON: { species: Species, formIndex?: number }[] = [
   },
 ];
 
-const POOL_4_POKEMON = [
-  Species.GENESECT,
-  Species.SLITHER_WING,
-  Species.BUZZWOLE,
-  Species.PHEROMOSA
-];
+const POOL_4_POKEMON = [Species.GENESECT, Species.SLITHER_WING, Species.BUZZWOLE, Species.PHEROMOSA];
 
 const PHYSICAL_TUTOR_MOVES = [
   Moves.MEGAHORN,
-  Moves.X_SCISSOR,
   Moves.ATTACK_ORDER,
-  Moves.PIN_MISSILE,
-  Moves.FIRST_IMPRESSION
+  Moves.BUG_BITE,
+  Moves.FIRST_IMPRESSION,
+  Moves.LUNGE
 ];
 
 const SPECIAL_TUTOR_MOVES = [
   Moves.SILVER_WIND,
-  Moves.BUG_BUZZ,
   Moves.SIGNAL_BEAM,
-  Moves.POLLEN_PUFF
+  Moves.BUG_BUZZ,
+  Moves.POLLEN_PUFF,
+  Moves.STRUGGLE_BUG
 ];
 
 const STATUS_TUTOR_MOVES = [
   Moves.STRING_SHOT,
-  Moves.STICKY_WEB,
-  Moves.SILK_TRAP,
+  Moves.DEFEND_ORDER,
   Moves.RAGE_POWDER,
-  Moves.HEAL_ORDER
+  Moves.STICKY_WEB,
+  Moves.SILK_TRAP
 ];
 
 const MISC_TUTOR_MOVES = [
-  Moves.BUG_BITE,
   Moves.LEECH_LIFE,
-  Moves.DEFEND_ORDER,
+  Moves.U_TURN,
+  Moves.HEAL_ORDER,
   Moves.QUIVER_DANCE,
-  Moves.TAIL_GLOW,
   Moves.INFESTATION,
-  Moves.U_TURN
 ];
 
 /**
  * Wave breakpoints that determine how strong to make the Bug-Type Superfan's team
  */
-const WAVE_LEVEL_BREAKPOINTS = [ 30, 50, 70, 100, 120, 140, 160 ];
+const WAVE_LEVEL_BREAKPOINTS = [30, 50, 70, 100, 120, 140, 160];
 
 /**
  * Bug Type Superfan encounter.
  * @see {@link https://github.com/pagefaultgames/pokerogue/issues/3820 | GitHub Issue #3820}
  * @see For biome requirements check {@linkcode mysteryEncountersByBiome}
  */
-export const BugTypeSuperfanEncounter: MysteryEncounter =
-  MysteryEncounterBuilder.withEncounterType(MysteryEncounterType.BUG_TYPE_SUPERFAN)
-    .withEncounterTier(MysteryEncounterTier.GREAT)
-    .withPrimaryPokemonRequirement(
-      CombinationPokemonRequirement.Some(
-        // Must have at least 1 Bug type on team, OR have a bug item somewhere on the team
-        new HeldItemRequirement([ "BypassSpeedChanceModifier", "ContactHeldItemTransferChanceModifier" ], 1),
-        new AttackTypeBoosterHeldItemTypeRequirement(Type.BUG, 1),
-        new TypeRequirement(Type.BUG, false, 1)
-      )
-    )
-    .withMaxAllowedEncounters(1)
-    .withSceneWaveRangeRequirement(...CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES)
-    .withIntroSpriteConfigs([]) // These are set in onInit()
-    .withAutoHideIntroVisuals(false)
-    .withIntroDialogue([
+export const BugTypeSuperfanEncounter: MysteryEncounter = MysteryEncounterBuilder.withEncounterType(
+  MysteryEncounterType.BUG_TYPE_SUPERFAN,
+)
+  .withEncounterTier(MysteryEncounterTier.GREAT)
+  .withPrimaryPokemonRequirement(
+    CombinationPokemonRequirement.Some(
+      // Must have at least 1 Bug type on team, OR have a bug item somewhere on the team
+      new HeldItemRequirement(["BypassSpeedChanceModifier", "ContactHeldItemTransferChanceModifier"], 1),
+      new AttackTypeBoosterHeldItemTypeRequirement(PokemonType.BUG, 1),
+      new TypeRequirement(PokemonType.BUG, false, 1),
+    ),
+  )
+  .withMaxAllowedEncounters(1)
+  .withSceneWaveRangeRequirement(...CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES)
+  .withIntroSpriteConfigs([]) // These are set in onInit()
+  .withAutoHideIntroVisuals(false)
+  .withIntroDialogue([
+    {
+      text: `${namespace}:intro`,
+    },
+    {
+      speaker: `${namespace}:speaker`,
+      text: `${namespace}:intro_dialogue`,
+    },
+  ])
+  .withOnInit(() => {
+    const encounter = globalScene.currentBattle.mysteryEncounter!;
+    // Calculates what trainers are available for battle in the encounter
+
+    // Bug type superfan trainer config
+    const config = getTrainerConfigForWave(globalScene.currentBattle.waveIndex);
+    const spriteKey = config.getSpriteKey();
+    encounter.enemyPartyConfigs.push({
+      trainerConfig: config,
+      female: true,
+    });
+
+    let beedrillKeys: { spriteKey: string; fileRoot: string }, butterfreeKeys: { spriteKey: string; fileRoot: string };
+    if (globalScene.currentBattle.waveIndex < WAVE_LEVEL_BREAKPOINTS[3]) {
+      beedrillKeys = getSpriteKeysFromSpecies(Species.BEEDRILL, false);
+      butterfreeKeys = getSpriteKeysFromSpecies(Species.BUTTERFREE, false);
+    } else {
+      // Mega Beedrill/Gmax Butterfree
+      beedrillKeys = getSpriteKeysFromSpecies(Species.BEEDRILL, false, 1);
+      butterfreeKeys = getSpriteKeysFromSpecies(Species.BUTTERFREE, false, 1);
+    }
+
+    encounter.spriteConfigs = [
       {
-        text: `${namespace}:intro`,
+        spriteKey: beedrillKeys.spriteKey,
+        fileRoot: beedrillKeys.fileRoot,
+        hasShadow: true,
+        repeat: true,
+        isPokemon: true,
+        x: -30,
+        tint: 0.15,
+        y: -4,
+        yShadow: -4,
       },
       {
-        speaker: `${namespace}:speaker`,
-        text: `${namespace}:intro_dialogue`,
+        spriteKey: butterfreeKeys.spriteKey,
+        fileRoot: butterfreeKeys.fileRoot,
+        hasShadow: true,
+        repeat: true,
+        isPokemon: true,
+        x: 30,
+        tint: 0.15,
+        y: -4,
+        yShadow: -4,
       },
-    ])
-    .withOnInit(() => {
+      {
+        spriteKey: spriteKey,
+        fileRoot: "trainer",
+        hasShadow: true,
+        x: 4,
+        y: 7,
+        yShadow: 7,
+      },
+    ];
+
+    const requiredItems = [
+      generateModifierType(modifierTypes.QUICK_CLAW),
+      generateModifierType(modifierTypes.GRIP_CLAW),
+      generateModifierType(modifierTypes.ATTACK_TYPE_BOOSTER, [PokemonType.BUG]),
+    ];
+
+    const requiredItemString = requiredItems.map(m => m?.name ?? "unknown").join("/");
+    encounter.setDialogueToken("requiredBugItems", requiredItemString);
+
+    return true;
+  })
+  .setLocalizationKey(`${namespace}`)
+  .withTitle(`${namespace}:title`)
+  .withDescription(`${namespace}:description`)
+  .withQuery(`${namespace}:query`)
+  .withSimpleOption(
+    {
+      buttonLabel: `${namespace}:option.1.label`,
+      buttonTooltip: `${namespace}:option.1.tooltip`,
+      selected: [
+        {
+          speaker: `${namespace}:speaker`,
+          text: `${namespace}:option.1.selected`,
+        },
+      ],
+    },
+    async () => {
+      // Select battle the bug trainer
       const encounter = globalScene.currentBattle.mysteryEncounter!;
-      // Calculates what trainers are available for battle in the encounter
+      const config: EnemyPartyConfig = encounter.enemyPartyConfigs[0];
 
-      // Bug type superfan trainer config
-      const config = getTrainerConfigForWave(globalScene.currentBattle.waveIndex);
-      const spriteKey = config.getSpriteKey();
-      encounter.enemyPartyConfigs.push({
-        trainerConfig: config,
-        female: true,
-      });
+      // Init the moves available for tutor
+      const moveTutorOptions: PokemonMove[] = [];
+      moveTutorOptions.push(new PokemonMove(PHYSICAL_TUTOR_MOVES[randSeedInt(PHYSICAL_TUTOR_MOVES.length)]));
+      moveTutorOptions.push(new PokemonMove(SPECIAL_TUTOR_MOVES[randSeedInt(SPECIAL_TUTOR_MOVES.length)]));
+      moveTutorOptions.push(new PokemonMove(STATUS_TUTOR_MOVES[randSeedInt(STATUS_TUTOR_MOVES.length)]));
+      moveTutorOptions.push(new PokemonMove(MISC_TUTOR_MOVES[randSeedInt(MISC_TUTOR_MOVES.length)]));
+      encounter.misc = {
+        moveTutorOptions,
+      };
 
-      let beedrillKeys: { spriteKey: string, fileRoot: string }, butterfreeKeys: { spriteKey: string, fileRoot: string };
-      if (globalScene.currentBattle.waveIndex < WAVE_LEVEL_BREAKPOINTS[3]) {
-        beedrillKeys = getSpriteKeysFromSpecies(Species.BEEDRILL, false);
-        butterfreeKeys = getSpriteKeysFromSpecies(Species.BUTTERFREE, false);
-      } else {
-        // Mega Beedrill/Gmax Butterfree
-        beedrillKeys = getSpriteKeysFromSpecies(Species.BEEDRILL, false, 1);
-        butterfreeKeys = getSpriteKeysFromSpecies(Species.BUTTERFREE, false, 1);
-      }
+      // Assigns callback that teaches move before continuing to rewards
+      encounter.onRewards = doBugTypeMoveTutor;
 
-      encounter.spriteConfigs = [
-        {
-          spriteKey: beedrillKeys.spriteKey,
-          fileRoot: beedrillKeys.fileRoot,
-          hasShadow: true,
-          repeat: true,
-          isPokemon: true,
-          x: -30,
-          tint: 0.15,
-          y: -4,
-          yShadow: -4
-        },
-        {
-          spriteKey: butterfreeKeys.spriteKey,
-          fileRoot: butterfreeKeys.fileRoot,
-          hasShadow: true,
-          repeat: true,
-          isPokemon: true,
-          x: 30,
-          tint: 0.15,
-          y: -4,
-          yShadow: -4
-        },
-        {
-          spriteKey: spriteKey,
-          fileRoot: "trainer",
-          hasShadow: true,
-          x: 4,
-          y: 7,
-          yShadow: 7
-        },
-      ];
-
-      const requiredItems = [
-        generateModifierType(modifierTypes.QUICK_CLAW),
-        generateModifierType(modifierTypes.GRIP_CLAW),
-        generateModifierType(modifierTypes.ATTACK_TYPE_BOOSTER, [ Type.BUG ]),
-      ];
-
-      const requiredItemString = requiredItems.map(m => m?.name ?? "unknown").join("/");
-      encounter.setDialogueToken("requiredBugItems", requiredItemString);
-
-      return true;
-    })
-    .setLocalizationKey(`${namespace}`)
-    .withTitle(`${namespace}:title`)
-    .withDescription(`${namespace}:description`)
-    .withQuery(`${namespace}:query`)
-    .withSimpleOption(
-      {
-        buttonLabel: `${namespace}:option.1.label`,
-        buttonTooltip: `${namespace}:option.1.tooltip`,
-        selected: [
-          {
-            speaker: `${namespace}:speaker`,
-            text: `${namespace}:option.1.selected`,
-          },
-        ],
-      },
-      async () => {
-        // Select battle the bug trainer
-        const encounter = globalScene.currentBattle.mysteryEncounter!;
-        const config: EnemyPartyConfig = encounter.enemyPartyConfigs[0];
-
-        // Init the moves available for tutor
-        const moveTutorOptions: PokemonMove[] = [];
-        moveTutorOptions.push(new PokemonMove(PHYSICAL_TUTOR_MOVES[randSeedInt(PHYSICAL_TUTOR_MOVES.length)]));
-        moveTutorOptions.push(new PokemonMove(SPECIAL_TUTOR_MOVES[randSeedInt(SPECIAL_TUTOR_MOVES.length)]));
-        moveTutorOptions.push(new PokemonMove(STATUS_TUTOR_MOVES[randSeedInt(STATUS_TUTOR_MOVES.length)]));
-        moveTutorOptions.push(new PokemonMove(MISC_TUTOR_MOVES[randSeedInt(MISC_TUTOR_MOVES.length)]));
-        encounter.misc = {
-          moveTutorOptions
-        };
-
-        // Assigns callback that teaches move before continuing to rewards
-        encounter.onRewards = doBugTypeMoveTutor;
-
-        setEncounterRewards({ fillRemaining: true });
-        await transitionMysteryEncounterIntroVisuals(true, true);
-        await initBattleWithEnemyConfig(config);
-      }
-    )
-    .withOption(MysteryEncounterOptionBuilder
-      .newOptionWithMode(MysteryEncounterOptionMode.DISABLED_OR_DEFAULT)
-      .withPrimaryPokemonRequirement(new TypeRequirement(Type.BUG, false, 1)) // Must have 1 Bug type on team
+      setEncounterRewards({ fillRemaining: true });
+      await transitionMysteryEncounterIntroVisuals(true, true);
+      await initBattleWithEnemyConfig(config);
+    },
+  )
+  .withOption(
+    MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DISABLED_OR_DEFAULT)
+      .withPrimaryPokemonRequirement(new TypeRequirement(PokemonType.BUG, false, 1)) // Must have 1 Bug type on team
       .withDialogue({
         buttonLabel: `${namespace}:option.2.label`,
         buttonTooltip: `${namespace}:option.2.tooltip`,
-        disabledButtonTooltip: `${namespace}:option.2.disabled_tooltip`
+        disabledButtonTooltip: `${namespace}:option.2.disabled_tooltip`,
       })
       .withPreOptionPhase(async () => {
         // Player shows off their bug types
         const encounter = globalScene.currentBattle.mysteryEncounter!;
 
         // Player gets different rewards depending on the number of bug types they have
-        const numBugTypes = globalScene.getPlayerParty().filter(p => p.isOfType(Type.BUG, true)).length;
-        const numBugTypesText = i18next.t(`${namespace}:numBugTypes`, { count: numBugTypes });
+        const numBugTypes = globalScene.getPlayerParty().filter(p => p.isOfType(PokemonType.BUG, true)).length;
+        const numBugTypesText = i18next.t(`${namespace}:numBugTypes`, {
+          count: numBugTypes,
+        });
         encounter.setDialogueToken("numBugTypes", numBugTypesText);
 
         if (numBugTypes < 2) {
-          setEncounterRewards({ guaranteedModifierTypeFuncs: [ modifierTypes.SUPER_LURE, modifierTypes.GREAT_BALL ], fillRemaining: false });
+          setEncounterRewards({
+            guaranteedModifierTypeFuncs: [modifierTypes.SUPER_LURE, modifierTypes.GREAT_BALL],
+            fillRemaining: false,
+          });
           encounter.selectedOption!.dialogue!.selected = [
             {
               speaker: `${namespace}:speaker`,
@@ -352,7 +346,10 @@ export const BugTypeSuperfanEncounter: MysteryEncounter =
             },
           ];
         } else if (numBugTypes < 4) {
-          setEncounterRewards({ guaranteedModifierTypeFuncs: [ modifierTypes.QUICK_CLAW, modifierTypes.MAX_LURE, modifierTypes.ULTRA_BALL ], fillRemaining: false });
+          setEncounterRewards({
+            guaranteedModifierTypeFuncs: [modifierTypes.QUICK_CLAW, modifierTypes.MAX_LURE, modifierTypes.ULTRA_BALL],
+            fillRemaining: false,
+          });
           encounter.selectedOption!.dialogue!.selected = [
             {
               speaker: `${namespace}:speaker`,
@@ -360,7 +357,10 @@ export const BugTypeSuperfanEncounter: MysteryEncounter =
             },
           ];
         } else if (numBugTypes < 6) {
-          setEncounterRewards({ guaranteedModifierTypeFuncs: [ modifierTypes.GRIP_CLAW, modifierTypes.MAX_LURE, modifierTypes.ROGUE_BALL ], fillRemaining: false });
+          setEncounterRewards({
+            guaranteedModifierTypeFuncs: [modifierTypes.GRIP_CLAW, modifierTypes.MAX_LURE, modifierTypes.ROGUE_BALL],
+            fillRemaining: false,
+          });
           encounter.selectedOption!.dialogue!.selected = [
             {
               speaker: `${namespace}:speaker`,
@@ -370,7 +370,7 @@ export const BugTypeSuperfanEncounter: MysteryEncounter =
         } else {
           // If the player has any evolution/form change items that are valid for their party,
           // spawn one of those items in addition to Dynamax Band, Mega Band, and Master Ball
-          const modifierOptions: ModifierTypeOption[] = [ generateModifierTypeOption(modifierTypes.MASTER_BALL)! ];
+          const modifierOptions: ModifierTypeOption[] = [generateModifierTypeOption(modifierTypes.MASTER_BALL)!];
           const specialOptions: ModifierTypeOption[] = [];
 
           if (!globalScene.findModifier(m => m instanceof MegaEvolutionAccessModifier)) {
@@ -399,7 +399,10 @@ export const BugTypeSuperfanEncounter: MysteryEncounter =
             modifierOptions.push(specialOptions[randSeedInt(specialOptions.length)]);
           }
 
-          setEncounterRewards({ guaranteedModifierTypeOptions: modifierOptions, fillRemaining: false });
+          setEncounterRewards({
+            guaranteedModifierTypeOptions: modifierOptions,
+            fillRemaining: false,
+          });
           encounter.selectedOption!.dialogue!.selected = [
             {
               speaker: `${namespace}:speaker`,
@@ -412,15 +415,16 @@ export const BugTypeSuperfanEncounter: MysteryEncounter =
         // Player shows off their bug types
         leaveEncounterWithoutBattle();
       })
-      .build())
-    .withOption(MysteryEncounterOptionBuilder
-      .newOptionWithMode(MysteryEncounterOptionMode.DISABLED_OR_DEFAULT)
+      .build(),
+  )
+  .withOption(
+    MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DISABLED_OR_DEFAULT)
       .withPrimaryPokemonRequirement(
         CombinationPokemonRequirement.Some(
           // Meets one or both of the below reqs
-          new HeldItemRequirement([ "BypassSpeedChanceModifier", "ContactHeldItemTransferChanceModifier" ], 1),
-          new AttackTypeBoosterHeldItemTypeRequirement(Type.BUG, 1)
-        )
+          new HeldItemRequirement(["BypassSpeedChanceModifier", "ContactHeldItemTransferChanceModifier"], 1),
+          new AttackTypeBoosterHeldItemTypeRequirement(PokemonType.BUG, 1),
+        ),
       )
       .withDialogue({
         buttonLabel: `${namespace}:option.3.label`,
@@ -443,10 +447,13 @@ export const BugTypeSuperfanEncounter: MysteryEncounter =
         const onPokemonSelected = (pokemon: PlayerPokemon) => {
           // Get Pokemon held items and filter for valid ones
           const validItems = pokemon.getHeldItems().filter(item => {
-            return (item instanceof BypassSpeedChanceModifier ||
-              item instanceof ContactHeldItemTransferChanceModifier ||
-              (item instanceof AttackTypeBoosterModifier && (item.type as AttackTypeBoosterModifierType).moveType === Type.BUG)) &&
-              item.isTransferable;
+            return (
+              (item instanceof BypassSpeedChanceModifier ||
+                item instanceof ContactHeldItemTransferChanceModifier ||
+                (item instanceof AttackTypeBoosterModifier &&
+                  (item.type as AttackTypeBoosterModifierType).moveType === PokemonType.BUG)) &&
+              item.isTransferable
+            );
           });
 
           return validItems.map((modifier: PokemonHeldItemModifier) => {
@@ -469,9 +476,12 @@ export const BugTypeSuperfanEncounter: MysteryEncounter =
         const selectableFilter = (pokemon: Pokemon) => {
           // If pokemon has valid item, it can be selected
           const hasValidItem = pokemon.getHeldItems().some(item => {
-            return item instanceof BypassSpeedChanceModifier ||
+            return (
+              item instanceof BypassSpeedChanceModifier ||
               item instanceof ContactHeldItemTransferChanceModifier ||
-              (item instanceof AttackTypeBoosterModifier && (item.type as AttackTypeBoosterModifierType).moveType === Type.BUG);
+              (item instanceof AttackTypeBoosterModifier &&
+                (item.type as AttackTypeBoosterModifierType).moveType === PokemonType.BUG)
+            );
           });
           if (!hasValidItem) {
             return getEncounterText(`${namespace}:option.3.invalid_selection`) ?? null;
@@ -493,16 +503,21 @@ export const BugTypeSuperfanEncounter: MysteryEncounter =
         const bugNet = generateModifierTypeOption(modifierTypes.MYSTERY_ENCOUNTER_GOLDEN_BUG_NET)!;
         bugNet.type.tier = ModifierTier.ROGUE;
 
-        setEncounterRewards({ guaranteedModifierTypeOptions: [ bugNet ], guaranteedModifierTypeFuncs: [ modifierTypes.REVIVER_SEED ], fillRemaining: false });
+        setEncounterRewards({
+          guaranteedModifierTypeOptions: [bugNet],
+          guaranteedModifierTypeFuncs: [modifierTypes.REVIVER_SEED],
+          fillRemaining: false,
+        });
         leaveEncounterWithoutBattle(true);
       })
-      .build())
-    .withOutroDialogue([
-      {
-        text: `${namespace}:outro`,
-      },
-    ])
-    .build();
+      .build(),
+  )
+  .withOutroDialogue([
+    {
+      text: `${namespace}:outro`,
+    },
+  ])
+  .build();
 
 function getTrainerConfigForWave(waveIndex: number) {
   // Bug type superfan trainer config
@@ -516,134 +531,186 @@ function getTrainerConfigForWave(waveIndex: number) {
   if (waveIndex < WAVE_LEVEL_BREAKPOINTS[0]) {
     // Use default template (2 AVG)
     config
-      .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.BEEDRILL ], TrainerSlot.TRAINER, true))
-      .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.BUTTERFREE ], TrainerSlot.TRAINER, true));
+      .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.BEEDRILL], TrainerSlot.TRAINER, true))
+      .setPartyMemberFunc(1, getRandomPartyMemberFunc([Species.BUTTERFREE], TrainerSlot.TRAINER, true));
   } else if (waveIndex < WAVE_LEVEL_BREAKPOINTS[1]) {
     config
       .setPartyTemplates(new TrainerPartyTemplate(3, PartyMemberStrength.AVERAGE))
-      .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.BEEDRILL ], TrainerSlot.TRAINER, true))
-      .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.BUTTERFREE ], TrainerSlot.TRAINER, true))
+      .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.BEEDRILL], TrainerSlot.TRAINER, true))
+      .setPartyMemberFunc(1, getRandomPartyMemberFunc([Species.BUTTERFREE], TrainerSlot.TRAINER, true))
       .setPartyMemberFunc(2, getRandomPartyMemberFunc(POOL_1_POKEMON, TrainerSlot.TRAINER, true));
   } else if (waveIndex < WAVE_LEVEL_BREAKPOINTS[2]) {
     config
       .setPartyTemplates(new TrainerPartyTemplate(4, PartyMemberStrength.AVERAGE))
-      .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.BEEDRILL ], TrainerSlot.TRAINER, true))
-      .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.BUTTERFREE ], TrainerSlot.TRAINER, true))
+      .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.BEEDRILL], TrainerSlot.TRAINER, true))
+      .setPartyMemberFunc(1, getRandomPartyMemberFunc([Species.BUTTERFREE], TrainerSlot.TRAINER, true))
       .setPartyMemberFunc(2, getRandomPartyMemberFunc(POOL_1_POKEMON, TrainerSlot.TRAINER, true))
       .setPartyMemberFunc(3, getRandomPartyMemberFunc(POOL_2_POKEMON, TrainerSlot.TRAINER, true));
   } else if (waveIndex < WAVE_LEVEL_BREAKPOINTS[3]) {
     config
       .setPartyTemplates(new TrainerPartyTemplate(5, PartyMemberStrength.AVERAGE))
-      .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.BEEDRILL ], TrainerSlot.TRAINER, true))
-      .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.BUTTERFREE ], TrainerSlot.TRAINER, true))
+      .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.BEEDRILL], TrainerSlot.TRAINER, true))
+      .setPartyMemberFunc(1, getRandomPartyMemberFunc([Species.BUTTERFREE], TrainerSlot.TRAINER, true))
       .setPartyMemberFunc(2, getRandomPartyMemberFunc(POOL_1_POKEMON, TrainerSlot.TRAINER, true))
       .setPartyMemberFunc(3, getRandomPartyMemberFunc(POOL_2_POKEMON, TrainerSlot.TRAINER, true))
       .setPartyMemberFunc(4, getRandomPartyMemberFunc(POOL_2_POKEMON, TrainerSlot.TRAINER, true));
   } else if (waveIndex < WAVE_LEVEL_BREAKPOINTS[4]) {
     config
       .setPartyTemplates(new TrainerPartyTemplate(5, PartyMemberStrength.AVERAGE))
-      .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.BEEDRILL ], TrainerSlot.TRAINER, true, p => {
-        p.formIndex = 1;
-        p.generateAndPopulateMoveset();
-        p.generateName();
-      }))
-      .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.BUTTERFREE ], TrainerSlot.TRAINER, true, p => {
-        p.formIndex = 1;
-        p.generateAndPopulateMoveset();
-        p.generateName();
-      }))
-      .setPartyMemberFunc(2, getRandomPartyMemberFunc(POOL_2_POKEMON, TrainerSlot.TRAINER, true))
-      .setPartyMemberFunc(3, getRandomPartyMemberFunc(POOL_2_POKEMON, TrainerSlot.TRAINER, true))
-      .setPartyMemberFunc(4, getRandomPartyMemberFunc([ pool3Mon.species ], TrainerSlot.TRAINER, true, p => {
-        if (!isNullOrUndefined(pool3Mon.formIndex)) {
-          p.formIndex = pool3Mon.formIndex;
+      .setPartyMemberFunc(
+        0,
+        getRandomPartyMemberFunc([Species.BEEDRILL], TrainerSlot.TRAINER, true, p => {
+          p.formIndex = 1;
           p.generateAndPopulateMoveset();
           p.generateName();
-        }
-      }));
+        }),
+      )
+      .setPartyMemberFunc(
+        1,
+        getRandomPartyMemberFunc([Species.BUTTERFREE], TrainerSlot.TRAINER, true, p => {
+          p.formIndex = 1;
+          p.generateAndPopulateMoveset();
+          p.generateName();
+        }),
+      )
+      .setPartyMemberFunc(2, getRandomPartyMemberFunc(POOL_2_POKEMON, TrainerSlot.TRAINER, true))
+      .setPartyMemberFunc(3, getRandomPartyMemberFunc(POOL_2_POKEMON, TrainerSlot.TRAINER, true))
+      .setPartyMemberFunc(
+        4,
+        getRandomPartyMemberFunc([pool3Mon.species], TrainerSlot.TRAINER, true, p => {
+          if (!isNullOrUndefined(pool3Mon.formIndex)) {
+            p.formIndex = pool3Mon.formIndex;
+            p.generateAndPopulateMoveset();
+            p.generateName();
+          }
+        }),
+      );
   } else if (waveIndex < WAVE_LEVEL_BREAKPOINTS[5]) {
     pool3Copy = randSeedShuffle(pool3Copy);
     const pool3Mon2 = pool3Copy.pop()!;
     config
       .setPartyTemplates(new TrainerPartyTemplate(5, PartyMemberStrength.AVERAGE))
-      .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.BEEDRILL ], TrainerSlot.TRAINER, true, p => {
-        p.formIndex = 1;
-        p.generateAndPopulateMoveset();
-        p.generateName();
-      }))
-      .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.BUTTERFREE ], TrainerSlot.TRAINER, true, p => {
-        p.formIndex = 1;
-        p.generateAndPopulateMoveset();
-        p.generateName();
-      }))
+      .setPartyMemberFunc(
+        0,
+        getRandomPartyMemberFunc([Species.BEEDRILL], TrainerSlot.TRAINER, true, p => {
+          p.formIndex = 1;
+          p.generateAndPopulateMoveset();
+          p.generateName();
+        }),
+      )
+      .setPartyMemberFunc(
+        1,
+        getRandomPartyMemberFunc([Species.BUTTERFREE], TrainerSlot.TRAINER, true, p => {
+          p.formIndex = 1;
+          p.generateAndPopulateMoveset();
+          p.generateName();
+        }),
+      )
       .setPartyMemberFunc(2, getRandomPartyMemberFunc(POOL_2_POKEMON, TrainerSlot.TRAINER, true))
-      .setPartyMemberFunc(3, getRandomPartyMemberFunc([ pool3Mon.species ], TrainerSlot.TRAINER, true, p => {
-        if (!isNullOrUndefined(pool3Mon.formIndex)) {
-          p.formIndex = pool3Mon.formIndex;
-          p.generateAndPopulateMoveset();
-          p.generateName();
-        }
-      }))
-      .setPartyMemberFunc(4, getRandomPartyMemberFunc([ pool3Mon2.species ], TrainerSlot.TRAINER, true, p => {
-        if (!isNullOrUndefined(pool3Mon2.formIndex)) {
-          p.formIndex = pool3Mon2.formIndex;
-          p.generateAndPopulateMoveset();
-          p.generateName();
-        }
-      }));
+      .setPartyMemberFunc(
+        3,
+        getRandomPartyMemberFunc([pool3Mon.species], TrainerSlot.TRAINER, true, p => {
+          if (!isNullOrUndefined(pool3Mon.formIndex)) {
+            p.formIndex = pool3Mon.formIndex;
+            p.generateAndPopulateMoveset();
+            p.generateName();
+          }
+        }),
+      )
+      .setPartyMemberFunc(
+        4,
+        getRandomPartyMemberFunc([pool3Mon2.species], TrainerSlot.TRAINER, true, p => {
+          if (!isNullOrUndefined(pool3Mon2.formIndex)) {
+            p.formIndex = pool3Mon2.formIndex;
+            p.generateAndPopulateMoveset();
+            p.generateName();
+          }
+        }),
+      );
   } else if (waveIndex < WAVE_LEVEL_BREAKPOINTS[6]) {
     config
-      .setPartyTemplates(new TrainerPartyCompoundTemplate(new TrainerPartyTemplate(4, PartyMemberStrength.AVERAGE), new TrainerPartyTemplate(1, PartyMemberStrength.STRONG)))
-      .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.BEEDRILL ], TrainerSlot.TRAINER, true, p => {
-        p.formIndex = 1;
-        p.generateAndPopulateMoveset();
-        p.generateName();
-      }))
-      .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.BUTTERFREE ], TrainerSlot.TRAINER, true, p => {
-        p.formIndex = 1;
-        p.generateAndPopulateMoveset();
-        p.generateName();
-      }))
-      .setPartyMemberFunc(2, getRandomPartyMemberFunc(POOL_2_POKEMON, TrainerSlot.TRAINER, true))
-      .setPartyMemberFunc(3, getRandomPartyMemberFunc([ pool3Mon.species ], TrainerSlot.TRAINER, true, p => {
-        if (!isNullOrUndefined(pool3Mon.formIndex)) {
-          p.formIndex = pool3Mon.formIndex;
+      .setPartyTemplates(
+        new TrainerPartyCompoundTemplate(
+          new TrainerPartyTemplate(4, PartyMemberStrength.AVERAGE),
+          new TrainerPartyTemplate(1, PartyMemberStrength.STRONG),
+        ),
+      )
+      .setPartyMemberFunc(
+        0,
+        getRandomPartyMemberFunc([Species.BEEDRILL], TrainerSlot.TRAINER, true, p => {
+          p.formIndex = 1;
           p.generateAndPopulateMoveset();
           p.generateName();
-        }
-      }))
+        }),
+      )
+      .setPartyMemberFunc(
+        1,
+        getRandomPartyMemberFunc([Species.BUTTERFREE], TrainerSlot.TRAINER, true, p => {
+          p.formIndex = 1;
+          p.generateAndPopulateMoveset();
+          p.generateName();
+        }),
+      )
+      .setPartyMemberFunc(2, getRandomPartyMemberFunc(POOL_2_POKEMON, TrainerSlot.TRAINER, true))
+      .setPartyMemberFunc(
+        3,
+        getRandomPartyMemberFunc([pool3Mon.species], TrainerSlot.TRAINER, true, p => {
+          if (!isNullOrUndefined(pool3Mon.formIndex)) {
+            p.formIndex = pool3Mon.formIndex;
+            p.generateAndPopulateMoveset();
+            p.generateName();
+          }
+        }),
+      )
       .setPartyMemberFunc(4, getRandomPartyMemberFunc(POOL_4_POKEMON, TrainerSlot.TRAINER, true));
   } else {
     pool3Copy = randSeedShuffle(pool3Copy);
     const pool3Mon2 = pool3Copy.pop()!;
     config
-      .setPartyTemplates(new TrainerPartyCompoundTemplate(new TrainerPartyTemplate(4, PartyMemberStrength.AVERAGE), new TrainerPartyTemplate(1, PartyMemberStrength.STRONG)))
-      .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.BEEDRILL ], TrainerSlot.TRAINER, true, p => {
-        p.setBoss(true, 2);
-        p.formIndex = 1;
-        p.generateAndPopulateMoveset();
-        p.generateName();
-      }))
-      .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.BUTTERFREE ], TrainerSlot.TRAINER, true, p => {
-        p.setBoss(true, 2);
-        p.formIndex = 1;
-        p.generateAndPopulateMoveset();
-        p.generateName();
-      }))
-      .setPartyMemberFunc(2, getRandomPartyMemberFunc([ pool3Mon.species ], TrainerSlot.TRAINER, true, p => {
-        if (!isNullOrUndefined(pool3Mon.formIndex)) {
-          p.formIndex = pool3Mon.formIndex;
+      .setPartyTemplates(
+        new TrainerPartyCompoundTemplate(
+          new TrainerPartyTemplate(4, PartyMemberStrength.AVERAGE),
+          new TrainerPartyTemplate(1, PartyMemberStrength.STRONG),
+        ),
+      )
+      .setPartyMemberFunc(
+        0,
+        getRandomPartyMemberFunc([Species.BEEDRILL], TrainerSlot.TRAINER, true, p => {
+          p.setBoss(true, 2);
+          p.formIndex = 1;
           p.generateAndPopulateMoveset();
           p.generateName();
-        }
-      }))
-      .setPartyMemberFunc(3, getRandomPartyMemberFunc([ pool3Mon2.species ], TrainerSlot.TRAINER, true, p => {
-        if (!isNullOrUndefined(pool3Mon2.formIndex)) {
-          p.formIndex = pool3Mon2.formIndex;
+        }),
+      )
+      .setPartyMemberFunc(
+        1,
+        getRandomPartyMemberFunc([Species.BUTTERFREE], TrainerSlot.TRAINER, true, p => {
+          p.setBoss(true, 2);
+          p.formIndex = 1;
           p.generateAndPopulateMoveset();
           p.generateName();
-        }
-      }))
+        }),
+      )
+      .setPartyMemberFunc(
+        2,
+        getRandomPartyMemberFunc([pool3Mon.species], TrainerSlot.TRAINER, true, p => {
+          if (!isNullOrUndefined(pool3Mon.formIndex)) {
+            p.formIndex = pool3Mon.formIndex;
+            p.generateAndPopulateMoveset();
+            p.generateName();
+          }
+        }),
+      )
+      .setPartyMemberFunc(
+        3,
+        getRandomPartyMemberFunc([pool3Mon2.species], TrainerSlot.TRAINER, true, p => {
+          if (!isNullOrUndefined(pool3Mon2.formIndex)) {
+            p.formIndex = pool3Mon2.formIndex;
+            p.generateAndPopulateMoveset();
+            p.generateName();
+          }
+        }),
+      )
       .setPartyMemberFunc(4, getRandomPartyMemberFunc(POOL_4_POKEMON, TrainerSlot.TRAINER, true));
   }
 
@@ -651,6 +718,7 @@ function getTrainerConfigForWave(waveIndex: number) {
 }
 
 function doBugTypeMoveTutor(): Promise<void> {
+  // biome-ignore lint/suspicious/noAsyncPromiseExecutor: TODO explain
   return new Promise<void>(async resolve => {
     const moveOptions = globalScene.currentBattle.mysteryEncounter!.misc.moveTutorOptions;
     await showEncounterDialogue(`${namespace}:battle_won`, `${namespace}:speaker`);
@@ -663,7 +731,7 @@ function doBugTypeMoveTutor(): Promise<void> {
       right: true,
       x: 1,
       y: -MoveInfoOverlay.getHeight(overlayScale, true) - 1,
-      width: (globalScene.game.canvas.width / 6) - 2,
+      width: globalScene.game.canvas.width / 6 - 2,
     });
     globalScene.ui.add(moveInfoOverlay);
 
@@ -688,7 +756,12 @@ function doBugTypeMoveTutor(): Promise<void> {
       moveInfoOverlay.setVisible(false);
     };
 
-    const result = await selectOptionThenPokemon(optionSelectItems, `${namespace}:teach_move_prompt`, undefined, onHoverOverCancel);
+    const result = await selectOptionThenPokemon(
+      optionSelectItems,
+      `${namespace}:teach_move_prompt`,
+      undefined,
+      onHoverOverCancel,
+    );
     // let forceExit = !!result;
     if (!result) {
       moveInfoOverlay.active = false;
@@ -699,7 +772,9 @@ function doBugTypeMoveTutor(): Promise<void> {
 
     // Option select complete, handle if they are learning a move
     if (result && result.selectedOptionIndex < moveOptions.length) {
-      globalScene.unshiftPhase(new LearnMovePhase(result.selectedPokemonIndex, moveOptions[result.selectedOptionIndex].moveId));
+      globalScene.unshiftPhase(
+        new LearnMovePhase(result.selectedPokemonIndex, moveOptions[result.selectedOptionIndex].moveId),
+      );
     }
 
     // Complete battle and go to rewards
diff --git a/src/data/mystery-encounters/encounters/clowning-around-encounter.ts b/src/data/mystery-encounters/encounters/clowning-around-encounter.ts
index e660b0b873c..ce5eb2cfdd1 100644
--- a/src/data/mystery-encounters/encounters/clowning-around-encounter.ts
+++ b/src/data/mystery-encounters/encounters/clowning-around-encounter.ts
@@ -1,6 +1,16 @@
 import type { EnemyPartyConfig } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
-import { generateModifierType, initBattleWithEnemyConfig, leaveEncounterWithoutBattle, loadCustomMovesForEncounter, selectPokemonForOption, setEncounterRewards, transitionMysteryEncounterIntroVisuals } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
-import { trainerConfigs, TrainerPartyCompoundTemplate, TrainerPartyTemplate, } from "#app/data/trainer-config";
+import {
+  generateModifierType,
+  initBattleWithEnemyConfig,
+  leaveEncounterWithoutBattle,
+  loadCustomMovesForEncounter,
+  selectPokemonForOption,
+  setEncounterRewards,
+  transitionMysteryEncounterIntroVisuals,
+} from "#app/data/mystery-encounters/utils/encounter-phase-utils";
+import { trainerConfigs } from "#app/data/trainers/trainer-config";
+import { TrainerPartyCompoundTemplate } from "#app/data/trainers/TrainerPartyTemplate";
+import { TrainerPartyTemplate } from "#app/data/trainers/TrainerPartyTemplate";
 import { ModifierTier } from "#app/modifier/modifier-tier";
 import type { PokemonHeldItemModifierType } from "#app/modifier/modifier-type";
 import { ModifierPoolType, modifierTypes } from "#app/modifier/modifier-type";
@@ -14,26 +24,29 @@ import { Species } from "#enums/species";
 import { TrainerType } from "#enums/trainer-type";
 import { getPokemonSpecies } from "#app/data/pokemon-species";
 import { Abilities } from "#enums/abilities";
-import { applyAbilityOverrideToPokemon, applyModifierTypeToPlayerPokemon } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils";
-import { Type } from "#enums/type";
+import {
+  applyAbilityOverrideToPokemon,
+  applyModifierTypeToPlayerPokemon,
+} from "#app/data/mystery-encounters/utils/encounter-pokemon-utils";
+import { PokemonType } from "#enums/pokemon-type";
 import { MysteryEncounterOptionBuilder } from "#app/data/mystery-encounters/mystery-encounter-option";
 import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
-import { randSeedInt, randSeedShuffle } from "#app/utils";
+import { randSeedInt, randSeedShuffle } from "#app/utils/common";
 import { showEncounterDialogue, showEncounterText } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils";
-import { Mode } from "#app/ui/ui";
+import { UiMode } from "#enums/ui-mode";
 import i18next from "i18next";
 import type { OptionSelectConfig } from "#app/ui/abstact-option-select-ui-handler";
 import type { PlayerPokemon } from "#app/field/pokemon";
 import { PokemonMove } from "#app/field/pokemon";
-import { Ability } from "#app/data/ability";
+import { Ability } from "#app/data/abilities/ability-class";
 import { BerryModifier } from "#app/modifier/modifier";
 import { BerryType } from "#enums/berry-type";
 import { BattlerIndex } from "#app/battle";
 import { Moves } from "#enums/moves";
 import { EncounterBattleAnim } from "#app/data/battle-anims";
-import { MoveCategory } from "#app/data/move";
+import { MoveCategory } from "#enums/MoveCategory";
 import { CustomPokemonData } from "#app/data/custom-pokemon-data";
-import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/game-mode";
+import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants";
 import { EncounterAnim } from "#enums/encounter-anims";
 import { Challenges } from "#enums/challenges";
 
@@ -55,7 +68,7 @@ const RANDOM_ABILITY_POOL = [
   Abilities.MISTY_SURGE,
   Abilities.MAGICIAN,
   Abilities.SHEER_FORCE,
-  Abilities.PRANKSTER
+  Abilities.PRANKSTER,
 ];
 
 /**
@@ -63,345 +76,365 @@ const RANDOM_ABILITY_POOL = [
  * @see {@link https://github.com/pagefaultgames/pokerogue/issues/3807 | GitHub Issue #3807}
  * @see For biome requirements check {@linkcode mysteryEncountersByBiome}
  */
-export const ClowningAroundEncounter: MysteryEncounter =
-  MysteryEncounterBuilder.withEncounterType(MysteryEncounterType.CLOWNING_AROUND)
-    .withEncounterTier(MysteryEncounterTier.ULTRA)
-    .withDisallowedChallenges(Challenges.SINGLE_TYPE)
-    .withSceneWaveRangeRequirement(80, CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES[1])
-    .withAnimations(EncounterAnim.SMOKESCREEN)
-    .withAutoHideIntroVisuals(false)
-    .withIntroSpriteConfigs([
-      {
-        spriteKey: Species.MR_MIME.toString(),
-        fileRoot: "pokemon",
-        hasShadow: true,
-        repeat: true,
-        x: -25,
-        tint: 0.3,
-        y: -3,
-        yShadow: -3
-      },
-      {
-        spriteKey: Species.BLACEPHALON.toString(),
-        fileRoot: "pokemon/exp",
-        hasShadow: true,
-        repeat: true,
-        x: 25,
-        tint: 0.3,
-        y: -3,
-        yShadow: -3
-      },
-      {
-        spriteKey: "harlequin",
-        fileRoot: "trainer",
-        hasShadow: true,
-        x: 0,
-        y: 2,
-        yShadow: 2
-      },
-    ])
-    .withIntroDialogue([
-      {
-        text: `${namespace}:intro`,
-      },
-      {
-        text: `${namespace}:intro_dialogue`,
-        speaker: `${namespace}:speaker`
-      },
-    ])
-    .withOnInit(() => {
-      const encounter = globalScene.currentBattle.mysteryEncounter!;
+export const ClowningAroundEncounter: MysteryEncounter = MysteryEncounterBuilder.withEncounterType(
+  MysteryEncounterType.CLOWNING_AROUND,
+)
+  .withEncounterTier(MysteryEncounterTier.ULTRA)
+  .withDisallowedChallenges(Challenges.SINGLE_TYPE)
+  .withSceneWaveRangeRequirement(80, CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES[1])
+  .withAnimations(EncounterAnim.SMOKESCREEN)
+  .withAutoHideIntroVisuals(false)
+  .withIntroSpriteConfigs([
+    {
+      spriteKey: Species.MR_MIME.toString(),
+      fileRoot: "pokemon",
+      hasShadow: true,
+      repeat: true,
+      x: -25,
+      tint: 0.3,
+      y: -3,
+      yShadow: -3,
+    },
+    {
+      spriteKey: Species.BLACEPHALON.toString(),
+      fileRoot: "pokemon/exp",
+      hasShadow: true,
+      repeat: true,
+      x: 25,
+      tint: 0.3,
+      y: -3,
+      yShadow: -3,
+    },
+    {
+      spriteKey: "harlequin",
+      fileRoot: "trainer",
+      hasShadow: true,
+      x: 0,
+      y: 2,
+      yShadow: 2,
+    },
+  ])
+  .withIntroDialogue([
+    {
+      text: `${namespace}:intro`,
+    },
+    {
+      text: `${namespace}:intro_dialogue`,
+      speaker: `${namespace}:speaker`,
+    },
+  ])
+  .withOnInit(() => {
+    const encounter = globalScene.currentBattle.mysteryEncounter!;
 
-      const clownTrainerType = TrainerType.HARLEQUIN;
-      const clownConfig = trainerConfigs[clownTrainerType].clone();
-      const clownPartyTemplate = new TrainerPartyCompoundTemplate(
-        new TrainerPartyTemplate(1, PartyMemberStrength.STRONG),
-        new TrainerPartyTemplate(1, PartyMemberStrength.STRONGER));
-      clownConfig.setPartyTemplates(clownPartyTemplate);
-      clownConfig.setDoubleOnly();
-      // @ts-ignore
-      clownConfig.partyTemplateFunc = null; // Overrides party template func if it exists
+    const clownTrainerType = TrainerType.HARLEQUIN;
+    const clownConfig = trainerConfigs[clownTrainerType].clone();
+    const clownPartyTemplate = new TrainerPartyCompoundTemplate(
+      new TrainerPartyTemplate(1, PartyMemberStrength.STRONG),
+      new TrainerPartyTemplate(1, PartyMemberStrength.STRONGER),
+    );
+    clownConfig.setPartyTemplates(clownPartyTemplate);
+    clownConfig.setDoubleOnly();
+    // @ts-ignore
+    clownConfig.partyTemplateFunc = null; // Overrides party template func if it exists
 
-      // Generate random ability for Blacephalon from pool
-      const ability = RANDOM_ABILITY_POOL[randSeedInt(RANDOM_ABILITY_POOL.length)];
-      encounter.setDialogueToken("ability", new Ability(ability, 3).name);
-      encounter.misc = { ability };
+    // Generate random ability for Blacephalon from pool
+    const ability = RANDOM_ABILITY_POOL[randSeedInt(RANDOM_ABILITY_POOL.length)];
+    encounter.setDialogueToken("ability", new Ability(ability, 3).name);
+    encounter.misc = { ability };
 
-      // Decide the random types for Blacephalon. They should not be the same.
-      const firstType: number = randSeedInt(18);
-      let secondType: number = randSeedInt(17);
-      if ( secondType >= firstType ) {
-        secondType++;
-      }
+    // Decide the random types for Blacephalon. They should not be the same.
+    const firstType: number = randSeedInt(18);
+    let secondType: number = randSeedInt(17);
+    if (secondType >= firstType) {
+      secondType++;
+    }
 
-      encounter.enemyPartyConfigs.push({
-        trainerConfig: clownConfig,
-        pokemonConfigs: [ // Overrides first 2 pokemon to be Mr. Mime and Blacephalon
+    encounter.enemyPartyConfigs.push({
+      trainerConfig: clownConfig,
+      pokemonConfigs: [
+        // Overrides first 2 pokemon to be Mr. Mime and Blacephalon
+        {
+          species: getPokemonSpecies(Species.MR_MIME),
+          isBoss: true,
+          moveSet: [Moves.TEETER_DANCE, Moves.ALLY_SWITCH, Moves.DAZZLING_GLEAM, Moves.PSYCHIC],
+        },
+        {
+          // Blacephalon has the random ability from pool, and 2 entirely random types to fit with the theme of the encounter
+          species: getPokemonSpecies(Species.BLACEPHALON),
+          customPokemonData: new CustomPokemonData({
+            ability: ability,
+            types: [firstType, secondType],
+          }),
+          isBoss: true,
+          moveSet: [Moves.TRICK, Moves.HYPNOSIS, Moves.SHADOW_BALL, Moves.MIND_BLOWN],
+        },
+      ],
+      doubleBattle: true,
+    });
+
+    // Load animations/sfx for start of fight moves
+    loadCustomMovesForEncounter([Moves.ROLE_PLAY, Moves.TAUNT]);
+
+    encounter.setDialogueToken("blacephalonName", getPokemonSpecies(Species.BLACEPHALON).getName());
+
+    return true;
+  })
+  .setLocalizationKey(`${namespace}`)
+  .withTitle(`${namespace}:title`)
+  .withDescription(`${namespace}:description`)
+  .withQuery(`${namespace}:query`)
+  .withOption(
+    MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DEFAULT)
+      .withDialogue({
+        buttonLabel: `${namespace}:option.1.label`,
+        buttonTooltip: `${namespace}:option.1.tooltip`,
+        selected: [
           {
-            species: getPokemonSpecies(Species.MR_MIME),
-            isBoss: true,
-            moveSet: [ Moves.TEETER_DANCE, Moves.ALLY_SWITCH, Moves.DAZZLING_GLEAM, Moves.PSYCHIC ]
-          },
-          { // Blacephalon has the random ability from pool, and 2 entirely random types to fit with the theme of the encounter
-            species: getPokemonSpecies(Species.BLACEPHALON),
-            customPokemonData: new CustomPokemonData({ ability: ability, types: [ firstType, secondType ]}),
-            isBoss: true,
-            moveSet: [ Moves.TRICK, Moves.HYPNOSIS, Moves.SHADOW_BALL, Moves.MIND_BLOWN ]
+            text: `${namespace}:option.1.selected`,
+            speaker: `${namespace}:speaker`,
           },
         ],
-        doubleBattle: true
-      });
+      })
+      .withOptionPhase(async () => {
+        const encounter = globalScene.currentBattle.mysteryEncounter!;
+        // Spawn battle
+        const config: EnemyPartyConfig = encounter.enemyPartyConfigs[0];
 
-      // Load animations/sfx for start of fight moves
-      loadCustomMovesForEncounter([ Moves.ROLE_PLAY, Moves.TAUNT ]);
+        setEncounterRewards({ fillRemaining: true });
 
-      encounter.setDialogueToken("blacephalonName", getPokemonSpecies(Species.BLACEPHALON).getName());
+        // TODO: when Magic Room and Wonder Room are implemented, add those to start of battle
+        encounter.startOfBattleEffects.push(
+          {
+            // Mr. Mime copies the Blacephalon's random ability
+            sourceBattlerIndex: BattlerIndex.ENEMY,
+            targets: [BattlerIndex.ENEMY_2],
+            move: new PokemonMove(Moves.ROLE_PLAY),
+            ignorePp: true,
+          },
+          {
+            sourceBattlerIndex: BattlerIndex.ENEMY_2,
+            targets: [BattlerIndex.PLAYER],
+            move: new PokemonMove(Moves.TAUNT),
+            ignorePp: true,
+          },
+          {
+            sourceBattlerIndex: BattlerIndex.ENEMY_2,
+            targets: [BattlerIndex.PLAYER_2],
+            move: new PokemonMove(Moves.TAUNT),
+            ignorePp: true,
+          },
+        );
 
-      return true;
-    })
-    .setLocalizationKey(`${namespace}`)
-    .withTitle(`${namespace}:title`)
-    .withDescription(`${namespace}:description`)
-    .withQuery(`${namespace}:query`)
-    .withOption(
-      MysteryEncounterOptionBuilder
-        .newOptionWithMode(MysteryEncounterOptionMode.DEFAULT)
-        .withDialogue({
-          buttonLabel: `${namespace}:option.1.label`,
-          buttonTooltip: `${namespace}:option.1.tooltip`,
-          selected: [
-            {
-              text: `${namespace}:option.1.selected`,
-              speaker: `${namespace}:speaker`
-            },
-          ],
-        })
-        .withOptionPhase(async () => {
-          const encounter = globalScene.currentBattle.mysteryEncounter!;
-          // Spawn battle
-          const config: EnemyPartyConfig = encounter.enemyPartyConfigs[0];
+        await transitionMysteryEncounterIntroVisuals();
+        await initBattleWithEnemyConfig(config);
+      })
+      .withPostOptionPhase(async (): Promise<boolean> => {
+        // After the battle, offer the player the opportunity to permanently swap ability
+        const abilityWasSwapped = await handleSwapAbility();
+        if (abilityWasSwapped) {
+          await showEncounterText(`${namespace}:option.1.ability_gained`);
+        }
 
-          setEncounterRewards({ fillRemaining: true });
+        // Play animations once ability swap is complete
+        // Trainer sprite that is shown at end of battle is not the same as mystery encounter intro visuals
+        globalScene.tweens.add({
+          targets: globalScene.currentBattle.trainer,
+          x: "+=16",
+          y: "-=16",
+          alpha: 0,
+          ease: "Sine.easeInOut",
+          duration: 250,
+        });
+        const background = new EncounterBattleAnim(
+          EncounterAnim.SMOKESCREEN,
+          globalScene.getPlayerPokemon()!,
+          globalScene.getPlayerPokemon(),
+        );
+        background.playWithoutTargets(230, 40, 2);
+        return true;
+      })
+      .build(),
+  )
+  .withOption(
+    MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DEFAULT)
+      .withDialogue({
+        buttonLabel: `${namespace}:option.2.label`,
+        buttonTooltip: `${namespace}:option.2.tooltip`,
+        selected: [
+          {
+            text: `${namespace}:option.2.selected`,
+            speaker: `${namespace}:speaker`,
+          },
+          {
+            text: `${namespace}:option.2.selected_2`,
+          },
+          {
+            text: `${namespace}:option.2.selected_3`,
+            speaker: `${namespace}:speaker`,
+          },
+        ],
+      })
+      .withPreOptionPhase(async () => {
+        // Swap player's items on pokemon with the most items
+        // Item comparisons look at whichever Pokemon has the greatest number of TRANSFERABLE, non-berry items
+        // So Vitamins, form change items, etc. are not included
+        const encounter = globalScene.currentBattle.mysteryEncounter!;
 
-          // TODO: when Magic Room and Wonder Room are implemented, add those to start of battle
-          encounter.startOfBattleEffects.push(
-            { // Mr. Mime copies the Blacephalon's random ability
-              sourceBattlerIndex: BattlerIndex.ENEMY,
-              targets: [ BattlerIndex.ENEMY_2 ],
-              move: new PokemonMove(Moves.ROLE_PLAY),
-              ignorePp: true
-            },
-            {
-              sourceBattlerIndex: BattlerIndex.ENEMY_2,
-              targets: [ BattlerIndex.PLAYER ],
-              move: new PokemonMove(Moves.TAUNT),
-              ignorePp: true
-            },
-            {
-              sourceBattlerIndex: BattlerIndex.ENEMY_2,
-              targets: [ BattlerIndex.PLAYER_2 ],
-              move: new PokemonMove(Moves.TAUNT),
-              ignorePp: true
-            });
+        const party = globalScene.getPlayerParty();
+        let mostHeldItemsPokemon = party[0];
+        let count = mostHeldItemsPokemon
+          .getHeldItems()
+          .filter(m => m.isTransferable && !(m instanceof BerryModifier))
+          .reduce((v, m) => v + m.stackCount, 0);
 
-          await transitionMysteryEncounterIntroVisuals();
-          await initBattleWithEnemyConfig(config);
-        })
-        .withPostOptionPhase(async (): Promise<boolean> => {
-          // After the battle, offer the player the opportunity to permanently swap ability
-          const abilityWasSwapped = await handleSwapAbility();
-          if (abilityWasSwapped) {
-            await showEncounterText(`${namespace}:option.1.ability_gained`);
-          }
-
-          // Play animations once ability swap is complete
-          // Trainer sprite that is shown at end of battle is not the same as mystery encounter intro visuals
-          globalScene.tweens.add({
-            targets: globalScene.currentBattle.trainer,
-            x: "+=16",
-            y: "-=16",
-            alpha: 0,
-            ease: "Sine.easeInOut",
-            duration: 250
-          });
-          const background = new EncounterBattleAnim(EncounterAnim.SMOKESCREEN, globalScene.getPlayerPokemon()!, globalScene.getPlayerPokemon());
-          background.playWithoutTargets(230, 40, 2);
-          return true;
-        })
-        .build()
-    )
-    .withOption(
-      MysteryEncounterOptionBuilder
-        .newOptionWithMode(MysteryEncounterOptionMode.DEFAULT)
-        .withDialogue({
-          buttonLabel: `${namespace}:option.2.label`,
-          buttonTooltip: `${namespace}:option.2.tooltip`,
-          selected: [
-            {
-              text: `${namespace}:option.2.selected`,
-              speaker: `${namespace}:speaker`
-            },
-            {
-              text: `${namespace}:option.2.selected_2`,
-            },
-            {
-              text: `${namespace}:option.2.selected_3`,
-              speaker: `${namespace}:speaker`
-            },
-          ],
-        })
-        .withPreOptionPhase(async () => {
-          // Swap player's items on pokemon with the most items
-          // Item comparisons look at whichever Pokemon has the greatest number of TRANSFERABLE, non-berry items
-          // So Vitamins, form change items, etc. are not included
-          const encounter = globalScene.currentBattle.mysteryEncounter!;
-
-          const party = globalScene.getPlayerParty();
-          let mostHeldItemsPokemon = party[0];
-          let count = mostHeldItemsPokemon.getHeldItems()
+        for (const pokemon of party) {
+          const nextCount = pokemon
+            .getHeldItems()
             .filter(m => m.isTransferable && !(m instanceof BerryModifier))
             .reduce((v, m) => v + m.stackCount, 0);
+          if (nextCount > count) {
+            mostHeldItemsPokemon = pokemon;
+            count = nextCount;
+          }
+        }
 
-          party.forEach(pokemon => {
-            const nextCount = pokemon.getHeldItems()
-              .filter(m => m.isTransferable && !(m instanceof BerryModifier))
-              .reduce((v, m) => v + m.stackCount, 0);
-            if (nextCount > count) {
-              mostHeldItemsPokemon = pokemon;
-              count = nextCount;
-            }
-          });
+        encounter.setDialogueToken("switchPokemon", mostHeldItemsPokemon.getNameToRender());
 
-          encounter.setDialogueToken("switchPokemon", mostHeldItemsPokemon.getNameToRender());
+        const items = mostHeldItemsPokemon.getHeldItems();
 
-          const items = mostHeldItemsPokemon.getHeldItems();
+        // Shuffles Berries (if they have any)
+        let numBerries = 0;
+        for (const m of items.filter(m => m instanceof BerryModifier)) {
+          numBerries += m.stackCount;
+          globalScene.removeModifier(m);
+        }
 
-          // Shuffles Berries (if they have any)
-          let numBerries = 0;
-          items.filter(m => m instanceof BerryModifier)
-            .forEach(m => {
-              numBerries += m.stackCount;
-              globalScene.removeModifier(m);
-            });
+        generateItemsOfTier(mostHeldItemsPokemon, numBerries, "Berries");
 
-          generateItemsOfTier(mostHeldItemsPokemon, numBerries, "Berries");
+        // Shuffle Transferable held items in the same tier (only shuffles Ultra and Rogue atm)
+        // For the purpose of this ME, Soothe Bells and Lucky Eggs are counted as Ultra tier
+        // And Golden Eggs as Rogue tier
+        let numUltra = 0;
+        let numRogue = 0;
 
-          // Shuffle Transferable held items in the same tier (only shuffles Ultra and Rogue atm)
-          // For the purpose of this ME, Soothe Bells and Lucky Eggs are counted as Ultra tier
-          // And Golden Eggs as Rogue tier
-          let numUltra = 0;
-          let numRogue = 0;
-          items.filter(m => m.isTransferable && !(m instanceof BerryModifier))
-            .forEach(m => {
-              const type = m.type.withTierFromPool(ModifierPoolType.PLAYER, party);
-              const tier = type.tier ?? ModifierTier.ULTRA;
-              if (type.id === "GOLDEN_EGG" || tier === ModifierTier.ROGUE) {
-                numRogue += m.stackCount;
-                globalScene.removeModifier(m);
-              } else if (type.id === "LUCKY_EGG" || type.id === "SOOTHE_BELL" || tier === ModifierTier.ULTRA) {
-                numUltra += m.stackCount;
-                globalScene.removeModifier(m);
-              }
-            });
+        for (const m of items.filter(m => m.isTransferable && !(m instanceof BerryModifier))) {
+          const type = m.type.withTierFromPool(ModifierPoolType.PLAYER, party);
+          const tier = type.tier ?? ModifierTier.ULTRA;
+          if (type.id === "GOLDEN_EGG" || tier === ModifierTier.ROGUE) {
+            numRogue += m.stackCount;
+            globalScene.removeModifier(m);
+          } else if (type.id === "LUCKY_EGG" || type.id === "SOOTHE_BELL" || tier === ModifierTier.ULTRA) {
+            numUltra += m.stackCount;
+            globalScene.removeModifier(m);
+          }
+        }
 
-          generateItemsOfTier(mostHeldItemsPokemon, numUltra, ModifierTier.ULTRA);
-          generateItemsOfTier(mostHeldItemsPokemon, numRogue, ModifierTier.ROGUE);
-        })
-        .withOptionPhase(async () => {
-          leaveEncounterWithoutBattle(true);
-        })
-        .withPostOptionPhase(async () => {
-          // Play animations
-          const background = new EncounterBattleAnim(EncounterAnim.SMOKESCREEN, globalScene.getPlayerPokemon()!, globalScene.getPlayerPokemon());
-          background.playWithoutTargets(230, 40, 2);
-          await transitionMysteryEncounterIntroVisuals(true, true, 200);
-        })
-        .build()
-    )
-    .withOption(
-      MysteryEncounterOptionBuilder
-        .newOptionWithMode(MysteryEncounterOptionMode.DEFAULT)
-        .withDialogue({
-          buttonLabel: `${namespace}:option.3.label`,
-          buttonTooltip: `${namespace}:option.3.tooltip`,
-          selected: [
-            {
-              text: `${namespace}:option.3.selected`,
-              speaker: `${namespace}:speaker`
-            },
-            {
-              text: `${namespace}:option.3.selected_2`,
-            },
-            {
-              text: `${namespace}:option.3.selected_3`,
-              speaker: `${namespace}:speaker`
-            },
-          ],
-        })
-        .withPreOptionPhase(async () => {
-          // Randomize the second type of all player's pokemon
-          // If the pokemon does not normally have a second type, it will gain 1
-          for (const pokemon of globalScene.getPlayerParty()) {
-            const originalTypes = pokemon.getTypes(false, false, true);
+        generateItemsOfTier(mostHeldItemsPokemon, numUltra, ModifierTier.ULTRA);
+        generateItemsOfTier(mostHeldItemsPokemon, numRogue, ModifierTier.ROGUE);
+      })
+      .withOptionPhase(async () => {
+        leaveEncounterWithoutBattle(true);
+      })
+      .withPostOptionPhase(async () => {
+        // Play animations
+        const background = new EncounterBattleAnim(
+          EncounterAnim.SMOKESCREEN,
+          globalScene.getPlayerPokemon()!,
+          globalScene.getPlayerPokemon(),
+        );
+        background.playWithoutTargets(230, 40, 2);
+        await transitionMysteryEncounterIntroVisuals(true, true, 200);
+      })
+      .build(),
+  )
+  .withOption(
+    MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DEFAULT)
+      .withDialogue({
+        buttonLabel: `${namespace}:option.3.label`,
+        buttonTooltip: `${namespace}:option.3.tooltip`,
+        selected: [
+          {
+            text: `${namespace}:option.3.selected`,
+            speaker: `${namespace}:speaker`,
+          },
+          {
+            text: `${namespace}:option.3.selected_2`,
+          },
+          {
+            text: `${namespace}:option.3.selected_3`,
+            speaker: `${namespace}:speaker`,
+          },
+        ],
+      })
+      .withPreOptionPhase(async () => {
+        // Randomize the second type of all player's pokemon
+        // If the pokemon does not normally have a second type, it will gain 1
+        for (const pokemon of globalScene.getPlayerParty()) {
+          const originalTypes = pokemon.getTypes(false, false, true);
 
-            // If the Pokemon has non-status moves that don't match the Pokemon's type, prioritizes those as the new type
-            // Makes the "randomness" of the shuffle slightly less punishing
-            let priorityTypes = pokemon.moveset
-              .filter(move => move && !originalTypes.includes(move.getMove().type) && move.getMove().category !== MoveCategory.STATUS)
-              .map(move => move!.getMove().type);
-            if (priorityTypes?.length > 0) {
-              priorityTypes = [ ...new Set(priorityTypes) ].sort();
-              priorityTypes = randSeedShuffle(priorityTypes);
-            }
+          // If the Pokemon has non-status moves that don't match the Pokemon's type, prioritizes those as the new type
+          // Makes the "randomness" of the shuffle slightly less punishing
+          let priorityTypes = pokemon.moveset
+            .filter(
+              move =>
+                move && !originalTypes.includes(move.getMove().type) && move.getMove().category !== MoveCategory.STATUS,
+            )
+            .map(move => move!.getMove().type);
+          if (priorityTypes?.length > 0) {
+            priorityTypes = [...new Set(priorityTypes)].sort();
+            priorityTypes = randSeedShuffle(priorityTypes);
+          }
 
-            const newTypes = [ Type.UNKNOWN ];
-            let secondType: Type | null = null;
-            while (secondType === null || secondType === newTypes[0] || originalTypes.includes(secondType)) {
-              if (priorityTypes.length > 0) {
-                secondType = priorityTypes.pop() ?? null;
-              } else {
-                secondType = randSeedInt(18) as Type;
-              }
-            }
-            newTypes.push(secondType);
-
-            // Apply the type changes (to both base and fusion, if pokemon is fused)
-            if (!pokemon.customPokemonData) {
-              pokemon.customPokemonData = new CustomPokemonData();
-            }
-            pokemon.customPokemonData.types = newTypes;
-            if (pokemon.isFusion()) {
-              if (!pokemon.fusionCustomPokemonData) {
-                pokemon.fusionCustomPokemonData = new CustomPokemonData();
-              }
-              pokemon.fusionCustomPokemonData.types = newTypes;
+          const newTypes = [PokemonType.UNKNOWN];
+          let secondType: PokemonType | null = null;
+          while (secondType === null || secondType === newTypes[0] || originalTypes.includes(secondType)) {
+            if (priorityTypes.length > 0) {
+              secondType = priorityTypes.pop() ?? null;
+            } else {
+              secondType = randSeedInt(18) as PokemonType;
             }
           }
-        })
-        .withOptionPhase(async () => {
-          leaveEncounterWithoutBattle(true);
-        })
-        .withPostOptionPhase(async () => {
-          // Play animations
-          const background = new EncounterBattleAnim(EncounterAnim.SMOKESCREEN, globalScene.getPlayerPokemon()!, globalScene.getPlayerPokemon());
-          background.playWithoutTargets(230, 40, 2);
-          await transitionMysteryEncounterIntroVisuals(true, true, 200);
-        })
-        .build()
-    )
-    .withOutroDialogue([
-      {
-        text: `${namespace}:outro`,
-      },
-    ])
-    .build();
+          newTypes.push(secondType);
+
+          // Apply the type changes (to both base and fusion, if pokemon is fused)
+          pokemon.customPokemonData.types = newTypes;
+          if (pokemon.isFusion()) {
+            if (!pokemon.fusionCustomPokemonData) {
+              pokemon.fusionCustomPokemonData = new CustomPokemonData();
+            }
+            pokemon.fusionCustomPokemonData.types = newTypes;
+          }
+        }
+      })
+      .withOptionPhase(async () => {
+        leaveEncounterWithoutBattle(true);
+      })
+      .withPostOptionPhase(async () => {
+        // Play animations
+        const background = new EncounterBattleAnim(
+          EncounterAnim.SMOKESCREEN,
+          globalScene.getPlayerPokemon()!,
+          globalScene.getPlayerPokemon(),
+        );
+        background.playWithoutTargets(230, 40, 2);
+        await transitionMysteryEncounterIntroVisuals(true, true, 200);
+      })
+      .build(),
+  )
+  .withOutroDialogue([
+    {
+      text: `${namespace}:outro`,
+    },
+  ])
+  .build();
 
 async function handleSwapAbility() {
+  // biome-ignore lint/suspicious/noAsyncPromiseExecutor: TODO: Consider refactoring to avoid async promise executor
   return new Promise<boolean>(async resolve => {
     await showEncounterDialogue(`${namespace}:option.1.apply_ability_dialogue`, `${namespace}:speaker`);
     await showEncounterText(`${namespace}:option.1.apply_ability_message`);
 
-    globalScene.ui.setMode(Mode.MESSAGE).then(() => {
+    globalScene.ui.setMode(UiMode.MESSAGE).then(() => {
       displayYesNoOptions(resolve);
     });
   });
@@ -415,23 +448,23 @@ function displayYesNoOptions(resolve) {
       handler: () => {
         onYesAbilitySwap(resolve);
         return true;
-      }
+      },
     },
     {
       label: i18next.t("menu:no"),
       handler: () => {
         resolve(false);
         return true;
-      }
-    }
+      },
+    },
   ];
 
   const config: OptionSelectConfig = {
     options: fullOptions,
     maxOptions: 7,
-    yOffset: 0
+    yOffset: 0,
   };
-  globalScene.ui.setModeWithoutClear(Mode.OPTION_SELECT, config, null, true);
+  globalScene.ui.setModeWithoutClear(UiMode.OPTION_SELECT, config, null, true);
 }
 
 function onYesAbilitySwap(resolve) {
@@ -441,11 +474,11 @@ function onYesAbilitySwap(resolve) {
 
     applyAbilityOverrideToPokemon(pokemon, encounter.misc.ability);
     encounter.setDialogueToken("chosenPokemon", pokemon.getNameToRender());
-    globalScene.ui.setMode(Mode.MESSAGE).then(() => resolve(true));
+    globalScene.ui.setMode(UiMode.MESSAGE).then(() => resolve(true));
   };
 
   const onPokemonNotSelected = () => {
-    globalScene.ui.setMode(Mode.MESSAGE).then(() => {
+    globalScene.ui.setMode(UiMode.MESSAGE).then(() => {
       displayYesNoOptions(resolve);
     });
   };
@@ -458,36 +491,36 @@ function generateItemsOfTier(pokemon: PlayerPokemon, numItems: number, tier: Mod
   // Pools have instances of the modifier type equal to the max stacks that modifier can be applied to any one pokemon
   // This is to prevent "over-generating" a random item of a certain type during item swaps
   const ultraPool = [
-    [ modifierTypes.REVIVER_SEED, 1 ],
-    [ modifierTypes.GOLDEN_PUNCH, 5 ],
-    [ modifierTypes.ATTACK_TYPE_BOOSTER, 99 ],
-    [ modifierTypes.QUICK_CLAW, 3 ],
-    [ modifierTypes.WIDE_LENS, 3 ]
+    [modifierTypes.REVIVER_SEED, 1],
+    [modifierTypes.GOLDEN_PUNCH, 5],
+    [modifierTypes.ATTACK_TYPE_BOOSTER, 99],
+    [modifierTypes.QUICK_CLAW, 3],
+    [modifierTypes.WIDE_LENS, 3],
   ];
 
   const roguePool = [
-    [ modifierTypes.LEFTOVERS, 4 ],
-    [ modifierTypes.SHELL_BELL, 4 ],
-    [ modifierTypes.SOUL_DEW, 10 ],
-    [ modifierTypes.SCOPE_LENS, 1 ],
-    [ modifierTypes.BATON, 1 ],
-    [ modifierTypes.FOCUS_BAND, 5 ],
-    [ modifierTypes.KINGS_ROCK, 3 ],
-    [ modifierTypes.GRIP_CLAW, 5 ]
+    [modifierTypes.LEFTOVERS, 4],
+    [modifierTypes.SHELL_BELL, 4],
+    [modifierTypes.SOUL_DEW, 10],
+    [modifierTypes.SCOPE_LENS, 1],
+    [modifierTypes.BATON, 1],
+    [modifierTypes.FOCUS_BAND, 5],
+    [modifierTypes.KINGS_ROCK, 3],
+    [modifierTypes.GRIP_CLAW, 5],
   ];
 
   const berryPool = [
-    [ BerryType.APICOT, 3 ],
-    [ BerryType.ENIGMA, 2 ],
-    [ BerryType.GANLON, 3 ],
-    [ BerryType.LANSAT, 3 ],
-    [ BerryType.LEPPA, 2 ],
-    [ BerryType.LIECHI, 3 ],
-    [ BerryType.LUM, 2 ],
-    [ BerryType.PETAYA, 3 ],
-    [ BerryType.SALAC, 2 ],
-    [ BerryType.SITRUS, 2 ],
-    [ BerryType.STARF, 3 ]
+    [BerryType.APICOT, 3],
+    [BerryType.ENIGMA, 2],
+    [BerryType.GANLON, 3],
+    [BerryType.LANSAT, 3],
+    [BerryType.LEPPA, 2],
+    [BerryType.LIECHI, 3],
+    [BerryType.LUM, 2],
+    [BerryType.PETAYA, 3],
+    [BerryType.SALAC, 2],
+    [BerryType.SITRUS, 2],
+    [BerryType.STARF, 3],
   ];
 
   let pool: any[];
@@ -506,7 +539,7 @@ function generateItemsOfTier(pokemon: PlayerPokemon, numItems: number, tier: Mod
     const newItemType = pool[randIndex];
     let newMod: PokemonHeldItemModifierType;
     if (tier === "Berries") {
-      newMod = generateModifierType(modifierTypes.BERRY, [ newItemType[0] ]) as PokemonHeldItemModifierType;
+      newMod = generateModifierType(modifierTypes.BERRY, [newItemType[0]]) as PokemonHeldItemModifierType;
     } else {
       newMod = generateModifierType(newItemType[0]) as PokemonHeldItemModifierType;
     }
diff --git a/src/data/mystery-encounters/encounters/dancing-lessons-encounter.ts b/src/data/mystery-encounters/encounters/dancing-lessons-encounter.ts
index 88e5794e816..bdd4bfaacaa 100644
--- a/src/data/mystery-encounters/encounters/dancing-lessons-encounter.ts
+++ b/src/data/mystery-encounters/encounters/dancing-lessons-encounter.ts
@@ -8,14 +8,23 @@ import { MoveRequirement } from "#app/data/mystery-encounters/mystery-encounter-
 import { DANCING_MOVES } from "#app/data/mystery-encounters/requirements/requirement-groups";
 import { getEncounterText, queueEncounterMessage } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils";
 import type { EnemyPartyConfig } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
-import { initBattleWithEnemyConfig, leaveEncounterWithoutBattle, selectPokemonForOption, setEncounterRewards } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
-import { catchPokemon, getEncounterPokemonLevelForWave, STANDARD_ENCOUNTER_BOOSTED_LEVEL_MODIFIER } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils";
+import {
+  initBattleWithEnemyConfig,
+  leaveEncounterWithoutBattle,
+  selectPokemonForOption,
+  setEncounterRewards,
+} from "#app/data/mystery-encounters/utils/encounter-phase-utils";
+import {
+  catchPokemon,
+  getEncounterPokemonLevelForWave,
+  STANDARD_ENCOUNTER_BOOSTED_LEVEL_MODIFIER,
+} from "#app/data/mystery-encounters/utils/encounter-pokemon-utils";
 import { getPokemonSpecies } from "#app/data/pokemon-species";
-import { TrainerSlot } from "#app/data/trainer-config";
+import { TrainerSlot } from "#enums/trainer-slot";
 import type { PlayerPokemon } from "#app/field/pokemon";
 import type Pokemon from "#app/field/pokemon";
 import { EnemyPokemon, PokemonMove } from "#app/field/pokemon";
-import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/game-mode";
+import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants";
 import { modifierTypes } from "#app/modifier/modifier-type";
 import { LearnMovePhase } from "#app/phases/learn-move-phase";
 import { StatStageChangePhase } from "#app/phases/stat-stage-change-phase";
@@ -44,7 +53,7 @@ const BAILE_STYLE_BIOMES = [
   Biome.WASTELAND,
   Biome.MOUNTAIN,
   Biome.BADLANDS,
-  Biome.DESERT
+  Biome.DESERT,
 ];
 
 // Electric form
@@ -55,7 +64,7 @@ const POM_POM_STYLE_BIOMES = [
   Biome.LABORATORY,
   Biome.SLUM,
   Biome.METROPOLIS,
-  Biome.DOJO
+  Biome.DOJO,
 ];
 
 // Psychic form
@@ -66,7 +75,7 @@ const PAU_STYLE_BIOMES = [
   Biome.PLAINS,
   Biome.GRASS,
   Biome.TALL_GRASS,
-  Biome.FOREST
+  Biome.FOREST,
 ];
 
 // Ghost form
@@ -77,7 +86,7 @@ const SENSU_STYLE_BIOMES = [
   Biome.ABYSS,
   Biome.GRAVEYARD,
   Biome.LAKE,
-  Biome.TEMPLE
+  Biome.TEMPLE,
 ];
 
 /**
@@ -85,239 +94,259 @@ const SENSU_STYLE_BIOMES = [
  * @see {@link https://github.com/pagefaultgames/pokerogue/issues/3823 | GitHub Issue #3823}
  * @see For biome requirements check {@linkcode mysteryEncountersByBiome}
  */
-export const DancingLessonsEncounter: MysteryEncounter =
-  MysteryEncounterBuilder.withEncounterType(MysteryEncounterType.DANCING_LESSONS)
-    .withEncounterTier(MysteryEncounterTier.GREAT)
-    .withSceneWaveRangeRequirement(...CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES)
-    .withIntroSpriteConfigs([]) // Uses a real Pokemon sprite instead of ME Intro Visuals
-    .withAnimations(EncounterAnim.DANCE)
-    .withHideWildIntroMessage(true)
-    .withAutoHideIntroVisuals(false)
-    .withCatchAllowed(true)
-    .withFleeAllowed(false)
-    .withOnVisualsStart(() => {
-      const oricorio = globalScene.getEnemyPokemon()!;
-      const danceAnim = new EncounterBattleAnim(EncounterAnim.DANCE, oricorio, globalScene.getPlayerPokemon()!);
-      danceAnim.play(false, () => {
-        if (oricorio.shiny) {
-          oricorio.sparkle();
-        }
-      });
-      return true;
-    })
-    .withIntroDialogue([
-      {
-        text: `${namespace}:intro`,
+export const DancingLessonsEncounter: MysteryEncounter = MysteryEncounterBuilder.withEncounterType(
+  MysteryEncounterType.DANCING_LESSONS,
+)
+  .withEncounterTier(MysteryEncounterTier.GREAT)
+  .withSceneWaveRangeRequirement(...CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES)
+  .withIntroSpriteConfigs([]) // Uses a real Pokemon sprite instead of ME Intro Visuals
+  .withAnimations(EncounterAnim.DANCE)
+  .withHideWildIntroMessage(true)
+  .withAutoHideIntroVisuals(false)
+  .withCatchAllowed(true)
+  .withFleeAllowed(false)
+  .withOnVisualsStart(() => {
+    const oricorio = globalScene.getEnemyPokemon()!;
+    const danceAnim = new EncounterBattleAnim(EncounterAnim.DANCE, oricorio, globalScene.getPlayerPokemon()!);
+    danceAnim.play(false, () => {
+      if (oricorio.shiny) {
+        oricorio.sparkle();
       }
-    ])
-    .setLocalizationKey(`${namespace}`)
-    .withTitle(`${namespace}:title`)
-    .withDescription(`${namespace}:description`)
-    .withQuery(`${namespace}:query`)
-    .withOnInit(() => {
-      const encounter = globalScene.currentBattle.mysteryEncounter!;
+    });
+    return true;
+  })
+  .withIntroDialogue([
+    {
+      text: `${namespace}:intro`,
+    },
+  ])
+  .setLocalizationKey(`${namespace}`)
+  .withTitle(`${namespace}:title`)
+  .withDescription(`${namespace}:description`)
+  .withQuery(`${namespace}:query`)
+  .withOnInit(() => {
+    const encounter = globalScene.currentBattle.mysteryEncounter!;
 
-      const species = getPokemonSpecies(Species.ORICORIO);
-      const level = getEncounterPokemonLevelForWave(STANDARD_ENCOUNTER_BOOSTED_LEVEL_MODIFIER);
-      const enemyPokemon = new EnemyPokemon(species, level, TrainerSlot.NONE, false);
-      if (!enemyPokemon.moveset.some(m => m && m.getMove().id === Moves.REVELATION_DANCE)) {
-        if (enemyPokemon.moveset.length < 4) {
-          enemyPokemon.moveset.push(new PokemonMove(Moves.REVELATION_DANCE));
-        } else {
-          enemyPokemon.moveset[0] = new PokemonMove(Moves.REVELATION_DANCE);
-        }
-      }
-
-      // Set the form index based on the biome
-      // Defaults to Baile style if somehow nothing matches
-      const currentBiome = globalScene.arena.biomeType;
-      if (BAILE_STYLE_BIOMES.includes(currentBiome)) {
-        enemyPokemon.formIndex = 0;
-      } else if (POM_POM_STYLE_BIOMES.includes(currentBiome)) {
-        enemyPokemon.formIndex = 1;
-      } else if (PAU_STYLE_BIOMES.includes(currentBiome)) {
-        enemyPokemon.formIndex = 2;
-      } else if (SENSU_STYLE_BIOMES.includes(currentBiome)) {
-        enemyPokemon.formIndex = 3;
+    const species = getPokemonSpecies(Species.ORICORIO);
+    const level = getEncounterPokemonLevelForWave(STANDARD_ENCOUNTER_BOOSTED_LEVEL_MODIFIER);
+    const enemyPokemon = new EnemyPokemon(species, level, TrainerSlot.NONE, false);
+    if (!enemyPokemon.moveset.some(m => m && m.getMove().id === Moves.REVELATION_DANCE)) {
+      if (enemyPokemon.moveset.length < 4) {
+        enemyPokemon.moveset.push(new PokemonMove(Moves.REVELATION_DANCE));
       } else {
-        enemyPokemon.formIndex = 0;
+        enemyPokemon.moveset[0] = new PokemonMove(Moves.REVELATION_DANCE);
       }
+    }
 
-      const oricorioData = new PokemonData(enemyPokemon);
-      const oricorio = globalScene.addEnemyPokemon(species, level, TrainerSlot.NONE, false, false, oricorioData);
+    // Set the form index based on the biome
+    // Defaults to Baile style if somehow nothing matches
+    const currentBiome = globalScene.arena.biomeType;
+    if (BAILE_STYLE_BIOMES.includes(currentBiome)) {
+      enemyPokemon.formIndex = 0;
+    } else if (POM_POM_STYLE_BIOMES.includes(currentBiome)) {
+      enemyPokemon.formIndex = 1;
+    } else if (PAU_STYLE_BIOMES.includes(currentBiome)) {
+      enemyPokemon.formIndex = 2;
+    } else if (SENSU_STYLE_BIOMES.includes(currentBiome)) {
+      enemyPokemon.formIndex = 3;
+    } else {
+      enemyPokemon.formIndex = 0;
+    }
 
-      // Adds a real Pokemon sprite to the field (required for the animation)
-      globalScene.getEnemyParty().forEach(enemyPokemon => {
-        enemyPokemon.leaveField(true, true, true);
-      });
-      globalScene.currentBattle.enemyParty = [ oricorio ];
-      globalScene.field.add(oricorio);
-      // Spawns on offscreen field
-      oricorio.x -= 300;
-      encounter.loadAssets.push(oricorio.loadAssets());
+    const oricorioData = new PokemonData(enemyPokemon);
+    const oricorio = globalScene.addEnemyPokemon(species, level, TrainerSlot.NONE, false, false, oricorioData);
 
-      const config: EnemyPartyConfig = {
-        pokemonConfigs: [{
+    // Adds a real Pokemon sprite to the field (required for the animation)
+    for (const enemyPokemon of globalScene.getEnemyParty()) {
+      enemyPokemon.leaveField(true, true, true);
+    }
+    globalScene.currentBattle.enemyParty = [oricorio];
+    globalScene.field.add(oricorio);
+    // Spawns on offscreen field
+    oricorio.x -= 300;
+    encounter.loadAssets.push(oricorio.loadAssets());
+
+    const config: EnemyPartyConfig = {
+      pokemonConfigs: [
+        {
           species: species,
           dataSource: oricorioData,
           isBoss: true,
           // Gets +1 to all stats except SPD on battle start
-          tags: [ BattlerTagType.MYSTERY_ENCOUNTER_POST_SUMMON ],
+          tags: [BattlerTagType.MYSTERY_ENCOUNTER_POST_SUMMON],
           mysteryEncounterBattleEffects: (pokemon: Pokemon) => {
             queueEncounterMessage(`${namespace}:option.1.boss_enraged`);
-            globalScene.unshiftPhase(new StatStageChangePhase(pokemon.getBattlerIndex(), true, [ Stat.ATK, Stat.DEF, Stat.SPATK, Stat.SPDEF ], 1));
+            globalScene.unshiftPhase(
+              new StatStageChangePhase(
+                pokemon.getBattlerIndex(),
+                true,
+                [Stat.ATK, Stat.DEF, Stat.SPATK, Stat.SPDEF],
+                1,
+              ),
+            );
+          },
+        },
+      ],
+    };
+    encounter.enemyPartyConfigs = [config];
+    encounter.misc = {
+      oricorioData,
+    };
+
+    encounter.setDialogueToken("oricorioName", getPokemonSpecies(Species.ORICORIO).getName());
+
+    return true;
+  })
+  .withOption(
+    MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DEFAULT)
+      .withDialogue({
+        buttonLabel: `${namespace}:option.1.label`,
+        buttonTooltip: `${namespace}:option.1.tooltip`,
+        selected: [
+          {
+            text: `${namespace}:option.1.selected`,
+          },
+        ],
+      })
+      .withOptionPhase(async () => {
+        // Pick battle
+        const encounter = globalScene.currentBattle.mysteryEncounter!;
+
+        encounter.startOfBattleEffects.push({
+          sourceBattlerIndex: BattlerIndex.ENEMY,
+          targets: [BattlerIndex.PLAYER],
+          move: new PokemonMove(Moves.REVELATION_DANCE),
+          ignorePp: true,
+        });
+
+        await hideOricorioPokemon();
+        setEncounterRewards({
+          guaranteedModifierTypeFuncs: [modifierTypes.BATON],
+          fillRemaining: true,
+        });
+        await initBattleWithEnemyConfig(encounter.enemyPartyConfigs[0]);
+      })
+      .build(),
+  )
+  .withOption(
+    MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DEFAULT)
+      .withDialogue({
+        buttonLabel: `${namespace}:option.2.label`,
+        buttonTooltip: `${namespace}:option.2.tooltip`,
+        selected: [
+          {
+            text: `${namespace}:option.2.selected`,
+          },
+        ],
+      })
+      .withPreOptionPhase(async () => {
+        // Learn its Dance
+        const encounter = globalScene.currentBattle.mysteryEncounter!;
+
+        const onPokemonSelected = (pokemon: PlayerPokemon) => {
+          encounter.setDialogueToken("selectedPokemon", pokemon.getNameToRender());
+          globalScene.unshiftPhase(
+            new LearnMovePhase(globalScene.getPlayerParty().indexOf(pokemon), Moves.REVELATION_DANCE),
+          );
+
+          // Play animation again to "learn" the dance
+          const danceAnim = new EncounterBattleAnim(
+            EncounterAnim.DANCE,
+            globalScene.getEnemyPokemon()!,
+            globalScene.getPlayerPokemon(),
+          );
+          danceAnim.play();
+        };
+
+        return selectPokemonForOption(onPokemonSelected);
+      })
+      .withOptionPhase(async () => {
+        // Learn its Dance
+        await hideOricorioPokemon();
+        leaveEncounterWithoutBattle(true);
+      })
+      .build(),
+  )
+  .withOption(
+    MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DISABLED_OR_SPECIAL)
+      .withPrimaryPokemonRequirement(new MoveRequirement(DANCING_MOVES, true)) // Will set option3PrimaryName and option3PrimaryMove dialogue tokens automatically
+      .withDialogue({
+        buttonLabel: `${namespace}:option.3.label`,
+        buttonTooltip: `${namespace}:option.3.tooltip`,
+        disabledButtonTooltip: `${namespace}:option.3.disabled_tooltip`,
+        secondOptionPrompt: `${namespace}:option.3.select_prompt`,
+        selected: [
+          {
+            text: `${namespace}:option.3.selected`,
+          },
+        ],
+      })
+      .withPreOptionPhase(async () => {
+        // Open menu for selecting pokemon with a Dancing move
+        const encounter = globalScene.currentBattle.mysteryEncounter!;
+        const onPokemonSelected = (pokemon: PlayerPokemon) => {
+          // Return the options for nature selection
+          return pokemon.moveset
+            .filter(move => move && DANCING_MOVES.includes(move.getMove().id))
+            .map((move: PokemonMove) => {
+              const option: OptionSelectItem = {
+                label: move.getName(),
+                handler: () => {
+                  // Pokemon and second option selected
+                  encounter.setDialogueToken("selectedPokemon", pokemon.getNameToRender());
+                  encounter.setDialogueToken("selectedMove", move.getName());
+                  encounter.misc.selectedMove = move;
+
+                  return true;
+                },
+              };
+              return option;
+            });
+        };
+
+        // Only challenge legal/unfainted Pokemon that have a Dancing move can be selected
+        const selectableFilter = (pokemon: Pokemon) => {
+          // If pokemon meets primary pokemon reqs, it can be selected
+          if (!pokemon.isAllowedInBattle()) {
+            return (
+              i18next.t("partyUiHandler:cantBeUsed", {
+                pokemonName: pokemon.getNameToRender(),
+              }) ?? null
+            );
           }
-        }],
-      };
-      encounter.enemyPartyConfigs = [ config ];
-      encounter.misc = {
-        oricorioData
-      };
-
-      encounter.setDialogueToken("oricorioName", getPokemonSpecies(Species.ORICORIO).getName());
-
-      return true;
-    })
-    .withOption(
-      MysteryEncounterOptionBuilder
-        .newOptionWithMode(MysteryEncounterOptionMode.DEFAULT)
-        .withDialogue({
-          buttonLabel: `${namespace}:option.1.label`,
-          buttonTooltip: `${namespace}:option.1.tooltip`,
-          selected: [
-            {
-              text: `${namespace}:option.1.selected`,
-            },
-          ],
-        })
-        .withOptionPhase(async () => {
-          // Pick battle
-          const encounter = globalScene.currentBattle.mysteryEncounter!;
-
-          encounter.startOfBattleEffects.push({
-            sourceBattlerIndex: BattlerIndex.ENEMY,
-            targets: [ BattlerIndex.PLAYER ],
-            move: new PokemonMove(Moves.REVELATION_DANCE),
-            ignorePp: true
-          });
-
-          await hideOricorioPokemon();
-          setEncounterRewards({ guaranteedModifierTypeFuncs: [ modifierTypes.BATON ], fillRemaining: true });
-          await initBattleWithEnemyConfig(encounter.enemyPartyConfigs[0]);
-        })
-        .build()
-    )
-    .withOption(
-      MysteryEncounterOptionBuilder
-        .newOptionWithMode(MysteryEncounterOptionMode.DEFAULT)
-        .withDialogue({
-          buttonLabel: `${namespace}:option.2.label`,
-          buttonTooltip: `${namespace}:option.2.tooltip`,
-          selected: [
-            {
-              text: `${namespace}:option.2.selected`,
-            },
-          ],
-        })
-        .withPreOptionPhase(async () => {
-          // Learn its Dance
-          const encounter = globalScene.currentBattle.mysteryEncounter!;
-
-          const onPokemonSelected = (pokemon: PlayerPokemon) => {
-            encounter.setDialogueToken("selectedPokemon", pokemon.getNameToRender());
-            globalScene.unshiftPhase(new LearnMovePhase(globalScene.getPlayerParty().indexOf(pokemon), Moves.REVELATION_DANCE));
-
-            // Play animation again to "learn" the dance
-            const danceAnim = new EncounterBattleAnim(EncounterAnim.DANCE, globalScene.getEnemyPokemon()!, globalScene.getPlayerPokemon());
-            danceAnim.play();
-          };
-
-          return selectPokemonForOption(onPokemonSelected);
-        })
-        .withOptionPhase(async () => {
-          // Learn its Dance
-          await hideOricorioPokemon();
-          leaveEncounterWithoutBattle(true);
-        })
-        .build()
-    )
-    .withOption(
-      MysteryEncounterOptionBuilder
-        .newOptionWithMode(MysteryEncounterOptionMode.DISABLED_OR_SPECIAL)
-        .withPrimaryPokemonRequirement(new MoveRequirement(DANCING_MOVES, true)) // Will set option3PrimaryName and option3PrimaryMove dialogue tokens automatically
-        .withDialogue({
-          buttonLabel: `${namespace}:option.3.label`,
-          buttonTooltip: `${namespace}:option.3.tooltip`,
-          disabledButtonTooltip: `${namespace}:option.3.disabled_tooltip`,
-          secondOptionPrompt: `${namespace}:option.3.select_prompt`,
-          selected: [
-            {
-              text: `${namespace}:option.3.selected`,
-            },
-          ],
-        })
-        .withPreOptionPhase(async () => {
-          // Open menu for selecting pokemon with a Dancing move
-          const encounter = globalScene.currentBattle.mysteryEncounter!;
-          const onPokemonSelected = (pokemon: PlayerPokemon) => {
-            // Return the options for nature selection
-            return pokemon.moveset
-              .filter(move => move && DANCING_MOVES.includes(move.getMove().id))
-              .map((move: PokemonMove) => {
-                const option: OptionSelectItem = {
-                  label: move.getName(),
-                  handler: () => {
-                    // Pokemon and second option selected
-                    encounter.setDialogueToken("selectedPokemon", pokemon.getNameToRender());
-                    encounter.setDialogueToken("selectedMove", move.getName());
-                    encounter.misc.selectedMove = move;
-
-                    return true;
-                  },
-                };
-                return option;
-              });
-          };
-
-          // Only challenge legal/unfainted Pokemon that have a Dancing move can be selected
-          const selectableFilter = (pokemon: Pokemon) => {
-            // If pokemon meets primary pokemon reqs, it can be selected
-            if (!pokemon.isAllowedInBattle()) {
-              return i18next.t("partyUiHandler:cantBeUsed", { pokemonName: pokemon.getNameToRender() }) ?? null;
-            }
-            const meetsReqs = encounter.options[2].pokemonMeetsPrimaryRequirements(pokemon);
-            if (!meetsReqs) {
-              return getEncounterText(`${namespace}:invalid_selection`) ?? null;
-            }
-
-            return null;
-          };
-
-          return selectPokemonForOption(onPokemonSelected, undefined, selectableFilter);
-        })
-        .withOptionPhase(async () => {
-          // Show the Oricorio a dance, and recruit it
-          const encounter = globalScene.currentBattle.mysteryEncounter!;
-          const oricorio = encounter.misc.oricorioData.toPokemon();
-          oricorio.passive = true;
-
-          // Ensure the Oricorio's moveset gains the Dance move the player used
-          const move = encounter.misc.selectedMove?.getMove().id;
-          if (!oricorio.moveset.some(m => m.getMove().id === move)) {
-            if (oricorio.moveset.length < 4) {
-              oricorio.moveset.push(new PokemonMove(move));
-            } else {
-              oricorio.moveset[3] = new PokemonMove(move);
-            }
+          const meetsReqs = encounter.options[2].pokemonMeetsPrimaryRequirements(pokemon);
+          if (!meetsReqs) {
+            return getEncounterText(`${namespace}:invalid_selection`) ?? null;
           }
 
-          await hideOricorioPokemon();
-          await catchPokemon(oricorio, null, PokeballType.POKEBALL, false);
-          leaveEncounterWithoutBattle(true);
-        })
-        .build()
-    )
-    .build();
+          return null;
+        };
+
+        return selectPokemonForOption(onPokemonSelected, undefined, selectableFilter);
+      })
+      .withOptionPhase(async () => {
+        // Show the Oricorio a dance, and recruit it
+        const encounter = globalScene.currentBattle.mysteryEncounter!;
+        const oricorio = encounter.misc.oricorioData.toPokemon();
+        oricorio.passive = true;
+
+        // Ensure the Oricorio's moveset gains the Dance move the player used
+        const move = encounter.misc.selectedMove?.getMove().id;
+        if (!oricorio.moveset.some(m => m.getMove().id === move)) {
+          if (oricorio.moveset.length < 4) {
+            oricorio.moveset.push(new PokemonMove(move));
+          } else {
+            oricorio.moveset[3] = new PokemonMove(move);
+          }
+        }
+
+        await hideOricorioPokemon();
+        await catchPokemon(oricorio, null, PokeballType.POKEBALL, false);
+        leaveEncounterWithoutBattle(true);
+      })
+      .build(),
+  )
+  .build();
 
 function hideOricorioPokemon() {
   return new Promise<void>(resolve => {
@@ -332,7 +361,7 @@ function hideOricorioPokemon() {
       onComplete: () => {
         globalScene.field.remove(oricorioSprite, true);
         resolve();
-      }
+      },
     });
   });
 }
diff --git a/src/data/mystery-encounters/encounters/dark-deal-encounter.ts b/src/data/mystery-encounters/encounters/dark-deal-encounter.ts
index 3b6ab8b0c05..e746b13c6a5 100644
--- a/src/data/mystery-encounters/encounters/dark-deal-encounter.ts
+++ b/src/data/mystery-encounters/encounters/dark-deal-encounter.ts
@@ -1,5 +1,5 @@
-import type { Type } from "#enums/type";
-import { isNullOrUndefined, randSeedInt } from "#app/utils";
+import type { PokemonType } from "#enums/pokemon-type";
+import { isNullOrUndefined, randSeedInt } from "#app/utils/common";
 import { MysteryEncounterType } from "#enums/mystery-encounter-type";
 import { Species } from "#enums/species";
 import { globalScene } from "#app/global-scene";
@@ -9,14 +9,17 @@ import type MysteryEncounter from "#app/data/mystery-encounters/mystery-encounte
 import { MysteryEncounterBuilder } from "#app/data/mystery-encounters/mystery-encounter";
 import { MysteryEncounterOptionBuilder } from "#app/data/mystery-encounters/mystery-encounter-option";
 import type { EnemyPartyConfig, EnemyPokemonConfig } from "../utils/encounter-phase-utils";
-import { initBattleWithEnemyConfig, leaveEncounterWithoutBattle, } from "../utils/encounter-phase-utils";
-import { getRandomPlayerPokemon, getRandomSpeciesByStarterCost } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils";
+import { initBattleWithEnemyConfig, leaveEncounterWithoutBattle } from "../utils/encounter-phase-utils";
+import {
+  getRandomPlayerPokemon,
+  getRandomSpeciesByStarterCost,
+} from "#app/data/mystery-encounters/utils/encounter-pokemon-utils";
 import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
 import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
 import { ModifierRewardPhase } from "#app/phases/modifier-reward-phase";
 import type { PokemonHeldItemModifier } from "#app/modifier/modifier";
 import { PokemonFormChangeItemModifier } from "#app/modifier/modifier";
-import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/game-mode";
+import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants";
 import { Challenges } from "#enums/challenges";
 
 /** i18n namespace for encounter */
@@ -93,131 +96,132 @@ const excludedBosses = [
  * @see {@link https://github.com/pagefaultgames/pokerogue/issues/3806 | GitHub Issue #3806}
  * @see For biome requirements check {@linkcode mysteryEncountersByBiome}
  */
-export const DarkDealEncounter: MysteryEncounter =
-  MysteryEncounterBuilder.withEncounterType(MysteryEncounterType.DARK_DEAL)
-    .withEncounterTier(MysteryEncounterTier.ROGUE)
-    .withIntroSpriteConfigs([
-      {
-        spriteKey: "dark_deal_scientist",
-        fileRoot: "mystery-encounters",
-        hasShadow: true,
-      },
-      {
-        spriteKey: "dark_deal_porygon",
-        fileRoot: "mystery-encounters",
-        hasShadow: true,
-        repeat: true,
-      },
-    ])
-    .withIntroDialogue([
-      {
-        text: `${namespace}:intro`,
-      },
-      {
-        speaker: `${namespace}:speaker`,
-        text: `${namespace}:intro_dialogue`,
-      },
-    ])
-    .withSceneWaveRangeRequirement(30, CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES[1])
-    .withScenePartySizeRequirement(2, 6, true) // Must have at least 2 pokemon in party
-    .withCatchAllowed(true)
-    .setLocalizationKey(`${namespace}`)
-    .withTitle(`${namespace}:title`)
-    .withDescription(`${namespace}:description`)
-    .withQuery(`${namespace}:query`)
-    .withOption(
-      MysteryEncounterOptionBuilder
-        .newOptionWithMode(MysteryEncounterOptionMode.DEFAULT)
-        .withDialogue({
-          buttonLabel: `${namespace}:option.1.label`,
-          buttonTooltip: `${namespace}:option.1.tooltip`,
-          selected: [
-            {
-              speaker: `${namespace}:speaker`,
-              text: `${namespace}:option.1.selected_dialogue`,
-            },
-            {
-              text: `${namespace}:option.1.selected_message`,
-            },
-          ],
-        })
-        .withPreOptionPhase(async () => {
-          // Removes random pokemon (including fainted) from party and adds name to dialogue data tokens
-          // Will never return last battle able mon and instead pick fainted/unable to battle
-          const removedPokemon = getRandomPlayerPokemon(true, false, true);
-
-          // Get all the pokemon's held items
-          const modifiers = removedPokemon.getHeldItems().filter(m => !(m instanceof PokemonFormChangeItemModifier));
-          globalScene.removePokemonFromPlayerParty(removedPokemon);
-
-          const encounter = globalScene.currentBattle.mysteryEncounter!;
-          encounter.setDialogueToken("pokeName", removedPokemon.getNameToRender());
-
-          // Store removed pokemon types
-          encounter.misc = {
-            removedTypes: removedPokemon.getTypes(),
-            modifiers
-          };
-        })
-        .withOptionPhase(async () => {
-          // Give the player 5 Rogue Balls
-          const encounter = globalScene.currentBattle.mysteryEncounter!;
-          globalScene.unshiftPhase(new ModifierRewardPhase(modifierTypes.ROGUE_BALL));
-
-          // Start encounter with random legendary (7-10 starter strength) that has level additive
-          // If this is a mono-type challenge, always ensure the required type is filtered for
-          let bossTypes: Type[] = encounter.misc.removedTypes;
-          const singleTypeChallenges = globalScene.gameMode.challenges.filter(c => c.value && c.id === Challenges.SINGLE_TYPE);
-          if (globalScene.gameMode.isChallenge && singleTypeChallenges.length > 0) {
-            bossTypes = singleTypeChallenges.map(c => (c.value - 1) as Type);
-          }
-
-          const bossModifiers: PokemonHeldItemModifier[] = encounter.misc.modifiers;
-          // Starter egg tier, 35/50/10/5 %odds for tiers 6/7/8/9+
-          const roll = randSeedInt(100);
-          const starterTier: number | [number, number] =
-            roll >= 65 ? 6 : roll >= 15 ? 7 : roll >= 5 ? 8 : [ 9, 10 ];
-          const bossSpecies = getPokemonSpecies(getRandomSpeciesByStarterCost(starterTier, excludedBosses, bossTypes));
-          const pokemonConfig: EnemyPokemonConfig = {
-            species: bossSpecies,
-            isBoss: true,
-            modifierConfigs: bossModifiers.map(m => {
-              return {
-                modifier: m,
-                stackCount: m.getStackCount(),
-              };
-            })
-          };
-          if (!isNullOrUndefined(bossSpecies.forms) && bossSpecies.forms.length > 0) {
-            pokemonConfig.formIndex = 0;
-          }
-          const config: EnemyPartyConfig = {
-            pokemonConfigs: [ pokemonConfig ],
-          };
-          await initBattleWithEnemyConfig(config);
-        })
-        .build()
-    )
-    .withSimpleOption(
-      {
-        buttonLabel: `${namespace}:option.2.label`,
-        buttonTooltip: `${namespace}:option.2.tooltip`,
+export const DarkDealEncounter: MysteryEncounter = MysteryEncounterBuilder.withEncounterType(
+  MysteryEncounterType.DARK_DEAL,
+)
+  .withEncounterTier(MysteryEncounterTier.ROGUE)
+  .withIntroSpriteConfigs([
+    {
+      spriteKey: "dark_deal_scientist",
+      fileRoot: "mystery-encounters",
+      hasShadow: true,
+    },
+    {
+      spriteKey: "dark_deal_porygon",
+      fileRoot: "mystery-encounters",
+      hasShadow: true,
+      repeat: true,
+    },
+  ])
+  .withIntroDialogue([
+    {
+      text: `${namespace}:intro`,
+    },
+    {
+      speaker: `${namespace}:speaker`,
+      text: `${namespace}:intro_dialogue`,
+    },
+  ])
+  .withSceneWaveRangeRequirement(30, CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES[1])
+  .withScenePartySizeRequirement(2, 6, true) // Must have at least 2 pokemon in party
+  .withCatchAllowed(true)
+  .setLocalizationKey(`${namespace}`)
+  .withTitle(`${namespace}:title`)
+  .withDescription(`${namespace}:description`)
+  .withQuery(`${namespace}:query`)
+  .withOption(
+    MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DEFAULT)
+      .withDialogue({
+        buttonLabel: `${namespace}:option.1.label`,
+        buttonTooltip: `${namespace}:option.1.tooltip`,
         selected: [
           {
             speaker: `${namespace}:speaker`,
-            text: `${namespace}:option.2.selected`,
+            text: `${namespace}:option.1.selected_dialogue`,
+          },
+          {
+            text: `${namespace}:option.1.selected_message`,
           },
         ],
-      },
-      async () => {
-        // Leave encounter with no rewards or exp
-        leaveEncounterWithoutBattle(true);
-        return true;
-      }
-    )
-    .withOutroDialogue([
-      {
-        text: `${namespace}:outro`
-      }
-    ])
-    .build();
+      })
+      .withPreOptionPhase(async () => {
+        // Removes random pokemon (including fainted) from party and adds name to dialogue data tokens
+        // Will never return last battle able mon and instead pick fainted/unable to battle
+        const removedPokemon = getRandomPlayerPokemon(true, false, true);
+
+        // Get all the pokemon's held items
+        const modifiers = removedPokemon.getHeldItems().filter(m => !(m instanceof PokemonFormChangeItemModifier));
+        globalScene.removePokemonFromPlayerParty(removedPokemon);
+
+        const encounter = globalScene.currentBattle.mysteryEncounter!;
+        encounter.setDialogueToken("pokeName", removedPokemon.getNameToRender());
+
+        // Store removed pokemon types
+        encounter.misc = {
+          removedTypes: removedPokemon.getTypes(),
+          modifiers,
+        };
+      })
+      .withOptionPhase(async () => {
+        // Give the player 5 Rogue Balls
+        const encounter = globalScene.currentBattle.mysteryEncounter!;
+        globalScene.unshiftPhase(new ModifierRewardPhase(modifierTypes.ROGUE_BALL));
+
+        // Start encounter with random legendary (7-10 starter strength) that has level additive
+        // If this is a mono-type challenge, always ensure the required type is filtered for
+        let bossTypes: PokemonType[] = encounter.misc.removedTypes;
+        const singleTypeChallenges = globalScene.gameMode.challenges.filter(
+          c => c.value && c.id === Challenges.SINGLE_TYPE,
+        );
+        if (globalScene.gameMode.isChallenge && singleTypeChallenges.length > 0) {
+          bossTypes = singleTypeChallenges.map(c => (c.value - 1) as PokemonType);
+        }
+
+        const bossModifiers: PokemonHeldItemModifier[] = encounter.misc.modifiers;
+        // Starter egg tier, 35/50/10/5 %odds for tiers 6/7/8/9+
+        const roll = randSeedInt(100);
+        const starterTier: number | [number, number] = roll >= 65 ? 6 : roll >= 15 ? 7 : roll >= 5 ? 8 : [9, 10];
+        const bossSpecies = getPokemonSpecies(getRandomSpeciesByStarterCost(starterTier, excludedBosses, bossTypes));
+        const pokemonConfig: EnemyPokemonConfig = {
+          species: bossSpecies,
+          isBoss: true,
+          modifierConfigs: bossModifiers.map(m => {
+            return {
+              modifier: m,
+              stackCount: m.getStackCount(),
+            };
+          }),
+        };
+        if (!isNullOrUndefined(bossSpecies.forms) && bossSpecies.forms.length > 0) {
+          pokemonConfig.formIndex = 0;
+        }
+        const config: EnemyPartyConfig = {
+          pokemonConfigs: [pokemonConfig],
+        };
+        await initBattleWithEnemyConfig(config);
+      })
+      .build(),
+  )
+  .withSimpleOption(
+    {
+      buttonLabel: `${namespace}:option.2.label`,
+      buttonTooltip: `${namespace}:option.2.tooltip`,
+      selected: [
+        {
+          speaker: `${namespace}:speaker`,
+          text: `${namespace}:option.2.selected`,
+        },
+      ],
+    },
+    async () => {
+      // Leave encounter with no rewards or exp
+      leaveEncounterWithoutBattle(true);
+      return true;
+    },
+  )
+  .withOutroDialogue([
+    {
+      text: `${namespace}:outro`,
+    },
+  ])
+  .build();
diff --git a/src/data/mystery-encounters/encounters/delibirdy-encounter.ts b/src/data/mystery-encounters/encounters/delibirdy-encounter.ts
index f382f130540..7040bb47d19 100644
--- a/src/data/mystery-encounters/encounters/delibirdy-encounter.ts
+++ b/src/data/mystery-encounters/encounters/delibirdy-encounter.ts
@@ -2,32 +2,48 @@ import { globalScene } from "#app/global-scene";
 import type MysteryEncounter from "#app/data/mystery-encounters/mystery-encounter";
 import { MysteryEncounterBuilder } from "#app/data/mystery-encounters/mystery-encounter";
 import { MysteryEncounterOptionBuilder } from "#app/data/mystery-encounters/mystery-encounter-option";
-import { CombinationPokemonRequirement, HeldItemRequirement, MoneyRequirement } from "#app/data/mystery-encounters/mystery-encounter-requirements";
+import {
+  CombinationPokemonRequirement,
+  HeldItemRequirement,
+  MoneyRequirement,
+} from "#app/data/mystery-encounters/mystery-encounter-requirements";
 import { getEncounterText, showEncounterText } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils";
-import { generateModifierType, leaveEncounterWithoutBattle, selectPokemonForOption, updatePlayerMoney, } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
+import {
+  generateModifierType,
+  leaveEncounterWithoutBattle,
+  selectPokemonForOption,
+  updatePlayerMoney,
+} from "#app/data/mystery-encounters/utils/encounter-phase-utils";
 import { applyModifierTypeToPlayerPokemon } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils";
 import { getPokemonSpecies } from "#app/data/pokemon-species";
 import type { PlayerPokemon } from "#app/field/pokemon";
 import type Pokemon from "#app/field/pokemon";
-import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/game-mode";
+import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants";
 import type { PokemonHeldItemModifier, PokemonInstantReviveModifier } from "#app/modifier/modifier";
-import { BerryModifier, HealingBoosterModifier, LevelIncrementBoosterModifier, MoneyMultiplierModifier, PreserveBerryModifier } from "#app/modifier/modifier";
+import {
+  BerryModifier,
+  HealingBoosterModifier,
+  LevelIncrementBoosterModifier,
+  MoneyMultiplierModifier,
+  PreserveBerryModifier,
+} from "#app/modifier/modifier";
 import type { PokemonHeldItemModifierType } from "#app/modifier/modifier-type";
 import { modifierTypes } from "#app/modifier/modifier-type";
 import { ModifierRewardPhase } from "#app/phases/modifier-reward-phase";
 import i18next from "#app/plugins/i18n";
 import type { OptionSelectItem } from "#app/ui/abstact-option-select-ui-handler";
-import { randSeedItem } from "#app/utils";
+import { randSeedItem } from "#app/utils/common";
 import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
 import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
 import { MysteryEncounterType } from "#enums/mystery-encounter-type";
 import { Species } from "#enums/species";
+import { timedEventManager } from "#app/global-event-manager";
 
 /** the i18n namespace for this encounter */
 const namespace = "mysteryEncounters/delibirdy";
 
 /** Berries only */
-const OPTION_2_ALLOWED_MODIFIERS = [ "BerryModifier", "PokemonInstantReviveModifier" ];
+const OPTION_2_ALLOWED_MODIFIERS = ["BerryModifier", "PokemonInstantReviveModifier"];
 
 /** Disallowed items are berries, Reviver Seeds, and Vitamins (form change items and fusion items are not PokemonHeldItemModifiers) */
 const OPTION_3_DISALLOWED_MODIFIERS = [
@@ -35,19 +51,19 @@ const OPTION_3_DISALLOWED_MODIFIERS = [
   "PokemonInstantReviveModifier",
   "TerastallizeModifier",
   "PokemonBaseStatModifier",
-  "PokemonBaseStatTotalModifier"
+  "PokemonBaseStatTotalModifier",
 ];
 
 const DELIBIRDY_MONEY_PRICE_MULTIPLIER = 2;
 
 const doEventReward = () => {
-  const event_buff = globalScene.eventManager.getDelibirdyBuff();
+  const event_buff = timedEventManager.getDelibirdyBuff();
   if (event_buff.length > 0) {
-    const candidates = event_buff.filter((c => {
+    const candidates = event_buff.filter(c => {
       const mtype = generateModifierType(modifierTypes[c]);
       const existingCharm = globalScene.findModifier(m => m.type.id === mtype?.id);
       return !(existingCharm && existingCharm.getStackCount() >= existingCharm.getMaxStackCount());
-    }));
+    });
     if (candidates.length > 0) {
       globalScene.unshiftPhase(new ModifierRewardPhase(modifierTypes[randSeedItem(candidates)]));
     } else {
@@ -62,282 +78,308 @@ const doEventReward = () => {
  * @see {@link https://github.com/pagefaultgames/pokerogue/issues/3804 | GitHub Issue #3804}
  * @see For biome requirements check {@linkcode mysteryEncountersByBiome}
  */
-export const DelibirdyEncounter: MysteryEncounter =
-  MysteryEncounterBuilder.withEncounterType(MysteryEncounterType.DELIBIRDY)
-    .withEncounterTier(MysteryEncounterTier.GREAT)
-    .withSceneWaveRangeRequirement(...CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES)
-    .withSceneRequirement(new MoneyRequirement(0, DELIBIRDY_MONEY_PRICE_MULTIPLIER)) // Must have enough money for it to spawn at the very least
-    .withPrimaryPokemonRequirement(
-      CombinationPokemonRequirement.Some(
-        // Must also have either option 2 or 3 available to spawn
-        new HeldItemRequirement(OPTION_2_ALLOWED_MODIFIERS),
-        new HeldItemRequirement(OPTION_3_DISALLOWED_MODIFIERS, 1, true)
-      )
-    )
-    .withIntroSpriteConfigs([
-      {
-        spriteKey: "",
-        fileRoot: "",
-        species: Species.DELIBIRD,
-        hasShadow: true,
-        repeat: true,
-        startFrame: 38,
-        scale: 0.94
-      },
-      {
-        spriteKey: "",
-        fileRoot: "",
-        species: Species.DELIBIRD,
-        hasShadow: true,
-        repeat: true,
-        scale: 1.06
-      },
-      {
-        spriteKey: "",
-        fileRoot: "",
-        species: Species.DELIBIRD,
-        hasShadow: true,
-        repeat: true,
-        startFrame: 65,
-        x: 1,
-        y: 5,
-        yShadow: 5
-      },
-    ])
-    .withIntroDialogue([
-      {
-        text: `${namespace}:intro`,
-      }
-    ])
-    .setLocalizationKey(`${namespace}`)
-    .withTitle(`${namespace}:title`)
-    .withDescription(`${namespace}:description`)
-    .withQuery(`${namespace}:query`)
-    .withOutroDialogue([
-      {
-        text: `${namespace}:outro`,
-      }
-    ])
-    .withOnInit(() => {
-      const encounter = globalScene.currentBattle.mysteryEncounter!;
-      encounter.setDialogueToken("delibirdName", getPokemonSpecies(Species.DELIBIRD).getName());
+export const DelibirdyEncounter: MysteryEncounter = MysteryEncounterBuilder.withEncounterType(
+  MysteryEncounterType.DELIBIRDY,
+)
+  .withEncounterTier(MysteryEncounterTier.GREAT)
+  .withSceneWaveRangeRequirement(...CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES)
+  .withSceneRequirement(new MoneyRequirement(0, DELIBIRDY_MONEY_PRICE_MULTIPLIER)) // Must have enough money for it to spawn at the very least
+  .withPrimaryPokemonRequirement(
+    CombinationPokemonRequirement.Some(
+      // Must also have either option 2 or 3 available to spawn
+      new HeldItemRequirement(OPTION_2_ALLOWED_MODIFIERS),
+      new HeldItemRequirement(OPTION_3_DISALLOWED_MODIFIERS, 1, true),
+    ),
+  )
+  .withIntroSpriteConfigs([
+    {
+      spriteKey: "",
+      fileRoot: "",
+      species: Species.DELIBIRD,
+      hasShadow: true,
+      repeat: true,
+      startFrame: 38,
+      scale: 0.94,
+    },
+    {
+      spriteKey: "",
+      fileRoot: "",
+      species: Species.DELIBIRD,
+      hasShadow: true,
+      repeat: true,
+      scale: 1.06,
+    },
+    {
+      spriteKey: "",
+      fileRoot: "",
+      species: Species.DELIBIRD,
+      hasShadow: true,
+      repeat: true,
+      startFrame: 65,
+      x: 1,
+      y: 5,
+      yShadow: 5,
+    },
+  ])
+  .withIntroDialogue([
+    {
+      text: `${namespace}:intro`,
+    },
+  ])
+  .setLocalizationKey(`${namespace}`)
+  .withTitle(`${namespace}:title`)
+  .withDescription(`${namespace}:description`)
+  .withQuery(`${namespace}:query`)
+  .withOutroDialogue([
+    {
+      text: `${namespace}:outro`,
+    },
+  ])
+  .withOnInit(() => {
+    const encounter = globalScene.currentBattle.mysteryEncounter!;
+    encounter.setDialogueToken("delibirdName", getPokemonSpecies(Species.DELIBIRD).getName());
 
-      globalScene.loadBgm("mystery_encounter_delibirdy", "mystery_encounter_delibirdy.mp3");
-      return true;
-    })
-    .withOnVisualsStart(() => {
-      globalScene.fadeAndSwitchBgm("mystery_encounter_delibirdy");
-      return true;
-    })
-    .withOption(
-      MysteryEncounterOptionBuilder
-        .newOptionWithMode(MysteryEncounterOptionMode.DISABLED_OR_DEFAULT)
-        .withSceneMoneyRequirement(0, DELIBIRDY_MONEY_PRICE_MULTIPLIER) // Must have money to spawn
-        .withDialogue({
-          buttonLabel: `${namespace}:option.1.label`,
-          buttonTooltip: `${namespace}:option.1.tooltip`,
-          selected: [
-            {
-              text: `${namespace}:option.1.selected`,
-            },
-          ],
-        })
-        .withPreOptionPhase(async (): Promise<boolean> => {
-          const encounter = globalScene.currentBattle.mysteryEncounter!;
-          updatePlayerMoney(-(encounter.options[0].requirements[0] as MoneyRequirement).requiredMoney, true, false);
-          return true;
-        })
-        .withOptionPhase(async () => {
-          // Give the player an Amulet Coin
-          // Check if the player has max stacks of that item already
-          const existing = globalScene.findModifier(m => m instanceof MoneyMultiplierModifier) as MoneyMultiplierModifier;
+    globalScene.loadBgm("mystery_encounter_delibirdy", "mystery_encounter_delibirdy.mp3");
+    return true;
+  })
+  .withOnVisualsStart(() => {
+    globalScene.fadeAndSwitchBgm("mystery_encounter_delibirdy");
+    return true;
+  })
+  .withOption(
+    MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DISABLED_OR_DEFAULT)
+      .withSceneMoneyRequirement(0, DELIBIRDY_MONEY_PRICE_MULTIPLIER) // Must have money to spawn
+      .withDialogue({
+        buttonLabel: `${namespace}:option.1.label`,
+        buttonTooltip: `${namespace}:option.1.tooltip`,
+        selected: [
+          {
+            text: `${namespace}:option.1.selected`,
+          },
+        ],
+      })
+      .withPreOptionPhase(async (): Promise<boolean> => {
+        const encounter = globalScene.currentBattle.mysteryEncounter!;
+        updatePlayerMoney(-(encounter.options[0].requirements[0] as MoneyRequirement).requiredMoney, true, false);
+        return true;
+      })
+      .withOptionPhase(async () => {
+        // Give the player an Amulet Coin
+        // Check if the player has max stacks of that item already
+        const existing = globalScene.findModifier(m => m instanceof MoneyMultiplierModifier) as MoneyMultiplierModifier;
+
+        if (existing && existing.getStackCount() >= existing.getMaxStackCount()) {
+          // At max stacks, give the first party pokemon a Shell Bell instead
+          const shellBell = generateModifierType(modifierTypes.SHELL_BELL) as PokemonHeldItemModifierType;
+          await applyModifierTypeToPlayerPokemon(globalScene.getPlayerPokemon()!, shellBell);
+          globalScene.playSound("item_fanfare");
+          await showEncounterText(
+            i18next.t("battle:rewardGain", { modifierName: shellBell.name }),
+            null,
+            undefined,
+            true,
+          );
+          doEventReward();
+        } else {
+          globalScene.unshiftPhase(new ModifierRewardPhase(modifierTypes.AMULET_COIN));
+          doEventReward();
+        }
+
+        leaveEncounterWithoutBattle(true);
+      })
+      .build(),
+  )
+  .withOption(
+    MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DISABLED_OR_DEFAULT)
+      .withPrimaryPokemonRequirement(new HeldItemRequirement(OPTION_2_ALLOWED_MODIFIERS))
+      .withDialogue({
+        buttonLabel: `${namespace}:option.2.label`,
+        buttonTooltip: `${namespace}:option.2.tooltip`,
+        secondOptionPrompt: `${namespace}:option.2.select_prompt`,
+        selected: [
+          {
+            text: `${namespace}:option.2.selected`,
+          },
+        ],
+      })
+      .withPreOptionPhase(async (): Promise<boolean> => {
+        const encounter = globalScene.currentBattle.mysteryEncounter!;
+        const onPokemonSelected = (pokemon: PlayerPokemon) => {
+          // Get Pokemon held items and filter for valid ones
+          const validItems = pokemon.getHeldItems().filter(it => {
+            return OPTION_2_ALLOWED_MODIFIERS.some(heldItem => it.constructor.name === heldItem) && it.isTransferable;
+          });
+
+          return validItems.map((modifier: PokemonHeldItemModifier) => {
+            const option: OptionSelectItem = {
+              label: modifier.type.name,
+              handler: () => {
+                // Pokemon and item selected
+                encounter.setDialogueToken("chosenItem", modifier.type.name);
+                encounter.misc = {
+                  chosenPokemon: pokemon,
+                  chosenModifier: modifier,
+                };
+                return true;
+              },
+            };
+            return option;
+          });
+        };
+
+        const selectableFilter = (pokemon: Pokemon) => {
+          // If pokemon has valid item, it can be selected
+          const meetsReqs = encounter.options[1].pokemonMeetsPrimaryRequirements(pokemon);
+          if (!meetsReqs) {
+            return getEncounterText(`${namespace}:invalid_selection`) ?? null;
+          }
+
+          return null;
+        };
+
+        return selectPokemonForOption(onPokemonSelected, undefined, selectableFilter);
+      })
+      .withOptionPhase(async () => {
+        const encounter = globalScene.currentBattle.mysteryEncounter!;
+        const modifier: BerryModifier | PokemonInstantReviveModifier = encounter.misc.chosenModifier;
+        const chosenPokemon: PlayerPokemon = encounter.misc.chosenPokemon;
+
+        // Give the player a Candy Jar if they gave a Berry, and a Berry Pouch for Reviver Seed
+        if (modifier instanceof BerryModifier) {
+          // Check if the player has max stacks of that Candy Jar already
+          const existing = globalScene.findModifier(
+            m => m instanceof LevelIncrementBoosterModifier,
+          ) as LevelIncrementBoosterModifier;
 
           if (existing && existing.getStackCount() >= existing.getMaxStackCount()) {
             // At max stacks, give the first party pokemon a Shell Bell instead
             const shellBell = generateModifierType(modifierTypes.SHELL_BELL) as PokemonHeldItemModifierType;
             await applyModifierTypeToPlayerPokemon(globalScene.getPlayerPokemon()!, shellBell);
             globalScene.playSound("item_fanfare");
-            await showEncounterText(i18next.t("battle:rewardGain", { modifierName: shellBell.name }), null, undefined, true);
+            await showEncounterText(
+              i18next.t("battle:rewardGain", {
+                modifierName: shellBell.name,
+              }),
+              null,
+              undefined,
+              true,
+            );
             doEventReward();
           } else {
-            globalScene.unshiftPhase(new ModifierRewardPhase(modifierTypes.AMULET_COIN));
+            globalScene.unshiftPhase(new ModifierRewardPhase(modifierTypes.CANDY_JAR));
             doEventReward();
           }
-
-          leaveEncounterWithoutBattle(true);
-        })
-        .build()
-    )
-    .withOption(
-      MysteryEncounterOptionBuilder
-        .newOptionWithMode(MysteryEncounterOptionMode.DISABLED_OR_DEFAULT)
-        .withPrimaryPokemonRequirement(new HeldItemRequirement(OPTION_2_ALLOWED_MODIFIERS))
-        .withDialogue({
-          buttonLabel: `${namespace}:option.2.label`,
-          buttonTooltip: `${namespace}:option.2.tooltip`,
-          secondOptionPrompt: `${namespace}:option.2.select_prompt`,
-          selected: [
-            {
-              text: `${namespace}:option.2.selected`,
-            },
-          ],
-        })
-        .withPreOptionPhase(async (): Promise<boolean> => {
-          const encounter = globalScene.currentBattle.mysteryEncounter!;
-          const onPokemonSelected = (pokemon: PlayerPokemon) => {
-            // Get Pokemon held items and filter for valid ones
-            const validItems = pokemon.getHeldItems().filter((it) => {
-              return OPTION_2_ALLOWED_MODIFIERS.some(heldItem => it.constructor.name === heldItem) && it.isTransferable;
-            });
-
-            return validItems.map((modifier: PokemonHeldItemModifier) => {
-              const option: OptionSelectItem = {
-                label: modifier.type.name,
-                handler: () => {
-                  // Pokemon and item selected
-                  encounter.setDialogueToken("chosenItem", modifier.type.name);
-                  encounter.misc = {
-                    chosenPokemon: pokemon,
-                    chosenModifier: modifier,
-                  };
-                  return true;
-                },
-              };
-              return option;
-            });
-          };
-
-          const selectableFilter = (pokemon: Pokemon) => {
-            // If pokemon has valid item, it can be selected
-            const meetsReqs = encounter.options[1].pokemonMeetsPrimaryRequirements(pokemon);
-            if (!meetsReqs) {
-              return getEncounterText(`${namespace}:invalid_selection`) ?? null;
-            }
-
-            return null;
-          };
-
-          return selectPokemonForOption(onPokemonSelected, undefined, selectableFilter);
-        })
-        .withOptionPhase(async () => {
-          const encounter = globalScene.currentBattle.mysteryEncounter!;
-          const modifier: BerryModifier | PokemonInstantReviveModifier = encounter.misc.chosenModifier;
-          const chosenPokemon: PlayerPokemon = encounter.misc.chosenPokemon;
-
-          // Give the player a Candy Jar if they gave a Berry, and a Berry Pouch for Reviver Seed
-          if (modifier instanceof BerryModifier) {
-            // Check if the player has max stacks of that Candy Jar already
-            const existing = globalScene.findModifier(m => m instanceof LevelIncrementBoosterModifier) as LevelIncrementBoosterModifier;
-
-            if (existing && existing.getStackCount() >= existing.getMaxStackCount()) {
-              // At max stacks, give the first party pokemon a Shell Bell instead
-              const shellBell = generateModifierType(modifierTypes.SHELL_BELL) as PokemonHeldItemModifierType;
-              await applyModifierTypeToPlayerPokemon(globalScene.getPlayerPokemon()!, shellBell);
-              globalScene.playSound("item_fanfare");
-              await showEncounterText(i18next.t("battle:rewardGain", { modifierName: shellBell.name }), null, undefined, true);
-              doEventReward();
-            } else {
-              globalScene.unshiftPhase(new ModifierRewardPhase(modifierTypes.CANDY_JAR));
-              doEventReward();
-            }
-          } else {
-            // Check if the player has max stacks of that Berry Pouch already
-            const existing = globalScene.findModifier(m => m instanceof PreserveBerryModifier) as PreserveBerryModifier;
-
-            if (existing && existing.getStackCount() >= existing.getMaxStackCount()) {
-              // At max stacks, give the first party pokemon a Shell Bell instead
-              const shellBell = generateModifierType(modifierTypes.SHELL_BELL) as PokemonHeldItemModifierType;
-              await applyModifierTypeToPlayerPokemon(globalScene.getPlayerPokemon()!, shellBell);
-              globalScene.playSound("item_fanfare");
-              await showEncounterText(i18next.t("battle:rewardGain", { modifierName: shellBell.name }), null, undefined, true);
-              doEventReward();
-            } else {
-              globalScene.unshiftPhase(new ModifierRewardPhase(modifierTypes.BERRY_POUCH));
-              doEventReward();
-            }
-          }
-
-          chosenPokemon.loseHeldItem(modifier, false);
-
-          leaveEncounterWithoutBattle(true);
-        })
-        .build()
-    )
-    .withOption(
-      MysteryEncounterOptionBuilder
-        .newOptionWithMode(MysteryEncounterOptionMode.DISABLED_OR_DEFAULT)
-        .withPrimaryPokemonRequirement(new HeldItemRequirement(OPTION_3_DISALLOWED_MODIFIERS, 1, true))
-        .withDialogue({
-          buttonLabel: `${namespace}:option.3.label`,
-          buttonTooltip: `${namespace}:option.3.tooltip`,
-          secondOptionPrompt: `${namespace}:option.3.select_prompt`,
-          selected: [
-            {
-              text: `${namespace}:option.3.selected`,
-            },
-          ],
-        })
-        .withPreOptionPhase(async (): Promise<boolean> => {
-          const encounter = globalScene.currentBattle.mysteryEncounter!;
-          const onPokemonSelected = (pokemon: PlayerPokemon) => {
-            // Get Pokemon held items and filter for valid ones
-            const validItems = pokemon.getHeldItems().filter((it) => {
-              return !OPTION_3_DISALLOWED_MODIFIERS.some(heldItem => it.constructor.name === heldItem) && it.isTransferable;
-            });
-
-            return validItems.map((modifier: PokemonHeldItemModifier) => {
-              const option: OptionSelectItem = {
-                label: modifier.type.name,
-                handler: () => {
-                  // Pokemon and item selected
-                  encounter.setDialogueToken("chosenItem", modifier.type.name);
-                  encounter.misc = {
-                    chosenPokemon: pokemon,
-                    chosenModifier: modifier,
-                  };
-                  return true;
-                },
-              };
-              return option;
-            });
-          };
-
-          const selectableFilter = (pokemon: Pokemon) => {
-            // If pokemon has valid item, it can be selected
-            const meetsReqs = encounter.options[2].pokemonMeetsPrimaryRequirements(pokemon);
-            if (!meetsReqs) {
-              return getEncounterText(`${namespace}:invalid_selection`) ?? null;
-            }
-
-            return null;
-          };
-
-          return selectPokemonForOption(onPokemonSelected, undefined, selectableFilter);
-        })
-        .withOptionPhase(async () => {
-          const encounter = globalScene.currentBattle.mysteryEncounter!;
-          const modifier = encounter.misc.chosenModifier;
-          const chosenPokemon: PlayerPokemon = encounter.misc.chosenPokemon;
-
-          // Check if the player has max stacks of Healing Charm already
-          const existing = globalScene.findModifier(m => m instanceof HealingBoosterModifier) as HealingBoosterModifier;
+        } else {
+          // Check if the player has max stacks of that Berry Pouch already
+          const existing = globalScene.findModifier(m => m instanceof PreserveBerryModifier) as PreserveBerryModifier;
 
           if (existing && existing.getStackCount() >= existing.getMaxStackCount()) {
             // At max stacks, give the first party pokemon a Shell Bell instead
             const shellBell = generateModifierType(modifierTypes.SHELL_BELL) as PokemonHeldItemModifierType;
-            await applyModifierTypeToPlayerPokemon(globalScene.getPlayerParty()[0], shellBell);
+            await applyModifierTypeToPlayerPokemon(globalScene.getPlayerPokemon()!, shellBell);
             globalScene.playSound("item_fanfare");
-            await showEncounterText(i18next.t("battle:rewardGain", { modifierName: shellBell.name }), null, undefined, true);
+            await showEncounterText(
+              i18next.t("battle:rewardGain", {
+                modifierName: shellBell.name,
+              }),
+              null,
+              undefined,
+              true,
+            );
             doEventReward();
           } else {
-            globalScene.unshiftPhase(new ModifierRewardPhase(modifierTypes.HEALING_CHARM));
+            globalScene.unshiftPhase(new ModifierRewardPhase(modifierTypes.BERRY_POUCH));
             doEventReward();
           }
+        }
 
-          chosenPokemon.loseHeldItem(modifier, false);
+        chosenPokemon.loseHeldItem(modifier, false);
 
-          leaveEncounterWithoutBattle(true);
-        })
-        .build()
-    )
-    .build();
+        leaveEncounterWithoutBattle(true);
+      })
+      .build(),
+  )
+  .withOption(
+    MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DISABLED_OR_DEFAULT)
+      .withPrimaryPokemonRequirement(new HeldItemRequirement(OPTION_3_DISALLOWED_MODIFIERS, 1, true))
+      .withDialogue({
+        buttonLabel: `${namespace}:option.3.label`,
+        buttonTooltip: `${namespace}:option.3.tooltip`,
+        secondOptionPrompt: `${namespace}:option.3.select_prompt`,
+        selected: [
+          {
+            text: `${namespace}:option.3.selected`,
+          },
+        ],
+      })
+      .withPreOptionPhase(async (): Promise<boolean> => {
+        const encounter = globalScene.currentBattle.mysteryEncounter!;
+        const onPokemonSelected = (pokemon: PlayerPokemon) => {
+          // Get Pokemon held items and filter for valid ones
+          const validItems = pokemon.getHeldItems().filter(it => {
+            return (
+              !OPTION_3_DISALLOWED_MODIFIERS.some(heldItem => it.constructor.name === heldItem) && it.isTransferable
+            );
+          });
+
+          return validItems.map((modifier: PokemonHeldItemModifier) => {
+            const option: OptionSelectItem = {
+              label: modifier.type.name,
+              handler: () => {
+                // Pokemon and item selected
+                encounter.setDialogueToken("chosenItem", modifier.type.name);
+                encounter.misc = {
+                  chosenPokemon: pokemon,
+                  chosenModifier: modifier,
+                };
+                return true;
+              },
+            };
+            return option;
+          });
+        };
+
+        const selectableFilter = (pokemon: Pokemon) => {
+          // If pokemon has valid item, it can be selected
+          const meetsReqs = encounter.options[2].pokemonMeetsPrimaryRequirements(pokemon);
+          if (!meetsReqs) {
+            return getEncounterText(`${namespace}:invalid_selection`) ?? null;
+          }
+
+          return null;
+        };
+
+        return selectPokemonForOption(onPokemonSelected, undefined, selectableFilter);
+      })
+      .withOptionPhase(async () => {
+        const encounter = globalScene.currentBattle.mysteryEncounter!;
+        const modifier = encounter.misc.chosenModifier;
+        const chosenPokemon: PlayerPokemon = encounter.misc.chosenPokemon;
+
+        // Check if the player has max stacks of Healing Charm already
+        const existing = globalScene.findModifier(m => m instanceof HealingBoosterModifier) as HealingBoosterModifier;
+
+        if (existing && existing.getStackCount() >= existing.getMaxStackCount()) {
+          // At max stacks, give the first party pokemon a Shell Bell instead
+          const shellBell = generateModifierType(modifierTypes.SHELL_BELL) as PokemonHeldItemModifierType;
+          await applyModifierTypeToPlayerPokemon(globalScene.getPlayerParty()[0], shellBell);
+          globalScene.playSound("item_fanfare");
+          await showEncounterText(
+            i18next.t("battle:rewardGain", { modifierName: shellBell.name }),
+            null,
+            undefined,
+            true,
+          );
+          doEventReward();
+        } else {
+          globalScene.unshiftPhase(new ModifierRewardPhase(modifierTypes.HEALING_CHARM));
+          doEventReward();
+        }
+
+        chosenPokemon.loseHeldItem(modifier, false);
+
+        leaveEncounterWithoutBattle(true);
+      })
+      .build(),
+  )
+  .build();
diff --git a/src/data/mystery-encounters/encounters/department-store-sale-encounter.ts b/src/data/mystery-encounters/encounters/department-store-sale-encounter.ts
index b2bc13ca744..39341bef2d5 100644
--- a/src/data/mystery-encounters/encounters/department-store-sale-encounter.ts
+++ b/src/data/mystery-encounters/encounters/department-store-sale-encounter.ts
@@ -4,15 +4,13 @@ import {
 } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
 import type { ModifierTypeFunc } from "#app/modifier/modifier-type";
 import { modifierTypes } from "#app/modifier/modifier-type";
-import { randSeedInt } from "#app/utils";
+import { randSeedInt } from "#app/utils/common";
 import { MysteryEncounterType } from "#enums/mystery-encounter-type";
 import { Species } from "#enums/species";
 import type MysteryEncounter from "#app/data/mystery-encounters/mystery-encounter";
-import {
-  MysteryEncounterBuilder,
-} from "#app/data/mystery-encounters/mystery-encounter";
+import { MysteryEncounterBuilder } from "#app/data/mystery-encounters/mystery-encounter";
 import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
-import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/game-mode";
+import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants";
 
 /** i18n namespace for encounter */
 const namespace = "mysteryEncounters/departmentStoreSale";
@@ -22,145 +20,158 @@ const namespace = "mysteryEncounters/departmentStoreSale";
  * @see {@link https://github.com/pagefaultgames/pokerogue/issues/3797 | GitHub Issue #3797}
  * @see For biome requirements check {@linkcode mysteryEncountersByBiome}
  */
-export const DepartmentStoreSaleEncounter: MysteryEncounter =
-  MysteryEncounterBuilder.withEncounterType(MysteryEncounterType.DEPARTMENT_STORE_SALE)
-    .withEncounterTier(MysteryEncounterTier.COMMON)
-    .withSceneWaveRangeRequirement(CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES[0], 100)
-    .withIntroSpriteConfigs([
-      {
-        spriteKey: "department_store_sale_lady",
-        fileRoot: "mystery-encounters",
-        hasShadow: true,
-        x: -20,
-      },
-      {
-        spriteKey: "",
-        fileRoot: "",
-        species: Species.FURFROU,
-        hasShadow: true,
-        repeat: true,
-        x: 30,
-      },
-    ])
-    .withIntroDialogue([
-      {
-        text: `${namespace}:intro`,
-      },
-      {
-        text: `${namespace}:intro_dialogue`,
-        speaker: `${namespace}:speaker`,
-      },
-    ])
-    .withAutoHideIntroVisuals(false)
-    .setLocalizationKey(`${namespace}`)
-    .withTitle(`${namespace}:title`)
-    .withDescription(`${namespace}:description`)
-    .withQuery(`${namespace}:query`)
-    .withSimpleOption(
-      {
-        buttonLabel: `${namespace}:option.1.label`,
-        buttonTooltip: `${namespace}:option.1.tooltip`,
-      },
-      async () => {
-        // Choose TMs
-        const modifiers: ModifierTypeFunc[] = [];
-        let i = 0;
-        while (i < 5) {
-          // 2/2/1 weight on TM rarity
-          const roll = randSeedInt(5);
-          if (roll < 2) {
-            modifiers.push(modifierTypes.TM_COMMON);
-          } else if (roll < 4) {
-            modifiers.push(modifierTypes.TM_GREAT);
-          } else {
-            modifiers.push(modifierTypes.TM_ULTRA);
-          }
-          i++;
+export const DepartmentStoreSaleEncounter: MysteryEncounter = MysteryEncounterBuilder.withEncounterType(
+  MysteryEncounterType.DEPARTMENT_STORE_SALE,
+)
+  .withEncounterTier(MysteryEncounterTier.COMMON)
+  .withSceneWaveRangeRequirement(CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES[0], 100)
+  .withIntroSpriteConfigs([
+    {
+      spriteKey: "department_store_sale_lady",
+      fileRoot: "mystery-encounters",
+      hasShadow: true,
+      x: -20,
+    },
+    {
+      spriteKey: "",
+      fileRoot: "",
+      species: Species.FURFROU,
+      hasShadow: true,
+      repeat: true,
+      x: 30,
+    },
+  ])
+  .withIntroDialogue([
+    {
+      text: `${namespace}:intro`,
+    },
+    {
+      text: `${namespace}:intro_dialogue`,
+      speaker: `${namespace}:speaker`,
+    },
+  ])
+  .withAutoHideIntroVisuals(false)
+  .setLocalizationKey(`${namespace}`)
+  .withTitle(`${namespace}:title`)
+  .withDescription(`${namespace}:description`)
+  .withQuery(`${namespace}:query`)
+  .withSimpleOption(
+    {
+      buttonLabel: `${namespace}:option.1.label`,
+      buttonTooltip: `${namespace}:option.1.tooltip`,
+    },
+    async () => {
+      // Choose TMs
+      const modifiers: ModifierTypeFunc[] = [];
+      let i = 0;
+      while (i < 5) {
+        // 2/2/1 weight on TM rarity
+        const roll = randSeedInt(5);
+        if (roll < 2) {
+          modifiers.push(modifierTypes.TM_COMMON);
+        } else if (roll < 4) {
+          modifiers.push(modifierTypes.TM_GREAT);
+        } else {
+          modifiers.push(modifierTypes.TM_ULTRA);
         }
-
-        setEncounterRewards({ guaranteedModifierTypeFuncs: modifiers, fillRemaining: false, });
-        leaveEncounterWithoutBattle();
+        i++;
       }
-    )
-    .withSimpleOption(
-      {
-        buttonLabel: `${namespace}:option.2.label`,
-        buttonTooltip: `${namespace}:option.2.tooltip`,
-      },
-      async () => {
-        // Choose Vitamins
-        const modifiers: ModifierTypeFunc[] = [];
-        let i = 0;
-        while (i < 3) {
-          // 2/1 weight on base stat booster vs PP Up
-          const roll = randSeedInt(3);
-          if (roll === 0) {
-            modifiers.push(modifierTypes.PP_UP);
-          } else {
-            modifiers.push(modifierTypes.BASE_STAT_BOOSTER);
-          }
-          i++;
+
+      setEncounterRewards({
+        guaranteedModifierTypeFuncs: modifiers,
+        fillRemaining: false,
+      });
+      leaveEncounterWithoutBattle();
+    },
+  )
+  .withSimpleOption(
+    {
+      buttonLabel: `${namespace}:option.2.label`,
+      buttonTooltip: `${namespace}:option.2.tooltip`,
+    },
+    async () => {
+      // Choose Vitamins
+      const modifiers: ModifierTypeFunc[] = [];
+      let i = 0;
+      while (i < 3) {
+        // 2/1 weight on base stat booster vs PP Up
+        const roll = randSeedInt(3);
+        if (roll === 0) {
+          modifiers.push(modifierTypes.PP_UP);
+        } else {
+          modifiers.push(modifierTypes.BASE_STAT_BOOSTER);
         }
-
-        setEncounterRewards({ guaranteedModifierTypeFuncs: modifiers, fillRemaining: false, });
-        leaveEncounterWithoutBattle();
+        i++;
       }
-    )
-    .withSimpleOption(
-      {
-        buttonLabel: `${namespace}:option.3.label`,
-        buttonTooltip: `${namespace}:option.3.tooltip`,
-      },
-      async () => {
-        // Choose X Items
-        const modifiers: ModifierTypeFunc[] = [];
-        let i = 0;
-        while (i < 5) {
-          // 4/1 weight on base stat booster vs Dire Hit
-          const roll = randSeedInt(5);
-          if (roll === 0) {
-            modifiers.push(modifierTypes.DIRE_HIT);
-          } else {
-            modifiers.push(modifierTypes.TEMP_STAT_STAGE_BOOSTER);
-          }
-          i++;
+
+      setEncounterRewards({
+        guaranteedModifierTypeFuncs: modifiers,
+        fillRemaining: false,
+      });
+      leaveEncounterWithoutBattle();
+    },
+  )
+  .withSimpleOption(
+    {
+      buttonLabel: `${namespace}:option.3.label`,
+      buttonTooltip: `${namespace}:option.3.tooltip`,
+    },
+    async () => {
+      // Choose X Items
+      const modifiers: ModifierTypeFunc[] = [];
+      let i = 0;
+      while (i < 5) {
+        // 4/1 weight on base stat booster vs Dire Hit
+        const roll = randSeedInt(5);
+        if (roll === 0) {
+          modifiers.push(modifierTypes.DIRE_HIT);
+        } else {
+          modifiers.push(modifierTypes.TEMP_STAT_STAGE_BOOSTER);
         }
-
-        setEncounterRewards({ guaranteedModifierTypeFuncs: modifiers, fillRemaining: false, });
-        leaveEncounterWithoutBattle();
+        i++;
       }
-    )
-    .withSimpleOption(
-      {
-        buttonLabel: `${namespace}:option.4.label`,
-        buttonTooltip: `${namespace}:option.4.tooltip`,
-      },
-      async () => {
-        // Choose Pokeballs
-        const modifiers: ModifierTypeFunc[] = [];
-        let i = 0;
-        while (i < 4) {
-          // 10/30/20/5 weight on pokeballs
-          const roll = randSeedInt(65);
-          if (roll < 10) {
-            modifiers.push(modifierTypes.POKEBALL);
-          } else if (roll < 40) {
-            modifiers.push(modifierTypes.GREAT_BALL);
-          } else if (roll < 60) {
-            modifiers.push(modifierTypes.ULTRA_BALL);
-          } else {
-            modifiers.push(modifierTypes.ROGUE_BALL);
-          }
-          i++;
+
+      setEncounterRewards({
+        guaranteedModifierTypeFuncs: modifiers,
+        fillRemaining: false,
+      });
+      leaveEncounterWithoutBattle();
+    },
+  )
+  .withSimpleOption(
+    {
+      buttonLabel: `${namespace}:option.4.label`,
+      buttonTooltip: `${namespace}:option.4.tooltip`,
+    },
+    async () => {
+      // Choose Pokeballs
+      const modifiers: ModifierTypeFunc[] = [];
+      let i = 0;
+      while (i < 4) {
+        // 10/30/20/5 weight on pokeballs
+        const roll = randSeedInt(65);
+        if (roll < 10) {
+          modifiers.push(modifierTypes.POKEBALL);
+        } else if (roll < 40) {
+          modifiers.push(modifierTypes.GREAT_BALL);
+        } else if (roll < 60) {
+          modifiers.push(modifierTypes.ULTRA_BALL);
+        } else {
+          modifiers.push(modifierTypes.ROGUE_BALL);
         }
+        i++;
+      }
 
-        setEncounterRewards({ guaranteedModifierTypeFuncs: modifiers, fillRemaining: false, });
-        leaveEncounterWithoutBattle();
-      }
-    )
-    .withOutroDialogue([
-      {
-        text: `${namespace}:outro`,
-      }
-    ])
-    .build();
+      setEncounterRewards({
+        guaranteedModifierTypeFuncs: modifiers,
+        fillRemaining: false,
+      });
+      leaveEncounterWithoutBattle();
+    },
+  )
+  .withOutroDialogue([
+    {
+      text: `${namespace}:outro`,
+    },
+  ])
+  .build();
diff --git a/src/data/mystery-encounters/encounters/field-trip-encounter.ts b/src/data/mystery-encounters/encounters/field-trip-encounter.ts
index 8bb5c68eec0..2cd6123838b 100644
--- a/src/data/mystery-encounters/encounters/field-trip-encounter.ts
+++ b/src/data/mystery-encounters/encounters/field-trip-encounter.ts
@@ -1,6 +1,12 @@
-import { MoveCategory } from "#app/data/move";
+import { MoveCategory } from "#enums/MoveCategory";
 import { MysteryEncounterOptionBuilder } from "#app/data/mystery-encounters/mystery-encounter-option";
-import { generateModifierTypeOption, leaveEncounterWithoutBattle, selectPokemonForOption, setEncounterExp, setEncounterRewards } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
+import {
+  generateModifierTypeOption,
+  leaveEncounterWithoutBattle,
+  selectPokemonForOption,
+  setEncounterExp,
+  setEncounterRewards,
+} from "#app/data/mystery-encounters/utils/encounter-phase-utils";
 import type { PlayerPokemon, PokemonMove } from "#app/field/pokemon";
 import { modifierTypes } from "#app/modifier/modifier-type";
 import type { OptionSelectItem } from "#app/ui/abstact-option-select-ui-handler";
@@ -12,7 +18,7 @@ import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
 import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
 import { Stat } from "#enums/stat";
 import i18next from "i18next";
-import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/game-mode";
+import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants";
 
 /** i18n namespace for the encounter */
 const namespace = "mysteryEncounters/fieldTrip";
@@ -22,180 +28,187 @@ const namespace = "mysteryEncounters/fieldTrip";
  * @see {@link https://github.com/pagefaultgames/pokerogue/issues/3794 | GitHub Issue #3794}
  * @see For biome requirements check {@linkcode mysteryEncountersByBiome}
  */
-export const FieldTripEncounter: MysteryEncounter =
-  MysteryEncounterBuilder.withEncounterType(MysteryEncounterType.FIELD_TRIP)
-    .withEncounterTier(MysteryEncounterTier.COMMON)
-    .withSceneWaveRangeRequirement(CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES[0], 100)
-    .withIntroSpriteConfigs([
-      {
-        spriteKey: "preschooler_m",
-        fileRoot: "trainer",
-        hasShadow: true,
-      },
-      {
-        spriteKey: "field_trip_teacher",
-        fileRoot: "mystery-encounters",
-        hasShadow: true,
-      },
-      {
-        spriteKey: "preschooler_f",
-        fileRoot: "trainer",
-        hasShadow: true,
-      },
-    ])
-    .withIntroDialogue([
-      {
-        text: `${namespace}:intro`,
-      },
-      {
-        text: `${namespace}:intro_dialogue`,
-        speaker: `${namespace}:speaker`,
-      },
-    ])
-    .withAutoHideIntroVisuals(false)
-    .setLocalizationKey(`${namespace}`)
-    .withTitle(`${namespace}:title`)
-    .withDescription(`${namespace}:description`)
-    .withQuery(`${namespace}:query`)
-    .withOption(
-      MysteryEncounterOptionBuilder
-        .newOptionWithMode(MysteryEncounterOptionMode.DEFAULT)
-        .withDialogue({
-          buttonLabel: `${namespace}:option.1.label`,
-          buttonTooltip: `${namespace}:option.1.tooltip`,
-          secondOptionPrompt: `${namespace}:second_option_prompt`,
-        })
-        .withPreOptionPhase(async (): Promise<boolean> => {
-          const encounter = globalScene.currentBattle.mysteryEncounter!;
-          const onPokemonSelected = (pokemon: PlayerPokemon) => {
-            // Return the options for Pokemon move valid for this option
-            return pokemon.moveset.map((move: PokemonMove) => {
-              const option: OptionSelectItem = {
-                label: move.getName(),
-                handler: () => {
-                  // Pokemon and move selected
-                  encounter.setDialogueToken("moveCategory", i18next.t(`${namespace}:physical`));
-                  pokemonAndMoveChosen(pokemon, move, MoveCategory.PHYSICAL);
-                  return true;
-                },
-              };
-              return option;
-            });
-          };
+export const FieldTripEncounter: MysteryEncounter = MysteryEncounterBuilder.withEncounterType(
+  MysteryEncounterType.FIELD_TRIP,
+)
+  .withEncounterTier(MysteryEncounterTier.COMMON)
+  .withSceneWaveRangeRequirement(CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES[0], 100)
+  .withIntroSpriteConfigs([
+    {
+      spriteKey: "preschooler_m",
+      fileRoot: "trainer",
+      hasShadow: true,
+    },
+    {
+      spriteKey: "field_trip_teacher",
+      fileRoot: "mystery-encounters",
+      hasShadow: true,
+    },
+    {
+      spriteKey: "preschooler_f",
+      fileRoot: "trainer",
+      hasShadow: true,
+    },
+  ])
+  .withIntroDialogue([
+    {
+      text: `${namespace}:intro`,
+    },
+    {
+      text: `${namespace}:intro_dialogue`,
+      speaker: `${namespace}:speaker`,
+    },
+  ])
+  .withAutoHideIntroVisuals(false)
+  .setLocalizationKey(`${namespace}`)
+  .withTitle(`${namespace}:title`)
+  .withDescription(`${namespace}:description`)
+  .withQuery(`${namespace}:query`)
+  .withOption(
+    MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DEFAULT)
+      .withDialogue({
+        buttonLabel: `${namespace}:option.1.label`,
+        buttonTooltip: `${namespace}:option.1.tooltip`,
+        secondOptionPrompt: `${namespace}:second_option_prompt`,
+      })
+      .withPreOptionPhase(async (): Promise<boolean> => {
+        const encounter = globalScene.currentBattle.mysteryEncounter!;
+        const onPokemonSelected = (pokemon: PlayerPokemon) => {
+          // Return the options for Pokemon move valid for this option
+          return pokemon.moveset.map((move: PokemonMove) => {
+            const option: OptionSelectItem = {
+              label: move.getName(),
+              handler: () => {
+                // Pokemon and move selected
+                encounter.setDialogueToken("moveCategory", i18next.t(`${namespace}:physical`));
+                pokemonAndMoveChosen(pokemon, move, MoveCategory.PHYSICAL);
+                return true;
+              },
+            };
+            return option;
+          });
+        };
 
-          return selectPokemonForOption(onPokemonSelected);
-        })
-        .withOptionPhase(async () => {
-          const encounter = globalScene.currentBattle.mysteryEncounter!;
-          if (encounter.misc.correctMove) {
-            const modifiers = [
-              generateModifierTypeOption(modifierTypes.TEMP_STAT_STAGE_BOOSTER, [ Stat.ATK ])!,
-              generateModifierTypeOption(modifierTypes.TEMP_STAT_STAGE_BOOSTER, [ Stat.DEF ])!,
-              generateModifierTypeOption(modifierTypes.TEMP_STAT_STAGE_BOOSTER, [ Stat.SPD ])!,
-              generateModifierTypeOption(modifierTypes.DIRE_HIT)!,
-              generateModifierTypeOption(modifierTypes.RARER_CANDY)!,
-            ];
+        return selectPokemonForOption(onPokemonSelected);
+      })
+      .withOptionPhase(async () => {
+        const encounter = globalScene.currentBattle.mysteryEncounter!;
+        if (encounter.misc.correctMove) {
+          const modifiers = [
+            generateModifierTypeOption(modifierTypes.TEMP_STAT_STAGE_BOOSTER, [Stat.ATK])!,
+            generateModifierTypeOption(modifierTypes.TEMP_STAT_STAGE_BOOSTER, [Stat.DEF])!,
+            generateModifierTypeOption(modifierTypes.TEMP_STAT_STAGE_BOOSTER, [Stat.SPD])!,
+            generateModifierTypeOption(modifierTypes.DIRE_HIT)!,
+            generateModifierTypeOption(modifierTypes.RARER_CANDY)!,
+          ];
 
-            setEncounterRewards({ guaranteedModifierTypeOptions: modifiers, fillRemaining: false });
-          }
+          setEncounterRewards({
+            guaranteedModifierTypeOptions: modifiers,
+            fillRemaining: false,
+          });
+        }
 
-          leaveEncounterWithoutBattle(!encounter.misc.correctMove);
-        })
-        .build()
-    )
-    .withOption(
-      MysteryEncounterOptionBuilder
-        .newOptionWithMode(MysteryEncounterOptionMode.DEFAULT)
-        .withDialogue({
-          buttonLabel: `${namespace}:option.2.label`,
-          buttonTooltip: `${namespace}:option.2.tooltip`,
-          secondOptionPrompt: `${namespace}:second_option_prompt`,
-        })
-        .withPreOptionPhase(async (): Promise<boolean> => {
-          const encounter = globalScene.currentBattle.mysteryEncounter!;
-          const onPokemonSelected = (pokemon: PlayerPokemon) => {
-            // Return the options for Pokemon move valid for this option
-            return pokemon.moveset.map((move: PokemonMove) => {
-              const option: OptionSelectItem = {
-                label: move.getName(),
-                handler: () => {
-                  // Pokemon and move selected
-                  encounter.setDialogueToken("moveCategory", i18next.t(`${namespace}:special`));
-                  pokemonAndMoveChosen(pokemon, move, MoveCategory.SPECIAL);
-                  return true;
-                },
-              };
-              return option;
-            });
-          };
+        leaveEncounterWithoutBattle(!encounter.misc.correctMove);
+      })
+      .build(),
+  )
+  .withOption(
+    MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DEFAULT)
+      .withDialogue({
+        buttonLabel: `${namespace}:option.2.label`,
+        buttonTooltip: `${namespace}:option.2.tooltip`,
+        secondOptionPrompt: `${namespace}:second_option_prompt`,
+      })
+      .withPreOptionPhase(async (): Promise<boolean> => {
+        const encounter = globalScene.currentBattle.mysteryEncounter!;
+        const onPokemonSelected = (pokemon: PlayerPokemon) => {
+          // Return the options for Pokemon move valid for this option
+          return pokemon.moveset.map((move: PokemonMove) => {
+            const option: OptionSelectItem = {
+              label: move.getName(),
+              handler: () => {
+                // Pokemon and move selected
+                encounter.setDialogueToken("moveCategory", i18next.t(`${namespace}:special`));
+                pokemonAndMoveChosen(pokemon, move, MoveCategory.SPECIAL);
+                return true;
+              },
+            };
+            return option;
+          });
+        };
 
-          return selectPokemonForOption(onPokemonSelected);
-        })
-        .withOptionPhase(async () => {
-          const encounter = globalScene.currentBattle.mysteryEncounter!;
-          if (encounter.misc.correctMove) {
-            const modifiers = [
-              generateModifierTypeOption(modifierTypes.TEMP_STAT_STAGE_BOOSTER, [ Stat.SPATK ])!,
-              generateModifierTypeOption(modifierTypes.TEMP_STAT_STAGE_BOOSTER, [ Stat.SPDEF ])!,
-              generateModifierTypeOption(modifierTypes.TEMP_STAT_STAGE_BOOSTER, [ Stat.SPD ])!,
-              generateModifierTypeOption(modifierTypes.DIRE_HIT)!,
-              generateModifierTypeOption(modifierTypes.RARER_CANDY)!,
-            ];
+        return selectPokemonForOption(onPokemonSelected);
+      })
+      .withOptionPhase(async () => {
+        const encounter = globalScene.currentBattle.mysteryEncounter!;
+        if (encounter.misc.correctMove) {
+          const modifiers = [
+            generateModifierTypeOption(modifierTypes.TEMP_STAT_STAGE_BOOSTER, [Stat.SPATK])!,
+            generateModifierTypeOption(modifierTypes.TEMP_STAT_STAGE_BOOSTER, [Stat.SPDEF])!,
+            generateModifierTypeOption(modifierTypes.TEMP_STAT_STAGE_BOOSTER, [Stat.SPD])!,
+            generateModifierTypeOption(modifierTypes.DIRE_HIT)!,
+            generateModifierTypeOption(modifierTypes.RARER_CANDY)!,
+          ];
 
-            setEncounterRewards({ guaranteedModifierTypeOptions: modifiers, fillRemaining: false });
-          }
+          setEncounterRewards({
+            guaranteedModifierTypeOptions: modifiers,
+            fillRemaining: false,
+          });
+        }
 
-          leaveEncounterWithoutBattle(!encounter.misc.correctMove);
-        })
-        .build()
-    )
-    .withOption(
-      MysteryEncounterOptionBuilder
-        .newOptionWithMode(MysteryEncounterOptionMode.DEFAULT)
-        .withDialogue({
-          buttonLabel: `${namespace}:option.3.label`,
-          buttonTooltip: `${namespace}:option.3.tooltip`,
-          secondOptionPrompt: `${namespace}:second_option_prompt`,
-        })
-        .withPreOptionPhase(async (): Promise<boolean> => {
-          const encounter = globalScene.currentBattle.mysteryEncounter!;
-          const onPokemonSelected = (pokemon: PlayerPokemon) => {
-            // Return the options for Pokemon move valid for this option
-            return pokemon.moveset.map((move: PokemonMove) => {
-              const option: OptionSelectItem = {
-                label: move.getName(),
-                handler: () => {
-                  // Pokemon and move selected
-                  encounter.setDialogueToken("moveCategory", i18next.t(`${namespace}:status`));
-                  pokemonAndMoveChosen(pokemon, move, MoveCategory.STATUS);
-                  return true;
-                },
-              };
-              return option;
-            });
-          };
+        leaveEncounterWithoutBattle(!encounter.misc.correctMove);
+      })
+      .build(),
+  )
+  .withOption(
+    MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DEFAULT)
+      .withDialogue({
+        buttonLabel: `${namespace}:option.3.label`,
+        buttonTooltip: `${namespace}:option.3.tooltip`,
+        secondOptionPrompt: `${namespace}:second_option_prompt`,
+      })
+      .withPreOptionPhase(async (): Promise<boolean> => {
+        const encounter = globalScene.currentBattle.mysteryEncounter!;
+        const onPokemonSelected = (pokemon: PlayerPokemon) => {
+          // Return the options for Pokemon move valid for this option
+          return pokemon.moveset.map((move: PokemonMove) => {
+            const option: OptionSelectItem = {
+              label: move.getName(),
+              handler: () => {
+                // Pokemon and move selected
+                encounter.setDialogueToken("moveCategory", i18next.t(`${namespace}:status`));
+                pokemonAndMoveChosen(pokemon, move, MoveCategory.STATUS);
+                return true;
+              },
+            };
+            return option;
+          });
+        };
 
-          return selectPokemonForOption(onPokemonSelected);
-        })
-        .withOptionPhase(async () => {
-          const encounter = globalScene.currentBattle.mysteryEncounter!;
-          if (encounter.misc.correctMove) {
-            const modifiers = [
-              generateModifierTypeOption(modifierTypes.TEMP_STAT_STAGE_BOOSTER, [ Stat.ACC ])!,
-              generateModifierTypeOption(modifierTypes.TEMP_STAT_STAGE_BOOSTER, [ Stat.SPD ])!,
-              generateModifierTypeOption(modifierTypes.GREAT_BALL)!,
-              generateModifierTypeOption(modifierTypes.IV_SCANNER)!,
-              generateModifierTypeOption(modifierTypes.RARER_CANDY)!,
-            ];
+        return selectPokemonForOption(onPokemonSelected);
+      })
+      .withOptionPhase(async () => {
+        const encounter = globalScene.currentBattle.mysteryEncounter!;
+        if (encounter.misc.correctMove) {
+          const modifiers = [
+            generateModifierTypeOption(modifierTypes.TEMP_STAT_STAGE_BOOSTER, [Stat.ACC])!,
+            generateModifierTypeOption(modifierTypes.TEMP_STAT_STAGE_BOOSTER, [Stat.SPD])!,
+            generateModifierTypeOption(modifierTypes.GREAT_BALL)!,
+            generateModifierTypeOption(modifierTypes.IV_SCANNER)!,
+            generateModifierTypeOption(modifierTypes.RARER_CANDY)!,
+          ];
 
-            setEncounterRewards({ guaranteedModifierTypeOptions: modifiers, fillRemaining: false });
-          }
+          setEncounterRewards({
+            guaranteedModifierTypeOptions: modifiers,
+            fillRemaining: false,
+          });
+        }
 
-          leaveEncounterWithoutBattle(!encounter.misc.correctMove);
-        })
-        .build()
-    )
-    .build();
+        leaveEncounterWithoutBattle(!encounter.misc.correctMove);
+      })
+      .build(),
+  )
+  .build();
 
 function pokemonAndMoveChosen(pokemon: PlayerPokemon, move: PokemonMove, correctMoveCategory: MoveCategory) {
   const encounter = globalScene.currentBattle.mysteryEncounter!;
@@ -215,7 +228,10 @@ function pokemonAndMoveChosen(pokemon: PlayerPokemon, move: PokemonMove, correct
         text: `${namespace}:incorrect_exp`,
       },
     ];
-    setEncounterExp(globalScene.getPlayerParty().map((p) => p.id), 50);
+    setEncounterExp(
+      globalScene.getPlayerParty().map(p => p.id),
+      50,
+    );
   } else {
     encounter.selectedOption!.dialogue!.selected = [
       {
@@ -229,7 +245,7 @@ function pokemonAndMoveChosen(pokemon: PlayerPokemon, move: PokemonMove, correct
         text: `${namespace}:correct_exp`,
       },
     ];
-    setEncounterExp([ pokemon.id ], 100);
+    setEncounterExp([pokemon.id], 100);
   }
   encounter.misc = {
     correctMove: correctMove,
diff --git a/src/data/mystery-encounters/encounters/fiery-fallout-encounter.ts b/src/data/mystery-encounters/encounters/fiery-fallout-encounter.ts
index c52540584b3..0364b98abe2 100644
--- a/src/data/mystery-encounters/encounters/fiery-fallout-encounter.ts
+++ b/src/data/mystery-encounters/encounters/fiery-fallout-encounter.ts
@@ -1,36 +1,52 @@
 import { MysteryEncounterOptionBuilder } from "#app/data/mystery-encounters/mystery-encounter-option";
 import type { EnemyPartyConfig } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
-import { initBattleWithEnemyConfig, loadCustomMovesForEncounter, leaveEncounterWithoutBattle, setEncounterExp, setEncounterRewards, transitionMysteryEncounterIntroVisuals, generateModifierType } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
+import {
+  initBattleWithEnemyConfig,
+  loadCustomMovesForEncounter,
+  leaveEncounterWithoutBattle,
+  setEncounterExp,
+  setEncounterRewards,
+  transitionMysteryEncounterIntroVisuals,
+  generateModifierType,
+} from "#app/data/mystery-encounters/utils/encounter-phase-utils";
 import type { AttackTypeBoosterModifierType } from "#app/modifier/modifier-type";
-import { modifierTypes, } from "#app/modifier/modifier-type";
+import { modifierTypes } from "#app/modifier/modifier-type";
 import { MysteryEncounterType } from "#enums/mystery-encounter-type";
 import { globalScene } from "#app/global-scene";
 import type MysteryEncounter from "#app/data/mystery-encounters/mystery-encounter";
 import { MysteryEncounterBuilder } from "#app/data/mystery-encounters/mystery-encounter";
-import { AbilityRequirement, CombinationPokemonRequirement, TypeRequirement } from "#app/data/mystery-encounters/mystery-encounter-requirements";
+import {
+  AbilityRequirement,
+  CombinationPokemonRequirement,
+  TypeRequirement,
+} from "#app/data/mystery-encounters/mystery-encounter-requirements";
 import { Species } from "#enums/species";
 import { getPokemonSpecies } from "#app/data/pokemon-species";
 import { Gender } from "#app/data/gender";
-import { Type } from "#enums/type";
+import { PokemonType } from "#enums/pokemon-type";
 import { BattlerIndex } from "#app/battle";
 import type Pokemon from "#app/field/pokemon";
 import { PokemonMove } from "#app/field/pokemon";
 import { Moves } from "#enums/moves";
 import { EncounterBattleAnim } from "#app/data/battle-anims";
 import { WeatherType } from "#enums/weather-type";
-import { isNullOrUndefined, randSeedInt } from "#app/utils";
+import { isNullOrUndefined, randSeedInt } from "#app/utils/common";
 import { StatusEffect } from "#enums/status-effect";
 import { queueEncounterMessage } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils";
-import { applyAbilityOverrideToPokemon, applyDamageToPokemon, applyModifierTypeToPlayerPokemon } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils";
+import {
+  applyAbilityOverrideToPokemon,
+  applyDamageToPokemon,
+  applyModifierTypeToPlayerPokemon,
+} from "#app/data/mystery-encounters/utils/encounter-pokemon-utils";
 import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
 import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
 import { EncounterAnim } from "#enums/encounter-anims";
-import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/game-mode";
+import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants";
 import { Abilities } from "#enums/abilities";
 import { BattlerTagType } from "#enums/battler-tag-type";
 import { StatStageChangePhase } from "#app/phases/stat-stage-change-phase";
 import { Stat } from "#enums/stat";
-import { Ability } from "#app/data/ability";
+import { Ability } from "#app/data/abilities/ability-class";
 import { FIRE_RESISTANT_ABILITIES } from "#app/data/mystery-encounters/requirements/requirement-groups";
 
 /** the i18n namespace for the encounter */
@@ -48,216 +64,231 @@ const DAMAGE_PERCENTAGE: number = 20;
  * @see {@link https://github.com/pagefaultgames/pokerogue/issues/3814 | GitHub Issue #3814}
  * @see For biome requirements check {@linkcode mysteryEncountersByBiome}
  */
-export const FieryFalloutEncounter: MysteryEncounter =
-  MysteryEncounterBuilder.withEncounterType(MysteryEncounterType.FIERY_FALLOUT)
-    .withEncounterTier(MysteryEncounterTier.COMMON)
-    .withSceneWaveRangeRequirement(40, CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES[1])
-    .withCatchAllowed(true)
-    .withIntroSpriteConfigs([]) // Set in onInit()
-    .withAnimations(EncounterAnim.MAGMA_BG, EncounterAnim.MAGMA_SPOUT)
-    .withAutoHideIntroVisuals(false)
-    .withFleeAllowed(false)
-    .withIntroDialogue([
+export const FieryFalloutEncounter: MysteryEncounter = MysteryEncounterBuilder.withEncounterType(
+  MysteryEncounterType.FIERY_FALLOUT,
+)
+  .withEncounterTier(MysteryEncounterTier.COMMON)
+  .withSceneWaveRangeRequirement(40, CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES[1])
+  .withCatchAllowed(true)
+  .withIntroSpriteConfigs([]) // Set in onInit()
+  .withAnimations(EncounterAnim.MAGMA_BG, EncounterAnim.MAGMA_SPOUT)
+  .withAutoHideIntroVisuals(false)
+  .withFleeAllowed(false)
+  .withIntroDialogue([
+    {
+      text: `${namespace}:intro`,
+    },
+  ])
+  .withOnInit(() => {
+    const encounter = globalScene.currentBattle.mysteryEncounter!;
+
+    // Calculate boss mons
+    const volcaronaSpecies = getPokemonSpecies(Species.VOLCARONA);
+    const config: EnemyPartyConfig = {
+      pokemonConfigs: [
+        {
+          species: volcaronaSpecies,
+          isBoss: false,
+          gender: Gender.MALE,
+          tags: [BattlerTagType.MYSTERY_ENCOUNTER_POST_SUMMON],
+          mysteryEncounterBattleEffects: (pokemon: Pokemon) => {
+            globalScene.unshiftPhase(
+              new StatStageChangePhase(pokemon.getBattlerIndex(), true, [Stat.SPDEF, Stat.SPD], 1),
+            );
+          },
+        },
+        {
+          species: volcaronaSpecies,
+          isBoss: false,
+          gender: Gender.FEMALE,
+          tags: [BattlerTagType.MYSTERY_ENCOUNTER_POST_SUMMON],
+          mysteryEncounterBattleEffects: (pokemon: Pokemon) => {
+            globalScene.unshiftPhase(
+              new StatStageChangePhase(pokemon.getBattlerIndex(), true, [Stat.SPDEF, Stat.SPD], 1),
+            );
+          },
+        },
+      ],
+      doubleBattle: true,
+      disableSwitch: true,
+    };
+    encounter.enemyPartyConfigs = [config];
+
+    // Load hidden Volcarona sprites
+    encounter.spriteConfigs = [
       {
-        text: `${namespace}:intro`,
+        spriteKey: "",
+        fileRoot: "",
+        species: Species.VOLCARONA,
+        repeat: true,
+        hidden: true,
+        hasShadow: true,
+        x: -20,
+        startFrame: 20,
       },
-    ])
-    .withOnInit(() => {
+      {
+        spriteKey: "",
+        fileRoot: "",
+        species: Species.VOLCARONA,
+        repeat: true,
+        hidden: true,
+        hasShadow: true,
+        x: 20,
+      },
+    ];
+
+    // Load animations/sfx for Volcarona moves
+    loadCustomMovesForEncounter([Moves.FIRE_SPIN, Moves.QUIVER_DANCE]);
+
+    const pokemon = globalScene.getEnemyPokemon();
+    globalScene.arena.trySetWeather(WeatherType.SUNNY, pokemon);
+
+    encounter.setDialogueToken("volcaronaName", getPokemonSpecies(Species.VOLCARONA).getName());
+
+    return true;
+  })
+  .withOnVisualsStart(() => {
+    // Play animations
+    const background = new EncounterBattleAnim(
+      EncounterAnim.MAGMA_BG,
+      globalScene.getPlayerPokemon()!,
+      globalScene.getPlayerPokemon(),
+    );
+    background.playWithoutTargets(200, 70, 2, 3);
+    const animation = new EncounterBattleAnim(
+      EncounterAnim.MAGMA_SPOUT,
+      globalScene.getPlayerPokemon()!,
+      globalScene.getPlayerPokemon(),
+    );
+    animation.playWithoutTargets(80, 100, 2);
+    globalScene.time.delayedCall(600, () => {
+      animation.playWithoutTargets(-20, 100, 2);
+    });
+    globalScene.time.delayedCall(1200, () => {
+      animation.playWithoutTargets(140, 150, 2);
+    });
+
+    return true;
+  })
+  .setLocalizationKey(`${namespace}`)
+  .withTitle(`${namespace}:title`)
+  .withDescription(`${namespace}:description`)
+  .withQuery(`${namespace}:query`)
+  .withSimpleOption(
+    {
+      buttonLabel: `${namespace}:option.1.label`,
+      buttonTooltip: `${namespace}:option.1.tooltip`,
+      selected: [
+        {
+          text: `${namespace}:option.1.selected`,
+        },
+      ],
+    },
+    async () => {
+      // Pick battle
       const encounter = globalScene.currentBattle.mysteryEncounter!;
+      setEncounterRewards({ fillRemaining: true }, undefined, () => giveLeadPokemonAttackTypeBoostItem());
 
-      // Calculate boss mons
-      const volcaronaSpecies = getPokemonSpecies(Species.VOLCARONA);
-      const config: EnemyPartyConfig = {
-        pokemonConfigs: [
-          {
-            species: volcaronaSpecies,
-            isBoss: false,
-            gender: Gender.MALE,
-            tags: [ BattlerTagType.MYSTERY_ENCOUNTER_POST_SUMMON ],
-            mysteryEncounterBattleEffects: (pokemon: Pokemon) => {
-              globalScene.unshiftPhase(new StatStageChangePhase(pokemon.getBattlerIndex(), true, [ Stat.SPDEF, Stat.SPD ], 1));
-            }
-          },
-          {
-            species: volcaronaSpecies,
-            isBoss: false,
-            gender: Gender.FEMALE,
-            tags: [ BattlerTagType.MYSTERY_ENCOUNTER_POST_SUMMON ],
-            mysteryEncounterBattleEffects: (pokemon: Pokemon) => {
-              globalScene.unshiftPhase(new StatStageChangePhase(pokemon.getBattlerIndex(), true, [ Stat.SPDEF, Stat.SPD ], 1));
-            }
-          }
-        ],
-        doubleBattle: true,
-        disableSwitch: true,
-      };
-      encounter.enemyPartyConfigs = [ config ];
-
-      // Load hidden Volcarona sprites
-      encounter.spriteConfigs = [
+      encounter.startOfBattleEffects.push(
         {
-          spriteKey: "",
-          fileRoot: "",
-          species: Species.VOLCARONA,
-          repeat: true,
-          hidden: true,
-          hasShadow: true,
-          x: -20,
-          startFrame: 20
+          sourceBattlerIndex: BattlerIndex.ENEMY,
+          targets: [BattlerIndex.PLAYER],
+          move: new PokemonMove(Moves.FIRE_SPIN),
+          ignorePp: true,
         },
         {
-          spriteKey: "",
-          fileRoot: "",
-          species: Species.VOLCARONA,
-          repeat: true,
-          hidden: true,
-          hasShadow: true,
-          x: 20
+          sourceBattlerIndex: BattlerIndex.ENEMY_2,
+          targets: [BattlerIndex.PLAYER_2],
+          move: new PokemonMove(Moves.FIRE_SPIN),
+          ignorePp: true,
         },
-      ];
+      );
+      await initBattleWithEnemyConfig(globalScene.currentBattle.mysteryEncounter!.enemyPartyConfigs[0]);
+    },
+  )
+  .withSimpleOption(
+    {
+      buttonLabel: `${namespace}:option.2.label`,
+      buttonTooltip: `${namespace}:option.2.tooltip`,
+      selected: [
+        {
+          text: `${namespace}:option.2.selected`,
+        },
+      ],
+    },
+    async () => {
+      // Damage non-fire types and burn 1 random non-fire type member + give it Heatproof
+      const encounter = globalScene.currentBattle.mysteryEncounter!;
+      const nonFireTypes = globalScene
+        .getPlayerParty()
+        .filter(p => p.isAllowedInBattle() && !p.getTypes().includes(PokemonType.FIRE));
 
-      // Load animations/sfx for Volcarona moves
-      loadCustomMovesForEncounter([ Moves.FIRE_SPIN, Moves.QUIVER_DANCE ]);
+      for (const pkm of nonFireTypes) {
+        const percentage = DAMAGE_PERCENTAGE / 100;
+        const damage = Math.floor(pkm.getMaxHp() * percentage);
+        applyDamageToPokemon(pkm, damage);
+      }
 
-      globalScene.arena.trySetWeather(WeatherType.SUNNY, true);
+      // Burn random member
+      const burnable = nonFireTypes.filter(
+        p => isNullOrUndefined(p.status) || isNullOrUndefined(p.status.effect) || p.status.effect === StatusEffect.NONE,
+      );
+      if (burnable?.length > 0) {
+        const roll = randSeedInt(burnable.length);
+        const chosenPokemon = burnable[roll];
+        if (chosenPokemon.trySetStatus(StatusEffect.BURN)) {
+          // Burn applied
+          encounter.setDialogueToken("burnedPokemon", chosenPokemon.getNameToRender());
+          encounter.setDialogueToken("abilityName", new Ability(Abilities.HEATPROOF, 3).name);
+          queueEncounterMessage(`${namespace}:option.2.target_burned`);
 
-      encounter.setDialogueToken("volcaronaName", getPokemonSpecies(Species.VOLCARONA).getName());
+          // Also permanently change the burned Pokemon's ability to Heatproof
+          applyAbilityOverrideToPokemon(chosenPokemon, Abilities.HEATPROOF);
+        }
+      }
 
-      return true;
-    })
-    .withOnVisualsStart(() => {
-      // Play animations
-      const background = new EncounterBattleAnim(EncounterAnim.MAGMA_BG, globalScene.getPlayerPokemon()!, globalScene.getPlayerPokemon());
-      background.playWithoutTargets(200, 70, 2, 3);
-      const animation = new EncounterBattleAnim(EncounterAnim.MAGMA_SPOUT, globalScene.getPlayerPokemon()!, globalScene.getPlayerPokemon());
-      animation.playWithoutTargets(80, 100, 2);
-      globalScene.time.delayedCall(600, () => {
-        animation.playWithoutTargets(-20, 100, 2);
-      });
-      globalScene.time.delayedCall(1200, () => {
-        animation.playWithoutTargets(140, 150, 2);
-      });
-
-      return true;
-    })
-    .setLocalizationKey(`${namespace}`)
-    .withTitle(`${namespace}:title`)
-    .withDescription(`${namespace}:description`)
-    .withQuery(`${namespace}:query`)
-    .withSimpleOption(
-      {
-        buttonLabel: `${namespace}:option.1.label`,
-        buttonTooltip: `${namespace}:option.1.tooltip`,
+      // No rewards
+      leaveEncounterWithoutBattle(true);
+    },
+  )
+  .withOption(
+    MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DISABLED_OR_SPECIAL)
+      .withPrimaryPokemonRequirement(
+        CombinationPokemonRequirement.Some(
+          new TypeRequirement(PokemonType.FIRE, true, 1),
+          new AbilityRequirement(FIRE_RESISTANT_ABILITIES, true),
+        ),
+      ) // Will set option3PrimaryName dialogue token automatically
+      .withDialogue({
+        buttonLabel: `${namespace}:option.3.label`,
+        buttonTooltip: `${namespace}:option.3.tooltip`,
+        disabledButtonTooltip: `${namespace}:option.3.disabled_tooltip`,
         selected: [
           {
-            text: `${namespace}:option.1.selected`,
+            text: `${namespace}:option.3.selected`,
           },
         ],
-      },
-      async () => {
-        // Pick battle
+      })
+      .withPreOptionPhase(async () => {
+        // Do NOT await this, to prevent player from repeatedly pressing options
+        transitionMysteryEncounterIntroVisuals(false, false, 2000);
+      })
+      .withOptionPhase(async () => {
+        // Fire types help calm the Volcarona
         const encounter = globalScene.currentBattle.mysteryEncounter!;
-        setEncounterRewards({ fillRemaining: true }, undefined, () => giveLeadPokemonAttackTypeBoostItem());
+        await transitionMysteryEncounterIntroVisuals();
+        setEncounterRewards({ fillRemaining: true }, undefined, () => {
+          giveLeadPokemonAttackTypeBoostItem();
+        });
 
-        encounter.startOfBattleEffects.push(
-          {
-            sourceBattlerIndex: BattlerIndex.ENEMY,
-            targets: [ BattlerIndex.PLAYER ],
-            move: new PokemonMove(Moves.FIRE_SPIN),
-            ignorePp: true
-          },
-          {
-            sourceBattlerIndex: BattlerIndex.ENEMY_2,
-            targets: [ BattlerIndex.PLAYER_2 ],
-            move: new PokemonMove(Moves.FIRE_SPIN),
-            ignorePp: true
-          });
-        await initBattleWithEnemyConfig(globalScene.currentBattle.mysteryEncounter!.enemyPartyConfigs[0]);
-      }
-    )
-    .withSimpleOption(
-      {
-        buttonLabel: `${namespace}:option.2.label`,
-        buttonTooltip: `${namespace}:option.2.tooltip`,
-        selected: [
-          {
-            text: `${namespace}:option.2.selected`,
-          },
-        ],
-      },
-      async () => {
-        // Damage non-fire types and burn 1 random non-fire type member + give it Heatproof
-        const encounter = globalScene.currentBattle.mysteryEncounter!;
-        const nonFireTypes = globalScene.getPlayerParty().filter((p) => p.isAllowedInBattle() && !p.getTypes().includes(Type.FIRE));
+        const primary = encounter.options[2].primaryPokemon!;
 
-        for (const pkm of nonFireTypes) {
-          const percentage = DAMAGE_PERCENTAGE / 100;
-          const damage = Math.floor(pkm.getMaxHp() * percentage);
-          applyDamageToPokemon(pkm, damage);
-        }
-
-        // Burn random member
-        const burnable = nonFireTypes.filter(p => isNullOrUndefined(p.status) || isNullOrUndefined(p.status.effect) || p.status.effect === StatusEffect.NONE);
-        if (burnable?.length > 0) {
-          const roll = randSeedInt(burnable.length);
-          const chosenPokemon = burnable[roll];
-          if (chosenPokemon.trySetStatus(StatusEffect.BURN)) {
-            // Burn applied
-            encounter.setDialogueToken("burnedPokemon", chosenPokemon.getNameToRender());
-            encounter.setDialogueToken("abilityName", new Ability(Abilities.HEATPROOF, 3).name);
-            queueEncounterMessage(`${namespace}:option.2.target_burned`);
-
-            // Also permanently change the burned Pokemon's ability to Heatproof
-            applyAbilityOverrideToPokemon(chosenPokemon, Abilities.HEATPROOF);
-          }
-        }
-
-        // No rewards
-        leaveEncounterWithoutBattle(true);
-      }
-    )
-    .withOption(
-      MysteryEncounterOptionBuilder
-        .newOptionWithMode(MysteryEncounterOptionMode.DISABLED_OR_SPECIAL)
-        .withPrimaryPokemonRequirement(
-          CombinationPokemonRequirement.Some(
-            new TypeRequirement(Type.FIRE, true, 1),
-            new AbilityRequirement(FIRE_RESISTANT_ABILITIES, true)
-          )
-        ) // Will set option3PrimaryName dialogue token automatically
-        .withDialogue({
-          buttonLabel: `${namespace}:option.3.label`,
-          buttonTooltip: `${namespace}:option.3.tooltip`,
-          disabledButtonTooltip: `${namespace}:option.3.disabled_tooltip`,
-          selected: [
-            {
-              text: `${namespace}:option.3.selected`,
-            },
-          ],
-        })
-        .withPreOptionPhase(async () => {
-          // Do NOT await this, to prevent player from repeatedly pressing options
-          transitionMysteryEncounterIntroVisuals(false, false, 2000);
-        })
-        .withOptionPhase(async () => {
-          // Fire types help calm the Volcarona
-          const encounter = globalScene.currentBattle.mysteryEncounter!;
-          await transitionMysteryEncounterIntroVisuals();
-          setEncounterRewards(
-            { fillRemaining: true },
-            undefined,
-            () => {
-              giveLeadPokemonAttackTypeBoostItem();
-            });
-
-          const primary = encounter.options[2].primaryPokemon!;
-
-          setEncounterExp([ primary.id ], getPokemonSpecies(Species.VOLCARONA).baseExp * 2);
-          leaveEncounterWithoutBattle();
-        })
-        .build()
-    )
-    .build();
+        setEncounterExp([primary.id], getPokemonSpecies(Species.VOLCARONA).baseExp * 2);
+        leaveEncounterWithoutBattle();
+      })
+      .build(),
+  )
+  .build();
 
 function giveLeadPokemonAttackTypeBoostItem() {
   // Give first party pokemon attack type boost item for free at end of battle
@@ -266,7 +297,9 @@ function giveLeadPokemonAttackTypeBoostItem() {
     // Generate type booster held item, default to Charcoal if item fails to generate
     let boosterModifierType = generateModifierType(modifierTypes.ATTACK_TYPE_BOOSTER) as AttackTypeBoosterModifierType;
     if (!boosterModifierType) {
-      boosterModifierType = generateModifierType(modifierTypes.ATTACK_TYPE_BOOSTER, [ Type.FIRE ]) as AttackTypeBoosterModifierType;
+      boosterModifierType = generateModifierType(modifierTypes.ATTACK_TYPE_BOOSTER, [
+        PokemonType.FIRE,
+      ]) as AttackTypeBoosterModifierType;
     }
     applyModifierTypeToPlayerPokemon(leadPokemon, boosterModifierType);
 
diff --git a/src/data/mystery-encounters/encounters/fight-or-flight-encounter.ts b/src/data/mystery-encounters/encounters/fight-or-flight-encounter.ts
index 1667a15e7c9..ecc2e17a06f 100644
--- a/src/data/mystery-encounters/encounters/fight-or-flight-encounter.ts
+++ b/src/data/mystery-encounters/encounters/fight-or-flight-encounter.ts
@@ -1,18 +1,16 @@
 import { MysteryEncounterOptionBuilder } from "#app/data/mystery-encounters/mystery-encounter-option";
-import type {
-  EnemyPartyConfig } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
+import type { EnemyPartyConfig } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
 import {
   getRandomEncounterSpecies,
   initBattleWithEnemyConfig,
   leaveEncounterWithoutBattle,
   setEncounterExp,
-  setEncounterRewards
+  setEncounterRewards,
 } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
 import { STEALING_MOVES } from "#app/data/mystery-encounters/requirements/requirement-groups";
 import type Pokemon from "#app/field/pokemon";
 import { ModifierTier } from "#app/modifier/modifier-tier";
-import type {
-  ModifierTypeOption } from "#app/modifier/modifier-type";
+import type { ModifierTypeOption } from "#app/modifier/modifier-type";
 import {
   getPlayerModifierTypeOptions,
   ModifierPoolType,
@@ -25,13 +23,17 @@ import { MysteryEncounterBuilder } from "#app/data/mystery-encounters/mystery-en
 import { MoveRequirement } from "#app/data/mystery-encounters/mystery-encounter-requirements";
 import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
 import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
-import { getEncounterPokemonLevelForWave, getSpriteKeysFromPokemon, STANDARD_ENCOUNTER_BOOSTED_LEVEL_MODIFIER } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils";
+import {
+  getEncounterPokemonLevelForWave,
+  getSpriteKeysFromPokemon,
+  STANDARD_ENCOUNTER_BOOSTED_LEVEL_MODIFIER,
+} from "#app/data/mystery-encounters/utils/encounter-pokemon-utils";
 import PokemonData from "#app/system/pokemon-data";
 import { BattlerTagType } from "#enums/battler-tag-type";
 import { queueEncounterMessage } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils";
-import { randSeedInt } from "#app/utils";
+import { randSeedInt } from "#app/utils/common";
 import { StatStageChangePhase } from "#app/phases/stat-stage-change-phase";
-import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/game-mode";
+import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants";
 
 /** the i18n namespace for the encounter */
 const namespace = "mysteryEncounters/fightOrFlight";
@@ -41,152 +43,163 @@ const namespace = "mysteryEncounters/fightOrFlight";
  * @see {@link https://github.com/pagefaultgames/pokerogue/issues/3795 | GitHub Issue #3795}
  * @see For biome requirements check {@linkcode mysteryEncountersByBiome}
  */
-export const FightOrFlightEncounter: MysteryEncounter =
-  MysteryEncounterBuilder.withEncounterType(MysteryEncounterType.FIGHT_OR_FLIGHT)
-    .withEncounterTier(MysteryEncounterTier.COMMON)
-    .withSceneWaveRangeRequirement(...CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES)
-    .withCatchAllowed(true)
-    .withHideWildIntroMessage(true)
-    .withFleeAllowed(false)
-    .withIntroSpriteConfigs([]) // Set in onInit()
-    .withIntroDialogue([
-      {
-        text: `${namespace}:intro`,
-      },
-    ])
-    .withOnInit(() => {
-      const encounter = globalScene.currentBattle.mysteryEncounter!;
+export const FightOrFlightEncounter: MysteryEncounter = MysteryEncounterBuilder.withEncounterType(
+  MysteryEncounterType.FIGHT_OR_FLIGHT,
+)
+  .withEncounterTier(MysteryEncounterTier.COMMON)
+  .withSceneWaveRangeRequirement(...CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES)
+  .withCatchAllowed(true)
+  .withHideWildIntroMessage(true)
+  .withFleeAllowed(false)
+  .withIntroSpriteConfigs([]) // Set in onInit()
+  .withIntroDialogue([
+    {
+      text: `${namespace}:intro`,
+    },
+  ])
+  .withOnInit(() => {
+    const encounter = globalScene.currentBattle.mysteryEncounter!;
 
-      // Calculate boss mon
-      const level = getEncounterPokemonLevelForWave(STANDARD_ENCOUNTER_BOOSTED_LEVEL_MODIFIER);
-      const bossPokemon = getRandomEncounterSpecies(level, true);
-      encounter.setDialogueToken("enemyPokemon", bossPokemon.getNameToRender());
-      const config: EnemyPartyConfig = {
-        pokemonConfigs: [{
+    // Calculate boss mon
+    const level = getEncounterPokemonLevelForWave(STANDARD_ENCOUNTER_BOOSTED_LEVEL_MODIFIER);
+    const bossPokemon = getRandomEncounterSpecies(level, true);
+    encounter.setDialogueToken("enemyPokemon", bossPokemon.getNameToRender());
+    const config: EnemyPartyConfig = {
+      pokemonConfigs: [
+        {
           level: level,
           species: bossPokemon.species,
           dataSource: new PokemonData(bossPokemon),
           isBoss: true,
-          tags: [ BattlerTagType.MYSTERY_ENCOUNTER_POST_SUMMON ],
+          tags: [BattlerTagType.MYSTERY_ENCOUNTER_POST_SUMMON],
           mysteryEncounterBattleEffects: (pokemon: Pokemon) => {
             queueEncounterMessage(`${namespace}:option.1.stat_boost`);
             // Randomly boost 1 stat 2 stages
             // Cannot boost Spd, Acc, or Evasion
-            globalScene.unshiftPhase(new StatStageChangePhase(pokemon.getBattlerIndex(), true, [ randSeedInt(4, 1) ], 2));
-          }
-        }],
-      };
-      encounter.enemyPartyConfigs = [ config ];
-
-      // Calculate item
-      // Waves 10-40 GREAT, 60-120 ULTRA, 120-160 ROGUE, 160-180 MASTER
-      const tier =
-        globalScene.currentBattle.waveIndex > 160
-          ? ModifierTier.MASTER
-          : globalScene.currentBattle.waveIndex > 120
-            ? ModifierTier.ROGUE
-            : globalScene.currentBattle.waveIndex > 40
-              ? ModifierTier.ULTRA
-              : ModifierTier.GREAT;
-      regenerateModifierPoolThresholds(globalScene.getPlayerParty(), ModifierPoolType.PLAYER, 0);
-      let item: ModifierTypeOption | null = null;
-      // TMs and Candy Jar excluded from possible rewards as they're too swingy in value for a singular item reward
-      while (!item || item.type.id.includes("TM_") || item.type.id === "CANDY_JAR") {
-        item = getPlayerModifierTypeOptions(1, globalScene.getPlayerParty(), [], { guaranteedModifierTiers: [ tier ], allowLuckUpgrades: false })[0];
-      }
-      encounter.setDialogueToken("itemName", item.type.name);
-      encounter.misc = item;
-
-      const { spriteKey, fileRoot } = getSpriteKeysFromPokemon(bossPokemon);
-      encounter.spriteConfigs = [
-        {
-          spriteKey: item.type.iconImage,
-          fileRoot: "items",
-          hasShadow: false,
-          x: 35,
-          y: -5,
-          scale: 0.75,
-          isItem: true,
-          disableAnimation: true
+            globalScene.unshiftPhase(new StatStageChangePhase(pokemon.getBattlerIndex(), true, [randSeedInt(4, 1)], 2));
+          },
         },
-        {
-          spriteKey: spriteKey,
-          fileRoot: fileRoot,
-          hasShadow: true,
-          tint: 0.25,
-          x: -5,
-          repeat: true,
-          isPokemon: true,
-          isShiny: bossPokemon.shiny,
-          variant: bossPokemon.variant
-        },
-      ];
+      ],
+    };
+    encounter.enemyPartyConfigs = [config];
 
-      return true;
-    })
-    .setLocalizationKey(`${namespace}`)
-    .withTitle(`${namespace}:title`)
-    .withDescription(`${namespace}:description`)
-    .withQuery(`${namespace}:query`)
-    .withSimpleOption(
+    // Calculate item
+    // Waves 10-40 GREAT, 60-120 ULTRA, 120-160 ROGUE, 160-180 MASTER
+    const tier =
+      globalScene.currentBattle.waveIndex > 160
+        ? ModifierTier.MASTER
+        : globalScene.currentBattle.waveIndex > 120
+          ? ModifierTier.ROGUE
+          : globalScene.currentBattle.waveIndex > 40
+            ? ModifierTier.ULTRA
+            : ModifierTier.GREAT;
+    regenerateModifierPoolThresholds(globalScene.getPlayerParty(), ModifierPoolType.PLAYER, 0);
+    let item: ModifierTypeOption | null = null;
+    // TMs and Candy Jar excluded from possible rewards as they're too swingy in value for a singular item reward
+    while (!item || item.type.id.includes("TM_") || item.type.id === "CANDY_JAR") {
+      item = getPlayerModifierTypeOptions(1, globalScene.getPlayerParty(), [], {
+        guaranteedModifierTiers: [tier],
+        allowLuckUpgrades: false,
+      })[0];
+    }
+    encounter.setDialogueToken("itemName", item.type.name);
+    encounter.misc = item;
+
+    const { spriteKey, fileRoot } = getSpriteKeysFromPokemon(bossPokemon);
+    encounter.spriteConfigs = [
       {
-        buttonLabel: `${namespace}:option.1.label`,
-        buttonTooltip: `${namespace}:option.1.tooltip`,
+        spriteKey: item.type.iconImage,
+        fileRoot: "items",
+        hasShadow: false,
+        x: 35,
+        y: -5,
+        scale: 0.75,
+        isItem: true,
+        disableAnimation: true,
+      },
+      {
+        spriteKey: spriteKey,
+        fileRoot: fileRoot,
+        hasShadow: true,
+        tint: 0.25,
+        x: -5,
+        repeat: true,
+        isPokemon: true,
+        isShiny: bossPokemon.shiny,
+        variant: bossPokemon.variant,
+      },
+    ];
+
+    return true;
+  })
+  .setLocalizationKey(`${namespace}`)
+  .withTitle(`${namespace}:title`)
+  .withDescription(`${namespace}:description`)
+  .withQuery(`${namespace}:query`)
+  .withSimpleOption(
+    {
+      buttonLabel: `${namespace}:option.1.label`,
+      buttonTooltip: `${namespace}:option.1.tooltip`,
+      selected: [
+        {
+          text: `${namespace}:option.1.selected`,
+        },
+      ],
+    },
+    async () => {
+      // Pick battle
+      // Pokemon will randomly boost 1 stat by 2 stages
+      const item = globalScene.currentBattle.mysteryEncounter!.misc as ModifierTypeOption;
+      setEncounterRewards({
+        guaranteedModifierTypeOptions: [item],
+        fillRemaining: false,
+      });
+      await initBattleWithEnemyConfig(globalScene.currentBattle.mysteryEncounter!.enemyPartyConfigs[0]);
+    },
+  )
+  .withOption(
+    MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DISABLED_OR_SPECIAL)
+      .withPrimaryPokemonRequirement(new MoveRequirement(STEALING_MOVES, true)) // Will set option2PrimaryName and option2PrimaryMove dialogue tokens automatically
+      .withDialogue({
+        buttonLabel: `${namespace}:option.2.label`,
+        buttonTooltip: `${namespace}:option.2.tooltip`,
+        disabledButtonTooltip: `${namespace}:option.2.disabled_tooltip`,
         selected: [
           {
-            text: `${namespace}:option.1.selected`,
+            text: `${namespace}:option.2.selected`,
           },
         ],
-      },
-      async () => {
-        // Pick battle
-        // Pokemon will randomly boost 1 stat by 2 stages
+      })
+      .withOptionPhase(async () => {
+        // Pick steal
+        const encounter = globalScene.currentBattle.mysteryEncounter!;
         const item = globalScene.currentBattle.mysteryEncounter!.misc as ModifierTypeOption;
-        setEncounterRewards({ guaranteedModifierTypeOptions: [ item ], fillRemaining: false });
-        await initBattleWithEnemyConfig(globalScene.currentBattle.mysteryEncounter!.enemyPartyConfigs[0]);
-      }
-    )
-    .withOption(
-      MysteryEncounterOptionBuilder
-        .newOptionWithMode(MysteryEncounterOptionMode.DISABLED_OR_SPECIAL)
-        .withPrimaryPokemonRequirement(new MoveRequirement(STEALING_MOVES, true)) // Will set option2PrimaryName and option2PrimaryMove dialogue tokens automatically
-        .withDialogue({
-          buttonLabel: `${namespace}:option.2.label`,
-          buttonTooltip: `${namespace}:option.2.tooltip`,
-          disabledButtonTooltip: `${namespace}:option.2.disabled_tooltip`,
-          selected: [
-            {
-              text: `${namespace}:option.2.selected`
-            }
-          ]
-        })
-        .withOptionPhase(async () => {
-          // Pick steal
-          const encounter = globalScene.currentBattle.mysteryEncounter!;
-          const item = globalScene.currentBattle.mysteryEncounter!.misc as ModifierTypeOption;
-          setEncounterRewards({ guaranteedModifierTypeOptions: [ item ], fillRemaining: false });
+        setEncounterRewards({
+          guaranteedModifierTypeOptions: [item],
+          fillRemaining: false,
+        });
 
-          // Use primaryPokemon to execute the thievery
-          const primaryPokemon = encounter.options[1].primaryPokemon!;
-          setEncounterExp(primaryPokemon.id, encounter.enemyPartyConfigs[0].pokemonConfigs![0].species.baseExp);
-          leaveEncounterWithoutBattle();
-        })
-        .build()
-    )
-    .withSimpleOption(
-      {
-        buttonLabel: `${namespace}:option.3.label`,
-        buttonTooltip: `${namespace}:option.3.tooltip`,
-        selected: [
-          {
-            text: `${namespace}:option.3.selected`,
-          },
-        ],
-      },
-      async () => {
-        // Leave encounter with no rewards or exp
-        leaveEncounterWithoutBattle(true);
-        return true;
-      }
-    )
-    .build();
+        // Use primaryPokemon to execute the thievery
+        const primaryPokemon = encounter.options[1].primaryPokemon!;
+        setEncounterExp(primaryPokemon.id, encounter.enemyPartyConfigs[0].pokemonConfigs![0].species.baseExp);
+        leaveEncounterWithoutBattle();
+      })
+      .build(),
+  )
+  .withSimpleOption(
+    {
+      buttonLabel: `${namespace}:option.3.label`,
+      buttonTooltip: `${namespace}:option.3.tooltip`,
+      selected: [
+        {
+          text: `${namespace}:option.3.selected`,
+        },
+      ],
+    },
+    async () => {
+      // Leave encounter with no rewards or exp
+      leaveEncounterWithoutBattle(true);
+      return true;
+    },
+  )
+  .build();
diff --git a/src/data/mystery-encounters/encounters/fun-and-games-encounter.ts b/src/data/mystery-encounters/encounters/fun-and-games-encounter.ts
index 53f89069491..2d0828b8c0c 100644
--- a/src/data/mystery-encounters/encounters/fun-and-games-encounter.ts
+++ b/src/data/mystery-encounters/encounters/fun-and-games-encounter.ts
@@ -1,10 +1,16 @@
-import { leaveEncounterWithoutBattle, selectPokemonForOption, setEncounterRewards, transitionMysteryEncounterIntroVisuals, updatePlayerMoney, } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
+import {
+  leaveEncounterWithoutBattle,
+  selectPokemonForOption,
+  setEncounterRewards,
+  transitionMysteryEncounterIntroVisuals,
+  updatePlayerMoney,
+} from "#app/data/mystery-encounters/utils/encounter-phase-utils";
 import { MysteryEncounterType } from "#enums/mystery-encounter-type";
 import { globalScene } from "#app/global-scene";
 import type MysteryEncounter from "#app/data/mystery-encounters/mystery-encounter";
 import { MysteryEncounterBuilder } from "#app/data/mystery-encounters/mystery-encounter";
 import { MysteryEncounterOptionBuilder } from "#app/data/mystery-encounters/mystery-encounter-option";
-import { TrainerSlot } from "#app/data/trainer-config";
+import { TrainerSlot } from "#enums/trainer-slot";
 import type { PlayerPokemon } from "#app/field/pokemon";
 import type Pokemon from "#app/field/pokemon";
 import { FieldPosition } from "#app/field/pokemon";
@@ -24,7 +30,7 @@ import { SpeciesFormChangeActiveTrigger } from "#app/data/pokemon-forms";
 import { PostSummonPhase } from "#app/phases/post-summon-phase";
 import { modifierTypes } from "#app/modifier/modifier-type";
 import { Nature } from "#enums/nature";
-import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/game-mode";
+import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants";
 import { isPokemonValidForEncounterOptionSelection } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils";
 
 /** the i18n namespace for the encounter */
@@ -35,66 +41,65 @@ const namespace = "mysteryEncounters/funAndGames";
  * @see {@link https://github.com/pagefaultgames/pokerogue/issues/3819 | GitHub Issue #3819}
  * @see For biome requirements check {@linkcode mysteryEncountersByBiome}
  */
-export const FunAndGamesEncounter: MysteryEncounter =
-  MysteryEncounterBuilder.withEncounterType(MysteryEncounterType.FUN_AND_GAMES)
-    .withEncounterTier(MysteryEncounterTier.GREAT)
-    .withSceneWaveRangeRequirement(...CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES)
-    .withSceneRequirement(new MoneyRequirement(0, 1.5)) // Cost equal to 1 Max Potion to play
-    .withAutoHideIntroVisuals(false)
-    // Allows using move without a visible enemy pokemon
-    .withBattleAnimationsWithoutTargets(true)
-    // The Wobbuffet won't use moves
-    .withSkipEnemyBattleTurns(true)
-    // Will skip COMMAND selection menu and go straight to FIGHT (move select) menu
-    .withSkipToFightInput(true)
-    .withFleeAllowed(false)
-    .withIntroSpriteConfigs([
-      {
-        spriteKey: "fun_and_games_game",
-        fileRoot: "mystery-encounters",
-        hasShadow: false,
-        x: 0,
-        y: 6,
-      },
-      {
-        spriteKey: "fun_and_games_wobbuffet",
-        fileRoot: "mystery-encounters",
-        hasShadow: true,
-        x: -28,
-        y: 6,
-        yShadow: 6
-      },
-      {
-        spriteKey: "fun_and_games_man",
-        fileRoot: "mystery-encounters",
-        hasShadow: true,
-        x: 40,
-        y: 6,
-        yShadow: 6
-      },
-    ])
-    .withIntroDialogue([
-      {
-        speaker: `${namespace}:speaker`,
-        text: `${namespace}:intro_dialogue`,
-      },
-    ])
-    .setLocalizationKey(`${namespace}`)
-    .withTitle(`${namespace}:title`)
-    .withDescription(`${namespace}:description`)
-    .withQuery(`${namespace}:query`)
-    .withOnInit(() => {
-      const encounter = globalScene.currentBattle.mysteryEncounter!;
-      globalScene.loadBgm("mystery_encounter_fun_and_games", "mystery_encounter_fun_and_games.mp3");
-      encounter.setDialogueToken("wobbuffetName", getPokemonSpecies(Species.WOBBUFFET).getName());
-      return true;
-    })
-    .withOnVisualsStart(() => {
-      globalScene.fadeAndSwitchBgm("mystery_encounter_fun_and_games");
-      return true;
-    })
-    .withOption(MysteryEncounterOptionBuilder
-      .newOptionWithMode(MysteryEncounterOptionMode.DISABLED_OR_DEFAULT)
+export const FunAndGamesEncounter: MysteryEncounter = MysteryEncounterBuilder.withEncounterType(
+  MysteryEncounterType.FUN_AND_GAMES,
+)
+  .withEncounterTier(MysteryEncounterTier.GREAT)
+  .withSceneWaveRangeRequirement(...CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES)
+  .withSceneRequirement(new MoneyRequirement(0, 1.5)) // Cost equal to 1 Max Potion to play
+  .withAutoHideIntroVisuals(false)
+  // The Wobbuffet won't use moves
+  .withSkipEnemyBattleTurns(true)
+  // Will skip COMMAND selection menu and go straight to FIGHT (move select) menu
+  .withSkipToFightInput(true)
+  .withFleeAllowed(false)
+  .withIntroSpriteConfigs([
+    {
+      spriteKey: "fun_and_games_game",
+      fileRoot: "mystery-encounters",
+      hasShadow: false,
+      x: 0,
+      y: 6,
+    },
+    {
+      spriteKey: "fun_and_games_wobbuffet",
+      fileRoot: "mystery-encounters",
+      hasShadow: true,
+      x: -28,
+      y: 6,
+      yShadow: 6,
+    },
+    {
+      spriteKey: "fun_and_games_man",
+      fileRoot: "mystery-encounters",
+      hasShadow: true,
+      x: 40,
+      y: 6,
+      yShadow: 6,
+    },
+  ])
+  .withIntroDialogue([
+    {
+      speaker: `${namespace}:speaker`,
+      text: `${namespace}:intro_dialogue`,
+    },
+  ])
+  .setLocalizationKey(`${namespace}`)
+  .withTitle(`${namespace}:title`)
+  .withDescription(`${namespace}:description`)
+  .withQuery(`${namespace}:query`)
+  .withOnInit(() => {
+    const encounter = globalScene.currentBattle.mysteryEncounter!;
+    globalScene.loadBgm("mystery_encounter_fun_and_games", "mystery_encounter_fun_and_games.mp3");
+    encounter.setDialogueToken("wobbuffetName", getPokemonSpecies(Species.WOBBUFFET).getName());
+    return true;
+  })
+  .withOnVisualsStart(() => {
+    globalScene.fadeAndSwitchBgm("mystery_encounter_fun_and_games");
+    return true;
+  })
+  .withOption(
+    MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DISABLED_OR_DEFAULT)
       .withSceneRequirement(new MoneyRequirement(0, 1.5)) // Cost equal to 1 Max Potion
       .withDialogue({
         buttonLabel: `${namespace}:option.1.label`,
@@ -129,7 +134,11 @@ export const FunAndGamesEncounter: MysteryEncounter =
         // Update money
         const moneyCost = (encounter.options[0].requirements[0] as MoneyRequirement).requiredMoney;
         updatePlayerMoney(-moneyCost, true, false);
-        await showEncounterText(i18next.t("mysteryEncounterMessages:paid_money", { amount: moneyCost }));
+        await showEncounterText(
+          i18next.t("mysteryEncounterMessages:paid_money", {
+            amount: moneyCost,
+          }),
+        );
 
         // Handlers for battle events
         encounter.onTurnStart = handleNextTurn; // triggered during TurnInitPhase
@@ -141,28 +150,29 @@ export const FunAndGamesEncounter: MysteryEncounter =
 
         return true;
       })
-      .build()
-    )
-    .withSimpleOption(
-      {
-        buttonLabel: `${namespace}:option.2.label`,
-        buttonTooltip: `${namespace}:option.2.tooltip`,
-        selected: [
-          {
-            text: `${namespace}:option.2.selected`,
-          },
-        ],
-      },
-      async () => {
-        // Leave encounter with no rewards or exp
-        await transitionMysteryEncounterIntroVisuals(true, true);
-        leaveEncounterWithoutBattle(true);
-        return true;
-      }
-    )
-    .build();
+      .build(),
+  )
+  .withSimpleOption(
+    {
+      buttonLabel: `${namespace}:option.2.label`,
+      buttonTooltip: `${namespace}:option.2.tooltip`,
+      selected: [
+        {
+          text: `${namespace}:option.2.selected`,
+        },
+      ],
+    },
+    async () => {
+      // Leave encounter with no rewards or exp
+      await transitionMysteryEncounterIntroVisuals(true, true);
+      leaveEncounterWithoutBattle(true);
+      return true;
+    },
+  )
+  .build();
 
 async function summonPlayerPokemon() {
+  // biome-ignore lint/suspicious/noAsyncPromiseExecutor: TODO: Consider refactoring to avoid async promise executor
   return new Promise<void>(async resolve => {
     const encounter = globalScene.currentBattle.mysteryEncounter!;
 
@@ -178,9 +188,15 @@ async function summonPlayerPokemon() {
 
     // Do trainer summon animation
     let playerAnimationPromise: Promise<void> | undefined;
-    globalScene.ui.showText(i18next.t("battle:playerGo", { pokemonName: getPokemonNameWithAffix(playerPokemon) }));
+    globalScene.ui.showText(
+      i18next.t("battle:playerGo", {
+        pokemonName: getPokemonNameWithAffix(playerPokemon),
+      }),
+    );
     globalScene.pbTray.hide();
-    globalScene.trainer.setTexture(`trainer_${globalScene.gameData.gender === PlayerGender.FEMALE ? "f" : "m"}_back_pb`);
+    globalScene.trainer.setTexture(
+      `trainer_${globalScene.gameData.gender === PlayerGender.FEMALE ? "f" : "m"}_back_pb`,
+    );
     globalScene.time.delayedCall(562, () => {
       globalScene.trainer.setFrame("2");
       globalScene.time.delayedCall(64, () => {
@@ -191,7 +207,7 @@ async function summonPlayerPokemon() {
       targets: globalScene.trainer,
       x: -36,
       duration: 1000,
-      onComplete: () => globalScene.trainer.setVisible(false)
+      onComplete: () => globalScene.trainer.setVisible(false),
     });
     globalScene.time.delayedCall(750, () => {
       playerAnimationPromise = summonPlayerPokemonAnimation(playerPokemon);
@@ -200,8 +216,14 @@ async function summonPlayerPokemon() {
     // Also loads Wobbuffet data (cannot be shiny)
     const enemySpecies = getPokemonSpecies(Species.WOBBUFFET);
     globalScene.currentBattle.enemyParty = [];
-    const wobbuffet = globalScene.addEnemyPokemon(enemySpecies, encounter.misc.playerPokemon.level, TrainerSlot.NONE, false, true);
-    wobbuffet.ivs = [ 0, 0, 0, 0, 0, 0 ];
+    const wobbuffet = globalScene.addEnemyPokemon(
+      enemySpecies,
+      encounter.misc.playerPokemon.level,
+      TrainerSlot.NONE,
+      false,
+      true,
+    );
+    wobbuffet.ivs = [0, 0, 0, 0, 0, 0];
     wobbuffet.setNature(Nature.MILD);
     wobbuffet.setAlpha(0);
     wobbuffet.setVisible(false);
@@ -221,6 +243,7 @@ async function summonPlayerPokemon() {
 }
 
 function handleLoseMinigame() {
+  // biome-ignore lint/suspicious/noAsyncPromiseExecutor: TODO: Consider refactoring to avoid async promise executor
   return new Promise<void>(async resolve => {
     // Check Wobbuffet is still alive
     const wobbuffet = globalScene.getEnemyPokemon();
@@ -260,15 +283,24 @@ function handleNextTurn() {
     let isHealPhase = false;
     if (healthRatio < 0.03) {
       // Grand prize
-      setEncounterRewards({ guaranteedModifierTypeFuncs: [ modifierTypes.MULTI_LENS ], fillRemaining: false });
+      setEncounterRewards({
+        guaranteedModifierTypeFuncs: [modifierTypes.MULTI_LENS],
+        fillRemaining: false,
+      });
       resultMessageKey = `${namespace}:best_result`;
     } else if (healthRatio < 0.15) {
       // 2nd prize
-      setEncounterRewards({ guaranteedModifierTypeFuncs: [ modifierTypes.SCOPE_LENS ], fillRemaining: false });
+      setEncounterRewards({
+        guaranteedModifierTypeFuncs: [modifierTypes.SCOPE_LENS],
+        fillRemaining: false,
+      });
       resultMessageKey = `${namespace}:great_result`;
     } else if (healthRatio < 0.33) {
       // 3rd prize
-      setEncounterRewards({ guaranteedModifierTypeFuncs: [ modifierTypes.WIDE_LENS ], fillRemaining: false });
+      setEncounterRewards({
+        guaranteedModifierTypeFuncs: [modifierTypes.WIDE_LENS],
+        fillRemaining: false,
+      });
       resultMessageKey = `${namespace}:good_result`;
     } else {
       // No prize
@@ -288,14 +320,13 @@ function handleNextTurn() {
 
     // Skip remainder of TurnInitPhase
     return true;
-  } else {
-    if (encounter.misc.turnsRemaining < 3) {
-      // Display charging messages on turns that aren't the initial turn
-      queueEncounterMessage(`${namespace}:charging_continue`);
-    }
-    queueEncounterMessage(`${namespace}:turn_remaining_${encounter.misc.turnsRemaining}`);
-    encounter.misc.turnsRemaining--;
   }
+  if (encounter.misc.turnsRemaining < 3) {
+    // Display charging messages on turns that aren't the initial turn
+    queueEncounterMessage(`${namespace}:charging_continue`);
+  }
+  queueEncounterMessage(`${namespace}:turn_remaining_${encounter.misc.turnsRemaining}`);
+  encounter.misc.turnsRemaining--;
 
   // Don't skip remainder of TurnInitPhase
   return false;
@@ -338,7 +369,7 @@ function summonPlayerPokemonAnimation(pokemon: PlayerPokemon): Promise<void> {
     globalScene.tweens.add({
       targets: pokeball,
       duration: 650,
-      x: 100 + fpOffset[0]
+      x: 100 + fpOffset[0],
     });
 
     globalScene.tweens.add({
@@ -389,11 +420,11 @@ function summonPlayerPokemonAnimation(pokemon: PlayerPokemon): Promise<void> {
                   globalScene.pushPhase(new PostSummonPhase(pokemon.getBattlerIndex()));
                   resolve();
                 });
-              }
+              },
             });
-          }
+          },
         });
-      }
+      },
     });
   });
 }
@@ -410,14 +441,14 @@ function hideShowmanIntroSprite() {
     y: "-=16",
     alpha: 0,
     ease: "Sine.easeInOut",
-    duration: 750
+    duration: 750,
   });
 
   // Slide the Wobbuffet and Game over slightly
   globalScene.tweens.add({
-    targets: [ wobbuffet, carnivalGame ],
+    targets: [wobbuffet, carnivalGame],
     x: "+=16",
     ease: "Sine.easeInOut",
-    duration: 750
+    duration: 750,
   });
 }
diff --git a/src/data/mystery-encounters/encounters/global-trade-system-encounter.ts b/src/data/mystery-encounters/encounters/global-trade-system-encounter.ts
index 65bbab16603..bb41bc7883c 100644
--- a/src/data/mystery-encounters/encounters/global-trade-system-encounter.ts
+++ b/src/data/mystery-encounters/encounters/global-trade-system-encounter.ts
@@ -1,9 +1,17 @@
-import { leaveEncounterWithoutBattle, selectPokemonForOption, setEncounterRewards } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
-import { TrainerSlot, } from "#app/data/trainer-config";
+import {
+  leaveEncounterWithoutBattle,
+  selectPokemonForOption,
+  setEncounterRewards,
+} from "#app/data/mystery-encounters/utils/encounter-phase-utils";
+import { TrainerSlot } from "#enums/trainer-slot";
 import { ModifierTier } from "#app/modifier/modifier-tier";
 import { MusicPreference } from "#app/system/settings/settings";
 import type { ModifierTypeOption } from "#app/modifier/modifier-type";
-import { getPlayerModifierTypeOptions, ModifierPoolType, regenerateModifierPoolThresholds } from "#app/modifier/modifier-type";
+import {
+  getPlayerModifierTypeOptions,
+  ModifierPoolType,
+  regenerateModifierPoolThresholds,
+} from "#app/modifier/modifier-type";
 import { MysteryEncounterType } from "#enums/mystery-encounter-type";
 import { globalScene } from "#app/global-scene";
 import type MysteryEncounter from "#app/data/mystery-encounters/mystery-encounter";
@@ -15,12 +23,24 @@ import { allSpecies, getPokemonSpecies } from "#app/data/pokemon-species";
 import { getTypeRgb } from "#app/data/type";
 import { MysteryEncounterOptionBuilder } from "#app/data/mystery-encounters/mystery-encounter-option";
 import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
-import { NumberHolder, isNullOrUndefined, randInt, randSeedInt, randSeedShuffle } from "#app/utils";
+import {
+  NumberHolder,
+  isNullOrUndefined,
+  randInt,
+  randSeedInt,
+  randSeedShuffle,
+  randSeedItem,
+} from "#app/utils/common";
 import type { PlayerPokemon } from "#app/field/pokemon";
 import type Pokemon from "#app/field/pokemon";
 import { EnemyPokemon, PokemonMove } from "#app/field/pokemon";
 import type { PokemonHeldItemModifier } from "#app/modifier/modifier";
-import { HiddenAbilityRateBoosterModifier, PokemonFormChangeItemModifier, ShinyRateBoosterModifier, SpeciesStatBoosterModifier } from "#app/modifier/modifier";
+import {
+  HiddenAbilityRateBoosterModifier,
+  PokemonFormChangeItemModifier,
+  ShinyRateBoosterModifier,
+  SpeciesStatBoosterModifier,
+} from "#app/modifier/modifier";
 import type { OptionSelectItem } from "#app/ui/abstact-option-select-ui-handler";
 import PokemonData from "#app/system/pokemon-data";
 import i18next from "i18next";
@@ -28,11 +48,12 @@ import { Gender, getGenderSymbol } from "#app/data/gender";
 import { getNatureName } from "#app/data/nature";
 import { getPokeballAtlasKey, getPokeballTintColor } from "#app/data/pokeball";
 import { getEncounterText, showEncounterText } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils";
-import { trainerNamePools } from "#app/data/trainer-names";
-import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/game-mode";
+import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants";
 import { addPokemonDataToDexAndValidateAchievements } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils";
 import type { PokeballType } from "#enums/pokeball";
 import { doShinySparkleAnim } from "#app/field/anims";
+import { TrainerType } from "#enums/trainer-type";
+import { timedEventManager } from "#app/global-event-manager";
 
 /** the i18n namespace for the encounter */
 const namespace = "mysteryEncounters/globalTradeSystem";
@@ -43,15 +64,15 @@ const WONDER_TRADE_SHINY_CHANCE = 512;
 const MAX_WONDER_TRADE_SHINY_CHANCE = 4096;
 
 const LEGENDARY_TRADE_POOLS = {
-  1: [ Species.RATTATA, Species.PIDGEY, Species.WEEDLE ],
-  2: [ Species.SENTRET, Species.HOOTHOOT, Species.LEDYBA ],
-  3: [ Species.POOCHYENA, Species.ZIGZAGOON, Species.TAILLOW ],
-  4: [ Species.BIDOOF, Species.STARLY, Species.KRICKETOT ],
-  5: [ Species.PATRAT, Species.PURRLOIN, Species.PIDOVE ],
-  6: [ Species.BUNNELBY, Species.LITLEO, Species.SCATTERBUG ],
-  7: [ Species.PIKIPEK, Species.YUNGOOS, Species.ROCKRUFF ],
-  8: [ Species.SKWOVET, Species.WOOLOO, Species.ROOKIDEE ],
-  9: [ Species.LECHONK, Species.FIDOUGH, Species.TAROUNTULA ]
+  1: [Species.RATTATA, Species.PIDGEY, Species.WEEDLE],
+  2: [Species.SENTRET, Species.HOOTHOOT, Species.LEDYBA],
+  3: [Species.POOCHYENA, Species.ZIGZAGOON, Species.TAILLOW],
+  4: [Species.BIDOOF, Species.STARLY, Species.KRICKETOT],
+  5: [Species.PATRAT, Species.PURRLOIN, Species.PIDOVE],
+  6: [Species.BUNNELBY, Species.LITLEO, Species.SCATTERBUG],
+  7: [Species.PIKIPEK, Species.YUNGOOS, Species.ROCKRUFF],
+  8: [Species.SKWOVET, Species.WOOLOO, Species.ROOKIDEE],
+  9: [Species.LECHONK, Species.FIDOUGH, Species.TAROUNTULA],
 };
 
 /** Exclude Paradox mons as they aren't considered legendary/mythical */
@@ -75,7 +96,7 @@ const EXCLUDED_TRADE_SPECIES = [
   Species.IRON_VALIANT,
   Species.IRON_LEAVES,
   Species.IRON_BOULDER,
-  Species.IRON_CROWN
+  Species.IRON_CROWN,
 ];
 
 /**
@@ -83,363 +104,405 @@ const EXCLUDED_TRADE_SPECIES = [
  * @see {@link https://github.com/pagefaultgames/pokerogue/issues/3812 | GitHub Issue #3812}
  * @see For biome requirements check {@linkcode mysteryEncountersByBiome}
  */
-export const GlobalTradeSystemEncounter: MysteryEncounter =
-  MysteryEncounterBuilder.withEncounterType(MysteryEncounterType.GLOBAL_TRADE_SYSTEM)
-    .withEncounterTier(MysteryEncounterTier.COMMON)
-    .withSceneWaveRangeRequirement(...CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES)
-    .withAutoHideIntroVisuals(false)
-    .withIntroSpriteConfigs([
-      {
-        spriteKey: "global_trade_system",
-        fileRoot: "mystery-encounters",
-        hasShadow: true,
-        disableAnimation: true,
-        x: 3,
-        y: 5,
-        yShadow: 1
-      }
-    ])
-    .withIntroDialogue([
-      {
-        text: `${namespace}:intro`,
-      }
-    ])
-    .setLocalizationKey(`${namespace}`)
-    .withTitle(`${namespace}:title`)
-    .withDescription(`${namespace}:description`)
-    .withQuery(`${namespace}:query`)
-    .withOnInit(() => {
-      const encounter = globalScene.currentBattle.mysteryEncounter!;
+export const GlobalTradeSystemEncounter: MysteryEncounter = MysteryEncounterBuilder.withEncounterType(
+  MysteryEncounterType.GLOBAL_TRADE_SYSTEM,
+)
+  .withEncounterTier(MysteryEncounterTier.COMMON)
+  .withSceneWaveRangeRequirement(...CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES)
+  .withAutoHideIntroVisuals(false)
+  .withIntroSpriteConfigs([
+    {
+      spriteKey: "global_trade_system",
+      fileRoot: "mystery-encounters",
+      hasShadow: true,
+      disableAnimation: true,
+      x: 3,
+      y: 5,
+      yShadow: 1,
+    },
+  ])
+  .withIntroDialogue([
+    {
+      text: `${namespace}:intro`,
+    },
+  ])
+  .setLocalizationKey(`${namespace}`)
+  .withTitle(`${namespace}:title`)
+  .withDescription(`${namespace}:description`)
+  .withQuery(`${namespace}:query`)
+  .withOnInit(() => {
+    const encounter = globalScene.currentBattle.mysteryEncounter!;
 
-      // Load bgm
-      let bgmKey: string;
-      if (globalScene.musicPreference === MusicPreference.GENFIVE) {
-        bgmKey = "mystery_encounter_gen_5_gts";
-        globalScene.loadBgm(bgmKey, `${bgmKey}.mp3`);
-      } else {
-        // Mixed option
-        bgmKey = "mystery_encounter_gen_6_gts";
-        globalScene.loadBgm(bgmKey, `${bgmKey}.mp3`);
-      }
+    // Load bgm
+    let bgmKey: string;
+    if (globalScene.musicPreference === MusicPreference.GENFIVE) {
+      bgmKey = "mystery_encounter_gen_5_gts";
+      globalScene.loadBgm(bgmKey, `${bgmKey}.mp3`);
+    } else {
+      // Mixed option
+      bgmKey = "mystery_encounter_gen_6_gts";
+      globalScene.loadBgm(bgmKey, `${bgmKey}.mp3`);
+    }
 
-      // Load possible trade options
-      // Maps current party member's id to 3 EnemyPokemon objects
-      // None of the trade options can be the same species
-      const tradeOptionsMap: Map<number, EnemyPokemon[]> = getPokemonTradeOptions();
-      encounter.misc = {
-        tradeOptionsMap,
-        bgmKey
-      };
+    // Load possible trade options
+    // Maps current party member's id to 3 EnemyPokemon objects
+    // None of the trade options can be the same species
+    const tradeOptionsMap: Map<number, EnemyPokemon[]> = getPokemonTradeOptions();
+    encounter.misc = {
+      tradeOptionsMap,
+      bgmKey,
+    };
 
-      return true;
-    })
-    .withOnVisualsStart(() => {
-      globalScene.fadeAndSwitchBgm(globalScene.currentBattle.mysteryEncounter!.misc.bgmKey);
-      return true;
-    })
-    .withOption(
-      MysteryEncounterOptionBuilder
-        .newOptionWithMode(MysteryEncounterOptionMode.DEFAULT)
-        .withHasDexProgress(true)
-        .withDialogue({
-          buttonLabel: `${namespace}:option.1.label`,
-          buttonTooltip: `${namespace}:option.1.tooltip`,
-          secondOptionPrompt: `${namespace}:option.1.trade_options_prompt`,
-        })
-        .withPreOptionPhase(async (): Promise<boolean> => {
-          const encounter = globalScene.currentBattle.mysteryEncounter!;
-          const onPokemonSelected = (pokemon: PlayerPokemon) => {
-            // Get the trade species options for the selected pokemon
-            const tradeOptionsMap: Map<number, EnemyPokemon[]> = encounter.misc.tradeOptionsMap;
-            const tradeOptions = tradeOptionsMap.get(pokemon.id);
-            if (!tradeOptions) {
-              return [];
-            }
-
-            return tradeOptions.map((tradePokemon: EnemyPokemon) => {
-              const option: OptionSelectItem = {
-                label: tradePokemon.getNameToRender(),
-                handler: () => {
-                  // Pokemon trade selected
-                  encounter.setDialogueToken("tradedPokemon", pokemon.getNameToRender());
-                  encounter.setDialogueToken("received", tradePokemon.getNameToRender());
-                  encounter.misc.tradedPokemon = pokemon;
-                  encounter.misc.receivedPokemon = tradePokemon;
-                  return true;
-                },
-                onHover: () => {
-                  const formName = tradePokemon.species.forms && tradePokemon.species.forms.length > tradePokemon.formIndex ? tradePokemon.species.forms[tradePokemon.formIndex].formName : null;
-                  const line1 = i18next.t("pokemonInfoContainer:ability") + " " + tradePokemon.getAbility().name + (tradePokemon.getGender() !== Gender.GENDERLESS ? "     |     " + i18next.t("pokemonInfoContainer:gender") + " " + getGenderSymbol(tradePokemon.getGender()) : "");
-                  const line2 = i18next.t("pokemonInfoContainer:nature") + " " + getNatureName(tradePokemon.getNature()) + (formName ? "     |     " + i18next.t("pokemonInfoContainer:form") + " " + formName : "");
-                  showEncounterText(`${line1}\n${line2}`, 0, 0, false);
-                },
-              };
-              return option;
-            });
-          };
-
-          return selectPokemonForOption(onPokemonSelected);
-        })
-        .withOptionPhase(async () => {
-          const encounter = globalScene.currentBattle.mysteryEncounter!;
-          const tradedPokemon: PlayerPokemon = encounter.misc.tradedPokemon;
-          const receivedPokemonData: EnemyPokemon = encounter.misc.receivedPokemon;
-          const modifiers = tradedPokemon.getHeldItems().filter(m => !(m instanceof PokemonFormChangeItemModifier) && !(m instanceof SpeciesStatBoosterModifier));
-
-          // Generate a trainer name
-          const traderName = generateRandomTraderName();
-          encounter.setDialogueToken("tradeTrainerName", traderName.trim());
-
-          // Remove the original party member from party
-          globalScene.removePokemonFromPlayerParty(tradedPokemon, false);
-
-          // Set data properly, then generate the new Pokemon's assets
-          receivedPokemonData.passive = tradedPokemon.passive;
-          // Pokeball to Ultra ball, randomly
-          receivedPokemonData.pokeball = randInt(4) as PokeballType;
-          const dataSource = new PokemonData(receivedPokemonData);
-          const newPlayerPokemon = globalScene.addPlayerPokemon(receivedPokemonData.species, receivedPokemonData.level, dataSource.abilityIndex, dataSource.formIndex, dataSource.gender, dataSource.shiny, dataSource.variant, dataSource.ivs, dataSource.nature, dataSource);
-          globalScene.getPlayerParty().push(newPlayerPokemon);
-          await newPlayerPokemon.loadAssets();
-
-          for (const mod of modifiers) {
-            mod.pokemonId = newPlayerPokemon.id;
-            globalScene.addModifier(mod, true, false, false, true);
+    return true;
+  })
+  .withOnVisualsStart(() => {
+    globalScene.fadeAndSwitchBgm(globalScene.currentBattle.mysteryEncounter!.misc.bgmKey);
+    return true;
+  })
+  .withOption(
+    MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DEFAULT)
+      .withHasDexProgress(true)
+      .withDialogue({
+        buttonLabel: `${namespace}:option.1.label`,
+        buttonTooltip: `${namespace}:option.1.tooltip`,
+        secondOptionPrompt: `${namespace}:option.1.trade_options_prompt`,
+      })
+      .withPreOptionPhase(async (): Promise<boolean> => {
+        const encounter = globalScene.currentBattle.mysteryEncounter!;
+        const onPokemonSelected = (pokemon: PlayerPokemon) => {
+          // Get the trade species options for the selected pokemon
+          const tradeOptionsMap: Map<number, EnemyPokemon[]> = encounter.misc.tradeOptionsMap;
+          const tradeOptions = tradeOptionsMap.get(pokemon.id);
+          if (!tradeOptions) {
+            return [];
           }
 
-          // Show the trade animation
-          await showTradeBackground();
-          await doPokemonTradeSequence(tradedPokemon, newPlayerPokemon);
-          await showEncounterText(`${namespace}:trade_received`, null, 0, true, 4000);
-          globalScene.playBgm(encounter.misc.bgmKey);
-          await addPokemonDataToDexAndValidateAchievements(newPlayerPokemon);
-          await hideTradeBackground();
-          tradedPokemon.destroy();
+          return tradeOptions.map((tradePokemon: EnemyPokemon) => {
+            const option: OptionSelectItem = {
+              label: tradePokemon.getNameToRender(),
+              handler: () => {
+                // Pokemon trade selected
+                encounter.setDialogueToken("tradedPokemon", pokemon.getNameToRender());
+                encounter.setDialogueToken("received", tradePokemon.getNameToRender());
+                encounter.misc.tradedPokemon = pokemon;
+                encounter.misc.receivedPokemon = tradePokemon;
+                return true;
+              },
+              onHover: () => {
+                const formName =
+                  tradePokemon.species.forms && tradePokemon.species.forms.length > tradePokemon.formIndex
+                    ? tradePokemon.species.forms[tradePokemon.formIndex].formName
+                    : null;
+                const line1 = `${i18next.t("pokemonInfoContainer:ability")} ${tradePokemon.getAbility().name}${
+                  tradePokemon.getGender() !== Gender.GENDERLESS
+                    ? `     |     ${i18next.t("pokemonInfoContainer:gender")} ${getGenderSymbol(tradePokemon.getGender())}`
+                    : ""
+                }`;
+                const line2 =
+                  i18next.t("pokemonInfoContainer:nature") +
+                  " " +
+                  getNatureName(tradePokemon.getNature()) +
+                  (formName ? `     |     ${i18next.t("pokemonInfoContainer:form")} ${formName}` : "");
+                showEncounterText(`${line1}\n${line2}`, 0, 0, false);
+              },
+            };
+            return option;
+          });
+        };
 
-          leaveEncounterWithoutBattle(true);
-        })
-        .build()
-    )
-    .withOption(
-      MysteryEncounterOptionBuilder
-        .newOptionWithMode(MysteryEncounterOptionMode.DEFAULT)
-        .withHasDexProgress(true)
-        .withDialogue({
-          buttonLabel: `${namespace}:option.2.label`,
-          buttonTooltip: `${namespace}:option.2.tooltip`,
-        })
-        .withPreOptionPhase(async (): Promise<boolean> => {
-          const encounter = globalScene.currentBattle.mysteryEncounter!;
-          const onPokemonSelected = (pokemon: PlayerPokemon) => {
-            // Randomly generate a Wonder Trade pokemon
-            const randomTradeOption = generateTradeOption(globalScene.getPlayerParty().map(p => p.species));
-            const tradePokemon = new EnemyPokemon(randomTradeOption, pokemon.level, TrainerSlot.NONE, false);
-            // Extra shiny roll at 1/128 odds (boosted by events and charms)
-            if (!tradePokemon.shiny) {
-              const shinyThreshold = new NumberHolder(WONDER_TRADE_SHINY_CHANCE);
-              if (globalScene.eventManager.isEventActive()) {
-                shinyThreshold.value *= globalScene.eventManager.getShinyMultiplier();
-              }
-              globalScene.applyModifiers(ShinyRateBoosterModifier, true, shinyThreshold);
+        return selectPokemonForOption(onPokemonSelected);
+      })
+      .withOptionPhase(async () => {
+        const encounter = globalScene.currentBattle.mysteryEncounter!;
+        const tradedPokemon: PlayerPokemon = encounter.misc.tradedPokemon;
+        const receivedPokemonData: EnemyPokemon = encounter.misc.receivedPokemon;
+        const modifiers = tradedPokemon
+          .getHeldItems()
+          .filter(m => !(m instanceof PokemonFormChangeItemModifier) && !(m instanceof SpeciesStatBoosterModifier));
 
-              // Base shiny chance of 512/65536 -> 1/128, affected by events and Shiny Charms
-              // Maximum shiny chance of 4096/65536 -> 1/16, cannot improve further after that
-              const shinyChance = Math.min(shinyThreshold.value, MAX_WONDER_TRADE_SHINY_CHANCE);
+        // Generate a trainer name
+        const traderName = generateRandomTraderName();
+        encounter.setDialogueToken("tradeTrainerName", traderName.trim());
 
-              tradePokemon.trySetShinySeed(shinyChance, false);
+        // Remove the original party member from party
+        globalScene.removePokemonFromPlayerParty(tradedPokemon, false);
+
+        // Set data properly, then generate the new Pokemon's assets
+        receivedPokemonData.passive = tradedPokemon.passive;
+        // Pokeball to Ultra ball, randomly
+        receivedPokemonData.pokeball = randInt(4) as PokeballType;
+        const dataSource = new PokemonData(receivedPokemonData);
+        const newPlayerPokemon = globalScene.addPlayerPokemon(
+          receivedPokemonData.species,
+          receivedPokemonData.level,
+          dataSource.abilityIndex,
+          dataSource.formIndex,
+          dataSource.gender,
+          dataSource.shiny,
+          dataSource.variant,
+          dataSource.ivs,
+          dataSource.nature,
+          dataSource,
+        );
+        globalScene.getPlayerParty().push(newPlayerPokemon);
+        await newPlayerPokemon.loadAssets();
+
+        for (const mod of modifiers) {
+          mod.pokemonId = newPlayerPokemon.id;
+          globalScene.addModifier(mod, true, false, false, true);
+        }
+
+        // Show the trade animation
+        await showTradeBackground();
+        await doPokemonTradeSequence(tradedPokemon, newPlayerPokemon);
+        await showEncounterText(`${namespace}:trade_received`, null, 0, true, 4000);
+        globalScene.playBgm(encounter.misc.bgmKey);
+        await addPokemonDataToDexAndValidateAchievements(newPlayerPokemon);
+        await hideTradeBackground();
+        tradedPokemon.destroy();
+
+        leaveEncounterWithoutBattle(true);
+      })
+      .build(),
+  )
+  .withOption(
+    MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DEFAULT)
+      .withHasDexProgress(true)
+      .withDialogue({
+        buttonLabel: `${namespace}:option.2.label`,
+        buttonTooltip: `${namespace}:option.2.tooltip`,
+      })
+      .withPreOptionPhase(async (): Promise<boolean> => {
+        const encounter = globalScene.currentBattle.mysteryEncounter!;
+        const onPokemonSelected = (pokemon: PlayerPokemon) => {
+          // Randomly generate a Wonder Trade pokemon
+          const randomTradeOption = generateTradeOption(globalScene.getPlayerParty().map(p => p.species));
+          const tradePokemon = new EnemyPokemon(randomTradeOption, pokemon.level, TrainerSlot.NONE, false);
+          // Extra shiny roll at 1/128 odds (boosted by events and charms)
+          if (!tradePokemon.shiny) {
+            const shinyThreshold = new NumberHolder(WONDER_TRADE_SHINY_CHANCE);
+            if (timedEventManager.isEventActive()) {
+              shinyThreshold.value *= timedEventManager.getShinyMultiplier();
             }
+            globalScene.applyModifiers(ShinyRateBoosterModifier, true, shinyThreshold);
 
-            // Extra HA roll at base 1/64 odds (boosted by events and charms)
-            const hiddenIndex = tradePokemon.species.ability2 ? 2 : 1;
-            if (tradePokemon.species.abilityHidden) {
-              if (tradePokemon.abilityIndex < hiddenIndex) {
-                const hiddenAbilityChance = new NumberHolder(64);
-                globalScene.applyModifiers(HiddenAbilityRateBoosterModifier, true, hiddenAbilityChance);
+            // Base shiny chance of 512/65536 -> 1/128, affected by events and Shiny Charms
+            // Maximum shiny chance of 4096/65536 -> 1/16, cannot improve further after that
+            const shinyChance = Math.min(shinyThreshold.value, MAX_WONDER_TRADE_SHINY_CHANCE);
 
-                const hasHiddenAbility = !randSeedInt(hiddenAbilityChance.value);
+            tradePokemon.trySetShinySeed(shinyChance, false);
+          }
 
-                if (hasHiddenAbility) {
-                  tradePokemon.abilityIndex = hiddenIndex;
+          // Extra HA roll at base 1/64 odds (boosted by events and charms)
+          const hiddenIndex = tradePokemon.species.ability2 ? 2 : 1;
+          if (tradePokemon.species.abilityHidden) {
+            if (tradePokemon.abilityIndex < hiddenIndex) {
+              const hiddenAbilityChance = new NumberHolder(64);
+              globalScene.applyModifiers(HiddenAbilityRateBoosterModifier, true, hiddenAbilityChance);
+
+              const hasHiddenAbility = !randSeedInt(hiddenAbilityChance.value);
+
+              if (hasHiddenAbility) {
+                tradePokemon.abilityIndex = hiddenIndex;
+              }
+            }
+          }
+
+          // If Pokemon is still not shiny or with HA, give the Pokemon a random Common egg move in its moveset
+          if (!tradePokemon.shiny && (!tradePokemon.species.abilityHidden || tradePokemon.abilityIndex < hiddenIndex)) {
+            const eggMoves = tradePokemon.getEggMoves();
+            if (eggMoves) {
+              // Cannot gen the rare egg move, only 1 of the first 3 common moves
+              const eggMove = eggMoves[randSeedInt(3)];
+              if (!tradePokemon.moveset.some(m => m.moveId === eggMove)) {
+                if (tradePokemon.moveset.length < 4) {
+                  tradePokemon.moveset.push(new PokemonMove(eggMove));
+                } else {
+                  const eggMoveIndex = randSeedInt(4);
+                  tradePokemon.moveset[eggMoveIndex] = new PokemonMove(eggMove);
                 }
               }
             }
-
-            // If Pokemon is still not shiny or with HA, give the Pokemon a random Common egg move in its moveset
-            if (!tradePokemon.shiny && (!tradePokemon.species.abilityHidden || tradePokemon.abilityIndex < hiddenIndex)) {
-              const eggMoves = tradePokemon.getEggMoves();
-              if (eggMoves) {
-                // Cannot gen the rare egg move, only 1 of the first 3 common moves
-                const eggMove = eggMoves[randSeedInt(3)];
-                if (!tradePokemon.moveset.some(m => m?.moveId === eggMove)) {
-                  if (tradePokemon.moveset.length < 4) {
-                    tradePokemon.moveset.push(new PokemonMove(eggMove));
-                  } else {
-                    const eggMoveIndex = randSeedInt(4);
-                    tradePokemon.moveset[eggMoveIndex] = new PokemonMove(eggMove);
-                  }
-                }
-              }
-            }
-
-            encounter.setDialogueToken("tradedPokemon", pokemon.getNameToRender());
-            encounter.setDialogueToken("received", tradePokemon.getNameToRender());
-            encounter.misc.tradedPokemon = pokemon;
-            encounter.misc.receivedPokemon = tradePokemon;
-          };
-
-          return selectPokemonForOption(onPokemonSelected);
-        })
-        .withOptionPhase(async () => {
-          const encounter = globalScene.currentBattle.mysteryEncounter!;
-          const tradedPokemon: PlayerPokemon = encounter.misc.tradedPokemon;
-          const receivedPokemonData: EnemyPokemon = encounter.misc.receivedPokemon;
-          const modifiers = tradedPokemon.getHeldItems().filter(m => !(m instanceof PokemonFormChangeItemModifier) && !(m instanceof SpeciesStatBoosterModifier));
-
-          // Generate a trainer name
-          const traderName = generateRandomTraderName();
-          encounter.setDialogueToken("tradeTrainerName", traderName.trim());
-
-          // Remove the original party member from party
-          globalScene.removePokemonFromPlayerParty(tradedPokemon, false);
-
-          // Set data properly, then generate the new Pokemon's assets
-          receivedPokemonData.passive = tradedPokemon.passive;
-          receivedPokemonData.pokeball = randInt(4) as PokeballType;
-          const dataSource = new PokemonData(receivedPokemonData);
-          const newPlayerPokemon = globalScene.addPlayerPokemon(receivedPokemonData.species, receivedPokemonData.level, dataSource.abilityIndex, dataSource.formIndex, dataSource.gender, dataSource.shiny, dataSource.variant, dataSource.ivs, dataSource.nature, dataSource);
-          globalScene.getPlayerParty().push(newPlayerPokemon);
-          await newPlayerPokemon.loadAssets();
-
-          for (const mod of modifiers) {
-            mod.pokemonId = newPlayerPokemon.id;
-            globalScene.addModifier(mod, true, false, false, true);
           }
 
-          // Show the trade animation
-          await showTradeBackground();
-          await doPokemonTradeSequence(tradedPokemon, newPlayerPokemon);
-          await showEncounterText(`${namespace}:trade_received`, null, 0, true, 4000);
-          globalScene.playBgm(encounter.misc.bgmKey);
-          await addPokemonDataToDexAndValidateAchievements(newPlayerPokemon);
-          await hideTradeBackground();
-          tradedPokemon.destroy();
+          encounter.setDialogueToken("tradedPokemon", pokemon.getNameToRender());
+          encounter.setDialogueToken("received", tradePokemon.getNameToRender());
+          encounter.misc.tradedPokemon = pokemon;
+          encounter.misc.receivedPokemon = tradePokemon;
+        };
 
-          leaveEncounterWithoutBattle(true);
-        })
-        .build()
-    )
-    .withOption(
-      MysteryEncounterOptionBuilder
-        .newOptionWithMode(MysteryEncounterOptionMode.DEFAULT)
-        .withDialogue({
-          buttonLabel: `${namespace}:option.3.label`,
-          buttonTooltip: `${namespace}:option.3.tooltip`,
-          secondOptionPrompt: `${namespace}:option.3.trade_options_prompt`,
-        })
-        .withPreOptionPhase(async (): Promise<boolean> => {
-          const encounter = globalScene.currentBattle.mysteryEncounter!;
-          const onPokemonSelected = (pokemon: PlayerPokemon) => {
-            // Get Pokemon held items and filter for valid ones
-            const validItems = pokemon.getHeldItems().filter((it) => {
-              return it.isTransferable;
-            });
+        return selectPokemonForOption(onPokemonSelected);
+      })
+      .withOptionPhase(async () => {
+        const encounter = globalScene.currentBattle.mysteryEncounter!;
+        const tradedPokemon: PlayerPokemon = encounter.misc.tradedPokemon;
+        const receivedPokemonData: EnemyPokemon = encounter.misc.receivedPokemon;
+        const modifiers = tradedPokemon
+          .getHeldItems()
+          .filter(m => !(m instanceof PokemonFormChangeItemModifier) && !(m instanceof SpeciesStatBoosterModifier));
 
-            return validItems.map((modifier: PokemonHeldItemModifier) => {
-              const option: OptionSelectItem = {
-                label: modifier.type.name,
-                handler: () => {
-                  // Pokemon and item selected
-                  encounter.setDialogueToken("chosenItem", modifier.type.name);
-                  encounter.misc.chosenModifier = modifier;
-                  encounter.misc.chosenPokemon = pokemon;
-                  return true;
-                },
-              };
-              return option;
-            });
-          };
+        // Generate a trainer name
+        const traderName = generateRandomTraderName();
+        encounter.setDialogueToken("tradeTrainerName", traderName.trim());
 
-          const selectableFilter = (pokemon: Pokemon) => {
-            // If pokemon has items to trade
-            const meetsReqs = pokemon.getHeldItems().filter((it) => {
+        // Remove the original party member from party
+        globalScene.removePokemonFromPlayerParty(tradedPokemon, false);
+
+        // Set data properly, then generate the new Pokemon's assets
+        receivedPokemonData.passive = tradedPokemon.passive;
+        receivedPokemonData.pokeball = randInt(4) as PokeballType;
+        const dataSource = new PokemonData(receivedPokemonData);
+        const newPlayerPokemon = globalScene.addPlayerPokemon(
+          receivedPokemonData.species,
+          receivedPokemonData.level,
+          dataSource.abilityIndex,
+          dataSource.formIndex,
+          dataSource.gender,
+          dataSource.shiny,
+          dataSource.variant,
+          dataSource.ivs,
+          dataSource.nature,
+          dataSource,
+        );
+        globalScene.getPlayerParty().push(newPlayerPokemon);
+        await newPlayerPokemon.loadAssets();
+
+        for (const mod of modifiers) {
+          mod.pokemonId = newPlayerPokemon.id;
+          globalScene.addModifier(mod, true, false, false, true);
+        }
+
+        // Show the trade animation
+        await showTradeBackground();
+        await doPokemonTradeSequence(tradedPokemon, newPlayerPokemon);
+        await showEncounterText(`${namespace}:trade_received`, null, 0, true, 4000);
+        globalScene.playBgm(encounter.misc.bgmKey);
+        await addPokemonDataToDexAndValidateAchievements(newPlayerPokemon);
+        await hideTradeBackground();
+        tradedPokemon.destroy();
+
+        leaveEncounterWithoutBattle(true);
+      })
+      .build(),
+  )
+  .withOption(
+    MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DEFAULT)
+      .withDialogue({
+        buttonLabel: `${namespace}:option.3.label`,
+        buttonTooltip: `${namespace}:option.3.tooltip`,
+        secondOptionPrompt: `${namespace}:option.3.trade_options_prompt`,
+      })
+      .withPreOptionPhase(async (): Promise<boolean> => {
+        const encounter = globalScene.currentBattle.mysteryEncounter!;
+        const onPokemonSelected = (pokemon: PlayerPokemon) => {
+          // Get Pokemon held items and filter for valid ones
+          const validItems = pokemon.getHeldItems().filter(it => {
+            return it.isTransferable;
+          });
+
+          return validItems.map((modifier: PokemonHeldItemModifier) => {
+            const option: OptionSelectItem = {
+              label: modifier.type.name,
+              handler: () => {
+                // Pokemon and item selected
+                encounter.setDialogueToken("chosenItem", modifier.type.name);
+                encounter.misc.chosenModifier = modifier;
+                encounter.misc.chosenPokemon = pokemon;
+                return true;
+              },
+            };
+            return option;
+          });
+        };
+
+        const selectableFilter = (pokemon: Pokemon) => {
+          // If pokemon has items to trade
+          const meetsReqs =
+            pokemon.getHeldItems().filter(it => {
               return it.isTransferable;
             }).length > 0;
-            if (!meetsReqs) {
-              return getEncounterText(`${namespace}:option.3.invalid_selection`) ?? null;
-            }
-
-            return null;
-          };
-
-          return selectPokemonForOption(onPokemonSelected, undefined, selectableFilter);
-        })
-        .withOptionPhase(async () => {
-          const encounter = globalScene.currentBattle.mysteryEncounter!;
-          const modifier = encounter.misc.chosenModifier as PokemonHeldItemModifier;
-          const party = globalScene.getPlayerParty();
-          const chosenPokemon: PlayerPokemon = encounter.misc.chosenPokemon;
-
-          // Check tier of the traded item, the received item will be one tier up
-          const type = modifier.type.withTierFromPool(ModifierPoolType.PLAYER, party);
-          let tier = type.tier ?? ModifierTier.GREAT;
-          // Eggs and White Herb are not in the pool
-          if (type.id === "WHITE_HERB") {
-            tier = ModifierTier.GREAT;
-          } else if (type.id === "LUCKY_EGG") {
-            tier = ModifierTier.ULTRA;
-          } else if (type.id === "GOLDEN_EGG") {
-            tier = ModifierTier.ROGUE;
-          }
-          // Increment tier by 1
-          if (tier < ModifierTier.MASTER) {
-            tier++;
+          if (!meetsReqs) {
+            return getEncounterText(`${namespace}:option.3.invalid_selection`) ?? null;
           }
 
-          regenerateModifierPoolThresholds(party, ModifierPoolType.PLAYER, 0);
-          let item: ModifierTypeOption | null = null;
-          // TMs excluded from possible rewards
-          while (!item || item.type.id.includes("TM_")) {
-            item = getPlayerModifierTypeOptions(1, party, [], { guaranteedModifierTiers: [ tier ], allowLuckUpgrades: false })[0];
-          }
+          return null;
+        };
 
-          encounter.setDialogueToken("itemName", item.type.name);
-          setEncounterRewards({ guaranteedModifierTypeOptions: [ item ], fillRemaining: false });
+        return selectPokemonForOption(onPokemonSelected, undefined, selectableFilter);
+      })
+      .withOptionPhase(async () => {
+        const encounter = globalScene.currentBattle.mysteryEncounter!;
+        const modifier = encounter.misc.chosenModifier as PokemonHeldItemModifier;
+        const party = globalScene.getPlayerParty();
+        const chosenPokemon: PlayerPokemon = encounter.misc.chosenPokemon;
 
-          chosenPokemon.loseHeldItem(modifier, false);
-          await globalScene.updateModifiers(true, true);
+        // Check tier of the traded item, the received item will be one tier up
+        const type = modifier.type.withTierFromPool(ModifierPoolType.PLAYER, party);
+        let tier = type.tier ?? ModifierTier.GREAT;
+        // Eggs and White Herb are not in the pool
+        if (type.id === "WHITE_HERB") {
+          tier = ModifierTier.GREAT;
+        } else if (type.id === "LUCKY_EGG") {
+          tier = ModifierTier.ULTRA;
+        } else if (type.id === "GOLDEN_EGG") {
+          tier = ModifierTier.ROGUE;
+        }
+        // Increment tier by 1
+        if (tier < ModifierTier.MASTER) {
+          tier++;
+        }
 
-          // Generate a trainer name
-          const traderName = generateRandomTraderName();
-          encounter.setDialogueToken("tradeTrainerName", traderName.trim());
-          await showEncounterText(`${namespace}:item_trade_selected`);
-          leaveEncounterWithoutBattle();
-        })
-        .build()
-    )
-    .withSimpleOption(
-      {
-        buttonLabel: `${namespace}:option.4.label`,
-        buttonTooltip: `${namespace}:option.4.tooltip`,
-        selected: [
-          {
-            text: `${namespace}:option.4.selected`,
-          },
-        ],
-      },
-      async () => {
-        // Leave encounter with no rewards or exp
-        leaveEncounterWithoutBattle(true);
-        return true;
-      }
-    )
-    .build();
+        regenerateModifierPoolThresholds(party, ModifierPoolType.PLAYER, 0);
+        let item: ModifierTypeOption | null = null;
+        // TMs excluded from possible rewards
+        while (!item || item.type.id.includes("TM_")) {
+          item = getPlayerModifierTypeOptions(1, party, [], {
+            guaranteedModifierTiers: [tier],
+            allowLuckUpgrades: false,
+          })[0];
+        }
+
+        encounter.setDialogueToken("itemName", item.type.name);
+        setEncounterRewards({
+          guaranteedModifierTypeOptions: [item],
+          fillRemaining: false,
+        });
+
+        chosenPokemon.loseHeldItem(modifier, false);
+        await globalScene.updateModifiers(true, true);
+
+        // Generate a trainer name
+        const traderName = generateRandomTraderName();
+        encounter.setDialogueToken("tradeTrainerName", traderName.trim());
+        await showEncounterText(`${namespace}:item_trade_selected`);
+        leaveEncounterWithoutBattle();
+      })
+      .build(),
+  )
+  .withSimpleOption(
+    {
+      buttonLabel: `${namespace}:option.4.label`,
+      buttonTooltip: `${namespace}:option.4.tooltip`,
+      selected: [
+        {
+          text: `${namespace}:option.4.selected`,
+        },
+      ],
+    },
+    async () => {
+      // Leave encounter with no rewards or exp
+      leaveEncounterWithoutBattle(true);
+      return true;
+    },
+  )
+  .build();
 
 function getPokemonTradeOptions(): Map<number, EnemyPokemon[]> {
   const tradeOptionsMap: Map<number, EnemyPokemon[]> = new Map<number, EnemyPokemon[]>();
   // Starts by filtering out any current party members as valid resulting species
   const alreadyUsedSpecies: PokemonSpecies[] = globalScene.getPlayerParty().map(p => p.species);
 
-  globalScene.getPlayerParty().forEach(pokemon => {
+  for (const pokemon of globalScene.getPlayerParty()) {
     // If the party member is legendary/mythical, the only trade options available are always pulled from generation-specific legendary trade pools
     if (pokemon.species.legendary || pokemon.species.subLegendary || pokemon.species.mythical) {
       const generation = pokemon.species.generation;
@@ -459,11 +522,14 @@ function getPokemonTradeOptions(): Map<number, EnemyPokemon[]> {
       }
 
       // Add trade options to map
-      tradeOptionsMap.set(pokemon.id, tradeOptions.map(s => {
-        return new EnemyPokemon(s, pokemon.level, TrainerSlot.NONE, false);
-      }));
+      tradeOptionsMap.set(
+        pokemon.id,
+        tradeOptions.map(s => {
+          return new EnemyPokemon(s, pokemon.level, TrainerSlot.NONE, false);
+        }),
+      );
     }
-  });
+  }
 
   return tradeOptionsMap;
 }
@@ -478,13 +544,12 @@ function generateTradeOption(alreadyUsedSpecies: PokemonSpecies[], originalBst?:
   }
   while (isNullOrUndefined(newSpecies)) {
     // Get all non-legendary species that fall within the Bst range requirements
-    let validSpecies = allSpecies
-      .filter(s => {
-        const isLegendaryOrMythical = s.legendary || s.subLegendary || s.mythical;
-        const speciesBst = s.getBaseStatTotal();
-        const bstInRange = speciesBst >= bstMin && speciesBst <= bstCap;
-        return !isLegendaryOrMythical && bstInRange && !EXCLUDED_TRADE_SPECIES.includes(s.speciesId);
-      });
+    let validSpecies = allSpecies.filter(s => {
+      const isLegendaryOrMythical = s.legendary || s.subLegendary || s.mythical;
+      const speciesBst = s.getBaseStatTotal();
+      const bstInRange = speciesBst >= bstMin && speciesBst <= bstCap;
+      return !isLegendaryOrMythical && bstInRange && !EXCLUDED_TRADE_SPECIES.includes(s.speciesId);
+    });
 
     // There must be at least 20 species available before it will choose one
     if (validSpecies?.length > 20) {
@@ -508,7 +573,13 @@ function showTradeBackground() {
     const tradeContainer = globalScene.add.container(0, -globalScene.game.canvas.height / 6);
     tradeContainer.setName("Trade Background");
 
-    const flyByStaticBg = globalScene.add.rectangle(0, 0, globalScene.game.canvas.width / 6, globalScene.game.canvas.height / 6, 0);
+    const flyByStaticBg = globalScene.add.rectangle(
+      0,
+      0,
+      globalScene.game.canvas.width / 6,
+      globalScene.game.canvas.height / 6,
+      0,
+    );
     flyByStaticBg.setName("Black Background");
     flyByStaticBg.setOrigin(0, 0);
     flyByStaticBg.setVisible(false);
@@ -531,7 +602,7 @@ function showTradeBackground() {
       ease: "Sine.easeInOut",
       onComplete: () => {
         resolve();
-      }
+      },
     });
   });
 }
@@ -548,7 +619,7 @@ function hideTradeBackground() {
       onComplete: () => {
         globalScene.fieldUI.remove(transformationContainer, true);
         resolve();
-      }
+      },
     });
   });
 }
@@ -569,8 +640,16 @@ function doPokemonTradeSequence(tradedPokemon: PlayerPokemon, receivedPokemon: P
     let receivedPokemonTintSprite: Phaser.GameObjects.Sprite;
 
     const getPokemonSprite = () => {
-      const ret = globalScene.addPokemonSprite(tradedPokemon, tradeBaseBg.displayWidth / 2, tradeBaseBg.displayHeight / 2, "pkmn__sub");
-      ret.setPipeline(globalScene.spritePipeline, { tone: [ 0.0, 0.0, 0.0, 0.0 ], ignoreTimeTint: true });
+      const ret = globalScene.addPokemonSprite(
+        tradedPokemon,
+        tradeBaseBg.displayWidth / 2,
+        tradeBaseBg.displayHeight / 2,
+        "pkmn__sub",
+      );
+      ret.setPipeline(globalScene.spritePipeline, {
+        tone: [0.0, 0.0, 0.0, 0.0],
+        ignoreTimeTint: true,
+      });
       return ret;
     };
 
@@ -586,7 +665,7 @@ function doPokemonTradeSequence(tradedPokemon: PlayerPokemon, receivedPokemon: P
     receivedPokemonTintSprite.setVisible(false);
     receivedPokemonTintSprite.setTintFill(getPokeballTintColor(receivedPokemon.pokeball));
 
-    [ tradedPokemonSprite, tradedPokemonTintSprite ].map(sprite => {
+    [tradedPokemonSprite, tradedPokemonTintSprite].map(sprite => {
       const spriteKey = tradedPokemon.getSpriteKey(true);
       try {
         sprite.play(spriteKey);
@@ -594,20 +673,25 @@ function doPokemonTradeSequence(tradedPokemon: PlayerPokemon, receivedPokemon: P
         console.error(`Failed to play animation for ${spriteKey}`, err);
       }
 
-      sprite.setPipeline(globalScene.spritePipeline, { tone: [ 0.0, 0.0, 0.0, 0.0 ], hasShadow: false, teraColor: getTypeRgb(tradedPokemon.getTeraType()) });
+      sprite.setPipeline(globalScene.spritePipeline, {
+        tone: [0.0, 0.0, 0.0, 0.0],
+        hasShadow: false,
+        teraColor: getTypeRgb(tradedPokemon.getTeraType()),
+        isTerastallized: tradedPokemon.isTerastallized,
+      });
       sprite.setPipelineData("ignoreTimeTint", true);
       sprite.setPipelineData("spriteKey", tradedPokemon.getSpriteKey());
       sprite.setPipelineData("shiny", tradedPokemon.shiny);
       sprite.setPipelineData("variant", tradedPokemon.variant);
-      [ "spriteColors", "fusionSpriteColors" ].map(k => {
-        if (tradedPokemon.summonData?.speciesForm) {
+      ["spriteColors", "fusionSpriteColors"].map(k => {
+        if (tradedPokemon.summonData.speciesForm) {
           k += "Base";
         }
         sprite.pipelineData[k] = tradedPokemon.getSprite().pipelineData[k];
       });
     });
 
-    [ receivedPokemonSprite, receivedPokemonTintSprite ].map(sprite => {
+    [receivedPokemonSprite, receivedPokemonTintSprite].map(sprite => {
       const spriteKey = receivedPokemon.getSpriteKey(true);
       try {
         sprite.play(spriteKey);
@@ -615,13 +699,18 @@ function doPokemonTradeSequence(tradedPokemon: PlayerPokemon, receivedPokemon: P
         console.error(`Failed to play animation for ${spriteKey}`, err);
       }
 
-      sprite.setPipeline(globalScene.spritePipeline, { tone: [ 0.0, 0.0, 0.0, 0.0 ], hasShadow: false, teraColor: getTypeRgb(tradedPokemon.getTeraType()) });
+      sprite.setPipeline(globalScene.spritePipeline, {
+        tone: [0.0, 0.0, 0.0, 0.0],
+        hasShadow: false,
+        teraColor: getTypeRgb(tradedPokemon.getTeraType()),
+        isTerastallized: tradedPokemon.isTerastallized,
+      });
       sprite.setPipelineData("ignoreTimeTint", true);
       sprite.setPipelineData("spriteKey", receivedPokemon.getSpriteKey());
       sprite.setPipelineData("shiny", receivedPokemon.shiny);
       sprite.setPipelineData("variant", receivedPokemon.variant);
-      [ "spriteColors", "fusionSpriteColors" ].map(k => {
-        if (receivedPokemon.summonData?.speciesForm) {
+      ["spriteColors", "fusionSpriteColors"].map(k => {
+        if (receivedPokemon.summonData.speciesForm) {
           k += "Base";
         }
         sprite.pipelineData[k] = receivedPokemon.getSprite().pipelineData[k];
@@ -630,13 +719,23 @@ function doPokemonTradeSequence(tradedPokemon: PlayerPokemon, receivedPokemon: P
 
     // Traded pokemon pokeball
     const tradedPbAtlasKey = getPokeballAtlasKey(tradedPokemon.pokeball);
-    const tradedPokeball: Phaser.GameObjects.Sprite = globalScene.add.sprite(tradeBaseBg.displayWidth / 2, tradeBaseBg.displayHeight / 2, "pb", tradedPbAtlasKey);
+    const tradedPokeball: Phaser.GameObjects.Sprite = globalScene.add.sprite(
+      tradeBaseBg.displayWidth / 2,
+      tradeBaseBg.displayHeight / 2,
+      "pb",
+      tradedPbAtlasKey,
+    );
     tradedPokeball.setVisible(false);
     tradeContainer.add(tradedPokeball);
 
     // Received pokemon pokeball
     const receivedPbAtlasKey = getPokeballAtlasKey(receivedPokemon.pokeball);
-    const receivedPokeball: Phaser.GameObjects.Sprite = globalScene.add.sprite(tradeBaseBg.displayWidth / 2, tradeBaseBg.displayHeight / 2, "pb", receivedPbAtlasKey);
+    const receivedPokeball: Phaser.GameObjects.Sprite = globalScene.add.sprite(
+      tradeBaseBg.displayWidth / 2,
+      tradeBaseBg.displayHeight / 2,
+      "pb",
+      receivedPbAtlasKey,
+    );
     receivedPokeball.setVisible(false);
     tradeContainer.add(receivedPokeball);
 
@@ -669,7 +768,7 @@ function doPokemonTradeSequence(tradedPokemon: PlayerPokemon, receivedPokemon: P
             // addPokeballOpenParticles(tradedPokemon.x, tradedPokemon.y, tradedPokemon.pokeball);
 
             globalScene.tweens.add({
-              targets: [ tradedPokemonTintSprite, tradedPokemonSprite ],
+              targets: [tradedPokemonTintSprite, tradedPokemonSprite],
               duration: 500,
               ease: "Sine.easeIn",
               scale: 0.25,
@@ -700,22 +799,31 @@ function doPokemonTradeSequence(tradedPokemon: PlayerPokemon, receivedPokemon: P
                       },
                       onComplete: async () => {
                         await doPokemonTradeFlyBySequence(tradedPokemonSprite, receivedPokemonSprite);
-                        await doTradeReceivedSequence(receivedPokemon, receivedPokemonSprite, receivedPokemonTintSprite, receivedPokeball, receivedPbAtlasKey);
+                        await doTradeReceivedSequence(
+                          receivedPokemon,
+                          receivedPokemonSprite,
+                          receivedPokemonTintSprite,
+                          receivedPokeball,
+                          receivedPbAtlasKey,
+                        );
                         resolve();
-                      }
+                      },
                     });
-                  }
+                  },
                 });
-              }
+              },
             });
-          }
+          },
         });
-      }
+      },
     });
   });
 }
 
-function doPokemonTradeFlyBySequence(tradedPokemonSprite: Phaser.GameObjects.Sprite, receivedPokemonSprite: Phaser.GameObjects.Sprite) {
+function doPokemonTradeFlyBySequence(
+  tradedPokemonSprite: Phaser.GameObjects.Sprite,
+  receivedPokemonSprite: Phaser.GameObjects.Sprite,
+) {
   return new Promise<void>(resolve => {
     const tradeContainer = globalScene.fieldUI.getByName("Trade Background") as Phaser.GameObjects.Container;
     const tradeBaseBg = tradeContainer.getByName("Trade Background Image") as Phaser.GameObjects.Image;
@@ -728,7 +836,7 @@ function doPokemonTradeFlyBySequence(tradedPokemonSprite: Phaser.GameObjects.Spr
     tradedPokemonSprite.y = 200;
     tradedPokemonSprite.scale = 1;
     tradedPokemonSprite.setVisible(true);
-    receivedPokemonSprite.x = tradeBaseBg.displayWidth * 3 / 4;
+    receivedPokemonSprite.x = (tradeBaseBg.displayWidth * 3) / 4;
     receivedPokemonSprite.y = -200;
     receivedPokemonSprite.scale = 1;
     receivedPokemonSprite.setVisible(true);
@@ -745,7 +853,7 @@ function doPokemonTradeFlyBySequence(tradedPokemonSprite: Phaser.GameObjects.Spr
       duration: FADE_DELAY,
       onComplete: () => {
         globalScene.tweens.add({
-          targets: [ receivedPokemonSprite, tradedPokemonSprite ],
+          targets: [receivedPokemonSprite, tradedPokemonSprite],
           y: tradeBaseBg.displayWidth / 2 - 100,
           ease: "Cubic.easeInOut",
           duration: BASE_ANIM_DURATION * 3,
@@ -755,11 +863,11 @@ function doPokemonTradeFlyBySequence(tradedPokemonSprite: Phaser.GameObjects.Spr
               x: tradeBaseBg.displayWidth / 4,
               ease: "Cubic.easeInOut",
               duration: BASE_ANIM_DURATION / 2,
-              delay: ANIM_DELAY
+              delay: ANIM_DELAY,
             });
             globalScene.tweens.add({
               targets: tradedPokemonSprite,
-              x: tradeBaseBg.displayWidth * 3 / 4,
+              x: (tradeBaseBg.displayWidth * 3) / 4,
               ease: "Cubic.easeInOut",
               duration: BASE_ANIM_DURATION / 2,
               delay: ANIM_DELAY,
@@ -785,20 +893,26 @@ function doPokemonTradeFlyBySequence(tradedPokemonSprite: Phaser.GameObjects.Spr
                       duration: FADE_DELAY,
                       onComplete: () => {
                         resolve();
-                      }
+                      },
                     });
-                  }
+                  },
                 });
-              }
+              },
             });
-          }
+          },
         });
-      }
+      },
     });
   });
 }
 
-function doTradeReceivedSequence(receivedPokemon: PlayerPokemon, receivedPokemonSprite: Phaser.GameObjects.Sprite, receivedPokemonTintSprite: Phaser.GameObjects.Sprite, receivedPokeballSprite: Phaser.GameObjects.Sprite, receivedPbAtlasKey: string) {
+function doTradeReceivedSequence(
+  receivedPokemon: PlayerPokemon,
+  receivedPokemonSprite: Phaser.GameObjects.Sprite,
+  receivedPokemonTintSprite: Phaser.GameObjects.Sprite,
+  receivedPokeballSprite: Phaser.GameObjects.Sprite,
+  receivedPbAtlasKey: string,
+) {
   return new Promise<void>(resolve => {
     const tradeContainer = globalScene.fieldUI.getByName("Trade Background") as Phaser.GameObjects.Container;
     const tradeBaseBg = tradeContainer.getByName("Trade Background Image") as Phaser.GameObjects.Image;
@@ -851,7 +965,7 @@ function doTradeReceivedSequence(receivedPokemon: PlayerPokemon, receivedPokemon
             targets: receivedPokemonSprite,
             duration: 250,
             ease: "Sine.easeOut",
-            scale: 1
+            scale: 1,
           });
           globalScene.tweens.add({
             targets: receivedPokemonTintSprite,
@@ -867,24 +981,22 @@ function doTradeReceivedSequence(receivedPokemon: PlayerPokemon, receivedPokemon
               }
               receivedPokeballSprite.destroy();
               globalScene.time.delayedCall(2000, () => resolve());
-            }
+            },
           });
         });
-      }
+      },
     });
   });
 }
 
 function generateRandomTraderName() {
-  const length = Object.keys(trainerNamePools).length;
+  const length = TrainerType.YOUNGSTER - TrainerType.ACE_TRAINER + 1;
   // +1 avoids TrainerType.UNKNOWN
-  let trainerTypePool = trainerNamePools[randInt(length) + 1];
-  while (!trainerTypePool) {
-    trainerTypePool = trainerNamePools[randInt(length) + 1];
-  }
+  const classKey = `trainersCommon:${TrainerType[randInt(length) + 1]}`;
   // Some trainers have 2 gendered pools, some do not
-  const genderedPool = trainerTypePool[randInt(trainerTypePool.length)];
-  const trainerNameString = genderedPool instanceof Array ? genderedPool[randInt(genderedPool.length)] : genderedPool;
+  const genderKey = i18next.exists(`${classKey}.MALE`) ? (randInt(2) === 0 ? ".MALE" : ".FEMALE") : "";
+  const trainerNameKey = randSeedItem(Object.keys(i18next.t(`${classKey}${genderKey}`, { returnObjects: true })));
+  const trainerNameString = i18next.t(`${classKey}${genderKey}.${trainerNameKey}`);
   // Some names have an '&' symbol and need to be trimmed to a single name instead of a double name
   const trainerNames = trainerNameString.split(" & ");
   return trainerNames[randInt(trainerNames.length)];
diff --git a/src/data/mystery-encounters/encounters/lost-at-sea-encounter.ts b/src/data/mystery-encounters/encounters/lost-at-sea-encounter.ts
index 34c808359b7..6d8a1fc8c6b 100644
--- a/src/data/mystery-encounters/encounters/lost-at-sea-encounter.ts
+++ b/src/data/mystery-encounters/encounters/lost-at-sea-encounter.ts
@@ -10,7 +10,7 @@ import { leaveEncounterWithoutBattle, setEncounterExp } from "../utils/encounter
 import { applyDamageToPokemon } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils";
 import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
 import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
-import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/game-mode";
+import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants";
 import { PokemonMove } from "#app/field/pokemon";
 
 const OPTION_1_REQUIRED_MOVE = Moves.SURF;
@@ -29,7 +29,9 @@ const namespace = "mysteryEncounters/lostAtSea";
  * @see {@link https://github.com/pagefaultgames/pokerogue/issues/3793 | GitHub Issue #3793}
  * @see For biome requirements check {@linkcode mysteryEncountersByBiome}
  */
-export const LostAtSeaEncounter: MysteryEncounter = MysteryEncounterBuilder.withEncounterType(MysteryEncounterType.LOST_AT_SEA)
+export const LostAtSeaEncounter: MysteryEncounter = MysteryEncounterBuilder.withEncounterType(
+  MysteryEncounterType.LOST_AT_SEA,
+)
   .withEncounterTier(MysteryEncounterTier.COMMON)
   .withSceneWaveRangeRequirement(...CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES)
   .withIntroSpriteConfigs([
@@ -57,8 +59,7 @@ export const LostAtSeaEncounter: MysteryEncounter = MysteryEncounterBuilder.with
   .withQuery(`${namespace}:query`)
   .withOption(
     // Option 1: Use a (non fainted) pokemon that can learn Surf to guide you back/
-    MysteryEncounterOptionBuilder
-      .newOptionWithMode(MysteryEncounterOptionMode.DISABLED_OR_DEFAULT)
+    MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DISABLED_OR_DEFAULT)
       .withPokemonCanLearnMoveRequirement(OPTION_1_REQUIRED_MOVE)
       .withDialogue({
         buttonLabel: `${namespace}:option.1.label`,
@@ -72,12 +73,11 @@ export const LostAtSeaEncounter: MysteryEncounter = MysteryEncounterBuilder.with
         ],
       })
       .withOptionPhase(async () => handlePokemonGuidingYouPhase())
-      .build()
+      .build(),
   )
   .withOption(
     //Option 2: Use a (non fainted) pokemon that can learn fly to guide you back.
-    MysteryEncounterOptionBuilder
-      .newOptionWithMode(MysteryEncounterOptionMode.DISABLED_OR_DEFAULT)
+    MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DISABLED_OR_DEFAULT)
       .withPokemonCanLearnMoveRequirement(OPTION_2_REQUIRED_MOVE)
       .withDialogue({
         buttonLabel: `${namespace}:option.2.label`,
@@ -91,7 +91,7 @@ export const LostAtSeaEncounter: MysteryEncounter = MysteryEncounterBuilder.with
         ],
       })
       .withOptionPhase(async () => handlePokemonGuidingYouPhase())
-      .build()
+      .build(),
   )
   .withSimpleOption(
     // Option 3: Wander aimlessly
@@ -105,7 +105,7 @@ export const LostAtSeaEncounter: MysteryEncounter = MysteryEncounterBuilder.with
       ],
     },
     async () => {
-      const allowedPokemon = globalScene.getPlayerParty().filter((p) => p.isAllowedInBattle());
+      const allowedPokemon = globalScene.getPlayerParty().filter(p => p.isAllowedInBattle());
 
       for (const pkm of allowedPokemon) {
         const percentage = DAMAGE_PERCENTAGE / 100;
@@ -116,7 +116,7 @@ export const LostAtSeaEncounter: MysteryEncounter = MysteryEncounterBuilder.with
       leaveEncounterWithoutBattle();
 
       return true;
-    }
+    },
   )
   .withOutroDialogue([
     {
diff --git a/src/data/mystery-encounters/encounters/mysterious-challengers-encounter.ts b/src/data/mystery-encounters/encounters/mysterious-challengers-encounter.ts
index 36e12b34e10..6907e18cfdc 100644
--- a/src/data/mystery-encounters/encounters/mysterious-challengers-encounter.ts
+++ b/src/data/mystery-encounters/encounters/mysterious-challengers-encounter.ts
@@ -1,25 +1,22 @@
-import type {
-  EnemyPartyConfig } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
+import type { EnemyPartyConfig } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
 import {
   initBattleWithEnemyConfig,
   setEncounterRewards,
 } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
-import {
-  trainerConfigs,
-  TrainerPartyCompoundTemplate,
-  TrainerPartyTemplate,
-  trainerPartyTemplates,
-} from "#app/data/trainer-config";
+import { trainerConfigs } from "#app/data/trainers/trainer-config";
+import { trainerPartyTemplates } from "#app/data/trainers/TrainerPartyTemplate";
+import { TrainerPartyCompoundTemplate } from "#app/data/trainers/TrainerPartyTemplate";
+import { TrainerPartyTemplate } from "#app/data/trainers/TrainerPartyTemplate";
 import { ModifierTier } from "#app/modifier/modifier-tier";
 import { modifierTypes } from "#app/modifier/modifier-type";
 import { MysteryEncounterType } from "#enums/mystery-encounter-type";
 import { PartyMemberStrength } from "#enums/party-member-strength";
 import { globalScene } from "#app/global-scene";
-import * as Utils from "#app/utils";
+import { randSeedInt } from "#app/utils/common";
 import type MysteryEncounter from "#app/data/mystery-encounters/mystery-encounter";
 import { MysteryEncounterBuilder } from "#app/data/mystery-encounters/mystery-encounter";
 import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
-import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/game-mode";
+import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants";
 
 /** the i18n namespace for the encounter */
 const namespace = "mysteryEncounters/mysteriousChallengers";
@@ -29,195 +26,202 @@ const namespace = "mysteryEncounters/mysteriousChallengers";
  * @see {@link https://github.com/pagefaultgames/pokerogue/issues/3801 | GitHub Issue #3801}
  * @see For biome requirements check {@linkcode mysteryEncountersByBiome}
  */
-export const MysteriousChallengersEncounter: MysteryEncounter =
-  MysteryEncounterBuilder.withEncounterType(MysteryEncounterType.MYSTERIOUS_CHALLENGERS)
-    .withEncounterTier(MysteryEncounterTier.GREAT)
-    .withSceneWaveRangeRequirement(...CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES)
-    .withIntroSpriteConfigs([]) // These are set in onInit()
-    .withIntroDialogue([
+export const MysteriousChallengersEncounter: MysteryEncounter = MysteryEncounterBuilder.withEncounterType(
+  MysteryEncounterType.MYSTERIOUS_CHALLENGERS,
+)
+  .withEncounterTier(MysteryEncounterTier.GREAT)
+  .withSceneWaveRangeRequirement(...CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES)
+  .withIntroSpriteConfigs([]) // These are set in onInit()
+  .withIntroDialogue([
+    {
+      text: `${namespace}:intro`,
+    },
+  ])
+  .withOnInit(() => {
+    const encounter = globalScene.currentBattle.mysteryEncounter!;
+    // Calculates what trainers are available for battle in the encounter
+
+    // Normal difficulty trainer is randomly pulled from biome
+    const normalTrainerType = globalScene.arena.randomTrainerType(globalScene.currentBattle.waveIndex);
+    const normalConfig = trainerConfigs[normalTrainerType].clone();
+    let female = false;
+    if (normalConfig.hasGenders) {
+      female = !!randSeedInt(2);
+    }
+    const normalSpriteKey = normalConfig.getSpriteKey(female, normalConfig.doubleOnly);
+    encounter.enemyPartyConfigs.push({
+      trainerConfig: normalConfig,
+      female: female,
+    });
+
+    // Hard difficulty trainer is another random trainer, but with AVERAGE_BALANCED config
+    // Number of mons is based off wave: 1-20 is 2, 20-40 is 3, etc. capping at 6 after wave 100
+    let retries = 0;
+    let hardTrainerType = globalScene.arena.randomTrainerType(globalScene.currentBattle.waveIndex);
+    while (retries < 5 && hardTrainerType === normalTrainerType) {
+      // Will try to use a different trainer from the normal trainer type
+      hardTrainerType = globalScene.arena.randomTrainerType(globalScene.currentBattle.waveIndex);
+      retries++;
+    }
+    const hardTemplate = new TrainerPartyCompoundTemplate(
+      new TrainerPartyTemplate(1, PartyMemberStrength.STRONGER, false, true),
+      new TrainerPartyTemplate(
+        Math.min(Math.ceil(globalScene.currentBattle.waveIndex / 20), 5),
+        PartyMemberStrength.AVERAGE,
+        false,
+        true,
+      ),
+    );
+    const hardConfig = trainerConfigs[hardTrainerType].clone();
+    hardConfig.setPartyTemplates(hardTemplate);
+    female = false;
+    if (hardConfig.hasGenders) {
+      female = !!randSeedInt(2);
+    }
+    const hardSpriteKey = hardConfig.getSpriteKey(female, hardConfig.doubleOnly);
+    encounter.enemyPartyConfigs.push({
+      trainerConfig: hardConfig,
+      levelAdditiveModifier: 1,
+      female: female,
+    });
+
+    // Brutal trainer is pulled from pool of boss trainers (gym leaders) for the biome
+    // They are given an E4 template team, so will be stronger than usual boss encounter and always have 6 mons
+    const brutalTrainerType = globalScene.arena.randomTrainerType(globalScene.currentBattle.waveIndex, true);
+    const e4Template = trainerPartyTemplates.ELITE_FOUR;
+    const brutalConfig = trainerConfigs[brutalTrainerType].clone();
+    brutalConfig.title = trainerConfigs[brutalTrainerType].title;
+    brutalConfig.setPartyTemplates(e4Template);
+    // @ts-ignore
+    brutalConfig.partyTemplateFunc = null; // Overrides gym leader party template func
+    female = false;
+    if (brutalConfig.hasGenders) {
+      female = !!randSeedInt(2);
+    }
+    const brutalSpriteKey = brutalConfig.getSpriteKey(female, brutalConfig.doubleOnly);
+    encounter.enemyPartyConfigs.push({
+      trainerConfig: brutalConfig,
+      levelAdditiveModifier: 1.5,
+      female: female,
+    });
+
+    encounter.spriteConfigs = [
       {
-        text: `${namespace}:intro`,
+        spriteKey: normalSpriteKey,
+        fileRoot: "trainer",
+        hasShadow: true,
+        tint: 1,
       },
-    ])
-    .withOnInit(() => {
+      {
+        spriteKey: hardSpriteKey,
+        fileRoot: "trainer",
+        hasShadow: true,
+        tint: 1,
+      },
+      {
+        spriteKey: brutalSpriteKey,
+        fileRoot: "trainer",
+        hasShadow: true,
+        tint: 1,
+      },
+    ];
+
+    return true;
+  })
+  .setLocalizationKey(`${namespace}`)
+  .withTitle(`${namespace}:title`)
+  .withDescription(`${namespace}:description`)
+  .withQuery(`${namespace}:query`)
+  .withSimpleOption(
+    {
+      buttonLabel: `${namespace}:option.1.label`,
+      buttonTooltip: `${namespace}:option.1.tooltip`,
+      selected: [
+        {
+          text: `${namespace}:option.selected`,
+        },
+      ],
+    },
+    async () => {
       const encounter = globalScene.currentBattle.mysteryEncounter!;
-      // Calculates what trainers are available for battle in the encounter
+      // Spawn standard trainer battle with memory mushroom reward
+      const config: EnemyPartyConfig = encounter.enemyPartyConfigs[0];
 
-      // Normal difficulty trainer is randomly pulled from biome
-      const normalTrainerType = globalScene.arena.randomTrainerType(globalScene.currentBattle.waveIndex);
-      const normalConfig = trainerConfigs[normalTrainerType].clone();
-      let female = false;
-      if (normalConfig.hasGenders) {
-        female = !!Utils.randSeedInt(2);
-      }
-      const normalSpriteKey = normalConfig.getSpriteKey(female, normalConfig.doubleOnly);
-      encounter.enemyPartyConfigs.push({
-        trainerConfig: normalConfig,
-        female: female,
+      setEncounterRewards({
+        guaranteedModifierTypeFuncs: [modifierTypes.TM_COMMON, modifierTypes.TM_GREAT, modifierTypes.MEMORY_MUSHROOM],
+        fillRemaining: true,
       });
 
-      // Hard difficulty trainer is another random trainer, but with AVERAGE_BALANCED config
-      // Number of mons is based off wave: 1-20 is 2, 20-40 is 3, etc. capping at 6 after wave 100
-      let retries = 0;
-      let hardTrainerType = globalScene.arena.randomTrainerType(globalScene.currentBattle.waveIndex);
-      while (retries < 5 && hardTrainerType === normalTrainerType) {
-        // Will try to use a different trainer from the normal trainer type
-        hardTrainerType = globalScene.arena.randomTrainerType(globalScene.currentBattle.waveIndex);
-        retries++;
-      }
-      const hardTemplate = new TrainerPartyCompoundTemplate(
-        new TrainerPartyTemplate(1, PartyMemberStrength.STRONGER, false, true),
-        new TrainerPartyTemplate(
-          Math.min(Math.ceil(globalScene.currentBattle.waveIndex / 20), 5),
-          PartyMemberStrength.AVERAGE,
-          false,
-          true
-        )
-      );
-      const hardConfig = trainerConfigs[hardTrainerType].clone();
-      hardConfig.setPartyTemplates(hardTemplate);
-      female = false;
-      if (hardConfig.hasGenders) {
-        female = !!Utils.randSeedInt(2);
-      }
-      const hardSpriteKey = hardConfig.getSpriteKey(female, hardConfig.doubleOnly);
-      encounter.enemyPartyConfigs.push({
-        trainerConfig: hardConfig,
-        levelAdditiveModifier: 1,
-        female: female,
+      // Seed offsets to remove possibility of different trainers having exact same teams
+      let initBattlePromise: Promise<void>;
+      globalScene.executeWithSeedOffset(() => {
+        initBattlePromise = initBattleWithEnemyConfig(config);
+      }, globalScene.currentBattle.waveIndex * 10);
+      await initBattlePromise!;
+    },
+  )
+  .withSimpleOption(
+    {
+      buttonLabel: `${namespace}:option.2.label`,
+      buttonTooltip: `${namespace}:option.2.tooltip`,
+      selected: [
+        {
+          text: `${namespace}:option.selected`,
+        },
+      ],
+    },
+    async () => {
+      const encounter = globalScene.currentBattle.mysteryEncounter!;
+      // Spawn hard fight
+      const config: EnemyPartyConfig = encounter.enemyPartyConfigs[1];
+
+      setEncounterRewards({
+        guaranteedModifierTiers: [ModifierTier.ULTRA, ModifierTier.ULTRA, ModifierTier.GREAT, ModifierTier.GREAT],
+        fillRemaining: true,
       });
 
-      // Brutal trainer is pulled from pool of boss trainers (gym leaders) for the biome
-      // They are given an E4 template team, so will be stronger than usual boss encounter and always have 6 mons
-      const brutalTrainerType = globalScene.arena.randomTrainerType(
-        globalScene.currentBattle.waveIndex,
-        true
-      );
-      const e4Template = trainerPartyTemplates.ELITE_FOUR;
-      const brutalConfig = trainerConfigs[brutalTrainerType].clone();
-      brutalConfig.title = trainerConfigs[brutalTrainerType].title;
-      brutalConfig.setPartyTemplates(e4Template);
-      // @ts-ignore
-      brutalConfig.partyTemplateFunc = null; // Overrides gym leader party template func
-      female = false;
-      if (brutalConfig.hasGenders) {
-        female = !!Utils.randSeedInt(2);
-      }
-      const brutalSpriteKey = brutalConfig.getSpriteKey(female, brutalConfig.doubleOnly);
-      encounter.enemyPartyConfigs.push({
-        trainerConfig: brutalConfig,
-        levelAdditiveModifier: 1.5,
-        female: female,
+      // Seed offsets to remove possibility of different trainers having exact same teams
+      let initBattlePromise: Promise<void>;
+      globalScene.executeWithSeedOffset(() => {
+        initBattlePromise = initBattleWithEnemyConfig(config);
+      }, globalScene.currentBattle.waveIndex * 100);
+      await initBattlePromise!;
+    },
+  )
+  .withSimpleOption(
+    {
+      buttonLabel: `${namespace}:option.3.label`,
+      buttonTooltip: `${namespace}:option.3.tooltip`,
+      selected: [
+        {
+          text: `${namespace}:option.selected`,
+        },
+      ],
+    },
+    async () => {
+      const encounter = globalScene.currentBattle.mysteryEncounter!;
+      // Spawn brutal fight
+      const config: EnemyPartyConfig = encounter.enemyPartyConfigs[2];
+
+      // To avoid player level snowballing from picking this option
+      encounter.expMultiplier = 0.9;
+
+      setEncounterRewards({
+        guaranteedModifierTiers: [ModifierTier.ROGUE, ModifierTier.ROGUE, ModifierTier.ULTRA, ModifierTier.GREAT],
+        fillRemaining: true,
       });
 
-      encounter.spriteConfigs = [
-        {
-          spriteKey: normalSpriteKey,
-          fileRoot: "trainer",
-          hasShadow: true,
-          tint: 1,
-        },
-        {
-          spriteKey: hardSpriteKey,
-          fileRoot: "trainer",
-          hasShadow: true,
-          tint: 1,
-        },
-        {
-          spriteKey: brutalSpriteKey,
-          fileRoot: "trainer",
-          hasShadow: true,
-          tint: 1,
-        },
-      ];
-
-      return true;
-    })
-    .setLocalizationKey(`${namespace}`)
-    .withTitle(`${namespace}:title`)
-    .withDescription(`${namespace}:description`)
-    .withQuery(`${namespace}:query`)
-    .withSimpleOption(
-      {
-        buttonLabel: `${namespace}:option.1.label`,
-        buttonTooltip: `${namespace}:option.1.tooltip`,
-        selected: [
-          {
-            text: `${namespace}:option.selected`,
-          },
-        ],
-      },
-      async () => {
-        const encounter = globalScene.currentBattle.mysteryEncounter!;
-        // Spawn standard trainer battle with memory mushroom reward
-        const config: EnemyPartyConfig = encounter.enemyPartyConfigs[0];
-
-        setEncounterRewards({ guaranteedModifierTypeFuncs: [ modifierTypes.TM_COMMON, modifierTypes.TM_GREAT, modifierTypes.MEMORY_MUSHROOM ], fillRemaining: true });
-
-        // Seed offsets to remove possibility of different trainers having exact same teams
-        let initBattlePromise: Promise<void>;
-        globalScene.executeWithSeedOffset(() => {
-          initBattlePromise = initBattleWithEnemyConfig(config);
-        }, globalScene.currentBattle.waveIndex * 10);
-        await initBattlePromise!;
-      }
-    )
-    .withSimpleOption(
-      {
-        buttonLabel: `${namespace}:option.2.label`,
-        buttonTooltip: `${namespace}:option.2.tooltip`,
-        selected: [
-          {
-            text: `${namespace}:option.selected`,
-          },
-        ],
-      },
-      async () => {
-        const encounter = globalScene.currentBattle.mysteryEncounter!;
-        // Spawn hard fight
-        const config: EnemyPartyConfig = encounter.enemyPartyConfigs[1];
-
-        setEncounterRewards({ guaranteedModifierTiers: [ ModifierTier.ULTRA, ModifierTier.ULTRA, ModifierTier.GREAT, ModifierTier.GREAT ], fillRemaining: true });
-
-        // Seed offsets to remove possibility of different trainers having exact same teams
-        let initBattlePromise: Promise<void>;
-        globalScene.executeWithSeedOffset(() => {
-          initBattlePromise = initBattleWithEnemyConfig(config);
-        }, globalScene.currentBattle.waveIndex * 100);
-        await initBattlePromise!;
-      }
-    )
-    .withSimpleOption(
-      {
-        buttonLabel: `${namespace}:option.3.label`,
-        buttonTooltip: `${namespace}:option.3.tooltip`,
-        selected: [
-          {
-            text: `${namespace}:option.selected`,
-          },
-        ],
-      },
-      async () => {
-        const encounter = globalScene.currentBattle.mysteryEncounter!;
-        // Spawn brutal fight
-        const config: EnemyPartyConfig = encounter.enemyPartyConfigs[2];
-
-        // To avoid player level snowballing from picking this option
-        encounter.expMultiplier = 0.9;
-
-        setEncounterRewards({ guaranteedModifierTiers: [ ModifierTier.ROGUE, ModifierTier.ROGUE, ModifierTier.ULTRA, ModifierTier.GREAT ], fillRemaining: true });
-
-        // Seed offsets to remove possibility of different trainers having exact same teams
-        let initBattlePromise: Promise<void>;
-        globalScene.executeWithSeedOffset(() => {
-          initBattlePromise = initBattleWithEnemyConfig(config);
-        }, globalScene.currentBattle.waveIndex * 1000);
-        await initBattlePromise!;
-      }
-    )
-    .withOutroDialogue([
-      {
-        text: `${namespace}:outro`,
-      },
-    ])
-    .build();
+      // Seed offsets to remove possibility of different trainers having exact same teams
+      let initBattlePromise: Promise<void>;
+      globalScene.executeWithSeedOffset(() => {
+        initBattlePromise = initBattleWithEnemyConfig(config);
+      }, globalScene.currentBattle.waveIndex * 1000);
+      await initBattlePromise!;
+    },
+  )
+  .withOutroDialogue([
+    {
+      text: `${namespace}:outro`,
+    },
+  ])
+  .build();
diff --git a/src/data/mystery-encounters/encounters/mysterious-chest-encounter.ts b/src/data/mystery-encounters/encounters/mysterious-chest-encounter.ts
index 9b4999020d0..e6c11378163 100644
--- a/src/data/mystery-encounters/encounters/mysterious-chest-encounter.ts
+++ b/src/data/mystery-encounters/encounters/mysterious-chest-encounter.ts
@@ -4,13 +4,21 @@ import { MysteryEncounterBuilder } from "#app/data/mystery-encounters/mystery-en
 import { MysteryEncounterOptionBuilder } from "#app/data/mystery-encounters/mystery-encounter-option";
 import { queueEncounterMessage, showEncounterText } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils";
 import type { EnemyPartyConfig } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
-import { initBattleWithEnemyConfig, leaveEncounterWithoutBattle, setEncounterRewards, transitionMysteryEncounterIntroVisuals } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
-import { getHighestLevelPlayerPokemon, koPlayerPokemon } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils";
+import {
+  initBattleWithEnemyConfig,
+  leaveEncounterWithoutBattle,
+  setEncounterRewards,
+  transitionMysteryEncounterIntroVisuals,
+} from "#app/data/mystery-encounters/utils/encounter-phase-utils";
+import {
+  getHighestLevelPlayerPokemon,
+  koPlayerPokemon,
+} from "#app/data/mystery-encounters/utils/encounter-pokemon-utils";
 import { getPokemonSpecies } from "#app/data/pokemon-species";
-import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/game-mode";
+import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants";
 import { ModifierTier } from "#app/modifier/modifier-tier";
 import { GameOverPhase } from "#app/phases/game-over-phase";
-import { randSeedInt } from "#app/utils";
+import { randSeedInt } from "#app/utils/common";
 import { Moves } from "#enums/moves";
 import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
 import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
@@ -21,8 +29,8 @@ import { Species } from "#enums/species";
 const namespace = "mysteryEncounters/mysteriousChest";
 
 const RAND_LENGTH = 100;
-const TRAP_PERCENT = 35;
-const COMMON_REWARDS_PERCENT = 20;
+const TRAP_PERCENT = 30;
+const COMMON_REWARDS_PERCENT = 25;
 const ULTRA_REWARDS_PERCENT = 30;
 const ROGUE_REWARDS_PERCENT = 10;
 const MASTER_REWARDS_PERCENT = 5;
@@ -32,183 +40,181 @@ const MASTER_REWARDS_PERCENT = 5;
  * @see {@link https://github.com/pagefaultgames/pokerogue/issues/3796 | GitHub Issue #3796}
  * @see For biome requirements check {@linkcode mysteryEncountersByBiome}
  */
-export const MysteriousChestEncounter: MysteryEncounter =
-  MysteryEncounterBuilder.withEncounterType(MysteryEncounterType.MYSTERIOUS_CHEST)
-    .withEncounterTier(MysteryEncounterTier.COMMON)
-    .withSceneWaveRangeRequirement(...CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES)
-    .withScenePartySizeRequirement(2, 6, true)
-    .withAutoHideIntroVisuals(false)
-    .withCatchAllowed(true)
-    .withIntroSpriteConfigs([
-      {
-        spriteKey: "mysterious_chest_blue",
-        fileRoot: "mystery-encounters",
-        hasShadow: true,
-        y: 8,
-        yShadow: 6,
-        alpha: 1,
-        disableAnimation: true, // Re-enabled after option select
-      },
-      {
-        spriteKey: "mysterious_chest_red",
-        fileRoot: "mystery-encounters",
-        hasShadow: false,
-        y: 8,
-        yShadow: 6,
-        alpha: 0,
-        disableAnimation: true, // Re-enabled after option select
-      }
-    ])
-    .withIntroDialogue([
-      {
-        text: `${namespace}:intro`,
-      }
-    ])
-    .setLocalizationKey(`${namespace}`)
-    .withTitle(`${namespace}:title`)
-    .withDescription(`${namespace}:description`)
-    .withQuery(`${namespace}:query`)
-    .withOnInit(() => {
-      const encounter = globalScene.currentBattle.mysteryEncounter!;
+export const MysteriousChestEncounter: MysteryEncounter = MysteryEncounterBuilder.withEncounterType(
+  MysteryEncounterType.MYSTERIOUS_CHEST,
+)
+  .withEncounterTier(MysteryEncounterTier.COMMON)
+  .withSceneWaveRangeRequirement(...CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES)
+  .withScenePartySizeRequirement(2, 6, true)
+  .withAutoHideIntroVisuals(false)
+  .withCatchAllowed(true)
+  .withIntroSpriteConfigs([
+    {
+      spriteKey: "mysterious_chest_blue",
+      fileRoot: "mystery-encounters",
+      hasShadow: true,
+      y: 8,
+      yShadow: 6,
+      alpha: 1,
+      disableAnimation: true, // Re-enabled after option select
+    },
+    {
+      spriteKey: "mysterious_chest_red",
+      fileRoot: "mystery-encounters",
+      hasShadow: false,
+      y: 8,
+      yShadow: 6,
+      alpha: 0,
+      disableAnimation: true, // Re-enabled after option select
+    },
+  ])
+  .withIntroDialogue([
+    {
+      text: `${namespace}:intro`,
+    },
+  ])
+  .setLocalizationKey(`${namespace}`)
+  .withTitle(`${namespace}:title`)
+  .withDescription(`${namespace}:description`)
+  .withQuery(`${namespace}:query`)
+  .withOnInit(() => {
+    const encounter = globalScene.currentBattle.mysteryEncounter!;
 
-      // Calculate boss mon
-      const config: EnemyPartyConfig = {
-        levelAdditiveModifier: 0.5,
-        disableSwitch: true,
-        pokemonConfigs: [
-          {
-            species: getPokemonSpecies(Species.GIMMIGHOUL),
-            formIndex: 0,
-            isBoss: true,
-            moveSet: [ Moves.NASTY_PLOT, Moves.SHADOW_BALL, Moves.POWER_GEM, Moves.THIEF ]
-          }
-        ],
-      };
+    // Calculate boss mon
+    const config: EnemyPartyConfig = {
+      levelAdditiveModifier: 0.5,
+      disableSwitch: true,
+      pokemonConfigs: [
+        {
+          species: getPokemonSpecies(Species.GIMMIGHOUL),
+          formIndex: 0,
+          isBoss: true,
+          moveSet: [Moves.NASTY_PLOT, Moves.SHADOW_BALL, Moves.POWER_GEM, Moves.THIEF],
+        },
+      ],
+    };
 
-      encounter.enemyPartyConfigs = [ config ];
+    encounter.enemyPartyConfigs = [config];
 
-      encounter.setDialogueToken("gimmighoulName", getPokemonSpecies(Species.GIMMIGHOUL).getName());
-      encounter.setDialogueToken("trapPercent", TRAP_PERCENT.toString());
-      encounter.setDialogueToken("commonPercent", COMMON_REWARDS_PERCENT.toString());
-      encounter.setDialogueToken("ultraPercent", ULTRA_REWARDS_PERCENT.toString());
-      encounter.setDialogueToken("roguePercent", ROGUE_REWARDS_PERCENT.toString());
-      encounter.setDialogueToken("masterPercent", MASTER_REWARDS_PERCENT.toString());
+    encounter.setDialogueToken("gimmighoulName", getPokemonSpecies(Species.GIMMIGHOUL).getName());
+    encounter.setDialogueToken("trapPercent", TRAP_PERCENT.toString());
+    encounter.setDialogueToken("commonPercent", COMMON_REWARDS_PERCENT.toString());
+    encounter.setDialogueToken("ultraPercent", ULTRA_REWARDS_PERCENT.toString());
+    encounter.setDialogueToken("roguePercent", ROGUE_REWARDS_PERCENT.toString());
+    encounter.setDialogueToken("masterPercent", MASTER_REWARDS_PERCENT.toString());
 
-      return true;
-    })
-    .withOption(
-      MysteryEncounterOptionBuilder
-        .newOptionWithMode(MysteryEncounterOptionMode.DEFAULT)
-        .withDialogue({
-          buttonLabel: `${namespace}:option.1.label`,
-          buttonTooltip: `${namespace}:option.1.tooltip`,
-          selected: [
-            {
-              text: `${namespace}:option.1.selected`,
-            },
-          ],
-        })
-        .withPreOptionPhase(async () => {
-          // Play animation
-          const encounter = globalScene.currentBattle.mysteryEncounter!;
-          const introVisuals = encounter.introVisuals!;
-
-          // Determine roll first
-          const roll = randSeedInt(RAND_LENGTH);
-          encounter.misc = {
-            roll
-          };
-
-          if (roll < TRAP_PERCENT) {
-            // Chest is springing trap, change to red chest sprite
-            const blueChestSprites = introVisuals.getSpriteAtIndex(0);
-            const redChestSprites = introVisuals.getSpriteAtIndex(1);
-            redChestSprites[0].setAlpha(1);
-            blueChestSprites[0].setAlpha(0.001);
-          }
-          introVisuals.spriteConfigs[0].disableAnimation = false;
-          introVisuals.spriteConfigs[1].disableAnimation = false;
-          introVisuals.playAnim();
-        })
-        .withOptionPhase(async () => {
-          // Open the chest
-          const encounter = globalScene.currentBattle.mysteryEncounter!;
-          const roll = encounter.misc.roll;
-          if (roll >= RAND_LENGTH - COMMON_REWARDS_PERCENT) {
-            // Choose between 2 COMMON / 2 GREAT tier items (20%)
-            setEncounterRewards({
-              guaranteedModifierTiers: [
-                ModifierTier.COMMON,
-                ModifierTier.COMMON,
-                ModifierTier.GREAT,
-                ModifierTier.GREAT,
-              ],
-            });
-            // Display result message then proceed to rewards
-            queueEncounterMessage(`${namespace}:option.1.normal`);
-            leaveEncounterWithoutBattle();
-          } else if (roll >= RAND_LENGTH - COMMON_REWARDS_PERCENT - ULTRA_REWARDS_PERCENT) {
-            // Choose between 3 ULTRA tier items (30%)
-            setEncounterRewards({
-              guaranteedModifierTiers: [
-                ModifierTier.ULTRA,
-                ModifierTier.ULTRA,
-                ModifierTier.ULTRA,
-              ],
-            });
-            // Display result message then proceed to rewards
-            queueEncounterMessage(`${namespace}:option.1.good`);
-            leaveEncounterWithoutBattle();
-          } else if (roll >= RAND_LENGTH - COMMON_REWARDS_PERCENT - ULTRA_REWARDS_PERCENT - ROGUE_REWARDS_PERCENT) {
-            // Choose between 2 ROGUE tier items (10%)
-            setEncounterRewards({ guaranteedModifierTiers: [ ModifierTier.ROGUE, ModifierTier.ROGUE ]});
-            // Display result message then proceed to rewards
-            queueEncounterMessage(`${namespace}:option.1.great`);
-            leaveEncounterWithoutBattle();
-          } else if (roll >= RAND_LENGTH - COMMON_REWARDS_PERCENT - ULTRA_REWARDS_PERCENT - ROGUE_REWARDS_PERCENT - MASTER_REWARDS_PERCENT) {
-            // Choose 1 MASTER tier item (5%)
-            setEncounterRewards({ guaranteedModifierTiers: [ ModifierTier.MASTER ]});
-            // Display result message then proceed to rewards
-            queueEncounterMessage(`${namespace}:option.1.amazing`);
-            leaveEncounterWithoutBattle();
-          } else {
-            // Your highest level unfainted Pokemon gets OHKO. Start battle against a Gimmighoul (35%)
-            const highestLevelPokemon = getHighestLevelPlayerPokemon(true, false);
-            koPlayerPokemon(highestLevelPokemon);
-
-            encounter.setDialogueToken("pokeName", highestLevelPokemon.getNameToRender());
-            await showEncounterText(`${namespace}:option.1.bad`);
-
-            // Handle game over edge case
-            const allowedPokemon = globalScene.getPokemonAllowedInBattle();
-            if (allowedPokemon.length === 0) {
-              // If there are no longer any legal pokemon in the party, game over.
-              globalScene.clearPhaseQueue();
-              globalScene.unshiftPhase(new GameOverPhase());
-            } else {
-              // Show which Pokemon was KOed, then start battle against Gimmighoul
-              await transitionMysteryEncounterIntroVisuals(true, true, 500);
-              setEncounterRewards({ fillRemaining: true });
-              await initBattleWithEnemyConfig(encounter.enemyPartyConfigs[0]);
-            }
-          }
-        })
-        .build()
-    )
-    .withSimpleOption(
-      {
-        buttonLabel: `${namespace}:option.2.label`,
-        buttonTooltip: `${namespace}:option.2.tooltip`,
+    return true;
+  })
+  .withOption(
+    MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DEFAULT)
+      .withDialogue({
+        buttonLabel: `${namespace}:option.1.label`,
+        buttonTooltip: `${namespace}:option.1.tooltip`,
         selected: [
           {
-            text: `${namespace}:option.2.selected`,
+            text: `${namespace}:option.1.selected`,
           },
         ],
-      },
-      async () => {
-        // Leave encounter with no rewards or exp
-        leaveEncounterWithoutBattle(true);
-        return true;
-      }
-    )
-    .build();
+      })
+      .withPreOptionPhase(async () => {
+        // Play animation
+        const encounter = globalScene.currentBattle.mysteryEncounter!;
+        const introVisuals = encounter.introVisuals!;
+
+        // Determine roll first
+        const roll = randSeedInt(RAND_LENGTH);
+        encounter.misc = {
+          roll,
+        };
+
+        if (roll < TRAP_PERCENT) {
+          // Chest is springing trap, change to red chest sprite
+          const blueChestSprites = introVisuals.getSpriteAtIndex(0);
+          const redChestSprites = introVisuals.getSpriteAtIndex(1);
+          redChestSprites[0].setAlpha(1);
+          blueChestSprites[0].setAlpha(0.001);
+        }
+        introVisuals.spriteConfigs[0].disableAnimation = false;
+        introVisuals.spriteConfigs[1].disableAnimation = false;
+        introVisuals.playAnim();
+      })
+      .withOptionPhase(async () => {
+        // Open the chest
+        const encounter = globalScene.currentBattle.mysteryEncounter!;
+        const roll = encounter.misc.roll;
+        if (roll >= RAND_LENGTH - COMMON_REWARDS_PERCENT) {
+          // Choose between 2 COMMON / 2 GREAT tier items (20%)
+          setEncounterRewards({
+            guaranteedModifierTiers: [ModifierTier.COMMON, ModifierTier.COMMON, ModifierTier.GREAT, ModifierTier.GREAT],
+          });
+          // Display result message then proceed to rewards
+          queueEncounterMessage(`${namespace}:option.1.normal`);
+          leaveEncounterWithoutBattle();
+        } else if (roll >= RAND_LENGTH - COMMON_REWARDS_PERCENT - ULTRA_REWARDS_PERCENT) {
+          // Choose between 3 ULTRA tier items (30%)
+          setEncounterRewards({
+            guaranteedModifierTiers: [ModifierTier.ULTRA, ModifierTier.ULTRA, ModifierTier.ULTRA],
+          });
+          // Display result message then proceed to rewards
+          queueEncounterMessage(`${namespace}:option.1.good`);
+          leaveEncounterWithoutBattle();
+        } else if (roll >= RAND_LENGTH - COMMON_REWARDS_PERCENT - ULTRA_REWARDS_PERCENT - ROGUE_REWARDS_PERCENT) {
+          // Choose between 2 ROGUE tier items (10%)
+          setEncounterRewards({
+            guaranteedModifierTiers: [ModifierTier.ROGUE, ModifierTier.ROGUE],
+          });
+          // Display result message then proceed to rewards
+          queueEncounterMessage(`${namespace}:option.1.great`);
+          leaveEncounterWithoutBattle();
+        } else if (
+          roll >=
+          RAND_LENGTH - COMMON_REWARDS_PERCENT - ULTRA_REWARDS_PERCENT - ROGUE_REWARDS_PERCENT - MASTER_REWARDS_PERCENT
+        ) {
+          // Choose 1 MASTER tier item (5%)
+          setEncounterRewards({
+            guaranteedModifierTiers: [ModifierTier.MASTER],
+          });
+          // Display result message then proceed to rewards
+          queueEncounterMessage(`${namespace}:option.1.amazing`);
+          leaveEncounterWithoutBattle();
+        } else {
+          // Your highest level unfainted Pokemon gets OHKO. Start battle against a Gimmighoul (35%)
+          const highestLevelPokemon = getHighestLevelPlayerPokemon(true, false);
+          koPlayerPokemon(highestLevelPokemon);
+
+          encounter.setDialogueToken("pokeName", highestLevelPokemon.getNameToRender());
+          await showEncounterText(`${namespace}:option.1.bad`);
+
+          // Handle game over edge case
+          const allowedPokemon = globalScene.getPokemonAllowedInBattle();
+          if (allowedPokemon.length === 0) {
+            // If there are no longer any legal pokemon in the party, game over.
+            globalScene.clearPhaseQueue();
+            globalScene.unshiftPhase(new GameOverPhase());
+          } else {
+            // Show which Pokemon was KOed, then start battle against Gimmighoul
+            await transitionMysteryEncounterIntroVisuals(true, true, 500);
+            setEncounterRewards({ fillRemaining: true });
+            await initBattleWithEnemyConfig(encounter.enemyPartyConfigs[0]);
+          }
+        }
+      })
+      .build(),
+  )
+  .withSimpleOption(
+    {
+      buttonLabel: `${namespace}:option.2.label`,
+      buttonTooltip: `${namespace}:option.2.tooltip`,
+      selected: [
+        {
+          text: `${namespace}:option.2.selected`,
+        },
+      ],
+    },
+    async () => {
+      // Leave encounter with no rewards or exp
+      leaveEncounterWithoutBattle(true);
+      return true;
+    },
+  )
+  .build();
diff --git a/src/data/mystery-encounters/encounters/part-timer-encounter.ts b/src/data/mystery-encounters/encounters/part-timer-encounter.ts
index 4db8e2eb6e8..1074eaf8c81 100644
--- a/src/data/mystery-encounters/encounters/part-timer-encounter.ts
+++ b/src/data/mystery-encounters/encounters/part-timer-encounter.ts
@@ -1,5 +1,12 @@
 import { MysteryEncounterOptionBuilder } from "#app/data/mystery-encounters/mystery-encounter-option";
-import { leaveEncounterWithoutBattle, selectPokemonForOption, setEncounterExp, setEncounterRewards, transitionMysteryEncounterIntroVisuals, updatePlayerMoney } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
+import {
+  leaveEncounterWithoutBattle,
+  selectPokemonForOption,
+  setEncounterExp,
+  setEncounterRewards,
+  transitionMysteryEncounterIntroVisuals,
+  updatePlayerMoney,
+} from "#app/data/mystery-encounters/utils/encounter-phase-utils";
 import { MysteryEncounterType } from "#enums/mystery-encounter-type";
 import { globalScene } from "#app/global-scene";
 import type MysteryEncounter from "#app/data/mystery-encounters/mystery-encounter";
@@ -13,7 +20,7 @@ import { showEncounterDialogue, showEncounterText } from "#app/data/mystery-enco
 import i18next from "i18next";
 import type { PlayerPokemon } from "#app/field/pokemon";
 import type Pokemon from "#app/field/pokemon";
-import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/game-mode";
+import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants";
 import { isPokemonValidForEncounterOptionSelection } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils";
 
 /** the i18n namespace for the encounter */
@@ -24,67 +31,68 @@ const namespace = "mysteryEncounters/partTimer";
  * @see {@link https://github.com/pagefaultgames/pokerogue/issues/3813 | GitHub Issue #3813}
  * @see For biome requirements check {@linkcode mysteryEncountersByBiome}
  */
-export const PartTimerEncounter: MysteryEncounter =
-  MysteryEncounterBuilder.withEncounterType(MysteryEncounterType.PART_TIMER)
-    .withEncounterTier(MysteryEncounterTier.COMMON)
-    .withSceneWaveRangeRequirement(...CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES)
-    .withIntroSpriteConfigs([
-      {
-        spriteKey: "part_timer_crate",
-        fileRoot: "mystery-encounters",
-        hasShadow: false,
-        y: 6,
-        x: 15
-      },
-      {
-        spriteKey: "worker_f",
-        fileRoot: "trainer",
-        hasShadow: true,
-        x: -18,
-        y: 4
-      }
-    ])
-    .withAutoHideIntroVisuals(false)
-    .withIntroDialogue([
-      {
-        text: `${namespace}:intro`,
-      },
-      {
-        speaker: `${namespace}:speaker`,
-        text: `${namespace}:intro_dialogue`,
-      },
-    ])
-    .withOnInit(() => {
-      // Load sfx
-      globalScene.loadSe("PRSFX- Horn Drill1", "battle_anims", "PRSFX- Horn Drill1.wav");
-      globalScene.loadSe("PRSFX- Horn Drill3", "battle_anims", "PRSFX- Horn Drill3.wav");
-      globalScene.loadSe("PRSFX- Guillotine2", "battle_anims", "PRSFX- Guillotine2.wav");
-      globalScene.loadSe("PRSFX- Heavy Slam2", "battle_anims", "PRSFX- Heavy Slam2.wav");
+export const PartTimerEncounter: MysteryEncounter = MysteryEncounterBuilder.withEncounterType(
+  MysteryEncounterType.PART_TIMER,
+)
+  .withEncounterTier(MysteryEncounterTier.COMMON)
+  .withSceneWaveRangeRequirement(...CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES)
+  .withIntroSpriteConfigs([
+    {
+      spriteKey: "part_timer_crate",
+      fileRoot: "mystery-encounters",
+      hasShadow: false,
+      y: 6,
+      x: 15,
+    },
+    {
+      spriteKey: "worker_f",
+      fileRoot: "trainer",
+      hasShadow: true,
+      x: -18,
+      y: 4,
+    },
+  ])
+  .withAutoHideIntroVisuals(false)
+  .withIntroDialogue([
+    {
+      text: `${namespace}:intro`,
+    },
+    {
+      speaker: `${namespace}:speaker`,
+      text: `${namespace}:intro_dialogue`,
+    },
+  ])
+  .withOnInit(() => {
+    // Load sfx
+    globalScene.loadSe("PRSFX- Horn Drill1", "battle_anims", "PRSFX- Horn Drill1.wav");
+    globalScene.loadSe("PRSFX- Horn Drill3", "battle_anims", "PRSFX- Horn Drill3.wav");
+    globalScene.loadSe("PRSFX- Guillotine2", "battle_anims", "PRSFX- Guillotine2.wav");
+    globalScene.loadSe("PRSFX- Heavy Slam2", "battle_anims", "PRSFX- Heavy Slam2.wav");
 
-      globalScene.loadSe("PRSFX- Agility", "battle_anims", "PRSFX- Agility.wav");
-      globalScene.loadSe("PRSFX- Extremespeed1", "battle_anims", "PRSFX- Extremespeed1.wav");
-      globalScene.loadSe("PRSFX- Accelerock1", "battle_anims", "PRSFX- Accelerock1.wav");
+    globalScene.loadSe("PRSFX- Agility", "battle_anims", "PRSFX- Agility.wav");
+    globalScene.loadSe("PRSFX- Extremespeed1", "battle_anims", "PRSFX- Extremespeed1.wav");
+    globalScene.loadSe("PRSFX- Accelerock1", "battle_anims", "PRSFX- Accelerock1.wav");
 
-      globalScene.loadSe("PRSFX- Captivate", "battle_anims", "PRSFX- Captivate.wav");
-      globalScene.loadSe("PRSFX- Attract2", "battle_anims", "PRSFX- Attract2.wav");
-      globalScene.loadSe("PRSFX- Aurora Veil2", "battle_anims", "PRSFX- Aurora Veil2.wav");
+    globalScene.loadSe("PRSFX- Captivate", "battle_anims", "PRSFX- Captivate.wav");
+    globalScene.loadSe("PRSFX- Attract2", "battle_anims", "PRSFX- Attract2.wav");
+    globalScene.loadSe("PRSFX- Aurora Veil2", "battle_anims", "PRSFX- Aurora Veil2.wav");
 
-      return true;
-    })
-    .setLocalizationKey(`${namespace}`)
-    .withTitle(`${namespace}:title`)
-    .withDescription(`${namespace}:description`)
-    .withQuery(`${namespace}:query`)
-    .withOption(MysteryEncounterOptionBuilder
-      .newOptionWithMode(MysteryEncounterOptionMode.DEFAULT)
+    return true;
+  })
+  .setLocalizationKey(`${namespace}`)
+  .withTitle(`${namespace}:title`)
+  .withDescription(`${namespace}:description`)
+  .withQuery(`${namespace}:query`)
+  .withOption(
+    MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DEFAULT)
       .withDialogue({
         buttonLabel: `${namespace}:option.1.label`,
         buttonTooltip: `${namespace}:option.1.tooltip`,
         selected: [
           {
-            text: `${namespace}:option.1.selected`
-          }
-        ]
+            text: `${namespace}:option.1.selected`,
+          },
+        ],
       })
       .withPreOptionPhase(async () => {
         const encounter = globalScene.currentBattle.mysteryEncounter!;
@@ -95,21 +103,21 @@ export const PartTimerEncounter: MysteryEncounter =
           // Calculate the "baseline" stat value (90 base stat, 16 IVs, neutral nature, same level as pokemon) to compare
           // Resulting money is 2.5 * (% difference from baseline), with minimum of 1 and maximum of 4.
           // Calculation from Pokemon.calculateStats
-          const baselineValue = Math.floor(((2 * 90 + 16) * pokemon.level) * 0.01) + 5;
+          const baselineValue = Math.floor((2 * 90 + 16) * pokemon.level * 0.01) + 5;
           const percentDiff = (pokemon.getStat(Stat.SPD) - baselineValue) / baselineValue;
           const moneyMultiplier = Math.min(Math.max(2.5 * (1 + percentDiff), 1), 4);
 
           encounter.misc = {
-            moneyMultiplier
+            moneyMultiplier,
           };
 
           // Reduce all PP to 2 (if they started at greater than 2)
-          pokemon.moveset.forEach(move => {
+          for (const move of pokemon.moveset) {
             if (move) {
               const newPpUsed = move.getMovePp() - 2;
               move.ppUsed = move.ppUsed < newPpUsed ? newPpUsed : move.ppUsed;
             }
-          });
+          }
 
           setEncounterExp(pokemon.id, 100);
 
@@ -141,24 +149,28 @@ export const PartTimerEncounter: MysteryEncounter =
         }
         const moneyChange = globalScene.getWaveMoneyAmount(moneyMultiplier);
         updatePlayerMoney(moneyChange, true, false);
-        await showEncounterText(i18next.t("mysteryEncounterMessages:receive_money", { amount: moneyChange }));
+        await showEncounterText(
+          i18next.t("mysteryEncounterMessages:receive_money", {
+            amount: moneyChange,
+          }),
+        );
         await showEncounterText(`${namespace}:pokemon_tired`);
 
         setEncounterRewards({ fillRemaining: true });
         leaveEncounterWithoutBattle();
       })
-      .build()
-    )
-    .withOption(MysteryEncounterOptionBuilder
-      .newOptionWithMode(MysteryEncounterOptionMode.DEFAULT)
+      .build(),
+  )
+  .withOption(
+    MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DEFAULT)
       .withDialogue({
         buttonLabel: `${namespace}:option.2.label`,
         buttonTooltip: `${namespace}:option.2.tooltip`,
         selected: [
           {
-            text: `${namespace}:option.2.selected`
-          }
-        ]
+            text: `${namespace}:option.2.selected`,
+          },
+        ],
       })
       .withPreOptionPhase(async () => {
         const encounter = globalScene.currentBattle.mysteryEncounter!;
@@ -169,24 +181,25 @@ export const PartTimerEncounter: MysteryEncounter =
           // Calculate the "baseline" stat value (75 base stat, 16 IVs, neutral nature, same level as pokemon) to compare
           // Resulting money is 2.5 * (% difference from baseline), with minimum of 1 and maximum of 4.
           // Calculation from Pokemon.calculateStats
-          const baselineHp = Math.floor(((2 * 75 + 16) * pokemon.level) * 0.01) + pokemon.level + 10;
-          const baselineAtkDef = Math.floor(((2 * 75 + 16) * pokemon.level) * 0.01) + 5;
+          const baselineHp = Math.floor((2 * 75 + 16) * pokemon.level * 0.01) + pokemon.level + 10;
+          const baselineAtkDef = Math.floor((2 * 75 + 16) * pokemon.level * 0.01) + 5;
           const baselineValue = baselineHp + 1.5 * (baselineAtkDef * 2);
-          const strongestValue = pokemon.getStat(Stat.HP) + 1.5 * (pokemon.getStat(Stat.ATK) + pokemon.getStat(Stat.DEF));
+          const strongestValue =
+            pokemon.getStat(Stat.HP) + 1.5 * (pokemon.getStat(Stat.ATK) + pokemon.getStat(Stat.DEF));
           const percentDiff = (strongestValue - baselineValue) / baselineValue;
           const moneyMultiplier = Math.min(Math.max(2.5 * (1 + percentDiff), 1), 4);
 
           encounter.misc = {
-            moneyMultiplier
+            moneyMultiplier,
           };
 
           // Reduce all PP to 2 (if they started at greater than 2)
-          pokemon.moveset.forEach(move => {
+          for (const move of pokemon.moveset) {
             if (move) {
               const newPpUsed = move.getMovePp() - 2;
               move.ppUsed = move.ppUsed < newPpUsed ? newPpUsed : move.ppUsed;
             }
-          });
+          }
 
           setEncounterExp(pokemon.id, 100);
 
@@ -218,73 +231,80 @@ export const PartTimerEncounter: MysteryEncounter =
         }
         const moneyChange = globalScene.getWaveMoneyAmount(moneyMultiplier);
         updatePlayerMoney(moneyChange, true, false);
-        await showEncounterText(i18next.t("mysteryEncounterMessages:receive_money", { amount: moneyChange }));
+        await showEncounterText(
+          i18next.t("mysteryEncounterMessages:receive_money", {
+            amount: moneyChange,
+          }),
+        );
         await showEncounterText(`${namespace}:pokemon_tired`);
 
         setEncounterRewards({ fillRemaining: true });
         leaveEncounterWithoutBattle();
       })
-      .build()
-    )
-    .withOption(
-      MysteryEncounterOptionBuilder
-        .newOptionWithMode(MysteryEncounterOptionMode.DISABLED_OR_SPECIAL)
-        .withPrimaryPokemonRequirement(new MoveRequirement(CHARMING_MOVES, true)) // Will set option3PrimaryName and option3PrimaryMove dialogue tokens automatically
-        .withDialogue({
-          buttonLabel: `${namespace}:option.3.label`,
-          buttonTooltip: `${namespace}:option.3.tooltip`,
-          disabledButtonTooltip: `${namespace}:option.3.disabled_tooltip`,
-          selected: [
-            {
-              text: `${namespace}:option.3.selected`,
-            },
-          ],
-        })
-        .withPreOptionPhase(async () => {
-          const encounter = globalScene.currentBattle.mysteryEncounter!;
-          const selectedPokemon = encounter.selectedOption?.primaryPokemon!;
-          encounter.setDialogueToken("selectedPokemon", selectedPokemon.getNameToRender());
+      .build(),
+  )
+  .withOption(
+    MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DISABLED_OR_SPECIAL)
+      .withPrimaryPokemonRequirement(new MoveRequirement(CHARMING_MOVES, true)) // Will set option3PrimaryName and option3PrimaryMove dialogue tokens automatically
+      .withDialogue({
+        buttonLabel: `${namespace}:option.3.label`,
+        buttonTooltip: `${namespace}:option.3.tooltip`,
+        disabledButtonTooltip: `${namespace}:option.3.disabled_tooltip`,
+        selected: [
+          {
+            text: `${namespace}:option.3.selected`,
+          },
+        ],
+      })
+      .withPreOptionPhase(async () => {
+        const encounter = globalScene.currentBattle.mysteryEncounter!;
+        const selectedPokemon = encounter.selectedOption?.primaryPokemon!;
+        encounter.setDialogueToken("selectedPokemon", selectedPokemon.getNameToRender());
 
-          // Reduce all PP to 2 (if they started at greater than 2)
-          selectedPokemon.moveset.forEach(move => {
-            if (move) {
-              const newPpUsed = move.getMovePp() - 2;
-              move.ppUsed = move.ppUsed < newPpUsed ? newPpUsed : move.ppUsed;
-            }
-          });
+        // Reduce all PP to 2 (if they started at greater than 2)
+        for (const move of selectedPokemon.moveset) {
+          if (move) {
+            const newPpUsed = move.getMovePp() - 2;
+            move.ppUsed = move.ppUsed < newPpUsed ? newPpUsed : move.ppUsed;
+          }
+        }
 
-          setEncounterExp(selectedPokemon.id, 100);
+        setEncounterExp(selectedPokemon.id, 100);
 
-          // Hide intro visuals
-          transitionMysteryEncounterIntroVisuals(true, false);
-          // Play sfx for "working"
-          doSalesSfx();
-          return true;
-        })
-        .withOptionPhase(async () => {
-          // Assist with Sales
-          // Bring visuals back in
-          await transitionMysteryEncounterIntroVisuals(false, false);
+        // Hide intro visuals
+        transitionMysteryEncounterIntroVisuals(true, false);
+        // Play sfx for "working"
+        doSalesSfx();
+        return true;
+      })
+      .withOptionPhase(async () => {
+        // Assist with Sales
+        // Bring visuals back in
+        await transitionMysteryEncounterIntroVisuals(false, false);
 
-          // Give money and do dialogue
-          await showEncounterDialogue(`${namespace}:job_complete_good`, `${namespace}:speaker`);
-          const moneyChange = globalScene.getWaveMoneyAmount(2.5);
-          updatePlayerMoney(moneyChange, true, false);
-          await showEncounterText(i18next.t("mysteryEncounterMessages:receive_money", { amount: moneyChange }));
-          await showEncounterText(`${namespace}:pokemon_tired`);
+        // Give money and do dialogue
+        await showEncounterDialogue(`${namespace}:job_complete_good`, `${namespace}:speaker`);
+        const moneyChange = globalScene.getWaveMoneyAmount(2.5);
+        updatePlayerMoney(moneyChange, true, false);
+        await showEncounterText(
+          i18next.t("mysteryEncounterMessages:receive_money", {
+            amount: moneyChange,
+          }),
+        );
+        await showEncounterText(`${namespace}:pokemon_tired`);
 
-          setEncounterRewards({ fillRemaining: true });
-          leaveEncounterWithoutBattle();
-        })
-        .build()
-    )
-    .withOutroDialogue([
-      {
-        speaker: `${namespace}:speaker`,
-        text: `${namespace}:outro`,
-      }
-    ])
-    .build();
+        setEncounterRewards({ fillRemaining: true });
+        leaveEncounterWithoutBattle();
+      })
+      .build(),
+  )
+  .withOutroDialogue([
+    {
+      speaker: `${namespace}:speaker`,
+      text: `${namespace}:outro`,
+    },
+  ])
+  .build();
 
 function doStrongWorkSfx() {
   globalScene.playSound("battle_anims/PRSFX- Horn Drill1");
diff --git a/src/data/mystery-encounters/encounters/safari-zone-encounter.ts b/src/data/mystery-encounters/encounters/safari-zone-encounter.ts
index fd078e1ffaa..7a12c86edff 100644
--- a/src/data/mystery-encounters/encounters/safari-zone-encounter.ts
+++ b/src/data/mystery-encounters/encounters/safari-zone-encounter.ts
@@ -1,33 +1,43 @@
-import { initSubsequentOptionSelect, leaveEncounterWithoutBattle, transitionMysteryEncounterIntroVisuals, updatePlayerMoney, } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
+import {
+  initSubsequentOptionSelect,
+  leaveEncounterWithoutBattle,
+  transitionMysteryEncounterIntroVisuals,
+  updatePlayerMoney,
+} from "#app/data/mystery-encounters/utils/encounter-phase-utils";
 import { MysteryEncounterType } from "#enums/mystery-encounter-type";
 import { globalScene } from "#app/global-scene";
 import type MysteryEncounter from "#app/data/mystery-encounters/mystery-encounter";
 import { MysteryEncounterBuilder } from "#app/data/mystery-encounters/mystery-encounter";
 import type MysteryEncounterOption from "#app/data/mystery-encounters/mystery-encounter-option";
 import { MysteryEncounterOptionBuilder } from "#app/data/mystery-encounters/mystery-encounter-option";
-import { TrainerSlot } from "#app/data/trainer-config";
+import { TrainerSlot } from "#enums/trainer-slot";
 import { HiddenAbilityRateBoosterModifier, IvScannerModifier } from "#app/modifier/modifier";
 import type { EnemyPokemon } from "#app/field/pokemon";
 import { PokeballType } from "#enums/pokeball";
 import { PlayerGender } from "#enums/player-gender";
-import { IntegerHolder, randSeedInt } from "#app/utils";
+import { NumberHolder, randSeedInt } from "#app/utils/common";
 import type PokemonSpecies from "#app/data/pokemon-species";
 import { getPokemonSpecies } from "#app/data/pokemon-species";
 import { MoneyRequirement } from "#app/data/mystery-encounters/mystery-encounter-requirements";
-import { doPlayerFlee, doPokemonFlee, getRandomSpeciesByStarterCost, trainerThrowPokeball } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils";
+import {
+  doPlayerFlee,
+  doPokemonFlee,
+  getRandomSpeciesByStarterCost,
+  trainerThrowPokeball,
+} from "#app/data/mystery-encounters/utils/encounter-pokemon-utils";
 import { getEncounterText, showEncounterText } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils";
 import { getPokemonNameWithAffix } from "#app/messages";
 import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
 import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
 import { ScanIvsPhase } from "#app/phases/scan-ivs-phase";
 import { SummonPhase } from "#app/phases/summon-phase";
-import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/game-mode";
+import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants";
 import { NON_LEGEND_PARADOX_POKEMON } from "#app/data/balance/special-species-groups";
 
 /** the i18n namespace for the encounter */
 const namespace = "mysteryEncounters/safariZone";
 
-const TRAINER_THROW_ANIMATION_TIMES = [ 512, 184, 768 ];
+const TRAINER_THROW_ANIMATION_TIMES = [512, 184, 768];
 
 const SAFARI_MONEY_MULTIPLIER = 2;
 
@@ -38,36 +48,37 @@ const NUM_SAFARI_ENCOUNTERS = 3;
  * @see {@link https://github.com/pagefaultgames/pokerogue/issues/3800 | GitHub Issue #3800}
  * @see For biome requirements check {@linkcode mysteryEncountersByBiome}
  */
-export const SafariZoneEncounter: MysteryEncounter =
-  MysteryEncounterBuilder.withEncounterType(MysteryEncounterType.SAFARI_ZONE)
-    .withEncounterTier(MysteryEncounterTier.GREAT)
-    .withSceneWaveRangeRequirement(...CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES)
-    .withSceneRequirement(new MoneyRequirement(0, SAFARI_MONEY_MULTIPLIER)) // Cost equal to 1 Max Revive
-    .withAutoHideIntroVisuals(false)
-    .withIntroSpriteConfigs([
-      {
-        spriteKey: "safari_zone",
-        fileRoot: "mystery-encounters",
-        hasShadow: false,
-        x: 4,
-        y: 6
-      },
-    ])
-    .withIntroDialogue([
-      {
-        text: `${namespace}:intro`,
-      },
-    ])
-    .setLocalizationKey(`${namespace}`)
-    .withTitle(`${namespace}:title`)
-    .withDescription(`${namespace}:description`)
-    .withQuery(`${namespace}:query`)
-    .withOnInit(() => {
-      globalScene.currentBattle.mysteryEncounter?.setDialogueToken("numEncounters", NUM_SAFARI_ENCOUNTERS.toString());
-      return true;
-    })
-    .withOption(MysteryEncounterOptionBuilder
-      .newOptionWithMode(MysteryEncounterOptionMode.DISABLED_OR_DEFAULT)
+export const SafariZoneEncounter: MysteryEncounter = MysteryEncounterBuilder.withEncounterType(
+  MysteryEncounterType.SAFARI_ZONE,
+)
+  .withEncounterTier(MysteryEncounterTier.GREAT)
+  .withSceneWaveRangeRequirement(...CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES)
+  .withSceneRequirement(new MoneyRequirement(0, SAFARI_MONEY_MULTIPLIER)) // Cost equal to 1 Max Revive
+  .withAutoHideIntroVisuals(false)
+  .withIntroSpriteConfigs([
+    {
+      spriteKey: "safari_zone",
+      fileRoot: "mystery-encounters",
+      hasShadow: false,
+      x: 4,
+      y: 6,
+    },
+  ])
+  .withIntroDialogue([
+    {
+      text: `${namespace}:intro`,
+    },
+  ])
+  .setLocalizationKey(`${namespace}`)
+  .withTitle(`${namespace}:title`)
+  .withDescription(`${namespace}:description`)
+  .withQuery(`${namespace}:query`)
+  .withOnInit(() => {
+    globalScene.currentBattle.mysteryEncounter?.setDialogueToken("numEncounters", NUM_SAFARI_ENCOUNTERS.toString());
+    return true;
+  })
+  .withOption(
+    MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DISABLED_OR_DEFAULT)
       .withSceneRequirement(new MoneyRequirement(0, SAFARI_MONEY_MULTIPLIER)) // Cost equal to 1 Max Revive
       .withDialogue({
         buttonLabel: `${namespace}:option.1.label`,
@@ -83,7 +94,7 @@ export const SafariZoneEncounter: MysteryEncounter =
         const encounter = globalScene.currentBattle.mysteryEncounter!;
         encounter.continuousEncounter = true;
         encounter.misc = {
-          safariPokemonRemaining: NUM_SAFARI_ENCOUNTERS
+          safariPokemonRemaining: NUM_SAFARI_ENCOUNTERS,
         };
         updatePlayerMoney(-(encounter.options[0].requirements[0] as MoneyRequirement).requiredMoney);
         // Load bait/mud assets
@@ -96,28 +107,31 @@ export const SafariZoneEncounter: MysteryEncounter =
         globalScene.currentBattle.enemyParty = [];
         await transitionMysteryEncounterIntroVisuals();
         await summonSafariPokemon();
-        initSubsequentOptionSelect({ overrideOptions: safariZoneGameOptions, hideDescription: true });
+        initSubsequentOptionSelect({
+          overrideOptions: safariZoneGameOptions,
+          hideDescription: true,
+        });
         return true;
       })
-      .build()
-    )
-    .withSimpleOption(
-      {
-        buttonLabel: `${namespace}:option.2.label`,
-        buttonTooltip: `${namespace}:option.2.tooltip`,
-        selected: [
-          {
-            text: `${namespace}:option.2.selected`,
-          },
-        ],
-      },
-      async () => {
-        // Leave encounter with no rewards or exp
-        leaveEncounterWithoutBattle(true);
-        return true;
-      }
-    )
-    .build();
+      .build(),
+  )
+  .withSimpleOption(
+    {
+      buttonLabel: `${namespace}:option.2.label`,
+      buttonTooltip: `${namespace}:option.2.tooltip`,
+      selected: [
+        {
+          text: `${namespace}:option.2.selected`,
+        },
+      ],
+    },
+    async () => {
+      // Leave encounter with no rewards or exp
+      leaveEncounterWithoutBattle(true);
+      return true;
+    },
+  )
+  .build();
 
 /**
  * SAFARI ZONE MINIGAME OPTIONS
@@ -135,15 +149,14 @@ export const SafariZoneEncounter: MysteryEncounter =
  * Flee chance = fleeRate / 255
  */
 const safariZoneGameOptions: MysteryEncounterOption[] = [
-  MysteryEncounterOptionBuilder
-    .newOptionWithMode(MysteryEncounterOptionMode.DEFAULT)
+  MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DEFAULT)
     .withDialogue({
       buttonLabel: `${namespace}:safari.1.label`,
       buttonTooltip: `${namespace}:safari.1.tooltip`,
       selected: [
         {
           text: `${namespace}:safari.1.selected`,
-        }
+        },
       ],
     })
     .withOptionPhase(async () => {
@@ -157,7 +170,11 @@ const safariZoneGameOptions: MysteryEncounterOption[] = [
         // Check how many safari pokemon left
         if (encounter.misc.safariPokemonRemaining > 0) {
           await summonSafariPokemon();
-          initSubsequentOptionSelect({ overrideOptions: safariZoneGameOptions, startingCursorIndex: 0, hideDescription: true });
+          initSubsequentOptionSelect({
+            overrideOptions: safariZoneGameOptions,
+            startingCursorIndex: 0,
+            hideDescription: true,
+          });
         } else {
           // End safari mode
           encounter.continuousEncounter = false;
@@ -170,8 +187,7 @@ const safariZoneGameOptions: MysteryEncounterOption[] = [
       return true;
     })
     .build(),
-  MysteryEncounterOptionBuilder
-    .newOptionWithMode(MysteryEncounterOptionMode.DEFAULT)
+  MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DEFAULT)
     .withDialogue({
       buttonLabel: `${namespace}:safari.2.label`,
       buttonTooltip: `${namespace}:safari.2.tooltip`,
@@ -191,7 +207,7 @@ const safariZoneGameOptions: MysteryEncounterOption[] = [
       // 80% chance to increase flee stage +1
       const fleeChangeResult = tryChangeFleeStage(1, 8);
       if (!fleeChangeResult) {
-        await showEncounterText(getEncounterText(`${namespace}:safari.busy_eating`) ?? "", null, 1000, false );
+        await showEncounterText(getEncounterText(`${namespace}:safari.busy_eating`) ?? "", null, 1000, false);
       } else {
         await showEncounterText(getEncounterText(`${namespace}:safari.eating`) ?? "", null, 1000, false);
       }
@@ -200,8 +216,7 @@ const safariZoneGameOptions: MysteryEncounterOption[] = [
       return true;
     })
     .build(),
-  MysteryEncounterOptionBuilder
-    .newOptionWithMode(MysteryEncounterOptionMode.DEFAULT)
+  MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DEFAULT)
     .withDialogue({
       buttonLabel: `${namespace}:safari.3.label`,
       buttonTooltip: `${namespace}:safari.3.tooltip`,
@@ -220,17 +235,16 @@ const safariZoneGameOptions: MysteryEncounterOption[] = [
       // 80% chance to decrease catch stage -1
       const catchChangeResult = tryChangeCatchStage(-1, 8);
       if (!catchChangeResult) {
-        await showEncounterText(getEncounterText(`${namespace}:safari.beside_itself_angry`) ?? "", null, 1000, false );
+        await showEncounterText(getEncounterText(`${namespace}:safari.beside_itself_angry`) ?? "", null, 1000, false);
       } else {
-        await showEncounterText(getEncounterText(`${namespace}:safari.angry`) ?? "", null, 1000, false );
+        await showEncounterText(getEncounterText(`${namespace}:safari.angry`) ?? "", null, 1000, false);
       }
 
       await doEndTurn(2);
       return true;
     })
     .build(),
-  MysteryEncounterOptionBuilder
-    .newOptionWithMode(MysteryEncounterOptionMode.DEFAULT)
+  MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DEFAULT)
     .withDialogue({
       buttonLabel: `${namespace}:safari.4.label`,
       buttonTooltip: `${namespace}:safari.4.tooltip`,
@@ -243,7 +257,11 @@ const safariZoneGameOptions: MysteryEncounterOption[] = [
       // Check how many safari pokemon left
       if (encounter.misc.safariPokemonRemaining > 0) {
         await summonSafariPokemon();
-        initSubsequentOptionSelect({ overrideOptions: safariZoneGameOptions, startingCursorIndex: 3, hideDescription: true });
+        initSubsequentOptionSelect({
+          overrideOptions: safariZoneGameOptions,
+          startingCursorIndex: 3,
+          hideDescription: true,
+        });
       } else {
         // End safari mode
         encounter.continuousEncounter = false;
@@ -251,7 +269,7 @@ const safariZoneGameOptions: MysteryEncounterOption[] = [
       }
       return true;
     })
-    .build()
+    .build(),
 ];
 
 async function summonSafariPokemon() {
@@ -262,38 +280,41 @@ async function summonSafariPokemon() {
 
   // Generate pokemon using safariPokemonRemaining so they are always the same pokemon no matter how many turns are taken
   // Safari pokemon roll twice on shiny and HA chances, but are otherwise normal
-  let enemySpecies;
-  let pokemon;
-  globalScene.executeWithSeedOffset(() => {
-    enemySpecies = getSafariSpeciesSpawn();
-    const level = globalScene.currentBattle.getLevelForWave();
-    enemySpecies = getPokemonSpecies(enemySpecies.getWildSpeciesForLevel(level, true, false, globalScene.gameMode));
-    pokemon = globalScene.addEnemyPokemon(enemySpecies, level, TrainerSlot.NONE, false);
+  let enemySpecies: PokemonSpecies;
+  let pokemon: any;
+  globalScene.executeWithSeedOffset(
+    () => {
+      enemySpecies = getSafariSpeciesSpawn();
+      const level = globalScene.currentBattle.getLevelForWave();
+      enemySpecies = getPokemonSpecies(enemySpecies.getWildSpeciesForLevel(level, true, false, globalScene.gameMode));
+      pokemon = globalScene.addEnemyPokemon(enemySpecies, level, TrainerSlot.NONE, false);
 
-    // Roll shiny twice
-    if (!pokemon.shiny) {
-      pokemon.trySetShinySeed();
-    }
+      // Roll shiny twice
+      if (!pokemon.shiny) {
+        pokemon.trySetShinySeed();
+      }
 
-    // Roll HA twice
-    if (pokemon.species.abilityHidden) {
-      const hiddenIndex = pokemon.species.ability2 ? 2 : 1;
-      if (pokemon.abilityIndex < hiddenIndex) {
-        const hiddenAbilityChance = new IntegerHolder(256);
-        globalScene.applyModifiers(HiddenAbilityRateBoosterModifier, true, hiddenAbilityChance);
+      // Roll HA twice
+      if (pokemon.species.abilityHidden) {
+        const hiddenIndex = pokemon.species.ability2 ? 2 : 1;
+        if (pokemon.abilityIndex < hiddenIndex) {
+          const hiddenAbilityChance = new NumberHolder(256);
+          globalScene.applyModifiers(HiddenAbilityRateBoosterModifier, true, hiddenAbilityChance);
 
-        const hasHiddenAbility = !randSeedInt(hiddenAbilityChance.value);
+          const hasHiddenAbility = !randSeedInt(hiddenAbilityChance.value);
 
-        if (hasHiddenAbility) {
-          pokemon.abilityIndex = hiddenIndex;
+          if (hasHiddenAbility) {
+            pokemon.abilityIndex = hiddenIndex;
+          }
         }
       }
-    }
 
-    pokemon.calculateStats();
+      pokemon.calculateStats();
 
-    globalScene.currentBattle.enemyParty.unshift(pokemon);
-  }, globalScene.currentBattle.waveIndex * 1000 * encounter.misc.safariPokemonRemaining);
+      globalScene.currentBattle.enemyParty.unshift(pokemon);
+    },
+    globalScene.currentBattle.waveIndex * 1000 * encounter.misc.safariPokemonRemaining,
+  );
 
   globalScene.gameData.setPokemonSeen(pokemon, true);
   await pokemon.loadAssets();
@@ -315,7 +336,7 @@ async function summonSafariPokemon() {
 
   const ivScannerModifier = globalScene.findModifier(m => m instanceof IvScannerModifier);
   if (ivScannerModifier) {
-    globalScene.pushPhase(new ScanIvsPhase(pokemon.getBattlerIndex(), Math.min(ivScannerModifier.getStackCount() * 2, 6)));
+    globalScene.pushPhase(new ScanIvsPhase(pokemon.getBattlerIndex()));
   }
 }
 
@@ -324,7 +345,8 @@ function throwPokeball(pokemon: EnemyPokemon): Promise<boolean> {
   // Catch stage ranges from -6 to +6 (like stat boost stages)
   const safariCatchStage = globalScene.currentBattle.mysteryEncounter!.misc.catchStage;
   // Catch modifier ranges from 2/8 (-6 stage) to 8/2 (+6)
-  const safariModifier = (2 + Math.min(Math.max(safariCatchStage, 0), 6)) / (2 - Math.max(Math.min(safariCatchStage, 0), -6));
+  const safariModifier =
+    (2 + Math.min(Math.max(safariCatchStage, 0), 6)) / (2 - Math.max(Math.min(safariCatchStage, 0), -6));
   // Catch rate same as safari ball
   const pokeballMultiplier = 1.5;
   const catchRate = Math.round(baseCatchRate * pokeballMultiplier * safariModifier);
@@ -341,7 +363,9 @@ async function throwBait(pokemon: EnemyPokemon): Promise<boolean> {
   globalScene.field.add(bait);
 
   return new Promise(resolve => {
-    globalScene.trainer.setTexture(`trainer_${globalScene.gameData.gender === PlayerGender.FEMALE ? "f" : "m"}_back_pb`);
+    globalScene.trainer.setTexture(
+      `trainer_${globalScene.gameData.gender === PlayerGender.FEMALE ? "f" : "m"}_back_pb`,
+    );
     globalScene.time.delayedCall(TRAINER_THROW_ANIMATION_TIMES[0], () => {
       globalScene.playSound("se/pb_throw");
 
@@ -350,7 +374,9 @@ async function throwBait(pokemon: EnemyPokemon): Promise<boolean> {
       globalScene.time.delayedCall(TRAINER_THROW_ANIMATION_TIMES[1], () => {
         globalScene.trainer.setFrame("3");
         globalScene.time.delayedCall(TRAINER_THROW_ANIMATION_TIMES[2], () => {
-          globalScene.trainer.setTexture(`trainer_${globalScene.gameData.gender === PlayerGender.FEMALE ? "f" : "m"}_back`);
+          globalScene.trainer.setTexture(
+            `trainer_${globalScene.gameData.gender === PlayerGender.FEMALE ? "f" : "m"}_back`,
+          );
         });
       });
 
@@ -361,7 +387,6 @@ async function throwBait(pokemon: EnemyPokemon): Promise<boolean> {
         y: { value: 55 + fpOffset[1], ease: "Cubic.easeOut" },
         duration: 500,
         onComplete: () => {
-
           let index = 1;
           globalScene.time.delayedCall(768, () => {
             globalScene.tweens.add({
@@ -389,10 +414,10 @@ async function throwBait(pokemon: EnemyPokemon): Promise<boolean> {
                   bait.destroy();
                   resolve(true);
                 });
-              }
+              },
             });
           });
-        }
+        },
       });
     });
   });
@@ -407,7 +432,9 @@ async function throwMud(pokemon: EnemyPokemon): Promise<boolean> {
   globalScene.field.add(mud);
 
   return new Promise(resolve => {
-    globalScene.trainer.setTexture(`trainer_${globalScene.gameData.gender === PlayerGender.FEMALE ? "f" : "m"}_back_pb`);
+    globalScene.trainer.setTexture(
+      `trainer_${globalScene.gameData.gender === PlayerGender.FEMALE ? "f" : "m"}_back_pb`,
+    );
     globalScene.time.delayedCall(TRAINER_THROW_ANIMATION_TIMES[0], () => {
       globalScene.playSound("se/pb_throw");
 
@@ -416,7 +443,9 @@ async function throwMud(pokemon: EnemyPokemon): Promise<boolean> {
       globalScene.time.delayedCall(TRAINER_THROW_ANIMATION_TIMES[1], () => {
         globalScene.trainer.setFrame("3");
         globalScene.time.delayedCall(TRAINER_THROW_ANIMATION_TIMES[2], () => {
-          globalScene.trainer.setTexture(`trainer_${globalScene.gameData.gender === PlayerGender.FEMALE ? "f" : "m"}_back`);
+          globalScene.trainer.setTexture(
+            `trainer_${globalScene.gameData.gender === PlayerGender.FEMALE ? "f" : "m"}_back`,
+          );
         });
       });
 
@@ -461,11 +490,11 @@ async function throwMud(pokemon: EnemyPokemon): Promise<boolean> {
                 },
                 onComplete: () => {
                   resolve(true);
-                }
+                },
               });
-            }
+            },
           });
-        }
+        },
       });
     });
   });
@@ -474,7 +503,7 @@ async function throwMud(pokemon: EnemyPokemon): Promise<boolean> {
 function isPokemonFlee(pokemon: EnemyPokemon, fleeStage: number): boolean {
   const speciesCatchRate = pokemon.species.catchRate;
   const fleeModifier = (2 + Math.min(Math.max(fleeStage, 0), 6)) / (2 - Math.max(Math.min(fleeStage, 0), -6));
-  const fleeRate = (255 * 255 - speciesCatchRate * speciesCatchRate) / 255 / 2 * fleeModifier;
+  const fleeRate = ((255 * 255 - speciesCatchRate * speciesCatchRate) / 255 / 2) * fleeModifier;
   console.log("Flee rate: " + fleeRate);
   const roll = randSeedInt(256);
   console.log("Roll: " + roll);
@@ -519,7 +548,11 @@ async function doEndTurn(cursorIndex: number) {
     // Check how many safari pokemon left
     if (encounter.misc.safariPokemonRemaining > 0) {
       await summonSafariPokemon();
-      initSubsequentOptionSelect({ overrideOptions: safariZoneGameOptions, startingCursorIndex: cursorIndex, hideDescription: true });
+      initSubsequentOptionSelect({
+        overrideOptions: safariZoneGameOptions,
+        startingCursorIndex: cursorIndex,
+        hideDescription: true,
+      });
     } else {
       // End safari mode
       encounter.continuousEncounter = false;
@@ -527,7 +560,11 @@ async function doEndTurn(cursorIndex: number) {
     }
   } else {
     globalScene.queueMessage(getEncounterText(`${namespace}:safari.watching`) ?? "", 0, null, 1000);
-    initSubsequentOptionSelect({ overrideOptions: safariZoneGameOptions, startingCursorIndex: cursorIndex, hideDescription: true });
+    initSubsequentOptionSelect({
+      overrideOptions: safariZoneGameOptions,
+      startingCursorIndex: cursorIndex,
+      hideDescription: true,
+    });
   }
 }
 
@@ -535,5 +572,7 @@ async function doEndTurn(cursorIndex: number) {
  * @returns A random species that has at most 5 starter cost and is not Mythical, Paradox, etc.
  */
 export function getSafariSpeciesSpawn(): PokemonSpecies {
-  return getPokemonSpecies(getRandomSpeciesByStarterCost([ 0, 5 ], NON_LEGEND_PARADOX_POKEMON, undefined, false, false, false));
+  return getPokemonSpecies(
+    getRandomSpeciesByStarterCost([0, 5], NON_LEGEND_PARADOX_POKEMON, undefined, false, false, false),
+  );
 }
diff --git a/src/data/mystery-encounters/encounters/shady-vitamin-dealer-encounter.ts b/src/data/mystery-encounters/encounters/shady-vitamin-dealer-encounter.ts
index d5362df28e7..daf4d860cdf 100644
--- a/src/data/mystery-encounters/encounters/shady-vitamin-dealer-encounter.ts
+++ b/src/data/mystery-encounters/encounters/shady-vitamin-dealer-encounter.ts
@@ -1,8 +1,14 @@
-import { generateModifierType, leaveEncounterWithoutBattle, selectPokemonForOption, setEncounterExp, updatePlayerMoney, } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
+import {
+  generateModifierType,
+  leaveEncounterWithoutBattle,
+  selectPokemonForOption,
+  setEncounterExp,
+  updatePlayerMoney,
+} from "#app/data/mystery-encounters/utils/encounter-phase-utils";
 import type { PlayerPokemon } from "#app/field/pokemon";
 import type Pokemon from "#app/field/pokemon";
 import { modifierTypes } from "#app/modifier/modifier-type";
-import { randSeedInt } from "#app/utils";
+import { randSeedInt } from "#app/utils/common";
 import { MysteryEncounterType } from "#enums/mystery-encounter-type";
 import { Species } from "#enums/species";
 import { globalScene } from "#app/global-scene";
@@ -11,12 +17,16 @@ import { MysteryEncounterBuilder } from "#app/data/mystery-encounters/mystery-en
 import { MysteryEncounterOptionBuilder } from "#app/data/mystery-encounters/mystery-encounter-option";
 import { MoneyRequirement } from "#app/data/mystery-encounters/mystery-encounter-requirements";
 import { getEncounterText, queueEncounterMessage } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils";
-import { applyDamageToPokemon, applyModifierTypeToPlayerPokemon, isPokemonValidForEncounterOptionSelection } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils";
+import {
+  applyDamageToPokemon,
+  applyModifierTypeToPlayerPokemon,
+  isPokemonValidForEncounterOptionSelection,
+} from "#app/data/mystery-encounters/utils/encounter-pokemon-utils";
 import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
 import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
 import type { Nature } from "#enums/nature";
 import { getNatureName } from "#app/data/nature";
-import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/game-mode";
+import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants";
 import i18next from "i18next";
 
 /** the i18n namespace for this encounter */
@@ -30,201 +40,204 @@ const VITAMIN_DEALER_EXPENSIVE_PRICE_MULTIPLIER = 5;
  * @see {@link https://github.com/pagefaultgames/pokerogue/issues/3798 | GitHub Issue #3798}
  * @see For biome requirements check {@linkcode mysteryEncountersByBiome}
  */
-export const ShadyVitaminDealerEncounter: MysteryEncounter =
-  MysteryEncounterBuilder.withEncounterType(MysteryEncounterType.SHADY_VITAMIN_DEALER)
-    .withEncounterTier(MysteryEncounterTier.COMMON)
-    .withSceneWaveRangeRequirement(...CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES)
-    .withSceneRequirement(new MoneyRequirement(0, VITAMIN_DEALER_CHEAP_PRICE_MULTIPLIER)) // Must have the money for at least the cheap deal
-    .withPrimaryPokemonHealthRatioRequirement([ 0.51, 1 ]) // At least 1 Pokemon must have above half HP
-    .withIntroSpriteConfigs([
-      {
-        spriteKey: Species.KROOKODILE.toString(),
-        fileRoot: "pokemon",
-        hasShadow: true,
-        repeat: true,
-        x: 12,
-        y: -5,
-        yShadow: -5
-      },
-      {
-        spriteKey: "shady_vitamin_dealer",
-        fileRoot: "mystery-encounters",
-        hasShadow: true,
-        x: -12,
-        y: 3,
-        yShadow: 3
-      },
-    ])
-    .withIntroDialogue([
-      {
-        text: `${namespace}:intro`,
-      },
-      {
-        text: `${namespace}:intro_dialogue`,
-        speaker: `${namespace}:speaker`,
-      },
-    ])
-    .setLocalizationKey(`${namespace}`)
-    .withTitle(`${namespace}:title`)
-    .withDescription(`${namespace}:description`)
-    .withQuery(`${namespace}:query`)
-    .withOption(
-      MysteryEncounterOptionBuilder
-        .newOptionWithMode(MysteryEncounterOptionMode.DISABLED_OR_DEFAULT)
-        .withSceneMoneyRequirement(0, VITAMIN_DEALER_CHEAP_PRICE_MULTIPLIER)
-        .withDialogue({
-          buttonLabel: `${namespace}:option.1.label`,
-          buttonTooltip: `${namespace}:option.1.tooltip`,
-          selected: [
-            {
-              text: `${namespace}:option.selected`,
-            },
-          ],
-        })
-        .withPreOptionPhase(async (): Promise<boolean> => {
-          const encounter = globalScene.currentBattle.mysteryEncounter!;
-          const onPokemonSelected = (pokemon: PlayerPokemon) => {
-            // Update money
-            updatePlayerMoney(-(encounter.options[0].requirements[0] as MoneyRequirement).requiredMoney);
-            // Calculate modifiers and dialogue tokens
-            const modifiers = [
-              generateModifierType(modifierTypes.BASE_STAT_BOOSTER)!,
-              generateModifierType(modifierTypes.BASE_STAT_BOOSTER)!,
-            ];
-            encounter.setDialogueToken("boost1", modifiers[0].name);
-            encounter.setDialogueToken("boost2", modifiers[1].name);
-            encounter.misc = {
-              chosenPokemon: pokemon,
-              modifiers: modifiers,
-            };
-          };
-
-          // Only Pokemon that can gain benefits are above half HP with no status
-          const selectableFilter = (pokemon: Pokemon) => {
-            // If pokemon meets primary pokemon reqs, it can be selected
-            if (!pokemon.isAllowedInChallenge()) {
-              return i18next.t("partyUiHandler:cantBeUsed", { pokemonName: pokemon.getNameToRender() }) ?? null;
-            }
-            if (!encounter.pokemonMeetsPrimaryRequirements(pokemon)) {
-              return getEncounterText(`${namespace}:invalid_selection`) ?? null;
-            }
-
-            return null;
-          };
-
-          return selectPokemonForOption(onPokemonSelected, undefined, selectableFilter);
-        })
-        .withOptionPhase(async () => {
-          // Choose Cheap Option
-          const encounter = globalScene.currentBattle.mysteryEncounter!;
-          const chosenPokemon = encounter.misc.chosenPokemon;
-          const modifiers = encounter.misc.modifiers;
-
-          for (const modType of modifiers) {
-            await applyModifierTypeToPlayerPokemon(chosenPokemon, modType);
-          }
-
-          leaveEncounterWithoutBattle(true);
-        })
-        .withPostOptionPhase(async () => {
-          // Damage and status applied after dealer leaves (to make thematic sense)
-          const encounter = globalScene.currentBattle.mysteryEncounter!;
-          const chosenPokemon = encounter.misc.chosenPokemon as PlayerPokemon;
-
-          // Pokemon takes half max HP damage and nature is randomized (does not update dex)
-          applyDamageToPokemon(chosenPokemon, Math.floor(chosenPokemon.getMaxHp() / 2));
-
-          const currentNature = chosenPokemon.nature;
-          let newNature = randSeedInt(25) as Nature;
-          while (newNature === currentNature) {
-            newNature = randSeedInt(25) as Nature;
-          }
-
-          chosenPokemon.setCustomNature(newNature);
-          encounter.setDialogueToken("newNature", getNatureName(newNature));
-          queueEncounterMessage(`${namespace}:cheap_side_effects`);
-          setEncounterExp([ chosenPokemon.id ], 100);
-          await chosenPokemon.updateInfo();
-        })
-        .build()
-    )
-    .withOption(
-      MysteryEncounterOptionBuilder
-        .newOptionWithMode(MysteryEncounterOptionMode.DISABLED_OR_DEFAULT)
-        .withSceneMoneyRequirement(0, VITAMIN_DEALER_EXPENSIVE_PRICE_MULTIPLIER)
-        .withDialogue({
-          buttonLabel: `${namespace}:option.2.label`,
-          buttonTooltip: `${namespace}:option.2.tooltip`,
-          selected: [
-            {
-              text: `${namespace}:option.selected`,
-            },
-          ],
-        })
-        .withPreOptionPhase(async (): Promise<boolean> => {
-          const encounter = globalScene.currentBattle.mysteryEncounter!;
-          const onPokemonSelected = (pokemon: PlayerPokemon) => {
-            // Update money
-            updatePlayerMoney(-(encounter.options[1].requirements[0] as MoneyRequirement).requiredMoney);
-            // Calculate modifiers and dialogue tokens
-            const modifiers = [
-              generateModifierType(modifierTypes.BASE_STAT_BOOSTER)!,
-              generateModifierType(modifierTypes.BASE_STAT_BOOSTER)!,
-            ];
-            encounter.setDialogueToken("boost1", modifiers[0].name);
-            encounter.setDialogueToken("boost2", modifiers[1].name);
-            encounter.misc = {
-              chosenPokemon: pokemon,
-              modifiers: modifiers,
-            };
-          };
-
-          // Only Pokemon that can gain benefits are unfainted
-          const selectableFilter = (pokemon: Pokemon) => {
-            return isPokemonValidForEncounterOptionSelection(pokemon, `${namespace}:invalid_selection`);
-          };
-
-          return selectPokemonForOption(onPokemonSelected, undefined, selectableFilter);
-        })
-        .withOptionPhase(async () => {
-          // Choose Expensive Option
-          const encounter = globalScene.currentBattle.mysteryEncounter!;
-          const chosenPokemon = encounter.misc.chosenPokemon;
-          const modifiers = encounter.misc.modifiers;
-
-          for (const modType of modifiers) {
-            await applyModifierTypeToPlayerPokemon(chosenPokemon, modType);
-          }
-
-          leaveEncounterWithoutBattle(true);
-        })
-        .withPostOptionPhase(async () => {
-          // Status applied after dealer leaves (to make thematic sense)
-          const encounter = globalScene.currentBattle.mysteryEncounter!;
-          const chosenPokemon = encounter.misc.chosenPokemon;
-
-          queueEncounterMessage(`${namespace}:no_bad_effects`);
-          setEncounterExp([ chosenPokemon.id ], 100);
-
-          await chosenPokemon.updateInfo();
-        })
-        .build()
-    )
-    .withSimpleOption(
-      {
-        buttonLabel: `${namespace}:option.3.label`,
-        buttonTooltip: `${namespace}:option.3.tooltip`,
+export const ShadyVitaminDealerEncounter: MysteryEncounter = MysteryEncounterBuilder.withEncounterType(
+  MysteryEncounterType.SHADY_VITAMIN_DEALER,
+)
+  .withEncounterTier(MysteryEncounterTier.COMMON)
+  .withSceneWaveRangeRequirement(...CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES)
+  .withSceneRequirement(new MoneyRequirement(0, VITAMIN_DEALER_CHEAP_PRICE_MULTIPLIER)) // Must have the money for at least the cheap deal
+  .withPrimaryPokemonHealthRatioRequirement([0.51, 1]) // At least 1 Pokemon must have above half HP
+  .withIntroSpriteConfigs([
+    {
+      spriteKey: Species.KROOKODILE.toString(),
+      fileRoot: "pokemon",
+      hasShadow: true,
+      repeat: true,
+      x: 12,
+      y: -5,
+      yShadow: -5,
+    },
+    {
+      spriteKey: "shady_vitamin_dealer",
+      fileRoot: "mystery-encounters",
+      hasShadow: true,
+      x: -12,
+      y: 3,
+      yShadow: 3,
+    },
+  ])
+  .withIntroDialogue([
+    {
+      text: `${namespace}:intro`,
+    },
+    {
+      text: `${namespace}:intro_dialogue`,
+      speaker: `${namespace}:speaker`,
+    },
+  ])
+  .setLocalizationKey(`${namespace}`)
+  .withTitle(`${namespace}:title`)
+  .withDescription(`${namespace}:description`)
+  .withQuery(`${namespace}:query`)
+  .withOption(
+    MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DISABLED_OR_DEFAULT)
+      .withSceneMoneyRequirement(0, VITAMIN_DEALER_CHEAP_PRICE_MULTIPLIER)
+      .withDialogue({
+        buttonLabel: `${namespace}:option.1.label`,
+        buttonTooltip: `${namespace}:option.1.tooltip`,
         selected: [
           {
-            text: `${namespace}:option.3.selected`,
-            speaker: `${namespace}:speaker`
+            text: `${namespace}:option.selected`,
+          },
+        ],
+      })
+      .withPreOptionPhase(async (): Promise<boolean> => {
+        const encounter = globalScene.currentBattle.mysteryEncounter!;
+        const onPokemonSelected = (pokemon: PlayerPokemon) => {
+          // Update money
+          updatePlayerMoney(-(encounter.options[0].requirements[0] as MoneyRequirement).requiredMoney);
+          // Calculate modifiers and dialogue tokens
+          const modifiers = [
+            generateModifierType(modifierTypes.BASE_STAT_BOOSTER)!,
+            generateModifierType(modifierTypes.BASE_STAT_BOOSTER)!,
+          ];
+          encounter.setDialogueToken("boost1", modifiers[0].name);
+          encounter.setDialogueToken("boost2", modifiers[1].name);
+          encounter.misc = {
+            chosenPokemon: pokemon,
+            modifiers: modifiers,
+          };
+        };
+
+        // Only Pokemon that can gain benefits are above half HP with no status
+        const selectableFilter = (pokemon: Pokemon) => {
+          // If pokemon meets primary pokemon reqs, it can be selected
+          if (!pokemon.isAllowedInChallenge()) {
+            return (
+              i18next.t("partyUiHandler:cantBeUsed", {
+                pokemonName: pokemon.getNameToRender(),
+              }) ?? null
+            );
           }
-        ]
-      },
-      async () => {
-        // Leave encounter with no rewards or exp
+          if (!encounter.pokemonMeetsPrimaryRequirements(pokemon)) {
+            return getEncounterText(`${namespace}:invalid_selection`) ?? null;
+          }
+
+          return null;
+        };
+
+        return selectPokemonForOption(onPokemonSelected, undefined, selectableFilter);
+      })
+      .withOptionPhase(async () => {
+        // Choose Cheap Option
+        const encounter = globalScene.currentBattle.mysteryEncounter!;
+        const chosenPokemon = encounter.misc.chosenPokemon;
+        const modifiers = encounter.misc.modifiers;
+
+        for (const modType of modifiers) {
+          await applyModifierTypeToPlayerPokemon(chosenPokemon, modType);
+        }
+
         leaveEncounterWithoutBattle(true);
-        return true;
-      }
-    )
-    .build();
+      })
+      .withPostOptionPhase(async () => {
+        // Damage and status applied after dealer leaves (to make thematic sense)
+        const encounter = globalScene.currentBattle.mysteryEncounter!;
+        const chosenPokemon = encounter.misc.chosenPokemon as PlayerPokemon;
+
+        // Pokemon takes half max HP damage and nature is randomized (does not update dex)
+        applyDamageToPokemon(chosenPokemon, Math.floor(chosenPokemon.getMaxHp() / 2));
+
+        const currentNature = chosenPokemon.nature;
+        let newNature = randSeedInt(25) as Nature;
+        while (newNature === currentNature) {
+          newNature = randSeedInt(25) as Nature;
+        }
+
+        chosenPokemon.setCustomNature(newNature);
+        encounter.setDialogueToken("newNature", getNatureName(newNature));
+        queueEncounterMessage(`${namespace}:cheap_side_effects`);
+        setEncounterExp([chosenPokemon.id], 100);
+        await chosenPokemon.updateInfo();
+      })
+      .build(),
+  )
+  .withOption(
+    MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DISABLED_OR_DEFAULT)
+      .withSceneMoneyRequirement(0, VITAMIN_DEALER_EXPENSIVE_PRICE_MULTIPLIER)
+      .withDialogue({
+        buttonLabel: `${namespace}:option.2.label`,
+        buttonTooltip: `${namespace}:option.2.tooltip`,
+        selected: [
+          {
+            text: `${namespace}:option.selected`,
+          },
+        ],
+      })
+      .withPreOptionPhase(async (): Promise<boolean> => {
+        const encounter = globalScene.currentBattle.mysteryEncounter!;
+        const onPokemonSelected = (pokemon: PlayerPokemon) => {
+          // Update money
+          updatePlayerMoney(-(encounter.options[1].requirements[0] as MoneyRequirement).requiredMoney);
+          // Calculate modifiers and dialogue tokens
+          const modifiers = [
+            generateModifierType(modifierTypes.BASE_STAT_BOOSTER)!,
+            generateModifierType(modifierTypes.BASE_STAT_BOOSTER)!,
+          ];
+          encounter.setDialogueToken("boost1", modifiers[0].name);
+          encounter.setDialogueToken("boost2", modifiers[1].name);
+          encounter.misc = {
+            chosenPokemon: pokemon,
+            modifiers: modifiers,
+          };
+        };
+
+        // Only Pokemon that can gain benefits are unfainted
+        const selectableFilter = (pokemon: Pokemon) => {
+          return isPokemonValidForEncounterOptionSelection(pokemon, `${namespace}:invalid_selection`);
+        };
+
+        return selectPokemonForOption(onPokemonSelected, undefined, selectableFilter);
+      })
+      .withOptionPhase(async () => {
+        // Choose Expensive Option
+        const encounter = globalScene.currentBattle.mysteryEncounter!;
+        const chosenPokemon = encounter.misc.chosenPokemon;
+        const modifiers = encounter.misc.modifiers;
+
+        for (const modType of modifiers) {
+          await applyModifierTypeToPlayerPokemon(chosenPokemon, modType);
+        }
+
+        leaveEncounterWithoutBattle(true);
+      })
+      .withPostOptionPhase(async () => {
+        // Status applied after dealer leaves (to make thematic sense)
+        const encounter = globalScene.currentBattle.mysteryEncounter!;
+        const chosenPokemon = encounter.misc.chosenPokemon;
+
+        queueEncounterMessage(`${namespace}:no_bad_effects`);
+        setEncounterExp([chosenPokemon.id], 100);
+
+        await chosenPokemon.updateInfo();
+      })
+      .build(),
+  )
+  .withSimpleOption(
+    {
+      buttonLabel: `${namespace}:option.3.label`,
+      buttonTooltip: `${namespace}:option.3.tooltip`,
+      selected: [
+        {
+          text: `${namespace}:option.3.selected`,
+          speaker: `${namespace}:speaker`,
+        },
+      ],
+    },
+    async () => {
+      // Leave encounter with no rewards or exp
+      leaveEncounterWithoutBattle(true);
+      return true;
+    },
+  )
+  .build();
diff --git a/src/data/mystery-encounters/encounters/slumbering-snorlax-encounter.ts b/src/data/mystery-encounters/encounters/slumbering-snorlax-encounter.ts
index 923d8f06c23..2654f6b18d8 100644
--- a/src/data/mystery-encounters/encounters/slumbering-snorlax-encounter.ts
+++ b/src/data/mystery-encounters/encounters/slumbering-snorlax-encounter.ts
@@ -10,8 +10,16 @@ import { MysteryEncounterBuilder } from "#app/data/mystery-encounters/mystery-en
 import { MysteryEncounterOptionBuilder } from "#app/data/mystery-encounters/mystery-encounter-option";
 import { MoveRequirement } from "#app/data/mystery-encounters/mystery-encounter-requirements";
 import type { EnemyPartyConfig, EnemyPokemonConfig } from "../utils/encounter-phase-utils";
-import { generateModifierType, initBattleWithEnemyConfig, leaveEncounterWithoutBattle, loadCustomMovesForEncounter, setEncounterExp, setEncounterRewards, } from "../utils/encounter-phase-utils";
+import {
+  generateModifierType,
+  initBattleWithEnemyConfig,
+  leaveEncounterWithoutBattle,
+  loadCustomMovesForEncounter,
+  setEncounterExp,
+  setEncounterRewards,
+} from "../utils/encounter-phase-utils";
 import { queueEncounterMessage } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils";
+import { Nature } from "#enums/nature";
 import { Moves } from "#enums/moves";
 import { BattlerIndex } from "#app/battle";
 import { AiType, PokemonMove } from "#app/field/pokemon";
@@ -19,9 +27,10 @@ import { getPokemonSpecies } from "#app/data/pokemon-species";
 import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
 import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
 import { PartyHealPhase } from "#app/phases/party-heal-phase";
-import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/game-mode";
 import { BerryType } from "#enums/berry-type";
+import { Stat } from "#enums/stat";
 import { CustomPokemonData } from "#app/data/custom-pokemon-data";
+import { randSeedInt } from "#app/utils/common";
 
 /** i18n namespace for the encounter */
 const namespace = "mysteryEncounters/slumberingSnorlax";
@@ -31,141 +40,152 @@ const namespace = "mysteryEncounters/slumberingSnorlax";
  * @see {@link https://github.com/pagefaultgames/pokerogue/issues/3815 | GitHub Issue #3815}
  * @see For biome requirements check {@linkcode mysteryEncountersByBiome}
  */
-export const SlumberingSnorlaxEncounter: MysteryEncounter =
-  MysteryEncounterBuilder.withEncounterType(MysteryEncounterType.SLUMBERING_SNORLAX)
-    .withEncounterTier(MysteryEncounterTier.GREAT)
-    .withSceneWaveRangeRequirement(...CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES)
-    .withCatchAllowed(true)
-    .withHideWildIntroMessage(true)
-    .withFleeAllowed(false)
-    .withIntroSpriteConfigs([
-      {
-        spriteKey: Species.SNORLAX.toString(),
-        fileRoot: "pokemon",
-        hasShadow: true,
-        tint: 0.25,
-        scale: 1.25,
-        repeat: true,
-        y: 5,
-      },
-    ])
-    .withIntroDialogue([
-      {
-        text: `${namespace}:intro`,
-      },
-    ])
-    .withOnInit(() => {
+export const SlumberingSnorlaxEncounter: MysteryEncounter = MysteryEncounterBuilder.withEncounterType(
+  MysteryEncounterType.SLUMBERING_SNORLAX,
+)
+  .withEncounterTier(MysteryEncounterTier.GREAT)
+  .withSceneWaveRangeRequirement(15, 150)
+  .withCatchAllowed(true)
+  .withHideWildIntroMessage(true)
+  .withFleeAllowed(false)
+  .withIntroSpriteConfigs([
+    {
+      spriteKey: Species.SNORLAX.toString(),
+      fileRoot: "pokemon",
+      hasShadow: true,
+      tint: 0.25,
+      scale: 1.25,
+      repeat: true,
+      y: 5,
+    },
+  ])
+  .withIntroDialogue([
+    {
+      text: `${namespace}:intro`,
+    },
+  ])
+  .withOnInit(() => {
+    const encounter = globalScene.currentBattle.mysteryEncounter!;
+    console.log(encounter);
+
+    // Calculate boss mon
+    const bossSpecies = getPokemonSpecies(Species.SNORLAX);
+    const pokemonConfig: EnemyPokemonConfig = {
+      species: bossSpecies,
+      isBoss: true,
+      shiny: false, // Shiny lock because shiny is rolled only if the battle option is picked
+      status: [StatusEffect.SLEEP, 6], // Extra turns on timer for Snorlax's start of fight moves
+      nature: Nature.DOCILE,
+      moveSet: [Moves.BODY_SLAM, Moves.CRUNCH, Moves.SLEEP_TALK, Moves.REST],
+      modifierConfigs: [
+        {
+          modifier: generateModifierType(modifierTypes.BERRY, [BerryType.SITRUS]) as PokemonHeldItemModifierType,
+        },
+        {
+          modifier: generateModifierType(modifierTypes.BERRY, [BerryType.ENIGMA]) as PokemonHeldItemModifierType,
+        },
+        {
+          modifier: generateModifierType(modifierTypes.BASE_STAT_BOOSTER, [Stat.HP]) as PokemonHeldItemModifierType,
+        },
+        {
+          modifier: generateModifierType(modifierTypes.SOOTHE_BELL) as PokemonHeldItemModifierType,
+          stackCount: randSeedInt(2, 0),
+        },
+        {
+          modifier: generateModifierType(modifierTypes.LUCKY_EGG) as PokemonHeldItemModifierType,
+          stackCount: randSeedInt(2, 0),
+        },
+      ],
+      customPokemonData: new CustomPokemonData({ spriteScale: 1.25 }),
+      aiType: AiType.SMART, // Required to ensure Snorlax uses Sleep Talk while it is asleep
+    };
+    const config: EnemyPartyConfig = {
+      levelAdditiveModifier: 0.5,
+      pokemonConfigs: [pokemonConfig],
+    };
+    encounter.enemyPartyConfigs = [config];
+
+    // Load animations/sfx for Snorlax fight start moves
+    loadCustomMovesForEncounter([Moves.SNORE]);
+
+    encounter.setDialogueToken("snorlaxName", getPokemonSpecies(Species.SNORLAX).getName());
+
+    return true;
+  })
+  .setLocalizationKey(`${namespace}`)
+  .withTitle(`${namespace}:title`)
+  .withDescription(`${namespace}:description`)
+  .withQuery(`${namespace}:query`)
+  .withSimpleOption(
+    {
+      buttonLabel: `${namespace}:option.1.label`,
+      buttonTooltip: `${namespace}:option.1.tooltip`,
+      selected: [
+        {
+          text: `${namespace}:option.1.selected`,
+        },
+      ],
+    },
+    async () => {
+      // Pick battle
       const encounter = globalScene.currentBattle.mysteryEncounter!;
-      console.log(encounter);
-
-      // Calculate boss mon
-      const bossSpecies = getPokemonSpecies(Species.SNORLAX);
-      const pokemonConfig: EnemyPokemonConfig = {
-        species: bossSpecies,
-        isBoss: true,
-        shiny: false, // Shiny lock because shiny is rolled only if the battle option is picked
-        status: [ StatusEffect.SLEEP, 5 ], // Extra turns on timer for Snorlax's start of fight moves
-        moveSet: [ Moves.REST, Moves.SLEEP_TALK, Moves.CRUNCH, Moves.GIGA_IMPACT ],
-        modifierConfigs: [
-          {
-            modifier: generateModifierType(modifierTypes.BERRY, [ BerryType.SITRUS ]) as PokemonHeldItemModifierType,
-            stackCount: 2
-          },
-          {
-            modifier: generateModifierType(modifierTypes.BERRY, [ BerryType.ENIGMA ]) as PokemonHeldItemModifierType,
-            stackCount: 2
-          },
-        ],
-        customPokemonData: new CustomPokemonData({ spriteScale: 1.25 }),
-        aiType: AiType.SMART // Required to ensure Snorlax uses Sleep Talk while it is asleep
-      };
-      const config: EnemyPartyConfig = {
-        levelAdditiveModifier: 0.5,
-        pokemonConfigs: [ pokemonConfig ],
-      };
-      encounter.enemyPartyConfigs = [ config ];
-
-      // Load animations/sfx for Snorlax fight start moves
-      loadCustomMovesForEncounter([ Moves.SNORE ]);
-
-      encounter.setDialogueToken("snorlaxName", getPokemonSpecies(Species.SNORLAX).getName());
-
-      return true;
-    })
-    .setLocalizationKey(`${namespace}`)
-    .withTitle(`${namespace}:title`)
-    .withDescription(`${namespace}:description`)
-    .withQuery(`${namespace}:query`)
-    .withSimpleOption(
-      {
-        buttonLabel: `${namespace}:option.1.label`,
-        buttonTooltip: `${namespace}:option.1.tooltip`,
+      setEncounterRewards({
+        guaranteedModifierTypeFuncs: [modifierTypes.LEFTOVERS],
+        fillRemaining: true,
+      });
+      encounter.startOfBattleEffects.push(
+        {
+          sourceBattlerIndex: BattlerIndex.ENEMY,
+          targets: [BattlerIndex.PLAYER],
+          move: new PokemonMove(Moves.SNORE),
+          ignorePp: true,
+        },
+      );
+      await initBattleWithEnemyConfig(encounter.enemyPartyConfigs[0]);
+    },
+  )
+  .withSimpleOption(
+    {
+      buttonLabel: `${namespace}:option.2.label`,
+      buttonTooltip: `${namespace}:option.2.tooltip`,
+      selected: [
+        {
+          text: `${namespace}:option.2.selected`,
+        },
+      ],
+    },
+    async () => {
+      // Fall asleep waiting for Snorlax
+      // Full heal party
+      globalScene.unshiftPhase(new PartyHealPhase(true));
+      queueEncounterMessage(`${namespace}:option.2.rest_result`);
+      leaveEncounterWithoutBattle();
+    },
+  )
+  .withOption(
+    MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DISABLED_OR_SPECIAL)
+      .withPrimaryPokemonRequirement(new MoveRequirement(STEALING_MOVES, true))
+      .withDialogue({
+        buttonLabel: `${namespace}:option.3.label`,
+        buttonTooltip: `${namespace}:option.3.tooltip`,
+        disabledButtonTooltip: `${namespace}:option.3.disabled_tooltip`,
         selected: [
           {
-            text: `${namespace}:option.1.selected`,
+            text: `${namespace}:option.3.selected`,
           },
         ],
-      },
-      async () => {
-        // Pick battle
-        const encounter = globalScene.currentBattle.mysteryEncounter!;
-        setEncounterRewards({ guaranteedModifierTypeFuncs: [ modifierTypes.LEFTOVERS ], fillRemaining: true });
-        encounter.startOfBattleEffects.push(
-          {
-            sourceBattlerIndex: BattlerIndex.ENEMY,
-            targets: [ BattlerIndex.PLAYER ],
-            move: new PokemonMove(Moves.SNORE),
-            ignorePp: true
-          },
-          {
-            sourceBattlerIndex: BattlerIndex.ENEMY,
-            targets: [ BattlerIndex.PLAYER ],
-            move: new PokemonMove(Moves.SNORE),
-            ignorePp: true
-          });
-        await initBattleWithEnemyConfig(encounter.enemyPartyConfigs[0]);
-      }
-    )
-    .withSimpleOption(
-      {
-        buttonLabel: `${namespace}:option.2.label`,
-        buttonTooltip: `${namespace}:option.2.tooltip`,
-        selected: [
-          {
-            text: `${namespace}:option.2.selected`,
-          },
-        ],
-      },
-      async () => {
-        // Fall asleep waiting for Snorlax
-        // Full heal party
-        globalScene.unshiftPhase(new PartyHealPhase(true));
-        queueEncounterMessage(`${namespace}:option.2.rest_result`);
+      })
+      .withOptionPhase(async () => {
+        // Steal the Snorlax's Leftovers
+        const instance = globalScene.currentBattle.mysteryEncounter!;
+        setEncounterRewards({
+          guaranteedModifierTypeFuncs: [modifierTypes.LEFTOVERS],
+          fillRemaining: false,
+        });
+        // Snorlax exp to Pokemon that did the stealing
+        setEncounterExp(instance.primaryPokemon!.id, getPokemonSpecies(Species.SNORLAX).baseExp);
         leaveEncounterWithoutBattle();
-      }
-    )
-    .withOption(
-      MysteryEncounterOptionBuilder
-        .newOptionWithMode(MysteryEncounterOptionMode.DISABLED_OR_SPECIAL)
-        .withPrimaryPokemonRequirement(new MoveRequirement(STEALING_MOVES, true))
-        .withDialogue({
-          buttonLabel: `${namespace}:option.3.label`,
-          buttonTooltip: `${namespace}:option.3.tooltip`,
-          disabledButtonTooltip: `${namespace}:option.3.disabled_tooltip`,
-          selected: [
-            {
-              text: `${namespace}:option.3.selected`
-            }
-          ]
-        })
-        .withOptionPhase(async () => {
-          // Steal the Snorlax's Leftovers
-          const instance = globalScene.currentBattle.mysteryEncounter!;
-          setEncounterRewards({ guaranteedModifierTypeFuncs: [ modifierTypes.LEFTOVERS ], fillRemaining: false });
-          // Snorlax exp to Pokemon that did the stealing
-          setEncounterExp(instance.primaryPokemon!.id, getPokemonSpecies(Species.SNORLAX).baseExp);
-          leaveEncounterWithoutBattle();
-        })
-        .build()
-    )
-    .build();
+      })
+      .build(),
+  )
+  .build();
diff --git a/src/data/mystery-encounters/encounters/teleporting-hijinks-encounter.ts b/src/data/mystery-encounters/encounters/teleporting-hijinks-encounter.ts
index 16015c80fc8..28c7fe4644f 100644
--- a/src/data/mystery-encounters/encounters/teleporting-hijinks-encounter.ts
+++ b/src/data/mystery-encounters/encounters/teleporting-hijinks-encounter.ts
@@ -1,6 +1,13 @@
 import type { EnemyPartyConfig } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
-import { generateModifierTypeOption, initBattleWithEnemyConfig, setEncounterExp, setEncounterRewards, transitionMysteryEncounterIntroVisuals, updatePlayerMoney, } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
-import { randSeedInt } from "#app/utils";
+import {
+  generateModifierTypeOption,
+  initBattleWithEnemyConfig,
+  setEncounterExp,
+  setEncounterRewards,
+  transitionMysteryEncounterIntroVisuals,
+  updatePlayerMoney,
+} from "#app/data/mystery-encounters/utils/encounter-phase-utils";
+import { randSeedInt } from "#app/utils/common";
 import { MysteryEncounterType } from "#enums/mystery-encounter-type";
 import { globalScene } from "#app/global-scene";
 import type MysteryEncounter from "#app/data/mystery-encounters/mystery-encounter";
@@ -15,148 +22,161 @@ import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
 import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
 import { Biome } from "#enums/biome";
 import { getBiomeKey } from "#app/field/arena";
-import { Type } from "#enums/type";
+import { PokemonType } from "#enums/pokemon-type";
 import { getPartyLuckValue, modifierTypes } from "#app/modifier/modifier-type";
-import { TrainerSlot } from "#app/data/trainer-config";
+import { TrainerSlot } from "#enums/trainer-slot";
 import { BattlerTagType } from "#enums/battler-tag-type";
 import { getPokemonNameWithAffix } from "#app/messages";
 import { StatStageChangePhase } from "#app/phases/stat-stage-change-phase";
 import { Stat } from "#enums/stat";
-import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/game-mode";
-import { getEncounterPokemonLevelForWave, STANDARD_ENCOUNTER_BOOSTED_LEVEL_MODIFIER } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils";
+import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants";
+import {
+  getEncounterPokemonLevelForWave,
+  STANDARD_ENCOUNTER_BOOSTED_LEVEL_MODIFIER,
+} from "#app/data/mystery-encounters/utils/encounter-pokemon-utils";
 
 /** the i18n namespace for this encounter */
 const namespace = "mysteryEncounters/teleportingHijinks";
 
 const MONEY_COST_MULTIPLIER = 1.75;
-const BIOME_CANDIDATES = [ Biome.SPACE, Biome.FAIRY_CAVE, Biome.LABORATORY, Biome.ISLAND, Biome.WASTELAND, Biome.DOJO ];
-const MACHINE_INTERFACING_TYPES = [ Type.ELECTRIC, Type.STEEL ];
+const BIOME_CANDIDATES = [Biome.SPACE, Biome.FAIRY_CAVE, Biome.LABORATORY, Biome.ISLAND, Biome.WASTELAND, Biome.DOJO];
+const MACHINE_INTERFACING_TYPES = [PokemonType.ELECTRIC, PokemonType.STEEL];
 
 /**
  * Teleporting Hijinks encounter.
  * @see {@link https://github.com/pagefaultgames/pokerogue/issues/3817 | GitHub Issue #3817}
  * @see For biome requirements check {@linkcode mysteryEncountersByBiome}
  */
-export const TeleportingHijinksEncounter: MysteryEncounter =
-  MysteryEncounterBuilder.withEncounterType(MysteryEncounterType.TELEPORTING_HIJINKS)
-    .withEncounterTier(MysteryEncounterTier.COMMON)
-    .withSceneWaveRangeRequirement(...CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES)
-    .withSceneRequirement(new WaveModulusRequirement([ 1, 2, 3 ], 10)) // Must be in first 3 waves after boss wave
-    .withSceneRequirement(new MoneyRequirement(0, MONEY_COST_MULTIPLIER)) // Must be able to pay teleport cost
-    .withAutoHideIntroVisuals(false)
-    .withCatchAllowed(true)
-    .withFleeAllowed(false)
-    .withIntroSpriteConfigs([
-      {
-        spriteKey: "teleporting_hijinks_teleporter",
-        fileRoot: "mystery-encounters",
-        hasShadow: true,
-        x: 4,
-        y: 4,
-        yShadow: 1
-      }
-    ])
-    .withIntroDialogue([
-      {
-        text: `${namespace}:intro`,
-      }
-    ])
-    .setLocalizationKey(`${namespace}`)
-    .withTitle(`${namespace}:title`)
-    .withDescription(`${namespace}:description`)
-    .withQuery(`${namespace}:query`)
-    .withOnInit(() => {
-      const encounter = globalScene.currentBattle.mysteryEncounter!;
-      const price = globalScene.getWaveMoneyAmount(MONEY_COST_MULTIPLIER);
-      encounter.setDialogueToken("price", price.toString());
-      encounter.misc = {
-        price
-      };
+export const TeleportingHijinksEncounter: MysteryEncounter = MysteryEncounterBuilder.withEncounterType(
+  MysteryEncounterType.TELEPORTING_HIJINKS,
+)
+  .withEncounterTier(MysteryEncounterTier.COMMON)
+  .withSceneWaveRangeRequirement(...CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES)
+  .withSceneRequirement(new WaveModulusRequirement([1, 2, 3], 10)) // Must be in first 3 waves after boss wave
+  .withSceneRequirement(new MoneyRequirement(0, MONEY_COST_MULTIPLIER)) // Must be able to pay teleport cost
+  .withAutoHideIntroVisuals(false)
+  .withCatchAllowed(true)
+  .withFleeAllowed(false)
+  .withIntroSpriteConfigs([
+    {
+      spriteKey: "teleporting_hijinks_teleporter",
+      fileRoot: "mystery-encounters",
+      hasShadow: true,
+      x: 4,
+      y: 4,
+      yShadow: 1,
+    },
+  ])
+  .withIntroDialogue([
+    {
+      text: `${namespace}:intro`,
+    },
+  ])
+  .setLocalizationKey(`${namespace}`)
+  .withTitle(`${namespace}:title`)
+  .withDescription(`${namespace}:description`)
+  .withQuery(`${namespace}:query`)
+  .withOnInit(() => {
+    const encounter = globalScene.currentBattle.mysteryEncounter!;
+    const price = globalScene.getWaveMoneyAmount(MONEY_COST_MULTIPLIER);
+    encounter.setDialogueToken("price", price.toString());
+    encounter.misc = {
+      price,
+    };
 
-      return true;
-    })
-    .withOption(
-      MysteryEncounterOptionBuilder
-        .newOptionWithMode(MysteryEncounterOptionMode.DISABLED_OR_DEFAULT)
-        .withSceneMoneyRequirement(0, MONEY_COST_MULTIPLIER) // Must be able to pay teleport cost
-        .withDialogue({
-          buttonLabel: `${namespace}:option.1.label`,
-          buttonTooltip: `${namespace}:option.1.tooltip`,
-          selected: [
-            {
-              text: `${namespace}:option.1.selected`,
-            }
-          ],
-        })
-        .withPreOptionPhase(async () => {
-          // Update money
-          updatePlayerMoney(-globalScene.currentBattle.mysteryEncounter!.misc.price, true, false);
-        })
-        .withOptionPhase(async () => {
-          const config: EnemyPartyConfig = await doBiomeTransitionDialogueAndBattleInit();
-          setEncounterRewards({ fillRemaining: true });
-          await initBattleWithEnemyConfig(config);
-        })
-        .build()
-    )
-    .withOption(
-      MysteryEncounterOptionBuilder
-        .newOptionWithMode(MysteryEncounterOptionMode.DISABLED_OR_SPECIAL)
-        .withPokemonTypeRequirement(MACHINE_INTERFACING_TYPES, true, 1) // Must have Steel or Electric type
-        .withDialogue({
-          buttonLabel: `${namespace}:option.2.label`,
-          buttonTooltip: `${namespace}:option.2.tooltip`,
-          disabledButtonTooltip: `${namespace}:option.2.disabled_tooltip`,
-          selected: [
-            {
-              text: `${namespace}:option.2.selected`,
-            }
-          ],
-        })
-        .withOptionPhase(async () => {
-          const config: EnemyPartyConfig = await doBiomeTransitionDialogueAndBattleInit();
-          setEncounterRewards({ fillRemaining: true });
-          setEncounterExp(globalScene.currentBattle.mysteryEncounter!.selectedOption!.primaryPokemon!.id, 100);
-          await initBattleWithEnemyConfig(config);
-        })
-        .build()
-    )
-    .withSimpleOption(
-      {
-        buttonLabel: `${namespace}:option.3.label`,
-        buttonTooltip: `${namespace}:option.3.tooltip`,
+    return true;
+  })
+  .withOption(
+    MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DISABLED_OR_DEFAULT)
+      .withSceneMoneyRequirement(0, MONEY_COST_MULTIPLIER) // Must be able to pay teleport cost
+      .withDialogue({
+        buttonLabel: `${namespace}:option.1.label`,
+        buttonTooltip: `${namespace}:option.1.tooltip`,
         selected: [
           {
-            text: `${namespace}:option.3.selected`,
+            text: `${namespace}:option.1.selected`,
           },
         ],
-      },
-      async () => {
-        // Inspect the Machine
-        const encounter = globalScene.currentBattle.mysteryEncounter!;
+      })
+      .withPreOptionPhase(async () => {
+        // Update money
+        updatePlayerMoney(-globalScene.currentBattle.mysteryEncounter!.misc.price, true, false);
+      })
+      .withOptionPhase(async () => {
+        const config: EnemyPartyConfig = await doBiomeTransitionDialogueAndBattleInit();
+        setEncounterRewards({ fillRemaining: true });
+        await initBattleWithEnemyConfig(config);
+      })
+      .build(),
+  )
+  .withOption(
+    MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DISABLED_OR_SPECIAL)
+      .withPokemonTypeRequirement(MACHINE_INTERFACING_TYPES, true, 1) // Must have Steel or Electric type
+      .withDialogue({
+        buttonLabel: `${namespace}:option.2.label`,
+        buttonTooltip: `${namespace}:option.2.tooltip`,
+        disabledButtonTooltip: `${namespace}:option.2.disabled_tooltip`,
+        selected: [
+          {
+            text: `${namespace}:option.2.selected`,
+          },
+        ],
+      })
+      .withOptionPhase(async () => {
+        const config: EnemyPartyConfig = await doBiomeTransitionDialogueAndBattleInit();
+        setEncounterRewards({ fillRemaining: true });
+        setEncounterExp(globalScene.currentBattle.mysteryEncounter!.selectedOption!.primaryPokemon!.id, 100);
+        await initBattleWithEnemyConfig(config);
+      })
+      .build(),
+  )
+  .withSimpleOption(
+    {
+      buttonLabel: `${namespace}:option.3.label`,
+      buttonTooltip: `${namespace}:option.3.tooltip`,
+      selected: [
+        {
+          text: `${namespace}:option.3.selected`,
+        },
+      ],
+    },
+    async () => {
+      // Inspect the Machine
+      const encounter = globalScene.currentBattle.mysteryEncounter!;
 
-        // Init enemy
-        const level = getEncounterPokemonLevelForWave(STANDARD_ENCOUNTER_BOOSTED_LEVEL_MODIFIER);
-        const bossSpecies = globalScene.arena.randomSpecies(globalScene.currentBattle.waveIndex, level, 0, getPartyLuckValue(globalScene.getPlayerParty()), true);
-        const bossPokemon = new EnemyPokemon(bossSpecies, level, TrainerSlot.NONE, true);
-        encounter.setDialogueToken("enemyPokemon", getPokemonNameWithAffix(bossPokemon));
-        const config: EnemyPartyConfig = {
-          pokemonConfigs: [{
+      // Init enemy
+      const level = getEncounterPokemonLevelForWave(STANDARD_ENCOUNTER_BOOSTED_LEVEL_MODIFIER);
+      const bossSpecies = globalScene.arena.randomSpecies(
+        globalScene.currentBattle.waveIndex,
+        level,
+        0,
+        getPartyLuckValue(globalScene.getPlayerParty()),
+        true,
+      );
+      const bossPokemon = new EnemyPokemon(bossSpecies, level, TrainerSlot.NONE, true);
+      encounter.setDialogueToken("enemyPokemon", getPokemonNameWithAffix(bossPokemon));
+      const config: EnemyPartyConfig = {
+        pokemonConfigs: [
+          {
             level: level,
             species: bossSpecies,
             dataSource: new PokemonData(bossPokemon),
             isBoss: true,
-          }],
-        };
+          },
+        ],
+      };
 
-        const magnet = generateModifierTypeOption(modifierTypes.ATTACK_TYPE_BOOSTER, [ Type.STEEL ])!;
-        const metalCoat = generateModifierTypeOption(modifierTypes.ATTACK_TYPE_BOOSTER, [ Type.ELECTRIC ])!;
-        setEncounterRewards({ guaranteedModifierTypeOptions: [ magnet, metalCoat ], fillRemaining: true });
-        await transitionMysteryEncounterIntroVisuals(true, true);
-        await initBattleWithEnemyConfig(config);
-      }
-    )
-    .build();
+      const magnet = generateModifierTypeOption(modifierTypes.ATTACK_TYPE_BOOSTER, [PokemonType.STEEL])!;
+      const metalCoat = generateModifierTypeOption(modifierTypes.ATTACK_TYPE_BOOSTER, [PokemonType.ELECTRIC])!;
+      setEncounterRewards({
+        guaranteedModifierTypeOptions: [magnet, metalCoat],
+        fillRemaining: true,
+      });
+      await transitionMysteryEncounterIntroVisuals(true, true);
+      await initBattleWithEnemyConfig(config);
+    },
+  )
+  .build();
 
 async function doBiomeTransitionDialogueAndBattleInit() {
   const encounter = globalScene.currentBattle.mysteryEncounter!;
@@ -167,34 +187,43 @@ async function doBiomeTransitionDialogueAndBattleInit() {
 
   // Show dialogue and transition biome
   await showEncounterText(`${namespace}:transport`);
-  await Promise.all([ animateBiomeChange(newBiome), transitionMysteryEncounterIntroVisuals() ]);
+  await Promise.all([animateBiomeChange(newBiome), transitionMysteryEncounterIntroVisuals()]);
   globalScene.updateBiomeWaveText();
   globalScene.playBgm();
   await showEncounterText(`${namespace}:attacked`);
 
   // Init enemy
   const level = getEncounterPokemonLevelForWave(STANDARD_ENCOUNTER_BOOSTED_LEVEL_MODIFIER);
-  const bossSpecies = globalScene.arena.randomSpecies(globalScene.currentBattle.waveIndex, level, 0, getPartyLuckValue(globalScene.getPlayerParty()), true);
+  const bossSpecies = globalScene.arena.randomSpecies(
+    globalScene.currentBattle.waveIndex,
+    level,
+    0,
+    getPartyLuckValue(globalScene.getPlayerParty()),
+    true,
+  );
   const bossPokemon = new EnemyPokemon(bossSpecies, level, TrainerSlot.NONE, true);
   encounter.setDialogueToken("enemyPokemon", getPokemonNameWithAffix(bossPokemon));
 
   // Defense/Spd buffs below wave 50, +1 to all stats otherwise
-  const statChangesForBattle: (Stat.ATK | Stat.DEF | Stat.SPATK | Stat.SPDEF | Stat.SPD | Stat.ACC | Stat.EVA)[] = globalScene.currentBattle.waveIndex < 50 ?
-    [ Stat.DEF, Stat.SPDEF, Stat.SPD ] :
-    [ Stat.ATK, Stat.DEF, Stat.SPATK, Stat.SPDEF, Stat.SPD ];
+  const statChangesForBattle: (Stat.ATK | Stat.DEF | Stat.SPATK | Stat.SPDEF | Stat.SPD | Stat.ACC | Stat.EVA)[] =
+    globalScene.currentBattle.waveIndex < 50
+      ? [Stat.DEF, Stat.SPDEF, Stat.SPD]
+      : [Stat.ATK, Stat.DEF, Stat.SPATK, Stat.SPDEF, Stat.SPD];
 
   const config: EnemyPartyConfig = {
-    pokemonConfigs: [{
-      level: level,
-      species: bossSpecies,
-      dataSource: new PokemonData(bossPokemon),
-      isBoss: true,
-      tags: [ BattlerTagType.MYSTERY_ENCOUNTER_POST_SUMMON ],
-      mysteryEncounterBattleEffects: (pokemon: Pokemon) => {
-        queueEncounterMessage(`${namespace}:boss_enraged`);
-        globalScene.unshiftPhase(new StatStageChangePhase(pokemon.getBattlerIndex(), true, statChangesForBattle, 1));
-      }
-    }],
+    pokemonConfigs: [
+      {
+        level: level,
+        species: bossSpecies,
+        dataSource: new PokemonData(bossPokemon),
+        isBoss: true,
+        tags: [BattlerTagType.MYSTERY_ENCOUNTER_POST_SUMMON],
+        mysteryEncounterBattleEffects: (pokemon: Pokemon) => {
+          queueEncounterMessage(`${namespace}:boss_enraged`);
+          globalScene.unshiftPhase(new StatStageChangePhase(pokemon.getBattlerIndex(), true, statChangesForBattle, 1));
+        },
+      },
+    ],
   };
 
   return config;
@@ -203,7 +232,7 @@ async function doBiomeTransitionDialogueAndBattleInit() {
 async function animateBiomeChange(nextBiome: Biome) {
   return new Promise<void>(resolve => {
     globalScene.tweens.add({
-      targets: [ globalScene.arenaEnemy, globalScene.lastEnemyTrainer ],
+      targets: [globalScene.arenaEnemy, globalScene.lastEnemyTrainer],
       x: "+=300",
       duration: 2000,
       onComplete: () => {
@@ -219,10 +248,10 @@ async function animateBiomeChange(nextBiome: Biome) {
         globalScene.arenaPlayerTransition.setVisible(true);
 
         globalScene.tweens.add({
-          targets: [ globalScene.arenaPlayer, globalScene.arenaBgTransition, globalScene.arenaPlayerTransition ],
+          targets: [globalScene.arenaPlayer, globalScene.arenaBgTransition, globalScene.arenaPlayerTransition],
           duration: 1000,
           ease: "Sine.easeInOut",
-          alpha: (target: any) => target === globalScene.arenaPlayer ? 0 : 1,
+          alpha: (target: any) => (target === globalScene.arenaPlayer ? 0 : 1),
           onComplete: () => {
             globalScene.arenaBg.setTexture(bgTexture);
             globalScene.arenaPlayer.setBiome(nextBiome);
@@ -242,9 +271,9 @@ async function animateBiomeChange(nextBiome: Biome) {
               targets: globalScene.arenaEnemy,
               x: "-=300",
             });
-          }
+          },
         });
-      }
+      },
     });
   });
 }
diff --git a/src/data/mystery-encounters/encounters/the-expert-pokemon-breeder-encounter.ts b/src/data/mystery-encounters/encounters/the-expert-pokemon-breeder-encounter.ts
index 2f5843e39d2..15063bc2763 100644
--- a/src/data/mystery-encounters/encounters/the-expert-pokemon-breeder-encounter.ts
+++ b/src/data/mystery-encounters/encounters/the-expert-pokemon-breeder-encounter.ts
@@ -1,13 +1,16 @@
 import type { EnemyPartyConfig } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
-import { generateModifierType, handleMysteryEncounterBattleFailed, initBattleWithEnemyConfig, setEncounterRewards, } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
-import { trainerConfigs } from "#app/data/trainer-config";
+import {
+  handleMysteryEncounterBattleFailed,
+  initBattleWithEnemyConfig,
+  setEncounterRewards,
+} from "#app/data/mystery-encounters/utils/encounter-phase-utils";
+import { trainerConfigs } from "#app/data/trainers/trainer-config";
 import { MysteryEncounterType } from "#enums/mystery-encounter-type";
 import { globalScene } from "#app/global-scene";
-import { randSeedShuffle } from "#app/utils";
+import { randSeedShuffle } from "#app/utils/common";
 import type MysteryEncounter from "../mystery-encounter";
 import { MysteryEncounterBuilder } from "../mystery-encounter";
 import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
-import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/game-mode";
 import { Biome } from "#enums/biome";
 import { TrainerType } from "#enums/trainer-type";
 import i18next from "i18next";
@@ -23,11 +26,9 @@ import { EggSourceType } from "#enums/egg-source-types";
 import { EggTier } from "#enums/egg-type";
 import { MysteryEncounterOptionBuilder } from "#app/data/mystery-encounters/mystery-encounter-option";
 import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
-import type { PokemonHeldItemModifierType } from "#app/modifier/modifier-type";
 import { modifierTypes } from "#app/modifier/modifier-type";
-import { Type } from "#enums/type";
+import { PokemonType } from "#enums/pokemon-type";
 import { getPokeballTintColor } from "#app/data/pokeball";
-import type { PokemonHeldItemModifier } from "#app/modifier/modifier";
 
 /** the i18n namespace for the encounter */
 const namespace = "mysteryEncounters/theExpertPokemonBreeder";
@@ -40,7 +41,7 @@ const FINAL_STAGE_EVOLUTION_WAVE = 75;
 
 const FRIENDSHIP_ADDED = 20;
 
-class BreederSpeciesEvolution  {
+class BreederSpeciesEvolution {
   species: Species;
   evolution: number;
 
@@ -51,29 +52,65 @@ class BreederSpeciesEvolution  {
 }
 
 const POOL_1_POKEMON: (Species | BreederSpeciesEvolution)[][] = [
-  [ Species.MUNCHLAX, new BreederSpeciesEvolution(Species.SNORLAX, SECOND_STAGE_EVOLUTION_WAVE) ],
-  [ Species.HAPPINY, new BreederSpeciesEvolution(Species.CHANSEY, FIRST_STAGE_EVOLUTION_WAVE), new BreederSpeciesEvolution(Species.BLISSEY, FINAL_STAGE_EVOLUTION_WAVE) ],
-  [ Species.MAGBY, new BreederSpeciesEvolution(Species.MAGMAR, FIRST_STAGE_EVOLUTION_WAVE), new BreederSpeciesEvolution(Species.MAGMORTAR, FINAL_STAGE_EVOLUTION_WAVE) ],
-  [ Species.ELEKID, new BreederSpeciesEvolution(Species.ELECTABUZZ, FIRST_STAGE_EVOLUTION_WAVE), new BreederSpeciesEvolution(Species.ELECTIVIRE, FINAL_STAGE_EVOLUTION_WAVE) ],
-  [ Species.RIOLU, new BreederSpeciesEvolution(Species.LUCARIO, SECOND_STAGE_EVOLUTION_WAVE) ],
-  [ Species.BUDEW, new BreederSpeciesEvolution(Species.ROSELIA, FIRST_STAGE_EVOLUTION_WAVE), new BreederSpeciesEvolution(Species.ROSERADE, FINAL_STAGE_EVOLUTION_WAVE) ],
-  [ Species.TOXEL, new BreederSpeciesEvolution(Species.TOXTRICITY, SECOND_STAGE_EVOLUTION_WAVE) ],
-  [ Species.MIME_JR, new BreederSpeciesEvolution(Species.GALAR_MR_MIME, FIRST_STAGE_EVOLUTION_WAVE), new BreederSpeciesEvolution(Species.MR_RIME, FINAL_STAGE_EVOLUTION_WAVE) ]
+  [Species.MUNCHLAX, new BreederSpeciesEvolution(Species.SNORLAX, SECOND_STAGE_EVOLUTION_WAVE)],
+  [
+    Species.HAPPINY,
+    new BreederSpeciesEvolution(Species.CHANSEY, FIRST_STAGE_EVOLUTION_WAVE),
+    new BreederSpeciesEvolution(Species.BLISSEY, FINAL_STAGE_EVOLUTION_WAVE),
+  ],
+  [
+    Species.MAGBY,
+    new BreederSpeciesEvolution(Species.MAGMAR, FIRST_STAGE_EVOLUTION_WAVE),
+    new BreederSpeciesEvolution(Species.MAGMORTAR, FINAL_STAGE_EVOLUTION_WAVE),
+  ],
+  [
+    Species.ELEKID,
+    new BreederSpeciesEvolution(Species.ELECTABUZZ, FIRST_STAGE_EVOLUTION_WAVE),
+    new BreederSpeciesEvolution(Species.ELECTIVIRE, FINAL_STAGE_EVOLUTION_WAVE),
+  ],
+  [Species.RIOLU, new BreederSpeciesEvolution(Species.LUCARIO, SECOND_STAGE_EVOLUTION_WAVE)],
+  [
+    Species.BUDEW,
+    new BreederSpeciesEvolution(Species.ROSELIA, FIRST_STAGE_EVOLUTION_WAVE),
+    new BreederSpeciesEvolution(Species.ROSERADE, FINAL_STAGE_EVOLUTION_WAVE),
+  ],
+  [Species.TOXEL, new BreederSpeciesEvolution(Species.TOXTRICITY, SECOND_STAGE_EVOLUTION_WAVE)],
+  [
+    Species.MIME_JR,
+    new BreederSpeciesEvolution(Species.GALAR_MR_MIME, FIRST_STAGE_EVOLUTION_WAVE),
+    new BreederSpeciesEvolution(Species.MR_RIME, FINAL_STAGE_EVOLUTION_WAVE),
+  ],
 ];
 
 const POOL_2_POKEMON: (Species | BreederSpeciesEvolution)[][] = [
-  [ Species.PICHU, new BreederSpeciesEvolution(Species.PIKACHU, FIRST_STAGE_EVOLUTION_WAVE), new BreederSpeciesEvolution(Species.RAICHU, FINAL_STAGE_EVOLUTION_WAVE) ],
-  [ Species.PICHU, new BreederSpeciesEvolution(Species.PIKACHU, FIRST_STAGE_EVOLUTION_WAVE), new BreederSpeciesEvolution(Species.ALOLA_RAICHU, FINAL_STAGE_EVOLUTION_WAVE) ],
-  [ Species.SMOOCHUM, new BreederSpeciesEvolution(Species.JYNX, SECOND_STAGE_EVOLUTION_WAVE) ],
-  [ Species.TYROGUE, new BreederSpeciesEvolution(Species.HITMONLEE, SECOND_STAGE_EVOLUTION_WAVE) ],
-  [ Species.TYROGUE, new BreederSpeciesEvolution(Species.HITMONCHAN, SECOND_STAGE_EVOLUTION_WAVE) ],
-  [ Species.TYROGUE, new BreederSpeciesEvolution(Species.HITMONTOP, SECOND_STAGE_EVOLUTION_WAVE) ],
-  [ Species.IGGLYBUFF, new BreederSpeciesEvolution(Species.JIGGLYPUFF, FIRST_STAGE_EVOLUTION_WAVE), new BreederSpeciesEvolution(Species.WIGGLYTUFF, FINAL_STAGE_EVOLUTION_WAVE) ],
-  [ Species.AZURILL, new BreederSpeciesEvolution(Species.MARILL, FIRST_STAGE_EVOLUTION_WAVE), new BreederSpeciesEvolution(Species.AZUMARILL, FINAL_STAGE_EVOLUTION_WAVE) ],
-  [ Species.WYNAUT, new BreederSpeciesEvolution(Species.WOBBUFFET, SECOND_STAGE_EVOLUTION_WAVE) ],
-  [ Species.CHINGLING, new BreederSpeciesEvolution(Species.CHIMECHO, SECOND_STAGE_EVOLUTION_WAVE) ],
-  [ Species.BONSLY, new BreederSpeciesEvolution(Species.SUDOWOODO, SECOND_STAGE_EVOLUTION_WAVE) ],
-  [ Species.MANTYKE, new BreederSpeciesEvolution(Species.MANTINE, SECOND_STAGE_EVOLUTION_WAVE) ]
+  [
+    Species.PICHU,
+    new BreederSpeciesEvolution(Species.PIKACHU, FIRST_STAGE_EVOLUTION_WAVE),
+    new BreederSpeciesEvolution(Species.RAICHU, FINAL_STAGE_EVOLUTION_WAVE),
+  ],
+  [
+    Species.PICHU,
+    new BreederSpeciesEvolution(Species.PIKACHU, FIRST_STAGE_EVOLUTION_WAVE),
+    new BreederSpeciesEvolution(Species.ALOLA_RAICHU, FINAL_STAGE_EVOLUTION_WAVE),
+  ],
+  [Species.SMOOCHUM, new BreederSpeciesEvolution(Species.JYNX, SECOND_STAGE_EVOLUTION_WAVE)],
+  [Species.TYROGUE, new BreederSpeciesEvolution(Species.HITMONLEE, SECOND_STAGE_EVOLUTION_WAVE)],
+  [Species.TYROGUE, new BreederSpeciesEvolution(Species.HITMONCHAN, SECOND_STAGE_EVOLUTION_WAVE)],
+  [Species.TYROGUE, new BreederSpeciesEvolution(Species.HITMONTOP, SECOND_STAGE_EVOLUTION_WAVE)],
+  [
+    Species.IGGLYBUFF,
+    new BreederSpeciesEvolution(Species.JIGGLYPUFF, FIRST_STAGE_EVOLUTION_WAVE),
+    new BreederSpeciesEvolution(Species.WIGGLYTUFF, FINAL_STAGE_EVOLUTION_WAVE),
+  ],
+  [
+    Species.AZURILL,
+    new BreederSpeciesEvolution(Species.MARILL, FIRST_STAGE_EVOLUTION_WAVE),
+    new BreederSpeciesEvolution(Species.AZUMARILL, FINAL_STAGE_EVOLUTION_WAVE),
+  ],
+  [Species.WYNAUT, new BreederSpeciesEvolution(Species.WOBBUFFET, SECOND_STAGE_EVOLUTION_WAVE)],
+  [Species.CHINGLING, new BreederSpeciesEvolution(Species.CHIMECHO, SECOND_STAGE_EVOLUTION_WAVE)],
+  [Species.BONSLY, new BreederSpeciesEvolution(Species.SUDOWOODO, SECOND_STAGE_EVOLUTION_WAVE)],
+  [Species.MANTYKE, new BreederSpeciesEvolution(Species.MANTINE, SECOND_STAGE_EVOLUTION_WAVE)],
 ];
 
 /**
@@ -81,291 +118,344 @@ const POOL_2_POKEMON: (Species | BreederSpeciesEvolution)[][] = [
  * @see {@link https://github.com/pagefaultgames/pokerogue/issues/3818 | GitHub Issue #3818}
  * @see For biome requirements check {@linkcode mysteryEncountersByBiome}
  */
-export const TheExpertPokemonBreederEncounter: MysteryEncounter =
-  MysteryEncounterBuilder.withEncounterType(MysteryEncounterType.THE_EXPERT_POKEMON_BREEDER)
-    .withEncounterTier(MysteryEncounterTier.ULTRA)
-    .withSceneWaveRangeRequirement(...CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES)
-    .withScenePartySizeRequirement(4, 6, true) // Must have at least 4 legal pokemon in party
-    .withIntroSpriteConfigs([]) // These are set in onInit()
-    .withIntroDialogue([
+export const TheExpertPokemonBreederEncounter: MysteryEncounter = MysteryEncounterBuilder.withEncounterType(
+  MysteryEncounterType.THE_EXPERT_POKEMON_BREEDER,
+)
+  .withEncounterTier(MysteryEncounterTier.ULTRA)
+  .withSceneWaveRangeRequirement(25, 180)
+  .withScenePartySizeRequirement(4, 6, true) // Must have at least 4 legal pokemon in party
+  .withIntroSpriteConfigs([]) // These are set in onInit()
+  .withIntroDialogue([
+    {
+      text: `${namespace}:intro`,
+    },
+    {
+      speaker: trainerNameKey,
+      text: `${namespace}:intro_dialogue`,
+    },
+  ])
+  .withOnInit(() => {
+    const encounter = globalScene.currentBattle.mysteryEncounter!;
+    const waveIndex = globalScene.currentBattle.waveIndex;
+    // Calculates what trainers are available for battle in the encounter
+
+    // If player is in space biome, uses special "Space" version of the trainer
+    encounter.enemyPartyConfigs = [getPartyConfig()];
+
+    const cleffaSpecies =
+      waveIndex < FIRST_STAGE_EVOLUTION_WAVE
+        ? Species.CLEFFA
+        : waveIndex < FINAL_STAGE_EVOLUTION_WAVE
+          ? Species.CLEFAIRY
+          : Species.CLEFABLE;
+    encounter.spriteConfigs = [
       {
-        text: `${namespace}:intro`,
+        spriteKey: cleffaSpecies.toString(),
+        fileRoot: "pokemon",
+        hasShadow: true,
+        repeat: true,
+        x: 14,
+        y: -2,
+        yShadow: -2,
       },
       {
-        speaker: trainerNameKey,
-        text: `${namespace}:intro_dialogue`,
+        spriteKey: "expert_pokemon_breeder",
+        fileRoot: "trainer",
+        hasShadow: true,
+        x: -14,
+        y: 4,
+        yShadow: 2,
       },
-    ])
-    .withOnInit(() => {
-      const encounter = globalScene.currentBattle.mysteryEncounter!;
-      const waveIndex = globalScene.currentBattle.waveIndex;
-      // Calculates what trainers are available for battle in the encounter
+    ];
 
-      // If player is in space biome, uses special "Space" version of the trainer
-      encounter.enemyPartyConfigs = [
-        getPartyConfig()
-      ];
+    // Determine the 3 pokemon the player can battle with
+    let partyCopy = globalScene.getPlayerParty().slice(0);
+    partyCopy = partyCopy.filter(p => p.isAllowedInBattle()).sort((a, b) => a.friendship - b.friendship);
 
-      const cleffaSpecies = waveIndex < FIRST_STAGE_EVOLUTION_WAVE ? Species.CLEFFA : waveIndex < FINAL_STAGE_EVOLUTION_WAVE ? Species.CLEFAIRY : Species.CLEFABLE;
-      encounter.spriteConfigs = [
-        {
-          spriteKey: cleffaSpecies.toString(),
-          fileRoot: "pokemon",
-          hasShadow: true,
-          repeat: true,
-          x: 14,
-          y: -2,
-          yShadow: -2
-        },
-        {
-          spriteKey: "expert_pokemon_breeder",
-          fileRoot: "trainer",
-          hasShadow: true,
-          x: -14,
-          y: 4,
-          yShadow: 2
-        },
-      ];
+    const pokemon1 = partyCopy[0];
+    const pokemon2 = partyCopy[1];
+    const pokemon3 = partyCopy[2];
+    encounter.setDialogueToken("pokemon1Name", pokemon1.getNameToRender());
+    encounter.setDialogueToken("pokemon2Name", pokemon2.getNameToRender());
+    encounter.setDialogueToken("pokemon3Name", pokemon3.getNameToRender());
 
-      // Determine the 3 pokemon the player can battle with
-      let partyCopy = globalScene.getPlayerParty().slice(0);
-      partyCopy = partyCopy
-        .filter(p => p.isAllowedInBattle())
-        .sort((a, b) => a.friendship - b.friendship);
+    // Dialogue and egg calcs for Pokemon 1
+    const [pokemon1CommonEggs, pokemon1RareEggs] = calculateEggRewardsForPokemon(pokemon1);
+    let pokemon1Tooltip = getEncounterText(`${namespace}:option.1.tooltip_base`)!;
+    if (pokemon1RareEggs > 0) {
+      const eggsText = i18next.t(`${namespace}:numEggs`, {
+        count: pokemon1RareEggs,
+        rarity: i18next.t("egg:greatTier"),
+      });
+      pokemon1Tooltip += i18next.t(`${namespace}:eggs_tooltip`, {
+        eggs: eggsText,
+      });
+      encounter.setDialogueToken("pokemon1RareEggs", eggsText);
+    }
+    if (pokemon1CommonEggs > 0) {
+      const eggsText = i18next.t(`${namespace}:numEggs`, {
+        count: pokemon1CommonEggs,
+        rarity: i18next.t("egg:defaultTier"),
+      });
+      pokemon1Tooltip += i18next.t(`${namespace}:eggs_tooltip`, {
+        eggs: eggsText,
+      });
+      encounter.setDialogueToken("pokemon1CommonEggs", eggsText);
+    }
+    encounter.options[0].dialogue!.buttonTooltip = pokemon1Tooltip;
 
-      const pokemon1 = partyCopy[0];
-      const pokemon2 = partyCopy[1];
-      const pokemon3 = partyCopy[2];
-      encounter.setDialogueToken("pokemon1Name", pokemon1.getNameToRender());
-      encounter.setDialogueToken("pokemon2Name", pokemon2.getNameToRender());
-      encounter.setDialogueToken("pokemon3Name", pokemon3.getNameToRender());
+    // Dialogue and egg calcs for Pokemon 2
+    const [pokemon2CommonEggs, pokemon2RareEggs] = calculateEggRewardsForPokemon(pokemon2);
+    let pokemon2Tooltip = getEncounterText(`${namespace}:option.2.tooltip_base`)!;
+    if (pokemon2RareEggs > 0) {
+      const eggsText = i18next.t(`${namespace}:numEggs`, {
+        count: pokemon2RareEggs,
+        rarity: i18next.t("egg:greatTier"),
+      });
+      pokemon2Tooltip += i18next.t(`${namespace}:eggs_tooltip`, {
+        eggs: eggsText,
+      });
+      encounter.setDialogueToken("pokemon2RareEggs", eggsText);
+    }
+    if (pokemon2CommonEggs > 0) {
+      const eggsText = i18next.t(`${namespace}:numEggs`, {
+        count: pokemon2CommonEggs,
+        rarity: i18next.t("egg:defaultTier"),
+      });
+      pokemon2Tooltip += i18next.t(`${namespace}:eggs_tooltip`, {
+        eggs: eggsText,
+      });
+      encounter.setDialogueToken("pokemon2CommonEggs", eggsText);
+    }
+    encounter.options[1].dialogue!.buttonTooltip = pokemon2Tooltip;
 
-      // Dialogue and egg calcs for Pokemon 1
-      const [ pokemon1CommonEggs, pokemon1RareEggs ] = calculateEggRewardsForPokemon(pokemon1);
-      let pokemon1Tooltip = getEncounterText(`${namespace}:option.1.tooltip_base`)!;
-      if (pokemon1RareEggs > 0) {
-        const eggsText = i18next.t(`${namespace}:numEggs`, { count: pokemon1RareEggs, rarity: i18next.t("egg:greatTier") });
-        pokemon1Tooltip += i18next.t(`${namespace}:eggs_tooltip`, { eggs: eggsText });
-        encounter.setDialogueToken("pokemon1RareEggs", eggsText);
-      }
-      if (pokemon1CommonEggs > 0) {
-        const eggsText = i18next.t(`${namespace}:numEggs`, { count: pokemon1CommonEggs, rarity: i18next.t("egg:defaultTier") });
-        pokemon1Tooltip += i18next.t(`${namespace}:eggs_tooltip`, { eggs: eggsText });
-        encounter.setDialogueToken("pokemon1CommonEggs", eggsText);
-      }
-      encounter.options[0].dialogue!.buttonTooltip = pokemon1Tooltip;
+    // Dialogue and egg calcs for Pokemon 3
+    const [pokemon3CommonEggs, pokemon3RareEggs] = calculateEggRewardsForPokemon(pokemon3);
+    let pokemon3Tooltip = getEncounterText(`${namespace}:option.3.tooltip_base`)!;
+    if (pokemon3RareEggs > 0) {
+      const eggsText = i18next.t(`${namespace}:numEggs`, {
+        count: pokemon3RareEggs,
+        rarity: i18next.t("egg:greatTier"),
+      });
+      pokemon3Tooltip += i18next.t(`${namespace}:eggs_tooltip`, {
+        eggs: eggsText,
+      });
+      encounter.setDialogueToken("pokemon3RareEggs", eggsText);
+    }
+    if (pokemon3CommonEggs > 0) {
+      const eggsText = i18next.t(`${namespace}:numEggs`, {
+        count: pokemon3CommonEggs,
+        rarity: i18next.t("egg:defaultTier"),
+      });
+      pokemon3Tooltip += i18next.t(`${namespace}:eggs_tooltip`, {
+        eggs: eggsText,
+      });
+      encounter.setDialogueToken("pokemon3CommonEggs", eggsText);
+    }
+    encounter.options[2].dialogue!.buttonTooltip = pokemon3Tooltip;
 
-      // Dialogue and egg calcs for Pokemon 2
-      const [ pokemon2CommonEggs, pokemon2RareEggs ] = calculateEggRewardsForPokemon(pokemon2);
-      let pokemon2Tooltip = getEncounterText(`${namespace}:option.2.tooltip_base`)!;
-      if (pokemon2RareEggs > 0) {
-        const eggsText = i18next.t(`${namespace}:numEggs`, { count: pokemon2RareEggs, rarity: i18next.t("egg:greatTier") });
-        pokemon2Tooltip += i18next.t(`${namespace}:eggs_tooltip`, { eggs: eggsText });
-        encounter.setDialogueToken("pokemon2RareEggs", eggsText);
-      }
-      if (pokemon2CommonEggs > 0) {
-        const eggsText = i18next.t(`${namespace}:numEggs`, { count: pokemon2CommonEggs, rarity: i18next.t("egg:defaultTier") });
-        pokemon2Tooltip += i18next.t(`${namespace}:eggs_tooltip`, { eggs: eggsText });
-        encounter.setDialogueToken("pokemon2CommonEggs", eggsText);
-      }
-      encounter.options[1].dialogue!.buttonTooltip = pokemon2Tooltip;
+    encounter.misc = {
+      pokemon1,
+      pokemon1CommonEggs,
+      pokemon1RareEggs,
+      pokemon2,
+      pokemon2CommonEggs,
+      pokemon2RareEggs,
+      pokemon3,
+      pokemon3CommonEggs,
+      pokemon3RareEggs,
+    };
 
-      // Dialogue and egg calcs for Pokemon 3
-      const [ pokemon3CommonEggs, pokemon3RareEggs ] = calculateEggRewardsForPokemon(pokemon3);
-      let pokemon3Tooltip = getEncounterText(`${namespace}:option.3.tooltip_base`)!;
-      if (pokemon3RareEggs > 0) {
-        const eggsText = i18next.t(`${namespace}:numEggs`, { count: pokemon3RareEggs, rarity: i18next.t("egg:greatTier") });
-        pokemon3Tooltip += i18next.t(`${namespace}:eggs_tooltip`, { eggs: eggsText });
-        encounter.setDialogueToken("pokemon3RareEggs", eggsText);
-      }
-      if (pokemon3CommonEggs > 0) {
-        const eggsText = i18next.t(`${namespace}:numEggs`, { count: pokemon3CommonEggs, rarity: i18next.t("egg:defaultTier") });
-        pokemon3Tooltip += i18next.t(`${namespace}:eggs_tooltip`, { eggs: eggsText });
-        encounter.setDialogueToken("pokemon3CommonEggs", eggsText);
-      }
-      encounter.options[2].dialogue!.buttonTooltip = pokemon3Tooltip;
+    return true;
+  })
+  .setLocalizationKey(`${namespace}`)
+  .withTitle(`${namespace}:title`)
+  .withDescription(`${namespace}:description`)
+  .withQuery(`${namespace}:query`)
+  .withOption(
+    MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DEFAULT)
+      .withDialogue({
+        buttonLabel: `${namespace}:option.1.label`,
+        selected: [
+          {
+            speaker: trainerNameKey,
+            text: `${namespace}:option.selected`,
+          },
+        ],
+      })
+      .withOptionPhase(async () => {
+        const encounter = globalScene.currentBattle.mysteryEncounter!;
+        // Spawn battle with first pokemon
+        const config: EnemyPartyConfig = encounter.enemyPartyConfigs[0];
 
-      encounter.misc = {
-        pokemon1,
-        pokemon1CommonEggs,
-        pokemon1RareEggs,
-        pokemon2,
-        pokemon2CommonEggs,
-        pokemon2RareEggs,
-        pokemon3,
-        pokemon3CommonEggs,
-        pokemon3RareEggs
-      };
+        const { pokemon1, pokemon1CommonEggs, pokemon1RareEggs } = encounter.misc;
+        encounter.misc.chosenPokemon = pokemon1;
+        encounter.setDialogueToken("chosenPokemon", pokemon1.getNameToRender());
+        const eggOptions = getEggOptions(pokemon1CommonEggs, pokemon1RareEggs);
+        setEncounterRewards(
+          {
+            guaranteedModifierTypeFuncs: [modifierTypes.SOOTHE_BELL],
+            fillRemaining: true,
+          },
+          eggOptions,
+          () => doPostEncounterCleanup(),
+        );
 
-      return true;
-    })
-    .setLocalizationKey(`${namespace}`)
-    .withTitle(`${namespace}:title`)
-    .withDescription(`${namespace}:description`)
-    .withQuery(`${namespace}:query`)
-    .withOption(
-      MysteryEncounterOptionBuilder
-        .newOptionWithMode(MysteryEncounterOptionMode.DEFAULT)
-        .withDialogue({
-          buttonLabel: `${namespace}:option.1.label`,
-          selected: [
-            {
-              speaker: trainerNameKey,
-              text: `${namespace}:option.selected`,
-            },
-          ],
-        })
-        .withOptionPhase(async () => {
-          const encounter = globalScene.currentBattle.mysteryEncounter!;
-          // Spawn battle with first pokemon
-          const config: EnemyPartyConfig = encounter.enemyPartyConfigs[0];
+        // Remove all Pokemon from the party except the chosen Pokemon
+        removePokemonFromPartyAndStoreHeldItems(encounter, pokemon1);
 
-          const { pokemon1, pokemon1CommonEggs, pokemon1RareEggs } = encounter.misc;
-          encounter.misc.chosenPokemon = pokemon1;
-          encounter.setDialogueToken("chosenPokemon", pokemon1.getNameToRender());
-          const eggOptions = getEggOptions(pokemon1CommonEggs, pokemon1RareEggs);
-          setEncounterRewards(
-            { guaranteedModifierTypeFuncs: [ modifierTypes.SOOTHE_BELL ], fillRemaining: true },
-            eggOptions,
-            () => doPostEncounterCleanup());
+        // Configure outro dialogue for egg rewards
+        encounter.dialogue.outro = [
+          {
+            speaker: trainerNameKey,
+            text: `${namespace}:outro`,
+          },
+        ];
+        if (encounter.dialogueTokens.hasOwnProperty("pokemon1CommonEggs")) {
+          encounter.dialogue.outro.push({
+            text: i18next.t(`${namespace}:gained_eggs`, {
+              numEggs: encounter.dialogueTokens["pokemon1CommonEggs"],
+            }),
+          });
+        }
+        if (encounter.dialogueTokens.hasOwnProperty("pokemon1RareEggs")) {
+          encounter.dialogue.outro.push({
+            text: i18next.t(`${namespace}:gained_eggs`, {
+              numEggs: encounter.dialogueTokens["pokemon1RareEggs"],
+            }),
+          });
+        }
 
-          // Remove all Pokemon from the party except the chosen Pokemon
-          removePokemonFromPartyAndStoreHeldItems(encounter, pokemon1);
+        encounter.onGameOver = onGameOver;
+        await initBattleWithEnemyConfig(config);
+      })
+      .build(),
+  )
+  .withOption(
+    MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DEFAULT)
+      .withDialogue({
+        buttonLabel: `${namespace}:option.2.label`,
+        selected: [
+          {
+            speaker: trainerNameKey,
+            text: `${namespace}:option.selected`,
+          },
+        ],
+      })
+      .withOptionPhase(async () => {
+        const encounter = globalScene.currentBattle.mysteryEncounter!;
+        // Spawn battle with second pokemon
+        const config: EnemyPartyConfig = encounter.enemyPartyConfigs[0];
 
-          // Configure outro dialogue for egg rewards
-          encounter.dialogue.outro = [
-            {
-              speaker: trainerNameKey,
-              text: `${namespace}:outro`,
-            },
-          ];
-          if (encounter.dialogueTokens.hasOwnProperty("pokemon1CommonEggs")) {
-            encounter.dialogue.outro.push({
-              text: i18next.t(`${namespace}:gained_eggs`, { numEggs: encounter.dialogueTokens["pokemon1CommonEggs"] }),
-            });
-          }
-          if (encounter.dialogueTokens.hasOwnProperty("pokemon1RareEggs")) {
-            encounter.dialogue.outro.push({
-              text: i18next.t(`${namespace}:gained_eggs`, { numEggs: encounter.dialogueTokens["pokemon1RareEggs"] }),
-            });
-          }
+        const { pokemon2, pokemon2CommonEggs, pokemon2RareEggs } = encounter.misc;
+        encounter.misc.chosenPokemon = pokemon2;
+        encounter.setDialogueToken("chosenPokemon", pokemon2.getNameToRender());
+        const eggOptions = getEggOptions(pokemon2CommonEggs, pokemon2RareEggs);
+        setEncounterRewards(
+          {
+            guaranteedModifierTypeFuncs: [modifierTypes.SOOTHE_BELL],
+            fillRemaining: true,
+          },
+          eggOptions,
+          () => doPostEncounterCleanup(),
+        );
 
-          encounter.onGameOver = onGameOver;
-          await initBattleWithEnemyConfig(config);
-        })
-        .build()
-    )
-    .withOption(
-      MysteryEncounterOptionBuilder
-        .newOptionWithMode(MysteryEncounterOptionMode.DEFAULT)
-        .withDialogue({
-          buttonLabel: `${namespace}:option.2.label`,
-          selected: [
-            {
-              speaker: trainerNameKey,
-              text: `${namespace}:option.selected`,
-            },
-          ],
-        })
-        .withOptionPhase(async () => {
-          const encounter = globalScene.currentBattle.mysteryEncounter!;
-          // Spawn battle with second pokemon
-          const config: EnemyPartyConfig = encounter.enemyPartyConfigs[0];
+        // Remove all Pokemon from the party except the chosen Pokemon
+        removePokemonFromPartyAndStoreHeldItems(encounter, pokemon2);
 
-          const { pokemon2, pokemon2CommonEggs, pokemon2RareEggs } = encounter.misc;
-          encounter.misc.chosenPokemon = pokemon2;
-          encounter.setDialogueToken("chosenPokemon", pokemon2.getNameToRender());
-          const eggOptions = getEggOptions(pokemon2CommonEggs, pokemon2RareEggs);
-          setEncounterRewards(
-            { guaranteedModifierTypeFuncs: [ modifierTypes.SOOTHE_BELL ], fillRemaining: true },
-            eggOptions,
-            () => doPostEncounterCleanup());
+        // Configure outro dialogue for egg rewards
+        encounter.dialogue.outro = [
+          {
+            speaker: trainerNameKey,
+            text: `${namespace}:outro`,
+          },
+        ];
+        if (encounter.dialogueTokens.hasOwnProperty("pokemon2CommonEggs")) {
+          encounter.dialogue.outro.push({
+            text: i18next.t(`${namespace}:gained_eggs`, {
+              numEggs: encounter.dialogueTokens["pokemon2CommonEggs"],
+            }),
+          });
+        }
+        if (encounter.dialogueTokens.hasOwnProperty("pokemon2RareEggs")) {
+          encounter.dialogue.outro.push({
+            text: i18next.t(`${namespace}:gained_eggs`, {
+              numEggs: encounter.dialogueTokens["pokemon2RareEggs"],
+            }),
+          });
+        }
 
-          // Remove all Pokemon from the party except the chosen Pokemon
-          removePokemonFromPartyAndStoreHeldItems(encounter, pokemon2);
+        encounter.onGameOver = onGameOver;
+        await initBattleWithEnemyConfig(config);
+      })
+      .build(),
+  )
+  .withOption(
+    MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DEFAULT)
+      .withDialogue({
+        buttonLabel: `${namespace}:option.3.label`,
+        selected: [
+          {
+            speaker: trainerNameKey,
+            text: `${namespace}:option.selected`,
+          },
+        ],
+      })
+      .withOptionPhase(async () => {
+        const encounter = globalScene.currentBattle.mysteryEncounter!;
+        // Spawn battle with third pokemon
+        const config: EnemyPartyConfig = encounter.enemyPartyConfigs[0];
 
-          // Configure outro dialogue for egg rewards
-          encounter.dialogue.outro = [
-            {
-              speaker: trainerNameKey,
-              text: `${namespace}:outro`,
-            },
-          ];
-          if (encounter.dialogueTokens.hasOwnProperty("pokemon2CommonEggs")) {
-            encounter.dialogue.outro.push({
-              text: i18next.t(`${namespace}:gained_eggs`, { numEggs: encounter.dialogueTokens["pokemon2CommonEggs"] }),
-            });
-          }
-          if (encounter.dialogueTokens.hasOwnProperty("pokemon2RareEggs")) {
-            encounter.dialogue.outro.push({
-              text: i18next.t(`${namespace}:gained_eggs`, { numEggs: encounter.dialogueTokens["pokemon2RareEggs"] }),
-            });
-          }
+        const { pokemon3, pokemon3CommonEggs, pokemon3RareEggs } = encounter.misc;
+        encounter.misc.chosenPokemon = pokemon3;
+        encounter.setDialogueToken("chosenPokemon", pokemon3.getNameToRender());
+        const eggOptions = getEggOptions(pokemon3CommonEggs, pokemon3RareEggs);
+        setEncounterRewards(
+          {
+            guaranteedModifierTypeFuncs: [modifierTypes.SOOTHE_BELL],
+            fillRemaining: true,
+          },
+          eggOptions,
+          () => doPostEncounterCleanup(),
+        );
 
-          encounter.onGameOver = onGameOver;
-          await initBattleWithEnemyConfig(config);
-        })
-        .build()
-    )
-    .withOption(
-      MysteryEncounterOptionBuilder
-        .newOptionWithMode(MysteryEncounterOptionMode.DEFAULT)
-        .withDialogue({
-          buttonLabel: `${namespace}:option.3.label`,
-          selected: [
-            {
-              speaker: trainerNameKey,
-              text: `${namespace}:option.selected`,
-            },
-          ],
-        })
-        .withOptionPhase(async () => {
-          const encounter = globalScene.currentBattle.mysteryEncounter!;
-          // Spawn battle with third pokemon
-          const config: EnemyPartyConfig = encounter.enemyPartyConfigs[0];
+        // Remove all Pokemon from the party except the chosen Pokemon
+        removePokemonFromPartyAndStoreHeldItems(encounter, pokemon3);
 
-          const { pokemon3, pokemon3CommonEggs, pokemon3RareEggs } = encounter.misc;
-          encounter.misc.chosenPokemon = pokemon3;
-          encounter.setDialogueToken("chosenPokemon", pokemon3.getNameToRender());
-          const eggOptions = getEggOptions(pokemon3CommonEggs, pokemon3RareEggs);
-          setEncounterRewards(
-            { guaranteedModifierTypeFuncs: [ modifierTypes.SOOTHE_BELL ], fillRemaining: true },
-            eggOptions,
-            () => doPostEncounterCleanup());
+        // Configure outro dialogue for egg rewards
+        encounter.dialogue.outro = [
+          {
+            speaker: trainerNameKey,
+            text: `${namespace}:outro`,
+          },
+        ];
+        if (encounter.dialogueTokens.hasOwnProperty("pokemon3CommonEggs")) {
+          encounter.dialogue.outro.push({
+            text: i18next.t(`${namespace}:gained_eggs`, {
+              numEggs: encounter.dialogueTokens["pokemon3CommonEggs"],
+            }),
+          });
+        }
+        if (encounter.dialogueTokens.hasOwnProperty("pokemon3RareEggs")) {
+          encounter.dialogue.outro.push({
+            text: i18next.t(`${namespace}:gained_eggs`, {
+              numEggs: encounter.dialogueTokens["pokemon3RareEggs"],
+            }),
+          });
+        }
 
-          // Remove all Pokemon from the party except the chosen Pokemon
-          removePokemonFromPartyAndStoreHeldItems(encounter, pokemon3);
-
-          // Configure outro dialogue for egg rewards
-          encounter.dialogue.outro = [
-            {
-              speaker: trainerNameKey,
-              text: `${namespace}:outro`,
-            },
-          ];
-          if (encounter.dialogueTokens.hasOwnProperty("pokemon3CommonEggs")) {
-            encounter.dialogue.outro.push({
-              text: i18next.t(`${namespace}:gained_eggs`, { numEggs: encounter.dialogueTokens["pokemon3CommonEggs"] }),
-            });
-          }
-          if (encounter.dialogueTokens.hasOwnProperty("pokemon3RareEggs")) {
-            encounter.dialogue.outro.push({
-              text: i18next.t(`${namespace}:gained_eggs`, { numEggs: encounter.dialogueTokens["pokemon3RareEggs"] }),
-            });
-          }
-
-          encounter.onGameOver = onGameOver;
-          await initBattleWithEnemyConfig(config);
-        })
-        .build()
-    )
-    .withOutroDialogue([
-      {
-        speaker: trainerNameKey,
-        text: `${namespace}:outro`,
-      },
-    ])
-    .build();
+        encounter.onGameOver = onGameOver;
+        await initBattleWithEnemyConfig(config);
+      })
+      .build(),
+  )
+  .withOutroDialogue([
+    {
+      speaker: trainerNameKey,
+      text: `${namespace}:outro`,
+    },
+  ])
+  .build();
 
 function getPartyConfig(): EnemyPartyConfig {
   // Bug type superfan trainer config
@@ -374,68 +464,79 @@ function getPartyConfig(): EnemyPartyConfig {
   breederConfig.name = i18next.t(trainerNameKey);
 
   // First mon is *always* this special cleffa
-  const cleffaSpecies = waveIndex < FIRST_STAGE_EVOLUTION_WAVE ? Species.CLEFFA : waveIndex < FINAL_STAGE_EVOLUTION_WAVE ? Species.CLEFAIRY : Species.CLEFABLE;
+  const cleffaSpecies =
+    waveIndex < FIRST_STAGE_EVOLUTION_WAVE
+      ? Species.CLEFFA
+      : waveIndex < FINAL_STAGE_EVOLUTION_WAVE
+        ? Species.CLEFAIRY
+        : Species.CLEFABLE;
   const baseConfig: EnemyPartyConfig = {
     trainerType: TrainerType.EXPERT_POKEMON_BREEDER,
     pokemonConfigs: [
       {
-        nickname: i18next.t(`${namespace}:cleffa_1_nickname`, { speciesName: getPokemonSpecies(cleffaSpecies).getName() }),
+        nickname: i18next.t(`${namespace}:cleffa_1_nickname`, {
+          speciesName: getPokemonSpecies(cleffaSpecies).getName(),
+        }),
         species: getPokemonSpecies(cleffaSpecies),
         isBoss: false,
         abilityIndex: 1, // Magic Guard
         shiny: false,
         nature: Nature.ADAMANT,
-        moveSet: [ Moves.METEOR_MASH, Moves.FIRE_PUNCH, Moves.ICE_PUNCH, Moves.THUNDER_PUNCH ],
-        ivs: [ 31, 31, 31, 31, 31, 31 ],
-        modifierConfigs: [
-          {
-            modifier: generateModifierType(modifierTypes.TERA_SHARD, [ Type.STEEL ]) as PokemonHeldItemModifierType,
-          }
-        ]
-      }
-    ]
+        moveSet: [Moves.FIRE_PUNCH, Moves.ICE_PUNCH, Moves.THUNDER_PUNCH, Moves.METEOR_MASH],
+        ivs: [31, 31, 31, 31, 31, 31],
+        tera: PokemonType.FAIRY,
+      },
+    ],
   };
 
   if (globalScene.arena.biomeType === Biome.SPACE) {
     // All 3 members always Cleffa line, but different configs
-    baseConfig.pokemonConfigs!.push({
-      nickname: i18next.t(`${namespace}:cleffa_2_nickname`, { speciesName: getPokemonSpecies(cleffaSpecies).getName() }),
-      species: getPokemonSpecies(cleffaSpecies),
-      isBoss: false,
-      abilityIndex: 1, // Magic Guard
-      shiny: true,
-      variant: 1,
-      nature: Nature.MODEST,
-      moveSet: [ Moves.MOONBLAST, Moves.MYSTICAL_FIRE, Moves.ICE_BEAM, Moves.THUNDERBOLT ],
-      ivs: [ 31, 31, 31, 31, 31, 31 ]
-    },
-    {
-      nickname: i18next.t(`${namespace}:cleffa_3_nickname`, { speciesName: getPokemonSpecies(cleffaSpecies).getName() }),
-      species: getPokemonSpecies(cleffaSpecies),
-      isBoss: false,
-      abilityIndex: 2, // Friend Guard / Unaware
-      shiny: true,
-      variant: 2,
-      nature: Nature.BOLD,
-      moveSet: [ Moves.TRI_ATTACK, Moves.STORED_POWER, Moves.TAKE_HEART, Moves.MOONLIGHT ],
-      ivs: [ 31, 31, 31, 31, 31, 31 ]
-    });
+    baseConfig.pokemonConfigs!.push(
+      {
+        nickname: i18next.t(`${namespace}:cleffa_2_nickname`, {
+          speciesName: getPokemonSpecies(cleffaSpecies).getName(),
+        }),
+        species: getPokemonSpecies(cleffaSpecies),
+        isBoss: false,
+        abilityIndex: 1, // Magic Guard
+        shiny: true,
+        variant: 1,
+        nature: Nature.MODEST,
+        moveSet: [Moves.MOONBLAST, Moves.MYSTICAL_FIRE, Moves.ICE_BEAM, Moves.THUNDERBOLT],
+        ivs: [31, 31, 31, 31, 31, 31],
+      },
+      {
+        nickname: i18next.t(`${namespace}:cleffa_3_nickname`, {
+          speciesName: getPokemonSpecies(cleffaSpecies).getName(),
+        }),
+        species: getPokemonSpecies(cleffaSpecies),
+        isBoss: false,
+        abilityIndex: 2, // Friend Guard / Unaware
+        shiny: true,
+        variant: 2,
+        nature: Nature.BOLD,
+        moveSet: [Moves.TRI_ATTACK, Moves.STORED_POWER, Moves.TAKE_HEART, Moves.MOONLIGHT],
+        ivs: [31, 31, 31, 31, 31, 31],
+      },
+    );
   } else {
     // Second member from pool 1
     const pool1Species = getSpeciesFromPool(POOL_1_POKEMON, waveIndex);
     // Third member from pool 2
     const pool2Species = getSpeciesFromPool(POOL_2_POKEMON, waveIndex);
 
-    baseConfig.pokemonConfigs!.push({
-      species: getPokemonSpecies(pool1Species),
-      isBoss: false,
-      ivs: [ 31, 31, 31, 31, 31, 31 ]
-    },
-    {
-      species: getPokemonSpecies(pool2Species),
-      isBoss: false,
-      ivs: [ 31, 31, 31, 31, 31, 31 ]
-    });
+    baseConfig.pokemonConfigs!.push(
+      {
+        species: getPokemonSpecies(pool1Species),
+        isBoss: false,
+        ivs: [31, 31, 31, 31, 31, 31],
+      },
+      {
+        species: getPokemonSpecies(pool2Species),
+        isBoss: false,
+        ivs: [31, 31, 31, 31, 31, 31],
+      },
+    );
   }
 
   return baseConfig;
@@ -476,7 +577,7 @@ function calculateEggRewardsForPokemon(pokemon: PlayerPokemon): [number, number]
   // 1 Common egg for every point leftover
   numCommons += totalPoints % 4;
 
-  return [ numCommons, numRares ];
+  return [numCommons, numRares];
 }
 
 function getEggOptions(commonEggs: number, rareEggs: number) {
@@ -489,7 +590,7 @@ function getEggOptions(commonEggs: number, rareEggs: number) {
         pulled: false,
         sourceType: EggSourceType.EVENT,
         eggDescriptor: eggDescription,
-        tier: EggTier.COMMON
+        tier: EggTier.COMMON,
       });
     }
   }
@@ -499,7 +600,7 @@ function getEggOptions(commonEggs: number, rareEggs: number) {
         pulled: false,
         sourceType: EggSourceType.EVENT,
         eggDescriptor: eggDescription,
-        tier: EggTier.RARE
+        tier: EggTier.RARE,
       });
     }
   }
@@ -513,11 +614,8 @@ function removePokemonFromPartyAndStoreHeldItems(encounter: MysteryEncounter, ch
   party[chosenIndex] = party[0];
   party[0] = chosenPokemon;
   encounter.misc.originalParty = globalScene.getPlayerParty().slice(1);
-  encounter.misc.originalPartyHeldItems = encounter.misc.originalParty
-    .map(p => p.getHeldItems());
-  globalScene["party"] = [
-    chosenPokemon
-  ];
+  encounter.misc.originalPartyHeldItems = encounter.misc.originalParty.map(p => p.getHeldItems());
+  globalScene["party"] = [chosenPokemon];
 }
 
 function restorePartyAndHeldItems() {
@@ -527,11 +625,11 @@ function restorePartyAndHeldItems() {
 
   // Restore held items
   const originalHeldItems = encounter.misc.originalPartyHeldItems;
-  originalHeldItems.forEach((pokemonHeldItemsList: PokemonHeldItemModifier[]) => {
-    pokemonHeldItemsList.forEach(heldItem => {
+  for (const pokemonHeldItemsList of originalHeldItems) {
+    for (const heldItem of pokemonHeldItemsList) {
       globalScene.addModifier(heldItem, true, false, false, true);
-    });
-  });
+    }
+  }
   globalScene.updateModifiers(true);
 }
 
@@ -547,7 +645,7 @@ function onGameOver() {
 
   // Restore original party, player loses all friendship with chosen mon (it remains fainted)
   restorePartyAndHeldItems();
-  const chosenPokemon  = encounter.misc.chosenPokemon;
+  const chosenPokemon = encounter.misc.chosenPokemon;
   chosenPokemon.friendship = 0;
 
   // Clear all rewards that would have been earned
@@ -576,7 +674,7 @@ function onGameOver() {
       scale: 0.5,
       onComplete: () => {
         pokemon.leaveField(true, true, true);
-      }
+      },
     });
   }
 
@@ -598,11 +696,10 @@ function onGameOver() {
       y: "+=16",
       alpha: 1,
       ease: "Sine.easeInOut",
-      duration: 750
+      duration: 750,
     });
   });
 
-
   handleMysteryEncounterBattleFailed(true);
 
   return false;
diff --git a/src/data/mystery-encounters/encounters/the-pokemon-salesman-encounter.ts b/src/data/mystery-encounters/encounters/the-pokemon-salesman-encounter.ts
index ff4dd9750c9..25798de3b4a 100644
--- a/src/data/mystery-encounters/encounters/the-pokemon-salesman-encounter.ts
+++ b/src/data/mystery-encounters/encounters/the-pokemon-salesman-encounter.ts
@@ -1,11 +1,19 @@
-import { leaveEncounterWithoutBattle, transitionMysteryEncounterIntroVisuals, updatePlayerMoney, } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
-import { isNullOrUndefined, randSeedInt } from "#app/utils";
+import {
+  leaveEncounterWithoutBattle,
+  transitionMysteryEncounterIntroVisuals,
+  updatePlayerMoney,
+} from "#app/data/mystery-encounters/utils/encounter-phase-utils";
+import { isNullOrUndefined, NumberHolder, randSeedInt, randSeedItem } from "#app/utils/common";
 import { MysteryEncounterType } from "#enums/mystery-encounter-type";
 import { globalScene } from "#app/global-scene";
 import type MysteryEncounter from "#app/data/mystery-encounters/mystery-encounter";
 import { MysteryEncounterBuilder } from "#app/data/mystery-encounters/mystery-encounter";
 import { MoneyRequirement } from "#app/data/mystery-encounters/mystery-encounter-requirements";
-import { catchPokemon, getRandomSpeciesByStarterCost, getSpriteKeysFromPokemon } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils";
+import {
+  catchPokemon,
+  getRandomSpeciesByStarterCost,
+  getSpriteKeysFromPokemon,
+} from "#app/data/mystery-encounters/utils/encounter-pokemon-utils";
 import type PokemonSpecies from "#app/data/pokemon-species";
 import { getPokemonSpecies } from "#app/data/pokemon-species";
 import { speciesStarterCosts } from "#app/data/balance/starters";
@@ -18,9 +26,10 @@ import { showEncounterDialogue } from "#app/data/mystery-encounters/utils/encoun
 import PokemonData from "#app/system/pokemon-data";
 import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
 import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
-import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/game-mode";
+import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants";
 import { Abilities } from "#enums/abilities";
-import { NON_LEGEND_PARADOX_POKEMON } from "#app/data/balance/special-species-groups";
+import { NON_LEGEND_PARADOX_POKEMON, NON_LEGEND_ULTRA_BEASTS } from "#app/data/balance/special-species-groups";
+import { timedEventManager } from "#app/global-event-manager";
 
 /** the i18n namespace for this encounter */
 const namespace = "mysteryEncounters/thePokemonSalesman";
@@ -30,148 +39,215 @@ const MAX_POKEMON_PRICE_MULTIPLIER = 4;
 /** Odds of shiny magikarp will be 1/value */
 const SHINY_MAGIKARP_WEIGHT = 100;
 
+/** Odds of event sale will be value/100 */
+const EVENT_THRESHOLD = 50;
+
 /**
  * Pokemon Salesman encounter.
  * @see {@link https://github.com/pagefaultgames/pokerogue/issues/3799 | GitHub Issue #3799}
  * @see For biome requirements check {@linkcode mysteryEncountersByBiome}
  */
-export const ThePokemonSalesmanEncounter: MysteryEncounter =
-  MysteryEncounterBuilder.withEncounterType(MysteryEncounterType.THE_POKEMON_SALESMAN)
-    .withEncounterTier(MysteryEncounterTier.ULTRA)
-    .withSceneWaveRangeRequirement(...CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES)
-    .withSceneRequirement(new MoneyRequirement(0, MAX_POKEMON_PRICE_MULTIPLIER)) // Some costs may not be as significant, this is the max you'd pay
-    .withAutoHideIntroVisuals(false)
-    .withIntroSpriteConfigs([
-      {
-        spriteKey: "pokemon_salesman",
-        fileRoot: "mystery-encounters",
-        hasShadow: true
-      }
-    ])
-    .withIntroDialogue([
-      {
-        text: `${namespace}:intro`,
-      },
-      {
-        text: `${namespace}:intro_dialogue`,
-        speaker: `${namespace}:speaker`,
-      },
-    ])
-    .setLocalizationKey(`${namespace}`)
-    .withTitle(`${namespace}:title`)
-    .withDescription(`${namespace}:description`)
-    .withQuery(`${namespace}:query`)
-    .withOnInit(() => {
-      const encounter = globalScene.currentBattle.mysteryEncounter!;
+export const ThePokemonSalesmanEncounter: MysteryEncounter = MysteryEncounterBuilder.withEncounterType(
+  MysteryEncounterType.THE_POKEMON_SALESMAN,
+)
+  .withEncounterTier(MysteryEncounterTier.ULTRA)
+  .withSceneWaveRangeRequirement(...CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES)
+  .withSceneRequirement(new MoneyRequirement(0, MAX_POKEMON_PRICE_MULTIPLIER)) // Some costs may not be as significant, this is the max you'd pay
+  .withAutoHideIntroVisuals(false)
+  .withIntroSpriteConfigs([
+    {
+      spriteKey: "pokemon_salesman",
+      fileRoot: "mystery-encounters",
+      hasShadow: true,
+    },
+  ])
+  .withIntroDialogue([
+    {
+      text: `${namespace}:intro`,
+    },
+    {
+      text: `${namespace}:intro_dialogue`,
+      speaker: `${namespace}:speaker`,
+    },
+  ])
+  .setLocalizationKey(`${namespace}`)
+  .withTitle(`${namespace}:title`)
+  .withDescription(`${namespace}:description`)
+  .withQuery(`${namespace}:query`)
+  .withOnInit(() => {
+    const encounter = globalScene.currentBattle.mysteryEncounter!;
 
-      let species = getSalesmanSpeciesOffer();
-      let tries = 0;
+    let species = getSalesmanSpeciesOffer();
+    let tries = 0;
 
-      // Reroll any species that don't have HAs
-      while ((isNullOrUndefined(species.abilityHidden) || species.abilityHidden === Abilities.NONE) && tries < 5) {
-        species = getSalesmanSpeciesOffer();
+    // Reroll any species that don't have HAs
+    while ((isNullOrUndefined(species.abilityHidden) || species.abilityHidden === Abilities.NONE) && tries < 5) {
+      species = getSalesmanSpeciesOffer();
+      tries++;
+    }
+
+    const r = randSeedInt(SHINY_MAGIKARP_WEIGHT);
+
+    let validEventEncounters = timedEventManager
+      .getEventEncounters()
+      .filter(
+        s =>
+          !getPokemonSpecies(s.species).legendary &&
+          !getPokemonSpecies(s.species).subLegendary &&
+          !getPokemonSpecies(s.species).mythical &&
+          !NON_LEGEND_PARADOX_POKEMON.includes(s.species) &&
+          !NON_LEGEND_ULTRA_BEASTS.includes(s.species),
+      );
+
+    let pokemon: PlayerPokemon;
+    /**
+     * Mon is determined as follows:
+     * If you roll the 1% for Shiny Magikarp, you get Magikarp with a random variant
+     * If an event with more than 1 valid event encounter species is active, you have 20% chance to get one of those
+     * If the rolled species has no HA, and there are valid event encounters, you will get one of those
+     * If the rolled species has no HA and there are no valid event encounters, you will get Shiny Magikarp
+     * Mons rolled from the event encounter pool get 3 extra shiny rolls
+     */
+    if (
+      r === 0 ||
+      ((isNullOrUndefined(species.abilityHidden) || species.abilityHidden === Abilities.NONE) &&
+        (validEventEncounters.length === 0))
+    ) {
+      // If you roll 1%, give shiny Magikarp with random variant
+      species = getPokemonSpecies(Species.MAGIKARP);
+      pokemon = new PlayerPokemon(species, 5, 2, undefined, undefined, true);
+    }
+    else if (
+      (validEventEncounters.length > 0 && (r <= EVENT_THRESHOLD ||
+      (isNullOrUndefined(species.abilityHidden) || species.abilityHidden === Abilities.NONE)))
+    ) {
+      tries = 0;
+      do {
+        // If you roll 20%, give event encounter with 3 extra shiny rolls and its HA, if it has one
+        const enc = randSeedItem(validEventEncounters);
+        species = getPokemonSpecies(enc.species);
+        pokemon = new PlayerPokemon(species, 5, species.abilityHidden === Abilities.NONE ? undefined : 2, enc.formIndex);
+        pokemon.trySetShinySeed();
+        pokemon.trySetShinySeed();
+        pokemon.trySetShinySeed();
+        if (pokemon.shiny || pokemon.abilityIndex === 2) {
+          break;
+        }
         tries++;
+      } while (tries < 6);
+      if (!pokemon.shiny && pokemon.abilityIndex !== 2) {
+        // If, after 6 tries, you STILL somehow don't have an HA or shiny mon, pick from only the event mons that have an HA.
+        if (validEventEncounters.some(s => !!getPokemonSpecies(s.species).abilityHidden)) {
+          validEventEncounters.filter(s => !!getPokemonSpecies(s.species).abilityHidden);
+          const enc = randSeedItem(validEventEncounters);
+          species = getPokemonSpecies(enc.species);
+          pokemon = new PlayerPokemon(species, 5, 2, enc.formIndex);
+          pokemon.trySetShinySeed();
+          pokemon.trySetShinySeed();
+          pokemon.trySetShinySeed();
+        }
+        else {
+          // If there's, and this would never happen, no eligible event encounters with a hidden ability, just do Magikarp
+          species = getPokemonSpecies(Species.MAGIKARP);
+          pokemon = new PlayerPokemon(species, 5, 2, undefined, undefined, true);
+        }
       }
+    }
+    else {
+      pokemon = new PlayerPokemon(species, 5, 2, species.formIndex);
+    }
+    pokemon.generateAndPopulateMoveset();
 
-      let pokemon: PlayerPokemon;
-      if (randSeedInt(SHINY_MAGIKARP_WEIGHT) === 0 || isNullOrUndefined(species.abilityHidden) || species.abilityHidden === Abilities.NONE) {
-        // If no HA mon found or you roll 1%, give shiny Magikarp with random variant
-        species = getPokemonSpecies(Species.MAGIKARP);
-        pokemon = new PlayerPokemon(species, 5, 2, species.formIndex, undefined, true);
-      } else {
-        pokemon = new PlayerPokemon(species, 5, 2, species.formIndex);
-      }
-      pokemon.generateAndPopulateMoveset();
+    const { spriteKey, fileRoot } = getSpriteKeysFromPokemon(pokemon);
+    encounter.spriteConfigs.push({
+      spriteKey: spriteKey,
+      fileRoot: fileRoot,
+      hasShadow: true,
+      repeat: true,
+      isPokemon: true,
+      isShiny: pokemon.shiny,
+      variant: pokemon.variant,
+    });
 
-      const { spriteKey, fileRoot } = getSpriteKeysFromPokemon(pokemon);
-      encounter.spriteConfigs.push({
-        spriteKey: spriteKey,
-        fileRoot: fileRoot,
-        hasShadow: true,
-        repeat: true,
-        isPokemon: true,
-        isShiny: pokemon.shiny,
-        variant: pokemon.variant
-      });
+    const starterTier = speciesStarterCosts[species.speciesId];
+    // Prices decrease by starter tier less than 5, but only reduces cost by half at max
+    let priceMultiplier = MAX_POKEMON_PRICE_MULTIPLIER * (Math.max(starterTier, 2.5) / 5);
+    if (pokemon.shiny) {
+      // Always max price for shiny (flip HA back to normal), and add special messaging
+      priceMultiplier = MAX_POKEMON_PRICE_MULTIPLIER;
+      pokemon.abilityIndex = 0;
+      encounter.dialogue.encounterOptionsDialogue!.description = `${namespace}:description_shiny`;
+      encounter.options[0].dialogue!.buttonTooltip = `${namespace}:option.1.tooltip_shiny`;
+    }
+    const price = globalScene.getWaveMoneyAmount(priceMultiplier);
+    encounter.setDialogueToken("purchasePokemon", pokemon.getNameToRender());
+    encounter.setDialogueToken("price", price.toString());
+    encounter.misc = {
+      price: price,
+      pokemon: pokemon,
+    };
 
-      const starterTier = speciesStarterCosts[species.speciesId];
-      // Prices decrease by starter tier less than 5, but only reduces cost by half at max
-      let priceMultiplier = MAX_POKEMON_PRICE_MULTIPLIER * (Math.max(starterTier, 2.5) / 5);
-      if (pokemon.shiny) {
-        // Always max price for shiny (flip HA back to normal), and add special messaging
-        priceMultiplier = MAX_POKEMON_PRICE_MULTIPLIER;
-        pokemon.abilityIndex = 0;
-        encounter.dialogue.encounterOptionsDialogue!.description = `${namespace}:description_shiny`;
-        encounter.options[0].dialogue!.buttonTooltip = `${namespace}:option.1.tooltip_shiny`;
-      }
-      const price = globalScene.getWaveMoneyAmount(priceMultiplier);
-      encounter.setDialogueToken("purchasePokemon", pokemon.getNameToRender());
-      encounter.setDialogueToken("price", price.toString());
-      encounter.misc = {
-        price: price,
-        pokemon: pokemon
-      };
+    pokemon.calculateStats();
 
-      pokemon.calculateStats();
-
-      return true;
-    })
-    .withOption(
-      MysteryEncounterOptionBuilder
-        .newOptionWithMode(MysteryEncounterOptionMode.DISABLED_OR_DEFAULT)
-        .withHasDexProgress(true)
-        .withSceneMoneyRequirement(0, MAX_POKEMON_PRICE_MULTIPLIER) // Wave scaling money multiplier of 2
-        .withDialogue({
-          buttonLabel: `${namespace}:option.1.label`,
-          buttonTooltip: `${namespace}:option.1.tooltip`,
-          selected: [
-            {
-              text: `${namespace}:option.1.selected_message`,
-            }
-          ],
-        })
-        .withOptionPhase(async () => {
-          const encounter = globalScene.currentBattle.mysteryEncounter!;
-          const price = encounter.misc.price;
-          const purchasedPokemon = encounter.misc.pokemon as PlayerPokemon;
-
-          // Update money
-          updatePlayerMoney(-price, true, false);
-
-          // Show dialogue
-          await showEncounterDialogue(`${namespace}:option.1.selected_dialogue`, `${namespace}:speaker`);
-          await transitionMysteryEncounterIntroVisuals();
-
-          // "Catch" purchased pokemon
-          const data = new PokemonData(purchasedPokemon);
-          data.player = false;
-          await catchPokemon(data.toPokemon() as EnemyPokemon, null, PokeballType.POKEBALL, true, true);
-
-          leaveEncounterWithoutBattle(true);
-        })
-        .build()
-    )
-    .withSimpleOption(
-      {
-        buttonLabel: `${namespace}:option.2.label`,
-        buttonTooltip: `${namespace}:option.2.tooltip`,
+    return true;
+  })
+  .withOption(
+    MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DISABLED_OR_DEFAULT)
+      .withHasDexProgress(true)
+      .withSceneMoneyRequirement(0, MAX_POKEMON_PRICE_MULTIPLIER) // Wave scaling money multiplier of 2
+      .withDialogue({
+        buttonLabel: `${namespace}:option.1.label`,
+        buttonTooltip: `${namespace}:option.1.tooltip`,
         selected: [
           {
-            text: `${namespace}:option.2.selected`,
+            text: `${namespace}:option.1.selected_message`,
           },
         ],
-      },
-      async () => {
-        // Leave encounter with no rewards or exp
+      })
+      .withOptionPhase(async () => {
+        const encounter = globalScene.currentBattle.mysteryEncounter!;
+        const price = encounter.misc.price;
+        const purchasedPokemon = encounter.misc.pokemon as PlayerPokemon;
+
+        // Update money
+        updatePlayerMoney(-price, true, false);
+
+        // Show dialogue
+        await showEncounterDialogue(`${namespace}:option.1.selected_dialogue`, `${namespace}:speaker`);
+        await transitionMysteryEncounterIntroVisuals();
+
+        // "Catch" purchased pokemon
+        const data = new PokemonData(purchasedPokemon);
+        data.player = false;
+        await catchPokemon(data.toPokemon() as EnemyPokemon, null, PokeballType.POKEBALL, true, true);
+
         leaveEncounterWithoutBattle(true);
-        return true;
-      }
-    )
-    .build();
+      })
+      .build(),
+  )
+  .withSimpleOption(
+    {
+      buttonLabel: `${namespace}:option.2.label`,
+      buttonTooltip: `${namespace}:option.2.tooltip`,
+      selected: [
+        {
+          text: `${namespace}:option.2.selected`,
+        },
+      ],
+    },
+    async () => {
+      // Leave encounter with no rewards or exp
+      leaveEncounterWithoutBattle(true);
+      return true;
+    },
+  )
+  .build();
 
 /**
  * @returns A random species that has at most 5 starter cost and is not Mythical, Paradox, etc.
  */
 export function getSalesmanSpeciesOffer(): PokemonSpecies {
-  return getPokemonSpecies(getRandomSpeciesByStarterCost([ 0, 5 ], NON_LEGEND_PARADOX_POKEMON, undefined, false, false, false));
+  return getPokemonSpecies(
+    getRandomSpeciesByStarterCost([0, 5], NON_LEGEND_PARADOX_POKEMON, undefined, false, false, false),
+  );
 }
diff --git a/src/data/mystery-encounters/encounters/the-strong-stuff-encounter.ts b/src/data/mystery-encounters/encounters/the-strong-stuff-encounter.ts
index 9e94e87938e..294f1a78b34 100644
--- a/src/data/mystery-encounters/encounters/the-strong-stuff-encounter.ts
+++ b/src/data/mystery-encounters/encounters/the-strong-stuff-encounter.ts
@@ -1,5 +1,12 @@
 import type { EnemyPartyConfig } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
-import { initBattleWithEnemyConfig, loadCustomMovesForEncounter, leaveEncounterWithoutBattle, setEncounterRewards, transitionMysteryEncounterIntroVisuals, generateModifierType } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
+import {
+  initBattleWithEnemyConfig,
+  loadCustomMovesForEncounter,
+  leaveEncounterWithoutBattle,
+  setEncounterRewards,
+  transitionMysteryEncounterIntroVisuals,
+  generateModifierType,
+} from "#app/data/mystery-encounters/utils/encounter-phase-utils";
 import type { PokemonHeldItemModifierType } from "#app/modifier/modifier-type";
 import { modifierTypes } from "#app/modifier/modifier-type";
 import { MysteryEncounterType } from "#enums/mystery-encounter-type";
@@ -21,7 +28,7 @@ import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
 import { CustomPokemonData } from "#app/data/custom-pokemon-data";
 import { Stat } from "#enums/stat";
 import { StatStageChangePhase } from "#app/phases/stat-stage-change-phase";
-import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/game-mode";
+import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants";
 
 /** the i18n namespace for the encounter */
 const namespace = "mysteryEncounters/theStrongStuff";
@@ -35,179 +42,188 @@ const BST_INCREASE_VALUE = 10;
  * @see {@link https://github.com/pagefaultgames/pokerogue/issues/3803 | GitHub Issue #3803}
  * @see For biome requirements check {@linkcode mysteryEncountersByBiome}
  */
-export const TheStrongStuffEncounter: MysteryEncounter =
-  MysteryEncounterBuilder.withEncounterType(MysteryEncounterType.THE_STRONG_STUFF)
-    .withEncounterTier(MysteryEncounterTier.COMMON)
-    .withSceneWaveRangeRequirement(...CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES)
-    .withScenePartySizeRequirement(3, 6) // Must have at least 3 pokemon in party
-    .withMaxAllowedEncounters(1)
-    .withHideWildIntroMessage(true)
-    .withAutoHideIntroVisuals(false)
-    .withFleeAllowed(false)
-    .withIntroSpriteConfigs([
-      {
-        spriteKey: "berry_juice",
-        fileRoot: "items",
-        hasShadow: true,
-        isItem: true,
-        scale: 1.25,
-        x: -15,
-        y: 3,
-        disableAnimation: true
-      },
-      {
-        spriteKey: Species.SHUCKLE.toString(),
-        fileRoot: "pokemon",
-        hasShadow: true,
-        repeat: true,
-        scale: 1.25,
-        x: 20,
-        y: 10,
-        yShadow: 7
-      },
-    ]) // Set in onInit()
-    .withIntroDialogue([
-      {
-        text: `${namespace}:intro`,
-      },
-    ])
-    .withOnInit(() => {
+export const TheStrongStuffEncounter: MysteryEncounter = MysteryEncounterBuilder.withEncounterType(
+  MysteryEncounterType.THE_STRONG_STUFF,
+)
+  .withEncounterTier(MysteryEncounterTier.COMMON)
+  .withSceneWaveRangeRequirement(...CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES)
+  .withScenePartySizeRequirement(3, 6) // Must have at least 3 pokemon in party
+  .withMaxAllowedEncounters(1)
+  .withHideWildIntroMessage(true)
+  .withAutoHideIntroVisuals(false)
+  .withFleeAllowed(false)
+  .withIntroSpriteConfigs([
+    {
+      spriteKey: "berry_juice",
+      fileRoot: "items",
+      hasShadow: true,
+      isItem: true,
+      scale: 1.25,
+      x: -15,
+      y: 3,
+      disableAnimation: true,
+    },
+    {
+      spriteKey: Species.SHUCKLE.toString(),
+      fileRoot: "pokemon",
+      hasShadow: true,
+      repeat: true,
+      scale: 1.25,
+      x: 20,
+      y: 10,
+      yShadow: 7,
+    },
+  ]) // Set in onInit()
+  .withIntroDialogue([
+    {
+      text: `${namespace}:intro`,
+    },
+  ])
+  .withOnInit(() => {
+    const encounter = globalScene.currentBattle.mysteryEncounter!;
+
+    // Calculate boss mon
+    const config: EnemyPartyConfig = {
+      levelAdditiveModifier: 1,
+      disableSwitch: true,
+      pokemonConfigs: [
+        {
+          species: getPokemonSpecies(Species.SHUCKLE),
+          isBoss: true,
+          bossSegments: 5,
+          shiny: false, // Shiny lock because shiny is rolled only if the battle option is picked
+          customPokemonData: new CustomPokemonData({ spriteScale: 1.25 }),
+          nature: Nature.HARDY,
+          moveSet: [Moves.INFESTATION, Moves.SALT_CURE, Moves.GASTRO_ACID, Moves.HEAL_ORDER],
+          modifierConfigs: [
+            {
+              modifier: generateModifierType(modifierTypes.BERRY, [BerryType.SITRUS]) as PokemonHeldItemModifierType,
+            },
+            {
+              modifier: generateModifierType(modifierTypes.BERRY, [BerryType.ENIGMA]) as PokemonHeldItemModifierType,
+            },
+            {
+              modifier: generateModifierType(modifierTypes.BERRY, [BerryType.APICOT]) as PokemonHeldItemModifierType,
+            },
+            {
+              modifier: generateModifierType(modifierTypes.BERRY, [BerryType.GANLON]) as PokemonHeldItemModifierType,
+            },
+            {
+              modifier: generateModifierType(modifierTypes.BERRY, [BerryType.LUM]) as PokemonHeldItemModifierType,
+              stackCount: 2,
+            },
+          ],
+          tags: [BattlerTagType.MYSTERY_ENCOUNTER_POST_SUMMON],
+          mysteryEncounterBattleEffects: (pokemon: Pokemon) => {
+            queueEncounterMessage(`${namespace}:option.2.stat_boost`);
+            globalScene.unshiftPhase(
+              new StatStageChangePhase(pokemon.getBattlerIndex(), true, [Stat.DEF, Stat.SPDEF], 1),
+            );
+          },
+        },
+      ],
+    };
+
+    encounter.enemyPartyConfigs = [config];
+
+    loadCustomMovesForEncounter([Moves.GASTRO_ACID, Moves.STEALTH_ROCK]);
+
+    encounter.setDialogueToken("shuckleName", getPokemonSpecies(Species.SHUCKLE).getName());
+
+    return true;
+  })
+  .setLocalizationKey(`${namespace}`)
+  .withTitle(`${namespace}:title`)
+  .withDescription(`${namespace}:description`)
+  .withQuery(`${namespace}:query`)
+  .withSimpleOption(
+    {
+      buttonLabel: `${namespace}:option.1.label`,
+      buttonTooltip: `${namespace}:option.1.tooltip`,
+      selected: [
+        {
+          text: `${namespace}:option.1.selected`,
+        },
+      ],
+    },
+    async () => {
       const encounter = globalScene.currentBattle.mysteryEncounter!;
+      // Do blackout and hide intro visuals during blackout
+      globalScene.time.delayedCall(750, () => {
+        transitionMysteryEncounterIntroVisuals(true, true, 50);
+      });
 
-      // Calculate boss mon
-      const config: EnemyPartyConfig = {
-        levelAdditiveModifier: 1,
-        disableSwitch: true,
-        pokemonConfigs: [
-          {
-            species: getPokemonSpecies(Species.SHUCKLE),
-            isBoss: true,
-            bossSegments: 5,
-            shiny: false, // Shiny lock because shiny is rolled only if the battle option is picked
-            customPokemonData: new CustomPokemonData({ spriteScale: 1.25 }),
-            nature: Nature.BOLD,
-            moveSet: [ Moves.INFESTATION, Moves.SALT_CURE, Moves.GASTRO_ACID, Moves.HEAL_ORDER ],
-            modifierConfigs: [
-              {
-                modifier: generateModifierType(modifierTypes.BERRY, [ BerryType.SITRUS ]) as PokemonHeldItemModifierType
-              },
-              {
-                modifier: generateModifierType(modifierTypes.BERRY, [ BerryType.ENIGMA ]) as PokemonHeldItemModifierType
-              },
-              {
-                modifier: generateModifierType(modifierTypes.BERRY, [ BerryType.APICOT ]) as PokemonHeldItemModifierType
-              },
-              {
-                modifier: generateModifierType(modifierTypes.BERRY, [ BerryType.GANLON ]) as PokemonHeldItemModifierType
-              },
-              {
-                modifier: generateModifierType(modifierTypes.BERRY, [ BerryType.LUM ]) as PokemonHeldItemModifierType,
-                stackCount: 2
-              }
-            ],
-            tags: [ BattlerTagType.MYSTERY_ENCOUNTER_POST_SUMMON ],
-            mysteryEncounterBattleEffects: (pokemon: Pokemon) => {
-              queueEncounterMessage(`${namespace}:option.2.stat_boost`);
-              globalScene.unshiftPhase(new StatStageChangePhase(pokemon.getBattlerIndex(), true, [ Stat.DEF, Stat.SPDEF ], 2));
-            }
-          }
-        ],
-      };
+      // -15 to all base stats of highest BST (halved for HP), +10 to all base stats of rest of party (halved for HP)
+      // Sort party by bst
+      const sortedParty = globalScene
+        .getPlayerParty()
+        .slice(0)
+        .sort((pokemon1, pokemon2) => {
+          const pokemon1Bst = pokemon1.getSpeciesForm().getBaseStatTotal();
+          const pokemon2Bst = pokemon2.getSpeciesForm().getBaseStatTotal();
+          return pokemon2Bst - pokemon1Bst;
+        });
 
-      encounter.enemyPartyConfigs = [ config ];
+      sortedParty.forEach((pokemon, index) => {
+        if (index < 2) {
+          // -15 to the two highest BST mons
+          modifyPlayerPokemonBST(pokemon, -HIGH_BST_REDUCTION_VALUE);
+          encounter.setDialogueToken("highBstPokemon" + (index + 1), pokemon.getNameToRender());
+        } else {
+          // +10 for the rest
+          modifyPlayerPokemonBST(pokemon, BST_INCREASE_VALUE);
+        }
+      });
 
-      loadCustomMovesForEncounter([ Moves.GASTRO_ACID, Moves.STEALTH_ROCK ]);
-
-      encounter.setDialogueToken("shuckleName", getPokemonSpecies(Species.SHUCKLE).getName());
+      encounter.setDialogueToken("reductionValue", HIGH_BST_REDUCTION_VALUE.toString());
+      encounter.setDialogueToken("increaseValue", BST_INCREASE_VALUE.toString());
+      await showEncounterText(`${namespace}:option.1.selected_2`, null, undefined, true);
 
+      encounter.dialogue.outro = [
+        {
+          text: `${namespace}:outro`,
+        },
+      ];
+      setEncounterRewards({ fillRemaining: true });
+      leaveEncounterWithoutBattle(true);
       return true;
-    })
-    .setLocalizationKey(`${namespace}`)
-    .withTitle(`${namespace}:title`)
-    .withDescription(`${namespace}:description`)
-    .withQuery(`${namespace}:query`)
-    .withSimpleOption(
-      {
-        buttonLabel: `${namespace}:option.1.label`,
-        buttonTooltip: `${namespace}:option.1.tooltip`,
-        selected: [
-          {
-            text: `${namespace}:option.1.selected`
-          }
-        ]
-      },
-      async () => {
-        const encounter = globalScene.currentBattle.mysteryEncounter!;
-        // Do blackout and hide intro visuals during blackout
-        globalScene.time.delayedCall(750, () => {
-          transitionMysteryEncounterIntroVisuals(true, true, 50);
-        });
+    },
+  )
+  .withSimpleOption(
+    {
+      buttonLabel: `${namespace}:option.2.label`,
+      buttonTooltip: `${namespace}:option.2.tooltip`,
+      selected: [
+        {
+          text: `${namespace}:option.2.selected`,
+        },
+      ],
+    },
+    async () => {
+      // Pick battle
+      const encounter = globalScene.currentBattle.mysteryEncounter!;
+      setEncounterRewards({
+        guaranteedModifierTypeFuncs: [modifierTypes.SOUL_DEW],
+        fillRemaining: true,
+      });
+      encounter.startOfBattleEffects.push(
+        {
+          sourceBattlerIndex: BattlerIndex.ENEMY,
+          targets: [BattlerIndex.PLAYER],
+          move: new PokemonMove(Moves.GASTRO_ACID),
+          ignorePp: true,
+        },
+        {
+          sourceBattlerIndex: BattlerIndex.ENEMY,
+          targets: [BattlerIndex.PLAYER],
+          move: new PokemonMove(Moves.STEALTH_ROCK),
+          ignorePp: true,
+        },
+      );
 
-        // -15 to all base stats of highest BST (halved for HP), +10 to all base stats of rest of party (halved for HP)
-        // Sort party by bst
-        const sortedParty = globalScene.getPlayerParty().slice(0)
-          .sort((pokemon1, pokemon2) => {
-            const pokemon1Bst = pokemon1.getSpeciesForm().getBaseStatTotal();
-            const pokemon2Bst = pokemon2.getSpeciesForm().getBaseStatTotal();
-            return pokemon2Bst - pokemon1Bst;
-          });
-
-        sortedParty.forEach((pokemon, index) => {
-          if (index < 2) {
-            // -15 to the two highest BST mons
-            modifyPlayerPokemonBST(pokemon, -HIGH_BST_REDUCTION_VALUE);
-            encounter.setDialogueToken("highBstPokemon" + (index + 1), pokemon.getNameToRender());
-          } else {
-            // +10 for the rest
-            modifyPlayerPokemonBST(pokemon, BST_INCREASE_VALUE);
-          }
-        });
-
-        encounter.setDialogueToken("reductionValue", HIGH_BST_REDUCTION_VALUE.toString());
-        encounter.setDialogueToken("increaseValue", BST_INCREASE_VALUE.toString());
-        await showEncounterText(`${namespace}:option.1.selected_2`, null, undefined, true);
-
-        encounter.dialogue.outro = [
-          {
-            text: `${namespace}:outro`,
-          }
-        ];
-        setEncounterRewards({ fillRemaining: true });
-        leaveEncounterWithoutBattle(true);
-        return true;
-      }
-    )
-    .withSimpleOption(
-      {
-        buttonLabel: `${namespace}:option.2.label`,
-        buttonTooltip: `${namespace}:option.2.tooltip`,
-        selected: [
-          {
-            text: `${namespace}:option.2.selected`,
-          },
-        ],
-      },
-      async () => {
-        // Pick battle
-        const encounter = globalScene.currentBattle.mysteryEncounter!;
-        setEncounterRewards({ guaranteedModifierTypeFuncs: [ modifierTypes.SOUL_DEW ], fillRemaining: true });
-        encounter.startOfBattleEffects.push(
-          {
-            sourceBattlerIndex: BattlerIndex.ENEMY,
-            targets: [ BattlerIndex.PLAYER ],
-            move: new PokemonMove(Moves.GASTRO_ACID),
-            ignorePp: true
-          },
-          {
-            sourceBattlerIndex: BattlerIndex.ENEMY,
-            targets: [ BattlerIndex.PLAYER ],
-            move: new PokemonMove(Moves.STEALTH_ROCK),
-            ignorePp: true
-          });
-
-        encounter.dialogue.outro = [];
-        await transitionMysteryEncounterIntroVisuals(true, true, 500);
-        await initBattleWithEnemyConfig(encounter.enemyPartyConfigs[0]);
-      }
-    )
-    .build();
+      encounter.dialogue.outro = [];
+      await transitionMysteryEncounterIntroVisuals(true, true, 500);
+      await initBattleWithEnemyConfig(encounter.enemyPartyConfigs[0]);
+    },
+  )
+  .build();
diff --git a/src/data/mystery-encounters/encounters/the-winstrate-challenge-encounter.ts b/src/data/mystery-encounters/encounters/the-winstrate-challenge-encounter.ts
index ca6b384cfbb..3cbe42591d8 100644
--- a/src/data/mystery-encounters/encounters/the-winstrate-challenge-encounter.ts
+++ b/src/data/mystery-encounters/encounters/the-winstrate-challenge-encounter.ts
@@ -1,5 +1,12 @@
 import type { EnemyPartyConfig } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
-import { generateModifierType, generateModifierTypeOption, initBattleWithEnemyConfig, leaveEncounterWithoutBattle, setEncounterRewards, transitionMysteryEncounterIntroVisuals, } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
+import {
+  generateModifierType,
+  generateModifierTypeOption,
+  initBattleWithEnemyConfig,
+  leaveEncounterWithoutBattle,
+  setEncounterRewards,
+  transitionMysteryEncounterIntroVisuals,
+} from "#app/data/mystery-encounters/utils/encounter-phase-utils";
 import type { PokemonHeldItemModifierType } from "#app/modifier/modifier-type";
 import { modifierTypes } from "#app/modifier/modifier-type";
 import { MysteryEncounterType } from "#enums/mystery-encounter-type";
@@ -13,11 +20,11 @@ import { Abilities } from "#enums/abilities";
 import { getPokemonSpecies } from "#app/data/pokemon-species";
 import { Moves } from "#enums/moves";
 import { Nature } from "#enums/nature";
-import { Type } from "#enums/type";
+import { PokemonType } from "#enums/pokemon-type";
 import { BerryType } from "#enums/berry-type";
 import { Stat } from "#enums/stat";
 import { SpeciesFormChangeAbilityTrigger } from "#app/data/pokemon-forms";
-import { applyPostBattleInitAbAttrs, PostBattleInitAbAttr } from "#app/data/ability";
+import { applyPostBattleInitAbAttrs, PostBattleInitAbAttr } from "#app/data/abilities/ability";
 import { showEncounterDialogue, showEncounterText } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils";
 import { MysteryEncounterMode } from "#enums/mystery-encounter-mode";
 import { PartyHealPhase } from "#app/phases/party-heal-phase";
@@ -25,7 +32,7 @@ import { ShowTrainerPhase } from "#app/phases/show-trainer-phase";
 import { ReturnPhase } from "#app/phases/return-phase";
 import i18next from "i18next";
 import { ModifierTier } from "#app/modifier/modifier-tier";
-import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/game-mode";
+import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants";
 import { BattlerTagType } from "#enums/battler-tag-type";
 
 /** the i18n namespace for the encounter */
@@ -36,111 +43,115 @@ const namespace = "mysteryEncounters/theWinstrateChallenge";
  * @see {@link https://github.com/pagefaultgames/pokerogue/issues/3821 | GitHub Issue #3821}
  * @see For biome requirements check {@linkcode mysteryEncountersByBiome}
  */
-export const TheWinstrateChallengeEncounter: MysteryEncounter =
-  MysteryEncounterBuilder.withEncounterType(MysteryEncounterType.THE_WINSTRATE_CHALLENGE)
-    .withEncounterTier(MysteryEncounterTier.ROGUE)
-    .withSceneWaveRangeRequirement(100, CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES[1])
-    .withIntroSpriteConfigs([
-      {
-        spriteKey: "vito",
-        fileRoot: "trainer",
-        hasShadow: false,
-        x: 16,
-        y: -4
-      },
-      {
-        spriteKey: "vivi",
-        fileRoot: "trainer",
-        hasShadow: false,
-        x: -14,
-        y: -4
-      },
-      {
-        spriteKey: "victor",
-        fileRoot: "trainer",
-        hasShadow: true,
-        x: -32
-      },
-      {
-        spriteKey: "victoria",
-        fileRoot: "trainer",
-        hasShadow: true,
-        x: 40,
-      },
-      {
-        spriteKey: "vicky",
-        fileRoot: "trainer",
-        hasShadow: true,
-        x: 3,
-        y: 5,
-        yShadow: 5
-      },
-    ])
-    .withIntroDialogue([
-      {
-        text: `${namespace}:intro`,
-      },
-      {
-        speaker: `${namespace}:speaker`,
-        text: `${namespace}:intro_dialogue`,
-      },
-    ])
-    .withAutoHideIntroVisuals(false)
-    .withOnInit(() => {
-      const encounter = globalScene.currentBattle.mysteryEncounter!;
+export const TheWinstrateChallengeEncounter: MysteryEncounter = MysteryEncounterBuilder.withEncounterType(
+  MysteryEncounterType.THE_WINSTRATE_CHALLENGE,
+)
+  .withEncounterTier(MysteryEncounterTier.ROGUE)
+  .withSceneWaveRangeRequirement(100, CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES[1])
+  .withIntroSpriteConfigs([
+    {
+      spriteKey: "vito",
+      fileRoot: "trainer",
+      hasShadow: false,
+      x: 16,
+      y: -4,
+    },
+    {
+      spriteKey: "vivi",
+      fileRoot: "trainer",
+      hasShadow: false,
+      x: -14,
+      y: -4,
+    },
+    {
+      spriteKey: "victor",
+      fileRoot: "trainer",
+      hasShadow: true,
+      x: -32,
+    },
+    {
+      spriteKey: "victoria",
+      fileRoot: "trainer",
+      hasShadow: true,
+      x: 40,
+    },
+    {
+      spriteKey: "vicky",
+      fileRoot: "trainer",
+      hasShadow: true,
+      x: 3,
+      y: 5,
+      yShadow: 5,
+    },
+  ])
+  .withIntroDialogue([
+    {
+      text: `${namespace}:intro`,
+    },
+    {
+      speaker: `${namespace}:speaker`,
+      text: `${namespace}:intro_dialogue`,
+    },
+  ])
+  .withAutoHideIntroVisuals(false)
+  .withOnInit(() => {
+    const encounter = globalScene.currentBattle.mysteryEncounter!;
 
-      // Loaded back to front for pop() operations
-      encounter.enemyPartyConfigs.push(getVitoTrainerConfig());
-      encounter.enemyPartyConfigs.push(getVickyTrainerConfig());
-      encounter.enemyPartyConfigs.push(getViviTrainerConfig());
-      encounter.enemyPartyConfigs.push(getVictoriaTrainerConfig());
-      encounter.enemyPartyConfigs.push(getVictorTrainerConfig());
+    // Loaded back to front for pop() operations
+    encounter.enemyPartyConfigs.push(getVitoTrainerConfig());
+    encounter.enemyPartyConfigs.push(getVickyTrainerConfig());
+    encounter.enemyPartyConfigs.push(getViviTrainerConfig());
+    encounter.enemyPartyConfigs.push(getVictoriaTrainerConfig());
+    encounter.enemyPartyConfigs.push(getVictorTrainerConfig());
 
-      return true;
-    })
-    .setLocalizationKey(`${namespace}`)
-    .withTitle(`${namespace}:title`)
-    .withDescription(`${namespace}:description`)
-    .withQuery(`${namespace}:query`)
-    .withSimpleOption(
-      {
-        buttonLabel: `${namespace}:option.1.label`,
-        buttonTooltip: `${namespace}:option.1.tooltip`,
-        selected: [
-          {
-            speaker: `${namespace}:speaker`,
-            text: `${namespace}:option.1.selected`,
-          },
-        ],
-      },
-      async () => {
-        // Spawn 5 trainer battles back to back with Macho Brace in rewards
-        globalScene.currentBattle.mysteryEncounter!.doContinueEncounter = async () => {
-          await endTrainerBattleAndShowDialogue();
-        };
-        await transitionMysteryEncounterIntroVisuals(true, false);
-        await spawnNextTrainerOrEndEncounter();
-      }
-    )
-    .withSimpleOption(
-      {
-        buttonLabel: `${namespace}:option.2.label`,
-        buttonTooltip: `${namespace}:option.2.tooltip`,
-        selected: [
-          {
-            speaker: `${namespace}:speaker`,
-            text: `${namespace}:option.2.selected`,
-          },
-        ],
-      },
-      async () => {
-        // Refuse the challenge, they full heal the party and give the player a Rarer Candy
-        globalScene.unshiftPhase(new PartyHealPhase(true));
-        setEncounterRewards({ guaranteedModifierTypeFuncs: [ modifierTypes.RARER_CANDY ], fillRemaining: false });
-        leaveEncounterWithoutBattle();
-      }
-    )
-    .build();
+    return true;
+  })
+  .setLocalizationKey(`${namespace}`)
+  .withTitle(`${namespace}:title`)
+  .withDescription(`${namespace}:description`)
+  .withQuery(`${namespace}:query`)
+  .withSimpleOption(
+    {
+      buttonLabel: `${namespace}:option.1.label`,
+      buttonTooltip: `${namespace}:option.1.tooltip`,
+      selected: [
+        {
+          speaker: `${namespace}:speaker`,
+          text: `${namespace}:option.1.selected`,
+        },
+      ],
+    },
+    async () => {
+      // Spawn 5 trainer battles back to back with Macho Brace in rewards
+      globalScene.currentBattle.mysteryEncounter!.doContinueEncounter = async () => {
+        await endTrainerBattleAndShowDialogue();
+      };
+      await transitionMysteryEncounterIntroVisuals(true, false);
+      await spawnNextTrainerOrEndEncounter();
+    },
+  )
+  .withSimpleOption(
+    {
+      buttonLabel: `${namespace}:option.2.label`,
+      buttonTooltip: `${namespace}:option.2.tooltip`,
+      selected: [
+        {
+          speaker: `${namespace}:speaker`,
+          text: `${namespace}:option.2.selected`,
+        },
+      ],
+    },
+    async () => {
+      // Refuse the challenge, they full heal the party and give the player a Rarer Candy
+      globalScene.unshiftPhase(new PartyHealPhase(true));
+      setEncounterRewards({
+        guaranteedModifierTypeFuncs: [modifierTypes.RARER_CANDY],
+        fillRemaining: false,
+      });
+      leaveEncounterWithoutBattle();
+    },
+  )
+  .build();
 
 async function spawnNextTrainerOrEndEncounter() {
   const encounter = globalScene.currentBattle.mysteryEncounter!;
@@ -151,7 +162,7 @@ async function spawnNextTrainerOrEndEncounter() {
 
     // Give 10x Voucher
     const newModifier = modifierTypes.VOUCHER_PREMIUM().newModifier();
-    await globalScene.addModifier(newModifier);
+    globalScene.addModifier(newModifier);
     globalScene.playSound("item_fanfare");
     await showEncounterText(i18next.t("battle:rewardGain", { modifierName: newModifier?.type.name }));
 
@@ -159,7 +170,10 @@ async function spawnNextTrainerOrEndEncounter() {
     globalScene.ui.clearText(); // Clears "Winstrate" title from screen as rewards get animated in
     const machoBrace = generateModifierTypeOption(modifierTypes.MYSTERY_ENCOUNTER_MACHO_BRACE)!;
     machoBrace.type.tier = ModifierTier.MASTER;
-    setEncounterRewards({ guaranteedModifierTypeOptions: [ machoBrace ], fillRemaining: false });
+    setEncounterRewards({
+      guaranteedModifierTypeOptions: [machoBrace],
+      fillRemaining: false,
+    });
     encounter.doContinueEncounter = undefined;
     leaveEncounterWithoutBattle(false, MysteryEncounterMode.NO_BATTLE);
   } else {
@@ -168,6 +182,7 @@ async function spawnNextTrainerOrEndEncounter() {
 }
 
 function endTrainerBattleAndShowDialogue(): Promise<void> {
+  // biome-ignore lint/suspicious/noAsyncPromiseExecutor: TODO: Consider refactoring to avoid async promise executor
   return new Promise(async resolve => {
     if (globalScene.currentBattle.mysteryEncounter!.enemyPartyConfigs.length === 0) {
       // Battle is over
@@ -182,7 +197,7 @@ function endTrainerBattleAndShowDialogue(): Promise<void> {
           duration: 750,
           onComplete: () => {
             globalScene.field.remove(trainer, true);
-          }
+          },
         });
       }
 
@@ -191,17 +206,24 @@ function endTrainerBattleAndShowDialogue(): Promise<void> {
     } else {
       globalScene.arena.resetArenaEffects();
       const playerField = globalScene.getPlayerField();
-      playerField.forEach((pokemon) => pokemon.lapseTag(BattlerTagType.COMMANDED));
+      for (const pokemon of playerField) {
+        pokemon.lapseTag(BattlerTagType.COMMANDED);
+      }
       playerField.forEach((_, p) => globalScene.unshiftPhase(new ReturnPhase(p)));
 
       for (const pokemon of globalScene.getPlayerParty()) {
         // Only trigger form change when Eiscue is in Noice form
         // Hardcoded Eiscue for now in case it is fused with another pokemon
-        if (pokemon.species.speciesId === Species.EISCUE && pokemon.hasAbility(Abilities.ICE_FACE) && pokemon.formIndex === 1) {
+        if (
+          pokemon.species.speciesId === Species.EISCUE &&
+          pokemon.hasAbility(Abilities.ICE_FACE) &&
+          pokemon.formIndex === 1
+        ) {
           globalScene.triggerPokemonFormChange(pokemon, SpeciesFormChangeAbilityTrigger);
         }
 
-        pokemon.resetBattleData();
+        // Each trainer battle is supposed to be a new fight, so reset all per-battle activation effects
+        pokemon.resetBattleAndWaveData();
         applyPostBattleInitAbAttrs(PostBattleInitAbAttr, pokemon);
       }
 
@@ -222,7 +244,7 @@ function endTrainerBattleAndShowDialogue(): Promise<void> {
           onComplete: () => {
             globalScene.field.remove(trainer, true);
             resolve();
-          }
+          },
         });
       }
     }
@@ -238,38 +260,38 @@ function getVictorTrainerConfig(): EnemyPartyConfig {
         isBoss: false,
         abilityIndex: 0, // Guts
         nature: Nature.ADAMANT,
-        moveSet: [ Moves.FACADE, Moves.BRAVE_BIRD, Moves.PROTECT, Moves.QUICK_ATTACK ],
+        moveSet: [Moves.FACADE, Moves.BRAVE_BIRD, Moves.PROTECT, Moves.QUICK_ATTACK],
         modifierConfigs: [
           {
             modifier: generateModifierType(modifierTypes.FLAME_ORB) as PokemonHeldItemModifierType,
-            isTransferable: false
+            isTransferable: false,
           },
           {
             modifier: generateModifierType(modifierTypes.FOCUS_BAND) as PokemonHeldItemModifierType,
             stackCount: 2,
-            isTransferable: false
+            isTransferable: false,
           },
-        ]
+        ],
       },
       {
         species: getPokemonSpecies(Species.OBSTAGOON),
         isBoss: false,
         abilityIndex: 1, // Guts
         nature: Nature.ADAMANT,
-        moveSet: [ Moves.FACADE, Moves.OBSTRUCT, Moves.NIGHT_SLASH, Moves.FIRE_PUNCH ],
+        moveSet: [Moves.FACADE, Moves.OBSTRUCT, Moves.NIGHT_SLASH, Moves.FIRE_PUNCH],
         modifierConfigs: [
           {
             modifier: generateModifierType(modifierTypes.FLAME_ORB) as PokemonHeldItemModifierType,
-            isTransferable: false
+            isTransferable: false,
           },
           {
             modifier: generateModifierType(modifierTypes.LEFTOVERS) as PokemonHeldItemModifierType,
             stackCount: 2,
-            isTransferable: false
-          }
-        ]
-      }
-    ]
+            isTransferable: false,
+          },
+        ],
+      },
+    ],
   };
 }
 
@@ -282,39 +304,43 @@ function getVictoriaTrainerConfig(): EnemyPartyConfig {
         isBoss: false,
         abilityIndex: 0, // Natural Cure
         nature: Nature.CALM,
-        moveSet: [ Moves.SYNTHESIS, Moves.SLUDGE_BOMB, Moves.GIGA_DRAIN, Moves.SLEEP_POWDER ],
+        moveSet: [Moves.SYNTHESIS, Moves.SLUDGE_BOMB, Moves.GIGA_DRAIN, Moves.SLEEP_POWDER],
         modifierConfigs: [
           {
             modifier: generateModifierType(modifierTypes.SOUL_DEW) as PokemonHeldItemModifierType,
-            isTransferable: false
+            isTransferable: false,
           },
           {
             modifier: generateModifierType(modifierTypes.QUICK_CLAW) as PokemonHeldItemModifierType,
             stackCount: 2,
-            isTransferable: false
-          }
-        ]
+            isTransferable: false,
+          },
+        ],
       },
       {
         species: getPokemonSpecies(Species.GARDEVOIR),
         isBoss: false,
         formIndex: 1,
         nature: Nature.TIMID,
-        moveSet: [ Moves.PSYSHOCK, Moves.MOONBLAST, Moves.SHADOW_BALL, Moves.WILL_O_WISP ],
+        moveSet: [Moves.PSYSHOCK, Moves.MOONBLAST, Moves.SHADOW_BALL, Moves.WILL_O_WISP],
         modifierConfigs: [
           {
-            modifier: generateModifierType(modifierTypes.ATTACK_TYPE_BOOSTER, [ Type.PSYCHIC ]) as PokemonHeldItemModifierType,
+            modifier: generateModifierType(modifierTypes.ATTACK_TYPE_BOOSTER, [
+              PokemonType.PSYCHIC,
+            ]) as PokemonHeldItemModifierType,
             stackCount: 1,
-            isTransferable: false
+            isTransferable: false,
           },
           {
-            modifier: generateModifierType(modifierTypes.ATTACK_TYPE_BOOSTER, [ Type.FAIRY ]) as PokemonHeldItemModifierType,
+            modifier: generateModifierType(modifierTypes.ATTACK_TYPE_BOOSTER, [
+              PokemonType.FAIRY,
+            ]) as PokemonHeldItemModifierType,
             stackCount: 1,
-            isTransferable: false
-          }
-        ]
-      }
-    ]
+            isTransferable: false,
+          },
+        ],
+      },
+    ],
   };
 }
 
@@ -327,53 +353,53 @@ function getViviTrainerConfig(): EnemyPartyConfig {
         isBoss: false,
         abilityIndex: 3, // Lightning Rod
         nature: Nature.ADAMANT,
-        moveSet: [ Moves.WATERFALL, Moves.MEGAHORN, Moves.KNOCK_OFF, Moves.REST ],
+        moveSet: [Moves.WATERFALL, Moves.MEGAHORN, Moves.KNOCK_OFF, Moves.REST],
         modifierConfigs: [
           {
-            modifier: generateModifierType(modifierTypes.BERRY, [ BerryType.LUM ]) as PokemonHeldItemModifierType,
+            modifier: generateModifierType(modifierTypes.BERRY, [BerryType.LUM]) as PokemonHeldItemModifierType,
             stackCount: 2,
-            isTransferable: false
+            isTransferable: false,
           },
           {
-            modifier: generateModifierType(modifierTypes.BASE_STAT_BOOSTER, [ Stat.HP ]) as PokemonHeldItemModifierType,
+            modifier: generateModifierType(modifierTypes.BASE_STAT_BOOSTER, [Stat.HP]) as PokemonHeldItemModifierType,
             stackCount: 4,
-            isTransferable: false
-          }
-        ]
+            isTransferable: false,
+          },
+        ],
       },
       {
         species: getPokemonSpecies(Species.BRELOOM),
         isBoss: false,
         abilityIndex: 1, // Poison Heal
         nature: Nature.JOLLY,
-        moveSet: [ Moves.SPORE, Moves.SWORDS_DANCE, Moves.SEED_BOMB, Moves.DRAIN_PUNCH ],
+        moveSet: [Moves.SPORE, Moves.SWORDS_DANCE, Moves.SEED_BOMB, Moves.DRAIN_PUNCH],
         modifierConfigs: [
           {
-            modifier: generateModifierType(modifierTypes.BASE_STAT_BOOSTER, [ Stat.HP ]) as PokemonHeldItemModifierType,
+            modifier: generateModifierType(modifierTypes.BASE_STAT_BOOSTER, [Stat.HP]) as PokemonHeldItemModifierType,
             stackCount: 4,
-            isTransferable: false
+            isTransferable: false,
           },
           {
             modifier: generateModifierType(modifierTypes.TOXIC_ORB) as PokemonHeldItemModifierType,
-            isTransferable: false
-          }
-        ]
+            isTransferable: false,
+          },
+        ],
       },
       {
         species: getPokemonSpecies(Species.CAMERUPT),
         isBoss: false,
         formIndex: 1,
         nature: Nature.CALM,
-        moveSet: [ Moves.EARTH_POWER, Moves.FIRE_BLAST, Moves.YAWN, Moves.PROTECT ],
+        moveSet: [Moves.EARTH_POWER, Moves.FIRE_BLAST, Moves.YAWN, Moves.PROTECT],
         modifierConfigs: [
           {
             modifier: generateModifierType(modifierTypes.QUICK_CLAW) as PokemonHeldItemModifierType,
             stackCount: 3,
-            isTransferable: false
+            isTransferable: false,
           },
-        ]
-      }
-    ]
+        ],
+      },
+    ],
   };
 }
 
@@ -386,15 +412,15 @@ function getVickyTrainerConfig(): EnemyPartyConfig {
         isBoss: false,
         formIndex: 1,
         nature: Nature.IMPISH,
-        moveSet: [ Moves.AXE_KICK, Moves.ICE_PUNCH, Moves.ZEN_HEADBUTT, Moves.BULLET_PUNCH ],
+        moveSet: [Moves.AXE_KICK, Moves.ICE_PUNCH, Moves.ZEN_HEADBUTT, Moves.BULLET_PUNCH],
         modifierConfigs: [
           {
             modifier: generateModifierType(modifierTypes.SHELL_BELL) as PokemonHeldItemModifierType,
-            isTransferable: false
-          }
-        ]
-      }
-    ]
+            isTransferable: false,
+          },
+        ],
+      },
+    ],
   };
 }
 
@@ -407,110 +433,110 @@ function getVitoTrainerConfig(): EnemyPartyConfig {
         isBoss: false,
         abilityIndex: 0, // Soundproof
         nature: Nature.MODEST,
-        moveSet: [ Moves.THUNDERBOLT, Moves.GIGA_DRAIN, Moves.FOUL_PLAY, Moves.THUNDER_WAVE ],
+        moveSet: [Moves.THUNDERBOLT, Moves.GIGA_DRAIN, Moves.FOUL_PLAY, Moves.THUNDER_WAVE],
         modifierConfigs: [
           {
-            modifier: generateModifierType(modifierTypes.BASE_STAT_BOOSTER, [ Stat.SPD ]) as PokemonHeldItemModifierType,
+            modifier: generateModifierType(modifierTypes.BASE_STAT_BOOSTER, [Stat.SPD]) as PokemonHeldItemModifierType,
             stackCount: 2,
-            isTransferable: false
-          }
-        ]
+            isTransferable: false,
+          },
+        ],
       },
       {
         species: getPokemonSpecies(Species.SWALOT),
         isBoss: false,
         abilityIndex: 2, // Gluttony
         nature: Nature.QUIET,
-        moveSet: [ Moves.SLUDGE_BOMB, Moves.GIGA_DRAIN, Moves.ICE_BEAM, Moves.EARTHQUAKE ],
+        moveSet: [Moves.SLUDGE_BOMB, Moves.GIGA_DRAIN, Moves.ICE_BEAM, Moves.EARTHQUAKE],
         modifierConfigs: [
           {
-            modifier: generateModifierType(modifierTypes.BERRY, [ BerryType.SITRUS ]) as PokemonHeldItemModifierType,
+            modifier: generateModifierType(modifierTypes.BERRY, [BerryType.SITRUS]) as PokemonHeldItemModifierType,
             stackCount: 2,
           },
           {
-            modifier: generateModifierType(modifierTypes.BERRY, [ BerryType.APICOT ]) as PokemonHeldItemModifierType,
+            modifier: generateModifierType(modifierTypes.BERRY, [BerryType.APICOT]) as PokemonHeldItemModifierType,
             stackCount: 2,
           },
           {
-            modifier: generateModifierType(modifierTypes.BERRY, [ BerryType.GANLON ]) as PokemonHeldItemModifierType,
+            modifier: generateModifierType(modifierTypes.BERRY, [BerryType.GANLON]) as PokemonHeldItemModifierType,
             stackCount: 2,
           },
           {
-            modifier: generateModifierType(modifierTypes.BERRY, [ BerryType.STARF ]) as PokemonHeldItemModifierType,
+            modifier: generateModifierType(modifierTypes.BERRY, [BerryType.STARF]) as PokemonHeldItemModifierType,
             stackCount: 2,
           },
           {
-            modifier: generateModifierType(modifierTypes.BERRY, [ BerryType.SALAC ]) as PokemonHeldItemModifierType,
+            modifier: generateModifierType(modifierTypes.BERRY, [BerryType.SALAC]) as PokemonHeldItemModifierType,
             stackCount: 2,
           },
           {
-            modifier: generateModifierType(modifierTypes.BERRY, [ BerryType.LUM ]) as PokemonHeldItemModifierType,
+            modifier: generateModifierType(modifierTypes.BERRY, [BerryType.LUM]) as PokemonHeldItemModifierType,
             stackCount: 2,
           },
           {
-            modifier: generateModifierType(modifierTypes.BERRY, [ BerryType.LANSAT ]) as PokemonHeldItemModifierType,
+            modifier: generateModifierType(modifierTypes.BERRY, [BerryType.LANSAT]) as PokemonHeldItemModifierType,
             stackCount: 2,
           },
           {
-            modifier: generateModifierType(modifierTypes.BERRY, [ BerryType.LIECHI ]) as PokemonHeldItemModifierType,
+            modifier: generateModifierType(modifierTypes.BERRY, [BerryType.LIECHI]) as PokemonHeldItemModifierType,
             stackCount: 2,
           },
           {
-            modifier: generateModifierType(modifierTypes.BERRY, [ BerryType.PETAYA ]) as PokemonHeldItemModifierType,
+            modifier: generateModifierType(modifierTypes.BERRY, [BerryType.PETAYA]) as PokemonHeldItemModifierType,
             stackCount: 2,
           },
           {
-            modifier: generateModifierType(modifierTypes.BERRY, [ BerryType.ENIGMA ]) as PokemonHeldItemModifierType,
+            modifier: generateModifierType(modifierTypes.BERRY, [BerryType.ENIGMA]) as PokemonHeldItemModifierType,
             stackCount: 2,
           },
           {
-            modifier: generateModifierType(modifierTypes.BERRY, [ BerryType.LEPPA ]) as PokemonHeldItemModifierType,
+            modifier: generateModifierType(modifierTypes.BERRY, [BerryType.LEPPA]) as PokemonHeldItemModifierType,
             stackCount: 2,
-          }
-        ]
+          },
+        ],
       },
       {
         species: getPokemonSpecies(Species.DODRIO),
         isBoss: false,
         abilityIndex: 2, // Tangled Feet
         nature: Nature.JOLLY,
-        moveSet: [ Moves.DRILL_PECK, Moves.QUICK_ATTACK, Moves.THRASH, Moves.KNOCK_OFF ],
+        moveSet: [Moves.DRILL_PECK, Moves.QUICK_ATTACK, Moves.THRASH, Moves.KNOCK_OFF],
         modifierConfigs: [
           {
             modifier: generateModifierType(modifierTypes.KINGS_ROCK) as PokemonHeldItemModifierType,
             stackCount: 2,
-            isTransferable: false
-          }
-        ]
+            isTransferable: false,
+          },
+        ],
       },
       {
         species: getPokemonSpecies(Species.ALAKAZAM),
         isBoss: false,
         formIndex: 1,
         nature: Nature.BOLD,
-        moveSet: [ Moves.PSYCHIC, Moves.SHADOW_BALL, Moves.FOCUS_BLAST, Moves.THUNDERBOLT ],
+        moveSet: [Moves.PSYCHIC, Moves.SHADOW_BALL, Moves.FOCUS_BLAST, Moves.THUNDERBOLT],
         modifierConfigs: [
           {
             modifier: generateModifierType(modifierTypes.WIDE_LENS) as PokemonHeldItemModifierType,
             stackCount: 2,
-            isTransferable: false
+            isTransferable: false,
           },
-        ]
+        ],
       },
       {
         species: getPokemonSpecies(Species.DARMANITAN),
         isBoss: false,
         abilityIndex: 0, // Sheer Force
         nature: Nature.IMPISH,
-        moveSet: [ Moves.EARTHQUAKE, Moves.U_TURN, Moves.FLARE_BLITZ, Moves.ROCK_SLIDE ],
+        moveSet: [Moves.EARTHQUAKE, Moves.U_TURN, Moves.FLARE_BLITZ, Moves.ROCK_SLIDE],
         modifierConfigs: [
           {
             modifier: generateModifierType(modifierTypes.QUICK_CLAW) as PokemonHeldItemModifierType,
             stackCount: 2,
-            isTransferable: false
+            isTransferable: false,
           },
-        ]
-      }
-    ]
+        ],
+      },
+    ],
   };
 }
diff --git a/src/data/mystery-encounters/encounters/training-session-encounter.ts b/src/data/mystery-encounters/encounters/training-session-encounter.ts
index 9cb388e343c..597a6b009b3 100644
--- a/src/data/mystery-encounters/encounters/training-session-encounter.ts
+++ b/src/data/mystery-encounters/encounters/training-session-encounter.ts
@@ -1,7 +1,12 @@
-import type { Ability } from "#app/data/ability";
-import { allAbilities } from "#app/data/ability";
+import type { Ability } from "#app/data/abilities/ability-class";
+import { allAbilities } from "#app/data/data-lists";
 import type { EnemyPartyConfig } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
-import { initBattleWithEnemyConfig, leaveEncounterWithoutBattle, selectPokemonForOption, setEncounterRewards, } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
+import {
+  initBattleWithEnemyConfig,
+  leaveEncounterWithoutBattle,
+  selectPokemonForOption,
+  setEncounterRewards,
+} from "#app/data/mystery-encounters/utils/encounter-phase-utils";
 import { getNatureName } from "#app/data/nature";
 import { speciesStarterCosts } from "#app/data/balance/starters";
 import type { PlayerPokemon } from "#app/field/pokemon";
@@ -10,7 +15,7 @@ import type { PokemonHeldItemModifier } from "#app/modifier/modifier";
 import { AbilityAttr } from "#app/system/game-data";
 import PokemonData from "#app/system/pokemon-data";
 import type { OptionSelectItem } from "#app/ui/abstact-option-select-ui-handler";
-import { isNullOrUndefined, randSeedShuffle } from "#app/utils";
+import { isNullOrUndefined, randSeedShuffle } from "#app/utils/common";
 import { BattlerTagType } from "#enums/battler-tag-type";
 import { MysteryEncounterType } from "#enums/mystery-encounter-type";
 import { globalScene } from "#app/global-scene";
@@ -23,7 +28,7 @@ import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode
 import type HeldModifierConfig from "#app/interfaces/held-modifier-config";
 import i18next from "i18next";
 import { getStatKey } from "#enums/stat";
-import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/game-mode";
+import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants";
 import { isPokemonValidForEncounterOptionSelection } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils";
 import type { Nature } from "#enums/nature";
 
@@ -35,360 +40,350 @@ const namespace = "mysteryEncounters/trainingSession";
  * @see {@link https://github.com/pagefaultgames/pokerogue/issues/3802 | GitHub Issue #3802}
  * @see For biome requirements check {@linkcode mysteryEncountersByBiome}
  */
-export const TrainingSessionEncounter: MysteryEncounter =
-  MysteryEncounterBuilder.withEncounterType(MysteryEncounterType.TRAINING_SESSION)
-    .withEncounterTier(MysteryEncounterTier.ULTRA)
-    .withSceneWaveRangeRequirement(...CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES)
-    .withScenePartySizeRequirement(2, 6, true) // Must have at least 2 unfainted pokemon in party
-    .withFleeAllowed(false)
-    .withHideWildIntroMessage(true)
-    .withPreventGameStatsUpdates(true) // Do not count the Pokemon as seen or defeated since it is ours
-    .withIntroSpriteConfigs([
-      {
-        spriteKey: "training_session_gear",
-        fileRoot: "mystery-encounters",
-        hasShadow: true,
-        y: 6,
-        x: 5,
-        yShadow: -2
-      },
-    ])
-    .withIntroDialogue([
-      {
-        text: `${namespace}:intro`,
-      }
-    ])
-    .setLocalizationKey(`${namespace}`)
-    .withTitle(`${namespace}:title`)
-    .withDescription(`${namespace}:description`)
-    .withQuery(`${namespace}:query`)
-    .withOption(
-      MysteryEncounterOptionBuilder
-        .newOptionWithMode(MysteryEncounterOptionMode.DEFAULT)
-        .withHasDexProgress(true)
-        .withDialogue({
-          buttonLabel: `${namespace}:option.1.label`,
-          buttonTooltip: `${namespace}:option.1.tooltip`,
-          selected: [
-            {
-              text: `${namespace}:option.selected`,
-            },
-          ],
-        })
-        .withPreOptionPhase(async (): Promise<boolean> => {
-          const encounter = globalScene.currentBattle.mysteryEncounter!;
-          const onPokemonSelected = (pokemon: PlayerPokemon) => {
-            encounter.misc = {
-              playerPokemon: pokemon,
+export const TrainingSessionEncounter: MysteryEncounter = MysteryEncounterBuilder.withEncounterType(
+  MysteryEncounterType.TRAINING_SESSION,
+)
+  .withEncounterTier(MysteryEncounterTier.ULTRA)
+  .withSceneWaveRangeRequirement(...CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES)
+  .withScenePartySizeRequirement(2, 6, true) // Must have at least 2 unfainted pokemon in party
+  .withFleeAllowed(false)
+  .withHideWildIntroMessage(true)
+  .withPreventGameStatsUpdates(true) // Do not count the Pokemon as seen or defeated since it is ours
+  .withIntroSpriteConfigs([
+    {
+      spriteKey: "training_session_gear",
+      fileRoot: "mystery-encounters",
+      hasShadow: true,
+      y: 6,
+      x: 5,
+      yShadow: -2,
+    },
+  ])
+  .withIntroDialogue([
+    {
+      text: `${namespace}:intro`,
+    },
+  ])
+  .setLocalizationKey(`${namespace}`)
+  .withTitle(`${namespace}:title`)
+  .withDescription(`${namespace}:description`)
+  .withQuery(`${namespace}:query`)
+  .withOption(
+    MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DEFAULT)
+      .withHasDexProgress(true)
+      .withDialogue({
+        buttonLabel: `${namespace}:option.1.label`,
+        buttonTooltip: `${namespace}:option.1.tooltip`,
+        selected: [
+          {
+            text: `${namespace}:option.selected`,
+          },
+        ],
+      })
+      .withPreOptionPhase(async (): Promise<boolean> => {
+        const encounter = globalScene.currentBattle.mysteryEncounter!;
+        const onPokemonSelected = (pokemon: PlayerPokemon) => {
+          encounter.misc = {
+            playerPokemon: pokemon,
+          };
+        };
+
+        // Only Pokemon that are not KOed/legal can be trained
+        const selectableFilter = (pokemon: Pokemon) => {
+          return isPokemonValidForEncounterOptionSelection(pokemon, `${namespace}:invalid_selection`);
+        };
+
+        return selectPokemonForOption(onPokemonSelected, undefined, selectableFilter);
+      })
+      .withOptionPhase(async () => {
+        const encounter = globalScene.currentBattle.mysteryEncounter!;
+        const playerPokemon: PlayerPokemon = encounter.misc.playerPokemon;
+
+        // Spawn light training session with chosen pokemon
+        // Every 50 waves, add +1 boss segment, capping at 5
+        const segments = Math.min(2 + Math.floor(globalScene.currentBattle.waveIndex / 50), 5);
+        const modifiers = new ModifiersHolder();
+        const config = getEnemyConfig(playerPokemon, segments, modifiers);
+        globalScene.removePokemonFromPlayerParty(playerPokemon, false);
+
+        const onBeforeRewardsPhase = () => {
+          encounter.setDialogueToken("stat1", "-");
+          encounter.setDialogueToken("stat2", "-");
+          // Add the pokemon back to party with IV boost
+          let ivIndexes: any[] = [];
+          playerPokemon.ivs.forEach((iv, index) => {
+            if (iv < 31) {
+              ivIndexes.push({ iv: iv, index: index });
+            }
+          });
+
+          // Improves 2 random non-maxed IVs
+          // +10 if IV is < 10, +5 if between 10-20, and +3 if > 20
+          // A 0-4 starting IV will cap in 6 encounters (assuming you always rolled that IV)
+          // 5-14 starting IV caps in 5 encounters
+          // 15-19 starting IV caps in 4 encounters
+          // 20-24 starting IV caps in 3 encounters
+          // 25-27 starting IV caps in 2 encounters
+          let improvedCount = 0;
+          while (ivIndexes.length > 0 && improvedCount < 2) {
+            ivIndexes = randSeedShuffle(ivIndexes);
+            const ivToChange = ivIndexes.pop();
+            let newVal = ivToChange.iv;
+            if (improvedCount === 0) {
+              encounter.setDialogueToken("stat1", i18next.t(getStatKey(ivToChange.index)) ?? "");
+            } else {
+              encounter.setDialogueToken("stat2", i18next.t(getStatKey(ivToChange.index)) ?? "");
+            }
+
+            // Corrects required encounter breakpoints to be continuous for all IV values
+            if (ivToChange.iv <= 21 && ivToChange.iv - (1 % 5) === 0) {
+              newVal += 1;
+            }
+
+            newVal += ivToChange.iv <= 10 ? 10 : ivToChange.iv <= 20 ? 5 : 3;
+            newVal = Math.min(newVal, 31);
+            playerPokemon.ivs[ivToChange.index] = newVal;
+            improvedCount++;
+          }
+
+          if (improvedCount > 0) {
+            playerPokemon.calculateStats();
+            globalScene.gameData.updateSpeciesDexIvs(playerPokemon.species.getRootSpeciesId(true), playerPokemon.ivs);
+            globalScene.gameData.setPokemonCaught(playerPokemon, false);
+          }
+
+          // Add pokemon and mods back
+          globalScene.getPlayerParty().push(playerPokemon);
+          for (const mod of modifiers.value) {
+            mod.pokemonId = playerPokemon.id;
+            globalScene.addModifier(mod, true, false, false, true);
+          }
+          globalScene.updateModifiers(true);
+          queueEncounterMessage(`${namespace}:option.1.finished`);
+        };
+
+        setEncounterRewards({ fillRemaining: true }, undefined, onBeforeRewardsPhase);
+
+        await initBattleWithEnemyConfig(config);
+      })
+      .build(),
+  )
+  .withOption(
+    MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DEFAULT)
+      .withHasDexProgress(true)
+      .withDialogue({
+        buttonLabel: `${namespace}:option.2.label`,
+        buttonTooltip: `${namespace}:option.2.tooltip`,
+        secondOptionPrompt: `${namespace}:option.2.select_prompt`,
+        selected: [
+          {
+            text: `${namespace}:option.selected`,
+          },
+        ],
+      })
+      .withPreOptionPhase(async (): Promise<boolean> => {
+        // Open menu for selecting pokemon and Nature
+        const encounter = globalScene.currentBattle.mysteryEncounter!;
+        const natures = new Array(25).fill(null).map((_val, i) => i as Nature);
+        const onPokemonSelected = (pokemon: PlayerPokemon) => {
+          // Return the options for nature selection
+          return natures.map((nature: Nature) => {
+            const option: OptionSelectItem = {
+              label: getNatureName(nature, true, true, true, globalScene.uiTheme),
+              handler: () => {
+                // Pokemon and second option selected
+                encounter.setDialogueToken("nature", getNatureName(nature));
+                encounter.misc = {
+                  playerPokemon: pokemon,
+                  chosenNature: nature,
+                };
+                return true;
+              },
             };
-          };
+            return option;
+          });
+        };
 
-          // Only Pokemon that are not KOed/legal can be trained
-          const selectableFilter = (pokemon: Pokemon) => {
-            return isPokemonValidForEncounterOptionSelection(pokemon, `${namespace}:invalid_selection`);
-          };
+        // Only Pokemon that are not KOed/legal can be trained
+        const selectableFilter = (pokemon: Pokemon) => {
+          return isPokemonValidForEncounterOptionSelection(pokemon, `${namespace}:invalid_selection`);
+        };
 
-          return selectPokemonForOption(onPokemonSelected, undefined, selectableFilter);
-        })
-        .withOptionPhase(async () => {
-          const encounter = globalScene.currentBattle.mysteryEncounter!;
-          const playerPokemon: PlayerPokemon = encounter.misc.playerPokemon;
+        return selectPokemonForOption(onPokemonSelected, undefined, selectableFilter);
+      })
+      .withOptionPhase(async () => {
+        const encounter = globalScene.currentBattle.mysteryEncounter!;
+        const playerPokemon: PlayerPokemon = encounter.misc.playerPokemon;
 
-          // Spawn light training session with chosen pokemon
-          // Every 50 waves, add +1 boss segment, capping at 5
-          const segments = Math.min(
-            2 + Math.floor(globalScene.currentBattle.waveIndex / 50),
-            5
-          );
-          const modifiers = new ModifiersHolder();
-          const config = getEnemyConfig(playerPokemon, segments, modifiers);
-          globalScene.removePokemonFromPlayerParty(playerPokemon, false);
+        // Spawn medium training session with chosen pokemon
+        // Every 40 waves, add +1 boss segment, capping at 6
+        const segments = Math.min(2 + Math.floor(globalScene.currentBattle.waveIndex / 40), 6);
+        const modifiers = new ModifiersHolder();
+        const config = getEnemyConfig(playerPokemon, segments, modifiers);
+        globalScene.removePokemonFromPlayerParty(playerPokemon, false);
 
-          const onBeforeRewardsPhase = () => {
-            encounter.setDialogueToken("stat1", "-");
-            encounter.setDialogueToken("stat2", "-");
-            // Add the pokemon back to party with IV boost
-            let ivIndexes: any[] = [];
-            playerPokemon.ivs.forEach((iv, index) => {
-              if (iv < 31) {
-                ivIndexes.push({ iv: iv, index: index });
-              }
-            });
+        const onBeforeRewardsPhase = () => {
+          queueEncounterMessage(`${namespace}:option.2.finished`);
+          // Add the pokemon back to party with Nature change
+          playerPokemon.setCustomNature(encounter.misc.chosenNature);
+          globalScene.gameData.unlockSpeciesNature(playerPokemon.species, encounter.misc.chosenNature);
 
-            // Improves 2 random non-maxed IVs
-            // +10 if IV is < 10, +5 if between 10-20, and +3 if > 20
-            // A 0-4 starting IV will cap in 6 encounters (assuming you always rolled that IV)
-            // 5-14 starting IV caps in 5 encounters
-            // 15-19 starting IV caps in 4 encounters
-            // 20-24 starting IV caps in 3 encounters
-            // 25-27 starting IV caps in 2 encounters
-            let improvedCount = 0;
-            while (ivIndexes.length > 0 && improvedCount < 2) {
-              ivIndexes = randSeedShuffle(ivIndexes);
-              const ivToChange = ivIndexes.pop();
-              let newVal = ivToChange.iv;
-              if (improvedCount === 0) {
-                encounter.setDialogueToken(
-                  "stat1",
-                  i18next.t(getStatKey(ivToChange.index)) ?? ""
-                );
-              } else {
-                encounter.setDialogueToken(
-                  "stat2",
-                  i18next.t(getStatKey(ivToChange.index)) ?? ""
-                );
-              }
+          // Add pokemon and modifiers back
+          globalScene.getPlayerParty().push(playerPokemon);
+          for (const mod of modifiers.value) {
+            mod.pokemonId = playerPokemon.id;
+            globalScene.addModifier(mod, true, false, false, true);
+          }
+          globalScene.updateModifiers(true);
+        };
 
-              // Corrects required encounter breakpoints to be continuous for all IV values
-              if (ivToChange.iv <= 21 && ivToChange.iv - (1 % 5) === 0) {
-                newVal += 1;
-              }
+        setEncounterRewards({ fillRemaining: true }, undefined, onBeforeRewardsPhase);
 
-              newVal += ivToChange.iv <= 10 ? 10 : ivToChange.iv <= 20 ? 5 : 3;
-              newVal = Math.min(newVal, 31);
-              playerPokemon.ivs[ivToChange.index] = newVal;
-              improvedCount++;
-            }
+        await initBattleWithEnemyConfig(config);
+      })
+      .build(),
+  )
+  .withOption(
+    MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DEFAULT)
+      .withHasDexProgress(true)
+      .withDialogue({
+        buttonLabel: `${namespace}:option.3.label`,
+        buttonTooltip: `${namespace}:option.3.tooltip`,
+        secondOptionPrompt: `${namespace}:option.3.select_prompt`,
+        selected: [
+          {
+            text: `${namespace}:option.selected`,
+          },
+        ],
+      })
+      .withPreOptionPhase(async (): Promise<boolean> => {
+        // Open menu for selecting pokemon and ability to learn
+        const encounter = globalScene.currentBattle.mysteryEncounter!;
+        const onPokemonSelected = (pokemon: PlayerPokemon) => {
+          // Return the options for ability selection
+          const speciesForm = pokemon.getFusionSpeciesForm()
+            ? pokemon.getFusionSpeciesForm()
+            : pokemon.getSpeciesForm();
+          const abilityCount = speciesForm.getAbilityCount();
+          const abilities: Ability[] = new Array(abilityCount)
+            .fill(null)
+            .map((_val, i) => allAbilities[speciesForm.getAbility(i)]);
 
-            if (improvedCount > 0) {
-              playerPokemon.calculateStats();
-              globalScene.gameData.updateSpeciesDexIvs(playerPokemon.species.getRootSpeciesId(true), playerPokemon.ivs);
-              globalScene.gameData.setPokemonCaught(playerPokemon, false);
-            }
-
-            // Add pokemon and mods back
-            globalScene.getPlayerParty().push(playerPokemon);
-            for (const mod of modifiers.value) {
-              mod.pokemonId = playerPokemon.id;
-              globalScene.addModifier(mod, true, false, false, true);
-            }
-            globalScene.updateModifiers(true);
-            queueEncounterMessage(`${namespace}:option.1.finished`);
-          };
-
-          setEncounterRewards({ fillRemaining: true }, undefined, onBeforeRewardsPhase);
-
-          await initBattleWithEnemyConfig(config);
-        })
-        .build()
-    )
-    .withOption(
-      MysteryEncounterOptionBuilder
-        .newOptionWithMode(MysteryEncounterOptionMode.DEFAULT)
-        .withHasDexProgress(true)
-        .withDialogue({
-          buttonLabel: `${namespace}:option.2.label`,
-          buttonTooltip: `${namespace}:option.2.tooltip`,
-          secondOptionPrompt: `${namespace}:option.2.select_prompt`,
-          selected: [
-            {
-              text: `${namespace}:option.selected`,
-            },
-          ],
-        })
-        .withPreOptionPhase(async (): Promise<boolean> => {
-          // Open menu for selecting pokemon and Nature
-          const encounter = globalScene.currentBattle.mysteryEncounter!;
-          const natures = new Array(25).fill(null).map((val, i) => i as Nature);
-          const onPokemonSelected = (pokemon: PlayerPokemon) => {
-            // Return the options for nature selection
-            return natures.map((nature: Nature) => {
+          const optionSelectItems: OptionSelectItem[] = [];
+          abilities.forEach((ability: Ability, index) => {
+            if (!optionSelectItems.some(o => o.label === ability.name)) {
               const option: OptionSelectItem = {
-                label: getNatureName(nature, true, true, true, globalScene.uiTheme),
+                label: ability.name,
                 handler: () => {
-                  // Pokemon and second option selected
-                  encounter.setDialogueToken("nature", getNatureName(nature));
+                  // Pokemon and ability selected
+                  encounter.setDialogueToken("ability", ability.name);
                   encounter.misc = {
                     playerPokemon: pokemon,
-                    chosenNature: nature,
+                    abilityIndex: index,
                   };
                   return true;
                 },
+                onHover: () => {
+                  showEncounterText(ability.description, 0, 0, false);
+                },
               };
-              return option;
-            });
-          };
-
-          // Only Pokemon that are not KOed/legal can be trained
-          const selectableFilter = (pokemon: Pokemon) => {
-            return isPokemonValidForEncounterOptionSelection(pokemon, `${namespace}:invalid_selection`);
-          };
-
-          return selectPokemonForOption(onPokemonSelected, undefined, selectableFilter);
-        })
-        .withOptionPhase(async () => {
-          const encounter = globalScene.currentBattle.mysteryEncounter!;
-          const playerPokemon: PlayerPokemon = encounter.misc.playerPokemon;
-
-          // Spawn medium training session with chosen pokemon
-          // Every 40 waves, add +1 boss segment, capping at 6
-          const segments = Math.min(2 + Math.floor(globalScene.currentBattle.waveIndex / 40), 6);
-          const modifiers = new ModifiersHolder();
-          const config = getEnemyConfig(playerPokemon, segments, modifiers);
-          globalScene.removePokemonFromPlayerParty(playerPokemon, false);
-
-          const onBeforeRewardsPhase = () => {
-            queueEncounterMessage(`${namespace}:option.2.finished`);
-            // Add the pokemon back to party with Nature change
-            playerPokemon.setCustomNature(encounter.misc.chosenNature);
-            globalScene.gameData.unlockSpeciesNature(playerPokemon.species, encounter.misc.chosenNature);
-
-            // Add pokemon and modifiers back
-            globalScene.getPlayerParty().push(playerPokemon);
-            for (const mod of modifiers.value) {
-              mod.pokemonId = playerPokemon.id;
-              globalScene.addModifier(mod, true, false, false, true);
+              optionSelectItems.push(option);
             }
-            globalScene.updateModifiers(true);
-          };
+          });
 
-          setEncounterRewards({ fillRemaining: true }, undefined, onBeforeRewardsPhase);
+          return optionSelectItems;
+        };
 
-          await initBattleWithEnemyConfig(config);
-        })
-        .build()
-    )
-    .withOption(
-      MysteryEncounterOptionBuilder
-        .newOptionWithMode(MysteryEncounterOptionMode.DEFAULT)
-        .withHasDexProgress(true)
-        .withDialogue({
-          buttonLabel: `${namespace}:option.3.label`,
-          buttonTooltip: `${namespace}:option.3.tooltip`,
-          secondOptionPrompt: `${namespace}:option.3.select_prompt`,
-          selected: [
-            {
-              text: `${namespace}:option.selected`,
-            },
-          ],
-        })
-        .withPreOptionPhase(async (): Promise<boolean> => {
-          // Open menu for selecting pokemon and ability to learn
-          const encounter = globalScene.currentBattle.mysteryEncounter!;
-          const onPokemonSelected = (pokemon: PlayerPokemon) => {
-            // Return the options for ability selection
-            const speciesForm = !!pokemon.getFusionSpeciesForm()
-              ? pokemon.getFusionSpeciesForm()
-              : pokemon.getSpeciesForm();
-            const abilityCount = speciesForm.getAbilityCount();
-            const abilities: Ability[] = new Array(abilityCount)
-              .fill(null)
-              .map((val, i) => allAbilities[speciesForm.getAbility(i)]);
+        // Only Pokemon that are not KOed/legal can be trained
+        const selectableFilter = (pokemon: Pokemon) => {
+          return isPokemonValidForEncounterOptionSelection(pokemon, `${namespace}:invalid_selection`);
+        };
 
-            const optionSelectItems: OptionSelectItem[] = [];
-            abilities.forEach((ability: Ability, index) => {
-              if (!optionSelectItems.some(o => o.label === ability.name)) {
-                const option: OptionSelectItem = {
-                  label: ability.name,
-                  handler: () => {
-                    // Pokemon and ability selected
-                    encounter.setDialogueToken("ability", ability.name);
-                    encounter.misc = {
-                      playerPokemon: pokemon,
-                      abilityIndex: index,
-                    };
-                    return true;
-                  },
-                  onHover: () => {
-                    showEncounterText(ability.description, 0, 0, false);
-                  },
-                };
-                optionSelectItems.push(option);
-              }
-            });
+        return selectPokemonForOption(onPokemonSelected, undefined, selectableFilter);
+      })
+      .withOptionPhase(async () => {
+        const encounter = globalScene.currentBattle.mysteryEncounter!;
+        const playerPokemon: PlayerPokemon = encounter.misc.playerPokemon;
 
-            return optionSelectItems;
-          };
+        // Spawn hard training session with chosen pokemon
+        // Every 30 waves, add +1 boss segment, capping at 6
+        // Also starts with +1 to all stats
+        const segments = Math.min(2 + Math.floor(globalScene.currentBattle.waveIndex / 30), 6);
+        const modifiers = new ModifiersHolder();
+        const config = getEnemyConfig(playerPokemon, segments, modifiers);
+        config.pokemonConfigs![0].tags = [BattlerTagType.MYSTERY_ENCOUNTER_POST_SUMMON];
+        globalScene.removePokemonFromPlayerParty(playerPokemon, false);
 
-          // Only Pokemon that are not KOed/legal can be trained
-          const selectableFilter = (pokemon: Pokemon) => {
-            return isPokemonValidForEncounterOptionSelection(pokemon, `${namespace}:invalid_selection`);
-          };
+        const onBeforeRewardsPhase = () => {
+          queueEncounterMessage(`${namespace}:option.3.finished`);
+          // Add the pokemon back to party with ability change
+          const abilityIndex = encounter.misc.abilityIndex;
 
-          return selectPokemonForOption(onPokemonSelected, undefined, selectableFilter);
-        })
-        .withOptionPhase(async () => {
-          const encounter = globalScene.currentBattle.mysteryEncounter!;
-          const playerPokemon: PlayerPokemon = encounter.misc.playerPokemon;
+          if (playerPokemon.getFusionSpeciesForm()) {
+            playerPokemon.fusionAbilityIndex = abilityIndex;
 
-          // Spawn hard training session with chosen pokemon
-          // Every 30 waves, add +1 boss segment, capping at 6
-          // Also starts with +1 to all stats
-          const segments = Math.min(2 + Math.floor(globalScene.currentBattle.waveIndex / 30), 6);
-          const modifiers = new ModifiersHolder();
-          const config = getEnemyConfig(playerPokemon, segments, modifiers);
-          config.pokemonConfigs![0].tags = [
-            BattlerTagType.MYSTERY_ENCOUNTER_POST_SUMMON,
-          ];
-          globalScene.removePokemonFromPlayerParty(playerPokemon, false);
-
-          const onBeforeRewardsPhase = () => {
-            queueEncounterMessage(`${namespace}:option.3.finished`);
-            // Add the pokemon back to party with ability change
-            const abilityIndex = encounter.misc.abilityIndex;
-
-            if (!!playerPokemon.getFusionSpeciesForm()) {
-              playerPokemon.fusionAbilityIndex = abilityIndex;
-
-              // Only update the fusion's dex data if the Pokemon is already caught in dex (ignore rentals)
-              const rootFusionSpecies = playerPokemon.fusionSpecies?.getRootSpeciesId();
-              if (!isNullOrUndefined(rootFusionSpecies)
-                && speciesStarterCosts.hasOwnProperty(rootFusionSpecies)
-                && !!globalScene.gameData.dexData[rootFusionSpecies].caughtAttr) {
-                globalScene.gameData.starterData[rootFusionSpecies].abilityAttr |= playerPokemon.fusionAbilityIndex !== 1 || playerPokemon.fusionSpecies?.ability2
+            // Only update the fusion's dex data if the Pokemon is already caught in dex (ignore rentals)
+            const rootFusionSpecies = playerPokemon.fusionSpecies?.getRootSpeciesId();
+            if (
+              !isNullOrUndefined(rootFusionSpecies) &&
+              speciesStarterCosts.hasOwnProperty(rootFusionSpecies) &&
+              !!globalScene.gameData.dexData[rootFusionSpecies].caughtAttr
+            ) {
+              globalScene.gameData.starterData[rootFusionSpecies].abilityAttr |=
+                playerPokemon.fusionAbilityIndex !== 1 || playerPokemon.fusionSpecies?.ability2
                   ? 1 << playerPokemon.fusionAbilityIndex
                   : AbilityAttr.ABILITY_HIDDEN;
-              }
-            } else {
-              playerPokemon.abilityIndex = abilityIndex;
             }
+          } else {
+            playerPokemon.abilityIndex = abilityIndex;
+          }
 
-            playerPokemon.calculateStats();
-            globalScene.gameData.setPokemonCaught(playerPokemon, false);
+          playerPokemon.calculateStats();
+          globalScene.gameData.setPokemonCaught(playerPokemon, false);
 
-            // Add pokemon and mods back
-            globalScene.getPlayerParty().push(playerPokemon);
-            for (const mod of modifiers.value) {
-              mod.pokemonId = playerPokemon.id;
-              globalScene.addModifier(mod, true, false, false, true);
-            }
-            globalScene.updateModifiers(true);
-          };
+          // Add pokemon and mods back
+          globalScene.getPlayerParty().push(playerPokemon);
+          for (const mod of modifiers.value) {
+            mod.pokemonId = playerPokemon.id;
+            globalScene.addModifier(mod, true, false, false, true);
+          }
+          globalScene.updateModifiers(true);
+        };
 
-          setEncounterRewards({ fillRemaining: true }, undefined, onBeforeRewardsPhase);
+        setEncounterRewards({ fillRemaining: true }, undefined, onBeforeRewardsPhase);
 
-          await initBattleWithEnemyConfig(config);
-        })
-        .build()
-    )
-    .withSimpleOption(
-      {
-        buttonLabel: `${namespace}:option.4.label`,
-        buttonTooltip: `${namespace}:option.4.tooltip`,
-        selected: [
-          {
-            text: `${namespace}:option.4.selected`,
-          },
-        ],
-      },
-      async () => {
-        // Leave encounter with no rewards or exp
-        leaveEncounterWithoutBattle(true);
-        return true;
-      }
-    )
-    .build();
+        await initBattleWithEnemyConfig(config);
+      })
+      .build(),
+  )
+  .withSimpleOption(
+    {
+      buttonLabel: `${namespace}:option.4.label`,
+      buttonTooltip: `${namespace}:option.4.tooltip`,
+      selected: [
+        {
+          text: `${namespace}:option.4.selected`,
+        },
+      ],
+    },
+    async () => {
+      // Leave encounter with no rewards or exp
+      leaveEncounterWithoutBattle(true);
+      return true;
+    },
+  )
+  .build();
 
 function getEnemyConfig(playerPokemon: PlayerPokemon, segments: number, modifiers: ModifiersHolder): EnemyPartyConfig {
   playerPokemon.resetSummonData();
 
   // Passes modifiers by reference
   modifiers.value = playerPokemon.getHeldItems();
-  const modifierConfigs = modifiers.value.map((mod) => {
+  const modifierConfigs = modifiers.value.map(mod => {
     return {
       modifier: mod.clone(),
       isTransferable: false,
-      stackCount: mod.stackCount
+      stackCount: mod.stackCount,
     };
   }) as HeldModifierConfig[];
 
@@ -410,6 +405,4 @@ function getEnemyConfig(playerPokemon: PlayerPokemon, segments: number, modifier
 
 class ModifiersHolder {
   public value: PokemonHeldItemModifier[] = [];
-
-  constructor() {}
 }
diff --git a/src/data/mystery-encounters/encounters/trash-to-treasure-encounter.ts b/src/data/mystery-encounters/encounters/trash-to-treasure-encounter.ts
index a17b05c4e33..1e1db14705a 100644
--- a/src/data/mystery-encounters/encounters/trash-to-treasure-encounter.ts
+++ b/src/data/mystery-encounters/encounters/trash-to-treasure-encounter.ts
@@ -1,5 +1,12 @@
 import type { EnemyPartyConfig, EnemyPokemonConfig } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
-import { generateModifierType, initBattleWithEnemyConfig, leaveEncounterWithoutBattle, loadCustomMovesForEncounter, setEncounterRewards, transitionMysteryEncounterIntroVisuals, } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
+import {
+  generateModifierType,
+  initBattleWithEnemyConfig,
+  leaveEncounterWithoutBattle,
+  loadCustomMovesForEncounter,
+  setEncounterRewards,
+  transitionMysteryEncounterIntroVisuals,
+} from "#app/data/mystery-encounters/utils/encounter-phase-utils";
 import type { PokemonHeldItemModifierType } from "#app/modifier/modifier-type";
 import { modifierTypes } from "#app/modifier/modifier-type";
 import { MysteryEncounterType } from "#enums/mystery-encounter-type";
@@ -19,7 +26,8 @@ import { getPokemonSpecies } from "#app/data/pokemon-species";
 import { Moves } from "#enums/moves";
 import { BattlerIndex } from "#app/battle";
 import { PokemonMove } from "#app/field/pokemon";
-import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/game-mode";
+import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants";
+import { randSeedInt } from "#app/utils/common";
 
 /** the i18n namespace for this encounter */
 const namespace = "mysteryEncounters/trashToTreasure";
@@ -34,135 +42,185 @@ const SHOP_ITEM_COST_MULTIPLIER = 2.5;
  * @see {@link https://github.com/pagefaultgames/pokerogue/issues/3809 | GitHub Issue #3809}
  * @see For biome requirements check {@linkcode mysteryEncountersByBiome}
  */
-export const TrashToTreasureEncounter: MysteryEncounter =
-  MysteryEncounterBuilder.withEncounterType(MysteryEncounterType.TRASH_TO_TREASURE)
-    .withEncounterTier(MysteryEncounterTier.ULTRA)
-    .withSceneWaveRangeRequirement(60, CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES[1])
-    .withMaxAllowedEncounters(1)
-    .withFleeAllowed(false)
-    .withIntroSpriteConfigs([
-      {
-        spriteKey: Species.GARBODOR.toString() + "-gigantamax",
-        fileRoot: "pokemon",
-        hasShadow: false,
-        disableAnimation: true,
-        scale: 1.5,
-        y: 8,
-        tint: 0.4
-      }
-    ])
-    .withAutoHideIntroVisuals(false)
-    .withIntroDialogue([
-      {
-        text: `${namespace}:intro`,
-      },
-    ])
-    .setLocalizationKey(`${namespace}`)
-    .withTitle(`${namespace}:title`)
-    .withDescription(`${namespace}:description`)
-    .withQuery(`${namespace}:query`)
-    .withOnInit(() => {
-      const encounter = globalScene.currentBattle.mysteryEncounter!;
+export const TrashToTreasureEncounter: MysteryEncounter = MysteryEncounterBuilder.withEncounterType(
+  MysteryEncounterType.TRASH_TO_TREASURE,
+)
+  .withEncounterTier(MysteryEncounterTier.ULTRA)
+  .withSceneWaveRangeRequirement(60, CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES[1])
+  .withMaxAllowedEncounters(1)
+  .withFleeAllowed(false)
+  .withIntroSpriteConfigs([
+    {
+      spriteKey: Species.GARBODOR.toString() + "-gigantamax",
+      fileRoot: "pokemon",
+      hasShadow: false,
+      disableAnimation: true,
+      scale: 1.5,
+      y: 8,
+      tint: 0.4,
+    },
+  ])
+  .withAutoHideIntroVisuals(false)
+  .withIntroDialogue([
+    {
+      text: `${namespace}:intro`,
+    },
+  ])
+  .setLocalizationKey(`${namespace}`)
+  .withTitle(`${namespace}:title`)
+  .withDescription(`${namespace}:description`)
+  .withQuery(`${namespace}:query`)
+  .withOnInit(() => {
+    const encounter = globalScene.currentBattle.mysteryEncounter!;
 
-      // Calculate boss mon (shiny locked)
-      const bossSpecies = getPokemonSpecies(Species.GARBODOR);
-      const pokemonConfig: EnemyPokemonConfig = {
-        species: bossSpecies,
-        isBoss: true,
-        shiny: false, // Shiny lock because of custom intro sprite
-        formIndex: 1, // Gmax
-        bossSegmentModifier: 1, // +1 Segment from normal
-        moveSet: [ Moves.PAYBACK, Moves.GUNK_SHOT, Moves.STOMPING_TANTRUM, Moves.DRAIN_PUNCH ]
-      };
-      const config: EnemyPartyConfig = {
-        levelAdditiveModifier: 0.5,
-        pokemonConfigs: [ pokemonConfig ],
-        disableSwitch: true
-      };
-      encounter.enemyPartyConfigs = [ config ];
+    // Calculate boss mon (shiny locked)
+    const bossSpecies = getPokemonSpecies(Species.GARBODOR);
+    const pokemonConfig: EnemyPokemonConfig = {
+      species: bossSpecies,
+      isBoss: true,
+      shiny: false, // Shiny lock because of custom intro sprite
+      formIndex: 1, // Gmax
+      bossSegmentModifier: 1, // +1 Segment from normal
+      moveSet: [Moves.GUNK_SHOT, Moves.STOMPING_TANTRUM, Moves.HAMMER_ARM, Moves.PAYBACK],
+      modifierConfigs: [
+        {
+          modifier: generateModifierType(modifierTypes.BERRY) as PokemonHeldItemModifierType,
+        },
+        {
+          modifier: generateModifierType(modifierTypes.BERRY) as PokemonHeldItemModifierType,
+        },
+        {
+          modifier: generateModifierType(modifierTypes.BERRY) as PokemonHeldItemModifierType,
+        },
+        {
+          modifier: generateModifierType(modifierTypes.BERRY) as PokemonHeldItemModifierType,
+        },
+        {
+          modifier: generateModifierType(modifierTypes.BASE_STAT_BOOSTER) as PokemonHeldItemModifierType,
+        },
+        {
+          modifier: generateModifierType(modifierTypes.BASE_STAT_BOOSTER) as PokemonHeldItemModifierType,
+        },
+        {
+          modifier: generateModifierType(modifierTypes.TOXIC_ORB) as PokemonHeldItemModifierType,
+          stackCount: randSeedInt(2, 0),
+        },
+        {
+          modifier: generateModifierType(modifierTypes.SOOTHE_BELL) as PokemonHeldItemModifierType,
+          stackCount: randSeedInt(2, 1),
+        },
+        {
+          modifier: generateModifierType(modifierTypes.LUCKY_EGG) as PokemonHeldItemModifierType,
+          stackCount: randSeedInt(3, 1),
+        },
+        {
+          modifier: generateModifierType(modifierTypes.GOLDEN_EGG) as PokemonHeldItemModifierType,
+          stackCount: randSeedInt(2, 0),
+        },
+      ],
+    };
+    const config: EnemyPartyConfig = {
+      levelAdditiveModifier: 0.5,
+      pokemonConfigs: [pokemonConfig],
+      disableSwitch: true,
+    };
+    encounter.enemyPartyConfigs = [config];
 
-      // Load animations/sfx for Garbodor fight start moves
-      loadCustomMovesForEncounter([ Moves.TOXIC, Moves.AMNESIA ]);
+    // Load animations/sfx for Garbodor fight start moves
+    loadCustomMovesForEncounter([Moves.TOXIC, Moves.STOCKPILE]);
 
-      globalScene.loadSe("PRSFX- Dig2", "battle_anims", "PRSFX- Dig2.wav");
-      globalScene.loadSe("PRSFX- Venom Drench", "battle_anims", "PRSFX- Venom Drench.wav");
+    globalScene.loadSe("PRSFX- Dig2", "battle_anims", "PRSFX- Dig2.wav");
+    globalScene.loadSe("PRSFX- Venom Drench", "battle_anims", "PRSFX- Venom Drench.wav");
 
-      encounter.setDialogueToken("costMultiplier", SHOP_ITEM_COST_MULTIPLIER.toString());
+    encounter.setDialogueToken("costMultiplier", SHOP_ITEM_COST_MULTIPLIER.toString());
 
-      return true;
-    })
-    .withOption(
-      MysteryEncounterOptionBuilder
-        .newOptionWithMode(MysteryEncounterOptionMode.DEFAULT)
-        .withDialogue({
-          buttonLabel: `${namespace}:option.1.label`,
-          buttonTooltip: `${namespace}:option.1.tooltip`,
-          selected: [
-            {
-              text: `${namespace}:option.1.selected`,
-            },
-          ],
-        })
-        .withPreOptionPhase(async () => {
-          // Play Dig2 and then Venom Drench sfx
-          doGarbageDig();
-        })
-        .withOptionPhase(async () => {
-          // Gain 2 Leftovers and 2 Shell Bell
-          await transitionMysteryEncounterIntroVisuals();
-          await tryApplyDigRewardItems();
+    return true;
+  })
+  .withOption(
+    MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DEFAULT)
+      .withDialogue({
+        buttonLabel: `${namespace}:option.1.label`,
+        buttonTooltip: `${namespace}:option.1.tooltip`,
+        selected: [
+          {
+            text: `${namespace}:option.1.selected`,
+          },
+        ],
+      })
+      .withPreOptionPhase(async () => {
+        // Play Dig2 and then Venom Drench sfx
+        doGarbageDig();
+      })
+      .withOptionPhase(async () => {
+        // Gain 2 Leftovers and 1 Shell Bell
+        await transitionMysteryEncounterIntroVisuals();
+        await tryApplyDigRewardItems();
 
-          const blackSludge = generateModifierType(modifierTypes.MYSTERY_ENCOUNTER_BLACK_SLUDGE, [ SHOP_ITEM_COST_MULTIPLIER ]);
-          const modifier = blackSludge?.newModifier();
-          if (modifier) {
-            await globalScene.addModifier(modifier, false, false, false, true);
-            globalScene.playSound("battle_anims/PRSFX- Venom Drench", { volume: 2 });
-            await showEncounterText(i18next.t("battle:rewardGain", { modifierName: modifier.type.name }), null, undefined, true);
-          }
+        const blackSludge = generateModifierType(modifierTypes.MYSTERY_ENCOUNTER_BLACK_SLUDGE, [
+          SHOP_ITEM_COST_MULTIPLIER,
+        ]);
+        const modifier = blackSludge?.newModifier();
+        if (modifier) {
+          await globalScene.addModifier(modifier, false, false, false, true);
+          globalScene.playSound("battle_anims/PRSFX- Venom Drench", {
+            volume: 2,
+          });
+          await showEncounterText(
+            i18next.t("battle:rewardGain", {
+              modifierName: modifier.type.name,
+            }),
+            null,
+            undefined,
+            true,
+          );
+        }
 
-          leaveEncounterWithoutBattle(true);
-        })
-        .build()
-    )
-    .withOption(
-      MysteryEncounterOptionBuilder
-        .newOptionWithMode(MysteryEncounterOptionMode.DEFAULT)
-        .withDialogue({
-          buttonLabel: `${namespace}:option.2.label`,
-          buttonTooltip: `${namespace}:option.2.tooltip`,
-          selected: [
-            {
-              text: `${namespace}:option.2.selected`,
-            },
-          ],
-        })
-        .withOptionPhase(async () => {
-          // Investigate garbage, battle Gmax Garbodor
-          globalScene.setFieldScale(0.75);
-          await showEncounterText(`${namespace}:option.2.selected_2`);
-          await transitionMysteryEncounterIntroVisuals();
+        leaveEncounterWithoutBattle(true);
+      })
+      .build(),
+  )
+  .withOption(
+    MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DEFAULT)
+      .withDialogue({
+        buttonLabel: `${namespace}:option.2.label`,
+        buttonTooltip: `${namespace}:option.2.tooltip`,
+        selected: [
+          {
+            text: `${namespace}:option.2.selected`,
+          },
+        ],
+      })
+      .withOptionPhase(async () => {
+        // Investigate garbage, battle Gmax Garbodor
+        globalScene.setFieldScale(0.75);
+        await showEncounterText(`${namespace}:option.2.selected_2`);
+        await transitionMysteryEncounterIntroVisuals();
 
-          const encounter = globalScene.currentBattle.mysteryEncounter!;
+        const encounter = globalScene.currentBattle.mysteryEncounter!;
 
-          setEncounterRewards({ guaranteedModifierTiers: [ ModifierTier.ROGUE, ModifierTier.ROGUE, ModifierTier.ULTRA, ModifierTier.GREAT ], fillRemaining: true });
-          encounter.startOfBattleEffects.push(
-            {
-              sourceBattlerIndex: BattlerIndex.ENEMY,
-              targets: [ BattlerIndex.PLAYER ],
-              move: new PokemonMove(Moves.TOXIC),
-              ignorePp: true
-            },
-            {
-              sourceBattlerIndex: BattlerIndex.ENEMY,
-              targets: [ BattlerIndex.ENEMY ],
-              move: new PokemonMove(Moves.AMNESIA),
-              ignorePp: true
-            });
-          await initBattleWithEnemyConfig(encounter.enemyPartyConfigs[0]);
-        })
-        .build()
-    )
-    .build();
+        setEncounterRewards({
+          guaranteedModifierTiers: [ModifierTier.ROGUE, ModifierTier.ROGUE, ModifierTier.ULTRA, ModifierTier.GREAT],
+          fillRemaining: true,
+        });
+        encounter.startOfBattleEffects.push(
+          {
+            sourceBattlerIndex: BattlerIndex.ENEMY,
+            targets: [BattlerIndex.PLAYER],
+            move: new PokemonMove(Moves.TOXIC),
+            ignorePp: true,
+          },
+          {
+            sourceBattlerIndex: BattlerIndex.ENEMY,
+            targets: [BattlerIndex.ENEMY],
+            move: new PokemonMove(Moves.STOCKPILE),
+            ignorePp: true,
+          },
+        );
+        await initBattleWithEnemyConfig(encounter.enemyPartyConfigs[0]);
+      })
+      .build(),
+  )
+  .build();
 
 async function tryApplyDigRewardItems() {
   const shellBell = generateModifierType(modifierTypes.SHELL_BELL) as PokemonHeldItemModifierType;
@@ -173,8 +231,10 @@ async function tryApplyDigRewardItems() {
   // Iterate over the party until an item was successfully given
   // First leftovers
   for (const pokemon of party) {
-    const heldItems = globalScene.findModifiers(m => m instanceof PokemonHeldItemModifier
-      && m.pokemonId === pokemon.id, true) as PokemonHeldItemModifier[];
+    const heldItems = globalScene.findModifiers(
+      m => m instanceof PokemonHeldItemModifier && m.pokemonId === pokemon.id,
+      true,
+    ) as PokemonHeldItemModifier[];
     const existingLeftovers = heldItems.find(m => m instanceof TurnHealModifier) as TurnHealModifier;
 
     if (!existingLeftovers || existingLeftovers.getStackCount() < existingLeftovers.getMaxStackCount()) {
@@ -185,8 +245,10 @@ async function tryApplyDigRewardItems() {
 
   // Second leftovers
   for (const pokemon of party) {
-    const heldItems = globalScene.findModifiers(m => m instanceof PokemonHeldItemModifier
-      && m.pokemonId === pokemon.id, true) as PokemonHeldItemModifier[];
+    const heldItems = globalScene.findModifiers(
+      m => m instanceof PokemonHeldItemModifier && m.pokemonId === pokemon.id,
+      true,
+    ) as PokemonHeldItemModifier[];
     const existingLeftovers = heldItems.find(m => m instanceof TurnHealModifier) as TurnHealModifier;
 
     if (!existingLeftovers || existingLeftovers.getStackCount() < existingLeftovers.getMaxStackCount()) {
@@ -196,24 +258,22 @@ async function tryApplyDigRewardItems() {
   }
 
   globalScene.playSound("item_fanfare");
-  await showEncounterText(i18next.t("battle:rewardGainCount", { modifierName: leftovers.name, count: 2 }), null, undefined, true);
+  await showEncounterText(
+    i18next.t("battle:rewardGainCount", {
+      modifierName: leftovers.name,
+      count: 2,
+    }),
+    null,
+    undefined,
+    true,
+  );
 
-  // First Shell bell
+  // Only Shell bell
   for (const pokemon of party) {
-    const heldItems = globalScene.findModifiers(m => m instanceof PokemonHeldItemModifier
-      && m.pokemonId === pokemon.id, true) as PokemonHeldItemModifier[];
-    const existingShellBell = heldItems.find(m => m instanceof HitHealModifier) as HitHealModifier;
-
-    if (!existingShellBell || existingShellBell.getStackCount() < existingShellBell.getMaxStackCount()) {
-      await applyModifierTypeToPlayerPokemon(pokemon, shellBell);
-      break;
-    }
-  }
-
-  // Second Shell bell
-  for (const pokemon of party) {
-    const heldItems = globalScene.findModifiers(m => m instanceof PokemonHeldItemModifier
-      && m.pokemonId === pokemon.id, true) as PokemonHeldItemModifier[];
+    const heldItems = globalScene.findModifiers(
+      m => m instanceof PokemonHeldItemModifier && m.pokemonId === pokemon.id,
+      true,
+    ) as PokemonHeldItemModifier[];
     const existingShellBell = heldItems.find(m => m instanceof HitHealModifier) as HitHealModifier;
 
     if (!existingShellBell || existingShellBell.getStackCount() < existingShellBell.getMaxStackCount()) {
@@ -223,7 +283,15 @@ async function tryApplyDigRewardItems() {
   }
 
   globalScene.playSound("item_fanfare");
-  await showEncounterText(i18next.t("battle:rewardGainCount", { modifierName: shellBell.name, count: 2 }), null, undefined, true);
+  await showEncounterText(
+    i18next.t("battle:rewardGainCount", {
+      modifierName: shellBell.name,
+      count: 1,
+    }),
+    null,
+    undefined,
+    true,
+  );
 }
 
 function doGarbageDig() {
diff --git a/src/data/mystery-encounters/encounters/uncommon-breed-encounter.ts b/src/data/mystery-encounters/encounters/uncommon-breed-encounter.ts
index 6e6381888f1..f4eec5b0923 100644
--- a/src/data/mystery-encounters/encounters/uncommon-breed-encounter.ts
+++ b/src/data/mystery-encounters/encounters/uncommon-breed-encounter.ts
@@ -1,6 +1,12 @@
 import { MysteryEncounterOptionBuilder } from "#app/data/mystery-encounters/mystery-encounter-option";
 import type { EnemyPartyConfig } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
-import { getRandomEncounterSpecies, initBattleWithEnemyConfig, leaveEncounterWithoutBattle, setEncounterExp, setEncounterRewards } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
+import {
+  getRandomEncounterSpecies,
+  initBattleWithEnemyConfig,
+  leaveEncounterWithoutBattle,
+  setEncounterExp,
+  setEncounterRewards,
+} from "#app/data/mystery-encounters/utils/encounter-phase-utils";
 import { CHARMING_MOVES } from "#app/data/mystery-encounters/requirements/requirement-groups";
 import type Pokemon from "#app/field/pokemon";
 import type { EnemyPokemon } from "#app/field/pokemon";
@@ -9,22 +15,29 @@ import { MysteryEncounterType } from "#enums/mystery-encounter-type";
 import { globalScene } from "#app/global-scene";
 import type MysteryEncounter from "#app/data/mystery-encounters/mystery-encounter";
 import { MysteryEncounterBuilder } from "#app/data/mystery-encounters/mystery-encounter";
-import { MoveRequirement, PersistentModifierRequirement } from "#app/data/mystery-encounters/mystery-encounter-requirements";
+import {
+  MoveRequirement,
+  PersistentModifierRequirement,
+} from "#app/data/mystery-encounters/mystery-encounter-requirements";
 import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
 import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
-import { catchPokemon, getHighestLevelPlayerPokemon, getSpriteKeysFromPokemon } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils";
+import {
+  catchPokemon,
+  getHighestLevelPlayerPokemon,
+  getSpriteKeysFromPokemon,
+} from "#app/data/mystery-encounters/utils/encounter-pokemon-utils";
 import PokemonData from "#app/system/pokemon-data";
-import { isNullOrUndefined, randSeedInt } from "#app/utils";
+import { isNullOrUndefined, randSeedInt } from "#app/utils/common";
 import type { Moves } from "#enums/moves";
 import { BattlerIndex } from "#app/battle";
-import { SelfStatusMove } from "#app/data/move";
+import { SelfStatusMove } from "#app/data/moves/move";
 import { PokeballType } from "#enums/pokeball";
 import { BattlerTagType } from "#enums/battler-tag-type";
 import { queueEncounterMessage } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils";
 import { BerryModifier } from "#app/modifier/modifier";
 import { StatStageChangePhase } from "#app/phases/stat-stage-change-phase";
 import { Stat } from "#enums/stat";
-import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/game-mode";
+import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants";
 
 /** the i18n namespace for the encounter */
 const namespace = "mysteryEncounters/uncommonBreed";
@@ -34,223 +47,228 @@ const namespace = "mysteryEncounters/uncommonBreed";
  * @see {@link https://github.com/pagefaultgames/pokerogue/issues/3811 | GitHub Issue #3811}
  * @see For biome requirements check {@linkcode mysteryEncountersByBiome}
  */
-export const UncommonBreedEncounter: MysteryEncounter =
-  MysteryEncounterBuilder.withEncounterType(MysteryEncounterType.UNCOMMON_BREED)
-    .withEncounterTier(MysteryEncounterTier.COMMON)
-    .withSceneWaveRangeRequirement(...CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES)
-    .withCatchAllowed(true)
-    .withHideWildIntroMessage(true)
-    .withFleeAllowed(false)
-    .withIntroSpriteConfigs([]) // Set in onInit()
-    .withIntroDialogue([
-      {
-        text: `${namespace}:intro`,
-      },
-    ])
-    .withOnInit(() => {
-      const encounter = globalScene.currentBattle.mysteryEncounter!;
+export const UncommonBreedEncounter: MysteryEncounter = MysteryEncounterBuilder.withEncounterType(
+  MysteryEncounterType.UNCOMMON_BREED,
+)
+  .withEncounterTier(MysteryEncounterTier.COMMON)
+  .withSceneWaveRangeRequirement(...CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES)
+  .withCatchAllowed(true)
+  .withHideWildIntroMessage(true)
+  .withFleeAllowed(false)
+  .withIntroSpriteConfigs([]) // Set in onInit()
+  .withIntroDialogue([
+    {
+      text: `${namespace}:intro`,
+    },
+  ])
+  .withOnInit(() => {
+    const encounter = globalScene.currentBattle.mysteryEncounter!;
 
-      // Calculate boss mon
-      // Level equal to 2 below highest party member
-      const level = getHighestLevelPlayerPokemon(false, true).level - 2;
-      const pokemon = getRandomEncounterSpecies(level, true, true);
+    // Calculate boss mon
+    // Level equal to 2 below highest party member
+    const level = getHighestLevelPlayerPokemon(false, true).level - 2;
+    const pokemon = getRandomEncounterSpecies(level, true, true);
 
-      // Pokemon will always have one of its egg moves in its moveset
-      const eggMoves = pokemon.getEggMoves();
-      if (eggMoves) {
-        const eggMoveIndex = randSeedInt(4);
-        const randomEggMove: Moves = eggMoves[eggMoveIndex];
-        encounter.misc = {
-          eggMove: randomEggMove,
-          pokemon: pokemon
-        };
-        if (pokemon.moveset.length < 4) {
-          pokemon.moveset.push(new PokemonMove(randomEggMove));
-        } else {
-          pokemon.moveset[0] = new PokemonMove(randomEggMove);
-        }
+    // Pokemon will always have one of its egg moves in its moveset
+    const eggMoves = pokemon.getEggMoves();
+    if (eggMoves) {
+      const eggMoveIndex = randSeedInt(4);
+      const randomEggMove: Moves = eggMoves[eggMoveIndex];
+      encounter.misc = {
+        eggMove: randomEggMove,
+        pokemon: pokemon,
+      };
+      if (pokemon.moveset.length < 4) {
+        pokemon.moveset.push(new PokemonMove(randomEggMove));
       } else {
-        encounter.misc.pokemon = pokemon;
+        pokemon.moveset[0] = new PokemonMove(randomEggMove);
       }
+    } else {
+      encounter.misc.pokemon = pokemon;
+    }
 
-      // Defense/Spd buffs below wave 50, +1 to all stats otherwise
-      const statChangesForBattle: (Stat.ATK | Stat.DEF | Stat.SPATK | Stat.SPDEF | Stat.SPD | Stat.ACC | Stat.EVA)[] = globalScene.currentBattle.waveIndex < 50 ?
-        [ Stat.DEF, Stat.SPDEF, Stat.SPD ] :
-        [ Stat.ATK, Stat.DEF, Stat.SPATK, Stat.SPDEF, Stat.SPD ];
+    // Defense/Spd buffs below wave 50, +1 to all stats otherwise
+    const statChangesForBattle: (Stat.ATK | Stat.DEF | Stat.SPATK | Stat.SPDEF | Stat.SPD | Stat.ACC | Stat.EVA)[] =
+      globalScene.currentBattle.waveIndex < 50
+        ? [Stat.DEF, Stat.SPDEF, Stat.SPD]
+        : [Stat.ATK, Stat.DEF, Stat.SPATK, Stat.SPDEF, Stat.SPD];
 
-      const config: EnemyPartyConfig = {
-        pokemonConfigs: [{
+    const config: EnemyPartyConfig = {
+      pokemonConfigs: [
+        {
           level: level,
           species: pokemon.species,
           dataSource: new PokemonData(pokemon),
           isBoss: false,
-          tags: [ BattlerTagType.MYSTERY_ENCOUNTER_POST_SUMMON ],
+          tags: [BattlerTagType.MYSTERY_ENCOUNTER_POST_SUMMON],
           mysteryEncounterBattleEffects: (pokemon: Pokemon) => {
             queueEncounterMessage(`${namespace}:option.1.stat_boost`);
-            globalScene.unshiftPhase(new StatStageChangePhase(pokemon.getBattlerIndex(), true, statChangesForBattle, 1));
-          }
-        }],
-      };
-      encounter.enemyPartyConfigs = [ config ];
-
-      const { spriteKey, fileRoot } = getSpriteKeysFromPokemon(pokemon);
-      encounter.spriteConfigs = [
-        {
-          spriteKey: spriteKey,
-          fileRoot: fileRoot,
-          hasShadow: true,
-          x: -5,
-          repeat: true,
-          isPokemon: true,
-          isShiny: pokemon.shiny,
-          variant: pokemon.variant
+            globalScene.unshiftPhase(
+              new StatStageChangePhase(pokemon.getBattlerIndex(), true, statChangesForBattle, 1),
+            );
+          },
         },
-      ];
+      ],
+    };
+    encounter.enemyPartyConfigs = [config];
 
-      encounter.setDialogueToken("enemyPokemon", pokemon.getNameToRender());
-      globalScene.loadSe("PRSFX- Spotlight2", "battle_anims", "PRSFX- Spotlight2.wav");
-      return true;
-    })
-    .withOnVisualsStart(() => {
-      // Animate the pokemon
-      const encounter = globalScene.currentBattle.mysteryEncounter!;
-      const pokemonSprite = encounter.introVisuals!.getSprites();
-
-      // Bounce at the end, then shiny sparkle if the Pokemon is shiny
-      globalScene.tweens.add({
-        targets: pokemonSprite,
-        duration: 300,
-        ease: "Cubic.easeOut",
-        yoyo: true,
-        y: "-=20",
-        loop: 1,
-        onComplete: () => encounter.introVisuals?.playShinySparkles()
-      });
-
-      globalScene.time.delayedCall(500, () => globalScene.playSound("battle_anims/PRSFX- Spotlight2"));
-      return true;
-    })
-    .setLocalizationKey(`${namespace}`)
-    .withTitle(`${namespace}:title`)
-    .withDescription(`${namespace}:description`)
-    .withQuery(`${namespace}:query`)
-    .withSimpleOption(
+    const { spriteKey, fileRoot } = getSpriteKeysFromPokemon(pokemon);
+    encounter.spriteConfigs = [
       {
-        buttonLabel: `${namespace}:option.1.label`,
-        buttonTooltip: `${namespace}:option.1.tooltip`,
+        spriteKey: spriteKey,
+        fileRoot: fileRoot,
+        hasShadow: true,
+        x: -5,
+        repeat: true,
+        isPokemon: true,
+        isShiny: pokemon.shiny,
+        variant: pokemon.variant,
+      },
+    ];
+
+    encounter.setDialogueToken("enemyPokemon", pokemon.getNameToRender());
+    globalScene.loadSe("PRSFX- Spotlight2", "battle_anims", "PRSFX- Spotlight2.wav");
+    return true;
+  })
+  .withOnVisualsStart(() => {
+    // Animate the pokemon
+    const encounter = globalScene.currentBattle.mysteryEncounter!;
+    const pokemonSprite = encounter.introVisuals!.getSprites();
+
+    // Bounce at the end, then shiny sparkle if the Pokemon is shiny
+    globalScene.tweens.add({
+      targets: pokemonSprite,
+      duration: 300,
+      ease: "Cubic.easeOut",
+      yoyo: true,
+      y: "-=20",
+      loop: 1,
+      onComplete: () => encounter.introVisuals?.playShinySparkles(),
+    });
+
+    globalScene.time.delayedCall(500, () => globalScene.playSound("battle_anims/PRSFX- Spotlight2"));
+    return true;
+  })
+  .setLocalizationKey(`${namespace}`)
+  .withTitle(`${namespace}:title`)
+  .withDescription(`${namespace}:description`)
+  .withQuery(`${namespace}:query`)
+  .withSimpleOption(
+    {
+      buttonLabel: `${namespace}:option.1.label`,
+      buttonTooltip: `${namespace}:option.1.tooltip`,
+      selected: [
+        {
+          text: `${namespace}:option.1.selected`,
+        },
+      ],
+    },
+    async () => {
+      // Pick battle
+      const encounter = globalScene.currentBattle.mysteryEncounter!;
+
+      const eggMove = encounter.misc.eggMove;
+      if (!isNullOrUndefined(eggMove)) {
+        // Check what type of move the egg move is to determine target
+        const pokemonMove = new PokemonMove(eggMove);
+        const move = pokemonMove.getMove();
+        const target = move instanceof SelfStatusMove ? BattlerIndex.ENEMY : BattlerIndex.PLAYER;
+
+        encounter.startOfBattleEffects.push({
+          sourceBattlerIndex: BattlerIndex.ENEMY,
+          targets: [target],
+          move: pokemonMove,
+          ignorePp: true,
+        });
+      }
+
+      setEncounterRewards({ fillRemaining: true });
+      await initBattleWithEnemyConfig(encounter.enemyPartyConfigs[0]);
+    },
+  )
+  .withOption(
+    MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DISABLED_OR_SPECIAL)
+      .withSceneRequirement(new PersistentModifierRequirement("BerryModifier", 4)) // Will set option2PrimaryName and option2PrimaryMove dialogue tokens automatically
+      .withDialogue({
+        buttonLabel: `${namespace}:option.2.label`,
+        buttonTooltip: `${namespace}:option.2.tooltip`,
+        disabledButtonTooltip: `${namespace}:option.2.disabled_tooltip`,
         selected: [
           {
-            text: `${namespace}:option.1.selected`,
+            text: `${namespace}:option.2.selected`,
           },
         ],
-      },
-      async () => {
-        // Pick battle
-        const encounter = globalScene.currentBattle.mysteryEncounter!;
+      })
+      .withOptionPhase(async () => {
+        // Give it some food
 
-        const eggMove = encounter.misc.eggMove;
-        if (!isNullOrUndefined(eggMove)) {
-          // Check what type of move the egg move is to determine target
-          const pokemonMove = new PokemonMove(eggMove);
-          const move = pokemonMove.getMove();
-          const target = move instanceof SelfStatusMove ? BattlerIndex.ENEMY : BattlerIndex.PLAYER;
-
-          encounter.startOfBattleEffects.push(
-            {
-              sourceBattlerIndex: BattlerIndex.ENEMY,
-              targets: [ target ],
-              move: pokemonMove,
-              ignorePp: true
-            });
+        // Remove 4 random berries from player's party
+        // Get all player berry items, remove from party, and store reference
+        const berryItems: BerryModifier[] = globalScene.findModifiers(
+          m => m instanceof BerryModifier,
+        ) as BerryModifier[];
+        for (let i = 0; i < 4; i++) {
+          const index = randSeedInt(berryItems.length);
+          const randBerry = berryItems[index];
+          randBerry.stackCount--;
+          if (randBerry.stackCount === 0) {
+            globalScene.removeModifier(randBerry);
+            berryItems.splice(index, 1);
+          }
         }
+        await globalScene.updateModifiers(true, true);
 
+        // Pokemon joins the team, with 2 egg moves
+        const encounter = globalScene.currentBattle.mysteryEncounter!;
+        const pokemon = encounter.misc.pokemon;
+
+        // Give 1 additional egg move
+        givePokemonExtraEggMove(pokemon, encounter.misc.eggMove);
+
+        await catchPokemon(pokemon, null, PokeballType.POKEBALL, false);
         setEncounterRewards({ fillRemaining: true });
-        await initBattleWithEnemyConfig(encounter.enemyPartyConfigs[0]);
-      }
-    )
-    .withOption(
-      MysteryEncounterOptionBuilder
-        .newOptionWithMode(MysteryEncounterOptionMode.DISABLED_OR_SPECIAL)
-        .withSceneRequirement(new PersistentModifierRequirement("BerryModifier", 4)) // Will set option2PrimaryName and option2PrimaryMove dialogue tokens automatically
-        .withDialogue({
-          buttonLabel: `${namespace}:option.2.label`,
-          buttonTooltip: `${namespace}:option.2.tooltip`,
-          disabledButtonTooltip: `${namespace}:option.2.disabled_tooltip`,
-          selected: [
-            {
-              text: `${namespace}:option.2.selected`
-            }
-          ]
-        })
-        .withOptionPhase(async () => {
-          // Give it some food
+        leaveEncounterWithoutBattle();
+      })
+      .build(),
+  )
+  .withOption(
+    MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DISABLED_OR_SPECIAL)
+      .withPrimaryPokemonRequirement(new MoveRequirement(CHARMING_MOVES, true)) // Will set option2PrimaryName and option2PrimaryMove dialogue tokens automatically
+      .withDialogue({
+        buttonLabel: `${namespace}:option.3.label`,
+        buttonTooltip: `${namespace}:option.3.tooltip`,
+        disabledButtonTooltip: `${namespace}:option.3.disabled_tooltip`,
+        selected: [
+          {
+            text: `${namespace}:option.3.selected`,
+          },
+        ],
+      })
+      .withOptionPhase(async () => {
+        // Attract the pokemon with a move
+        // Pokemon joins the team, with 2 egg moves and IVs rolled an additional time
+        const encounter = globalScene.currentBattle.mysteryEncounter!;
+        const pokemon = encounter.misc.pokemon;
 
-          // Remove 4 random berries from player's party
-          // Get all player berry items, remove from party, and store reference
-          const berryItems: BerryModifier[] = globalScene.findModifiers(m => m instanceof BerryModifier) as BerryModifier[];
-          for (let i = 0; i < 4; i++) {
-            const index = randSeedInt(berryItems.length);
-            const randBerry = berryItems[index];
-            randBerry.stackCount--;
-            if (randBerry.stackCount === 0) {
-              globalScene.removeModifier(randBerry);
-              berryItems.splice(index, 1);
-            }
-          }
-          await globalScene.updateModifiers(true, true);
+        // Give 1 additional egg move
+        givePokemonExtraEggMove(pokemon, encounter.misc.eggMove);
 
-          // Pokemon joins the team, with 2 egg moves
-          const encounter = globalScene.currentBattle.mysteryEncounter!;
-          const pokemon = encounter.misc.pokemon;
+        // Roll IVs a second time
+        pokemon.ivs = pokemon.ivs.map(iv => {
+          const newValue = randSeedInt(31);
+          return newValue > iv ? newValue : iv;
+        });
 
-          // Give 1 additional egg move
-          givePokemonExtraEggMove(pokemon, encounter.misc.eggMove);
-
-          await catchPokemon(pokemon, null, PokeballType.POKEBALL, false);
-          setEncounterRewards({ fillRemaining: true });
-          leaveEncounterWithoutBattle();
-        })
-        .build()
-    )
-    .withOption(
-      MysteryEncounterOptionBuilder
-        .newOptionWithMode(MysteryEncounterOptionMode.DISABLED_OR_SPECIAL)
-        .withPrimaryPokemonRequirement(new MoveRequirement(CHARMING_MOVES, true)) // Will set option2PrimaryName and option2PrimaryMove dialogue tokens automatically
-        .withDialogue({
-          buttonLabel: `${namespace}:option.3.label`,
-          buttonTooltip: `${namespace}:option.3.tooltip`,
-          disabledButtonTooltip: `${namespace}:option.3.disabled_tooltip`,
-          selected: [
-            {
-              text: `${namespace}:option.3.selected`
-            }
-          ]
-        })
-        .withOptionPhase(async () => {
-          // Attract the pokemon with a move
-          // Pokemon joins the team, with 2 egg moves and IVs rolled an additional time
-          const encounter = globalScene.currentBattle.mysteryEncounter!;
-          const pokemon = encounter.misc.pokemon;
-
-          // Give 1 additional egg move
-          givePokemonExtraEggMove(pokemon, encounter.misc.eggMove);
-
-          // Roll IVs a second time
-          pokemon.ivs = pokemon.ivs.map(iv => {
-            const newValue = randSeedInt(31);
-            return newValue > iv ? newValue : iv;
-          });
-
-          await catchPokemon(pokemon, null, PokeballType.POKEBALL, false);
-          if (encounter.selectedOption?.primaryPokemon?.id) {
-            setEncounterExp(encounter.selectedOption.primaryPokemon.id, pokemon.getExpValue(), false);
-          }
-          setEncounterRewards({ fillRemaining: true });
-          leaveEncounterWithoutBattle();
-        })
-        .build()
-    )
-    .build();
+        await catchPokemon(pokemon, null, PokeballType.POKEBALL, false);
+        if (encounter.selectedOption?.primaryPokemon?.id) {
+          setEncounterExp(encounter.selectedOption.primaryPokemon.id, pokemon.getExpValue(), false);
+        }
+        setEncounterRewards({ fillRemaining: true });
+        leaveEncounterWithoutBattle();
+      })
+      .build(),
+  )
+  .build();
 
 function givePokemonExtraEggMove(pokemon: EnemyPokemon, previousEggMove: Moves) {
   const eggMoves = pokemon.getEggMoves();
diff --git a/src/data/mystery-encounters/encounters/weird-dream-encounter.ts b/src/data/mystery-encounters/encounters/weird-dream-encounter.ts
index e047a7a4f01..cceda25fcb4 100644
--- a/src/data/mystery-encounters/encounters/weird-dream-encounter.ts
+++ b/src/data/mystery-encounters/encounters/weird-dream-encounter.ts
@@ -1,4 +1,4 @@
-import { Type } from "#enums/type";
+import { PokemonType } from "#enums/pokemon-type";
 import { MysteryEncounterType } from "#enums/mystery-encounter-type";
 import { Species } from "#enums/species";
 import { globalScene } from "#app/global-scene";
@@ -6,24 +6,31 @@ import type MysteryEncounter from "#app/data/mystery-encounters/mystery-encounte
 import { MysteryEncounterBuilder } from "#app/data/mystery-encounters/mystery-encounter";
 import { MysteryEncounterOptionBuilder } from "#app/data/mystery-encounters/mystery-encounter-option";
 import type { EnemyPartyConfig, EnemyPokemonConfig } from "../utils/encounter-phase-utils";
-import { generateModifierType, initBattleWithEnemyConfig, leaveEncounterWithoutBattle, setEncounterRewards, } from "../utils/encounter-phase-utils";
+import {
+  generateModifierType,
+  initBattleWithEnemyConfig,
+  leaveEncounterWithoutBattle,
+  setEncounterRewards,
+} from "../utils/encounter-phase-utils";
 import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
 import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
 import type { PlayerPokemon } from "#app/field/pokemon";
 import type Pokemon from "#app/field/pokemon";
 import { PokemonMove } from "#app/field/pokemon";
-import { IntegerHolder, isNullOrUndefined, randSeedInt, randSeedShuffle } from "#app/utils";
+import { NumberHolder, isNullOrUndefined, randSeedInt, randSeedShuffle } from "#app/utils/common";
 import type PokemonSpecies from "#app/data/pokemon-species";
 import { allSpecies, getPokemonSpecies } from "#app/data/pokemon-species";
 import type { PokemonHeldItemModifier } from "#app/modifier/modifier";
 import { HiddenAbilityRateBoosterModifier, PokemonFormChangeItemModifier } from "#app/modifier/modifier";
 import { achvs } from "#app/system/achv";
-import { CustomPokemonData } from "#app/data/custom-pokemon-data";
 import { showEncounterText } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils";
 import type { PokemonHeldItemModifierType } from "#app/modifier/modifier-type";
 import { modifierTypes } from "#app/modifier/modifier-type";
 import i18next from "#app/plugins/i18n";
-import { doPokemonTransformationSequence, TransformationScreenPosition } from "#app/data/mystery-encounters/utils/encounter-transformation-sequence";
+import {
+  doPokemonTransformationSequence,
+  TransformationScreenPosition,
+} from "#app/data/mystery-encounters/utils/encounter-transformation-sequence";
 import { getLevelTotalExp } from "#app/data/exp";
 import { Stat } from "#enums/stat";
 import { Challenges } from "#enums/challenges";
@@ -33,7 +40,8 @@ import { TrainerType } from "#enums/trainer-type";
 import PokemonData from "#app/system/pokemon-data";
 import { Nature } from "#enums/nature";
 import type HeldModifierConfig from "#app/interfaces/held-modifier-config";
-import { trainerConfigs, TrainerPartyTemplate } from "#app/data/trainer-config";
+import { trainerConfigs } from "#app/data/trainers/trainer-config";
+import { TrainerPartyTemplate } from "#app/data/trainers/TrainerPartyTemplate";
 import { PartyMemberStrength } from "#enums/party-member-strength";
 
 /** i18n namespace for encounter */
@@ -104,230 +112,260 @@ const PERCENT_LEVEL_LOSS_ON_REFUSE = 10;
  * Value ranges of the resulting species BST transformations after adding values to original species
  * 2 Pokemon in the party use this range
  */
-const HIGH_BST_TRANSFORM_BASE_VALUES: [number, number] = [ 90, 110 ];
+const HIGH_BST_TRANSFORM_BASE_VALUES: [number, number] = [90, 110];
 /**
  * Value ranges of the resulting species BST transformations after adding values to original species
  * All remaining Pokemon in the party use this range
  */
-const STANDARD_BST_TRANSFORM_BASE_VALUES: [number, number] = [ 40, 50 ];
+const STANDARD_BST_TRANSFORM_BASE_VALUES: [number, number] = [40, 50];
 
 /**
  * Weird Dream encounter.
  * @see {@link https://github.com/pagefaultgames/pokerogue/issues/3822 | GitHub Issue #3822}
  * @see For biome requirements check {@linkcode mysteryEncountersByBiome}
  */
-export const WeirdDreamEncounter: MysteryEncounter =
-  MysteryEncounterBuilder.withEncounterType(MysteryEncounterType.WEIRD_DREAM)
-    .withEncounterTier(MysteryEncounterTier.ROGUE)
-    .withDisallowedChallenges(Challenges.SINGLE_TYPE, Challenges.SINGLE_GENERATION)
-    // TODO: should reset minimum wave to 10 when there are more Rogue tiers in pool. Matching Dark Deal minimum for now.
-    .withSceneWaveRangeRequirement(30, 140)
-    .withIntroSpriteConfigs([
-      {
-        spriteKey: "weird_dream_woman",
-        fileRoot: "mystery-encounters",
-        hasShadow: true,
-        y: 11,
-        yShadow: 6,
-        x: 4
-      },
-    ])
-    .withIntroDialogue([
-      {
-        text: `${namespace}:intro`,
-      },
-      {
-        speaker: `${namespace}:speaker`,
-        text: `${namespace}:intro_dialogue`,
-      },
-    ])
-    .setLocalizationKey(`${namespace}`)
-    .withTitle(`${namespace}:title`)
-    .withDescription(`${namespace}:description`)
-    .withQuery(`${namespace}:query`)
-    .withOnInit(() => {
-      globalScene.loadBgm("mystery_encounter_weird_dream", "mystery_encounter_weird_dream.mp3");
+export const WeirdDreamEncounter: MysteryEncounter = MysteryEncounterBuilder.withEncounterType(
+  MysteryEncounterType.WEIRD_DREAM,
+)
+  .withEncounterTier(MysteryEncounterTier.ROGUE)
+  .withDisallowedChallenges(Challenges.SINGLE_TYPE, Challenges.SINGLE_GENERATION)
+  // TODO: should reset minimum wave to 10 when there are more Rogue tiers in pool. Matching Dark Deal minimum for now.
+  .withSceneWaveRangeRequirement(30, 140)
+  .withIntroSpriteConfigs([
+    {
+      spriteKey: "weird_dream_woman",
+      fileRoot: "mystery-encounters",
+      hasShadow: true,
+      y: 11,
+      yShadow: 6,
+      x: 4,
+    },
+  ])
+  .withIntroDialogue([
+    {
+      text: `${namespace}:intro`,
+    },
+    {
+      speaker: `${namespace}:speaker`,
+      text: `${namespace}:intro_dialogue`,
+    },
+  ])
+  .setLocalizationKey(`${namespace}`)
+  .withTitle(`${namespace}:title`)
+  .withDescription(`${namespace}:description`)
+  .withQuery(`${namespace}:query`)
+  .withOnInit(() => {
+    globalScene.loadBgm("mystery_encounter_weird_dream", "mystery_encounter_weird_dream.mp3");
 
-      // Calculate all the newly transformed Pokemon and begin asset load
-      const teamTransformations = getTeamTransformations();
-      const loadAssets = teamTransformations.map(t => (t.newPokemon as PlayerPokemon).loadAssets());
-      globalScene.currentBattle.mysteryEncounter!.misc = {
-        teamTransformations,
-        loadAssets
+    // Calculate all the newly transformed Pokemon and begin asset load
+    const teamTransformations = getTeamTransformations();
+    const loadAssets = teamTransformations.map(t => (t.newPokemon as PlayerPokemon).loadAssets());
+    globalScene.currentBattle.mysteryEncounter!.misc = {
+      teamTransformations,
+      loadAssets,
+    };
+
+    return true;
+  })
+  .withOnVisualsStart(() => {
+    globalScene.fadeAndSwitchBgm("mystery_encounter_weird_dream");
+    return true;
+  })
+  .withOption(
+    MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DEFAULT)
+      .withHasDexProgress(true)
+      .withDialogue({
+        buttonLabel: `${namespace}:option.1.label`,
+        buttonTooltip: `${namespace}:option.1.tooltip`,
+        selected: [
+          {
+            text: `${namespace}:option.1.selected`,
+          },
+        ],
+      })
+      .withPreOptionPhase(async () => {
+        // Play the animation as the player goes through the dialogue
+        globalScene.time.delayedCall(1000, () => {
+          doShowDreamBackground();
+        });
+
+        for (const transformation of globalScene.currentBattle.mysteryEncounter!.misc.teamTransformations) {
+          globalScene.removePokemonFromPlayerParty(transformation.previousPokemon, false);
+          globalScene.getPlayerParty().push(transformation.newPokemon);
+        }
+      })
+      .withOptionPhase(async () => {
+        // Starts cutscene dialogue, but does not await so that cutscene plays as player goes through dialogue
+        const cutsceneDialoguePromise = showEncounterText(`${namespace}:option.1.cutscene`);
+
+        // Change the entire player's party
+        // Wait for all new Pokemon assets to be loaded before showing transformation animations
+        await Promise.all(globalScene.currentBattle.mysteryEncounter!.misc.loadAssets);
+        const transformations = globalScene.currentBattle.mysteryEncounter!.misc.teamTransformations;
+
+        // If there are 1-3 transformations, do them centered back to back
+        // Otherwise, the first 3 transformations are executed side-by-side, then any remaining 1-3 transformations occur in those same respective positions
+        if (transformations.length <= 3) {
+          for (const transformation of transformations) {
+            const pokemon1 = transformation.previousPokemon;
+            const pokemon2 = transformation.newPokemon;
+
+            await doPokemonTransformationSequence(pokemon1, pokemon2, TransformationScreenPosition.CENTER);
+          }
+        } else {
+          await doSideBySideTransformations(transformations);
+        }
+
+        // Make sure player has finished cutscene dialogue
+        await cutsceneDialoguePromise;
+
+        doHideDreamBackground();
+        await showEncounterText(`${namespace}:option.1.dream_complete`);
+
+        await doNewTeamPostProcess(transformations);
+        setEncounterRewards({
+          guaranteedModifierTypeFuncs: [
+            modifierTypes.MEMORY_MUSHROOM,
+            modifierTypes.ROGUE_BALL,
+            modifierTypes.MINT,
+            modifierTypes.MINT,
+            modifierTypes.MINT,
+          ],
+          fillRemaining: false,
+        });
+        leaveEncounterWithoutBattle(true);
+      })
+      .build(),
+  )
+  .withSimpleOption(
+    {
+      buttonLabel: `${namespace}:option.2.label`,
+      buttonTooltip: `${namespace}:option.2.tooltip`,
+      selected: [
+        {
+          text: `${namespace}:option.2.selected`,
+        },
+      ],
+    },
+    async () => {
+      // Battle your "future" team for some item rewards
+      const transformations: PokemonTransformation[] =
+        globalScene.currentBattle.mysteryEncounter!.misc.teamTransformations;
+
+      // Uses the pokemon that player's party would have transformed into
+      const enemyPokemonConfigs: EnemyPokemonConfig[] = [];
+      for (const transformation of transformations) {
+        const newPokemon = transformation.newPokemon;
+        const previousPokemon = transformation.previousPokemon;
+
+        await postProcessTransformedPokemon(previousPokemon, newPokemon, newPokemon.species.getRootSpeciesId(), true);
+
+        const dataSource = new PokemonData(newPokemon);
+        dataSource.player = false;
+
+        // Copy held items to new pokemon
+        const newPokemonHeldItemConfigs: HeldModifierConfig[] = [];
+        for (const item of transformation.heldItems) {
+          newPokemonHeldItemConfigs.push({
+            modifier: item.clone() as PokemonHeldItemModifier,
+            stackCount: item.getStackCount(),
+            isTransferable: false,
+          });
+        }
+        // Any pokemon that is below 570 BST gets +20 permanent BST to 3 stats
+        if (shouldGetOldGateau(newPokemon)) {
+          const stats = getOldGateauBoostedStats(newPokemon);
+          newPokemonHeldItemConfigs.push({
+            modifier: generateModifierType(modifierTypes.MYSTERY_ENCOUNTER_OLD_GATEAU, [
+              OLD_GATEAU_STATS_UP,
+              stats,
+            ]) as PokemonHeldItemModifierType,
+            stackCount: 1,
+            isTransferable: false,
+          });
+        }
+
+        const enemyConfig: EnemyPokemonConfig = {
+          species: transformation.newSpecies,
+          isBoss: newPokemon.getSpeciesForm().getBaseStatTotal() > NON_LEGENDARY_BST_THRESHOLD,
+          level: previousPokemon.level,
+          dataSource: dataSource,
+          modifierConfigs: newPokemonHeldItemConfigs,
+        };
+
+        enemyPokemonConfigs.push(enemyConfig);
+      }
+
+      const genderIndex = globalScene.gameData.gender ?? PlayerGender.UNSET;
+      const trainerConfig =
+        trainerConfigs[
+          genderIndex === PlayerGender.FEMALE ? TrainerType.FUTURE_SELF_F : TrainerType.FUTURE_SELF_M
+        ].clone();
+      trainerConfig.setPartyTemplates(new TrainerPartyTemplate(transformations.length, PartyMemberStrength.STRONG));
+      const enemyPartyConfig: EnemyPartyConfig = {
+        trainerConfig: trainerConfig,
+        pokemonConfigs: enemyPokemonConfigs,
+        female: genderIndex === PlayerGender.FEMALE,
       };
 
-      return true;
-    })
-    .withOnVisualsStart(() => {
-      globalScene.fadeAndSwitchBgm("mystery_encounter_weird_dream");
-      return true;
-    })
-    .withOption(
-      MysteryEncounterOptionBuilder
-        .newOptionWithMode(MysteryEncounterOptionMode.DEFAULT)
-        .withHasDexProgress(true)
-        .withDialogue({
-          buttonLabel: `${namespace}:option.1.label`,
-          buttonTooltip: `${namespace}:option.1.tooltip`,
-          selected: [
-            {
-              text: `${namespace}:option.1.selected`,
-            }
+      const onBeforeRewards = () => {
+        // Before battle rewards, unlock the passive on a pokemon in the player's team for the rest of the run (not permanently)
+        // One random pokemon will get its passive unlocked
+        const passiveDisabledPokemon = globalScene.getPlayerParty().filter(p => !p.passive);
+        if (passiveDisabledPokemon?.length > 0) {
+          const enablePassiveMon = passiveDisabledPokemon[randSeedInt(passiveDisabledPokemon.length)];
+          enablePassiveMon.passive = true;
+          enablePassiveMon.updateInfo(true);
+        }
+      };
+
+      setEncounterRewards(
+        {
+          guaranteedModifierTiers: [
+            ModifierTier.ROGUE,
+            ModifierTier.ROGUE,
+            ModifierTier.ULTRA,
+            ModifierTier.ULTRA,
+            ModifierTier.GREAT,
+            ModifierTier.GREAT,
           ],
-        })
-        .withPreOptionPhase(async () => {
-          // Play the animation as the player goes through the dialogue
-          globalScene.time.delayedCall(1000, () => {
-            doShowDreamBackground();
-          });
+          fillRemaining: false,
+        },
+        undefined,
+        onBeforeRewards,
+      );
 
-          for (const transformation of globalScene.currentBattle.mysteryEncounter!.misc.teamTransformations) {
-            globalScene.removePokemonFromPlayerParty(transformation.previousPokemon, false);
-            globalScene.getPlayerParty().push(transformation.newPokemon);
-          }
-        })
-        .withOptionPhase(async () => {
-          // Starts cutscene dialogue, but does not await so that cutscene plays as player goes through dialogue
-          const cutsceneDialoguePromise = showEncounterText(`${namespace}:option.1.cutscene`);
+      await showEncounterText(`${namespace}:option.2.selected_2`, null, undefined, true);
+      await initBattleWithEnemyConfig(enemyPartyConfig);
+    },
+  )
+  .withSimpleOption(
+    {
+      buttonLabel: `${namespace}:option.3.label`,
+      buttonTooltip: `${namespace}:option.3.tooltip`,
+      selected: [
+        {
+          text: `${namespace}:option.3.selected`,
+        },
+      ],
+    },
+    async () => {
+      // Leave, reduce party levels by 10%
+      for (const pokemon of globalScene.getPlayerParty()) {
+        pokemon.level = Math.max(Math.ceil(((100 - PERCENT_LEVEL_LOSS_ON_REFUSE) / 100) * pokemon.level), 1);
+        pokemon.exp = getLevelTotalExp(pokemon.level, pokemon.species.growthRate);
+        pokemon.levelExp = 0;
 
-          // Change the entire player's party
-          // Wait for all new Pokemon assets to be loaded before showing transformation animations
-          await Promise.all(globalScene.currentBattle.mysteryEncounter!.misc.loadAssets);
-          const transformations = globalScene.currentBattle.mysteryEncounter!.misc.teamTransformations;
-
-          // If there are 1-3 transformations, do them centered back to back
-          // Otherwise, the first 3 transformations are executed side-by-side, then any remaining 1-3 transformations occur in those same respective positions
-          if (transformations.length <= 3) {
-            for (const transformation of transformations) {
-              const pokemon1 = transformation.previousPokemon;
-              const pokemon2 = transformation.newPokemon;
-
-              await doPokemonTransformationSequence(pokemon1, pokemon2, TransformationScreenPosition.CENTER);
-            }
-          } else {
-            await doSideBySideTransformations(transformations);
-          }
-
-          // Make sure player has finished cutscene dialogue
-          await cutsceneDialoguePromise;
-
-          doHideDreamBackground();
-          await showEncounterText(`${namespace}:option.1.dream_complete`);
-
-          await doNewTeamPostProcess(transformations);
-          setEncounterRewards({ guaranteedModifierTypeFuncs: [ modifierTypes.MEMORY_MUSHROOM, modifierTypes.ROGUE_BALL, modifierTypes.MINT, modifierTypes.MINT, modifierTypes.MINT ], fillRemaining: false });
-          leaveEncounterWithoutBattle(true);
-        })
-        .build()
-    )
-    .withSimpleOption(
-      {
-        buttonLabel: `${namespace}:option.2.label`,
-        buttonTooltip: `${namespace}:option.2.tooltip`,
-        selected: [
-          {
-            text: `${namespace}:option.2.selected`,
-          },
-        ],
-      },
-      async () => {
-        // Battle your "future" team for some item rewards
-        const transformations: PokemonTransformation[] = globalScene.currentBattle.mysteryEncounter!.misc.teamTransformations;
-
-        // Uses the pokemon that player's party would have transformed into
-        const enemyPokemonConfigs: EnemyPokemonConfig[] = [];
-        for (const transformation of transformations) {
-          const newPokemon = transformation.newPokemon;
-          const previousPokemon = transformation.previousPokemon;
-
-          await postProcessTransformedPokemon(previousPokemon, newPokemon, newPokemon.species.getRootSpeciesId(), true);
-
-          const dataSource = new PokemonData(newPokemon);
-          dataSource.player = false;
-
-          // Copy held items to new pokemon
-          const newPokemonHeldItemConfigs: HeldModifierConfig[] = [];
-          for (const item of transformation.heldItems) {
-            newPokemonHeldItemConfigs.push({
-              modifier: item.clone() as PokemonHeldItemModifier,
-              stackCount: item.getStackCount(),
-              isTransferable: false
-            });
-          }
-          // Any pokemon that is below 570 BST gets +20 permanent BST to 3 stats
-          if (shouldGetOldGateau(newPokemon)) {
-            const stats = getOldGateauBoostedStats(newPokemon);
-            newPokemonHeldItemConfigs.push({
-              modifier: generateModifierType(modifierTypes.MYSTERY_ENCOUNTER_OLD_GATEAU, [ OLD_GATEAU_STATS_UP, stats ]) as PokemonHeldItemModifierType,
-              stackCount: 1,
-              isTransferable: false
-            });
-          }
-
-          const enemyConfig: EnemyPokemonConfig = {
-            species: transformation.newSpecies,
-            isBoss: newPokemon.getSpeciesForm().getBaseStatTotal() > NON_LEGENDARY_BST_THRESHOLD,
-            level: previousPokemon.level,
-            dataSource: dataSource,
-            modifierConfigs: newPokemonHeldItemConfigs
-          };
-
-          enemyPokemonConfigs.push(enemyConfig);
-        }
-
-        const genderIndex = globalScene.gameData.gender ?? PlayerGender.UNSET;
-        const trainerConfig = trainerConfigs[genderIndex === PlayerGender.FEMALE ? TrainerType.FUTURE_SELF_F : TrainerType.FUTURE_SELF_M].clone();
-        trainerConfig.setPartyTemplates(new TrainerPartyTemplate(transformations.length, PartyMemberStrength.STRONG));
-        const enemyPartyConfig: EnemyPartyConfig = {
-          trainerConfig: trainerConfig,
-          pokemonConfigs: enemyPokemonConfigs,
-          female: genderIndex === PlayerGender.FEMALE
-        };
-
-        const onBeforeRewards = () => {
-          // Before battle rewards, unlock the passive on a pokemon in the player's team for the rest of the run (not permanently)
-          // One random pokemon will get its passive unlocked
-          const passiveDisabledPokemon = globalScene.getPlayerParty().filter(p => !p.passive);
-          if (passiveDisabledPokemon?.length > 0) {
-            const enablePassiveMon = passiveDisabledPokemon[randSeedInt(passiveDisabledPokemon.length)];
-            enablePassiveMon.passive = true;
-            enablePassiveMon.updateInfo(true);
-          }
-        };
-
-        setEncounterRewards({ guaranteedModifierTiers: [ ModifierTier.ROGUE, ModifierTier.ROGUE, ModifierTier.ULTRA, ModifierTier.ULTRA, ModifierTier.GREAT, ModifierTier.GREAT ], fillRemaining: false }, undefined, onBeforeRewards);
-
-        await showEncounterText(`${namespace}:option.2.selected_2`, null, undefined, true);
-        await initBattleWithEnemyConfig(enemyPartyConfig);
+        pokemon.calculateStats();
+        pokemon.getBattleInfo().setLevel(pokemon.level);
+        await pokemon.updateInfo();
       }
-    )
-    .withSimpleOption(
-      {
-        buttonLabel: `${namespace}:option.3.label`,
-        buttonTooltip: `${namespace}:option.3.tooltip`,
-        selected: [
-          {
-            text: `${namespace}:option.3.selected`,
-          },
-        ],
-      },
-      async () => {
-        // Leave, reduce party levels by 10%
-        for (const pokemon of globalScene.getPlayerParty()) {
-          pokemon.level = Math.max(Math.ceil((100 - PERCENT_LEVEL_LOSS_ON_REFUSE) / 100 * pokemon.level), 1);
-          pokemon.exp = getLevelTotalExp(pokemon.level, pokemon.species.growthRate);
-          pokemon.levelExp = 0;
 
-          pokemon.calculateStats();
-          pokemon.getBattleInfo().setLevel(pokemon.level);
-          await pokemon.updateInfo();
-        }
-
-        leaveEncounterWithoutBattle(true);
-        return true;
-      }
-    )
-    .build();
+      leaveEncounterWithoutBattle(true);
+      return true;
+    },
+  )
+  .build();
 
 interface PokemonTransformation {
   previousPokemon: PlayerPokemon;
@@ -342,7 +380,7 @@ function getTeamTransformations(): PokemonTransformation[] {
   const alreadyUsedSpecies: PokemonSpecies[] = party.map(p => p.species);
   const pokemonTransformations: PokemonTransformation[] = party.map(p => {
     return {
-      previousPokemon: p
+      previousPokemon: p,
     } as PokemonTransformation;
   });
 
@@ -358,7 +396,9 @@ function getTeamTransformations(): PokemonTransformation[] {
   for (let i = 0; i < numPokemon; i++) {
     const removed = removedPokemon[i];
     const index = pokemonTransformations.findIndex(p => p.previousPokemon.id === removed.id);
-    pokemonTransformations[index].heldItems = removed.getHeldItems().filter(m => !(m instanceof PokemonFormChangeItemModifier));
+    pokemonTransformations[index].heldItems = removed
+      .getHeldItems()
+      .filter(m => !(m instanceof PokemonFormChangeItemModifier));
 
     const bst = removed.getSpeciesForm().getBaseStatTotal();
     let newBstRange: [number, number];
@@ -368,7 +408,13 @@ function getTeamTransformations(): PokemonTransformation[] {
       newBstRange = STANDARD_BST_TRANSFORM_BASE_VALUES;
     }
 
-    const newSpecies = getTransformedSpecies(bst, newBstRange, hasPokemonInSuperLegendaryBstThreshold, hasPokemonInLegendaryBstThreshold, alreadyUsedSpecies);
+    const newSpecies = getTransformedSpecies(
+      bst,
+      newBstRange,
+      hasPokemonInSuperLegendaryBstThreshold,
+      hasPokemonInLegendaryBstThreshold,
+      alreadyUsedSpecies,
+    );
 
     const newSpeciesBst = newSpecies.getBaseStatTotal();
     if (newSpeciesBst > SUPER_LEGENDARY_BST_THRESHOLD) {
@@ -378,7 +424,6 @@ function getTeamTransformations(): PokemonTransformation[] {
       hasPokemonInLegendaryBstThreshold = true;
     }
 
-
     pokemonTransformations[index].newSpecies = newSpecies;
     console.log("New species: " + JSON.stringify(newSpecies));
     alreadyUsedSpecies.push(newSpecies);
@@ -386,7 +431,12 @@ function getTeamTransformations(): PokemonTransformation[] {
 
   for (const transformation of pokemonTransformations) {
     const newAbilityIndex = randSeedInt(transformation.newSpecies.getAbilityCount());
-    transformation.newPokemon = globalScene.addPlayerPokemon(transformation.newSpecies, transformation.previousPokemon.level, newAbilityIndex, undefined);
+    transformation.newPokemon = globalScene.addPlayerPokemon(
+      transformation.newSpecies,
+      transformation.previousPokemon.level,
+      newAbilityIndex,
+      undefined,
+    );
   }
 
   return pokemonTransformations;
@@ -406,17 +456,18 @@ async function doNewTeamPostProcess(transformations: PokemonTransformation[]) {
     // Copy old items to new pokemon
     for (const item of transformation.heldItems) {
       item.pokemonId = newPokemon.id;
-      await globalScene.addModifier(item, false, false, false, true);
+      globalScene.addModifier(item, false, false, false, true);
     }
     // Any pokemon that is below 570 BST gets +20 permanent BST to 3 stats
     if (shouldGetOldGateau(newPokemon)) {
       const stats = getOldGateauBoostedStats(newPokemon);
-      const modType = modifierTypes.MYSTERY_ENCOUNTER_OLD_GATEAU()
-        .generateType(globalScene.getPlayerParty(), [ OLD_GATEAU_STATS_UP, stats ])
+      const modType = modifierTypes
+        .MYSTERY_ENCOUNTER_OLD_GATEAU()
+        .generateType(globalScene.getPlayerParty(), [OLD_GATEAU_STATS_UP, stats])
         ?.withIdFromFunc(modifierTypes.MYSTERY_ENCOUNTER_OLD_GATEAU);
       const modifier = modType?.newModifier(newPokemon);
       if (modifier) {
-        await globalScene.addModifier(modifier, false, false, false, true);
+        globalScene.addModifier(modifier, false, false, false, true);
       }
     }
 
@@ -446,13 +497,18 @@ async function doNewTeamPostProcess(transformations: PokemonTransformation[]) {
  * @param speciesRootForm
  * @param forBattle Default `false`. If false, will perform achievements and dex unlocks for the player.
  */
-async function postProcessTransformedPokemon(previousPokemon: PlayerPokemon, newPokemon: PlayerPokemon, speciesRootForm: Species, forBattle: boolean = false): Promise<boolean> {
+async function postProcessTransformedPokemon(
+  previousPokemon: PlayerPokemon,
+  newPokemon: PlayerPokemon,
+  speciesRootForm: Species,
+  forBattle = false,
+): Promise<boolean> {
   let isNewStarter = false;
   // Roll HA a second time
   if (newPokemon.species.abilityHidden) {
     const hiddenIndex = newPokemon.species.ability2 ? 2 : 1;
     if (newPokemon.abilityIndex < hiddenIndex) {
-      const hiddenAbilityChance = new IntegerHolder(256);
+      const hiddenAbilityChance = new NumberHolder(256);
       globalScene.applyModifiers(HiddenAbilityRateBoosterModifier, true, hiddenAbilityChance);
 
       const hasHiddenAbility = !randSeedInt(hiddenAbilityChance.value);
@@ -470,11 +526,17 @@ async function postProcessTransformedPokemon(previousPokemon: PlayerPokemon, new
   });
 
   // Roll a neutral nature
-  newPokemon.nature = [ Nature.HARDY, Nature.DOCILE, Nature.BASHFUL, Nature.QUIRKY, Nature.SERIOUS ][randSeedInt(5)];
+  newPokemon.nature = [Nature.HARDY, Nature.DOCILE, Nature.BASHFUL, Nature.QUIRKY, Nature.SERIOUS][randSeedInt(5)];
 
   // For pokemon at/below 570 BST or any shiny pokemon, unlock it permanently as if you had caught it
-  if (!forBattle && (newPokemon.getSpeciesForm().getBaseStatTotal() <= NON_LEGENDARY_BST_THRESHOLD || newPokemon.isShiny())) {
-    if (newPokemon.getSpeciesForm().abilityHidden && newPokemon.abilityIndex === newPokemon.getSpeciesForm().getAbilityCount() - 1) {
+  if (
+    !forBattle &&
+    (newPokemon.getSpeciesForm().getBaseStatTotal() <= NON_LEGENDARY_BST_THRESHOLD || newPokemon.isShiny())
+  ) {
+    if (
+      newPokemon.getSpeciesForm().abilityHidden &&
+      newPokemon.abilityIndex === newPokemon.getSpeciesForm().getAbilityCount() - 1
+    ) {
       globalScene.validateAchv(achvs.HIDDEN_ABILITY);
     }
 
@@ -494,7 +556,11 @@ async function postProcessTransformedPokemon(previousPokemon: PlayerPokemon, new
     const newStarterUnlocked = await globalScene.gameData.setPokemonCaught(newPokemon, true, false, false);
     if (newStarterUnlocked) {
       isNewStarter = true;
-      await showEncounterText(i18next.t("battle:addedAsAStarter", { pokemonName: getPokemonSpecies(speciesRootForm).getName() }));
+      await showEncounterText(
+        i18next.t("battle:addedAsAStarter", {
+          pokemonName: getPokemonSpecies(speciesRootForm).getName(),
+        }),
+      );
     }
   }
 
@@ -528,15 +594,12 @@ async function postProcessTransformedPokemon(previousPokemon: PlayerPokemon, new
 
   // Randomize the second type of the pokemon
   // If the pokemon does not normally have a second type, it will gain 1
-  const newTypes = [ Type.UNKNOWN ];
-  let newType = randSeedInt(18) as Type;
+  const newTypes = [PokemonType.UNKNOWN];
+  let newType = randSeedInt(18) as PokemonType;
   while (newType === newTypes[0]) {
-    newType = randSeedInt(18) as Type;
+    newType = randSeedInt(18) as PokemonType;
   }
   newTypes.push(newType);
-  if (!newPokemon.customPokemonData) {
-    newPokemon.customPokemonData = new CustomPokemonData();
-  }
   newPokemon.customPokemonData.types = newTypes;
 
   // Enable passive if previous had it
@@ -568,23 +631,30 @@ function getOldGateauBoostedStats(pokemon: Pokemon): Stat[] {
   return stats;
 }
 
-
-function getTransformedSpecies(originalBst: number, bstSearchRange: [number, number], hasPokemonBstHigherThan600: boolean, hasPokemonBstBetween570And600: boolean, alreadyUsedSpecies: PokemonSpecies[]): PokemonSpecies {
+function getTransformedSpecies(
+  originalBst: number,
+  bstSearchRange: [number, number],
+  hasPokemonBstHigherThan600: boolean,
+  hasPokemonBstBetween570And600: boolean,
+  alreadyUsedSpecies: PokemonSpecies[],
+): PokemonSpecies {
   let newSpecies: PokemonSpecies | undefined;
   while (isNullOrUndefined(newSpecies)) {
     const bstCap = originalBst + bstSearchRange[1];
     const bstMin = Math.max(originalBst + bstSearchRange[0], 0);
 
     // Get any/all species that fall within the Bst range requirements
-    let validSpecies = allSpecies
-      .filter(s => {
-        const speciesBst = s.getBaseStatTotal();
-        const bstInRange = speciesBst >= bstMin && speciesBst <= bstCap;
-        // Checks that a Pokemon has not already been added in the +600 or 570-600 slots;
-        const validBst = (!hasPokemonBstBetween570And600 || (speciesBst < NON_LEGENDARY_BST_THRESHOLD || speciesBst > SUPER_LEGENDARY_BST_THRESHOLD)) &&
-          (!hasPokemonBstHigherThan600 || speciesBst <= SUPER_LEGENDARY_BST_THRESHOLD);
-        return bstInRange && validBst && !EXCLUDED_TRANSFORMATION_SPECIES.includes(s.speciesId);
-      });
+    let validSpecies = allSpecies.filter(s => {
+      const speciesBst = s.getBaseStatTotal();
+      const bstInRange = speciesBst >= bstMin && speciesBst <= bstCap;
+      // Checks that a Pokemon has not already been added in the +600 or 570-600 slots;
+      const validBst =
+        (!hasPokemonBstBetween570And600 ||
+          speciesBst < NON_LEGENDARY_BST_THRESHOLD ||
+          speciesBst > SUPER_LEGENDARY_BST_THRESHOLD) &&
+        (!hasPokemonBstHigherThan600 || speciesBst <= SUPER_LEGENDARY_BST_THRESHOLD);
+      return bstInRange && validBst && !EXCLUDED_TRANSFORMATION_SPECIES.includes(s.speciesId);
+    });
 
     // There must be at least 20 species available before it will choose one
     if (validSpecies?.length > 20) {
@@ -608,7 +678,13 @@ function doShowDreamBackground() {
   transformationContainer.name = "Dream Background";
 
   // In case it takes a bit for video to load
-  const transformationStaticBg = globalScene.add.rectangle(0, 0, globalScene.game.canvas.width / 6, globalScene.game.canvas.height / 6, 0);
+  const transformationStaticBg = globalScene.add.rectangle(
+    0,
+    0,
+    globalScene.game.canvas.width / 6,
+    globalScene.game.canvas.height / 6,
+    0,
+  );
   transformationStaticBg.setName("Black Background");
   transformationStaticBg.setOrigin(0, 0);
   transformationContainer.add(transformationStaticBg);
@@ -631,7 +707,7 @@ function doShowDreamBackground() {
     targets: transformationContainer,
     alpha: 1,
     duration: 3000,
-    ease: "Sine.easeInOut"
+    ease: "Sine.easeInOut",
   });
 }
 
@@ -645,7 +721,7 @@ function doHideDreamBackground() {
     ease: "Sine.easeInOut",
     onComplete: () => {
       globalScene.fieldUI.remove(transformationContainer, true);
-    }
+    },
   });
 }
 
@@ -660,16 +736,15 @@ function doSideBySideTransformations(transformations: PokemonTransformation[]) {
         const pokemon2 = transformation.newPokemon;
         const screenPosition = i as TransformationScreenPosition;
 
-        const transformationPromise = doPokemonTransformationSequence(pokemon1, pokemon2, screenPosition)
-          .then(() => {
-            if (transformations.length > i + 3) {
-              const nextTransformationAtPosition = transformations[i + 3];
-              const nextPokemon1 = nextTransformationAtPosition.previousPokemon;
-              const nextPokemon2 = nextTransformationAtPosition.newPokemon;
+        const transformationPromise = doPokemonTransformationSequence(pokemon1, pokemon2, screenPosition).then(() => {
+          if (transformations.length > i + 3) {
+            const nextTransformationAtPosition = transformations[i + 3];
+            const nextPokemon1 = nextTransformationAtPosition.previousPokemon;
+            const nextPokemon2 = nextTransformationAtPosition.newPokemon;
 
-              allTransformationPromises.push(doPokemonTransformationSequence(nextPokemon1, nextPokemon2, screenPosition));
-            }
-          });
+            allTransformationPromises.push(doPokemonTransformationSequence(nextPokemon1, nextPokemon2, screenPosition));
+          }
+        });
         allTransformationPromises.push(transformationPromise);
       });
     }
@@ -691,15 +766,19 @@ function doSideBySideTransformations(transformations: PokemonTransformation[]) {
  * @param newPokemon
  * @param speciesRootForm
  */
-async function addEggMoveToNewPokemonMoveset(newPokemon: PlayerPokemon, speciesRootForm: Species, forBattle: boolean = false): Promise<number | null> {
+async function addEggMoveToNewPokemonMoveset(
+  newPokemon: PlayerPokemon,
+  speciesRootForm: Species,
+  forBattle = false,
+): Promise<number | null> {
   let eggMoveIndex: null | number = null;
   const eggMoves = newPokemon.getEggMoves()?.slice(0);
   if (eggMoves) {
-    const eggMoveIndices = randSeedShuffle([ 0, 1, 2, 3 ]);
+    const eggMoveIndices = randSeedShuffle([0, 1, 2, 3]);
     let randomEggMoveIndex = eggMoveIndices.pop();
     let randomEggMove = !isNullOrUndefined(randomEggMoveIndex) ? eggMoves[randomEggMoveIndex] : null;
     let retries = 0;
-    while (retries < 3 && (!randomEggMove || newPokemon.moveset.some(m => m?.moveId === randomEggMove))) {
+    while (retries < 3 && (!randomEggMove || newPokemon.moveset.some(m => m.moveId === randomEggMove))) {
       // If Pokemon already knows this move, roll for another egg move
       randomEggMoveIndex = eggMoveIndices.pop();
       randomEggMove = !isNullOrUndefined(randomEggMoveIndex) ? eggMoves[randomEggMoveIndex] : null;
@@ -707,7 +786,7 @@ async function addEggMoveToNewPokemonMoveset(newPokemon: PlayerPokemon, speciesR
     }
 
     if (randomEggMove) {
-      if (!newPokemon.moveset.some(m => m?.moveId === randomEggMove)) {
+      if (!newPokemon.moveset.some(m => m.moveId === randomEggMove)) {
         if (newPokemon.moveset.length < 4) {
           newPokemon.moveset.push(new PokemonMove(randomEggMove));
         } else {
@@ -717,7 +796,11 @@ async function addEggMoveToNewPokemonMoveset(newPokemon: PlayerPokemon, speciesR
       }
 
       // For pokemon that the player owns (including ones just caught), unlock the egg move
-      if (!forBattle && !isNullOrUndefined(randomEggMoveIndex) && !!globalScene.gameData.dexData[speciesRootForm].caughtAttr) {
+      if (
+        !forBattle &&
+        !isNullOrUndefined(randomEggMoveIndex) &&
+        !!globalScene.gameData.dexData[speciesRootForm].caughtAttr
+      ) {
         await globalScene.gameData.setEggMoveUnlocked(getPokemonSpecies(speciesRootForm), randomEggMoveIndex, true);
       }
     }
@@ -732,11 +815,15 @@ async function addEggMoveToNewPokemonMoveset(newPokemon: PlayerPokemon, speciesR
  * @param newPokemonGeneratedMoveset
  * @param newEggMoveIndex
  */
-function addFavoredMoveToNewPokemonMoveset(newPokemon: PlayerPokemon, newPokemonGeneratedMoveset: (PokemonMove | null)[], newEggMoveIndex: number | null) {
+function addFavoredMoveToNewPokemonMoveset(
+  newPokemon: PlayerPokemon,
+  newPokemonGeneratedMoveset: PokemonMove[],
+  newEggMoveIndex: number | null,
+) {
   let favoredMove: PokemonMove | null = null;
   for (const move of newPokemonGeneratedMoveset) {
     // Needs to match first type, second type will be replaced
-    if (move?.getMove().type === newPokemon.getTypes()[0] && !newPokemon.moveset.some(m => m?.moveId === move?.moveId)) {
+    if (move?.getMove().type === newPokemon.getTypes()[0] && !newPokemon.moveset.some(m => m.moveId === move.moveId)) {
       favoredMove = move;
       break;
     }
@@ -746,7 +833,7 @@ function addFavoredMoveToNewPokemonMoveset(newPokemon: PlayerPokemon, newPokemon
   if (!favoredMove) {
     for (const move of newPokemonGeneratedMoveset) {
       // Needs to match first type, second type will be replaced
-      if (!newPokemon.moveset.some(m => m?.moveId === move?.moveId)) {
+      if (!newPokemon.moveset.some(m => m.moveId === move.moveId)) {
         favoredMove = move;
         break;
       }
diff --git a/src/data/mystery-encounters/mystery-encounter-dialogue.ts b/src/data/mystery-encounters/mystery-encounter-dialogue.ts
index 39db3d58690..71e1b382f61 100644
--- a/src/data/mystery-encounters/mystery-encounter-dialogue.ts
+++ b/src/data/mystery-encounters/mystery-encounter-dialogue.ts
@@ -72,4 +72,3 @@ export default class MysteryEncounterDialogue {
   encounterOptionsDialogue?: EncounterOptionsDialogue;
   outro?: TextDisplay[];
 }
-
diff --git a/src/data/mystery-encounters/mystery-encounter-option.ts b/src/data/mystery-encounters/mystery-encounter-option.ts
index d0078b3686e..57dd50fa972 100644
--- a/src/data/mystery-encounters/mystery-encounter-option.ts
+++ b/src/data/mystery-encounters/mystery-encounter-option.ts
@@ -3,14 +3,19 @@ import type { Moves } from "#app/enums/moves";
 import type { PlayerPokemon } from "#app/field/pokemon";
 import type Pokemon from "#app/field/pokemon";
 import { globalScene } from "#app/global-scene";
-import type { Type } from "#enums/type";
-import { EncounterPokemonRequirement, EncounterSceneRequirement, MoneyRequirement, TypeRequirement } from "#app/data/mystery-encounters/mystery-encounter-requirements";
+import type { PokemonType } from "#enums/pokemon-type";
+import {
+  EncounterPokemonRequirement,
+  EncounterSceneRequirement,
+  MoneyRequirement,
+  TypeRequirement,
+} from "#app/data/mystery-encounters/mystery-encounter-requirements";
 import type { CanLearnMoveRequirementOptions } from "./requirements/can-learn-move-requirement";
 import { CanLearnMoveRequirement } from "./requirements/can-learn-move-requirement";
-import { isNullOrUndefined, randSeedInt } from "#app/utils";
+import { isNullOrUndefined, randSeedInt } from "#app/utils/common";
 import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
 
-
+// biome-ignore lint/suspicious/noConfusingVoidType: void unions in callbacks are OK
 export type OptionPhaseCallback = () => Promise<void | boolean>;
 
 /**
@@ -71,16 +76,22 @@ export default class MysteryEncounterOption implements IMysteryEncounterOption {
    * Returns true if option contains any {@linkcode EncounterRequirement}s, false otherwise.
    */
   hasRequirements(): boolean {
-    return this.requirements.length > 0 || this.primaryPokemonRequirements.length > 0 || this.secondaryPokemonRequirements.length > 0;
+    return (
+      this.requirements.length > 0 ||
+      this.primaryPokemonRequirements.length > 0 ||
+      this.secondaryPokemonRequirements.length > 0
+    );
   }
 
   /**
    * Returns true if all {@linkcode EncounterRequirement}s for the option are met
    */
   meetsRequirements(): boolean {
-    return !this.requirements.some(requirement => !requirement.meetsRequirement())
-      && this.meetsSupportingRequirementAndSupportingPokemonSelected()
-      && this.meetsPrimaryRequirementAndPrimaryPokemonSelected();
+    return (
+      !this.requirements.some(requirement => !requirement.meetsRequirement()) &&
+      this.meetsSupportingRequirementAndSupportingPokemonSelected() &&
+      this.meetsPrimaryRequirementAndPrimaryPokemonSelected()
+    );
   }
 
   /**
@@ -88,7 +99,13 @@ export default class MysteryEncounterOption implements IMysteryEncounterOption {
    * @param pokemon
    */
   pokemonMeetsPrimaryRequirements(pokemon: Pokemon): boolean {
-    return !this.primaryPokemonRequirements.some(req => !req.queryParty(globalScene.getPlayerParty()).map(p => p.id).includes(pokemon.id));
+    return !this.primaryPokemonRequirements.some(
+      req =>
+        !req
+          .queryParty(globalScene.getPlayerParty())
+          .map(p => p.id)
+          .includes(pokemon.id),
+    );
   }
 
   /**
@@ -125,27 +142,26 @@ export default class MysteryEncounterOption implements IMysteryEncounterOption {
         } else {
           overlap.push(qp);
         }
-
       }
       if (truePrimaryPool.length > 0) {
         // always choose from the non-overlapping pokemon first
         this.primaryPokemon = truePrimaryPool[randSeedInt(truePrimaryPool.length)];
         return true;
-      } else {
-        // if there are multiple overlapping pokemon, we're okay - just choose one and take it out of the supporting pokemon pool
-        if (overlap.length > 1 || (this.secondaryPokemon.length - overlap.length >= 1)) {
-          this.primaryPokemon = overlap[randSeedInt(overlap.length)];
-          this.secondaryPokemon = this.secondaryPokemon.filter((supp) => supp !== this.primaryPokemon);
-          return true;
-        }
-        console.log("Mystery Encounter Edge Case: Requirement not met due to primay pokemon overlapping with support pokemon. There's no valid primary pokemon left.");
-        return false;
       }
-    } else {
-      // Just pick the first qualifying Pokemon
-      this.primaryPokemon = qualified[0];
-      return true;
+      // if there are multiple overlapping pokemon, we're okay - just choose one and take it out of the supporting pokemon pool
+      if (overlap.length > 1 || this.secondaryPokemon.length - overlap.length >= 1) {
+        this.primaryPokemon = overlap[randSeedInt(overlap.length)];
+        this.secondaryPokemon = this.secondaryPokemon.filter(supp => supp !== this.primaryPokemon);
+        return true;
+      }
+      console.log(
+        "Mystery Encounter Edge Case: Requirement not met due to primay pokemon overlapping with support pokemon. There's no valid primary pokemon left.",
+      );
+      return false;
     }
+    // Just pick the first qualifying Pokemon
+    this.primaryPokemon = qualified[0];
+    return true;
   }
 
   /**
@@ -180,12 +196,14 @@ export class MysteryEncounterOptionBuilder implements Partial<IMysteryEncounterO
   requirements: EncounterSceneRequirement[] = [];
   primaryPokemonRequirements: EncounterPokemonRequirement[] = [];
   secondaryPokemonRequirements: EncounterPokemonRequirement[] = [];
-  excludePrimaryFromSecondaryRequirements: boolean = false;
-  isDisabledOnRequirementsNotMet: boolean = true;
-  hasDexProgress: boolean = false;
+  excludePrimaryFromSecondaryRequirements = false;
+  isDisabledOnRequirementsNotMet = true;
+  hasDexProgress = false;
   dialogue?: OptionTextDisplay;
 
-  static newOptionWithMode(optionMode: MysteryEncounterOptionMode): MysteryEncounterOptionBuilder & Pick<IMysteryEncounterOption, "optionMode"> {
+  static newOptionWithMode(
+    optionMode: MysteryEncounterOptionMode,
+  ): MysteryEncounterOptionBuilder & Pick<IMysteryEncounterOption, "optionMode"> {
     return Object.assign(new MysteryEncounterOptionBuilder(), { optionMode });
   }
 
@@ -197,7 +215,9 @@ export class MysteryEncounterOptionBuilder implements Partial<IMysteryEncounterO
    * Adds a {@linkcode EncounterSceneRequirement} to {@linkcode requirements}
    * @param requirement
    */
-  withSceneRequirement(requirement: EncounterSceneRequirement): this & Required<Pick<IMysteryEncounterOption, "requirements">> {
+  withSceneRequirement(
+    requirement: EncounterSceneRequirement,
+  ): this & Required<Pick<IMysteryEncounterOption, "requirements">> {
     if (requirement instanceof EncounterPokemonRequirement) {
       Error("Incorrectly added pokemon requirement as scene requirement.");
     }
@@ -216,7 +236,9 @@ export class MysteryEncounterOptionBuilder implements Partial<IMysteryEncounterO
    * If there are scenarios where the Encounter should NOT continue, should return boolean instead of void.
    * @param onPreOptionPhase
    */
-  withPreOptionPhase(onPreOptionPhase: OptionPhaseCallback): this & Required<Pick<IMysteryEncounterOption, "onPreOptionPhase">> {
+  withPreOptionPhase(
+    onPreOptionPhase: OptionPhaseCallback,
+  ): this & Required<Pick<IMysteryEncounterOption, "onPreOptionPhase">> {
     return Object.assign(this, { onPreOptionPhase: onPreOptionPhase });
   }
 
@@ -228,7 +250,9 @@ export class MysteryEncounterOptionBuilder implements Partial<IMysteryEncounterO
     return Object.assign(this, { onOptionPhase: onOptionPhase });
   }
 
-  withPostOptionPhase(onPostOptionPhase: OptionPhaseCallback): this & Required<Pick<IMysteryEncounterOption, "onPostOptionPhase">> {
+  withPostOptionPhase(
+    onPostOptionPhase: OptionPhaseCallback,
+  ): this & Required<Pick<IMysteryEncounterOption, "onPostOptionPhase">> {
     return Object.assign(this, { onPostOptionPhase: onPostOptionPhase });
   }
 
@@ -236,13 +260,17 @@ export class MysteryEncounterOptionBuilder implements Partial<IMysteryEncounterO
    * Adds a {@linkcode EncounterPokemonRequirement} to {@linkcode primaryPokemonRequirements}
    * @param requirement
    */
-  withPrimaryPokemonRequirement(requirement: EncounterPokemonRequirement): this & Required<Pick<IMysteryEncounterOption, "primaryPokemonRequirements">> {
+  withPrimaryPokemonRequirement(
+    requirement: EncounterPokemonRequirement,
+  ): this & Required<Pick<IMysteryEncounterOption, "primaryPokemonRequirements">> {
     if (requirement instanceof EncounterSceneRequirement) {
       Error("Incorrectly added scene requirement as pokemon requirement.");
     }
 
     this.primaryPokemonRequirements.push(requirement);
-    return Object.assign(this, { primaryPokemonRequirements: this.primaryPokemonRequirements });
+    return Object.assign(this, {
+      primaryPokemonRequirements: this.primaryPokemonRequirements,
+    });
   }
 
   /**
@@ -254,8 +282,15 @@ export class MysteryEncounterOptionBuilder implements Partial<IMysteryEncounterO
    * @param invertQuery
    * @returns
    */
-  withPokemonTypeRequirement(type: Type | Type[], excludeFainted?: boolean, minNumberOfPokemon?: number, invertQuery?: boolean) {
-    return this.withPrimaryPokemonRequirement(new TypeRequirement(type, excludeFainted, minNumberOfPokemon, invertQuery));
+  withPokemonTypeRequirement(
+    type: PokemonType | PokemonType[],
+    excludeFainted?: boolean,
+    minNumberOfPokemon?: number,
+    invertQuery?: boolean,
+  ) {
+    return this.withPrimaryPokemonRequirement(
+      new TypeRequirement(type, excludeFainted, minNumberOfPokemon, invertQuery),
+    );
   }
 
   /**
@@ -274,14 +309,19 @@ export class MysteryEncounterOptionBuilder implements Partial<IMysteryEncounterO
    * @param requirement
    * @param excludePrimaryFromSecondaryRequirements
    */
-  withSecondaryPokemonRequirement(requirement: EncounterPokemonRequirement, excludePrimaryFromSecondaryRequirements: boolean = true): this & Required<Pick<IMysteryEncounterOption, "secondaryPokemonRequirements">> {
+  withSecondaryPokemonRequirement(
+    requirement: EncounterPokemonRequirement,
+    excludePrimaryFromSecondaryRequirements = true,
+  ): this & Required<Pick<IMysteryEncounterOption, "secondaryPokemonRequirements">> {
     if (requirement instanceof EncounterSceneRequirement) {
       Error("Incorrectly added scene requirement as pokemon requirement.");
     }
 
     this.secondaryPokemonRequirements.push(requirement);
     this.excludePrimaryFromSecondaryRequirements = excludePrimaryFromSecondaryRequirements;
-    return Object.assign(this, { secondaryPokemonRequirements: this.secondaryPokemonRequirements });
+    return Object.assign(this, {
+      secondaryPokemonRequirements: this.secondaryPokemonRequirements,
+    });
   }
 
   /**
diff --git a/src/data/mystery-encounters/mystery-encounter-requirements.ts b/src/data/mystery-encounters/mystery-encounter-requirements.ts
index 63fb0cc5380..49fd632932c 100644
--- a/src/data/mystery-encounters/mystery-encounter-requirements.ts
+++ b/src/data/mystery-encounters/mystery-encounter-requirements.ts
@@ -1,15 +1,15 @@
 import { globalScene } from "#app/global-scene";
-import { allAbilities } from "#app/data/ability";
+import { allAbilities } from "../data-lists";
 import { EvolutionItem, pokemonEvolutions } from "#app/data/balance/pokemon-evolutions";
 import { Nature } from "#enums/nature";
 import { FormChangeItem, pokemonFormChanges, SpeciesFormChangeItemTrigger } from "#app/data/pokemon-forms";
 import { StatusEffect } from "#enums/status-effect";
-import { Type } from "#enums/type";
+import { PokemonType } from "#enums/pokemon-type";
 import { WeatherType } from "#enums/weather-type";
 import type { PlayerPokemon } from "#app/field/pokemon";
 import { AttackTypeBoosterModifier } from "#app/modifier/modifier";
 import type { AttackTypeBoosterModifierType } from "#app/modifier/modifier-type";
-import { isNullOrUndefined } from "#app/utils";
+import { isNullOrUndefined } from "#app/utils/common";
 import type { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import type { MysteryEncounterType } from "#enums/mystery-encounter-type";
@@ -76,15 +76,14 @@ export class CombinationSceneRequirement extends EncounterSceneRequirement {
   override getDialogueToken(pokemon?: PlayerPokemon): [string, string] {
     if (this.isAnd) {
       throw new Error("Not implemented (Sorry)");
-    } else {
-      for (const req of this.requirements) {
-        if (req.meetsRequirement()) {
-          return req.getDialogueToken(pokemon);
-        }
-      }
-
-      return this.requirements[0].getDialogueToken(pokemon);
     }
+    for (const req of this.requirements) {
+      if (req.meetsRequirement()) {
+        return req.getDialogueToken(pokemon);
+      }
+    }
+
+    return this.requirements[0].getDialogueToken(pokemon);
   }
 }
 
@@ -153,10 +152,9 @@ export class CombinationPokemonRequirement extends EncounterPokemonRequirement {
   override queryParty(partyPokemon: PlayerPokemon[]): PlayerPokemon[] {
     if (this.isAnd) {
       return this.requirements.reduce((relevantPokemon, req) => req.queryParty(relevantPokemon), partyPokemon);
-    } else {
-      const matchingRequirement = this.requirements.find(req => req.queryParty(partyPokemon).length > 0);
-      return matchingRequirement ? matchingRequirement.queryParty(partyPokemon) : [];
     }
+    const matchingRequirement = this.requirements.find(req => req.queryParty(partyPokemon).length > 0);
+    return matchingRequirement ? matchingRequirement.queryParty(partyPokemon) : [];
   }
 
   /**
@@ -168,15 +166,14 @@ export class CombinationPokemonRequirement extends EncounterPokemonRequirement {
   override getDialogueToken(pokemon?: PlayerPokemon): [string, string] {
     if (this.isAnd) {
       throw new Error("Not implemented (Sorry)");
-    } else {
-      for (const req of this.requirements) {
-        if (req.meetsRequirement()) {
-          return req.getDialogueToken(pokemon);
-        }
-      }
-
-      return this.requirements[0].getDialogueToken(pokemon);
     }
+    for (const req of this.requirements) {
+      if (req.meetsRequirement()) {
+        return req.getDialogueToken(pokemon);
+      }
+    }
+
+    return this.requirements[0].getDialogueToken(pokemon);
   }
 }
 
@@ -193,11 +190,18 @@ export class PreviousEncounterRequirement extends EncounterSceneRequirement {
   }
 
   override meetsRequirement(): boolean {
-    return globalScene.mysteryEncounterSaveData.encounteredEvents.some(e => e.type === this.previousEncounterRequirement);
+    return globalScene.mysteryEncounterSaveData.encounteredEvents.some(
+      e => e.type === this.previousEncounterRequirement,
+    );
   }
 
-  override getDialogueToken(pokemon?: PlayerPokemon): [string, string] {
-    return [ "previousEncounter", globalScene.mysteryEncounterSaveData.encounteredEvents.find(e => e.type === this.previousEncounterRequirement)?.[0].toString() ?? "" ];
+  override getDialogueToken(_pokemon?: PlayerPokemon): [string, string] {
+    return [
+      "previousEncounter",
+      globalScene.mysteryEncounterSaveData.encounteredEvents
+        .find(e => e.type === this.previousEncounterRequirement)?.[0]
+        .toString() ?? "",
+    ];
   }
 }
 
@@ -217,15 +221,18 @@ export class WaveRangeRequirement extends EncounterSceneRequirement {
   override meetsRequirement(): boolean {
     if (!isNullOrUndefined(this.waveRange) && this.waveRange[0] <= this.waveRange[1]) {
       const waveIndex = globalScene.currentBattle.waveIndex;
-      if (waveIndex >= 0 && (this.waveRange[0] >= 0 && this.waveRange[0] > waveIndex) || (this.waveRange[1] >= 0 && this.waveRange[1] < waveIndex)) {
+      if (
+        (waveIndex >= 0 && this.waveRange[0] >= 0 && this.waveRange[0] > waveIndex) ||
+        (this.waveRange[1] >= 0 && this.waveRange[1] < waveIndex)
+      ) {
         return false;
       }
     }
     return true;
   }
 
-  override getDialogueToken(pokemon?: PlayerPokemon): [string, string] {
-    return [ "waveIndex", globalScene.currentBattle.waveIndex.toString() ];
+  override getDialogueToken(_pokemon?: PlayerPokemon): [string, string] {
+    return ["waveIndex", globalScene.currentBattle.waveIndex.toString()];
   }
 }
 
@@ -253,8 +260,8 @@ export class WaveModulusRequirement extends EncounterSceneRequirement {
     return this.waveModuli.includes(globalScene.currentBattle.waveIndex % this.modulusValue);
   }
 
-  override getDialogueToken(pokemon?: PlayerPokemon): [string, string] {
-    return [ "waveIndex", globalScene.currentBattle.waveIndex.toString() ];
+  override getDialogueToken(_pokemon?: PlayerPokemon): [string, string] {
+    return ["waveIndex", globalScene.currentBattle.waveIndex.toString()];
   }
 }
 
@@ -263,20 +270,24 @@ export class TimeOfDayRequirement extends EncounterSceneRequirement {
 
   constructor(timeOfDay: TimeOfDay | TimeOfDay[]) {
     super();
-    this.requiredTimeOfDay = Array.isArray(timeOfDay) ? timeOfDay : [ timeOfDay ];
+    this.requiredTimeOfDay = Array.isArray(timeOfDay) ? timeOfDay : [timeOfDay];
   }
 
   override meetsRequirement(): boolean {
     const timeOfDay = globalScene.arena?.getTimeOfDay();
-    if (!isNullOrUndefined(timeOfDay) && this.requiredTimeOfDay?.length > 0 && !this.requiredTimeOfDay.includes(timeOfDay)) {
+    if (
+      !isNullOrUndefined(timeOfDay) &&
+      this.requiredTimeOfDay?.length > 0 &&
+      !this.requiredTimeOfDay.includes(timeOfDay)
+    ) {
       return false;
     }
 
     return true;
   }
 
-  override getDialogueToken(pokemon?: PlayerPokemon): [string, string] {
-    return [ "timeOfDay", TimeOfDay[globalScene.arena.getTimeOfDay()].toLocaleLowerCase() ];
+  override getDialogueToken(_pokemon?: PlayerPokemon): [string, string] {
+    return ["timeOfDay", TimeOfDay[globalScene.arena.getTimeOfDay()].toLocaleLowerCase()];
   }
 }
 
@@ -285,25 +296,29 @@ export class WeatherRequirement extends EncounterSceneRequirement {
 
   constructor(weather: WeatherType | WeatherType[]) {
     super();
-    this.requiredWeather = Array.isArray(weather) ? weather : [ weather ];
+    this.requiredWeather = Array.isArray(weather) ? weather : [weather];
   }
 
   override meetsRequirement(): boolean {
     const currentWeather = globalScene.arena.weather?.weatherType;
-    if (!isNullOrUndefined(currentWeather) && this.requiredWeather?.length > 0 && !this.requiredWeather.includes(currentWeather!)) {
+    if (
+      !isNullOrUndefined(currentWeather) &&
+      this.requiredWeather?.length > 0 &&
+      !this.requiredWeather.includes(currentWeather!)
+    ) {
       return false;
     }
 
     return true;
   }
 
-  override getDialogueToken(pokemon?: PlayerPokemon): [string, string] {
+  override getDialogueToken(_pokemon?: PlayerPokemon): [string, string] {
     const currentWeather = globalScene.arena.weather?.weatherType;
     let token = "";
     if (!isNullOrUndefined(currentWeather)) {
       token = WeatherType[currentWeather].replace("_", " ").toLocaleLowerCase();
     }
-    return [ "weather", token ];
+    return ["weather", token];
   }
 }
 
@@ -325,8 +340,13 @@ export class PartySizeRequirement extends EncounterSceneRequirement {
 
   override meetsRequirement(): boolean {
     if (!isNullOrUndefined(this.partySizeRange) && this.partySizeRange[0] <= this.partySizeRange[1]) {
-      const partySize = this.excludeDisallowedPokemon ? globalScene.getPokemonAllowedInBattle().length : globalScene.getPlayerParty().length;
-      if (partySize >= 0 && (this.partySizeRange[0] >= 0 && this.partySizeRange[0] > partySize) || (this.partySizeRange[1] >= 0 && this.partySizeRange[1] < partySize)) {
+      const partySize = this.excludeDisallowedPokemon
+        ? globalScene.getPokemonAllowedInBattle().length
+        : globalScene.getPlayerParty().length;
+      if (
+        (partySize >= 0 && this.partySizeRange[0] >= 0 && this.partySizeRange[0] > partySize) ||
+        (this.partySizeRange[1] >= 0 && this.partySizeRange[1] < partySize)
+      ) {
         return false;
       }
     }
@@ -334,8 +354,8 @@ export class PartySizeRequirement extends EncounterSceneRequirement {
     return true;
   }
 
-  override getDialogueToken(pokemon?: PlayerPokemon): [string, string] {
-    return [ "partySize", globalScene.getPlayerParty().length.toString() ];
+  override getDialogueToken(_pokemon?: PlayerPokemon): [string, string] {
+    return ["partySize", globalScene.getPlayerParty().length.toString()];
   }
 }
 
@@ -343,10 +363,10 @@ export class PersistentModifierRequirement extends EncounterSceneRequirement {
   requiredHeldItemModifiers: string[];
   minNumberOfItems: number;
 
-  constructor(heldItem: string | string[], minNumberOfItems: number = 1) {
+  constructor(heldItem: string | string[], minNumberOfItems = 1) {
     super();
     this.minNumberOfItems = minNumberOfItems;
-    this.requiredHeldItemModifiers = Array.isArray(heldItem) ? heldItem : [ heldItem ];
+    this.requiredHeldItemModifiers = Array.isArray(heldItem) ? heldItem : [heldItem];
   }
 
   override meetsRequirement(): boolean {
@@ -355,20 +375,20 @@ export class PersistentModifierRequirement extends EncounterSceneRequirement {
       return false;
     }
     let modifierCount = 0;
-    this.requiredHeldItemModifiers.forEach(modifier => {
+    for (const modifier of this.requiredHeldItemModifiers) {
       const matchingMods = globalScene.findModifiers(m => m.constructor.name === modifier);
       if (matchingMods?.length > 0) {
-        matchingMods.forEach(matchingMod => {
+        for (const matchingMod of matchingMods) {
           modifierCount += matchingMod.stackCount;
-        });
+        }
       }
-    });
+    }
 
     return modifierCount >= this.minNumberOfItems;
   }
 
-  override getDialogueToken(pokemon?: PlayerPokemon): [string, string] {
-    return [ "requiredItem", this.requiredHeldItemModifiers[0] ];
+  override getDialogueToken(_pokemon?: PlayerPokemon): [string, string] {
+    return ["requiredItem", this.requiredHeldItemModifiers[0]];
   }
 }
 
@@ -394,9 +414,12 @@ export class MoneyRequirement extends EncounterSceneRequirement {
     return !(this.requiredMoney > 0 && this.requiredMoney > money);
   }
 
-  override getDialogueToken(pokemon?: PlayerPokemon): [string, string] {
-    const value = this.scalingMultiplier > 0 ? globalScene.getWaveMoneyAmount(this.scalingMultiplier).toString() : this.requiredMoney.toString();
-    return [ "money", value ];
+  override getDialogueToken(_pokemon?: PlayerPokemon): [string, string] {
+    const value =
+      this.scalingMultiplier > 0
+        ? globalScene.getWaveMoneyAmount(this.scalingMultiplier).toString()
+        : this.requiredMoney.toString();
+    return ["money", value];
   }
 }
 
@@ -405,11 +428,11 @@ export class SpeciesRequirement extends EncounterPokemonRequirement {
   minNumberOfPokemon: number;
   invertQuery: boolean;
 
-  constructor(species: Species | Species[], minNumberOfPokemon: number = 1, invertQuery: boolean = false) {
+  constructor(species: Species | Species[], minNumberOfPokemon = 1, invertQuery = false) {
     super();
     this.minNumberOfPokemon = minNumberOfPokemon;
     this.invertQuery = invertQuery;
-    this.requiredSpecies = Array.isArray(species) ? species : [ species ];
+    this.requiredSpecies = Array.isArray(species) ? species : [species];
   }
 
   override meetsRequirement(): boolean {
@@ -422,32 +445,34 @@ export class SpeciesRequirement extends EncounterPokemonRequirement {
 
   override queryParty(partyPokemon: PlayerPokemon[]): PlayerPokemon[] {
     if (!this.invertQuery) {
-      return partyPokemon.filter((pokemon) => this.requiredSpecies.filter((species) => pokemon.species.speciesId === species).length > 0);
-    } else {
-      // for an inverted query, we only want to get the pokemon that don't have ANY of the listed speciess
-      return partyPokemon.filter((pokemon) => this.requiredSpecies.filter((species) => pokemon.species.speciesId === species).length === 0);
+      return partyPokemon.filter(
+        pokemon => this.requiredSpecies.filter(species => pokemon.species.speciesId === species).length > 0,
+      );
     }
+    // for an inverted query, we only want to get the pokemon that don't have ANY of the listed speciess
+    return partyPokemon.filter(
+      pokemon => this.requiredSpecies.filter(species => pokemon.species.speciesId === species).length === 0,
+    );
   }
 
   override getDialogueToken(pokemon?: PlayerPokemon): [string, string] {
     if (pokemon?.species.speciesId && this.requiredSpecies.includes(pokemon.species.speciesId)) {
-      return [ "species", Species[pokemon.species.speciesId] ];
+      return ["species", Species[pokemon.species.speciesId]];
     }
-    return [ "species", "" ];
+    return ["species", ""];
   }
 }
 
-
 export class NatureRequirement extends EncounterPokemonRequirement {
   requiredNature: Nature[];
   minNumberOfPokemon: number;
   invertQuery: boolean;
 
-  constructor(nature: Nature | Nature[], minNumberOfPokemon: number = 1, invertQuery: boolean = false) {
+  constructor(nature: Nature | Nature[], minNumberOfPokemon = 1, invertQuery = false) {
     super();
     this.minNumberOfPokemon = minNumberOfPokemon;
     this.invertQuery = invertQuery;
-    this.requiredNature = Array.isArray(nature) ? nature : [ nature ];
+    this.requiredNature = Array.isArray(nature) ? nature : [nature];
   }
 
   override meetsRequirement(): boolean {
@@ -460,33 +485,32 @@ export class NatureRequirement extends EncounterPokemonRequirement {
 
   override queryParty(partyPokemon: PlayerPokemon[]): PlayerPokemon[] {
     if (!this.invertQuery) {
-      return partyPokemon.filter((pokemon) => this.requiredNature.filter((nature) => pokemon.nature === nature).length > 0);
-    } else {
-      // for an inverted query, we only want to get the pokemon that don't have ANY of the listed natures
-      return partyPokemon.filter((pokemon) => this.requiredNature.filter((nature) => pokemon.nature === nature).length === 0);
+      return partyPokemon.filter(pokemon => this.requiredNature.filter(nature => pokemon.nature === nature).length > 0);
     }
+    // for an inverted query, we only want to get the pokemon that don't have ANY of the listed natures
+    return partyPokemon.filter(pokemon => this.requiredNature.filter(nature => pokemon.nature === nature).length === 0);
   }
 
   override getDialogueToken(pokemon?: PlayerPokemon): [string, string] {
     if (!isNullOrUndefined(pokemon?.nature) && this.requiredNature.includes(pokemon.nature)) {
-      return [ "nature", Nature[pokemon.nature] ];
+      return ["nature", Nature[pokemon.nature]];
     }
-    return [ "nature", "" ];
+    return ["nature", ""];
   }
 }
 
 export class TypeRequirement extends EncounterPokemonRequirement {
-  requiredType: Type[];
+  requiredType: PokemonType[];
   excludeFainted: boolean;
   minNumberOfPokemon: number;
   invertQuery: boolean;
 
-  constructor(type: Type | Type[], excludeFainted: boolean = true, minNumberOfPokemon: number = 1, invertQuery: boolean = false) {
+  constructor(type: PokemonType | PokemonType[], excludeFainted = true, minNumberOfPokemon = 1, invertQuery = false) {
     super();
     this.excludeFainted = excludeFainted;
     this.minNumberOfPokemon = minNumberOfPokemon;
     this.invertQuery = invertQuery;
-    this.requiredType = Array.isArray(type) ? type : [ type ];
+    this.requiredType = Array.isArray(type) ? type : [type];
   }
 
   override meetsRequirement(): boolean {
@@ -497,7 +521,7 @@ export class TypeRequirement extends EncounterPokemonRequirement {
     }
 
     if (this.excludeFainted) {
-      partyPokemon = partyPokemon.filter((pokemon) => !pokemon.isFainted());
+      partyPokemon = partyPokemon.filter(pokemon => !pokemon.isFainted());
     }
 
     return this.queryParty(partyPokemon).length >= this.minNumberOfPokemon;
@@ -505,35 +529,37 @@ export class TypeRequirement extends EncounterPokemonRequirement {
 
   override queryParty(partyPokemon: PlayerPokemon[]): PlayerPokemon[] {
     if (!this.invertQuery) {
-      return partyPokemon.filter((pokemon) => this.requiredType.filter((type) => pokemon.getTypes().includes(type)).length > 0);
-    } else {
-      // for an inverted query, we only want to get the pokemon that don't have ANY of the listed types
-      return partyPokemon.filter((pokemon) => this.requiredType.filter((type) => pokemon.getTypes().includes(type)).length === 0);
+      return partyPokemon.filter(
+        pokemon => this.requiredType.filter(type => pokemon.getTypes().includes(type)).length > 0,
+      );
     }
+    // for an inverted query, we only want to get the pokemon that don't have ANY of the listed types
+    return partyPokemon.filter(
+      pokemon => this.requiredType.filter(type => pokemon.getTypes().includes(type)).length === 0,
+    );
   }
 
   override getDialogueToken(pokemon?: PlayerPokemon): [string, string] {
-    const includedTypes = this.requiredType.filter((ty) => pokemon?.getTypes().includes(ty));
+    const includedTypes = this.requiredType.filter(ty => pokemon?.getTypes().includes(ty));
     if (includedTypes.length > 0) {
-      return [ "type", Type[includedTypes[0]] ];
+      return ["type", PokemonType[includedTypes[0]]];
     }
-    return [ "type", "" ];
+    return ["type", ""];
   }
 }
 
-
 export class MoveRequirement extends EncounterPokemonRequirement {
   requiredMoves: Moves[] = [];
   minNumberOfPokemon: number;
   invertQuery: boolean;
   excludeDisallowedPokemon: boolean;
 
-  constructor(moves: Moves | Moves[], excludeDisallowedPokemon: boolean, minNumberOfPokemon: number = 1, invertQuery: boolean = false) {
+  constructor(moves: Moves | Moves[], excludeDisallowedPokemon: boolean, minNumberOfPokemon = 1, invertQuery = false) {
     super();
     this.excludeDisallowedPokemon = excludeDisallowedPokemon;
     this.minNumberOfPokemon = minNumberOfPokemon;
     this.invertQuery = invertQuery;
-    this.requiredMoves = Array.isArray(moves) ? moves : [ moves ];
+    this.requiredMoves = Array.isArray(moves) ? moves : [moves];
   }
 
   override meetsRequirement(): boolean {
@@ -547,25 +573,27 @@ export class MoveRequirement extends EncounterPokemonRequirement {
   override queryParty(partyPokemon: PlayerPokemon[]): PlayerPokemon[] {
     if (!this.invertQuery) {
       // get the Pokemon with at least one move in the required moves list
-      return partyPokemon.filter((pokemon) =>
-        (!this.excludeDisallowedPokemon || pokemon.isAllowedInBattle())
-        && pokemon.moveset.some((move) => move?.moveId && this.requiredMoves.includes(move.moveId)));
-    } else {
-      // for an inverted query, we only want to get the pokemon that don't have ANY of the listed moves
-      return partyPokemon.filter((pokemon) =>
-        (!this.excludeDisallowedPokemon || pokemon.isAllowedInBattle())
-        && !pokemon.moveset.some((move) => move?.moveId && this.requiredMoves.includes(move.moveId)));
+      return partyPokemon.filter(
+        pokemon =>
+          (!this.excludeDisallowedPokemon || pokemon.isAllowedInBattle()) &&
+          pokemon.moveset.some(move => move.moveId && this.requiredMoves.includes(move.moveId)),
+      );
     }
+    // for an inverted query, we only want to get the pokemon that don't have ANY of the listed moves
+    return partyPokemon.filter(
+      pokemon =>
+        (!this.excludeDisallowedPokemon || pokemon.isAllowedInBattle()) &&
+        !pokemon.moveset.some(move => move.moveId && this.requiredMoves.includes(move.moveId)),
+    );
   }
 
   override getDialogueToken(pokemon?: PlayerPokemon): [string, string] {
-    const includedMoves = pokemon?.moveset.filter((move) => move?.moveId && this.requiredMoves.includes(move.moveId));
+    const includedMoves = pokemon?.moveset.filter(move => move.moveId && this.requiredMoves.includes(move.moveId));
     if (includedMoves && includedMoves.length > 0 && includedMoves[0]) {
-      return [ "move", includedMoves[0].getName() ];
+      return ["move", includedMoves[0].getName()];
     }
-    return [ "move", "" ];
+    return ["move", ""];
   }
-
 }
 
 /**
@@ -578,11 +606,11 @@ export class CompatibleMoveRequirement extends EncounterPokemonRequirement {
   minNumberOfPokemon: number;
   invertQuery: boolean;
 
-  constructor(learnableMove: Moves | Moves[], minNumberOfPokemon: number = 1, invertQuery: boolean = false) {
+  constructor(learnableMove: Moves | Moves[], minNumberOfPokemon = 1, invertQuery = false) {
     super();
     this.minNumberOfPokemon = minNumberOfPokemon;
     this.invertQuery = invertQuery;
-    this.requiredMoves = Array.isArray(learnableMove) ? learnableMove : [ learnableMove ];
+    this.requiredMoves = Array.isArray(learnableMove) ? learnableMove : [learnableMove];
   }
 
   override meetsRequirement(): boolean {
@@ -595,21 +623,31 @@ export class CompatibleMoveRequirement extends EncounterPokemonRequirement {
 
   override queryParty(partyPokemon: PlayerPokemon[]): PlayerPokemon[] {
     if (!this.invertQuery) {
-      return partyPokemon.filter((pokemon) => this.requiredMoves.filter((learnableMove) => pokemon.compatibleTms.filter(tm => !pokemon.moveset.find(m => m?.moveId === tm)).includes(learnableMove)).length > 0);
-    } else {
-      // for an inverted query, we only want to get the pokemon that don't have ANY of the listed learnableMoves
-      return partyPokemon.filter((pokemon) => this.requiredMoves.filter((learnableMove) => pokemon.compatibleTms.filter(tm => !pokemon.moveset.find(m => m?.moveId === tm)).includes(learnableMove)).length === 0);
+      return partyPokemon.filter(
+        pokemon =>
+          this.requiredMoves.filter(learnableMove =>
+            pokemon.compatibleTms.filter(tm => !pokemon.moveset.find(m => m.moveId === tm)).includes(learnableMove),
+          ).length > 0,
+      );
     }
+    // for an inverted query, we only want to get the pokemon that don't have ANY of the listed learnableMoves
+    return partyPokemon.filter(
+      pokemon =>
+        this.requiredMoves.filter(learnableMove =>
+          pokemon.compatibleTms.filter(tm => !pokemon.moveset.find(m => m.moveId === tm)).includes(learnableMove),
+        ).length === 0,
+    );
   }
 
   override getDialogueToken(pokemon?: PlayerPokemon): [string, string] {
-    const includedCompatMoves = this.requiredMoves.filter((reqMove) => pokemon?.compatibleTms.filter((tm) => !pokemon.moveset.find(m => m?.moveId === tm)).includes(reqMove));
+    const includedCompatMoves = this.requiredMoves.filter(reqMove =>
+      pokemon?.compatibleTms.filter(tm => !pokemon.moveset.find(m => m.moveId === tm)).includes(reqMove),
+    );
     if (includedCompatMoves.length > 0) {
-      return [ "compatibleMove", Moves[includedCompatMoves[0]] ];
+      return ["compatibleMove", Moves[includedCompatMoves[0]]];
     }
-    return [ "compatibleMove", "" ];
+    return ["compatibleMove", ""];
   }
-
 }
 
 export class AbilityRequirement extends EncounterPokemonRequirement {
@@ -618,12 +656,17 @@ export class AbilityRequirement extends EncounterPokemonRequirement {
   invertQuery: boolean;
   excludeDisallowedPokemon: boolean;
 
-  constructor(abilities: Abilities | Abilities[], excludeDisallowedPokemon: boolean, minNumberOfPokemon: number = 1, invertQuery: boolean = false) {
+  constructor(
+    abilities: Abilities | Abilities[],
+    excludeDisallowedPokemon: boolean,
+    minNumberOfPokemon = 1,
+    invertQuery = false,
+  ) {
     super();
     this.excludeDisallowedPokemon = excludeDisallowedPokemon;
     this.minNumberOfPokemon = minNumberOfPokemon;
     this.invertQuery = invertQuery;
-    this.requiredAbilities = Array.isArray(abilities) ? abilities : [ abilities ];
+    this.requiredAbilities = Array.isArray(abilities) ? abilities : [abilities];
   }
 
   override meetsRequirement(): boolean {
@@ -636,23 +679,26 @@ export class AbilityRequirement extends EncounterPokemonRequirement {
 
   override queryParty(partyPokemon: PlayerPokemon[]): PlayerPokemon[] {
     if (!this.invertQuery) {
-      return partyPokemon.filter((pokemon) =>
-        (!this.excludeDisallowedPokemon || pokemon.isAllowedInBattle())
-        && this.requiredAbilities.some((ability) => pokemon.hasAbility(ability, false)));
-    } else {
-      // for an inverted query, we only want to get the pokemon that don't have ANY of the listed abilities
-      return partyPokemon.filter((pokemon) =>
-        (!this.excludeDisallowedPokemon || pokemon.isAllowedInBattle())
-        && this.requiredAbilities.filter((ability) => pokemon.hasAbility(ability, false)).length === 0);
+      return partyPokemon.filter(
+        pokemon =>
+          (!this.excludeDisallowedPokemon || pokemon.isAllowedInBattle()) &&
+          this.requiredAbilities.some(ability => pokemon.hasAbility(ability, false)),
+      );
     }
+    // for an inverted query, we only want to get the pokemon that don't have ANY of the listed abilities
+    return partyPokemon.filter(
+      pokemon =>
+        (!this.excludeDisallowedPokemon || pokemon.isAllowedInBattle()) &&
+        this.requiredAbilities.filter(ability => pokemon.hasAbility(ability, false)).length === 0,
+    );
   }
 
   override getDialogueToken(pokemon?: PlayerPokemon): [string, string] {
     const matchingAbility = this.requiredAbilities.find(a => pokemon?.hasAbility(a, false));
     if (!isNullOrUndefined(matchingAbility)) {
-      return [ "ability", allAbilities[matchingAbility].name ];
+      return ["ability", allAbilities[matchingAbility].name];
     }
-    return [ "ability", "" ];
+    return ["ability", ""];
   }
 }
 
@@ -661,11 +707,11 @@ export class StatusEffectRequirement extends EncounterPokemonRequirement {
   minNumberOfPokemon: number;
   invertQuery: boolean;
 
-  constructor(statusEffect: StatusEffect | StatusEffect[], minNumberOfPokemon: number = 1, invertQuery: boolean = false) {
+  constructor(statusEffect: StatusEffect | StatusEffect[], minNumberOfPokemon = 1, invertQuery = false) {
     super();
     this.minNumberOfPokemon = minNumberOfPokemon;
     this.invertQuery = invertQuery;
-    this.requiredStatusEffect = Array.isArray(statusEffect) ? statusEffect : [ statusEffect ];
+    this.requiredStatusEffect = Array.isArray(statusEffect) ? statusEffect : [statusEffect];
   }
 
   override meetsRequirement(): boolean {
@@ -680,44 +726,50 @@ export class StatusEffectRequirement extends EncounterPokemonRequirement {
 
   override queryParty(partyPokemon: PlayerPokemon[]): PlayerPokemon[] {
     if (!this.invertQuery) {
-      return partyPokemon.filter((pokemon) => {
-        return this.requiredStatusEffect.some((statusEffect) => {
+      return partyPokemon.filter(pokemon => {
+        return this.requiredStatusEffect.some(statusEffect => {
           if (statusEffect === StatusEffect.NONE) {
             // StatusEffect.NONE also checks for null or undefined status
-            return isNullOrUndefined(pokemon.status) || isNullOrUndefined(pokemon.status.effect) || pokemon.status.effect === statusEffect;
-          } else {
-            return pokemon.status?.effect === statusEffect;
-          }
-        });
-      });
-    } else {
-      // for an inverted query, we only want to get the pokemon that don't have ANY of the listed StatusEffects
-      return partyPokemon.filter((pokemon) => {
-        return !this.requiredStatusEffect.some((statusEffect) => {
-          if (statusEffect === StatusEffect.NONE) {
-            // StatusEffect.NONE also checks for null or undefined status
-            return isNullOrUndefined(pokemon.status) || isNullOrUndefined(pokemon.status.effect) || pokemon.status.effect === statusEffect;
-          } else {
-            return pokemon.status?.effect === statusEffect;
+            return (
+              isNullOrUndefined(pokemon.status) ||
+              isNullOrUndefined(pokemon.status.effect) ||
+              pokemon.status.effect === statusEffect
+            );
           }
+          return pokemon.status?.effect === statusEffect;
         });
       });
     }
+    // for an inverted query, we only want to get the pokemon that don't have ANY of the listed StatusEffects
+    return partyPokemon.filter(pokemon => {
+      return !this.requiredStatusEffect.some(statusEffect => {
+        if (statusEffect === StatusEffect.NONE) {
+          // StatusEffect.NONE also checks for null or undefined status
+          return (
+            isNullOrUndefined(pokemon.status) ||
+            isNullOrUndefined(pokemon.status.effect) ||
+            pokemon.status.effect === statusEffect
+          );
+        }
+        return pokemon.status?.effect === statusEffect;
+      });
+    });
   }
 
   override getDialogueToken(pokemon?: PlayerPokemon): [string, string] {
-    const reqStatus = this.requiredStatusEffect.filter((a) => {
+    const reqStatus = this.requiredStatusEffect.filter(a => {
       if (a === StatusEffect.NONE) {
-        return isNullOrUndefined(pokemon?.status) || isNullOrUndefined(pokemon.status.effect) || pokemon.status.effect === a;
+        return (
+          isNullOrUndefined(pokemon?.status) || isNullOrUndefined(pokemon.status.effect) || pokemon.status.effect === a
+        );
       }
       return pokemon!.status?.effect === a;
     });
     if (reqStatus.length > 0) {
-      return [ "status", StatusEffect[reqStatus[0]] ];
+      return ["status", StatusEffect[reqStatus[0]]];
     }
-    return [ "status", "" ];
+    return ["status", ""];
   }
-
 }
 
 /**
@@ -730,11 +782,11 @@ export class CanFormChangeWithItemRequirement extends EncounterPokemonRequiremen
   minNumberOfPokemon: number;
   invertQuery: boolean;
 
-  constructor(formChangeItem: FormChangeItem | FormChangeItem[], minNumberOfPokemon: number = 1, invertQuery: boolean = false) {
+  constructor(formChangeItem: FormChangeItem | FormChangeItem[], minNumberOfPokemon = 1, invertQuery = false) {
     super();
     this.minNumberOfPokemon = minNumberOfPokemon;
     this.invertQuery = invertQuery;
-    this.requiredFormChangeItem = Array.isArray(formChangeItem) ? formChangeItem : [ formChangeItem ];
+    this.requiredFormChangeItem = Array.isArray(formChangeItem) ? formChangeItem : [formChangeItem];
   }
 
   override meetsRequirement(): boolean {
@@ -746,35 +798,44 @@ export class CanFormChangeWithItemRequirement extends EncounterPokemonRequiremen
   }
 
   filterByForm(pokemon, formChangeItem) {
-    if (pokemonFormChanges.hasOwnProperty(pokemon.species.speciesId)
+    if (
+      pokemonFormChanges.hasOwnProperty(pokemon.species.speciesId) &&
       // Get all form changes for this species with an item trigger, including any compound triggers
-      && pokemonFormChanges[pokemon.species.speciesId].filter(fc => fc.trigger.hasTriggerType(SpeciesFormChangeItemTrigger))
+      pokemonFormChanges[pokemon.species.speciesId]
+        .filter(fc => fc.trigger.hasTriggerType(SpeciesFormChangeItemTrigger))
         // Returns true if any form changes match this item
-        .map(fc => fc.findTrigger(SpeciesFormChangeItemTrigger) as SpeciesFormChangeItemTrigger)
-        .flat().flatMap(fc => fc.item).includes(formChangeItem)) {
+        .flatMap(fc => fc.findTrigger(SpeciesFormChangeItemTrigger) as SpeciesFormChangeItemTrigger)
+        .flatMap(fc => fc.item)
+        .includes(formChangeItem)
+    ) {
       return true;
-    } else {
-      return false;
     }
+    return false;
   }
 
   override queryParty(partyPokemon: PlayerPokemon[]): PlayerPokemon[] {
     if (!this.invertQuery) {
-      return partyPokemon.filter((pokemon) => this.requiredFormChangeItem.filter((formChangeItem) => this.filterByForm(pokemon, formChangeItem)).length > 0);
-    } else {
-      // for an inverted query, we only want to get the pokemon that don't have ANY of the listed formChangeItems
-      return partyPokemon.filter((pokemon) => this.requiredFormChangeItem.filter((formChangeItem) => this.filterByForm(pokemon, formChangeItem)).length === 0);
+      return partyPokemon.filter(
+        pokemon =>
+          this.requiredFormChangeItem.filter(formChangeItem => this.filterByForm(pokemon, formChangeItem)).length > 0,
+      );
     }
+    // for an inverted query, we only want to get the pokemon that don't have ANY of the listed formChangeItems
+    return partyPokemon.filter(
+      pokemon =>
+        this.requiredFormChangeItem.filter(formChangeItem => this.filterByForm(pokemon, formChangeItem)).length === 0,
+    );
   }
 
   override getDialogueToken(pokemon?: PlayerPokemon): [string, string] {
-    const requiredItems = this.requiredFormChangeItem.filter((formChangeItem) => this.filterByForm(pokemon, formChangeItem));
+    const requiredItems = this.requiredFormChangeItem.filter(formChangeItem =>
+      this.filterByForm(pokemon, formChangeItem),
+    );
     if (requiredItems.length > 0) {
-      return [ "formChangeItem", FormChangeItem[requiredItems[0]] ];
+      return ["formChangeItem", FormChangeItem[requiredItems[0]]];
     }
-    return [ "formChangeItem", "" ];
+    return ["formChangeItem", ""];
   }
-
 }
 
 export class CanEvolveWithItemRequirement extends EncounterPokemonRequirement {
@@ -782,11 +843,11 @@ export class CanEvolveWithItemRequirement extends EncounterPokemonRequirement {
   minNumberOfPokemon: number;
   invertQuery: boolean;
 
-  constructor(evolutionItems: EvolutionItem | EvolutionItem[], minNumberOfPokemon: number = 1, invertQuery: boolean = false) {
+  constructor(evolutionItems: EvolutionItem | EvolutionItem[], minNumberOfPokemon = 1, invertQuery = false) {
     super();
     this.minNumberOfPokemon = minNumberOfPokemon;
     this.invertQuery = invertQuery;
-    this.requiredEvolutionItem = Array.isArray(evolutionItems) ? evolutionItems : [ evolutionItems ];
+    this.requiredEvolutionItem = Array.isArray(evolutionItems) ? evolutionItems : [evolutionItems];
   }
 
   override meetsRequirement(): boolean {
@@ -798,11 +859,23 @@ export class CanEvolveWithItemRequirement extends EncounterPokemonRequirement {
   }
 
   filterByEvo(pokemon, evolutionItem) {
-    if (pokemonEvolutions.hasOwnProperty(pokemon.species.speciesId) && pokemonEvolutions[pokemon.species.speciesId].filter(e => e.item === evolutionItem
-      && (!e.condition || e.condition.predicate(pokemon))).length && (pokemon.getFormKey() !== SpeciesFormKey.GIGANTAMAX)) {
+    if (
+      pokemonEvolutions.hasOwnProperty(pokemon.species.speciesId) &&
+      pokemonEvolutions[pokemon.species.speciesId].filter(
+        e => e.item === evolutionItem && (!e.condition || e.condition.predicate(pokemon)),
+      ).length &&
+      pokemon.getFormKey() !== SpeciesFormKey.GIGANTAMAX
+    ) {
       return true;
-    } else if (pokemon.isFusion() && pokemonEvolutions.hasOwnProperty(pokemon.fusionSpecies.speciesId) && pokemonEvolutions[pokemon.fusionSpecies.speciesId].filter(e => e.item === evolutionItem
-      && (!e.condition || e.condition.predicate(pokemon))).length && (pokemon.getFusionFormKey() !== SpeciesFormKey.GIGANTAMAX)) {
+    }
+    if (
+      pokemon.isFusion() &&
+      pokemonEvolutions.hasOwnProperty(pokemon.fusionSpecies.speciesId) &&
+      pokemonEvolutions[pokemon.fusionSpecies.speciesId].filter(
+        e => e.item === evolutionItem && (!e.condition || e.condition.predicate(pokemon)),
+      ).length &&
+      pokemon.getFusionFormKey() !== SpeciesFormKey.GIGANTAMAX
+    ) {
       return true;
     }
     return false;
@@ -810,19 +883,24 @@ export class CanEvolveWithItemRequirement extends EncounterPokemonRequirement {
 
   override queryParty(partyPokemon: PlayerPokemon[]): PlayerPokemon[] {
     if (!this.invertQuery) {
-      return partyPokemon.filter((pokemon) => this.requiredEvolutionItem.filter((evolutionItem) => this.filterByEvo(pokemon, evolutionItem)).length > 0);
-    } else {
-      // for an inverted query, we only want to get the pokemon that don't have ANY of the listed evolutionItemss
-      return partyPokemon.filter((pokemon) => this.requiredEvolutionItem.filter((evolutionItems) => this.filterByEvo(pokemon, evolutionItems)).length === 0);
+      return partyPokemon.filter(
+        pokemon =>
+          this.requiredEvolutionItem.filter(evolutionItem => this.filterByEvo(pokemon, evolutionItem)).length > 0,
+      );
     }
+    // for an inverted query, we only want to get the pokemon that don't have ANY of the listed evolutionItemss
+    return partyPokemon.filter(
+      pokemon =>
+        this.requiredEvolutionItem.filter(evolutionItems => this.filterByEvo(pokemon, evolutionItems)).length === 0,
+    );
   }
 
   override getDialogueToken(pokemon?: PlayerPokemon): [string, string] {
-    const requiredItems = this.requiredEvolutionItem.filter((evoItem) => this.filterByEvo(pokemon, evoItem));
+    const requiredItems = this.requiredEvolutionItem.filter(evoItem => this.filterByEvo(pokemon, evoItem));
     if (requiredItems.length > 0) {
-      return [ "evolutionItem", EvolutionItem[requiredItems[0]] ];
+      return ["evolutionItem", EvolutionItem[requiredItems[0]]];
     }
-    return [ "evolutionItem", "" ];
+    return ["evolutionItem", ""];
   }
 }
 
@@ -832,11 +910,11 @@ export class HeldItemRequirement extends EncounterPokemonRequirement {
   invertQuery: boolean;
   requireTransferable: boolean;
 
-  constructor(heldItem: string | string[], minNumberOfPokemon: number = 1, invertQuery: boolean = false, requireTransferable: boolean = true) {
+  constructor(heldItem: string | string[], minNumberOfPokemon = 1, invertQuery = false, requireTransferable = true) {
     super();
     this.minNumberOfPokemon = minNumberOfPokemon;
     this.invertQuery = invertQuery;
-    this.requiredHeldItemModifiers = Array.isArray(heldItem) ? heldItem : [ heldItem ];
+    this.requiredHeldItemModifiers = Array.isArray(heldItem) ? heldItem : [heldItem];
     this.requireTransferable = requireTransferable;
   }
 
@@ -850,44 +928,57 @@ export class HeldItemRequirement extends EncounterPokemonRequirement {
 
   override queryParty(partyPokemon: PlayerPokemon[]): PlayerPokemon[] {
     if (!this.invertQuery) {
-      return partyPokemon.filter((pokemon) => this.requiredHeldItemModifiers.some((heldItem) => {
-        return pokemon.getHeldItems().some((it) => {
-          return it.constructor.name === heldItem && (!this.requireTransferable || it.isTransferable);
-        });
-      }));
-    } else {
-      // for an inverted query, we only want to get the pokemon that have any held items that are NOT in requiredHeldItemModifiers
-      // E.g. functions as a blacklist
-      return partyPokemon.filter((pokemon) => pokemon.getHeldItems().filter((it) => {
-        return !this.requiredHeldItemModifiers.some(heldItem => it.constructor.name === heldItem)
-          && (!this.requireTransferable || it.isTransferable);
-      }).length > 0);
+      return partyPokemon.filter(pokemon =>
+        this.requiredHeldItemModifiers.some(heldItem => {
+          return pokemon.getHeldItems().some(it => {
+            return it.constructor.name === heldItem && (!this.requireTransferable || it.isTransferable);
+          });
+        }),
+      );
     }
+    // for an inverted query, we only want to get the pokemon that have any held items that are NOT in requiredHeldItemModifiers
+    // E.g. functions as a blacklist
+    return partyPokemon.filter(
+      pokemon =>
+        pokemon.getHeldItems().filter(it => {
+          return (
+            !this.requiredHeldItemModifiers.some(heldItem => it.constructor.name === heldItem) &&
+            (!this.requireTransferable || it.isTransferable)
+          );
+        }).length > 0,
+    );
   }
 
   override getDialogueToken(pokemon?: PlayerPokemon): [string, string] {
-    const requiredItems = pokemon?.getHeldItems().filter((it) => {
-      return this.requiredHeldItemModifiers.some(heldItem => it.constructor.name === heldItem)
-        && (!this.requireTransferable || it.isTransferable);
+    const requiredItems = pokemon?.getHeldItems().filter(it => {
+      return (
+        this.requiredHeldItemModifiers.some(heldItem => it.constructor.name === heldItem) &&
+        (!this.requireTransferable || it.isTransferable)
+      );
     });
     if (requiredItems && requiredItems.length > 0) {
-      return [ "heldItem", requiredItems[0].type.name ];
+      return ["heldItem", requiredItems[0].type.name];
     }
-    return [ "heldItem", "" ];
+    return ["heldItem", ""];
   }
 }
 
 export class AttackTypeBoosterHeldItemTypeRequirement extends EncounterPokemonRequirement {
-  requiredHeldItemTypes: Type[];
+  requiredHeldItemTypes: PokemonType[];
   minNumberOfPokemon: number;
   invertQuery: boolean;
   requireTransferable: boolean;
 
-  constructor(heldItemTypes: Type | Type[], minNumberOfPokemon: number = 1, invertQuery: boolean = false, requireTransferable: boolean = true) {
+  constructor(
+    heldItemTypes: PokemonType | PokemonType[],
+    minNumberOfPokemon = 1,
+    invertQuery = false,
+    requireTransferable = true,
+  ) {
     super();
     this.minNumberOfPokemon = minNumberOfPokemon;
     this.invertQuery = invertQuery;
-    this.requiredHeldItemTypes = Array.isArray(heldItemTypes) ? heldItemTypes : [ heldItemTypes ];
+    this.requiredHeldItemTypes = Array.isArray(heldItemTypes) ? heldItemTypes : [heldItemTypes];
     this.requireTransferable = requireTransferable;
   }
 
@@ -901,36 +992,48 @@ export class AttackTypeBoosterHeldItemTypeRequirement extends EncounterPokemonRe
 
   override queryParty(partyPokemon: PlayerPokemon[]): PlayerPokemon[] {
     if (!this.invertQuery) {
-      return partyPokemon.filter((pokemon) => this.requiredHeldItemTypes.some((heldItemType) => {
-        return pokemon.getHeldItems().some((it) => {
-          return it instanceof AttackTypeBoosterModifier
-            && (it.type as AttackTypeBoosterModifierType).moveType === heldItemType
-            && (!this.requireTransferable || it.isTransferable);
-        });
-      }));
-    } else {
-      // for an inverted query, we only want to get the pokemon that have any held items that are NOT in requiredHeldItemModifiers
-      // E.g. functions as a blacklist
-      return partyPokemon.filter((pokemon) => pokemon.getHeldItems().filter((it) => {
-        return !this.requiredHeldItemTypes.some(heldItemType =>
-          it instanceof AttackTypeBoosterModifier
-          && (it.type as AttackTypeBoosterModifierType).moveType === heldItemType
-          && (!this.requireTransferable || it.isTransferable));
-      }).length > 0);
+      return partyPokemon.filter(pokemon =>
+        this.requiredHeldItemTypes.some(heldItemType => {
+          return pokemon.getHeldItems().some(it => {
+            return (
+              it instanceof AttackTypeBoosterModifier &&
+              (it.type as AttackTypeBoosterModifierType).moveType === heldItemType &&
+              (!this.requireTransferable || it.isTransferable)
+            );
+          });
+        }),
+      );
     }
+    // for an inverted query, we only want to get the pokemon that have any held items that are NOT in requiredHeldItemModifiers
+    // E.g. functions as a blacklist
+    return partyPokemon.filter(
+      pokemon =>
+        pokemon.getHeldItems().filter(it => {
+          return !this.requiredHeldItemTypes.some(
+            heldItemType =>
+              it instanceof AttackTypeBoosterModifier &&
+              (it.type as AttackTypeBoosterModifierType).moveType === heldItemType &&
+              (!this.requireTransferable || it.isTransferable),
+          );
+        }).length > 0,
+    );
   }
 
   override getDialogueToken(pokemon?: PlayerPokemon): [string, string] {
-    const requiredItems = pokemon?.getHeldItems().filter((it) => {
-      return this.requiredHeldItemTypes.some(heldItemType =>
-        it instanceof AttackTypeBoosterModifier
-        && (it.type as AttackTypeBoosterModifierType).moveType === heldItemType)
-        && (!this.requireTransferable || it.isTransferable);
+    const requiredItems = pokemon?.getHeldItems().filter(it => {
+      return (
+        this.requiredHeldItemTypes.some(
+          heldItemType =>
+            it instanceof AttackTypeBoosterModifier &&
+            (it.type as AttackTypeBoosterModifierType).moveType === heldItemType,
+        ) &&
+        (!this.requireTransferable || it.isTransferable)
+      );
     });
     if (requiredItems && requiredItems.length > 0) {
-      return [ "heldItem", requiredItems[0].type.name ];
+      return ["heldItem", requiredItems[0].type.name];
     }
-    return [ "heldItem", "" ];
+    return ["heldItem", ""];
   }
 }
 
@@ -939,7 +1042,7 @@ export class LevelRequirement extends EncounterPokemonRequirement {
   minNumberOfPokemon: number;
   invertQuery: boolean;
 
-  constructor(requiredLevelRange: [number, number], minNumberOfPokemon: number = 1, invertQuery: boolean = false) {
+  constructor(requiredLevelRange: [number, number], minNumberOfPokemon = 1, invertQuery = false) {
     super();
     this.minNumberOfPokemon = minNumberOfPokemon;
     this.invertQuery = invertQuery;
@@ -960,15 +1063,18 @@ export class LevelRequirement extends EncounterPokemonRequirement {
 
   override queryParty(partyPokemon: PlayerPokemon[]): PlayerPokemon[] {
     if (!this.invertQuery) {
-      return partyPokemon.filter((pokemon) => pokemon.level >= this.requiredLevelRange[0] && pokemon.level <= this.requiredLevelRange[1]);
-    } else {
-      // for an inverted query, we only want to get the pokemon that don't have ANY of the listed requiredLevelRanges
-      return partyPokemon.filter((pokemon) => pokemon.level < this.requiredLevelRange[0] || pokemon.level > this.requiredLevelRange[1]);
+      return partyPokemon.filter(
+        pokemon => pokemon.level >= this.requiredLevelRange[0] && pokemon.level <= this.requiredLevelRange[1],
+      );
     }
+    // for an inverted query, we only want to get the pokemon that don't have ANY of the listed requiredLevelRanges
+    return partyPokemon.filter(
+      pokemon => pokemon.level < this.requiredLevelRange[0] || pokemon.level > this.requiredLevelRange[1],
+    );
   }
 
   override getDialogueToken(pokemon?: PlayerPokemon): [string, string] {
-    return [ "level", pokemon?.level.toString() ?? "" ];
+    return ["level", pokemon?.level.toString() ?? ""];
   }
 }
 
@@ -977,7 +1083,7 @@ export class FriendshipRequirement extends EncounterPokemonRequirement {
   minNumberOfPokemon: number;
   invertQuery: boolean;
 
-  constructor(requiredFriendshipRange: [number, number], minNumberOfPokemon: number = 1, invertQuery: boolean = false) {
+  constructor(requiredFriendshipRange: [number, number], minNumberOfPokemon = 1, invertQuery = false) {
     super();
     this.minNumberOfPokemon = minNumberOfPokemon;
     this.invertQuery = invertQuery;
@@ -986,7 +1092,10 @@ export class FriendshipRequirement extends EncounterPokemonRequirement {
 
   override meetsRequirement(): boolean {
     // Party Pokemon inside required friendship range
-    if (!isNullOrUndefined(this.requiredFriendshipRange) && this.requiredFriendshipRange[0] <= this.requiredFriendshipRange[1]) {
+    if (
+      !isNullOrUndefined(this.requiredFriendshipRange) &&
+      this.requiredFriendshipRange[0] <= this.requiredFriendshipRange[1]
+    ) {
       const partyPokemon = globalScene.getPlayerParty();
       const pokemonInRange = this.queryParty(partyPokemon);
       if (pokemonInRange.length < this.minNumberOfPokemon) {
@@ -998,15 +1107,21 @@ export class FriendshipRequirement extends EncounterPokemonRequirement {
 
   override queryParty(partyPokemon: PlayerPokemon[]): PlayerPokemon[] {
     if (!this.invertQuery) {
-      return partyPokemon.filter((pokemon) => pokemon.friendship >= this.requiredFriendshipRange[0] && pokemon.friendship <= this.requiredFriendshipRange[1]);
-    } else {
-      // for an inverted query, we only want to get the pokemon that don't have ANY of the listed requiredFriendshipRanges
-      return partyPokemon.filter((pokemon) => pokemon.friendship < this.requiredFriendshipRange[0] || pokemon.friendship > this.requiredFriendshipRange[1]);
+      return partyPokemon.filter(
+        pokemon =>
+          pokemon.friendship >= this.requiredFriendshipRange[0] &&
+          pokemon.friendship <= this.requiredFriendshipRange[1],
+      );
     }
+    // for an inverted query, we only want to get the pokemon that don't have ANY of the listed requiredFriendshipRanges
+    return partyPokemon.filter(
+      pokemon =>
+        pokemon.friendship < this.requiredFriendshipRange[0] || pokemon.friendship > this.requiredFriendshipRange[1],
+    );
   }
 
   override getDialogueToken(pokemon?: PlayerPokemon): [string, string] {
-    return [ "friendship", pokemon?.friendship.toString() ?? "" ];
+    return ["friendship", pokemon?.friendship.toString() ?? ""];
   }
 }
 
@@ -1020,7 +1135,7 @@ export class HealthRatioRequirement extends EncounterPokemonRequirement {
   minNumberOfPokemon: number;
   invertQuery: boolean;
 
-  constructor(requiredHealthRange: [number, number], minNumberOfPokemon: number = 1, invertQuery: boolean = false) {
+  constructor(requiredHealthRange: [number, number], minNumberOfPokemon = 1, invertQuery = false) {
     super();
     this.minNumberOfPokemon = minNumberOfPokemon;
     this.invertQuery = invertQuery;
@@ -1041,21 +1156,25 @@ export class HealthRatioRequirement extends EncounterPokemonRequirement {
 
   override queryParty(partyPokemon: PlayerPokemon[]): PlayerPokemon[] {
     if (!this.invertQuery) {
-      return partyPokemon.filter((pokemon) => {
-        return pokemon.getHpRatio() >= this.requiredHealthRange[0] && pokemon.getHpRatio() <= this.requiredHealthRange[1];
+      return partyPokemon.filter(pokemon => {
+        return (
+          pokemon.getHpRatio() >= this.requiredHealthRange[0] && pokemon.getHpRatio() <= this.requiredHealthRange[1]
+        );
       });
-    } else {
-      // for an inverted query, we only want to get the pokemon that don't have ANY of the listed requiredHealthRanges
-      return partyPokemon.filter((pokemon) => pokemon.getHpRatio() < this.requiredHealthRange[0] || pokemon.getHpRatio() > this.requiredHealthRange[1]);
     }
+    // for an inverted query, we only want to get the pokemon that don't have ANY of the listed requiredHealthRanges
+    return partyPokemon.filter(
+      pokemon =>
+        pokemon.getHpRatio() < this.requiredHealthRange[0] || pokemon.getHpRatio() > this.requiredHealthRange[1],
+    );
   }
 
   override getDialogueToken(pokemon?: PlayerPokemon): [string, string] {
     const hpRatio = pokemon?.getHpRatio();
     if (!isNullOrUndefined(hpRatio)) {
-      return [ "healthRatio", Math.floor(hpRatio * 100).toString() + "%" ];
+      return ["healthRatio", Math.floor(hpRatio * 100).toString() + "%"];
     }
-    return [ "healthRatio", "" ];
+    return ["healthRatio", ""];
   }
 }
 
@@ -1064,7 +1183,7 @@ export class WeightRequirement extends EncounterPokemonRequirement {
   minNumberOfPokemon: number;
   invertQuery: boolean;
 
-  constructor(requiredWeightRange: [number, number], minNumberOfPokemon: number = 1, invertQuery: boolean = false) {
+  constructor(requiredWeightRange: [number, number], minNumberOfPokemon = 1, invertQuery = false) {
     super();
     this.minNumberOfPokemon = minNumberOfPokemon;
     this.invertQuery = invertQuery;
@@ -1085,15 +1204,18 @@ export class WeightRequirement extends EncounterPokemonRequirement {
 
   override queryParty(partyPokemon: PlayerPokemon[]): PlayerPokemon[] {
     if (!this.invertQuery) {
-      return partyPokemon.filter((pokemon) => pokemon.getWeight() >= this.requiredWeightRange[0] && pokemon.getWeight() <= this.requiredWeightRange[1]);
-    } else {
-      // for an inverted query, we only want to get the pokemon that don't have ANY of the listed requiredWeightRanges
-      return partyPokemon.filter((pokemon) => pokemon.getWeight() < this.requiredWeightRange[0] || pokemon.getWeight() > this.requiredWeightRange[1]);
+      return partyPokemon.filter(
+        pokemon =>
+          pokemon.getWeight() >= this.requiredWeightRange[0] && pokemon.getWeight() <= this.requiredWeightRange[1],
+      );
     }
+    // for an inverted query, we only want to get the pokemon that don't have ANY of the listed requiredWeightRanges
+    return partyPokemon.filter(
+      pokemon => pokemon.getWeight() < this.requiredWeightRange[0] || pokemon.getWeight() > this.requiredWeightRange[1],
+    );
   }
 
   override getDialogueToken(pokemon?: PlayerPokemon): [string, string] {
-    return [ "weight", pokemon?.getWeight().toString() ?? "" ];
+    return ["weight", pokemon?.getWeight().toString() ?? ""];
   }
 }
-
diff --git a/src/data/mystery-encounters/mystery-encounter-save-data.ts b/src/data/mystery-encounters/mystery-encounter-save-data.ts
index 7c8110628f0..dd633390e46 100644
--- a/src/data/mystery-encounters/mystery-encounter-save-data.ts
+++ b/src/data/mystery-encounters/mystery-encounter-save-data.ts
@@ -1,6 +1,6 @@
 import type { MysteryEncounterType } from "#enums/mystery-encounter-type";
 import { BASE_MYSTERY_ENCOUNTER_SPAWN_WEIGHT } from "#app/data/mystery-encounters/mystery-encounters";
-import { isNullOrUndefined } from "#app/utils";
+import { isNullOrUndefined } from "#app/utils/common";
 import type { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
 
 export class SeenEncounterData {
diff --git a/src/data/mystery-encounters/mystery-encounter.ts b/src/data/mystery-encounters/mystery-encounter.ts
index c90649e551d..e305252ed0f 100644
--- a/src/data/mystery-encounters/mystery-encounter.ts
+++ b/src/data/mystery-encounters/mystery-encounter.ts
@@ -1,18 +1,25 @@
 import type { EnemyPartyConfig } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
 import type { PlayerPokemon, PokemonMove } from "#app/field/pokemon";
 import type Pokemon from "#app/field/pokemon";
-import { capitalizeFirstLetter, isNullOrUndefined } from "#app/utils";
+import { capitalizeFirstLetter, isNullOrUndefined } from "#app/utils/common";
 import type { MysteryEncounterType } from "#enums/mystery-encounter-type";
 import type { MysteryEncounterSpriteConfig } from "#app/field/mystery-encounter-intro";
 import MysteryEncounterIntroVisuals from "#app/field/mystery-encounter-intro";
-import * as Utils from "#app/utils";
+import { randSeedInt } from "#app/utils/common";
 import type { StatusEffect } from "#enums/status-effect";
 import type { OptionTextDisplay } from "./mystery-encounter-dialogue";
 import type MysteryEncounterDialogue from "./mystery-encounter-dialogue";
 import type { OptionPhaseCallback } from "./mystery-encounter-option";
 import type MysteryEncounterOption from "./mystery-encounter-option";
 import { MysteryEncounterOptionBuilder } from "./mystery-encounter-option";
-import { EncounterPokemonRequirement, EncounterSceneRequirement, HealthRatioRequirement, PartySizeRequirement, StatusEffectRequirement, WaveRangeRequirement } from "./mystery-encounter-requirements";
+import {
+  EncounterPokemonRequirement,
+  EncounterSceneRequirement,
+  HealthRatioRequirement,
+  PartySizeRequirement,
+  StatusEffectRequirement,
+  WaveRangeRequirement,
+} from "./mystery-encounter-requirements";
 import type { BattlerIndex } from "#app/battle";
 import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
 import { MysteryEncounterMode } from "#enums/mystery-encounter-mode";
@@ -276,9 +283,12 @@ export default class MysteryEncounter implements IMysteryEncounter {
     this.encounterTier = this.encounterTier ?? MysteryEncounterTier.COMMON;
     this.localizationKey = this.localizationKey ?? "";
     this.dialogue = this.dialogue ?? {};
-    this.spriteConfigs = this.spriteConfigs ? [ ...this.spriteConfigs ] : [];
+    this.spriteConfigs = this.spriteConfigs ? [...this.spriteConfigs] : [];
     // Default max is 1 for ROGUE encounters, 2 for others
-    this.maxAllowedEncounters = this.maxAllowedEncounters ?? this.encounterTier === MysteryEncounterTier.ROGUE ? DEFAULT_MAX_ALLOWED_ROGUE_ENCOUNTERS : DEFAULT_MAX_ALLOWED_ENCOUNTERS;
+    this.maxAllowedEncounters =
+      (this.maxAllowedEncounters ?? this.encounterTier === MysteryEncounterTier.ROGUE)
+        ? DEFAULT_MAX_ALLOWED_ROGUE_ENCOUNTERS
+        : DEFAULT_MAX_ALLOWED_ENCOUNTERS;
     this.encounterMode = MysteryEncounterMode.DEFAULT;
     this.requirements = this.requirements ? this.requirements : [];
     this.hideBattleIntroMessage = this.hideBattleIntroMessage ?? false;
@@ -317,7 +327,13 @@ export default class MysteryEncounter implements IMysteryEncounter {
    * @param pokemon
    */
   pokemonMeetsPrimaryRequirements(pokemon: Pokemon): boolean {
-    return !this.primaryPokemonRequirements.some(req => !req.queryParty(globalScene.getPlayerParty()).map(p => p.id).includes(pokemon.id));
+    return !this.primaryPokemonRequirements.some(
+      req =>
+        !req
+          .queryParty(globalScene.getPlayerParty())
+          .map(p => p.id)
+          .includes(pokemon.id),
+    );
   }
 
   /**
@@ -359,28 +375,27 @@ export default class MysteryEncounter implements IMysteryEncounter {
         } else {
           overlap.push(qp);
         }
-
       }
       if (truePrimaryPool.length > 0) {
         // Always choose from the non-overlapping pokemon first
-        this.primaryPokemon = truePrimaryPool[Utils.randSeedInt(truePrimaryPool.length, 0)];
+        this.primaryPokemon = truePrimaryPool[randSeedInt(truePrimaryPool.length, 0)];
         return true;
-      } else {
-        // If there are multiple overlapping pokemon, we're okay - just choose one and take it out of the primary pokemon pool
-        if (overlap.length > 1 || (this.secondaryPokemon.length - overlap.length >= 1)) {
-          // is this working?
-          this.primaryPokemon = overlap[Utils.randSeedInt(overlap.length, 0)];
-          this.secondaryPokemon = this.secondaryPokemon.filter((supp) => supp !== this.primaryPokemon);
-          return true;
-        }
-        console.log("Mystery Encounter Edge Case: Requirement not met due to primary pokemon overlapping with secondary pokemon. There's no valid primary pokemon left.");
-        return false;
       }
-    } else {
-      // this means we CAN have the same pokemon be a primary and secondary pokemon, so just choose any qualifying one randomly.
-      this.primaryPokemon = qualified[Utils.randSeedInt(qualified.length, 0)];
-      return true;
+      // If there are multiple overlapping pokemon, we're okay - just choose one and take it out of the primary pokemon pool
+      if (overlap.length > 1 || this.secondaryPokemon.length - overlap.length >= 1) {
+        // is this working?
+        this.primaryPokemon = overlap[randSeedInt(overlap.length, 0)];
+        this.secondaryPokemon = this.secondaryPokemon.filter(supp => supp !== this.primaryPokemon);
+        return true;
+      }
+      console.log(
+        "Mystery Encounter Edge Case: Requirement not met due to primary pokemon overlapping with secondary pokemon. There's no valid primary pokemon left.",
+      );
+      return false;
     }
+    // this means we CAN have the same pokemon be a primary and secondary pokemon, so just choose any qualifying one randomly.
+    this.primaryPokemon = qualified[randSeedInt(qualified.length, 0)];
+    return true;
   }
 
   /**
@@ -533,28 +548,28 @@ export class MysteryEncounterBuilder implements Partial<IMysteryEncounter> {
   options: [MysteryEncounterOption, MysteryEncounterOption, ...MysteryEncounterOption[]];
   enemyPartyConfigs: EnemyPartyConfig[] = [];
 
-  localizationKey: string = "";
+  localizationKey = "";
   dialogue: MysteryEncounterDialogue = {};
   requirements: EncounterSceneRequirement[] = [];
   primaryPokemonRequirements: EncounterPokemonRequirement[] = [];
   secondaryPokemonRequirements: EncounterPokemonRequirement[] = [];
-  excludePrimaryFromSupportRequirements: boolean = true;
+  excludePrimaryFromSupportRequirements = true;
   dialogueTokens: Record<string, string> = {};
 
-  hideBattleIntroMessage: boolean = false;
-  autoHideIntroVisuals: boolean = true;
-  enterIntroVisualsFromRight: boolean = false;
-  continuousEncounter: boolean = false;
-  catchAllowed: boolean = false;
-  fleeAllowed: boolean = true;
-  lockEncounterRewardTiers: boolean = false;
-  startOfBattleEffectsComplete: boolean = false;
-  hasBattleAnimationsWithoutTargets: boolean = false;
-  skipEnemyBattleTurns: boolean = false;
-  skipToFightInput: boolean = false;
-  preventGameStatsUpdates: boolean = false;
-  maxAllowedEncounters: number = 3;
-  expMultiplier: number = 1;
+  hideBattleIntroMessage = false;
+  autoHideIntroVisuals = true;
+  enterIntroVisualsFromRight = false;
+  continuousEncounter = false;
+  catchAllowed = false;
+  fleeAllowed = true;
+  lockEncounterRewardTiers = false;
+  startOfBattleEffectsComplete = false;
+  hasBattleAnimationsWithoutTargets = false;
+  skipEnemyBattleTurns = false;
+  skipToFightInput = false;
+  preventGameStatsUpdates = false;
+  maxAllowedEncounters = 3;
+  expMultiplier = 1;
 
   /**
    * REQUIRED
@@ -566,7 +581,9 @@ export class MysteryEncounterBuilder implements Partial<IMysteryEncounter> {
    * @param encounterType
    * @returns this
    */
-  static withEncounterType(encounterType: MysteryEncounterType): MysteryEncounterBuilder & Pick<IMysteryEncounter, "encounterType"> {
+  static withEncounterType(
+    encounterType: MysteryEncounterType,
+  ): MysteryEncounterBuilder & Pick<IMysteryEncounter, "encounterType"> {
     return Object.assign(new MysteryEncounterBuilder(), { encounterType });
   }
 
@@ -580,12 +597,11 @@ export class MysteryEncounterBuilder implements Partial<IMysteryEncounter> {
    */
   withOption(option: MysteryEncounterOption): this & Pick<IMysteryEncounter, "options"> {
     if (!this.options) {
-      const options = [ option ];
+      const options = [option];
       return Object.assign(this, { options });
-    } else {
-      this.options.push(option);
-      return this;
     }
+    this.options.push(option);
+    return this;
   }
 
   /**
@@ -598,8 +614,16 @@ export class MysteryEncounterBuilder implements Partial<IMysteryEncounter> {
    * @param callback {@linkcode OptionPhaseCallback}
    * @returns
    */
-  withSimpleOption(dialogue: OptionTextDisplay, callback: OptionPhaseCallback): this & Pick<IMysteryEncounter, "options"> {
-    return this.withOption(MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DEFAULT).withDialogue(dialogue).withOptionPhase(callback).build());
+  withSimpleOption(
+    dialogue: OptionTextDisplay,
+    callback: OptionPhaseCallback,
+  ): this & Pick<IMysteryEncounter, "options"> {
+    return this.withOption(
+      MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DEFAULT)
+        .withDialogue(dialogue)
+        .withOptionPhase(callback)
+        .build(),
+    );
   }
 
   /**
@@ -612,12 +636,17 @@ export class MysteryEncounterBuilder implements Partial<IMysteryEncounter> {
    * @param callback {@linkcode OptionPhaseCallback}
    * @returns
    */
-  withSimpleDexProgressOption(dialogue: OptionTextDisplay, callback: OptionPhaseCallback): this & Pick<IMysteryEncounter, "options"> {
-    return this.withOption(MysteryEncounterOptionBuilder
-      .newOptionWithMode(MysteryEncounterOptionMode.DEFAULT)
-      .withHasDexProgress(true)
-      .withDialogue(dialogue)
-      .withOptionPhase(callback).build());
+  withSimpleDexProgressOption(
+    dialogue: OptionTextDisplay,
+    callback: OptionPhaseCallback,
+  ): this & Pick<IMysteryEncounter, "options"> {
+    return this.withOption(
+      MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DEFAULT)
+        .withHasDexProgress(true)
+        .withDialogue(dialogue)
+        .withOptionPhase(callback)
+        .build(),
+    );
   }
 
   /**
@@ -626,7 +655,9 @@ export class MysteryEncounterBuilder implements Partial<IMysteryEncounter> {
    * @param spriteConfigs
    * @returns
    */
-  withIntroSpriteConfigs(spriteConfigs: MysteryEncounterSpriteConfig[]): this & Pick<IMysteryEncounter, "spriteConfigs"> {
+  withIntroSpriteConfigs(
+    spriteConfigs: MysteryEncounterSpriteConfig[],
+  ): this & Pick<IMysteryEncounter, "spriteConfigs"> {
     return Object.assign(this, { spriteConfigs: spriteConfigs });
   }
 
@@ -635,7 +666,13 @@ export class MysteryEncounterBuilder implements Partial<IMysteryEncounter> {
     return this;
   }
 
-  withIntro({ spriteConfigs, dialogue } : {spriteConfigs: MysteryEncounterSpriteConfig[], dialogue?:  MysteryEncounterDialogue["intro"]}) {
+  withIntro({
+    spriteConfigs,
+    dialogue,
+  }: {
+    spriteConfigs: MysteryEncounterSpriteConfig[];
+    dialogue?: MysteryEncounterDialogue["intro"];
+  }) {
     return this.withIntroSpriteConfigs(spriteConfigs).withIntroDialogue(dialogue);
   }
 
@@ -676,8 +713,10 @@ export class MysteryEncounterBuilder implements Partial<IMysteryEncounter> {
    * @param encounterAnimations
    * @returns
    */
-  withAnimations(...encounterAnimations: EncounterAnim[]): this & Required<Pick<IMysteryEncounter, "encounterAnimations">> {
-    const animations = Array.isArray(encounterAnimations) ? encounterAnimations : [ encounterAnimations ];
+  withAnimations(
+    ...encounterAnimations: EncounterAnim[]
+  ): this & Required<Pick<IMysteryEncounter, "encounterAnimations">> {
+    const animations = Array.isArray(encounterAnimations) ? encounterAnimations : [encounterAnimations];
     return Object.assign(this, { encounterAnimations: animations });
   }
 
@@ -686,8 +725,10 @@ export class MysteryEncounterBuilder implements Partial<IMysteryEncounter> {
    * @returns
    * @param disallowedGameModes
    */
-  withDisallowedGameModes(...disallowedGameModes: GameModes[]): this & Required<Pick<IMysteryEncounter, "disallowedGameModes">> {
-    const gameModes = Array.isArray(disallowedGameModes) ? disallowedGameModes : [ disallowedGameModes ];
+  withDisallowedGameModes(
+    ...disallowedGameModes: GameModes[]
+  ): this & Required<Pick<IMysteryEncounter, "disallowedGameModes">> {
+    const gameModes = Array.isArray(disallowedGameModes) ? disallowedGameModes : [disallowedGameModes];
     return Object.assign(this, { disallowedGameModes: gameModes });
   }
 
@@ -696,8 +737,10 @@ export class MysteryEncounterBuilder implements Partial<IMysteryEncounter> {
    * @returns
    * @param disallowedChallenges
    */
-  withDisallowedChallenges(...disallowedChallenges: Challenges[]): this & Required<Pick<IMysteryEncounter, "disallowedChallenges">> {
-    const challenges = Array.isArray(disallowedChallenges) ? disallowedChallenges : [ disallowedChallenges ];
+  withDisallowedChallenges(
+    ...disallowedChallenges: Challenges[]
+  ): this & Required<Pick<IMysteryEncounter, "disallowedChallenges">> {
+    const challenges = Array.isArray(disallowedChallenges) ? disallowedChallenges : [disallowedChallenges];
     return Object.assign(this, { disallowedChallenges: challenges });
   }
 
@@ -707,7 +750,9 @@ export class MysteryEncounterBuilder implements Partial<IMysteryEncounter> {
    * Default false
    * @param continuousEncounter
    */
-  withContinuousEncounter(continuousEncounter: boolean): this & Required<Pick<IMysteryEncounter, "continuousEncounter">> {
+  withContinuousEncounter(
+    continuousEncounter: boolean,
+  ): this & Required<Pick<IMysteryEncounter, "continuousEncounter">> {
     return Object.assign(this, { continuousEncounter: continuousEncounter });
   }
 
@@ -717,7 +762,9 @@ export class MysteryEncounterBuilder implements Partial<IMysteryEncounter> {
    * Default false
    * @param hasBattleAnimationsWithoutTargets
    */
-  withBattleAnimationsWithoutTargets(hasBattleAnimationsWithoutTargets: boolean): this & Required<Pick<IMysteryEncounter, "hasBattleAnimationsWithoutTargets">> {
+  withBattleAnimationsWithoutTargets(
+    hasBattleAnimationsWithoutTargets: boolean,
+  ): this & Required<Pick<IMysteryEncounter, "hasBattleAnimationsWithoutTargets">> {
     return Object.assign(this, { hasBattleAnimationsWithoutTargets });
   }
 
@@ -727,7 +774,9 @@ export class MysteryEncounterBuilder implements Partial<IMysteryEncounter> {
    * Default false
    * @param skipEnemyBattleTurns
    */
-  withSkipEnemyBattleTurns(skipEnemyBattleTurns: boolean): this & Required<Pick<IMysteryEncounter, "skipEnemyBattleTurns">> {
+  withSkipEnemyBattleTurns(
+    skipEnemyBattleTurns: boolean,
+  ): this & Required<Pick<IMysteryEncounter, "skipEnemyBattleTurns">> {
     return Object.assign(this, { skipEnemyBattleTurns });
   }
 
@@ -744,7 +793,9 @@ export class MysteryEncounterBuilder implements Partial<IMysteryEncounter> {
    * If true, will prevent updating {@linkcode GameStats} for encountering and/or defeating Pokemon
    * Default `false`
    */
-  withPreventGameStatsUpdates(preventGameStatsUpdates: boolean): this & Required<Pick<IMysteryEncounter, "preventGameStatsUpdates">> {
+  withPreventGameStatsUpdates(
+    preventGameStatsUpdates: boolean,
+  ): this & Required<Pick<IMysteryEncounter, "preventGameStatsUpdates">> {
     return Object.assign(this, { preventGameStatsUpdates });
   }
 
@@ -753,7 +804,9 @@ export class MysteryEncounterBuilder implements Partial<IMysteryEncounter> {
    * @param maxAllowedEncounters
    * @returns
    */
-  withMaxAllowedEncounters(maxAllowedEncounters: number): this & Required<Pick<IMysteryEncounter, "maxAllowedEncounters">> {
+  withMaxAllowedEncounters(
+    maxAllowedEncounters: number,
+  ): this & Required<Pick<IMysteryEncounter, "maxAllowedEncounters">> {
     return Object.assign(this, { maxAllowedEncounters: maxAllowedEncounters });
   }
 
@@ -764,7 +817,9 @@ export class MysteryEncounterBuilder implements Partial<IMysteryEncounter> {
    * @param requirement
    * @returns
    */
-  withSceneRequirement(requirement: EncounterSceneRequirement): this & Required<Pick<IMysteryEncounter, "requirements">> {
+  withSceneRequirement(
+    requirement: EncounterSceneRequirement,
+  ): this & Required<Pick<IMysteryEncounter, "requirements">> {
     if (requirement instanceof EncounterPokemonRequirement) {
       Error("Incorrectly added pokemon requirement as scene requirement.");
     }
@@ -780,7 +835,7 @@ export class MysteryEncounterBuilder implements Partial<IMysteryEncounter> {
    * @returns
    */
   withSceneWaveRangeRequirement(min: number, max?: number): this & Required<Pick<IMysteryEncounter, "requirements">> {
-    return this.withSceneRequirement(new WaveRangeRequirement([ min, max ?? min ]));
+    return this.withSceneRequirement(new WaveRangeRequirement([min, max ?? min]));
   }
 
   /**
@@ -791,8 +846,12 @@ export class MysteryEncounterBuilder implements Partial<IMysteryEncounter> {
    * @param excludeDisallowedPokemon if true, only counts allowed (legal in Challenge/unfainted) mons
    * @returns
    */
-  withScenePartySizeRequirement(min: number, max?: number, excludeDisallowedPokemon: boolean = false): this & Required<Pick<IMysteryEncounter, "requirements">> {
-    return this.withSceneRequirement(new PartySizeRequirement([ min, max ?? min ], excludeDisallowedPokemon));
+  withScenePartySizeRequirement(
+    min: number,
+    max?: number,
+    excludeDisallowedPokemon = false,
+  ): this & Required<Pick<IMysteryEncounter, "requirements">> {
+    return this.withSceneRequirement(new PartySizeRequirement([min, max ?? min], excludeDisallowedPokemon));
   }
 
   /**
@@ -801,13 +860,17 @@ export class MysteryEncounterBuilder implements Partial<IMysteryEncounter> {
    * @param requirement {@linkcode EncounterPokemonRequirement}
    * @returns
    */
-  withPrimaryPokemonRequirement(requirement: EncounterPokemonRequirement): this & Required<Pick<IMysteryEncounter, "primaryPokemonRequirements">> {
+  withPrimaryPokemonRequirement(
+    requirement: EncounterPokemonRequirement,
+  ): this & Required<Pick<IMysteryEncounter, "primaryPokemonRequirements">> {
     if (requirement instanceof EncounterSceneRequirement) {
       Error("Incorrectly added scene requirement as pokemon requirement.");
     }
 
     this.primaryPokemonRequirements.push(requirement);
-    return Object.assign(this, { primaryPokemonRequirements: this.primaryPokemonRequirements });
+    return Object.assign(this, {
+      primaryPokemonRequirements: this.primaryPokemonRequirements,
+    });
   }
 
   /**
@@ -818,8 +881,14 @@ export class MysteryEncounterBuilder implements Partial<IMysteryEncounter> {
    * @param invertQuery if true will invert the query
    * @returns
    */
-  withPrimaryPokemonStatusEffectRequirement(statusEffect: StatusEffect | StatusEffect[], minNumberOfPokemon: number = 1, invertQuery: boolean = false): this & Required<Pick<IMysteryEncounter, "primaryPokemonRequirements">> {
-    return this.withPrimaryPokemonRequirement(new StatusEffectRequirement(statusEffect, minNumberOfPokemon, invertQuery));
+  withPrimaryPokemonStatusEffectRequirement(
+    statusEffect: StatusEffect | StatusEffect[],
+    minNumberOfPokemon = 1,
+    invertQuery = false,
+  ): this & Required<Pick<IMysteryEncounter, "primaryPokemonRequirements">> {
+    return this.withPrimaryPokemonRequirement(
+      new StatusEffectRequirement(statusEffect, minNumberOfPokemon, invertQuery),
+    );
   }
 
   /**
@@ -830,21 +899,33 @@ export class MysteryEncounterBuilder implements Partial<IMysteryEncounter> {
    * @param invertQuery if true will invert the query
    * @returns
    */
-  withPrimaryPokemonHealthRatioRequirement(requiredHealthRange: [number, number], minNumberOfPokemon: number = 1, invertQuery: boolean = false): this & Required<Pick<IMysteryEncounter, "primaryPokemonRequirements">> {
-    return this.withPrimaryPokemonRequirement(new HealthRatioRequirement(requiredHealthRange, minNumberOfPokemon, invertQuery));
+  withPrimaryPokemonHealthRatioRequirement(
+    requiredHealthRange: [number, number],
+    minNumberOfPokemon = 1,
+    invertQuery = false,
+  ): this & Required<Pick<IMysteryEncounter, "primaryPokemonRequirements">> {
+    return this.withPrimaryPokemonRequirement(
+      new HealthRatioRequirement(requiredHealthRange, minNumberOfPokemon, invertQuery),
+    );
   }
 
   // TODO: Maybe add an optional parameter for excluding primary pokemon from the support cast?
   // ex. if your only grass type pokemon, a snivy, is chosen as primary, if the support pokemon requires a grass type, the event won't trigger because
   // it's already been
-  withSecondaryPokemonRequirement(requirement: EncounterPokemonRequirement, excludePrimaryFromSecondaryRequirements: boolean = false): this & Required<Pick<IMysteryEncounter, "secondaryPokemonRequirements">> {
+  withSecondaryPokemonRequirement(
+    requirement: EncounterPokemonRequirement,
+    excludePrimaryFromSecondaryRequirements = false,
+  ): this & Required<Pick<IMysteryEncounter, "secondaryPokemonRequirements">> {
     if (requirement instanceof EncounterSceneRequirement) {
       Error("Incorrectly added scene requirement as pokemon requirement.");
     }
 
     this.secondaryPokemonRequirements.push(requirement);
     this.excludePrimaryFromSupportRequirements = excludePrimaryFromSecondaryRequirements;
-    return Object.assign(this, { excludePrimaryFromSecondaryRequirements: this.excludePrimaryFromSupportRequirements, secondaryPokemonRequirements: this.secondaryPokemonRequirements });
+    return Object.assign(this, {
+      excludePrimaryFromSecondaryRequirements: this.excludePrimaryFromSupportRequirements,
+      secondaryPokemonRequirements: this.secondaryPokemonRequirements,
+    });
   }
 
   /**
@@ -919,15 +1000,21 @@ export class MysteryEncounterBuilder implements Partial<IMysteryEncounter> {
    * @param hideBattleIntroMessage If `true`, will not show the trainerAppeared/wildAppeared/bossAppeared message for an encounter
    * @returns
    */
-  withHideWildIntroMessage(hideBattleIntroMessage: boolean): this & Required<Pick<IMysteryEncounter, "hideBattleIntroMessage">> {
-    return Object.assign(this, { hideBattleIntroMessage: hideBattleIntroMessage });
+  withHideWildIntroMessage(
+    hideBattleIntroMessage: boolean,
+  ): this & Required<Pick<IMysteryEncounter, "hideBattleIntroMessage">> {
+    return Object.assign(this, {
+      hideBattleIntroMessage: hideBattleIntroMessage,
+    });
   }
 
   /**
    * @param autoHideIntroVisuals If `false`, will not hide the intro visuals that are displayed at the beginning of encounter
    * @returns
    */
-  withAutoHideIntroVisuals(autoHideIntroVisuals: boolean): this & Required<Pick<IMysteryEncounter, "autoHideIntroVisuals">> {
+  withAutoHideIntroVisuals(
+    autoHideIntroVisuals: boolean,
+  ): this & Required<Pick<IMysteryEncounter, "autoHideIntroVisuals">> {
     return Object.assign(this, { autoHideIntroVisuals: autoHideIntroVisuals });
   }
 
@@ -936,8 +1023,12 @@ export class MysteryEncounterBuilder implements Partial<IMysteryEncounter> {
    * Default false
    * @returns
    */
-  withEnterIntroVisualsFromRight(enterIntroVisualsFromRight: boolean): this & Required<Pick<IMysteryEncounter, "enterIntroVisualsFromRight">> {
-    return Object.assign(this, { enterIntroVisualsFromRight: enterIntroVisualsFromRight });
+  withEnterIntroVisualsFromRight(
+    enterIntroVisualsFromRight: boolean,
+  ): this & Required<Pick<IMysteryEncounter, "enterIntroVisualsFromRight">> {
+    return Object.assign(this, {
+      enterIntroVisualsFromRight: enterIntroVisualsFromRight,
+    });
   }
 
   /**
@@ -954,7 +1045,7 @@ export class MysteryEncounterBuilder implements Partial<IMysteryEncounter> {
       encounterOptionsDialogue: {
         ...encounterOptionsDialogue,
         title,
-      }
+      },
     };
 
     return this;
@@ -974,7 +1065,7 @@ export class MysteryEncounterBuilder implements Partial<IMysteryEncounter> {
       encounterOptionsDialogue: {
         ...encounterOptionsDialogue,
         description,
-      }
+      },
     };
 
     return this;
@@ -994,7 +1085,7 @@ export class MysteryEncounterBuilder implements Partial<IMysteryEncounter> {
       encounterOptionsDialogue: {
         ...encounterOptionsDialogue,
         query,
-      }
+      },
     };
 
     return this;
diff --git a/src/data/mystery-encounters/mystery-encounters.ts b/src/data/mystery-encounters/mystery-encounters.ts
index 3219640e4e5..1a36dc27df2 100644
--- a/src/data/mystery-encounters/mystery-encounters.ts
+++ b/src/data/mystery-encounters/mystery-encounters.ts
@@ -80,7 +80,7 @@ export const EXTREME_ENCOUNTER_BIOMES = [
   Biome.WASTELAND,
   Biome.ABYSS,
   Biome.SPACE,
-  Biome.END
+  Biome.END,
 ];
 
 export const NON_EXTREME_ENCOUNTER_BIOMES = [
@@ -108,7 +108,7 @@ export const NON_EXTREME_ENCOUNTER_BIOMES = [
   Biome.SLUM,
   Biome.SNOWY_FOREST,
   Biome.ISLAND,
-  Biome.LABORATORY
+  Biome.LABORATORY,
 ];
 
 /**
@@ -147,7 +147,7 @@ export const HUMAN_TRANSITABLE_BIOMES = [
   Biome.SLUM,
   Biome.SNOWY_FOREST,
   Biome.ISLAND,
-  Biome.LABORATORY
+  Biome.LABORATORY,
 ];
 
 /**
@@ -168,11 +168,12 @@ export const CIVILIZATION_ENCOUNTER_BIOMES = [
   Biome.FACTORY,
   Biome.CONSTRUCTION_SITE,
   Biome.SLUM,
-  Biome.ISLAND
+  Biome.ISLAND,
 ];
 
-export const allMysteryEncounters: { [encounterType: number]: MysteryEncounter } = {};
-
+export const allMysteryEncounters: {
+  [encounterType: number]: MysteryEncounter;
+} = {};
 
 const extremeBiomeEncounters: MysteryEncounterType[] = [];
 
@@ -187,14 +188,14 @@ const humanTransitableBiomeEncounters: MysteryEncounterType[] = [
   MysteryEncounterType.THE_POKEMON_SALESMAN,
   // MysteryEncounterType.AN_OFFER_YOU_CANT_REFUSE, Disabled
   MysteryEncounterType.THE_WINSTRATE_CHALLENGE,
-  MysteryEncounterType.THE_EXPERT_POKEMON_BREEDER
+  MysteryEncounterType.THE_EXPERT_POKEMON_BREEDER,
 ];
 
 const civilizationBiomeEncounters: MysteryEncounterType[] = [
   MysteryEncounterType.DEPARTMENT_STORE_SALE,
   MysteryEncounterType.PART_TIMER,
   MysteryEncounterType.FUN_AND_GAMES,
-  MysteryEncounterType.GLOBAL_TRADE_SYSTEM
+  MysteryEncounterType.GLOBAL_TRADE_SYSTEM,
 ];
 
 /**
@@ -213,7 +214,7 @@ const anyBiomeEncounters: MysteryEncounterType[] = [
   MysteryEncounterType.WEIRD_DREAM,
   MysteryEncounterType.TELEPORTING_HIJINKS,
   MysteryEncounterType.BUG_TYPE_SUPERFAN,
-  MysteryEncounterType.UNCOMMON_BREED
+  MysteryEncounterType.UNCOMMON_BREED,
 ];
 
 /**
@@ -224,72 +225,40 @@ const anyBiomeEncounters: MysteryEncounterType[] = [
  * that biome groups do not cover
  */
 export const mysteryEncountersByBiome = new Map<Biome, MysteryEncounterType[]>([
-  [ Biome.TOWN, []],
-  [ Biome.PLAINS, [
-    MysteryEncounterType.SLUMBERING_SNORLAX,
-    MysteryEncounterType.ABSOLUTE_AVARICE
-  ]],
-  [ Biome.GRASS, [
-    MysteryEncounterType.SLUMBERING_SNORLAX,
-    MysteryEncounterType.ABSOLUTE_AVARICE
-  ]],
-  [ Biome.TALL_GRASS, [
-    MysteryEncounterType.ABSOLUTE_AVARICE
-  ]],
-  [ Biome.METROPOLIS, []],
-  [ Biome.FOREST, [
-    MysteryEncounterType.SAFARI_ZONE,
-    MysteryEncounterType.ABSOLUTE_AVARICE
-  ]],
-  [ Biome.SEA, [
-    MysteryEncounterType.LOST_AT_SEA
-  ]],
-  [ Biome.SWAMP, [
-    MysteryEncounterType.SAFARI_ZONE
-  ]],
-  [ Biome.BEACH, []],
-  [ Biome.LAKE, []],
-  [ Biome.SEABED, []],
-  [ Biome.MOUNTAIN, []],
-  [ Biome.BADLANDS, [
-    MysteryEncounterType.DANCING_LESSONS
-  ]],
-  [ Biome.CAVE, [
-    MysteryEncounterType.THE_STRONG_STUFF
-  ]],
-  [ Biome.DESERT, [
-    MysteryEncounterType.DANCING_LESSONS
-  ]],
-  [ Biome.ICE_CAVE, []],
-  [ Biome.MEADOW, []],
-  [ Biome.POWER_PLANT, []],
-  [ Biome.VOLCANO, [
-    MysteryEncounterType.FIERY_FALLOUT,
-    MysteryEncounterType.DANCING_LESSONS
-  ]],
-  [ Biome.GRAVEYARD, []],
-  [ Biome.DOJO, []],
-  [ Biome.FACTORY, []],
-  [ Biome.RUINS, []],
-  [ Biome.WASTELAND, [
-    MysteryEncounterType.DANCING_LESSONS
-  ]],
-  [ Biome.ABYSS, [
-    MysteryEncounterType.DANCING_LESSONS
-  ]],
-  [ Biome.SPACE, [
-    MysteryEncounterType.THE_EXPERT_POKEMON_BREEDER
-  ]],
-  [ Biome.CONSTRUCTION_SITE, []],
-  [ Biome.JUNGLE, [
-    MysteryEncounterType.SAFARI_ZONE
-  ]],
-  [ Biome.FAIRY_CAVE, []],
-  [ Biome.TEMPLE, []],
-  [ Biome.SLUM, []],
-  [ Biome.SNOWY_FOREST, []],
-  [ Biome.ISLAND, []],
-  [ Biome.LABORATORY, []]
+  [Biome.TOWN, []],
+  [Biome.PLAINS, [MysteryEncounterType.SLUMBERING_SNORLAX]],
+  [Biome.GRASS, [MysteryEncounterType.SLUMBERING_SNORLAX, MysteryEncounterType.ABSOLUTE_AVARICE]],
+  [Biome.TALL_GRASS, [MysteryEncounterType.SLUMBERING_SNORLAX, MysteryEncounterType.ABSOLUTE_AVARICE]],
+  [Biome.METROPOLIS, []],
+  [Biome.FOREST, [MysteryEncounterType.SAFARI_ZONE, MysteryEncounterType.ABSOLUTE_AVARICE]],
+  [Biome.SEA, [MysteryEncounterType.LOST_AT_SEA]],
+  [Biome.SWAMP, [MysteryEncounterType.SAFARI_ZONE]],
+  [Biome.BEACH, []],
+  [Biome.LAKE, []],
+  [Biome.SEABED, []],
+  [Biome.MOUNTAIN, []],
+  [Biome.BADLANDS, [MysteryEncounterType.DANCING_LESSONS]],
+  [Biome.CAVE, [MysteryEncounterType.THE_STRONG_STUFF]],
+  [Biome.DESERT, [MysteryEncounterType.DANCING_LESSONS]],
+  [Biome.ICE_CAVE, []],
+  [Biome.MEADOW, []],
+  [Biome.POWER_PLANT, []],
+  [Biome.VOLCANO, [MysteryEncounterType.FIERY_FALLOUT, MysteryEncounterType.DANCING_LESSONS]],
+  [Biome.GRAVEYARD, []],
+  [Biome.DOJO, []],
+  [Biome.FACTORY, []],
+  [Biome.RUINS, []],
+  [Biome.WASTELAND, [MysteryEncounterType.DANCING_LESSONS]],
+  [Biome.ABYSS, [MysteryEncounterType.DANCING_LESSONS]],
+  [Biome.SPACE, [MysteryEncounterType.THE_EXPERT_POKEMON_BREEDER]],
+  [Biome.CONSTRUCTION_SITE, []],
+  [Biome.JUNGLE, [MysteryEncounterType.SAFARI_ZONE]],
+  [Biome.FAIRY_CAVE, []],
+  [Biome.TEMPLE, []],
+  [Biome.SLUM, []],
+  [Biome.SNOWY_FOREST, []],
+  [Biome.ISLAND, []],
+  [Biome.LABORATORY, []],
 ]);
 
 export function initMysteryEncounters() {
@@ -363,8 +332,7 @@ export function initMysteryEncounters() {
   });
 
   // Add ANY biome encounters to biome map
-  // eslint-disable-next-line
-  let encounterBiomeTableLog = "";
+  let _encounterBiomeTableLog = "";
   mysteryEncountersByBiome.forEach((biomeEncounters, biome) => {
     anyBiomeEncounters.forEach(encounter => {
       if (!biomeEncounters.includes(encounter)) {
@@ -372,7 +340,10 @@ export function initMysteryEncounters() {
       }
     });
 
-    encounterBiomeTableLog += `${getBiomeName(biome).toUpperCase()}: [${biomeEncounters.map(type => MysteryEncounterType[type].toString().toLowerCase()).sort().join(", ")}]\n`;
+    _encounterBiomeTableLog += `${getBiomeName(biome).toUpperCase()}: [${biomeEncounters
+      .map(type => MysteryEncounterType[type].toString().toLowerCase())
+      .sort()
+      .join(", ")}]\n`;
   });
 
   //console.debug("All Mystery Encounters by Biome:\n" + encounterBiomeTableLog);
diff --git a/src/data/mystery-encounters/requirements/can-learn-move-requirement.ts b/src/data/mystery-encounters/requirements/can-learn-move-requirement.ts
index 3d454269204..37194aef78e 100644
--- a/src/data/mystery-encounters/requirements/can-learn-move-requirement.ts
+++ b/src/data/mystery-encounters/requirements/can-learn-move-requirement.ts
@@ -1,7 +1,7 @@
 import type { Moves } from "#app/enums/moves";
 import type { PlayerPokemon } from "#app/field/pokemon";
 import { PokemonMove } from "#app/field/pokemon";
-import { isNullOrUndefined } from "#app/utils";
+import { isNullOrUndefined } from "#app/utils/common";
 import { EncounterPokemonRequirement } from "#app/data/mystery-encounters/mystery-encounter-requirements";
 import { globalScene } from "#app/global-scene";
 
@@ -29,7 +29,7 @@ export class CanLearnMoveRequirement extends EncounterPokemonRequirement {
 
   constructor(requiredMoves: Moves | Moves[], options: CanLearnMoveRequirementOptions = {}) {
     super();
-    this.requiredMoves = Array.isArray(requiredMoves) ? requiredMoves : [ requiredMoves ];
+    this.requiredMoves = Array.isArray(requiredMoves) ? requiredMoves : [requiredMoves];
 
     this.excludeLevelMoves = options.excludeLevelMoves ?? false;
     this.excludeTmMoves = options.excludeTmMoves ?? false;
@@ -40,7 +40,9 @@ export class CanLearnMoveRequirement extends EncounterPokemonRequirement {
   }
 
   override meetsRequirement(): boolean {
-    const partyPokemon = globalScene.getPlayerParty().filter((pkm) => (this.includeFainted ? pkm.isAllowedInChallenge() : pkm.isAllowedInBattle()));
+    const partyPokemon = globalScene
+      .getPlayerParty()
+      .filter(pkm => (this.includeFainted ? pkm.isAllowedInChallenge() : pkm.isAllowedInBattle()));
 
     if (isNullOrUndefined(partyPokemon) || this.requiredMoves?.length < 0) {
       return false;
@@ -51,25 +53,24 @@ export class CanLearnMoveRequirement extends EncounterPokemonRequirement {
 
   override queryParty(partyPokemon: PlayerPokemon[]): PlayerPokemon[] {
     if (!this.invertQuery) {
-      return partyPokemon.filter((pokemon) =>
+      return partyPokemon.filter(pokemon =>
         // every required move should be included
-        this.requiredMoves.every((requiredMove) => this.getAllPokemonMoves(pokemon).includes(requiredMove))
-      );
-    } else {
-      return partyPokemon.filter(
-        (pokemon) =>
-          // none of the "required" moves should be included
-          !this.requiredMoves.some((requiredMove) => this.getAllPokemonMoves(pokemon).includes(requiredMove))
+        this.requiredMoves.every(requiredMove => this.getAllPokemonMoves(pokemon).includes(requiredMove)),
       );
     }
+    return partyPokemon.filter(
+      pokemon =>
+        // none of the "required" moves should be included
+        !this.requiredMoves.some(requiredMove => this.getAllPokemonMoves(pokemon).includes(requiredMove)),
+    );
   }
 
   override getDialogueToken(__pokemon?: PlayerPokemon): [string, string] {
-    return [ "requiredMoves", this.requiredMoves.map(m => new PokemonMove(m).getName()).join(", ") ];
+    return ["requiredMoves", this.requiredMoves.map(m => new PokemonMove(m).getName()).join(", ")];
   }
 
   private getPokemonLevelMoves(pkm: PlayerPokemon): Moves[] {
-    return pkm.getLevelMoves().map(([ _level, move ]) => move);
+    return pkm.getLevelMoves().map(([_level, move]) => move);
   }
 
   private getAllPokemonMoves(pkm: PlayerPokemon): Moves[] {
diff --git a/src/data/mystery-encounters/requirements/requirement-groups.ts b/src/data/mystery-encounters/requirements/requirement-groups.ts
index 76bbb8f03a7..d9d62819fa6 100644
--- a/src/data/mystery-encounters/requirements/requirement-groups.ts
+++ b/src/data/mystery-encounters/requirements/requirement-groups.ts
@@ -4,14 +4,7 @@ import { Abilities } from "#enums/abilities";
 /**
  * Moves that "steal" things
  */
-export const STEALING_MOVES = [
-  Moves.PLUCK,
-  Moves.COVET,
-  Moves.KNOCK_OFF,
-  Moves.THIEF,
-  Moves.TRICK,
-  Moves.SWITCHEROO
-];
+export const STEALING_MOVES = [Moves.PLUCK, Moves.COVET, Moves.KNOCK_OFF, Moves.THIEF, Moves.TRICK, Moves.SWITCHEROO];
 
 /**
  * Moves that "charm" someone
@@ -24,7 +17,7 @@ export const CHARMING_MOVES = [
   Moves.ATTRACT,
   Moves.SWEET_SCENT,
   Moves.CAPTIVATE,
-  Moves.AROMATIC_MIST
+  Moves.AROMATIC_MIST,
 ];
 
 /**
@@ -42,7 +35,7 @@ export const DANCING_MOVES = [
   Moves.QUIVER_DANCE,
   Moves.SWORDS_DANCE,
   Moves.TEETER_DANCE,
-  Moves.VICTORY_DANCE
+  Moves.VICTORY_DANCE,
 ];
 
 /**
@@ -60,7 +53,7 @@ export const DISTRACTION_MOVES = [
   Moves.CAPTIVATE,
   Moves.RAGE_POWDER,
   Moves.SUBSTITUTE,
-  Moves.SHED_TAIL
+  Moves.SHED_TAIL,
 ];
 
 /**
@@ -79,7 +72,7 @@ export const PROTECTING_MOVES = [
   Moves.CRAFTY_SHIELD,
   Moves.SPIKY_SHIELD,
   Moves.OBSTRUCT,
-  Moves.DETECT
+  Moves.DETECT,
 ];
 
 /**
@@ -116,7 +109,7 @@ export const EXTORTION_ABILITIES = [
   Abilities.ARENA_TRAP,
   Abilities.SHADOW_TAG,
   Abilities.SUCTION_CUPS,
-  Abilities.STICKY_HOLD
+  Abilities.STICKY_HOLD,
 ];
 
 /**
@@ -133,5 +126,5 @@ export const FIRE_RESISTANT_ABILITIES = [
   Abilities.MAGMA_ARMOR,
   Abilities.WATER_VEIL,
   Abilities.STEAM_ENGINE,
-  Abilities.PRIMORDIAL_SEA
+  Abilities.PRIMORDIAL_SEA,
 ];
diff --git a/src/data/mystery-encounters/utils/encounter-dialogue-utils.ts b/src/data/mystery-encounters/utils/encounter-dialogue-utils.ts
index df9b6355017..296d94093d9 100644
--- a/src/data/mystery-encounters/utils/encounter-dialogue-utils.ts
+++ b/src/data/mystery-encounters/utils/encounter-dialogue-utils.ts
@@ -2,7 +2,7 @@ import { globalScene } from "#app/global-scene";
 import type { TextStyle } from "#app/ui/text";
 import { getTextWithColors } from "#app/ui/text";
 import { UiTheme } from "#enums/ui-theme";
-import { isNullOrUndefined } from "#app/utils";
+import { isNullOrUndefined } from "#app/utils/common";
 import i18next from "i18next";
 
 /**
@@ -63,7 +63,13 @@ export function queueEncounterMessage(contentKey: string): void {
  * @param callbackDelay
  * @param promptDelay
  */
-export function showEncounterText(contentKey: string, delay: number | null = null, callbackDelay: number = 0, prompt: boolean = true, promptDelay: number | null = null): Promise<void> {
+export function showEncounterText(
+  contentKey: string,
+  delay: number | null = null,
+  callbackDelay = 0,
+  prompt = true,
+  promptDelay: number | null = null,
+): Promise<void> {
   return new Promise<void>(resolve => {
     const text: string | null = getEncounterText(contentKey);
     globalScene.ui.showText(text ?? "", delay, () => resolve(), callbackDelay, prompt, promptDelay);
@@ -78,7 +84,12 @@ export function showEncounterText(contentKey: string, delay: number | null = nul
  * @param speakerContentKey
  * @param callbackDelay
  */
-export function showEncounterDialogue(textContentKey: string, speakerContentKey: string, delay: number | null = null, callbackDelay: number = 0): Promise<void> {
+export function showEncounterDialogue(
+  textContentKey: string,
+  speakerContentKey: string,
+  delay: number | null = null,
+  callbackDelay = 0,
+): Promise<void> {
   return new Promise<void>(resolve => {
     const text: string | null = getEncounterText(textContentKey);
     const speaker: string | null = getEncounterText(speakerContentKey);
diff --git a/src/data/mystery-encounters/utils/encounter-phase-utils.ts b/src/data/mystery-encounters/utils/encounter-phase-utils.ts
index ead0443908b..0215928bbe8 100644
--- a/src/data/mystery-encounters/utils/encounter-phase-utils.ts
+++ b/src/data/mystery-encounters/utils/encounter-phase-utils.ts
@@ -1,22 +1,37 @@
 import type Battle from "#app/battle";
-import { BattlerIndex, BattleType } from "#app/battle";
+import { BattlerIndex } from "#app/battle";
+import { BattleType } from "#enums/battle-type";
 import { biomeLinks, BiomePoolTier } from "#app/data/balance/biomes";
 import type MysteryEncounterOption from "#app/data/mystery-encounters/mystery-encounter-option";
-import { AVERAGE_ENCOUNTERS_PER_RUN_TARGET, WEIGHT_INCREMENT_ON_SPAWN_MISS } from "#app/data/mystery-encounters/mystery-encounters";
+import {
+  AVERAGE_ENCOUNTERS_PER_RUN_TARGET,
+  WEIGHT_INCREMENT_ON_SPAWN_MISS,
+} from "#app/data/mystery-encounters/mystery-encounters";
 import { showEncounterText } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils";
 import type { AiType, PlayerPokemon } from "#app/field/pokemon";
 import type Pokemon from "#app/field/pokemon";
-import { EnemyPokemon, FieldPosition, PokemonMove, PokemonSummonData } from "#app/field/pokemon";
+import { EnemyPokemon, FieldPosition, PokemonMove } from "#app/field/pokemon";
 import type { CustomModifierSettings, ModifierType } from "#app/modifier/modifier-type";
-import { getPartyLuckValue, ModifierPoolType, ModifierTypeGenerator, ModifierTypeOption, modifierTypes, regenerateModifierPoolThresholds } from "#app/modifier/modifier-type";
-import { MysteryEncounterBattlePhase, MysteryEncounterBattleStartCleanupPhase, MysteryEncounterPhase, MysteryEncounterRewardsPhase } from "#app/phases/mystery-encounter-phases";
+import {
+  getPartyLuckValue,
+  ModifierPoolType,
+  ModifierTypeGenerator,
+  ModifierTypeOption,
+  modifierTypes,
+  regenerateModifierPoolThresholds,
+} from "#app/modifier/modifier-type";
+import {
+  MysteryEncounterBattlePhase,
+  MysteryEncounterBattleStartCleanupPhase,
+  MysteryEncounterPhase,
+  MysteryEncounterRewardsPhase,
+} from "#app/phases/mystery-encounter-phases";
 import type PokemonData from "#app/system/pokemon-data";
 import type { OptionSelectConfig, OptionSelectItem } from "#app/ui/abstact-option-select-ui-handler";
 import type { PartyOption, PokemonSelectFilter } from "#app/ui/party-ui-handler";
 import { PartyUiMode } from "#app/ui/party-ui-handler";
-import { Mode } from "#app/ui/ui";
-import * as Utils from "#app/utils";
-import { isNullOrUndefined, randSeedInt, randSeedItem } from "#app/utils";
+import { UiMode } from "#enums/ui-mode";
+import { isNullOrUndefined, randSeedInt, randomString, randSeedItem } from "#app/utils/common";
 import type { BattlerTagType } from "#enums/battler-tag-type";
 import { Biome } from "#enums/biome";
 import type { TrainerType } from "#enums/trainer-type";
@@ -28,8 +43,9 @@ import type { Moves } from "#enums/moves";
 import { initMoveAnim, loadMoveAnimAssets } from "#app/data/battle-anims";
 import { MysteryEncounterMode } from "#enums/mystery-encounter-mode";
 import { Status } from "#app/data/status-effect";
-import type { TrainerConfig } from "#app/data/trainer-config";
-import { trainerConfigs, TrainerSlot } from "#app/data/trainer-config";
+import type { TrainerConfig } from "#app/data/trainers/trainer-config";
+import { trainerConfigs } from "#app/data/trainers/trainer-config";
+import { TrainerSlot } from "#enums/trainer-slot";
 import type PokemonSpecies from "#app/data/pokemon-species";
 import type { IEggOptions } from "#app/data/egg";
 import { Egg } from "#app/data/egg";
@@ -42,10 +58,14 @@ import { BattleEndPhase } from "#app/phases/battle-end-phase";
 import { GameOverPhase } from "#app/phases/game-over-phase";
 import { SelectModifierPhase } from "#app/phases/select-modifier-phase";
 import { PartyExpPhase } from "#app/phases/party-exp-phase";
-import type { Variant } from "#app/data/variant";
+import type { Variant } from "#app/sprites/variant";
 import { StatusEffect } from "#enums/status-effect";
 import { globalScene } from "#app/global-scene";
 import { getPokemonSpecies } from "#app/data/pokemon-species";
+import { PokemonType } from "#enums/pokemon-type";
+import { getNatureName } from "#app/data/nature";
+import { getPokemonNameWithAffix } from "#app/messages";
+import { timedEventManager } from "#app/global-event-manager";
 
 /**
  * Animates exclamation sprite over trainer's head at start of encounter
@@ -68,7 +88,7 @@ export function doTrainerExclamation() {
       globalScene.time.delayedCall(800, () => {
         globalScene.field.remove(exclamationSprite, true);
       });
-    }
+    },
   });
 
   globalScene.playSound("battle_anims/GEN8- Exclaim", { volume: 0.7 });
@@ -98,6 +118,7 @@ export interface EnemyPokemonConfig {
   modifierConfigs?: HeldModifierConfig[];
   tags?: BattlerTagType[];
   dataSource?: PokemonData;
+  tera?: PokemonType;
   aiType?: AiType;
 }
 
@@ -147,8 +168,15 @@ export async function initBattleWithEnemyConfig(partyConfig: EnemyPartyConfig):
 
     const doubleTrainer = trainerConfig.doubleOnly || (trainerConfig.hasDouble && !!partyConfig.doubleBattle);
     doubleBattle = doubleTrainer;
-    const trainerFemale = isNullOrUndefined(partyConfig.female) ? !!(Utils.randSeedInt(2)) : partyConfig.female;
-    const newTrainer = new Trainer(trainerConfig.trainerType, doubleTrainer ? TrainerVariant.DOUBLE : trainerFemale ? TrainerVariant.FEMALE : TrainerVariant.DEFAULT, undefined, undefined, undefined, trainerConfig);
+    const trainerFemale = isNullOrUndefined(partyConfig.female) ? !!randSeedInt(2) : partyConfig.female;
+    const newTrainer = new Trainer(
+      trainerConfig.trainerType,
+      doubleTrainer ? TrainerVariant.DOUBLE : trainerFemale ? TrainerVariant.FEMALE : TrainerVariant.DEFAULT,
+      undefined,
+      undefined,
+      undefined,
+      trainerConfig,
+    );
     newTrainer.x += 300;
     newTrainer.setVisible(false);
     globalScene.field.add(newTrainer);
@@ -159,7 +187,12 @@ export async function initBattleWithEnemyConfig(partyConfig: EnemyPartyConfig):
   } else {
     // Wild
     globalScene.currentBattle.mysteryEncounter!.encounterMode = MysteryEncounterMode.WILD_BATTLE;
-    const numEnemies = partyConfig?.pokemonConfigs && partyConfig.pokemonConfigs.length > 0 ? partyConfig?.pokemonConfigs?.length : doubleBattle ? 2 : 1;
+    const numEnemies =
+      partyConfig?.pokemonConfigs && partyConfig.pokemonConfigs.length > 0
+        ? partyConfig?.pokemonConfigs?.length
+        : doubleBattle
+          ? 2
+          : 1;
     battle.enemyLevels = new Array(numEnemies).fill(null).map(() => globalScene.currentBattle.getLevelForWave());
   }
 
@@ -179,8 +212,8 @@ export async function initBattleWithEnemyConfig(partyConfig: EnemyPartyConfig):
   battle.enemyLevels = battle.enemyLevels.map(level => level + additive);
 
   battle.enemyLevels.forEach((level, e) => {
-    let enemySpecies;
-    let dataSource;
+    let enemySpecies: PokemonSpecies | undefined;
+    let dataSource: PokemonData | undefined;
     let isBoss = false;
     if (!loaded) {
       if ((!isNullOrUndefined(trainerType) || trainerConfig) && battle.trainer) {
@@ -191,7 +224,14 @@ export async function initBattleWithEnemyConfig(partyConfig: EnemyPartyConfig):
           dataSource = config.dataSource;
           enemySpecies = config.species;
           isBoss = config.isBoss;
-          battle.enemyParty[e] = globalScene.addEnemyPokemon(enemySpecies, level, TrainerSlot.TRAINER, isBoss, false, dataSource);
+          battle.enemyParty[e] = globalScene.addEnemyPokemon(
+            enemySpecies,
+            level,
+            TrainerSlot.TRAINER,
+            isBoss,
+            false,
+            dataSource,
+          );
         } else {
           battle.enemyParty[e] = battle.trainer.genPartyMember(e);
         }
@@ -209,7 +249,14 @@ export async function initBattleWithEnemyConfig(partyConfig: EnemyPartyConfig):
           enemySpecies = globalScene.randomSpecies(battle.waveIndex, level, true);
         }
 
-        battle.enemyParty[e] = globalScene.addEnemyPokemon(enemySpecies, level, TrainerSlot.NONE, isBoss, false, dataSource);
+        battle.enemyParty[e] = globalScene.addEnemyPokemon(
+          enemySpecies,
+          level,
+          TrainerSlot.NONE,
+          isBoss,
+          false,
+          dataSource,
+        );
       }
     }
 
@@ -225,7 +272,7 @@ export async function initBattleWithEnemyConfig(partyConfig: EnemyPartyConfig):
       enemyPokemon.resetSummonData();
     }
 
-    if (!loaded && isNullOrUndefined(partyConfig.countAsSeen) || partyConfig.countAsSeen) {
+    if ((!loaded && isNullOrUndefined(partyConfig.countAsSeen)) || partyConfig.countAsSeen) {
       globalScene.gameData.setPokemonSeen(enemyPokemon, true, !!(trainerType || trainerConfig));
     }
 
@@ -239,7 +286,7 @@ export async function initBattleWithEnemyConfig(partyConfig: EnemyPartyConfig):
 
       // Generate new id, reset status and HP in case using data source
       if (config.dataSource) {
-        enemyPokemon.id = Utils.randSeedInt(4294967296);
+        enemyPokemon.id = randSeedInt(4294967296);
       }
 
       // Set form
@@ -264,7 +311,9 @@ export async function initBattleWithEnemyConfig(partyConfig: EnemyPartyConfig):
 
       // Set Boss
       if (config.isBoss) {
-        let segments = !isNullOrUndefined(config.bossSegments) ? config.bossSegments! : globalScene.getEncounterBossSegments(globalScene.currentBattle.waveIndex, level, enemySpecies, true);
+        let segments = !isNullOrUndefined(config.bossSegments)
+          ? config.bossSegments!
+          : globalScene.getEncounterBossSegments(globalScene.currentBattle.waveIndex, level, enemySpecies, true);
         if (!isNullOrUndefined(config.bossSegmentModifier)) {
           segments += config.bossSegmentModifier;
         }
@@ -291,15 +340,14 @@ export async function initBattleWithEnemyConfig(partyConfig: EnemyPartyConfig):
       if (statusEffects) {
         // Default to cureturn 3 for sleep
         const status = Array.isArray(statusEffects) ? statusEffects[0] : statusEffects;
-        const cureTurn = Array.isArray(statusEffects) ? statusEffects[1] : statusEffects === StatusEffect.SLEEP ? 3 : undefined;
+        const cureTurn = Array.isArray(statusEffects)
+          ? statusEffects[1]
+          : statusEffects === StatusEffect.SLEEP
+            ? 3
+            : undefined;
         enemyPokemon.status = new Status(status, 0, cureTurn);
       }
 
-      // Set summon data fields
-      if (!enemyPokemon.summonData) {
-        enemyPokemon.summonData = new PokemonSummonData();
-      }
-
       // Set ability
       if (!isNullOrUndefined(config.abilityIndex)) {
         enemyPokemon.abilityIndex = config.abilityIndex;
@@ -329,14 +377,19 @@ export async function initBattleWithEnemyConfig(partyConfig: EnemyPartyConfig):
         tags.forEach(tag => enemyPokemon.addTag(tag));
       }
 
-      // mysteryEncounterBattleEffects will only be used IFF MYSTERY_ENCOUNTER_POST_SUMMON tag is applied
+      // Set tera
+      if (config.tera && config.tera !== PokemonType.UNKNOWN) {
+        enemyPokemon.teraType = config.tera;
+        if (battle.trainer) {
+          battle.trainer.config.setInstantTera(e);
+        }
+      }
+
+      // mysteryEncounterBattleEffects will only be used if MYSTERY_ENCOUNTER_POST_SUMMON tag is applied
       if (config.mysteryEncounterBattleEffects) {
         enemyPokemon.mysteryEncounterBattleEffects = config.mysteryEncounterBattleEffects;
       }
 
-      // Requires re-priming summon data to update everything properly
-      enemyPokemon.primeSummonData(enemyPokemon.summonData);
-
       if (enemyPokemon.isShiny() && !enemyPokemon["shinySparkle"]) {
         enemyPokemon.initShinySparkle();
       }
@@ -347,7 +400,32 @@ export async function initBattleWithEnemyConfig(partyConfig: EnemyPartyConfig):
 
     loadEnemyAssets.push(enemyPokemon.loadAssets());
 
-    console.log(`Pokemon: ${enemyPokemon.name}`, `Species ID: ${enemyPokemon.species.speciesId}`, `Stats: ${enemyPokemon.stats}`, `Ability: ${enemyPokemon.getAbility().name}`, `Passive Ability: ${enemyPokemon.getPassiveAbility().name}`);
+    const stats: string[] = [
+      `HP: ${enemyPokemon.stats[0]} (${enemyPokemon.ivs[0]})`,
+      ` Atk: ${enemyPokemon.stats[1]} (${enemyPokemon.ivs[1]})`,
+      ` Def: ${enemyPokemon.stats[2]} (${enemyPokemon.ivs[2]})`,
+      ` Spatk: ${enemyPokemon.stats[3]} (${enemyPokemon.ivs[3]})`,
+      ` Spdef: ${enemyPokemon.stats[4]} (${enemyPokemon.ivs[4]})`,
+      ` Spd: ${enemyPokemon.stats[5]} (${enemyPokemon.ivs[5]})`,
+    ];
+    const moveset: string[] = [];
+    enemyPokemon.getMoveset().forEach(move => {
+      moveset.push(move!.getName()); // TODO: remove `!` after moveset-null removal PR
+    });
+
+    console.log(
+      `Pokemon: ${getPokemonNameWithAffix(enemyPokemon)}`,
+      `| Species ID: ${enemyPokemon.species.speciesId}`,
+      `| Level: ${enemyPokemon.level}`,
+      `| Nature: ${getNatureName(enemyPokemon.nature, true, true, true)}`,
+    );
+    console.log(`Stats (IVs): ${stats}`);
+    console.log(
+      `Ability: ${enemyPokemon.getAbility().name}`,
+      `| Passive Ability${enemyPokemon.hasPassive() ? "" : " (inactive)"}: ${enemyPokemon.getPassiveAbility().name}`,
+      `${enemyPokemon.isBoss() ? `| Boss Bars: ${enemyPokemon.bossSegments}` : ""}`,
+    );
+    console.log("Moveset:", moveset);
   });
 
   globalScene.pushPhase(new MysteryEncounterBattlePhase(partyConfig.disableSwitch));
@@ -364,7 +442,10 @@ export async function initBattleWithEnemyConfig(partyConfig: EnemyPartyConfig):
     }
   });
   if (!loaded) {
-    regenerateModifierPoolThresholds(globalScene.getEnemyField(), battle.battleType === BattleType.TRAINER ? ModifierPoolType.TRAINER : ModifierPoolType.WILD);
+    regenerateModifierPoolThresholds(
+      globalScene.getEnemyField(),
+      battle.battleType === BattleType.TRAINER ? ModifierPoolType.TRAINER : ModifierPoolType.WILD,
+    );
     const customModifierTypes = partyConfig?.pokemonConfigs
       ?.filter(config => config?.modifierConfigs)
       .map(config => config.modifierConfigs!);
@@ -380,9 +461,8 @@ export async function initBattleWithEnemyConfig(partyConfig: EnemyPartyConfig):
  * @param moves
  */
 export function loadCustomMovesForEncounter(moves: Moves | Moves[]) {
-  moves = Array.isArray(moves) ? moves : [ moves ];
-  return Promise.all(moves.map(move => initMoveAnim(move)))
-    .then(() => loadMoveAnimAssets(moves));
+  moves = Array.isArray(moves) ? moves : [moves];
+  return Promise.all(moves.map(move => initMoveAnim(move))).then(() => loadMoveAnimAssets(moves));
 }
 
 /**
@@ -391,7 +471,7 @@ export function loadCustomMovesForEncounter(moves: Moves | Moves[]) {
  * @param playSound
  * @param showMessage
  */
-export function updatePlayerMoney(changeValue: number, playSound: boolean = true, showMessage: boolean = true) {
+export function updatePlayerMoney(changeValue: number, playSound = true, showMessage = true) {
   globalScene.money = Math.min(Math.max(globalScene.money + changeValue, 0), Number.MAX_SAFE_INTEGER);
   globalScene.updateMoneyText();
   globalScene.animateMoneyChanged(false);
@@ -400,9 +480,21 @@ export function updatePlayerMoney(changeValue: number, playSound: boolean = true
   }
   if (showMessage) {
     if (changeValue < 0) {
-      globalScene.queueMessage(i18next.t("mysteryEncounterMessages:paid_money", { amount: -changeValue }), null, true);
+      globalScene.queueMessage(
+        i18next.t("mysteryEncounterMessages:paid_money", {
+          amount: -changeValue,
+        }),
+        null,
+        true,
+      );
     } else {
-      globalScene.queueMessage(i18next.t("mysteryEncounterMessages:receive_money", { amount: changeValue }), null, true);
+      globalScene.queueMessage(
+        i18next.t("mysteryEncounterMessages:receive_money", {
+          amount: changeValue,
+        }),
+        null,
+        true,
+      );
     }
   }
 }
@@ -425,7 +517,9 @@ export function generateModifierType(modifier: () => ModifierType, pregenArgs?:
     .withIdFromFunc(modifierTypes[modifierId])
     .withTierFromPool(ModifierPoolType.PLAYER, globalScene.getPlayerParty());
 
-  return result instanceof ModifierTypeGenerator ? result.generateType(globalScene.getPlayerParty(), pregenArgs) : result;
+  return result instanceof ModifierTypeGenerator
+    ? result.generateType(globalScene.getPlayerParty(), pregenArgs)
+    : result;
 }
 
 /**
@@ -433,7 +527,10 @@ export function generateModifierType(modifier: () => ModifierType, pregenArgs?:
  * @param modifier
  * @param pregenArgs - can specify BerryType for berries, TM for TMs, AttackBoostType for item, etc.
  */
-export function generateModifierTypeOption(modifier: () => ModifierType, pregenArgs?: any[]): ModifierTypeOption | null {
+export function generateModifierTypeOption(
+  modifier: () => ModifierType,
+  pregenArgs?: any[],
+): ModifierTypeOption | null {
   const result = generateModifierType(modifier, pregenArgs);
   if (result) {
     return new ModifierTypeOption(result, 0);
@@ -448,80 +545,100 @@ export function generateModifierTypeOption(modifier: () => ModifierType, pregenA
  * @param onPokemonNotSelected - Any logic that needs to be performed if no Pokemon is chosen
  * @param selectablePokemonFilter
  */
-export function selectPokemonForOption(onPokemonSelected: (pokemon: PlayerPokemon) => void | OptionSelectItem[], onPokemonNotSelected?: () => void, selectablePokemonFilter?: PokemonSelectFilter): Promise<boolean> {
+export function selectPokemonForOption(
+  // biome-ignore lint/suspicious/noConfusingVoidType: Takes a function that either returns void or an array of OptionSelectItem
+  onPokemonSelected: (pokemon: PlayerPokemon) => void | OptionSelectItem[],
+  onPokemonNotSelected?: () => void,
+  selectablePokemonFilter?: PokemonSelectFilter,
+): Promise<boolean> {
   return new Promise(resolve => {
     const modeToSetOnExit = globalScene.ui.getMode();
 
     // Open party screen to choose pokemon
-    globalScene.ui.setMode(Mode.PARTY, PartyUiMode.SELECT, -1, (slotIndex: number, option: PartyOption) => {
-      if (slotIndex < globalScene.getPlayerParty().length) {
-        globalScene.ui.setMode(modeToSetOnExit).then(() => {
-          const pokemon = globalScene.getPlayerParty()[slotIndex];
-          const secondaryOptions = onPokemonSelected(pokemon);
-          if (!secondaryOptions) {
-            globalScene.currentBattle.mysteryEncounter!.setDialogueToken("selectedPokemon", pokemon.getNameToRender());
-            resolve(true);
-            return;
-          }
+    globalScene.ui.setMode(
+      UiMode.PARTY,
+      PartyUiMode.SELECT,
+      -1,
+      (slotIndex: number, _option: PartyOption) => {
+        if (slotIndex < globalScene.getPlayerParty().length) {
+          globalScene.ui.setMode(modeToSetOnExit).then(() => {
+            const pokemon = globalScene.getPlayerParty()[slotIndex];
+            const secondaryOptions = onPokemonSelected(pokemon);
+            if (!secondaryOptions) {
+              globalScene.currentBattle.mysteryEncounter!.setDialogueToken(
+                "selectedPokemon",
+                pokemon.getNameToRender(),
+              );
+              resolve(true);
+              return;
+            }
 
-          // There is a second option to choose after selecting the Pokemon
-          globalScene.ui.setMode(Mode.MESSAGE).then(() => {
-            const displayOptions = () => {
-              // Always appends a cancel option to bottom of options
-              const fullOptions = secondaryOptions.map(option => {
-                // Update handler to resolve promise
-                const onSelect = option.handler;
-                option.handler = () => {
-                  onSelect();
-                  globalScene.currentBattle.mysteryEncounter!.setDialogueToken("selectedPokemon", pokemon.getNameToRender());
-                  resolve(true);
-                  return true;
+            // There is a second option to choose after selecting the Pokemon
+            globalScene.ui.setMode(UiMode.MESSAGE).then(() => {
+              const displayOptions = () => {
+                // Always appends a cancel option to bottom of options
+                const fullOptions = secondaryOptions
+                  .map(option => {
+                    // Update handler to resolve promise
+                    const onSelect = option.handler;
+                    option.handler = () => {
+                      onSelect();
+                      globalScene.currentBattle.mysteryEncounter!.setDialogueToken(
+                        "selectedPokemon",
+                        pokemon.getNameToRender(),
+                      );
+                      resolve(true);
+                      return true;
+                    };
+                    return option;
+                  })
+                  .concat({
+                    label: i18next.t("menu:cancel"),
+                    handler: () => {
+                      globalScene.ui.clearText();
+                      globalScene.ui.setMode(modeToSetOnExit);
+                      resolve(false);
+                      return true;
+                    },
+                    onHover: () => {
+                      showEncounterText(i18next.t("mysteryEncounterMessages:cancel_option"), 0, 0, false);
+                    },
+                  });
+
+                const config: OptionSelectConfig = {
+                  options: fullOptions,
+                  maxOptions: 7,
+                  yOffset: 0,
+                  supportHover: true,
                 };
-                return option;
-              }).concat({
-                label: i18next.t("menu:cancel"),
-                handler: () => {
-                  globalScene.ui.clearText();
-                  globalScene.ui.setMode(modeToSetOnExit);
-                  resolve(false);
-                  return true;
-                },
-                onHover: () => {
-                  showEncounterText(i18next.t("mysteryEncounterMessages:cancel_option"), 0, 0, false);
-                }
-              });
 
-              const config: OptionSelectConfig = {
-                options: fullOptions,
-                maxOptions: 7,
-                yOffset: 0,
-                supportHover: true
+                // Do hover over the starting selection option
+                if (fullOptions[0].onHover) {
+                  fullOptions[0].onHover();
+                }
+                globalScene.ui.setModeWithoutClear(UiMode.OPTION_SELECT, config, null, true);
               };
 
-              // Do hover over the starting selection option
-              if (fullOptions[0].onHover) {
-                fullOptions[0].onHover();
+              const textPromptKey =
+                globalScene.currentBattle.mysteryEncounter?.selectedOption?.dialogue?.secondOptionPrompt;
+              if (!textPromptKey) {
+                displayOptions();
+              } else {
+                showEncounterText(textPromptKey).then(() => displayOptions());
               }
-              globalScene.ui.setModeWithoutClear(Mode.OPTION_SELECT, config, null, true);
-            };
-
-            const textPromptKey = globalScene.currentBattle.mysteryEncounter?.selectedOption?.dialogue?.secondOptionPrompt;
-            if (!textPromptKey) {
-              displayOptions();
-            } else {
-              showEncounterText(textPromptKey).then(() => displayOptions());
-            }
+            });
           });
-        });
-      } else {
-        globalScene.ui.setMode(modeToSetOnExit).then(() => {
-          if (onPokemonNotSelected) {
-            onPokemonNotSelected();
-          }
-          resolve(false);
-        });
-      }
-    }, selectablePokemonFilter);
+        } else {
+          globalScene.ui.setMode(modeToSetOnExit).then(() => {
+            if (onPokemonNotSelected) {
+              onPokemonNotSelected();
+            }
+            resolve(false);
+          });
+        }
+      },
+      selectablePokemonFilter,
+    );
   });
 }
 
@@ -539,25 +656,30 @@ interface PokemonAndOptionSelected {
  * @param selectablePokemonFilter
  * @param onHoverOverCancelOption
  */
-export function selectOptionThenPokemon(options: OptionSelectItem[], optionSelectPromptKey: string, selectablePokemonFilter?: PokemonSelectFilter, onHoverOverCancelOption?: () => void): Promise<PokemonAndOptionSelected | null> {
+export function selectOptionThenPokemon(
+  options: OptionSelectItem[],
+  optionSelectPromptKey: string,
+  selectablePokemonFilter?: PokemonSelectFilter,
+  onHoverOverCancelOption?: () => void,
+): Promise<PokemonAndOptionSelected | null> {
   return new Promise<PokemonAndOptionSelected | null>(resolve => {
     const modeToSetOnExit = globalScene.ui.getMode();
 
     const displayOptions = (config: OptionSelectConfig) => {
-      globalScene.ui.setMode(Mode.MESSAGE).then(() => {
+      globalScene.ui.setMode(UiMode.MESSAGE).then(() => {
         if (!optionSelectPromptKey) {
           // Do hover over the starting selection option
           if (fullOptions[0].onHover) {
             fullOptions[0].onHover();
           }
-          globalScene.ui.setMode(Mode.OPTION_SELECT, config);
+          globalScene.ui.setMode(UiMode.OPTION_SELECT, config);
         } else {
           showEncounterText(optionSelectPromptKey).then(() => {
             // Do hover over the starting selection option
             if (fullOptions[0].onHover) {
               fullOptions[0].onHover();
             }
-            globalScene.ui.setMode(Mode.OPTION_SELECT, config);
+            globalScene.ui.setMode(UiMode.OPTION_SELECT, config);
           });
         }
       });
@@ -565,51 +687,62 @@ export function selectOptionThenPokemon(options: OptionSelectItem[], optionSelec
 
     const selectPokemonAfterOption = (selectedOptionIndex: number) => {
       // Open party screen to choose a Pokemon
-      globalScene.ui.setMode(Mode.PARTY, PartyUiMode.SELECT, -1, (slotIndex: number, option: PartyOption) => {
-        if (slotIndex < globalScene.getPlayerParty().length) {
-          // Pokemon and option selected
-          globalScene.ui.setMode(modeToSetOnExit).then(() => {
-            const result: PokemonAndOptionSelected = { selectedPokemonIndex: slotIndex, selectedOptionIndex: selectedOptionIndex };
-            resolve(result);
-          });
-        } else {
-          // Back to first option select screen
-          displayOptions(config);
-        }
-      }, selectablePokemonFilter);
+      globalScene.ui.setMode(
+        UiMode.PARTY,
+        PartyUiMode.SELECT,
+        -1,
+        (slotIndex: number, _option: PartyOption) => {
+          if (slotIndex < globalScene.getPlayerParty().length) {
+            // Pokemon and option selected
+            globalScene.ui.setMode(modeToSetOnExit).then(() => {
+              const result: PokemonAndOptionSelected = {
+                selectedPokemonIndex: slotIndex,
+                selectedOptionIndex: selectedOptionIndex,
+              };
+              resolve(result);
+            });
+          } else {
+            // Back to first option select screen
+            displayOptions(config);
+          }
+        },
+        selectablePokemonFilter,
+      );
     };
 
     // Always appends a cancel option to bottom of options
-    const fullOptions = options.map((option, index) => {
-      // Update handler to resolve promise
-      const onSelect = option.handler;
-      option.handler = () => {
-        onSelect();
-        selectPokemonAfterOption(index);
-        return true;
-      };
-      return option;
-    }).concat({
-      label: i18next.t("menu:cancel"),
-      handler: () => {
-        globalScene.ui.clearText();
-        globalScene.ui.setMode(modeToSetOnExit);
-        resolve(null);
-        return true;
-      },
-      onHover: () => {
-        if (onHoverOverCancelOption) {
-          onHoverOverCancelOption();
-        }
-        showEncounterText(i18next.t("mysteryEncounterMessages:cancel_option"), 0, 0, false);
-      }
-    });
+    const fullOptions = options
+      .map((option, index) => {
+        // Update handler to resolve promise
+        const onSelect = option.handler;
+        option.handler = () => {
+          onSelect();
+          selectPokemonAfterOption(index);
+          return true;
+        };
+        return option;
+      })
+      .concat({
+        label: i18next.t("menu:cancel"),
+        handler: () => {
+          globalScene.ui.clearText();
+          globalScene.ui.setMode(modeToSetOnExit);
+          resolve(null);
+          return true;
+        },
+        onHover: () => {
+          if (onHoverOverCancelOption) {
+            onHoverOverCancelOption();
+          }
+          showEncounterText(i18next.t("mysteryEncounterMessages:cancel_option"), 0, 0, false);
+        },
+      });
 
     const config: OptionSelectConfig = {
       options: fullOptions,
       maxOptions: 7,
       yOffset: 0,
-      supportHover: true
+      supportHover: true,
     };
 
     displayOptions(config);
@@ -623,7 +756,11 @@ export function selectOptionThenPokemon(options: OptionSelectItem[], optionSelec
  * @param eggRewards
  * @param preRewardsCallback - can execute an arbitrary callback before the new phases if necessary (useful for updating items/party/injecting new phases before {@linkcode MysteryEncounterRewardsPhase})
  */
-export function setEncounterRewards(customShopRewards?: CustomModifierSettings, eggRewards?: IEggOptions[], preRewardsCallback?: Function) {
+export function setEncounterRewards(
+  customShopRewards?: CustomModifierSettings,
+  eggRewards?: IEggOptions[],
+  preRewardsCallback?: Function,
+) {
   globalScene.currentBattle.mysteryEncounter!.doEncounterRewards = () => {
     if (preRewardsCallback) {
       preRewardsCallback();
@@ -666,8 +803,8 @@ export function setEncounterRewards(customShopRewards?: CustomModifierSettings,
  * https://bulbapedia.bulbagarden.net/wiki/List_of_Pok%C3%A9mon_by_effort_value_yield_(Generation_IX)
  * @param useWaveIndex - set to false when directly passing the the full exp value instead of baseExpValue
  */
-export function setEncounterExp(participantId: number | number[], baseExpValue: number, useWaveIndex: boolean = true) {
-  const participantIds = Array.isArray(participantId) ? participantId : [ participantId ];
+export function setEncounterExp(participantId: number | number[], baseExpValue: number, useWaveIndex = true) {
+  const participantIds = Array.isArray(participantId) ? participantId : [participantId];
 
   globalScene.currentBattle.mysteryEncounter!.doEncounterExp = () => {
     globalScene.unshiftPhase(new PartyExpPhase(baseExpValue, useWaveIndex, new Set(participantIds)));
@@ -701,7 +838,10 @@ export function initSubsequentOptionSelect(optionSelectSettings: OptionSelectSet
  * @param addHealPhase - when true, will add a shop phase to end of encounter with 0 rewards but healing items are available
  * @param encounterMode - Can set custom encounter mode if necessary (may be required for forcing Pokemon to return before next phase)
  */
-export function leaveEncounterWithoutBattle(addHealPhase: boolean = false, encounterMode: MysteryEncounterMode = MysteryEncounterMode.NO_BATTLE) {
+export function leaveEncounterWithoutBattle(
+  addHealPhase = false,
+  encounterMode: MysteryEncounterMode = MysteryEncounterMode.NO_BATTLE,
+) {
   globalScene.currentBattle.mysteryEncounter!.encounterMode = encounterMode;
   globalScene.clearPhaseQueue();
   globalScene.clearPhaseQueueSplice();
@@ -713,8 +853,8 @@ export function leaveEncounterWithoutBattle(addHealPhase: boolean = false, encou
  * @param addHealPhase - Adds an empty shop phase to allow player to purchase healing items
  * @param doNotContinue - default `false`. If set to true, will not end the battle and continue to next wave
  */
-export function handleMysteryEncounterVictory(addHealPhase: boolean = false, doNotContinue: boolean = false) {
-  const allowedPkm = globalScene.getPlayerParty().filter((pkm) => pkm.isAllowedInBattle());
+export function handleMysteryEncounterVictory(addHealPhase = false, doNotContinue = false) {
+  const allowedPkm = globalScene.getPlayerParty().filter(pkm => pkm.isAllowedInBattle());
 
   if (allowedPkm.length === 0) {
     globalScene.clearPhaseQueue();
@@ -727,10 +867,17 @@ export function handleMysteryEncounterVictory(addHealPhase: boolean = false, doN
   const encounter = globalScene.currentBattle.mysteryEncounter!;
   if (encounter.continuousEncounter || doNotContinue) {
     return;
-  } else if (encounter.encounterMode === MysteryEncounterMode.NO_BATTLE) {
+  }
+  if (encounter.encounterMode === MysteryEncounterMode.NO_BATTLE) {
     globalScene.pushPhase(new MysteryEncounterRewardsPhase(addHealPhase));
     globalScene.pushPhase(new EggLapsePhase());
-  } else if (!globalScene.getEnemyParty().find(p => encounter.encounterMode !== MysteryEncounterMode.TRAINER_BATTLE ? p.isOnField() : !p?.isFainted(true))) {
+  } else if (
+    !globalScene
+      .getEnemyParty()
+      .find(p =>
+        encounter.encounterMode !== MysteryEncounterMode.TRAINER_BATTLE ? p.isOnField() : !p?.isFainted(true),
+      )
+  ) {
     globalScene.pushPhase(new BattleEndPhase(true));
     if (encounter.encounterMode === MysteryEncounterMode.TRAINER_BATTLE) {
       globalScene.pushPhase(new TrainerVictoryPhase());
@@ -749,8 +896,8 @@ export function handleMysteryEncounterVictory(addHealPhase: boolean = false, doN
  * Similar to {@linkcode handleMysteryEncounterVictory}, but for cases where the player lost a battle or failed a challenge
  * @param addHealPhase
  */
-export function handleMysteryEncounterBattleFailed(addHealPhase: boolean = false, doNotContinue: boolean = false) {
-  const allowedPkm = globalScene.getPlayerParty().filter((pkm) => pkm.isAllowedInBattle());
+export function handleMysteryEncounterBattleFailed(addHealPhase = false, doNotContinue = false) {
+  const allowedPkm = globalScene.getPlayerParty().filter(pkm => pkm.isAllowedInBattle());
 
   if (allowedPkm.length === 0) {
     globalScene.clearPhaseQueue();
@@ -763,7 +910,8 @@ export function handleMysteryEncounterBattleFailed(addHealPhase: boolean = false
   const encounter = globalScene.currentBattle.mysteryEncounter!;
   if (encounter.continuousEncounter || doNotContinue) {
     return;
-  } else if (encounter.encounterMode !== MysteryEncounterMode.NO_BATTLE) {
+  }
+  if (encounter.encounterMode !== MysteryEncounterMode.NO_BATTLE) {
     globalScene.pushPhase(new BattleEndPhase(false));
   }
 
@@ -781,7 +929,7 @@ export function handleMysteryEncounterBattleFailed(addHealPhase: boolean = false
  * @param destroy - If true, will destroy visuals ONLY ON HIDE TRANSITION. Does nothing on show. Defaults to true
  * @param duration
  */
-export function transitionMysteryEncounterIntroVisuals(hide: boolean = true, destroy: boolean = true, duration: number = 750): Promise<boolean> {
+export function transitionMysteryEncounterIntroVisuals(hide = true, destroy = true, duration = 750): Promise<boolean> {
   return new Promise(resolve => {
     const introVisuals = globalScene.currentBattle.mysteryEncounter!.introVisuals;
     const enemyPokemon = globalScene.getEnemyField();
@@ -799,7 +947,7 @@ export function transitionMysteryEncounterIntroVisuals(hide: boolean = true, des
 
       // Transition
       globalScene.tweens.add({
-        targets: [ introVisuals, enemyPokemon ],
+        targets: [introVisuals, enemyPokemon],
         x: `${hide ? "+" : "-"}=16`,
         y: `${hide ? "-" : "+"}=16`,
         alpha: hide ? 0 : 1,
@@ -816,7 +964,7 @@ export function transitionMysteryEncounterIntroVisuals(hide: boolean = true, des
             globalScene.currentBattle.mysteryEncounter!.introVisuals = undefined;
           }
           resolve(true);
-        }
+        },
       });
     } else {
       resolve(true);
@@ -830,10 +978,15 @@ export function transitionMysteryEncounterIntroVisuals(hide: boolean = true, des
  */
 export function handleMysteryEncounterBattleStartEffects() {
   const encounter = globalScene.currentBattle.mysteryEncounter;
-  if (globalScene.currentBattle.isBattleMysteryEncounter() && encounter && encounter.encounterMode !== MysteryEncounterMode.NO_BATTLE && !encounter.startOfBattleEffectsComplete) {
+  if (
+    globalScene.currentBattle.isBattleMysteryEncounter() &&
+    encounter &&
+    encounter.encounterMode !== MysteryEncounterMode.NO_BATTLE &&
+    !encounter.startOfBattleEffectsComplete
+  ) {
     const effects = encounter.startOfBattleEffects;
     effects.forEach(effect => {
-      let source;
+      let source: EnemyPokemon | Pokemon;
       if (effect.sourcePokemon) {
         source = effect.sourcePokemon;
       } else if (!isNullOrUndefined(effect.sourceBattlerIndex)) {
@@ -851,6 +1004,7 @@ export function handleMysteryEncounterBattleStartEffects() {
       } else {
         source = globalScene.getEnemyField()[0];
       }
+      // @ts-ignore: source cannot be undefined
       globalScene.pushPhase(new MovePhase(source, effect.targets, effect.move, effect.followUp, effect.ignorePp));
     });
 
@@ -883,23 +1037,39 @@ export function handleMysteryEncounterTurnStartEffects(): boolean {
  * @param rerollHidden whether the mon should get an extra roll for Hidden Ability
  * @returns {@linkcode EnemyPokemon} for the requested encounter
  */
-export function getRandomEncounterSpecies(level: number, isBoss: boolean = false, rerollHidden: boolean = false): EnemyPokemon {
+export function getRandomEncounterSpecies(level: number, isBoss = false, rerollHidden = false): EnemyPokemon {
   let bossSpecies: PokemonSpecies;
   let isEventEncounter = false;
-  const eventEncounters = globalScene.eventManager.getEventEncounters();
+  const eventEncounters = timedEventManager.getEventEncounters();
+  let formIndex: number | undefined;
 
   if (eventEncounters.length > 0 && randSeedInt(2) === 1) {
     const eventEncounter = randSeedItem(eventEncounters);
-    const levelSpecies = getPokemonSpecies(eventEncounter.species).getWildSpeciesForLevel(level, !eventEncounter.blockEvolution, isBoss, globalScene.gameMode);
+    const levelSpecies = getPokemonSpecies(eventEncounter.species).getWildSpeciesForLevel(
+      level,
+      !eventEncounter.blockEvolution,
+      isBoss,
+      globalScene.gameMode,
+    );
     isEventEncounter = true;
     bossSpecies = getPokemonSpecies(levelSpecies);
+    formIndex = eventEncounter.formIndex;
   } else {
-    bossSpecies = globalScene.arena.randomSpecies(globalScene.currentBattle.waveIndex, level, 0, getPartyLuckValue(globalScene.getPlayerParty()), isBoss);
+    bossSpecies = globalScene.arena.randomSpecies(
+      globalScene.currentBattle.waveIndex,
+      level,
+      0,
+      getPartyLuckValue(globalScene.getPlayerParty()),
+      isBoss,
+    );
   }
   const ret = new EnemyPokemon(bossSpecies, level, TrainerSlot.NONE, isBoss);
+  if (formIndex) {
+    ret.formIndex = formIndex;
+  }
 
-  //Reroll shiny for event encounters
-  if (isEventEncounter && !ret.shiny) {
+  //Reroll shiny or variant for event encounters
+  if (isEventEncounter) {
     ret.trySetShinySeed();
   }
   //Reroll hidden ability
@@ -918,18 +1088,27 @@ export function getRandomEncounterSpecies(level: number, isBoss: boolean = false
 export function calculateMEAggregateStats(baseSpawnWeight: number) {
   const numRuns = 1000;
   let run = 0;
-  const biomes = Object.keys(Biome).filter(key => isNaN(Number(key)));
-  const alwaysPickTheseBiomes = [ Biome.ISLAND, Biome.ABYSS, Biome.WASTELAND, Biome.FAIRY_CAVE, Biome.TEMPLE, Biome.LABORATORY, Biome.SPACE, Biome.WASTELAND ];
+  const biomes = Object.keys(Biome).filter(key => Number.isNaN(Number(key)));
+  const alwaysPickTheseBiomes = [
+    Biome.ISLAND,
+    Biome.ABYSS,
+    Biome.WASTELAND,
+    Biome.FAIRY_CAVE,
+    Biome.TEMPLE,
+    Biome.LABORATORY,
+    Biome.SPACE,
+    Biome.WASTELAND,
+  ];
 
   const calculateNumEncounters = (): any[] => {
     let encounterRate = baseSpawnWeight; // BASE_MYSTERY_ENCOUNTER_SPAWN_WEIGHT
-    const numEncounters = [ 0, 0, 0, 0 ];
+    const numEncounters = [0, 0, 0, 0];
     let mostRecentEncounterWave = 0;
-    const encountersByBiome = new Map<string, number>(biomes.map(b => [ b, 0 ]));
-    const validMEfloorsByBiome = new Map<string, number>(biomes.map(b => [ b, 0 ]));
+    const encountersByBiome = new Map<string, number>(biomes.map(b => [b, 0]));
+    const validMEfloorsByBiome = new Map<string, number>(biomes.map(b => [b, 0]));
     let currentBiome = Biome.TOWN;
     let currentArena = globalScene.newArena(currentBiome);
-    globalScene.setSeed(Utils.randomString(24));
+    globalScene.setSeed(randomString(24));
     globalScene.resetSeed();
     for (let i = 10; i < 180; i++) {
       // Boss
@@ -944,20 +1123,20 @@ export function calculateMEAggregateStats(baseSpawnWeight: number) {
           globalScene.executeWithSeedOffset(() => {
             biomes = (biomeLinks[currentBiome] as (Biome | [Biome, number])[])
               .filter(b => {
-                return !Array.isArray(b) || !Utils.randSeedInt(b[1]);
+                return !Array.isArray(b) || !randSeedInt(b[1]);
               })
-              .map(b => !Array.isArray(b) ? b : b[0]);
+              .map(b => (!Array.isArray(b) ? b : b[0]));
           }, i * 100);
           if (biomes! && biomes.length > 0) {
             const specialBiomes = biomes.filter(b => alwaysPickTheseBiomes.includes(b));
             if (specialBiomes.length > 0) {
-              currentBiome = specialBiomes[Utils.randSeedInt(specialBiomes.length)];
+              currentBiome = specialBiomes[randSeedInt(specialBiomes.length)];
             } else {
-              currentBiome = biomes[Utils.randSeedInt(biomes.length)];
+              currentBiome = biomes[randSeedInt(biomes.length)];
             }
           }
         } else if (biomeLinks.hasOwnProperty(currentBiome)) {
-          currentBiome = (biomeLinks[currentBiome] as Biome);
+          currentBiome = biomeLinks[currentBiome] as Biome;
         } else {
           if (!(i % 50)) {
             currentBiome = Biome.END;
@@ -981,17 +1160,17 @@ export function calculateMEAggregateStats(baseSpawnWeight: number) {
 
       // Otherwise, roll encounter
 
-      const roll = Utils.randSeedInt(256);
+      const roll = randSeedInt(256);
       validMEfloorsByBiome.set(Biome[currentBiome], (validMEfloorsByBiome.get(Biome[currentBiome]) ?? 0) + 1);
 
       // If total number of encounters is lower than expected for the run, slightly favor a new encounter
       // Do the reverse as well
-      const expectedEncountersByFloor = AVERAGE_ENCOUNTERS_PER_RUN_TARGET / (180 - 10) * (i - 10);
+      const expectedEncountersByFloor = (AVERAGE_ENCOUNTERS_PER_RUN_TARGET / (180 - 10)) * (i - 10);
       const currentRunDiffFromAvg = expectedEncountersByFloor - numEncounters.reduce((a, b) => a + b);
       const favoredEncounterRate = encounterRate + currentRunDiffFromAvg * 15;
 
       // If the most recent ME was 3 or fewer waves ago, can never spawn a ME
-      const canSpawn = (i - mostRecentEncounterWave) > 3;
+      const canSpawn = i - mostRecentEncounterWave > 3;
 
       if (canSpawn && roll < favoredEncounterRate) {
         mostRecentEncounterWave = i;
@@ -999,26 +1178,32 @@ export function calculateMEAggregateStats(baseSpawnWeight: number) {
 
         // Calculate encounter rarity
         // Common / Uncommon / Rare / Super Rare (base is out of 128)
-        const tierWeights = [ 66, 40, 19, 3 ];
+        const tierWeights = [66, 40, 19, 3];
 
         // Adjust tier weights by currently encountered events (pity system that lowers odds of multiple Common/Great)
         tierWeights[0] = tierWeights[0] - 6 * numEncounters[0];
         tierWeights[1] = tierWeights[1] - 4 * numEncounters[1];
 
         const totalWeight = tierWeights.reduce((a, b) => a + b);
-        const tierValue = Utils.randSeedInt(totalWeight);
+        const tierValue = randSeedInt(totalWeight);
         const commonThreshold = totalWeight - tierWeights[0]; // 64 - 32 = 32
         const uncommonThreshold = totalWeight - tierWeights[0] - tierWeights[1]; // 64 - 32 - 16 = 16
         const rareThreshold = totalWeight - tierWeights[0] - tierWeights[1] - tierWeights[2]; // 64 - 32 - 16 - 10 = 6
 
-        tierValue > commonThreshold ? ++numEncounters[0] : tierValue > uncommonThreshold ? ++numEncounters[1] : tierValue > rareThreshold ? ++numEncounters[2] : ++numEncounters[3];
+        tierValue > commonThreshold
+          ? ++numEncounters[0]
+          : tierValue > uncommonThreshold
+            ? ++numEncounters[1]
+            : tierValue > rareThreshold
+              ? ++numEncounters[2]
+              : ++numEncounters[3];
         encountersByBiome.set(Biome[currentBiome], (encountersByBiome.get(Biome[currentBiome]) ?? 0) + 1);
       } else {
         encounterRate += WEIGHT_INCREMENT_ON_SPAWN_MISS;
       }
     }
 
-    return [ numEncounters, encountersByBiome, validMEfloorsByBiome ];
+    return [numEncounters, encountersByBiome, validMEfloorsByBiome];
   };
 
   const encounterRuns: number[][] = [];
@@ -1026,7 +1211,7 @@ export function calculateMEAggregateStats(baseSpawnWeight: number) {
   const validFloorsByBiome: Map<string, number>[] = [];
   while (run < numRuns) {
     globalScene.executeWithSeedOffset(() => {
-      const [ numEncounters, encountersByBiome, validMEfloorsByBiome ] = calculateNumEncounters();
+      const [numEncounters, encountersByBiome, validMEfloorsByBiome] = calculateNumEncounters();
       encounterRuns.push(numEncounters);
       encountersByBiomeRuns.push(encountersByBiome);
       validFloorsByBiome.push(validMEfloorsByBiome);
@@ -1067,13 +1252,17 @@ export function calculateMEAggregateStats(baseSpawnWeight: number) {
 
   let stats = `Starting weight: ${baseSpawnWeight}\nAverage MEs per run: ${totalMean}\nStandard Deviation: ${totalStd}\nAvg Commons: ${commonMean}\nAvg Greats: ${uncommonMean}\nAvg Ultras: ${rareMean}\nAvg Rogues: ${superRareMean}\n`;
 
-  const meanEncountersPerRunPerBiomeSorted = [ ...meanEncountersPerRunPerBiome.entries() ].sort((e1, e2) => e2[1] - e1[1]);
-  meanEncountersPerRunPerBiomeSorted.forEach(value => stats = stats + `${value[0]}: avg valid floors ${meanMEFloorsPerRunPerBiome.get(value[0])}, avg MEs ${value[1]},\n`);
+  const meanEncountersPerRunPerBiomeSorted = [...meanEncountersPerRunPerBiome.entries()].sort(
+    (e1, e2) => e2[1] - e1[1],
+  );
+
+  for (const value of meanEncountersPerRunPerBiomeSorted) {
+    stats += value[0] + "avg valid floors " + meanMEFloorsPerRunPerBiome.get(value[0]) + ", avg MEs ${value[1]},\n";
+  }
 
   console.log(stats);
 }
 
-
 /**
  * TODO: remove once encounter spawn rate is finalized
  * Just a helper function to calculate aggregate stats for MEs in a Classic run
@@ -1084,25 +1273,28 @@ export function calculateRareSpawnAggregateStats(luckValue: number) {
   let run = 0;
 
   const calculateNumRareEncounters = (): any[] => {
-    const bossEncountersByRarity = [ 0, 0, 0, 0 ];
-    globalScene.setSeed(Utils.randomString(24));
+    const bossEncountersByRarity = [0, 0, 0, 0];
+    globalScene.setSeed(randomString(24));
     globalScene.resetSeed();
     // There are 12 wild boss floors
     for (let i = 0; i < 12; i++) {
       // Roll boss tier
       // luck influences encounter rarity
       let luckModifier = 0;
-      if (!isNaN(luckValue)) {
+      if (!Number.isNaN(luckValue)) {
         luckModifier = luckValue * 0.5;
       }
-      const tierValue = Utils.randSeedInt(64 - luckModifier);
-      const tier = tierValue >= 20 ? BiomePoolTier.BOSS : tierValue >= 6 ? BiomePoolTier.BOSS_RARE : tierValue >= 1 ? BiomePoolTier.BOSS_SUPER_RARE : BiomePoolTier.BOSS_ULTRA_RARE;
+      const tierValue = randSeedInt(64 - luckModifier);
+      const tier =
+        tierValue >= 20
+          ? BiomePoolTier.BOSS
+          : tierValue >= 6
+            ? BiomePoolTier.BOSS_RARE
+            : tierValue >= 1
+              ? BiomePoolTier.BOSS_SUPER_RARE
+              : BiomePoolTier.BOSS_ULTRA_RARE;
 
       switch (tier) {
-        default:
-        case BiomePoolTier.BOSS:
-          ++bossEncountersByRarity[0];
-          break;
         case BiomePoolTier.BOSS_RARE:
           ++bossEncountersByRarity[1];
           break;
@@ -1112,6 +1304,10 @@ export function calculateRareSpawnAggregateStats(luckValue: number) {
         case BiomePoolTier.BOSS_ULTRA_RARE:
           ++bossEncountersByRarity[3];
           break;
+        case BiomePoolTier.BOSS:
+        default:
+          ++bossEncountersByRarity[0];
+          break;
       }
     }
 
diff --git a/src/data/mystery-encounters/utils/encounter-pokemon-utils.ts b/src/data/mystery-encounters/utils/encounter-pokemon-utils.ts
index 580aaaf2cc6..a6a87b4ab9a 100644
--- a/src/data/mystery-encounters/utils/encounter-pokemon-utils.ts
+++ b/src/data/mystery-encounters/utils/encounter-pokemon-utils.ts
@@ -1,23 +1,32 @@
 import { globalScene } from "#app/global-scene";
 import i18next from "i18next";
-import { isNullOrUndefined, randSeedInt } from "#app/utils";
+import { isNullOrUndefined, randSeedInt } from "#app/utils/common";
 import { PokemonHeldItemModifier } from "#app/modifier/modifier";
 import type { EnemyPokemon, PlayerPokemon } from "#app/field/pokemon";
 import type Pokemon from "#app/field/pokemon";
-import { doPokeballBounceAnim, getPokeballAtlasKey, getPokeballCatchMultiplier, getPokeballTintColor } from "#app/data/pokeball";
+import {
+  doPokeballBounceAnim,
+  getPokeballAtlasKey,
+  getPokeballCatchMultiplier,
+  getPokeballTintColor,
+} from "#app/data/pokeball";
 import { PlayerGender } from "#enums/player-gender";
 import { addPokeballCaptureStars, addPokeballOpenParticles } from "#app/field/anims";
 import { getStatusEffectCatchRateMultiplier } from "#app/data/status-effect";
 import { achvs } from "#app/system/achv";
-import { Mode } from "#app/ui/ui";
+import { UiMode } from "#enums/ui-mode";
 import type { PartyOption } from "#app/ui/party-ui-handler";
 import { PartyUiMode } from "#app/ui/party-ui-handler";
 import { Species } from "#enums/species";
-import type { Type } from "#enums/type";
+import type { PokemonType } from "#enums/pokemon-type";
 import type PokemonSpecies from "#app/data/pokemon-species";
 import { getPokemonSpecies } from "#app/data/pokemon-species";
 import { speciesStarterCosts } from "#app/data/balance/starters";
-import { getEncounterText, queueEncounterMessage, showEncounterText } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils";
+import {
+  getEncounterText,
+  queueEncounterMessage,
+  showEncounterText,
+} from "#app/data/mystery-encounters/utils/encounter-dialogue-utils";
 import { getPokemonNameWithAffix } from "#app/messages";
 import type { PokemonHeldItemModifierType } from "#app/modifier/modifier-type";
 import { modifierTypes } from "#app/modifier/modifier-type";
@@ -41,18 +50,41 @@ export const STANDARD_ENCOUNTER_BOOSTED_LEVEL_MODIFIER = 1;
  * @param shiny
  * @param variant
  */
-export function getSpriteKeysFromSpecies(species: Species, female?: boolean, formIndex?: number, shiny?: boolean, variant?: number): { spriteKey: string, fileRoot: string } {
-  const spriteKey = getPokemonSpecies(species).getSpriteKey(female ?? false, formIndex ?? 0, shiny ?? false, variant ?? 0);
-  const fileRoot = getPokemonSpecies(species).getSpriteAtlasPath(female ?? false, formIndex ?? 0, shiny ?? false, variant ?? 0);
+export function getSpriteKeysFromSpecies(
+  species: Species,
+  female?: boolean,
+  formIndex?: number,
+  shiny?: boolean,
+  variant?: number,
+): { spriteKey: string; fileRoot: string } {
+  const spriteKey = getPokemonSpecies(species).getSpriteKey(
+    female ?? false,
+    formIndex ?? 0,
+    shiny ?? false,
+    variant ?? 0,
+  );
+  const fileRoot = getPokemonSpecies(species).getSpriteAtlasPath(
+    female ?? false,
+    formIndex ?? 0,
+    shiny ?? false,
+    variant ?? 0,
+  );
   return { spriteKey, fileRoot };
 }
 
 /**
  * Gets the sprite key and file root for a given Pokemon (accounts for gender, shiny, variants, forms, and experimental)
  */
-export function getSpriteKeysFromPokemon(pokemon: Pokemon): { spriteKey: string, fileRoot: string } {
-  const spriteKey = pokemon.getSpeciesForm().getSpriteKey(pokemon.getGender() === Gender.FEMALE, pokemon.formIndex, pokemon.shiny, pokemon.variant);
-  const fileRoot = pokemon.getSpeciesForm().getSpriteAtlasPath(pokemon.getGender() === Gender.FEMALE, pokemon.formIndex, pokemon.shiny, pokemon.variant);
+export function getSpriteKeysFromPokemon(pokemon: Pokemon): {
+  spriteKey: string;
+  fileRoot: string;
+} {
+  const spriteKey = pokemon
+    .getSpeciesForm()
+    .getSpriteKey(pokemon.getGender() === Gender.FEMALE, pokemon.formIndex, pokemon.shiny, pokemon.variant);
+  const fileRoot = pokemon
+    .getSpeciesForm()
+    .getSpriteAtlasPath(pokemon.getGender() === Gender.FEMALE, pokemon.formIndex, pokemon.shiny, pokemon.variant);
 
   return { spriteKey, fileRoot };
 }
@@ -65,7 +97,11 @@ export function getSpriteKeysFromPokemon(pokemon: Pokemon): { spriteKey: string,
  * @param doNotReturnLastAllowedMon Default `false`. If `true`, will never return the last unfainted pokemon in the party. Useful when this function is being used to determine what Pokemon to remove from the party (Don't want to remove last unfainted)
  * @returns
  */
-export function getRandomPlayerPokemon(isAllowed: boolean = false, isFainted: boolean = false, doNotReturnLastAllowedMon: boolean = false): PlayerPokemon {
+export function getRandomPlayerPokemon(
+  isAllowed = false,
+  isFainted = false,
+  doNotReturnLastAllowedMon = false,
+): PlayerPokemon {
   const party = globalScene.getPlayerParty();
   let chosenIndex: number;
   let chosenPokemon: PlayerPokemon | null = null;
@@ -104,7 +140,7 @@ export function getRandomPlayerPokemon(isAllowed: boolean = false, isFainted: bo
  * @param isFainted Default false. If true, includes fainted mons.
  * @returns
  */
-export function getHighestLevelPlayerPokemon(isAllowed: boolean = false, isFainted: boolean = false): PlayerPokemon {
+export function getHighestLevelPlayerPokemon(isAllowed = false, isFainted = false): PlayerPokemon {
   const party = globalScene.getPlayerParty();
   let pokemon: PlayerPokemon | null = null;
 
@@ -116,7 +152,7 @@ export function getHighestLevelPlayerPokemon(isAllowed: boolean = false, isFaint
       continue;
     }
 
-    pokemon = pokemon ? pokemon?.level < p?.level ? p : pokemon : p;
+    pokemon = pokemon ? (pokemon?.level < p?.level ? p : pokemon) : p;
   }
 
   return pokemon!;
@@ -130,7 +166,7 @@ export function getHighestLevelPlayerPokemon(isAllowed: boolean = false, isFaint
  * @param isFainted Default false. If true, includes fainted mons.
  * @returns
  */
-export function getHighestStatPlayerPokemon(stat: PermanentStat, isAllowed: boolean = false, isFainted: boolean = false): PlayerPokemon {
+export function getHighestStatPlayerPokemon(stat: PermanentStat, isAllowed = false, isFainted = false): PlayerPokemon {
   const party = globalScene.getPlayerParty();
   let pokemon: PlayerPokemon | null = null;
 
@@ -142,7 +178,7 @@ export function getHighestStatPlayerPokemon(stat: PermanentStat, isAllowed: bool
       continue;
     }
 
-    pokemon = pokemon ? pokemon.getStat(stat) < p?.getStat(stat) ? p : pokemon : p;
+    pokemon = pokemon ? (pokemon.getStat(stat) < p?.getStat(stat) ? p : pokemon) : p;
   }
 
   return pokemon!;
@@ -155,7 +191,7 @@ export function getHighestStatPlayerPokemon(stat: PermanentStat, isAllowed: bool
  * @param isFainted Default false. If true, includes fainted mons.
  * @returns
  */
-export function getLowestLevelPlayerPokemon(isAllowed: boolean = false, isFainted: boolean = false): PlayerPokemon {
+export function getLowestLevelPlayerPokemon(isAllowed = false, isFainted = false): PlayerPokemon {
   const party = globalScene.getPlayerParty();
   let pokemon: PlayerPokemon | null = null;
 
@@ -167,7 +203,7 @@ export function getLowestLevelPlayerPokemon(isAllowed: boolean = false, isFainte
       continue;
     }
 
-    pokemon = pokemon ? pokemon?.level > p?.level ? p : pokemon : p;
+    pokemon = pokemon ? (pokemon?.level > p?.level ? p : pokemon) : p;
   }
 
   return pokemon!;
@@ -180,7 +216,7 @@ export function getLowestLevelPlayerPokemon(isAllowed: boolean = false, isFainte
  * @param isFainted Default false. If true, includes fainted mons.
  * @returns
  */
-export function getHighestStatTotalPlayerPokemon(isAllowed: boolean = false, isFainted: boolean = false): PlayerPokemon {
+export function getHighestStatTotalPlayerPokemon(isAllowed = false, isFainted = false): PlayerPokemon {
   const party = globalScene.getPlayerParty();
   let pokemon: PlayerPokemon | null = null;
 
@@ -192,7 +228,7 @@ export function getHighestStatTotalPlayerPokemon(isAllowed: boolean = false, isF
       continue;
     }
 
-    pokemon = pokemon ? pokemon?.stats.reduce((a, b) => a + b) < p?.stats.reduce((a, b) => a + b) ? p : pokemon : p;
+    pokemon = pokemon ? (pokemon?.stats.reduce((a, b) => a + b) < p?.stats.reduce((a, b) => a + b) ? p : pokemon) : p;
   }
 
   return pokemon!;
@@ -209,28 +245,40 @@ export function getHighestStatTotalPlayerPokemon(isAllowed: boolean = false, isF
  * @param allowMythical
  * @returns
  */
-export function getRandomSpeciesByStarterCost(starterTiers: number | [number, number], excludedSpecies?: Species[], types?: Type[], allowSubLegendary: boolean = true, allowLegendary: boolean = true, allowMythical: boolean = true): Species {
+export function getRandomSpeciesByStarterCost(
+  starterTiers: number | [number, number],
+  excludedSpecies?: Species[],
+  types?: PokemonType[],
+  allowSubLegendary = true,
+  allowLegendary = true,
+  allowMythical = true,
+): Species {
   let min = Array.isArray(starterTiers) ? starterTiers[0] : starterTiers;
   let max = Array.isArray(starterTiers) ? starterTiers[1] : starterTiers;
 
   let filteredSpecies: [PokemonSpecies, number][] = Object.keys(speciesStarterCosts)
-    .map(s => [ parseInt(s) as Species, speciesStarterCosts[s] as number ])
+    .map(s => [Number.parseInt(s) as Species, speciesStarterCosts[s] as number])
     .filter(s => {
       const pokemonSpecies = getPokemonSpecies(s[0]);
-      return pokemonSpecies && (!excludedSpecies || !excludedSpecies.includes(s[0]))
-        && (allowSubLegendary || !pokemonSpecies.subLegendary)
-        && (allowLegendary || !pokemonSpecies.legendary)
-        && (allowMythical || !pokemonSpecies.mythical);
+      return (
+        pokemonSpecies &&
+        (!excludedSpecies || !excludedSpecies.includes(s[0])) &&
+        (allowSubLegendary || !pokemonSpecies.subLegendary) &&
+        (allowLegendary || !pokemonSpecies.legendary) &&
+        (allowMythical || !pokemonSpecies.mythical)
+      );
     })
-    .map(s => [ getPokemonSpecies(s[0]), s[1] ]);
+    .map(s => [getPokemonSpecies(s[0]), s[1]]);
 
   if (types && types.length > 0) {
-    filteredSpecies = filteredSpecies.filter(s => types.includes(s[0].type1) || (!isNullOrUndefined(s[0].type2) && types.includes(s[0].type2)));
+    filteredSpecies = filteredSpecies.filter(
+      s => types.includes(s[0].type1) || (!isNullOrUndefined(s[0].type2) && types.includes(s[0].type2)),
+    );
   }
 
   // If no filtered mons exist at specified starter tiers, will expand starter search range until there are
   // Starts by decrementing starter tier min until it is 0, then increments tier max up to 10
-  let tryFilterStarterTiers: [PokemonSpecies, number][] = filteredSpecies.filter(s => (s[1] >= min && s[1] <= max));
+  let tryFilterStarterTiers: [PokemonSpecies, number][] = filteredSpecies.filter(s => s[1] >= min && s[1] <= max);
   while (tryFilterStarterTiers.length === 0 && !(min === 0 && max === 10)) {
     if (min > 0) {
       min--;
@@ -259,7 +307,11 @@ export function koPlayerPokemon(pokemon: PlayerPokemon) {
   pokemon.hp = 0;
   pokemon.trySetStatus(StatusEffect.FAINT);
   pokemon.updateInfo();
-  queueEncounterMessage(i18next.t("battle:fainted", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
+  queueEncounterMessage(
+    i18next.t("battle:fainted", {
+      pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
+    }),
+  );
 }
 
 /**
@@ -290,7 +342,9 @@ function applyHpChangeToPokemon(pokemon: PlayerPokemon, value: number) {
  */
 export function applyDamageToPokemon(pokemon: PlayerPokemon, damage: number) {
   if (damage <= 0) {
-    console.warn("Healing pokemon with `applyDamageToPokemon` is not recommended! Please use `applyHealToPokemon` instead.");
+    console.warn(
+      "Healing pokemon with `applyDamageToPokemon` is not recommended! Please use `applyHealToPokemon` instead.",
+    );
   }
   // If a Pokemon would faint from the damage applied, its HP is instead set to 1.
   if (pokemon.isAllowedInBattle() && pokemon.hp - damage <= 0) {
@@ -308,7 +362,9 @@ export function applyDamageToPokemon(pokemon: PlayerPokemon, damage: number) {
  */
 export function applyHealToPokemon(pokemon: PlayerPokemon, heal: number) {
   if (heal <= 0) {
-    console.warn("Damaging pokemon with `applyHealToPokemon` is not recommended! Please use `applyDamageToPokemon` instead.");
+    console.warn(
+      "Damaging pokemon with `applyHealToPokemon` is not recommended! Please use `applyDamageToPokemon` instead.",
+    );
   }
 
   applyHpChangeToPokemon(pokemon, heal);
@@ -321,12 +377,13 @@ export function applyHealToPokemon(pokemon: PlayerPokemon, heal: number) {
  * @param value
  */
 export async function modifyPlayerPokemonBST(pokemon: PlayerPokemon, value: number) {
-  const modType = modifierTypes.MYSTERY_ENCOUNTER_SHUCKLE_JUICE()
-    .generateType(globalScene.getPlayerParty(), [ value ])
+  const modType = modifierTypes
+    .MYSTERY_ENCOUNTER_SHUCKLE_JUICE()
+    .generateType(globalScene.getPlayerParty(), [value])
     ?.withIdFromFunc(modifierTypes.MYSTERY_ENCOUNTER_SHUCKLE_JUICE);
   const modifier = modType?.newModifier(pokemon);
   if (modifier) {
-    await globalScene.addModifier(modifier, false, false, false, true);
+    globalScene.addModifier(modifier, false, false, false, true);
     pokemon.calculateStats();
   }
 }
@@ -339,15 +396,20 @@ export async function modifyPlayerPokemonBST(pokemon: PlayerPokemon, value: numb
  * @param modType
  * @param fallbackModifierType
  */
-export async function applyModifierTypeToPlayerPokemon(pokemon: PlayerPokemon, modType: PokemonHeldItemModifierType, fallbackModifierType?: PokemonHeldItemModifierType) {
+export async function applyModifierTypeToPlayerPokemon(
+  pokemon: PlayerPokemon,
+  modType: PokemonHeldItemModifierType,
+  fallbackModifierType?: PokemonHeldItemModifierType,
+) {
   // Check if the Pokemon has max stacks of that item already
   const modifier = modType.newModifier(pokemon);
-  const existing = globalScene.findModifier(m => (
-    m instanceof PokemonHeldItemModifier &&
-    m.type.id === modType.id &&
-    m.pokemonId === pokemon.id &&
-    m.matchType(modifier)
-  )) as PokemonHeldItemModifier;
+  const existing = globalScene.findModifier(
+    m =>
+      m instanceof PokemonHeldItemModifier &&
+      m.type.id === modType.id &&
+      m.pokemonId === pokemon.id &&
+      m.matchType(modifier),
+  ) as PokemonHeldItemModifier;
 
   // At max stacks
   if (existing && existing.getStackCount() >= existing.getMaxStackCount()) {
@@ -359,7 +421,7 @@ export async function applyModifierTypeToPlayerPokemon(pokemon: PlayerPokemon, m
     return applyModifierTypeToPlayerPokemon(pokemon, fallbackModifierType);
   }
 
-  await globalScene.addModifier(modifier, false, false, false, true);
+  globalScene.addModifier(modifier, false, false, false, true);
 }
 
 /**
@@ -373,7 +435,11 @@ export async function applyModifierTypeToPlayerPokemon(pokemon: PlayerPokemon, m
  * @param pokeballType
  * @param ballTwitchRate - can pass custom ball catch rates (for special events, like safari)
  */
-export function trainerThrowPokeball(pokemon: EnemyPokemon, pokeballType: PokeballType, ballTwitchRate?: number): Promise<boolean> {
+export function trainerThrowPokeball(
+  pokemon: EnemyPokemon,
+  pokeballType: PokeballType,
+  ballTwitchRate?: number,
+): Promise<boolean> {
   const originalY: number = pokemon.y;
 
   if (!ballTwitchRate) {
@@ -397,7 +463,9 @@ export function trainerThrowPokeball(pokemon: EnemyPokemon, pokeballType: Pokeba
   });
 
   return new Promise(resolve => {
-    globalScene.trainer.setTexture(`trainer_${globalScene.gameData.gender === PlayerGender.FEMALE ? "f" : "m"}_back_pb`);
+    globalScene.trainer.setTexture(
+      `trainer_${globalScene.gameData.gender === PlayerGender.FEMALE ? "f" : "m"}_back_pb`,
+    );
     globalScene.time.delayedCall(512, () => {
       globalScene.playSound("se/pb_throw");
 
@@ -406,7 +474,9 @@ export function trainerThrowPokeball(pokemon: EnemyPokemon, pokeballType: Pokeba
       globalScene.time.delayedCall(256, () => {
         globalScene.trainer.setFrame("3");
         globalScene.time.delayedCall(768, () => {
-          globalScene.trainer.setTexture(`trainer_${globalScene.gameData.gender === PlayerGender.FEMALE ? "f" : "m"}_back`);
+          globalScene.trainer.setTexture(
+            `trainer_${globalScene.gameData.gender === PlayerGender.FEMALE ? "f" : "m"}_back`,
+          );
         });
       });
 
@@ -486,22 +556,22 @@ export function trainerThrowPokeball(pokemon: EnemyPokemon, pokeballType: Pokeba
                             alpha: 0,
                             duration: 200,
                             easing: "Sine.easeIn",
-                            onComplete: () => pbTint.destroy()
+                            onComplete: () => pbTint.destroy(),
                           });
-                        }
+                        },
                       });
                     }
                   },
                   onComplete: () => {
                     catchPokemon(pokemon, pokeball, pokeballType).then(() => resolve(true));
-                  }
+                  },
                 });
               };
 
               globalScene.time.delayedCall(250, () => doPokeballBounceAnim(pokeball, 16, 72, 350, doShake));
-            }
+            },
           });
-        }
+        },
       });
     });
   });
@@ -515,7 +585,12 @@ export function trainerThrowPokeball(pokemon: EnemyPokemon, pokeballType: Pokeba
  * @param pokeball
  * @param pokeballType
  */
-function failCatch(pokemon: EnemyPokemon, originalY: number, pokeball: Phaser.GameObjects.Sprite, pokeballType: PokeballType) {
+function failCatch(
+  pokemon: EnemyPokemon,
+  originalY: number,
+  pokeball: Phaser.GameObjects.Sprite,
+  pokeballType: PokeballType,
+) {
   return new Promise<void>(resolve => {
     globalScene.playSound("se/pb_rel");
     pokemon.setY(originalY);
@@ -534,13 +609,21 @@ function failCatch(pokemon: EnemyPokemon, originalY: number, pokeball: Phaser.Ga
       targets: pokemon,
       duration: 250,
       ease: "Sine.easeOut",
-      scale: 1
+      scale: 1,
     });
 
     globalScene.currentBattle.lastUsedPokeball = pokeballType;
     removePb(pokeball);
 
-    globalScene.ui.showText(i18next.t("battle:pokemonBrokeFree", { pokemonName: pokemon.getNameToRender() }), null, () => resolve(), null, true);
+    globalScene.ui.showText(
+      i18next.t("battle:pokemonBrokeFree", {
+        pokemonName: pokemon.getNameToRender(),
+      }),
+      null,
+      () => resolve(),
+      null,
+      true,
+    );
   });
 }
 
@@ -553,10 +636,19 @@ function failCatch(pokemon: EnemyPokemon, originalY: number, pokeball: Phaser.Ga
  * @param showCatchObtainMessage
  * @param isObtain
  */
-export async function catchPokemon(pokemon: EnemyPokemon, pokeball: Phaser.GameObjects.Sprite | null, pokeballType: PokeballType, showCatchObtainMessage: boolean = true, isObtain: boolean = false): Promise<void> {
+export async function catchPokemon(
+  pokemon: EnemyPokemon,
+  pokeball: Phaser.GameObjects.Sprite | null,
+  pokeballType: PokeballType,
+  showCatchObtainMessage = true,
+  isObtain = false,
+): Promise<void> {
   const speciesForm = !pokemon.fusionSpecies ? pokemon.getSpeciesForm() : pokemon.getFusionSpeciesForm();
 
-  if (speciesForm.abilityHidden && (pokemon.fusionSpecies ? pokemon.fusionAbilityIndex : pokemon.abilityIndex) === speciesForm.getAbilityCount() - 1) {
+  if (
+    speciesForm.abilityHidden &&
+    (pokemon.fusionSpecies ? pokemon.fusionAbilityIndex : pokemon.abilityIndex) === speciesForm.getAbilityCount() - 1
+  ) {
     globalScene.validateAchv(achvs.HIDDEN_ABILITY);
   }
 
@@ -611,35 +703,90 @@ export async function catchPokemon(pokemon: EnemyPokemon, pokeball: Phaser.GameO
           }
         });
       };
-      Promise.all([ pokemon.hideInfo(), globalScene.gameData.setPokemonCaught(pokemon) ]).then(() => {
+      Promise.all([pokemon.hideInfo(), globalScene.gameData.setPokemonCaught(pokemon)]).then(() => {
         if (globalScene.getPlayerParty().length === 6) {
           const promptRelease = () => {
-            globalScene.ui.showText(i18next.t("battle:partyFull", { pokemonName: pokemon.getNameToRender() }), null, () => {
-              globalScene.pokemonInfoContainer.makeRoomForConfirmUi(1, true);
-              globalScene.ui.setMode(Mode.CONFIRM, () => {
-                const newPokemon = globalScene.addPlayerPokemon(pokemon.species, pokemon.level, pokemon.abilityIndex, pokemon.formIndex, pokemon.gender, pokemon.shiny, pokemon.variant, pokemon.ivs, pokemon.nature, pokemon);
-                globalScene.ui.setMode(Mode.SUMMARY, newPokemon, 0, SummaryUiMode.DEFAULT, () => {
-                  globalScene.ui.setMode(Mode.MESSAGE).then(() => {
-                    promptRelease();
-                  });
-                }, false);
-              }, () => {
-                globalScene.ui.setMode(Mode.PARTY, PartyUiMode.RELEASE, 0, (slotIndex: number, _option: PartyOption) => {
-                  globalScene.ui.setMode(Mode.MESSAGE).then(() => {
-                    if (slotIndex < 6) {
-                      addToParty(slotIndex);
-                    } else {
-                      promptRelease();
-                    }
-                  });
-                });
-              }, () => {
-                globalScene.ui.setMode(Mode.MESSAGE).then(() => {
-                  removePokemon();
-                  end();
-                });
-              }, "fullParty");
-            });
+            globalScene.ui.showText(
+              i18next.t("battle:partyFull", {
+                pokemonName: pokemon.getNameToRender(),
+              }),
+              null,
+              () => {
+                globalScene.pokemonInfoContainer.makeRoomForConfirmUi(1, true);
+                globalScene.ui.setMode(
+                  UiMode.CONFIRM,
+                  () => {
+                    const newPokemon = globalScene.addPlayerPokemon(
+                      pokemon.species,
+                      pokemon.level,
+                      pokemon.abilityIndex,
+                      pokemon.formIndex,
+                      pokemon.gender,
+                      pokemon.shiny,
+                      pokemon.variant,
+                      pokemon.ivs,
+                      pokemon.nature,
+                      pokemon,
+                    );
+                    globalScene.ui.setMode(
+                      UiMode.SUMMARY,
+                      newPokemon,
+                      0,
+                      SummaryUiMode.DEFAULT,
+                      () => {
+                        globalScene.ui.setMode(UiMode.MESSAGE).then(() => {
+                          promptRelease();
+                        });
+                      },
+                      false,
+                    );
+                  },
+                  () => {
+                    const attributes = {
+                      shiny: pokemon.shiny,
+                      variant: pokemon.variant,
+                      form: pokemon.formIndex,
+                      female: pokemon.gender === Gender.FEMALE,
+                    };
+                    globalScene.ui.setOverlayMode(
+                      UiMode.POKEDEX_PAGE,
+                      pokemon.species,
+                      pokemon.formIndex,
+                      attributes,
+                      null,
+                      () => {
+                        globalScene.ui.setMode(UiMode.MESSAGE).then(() => {
+                          promptRelease();
+                        });
+                      },
+                    );
+                  },
+                  () => {
+                    globalScene.ui.setMode(
+                      UiMode.PARTY,
+                      PartyUiMode.RELEASE,
+                      0,
+                      (slotIndex: number, _option: PartyOption) => {
+                        globalScene.ui.setMode(UiMode.MESSAGE).then(() => {
+                          if (slotIndex < 6) {
+                            addToParty(slotIndex);
+                          } else {
+                            promptRelease();
+                          }
+                        });
+                      },
+                    );
+                  },
+                  () => {
+                    globalScene.ui.setMode(UiMode.MESSAGE).then(() => {
+                      removePokemon();
+                      end();
+                    });
+                  },
+                  "fullParty",
+                );
+              },
+            );
           };
           promptRelease();
         } else {
@@ -649,7 +796,15 @@ export async function catchPokemon(pokemon: EnemyPokemon, pokeball: Phaser.GameO
     };
 
     if (showCatchObtainMessage) {
-      globalScene.ui.showText(i18next.t(isObtain ? "battle:pokemonObtained" : "battle:pokemonCaught", { pokemonName: pokemon.getNameToRender() }), null, doPokemonCatchMenu, 0, true);
+      globalScene.ui.showText(
+        i18next.t(isObtain ? "battle:pokemonObtained" : "battle:pokemonCaught", {
+          pokemonName: pokemon.getNameToRender(),
+        }),
+        null,
+        doPokemonCatchMenu,
+        0,
+        true,
+      );
     } else {
       doPokemonCatchMenu();
     }
@@ -671,7 +826,7 @@ function removePb(pokeball: Phaser.GameObjects.Sprite) {
       alpha: 0,
       onComplete: () => {
         pokeball.destroy();
-      }
+      },
     });
   }
 }
@@ -696,11 +851,17 @@ export async function doPokemonFlee(pokemon: EnemyPokemon): Promise<void> {
       onComplete: () => {
         pokemon.setVisible(false);
         pokemon.leaveField(true, true, true);
-        showEncounterText(i18next.t("battle:pokemonFled", { pokemonName: pokemon.getNameToRender() }), null, 600, false)
-          .then(() => {
-            resolve();
-          });
-      }
+        showEncounterText(
+          i18next.t("battle:pokemonFled", {
+            pokemonName: pokemon.getNameToRender(),
+          }),
+          null,
+          600,
+          false,
+        ).then(() => {
+          resolve();
+        });
+      },
     });
   });
 }
@@ -724,11 +885,17 @@ export function doPlayerFlee(pokemon: EnemyPokemon): Promise<void> {
       onComplete: () => {
         pokemon.setVisible(false);
         pokemon.leaveField(true, true, true);
-        showEncounterText(i18next.t("battle:playerFled", { pokemonName: pokemon.getNameToRender() }), null, 600, false)
-          .then(() => {
-            resolve();
-          });
-      }
+        showEncounterText(
+          i18next.t("battle:playerFled", {
+            pokemonName: pokemon.getNameToRender(),
+          }),
+          null,
+          600,
+          false,
+        ).then(() => {
+          resolve();
+        });
+      },
     });
   });
 }
@@ -737,33 +904,33 @@ export function doPlayerFlee(pokemon: EnemyPokemon): Promise<void> {
  * Bug Species and their corresponding weights
  */
 const GOLDEN_BUG_NET_SPECIES_POOL: [Species, number][] = [
-  [ Species.SCYTHER, 40 ],
-  [ Species.SCIZOR, 40 ],
-  [ Species.KLEAVOR, 40 ],
-  [ Species.PINSIR, 40 ],
-  [ Species.HERACROSS, 40 ],
-  [ Species.YANMA, 40 ],
-  [ Species.YANMEGA, 40 ],
-  [ Species.SHUCKLE, 40 ],
-  [ Species.ANORITH, 40 ],
-  [ Species.ARMALDO, 40 ],
-  [ Species.ESCAVALIER, 40 ],
-  [ Species.ACCELGOR, 40 ],
-  [ Species.JOLTIK, 40 ],
-  [ Species.GALVANTULA, 40 ],
-  [ Species.DURANT, 40 ],
-  [ Species.LARVESTA, 40 ],
-  [ Species.VOLCARONA, 40 ],
-  [ Species.DEWPIDER, 40 ],
-  [ Species.ARAQUANID, 40 ],
-  [ Species.WIMPOD, 40 ],
-  [ Species.GOLISOPOD, 40 ],
-  [ Species.SIZZLIPEDE, 40 ],
-  [ Species.CENTISKORCH, 40 ],
-  [ Species.NYMBLE, 40 ],
-  [ Species.LOKIX, 40 ],
-  [ Species.BUZZWOLE, 1 ],
-  [ Species.PHEROMOSA, 1 ],
+  [Species.SCYTHER, 40],
+  [Species.SCIZOR, 40],
+  [Species.KLEAVOR, 40],
+  [Species.PINSIR, 40],
+  [Species.HERACROSS, 40],
+  [Species.YANMA, 40],
+  [Species.YANMEGA, 40],
+  [Species.SHUCKLE, 40],
+  [Species.ANORITH, 40],
+  [Species.ARMALDO, 40],
+  [Species.ESCAVALIER, 40],
+  [Species.ACCELGOR, 40],
+  [Species.JOLTIK, 40],
+  [Species.GALVANTULA, 40],
+  [Species.DURANT, 40],
+  [Species.LARVESTA, 40],
+  [Species.VOLCARONA, 40],
+  [Species.DEWPIDER, 40],
+  [Species.ARAQUANID, 40],
+  [Species.WIMPOD, 40],
+  [Species.GOLISOPOD, 40],
+  [Species.SIZZLIPEDE, 40],
+  [Species.CENTISKORCH, 40],
+  [Species.NYMBLE, 40],
+  [Species.LOKIX, 40],
+  [Species.BUZZWOLE, 1],
+  [Species.PHEROMOSA, 1],
 ];
 
 /**
@@ -792,7 +959,7 @@ export function getGoldenBugNetSpecies(level: number): PokemonSpecies {
  * @param scene
  * @param levelAdditiveModifier Default 0. will add +(1 level / 10 waves * levelAdditiveModifier) to the level calculation
  */
-export function getEncounterPokemonLevelForWave(levelAdditiveModifier: number = 0) {
+export function getEncounterPokemonLevelForWave(levelAdditiveModifier = 0) {
   const currentBattle = globalScene.currentBattle;
   const baseLevel = currentBattle.getLevelForWave();
 
@@ -803,7 +970,10 @@ export function getEncounterPokemonLevelForWave(levelAdditiveModifier: number =
 export async function addPokemonDataToDexAndValidateAchievements(pokemon: PlayerPokemon) {
   const speciesForm = !pokemon.fusionSpecies ? pokemon.getSpeciesForm() : pokemon.getFusionSpeciesForm();
 
-  if (speciesForm.abilityHidden && (pokemon.fusionSpecies ? pokemon.fusionAbilityIndex : pokemon.abilityIndex) === speciesForm.getAbilityCount() - 1) {
+  if (
+    speciesForm.abilityHidden &&
+    (pokemon.fusionSpecies ? pokemon.fusionAbilityIndex : pokemon.abilityIndex) === speciesForm.getAbilityCount() - 1
+  ) {
     globalScene.validateAchv(achvs.HIDDEN_ABILITY);
   }
 
@@ -832,9 +1002,16 @@ export async function addPokemonDataToDexAndValidateAchievements(pokemon: Player
  * @param scene
  * @param invalidSelectionKey
  */
-export function isPokemonValidForEncounterOptionSelection(pokemon: Pokemon, invalidSelectionKey: string): string | null {
+export function isPokemonValidForEncounterOptionSelection(
+  pokemon: Pokemon,
+  invalidSelectionKey: string,
+): string | null {
   if (!pokemon.isAllowedInChallenge()) {
-    return i18next.t("partyUiHandler:cantBeUsed", { pokemonName: pokemon.getNameToRender() }) ?? null;
+    return (
+      i18next.t("partyUiHandler:cantBeUsed", {
+        pokemonName: pokemon.getNameToRender(),
+      }) ?? null
+    );
   }
   if (!pokemon.isAllowedInBattle()) {
     return getEncounterText(invalidSelectionKey) ?? null;
@@ -854,9 +1031,6 @@ export function applyAbilityOverrideToPokemon(pokemon: Pokemon, ability: Abiliti
     }
     pokemon.fusionCustomPokemonData.ability = ability;
   } else {
-    if (!pokemon.customPokemonData) {
-      pokemon.customPokemonData = new CustomPokemonData();
-    }
     pokemon.customPokemonData.ability = ability;
   }
 }
diff --git a/src/data/mystery-encounters/utils/encounter-transformation-sequence.ts b/src/data/mystery-encounters/utils/encounter-transformation-sequence.ts
index d4ae3496b0c..ebef47eac2d 100644
--- a/src/data/mystery-encounters/utils/encounter-transformation-sequence.ts
+++ b/src/data/mystery-encounters/utils/encounter-transformation-sequence.ts
@@ -1,5 +1,5 @@
 import type { PlayerPokemon } from "#app/field/pokemon";
-import { getFrameMs } from "#app/utils";
+import { getFrameMs } from "#app/utils/common";
 import { cos, sin } from "#app/field/anims";
 import { getTypeRgb } from "#app/data/type";
 import { globalScene } from "#app/global-scene";
@@ -7,7 +7,7 @@ import { globalScene } from "#app/global-scene";
 export enum TransformationScreenPosition {
   CENTER,
   LEFT,
-  RIGHT
+  RIGHT,
 }
 
 /**
@@ -17,7 +17,11 @@ export enum TransformationScreenPosition {
  * @param transformPokemon
  * @param screenPosition
  */
-export function doPokemonTransformationSequence(previousPokemon: PlayerPokemon, transformPokemon: PlayerPokemon, screenPosition: TransformationScreenPosition) {
+export function doPokemonTransformationSequence(
+  previousPokemon: PlayerPokemon,
+  transformPokemon: PlayerPokemon,
+  screenPosition: TransformationScreenPosition,
+) {
   return new Promise<void>(resolve => {
     const transformationContainer = globalScene.fieldUI.getByName("Dream Background") as Phaser.GameObjects.Container;
     const transformationBaseBg = globalScene.add.image(0, 0, "default_bg");
@@ -30,14 +34,26 @@ export function doPokemonTransformationSequence(previousPokemon: PlayerPokemon,
     let pokemonEvoSprite: Phaser.GameObjects.Sprite;
     let pokemonEvoTintSprite: Phaser.GameObjects.Sprite;
 
-    const xOffset = screenPosition === TransformationScreenPosition.CENTER ? 0 :
-      screenPosition === TransformationScreenPosition.RIGHT ? 100 : -100;
+    const xOffset =
+      screenPosition === TransformationScreenPosition.CENTER
+        ? 0
+        : screenPosition === TransformationScreenPosition.RIGHT
+          ? 100
+          : -100;
     // Centered transformations occur at a lower y Position
     const yOffset = screenPosition !== TransformationScreenPosition.CENTER ? -15 : 0;
 
     const getPokemonSprite = () => {
-      const ret = globalScene.addPokemonSprite(previousPokemon, transformationBaseBg.displayWidth / 2 + xOffset, transformationBaseBg.displayHeight / 2 + yOffset, "pkmn__sub");
-      ret.setPipeline(globalScene.spritePipeline, { tone: [ 0.0, 0.0, 0.0, 0.0 ], ignoreTimeTint: true });
+      const ret = globalScene.addPokemonSprite(
+        previousPokemon,
+        transformationBaseBg.displayWidth / 2 + xOffset,
+        transformationBaseBg.displayHeight / 2 + yOffset,
+        "pkmn__sub",
+      );
+      ret.setPipeline(globalScene.spritePipeline, {
+        tone: [0.0, 0.0, 0.0, 0.0],
+        ignoreTimeTint: true,
+      });
       return ret;
     };
 
@@ -48,12 +64,12 @@ export function doPokemonTransformationSequence(previousPokemon: PlayerPokemon,
 
     pokemonSprite.setAlpha(0);
     pokemonTintSprite.setAlpha(0);
-    pokemonTintSprite.setTintFill(0xFFFFFF);
+    pokemonTintSprite.setTintFill(0xffffff);
     pokemonEvoSprite.setVisible(false);
     pokemonEvoTintSprite.setVisible(false);
-    pokemonEvoTintSprite.setTintFill(0xFFFFFF);
+    pokemonEvoTintSprite.setTintFill(0xffffff);
 
-    [ pokemonSprite, pokemonTintSprite, pokemonEvoSprite, pokemonEvoTintSprite ].map(sprite => {
+    [pokemonSprite, pokemonTintSprite, pokemonEvoSprite, pokemonEvoTintSprite].map(sprite => {
       const spriteKey = previousPokemon.getSpriteKey(true);
       try {
         sprite.play(spriteKey);
@@ -61,20 +77,25 @@ export function doPokemonTransformationSequence(previousPokemon: PlayerPokemon,
         console.error(`Failed to play animation for ${spriteKey}`, err);
       }
 
-      sprite.setPipeline(globalScene.spritePipeline, { tone: [ 0.0, 0.0, 0.0, 0.0 ], hasShadow: false, teraColor: getTypeRgb(previousPokemon.getTeraType()) });
+      sprite.setPipeline(globalScene.spritePipeline, {
+        tone: [0.0, 0.0, 0.0, 0.0],
+        hasShadow: false,
+        teraColor: getTypeRgb(previousPokemon.getTeraType()),
+        isTerastallized: previousPokemon.isTerastallized,
+      });
       sprite.setPipelineData("ignoreTimeTint", true);
       sprite.setPipelineData("spriteKey", previousPokemon.getSpriteKey());
       sprite.setPipelineData("shiny", previousPokemon.shiny);
       sprite.setPipelineData("variant", previousPokemon.variant);
-      [ "spriteColors", "fusionSpriteColors" ].map(k => {
-        if (previousPokemon.summonData?.speciesForm) {
+      ["spriteColors", "fusionSpriteColors"].map(k => {
+        if (previousPokemon.summonData.speciesForm) {
           k += "Base";
         }
         sprite.pipelineData[k] = previousPokemon.getSprite().pipelineData[k];
       });
     });
 
-    [ pokemonEvoSprite, pokemonEvoTintSprite ].map(sprite => {
+    [pokemonEvoSprite, pokemonEvoTintSprite].map(sprite => {
       const spriteKey = transformPokemon.getSpriteKey(true);
       try {
         sprite.play(spriteKey);
@@ -86,8 +107,8 @@ export function doPokemonTransformationSequence(previousPokemon: PlayerPokemon,
       sprite.setPipelineData("spriteKey", transformPokemon.getSpriteKey());
       sprite.setPipelineData("shiny", transformPokemon.shiny);
       sprite.setPipelineData("variant", transformPokemon.variant);
-      [ "spriteColors", "fusionSpriteColors" ].map(k => {
-        if (transformPokemon.summonData?.speciesForm) {
+      ["spriteColors", "fusionSpriteColors"].map(k => {
+        if (transformPokemon.summonData.speciesForm) {
           k += "Base";
         }
         sprite.pipelineData[k] = transformPokemon.getSprite().pipelineData[k];
@@ -139,18 +160,18 @@ export function doPokemonTransformationSequence(previousPokemon: PlayerPokemon,
                               previousPokemon.destroy();
                               transformPokemon.setVisible(false);
                               transformPokemon.setAlpha(1);
-                            }
+                            },
                           });
                         });
-                      }
+                      },
                     });
                   });
                 });
               });
             });
-          }
+          },
         });
-      }
+      },
     });
   });
 }
@@ -163,7 +184,12 @@ export function doPokemonTransformationSequence(previousPokemon: PlayerPokemon,
  * @param xOffset
  * @param yOffset
  */
-function doSpiralUpward(transformationBaseBg: Phaser.GameObjects.Image, transformationContainer: Phaser.GameObjects.Container, xOffset: number, yOffset: number) {
+function doSpiralUpward(
+  transformationBaseBg: Phaser.GameObjects.Image,
+  transformationContainer: Phaser.GameObjects.Container,
+  xOffset: number,
+  yOffset: number,
+) {
   let f = 0;
 
   globalScene.tweens.addCounter({
@@ -173,12 +199,18 @@ function doSpiralUpward(transformationBaseBg: Phaser.GameObjects.Image, transfor
       if (f < 64) {
         if (!(f & 7)) {
           for (let i = 0; i < 4; i++) {
-            doSpiralUpwardParticle((f & 120) * 2 + i * 64, transformationBaseBg, transformationContainer, xOffset, yOffset);
+            doSpiralUpwardParticle(
+              (f & 120) * 2 + i * 64,
+              transformationBaseBg,
+              transformationContainer,
+              xOffset,
+              yOffset,
+            );
           }
         }
         f++;
       }
-    }
+    },
   });
 }
 
@@ -190,7 +222,12 @@ function doSpiralUpward(transformationBaseBg: Phaser.GameObjects.Image, transfor
  * @param xOffset
  * @param yOffset
  */
-function doArcDownward(transformationBaseBg: Phaser.GameObjects.Image, transformationContainer: Phaser.GameObjects.Container, xOffset: number, yOffset: number) {
+function doArcDownward(
+  transformationBaseBg: Phaser.GameObjects.Image,
+  transformationContainer: Phaser.GameObjects.Container,
+  xOffset: number,
+  yOffset: number,
+) {
   let f = 0;
 
   globalScene.tweens.addCounter({
@@ -205,7 +242,7 @@ function doArcDownward(transformationBaseBg: Phaser.GameObjects.Image, transform
         }
         f++;
       }
-    }
+    },
   });
 }
 
@@ -217,7 +254,12 @@ function doArcDownward(transformationBaseBg: Phaser.GameObjects.Image, transform
  * @param pokemonTintSprite
  * @param pokemonEvoTintSprite
  */
-function doCycle(l: number, lastCycle: number, pokemonTintSprite: Phaser.GameObjects.Sprite, pokemonEvoTintSprite: Phaser.GameObjects.Sprite): Promise<boolean> {
+function doCycle(
+  l: number,
+  lastCycle: number,
+  pokemonTintSprite: Phaser.GameObjects.Sprite,
+  pokemonEvoTintSprite: Phaser.GameObjects.Sprite,
+): Promise<boolean> {
   return new Promise(resolve => {
     const isLastCycle = l === lastCycle;
     globalScene.tweens.add({
@@ -225,7 +267,7 @@ function doCycle(l: number, lastCycle: number, pokemonTintSprite: Phaser.GameObj
       scale: 0.25,
       ease: "Cubic.easeInOut",
       duration: 500 / l,
-      yoyo: !isLastCycle
+      yoyo: !isLastCycle,
     });
     globalScene.tweens.add({
       targets: pokemonEvoTintSprite,
@@ -240,7 +282,7 @@ function doCycle(l: number, lastCycle: number, pokemonTintSprite: Phaser.GameObj
           pokemonTintSprite.setVisible(false);
           resolve(true);
         }
-      }
+      },
     });
   });
 }
@@ -253,7 +295,12 @@ function doCycle(l: number, lastCycle: number, pokemonTintSprite: Phaser.GameObj
  * @param xOffset
  * @param yOffset
  */
-function doCircleInward(transformationBaseBg: Phaser.GameObjects.Image, transformationContainer: Phaser.GameObjects.Container, xOffset: number, yOffset: number) {
+function doCircleInward(
+  transformationBaseBg: Phaser.GameObjects.Image,
+  transformationContainer: Phaser.GameObjects.Container,
+  xOffset: number,
+  yOffset: number,
+) {
   let f = 0;
 
   globalScene.tweens.addCounter({
@@ -270,7 +317,7 @@ function doCircleInward(transformationBaseBg: Phaser.GameObjects.Image, transfor
         }
       }
       f++;
-    }
+    },
   });
 }
 
@@ -283,7 +330,13 @@ function doCircleInward(transformationBaseBg: Phaser.GameObjects.Image, transfor
  * @param xOffset
  * @param yOffset
  */
-function doSpiralUpwardParticle(trigIndex: number, transformationBaseBg: Phaser.GameObjects.Image, transformationContainer: Phaser.GameObjects.Container, xOffset: number, yOffset: number) {
+function doSpiralUpwardParticle(
+  trigIndex: number,
+  transformationBaseBg: Phaser.GameObjects.Image,
+  transformationContainer: Phaser.GameObjects.Container,
+  xOffset: number,
+  yOffset: number,
+) {
   const initialX = transformationBaseBg.displayWidth / 2 + xOffset;
   const particle = globalScene.add.image(initialX, 0, "evo_sparkle");
   transformationContainer.add(particle);
@@ -296,7 +349,7 @@ function doSpiralUpwardParticle(trigIndex: number, transformationBaseBg: Phaser.
     duration: getFrameMs(1),
     onRepeat: () => {
       updateParticle();
-    }
+    },
   });
 
   const updateParticle = () => {
@@ -304,7 +357,7 @@ function doSpiralUpwardParticle(trigIndex: number, transformationBaseBg: Phaser.
       particle.setPosition(initialX, 88 - (f * f) / 80 + yOffset);
       particle.y += sin(trigIndex, amp) / 4;
       particle.x += cos(trigIndex, amp);
-      particle.setScale(1 - (f / 80));
+      particle.setScale(1 - f / 80);
       trigIndex += 4;
       if (f & 1) {
         amp--;
@@ -328,7 +381,13 @@ function doSpiralUpwardParticle(trigIndex: number, transformationBaseBg: Phaser.
  * @param xOffset
  * @param yOffset
  */
-function doArcDownParticle(trigIndex: number, transformationBaseBg: Phaser.GameObjects.Image, transformationContainer: Phaser.GameObjects.Container, xOffset: number, yOffset: number) {
+function doArcDownParticle(
+  trigIndex: number,
+  transformationBaseBg: Phaser.GameObjects.Image,
+  transformationContainer: Phaser.GameObjects.Container,
+  xOffset: number,
+  yOffset: number,
+) {
   const initialX = transformationBaseBg.displayWidth / 2 + xOffset;
   const particle = globalScene.add.image(initialX, 0, "evo_sparkle");
   particle.setScale(0.5);
@@ -342,7 +401,7 @@ function doArcDownParticle(trigIndex: number, transformationBaseBg: Phaser.GameO
     duration: getFrameMs(1),
     onRepeat: () => {
       updateParticle();
-    }
+    },
   });
 
   const updateParticle = () => {
@@ -371,7 +430,14 @@ function doArcDownParticle(trigIndex: number, transformationBaseBg: Phaser.GameO
  * @param xOffset
  * @param yOffset
  */
-function doCircleInwardParticle(trigIndex: number, speed: number, transformationBaseBg: Phaser.GameObjects.Image, transformationContainer: Phaser.GameObjects.Container, xOffset: number, yOffset: number) {
+function doCircleInwardParticle(
+  trigIndex: number,
+  speed: number,
+  transformationBaseBg: Phaser.GameObjects.Image,
+  transformationContainer: Phaser.GameObjects.Container,
+  xOffset: number,
+  yOffset: number,
+) {
   const initialX = transformationBaseBg.displayWidth / 2 + xOffset;
   const initialY = transformationBaseBg.displayHeight / 2 + yOffset;
   const particle = globalScene.add.image(initialX, initialY, "evo_sparkle");
@@ -384,7 +450,7 @@ function doCircleInwardParticle(trigIndex: number, speed: number, transformation
     duration: getFrameMs(1),
     onRepeat: () => {
       updateParticle();
-    }
+    },
   });
 
   const updateParticle = () => {
diff --git a/src/data/nature.ts b/src/data/nature.ts
index b90047ce6f0..83b3ee7538d 100644
--- a/src/data/nature.ts
+++ b/src/data/nature.ts
@@ -1,15 +1,21 @@
-import * as Utils from "../utils";
+import { toReadableString } from "#app/utils/common";
 import { TextStyle, getBBCodeFrag } from "../ui/text";
 import { Nature } from "#enums/nature";
 import { UiTheme } from "#enums/ui-theme";
 import i18next from "i18next";
 import { Stat, EFFECTIVE_STATS, getShortenedStatKey } from "#enums/stat";
 
-export function getNatureName(nature: Nature, includeStatEffects: boolean = false, forStarterSelect: boolean = false, ignoreBBCode: boolean = false, uiTheme: UiTheme = UiTheme.DEFAULT): string {
-  let ret = Utils.toReadableString(Nature[nature]);
+export function getNatureName(
+  nature: Nature,
+  includeStatEffects = false,
+  forStarterSelect = false,
+  ignoreBBCode = false,
+  uiTheme: UiTheme = UiTheme.DEFAULT,
+): string {
+  let ret = toReadableString(Nature[nature]);
   //Translating nature
-  if (i18next.exists("nature:" + ret)) {
-    ret = i18next.t("nature:" + ret as any);
+  if (i18next.exists(`nature:${ret}`)) {
+    ret = i18next.t(`nature:${ret}` as any);
   }
   if (includeStatEffects) {
     let increasedStat: Stat | null = null;
@@ -23,7 +29,9 @@ export function getNatureName(nature: Nature, includeStatEffects: boolean = fals
       }
     }
     const textStyle = forStarterSelect ? TextStyle.SUMMARY_ALT : TextStyle.WINDOW;
-    const getTextFrag = !ignoreBBCode ? (text: string, style: TextStyle) => getBBCodeFrag(text, style, uiTheme) : (text: string, style: TextStyle) => text;
+    const getTextFrag = !ignoreBBCode
+      ? (text: string, style: TextStyle) => getBBCodeFrag(text, style, uiTheme)
+      : (text: string, _style: TextStyle) => text;
     if (increasedStat && decreasedStat) {
       ret = `${getTextFrag(`${ret}${!forStarterSelect ? "\n" : " "}(`, textStyle)}${getTextFrag(`+${i18next.t(getShortenedStatKey(increasedStat))}`, TextStyle.SUMMARY_PINK)}${getTextFrag("/", textStyle)}${getTextFrag(`-${i18next.t(getShortenedStatKey(decreasedStat))}`, TextStyle.SUMMARY_BLUE)}${getTextFrag(")", textStyle)}`;
     } else {
diff --git a/src/data/pokeball.ts b/src/data/pokeball.ts
index 7cd9f061cdd..7a44ebdda7c 100644
--- a/src/data/pokeball.ts
+++ b/src/data/pokeball.ts
@@ -1,6 +1,6 @@
 import { globalScene } from "#app/global-scene";
 import { CriticalCatchChanceBoosterModifier } from "#app/modifier/modifier";
-import { NumberHolder } from "#app/utils";
+import { NumberHolder } from "#app/utils/common";
 import { PokeballType } from "#enums/pokeball";
 import i18next from "i18next";
 
@@ -95,16 +95,31 @@ export function getCriticalCaptureChance(modifiedCatchRate: number): number {
   const dexCount = globalScene.gameData.getSpeciesCount(d => !!d.caughtAttr);
   const catchingCharmMultiplier = new NumberHolder(1);
   globalScene.findModifier(m => m instanceof CriticalCatchChanceBoosterModifier)?.apply(catchingCharmMultiplier);
-  const dexMultiplier = globalScene.gameMode.isDaily || dexCount > 800 ? 2.5
-    : dexCount > 600 ? 2
-      : dexCount > 400 ? 1.5
-        : dexCount > 200 ? 1
-          : dexCount > 100 ? 0.5
-            : 0;
-  return Math.floor(catchingCharmMultiplier.value * dexMultiplier * Math.min(255, modifiedCatchRate) / 6);
+  const dexMultiplier =
+    globalScene.gameMode.isDaily || dexCount > 800
+      ? 2.5
+      : dexCount > 600
+        ? 2
+        : dexCount > 400
+          ? 1.5
+          : dexCount > 200
+            ? 1
+            : dexCount > 100
+              ? 0.5
+              : 0;
+  return Math.floor((catchingCharmMultiplier.value * dexMultiplier * Math.min(255, modifiedCatchRate)) / 6);
 }
 
-export function doPokeballBounceAnim(pokeball: Phaser.GameObjects.Sprite, y1: number, y2: number, baseBounceDuration: number, callback: Function, isCritical: boolean = false) {
+// TODO: fix Function annotations
+export function doPokeballBounceAnim(
+  pokeball: Phaser.GameObjects.Sprite,
+  y1: number,
+  y2: number,
+  baseBounceDuration: number,
+  // biome-ignore lint/complexity/noBannedTypes: TODO
+  callback: Function,
+  isCritical = false,
+) {
   let bouncePower = 1;
   let bounceYOffset = y1;
   let bounceY = y2;
@@ -134,12 +149,12 @@ export function doPokeballBounceAnim(pokeball: Phaser.GameObjects.Sprite, y1: nu
             y: bounceY,
             duration: bouncePower * baseBounceDuration,
             ease: "Cubic.easeOut",
-            onComplete: () => doBounce()
+            onComplete: () => doBounce(),
           });
         } else if (callback) {
           callback();
         }
-      }
+      },
     });
   };
 
@@ -165,12 +180,12 @@ export function doPokeballBounceAnim(pokeball: Phaser.GameObjects.Sprite, y1: nu
                 x: x0,
                 duration: 60,
                 ease: "Linear",
-                onComplete: () => globalScene.time.delayedCall(500, doBounce)
+                onComplete: () => globalScene.time.delayedCall(500, doBounce),
               });
             }
-          }
+          },
         });
-      }
+      },
     });
   };
 
diff --git a/src/data/pokemon-forms.ts b/src/data/pokemon-forms.ts
index 0226aef79d1..f76462d2725 100644
--- a/src/data/pokemon-forms.ts
+++ b/src/data/pokemon-forms.ts
@@ -1,9 +1,9 @@
-import { PokemonFormChangeItemModifier, TerastallizeModifier } from "../modifier/modifier";
+import { PokemonFormChangeItemModifier } from "../modifier/modifier";
 import type Pokemon from "../field/pokemon";
 import { StatusEffect } from "#enums/status-effect";
-import { MoveCategory, allMoves } from "./move";
-import { Type } from "#enums/type";
-import type { Constructor, nil } from "#app/utils";
+import { allMoves } from "./moves/move";
+import { MoveCategory } from "#enums/MoveCategory";
+import type { Constructor, nil } from "#app/utils/common";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
@@ -113,7 +113,7 @@ export enum FormChangeItem {
   DRACO_PLATE,
   DREAD_PLATE,
   PIXIE_PLATE,
-  BLANK_PLATE,  // TODO: Find a potential use for this
+  BLANK_PLATE, // TODO: Find a potential use for this
   LEGEND_PLATE, // TODO: Find a potential use for this
   FIGHTING_MEMORY,
   FLYING_MEMORY,
@@ -132,7 +132,7 @@ export enum FormChangeItem {
   DRAGON_MEMORY,
   DARK_MEMORY,
   FAIRY_MEMORY,
-  NORMAL_MEMORY // TODO: Find a potential use for this
+  NORMAL_MEMORY, // TODO: Find a potential use for this
 }
 
 export type SpeciesFormChangeConditionPredicate = (p: Pokemon) => boolean;
@@ -146,7 +146,14 @@ export class SpeciesFormChange {
   public quiet: boolean;
   public readonly conditions: SpeciesFormChangeCondition[];
 
-  constructor(speciesId: Species, preFormKey: string, evoFormKey: string, trigger: SpeciesFormChangeTrigger, quiet: boolean = false, ...conditions: SpeciesFormChangeCondition[]) {
+  constructor(
+    speciesId: Species,
+    preFormKey: string,
+    evoFormKey: string,
+    trigger: SpeciesFormChangeTrigger,
+    quiet = false,
+    ...conditions: SpeciesFormChangeCondition[]
+  ) {
     this.speciesId = speciesId;
     this.preFormKey = preFormKey;
     this.formKey = evoFormKey;
@@ -212,9 +219,9 @@ export class SpeciesFormChangeCondition {
 }
 
 export abstract class SpeciesFormChangeTrigger {
-  public description: string = "";
+  public description = "";
 
-  canChange(pokemon: Pokemon): boolean {
+  canChange(_pokemon: Pokemon): boolean {
     return true;
   }
 
@@ -223,20 +230,22 @@ export abstract class SpeciesFormChangeTrigger {
   }
 }
 
-export class SpeciesFormChangeManualTrigger extends SpeciesFormChangeTrigger {
-}
+export class SpeciesFormChangeManualTrigger extends SpeciesFormChangeTrigger {}
 
 export class SpeciesFormChangeAbilityTrigger extends SpeciesFormChangeTrigger {
   public description: string = i18next.t("pokemonEvolutions:Forms.ability");
 }
 
 export class SpeciesFormChangeCompoundTrigger {
-  public description: string = "";
+  public description = "";
   public triggers: SpeciesFormChangeTrigger[];
 
   constructor(...triggers: SpeciesFormChangeTrigger[]) {
     this.triggers = triggers;
-    this.description = this.triggers.filter(trigger => trigger?.description?.length > 0).map(trigger => trigger.description).join(", ");
+    this.description = this.triggers
+      .filter(trigger => trigger?.description?.length > 0)
+      .map(trigger => trigger.description)
+      .join(", ");
   }
 
   canChange(pokemon: Pokemon): boolean {
@@ -258,17 +267,27 @@ export class SpeciesFormChangeItemTrigger extends SpeciesFormChangeTrigger {
   public item: FormChangeItem;
   public active: boolean;
 
-  constructor(item: FormChangeItem, active: boolean = true) {
+  constructor(item: FormChangeItem, active = true) {
     super();
     this.item = item;
     this.active = active;
-    this.description = this.active ?
-      i18next.t("pokemonEvolutions:Forms.item", { item: i18next.t(`modifierType:FormChangeItem.${FormChangeItem[this.item]}`) }) :
-      i18next.t("pokemonEvolutions:Forms.deactivateItem", { item: i18next.t(`modifierType:FormChangeItem.${FormChangeItem[this.item]}`) });
+    this.description = this.active
+      ? i18next.t("pokemonEvolutions:Forms.item", {
+          item: i18next.t(`modifierType:FormChangeItem.${FormChangeItem[this.item]}`),
+        })
+      : i18next.t("pokemonEvolutions:Forms.deactivateItem", {
+          item: i18next.t(`modifierType:FormChangeItem.${FormChangeItem[this.item]}`),
+        });
   }
 
   canChange(pokemon: Pokemon): boolean {
-    return !!globalScene.findModifier(m => m instanceof PokemonFormChangeItemModifier && m.pokemonId === pokemon.id && m.formChangeItem === this.item && m.active === this.active);
+    return !!globalScene.findModifier(
+      m =>
+        m instanceof PokemonFormChangeItemModifier &&
+        m.pokemonId === pokemon.id &&
+        m.formChangeItem === this.item &&
+        m.active === this.active,
+    );
   }
 }
 
@@ -281,7 +300,7 @@ export class SpeciesFormChangeTimeOfDayTrigger extends SpeciesFormChangeTrigger
     this.description = i18next.t("pokemonEvolutions:Forms.timeOfDay");
   }
 
-  canChange(pokemon: Pokemon): boolean {
+  canChange(_pokemon: Pokemon): boolean {
     return this.timesOfDay.indexOf(globalScene.arena.getTimeOfDay()) > -1;
   }
 }
@@ -289,10 +308,12 @@ export class SpeciesFormChangeTimeOfDayTrigger extends SpeciesFormChangeTrigger
 export class SpeciesFormChangeActiveTrigger extends SpeciesFormChangeTrigger {
   public active: boolean;
 
-  constructor(active: boolean = false) {
+  constructor(active = false) {
     super();
     this.active = active;
-    this.description = this.active ? i18next.t("pokemonEvolutions:Forms.enter") : i18next.t("pokemonEvolutions:Forms.leave");
+    this.description = this.active
+      ? i18next.t("pokemonEvolutions:Forms.enter")
+      : i18next.t("pokemonEvolutions:Forms.leave");
   }
 
   canChange(pokemon: Pokemon): boolean {
@@ -304,10 +325,10 @@ export class SpeciesFormChangeStatusEffectTrigger extends SpeciesFormChangeTrigg
   public statusEffects: StatusEffect[];
   public invert: boolean;
 
-  constructor(statusEffects: StatusEffect | StatusEffect[], invert: boolean = false) {
+  constructor(statusEffects: StatusEffect | StatusEffect[], invert = false) {
     super();
     if (!Array.isArray(statusEffects)) {
-      statusEffects = [ statusEffects ];
+      statusEffects = [statusEffects];
     }
     this.statusEffects = statusEffects;
     this.invert = invert;
@@ -315,7 +336,7 @@ export class SpeciesFormChangeStatusEffectTrigger extends SpeciesFormChangeTrigg
   }
 
   canChange(pokemon: Pokemon): boolean {
-    return (this.statusEffects.indexOf(pokemon.status?.effect || StatusEffect.NONE) > -1) !== this.invert;
+    return this.statusEffects.indexOf(pokemon.status?.effect || StatusEffect.NONE) > -1 !== this.invert;
   }
 }
 
@@ -323,17 +344,26 @@ export class SpeciesFormChangeMoveLearnedTrigger extends SpeciesFormChangeTrigge
   public move: Moves;
   public known: boolean;
 
-  constructor(move: Moves, known: boolean = true) {
+  constructor(move: Moves, known = true) {
     super();
     this.move = move;
     this.known = known;
-    const moveKey = Moves[this.move].split("_").filter(f => f).map((f, i) => i ? `${f[0]}${f.slice(1).toLowerCase()}` : f.toLowerCase()).join("") as unknown as string;
-    this.description = known ? i18next.t("pokemonEvolutions:Forms.moveLearned", { move: i18next.t(`move:${moveKey}.name`) }) :
-      i18next.t("pokemonEvolutions:Forms.moveForgotten", { move: i18next.t(`move:${moveKey}.name`) });
+    const moveKey = Moves[this.move]
+      .split("_")
+      .filter(f => f)
+      .map((f, i) => (i ? `${f[0]}${f.slice(1).toLowerCase()}` : f.toLowerCase()))
+      .join("") as unknown as string;
+    this.description = known
+      ? i18next.t("pokemonEvolutions:Forms.moveLearned", {
+          move: i18next.t(`move:${moveKey}.name`),
+        })
+      : i18next.t("pokemonEvolutions:Forms.moveForgotten", {
+          move: i18next.t(`move:${moveKey}.name`),
+        });
   }
 
   canChange(pokemon: Pokemon): boolean {
-    return (!!pokemon.moveset.filter(m => m?.moveId === this.move).length) === this.known;
+    return !!pokemon.moveset.filter(m => m.moveId === this.move).length === this.known;
   }
 }
 
@@ -341,7 +371,7 @@ export abstract class SpeciesFormChangeMoveTrigger extends SpeciesFormChangeTrig
   public movePredicate: (m: Moves) => boolean;
   public used: boolean;
 
-  constructor(move: Moves | ((m: Moves) => boolean), used: boolean = true) {
+  constructor(move: Moves | ((m: Moves) => boolean), used = true) {
     super();
     this.movePredicate = typeof move === "function" ? move : (m: Moves) => m === move;
     this.used = used;
@@ -361,7 +391,9 @@ export class SpeciesFormChangePostMoveTrigger extends SpeciesFormChangeMoveTrigg
   description = i18next.t("pokemonEvolutions:Forms.postMove");
 
   canChange(pokemon: Pokemon): boolean {
-    return pokemon.summonData && !!pokemon.getLastXMoves(1).filter(m => this.movePredicate(m.move)).length === this.used;
+    return (
+      pokemon.summonData && !!pokemon.getLastXMoves(1).filter(m => this.movePredicate(m.move)).length === this.used
+    );
   }
 }
 
@@ -369,13 +401,12 @@ export class MeloettaFormChangePostMoveTrigger extends SpeciesFormChangePostMove
   override canChange(pokemon: Pokemon): boolean {
     if (globalScene.gameMode.hasChallenge(Challenges.SINGLE_TYPE)) {
       return false;
-    } else {
-      // Meloetta will not transform if it has the ability Sheer Force when using Relic Song
-      if (pokemon.hasAbility(Abilities.SHEER_FORCE)) {
-        return false;
-      }
-      return super.canChange(pokemon);
     }
+    // Meloetta will not transform if it has the ability Sheer Force when using Relic Song
+    if (pokemon.hasAbility(Abilities.SHEER_FORCE)) {
+      return false;
+    }
+    return super.canChange(pokemon);
   }
 }
 
@@ -389,7 +420,11 @@ export class SpeciesDefaultFormMatchTrigger extends SpeciesFormChangeTrigger {
   }
 
   canChange(pokemon: Pokemon): boolean {
-    return this.formKey === pokemon.species.forms[globalScene.getSpeciesFormIndex(pokemon.species, pokemon.gender, pokemon.getNature(), true)].formKey;
+    return (
+      this.formKey ===
+      pokemon.species.forms[globalScene.getSpeciesFormIndex(pokemon.species, pokemon.gender, pokemon.getNature(), true)]
+        .formKey
+    );
   }
 }
 
@@ -399,23 +434,7 @@ export class SpeciesDefaultFormMatchTrigger extends SpeciesFormChangeTrigger {
  * @extends SpeciesFormChangeTrigger
  */
 export class SpeciesFormChangeTeraTrigger extends SpeciesFormChangeTrigger {
-  /** The Tera type that triggers the form change */
-  private teraType: Type;
-
-  constructor(teraType: Type) {
-    super();
-    this.teraType = teraType;
-    this.description = i18next.t("pokemonEvolutions:Forms.tera", { teraType: i18next.t(`pokemonInfo:Type.${Type[this.teraType]}`) });
-  }
-
-  /**
-   * Checks if the associated Pokémon has the required Tera Shard that matches with the associated Tera type.
-   * @param {Pokemon} pokemon the Pokémon that is trying to do the form change
-   * @returns `true` if the Pokémon can change forms, `false` otherwise
-   */
-  canChange(pokemon: Pokemon): boolean {
-    return !!globalScene.findModifier(m => m instanceof TerastallizeModifier && m.pokemonId === pokemon.id && m.teraType === this.teraType);
-  }
+  description = i18next.t("pokemonEvolutions:Forms.tera");
 }
 
 /**
@@ -425,10 +444,6 @@ export class SpeciesFormChangeTeraTrigger extends SpeciesFormChangeTrigger {
  */
 export class SpeciesFormChangeLapseTeraTrigger extends SpeciesFormChangeTrigger {
   description = i18next.t("pokemonEvolutions:Forms.teraLapse");
-
-  canChange(pokemon: Pokemon): boolean {
-    return !!globalScene.findModifier(m => m instanceof TerastallizeModifier && m.pokemonId === pokemon.id);
-  }
 }
 
 /**
@@ -460,7 +475,12 @@ export class SpeciesFormChangeWeatherTrigger extends SpeciesFormChangeTrigger {
     const isWeatherSuppressed = globalScene.arena.weather?.isEffectSuppressed();
     const isAbilitySuppressed = pokemon.summonData.abilitySuppressed;
 
-    return !isAbilitySuppressed && !isWeatherSuppressed && (pokemon.hasAbility(this.ability) && this.weathers.includes(currentWeather));
+    return (
+      !isAbilitySuppressed &&
+      !isWeatherSuppressed &&
+      pokemon.hasAbility(this.ability) &&
+      this.weathers.includes(currentWeather)
+    );
   }
 }
 
@@ -511,16 +531,27 @@ export function getSpeciesFormChangeMessage(pokemon: Pokemon, formChange: Specie
   const isEmax = formChange.formKey.indexOf(SpeciesFormKey.ETERNAMAX) > -1;
   const isRevert = !isMega && formChange.formKey === pokemon.species.forms[0].formKey;
   if (isMega) {
-    return i18next.t("battlePokemonForm:megaChange", { preName, pokemonName: pokemon.name });
+    return i18next.t("battlePokemonForm:megaChange", {
+      preName,
+      pokemonName: pokemon.name,
+    });
   }
   if (isGmax) {
-    return i18next.t("battlePokemonForm:gigantamaxChange", { preName, pokemonName: pokemon.name });
+    return i18next.t("battlePokemonForm:gigantamaxChange", {
+      preName,
+      pokemonName: pokemon.name,
+    });
   }
   if (isEmax) {
-    return i18next.t("battlePokemonForm:eternamaxChange", { preName, pokemonName: pokemon.name });
+    return i18next.t("battlePokemonForm:eternamaxChange", {
+      preName,
+      pokemonName: pokemon.name,
+    });
   }
   if (isRevert) {
-    return i18next.t("battlePokemonForm:revertChange", { pokemonName: getPokemonNameWithAffix(pokemon) });
+    return i18next.t("battlePokemonForm:revertChange", {
+      pokemonName: getPokemonNameWithAffix(pokemon),
+    });
   }
   if (pokemon.getAbility().id === Abilities.DISGUISE) {
     return i18next.t("battlePokemonForm:disguiseChange");
@@ -535,13 +566,14 @@ export function getSpeciesFormChangeMessage(pokemon: Pokemon, formChange: Specie
  * @returns A {@linkcode SpeciesFormChangeCondition} checking if that species is registered as caught
  */
 function getSpeciesDependentFormChangeCondition(species: Species): SpeciesFormChangeCondition {
-  return new SpeciesFormChangeCondition(p => !!globalScene.gameData.dexData[species].caughtAttr);
+  return new SpeciesFormChangeCondition(_p => !!globalScene.gameData.dexData[species].caughtAttr);
 }
 
 interface PokemonFormChanges {
-  [key: string]: SpeciesFormChange[]
+  [key: string]: SpeciesFormChange[];
 }
 
+// biome-ignore format: manually formatted
 export const pokemonFormChanges: PokemonFormChanges = {
   [Species.VENUSAUR]: [
     new SpeciesFormChange(Species.VENUSAUR, "", SpeciesFormKey.MEGA, new SpeciesFormChangeItemTrigger(FormChangeItem.VENUSAURITE)),
@@ -992,19 +1024,19 @@ export const pokemonFormChanges: PokemonFormChanges = {
     new SpeciesFormChange(Species.OGERPON, "teal-mask", "wellspring-mask", new SpeciesFormChangeItemTrigger(FormChangeItem.WELLSPRING_MASK)),
     new SpeciesFormChange(Species.OGERPON, "teal-mask", "hearthflame-mask", new SpeciesFormChangeItemTrigger(FormChangeItem.HEARTHFLAME_MASK)),
     new SpeciesFormChange(Species.OGERPON, "teal-mask", "cornerstone-mask", new SpeciesFormChangeItemTrigger(FormChangeItem.CORNERSTONE_MASK)),
-    new SpeciesFormChange(Species.OGERPON, "teal-mask", "teal-mask-tera", new SpeciesFormChangeTeraTrigger(Type.GRASS)),
-    new SpeciesFormChange(Species.OGERPON, "teal-mask-tera", "teal-mask", new SpeciesFormChangeLapseTeraTrigger(), true, new SpeciesFormChangeCondition(p => p.getTeraType() !== Type.GRASS)),
-    new SpeciesFormChange(Species.OGERPON, "wellspring-mask", "wellspring-mask-tera", new SpeciesFormChangeTeraTrigger(Type.WATER)),
-    new SpeciesFormChange(Species.OGERPON, "wellspring-mask-tera", "wellspring-mask", new SpeciesFormChangeLapseTeraTrigger(), true, new SpeciesFormChangeCondition(p => p.getTeraType() !== Type.WATER)),
-    new SpeciesFormChange(Species.OGERPON, "hearthflame-mask", "hearthflame-mask-tera", new SpeciesFormChangeTeraTrigger(Type.FIRE)),
-    new SpeciesFormChange(Species.OGERPON, "hearthflame-mask-tera", "hearthflame-mask", new SpeciesFormChangeLapseTeraTrigger(), true, new SpeciesFormChangeCondition(p => p.getTeraType() !== Type.FIRE)),
-    new SpeciesFormChange(Species.OGERPON, "cornerstone-mask", "cornerstone-mask-tera", new SpeciesFormChangeTeraTrigger(Type.ROCK)),
-    new SpeciesFormChange(Species.OGERPON, "cornerstone-mask-tera", "cornerstone-mask", new SpeciesFormChangeLapseTeraTrigger(), true, new SpeciesFormChangeCondition(p => p.getTeraType() !== Type.ROCK))
+    new SpeciesFormChange(Species.OGERPON, "teal-mask", "teal-mask-tera", new SpeciesFormChangeTeraTrigger(), true),
+    new SpeciesFormChange(Species.OGERPON, "teal-mask-tera", "teal-mask", new SpeciesFormChangeLapseTeraTrigger(), true),
+    new SpeciesFormChange(Species.OGERPON, "wellspring-mask", "wellspring-mask-tera", new SpeciesFormChangeTeraTrigger(), true),
+    new SpeciesFormChange(Species.OGERPON, "wellspring-mask-tera", "wellspring-mask", new SpeciesFormChangeLapseTeraTrigger(), true),
+    new SpeciesFormChange(Species.OGERPON, "hearthflame-mask", "hearthflame-mask-tera", new SpeciesFormChangeTeraTrigger(), true),
+    new SpeciesFormChange(Species.OGERPON, "hearthflame-mask-tera", "hearthflame-mask", new SpeciesFormChangeLapseTeraTrigger(), true),
+    new SpeciesFormChange(Species.OGERPON, "cornerstone-mask", "cornerstone-mask-tera", new SpeciesFormChangeTeraTrigger(), true),
+    new SpeciesFormChange(Species.OGERPON, "cornerstone-mask-tera", "cornerstone-mask", new SpeciesFormChangeLapseTeraTrigger(), true)
   ],
   [Species.TERAPAGOS]: [
     new SpeciesFormChange(Species.TERAPAGOS, "", "terastal", new SpeciesFormChangeAbilityTrigger(), true),
-    new SpeciesFormChange(Species.TERAPAGOS, "terastal", "stellar", new SpeciesFormChangeTeraTrigger(Type.STELLAR)),
-    new SpeciesFormChange(Species.TERAPAGOS, "stellar", "terastal", new SpeciesFormChangeLapseTeraTrigger(), true, new SpeciesFormChangeCondition(p => p.getTeraType() !== Type.STELLAR))
+    new SpeciesFormChange(Species.TERAPAGOS, "terastal", "stellar", new SpeciesFormChangeTeraTrigger(), true),
+    new SpeciesFormChange(Species.TERAPAGOS, "stellar", "terastal", new SpeciesFormChangeLapseTeraTrigger(), true)
   ],
   [Species.GALAR_DARMANITAN]: [
     new SpeciesFormChange(Species.GALAR_DARMANITAN, "", "zen", new SpeciesFormChangeAbilityTrigger(), true),
@@ -1014,16 +1046,22 @@ export const pokemonFormChanges: PokemonFormChanges = {
 
 export function initPokemonForms() {
   const formChangeKeys = Object.keys(pokemonFormChanges);
-  formChangeKeys.forEach(pk => {
+  for (const pk of formChangeKeys) {
     const formChanges = pokemonFormChanges[pk];
     const newFormChanges: SpeciesFormChange[] = [];
     for (const fc of formChanges) {
       const itemTrigger = fc.findTrigger(SpeciesFormChangeItemTrigger) as SpeciesFormChangeItemTrigger;
       if (itemTrigger && !formChanges.find(c => fc.formKey === c.preFormKey && fc.preFormKey === c.formKey)) {
-        newFormChanges.push(new SpeciesFormChange(fc.speciesId, fc.formKey, fc.preFormKey, new SpeciesFormChangeItemTrigger(itemTrigger.item, false)));
+        newFormChanges.push(
+          new SpeciesFormChange(
+            fc.speciesId,
+            fc.formKey,
+            fc.preFormKey,
+            new SpeciesFormChangeItemTrigger(itemTrigger.item, false),
+          ),
+        );
       }
     }
     formChanges.push(...newFormChanges);
-  });
+  }
 }
-
diff --git a/src/data/pokemon-species.ts b/src/data/pokemon-species.ts
index 55da6a7e76c..59167ba47f6 100644
--- a/src/data/pokemon-species.ts
+++ b/src/data/pokemon-species.ts
@@ -7,40 +7,79 @@ import i18next from "i18next";
 import type { AnySound } from "#app/battle-scene";
 import { globalScene } from "#app/global-scene";
 import type { GameMode } from "#app/game-mode";
-import type { StarterMoveset } from "#app/system/game-data";
-import * as Utils from "#app/utils";
+import { DexAttr, type StarterMoveset } from "#app/system/game-data";
+import { isNullOrUndefined, capitalizeString, randSeedInt, randSeedGauss, randSeedItem } from "#app/utils/common";
 import { uncatchableSpecies } from "#app/data/balance/biomes";
 import { speciesEggMoves } from "#app/data/balance/egg-moves";
 import { GrowthRate } from "#app/data/exp";
 import type { EvolutionLevel } from "#app/data/balance/pokemon-evolutions";
-import { SpeciesWildEvolutionDelay, pokemonEvolutions, pokemonPrevolutions } from "#app/data/balance/pokemon-evolutions";
-import { Type } from "#enums/type";
+import {
+  SpeciesWildEvolutionDelay,
+  pokemonEvolutions,
+  pokemonPrevolutions,
+} from "#app/data/balance/pokemon-evolutions";
+import { PokemonType } from "#enums/pokemon-type";
 import type { LevelMoves } from "#app/data/balance/pokemon-level-moves";
-import { pokemonFormLevelMoves, pokemonFormLevelMoves as pokemonSpeciesFormLevelMoves, pokemonSpeciesLevelMoves } from "#app/data/balance/pokemon-level-moves";
+import {
+  pokemonFormLevelMoves,
+  pokemonFormLevelMoves as pokemonSpeciesFormLevelMoves,
+  pokemonSpeciesLevelMoves,
+} from "#app/data/balance/pokemon-level-moves";
 import type { Stat } from "#enums/stat";
-import type { Variant, VariantSet } from "#app/data/variant";
-import { variantData } from "#app/data/variant";
+import type { Variant, VariantSet } from "#app/sprites/variant";
+import { populateVariantColorCache, variantColorCache, variantData } from "#app/sprites/variant";
 import { speciesStarterCosts, POKERUS_STARTER_COUNT } from "#app/data/balance/starters";
 import { SpeciesFormKey } from "#enums/species-form-key";
 import { starterPassiveAbilities } from "#app/data/balance/passives";
+import { loadPokemonVariantAssets } from "#app/sprites/pokemon-sprite";
+import { hasExpSprite } from "#app/sprites/sprite-utils";
+import { Gender } from "./gender";
 
 export enum Region {
   NORMAL,
   ALOLA,
   GALAR,
   HISUI,
-  PALDEA
+  PALDEA,
 }
 
+// TODO: this is horrible and will need to be removed once a refactor/cleanup of forms is executed.
+export const normalForm: Species[] = [
+  Species.PIKACHU,
+  Species.RAICHU,
+  Species.EEVEE,
+  Species.JOLTEON,
+  Species.FLAREON,
+  Species.VAPOREON,
+  Species.ESPEON,
+  Species.UMBREON,
+  Species.LEAFEON,
+  Species.GLACEON,
+  Species.SYLVEON,
+  Species.PICHU,
+  Species.ROTOM,
+  Species.DIALGA,
+  Species.PALKIA,
+  Species.KYUREM,
+  Species.GENESECT,
+  Species.FROAKIE,
+  Species.FROGADIER,
+  Species.GRENINJA,
+  Species.ROCKRUFF,
+  Species.NECROZMA,
+  Species.MAGEARNA,
+  Species.MARSHADOW,
+  Species.CRAMORANT,
+  Species.ZARUDE,
+  Species.CALYREX,
+];
+
 /**
  * Gets the {@linkcode PokemonSpecies} object associated with the {@linkcode Species} enum given
  * @param species The species to fetch
  * @returns The associated {@linkcode PokemonSpecies} object
  */
-export function getPokemonSpecies(species: Species | Species[] | undefined): PokemonSpecies {
-  if (!species) {
-    throw new Error("`species` must not be undefined in `getPokemonSpecies()`");
-  }
+export function getPokemonSpecies(species: Species | Species[]): PokemonSpecies {
   // If a special pool (named trainers) is used here it CAN happen that they have a array as species (which means choose one of those two). So we catch that with this code block
   if (Array.isArray(species)) {
     // Pick a random species from the list
@@ -53,9 +92,10 @@ export function getPokemonSpecies(species: Species | Species[] | undefined): Pok
 }
 
 export function getPokemonSpeciesForm(species: Species, formIndex: number): PokemonSpeciesForm {
-  const retSpecies: PokemonSpecies = species >= 2000
-    ? allSpecies.find(s => s.speciesId === species)! // TODO: is the bang correct?
-    : allSpecies[species - 1];
+  const retSpecies: PokemonSpecies =
+    species >= 2000
+      ? allSpecies.find(s => s.speciesId === species)! // TODO: is the bang correct?
+      : allSpecies[species - 1];
   if (formIndex < retSpecies.forms?.length) {
     return retSpecies.forms[formIndex];
   }
@@ -66,8 +106,8 @@ export function getFusedSpeciesName(speciesAName: string, speciesBName: string):
   const fragAPattern = /([a-z]{2}.*?[aeiou(?:y$)\-\']+)(.*?)$/i;
   const fragBPattern = /([a-z]{2}.*?[aeiou(?:y$)\-\'])(.*?)$/i;
 
-  const [ speciesAPrefixMatch, speciesBPrefixMatch ] = [ speciesAName, speciesBName ].map(n => /^(?:[^ ]+) /.exec(n));
-  const [ speciesAPrefix, speciesBPrefix ] = [ speciesAPrefixMatch, speciesBPrefixMatch ].map(m => m ? m[0] : "");
+  const [speciesAPrefixMatch, speciesBPrefixMatch] = [speciesAName, speciesBName].map(n => /^(?:[^ ]+) /.exec(n));
+  const [speciesAPrefix, speciesBPrefix] = [speciesAPrefixMatch, speciesBPrefixMatch].map(m => (m ? m[0] : ""));
 
   if (speciesAPrefix) {
     speciesAName = speciesAName.slice(speciesAPrefix.length);
@@ -76,8 +116,8 @@ export function getFusedSpeciesName(speciesAName: string, speciesBName: string):
     speciesBName = speciesBName.slice(speciesBPrefix.length);
   }
 
-  const [ speciesASuffixMatch, speciesBSuffixMatch ] = [ speciesAName, speciesBName ].map(n => / (?:[^ ]+)$/.exec(n));
-  const [ speciesASuffix, speciesBSuffix ] = [ speciesASuffixMatch, speciesBSuffixMatch ].map(m => m ? m[0] : "");
+  const [speciesASuffixMatch, speciesBSuffixMatch] = [speciesAName, speciesBName].map(n => / (?:[^ ]+)$/.exec(n));
+  const [speciesASuffix, speciesBSuffix] = [speciesASuffixMatch, speciesBSuffixMatch].map(m => (m ? m[0] : ""));
 
   if (speciesASuffix) {
     speciesAName = speciesAName.slice(0, -speciesASuffix.length);
@@ -95,9 +135,7 @@ export function getFusedSpeciesName(speciesAName: string, speciesBName: string):
   let fragA: string;
   let fragB: string;
 
-  fragA = splitNameA.length === 1
-    ? fragAMatch ? fragAMatch[1] : speciesAName
-    : splitNameA[splitNameA.length - 1];
+  fragA = splitNameA.length === 1 ? (fragAMatch ? fragAMatch[1] : speciesAName) : splitNameA[splitNameA.length - 1];
 
   if (splitNameB.length === 1) {
     if (fragBMatch) {
@@ -136,8 +174,8 @@ export abstract class PokemonSpeciesForm {
   public speciesId: Species;
   protected _formIndex: number;
   protected _generation: number;
-  readonly type1: Type;
-  readonly type2: Type | null;
+  readonly type1: PokemonType;
+  readonly type2: PokemonType | null;
   readonly height: number;
   readonly weight: number;
   readonly ability1: Abilities;
@@ -151,9 +189,26 @@ export abstract class PokemonSpeciesForm {
   readonly genderDiffs: boolean;
   readonly isStarterSelectable: boolean;
 
-  constructor(type1: Type, type2: Type | null, height: number, weight: number, ability1: Abilities, ability2: Abilities, abilityHidden: Abilities,
-    baseTotal: number, baseHp: number, baseAtk: number, baseDef: number, baseSpatk: number, baseSpdef: number, baseSpd: number,
-    catchRate: number, baseFriendship: number, baseExp: number, genderDiffs: boolean, isStarterSelectable: boolean
+  constructor(
+    type1: PokemonType,
+    type2: PokemonType | null,
+    height: number,
+    weight: number,
+    ability1: Abilities,
+    ability2: Abilities,
+    abilityHidden: Abilities,
+    baseTotal: number,
+    baseHp: number,
+    baseAtk: number,
+    baseDef: number,
+    baseSpatk: number,
+    baseSpdef: number,
+    baseSpd: number,
+    catchRate: number,
+    baseFriendship: number,
+    baseExp: number,
+    genderDiffs: boolean,
+    isStarterSelectable: boolean,
   ) {
     this.type1 = type1;
     this.type2 = type2;
@@ -163,7 +218,7 @@ export abstract class PokemonSpeciesForm {
     this.ability2 = ability2 === Abilities.NONE ? ability1 : ability2;
     this.abilityHidden = abilityHidden;
     this.baseTotal = baseTotal;
-    this.baseStats = [ baseHp, baseAtk, baseDef, baseSpatk, baseSpdef, baseSpd ];
+    this.baseStats = [baseHp, baseAtk, baseDef, baseSpatk, baseSpdef, baseSpd];
     this.catchRate = catchRate;
     this.baseFriendship = baseFriendship;
     this.baseExp = baseExp;
@@ -178,7 +233,7 @@ export abstract class PokemonSpeciesForm {
    * @param forStarter boolean to get the nonbaby form of a starter
    * @returns The species
    */
-  getRootSpeciesId(forStarter: boolean = false): Species {
+  getRootSpeciesId(forStarter = false): Species {
     let ret = this.speciesId;
     while (pokemonPrevolutions.hasOwnProperty(ret) && (!forStarter || !speciesStarterCosts.hasOwnProperty(ret))) {
       ret = pokemonPrevolutions[ret];
@@ -237,27 +292,33 @@ export abstract class PokemonSpeciesForm {
    * @returns The id of the ability
    */
   getPassiveAbility(formIndex?: number): Abilities {
-    if (Utils.isNullOrUndefined(formIndex)) {
+    if (isNullOrUndefined(formIndex)) {
       formIndex = this.formIndex;
     }
     let starterSpeciesId = this.speciesId;
-    while (!(starterSpeciesId in starterPassiveAbilities) || !(formIndex in starterPassiveAbilities[starterSpeciesId])) {
+    while (
+      !(starterSpeciesId in starterPassiveAbilities) ||
+      !(formIndex in starterPassiveAbilities[starterSpeciesId])
+    ) {
       if (pokemonPrevolutions.hasOwnProperty(starterSpeciesId)) {
         starterSpeciesId = pokemonPrevolutions[starterSpeciesId];
-      } else { // If we've reached the base species and still haven't found a matching ability, use form 0 if possible
+      } else {
+        // If we've reached the base species and still haven't found a matching ability, use form 0 if possible
         if (0 in starterPassiveAbilities[starterSpeciesId]) {
           return starterPassiveAbilities[starterSpeciesId][0];
-        } else {
-          console.log("No passive ability found for %s, using run away", this.speciesId);
-          return Abilities.RUN_AWAY;
         }
+        console.log("No passive ability found for %s, using run away", this.speciesId);
+        return Abilities.RUN_AWAY;
       }
     }
     return starterPassiveAbilities[starterSpeciesId][formIndex];
   }
 
   getLevelMoves(): LevelMoves {
-    if (pokemonSpeciesFormLevelMoves.hasOwnProperty(this.speciesId) && pokemonSpeciesFormLevelMoves[this.speciesId].hasOwnProperty(this.formIndex)) {
+    if (
+      pokemonSpeciesFormLevelMoves.hasOwnProperty(this.speciesId) &&
+      pokemonSpeciesFormLevelMoves[this.speciesId].hasOwnProperty(this.formIndex)
+    ) {
       return pokemonSpeciesFormLevelMoves[this.speciesId][this.formIndex].slice(0);
     }
     return pokemonSpeciesLevelMoves[this.speciesId].slice(0);
@@ -268,7 +329,7 @@ export abstract class PokemonSpeciesForm {
   }
 
   isObtainable(): boolean {
-    return (this.generation <= 9 || pokemonPrevolutions.hasOwnProperty(this.speciesId));
+    return this.generation <= 9 || pokemonPrevolutions.hasOwnProperty(this.speciesId);
   }
 
   isCatchable(): boolean {
@@ -280,7 +341,7 @@ export abstract class PokemonSpeciesForm {
   }
 
   isTrainerForbidden(): boolean {
-    return [ Species.ETERNAL_FLOETTE, Species.BLOODMOON_URSALUNA ].includes(this.speciesId);
+    return [Species.ETERNAL_FLOETTE, Species.BLOODMOON_URSALUNA].includes(this.speciesId);
   }
 
   isRareRegional(): boolean {
@@ -329,18 +390,26 @@ export abstract class PokemonSpeciesForm {
     return `${/_[1-3]$/.test(spriteId) ? "variant/" : ""}${spriteId}`;
   }
 
-  getSpriteId(female: boolean, formIndex?: number, shiny?: boolean, variant: number = 0, back?: boolean): string {
+  getBaseSpriteKey(female: boolean, formIndex?: number): string {
     if (formIndex === undefined || this instanceof PokemonForm) {
       formIndex = this.formIndex;
     }
 
     const formSpriteKey = this.getFormSpriteKey(formIndex);
-    const showGenderDiffs = this.genderDiffs && female && ![ SpeciesFormKey.MEGA, SpeciesFormKey.GIGANTAMAX ].find(k => formSpriteKey === k);
+    const showGenderDiffs =
+      this.genderDiffs &&
+      female &&
+      ![SpeciesFormKey.MEGA, SpeciesFormKey.GIGANTAMAX].includes(formSpriteKey as SpeciesFormKey);
 
-    const baseSpriteKey = `${showGenderDiffs ? "female__" : ""}${this.speciesId}${formSpriteKey ? `-${formSpriteKey}` : ""}`;
+    return `${showGenderDiffs ? "female__" : ""}${this.speciesId}${formSpriteKey ? `-${formSpriteKey}` : ""}`;
+  }
+
+  /** Compute the sprite ID of the pokemon form. */
+  getSpriteId(female: boolean, formIndex?: number, shiny?: boolean, variant = 0, back = false): string {
+    const baseSpriteKey = this.getBaseSpriteKey(female, formIndex);
 
     let config = variantData;
-    `${back ? "back__" : ""}${baseSpriteKey}`.split("__").map(p => config ? config = config[p] : null);
+    `${back ? "back__" : ""}${baseSpriteKey}`.split("__").map(p => (config ? (config = config[p]) : null));
     const variantSet = config as VariantSet;
 
     return `${back ? "back__" : ""}${shiny && (!variantSet || (!variant && !variantSet[variant || 0])) ? "shiny__" : ""}${baseSpriteKey}${shiny && variantSet && variantSet[variant] === 2 ? `_${variant + 1}` : ""}`;
@@ -352,7 +421,6 @@ export abstract class PokemonSpeciesForm {
 
   abstract getFormSpriteKey(formIndex?: number): string;
 
-
   /**
    * Variant Data key/index is either species id or species id followed by -formkey
    * @param formIndex optional form index for pokemon with different forms
@@ -373,7 +441,8 @@ export abstract class PokemonSpeciesForm {
 
   getIconAtlasKey(formIndex?: number, shiny?: boolean, variant?: number): string {
     const variantDataIndex = this.getVariantDataIndex(formIndex);
-    const isVariant = shiny && variantData[variantDataIndex] && (variant !== undefined && variantData[variantDataIndex][variant]);
+    const isVariant =
+      shiny && variantData[variantDataIndex] && variant !== undefined && variantData[variantDataIndex][variant];
     return `pokemon_icons_${this.generation}${isVariant ? "v" : ""}`;
   }
 
@@ -386,7 +455,8 @@ export abstract class PokemonSpeciesForm {
 
     let ret = this.speciesId.toString();
 
-    const isVariant = shiny && variantData[variantDataIndex] && (variant !== undefined && variantData[variantDataIndex][variant]);
+    const isVariant =
+      shiny && variantData[variantDataIndex] && variant !== undefined && variantData[variantDataIndex][variant];
 
     if (shiny && !isVariant) {
       ret += "s";
@@ -416,6 +486,7 @@ export abstract class PokemonSpeciesForm {
           break;
         case Species.ZACIAN:
         case Species.ZAMAZENTA:
+          // biome-ignore lint/suspicious/noFallthroughSwitchClause: Falls through
           if (formSpriteKey.startsWith("behemoth")) {
             formSpriteKey = "crowned";
           }
@@ -451,7 +522,9 @@ export abstract class PokemonSpeciesForm {
     const forms = getPokemonSpecies(speciesId).forms;
     if (forms.length) {
       if (formIndex !== undefined && formIndex >= forms.length) {
-        console.warn(`Attempted accessing form with index ${formIndex} of species ${getPokemonSpecies(speciesId).getName()} with only ${forms.length || 0} forms`);
+        console.warn(
+          `Attempted accessing form with index ${formIndex} of species ${getPokemonSpecies(speciesId).getName()} with only ${forms.length || 0} forms`,
+        );
         formIndex = Math.min(formIndex, forms.length - 1);
       }
       const formKey = forms[formIndex || 0].formKey;
@@ -504,11 +577,14 @@ export abstract class PokemonSpeciesForm {
     for (const moveId of moveset) {
       if (speciesEggMoves.hasOwnProperty(rootSpeciesId)) {
         const eggMoveIndex = speciesEggMoves[rootSpeciesId].findIndex(m => m === moveId);
-        if (eggMoveIndex > -1 && (eggMoves & (1 << eggMoveIndex))) {
+        if (eggMoveIndex > -1 && eggMoves & (1 << eggMoveIndex)) {
           continue;
         }
       }
-      if (pokemonFormLevelMoves.hasOwnProperty(this.speciesId) && pokemonFormLevelMoves[this.speciesId].hasOwnProperty(this.formIndex)) {
+      if (
+        pokemonFormLevelMoves.hasOwnProperty(this.speciesId) &&
+        pokemonFormLevelMoves[this.speciesId].hasOwnProperty(this.formIndex)
+      ) {
         if (!pokemonFormLevelMoves[this.speciesId][this.formIndex].find(lm => lm[0] <= 5 && lm[1] === moveId)) {
           return false;
         }
@@ -520,29 +596,87 @@ export abstract class PokemonSpeciesForm {
     return true;
   }
 
-  loadAssets(female: boolean, formIndex?: number, shiny?: boolean, variant?: Variant, startLoad?: boolean, back?: boolean): Promise<void> {
-    return new Promise(resolve => {
-      const spriteKey = this.getSpriteKey(female, formIndex, shiny, variant, back);
-      globalScene.loadPokemonAtlas(spriteKey, this.getSpriteAtlasPath(female, formIndex, shiny, variant, back));
-      globalScene.load.audio(`${this.getCryKey(formIndex)}`, `audio/${this.getCryKey(formIndex)}.m4a`);
+  /**
+   * Load the variant colors for the species into the variant color cache
+   *
+   * @param spriteKey - The sprite key to use
+   * @param female - Whether to load female instead of male
+   * @param back - Whether the back sprite is being loaded
+   *
+   */
+  async loadVariantColors(
+    spriteKey: string,
+    female: boolean,
+    variant: Variant,
+    back = false,
+    formIndex?: number,
+  ): Promise<void> {
+    let baseSpriteKey = this.getBaseSpriteKey(female, formIndex);
+    if (back) {
+      baseSpriteKey = "back__" + baseSpriteKey;
+    }
+
+    if (variantColorCache.hasOwnProperty(baseSpriteKey)) {
+      // Variant colors have already been loaded
+      return;
+    }
+
+    const variantInfo = variantData[this.getVariantDataIndex(formIndex)];
+    // Do nothing if there is no variant information or the variant does not have color replacements
+    if (!variantInfo || variantInfo[variant] !== 1) {
+      return;
+    }
+
+    await populateVariantColorCache(
+      "pkmn__" + baseSpriteKey,
+      globalScene.experimentalSprites && hasExpSprite(spriteKey),
+      baseSpriteKey.replace("__", "/"),
+    );
+  }
+
+  async loadAssets(
+    female: boolean,
+    formIndex?: number,
+    shiny = false,
+    variant?: Variant,
+    startLoad = false,
+    back = false,
+  ): Promise<void> {
+    // We need to populate the color cache for this species' variant
+    const spriteKey = this.getSpriteKey(female, formIndex, shiny, variant, back);
+    globalScene.loadPokemonAtlas(spriteKey, this.getSpriteAtlasPath(female, formIndex, shiny, variant, back));
+    globalScene.load.audio(this.getCryKey(formIndex), `audio/${this.getCryKey(formIndex)}.m4a`);
+    if (!isNullOrUndefined(variant)) {
+      await this.loadVariantColors(spriteKey, female, variant, back, formIndex);
+    }
+    return new Promise<void>(resolve => {
       globalScene.load.once(Phaser.Loader.Events.COMPLETE, () => {
         const originalWarn = console.warn;
         // Ignore warnings for missing frames, because there will be a lot
         console.warn = () => {};
-        const frameNames = globalScene.anims.generateFrameNames(spriteKey, { zeroPad: 4, suffix: ".png", start: 1, end: 400 });
+        const frameNames = globalScene.anims.generateFrameNames(spriteKey, {
+          zeroPad: 4,
+          suffix: ".png",
+          start: 1,
+          end: 400,
+        });
         console.warn = originalWarn;
-        if (!(globalScene.anims.exists(spriteKey))) {
+        if (!globalScene.anims.exists(spriteKey)) {
           globalScene.anims.create({
             key: this.getSpriteKey(female, formIndex, shiny, variant, back),
             frames: frameNames,
             frameRate: 10,
-            repeat: -1
+            repeat: -1,
           });
         } else {
           globalScene.anims.get(spriteKey).frameRate = 10;
         }
-        const spritePath = this.getSpriteAtlasPath(female, formIndex, shiny, variant, back).replace("variant/", "").replace(/_[1-3]$/, "");
-        globalScene.loadPokemonVariantAssets(spriteKey, spritePath, variant).then(() => resolve());
+        const spritePath = this.getSpriteAtlasPath(female, formIndex, shiny, variant, back)
+          .replace("variant/", "")
+          .replace(/_[1-3]$/, "");
+        if (!isNullOrUndefined(variant)) {
+          loadPokemonVariantAssets(spriteKey, spritePath, variant).then(() => resolve());
+        }
       });
       if (startLoad) {
         if (!globalScene.load.isLoading()) {
@@ -590,9 +724,9 @@ export abstract class PokemonSpeciesForm {
       for (let i = 0; i < pixelData.length; i += 4) {
         if (pixelData[i + 3]) {
           const pixel = pixelData.slice(i, i + 4);
-          const [ r, g, b, a ] = pixel;
+          const [r, g, b, a] = pixel;
           if (!spriteColors.find(c => c[0] === r && c[1] === g && c[2] === b)) {
-            spriteColors.push([ r, g, b, a ]);
+            spriteColors.push([r, g, b, a]);
           }
         }
       }
@@ -602,18 +736,29 @@ export abstract class PokemonSpeciesForm {
         if (!total) {
           continue;
         }
-        pixelColors.push(argbFromRgba({ r: pixelData[i], g: pixelData[i + 1], b: pixelData[i + 2], a: pixelData[i + 3] }));
+        pixelColors.push(
+          argbFromRgba({
+            r: pixelData[i],
+            g: pixelData[i + 1],
+            b: pixelData[i + 2],
+            a: pixelData[i + 3],
+          }),
+        );
       }
     }
 
     let paletteColors: Map<number, number> = new Map();
 
     const originalRandom = Math.random;
-    Math.random = () => Phaser.Math.RND.realInRange(0, 1);
+    Math.random = Phaser.Math.RND.frac;
 
-    globalScene.executeWithSeedOffset(() => {
-      paletteColors = QuantizerCelebi.quantize(pixelColors, 2);
-    }, 0, "This result should not vary");
+    globalScene.executeWithSeedOffset(
+      () => {
+        paletteColors = QuantizerCelebi.quantize(pixelColors, 2);
+      },
+      0,
+      "This result should not vary",
+    );
 
     Math.random = originalRandom;
 
@@ -633,14 +778,57 @@ export default class PokemonSpecies extends PokemonSpeciesForm implements Locali
   readonly canChangeForm: boolean;
   readonly forms: PokemonForm[];
 
-  constructor(id: Species, generation: number, subLegendary: boolean, legendary: boolean, mythical: boolean, species: string,
-    type1: Type, type2: Type | null, height: number, weight: number, ability1: Abilities, ability2: Abilities, abilityHidden: Abilities,
-    baseTotal: number, baseHp: number, baseAtk: number, baseDef: number, baseSpatk: number, baseSpdef: number, baseSpd: number,
-    catchRate: number, baseFriendship: number, baseExp: number, growthRate: GrowthRate, malePercent: number | null,
-    genderDiffs: boolean, canChangeForm?: boolean, ...forms: PokemonForm[]
+  constructor(
+    id: Species,
+    generation: number,
+    subLegendary: boolean,
+    legendary: boolean,
+    mythical: boolean,
+    species: string,
+    type1: PokemonType,
+    type2: PokemonType | null,
+    height: number,
+    weight: number,
+    ability1: Abilities,
+    ability2: Abilities,
+    abilityHidden: Abilities,
+    baseTotal: number,
+    baseHp: number,
+    baseAtk: number,
+    baseDef: number,
+    baseSpatk: number,
+    baseSpdef: number,
+    baseSpd: number,
+    catchRate: number,
+    baseFriendship: number,
+    baseExp: number,
+    growthRate: GrowthRate,
+    malePercent: number | null,
+    genderDiffs: boolean,
+    canChangeForm?: boolean,
+    ...forms: PokemonForm[]
   ) {
-    super(type1, type2, height, weight, ability1, ability2, abilityHidden, baseTotal, baseHp, baseAtk, baseDef, baseSpatk, baseSpdef, baseSpd,
-      catchRate, baseFriendship, baseExp, genderDiffs, false);
+    super(
+      type1,
+      type2,
+      height,
+      weight,
+      ability1,
+      ability2,
+      abilityHidden,
+      baseTotal,
+      baseHp,
+      baseAtk,
+      baseDef,
+      baseSpatk,
+      baseSpdef,
+      baseSpd,
+      catchRate,
+      baseFriendship,
+      baseExp,
+      genderDiffs,
+      false,
+    );
     this.speciesId = id;
     this.formIndex = 0;
     this.generation = generation;
@@ -684,21 +872,125 @@ export default class PokemonSpecies extends PokemonSpeciesForm implements Locali
       }
 
       if (key) {
-        return i18next.t(`battlePokemonForm:${key}`, { pokemonName: this.name });
+        return i18next.t(`battlePokemonForm:${key}`, {
+          pokemonName: this.name,
+        });
       }
     }
     return this.name;
   }
 
+  /**
+   * Pick and return a random {@linkcode Gender} for a {@linkcode Pokemon}.
+   * @returns A randomly rolled gender based on this Species' {@linkcode malePercent}.
+   */
+  generateGender(): Gender {
+    if (isNullOrUndefined(this.malePercent)) {
+      return Gender.GENDERLESS;
+    }
+
+    if (Phaser.Math.RND.realInRange(0, 1) <= this.malePercent) {
+      return Gender.MALE;
+    }
+    return Gender.FEMALE;
+  }
+
+  /**
+   * Find the name of species with proper attachments for regionals and separate starter forms (Floette, Ursaluna)
+   * @returns a string with the region name or other form name attached
+   */
+  getExpandedSpeciesName(): string {
+    if (this.speciesId < 2000) {
+      return this.name; // Other special cases could be put here too
+    }
+    // Everything beyond this point essentially follows the pattern of FORMNAME_SPECIES
+    return i18next.t(`pokemonForm:appendForm.${Species[this.speciesId].split("_")[0]}`, { pokemonName: this.name });
+  }
+
+  /**
+   * Find the form name for species with just one form (regional variants, Floette, Ursaluna)
+   * @param formIndex The form index to check (defaults to 0)
+   * @param append Whether to append the species name to the end (defaults to false)
+   * @returns the pokemon-form locale key for the single form name ("Alolan Form", "Eternal Flower" etc)
+   */
+  getFormNameToDisplay(formIndex = 0, append = false): string {
+    const formKey = this.forms?.[formIndex!]?.formKey;
+    const formText = capitalizeString(formKey, "-", false, false) || "";
+    const speciesName = capitalizeString(Species[this.speciesId], "_", true, false);
+    let ret = "";
+
+    const region = this.getRegion();
+    if (this.speciesId === Species.ARCEUS) {
+      ret = i18next.t(`pokemonInfo:Type.${formText?.toUpperCase()}`);
+    } else if (
+      [
+        SpeciesFormKey.MEGA,
+        SpeciesFormKey.MEGA_X,
+        SpeciesFormKey.MEGA_Y,
+        SpeciesFormKey.PRIMAL,
+        SpeciesFormKey.GIGANTAMAX,
+        SpeciesFormKey.GIGANTAMAX_RAPID,
+        SpeciesFormKey.GIGANTAMAX_SINGLE,
+        SpeciesFormKey.ETERNAMAX,
+      ].includes(formKey as SpeciesFormKey)
+    ) {
+      return append
+        ? i18next.t(`battlePokemonForm:${formKey}`, { pokemonName: this.name })
+        : i18next.t(`pokemonForm:battleForm.${formKey}`);
+    } else if (
+      region === Region.NORMAL ||
+      (this.speciesId === Species.GALAR_DARMANITAN && formIndex > 0) ||
+      this.speciesId === Species.PALDEA_TAUROS
+    ) {
+      // More special cases can be added here
+      const i18key = `pokemonForm:${speciesName}${formText}`;
+      if (i18next.exists(i18key)) {
+        ret = i18next.t(i18key);
+      } else {
+        const rootSpeciesName = capitalizeString(Species[this.getRootSpeciesId()], "_", true, false);
+        const i18RootKey = `pokemonForm:${rootSpeciesName}${formText}`;
+        ret = i18next.exists(i18RootKey) ? i18next.t(i18RootKey) : formText;
+      }
+    } else if (append) {
+      // Everything beyond this has an expanded name
+      return this.getExpandedSpeciesName();
+    } else if (this.speciesId === Species.ETERNAL_FLOETTE) {
+      // Not a real form, so the key is made up
+      return i18next.t("pokemonForm:floetteEternalFlower");
+    } else if (this.speciesId === Species.BLOODMOON_URSALUNA) {
+      // Not a real form, so the key is made up
+      return i18next.t("pokemonForm:ursalunaBloodmoon");
+    } else {
+      // Only regional forms should be left at this point
+      return i18next.t(`pokemonForm:regionalForm.${Region[region]}`);
+    }
+    return append
+      ? i18next.t("pokemonForm:appendForm.GENERIC", {
+          pokemonName: this.name,
+          formName: ret,
+        })
+      : ret;
+  }
+
   localize(): void {
     this.name = i18next.t(`pokemon:${Species[this.speciesId].toLowerCase()}`);
   }
 
   getWildSpeciesForLevel(level: number, allowEvolving: boolean, isBoss: boolean, gameMode: GameMode): Species {
-    return this.getSpeciesForLevel(level, allowEvolving, false, (isBoss ? PartyMemberStrength.WEAKER : PartyMemberStrength.AVERAGE) + (gameMode?.isEndless ? 1 : 0));
+    return this.getSpeciesForLevel(
+      level,
+      allowEvolving,
+      false,
+      (isBoss ? PartyMemberStrength.WEAKER : PartyMemberStrength.AVERAGE) + (gameMode?.isEndless ? 1 : 0),
+    );
   }
 
-  getTrainerSpeciesForLevel(level: number, allowEvolving: boolean = false, strength: PartyMemberStrength, currentWave: number = 0): Species {
+  getTrainerSpeciesForLevel(
+    level: number,
+    allowEvolving = false,
+    strength: PartyMemberStrength,
+    currentWave = 0,
+  ): Species {
     return this.getSpeciesForLevel(level, allowEvolving, true, strength, currentWave);
   }
 
@@ -737,7 +1029,13 @@ export default class PokemonSpecies extends PokemonSpeciesForm implements Locali
     }
   }
 
-  getSpeciesForLevel(level: number, allowEvolving: boolean = false, forTrainer: boolean = false, strength: PartyMemberStrength = PartyMemberStrength.WEAKER, currentWave: number = 0): Species {
+  getSpeciesForLevel(
+    level: number,
+    allowEvolving = false,
+    forTrainer = false,
+    strength: PartyMemberStrength = PartyMemberStrength.WEAKER,
+    currentWave = 0,
+  ): Species {
     const prevolutionLevels = this.getPrevolutionLevels();
 
     if (prevolutionLevels.length) {
@@ -749,7 +1047,14 @@ export default class PokemonSpecies extends PokemonSpeciesForm implements Locali
       }
     }
 
-    if (!allowEvolving || !pokemonEvolutions.hasOwnProperty(this.speciesId)) {
+    if (
+      // If evolutions shouldn't happen, add more cases here :)
+      !allowEvolving ||
+      !pokemonEvolutions.hasOwnProperty(this.speciesId) ||
+      (globalScene.currentBattle?.waveIndex === 20 &&
+        globalScene.gameMode.isClassic &&
+        globalScene.currentBattle.trainer)
+    ) {
       return this.speciesId;
     }
 
@@ -782,20 +1087,32 @@ export default class PokemonSpecies extends PokemonSpeciesForm implements Locali
             const maxLevelDiff = this.getStrengthLevelDiff(strength); //The maximum distance from the evolution level tolerated for the mon to not evolve
             const minChance: number = 0.875 - 0.125 * strength;
 
-            evolutionChance = Math.min(minChance + easeInFunc(Math.min(level - ev.level, maxLevelDiff) / maxLevelDiff) * (1 - minChance), 1);
+            evolutionChance = Math.min(
+              minChance + easeInFunc(Math.min(level - ev.level, maxLevelDiff) / maxLevelDiff) * (1 - minChance),
+              1,
+            );
           }
         } else {
-          const preferredMinLevel = Math.max((ev.level - 1) + (ev.wildDelay!) * this.getStrengthLevelDiff(strength), 1); // TODO: is the bang correct?
+          const preferredMinLevel = Math.max(ev.level - 1 + ev.wildDelay! * this.getStrengthLevelDiff(strength), 1); // TODO: is the bang correct?
           let evolutionLevel = Math.max(ev.level > 1 ? ev.level : Math.floor(preferredMinLevel / 2), 1);
 
           if (ev.level <= 1 && pokemonPrevolutions.hasOwnProperty(this.speciesId)) {
-            const prevolutionLevel = pokemonEvolutions[pokemonPrevolutions[this.speciesId]].find(ev => ev.speciesId === this.speciesId)!.level; // TODO: is the bang correct?
+            const prevolutionLevel = pokemonEvolutions[pokemonPrevolutions[this.speciesId]].find(
+              ev => ev.speciesId === this.speciesId,
+            )!.level; // TODO: is the bang correct?
             if (prevolutionLevel > 1) {
               evolutionLevel = prevolutionLevel;
             }
           }
 
-          evolutionChance = Math.min(0.65 * easeInFunc(Math.min(Math.max(level - evolutionLevel, 0), preferredMinLevel) / preferredMinLevel) + 0.35 * easeOutFunc(Math.min(Math.max(level - evolutionLevel, 0), preferredMinLevel * 2.5) / (preferredMinLevel * 2.5)), 1);
+          evolutionChance = Math.min(
+            0.65 * easeInFunc(Math.min(Math.max(level - evolutionLevel, 0), preferredMinLevel) / preferredMinLevel) +
+              0.35 *
+                easeOutFunc(
+                  Math.min(Math.max(level - evolutionLevel, 0), preferredMinLevel * 2.5) / (preferredMinLevel * 2.5),
+                ),
+            1,
+          );
         }
       }
 
@@ -808,14 +1125,14 @@ export default class PokemonSpecies extends PokemonSpeciesForm implements Locali
 
       if (evolutionChance > 0) {
         if (isRegionalEvolution) {
-          evolutionChance /= (evolutionSpecies.isRareRegional() ? 16 : 4);
+          evolutionChance /= evolutionSpecies.isRareRegional() ? 16 : 4;
         }
 
         totalWeight += evolutionChance;
 
         evolutionPool.set(totalWeight, ev.speciesId);
 
-        if ((1 - evolutionChance) < noEvolutionChance) {
+        if (1 - evolutionChance < noEvolutionChance) {
           noEvolutionChance = 1 - evolutionChance;
         }
       }
@@ -825,11 +1142,18 @@ export default class PokemonSpecies extends PokemonSpeciesForm implements Locali
       return this.speciesId;
     }
 
-    const randValue = evolutionPool.size === 1 ? 0 : Utils.randSeedInt(totalWeight);
+    const randValue = evolutionPool.size === 1 ? 0 : randSeedInt(totalWeight);
 
     for (const weight of evolutionPool.keys()) {
       if (randValue < weight) {
-        return getPokemonSpecies(evolutionPool.get(weight)).getSpeciesForLevel(level, true, forTrainer, strength, currentWave);
+        // TODO: this entire function is dumb and should be changed, adding a `!` here for now until then
+        return getPokemonSpecies(evolutionPool.get(weight)!).getSpeciesForLevel(
+          level,
+          true,
+          forTrainer,
+          strength,
+          currentWave,
+        );
       }
     }
 
@@ -845,7 +1169,7 @@ export default class PokemonSpecies extends PokemonSpeciesForm implements Locali
       for (const e of pokemonEvolutions[this.speciesId]) {
         const speciesId = e.speciesId;
         const level = e.level;
-        evolutionLevels.push([ speciesId, level ]);
+        evolutionLevels.push([speciesId, level]);
         //console.log(Species[speciesId], getPokemonSpecies(speciesId), getPokemonSpecies(speciesId).getEvolutionLevels());
         const nextEvolutionLevels = getPokemonSpecies(speciesId).getEvolutionLevels();
         for (const npl of nextEvolutionLevels) {
@@ -863,10 +1187,14 @@ export default class PokemonSpecies extends PokemonSpeciesForm implements Locali
     const allEvolvingPokemon = Object.keys(pokemonEvolutions);
     for (const p of allEvolvingPokemon) {
       for (const e of pokemonEvolutions[p]) {
-        if (e.speciesId === this.speciesId && (!this.forms.length || !e.evoFormKey || e.evoFormKey === this.forms[this.formIndex].formKey) && prevolutionLevels.every(pe => pe[0] !== parseInt(p))) {
-          const speciesId = parseInt(p) as Species;
+        if (
+          e.speciesId === this.speciesId &&
+          (!this.forms.length || !e.evoFormKey || e.evoFormKey === this.forms[this.formIndex].formKey) &&
+          prevolutionLevels.every(pe => pe[0] !== Number.parseInt(p))
+        ) {
+          const speciesId = Number.parseInt(p) as Species;
           const level = e.level;
-          prevolutionLevels.push([ speciesId, level ]);
+          prevolutionLevels.push([speciesId, level]);
           const subPrevolutionLevels = getPokemonSpecies(speciesId).getPrevolutionLevels();
           for (const spl of subPrevolutionLevels) {
             prevolutionLevels.push(spl);
@@ -879,21 +1207,53 @@ export default class PokemonSpecies extends PokemonSpeciesForm implements Locali
   }
 
   // This could definitely be written better and more accurate to the getSpeciesForLevel logic, but it is only for generating movesets for evolved Pokemon
-  getSimulatedEvolutionChain(currentLevel: number, forTrainer: boolean = false, isBoss: boolean = false, player: boolean = false): EvolutionLevel[] {
+  getSimulatedEvolutionChain(
+    currentLevel: number,
+    forTrainer = false,
+    isBoss = false,
+    player = false,
+  ): EvolutionLevel[] {
     const ret: EvolutionLevel[] = [];
     if (pokemonPrevolutions.hasOwnProperty(this.speciesId)) {
       const prevolutionLevels = this.getPrevolutionLevels().reverse();
-      const levelDiff = player ? 0 : forTrainer || isBoss ? forTrainer && isBoss ? 2.5 : 5 : 10;
-      ret.push([ prevolutionLevels[0][0], 1 ]);
+      const levelDiff = player ? 0 : forTrainer || isBoss ? (forTrainer && isBoss ? 2.5 : 5) : 10;
+      ret.push([prevolutionLevels[0][0], 1]);
       for (let l = 1; l < prevolutionLevels.length; l++) {
-        const evolution = pokemonEvolutions[prevolutionLevels[l - 1][0]].find(e => e.speciesId === prevolutionLevels[l][0]);
-        ret.push([ prevolutionLevels[l][0], Math.min(Math.max((evolution?.level!) + Math.round(Utils.randSeedGauss(0.5, 1 + levelDiff * 0.2) * Math.max((evolution?.wildDelay!), 0.5) * 5) - 1, 2, (evolution?.level!)), currentLevel - 1) ]); // TODO: are those bangs correct?
+        const evolution = pokemonEvolutions[prevolutionLevels[l - 1][0]].find(
+          e => e.speciesId === prevolutionLevels[l][0],
+        );
+        ret.push([
+          prevolutionLevels[l][0],
+          Math.min(
+            Math.max(
+              evolution?.level! +
+                Math.round(randSeedGauss(0.5, 1 + levelDiff * 0.2) * Math.max(evolution?.wildDelay!, 0.5) * 5) -
+                1,
+              2,
+              evolution?.level!,
+            ),
+            currentLevel - 1,
+          ),
+        ]); // TODO: are those bangs correct?
       }
       const lastPrevolutionLevel = ret[prevolutionLevels.length - 1][1];
-      const evolution = pokemonEvolutions[prevolutionLevels[prevolutionLevels.length - 1][0]].find(e => e.speciesId === this.speciesId);
-      ret.push([ this.speciesId, Math.min(Math.max(lastPrevolutionLevel + Math.round(Utils.randSeedGauss(0.5, 1 + levelDiff * 0.2) * Math.max((evolution?.wildDelay!), 0.5) * 5), lastPrevolutionLevel + 1, (evolution?.level!)), currentLevel) ]); // TODO: are those bangs correct?
+      const evolution = pokemonEvolutions[prevolutionLevels[prevolutionLevels.length - 1][0]].find(
+        e => e.speciesId === this.speciesId,
+      );
+      ret.push([
+        this.speciesId,
+        Math.min(
+          Math.max(
+            lastPrevolutionLevel +
+              Math.round(randSeedGauss(0.5, 1 + levelDiff * 0.2) * Math.max(evolution?.wildDelay!, 0.5) * 5),
+            lastPrevolutionLevel + 1,
+            evolution?.level!,
+          ),
+          currentLevel,
+        ),
+      ]); // TODO: are those bangs correct?
     } else {
-      ret.push([ this.speciesId, 1 ]);
+      ret.push([this.speciesId, 1]);
     }
 
     return ret;
@@ -907,19 +1267,17 @@ export default class PokemonSpecies extends PokemonSpeciesForm implements Locali
     const mythical = this.mythical;
     return species => {
       return (
-        subLegendary
-        || legendary
-        || mythical
-        || (
-          pokemonEvolutions.hasOwnProperty(species.speciesId) === hasEvolution
-          && pokemonPrevolutions.hasOwnProperty(species.speciesId) === hasPrevolution
-        )
-      )
-        && species.subLegendary === subLegendary
-        && species.legendary === legendary
-        && species.mythical === mythical
-        && (this.isTrainerForbidden() || !species.isTrainerForbidden())
-        && species.speciesId !== Species.DITTO;
+        (subLegendary ||
+          legendary ||
+          mythical ||
+          (pokemonEvolutions.hasOwnProperty(species.speciesId) === hasEvolution &&
+            pokemonPrevolutions.hasOwnProperty(species.speciesId) === hasPrevolution)) &&
+        species.subLegendary === subLegendary &&
+        species.legendary === legendary &&
+        species.mythical === mythical &&
+        (this.isTrainerForbidden() || !species.isTrainerForbidden()) &&
+        species.speciesId !== Species.DITTO
+      );
     };
   }
 
@@ -939,13 +1297,47 @@ export default class PokemonSpecies extends PokemonSpeciesForm implements Locali
   }
 
   getFormSpriteKey(formIndex?: number) {
-    if (this.forms.length && (formIndex !== undefined && formIndex >= this.forms.length)) {
-      console.warn(`Attempted accessing form with index ${formIndex} of species ${this.getName()} with only ${this.forms.length || 0} forms`);
+    if (this.forms.length && formIndex !== undefined && formIndex >= this.forms.length) {
+      console.warn(
+        `Attempted accessing form with index ${formIndex} of species ${this.getName()} with only ${this.forms.length || 0} forms`,
+      );
       formIndex = Math.min(formIndex, this.forms.length - 1);
     }
-    return this.forms?.length
-      ? this.forms[formIndex || 0].getFormSpriteKey()
-      : "";
+    return this.forms?.length ? this.forms[formIndex || 0].getFormSpriteKey() : "";
+  }
+
+  /**
+   * Generates a {@linkcode bigint} corresponding to the maximum unlocks possible for this species,
+   * taking into account if the species has a male/female gender, and which variants are implemented.
+   * @returns {@linkcode bigint} Maximum unlocks, can be compared with {@linkcode DexEntry.caughtAttr}.
+   */
+  getFullUnlocksData(): bigint {
+    let caughtAttr = 0n;
+    caughtAttr += DexAttr.NON_SHINY;
+    caughtAttr += DexAttr.SHINY;
+    if (this.malePercent !== null) {
+      if (this.malePercent > 0) {
+        caughtAttr += DexAttr.MALE;
+      }
+      if (this.malePercent < 100) {
+        caughtAttr += DexAttr.FEMALE;
+      }
+    }
+    caughtAttr += DexAttr.DEFAULT_VARIANT;
+    if (this.hasVariants()) {
+      caughtAttr += DexAttr.VARIANT_2;
+      caughtAttr += DexAttr.VARIANT_3;
+    }
+
+    // Summing successive bigints for each obtainable form
+    caughtAttr +=
+      this?.forms?.length > 1
+        ? this.forms
+            .map((f, index) => (f.isUnobtainable ? 0n : 128n * 2n ** BigInt(index)))
+            .reduce((acc, val) => acc + val, 0n)
+        : DexAttr.DEFAULT_FORM;
+
+    return caughtAttr;
   }
 }
 
@@ -953,19 +1345,73 @@ export class PokemonForm extends PokemonSpeciesForm {
   public formName: string;
   public formKey: string;
   public formSpriteKey: string | null;
+  public isUnobtainable: boolean;
 
   // This is a collection of form keys that have in-run form changes, but should still be separately selectable from the start screen
-  private starterSelectableKeys: string[] = [ "10", "50", "10-pc", "50-pc", "red", "orange", "yellow", "green", "blue", "indigo", "violet" ];
+  private starterSelectableKeys: string[] = [
+    "10",
+    "50",
+    "10-pc",
+    "50-pc",
+    "red",
+    "orange",
+    "yellow",
+    "green",
+    "blue",
+    "indigo",
+    "violet",
+  ];
 
-  constructor(formName: string, formKey: string, type1: Type, type2: Type | null, height: number, weight: number, ability1: Abilities, ability2: Abilities, abilityHidden: Abilities,
-    baseTotal: number, baseHp: number, baseAtk: number, baseDef: number, baseSpatk: number, baseSpdef: number, baseSpd: number,
-    catchRate: number, baseFriendship: number, baseExp: number, genderDiffs: boolean = false, formSpriteKey: string | null = null, isStarterSelectable: boolean = false
+  constructor(
+    formName: string,
+    formKey: string,
+    type1: PokemonType,
+    type2: PokemonType | null,
+    height: number,
+    weight: number,
+    ability1: Abilities,
+    ability2: Abilities,
+    abilityHidden: Abilities,
+    baseTotal: number,
+    baseHp: number,
+    baseAtk: number,
+    baseDef: number,
+    baseSpatk: number,
+    baseSpdef: number,
+    baseSpd: number,
+    catchRate: number,
+    baseFriendship: number,
+    baseExp: number,
+    genderDiffs = false,
+    formSpriteKey: string | null = null,
+    isStarterSelectable = false,
+    isUnobtainable = false,
   ) {
-    super(type1, type2, height, weight, ability1, ability2, abilityHidden, baseTotal, baseHp, baseAtk, baseDef, baseSpatk, baseSpdef, baseSpd,
-      catchRate, baseFriendship, baseExp, genderDiffs, (isStarterSelectable || !formKey));
+    super(
+      type1,
+      type2,
+      height,
+      weight,
+      ability1,
+      ability2,
+      abilityHidden,
+      baseTotal,
+      baseHp,
+      baseAtk,
+      baseDef,
+      baseSpatk,
+      baseSpdef,
+      baseSpd,
+      catchRate,
+      baseFriendship,
+      baseExp,
+      genderDiffs,
+      isStarterSelectable || !formKey,
+    );
     this.formName = formName;
     this.formKey = formKey;
     this.formSpriteKey = formSpriteKey;
+    this.isUnobtainable = isUnobtainable;
   }
 
   getFormSpriteKey(_formIndex?: number) {
@@ -974,1819 +1420,1804 @@ export class PokemonForm extends PokemonSpeciesForm {
 }
 
 /**
-* Method to get the daily list of starters with Pokerus.
-* @returns A list of starters with Pokerus
-*/
+ * Method to get the daily list of starters with Pokerus.
+ * @returns A list of starters with Pokerus
+ */
 export function getPokerusStarters(): PokemonSpecies[] {
   const pokerusStarters: PokemonSpecies[] = [];
   const date = new Date();
   date.setUTCHours(0, 0, 0, 0);
-  globalScene.executeWithSeedOffset(() => {
-    while (pokerusStarters.length < POKERUS_STARTER_COUNT) {
-      const randomSpeciesId = parseInt(Utils.randSeedItem(Object.keys(speciesStarterCosts)), 10);
-      const species = getPokemonSpecies(randomSpeciesId);
-      if (!pokerusStarters.includes(species)) {
-        pokerusStarters.push(species);
+  globalScene.executeWithSeedOffset(
+    () => {
+      while (pokerusStarters.length < POKERUS_STARTER_COUNT) {
+        const randomSpeciesId = Number.parseInt(randSeedItem(Object.keys(speciesStarterCosts)), 10);
+        const species = getPokemonSpecies(randomSpeciesId);
+        if (!pokerusStarters.includes(species)) {
+          pokerusStarters.push(species);
+        }
       }
-    }
-  }, 0, date.getTime().toString());
+    },
+    0,
+    date.getTime().toString(),
+  );
   return pokerusStarters;
 }
 
 export const allSpecies: PokemonSpecies[] = [];
 
+// biome-ignore format: manually formatted
 export function initSpecies() {
   allSpecies.push(
-    new PokemonSpecies(Species.BULBASAUR, 1, false, false, false, "Seed Pokémon", Type.GRASS, Type.POISON, 0.7, 6.9, Abilities.OVERGROW, Abilities.NONE, Abilities.CHLOROPHYLL, 318, 45, 49, 49, 65, 65, 45, 45, 50, 64, GrowthRate.MEDIUM_SLOW, 87.5, false),
-    new PokemonSpecies(Species.IVYSAUR, 1, false, false, false, "Seed Pokémon", Type.GRASS, Type.POISON, 1, 13, Abilities.OVERGROW, Abilities.NONE, Abilities.CHLOROPHYLL, 405, 60, 62, 63, 80, 80, 60, 45, 50, 142, GrowthRate.MEDIUM_SLOW, 87.5, false),
-    new PokemonSpecies(Species.VENUSAUR, 1, false, false, false, "Seed Pokémon", Type.GRASS, Type.POISON, 2, 100, Abilities.OVERGROW, Abilities.NONE, Abilities.CHLOROPHYLL, 525, 80, 82, 83, 100, 100, 80, 45, 50, 263, GrowthRate.MEDIUM_SLOW, 87.5, true, true,
-      new PokemonForm("Normal", "", Type.GRASS, Type.POISON, 2, 100, Abilities.OVERGROW, Abilities.NONE, Abilities.CHLOROPHYLL, 525, 80, 82, 83, 100, 100, 80, 45, 50, 263, true, null, true),
-      new PokemonForm("Mega", SpeciesFormKey.MEGA, Type.GRASS, Type.POISON, 2.4, 155.5, Abilities.THICK_FAT, Abilities.THICK_FAT, Abilities.THICK_FAT, 625, 80, 100, 123, 122, 120, 80, 45, 50, 263, true),
-      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.GRASS, Type.POISON, 24, 999.9, Abilities.EFFECT_SPORE, Abilities.NONE, Abilities.EFFECT_SPORE, 625, 120, 82, 98, 130, 115, 80, 45, 50, 263, true),
-    ),
-    new PokemonSpecies(Species.CHARMANDER, 1, false, false, false, "Lizard Pokémon", Type.FIRE, null, 0.6, 8.5, Abilities.BLAZE, Abilities.NONE, Abilities.SOLAR_POWER, 309, 39, 52, 43, 60, 50, 65, 45, 50, 62, GrowthRate.MEDIUM_SLOW, 87.5, false),
-    new PokemonSpecies(Species.CHARMELEON, 1, false, false, false, "Flame Pokémon", Type.FIRE, null, 1.1, 19, Abilities.BLAZE, Abilities.NONE, Abilities.SOLAR_POWER, 405, 58, 64, 58, 80, 65, 80, 45, 50, 142, GrowthRate.MEDIUM_SLOW, 87.5, false),
-    new PokemonSpecies(Species.CHARIZARD, 1, false, false, false, "Flame Pokémon", Type.FIRE, Type.FLYING, 1.7, 90.5, Abilities.BLAZE, Abilities.NONE, Abilities.SOLAR_POWER, 534, 78, 84, 78, 109, 85, 100, 45, 50, 267, GrowthRate.MEDIUM_SLOW, 87.5, false, true,
-      new PokemonForm("Normal", "", Type.FIRE, Type.FLYING, 1.7, 90.5, Abilities.BLAZE, Abilities.NONE, Abilities.SOLAR_POWER, 534, 78, 84, 78, 109, 85, 100, 45, 50, 267, false, null, true),
-      new PokemonForm("Mega X", SpeciesFormKey.MEGA_X, Type.FIRE, Type.DRAGON, 1.7, 110.5, Abilities.TOUGH_CLAWS, Abilities.NONE, Abilities.TOUGH_CLAWS, 634, 78, 130, 111, 130, 85, 100, 45, 50, 267),
-      new PokemonForm("Mega Y", SpeciesFormKey.MEGA_Y, Type.FIRE, Type.FLYING, 1.7, 100.5, Abilities.DROUGHT, Abilities.NONE, Abilities.DROUGHT, 634, 78, 104, 78, 159, 115, 100, 45, 50, 267),
-      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.FIRE, Type.FLYING, 28, 999.9, Abilities.BERSERK, Abilities.NONE, Abilities.BERSERK, 634, 118, 84, 93, 139, 100, 100, 45, 50, 267),
-    ),
-    new PokemonSpecies(Species.SQUIRTLE, 1, false, false, false, "Tiny Turtle Pokémon", Type.WATER, null, 0.5, 9, Abilities.TORRENT, Abilities.NONE, Abilities.RAIN_DISH, 314, 44, 48, 65, 50, 64, 43, 45, 50, 63, GrowthRate.MEDIUM_SLOW, 87.5, false),
-    new PokemonSpecies(Species.WARTORTLE, 1, false, false, false, "Turtle Pokémon", Type.WATER, null, 1, 22.5, Abilities.TORRENT, Abilities.NONE, Abilities.RAIN_DISH, 405, 59, 63, 80, 65, 80, 58, 45, 50, 142, GrowthRate.MEDIUM_SLOW, 87.5, false),
-    new PokemonSpecies(Species.BLASTOISE, 1, false, false, false, "Shellfish Pokémon", Type.WATER, null, 1.6, 85.5, Abilities.TORRENT, Abilities.NONE, Abilities.RAIN_DISH, 530, 79, 83, 100, 85, 105, 78, 45, 50, 265, GrowthRate.MEDIUM_SLOW, 87.5, false, true,
-      new PokemonForm("Normal", "", Type.WATER, null, 1.6, 85.5, Abilities.TORRENT, Abilities.NONE, Abilities.RAIN_DISH, 530, 79, 83, 100, 85, 105, 78, 45, 50, 265, false, null, true),
-      new PokemonForm("Mega", SpeciesFormKey.MEGA, Type.WATER, null, 1.6, 101.1, Abilities.MEGA_LAUNCHER, Abilities.NONE, Abilities.MEGA_LAUNCHER, 630, 79, 103, 120, 135, 115, 78, 45, 50, 265),
-      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.WATER, Type.STEEL, 25, 999.9, Abilities.SHELL_ARMOR, Abilities.NONE, Abilities.SHELL_ARMOR, 630, 119, 83, 135, 115, 110, 68, 45, 50, 265),
-    ),
-    new PokemonSpecies(Species.CATERPIE, 1, false, false, false, "Worm Pokémon", Type.BUG, null, 0.3, 2.9, Abilities.SHIELD_DUST, Abilities.NONE, Abilities.RUN_AWAY, 195, 45, 30, 35, 20, 20, 45, 255, 50, 39, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.METAPOD, 1, false, false, false, "Cocoon Pokémon", Type.BUG, null, 0.7, 9.9, Abilities.SHED_SKIN, Abilities.NONE, Abilities.SHED_SKIN, 205, 50, 20, 55, 25, 25, 30, 120, 50, 72, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.BUTTERFREE, 1, false, false, false, "Butterfly Pokémon", Type.BUG, Type.FLYING, 1.1, 32, Abilities.COMPOUND_EYES, Abilities.NONE, Abilities.TINTED_LENS, 395, 60, 45, 50, 90, 80, 70, 45, 50, 198, GrowthRate.MEDIUM_FAST, 50, true, true,
-      new PokemonForm("Normal", "", Type.BUG, Type.FLYING, 1.1, 32, Abilities.COMPOUND_EYES, Abilities.NONE, Abilities.TINTED_LENS, 395, 60, 45, 50, 90, 80, 70, 45, 50, 198, true, null, true),
-      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.BUG, Type.FLYING, 17, 999.9, Abilities.COMPOUND_EYES, Abilities.NONE, Abilities.COMPOUND_EYES, 495, 85, 35, 80, 120, 90, 85, 45, 50, 198, true),
-    ),
-    new PokemonSpecies(Species.WEEDLE, 1, false, false, false, "Hairy Bug Pokémon", Type.BUG, Type.POISON, 0.3, 3.2, Abilities.SHIELD_DUST, Abilities.NONE, Abilities.RUN_AWAY, 195, 40, 35, 30, 20, 20, 50, 255, 70, 39, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.KAKUNA, 1, false, false, false, "Cocoon Pokémon", Type.BUG, Type.POISON, 0.6, 10, Abilities.SHED_SKIN, Abilities.NONE, Abilities.SHED_SKIN, 205, 45, 25, 50, 25, 25, 35, 120, 70, 72, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.BEEDRILL, 1, false, false, false, "Poison Bee Pokémon", Type.BUG, Type.POISON, 1, 29.5, Abilities.SWARM, Abilities.NONE, Abilities.SNIPER, 395, 65, 90, 40, 45, 80, 75, 45, 70, 198, GrowthRate.MEDIUM_FAST, 50, false, true,
-      new PokemonForm("Normal", "", Type.BUG, Type.POISON, 1, 29.5, Abilities.SWARM, Abilities.NONE, Abilities.SNIPER, 395, 65, 90, 40, 45, 80, 75, 45, 70, 198, false, null, true),
-      new PokemonForm("Mega", SpeciesFormKey.MEGA, Type.BUG, Type.POISON, 1.4, 40.5, Abilities.ADAPTABILITY, Abilities.NONE, Abilities.ADAPTABILITY, 495, 65, 150, 40, 15, 80, 145, 45, 70, 198),
-    ),
-    new PokemonSpecies(Species.PIDGEY, 1, false, false, false, "Tiny Bird Pokémon", Type.NORMAL, Type.FLYING, 0.3, 1.8, Abilities.KEEN_EYE, Abilities.TANGLED_FEET, Abilities.BIG_PECKS, 251, 40, 45, 40, 35, 35, 56, 255, 70, 50, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.PIDGEOTTO, 1, false, false, false, "Bird Pokémon", Type.NORMAL, Type.FLYING, 1.1, 30, Abilities.KEEN_EYE, Abilities.TANGLED_FEET, Abilities.BIG_PECKS, 349, 63, 60, 55, 50, 50, 71, 120, 70, 122, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.PIDGEOT, 1, false, false, false, "Bird Pokémon", Type.NORMAL, Type.FLYING, 1.5, 39.5, Abilities.KEEN_EYE, Abilities.TANGLED_FEET, Abilities.BIG_PECKS, 479, 83, 80, 75, 70, 70, 101, 45, 70, 240, GrowthRate.MEDIUM_SLOW, 50, false, true,
-      new PokemonForm("Normal", "", Type.NORMAL, Type.FLYING, 1.5, 39.5, Abilities.KEEN_EYE, Abilities.TANGLED_FEET, Abilities.BIG_PECKS, 479, 83, 80, 75, 70, 70, 101, 45, 70, 240, false, null, true),
-      new PokemonForm("Mega", SpeciesFormKey.MEGA, Type.NORMAL, Type.FLYING, 2.2, 50.5, Abilities.NO_GUARD, Abilities.NO_GUARD, Abilities.NO_GUARD, 579, 83, 80, 80, 135, 80, 121, 45, 70, 240),
-    ),
-    new PokemonSpecies(Species.RATTATA, 1, false, false, false, "Mouse Pokémon", Type.NORMAL, null, 0.3, 3.5, Abilities.RUN_AWAY, Abilities.GUTS, Abilities.HUSTLE, 253, 30, 56, 35, 25, 35, 72, 255, 70, 51, GrowthRate.MEDIUM_FAST, 50, true),
-    new PokemonSpecies(Species.RATICATE, 1, false, false, false, "Mouse Pokémon", Type.NORMAL, null, 0.7, 18.5, Abilities.RUN_AWAY, Abilities.GUTS, Abilities.HUSTLE, 413, 55, 81, 60, 50, 70, 97, 127, 70, 145, GrowthRate.MEDIUM_FAST, 50, true),
-    new PokemonSpecies(Species.SPEAROW, 1, false, false, false, "Tiny Bird Pokémon", Type.NORMAL, Type.FLYING, 0.3, 2, Abilities.KEEN_EYE, Abilities.NONE, Abilities.SNIPER, 262, 40, 60, 30, 31, 31, 70, 255, 70, 52, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.FEAROW, 1, false, false, false, "Beak Pokémon", Type.NORMAL, Type.FLYING, 1.2, 38, Abilities.KEEN_EYE, Abilities.NONE, Abilities.SNIPER, 442, 65, 90, 65, 61, 61, 100, 90, 70, 155, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.EKANS, 1, false, false, false, "Snake Pokémon", Type.POISON, null, 2, 6.9, Abilities.INTIMIDATE, Abilities.SHED_SKIN, Abilities.UNNERVE, 288, 35, 60, 44, 40, 54, 55, 255, 70, 58, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.ARBOK, 1, false, false, false, "Cobra Pokémon", Type.POISON, null, 3.5, 65, Abilities.INTIMIDATE, Abilities.SHED_SKIN, Abilities.UNNERVE, 448, 60, 95, 69, 65, 79, 80, 90, 70, 157, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.PIKACHU, 1, false, false, false, "Mouse Pokémon", Type.ELECTRIC, null, 0.4, 6, Abilities.STATIC, Abilities.NONE, Abilities.LIGHTNING_ROD, 320, 35, 55, 40, 50, 50, 90, 190, 50, 112, GrowthRate.MEDIUM_FAST, 50, true, true,
-      new PokemonForm("Normal", "", Type.ELECTRIC, null, 0.4, 6, Abilities.STATIC, Abilities.NONE, Abilities.LIGHTNING_ROD, 320, 35, 55, 40, 50, 50, 90, 190, 50, 112, true, null, true),
-      new PokemonForm("Partner", "partner", Type.ELECTRIC, null, 0.4, 6, Abilities.STATIC, Abilities.NONE, Abilities.LIGHTNING_ROD, 430, 45, 80, 50, 75, 60, 120, 190, 50, 112, true, null, true),
-      new PokemonForm("Cosplay", "cosplay", Type.ELECTRIC, null, 0.4, 6, Abilities.STATIC, Abilities.NONE, Abilities.LIGHTNING_ROD, 430, 45, 80, 50, 75, 60, 120, 190, 50, 112, true, null, true), //Custom
-      new PokemonForm("Cool Cosplay", "cool-cosplay", Type.ELECTRIC, null, 0.4, 6, Abilities.STATIC, Abilities.NONE, Abilities.LIGHTNING_ROD, 430, 45, 80, 50, 75, 60, 120, 190, 50, 112, true, null, true), //Custom
-      new PokemonForm("Beauty Cosplay", "beauty-cosplay", Type.ELECTRIC, null, 0.4, 6, Abilities.STATIC, Abilities.NONE, Abilities.LIGHTNING_ROD, 430, 45, 80, 50, 75, 60, 120, 190, 50, 112, true, null, true), //Custom
-      new PokemonForm("Cute Cosplay", "cute-cosplay", Type.ELECTRIC, null, 0.4, 6, Abilities.STATIC, Abilities.NONE, Abilities.LIGHTNING_ROD, 430, 45, 80, 50, 75, 60, 120, 190, 50, 112, true, null, true), //Custom
-      new PokemonForm("Smart Cosplay", "smart-cosplay", Type.ELECTRIC, null, 0.4, 6, Abilities.STATIC, Abilities.NONE, Abilities.LIGHTNING_ROD, 430, 45, 80, 50, 75, 60, 120, 190, 50, 112, true, null, true), //Custom
-      new PokemonForm("Tough Cosplay", "tough-cosplay", Type.ELECTRIC, null, 0.4, 6, Abilities.STATIC, Abilities.NONE, Abilities.LIGHTNING_ROD, 430, 45, 80, 50, 75, 60, 120, 190, 50, 112, true, null, true), //Custom
-      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.ELECTRIC, null, 21, 999.9, Abilities.LIGHTNING_ROD, Abilities.NONE, Abilities.LIGHTNING_ROD, 530, 125, 95, 60, 90, 70, 90, 190, 50, 112), //+100 BST from Partner Form
-    ),
-    new PokemonSpecies(Species.RAICHU, 1, false, false, false, "Mouse Pokémon", Type.ELECTRIC, null, 0.8, 30, Abilities.STATIC, Abilities.NONE, Abilities.LIGHTNING_ROD, 485, 60, 90, 55, 90, 80, 110, 75, 50, 243, GrowthRate.MEDIUM_FAST, 50, true),
-    new PokemonSpecies(Species.SANDSHREW, 1, false, false, false, "Mouse Pokémon", Type.GROUND, null, 0.6, 12, Abilities.SAND_VEIL, Abilities.NONE, Abilities.SAND_RUSH, 300, 50, 75, 85, 20, 30, 40, 255, 50, 60, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.SANDSLASH, 1, false, false, false, "Mouse Pokémon", Type.GROUND, null, 1, 29.5, Abilities.SAND_VEIL, Abilities.NONE, Abilities.SAND_RUSH, 450, 75, 100, 110, 45, 55, 65, 90, 50, 158, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.NIDORAN_F, 1, false, false, false, "Poison Pin Pokémon", Type.POISON, null, 0.4, 7, Abilities.POISON_POINT, Abilities.RIVALRY, Abilities.HUSTLE, 275, 55, 47, 52, 40, 40, 41, 235, 50, 55, GrowthRate.MEDIUM_SLOW, 0, false),
-    new PokemonSpecies(Species.NIDORINA, 1, false, false, false, "Poison Pin Pokémon", Type.POISON, null, 0.8, 20, Abilities.POISON_POINT, Abilities.RIVALRY, Abilities.HUSTLE, 365, 70, 62, 67, 55, 55, 56, 120, 50, 128, GrowthRate.MEDIUM_SLOW, 0, false),
-    new PokemonSpecies(Species.NIDOQUEEN, 1, false, false, false, "Drill Pokémon", Type.POISON, Type.GROUND, 1.3, 60, Abilities.POISON_POINT, Abilities.RIVALRY, Abilities.SHEER_FORCE, 505, 90, 92, 87, 75, 85, 76, 45, 50, 253, GrowthRate.MEDIUM_SLOW, 0, false),
-    new PokemonSpecies(Species.NIDORAN_M, 1, false, false, false, "Poison Pin Pokémon", Type.POISON, null, 0.5, 9, Abilities.POISON_POINT, Abilities.RIVALRY, Abilities.HUSTLE, 273, 46, 57, 40, 40, 40, 50, 235, 50, 55, GrowthRate.MEDIUM_SLOW, 100, false),
-    new PokemonSpecies(Species.NIDORINO, 1, false, false, false, "Poison Pin Pokémon", Type.POISON, null, 0.9, 19.5, Abilities.POISON_POINT, Abilities.RIVALRY, Abilities.HUSTLE, 365, 61, 72, 57, 55, 55, 65, 120, 50, 128, GrowthRate.MEDIUM_SLOW, 100, false),
-    new PokemonSpecies(Species.NIDOKING, 1, false, false, false, "Drill Pokémon", Type.POISON, Type.GROUND, 1.4, 62, Abilities.POISON_POINT, Abilities.RIVALRY, Abilities.SHEER_FORCE, 505, 81, 102, 77, 85, 75, 85, 45, 50, 253, GrowthRate.MEDIUM_SLOW, 100, false),
-    new PokemonSpecies(Species.CLEFAIRY, 1, false, false, false, "Fairy Pokémon", Type.FAIRY, null, 0.6, 7.5, Abilities.CUTE_CHARM, Abilities.MAGIC_GUARD, Abilities.FRIEND_GUARD, 323, 70, 45, 48, 60, 65, 35, 150, 140, 113, GrowthRate.FAST, 25, false),
-    new PokemonSpecies(Species.CLEFABLE, 1, false, false, false, "Fairy Pokémon", Type.FAIRY, null, 1.3, 40, Abilities.CUTE_CHARM, Abilities.MAGIC_GUARD, Abilities.UNAWARE, 483, 95, 70, 73, 95, 90, 60, 25, 140, 242, GrowthRate.FAST, 25, false),
-    new PokemonSpecies(Species.VULPIX, 1, false, false, false, "Fox Pokémon", Type.FIRE, null, 0.6, 9.9, Abilities.FLASH_FIRE, Abilities.NONE, Abilities.DROUGHT, 299, 38, 41, 40, 50, 65, 65, 190, 50, 60, GrowthRate.MEDIUM_FAST, 25, false),
-    new PokemonSpecies(Species.NINETALES, 1, false, false, false, "Fox Pokémon", Type.FIRE, null, 1.1, 19.9, Abilities.FLASH_FIRE, Abilities.NONE, Abilities.DROUGHT, 505, 73, 76, 75, 81, 100, 100, 75, 50, 177, GrowthRate.MEDIUM_FAST, 25, false),
-    new PokemonSpecies(Species.JIGGLYPUFF, 1, false, false, false, "Balloon Pokémon", Type.NORMAL, Type.FAIRY, 0.5, 5.5, Abilities.CUTE_CHARM, Abilities.COMPETITIVE, Abilities.FRIEND_GUARD, 270, 115, 45, 20, 45, 25, 20, 170, 50, 95, GrowthRate.FAST, 25, false),
-    new PokemonSpecies(Species.WIGGLYTUFF, 1, false, false, false, "Balloon Pokémon", Type.NORMAL, Type.FAIRY, 1, 12, Abilities.CUTE_CHARM, Abilities.COMPETITIVE, Abilities.FRISK, 435, 140, 70, 45, 85, 50, 45, 50, 50, 218, GrowthRate.FAST, 25, false),
-    new PokemonSpecies(Species.ZUBAT, 1, false, false, false, "Bat Pokémon", Type.POISON, Type.FLYING, 0.8, 7.5, Abilities.INNER_FOCUS, Abilities.NONE, Abilities.INFILTRATOR, 245, 40, 45, 35, 30, 40, 55, 255, 50, 49, GrowthRate.MEDIUM_FAST, 50, true),
-    new PokemonSpecies(Species.GOLBAT, 1, false, false, false, "Bat Pokémon", Type.POISON, Type.FLYING, 1.6, 55, Abilities.INNER_FOCUS, Abilities.NONE, Abilities.INFILTRATOR, 455, 75, 80, 70, 65, 75, 90, 90, 50, 159, GrowthRate.MEDIUM_FAST, 50, true),
-    new PokemonSpecies(Species.ODDISH, 1, false, false, false, "Weed Pokémon", Type.GRASS, Type.POISON, 0.5, 5.4, Abilities.CHLOROPHYLL, Abilities.NONE, Abilities.RUN_AWAY, 320, 45, 50, 55, 75, 65, 30, 255, 50, 64, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.GLOOM, 1, false, false, false, "Weed Pokémon", Type.GRASS, Type.POISON, 0.8, 8.6, Abilities.CHLOROPHYLL, Abilities.NONE, Abilities.STENCH, 395, 60, 65, 70, 85, 75, 40, 120, 50, 138, GrowthRate.MEDIUM_SLOW, 50, true),
-    new PokemonSpecies(Species.VILEPLUME, 1, false, false, false, "Flower Pokémon", Type.GRASS, Type.POISON, 1.2, 18.6, Abilities.CHLOROPHYLL, Abilities.NONE, Abilities.EFFECT_SPORE, 490, 75, 80, 85, 110, 90, 50, 45, 50, 245, GrowthRate.MEDIUM_SLOW, 50, true),
-    new PokemonSpecies(Species.PARAS, 1, false, false, false, "Mushroom Pokémon", Type.BUG, Type.GRASS, 0.3, 5.4, Abilities.EFFECT_SPORE, Abilities.DRY_SKIN, Abilities.DAMP, 285, 35, 70, 55, 45, 55, 25, 190, 70, 57, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.PARASECT, 1, false, false, false, "Mushroom Pokémon", Type.BUG, Type.GRASS, 1, 29.5, Abilities.EFFECT_SPORE, Abilities.DRY_SKIN, Abilities.DAMP, 405, 60, 95, 80, 60, 80, 30, 75, 70, 142, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.VENONAT, 1, false, false, false, "Insect Pokémon", Type.BUG, Type.POISON, 1, 30, Abilities.COMPOUND_EYES, Abilities.TINTED_LENS, Abilities.RUN_AWAY, 305, 60, 55, 50, 40, 55, 45, 190, 70, 61, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.VENOMOTH, 1, false, false, false, "Poison Moth Pokémon", Type.BUG, Type.POISON, 1.5, 12.5, Abilities.SHIELD_DUST, Abilities.TINTED_LENS, Abilities.WONDER_SKIN, 450, 70, 65, 60, 90, 75, 90, 75, 70, 158, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.DIGLETT, 1, false, false, false, "Mole Pokémon", Type.GROUND, null, 0.2, 0.8, Abilities.SAND_VEIL, Abilities.ARENA_TRAP, Abilities.SAND_FORCE, 265, 10, 55, 25, 35, 45, 95, 255, 50, 53, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.DUGTRIO, 1, false, false, false, "Mole Pokémon", Type.GROUND, null, 0.7, 33.3, Abilities.SAND_VEIL, Abilities.ARENA_TRAP, Abilities.SAND_FORCE, 425, 35, 100, 50, 50, 70, 120, 50, 50, 149, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.MEOWTH, 1, false, false, false, "Scratch Cat Pokémon", Type.NORMAL, null, 0.4, 4.2, Abilities.PICKUP, Abilities.TECHNICIAN, Abilities.UNNERVE, 290, 40, 45, 35, 40, 40, 90, 255, 50, 58, GrowthRate.MEDIUM_FAST, 50, false, true,
-      new PokemonForm("Normal", "", Type.NORMAL, null, 0.4, 4.2, Abilities.PICKUP, Abilities.TECHNICIAN, Abilities.UNNERVE, 290, 40, 45, 35, 40, 40, 90, 255, 50, 58, false, null, true),
-      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.NORMAL, null, 33, 999.9, Abilities.TECHNICIAN, Abilities.TECHNICIAN, Abilities.TECHNICIAN, 540, 115, 110, 65, 65, 70, 115, 255, 50, 58), //+100 BST from Persian
-    ),
-    new PokemonSpecies(Species.PERSIAN, 1, false, false, false, "Classy Cat Pokémon", Type.NORMAL, null, 1, 32, Abilities.LIMBER, Abilities.TECHNICIAN, Abilities.UNNERVE, 440, 65, 70, 60, 65, 65, 115, 90, 50, 154, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.PSYDUCK, 1, false, false, false, "Duck Pokémon", Type.WATER, null, 0.8, 19.6, Abilities.DAMP, Abilities.CLOUD_NINE, Abilities.SWIFT_SWIM, 320, 50, 52, 48, 65, 50, 55, 190, 50, 64, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.GOLDUCK, 1, false, false, false, "Duck Pokémon", Type.WATER, null, 1.7, 76.6, Abilities.DAMP, Abilities.CLOUD_NINE, Abilities.SWIFT_SWIM, 500, 80, 82, 78, 95, 80, 85, 75, 50, 175, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.MANKEY, 1, false, false, false, "Pig Monkey Pokémon", Type.FIGHTING, null, 0.5, 28, Abilities.VITAL_SPIRIT, Abilities.ANGER_POINT, Abilities.DEFIANT, 305, 40, 80, 35, 35, 45, 70, 190, 70, 61, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.PRIMEAPE, 1, false, false, false, "Pig Monkey Pokémon", Type.FIGHTING, null, 1, 32, Abilities.VITAL_SPIRIT, Abilities.ANGER_POINT, Abilities.DEFIANT, 455, 65, 105, 60, 60, 70, 95, 75, 70, 159, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.GROWLITHE, 1, false, false, false, "Puppy Pokémon", Type.FIRE, null, 0.7, 19, Abilities.INTIMIDATE, Abilities.FLASH_FIRE, Abilities.JUSTIFIED, 350, 55, 70, 45, 70, 50, 60, 190, 50, 70, GrowthRate.SLOW, 75, false),
-    new PokemonSpecies(Species.ARCANINE, 1, false, false, false, "Legendary Pokémon", Type.FIRE, null, 1.9, 155, Abilities.INTIMIDATE, Abilities.FLASH_FIRE, Abilities.JUSTIFIED, 555, 90, 110, 80, 100, 80, 95, 75, 50, 194, GrowthRate.SLOW, 75, false),
-    new PokemonSpecies(Species.POLIWAG, 1, false, false, false, "Tadpole Pokémon", Type.WATER, null, 0.6, 12.4, Abilities.WATER_ABSORB, Abilities.DAMP, Abilities.SWIFT_SWIM, 300, 40, 50, 40, 40, 40, 90, 255, 50, 60, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.POLIWHIRL, 1, false, false, false, "Tadpole Pokémon", Type.WATER, null, 1, 20, Abilities.WATER_ABSORB, Abilities.DAMP, Abilities.SWIFT_SWIM, 385, 65, 65, 65, 50, 50, 90, 120, 50, 135, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.POLIWRATH, 1, false, false, false, "Tadpole Pokémon", Type.WATER, Type.FIGHTING, 1.3, 54, Abilities.WATER_ABSORB, Abilities.DAMP, Abilities.SWIFT_SWIM, 510, 90, 95, 95, 70, 90, 70, 45, 50, 255, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.ABRA, 1, false, false, false, "Psi Pokémon", Type.PSYCHIC, null, 0.9, 19.5, Abilities.SYNCHRONIZE, Abilities.INNER_FOCUS, Abilities.MAGIC_GUARD, 310, 25, 20, 15, 105, 55, 90, 200, 50, 62, GrowthRate.MEDIUM_SLOW, 75, false),
-    new PokemonSpecies(Species.KADABRA, 1, false, false, false, "Psi Pokémon", Type.PSYCHIC, null, 1.3, 56.5, Abilities.SYNCHRONIZE, Abilities.INNER_FOCUS, Abilities.MAGIC_GUARD, 400, 40, 35, 30, 120, 70, 105, 100, 50, 140, GrowthRate.MEDIUM_SLOW, 75, true),
-    new PokemonSpecies(Species.ALAKAZAM, 1, false, false, false, "Psi Pokémon", Type.PSYCHIC, null, 1.5, 48, Abilities.SYNCHRONIZE, Abilities.INNER_FOCUS, Abilities.MAGIC_GUARD, 500, 55, 50, 45, 135, 95, 120, 50, 50, 250, GrowthRate.MEDIUM_SLOW, 75, true, true,
-      new PokemonForm("Normal", "", Type.PSYCHIC, null, 1.5, 48, Abilities.SYNCHRONIZE, Abilities.INNER_FOCUS, Abilities.MAGIC_GUARD, 500, 55, 50, 45, 135, 95, 120, 50, 50, 250, true, null, true),
-      new PokemonForm("Mega", SpeciesFormKey.MEGA, Type.PSYCHIC, null, 1.2, 48, Abilities.TRACE, Abilities.TRACE, Abilities.TRACE, 600, 55, 50, 65, 175, 105, 150, 50, 50, 250, true),
-    ),
-    new PokemonSpecies(Species.MACHOP, 1, false, false, false, "Superpower Pokémon", Type.FIGHTING, null, 0.8, 19.5, Abilities.GUTS, Abilities.NO_GUARD, Abilities.STEADFAST, 305, 70, 80, 50, 35, 35, 35, 180, 50, 61, GrowthRate.MEDIUM_SLOW, 75, false),
-    new PokemonSpecies(Species.MACHOKE, 1, false, false, false, "Superpower Pokémon", Type.FIGHTING, null, 1.5, 70.5, Abilities.GUTS, Abilities.NO_GUARD, Abilities.STEADFAST, 405, 80, 100, 70, 50, 60, 45, 90, 50, 142, GrowthRate.MEDIUM_SLOW, 75, false),
-    new PokemonSpecies(Species.MACHAMP, 1, false, false, false, "Superpower Pokémon", Type.FIGHTING, null, 1.6, 130, Abilities.GUTS, Abilities.NO_GUARD, Abilities.STEADFAST, 505, 90, 130, 80, 65, 85, 55, 45, 50, 253, GrowthRate.MEDIUM_SLOW, 75, false, true,
-      new PokemonForm("Normal", "", Type.FIGHTING, null, 1.6, 130, Abilities.GUTS, Abilities.NO_GUARD, Abilities.STEADFAST, 505, 90, 130, 80, 65, 85, 55, 45, 50, 253, false, null, true),
-      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.FIGHTING, null, 25, 999.9, Abilities.GUTS, Abilities.GUTS, Abilities.GUTS, 605, 115, 170, 95, 65, 95, 65, 45, 50, 253),
-    ),
-    new PokemonSpecies(Species.BELLSPROUT, 1, false, false, false, "Flower Pokémon", Type.GRASS, Type.POISON, 0.7, 4, Abilities.CHLOROPHYLL, Abilities.NONE, Abilities.GLUTTONY, 300, 50, 75, 35, 70, 30, 40, 255, 70, 60, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.WEEPINBELL, 1, false, false, false, "Flycatcher Pokémon", Type.GRASS, Type.POISON, 1, 6.4, Abilities.CHLOROPHYLL, Abilities.NONE, Abilities.GLUTTONY, 390, 65, 90, 50, 85, 45, 55, 120, 70, 137, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.VICTREEBEL, 1, false, false, false, "Flycatcher Pokémon", Type.GRASS, Type.POISON, 1.7, 15.5, Abilities.CHLOROPHYLL, Abilities.NONE, Abilities.GLUTTONY, 490, 80, 105, 65, 100, 70, 70, 45, 70, 245, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.TENTACOOL, 1, false, false, false, "Jellyfish Pokémon", Type.WATER, Type.POISON, 0.9, 45.5, Abilities.CLEAR_BODY, Abilities.LIQUID_OOZE, Abilities.RAIN_DISH, 335, 40, 40, 35, 50, 100, 70, 190, 50, 67, GrowthRate.SLOW, 50, false),
-    new PokemonSpecies(Species.TENTACRUEL, 1, false, false, false, "Jellyfish Pokémon", Type.WATER, Type.POISON, 1.6, 55, Abilities.CLEAR_BODY, Abilities.LIQUID_OOZE, Abilities.RAIN_DISH, 515, 80, 70, 65, 80, 120, 100, 60, 50, 180, GrowthRate.SLOW, 50, false),
-    new PokemonSpecies(Species.GEODUDE, 1, false, false, false, "Rock Pokémon", Type.ROCK, Type.GROUND, 0.4, 20, Abilities.ROCK_HEAD, Abilities.STURDY, Abilities.SAND_VEIL, 300, 40, 80, 100, 30, 30, 20, 255, 70, 60, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.GRAVELER, 1, false, false, false, "Rock Pokémon", Type.ROCK, Type.GROUND, 1, 105, Abilities.ROCK_HEAD, Abilities.STURDY, Abilities.SAND_VEIL, 390, 55, 95, 115, 45, 45, 35, 120, 70, 137, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.GOLEM, 1, false, false, false, "Megaton Pokémon", Type.ROCK, Type.GROUND, 1.4, 300, Abilities.ROCK_HEAD, Abilities.STURDY, Abilities.SAND_VEIL, 495, 80, 120, 130, 55, 65, 45, 45, 70, 248, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.PONYTA, 1, false, false, false, "Fire Horse Pokémon", Type.FIRE, null, 1, 30, Abilities.RUN_AWAY, Abilities.FLASH_FIRE, Abilities.FLAME_BODY, 410, 50, 85, 55, 65, 65, 90, 190, 50, 82, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.RAPIDASH, 1, false, false, false, "Fire Horse Pokémon", Type.FIRE, null, 1.7, 95, Abilities.RUN_AWAY, Abilities.FLASH_FIRE, Abilities.FLAME_BODY, 500, 65, 100, 70, 80, 80, 105, 60, 50, 175, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.SLOWPOKE, 1, false, false, false, "Dopey Pokémon", Type.WATER, Type.PSYCHIC, 1.2, 36, Abilities.OBLIVIOUS, Abilities.OWN_TEMPO, Abilities.REGENERATOR, 315, 90, 65, 65, 40, 40, 15, 190, 50, 63, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.SLOWBRO, 1, false, false, false, "Hermit Crab Pokémon", Type.WATER, Type.PSYCHIC, 1.6, 78.5, Abilities.OBLIVIOUS, Abilities.OWN_TEMPO, Abilities.REGENERATOR, 490, 95, 75, 110, 100, 80, 30, 75, 50, 172, GrowthRate.MEDIUM_FAST, 50, false, true,
-      new PokemonForm("Normal", "", Type.WATER, Type.PSYCHIC, 1.6, 78.5, Abilities.OBLIVIOUS, Abilities.OWN_TEMPO, Abilities.REGENERATOR, 490, 95, 75, 110, 100, 80, 30, 75, 50, 172, false, null, true),
-      new PokemonForm("Mega", SpeciesFormKey.MEGA, Type.WATER, Type.PSYCHIC, 2, 120, Abilities.SHELL_ARMOR, Abilities.SHELL_ARMOR, Abilities.SHELL_ARMOR, 590, 95, 75, 180, 130, 80, 30, 75, 50, 172),
-    ),
-    new PokemonSpecies(Species.MAGNEMITE, 1, false, false, false, "Magnet Pokémon", Type.ELECTRIC, Type.STEEL, 0.3, 6, Abilities.MAGNET_PULL, Abilities.STURDY, Abilities.ANALYTIC, 325, 25, 35, 70, 95, 55, 45, 190, 50, 65, GrowthRate.MEDIUM_FAST, null, false),
-    new PokemonSpecies(Species.MAGNETON, 1, false, false, false, "Magnet Pokémon", Type.ELECTRIC, Type.STEEL, 1, 60, Abilities.MAGNET_PULL, Abilities.STURDY, Abilities.ANALYTIC, 465, 50, 60, 95, 120, 70, 70, 60, 50, 163, GrowthRate.MEDIUM_FAST, null, false),
-    new PokemonSpecies(Species.FARFETCHD, 1, false, false, false, "Wild Duck Pokémon", Type.NORMAL, Type.FLYING, 0.8, 15, Abilities.KEEN_EYE, Abilities.INNER_FOCUS, Abilities.DEFIANT, 377, 52, 90, 55, 58, 62, 60, 45, 50, 132, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.DODUO, 1, false, false, false, "Twin Bird Pokémon", Type.NORMAL, Type.FLYING, 1.4, 39.2, Abilities.RUN_AWAY, Abilities.EARLY_BIRD, Abilities.TANGLED_FEET, 310, 35, 85, 45, 35, 35, 75, 190, 70, 62, GrowthRate.MEDIUM_FAST, 50, true),
-    new PokemonSpecies(Species.DODRIO, 1, false, false, false, "Triple Bird Pokémon", Type.NORMAL, Type.FLYING, 1.8, 85.2, Abilities.RUN_AWAY, Abilities.EARLY_BIRD, Abilities.TANGLED_FEET, 470, 60, 110, 70, 60, 60, 110, 45, 70, 165, GrowthRate.MEDIUM_FAST, 50, true),
-    new PokemonSpecies(Species.SEEL, 1, false, false, false, "Sea Lion Pokémon", Type.WATER, null, 1.1, 90, Abilities.THICK_FAT, Abilities.HYDRATION, Abilities.ICE_BODY, 325, 65, 45, 55, 45, 70, 45, 190, 70, 65, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.DEWGONG, 1, false, false, false, "Sea Lion Pokémon", Type.WATER, Type.ICE, 1.7, 120, Abilities.THICK_FAT, Abilities.HYDRATION, Abilities.ICE_BODY, 475, 90, 70, 80, 70, 95, 70, 75, 70, 166, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.GRIMER, 1, false, false, false, "Sludge Pokémon", Type.POISON, null, 0.9, 30, Abilities.STENCH, Abilities.STICKY_HOLD, Abilities.POISON_TOUCH, 325, 80, 80, 50, 40, 50, 25, 190, 70, 65, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.MUK, 1, false, false, false, "Sludge Pokémon", Type.POISON, null, 1.2, 30, Abilities.STENCH, Abilities.STICKY_HOLD, Abilities.POISON_TOUCH, 500, 105, 105, 75, 65, 100, 50, 75, 70, 175, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.SHELLDER, 1, false, false, false, "Bivalve Pokémon", Type.WATER, null, 0.3, 4, Abilities.SHELL_ARMOR, Abilities.SKILL_LINK, Abilities.OVERCOAT, 305, 30, 65, 100, 45, 25, 40, 190, 50, 61, GrowthRate.SLOW, 50, false),
-    new PokemonSpecies(Species.CLOYSTER, 1, false, false, false, "Bivalve Pokémon", Type.WATER, Type.ICE, 1.5, 132.5, Abilities.SHELL_ARMOR, Abilities.SKILL_LINK, Abilities.OVERCOAT, 525, 50, 95, 180, 85, 45, 70, 60, 50, 184, GrowthRate.SLOW, 50, false),
-    new PokemonSpecies(Species.GASTLY, 1, false, false, false, "Gas Pokémon", Type.GHOST, Type.POISON, 1.3, 0.1, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 310, 30, 35, 30, 100, 35, 80, 190, 50, 62, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.HAUNTER, 1, false, false, false, "Gas Pokémon", Type.GHOST, Type.POISON, 1.6, 0.1, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 405, 45, 50, 45, 115, 55, 95, 90, 50, 142, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.GENGAR, 1, false, false, false, "Shadow Pokémon", Type.GHOST, Type.POISON, 1.5, 40.5, Abilities.CURSED_BODY, Abilities.NONE, Abilities.NONE, 500, 60, 65, 60, 130, 75, 110, 45, 50, 250, GrowthRate.MEDIUM_SLOW, 50, false, true,
-      new PokemonForm("Normal", "", Type.GHOST, Type.POISON, 1.5, 40.5, Abilities.CURSED_BODY, Abilities.NONE, Abilities.NONE, 500, 60, 65, 60, 130, 75, 110, 45, 50, 250, false, null, true),
-      new PokemonForm("Mega", SpeciesFormKey.MEGA, Type.GHOST, Type.POISON, 1.4, 40.5, Abilities.SHADOW_TAG, Abilities.NONE, Abilities.NONE, 600, 60, 65, 80, 170, 95, 130, 45, 50, 250),
-      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.GHOST, Type.POISON, 20, 999.9, Abilities.CURSED_BODY, Abilities.NONE, Abilities.NONE, 600, 140, 65, 70, 140, 85, 100, 45, 50, 250),
-    ),
-    new PokemonSpecies(Species.ONIX, 1, false, false, false, "Rock Snake Pokémon", Type.ROCK, Type.GROUND, 8.8, 210, Abilities.ROCK_HEAD, Abilities.STURDY, Abilities.WEAK_ARMOR, 385, 35, 45, 160, 30, 45, 70, 45, 50, 77, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.DROWZEE, 1, false, false, false, "Hypnosis Pokémon", Type.PSYCHIC, null, 1, 32.4, Abilities.INSOMNIA, Abilities.FOREWARN, Abilities.INNER_FOCUS, 328, 60, 48, 45, 43, 90, 42, 190, 70, 66, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.HYPNO, 1, false, false, false, "Hypnosis Pokémon", Type.PSYCHIC, null, 1.6, 75.6, Abilities.INSOMNIA, Abilities.FOREWARN, Abilities.INNER_FOCUS, 483, 85, 73, 70, 73, 115, 67, 75, 70, 169, GrowthRate.MEDIUM_FAST, 50, true),
-    new PokemonSpecies(Species.KRABBY, 1, false, false, false, "River Crab Pokémon", Type.WATER, null, 0.4, 6.5, Abilities.HYPER_CUTTER, Abilities.SHELL_ARMOR, Abilities.SHEER_FORCE, 325, 30, 105, 90, 25, 25, 50, 225, 50, 65, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.KINGLER, 1, false, false, false, "Pincer Pokémon", Type.WATER, null, 1.3, 60, Abilities.HYPER_CUTTER, Abilities.SHELL_ARMOR, Abilities.SHEER_FORCE, 475, 55, 130, 115, 50, 50, 75, 60, 50, 166, GrowthRate.MEDIUM_FAST, 50, false, true,
-      new PokemonForm("Normal", "", Type.WATER, null, 1.3, 60, Abilities.HYPER_CUTTER, Abilities.SHELL_ARMOR, Abilities.SHEER_FORCE, 475, 55, 130, 115, 50, 50, 75, 60, 50, 166, false, null, true),
-      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.WATER, null, 19, 999.9, Abilities.TOUGH_CLAWS, Abilities.TOUGH_CLAWS, Abilities.TOUGH_CLAWS, 575, 90, 155, 140, 50, 70, 70, 60, 50, 166),
-    ),
-    new PokemonSpecies(Species.VOLTORB, 1, false, false, false, "Ball Pokémon", Type.ELECTRIC, null, 0.5, 10.4, Abilities.SOUNDPROOF, Abilities.STATIC, Abilities.AFTERMATH, 330, 40, 30, 50, 55, 55, 100, 190, 70, 66, GrowthRate.MEDIUM_FAST, null, false),
-    new PokemonSpecies(Species.ELECTRODE, 1, false, false, false, "Ball Pokémon", Type.ELECTRIC, null, 1.2, 66.6, Abilities.SOUNDPROOF, Abilities.STATIC, Abilities.AFTERMATH, 490, 60, 50, 70, 80, 80, 150, 60, 70, 172, GrowthRate.MEDIUM_FAST, null, false),
-    new PokemonSpecies(Species.EXEGGCUTE, 1, false, false, false, "Egg Pokémon", Type.GRASS, Type.PSYCHIC, 0.4, 2.5, Abilities.CHLOROPHYLL, Abilities.NONE, Abilities.HARVEST, 325, 60, 40, 80, 60, 45, 40, 90, 50, 65, GrowthRate.SLOW, 50, false),
-    new PokemonSpecies(Species.EXEGGUTOR, 1, false, false, false, "Coconut Pokémon", Type.GRASS, Type.PSYCHIC, 2, 120, Abilities.CHLOROPHYLL, Abilities.NONE, Abilities.HARVEST, 530, 95, 95, 85, 125, 75, 55, 45, 50, 186, GrowthRate.SLOW, 50, false),
-    new PokemonSpecies(Species.CUBONE, 1, false, false, false, "Lonely Pokémon", Type.GROUND, null, 0.4, 6.5, Abilities.ROCK_HEAD, Abilities.LIGHTNING_ROD, Abilities.BATTLE_ARMOR, 320, 50, 50, 95, 40, 50, 35, 190, 50, 64, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.MAROWAK, 1, false, false, false, "Bone Keeper Pokémon", Type.GROUND, null, 1, 45, Abilities.ROCK_HEAD, Abilities.LIGHTNING_ROD, Abilities.BATTLE_ARMOR, 425, 60, 80, 110, 50, 80, 45, 75, 50, 149, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.HITMONLEE, 1, false, false, false, "Kicking Pokémon", Type.FIGHTING, null, 1.5, 49.8, Abilities.LIMBER, Abilities.RECKLESS, Abilities.UNBURDEN, 455, 50, 120, 53, 35, 110, 87, 45, 50, 159, GrowthRate.MEDIUM_FAST, 100, false),
-    new PokemonSpecies(Species.HITMONCHAN, 1, false, false, false, "Punching Pokémon", Type.FIGHTING, null, 1.4, 50.2, Abilities.KEEN_EYE, Abilities.IRON_FIST, Abilities.INNER_FOCUS, 455, 50, 105, 79, 35, 110, 76, 45, 50, 159, GrowthRate.MEDIUM_FAST, 100, false),
-    new PokemonSpecies(Species.LICKITUNG, 1, false, false, false, "Licking Pokémon", Type.NORMAL, null, 1.2, 65.5, Abilities.OWN_TEMPO, Abilities.OBLIVIOUS, Abilities.CLOUD_NINE, 385, 90, 55, 75, 60, 75, 30, 45, 50, 77, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.KOFFING, 1, false, false, false, "Poison Gas Pokémon", Type.POISON, null, 0.6, 1, Abilities.LEVITATE, Abilities.NEUTRALIZING_GAS, Abilities.STENCH, 340, 40, 65, 95, 60, 45, 35, 190, 50, 68, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.WEEZING, 1, false, false, false, "Poison Gas Pokémon", Type.POISON, null, 1.2, 9.5, Abilities.LEVITATE, Abilities.NEUTRALIZING_GAS, Abilities.STENCH, 490, 65, 90, 120, 85, 70, 60, 60, 50, 172, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.RHYHORN, 1, false, false, false, "Spikes Pokémon", Type.GROUND, Type.ROCK, 1, 115, Abilities.LIGHTNING_ROD, Abilities.ROCK_HEAD, Abilities.RECKLESS, 345, 80, 85, 95, 30, 30, 25, 120, 50, 69, GrowthRate.SLOW, 50, true),
-    new PokemonSpecies(Species.RHYDON, 1, false, false, false, "Drill Pokémon", Type.GROUND, Type.ROCK, 1.9, 120, Abilities.LIGHTNING_ROD, Abilities.ROCK_HEAD, Abilities.RECKLESS, 485, 105, 130, 120, 45, 45, 40, 60, 50, 170, GrowthRate.SLOW, 50, true),
-    new PokemonSpecies(Species.CHANSEY, 1, false, false, false, "Egg Pokémon", Type.NORMAL, null, 1.1, 34.6, Abilities.NATURAL_CURE, Abilities.SERENE_GRACE, Abilities.HEALER, 450, 250, 5, 5, 35, 105, 50, 30, 140, 395, GrowthRate.FAST, 0, false),
-    new PokemonSpecies(Species.TANGELA, 1, false, false, false, "Vine Pokémon", Type.GRASS, null, 1, 35, Abilities.CHLOROPHYLL, Abilities.LEAF_GUARD, Abilities.REGENERATOR, 435, 65, 55, 115, 100, 40, 60, 45, 50, 87, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.KANGASKHAN, 1, false, false, false, "Parent Pokémon", Type.NORMAL, null, 2.2, 80, Abilities.EARLY_BIRD, Abilities.SCRAPPY, Abilities.INNER_FOCUS, 490, 105, 95, 80, 40, 80, 90, 45, 50, 172, GrowthRate.MEDIUM_FAST, 0, false, true,
-      new PokemonForm("Normal", "", Type.NORMAL, null, 2.2, 80, Abilities.EARLY_BIRD, Abilities.SCRAPPY, Abilities.INNER_FOCUS, 490, 105, 95, 80, 40, 80, 90, 45, 50, 172, false, null, true),
-      new PokemonForm("Mega", SpeciesFormKey.MEGA, Type.NORMAL, null, 2.2, 100, Abilities.PARENTAL_BOND, Abilities.PARENTAL_BOND, Abilities.PARENTAL_BOND, 590, 105, 125, 100, 60, 100, 100, 45, 50, 172),
-    ),
-    new PokemonSpecies(Species.HORSEA, 1, false, false, false, "Dragon Pokémon", Type.WATER, null, 0.4, 8, Abilities.SWIFT_SWIM, Abilities.SNIPER, Abilities.DAMP, 295, 30, 40, 70, 70, 25, 60, 225, 50, 59, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.SEADRA, 1, false, false, false, "Dragon Pokémon", Type.WATER, null, 1.2, 25, Abilities.POISON_POINT, Abilities.SNIPER, Abilities.DAMP, 440, 55, 65, 95, 95, 45, 85, 75, 50, 154, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.GOLDEEN, 1, false, false, false, "Goldfish Pokémon", Type.WATER, null, 0.6, 15, Abilities.SWIFT_SWIM, Abilities.WATER_VEIL, Abilities.LIGHTNING_ROD, 320, 45, 67, 60, 35, 50, 63, 225, 50, 64, GrowthRate.MEDIUM_FAST, 50, true),
-    new PokemonSpecies(Species.SEAKING, 1, false, false, false, "Goldfish Pokémon", Type.WATER, null, 1.3, 39, Abilities.SWIFT_SWIM, Abilities.WATER_VEIL, Abilities.LIGHTNING_ROD, 450, 80, 92, 65, 65, 80, 68, 60, 50, 158, GrowthRate.MEDIUM_FAST, 50, true),
-    new PokemonSpecies(Species.STARYU, 1, false, false, false, "Star Shape Pokémon", Type.WATER, null, 0.8, 34.5, Abilities.ILLUMINATE, Abilities.NATURAL_CURE, Abilities.ANALYTIC, 340, 30, 45, 55, 70, 55, 85, 225, 50, 68, GrowthRate.SLOW, null, false),
-    new PokemonSpecies(Species.STARMIE, 1, false, false, false, "Mysterious Pokémon", Type.WATER, Type.PSYCHIC, 1.1, 80, Abilities.ILLUMINATE, Abilities.NATURAL_CURE, Abilities.ANALYTIC, 520, 60, 75, 85, 100, 85, 115, 60, 50, 182, GrowthRate.SLOW, null, false),
-    new PokemonSpecies(Species.MR_MIME, 1, false, false, false, "Barrier Pokémon", Type.PSYCHIC, Type.FAIRY, 1.3, 54.5, Abilities.SOUNDPROOF, Abilities.FILTER, Abilities.TECHNICIAN, 460, 40, 45, 65, 100, 120, 90, 45, 50, 161, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.SCYTHER, 1, false, false, false, "Mantis Pokémon", Type.BUG, Type.FLYING, 1.5, 56, Abilities.SWARM, Abilities.TECHNICIAN, Abilities.STEADFAST, 500, 70, 110, 80, 55, 80, 105, 45, 50, 100, GrowthRate.MEDIUM_FAST, 50, true),
-    new PokemonSpecies(Species.JYNX, 1, false, false, false, "Human Shape Pokémon", Type.ICE, Type.PSYCHIC, 1.4, 40.6, Abilities.OBLIVIOUS, Abilities.FOREWARN, Abilities.DRY_SKIN, 455, 65, 50, 35, 115, 95, 95, 45, 50, 159, GrowthRate.MEDIUM_FAST, 0, false),
-    new PokemonSpecies(Species.ELECTABUZZ, 1, false, false, false, "Electric Pokémon", Type.ELECTRIC, null, 1.1, 30, Abilities.STATIC, Abilities.NONE, Abilities.VITAL_SPIRIT, 490, 65, 83, 57, 95, 85, 105, 45, 50, 172, GrowthRate.MEDIUM_FAST, 75, false),
-    new PokemonSpecies(Species.MAGMAR, 1, false, false, false, "Spitfire Pokémon", Type.FIRE, null, 1.3, 44.5, Abilities.FLAME_BODY, Abilities.NONE, Abilities.VITAL_SPIRIT, 495, 65, 95, 57, 100, 85, 93, 45, 50, 173, GrowthRate.MEDIUM_FAST, 75, false),
-    new PokemonSpecies(Species.PINSIR, 1, false, false, false, "Stag Beetle Pokémon", Type.BUG, null, 1.5, 55, Abilities.HYPER_CUTTER, Abilities.MOLD_BREAKER, Abilities.MOXIE, 500, 65, 125, 100, 55, 70, 85, 45, 50, 175, GrowthRate.SLOW, 50, false, true,
-      new PokemonForm("Normal", "", Type.BUG, null, 1.5, 55, Abilities.HYPER_CUTTER, Abilities.MOLD_BREAKER, Abilities.MOXIE, 500, 65, 125, 100, 55, 70, 85, 45, 50, 175, false, null, true),
-      new PokemonForm("Mega", SpeciesFormKey.MEGA, Type.BUG, Type.FLYING, 1.7, 59, Abilities.AERILATE, Abilities.AERILATE, Abilities.AERILATE, 600, 65, 155, 120, 65, 90, 105, 45, 50, 175),
-    ),
-    new PokemonSpecies(Species.TAUROS, 1, false, false, false, "Wild Bull Pokémon", Type.NORMAL, null, 1.4, 88.4, Abilities.INTIMIDATE, Abilities.ANGER_POINT, Abilities.SHEER_FORCE, 490, 75, 100, 95, 40, 70, 110, 45, 50, 172, GrowthRate.SLOW, 100, false),
-    new PokemonSpecies(Species.MAGIKARP, 1, false, false, false, "Fish Pokémon", Type.WATER, null, 0.9, 10, Abilities.SWIFT_SWIM, Abilities.NONE, Abilities.RATTLED, 200, 20, 10, 55, 15, 20, 80, 255, 50, 40, GrowthRate.SLOW, 50, true),
-    new PokemonSpecies(Species.GYARADOS, 1, false, false, false, "Atrocious Pokémon", Type.WATER, Type.FLYING, 6.5, 235, Abilities.INTIMIDATE, Abilities.NONE, Abilities.MOXIE, 540, 95, 125, 79, 60, 100, 81, 45, 50, 189, GrowthRate.SLOW, 50, true, true,
-      new PokemonForm("Normal", "", Type.WATER, Type.FLYING, 6.5, 235, Abilities.INTIMIDATE, Abilities.NONE, Abilities.MOXIE, 540, 95, 125, 79, 60, 100, 81, 45, 50, 189, true, null, true),
-      new PokemonForm("Mega", SpeciesFormKey.MEGA, Type.WATER, Type.DARK, 6.5, 305, Abilities.MOLD_BREAKER, Abilities.MOLD_BREAKER, Abilities.MOLD_BREAKER, 640, 95, 155, 109, 70, 130, 81, 45, 50, 189, true),
-    ),
-    new PokemonSpecies(Species.LAPRAS, 1, false, false, false, "Transport Pokémon", Type.WATER, Type.ICE, 2.5, 220, Abilities.WATER_ABSORB, Abilities.SHELL_ARMOR, Abilities.HYDRATION, 535, 130, 85, 80, 85, 95, 60, 45, 50, 187, GrowthRate.SLOW, 50, false, true,
-      new PokemonForm("Normal", "", Type.WATER, Type.ICE, 2.5, 220, Abilities.WATER_ABSORB, Abilities.SHELL_ARMOR, Abilities.HYDRATION, 535, 130, 85, 80, 85, 95, 60, 45, 50, 187, false, null, true),
-      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.WATER, Type.ICE, 24, 999.9, Abilities.SHIELD_DUST, Abilities.SHIELD_DUST, Abilities.SHIELD_DUST, 635, 170, 85, 85, 105, 130, 60, 45, 50, 187),
-    ),
-    new PokemonSpecies(Species.DITTO, 1, false, false, false, "Transform Pokémon", Type.NORMAL, null, 0.3, 4, Abilities.LIMBER, Abilities.NONE, Abilities.IMPOSTER, 288, 48, 48, 48, 48, 48, 48, 35, 50, 101, GrowthRate.MEDIUM_FAST, null, false),
-    new PokemonSpecies(Species.EEVEE, 1, false, false, false, "Evolution Pokémon", Type.NORMAL, null, 0.3, 6.5, Abilities.RUN_AWAY, Abilities.ADAPTABILITY, Abilities.ANTICIPATION, 325, 55, 55, 50, 45, 65, 55, 45, 50, 65, GrowthRate.MEDIUM_FAST, 87.5, false, true,
-      new PokemonForm("Normal", "", Type.NORMAL, null, 0.3, 6.5, Abilities.RUN_AWAY, Abilities.ADAPTABILITY, Abilities.ANTICIPATION, 325, 55, 55, 50, 45, 65, 55, 45, 50, 65, false, null, true),
-      new PokemonForm("Partner", "partner", Type.NORMAL, null, 0.3, 6.5, Abilities.RUN_AWAY, Abilities.ADAPTABILITY, Abilities.ANTICIPATION, 435, 65, 75, 70, 65, 85, 75, 45, 50, 65, false, null, true),
-      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.NORMAL, null, 18, 999.9, Abilities.PROTEAN, Abilities.PROTEAN, Abilities.PROTEAN, 535, 110, 90, 70, 95, 85, 85, 45, 50, 65), //+100 BST from Partner Form
-    ),
-    new PokemonSpecies(Species.VAPOREON, 1, false, false, false, "Bubble Jet Pokémon", Type.WATER, null, 1, 29, Abilities.WATER_ABSORB, Abilities.NONE, Abilities.HYDRATION, 525, 130, 65, 60, 110, 95, 65, 45, 50, 184, GrowthRate.MEDIUM_FAST, 87.5, false),
-    new PokemonSpecies(Species.JOLTEON, 1, false, false, false, "Lightning Pokémon", Type.ELECTRIC, null, 0.8, 24.5, Abilities.VOLT_ABSORB, Abilities.NONE, Abilities.QUICK_FEET, 525, 65, 65, 60, 110, 95, 130, 45, 50, 184, GrowthRate.MEDIUM_FAST, 87.5, false),
-    new PokemonSpecies(Species.FLAREON, 1, false, false, false, "Flame Pokémon", Type.FIRE, null, 0.9, 25, Abilities.FLASH_FIRE, Abilities.NONE, Abilities.GUTS, 525, 65, 130, 60, 95, 110, 65, 45, 50, 184, GrowthRate.MEDIUM_FAST, 87.5, false),
-    new PokemonSpecies(Species.PORYGON, 1, false, false, false, "Virtual Pokémon", Type.NORMAL, null, 0.8, 36.5, Abilities.TRACE, Abilities.DOWNLOAD, Abilities.ANALYTIC, 395, 65, 60, 70, 85, 75, 40, 45, 50, 79, GrowthRate.MEDIUM_FAST, null, false),
-    new PokemonSpecies(Species.OMANYTE, 1, false, false, false, "Spiral Pokémon", Type.ROCK, Type.WATER, 0.4, 7.5, Abilities.SWIFT_SWIM, Abilities.SHELL_ARMOR, Abilities.WEAK_ARMOR, 355, 35, 40, 100, 90, 55, 35, 45, 50, 71, GrowthRate.MEDIUM_FAST, 87.5, false),
-    new PokemonSpecies(Species.OMASTAR, 1, false, false, false, "Spiral Pokémon", Type.ROCK, Type.WATER, 1, 35, Abilities.SWIFT_SWIM, Abilities.SHELL_ARMOR, Abilities.WEAK_ARMOR, 495, 70, 60, 125, 115, 70, 55, 45, 50, 173, GrowthRate.MEDIUM_FAST, 87.5, false),
-    new PokemonSpecies(Species.KABUTO, 1, false, false, false, "Shellfish Pokémon", Type.ROCK, Type.WATER, 0.5, 11.5, Abilities.SWIFT_SWIM, Abilities.BATTLE_ARMOR, Abilities.WEAK_ARMOR, 355, 30, 80, 90, 55, 45, 55, 45, 50, 71, GrowthRate.MEDIUM_FAST, 87.5, false),
-    new PokemonSpecies(Species.KABUTOPS, 1, false, false, false, "Shellfish Pokémon", Type.ROCK, Type.WATER, 1.3, 40.5, Abilities.SWIFT_SWIM, Abilities.BATTLE_ARMOR, Abilities.WEAK_ARMOR, 495, 60, 115, 105, 65, 70, 80, 45, 50, 173, GrowthRate.MEDIUM_FAST, 87.5, false),
-    new PokemonSpecies(Species.AERODACTYL, 1, false, false, false, "Fossil Pokémon", Type.ROCK, Type.FLYING, 1.8, 59, Abilities.ROCK_HEAD, Abilities.PRESSURE, Abilities.UNNERVE, 515, 80, 105, 65, 60, 75, 130, 45, 50, 180, GrowthRate.SLOW, 87.5, false, true,
-      new PokemonForm("Normal", "", Type.ROCK, Type.FLYING, 1.8, 59, Abilities.ROCK_HEAD, Abilities.PRESSURE, Abilities.UNNERVE, 515, 80, 105, 65, 60, 75, 130, 45, 50, 180, false, null, true),
-      new PokemonForm("Mega", SpeciesFormKey.MEGA, Type.ROCK, Type.FLYING, 2.1, 79, Abilities.TOUGH_CLAWS, Abilities.TOUGH_CLAWS, Abilities.TOUGH_CLAWS, 615, 80, 135, 85, 70, 95, 150, 45, 50, 180),
-    ),
-    new PokemonSpecies(Species.SNORLAX, 1, false, false, false, "Sleeping Pokémon", Type.NORMAL, null, 2.1, 460, Abilities.IMMUNITY, Abilities.THICK_FAT, Abilities.GLUTTONY, 540, 160, 110, 65, 65, 110, 30, 25, 50, 189, GrowthRate.SLOW, 87.5, false, true,
-      new PokemonForm("Normal", "", Type.NORMAL, null, 2.1, 460, Abilities.IMMUNITY, Abilities.THICK_FAT, Abilities.GLUTTONY, 540, 160, 110, 65, 65, 110, 30, 25, 50, 189, false, null, true),
-      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.NORMAL, null, 35, 999.9, Abilities.HARVEST, Abilities.HARVEST, Abilities.HARVEST, 640, 200, 135, 80, 80, 125, 20, 25, 50, 189),
-    ),
-    new PokemonSpecies(Species.ARTICUNO, 1, true, false, false, "Freeze Pokémon", Type.ICE, Type.FLYING, 1.7, 55.4, Abilities.PRESSURE, Abilities.NONE, Abilities.SNOW_CLOAK, 580, 90, 85, 100, 95, 125, 85, 3, 35, 290, GrowthRate.SLOW, null, false),
-    new PokemonSpecies(Species.ZAPDOS, 1, true, false, false, "Electric Pokémon", Type.ELECTRIC, Type.FLYING, 1.6, 52.6, Abilities.PRESSURE, Abilities.NONE, Abilities.STATIC, 580, 90, 90, 85, 125, 90, 100, 3, 35, 290, GrowthRate.SLOW, null, false),
-    new PokemonSpecies(Species.MOLTRES, 1, true, false, false, "Flame Pokémon", Type.FIRE, Type.FLYING, 2, 60, Abilities.PRESSURE, Abilities.NONE, Abilities.FLAME_BODY, 580, 90, 100, 90, 125, 85, 90, 3, 35, 290, GrowthRate.SLOW, null, false),
-    new PokemonSpecies(Species.DRATINI, 1, false, false, false, "Dragon Pokémon", Type.DRAGON, null, 1.8, 3.3, Abilities.SHED_SKIN, Abilities.NONE, Abilities.MARVEL_SCALE, 300, 41, 64, 45, 50, 50, 50, 45, 35, 60, GrowthRate.SLOW, 50, false),
-    new PokemonSpecies(Species.DRAGONAIR, 1, false, false, false, "Dragon Pokémon", Type.DRAGON, null, 4, 16.5, Abilities.SHED_SKIN, Abilities.NONE, Abilities.MARVEL_SCALE, 420, 61, 84, 65, 70, 70, 70, 45, 35, 147, GrowthRate.SLOW, 50, false),
-    new PokemonSpecies(Species.DRAGONITE, 1, false, false, false, "Dragon Pokémon", Type.DRAGON, Type.FLYING, 2.2, 210, Abilities.INNER_FOCUS, Abilities.NONE, Abilities.MULTISCALE, 600, 91, 134, 95, 100, 100, 80, 45, 35, 300, GrowthRate.SLOW, 50, false),
-    new PokemonSpecies(Species.MEWTWO, 1, false, true, false, "Genetic Pokémon", Type.PSYCHIC, null, 2, 122, Abilities.PRESSURE, Abilities.NONE, Abilities.UNNERVE, 680, 106, 110, 90, 154, 90, 130, 3, 0, 340, GrowthRate.SLOW, null, false, true,
-      new PokemonForm("Normal", "", Type.PSYCHIC, null, 2, 122, Abilities.PRESSURE, Abilities.NONE, Abilities.UNNERVE, 680, 106, 110, 90, 154, 90, 130, 3, 0, 340, false, null, true),
-      new PokemonForm("Mega X", SpeciesFormKey.MEGA_X, Type.PSYCHIC, Type.FIGHTING, 2.3, 127, Abilities.STEADFAST, Abilities.NONE, Abilities.STEADFAST, 780, 106, 190, 100, 154, 100, 130, 3, 0, 340),
-      new PokemonForm("Mega Y", SpeciesFormKey.MEGA_Y, Type.PSYCHIC, null, 1.5, 33, Abilities.INSOMNIA, Abilities.NONE, Abilities.INSOMNIA, 780, 106, 150, 70, 194, 120, 140, 3, 0, 340),
-    ),
-    new PokemonSpecies(Species.MEW, 1, false, false, true, "New Species Pokémon", Type.PSYCHIC, null, 0.4, 4, Abilities.SYNCHRONIZE, Abilities.NONE, Abilities.NONE, 600, 100, 100, 100, 100, 100, 100, 45, 100, 300, GrowthRate.MEDIUM_SLOW, null, false),
-    new PokemonSpecies(Species.CHIKORITA, 2, false, false, false, "Leaf Pokémon", Type.GRASS, null, 0.9, 6.4, Abilities.OVERGROW, Abilities.NONE, Abilities.LEAF_GUARD, 318, 45, 49, 65, 49, 65, 45, 45, 70, 64, GrowthRate.MEDIUM_SLOW, 87.5, false),
-    new PokemonSpecies(Species.BAYLEEF, 2, false, false, false, "Leaf Pokémon", Type.GRASS, null, 1.2, 15.8, Abilities.OVERGROW, Abilities.NONE, Abilities.LEAF_GUARD, 405, 60, 62, 80, 63, 80, 60, 45, 70, 142, GrowthRate.MEDIUM_SLOW, 87.5, false),
-    new PokemonSpecies(Species.MEGANIUM, 2, false, false, false, "Herb Pokémon", Type.GRASS, null, 1.8, 100.5, Abilities.OVERGROW, Abilities.NONE, Abilities.LEAF_GUARD, 525, 80, 82, 100, 83, 100, 80, 45, 70, 263, GrowthRate.MEDIUM_SLOW, 87.5, true),
-    new PokemonSpecies(Species.CYNDAQUIL, 2, false, false, false, "Fire Mouse Pokémon", Type.FIRE, null, 0.5, 7.9, Abilities.BLAZE, Abilities.NONE, Abilities.FLASH_FIRE, 309, 39, 52, 43, 60, 50, 65, 45, 70, 62, GrowthRate.MEDIUM_SLOW, 87.5, false),
-    new PokemonSpecies(Species.QUILAVA, 2, false, false, false, "Volcano Pokémon", Type.FIRE, null, 0.9, 19, Abilities.BLAZE, Abilities.NONE, Abilities.FLASH_FIRE, 405, 58, 64, 58, 80, 65, 80, 45, 70, 142, GrowthRate.MEDIUM_SLOW, 87.5, false),
-    new PokemonSpecies(Species.TYPHLOSION, 2, false, false, false, "Volcano Pokémon", Type.FIRE, null, 1.7, 79.5, Abilities.BLAZE, Abilities.NONE, Abilities.FLASH_FIRE, 534, 78, 84, 78, 109, 85, 100, 45, 70, 267, GrowthRate.MEDIUM_SLOW, 87.5, false),
-    new PokemonSpecies(Species.TOTODILE, 2, false, false, false, "Big Jaw Pokémon", Type.WATER, null, 0.6, 9.5, Abilities.TORRENT, Abilities.NONE, Abilities.SHEER_FORCE, 314, 50, 65, 64, 44, 48, 43, 45, 70, 63, GrowthRate.MEDIUM_SLOW, 87.5, false),
-    new PokemonSpecies(Species.CROCONAW, 2, false, false, false, "Big Jaw Pokémon", Type.WATER, null, 1.1, 25, Abilities.TORRENT, Abilities.NONE, Abilities.SHEER_FORCE, 405, 65, 80, 80, 59, 63, 58, 45, 70, 142, GrowthRate.MEDIUM_SLOW, 87.5, false),
-    new PokemonSpecies(Species.FERALIGATR, 2, false, false, false, "Big Jaw Pokémon", Type.WATER, null, 2.3, 88.8, Abilities.TORRENT, Abilities.NONE, Abilities.SHEER_FORCE, 530, 85, 105, 100, 79, 83, 78, 45, 70, 265, GrowthRate.MEDIUM_SLOW, 87.5, false),
-    new PokemonSpecies(Species.SENTRET, 2, false, false, false, "Scout Pokémon", Type.NORMAL, null, 0.8, 6, Abilities.RUN_AWAY, Abilities.KEEN_EYE, Abilities.FRISK, 215, 35, 46, 34, 35, 45, 20, 255, 70, 43, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.FURRET, 2, false, false, false, "Long Body Pokémon", Type.NORMAL, null, 1.8, 32.5, Abilities.RUN_AWAY, Abilities.KEEN_EYE, Abilities.FRISK, 415, 85, 76, 64, 45, 55, 90, 90, 70, 145, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.HOOTHOOT, 2, false, false, false, "Owl Pokémon", Type.NORMAL, Type.FLYING, 0.7, 21.2, Abilities.INSOMNIA, Abilities.KEEN_EYE, Abilities.TINTED_LENS, 262, 60, 30, 30, 36, 56, 50, 255, 50, 52, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.NOCTOWL, 2, false, false, false, "Owl Pokémon", Type.NORMAL, Type.FLYING, 1.6, 40.8, Abilities.INSOMNIA, Abilities.KEEN_EYE, Abilities.TINTED_LENS, 452, 100, 50, 50, 86, 96, 70, 90, 50, 158, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.LEDYBA, 2, false, false, false, "Five Star Pokémon", Type.BUG, Type.FLYING, 1, 10.8, Abilities.SWARM, Abilities.EARLY_BIRD, Abilities.RATTLED, 265, 40, 20, 30, 40, 80, 55, 255, 70, 53, GrowthRate.FAST, 50, true),
-    new PokemonSpecies(Species.LEDIAN, 2, false, false, false, "Five Star Pokémon", Type.BUG, Type.FLYING, 1.4, 35.6, Abilities.SWARM, Abilities.EARLY_BIRD, Abilities.IRON_FIST, 390, 55, 35, 50, 55, 110, 85, 90, 70, 137, GrowthRate.FAST, 50, true),
-    new PokemonSpecies(Species.SPINARAK, 2, false, false, false, "String Spit Pokémon", Type.BUG, Type.POISON, 0.5, 8.5, Abilities.SWARM, Abilities.INSOMNIA, Abilities.SNIPER, 250, 40, 60, 40, 40, 40, 30, 255, 70, 50, GrowthRate.FAST, 50, false),
-    new PokemonSpecies(Species.ARIADOS, 2, false, false, false, "Long Leg Pokémon", Type.BUG, Type.POISON, 1.1, 33.5, Abilities.SWARM, Abilities.INSOMNIA, Abilities.SNIPER, 400, 70, 90, 70, 60, 70, 40, 90, 70, 140, GrowthRate.FAST, 50, false),
-    new PokemonSpecies(Species.CROBAT, 2, false, false, false, "Bat Pokémon", Type.POISON, Type.FLYING, 1.8, 75, Abilities.INNER_FOCUS, Abilities.NONE, Abilities.INFILTRATOR, 535, 85, 90, 80, 70, 80, 130, 90, 50, 268, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.CHINCHOU, 2, false, false, false, "Angler Pokémon", Type.WATER, Type.ELECTRIC, 0.5, 12, Abilities.VOLT_ABSORB, Abilities.ILLUMINATE, Abilities.WATER_ABSORB, 330, 75, 38, 38, 56, 56, 67, 190, 50, 66, GrowthRate.SLOW, 50, false),
-    new PokemonSpecies(Species.LANTURN, 2, false, false, false, "Light Pokémon", Type.WATER, Type.ELECTRIC, 1.2, 22.5, Abilities.VOLT_ABSORB, Abilities.ILLUMINATE, Abilities.WATER_ABSORB, 460, 125, 58, 58, 76, 76, 67, 75, 50, 161, GrowthRate.SLOW, 50, false),
-    new PokemonSpecies(Species.PICHU, 2, false, false, false, "Tiny Mouse Pokémon", Type.ELECTRIC, null, 0.3, 2, Abilities.STATIC, Abilities.NONE, Abilities.LIGHTNING_ROD, 205, 20, 40, 15, 35, 35, 60, 190, 70, 41, GrowthRate.MEDIUM_FAST, 50, false, false,
-      new PokemonForm("Normal", "", Type.ELECTRIC, null, 1.4, 61.5, Abilities.STATIC, Abilities.NONE, Abilities.LIGHTNING_ROD, 205, 20, 40, 15, 35, 35, 60, 190, 70, 41, false, null, true),
-      new PokemonForm("Spiky-Eared", "spiky", Type.ELECTRIC, null, 1.4, 61.5, Abilities.STATIC, Abilities.NONE, Abilities.LIGHTNING_ROD, 205, 20, 40, 15, 35, 35, 60, 190, 70, 41, false, null, true),
-    ),
-    new PokemonSpecies(Species.CLEFFA, 2, false, false, false, "Star Shape Pokémon", Type.FAIRY, null, 0.3, 3, Abilities.CUTE_CHARM, Abilities.MAGIC_GUARD, Abilities.FRIEND_GUARD, 218, 50, 25, 28, 45, 55, 15, 150, 140, 44, GrowthRate.FAST, 25, false),
-    new PokemonSpecies(Species.IGGLYBUFF, 2, false, false, false, "Balloon Pokémon", Type.NORMAL, Type.FAIRY, 0.3, 1, Abilities.CUTE_CHARM, Abilities.COMPETITIVE, Abilities.FRIEND_GUARD, 210, 90, 30, 15, 40, 20, 15, 170, 50, 42, GrowthRate.FAST, 25, false),
-    new PokemonSpecies(Species.TOGEPI, 2, false, false, false, "Spike Ball Pokémon", Type.FAIRY, null, 0.3, 1.5, Abilities.HUSTLE, Abilities.SERENE_GRACE, Abilities.SUPER_LUCK, 245, 35, 20, 65, 40, 65, 20, 190, 50, 49, GrowthRate.FAST, 87.5, false),
-    new PokemonSpecies(Species.TOGETIC, 2, false, false, false, "Happiness Pokémon", Type.FAIRY, Type.FLYING, 0.6, 3.2, Abilities.HUSTLE, Abilities.SERENE_GRACE, Abilities.SUPER_LUCK, 405, 55, 40, 85, 80, 105, 40, 75, 50, 142, GrowthRate.FAST, 87.5, false),
-    new PokemonSpecies(Species.NATU, 2, false, false, false, "Tiny Bird Pokémon", Type.PSYCHIC, Type.FLYING, 0.2, 2, Abilities.SYNCHRONIZE, Abilities.EARLY_BIRD, Abilities.MAGIC_BOUNCE, 320, 40, 50, 45, 70, 45, 70, 190, 50, 64, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.XATU, 2, false, false, false, "Mystic Pokémon", Type.PSYCHIC, Type.FLYING, 1.5, 15, Abilities.SYNCHRONIZE, Abilities.EARLY_BIRD, Abilities.MAGIC_BOUNCE, 470, 65, 75, 70, 95, 70, 95, 75, 50, 165, GrowthRate.MEDIUM_FAST, 50, true),
-    new PokemonSpecies(Species.MAREEP, 2, false, false, false, "Wool Pokémon", Type.ELECTRIC, null, 0.6, 7.8, Abilities.STATIC, Abilities.NONE, Abilities.PLUS, 280, 55, 40, 40, 65, 45, 35, 235, 70, 56, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.FLAAFFY, 2, false, false, false, "Wool Pokémon", Type.ELECTRIC, null, 0.8, 13.3, Abilities.STATIC, Abilities.NONE, Abilities.PLUS, 365, 70, 55, 55, 80, 60, 45, 120, 70, 128, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.AMPHAROS, 2, false, false, false, "Light Pokémon", Type.ELECTRIC, null, 1.4, 61.5, Abilities.STATIC, Abilities.NONE, Abilities.PLUS, 510, 90, 75, 85, 115, 90, 55, 45, 70, 255, GrowthRate.MEDIUM_SLOW, 50, false, true,
-      new PokemonForm("Normal", "", Type.ELECTRIC, null, 1.4, 61.5, Abilities.STATIC, Abilities.NONE, Abilities.PLUS, 510, 90, 75, 85, 115, 90, 55, 45, 70, 255, false, null, true),
-      new PokemonForm("Mega", SpeciesFormKey.MEGA, Type.ELECTRIC, Type.DRAGON, 1.4, 61.5, Abilities.MOLD_BREAKER, Abilities.NONE, Abilities.MOLD_BREAKER, 610, 90, 95, 105, 165, 110, 45, 45, 70, 255),
-    ),
-    new PokemonSpecies(Species.BELLOSSOM, 2, false, false, false, "Flower Pokémon", Type.GRASS, null, 0.4, 5.8, Abilities.CHLOROPHYLL, Abilities.NONE, Abilities.HEALER, 490, 75, 80, 95, 90, 100, 50, 45, 50, 245, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.MARILL, 2, false, false, false, "Aqua Mouse Pokémon", Type.WATER, Type.FAIRY, 0.4, 8.5, Abilities.THICK_FAT, Abilities.HUGE_POWER, Abilities.SAP_SIPPER, 250, 70, 20, 50, 20, 50, 40, 190, 50, 88, GrowthRate.FAST, 50, false),
-    new PokemonSpecies(Species.AZUMARILL, 2, false, false, false, "Aqua Rabbit Pokémon", Type.WATER, Type.FAIRY, 0.8, 28.5, Abilities.THICK_FAT, Abilities.HUGE_POWER, Abilities.SAP_SIPPER, 420, 100, 50, 80, 60, 80, 50, 75, 50, 210, GrowthRate.FAST, 50, false),
-    new PokemonSpecies(Species.SUDOWOODO, 2, false, false, false, "Imitation Pokémon", Type.ROCK, null, 1.2, 38, Abilities.STURDY, Abilities.ROCK_HEAD, Abilities.RATTLED, 410, 70, 100, 115, 30, 65, 30, 65, 50, 144, GrowthRate.MEDIUM_FAST, 50, true),
-    new PokemonSpecies(Species.POLITOED, 2, false, false, false, "Frog Pokémon", Type.WATER, null, 1.1, 33.9, Abilities.WATER_ABSORB, Abilities.DAMP, Abilities.DRIZZLE, 500, 90, 75, 75, 90, 100, 70, 45, 50, 250, GrowthRate.MEDIUM_SLOW, 50, true),
-    new PokemonSpecies(Species.HOPPIP, 2, false, false, false, "Cottonweed Pokémon", Type.GRASS, Type.FLYING, 0.4, 0.5, Abilities.CHLOROPHYLL, Abilities.LEAF_GUARD, Abilities.INFILTRATOR, 250, 35, 35, 40, 35, 55, 50, 255, 70, 50, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.SKIPLOOM, 2, false, false, false, "Cottonweed Pokémon", Type.GRASS, Type.FLYING, 0.6, 1, Abilities.CHLOROPHYLL, Abilities.LEAF_GUARD, Abilities.INFILTRATOR, 340, 55, 45, 50, 45, 65, 80, 120, 70, 119, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.JUMPLUFF, 2, false, false, false, "Cottonweed Pokémon", Type.GRASS, Type.FLYING, 0.8, 3, Abilities.CHLOROPHYLL, Abilities.LEAF_GUARD, Abilities.INFILTRATOR, 460, 75, 55, 70, 55, 95, 110, 45, 70, 230, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.AIPOM, 2, false, false, false, "Long Tail Pokémon", Type.NORMAL, null, 0.8, 11.5, Abilities.RUN_AWAY, Abilities.PICKUP, Abilities.SKILL_LINK, 360, 55, 70, 55, 40, 55, 85, 45, 70, 72, GrowthRate.FAST, 50, true),
-    new PokemonSpecies(Species.SUNKERN, 2, false, false, false, "Seed Pokémon", Type.GRASS, null, 0.3, 1.8, Abilities.CHLOROPHYLL, Abilities.SOLAR_POWER, Abilities.EARLY_BIRD, 180, 30, 30, 30, 30, 30, 30, 235, 70, 36, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.SUNFLORA, 2, false, false, false, "Sun Pokémon", Type.GRASS, null, 0.8, 8.5, Abilities.CHLOROPHYLL, Abilities.SOLAR_POWER, Abilities.EARLY_BIRD, 425, 75, 75, 55, 105, 85, 30, 120, 70, 149, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.YANMA, 2, false, false, false, "Clear Wing Pokémon", Type.BUG, Type.FLYING, 1.2, 38, Abilities.SPEED_BOOST, Abilities.COMPOUND_EYES, Abilities.FRISK, 390, 65, 65, 45, 75, 45, 95, 75, 70, 78, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.WOOPER, 2, false, false, false, "Water Fish Pokémon", Type.WATER, Type.GROUND, 0.4, 8.5, Abilities.DAMP, Abilities.WATER_ABSORB, Abilities.UNAWARE, 210, 55, 45, 45, 25, 25, 15, 255, 50, 42, GrowthRate.MEDIUM_FAST, 50, true),
-    new PokemonSpecies(Species.QUAGSIRE, 2, false, false, false, "Water Fish Pokémon", Type.WATER, Type.GROUND, 1.4, 75, Abilities.DAMP, Abilities.WATER_ABSORB, Abilities.UNAWARE, 430, 95, 85, 85, 65, 65, 35, 90, 50, 151, GrowthRate.MEDIUM_FAST, 50, true),
-    new PokemonSpecies(Species.ESPEON, 2, false, false, false, "Sun Pokémon", Type.PSYCHIC, null, 0.9, 26.5, Abilities.SYNCHRONIZE, Abilities.NONE, Abilities.MAGIC_BOUNCE, 525, 65, 65, 60, 130, 95, 110, 45, 50, 184, GrowthRate.MEDIUM_FAST, 87.5, false),
-    new PokemonSpecies(Species.UMBREON, 2, false, false, false, "Moonlight Pokémon", Type.DARK, null, 1, 27, Abilities.SYNCHRONIZE, Abilities.NONE, Abilities.INNER_FOCUS, 525, 95, 65, 110, 60, 130, 65, 45, 35, 184, GrowthRate.MEDIUM_FAST, 87.5, false),
-    new PokemonSpecies(Species.MURKROW, 2, false, false, false, "Darkness Pokémon", Type.DARK, Type.FLYING, 0.5, 2.1, Abilities.INSOMNIA, Abilities.SUPER_LUCK, Abilities.PRANKSTER, 405, 60, 85, 42, 85, 42, 91, 30, 35, 81, GrowthRate.MEDIUM_SLOW, 50, true),
-    new PokemonSpecies(Species.SLOWKING, 2, false, false, false, "Royal Pokémon", Type.WATER, Type.PSYCHIC, 2, 79.5, Abilities.OBLIVIOUS, Abilities.OWN_TEMPO, Abilities.REGENERATOR, 490, 95, 75, 80, 100, 110, 30, 70, 50, 172, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.MISDREAVUS, 2, false, false, false, "Screech Pokémon", Type.GHOST, null, 0.7, 1, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 435, 60, 60, 60, 85, 85, 85, 45, 35, 87, GrowthRate.FAST, 50, false),
-    new PokemonSpecies(Species.UNOWN, 2, false, false, false, "Symbol Pokémon", Type.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, GrowthRate.MEDIUM_FAST, null, false, false,
-      new PokemonForm("A", "a", Type.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true),
-      new PokemonForm("B", "b", Type.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true),
-      new PokemonForm("C", "c", Type.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true),
-      new PokemonForm("D", "d", Type.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true),
-      new PokemonForm("E", "e", Type.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true),
-      new PokemonForm("F", "f", Type.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true),
-      new PokemonForm("G", "g", Type.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true),
-      new PokemonForm("H", "h", Type.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true),
-      new PokemonForm("I", "i", Type.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true),
-      new PokemonForm("J", "j", Type.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true),
-      new PokemonForm("K", "k", Type.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true),
-      new PokemonForm("L", "l", Type.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true),
-      new PokemonForm("M", "m", Type.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true),
-      new PokemonForm("N", "n", Type.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true),
-      new PokemonForm("O", "o", Type.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true),
-      new PokemonForm("P", "p", Type.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true),
-      new PokemonForm("Q", "q", Type.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true),
-      new PokemonForm("R", "r", Type.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true),
-      new PokemonForm("S", "s", Type.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true),
-      new PokemonForm("T", "t", Type.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true),
-      new PokemonForm("U", "u", Type.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true),
-      new PokemonForm("V", "v", Type.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true),
-      new PokemonForm("W", "w", Type.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true),
-      new PokemonForm("X", "x", Type.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true),
-      new PokemonForm("Y", "y", Type.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true),
-      new PokemonForm("Z", "z", Type.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true),
-      new PokemonForm("!", "exclamation", Type.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true),
-      new PokemonForm("?", "question", Type.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true),
-    ),
-    new PokemonSpecies(Species.WOBBUFFET, 2, false, false, false, "Patient Pokémon", Type.PSYCHIC, null, 1.3, 28.5, Abilities.SHADOW_TAG, Abilities.NONE, Abilities.TELEPATHY, 405, 190, 33, 58, 33, 58, 33, 45, 50, 142, GrowthRate.MEDIUM_FAST, 50, true),
-    new PokemonSpecies(Species.GIRAFARIG, 2, false, false, false, "Long Neck Pokémon", Type.NORMAL, Type.PSYCHIC, 1.5, 41.5, Abilities.INNER_FOCUS, Abilities.EARLY_BIRD, Abilities.SAP_SIPPER, 455, 70, 80, 65, 90, 65, 85, 60, 70, 159, GrowthRate.MEDIUM_FAST, 50, true),
-    new PokemonSpecies(Species.PINECO, 2, false, false, false, "Bagworm Pokémon", Type.BUG, null, 0.6, 7.2, Abilities.STURDY, Abilities.NONE, Abilities.OVERCOAT, 290, 50, 65, 90, 35, 35, 15, 190, 70, 58, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.FORRETRESS, 2, false, false, false, "Bagworm Pokémon", Type.BUG, Type.STEEL, 1.2, 125.8, Abilities.STURDY, Abilities.NONE, Abilities.OVERCOAT, 465, 75, 90, 140, 60, 60, 40, 75, 70, 163, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.DUNSPARCE, 2, false, false, false, "Land Snake Pokémon", Type.NORMAL, null, 1.5, 14, Abilities.SERENE_GRACE, Abilities.RUN_AWAY, Abilities.RATTLED, 415, 100, 70, 70, 65, 65, 45, 190, 50, 145, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.GLIGAR, 2, false, false, false, "Fly Scorpion Pokémon", Type.GROUND, Type.FLYING, 1.1, 64.8, Abilities.HYPER_CUTTER, Abilities.SAND_VEIL, Abilities.IMMUNITY, 430, 65, 75, 105, 35, 65, 85, 60, 70, 86, GrowthRate.MEDIUM_SLOW, 50, true),
-    new PokemonSpecies(Species.STEELIX, 2, false, false, false, "Iron Snake Pokémon", Type.STEEL, Type.GROUND, 9.2, 400, Abilities.ROCK_HEAD, Abilities.STURDY, Abilities.SHEER_FORCE, 510, 75, 85, 200, 55, 65, 30, 25, 50, 179, GrowthRate.MEDIUM_FAST, 50, true, true,
-      new PokemonForm("Normal", "", Type.STEEL, Type.GROUND, 9.2, 400, Abilities.ROCK_HEAD, Abilities.STURDY, Abilities.SHEER_FORCE, 510, 75, 85, 200, 55, 65, 30, 25, 50, 179, true, null, true),
-      new PokemonForm("Mega", SpeciesFormKey.MEGA, Type.STEEL, Type.GROUND, 10.5, 740, Abilities.SAND_FORCE, Abilities.SAND_FORCE, Abilities.SAND_FORCE, 610, 75, 125, 230, 55, 95, 30, 25, 50, 179, true),
-    ),
-    new PokemonSpecies(Species.SNUBBULL, 2, false, false, false, "Fairy Pokémon", Type.FAIRY, null, 0.6, 7.8, Abilities.INTIMIDATE, Abilities.RUN_AWAY, Abilities.RATTLED, 300, 60, 80, 50, 40, 40, 30, 190, 70, 60, GrowthRate.FAST, 25, false),
-    new PokemonSpecies(Species.GRANBULL, 2, false, false, false, "Fairy Pokémon", Type.FAIRY, null, 1.4, 48.7, Abilities.INTIMIDATE, Abilities.QUICK_FEET, Abilities.RATTLED, 450, 90, 120, 75, 60, 60, 45, 75, 70, 158, GrowthRate.FAST, 25, false),
-    new PokemonSpecies(Species.QWILFISH, 2, false, false, false, "Balloon Pokémon", Type.WATER, Type.POISON, 0.5, 3.9, Abilities.POISON_POINT, Abilities.SWIFT_SWIM, Abilities.INTIMIDATE, 440, 65, 95, 85, 55, 55, 85, 45, 50, 88, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.SCIZOR, 2, false, false, false, "Pincer Pokémon", Type.BUG, Type.STEEL, 1.8, 118, Abilities.SWARM, Abilities.TECHNICIAN, Abilities.LIGHT_METAL, 500, 70, 130, 100, 55, 80, 65, 25, 50, 175, GrowthRate.MEDIUM_FAST, 50, true, true,
-      new PokemonForm("Normal", "", Type.BUG, Type.STEEL, 1.8, 118, Abilities.SWARM, Abilities.TECHNICIAN, Abilities.LIGHT_METAL, 500, 70, 130, 100, 55, 80, 65, 25, 50, 175, true, null, true),
-      new PokemonForm("Mega", SpeciesFormKey.MEGA, Type.BUG, Type.STEEL, 2, 125, Abilities.TECHNICIAN, Abilities.TECHNICIAN, Abilities.TECHNICIAN, 600, 70, 150, 140, 65, 100, 75, 25, 50, 175, true),
-    ),
-    new PokemonSpecies(Species.SHUCKLE, 2, false, false, false, "Mold Pokémon", Type.BUG, Type.ROCK, 0.6, 20.5, Abilities.STURDY, Abilities.GLUTTONY, Abilities.CONTRARY, 505, 20, 10, 230, 10, 230, 5, 190, 50, 177, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.HERACROSS, 2, false, false, false, "Single Horn Pokémon", Type.BUG, Type.FIGHTING, 1.5, 54, Abilities.SWARM, Abilities.GUTS, Abilities.MOXIE, 500, 80, 125, 75, 40, 95, 85, 45, 50, 175, GrowthRate.SLOW, 50, true, true,
-      new PokemonForm("Normal", "", Type.BUG, Type.FIGHTING, 1.5, 54, Abilities.SWARM, Abilities.GUTS, Abilities.MOXIE, 500, 80, 125, 75, 40, 95, 85, 45, 50, 175, true, null, true),
-      new PokemonForm("Mega", SpeciesFormKey.MEGA, Type.BUG, Type.FIGHTING, 1.7, 62.5, Abilities.SKILL_LINK, Abilities.SKILL_LINK, Abilities.SKILL_LINK, 600, 80, 185, 115, 40, 105, 75, 45, 50, 175, true),
-    ),
-    new PokemonSpecies(Species.SNEASEL, 2, false, false, false, "Sharp Claw Pokémon", Type.DARK, Type.ICE, 0.9, 28, Abilities.INNER_FOCUS, Abilities.KEEN_EYE, Abilities.PICKPOCKET, 430, 55, 95, 55, 35, 75, 115, 60, 35, 86, GrowthRate.MEDIUM_SLOW, 50, true),
-    new PokemonSpecies(Species.TEDDIURSA, 2, false, false, false, "Little Bear Pokémon", Type.NORMAL, null, 0.6, 8.8, Abilities.PICKUP, Abilities.QUICK_FEET, Abilities.HONEY_GATHER, 330, 60, 80, 50, 50, 50, 40, 120, 70, 66, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.URSARING, 2, false, false, false, "Hibernator Pokémon", Type.NORMAL, null, 1.8, 125.8, Abilities.GUTS, Abilities.QUICK_FEET, Abilities.UNNERVE, 500, 90, 130, 75, 75, 75, 55, 60, 70, 175, GrowthRate.MEDIUM_FAST, 50, true),
-    new PokemonSpecies(Species.SLUGMA, 2, false, false, false, "Lava Pokémon", Type.FIRE, null, 0.7, 35, Abilities.MAGMA_ARMOR, Abilities.FLAME_BODY, Abilities.WEAK_ARMOR, 250, 40, 40, 40, 70, 40, 20, 190, 70, 50, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.MAGCARGO, 2, false, false, false, "Lava Pokémon", Type.FIRE, Type.ROCK, 0.8, 55, Abilities.MAGMA_ARMOR, Abilities.FLAME_BODY, Abilities.WEAK_ARMOR, 430, 60, 50, 120, 90, 80, 30, 75, 70, 151, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.SWINUB, 2, false, false, false, "Pig Pokémon", Type.ICE, Type.GROUND, 0.4, 6.5, Abilities.OBLIVIOUS, Abilities.SNOW_CLOAK, Abilities.THICK_FAT, 250, 50, 50, 40, 30, 30, 50, 225, 50, 50, GrowthRate.SLOW, 50, false),
-    new PokemonSpecies(Species.PILOSWINE, 2, false, false, false, "Swine Pokémon", Type.ICE, Type.GROUND, 1.1, 55.8, Abilities.OBLIVIOUS, Abilities.SNOW_CLOAK, Abilities.THICK_FAT, 450, 100, 100, 80, 60, 60, 50, 75, 50, 158, GrowthRate.SLOW, 50, true),
-    new PokemonSpecies(Species.CORSOLA, 2, false, false, false, "Coral Pokémon", Type.WATER, Type.ROCK, 0.6, 5, Abilities.HUSTLE, Abilities.NATURAL_CURE, Abilities.REGENERATOR, 410, 65, 55, 95, 65, 95, 35, 60, 50, 144, GrowthRate.FAST, 25, false),
-    new PokemonSpecies(Species.REMORAID, 2, false, false, false, "Jet Pokémon", Type.WATER, null, 0.6, 12, Abilities.HUSTLE, Abilities.SNIPER, Abilities.MOODY, 300, 35, 65, 35, 65, 35, 65, 190, 50, 60, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.OCTILLERY, 2, false, false, false, "Jet Pokémon", Type.WATER, null, 0.9, 28.5, Abilities.SUCTION_CUPS, Abilities.SNIPER, Abilities.MOODY, 480, 75, 105, 75, 105, 75, 45, 75, 50, 168, GrowthRate.MEDIUM_FAST, 50, true),
-    new PokemonSpecies(Species.DELIBIRD, 2, false, false, false, "Delivery Pokémon", Type.ICE, Type.FLYING, 0.9, 16, Abilities.VITAL_SPIRIT, Abilities.HUSTLE, Abilities.INSOMNIA, 330, 45, 55, 45, 65, 45, 75, 45, 50, 116, GrowthRate.FAST, 50, false),
-    new PokemonSpecies(Species.MANTINE, 2, false, false, false, "Kite Pokémon", Type.WATER, Type.FLYING, 2.1, 220, Abilities.SWIFT_SWIM, Abilities.WATER_ABSORB, Abilities.WATER_VEIL, 485, 85, 40, 70, 80, 140, 70, 25, 50, 170, GrowthRate.SLOW, 50, false),
-    new PokemonSpecies(Species.SKARMORY, 2, false, false, false, "Armor Bird Pokémon", Type.STEEL, Type.FLYING, 1.7, 50.5, Abilities.KEEN_EYE, Abilities.STURDY, Abilities.WEAK_ARMOR, 465, 65, 80, 140, 40, 70, 70, 25, 50, 163, GrowthRate.SLOW, 50, false),
-    new PokemonSpecies(Species.HOUNDOUR, 2, false, false, false, "Dark Pokémon", Type.DARK, Type.FIRE, 0.6, 10.8, Abilities.EARLY_BIRD, Abilities.FLASH_FIRE, Abilities.UNNERVE, 330, 45, 60, 30, 80, 50, 65, 120, 35, 66, GrowthRate.SLOW, 50, false),
-    new PokemonSpecies(Species.HOUNDOOM, 2, false, false, false, "Dark Pokémon", Type.DARK, Type.FIRE, 1.4, 35, Abilities.EARLY_BIRD, Abilities.FLASH_FIRE, Abilities.UNNERVE, 500, 75, 90, 50, 110, 80, 95, 45, 35, 175, GrowthRate.SLOW, 50, true, true,
-      new PokemonForm("Normal", "", Type.DARK, Type.FIRE, 1.4, 35, Abilities.EARLY_BIRD, Abilities.FLASH_FIRE, Abilities.UNNERVE, 500, 75, 90, 50, 110, 80, 95, 45, 35, 175, true, null, true),
-      new PokemonForm("Mega", SpeciesFormKey.MEGA, Type.DARK, Type.FIRE, 1.9, 49.5, Abilities.SOLAR_POWER, Abilities.SOLAR_POWER, Abilities.SOLAR_POWER, 600, 75, 90, 90, 140, 90, 115, 45, 35, 175, true),
-    ),
-    new PokemonSpecies(Species.KINGDRA, 2, false, false, false, "Dragon Pokémon", Type.WATER, Type.DRAGON, 1.8, 152, Abilities.SWIFT_SWIM, Abilities.SNIPER, Abilities.DAMP, 540, 75, 95, 95, 95, 95, 85, 45, 50, 270, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.PHANPY, 2, false, false, false, "Long Nose Pokémon", Type.GROUND, null, 0.5, 33.5, Abilities.PICKUP, Abilities.NONE, Abilities.SAND_VEIL, 330, 90, 60, 60, 40, 40, 40, 120, 70, 66, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.DONPHAN, 2, false, false, false, "Armor Pokémon", Type.GROUND, null, 1.1, 120, Abilities.STURDY, Abilities.NONE, Abilities.SAND_VEIL, 500, 90, 120, 120, 60, 60, 50, 60, 70, 175, GrowthRate.MEDIUM_FAST, 50, true),
-    new PokemonSpecies(Species.PORYGON2, 2, false, false, false, "Virtual Pokémon", Type.NORMAL, null, 0.6, 32.5, Abilities.TRACE, Abilities.DOWNLOAD, Abilities.ANALYTIC, 515, 85, 80, 90, 105, 95, 60, 45, 50, 180, GrowthRate.MEDIUM_FAST, null, false),
-    new PokemonSpecies(Species.STANTLER, 2, false, false, false, "Big Horn Pokémon", Type.NORMAL, null, 1.4, 71.2, Abilities.INTIMIDATE, Abilities.FRISK, Abilities.SAP_SIPPER, 465, 73, 95, 62, 85, 65, 85, 45, 70, 163, GrowthRate.SLOW, 50, false),
-    new PokemonSpecies(Species.SMEARGLE, 2, false, false, false, "Painter Pokémon", Type.NORMAL, null, 1.2, 58, Abilities.OWN_TEMPO, Abilities.TECHNICIAN, Abilities.MOODY, 250, 55, 20, 35, 20, 45, 75, 45, 70, 88, GrowthRate.FAST, 50, false),
-    new PokemonSpecies(Species.TYROGUE, 2, false, false, false, "Scuffle Pokémon", Type.FIGHTING, null, 0.7, 21, Abilities.GUTS, Abilities.STEADFAST, Abilities.VITAL_SPIRIT, 210, 35, 35, 35, 35, 35, 35, 75, 50, 42, GrowthRate.MEDIUM_FAST, 100, false),
-    new PokemonSpecies(Species.HITMONTOP, 2, false, false, false, "Handstand Pokémon", Type.FIGHTING, null, 1.4, 48, Abilities.INTIMIDATE, Abilities.TECHNICIAN, Abilities.STEADFAST, 455, 50, 95, 95, 35, 110, 70, 45, 50, 159, GrowthRate.MEDIUM_FAST, 100, false),
-    new PokemonSpecies(Species.SMOOCHUM, 2, false, false, false, "Kiss Pokémon", Type.ICE, Type.PSYCHIC, 0.4, 6, Abilities.OBLIVIOUS, Abilities.FOREWARN, Abilities.HYDRATION, 305, 45, 30, 15, 85, 65, 65, 45, 50, 61, GrowthRate.MEDIUM_FAST, 0, false),
-    new PokemonSpecies(Species.ELEKID, 2, false, false, false, "Electric Pokémon", Type.ELECTRIC, null, 0.6, 23.5, Abilities.STATIC, Abilities.NONE, Abilities.VITAL_SPIRIT, 360, 45, 63, 37, 65, 55, 95, 45, 50, 72, GrowthRate.MEDIUM_FAST, 75, false),
-    new PokemonSpecies(Species.MAGBY, 2, false, false, false, "Live Coal Pokémon", Type.FIRE, null, 0.7, 21.4, Abilities.FLAME_BODY, Abilities.NONE, Abilities.VITAL_SPIRIT, 365, 45, 75, 37, 70, 55, 83, 45, 50, 73, GrowthRate.MEDIUM_FAST, 75, false),
-    new PokemonSpecies(Species.MILTANK, 2, false, false, false, "Milk Cow Pokémon", Type.NORMAL, null, 1.2, 75.5, Abilities.THICK_FAT, Abilities.SCRAPPY, Abilities.SAP_SIPPER, 490, 95, 80, 105, 40, 70, 100, 45, 50, 172, GrowthRate.SLOW, 0, false),
-    new PokemonSpecies(Species.BLISSEY, 2, false, false, false, "Happiness Pokémon", Type.NORMAL, null, 1.5, 46.8, Abilities.NATURAL_CURE, Abilities.SERENE_GRACE, Abilities.HEALER, 540, 255, 10, 10, 75, 135, 55, 30, 140, 608, GrowthRate.FAST, 0, false),
-    new PokemonSpecies(Species.RAIKOU, 2, true, false, false, "Thunder Pokémon", Type.ELECTRIC, null, 1.9, 178, Abilities.PRESSURE, Abilities.NONE, Abilities.INNER_FOCUS, 580, 90, 85, 75, 115, 100, 115, 3, 35, 290, GrowthRate.SLOW, null, false),
-    new PokemonSpecies(Species.ENTEI, 2, true, false, false, "Volcano Pokémon", Type.FIRE, null, 2.1, 198, Abilities.PRESSURE, Abilities.NONE, Abilities.INNER_FOCUS, 580, 115, 115, 85, 90, 75, 100, 3, 35, 290, GrowthRate.SLOW, null, false),
-    new PokemonSpecies(Species.SUICUNE, 2, true, false, false, "Aurora Pokémon", Type.WATER, null, 2, 187, Abilities.PRESSURE, Abilities.NONE, Abilities.INNER_FOCUS, 580, 100, 75, 115, 90, 115, 85, 3, 35, 290, GrowthRate.SLOW, null, false),
-    new PokemonSpecies(Species.LARVITAR, 2, false, false, false, "Rock Skin Pokémon", Type.ROCK, Type.GROUND, 0.6, 72, Abilities.GUTS, Abilities.NONE, Abilities.SAND_VEIL, 300, 50, 64, 50, 45, 50, 41, 45, 35, 60, GrowthRate.SLOW, 50, false),
-    new PokemonSpecies(Species.PUPITAR, 2, false, false, false, "Hard Shell Pokémon", Type.ROCK, Type.GROUND, 1.2, 152, Abilities.SHED_SKIN, Abilities.NONE, Abilities.SHED_SKIN, 410, 70, 84, 70, 65, 70, 51, 45, 35, 144, GrowthRate.SLOW, 50, false),
-    new PokemonSpecies(Species.TYRANITAR, 2, false, false, false, "Armor Pokémon", Type.ROCK, Type.DARK, 2, 202, Abilities.SAND_STREAM, Abilities.NONE, Abilities.UNNERVE, 600, 100, 134, 110, 95, 100, 61, 45, 35, 300, GrowthRate.SLOW, 50, false, true,
-      new PokemonForm("Normal", "", Type.ROCK, Type.DARK, 2, 202, Abilities.SAND_STREAM, Abilities.NONE, Abilities.UNNERVE, 600, 100, 134, 110, 95, 100, 61, 45, 35, 300, false, null, true),
-      new PokemonForm("Mega", SpeciesFormKey.MEGA, Type.ROCK, Type.DARK, 2.5, 255, Abilities.SAND_STREAM, Abilities.NONE, Abilities.SAND_STREAM, 700, 100, 164, 150, 95, 120, 71, 45, 35, 300),
-    ),
-    new PokemonSpecies(Species.LUGIA, 2, false, true, false, "Diving Pokémon", Type.PSYCHIC, Type.FLYING, 5.2, 216, Abilities.PRESSURE, Abilities.NONE, Abilities.MULTISCALE, 680, 106, 90, 130, 90, 154, 110, 3, 0, 340, GrowthRate.SLOW, null, false),
-    new PokemonSpecies(Species.HO_OH, 2, false, true, false, "Rainbow Pokémon", Type.FIRE, Type.FLYING, 3.8, 199, Abilities.PRESSURE, Abilities.NONE, Abilities.REGENERATOR, 680, 106, 130, 90, 110, 154, 90, 3, 0, 340, GrowthRate.SLOW, null, false),
-    new PokemonSpecies(Species.CELEBI, 2, false, false, true, "Time Travel Pokémon", Type.PSYCHIC, Type.GRASS, 0.6, 5, Abilities.NATURAL_CURE, Abilities.NONE, Abilities.NONE, 600, 100, 100, 100, 100, 100, 100, 45, 100, 300, GrowthRate.MEDIUM_SLOW, null, false),
-    new PokemonSpecies(Species.TREECKO, 3, false, false, false, "Wood Gecko Pokémon", Type.GRASS, null, 0.5, 5, Abilities.OVERGROW, Abilities.NONE, Abilities.UNBURDEN, 310, 40, 45, 35, 65, 55, 70, 45, 50, 62, GrowthRate.MEDIUM_SLOW, 87.5, false),
-    new PokemonSpecies(Species.GROVYLE, 3, false, false, false, "Wood Gecko Pokémon", Type.GRASS, null, 0.9, 21.6, Abilities.OVERGROW, Abilities.NONE, Abilities.UNBURDEN, 405, 50, 65, 45, 85, 65, 95, 45, 50, 142, GrowthRate.MEDIUM_SLOW, 87.5, false),
-    new PokemonSpecies(Species.SCEPTILE, 3, false, false, false, "Forest Pokémon", Type.GRASS, null, 1.7, 52.2, Abilities.OVERGROW, Abilities.NONE, Abilities.UNBURDEN, 530, 70, 85, 65, 105, 85, 120, 45, 50, 265, GrowthRate.MEDIUM_SLOW, 87.5, false, true,
-      new PokemonForm("Normal", "", Type.GRASS, null, 1.7, 52.2, Abilities.OVERGROW, Abilities.NONE, Abilities.UNBURDEN, 530, 70, 85, 65, 105, 85, 120, 45, 50, 265, false, null, true),
-      new PokemonForm("Mega", SpeciesFormKey.MEGA, Type.GRASS, Type.DRAGON, 1.9, 55.2, Abilities.LIGHTNING_ROD, Abilities.NONE, Abilities.LIGHTNING_ROD, 630, 70, 110, 75, 145, 85, 145, 45, 50, 265),
-    ),
-    new PokemonSpecies(Species.TORCHIC, 3, false, false, false, "Chick Pokémon", Type.FIRE, null, 0.4, 2.5, Abilities.BLAZE, Abilities.NONE, Abilities.SPEED_BOOST, 310, 45, 60, 40, 70, 50, 45, 45, 50, 62, GrowthRate.MEDIUM_SLOW, 87.5, true),
-    new PokemonSpecies(Species.COMBUSKEN, 3, false, false, false, "Young Fowl Pokémon", Type.FIRE, Type.FIGHTING, 0.9, 19.5, Abilities.BLAZE, Abilities.NONE, Abilities.SPEED_BOOST, 405, 60, 85, 60, 85, 60, 55, 45, 50, 142, GrowthRate.MEDIUM_SLOW, 87.5, true),
-    new PokemonSpecies(Species.BLAZIKEN, 3, false, false, false, "Blaze Pokémon", Type.FIRE, Type.FIGHTING, 1.9, 52, Abilities.BLAZE, Abilities.NONE, Abilities.SPEED_BOOST, 530, 80, 120, 70, 110, 70, 80, 45, 50, 265, GrowthRate.MEDIUM_SLOW, 87.5, true, true,
-      new PokemonForm("Normal", "", Type.FIRE, Type.FIGHTING, 1.9, 52, Abilities.BLAZE, Abilities.NONE, Abilities.SPEED_BOOST, 530, 80, 120, 70, 110, 70, 80, 45, 50, 265, true, null, true),
-      new PokemonForm("Mega", SpeciesFormKey.MEGA, Type.FIRE, Type.FIGHTING, 1.9, 52, Abilities.SPEED_BOOST, Abilities.NONE, Abilities.SPEED_BOOST, 630, 80, 160, 80, 130, 80, 100, 45, 50, 265, true),
-    ),
-    new PokemonSpecies(Species.MUDKIP, 3, false, false, false, "Mud Fish Pokémon", Type.WATER, null, 0.4, 7.6, Abilities.TORRENT, Abilities.NONE, Abilities.DAMP, 310, 50, 70, 50, 50, 50, 40, 45, 50, 62, GrowthRate.MEDIUM_SLOW, 87.5, false),
-    new PokemonSpecies(Species.MARSHTOMP, 3, false, false, false, "Mud Fish Pokémon", Type.WATER, Type.GROUND, 0.7, 28, Abilities.TORRENT, Abilities.NONE, Abilities.DAMP, 405, 70, 85, 70, 60, 70, 50, 45, 50, 142, GrowthRate.MEDIUM_SLOW, 87.5, false),
-    new PokemonSpecies(Species.SWAMPERT, 3, false, false, false, "Mud Fish Pokémon", Type.WATER, Type.GROUND, 1.5, 81.9, Abilities.TORRENT, Abilities.NONE, Abilities.DAMP, 535, 100, 110, 90, 85, 90, 60, 45, 50, 268, GrowthRate.MEDIUM_SLOW, 87.5, false, true,
-      new PokemonForm("Normal", "", Type.WATER, Type.GROUND, 1.5, 81.9, Abilities.TORRENT, Abilities.NONE, Abilities.DAMP, 535, 100, 110, 90, 85, 90, 60, 45, 50, 268, false, null, true),
-      new PokemonForm("Mega", SpeciesFormKey.MEGA, Type.WATER, Type.GROUND, 1.9, 102, Abilities.SWIFT_SWIM, Abilities.NONE, Abilities.SWIFT_SWIM, 635, 100, 150, 110, 95, 110, 70, 45, 50, 268),
-    ),
-    new PokemonSpecies(Species.POOCHYENA, 3, false, false, false, "Bite Pokémon", Type.DARK, null, 0.5, 13.6, Abilities.RUN_AWAY, Abilities.QUICK_FEET, Abilities.RATTLED, 220, 35, 55, 35, 30, 30, 35, 255, 70, 56, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.MIGHTYENA, 3, false, false, false, "Bite Pokémon", Type.DARK, null, 1, 37, Abilities.INTIMIDATE, Abilities.QUICK_FEET, Abilities.MOXIE, 420, 70, 90, 70, 60, 60, 70, 127, 70, 147, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.ZIGZAGOON, 3, false, false, false, "Tiny Raccoon Pokémon", Type.NORMAL, null, 0.4, 17.5, Abilities.PICKUP, Abilities.GLUTTONY, Abilities.QUICK_FEET, 240, 38, 30, 41, 30, 41, 60, 255, 50, 56, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.LINOONE, 3, false, false, false, "Rushing Pokémon", Type.NORMAL, null, 0.5, 32.5, Abilities.PICKUP, Abilities.GLUTTONY, Abilities.QUICK_FEET, 420, 78, 70, 61, 50, 61, 100, 90, 50, 147, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.WURMPLE, 3, false, false, false, "Worm Pokémon", Type.BUG, null, 0.3, 3.6, Abilities.SHIELD_DUST, Abilities.NONE, Abilities.RUN_AWAY, 195, 45, 45, 35, 20, 30, 20, 255, 70, 56, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.SILCOON, 3, false, false, false, "Cocoon Pokémon", Type.BUG, null, 0.6, 10, Abilities.SHED_SKIN, Abilities.NONE, Abilities.SHED_SKIN, 205, 50, 35, 55, 25, 25, 15, 120, 70, 72, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.BEAUTIFLY, 3, false, false, false, "Butterfly Pokémon", Type.BUG, Type.FLYING, 1, 28.4, Abilities.SWARM, Abilities.NONE, Abilities.RIVALRY, 395, 60, 70, 50, 100, 50, 65, 45, 70, 198, GrowthRate.MEDIUM_FAST, 50, true),
-    new PokemonSpecies(Species.CASCOON, 3, false, false, false, "Cocoon Pokémon", Type.BUG, null, 0.7, 11.5, Abilities.SHED_SKIN, Abilities.NONE, Abilities.SHED_SKIN, 205, 50, 35, 55, 25, 25, 15, 120, 70, 72, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.DUSTOX, 3, false, false, false, "Poison Moth Pokémon", Type.BUG, Type.POISON, 1.2, 31.6, Abilities.SHIELD_DUST, Abilities.NONE, Abilities.COMPOUND_EYES, 385, 60, 50, 70, 50, 90, 65, 45, 70, 193, GrowthRate.MEDIUM_FAST, 50, true),
-    new PokemonSpecies(Species.LOTAD, 3, false, false, false, "Water Weed Pokémon", Type.WATER, Type.GRASS, 0.5, 2.6, Abilities.SWIFT_SWIM, Abilities.RAIN_DISH, Abilities.OWN_TEMPO, 220, 40, 30, 30, 40, 50, 30, 255, 50, 44, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.LOMBRE, 3, false, false, false, "Jolly Pokémon", Type.WATER, Type.GRASS, 1.2, 32.5, Abilities.SWIFT_SWIM, Abilities.RAIN_DISH, Abilities.OWN_TEMPO, 340, 60, 50, 50, 60, 70, 50, 120, 50, 119, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.LUDICOLO, 3, false, false, false, "Carefree Pokémon", Type.WATER, Type.GRASS, 1.5, 55, Abilities.SWIFT_SWIM, Abilities.RAIN_DISH, Abilities.OWN_TEMPO, 480, 80, 70, 70, 90, 100, 70, 45, 50, 240, GrowthRate.MEDIUM_SLOW, 50, true),
-    new PokemonSpecies(Species.SEEDOT, 3, false, false, false, "Acorn Pokémon", Type.GRASS, null, 0.5, 4, Abilities.CHLOROPHYLL, Abilities.EARLY_BIRD, Abilities.PICKPOCKET, 220, 40, 40, 50, 30, 30, 30, 255, 50, 44, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.NUZLEAF, 3, false, false, false, "Wily Pokémon", Type.GRASS, Type.DARK, 1, 28, Abilities.CHLOROPHYLL, Abilities.EARLY_BIRD, Abilities.PICKPOCKET, 340, 70, 70, 40, 60, 40, 60, 120, 50, 119, GrowthRate.MEDIUM_SLOW, 50, true),
-    new PokemonSpecies(Species.SHIFTRY, 3, false, false, false, "Wicked Pokémon", Type.GRASS, Type.DARK, 1.3, 59.6, Abilities.CHLOROPHYLL, Abilities.WIND_RIDER, Abilities.PICKPOCKET, 480, 90, 100, 60, 90, 60, 80, 45, 50, 240, GrowthRate.MEDIUM_SLOW, 50, true),
-    new PokemonSpecies(Species.TAILLOW, 3, false, false, false, "Tiny Swallow Pokémon", Type.NORMAL, Type.FLYING, 0.3, 2.3, Abilities.GUTS, Abilities.NONE, Abilities.SCRAPPY, 270, 40, 55, 30, 30, 30, 85, 200, 70, 54, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.SWELLOW, 3, false, false, false, "Swallow Pokémon", Type.NORMAL, Type.FLYING, 0.7, 19.8, Abilities.GUTS, Abilities.NONE, Abilities.SCRAPPY, 455, 60, 85, 60, 75, 50, 125, 45, 70, 159, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.WINGULL, 3, false, false, false, "Seagull Pokémon", Type.WATER, Type.FLYING, 0.6, 9.5, Abilities.KEEN_EYE, Abilities.HYDRATION, Abilities.RAIN_DISH, 270, 40, 30, 30, 55, 30, 85, 190, 50, 54, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.PELIPPER, 3, false, false, false, "Water Bird Pokémon", Type.WATER, Type.FLYING, 1.2, 28, Abilities.KEEN_EYE, Abilities.DRIZZLE, Abilities.RAIN_DISH, 440, 60, 50, 100, 95, 70, 65, 45, 50, 154, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.RALTS, 3, false, false, false, "Feeling Pokémon", Type.PSYCHIC, Type.FAIRY, 0.4, 6.6, Abilities.SYNCHRONIZE, Abilities.TRACE, Abilities.TELEPATHY, 198, 28, 25, 25, 45, 35, 40, 235, 35, 40, GrowthRate.SLOW, 50, false),
-    new PokemonSpecies(Species.KIRLIA, 3, false, false, false, "Emotion Pokémon", Type.PSYCHIC, Type.FAIRY, 0.8, 20.2, Abilities.SYNCHRONIZE, Abilities.TRACE, Abilities.TELEPATHY, 278, 38, 35, 35, 65, 55, 50, 120, 35, 97, GrowthRate.SLOW, 50, false),
-    new PokemonSpecies(Species.GARDEVOIR, 3, false, false, false, "Embrace Pokémon", Type.PSYCHIC, Type.FAIRY, 1.6, 48.4, Abilities.SYNCHRONIZE, Abilities.TRACE, Abilities.TELEPATHY, 518, 68, 65, 65, 125, 115, 80, 45, 35, 259, GrowthRate.SLOW, 50, false, true,
-      new PokemonForm("Normal", "", Type.PSYCHIC, Type.FAIRY, 1.6, 48.4, Abilities.SYNCHRONIZE, Abilities.TRACE, Abilities.TELEPATHY, 518, 68, 65, 65, 125, 115, 80, 45, 35, 259, false, null, true),
-      new PokemonForm("Mega", SpeciesFormKey.MEGA, Type.PSYCHIC, Type.FAIRY, 1.6, 48.4, Abilities.PIXILATE, Abilities.PIXILATE, Abilities.PIXILATE, 618, 68, 85, 65, 165, 135, 100, 45, 35, 259),
-    ),
-    new PokemonSpecies(Species.SURSKIT, 3, false, false, false, "Pond Skater Pokémon", Type.BUG, Type.WATER, 0.5, 1.7, Abilities.SWIFT_SWIM, Abilities.NONE, Abilities.RAIN_DISH, 269, 40, 30, 32, 50, 52, 65, 200, 70, 54, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.MASQUERAIN, 3, false, false, false, "Eyeball Pokémon", Type.BUG, Type.FLYING, 0.8, 3.6, Abilities.INTIMIDATE, Abilities.NONE, Abilities.UNNERVE, 454, 70, 60, 62, 100, 82, 80, 75, 70, 159, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.SHROOMISH, 3, false, false, false, "Mushroom Pokémon", Type.GRASS, null, 0.4, 4.5, Abilities.EFFECT_SPORE, Abilities.POISON_HEAL, Abilities.QUICK_FEET, 295, 60, 40, 60, 40, 60, 35, 255, 70, 59, GrowthRate.FLUCTUATING, 50, false),
-    new PokemonSpecies(Species.BRELOOM, 3, false, false, false, "Mushroom Pokémon", Type.GRASS, Type.FIGHTING, 1.2, 39.2, Abilities.EFFECT_SPORE, Abilities.POISON_HEAL, Abilities.TECHNICIAN, 460, 60, 130, 80, 60, 60, 70, 90, 70, 161, GrowthRate.FLUCTUATING, 50, false),
-    new PokemonSpecies(Species.SLAKOTH, 3, false, false, false, "Slacker Pokémon", Type.NORMAL, null, 0.8, 24, Abilities.TRUANT, Abilities.NONE, Abilities.STALL, 280, 60, 60, 60, 35, 35, 30, 255, 70, 56, GrowthRate.SLOW, 50, false), //Custom Hidden
-    new PokemonSpecies(Species.VIGOROTH, 3, false, false, false, "Wild Monkey Pokémon", Type.NORMAL, null, 1.4, 46.5, Abilities.VITAL_SPIRIT, Abilities.NONE, Abilities.INSOMNIA, 440, 80, 80, 80, 55, 55, 90, 120, 70, 154, GrowthRate.SLOW, 50, false), //Custom Hidden
-    new PokemonSpecies(Species.SLAKING, 3, false, false, false, "Lazy Pokémon", Type.NORMAL, null, 2, 130.5, Abilities.TRUANT, Abilities.NONE, Abilities.STALL, 670, 150, 160, 100, 95, 65, 100, 45, 70, 285, GrowthRate.SLOW, 50, false), //Custom Hidden
-    new PokemonSpecies(Species.NINCADA, 3, false, false, false, "Trainee Pokémon", Type.BUG, Type.GROUND, 0.5, 5.5, Abilities.COMPOUND_EYES, Abilities.NONE, Abilities.RUN_AWAY, 266, 31, 45, 90, 30, 30, 40, 255, 50, 53, GrowthRate.ERRATIC, 50, false),
-    new PokemonSpecies(Species.NINJASK, 3, false, false, false, "Ninja Pokémon", Type.BUG, Type.FLYING, 0.8, 12, Abilities.SPEED_BOOST, Abilities.NONE, Abilities.INFILTRATOR, 456, 61, 90, 45, 50, 50, 160, 120, 50, 160, GrowthRate.ERRATIC, 50, false),
-    new PokemonSpecies(Species.SHEDINJA, 3, false, false, false, "Shed Pokémon", Type.BUG, Type.GHOST, 0.8, 1.2, Abilities.WONDER_GUARD, Abilities.NONE, Abilities.NONE, 236, 1, 90, 45, 30, 30, 40, 45, 50, 83, GrowthRate.ERRATIC, null, false),
-    new PokemonSpecies(Species.WHISMUR, 3, false, false, false, "Whisper Pokémon", Type.NORMAL, null, 0.6, 16.3, Abilities.SOUNDPROOF, Abilities.NONE, Abilities.RATTLED, 240, 64, 51, 23, 51, 23, 28, 190, 50, 48, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.LOUDRED, 3, false, false, false, "Big Voice Pokémon", Type.NORMAL, null, 1, 40.5, Abilities.SOUNDPROOF, Abilities.NONE, Abilities.SCRAPPY, 360, 84, 71, 43, 71, 43, 48, 120, 50, 126, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.EXPLOUD, 3, false, false, false, "Loud Noise Pokémon", Type.NORMAL, null, 1.5, 84, Abilities.SOUNDPROOF, Abilities.NONE, Abilities.SCRAPPY, 490, 104, 91, 63, 91, 73, 68, 45, 50, 245, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.MAKUHITA, 3, false, false, false, "Guts Pokémon", Type.FIGHTING, null, 1, 86.4, Abilities.THICK_FAT, Abilities.GUTS, Abilities.SHEER_FORCE, 237, 72, 60, 30, 20, 30, 25, 180, 70, 47, GrowthRate.FLUCTUATING, 75, false),
-    new PokemonSpecies(Species.HARIYAMA, 3, false, false, false, "Arm Thrust Pokémon", Type.FIGHTING, null, 2.3, 253.8, Abilities.THICK_FAT, Abilities.GUTS, Abilities.SHEER_FORCE, 474, 144, 120, 60, 40, 60, 50, 200, 70, 166, GrowthRate.FLUCTUATING, 75, false),
-    new PokemonSpecies(Species.AZURILL, 3, false, false, false, "Polka Dot Pokémon", Type.NORMAL, Type.FAIRY, 0.2, 2, Abilities.THICK_FAT, Abilities.HUGE_POWER, Abilities.SAP_SIPPER, 190, 50, 20, 40, 20, 40, 20, 150, 50, 38, GrowthRate.FAST, 25, false),
-    new PokemonSpecies(Species.NOSEPASS, 3, false, false, false, "Compass Pokémon", Type.ROCK, null, 1, 97, Abilities.STURDY, Abilities.MAGNET_PULL, Abilities.SAND_FORCE, 375, 30, 45, 135, 45, 90, 30, 255, 70, 75, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.SKITTY, 3, false, false, false, "Kitten Pokémon", Type.NORMAL, null, 0.6, 11, Abilities.CUTE_CHARM, Abilities.NORMALIZE, Abilities.WONDER_SKIN, 260, 50, 45, 45, 35, 35, 50, 255, 70, 52, GrowthRate.FAST, 25, false),
-    new PokemonSpecies(Species.DELCATTY, 3, false, false, false, "Prim Pokémon", Type.NORMAL, null, 1.1, 32.6, Abilities.CUTE_CHARM, Abilities.NORMALIZE, Abilities.WONDER_SKIN, 400, 70, 65, 65, 55, 55, 90, 60, 70, 140, GrowthRate.FAST, 25, false),
-    new PokemonSpecies(Species.SABLEYE, 3, false, false, false, "Darkness Pokémon", Type.DARK, Type.GHOST, 0.5, 11, Abilities.KEEN_EYE, Abilities.STALL, Abilities.PRANKSTER, 380, 50, 75, 75, 65, 65, 50, 45, 35, 133, GrowthRate.MEDIUM_SLOW, 50, false, true,
-      new PokemonForm("Normal", "", Type.DARK, Type.GHOST, 0.5, 11, Abilities.KEEN_EYE, Abilities.STALL, Abilities.PRANKSTER, 380, 50, 75, 75, 65, 65, 50, 45, 35, 133, false, null, true),
-      new PokemonForm("Mega", SpeciesFormKey.MEGA, Type.DARK, Type.GHOST, 0.5, 161, Abilities.MAGIC_BOUNCE, Abilities.MAGIC_BOUNCE, Abilities.MAGIC_BOUNCE, 480, 50, 85, 125, 85, 115, 20, 45, 35, 133),
-    ),
-    new PokemonSpecies(Species.MAWILE, 3, false, false, false, "Deceiver Pokémon", Type.STEEL, Type.FAIRY, 0.6, 11.5, Abilities.HYPER_CUTTER, Abilities.INTIMIDATE, Abilities.SHEER_FORCE, 380, 50, 85, 85, 55, 55, 50, 45, 50, 133, GrowthRate.FAST, 50, false, true,
-      new PokemonForm("Normal", "", Type.STEEL, Type.FAIRY, 0.6, 11.5, Abilities.HYPER_CUTTER, Abilities.INTIMIDATE, Abilities.SHEER_FORCE, 380, 50, 85, 85, 55, 55, 50, 45, 50, 133, false, null, true),
-      new PokemonForm("Mega", SpeciesFormKey.MEGA, Type.STEEL, Type.FAIRY, 1, 23.5, Abilities.HUGE_POWER, Abilities.HUGE_POWER, Abilities.HUGE_POWER, 480, 50, 105, 125, 55, 95, 50, 45, 50, 133),
-    ),
-    new PokemonSpecies(Species.ARON, 3, false, false, false, "Iron Armor Pokémon", Type.STEEL, Type.ROCK, 0.4, 60, Abilities.STURDY, Abilities.ROCK_HEAD, Abilities.HEAVY_METAL, 330, 50, 70, 100, 40, 40, 30, 180, 35, 66, GrowthRate.SLOW, 50, false),
-    new PokemonSpecies(Species.LAIRON, 3, false, false, false, "Iron Armor Pokémon", Type.STEEL, Type.ROCK, 0.9, 120, Abilities.STURDY, Abilities.ROCK_HEAD, Abilities.HEAVY_METAL, 430, 60, 90, 140, 50, 50, 40, 90, 35, 151, GrowthRate.SLOW, 50, false),
-    new PokemonSpecies(Species.AGGRON, 3, false, false, false, "Iron Armor Pokémon", Type.STEEL, Type.ROCK, 2.1, 360, Abilities.STURDY, Abilities.ROCK_HEAD, Abilities.HEAVY_METAL, 530, 70, 110, 180, 60, 60, 50, 45, 35, 265, GrowthRate.SLOW, 50, false, true,
-      new PokemonForm("Normal", "", Type.STEEL, Type.ROCK, 2.1, 360, Abilities.STURDY, Abilities.ROCK_HEAD, Abilities.HEAVY_METAL, 530, 70, 110, 180, 60, 60, 50, 45, 35, 265, false, null, true),
-      new PokemonForm("Mega", SpeciesFormKey.MEGA, Type.STEEL, null, 2.2, 395, Abilities.FILTER, Abilities.FILTER, Abilities.FILTER, 630, 70, 140, 230, 60, 80, 50, 45, 35, 265),
-    ),
-    new PokemonSpecies(Species.MEDITITE, 3, false, false, false, "Meditate Pokémon", Type.FIGHTING, Type.PSYCHIC, 0.6, 11.2, Abilities.PURE_POWER, Abilities.NONE, Abilities.TELEPATHY, 280, 30, 40, 55, 40, 55, 60, 180, 70, 56, GrowthRate.MEDIUM_FAST, 50, true),
-    new PokemonSpecies(Species.MEDICHAM, 3, false, false, false, "Meditate Pokémon", Type.FIGHTING, Type.PSYCHIC, 1.3, 31.5, Abilities.PURE_POWER, Abilities.NONE, Abilities.TELEPATHY, 410, 60, 60, 75, 60, 75, 80, 90, 70, 144, GrowthRate.MEDIUM_FAST, 50, true, true,
-      new PokemonForm("Normal", "", Type.FIGHTING, Type.PSYCHIC, 1.3, 31.5, Abilities.PURE_POWER, Abilities.NONE, Abilities.TELEPATHY, 410, 60, 60, 75, 60, 75, 80, 90, 70, 144, true, null, true),
-      new PokemonForm("Mega", SpeciesFormKey.MEGA, Type.FIGHTING, Type.PSYCHIC, 1.3, 31.5, Abilities.PURE_POWER, Abilities.NONE, Abilities.PURE_POWER, 510, 60, 100, 85, 80, 85, 100, 90, 70, 144, true),
-    ),
-    new PokemonSpecies(Species.ELECTRIKE, 3, false, false, false, "Lightning Pokémon", Type.ELECTRIC, null, 0.6, 15.2, Abilities.STATIC, Abilities.LIGHTNING_ROD, Abilities.MINUS, 295, 40, 45, 40, 65, 40, 65, 120, 50, 59, GrowthRate.SLOW, 50, false),
-    new PokemonSpecies(Species.MANECTRIC, 3, false, false, false, "Discharge Pokémon", Type.ELECTRIC, null, 1.5, 40.2, Abilities.STATIC, Abilities.LIGHTNING_ROD, Abilities.MINUS, 475, 70, 75, 60, 105, 60, 105, 45, 50, 166, GrowthRate.SLOW, 50, false, true,
-      new PokemonForm("Normal", "", Type.ELECTRIC, null, 1.5, 40.2, Abilities.STATIC, Abilities.LIGHTNING_ROD, Abilities.MINUS, 475, 70, 75, 60, 105, 60, 105, 45, 50, 166, false, null, true),
-      new PokemonForm("Mega", SpeciesFormKey.MEGA, Type.ELECTRIC, null, 1.8, 44, Abilities.INTIMIDATE, Abilities.INTIMIDATE, Abilities.INTIMIDATE, 575, 70, 75, 80, 135, 80, 135, 45, 50, 166),
-    ),
-    new PokemonSpecies(Species.PLUSLE, 3, false, false, false, "Cheering Pokémon", Type.ELECTRIC, null, 0.4, 4.2, Abilities.PLUS, Abilities.NONE, Abilities.LIGHTNING_ROD, 405, 60, 50, 40, 85, 75, 95, 200, 70, 142, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.MINUN, 3, false, false, false, "Cheering Pokémon", Type.ELECTRIC, null, 0.4, 4.2, Abilities.MINUS, Abilities.NONE, Abilities.VOLT_ABSORB, 405, 60, 40, 50, 75, 85, 95, 200, 70, 142, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.VOLBEAT, 3, false, false, false, "Firefly Pokémon", Type.BUG, null, 0.7, 17.7, Abilities.ILLUMINATE, Abilities.SWARM, Abilities.PRANKSTER, 430, 65, 73, 75, 47, 85, 85, 150, 70, 151, GrowthRate.ERRATIC, 100, false),
-    new PokemonSpecies(Species.ILLUMISE, 3, false, false, false, "Firefly Pokémon", Type.BUG, null, 0.6, 17.7, Abilities.OBLIVIOUS, Abilities.TINTED_LENS, Abilities.PRANKSTER, 430, 65, 47, 75, 73, 85, 85, 150, 70, 151, GrowthRate.FLUCTUATING, 0, false),
-    new PokemonSpecies(Species.ROSELIA, 3, false, false, false, "Thorn Pokémon", Type.GRASS, Type.POISON, 0.3, 2, Abilities.NATURAL_CURE, Abilities.POISON_POINT, Abilities.LEAF_GUARD, 400, 50, 60, 45, 100, 80, 65, 150, 50, 140, GrowthRate.MEDIUM_SLOW, 50, true),
-    new PokemonSpecies(Species.GULPIN, 3, false, false, false, "Stomach Pokémon", Type.POISON, null, 0.4, 10.3, Abilities.LIQUID_OOZE, Abilities.STICKY_HOLD, Abilities.GLUTTONY, 302, 70, 43, 53, 43, 53, 40, 225, 70, 60, GrowthRate.FLUCTUATING, 50, true),
-    new PokemonSpecies(Species.SWALOT, 3, false, false, false, "Poison Bag Pokémon", Type.POISON, null, 1.7, 80, Abilities.LIQUID_OOZE, Abilities.STICKY_HOLD, Abilities.GLUTTONY, 467, 100, 73, 83, 73, 83, 55, 75, 70, 163, GrowthRate.FLUCTUATING, 50, true),
-    new PokemonSpecies(Species.CARVANHA, 3, false, false, false, "Savage Pokémon", Type.WATER, Type.DARK, 0.8, 20.8, Abilities.ROUGH_SKIN, Abilities.NONE, Abilities.SPEED_BOOST, 305, 45, 90, 20, 65, 20, 65, 225, 35, 61, GrowthRate.SLOW, 50, false),
-    new PokemonSpecies(Species.SHARPEDO, 3, false, false, false, "Brutal Pokémon", Type.WATER, Type.DARK, 1.8, 88.8, Abilities.ROUGH_SKIN, Abilities.NONE, Abilities.SPEED_BOOST, 460, 70, 120, 40, 95, 40, 95, 60, 35, 161, GrowthRate.SLOW, 50, false, true,
-      new PokemonForm("Normal", "", Type.WATER, Type.DARK, 1.8, 88.8, Abilities.ROUGH_SKIN, Abilities.NONE, Abilities.SPEED_BOOST, 460, 70, 120, 40, 95, 40, 95, 60, 35, 161, false, null, true),
-      new PokemonForm("Mega", SpeciesFormKey.MEGA, Type.WATER, Type.DARK, 2.5, 130.3, Abilities.STRONG_JAW, Abilities.NONE, Abilities.STRONG_JAW, 560, 70, 140, 70, 110, 65, 105, 60, 35, 161),
-    ),
-    new PokemonSpecies(Species.WAILMER, 3, false, false, false, "Ball Whale Pokémon", Type.WATER, null, 2, 130, Abilities.WATER_VEIL, Abilities.OBLIVIOUS, Abilities.PRESSURE, 400, 130, 70, 35, 70, 35, 60, 125, 50, 80, GrowthRate.FLUCTUATING, 50, false),
-    new PokemonSpecies(Species.WAILORD, 3, false, false, false, "Float Whale Pokémon", Type.WATER, null, 14.5, 398, Abilities.WATER_VEIL, Abilities.OBLIVIOUS, Abilities.PRESSURE, 500, 170, 90, 45, 90, 45, 60, 60, 50, 175, GrowthRate.FLUCTUATING, 50, false),
-    new PokemonSpecies(Species.NUMEL, 3, false, false, false, "Numb Pokémon", Type.FIRE, Type.GROUND, 0.7, 24, Abilities.OBLIVIOUS, Abilities.SIMPLE, Abilities.OWN_TEMPO, 305, 60, 60, 40, 65, 45, 35, 255, 70, 61, GrowthRate.MEDIUM_FAST, 50, true),
-    new PokemonSpecies(Species.CAMERUPT, 3, false, false, false, "Eruption Pokémon", Type.FIRE, Type.GROUND, 1.9, 220, Abilities.MAGMA_ARMOR, Abilities.SOLID_ROCK, Abilities.ANGER_POINT, 460, 70, 100, 70, 105, 75, 40, 150, 70, 161, GrowthRate.MEDIUM_FAST, 50, true, true,
-      new PokemonForm("Normal", "", Type.FIRE, Type.GROUND, 1.9, 220, Abilities.MAGMA_ARMOR, Abilities.SOLID_ROCK, Abilities.ANGER_POINT, 460, 70, 100, 70, 105, 75, 40, 150, 70, 161, true, null, true),
-      new PokemonForm("Mega", SpeciesFormKey.MEGA, Type.FIRE, Type.GROUND, 2.5, 320.5, Abilities.SHEER_FORCE, Abilities.SHEER_FORCE, Abilities.SHEER_FORCE, 560, 70, 120, 100, 145, 105, 20, 150, 70, 161),
-    ),
-    new PokemonSpecies(Species.TORKOAL, 3, false, false, false, "Coal Pokémon", Type.FIRE, null, 0.5, 80.4, Abilities.WHITE_SMOKE, Abilities.DROUGHT, Abilities.SHELL_ARMOR, 470, 70, 85, 140, 85, 70, 20, 90, 50, 165, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.SPOINK, 3, false, false, false, "Bounce Pokémon", Type.PSYCHIC, null, 0.7, 30.6, Abilities.THICK_FAT, Abilities.OWN_TEMPO, Abilities.GLUTTONY, 330, 60, 25, 35, 70, 80, 60, 255, 70, 66, GrowthRate.FAST, 50, false),
-    new PokemonSpecies(Species.GRUMPIG, 3, false, false, false, "Manipulate Pokémon", Type.PSYCHIC, null, 0.9, 71.5, Abilities.THICK_FAT, Abilities.OWN_TEMPO, Abilities.GLUTTONY, 470, 80, 45, 65, 90, 110, 80, 60, 70, 165, GrowthRate.FAST, 50, false),
-    new PokemonSpecies(Species.SPINDA, 3, false, false, false, "Spot Panda Pokémon", Type.NORMAL, null, 1.1, 5, Abilities.OWN_TEMPO, Abilities.TANGLED_FEET, Abilities.CONTRARY, 360, 60, 60, 60, 60, 60, 60, 255, 70, 126, GrowthRate.FAST, 50, false),
-    new PokemonSpecies(Species.TRAPINCH, 3, false, false, false, "Ant Pit Pokémon", Type.GROUND, null, 0.7, 15, Abilities.HYPER_CUTTER, Abilities.ARENA_TRAP, Abilities.SHEER_FORCE, 290, 45, 100, 45, 45, 45, 10, 255, 50, 58, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.VIBRAVA, 3, false, false, false, "Vibration Pokémon", Type.GROUND, Type.DRAGON, 1.1, 15.3, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 340, 50, 70, 50, 50, 50, 70, 120, 50, 119, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.FLYGON, 3, false, false, false, "Mystic Pokémon", Type.GROUND, Type.DRAGON, 2, 82, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 520, 80, 100, 80, 80, 80, 100, 45, 50, 260, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.CACNEA, 3, false, false, false, "Cactus Pokémon", Type.GRASS, null, 0.4, 51.3, Abilities.SAND_VEIL, Abilities.NONE, Abilities.WATER_ABSORB, 335, 50, 85, 40, 85, 40, 35, 190, 35, 67, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.CACTURNE, 3, false, false, false, "Scarecrow Pokémon", Type.GRASS, Type.DARK, 1.3, 77.4, Abilities.SAND_VEIL, Abilities.NONE, Abilities.WATER_ABSORB, 475, 70, 115, 60, 115, 60, 55, 60, 35, 166, GrowthRate.MEDIUM_SLOW, 50, true),
-    new PokemonSpecies(Species.SWABLU, 3, false, false, false, "Cotton Bird Pokémon", Type.NORMAL, Type.FLYING, 0.4, 1.2, Abilities.NATURAL_CURE, Abilities.NONE, Abilities.CLOUD_NINE, 310, 45, 40, 60, 40, 75, 50, 255, 50, 62, GrowthRate.ERRATIC, 50, false),
-    new PokemonSpecies(Species.ALTARIA, 3, false, false, false, "Humming Pokémon", Type.DRAGON, Type.FLYING, 1.1, 20.6, Abilities.NATURAL_CURE, Abilities.NONE, Abilities.CLOUD_NINE, 490, 75, 70, 90, 70, 105, 80, 45, 50, 172, GrowthRate.ERRATIC, 50, false, true,
-      new PokemonForm("Normal", "", Type.DRAGON, Type.FLYING, 1.1, 20.6, Abilities.NATURAL_CURE, Abilities.NONE, Abilities.CLOUD_NINE, 490, 75, 70, 90, 70, 105, 80, 45, 50, 172, false, null, true),
-      new PokemonForm("Mega", SpeciesFormKey.MEGA, Type.DRAGON, Type.FAIRY, 1.5, 20.6, Abilities.PIXILATE, Abilities.NONE, Abilities.PIXILATE, 590, 75, 110, 110, 110, 105, 80, 45, 50, 172),
-    ),
-    new PokemonSpecies(Species.ZANGOOSE, 3, false, false, false, "Cat Ferret Pokémon", Type.NORMAL, null, 1.3, 40.3, Abilities.IMMUNITY, Abilities.NONE, Abilities.TOXIC_BOOST, 458, 73, 115, 60, 60, 60, 90, 90, 70, 160, GrowthRate.ERRATIC, 50, false),
-    new PokemonSpecies(Species.SEVIPER, 3, false, false, false, "Fang Snake Pokémon", Type.POISON, null, 2.7, 52.5, Abilities.SHED_SKIN, Abilities.NONE, Abilities.INFILTRATOR, 458, 73, 100, 60, 100, 60, 65, 90, 70, 160, GrowthRate.FLUCTUATING, 50, false),
-    new PokemonSpecies(Species.LUNATONE, 3, false, false, false, "Meteorite Pokémon", Type.ROCK, Type.PSYCHIC, 1, 168, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 460, 90, 55, 65, 95, 85, 70, 45, 50, 161, GrowthRate.FAST, null, false),
-    new PokemonSpecies(Species.SOLROCK, 3, false, false, false, "Meteorite Pokémon", Type.ROCK, Type.PSYCHIC, 1.2, 154, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 460, 90, 95, 85, 55, 65, 70, 45, 50, 161, GrowthRate.FAST, null, false),
-    new PokemonSpecies(Species.BARBOACH, 3, false, false, false, "Whiskers Pokémon", Type.WATER, Type.GROUND, 0.4, 1.9, Abilities.OBLIVIOUS, Abilities.ANTICIPATION, Abilities.HYDRATION, 288, 50, 48, 43, 46, 41, 60, 190, 50, 58, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.WHISCASH, 3, false, false, false, "Whiskers Pokémon", Type.WATER, Type.GROUND, 0.9, 23.6, Abilities.OBLIVIOUS, Abilities.ANTICIPATION, Abilities.HYDRATION, 468, 110, 78, 73, 76, 71, 60, 75, 50, 164, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.CORPHISH, 3, false, false, false, "Ruffian Pokémon", Type.WATER, null, 0.6, 11.5, Abilities.HYPER_CUTTER, Abilities.SHELL_ARMOR, Abilities.ADAPTABILITY, 308, 43, 80, 65, 50, 35, 35, 205, 50, 62, GrowthRate.FLUCTUATING, 50, false),
-    new PokemonSpecies(Species.CRAWDAUNT, 3, false, false, false, "Rogue Pokémon", Type.WATER, Type.DARK, 1.1, 32.8, Abilities.HYPER_CUTTER, Abilities.SHELL_ARMOR, Abilities.ADAPTABILITY, 468, 63, 120, 85, 90, 55, 55, 155, 50, 164, GrowthRate.FLUCTUATING, 50, false),
-    new PokemonSpecies(Species.BALTOY, 3, false, false, false, "Clay Doll Pokémon", Type.GROUND, Type.PSYCHIC, 0.5, 21.5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 300, 40, 40, 55, 40, 70, 55, 255, 50, 60, GrowthRate.MEDIUM_FAST, null, false),
-    new PokemonSpecies(Species.CLAYDOL, 3, false, false, false, "Clay Doll Pokémon", Type.GROUND, Type.PSYCHIC, 1.5, 108, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 500, 60, 70, 105, 70, 120, 75, 90, 50, 175, GrowthRate.MEDIUM_FAST, null, false),
-    new PokemonSpecies(Species.LILEEP, 3, false, false, false, "Sea Lily Pokémon", Type.ROCK, Type.GRASS, 1, 23.8, Abilities.SUCTION_CUPS, Abilities.NONE, Abilities.STORM_DRAIN, 355, 66, 41, 77, 61, 87, 23, 45, 50, 71, GrowthRate.ERRATIC, 87.5, false),
-    new PokemonSpecies(Species.CRADILY, 3, false, false, false, "Barnacle Pokémon", Type.ROCK, Type.GRASS, 1.5, 60.4, Abilities.SUCTION_CUPS, Abilities.NONE, Abilities.STORM_DRAIN, 495, 86, 81, 97, 81, 107, 43, 45, 50, 173, GrowthRate.ERRATIC, 87.5, false),
-    new PokemonSpecies(Species.ANORITH, 3, false, false, false, "Old Shrimp Pokémon", Type.ROCK, Type.BUG, 0.7, 12.5, Abilities.BATTLE_ARMOR, Abilities.NONE, Abilities.SWIFT_SWIM, 355, 45, 95, 50, 40, 50, 75, 45, 50, 71, GrowthRate.ERRATIC, 87.5, false),
-    new PokemonSpecies(Species.ARMALDO, 3, false, false, false, "Plate Pokémon", Type.ROCK, Type.BUG, 1.5, 68.2, Abilities.BATTLE_ARMOR, Abilities.NONE, Abilities.SWIFT_SWIM, 495, 75, 125, 100, 70, 80, 45, 45, 50, 173, GrowthRate.ERRATIC, 87.5, false),
-    new PokemonSpecies(Species.FEEBAS, 3, false, false, false, "Fish Pokémon", Type.WATER, null, 0.6, 7.4, Abilities.SWIFT_SWIM, Abilities.OBLIVIOUS, Abilities.ADAPTABILITY, 200, 20, 15, 20, 10, 55, 80, 255, 50, 40, GrowthRate.ERRATIC, 50, false),
-    new PokemonSpecies(Species.MILOTIC, 3, false, false, false, "Tender Pokémon", Type.WATER, null, 6.2, 162, Abilities.MARVEL_SCALE, Abilities.COMPETITIVE, Abilities.CUTE_CHARM, 540, 95, 60, 79, 100, 125, 81, 60, 50, 189, GrowthRate.ERRATIC, 50, true),
-    new PokemonSpecies(Species.CASTFORM, 3, false, false, false, "Weather Pokémon", Type.NORMAL, null, 0.3, 0.8, Abilities.FORECAST, Abilities.NONE, Abilities.NONE, 420, 70, 70, 70, 70, 70, 70, 45, 70, 147, GrowthRate.MEDIUM_FAST, 50, false, true,
-      new PokemonForm("Normal Form", "", Type.NORMAL, null, 0.3, 0.8, Abilities.FORECAST, Abilities.NONE, Abilities.NONE, 420, 70, 70, 70, 70, 70, 70, 45, 70, 147, false, null, true),
-      new PokemonForm("Sunny Form", "sunny", Type.FIRE, null, 0.3, 0.8, Abilities.FORECAST, Abilities.NONE, Abilities.NONE, 420, 70, 70, 70, 70, 70, 70, 45, 70, 147),
-      new PokemonForm("Rainy Form", "rainy", Type.WATER, null, 0.3, 0.8, Abilities.FORECAST, Abilities.NONE, Abilities.NONE, 420, 70, 70, 70, 70, 70, 70, 45, 70, 147),
-      new PokemonForm("Snowy Form", "snowy", Type.ICE, null, 0.3, 0.8, Abilities.FORECAST, Abilities.NONE, Abilities.NONE, 420, 70, 70, 70, 70, 70, 70, 45, 70, 147),
-    ),
-    new PokemonSpecies(Species.KECLEON, 3, false, false, false, "Color Swap Pokémon", Type.NORMAL, null, 1, 22, Abilities.COLOR_CHANGE, Abilities.NONE, Abilities.PROTEAN, 440, 60, 90, 70, 60, 120, 40, 200, 70, 154, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.SHUPPET, 3, false, false, false, "Puppet Pokémon", Type.GHOST, null, 0.6, 2.3, Abilities.INSOMNIA, Abilities.FRISK, Abilities.CURSED_BODY, 295, 44, 75, 35, 63, 33, 45, 225, 35, 59, GrowthRate.FAST, 50, false),
-    new PokemonSpecies(Species.BANETTE, 3, false, false, false, "Marionette Pokémon", Type.GHOST, null, 1.1, 12.5, Abilities.INSOMNIA, Abilities.FRISK, Abilities.CURSED_BODY, 455, 64, 115, 65, 83, 63, 65, 45, 35, 159, GrowthRate.FAST, 50, false, true,
-      new PokemonForm("Normal", "", Type.GHOST, null, 1.1, 12.5, Abilities.INSOMNIA, Abilities.FRISK, Abilities.CURSED_BODY, 455, 64, 115, 65, 83, 63, 65, 45, 35, 159, false, null, true),
-      new PokemonForm("Mega", SpeciesFormKey.MEGA, Type.GHOST, null, 1.2, 13, Abilities.PRANKSTER, Abilities.PRANKSTER, Abilities.PRANKSTER, 555, 64, 165, 75, 93, 83, 75, 45, 35, 159),
-    ),
-    new PokemonSpecies(Species.DUSKULL, 3, false, false, false, "Requiem Pokémon", Type.GHOST, null, 0.8, 15, Abilities.LEVITATE, Abilities.NONE, Abilities.FRISK, 295, 20, 40, 90, 30, 90, 25, 190, 35, 59, GrowthRate.FAST, 50, false),
-    new PokemonSpecies(Species.DUSCLOPS, 3, false, false, false, "Beckon Pokémon", Type.GHOST, null, 1.6, 30.6, Abilities.PRESSURE, Abilities.NONE, Abilities.FRISK, 455, 40, 70, 130, 60, 130, 25, 90, 35, 159, GrowthRate.FAST, 50, false),
-    new PokemonSpecies(Species.TROPIUS, 3, false, false, false, "Fruit Pokémon", Type.GRASS, Type.FLYING, 2, 100, Abilities.CHLOROPHYLL, Abilities.SOLAR_POWER, Abilities.HARVEST, 460, 99, 68, 83, 72, 87, 51, 200, 70, 161, GrowthRate.SLOW, 50, false),
-    new PokemonSpecies(Species.CHIMECHO, 3, false, false, false, "Wind Chime Pokémon", Type.PSYCHIC, null, 0.6, 1, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 455, 75, 50, 80, 95, 90, 65, 45, 70, 159, GrowthRate.FAST, 50, false),
-    new PokemonSpecies(Species.ABSOL, 3, false, false, false, "Disaster Pokémon", Type.DARK, null, 1.2, 47, Abilities.PRESSURE, Abilities.SUPER_LUCK, Abilities.JUSTIFIED, 465, 65, 130, 60, 75, 60, 75, 30, 35, 163, GrowthRate.MEDIUM_SLOW, 50, false, true,
-      new PokemonForm("Normal", "", Type.DARK, null, 1.2, 47, Abilities.PRESSURE, Abilities.SUPER_LUCK, Abilities.JUSTIFIED, 465, 65, 130, 60, 75, 60, 75, 30, 35, 163, false, null, true),
-      new PokemonForm("Mega", SpeciesFormKey.MEGA, Type.DARK, null, 1.2, 49, Abilities.MAGIC_BOUNCE, Abilities.MAGIC_BOUNCE, Abilities.MAGIC_BOUNCE, 565, 65, 150, 60, 115, 60, 115, 30, 35, 163),
-    ),
-    new PokemonSpecies(Species.WYNAUT, 3, false, false, false, "Bright Pokémon", Type.PSYCHIC, null, 0.6, 14, Abilities.SHADOW_TAG, Abilities.NONE, Abilities.TELEPATHY, 260, 95, 23, 48, 23, 48, 23, 125, 50, 52, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.SNORUNT, 3, false, false, false, "Snow Hat Pokémon", Type.ICE, null, 0.7, 16.8, Abilities.INNER_FOCUS, Abilities.ICE_BODY, Abilities.MOODY, 300, 50, 50, 50, 50, 50, 50, 190, 50, 60, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.GLALIE, 3, false, false, false, "Face Pokémon", Type.ICE, null, 1.5, 256.5, Abilities.INNER_FOCUS, Abilities.ICE_BODY, Abilities.MOODY, 480, 80, 80, 80, 80, 80, 80, 75, 50, 168, GrowthRate.MEDIUM_FAST, 50, false, true,
-      new PokemonForm("Normal", "", Type.ICE, null, 1.5, 256.5, Abilities.INNER_FOCUS, Abilities.ICE_BODY, Abilities.MOODY, 480, 80, 80, 80, 80, 80, 80, 75, 50, 168, false, null, true),
-      new PokemonForm("Mega", SpeciesFormKey.MEGA, Type.ICE, null, 2.1, 350.2, Abilities.REFRIGERATE, Abilities.REFRIGERATE, Abilities.REFRIGERATE, 580, 80, 120, 80, 120, 80, 100, 75, 50, 168),
-    ),
-    new PokemonSpecies(Species.SPHEAL, 3, false, false, false, "Clap Pokémon", Type.ICE, Type.WATER, 0.8, 39.5, Abilities.THICK_FAT, Abilities.ICE_BODY, Abilities.OBLIVIOUS, 290, 70, 40, 50, 55, 50, 25, 255, 50, 58, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.SEALEO, 3, false, false, false, "Ball Roll Pokémon", Type.ICE, Type.WATER, 1.1, 87.6, Abilities.THICK_FAT, Abilities.ICE_BODY, Abilities.OBLIVIOUS, 410, 90, 60, 70, 75, 70, 45, 120, 50, 144, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.WALREIN, 3, false, false, false, "Ice Break Pokémon", Type.ICE, Type.WATER, 1.4, 150.6, Abilities.THICK_FAT, Abilities.ICE_BODY, Abilities.OBLIVIOUS, 530, 110, 80, 90, 95, 90, 65, 45, 50, 265, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.CLAMPERL, 3, false, false, false, "Bivalve Pokémon", Type.WATER, null, 0.4, 52.5, Abilities.SHELL_ARMOR, Abilities.NONE, Abilities.RATTLED, 345, 35, 64, 85, 74, 55, 32, 255, 70, 69, GrowthRate.ERRATIC, 50, false),
-    new PokemonSpecies(Species.HUNTAIL, 3, false, false, false, "Deep Sea Pokémon", Type.WATER, null, 1.7, 27, Abilities.SWIFT_SWIM, Abilities.NONE, Abilities.WATER_VEIL, 485, 55, 104, 105, 94, 75, 52, 60, 70, 170, GrowthRate.ERRATIC, 50, false),
-    new PokemonSpecies(Species.GOREBYSS, 3, false, false, false, "South Sea Pokémon", Type.WATER, null, 1.8, 22.6, Abilities.SWIFT_SWIM, Abilities.NONE, Abilities.HYDRATION, 485, 55, 84, 105, 114, 75, 52, 60, 70, 170, GrowthRate.ERRATIC, 50, false),
-    new PokemonSpecies(Species.RELICANTH, 3, false, false, false, "Longevity Pokémon", Type.WATER, Type.ROCK, 1, 23.4, Abilities.SWIFT_SWIM, Abilities.ROCK_HEAD, Abilities.STURDY, 485, 100, 90, 130, 45, 65, 55, 25, 50, 170, GrowthRate.SLOW, 87.5, true),
-    new PokemonSpecies(Species.LUVDISC, 3, false, false, false, "Rendezvous Pokémon", Type.WATER, null, 0.6, 8.7, Abilities.SWIFT_SWIM, Abilities.NONE, Abilities.HYDRATION, 330, 43, 30, 55, 40, 65, 97, 225, 70, 116, GrowthRate.FAST, 25, false),
-    new PokemonSpecies(Species.BAGON, 3, false, false, false, "Rock Head Pokémon", Type.DRAGON, null, 0.6, 42.1, Abilities.ROCK_HEAD, Abilities.NONE, Abilities.SHEER_FORCE, 300, 45, 75, 60, 40, 30, 50, 45, 35, 60, GrowthRate.SLOW, 50, false),
-    new PokemonSpecies(Species.SHELGON, 3, false, false, false, "Endurance Pokémon", Type.DRAGON, null, 1.1, 110.5, Abilities.ROCK_HEAD, Abilities.NONE, Abilities.OVERCOAT, 420, 65, 95, 100, 60, 50, 50, 45, 35, 147, GrowthRate.SLOW, 50, false),
-    new PokemonSpecies(Species.SALAMENCE, 3, false, false, false, "Dragon Pokémon", Type.DRAGON, Type.FLYING, 1.5, 102.6, Abilities.INTIMIDATE, Abilities.NONE, Abilities.MOXIE, 600, 95, 135, 80, 110, 80, 100, 45, 35, 300, GrowthRate.SLOW, 50, false, true,
-      new PokemonForm("Normal", "", Type.DRAGON, Type.FLYING, 1.5, 102.6, Abilities.INTIMIDATE, Abilities.NONE, Abilities.MOXIE, 600, 95, 135, 80, 110, 80, 100, 45, 35, 300, false, null, true),
-      new PokemonForm("Mega", SpeciesFormKey.MEGA, Type.DRAGON, Type.FLYING, 1.8, 112.6, Abilities.AERILATE, Abilities.NONE, Abilities.AERILATE, 700, 95, 145, 130, 120, 90, 120, 45, 35, 300),
-    ),
-    new PokemonSpecies(Species.BELDUM, 3, false, false, false, "Iron Ball Pokémon", Type.STEEL, Type.PSYCHIC, 0.6, 95.2, Abilities.CLEAR_BODY, Abilities.NONE, Abilities.LIGHT_METAL, 300, 40, 55, 80, 35, 60, 30, 45, 35, 60, GrowthRate.SLOW, null, false), //Custom Catchrate, matching Frigibax
-    new PokemonSpecies(Species.METANG, 3, false, false, false, "Iron Claw Pokémon", Type.STEEL, Type.PSYCHIC, 1.2, 202.5, Abilities.CLEAR_BODY, Abilities.NONE, Abilities.LIGHT_METAL, 420, 60, 75, 100, 55, 80, 50, 25, 35, 147, GrowthRate.SLOW, null, false), //Custom Catchrate, matching Arctibax
-    new PokemonSpecies(Species.METAGROSS, 3, false, false, false, "Iron Leg Pokémon", Type.STEEL, Type.PSYCHIC, 1.6, 550, Abilities.CLEAR_BODY, Abilities.NONE, Abilities.LIGHT_METAL, 600, 80, 135, 130, 95, 90, 70, 10, 35, 300, GrowthRate.SLOW, null, false, true, //Custom Catchrate, matching Baxcalibur
-      new PokemonForm("Normal", "", Type.STEEL, Type.PSYCHIC, 1.6, 550, Abilities.CLEAR_BODY, Abilities.NONE, Abilities.LIGHT_METAL, 600, 80, 135, 130, 95, 90, 70, 3, 35, 300, false, null, true),
-      new PokemonForm("Mega", SpeciesFormKey.MEGA, Type.STEEL, Type.PSYCHIC, 2.5, 942.9, Abilities.TOUGH_CLAWS, Abilities.NONE, Abilities.TOUGH_CLAWS, 700, 80, 145, 150, 105, 110, 110, 3, 35, 300),
-    ),
-    new PokemonSpecies(Species.REGIROCK, 3, true, false, false, "Rock Peak Pokémon", Type.ROCK, null, 1.7, 230, Abilities.CLEAR_BODY, Abilities.NONE, Abilities.STURDY, 580, 80, 100, 200, 50, 100, 50, 3, 35, 290, GrowthRate.SLOW, null, false),
-    new PokemonSpecies(Species.REGICE, 3, true, false, false, "Iceberg Pokémon", Type.ICE, null, 1.8, 175, Abilities.CLEAR_BODY, Abilities.NONE, Abilities.ICE_BODY, 580, 80, 50, 100, 100, 200, 50, 3, 35, 290, GrowthRate.SLOW, null, false),
-    new PokemonSpecies(Species.REGISTEEL, 3, true, false, false, "Iron Pokémon", Type.STEEL, null, 1.9, 205, Abilities.CLEAR_BODY, Abilities.NONE, Abilities.LIGHT_METAL, 580, 80, 75, 150, 75, 150, 50, 3, 35, 290, GrowthRate.SLOW, null, false),
-    new PokemonSpecies(Species.LATIAS, 3, true, false, false, "Eon Pokémon", Type.DRAGON, Type.PSYCHIC, 1.4, 40, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 600, 80, 80, 90, 110, 130, 110, 3, 90, 300, GrowthRate.SLOW, 0, false, true,
-      new PokemonForm("Normal", "", Type.DRAGON, Type.PSYCHIC, 1.4, 40, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 600, 80, 80, 90, 110, 130, 110, 3, 90, 300, false, null, true),
-      new PokemonForm("Mega", SpeciesFormKey.MEGA, Type.DRAGON, Type.PSYCHIC, 1.8, 52, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 700, 80, 100, 120, 140, 150, 110, 3, 90, 300),
-    ),
-    new PokemonSpecies(Species.LATIOS, 3, true, false, false, "Eon Pokémon", Type.DRAGON, Type.PSYCHIC, 2, 60, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 600, 80, 90, 80, 130, 110, 110, 3, 90, 300, GrowthRate.SLOW, 100, false, true,
-      new PokemonForm("Normal", "", Type.DRAGON, Type.PSYCHIC, 2, 60, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 600, 80, 90, 80, 130, 110, 110, 3, 90, 300, false, null, true),
-      new PokemonForm("Mega", SpeciesFormKey.MEGA, Type.DRAGON, Type.PSYCHIC, 2.3, 70, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 700, 80, 130, 100, 160, 120, 110, 3, 90, 300),
-    ),
-    new PokemonSpecies(Species.KYOGRE, 3, false, true, false, "Sea Basin Pokémon", Type.WATER, null, 4.5, 352, Abilities.DRIZZLE, Abilities.NONE, Abilities.NONE, 670, 100, 100, 90, 150, 140, 90, 3, 0, 335, GrowthRate.SLOW, null, false, true,
-      new PokemonForm("Normal", "", Type.WATER, null, 4.5, 352, Abilities.DRIZZLE, Abilities.NONE, Abilities.NONE, 670, 100, 100, 90, 150, 140, 90, 3, 0, 335, false, null, true),
-      new PokemonForm("Primal", "primal", Type.WATER, null, 9.8, 430, Abilities.PRIMORDIAL_SEA, Abilities.NONE, Abilities.NONE, 770, 100, 150, 90, 180, 160, 90, 3, 0, 335),
-    ),
-    new PokemonSpecies(Species.GROUDON, 3, false, true, false, "Continent Pokémon", Type.GROUND, null, 3.5, 950, Abilities.DROUGHT, Abilities.NONE, Abilities.NONE, 670, 100, 150, 140, 100, 90, 90, 3, 0, 335, GrowthRate.SLOW, null, false, true,
-      new PokemonForm("Normal", "", Type.GROUND, null, 3.5, 950, Abilities.DROUGHT, Abilities.NONE, Abilities.NONE, 670, 100, 150, 140, 100, 90, 90, 3, 0, 335, false, null, true),
-      new PokemonForm("Primal", "primal", Type.GROUND, Type.FIRE, 5, 999.7, Abilities.DESOLATE_LAND, Abilities.NONE, Abilities.NONE, 770, 100, 180, 160, 150, 90, 90, 3, 0, 335),
-    ),
-    new PokemonSpecies(Species.RAYQUAZA, 3, false, true, false, "Sky High Pokémon", Type.DRAGON, Type.FLYING, 7, 206.5, Abilities.AIR_LOCK, Abilities.NONE, Abilities.NONE, 680, 105, 150, 90, 150, 90, 95, 45, 0, 340, GrowthRate.SLOW, null, false, true,
-      new PokemonForm("Normal", "", Type.DRAGON, Type.FLYING, 7, 206.5, Abilities.AIR_LOCK, Abilities.NONE, Abilities.NONE, 680, 105, 150, 90, 150, 90, 95, 45, 0, 340, false, null, true),
-      new PokemonForm("Mega", SpeciesFormKey.MEGA, Type.DRAGON, Type.FLYING, 10.8, 392, Abilities.DELTA_STREAM, Abilities.NONE, Abilities.NONE, 780, 105, 180, 100, 180, 100, 115, 45, 0, 340),
-    ),
-    new PokemonSpecies(Species.JIRACHI, 3, false, false, true, "Wish Pokémon", Type.STEEL, Type.PSYCHIC, 0.3, 1.1, Abilities.SERENE_GRACE, Abilities.NONE, Abilities.NONE, 600, 100, 100, 100, 100, 100, 100, 3, 100, 300, GrowthRate.SLOW, null, false),
-    new PokemonSpecies(Species.DEOXYS, 3, false, false, true, "DNA Pokémon", Type.PSYCHIC, null, 1.7, 60.8, Abilities.PRESSURE, Abilities.NONE, Abilities.NONE, 600, 50, 150, 50, 150, 50, 150, 3, 0, 300, GrowthRate.SLOW, null, false, true,
-      new PokemonForm("Normal Forme", "normal", Type.PSYCHIC, null, 1.7, 60.8, Abilities.PRESSURE, Abilities.NONE, Abilities.NONE, 600, 50, 150, 50, 150, 50, 150, 3, 0, 300, false, "", true),
-      new PokemonForm("Attack Forme", "attack", Type.PSYCHIC, null, 1.7, 60.8, Abilities.PRESSURE, Abilities.NONE, Abilities.NONE, 600, 50, 180, 20, 180, 20, 150, 3, 0, 300),
-      new PokemonForm("Defense Forme", "defense", Type.PSYCHIC, null, 1.7, 60.8, Abilities.PRESSURE, Abilities.NONE, Abilities.NONE, 600, 50, 70, 160, 70, 160, 90, 3, 0, 300),
-      new PokemonForm("Speed Forme", "speed", Type.PSYCHIC, null, 1.7, 60.8, Abilities.PRESSURE, Abilities.NONE, Abilities.NONE, 600, 50, 95, 90, 95, 90, 180, 3, 0, 300),
-    ),
-    new PokemonSpecies(Species.TURTWIG, 4, false, false, false, "Tiny Leaf Pokémon", Type.GRASS, null, 0.4, 10.2, Abilities.OVERGROW, Abilities.NONE, Abilities.SHELL_ARMOR, 318, 55, 68, 64, 45, 55, 31, 45, 70, 64, GrowthRate.MEDIUM_SLOW, 87.5, false),
-    new PokemonSpecies(Species.GROTLE, 4, false, false, false, "Grove Pokémon", Type.GRASS, null, 1.1, 97, Abilities.OVERGROW, Abilities.NONE, Abilities.SHELL_ARMOR, 405, 75, 89, 85, 55, 65, 36, 45, 70, 142, GrowthRate.MEDIUM_SLOW, 87.5, false),
-    new PokemonSpecies(Species.TORTERRA, 4, false, false, false, "Continent Pokémon", Type.GRASS, Type.GROUND, 2.2, 310, Abilities.OVERGROW, Abilities.NONE, Abilities.SHELL_ARMOR, 525, 95, 109, 105, 75, 85, 56, 45, 70, 263, GrowthRate.MEDIUM_SLOW, 87.5, false),
-    new PokemonSpecies(Species.CHIMCHAR, 4, false, false, false, "Chimp Pokémon", Type.FIRE, null, 0.5, 6.2, Abilities.BLAZE, Abilities.NONE, Abilities.IRON_FIST, 309, 44, 58, 44, 58, 44, 61, 45, 70, 62, GrowthRate.MEDIUM_SLOW, 87.5, false),
-    new PokemonSpecies(Species.MONFERNO, 4, false, false, false, "Playful Pokémon", Type.FIRE, Type.FIGHTING, 0.9, 22, Abilities.BLAZE, Abilities.NONE, Abilities.IRON_FIST, 405, 64, 78, 52, 78, 52, 81, 45, 70, 142, GrowthRate.MEDIUM_SLOW, 87.5, false),
-    new PokemonSpecies(Species.INFERNAPE, 4, false, false, false, "Flame Pokémon", Type.FIRE, Type.FIGHTING, 1.2, 55, Abilities.BLAZE, Abilities.NONE, Abilities.IRON_FIST, 534, 76, 104, 71, 104, 71, 108, 45, 70, 267, GrowthRate.MEDIUM_SLOW, 87.5, false),
-    new PokemonSpecies(Species.PIPLUP, 4, false, false, false, "Penguin Pokémon", Type.WATER, null, 0.4, 5.2, Abilities.TORRENT, Abilities.NONE, Abilities.COMPETITIVE, 314, 53, 51, 53, 61, 56, 40, 45, 70, 63, GrowthRate.MEDIUM_SLOW, 87.5, false),
-    new PokemonSpecies(Species.PRINPLUP, 4, false, false, false, "Penguin Pokémon", Type.WATER, null, 0.8, 23, Abilities.TORRENT, Abilities.NONE, Abilities.COMPETITIVE, 405, 64, 66, 68, 81, 76, 50, 45, 70, 142, GrowthRate.MEDIUM_SLOW, 87.5, false),
-    new PokemonSpecies(Species.EMPOLEON, 4, false, false, false, "Emperor Pokémon", Type.WATER, Type.STEEL, 1.7, 84.5, Abilities.TORRENT, Abilities.NONE, Abilities.COMPETITIVE, 530, 84, 86, 88, 111, 101, 60, 45, 70, 265, GrowthRate.MEDIUM_SLOW, 87.5, false),
-    new PokemonSpecies(Species.STARLY, 4, false, false, false, "Starling Pokémon", Type.NORMAL, Type.FLYING, 0.3, 2, Abilities.KEEN_EYE, Abilities.NONE, Abilities.RECKLESS, 245, 40, 55, 30, 30, 30, 60, 255, 70, 49, GrowthRate.MEDIUM_SLOW, 50, true),
-    new PokemonSpecies(Species.STARAVIA, 4, false, false, false, "Starling Pokémon", Type.NORMAL, Type.FLYING, 0.6, 15.5, Abilities.INTIMIDATE, Abilities.NONE, Abilities.RECKLESS, 340, 55, 75, 50, 40, 40, 80, 120, 70, 119, GrowthRate.MEDIUM_SLOW, 50, true),
-    new PokemonSpecies(Species.STARAPTOR, 4, false, false, false, "Predator Pokémon", Type.NORMAL, Type.FLYING, 1.2, 24.9, Abilities.INTIMIDATE, Abilities.NONE, Abilities.RECKLESS, 485, 85, 120, 70, 50, 60, 100, 45, 70, 243, GrowthRate.MEDIUM_SLOW, 50, true),
-    new PokemonSpecies(Species.BIDOOF, 4, false, false, false, "Plump Mouse Pokémon", Type.NORMAL, null, 0.5, 20, Abilities.SIMPLE, Abilities.UNAWARE, Abilities.MOODY, 250, 59, 45, 40, 35, 40, 31, 255, 70, 50, GrowthRate.MEDIUM_FAST, 50, true),
-    new PokemonSpecies(Species.BIBAREL, 4, false, false, false, "Beaver Pokémon", Type.NORMAL, Type.WATER, 1, 31.5, Abilities.SIMPLE, Abilities.UNAWARE, Abilities.MOODY, 410, 79, 85, 60, 55, 60, 71, 127, 70, 144, GrowthRate.MEDIUM_FAST, 50, true),
-    new PokemonSpecies(Species.KRICKETOT, 4, false, false, false, "Cricket Pokémon", Type.BUG, null, 0.3, 2.2, Abilities.SHED_SKIN, Abilities.NONE, Abilities.RUN_AWAY, 194, 37, 25, 41, 25, 41, 25, 255, 70, 39, GrowthRate.MEDIUM_SLOW, 50, true),
-    new PokemonSpecies(Species.KRICKETUNE, 4, false, false, false, "Cricket Pokémon", Type.BUG, null, 1, 25.5, Abilities.SWARM, Abilities.NONE, Abilities.TECHNICIAN, 384, 77, 85, 51, 55, 51, 65, 45, 70, 134, GrowthRate.MEDIUM_SLOW, 50, true),
-    new PokemonSpecies(Species.SHINX, 4, false, false, false, "Flash Pokémon", Type.ELECTRIC, null, 0.5, 9.5, Abilities.RIVALRY, Abilities.INTIMIDATE, Abilities.GUTS, 263, 45, 65, 34, 40, 34, 45, 235, 50, 53, GrowthRate.MEDIUM_SLOW, 50, true),
-    new PokemonSpecies(Species.LUXIO, 4, false, false, false, "Spark Pokémon", Type.ELECTRIC, null, 0.9, 30.5, Abilities.RIVALRY, Abilities.INTIMIDATE, Abilities.GUTS, 363, 60, 85, 49, 60, 49, 60, 120, 100, 127, GrowthRate.MEDIUM_SLOW, 50, true),
-    new PokemonSpecies(Species.LUXRAY, 4, false, false, false, "Gleam Eyes Pokémon", Type.ELECTRIC, null, 1.4, 42, Abilities.RIVALRY, Abilities.INTIMIDATE, Abilities.GUTS, 523, 80, 120, 79, 95, 79, 70, 45, 50, 262, GrowthRate.MEDIUM_SLOW, 50, true),
-    new PokemonSpecies(Species.BUDEW, 4, false, false, false, "Bud Pokémon", Type.GRASS, Type.POISON, 0.2, 1.2, Abilities.NATURAL_CURE, Abilities.POISON_POINT, Abilities.LEAF_GUARD, 280, 40, 30, 35, 50, 70, 55, 255, 50, 56, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.ROSERADE, 4, false, false, false, "Bouquet Pokémon", Type.GRASS, Type.POISON, 0.9, 14.5, Abilities.NATURAL_CURE, Abilities.POISON_POINT, Abilities.TECHNICIAN, 515, 60, 70, 65, 125, 105, 90, 75, 50, 258, GrowthRate.MEDIUM_SLOW, 50, true),
-    new PokemonSpecies(Species.CRANIDOS, 4, false, false, false, "Head Butt Pokémon", Type.ROCK, null, 0.9, 31.5, Abilities.MOLD_BREAKER, Abilities.NONE, Abilities.SHEER_FORCE, 350, 67, 125, 40, 30, 30, 58, 45, 70, 70, GrowthRate.ERRATIC, 87.5, false),
-    new PokemonSpecies(Species.RAMPARDOS, 4, false, false, false, "Head Butt Pokémon", Type.ROCK, null, 1.6, 102.5, Abilities.MOLD_BREAKER, Abilities.NONE, Abilities.SHEER_FORCE, 495, 97, 165, 60, 65, 50, 58, 45, 70, 173, GrowthRate.ERRATIC, 87.5, false),
-    new PokemonSpecies(Species.SHIELDON, 4, false, false, false, "Shield Pokémon", Type.ROCK, Type.STEEL, 0.5, 57, Abilities.STURDY, Abilities.NONE, Abilities.SOUNDPROOF, 350, 30, 42, 118, 42, 88, 30, 45, 70, 70, GrowthRate.ERRATIC, 87.5, false),
-    new PokemonSpecies(Species.BASTIODON, 4, false, false, false, "Shield Pokémon", Type.ROCK, Type.STEEL, 1.3, 149.5, Abilities.STURDY, Abilities.NONE, Abilities.SOUNDPROOF, 495, 60, 52, 168, 47, 138, 30, 45, 70, 173, GrowthRate.ERRATIC, 87.5, false),
-    new PokemonSpecies(Species.BURMY, 4, false, false, false, "Bagworm Pokémon", Type.BUG, null, 0.2, 3.4, Abilities.SHED_SKIN, Abilities.NONE, Abilities.OVERCOAT, 224, 40, 29, 45, 29, 45, 36, 120, 70, 45, GrowthRate.MEDIUM_FAST, 50, false, true,
-      new PokemonForm("Plant Cloak", "plant", Type.BUG, null, 0.2, 3.4, Abilities.SHED_SKIN, Abilities.NONE, Abilities.OVERCOAT, 224, 40, 29, 45, 29, 45, 36, 120, 70, 45, false, null, true),
-      new PokemonForm("Sandy Cloak", "sandy", Type.BUG, null, 0.2, 3.4, Abilities.SHED_SKIN, Abilities.NONE, Abilities.OVERCOAT, 224, 40, 29, 45, 29, 45, 36, 120, 70, 45, false, null, true),
-      new PokemonForm("Trash Cloak", "trash", Type.BUG, null, 0.2, 3.4, Abilities.SHED_SKIN, Abilities.NONE, Abilities.OVERCOAT, 224, 40, 29, 45, 29, 45, 36, 120, 70, 45, false, null, true),
-    ),
-    new PokemonSpecies(Species.WORMADAM, 4, false, false, false, "Bagworm Pokémon", Type.BUG, Type.GRASS, 0.5, 6.5, Abilities.ANTICIPATION, Abilities.NONE, Abilities.OVERCOAT, 424, 60, 59, 85, 79, 105, 36, 45, 70, 148, GrowthRate.MEDIUM_FAST, 0, false, false,
-      new PokemonForm("Plant Cloak", "plant", Type.BUG, Type.GRASS, 0.5, 6.5, Abilities.ANTICIPATION, Abilities.NONE, Abilities.OVERCOAT, 424, 60, 59, 85, 79, 105, 36, 45, 70, 148, false, null, true),
-      new PokemonForm("Sandy Cloak", "sandy", Type.BUG, Type.GROUND, 0.5, 6.5, Abilities.ANTICIPATION, Abilities.NONE, Abilities.OVERCOAT, 424, 60, 79, 105, 59, 85, 36, 45, 70, 148, false, null, true),
-      new PokemonForm("Trash Cloak", "trash", Type.BUG, Type.STEEL, 0.5, 6.5, Abilities.ANTICIPATION, Abilities.NONE, Abilities.OVERCOAT, 424, 60, 69, 95, 69, 95, 36, 45, 70, 148, false, null, true),
-    ),
-    new PokemonSpecies(Species.MOTHIM, 4, false, false, false, "Moth Pokémon", Type.BUG, Type.FLYING, 0.9, 23.3, Abilities.SWARM, Abilities.NONE, Abilities.TINTED_LENS, 424, 70, 94, 50, 94, 50, 66, 45, 70, 148, GrowthRate.MEDIUM_FAST, 100, false),
-    new PokemonSpecies(Species.COMBEE, 4, false, false, false, "Tiny Bee Pokémon", Type.BUG, Type.FLYING, 0.3, 5.5, Abilities.HONEY_GATHER, Abilities.NONE, Abilities.HUSTLE, 244, 30, 30, 42, 30, 42, 70, 120, 50, 49, GrowthRate.MEDIUM_SLOW, 87.5, true),
-    new PokemonSpecies(Species.VESPIQUEN, 4, false, false, false, "Beehive Pokémon", Type.BUG, Type.FLYING, 1.2, 38.5, Abilities.PRESSURE, Abilities.NONE, Abilities.UNNERVE, 474, 70, 80, 102, 80, 102, 40, 45, 50, 166, GrowthRate.MEDIUM_SLOW, 0, false),
-    new PokemonSpecies(Species.PACHIRISU, 4, false, false, false, "EleSquirrel Pokémon", Type.ELECTRIC, null, 0.4, 3.9, Abilities.RUN_AWAY, Abilities.PICKUP, Abilities.VOLT_ABSORB, 405, 60, 45, 70, 45, 90, 95, 200, 100, 142, GrowthRate.MEDIUM_FAST, 50, true),
-    new PokemonSpecies(Species.BUIZEL, 4, false, false, false, "Sea Weasel Pokémon", Type.WATER, null, 0.7, 29.5, Abilities.SWIFT_SWIM, Abilities.NONE, Abilities.WATER_VEIL, 330, 55, 65, 35, 60, 30, 85, 190, 70, 66, GrowthRate.MEDIUM_FAST, 50, true),
-    new PokemonSpecies(Species.FLOATZEL, 4, false, false, false, "Sea Weasel Pokémon", Type.WATER, null, 1.1, 33.5, Abilities.SWIFT_SWIM, Abilities.NONE, Abilities.WATER_VEIL, 495, 85, 105, 55, 85, 50, 115, 75, 70, 173, GrowthRate.MEDIUM_FAST, 50, true),
-    new PokemonSpecies(Species.CHERUBI, 4, false, false, false, "Cherry Pokémon", Type.GRASS, null, 0.4, 3.3, Abilities.CHLOROPHYLL, Abilities.NONE, Abilities.NONE, 275, 45, 35, 45, 62, 53, 35, 190, 50, 55, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.CHERRIM, 4, false, false, false, "Blossom Pokémon", Type.GRASS, null, 0.5, 9.3, Abilities.FLOWER_GIFT, Abilities.NONE, Abilities.NONE, 450, 70, 60, 70, 87, 78, 85, 75, 50, 158, GrowthRate.MEDIUM_FAST, 50, false, true,
-      new PokemonForm("Overcast Form", "overcast", Type.GRASS, null, 0.5, 9.3, Abilities.FLOWER_GIFT, Abilities.NONE, Abilities.NONE, 450, 70, 60, 70, 87, 78, 85, 75, 50, 158, false, null, true),
-      new PokemonForm("Sunshine Form", "sunshine", Type.GRASS, null, 0.5, 9.3, Abilities.FLOWER_GIFT, Abilities.NONE, Abilities.NONE, 450, 70, 60, 70, 87, 78, 85, 75, 50, 158),
-    ),
-    new PokemonSpecies(Species.SHELLOS, 4, false, false, false, "Sea Slug Pokémon", Type.WATER, null, 0.3, 6.3, Abilities.STICKY_HOLD, Abilities.STORM_DRAIN, Abilities.SAND_FORCE, 325, 76, 48, 48, 57, 62, 34, 190, 50, 65, GrowthRate.MEDIUM_FAST, 50, false, false,
-      new PokemonForm("East Sea", "east", Type.WATER, null, 0.3, 6.3, Abilities.STICKY_HOLD, Abilities.STORM_DRAIN, Abilities.SAND_FORCE, 325, 76, 48, 48, 57, 62, 34, 190, 50, 65, false, null, true),
-      new PokemonForm("West Sea", "west", Type.WATER, null, 0.3, 6.3, Abilities.STICKY_HOLD, Abilities.STORM_DRAIN, Abilities.SAND_FORCE, 325, 76, 48, 48, 57, 62, 34, 190, 50, 65, false, null, true),
-    ),
-    new PokemonSpecies(Species.GASTRODON, 4, false, false, false, "Sea Slug Pokémon", Type.WATER, Type.GROUND, 0.9, 29.9, Abilities.STICKY_HOLD, Abilities.STORM_DRAIN, Abilities.SAND_FORCE, 475, 111, 83, 68, 92, 82, 39, 75, 50, 166, GrowthRate.MEDIUM_FAST, 50, false, false,
-      new PokemonForm("East Sea", "east", Type.WATER, Type.GROUND, 0.9, 29.9, Abilities.STICKY_HOLD, Abilities.STORM_DRAIN, Abilities.SAND_FORCE, 475, 111, 83, 68, 92, 82, 39, 75, 50, 166, false, null, true),
-      new PokemonForm("West Sea", "west", Type.WATER, Type.GROUND, 0.9, 29.9, Abilities.STICKY_HOLD, Abilities.STORM_DRAIN, Abilities.SAND_FORCE, 475, 111, 83, 68, 92, 82, 39, 75, 50, 166, false, null, true),
-    ),
-    new PokemonSpecies(Species.AMBIPOM, 4, false, false, false, "Long Tail Pokémon", Type.NORMAL, null, 1.2, 20.3, Abilities.TECHNICIAN, Abilities.PICKUP, Abilities.SKILL_LINK, 482, 75, 100, 66, 60, 66, 115, 45, 100, 169, GrowthRate.FAST, 50, true),
-    new PokemonSpecies(Species.DRIFLOON, 4, false, false, false, "Balloon Pokémon", Type.GHOST, Type.FLYING, 0.4, 1.2, Abilities.AFTERMATH, Abilities.UNBURDEN, Abilities.FLARE_BOOST, 348, 90, 50, 34, 60, 44, 70, 125, 50, 70, GrowthRate.FLUCTUATING, 50, false),
-    new PokemonSpecies(Species.DRIFBLIM, 4, false, false, false, "Blimp Pokémon", Type.GHOST, Type.FLYING, 1.2, 15, Abilities.AFTERMATH, Abilities.UNBURDEN, Abilities.FLARE_BOOST, 498, 150, 80, 44, 90, 54, 80, 60, 50, 174, GrowthRate.FLUCTUATING, 50, false),
-    new PokemonSpecies(Species.BUNEARY, 4, false, false, false, "Rabbit Pokémon", Type.NORMAL, null, 0.4, 5.5, Abilities.RUN_AWAY, Abilities.KLUTZ, Abilities.LIMBER, 350, 55, 66, 44, 44, 56, 85, 190, 0, 70, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.LOPUNNY, 4, false, false, false, "Rabbit Pokémon", Type.NORMAL, null, 1.2, 33.3, Abilities.CUTE_CHARM, Abilities.KLUTZ, Abilities.LIMBER, 480, 65, 76, 84, 54, 96, 105, 60, 140, 168, GrowthRate.MEDIUM_FAST, 50, false, true,
-      new PokemonForm("Normal", "", Type.NORMAL, null, 1.2, 33.3, Abilities.CUTE_CHARM, Abilities.KLUTZ, Abilities.LIMBER, 480, 65, 76, 84, 54, 96, 105, 60, 140, 168, false, null, true),
-      new PokemonForm("Mega", SpeciesFormKey.MEGA, Type.NORMAL, Type.FIGHTING, 1.3, 28.3, Abilities.SCRAPPY, Abilities.SCRAPPY, Abilities.SCRAPPY, 580, 65, 136, 94, 54, 96, 135, 60, 140, 168),
-    ),
-    new PokemonSpecies(Species.MISMAGIUS, 4, false, false, false, "Magical Pokémon", Type.GHOST, null, 0.9, 4.4, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 495, 60, 60, 60, 105, 105, 105, 45, 35, 173, GrowthRate.FAST, 50, false),
-    new PokemonSpecies(Species.HONCHKROW, 4, false, false, false, "Big Boss Pokémon", Type.DARK, Type.FLYING, 0.9, 27.3, Abilities.INSOMNIA, Abilities.SUPER_LUCK, Abilities.MOXIE, 505, 100, 125, 52, 105, 52, 71, 30, 35, 177, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.GLAMEOW, 4, false, false, false, "Catty Pokémon", Type.NORMAL, null, 0.5, 3.9, Abilities.LIMBER, Abilities.OWN_TEMPO, Abilities.KEEN_EYE, 310, 49, 55, 42, 42, 37, 85, 190, 70, 62, GrowthRate.FAST, 25, false),
-    new PokemonSpecies(Species.PURUGLY, 4, false, false, false, "Tiger Cat Pokémon", Type.NORMAL, null, 1, 43.8, Abilities.THICK_FAT, Abilities.OWN_TEMPO, Abilities.DEFIANT, 452, 71, 82, 64, 64, 59, 112, 75, 70, 158, GrowthRate.FAST, 25, false),
-    new PokemonSpecies(Species.CHINGLING, 4, false, false, false, "Bell Pokémon", Type.PSYCHIC, null, 0.2, 0.6, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 285, 45, 30, 50, 65, 50, 45, 120, 70, 57, GrowthRate.FAST, 50, false),
-    new PokemonSpecies(Species.STUNKY, 4, false, false, false, "Skunk Pokémon", Type.POISON, Type.DARK, 0.4, 19.2, Abilities.STENCH, Abilities.AFTERMATH, Abilities.KEEN_EYE, 329, 63, 63, 47, 41, 41, 74, 225, 50, 66, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.SKUNTANK, 4, false, false, false, "Skunk Pokémon", Type.POISON, Type.DARK, 1, 38, Abilities.STENCH, Abilities.AFTERMATH, Abilities.KEEN_EYE, 479, 103, 93, 67, 71, 61, 84, 60, 50, 168, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.BRONZOR, 4, false, false, false, "Bronze Pokémon", Type.STEEL, Type.PSYCHIC, 0.5, 60.5, Abilities.LEVITATE, Abilities.HEATPROOF, Abilities.HEAVY_METAL, 300, 57, 24, 86, 24, 86, 23, 255, 50, 60, GrowthRate.MEDIUM_FAST, null, false),
-    new PokemonSpecies(Species.BRONZONG, 4, false, false, false, "Bronze Bell Pokémon", Type.STEEL, Type.PSYCHIC, 1.3, 187, Abilities.LEVITATE, Abilities.HEATPROOF, Abilities.HEAVY_METAL, 500, 67, 89, 116, 79, 116, 33, 90, 50, 175, GrowthRate.MEDIUM_FAST, null, false),
-    new PokemonSpecies(Species.BONSLY, 4, false, false, false, "Bonsai Pokémon", Type.ROCK, null, 0.5, 15, Abilities.STURDY, Abilities.ROCK_HEAD, Abilities.RATTLED, 290, 50, 80, 95, 10, 45, 10, 255, 50, 58, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.MIME_JR, 4, false, false, false, "Mime Pokémon", Type.PSYCHIC, Type.FAIRY, 0.6, 13, Abilities.SOUNDPROOF, Abilities.FILTER, Abilities.TECHNICIAN, 310, 20, 25, 45, 70, 90, 60, 145, 50, 62, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.HAPPINY, 4, false, false, false, "Playhouse Pokémon", Type.NORMAL, null, 0.6, 24.4, Abilities.NATURAL_CURE, Abilities.SERENE_GRACE, Abilities.FRIEND_GUARD, 220, 100, 5, 5, 15, 65, 30, 130, 140, 110, GrowthRate.FAST, 0, false),
-    new PokemonSpecies(Species.CHATOT, 4, false, false, false, "Music Note Pokémon", Type.NORMAL, Type.FLYING, 0.5, 1.9, Abilities.KEEN_EYE, Abilities.TANGLED_FEET, Abilities.BIG_PECKS, 411, 76, 65, 45, 92, 42, 91, 30, 35, 144, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.SPIRITOMB, 4, false, false, false, "Forbidden Pokémon", Type.GHOST, Type.DARK, 1, 108, Abilities.PRESSURE, Abilities.NONE, Abilities.INFILTRATOR, 485, 50, 92, 108, 92, 108, 35, 100, 50, 170, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.GIBLE, 4, false, false, false, "Land Shark Pokémon", Type.DRAGON, Type.GROUND, 0.7, 20.5, Abilities.SAND_VEIL, Abilities.NONE, Abilities.ROUGH_SKIN, 300, 58, 70, 45, 40, 45, 42, 45, 50, 60, GrowthRate.SLOW, 50, true),
-    new PokemonSpecies(Species.GABITE, 4, false, false, false, "Cave Pokémon", Type.DRAGON, Type.GROUND, 1.4, 56, Abilities.SAND_VEIL, Abilities.NONE, Abilities.ROUGH_SKIN, 410, 68, 90, 65, 50, 55, 82, 45, 50, 144, GrowthRate.SLOW, 50, true),
-    new PokemonSpecies(Species.GARCHOMP, 4, false, false, false, "Mach Pokémon", Type.DRAGON, Type.GROUND, 1.9, 95, Abilities.SAND_VEIL, Abilities.NONE, Abilities.ROUGH_SKIN, 600, 108, 130, 95, 80, 85, 102, 45, 50, 300, GrowthRate.SLOW, 50, true, true,
-      new PokemonForm("Normal", "", Type.DRAGON, Type.GROUND, 1.9, 95, Abilities.SAND_VEIL, Abilities.NONE, Abilities.ROUGH_SKIN, 600, 108, 130, 95, 80, 85, 102, 45, 50, 300, true, null, true),
-      new PokemonForm("Mega", SpeciesFormKey.MEGA, Type.DRAGON, Type.GROUND, 1.9, 95, Abilities.SAND_FORCE, Abilities.NONE, Abilities.SAND_FORCE, 700, 108, 170, 115, 120, 95, 92, 45, 50, 300, true),
-    ),
-    new PokemonSpecies(Species.MUNCHLAX, 4, false, false, false, "Big Eater Pokémon", Type.NORMAL, null, 0.6, 105, Abilities.PICKUP, Abilities.THICK_FAT, Abilities.GLUTTONY, 390, 135, 85, 40, 40, 85, 5, 50, 50, 78, GrowthRate.SLOW, 87.5, false),
-    new PokemonSpecies(Species.RIOLU, 4, false, false, false, "Emanation Pokémon", Type.FIGHTING, null, 0.7, 20.2, Abilities.STEADFAST, Abilities.INNER_FOCUS, Abilities.PRANKSTER, 285, 40, 70, 40, 35, 40, 60, 75, 50, 57, GrowthRate.MEDIUM_SLOW, 87.5, false),
-    new PokemonSpecies(Species.LUCARIO, 4, false, false, false, "Aura Pokémon", Type.FIGHTING, Type.STEEL, 1.2, 54, Abilities.STEADFAST, Abilities.INNER_FOCUS, Abilities.JUSTIFIED, 525, 70, 110, 70, 115, 70, 90, 45, 50, 184, GrowthRate.MEDIUM_SLOW, 87.5, false, true,
-      new PokemonForm("Normal", "", Type.FIGHTING, Type.STEEL, 1.2, 54, Abilities.STEADFAST, Abilities.INNER_FOCUS, Abilities.JUSTIFIED, 525, 70, 110, 70, 115, 70, 90, 45, 50, 184, false, null, true),
-      new PokemonForm("Mega", SpeciesFormKey.MEGA, Type.FIGHTING, Type.STEEL, 1.3, 57.5, Abilities.ADAPTABILITY, Abilities.ADAPTABILITY, Abilities.ADAPTABILITY, 625, 70, 145, 88, 140, 70, 112, 45, 50, 184),
-    ),
-    new PokemonSpecies(Species.HIPPOPOTAS, 4, false, false, false, "Hippo Pokémon", Type.GROUND, null, 0.8, 49.5, Abilities.SAND_STREAM, Abilities.NONE, Abilities.SAND_FORCE, 330, 68, 72, 78, 38, 42, 32, 140, 50, 66, GrowthRate.SLOW, 50, true),
-    new PokemonSpecies(Species.HIPPOWDON, 4, false, false, false, "Heavyweight Pokémon", Type.GROUND, null, 2, 300, Abilities.SAND_STREAM, Abilities.NONE, Abilities.SAND_FORCE, 525, 108, 112, 118, 68, 72, 47, 60, 50, 184, GrowthRate.SLOW, 50, true),
-    new PokemonSpecies(Species.SKORUPI, 4, false, false, false, "Scorpion Pokémon", Type.POISON, Type.BUG, 0.8, 12, Abilities.BATTLE_ARMOR, Abilities.SNIPER, Abilities.KEEN_EYE, 330, 40, 50, 90, 30, 55, 65, 120, 50, 66, GrowthRate.SLOW, 50, false),
-    new PokemonSpecies(Species.DRAPION, 4, false, false, false, "Ogre Scorpion Pokémon", Type.POISON, Type.DARK, 1.3, 61.5, Abilities.BATTLE_ARMOR, Abilities.SNIPER, Abilities.KEEN_EYE, 500, 70, 90, 110, 60, 75, 95, 45, 50, 175, GrowthRate.SLOW, 50, false),
-    new PokemonSpecies(Species.CROAGUNK, 4, false, false, false, "Toxic Mouth Pokémon", Type.POISON, Type.FIGHTING, 0.7, 23, Abilities.ANTICIPATION, Abilities.DRY_SKIN, Abilities.POISON_TOUCH, 300, 48, 61, 40, 61, 40, 50, 140, 100, 60, GrowthRate.MEDIUM_FAST, 50, true),
-    new PokemonSpecies(Species.TOXICROAK, 4, false, false, false, "Toxic Mouth Pokémon", Type.POISON, Type.FIGHTING, 1.3, 44.4, Abilities.ANTICIPATION, Abilities.DRY_SKIN, Abilities.POISON_TOUCH, 490, 83, 106, 65, 86, 65, 85, 75, 50, 172, GrowthRate.MEDIUM_FAST, 50, true),
-    new PokemonSpecies(Species.CARNIVINE, 4, false, false, false, "Bug Catcher Pokémon", Type.GRASS, null, 1.4, 27, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 454, 74, 100, 72, 90, 72, 46, 200, 70, 159, GrowthRate.SLOW, 50, false),
-    new PokemonSpecies(Species.FINNEON, 4, false, false, false, "Wing Fish Pokémon", Type.WATER, null, 0.4, 7, Abilities.SWIFT_SWIM, Abilities.STORM_DRAIN, Abilities.WATER_VEIL, 330, 49, 49, 56, 49, 61, 66, 190, 70, 66, GrowthRate.ERRATIC, 50, true),
-    new PokemonSpecies(Species.LUMINEON, 4, false, false, false, "Neon Pokémon", Type.WATER, null, 1.2, 24, Abilities.SWIFT_SWIM, Abilities.STORM_DRAIN, Abilities.WATER_VEIL, 460, 69, 69, 76, 69, 86, 91, 75, 70, 161, GrowthRate.ERRATIC, 50, true),
-    new PokemonSpecies(Species.MANTYKE, 4, false, false, false, "Kite Pokémon", Type.WATER, Type.FLYING, 1, 65, Abilities.SWIFT_SWIM, Abilities.WATER_ABSORB, Abilities.WATER_VEIL, 345, 45, 20, 50, 60, 120, 50, 25, 50, 69, GrowthRate.SLOW, 50, false),
-    new PokemonSpecies(Species.SNOVER, 4, false, false, false, "Frost Tree Pokémon", Type.GRASS, Type.ICE, 1, 50.5, Abilities.SNOW_WARNING, Abilities.NONE, Abilities.SOUNDPROOF, 334, 60, 62, 50, 62, 60, 40, 120, 50, 67, GrowthRate.SLOW, 50, true),
-    new PokemonSpecies(Species.ABOMASNOW, 4, false, false, false, "Frost Tree Pokémon", Type.GRASS, Type.ICE, 2.2, 135.5, Abilities.SNOW_WARNING, Abilities.NONE, Abilities.SOUNDPROOF, 494, 90, 92, 75, 92, 85, 60, 60, 50, 173, GrowthRate.SLOW, 50, true, true,
-      new PokemonForm("Normal", "", Type.GRASS, Type.ICE, 2.2, 135.5, Abilities.SNOW_WARNING, Abilities.NONE, Abilities.SOUNDPROOF, 494, 90, 92, 75, 92, 85, 60, 60, 50, 173, true, null, true),
-      new PokemonForm("Mega", SpeciesFormKey.MEGA, Type.GRASS, Type.ICE, 2.7, 185, Abilities.SNOW_WARNING, Abilities.NONE, Abilities.SNOW_WARNING, 594, 90, 132, 105, 132, 105, 30, 60, 50, 173, true),
-    ),
-    new PokemonSpecies(Species.WEAVILE, 4, false, false, false, "Sharp Claw Pokémon", Type.DARK, Type.ICE, 1.1, 34, Abilities.PRESSURE, Abilities.NONE, Abilities.PICKPOCKET, 510, 70, 120, 65, 45, 85, 125, 45, 35, 179, GrowthRate.MEDIUM_SLOW, 50, true),
-    new PokemonSpecies(Species.MAGNEZONE, 4, false, false, false, "Magnet Area Pokémon", Type.ELECTRIC, Type.STEEL, 1.2, 180, Abilities.MAGNET_PULL, Abilities.STURDY, Abilities.ANALYTIC, 535, 70, 70, 115, 130, 90, 60, 30, 50, 268, GrowthRate.MEDIUM_FAST, null, false),
-    new PokemonSpecies(Species.LICKILICKY, 4, false, false, false, "Licking Pokémon", Type.NORMAL, null, 1.7, 140, Abilities.OWN_TEMPO, Abilities.OBLIVIOUS, Abilities.CLOUD_NINE, 515, 110, 85, 95, 80, 95, 50, 30, 50, 180, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.RHYPERIOR, 4, false, false, false, "Drill Pokémon", Type.GROUND, Type.ROCK, 2.4, 282.8, Abilities.LIGHTNING_ROD, Abilities.SOLID_ROCK, Abilities.RECKLESS, 535, 115, 140, 130, 55, 55, 40, 30, 50, 268, GrowthRate.SLOW, 50, true),
-    new PokemonSpecies(Species.TANGROWTH, 4, false, false, false, "Vine Pokémon", Type.GRASS, null, 2, 128.6, Abilities.CHLOROPHYLL, Abilities.LEAF_GUARD, Abilities.REGENERATOR, 535, 100, 100, 125, 110, 50, 50, 30, 50, 187, GrowthRate.MEDIUM_FAST, 50, true),
-    new PokemonSpecies(Species.ELECTIVIRE, 4, false, false, false, "Thunderbolt Pokémon", Type.ELECTRIC, null, 1.8, 138.6, Abilities.MOTOR_DRIVE, Abilities.NONE, Abilities.VITAL_SPIRIT, 540, 75, 123, 67, 95, 85, 95, 30, 50, 270, GrowthRate.MEDIUM_FAST, 75, false),
-    new PokemonSpecies(Species.MAGMORTAR, 4, false, false, false, "Blast Pokémon", Type.FIRE, null, 1.6, 68, Abilities.FLAME_BODY, Abilities.NONE, Abilities.VITAL_SPIRIT, 540, 75, 95, 67, 125, 95, 83, 30, 50, 270, GrowthRate.MEDIUM_FAST, 75, false),
-    new PokemonSpecies(Species.TOGEKISS, 4, false, false, false, "Jubilee Pokémon", Type.FAIRY, Type.FLYING, 1.5, 38, Abilities.HUSTLE, Abilities.SERENE_GRACE, Abilities.SUPER_LUCK, 545, 85, 50, 95, 120, 115, 80, 30, 50, 273, GrowthRate.FAST, 87.5, false),
-    new PokemonSpecies(Species.YANMEGA, 4, false, false, false, "Ogre Darner Pokémon", Type.BUG, Type.FLYING, 1.9, 51.5, Abilities.SPEED_BOOST, Abilities.TINTED_LENS, Abilities.FRISK, 515, 86, 76, 86, 116, 56, 95, 30, 70, 180, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.LEAFEON, 4, false, false, false, "Verdant Pokémon", Type.GRASS, null, 1, 25.5, Abilities.LEAF_GUARD, Abilities.NONE, Abilities.CHLOROPHYLL, 525, 65, 110, 130, 60, 65, 95, 45, 35, 184, GrowthRate.MEDIUM_FAST, 87.5, false),
-    new PokemonSpecies(Species.GLACEON, 4, false, false, false, "Fresh Snow Pokémon", Type.ICE, null, 0.8, 25.9, Abilities.SNOW_CLOAK, Abilities.NONE, Abilities.ICE_BODY, 525, 65, 60, 110, 130, 95, 65, 45, 35, 184, GrowthRate.MEDIUM_FAST, 87.5, false),
-    new PokemonSpecies(Species.GLISCOR, 4, false, false, false, "Fang Scorpion Pokémon", Type.GROUND, Type.FLYING, 2, 42.5, Abilities.HYPER_CUTTER, Abilities.SAND_VEIL, Abilities.POISON_HEAL, 510, 75, 95, 125, 45, 75, 95, 30, 70, 179, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.MAMOSWINE, 4, false, false, false, "Twin Tusk Pokémon", Type.ICE, Type.GROUND, 2.5, 291, Abilities.OBLIVIOUS, Abilities.SNOW_CLOAK, Abilities.THICK_FAT, 530, 110, 130, 80, 70, 60, 80, 50, 50, 265, GrowthRate.SLOW, 50, true),
-    new PokemonSpecies(Species.PORYGON_Z, 4, false, false, false, "Virtual Pokémon", Type.NORMAL, null, 0.9, 34, Abilities.ADAPTABILITY, Abilities.DOWNLOAD, Abilities.ANALYTIC, 535, 85, 80, 70, 135, 75, 90, 30, 50, 268, GrowthRate.MEDIUM_FAST, null, false),
-    new PokemonSpecies(Species.GALLADE, 4, false, false, false, "Blade Pokémon", Type.PSYCHIC, Type.FIGHTING, 1.6, 52, Abilities.STEADFAST, Abilities.SHARPNESS, Abilities.JUSTIFIED, 518, 68, 125, 65, 65, 115, 80, 45, 35, 259, GrowthRate.SLOW, 100, false, true,
-      new PokemonForm("Normal", "", Type.PSYCHIC, Type.FIGHTING, 1.6, 52, Abilities.STEADFAST, Abilities.SHARPNESS, Abilities.JUSTIFIED, 518, 68, 125, 65, 65, 115, 80, 45, 35, 259, false, null, true),
-      new PokemonForm("Mega", SpeciesFormKey.MEGA, Type.PSYCHIC, Type.FIGHTING, 1.6, 56.4, Abilities.SHARPNESS, Abilities.SHARPNESS, Abilities.SHARPNESS, 618, 68, 165, 95, 65, 115, 110, 45, 35, 259),
-    ),
-    new PokemonSpecies(Species.PROBOPASS, 4, false, false, false, "Compass Pokémon", Type.ROCK, Type.STEEL, 1.4, 340, Abilities.STURDY, Abilities.MAGNET_PULL, Abilities.SAND_FORCE, 525, 60, 55, 145, 75, 150, 40, 60, 70, 184, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.DUSKNOIR, 4, false, false, false, "Gripper Pokémon", Type.GHOST, null, 2.2, 106.6, Abilities.PRESSURE, Abilities.NONE, Abilities.FRISK, 525, 45, 100, 135, 65, 135, 45, 45, 35, 263, GrowthRate.FAST, 50, false),
-    new PokemonSpecies(Species.FROSLASS, 4, false, false, false, "Snow Land Pokémon", Type.ICE, Type.GHOST, 1.3, 26.6, Abilities.SNOW_CLOAK, Abilities.NONE, Abilities.CURSED_BODY, 480, 70, 80, 70, 80, 70, 110, 75, 50, 168, GrowthRate.MEDIUM_FAST, 0, false),
-    new PokemonSpecies(Species.ROTOM, 4, false, false, false, "Plasma Pokémon", Type.ELECTRIC, Type.GHOST, 0.3, 0.3, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 440, 50, 50, 77, 95, 77, 91, 45, 50, 154, GrowthRate.MEDIUM_FAST, null, false, false,
-      new PokemonForm("Normal", "", Type.ELECTRIC, Type.GHOST, 0.3, 0.3, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 440, 50, 50, 77, 95, 77, 91, 45, 50, 154, false, null, true),
-      new PokemonForm("Heat", "heat", Type.ELECTRIC, Type.FIRE, 0.3, 0.3, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 520, 50, 65, 107, 105, 107, 86, 45, 50, 182, false, null, true),
-      new PokemonForm("Wash", "wash", Type.ELECTRIC, Type.WATER, 0.3, 0.3, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 520, 50, 65, 107, 105, 107, 86, 45, 50, 182, false, null, true),
-      new PokemonForm("Frost", "frost", Type.ELECTRIC, Type.ICE, 0.3, 0.3, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 520, 50, 65, 107, 105, 107, 86, 45, 50, 182, false, null, true),
-      new PokemonForm("Fan", "fan", Type.ELECTRIC, Type.FLYING, 0.3, 0.3, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 520, 50, 65, 107, 105, 107, 86, 45, 50, 182, false, null, true),
-      new PokemonForm("Mow", "mow", Type.ELECTRIC, Type.GRASS, 0.3, 0.3, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 520, 50, 65, 107, 105, 107, 86, 45, 50, 182, false, null, true),
-    ),
-    new PokemonSpecies(Species.UXIE, 4, true, false, false, "Knowledge Pokémon", Type.PSYCHIC, null, 0.3, 0.3, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 580, 75, 75, 130, 75, 130, 95, 3, 140, 290, GrowthRate.SLOW, null, false),
-    new PokemonSpecies(Species.MESPRIT, 4, true, false, false, "Emotion Pokémon", Type.PSYCHIC, null, 0.3, 0.3, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 580, 80, 105, 105, 105, 105, 80, 3, 140, 290, GrowthRate.SLOW, null, false),
-    new PokemonSpecies(Species.AZELF, 4, true, false, false, "Willpower Pokémon", Type.PSYCHIC, null, 0.3, 0.3, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 580, 75, 125, 70, 125, 70, 115, 3, 140, 290, GrowthRate.SLOW, null, false),
-    new PokemonSpecies(Species.DIALGA, 4, false, true, false, "Temporal Pokémon", Type.STEEL, Type.DRAGON, 5.4, 683, Abilities.PRESSURE, Abilities.NONE, Abilities.TELEPATHY, 680, 100, 120, 120, 150, 100, 90, 3, 0, 340, GrowthRate.SLOW, null, false, false,
-      new PokemonForm("Normal", "", Type.STEEL, Type.DRAGON, 5.4, 683, Abilities.PRESSURE, Abilities.NONE, Abilities.TELEPATHY, 680, 100, 120, 120, 150, 100, 90, 3, 0, 340, false, null, true),
-      new PokemonForm("Origin Forme", "origin", Type.STEEL, Type.DRAGON, 7, 848.7, Abilities.PRESSURE, Abilities.NONE, Abilities.TELEPATHY, 680, 100, 100, 120, 150, 120, 90, 3, 0, 340),
-    ),
-    new PokemonSpecies(Species.PALKIA, 4, false, true, false, "Spatial Pokémon", Type.WATER, Type.DRAGON, 4.2, 336, Abilities.PRESSURE, Abilities.NONE, Abilities.TELEPATHY, 680, 90, 120, 100, 150, 120, 100, 3, 0, 340, GrowthRate.SLOW, null, false, false,
-      new PokemonForm("Normal", "", Type.WATER, Type.DRAGON, 4.2, 336, Abilities.PRESSURE, Abilities.NONE, Abilities.TELEPATHY, 680, 90, 120, 100, 150, 120, 100, 3, 0, 340, false, null, true),
-      new PokemonForm("Origin Forme", "origin", Type.WATER, Type.DRAGON, 6.3, 659, Abilities.PRESSURE, Abilities.NONE, Abilities.TELEPATHY, 680, 90, 100, 100, 150, 120, 120, 3, 0, 340),
-    ),
-    new PokemonSpecies(Species.HEATRAN, 4, true, false, false, "Lava Dome Pokémon", Type.FIRE, Type.STEEL, 1.7, 430, Abilities.FLASH_FIRE, Abilities.NONE, Abilities.FLAME_BODY, 600, 91, 90, 106, 130, 106, 77, 3, 100, 300, GrowthRate.SLOW, 50, false),
-    new PokemonSpecies(Species.REGIGIGAS, 4, true, false, false, "Colossal Pokémon", Type.NORMAL, null, 3.7, 420, Abilities.SLOW_START, Abilities.NONE, Abilities.NORMALIZE, 670, 110, 160, 110, 80, 110, 100, 3, 0, 335, GrowthRate.SLOW, null, false),
-    new PokemonSpecies(Species.GIRATINA, 4, false, true, false, "Renegade Pokémon", Type.GHOST, Type.DRAGON, 4.5, 750, Abilities.PRESSURE, Abilities.NONE, Abilities.TELEPATHY, 680, 150, 100, 120, 100, 120, 90, 3, 0, 340, GrowthRate.SLOW, null, false, true,
-      new PokemonForm("Altered Forme", "altered", Type.GHOST, Type.DRAGON, 4.5, 750, Abilities.PRESSURE, Abilities.NONE, Abilities.TELEPATHY, 680, 150, 100, 120, 100, 120, 90, 3, 0, 340, false, null, true),
-      new PokemonForm("Origin Forme", "origin", Type.GHOST, Type.DRAGON, 6.9, 650, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 680, 150, 120, 100, 120, 100, 90, 3, 0, 340),
-    ),
-    new PokemonSpecies(Species.CRESSELIA, 4, true, false, false, "Lunar Pokémon", Type.PSYCHIC, null, 1.5, 85.6, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 580, 120, 70, 110, 75, 120, 85, 3, 100, 300, GrowthRate.SLOW, 0, false),
-    new PokemonSpecies(Species.PHIONE, 4, false, false, true, "Sea Drifter Pokémon", Type.WATER, null, 0.4, 3.1, Abilities.HYDRATION, Abilities.NONE, Abilities.NONE, 480, 80, 80, 80, 80, 80, 80, 30, 70, 240, GrowthRate.SLOW, null, false),
-    new PokemonSpecies(Species.MANAPHY, 4, false, false, true, "Seafaring Pokémon", Type.WATER, null, 0.3, 1.4, Abilities.HYDRATION, Abilities.NONE, Abilities.NONE, 600, 100, 100, 100, 100, 100, 100, 3, 70, 300, GrowthRate.SLOW, null, false),
-    new PokemonSpecies(Species.DARKRAI, 4, false, false, true, "Pitch-Black Pokémon", Type.DARK, null, 1.5, 50.5, Abilities.BAD_DREAMS, Abilities.NONE, Abilities.NONE, 600, 70, 90, 90, 135, 90, 125, 3, 0, 300, GrowthRate.SLOW, null, false),
-    new PokemonSpecies(Species.SHAYMIN, 4, false, false, true, "Gratitude Pokémon", Type.GRASS, null, 0.2, 2.1, Abilities.NATURAL_CURE, Abilities.NONE, Abilities.NONE, 600, 100, 100, 100, 100, 100, 100, 45, 100, 300, GrowthRate.MEDIUM_SLOW, null, false, true,
-      new PokemonForm("Land Forme", "land", Type.GRASS, null, 0.2, 2.1, Abilities.NATURAL_CURE, Abilities.NONE, Abilities.NONE, 600, 100, 100, 100, 100, 100, 100, 45, 100, 300, false, null, true),
-      new PokemonForm("Sky Forme", "sky", Type.GRASS, Type.FLYING, 0.4, 5.2, Abilities.SERENE_GRACE, Abilities.NONE, Abilities.NONE, 600, 100, 103, 75, 120, 75, 127, 45, 100, 300),
-    ),
-    new PokemonSpecies(Species.ARCEUS, 4, false, false, true, "Alpha Pokémon", Type.NORMAL, null, 3.2, 320, Abilities.MULTITYPE, Abilities.NONE, Abilities.NONE, 720, 120, 120, 120, 120, 120, 120, 3, 0, 360, GrowthRate.SLOW, null, false, true,
-      new PokemonForm("Normal", "normal", Type.NORMAL, null, 3.2, 320, Abilities.MULTITYPE, Abilities.NONE, Abilities.NONE, 720, 120, 120, 120, 120, 120, 120, 3, 0, 360, false, null, true),
-      new PokemonForm("Fighting", "fighting", Type.FIGHTING, null, 3.2, 320, Abilities.MULTITYPE, Abilities.NONE, Abilities.NONE, 720, 120, 120, 120, 120, 120, 120, 3, 0, 360),
-      new PokemonForm("Flying", "flying", Type.FLYING, null, 3.2, 320, Abilities.MULTITYPE, Abilities.NONE, Abilities.NONE, 720, 120, 120, 120, 120, 120, 120, 3, 0, 360),
-      new PokemonForm("Poison", "poison", Type.POISON, null, 3.2, 320, Abilities.MULTITYPE, Abilities.NONE, Abilities.NONE, 720, 120, 120, 120, 120, 120, 120, 3, 0, 360),
-      new PokemonForm("Ground", "ground", Type.GROUND, null, 3.2, 320, Abilities.MULTITYPE, Abilities.NONE, Abilities.NONE, 720, 120, 120, 120, 120, 120, 120, 3, 0, 360),
-      new PokemonForm("Rock", "rock", Type.ROCK, null, 3.2, 320, Abilities.MULTITYPE, Abilities.NONE, Abilities.NONE, 720, 120, 120, 120, 120, 120, 120, 3, 0, 360),
-      new PokemonForm("Bug", "bug", Type.BUG, null, 3.2, 320, Abilities.MULTITYPE, Abilities.NONE, Abilities.NONE, 720, 120, 120, 120, 120, 120, 120, 3, 0, 360),
-      new PokemonForm("Ghost", "ghost", Type.GHOST, null, 3.2, 320, Abilities.MULTITYPE, Abilities.NONE, Abilities.NONE, 720, 120, 120, 120, 120, 120, 120, 3, 0, 360),
-      new PokemonForm("Steel", "steel", Type.STEEL, null, 3.2, 320, Abilities.MULTITYPE, Abilities.NONE, Abilities.NONE, 720, 120, 120, 120, 120, 120, 120, 3, 0, 360),
-      new PokemonForm("Fire", "fire", Type.FIRE, null, 3.2, 320, Abilities.MULTITYPE, Abilities.NONE, Abilities.NONE, 720, 120, 120, 120, 120, 120, 120, 3, 0, 360),
-      new PokemonForm("Water", "water", Type.WATER, null, 3.2, 320, Abilities.MULTITYPE, Abilities.NONE, Abilities.NONE, 720, 120, 120, 120, 120, 120, 120, 3, 0, 360),
-      new PokemonForm("Grass", "grass", Type.GRASS, null, 3.2, 320, Abilities.MULTITYPE, Abilities.NONE, Abilities.NONE, 720, 120, 120, 120, 120, 120, 120, 3, 0, 360),
-      new PokemonForm("Electric", "electric", Type.ELECTRIC, null, 3.2, 320, Abilities.MULTITYPE, Abilities.NONE, Abilities.NONE, 720, 120, 120, 120, 120, 120, 120, 3, 0, 360),
-      new PokemonForm("Psychic", "psychic", Type.PSYCHIC, null, 3.2, 320, Abilities.MULTITYPE, Abilities.NONE, Abilities.NONE, 720, 120, 120, 120, 120, 120, 120, 3, 0, 360),
-      new PokemonForm("Ice", "ice", Type.ICE, null, 3.2, 320, Abilities.MULTITYPE, Abilities.NONE, Abilities.NONE, 720, 120, 120, 120, 120, 120, 120, 3, 0, 360),
-      new PokemonForm("Dragon", "dragon", Type.DRAGON, null, 3.2, 320, Abilities.MULTITYPE, Abilities.NONE, Abilities.NONE, 720, 120, 120, 120, 120, 120, 120, 3, 0, 360),
-      new PokemonForm("Dark", "dark", Type.DARK, null, 3.2, 320, Abilities.MULTITYPE, Abilities.NONE, Abilities.NONE, 720, 120, 120, 120, 120, 120, 120, 3, 0, 360),
-      new PokemonForm("Fairy", "fairy", Type.FAIRY, null, 3.2, 320, Abilities.MULTITYPE, Abilities.NONE, Abilities.NONE, 720, 120, 120, 120, 120, 120, 120, 3, 0, 360),
-      new PokemonForm("???", "unknown", Type.UNKNOWN, null, 3.2, 320, Abilities.MULTITYPE, Abilities.NONE, Abilities.NONE, 720, 120, 120, 120, 120, 120, 120, 3, 0, 360),
-    ),
-    new PokemonSpecies(Species.VICTINI, 5, false, false, true, "Victory Pokémon", Type.PSYCHIC, Type.FIRE, 0.4, 4, Abilities.VICTORY_STAR, Abilities.NONE, Abilities.NONE, 600, 100, 100, 100, 100, 100, 100, 3, 100, 300, GrowthRate.SLOW, null, false),
-    new PokemonSpecies(Species.SNIVY, 5, false, false, false, "Grass Snake Pokémon", Type.GRASS, null, 0.6, 8.1, Abilities.OVERGROW, Abilities.NONE, Abilities.CONTRARY, 308, 45, 45, 55, 45, 55, 63, 45, 70, 62, GrowthRate.MEDIUM_SLOW, 87.5, false),
-    new PokemonSpecies(Species.SERVINE, 5, false, false, false, "Grass Snake Pokémon", Type.GRASS, null, 0.8, 16, Abilities.OVERGROW, Abilities.NONE, Abilities.CONTRARY, 413, 60, 60, 75, 60, 75, 83, 45, 70, 145, GrowthRate.MEDIUM_SLOW, 87.5, false),
-    new PokemonSpecies(Species.SERPERIOR, 5, false, false, false, "Regal Pokémon", Type.GRASS, null, 3.3, 63, Abilities.OVERGROW, Abilities.NONE, Abilities.CONTRARY, 528, 75, 75, 95, 75, 95, 113, 45, 70, 264, GrowthRate.MEDIUM_SLOW, 87.5, false),
-    new PokemonSpecies(Species.TEPIG, 5, false, false, false, "Fire Pig Pokémon", Type.FIRE, null, 0.5, 9.9, Abilities.BLAZE, Abilities.NONE, Abilities.THICK_FAT, 308, 65, 63, 45, 45, 45, 45, 45, 70, 62, GrowthRate.MEDIUM_SLOW, 87.5, false),
-    new PokemonSpecies(Species.PIGNITE, 5, false, false, false, "Fire Pig Pokémon", Type.FIRE, Type.FIGHTING, 1, 55.5, Abilities.BLAZE, Abilities.NONE, Abilities.THICK_FAT, 418, 90, 93, 55, 70, 55, 55, 45, 70, 146, GrowthRate.MEDIUM_SLOW, 87.5, false),
-    new PokemonSpecies(Species.EMBOAR, 5, false, false, false, "Mega Fire Pig Pokémon", Type.FIRE, Type.FIGHTING, 1.6, 150, Abilities.BLAZE, Abilities.NONE, Abilities.RECKLESS, 528, 110, 123, 65, 100, 65, 65, 45, 70, 264, GrowthRate.MEDIUM_SLOW, 87.5, false),
-    new PokemonSpecies(Species.OSHAWOTT, 5, false, false, false, "Sea Otter Pokémon", Type.WATER, null, 0.5, 5.9, Abilities.TORRENT, Abilities.NONE, Abilities.SHELL_ARMOR, 308, 55, 55, 45, 63, 45, 45, 45, 70, 62, GrowthRate.MEDIUM_SLOW, 87.5, false),
-    new PokemonSpecies(Species.DEWOTT, 5, false, false, false, "Discipline Pokémon", Type.WATER, null, 0.8, 24.5, Abilities.TORRENT, Abilities.NONE, Abilities.SHELL_ARMOR, 413, 75, 75, 60, 83, 60, 60, 45, 70, 145, GrowthRate.MEDIUM_SLOW, 87.5, false),
-    new PokemonSpecies(Species.SAMUROTT, 5, false, false, false, "Formidable Pokémon", Type.WATER, null, 1.5, 94.6, Abilities.TORRENT, Abilities.NONE, Abilities.SHELL_ARMOR, 528, 95, 100, 85, 108, 70, 70, 45, 70, 264, GrowthRate.MEDIUM_SLOW, 87.5, false),
-    new PokemonSpecies(Species.PATRAT, 5, false, false, false, "Scout Pokémon", Type.NORMAL, null, 0.5, 11.6, Abilities.RUN_AWAY, Abilities.KEEN_EYE, Abilities.ANALYTIC, 255, 45, 55, 39, 35, 39, 42, 255, 70, 51, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.WATCHOG, 5, false, false, false, "Lookout Pokémon", Type.NORMAL, null, 1.1, 27, Abilities.ILLUMINATE, Abilities.KEEN_EYE, Abilities.ANALYTIC, 420, 60, 85, 69, 60, 69, 77, 255, 70, 147, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.LILLIPUP, 5, false, false, false, "Puppy Pokémon", Type.NORMAL, null, 0.4, 4.1, Abilities.VITAL_SPIRIT, Abilities.PICKUP, Abilities.RUN_AWAY, 275, 45, 60, 45, 25, 45, 55, 255, 50, 55, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.HERDIER, 5, false, false, false, "Loyal Dog Pokémon", Type.NORMAL, null, 0.9, 14.7, Abilities.INTIMIDATE, Abilities.SAND_RUSH, Abilities.SCRAPPY, 370, 65, 80, 65, 35, 65, 60, 120, 50, 130, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.STOUTLAND, 5, false, false, false, "Big-Hearted Pokémon", Type.NORMAL, null, 1.2, 61, Abilities.INTIMIDATE, Abilities.SAND_RUSH, Abilities.SCRAPPY, 500, 85, 110, 90, 45, 90, 80, 45, 50, 250, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.PURRLOIN, 5, false, false, false, "Devious Pokémon", Type.DARK, null, 0.4, 10.1, Abilities.LIMBER, Abilities.UNBURDEN, Abilities.PRANKSTER, 281, 41, 50, 37, 50, 37, 66, 255, 50, 56, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.LIEPARD, 5, false, false, false, "Cruel Pokémon", Type.DARK, null, 1.1, 37.5, Abilities.LIMBER, Abilities.UNBURDEN, Abilities.PRANKSTER, 446, 64, 88, 50, 88, 50, 106, 90, 50, 156, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.PANSAGE, 5, false, false, false, "Grass Monkey Pokémon", Type.GRASS, null, 0.6, 10.5, Abilities.GLUTTONY, Abilities.NONE, Abilities.OVERGROW, 316, 50, 53, 48, 53, 48, 64, 190, 70, 63, GrowthRate.MEDIUM_FAST, 87.5, false),
-    new PokemonSpecies(Species.SIMISAGE, 5, false, false, false, "Thorn Monkey Pokémon", Type.GRASS, null, 1.1, 30.5, Abilities.GLUTTONY, Abilities.NONE, Abilities.OVERGROW, 498, 75, 98, 63, 98, 63, 101, 75, 70, 174, GrowthRate.MEDIUM_FAST, 87.5, false),
-    new PokemonSpecies(Species.PANSEAR, 5, false, false, false, "High Temp Pokémon", Type.FIRE, null, 0.6, 11, Abilities.GLUTTONY, Abilities.NONE, Abilities.BLAZE, 316, 50, 53, 48, 53, 48, 64, 190, 70, 63, GrowthRate.MEDIUM_FAST, 87.5, false),
-    new PokemonSpecies(Species.SIMISEAR, 5, false, false, false, "Ember Pokémon", Type.FIRE, null, 1, 28, Abilities.GLUTTONY, Abilities.NONE, Abilities.BLAZE, 498, 75, 98, 63, 98, 63, 101, 75, 70, 174, GrowthRate.MEDIUM_FAST, 87.5, false),
-    new PokemonSpecies(Species.PANPOUR, 5, false, false, false, "Spray Pokémon", Type.WATER, null, 0.6, 13.5, Abilities.GLUTTONY, Abilities.NONE, Abilities.TORRENT, 316, 50, 53, 48, 53, 48, 64, 190, 70, 63, GrowthRate.MEDIUM_FAST, 87.5, false),
-    new PokemonSpecies(Species.SIMIPOUR, 5, false, false, false, "Geyser Pokémon", Type.WATER, null, 1, 29, Abilities.GLUTTONY, Abilities.NONE, Abilities.TORRENT, 498, 75, 98, 63, 98, 63, 101, 75, 70, 174, GrowthRate.MEDIUM_FAST, 87.5, false),
-    new PokemonSpecies(Species.MUNNA, 5, false, false, false, "Dream Eater Pokémon", Type.PSYCHIC, null, 0.6, 23.3, Abilities.FOREWARN, Abilities.SYNCHRONIZE, Abilities.TELEPATHY, 292, 76, 25, 45, 67, 55, 24, 190, 50, 58, GrowthRate.FAST, 50, false),
-    new PokemonSpecies(Species.MUSHARNA, 5, false, false, false, "Drowsing Pokémon", Type.PSYCHIC, null, 1.1, 60.5, Abilities.FOREWARN, Abilities.SYNCHRONIZE, Abilities.TELEPATHY, 487, 116, 55, 85, 107, 95, 29, 75, 50, 170, GrowthRate.FAST, 50, false),
-    new PokemonSpecies(Species.PIDOVE, 5, false, false, false, "Tiny Pigeon Pokémon", Type.NORMAL, Type.FLYING, 0.3, 2.1, Abilities.BIG_PECKS, Abilities.SUPER_LUCK, Abilities.RIVALRY, 264, 50, 55, 50, 36, 30, 43, 255, 50, 53, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.TRANQUILL, 5, false, false, false, "Wild Pigeon Pokémon", Type.NORMAL, Type.FLYING, 0.6, 15, Abilities.BIG_PECKS, Abilities.SUPER_LUCK, Abilities.RIVALRY, 358, 62, 77, 62, 50, 42, 65, 120, 50, 125, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.UNFEZANT, 5, false, false, false, "Proud Pokémon", Type.NORMAL, Type.FLYING, 1.2, 29, Abilities.BIG_PECKS, Abilities.SUPER_LUCK, Abilities.RIVALRY, 488, 80, 115, 80, 65, 55, 93, 45, 50, 244, GrowthRate.MEDIUM_SLOW, 50, true),
-    new PokemonSpecies(Species.BLITZLE, 5, false, false, false, "Electrified Pokémon", Type.ELECTRIC, null, 0.8, 29.8, Abilities.LIGHTNING_ROD, Abilities.MOTOR_DRIVE, Abilities.SAP_SIPPER, 295, 45, 60, 32, 50, 32, 76, 190, 70, 59, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.ZEBSTRIKA, 5, false, false, false, "Thunderbolt Pokémon", Type.ELECTRIC, null, 1.6, 79.5, Abilities.LIGHTNING_ROD, Abilities.MOTOR_DRIVE, Abilities.SAP_SIPPER, 497, 75, 100, 63, 80, 63, 116, 75, 70, 174, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.ROGGENROLA, 5, false, false, false, "Mantle Pokémon", Type.ROCK, null, 0.4, 18, Abilities.STURDY, Abilities.WEAK_ARMOR, Abilities.SAND_FORCE, 280, 55, 75, 85, 25, 25, 15, 255, 50, 56, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.BOLDORE, 5, false, false, false, "Ore Pokémon", Type.ROCK, null, 0.9, 102, Abilities.STURDY, Abilities.WEAK_ARMOR, Abilities.SAND_FORCE, 390, 70, 105, 105, 50, 40, 20, 120, 50, 137, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.GIGALITH, 5, false, false, false, "Compressed Pokémon", Type.ROCK, null, 1.7, 260, Abilities.STURDY, Abilities.SAND_STREAM, Abilities.SAND_FORCE, 515, 85, 135, 130, 60, 80, 25, 45, 50, 258, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.WOOBAT, 5, false, false, false, "Bat Pokémon", Type.PSYCHIC, Type.FLYING, 0.4, 2.1, Abilities.UNAWARE, Abilities.KLUTZ, Abilities.SIMPLE, 323, 65, 45, 43, 55, 43, 72, 190, 50, 65, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.SWOOBAT, 5, false, false, false, "Courting Pokémon", Type.PSYCHIC, Type.FLYING, 0.9, 10.5, Abilities.UNAWARE, Abilities.KLUTZ, Abilities.SIMPLE, 425, 67, 57, 55, 77, 55, 114, 45, 50, 149, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.DRILBUR, 5, false, false, false, "Mole Pokémon", Type.GROUND, null, 0.3, 8.5, Abilities.SAND_RUSH, Abilities.SAND_FORCE, Abilities.MOLD_BREAKER, 328, 60, 85, 40, 30, 45, 68, 120, 50, 66, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.EXCADRILL, 5, false, false, false, "Subterrene Pokémon", Type.GROUND, Type.STEEL, 0.7, 40.4, Abilities.SAND_RUSH, Abilities.SAND_FORCE, Abilities.MOLD_BREAKER, 508, 110, 135, 60, 50, 65, 88, 60, 50, 178, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.AUDINO, 5, false, false, false, "Hearing Pokémon", Type.NORMAL, null, 1.1, 31, Abilities.HEALER, Abilities.REGENERATOR, Abilities.KLUTZ, 445, 103, 60, 86, 60, 86, 50, 255, 50, 390, GrowthRate.FAST, 50, false, true,
-      new PokemonForm("Normal", "", Type.NORMAL, null, 1.1, 31, Abilities.HEALER, Abilities.REGENERATOR, Abilities.KLUTZ, 445, 103, 60, 86, 60, 86, 50, 255, 50, 390, false, null, true),
-      new PokemonForm("Mega", SpeciesFormKey.MEGA, Type.NORMAL, Type.FAIRY, 1.5, 32, Abilities.REGENERATOR, Abilities.REGENERATOR, Abilities.REGENERATOR, 545, 103, 60, 126, 80, 126, 50, 255, 50, 390), //Custom Ability, base form Hidden Ability
-    ),
-    new PokemonSpecies(Species.TIMBURR, 5, false, false, false, "Muscular Pokémon", Type.FIGHTING, null, 0.6, 12.5, Abilities.GUTS, Abilities.SHEER_FORCE, Abilities.IRON_FIST, 305, 75, 80, 55, 25, 35, 35, 180, 70, 61, GrowthRate.MEDIUM_SLOW, 75, false),
-    new PokemonSpecies(Species.GURDURR, 5, false, false, false, "Muscular Pokémon", Type.FIGHTING, null, 1.2, 40, Abilities.GUTS, Abilities.SHEER_FORCE, Abilities.IRON_FIST, 405, 85, 105, 85, 40, 50, 40, 90, 50, 142, GrowthRate.MEDIUM_SLOW, 75, false),
-    new PokemonSpecies(Species.CONKELDURR, 5, false, false, false, "Muscular Pokémon", Type.FIGHTING, null, 1.4, 87, Abilities.GUTS, Abilities.SHEER_FORCE, Abilities.IRON_FIST, 505, 105, 140, 95, 55, 65, 45, 45, 50, 253, GrowthRate.MEDIUM_SLOW, 75, false),
-    new PokemonSpecies(Species.TYMPOLE, 5, false, false, false, "Tadpole Pokémon", Type.WATER, null, 0.5, 4.5, Abilities.SWIFT_SWIM, Abilities.HYDRATION, Abilities.WATER_ABSORB, 294, 50, 50, 40, 50, 40, 64, 255, 50, 59, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.PALPITOAD, 5, false, false, false, "Vibration Pokémon", Type.WATER, Type.GROUND, 0.8, 17, Abilities.SWIFT_SWIM, Abilities.HYDRATION, Abilities.WATER_ABSORB, 384, 75, 65, 55, 65, 55, 69, 120, 50, 134, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.SEISMITOAD, 5, false, false, false, "Vibration Pokémon", Type.WATER, Type.GROUND, 1.5, 62, Abilities.SWIFT_SWIM, Abilities.POISON_TOUCH, Abilities.WATER_ABSORB, 509, 105, 95, 75, 85, 75, 74, 45, 50, 255, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.THROH, 5, false, false, false, "Judo Pokémon", Type.FIGHTING, null, 1.3, 55.5, Abilities.GUTS, Abilities.INNER_FOCUS, Abilities.MOLD_BREAKER, 465, 120, 100, 85, 30, 85, 45, 45, 50, 163, GrowthRate.MEDIUM_FAST, 100, false),
-    new PokemonSpecies(Species.SAWK, 5, false, false, false, "Karate Pokémon", Type.FIGHTING, null, 1.4, 51, Abilities.STURDY, Abilities.INNER_FOCUS, Abilities.MOLD_BREAKER, 465, 75, 125, 75, 30, 75, 85, 45, 50, 163, GrowthRate.MEDIUM_FAST, 100, false),
-    new PokemonSpecies(Species.SEWADDLE, 5, false, false, false, "Sewing Pokémon", Type.BUG, Type.GRASS, 0.3, 2.5, Abilities.SWARM, Abilities.CHLOROPHYLL, Abilities.OVERCOAT, 310, 45, 53, 70, 40, 60, 42, 255, 70, 62, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.SWADLOON, 5, false, false, false, "Leaf-Wrapped Pokémon", Type.BUG, Type.GRASS, 0.5, 7.3, Abilities.LEAF_GUARD, Abilities.CHLOROPHYLL, Abilities.OVERCOAT, 380, 55, 63, 90, 50, 80, 42, 120, 70, 133, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.LEAVANNY, 5, false, false, false, "Nurturing Pokémon", Type.BUG, Type.GRASS, 1.2, 20.5, Abilities.SWARM, Abilities.CHLOROPHYLL, Abilities.OVERCOAT, 500, 75, 103, 80, 70, 80, 92, 45, 70, 250, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.VENIPEDE, 5, false, false, false, "Centipede Pokémon", Type.BUG, Type.POISON, 0.4, 5.3, Abilities.POISON_POINT, Abilities.SWARM, Abilities.SPEED_BOOST, 260, 30, 45, 59, 30, 39, 57, 255, 50, 52, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.WHIRLIPEDE, 5, false, false, false, "Curlipede Pokémon", Type.BUG, Type.POISON, 1.2, 58.5, Abilities.POISON_POINT, Abilities.SWARM, Abilities.SPEED_BOOST, 360, 40, 55, 99, 40, 79, 47, 120, 50, 126, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.SCOLIPEDE, 5, false, false, false, "Megapede Pokémon", Type.BUG, Type.POISON, 2.5, 200.5, Abilities.POISON_POINT, Abilities.SWARM, Abilities.SPEED_BOOST, 485, 60, 100, 89, 55, 69, 112, 45, 50, 243, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.COTTONEE, 5, false, false, false, "Cotton Puff Pokémon", Type.GRASS, Type.FAIRY, 0.3, 0.6, Abilities.PRANKSTER, Abilities.INFILTRATOR, Abilities.CHLOROPHYLL, 280, 40, 27, 60, 37, 50, 66, 190, 50, 56, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.WHIMSICOTT, 5, false, false, false, "Windveiled Pokémon", Type.GRASS, Type.FAIRY, 0.7, 6.6, Abilities.PRANKSTER, Abilities.INFILTRATOR, Abilities.CHLOROPHYLL, 480, 60, 67, 85, 77, 75, 116, 75, 50, 168, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.PETILIL, 5, false, false, false, "Bulb Pokémon", Type.GRASS, null, 0.5, 6.6, Abilities.CHLOROPHYLL, Abilities.OWN_TEMPO, Abilities.LEAF_GUARD, 280, 45, 35, 50, 70, 50, 30, 190, 50, 56, GrowthRate.MEDIUM_FAST, 0, false),
-    new PokemonSpecies(Species.LILLIGANT, 5, false, false, false, "Flowering Pokémon", Type.GRASS, null, 1.1, 16.3, Abilities.CHLOROPHYLL, Abilities.OWN_TEMPO, Abilities.LEAF_GUARD, 480, 70, 60, 75, 110, 75, 90, 75, 50, 168, GrowthRate.MEDIUM_FAST, 0, false),
-    new PokemonSpecies(Species.BASCULIN, 5, false, false, false, "Hostile Pokémon", Type.WATER, null, 1, 18, Abilities.RECKLESS, Abilities.ADAPTABILITY, Abilities.MOLD_BREAKER, 460, 70, 92, 65, 80, 55, 98, 25, 50, 161, GrowthRate.MEDIUM_FAST, 50, false, false,
-      new PokemonForm("Red-Striped Form", "red-striped", Type.WATER, null, 1, 18, Abilities.RECKLESS, Abilities.ADAPTABILITY, Abilities.MOLD_BREAKER, 460, 70, 92, 65, 80, 55, 98, 25, 50, 161, false, null, true),
-      new PokemonForm("Blue-Striped Form", "blue-striped", Type.WATER, null, 1, 18, Abilities.ROCK_HEAD, Abilities.ADAPTABILITY, Abilities.MOLD_BREAKER, 460, 70, 92, 65, 80, 55, 98, 25, 50, 161, false, null, true),
-      new PokemonForm("White-Striped Form", "white-striped", Type.WATER, null, 1, 18, Abilities.RATTLED, Abilities.ADAPTABILITY, Abilities.MOLD_BREAKER, 460, 70, 92, 65, 80, 55, 98, 25, 50, 161, false, null, true),
-    ),
-    new PokemonSpecies(Species.SANDILE, 5, false, false, false, "Desert Croc Pokémon", Type.GROUND, Type.DARK, 0.7, 15.2, Abilities.INTIMIDATE, Abilities.MOXIE, Abilities.ANGER_POINT, 292, 50, 72, 35, 35, 35, 65, 180, 50, 58, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.KROKOROK, 5, false, false, false, "Desert Croc Pokémon", Type.GROUND, Type.DARK, 1, 33.4, Abilities.INTIMIDATE, Abilities.MOXIE, Abilities.ANGER_POINT, 351, 60, 82, 45, 45, 45, 74, 90, 50, 123, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.KROOKODILE, 5, false, false, false, "Intimidation Pokémon", Type.GROUND, Type.DARK, 1.5, 96.3, Abilities.INTIMIDATE, Abilities.MOXIE, Abilities.ANGER_POINT, 519, 95, 117, 80, 65, 70, 92, 45, 50, 260, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.DARUMAKA, 5, false, false, false, "Zen Charm Pokémon", Type.FIRE, null, 0.6, 37.5, Abilities.HUSTLE, Abilities.NONE, Abilities.INNER_FOCUS, 315, 70, 90, 45, 15, 45, 50, 120, 50, 63, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.DARMANITAN, 5, false, false, false, "Blazing Pokémon", Type.FIRE, null, 1.3, 92.9, Abilities.SHEER_FORCE, Abilities.NONE, Abilities.ZEN_MODE, 480, 105, 140, 55, 30, 55, 95, 60, 50, 168, GrowthRate.MEDIUM_SLOW, 50, false, true,
-      new PokemonForm("Standard Mode", "", Type.FIRE, null, 1.3, 92.9, Abilities.SHEER_FORCE, Abilities.NONE, Abilities.ZEN_MODE, 480, 105, 140, 55, 30, 55, 95, 60, 50, 168, false, null, true),
-      new PokemonForm("Zen Mode", "zen", Type.FIRE, Type.PSYCHIC, 1.3, 92.9, Abilities.SHEER_FORCE, Abilities.NONE, Abilities.ZEN_MODE, 540, 105, 30, 105, 140, 105, 55, 60, 50, 189),
-    ),
-    new PokemonSpecies(Species.MARACTUS, 5, false, false, false, "Cactus Pokémon", Type.GRASS, null, 1, 28, Abilities.WATER_ABSORB, Abilities.CHLOROPHYLL, Abilities.STORM_DRAIN, 461, 75, 86, 67, 106, 67, 60, 255, 50, 161, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.DWEBBLE, 5, false, false, false, "Rock Inn Pokémon", Type.BUG, Type.ROCK, 0.3, 14.5, Abilities.STURDY, Abilities.SHELL_ARMOR, Abilities.WEAK_ARMOR, 325, 50, 65, 85, 35, 35, 55, 190, 50, 65, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.CRUSTLE, 5, false, false, false, "Stone Home Pokémon", Type.BUG, Type.ROCK, 1.4, 200, Abilities.STURDY, Abilities.SHELL_ARMOR, Abilities.WEAK_ARMOR, 485, 70, 105, 125, 65, 75, 45, 75, 50, 170, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.SCRAGGY, 5, false, false, false, "Shedding Pokémon", Type.DARK, Type.FIGHTING, 0.6, 11.8, Abilities.SHED_SKIN, Abilities.MOXIE, Abilities.INTIMIDATE, 348, 50, 75, 70, 35, 70, 48, 180, 35, 70, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.SCRAFTY, 5, false, false, false, "Hoodlum Pokémon", Type.DARK, Type.FIGHTING, 1.1, 30, Abilities.SHED_SKIN, Abilities.MOXIE, Abilities.INTIMIDATE, 488, 65, 90, 115, 45, 115, 58, 90, 50, 171, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.SIGILYPH, 5, false, false, false, "Avianoid Pokémon", Type.PSYCHIC, Type.FLYING, 1.4, 14, Abilities.WONDER_SKIN, Abilities.MAGIC_GUARD, Abilities.TINTED_LENS, 490, 72, 58, 80, 103, 80, 97, 45, 50, 172, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.YAMASK, 5, false, false, false, "Spirit Pokémon", Type.GHOST, null, 0.5, 1.5, Abilities.MUMMY, Abilities.NONE, Abilities.NONE, 303, 38, 30, 85, 55, 65, 30, 190, 50, 61, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.COFAGRIGUS, 5, false, false, false, "Coffin Pokémon", Type.GHOST, null, 1.7, 76.5, Abilities.MUMMY, Abilities.NONE, Abilities.NONE, 483, 58, 50, 145, 95, 105, 30, 90, 50, 169, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.TIRTOUGA, 5, false, false, false, "Prototurtle Pokémon", Type.WATER, Type.ROCK, 0.7, 16.5, Abilities.SOLID_ROCK, Abilities.STURDY, Abilities.SWIFT_SWIM, 355, 54, 78, 103, 53, 45, 22, 45, 50, 71, GrowthRate.MEDIUM_FAST, 87.5, false),
-    new PokemonSpecies(Species.CARRACOSTA, 5, false, false, false, "Prototurtle Pokémon", Type.WATER, Type.ROCK, 1.2, 81, Abilities.SOLID_ROCK, Abilities.STURDY, Abilities.SWIFT_SWIM, 495, 74, 108, 133, 83, 65, 32, 45, 50, 173, GrowthRate.MEDIUM_FAST, 87.5, false),
-    new PokemonSpecies(Species.ARCHEN, 5, false, false, false, "First Bird Pokémon", Type.ROCK, Type.FLYING, 0.5, 9.5, Abilities.DEFEATIST, Abilities.NONE, Abilities.WIMP_OUT, 401, 55, 112, 45, 74, 45, 70, 45, 50, 71, GrowthRate.MEDIUM_FAST, 87.5, false), //Custom Hidden
-    new PokemonSpecies(Species.ARCHEOPS, 5, false, false, false, "First Bird Pokémon", Type.ROCK, Type.FLYING, 1.4, 32, Abilities.DEFEATIST, Abilities.NONE, Abilities.EMERGENCY_EXIT, 567, 75, 140, 65, 112, 65, 110, 45, 50, 177, GrowthRate.MEDIUM_FAST, 87.5, false), //Custom Hidden
-    new PokemonSpecies(Species.TRUBBISH, 5, false, false, false, "Trash Bag Pokémon", Type.POISON, null, 0.6, 31, Abilities.STENCH, Abilities.STICKY_HOLD, Abilities.AFTERMATH, 329, 50, 50, 62, 40, 62, 65, 190, 50, 66, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.GARBODOR, 5, false, false, false, "Trash Heap Pokémon", Type.POISON, null, 1.9, 107.3, Abilities.STENCH, Abilities.WEAK_ARMOR, Abilities.AFTERMATH, 474, 80, 95, 82, 60, 82, 75, 60, 50, 166, GrowthRate.MEDIUM_FAST, 50, false, true,
-      new PokemonForm("Normal", "", Type.POISON, null, 1.9, 107.3, Abilities.STENCH, Abilities.WEAK_ARMOR, Abilities.AFTERMATH, 474, 80, 95, 82, 60, 82, 75, 60, 50, 166, false, null, true),
-      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.POISON, Type.STEEL, 21, 999.9, Abilities.TOXIC_DEBRIS, Abilities.TOXIC_DEBRIS, Abilities.TOXIC_DEBRIS, 574, 135, 125, 102, 57, 102, 53, 60, 50, 166),
-    ),
-    new PokemonSpecies(Species.ZORUA, 5, false, false, false, "Tricky Fox Pokémon", Type.DARK, null, 0.7, 12.5, Abilities.ILLUSION, Abilities.NONE, Abilities.NONE, 330, 40, 65, 40, 80, 40, 65, 75, 50, 66, GrowthRate.MEDIUM_SLOW, 87.5, false),
-    new PokemonSpecies(Species.ZOROARK, 5, false, false, false, "Illusion Fox Pokémon", Type.DARK, null, 1.6, 81.1, Abilities.ILLUSION, Abilities.NONE, Abilities.NONE, 510, 60, 105, 60, 120, 60, 105, 45, 50, 179, GrowthRate.MEDIUM_SLOW, 87.5, false),
-    new PokemonSpecies(Species.MINCCINO, 5, false, false, false, "Chinchilla Pokémon", Type.NORMAL, null, 0.4, 5.8, Abilities.CUTE_CHARM, Abilities.TECHNICIAN, Abilities.SKILL_LINK, 300, 55, 50, 40, 40, 40, 75, 255, 50, 60, GrowthRate.FAST, 25, false),
-    new PokemonSpecies(Species.CINCCINO, 5, false, false, false, "Scarf Pokémon", Type.NORMAL, null, 0.5, 7.5, Abilities.CUTE_CHARM, Abilities.TECHNICIAN, Abilities.SKILL_LINK, 470, 75, 95, 60, 65, 60, 115, 60, 50, 165, GrowthRate.FAST, 25, false),
-    new PokemonSpecies(Species.GOTHITA, 5, false, false, false, "Fixation Pokémon", Type.PSYCHIC, null, 0.4, 5.8, Abilities.FRISK, Abilities.COMPETITIVE, Abilities.SHADOW_TAG, 290, 45, 30, 50, 55, 65, 45, 200, 50, 58, GrowthRate.MEDIUM_SLOW, 25, false),
-    new PokemonSpecies(Species.GOTHORITA, 5, false, false, false, "Manipulate Pokémon", Type.PSYCHIC, null, 0.7, 18, Abilities.FRISK, Abilities.COMPETITIVE, Abilities.SHADOW_TAG, 390, 60, 45, 70, 75, 85, 55, 100, 50, 137, GrowthRate.MEDIUM_SLOW, 25, false),
-    new PokemonSpecies(Species.GOTHITELLE, 5, false, false, false, "Astral Body Pokémon", Type.PSYCHIC, null, 1.5, 44, Abilities.FRISK, Abilities.COMPETITIVE, Abilities.SHADOW_TAG, 490, 70, 55, 95, 95, 110, 65, 50, 50, 245, GrowthRate.MEDIUM_SLOW, 25, false),
-    new PokemonSpecies(Species.SOLOSIS, 5, false, false, false, "Cell Pokémon", Type.PSYCHIC, null, 0.3, 1, Abilities.OVERCOAT, Abilities.MAGIC_GUARD, Abilities.REGENERATOR, 290, 45, 30, 40, 105, 50, 20, 200, 50, 58, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.DUOSION, 5, false, false, false, "Mitosis Pokémon", Type.PSYCHIC, null, 0.6, 8, Abilities.OVERCOAT, Abilities.MAGIC_GUARD, Abilities.REGENERATOR, 370, 65, 40, 50, 125, 60, 30, 100, 50, 130, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.REUNICLUS, 5, false, false, false, "Multiplying Pokémon", Type.PSYCHIC, null, 1, 20.1, Abilities.OVERCOAT, Abilities.MAGIC_GUARD, Abilities.REGENERATOR, 490, 110, 65, 75, 125, 85, 30, 50, 50, 245, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.DUCKLETT, 5, false, false, false, "Water Bird Pokémon", Type.WATER, Type.FLYING, 0.5, 5.5, Abilities.KEEN_EYE, Abilities.BIG_PECKS, Abilities.HYDRATION, 305, 62, 44, 50, 44, 50, 55, 190, 70, 61, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.SWANNA, 5, false, false, false, "White Bird Pokémon", Type.WATER, Type.FLYING, 1.3, 24.2, Abilities.KEEN_EYE, Abilities.BIG_PECKS, Abilities.HYDRATION, 473, 75, 87, 63, 87, 63, 98, 45, 70, 166, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.VANILLITE, 5, false, false, false, "Fresh Snow Pokémon", Type.ICE, null, 0.4, 5.7, Abilities.ICE_BODY, Abilities.SNOW_CLOAK, Abilities.WEAK_ARMOR, 305, 36, 50, 50, 65, 60, 44, 255, 50, 61, GrowthRate.SLOW, 50, false),
-    new PokemonSpecies(Species.VANILLISH, 5, false, false, false, "Icy Snow Pokémon", Type.ICE, null, 1.1, 41, Abilities.ICE_BODY, Abilities.SNOW_CLOAK, Abilities.WEAK_ARMOR, 395, 51, 65, 65, 80, 75, 59, 120, 50, 138, GrowthRate.SLOW, 50, false),
-    new PokemonSpecies(Species.VANILLUXE, 5, false, false, false, "Snowstorm Pokémon", Type.ICE, null, 1.3, 57.5, Abilities.ICE_BODY, Abilities.SNOW_WARNING, Abilities.WEAK_ARMOR, 535, 71, 95, 85, 110, 95, 79, 45, 50, 268, GrowthRate.SLOW, 50, false),
-    new PokemonSpecies(Species.DEERLING, 5, false, false, false, "Season Pokémon", Type.NORMAL, Type.GRASS, 0.6, 19.5, Abilities.CHLOROPHYLL, Abilities.SAP_SIPPER, Abilities.SERENE_GRACE, 335, 60, 60, 50, 40, 50, 75, 190, 70, 67, GrowthRate.MEDIUM_FAST, 50, false, true,
-      new PokemonForm("Spring Form", "spring", Type.NORMAL, Type.GRASS, 0.6, 19.5, Abilities.CHLOROPHYLL, Abilities.SAP_SIPPER, Abilities.SERENE_GRACE, 335, 60, 60, 50, 40, 50, 75, 190, 70, 67, false, null, true),
-      new PokemonForm("Summer Form", "summer", Type.NORMAL, Type.GRASS, 0.6, 19.5, Abilities.CHLOROPHYLL, Abilities.SAP_SIPPER, Abilities.SERENE_GRACE, 335, 60, 60, 50, 40, 50, 75, 190, 70, 67, false, null, true),
-      new PokemonForm("Autumn Form", "autumn", Type.NORMAL, Type.GRASS, 0.6, 19.5, Abilities.CHLOROPHYLL, Abilities.SAP_SIPPER, Abilities.SERENE_GRACE, 335, 60, 60, 50, 40, 50, 75, 190, 70, 67, false, null, true),
-      new PokemonForm("Winter Form", "winter", Type.NORMAL, Type.GRASS, 0.6, 19.5, Abilities.CHLOROPHYLL, Abilities.SAP_SIPPER, Abilities.SERENE_GRACE, 335, 60, 60, 50, 40, 50, 75, 190, 70, 67, false, null, true),
-    ),
-    new PokemonSpecies(Species.SAWSBUCK, 5, false, false, false, "Season Pokémon", Type.NORMAL, Type.GRASS, 1.9, 92.5, Abilities.CHLOROPHYLL, Abilities.SAP_SIPPER, Abilities.SERENE_GRACE, 475, 80, 100, 70, 60, 70, 95, 75, 70, 166, GrowthRate.MEDIUM_FAST, 50, false, true,
-      new PokemonForm("Spring Form", "spring", Type.NORMAL, Type.GRASS, 1.9, 92.5, Abilities.CHLOROPHYLL, Abilities.SAP_SIPPER, Abilities.SERENE_GRACE, 475, 80, 100, 70, 60, 70, 95, 75, 70, 166, false, null, true),
-      new PokemonForm("Summer Form", "summer", Type.NORMAL, Type.GRASS, 1.9, 92.5, Abilities.CHLOROPHYLL, Abilities.SAP_SIPPER, Abilities.SERENE_GRACE, 475, 80, 100, 70, 60, 70, 95, 75, 70, 166, false, null, true),
-      new PokemonForm("Autumn Form", "autumn", Type.NORMAL, Type.GRASS, 1.9, 92.5, Abilities.CHLOROPHYLL, Abilities.SAP_SIPPER, Abilities.SERENE_GRACE, 475, 80, 100, 70, 60, 70, 95, 75, 70, 166, false, null, true),
-      new PokemonForm("Winter Form", "winter", Type.NORMAL, Type.GRASS, 1.9, 92.5, Abilities.CHLOROPHYLL, Abilities.SAP_SIPPER, Abilities.SERENE_GRACE, 475, 80, 100, 70, 60, 70, 95, 75, 70, 166, false, null, true),
-    ),
-    new PokemonSpecies(Species.EMOLGA, 5, false, false, false, "Sky Squirrel Pokémon", Type.ELECTRIC, Type.FLYING, 0.4, 5, Abilities.STATIC, Abilities.NONE, Abilities.MOTOR_DRIVE, 428, 55, 75, 60, 75, 60, 103, 200, 50, 150, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.KARRABLAST, 5, false, false, false, "Clamping Pokémon", Type.BUG, null, 0.5, 5.9, Abilities.SWARM, Abilities.SHED_SKIN, Abilities.NO_GUARD, 315, 50, 75, 45, 40, 45, 60, 200, 50, 63, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.ESCAVALIER, 5, false, false, false, "Cavalry Pokémon", Type.BUG, Type.STEEL, 1, 33, Abilities.SWARM, Abilities.SHELL_ARMOR, Abilities.OVERCOAT, 495, 70, 135, 105, 60, 105, 20, 75, 50, 173, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.FOONGUS, 5, false, false, false, "Mushroom Pokémon", Type.GRASS, Type.POISON, 0.2, 1, Abilities.EFFECT_SPORE, Abilities.NONE, Abilities.REGENERATOR, 294, 69, 55, 45, 55, 55, 15, 190, 50, 59, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.AMOONGUSS, 5, false, false, false, "Mushroom Pokémon", Type.GRASS, Type.POISON, 0.6, 10.5, Abilities.EFFECT_SPORE, Abilities.NONE, Abilities.REGENERATOR, 464, 114, 85, 70, 85, 80, 30, 75, 50, 162, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.FRILLISH, 5, false, false, false, "Floating Pokémon", Type.WATER, Type.GHOST, 1.2, 33, Abilities.WATER_ABSORB, Abilities.CURSED_BODY, Abilities.DAMP, 335, 55, 40, 50, 65, 85, 40, 190, 50, 67, GrowthRate.MEDIUM_FAST, 50, true),
-    new PokemonSpecies(Species.JELLICENT, 5, false, false, false, "Floating Pokémon", Type.WATER, Type.GHOST, 2.2, 135, Abilities.WATER_ABSORB, Abilities.CURSED_BODY, Abilities.DAMP, 480, 100, 60, 70, 85, 105, 60, 60, 50, 168, GrowthRate.MEDIUM_FAST, 50, true),
-    new PokemonSpecies(Species.ALOMOMOLA, 5, false, false, false, "Caring Pokémon", Type.WATER, null, 1.2, 31.6, Abilities.HEALER, Abilities.HYDRATION, Abilities.REGENERATOR, 470, 165, 75, 80, 40, 45, 65, 75, 70, 165, GrowthRate.FAST, 50, false),
-    new PokemonSpecies(Species.JOLTIK, 5, false, false, false, "Attaching Pokémon", Type.BUG, Type.ELECTRIC, 0.1, 0.6, Abilities.COMPOUND_EYES, Abilities.UNNERVE, Abilities.SWARM, 319, 50, 47, 50, 57, 50, 65, 190, 50, 64, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.GALVANTULA, 5, false, false, false, "EleSpider Pokémon", Type.BUG, Type.ELECTRIC, 0.8, 14.3, Abilities.COMPOUND_EYES, Abilities.UNNERVE, Abilities.SWARM, 472, 70, 77, 60, 97, 60, 108, 75, 50, 165, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.FERROSEED, 5, false, false, false, "Thorn Seed Pokémon", Type.GRASS, Type.STEEL, 0.6, 18.8, Abilities.IRON_BARBS, Abilities.NONE, Abilities.ANTICIPATION, 305, 44, 50, 91, 24, 86, 10, 255, 50, 61, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.FERROTHORN, 5, false, false, false, "Thorn Pod Pokémon", Type.GRASS, Type.STEEL, 1, 110, Abilities.IRON_BARBS, Abilities.NONE, Abilities.ANTICIPATION, 489, 74, 94, 131, 54, 116, 20, 90, 50, 171, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.KLINK, 5, false, false, false, "Gear Pokémon", Type.STEEL, null, 0.3, 21, Abilities.PLUS, Abilities.MINUS, Abilities.CLEAR_BODY, 300, 40, 55, 70, 45, 60, 30, 130, 50, 60, GrowthRate.MEDIUM_SLOW, null, false),
-    new PokemonSpecies(Species.KLANG, 5, false, false, false, "Gear Pokémon", Type.STEEL, null, 0.6, 51, Abilities.PLUS, Abilities.MINUS, Abilities.CLEAR_BODY, 440, 60, 80, 95, 70, 85, 50, 60, 50, 154, GrowthRate.MEDIUM_SLOW, null, false),
-    new PokemonSpecies(Species.KLINKLANG, 5, false, false, false, "Gear Pokémon", Type.STEEL, null, 0.6, 81, Abilities.PLUS, Abilities.MINUS, Abilities.CLEAR_BODY, 520, 60, 100, 115, 70, 85, 90, 30, 50, 260, GrowthRate.MEDIUM_SLOW, null, false),
-    new PokemonSpecies(Species.TYNAMO, 5, false, false, false, "EleFish Pokémon", Type.ELECTRIC, null, 0.2, 0.3, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 275, 35, 55, 40, 45, 40, 60, 190, 70, 55, GrowthRate.SLOW, 50, false),
-    new PokemonSpecies(Species.EELEKTRIK, 5, false, false, false, "EleFish Pokémon", Type.ELECTRIC, null, 1.2, 22, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 405, 65, 85, 70, 75, 70, 40, 60, 70, 142, GrowthRate.SLOW, 50, false),
-    new PokemonSpecies(Species.EELEKTROSS, 5, false, false, false, "EleFish Pokémon", Type.ELECTRIC, null, 2.1, 80.5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 515, 85, 115, 80, 105, 80, 50, 30, 70, 258, GrowthRate.SLOW, 50, false),
-    new PokemonSpecies(Species.ELGYEM, 5, false, false, false, "Cerebral Pokémon", Type.PSYCHIC, null, 0.5, 9, Abilities.TELEPATHY, Abilities.SYNCHRONIZE, Abilities.ANALYTIC, 335, 55, 55, 55, 85, 55, 30, 255, 50, 67, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.BEHEEYEM, 5, false, false, false, "Cerebral Pokémon", Type.PSYCHIC, null, 1, 34.5, Abilities.TELEPATHY, Abilities.SYNCHRONIZE, Abilities.ANALYTIC, 485, 75, 75, 75, 125, 95, 40, 90, 50, 170, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.LITWICK, 5, false, false, false, "Candle Pokémon", Type.GHOST, Type.FIRE, 0.3, 3.1, Abilities.FLASH_FIRE, Abilities.FLAME_BODY, Abilities.INFILTRATOR, 275, 50, 30, 55, 65, 55, 20, 190, 50, 55, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.LAMPENT, 5, false, false, false, "Lamp Pokémon", Type.GHOST, Type.FIRE, 0.6, 13, Abilities.FLASH_FIRE, Abilities.FLAME_BODY, Abilities.INFILTRATOR, 370, 60, 40, 60, 95, 60, 55, 90, 50, 130, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.CHANDELURE, 5, false, false, false, "Luring Pokémon", Type.GHOST, Type.FIRE, 1, 34.3, Abilities.FLASH_FIRE, Abilities.FLAME_BODY, Abilities.INFILTRATOR, 520, 60, 55, 90, 145, 90, 80, 45, 50, 260, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.AXEW, 5, false, false, false, "Tusk Pokémon", Type.DRAGON, null, 0.6, 18, Abilities.RIVALRY, Abilities.MOLD_BREAKER, Abilities.UNNERVE, 320, 46, 87, 60, 30, 40, 57, 75, 35, 64, GrowthRate.SLOW, 50, false),
-    new PokemonSpecies(Species.FRAXURE, 5, false, false, false, "Axe Jaw Pokémon", Type.DRAGON, null, 1, 36, Abilities.RIVALRY, Abilities.MOLD_BREAKER, Abilities.UNNERVE, 410, 66, 117, 70, 40, 50, 67, 60, 35, 144, GrowthRate.SLOW, 50, false),
-    new PokemonSpecies(Species.HAXORUS, 5, false, false, false, "Axe Jaw Pokémon", Type.DRAGON, null, 1.8, 105.5, Abilities.RIVALRY, Abilities.MOLD_BREAKER, Abilities.UNNERVE, 540, 76, 147, 90, 60, 70, 97, 45, 35, 270, GrowthRate.SLOW, 50, false),
-    new PokemonSpecies(Species.CUBCHOO, 5, false, false, false, "Chill Pokémon", Type.ICE, null, 0.5, 8.5, Abilities.SNOW_CLOAK, Abilities.SLUSH_RUSH, Abilities.RATTLED, 305, 55, 70, 40, 60, 40, 40, 120, 50, 61, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.BEARTIC, 5, false, false, false, "Freezing Pokémon", Type.ICE, null, 2.6, 260, Abilities.SNOW_CLOAK, Abilities.SLUSH_RUSH, Abilities.SWIFT_SWIM, 505, 95, 130, 80, 70, 80, 50, 60, 50, 177, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.CRYOGONAL, 5, false, false, false, "Crystallizing Pokémon", Type.ICE, null, 1.1, 148, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 515, 80, 50, 50, 95, 135, 105, 25, 50, 180, GrowthRate.MEDIUM_FAST, null, false),
-    new PokemonSpecies(Species.SHELMET, 5, false, false, false, "Snail Pokémon", Type.BUG, null, 0.4, 7.7, Abilities.HYDRATION, Abilities.SHELL_ARMOR, Abilities.OVERCOAT, 305, 50, 40, 85, 40, 65, 25, 200, 50, 61, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.ACCELGOR, 5, false, false, false, "Shell Out Pokémon", Type.BUG, null, 0.8, 25.3, Abilities.HYDRATION, Abilities.STICKY_HOLD, Abilities.UNBURDEN, 495, 80, 70, 40, 100, 60, 145, 75, 50, 173, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.STUNFISK, 5, false, false, false, "Trap Pokémon", Type.GROUND, Type.ELECTRIC, 0.7, 11, Abilities.STATIC, Abilities.LIMBER, Abilities.SAND_VEIL, 471, 109, 66, 84, 81, 99, 32, 75, 70, 165, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.MIENFOO, 5, false, false, false, "Martial Arts Pokémon", Type.FIGHTING, null, 0.9, 20, Abilities.INNER_FOCUS, Abilities.REGENERATOR, Abilities.RECKLESS, 350, 45, 85, 50, 55, 50, 65, 180, 50, 70, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.MIENSHAO, 5, false, false, false, "Martial Arts Pokémon", Type.FIGHTING, null, 1.4, 35.5, Abilities.INNER_FOCUS, Abilities.REGENERATOR, Abilities.RECKLESS, 510, 65, 125, 60, 95, 60, 105, 45, 50, 179, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.DRUDDIGON, 5, false, false, false, "Cave Pokémon", Type.DRAGON, null, 1.6, 139, Abilities.ROUGH_SKIN, Abilities.SHEER_FORCE, Abilities.MOLD_BREAKER, 485, 77, 120, 90, 60, 90, 48, 45, 50, 170, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.GOLETT, 5, false, false, false, "Automaton Pokémon", Type.GROUND, Type.GHOST, 1, 92, Abilities.IRON_FIST, Abilities.KLUTZ, Abilities.NO_GUARD, 303, 59, 74, 50, 35, 50, 35, 190, 50, 61, GrowthRate.MEDIUM_FAST, null, false),
-    new PokemonSpecies(Species.GOLURK, 5, false, false, false, "Automaton Pokémon", Type.GROUND, Type.GHOST, 2.8, 330, Abilities.IRON_FIST, Abilities.KLUTZ, Abilities.NO_GUARD, 483, 89, 124, 80, 55, 80, 55, 90, 50, 169, GrowthRate.MEDIUM_FAST, null, false),
-    new PokemonSpecies(Species.PAWNIARD, 5, false, false, false, "Sharp Blade Pokémon", Type.DARK, Type.STEEL, 0.5, 10.2, Abilities.DEFIANT, Abilities.INNER_FOCUS, Abilities.PRESSURE, 340, 45, 85, 70, 40, 40, 60, 120, 35, 68, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.BISHARP, 5, false, false, false, "Sword Blade Pokémon", Type.DARK, Type.STEEL, 1.6, 70, Abilities.DEFIANT, Abilities.INNER_FOCUS, Abilities.PRESSURE, 490, 65, 125, 100, 60, 70, 70, 45, 35, 172, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.BOUFFALANT, 5, false, false, false, "Bash Buffalo Pokémon", Type.NORMAL, null, 1.6, 94.6, Abilities.RECKLESS, Abilities.SAP_SIPPER, Abilities.SOUNDPROOF, 490, 95, 110, 95, 40, 95, 55, 45, 50, 172, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.RUFFLET, 5, false, false, false, "Eaglet Pokémon", Type.NORMAL, Type.FLYING, 0.5, 10.5, Abilities.KEEN_EYE, Abilities.SHEER_FORCE, Abilities.HUSTLE, 350, 70, 83, 50, 37, 50, 60, 190, 50, 70, GrowthRate.SLOW, 100, false),
-    new PokemonSpecies(Species.BRAVIARY, 5, false, false, false, "Valiant Pokémon", Type.NORMAL, Type.FLYING, 1.5, 41, Abilities.KEEN_EYE, Abilities.SHEER_FORCE, Abilities.DEFIANT, 510, 100, 123, 75, 57, 75, 80, 60, 50, 179, GrowthRate.SLOW, 100, false),
-    new PokemonSpecies(Species.VULLABY, 5, false, false, false, "Diapered Pokémon", Type.DARK, Type.FLYING, 0.5, 9, Abilities.BIG_PECKS, Abilities.OVERCOAT, Abilities.WEAK_ARMOR, 370, 70, 55, 75, 45, 65, 60, 190, 35, 74, GrowthRate.SLOW, 0, false),
-    new PokemonSpecies(Species.MANDIBUZZ, 5, false, false, false, "Bone Vulture Pokémon", Type.DARK, Type.FLYING, 1.2, 39.5, Abilities.BIG_PECKS, Abilities.OVERCOAT, Abilities.WEAK_ARMOR, 510, 110, 65, 105, 55, 95, 80, 60, 35, 179, GrowthRate.SLOW, 0, false),
-    new PokemonSpecies(Species.HEATMOR, 5, false, false, false, "Anteater Pokémon", Type.FIRE, null, 1.4, 58, Abilities.GLUTTONY, Abilities.FLASH_FIRE, Abilities.WHITE_SMOKE, 484, 85, 97, 66, 105, 66, 65, 90, 50, 169, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.DURANT, 5, false, false, false, "Iron Ant Pokémon", Type.BUG, Type.STEEL, 0.3, 33, Abilities.SWARM, Abilities.HUSTLE, Abilities.TRUANT, 484, 58, 109, 112, 48, 48, 109, 90, 50, 169, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.DEINO, 5, false, false, false, "Irate Pokémon", Type.DARK, Type.DRAGON, 0.8, 17.3, Abilities.HUSTLE, Abilities.NONE, Abilities.NONE, 300, 52, 65, 50, 45, 50, 38, 45, 35, 60, GrowthRate.SLOW, 50, false),
-    new PokemonSpecies(Species.ZWEILOUS, 5, false, false, false, "Hostile Pokémon", Type.DARK, Type.DRAGON, 1.4, 50, Abilities.HUSTLE, Abilities.NONE, Abilities.NONE, 420, 72, 85, 70, 65, 70, 58, 45, 35, 147, GrowthRate.SLOW, 50, false),
-    new PokemonSpecies(Species.HYDREIGON, 5, false, false, false, "Brutal Pokémon", Type.DARK, Type.DRAGON, 1.8, 160, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 600, 92, 105, 90, 125, 90, 98, 45, 35, 300, GrowthRate.SLOW, 50, false),
-    new PokemonSpecies(Species.LARVESTA, 5, false, false, false, "Torch Pokémon", Type.BUG, Type.FIRE, 1.1, 28.8, Abilities.FLAME_BODY, Abilities.NONE, Abilities.SWARM, 360, 55, 85, 55, 50, 55, 60, 45, 50, 72, GrowthRate.SLOW, 50, false),
-    new PokemonSpecies(Species.VOLCARONA, 5, false, false, false, "Sun Pokémon", Type.BUG, Type.FIRE, 1.6, 46, Abilities.FLAME_BODY, Abilities.NONE, Abilities.SWARM, 550, 85, 60, 65, 135, 105, 100, 15, 50, 275, GrowthRate.SLOW, 50, false),
-    new PokemonSpecies(Species.COBALION, 5, true, false, false, "Iron Will Pokémon", Type.STEEL, Type.FIGHTING, 2.1, 250, Abilities.JUSTIFIED, Abilities.NONE, Abilities.NONE, 580, 91, 90, 129, 90, 72, 108, 3, 35, 290, GrowthRate.SLOW, null, false),
-    new PokemonSpecies(Species.TERRAKION, 5, true, false, false, "Cavern Pokémon", Type.ROCK, Type.FIGHTING, 1.9, 260, Abilities.JUSTIFIED, Abilities.NONE, Abilities.NONE, 580, 91, 129, 90, 72, 90, 108, 3, 35, 290, GrowthRate.SLOW, null, false),
-    new PokemonSpecies(Species.VIRIZION, 5, true, false, false, "Grassland Pokémon", Type.GRASS, Type.FIGHTING, 2, 200, Abilities.JUSTIFIED, Abilities.NONE, Abilities.NONE, 580, 91, 90, 72, 90, 129, 108, 3, 35, 290, GrowthRate.SLOW, null, false),
-    new PokemonSpecies(Species.TORNADUS, 5, true, false, false, "Cyclone Pokémon", Type.FLYING, null, 1.5, 63, Abilities.PRANKSTER, Abilities.NONE, Abilities.DEFIANT, 580, 79, 115, 70, 125, 80, 111, 3, 90, 290, GrowthRate.SLOW, 100, false, true,
-      new PokemonForm("Incarnate Forme", "incarnate", Type.FLYING, null, 1.5, 63, Abilities.PRANKSTER, Abilities.NONE, Abilities.DEFIANT, 580, 79, 115, 70, 125, 80, 111, 3, 90, 290, false, null, true),
-      new PokemonForm("Therian Forme", "therian", Type.FLYING, null, 1.4, 63, Abilities.REGENERATOR, Abilities.NONE, Abilities.REGENERATOR, 580, 79, 100, 80, 110, 90, 121, 3, 90, 290),
-    ),
-    new PokemonSpecies(Species.THUNDURUS, 5, true, false, false, "Bolt Strike Pokémon", Type.ELECTRIC, Type.FLYING, 1.5, 61, Abilities.PRANKSTER, Abilities.NONE, Abilities.DEFIANT, 580, 79, 115, 70, 125, 80, 111, 3, 90, 290, GrowthRate.SLOW, 100, false, true,
-      new PokemonForm("Incarnate Forme", "incarnate", Type.ELECTRIC, Type.FLYING, 1.5, 61, Abilities.PRANKSTER, Abilities.NONE, Abilities.DEFIANT, 580, 79, 115, 70, 125, 80, 111, 3, 90, 290, false, null, true),
-      new PokemonForm("Therian Forme", "therian", Type.ELECTRIC, Type.FLYING, 3, 61, Abilities.VOLT_ABSORB, Abilities.NONE, Abilities.VOLT_ABSORB, 580, 79, 105, 70, 145, 80, 101, 3, 90, 290),
-    ),
-    new PokemonSpecies(Species.RESHIRAM, 5, false, true, false, "Vast White Pokémon", Type.DRAGON, Type.FIRE, 3.2, 330, Abilities.TURBOBLAZE, Abilities.NONE, Abilities.NONE, 680, 100, 120, 100, 150, 120, 90, 3, 0, 340, GrowthRate.SLOW, null, false),
-    new PokemonSpecies(Species.ZEKROM, 5, false, true, false, "Deep Black Pokémon", Type.DRAGON, Type.ELECTRIC, 2.9, 345, Abilities.TERAVOLT, Abilities.NONE, Abilities.NONE, 680, 100, 150, 120, 120, 100, 90, 3, 0, 340, GrowthRate.SLOW, null, false),
-    new PokemonSpecies(Species.LANDORUS, 5, true, false, false, "Abundance Pokémon", Type.GROUND, Type.FLYING, 1.5, 68, Abilities.SAND_FORCE, Abilities.NONE, Abilities.SHEER_FORCE, 600, 89, 125, 90, 115, 80, 101, 3, 90, 300, GrowthRate.SLOW, 100, false, true,
-      new PokemonForm("Incarnate Forme", "incarnate", Type.GROUND, Type.FLYING, 1.5, 68, Abilities.SAND_FORCE, Abilities.NONE, Abilities.SHEER_FORCE, 600, 89, 125, 90, 115, 80, 101, 3, 90, 300, false, null, true),
-      new PokemonForm("Therian Forme", "therian", Type.GROUND, Type.FLYING, 1.3, 68, Abilities.INTIMIDATE, Abilities.NONE, Abilities.INTIMIDATE, 600, 89, 145, 90, 105, 80, 91, 3, 90, 300),
-    ),
-    new PokemonSpecies(Species.KYUREM, 5, false, true, false, "Boundary Pokémon", Type.DRAGON, Type.ICE, 3, 325, Abilities.PRESSURE, Abilities.NONE, Abilities.NONE, 660, 125, 130, 90, 130, 90, 95, 3, 0, 330, GrowthRate.SLOW, null, false, true,
-      new PokemonForm("Normal", "", Type.DRAGON, Type.ICE, 3, 325, Abilities.PRESSURE, Abilities.NONE, Abilities.NONE, 660, 125, 130, 90, 130, 90, 95, 3, 0, 330, false, null, true),
-      new PokemonForm("Black", "black", Type.DRAGON, Type.ICE, 3.3, 325, Abilities.TERAVOLT, Abilities.NONE, Abilities.NONE, 700, 125, 170, 100, 120, 90, 95, 3, 0, 350),
-      new PokemonForm("White", "white", Type.DRAGON, Type.ICE, 3.6, 325, Abilities.TURBOBLAZE, Abilities.NONE, Abilities.NONE, 700, 125, 120, 90, 170, 100, 95, 3, 0, 350),
-    ),
-    new PokemonSpecies(Species.KELDEO, 5, false, false, true, "Colt Pokémon", Type.WATER, Type.FIGHTING, 1.4, 48.5, Abilities.JUSTIFIED, Abilities.NONE, Abilities.NONE, 580, 91, 72, 90, 129, 90, 108, 3, 35, 290, GrowthRate.SLOW, null, false, true,
-      new PokemonForm("Ordinary Form", "ordinary", Type.WATER, Type.FIGHTING, 1.4, 48.5, Abilities.JUSTIFIED, Abilities.NONE, Abilities.NONE, 580, 91, 72, 90, 129, 90, 108, 3, 35, 290, false, null, true),
-      new PokemonForm("Resolute", "resolute", Type.WATER, Type.FIGHTING, 1.4, 48.5, Abilities.JUSTIFIED, Abilities.NONE, Abilities.NONE, 580, 91, 72, 90, 129, 90, 108, 3, 35, 290),
-    ),
-    new PokemonSpecies(Species.MELOETTA, 5, false, false, true, "Melody Pokémon", Type.NORMAL, Type.PSYCHIC, 0.6, 6.5, Abilities.SERENE_GRACE, Abilities.NONE, Abilities.NONE, 600, 100, 77, 77, 128, 128, 90, 3, 100, 300, GrowthRate.SLOW, null, false, true,
-      new PokemonForm("Aria Forme", "aria", Type.NORMAL, Type.PSYCHIC, 0.6, 6.5, Abilities.SERENE_GRACE, Abilities.NONE, Abilities.NONE, 600, 100, 77, 77, 128, 128, 90, 3, 100, 300, false, null, true),
-      new PokemonForm("Pirouette Forme", "pirouette", Type.NORMAL, Type.FIGHTING, 0.6, 6.5, Abilities.SERENE_GRACE, Abilities.NONE, Abilities.NONE, 600, 100, 128, 90, 77, 77, 128, 3, 100, 300, false, null, true),
-    ),
-    new PokemonSpecies(Species.GENESECT, 5, false, false, true, "Paleozoic Pokémon", Type.BUG, Type.STEEL, 1.5, 82.5, Abilities.DOWNLOAD, Abilities.NONE, Abilities.NONE, 600, 71, 120, 95, 120, 95, 99, 3, 0, 300, GrowthRate.SLOW, null, false, true,
-      new PokemonForm("Normal", "", Type.BUG, Type.STEEL, 1.5, 82.5, Abilities.DOWNLOAD, Abilities.NONE, Abilities.NONE, 600, 71, 120, 95, 120, 95, 99, 3, 0, 300, false, null, true),
-      new PokemonForm("Shock Drive", "shock", Type.BUG, Type.STEEL, 1.5, 82.5, Abilities.DOWNLOAD, Abilities.NONE, Abilities.NONE, 600, 71, 120, 95, 120, 95, 99, 3, 0, 300),
-      new PokemonForm("Burn Drive", "burn", Type.BUG, Type.STEEL, 1.5, 82.5, Abilities.DOWNLOAD, Abilities.NONE, Abilities.NONE, 600, 71, 120, 95, 120, 95, 99, 3, 0, 300),
-      new PokemonForm("Chill Drive", "chill", Type.BUG, Type.STEEL, 1.5, 82.5, Abilities.DOWNLOAD, Abilities.NONE, Abilities.NONE, 600, 71, 120, 95, 120, 95, 99, 3, 0, 300),
-      new PokemonForm("Douse Drive", "douse", Type.BUG, Type.STEEL, 1.5, 82.5, Abilities.DOWNLOAD, Abilities.NONE, Abilities.NONE, 600, 71, 120, 95, 120, 95, 99, 3, 0, 300),
-    ),
-    new PokemonSpecies(Species.CHESPIN, 6, false, false, false, "Spiny Nut Pokémon", Type.GRASS, null, 0.4, 9, Abilities.OVERGROW, Abilities.NONE, Abilities.BULLETPROOF, 313, 56, 61, 65, 48, 45, 38, 45, 70, 63, GrowthRate.MEDIUM_SLOW, 87.5, false),
-    new PokemonSpecies(Species.QUILLADIN, 6, false, false, false, "Spiny Armor Pokémon", Type.GRASS, null, 0.7, 29, Abilities.OVERGROW, Abilities.NONE, Abilities.BULLETPROOF, 405, 61, 78, 95, 56, 58, 57, 45, 70, 142, GrowthRate.MEDIUM_SLOW, 87.5, false),
-    new PokemonSpecies(Species.CHESNAUGHT, 6, false, false, false, "Spiny Armor Pokémon", Type.GRASS, Type.FIGHTING, 1.6, 90, Abilities.OVERGROW, Abilities.NONE, Abilities.BULLETPROOF, 530, 88, 107, 122, 74, 75, 64, 45, 70, 265, GrowthRate.MEDIUM_SLOW, 87.5, false),
-    new PokemonSpecies(Species.FENNEKIN, 6, false, false, false, "Fox Pokémon", Type.FIRE, null, 0.4, 9.4, Abilities.BLAZE, Abilities.NONE, Abilities.MAGICIAN, 307, 40, 45, 40, 62, 60, 60, 45, 70, 61, GrowthRate.MEDIUM_SLOW, 87.5, false),
-    new PokemonSpecies(Species.BRAIXEN, 6, false, false, false, "Fox Pokémon", Type.FIRE, null, 1, 14.5, Abilities.BLAZE, Abilities.NONE, Abilities.MAGICIAN, 409, 59, 59, 58, 90, 70, 73, 45, 70, 143, GrowthRate.MEDIUM_SLOW, 87.5, false),
-    new PokemonSpecies(Species.DELPHOX, 6, false, false, false, "Fox Pokémon", Type.FIRE, Type.PSYCHIC, 1.5, 39, Abilities.BLAZE, Abilities.NONE, Abilities.MAGICIAN, 534, 75, 69, 72, 114, 100, 104, 45, 70, 267, GrowthRate.MEDIUM_SLOW, 87.5, false),
-    new PokemonSpecies(Species.FROAKIE, 6, false, false, false, "Bubble Frog Pokémon", Type.WATER, null, 0.3, 7, Abilities.TORRENT, Abilities.NONE, Abilities.PROTEAN, 314, 41, 56, 40, 62, 44, 71, 45, 70, 63, GrowthRate.MEDIUM_SLOW, 87.5, false, false,
-      new PokemonForm("Normal", "", Type.WATER, null, 0.3, 7, Abilities.TORRENT, Abilities.NONE, Abilities.PROTEAN, 314, 41, 56, 40, 62, 44, 71, 45, 70, 63, false, null, true),
-      new PokemonForm("Battle Bond", "battle-bond", Type.WATER, null, 0.3, 7, Abilities.TORRENT, Abilities.NONE, Abilities.PROTEAN, 314, 41, 56, 40, 62, 44, 71, 45, 70, 63, false, "", true),
-    ),
-    new PokemonSpecies(Species.FROGADIER, 6, false, false, false, "Bubble Frog Pokémon", Type.WATER, null, 0.6, 10.9, Abilities.TORRENT, Abilities.NONE, Abilities.PROTEAN, 405, 54, 63, 52, 83, 56, 97, 45, 70, 142, GrowthRate.MEDIUM_SLOW, 87.5, false, false,
-      new PokemonForm("Normal", "", Type.WATER, null, 0.6, 10.9, Abilities.TORRENT, Abilities.NONE, Abilities.PROTEAN, 405, 54, 63, 52, 83, 56, 97, 45, 70, 142, false, null, true),
-      new PokemonForm("Battle Bond", "battle-bond", Type.WATER, null, 0.6, 10.9, Abilities.TORRENT, Abilities.NONE, Abilities.PROTEAN, 405, 54, 63, 52, 83, 56, 97, 45, 70, 142, false, "", true),
-    ),
-    new PokemonSpecies(Species.GRENINJA, 6, false, false, false, "Ninja Pokémon", Type.WATER, Type.DARK, 1.5, 40, Abilities.TORRENT, Abilities.NONE, Abilities.PROTEAN, 530, 72, 95, 67, 103, 71, 122, 45, 70, 265, GrowthRate.MEDIUM_SLOW, 87.5, false, false,
-      new PokemonForm("Normal", "", Type.WATER, Type.DARK, 1.5, 40, Abilities.TORRENT, Abilities.NONE, Abilities.PROTEAN, 530, 72, 95, 67, 103, 71, 122, 45, 70, 265, false, null, true),
-      new PokemonForm("Battle Bond", "battle-bond", Type.WATER, Type.DARK, 1.5, 40, Abilities.BATTLE_BOND, Abilities.NONE, Abilities.BATTLE_BOND, 530, 72, 95, 67, 103, 71, 122, 45, 70, 265, false, "", true),
-      new PokemonForm("Ash", "ash", Type.WATER, Type.DARK, 1.5, 40, Abilities.BATTLE_BOND, Abilities.NONE, Abilities.BATTLE_BOND, 640, 72, 145, 67, 153, 71, 132, 45, 70, 265),
-    ),
-    new PokemonSpecies(Species.BUNNELBY, 6, false, false, false, "Digging Pokémon", Type.NORMAL, null, 0.4, 5, Abilities.PICKUP, Abilities.CHEEK_POUCH, Abilities.HUGE_POWER, 237, 38, 36, 38, 32, 36, 57, 255, 50, 47, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.DIGGERSBY, 6, false, false, false, "Digging Pokémon", Type.NORMAL, Type.GROUND, 1, 42.4, Abilities.PICKUP, Abilities.CHEEK_POUCH, Abilities.HUGE_POWER, 423, 85, 56, 77, 50, 77, 78, 127, 50, 148, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.FLETCHLING, 6, false, false, false, "Tiny Robin Pokémon", Type.NORMAL, Type.FLYING, 0.3, 1.7, Abilities.BIG_PECKS, Abilities.NONE, Abilities.GALE_WINGS, 278, 45, 50, 43, 40, 38, 62, 255, 50, 56, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.FLETCHINDER, 6, false, false, false, "Ember Pokémon", Type.FIRE, Type.FLYING, 0.7, 16, Abilities.FLAME_BODY, Abilities.NONE, Abilities.GALE_WINGS, 382, 62, 73, 55, 56, 52, 84, 120, 50, 134, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.TALONFLAME, 6, false, false, false, "Scorching Pokémon", Type.FIRE, Type.FLYING, 1.2, 24.5, Abilities.FLAME_BODY, Abilities.NONE, Abilities.GALE_WINGS, 499, 78, 81, 71, 74, 69, 126, 45, 50, 175, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.SCATTERBUG, 6, false, false, false, "Scatterdust Pokémon", Type.BUG, null, 0.3, 2.5, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 200, 38, 35, 40, 27, 25, 35, 255, 70, 40, GrowthRate.MEDIUM_FAST, 50, false, false,
-      new PokemonForm("Meadow Pattern", "meadow", Type.BUG, null, 0.3, 2.5, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 200, 38, 35, 40, 27, 25, 35, 255, 70, 40, false, "", true),
-      new PokemonForm("Icy Snow Pattern", "icy-snow", Type.BUG, null, 0.3, 2.5, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 200, 38, 35, 40, 27, 25, 35, 255, 70, 40, false, "", true),
-      new PokemonForm("Polar Pattern", "polar", Type.BUG, null, 0.3, 2.5, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 200, 38, 35, 40, 27, 25, 35, 255, 70, 40, false, "", true),
-      new PokemonForm("Tundra Pattern", "tundra", Type.BUG, null, 0.3, 2.5, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 200, 38, 35, 40, 27, 25, 35, 255, 70, 40, false, "", true),
-      new PokemonForm("Continental Pattern", "continental", Type.BUG, null, 0.3, 2.5, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 200, 38, 35, 40, 27, 25, 35, 255, 70, 40, false, "", true),
-      new PokemonForm("Garden Pattern", "garden", Type.BUG, null, 0.3, 2.5, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 200, 38, 35, 40, 27, 25, 35, 255, 70, 40, false, "", true),
-      new PokemonForm("Elegant Pattern", "elegant", Type.BUG, null, 0.3, 2.5, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 200, 38, 35, 40, 27, 25, 35, 255, 70, 40, false, "", true),
-      new PokemonForm("Modern Pattern", "modern", Type.BUG, null, 0.3, 2.5, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 200, 38, 35, 40, 27, 25, 35, 255, 70, 40, false, "", true),
-      new PokemonForm("Marine Pattern", "marine", Type.BUG, null, 0.3, 2.5, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 200, 38, 35, 40, 27, 25, 35, 255, 70, 40, false, "", true),
-      new PokemonForm("Archipelago Pattern", "archipelago", Type.BUG, null, 0.3, 2.5, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 200, 38, 35, 40, 27, 25, 35, 255, 70, 40, false, "", true),
-      new PokemonForm("High Plains Pattern", "high-plains", Type.BUG, null, 0.3, 2.5, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 200, 38, 35, 40, 27, 25, 35, 255, 70, 40, false, "", true),
-      new PokemonForm("Sandstorm Pattern", "sandstorm", Type.BUG, null, 0.3, 2.5, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 200, 38, 35, 40, 27, 25, 35, 255, 70, 40, false, "", true),
-      new PokemonForm("River Pattern", "river", Type.BUG, null, 0.3, 2.5, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 200, 38, 35, 40, 27, 25, 35, 255, 70, 40, false, "", true),
-      new PokemonForm("Monsoon Pattern", "monsoon", Type.BUG, null, 0.3, 2.5, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 200, 38, 35, 40, 27, 25, 35, 255, 70, 40, false, "", true),
-      new PokemonForm("Savanna Pattern", "savanna", Type.BUG, null, 0.3, 2.5, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 200, 38, 35, 40, 27, 25, 35, 255, 70, 40, false, "", true),
-      new PokemonForm("Sun Pattern", "sun", Type.BUG, null, 0.3, 2.5, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 200, 38, 35, 40, 27, 25, 35, 255, 70, 40, false, "", true),
-      new PokemonForm("Ocean Pattern", "ocean", Type.BUG, null, 0.3, 2.5, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 200, 38, 35, 40, 27, 25, 35, 255, 70, 40, false, "", true),
-      new PokemonForm("Jungle Pattern", "jungle", Type.BUG, null, 0.3, 2.5, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 200, 38, 35, 40, 27, 25, 35, 255, 70, 40, false, "", true),
-      new PokemonForm("Fancy Pattern", "fancy", Type.BUG, null, 0.3, 2.5, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 200, 38, 35, 40, 27, 25, 35, 255, 70, 40, false, "", true),
-      new PokemonForm("Poké Ball Pattern", "poke-ball", Type.BUG, null, 0.3, 2.5, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 200, 38, 35, 40, 27, 25, 35, 255, 70, 40, false, "", true),
-    ),
-    new PokemonSpecies(Species.SPEWPA, 6, false, false, false, "Scatterdust Pokémon", Type.BUG, null, 0.3, 8.4, Abilities.SHED_SKIN, Abilities.SHED_SKIN, Abilities.FRIEND_GUARD, 213, 45, 22, 60, 27, 30, 29, 120, 70, 75, GrowthRate.MEDIUM_FAST, 50, false, false,
-      new PokemonForm("Meadow Pattern", "meadow", Type.BUG, null, 0.3, 8.4, Abilities.SHED_SKIN, Abilities.NONE, Abilities.FRIEND_GUARD, 213, 45, 22, 60, 27, 30, 29, 120, 70, 75, false, "", true),
-      new PokemonForm("Icy Snow Pattern", "icy-snow", Type.BUG, null, 0.3, 8.4, Abilities.SHED_SKIN, Abilities.NONE, Abilities.FRIEND_GUARD, 213, 45, 22, 60, 27, 30, 29, 120, 70, 75, false, "", true),
-      new PokemonForm("Polar Pattern", "polar", Type.BUG, null, 0.3, 8.4, Abilities.SHED_SKIN, Abilities.NONE, Abilities.FRIEND_GUARD, 213, 45, 22, 60, 27, 30, 29, 120, 70, 75, false, "", true),
-      new PokemonForm("Tundra Pattern", "tundra", Type.BUG, null, 0.3, 8.4, Abilities.SHED_SKIN, Abilities.NONE, Abilities.FRIEND_GUARD, 213, 45, 22, 60, 27, 30, 29, 120, 70, 75, false, "", true),
-      new PokemonForm("Continental Pattern", "continental", Type.BUG, null, 0.3, 8.4, Abilities.SHED_SKIN, Abilities.NONE, Abilities.FRIEND_GUARD, 213, 45, 22, 60, 27, 30, 29, 120, 70, 75, false, "", true),
-      new PokemonForm("Garden Pattern", "garden", Type.BUG, null, 0.3, 8.4, Abilities.SHED_SKIN, Abilities.NONE, Abilities.FRIEND_GUARD, 213, 45, 22, 60, 27, 30, 29, 120, 70, 75, false, "", true),
-      new PokemonForm("Elegant Pattern", "elegant", Type.BUG, null, 0.3, 8.4, Abilities.SHED_SKIN, Abilities.NONE, Abilities.FRIEND_GUARD, 213, 45, 22, 60, 27, 30, 29, 120, 70, 75, false, "", true),
-      new PokemonForm("Modern Pattern", "modern", Type.BUG, null, 0.3, 8.4, Abilities.SHED_SKIN, Abilities.NONE, Abilities.FRIEND_GUARD, 213, 45, 22, 60, 27, 30, 29, 120, 70, 75, false, "", true),
-      new PokemonForm("Marine Pattern", "marine", Type.BUG, null, 0.3, 8.4, Abilities.SHED_SKIN, Abilities.NONE, Abilities.FRIEND_GUARD, 213, 45, 22, 60, 27, 30, 29, 120, 70, 75, false, "", true),
-      new PokemonForm("Archipelago Pattern", "archipelago", Type.BUG, null, 0.3, 8.4, Abilities.SHED_SKIN, Abilities.NONE, Abilities.FRIEND_GUARD, 213, 45, 22, 60, 27, 30, 29, 120, 70, 75, false, "", true),
-      new PokemonForm("High Plains Pattern", "high-plains", Type.BUG, null, 0.3, 8.4, Abilities.SHED_SKIN, Abilities.NONE, Abilities.FRIEND_GUARD, 213, 45, 22, 60, 27, 30, 29, 120, 70, 75, false, "", true),
-      new PokemonForm("Sandstorm Pattern", "sandstorm", Type.BUG, null, 0.3, 8.4, Abilities.SHED_SKIN, Abilities.NONE, Abilities.FRIEND_GUARD, 213, 45, 22, 60, 27, 30, 29, 120, 70, 75, false, "", true),
-      new PokemonForm("River Pattern", "river", Type.BUG, null, 0.3, 8.4, Abilities.SHED_SKIN, Abilities.NONE, Abilities.FRIEND_GUARD, 213, 45, 22, 60, 27, 30, 29, 120, 70, 75, false, "", true),
-      new PokemonForm("Monsoon Pattern", "monsoon", Type.BUG, null, 0.3, 8.4, Abilities.SHED_SKIN, Abilities.NONE, Abilities.FRIEND_GUARD, 213, 45, 22, 60, 27, 30, 29, 120, 70, 75, false, "", true),
-      new PokemonForm("Savanna Pattern", "savanna", Type.BUG, null, 0.3, 8.4, Abilities.SHED_SKIN, Abilities.NONE, Abilities.FRIEND_GUARD, 213, 45, 22, 60, 27, 30, 29, 120, 70, 75, false, "", true),
-      new PokemonForm("Sun Pattern", "sun", Type.BUG, null, 0.3, 8.4, Abilities.SHED_SKIN, Abilities.NONE, Abilities.FRIEND_GUARD, 213, 45, 22, 60, 27, 30, 29, 120, 70, 75, false, "", true),
-      new PokemonForm("Ocean Pattern", "ocean", Type.BUG, null, 0.3, 8.4, Abilities.SHED_SKIN, Abilities.NONE, Abilities.FRIEND_GUARD, 213, 45, 22, 60, 27, 30, 29, 120, 70, 75, false, "", true),
-      new PokemonForm("Jungle Pattern", "jungle", Type.BUG, null, 0.3, 8.4, Abilities.SHED_SKIN, Abilities.NONE, Abilities.FRIEND_GUARD, 213, 45, 22, 60, 27, 30, 29, 120, 70, 75, false, "", true),
-      new PokemonForm("Fancy Pattern", "fancy", Type.BUG, null, 0.3, 8.4, Abilities.SHED_SKIN, Abilities.NONE, Abilities.FRIEND_GUARD, 213, 45, 22, 60, 27, 30, 29, 120, 70, 75, false, "", true),
-      new PokemonForm("Poké Ball Pattern", "poke-ball", Type.BUG, null, 0.3, 8.4, Abilities.SHED_SKIN, Abilities.NONE, Abilities.FRIEND_GUARD, 213, 45, 22, 60, 27, 30, 29, 120, 70, 75, false, "", true),
-    ),
-    new PokemonSpecies(Species.VIVILLON, 6, false, false, false, "Scale Pokémon", Type.BUG, Type.FLYING, 1.2, 17, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 411, 80, 52, 50, 90, 50, 89, 45, 70, 206, GrowthRate.MEDIUM_FAST, 50, false, false,
-      new PokemonForm("Meadow Pattern", "meadow", Type.BUG, Type.FLYING, 1.2, 17, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 411, 80, 52, 50, 90, 50, 89, 45, 70, 206, false, null, true),
-      new PokemonForm("Icy Snow Pattern", "icy-snow", Type.BUG, Type.FLYING, 1.2, 17, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 411, 80, 52, 50, 90, 50, 89, 45, 70, 206, false, null, true),
-      new PokemonForm("Polar Pattern", "polar", Type.BUG, Type.FLYING, 1.2, 17, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 411, 80, 52, 50, 90, 50, 89, 45, 70, 206, false, null, true),
-      new PokemonForm("Tundra Pattern", "tundra", Type.BUG, Type.FLYING, 1.2, 17, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 411, 80, 52, 50, 90, 50, 89, 45, 70, 206, false, null, true),
-      new PokemonForm("Continental Pattern", "continental", Type.BUG, Type.FLYING, 1.2, 17, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 411, 80, 52, 50, 90, 50, 89, 45, 70, 206, false, null, true),
-      new PokemonForm("Garden Pattern", "garden", Type.BUG, Type.FLYING, 1.2, 17, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 411, 80, 52, 50, 90, 50, 89, 45, 70, 206, false, null, true),
-      new PokemonForm("Elegant Pattern", "elegant", Type.BUG, Type.FLYING, 1.2, 17, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 411, 80, 52, 50, 90, 50, 89, 45, 70, 206, false, null, true),
-      new PokemonForm("Modern Pattern", "modern", Type.BUG, Type.FLYING, 1.2, 17, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 411, 80, 52, 50, 90, 50, 89, 45, 70, 206, false, null, true),
-      new PokemonForm("Marine Pattern", "marine", Type.BUG, Type.FLYING, 1.2, 17, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 411, 80, 52, 50, 90, 50, 89, 45, 70, 206, false, null, true),
-      new PokemonForm("Archipelago Pattern", "archipelago", Type.BUG, Type.FLYING, 1.2, 17, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 411, 80, 52, 50, 90, 50, 89, 45, 70, 206, false, null, true),
-      new PokemonForm("High Plains Pattern", "high-plains", Type.BUG, Type.FLYING, 1.2, 17, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 411, 80, 52, 50, 90, 50, 89, 45, 70, 206, false, null, true),
-      new PokemonForm("Sandstorm Pattern", "sandstorm", Type.BUG, Type.FLYING, 1.2, 17, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 411, 80, 52, 50, 90, 50, 89, 45, 70, 206, false, null, true),
-      new PokemonForm("River Pattern", "river", Type.BUG, Type.FLYING, 1.2, 17, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 411, 80, 52, 50, 90, 50, 89, 45, 70, 206, false, null, true),
-      new PokemonForm("Monsoon Pattern", "monsoon", Type.BUG, Type.FLYING, 1.2, 17, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 411, 80, 52, 50, 90, 50, 89, 45, 70, 206, false, null, true),
-      new PokemonForm("Savanna Pattern", "savanna", Type.BUG, Type.FLYING, 1.2, 17, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 411, 80, 52, 50, 90, 50, 89, 45, 70, 206, false, null, true),
-      new PokemonForm("Sun Pattern", "sun", Type.BUG, Type.FLYING, 1.2, 17, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 411, 80, 52, 50, 90, 50, 89, 45, 70, 206, false, null, true),
-      new PokemonForm("Ocean Pattern", "ocean", Type.BUG, Type.FLYING, 1.2, 17, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 411, 80, 52, 50, 90, 50, 89, 45, 70, 206, false, null, true),
-      new PokemonForm("Jungle Pattern", "jungle", Type.BUG, Type.FLYING, 1.2, 17, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 411, 80, 52, 50, 90, 50, 89, 45, 70, 206, false, null, true),
-      new PokemonForm("Fancy Pattern", "fancy", Type.BUG, Type.FLYING, 1.2, 17, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 411, 80, 52, 50, 90, 50, 89, 45, 70, 206, false, null, true),
-      new PokemonForm("Poké Ball Pattern", "poke-ball", Type.BUG, Type.FLYING, 1.2, 17, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 411, 80, 52, 50, 90, 50, 89, 45, 70, 206, false, null, true),
-    ),
-    new PokemonSpecies(Species.LITLEO, 6, false, false, false, "Lion Cub Pokémon", Type.FIRE, Type.NORMAL, 0.6, 13.5, Abilities.RIVALRY, Abilities.UNNERVE, Abilities.MOXIE, 369, 62, 50, 58, 73, 54, 72, 220, 70, 74, GrowthRate.MEDIUM_SLOW, 12.5, false),
-    new PokemonSpecies(Species.PYROAR, 6, false, false, false, "Royal Pokémon", Type.FIRE, Type.NORMAL, 1.5, 81.5, Abilities.RIVALRY, Abilities.UNNERVE, Abilities.MOXIE, 507, 86, 68, 72, 109, 66, 106, 65, 70, 177, GrowthRate.MEDIUM_SLOW, 12.5, true),
-    new PokemonSpecies(Species.FLABEBE, 6, false, false, false, "Single Bloom Pokémon", Type.FAIRY, null, 0.1, 0.1, Abilities.FLOWER_VEIL, Abilities.NONE, Abilities.SYMBIOSIS, 303, 44, 38, 39, 61, 79, 42, 225, 70, 61, GrowthRate.MEDIUM_FAST, 0, false, false,
-      new PokemonForm("Red Flower", "red", Type.FAIRY, null, 0.1, 0.1, Abilities.FLOWER_VEIL, Abilities.NONE, Abilities.SYMBIOSIS, 303, 44, 38, 39, 61, 79, 42, 225, 70, 61, false, null, true),
-      new PokemonForm("Yellow Flower", "yellow", Type.FAIRY, null, 0.1, 0.1, Abilities.FLOWER_VEIL, Abilities.NONE, Abilities.SYMBIOSIS, 303, 44, 38, 39, 61, 79, 42, 225, 70, 61, false, null, true),
-      new PokemonForm("Orange Flower", "orange", Type.FAIRY, null, 0.1, 0.1, Abilities.FLOWER_VEIL, Abilities.NONE, Abilities.SYMBIOSIS, 303, 44, 38, 39, 61, 79, 42, 225, 70, 61, false, null, true),
-      new PokemonForm("Blue Flower", "blue", Type.FAIRY, null, 0.1, 0.1, Abilities.FLOWER_VEIL, Abilities.NONE, Abilities.SYMBIOSIS, 303, 44, 38, 39, 61, 79, 42, 225, 70, 61, false, null, true),
-      new PokemonForm("White Flower", "white", Type.FAIRY, null, 0.1, 0.1, Abilities.FLOWER_VEIL, Abilities.NONE, Abilities.SYMBIOSIS, 303, 44, 38, 39, 61, 79, 42, 225, 70, 61, false, null, true),
-    ),
-    new PokemonSpecies(Species.FLOETTE, 6, false, false, false, "Single Bloom Pokémon", Type.FAIRY, null, 0.2, 0.9, Abilities.FLOWER_VEIL, Abilities.NONE, Abilities.SYMBIOSIS, 371, 54, 45, 47, 75, 98, 52, 120, 70, 130, GrowthRate.MEDIUM_FAST, 0, false, false,
-      new PokemonForm("Red Flower", "red", Type.FAIRY, null, 0.2, 0.9, Abilities.FLOWER_VEIL, Abilities.NONE, Abilities.SYMBIOSIS, 371, 54, 45, 47, 75, 98, 52, 120, 70, 130, false, null, true),
-      new PokemonForm("Yellow Flower", "yellow", Type.FAIRY, null, 0.2, 0.9, Abilities.FLOWER_VEIL, Abilities.NONE, Abilities.SYMBIOSIS, 371, 54, 45, 47, 75, 98, 52, 120, 70, 130, false, null, true),
-      new PokemonForm("Orange Flower", "orange", Type.FAIRY, null, 0.2, 0.9, Abilities.FLOWER_VEIL, Abilities.NONE, Abilities.SYMBIOSIS, 371, 54, 45, 47, 75, 98, 52, 120, 70, 130, false, null, true),
-      new PokemonForm("Blue Flower", "blue", Type.FAIRY, null, 0.2, 0.9, Abilities.FLOWER_VEIL, Abilities.NONE, Abilities.SYMBIOSIS, 371, 54, 45, 47, 75, 98, 52, 120, 70, 130, false, null, true),
-      new PokemonForm("White Flower", "white", Type.FAIRY, null, 0.2, 0.9, Abilities.FLOWER_VEIL, Abilities.NONE, Abilities.SYMBIOSIS, 371, 54, 45, 47, 75, 98, 52, 120, 70, 130, false, null, true),
-    ),
-    new PokemonSpecies(Species.FLORGES, 6, false, false, false, "Garden Pokémon", Type.FAIRY, null, 1.1, 10, Abilities.FLOWER_VEIL, Abilities.NONE, Abilities.SYMBIOSIS, 552, 78, 65, 68, 112, 154, 75, 45, 70, 276, GrowthRate.MEDIUM_FAST, 0, false, false,
-      new PokemonForm("Red Flower", "red", Type.FAIRY, null, 1.1, 10, Abilities.FLOWER_VEIL, Abilities.NONE, Abilities.SYMBIOSIS, 552, 78, 65, 68, 112, 154, 75, 45, 70, 276, false, null, true),
-      new PokemonForm("Yellow Flower", "yellow", Type.FAIRY, null, 1.1, 10, Abilities.FLOWER_VEIL, Abilities.NONE, Abilities.SYMBIOSIS, 552, 78, 65, 68, 112, 154, 75, 45, 70, 276, false, null, true),
-      new PokemonForm("Orange Flower", "orange", Type.FAIRY, null, 1.1, 10, Abilities.FLOWER_VEIL, Abilities.NONE, Abilities.SYMBIOSIS, 552, 78, 65, 68, 112, 154, 75, 45, 70, 276, false, null, true),
-      new PokemonForm("Blue Flower", "blue", Type.FAIRY, null, 1.1, 10, Abilities.FLOWER_VEIL, Abilities.NONE, Abilities.SYMBIOSIS, 552, 78, 65, 68, 112, 154, 75, 45, 70, 276, false, null, true),
-      new PokemonForm("White Flower", "white", Type.FAIRY, null, 1.1, 10, Abilities.FLOWER_VEIL, Abilities.NONE, Abilities.SYMBIOSIS, 552, 78, 65, 68, 112, 154, 75, 45, 70, 276, false, null, true),
-    ),
-    new PokemonSpecies(Species.SKIDDO, 6, false, false, false, "Mount Pokémon", Type.GRASS, null, 0.9, 31, Abilities.SAP_SIPPER, Abilities.NONE, Abilities.GRASS_PELT, 350, 66, 65, 48, 62, 57, 52, 200, 70, 70, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.GOGOAT, 6, false, false, false, "Mount Pokémon", Type.GRASS, null, 1.7, 91, Abilities.SAP_SIPPER, Abilities.NONE, Abilities.GRASS_PELT, 531, 123, 100, 62, 97, 81, 68, 45, 70, 186, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.PANCHAM, 6, false, false, false, "Playful Pokémon", Type.FIGHTING, null, 0.6, 8, Abilities.IRON_FIST, Abilities.MOLD_BREAKER, Abilities.SCRAPPY, 348, 67, 82, 62, 46, 48, 43, 220, 50, 70, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.PANGORO, 6, false, false, false, "Daunting Pokémon", Type.FIGHTING, Type.DARK, 2.1, 136, Abilities.IRON_FIST, Abilities.MOLD_BREAKER, Abilities.SCRAPPY, 495, 95, 124, 78, 69, 71, 58, 65, 50, 173, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.FURFROU, 6, false, false, false, "Poodle Pokémon", Type.NORMAL, null, 1.2, 28, Abilities.FUR_COAT, Abilities.NONE, Abilities.NONE, 472, 75, 80, 60, 65, 90, 102, 160, 70, 165, GrowthRate.MEDIUM_FAST, 50, false, true,
-      new PokemonForm("Natural Form", "", Type.NORMAL, null, 1.2, 28, Abilities.FUR_COAT, Abilities.NONE, Abilities.NONE, 472, 75, 80, 60, 65, 90, 102, 160, 70, 165, false, null, true),
-      new PokemonForm("Heart Trim", "heart", Type.NORMAL, null, 1.2, 28, Abilities.FUR_COAT, Abilities.NONE, Abilities.NONE, 472, 75, 80, 60, 65, 90, 102, 160, 70, 165, false, null, true),
-      new PokemonForm("Star Trim", "star", Type.NORMAL, null, 1.2, 28, Abilities.FUR_COAT, Abilities.NONE, Abilities.NONE, 472, 75, 80, 60, 65, 90, 102, 160, 70, 165, false, null, true),
-      new PokemonForm("Diamond Trim", "diamond", Type.NORMAL, null, 1.2, 28, Abilities.FUR_COAT, Abilities.NONE, Abilities.NONE, 472, 75, 80, 60, 65, 90, 102, 160, 70, 165, false, null, true),
-      new PokemonForm("Debutante Trim", "debutante", Type.NORMAL, null, 1.2, 28, Abilities.FUR_COAT, Abilities.NONE, Abilities.NONE, 472, 75, 80, 60, 65, 90, 102, 160, 70, 165, false, null, true),
-      new PokemonForm("Matron Trim", "matron", Type.NORMAL, null, 1.2, 28, Abilities.FUR_COAT, Abilities.NONE, Abilities.NONE, 472, 75, 80, 60, 65, 90, 102, 160, 70, 165, false, null, true),
-      new PokemonForm("Dandy Trim", "dandy", Type.NORMAL, null, 1.2, 28, Abilities.FUR_COAT, Abilities.NONE, Abilities.NONE, 472, 75, 80, 60, 65, 90, 102, 160, 70, 165, false, null, true),
-      new PokemonForm("La Reine Trim", "la-reine", Type.NORMAL, null, 1.2, 28, Abilities.FUR_COAT, Abilities.NONE, Abilities.NONE, 472, 75, 80, 60, 65, 90, 102, 160, 70, 165, false, null, true),
-      new PokemonForm("Kabuki Trim", "kabuki", Type.NORMAL, null, 1.2, 28, Abilities.FUR_COAT, Abilities.NONE, Abilities.NONE, 472, 75, 80, 60, 65, 90, 102, 160, 70, 165, false, null, true),
-      new PokemonForm("Pharaoh Trim", "pharaoh", Type.NORMAL, null, 1.2, 28, Abilities.FUR_COAT, Abilities.NONE, Abilities.NONE, 472, 75, 80, 60, 65, 90, 102, 160, 70, 165, false, null, true),
-    ),
-    new PokemonSpecies(Species.ESPURR, 6, false, false, false, "Restraint Pokémon", Type.PSYCHIC, null, 0.3, 3.5, Abilities.KEEN_EYE, Abilities.INFILTRATOR, Abilities.OWN_TEMPO, 355, 62, 48, 54, 63, 60, 68, 190, 50, 71, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.MEOWSTIC, 6, false, false, false, "Constraint Pokémon", Type.PSYCHIC, null, 0.6, 8.5, Abilities.KEEN_EYE, Abilities.INFILTRATOR, Abilities.PRANKSTER, 466, 74, 48, 76, 83, 81, 104, 75, 50, 163, GrowthRate.MEDIUM_FAST, 50, false, false,
-      new PokemonForm("Male", "male", Type.PSYCHIC, null, 0.6, 8.5, Abilities.KEEN_EYE, Abilities.INFILTRATOR, Abilities.PRANKSTER, 466, 74, 48, 76, 83, 81, 104, 75, 50, 163, false, "", true),
-      new PokemonForm("Female", "female", Type.PSYCHIC, null, 0.6, 8.5, Abilities.KEEN_EYE, Abilities.INFILTRATOR, Abilities.COMPETITIVE, 466, 74, 48, 76, 83, 81, 104, 75, 50, 163, false, null, true),
-    ),
-    new PokemonSpecies(Species.HONEDGE, 6, false, false, false, "Sword Pokémon", Type.STEEL, Type.GHOST, 0.8, 2, Abilities.NO_GUARD, Abilities.NONE, Abilities.NONE, 325, 45, 80, 100, 35, 37, 28, 180, 50, 65, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.DOUBLADE, 6, false, false, false, "Sword Pokémon", Type.STEEL, Type.GHOST, 0.8, 4.5, Abilities.NO_GUARD, Abilities.NONE, Abilities.NONE, 448, 59, 110, 150, 45, 49, 35, 90, 50, 157, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.AEGISLASH, 6, false, false, false, "Royal Sword Pokémon", Type.STEEL, Type.GHOST, 1.7, 53, Abilities.STANCE_CHANGE, Abilities.NONE, Abilities.NONE, 500, 60, 50, 140, 50, 140, 60, 45, 50, 250, GrowthRate.MEDIUM_FAST, 50, false, true,
-      new PokemonForm("Shield Forme", "shield", Type.STEEL, Type.GHOST, 1.7, 53, Abilities.STANCE_CHANGE, Abilities.NONE, Abilities.NONE, 500, 60, 50, 140, 50, 140, 60, 45, 50, 250, false, "", true),
-      new PokemonForm("Blade Forme", "blade", Type.STEEL, Type.GHOST, 1.7, 53, Abilities.STANCE_CHANGE, Abilities.NONE, Abilities.NONE, 500, 60, 140, 50, 140, 50, 60, 45, 50, 250),
-    ),
-    new PokemonSpecies(Species.SPRITZEE, 6, false, false, false, "Perfume Pokémon", Type.FAIRY, null, 0.2, 0.5, Abilities.HEALER, Abilities.NONE, Abilities.AROMA_VEIL, 341, 78, 52, 60, 63, 65, 23, 200, 50, 68, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.AROMATISSE, 6, false, false, false, "Fragrance Pokémon", Type.FAIRY, null, 0.8, 15.5, Abilities.HEALER, Abilities.NONE, Abilities.AROMA_VEIL, 462, 101, 72, 72, 99, 89, 29, 140, 50, 162, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.SWIRLIX, 6, false, false, false, "Cotton Candy Pokémon", Type.FAIRY, null, 0.4, 3.5, Abilities.SWEET_VEIL, Abilities.NONE, Abilities.UNBURDEN, 341, 62, 48, 66, 59, 57, 49, 200, 50, 68, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.SLURPUFF, 6, false, false, false, "Meringue Pokémon", Type.FAIRY, null, 0.8, 5, Abilities.SWEET_VEIL, Abilities.NONE, Abilities.UNBURDEN, 480, 82, 80, 86, 85, 75, 72, 140, 50, 168, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.INKAY, 6, false, false, false, "Revolving Pokémon", Type.DARK, Type.PSYCHIC, 0.4, 3.5, Abilities.CONTRARY, Abilities.SUCTION_CUPS, Abilities.INFILTRATOR, 288, 53, 54, 53, 37, 46, 45, 190, 50, 58, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.MALAMAR, 6, false, false, false, "Overturning Pokémon", Type.DARK, Type.PSYCHIC, 1.5, 47, Abilities.CONTRARY, Abilities.SUCTION_CUPS, Abilities.INFILTRATOR, 482, 86, 92, 88, 68, 75, 73, 80, 50, 169, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.BINACLE, 6, false, false, false, "Two-Handed Pokémon", Type.ROCK, Type.WATER, 0.5, 31, Abilities.TOUGH_CLAWS, Abilities.SNIPER, Abilities.PICKPOCKET, 306, 42, 52, 67, 39, 56, 50, 120, 50, 61, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.BARBARACLE, 6, false, false, false, "Collective Pokémon", Type.ROCK, Type.WATER, 1.3, 96, Abilities.TOUGH_CLAWS, Abilities.SNIPER, Abilities.PICKPOCKET, 500, 72, 105, 115, 54, 86, 68, 45, 50, 175, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.SKRELP, 6, false, false, false, "Mock Kelp Pokémon", Type.POISON, Type.WATER, 0.5, 7.3, Abilities.POISON_POINT, Abilities.POISON_TOUCH, Abilities.ADAPTABILITY, 320, 50, 60, 60, 60, 60, 30, 225, 50, 64, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.DRAGALGE, 6, false, false, false, "Mock Kelp Pokémon", Type.POISON, Type.DRAGON, 1.8, 81.5, Abilities.POISON_POINT, Abilities.POISON_TOUCH, Abilities.ADAPTABILITY, 494, 65, 75, 90, 97, 123, 44, 55, 50, 173, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.CLAUNCHER, 6, false, false, false, "Water Gun Pokémon", Type.WATER, null, 0.5, 8.3, Abilities.MEGA_LAUNCHER, Abilities.NONE, Abilities.NONE, 330, 50, 53, 62, 58, 63, 44, 225, 50, 66, GrowthRate.SLOW, 50, false),
-    new PokemonSpecies(Species.CLAWITZER, 6, false, false, false, "Howitzer Pokémon", Type.WATER, null, 1.3, 35.3, Abilities.MEGA_LAUNCHER, Abilities.NONE, Abilities.NONE, 500, 71, 73, 88, 120, 89, 59, 55, 50, 100, GrowthRate.SLOW, 50, false),
-    new PokemonSpecies(Species.HELIOPTILE, 6, false, false, false, "Generator Pokémon", Type.ELECTRIC, Type.NORMAL, 0.5, 6, Abilities.DRY_SKIN, Abilities.SAND_VEIL, Abilities.SOLAR_POWER, 289, 44, 38, 33, 61, 43, 70, 190, 50, 58, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.HELIOLISK, 6, false, false, false, "Generator Pokémon", Type.ELECTRIC, Type.NORMAL, 1, 21, Abilities.DRY_SKIN, Abilities.SAND_VEIL, Abilities.SOLAR_POWER, 481, 62, 55, 52, 109, 94, 109, 75, 50, 168, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.TYRUNT, 6, false, false, false, "Royal Heir Pokémon", Type.ROCK, Type.DRAGON, 0.8, 26, Abilities.STRONG_JAW, Abilities.NONE, Abilities.STURDY, 362, 58, 89, 77, 45, 45, 48, 45, 50, 72, GrowthRate.MEDIUM_FAST, 87.5, false),
-    new PokemonSpecies(Species.TYRANTRUM, 6, false, false, false, "Despot Pokémon", Type.ROCK, Type.DRAGON, 2.5, 270, Abilities.STRONG_JAW, Abilities.NONE, Abilities.ROCK_HEAD, 521, 82, 121, 119, 69, 59, 71, 45, 50, 182, GrowthRate.MEDIUM_FAST, 87.5, false),
-    new PokemonSpecies(Species.AMAURA, 6, false, false, false, "Tundra Pokémon", Type.ROCK, Type.ICE, 1.3, 25.2, Abilities.REFRIGERATE, Abilities.NONE, Abilities.SNOW_WARNING, 362, 77, 59, 50, 67, 63, 46, 45, 50, 72, GrowthRate.MEDIUM_FAST, 87.5, false),
-    new PokemonSpecies(Species.AURORUS, 6, false, false, false, "Tundra Pokémon", Type.ROCK, Type.ICE, 2.7, 225, Abilities.REFRIGERATE, Abilities.NONE, Abilities.SNOW_WARNING, 521, 123, 77, 72, 99, 92, 58, 45, 50, 104, GrowthRate.MEDIUM_FAST, 87.5, false),
-    new PokemonSpecies(Species.SYLVEON, 6, false, false, false, "Intertwining Pokémon", Type.FAIRY, null, 1, 23.5, Abilities.CUTE_CHARM, Abilities.NONE, Abilities.PIXILATE, 525, 95, 65, 65, 110, 130, 60, 45, 50, 184, GrowthRate.MEDIUM_FAST, 87.5, false),
-    new PokemonSpecies(Species.HAWLUCHA, 6, false, false, false, "Wrestling Pokémon", Type.FIGHTING, Type.FLYING, 0.8, 21.5, Abilities.LIMBER, Abilities.UNBURDEN, Abilities.MOLD_BREAKER, 500, 78, 92, 75, 74, 63, 118, 100, 50, 175, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.DEDENNE, 6, false, false, false, "Antenna Pokémon", Type.ELECTRIC, Type.FAIRY, 0.2, 2.2, Abilities.CHEEK_POUCH, Abilities.PICKUP, Abilities.PLUS, 431, 67, 58, 57, 81, 67, 101, 180, 50, 151, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.CARBINK, 6, false, false, false, "Jewel Pokémon", Type.ROCK, Type.FAIRY, 0.3, 5.7, Abilities.CLEAR_BODY, Abilities.NONE, Abilities.STURDY, 500, 50, 50, 150, 50, 150, 50, 60, 50, 100, GrowthRate.SLOW, null, false),
-    new PokemonSpecies(Species.GOOMY, 6, false, false, false, "Soft Tissue Pokémon", Type.DRAGON, null, 0.3, 2.8, Abilities.SAP_SIPPER, Abilities.HYDRATION, Abilities.GOOEY, 300, 45, 50, 35, 55, 75, 40, 45, 35, 60, GrowthRate.SLOW, 50, false),
-    new PokemonSpecies(Species.SLIGGOO, 6, false, false, false, "Soft Tissue Pokémon", Type.DRAGON, null, 0.8, 17.5, Abilities.SAP_SIPPER, Abilities.HYDRATION, Abilities.GOOEY, 452, 68, 75, 53, 83, 113, 60, 45, 35, 158, GrowthRate.SLOW, 50, false),
-    new PokemonSpecies(Species.GOODRA, 6, false, false, false, "Dragon Pokémon", Type.DRAGON, null, 2, 150.5, Abilities.SAP_SIPPER, Abilities.HYDRATION, Abilities.GOOEY, 600, 90, 100, 70, 110, 150, 80, 45, 35, 300, GrowthRate.SLOW, 50, false),
-    new PokemonSpecies(Species.KLEFKI, 6, false, false, false, "Key Ring Pokémon", Type.STEEL, Type.FAIRY, 0.2, 3, Abilities.PRANKSTER, Abilities.NONE, Abilities.MAGICIAN, 470, 57, 80, 91, 80, 87, 75, 75, 50, 165, GrowthRate.FAST, 50, false),
-    new PokemonSpecies(Species.PHANTUMP, 6, false, false, false, "Stump Pokémon", Type.GHOST, Type.GRASS, 0.4, 7, Abilities.NATURAL_CURE, Abilities.FRISK, Abilities.HARVEST, 309, 43, 70, 48, 50, 60, 38, 120, 50, 62, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.TREVENANT, 6, false, false, false, "Elder Tree Pokémon", Type.GHOST, Type.GRASS, 1.5, 71, Abilities.NATURAL_CURE, Abilities.FRISK, Abilities.HARVEST, 474, 85, 110, 76, 65, 82, 56, 60, 50, 166, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.PUMPKABOO, 6, false, false, false, "Pumpkin Pokémon", Type.GHOST, Type.GRASS, 0.4, 5, Abilities.PICKUP, Abilities.FRISK, Abilities.INSOMNIA, 335, 49, 66, 70, 44, 55, 51, 120, 50, 67, GrowthRate.MEDIUM_FAST, 50, false, false,
-      new PokemonForm("Average Size", "", Type.GHOST, Type.GRASS, 0.4, 5, Abilities.PICKUP, Abilities.FRISK, Abilities.INSOMNIA, 335, 49, 66, 70, 44, 55, 51, 120, 50, 67, false, null, true),
-      new PokemonForm("Small Size", "small", Type.GHOST, Type.GRASS, 0.3, 3.5, Abilities.PICKUP, Abilities.FRISK, Abilities.INSOMNIA, 335, 44, 66, 70, 44, 55, 56, 120, 50, 67, false, "", true),
-      new PokemonForm("Large Size", "large", Type.GHOST, Type.GRASS, 0.5, 7.5, Abilities.PICKUP, Abilities.FRISK, Abilities.INSOMNIA, 335, 54, 66, 70, 44, 55, 46, 120, 50, 67, false, "", true),
-      new PokemonForm("Super Size", "super", Type.GHOST, Type.GRASS, 0.8, 15, Abilities.PICKUP, Abilities.FRISK, Abilities.INSOMNIA, 335, 59, 66, 70, 44, 55, 41, 120, 50, 67, false, "", true),
-    ),
-    new PokemonSpecies(Species.GOURGEIST, 6, false, false, false, "Pumpkin Pokémon", Type.GHOST, Type.GRASS, 0.9, 12.5, Abilities.PICKUP, Abilities.FRISK, Abilities.INSOMNIA, 494, 65, 90, 122, 58, 75, 84, 60, 50, 173, GrowthRate.MEDIUM_FAST, 50, false, false,
-      new PokemonForm("Average Size", "", Type.GHOST, Type.GRASS, 0.9, 12.5, Abilities.PICKUP, Abilities.FRISK, Abilities.INSOMNIA, 494, 65, 90, 122, 58, 75, 84, 60, 50, 173, false, null, true),
-      new PokemonForm("Small Size", "small", Type.GHOST, Type.GRASS, 0.7, 9.5, Abilities.PICKUP, Abilities.FRISK, Abilities.INSOMNIA, 494, 55, 85, 122, 58, 75, 99, 60, 50, 173, false, "", true),
-      new PokemonForm("Large Size", "large", Type.GHOST, Type.GRASS, 1.1, 14, Abilities.PICKUP, Abilities.FRISK, Abilities.INSOMNIA, 494, 75, 95, 122, 58, 75, 69, 60, 50, 173, false, "", true),
-      new PokemonForm("Super Size", "super", Type.GHOST, Type.GRASS, 1.7, 39, Abilities.PICKUP, Abilities.FRISK, Abilities.INSOMNIA, 494, 85, 100, 122, 58, 75, 54, 60, 50, 173, false, "", true),
-    ),
-    new PokemonSpecies(Species.BERGMITE, 6, false, false, false, "Ice Chunk Pokémon", Type.ICE, null, 1, 99.5, Abilities.OWN_TEMPO, Abilities.ICE_BODY, Abilities.STURDY, 304, 55, 69, 85, 32, 35, 28, 190, 50, 61, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.AVALUGG, 6, false, false, false, "Iceberg Pokémon", Type.ICE, null, 2, 505, Abilities.OWN_TEMPO, Abilities.ICE_BODY, Abilities.STURDY, 514, 95, 117, 184, 44, 46, 28, 55, 50, 180, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.NOIBAT, 6, false, false, false, "Sound Wave Pokémon", Type.FLYING, Type.DRAGON, 0.5, 8, Abilities.FRISK, Abilities.INFILTRATOR, Abilities.TELEPATHY, 245, 40, 30, 35, 45, 40, 55, 190, 50, 49, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.NOIVERN, 6, false, false, false, "Sound Wave Pokémon", Type.FLYING, Type.DRAGON, 1.5, 85, Abilities.FRISK, Abilities.INFILTRATOR, Abilities.TELEPATHY, 535, 85, 70, 80, 97, 80, 123, 45, 50, 187, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.XERNEAS, 6, false, true, false, "Life Pokémon", Type.FAIRY, null, 3, 215, Abilities.FAIRY_AURA, Abilities.NONE, Abilities.NONE, 680, 126, 131, 95, 131, 98, 99, 45, 0, 340, GrowthRate.SLOW, null, false, true,
-      new PokemonForm("Neutral Mode", "neutral", Type.FAIRY, null, 3, 215, Abilities.FAIRY_AURA, Abilities.NONE, Abilities.NONE, 680, 126, 131, 95, 131, 98, 99, 45, 0, 340, false, null, true),
-      new PokemonForm("Active Mode", "active", Type.FAIRY, null, 3, 215, Abilities.FAIRY_AURA, Abilities.NONE, Abilities.NONE, 680, 126, 131, 95, 131, 98, 99, 45, 0, 340)
-    ),
-    new PokemonSpecies(Species.YVELTAL, 6, false, true, false, "Destruction Pokémon", Type.DARK, Type.FLYING, 5.8, 203, Abilities.DARK_AURA, Abilities.NONE, Abilities.NONE, 680, 126, 131, 95, 131, 98, 99, 45, 0, 340, GrowthRate.SLOW, null, false),
-    new PokemonSpecies(Species.ZYGARDE, 6, false, true, false, "Order Pokémon", Type.DRAGON, Type.GROUND, 5, 305, Abilities.AURA_BREAK, Abilities.NONE, Abilities.NONE, 600, 108, 100, 121, 81, 95, 95, 3, 0, 300, GrowthRate.SLOW, null, false, false,
-      new PokemonForm("50% Forme", "50", Type.DRAGON, Type.GROUND, 5, 305, Abilities.AURA_BREAK, Abilities.NONE, Abilities.NONE, 600, 108, 100, 121, 81, 95, 95, 3, 0, 300, false, "", true),
-      new PokemonForm("10% Forme", "10", Type.DRAGON, Type.GROUND, 1.2, 33.5, Abilities.AURA_BREAK, Abilities.NONE, Abilities.NONE, 486, 54, 100, 71, 61, 85, 115, 3, 0, 243, false, null, true),
-      new PokemonForm("50% Forme Power Construct", "50-pc", Type.DRAGON, Type.GROUND, 5, 305, Abilities.POWER_CONSTRUCT, Abilities.NONE, Abilities.NONE, 600, 108, 100, 121, 81, 95, 95, 3, 0, 300, false, "", true),
-      new PokemonForm("10% Forme Power Construct", "10-pc", Type.DRAGON, Type.GROUND, 1.2, 33.5, Abilities.POWER_CONSTRUCT, Abilities.NONE, Abilities.NONE, 486, 54, 100, 71, 61, 85, 115, 3, 0, 243, false, "10", true),
-      new PokemonForm("Complete Forme (50% PC)", "complete", Type.DRAGON, Type.GROUND, 4.5, 610, Abilities.POWER_CONSTRUCT, Abilities.NONE, Abilities.NONE, 708, 216, 100, 121, 91, 95, 85, 3, 0, 354),
-      new PokemonForm("Complete Forme (10% PC)", "10-complete", Type.DRAGON, Type.GROUND, 4.5, 610, Abilities.POWER_CONSTRUCT, Abilities.NONE, Abilities.NONE, 708, 216, 100, 121, 91, 95, 85, 3, 0, 354, false, "complete"),
-    ),
-    new PokemonSpecies(Species.DIANCIE, 6, false, false, true, "Jewel Pokémon", Type.ROCK, Type.FAIRY, 0.7, 8.8, Abilities.CLEAR_BODY, Abilities.NONE, Abilities.NONE, 600, 50, 100, 150, 100, 150, 50, 3, 50, 300, GrowthRate.SLOW, null, false, true,
-      new PokemonForm("Normal", "", Type.ROCK, Type.FAIRY, 0.7, 8.8, Abilities.CLEAR_BODY, Abilities.NONE, Abilities.NONE, 600, 50, 100, 150, 100, 150, 50, 3, 50, 300, false, null, true),
-      new PokemonForm("Mega", SpeciesFormKey.MEGA, Type.ROCK, Type.FAIRY, 1.1, 27.8, Abilities.MAGIC_BOUNCE, Abilities.NONE, Abilities.NONE, 700, 50, 160, 110, 160, 110, 110, 3, 50, 300),
-    ),
-    new PokemonSpecies(Species.HOOPA, 6, false, false, true, "Mischief Pokémon", Type.PSYCHIC, Type.GHOST, 0.5, 9, Abilities.MAGICIAN, Abilities.NONE, Abilities.NONE, 600, 80, 110, 60, 150, 130, 70, 3, 100, 300, GrowthRate.SLOW, null, false, false,
-      new PokemonForm("Hoopa Confined", "", Type.PSYCHIC, Type.GHOST, 0.5, 9, Abilities.MAGICIAN, Abilities.NONE, Abilities.NONE, 600, 80, 110, 60, 150, 130, 70, 3, 100, 300, false, null, true),
-      new PokemonForm("Hoopa Unbound", "unbound", Type.PSYCHIC, Type.DARK, 6.5, 490, Abilities.MAGICIAN, Abilities.NONE, Abilities.NONE, 680, 80, 160, 60, 170, 130, 80, 3, 100, 340),
-    ),
-    new PokemonSpecies(Species.VOLCANION, 6, false, false, true, "Steam Pokémon", Type.FIRE, Type.WATER, 1.7, 195, Abilities.WATER_ABSORB, Abilities.NONE, Abilities.NONE, 600, 80, 110, 120, 130, 90, 70, 3, 100, 300, GrowthRate.SLOW, null, false),
-    new PokemonSpecies(Species.ROWLET, 7, false, false, false, "Grass Quill Pokémon", Type.GRASS, Type.FLYING, 0.3, 1.5, Abilities.OVERGROW, Abilities.NONE, Abilities.LONG_REACH, 320, 68, 55, 55, 50, 50, 42, 45, 50, 64, GrowthRate.MEDIUM_SLOW, 87.5, false),
-    new PokemonSpecies(Species.DARTRIX, 7, false, false, false, "Blade Quill Pokémon", Type.GRASS, Type.FLYING, 0.7, 16, Abilities.OVERGROW, Abilities.NONE, Abilities.LONG_REACH, 420, 78, 75, 75, 70, 70, 52, 45, 50, 147, GrowthRate.MEDIUM_SLOW, 87.5, false),
-    new PokemonSpecies(Species.DECIDUEYE, 7, false, false, false, "Arrow Quill Pokémon", Type.GRASS, Type.GHOST, 1.6, 36.6, Abilities.OVERGROW, Abilities.NONE, Abilities.LONG_REACH, 530, 78, 107, 75, 100, 100, 70, 45, 50, 265, GrowthRate.MEDIUM_SLOW, 87.5, false),
-    new PokemonSpecies(Species.LITTEN, 7, false, false, false, "Fire Cat Pokémon", Type.FIRE, null, 0.4, 4.3, Abilities.BLAZE, Abilities.NONE, Abilities.INTIMIDATE, 320, 45, 65, 40, 60, 40, 70, 45, 50, 64, GrowthRate.MEDIUM_SLOW, 87.5, false),
-    new PokemonSpecies(Species.TORRACAT, 7, false, false, false, "Fire Cat Pokémon", Type.FIRE, null, 0.7, 25, Abilities.BLAZE, Abilities.NONE, Abilities.INTIMIDATE, 420, 65, 85, 50, 80, 50, 90, 45, 50, 147, GrowthRate.MEDIUM_SLOW, 87.5, false),
-    new PokemonSpecies(Species.INCINEROAR, 7, false, false, false, "Heel Pokémon", Type.FIRE, Type.DARK, 1.8, 83, Abilities.BLAZE, Abilities.NONE, Abilities.INTIMIDATE, 530, 95, 115, 90, 80, 90, 60, 45, 50, 265, GrowthRate.MEDIUM_SLOW, 87.5, false),
-    new PokemonSpecies(Species.POPPLIO, 7, false, false, false, "Sea Lion Pokémon", Type.WATER, null, 0.4, 7.5, Abilities.TORRENT, Abilities.NONE, Abilities.LIQUID_VOICE, 320, 50, 54, 54, 66, 56, 40, 45, 50, 64, GrowthRate.MEDIUM_SLOW, 87.5, false),
-    new PokemonSpecies(Species.BRIONNE, 7, false, false, false, "Pop Star Pokémon", Type.WATER, null, 0.6, 17.5, Abilities.TORRENT, Abilities.NONE, Abilities.LIQUID_VOICE, 420, 60, 69, 69, 91, 81, 50, 45, 50, 147, GrowthRate.MEDIUM_SLOW, 87.5, false),
-    new PokemonSpecies(Species.PRIMARINA, 7, false, false, false, "Soloist Pokémon", Type.WATER, Type.FAIRY, 1.8, 44, Abilities.TORRENT, Abilities.NONE, Abilities.LIQUID_VOICE, 530, 80, 74, 74, 126, 116, 60, 45, 50, 265, GrowthRate.MEDIUM_SLOW, 87.5, false),
-    new PokemonSpecies(Species.PIKIPEK, 7, false, false, false, "Woodpecker Pokémon", Type.NORMAL, Type.FLYING, 0.3, 1.2, Abilities.KEEN_EYE, Abilities.SKILL_LINK, Abilities.PICKUP, 265, 35, 75, 30, 30, 30, 65, 255, 70, 53, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.TRUMBEAK, 7, false, false, false, "Bugle Beak Pokémon", Type.NORMAL, Type.FLYING, 0.6, 14.8, Abilities.KEEN_EYE, Abilities.SKILL_LINK, Abilities.PICKUP, 355, 55, 85, 50, 40, 50, 75, 120, 70, 124, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.TOUCANNON, 7, false, false, false, "Cannon Pokémon", Type.NORMAL, Type.FLYING, 1.1, 26, Abilities.KEEN_EYE, Abilities.SKILL_LINK, Abilities.SHEER_FORCE, 485, 80, 120, 75, 75, 75, 60, 45, 70, 243, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.YUNGOOS, 7, false, false, false, "Loitering Pokémon", Type.NORMAL, null, 0.4, 6, Abilities.STAKEOUT, Abilities.STRONG_JAW, Abilities.ADAPTABILITY, 253, 48, 70, 30, 30, 30, 45, 255, 70, 51, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.GUMSHOOS, 7, false, false, false, "Stakeout Pokémon", Type.NORMAL, null, 0.7, 14.2, Abilities.STAKEOUT, Abilities.STRONG_JAW, Abilities.ADAPTABILITY, 418, 88, 110, 60, 55, 60, 45, 127, 70, 146, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.GRUBBIN, 7, false, false, false, "Larva Pokémon", Type.BUG, null, 0.4, 4.4, Abilities.SWARM, Abilities.NONE, Abilities.NONE, 300, 47, 62, 45, 55, 45, 46, 255, 50, 60, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.CHARJABUG, 7, false, false, false, "Battery Pokémon", Type.BUG, Type.ELECTRIC, 0.5, 10.5, Abilities.BATTERY, Abilities.NONE, Abilities.NONE, 400, 57, 82, 95, 55, 75, 36, 120, 50, 140, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.VIKAVOLT, 7, false, false, false, "Stag Beetle Pokémon", Type.BUG, Type.ELECTRIC, 1.5, 45, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 500, 77, 70, 90, 145, 75, 43, 45, 50, 250, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.CRABRAWLER, 7, false, false, false, "Boxing Pokémon", Type.FIGHTING, null, 0.6, 7, Abilities.HYPER_CUTTER, Abilities.IRON_FIST, Abilities.ANGER_POINT, 338, 47, 82, 57, 42, 47, 63, 225, 70, 68, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.CRABOMINABLE, 7, false, false, false, "Woolly Crab Pokémon", Type.FIGHTING, Type.ICE, 1.7, 180, Abilities.HYPER_CUTTER, Abilities.IRON_FIST, Abilities.ANGER_POINT, 478, 97, 132, 77, 62, 67, 43, 60, 70, 167, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.ORICORIO, 7, false, false, false, "Dancing Pokémon", Type.FIRE, Type.FLYING, 0.6, 3.4, Abilities.DANCER, Abilities.NONE, Abilities.NONE, 476, 75, 70, 70, 98, 70, 93, 45, 70, 167, GrowthRate.MEDIUM_FAST, 25, false, false,
-      new PokemonForm("Baile Style", "baile", Type.FIRE, Type.FLYING, 0.6, 3.4, Abilities.DANCER, Abilities.NONE, Abilities.NONE, 476, 75, 70, 70, 98, 70, 93, 45, 70, 167, false, "", true),
-      new PokemonForm("Pom-Pom Style", "pompom", Type.ELECTRIC, Type.FLYING, 0.6, 3.4, Abilities.DANCER, Abilities.NONE, Abilities.NONE, 476, 75, 70, 70, 98, 70, 93, 45, 70, 167, false, null, true),
-      new PokemonForm("Pau Style", "pau", Type.PSYCHIC, Type.FLYING, 0.6, 3.4, Abilities.DANCER, Abilities.NONE, Abilities.NONE, 476, 75, 70, 70, 98, 70, 93, 45, 70, 167, false, null, true),
-      new PokemonForm("Sensu Style", "sensu", Type.GHOST, Type.FLYING, 0.6, 3.4, Abilities.DANCER, Abilities.NONE, Abilities.NONE, 476, 75, 70, 70, 98, 70, 93, 45, 70, 167, false, null, true),
-    ),
-    new PokemonSpecies(Species.CUTIEFLY, 7, false, false, false, "Bee Fly Pokémon", Type.BUG, Type.FAIRY, 0.1, 0.2, Abilities.HONEY_GATHER, Abilities.SHIELD_DUST, Abilities.SWEET_VEIL, 304, 40, 45, 40, 55, 40, 84, 190, 50, 61, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.RIBOMBEE, 7, false, false, false, "Bee Fly Pokémon", Type.BUG, Type.FAIRY, 0.2, 0.5, Abilities.HONEY_GATHER, Abilities.SHIELD_DUST, Abilities.SWEET_VEIL, 464, 60, 55, 60, 95, 70, 124, 75, 50, 162, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.ROCKRUFF, 7, false, false, false, "Puppy Pokémon", Type.ROCK, null, 0.5, 9.2, Abilities.KEEN_EYE, Abilities.VITAL_SPIRIT, Abilities.STEADFAST, 280, 45, 65, 40, 30, 40, 60, 190, 50, 56, GrowthRate.MEDIUM_FAST, 50, false, false,
-      new PokemonForm("Normal", "", Type.ROCK, null, 0.5, 9.2, Abilities.KEEN_EYE, Abilities.VITAL_SPIRIT, Abilities.STEADFAST, 280, 45, 65, 40, 30, 40, 60, 190, 50, 56, false, null, true),
-      new PokemonForm("Own Tempo", "own-tempo", Type.ROCK, null, 0.5, 9.2, Abilities.OWN_TEMPO, Abilities.NONE, Abilities.OWN_TEMPO, 280, 45, 65, 40, 30, 40, 60, 190, 50, 56, false, "", true),
-    ),
-    new PokemonSpecies(Species.LYCANROC, 7, false, false, false, "Wolf Pokémon", Type.ROCK, null, 0.8, 25, Abilities.KEEN_EYE, Abilities.SAND_RUSH, Abilities.STEADFAST, 487, 75, 115, 65, 55, 65, 112, 90, 50, 170, GrowthRate.MEDIUM_FAST, 50, false, false,
-      new PokemonForm("Midday Form", "midday", Type.ROCK, null, 0.8, 25, Abilities.KEEN_EYE, Abilities.SAND_RUSH, Abilities.STEADFAST, 487, 75, 115, 65, 55, 65, 112, 90, 50, 170, false, "", true),
-      new PokemonForm("Midnight Form", "midnight", Type.ROCK, null, 1.1, 25, Abilities.KEEN_EYE, Abilities.VITAL_SPIRIT, Abilities.NO_GUARD, 487, 85, 115, 75, 55, 75, 82, 90, 50, 170, false, null, true),
-      new PokemonForm("Dusk Form", "dusk", Type.ROCK, null, 0.8, 25, Abilities.TOUGH_CLAWS, Abilities.TOUGH_CLAWS, Abilities.TOUGH_CLAWS, 487, 75, 117, 65, 55, 65, 110, 90, 50, 170, false, null, true),
-    ),
-    new PokemonSpecies(Species.WISHIWASHI, 7, false, false, false, "Small Fry Pokémon", Type.WATER, null, 0.2, 0.3, Abilities.SCHOOLING, Abilities.NONE, Abilities.NONE, 175, 45, 20, 20, 25, 25, 40, 60, 50, 61, GrowthRate.FAST, 50, false, false,
-      new PokemonForm("Solo Form", "", Type.WATER, null, 0.2, 0.3, Abilities.SCHOOLING, Abilities.NONE, Abilities.NONE, 175, 45, 20, 20, 25, 25, 40, 60, 50, 61, false, null, true),
-      new PokemonForm("School", "school", Type.WATER, null, 8.2, 78.6, Abilities.SCHOOLING, Abilities.NONE, Abilities.NONE, 620, 45, 140, 130, 140, 135, 30, 60, 50, 217),
-    ),
-    new PokemonSpecies(Species.MAREANIE, 7, false, false, false, "Brutal Star Pokémon", Type.POISON, Type.WATER, 0.4, 8, Abilities.MERCILESS, Abilities.LIMBER, Abilities.REGENERATOR, 305, 50, 53, 62, 43, 52, 45, 190, 50, 61, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.TOXAPEX, 7, false, false, false, "Brutal Star Pokémon", Type.POISON, Type.WATER, 0.7, 14.5, Abilities.MERCILESS, Abilities.LIMBER, Abilities.REGENERATOR, 495, 50, 63, 152, 53, 142, 35, 75, 50, 173, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.MUDBRAY, 7, false, false, false, "Donkey Pokémon", Type.GROUND, null, 1, 110, Abilities.OWN_TEMPO, Abilities.STAMINA, Abilities.INNER_FOCUS, 385, 70, 100, 70, 45, 55, 45, 190, 50, 77, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.MUDSDALE, 7, false, false, false, "Draft Horse Pokémon", Type.GROUND, null, 2.5, 920, Abilities.OWN_TEMPO, Abilities.STAMINA, Abilities.INNER_FOCUS, 500, 100, 125, 100, 55, 85, 35, 60, 50, 175, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.DEWPIDER, 7, false, false, false, "Water Bubble Pokémon", Type.WATER, Type.BUG, 0.3, 4, Abilities.WATER_BUBBLE, Abilities.NONE, Abilities.WATER_ABSORB, 269, 38, 40, 52, 40, 72, 27, 200, 50, 54, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.ARAQUANID, 7, false, false, false, "Water Bubble Pokémon", Type.WATER, Type.BUG, 1.8, 82, Abilities.WATER_BUBBLE, Abilities.NONE, Abilities.WATER_ABSORB, 454, 68, 70, 92, 50, 132, 42, 100, 50, 159, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.FOMANTIS, 7, false, false, false, "Sickle Grass Pokémon", Type.GRASS, null, 0.3, 1.5, Abilities.LEAF_GUARD, Abilities.NONE, Abilities.CONTRARY, 250, 40, 55, 35, 50, 35, 35, 190, 50, 50, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.LURANTIS, 7, false, false, false, "Bloom Sickle Pokémon", Type.GRASS, null, 0.9, 18.5, Abilities.LEAF_GUARD, Abilities.NONE, Abilities.CONTRARY, 480, 70, 105, 90, 80, 90, 45, 75, 50, 168, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.MORELULL, 7, false, false, false, "Illuminating Pokémon", Type.GRASS, Type.FAIRY, 0.2, 1.5, Abilities.ILLUMINATE, Abilities.EFFECT_SPORE, Abilities.RAIN_DISH, 285, 40, 35, 55, 65, 75, 15, 190, 50, 57, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.SHIINOTIC, 7, false, false, false, "Illuminating Pokémon", Type.GRASS, Type.FAIRY, 1, 11.5, Abilities.ILLUMINATE, Abilities.EFFECT_SPORE, Abilities.RAIN_DISH, 405, 60, 45, 80, 90, 100, 30, 75, 50, 142, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.SALANDIT, 7, false, false, false, "Toxic Lizard Pokémon", Type.POISON, Type.FIRE, 0.6, 4.8, Abilities.CORROSION, Abilities.NONE, Abilities.OBLIVIOUS, 320, 48, 44, 40, 71, 40, 77, 120, 50, 64, GrowthRate.MEDIUM_FAST, 87.5, false),
-    new PokemonSpecies(Species.SALAZZLE, 7, false, false, false, "Toxic Lizard Pokémon", Type.POISON, Type.FIRE, 1.2, 22.2, Abilities.CORROSION, Abilities.NONE, Abilities.OBLIVIOUS, 480, 68, 64, 60, 111, 60, 117, 45, 50, 168, GrowthRate.MEDIUM_FAST, 0, false),
-    new PokemonSpecies(Species.STUFFUL, 7, false, false, false, "Flailing Pokémon", Type.NORMAL, Type.FIGHTING, 0.5, 6.8, Abilities.FLUFFY, Abilities.KLUTZ, Abilities.CUTE_CHARM, 340, 70, 75, 50, 45, 50, 50, 140, 50, 68, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.BEWEAR, 7, false, false, false, "Strong Arm Pokémon", Type.NORMAL, Type.FIGHTING, 2.1, 135, Abilities.FLUFFY, Abilities.KLUTZ, Abilities.UNNERVE, 500, 120, 125, 80, 55, 60, 60, 70, 50, 175, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.BOUNSWEET, 7, false, false, false, "Fruit Pokémon", Type.GRASS, null, 0.3, 3.2, Abilities.LEAF_GUARD, Abilities.OBLIVIOUS, Abilities.SWEET_VEIL, 210, 42, 30, 38, 30, 38, 32, 235, 50, 42, GrowthRate.MEDIUM_SLOW, 0, false),
-    new PokemonSpecies(Species.STEENEE, 7, false, false, false, "Fruit Pokémon", Type.GRASS, null, 0.7, 8.2, Abilities.LEAF_GUARD, Abilities.OBLIVIOUS, Abilities.SWEET_VEIL, 290, 52, 40, 48, 40, 48, 62, 120, 50, 102, GrowthRate.MEDIUM_SLOW, 0, false),
-    new PokemonSpecies(Species.TSAREENA, 7, false, false, false, "Fruit Pokémon", Type.GRASS, null, 1.2, 21.4, Abilities.LEAF_GUARD, Abilities.QUEENLY_MAJESTY, Abilities.SWEET_VEIL, 510, 72, 120, 98, 50, 98, 72, 45, 50, 255, GrowthRate.MEDIUM_SLOW, 0, false),
-    new PokemonSpecies(Species.COMFEY, 7, false, false, false, "Posy Picker Pokémon", Type.FAIRY, null, 0.1, 0.3, Abilities.FLOWER_VEIL, Abilities.TRIAGE, Abilities.NATURAL_CURE, 485, 51, 52, 90, 82, 110, 100, 60, 50, 170, GrowthRate.FAST, 25, false),
-    new PokemonSpecies(Species.ORANGURU, 7, false, false, false, "Sage Pokémon", Type.NORMAL, Type.PSYCHIC, 1.5, 76, Abilities.INNER_FOCUS, Abilities.TELEPATHY, Abilities.SYMBIOSIS, 490, 90, 60, 80, 90, 110, 60, 45, 50, 172, GrowthRate.SLOW, 50, false),
-    new PokemonSpecies(Species.PASSIMIAN, 7, false, false, false, "Teamwork Pokémon", Type.FIGHTING, null, 2, 82.8, Abilities.RECEIVER, Abilities.NONE, Abilities.DEFIANT, 490, 100, 120, 90, 40, 60, 80, 45, 50, 172, GrowthRate.SLOW, 50, false),
-    new PokemonSpecies(Species.WIMPOD, 7, false, false, false, "Turn Tail Pokémon", Type.BUG, Type.WATER, 0.5, 12, Abilities.WIMP_OUT, Abilities.NONE, Abilities.RUN_AWAY, 230, 25, 35, 40, 20, 30, 80, 90, 50, 46, GrowthRate.MEDIUM_FAST, 50, false), //Custom Hidden
-    new PokemonSpecies(Species.GOLISOPOD, 7, false, false, false, "Hard Scale Pokémon", Type.BUG, Type.WATER, 2, 108, Abilities.EMERGENCY_EXIT, Abilities.NONE, Abilities.ANTICIPATION, 530, 75, 125, 140, 60, 90, 40, 45, 50, 186, GrowthRate.MEDIUM_FAST, 50, false), //Custom Hidden
-    new PokemonSpecies(Species.SANDYGAST, 7, false, false, false, "Sand Heap Pokémon", Type.GHOST, Type.GROUND, 0.5, 70, Abilities.WATER_COMPACTION, Abilities.NONE, Abilities.SAND_VEIL, 320, 55, 55, 80, 70, 45, 15, 140, 50, 64, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.PALOSSAND, 7, false, false, false, "Sand Castle Pokémon", Type.GHOST, Type.GROUND, 1.3, 250, Abilities.WATER_COMPACTION, Abilities.NONE, Abilities.SAND_VEIL, 480, 85, 75, 110, 100, 75, 35, 60, 50, 168, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.PYUKUMUKU, 7, false, false, false, "Sea Cucumber Pokémon", Type.WATER, null, 0.3, 1.2, Abilities.INNARDS_OUT, Abilities.NONE, Abilities.UNAWARE, 410, 55, 60, 130, 30, 130, 5, 60, 50, 144, GrowthRate.FAST, 50, false),
-    new PokemonSpecies(Species.TYPE_NULL, 7, true, false, false, "Synthetic Pokémon", Type.NORMAL, null, 1.9, 120.5, Abilities.BATTLE_ARMOR, Abilities.NONE, Abilities.NONE, 534, 95, 95, 95, 95, 95, 59, 3, 0, 107, GrowthRate.SLOW, null, false),
-    new PokemonSpecies(Species.SILVALLY, 7, true, false, false, "Synthetic Pokémon", Type.NORMAL, null, 2.3, 100.5, Abilities.RKS_SYSTEM, Abilities.NONE, Abilities.NONE, 570, 95, 95, 95, 95, 95, 95, 3, 0, 285, GrowthRate.SLOW, null, false, false,
-      new PokemonForm("Type: Normal", "normal", Type.NORMAL, null, 2.3, 100.5, Abilities.RKS_SYSTEM, Abilities.NONE, Abilities.NONE, 570, 95, 95, 95, 95, 95, 95, 3, 0, 285, false, "", true),
-      new PokemonForm("Type: Fighting", "fighting", Type.FIGHTING, null, 2.3, 100.5, Abilities.RKS_SYSTEM, Abilities.NONE, Abilities.NONE, 570, 95, 95, 95, 95, 95, 95, 3, 0, 285),
-      new PokemonForm("Type: Flying", "flying", Type.FLYING, null, 2.3, 100.5, Abilities.RKS_SYSTEM, Abilities.NONE, Abilities.NONE, 570, 95, 95, 95, 95, 95, 95, 3, 0, 285),
-      new PokemonForm("Type: Poison", "poison", Type.POISON, null, 2.3, 100.5, Abilities.RKS_SYSTEM, Abilities.NONE, Abilities.NONE, 570, 95, 95, 95, 95, 95, 95, 3, 0, 285),
-      new PokemonForm("Type: Ground", "ground", Type.GROUND, null, 2.3, 100.5, Abilities.RKS_SYSTEM, Abilities.NONE, Abilities.NONE, 570, 95, 95, 95, 95, 95, 95, 3, 0, 285),
-      new PokemonForm("Type: Rock", "rock", Type.ROCK, null, 2.3, 100.5, Abilities.RKS_SYSTEM, Abilities.NONE, Abilities.NONE, 570, 95, 95, 95, 95, 95, 95, 3, 0, 285),
-      new PokemonForm("Type: Bug", "bug", Type.BUG, null, 2.3, 100.5, Abilities.RKS_SYSTEM, Abilities.NONE, Abilities.NONE, 570, 95, 95, 95, 95, 95, 95, 3, 0, 285),
-      new PokemonForm("Type: Ghost", "ghost", Type.GHOST, null, 2.3, 100.5, Abilities.RKS_SYSTEM, Abilities.NONE, Abilities.NONE, 570, 95, 95, 95, 95, 95, 95, 3, 0, 285),
-      new PokemonForm("Type: Steel", "steel", Type.STEEL, null, 2.3, 100.5, Abilities.RKS_SYSTEM, Abilities.NONE, Abilities.NONE, 570, 95, 95, 95, 95, 95, 95, 3, 0, 285),
-      new PokemonForm("Type: Fire", "fire", Type.FIRE, null, 2.3, 100.5, Abilities.RKS_SYSTEM, Abilities.NONE, Abilities.NONE, 570, 95, 95, 95, 95, 95, 95, 3, 0, 285),
-      new PokemonForm("Type: Water", "water", Type.WATER, null, 2.3, 100.5, Abilities.RKS_SYSTEM, Abilities.NONE, Abilities.NONE, 570, 95, 95, 95, 95, 95, 95, 3, 0, 285),
-      new PokemonForm("Type: Grass", "grass", Type.GRASS, null, 2.3, 100.5, Abilities.RKS_SYSTEM, Abilities.NONE, Abilities.NONE, 570, 95, 95, 95, 95, 95, 95, 3, 0, 285),
-      new PokemonForm("Type: Electric", "electric", Type.ELECTRIC, null, 2.3, 100.5, Abilities.RKS_SYSTEM, Abilities.NONE, Abilities.NONE, 570, 95, 95, 95, 95, 95, 95, 3, 0, 285),
-      new PokemonForm("Type: Psychic", "psychic", Type.PSYCHIC, null, 2.3, 100.5, Abilities.RKS_SYSTEM, Abilities.NONE, Abilities.NONE, 570, 95, 95, 95, 95, 95, 95, 3, 0, 285),
-      new PokemonForm("Type: Ice", "ice", Type.ICE, null, 2.3, 100.5, Abilities.RKS_SYSTEM, Abilities.NONE, Abilities.NONE, 570, 95, 95, 95, 95, 95, 95, 3, 0, 285),
-      new PokemonForm("Type: Dragon", "dragon", Type.DRAGON, null, 2.3, 100.5, Abilities.RKS_SYSTEM, Abilities.NONE, Abilities.NONE, 570, 95, 95, 95, 95, 95, 95, 3, 0, 285),
-      new PokemonForm("Type: Dark", "dark", Type.DARK, null, 2.3, 100.5, Abilities.RKS_SYSTEM, Abilities.NONE, Abilities.NONE, 570, 95, 95, 95, 95, 95, 95, 3, 0, 285),
-      new PokemonForm("Type: Fairy", "fairy", Type.FAIRY, null, 2.3, 100.5, Abilities.RKS_SYSTEM, Abilities.NONE, Abilities.NONE, 570, 95, 95, 95, 95, 95, 95, 3, 0, 285),
-    ),
-    new PokemonSpecies(Species.MINIOR, 7, false, false, false, "Meteor Pokémon", Type.ROCK, Type.FLYING, 0.3, 40, Abilities.SHIELDS_DOWN, Abilities.NONE, Abilities.NONE, 440, 60, 60, 100, 60, 100, 60, 30, 70, 154, GrowthRate.MEDIUM_SLOW, null, false, false,
-      new PokemonForm("Red Meteor Form", "red-meteor", Type.ROCK, Type.FLYING, 0.3, 40, Abilities.SHIELDS_DOWN, Abilities.NONE, Abilities.NONE, 440, 60, 60, 100, 60, 100, 60, 30, 70, 154, false, "", true),
-      new PokemonForm("Orange Meteor Form", "orange-meteor", Type.ROCK, Type.FLYING, 0.3, 40, Abilities.SHIELDS_DOWN, Abilities.NONE, Abilities.NONE, 440, 60, 60, 100, 60, 100, 60, 30, 70, 154, false, "", true),
-      new PokemonForm("Yellow Meteor Form", "yellow-meteor", Type.ROCK, Type.FLYING, 0.3, 40, Abilities.SHIELDS_DOWN, Abilities.NONE, Abilities.NONE, 440, 60, 60, 100, 60, 100, 60, 30, 70, 154, false, "", true),
-      new PokemonForm("Green Meteor Form", "green-meteor", Type.ROCK, Type.FLYING, 0.3, 40, Abilities.SHIELDS_DOWN, Abilities.NONE, Abilities.NONE, 440, 60, 60, 100, 60, 100, 60, 30, 70, 154, false, "", true),
-      new PokemonForm("Blue Meteor Form", "blue-meteor", Type.ROCK, Type.FLYING, 0.3, 40, Abilities.SHIELDS_DOWN, Abilities.NONE, Abilities.NONE, 440, 60, 60, 100, 60, 100, 60, 30, 70, 154, false, "", true),
-      new PokemonForm("Indigo Meteor Form", "indigo-meteor", Type.ROCK, Type.FLYING, 0.3, 40, Abilities.SHIELDS_DOWN, Abilities.NONE, Abilities.NONE, 440, 60, 60, 100, 60, 100, 60, 30, 70, 154, false, "", true),
-      new PokemonForm("Violet Meteor Form", "violet-meteor", Type.ROCK, Type.FLYING, 0.3, 40, Abilities.SHIELDS_DOWN, Abilities.NONE, Abilities.NONE, 440, 60, 60, 100, 60, 100, 60, 30, 70, 154, false, "", true),
-      new PokemonForm("Red Core Form", "red", Type.ROCK, Type.FLYING, 0.3, 0.3, Abilities.SHIELDS_DOWN, Abilities.NONE, Abilities.NONE, 500, 60, 100, 60, 100, 60, 120, 30, 70, 175, false, null, true),
-      new PokemonForm("Orange Core Form", "orange", Type.ROCK, Type.FLYING, 0.3, 0.3, Abilities.SHIELDS_DOWN, Abilities.NONE, Abilities.NONE, 500, 60, 100, 60, 100, 60, 120, 30, 70, 175, false, null, true),
-      new PokemonForm("Yellow Core Form", "yellow", Type.ROCK, Type.FLYING, 0.3, 0.3, Abilities.SHIELDS_DOWN, Abilities.NONE, Abilities.NONE, 500, 60, 100, 60, 100, 60, 120, 30, 70, 175, false, null, true),
-      new PokemonForm("Green Core Form", "green", Type.ROCK, Type.FLYING, 0.3, 0.3, Abilities.SHIELDS_DOWN, Abilities.NONE, Abilities.NONE, 500, 60, 100, 60, 100, 60, 120, 30, 70, 175, false, null, true),
-      new PokemonForm("Blue Core Form", "blue", Type.ROCK, Type.FLYING, 0.3, 0.3, Abilities.SHIELDS_DOWN, Abilities.NONE, Abilities.NONE, 500, 60, 100, 60, 100, 60, 120, 30, 70, 175, false, null, true),
-      new PokemonForm("Indigo Core Form", "indigo", Type.ROCK, Type.FLYING, 0.3, 0.3, Abilities.SHIELDS_DOWN, Abilities.NONE, Abilities.NONE, 500, 60, 100, 60, 100, 60, 120, 30, 70, 175, false, null, true),
-      new PokemonForm("Violet Core Form", "violet", Type.ROCK, Type.FLYING, 0.3, 0.3, Abilities.SHIELDS_DOWN, Abilities.NONE, Abilities.NONE, 500, 60, 100, 60, 100, 60, 120, 30, 70, 175, false, null, true),
-    ),
-    new PokemonSpecies(Species.KOMALA, 7, false, false, false, "Drowsing Pokémon", Type.NORMAL, null, 0.4, 19.9, Abilities.COMATOSE, Abilities.NONE, Abilities.NONE, 480, 65, 115, 65, 75, 95, 65, 45, 70, 168, GrowthRate.SLOW, 50, false),
-    new PokemonSpecies(Species.TURTONATOR, 7, false, false, false, "Blast Turtle Pokémon", Type.FIRE, Type.DRAGON, 2, 212, Abilities.SHELL_ARMOR, Abilities.NONE, Abilities.NONE, 485, 60, 78, 135, 91, 85, 36, 70, 50, 170, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.TOGEDEMARU, 7, false, false, false, "Roly-Poly Pokémon", Type.ELECTRIC, Type.STEEL, 0.3, 3.3, Abilities.IRON_BARBS, Abilities.LIGHTNING_ROD, Abilities.STURDY, 435, 65, 98, 63, 40, 73, 96, 180, 50, 152, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.MIMIKYU, 7, false, false, false, "Disguise Pokémon", Type.GHOST, Type.FAIRY, 0.2, 0.7, Abilities.DISGUISE, Abilities.NONE, Abilities.NONE, 476, 55, 90, 80, 50, 105, 96, 45, 50, 167, GrowthRate.MEDIUM_FAST, 50, false, false,
-      new PokemonForm("Disguised Form", "disguised", Type.GHOST, Type.FAIRY, 0.2, 0.7, Abilities.DISGUISE, Abilities.NONE, Abilities.NONE, 476, 55, 90, 80, 50, 105, 96, 45, 50, 167, false, null, true),
-      new PokemonForm("Busted Form", "busted", Type.GHOST, Type.FAIRY, 0.2, 0.7, Abilities.DISGUISE, Abilities.NONE, Abilities.NONE, 476, 55, 90, 80, 50, 105, 96, 45, 50, 167),
-    ),
-    new PokemonSpecies(Species.BRUXISH, 7, false, false, false, "Gnash Teeth Pokémon", Type.WATER, Type.PSYCHIC, 0.9, 19, Abilities.DAZZLING, Abilities.STRONG_JAW, Abilities.WONDER_SKIN, 475, 68, 105, 70, 70, 70, 92, 80, 70, 166, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.DRAMPA, 7, false, false, false, "Placid Pokémon", Type.NORMAL, Type.DRAGON, 3, 185, Abilities.BERSERK, Abilities.SAP_SIPPER, Abilities.CLOUD_NINE, 485, 78, 60, 85, 135, 91, 36, 70, 50, 170, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.DHELMISE, 7, false, false, false, "Sea Creeper Pokémon", Type.GHOST, Type.GRASS, 3.9, 210, Abilities.STEELWORKER, Abilities.NONE, Abilities.NONE, 517, 70, 131, 100, 86, 90, 40, 25, 50, 181, GrowthRate.MEDIUM_FAST, null, false),
-    new PokemonSpecies(Species.JANGMO_O, 7, false, false, false, "Scaly Pokémon", Type.DRAGON, null, 0.6, 29.7, Abilities.BULLETPROOF, Abilities.SOUNDPROOF, Abilities.OVERCOAT, 300, 45, 55, 65, 45, 45, 45, 45, 50, 60, GrowthRate.SLOW, 50, false),
-    new PokemonSpecies(Species.HAKAMO_O, 7, false, false, false, "Scaly Pokémon", Type.DRAGON, Type.FIGHTING, 1.2, 47, Abilities.BULLETPROOF, Abilities.SOUNDPROOF, Abilities.OVERCOAT, 420, 55, 75, 90, 65, 70, 65, 45, 50, 147, GrowthRate.SLOW, 50, false),
-    new PokemonSpecies(Species.KOMMO_O, 7, false, false, false, "Scaly Pokémon", Type.DRAGON, Type.FIGHTING, 1.6, 78.2, Abilities.BULLETPROOF, Abilities.SOUNDPROOF, Abilities.OVERCOAT, 600, 75, 110, 125, 100, 105, 85, 45, 50, 300, GrowthRate.SLOW, 50, false),
-    new PokemonSpecies(Species.TAPU_KOKO, 7, true, false, false, "Land Spirit Pokémon", Type.ELECTRIC, Type.FAIRY, 1.8, 20.5, Abilities.ELECTRIC_SURGE, Abilities.NONE, Abilities.TELEPATHY, 570, 70, 115, 85, 95, 75, 130, 3, 50, 285, GrowthRate.SLOW, null, false),
-    new PokemonSpecies(Species.TAPU_LELE, 7, true, false, false, "Land Spirit Pokémon", Type.PSYCHIC, Type.FAIRY, 1.2, 18.6, Abilities.PSYCHIC_SURGE, Abilities.NONE, Abilities.TELEPATHY, 570, 70, 85, 75, 130, 115, 95, 3, 50, 285, GrowthRate.SLOW, null, false),
-    new PokemonSpecies(Species.TAPU_BULU, 7, true, false, false, "Land Spirit Pokémon", Type.GRASS, Type.FAIRY, 1.9, 45.5, Abilities.GRASSY_SURGE, Abilities.NONE, Abilities.TELEPATHY, 570, 70, 130, 115, 85, 95, 75, 3, 50, 285, GrowthRate.SLOW, null, false),
-    new PokemonSpecies(Species.TAPU_FINI, 7, true, false, false, "Land Spirit Pokémon", Type.WATER, Type.FAIRY, 1.3, 21.2, Abilities.MISTY_SURGE, Abilities.NONE, Abilities.TELEPATHY, 570, 70, 75, 115, 95, 130, 85, 3, 50, 285, GrowthRate.SLOW, null, false),
-    new PokemonSpecies(Species.COSMOG, 7, true, false, false, "Nebula Pokémon", Type.PSYCHIC, null, 0.2, 0.1, Abilities.UNAWARE, Abilities.NONE, Abilities.NONE, 200, 43, 29, 31, 29, 31, 37, 45, 0, 40, GrowthRate.SLOW, null, false),
-    new PokemonSpecies(Species.COSMOEM, 7, true, false, false, "Protostar Pokémon", Type.PSYCHIC, null, 0.1, 999.9, Abilities.STURDY, Abilities.NONE, Abilities.NONE, 400, 43, 29, 131, 29, 131, 37, 45, 0, 140, GrowthRate.SLOW, null, false),
-    new PokemonSpecies(Species.SOLGALEO, 7, false, true, false, "Sunne Pokémon", Type.PSYCHIC, Type.STEEL, 3.4, 230, Abilities.FULL_METAL_BODY, Abilities.NONE, Abilities.NONE, 680, 137, 137, 107, 113, 89, 97, 45, 0, 340, GrowthRate.SLOW, null, false),
-    new PokemonSpecies(Species.LUNALA, 7, false, true, false, "Moone Pokémon", Type.PSYCHIC, Type.GHOST, 4, 120, Abilities.SHADOW_SHIELD, Abilities.NONE, Abilities.NONE, 680, 137, 113, 89, 137, 107, 97, 45, 0, 340, GrowthRate.SLOW, null, false),
-    new PokemonSpecies(Species.NIHILEGO, 7, true, false, false, "Parasite Pokémon", Type.ROCK, Type.POISON, 1.2, 55.5, Abilities.BEAST_BOOST, Abilities.NONE, Abilities.NONE, 570, 109, 53, 47, 127, 131, 103, 45, 0, 285, GrowthRate.SLOW, null, false),
-    new PokemonSpecies(Species.BUZZWOLE, 7, true, false, false, "Swollen Pokémon", Type.BUG, Type.FIGHTING, 2.4, 333.6, Abilities.BEAST_BOOST, Abilities.NONE, Abilities.NONE, 570, 107, 139, 139, 53, 53, 79, 45, 0, 285, GrowthRate.SLOW, null, false),
-    new PokemonSpecies(Species.PHEROMOSA, 7, true, false, false, "Lissome Pokémon", Type.BUG, Type.FIGHTING, 1.8, 25, Abilities.BEAST_BOOST, Abilities.NONE, Abilities.NONE, 570, 71, 137, 37, 137, 37, 151, 45, 0, 285, GrowthRate.SLOW, null, false),
-    new PokemonSpecies(Species.XURKITREE, 7, true, false, false, "Glowing Pokémon", Type.ELECTRIC, null, 3.8, 100, Abilities.BEAST_BOOST, Abilities.NONE, Abilities.NONE, 570, 83, 89, 71, 173, 71, 83, 45, 0, 285, GrowthRate.SLOW, null, false),
-    new PokemonSpecies(Species.CELESTEELA, 7, true, false, false, "Launch Pokémon", Type.STEEL, Type.FLYING, 9.2, 999.9, Abilities.BEAST_BOOST, Abilities.NONE, Abilities.NONE, 570, 97, 101, 103, 107, 101, 61, 45, 0, 285, GrowthRate.SLOW, null, false),
-    new PokemonSpecies(Species.KARTANA, 7, true, false, false, "Drawn Sword Pokémon", Type.GRASS, Type.STEEL, 0.3, 0.1, Abilities.BEAST_BOOST, Abilities.NONE, Abilities.NONE, 570, 59, 181, 131, 59, 31, 109, 45, 0, 285, GrowthRate.SLOW, null, false),
-    new PokemonSpecies(Species.GUZZLORD, 7, true, false, false, "Junkivore Pokémon", Type.DARK, Type.DRAGON, 5.5, 888, Abilities.BEAST_BOOST, Abilities.NONE, Abilities.NONE, 570, 223, 101, 53, 97, 53, 43, 45, 0, 285, GrowthRate.SLOW, null, false),
-    new PokemonSpecies(Species.NECROZMA, 7, false, true, false, "Prism Pokémon", Type.PSYCHIC, null, 2.4, 230, Abilities.PRISM_ARMOR, Abilities.NONE, Abilities.NONE, 600, 97, 107, 101, 127, 89, 79, 255, 0, 300, GrowthRate.SLOW, null, false, false,
-      new PokemonForm("Normal", "", Type.PSYCHIC, null, 2.4, 230, Abilities.PRISM_ARMOR, Abilities.NONE, Abilities.NONE, 600, 97, 107, 101, 127, 89, 79, 255, 0, 300, false, null, true),
-      new PokemonForm("Dusk Mane", "dusk-mane", Type.PSYCHIC, Type.STEEL, 3.8, 460, Abilities.PRISM_ARMOR, Abilities.NONE, Abilities.NONE, 680, 97, 157, 127, 113, 109, 77, 255, 0, 340),
-      new PokemonForm("Dawn Wings", "dawn-wings", Type.PSYCHIC, Type.GHOST, 4.2, 350, Abilities.PRISM_ARMOR, Abilities.NONE, Abilities.NONE, 680, 97, 113, 109, 157, 127, 77, 255, 0, 340),
-      new PokemonForm("Ultra", "ultra", Type.PSYCHIC, Type.DRAGON, 7.5, 230, Abilities.NEUROFORCE, Abilities.NONE, Abilities.NONE, 754, 97, 167, 97, 167, 97, 129, 255, 0, 377),
-    ),
-    new PokemonSpecies(Species.MAGEARNA, 7, false, false, true, "Artificial Pokémon", Type.STEEL, Type.FAIRY, 1, 80.5, Abilities.SOUL_HEART, Abilities.NONE, Abilities.NONE, 600, 80, 95, 115, 130, 115, 65, 3, 0, 300, GrowthRate.SLOW, null, false, false,
-      new PokemonForm("Normal", "", Type.STEEL, Type.FAIRY, 1, 80.5, Abilities.SOUL_HEART, Abilities.NONE, Abilities.NONE, 600, 80, 95, 115, 130, 115, 65, 3, 0, 300, false, null, true),
-      new PokemonForm("Original", "original", Type.STEEL, Type.FAIRY, 1, 80.5, Abilities.SOUL_HEART, Abilities.NONE, Abilities.NONE, 600, 80, 95, 115, 130, 115, 65, 3, 0, 300, false, null, true),
-    ),
-    new PokemonSpecies(Species.MARSHADOW, 7, false, false, true, "Gloomdweller Pokémon", Type.FIGHTING, Type.GHOST, 0.7, 22.2, Abilities.TECHNICIAN, Abilities.NONE, Abilities.NONE, 600, 90, 125, 80, 90, 90, 125, 3, 0, 300, GrowthRate.SLOW, null, false, true,
-      new PokemonForm("Normal", "", Type.FIGHTING, Type.GHOST, 0.7, 22.2, Abilities.TECHNICIAN, Abilities.NONE, Abilities.NONE, 600, 90, 125, 80, 90, 90, 125, 3, 0, 300, false, null, true),
-      new PokemonForm("Zenith", "zenith", Type.FIGHTING, Type.GHOST, 0.7, 22.2, Abilities.TECHNICIAN, Abilities.NONE, Abilities.NONE, 600, 90, 125, 80, 90, 90, 125, 3, 0, 300)
-    ),
-    new PokemonSpecies(Species.POIPOLE, 7, true, false, false, "Poison Pin Pokémon", Type.POISON, null, 0.6, 1.8, Abilities.BEAST_BOOST, Abilities.NONE, Abilities.NONE, 420, 67, 73, 67, 73, 67, 73, 45, 0, 210, GrowthRate.SLOW, null, false),
-    new PokemonSpecies(Species.NAGANADEL, 7, true, false, false, "Poison Pin Pokémon", Type.POISON, Type.DRAGON, 3.6, 150, Abilities.BEAST_BOOST, Abilities.NONE, Abilities.NONE, 540, 73, 73, 73, 127, 73, 121, 45, 0, 270, GrowthRate.SLOW, null, false),
-    new PokemonSpecies(Species.STAKATAKA, 7, true, false, false, "Rampart Pokémon", Type.ROCK, Type.STEEL, 5.5, 820, Abilities.BEAST_BOOST, Abilities.NONE, Abilities.NONE, 570, 61, 131, 211, 53, 101, 13, 30, 0, 285, GrowthRate.SLOW, null, false),
-    new PokemonSpecies(Species.BLACEPHALON, 7, true, false, false, "Fireworks Pokémon", Type.FIRE, Type.GHOST, 1.8, 13, Abilities.BEAST_BOOST, Abilities.NONE, Abilities.NONE, 570, 53, 127, 53, 151, 79, 107, 30, 0, 285, GrowthRate.SLOW, null, false),
-    new PokemonSpecies(Species.ZERAORA, 7, false, false, true, "Thunderclap Pokémon", Type.ELECTRIC, null, 1.5, 44.5, Abilities.VOLT_ABSORB, Abilities.NONE, Abilities.NONE, 600, 88, 112, 75, 102, 80, 143, 3, 0, 300, GrowthRate.SLOW, null, false),
-    new PokemonSpecies(Species.MELTAN, 7, false, false, true, "Hex Nut Pokémon", Type.STEEL, null, 0.2, 8, Abilities.MAGNET_PULL, Abilities.NONE, Abilities.NONE, 300, 46, 65, 65, 55, 35, 34, 3, 0, 150, GrowthRate.SLOW, null, false),
-    new PokemonSpecies(Species.MELMETAL, 7, false, false, true, "Hex Nut Pokémon", Type.STEEL, null, 2.5, 800, Abilities.IRON_FIST, Abilities.NONE, Abilities.NONE, 600, 135, 143, 143, 80, 65, 34, 3, 0, 300, GrowthRate.SLOW, null, false, true,
-      new PokemonForm("Normal", "", Type.STEEL, null, 2.5, 800, Abilities.IRON_FIST, Abilities.NONE, Abilities.NONE, 600, 135, 143, 143, 80, 65, 34, 3, 0, 300, false, null, true),
-      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.STEEL, null, 25, 999.9, Abilities.IRON_FIST, Abilities.NONE, Abilities.NONE, 700, 175, 165, 155, 85, 75, 45, 3, 0, 300),
-    ),
-    new PokemonSpecies(Species.GROOKEY, 8, false, false, false, "Chimp Pokémon", Type.GRASS, null, 0.3, 5, Abilities.OVERGROW, Abilities.NONE, Abilities.GRASSY_SURGE, 310, 50, 65, 50, 40, 40, 65, 45, 50, 62, GrowthRate.MEDIUM_SLOW, 87.5, false),
-    new PokemonSpecies(Species.THWACKEY, 8, false, false, false, "Beat Pokémon", Type.GRASS, null, 0.7, 14, Abilities.OVERGROW, Abilities.NONE, Abilities.GRASSY_SURGE, 420, 70, 85, 70, 55, 60, 80, 45, 50, 147, GrowthRate.MEDIUM_SLOW, 87.5, false),
-    new PokemonSpecies(Species.RILLABOOM, 8, false, false, false, "Drummer Pokémon", Type.GRASS, null, 2.1, 90, Abilities.OVERGROW, Abilities.NONE, Abilities.GRASSY_SURGE, 530, 100, 125, 90, 60, 70, 85, 45, 50, 265, GrowthRate.MEDIUM_SLOW, 87.5, false, true,
-      new PokemonForm("Normal", "", Type.GRASS, null, 2.1, 90, Abilities.OVERGROW, Abilities.NONE, Abilities.GRASSY_SURGE, 530, 100, 125, 90, 60, 70, 85, 45, 50, 265, false, null, true),
-      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.GRASS, null, 28, 999.9, Abilities.GRASSY_SURGE, Abilities.NONE, Abilities.GRASSY_SURGE, 630, 125, 150, 105, 85, 85, 80, 45, 50, 265),
-    ),
-    new PokemonSpecies(Species.SCORBUNNY, 8, false, false, false, "Rabbit Pokémon", Type.FIRE, null, 0.3, 4.5, Abilities.BLAZE, Abilities.NONE, Abilities.LIBERO, 310, 50, 71, 40, 40, 40, 69, 45, 50, 62, GrowthRate.MEDIUM_SLOW, 87.5, false),
-    new PokemonSpecies(Species.RABOOT, 8, false, false, false, "Rabbit Pokémon", Type.FIRE, null, 0.6, 9, Abilities.BLAZE, Abilities.NONE, Abilities.LIBERO, 420, 65, 86, 60, 55, 60, 94, 45, 50, 147, GrowthRate.MEDIUM_SLOW, 87.5, false),
-    new PokemonSpecies(Species.CINDERACE, 8, false, false, false, "Striker Pokémon", Type.FIRE, null, 1.4, 33, Abilities.BLAZE, Abilities.NONE, Abilities.LIBERO, 530, 80, 116, 75, 65, 75, 119, 45, 50, 265, GrowthRate.MEDIUM_SLOW, 87.5, false, true,
-      new PokemonForm("Normal", "", Type.FIRE, null, 1.4, 33, Abilities.BLAZE, Abilities.NONE, Abilities.LIBERO, 530, 80, 116, 75, 65, 75, 119, 45, 50, 265, false, null, true),
-      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.FIRE, null, 27, 999.9, Abilities.LIBERO, Abilities.NONE, Abilities.LIBERO, 630, 100, 146, 80, 90, 80, 134, 45, 50, 265),
-    ),
-    new PokemonSpecies(Species.SOBBLE, 8, false, false, false, "Water Lizard Pokémon", Type.WATER, null, 0.3, 4, Abilities.TORRENT, Abilities.NONE, Abilities.SNIPER, 310, 50, 40, 40, 70, 40, 70, 45, 50, 62, GrowthRate.MEDIUM_SLOW, 87.5, false),
-    new PokemonSpecies(Species.DRIZZILE, 8, false, false, false, "Water Lizard Pokémon", Type.WATER, null, 0.7, 11.5, Abilities.TORRENT, Abilities.NONE, Abilities.SNIPER, 420, 65, 60, 55, 95, 55, 90, 45, 50, 147, GrowthRate.MEDIUM_SLOW, 87.5, false),
-    new PokemonSpecies(Species.INTELEON, 8, false, false, false, "Secret Agent Pokémon", Type.WATER, null, 1.9, 45.2, Abilities.TORRENT, Abilities.NONE, Abilities.SNIPER, 530, 70, 85, 65, 125, 65, 120, 45, 50, 265, GrowthRate.MEDIUM_SLOW, 87.5, false, true,
-      new PokemonForm("Normal", "", Type.WATER, null, 1.9, 45.2, Abilities.TORRENT, Abilities.NONE, Abilities.SNIPER, 530, 70, 85, 65, 125, 65, 120, 45, 50, 265, false, null, true),
-      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.WATER, null, 40, 999.9, Abilities.SNIPER, Abilities.NONE, Abilities.SNIPER, 630, 95, 97, 77, 147, 77, 137, 45, 50, 265),
-    ),
-    new PokemonSpecies(Species.SKWOVET, 8, false, false, false, "Cheeky Pokémon", Type.NORMAL, null, 0.3, 2.5, Abilities.CHEEK_POUCH, Abilities.NONE, Abilities.GLUTTONY, 275, 70, 55, 55, 35, 35, 25, 255, 50, 55, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.GREEDENT, 8, false, false, false, "Greedy Pokémon", Type.NORMAL, null, 0.6, 6, Abilities.CHEEK_POUCH, Abilities.NONE, Abilities.GLUTTONY, 460, 120, 95, 95, 55, 75, 20, 90, 50, 161, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.ROOKIDEE, 8, false, false, false, "Tiny Bird Pokémon", Type.FLYING, null, 0.2, 1.8, Abilities.KEEN_EYE, Abilities.UNNERVE, Abilities.BIG_PECKS, 245, 38, 47, 35, 33, 35, 57, 255, 50, 49, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.CORVISQUIRE, 8, false, false, false, "Raven Pokémon", Type.FLYING, null, 0.8, 16, Abilities.KEEN_EYE, Abilities.UNNERVE, Abilities.BIG_PECKS, 365, 68, 67, 55, 43, 55, 77, 120, 50, 128, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.CORVIKNIGHT, 8, false, false, false, "Raven Pokémon", Type.FLYING, Type.STEEL, 2.2, 75, Abilities.PRESSURE, Abilities.UNNERVE, Abilities.MIRROR_ARMOR, 495, 98, 87, 105, 53, 85, 67, 45, 50, 248, GrowthRate.MEDIUM_SLOW, 50, false, true,
-      new PokemonForm("Normal", "", Type.FLYING, Type.STEEL, 2.2, 75, Abilities.PRESSURE, Abilities.UNNERVE, Abilities.MIRROR_ARMOR, 495, 98, 87, 105, 53, 85, 67, 45, 50, 248, false, null, true),
-      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.FLYING, Type.STEEL, 14, 999.9, Abilities.MIRROR_ARMOR, Abilities.MIRROR_ARMOR, Abilities.MIRROR_ARMOR, 595, 128, 102, 140, 53, 95, 77, 45, 50, 248),
-    ),
-    new PokemonSpecies(Species.BLIPBUG, 8, false, false, false, "Larva Pokémon", Type.BUG, null, 0.4, 8, Abilities.SWARM, Abilities.COMPOUND_EYES, Abilities.TELEPATHY, 180, 25, 20, 20, 25, 45, 45, 255, 50, 36, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.DOTTLER, 8, false, false, false, "Radome Pokémon", Type.BUG, Type.PSYCHIC, 0.4, 19.5, Abilities.SWARM, Abilities.COMPOUND_EYES, Abilities.TELEPATHY, 335, 50, 35, 80, 50, 90, 30, 120, 50, 117, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.ORBEETLE, 8, false, false, false, "Seven Spot Pokémon", Type.BUG, Type.PSYCHIC, 0.4, 40.8, Abilities.SWARM, Abilities.FRISK, Abilities.TELEPATHY, 505, 60, 45, 110, 80, 120, 90, 45, 50, 253, GrowthRate.MEDIUM_FAST, 50, false, true,
-      new PokemonForm("Normal", "", Type.BUG, Type.PSYCHIC, 0.4, 40.8, Abilities.SWARM, Abilities.FRISK, Abilities.TELEPATHY, 505, 60, 45, 110, 80, 120, 90, 45, 50, 253, false, null, true),
-      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.BUG, Type.PSYCHIC, 14, 999.9, Abilities.TRACE, Abilities.TRACE, Abilities.TRACE, 605, 90, 45, 130, 110, 140, 90, 45, 50, 253),
-    ),
-    new PokemonSpecies(Species.NICKIT, 8, false, false, false, "Fox Pokémon", Type.DARK, null, 0.6, 8.9, Abilities.RUN_AWAY, Abilities.UNBURDEN, Abilities.STAKEOUT, 245, 40, 28, 28, 47, 52, 50, 255, 50, 49, GrowthRate.FAST, 50, false),
-    new PokemonSpecies(Species.THIEVUL, 8, false, false, false, "Fox Pokémon", Type.DARK, null, 1.2, 19.9, Abilities.RUN_AWAY, Abilities.UNBURDEN, Abilities.STAKEOUT, 455, 70, 58, 58, 87, 92, 90, 127, 50, 159, GrowthRate.FAST, 50, false),
-    new PokemonSpecies(Species.GOSSIFLEUR, 8, false, false, false, "Flowering Pokémon", Type.GRASS, null, 0.4, 2.2, Abilities.COTTON_DOWN, Abilities.REGENERATOR, Abilities.EFFECT_SPORE, 250, 40, 40, 60, 40, 60, 10, 190, 50, 50, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.ELDEGOSS, 8, false, false, false, "Cotton Bloom Pokémon", Type.GRASS, null, 0.5, 2.5, Abilities.COTTON_DOWN, Abilities.REGENERATOR, Abilities.EFFECT_SPORE, 460, 60, 50, 90, 80, 120, 60, 75, 50, 161, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.WOOLOO, 8, false, false, false, "Sheep Pokémon", Type.NORMAL, null, 0.6, 6, Abilities.FLUFFY, Abilities.RUN_AWAY, Abilities.BULLETPROOF, 270, 42, 40, 55, 40, 45, 48, 255, 50, 122, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.DUBWOOL, 8, false, false, false, "Sheep Pokémon", Type.NORMAL, null, 1.3, 43, Abilities.FLUFFY, Abilities.STEADFAST, Abilities.BULLETPROOF, 490, 72, 80, 100, 60, 90, 88, 127, 50, 172, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.CHEWTLE, 8, false, false, false, "Snapping Pokémon", Type.WATER, null, 0.3, 8.5, Abilities.STRONG_JAW, Abilities.SHELL_ARMOR, Abilities.SWIFT_SWIM, 284, 50, 64, 50, 38, 38, 44, 255, 50, 57, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.DREDNAW, 8, false, false, false, "Bite Pokémon", Type.WATER, Type.ROCK, 1, 115.5, Abilities.STRONG_JAW, Abilities.SHELL_ARMOR, Abilities.SWIFT_SWIM, 485, 90, 115, 90, 48, 68, 74, 75, 50, 170, GrowthRate.MEDIUM_FAST, 50, false, true,
-      new PokemonForm("Normal", "", Type.WATER, Type.ROCK, 1, 115.5, Abilities.STRONG_JAW, Abilities.SHELL_ARMOR, Abilities.SWIFT_SWIM, 485, 90, 115, 90, 48, 68, 74, 75, 50, 170, false, null, true),
-      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.WATER, Type.ROCK, 24, 999.9, Abilities.STRONG_JAW, Abilities.STRONG_JAW, Abilities.STRONG_JAW, 585, 115, 145, 115, 43, 83, 84, 75, 50, 170),
-    ),
-    new PokemonSpecies(Species.YAMPER, 8, false, false, false, "Puppy Pokémon", Type.ELECTRIC, null, 0.3, 13.5, Abilities.BALL_FETCH, Abilities.NONE, Abilities.RATTLED, 270, 59, 45, 50, 40, 50, 26, 255, 50, 54, GrowthRate.FAST, 50, false),
-    new PokemonSpecies(Species.BOLTUND, 8, false, false, false, "Dog Pokémon", Type.ELECTRIC, null, 1, 34, Abilities.STRONG_JAW, Abilities.NONE, Abilities.COMPETITIVE, 490, 69, 90, 60, 90, 60, 121, 45, 50, 172, GrowthRate.FAST, 50, false),
-    new PokemonSpecies(Species.ROLYCOLY, 8, false, false, false, "Coal Pokémon", Type.ROCK, null, 0.3, 12, Abilities.STEAM_ENGINE, Abilities.HEATPROOF, Abilities.FLASH_FIRE, 240, 30, 40, 50, 40, 50, 30, 255, 50, 48, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.CARKOL, 8, false, false, false, "Coal Pokémon", Type.ROCK, Type.FIRE, 1.1, 78, Abilities.STEAM_ENGINE, Abilities.FLAME_BODY, Abilities.FLASH_FIRE, 410, 80, 60, 90, 60, 70, 50, 120, 50, 144, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.COALOSSAL, 8, false, false, false, "Coal Pokémon", Type.ROCK, Type.FIRE, 2.8, 310.5, Abilities.STEAM_ENGINE, Abilities.FLAME_BODY, Abilities.FLASH_FIRE, 510, 110, 80, 120, 80, 90, 30, 45, 50, 255, GrowthRate.MEDIUM_SLOW, 50, false, true,
-      new PokemonForm("Normal", "", Type.ROCK, Type.FIRE, 2.8, 310.5, Abilities.STEAM_ENGINE, Abilities.FLAME_BODY, Abilities.FLASH_FIRE, 510, 110, 80, 120, 80, 90, 30, 45, 50, 255, false, null, true),
-      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.ROCK, Type.FIRE, 42, 999.9, Abilities.STEAM_ENGINE, Abilities.STEAM_ENGINE, Abilities.STEAM_ENGINE, 610, 140, 95, 130, 95, 110, 40, 45, 50, 255),
-    ),
-    new PokemonSpecies(Species.APPLIN, 8, false, false, false, "Apple Core Pokémon", Type.GRASS, Type.DRAGON, 0.2, 0.5, Abilities.RIPEN, Abilities.GLUTTONY, Abilities.BULLETPROOF, 260, 40, 40, 80, 40, 40, 20, 255, 50, 52, GrowthRate.ERRATIC, 50, false),
-    new PokemonSpecies(Species.FLAPPLE, 8, false, false, false, "Apple Wing Pokémon", Type.GRASS, Type.DRAGON, 0.3, 1, Abilities.RIPEN, Abilities.GLUTTONY, Abilities.HUSTLE, 485, 70, 110, 80, 95, 60, 70, 45, 50, 170, GrowthRate.ERRATIC, 50, false, true,
-      new PokemonForm("Normal", "", Type.GRASS, Type.DRAGON, 0.3, 1, Abilities.RIPEN, Abilities.GLUTTONY, Abilities.HUSTLE, 485, 70, 110, 80, 95, 60, 70, 45, 50, 170, false, null, true),
-      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.GRASS, Type.DRAGON, 24, 999.9, Abilities.HUSTLE, Abilities.HUSTLE, Abilities.HUSTLE, 585, 90, 130, 100, 85, 80, 100, 45, 50, 170),
-    ),
-    new PokemonSpecies(Species.APPLETUN, 8, false, false, false, "Apple Nectar Pokémon", Type.GRASS, Type.DRAGON, 0.4, 13, Abilities.RIPEN, Abilities.GLUTTONY, Abilities.THICK_FAT, 485, 110, 85, 80, 100, 80, 30, 45, 50, 170, GrowthRate.ERRATIC, 50, false, true,
-      new PokemonForm("Normal", "", Type.GRASS, Type.DRAGON, 0.4, 13, Abilities.RIPEN, Abilities.GLUTTONY, Abilities.THICK_FAT, 485, 110, 85, 80, 100, 80, 30, 45, 50, 170, false, null, true),
-      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.GRASS, Type.DRAGON, 24, 999.9, Abilities.THICK_FAT, Abilities.THICK_FAT, Abilities.THICK_FAT, 585, 130, 75, 115, 125, 115, 25, 45, 50, 170),
-    ),
-    new PokemonSpecies(Species.SILICOBRA, 8, false, false, false, "Sand Snake Pokémon", Type.GROUND, null, 2.2, 7.6, Abilities.SAND_SPIT, Abilities.SHED_SKIN, Abilities.SAND_VEIL, 315, 52, 57, 75, 35, 50, 46, 255, 50, 63, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.SANDACONDA, 8, false, false, false, "Sand Snake Pokémon", Type.GROUND, null, 3.8, 65.5, Abilities.SAND_SPIT, Abilities.SHED_SKIN, Abilities.SAND_VEIL, 510, 72, 107, 125, 65, 70, 71, 120, 50, 179, GrowthRate.MEDIUM_FAST, 50, false, true,
-      new PokemonForm("Normal", "", Type.GROUND, null, 3.8, 65.5, Abilities.SAND_SPIT, Abilities.SHED_SKIN, Abilities.SAND_VEIL, 510, 72, 107, 125, 65, 70, 71, 120, 50, 179, false, null, true),
-      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.GROUND, null, 22, 999.9, Abilities.SAND_SPIT, Abilities.SAND_SPIT, Abilities.SAND_SPIT, 610, 117, 137, 140, 55, 80, 81, 120, 50, 179),
-    ),
-    new PokemonSpecies(Species.CRAMORANT, 8, false, false, false, "Gulp Pokémon", Type.FLYING, Type.WATER, 0.8, 18, Abilities.GULP_MISSILE, Abilities.NONE, Abilities.NONE, 475, 70, 85, 55, 85, 95, 85, 45, 50, 166, GrowthRate.MEDIUM_FAST, 50, false, false,
-      new PokemonForm("Normal", "", Type.FLYING, Type.WATER, 0.8, 18, Abilities.GULP_MISSILE, Abilities.NONE, Abilities.NONE, 475, 70, 85, 55, 85, 95, 85, 45, 50, 166, false, null, true),
-      new PokemonForm("Gulping Form", "gulping", Type.FLYING, Type.WATER, 0.8, 18, Abilities.GULP_MISSILE, Abilities.NONE, Abilities.NONE, 475, 70, 85, 55, 85, 95, 85, 45, 50, 166),
-      new PokemonForm("Gorging Form", "gorging", Type.FLYING, Type.WATER, 0.8, 18, Abilities.GULP_MISSILE, Abilities.NONE, Abilities.NONE, 475, 70, 85, 55, 85, 95, 85, 45, 50, 166),
-    ),
-    new PokemonSpecies(Species.ARROKUDA, 8, false, false, false, "Rush Pokémon", Type.WATER, null, 0.5, 1, Abilities.SWIFT_SWIM, Abilities.NONE, Abilities.PROPELLER_TAIL, 280, 41, 63, 40, 40, 30, 66, 255, 50, 56, GrowthRate.SLOW, 50, false),
-    new PokemonSpecies(Species.BARRASKEWDA, 8, false, false, false, "Skewer Pokémon", Type.WATER, null, 1.3, 30, Abilities.SWIFT_SWIM, Abilities.NONE, Abilities.PROPELLER_TAIL, 490, 61, 123, 60, 60, 50, 136, 60, 50, 172, GrowthRate.SLOW, 50, false),
-    new PokemonSpecies(Species.TOXEL, 8, false, false, false, "Baby Pokémon", Type.ELECTRIC, Type.POISON, 0.4, 11, Abilities.RATTLED, Abilities.STATIC, Abilities.KLUTZ, 242, 40, 38, 35, 54, 35, 40, 75, 50, 48, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.TOXTRICITY, 8, false, false, false, "Punk Pokémon", Type.ELECTRIC, Type.POISON, 1.6, 40, Abilities.PUNK_ROCK, Abilities.PLUS, Abilities.TECHNICIAN, 502, 75, 98, 70, 114, 70, 75, 45, 50, 176, GrowthRate.MEDIUM_SLOW, 50, false, true,
-      new PokemonForm("Amped Form", "amped", Type.ELECTRIC, Type.POISON, 1.6, 40, Abilities.PUNK_ROCK, Abilities.PLUS, Abilities.TECHNICIAN, 502, 75, 98, 70, 114, 70, 75, 45, 50, 176, false, "", true),
-      new PokemonForm("Low-Key Form", "lowkey", Type.ELECTRIC, Type.POISON, 1.6, 40, Abilities.PUNK_ROCK, Abilities.MINUS, Abilities.TECHNICIAN, 502, 75, 98, 70, 114, 70, 75, 45, 50, 176, false, "lowkey", true),
-      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.ELECTRIC, Type.POISON, 24, 999.9, Abilities.PUNK_ROCK, Abilities.PUNK_ROCK, Abilities.PUNK_ROCK, 602, 114, 98, 82, 144, 82, 82, 45, 50, 176),
-    ),
-    new PokemonSpecies(Species.SIZZLIPEDE, 8, false, false, false, "Radiator Pokémon", Type.FIRE, Type.BUG, 0.7, 1, Abilities.FLASH_FIRE, Abilities.WHITE_SMOKE, Abilities.FLAME_BODY, 305, 50, 65, 45, 50, 50, 45, 190, 50, 61, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.CENTISKORCH, 8, false, false, false, "Radiator Pokémon", Type.FIRE, Type.BUG, 3, 120, Abilities.FLASH_FIRE, Abilities.WHITE_SMOKE, Abilities.FLAME_BODY, 525, 100, 115, 65, 90, 90, 65, 75, 50, 184, GrowthRate.MEDIUM_FAST, 50, false, true,
-      new PokemonForm("Normal", "", Type.FIRE, Type.BUG, 3, 120, Abilities.FLASH_FIRE, Abilities.WHITE_SMOKE, Abilities.FLAME_BODY, 525, 100, 115, 65, 90, 90, 65, 75, 50, 184, false, null, true),
-      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.FIRE, Type.BUG, 75, 999.9, Abilities.FLASH_FIRE, Abilities.FLASH_FIRE, Abilities.FLASH_FIRE, 625, 140, 145, 75, 90, 100, 75, 75, 50, 184),
-    ),
-    new PokemonSpecies(Species.CLOBBOPUS, 8, false, false, false, "Tantrum Pokémon", Type.FIGHTING, null, 0.6, 4, Abilities.LIMBER, Abilities.NONE, Abilities.TECHNICIAN, 310, 50, 68, 60, 50, 50, 32, 180, 50, 62, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.GRAPPLOCT, 8, false, false, false, "Jujitsu Pokémon", Type.FIGHTING, null, 1.6, 39, Abilities.LIMBER, Abilities.NONE, Abilities.TECHNICIAN, 480, 80, 118, 90, 70, 80, 42, 45, 50, 168, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.SINISTEA, 8, false, false, false, "Black Tea Pokémon", Type.GHOST, null, 0.1, 0.2, Abilities.WEAK_ARMOR, Abilities.NONE, Abilities.CURSED_BODY, 308, 40, 45, 45, 74, 54, 50, 120, 50, 62, GrowthRate.MEDIUM_FAST, null, false, false,
-      new PokemonForm("Phony Form", "phony", Type.GHOST, null, 0.1, 0.2, Abilities.WEAK_ARMOR, Abilities.NONE, Abilities.CURSED_BODY, 308, 40, 45, 45, 74, 54, 50, 120, 50, 62, false, "", true),
-      new PokemonForm("Antique Form", "antique", Type.GHOST, null, 0.1, 0.2, Abilities.WEAK_ARMOR, Abilities.NONE, Abilities.CURSED_BODY, 308, 40, 45, 45, 74, 54, 50, 120, 50, 62, false, "", true),
-    ),
-    new PokemonSpecies(Species.POLTEAGEIST, 8, false, false, false, "Black Tea Pokémon", Type.GHOST, null, 0.2, 0.4, Abilities.WEAK_ARMOR, Abilities.NONE, Abilities.CURSED_BODY, 508, 60, 65, 65, 134, 114, 70, 60, 50, 178, GrowthRate.MEDIUM_FAST, null, false, false,
-      new PokemonForm("Phony Form", "phony", Type.GHOST, null, 0.2, 0.4, Abilities.WEAK_ARMOR, Abilities.NONE, Abilities.CURSED_BODY, 508, 60, 65, 65, 134, 114, 70, 60, 50, 178, false, "", true),
-      new PokemonForm("Antique Form", "antique", Type.GHOST, null, 0.2, 0.4, Abilities.WEAK_ARMOR, Abilities.NONE, Abilities.CURSED_BODY, 508, 60, 65, 65, 134, 114, 70, 60, 50, 178, false, "", true),
-    ),
-    new PokemonSpecies(Species.HATENNA, 8, false, false, false, "Calm Pokémon", Type.PSYCHIC, null, 0.4, 3.4, Abilities.HEALER, Abilities.ANTICIPATION, Abilities.MAGIC_BOUNCE, 265, 42, 30, 45, 56, 53, 39, 235, 50, 53, GrowthRate.SLOW, 0, false),
-    new PokemonSpecies(Species.HATTREM, 8, false, false, false, "Serene Pokémon", Type.PSYCHIC, null, 0.6, 4.8, Abilities.HEALER, Abilities.ANTICIPATION, Abilities.MAGIC_BOUNCE, 370, 57, 40, 65, 86, 73, 49, 120, 50, 130, GrowthRate.SLOW, 0, false),
-    new PokemonSpecies(Species.HATTERENE, 8, false, false, false, "Silent Pokémon", Type.PSYCHIC, Type.FAIRY, 2.1, 5.1, Abilities.HEALER, Abilities.ANTICIPATION, Abilities.MAGIC_BOUNCE, 510, 57, 90, 95, 136, 103, 29, 45, 50, 255, GrowthRate.SLOW, 0, false, true,
-      new PokemonForm("Normal", "", Type.PSYCHIC, Type.FAIRY, 2.1, 5.1, Abilities.HEALER, Abilities.ANTICIPATION, Abilities.MAGIC_BOUNCE, 510, 57, 90, 95, 136, 103, 29, 45, 50, 255, false, null, true),
-      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.PSYCHIC, Type.FAIRY, 26, 999.9, Abilities.MAGIC_BOUNCE, Abilities.MAGIC_BOUNCE, Abilities.MAGIC_BOUNCE, 610, 97, 90, 105, 146, 122, 50, 45, 50, 255),
-    ),
-    new PokemonSpecies(Species.IMPIDIMP, 8, false, false, false, "Wily Pokémon", Type.DARK, Type.FAIRY, 0.4, 5.5, Abilities.PRANKSTER, Abilities.FRISK, Abilities.PICKPOCKET, 265, 45, 45, 30, 55, 40, 50, 255, 50, 53, GrowthRate.MEDIUM_FAST, 100, false),
-    new PokemonSpecies(Species.MORGREM, 8, false, false, false, "Devious Pokémon", Type.DARK, Type.FAIRY, 0.8, 12.5, Abilities.PRANKSTER, Abilities.FRISK, Abilities.PICKPOCKET, 370, 65, 60, 45, 75, 55, 70, 120, 50, 130, GrowthRate.MEDIUM_FAST, 100, false),
-    new PokemonSpecies(Species.GRIMMSNARL, 8, false, false, false, "Bulk Up Pokémon", Type.DARK, Type.FAIRY, 1.5, 61, Abilities.PRANKSTER, Abilities.FRISK, Abilities.PICKPOCKET, 510, 95, 120, 65, 95, 75, 60, 45, 50, 255, GrowthRate.MEDIUM_FAST, 100, false, true,
-      new PokemonForm("Normal", "", Type.DARK, Type.FAIRY, 1.5, 61, Abilities.PRANKSTER, Abilities.FRISK, Abilities.PICKPOCKET, 510, 95, 120, 65, 95, 75, 60, 45, 50, 255, false, null, true),
-      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.DARK, Type.FAIRY, 32, 999.9, Abilities.PRANKSTER, Abilities.PRANKSTER, Abilities.PRANKSTER, 610, 135, 138, 77, 110, 85, 65, 45, 50, 255),
-    ),
-    new PokemonSpecies(Species.OBSTAGOON, 8, false, false, false, "Blocking Pokémon", Type.DARK, Type.NORMAL, 1.6, 46, Abilities.RECKLESS, Abilities.GUTS, Abilities.DEFIANT, 520, 93, 90, 101, 60, 81, 95, 45, 50, 260, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.PERRSERKER, 8, false, false, false, "Viking Pokémon", Type.STEEL, null, 0.8, 28, Abilities.BATTLE_ARMOR, Abilities.TOUGH_CLAWS, Abilities.STEELY_SPIRIT, 440, 70, 110, 100, 50, 60, 50, 90, 50, 154, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.CURSOLA, 8, false, false, false, "Coral Pokémon", Type.GHOST, null, 1, 0.4, Abilities.WEAK_ARMOR, Abilities.NONE, Abilities.PERISH_BODY, 510, 60, 95, 50, 145, 130, 30, 30, 50, 179, GrowthRate.FAST, 25, false),
-    new PokemonSpecies(Species.SIRFETCHD, 8, false, false, false, "Wild Duck Pokémon", Type.FIGHTING, null, 0.8, 117, Abilities.STEADFAST, Abilities.NONE, Abilities.SCRAPPY, 507, 62, 135, 95, 68, 82, 65, 45, 50, 177, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.MR_RIME, 8, false, false, false, "Comedian Pokémon", Type.ICE, Type.PSYCHIC, 1.5, 58.2, Abilities.TANGLED_FEET, Abilities.SCREEN_CLEANER, Abilities.ICE_BODY, 520, 80, 85, 75, 110, 100, 70, 45, 50, 182, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.RUNERIGUS, 8, false, false, false, "Grudge Pokémon", Type.GROUND, Type.GHOST, 1.6, 66.6, Abilities.WANDERING_SPIRIT, Abilities.NONE, Abilities.NONE, 483, 58, 95, 145, 50, 105, 30, 90, 50, 169, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.MILCERY, 8, false, false, false, "Cream Pokémon", Type.FAIRY, null, 0.2, 0.3, Abilities.SWEET_VEIL, Abilities.NONE, Abilities.AROMA_VEIL, 270, 45, 40, 40, 50, 61, 34, 200, 50, 54, GrowthRate.MEDIUM_FAST, 0, false),
-    new PokemonSpecies(Species.ALCREMIE, 8, false, false, false, "Cream Pokémon", Type.FAIRY, null, 0.3, 0.5, Abilities.SWEET_VEIL, Abilities.NONE, Abilities.AROMA_VEIL, 495, 65, 60, 75, 110, 121, 64, 100, 50, 173, GrowthRate.MEDIUM_FAST, 0, false, true,
-      new PokemonForm("Vanilla Cream", "vanilla-cream", Type.FAIRY, null, 0.3, 0.5, Abilities.SWEET_VEIL, Abilities.NONE, Abilities.AROMA_VEIL, 495, 65, 60, 75, 110, 121, 64, 100, 50, 173, false, "", true),
-      new PokemonForm("Ruby Cream", "ruby-cream", Type.FAIRY, null, 0.3, 0.5, Abilities.SWEET_VEIL, Abilities.NONE, Abilities.AROMA_VEIL, 495, 65, 60, 75, 110, 121, 64, 100, 50, 173, false, null, true),
-      new PokemonForm("Matcha Cream", "matcha-cream", Type.FAIRY, null, 0.3, 0.5, Abilities.SWEET_VEIL, Abilities.NONE, Abilities.AROMA_VEIL, 495, 65, 60, 75, 110, 121, 64, 100, 50, 173, false, null, true),
-      new PokemonForm("Mint Cream", "mint-cream", Type.FAIRY, null, 0.3, 0.5, Abilities.SWEET_VEIL, Abilities.NONE, Abilities.AROMA_VEIL, 495, 65, 60, 75, 110, 121, 64, 100, 50, 173, false, null, true),
-      new PokemonForm("Lemon Cream", "lemon-cream", Type.FAIRY, null, 0.3, 0.5, Abilities.SWEET_VEIL, Abilities.NONE, Abilities.AROMA_VEIL, 495, 65, 60, 75, 110, 121, 64, 100, 50, 173, false, null, true),
-      new PokemonForm("Salted Cream", "salted-cream", Type.FAIRY, null, 0.3, 0.5, Abilities.SWEET_VEIL, Abilities.NONE, Abilities.AROMA_VEIL, 495, 65, 60, 75, 110, 121, 64, 100, 50, 173, false, null, true),
-      new PokemonForm("Ruby Swirl", "ruby-swirl", Type.FAIRY, null, 0.3, 0.5, Abilities.SWEET_VEIL, Abilities.NONE, Abilities.AROMA_VEIL, 495, 65, 60, 75, 110, 121, 64, 100, 50, 173, false, null, true),
-      new PokemonForm("Caramel Swirl", "caramel-swirl", Type.FAIRY, null, 0.3, 0.5, Abilities.SWEET_VEIL, Abilities.NONE, Abilities.AROMA_VEIL, 495, 65, 60, 75, 110, 121, 64, 100, 50, 173, false, null, true),
-      new PokemonForm("Rainbow Swirl", "rainbow-swirl", Type.FAIRY, null, 0.3, 0.5, Abilities.SWEET_VEIL, Abilities.NONE, Abilities.AROMA_VEIL, 495, 65, 60, 75, 110, 121, 64, 100, 50, 173, false, null, true),
-      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.FAIRY, null, 30, 999.9, Abilities.MISTY_SURGE, Abilities.NONE, Abilities.MISTY_SURGE, 595, 135, 60, 75, 130, 131, 64, 100, 50, 173),
-    ),
-    new PokemonSpecies(Species.FALINKS, 8, false, false, false, "Formation Pokémon", Type.FIGHTING, null, 3, 62, Abilities.BATTLE_ARMOR, Abilities.NONE, Abilities.DEFIANT, 470, 65, 100, 100, 70, 60, 75, 45, 50, 165, GrowthRate.MEDIUM_FAST, null, false),
-    new PokemonSpecies(Species.PINCURCHIN, 8, false, false, false, "Sea Urchin Pokémon", Type.ELECTRIC, null, 0.3, 1, Abilities.LIGHTNING_ROD, Abilities.NONE, Abilities.ELECTRIC_SURGE, 435, 48, 101, 95, 91, 85, 15, 75, 50, 152, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.SNOM, 8, false, false, false, "Worm Pokémon", Type.ICE, Type.BUG, 0.3, 3.8, Abilities.SHIELD_DUST, Abilities.NONE, Abilities.ICE_SCALES, 185, 30, 25, 35, 45, 30, 20, 190, 50, 37, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.FROSMOTH, 8, false, false, false, "Frost Moth Pokémon", Type.ICE, Type.BUG, 1.3, 42, Abilities.SHIELD_DUST, Abilities.NONE, Abilities.ICE_SCALES, 475, 70, 65, 60, 125, 90, 65, 75, 50, 166, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.STONJOURNER, 8, false, false, false, "Big Rock Pokémon", Type.ROCK, null, 2.5, 520, Abilities.POWER_SPOT, Abilities.NONE, Abilities.NONE, 470, 100, 125, 135, 20, 20, 70, 60, 50, 165, GrowthRate.SLOW, 50, false),
-    new PokemonSpecies(Species.EISCUE, 8, false, false, false, "Penguin Pokémon", Type.ICE, null, 1.4, 89, Abilities.ICE_FACE, Abilities.NONE, Abilities.NONE, 470, 75, 80, 110, 65, 90, 50, 60, 50, 165, GrowthRate.SLOW, 50, false, false,
-      new PokemonForm("Ice Face", "", Type.ICE, null, 1.4, 89, Abilities.ICE_FACE, Abilities.NONE, Abilities.NONE, 470, 75, 80, 110, 65, 90, 50, 60, 50, 165, false, null, true),
-      new PokemonForm("No Ice", "no-ice", Type.ICE, null, 1.4, 89, Abilities.ICE_FACE, Abilities.NONE, Abilities.NONE, 470, 75, 80, 70, 65, 50, 130, 60, 50, 165),
-    ),
-    new PokemonSpecies(Species.INDEEDEE, 8, false, false, false, "Emotion Pokémon", Type.PSYCHIC, Type.NORMAL, 0.9, 28, Abilities.INNER_FOCUS, Abilities.SYNCHRONIZE, Abilities.PSYCHIC_SURGE, 475, 60, 65, 55, 105, 95, 95, 30, 140, 166, GrowthRate.FAST, 50, false, false,
-      new PokemonForm("Male", "male", Type.PSYCHIC, Type.NORMAL, 0.9, 28, Abilities.INNER_FOCUS, Abilities.SYNCHRONIZE, Abilities.PSYCHIC_SURGE, 475, 60, 65, 55, 105, 95, 95, 30, 140, 166, false, "", true),
-      new PokemonForm("Female", "female", Type.PSYCHIC, Type.NORMAL, 0.9, 28, Abilities.OWN_TEMPO, Abilities.SYNCHRONIZE, Abilities.PSYCHIC_SURGE, 475, 70, 55, 65, 95, 105, 85, 30, 140, 166, false, null, true),
-    ),
-    new PokemonSpecies(Species.MORPEKO, 8, false, false, false, "Two-Sided Pokémon", Type.ELECTRIC, Type.DARK, 0.3, 3, Abilities.HUNGER_SWITCH, Abilities.NONE, Abilities.NONE, 436, 58, 95, 58, 70, 58, 97, 180, 50, 153, GrowthRate.MEDIUM_FAST, 50, false, false,
-      new PokemonForm("Full Belly Mode", "full-belly", Type.ELECTRIC, Type.DARK, 0.3, 3, Abilities.HUNGER_SWITCH, Abilities.NONE, Abilities.NONE, 436, 58, 95, 58, 70, 58, 97, 180, 50, 153, false, "", true),
-      new PokemonForm("Hangry Mode", "hangry", Type.ELECTRIC, Type.DARK, 0.3, 3, Abilities.HUNGER_SWITCH, Abilities.NONE, Abilities.NONE, 436, 58, 95, 58, 70, 58, 97, 180, 50, 153),
-    ),
-    new PokemonSpecies(Species.CUFANT, 8, false, false, false, "Copperderm Pokémon", Type.STEEL, null, 1.2, 100, Abilities.SHEER_FORCE, Abilities.NONE, Abilities.HEAVY_METAL, 330, 72, 80, 49, 40, 49, 40, 190, 50, 66, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.COPPERAJAH, 8, false, false, false, "Copperderm Pokémon", Type.STEEL, null, 3, 650, Abilities.SHEER_FORCE, Abilities.NONE, Abilities.HEAVY_METAL, 500, 122, 130, 69, 80, 69, 30, 90, 50, 175, GrowthRate.MEDIUM_FAST, 50, false, true,
-      new PokemonForm("Normal", "", Type.STEEL, null, 3, 650, Abilities.SHEER_FORCE, Abilities.NONE, Abilities.HEAVY_METAL, 500, 122, 130, 69, 80, 69, 30, 90, 50, 175, false, null, true),
-      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.STEEL, Type.GROUND, 23, 999.9, Abilities.MOLD_BREAKER, Abilities.NONE, Abilities.MOLD_BREAKER, 600, 167, 155, 89, 80, 89, 20, 90, 50, 175),
-    ),
-    new PokemonSpecies(Species.DRACOZOLT, 8, false, false, false, "Fossil Pokémon", Type.ELECTRIC, Type.DRAGON, 1.8, 190, Abilities.VOLT_ABSORB, Abilities.HUSTLE, Abilities.SAND_RUSH, 505, 90, 100, 90, 80, 70, 75, 45, 50, 177, GrowthRate.SLOW, null, false),
-    new PokemonSpecies(Species.ARCTOZOLT, 8, false, false, false, "Fossil Pokémon", Type.ELECTRIC, Type.ICE, 2.3, 150, Abilities.VOLT_ABSORB, Abilities.STATIC, Abilities.SLUSH_RUSH, 505, 90, 100, 90, 90, 80, 55, 45, 50, 177, GrowthRate.SLOW, null, false),
-    new PokemonSpecies(Species.DRACOVISH, 8, false, false, false, "Fossil Pokémon", Type.WATER, Type.DRAGON, 2.3, 215, Abilities.WATER_ABSORB, Abilities.STRONG_JAW, Abilities.SAND_RUSH, 505, 90, 90, 100, 70, 80, 75, 45, 50, 177, GrowthRate.SLOW, null, false),
-    new PokemonSpecies(Species.ARCTOVISH, 8, false, false, false, "Fossil Pokémon", Type.WATER, Type.ICE, 2, 175, Abilities.WATER_ABSORB, Abilities.ICE_BODY, Abilities.SLUSH_RUSH, 505, 90, 90, 100, 80, 90, 55, 45, 50, 177, GrowthRate.SLOW, null, false),
-    new PokemonSpecies(Species.DURALUDON, 8, false, false, false, "Alloy Pokémon", Type.STEEL, Type.DRAGON, 1.8, 40, Abilities.LIGHT_METAL, Abilities.HEAVY_METAL, Abilities.STALWART, 535, 70, 95, 115, 120, 50, 85, 45, 50, 187, GrowthRate.MEDIUM_FAST, 50, false, true,
-      new PokemonForm("Normal", "", Type.STEEL, Type.DRAGON, 1.8, 40, Abilities.LIGHT_METAL, Abilities.HEAVY_METAL, Abilities.STALWART, 535, 70, 95, 115, 120, 50, 85, 45, 50, 187, false, null, true),
-      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.STEEL, Type.DRAGON, 43, 999.9, Abilities.LIGHTNING_ROD, Abilities.LIGHTNING_ROD, Abilities.LIGHTNING_ROD, 635, 100, 110, 120, 175, 60, 70, 45, 50, 187),
-    ),
-    new PokemonSpecies(Species.DREEPY, 8, false, false, false, "Lingering Pokémon", Type.DRAGON, Type.GHOST, 0.5, 2, Abilities.CLEAR_BODY, Abilities.INFILTRATOR, Abilities.CURSED_BODY, 270, 28, 60, 30, 40, 30, 82, 45, 50, 54, GrowthRate.SLOW, 50, false),
-    new PokemonSpecies(Species.DRAKLOAK, 8, false, false, false, "Caretaker Pokémon", Type.DRAGON, Type.GHOST, 1.4, 11, Abilities.CLEAR_BODY, Abilities.INFILTRATOR, Abilities.CURSED_BODY, 410, 68, 80, 50, 60, 50, 102, 45, 50, 144, GrowthRate.SLOW, 50, false),
-    new PokemonSpecies(Species.DRAGAPULT, 8, false, false, false, "Stealth Pokémon", Type.DRAGON, Type.GHOST, 3, 50, Abilities.CLEAR_BODY, Abilities.INFILTRATOR, Abilities.CURSED_BODY, 600, 88, 120, 75, 100, 75, 142, 45, 50, 300, GrowthRate.SLOW, 50, false),
-    new PokemonSpecies(Species.ZACIAN, 8, false, true, false, "Warrior Pokémon", Type.FAIRY, null, 2.8, 110, Abilities.INTREPID_SWORD, Abilities.NONE, Abilities.NONE, 660, 92, 120, 115, 80, 115, 138, 10, 0, 335, GrowthRate.SLOW, null, false, false,
-      new PokemonForm("Hero of Many Battles", "hero-of-many-battles", Type.FAIRY, null, 2.8, 110, Abilities.INTREPID_SWORD, Abilities.NONE, Abilities.NONE, 660, 92, 120, 115, 80, 115, 138, 10, 0, 335, false, "", true),
-      new PokemonForm("Crowned", "crowned", Type.FAIRY, Type.STEEL, 2.8, 355, Abilities.INTREPID_SWORD, Abilities.NONE, Abilities.NONE, 700, 92, 150, 115, 80, 115, 148, 10, 0, 360),
-    ),
-    new PokemonSpecies(Species.ZAMAZENTA, 8, false, true, false, "Warrior Pokémon", Type.FIGHTING, null, 2.9, 210, Abilities.DAUNTLESS_SHIELD, Abilities.NONE, Abilities.NONE, 660, 92, 120, 115, 80, 115, 138, 10, 0, 335, GrowthRate.SLOW, null, false, false,
-      new PokemonForm("Hero of Many Battles", "hero-of-many-battles", Type.FIGHTING, null, 2.9, 210, Abilities.DAUNTLESS_SHIELD, Abilities.NONE, Abilities.NONE, 660, 92, 120, 115, 80, 115, 138, 10, 0, 335, false, "", true),
-      new PokemonForm("Crowned", "crowned", Type.FIGHTING, Type.STEEL, 2.9, 785, Abilities.DAUNTLESS_SHIELD, Abilities.NONE, Abilities.NONE, 700, 92, 120, 140, 80, 140, 128, 10, 0, 360),
-    ),
-    new PokemonSpecies(Species.ETERNATUS, 8, false, true, false, "Gigantic Pokémon", Type.POISON, Type.DRAGON, 20, 950, Abilities.PRESSURE, Abilities.NONE, Abilities.NONE, 690, 140, 85, 95, 145, 95, 130, 255, 0, 345, GrowthRate.SLOW, null, false, true,
-      new PokemonForm("Normal", "", Type.POISON, Type.DRAGON, 20, 950, Abilities.PRESSURE, Abilities.NONE, Abilities.NONE, 690, 140, 85, 95, 145, 95, 130, 255, 0, 345, false, null, true),
-      new PokemonForm("E-Max", "eternamax", Type.POISON, Type.DRAGON, 100, 999.9, Abilities.PRESSURE, Abilities.NONE, Abilities.NONE, 1125, 255, 115, 250, 125, 250, 130, 255, 0, 345),
-    ),
-    new PokemonSpecies(Species.KUBFU, 8, true, false, false, "Wushu Pokémon", Type.FIGHTING, null, 0.6, 12, Abilities.INNER_FOCUS, Abilities.NONE, Abilities.NONE, 385, 60, 90, 60, 53, 50, 72, 3, 50, 77, GrowthRate.SLOW, 87.5, false),
-    new PokemonSpecies(Species.URSHIFU, 8, true, false, false, "Wushu Pokémon", Type.FIGHTING, Type.DARK, 1.9, 105, Abilities.UNSEEN_FIST, Abilities.NONE, Abilities.NONE, 550, 100, 130, 100, 63, 60, 97, 3, 50, 275, GrowthRate.SLOW, 87.5, false, true,
-      new PokemonForm("Single Strike Style", "single-strike", Type.FIGHTING, Type.DARK, 1.9, 105, Abilities.UNSEEN_FIST, Abilities.NONE, Abilities.NONE, 550, 100, 130, 100, 63, 60, 97, 3, 50, 275, false, "", true),
-      new PokemonForm("Rapid Strike Style", "rapid-strike", Type.FIGHTING, Type.WATER, 1.9, 105, Abilities.UNSEEN_FIST, Abilities.NONE, Abilities.NONE, 550, 100, 130, 100, 63, 60, 97, 3, 50, 275, false, null, true),
-      new PokemonForm("G-Max Single Strike Style", SpeciesFormKey.GIGANTAMAX_SINGLE, Type.FIGHTING, Type.DARK, 29, 999.9, Abilities.UNSEEN_FIST, Abilities.NONE, Abilities.NONE, 650, 125, 150, 115, 73, 70, 117, 3, 50, 275),
-      new PokemonForm("G-Max Rapid Strike Style", SpeciesFormKey.GIGANTAMAX_RAPID, Type.FIGHTING, Type.WATER, 26, 999.9, Abilities.UNSEEN_FIST, Abilities.NONE, Abilities.NONE, 650, 125, 150, 115, 73, 70, 117, 3, 50, 275),
-    ),
-    new PokemonSpecies(Species.ZARUDE, 8, false, false, true, "Rogue Monkey Pokémon", Type.DARK, Type.GRASS, 1.8, 70, Abilities.LEAF_GUARD, Abilities.NONE, Abilities.NONE, 600, 105, 120, 105, 70, 95, 105, 3, 0, 300, GrowthRate.SLOW, null, false, false,
-      new PokemonForm("Normal", "", Type.DARK, Type.GRASS, 1.8, 70, Abilities.LEAF_GUARD, Abilities.NONE, Abilities.NONE, 600, 105, 120, 105, 70, 95, 105, 3, 0, 300, false, null, true),
-      new PokemonForm("Dada", "dada", Type.DARK, Type.GRASS, 1.8, 70, Abilities.LEAF_GUARD, Abilities.NONE, Abilities.NONE, 600, 105, 120, 105, 70, 95, 105, 3, 0, 300, false, null, true),
-    ),
-    new PokemonSpecies(Species.REGIELEKI, 8, true, false, false, "Electron Pokémon", Type.ELECTRIC, null, 1.2, 145, Abilities.TRANSISTOR, Abilities.NONE, Abilities.NONE, 580, 80, 100, 50, 100, 50, 200, 3, 35, 290, GrowthRate.SLOW, null, false),
-    new PokemonSpecies(Species.REGIDRAGO, 8, true, false, false, "Dragon Orb Pokémon", Type.DRAGON, null, 2.1, 200, Abilities.DRAGONS_MAW, Abilities.NONE, Abilities.NONE, 580, 200, 100, 50, 100, 50, 80, 3, 35, 290, GrowthRate.SLOW, null, false),
-    new PokemonSpecies(Species.GLASTRIER, 8, true, false, false, "Wild Horse Pokémon", Type.ICE, null, 2.2, 800, Abilities.CHILLING_NEIGH, Abilities.NONE, Abilities.NONE, 580, 100, 145, 130, 65, 110, 30, 3, 35, 290, GrowthRate.SLOW, null, false),
-    new PokemonSpecies(Species.SPECTRIER, 8, true, false, false, "Swift Horse Pokémon", Type.GHOST, null, 2, 44.5, Abilities.GRIM_NEIGH, Abilities.NONE, Abilities.NONE, 580, 100, 65, 60, 145, 80, 130, 3, 35, 290, GrowthRate.SLOW, null, false),
-    new PokemonSpecies(Species.CALYREX, 8, false, true, false, "King Pokémon", Type.PSYCHIC, Type.GRASS, 1.1, 7.7, Abilities.UNNERVE, Abilities.NONE, Abilities.NONE, 500, 100, 80, 80, 80, 80, 80, 3, 100, 250, GrowthRate.SLOW, null, false, true,
-      new PokemonForm("Normal", "", Type.PSYCHIC, Type.GRASS, 1.1, 7.7, Abilities.UNNERVE, Abilities.NONE, Abilities.NONE, 500, 100, 80, 80, 80, 80, 80, 3, 100, 250, false, null, true),
-      new PokemonForm("Ice", "ice", Type.PSYCHIC, Type.ICE, 2.4, 809.1, Abilities.AS_ONE_GLASTRIER, Abilities.NONE, Abilities.NONE, 680, 100, 165, 150, 85, 130, 50, 3, 100, 340),
-      new PokemonForm("Shadow", "shadow", Type.PSYCHIC, Type.GHOST, 2.4, 53.6, Abilities.AS_ONE_SPECTRIER, Abilities.NONE, Abilities.NONE, 680, 100, 85, 80, 165, 100, 150, 3, 100, 340),
-    ),
-    new PokemonSpecies(Species.WYRDEER, 8, false, false, false, "Big Horn Pokémon", Type.NORMAL, Type.PSYCHIC, 1.8, 95.1, Abilities.INTIMIDATE, Abilities.FRISK, Abilities.SAP_SIPPER, 525, 103, 105, 72, 105, 75, 65, 135, 50, 263, GrowthRate.SLOW, 50, false),
-    new PokemonSpecies(Species.KLEAVOR, 8, false, false, false, "Axe Pokémon", Type.BUG, Type.ROCK, 1.8, 89, Abilities.SWARM, Abilities.SHEER_FORCE, Abilities.SHARPNESS, 500, 70, 135, 95, 45, 70, 85, 115, 50, 175, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.URSALUNA, 8, false, false, false, "Peat Pokémon", Type.GROUND, Type.NORMAL, 2.4, 290, Abilities.GUTS, Abilities.BULLETPROOF, Abilities.UNNERVE, 550, 130, 140, 105, 45, 80, 50, 75, 50, 275, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.BASCULEGION, 8, false, false, false, "Big Fish Pokémon", Type.WATER, Type.GHOST, 3, 110, Abilities.SWIFT_SWIM, Abilities.ADAPTABILITY, Abilities.MOLD_BREAKER, 530, 120, 112, 65, 80, 75, 78, 135, 50, 265, GrowthRate.MEDIUM_FAST, 50, false, false,
-      new PokemonForm("Male", "male", Type.WATER, Type.GHOST, 3, 110, Abilities.SWIFT_SWIM, Abilities.ADAPTABILITY, Abilities.MOLD_BREAKER, 530, 120, 112, 65, 80, 75, 78, 135, 50, 265, false, "", true),
-      new PokemonForm("Female", "female", Type.WATER, Type.GHOST, 3, 110, Abilities.SWIFT_SWIM, Abilities.ADAPTABILITY, Abilities.MOLD_BREAKER, 530, 120, 92, 65, 100, 75, 78, 135, 50, 265, false, null, true),
-    ),
-    new PokemonSpecies(Species.SNEASLER, 8, false, false, false, "Free Climb Pokémon", Type.FIGHTING, Type.POISON, 1.3, 43, Abilities.PRESSURE, Abilities.UNBURDEN, Abilities.POISON_TOUCH, 510, 80, 130, 60, 40, 80, 120, 135, 50, 102, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.OVERQWIL, 8, false, false, false, "Pin Cluster Pokémon", Type.DARK, Type.POISON, 2.5, 60.5, Abilities.POISON_POINT, Abilities.SWIFT_SWIM, Abilities.INTIMIDATE, 510, 85, 115, 95, 65, 65, 85, 135, 50, 179, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.ENAMORUS, 8, true, false, false, "Love-Hate Pokémon", Type.FAIRY, Type.FLYING, 1.6, 48, Abilities.CUTE_CHARM, Abilities.NONE, Abilities.CONTRARY, 580, 74, 115, 70, 135, 80, 106, 3, 50, 116, GrowthRate.SLOW, 0, false, true,
-      new PokemonForm("Incarnate Forme", "incarnate", Type.FAIRY, Type.FLYING, 1.6, 48, Abilities.CUTE_CHARM, Abilities.NONE, Abilities.CONTRARY, 580, 74, 115, 70, 135, 80, 106, 3, 50, 116, false, null, true),
-      new PokemonForm("Therian Forme", "therian", Type.FAIRY, Type.FLYING, 1.6, 48, Abilities.OVERCOAT, Abilities.NONE, Abilities.OVERCOAT, 580, 74, 115, 110, 135, 100, 46, 3, 50, 116),
-    ),
-    new PokemonSpecies(Species.SPRIGATITO, 9, false, false, false, "Grass Cat Pokémon", Type.GRASS, null, 0.4, 4.1, Abilities.OVERGROW, Abilities.NONE, Abilities.PROTEAN, 310, 40, 61, 54, 45, 45, 65, 45, 50, 62, GrowthRate.MEDIUM_SLOW, 87.5, false),
-    new PokemonSpecies(Species.FLORAGATO, 9, false, false, false, "Grass Cat Pokémon", Type.GRASS, null, 0.9, 12.2, Abilities.OVERGROW, Abilities.NONE, Abilities.PROTEAN, 410, 61, 80, 63, 60, 63, 83, 45, 50, 144, GrowthRate.MEDIUM_SLOW, 87.5, false),
-    new PokemonSpecies(Species.MEOWSCARADA, 9, false, false, false, "Magician Pokémon", Type.GRASS, Type.DARK, 1.5, 31.2, Abilities.OVERGROW, Abilities.NONE, Abilities.PROTEAN, 530, 76, 110, 70, 81, 70, 123, 45, 50, 265, GrowthRate.MEDIUM_SLOW, 87.5, false),
-    new PokemonSpecies(Species.FUECOCO, 9, false, false, false, "Fire Croc Pokémon", Type.FIRE, null, 0.4, 9.8, Abilities.BLAZE, Abilities.NONE, Abilities.UNAWARE, 310, 67, 45, 59, 63, 40, 36, 45, 50, 62, GrowthRate.MEDIUM_SLOW, 87.5, false),
-    new PokemonSpecies(Species.CROCALOR, 9, false, false, false, "Fire Croc Pokémon", Type.FIRE, null, 1, 30.7, Abilities.BLAZE, Abilities.NONE, Abilities.UNAWARE, 411, 81, 55, 78, 90, 58, 49, 45, 50, 144, GrowthRate.MEDIUM_SLOW, 87.5, false),
-    new PokemonSpecies(Species.SKELEDIRGE, 9, false, false, false, "Singer Pokémon", Type.FIRE, Type.GHOST, 1.6, 326.5, Abilities.BLAZE, Abilities.NONE, Abilities.UNAWARE, 530, 104, 75, 100, 110, 75, 66, 45, 50, 265, GrowthRate.MEDIUM_SLOW, 87.5, false),
-    new PokemonSpecies(Species.QUAXLY, 9, false, false, false, "Duckling Pokémon", Type.WATER, null, 0.5, 6.1, Abilities.TORRENT, Abilities.NONE, Abilities.MOXIE, 310, 55, 65, 45, 50, 45, 50, 45, 50, 62, GrowthRate.MEDIUM_SLOW, 87.5, false),
-    new PokemonSpecies(Species.QUAXWELL, 9, false, false, false, "Practicing Pokémon", Type.WATER, null, 1.2, 21.5, Abilities.TORRENT, Abilities.NONE, Abilities.MOXIE, 410, 70, 85, 65, 65, 60, 65, 45, 50, 144, GrowthRate.MEDIUM_SLOW, 87.5, false),
-    new PokemonSpecies(Species.QUAQUAVAL, 9, false, false, false, "Dancer Pokémon", Type.WATER, Type.FIGHTING, 1.8, 61.9, Abilities.TORRENT, Abilities.NONE, Abilities.MOXIE, 530, 85, 120, 80, 85, 75, 85, 45, 50, 265, GrowthRate.MEDIUM_SLOW, 87.5, false),
-    new PokemonSpecies(Species.LECHONK, 9, false, false, false, "Hog Pokémon", Type.NORMAL, null, 0.5, 10.2, Abilities.AROMA_VEIL, Abilities.GLUTTONY, Abilities.THICK_FAT, 254, 54, 45, 40, 35, 45, 35, 255, 50, 51, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.OINKOLOGNE, 9, false, false, false, "Hog Pokémon", Type.NORMAL, null, 1, 120, Abilities.LINGERING_AROMA, Abilities.GLUTTONY, Abilities.THICK_FAT, 489, 110, 100, 75, 59, 80, 65, 100, 50, 171, GrowthRate.MEDIUM_FAST, 50, false, false,
-      new PokemonForm("Male", "male", Type.NORMAL, null, 1, 120, Abilities.LINGERING_AROMA, Abilities.GLUTTONY, Abilities.THICK_FAT, 489, 110, 100, 75, 59, 80, 65, 100, 50, 171, false, "", true),
-      new PokemonForm("Female", "female", Type.NORMAL, null, 1, 120, Abilities.AROMA_VEIL, Abilities.GLUTTONY, Abilities.THICK_FAT, 489, 115, 90, 70, 59, 90, 65, 100, 50, 171, false, null, true),
-    ),
-    new PokemonSpecies(Species.TAROUNTULA, 9, false, false, false, "String Ball Pokémon", Type.BUG, null, 0.3, 4, Abilities.INSOMNIA, Abilities.NONE, Abilities.STAKEOUT, 210, 35, 41, 45, 29, 40, 20, 255, 50, 42, GrowthRate.ERRATIC, 50, false),
-    new PokemonSpecies(Species.SPIDOPS, 9, false, false, false, "Trap Pokémon", Type.BUG, null, 1, 16.5, Abilities.INSOMNIA, Abilities.NONE, Abilities.STAKEOUT, 404, 60, 79, 92, 52, 86, 35, 120, 50, 141, GrowthRate.ERRATIC, 50, false),
-    new PokemonSpecies(Species.NYMBLE, 9, false, false, false, "Grasshopper Pokémon", Type.BUG, null, 0.2, 1, Abilities.SWARM, Abilities.NONE, Abilities.TINTED_LENS, 210, 33, 46, 40, 21, 25, 45, 190, 20, 42, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.LOKIX, 9, false, false, false, "Grasshopper Pokémon", Type.BUG, Type.DARK, 1, 17.5, Abilities.SWARM, Abilities.NONE, Abilities.TINTED_LENS, 450, 71, 102, 78, 52, 55, 92, 30, 0, 158, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.PAWMI, 9, false, false, false, "Mouse Pokémon", Type.ELECTRIC, null, 0.3, 2.5, Abilities.STATIC, Abilities.NATURAL_CURE, Abilities.IRON_FIST, 240, 45, 50, 20, 40, 25, 60, 190, 50, 48, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.PAWMO, 9, false, false, false, "Mouse Pokémon", Type.ELECTRIC, Type.FIGHTING, 0.4, 6.5, Abilities.VOLT_ABSORB, Abilities.NATURAL_CURE, Abilities.IRON_FIST, 350, 60, 75, 40, 50, 40, 85, 80, 50, 123, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.PAWMOT, 9, false, false, false, "Hands-On Pokémon", Type.ELECTRIC, Type.FIGHTING, 0.9, 41, Abilities.VOLT_ABSORB, Abilities.NATURAL_CURE, Abilities.IRON_FIST, 490, 70, 115, 70, 70, 60, 105, 45, 50, 245, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.TANDEMAUS, 9, false, false, false, "Couple Pokémon", Type.NORMAL, null, 0.3, 1.8, Abilities.RUN_AWAY, Abilities.PICKUP, Abilities.OWN_TEMPO, 305, 50, 50, 45, 40, 45, 75, 150, 50, 61, GrowthRate.FAST, null, false),
-    new PokemonSpecies(Species.MAUSHOLD, 9, false, false, false, "Family Pokémon", Type.NORMAL, null, 0.3, 2.3, Abilities.FRIEND_GUARD, Abilities.CHEEK_POUCH, Abilities.TECHNICIAN, 470, 74, 75, 70, 65, 75, 111, 75, 50, 165, GrowthRate.FAST, null, false, false,
-      new PokemonForm("Family of Four", "four", Type.NORMAL, null, 0.3, 2.8, Abilities.FRIEND_GUARD, Abilities.CHEEK_POUCH, Abilities.TECHNICIAN, 470, 74, 75, 70, 65, 75, 111, 75, 50, 165),
-      new PokemonForm("Family of Three", "three", Type.NORMAL, null, 0.3, 2.3, Abilities.FRIEND_GUARD, Abilities.CHEEK_POUCH, Abilities.TECHNICIAN, 470, 74, 75, 70, 65, 75, 111, 75, 50, 165),
-    ),
-    new PokemonSpecies(Species.FIDOUGH, 9, false, false, false, "Puppy Pokémon", Type.FAIRY, null, 0.3, 10.9, Abilities.OWN_TEMPO, Abilities.NONE, Abilities.KLUTZ, 312, 37, 55, 70, 30, 55, 65, 190, 50, 62, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.DACHSBUN, 9, false, false, false, "Dog Pokémon", Type.FAIRY, null, 0.5, 14.9, Abilities.WELL_BAKED_BODY, Abilities.NONE, Abilities.AROMA_VEIL, 477, 57, 80, 115, 50, 80, 95, 90, 50, 167, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.SMOLIV, 9, false, false, false, "Olive Pokémon", Type.GRASS, Type.NORMAL, 0.3, 6.5, Abilities.EARLY_BIRD, Abilities.NONE, Abilities.HARVEST, 260, 41, 35, 45, 58, 51, 30, 255, 50, 52, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.DOLLIV, 9, false, false, false, "Olive Pokémon", Type.GRASS, Type.NORMAL, 0.6, 11.9, Abilities.EARLY_BIRD, Abilities.NONE, Abilities.HARVEST, 354, 52, 53, 60, 78, 78, 33, 120, 50, 124, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.ARBOLIVA, 9, false, false, false, "Olive Pokémon", Type.GRASS, Type.NORMAL, 1.4, 48.2, Abilities.SEED_SOWER, Abilities.NONE, Abilities.HARVEST, 510, 78, 69, 90, 125, 109, 39, 45, 50, 255, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.SQUAWKABILLY, 9, false, false, false, "Parrot Pokémon", Type.NORMAL, Type.FLYING, 0.6, 2.4, Abilities.INTIMIDATE, Abilities.HUSTLE, Abilities.GUTS, 417, 82, 96, 51, 45, 51, 92, 190, 50, 146, GrowthRate.ERRATIC, 50, false, false,
-      new PokemonForm("Green Plumage", "green-plumage", Type.NORMAL, Type.FLYING, 0.6, 2.4, Abilities.INTIMIDATE, Abilities.HUSTLE, Abilities.GUTS, 417, 82, 96, 51, 45, 51, 92, 190, 50, 146, false, null, true),
-      new PokemonForm("Blue Plumage", "blue-plumage", Type.NORMAL, Type.FLYING, 0.6, 2.4, Abilities.INTIMIDATE, Abilities.HUSTLE, Abilities.GUTS, 417, 82, 96, 51, 45, 51, 92, 190, 50, 146, false, null, true),
-      new PokemonForm("Yellow Plumage", "yellow-plumage", Type.NORMAL, Type.FLYING, 0.6, 2.4, Abilities.INTIMIDATE, Abilities.HUSTLE, Abilities.SHEER_FORCE, 417, 82, 96, 51, 45, 51, 92, 190, 50, 146, false, null, true),
-      new PokemonForm("White Plumage", "white-plumage", Type.NORMAL, Type.FLYING, 0.6, 2.4, Abilities.INTIMIDATE, Abilities.HUSTLE, Abilities.SHEER_FORCE, 417, 82, 96, 51, 45, 51, 92, 190, 50, 146, false, null, true),
-    ),
-    new PokemonSpecies(Species.NACLI, 9, false, false, false, "Rock Salt Pokémon", Type.ROCK, null, 0.4, 16, Abilities.PURIFYING_SALT, Abilities.STURDY, Abilities.CLEAR_BODY, 280, 55, 55, 75, 35, 35, 25, 255, 50, 56, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.NACLSTACK, 9, false, false, false, "Rock Salt Pokémon", Type.ROCK, null, 0.6, 105, Abilities.PURIFYING_SALT, Abilities.STURDY, Abilities.CLEAR_BODY, 355, 60, 60, 100, 35, 65, 35, 120, 50, 124, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.GARGANACL, 9, false, false, false, "Rock Salt Pokémon", Type.ROCK, null, 2.3, 240, Abilities.PURIFYING_SALT, Abilities.STURDY, Abilities.CLEAR_BODY, 500, 100, 100, 130, 45, 90, 35, 45, 50, 250, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.CHARCADET, 9, false, false, false, "Fire Child Pokémon", Type.FIRE, null, 0.6, 10.5, Abilities.FLASH_FIRE, Abilities.NONE, Abilities.FLAME_BODY, 255, 40, 50, 40, 50, 40, 35, 90, 50, 51, GrowthRate.SLOW, 50, false),
-    new PokemonSpecies(Species.ARMAROUGE, 9, false, false, false, "Fire Warrior Pokémon", Type.FIRE, Type.PSYCHIC, 1.5, 85, Abilities.FLASH_FIRE, Abilities.NONE, Abilities.WEAK_ARMOR, 525, 85, 60, 100, 125, 80, 75, 25, 20, 263, GrowthRate.SLOW, 50, false),
-    new PokemonSpecies(Species.CERULEDGE, 9, false, false, false, "Fire Blades Pokémon", Type.FIRE, Type.GHOST, 1.6, 62, Abilities.FLASH_FIRE, Abilities.NONE, Abilities.WEAK_ARMOR, 525, 75, 125, 80, 60, 100, 85, 25, 20, 263, GrowthRate.SLOW, 50, false),
-    new PokemonSpecies(Species.TADBULB, 9, false, false, false, "EleTadpole Pokémon", Type.ELECTRIC, null, 0.3, 0.4, Abilities.OWN_TEMPO, Abilities.STATIC, Abilities.DAMP, 272, 61, 31, 41, 59, 35, 45, 190, 50, 54, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.BELLIBOLT, 9, false, false, false, "EleFrog Pokémon", Type.ELECTRIC, null, 1.2, 113, Abilities.ELECTROMORPHOSIS, Abilities.STATIC, Abilities.DAMP, 495, 109, 64, 91, 103, 83, 45, 50, 50, 173, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.WATTREL, 9, false, false, false, "Storm Petrel Pokémon", Type.ELECTRIC, Type.FLYING, 0.4, 3.6, Abilities.WIND_POWER, Abilities.VOLT_ABSORB, Abilities.COMPETITIVE, 280, 40, 40, 35, 55, 40, 70, 180, 50, 56, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.KILOWATTREL, 9, false, false, false, "Frigatebird Pokémon", Type.ELECTRIC, Type.FLYING, 1.4, 38.6, Abilities.WIND_POWER, Abilities.VOLT_ABSORB, Abilities.COMPETITIVE, 490, 70, 70, 60, 105, 60, 125, 90, 50, 172, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.MASCHIFF, 9, false, false, false, "Rascal Pokémon", Type.DARK, null, 0.5, 16, Abilities.INTIMIDATE, Abilities.RUN_AWAY, Abilities.STAKEOUT, 340, 60, 78, 60, 40, 51, 51, 150, 50, 68, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.MABOSSTIFF, 9, false, false, false, "Boss Pokémon", Type.DARK, null, 1.1, 61, Abilities.INTIMIDATE, Abilities.GUARD_DOG, Abilities.STAKEOUT, 505, 80, 120, 90, 60, 70, 85, 75, 50, 177, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.SHROODLE, 9, false, false, false, "Toxic Mouse Pokémon", Type.POISON, Type.NORMAL, 0.2, 0.7, Abilities.UNBURDEN, Abilities.PICKPOCKET, Abilities.PRANKSTER, 290, 40, 65, 35, 40, 35, 75, 190, 50, 58, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.GRAFAIAI, 9, false, false, false, "Toxic Monkey Pokémon", Type.POISON, Type.NORMAL, 0.7, 27.2, Abilities.UNBURDEN, Abilities.POISON_TOUCH, Abilities.PRANKSTER, 485, 63, 95, 65, 80, 72, 110, 90, 50, 170, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.BRAMBLIN, 9, false, false, false, "Tumbleweed Pokémon", Type.GRASS, Type.GHOST, 0.6, 0.6, Abilities.WIND_RIDER, Abilities.NONE, Abilities.INFILTRATOR, 275, 40, 65, 30, 45, 35, 60, 190, 50, 55, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.BRAMBLEGHAST, 9, false, false, false, "Tumbleweed Pokémon", Type.GRASS, Type.GHOST, 1.2, 6, Abilities.WIND_RIDER, Abilities.NONE, Abilities.INFILTRATOR, 480, 55, 115, 70, 80, 70, 90, 45, 50, 168, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.TOEDSCOOL, 9, false, false, false, "Woodear Pokémon", Type.GROUND, Type.GRASS, 0.9, 33, Abilities.MYCELIUM_MIGHT, Abilities.NONE, Abilities.NONE, 335, 40, 40, 35, 50, 100, 70, 190, 50, 67, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.TOEDSCRUEL, 9, false, false, false, "Woodear Pokémon", Type.GROUND, Type.GRASS, 1.9, 58, Abilities.MYCELIUM_MIGHT, Abilities.NONE, Abilities.NONE, 515, 80, 70, 65, 80, 120, 100, 90, 50, 180, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.KLAWF, 9, false, false, false, "Ambush Pokémon", Type.ROCK, null, 1.3, 79, Abilities.ANGER_SHELL, Abilities.SHELL_ARMOR, Abilities.REGENERATOR, 450, 70, 100, 115, 35, 55, 75, 120, 50, 158, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.CAPSAKID, 9, false, false, false, "Spicy Pepper Pokémon", Type.GRASS, null, 0.3, 3, Abilities.CHLOROPHYLL, Abilities.INSOMNIA, Abilities.KLUTZ, 304, 50, 62, 40, 62, 40, 50, 190, 50, 61, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.SCOVILLAIN, 9, false, false, false, "Spicy Pepper Pokémon", Type.GRASS, Type.FIRE, 0.9, 15, Abilities.CHLOROPHYLL, Abilities.INSOMNIA, Abilities.MOODY, 486, 65, 108, 65, 108, 65, 75, 75, 50, 170, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.RELLOR, 9, false, false, false, "Rolling Pokémon", Type.BUG, null, 0.2, 1, Abilities.COMPOUND_EYES, Abilities.NONE, Abilities.SHED_SKIN, 270, 41, 50, 60, 31, 58, 30, 190, 50, 54, GrowthRate.FAST, 50, false),
-    new PokemonSpecies(Species.RABSCA, 9, false, false, false, "Rolling Pokémon", Type.BUG, Type.PSYCHIC, 0.3, 3.5, Abilities.SYNCHRONIZE, Abilities.NONE, Abilities.TELEPATHY, 470, 75, 50, 85, 115, 100, 45, 45, 50, 165, GrowthRate.FAST, 50, false),
-    new PokemonSpecies(Species.FLITTLE, 9, false, false, false, "Frill Pokémon", Type.PSYCHIC, null, 0.2, 1.5, Abilities.ANTICIPATION, Abilities.FRISK, Abilities.SPEED_BOOST, 255, 30, 35, 30, 55, 30, 75, 120, 50, 51, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.ESPATHRA, 9, false, false, false, "Ostrich Pokémon", Type.PSYCHIC, null, 1.9, 90, Abilities.OPPORTUNIST, Abilities.FRISK, Abilities.SPEED_BOOST, 481, 95, 60, 60, 101, 60, 105, 60, 50, 168, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.TINKATINK, 9, false, false, false, "Metalsmith Pokémon", Type.FAIRY, Type.STEEL, 0.4, 8.9, Abilities.MOLD_BREAKER, Abilities.OWN_TEMPO, Abilities.PICKPOCKET, 297, 50, 45, 45, 35, 64, 58, 190, 50, 59, GrowthRate.MEDIUM_SLOW, 0, false),
-    new PokemonSpecies(Species.TINKATUFF, 9, false, false, false, "Hammer Pokémon", Type.FAIRY, Type.STEEL, 0.7, 59.1, Abilities.MOLD_BREAKER, Abilities.OWN_TEMPO, Abilities.PICKPOCKET, 380, 65, 55, 55, 45, 82, 78, 90, 50, 133, GrowthRate.MEDIUM_SLOW, 0, false),
-    new PokemonSpecies(Species.TINKATON, 9, false, false, false, "Hammer Pokémon", Type.FAIRY, Type.STEEL, 0.7, 112.8, Abilities.MOLD_BREAKER, Abilities.OWN_TEMPO, Abilities.PICKPOCKET, 506, 85, 75, 77, 70, 105, 94, 45, 50, 253, GrowthRate.MEDIUM_SLOW, 0, false),
-    new PokemonSpecies(Species.WIGLETT, 9, false, false, false, "Garden Eel Pokémon", Type.WATER, null, 1.2, 1.8, Abilities.GOOEY, Abilities.RATTLED, Abilities.SAND_VEIL, 245, 10, 55, 25, 35, 25, 95, 255, 50, 49, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.WUGTRIO, 9, false, false, false, "Garden Eel Pokémon", Type.WATER, null, 1.2, 5.4, Abilities.GOOEY, Abilities.RATTLED, Abilities.SAND_VEIL, 425, 35, 100, 50, 50, 70, 120, 50, 50, 149, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.BOMBIRDIER, 9, false, false, false, "Item Drop Pokémon", Type.FLYING, Type.DARK, 1.5, 42.9, Abilities.BIG_PECKS, Abilities.KEEN_EYE, Abilities.ROCKY_PAYLOAD, 485, 70, 103, 85, 60, 85, 82, 25, 50, 243, GrowthRate.SLOW, 50, false),
-    new PokemonSpecies(Species.FINIZEN, 9, false, false, false, "Dolphin Pokémon", Type.WATER, null, 1.3, 60.2, Abilities.WATER_VEIL, Abilities.NONE, Abilities.NONE, 315, 70, 45, 40, 45, 40, 75, 200, 50, 63, GrowthRate.SLOW, 50, false),
-    new PokemonSpecies(Species.PALAFIN, 9, false, false, false, "Dolphin Pokémon", Type.WATER, null, 1.3, 60.2, Abilities.ZERO_TO_HERO, Abilities.NONE, Abilities.NONE, 457, 100, 70, 72, 53, 62, 100, 45, 50, 160, GrowthRate.SLOW, 50, false, true,
-      new PokemonForm("Zero Form", "zero", Type.WATER, null, 1.3, 60.2, Abilities.ZERO_TO_HERO, Abilities.NONE, Abilities.ZERO_TO_HERO, 457, 100, 70, 72, 53, 62, 100, 45, 50, 160, false, null, true),
-      new PokemonForm("Hero Form", "hero", Type.WATER, null, 1.8, 97.4, Abilities.ZERO_TO_HERO, Abilities.NONE, Abilities.ZERO_TO_HERO, 650, 100, 160, 97, 106, 87, 100, 45, 50, 160),
-    ),
-    new PokemonSpecies(Species.VAROOM, 9, false, false, false, "Single-Cyl Pokémon", Type.STEEL, Type.POISON, 1, 35, Abilities.OVERCOAT, Abilities.NONE, Abilities.SLOW_START, 300, 45, 70, 63, 30, 45, 47, 190, 50, 60, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.REVAVROOM, 9, false, false, false, "Multi-Cyl Pokémon", Type.STEEL, Type.POISON, 1.8, 120, Abilities.OVERCOAT, Abilities.NONE, Abilities.FILTER, 500, 80, 119, 90, 54, 67, 90, 75, 50, 175, GrowthRate.MEDIUM_FAST, 50, false, false,
-      new PokemonForm("Normal", "", Type.STEEL, Type.POISON, 1.8, 120, Abilities.OVERCOAT, Abilities.NONE, Abilities.FILTER, 500, 80, 119, 90, 54, 67, 90, 75, 50, 175, false, null, true),
-      new PokemonForm("Segin Starmobile", "segin-starmobile", Type.STEEL, Type.DARK, 1.8, 240, Abilities.INTIMIDATE, Abilities.NONE, Abilities.INTIMIDATE, 600, 110, 129, 100, 77, 79, 105, 75, 50, 175),
-      new PokemonForm("Schedar Starmobile", "schedar-starmobile", Type.STEEL, Type.FIRE, 1.8, 240, Abilities.SPEED_BOOST, Abilities.NONE, Abilities.SPEED_BOOST, 600, 110, 129, 100, 77, 79, 105, 75, 50, 175),
-      new PokemonForm("Navi Starmobile", "navi-starmobile", Type.STEEL, Type.POISON, 1.8, 240, Abilities.TOXIC_DEBRIS, Abilities.NONE, Abilities.TOXIC_DEBRIS, 600, 110, 129, 100, 77, 79, 105, 75, 50, 175),
-      new PokemonForm("Ruchbah Starmobile", "ruchbah-starmobile", Type.STEEL, Type.FAIRY, 1.8, 240, Abilities.MISTY_SURGE, Abilities.NONE, Abilities.MISTY_SURGE, 600, 110, 129, 100, 77, 79, 105, 75, 50, 175),
-      new PokemonForm("Caph Starmobile", "caph-starmobile", Type.STEEL, Type.FIGHTING, 1.8, 240, Abilities.STAMINA, Abilities.NONE, Abilities.STAMINA, 600, 110, 129, 100, 77, 79, 105, 75, 50, 175),
-    ),
-    new PokemonSpecies(Species.CYCLIZAR, 9, false, false, false, "Mount Pokémon", Type.DRAGON, Type.NORMAL, 1.6, 63, Abilities.SHED_SKIN, Abilities.NONE, Abilities.REGENERATOR, 501, 70, 95, 65, 85, 65, 121, 190, 50, 175, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.ORTHWORM, 9, false, false, false, "Earthworm Pokémon", Type.STEEL, null, 2.5, 310, Abilities.EARTH_EATER, Abilities.NONE, Abilities.SAND_VEIL, 480, 70, 85, 145, 60, 55, 65, 25, 50, 240, GrowthRate.SLOW, 50, false),
-    new PokemonSpecies(Species.GLIMMET, 9, false, false, false, "Ore Pokémon", Type.ROCK, Type.POISON, 0.7, 8, Abilities.TOXIC_DEBRIS, Abilities.NONE, Abilities.CORROSION, 350, 48, 35, 42, 105, 60, 60, 70, 50, 70, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.GLIMMORA, 9, false, false, false, "Ore Pokémon", Type.ROCK, Type.POISON, 1.5, 45, Abilities.TOXIC_DEBRIS, Abilities.NONE, Abilities.CORROSION, 525, 83, 55, 90, 130, 81, 86, 25, 50, 184, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.GREAVARD, 9, false, false, false, "Ghost Dog Pokémon", Type.GHOST, null, 0.6, 35, Abilities.PICKUP, Abilities.NONE, Abilities.FLUFFY, 290, 50, 61, 60, 30, 55, 34, 120, 50, 58, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.HOUNDSTONE, 9, false, false, false, "Ghost Dog Pokémon", Type.GHOST, null, 2, 15, Abilities.SAND_RUSH, Abilities.NONE, Abilities.FLUFFY, 488, 72, 101, 100, 50, 97, 68, 60, 50, 171, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.FLAMIGO, 9, false, false, false, "Synchronize Pokémon", Type.FLYING, Type.FIGHTING, 1.6, 37, Abilities.SCRAPPY, Abilities.TANGLED_FEET, Abilities.COSTAR, 500, 82, 115, 74, 75, 64, 90, 100, 50, 175, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.CETODDLE, 9, false, false, false, "Terra Whale Pokémon", Type.ICE, null, 1.2, 45, Abilities.THICK_FAT, Abilities.SNOW_CLOAK, Abilities.SHEER_FORCE, 334, 108, 68, 45, 30, 40, 43, 150, 50, 67, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.CETITAN, 9, false, false, false, "Terra Whale Pokémon", Type.ICE, null, 4.5, 700, Abilities.THICK_FAT, Abilities.SLUSH_RUSH, Abilities.SHEER_FORCE, 521, 170, 113, 65, 45, 55, 73, 50, 50, 182, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.VELUZA, 9, false, false, false, "Jettison Pokémon", Type.WATER, Type.PSYCHIC, 2.5, 90, Abilities.MOLD_BREAKER, Abilities.NONE, Abilities.SHARPNESS, 478, 90, 102, 73, 78, 65, 70, 100, 50, 167, GrowthRate.FAST, 50, false),
-    new PokemonSpecies(Species.DONDOZO, 9, false, false, false, "Big Catfish Pokémon", Type.WATER, null, 12, 220, Abilities.UNAWARE, Abilities.OBLIVIOUS, Abilities.WATER_VEIL, 530, 150, 100, 115, 65, 65, 35, 25, 50, 265, GrowthRate.SLOW, 50, false),
-    new PokemonSpecies(Species.TATSUGIRI, 9, false, false, false, "Mimicry Pokémon", Type.DRAGON, Type.WATER, 0.3, 8, Abilities.COMMANDER, Abilities.NONE, Abilities.STORM_DRAIN, 475, 68, 50, 60, 120, 95, 82, 100, 50, 166, GrowthRate.MEDIUM_SLOW, 50, false, false,
-      new PokemonForm("Curly Form", "curly", Type.DRAGON, Type.WATER, 0.3, 8, Abilities.COMMANDER, Abilities.NONE, Abilities.STORM_DRAIN, 475, 68, 50, 60, 120, 95, 82, 100, 50, 166, false, null, true),
-      new PokemonForm("Droopy Form", "droopy", Type.DRAGON, Type.WATER, 0.3, 8, Abilities.COMMANDER, Abilities.NONE, Abilities.STORM_DRAIN, 475, 68, 50, 60, 120, 95, 82, 100, 50, 166, false, null, true),
-      new PokemonForm("Stretchy Form", "stretchy", Type.DRAGON, Type.WATER, 0.3, 8, Abilities.COMMANDER, Abilities.NONE, Abilities.STORM_DRAIN, 475, 68, 50, 60, 120, 95, 82, 100, 50, 166, false, null, true),
-    ),
-    new PokemonSpecies(Species.ANNIHILAPE, 9, false, false, false, "Rage Monkey Pokémon", Type.FIGHTING, Type.GHOST, 1.2, 56, Abilities.VITAL_SPIRIT, Abilities.INNER_FOCUS, Abilities.DEFIANT, 535, 110, 115, 80, 50, 90, 90, 45, 50, 268, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.CLODSIRE, 9, false, false, false, "Spiny Fish Pokémon", Type.POISON, Type.GROUND, 1.8, 223, Abilities.POISON_POINT, Abilities.WATER_ABSORB, Abilities.UNAWARE, 430, 130, 75, 60, 45, 100, 20, 90, 50, 151, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.FARIGIRAF, 9, false, false, false, "Long Neck Pokémon", Type.NORMAL, Type.PSYCHIC, 3.2, 160, Abilities.CUD_CHEW, Abilities.ARMOR_TAIL, Abilities.SAP_SIPPER, 520, 120, 90, 70, 110, 70, 60, 45, 50, 260, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.DUDUNSPARCE, 9, false, false, false, "Land Snake Pokémon", Type.NORMAL, null, 3.6, 39.2, Abilities.SERENE_GRACE, Abilities.RUN_AWAY, Abilities.RATTLED, 520, 125, 100, 80, 85, 75, 55, 45, 50, 182, GrowthRate.MEDIUM_FAST, 50, false, false,
-      new PokemonForm("Two-Segment Form", "two-segment", Type.NORMAL, null, 3.6, 39.2, Abilities.SERENE_GRACE, Abilities.RUN_AWAY, Abilities.RATTLED, 520, 125, 100, 80, 85, 75, 55, 45, 50, 182, false, ""),
-      new PokemonForm("Three-Segment Form", "three-segment", Type.NORMAL, null, 4.5, 47.4, Abilities.SERENE_GRACE, Abilities.RUN_AWAY, Abilities.RATTLED, 520, 125, 100, 80, 85, 75, 55, 45, 50, 182),
-    ),
-    new PokemonSpecies(Species.KINGAMBIT, 9, false, false, false, "Big Blade Pokémon", Type.DARK, Type.STEEL, 2, 120, Abilities.DEFIANT, Abilities.SUPREME_OVERLORD, Abilities.PRESSURE, 550, 100, 135, 120, 60, 85, 50, 25, 50, 275, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.GREAT_TUSK, 9, false, false, false, "Paradox Pokémon", Type.GROUND, Type.FIGHTING, 2.2, 320, Abilities.PROTOSYNTHESIS, Abilities.NONE, Abilities.NONE, 570, 115, 131, 131, 53, 53, 87, 30, 0, 285, GrowthRate.SLOW, null, false),
-    new PokemonSpecies(Species.SCREAM_TAIL, 9, false, false, false, "Paradox Pokémon", Type.FAIRY, Type.PSYCHIC, 1.2, 8, Abilities.PROTOSYNTHESIS, Abilities.NONE, Abilities.NONE, 570, 115, 65, 99, 65, 115, 111, 50, 0, 285, GrowthRate.SLOW, null, false),
-    new PokemonSpecies(Species.BRUTE_BONNET, 9, false, false, false, "Paradox Pokémon", Type.GRASS, Type.DARK, 1.2, 21, Abilities.PROTOSYNTHESIS, Abilities.NONE, Abilities.NONE, 570, 111, 127, 99, 79, 99, 55, 50, 0, 285, GrowthRate.SLOW, null, false),
-    new PokemonSpecies(Species.FLUTTER_MANE, 9, false, false, false, "Paradox Pokémon", Type.GHOST, Type.FAIRY, 1.4, 4, Abilities.PROTOSYNTHESIS, Abilities.NONE, Abilities.NONE, 570, 55, 55, 55, 135, 135, 135, 30, 0, 285, GrowthRate.SLOW, null, false),
-    new PokemonSpecies(Species.SLITHER_WING, 9, false, false, false, "Paradox Pokémon", Type.BUG, Type.FIGHTING, 3.2, 92, Abilities.PROTOSYNTHESIS, Abilities.NONE, Abilities.NONE, 570, 85, 135, 79, 85, 105, 81, 30, 0, 285, GrowthRate.SLOW, null, false),
-    new PokemonSpecies(Species.SANDY_SHOCKS, 9, false, false, false, "Paradox Pokémon", Type.ELECTRIC, Type.GROUND, 2.3, 60, Abilities.PROTOSYNTHESIS, Abilities.NONE, Abilities.NONE, 570, 85, 81, 97, 121, 85, 101, 30, 0, 285, GrowthRate.SLOW, null, false),
-    new PokemonSpecies(Species.IRON_TREADS, 9, false, false, false, "Paradox Pokémon", Type.GROUND, Type.STEEL, 0.9, 240, Abilities.QUARK_DRIVE, Abilities.NONE, Abilities.NONE, 570, 90, 112, 120, 72, 70, 106, 30, 0, 285, GrowthRate.SLOW, null, false),
-    new PokemonSpecies(Species.IRON_BUNDLE, 9, false, false, false, "Paradox Pokémon", Type.ICE, Type.WATER, 0.6, 11, Abilities.QUARK_DRIVE, Abilities.NONE, Abilities.NONE, 570, 56, 80, 114, 124, 60, 136, 50, 0, 285, GrowthRate.SLOW, null, false),
-    new PokemonSpecies(Species.IRON_HANDS, 9, false, false, false, "Paradox Pokémon", Type.FIGHTING, Type.ELECTRIC, 1.8, 380.7, Abilities.QUARK_DRIVE, Abilities.NONE, Abilities.NONE, 570, 154, 140, 108, 50, 68, 50, 50, 0, 285, GrowthRate.SLOW, null, false),
-    new PokemonSpecies(Species.IRON_JUGULIS, 9, false, false, false, "Paradox Pokémon", Type.DARK, Type.FLYING, 1.3, 111, Abilities.QUARK_DRIVE, Abilities.NONE, Abilities.NONE, 570, 94, 80, 86, 122, 80, 108, 30, 0, 285, GrowthRate.SLOW, null, false),
-    new PokemonSpecies(Species.IRON_MOTH, 9, false, false, false, "Paradox Pokémon", Type.FIRE, Type.POISON, 1.2, 36, Abilities.QUARK_DRIVE, Abilities.NONE, Abilities.NONE, 570, 80, 70, 60, 140, 110, 110, 30, 0, 285, GrowthRate.SLOW, null, false),
-    new PokemonSpecies(Species.IRON_THORNS, 9, false, false, false, "Paradox Pokémon", Type.ROCK, Type.ELECTRIC, 1.6, 303, Abilities.QUARK_DRIVE, Abilities.NONE, Abilities.NONE, 570, 100, 134, 110, 70, 84, 72, 30, 0, 285, GrowthRate.SLOW, null, false),
-    new PokemonSpecies(Species.FRIGIBAX, 9, false, false, false, "Ice Fin Pokémon", Type.DRAGON, Type.ICE, 0.5, 17, Abilities.THERMAL_EXCHANGE, Abilities.NONE, Abilities.ICE_BODY, 320, 65, 75, 45, 35, 45, 55, 45, 50, 64, GrowthRate.SLOW, 50, false),
-    new PokemonSpecies(Species.ARCTIBAX, 9, false, false, false, "Ice Fin Pokémon", Type.DRAGON, Type.ICE, 0.8, 30, Abilities.THERMAL_EXCHANGE, Abilities.NONE, Abilities.ICE_BODY, 423, 90, 95, 66, 45, 65, 62, 25, 50, 148, GrowthRate.SLOW, 50, false),
-    new PokemonSpecies(Species.BAXCALIBUR, 9, false, false, false, "Ice Dragon Pokémon", Type.DRAGON, Type.ICE, 2.1, 210, Abilities.THERMAL_EXCHANGE, Abilities.NONE, Abilities.ICE_BODY, 600, 115, 145, 92, 75, 86, 87, 10, 50, 300, GrowthRate.SLOW, 50, false),
-    new PokemonSpecies(Species.GIMMIGHOUL, 9, false, false, false, "Coin Chest Pokémon", Type.GHOST, null, 0.3, 5, Abilities.RATTLED, Abilities.NONE, Abilities.NONE, 300, 45, 30, 70, 75, 70, 10, 45, 50, 60, GrowthRate.SLOW, null, false, false,
-      new PokemonForm("Chest Form", "chest", Type.GHOST, null, 0.3, 5, Abilities.RATTLED, Abilities.NONE, Abilities.NONE, 300, 45, 30, 70, 75, 70, 10, 45, 50, 60, false, "", true),
-      new PokemonForm("Roaming Form", "roaming", Type.GHOST, null, 0.1, 1, Abilities.RUN_AWAY, Abilities.NONE, Abilities.NONE, 300, 45, 30, 25, 75, 45, 80, 45, 50, 60, false, null, true),
-    ),
-    new PokemonSpecies(Species.GHOLDENGO, 9, false, false, false, "Coin Entity Pokémon", Type.STEEL, Type.GHOST, 1.2, 30, Abilities.GOOD_AS_GOLD, Abilities.NONE, Abilities.NONE, 550, 87, 60, 95, 133, 91, 84, 45, 50, 275, GrowthRate.SLOW, null, false),
-    new PokemonSpecies(Species.WO_CHIEN, 9, true, false, false, "Ruinous Pokémon", Type.DARK, Type.GRASS, 1.5, 74.2, Abilities.TABLETS_OF_RUIN, Abilities.NONE, Abilities.NONE, 570, 85, 85, 100, 95, 135, 70, 6, 0, 285, GrowthRate.SLOW, null, false),
-    new PokemonSpecies(Species.CHIEN_PAO, 9, true, false, false, "Ruinous Pokémon", Type.DARK, Type.ICE, 1.9, 152.2, Abilities.SWORD_OF_RUIN, Abilities.NONE, Abilities.NONE, 570, 80, 120, 80, 90, 65, 135, 6, 0, 285, GrowthRate.SLOW, null, false),
-    new PokemonSpecies(Species.TING_LU, 9, true, false, false, "Ruinous Pokémon", Type.DARK, Type.GROUND, 2.7, 699.7, Abilities.VESSEL_OF_RUIN, Abilities.NONE, Abilities.NONE, 570, 155, 110, 125, 55, 80, 45, 6, 0, 285, GrowthRate.SLOW, null, false),
-    new PokemonSpecies(Species.CHI_YU, 9, true, false, false, "Ruinous Pokémon", Type.DARK, Type.FIRE, 0.4, 4.9, Abilities.BEADS_OF_RUIN, Abilities.NONE, Abilities.NONE, 570, 55, 80, 80, 135, 120, 100, 6, 0, 285, GrowthRate.SLOW, null, false),
-    new PokemonSpecies(Species.ROARING_MOON, 9, false, false, false, "Paradox Pokémon", Type.DRAGON, Type.DARK, 2, 380, Abilities.PROTOSYNTHESIS, Abilities.NONE, Abilities.NONE, 590, 105, 139, 71, 55, 101, 119, 10, 0, 295, GrowthRate.SLOW, null, false),
-    new PokemonSpecies(Species.IRON_VALIANT, 9, false, false, false, "Paradox Pokémon", Type.FAIRY, Type.FIGHTING, 1.4, 35, Abilities.QUARK_DRIVE, Abilities.NONE, Abilities.NONE, 590, 74, 130, 90, 120, 60, 116, 10, 0, 295, GrowthRate.SLOW, null, false),
-    new PokemonSpecies(Species.KORAIDON, 9, false, true, false, "Paradox Pokémon", Type.FIGHTING, Type.DRAGON, 2.5, 303, Abilities.ORICHALCUM_PULSE, Abilities.NONE, Abilities.NONE, 670, 100, 135, 115, 85, 100, 135, 3, 0, 335, GrowthRate.SLOW, null, false, false,
-      new PokemonForm("Apex Build", "apex-build", Type.FIGHTING, Type.DRAGON, 2.5, 303, Abilities.ORICHALCUM_PULSE, Abilities.NONE, Abilities.NONE, 670, 100, 135, 115, 85, 100, 135, 3, 0, 335, false, null, true),
-    ),
-    new PokemonSpecies(Species.MIRAIDON, 9, false, true, false, "Paradox Pokémon", Type.ELECTRIC, Type.DRAGON, 3.5, 240, Abilities.HADRON_ENGINE, Abilities.NONE, Abilities.NONE, 670, 100, 85, 100, 135, 115, 135, 3, 0, 335, GrowthRate.SLOW, null, false, false,
-      new PokemonForm("Ultimate Mode", "ultimate-mode", Type.ELECTRIC, Type.DRAGON, 3.5, 240, Abilities.HADRON_ENGINE, Abilities.NONE, Abilities.NONE, 670, 100, 85, 100, 135, 115, 135, 3, 0, 335, false, null, true),
-    ),
-    new PokemonSpecies(Species.WALKING_WAKE, 9, false, false, false, "Paradox Pokémon", Type.WATER, Type.DRAGON, 3.5, 280, Abilities.PROTOSYNTHESIS, Abilities.NONE, Abilities.NONE, 590, 99, 83, 91, 125, 83, 109, 10, 0, 295, GrowthRate.SLOW, null, false), //Custom Catchrate, matching Gouging Fire and Raging Bolt
-    new PokemonSpecies(Species.IRON_LEAVES, 9, false, false, false, "Paradox Pokémon", Type.GRASS, Type.PSYCHIC, 1.5, 125, Abilities.QUARK_DRIVE, Abilities.NONE, Abilities.NONE, 590, 90, 130, 88, 70, 108, 104, 10, 0, 295, GrowthRate.SLOW, null, false), //Custom Catchrate, matching Iron Boulder and Iron Crown
-    new PokemonSpecies(Species.DIPPLIN, 9, false, false, false, "Candy Apple Pokémon", Type.GRASS, Type.DRAGON, 0.4, 9.7, Abilities.SUPERSWEET_SYRUP, Abilities.GLUTTONY, Abilities.STICKY_HOLD, 485, 80, 80, 110, 95, 80, 40, 45, 50, 170, GrowthRate.ERRATIC, 50, false),
-    new PokemonSpecies(Species.POLTCHAGEIST, 9, false, false, false, "Matcha Pokémon", Type.GRASS, Type.GHOST, 0.1, 1.1, Abilities.HOSPITALITY, Abilities.NONE, Abilities.HEATPROOF, 308, 40, 45, 45, 74, 54, 50, 120, 50, 62, GrowthRate.SLOW, null, false, false,
-      new PokemonForm("Counterfeit Form", "counterfeit", Type.GRASS, Type.GHOST, 0.1, 1.1, Abilities.HOSPITALITY, Abilities.NONE, Abilities.HEATPROOF, 308, 40, 45, 45, 74, 54, 50, 120, 50, 62, false, null, true),
-      new PokemonForm("Artisan Form", "artisan", Type.GRASS, Type.GHOST, 0.1, 1.1, Abilities.HOSPITALITY, Abilities.NONE, Abilities.HEATPROOF, 308, 40, 45, 45, 74, 54, 50, 120, 50, 62, false, null, true),
-    ),
-    new PokemonSpecies(Species.SINISTCHA, 9, false, false, false, "Matcha Pokémon", Type.GRASS, Type.GHOST, 0.2, 2.2, Abilities.HOSPITALITY, Abilities.NONE, Abilities.HEATPROOF, 508, 71, 60, 106, 121, 80, 70, 60, 50, 178, GrowthRate.SLOW, null, false, false,
-      new PokemonForm("Unremarkable Form", "unremarkable", Type.GRASS, Type.GHOST, 0.2, 2.2, Abilities.HOSPITALITY, Abilities.NONE, Abilities.HEATPROOF, 508, 71, 60, 106, 121, 80, 70, 60, 50, 178),
-      new PokemonForm("Masterpiece Form", "masterpiece", Type.GRASS, Type.GHOST, 0.2, 2.2, Abilities.HOSPITALITY, Abilities.NONE, Abilities.HEATPROOF, 508, 71, 60, 106, 121, 80, 70, 60, 50, 178),
-    ),
-    new PokemonSpecies(Species.OKIDOGI, 9, true, false, false, "Retainer Pokémon", Type.POISON, Type.FIGHTING, 1.8, 92.2, Abilities.TOXIC_CHAIN, Abilities.NONE, Abilities.GUARD_DOG, 555, 88, 128, 115, 58, 86, 80, 3, 0, 276, GrowthRate.SLOW, 100, false),
-    new PokemonSpecies(Species.MUNKIDORI, 9, true, false, false, "Retainer Pokémon", Type.POISON, Type.PSYCHIC, 1, 12.2, Abilities.TOXIC_CHAIN, Abilities.NONE, Abilities.FRISK, 555, 88, 75, 66, 130, 90, 106, 3, 0, 276, GrowthRate.SLOW, 100, false),
-    new PokemonSpecies(Species.FEZANDIPITI, 9, true, false, false, "Retainer Pokémon", Type.POISON, Type.FAIRY, 1.4, 30.1, Abilities.TOXIC_CHAIN, Abilities.NONE, Abilities.TECHNICIAN, 555, 88, 91, 82, 70, 125, 99, 3, 0, 276, GrowthRate.SLOW, 100, false),
-    new PokemonSpecies(Species.OGERPON, 9, true, false, false, "Mask Pokémon", Type.GRASS, null, 1.2, 39.8, Abilities.DEFIANT, Abilities.NONE, Abilities.NONE, 550, 80, 120, 84, 60, 96, 110, 5, 50, 275, GrowthRate.SLOW, 0, false, false,
-      new PokemonForm("Teal Mask", "teal-mask", Type.GRASS, null, 1.2, 39.8, Abilities.DEFIANT, Abilities.NONE, Abilities.NONE, 550, 80, 120, 84, 60, 96, 110, 5, 50, 275, false, null, true),
-      new PokemonForm("Wellspring Mask", "wellspring-mask", Type.GRASS, Type.WATER, 1.2, 39.8, Abilities.WATER_ABSORB, Abilities.NONE, Abilities.NONE, 550, 80, 120, 84, 60, 96, 110, 5, 50, 275),
-      new PokemonForm("Hearthflame Mask", "hearthflame-mask", Type.GRASS, Type.FIRE, 1.2, 39.8, Abilities.MOLD_BREAKER, Abilities.NONE, Abilities.NONE, 550, 80, 120, 84, 60, 96, 110, 5, 50, 275),
-      new PokemonForm("Cornerstone Mask", "cornerstone-mask", Type.GRASS, Type.ROCK, 1.2, 39.8, Abilities.STURDY, Abilities.NONE, Abilities.NONE, 550, 80, 120, 84, 60, 96, 110, 5, 50, 275),
-      new PokemonForm("Teal Mask Terastallized", "teal-mask-tera", Type.GRASS, null, 1.2, 39.8, Abilities.EMBODY_ASPECT_TEAL, Abilities.NONE, Abilities.NONE, 550, 80, 120, 84, 60, 96, 110, 5, 50, 275),
-      new PokemonForm("Wellspring Mask Terastallized", "wellspring-mask-tera", Type.GRASS, Type.WATER, 1.2, 39.8, Abilities.EMBODY_ASPECT_WELLSPRING, Abilities.NONE, Abilities.NONE, 550, 80, 120, 84, 60, 96, 110, 5, 50, 275),
-      new PokemonForm("Hearthflame Mask Terastallized", "hearthflame-mask-tera", Type.GRASS, Type.FIRE, 1.2, 39.8, Abilities.EMBODY_ASPECT_HEARTHFLAME, Abilities.NONE, Abilities.NONE, 550, 80, 120, 84, 60, 96, 110, 5, 50, 275),
-      new PokemonForm("Cornerstone Mask Terastallized", "cornerstone-mask-tera", Type.GRASS, Type.ROCK, 1.2, 39.8, Abilities.EMBODY_ASPECT_CORNERSTONE, Abilities.NONE, Abilities.NONE, 550, 80, 120, 84, 60, 96, 110, 5, 50, 275),
-    ),
-    new PokemonSpecies(Species.ARCHALUDON, 9, false, false, false, "Alloy Pokémon", Type.STEEL, Type.DRAGON, 2, 60, Abilities.STAMINA, Abilities.STURDY, Abilities.STALWART, 600, 90, 105, 130, 125, 65, 85, 10, 50, 300, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.HYDRAPPLE, 9, false, false, false, "Apple Hydra Pokémon", Type.GRASS, Type.DRAGON, 1.8, 93, Abilities.SUPERSWEET_SYRUP, Abilities.REGENERATOR, Abilities.STICKY_HOLD, 540, 106, 80, 110, 120, 80, 44, 10, 50, 270, GrowthRate.ERRATIC, 50, false),
-    new PokemonSpecies(Species.GOUGING_FIRE, 9, false, false, false, "Paradox Pokémon", Type.FIRE, Type.DRAGON, 3.5, 590, Abilities.PROTOSYNTHESIS, Abilities.NONE, Abilities.NONE, 590, 105, 115, 121, 65, 93, 91, 10, 0, 295, GrowthRate.SLOW, null, false),
-    new PokemonSpecies(Species.RAGING_BOLT, 9, false, false, false, "Paradox Pokémon", Type.ELECTRIC, Type.DRAGON, 5.2, 480, Abilities.PROTOSYNTHESIS, Abilities.NONE, Abilities.NONE, 590, 125, 73, 91, 137, 89, 75, 10, 0, 295, GrowthRate.SLOW, null, false),
-    new PokemonSpecies(Species.IRON_BOULDER, 9, false, false, false, "Paradox Pokémon", Type.ROCK, Type.PSYCHIC, 1.5, 162.5, Abilities.QUARK_DRIVE, Abilities.NONE, Abilities.NONE, 590, 90, 120, 80, 68, 108, 124, 10, 0, 295, GrowthRate.SLOW, null, false),
-    new PokemonSpecies(Species.IRON_CROWN, 9, false, false, false, "Paradox Pokémon", Type.STEEL, Type.PSYCHIC, 1.6, 156, Abilities.QUARK_DRIVE, Abilities.NONE, Abilities.NONE, 590, 90, 72, 100, 122, 108, 98, 10, 0, 295, GrowthRate.SLOW, null, false),
-    new PokemonSpecies(Species.TERAPAGOS, 9, false, true, false, "Tera Pokémon", Type.NORMAL, null, 0.2, 6.5, Abilities.TERA_SHIFT, Abilities.NONE, Abilities.NONE, 450, 90, 65, 85, 65, 85, 60, 5, 50, 90, GrowthRate.SLOW, 50, false, false,
-      new PokemonForm("Normal Form", "", Type.NORMAL, null, 0.2, 6.5, Abilities.TERA_SHIFT, Abilities.NONE, Abilities.NONE, 450, 90, 65, 85, 65, 85, 60, 5, 50, 90, false, null, true),
-      new PokemonForm("Terastal Form", "terastal", Type.NORMAL, null, 0.3, 16, Abilities.TERA_SHELL, Abilities.NONE, Abilities.NONE, 600, 95, 95, 110, 105, 110, 85, 5, 50, 120),
-      new PokemonForm("Stellar Form", "stellar", Type.NORMAL, null, 1.7, 77, Abilities.TERAFORM_ZERO, Abilities.NONE, Abilities.NONE, 700, 160, 105, 110, 130, 110, 85, 5, 50, 140),
-    ),
-    new PokemonSpecies(Species.PECHARUNT, 9, false, false, true, "Subjugation Pokémon", Type.POISON, Type.GHOST, 0.3, 0.3, Abilities.POISON_PUPPETEER, Abilities.NONE, Abilities.NONE, 600, 88, 88, 160, 88, 88, 88, 3, 0, 300, GrowthRate.SLOW, null, false),
-    new PokemonSpecies(Species.ALOLA_RATTATA, 7, false, false, false, "Mouse Pokémon", Type.DARK, Type.NORMAL, 0.3, 3.8, Abilities.GLUTTONY, Abilities.HUSTLE, Abilities.THICK_FAT, 253, 30, 56, 35, 25, 35, 72, 255, 70, 51, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.ALOLA_RATICATE, 7, false, false, false, "Mouse Pokémon", Type.DARK, Type.NORMAL, 0.7, 25.5, Abilities.GLUTTONY, Abilities.HUSTLE, Abilities.THICK_FAT, 413, 75, 71, 70, 40, 80, 77, 127, 70, 145, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.ALOLA_RAICHU, 7, false, false, false, "Mouse Pokémon", Type.ELECTRIC, Type.PSYCHIC, 0.7, 21, Abilities.SURGE_SURFER, Abilities.NONE, Abilities.NONE, 485, 60, 85, 50, 95, 85, 110, 75, 50, 243, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.ALOLA_SANDSHREW, 7, false, false, false, "Mouse Pokémon", Type.ICE, Type.STEEL, 0.7, 40, Abilities.SNOW_CLOAK, Abilities.NONE, Abilities.SLUSH_RUSH, 300, 50, 75, 90, 10, 35, 40, 255, 50, 60, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.ALOLA_SANDSLASH, 7, false, false, false, "Mouse Pokémon", Type.ICE, Type.STEEL, 1.2, 55, Abilities.SNOW_CLOAK, Abilities.NONE, Abilities.SLUSH_RUSH, 450, 75, 100, 120, 25, 65, 65, 90, 50, 158, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.ALOLA_VULPIX, 7, false, false, false, "Fox Pokémon", Type.ICE, null, 0.6, 9.9, Abilities.SNOW_CLOAK, Abilities.NONE, Abilities.SNOW_WARNING, 299, 38, 41, 40, 50, 65, 65, 190, 50, 60, GrowthRate.MEDIUM_FAST, 25, false),
-    new PokemonSpecies(Species.ALOLA_NINETALES, 7, false, false, false, "Fox Pokémon", Type.ICE, Type.FAIRY, 1.1, 19.9, Abilities.SNOW_CLOAK, Abilities.NONE, Abilities.SNOW_WARNING, 505, 73, 67, 75, 81, 100, 109, 75, 50, 177, GrowthRate.MEDIUM_FAST, 25, false),
-    new PokemonSpecies(Species.ALOLA_DIGLETT, 7, false, false, false, "Mole Pokémon", Type.GROUND, Type.STEEL, 0.2, 1, Abilities.SAND_VEIL, Abilities.TANGLING_HAIR, Abilities.SAND_FORCE, 265, 10, 55, 30, 35, 45, 90, 255, 50, 53, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.ALOLA_DUGTRIO, 7, false, false, false, "Mole Pokémon", Type.GROUND, Type.STEEL, 0.7, 66.6, Abilities.SAND_VEIL, Abilities.TANGLING_HAIR, Abilities.SAND_FORCE, 425, 35, 100, 60, 50, 70, 110, 50, 50, 149, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.ALOLA_MEOWTH, 7, false, false, false, "Scratch Cat Pokémon", Type.DARK, null, 0.4, 4.2, Abilities.PICKUP, Abilities.TECHNICIAN, Abilities.RATTLED, 290, 40, 35, 35, 50, 40, 90, 255, 50, 58, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.ALOLA_PERSIAN, 7, false, false, false, "Classy Cat Pokémon", Type.DARK, null, 1.1, 33, Abilities.FUR_COAT, Abilities.TECHNICIAN, Abilities.RATTLED, 440, 65, 60, 60, 75, 65, 115, 90, 50, 154, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.ALOLA_GEODUDE, 7, false, false, false, "Rock Pokémon", Type.ROCK, Type.ELECTRIC, 0.4, 20.3, Abilities.MAGNET_PULL, Abilities.STURDY, Abilities.GALVANIZE, 300, 40, 80, 100, 30, 30, 20, 255, 70, 60, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.ALOLA_GRAVELER, 7, false, false, false, "Rock Pokémon", Type.ROCK, Type.ELECTRIC, 1, 110, Abilities.MAGNET_PULL, Abilities.STURDY, Abilities.GALVANIZE, 390, 55, 95, 115, 45, 45, 35, 120, 70, 137, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.ALOLA_GOLEM, 7, false, false, false, "Megaton Pokémon", Type.ROCK, Type.ELECTRIC, 1.7, 316, Abilities.MAGNET_PULL, Abilities.STURDY, Abilities.GALVANIZE, 495, 80, 120, 130, 55, 65, 45, 45, 70, 223, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.ALOLA_GRIMER, 7, false, false, false, "Sludge Pokémon", Type.POISON, Type.DARK, 0.7, 42, Abilities.POISON_TOUCH, Abilities.GLUTTONY, Abilities.POWER_OF_ALCHEMY, 325, 80, 80, 50, 40, 50, 25, 190, 70, 65, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.ALOLA_MUK, 7, false, false, false, "Sludge Pokémon", Type.POISON, Type.DARK, 1, 52, Abilities.POISON_TOUCH, Abilities.GLUTTONY, Abilities.POWER_OF_ALCHEMY, 500, 105, 105, 75, 65, 100, 50, 75, 70, 175, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.ALOLA_EXEGGUTOR, 7, false, false, false, "Coconut Pokémon", Type.GRASS, Type.DRAGON, 10.9, 415.6, Abilities.FRISK, Abilities.NONE, Abilities.HARVEST, 530, 95, 105, 85, 125, 75, 45, 45, 50, 186, GrowthRate.SLOW, 50, false),
-    new PokemonSpecies(Species.ALOLA_MAROWAK, 7, false, false, false, "Bone Keeper Pokémon", Type.FIRE, Type.GHOST, 1, 34, Abilities.CURSED_BODY, Abilities.LIGHTNING_ROD, Abilities.ROCK_HEAD, 425, 60, 80, 110, 50, 80, 45, 75, 50, 149, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.ETERNAL_FLOETTE, 6, true, false, false, "Single Bloom Pokémon", Type.FAIRY, null, 0.2, 0.9, Abilities.FLOWER_VEIL, Abilities.NONE, Abilities.SYMBIOSIS, 551, 74, 65, 67, 125, 128, 92, 120, 70, 243, GrowthRate.MEDIUM_FAST, 0, false), //Marked as Sub-Legend, for casing purposes
-    new PokemonSpecies(Species.GALAR_MEOWTH, 8, false, false, false, "Scratch Cat Pokémon", Type.STEEL, null, 0.4, 7.5, Abilities.PICKUP, Abilities.TOUGH_CLAWS, Abilities.UNNERVE, 290, 50, 65, 55, 40, 40, 40, 255, 50, 58, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.GALAR_PONYTA, 8, false, false, false, "Fire Horse Pokémon", Type.PSYCHIC, null, 0.8, 24, Abilities.RUN_AWAY, Abilities.PASTEL_VEIL, Abilities.ANTICIPATION, 410, 50, 85, 55, 65, 65, 90, 190, 50, 82, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.GALAR_RAPIDASH, 8, false, false, false, "Fire Horse Pokémon", Type.PSYCHIC, Type.FAIRY, 1.7, 80, Abilities.RUN_AWAY, Abilities.PASTEL_VEIL, Abilities.ANTICIPATION, 500, 65, 100, 70, 80, 80, 105, 60, 50, 175, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.GALAR_SLOWPOKE, 8, false, false, false, "Dopey Pokémon", Type.PSYCHIC, null, 1.2, 36, Abilities.GLUTTONY, Abilities.OWN_TEMPO, Abilities.REGENERATOR, 315, 90, 65, 65, 40, 40, 15, 190, 50, 63, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.GALAR_SLOWBRO, 8, false, false, false, "Hermit Crab Pokémon", Type.POISON, Type.PSYCHIC, 1.6, 70.5, Abilities.QUICK_DRAW, Abilities.OWN_TEMPO, Abilities.REGENERATOR, 490, 95, 100, 95, 100, 70, 30, 75, 50, 172, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.GALAR_FARFETCHD, 8, false, false, false, "Wild Duck Pokémon", Type.FIGHTING, null, 0.8, 42, Abilities.STEADFAST, Abilities.NONE, Abilities.SCRAPPY, 377, 52, 95, 55, 58, 62, 55, 45, 50, 132, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.GALAR_WEEZING, 8, false, false, false, "Poison Gas Pokémon", Type.POISON, Type.FAIRY, 3, 16, Abilities.LEVITATE, Abilities.NEUTRALIZING_GAS, Abilities.MISTY_SURGE, 490, 65, 90, 120, 85, 70, 60, 60, 50, 172, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.GALAR_MR_MIME, 8, false, false, false, "Barrier Pokémon", Type.ICE, Type.PSYCHIC, 1.4, 56.8, Abilities.VITAL_SPIRIT, Abilities.SCREEN_CLEANER, Abilities.ICE_BODY, 460, 50, 65, 65, 90, 90, 100, 45, 50, 161, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.GALAR_ARTICUNO, 8, true, false, false, "Freeze Pokémon", Type.PSYCHIC, Type.FLYING, 1.7, 50.9, Abilities.COMPETITIVE, Abilities.NONE, Abilities.NONE, 580, 90, 85, 85, 125, 100, 95, 3, 35, 290, GrowthRate.SLOW, null, false),
-    new PokemonSpecies(Species.GALAR_ZAPDOS, 8, true, false, false, "Electric Pokémon", Type.FIGHTING, Type.FLYING, 1.6, 58.2, Abilities.DEFIANT, Abilities.NONE, Abilities.NONE, 580, 90, 125, 90, 85, 90, 100, 3, 35, 290, GrowthRate.SLOW, null, false),
-    new PokemonSpecies(Species.GALAR_MOLTRES, 8, true, false, false, "Flame Pokémon", Type.DARK, Type.FLYING, 2, 66, Abilities.BERSERK, Abilities.NONE, Abilities.NONE, 580, 90, 85, 90, 100, 125, 90, 3, 35, 290, GrowthRate.SLOW, null, false),
-    new PokemonSpecies(Species.GALAR_SLOWKING, 8, false, false, false, "Royal Pokémon", Type.POISON, Type.PSYCHIC, 1.8, 79.5, Abilities.CURIOUS_MEDICINE, Abilities.OWN_TEMPO, Abilities.REGENERATOR, 490, 95, 65, 80, 110, 110, 30, 70, 50, 172, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.GALAR_CORSOLA, 8, false, false, false, "Coral Pokémon", Type.GHOST, null, 0.6, 0.5, Abilities.WEAK_ARMOR, Abilities.NONE, Abilities.CURSED_BODY, 410, 60, 55, 100, 65, 100, 30, 60, 50, 144, GrowthRate.FAST, 25, false),
-    new PokemonSpecies(Species.GALAR_ZIGZAGOON, 8, false, false, false, "Tiny Raccoon Pokémon", Type.DARK, Type.NORMAL, 0.4, 17.5, Abilities.PICKUP, Abilities.GLUTTONY, Abilities.QUICK_FEET, 240, 38, 30, 41, 30, 41, 60, 255, 50, 56, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.GALAR_LINOONE, 8, false, false, false, "Rushing Pokémon", Type.DARK, Type.NORMAL, 0.5, 32.5, Abilities.PICKUP, Abilities.GLUTTONY, Abilities.QUICK_FEET, 420, 78, 70, 61, 50, 61, 100, 90, 50, 147, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.GALAR_DARUMAKA, 8, false, false, false, "Zen Charm Pokémon", Type.ICE, null, 0.7, 40, Abilities.HUSTLE, Abilities.NONE, Abilities.INNER_FOCUS, 315, 70, 90, 45, 15, 45, 50, 120, 50, 63, GrowthRate.MEDIUM_SLOW, 50, false),
-    new PokemonSpecies(Species.GALAR_DARMANITAN, 8, false, false, false, "Blazing Pokémon", Type.ICE, null, 1.7, 120, Abilities.GORILLA_TACTICS, Abilities.NONE, Abilities.ZEN_MODE, 480, 105, 140, 55, 30, 55, 95, 60, 50, 168, GrowthRate.MEDIUM_SLOW, 50, false, true,
-      new PokemonForm("Standard Mode", "", Type.ICE, null, 1.7, 120, Abilities.GORILLA_TACTICS, Abilities.NONE, Abilities.ZEN_MODE, 480, 105, 140, 55, 30, 55, 95, 60, 50, 168, false, null, true),
-      new PokemonForm("Zen Mode", "zen", Type.ICE, Type.FIRE, 1.7, 120, Abilities.GORILLA_TACTICS, Abilities.NONE, Abilities.ZEN_MODE, 540, 105, 160, 55, 30, 55, 135, 60, 50, 189),
-    ),
-    new PokemonSpecies(Species.GALAR_YAMASK, 8, false, false, false, "Spirit Pokémon", Type.GROUND, Type.GHOST, 0.5, 1.5, Abilities.WANDERING_SPIRIT, Abilities.NONE, Abilities.NONE, 303, 38, 55, 85, 30, 65, 30, 190, 50, 61, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.GALAR_STUNFISK, 8, false, false, false, "Trap Pokémon", Type.GROUND, Type.STEEL, 0.7, 20.5, Abilities.MIMICRY, Abilities.NONE, Abilities.NONE, 471, 109, 81, 99, 66, 84, 32, 75, 70, 165, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.HISUI_GROWLITHE, 8, false, false, false, "Puppy Pokémon", Type.FIRE, Type.ROCK, 0.8, 22.7, Abilities.INTIMIDATE, Abilities.FLASH_FIRE, Abilities.ROCK_HEAD, 350, 60, 75, 45, 65, 50, 55, 190, 50, 70, GrowthRate.SLOW, 75, false),
-    new PokemonSpecies(Species.HISUI_ARCANINE, 8, false, false, false, "Legendary Pokémon", Type.FIRE, Type.ROCK, 2, 168, Abilities.INTIMIDATE, Abilities.FLASH_FIRE, Abilities.ROCK_HEAD, 555, 95, 115, 80, 95, 80, 90, 85, 50, 194, GrowthRate.SLOW, 75, false),
-    new PokemonSpecies(Species.HISUI_VOLTORB, 8, false, false, false, "Ball Pokémon", Type.ELECTRIC, Type.GRASS, 0.5, 13, Abilities.SOUNDPROOF, Abilities.STATIC, Abilities.AFTERMATH, 330, 40, 30, 50, 55, 55, 100, 190, 80, 66, GrowthRate.MEDIUM_FAST, null, false),
-    new PokemonSpecies(Species.HISUI_ELECTRODE, 8, false, false, false, "Ball Pokémon", Type.ELECTRIC, Type.GRASS, 1.2, 81, Abilities.SOUNDPROOF, Abilities.STATIC, Abilities.AFTERMATH, 490, 60, 50, 70, 80, 80, 150, 60, 70, 172, GrowthRate.MEDIUM_FAST, null, false),
-    new PokemonSpecies(Species.HISUI_TYPHLOSION, 8, false, false, false, "Volcano Pokémon", Type.FIRE, Type.GHOST, 1.6, 69.8, Abilities.BLAZE, Abilities.NONE, Abilities.FRISK, 534, 73, 84, 78, 119, 85, 95, 45, 70, 240, GrowthRate.MEDIUM_SLOW, 87.5, false),
-    new PokemonSpecies(Species.HISUI_QWILFISH, 8, false, false, false, "Balloon Pokémon", Type.DARK, Type.POISON, 0.5, 3.9, Abilities.POISON_POINT, Abilities.SWIFT_SWIM, Abilities.INTIMIDATE, 440, 65, 95, 85, 55, 55, 85, 45, 50, 88, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.HISUI_SNEASEL, 8, false, false, false, "Sharp Claw Pokémon", Type.FIGHTING, Type.POISON, 0.9, 27, Abilities.INNER_FOCUS, Abilities.KEEN_EYE, Abilities.PICKPOCKET, 430, 55, 95, 55, 35, 75, 115, 60, 35, 86, GrowthRate.MEDIUM_SLOW, 50, true),
-    new PokemonSpecies(Species.HISUI_SAMUROTT, 8, false, false, false, "Formidable Pokémon", Type.WATER, Type.DARK, 1.5, 58.2, Abilities.TORRENT, Abilities.NONE, Abilities.SHARPNESS, 528, 90, 108, 80, 100, 65, 85, 45, 80, 238, GrowthRate.MEDIUM_SLOW, 87.5, false),
-    new PokemonSpecies(Species.HISUI_LILLIGANT, 8, false, false, false, "Flowering Pokémon", Type.GRASS, Type.FIGHTING, 1.2, 19.2, Abilities.CHLOROPHYLL, Abilities.HUSTLE, Abilities.LEAF_GUARD, 480, 70, 105, 75, 50, 75, 105, 75, 50, 168, GrowthRate.MEDIUM_FAST, 0, false),
-    new PokemonSpecies(Species.HISUI_ZORUA, 8, false, false, false, "Tricky Fox Pokémon", Type.NORMAL, Type.GHOST, 0.7, 12.5, Abilities.ILLUSION, Abilities.NONE, Abilities.NONE, 330, 35, 60, 40, 85, 40, 70, 75, 50, 66, GrowthRate.MEDIUM_SLOW, 87.5, false),
-    new PokemonSpecies(Species.HISUI_ZOROARK, 8, false, false, false, "Illusion Fox Pokémon", Type.NORMAL, Type.GHOST, 1.6, 83, Abilities.ILLUSION, Abilities.NONE, Abilities.NONE, 510, 55, 100, 60, 125, 60, 110, 45, 50, 179, GrowthRate.MEDIUM_SLOW, 87.5, false),
-    new PokemonSpecies(Species.HISUI_BRAVIARY, 8, false, false, false, "Valiant Pokémon", Type.PSYCHIC, Type.FLYING, 1.7, 43.4, Abilities.KEEN_EYE, Abilities.SHEER_FORCE, Abilities.TINTED_LENS, 510, 110, 83, 70, 112, 70, 65, 60, 50, 179, GrowthRate.SLOW, 100, false),
-    new PokemonSpecies(Species.HISUI_SLIGGOO, 8, false, false, false, "Soft Tissue Pokémon", Type.STEEL, Type.DRAGON, 0.7, 68.5, Abilities.SAP_SIPPER, Abilities.SHELL_ARMOR, Abilities.GOOEY, 452, 58, 75, 83, 83, 113, 40, 45, 35, 158, GrowthRate.SLOW, 50, false),
-    new PokemonSpecies(Species.HISUI_GOODRA, 8, false, false, false, "Dragon Pokémon", Type.STEEL, Type.DRAGON, 1.7, 334.1, Abilities.SAP_SIPPER, Abilities.SHELL_ARMOR, Abilities.GOOEY, 600, 80, 100, 100, 110, 150, 60, 45, 35, 270, GrowthRate.SLOW, 50, false),
-    new PokemonSpecies(Species.HISUI_AVALUGG, 8, false, false, false, "Iceberg Pokémon", Type.ICE, Type.ROCK, 1.4, 262.4, Abilities.STRONG_JAW, Abilities.ICE_BODY, Abilities.STURDY, 514, 95, 127, 184, 34, 36, 38, 55, 50, 180, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.HISUI_DECIDUEYE, 8, false, false, false, "Arrow Quill Pokémon", Type.GRASS, Type.FIGHTING, 1.6, 37, Abilities.OVERGROW, Abilities.NONE, Abilities.SCRAPPY, 530, 88, 112, 80, 95, 95, 60, 45, 50, 239, GrowthRate.MEDIUM_SLOW, 87.5, false),
-    new PokemonSpecies(Species.PALDEA_TAUROS, 9, false, false, false, "Wild Bull Pokémon", Type.FIGHTING, null, 1.4, 115, Abilities.INTIMIDATE, Abilities.ANGER_POINT, Abilities.CUD_CHEW, 490, 75, 110, 105, 30, 70, 100, 45, 50, 172, GrowthRate.SLOW, 100, false, false,
-      new PokemonForm("Combat Breed", "combat", Type.FIGHTING, null, 1.4, 115, Abilities.INTIMIDATE, Abilities.ANGER_POINT, Abilities.CUD_CHEW, 490, 75, 110, 105, 30, 70, 100, 45, 50, 172, false, "", true),
-      new PokemonForm("Blaze Breed", "blaze", Type.FIGHTING, Type.FIRE, 1.4, 85, Abilities.INTIMIDATE, Abilities.ANGER_POINT, Abilities.CUD_CHEW, 490, 75, 110, 105, 30, 70, 100, 45, 50, 172, false, null, true),
-      new PokemonForm("Aqua Breed", "aqua", Type.FIGHTING, Type.WATER, 1.4, 110, Abilities.INTIMIDATE, Abilities.ANGER_POINT, Abilities.CUD_CHEW, 490, 75, 110, 105, 30, 70, 100, 45, 50, 172, false, null, true),
-    ),
-    new PokemonSpecies(Species.PALDEA_WOOPER, 9, false, false, false, "Water Fish Pokémon", Type.POISON, Type.GROUND, 0.4, 11, Abilities.POISON_POINT, Abilities.WATER_ABSORB, Abilities.UNAWARE, 210, 55, 45, 45, 25, 25, 15, 255, 50, 42, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.BLOODMOON_URSALUNA, 9, true, false, false, "Peat Pokémon", Type.GROUND, Type.NORMAL, 2.7, 333, Abilities.MINDS_EYE, Abilities.NONE, Abilities.NONE, 555, 113, 70, 120, 135, 65, 52, 75, 50, 278, GrowthRate.MEDIUM_FAST, 50, false), //Marked as Sub-Legend, for casing purposes
+    new PokemonSpecies(Species.BULBASAUR, 1, false, false, false, "Seed Pokémon", PokemonType.GRASS, PokemonType.POISON, 0.7, 6.9, Abilities.OVERGROW, Abilities.NONE, Abilities.CHLOROPHYLL, 318, 45, 49, 49, 65, 65, 45, 45, 50, 64, GrowthRate.MEDIUM_SLOW, 87.5, false),
+    new PokemonSpecies(Species.IVYSAUR, 1, false, false, false, "Seed Pokémon", PokemonType.GRASS, PokemonType.POISON, 1, 13, Abilities.OVERGROW, Abilities.NONE, Abilities.CHLOROPHYLL, 405, 60, 62, 63, 80, 80, 60, 45, 50, 142, GrowthRate.MEDIUM_SLOW, 87.5, false),
+    new PokemonSpecies(Species.VENUSAUR, 1, false, false, false, "Seed Pokémon", PokemonType.GRASS, PokemonType.POISON, 2, 100, Abilities.OVERGROW, Abilities.NONE, Abilities.CHLOROPHYLL, 525, 80, 82, 83, 100, 100, 80, 45, 50, 263, GrowthRate.MEDIUM_SLOW, 87.5, true, true,
+      new PokemonForm("Normal", "", PokemonType.GRASS, PokemonType.POISON, 2, 100, Abilities.OVERGROW, Abilities.NONE, Abilities.CHLOROPHYLL, 525, 80, 82, 83, 100, 100, 80, 45, 50, 263, true, null, true),
+      new PokemonForm("Mega", SpeciesFormKey.MEGA, PokemonType.GRASS, PokemonType.POISON, 2.4, 155.5, Abilities.THICK_FAT, Abilities.THICK_FAT, Abilities.THICK_FAT, 625, 80, 100, 123, 122, 120, 80, 45, 50, 263, true),
+      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, PokemonType.GRASS, PokemonType.POISON, 24, 999.9, Abilities.EFFECT_SPORE, Abilities.NONE, Abilities.EFFECT_SPORE, 625, 120, 122, 90, 108, 105, 80, 45, 50, 263, true),
+    ),
+    new PokemonSpecies(Species.CHARMANDER, 1, false, false, false, "Lizard Pokémon", PokemonType.FIRE, null, 0.6, 8.5, Abilities.BLAZE, Abilities.NONE, Abilities.SOLAR_POWER, 309, 39, 52, 43, 60, 50, 65, 45, 50, 62, GrowthRate.MEDIUM_SLOW, 87.5, false),
+    new PokemonSpecies(Species.CHARMELEON, 1, false, false, false, "Flame Pokémon", PokemonType.FIRE, null, 1.1, 19, Abilities.BLAZE, Abilities.NONE, Abilities.SOLAR_POWER, 405, 58, 64, 58, 80, 65, 80, 45, 50, 142, GrowthRate.MEDIUM_SLOW, 87.5, false),
+    new PokemonSpecies(Species.CHARIZARD, 1, false, false, false, "Flame Pokémon", PokemonType.FIRE, PokemonType.FLYING, 1.7, 90.5, Abilities.BLAZE, Abilities.NONE, Abilities.SOLAR_POWER, 534, 78, 84, 78, 109, 85, 100, 45, 50, 267, GrowthRate.MEDIUM_SLOW, 87.5, false, true,
+      new PokemonForm("Normal", "", PokemonType.FIRE, PokemonType.FLYING, 1.7, 90.5, Abilities.BLAZE, Abilities.NONE, Abilities.SOLAR_POWER, 534, 78, 84, 78, 109, 85, 100, 45, 50, 267, false, null, true),
+      new PokemonForm("Mega X", SpeciesFormKey.MEGA_X, PokemonType.FIRE, PokemonType.DRAGON, 1.7, 110.5, Abilities.TOUGH_CLAWS, Abilities.NONE, Abilities.TOUGH_CLAWS, 634, 78, 130, 111, 130, 85, 100, 45, 50, 267),
+      new PokemonForm("Mega Y", SpeciesFormKey.MEGA_Y, PokemonType.FIRE, PokemonType.FLYING, 1.7, 100.5, Abilities.DROUGHT, Abilities.NONE, Abilities.DROUGHT, 634, 78, 104, 78, 159, 115, 100, 45, 50, 267),
+      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, PokemonType.FIRE, PokemonType.FLYING, 28, 999.9, Abilities.BERSERK, Abilities.NONE, Abilities.BERSERK, 634, 118, 99, 88, 134, 95, 100, 45, 50, 267),
+    ),
+    new PokemonSpecies(Species.SQUIRTLE, 1, false, false, false, "Tiny Turtle Pokémon", PokemonType.WATER, null, 0.5, 9, Abilities.TORRENT, Abilities.NONE, Abilities.RAIN_DISH, 314, 44, 48, 65, 50, 64, 43, 45, 50, 63, GrowthRate.MEDIUM_SLOW, 87.5, false),
+    new PokemonSpecies(Species.WARTORTLE, 1, false, false, false, "Turtle Pokémon", PokemonType.WATER, null, 1, 22.5, Abilities.TORRENT, Abilities.NONE, Abilities.RAIN_DISH, 405, 59, 63, 80, 65, 80, 58, 45, 50, 142, GrowthRate.MEDIUM_SLOW, 87.5, false),
+    new PokemonSpecies(Species.BLASTOISE, 1, false, false, false, "Shellfish Pokémon", PokemonType.WATER, null, 1.6, 85.5, Abilities.TORRENT, Abilities.NONE, Abilities.RAIN_DISH, 530, 79, 83, 100, 85, 105, 78, 45, 50, 265, GrowthRate.MEDIUM_SLOW, 87.5, false, true,
+      new PokemonForm("Normal", "", PokemonType.WATER, null, 1.6, 85.5, Abilities.TORRENT, Abilities.NONE, Abilities.RAIN_DISH, 530, 79, 83, 100, 85, 105, 78, 45, 50, 265, false, null, true),
+      new PokemonForm("Mega", SpeciesFormKey.MEGA, PokemonType.WATER, null, 1.6, 101.1, Abilities.MEGA_LAUNCHER, Abilities.NONE, Abilities.MEGA_LAUNCHER, 630, 79, 103, 120, 135, 115, 78, 45, 50, 265),
+      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, PokemonType.WATER, PokemonType.STEEL, 25, 999.9, Abilities.SHELL_ARMOR, Abilities.NONE, Abilities.SHELL_ARMOR, 630, 119, 108, 125, 105, 110, 63, 45, 50, 265),
+    ),
+    new PokemonSpecies(Species.CATERPIE, 1, false, false, false, "Worm Pokémon", PokemonType.BUG, null, 0.3, 2.9, Abilities.SHIELD_DUST, Abilities.NONE, Abilities.RUN_AWAY, 195, 45, 30, 35, 20, 20, 45, 255, 50, 39, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.METAPOD, 1, false, false, false, "Cocoon Pokémon", PokemonType.BUG, null, 0.7, 9.9, Abilities.SHED_SKIN, Abilities.NONE, Abilities.SHED_SKIN, 205, 50, 20, 55, 25, 25, 30, 120, 50, 72, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.BUTTERFREE, 1, false, false, false, "Butterfly Pokémon", PokemonType.BUG, PokemonType.FLYING, 1.1, 32, Abilities.COMPOUND_EYES, Abilities.NONE, Abilities.TINTED_LENS, 395, 60, 45, 50, 90, 80, 70, 45, 50, 198, GrowthRate.MEDIUM_FAST, 50, true, true,
+      new PokemonForm("Normal", "", PokemonType.BUG, PokemonType.FLYING, 1.1, 32, Abilities.COMPOUND_EYES, Abilities.NONE, Abilities.TINTED_LENS, 395, 60, 45, 50, 90, 80, 70, 45, 50, 198, true, null, true),
+      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, PokemonType.BUG, PokemonType.FLYING, 17, 999.9, Abilities.COMPOUND_EYES, Abilities.NONE, Abilities.COMPOUND_EYES, 495, 80, 40, 75, 120, 95, 85, 45, 50, 198, true),
+    ),
+    new PokemonSpecies(Species.WEEDLE, 1, false, false, false, "Hairy Bug Pokémon", PokemonType.BUG, PokemonType.POISON, 0.3, 3.2, Abilities.SHIELD_DUST, Abilities.NONE, Abilities.RUN_AWAY, 195, 40, 35, 30, 20, 20, 50, 255, 70, 39, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.KAKUNA, 1, false, false, false, "Cocoon Pokémon", PokemonType.BUG, PokemonType.POISON, 0.6, 10, Abilities.SHED_SKIN, Abilities.NONE, Abilities.SHED_SKIN, 205, 45, 25, 50, 25, 25, 35, 120, 70, 72, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.BEEDRILL, 1, false, false, false, "Poison Bee Pokémon", PokemonType.BUG, PokemonType.POISON, 1, 29.5, Abilities.SWARM, Abilities.NONE, Abilities.SNIPER, 395, 65, 90, 40, 45, 80, 75, 45, 70, 198, GrowthRate.MEDIUM_FAST, 50, false, true,
+      new PokemonForm("Normal", "", PokemonType.BUG, PokemonType.POISON, 1, 29.5, Abilities.SWARM, Abilities.NONE, Abilities.SNIPER, 395, 65, 90, 40, 45, 80, 75, 45, 70, 198, false, null, true),
+      new PokemonForm("Mega", SpeciesFormKey.MEGA, PokemonType.BUG, PokemonType.POISON, 1.4, 40.5, Abilities.ADAPTABILITY, Abilities.NONE, Abilities.ADAPTABILITY, 495, 65, 150, 40, 15, 80, 145, 45, 70, 198),
+    ),
+    new PokemonSpecies(Species.PIDGEY, 1, false, false, false, "Tiny Bird Pokémon", PokemonType.NORMAL, PokemonType.FLYING, 0.3, 1.8, Abilities.KEEN_EYE, Abilities.TANGLED_FEET, Abilities.BIG_PECKS, 251, 40, 45, 40, 35, 35, 56, 255, 70, 50, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.PIDGEOTTO, 1, false, false, false, "Bird Pokémon", PokemonType.NORMAL, PokemonType.FLYING, 1.1, 30, Abilities.KEEN_EYE, Abilities.TANGLED_FEET, Abilities.BIG_PECKS, 349, 63, 60, 55, 50, 50, 71, 120, 70, 122, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.PIDGEOT, 1, false, false, false, "Bird Pokémon", PokemonType.NORMAL, PokemonType.FLYING, 1.5, 39.5, Abilities.KEEN_EYE, Abilities.TANGLED_FEET, Abilities.BIG_PECKS, 479, 83, 80, 75, 70, 70, 101, 45, 70, 240, GrowthRate.MEDIUM_SLOW, 50, false, true,
+      new PokemonForm("Normal", "", PokemonType.NORMAL, PokemonType.FLYING, 1.5, 39.5, Abilities.KEEN_EYE, Abilities.TANGLED_FEET, Abilities.BIG_PECKS, 479, 83, 80, 75, 70, 70, 101, 45, 70, 240, false, null, true),
+      new PokemonForm("Mega", SpeciesFormKey.MEGA, PokemonType.NORMAL, PokemonType.FLYING, 2.2, 50.5, Abilities.NO_GUARD, Abilities.NO_GUARD, Abilities.NO_GUARD, 579, 83, 80, 80, 135, 80, 121, 45, 70, 240),
+    ),
+    new PokemonSpecies(Species.RATTATA, 1, false, false, false, "Mouse Pokémon", PokemonType.NORMAL, null, 0.3, 3.5, Abilities.RUN_AWAY, Abilities.GUTS, Abilities.HUSTLE, 253, 30, 56, 35, 25, 35, 72, 255, 70, 51, GrowthRate.MEDIUM_FAST, 50, true),
+    new PokemonSpecies(Species.RATICATE, 1, false, false, false, "Mouse Pokémon", PokemonType.NORMAL, null, 0.7, 18.5, Abilities.RUN_AWAY, Abilities.GUTS, Abilities.HUSTLE, 413, 55, 81, 60, 50, 70, 97, 127, 70, 145, GrowthRate.MEDIUM_FAST, 50, true),
+    new PokemonSpecies(Species.SPEAROW, 1, false, false, false, "Tiny Bird Pokémon", PokemonType.NORMAL, PokemonType.FLYING, 0.3, 2, Abilities.KEEN_EYE, Abilities.NONE, Abilities.SNIPER, 262, 40, 60, 30, 31, 31, 70, 255, 70, 52, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.FEAROW, 1, false, false, false, "Beak Pokémon", PokemonType.NORMAL, PokemonType.FLYING, 1.2, 38, Abilities.KEEN_EYE, Abilities.NONE, Abilities.SNIPER, 442, 65, 90, 65, 61, 61, 100, 90, 70, 155, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.EKANS, 1, false, false, false, "Snake Pokémon", PokemonType.POISON, null, 2, 6.9, Abilities.INTIMIDATE, Abilities.SHED_SKIN, Abilities.UNNERVE, 288, 35, 60, 44, 40, 54, 55, 255, 70, 58, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.ARBOK, 1, false, false, false, "Cobra Pokémon", PokemonType.POISON, null, 3.5, 65, Abilities.INTIMIDATE, Abilities.SHED_SKIN, Abilities.UNNERVE, 448, 60, 95, 69, 65, 79, 80, 90, 70, 157, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.PIKACHU, 1, false, false, false, "Mouse Pokémon", PokemonType.ELECTRIC, null, 0.4, 6, Abilities.STATIC, Abilities.NONE, Abilities.LIGHTNING_ROD, 320, 35, 55, 40, 50, 50, 90, 190, 50, 112, GrowthRate.MEDIUM_FAST, 50, true, true,
+      new PokemonForm("Normal", "", PokemonType.ELECTRIC, null, 0.4, 6, Abilities.STATIC, Abilities.NONE, Abilities.LIGHTNING_ROD, 320, 35, 55, 40, 50, 50, 90, 190, 50, 112, true, null, true),
+      new PokemonForm("Partner", "partner", PokemonType.ELECTRIC, null, 0.4, 6, Abilities.STATIC, Abilities.NONE, Abilities.LIGHTNING_ROD, 430, 45, 80, 50, 75, 60, 120, 190, 50, 112, true, null, true),
+      new PokemonForm("Cosplay", "cosplay", PokemonType.ELECTRIC, null, 0.4, 6, Abilities.STATIC, Abilities.NONE, Abilities.LIGHTNING_ROD, 430, 45, 80, 50, 75, 60, 120, 190, 50, 112, true, null, true), //Custom
+      new PokemonForm("Cool Cosplay", "cool-cosplay", PokemonType.ELECTRIC, null, 0.4, 6, Abilities.STATIC, Abilities.NONE, Abilities.LIGHTNING_ROD, 430, 45, 80, 50, 75, 60, 120, 190, 50, 112, true, null, true), //Custom
+      new PokemonForm("Beauty Cosplay", "beauty-cosplay", PokemonType.ELECTRIC, null, 0.4, 6, Abilities.STATIC, Abilities.NONE, Abilities.LIGHTNING_ROD, 430, 45, 80, 50, 75, 60, 120, 190, 50, 112, true, null, true), //Custom
+      new PokemonForm("Cute Cosplay", "cute-cosplay", PokemonType.ELECTRIC, null, 0.4, 6, Abilities.STATIC, Abilities.NONE, Abilities.LIGHTNING_ROD, 430, 45, 80, 50, 75, 60, 120, 190, 50, 112, true, null, true), //Custom
+      new PokemonForm("Smart Cosplay", "smart-cosplay", PokemonType.ELECTRIC, null, 0.4, 6, Abilities.STATIC, Abilities.NONE, Abilities.LIGHTNING_ROD, 430, 45, 80, 50, 75, 60, 120, 190, 50, 112, true, null, true), //Custom
+      new PokemonForm("Tough Cosplay", "tough-cosplay", PokemonType.ELECTRIC, null, 0.4, 6, Abilities.STATIC, Abilities.NONE, Abilities.LIGHTNING_ROD, 430, 45, 80, 50, 75, 60, 120, 190, 50, 112, true, null, true), //Custom
+      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, PokemonType.ELECTRIC, null, 21, 999.9, Abilities.LIGHTNING_ROD, Abilities.NONE, Abilities.LIGHTNING_ROD, 530, 125, 95, 60, 90, 70, 90, 190, 50, 112), //+100 BST from Partner Form
+    ),
+    new PokemonSpecies(Species.RAICHU, 1, false, false, false, "Mouse Pokémon", PokemonType.ELECTRIC, null, 0.8, 30, Abilities.STATIC, Abilities.NONE, Abilities.LIGHTNING_ROD, 485, 60, 90, 55, 90, 80, 110, 75, 50, 243, GrowthRate.MEDIUM_FAST, 50, true),
+    new PokemonSpecies(Species.SANDSHREW, 1, false, false, false, "Mouse Pokémon", PokemonType.GROUND, null, 0.6, 12, Abilities.SAND_VEIL, Abilities.NONE, Abilities.SAND_RUSH, 300, 50, 75, 85, 20, 30, 40, 255, 50, 60, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.SANDSLASH, 1, false, false, false, "Mouse Pokémon", PokemonType.GROUND, null, 1, 29.5, Abilities.SAND_VEIL, Abilities.NONE, Abilities.SAND_RUSH, 450, 75, 100, 110, 45, 55, 65, 90, 50, 158, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.NIDORAN_F, 1, false, false, false, "Poison Pin Pokémon", PokemonType.POISON, null, 0.4, 7, Abilities.POISON_POINT, Abilities.RIVALRY, Abilities.HUSTLE, 275, 55, 47, 52, 40, 40, 41, 235, 50, 55, GrowthRate.MEDIUM_SLOW, 0, false),
+    new PokemonSpecies(Species.NIDORINA, 1, false, false, false, "Poison Pin Pokémon", PokemonType.POISON, null, 0.8, 20, Abilities.POISON_POINT, Abilities.RIVALRY, Abilities.HUSTLE, 365, 70, 62, 67, 55, 55, 56, 120, 50, 128, GrowthRate.MEDIUM_SLOW, 0, false),
+    new PokemonSpecies(Species.NIDOQUEEN, 1, false, false, false, "Drill Pokémon", PokemonType.POISON, PokemonType.GROUND, 1.3, 60, Abilities.POISON_POINT, Abilities.RIVALRY, Abilities.SHEER_FORCE, 505, 90, 92, 87, 75, 85, 76, 45, 50, 253, GrowthRate.MEDIUM_SLOW, 0, false),
+    new PokemonSpecies(Species.NIDORAN_M, 1, false, false, false, "Poison Pin Pokémon", PokemonType.POISON, null, 0.5, 9, Abilities.POISON_POINT, Abilities.RIVALRY, Abilities.HUSTLE, 273, 46, 57, 40, 40, 40, 50, 235, 50, 55, GrowthRate.MEDIUM_SLOW, 100, false),
+    new PokemonSpecies(Species.NIDORINO, 1, false, false, false, "Poison Pin Pokémon", PokemonType.POISON, null, 0.9, 19.5, Abilities.POISON_POINT, Abilities.RIVALRY, Abilities.HUSTLE, 365, 61, 72, 57, 55, 55, 65, 120, 50, 128, GrowthRate.MEDIUM_SLOW, 100, false),
+    new PokemonSpecies(Species.NIDOKING, 1, false, false, false, "Drill Pokémon", PokemonType.POISON, PokemonType.GROUND, 1.4, 62, Abilities.POISON_POINT, Abilities.RIVALRY, Abilities.SHEER_FORCE, 505, 81, 102, 77, 85, 75, 85, 45, 50, 253, GrowthRate.MEDIUM_SLOW, 100, false),
+    new PokemonSpecies(Species.CLEFAIRY, 1, false, false, false, "Fairy Pokémon", PokemonType.FAIRY, null, 0.6, 7.5, Abilities.CUTE_CHARM, Abilities.MAGIC_GUARD, Abilities.FRIEND_GUARD, 323, 70, 45, 48, 60, 65, 35, 150, 140, 113, GrowthRate.FAST, 25, false),
+    new PokemonSpecies(Species.CLEFABLE, 1, false, false, false, "Fairy Pokémon", PokemonType.FAIRY, null, 1.3, 40, Abilities.CUTE_CHARM, Abilities.MAGIC_GUARD, Abilities.UNAWARE, 483, 95, 70, 73, 95, 90, 60, 25, 140, 242, GrowthRate.FAST, 25, false),
+    new PokemonSpecies(Species.VULPIX, 1, false, false, false, "Fox Pokémon", PokemonType.FIRE, null, 0.6, 9.9, Abilities.FLASH_FIRE, Abilities.NONE, Abilities.DROUGHT, 299, 38, 41, 40, 50, 65, 65, 190, 50, 60, GrowthRate.MEDIUM_FAST, 25, false),
+    new PokemonSpecies(Species.NINETALES, 1, false, false, false, "Fox Pokémon", PokemonType.FIRE, null, 1.1, 19.9, Abilities.FLASH_FIRE, Abilities.NONE, Abilities.DROUGHT, 505, 73, 76, 75, 81, 100, 100, 75, 50, 177, GrowthRate.MEDIUM_FAST, 25, false),
+    new PokemonSpecies(Species.JIGGLYPUFF, 1, false, false, false, "Balloon Pokémon", PokemonType.NORMAL, PokemonType.FAIRY, 0.5, 5.5, Abilities.CUTE_CHARM, Abilities.COMPETITIVE, Abilities.FRIEND_GUARD, 270, 115, 45, 20, 45, 25, 20, 170, 50, 95, GrowthRate.FAST, 25, false),
+    new PokemonSpecies(Species.WIGGLYTUFF, 1, false, false, false, "Balloon Pokémon", PokemonType.NORMAL, PokemonType.FAIRY, 1, 12, Abilities.CUTE_CHARM, Abilities.COMPETITIVE, Abilities.FRISK, 435, 140, 70, 45, 85, 50, 45, 50, 50, 218, GrowthRate.FAST, 25, false),
+    new PokemonSpecies(Species.ZUBAT, 1, false, false, false, "Bat Pokémon", PokemonType.POISON, PokemonType.FLYING, 0.8, 7.5, Abilities.INNER_FOCUS, Abilities.NONE, Abilities.INFILTRATOR, 245, 40, 45, 35, 30, 40, 55, 255, 50, 49, GrowthRate.MEDIUM_FAST, 50, true),
+    new PokemonSpecies(Species.GOLBAT, 1, false, false, false, "Bat Pokémon", PokemonType.POISON, PokemonType.FLYING, 1.6, 55, Abilities.INNER_FOCUS, Abilities.NONE, Abilities.INFILTRATOR, 455, 75, 80, 70, 65, 75, 90, 90, 50, 159, GrowthRate.MEDIUM_FAST, 50, true),
+    new PokemonSpecies(Species.ODDISH, 1, false, false, false, "Weed Pokémon", PokemonType.GRASS, PokemonType.POISON, 0.5, 5.4, Abilities.CHLOROPHYLL, Abilities.NONE, Abilities.RUN_AWAY, 320, 45, 50, 55, 75, 65, 30, 255, 50, 64, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.GLOOM, 1, false, false, false, "Weed Pokémon", PokemonType.GRASS, PokemonType.POISON, 0.8, 8.6, Abilities.CHLOROPHYLL, Abilities.NONE, Abilities.STENCH, 395, 60, 65, 70, 85, 75, 40, 120, 50, 138, GrowthRate.MEDIUM_SLOW, 50, true),
+    new PokemonSpecies(Species.VILEPLUME, 1, false, false, false, "Flower Pokémon", PokemonType.GRASS, PokemonType.POISON, 1.2, 18.6, Abilities.CHLOROPHYLL, Abilities.NONE, Abilities.EFFECT_SPORE, 490, 75, 80, 85, 110, 90, 50, 45, 50, 245, GrowthRate.MEDIUM_SLOW, 50, true),
+    new PokemonSpecies(Species.PARAS, 1, false, false, false, "Mushroom Pokémon", PokemonType.BUG, PokemonType.GRASS, 0.3, 5.4, Abilities.EFFECT_SPORE, Abilities.DRY_SKIN, Abilities.DAMP, 285, 35, 70, 55, 45, 55, 25, 190, 70, 57, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.PARASECT, 1, false, false, false, "Mushroom Pokémon", PokemonType.BUG, PokemonType.GRASS, 1, 29.5, Abilities.EFFECT_SPORE, Abilities.DRY_SKIN, Abilities.DAMP, 405, 60, 95, 80, 60, 80, 30, 75, 70, 142, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.VENONAT, 1, false, false, false, "Insect Pokémon", PokemonType.BUG, PokemonType.POISON, 1, 30, Abilities.COMPOUND_EYES, Abilities.TINTED_LENS, Abilities.RUN_AWAY, 305, 60, 55, 50, 40, 55, 45, 190, 70, 61, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.VENOMOTH, 1, false, false, false, "Poison Moth Pokémon", PokemonType.BUG, PokemonType.POISON, 1.5, 12.5, Abilities.SHIELD_DUST, Abilities.TINTED_LENS, Abilities.WONDER_SKIN, 450, 70, 65, 60, 90, 75, 90, 75, 70, 158, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.DIGLETT, 1, false, false, false, "Mole Pokémon", PokemonType.GROUND, null, 0.2, 0.8, Abilities.SAND_VEIL, Abilities.ARENA_TRAP, Abilities.SAND_FORCE, 265, 10, 55, 25, 35, 45, 95, 255, 50, 53, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.DUGTRIO, 1, false, false, false, "Mole Pokémon", PokemonType.GROUND, null, 0.7, 33.3, Abilities.SAND_VEIL, Abilities.ARENA_TRAP, Abilities.SAND_FORCE, 425, 35, 100, 50, 50, 70, 120, 50, 50, 149, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.MEOWTH, 1, false, false, false, "Scratch Cat Pokémon", PokemonType.NORMAL, null, 0.4, 4.2, Abilities.PICKUP, Abilities.TECHNICIAN, Abilities.UNNERVE, 290, 40, 45, 35, 40, 40, 90, 255, 50, 58, GrowthRate.MEDIUM_FAST, 50, false, true,
+      new PokemonForm("Normal", "", PokemonType.NORMAL, null, 0.4, 4.2, Abilities.PICKUP, Abilities.TECHNICIAN, Abilities.UNNERVE, 290, 40, 45, 35, 40, 40, 90, 255, 50, 58, false, null, true),
+      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, PokemonType.NORMAL, null, 33, 999.9, Abilities.TECHNICIAN, Abilities.TECHNICIAN, Abilities.TECHNICIAN, 540, 115, 110, 65, 65, 70, 115, 255, 50, 58), //+100 BST from Persian
+    ),
+    new PokemonSpecies(Species.PERSIAN, 1, false, false, false, "Classy Cat Pokémon", PokemonType.NORMAL, null, 1, 32, Abilities.LIMBER, Abilities.TECHNICIAN, Abilities.UNNERVE, 440, 65, 70, 60, 65, 65, 115, 90, 50, 154, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.PSYDUCK, 1, false, false, false, "Duck Pokémon", PokemonType.WATER, null, 0.8, 19.6, Abilities.DAMP, Abilities.CLOUD_NINE, Abilities.SWIFT_SWIM, 320, 50, 52, 48, 65, 50, 55, 190, 50, 64, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.GOLDUCK, 1, false, false, false, "Duck Pokémon", PokemonType.WATER, null, 1.7, 76.6, Abilities.DAMP, Abilities.CLOUD_NINE, Abilities.SWIFT_SWIM, 500, 80, 82, 78, 95, 80, 85, 75, 50, 175, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.MANKEY, 1, false, false, false, "Pig Monkey Pokémon", PokemonType.FIGHTING, null, 0.5, 28, Abilities.VITAL_SPIRIT, Abilities.ANGER_POINT, Abilities.DEFIANT, 305, 40, 80, 35, 35, 45, 70, 190, 70, 61, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.PRIMEAPE, 1, false, false, false, "Pig Monkey Pokémon", PokemonType.FIGHTING, null, 1, 32, Abilities.VITAL_SPIRIT, Abilities.ANGER_POINT, Abilities.DEFIANT, 455, 65, 105, 60, 60, 70, 95, 75, 70, 159, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.GROWLITHE, 1, false, false, false, "Puppy Pokémon", PokemonType.FIRE, null, 0.7, 19, Abilities.INTIMIDATE, Abilities.FLASH_FIRE, Abilities.JUSTIFIED, 350, 55, 70, 45, 70, 50, 60, 190, 50, 70, GrowthRate.SLOW, 75, false),
+    new PokemonSpecies(Species.ARCANINE, 1, false, false, false, "Legendary Pokémon", PokemonType.FIRE, null, 1.9, 155, Abilities.INTIMIDATE, Abilities.FLASH_FIRE, Abilities.JUSTIFIED, 555, 90, 110, 80, 100, 80, 95, 75, 50, 194, GrowthRate.SLOW, 75, false),
+    new PokemonSpecies(Species.POLIWAG, 1, false, false, false, "Tadpole Pokémon", PokemonType.WATER, null, 0.6, 12.4, Abilities.WATER_ABSORB, Abilities.DAMP, Abilities.SWIFT_SWIM, 300, 40, 50, 40, 40, 40, 90, 255, 50, 60, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.POLIWHIRL, 1, false, false, false, "Tadpole Pokémon", PokemonType.WATER, null, 1, 20, Abilities.WATER_ABSORB, Abilities.DAMP, Abilities.SWIFT_SWIM, 385, 65, 65, 65, 50, 50, 90, 120, 50, 135, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.POLIWRATH, 1, false, false, false, "Tadpole Pokémon", PokemonType.WATER, PokemonType.FIGHTING, 1.3, 54, Abilities.WATER_ABSORB, Abilities.DAMP, Abilities.SWIFT_SWIM, 510, 90, 95, 95, 70, 90, 70, 45, 50, 255, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.ABRA, 1, false, false, false, "Psi Pokémon", PokemonType.PSYCHIC, null, 0.9, 19.5, Abilities.SYNCHRONIZE, Abilities.INNER_FOCUS, Abilities.MAGIC_GUARD, 310, 25, 20, 15, 105, 55, 90, 200, 50, 62, GrowthRate.MEDIUM_SLOW, 75, false),
+    new PokemonSpecies(Species.KADABRA, 1, false, false, false, "Psi Pokémon", PokemonType.PSYCHIC, null, 1.3, 56.5, Abilities.SYNCHRONIZE, Abilities.INNER_FOCUS, Abilities.MAGIC_GUARD, 400, 40, 35, 30, 120, 70, 105, 100, 50, 140, GrowthRate.MEDIUM_SLOW, 75, true),
+    new PokemonSpecies(Species.ALAKAZAM, 1, false, false, false, "Psi Pokémon", PokemonType.PSYCHIC, null, 1.5, 48, Abilities.SYNCHRONIZE, Abilities.INNER_FOCUS, Abilities.MAGIC_GUARD, 500, 55, 50, 45, 135, 95, 120, 50, 50, 250, GrowthRate.MEDIUM_SLOW, 75, true, true,
+      new PokemonForm("Normal", "", PokemonType.PSYCHIC, null, 1.5, 48, Abilities.SYNCHRONIZE, Abilities.INNER_FOCUS, Abilities.MAGIC_GUARD, 500, 55, 50, 45, 135, 95, 120, 50, 50, 250, true, null, true),
+      new PokemonForm("Mega", SpeciesFormKey.MEGA, PokemonType.PSYCHIC, null, 1.2, 48, Abilities.TRACE, Abilities.TRACE, Abilities.TRACE, 600, 55, 50, 65, 175, 105, 150, 50, 50, 250, true),
+    ),
+    new PokemonSpecies(Species.MACHOP, 1, false, false, false, "Superpower Pokémon", PokemonType.FIGHTING, null, 0.8, 19.5, Abilities.GUTS, Abilities.NO_GUARD, Abilities.STEADFAST, 305, 70, 80, 50, 35, 35, 35, 180, 50, 61, GrowthRate.MEDIUM_SLOW, 75, false),
+    new PokemonSpecies(Species.MACHOKE, 1, false, false, false, "Superpower Pokémon", PokemonType.FIGHTING, null, 1.5, 70.5, Abilities.GUTS, Abilities.NO_GUARD, Abilities.STEADFAST, 405, 80, 100, 70, 50, 60, 45, 90, 50, 142, GrowthRate.MEDIUM_SLOW, 75, false),
+    new PokemonSpecies(Species.MACHAMP, 1, false, false, false, "Superpower Pokémon", PokemonType.FIGHTING, null, 1.6, 130, Abilities.GUTS, Abilities.NO_GUARD, Abilities.STEADFAST, 505, 90, 130, 80, 65, 85, 55, 45, 50, 253, GrowthRate.MEDIUM_SLOW, 75, false, true,
+      new PokemonForm("Normal", "", PokemonType.FIGHTING, null, 1.6, 130, Abilities.GUTS, Abilities.NO_GUARD, Abilities.STEADFAST, 505, 90, 130, 80, 65, 85, 55, 45, 50, 253, false, null, true),
+      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, PokemonType.FIGHTING, null, 25, 999.9, Abilities.GUTS, Abilities.GUTS, Abilities.GUTS, 605, 120, 170, 85, 75, 90, 65, 45, 50, 253),
+    ),
+    new PokemonSpecies(Species.BELLSPROUT, 1, false, false, false, "Flower Pokémon", PokemonType.GRASS, PokemonType.POISON, 0.7, 4, Abilities.CHLOROPHYLL, Abilities.NONE, Abilities.GLUTTONY, 300, 50, 75, 35, 70, 30, 40, 255, 70, 60, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.WEEPINBELL, 1, false, false, false, "Flycatcher Pokémon", PokemonType.GRASS, PokemonType.POISON, 1, 6.4, Abilities.CHLOROPHYLL, Abilities.NONE, Abilities.GLUTTONY, 390, 65, 90, 50, 85, 45, 55, 120, 70, 137, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.VICTREEBEL, 1, false, false, false, "Flycatcher Pokémon", PokemonType.GRASS, PokemonType.POISON, 1.7, 15.5, Abilities.CHLOROPHYLL, Abilities.NONE, Abilities.GLUTTONY, 490, 80, 105, 65, 100, 70, 70, 45, 70, 245, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.TENTACOOL, 1, false, false, false, "Jellyfish Pokémon", PokemonType.WATER, PokemonType.POISON, 0.9, 45.5, Abilities.CLEAR_BODY, Abilities.LIQUID_OOZE, Abilities.RAIN_DISH, 335, 40, 40, 35, 50, 100, 70, 190, 50, 67, GrowthRate.SLOW, 50, false),
+    new PokemonSpecies(Species.TENTACRUEL, 1, false, false, false, "Jellyfish Pokémon", PokemonType.WATER, PokemonType.POISON, 1.6, 55, Abilities.CLEAR_BODY, Abilities.LIQUID_OOZE, Abilities.RAIN_DISH, 515, 80, 70, 65, 80, 120, 100, 60, 50, 180, GrowthRate.SLOW, 50, false),
+    new PokemonSpecies(Species.GEODUDE, 1, false, false, false, "Rock Pokémon", PokemonType.ROCK, PokemonType.GROUND, 0.4, 20, Abilities.ROCK_HEAD, Abilities.STURDY, Abilities.SAND_VEIL, 300, 40, 80, 100, 30, 30, 20, 255, 70, 60, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.GRAVELER, 1, false, false, false, "Rock Pokémon", PokemonType.ROCK, PokemonType.GROUND, 1, 105, Abilities.ROCK_HEAD, Abilities.STURDY, Abilities.SAND_VEIL, 390, 55, 95, 115, 45, 45, 35, 120, 70, 137, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.GOLEM, 1, false, false, false, "Megaton Pokémon", PokemonType.ROCK, PokemonType.GROUND, 1.4, 300, Abilities.ROCK_HEAD, Abilities.STURDY, Abilities.SAND_VEIL, 495, 80, 120, 130, 55, 65, 45, 45, 70, 248, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.PONYTA, 1, false, false, false, "Fire Horse Pokémon", PokemonType.FIRE, null, 1, 30, Abilities.RUN_AWAY, Abilities.FLASH_FIRE, Abilities.FLAME_BODY, 410, 50, 85, 55, 65, 65, 90, 190, 50, 82, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.RAPIDASH, 1, false, false, false, "Fire Horse Pokémon", PokemonType.FIRE, null, 1.7, 95, Abilities.RUN_AWAY, Abilities.FLASH_FIRE, Abilities.FLAME_BODY, 500, 65, 100, 70, 80, 80, 105, 60, 50, 175, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.SLOWPOKE, 1, false, false, false, "Dopey Pokémon", PokemonType.WATER, PokemonType.PSYCHIC, 1.2, 36, Abilities.OBLIVIOUS, Abilities.OWN_TEMPO, Abilities.REGENERATOR, 315, 90, 65, 65, 40, 40, 15, 190, 50, 63, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.SLOWBRO, 1, false, false, false, "Hermit Crab Pokémon", PokemonType.WATER, PokemonType.PSYCHIC, 1.6, 78.5, Abilities.OBLIVIOUS, Abilities.OWN_TEMPO, Abilities.REGENERATOR, 490, 95, 75, 110, 100, 80, 30, 75, 50, 172, GrowthRate.MEDIUM_FAST, 50, false, true,
+      new PokemonForm("Normal", "", PokemonType.WATER, PokemonType.PSYCHIC, 1.6, 78.5, Abilities.OBLIVIOUS, Abilities.OWN_TEMPO, Abilities.REGENERATOR, 490, 95, 75, 110, 100, 80, 30, 75, 50, 172, false, null, true),
+      new PokemonForm("Mega", SpeciesFormKey.MEGA, PokemonType.WATER, PokemonType.PSYCHIC, 2, 120, Abilities.SHELL_ARMOR, Abilities.SHELL_ARMOR, Abilities.SHELL_ARMOR, 590, 95, 75, 180, 130, 80, 30, 75, 50, 172),
+    ),
+    new PokemonSpecies(Species.MAGNEMITE, 1, false, false, false, "Magnet Pokémon", PokemonType.ELECTRIC, PokemonType.STEEL, 0.3, 6, Abilities.MAGNET_PULL, Abilities.STURDY, Abilities.ANALYTIC, 325, 25, 35, 70, 95, 55, 45, 190, 50, 65, GrowthRate.MEDIUM_FAST, null, false),
+    new PokemonSpecies(Species.MAGNETON, 1, false, false, false, "Magnet Pokémon", PokemonType.ELECTRIC, PokemonType.STEEL, 1, 60, Abilities.MAGNET_PULL, Abilities.STURDY, Abilities.ANALYTIC, 465, 50, 60, 95, 120, 70, 70, 60, 50, 163, GrowthRate.MEDIUM_FAST, null, false),
+    new PokemonSpecies(Species.FARFETCHD, 1, false, false, false, "Wild Duck Pokémon", PokemonType.NORMAL, PokemonType.FLYING, 0.8, 15, Abilities.KEEN_EYE, Abilities.INNER_FOCUS, Abilities.DEFIANT, 377, 52, 90, 55, 58, 62, 60, 45, 50, 132, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.DODUO, 1, false, false, false, "Twin Bird Pokémon", PokemonType.NORMAL, PokemonType.FLYING, 1.4, 39.2, Abilities.RUN_AWAY, Abilities.EARLY_BIRD, Abilities.TANGLED_FEET, 310, 35, 85, 45, 35, 35, 75, 190, 70, 62, GrowthRate.MEDIUM_FAST, 50, true),
+    new PokemonSpecies(Species.DODRIO, 1, false, false, false, "Triple Bird Pokémon", PokemonType.NORMAL, PokemonType.FLYING, 1.8, 85.2, Abilities.RUN_AWAY, Abilities.EARLY_BIRD, Abilities.TANGLED_FEET, 470, 60, 110, 70, 60, 60, 110, 45, 70, 165, GrowthRate.MEDIUM_FAST, 50, true),
+    new PokemonSpecies(Species.SEEL, 1, false, false, false, "Sea Lion Pokémon", PokemonType.WATER, null, 1.1, 90, Abilities.THICK_FAT, Abilities.HYDRATION, Abilities.ICE_BODY, 325, 65, 45, 55, 45, 70, 45, 190, 70, 65, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.DEWGONG, 1, false, false, false, "Sea Lion Pokémon", PokemonType.WATER, PokemonType.ICE, 1.7, 120, Abilities.THICK_FAT, Abilities.HYDRATION, Abilities.ICE_BODY, 475, 90, 70, 80, 70, 95, 70, 75, 70, 166, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.GRIMER, 1, false, false, false, "Sludge Pokémon", PokemonType.POISON, null, 0.9, 30, Abilities.STENCH, Abilities.STICKY_HOLD, Abilities.POISON_TOUCH, 325, 80, 80, 50, 40, 50, 25, 190, 70, 65, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.MUK, 1, false, false, false, "Sludge Pokémon", PokemonType.POISON, null, 1.2, 30, Abilities.STENCH, Abilities.STICKY_HOLD, Abilities.POISON_TOUCH, 500, 105, 105, 75, 65, 100, 50, 75, 70, 175, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.SHELLDER, 1, false, false, false, "Bivalve Pokémon", PokemonType.WATER, null, 0.3, 4, Abilities.SHELL_ARMOR, Abilities.SKILL_LINK, Abilities.OVERCOAT, 305, 30, 65, 100, 45, 25, 40, 190, 50, 61, GrowthRate.SLOW, 50, false),
+    new PokemonSpecies(Species.CLOYSTER, 1, false, false, false, "Bivalve Pokémon", PokemonType.WATER, PokemonType.ICE, 1.5, 132.5, Abilities.SHELL_ARMOR, Abilities.SKILL_LINK, Abilities.OVERCOAT, 525, 50, 95, 180, 85, 45, 70, 60, 50, 184, GrowthRate.SLOW, 50, false),
+    new PokemonSpecies(Species.GASTLY, 1, false, false, false, "Gas Pokémon", PokemonType.GHOST, PokemonType.POISON, 1.3, 0.1, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 310, 30, 35, 30, 100, 35, 80, 190, 50, 62, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.HAUNTER, 1, false, false, false, "Gas Pokémon", PokemonType.GHOST, PokemonType.POISON, 1.6, 0.1, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 405, 45, 50, 45, 115, 55, 95, 90, 50, 142, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.GENGAR, 1, false, false, false, "Shadow Pokémon", PokemonType.GHOST, PokemonType.POISON, 1.5, 40.5, Abilities.CURSED_BODY, Abilities.NONE, Abilities.NONE, 500, 60, 65, 60, 130, 75, 110, 45, 50, 250, GrowthRate.MEDIUM_SLOW, 50, false, true,
+      new PokemonForm("Normal", "", PokemonType.GHOST, PokemonType.POISON, 1.5, 40.5, Abilities.CURSED_BODY, Abilities.NONE, Abilities.NONE, 500, 60, 65, 60, 130, 75, 110, 45, 50, 250, false, null, true),
+      new PokemonForm("Mega", SpeciesFormKey.MEGA, PokemonType.GHOST, PokemonType.POISON, 1.4, 40.5, Abilities.SHADOW_TAG, Abilities.NONE, Abilities.NONE, 600, 60, 65, 80, 170, 95, 130, 45, 50, 250),
+      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, PokemonType.GHOST, PokemonType.POISON, 20, 999.9, Abilities.CURSED_BODY, Abilities.NONE, Abilities.NONE, 600, 140, 65, 70, 140, 85, 100, 45, 50, 250),
+    ),
+    new PokemonSpecies(Species.ONIX, 1, false, false, false, "Rock Snake Pokémon", PokemonType.ROCK, PokemonType.GROUND, 8.8, 210, Abilities.ROCK_HEAD, Abilities.STURDY, Abilities.WEAK_ARMOR, 385, 35, 45, 160, 30, 45, 70, 45, 50, 77, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.DROWZEE, 1, false, false, false, "Hypnosis Pokémon", PokemonType.PSYCHIC, null, 1, 32.4, Abilities.INSOMNIA, Abilities.FOREWARN, Abilities.INNER_FOCUS, 328, 60, 48, 45, 43, 90, 42, 190, 70, 66, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.HYPNO, 1, false, false, false, "Hypnosis Pokémon", PokemonType.PSYCHIC, null, 1.6, 75.6, Abilities.INSOMNIA, Abilities.FOREWARN, Abilities.INNER_FOCUS, 483, 85, 73, 70, 73, 115, 67, 75, 70, 169, GrowthRate.MEDIUM_FAST, 50, true),
+    new PokemonSpecies(Species.KRABBY, 1, false, false, false, "River Crab Pokémon", PokemonType.WATER, null, 0.4, 6.5, Abilities.HYPER_CUTTER, Abilities.SHELL_ARMOR, Abilities.SHEER_FORCE, 325, 30, 105, 90, 25, 25, 50, 225, 50, 65, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.KINGLER, 1, false, false, false, "Pincer Pokémon", PokemonType.WATER, null, 1.3, 60, Abilities.HYPER_CUTTER, Abilities.SHELL_ARMOR, Abilities.SHEER_FORCE, 475, 55, 130, 115, 50, 50, 75, 60, 50, 166, GrowthRate.MEDIUM_FAST, 50, false, true,
+      new PokemonForm("Normal", "", PokemonType.WATER, null, 1.3, 60, Abilities.HYPER_CUTTER, Abilities.SHELL_ARMOR, Abilities.SHEER_FORCE, 475, 55, 130, 115, 50, 50, 75, 60, 50, 166, false, null, true),
+      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, PokemonType.WATER, null, 19, 999.9, Abilities.TOUGH_CLAWS, Abilities.TOUGH_CLAWS, Abilities.TOUGH_CLAWS, 575, 92, 145, 140, 60, 65, 73, 60, 50, 166),
+    ),
+    new PokemonSpecies(Species.VOLTORB, 1, false, false, false, "Ball Pokémon", PokemonType.ELECTRIC, null, 0.5, 10.4, Abilities.SOUNDPROOF, Abilities.STATIC, Abilities.AFTERMATH, 330, 40, 30, 50, 55, 55, 100, 190, 70, 66, GrowthRate.MEDIUM_FAST, null, false),
+    new PokemonSpecies(Species.ELECTRODE, 1, false, false, false, "Ball Pokémon", PokemonType.ELECTRIC, null, 1.2, 66.6, Abilities.SOUNDPROOF, Abilities.STATIC, Abilities.AFTERMATH, 490, 60, 50, 70, 80, 80, 150, 60, 70, 172, GrowthRate.MEDIUM_FAST, null, false),
+    new PokemonSpecies(Species.EXEGGCUTE, 1, false, false, false, "Egg Pokémon", PokemonType.GRASS, PokemonType.PSYCHIC, 0.4, 2.5, Abilities.CHLOROPHYLL, Abilities.NONE, Abilities.HARVEST, 325, 60, 40, 80, 60, 45, 40, 90, 50, 65, GrowthRate.SLOW, 50, false),
+    new PokemonSpecies(Species.EXEGGUTOR, 1, false, false, false, "Coconut Pokémon", PokemonType.GRASS, PokemonType.PSYCHIC, 2, 120, Abilities.CHLOROPHYLL, Abilities.NONE, Abilities.HARVEST, 530, 95, 95, 85, 125, 75, 55, 45, 50, 186, GrowthRate.SLOW, 50, false),
+    new PokemonSpecies(Species.CUBONE, 1, false, false, false, "Lonely Pokémon", PokemonType.GROUND, null, 0.4, 6.5, Abilities.ROCK_HEAD, Abilities.LIGHTNING_ROD, Abilities.BATTLE_ARMOR, 320, 50, 50, 95, 40, 50, 35, 190, 50, 64, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.MAROWAK, 1, false, false, false, "Bone Keeper Pokémon", PokemonType.GROUND, null, 1, 45, Abilities.ROCK_HEAD, Abilities.LIGHTNING_ROD, Abilities.BATTLE_ARMOR, 425, 60, 80, 110, 50, 80, 45, 75, 50, 149, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.HITMONLEE, 1, false, false, false, "Kicking Pokémon", PokemonType.FIGHTING, null, 1.5, 49.8, Abilities.LIMBER, Abilities.RECKLESS, Abilities.UNBURDEN, 455, 50, 120, 53, 35, 110, 87, 45, 50, 159, GrowthRate.MEDIUM_FAST, 100, false),
+    new PokemonSpecies(Species.HITMONCHAN, 1, false, false, false, "Punching Pokémon", PokemonType.FIGHTING, null, 1.4, 50.2, Abilities.KEEN_EYE, Abilities.IRON_FIST, Abilities.INNER_FOCUS, 455, 50, 105, 79, 35, 110, 76, 45, 50, 159, GrowthRate.MEDIUM_FAST, 100, false),
+    new PokemonSpecies(Species.LICKITUNG, 1, false, false, false, "Licking Pokémon", PokemonType.NORMAL, null, 1.2, 65.5, Abilities.OWN_TEMPO, Abilities.OBLIVIOUS, Abilities.CLOUD_NINE, 385, 90, 55, 75, 60, 75, 30, 45, 50, 77, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.KOFFING, 1, false, false, false, "Poison Gas Pokémon", PokemonType.POISON, null, 0.6, 1, Abilities.LEVITATE, Abilities.NEUTRALIZING_GAS, Abilities.STENCH, 340, 40, 65, 95, 60, 45, 35, 190, 50, 68, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.WEEZING, 1, false, false, false, "Poison Gas Pokémon", PokemonType.POISON, null, 1.2, 9.5, Abilities.LEVITATE, Abilities.NEUTRALIZING_GAS, Abilities.STENCH, 490, 65, 90, 120, 85, 70, 60, 60, 50, 172, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.RHYHORN, 1, false, false, false, "Spikes Pokémon", PokemonType.GROUND, PokemonType.ROCK, 1, 115, Abilities.LIGHTNING_ROD, Abilities.ROCK_HEAD, Abilities.RECKLESS, 345, 80, 85, 95, 30, 30, 25, 120, 50, 69, GrowthRate.SLOW, 50, true),
+    new PokemonSpecies(Species.RHYDON, 1, false, false, false, "Drill Pokémon", PokemonType.GROUND, PokemonType.ROCK, 1.9, 120, Abilities.LIGHTNING_ROD, Abilities.ROCK_HEAD, Abilities.RECKLESS, 485, 105, 130, 120, 45, 45, 40, 60, 50, 170, GrowthRate.SLOW, 50, true),
+    new PokemonSpecies(Species.CHANSEY, 1, false, false, false, "Egg Pokémon", PokemonType.NORMAL, null, 1.1, 34.6, Abilities.NATURAL_CURE, Abilities.SERENE_GRACE, Abilities.HEALER, 450, 250, 5, 5, 35, 105, 50, 30, 140, 395, GrowthRate.FAST, 0, false),
+    new PokemonSpecies(Species.TANGELA, 1, false, false, false, "Vine Pokémon", PokemonType.GRASS, null, 1, 35, Abilities.CHLOROPHYLL, Abilities.LEAF_GUARD, Abilities.REGENERATOR, 435, 65, 55, 115, 100, 40, 60, 45, 50, 87, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.KANGASKHAN, 1, false, false, false, "Parent Pokémon", PokemonType.NORMAL, null, 2.2, 80, Abilities.EARLY_BIRD, Abilities.SCRAPPY, Abilities.INNER_FOCUS, 490, 105, 95, 80, 40, 80, 90, 45, 50, 172, GrowthRate.MEDIUM_FAST, 0, false, true,
+      new PokemonForm("Normal", "", PokemonType.NORMAL, null, 2.2, 80, Abilities.EARLY_BIRD, Abilities.SCRAPPY, Abilities.INNER_FOCUS, 490, 105, 95, 80, 40, 80, 90, 45, 50, 172, false, null, true),
+      new PokemonForm("Mega", SpeciesFormKey.MEGA, PokemonType.NORMAL, null, 2.2, 100, Abilities.PARENTAL_BOND, Abilities.PARENTAL_BOND, Abilities.PARENTAL_BOND, 590, 105, 125, 100, 60, 100, 100, 45, 50, 172),
+    ),
+    new PokemonSpecies(Species.HORSEA, 1, false, false, false, "Dragon Pokémon", PokemonType.WATER, null, 0.4, 8, Abilities.SWIFT_SWIM, Abilities.SNIPER, Abilities.DAMP, 295, 30, 40, 70, 70, 25, 60, 225, 50, 59, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.SEADRA, 1, false, false, false, "Dragon Pokémon", PokemonType.WATER, null, 1.2, 25, Abilities.POISON_POINT, Abilities.SNIPER, Abilities.DAMP, 440, 55, 65, 95, 95, 45, 85, 75, 50, 154, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.GOLDEEN, 1, false, false, false, "Goldfish Pokémon", PokemonType.WATER, null, 0.6, 15, Abilities.SWIFT_SWIM, Abilities.WATER_VEIL, Abilities.LIGHTNING_ROD, 320, 45, 67, 60, 35, 50, 63, 225, 50, 64, GrowthRate.MEDIUM_FAST, 50, true),
+    new PokemonSpecies(Species.SEAKING, 1, false, false, false, "Goldfish Pokémon", PokemonType.WATER, null, 1.3, 39, Abilities.SWIFT_SWIM, Abilities.WATER_VEIL, Abilities.LIGHTNING_ROD, 450, 80, 92, 65, 65, 80, 68, 60, 50, 158, GrowthRate.MEDIUM_FAST, 50, true),
+    new PokemonSpecies(Species.STARYU, 1, false, false, false, "Star Shape Pokémon", PokemonType.WATER, null, 0.8, 34.5, Abilities.ILLUMINATE, Abilities.NATURAL_CURE, Abilities.ANALYTIC, 340, 30, 45, 55, 70, 55, 85, 225, 50, 68, GrowthRate.SLOW, null, false),
+    new PokemonSpecies(Species.STARMIE, 1, false, false, false, "Mysterious Pokémon", PokemonType.WATER, PokemonType.PSYCHIC, 1.1, 80, Abilities.ILLUMINATE, Abilities.NATURAL_CURE, Abilities.ANALYTIC, 520, 60, 75, 85, 100, 85, 115, 60, 50, 182, GrowthRate.SLOW, null, false),
+    new PokemonSpecies(Species.MR_MIME, 1, false, false, false, "Barrier Pokémon", PokemonType.PSYCHIC, PokemonType.FAIRY, 1.3, 54.5, Abilities.SOUNDPROOF, Abilities.FILTER, Abilities.TECHNICIAN, 460, 40, 45, 65, 100, 120, 90, 45, 50, 161, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.SCYTHER, 1, false, false, false, "Mantis Pokémon", PokemonType.BUG, PokemonType.FLYING, 1.5, 56, Abilities.SWARM, Abilities.TECHNICIAN, Abilities.STEADFAST, 500, 70, 110, 80, 55, 80, 105, 45, 50, 100, GrowthRate.MEDIUM_FAST, 50, true),
+    new PokemonSpecies(Species.JYNX, 1, false, false, false, "Human Shape Pokémon", PokemonType.ICE, PokemonType.PSYCHIC, 1.4, 40.6, Abilities.OBLIVIOUS, Abilities.FOREWARN, Abilities.DRY_SKIN, 455, 65, 50, 35, 115, 95, 95, 45, 50, 159, GrowthRate.MEDIUM_FAST, 0, false),
+    new PokemonSpecies(Species.ELECTABUZZ, 1, false, false, false, "Electric Pokémon", PokemonType.ELECTRIC, null, 1.1, 30, Abilities.STATIC, Abilities.NONE, Abilities.VITAL_SPIRIT, 490, 65, 83, 57, 95, 85, 105, 45, 50, 172, GrowthRate.MEDIUM_FAST, 75, false),
+    new PokemonSpecies(Species.MAGMAR, 1, false, false, false, "Spitfire Pokémon", PokemonType.FIRE, null, 1.3, 44.5, Abilities.FLAME_BODY, Abilities.NONE, Abilities.VITAL_SPIRIT, 495, 65, 95, 57, 100, 85, 93, 45, 50, 173, GrowthRate.MEDIUM_FAST, 75, false),
+    new PokemonSpecies(Species.PINSIR, 1, false, false, false, "Stag Beetle Pokémon", PokemonType.BUG, null, 1.5, 55, Abilities.HYPER_CUTTER, Abilities.MOLD_BREAKER, Abilities.MOXIE, 500, 65, 125, 100, 55, 70, 85, 45, 50, 175, GrowthRate.SLOW, 50, false, true,
+      new PokemonForm("Normal", "", PokemonType.BUG, null, 1.5, 55, Abilities.HYPER_CUTTER, Abilities.MOLD_BREAKER, Abilities.MOXIE, 500, 65, 125, 100, 55, 70, 85, 45, 50, 175, false, null, true),
+      new PokemonForm("Mega", SpeciesFormKey.MEGA, PokemonType.BUG, PokemonType.FLYING, 1.7, 59, Abilities.AERILATE, Abilities.AERILATE, Abilities.AERILATE, 600, 65, 155, 120, 65, 90, 105, 45, 50, 175),
+    ),
+    new PokemonSpecies(Species.TAUROS, 1, false, false, false, "Wild Bull Pokémon", PokemonType.NORMAL, null, 1.4, 88.4, Abilities.INTIMIDATE, Abilities.ANGER_POINT, Abilities.SHEER_FORCE, 490, 75, 100, 95, 40, 70, 110, 45, 50, 172, GrowthRate.SLOW, 100, false),
+    new PokemonSpecies(Species.MAGIKARP, 1, false, false, false, "Fish Pokémon", PokemonType.WATER, null, 0.9, 10, Abilities.SWIFT_SWIM, Abilities.NONE, Abilities.RATTLED, 200, 20, 10, 55, 15, 20, 80, 255, 50, 40, GrowthRate.SLOW, 50, true),
+    new PokemonSpecies(Species.GYARADOS, 1, false, false, false, "Atrocious Pokémon", PokemonType.WATER, PokemonType.FLYING, 6.5, 235, Abilities.INTIMIDATE, Abilities.NONE, Abilities.MOXIE, 540, 95, 125, 79, 60, 100, 81, 45, 50, 189, GrowthRate.SLOW, 50, true, true,
+      new PokemonForm("Normal", "", PokemonType.WATER, PokemonType.FLYING, 6.5, 235, Abilities.INTIMIDATE, Abilities.NONE, Abilities.MOXIE, 540, 95, 125, 79, 60, 100, 81, 45, 50, 189, true, null, true),
+      new PokemonForm("Mega", SpeciesFormKey.MEGA, PokemonType.WATER, PokemonType.DARK, 6.5, 305, Abilities.MOLD_BREAKER, Abilities.MOLD_BREAKER, Abilities.MOLD_BREAKER, 640, 95, 155, 109, 70, 130, 81, 45, 50, 189, true),
+    ),
+    new PokemonSpecies(Species.LAPRAS, 1, false, false, false, "Transport Pokémon", PokemonType.WATER, PokemonType.ICE, 2.5, 220, Abilities.WATER_ABSORB, Abilities.SHELL_ARMOR, Abilities.HYDRATION, 535, 130, 85, 80, 85, 95, 60, 45, 50, 187, GrowthRate.SLOW, 50, false, true,
+      new PokemonForm("Normal", "", PokemonType.WATER, PokemonType.ICE, 2.5, 220, Abilities.WATER_ABSORB, Abilities.SHELL_ARMOR, Abilities.HYDRATION, 535, 130, 85, 80, 85, 95, 60, 45, 50, 187, false, null, true),
+      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, PokemonType.WATER, PokemonType.ICE, 24, 999.9, Abilities.SHIELD_DUST, Abilities.SHIELD_DUST, Abilities.SHIELD_DUST, 635, 170, 97, 85, 107, 111, 65, 45, 50, 187),
+    ),
+    new PokemonSpecies(Species.DITTO, 1, false, false, false, "Transform Pokémon", PokemonType.NORMAL, null, 0.3, 4, Abilities.LIMBER, Abilities.NONE, Abilities.IMPOSTER, 288, 48, 48, 48, 48, 48, 48, 35, 50, 101, GrowthRate.MEDIUM_FAST, null, false),
+    new PokemonSpecies(Species.EEVEE, 1, false, false, false, "Evolution Pokémon", PokemonType.NORMAL, null, 0.3, 6.5, Abilities.RUN_AWAY, Abilities.ADAPTABILITY, Abilities.ANTICIPATION, 325, 55, 55, 50, 45, 65, 55, 45, 50, 65, GrowthRate.MEDIUM_FAST, 87.5, false, true,
+      new PokemonForm("Normal", "", PokemonType.NORMAL, null, 0.3, 6.5, Abilities.RUN_AWAY, Abilities.ADAPTABILITY, Abilities.ANTICIPATION, 325, 55, 55, 50, 45, 65, 55, 45, 50, 65, false, null, true),
+      new PokemonForm("Partner", "partner", PokemonType.NORMAL, null, 0.3, 6.5, Abilities.RUN_AWAY, Abilities.ADAPTABILITY, Abilities.ANTICIPATION, 435, 65, 75, 70, 65, 85, 75, 45, 50, 65, false, null, true),
+      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, PokemonType.NORMAL, null, 18, 999.9, Abilities.PROTEAN, Abilities.PROTEAN, Abilities.PROTEAN, 535, 110, 95, 70, 90, 85, 85, 45, 50, 65), //+100 BST from Partner Form
+    ),
+    new PokemonSpecies(Species.VAPOREON, 1, false, false, false, "Bubble Jet Pokémon", PokemonType.WATER, null, 1, 29, Abilities.WATER_ABSORB, Abilities.NONE, Abilities.HYDRATION, 525, 130, 65, 60, 110, 95, 65, 45, 50, 184, GrowthRate.MEDIUM_FAST, 87.5, false),
+    new PokemonSpecies(Species.JOLTEON, 1, false, false, false, "Lightning Pokémon", PokemonType.ELECTRIC, null, 0.8, 24.5, Abilities.VOLT_ABSORB, Abilities.NONE, Abilities.QUICK_FEET, 525, 65, 65, 60, 110, 95, 130, 45, 50, 184, GrowthRate.MEDIUM_FAST, 87.5, false),
+    new PokemonSpecies(Species.FLAREON, 1, false, false, false, "Flame Pokémon", PokemonType.FIRE, null, 0.9, 25, Abilities.FLASH_FIRE, Abilities.NONE, Abilities.GUTS, 525, 65, 130, 60, 95, 110, 65, 45, 50, 184, GrowthRate.MEDIUM_FAST, 87.5, false),
+    new PokemonSpecies(Species.PORYGON, 1, false, false, false, "Virtual Pokémon", PokemonType.NORMAL, null, 0.8, 36.5, Abilities.TRACE, Abilities.DOWNLOAD, Abilities.ANALYTIC, 395, 65, 60, 70, 85, 75, 40, 45, 50, 79, GrowthRate.MEDIUM_FAST, null, false),
+    new PokemonSpecies(Species.OMANYTE, 1, false, false, false, "Spiral Pokémon", PokemonType.ROCK, PokemonType.WATER, 0.4, 7.5, Abilities.SWIFT_SWIM, Abilities.SHELL_ARMOR, Abilities.WEAK_ARMOR, 355, 35, 40, 100, 90, 55, 35, 45, 50, 71, GrowthRate.MEDIUM_FAST, 87.5, false),
+    new PokemonSpecies(Species.OMASTAR, 1, false, false, false, "Spiral Pokémon", PokemonType.ROCK, PokemonType.WATER, 1, 35, Abilities.SWIFT_SWIM, Abilities.SHELL_ARMOR, Abilities.WEAK_ARMOR, 495, 70, 60, 125, 115, 70, 55, 45, 50, 173, GrowthRate.MEDIUM_FAST, 87.5, false),
+    new PokemonSpecies(Species.KABUTO, 1, false, false, false, "Shellfish Pokémon", PokemonType.ROCK, PokemonType.WATER, 0.5, 11.5, Abilities.SWIFT_SWIM, Abilities.BATTLE_ARMOR, Abilities.WEAK_ARMOR, 355, 30, 80, 90, 55, 45, 55, 45, 50, 71, GrowthRate.MEDIUM_FAST, 87.5, false),
+    new PokemonSpecies(Species.KABUTOPS, 1, false, false, false, "Shellfish Pokémon", PokemonType.ROCK, PokemonType.WATER, 1.3, 40.5, Abilities.SWIFT_SWIM, Abilities.BATTLE_ARMOR, Abilities.WEAK_ARMOR, 495, 60, 115, 105, 65, 70, 80, 45, 50, 173, GrowthRate.MEDIUM_FAST, 87.5, false),
+    new PokemonSpecies(Species.AERODACTYL, 1, false, false, false, "Fossil Pokémon", PokemonType.ROCK, PokemonType.FLYING, 1.8, 59, Abilities.ROCK_HEAD, Abilities.PRESSURE, Abilities.UNNERVE, 515, 80, 105, 65, 60, 75, 130, 45, 50, 180, GrowthRate.SLOW, 87.5, false, true,
+      new PokemonForm("Normal", "", PokemonType.ROCK, PokemonType.FLYING, 1.8, 59, Abilities.ROCK_HEAD, Abilities.PRESSURE, Abilities.UNNERVE, 515, 80, 105, 65, 60, 75, 130, 45, 50, 180, false, null, true),
+      new PokemonForm("Mega", SpeciesFormKey.MEGA, PokemonType.ROCK, PokemonType.FLYING, 2.1, 79, Abilities.TOUGH_CLAWS, Abilities.TOUGH_CLAWS, Abilities.TOUGH_CLAWS, 615, 80, 135, 85, 70, 95, 150, 45, 50, 180),
+    ),
+    new PokemonSpecies(Species.SNORLAX, 1, false, false, false, "Sleeping Pokémon", PokemonType.NORMAL, null, 2.1, 460, Abilities.IMMUNITY, Abilities.THICK_FAT, Abilities.GLUTTONY, 540, 160, 110, 65, 65, 110, 30, 25, 50, 189, GrowthRate.SLOW, 87.5, false, true,
+      new PokemonForm("Normal", "", PokemonType.NORMAL, null, 2.1, 460, Abilities.IMMUNITY, Abilities.THICK_FAT, Abilities.GLUTTONY, 540, 160, 110, 65, 65, 110, 30, 25, 50, 189, false, null, true),
+      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, PokemonType.NORMAL, null, 35, 999.9, Abilities.HARVEST, Abilities.HARVEST, Abilities.HARVEST, 640, 210, 135, 70, 90, 115, 20, 25, 50, 189),
+    ),
+    new PokemonSpecies(Species.ARTICUNO, 1, true, false, false, "Freeze Pokémon", PokemonType.ICE, PokemonType.FLYING, 1.7, 55.4, Abilities.PRESSURE, Abilities.NONE, Abilities.SNOW_CLOAK, 580, 90, 85, 100, 95, 125, 85, 3, 35, 290, GrowthRate.SLOW, null, false),
+    new PokemonSpecies(Species.ZAPDOS, 1, true, false, false, "Electric Pokémon", PokemonType.ELECTRIC, PokemonType.FLYING, 1.6, 52.6, Abilities.PRESSURE, Abilities.NONE, Abilities.STATIC, 580, 90, 90, 85, 125, 90, 100, 3, 35, 290, GrowthRate.SLOW, null, false),
+    new PokemonSpecies(Species.MOLTRES, 1, true, false, false, "Flame Pokémon", PokemonType.FIRE, PokemonType.FLYING, 2, 60, Abilities.PRESSURE, Abilities.NONE, Abilities.FLAME_BODY, 580, 90, 100, 90, 125, 85, 90, 3, 35, 290, GrowthRate.SLOW, null, false),
+    new PokemonSpecies(Species.DRATINI, 1, false, false, false, "Dragon Pokémon", PokemonType.DRAGON, null, 1.8, 3.3, Abilities.SHED_SKIN, Abilities.NONE, Abilities.MARVEL_SCALE, 300, 41, 64, 45, 50, 50, 50, 45, 35, 60, GrowthRate.SLOW, 50, false),
+    new PokemonSpecies(Species.DRAGONAIR, 1, false, false, false, "Dragon Pokémon", PokemonType.DRAGON, null, 4, 16.5, Abilities.SHED_SKIN, Abilities.NONE, Abilities.MARVEL_SCALE, 420, 61, 84, 65, 70, 70, 70, 45, 35, 147, GrowthRate.SLOW, 50, false),
+    new PokemonSpecies(Species.DRAGONITE, 1, false, false, false, "Dragon Pokémon", PokemonType.DRAGON, PokemonType.FLYING, 2.2, 210, Abilities.INNER_FOCUS, Abilities.NONE, Abilities.MULTISCALE, 600, 91, 134, 95, 100, 100, 80, 45, 35, 300, GrowthRate.SLOW, 50, false),
+    new PokemonSpecies(Species.MEWTWO, 1, false, true, false, "Genetic Pokémon", PokemonType.PSYCHIC, null, 2, 122, Abilities.PRESSURE, Abilities.NONE, Abilities.UNNERVE, 680, 106, 110, 90, 154, 90, 130, 3, 0, 340, GrowthRate.SLOW, null, false, true,
+      new PokemonForm("Normal", "", PokemonType.PSYCHIC, null, 2, 122, Abilities.PRESSURE, Abilities.NONE, Abilities.UNNERVE, 680, 106, 110, 90, 154, 90, 130, 3, 0, 340, false, null, true),
+      new PokemonForm("Mega X", SpeciesFormKey.MEGA_X, PokemonType.PSYCHIC, PokemonType.FIGHTING, 2.3, 127, Abilities.STEADFAST, Abilities.NONE, Abilities.STEADFAST, 780, 106, 190, 100, 154, 100, 130, 3, 0, 340),
+      new PokemonForm("Mega Y", SpeciesFormKey.MEGA_Y, PokemonType.PSYCHIC, null, 1.5, 33, Abilities.INSOMNIA, Abilities.NONE, Abilities.INSOMNIA, 780, 106, 150, 70, 194, 120, 140, 3, 0, 340),
+    ),
+    new PokemonSpecies(Species.MEW, 1, false, false, true, "New Species Pokémon", PokemonType.PSYCHIC, null, 0.4, 4, Abilities.SYNCHRONIZE, Abilities.NONE, Abilities.NONE, 600, 100, 100, 100, 100, 100, 100, 45, 100, 300, GrowthRate.MEDIUM_SLOW, null, false),
+    new PokemonSpecies(Species.CHIKORITA, 2, false, false, false, "Leaf Pokémon", PokemonType.GRASS, null, 0.9, 6.4, Abilities.OVERGROW, Abilities.NONE, Abilities.LEAF_GUARD, 318, 45, 49, 65, 49, 65, 45, 45, 70, 64, GrowthRate.MEDIUM_SLOW, 87.5, false),
+    new PokemonSpecies(Species.BAYLEEF, 2, false, false, false, "Leaf Pokémon", PokemonType.GRASS, null, 1.2, 15.8, Abilities.OVERGROW, Abilities.NONE, Abilities.LEAF_GUARD, 405, 60, 62, 80, 63, 80, 60, 45, 70, 142, GrowthRate.MEDIUM_SLOW, 87.5, false),
+    new PokemonSpecies(Species.MEGANIUM, 2, false, false, false, "Herb Pokémon", PokemonType.GRASS, null, 1.8, 100.5, Abilities.OVERGROW, Abilities.NONE, Abilities.LEAF_GUARD, 525, 80, 82, 100, 83, 100, 80, 45, 70, 263, GrowthRate.MEDIUM_SLOW, 87.5, true),
+    new PokemonSpecies(Species.CYNDAQUIL, 2, false, false, false, "Fire Mouse Pokémon", PokemonType.FIRE, null, 0.5, 7.9, Abilities.BLAZE, Abilities.NONE, Abilities.FLASH_FIRE, 309, 39, 52, 43, 60, 50, 65, 45, 70, 62, GrowthRate.MEDIUM_SLOW, 87.5, false),
+    new PokemonSpecies(Species.QUILAVA, 2, false, false, false, "Volcano Pokémon", PokemonType.FIRE, null, 0.9, 19, Abilities.BLAZE, Abilities.NONE, Abilities.FLASH_FIRE, 405, 58, 64, 58, 80, 65, 80, 45, 70, 142, GrowthRate.MEDIUM_SLOW, 87.5, false),
+    new PokemonSpecies(Species.TYPHLOSION, 2, false, false, false, "Volcano Pokémon", PokemonType.FIRE, null, 1.7, 79.5, Abilities.BLAZE, Abilities.NONE, Abilities.FLASH_FIRE, 534, 78, 84, 78, 109, 85, 100, 45, 70, 267, GrowthRate.MEDIUM_SLOW, 87.5, false),
+    new PokemonSpecies(Species.TOTODILE, 2, false, false, false, "Big Jaw Pokémon", PokemonType.WATER, null, 0.6, 9.5, Abilities.TORRENT, Abilities.NONE, Abilities.SHEER_FORCE, 314, 50, 65, 64, 44, 48, 43, 45, 70, 63, GrowthRate.MEDIUM_SLOW, 87.5, false),
+    new PokemonSpecies(Species.CROCONAW, 2, false, false, false, "Big Jaw Pokémon", PokemonType.WATER, null, 1.1, 25, Abilities.TORRENT, Abilities.NONE, Abilities.SHEER_FORCE, 405, 65, 80, 80, 59, 63, 58, 45, 70, 142, GrowthRate.MEDIUM_SLOW, 87.5, false),
+    new PokemonSpecies(Species.FERALIGATR, 2, false, false, false, "Big Jaw Pokémon", PokemonType.WATER, null, 2.3, 88.8, Abilities.TORRENT, Abilities.NONE, Abilities.SHEER_FORCE, 530, 85, 105, 100, 79, 83, 78, 45, 70, 265, GrowthRate.MEDIUM_SLOW, 87.5, false),
+    new PokemonSpecies(Species.SENTRET, 2, false, false, false, "Scout Pokémon", PokemonType.NORMAL, null, 0.8, 6, Abilities.RUN_AWAY, Abilities.KEEN_EYE, Abilities.FRISK, 215, 35, 46, 34, 35, 45, 20, 255, 70, 43, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.FURRET, 2, false, false, false, "Long Body Pokémon", PokemonType.NORMAL, null, 1.8, 32.5, Abilities.RUN_AWAY, Abilities.KEEN_EYE, Abilities.FRISK, 415, 85, 76, 64, 45, 55, 90, 90, 70, 145, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.HOOTHOOT, 2, false, false, false, "Owl Pokémon", PokemonType.NORMAL, PokemonType.FLYING, 0.7, 21.2, Abilities.INSOMNIA, Abilities.KEEN_EYE, Abilities.TINTED_LENS, 262, 60, 30, 30, 36, 56, 50, 255, 50, 52, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.NOCTOWL, 2, false, false, false, "Owl Pokémon", PokemonType.NORMAL, PokemonType.FLYING, 1.6, 40.8, Abilities.INSOMNIA, Abilities.KEEN_EYE, Abilities.TINTED_LENS, 452, 100, 50, 50, 86, 96, 70, 90, 50, 158, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.LEDYBA, 2, false, false, false, "Five Star Pokémon", PokemonType.BUG, PokemonType.FLYING, 1, 10.8, Abilities.SWARM, Abilities.EARLY_BIRD, Abilities.RATTLED, 265, 40, 20, 30, 40, 80, 55, 255, 70, 53, GrowthRate.FAST, 50, true),
+    new PokemonSpecies(Species.LEDIAN, 2, false, false, false, "Five Star Pokémon", PokemonType.BUG, PokemonType.FLYING, 1.4, 35.6, Abilities.SWARM, Abilities.EARLY_BIRD, Abilities.IRON_FIST, 390, 55, 35, 50, 55, 110, 85, 90, 70, 137, GrowthRate.FAST, 50, true),
+    new PokemonSpecies(Species.SPINARAK, 2, false, false, false, "String Spit Pokémon", PokemonType.BUG, PokemonType.POISON, 0.5, 8.5, Abilities.SWARM, Abilities.INSOMNIA, Abilities.SNIPER, 250, 40, 60, 40, 40, 40, 30, 255, 70, 50, GrowthRate.FAST, 50, false),
+    new PokemonSpecies(Species.ARIADOS, 2, false, false, false, "Long Leg Pokémon", PokemonType.BUG, PokemonType.POISON, 1.1, 33.5, Abilities.SWARM, Abilities.INSOMNIA, Abilities.SNIPER, 400, 70, 90, 70, 60, 70, 40, 90, 70, 140, GrowthRate.FAST, 50, false),
+    new PokemonSpecies(Species.CROBAT, 2, false, false, false, "Bat Pokémon", PokemonType.POISON, PokemonType.FLYING, 1.8, 75, Abilities.INNER_FOCUS, Abilities.NONE, Abilities.INFILTRATOR, 535, 85, 90, 80, 70, 80, 130, 90, 50, 268, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.CHINCHOU, 2, false, false, false, "Angler Pokémon", PokemonType.WATER, PokemonType.ELECTRIC, 0.5, 12, Abilities.VOLT_ABSORB, Abilities.ILLUMINATE, Abilities.WATER_ABSORB, 330, 75, 38, 38, 56, 56, 67, 190, 50, 66, GrowthRate.SLOW, 50, false),
+    new PokemonSpecies(Species.LANTURN, 2, false, false, false, "Light Pokémon", PokemonType.WATER, PokemonType.ELECTRIC, 1.2, 22.5, Abilities.VOLT_ABSORB, Abilities.ILLUMINATE, Abilities.WATER_ABSORB, 460, 125, 58, 58, 76, 76, 67, 75, 50, 161, GrowthRate.SLOW, 50, false),
+    new PokemonSpecies(Species.PICHU, 2, false, false, false, "Tiny Mouse Pokémon", PokemonType.ELECTRIC, null, 0.3, 2, Abilities.STATIC, Abilities.NONE, Abilities.LIGHTNING_ROD, 205, 20, 40, 15, 35, 35, 60, 190, 70, 41, GrowthRate.MEDIUM_FAST, 50, false, false,
+      new PokemonForm("Normal", "", PokemonType.ELECTRIC, null, 1.4, 61.5, Abilities.STATIC, Abilities.NONE, Abilities.LIGHTNING_ROD, 205, 20, 40, 15, 35, 35, 60, 190, 70, 41, false, null, true),
+      new PokemonForm("Spiky-Eared", "spiky", PokemonType.ELECTRIC, null, 1.4, 61.5, Abilities.STATIC, Abilities.NONE, Abilities.LIGHTNING_ROD, 205, 20, 40, 15, 35, 35, 60, 190, 70, 41, false, null, true),
+    ),
+    new PokemonSpecies(Species.CLEFFA, 2, false, false, false, "Star Shape Pokémon", PokemonType.FAIRY, null, 0.3, 3, Abilities.CUTE_CHARM, Abilities.MAGIC_GUARD, Abilities.FRIEND_GUARD, 218, 50, 25, 28, 45, 55, 15, 150, 140, 44, GrowthRate.FAST, 25, false),
+    new PokemonSpecies(Species.IGGLYBUFF, 2, false, false, false, "Balloon Pokémon", PokemonType.NORMAL, PokemonType.FAIRY, 0.3, 1, Abilities.CUTE_CHARM, Abilities.COMPETITIVE, Abilities.FRIEND_GUARD, 210, 90, 30, 15, 40, 20, 15, 170, 50, 42, GrowthRate.FAST, 25, false),
+    new PokemonSpecies(Species.TOGEPI, 2, false, false, false, "Spike Ball Pokémon", PokemonType.FAIRY, null, 0.3, 1.5, Abilities.HUSTLE, Abilities.SERENE_GRACE, Abilities.SUPER_LUCK, 245, 35, 20, 65, 40, 65, 20, 190, 50, 49, GrowthRate.FAST, 87.5, false),
+    new PokemonSpecies(Species.TOGETIC, 2, false, false, false, "Happiness Pokémon", PokemonType.FAIRY, PokemonType.FLYING, 0.6, 3.2, Abilities.HUSTLE, Abilities.SERENE_GRACE, Abilities.SUPER_LUCK, 405, 55, 40, 85, 80, 105, 40, 75, 50, 142, GrowthRate.FAST, 87.5, false),
+    new PokemonSpecies(Species.NATU, 2, false, false, false, "Tiny Bird Pokémon", PokemonType.PSYCHIC, PokemonType.FLYING, 0.2, 2, Abilities.SYNCHRONIZE, Abilities.EARLY_BIRD, Abilities.MAGIC_BOUNCE, 320, 40, 50, 45, 70, 45, 70, 190, 50, 64, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.XATU, 2, false, false, false, "Mystic Pokémon", PokemonType.PSYCHIC, PokemonType.FLYING, 1.5, 15, Abilities.SYNCHRONIZE, Abilities.EARLY_BIRD, Abilities.MAGIC_BOUNCE, 470, 65, 75, 70, 95, 70, 95, 75, 50, 165, GrowthRate.MEDIUM_FAST, 50, true),
+    new PokemonSpecies(Species.MAREEP, 2, false, false, false, "Wool Pokémon", PokemonType.ELECTRIC, null, 0.6, 7.8, Abilities.STATIC, Abilities.NONE, Abilities.PLUS, 280, 55, 40, 40, 65, 45, 35, 235, 70, 56, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.FLAAFFY, 2, false, false, false, "Wool Pokémon", PokemonType.ELECTRIC, null, 0.8, 13.3, Abilities.STATIC, Abilities.NONE, Abilities.PLUS, 365, 70, 55, 55, 80, 60, 45, 120, 70, 128, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.AMPHAROS, 2, false, false, false, "Light Pokémon", PokemonType.ELECTRIC, null, 1.4, 61.5, Abilities.STATIC, Abilities.NONE, Abilities.PLUS, 510, 90, 75, 85, 115, 90, 55, 45, 70, 255, GrowthRate.MEDIUM_SLOW, 50, false, true,
+      new PokemonForm("Normal", "", PokemonType.ELECTRIC, null, 1.4, 61.5, Abilities.STATIC, Abilities.NONE, Abilities.PLUS, 510, 90, 75, 85, 115, 90, 55, 45, 70, 255, false, null, true),
+      new PokemonForm("Mega", SpeciesFormKey.MEGA, PokemonType.ELECTRIC, PokemonType.DRAGON, 1.4, 61.5, Abilities.MOLD_BREAKER, Abilities.NONE, Abilities.MOLD_BREAKER, 610, 90, 95, 105, 165, 110, 45, 45, 70, 255),
+    ),
+    new PokemonSpecies(Species.BELLOSSOM, 2, false, false, false, "Flower Pokémon", PokemonType.GRASS, null, 0.4, 5.8, Abilities.CHLOROPHYLL, Abilities.NONE, Abilities.HEALER, 490, 75, 80, 95, 90, 100, 50, 45, 50, 245, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.MARILL, 2, false, false, false, "Aqua Mouse Pokémon", PokemonType.WATER, PokemonType.FAIRY, 0.4, 8.5, Abilities.THICK_FAT, Abilities.HUGE_POWER, Abilities.SAP_SIPPER, 250, 70, 20, 50, 20, 50, 40, 190, 50, 88, GrowthRate.FAST, 50, false),
+    new PokemonSpecies(Species.AZUMARILL, 2, false, false, false, "Aqua Rabbit Pokémon", PokemonType.WATER, PokemonType.FAIRY, 0.8, 28.5, Abilities.THICK_FAT, Abilities.HUGE_POWER, Abilities.SAP_SIPPER, 420, 100, 50, 80, 60, 80, 50, 75, 50, 210, GrowthRate.FAST, 50, false),
+    new PokemonSpecies(Species.SUDOWOODO, 2, false, false, false, "Imitation Pokémon", PokemonType.ROCK, null, 1.2, 38, Abilities.STURDY, Abilities.ROCK_HEAD, Abilities.RATTLED, 410, 70, 100, 115, 30, 65, 30, 65, 50, 144, GrowthRate.MEDIUM_FAST, 50, true),
+    new PokemonSpecies(Species.POLITOED, 2, false, false, false, "Frog Pokémon", PokemonType.WATER, null, 1.1, 33.9, Abilities.WATER_ABSORB, Abilities.DAMP, Abilities.DRIZZLE, 500, 90, 75, 75, 90, 100, 70, 45, 50, 250, GrowthRate.MEDIUM_SLOW, 50, true),
+    new PokemonSpecies(Species.HOPPIP, 2, false, false, false, "Cottonweed Pokémon", PokemonType.GRASS, PokemonType.FLYING, 0.4, 0.5, Abilities.CHLOROPHYLL, Abilities.LEAF_GUARD, Abilities.INFILTRATOR, 250, 35, 35, 40, 35, 55, 50, 255, 70, 50, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.SKIPLOOM, 2, false, false, false, "Cottonweed Pokémon", PokemonType.GRASS, PokemonType.FLYING, 0.6, 1, Abilities.CHLOROPHYLL, Abilities.LEAF_GUARD, Abilities.INFILTRATOR, 340, 55, 45, 50, 45, 65, 80, 120, 70, 119, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.JUMPLUFF, 2, false, false, false, "Cottonweed Pokémon", PokemonType.GRASS, PokemonType.FLYING, 0.8, 3, Abilities.CHLOROPHYLL, Abilities.LEAF_GUARD, Abilities.INFILTRATOR, 460, 75, 55, 70, 55, 95, 110, 45, 70, 230, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.AIPOM, 2, false, false, false, "Long Tail Pokémon", PokemonType.NORMAL, null, 0.8, 11.5, Abilities.RUN_AWAY, Abilities.PICKUP, Abilities.SKILL_LINK, 360, 55, 70, 55, 40, 55, 85, 45, 70, 72, GrowthRate.FAST, 50, true),
+    new PokemonSpecies(Species.SUNKERN, 2, false, false, false, "Seed Pokémon", PokemonType.GRASS, null, 0.3, 1.8, Abilities.CHLOROPHYLL, Abilities.SOLAR_POWER, Abilities.EARLY_BIRD, 180, 30, 30, 30, 30, 30, 30, 235, 70, 36, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.SUNFLORA, 2, false, false, false, "Sun Pokémon", PokemonType.GRASS, null, 0.8, 8.5, Abilities.CHLOROPHYLL, Abilities.SOLAR_POWER, Abilities.EARLY_BIRD, 425, 75, 75, 55, 105, 85, 30, 120, 70, 149, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.YANMA, 2, false, false, false, "Clear Wing Pokémon", PokemonType.BUG, PokemonType.FLYING, 1.2, 38, Abilities.SPEED_BOOST, Abilities.COMPOUND_EYES, Abilities.FRISK, 390, 65, 65, 45, 75, 45, 95, 75, 70, 78, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.WOOPER, 2, false, false, false, "Water Fish Pokémon", PokemonType.WATER, PokemonType.GROUND, 0.4, 8.5, Abilities.DAMP, Abilities.WATER_ABSORB, Abilities.UNAWARE, 210, 55, 45, 45, 25, 25, 15, 255, 50, 42, GrowthRate.MEDIUM_FAST, 50, true),
+    new PokemonSpecies(Species.QUAGSIRE, 2, false, false, false, "Water Fish Pokémon", PokemonType.WATER, PokemonType.GROUND, 1.4, 75, Abilities.DAMP, Abilities.WATER_ABSORB, Abilities.UNAWARE, 430, 95, 85, 85, 65, 65, 35, 90, 50, 151, GrowthRate.MEDIUM_FAST, 50, true),
+    new PokemonSpecies(Species.ESPEON, 2, false, false, false, "Sun Pokémon", PokemonType.PSYCHIC, null, 0.9, 26.5, Abilities.SYNCHRONIZE, Abilities.NONE, Abilities.MAGIC_BOUNCE, 525, 65, 65, 60, 130, 95, 110, 45, 50, 184, GrowthRate.MEDIUM_FAST, 87.5, false),
+    new PokemonSpecies(Species.UMBREON, 2, false, false, false, "Moonlight Pokémon", PokemonType.DARK, null, 1, 27, Abilities.SYNCHRONIZE, Abilities.NONE, Abilities.INNER_FOCUS, 525, 95, 65, 110, 60, 130, 65, 45, 35, 184, GrowthRate.MEDIUM_FAST, 87.5, false),
+    new PokemonSpecies(Species.MURKROW, 2, false, false, false, "Darkness Pokémon", PokemonType.DARK, PokemonType.FLYING, 0.5, 2.1, Abilities.INSOMNIA, Abilities.SUPER_LUCK, Abilities.PRANKSTER, 405, 60, 85, 42, 85, 42, 91, 30, 35, 81, GrowthRate.MEDIUM_SLOW, 50, true),
+    new PokemonSpecies(Species.SLOWKING, 2, false, false, false, "Royal Pokémon", PokemonType.WATER, PokemonType.PSYCHIC, 2, 79.5, Abilities.OBLIVIOUS, Abilities.OWN_TEMPO, Abilities.REGENERATOR, 490, 95, 75, 80, 100, 110, 30, 70, 50, 172, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.MISDREAVUS, 2, false, false, false, "Screech Pokémon", PokemonType.GHOST, null, 0.7, 1, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 435, 60, 60, 60, 85, 85, 85, 45, 35, 87, GrowthRate.FAST, 50, false),
+    new PokemonSpecies(Species.UNOWN, 2, false, false, false, "Symbol Pokémon", PokemonType.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, GrowthRate.MEDIUM_FAST, null, false, false,
+      new PokemonForm("A", "a", PokemonType.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true),
+      new PokemonForm("B", "b", PokemonType.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true),
+      new PokemonForm("C", "c", PokemonType.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true),
+      new PokemonForm("D", "d", PokemonType.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true),
+      new PokemonForm("E", "e", PokemonType.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true),
+      new PokemonForm("F", "f", PokemonType.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true),
+      new PokemonForm("G", "g", PokemonType.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true),
+      new PokemonForm("H", "h", PokemonType.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true),
+      new PokemonForm("I", "i", PokemonType.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true),
+      new PokemonForm("J", "j", PokemonType.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true),
+      new PokemonForm("K", "k", PokemonType.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true),
+      new PokemonForm("L", "l", PokemonType.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true),
+      new PokemonForm("M", "m", PokemonType.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true),
+      new PokemonForm("N", "n", PokemonType.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true),
+      new PokemonForm("O", "o", PokemonType.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true),
+      new PokemonForm("P", "p", PokemonType.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true),
+      new PokemonForm("Q", "q", PokemonType.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true),
+      new PokemonForm("R", "r", PokemonType.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true),
+      new PokemonForm("S", "s", PokemonType.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true),
+      new PokemonForm("T", "t", PokemonType.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true),
+      new PokemonForm("U", "u", PokemonType.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true),
+      new PokemonForm("V", "v", PokemonType.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true),
+      new PokemonForm("W", "w", PokemonType.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true),
+      new PokemonForm("X", "x", PokemonType.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true),
+      new PokemonForm("Y", "y", PokemonType.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true),
+      new PokemonForm("Z", "z", PokemonType.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true),
+      new PokemonForm("!", "exclamation", PokemonType.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true),
+      new PokemonForm("?", "question", PokemonType.PSYCHIC, null, 0.5, 5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 336, 48, 72, 48, 72, 48, 48, 225, 70, 118, false, null, true),
+    ),
+    new PokemonSpecies(Species.WOBBUFFET, 2, false, false, false, "Patient Pokémon", PokemonType.PSYCHIC, null, 1.3, 28.5, Abilities.SHADOW_TAG, Abilities.NONE, Abilities.TELEPATHY, 405, 190, 33, 58, 33, 58, 33, 45, 50, 142, GrowthRate.MEDIUM_FAST, 50, true),
+    new PokemonSpecies(Species.GIRAFARIG, 2, false, false, false, "Long Neck Pokémon", PokemonType.NORMAL, PokemonType.PSYCHIC, 1.5, 41.5, Abilities.INNER_FOCUS, Abilities.EARLY_BIRD, Abilities.SAP_SIPPER, 455, 70, 80, 65, 90, 65, 85, 60, 70, 159, GrowthRate.MEDIUM_FAST, 50, true),
+    new PokemonSpecies(Species.PINECO, 2, false, false, false, "Bagworm Pokémon", PokemonType.BUG, null, 0.6, 7.2, Abilities.STURDY, Abilities.NONE, Abilities.OVERCOAT, 290, 50, 65, 90, 35, 35, 15, 190, 70, 58, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.FORRETRESS, 2, false, false, false, "Bagworm Pokémon", PokemonType.BUG, PokemonType.STEEL, 1.2, 125.8, Abilities.STURDY, Abilities.NONE, Abilities.OVERCOAT, 465, 75, 90, 140, 60, 60, 40, 75, 70, 163, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.DUNSPARCE, 2, false, false, false, "Land Snake Pokémon", PokemonType.NORMAL, null, 1.5, 14, Abilities.SERENE_GRACE, Abilities.RUN_AWAY, Abilities.RATTLED, 415, 100, 70, 70, 65, 65, 45, 190, 50, 145, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.GLIGAR, 2, false, false, false, "Fly Scorpion Pokémon", PokemonType.GROUND, PokemonType.FLYING, 1.1, 64.8, Abilities.HYPER_CUTTER, Abilities.SAND_VEIL, Abilities.IMMUNITY, 430, 65, 75, 105, 35, 65, 85, 60, 70, 86, GrowthRate.MEDIUM_SLOW, 50, true),
+    new PokemonSpecies(Species.STEELIX, 2, false, false, false, "Iron Snake Pokémon", PokemonType.STEEL, PokemonType.GROUND, 9.2, 400, Abilities.ROCK_HEAD, Abilities.STURDY, Abilities.SHEER_FORCE, 510, 75, 85, 200, 55, 65, 30, 25, 50, 179, GrowthRate.MEDIUM_FAST, 50, true, true,
+      new PokemonForm("Normal", "", PokemonType.STEEL, PokemonType.GROUND, 9.2, 400, Abilities.ROCK_HEAD, Abilities.STURDY, Abilities.SHEER_FORCE, 510, 75, 85, 200, 55, 65, 30, 25, 50, 179, true, null, true),
+      new PokemonForm("Mega", SpeciesFormKey.MEGA, PokemonType.STEEL, PokemonType.GROUND, 10.5, 740, Abilities.SAND_FORCE, Abilities.SAND_FORCE, Abilities.SAND_FORCE, 610, 75, 125, 230, 55, 95, 30, 25, 50, 179, true),
+    ),
+    new PokemonSpecies(Species.SNUBBULL, 2, false, false, false, "Fairy Pokémon", PokemonType.FAIRY, null, 0.6, 7.8, Abilities.INTIMIDATE, Abilities.RUN_AWAY, Abilities.RATTLED, 300, 60, 80, 50, 40, 40, 30, 190, 70, 60, GrowthRate.FAST, 25, false),
+    new PokemonSpecies(Species.GRANBULL, 2, false, false, false, "Fairy Pokémon", PokemonType.FAIRY, null, 1.4, 48.7, Abilities.INTIMIDATE, Abilities.QUICK_FEET, Abilities.RATTLED, 450, 90, 120, 75, 60, 60, 45, 75, 70, 158, GrowthRate.FAST, 25, false),
+    new PokemonSpecies(Species.QWILFISH, 2, false, false, false, "Balloon Pokémon", PokemonType.WATER, PokemonType.POISON, 0.5, 3.9, Abilities.POISON_POINT, Abilities.SWIFT_SWIM, Abilities.INTIMIDATE, 440, 65, 95, 85, 55, 55, 85, 45, 50, 88, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.SCIZOR, 2, false, false, false, "Pincer Pokémon", PokemonType.BUG, PokemonType.STEEL, 1.8, 118, Abilities.SWARM, Abilities.TECHNICIAN, Abilities.LIGHT_METAL, 500, 70, 130, 100, 55, 80, 65, 25, 50, 175, GrowthRate.MEDIUM_FAST, 50, true, true,
+      new PokemonForm("Normal", "", PokemonType.BUG, PokemonType.STEEL, 1.8, 118, Abilities.SWARM, Abilities.TECHNICIAN, Abilities.LIGHT_METAL, 500, 70, 130, 100, 55, 80, 65, 25, 50, 175, true, null, true),
+      new PokemonForm("Mega", SpeciesFormKey.MEGA, PokemonType.BUG, PokemonType.STEEL, 2, 125, Abilities.TECHNICIAN, Abilities.TECHNICIAN, Abilities.TECHNICIAN, 600, 70, 150, 140, 65, 100, 75, 25, 50, 175, true),
+    ),
+    new PokemonSpecies(Species.SHUCKLE, 2, false, false, false, "Mold Pokémon", PokemonType.BUG, PokemonType.ROCK, 0.6, 20.5, Abilities.STURDY, Abilities.GLUTTONY, Abilities.CONTRARY, 505, 20, 10, 230, 10, 230, 5, 190, 50, 177, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.HERACROSS, 2, false, false, false, "Single Horn Pokémon", PokemonType.BUG, PokemonType.FIGHTING, 1.5, 54, Abilities.SWARM, Abilities.GUTS, Abilities.MOXIE, 500, 80, 125, 75, 40, 95, 85, 45, 50, 175, GrowthRate.SLOW, 50, true, true,
+      new PokemonForm("Normal", "", PokemonType.BUG, PokemonType.FIGHTING, 1.5, 54, Abilities.SWARM, Abilities.GUTS, Abilities.MOXIE, 500, 80, 125, 75, 40, 95, 85, 45, 50, 175, true, null, true),
+      new PokemonForm("Mega", SpeciesFormKey.MEGA, PokemonType.BUG, PokemonType.FIGHTING, 1.7, 62.5, Abilities.SKILL_LINK, Abilities.SKILL_LINK, Abilities.SKILL_LINK, 600, 80, 185, 115, 40, 105, 75, 45, 50, 175, true),
+    ),
+    new PokemonSpecies(Species.SNEASEL, 2, false, false, false, "Sharp Claw Pokémon", PokemonType.DARK, PokemonType.ICE, 0.9, 28, Abilities.INNER_FOCUS, Abilities.KEEN_EYE, Abilities.PICKPOCKET, 430, 55, 95, 55, 35, 75, 115, 60, 35, 86, GrowthRate.MEDIUM_SLOW, 50, true),
+    new PokemonSpecies(Species.TEDDIURSA, 2, false, false, false, "Little Bear Pokémon", PokemonType.NORMAL, null, 0.6, 8.8, Abilities.PICKUP, Abilities.QUICK_FEET, Abilities.HONEY_GATHER, 330, 60, 80, 50, 50, 50, 40, 120, 70, 66, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.URSARING, 2, false, false, false, "Hibernator Pokémon", PokemonType.NORMAL, null, 1.8, 125.8, Abilities.GUTS, Abilities.QUICK_FEET, Abilities.UNNERVE, 500, 90, 130, 75, 75, 75, 55, 60, 70, 175, GrowthRate.MEDIUM_FAST, 50, true),
+    new PokemonSpecies(Species.SLUGMA, 2, false, false, false, "Lava Pokémon", PokemonType.FIRE, null, 0.7, 35, Abilities.MAGMA_ARMOR, Abilities.FLAME_BODY, Abilities.WEAK_ARMOR, 250, 40, 40, 40, 70, 40, 20, 190, 70, 50, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.MAGCARGO, 2, false, false, false, "Lava Pokémon", PokemonType.FIRE, PokemonType.ROCK, 0.8, 55, Abilities.MAGMA_ARMOR, Abilities.FLAME_BODY, Abilities.WEAK_ARMOR, 430, 60, 50, 120, 90, 80, 30, 75, 70, 151, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.SWINUB, 2, false, false, false, "Pig Pokémon", PokemonType.ICE, PokemonType.GROUND, 0.4, 6.5, Abilities.OBLIVIOUS, Abilities.SNOW_CLOAK, Abilities.THICK_FAT, 250, 50, 50, 40, 30, 30, 50, 225, 50, 50, GrowthRate.SLOW, 50, false),
+    new PokemonSpecies(Species.PILOSWINE, 2, false, false, false, "Swine Pokémon", PokemonType.ICE, PokemonType.GROUND, 1.1, 55.8, Abilities.OBLIVIOUS, Abilities.SNOW_CLOAK, Abilities.THICK_FAT, 450, 100, 100, 80, 60, 60, 50, 75, 50, 158, GrowthRate.SLOW, 50, true),
+    new PokemonSpecies(Species.CORSOLA, 2, false, false, false, "Coral Pokémon", PokemonType.WATER, PokemonType.ROCK, 0.6, 5, Abilities.HUSTLE, Abilities.NATURAL_CURE, Abilities.REGENERATOR, 410, 65, 55, 95, 65, 95, 35, 60, 50, 144, GrowthRate.FAST, 25, false),
+    new PokemonSpecies(Species.REMORAID, 2, false, false, false, "Jet Pokémon", PokemonType.WATER, null, 0.6, 12, Abilities.HUSTLE, Abilities.SNIPER, Abilities.MOODY, 300, 35, 65, 35, 65, 35, 65, 190, 50, 60, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.OCTILLERY, 2, false, false, false, "Jet Pokémon", PokemonType.WATER, null, 0.9, 28.5, Abilities.SUCTION_CUPS, Abilities.SNIPER, Abilities.MOODY, 480, 75, 105, 75, 105, 75, 45, 75, 50, 168, GrowthRate.MEDIUM_FAST, 50, true),
+    new PokemonSpecies(Species.DELIBIRD, 2, false, false, false, "Delivery Pokémon", PokemonType.ICE, PokemonType.FLYING, 0.9, 16, Abilities.VITAL_SPIRIT, Abilities.HUSTLE, Abilities.INSOMNIA, 330, 45, 55, 45, 65, 45, 75, 45, 50, 116, GrowthRate.FAST, 50, false),
+    new PokemonSpecies(Species.MANTINE, 2, false, false, false, "Kite Pokémon", PokemonType.WATER, PokemonType.FLYING, 2.1, 220, Abilities.SWIFT_SWIM, Abilities.WATER_ABSORB, Abilities.WATER_VEIL, 485, 85, 40, 70, 80, 140, 70, 25, 50, 170, GrowthRate.SLOW, 50, false),
+    new PokemonSpecies(Species.SKARMORY, 2, false, false, false, "Armor Bird Pokémon", PokemonType.STEEL, PokemonType.FLYING, 1.7, 50.5, Abilities.KEEN_EYE, Abilities.STURDY, Abilities.WEAK_ARMOR, 465, 65, 80, 140, 40, 70, 70, 25, 50, 163, GrowthRate.SLOW, 50, false),
+    new PokemonSpecies(Species.HOUNDOUR, 2, false, false, false, "Dark Pokémon", PokemonType.DARK, PokemonType.FIRE, 0.6, 10.8, Abilities.EARLY_BIRD, Abilities.FLASH_FIRE, Abilities.UNNERVE, 330, 45, 60, 30, 80, 50, 65, 120, 35, 66, GrowthRate.SLOW, 50, false),
+    new PokemonSpecies(Species.HOUNDOOM, 2, false, false, false, "Dark Pokémon", PokemonType.DARK, PokemonType.FIRE, 1.4, 35, Abilities.EARLY_BIRD, Abilities.FLASH_FIRE, Abilities.UNNERVE, 500, 75, 90, 50, 110, 80, 95, 45, 35, 175, GrowthRate.SLOW, 50, true, true,
+      new PokemonForm("Normal", "", PokemonType.DARK, PokemonType.FIRE, 1.4, 35, Abilities.EARLY_BIRD, Abilities.FLASH_FIRE, Abilities.UNNERVE, 500, 75, 90, 50, 110, 80, 95, 45, 35, 175, true, null, true),
+      new PokemonForm("Mega", SpeciesFormKey.MEGA, PokemonType.DARK, PokemonType.FIRE, 1.9, 49.5, Abilities.SOLAR_POWER, Abilities.SOLAR_POWER, Abilities.SOLAR_POWER, 600, 75, 90, 90, 140, 90, 115, 45, 35, 175, true),
+    ),
+    new PokemonSpecies(Species.KINGDRA, 2, false, false, false, "Dragon Pokémon", PokemonType.WATER, PokemonType.DRAGON, 1.8, 152, Abilities.SWIFT_SWIM, Abilities.SNIPER, Abilities.DAMP, 540, 75, 95, 95, 95, 95, 85, 45, 50, 270, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.PHANPY, 2, false, false, false, "Long Nose Pokémon", PokemonType.GROUND, null, 0.5, 33.5, Abilities.PICKUP, Abilities.NONE, Abilities.SAND_VEIL, 330, 90, 60, 60, 40, 40, 40, 120, 70, 66, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.DONPHAN, 2, false, false, false, "Armor Pokémon", PokemonType.GROUND, null, 1.1, 120, Abilities.STURDY, Abilities.NONE, Abilities.SAND_VEIL, 500, 90, 120, 120, 60, 60, 50, 60, 70, 175, GrowthRate.MEDIUM_FAST, 50, true),
+    new PokemonSpecies(Species.PORYGON2, 2, false, false, false, "Virtual Pokémon", PokemonType.NORMAL, null, 0.6, 32.5, Abilities.TRACE, Abilities.DOWNLOAD, Abilities.ANALYTIC, 515, 85, 80, 90, 105, 95, 60, 45, 50, 180, GrowthRate.MEDIUM_FAST, null, false),
+    new PokemonSpecies(Species.STANTLER, 2, false, false, false, "Big Horn Pokémon", PokemonType.NORMAL, null, 1.4, 71.2, Abilities.INTIMIDATE, Abilities.FRISK, Abilities.SAP_SIPPER, 465, 73, 95, 62, 85, 65, 85, 45, 70, 163, GrowthRate.SLOW, 50, false),
+    new PokemonSpecies(Species.SMEARGLE, 2, false, false, false, "Painter Pokémon", PokemonType.NORMAL, null, 1.2, 58, Abilities.OWN_TEMPO, Abilities.TECHNICIAN, Abilities.MOODY, 250, 55, 20, 35, 20, 45, 75, 45, 70, 88, GrowthRate.FAST, 50, false),
+    new PokemonSpecies(Species.TYROGUE, 2, false, false, false, "Scuffle Pokémon", PokemonType.FIGHTING, null, 0.7, 21, Abilities.GUTS, Abilities.STEADFAST, Abilities.VITAL_SPIRIT, 210, 35, 35, 35, 35, 35, 35, 75, 50, 42, GrowthRate.MEDIUM_FAST, 100, false),
+    new PokemonSpecies(Species.HITMONTOP, 2, false, false, false, "Handstand Pokémon", PokemonType.FIGHTING, null, 1.4, 48, Abilities.INTIMIDATE, Abilities.TECHNICIAN, Abilities.STEADFAST, 455, 50, 95, 95, 35, 110, 70, 45, 50, 159, GrowthRate.MEDIUM_FAST, 100, false),
+    new PokemonSpecies(Species.SMOOCHUM, 2, false, false, false, "Kiss Pokémon", PokemonType.ICE, PokemonType.PSYCHIC, 0.4, 6, Abilities.OBLIVIOUS, Abilities.FOREWARN, Abilities.HYDRATION, 305, 45, 30, 15, 85, 65, 65, 45, 50, 61, GrowthRate.MEDIUM_FAST, 0, false),
+    new PokemonSpecies(Species.ELEKID, 2, false, false, false, "Electric Pokémon", PokemonType.ELECTRIC, null, 0.6, 23.5, Abilities.STATIC, Abilities.NONE, Abilities.VITAL_SPIRIT, 360, 45, 63, 37, 65, 55, 95, 45, 50, 72, GrowthRate.MEDIUM_FAST, 75, false),
+    new PokemonSpecies(Species.MAGBY, 2, false, false, false, "Live Coal Pokémon", PokemonType.FIRE, null, 0.7, 21.4, Abilities.FLAME_BODY, Abilities.NONE, Abilities.VITAL_SPIRIT, 365, 45, 75, 37, 70, 55, 83, 45, 50, 73, GrowthRate.MEDIUM_FAST, 75, false),
+    new PokemonSpecies(Species.MILTANK, 2, false, false, false, "Milk Cow Pokémon", PokemonType.NORMAL, null, 1.2, 75.5, Abilities.THICK_FAT, Abilities.SCRAPPY, Abilities.SAP_SIPPER, 490, 95, 80, 105, 40, 70, 100, 45, 50, 172, GrowthRate.SLOW, 0, false),
+    new PokemonSpecies(Species.BLISSEY, 2, false, false, false, "Happiness Pokémon", PokemonType.NORMAL, null, 1.5, 46.8, Abilities.NATURAL_CURE, Abilities.SERENE_GRACE, Abilities.HEALER, 540, 255, 10, 10, 75, 135, 55, 30, 140, 608, GrowthRate.FAST, 0, false),
+    new PokemonSpecies(Species.RAIKOU, 2, true, false, false, "Thunder Pokémon", PokemonType.ELECTRIC, null, 1.9, 178, Abilities.PRESSURE, Abilities.NONE, Abilities.INNER_FOCUS, 580, 90, 85, 75, 115, 100, 115, 3, 35, 290, GrowthRate.SLOW, null, false),
+    new PokemonSpecies(Species.ENTEI, 2, true, false, false, "Volcano Pokémon", PokemonType.FIRE, null, 2.1, 198, Abilities.PRESSURE, Abilities.NONE, Abilities.INNER_FOCUS, 580, 115, 115, 85, 90, 75, 100, 3, 35, 290, GrowthRate.SLOW, null, false),
+    new PokemonSpecies(Species.SUICUNE, 2, true, false, false, "Aurora Pokémon", PokemonType.WATER, null, 2, 187, Abilities.PRESSURE, Abilities.NONE, Abilities.INNER_FOCUS, 580, 100, 75, 115, 90, 115, 85, 3, 35, 290, GrowthRate.SLOW, null, false),
+    new PokemonSpecies(Species.LARVITAR, 2, false, false, false, "Rock Skin Pokémon", PokemonType.ROCK, PokemonType.GROUND, 0.6, 72, Abilities.GUTS, Abilities.NONE, Abilities.SAND_VEIL, 300, 50, 64, 50, 45, 50, 41, 45, 35, 60, GrowthRate.SLOW, 50, false),
+    new PokemonSpecies(Species.PUPITAR, 2, false, false, false, "Hard Shell Pokémon", PokemonType.ROCK, PokemonType.GROUND, 1.2, 152, Abilities.SHED_SKIN, Abilities.NONE, Abilities.SHED_SKIN, 410, 70, 84, 70, 65, 70, 51, 45, 35, 144, GrowthRate.SLOW, 50, false),
+    new PokemonSpecies(Species.TYRANITAR, 2, false, false, false, "Armor Pokémon", PokemonType.ROCK, PokemonType.DARK, 2, 202, Abilities.SAND_STREAM, Abilities.NONE, Abilities.UNNERVE, 600, 100, 134, 110, 95, 100, 61, 45, 35, 300, GrowthRate.SLOW, 50, false, true,
+      new PokemonForm("Normal", "", PokemonType.ROCK, PokemonType.DARK, 2, 202, Abilities.SAND_STREAM, Abilities.NONE, Abilities.UNNERVE, 600, 100, 134, 110, 95, 100, 61, 45, 35, 300, false, null, true),
+      new PokemonForm("Mega", SpeciesFormKey.MEGA, PokemonType.ROCK, PokemonType.DARK, 2.5, 255, Abilities.SAND_STREAM, Abilities.NONE, Abilities.SAND_STREAM, 700, 100, 164, 150, 95, 120, 71, 45, 35, 300),
+    ),
+    new PokemonSpecies(Species.LUGIA, 2, false, true, false, "Diving Pokémon", PokemonType.PSYCHIC, PokemonType.FLYING, 5.2, 216, Abilities.PRESSURE, Abilities.NONE, Abilities.MULTISCALE, 680, 106, 90, 130, 90, 154, 110, 3, 0, 340, GrowthRate.SLOW, null, false),
+    new PokemonSpecies(Species.HO_OH, 2, false, true, false, "Rainbow Pokémon", PokemonType.FIRE, PokemonType.FLYING, 3.8, 199, Abilities.PRESSURE, Abilities.NONE, Abilities.REGENERATOR, 680, 106, 130, 90, 110, 154, 90, 3, 0, 340, GrowthRate.SLOW, null, false),
+    new PokemonSpecies(Species.CELEBI, 2, false, false, true, "Time Travel Pokémon", PokemonType.PSYCHIC, PokemonType.GRASS, 0.6, 5, Abilities.NATURAL_CURE, Abilities.NONE, Abilities.NONE, 600, 100, 100, 100, 100, 100, 100, 45, 100, 300, GrowthRate.MEDIUM_SLOW, null, false),
+    new PokemonSpecies(Species.TREECKO, 3, false, false, false, "Wood Gecko Pokémon", PokemonType.GRASS, null, 0.5, 5, Abilities.OVERGROW, Abilities.NONE, Abilities.UNBURDEN, 310, 40, 45, 35, 65, 55, 70, 45, 50, 62, GrowthRate.MEDIUM_SLOW, 87.5, false),
+    new PokemonSpecies(Species.GROVYLE, 3, false, false, false, "Wood Gecko Pokémon", PokemonType.GRASS, null, 0.9, 21.6, Abilities.OVERGROW, Abilities.NONE, Abilities.UNBURDEN, 405, 50, 65, 45, 85, 65, 95, 45, 50, 142, GrowthRate.MEDIUM_SLOW, 87.5, false),
+    new PokemonSpecies(Species.SCEPTILE, 3, false, false, false, "Forest Pokémon", PokemonType.GRASS, null, 1.7, 52.2, Abilities.OVERGROW, Abilities.NONE, Abilities.UNBURDEN, 530, 70, 85, 65, 105, 85, 120, 45, 50, 265, GrowthRate.MEDIUM_SLOW, 87.5, false, true,
+      new PokemonForm("Normal", "", PokemonType.GRASS, null, 1.7, 52.2, Abilities.OVERGROW, Abilities.NONE, Abilities.UNBURDEN, 530, 70, 85, 65, 105, 85, 120, 45, 50, 265, false, null, true),
+      new PokemonForm("Mega", SpeciesFormKey.MEGA, PokemonType.GRASS, PokemonType.DRAGON, 1.9, 55.2, Abilities.LIGHTNING_ROD, Abilities.NONE, Abilities.LIGHTNING_ROD, 630, 70, 110, 75, 145, 85, 145, 45, 50, 265),
+    ),
+    new PokemonSpecies(Species.TORCHIC, 3, false, false, false, "Chick Pokémon", PokemonType.FIRE, null, 0.4, 2.5, Abilities.BLAZE, Abilities.NONE, Abilities.SPEED_BOOST, 310, 45, 60, 40, 70, 50, 45, 45, 50, 62, GrowthRate.MEDIUM_SLOW, 87.5, true),
+    new PokemonSpecies(Species.COMBUSKEN, 3, false, false, false, "Young Fowl Pokémon", PokemonType.FIRE, PokemonType.FIGHTING, 0.9, 19.5, Abilities.BLAZE, Abilities.NONE, Abilities.SPEED_BOOST, 405, 60, 85, 60, 85, 60, 55, 45, 50, 142, GrowthRate.MEDIUM_SLOW, 87.5, true),
+    new PokemonSpecies(Species.BLAZIKEN, 3, false, false, false, "Blaze Pokémon", PokemonType.FIRE, PokemonType.FIGHTING, 1.9, 52, Abilities.BLAZE, Abilities.NONE, Abilities.SPEED_BOOST, 530, 80, 120, 70, 110, 70, 80, 45, 50, 265, GrowthRate.MEDIUM_SLOW, 87.5, true, true,
+      new PokemonForm("Normal", "", PokemonType.FIRE, PokemonType.FIGHTING, 1.9, 52, Abilities.BLAZE, Abilities.NONE, Abilities.SPEED_BOOST, 530, 80, 120, 70, 110, 70, 80, 45, 50, 265, true, null, true),
+      new PokemonForm("Mega", SpeciesFormKey.MEGA, PokemonType.FIRE, PokemonType.FIGHTING, 1.9, 52, Abilities.SPEED_BOOST, Abilities.NONE, Abilities.SPEED_BOOST, 630, 80, 160, 80, 130, 80, 100, 45, 50, 265, true),
+    ),
+    new PokemonSpecies(Species.MUDKIP, 3, false, false, false, "Mud Fish Pokémon", PokemonType.WATER, null, 0.4, 7.6, Abilities.TORRENT, Abilities.NONE, Abilities.DAMP, 310, 50, 70, 50, 50, 50, 40, 45, 50, 62, GrowthRate.MEDIUM_SLOW, 87.5, false),
+    new PokemonSpecies(Species.MARSHTOMP, 3, false, false, false, "Mud Fish Pokémon", PokemonType.WATER, PokemonType.GROUND, 0.7, 28, Abilities.TORRENT, Abilities.NONE, Abilities.DAMP, 405, 70, 85, 70, 60, 70, 50, 45, 50, 142, GrowthRate.MEDIUM_SLOW, 87.5, false),
+    new PokemonSpecies(Species.SWAMPERT, 3, false, false, false, "Mud Fish Pokémon", PokemonType.WATER, PokemonType.GROUND, 1.5, 81.9, Abilities.TORRENT, Abilities.NONE, Abilities.DAMP, 535, 100, 110, 90, 85, 90, 60, 45, 50, 268, GrowthRate.MEDIUM_SLOW, 87.5, false, true,
+      new PokemonForm("Normal", "", PokemonType.WATER, PokemonType.GROUND, 1.5, 81.9, Abilities.TORRENT, Abilities.NONE, Abilities.DAMP, 535, 100, 110, 90, 85, 90, 60, 45, 50, 268, false, null, true),
+      new PokemonForm("Mega", SpeciesFormKey.MEGA, PokemonType.WATER, PokemonType.GROUND, 1.9, 102, Abilities.SWIFT_SWIM, Abilities.NONE, Abilities.SWIFT_SWIM, 635, 100, 150, 110, 95, 110, 70, 45, 50, 268),
+    ),
+    new PokemonSpecies(Species.POOCHYENA, 3, false, false, false, "Bite Pokémon", PokemonType.DARK, null, 0.5, 13.6, Abilities.RUN_AWAY, Abilities.QUICK_FEET, Abilities.RATTLED, 220, 35, 55, 35, 30, 30, 35, 255, 70, 56, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.MIGHTYENA, 3, false, false, false, "Bite Pokémon", PokemonType.DARK, null, 1, 37, Abilities.INTIMIDATE, Abilities.QUICK_FEET, Abilities.MOXIE, 420, 70, 90, 70, 60, 60, 70, 127, 70, 147, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.ZIGZAGOON, 3, false, false, false, "Tiny Raccoon Pokémon", PokemonType.NORMAL, null, 0.4, 17.5, Abilities.PICKUP, Abilities.GLUTTONY, Abilities.QUICK_FEET, 240, 38, 30, 41, 30, 41, 60, 255, 50, 56, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.LINOONE, 3, false, false, false, "Rushing Pokémon", PokemonType.NORMAL, null, 0.5, 32.5, Abilities.PICKUP, Abilities.GLUTTONY, Abilities.QUICK_FEET, 420, 78, 70, 61, 50, 61, 100, 90, 50, 147, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.WURMPLE, 3, false, false, false, "Worm Pokémon", PokemonType.BUG, null, 0.3, 3.6, Abilities.SHIELD_DUST, Abilities.NONE, Abilities.RUN_AWAY, 195, 45, 45, 35, 20, 30, 20, 255, 70, 56, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.SILCOON, 3, false, false, false, "Cocoon Pokémon", PokemonType.BUG, null, 0.6, 10, Abilities.SHED_SKIN, Abilities.NONE, Abilities.SHED_SKIN, 205, 50, 35, 55, 25, 25, 15, 120, 70, 72, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.BEAUTIFLY, 3, false, false, false, "Butterfly Pokémon", PokemonType.BUG, PokemonType.FLYING, 1, 28.4, Abilities.SWARM, Abilities.NONE, Abilities.RIVALRY, 395, 60, 70, 50, 100, 50, 65, 45, 70, 198, GrowthRate.MEDIUM_FAST, 50, true),
+    new PokemonSpecies(Species.CASCOON, 3, false, false, false, "Cocoon Pokémon", PokemonType.BUG, null, 0.7, 11.5, Abilities.SHED_SKIN, Abilities.NONE, Abilities.SHED_SKIN, 205, 50, 35, 55, 25, 25, 15, 120, 70, 72, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.DUSTOX, 3, false, false, false, "Poison Moth Pokémon", PokemonType.BUG, PokemonType.POISON, 1.2, 31.6, Abilities.SHIELD_DUST, Abilities.NONE, Abilities.COMPOUND_EYES, 385, 60, 50, 70, 50, 90, 65, 45, 70, 193, GrowthRate.MEDIUM_FAST, 50, true),
+    new PokemonSpecies(Species.LOTAD, 3, false, false, false, "Water Weed Pokémon", PokemonType.WATER, PokemonType.GRASS, 0.5, 2.6, Abilities.SWIFT_SWIM, Abilities.RAIN_DISH, Abilities.OWN_TEMPO, 220, 40, 30, 30, 40, 50, 30, 255, 50, 44, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.LOMBRE, 3, false, false, false, "Jolly Pokémon", PokemonType.WATER, PokemonType.GRASS, 1.2, 32.5, Abilities.SWIFT_SWIM, Abilities.RAIN_DISH, Abilities.OWN_TEMPO, 340, 60, 50, 50, 60, 70, 50, 120, 50, 119, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.LUDICOLO, 3, false, false, false, "Carefree Pokémon", PokemonType.WATER, PokemonType.GRASS, 1.5, 55, Abilities.SWIFT_SWIM, Abilities.RAIN_DISH, Abilities.OWN_TEMPO, 480, 80, 70, 70, 90, 100, 70, 45, 50, 240, GrowthRate.MEDIUM_SLOW, 50, true),
+    new PokemonSpecies(Species.SEEDOT, 3, false, false, false, "Acorn Pokémon", PokemonType.GRASS, null, 0.5, 4, Abilities.CHLOROPHYLL, Abilities.EARLY_BIRD, Abilities.PICKPOCKET, 220, 40, 40, 50, 30, 30, 30, 255, 50, 44, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.NUZLEAF, 3, false, false, false, "Wily Pokémon", PokemonType.GRASS, PokemonType.DARK, 1, 28, Abilities.CHLOROPHYLL, Abilities.EARLY_BIRD, Abilities.PICKPOCKET, 340, 70, 70, 40, 60, 40, 60, 120, 50, 119, GrowthRate.MEDIUM_SLOW, 50, true),
+    new PokemonSpecies(Species.SHIFTRY, 3, false, false, false, "Wicked Pokémon", PokemonType.GRASS, PokemonType.DARK, 1.3, 59.6, Abilities.CHLOROPHYLL, Abilities.WIND_RIDER, Abilities.PICKPOCKET, 480, 90, 100, 60, 90, 60, 80, 45, 50, 240, GrowthRate.MEDIUM_SLOW, 50, true),
+    new PokemonSpecies(Species.TAILLOW, 3, false, false, false, "Tiny Swallow Pokémon", PokemonType.NORMAL, PokemonType.FLYING, 0.3, 2.3, Abilities.GUTS, Abilities.NONE, Abilities.SCRAPPY, 270, 40, 55, 30, 30, 30, 85, 200, 70, 54, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.SWELLOW, 3, false, false, false, "Swallow Pokémon", PokemonType.NORMAL, PokemonType.FLYING, 0.7, 19.8, Abilities.GUTS, Abilities.NONE, Abilities.SCRAPPY, 455, 60, 85, 60, 75, 50, 125, 45, 70, 159, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.WINGULL, 3, false, false, false, "Seagull Pokémon", PokemonType.WATER, PokemonType.FLYING, 0.6, 9.5, Abilities.KEEN_EYE, Abilities.HYDRATION, Abilities.RAIN_DISH, 270, 40, 30, 30, 55, 30, 85, 190, 50, 54, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.PELIPPER, 3, false, false, false, "Water Bird Pokémon", PokemonType.WATER, PokemonType.FLYING, 1.2, 28, Abilities.KEEN_EYE, Abilities.DRIZZLE, Abilities.RAIN_DISH, 440, 60, 50, 100, 95, 70, 65, 45, 50, 154, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.RALTS, 3, false, false, false, "Feeling Pokémon", PokemonType.PSYCHIC, PokemonType.FAIRY, 0.4, 6.6, Abilities.SYNCHRONIZE, Abilities.TRACE, Abilities.TELEPATHY, 198, 28, 25, 25, 45, 35, 40, 235, 35, 40, GrowthRate.SLOW, 50, false),
+    new PokemonSpecies(Species.KIRLIA, 3, false, false, false, "Emotion Pokémon", PokemonType.PSYCHIC, PokemonType.FAIRY, 0.8, 20.2, Abilities.SYNCHRONIZE, Abilities.TRACE, Abilities.TELEPATHY, 278, 38, 35, 35, 65, 55, 50, 120, 35, 97, GrowthRate.SLOW, 50, false),
+    new PokemonSpecies(Species.GARDEVOIR, 3, false, false, false, "Embrace Pokémon", PokemonType.PSYCHIC, PokemonType.FAIRY, 1.6, 48.4, Abilities.SYNCHRONIZE, Abilities.TRACE, Abilities.TELEPATHY, 518, 68, 65, 65, 125, 115, 80, 45, 35, 259, GrowthRate.SLOW, 50, false, true,
+      new PokemonForm("Normal", "", PokemonType.PSYCHIC, PokemonType.FAIRY, 1.6, 48.4, Abilities.SYNCHRONIZE, Abilities.TRACE, Abilities.TELEPATHY, 518, 68, 65, 65, 125, 115, 80, 45, 35, 259, false, null, true),
+      new PokemonForm("Mega", SpeciesFormKey.MEGA, PokemonType.PSYCHIC, PokemonType.FAIRY, 1.6, 48.4, Abilities.PIXILATE, Abilities.PIXILATE, Abilities.PIXILATE, 618, 68, 85, 65, 165, 135, 100, 45, 35, 259),
+    ),
+    new PokemonSpecies(Species.SURSKIT, 3, false, false, false, "Pond Skater Pokémon", PokemonType.BUG, PokemonType.WATER, 0.5, 1.7, Abilities.SWIFT_SWIM, Abilities.NONE, Abilities.RAIN_DISH, 269, 40, 30, 32, 50, 52, 65, 200, 70, 54, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.MASQUERAIN, 3, false, false, false, "Eyeball Pokémon", PokemonType.BUG, PokemonType.FLYING, 0.8, 3.6, Abilities.INTIMIDATE, Abilities.NONE, Abilities.UNNERVE, 454, 70, 60, 62, 100, 82, 80, 75, 70, 159, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.SHROOMISH, 3, false, false, false, "Mushroom Pokémon", PokemonType.GRASS, null, 0.4, 4.5, Abilities.EFFECT_SPORE, Abilities.POISON_HEAL, Abilities.QUICK_FEET, 295, 60, 40, 60, 40, 60, 35, 255, 70, 59, GrowthRate.FLUCTUATING, 50, false),
+    new PokemonSpecies(Species.BRELOOM, 3, false, false, false, "Mushroom Pokémon", PokemonType.GRASS, PokemonType.FIGHTING, 1.2, 39.2, Abilities.EFFECT_SPORE, Abilities.POISON_HEAL, Abilities.TECHNICIAN, 460, 60, 130, 80, 60, 60, 70, 90, 70, 161, GrowthRate.FLUCTUATING, 50, false),
+    new PokemonSpecies(Species.SLAKOTH, 3, false, false, false, "Slacker Pokémon", PokemonType.NORMAL, null, 0.8, 24, Abilities.TRUANT, Abilities.NONE, Abilities.STALL, 280, 60, 60, 60, 35, 35, 30, 255, 70, 56, GrowthRate.SLOW, 50, false), //Custom Hidden
+    new PokemonSpecies(Species.VIGOROTH, 3, false, false, false, "Wild Monkey Pokémon", PokemonType.NORMAL, null, 1.4, 46.5, Abilities.VITAL_SPIRIT, Abilities.NONE, Abilities.INSOMNIA, 440, 80, 80, 80, 55, 55, 90, 120, 70, 154, GrowthRate.SLOW, 50, false), //Custom Hidden
+    new PokemonSpecies(Species.SLAKING, 3, false, false, false, "Lazy Pokémon", PokemonType.NORMAL, null, 2, 130.5, Abilities.TRUANT, Abilities.NONE, Abilities.STALL, 670, 150, 160, 100, 95, 65, 100, 45, 70, 285, GrowthRate.SLOW, 50, false), //Custom Hidden
+    new PokemonSpecies(Species.NINCADA, 3, false, false, false, "Trainee Pokémon", PokemonType.BUG, PokemonType.GROUND, 0.5, 5.5, Abilities.COMPOUND_EYES, Abilities.NONE, Abilities.RUN_AWAY, 266, 31, 45, 90, 30, 30, 40, 255, 50, 53, GrowthRate.ERRATIC, 50, false),
+    new PokemonSpecies(Species.NINJASK, 3, false, false, false, "Ninja Pokémon", PokemonType.BUG, PokemonType.FLYING, 0.8, 12, Abilities.SPEED_BOOST, Abilities.NONE, Abilities.INFILTRATOR, 456, 61, 90, 45, 50, 50, 160, 120, 50, 160, GrowthRate.ERRATIC, 50, false),
+    new PokemonSpecies(Species.SHEDINJA, 3, false, false, false, "Shed Pokémon", PokemonType.BUG, PokemonType.GHOST, 0.8, 1.2, Abilities.WONDER_GUARD, Abilities.NONE, Abilities.NONE, 236, 1, 90, 45, 30, 30, 40, 45, 50, 83, GrowthRate.ERRATIC, null, false),
+    new PokemonSpecies(Species.WHISMUR, 3, false, false, false, "Whisper Pokémon", PokemonType.NORMAL, null, 0.6, 16.3, Abilities.SOUNDPROOF, Abilities.NONE, Abilities.RATTLED, 240, 64, 51, 23, 51, 23, 28, 190, 50, 48, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.LOUDRED, 3, false, false, false, "Big Voice Pokémon", PokemonType.NORMAL, null, 1, 40.5, Abilities.SOUNDPROOF, Abilities.NONE, Abilities.SCRAPPY, 360, 84, 71, 43, 71, 43, 48, 120, 50, 126, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.EXPLOUD, 3, false, false, false, "Loud Noise Pokémon", PokemonType.NORMAL, null, 1.5, 84, Abilities.SOUNDPROOF, Abilities.NONE, Abilities.SCRAPPY, 490, 104, 91, 63, 91, 73, 68, 45, 50, 245, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.MAKUHITA, 3, false, false, false, "Guts Pokémon", PokemonType.FIGHTING, null, 1, 86.4, Abilities.THICK_FAT, Abilities.GUTS, Abilities.SHEER_FORCE, 237, 72, 60, 30, 20, 30, 25, 180, 70, 47, GrowthRate.FLUCTUATING, 75, false),
+    new PokemonSpecies(Species.HARIYAMA, 3, false, false, false, "Arm Thrust Pokémon", PokemonType.FIGHTING, null, 2.3, 253.8, Abilities.THICK_FAT, Abilities.GUTS, Abilities.SHEER_FORCE, 474, 144, 120, 60, 40, 60, 50, 200, 70, 166, GrowthRate.FLUCTUATING, 75, false),
+    new PokemonSpecies(Species.AZURILL, 3, false, false, false, "Polka Dot Pokémon", PokemonType.NORMAL, PokemonType.FAIRY, 0.2, 2, Abilities.THICK_FAT, Abilities.HUGE_POWER, Abilities.SAP_SIPPER, 190, 50, 20, 40, 20, 40, 20, 150, 50, 38, GrowthRate.FAST, 25, false),
+    new PokemonSpecies(Species.NOSEPASS, 3, false, false, false, "Compass Pokémon", PokemonType.ROCK, null, 1, 97, Abilities.STURDY, Abilities.MAGNET_PULL, Abilities.SAND_FORCE, 375, 30, 45, 135, 45, 90, 30, 255, 70, 75, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.SKITTY, 3, false, false, false, "Kitten Pokémon", PokemonType.NORMAL, null, 0.6, 11, Abilities.CUTE_CHARM, Abilities.NORMALIZE, Abilities.WONDER_SKIN, 260, 50, 45, 45, 35, 35, 50, 255, 70, 52, GrowthRate.FAST, 25, false),
+    new PokemonSpecies(Species.DELCATTY, 3, false, false, false, "Prim Pokémon", PokemonType.NORMAL, null, 1.1, 32.6, Abilities.CUTE_CHARM, Abilities.NORMALIZE, Abilities.WONDER_SKIN, 400, 70, 65, 65, 55, 55, 90, 60, 70, 140, GrowthRate.FAST, 25, false),
+    new PokemonSpecies(Species.SABLEYE, 3, false, false, false, "Darkness Pokémon", PokemonType.DARK, PokemonType.GHOST, 0.5, 11, Abilities.KEEN_EYE, Abilities.STALL, Abilities.PRANKSTER, 380, 50, 75, 75, 65, 65, 50, 45, 35, 133, GrowthRate.MEDIUM_SLOW, 50, false, true,
+      new PokemonForm("Normal", "", PokemonType.DARK, PokemonType.GHOST, 0.5, 11, Abilities.KEEN_EYE, Abilities.STALL, Abilities.PRANKSTER, 380, 50, 75, 75, 65, 65, 50, 45, 35, 133, false, null, true),
+      new PokemonForm("Mega", SpeciesFormKey.MEGA, PokemonType.DARK, PokemonType.GHOST, 0.5, 161, Abilities.MAGIC_BOUNCE, Abilities.MAGIC_BOUNCE, Abilities.MAGIC_BOUNCE, 480, 50, 85, 125, 85, 115, 20, 45, 35, 133),
+    ),
+    new PokemonSpecies(Species.MAWILE, 3, false, false, false, "Deceiver Pokémon", PokemonType.STEEL, PokemonType.FAIRY, 0.6, 11.5, Abilities.HYPER_CUTTER, Abilities.INTIMIDATE, Abilities.SHEER_FORCE, 380, 50, 85, 85, 55, 55, 50, 45, 50, 133, GrowthRate.FAST, 50, false, true,
+      new PokemonForm("Normal", "", PokemonType.STEEL, PokemonType.FAIRY, 0.6, 11.5, Abilities.HYPER_CUTTER, Abilities.INTIMIDATE, Abilities.SHEER_FORCE, 380, 50, 85, 85, 55, 55, 50, 45, 50, 133, false, null, true),
+      new PokemonForm("Mega", SpeciesFormKey.MEGA, PokemonType.STEEL, PokemonType.FAIRY, 1, 23.5, Abilities.HUGE_POWER, Abilities.HUGE_POWER, Abilities.HUGE_POWER, 480, 50, 105, 125, 55, 95, 50, 45, 50, 133),
+    ),
+    new PokemonSpecies(Species.ARON, 3, false, false, false, "Iron Armor Pokémon", PokemonType.STEEL, PokemonType.ROCK, 0.4, 60, Abilities.STURDY, Abilities.ROCK_HEAD, Abilities.HEAVY_METAL, 330, 50, 70, 100, 40, 40, 30, 180, 35, 66, GrowthRate.SLOW, 50, false),
+    new PokemonSpecies(Species.LAIRON, 3, false, false, false, "Iron Armor Pokémon", PokemonType.STEEL, PokemonType.ROCK, 0.9, 120, Abilities.STURDY, Abilities.ROCK_HEAD, Abilities.HEAVY_METAL, 430, 60, 90, 140, 50, 50, 40, 90, 35, 151, GrowthRate.SLOW, 50, false),
+    new PokemonSpecies(Species.AGGRON, 3, false, false, false, "Iron Armor Pokémon", PokemonType.STEEL, PokemonType.ROCK, 2.1, 360, Abilities.STURDY, Abilities.ROCK_HEAD, Abilities.HEAVY_METAL, 530, 70, 110, 180, 60, 60, 50, 45, 35, 265, GrowthRate.SLOW, 50, false, true,
+      new PokemonForm("Normal", "", PokemonType.STEEL, PokemonType.ROCK, 2.1, 360, Abilities.STURDY, Abilities.ROCK_HEAD, Abilities.HEAVY_METAL, 530, 70, 110, 180, 60, 60, 50, 45, 35, 265, false, null, true),
+      new PokemonForm("Mega", SpeciesFormKey.MEGA, PokemonType.STEEL, null, 2.2, 395, Abilities.FILTER, Abilities.FILTER, Abilities.FILTER, 630, 70, 140, 230, 60, 80, 50, 45, 35, 265),
+    ),
+    new PokemonSpecies(Species.MEDITITE, 3, false, false, false, "Meditate Pokémon", PokemonType.FIGHTING, PokemonType.PSYCHIC, 0.6, 11.2, Abilities.PURE_POWER, Abilities.NONE, Abilities.TELEPATHY, 280, 30, 40, 55, 40, 55, 60, 180, 70, 56, GrowthRate.MEDIUM_FAST, 50, true),
+    new PokemonSpecies(Species.MEDICHAM, 3, false, false, false, "Meditate Pokémon", PokemonType.FIGHTING, PokemonType.PSYCHIC, 1.3, 31.5, Abilities.PURE_POWER, Abilities.NONE, Abilities.TELEPATHY, 410, 60, 60, 75, 60, 75, 80, 90, 70, 144, GrowthRate.MEDIUM_FAST, 50, true, true,
+      new PokemonForm("Normal", "", PokemonType.FIGHTING, PokemonType.PSYCHIC, 1.3, 31.5, Abilities.PURE_POWER, Abilities.NONE, Abilities.TELEPATHY, 410, 60, 60, 75, 60, 75, 80, 90, 70, 144, true, null, true),
+      new PokemonForm("Mega", SpeciesFormKey.MEGA, PokemonType.FIGHTING, PokemonType.PSYCHIC, 1.3, 31.5, Abilities.PURE_POWER, Abilities.NONE, Abilities.PURE_POWER, 510, 60, 100, 85, 80, 85, 100, 90, 70, 144, true),
+    ),
+    new PokemonSpecies(Species.ELECTRIKE, 3, false, false, false, "Lightning Pokémon", PokemonType.ELECTRIC, null, 0.6, 15.2, Abilities.STATIC, Abilities.LIGHTNING_ROD, Abilities.MINUS, 295, 40, 45, 40, 65, 40, 65, 120, 50, 59, GrowthRate.SLOW, 50, false),
+    new PokemonSpecies(Species.MANECTRIC, 3, false, false, false, "Discharge Pokémon", PokemonType.ELECTRIC, null, 1.5, 40.2, Abilities.STATIC, Abilities.LIGHTNING_ROD, Abilities.MINUS, 475, 70, 75, 60, 105, 60, 105, 45, 50, 166, GrowthRate.SLOW, 50, false, true,
+      new PokemonForm("Normal", "", PokemonType.ELECTRIC, null, 1.5, 40.2, Abilities.STATIC, Abilities.LIGHTNING_ROD, Abilities.MINUS, 475, 70, 75, 60, 105, 60, 105, 45, 50, 166, false, null, true),
+      new PokemonForm("Mega", SpeciesFormKey.MEGA, PokemonType.ELECTRIC, null, 1.8, 44, Abilities.INTIMIDATE, Abilities.INTIMIDATE, Abilities.INTIMIDATE, 575, 70, 75, 80, 135, 80, 135, 45, 50, 166),
+    ),
+    new PokemonSpecies(Species.PLUSLE, 3, false, false, false, "Cheering Pokémon", PokemonType.ELECTRIC, null, 0.4, 4.2, Abilities.PLUS, Abilities.NONE, Abilities.LIGHTNING_ROD, 405, 60, 50, 40, 85, 75, 95, 200, 70, 142, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.MINUN, 3, false, false, false, "Cheering Pokémon", PokemonType.ELECTRIC, null, 0.4, 4.2, Abilities.MINUS, Abilities.NONE, Abilities.VOLT_ABSORB, 405, 60, 40, 50, 75, 85, 95, 200, 70, 142, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.VOLBEAT, 3, false, false, false, "Firefly Pokémon", PokemonType.BUG, null, 0.7, 17.7, Abilities.ILLUMINATE, Abilities.SWARM, Abilities.PRANKSTER, 430, 65, 73, 75, 47, 85, 85, 150, 70, 151, GrowthRate.ERRATIC, 100, false),
+    new PokemonSpecies(Species.ILLUMISE, 3, false, false, false, "Firefly Pokémon", PokemonType.BUG, null, 0.6, 17.7, Abilities.OBLIVIOUS, Abilities.TINTED_LENS, Abilities.PRANKSTER, 430, 65, 47, 75, 73, 85, 85, 150, 70, 151, GrowthRate.FLUCTUATING, 0, false),
+    new PokemonSpecies(Species.ROSELIA, 3, false, false, false, "Thorn Pokémon", PokemonType.GRASS, PokemonType.POISON, 0.3, 2, Abilities.NATURAL_CURE, Abilities.POISON_POINT, Abilities.LEAF_GUARD, 400, 50, 60, 45, 100, 80, 65, 150, 50, 140, GrowthRate.MEDIUM_SLOW, 50, true),
+    new PokemonSpecies(Species.GULPIN, 3, false, false, false, "Stomach Pokémon", PokemonType.POISON, null, 0.4, 10.3, Abilities.LIQUID_OOZE, Abilities.STICKY_HOLD, Abilities.GLUTTONY, 302, 70, 43, 53, 43, 53, 40, 225, 70, 60, GrowthRate.FLUCTUATING, 50, true),
+    new PokemonSpecies(Species.SWALOT, 3, false, false, false, "Poison Bag Pokémon", PokemonType.POISON, null, 1.7, 80, Abilities.LIQUID_OOZE, Abilities.STICKY_HOLD, Abilities.GLUTTONY, 467, 100, 73, 83, 73, 83, 55, 75, 70, 163, GrowthRate.FLUCTUATING, 50, true),
+    new PokemonSpecies(Species.CARVANHA, 3, false, false, false, "Savage Pokémon", PokemonType.WATER, PokemonType.DARK, 0.8, 20.8, Abilities.ROUGH_SKIN, Abilities.NONE, Abilities.SPEED_BOOST, 305, 45, 90, 20, 65, 20, 65, 225, 35, 61, GrowthRate.SLOW, 50, false),
+    new PokemonSpecies(Species.SHARPEDO, 3, false, false, false, "Brutal Pokémon", PokemonType.WATER, PokemonType.DARK, 1.8, 88.8, Abilities.ROUGH_SKIN, Abilities.NONE, Abilities.SPEED_BOOST, 460, 70, 120, 40, 95, 40, 95, 60, 35, 161, GrowthRate.SLOW, 50, false, true,
+      new PokemonForm("Normal", "", PokemonType.WATER, PokemonType.DARK, 1.8, 88.8, Abilities.ROUGH_SKIN, Abilities.NONE, Abilities.SPEED_BOOST, 460, 70, 120, 40, 95, 40, 95, 60, 35, 161, false, null, true),
+      new PokemonForm("Mega", SpeciesFormKey.MEGA, PokemonType.WATER, PokemonType.DARK, 2.5, 130.3, Abilities.STRONG_JAW, Abilities.NONE, Abilities.STRONG_JAW, 560, 70, 140, 70, 110, 65, 105, 60, 35, 161),
+    ),
+    new PokemonSpecies(Species.WAILMER, 3, false, false, false, "Ball Whale Pokémon", PokemonType.WATER, null, 2, 130, Abilities.WATER_VEIL, Abilities.OBLIVIOUS, Abilities.PRESSURE, 400, 130, 70, 35, 70, 35, 60, 125, 50, 80, GrowthRate.FLUCTUATING, 50, false),
+    new PokemonSpecies(Species.WAILORD, 3, false, false, false, "Float Whale Pokémon", PokemonType.WATER, null, 14.5, 398, Abilities.WATER_VEIL, Abilities.OBLIVIOUS, Abilities.PRESSURE, 500, 170, 90, 45, 90, 45, 60, 60, 50, 175, GrowthRate.FLUCTUATING, 50, false),
+    new PokemonSpecies(Species.NUMEL, 3, false, false, false, "Numb Pokémon", PokemonType.FIRE, PokemonType.GROUND, 0.7, 24, Abilities.OBLIVIOUS, Abilities.SIMPLE, Abilities.OWN_TEMPO, 305, 60, 60, 40, 65, 45, 35, 255, 70, 61, GrowthRate.MEDIUM_FAST, 50, true),
+    new PokemonSpecies(Species.CAMERUPT, 3, false, false, false, "Eruption Pokémon", PokemonType.FIRE, PokemonType.GROUND, 1.9, 220, Abilities.MAGMA_ARMOR, Abilities.SOLID_ROCK, Abilities.ANGER_POINT, 460, 70, 100, 70, 105, 75, 40, 150, 70, 161, GrowthRate.MEDIUM_FAST, 50, true, true,
+      new PokemonForm("Normal", "", PokemonType.FIRE, PokemonType.GROUND, 1.9, 220, Abilities.MAGMA_ARMOR, Abilities.SOLID_ROCK, Abilities.ANGER_POINT, 460, 70, 100, 70, 105, 75, 40, 150, 70, 161, true, null, true),
+      new PokemonForm("Mega", SpeciesFormKey.MEGA, PokemonType.FIRE, PokemonType.GROUND, 2.5, 320.5, Abilities.SHEER_FORCE, Abilities.SHEER_FORCE, Abilities.SHEER_FORCE, 560, 70, 120, 100, 145, 105, 20, 150, 70, 161),
+    ),
+    new PokemonSpecies(Species.TORKOAL, 3, false, false, false, "Coal Pokémon", PokemonType.FIRE, null, 0.5, 80.4, Abilities.WHITE_SMOKE, Abilities.DROUGHT, Abilities.SHELL_ARMOR, 470, 70, 85, 140, 85, 70, 20, 90, 50, 165, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.SPOINK, 3, false, false, false, "Bounce Pokémon", PokemonType.PSYCHIC, null, 0.7, 30.6, Abilities.THICK_FAT, Abilities.OWN_TEMPO, Abilities.GLUTTONY, 330, 60, 25, 35, 70, 80, 60, 255, 70, 66, GrowthRate.FAST, 50, false),
+    new PokemonSpecies(Species.GRUMPIG, 3, false, false, false, "Manipulate Pokémon", PokemonType.PSYCHIC, null, 0.9, 71.5, Abilities.THICK_FAT, Abilities.OWN_TEMPO, Abilities.GLUTTONY, 470, 80, 45, 65, 90, 110, 80, 60, 70, 165, GrowthRate.FAST, 50, false),
+    new PokemonSpecies(Species.SPINDA, 3, false, false, false, "Spot Panda Pokémon", PokemonType.NORMAL, null, 1.1, 5, Abilities.OWN_TEMPO, Abilities.TANGLED_FEET, Abilities.CONTRARY, 360, 60, 60, 60, 60, 60, 60, 255, 70, 126, GrowthRate.FAST, 50, false),
+    new PokemonSpecies(Species.TRAPINCH, 3, false, false, false, "Ant Pit Pokémon", PokemonType.GROUND, null, 0.7, 15, Abilities.HYPER_CUTTER, Abilities.ARENA_TRAP, Abilities.SHEER_FORCE, 290, 45, 100, 45, 45, 45, 10, 255, 50, 58, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.VIBRAVA, 3, false, false, false, "Vibration Pokémon", PokemonType.GROUND, PokemonType.DRAGON, 1.1, 15.3, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 340, 50, 70, 50, 50, 50, 70, 120, 50, 119, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.FLYGON, 3, false, false, false, "Mystic Pokémon", PokemonType.GROUND, PokemonType.DRAGON, 2, 82, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 520, 80, 100, 80, 80, 80, 100, 45, 50, 260, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.CACNEA, 3, false, false, false, "Cactus Pokémon", PokemonType.GRASS, null, 0.4, 51.3, Abilities.SAND_VEIL, Abilities.NONE, Abilities.WATER_ABSORB, 335, 50, 85, 40, 85, 40, 35, 190, 35, 67, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.CACTURNE, 3, false, false, false, "Scarecrow Pokémon", PokemonType.GRASS, PokemonType.DARK, 1.3, 77.4, Abilities.SAND_VEIL, Abilities.NONE, Abilities.WATER_ABSORB, 475, 70, 115, 60, 115, 60, 55, 60, 35, 166, GrowthRate.MEDIUM_SLOW, 50, true),
+    new PokemonSpecies(Species.SWABLU, 3, false, false, false, "Cotton Bird Pokémon", PokemonType.NORMAL, PokemonType.FLYING, 0.4, 1.2, Abilities.NATURAL_CURE, Abilities.NONE, Abilities.CLOUD_NINE, 310, 45, 40, 60, 40, 75, 50, 255, 50, 62, GrowthRate.ERRATIC, 50, false),
+    new PokemonSpecies(Species.ALTARIA, 3, false, false, false, "Humming Pokémon", PokemonType.DRAGON, PokemonType.FLYING, 1.1, 20.6, Abilities.NATURAL_CURE, Abilities.NONE, Abilities.CLOUD_NINE, 490, 75, 70, 90, 70, 105, 80, 45, 50, 172, GrowthRate.ERRATIC, 50, false, true,
+      new PokemonForm("Normal", "", PokemonType.DRAGON, PokemonType.FLYING, 1.1, 20.6, Abilities.NATURAL_CURE, Abilities.NONE, Abilities.CLOUD_NINE, 490, 75, 70, 90, 70, 105, 80, 45, 50, 172, false, null, true),
+      new PokemonForm("Mega", SpeciesFormKey.MEGA, PokemonType.DRAGON, PokemonType.FAIRY, 1.5, 20.6, Abilities.PIXILATE, Abilities.NONE, Abilities.PIXILATE, 590, 75, 110, 110, 110, 105, 80, 45, 50, 172),
+    ),
+    new PokemonSpecies(Species.ZANGOOSE, 3, false, false, false, "Cat Ferret Pokémon", PokemonType.NORMAL, null, 1.3, 40.3, Abilities.IMMUNITY, Abilities.NONE, Abilities.TOXIC_BOOST, 458, 73, 115, 60, 60, 60, 90, 90, 70, 160, GrowthRate.ERRATIC, 50, false),
+    new PokemonSpecies(Species.SEVIPER, 3, false, false, false, "Fang Snake Pokémon", PokemonType.POISON, null, 2.7, 52.5, Abilities.SHED_SKIN, Abilities.NONE, Abilities.INFILTRATOR, 458, 73, 100, 60, 100, 60, 65, 90, 70, 160, GrowthRate.FLUCTUATING, 50, false),
+    new PokemonSpecies(Species.LUNATONE, 3, false, false, false, "Meteorite Pokémon", PokemonType.ROCK, PokemonType.PSYCHIC, 1, 168, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 460, 90, 55, 65, 95, 85, 70, 45, 50, 161, GrowthRate.FAST, null, false),
+    new PokemonSpecies(Species.SOLROCK, 3, false, false, false, "Meteorite Pokémon", PokemonType.ROCK, PokemonType.PSYCHIC, 1.2, 154, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 460, 90, 95, 85, 55, 65, 70, 45, 50, 161, GrowthRate.FAST, null, false),
+    new PokemonSpecies(Species.BARBOACH, 3, false, false, false, "Whiskers Pokémon", PokemonType.WATER, PokemonType.GROUND, 0.4, 1.9, Abilities.OBLIVIOUS, Abilities.ANTICIPATION, Abilities.HYDRATION, 288, 50, 48, 43, 46, 41, 60, 190, 50, 58, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.WHISCASH, 3, false, false, false, "Whiskers Pokémon", PokemonType.WATER, PokemonType.GROUND, 0.9, 23.6, Abilities.OBLIVIOUS, Abilities.ANTICIPATION, Abilities.HYDRATION, 468, 110, 78, 73, 76, 71, 60, 75, 50, 164, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.CORPHISH, 3, false, false, false, "Ruffian Pokémon", PokemonType.WATER, null, 0.6, 11.5, Abilities.HYPER_CUTTER, Abilities.SHELL_ARMOR, Abilities.ADAPTABILITY, 308, 43, 80, 65, 50, 35, 35, 205, 50, 62, GrowthRate.FLUCTUATING, 50, false),
+    new PokemonSpecies(Species.CRAWDAUNT, 3, false, false, false, "Rogue Pokémon", PokemonType.WATER, PokemonType.DARK, 1.1, 32.8, Abilities.HYPER_CUTTER, Abilities.SHELL_ARMOR, Abilities.ADAPTABILITY, 468, 63, 120, 85, 90, 55, 55, 155, 50, 164, GrowthRate.FLUCTUATING, 50, false),
+    new PokemonSpecies(Species.BALTOY, 3, false, false, false, "Clay Doll Pokémon", PokemonType.GROUND, PokemonType.PSYCHIC, 0.5, 21.5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 300, 40, 40, 55, 40, 70, 55, 255, 50, 60, GrowthRate.MEDIUM_FAST, null, false),
+    new PokemonSpecies(Species.CLAYDOL, 3, false, false, false, "Clay Doll Pokémon", PokemonType.GROUND, PokemonType.PSYCHIC, 1.5, 108, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 500, 60, 70, 105, 70, 120, 75, 90, 50, 175, GrowthRate.MEDIUM_FAST, null, false),
+    new PokemonSpecies(Species.LILEEP, 3, false, false, false, "Sea Lily Pokémon", PokemonType.ROCK, PokemonType.GRASS, 1, 23.8, Abilities.SUCTION_CUPS, Abilities.NONE, Abilities.STORM_DRAIN, 355, 66, 41, 77, 61, 87, 23, 45, 50, 71, GrowthRate.ERRATIC, 87.5, false),
+    new PokemonSpecies(Species.CRADILY, 3, false, false, false, "Barnacle Pokémon", PokemonType.ROCK, PokemonType.GRASS, 1.5, 60.4, Abilities.SUCTION_CUPS, Abilities.NONE, Abilities.STORM_DRAIN, 495, 86, 81, 97, 81, 107, 43, 45, 50, 173, GrowthRate.ERRATIC, 87.5, false),
+    new PokemonSpecies(Species.ANORITH, 3, false, false, false, "Old Shrimp Pokémon", PokemonType.ROCK, PokemonType.BUG, 0.7, 12.5, Abilities.BATTLE_ARMOR, Abilities.NONE, Abilities.SWIFT_SWIM, 355, 45, 95, 50, 40, 50, 75, 45, 50, 71, GrowthRate.ERRATIC, 87.5, false),
+    new PokemonSpecies(Species.ARMALDO, 3, false, false, false, "Plate Pokémon", PokemonType.ROCK, PokemonType.BUG, 1.5, 68.2, Abilities.BATTLE_ARMOR, Abilities.NONE, Abilities.SWIFT_SWIM, 495, 75, 125, 100, 70, 80, 45, 45, 50, 173, GrowthRate.ERRATIC, 87.5, false),
+    new PokemonSpecies(Species.FEEBAS, 3, false, false, false, "Fish Pokémon", PokemonType.WATER, null, 0.6, 7.4, Abilities.SWIFT_SWIM, Abilities.OBLIVIOUS, Abilities.ADAPTABILITY, 200, 20, 15, 20, 10, 55, 80, 255, 50, 40, GrowthRate.ERRATIC, 50, false),
+    new PokemonSpecies(Species.MILOTIC, 3, false, false, false, "Tender Pokémon", PokemonType.WATER, null, 6.2, 162, Abilities.MARVEL_SCALE, Abilities.COMPETITIVE, Abilities.CUTE_CHARM, 540, 95, 60, 79, 100, 125, 81, 60, 50, 189, GrowthRate.ERRATIC, 50, true),
+    new PokemonSpecies(Species.CASTFORM, 3, false, false, false, "Weather Pokémon", PokemonType.NORMAL, null, 0.3, 0.8, Abilities.FORECAST, Abilities.NONE, Abilities.NONE, 420, 70, 70, 70, 70, 70, 70, 45, 70, 147, GrowthRate.MEDIUM_FAST, 50, false, true,
+      new PokemonForm("Normal Form", "", PokemonType.NORMAL, null, 0.3, 0.8, Abilities.FORECAST, Abilities.NONE, Abilities.NONE, 420, 70, 70, 70, 70, 70, 70, 45, 70, 147, false, null, true),
+      new PokemonForm("Sunny Form", "sunny", PokemonType.FIRE, null, 0.3, 0.8, Abilities.FORECAST, Abilities.NONE, Abilities.NONE, 420, 70, 70, 70, 70, 70, 70, 45, 70, 147),
+      new PokemonForm("Rainy Form", "rainy", PokemonType.WATER, null, 0.3, 0.8, Abilities.FORECAST, Abilities.NONE, Abilities.NONE, 420, 70, 70, 70, 70, 70, 70, 45, 70, 147),
+      new PokemonForm("Snowy Form", "snowy", PokemonType.ICE, null, 0.3, 0.8, Abilities.FORECAST, Abilities.NONE, Abilities.NONE, 420, 70, 70, 70, 70, 70, 70, 45, 70, 147),
+    ),
+    new PokemonSpecies(Species.KECLEON, 3, false, false, false, "Color Swap Pokémon", PokemonType.NORMAL, null, 1, 22, Abilities.COLOR_CHANGE, Abilities.NONE, Abilities.PROTEAN, 440, 60, 90, 70, 60, 120, 40, 200, 70, 154, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.SHUPPET, 3, false, false, false, "Puppet Pokémon", PokemonType.GHOST, null, 0.6, 2.3, Abilities.INSOMNIA, Abilities.FRISK, Abilities.CURSED_BODY, 295, 44, 75, 35, 63, 33, 45, 225, 35, 59, GrowthRate.FAST, 50, false),
+    new PokemonSpecies(Species.BANETTE, 3, false, false, false, "Marionette Pokémon", PokemonType.GHOST, null, 1.1, 12.5, Abilities.INSOMNIA, Abilities.FRISK, Abilities.CURSED_BODY, 455, 64, 115, 65, 83, 63, 65, 45, 35, 159, GrowthRate.FAST, 50, false, true,
+      new PokemonForm("Normal", "", PokemonType.GHOST, null, 1.1, 12.5, Abilities.INSOMNIA, Abilities.FRISK, Abilities.CURSED_BODY, 455, 64, 115, 65, 83, 63, 65, 45, 35, 159, false, null, true),
+      new PokemonForm("Mega", SpeciesFormKey.MEGA, PokemonType.GHOST, null, 1.2, 13, Abilities.PRANKSTER, Abilities.PRANKSTER, Abilities.PRANKSTER, 555, 64, 165, 75, 93, 83, 75, 45, 35, 159),
+    ),
+    new PokemonSpecies(Species.DUSKULL, 3, false, false, false, "Requiem Pokémon", PokemonType.GHOST, null, 0.8, 15, Abilities.LEVITATE, Abilities.NONE, Abilities.FRISK, 295, 20, 40, 90, 30, 90, 25, 190, 35, 59, GrowthRate.FAST, 50, false),
+    new PokemonSpecies(Species.DUSCLOPS, 3, false, false, false, "Beckon Pokémon", PokemonType.GHOST, null, 1.6, 30.6, Abilities.PRESSURE, Abilities.NONE, Abilities.FRISK, 455, 40, 70, 130, 60, 130, 25, 90, 35, 159, GrowthRate.FAST, 50, false),
+    new PokemonSpecies(Species.TROPIUS, 3, false, false, false, "Fruit Pokémon", PokemonType.GRASS, PokemonType.FLYING, 2, 100, Abilities.CHLOROPHYLL, Abilities.SOLAR_POWER, Abilities.HARVEST, 460, 99, 68, 83, 72, 87, 51, 200, 70, 161, GrowthRate.SLOW, 50, false),
+    new PokemonSpecies(Species.CHIMECHO, 3, false, false, false, "Wind Chime Pokémon", PokemonType.PSYCHIC, null, 0.6, 1, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 455, 75, 50, 80, 95, 90, 65, 45, 70, 159, GrowthRate.FAST, 50, false),
+    new PokemonSpecies(Species.ABSOL, 3, false, false, false, "Disaster Pokémon", PokemonType.DARK, null, 1.2, 47, Abilities.PRESSURE, Abilities.SUPER_LUCK, Abilities.JUSTIFIED, 465, 65, 130, 60, 75, 60, 75, 30, 35, 163, GrowthRate.MEDIUM_SLOW, 50, false, true,
+      new PokemonForm("Normal", "", PokemonType.DARK, null, 1.2, 47, Abilities.PRESSURE, Abilities.SUPER_LUCK, Abilities.JUSTIFIED, 465, 65, 130, 60, 75, 60, 75, 30, 35, 163, false, null, true),
+      new PokemonForm("Mega", SpeciesFormKey.MEGA, PokemonType.DARK, null, 1.2, 49, Abilities.MAGIC_BOUNCE, Abilities.MAGIC_BOUNCE, Abilities.MAGIC_BOUNCE, 565, 65, 150, 60, 115, 60, 115, 30, 35, 163),
+    ),
+    new PokemonSpecies(Species.WYNAUT, 3, false, false, false, "Bright Pokémon", PokemonType.PSYCHIC, null, 0.6, 14, Abilities.SHADOW_TAG, Abilities.NONE, Abilities.TELEPATHY, 260, 95, 23, 48, 23, 48, 23, 125, 50, 52, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.SNORUNT, 3, false, false, false, "Snow Hat Pokémon", PokemonType.ICE, null, 0.7, 16.8, Abilities.INNER_FOCUS, Abilities.ICE_BODY, Abilities.MOODY, 300, 50, 50, 50, 50, 50, 50, 190, 50, 60, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.GLALIE, 3, false, false, false, "Face Pokémon", PokemonType.ICE, null, 1.5, 256.5, Abilities.INNER_FOCUS, Abilities.ICE_BODY, Abilities.MOODY, 480, 80, 80, 80, 80, 80, 80, 75, 50, 168, GrowthRate.MEDIUM_FAST, 50, false, true,
+      new PokemonForm("Normal", "", PokemonType.ICE, null, 1.5, 256.5, Abilities.INNER_FOCUS, Abilities.ICE_BODY, Abilities.MOODY, 480, 80, 80, 80, 80, 80, 80, 75, 50, 168, false, null, true),
+      new PokemonForm("Mega", SpeciesFormKey.MEGA, PokemonType.ICE, null, 2.1, 350.2, Abilities.REFRIGERATE, Abilities.REFRIGERATE, Abilities.REFRIGERATE, 580, 80, 120, 80, 120, 80, 100, 75, 50, 168),
+    ),
+    new PokemonSpecies(Species.SPHEAL, 3, false, false, false, "Clap Pokémon", PokemonType.ICE, PokemonType.WATER, 0.8, 39.5, Abilities.THICK_FAT, Abilities.ICE_BODY, Abilities.OBLIVIOUS, 290, 70, 40, 50, 55, 50, 25, 255, 50, 58, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.SEALEO, 3, false, false, false, "Ball Roll Pokémon", PokemonType.ICE, PokemonType.WATER, 1.1, 87.6, Abilities.THICK_FAT, Abilities.ICE_BODY, Abilities.OBLIVIOUS, 410, 90, 60, 70, 75, 70, 45, 120, 50, 144, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.WALREIN, 3, false, false, false, "Ice Break Pokémon", PokemonType.ICE, PokemonType.WATER, 1.4, 150.6, Abilities.THICK_FAT, Abilities.ICE_BODY, Abilities.OBLIVIOUS, 530, 110, 80, 90, 95, 90, 65, 45, 50, 265, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.CLAMPERL, 3, false, false, false, "Bivalve Pokémon", PokemonType.WATER, null, 0.4, 52.5, Abilities.SHELL_ARMOR, Abilities.NONE, Abilities.RATTLED, 345, 35, 64, 85, 74, 55, 32, 255, 70, 69, GrowthRate.ERRATIC, 50, false),
+    new PokemonSpecies(Species.HUNTAIL, 3, false, false, false, "Deep Sea Pokémon", PokemonType.WATER, null, 1.7, 27, Abilities.SWIFT_SWIM, Abilities.NONE, Abilities.WATER_VEIL, 485, 55, 104, 105, 94, 75, 52, 60, 70, 170, GrowthRate.ERRATIC, 50, false),
+    new PokemonSpecies(Species.GOREBYSS, 3, false, false, false, "South Sea Pokémon", PokemonType.WATER, null, 1.8, 22.6, Abilities.SWIFT_SWIM, Abilities.NONE, Abilities.HYDRATION, 485, 55, 84, 105, 114, 75, 52, 60, 70, 170, GrowthRate.ERRATIC, 50, false),
+    new PokemonSpecies(Species.RELICANTH, 3, false, false, false, "Longevity Pokémon", PokemonType.WATER, PokemonType.ROCK, 1, 23.4, Abilities.SWIFT_SWIM, Abilities.ROCK_HEAD, Abilities.STURDY, 485, 100, 90, 130, 45, 65, 55, 25, 50, 170, GrowthRate.SLOW, 87.5, true),
+    new PokemonSpecies(Species.LUVDISC, 3, false, false, false, "Rendezvous Pokémon", PokemonType.WATER, null, 0.6, 8.7, Abilities.SWIFT_SWIM, Abilities.NONE, Abilities.HYDRATION, 330, 43, 30, 55, 40, 65, 97, 225, 70, 116, GrowthRate.FAST, 25, false),
+    new PokemonSpecies(Species.BAGON, 3, false, false, false, "Rock Head Pokémon", PokemonType.DRAGON, null, 0.6, 42.1, Abilities.ROCK_HEAD, Abilities.NONE, Abilities.SHEER_FORCE, 300, 45, 75, 60, 40, 30, 50, 45, 35, 60, GrowthRate.SLOW, 50, false),
+    new PokemonSpecies(Species.SHELGON, 3, false, false, false, "Endurance Pokémon", PokemonType.DRAGON, null, 1.1, 110.5, Abilities.ROCK_HEAD, Abilities.NONE, Abilities.OVERCOAT, 420, 65, 95, 100, 60, 50, 50, 45, 35, 147, GrowthRate.SLOW, 50, false),
+    new PokemonSpecies(Species.SALAMENCE, 3, false, false, false, "Dragon Pokémon", PokemonType.DRAGON, PokemonType.FLYING, 1.5, 102.6, Abilities.INTIMIDATE, Abilities.NONE, Abilities.MOXIE, 600, 95, 135, 80, 110, 80, 100, 45, 35, 300, GrowthRate.SLOW, 50, false, true,
+      new PokemonForm("Normal", "", PokemonType.DRAGON, PokemonType.FLYING, 1.5, 102.6, Abilities.INTIMIDATE, Abilities.NONE, Abilities.MOXIE, 600, 95, 135, 80, 110, 80, 100, 45, 35, 300, false, null, true),
+      new PokemonForm("Mega", SpeciesFormKey.MEGA, PokemonType.DRAGON, PokemonType.FLYING, 1.8, 112.6, Abilities.AERILATE, Abilities.NONE, Abilities.AERILATE, 700, 95, 145, 130, 120, 90, 120, 45, 35, 300),
+    ),
+    new PokemonSpecies(Species.BELDUM, 3, false, false, false, "Iron Ball Pokémon", PokemonType.STEEL, PokemonType.PSYCHIC, 0.6, 95.2, Abilities.CLEAR_BODY, Abilities.NONE, Abilities.LIGHT_METAL, 300, 40, 55, 80, 35, 60, 30, 45, 35, 60, GrowthRate.SLOW, null, false), //Custom Catchrate, matching Frigibax
+    new PokemonSpecies(Species.METANG, 3, false, false, false, "Iron Claw Pokémon", PokemonType.STEEL, PokemonType.PSYCHIC, 1.2, 202.5, Abilities.CLEAR_BODY, Abilities.NONE, Abilities.LIGHT_METAL, 420, 60, 75, 100, 55, 80, 50, 25, 35, 147, GrowthRate.SLOW, null, false), //Custom Catchrate, matching Arctibax
+    new PokemonSpecies(Species.METAGROSS, 3, false, false, false, "Iron Leg Pokémon", PokemonType.STEEL, PokemonType.PSYCHIC, 1.6, 550, Abilities.CLEAR_BODY, Abilities.NONE, Abilities.LIGHT_METAL, 600, 80, 135, 130, 95, 90, 70, 10, 35, 300, GrowthRate.SLOW, null, false, true, //Custom Catchrate, matching Baxcalibur
+      new PokemonForm("Normal", "", PokemonType.STEEL, PokemonType.PSYCHIC, 1.6, 550, Abilities.CLEAR_BODY, Abilities.NONE, Abilities.LIGHT_METAL, 600, 80, 135, 130, 95, 90, 70, 3, 35, 300, false, null, true),
+      new PokemonForm("Mega", SpeciesFormKey.MEGA, PokemonType.STEEL, PokemonType.PSYCHIC, 2.5, 942.9, Abilities.TOUGH_CLAWS, Abilities.NONE, Abilities.TOUGH_CLAWS, 700, 80, 145, 150, 105, 110, 110, 3, 35, 300),
+    ),
+    new PokemonSpecies(Species.REGIROCK, 3, true, false, false, "Rock Peak Pokémon", PokemonType.ROCK, null, 1.7, 230, Abilities.CLEAR_BODY, Abilities.NONE, Abilities.STURDY, 580, 80, 100, 200, 50, 100, 50, 3, 35, 290, GrowthRate.SLOW, null, false),
+    new PokemonSpecies(Species.REGICE, 3, true, false, false, "Iceberg Pokémon", PokemonType.ICE, null, 1.8, 175, Abilities.CLEAR_BODY, Abilities.NONE, Abilities.ICE_BODY, 580, 80, 50, 100, 100, 200, 50, 3, 35, 290, GrowthRate.SLOW, null, false),
+    new PokemonSpecies(Species.REGISTEEL, 3, true, false, false, "Iron Pokémon", PokemonType.STEEL, null, 1.9, 205, Abilities.CLEAR_BODY, Abilities.NONE, Abilities.LIGHT_METAL, 580, 80, 75, 150, 75, 150, 50, 3, 35, 290, GrowthRate.SLOW, null, false),
+    new PokemonSpecies(Species.LATIAS, 3, true, false, false, "Eon Pokémon", PokemonType.DRAGON, PokemonType.PSYCHIC, 1.4, 40, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 600, 80, 80, 90, 110, 130, 110, 3, 90, 300, GrowthRate.SLOW, 0, false, true,
+      new PokemonForm("Normal", "", PokemonType.DRAGON, PokemonType.PSYCHIC, 1.4, 40, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 600, 80, 80, 90, 110, 130, 110, 3, 90, 300, false, null, true),
+      new PokemonForm("Mega", SpeciesFormKey.MEGA, PokemonType.DRAGON, PokemonType.PSYCHIC, 1.8, 52, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 700, 80, 100, 120, 140, 150, 110, 3, 90, 300),
+    ),
+    new PokemonSpecies(Species.LATIOS, 3, true, false, false, "Eon Pokémon", PokemonType.DRAGON, PokemonType.PSYCHIC, 2, 60, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 600, 80, 90, 80, 130, 110, 110, 3, 90, 300, GrowthRate.SLOW, 100, false, true,
+      new PokemonForm("Normal", "", PokemonType.DRAGON, PokemonType.PSYCHIC, 2, 60, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 600, 80, 90, 80, 130, 110, 110, 3, 90, 300, false, null, true),
+      new PokemonForm("Mega", SpeciesFormKey.MEGA, PokemonType.DRAGON, PokemonType.PSYCHIC, 2.3, 70, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 700, 80, 130, 100, 160, 120, 110, 3, 90, 300),
+    ),
+    new PokemonSpecies(Species.KYOGRE, 3, false, true, false, "Sea Basin Pokémon", PokemonType.WATER, null, 4.5, 352, Abilities.DRIZZLE, Abilities.NONE, Abilities.NONE, 670, 100, 100, 90, 150, 140, 90, 3, 0, 335, GrowthRate.SLOW, null, false, true,
+      new PokemonForm("Normal", "", PokemonType.WATER, null, 4.5, 352, Abilities.DRIZZLE, Abilities.NONE, Abilities.NONE, 670, 100, 100, 90, 150, 140, 90, 3, 0, 335, false, null, true),
+      new PokemonForm("Primal", "primal", PokemonType.WATER, null, 9.8, 430, Abilities.PRIMORDIAL_SEA, Abilities.NONE, Abilities.NONE, 770, 100, 150, 90, 180, 160, 90, 3, 0, 335),
+    ),
+    new PokemonSpecies(Species.GROUDON, 3, false, true, false, "Continent Pokémon", PokemonType.GROUND, null, 3.5, 950, Abilities.DROUGHT, Abilities.NONE, Abilities.NONE, 670, 100, 150, 140, 100, 90, 90, 3, 0, 335, GrowthRate.SLOW, null, false, true,
+      new PokemonForm("Normal", "", PokemonType.GROUND, null, 3.5, 950, Abilities.DROUGHT, Abilities.NONE, Abilities.NONE, 670, 100, 150, 140, 100, 90, 90, 3, 0, 335, false, null, true),
+      new PokemonForm("Primal", "primal", PokemonType.GROUND, PokemonType.FIRE, 5, 999.7, Abilities.DESOLATE_LAND, Abilities.NONE, Abilities.NONE, 770, 100, 180, 160, 150, 90, 90, 3, 0, 335),
+    ),
+    new PokemonSpecies(Species.RAYQUAZA, 3, false, true, false, "Sky High Pokémon", PokemonType.DRAGON, PokemonType.FLYING, 7, 206.5, Abilities.AIR_LOCK, Abilities.NONE, Abilities.NONE, 680, 105, 150, 90, 150, 90, 95, 45, 0, 340, GrowthRate.SLOW, null, false, true,
+      new PokemonForm("Normal", "", PokemonType.DRAGON, PokemonType.FLYING, 7, 206.5, Abilities.AIR_LOCK, Abilities.NONE, Abilities.NONE, 680, 105, 150, 90, 150, 90, 95, 45, 0, 340, false, null, true),
+      new PokemonForm("Mega", SpeciesFormKey.MEGA, PokemonType.DRAGON, PokemonType.FLYING, 10.8, 392, Abilities.DELTA_STREAM, Abilities.NONE, Abilities.NONE, 780, 105, 180, 100, 180, 100, 115, 45, 0, 340),
+    ),
+    new PokemonSpecies(Species.JIRACHI, 3, false, false, true, "Wish Pokémon", PokemonType.STEEL, PokemonType.PSYCHIC, 0.3, 1.1, Abilities.SERENE_GRACE, Abilities.NONE, Abilities.NONE, 600, 100, 100, 100, 100, 100, 100, 3, 100, 300, GrowthRate.SLOW, null, false),
+    new PokemonSpecies(Species.DEOXYS, 3, false, false, true, "DNA Pokémon", PokemonType.PSYCHIC, null, 1.7, 60.8, Abilities.PRESSURE, Abilities.NONE, Abilities.NONE, 600, 50, 150, 50, 150, 50, 150, 3, 0, 300, GrowthRate.SLOW, null, false, true,
+      new PokemonForm("Normal Forme", "normal", PokemonType.PSYCHIC, null, 1.7, 60.8, Abilities.PRESSURE, Abilities.NONE, Abilities.NONE, 600, 50, 150, 50, 150, 50, 150, 3, 0, 300, false, "", true),
+      new PokemonForm("Attack Forme", "attack", PokemonType.PSYCHIC, null, 1.7, 60.8, Abilities.PRESSURE, Abilities.NONE, Abilities.NONE, 600, 50, 180, 20, 180, 20, 150, 3, 0, 300),
+      new PokemonForm("Defense Forme", "defense", PokemonType.PSYCHIC, null, 1.7, 60.8, Abilities.PRESSURE, Abilities.NONE, Abilities.NONE, 600, 50, 70, 160, 70, 160, 90, 3, 0, 300),
+      new PokemonForm("Speed Forme", "speed", PokemonType.PSYCHIC, null, 1.7, 60.8, Abilities.PRESSURE, Abilities.NONE, Abilities.NONE, 600, 50, 95, 90, 95, 90, 180, 3, 0, 300),
+    ),
+    new PokemonSpecies(Species.TURTWIG, 4, false, false, false, "Tiny Leaf Pokémon", PokemonType.GRASS, null, 0.4, 10.2, Abilities.OVERGROW, Abilities.NONE, Abilities.SHELL_ARMOR, 318, 55, 68, 64, 45, 55, 31, 45, 70, 64, GrowthRate.MEDIUM_SLOW, 87.5, false),
+    new PokemonSpecies(Species.GROTLE, 4, false, false, false, "Grove Pokémon", PokemonType.GRASS, null, 1.1, 97, Abilities.OVERGROW, Abilities.NONE, Abilities.SHELL_ARMOR, 405, 75, 89, 85, 55, 65, 36, 45, 70, 142, GrowthRate.MEDIUM_SLOW, 87.5, false),
+    new PokemonSpecies(Species.TORTERRA, 4, false, false, false, "Continent Pokémon", PokemonType.GRASS, PokemonType.GROUND, 2.2, 310, Abilities.OVERGROW, Abilities.NONE, Abilities.SHELL_ARMOR, 525, 95, 109, 105, 75, 85, 56, 45, 70, 263, GrowthRate.MEDIUM_SLOW, 87.5, false),
+    new PokemonSpecies(Species.CHIMCHAR, 4, false, false, false, "Chimp Pokémon", PokemonType.FIRE, null, 0.5, 6.2, Abilities.BLAZE, Abilities.NONE, Abilities.IRON_FIST, 309, 44, 58, 44, 58, 44, 61, 45, 70, 62, GrowthRate.MEDIUM_SLOW, 87.5, false),
+    new PokemonSpecies(Species.MONFERNO, 4, false, false, false, "Playful Pokémon", PokemonType.FIRE, PokemonType.FIGHTING, 0.9, 22, Abilities.BLAZE, Abilities.NONE, Abilities.IRON_FIST, 405, 64, 78, 52, 78, 52, 81, 45, 70, 142, GrowthRate.MEDIUM_SLOW, 87.5, false),
+    new PokemonSpecies(Species.INFERNAPE, 4, false, false, false, "Flame Pokémon", PokemonType.FIRE, PokemonType.FIGHTING, 1.2, 55, Abilities.BLAZE, Abilities.NONE, Abilities.IRON_FIST, 534, 76, 104, 71, 104, 71, 108, 45, 70, 267, GrowthRate.MEDIUM_SLOW, 87.5, false),
+    new PokemonSpecies(Species.PIPLUP, 4, false, false, false, "Penguin Pokémon", PokemonType.WATER, null, 0.4, 5.2, Abilities.TORRENT, Abilities.NONE, Abilities.COMPETITIVE, 314, 53, 51, 53, 61, 56, 40, 45, 70, 63, GrowthRate.MEDIUM_SLOW, 87.5, false),
+    new PokemonSpecies(Species.PRINPLUP, 4, false, false, false, "Penguin Pokémon", PokemonType.WATER, null, 0.8, 23, Abilities.TORRENT, Abilities.NONE, Abilities.COMPETITIVE, 405, 64, 66, 68, 81, 76, 50, 45, 70, 142, GrowthRate.MEDIUM_SLOW, 87.5, false),
+    new PokemonSpecies(Species.EMPOLEON, 4, false, false, false, "Emperor Pokémon", PokemonType.WATER, PokemonType.STEEL, 1.7, 84.5, Abilities.TORRENT, Abilities.NONE, Abilities.COMPETITIVE, 530, 84, 86, 88, 111, 101, 60, 45, 70, 265, GrowthRate.MEDIUM_SLOW, 87.5, false),
+    new PokemonSpecies(Species.STARLY, 4, false, false, false, "Starling Pokémon", PokemonType.NORMAL, PokemonType.FLYING, 0.3, 2, Abilities.KEEN_EYE, Abilities.NONE, Abilities.RECKLESS, 245, 40, 55, 30, 30, 30, 60, 255, 70, 49, GrowthRate.MEDIUM_SLOW, 50, true),
+    new PokemonSpecies(Species.STARAVIA, 4, false, false, false, "Starling Pokémon", PokemonType.NORMAL, PokemonType.FLYING, 0.6, 15.5, Abilities.INTIMIDATE, Abilities.NONE, Abilities.RECKLESS, 340, 55, 75, 50, 40, 40, 80, 120, 70, 119, GrowthRate.MEDIUM_SLOW, 50, true),
+    new PokemonSpecies(Species.STARAPTOR, 4, false, false, false, "Predator Pokémon", PokemonType.NORMAL, PokemonType.FLYING, 1.2, 24.9, Abilities.INTIMIDATE, Abilities.NONE, Abilities.RECKLESS, 485, 85, 120, 70, 50, 60, 100, 45, 70, 243, GrowthRate.MEDIUM_SLOW, 50, true),
+    new PokemonSpecies(Species.BIDOOF, 4, false, false, false, "Plump Mouse Pokémon", PokemonType.NORMAL, null, 0.5, 20, Abilities.SIMPLE, Abilities.UNAWARE, Abilities.MOODY, 250, 59, 45, 40, 35, 40, 31, 255, 70, 50, GrowthRate.MEDIUM_FAST, 50, true),
+    new PokemonSpecies(Species.BIBAREL, 4, false, false, false, "Beaver Pokémon", PokemonType.NORMAL, PokemonType.WATER, 1, 31.5, Abilities.SIMPLE, Abilities.UNAWARE, Abilities.MOODY, 410, 79, 85, 60, 55, 60, 71, 127, 70, 144, GrowthRate.MEDIUM_FAST, 50, true),
+    new PokemonSpecies(Species.KRICKETOT, 4, false, false, false, "Cricket Pokémon", PokemonType.BUG, null, 0.3, 2.2, Abilities.SHED_SKIN, Abilities.NONE, Abilities.RUN_AWAY, 194, 37, 25, 41, 25, 41, 25, 255, 70, 39, GrowthRate.MEDIUM_SLOW, 50, true),
+    new PokemonSpecies(Species.KRICKETUNE, 4, false, false, false, "Cricket Pokémon", PokemonType.BUG, null, 1, 25.5, Abilities.SWARM, Abilities.NONE, Abilities.TECHNICIAN, 384, 77, 85, 51, 55, 51, 65, 45, 70, 134, GrowthRate.MEDIUM_SLOW, 50, true),
+    new PokemonSpecies(Species.SHINX, 4, false, false, false, "Flash Pokémon", PokemonType.ELECTRIC, null, 0.5, 9.5, Abilities.RIVALRY, Abilities.INTIMIDATE, Abilities.GUTS, 263, 45, 65, 34, 40, 34, 45, 235, 50, 53, GrowthRate.MEDIUM_SLOW, 50, true),
+    new PokemonSpecies(Species.LUXIO, 4, false, false, false, "Spark Pokémon", PokemonType.ELECTRIC, null, 0.9, 30.5, Abilities.RIVALRY, Abilities.INTIMIDATE, Abilities.GUTS, 363, 60, 85, 49, 60, 49, 60, 120, 100, 127, GrowthRate.MEDIUM_SLOW, 50, true),
+    new PokemonSpecies(Species.LUXRAY, 4, false, false, false, "Gleam Eyes Pokémon", PokemonType.ELECTRIC, null, 1.4, 42, Abilities.RIVALRY, Abilities.INTIMIDATE, Abilities.GUTS, 523, 80, 120, 79, 95, 79, 70, 45, 50, 262, GrowthRate.MEDIUM_SLOW, 50, true),
+    new PokemonSpecies(Species.BUDEW, 4, false, false, false, "Bud Pokémon", PokemonType.GRASS, PokemonType.POISON, 0.2, 1.2, Abilities.NATURAL_CURE, Abilities.POISON_POINT, Abilities.LEAF_GUARD, 280, 40, 30, 35, 50, 70, 55, 255, 50, 56, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.ROSERADE, 4, false, false, false, "Bouquet Pokémon", PokemonType.GRASS, PokemonType.POISON, 0.9, 14.5, Abilities.NATURAL_CURE, Abilities.POISON_POINT, Abilities.TECHNICIAN, 515, 60, 70, 65, 125, 105, 90, 75, 50, 258, GrowthRate.MEDIUM_SLOW, 50, true),
+    new PokemonSpecies(Species.CRANIDOS, 4, false, false, false, "Head Butt Pokémon", PokemonType.ROCK, null, 0.9, 31.5, Abilities.MOLD_BREAKER, Abilities.NONE, Abilities.SHEER_FORCE, 350, 67, 125, 40, 30, 30, 58, 45, 70, 70, GrowthRate.ERRATIC, 87.5, false),
+    new PokemonSpecies(Species.RAMPARDOS, 4, false, false, false, "Head Butt Pokémon", PokemonType.ROCK, null, 1.6, 102.5, Abilities.MOLD_BREAKER, Abilities.NONE, Abilities.SHEER_FORCE, 495, 97, 165, 60, 65, 50, 58, 45, 70, 173, GrowthRate.ERRATIC, 87.5, false),
+    new PokemonSpecies(Species.SHIELDON, 4, false, false, false, "Shield Pokémon", PokemonType.ROCK, PokemonType.STEEL, 0.5, 57, Abilities.STURDY, Abilities.NONE, Abilities.SOUNDPROOF, 350, 30, 42, 118, 42, 88, 30, 45, 70, 70, GrowthRate.ERRATIC, 87.5, false),
+    new PokemonSpecies(Species.BASTIODON, 4, false, false, false, "Shield Pokémon", PokemonType.ROCK, PokemonType.STEEL, 1.3, 149.5, Abilities.STURDY, Abilities.NONE, Abilities.SOUNDPROOF, 495, 60, 52, 168, 47, 138, 30, 45, 70, 173, GrowthRate.ERRATIC, 87.5, false),
+    new PokemonSpecies(Species.BURMY, 4, false, false, false, "Bagworm Pokémon", PokemonType.BUG, null, 0.2, 3.4, Abilities.SHED_SKIN, Abilities.NONE, Abilities.OVERCOAT, 224, 40, 29, 45, 29, 45, 36, 120, 70, 45, GrowthRate.MEDIUM_FAST, 50, false, true,
+      new PokemonForm("Plant Cloak", "plant", PokemonType.BUG, null, 0.2, 3.4, Abilities.SHED_SKIN, Abilities.NONE, Abilities.OVERCOAT, 224, 40, 29, 45, 29, 45, 36, 120, 70, 45, false, null, true),
+      new PokemonForm("Sandy Cloak", "sandy", PokemonType.BUG, null, 0.2, 3.4, Abilities.SHED_SKIN, Abilities.NONE, Abilities.OVERCOAT, 224, 40, 29, 45, 29, 45, 36, 120, 70, 45, false, null, true),
+      new PokemonForm("Trash Cloak", "trash", PokemonType.BUG, null, 0.2, 3.4, Abilities.SHED_SKIN, Abilities.NONE, Abilities.OVERCOAT, 224, 40, 29, 45, 29, 45, 36, 120, 70, 45, false, null, true),
+    ),
+    new PokemonSpecies(Species.WORMADAM, 4, false, false, false, "Bagworm Pokémon", PokemonType.BUG, PokemonType.GRASS, 0.5, 6.5, Abilities.ANTICIPATION, Abilities.NONE, Abilities.OVERCOAT, 424, 60, 59, 85, 79, 105, 36, 45, 70, 148, GrowthRate.MEDIUM_FAST, 0, false, false,
+      new PokemonForm("Plant Cloak", "plant", PokemonType.BUG, PokemonType.GRASS, 0.5, 6.5, Abilities.ANTICIPATION, Abilities.NONE, Abilities.OVERCOAT, 424, 60, 59, 85, 79, 105, 36, 45, 70, 148, false, null, true),
+      new PokemonForm("Sandy Cloak", "sandy", PokemonType.BUG, PokemonType.GROUND, 0.5, 6.5, Abilities.ANTICIPATION, Abilities.NONE, Abilities.OVERCOAT, 424, 60, 79, 105, 59, 85, 36, 45, 70, 148, false, null, true),
+      new PokemonForm("Trash Cloak", "trash", PokemonType.BUG, PokemonType.STEEL, 0.5, 6.5, Abilities.ANTICIPATION, Abilities.NONE, Abilities.OVERCOAT, 424, 60, 69, 95, 69, 95, 36, 45, 70, 148, false, null, true),
+    ),
+    new PokemonSpecies(Species.MOTHIM, 4, false, false, false, "Moth Pokémon", PokemonType.BUG, PokemonType.FLYING, 0.9, 23.3, Abilities.SWARM, Abilities.NONE, Abilities.TINTED_LENS, 424, 70, 94, 50, 94, 50, 66, 45, 70, 148, GrowthRate.MEDIUM_FAST, 100, false),
+    new PokemonSpecies(Species.COMBEE, 4, false, false, false, "Tiny Bee Pokémon", PokemonType.BUG, PokemonType.FLYING, 0.3, 5.5, Abilities.HONEY_GATHER, Abilities.NONE, Abilities.HUSTLE, 244, 30, 30, 42, 30, 42, 70, 120, 50, 49, GrowthRate.MEDIUM_SLOW, 87.5, true),
+    new PokemonSpecies(Species.VESPIQUEN, 4, false, false, false, "Beehive Pokémon", PokemonType.BUG, PokemonType.FLYING, 1.2, 38.5, Abilities.PRESSURE, Abilities.NONE, Abilities.UNNERVE, 474, 70, 80, 102, 80, 102, 40, 45, 50, 166, GrowthRate.MEDIUM_SLOW, 0, false),
+    new PokemonSpecies(Species.PACHIRISU, 4, false, false, false, "EleSquirrel Pokémon", PokemonType.ELECTRIC, null, 0.4, 3.9, Abilities.RUN_AWAY, Abilities.PICKUP, Abilities.VOLT_ABSORB, 405, 60, 45, 70, 45, 90, 95, 200, 100, 142, GrowthRate.MEDIUM_FAST, 50, true),
+    new PokemonSpecies(Species.BUIZEL, 4, false, false, false, "Sea Weasel Pokémon", PokemonType.WATER, null, 0.7, 29.5, Abilities.SWIFT_SWIM, Abilities.NONE, Abilities.WATER_VEIL, 330, 55, 65, 35, 60, 30, 85, 190, 70, 66, GrowthRate.MEDIUM_FAST, 50, true),
+    new PokemonSpecies(Species.FLOATZEL, 4, false, false, false, "Sea Weasel Pokémon", PokemonType.WATER, null, 1.1, 33.5, Abilities.SWIFT_SWIM, Abilities.NONE, Abilities.WATER_VEIL, 495, 85, 105, 55, 85, 50, 115, 75, 70, 173, GrowthRate.MEDIUM_FAST, 50, true),
+    new PokemonSpecies(Species.CHERUBI, 4, false, false, false, "Cherry Pokémon", PokemonType.GRASS, null, 0.4, 3.3, Abilities.CHLOROPHYLL, Abilities.NONE, Abilities.NONE, 275, 45, 35, 45, 62, 53, 35, 190, 50, 55, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.CHERRIM, 4, false, false, false, "Blossom Pokémon", PokemonType.GRASS, null, 0.5, 9.3, Abilities.FLOWER_GIFT, Abilities.NONE, Abilities.NONE, 450, 70, 60, 70, 87, 78, 85, 75, 50, 158, GrowthRate.MEDIUM_FAST, 50, false, true,
+      new PokemonForm("Overcast Form", "overcast", PokemonType.GRASS, null, 0.5, 9.3, Abilities.FLOWER_GIFT, Abilities.NONE, Abilities.NONE, 450, 70, 60, 70, 87, 78, 85, 75, 50, 158, false, null, true),
+      new PokemonForm("Sunshine Form", "sunshine", PokemonType.GRASS, null, 0.5, 9.3, Abilities.FLOWER_GIFT, Abilities.NONE, Abilities.NONE, 450, 70, 60, 70, 87, 78, 85, 75, 50, 158),
+    ),
+    new PokemonSpecies(Species.SHELLOS, 4, false, false, false, "Sea Slug Pokémon", PokemonType.WATER, null, 0.3, 6.3, Abilities.STICKY_HOLD, Abilities.STORM_DRAIN, Abilities.SAND_FORCE, 325, 76, 48, 48, 57, 62, 34, 190, 50, 65, GrowthRate.MEDIUM_FAST, 50, false, false,
+      new PokemonForm("East Sea", "east", PokemonType.WATER, null, 0.3, 6.3, Abilities.STICKY_HOLD, Abilities.STORM_DRAIN, Abilities.SAND_FORCE, 325, 76, 48, 48, 57, 62, 34, 190, 50, 65, false, null, true),
+      new PokemonForm("West Sea", "west", PokemonType.WATER, null, 0.3, 6.3, Abilities.STICKY_HOLD, Abilities.STORM_DRAIN, Abilities.SAND_FORCE, 325, 76, 48, 48, 57, 62, 34, 190, 50, 65, false, null, true),
+    ),
+    new PokemonSpecies(Species.GASTRODON, 4, false, false, false, "Sea Slug Pokémon", PokemonType.WATER, PokemonType.GROUND, 0.9, 29.9, Abilities.STICKY_HOLD, Abilities.STORM_DRAIN, Abilities.SAND_FORCE, 475, 111, 83, 68, 92, 82, 39, 75, 50, 166, GrowthRate.MEDIUM_FAST, 50, false, false,
+      new PokemonForm("East Sea", "east", PokemonType.WATER, PokemonType.GROUND, 0.9, 29.9, Abilities.STICKY_HOLD, Abilities.STORM_DRAIN, Abilities.SAND_FORCE, 475, 111, 83, 68, 92, 82, 39, 75, 50, 166, false, null, true),
+      new PokemonForm("West Sea", "west", PokemonType.WATER, PokemonType.GROUND, 0.9, 29.9, Abilities.STICKY_HOLD, Abilities.STORM_DRAIN, Abilities.SAND_FORCE, 475, 111, 83, 68, 92, 82, 39, 75, 50, 166, false, null, true),
+    ),
+    new PokemonSpecies(Species.AMBIPOM, 4, false, false, false, "Long Tail Pokémon", PokemonType.NORMAL, null, 1.2, 20.3, Abilities.TECHNICIAN, Abilities.PICKUP, Abilities.SKILL_LINK, 482, 75, 100, 66, 60, 66, 115, 45, 100, 169, GrowthRate.FAST, 50, true),
+    new PokemonSpecies(Species.DRIFLOON, 4, false, false, false, "Balloon Pokémon", PokemonType.GHOST, PokemonType.FLYING, 0.4, 1.2, Abilities.AFTERMATH, Abilities.UNBURDEN, Abilities.FLARE_BOOST, 348, 90, 50, 34, 60, 44, 70, 125, 50, 70, GrowthRate.FLUCTUATING, 50, false),
+    new PokemonSpecies(Species.DRIFBLIM, 4, false, false, false, "Blimp Pokémon", PokemonType.GHOST, PokemonType.FLYING, 1.2, 15, Abilities.AFTERMATH, Abilities.UNBURDEN, Abilities.FLARE_BOOST, 498, 150, 80, 44, 90, 54, 80, 60, 50, 174, GrowthRate.FLUCTUATING, 50, false),
+    new PokemonSpecies(Species.BUNEARY, 4, false, false, false, "Rabbit Pokémon", PokemonType.NORMAL, null, 0.4, 5.5, Abilities.RUN_AWAY, Abilities.KLUTZ, Abilities.LIMBER, 350, 55, 66, 44, 44, 56, 85, 190, 0, 70, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.LOPUNNY, 4, false, false, false, "Rabbit Pokémon", PokemonType.NORMAL, null, 1.2, 33.3, Abilities.CUTE_CHARM, Abilities.KLUTZ, Abilities.LIMBER, 480, 65, 76, 84, 54, 96, 105, 60, 140, 168, GrowthRate.MEDIUM_FAST, 50, false, true,
+      new PokemonForm("Normal", "", PokemonType.NORMAL, null, 1.2, 33.3, Abilities.CUTE_CHARM, Abilities.KLUTZ, Abilities.LIMBER, 480, 65, 76, 84, 54, 96, 105, 60, 140, 168, false, null, true),
+      new PokemonForm("Mega", SpeciesFormKey.MEGA, PokemonType.NORMAL, PokemonType.FIGHTING, 1.3, 28.3, Abilities.SCRAPPY, Abilities.SCRAPPY, Abilities.SCRAPPY, 580, 65, 136, 94, 54, 96, 135, 60, 140, 168),
+    ),
+    new PokemonSpecies(Species.MISMAGIUS, 4, false, false, false, "Magical Pokémon", PokemonType.GHOST, null, 0.9, 4.4, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 495, 60, 60, 60, 105, 105, 105, 45, 35, 173, GrowthRate.FAST, 50, false),
+    new PokemonSpecies(Species.HONCHKROW, 4, false, false, false, "Big Boss Pokémon", PokemonType.DARK, PokemonType.FLYING, 0.9, 27.3, Abilities.INSOMNIA, Abilities.SUPER_LUCK, Abilities.MOXIE, 505, 100, 125, 52, 105, 52, 71, 30, 35, 177, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.GLAMEOW, 4, false, false, false, "Catty Pokémon", PokemonType.NORMAL, null, 0.5, 3.9, Abilities.LIMBER, Abilities.OWN_TEMPO, Abilities.KEEN_EYE, 310, 49, 55, 42, 42, 37, 85, 190, 70, 62, GrowthRate.FAST, 25, false),
+    new PokemonSpecies(Species.PURUGLY, 4, false, false, false, "Tiger Cat Pokémon", PokemonType.NORMAL, null, 1, 43.8, Abilities.THICK_FAT, Abilities.OWN_TEMPO, Abilities.DEFIANT, 452, 71, 82, 64, 64, 59, 112, 75, 70, 158, GrowthRate.FAST, 25, false),
+    new PokemonSpecies(Species.CHINGLING, 4, false, false, false, "Bell Pokémon", PokemonType.PSYCHIC, null, 0.2, 0.6, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 285, 45, 30, 50, 65, 50, 45, 120, 70, 57, GrowthRate.FAST, 50, false),
+    new PokemonSpecies(Species.STUNKY, 4, false, false, false, "Skunk Pokémon", PokemonType.POISON, PokemonType.DARK, 0.4, 19.2, Abilities.STENCH, Abilities.AFTERMATH, Abilities.KEEN_EYE, 329, 63, 63, 47, 41, 41, 74, 225, 50, 66, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.SKUNTANK, 4, false, false, false, "Skunk Pokémon", PokemonType.POISON, PokemonType.DARK, 1, 38, Abilities.STENCH, Abilities.AFTERMATH, Abilities.KEEN_EYE, 479, 103, 93, 67, 71, 61, 84, 60, 50, 168, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.BRONZOR, 4, false, false, false, "Bronze Pokémon", PokemonType.STEEL, PokemonType.PSYCHIC, 0.5, 60.5, Abilities.LEVITATE, Abilities.HEATPROOF, Abilities.HEAVY_METAL, 300, 57, 24, 86, 24, 86, 23, 255, 50, 60, GrowthRate.MEDIUM_FAST, null, false),
+    new PokemonSpecies(Species.BRONZONG, 4, false, false, false, "Bronze Bell Pokémon", PokemonType.STEEL, PokemonType.PSYCHIC, 1.3, 187, Abilities.LEVITATE, Abilities.HEATPROOF, Abilities.HEAVY_METAL, 500, 67, 89, 116, 79, 116, 33, 90, 50, 175, GrowthRate.MEDIUM_FAST, null, false),
+    new PokemonSpecies(Species.BONSLY, 4, false, false, false, "Bonsai Pokémon", PokemonType.ROCK, null, 0.5, 15, Abilities.STURDY, Abilities.ROCK_HEAD, Abilities.RATTLED, 290, 50, 80, 95, 10, 45, 10, 255, 50, 58, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.MIME_JR, 4, false, false, false, "Mime Pokémon", PokemonType.PSYCHIC, PokemonType.FAIRY, 0.6, 13, Abilities.SOUNDPROOF, Abilities.FILTER, Abilities.TECHNICIAN, 310, 20, 25, 45, 70, 90, 60, 145, 50, 62, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.HAPPINY, 4, false, false, false, "Playhouse Pokémon", PokemonType.NORMAL, null, 0.6, 24.4, Abilities.NATURAL_CURE, Abilities.SERENE_GRACE, Abilities.FRIEND_GUARD, 220, 100, 5, 5, 15, 65, 30, 130, 140, 110, GrowthRate.FAST, 0, false),
+    new PokemonSpecies(Species.CHATOT, 4, false, false, false, "Music Note Pokémon", PokemonType.NORMAL, PokemonType.FLYING, 0.5, 1.9, Abilities.KEEN_EYE, Abilities.TANGLED_FEET, Abilities.BIG_PECKS, 411, 76, 65, 45, 92, 42, 91, 30, 35, 144, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.SPIRITOMB, 4, false, false, false, "Forbidden Pokémon", PokemonType.GHOST, PokemonType.DARK, 1, 108, Abilities.PRESSURE, Abilities.NONE, Abilities.INFILTRATOR, 485, 50, 92, 108, 92, 108, 35, 100, 50, 170, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.GIBLE, 4, false, false, false, "Land Shark Pokémon", PokemonType.DRAGON, PokemonType.GROUND, 0.7, 20.5, Abilities.SAND_VEIL, Abilities.NONE, Abilities.ROUGH_SKIN, 300, 58, 70, 45, 40, 45, 42, 45, 50, 60, GrowthRate.SLOW, 50, true),
+    new PokemonSpecies(Species.GABITE, 4, false, false, false, "Cave Pokémon", PokemonType.DRAGON, PokemonType.GROUND, 1.4, 56, Abilities.SAND_VEIL, Abilities.NONE, Abilities.ROUGH_SKIN, 410, 68, 90, 65, 50, 55, 82, 45, 50, 144, GrowthRate.SLOW, 50, true),
+    new PokemonSpecies(Species.GARCHOMP, 4, false, false, false, "Mach Pokémon", PokemonType.DRAGON, PokemonType.GROUND, 1.9, 95, Abilities.SAND_VEIL, Abilities.NONE, Abilities.ROUGH_SKIN, 600, 108, 130, 95, 80, 85, 102, 45, 50, 300, GrowthRate.SLOW, 50, true, true,
+      new PokemonForm("Normal", "", PokemonType.DRAGON, PokemonType.GROUND, 1.9, 95, Abilities.SAND_VEIL, Abilities.NONE, Abilities.ROUGH_SKIN, 600, 108, 130, 95, 80, 85, 102, 45, 50, 300, true, null, true),
+      new PokemonForm("Mega", SpeciesFormKey.MEGA, PokemonType.DRAGON, PokemonType.GROUND, 1.9, 95, Abilities.SAND_FORCE, Abilities.NONE, Abilities.SAND_FORCE, 700, 108, 170, 115, 120, 95, 92, 45, 50, 300, true),
+    ),
+    new PokemonSpecies(Species.MUNCHLAX, 4, false, false, false, "Big Eater Pokémon", PokemonType.NORMAL, null, 0.6, 105, Abilities.PICKUP, Abilities.THICK_FAT, Abilities.GLUTTONY, 390, 135, 85, 40, 40, 85, 5, 50, 50, 78, GrowthRate.SLOW, 87.5, false),
+    new PokemonSpecies(Species.RIOLU, 4, false, false, false, "Emanation Pokémon", PokemonType.FIGHTING, null, 0.7, 20.2, Abilities.STEADFAST, Abilities.INNER_FOCUS, Abilities.PRANKSTER, 285, 40, 70, 40, 35, 40, 60, 75, 50, 57, GrowthRate.MEDIUM_SLOW, 87.5, false),
+    new PokemonSpecies(Species.LUCARIO, 4, false, false, false, "Aura Pokémon", PokemonType.FIGHTING, PokemonType.STEEL, 1.2, 54, Abilities.STEADFAST, Abilities.INNER_FOCUS, Abilities.JUSTIFIED, 525, 70, 110, 70, 115, 70, 90, 45, 50, 184, GrowthRate.MEDIUM_SLOW, 87.5, false, true,
+      new PokemonForm("Normal", "", PokemonType.FIGHTING, PokemonType.STEEL, 1.2, 54, Abilities.STEADFAST, Abilities.INNER_FOCUS, Abilities.JUSTIFIED, 525, 70, 110, 70, 115, 70, 90, 45, 50, 184, false, null, true),
+      new PokemonForm("Mega", SpeciesFormKey.MEGA, PokemonType.FIGHTING, PokemonType.STEEL, 1.3, 57.5, Abilities.ADAPTABILITY, Abilities.ADAPTABILITY, Abilities.ADAPTABILITY, 625, 70, 145, 88, 140, 70, 112, 45, 50, 184),
+    ),
+    new PokemonSpecies(Species.HIPPOPOTAS, 4, false, false, false, "Hippo Pokémon", PokemonType.GROUND, null, 0.8, 49.5, Abilities.SAND_STREAM, Abilities.NONE, Abilities.SAND_FORCE, 330, 68, 72, 78, 38, 42, 32, 140, 50, 66, GrowthRate.SLOW, 50, true),
+    new PokemonSpecies(Species.HIPPOWDON, 4, false, false, false, "Heavyweight Pokémon", PokemonType.GROUND, null, 2, 300, Abilities.SAND_STREAM, Abilities.NONE, Abilities.SAND_FORCE, 525, 108, 112, 118, 68, 72, 47, 60, 50, 184, GrowthRate.SLOW, 50, true),
+    new PokemonSpecies(Species.SKORUPI, 4, false, false, false, "Scorpion Pokémon", PokemonType.POISON, PokemonType.BUG, 0.8, 12, Abilities.BATTLE_ARMOR, Abilities.SNIPER, Abilities.KEEN_EYE, 330, 40, 50, 90, 30, 55, 65, 120, 50, 66, GrowthRate.SLOW, 50, false),
+    new PokemonSpecies(Species.DRAPION, 4, false, false, false, "Ogre Scorpion Pokémon", PokemonType.POISON, PokemonType.DARK, 1.3, 61.5, Abilities.BATTLE_ARMOR, Abilities.SNIPER, Abilities.KEEN_EYE, 500, 70, 90, 110, 60, 75, 95, 45, 50, 175, GrowthRate.SLOW, 50, false),
+    new PokemonSpecies(Species.CROAGUNK, 4, false, false, false, "Toxic Mouth Pokémon", PokemonType.POISON, PokemonType.FIGHTING, 0.7, 23, Abilities.ANTICIPATION, Abilities.DRY_SKIN, Abilities.POISON_TOUCH, 300, 48, 61, 40, 61, 40, 50, 140, 100, 60, GrowthRate.MEDIUM_FAST, 50, true),
+    new PokemonSpecies(Species.TOXICROAK, 4, false, false, false, "Toxic Mouth Pokémon", PokemonType.POISON, PokemonType.FIGHTING, 1.3, 44.4, Abilities.ANTICIPATION, Abilities.DRY_SKIN, Abilities.POISON_TOUCH, 490, 83, 106, 65, 86, 65, 85, 75, 50, 172, GrowthRate.MEDIUM_FAST, 50, true),
+    new PokemonSpecies(Species.CARNIVINE, 4, false, false, false, "Bug Catcher Pokémon", PokemonType.GRASS, null, 1.4, 27, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 454, 74, 100, 72, 90, 72, 46, 200, 70, 159, GrowthRate.SLOW, 50, false),
+    new PokemonSpecies(Species.FINNEON, 4, false, false, false, "Wing Fish Pokémon", PokemonType.WATER, null, 0.4, 7, Abilities.SWIFT_SWIM, Abilities.STORM_DRAIN, Abilities.WATER_VEIL, 330, 49, 49, 56, 49, 61, 66, 190, 70, 66, GrowthRate.ERRATIC, 50, true),
+    new PokemonSpecies(Species.LUMINEON, 4, false, false, false, "Neon Pokémon", PokemonType.WATER, null, 1.2, 24, Abilities.SWIFT_SWIM, Abilities.STORM_DRAIN, Abilities.WATER_VEIL, 460, 69, 69, 76, 69, 86, 91, 75, 70, 161, GrowthRate.ERRATIC, 50, true),
+    new PokemonSpecies(Species.MANTYKE, 4, false, false, false, "Kite Pokémon", PokemonType.WATER, PokemonType.FLYING, 1, 65, Abilities.SWIFT_SWIM, Abilities.WATER_ABSORB, Abilities.WATER_VEIL, 345, 45, 20, 50, 60, 120, 50, 25, 50, 69, GrowthRate.SLOW, 50, false),
+    new PokemonSpecies(Species.SNOVER, 4, false, false, false, "Frost Tree Pokémon", PokemonType.GRASS, PokemonType.ICE, 1, 50.5, Abilities.SNOW_WARNING, Abilities.NONE, Abilities.SOUNDPROOF, 334, 60, 62, 50, 62, 60, 40, 120, 50, 67, GrowthRate.SLOW, 50, true),
+    new PokemonSpecies(Species.ABOMASNOW, 4, false, false, false, "Frost Tree Pokémon", PokemonType.GRASS, PokemonType.ICE, 2.2, 135.5, Abilities.SNOW_WARNING, Abilities.NONE, Abilities.SOUNDPROOF, 494, 90, 92, 75, 92, 85, 60, 60, 50, 173, GrowthRate.SLOW, 50, true, true,
+      new PokemonForm("Normal", "", PokemonType.GRASS, PokemonType.ICE, 2.2, 135.5, Abilities.SNOW_WARNING, Abilities.NONE, Abilities.SOUNDPROOF, 494, 90, 92, 75, 92, 85, 60, 60, 50, 173, true, null, true),
+      new PokemonForm("Mega", SpeciesFormKey.MEGA, PokemonType.GRASS, PokemonType.ICE, 2.7, 185, Abilities.SNOW_WARNING, Abilities.NONE, Abilities.SNOW_WARNING, 594, 90, 132, 105, 132, 105, 30, 60, 50, 173, true),
+    ),
+    new PokemonSpecies(Species.WEAVILE, 4, false, false, false, "Sharp Claw Pokémon", PokemonType.DARK, PokemonType.ICE, 1.1, 34, Abilities.PRESSURE, Abilities.NONE, Abilities.PICKPOCKET, 510, 70, 120, 65, 45, 85, 125, 45, 35, 179, GrowthRate.MEDIUM_SLOW, 50, true),
+    new PokemonSpecies(Species.MAGNEZONE, 4, false, false, false, "Magnet Area Pokémon", PokemonType.ELECTRIC, PokemonType.STEEL, 1.2, 180, Abilities.MAGNET_PULL, Abilities.STURDY, Abilities.ANALYTIC, 535, 70, 70, 115, 130, 90, 60, 30, 50, 268, GrowthRate.MEDIUM_FAST, null, false),
+    new PokemonSpecies(Species.LICKILICKY, 4, false, false, false, "Licking Pokémon", PokemonType.NORMAL, null, 1.7, 140, Abilities.OWN_TEMPO, Abilities.OBLIVIOUS, Abilities.CLOUD_NINE, 515, 110, 85, 95, 80, 95, 50, 30, 50, 180, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.RHYPERIOR, 4, false, false, false, "Drill Pokémon", PokemonType.GROUND, PokemonType.ROCK, 2.4, 282.8, Abilities.LIGHTNING_ROD, Abilities.SOLID_ROCK, Abilities.RECKLESS, 535, 115, 140, 130, 55, 55, 40, 30, 50, 268, GrowthRate.SLOW, 50, true),
+    new PokemonSpecies(Species.TANGROWTH, 4, false, false, false, "Vine Pokémon", PokemonType.GRASS, null, 2, 128.6, Abilities.CHLOROPHYLL, Abilities.LEAF_GUARD, Abilities.REGENERATOR, 535, 100, 100, 125, 110, 50, 50, 30, 50, 187, GrowthRate.MEDIUM_FAST, 50, true),
+    new PokemonSpecies(Species.ELECTIVIRE, 4, false, false, false, "Thunderbolt Pokémon", PokemonType.ELECTRIC, null, 1.8, 138.6, Abilities.MOTOR_DRIVE, Abilities.NONE, Abilities.VITAL_SPIRIT, 540, 75, 123, 67, 95, 85, 95, 30, 50, 270, GrowthRate.MEDIUM_FAST, 75, false),
+    new PokemonSpecies(Species.MAGMORTAR, 4, false, false, false, "Blast Pokémon", PokemonType.FIRE, null, 1.6, 68, Abilities.FLAME_BODY, Abilities.NONE, Abilities.VITAL_SPIRIT, 540, 75, 95, 67, 125, 95, 83, 30, 50, 270, GrowthRate.MEDIUM_FAST, 75, false),
+    new PokemonSpecies(Species.TOGEKISS, 4, false, false, false, "Jubilee Pokémon", PokemonType.FAIRY, PokemonType.FLYING, 1.5, 38, Abilities.HUSTLE, Abilities.SERENE_GRACE, Abilities.SUPER_LUCK, 545, 85, 50, 95, 120, 115, 80, 30, 50, 273, GrowthRate.FAST, 87.5, false),
+    new PokemonSpecies(Species.YANMEGA, 4, false, false, false, "Ogre Darner Pokémon", PokemonType.BUG, PokemonType.FLYING, 1.9, 51.5, Abilities.SPEED_BOOST, Abilities.TINTED_LENS, Abilities.FRISK, 515, 86, 76, 86, 116, 56, 95, 30, 70, 180, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.LEAFEON, 4, false, false, false, "Verdant Pokémon", PokemonType.GRASS, null, 1, 25.5, Abilities.LEAF_GUARD, Abilities.NONE, Abilities.CHLOROPHYLL, 525, 65, 110, 130, 60, 65, 95, 45, 35, 184, GrowthRate.MEDIUM_FAST, 87.5, false),
+    new PokemonSpecies(Species.GLACEON, 4, false, false, false, "Fresh Snow Pokémon", PokemonType.ICE, null, 0.8, 25.9, Abilities.SNOW_CLOAK, Abilities.NONE, Abilities.ICE_BODY, 525, 65, 60, 110, 130, 95, 65, 45, 35, 184, GrowthRate.MEDIUM_FAST, 87.5, false),
+    new PokemonSpecies(Species.GLISCOR, 4, false, false, false, "Fang Scorpion Pokémon", PokemonType.GROUND, PokemonType.FLYING, 2, 42.5, Abilities.HYPER_CUTTER, Abilities.SAND_VEIL, Abilities.POISON_HEAL, 510, 75, 95, 125, 45, 75, 95, 30, 70, 179, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.MAMOSWINE, 4, false, false, false, "Twin Tusk Pokémon", PokemonType.ICE, PokemonType.GROUND, 2.5, 291, Abilities.OBLIVIOUS, Abilities.SNOW_CLOAK, Abilities.THICK_FAT, 530, 110, 130, 80, 70, 60, 80, 50, 50, 265, GrowthRate.SLOW, 50, true),
+    new PokemonSpecies(Species.PORYGON_Z, 4, false, false, false, "Virtual Pokémon", PokemonType.NORMAL, null, 0.9, 34, Abilities.ADAPTABILITY, Abilities.DOWNLOAD, Abilities.ANALYTIC, 535, 85, 80, 70, 135, 75, 90, 30, 50, 268, GrowthRate.MEDIUM_FAST, null, false),
+    new PokemonSpecies(Species.GALLADE, 4, false, false, false, "Blade Pokémon", PokemonType.PSYCHIC, PokemonType.FIGHTING, 1.6, 52, Abilities.STEADFAST, Abilities.SHARPNESS, Abilities.JUSTIFIED, 518, 68, 125, 65, 65, 115, 80, 45, 35, 259, GrowthRate.SLOW, 100, false, true,
+      new PokemonForm("Normal", "", PokemonType.PSYCHIC, PokemonType.FIGHTING, 1.6, 52, Abilities.STEADFAST, Abilities.SHARPNESS, Abilities.JUSTIFIED, 518, 68, 125, 65, 65, 115, 80, 45, 35, 259, false, null, true),
+      new PokemonForm("Mega", SpeciesFormKey.MEGA, PokemonType.PSYCHIC, PokemonType.FIGHTING, 1.6, 56.4, Abilities.INNER_FOCUS, Abilities.INNER_FOCUS, Abilities.INNER_FOCUS, 618, 68, 165, 95, 65, 115, 110, 45, 35, 259),
+    ),
+    new PokemonSpecies(Species.PROBOPASS, 4, false, false, false, "Compass Pokémon", PokemonType.ROCK, PokemonType.STEEL, 1.4, 340, Abilities.STURDY, Abilities.MAGNET_PULL, Abilities.SAND_FORCE, 525, 60, 55, 145, 75, 150, 40, 60, 70, 184, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.DUSKNOIR, 4, false, false, false, "Gripper Pokémon", PokemonType.GHOST, null, 2.2, 106.6, Abilities.PRESSURE, Abilities.NONE, Abilities.FRISK, 525, 45, 100, 135, 65, 135, 45, 45, 35, 263, GrowthRate.FAST, 50, false),
+    new PokemonSpecies(Species.FROSLASS, 4, false, false, false, "Snow Land Pokémon", PokemonType.ICE, PokemonType.GHOST, 1.3, 26.6, Abilities.SNOW_CLOAK, Abilities.NONE, Abilities.CURSED_BODY, 480, 70, 80, 70, 80, 70, 110, 75, 50, 168, GrowthRate.MEDIUM_FAST, 0, false),
+    new PokemonSpecies(Species.ROTOM, 4, false, false, false, "Plasma Pokémon", PokemonType.ELECTRIC, PokemonType.GHOST, 0.3, 0.3, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 440, 50, 50, 77, 95, 77, 91, 45, 50, 154, GrowthRate.MEDIUM_FAST, null, false, false,
+      new PokemonForm("Normal", "", PokemonType.ELECTRIC, PokemonType.GHOST, 0.3, 0.3, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 440, 50, 50, 77, 95, 77, 91, 45, 50, 154, false, null, true),
+      new PokemonForm("Heat", "heat", PokemonType.ELECTRIC, PokemonType.FIRE, 0.3, 0.3, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 520, 50, 65, 107, 105, 107, 86, 45, 50, 182, false, null, true),
+      new PokemonForm("Wash", "wash", PokemonType.ELECTRIC, PokemonType.WATER, 0.3, 0.3, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 520, 50, 65, 107, 105, 107, 86, 45, 50, 182, false, null, true),
+      new PokemonForm("Frost", "frost", PokemonType.ELECTRIC, PokemonType.ICE, 0.3, 0.3, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 520, 50, 65, 107, 105, 107, 86, 45, 50, 182, false, null, true),
+      new PokemonForm("Fan", "fan", PokemonType.ELECTRIC, PokemonType.FLYING, 0.3, 0.3, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 520, 50, 65, 107, 105, 107, 86, 45, 50, 182, false, null, true),
+      new PokemonForm("Mow", "mow", PokemonType.ELECTRIC, PokemonType.GRASS, 0.3, 0.3, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 520, 50, 65, 107, 105, 107, 86, 45, 50, 182, false, null, true),
+    ),
+    new PokemonSpecies(Species.UXIE, 4, true, false, false, "Knowledge Pokémon", PokemonType.PSYCHIC, null, 0.3, 0.3, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 580, 75, 75, 130, 75, 130, 95, 3, 140, 290, GrowthRate.SLOW, null, false),
+    new PokemonSpecies(Species.MESPRIT, 4, true, false, false, "Emotion Pokémon", PokemonType.PSYCHIC, null, 0.3, 0.3, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 580, 80, 105, 105, 105, 105, 80, 3, 140, 290, GrowthRate.SLOW, null, false),
+    new PokemonSpecies(Species.AZELF, 4, true, false, false, "Willpower Pokémon", PokemonType.PSYCHIC, null, 0.3, 0.3, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 580, 75, 125, 70, 125, 70, 115, 3, 140, 290, GrowthRate.SLOW, null, false),
+    new PokemonSpecies(Species.DIALGA, 4, false, true, false, "Temporal Pokémon", PokemonType.STEEL, PokemonType.DRAGON, 5.4, 683, Abilities.PRESSURE, Abilities.NONE, Abilities.TELEPATHY, 680, 100, 120, 120, 150, 100, 90, 3, 0, 340, GrowthRate.SLOW, null, false, false,
+      new PokemonForm("Normal", "", PokemonType.STEEL, PokemonType.DRAGON, 5.4, 683, Abilities.PRESSURE, Abilities.NONE, Abilities.TELEPATHY, 680, 100, 120, 120, 150, 100, 90, 3, 0, 340, false, null, true),
+      new PokemonForm("Origin Forme", "origin", PokemonType.STEEL, PokemonType.DRAGON, 7, 848.7, Abilities.PRESSURE, Abilities.NONE, Abilities.TELEPATHY, 680, 100, 100, 120, 150, 120, 90, 3, 0, 340),
+    ),
+    new PokemonSpecies(Species.PALKIA, 4, false, true, false, "Spatial Pokémon", PokemonType.WATER, PokemonType.DRAGON, 4.2, 336, Abilities.PRESSURE, Abilities.NONE, Abilities.TELEPATHY, 680, 90, 120, 100, 150, 120, 100, 3, 0, 340, GrowthRate.SLOW, null, false, false,
+      new PokemonForm("Normal", "", PokemonType.WATER, PokemonType.DRAGON, 4.2, 336, Abilities.PRESSURE, Abilities.NONE, Abilities.TELEPATHY, 680, 90, 120, 100, 150, 120, 100, 3, 0, 340, false, null, true),
+      new PokemonForm("Origin Forme", "origin", PokemonType.WATER, PokemonType.DRAGON, 6.3, 659, Abilities.PRESSURE, Abilities.NONE, Abilities.TELEPATHY, 680, 90, 100, 100, 150, 120, 120, 3, 0, 340),
+    ),
+    new PokemonSpecies(Species.HEATRAN, 4, true, false, false, "Lava Dome Pokémon", PokemonType.FIRE, PokemonType.STEEL, 1.7, 430, Abilities.FLASH_FIRE, Abilities.NONE, Abilities.FLAME_BODY, 600, 91, 90, 106, 130, 106, 77, 3, 100, 300, GrowthRate.SLOW, 50, false),
+    new PokemonSpecies(Species.REGIGIGAS, 4, true, false, false, "Colossal Pokémon", PokemonType.NORMAL, null, 3.7, 420, Abilities.SLOW_START, Abilities.NONE, Abilities.NORMALIZE, 670, 110, 160, 110, 80, 110, 100, 3, 0, 335, GrowthRate.SLOW, null, false),
+    new PokemonSpecies(Species.GIRATINA, 4, false, true, false, "Renegade Pokémon", PokemonType.GHOST, PokemonType.DRAGON, 4.5, 750, Abilities.PRESSURE, Abilities.NONE, Abilities.TELEPATHY, 680, 150, 100, 120, 100, 120, 90, 3, 0, 340, GrowthRate.SLOW, null, false, true,
+      new PokemonForm("Altered Forme", "altered", PokemonType.GHOST, PokemonType.DRAGON, 4.5, 750, Abilities.PRESSURE, Abilities.NONE, Abilities.TELEPATHY, 680, 150, 100, 120, 100, 120, 90, 3, 0, 340, false, null, true),
+      new PokemonForm("Origin Forme", "origin", PokemonType.GHOST, PokemonType.DRAGON, 6.9, 650, Abilities.LEVITATE, Abilities.NONE, Abilities.LEVITATE, 680, 150, 120, 100, 120, 100, 90, 3, 0, 340),
+    ),
+    new PokemonSpecies(Species.CRESSELIA, 4, true, false, false, "Lunar Pokémon", PokemonType.PSYCHIC, null, 1.5, 85.6, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 580, 120, 70, 110, 75, 120, 85, 3, 100, 300, GrowthRate.SLOW, 0, false),
+    new PokemonSpecies(Species.PHIONE, 4, false, false, true, "Sea Drifter Pokémon", PokemonType.WATER, null, 0.4, 3.1, Abilities.HYDRATION, Abilities.NONE, Abilities.NONE, 480, 80, 80, 80, 80, 80, 80, 30, 70, 240, GrowthRate.SLOW, null, false),
+    new PokemonSpecies(Species.MANAPHY, 4, false, false, true, "Seafaring Pokémon", PokemonType.WATER, null, 0.3, 1.4, Abilities.HYDRATION, Abilities.NONE, Abilities.NONE, 600, 100, 100, 100, 100, 100, 100, 3, 70, 300, GrowthRate.SLOW, null, false),
+    new PokemonSpecies(Species.DARKRAI, 4, false, false, true, "Pitch-Black Pokémon", PokemonType.DARK, null, 1.5, 50.5, Abilities.BAD_DREAMS, Abilities.NONE, Abilities.NONE, 600, 70, 90, 90, 135, 90, 125, 3, 0, 300, GrowthRate.SLOW, null, false),
+    new PokemonSpecies(Species.SHAYMIN, 4, false, false, true, "Gratitude Pokémon", PokemonType.GRASS, null, 0.2, 2.1, Abilities.NATURAL_CURE, Abilities.NONE, Abilities.NONE, 600, 100, 100, 100, 100, 100, 100, 45, 100, 300, GrowthRate.MEDIUM_SLOW, null, false, true,
+      new PokemonForm("Land Forme", "land", PokemonType.GRASS, null, 0.2, 2.1, Abilities.NATURAL_CURE, Abilities.NONE, Abilities.NONE, 600, 100, 100, 100, 100, 100, 100, 45, 100, 300, false, null, true),
+      new PokemonForm("Sky Forme", "sky", PokemonType.GRASS, PokemonType.FLYING, 0.4, 5.2, Abilities.SERENE_GRACE, Abilities.NONE, Abilities.NONE, 600, 100, 103, 75, 120, 75, 127, 45, 100, 300),
+    ),
+    new PokemonSpecies(Species.ARCEUS, 4, false, false, true, "Alpha Pokémon", PokemonType.NORMAL, null, 3.2, 320, Abilities.MULTITYPE, Abilities.NONE, Abilities.NONE, 720, 120, 120, 120, 120, 120, 120, 3, 0, 360, GrowthRate.SLOW, null, false, true,
+      new PokemonForm("Normal", "normal", PokemonType.NORMAL, null, 3.2, 320, Abilities.MULTITYPE, Abilities.NONE, Abilities.NONE, 720, 120, 120, 120, 120, 120, 120, 3, 0, 360, false, null, true),
+      new PokemonForm("Fighting", "fighting", PokemonType.FIGHTING, null, 3.2, 320, Abilities.MULTITYPE, Abilities.NONE, Abilities.NONE, 720, 120, 120, 120, 120, 120, 120, 3, 0, 360),
+      new PokemonForm("Flying", "flying", PokemonType.FLYING, null, 3.2, 320, Abilities.MULTITYPE, Abilities.NONE, Abilities.NONE, 720, 120, 120, 120, 120, 120, 120, 3, 0, 360),
+      new PokemonForm("Poison", "poison", PokemonType.POISON, null, 3.2, 320, Abilities.MULTITYPE, Abilities.NONE, Abilities.NONE, 720, 120, 120, 120, 120, 120, 120, 3, 0, 360),
+      new PokemonForm("Ground", "ground", PokemonType.GROUND, null, 3.2, 320, Abilities.MULTITYPE, Abilities.NONE, Abilities.NONE, 720, 120, 120, 120, 120, 120, 120, 3, 0, 360),
+      new PokemonForm("Rock", "rock", PokemonType.ROCK, null, 3.2, 320, Abilities.MULTITYPE, Abilities.NONE, Abilities.NONE, 720, 120, 120, 120, 120, 120, 120, 3, 0, 360),
+      new PokemonForm("Bug", "bug", PokemonType.BUG, null, 3.2, 320, Abilities.MULTITYPE, Abilities.NONE, Abilities.NONE, 720, 120, 120, 120, 120, 120, 120, 3, 0, 360),
+      new PokemonForm("Ghost", "ghost", PokemonType.GHOST, null, 3.2, 320, Abilities.MULTITYPE, Abilities.NONE, Abilities.NONE, 720, 120, 120, 120, 120, 120, 120, 3, 0, 360),
+      new PokemonForm("Steel", "steel", PokemonType.STEEL, null, 3.2, 320, Abilities.MULTITYPE, Abilities.NONE, Abilities.NONE, 720, 120, 120, 120, 120, 120, 120, 3, 0, 360),
+      new PokemonForm("Fire", "fire", PokemonType.FIRE, null, 3.2, 320, Abilities.MULTITYPE, Abilities.NONE, Abilities.NONE, 720, 120, 120, 120, 120, 120, 120, 3, 0, 360),
+      new PokemonForm("Water", "water", PokemonType.WATER, null, 3.2, 320, Abilities.MULTITYPE, Abilities.NONE, Abilities.NONE, 720, 120, 120, 120, 120, 120, 120, 3, 0, 360),
+      new PokemonForm("Grass", "grass", PokemonType.GRASS, null, 3.2, 320, Abilities.MULTITYPE, Abilities.NONE, Abilities.NONE, 720, 120, 120, 120, 120, 120, 120, 3, 0, 360),
+      new PokemonForm("Electric", "electric", PokemonType.ELECTRIC, null, 3.2, 320, Abilities.MULTITYPE, Abilities.NONE, Abilities.NONE, 720, 120, 120, 120, 120, 120, 120, 3, 0, 360),
+      new PokemonForm("Psychic", "psychic", PokemonType.PSYCHIC, null, 3.2, 320, Abilities.MULTITYPE, Abilities.NONE, Abilities.NONE, 720, 120, 120, 120, 120, 120, 120, 3, 0, 360),
+      new PokemonForm("Ice", "ice", PokemonType.ICE, null, 3.2, 320, Abilities.MULTITYPE, Abilities.NONE, Abilities.NONE, 720, 120, 120, 120, 120, 120, 120, 3, 0, 360),
+      new PokemonForm("Dragon", "dragon", PokemonType.DRAGON, null, 3.2, 320, Abilities.MULTITYPE, Abilities.NONE, Abilities.NONE, 720, 120, 120, 120, 120, 120, 120, 3, 0, 360),
+      new PokemonForm("Dark", "dark", PokemonType.DARK, null, 3.2, 320, Abilities.MULTITYPE, Abilities.NONE, Abilities.NONE, 720, 120, 120, 120, 120, 120, 120, 3, 0, 360),
+      new PokemonForm("Fairy", "fairy", PokemonType.FAIRY, null, 3.2, 320, Abilities.MULTITYPE, Abilities.NONE, Abilities.NONE, 720, 120, 120, 120, 120, 120, 120, 3, 0, 360),
+      new PokemonForm("???", "unknown", PokemonType.UNKNOWN, null, 3.2, 320, Abilities.MULTITYPE, Abilities.NONE, Abilities.NONE, 720, 120, 120, 120, 120, 120, 120, 3, 0, 360, false, null, false, true),
+    ),
+    new PokemonSpecies(Species.VICTINI, 5, false, false, true, "Victory Pokémon", PokemonType.PSYCHIC, PokemonType.FIRE, 0.4, 4, Abilities.VICTORY_STAR, Abilities.NONE, Abilities.NONE, 600, 100, 100, 100, 100, 100, 100, 3, 100, 300, GrowthRate.SLOW, null, false),
+    new PokemonSpecies(Species.SNIVY, 5, false, false, false, "Grass Snake Pokémon", PokemonType.GRASS, null, 0.6, 8.1, Abilities.OVERGROW, Abilities.NONE, Abilities.CONTRARY, 308, 45, 45, 55, 45, 55, 63, 45, 70, 62, GrowthRate.MEDIUM_SLOW, 87.5, false),
+    new PokemonSpecies(Species.SERVINE, 5, false, false, false, "Grass Snake Pokémon", PokemonType.GRASS, null, 0.8, 16, Abilities.OVERGROW, Abilities.NONE, Abilities.CONTRARY, 413, 60, 60, 75, 60, 75, 83, 45, 70, 145, GrowthRate.MEDIUM_SLOW, 87.5, false),
+    new PokemonSpecies(Species.SERPERIOR, 5, false, false, false, "Regal Pokémon", PokemonType.GRASS, null, 3.3, 63, Abilities.OVERGROW, Abilities.NONE, Abilities.CONTRARY, 528, 75, 75, 95, 75, 95, 113, 45, 70, 264, GrowthRate.MEDIUM_SLOW, 87.5, false),
+    new PokemonSpecies(Species.TEPIG, 5, false, false, false, "Fire Pig Pokémon", PokemonType.FIRE, null, 0.5, 9.9, Abilities.BLAZE, Abilities.NONE, Abilities.THICK_FAT, 308, 65, 63, 45, 45, 45, 45, 45, 70, 62, GrowthRate.MEDIUM_SLOW, 87.5, false),
+    new PokemonSpecies(Species.PIGNITE, 5, false, false, false, "Fire Pig Pokémon", PokemonType.FIRE, PokemonType.FIGHTING, 1, 55.5, Abilities.BLAZE, Abilities.NONE, Abilities.THICK_FAT, 418, 90, 93, 55, 70, 55, 55, 45, 70, 146, GrowthRate.MEDIUM_SLOW, 87.5, false),
+    new PokemonSpecies(Species.EMBOAR, 5, false, false, false, "Mega Fire Pig Pokémon", PokemonType.FIRE, PokemonType.FIGHTING, 1.6, 150, Abilities.BLAZE, Abilities.NONE, Abilities.RECKLESS, 528, 110, 123, 65, 100, 65, 65, 45, 70, 264, GrowthRate.MEDIUM_SLOW, 87.5, false),
+    new PokemonSpecies(Species.OSHAWOTT, 5, false, false, false, "Sea Otter Pokémon", PokemonType.WATER, null, 0.5, 5.9, Abilities.TORRENT, Abilities.NONE, Abilities.SHELL_ARMOR, 308, 55, 55, 45, 63, 45, 45, 45, 70, 62, GrowthRate.MEDIUM_SLOW, 87.5, false),
+    new PokemonSpecies(Species.DEWOTT, 5, false, false, false, "Discipline Pokémon", PokemonType.WATER, null, 0.8, 24.5, Abilities.TORRENT, Abilities.NONE, Abilities.SHELL_ARMOR, 413, 75, 75, 60, 83, 60, 60, 45, 70, 145, GrowthRate.MEDIUM_SLOW, 87.5, false),
+    new PokemonSpecies(Species.SAMUROTT, 5, false, false, false, "Formidable Pokémon", PokemonType.WATER, null, 1.5, 94.6, Abilities.TORRENT, Abilities.NONE, Abilities.SHELL_ARMOR, 528, 95, 100, 85, 108, 70, 70, 45, 70, 264, GrowthRate.MEDIUM_SLOW, 87.5, false),
+    new PokemonSpecies(Species.PATRAT, 5, false, false, false, "Scout Pokémon", PokemonType.NORMAL, null, 0.5, 11.6, Abilities.RUN_AWAY, Abilities.KEEN_EYE, Abilities.ANALYTIC, 255, 45, 55, 39, 35, 39, 42, 255, 70, 51, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.WATCHOG, 5, false, false, false, "Lookout Pokémon", PokemonType.NORMAL, null, 1.1, 27, Abilities.ILLUMINATE, Abilities.KEEN_EYE, Abilities.ANALYTIC, 420, 60, 85, 69, 60, 69, 77, 255, 70, 147, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.LILLIPUP, 5, false, false, false, "Puppy Pokémon", PokemonType.NORMAL, null, 0.4, 4.1, Abilities.VITAL_SPIRIT, Abilities.PICKUP, Abilities.RUN_AWAY, 275, 45, 60, 45, 25, 45, 55, 255, 50, 55, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.HERDIER, 5, false, false, false, "Loyal Dog Pokémon", PokemonType.NORMAL, null, 0.9, 14.7, Abilities.INTIMIDATE, Abilities.SAND_RUSH, Abilities.SCRAPPY, 370, 65, 80, 65, 35, 65, 60, 120, 50, 130, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.STOUTLAND, 5, false, false, false, "Big-Hearted Pokémon", PokemonType.NORMAL, null, 1.2, 61, Abilities.INTIMIDATE, Abilities.SAND_RUSH, Abilities.SCRAPPY, 500, 85, 110, 90, 45, 90, 80, 45, 50, 250, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.PURRLOIN, 5, false, false, false, "Devious Pokémon", PokemonType.DARK, null, 0.4, 10.1, Abilities.LIMBER, Abilities.UNBURDEN, Abilities.PRANKSTER, 281, 41, 50, 37, 50, 37, 66, 255, 50, 56, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.LIEPARD, 5, false, false, false, "Cruel Pokémon", PokemonType.DARK, null, 1.1, 37.5, Abilities.LIMBER, Abilities.UNBURDEN, Abilities.PRANKSTER, 446, 64, 88, 50, 88, 50, 106, 90, 50, 156, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.PANSAGE, 5, false, false, false, "Grass Monkey Pokémon", PokemonType.GRASS, null, 0.6, 10.5, Abilities.GLUTTONY, Abilities.NONE, Abilities.OVERGROW, 316, 50, 53, 48, 53, 48, 64, 190, 70, 63, GrowthRate.MEDIUM_FAST, 87.5, false),
+    new PokemonSpecies(Species.SIMISAGE, 5, false, false, false, "Thorn Monkey Pokémon", PokemonType.GRASS, null, 1.1, 30.5, Abilities.GLUTTONY, Abilities.NONE, Abilities.OVERGROW, 498, 75, 98, 63, 98, 63, 101, 75, 70, 174, GrowthRate.MEDIUM_FAST, 87.5, false),
+    new PokemonSpecies(Species.PANSEAR, 5, false, false, false, "High Temp Pokémon", PokemonType.FIRE, null, 0.6, 11, Abilities.GLUTTONY, Abilities.NONE, Abilities.BLAZE, 316, 50, 53, 48, 53, 48, 64, 190, 70, 63, GrowthRate.MEDIUM_FAST, 87.5, false),
+    new PokemonSpecies(Species.SIMISEAR, 5, false, false, false, "Ember Pokémon", PokemonType.FIRE, null, 1, 28, Abilities.GLUTTONY, Abilities.NONE, Abilities.BLAZE, 498, 75, 98, 63, 98, 63, 101, 75, 70, 174, GrowthRate.MEDIUM_FAST, 87.5, false),
+    new PokemonSpecies(Species.PANPOUR, 5, false, false, false, "Spray Pokémon", PokemonType.WATER, null, 0.6, 13.5, Abilities.GLUTTONY, Abilities.NONE, Abilities.TORRENT, 316, 50, 53, 48, 53, 48, 64, 190, 70, 63, GrowthRate.MEDIUM_FAST, 87.5, false),
+    new PokemonSpecies(Species.SIMIPOUR, 5, false, false, false, "Geyser Pokémon", PokemonType.WATER, null, 1, 29, Abilities.GLUTTONY, Abilities.NONE, Abilities.TORRENT, 498, 75, 98, 63, 98, 63, 101, 75, 70, 174, GrowthRate.MEDIUM_FAST, 87.5, false),
+    new PokemonSpecies(Species.MUNNA, 5, false, false, false, "Dream Eater Pokémon", PokemonType.PSYCHIC, null, 0.6, 23.3, Abilities.FOREWARN, Abilities.SYNCHRONIZE, Abilities.TELEPATHY, 292, 76, 25, 45, 67, 55, 24, 190, 50, 58, GrowthRate.FAST, 50, false),
+    new PokemonSpecies(Species.MUSHARNA, 5, false, false, false, "Drowsing Pokémon", PokemonType.PSYCHIC, null, 1.1, 60.5, Abilities.FOREWARN, Abilities.SYNCHRONIZE, Abilities.TELEPATHY, 487, 116, 55, 85, 107, 95, 29, 75, 50, 170, GrowthRate.FAST, 50, false),
+    new PokemonSpecies(Species.PIDOVE, 5, false, false, false, "Tiny Pigeon Pokémon", PokemonType.NORMAL, PokemonType.FLYING, 0.3, 2.1, Abilities.BIG_PECKS, Abilities.SUPER_LUCK, Abilities.RIVALRY, 264, 50, 55, 50, 36, 30, 43, 255, 50, 53, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.TRANQUILL, 5, false, false, false, "Wild Pigeon Pokémon", PokemonType.NORMAL, PokemonType.FLYING, 0.6, 15, Abilities.BIG_PECKS, Abilities.SUPER_LUCK, Abilities.RIVALRY, 358, 62, 77, 62, 50, 42, 65, 120, 50, 125, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.UNFEZANT, 5, false, false, false, "Proud Pokémon", PokemonType.NORMAL, PokemonType.FLYING, 1.2, 29, Abilities.BIG_PECKS, Abilities.SUPER_LUCK, Abilities.RIVALRY, 488, 80, 115, 80, 65, 55, 93, 45, 50, 244, GrowthRate.MEDIUM_SLOW, 50, true),
+    new PokemonSpecies(Species.BLITZLE, 5, false, false, false, "Electrified Pokémon", PokemonType.ELECTRIC, null, 0.8, 29.8, Abilities.LIGHTNING_ROD, Abilities.MOTOR_DRIVE, Abilities.SAP_SIPPER, 295, 45, 60, 32, 50, 32, 76, 190, 70, 59, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.ZEBSTRIKA, 5, false, false, false, "Thunderbolt Pokémon", PokemonType.ELECTRIC, null, 1.6, 79.5, Abilities.LIGHTNING_ROD, Abilities.MOTOR_DRIVE, Abilities.SAP_SIPPER, 497, 75, 100, 63, 80, 63, 116, 75, 70, 174, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.ROGGENROLA, 5, false, false, false, "Mantle Pokémon", PokemonType.ROCK, null, 0.4, 18, Abilities.STURDY, Abilities.WEAK_ARMOR, Abilities.SAND_FORCE, 280, 55, 75, 85, 25, 25, 15, 255, 50, 56, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.BOLDORE, 5, false, false, false, "Ore Pokémon", PokemonType.ROCK, null, 0.9, 102, Abilities.STURDY, Abilities.WEAK_ARMOR, Abilities.SAND_FORCE, 390, 70, 105, 105, 50, 40, 20, 120, 50, 137, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.GIGALITH, 5, false, false, false, "Compressed Pokémon", PokemonType.ROCK, null, 1.7, 260, Abilities.STURDY, Abilities.SAND_STREAM, Abilities.SAND_FORCE, 515, 85, 135, 130, 60, 80, 25, 45, 50, 258, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.WOOBAT, 5, false, false, false, "Bat Pokémon", PokemonType.PSYCHIC, PokemonType.FLYING, 0.4, 2.1, Abilities.UNAWARE, Abilities.KLUTZ, Abilities.SIMPLE, 323, 65, 45, 43, 55, 43, 72, 190, 50, 65, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.SWOOBAT, 5, false, false, false, "Courting Pokémon", PokemonType.PSYCHIC, PokemonType.FLYING, 0.9, 10.5, Abilities.UNAWARE, Abilities.KLUTZ, Abilities.SIMPLE, 425, 67, 57, 55, 77, 55, 114, 45, 50, 149, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.DRILBUR, 5, false, false, false, "Mole Pokémon", PokemonType.GROUND, null, 0.3, 8.5, Abilities.SAND_RUSH, Abilities.SAND_FORCE, Abilities.MOLD_BREAKER, 328, 60, 85, 40, 30, 45, 68, 120, 50, 66, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.EXCADRILL, 5, false, false, false, "Subterrene Pokémon", PokemonType.GROUND, PokemonType.STEEL, 0.7, 40.4, Abilities.SAND_RUSH, Abilities.SAND_FORCE, Abilities.MOLD_BREAKER, 508, 110, 135, 60, 50, 65, 88, 60, 50, 178, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.AUDINO, 5, false, false, false, "Hearing Pokémon", PokemonType.NORMAL, null, 1.1, 31, Abilities.HEALER, Abilities.REGENERATOR, Abilities.KLUTZ, 445, 103, 60, 86, 60, 86, 50, 255, 50, 390, GrowthRate.FAST, 50, false, true,
+      new PokemonForm("Normal", "", PokemonType.NORMAL, null, 1.1, 31, Abilities.HEALER, Abilities.REGENERATOR, Abilities.KLUTZ, 445, 103, 60, 86, 60, 86, 50, 255, 50, 390, false, null, true),
+      new PokemonForm("Mega", SpeciesFormKey.MEGA, PokemonType.NORMAL, PokemonType.FAIRY, 1.5, 32, Abilities.REGENERATOR, Abilities.REGENERATOR, Abilities.REGENERATOR, 545, 103, 60, 126, 80, 126, 50, 255, 50, 390), //Custom Ability, base form Hidden Ability
+    ),
+    new PokemonSpecies(Species.TIMBURR, 5, false, false, false, "Muscular Pokémon", PokemonType.FIGHTING, null, 0.6, 12.5, Abilities.GUTS, Abilities.SHEER_FORCE, Abilities.IRON_FIST, 305, 75, 80, 55, 25, 35, 35, 180, 70, 61, GrowthRate.MEDIUM_SLOW, 75, false),
+    new PokemonSpecies(Species.GURDURR, 5, false, false, false, "Muscular Pokémon", PokemonType.FIGHTING, null, 1.2, 40, Abilities.GUTS, Abilities.SHEER_FORCE, Abilities.IRON_FIST, 405, 85, 105, 85, 40, 50, 40, 90, 50, 142, GrowthRate.MEDIUM_SLOW, 75, false),
+    new PokemonSpecies(Species.CONKELDURR, 5, false, false, false, "Muscular Pokémon", PokemonType.FIGHTING, null, 1.4, 87, Abilities.GUTS, Abilities.SHEER_FORCE, Abilities.IRON_FIST, 505, 105, 140, 95, 55, 65, 45, 45, 50, 253, GrowthRate.MEDIUM_SLOW, 75, false),
+    new PokemonSpecies(Species.TYMPOLE, 5, false, false, false, "Tadpole Pokémon", PokemonType.WATER, null, 0.5, 4.5, Abilities.SWIFT_SWIM, Abilities.HYDRATION, Abilities.WATER_ABSORB, 294, 50, 50, 40, 50, 40, 64, 255, 50, 59, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.PALPITOAD, 5, false, false, false, "Vibration Pokémon", PokemonType.WATER, PokemonType.GROUND, 0.8, 17, Abilities.SWIFT_SWIM, Abilities.HYDRATION, Abilities.WATER_ABSORB, 384, 75, 65, 55, 65, 55, 69, 120, 50, 134, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.SEISMITOAD, 5, false, false, false, "Vibration Pokémon", PokemonType.WATER, PokemonType.GROUND, 1.5, 62, Abilities.SWIFT_SWIM, Abilities.POISON_TOUCH, Abilities.WATER_ABSORB, 509, 105, 95, 75, 85, 75, 74, 45, 50, 255, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.THROH, 5, false, false, false, "Judo Pokémon", PokemonType.FIGHTING, null, 1.3, 55.5, Abilities.GUTS, Abilities.INNER_FOCUS, Abilities.MOLD_BREAKER, 465, 120, 100, 85, 30, 85, 45, 45, 50, 163, GrowthRate.MEDIUM_FAST, 100, false),
+    new PokemonSpecies(Species.SAWK, 5, false, false, false, "Karate Pokémon", PokemonType.FIGHTING, null, 1.4, 51, Abilities.STURDY, Abilities.INNER_FOCUS, Abilities.MOLD_BREAKER, 465, 75, 125, 75, 30, 75, 85, 45, 50, 163, GrowthRate.MEDIUM_FAST, 100, false),
+    new PokemonSpecies(Species.SEWADDLE, 5, false, false, false, "Sewing Pokémon", PokemonType.BUG, PokemonType.GRASS, 0.3, 2.5, Abilities.SWARM, Abilities.CHLOROPHYLL, Abilities.OVERCOAT, 310, 45, 53, 70, 40, 60, 42, 255, 70, 62, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.SWADLOON, 5, false, false, false, "Leaf-Wrapped Pokémon", PokemonType.BUG, PokemonType.GRASS, 0.5, 7.3, Abilities.LEAF_GUARD, Abilities.CHLOROPHYLL, Abilities.OVERCOAT, 380, 55, 63, 90, 50, 80, 42, 120, 70, 133, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.LEAVANNY, 5, false, false, false, "Nurturing Pokémon", PokemonType.BUG, PokemonType.GRASS, 1.2, 20.5, Abilities.SWARM, Abilities.CHLOROPHYLL, Abilities.OVERCOAT, 500, 75, 103, 80, 70, 80, 92, 45, 70, 250, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.VENIPEDE, 5, false, false, false, "Centipede Pokémon", PokemonType.BUG, PokemonType.POISON, 0.4, 5.3, Abilities.POISON_POINT, Abilities.SWARM, Abilities.SPEED_BOOST, 260, 30, 45, 59, 30, 39, 57, 255, 50, 52, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.WHIRLIPEDE, 5, false, false, false, "Curlipede Pokémon", PokemonType.BUG, PokemonType.POISON, 1.2, 58.5, Abilities.POISON_POINT, Abilities.SWARM, Abilities.SPEED_BOOST, 360, 40, 55, 99, 40, 79, 47, 120, 50, 126, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.SCOLIPEDE, 5, false, false, false, "Megapede Pokémon", PokemonType.BUG, PokemonType.POISON, 2.5, 200.5, Abilities.POISON_POINT, Abilities.SWARM, Abilities.SPEED_BOOST, 485, 60, 100, 89, 55, 69, 112, 45, 50, 243, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.COTTONEE, 5, false, false, false, "Cotton Puff Pokémon", PokemonType.GRASS, PokemonType.FAIRY, 0.3, 0.6, Abilities.PRANKSTER, Abilities.INFILTRATOR, Abilities.CHLOROPHYLL, 280, 40, 27, 60, 37, 50, 66, 190, 50, 56, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.WHIMSICOTT, 5, false, false, false, "Windveiled Pokémon", PokemonType.GRASS, PokemonType.FAIRY, 0.7, 6.6, Abilities.PRANKSTER, Abilities.INFILTRATOR, Abilities.CHLOROPHYLL, 480, 60, 67, 85, 77, 75, 116, 75, 50, 168, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.PETILIL, 5, false, false, false, "Bulb Pokémon", PokemonType.GRASS, null, 0.5, 6.6, Abilities.CHLOROPHYLL, Abilities.OWN_TEMPO, Abilities.LEAF_GUARD, 280, 45, 35, 50, 70, 50, 30, 190, 50, 56, GrowthRate.MEDIUM_FAST, 0, false),
+    new PokemonSpecies(Species.LILLIGANT, 5, false, false, false, "Flowering Pokémon", PokemonType.GRASS, null, 1.1, 16.3, Abilities.CHLOROPHYLL, Abilities.OWN_TEMPO, Abilities.LEAF_GUARD, 480, 70, 60, 75, 110, 75, 90, 75, 50, 168, GrowthRate.MEDIUM_FAST, 0, false),
+    new PokemonSpecies(Species.BASCULIN, 5, false, false, false, "Hostile Pokémon", PokemonType.WATER, null, 1, 18, Abilities.RECKLESS, Abilities.ADAPTABILITY, Abilities.MOLD_BREAKER, 460, 70, 92, 65, 80, 55, 98, 25, 50, 161, GrowthRate.MEDIUM_FAST, 50, false, false,
+      new PokemonForm("Red-Striped Form", "red-striped", PokemonType.WATER, null, 1, 18, Abilities.RECKLESS, Abilities.ADAPTABILITY, Abilities.MOLD_BREAKER, 460, 70, 92, 65, 80, 55, 98, 25, 50, 161, false, null, true),
+      new PokemonForm("Blue-Striped Form", "blue-striped", PokemonType.WATER, null, 1, 18, Abilities.ROCK_HEAD, Abilities.ADAPTABILITY, Abilities.MOLD_BREAKER, 460, 70, 92, 65, 80, 55, 98, 25, 50, 161, false, null, true),
+      new PokemonForm("White-Striped Form", "white-striped", PokemonType.WATER, null, 1, 18, Abilities.RATTLED, Abilities.ADAPTABILITY, Abilities.MOLD_BREAKER, 460, 70, 92, 65, 80, 55, 98, 25, 50, 161, false, null, true),
+    ),
+    new PokemonSpecies(Species.SANDILE, 5, false, false, false, "Desert Croc Pokémon", PokemonType.GROUND, PokemonType.DARK, 0.7, 15.2, Abilities.INTIMIDATE, Abilities.MOXIE, Abilities.ANGER_POINT, 292, 50, 72, 35, 35, 35, 65, 180, 50, 58, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.KROKOROK, 5, false, false, false, "Desert Croc Pokémon", PokemonType.GROUND, PokemonType.DARK, 1, 33.4, Abilities.INTIMIDATE, Abilities.MOXIE, Abilities.ANGER_POINT, 351, 60, 82, 45, 45, 45, 74, 90, 50, 123, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.KROOKODILE, 5, false, false, false, "Intimidation Pokémon", PokemonType.GROUND, PokemonType.DARK, 1.5, 96.3, Abilities.INTIMIDATE, Abilities.MOXIE, Abilities.ANGER_POINT, 519, 95, 117, 80, 65, 70, 92, 45, 50, 260, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.DARUMAKA, 5, false, false, false, "Zen Charm Pokémon", PokemonType.FIRE, null, 0.6, 37.5, Abilities.HUSTLE, Abilities.NONE, Abilities.INNER_FOCUS, 315, 70, 90, 45, 15, 45, 50, 120, 50, 63, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.DARMANITAN, 5, false, false, false, "Blazing Pokémon", PokemonType.FIRE, null, 1.3, 92.9, Abilities.SHEER_FORCE, Abilities.NONE, Abilities.ZEN_MODE, 480, 105, 140, 55, 30, 55, 95, 60, 50, 168, GrowthRate.MEDIUM_SLOW, 50, false, true,
+      new PokemonForm("Standard Mode", "", PokemonType.FIRE, null, 1.3, 92.9, Abilities.SHEER_FORCE, Abilities.NONE, Abilities.ZEN_MODE, 480, 105, 140, 55, 30, 55, 95, 60, 50, 168, false, null, true),
+      new PokemonForm("Zen Mode", "zen", PokemonType.FIRE, PokemonType.PSYCHIC, 1.3, 92.9, Abilities.SHEER_FORCE, Abilities.NONE, Abilities.ZEN_MODE, 540, 105, 30, 105, 140, 105, 55, 60, 50, 189),
+    ),
+    new PokemonSpecies(Species.MARACTUS, 5, false, false, false, "Cactus Pokémon", PokemonType.GRASS, null, 1, 28, Abilities.WATER_ABSORB, Abilities.CHLOROPHYLL, Abilities.STORM_DRAIN, 461, 75, 86, 67, 106, 67, 60, 255, 50, 161, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.DWEBBLE, 5, false, false, false, "Rock Inn Pokémon", PokemonType.BUG, PokemonType.ROCK, 0.3, 14.5, Abilities.STURDY, Abilities.SHELL_ARMOR, Abilities.WEAK_ARMOR, 325, 50, 65, 85, 35, 35, 55, 190, 50, 65, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.CRUSTLE, 5, false, false, false, "Stone Home Pokémon", PokemonType.BUG, PokemonType.ROCK, 1.4, 200, Abilities.STURDY, Abilities.SHELL_ARMOR, Abilities.WEAK_ARMOR, 485, 70, 105, 125, 65, 75, 45, 75, 50, 170, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.SCRAGGY, 5, false, false, false, "Shedding Pokémon", PokemonType.DARK, PokemonType.FIGHTING, 0.6, 11.8, Abilities.SHED_SKIN, Abilities.MOXIE, Abilities.INTIMIDATE, 348, 50, 75, 70, 35, 70, 48, 180, 35, 70, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.SCRAFTY, 5, false, false, false, "Hoodlum Pokémon", PokemonType.DARK, PokemonType.FIGHTING, 1.1, 30, Abilities.SHED_SKIN, Abilities.MOXIE, Abilities.INTIMIDATE, 488, 65, 90, 115, 45, 115, 58, 90, 50, 171, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.SIGILYPH, 5, false, false, false, "Avianoid Pokémon", PokemonType.PSYCHIC, PokemonType.FLYING, 1.4, 14, Abilities.WONDER_SKIN, Abilities.MAGIC_GUARD, Abilities.TINTED_LENS, 490, 72, 58, 80, 103, 80, 97, 45, 50, 172, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.YAMASK, 5, false, false, false, "Spirit Pokémon", PokemonType.GHOST, null, 0.5, 1.5, Abilities.MUMMY, Abilities.NONE, Abilities.NONE, 303, 38, 30, 85, 55, 65, 30, 190, 50, 61, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.COFAGRIGUS, 5, false, false, false, "Coffin Pokémon", PokemonType.GHOST, null, 1.7, 76.5, Abilities.MUMMY, Abilities.NONE, Abilities.NONE, 483, 58, 50, 145, 95, 105, 30, 90, 50, 169, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.TIRTOUGA, 5, false, false, false, "Prototurtle Pokémon", PokemonType.WATER, PokemonType.ROCK, 0.7, 16.5, Abilities.SOLID_ROCK, Abilities.STURDY, Abilities.SWIFT_SWIM, 355, 54, 78, 103, 53, 45, 22, 45, 50, 71, GrowthRate.MEDIUM_FAST, 87.5, false),
+    new PokemonSpecies(Species.CARRACOSTA, 5, false, false, false, "Prototurtle Pokémon", PokemonType.WATER, PokemonType.ROCK, 1.2, 81, Abilities.SOLID_ROCK, Abilities.STURDY, Abilities.SWIFT_SWIM, 495, 74, 108, 133, 83, 65, 32, 45, 50, 173, GrowthRate.MEDIUM_FAST, 87.5, false),
+    new PokemonSpecies(Species.ARCHEN, 5, false, false, false, "First Bird Pokémon", PokemonType.ROCK, PokemonType.FLYING, 0.5, 9.5, Abilities.DEFEATIST, Abilities.NONE, Abilities.WIMP_OUT, 401, 55, 112, 45, 74, 45, 70, 45, 50, 71, GrowthRate.MEDIUM_FAST, 87.5, false), //Custom Hidden
+    new PokemonSpecies(Species.ARCHEOPS, 5, false, false, false, "First Bird Pokémon", PokemonType.ROCK, PokemonType.FLYING, 1.4, 32, Abilities.DEFEATIST, Abilities.NONE, Abilities.EMERGENCY_EXIT, 567, 75, 140, 65, 112, 65, 110, 45, 50, 177, GrowthRate.MEDIUM_FAST, 87.5, false), //Custom Hidden
+    new PokemonSpecies(Species.TRUBBISH, 5, false, false, false, "Trash Bag Pokémon", PokemonType.POISON, null, 0.6, 31, Abilities.STENCH, Abilities.STICKY_HOLD, Abilities.AFTERMATH, 329, 50, 50, 62, 40, 62, 65, 190, 50, 66, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.GARBODOR, 5, false, false, false, "Trash Heap Pokémon", PokemonType.POISON, null, 1.9, 107.3, Abilities.STENCH, Abilities.WEAK_ARMOR, Abilities.AFTERMATH, 474, 80, 95, 82, 60, 82, 75, 60, 50, 166, GrowthRate.MEDIUM_FAST, 50, false, true,
+      new PokemonForm("Normal", "", PokemonType.POISON, null, 1.9, 107.3, Abilities.STENCH, Abilities.WEAK_ARMOR, Abilities.AFTERMATH, 474, 80, 95, 82, 60, 82, 75, 60, 50, 166, false, null, true),
+      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, PokemonType.POISON, PokemonType.STEEL, 21, 999.9, Abilities.TOXIC_DEBRIS, Abilities.TOXIC_DEBRIS, Abilities.TOXIC_DEBRIS, 574, 115, 121, 102, 81, 102, 53, 60, 50, 166),
+    ),
+    new PokemonSpecies(Species.ZORUA, 5, false, false, false, "Tricky Fox Pokémon", PokemonType.DARK, null, 0.7, 12.5, Abilities.ILLUSION, Abilities.NONE, Abilities.NONE, 330, 40, 65, 40, 80, 40, 65, 75, 50, 66, GrowthRate.MEDIUM_SLOW, 87.5, false),
+    new PokemonSpecies(Species.ZOROARK, 5, false, false, false, "Illusion Fox Pokémon", PokemonType.DARK, null, 1.6, 81.1, Abilities.ILLUSION, Abilities.NONE, Abilities.NONE, 510, 60, 105, 60, 120, 60, 105, 45, 50, 179, GrowthRate.MEDIUM_SLOW, 87.5, false),
+    new PokemonSpecies(Species.MINCCINO, 5, false, false, false, "Chinchilla Pokémon", PokemonType.NORMAL, null, 0.4, 5.8, Abilities.CUTE_CHARM, Abilities.TECHNICIAN, Abilities.SKILL_LINK, 300, 55, 50, 40, 40, 40, 75, 255, 50, 60, GrowthRate.FAST, 25, false),
+    new PokemonSpecies(Species.CINCCINO, 5, false, false, false, "Scarf Pokémon", PokemonType.NORMAL, null, 0.5, 7.5, Abilities.CUTE_CHARM, Abilities.TECHNICIAN, Abilities.SKILL_LINK, 470, 75, 95, 60, 65, 60, 115, 60, 50, 165, GrowthRate.FAST, 25, false),
+    new PokemonSpecies(Species.GOTHITA, 5, false, false, false, "Fixation Pokémon", PokemonType.PSYCHIC, null, 0.4, 5.8, Abilities.FRISK, Abilities.COMPETITIVE, Abilities.SHADOW_TAG, 290, 45, 30, 50, 55, 65, 45, 200, 50, 58, GrowthRate.MEDIUM_SLOW, 25, false),
+    new PokemonSpecies(Species.GOTHORITA, 5, false, false, false, "Manipulate Pokémon", PokemonType.PSYCHIC, null, 0.7, 18, Abilities.FRISK, Abilities.COMPETITIVE, Abilities.SHADOW_TAG, 390, 60, 45, 70, 75, 85, 55, 100, 50, 137, GrowthRate.MEDIUM_SLOW, 25, false),
+    new PokemonSpecies(Species.GOTHITELLE, 5, false, false, false, "Astral Body Pokémon", PokemonType.PSYCHIC, null, 1.5, 44, Abilities.FRISK, Abilities.COMPETITIVE, Abilities.SHADOW_TAG, 490, 70, 55, 95, 95, 110, 65, 50, 50, 245, GrowthRate.MEDIUM_SLOW, 25, false),
+    new PokemonSpecies(Species.SOLOSIS, 5, false, false, false, "Cell Pokémon", PokemonType.PSYCHIC, null, 0.3, 1, Abilities.OVERCOAT, Abilities.MAGIC_GUARD, Abilities.REGENERATOR, 290, 45, 30, 40, 105, 50, 20, 200, 50, 58, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.DUOSION, 5, false, false, false, "Mitosis Pokémon", PokemonType.PSYCHIC, null, 0.6, 8, Abilities.OVERCOAT, Abilities.MAGIC_GUARD, Abilities.REGENERATOR, 370, 65, 40, 50, 125, 60, 30, 100, 50, 130, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.REUNICLUS, 5, false, false, false, "Multiplying Pokémon", PokemonType.PSYCHIC, null, 1, 20.1, Abilities.OVERCOAT, Abilities.MAGIC_GUARD, Abilities.REGENERATOR, 490, 110, 65, 75, 125, 85, 30, 50, 50, 245, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.DUCKLETT, 5, false, false, false, "Water Bird Pokémon", PokemonType.WATER, PokemonType.FLYING, 0.5, 5.5, Abilities.KEEN_EYE, Abilities.BIG_PECKS, Abilities.HYDRATION, 305, 62, 44, 50, 44, 50, 55, 190, 70, 61, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.SWANNA, 5, false, false, false, "White Bird Pokémon", PokemonType.WATER, PokemonType.FLYING, 1.3, 24.2, Abilities.KEEN_EYE, Abilities.BIG_PECKS, Abilities.HYDRATION, 473, 75, 87, 63, 87, 63, 98, 45, 70, 166, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.VANILLITE, 5, false, false, false, "Fresh Snow Pokémon", PokemonType.ICE, null, 0.4, 5.7, Abilities.ICE_BODY, Abilities.SNOW_CLOAK, Abilities.WEAK_ARMOR, 305, 36, 50, 50, 65, 60, 44, 255, 50, 61, GrowthRate.SLOW, 50, false),
+    new PokemonSpecies(Species.VANILLISH, 5, false, false, false, "Icy Snow Pokémon", PokemonType.ICE, null, 1.1, 41, Abilities.ICE_BODY, Abilities.SNOW_CLOAK, Abilities.WEAK_ARMOR, 395, 51, 65, 65, 80, 75, 59, 120, 50, 138, GrowthRate.SLOW, 50, false),
+    new PokemonSpecies(Species.VANILLUXE, 5, false, false, false, "Snowstorm Pokémon", PokemonType.ICE, null, 1.3, 57.5, Abilities.ICE_BODY, Abilities.SNOW_WARNING, Abilities.WEAK_ARMOR, 535, 71, 95, 85, 110, 95, 79, 45, 50, 268, GrowthRate.SLOW, 50, false),
+    new PokemonSpecies(Species.DEERLING, 5, false, false, false, "Season Pokémon", PokemonType.NORMAL, PokemonType.GRASS, 0.6, 19.5, Abilities.CHLOROPHYLL, Abilities.SAP_SIPPER, Abilities.SERENE_GRACE, 335, 60, 60, 50, 40, 50, 75, 190, 70, 67, GrowthRate.MEDIUM_FAST, 50, false, true,
+      new PokemonForm("Spring Form", "spring", PokemonType.NORMAL, PokemonType.GRASS, 0.6, 19.5, Abilities.CHLOROPHYLL, Abilities.SAP_SIPPER, Abilities.SERENE_GRACE, 335, 60, 60, 50, 40, 50, 75, 190, 70, 67, false, null, true),
+      new PokemonForm("Summer Form", "summer", PokemonType.NORMAL, PokemonType.GRASS, 0.6, 19.5, Abilities.CHLOROPHYLL, Abilities.SAP_SIPPER, Abilities.SERENE_GRACE, 335, 60, 60, 50, 40, 50, 75, 190, 70, 67, false, null, true),
+      new PokemonForm("Autumn Form", "autumn", PokemonType.NORMAL, PokemonType.GRASS, 0.6, 19.5, Abilities.CHLOROPHYLL, Abilities.SAP_SIPPER, Abilities.SERENE_GRACE, 335, 60, 60, 50, 40, 50, 75, 190, 70, 67, false, null, true),
+      new PokemonForm("Winter Form", "winter", PokemonType.NORMAL, PokemonType.GRASS, 0.6, 19.5, Abilities.CHLOROPHYLL, Abilities.SAP_SIPPER, Abilities.SERENE_GRACE, 335, 60, 60, 50, 40, 50, 75, 190, 70, 67, false, null, true),
+    ),
+    new PokemonSpecies(Species.SAWSBUCK, 5, false, false, false, "Season Pokémon", PokemonType.NORMAL, PokemonType.GRASS, 1.9, 92.5, Abilities.CHLOROPHYLL, Abilities.SAP_SIPPER, Abilities.SERENE_GRACE, 475, 80, 100, 70, 60, 70, 95, 75, 70, 166, GrowthRate.MEDIUM_FAST, 50, false, true,
+      new PokemonForm("Spring Form", "spring", PokemonType.NORMAL, PokemonType.GRASS, 1.9, 92.5, Abilities.CHLOROPHYLL, Abilities.SAP_SIPPER, Abilities.SERENE_GRACE, 475, 80, 100, 70, 60, 70, 95, 75, 70, 166, false, null, true),
+      new PokemonForm("Summer Form", "summer", PokemonType.NORMAL, PokemonType.GRASS, 1.9, 92.5, Abilities.CHLOROPHYLL, Abilities.SAP_SIPPER, Abilities.SERENE_GRACE, 475, 80, 100, 70, 60, 70, 95, 75, 70, 166, false, null, true),
+      new PokemonForm("Autumn Form", "autumn", PokemonType.NORMAL, PokemonType.GRASS, 1.9, 92.5, Abilities.CHLOROPHYLL, Abilities.SAP_SIPPER, Abilities.SERENE_GRACE, 475, 80, 100, 70, 60, 70, 95, 75, 70, 166, false, null, true),
+      new PokemonForm("Winter Form", "winter", PokemonType.NORMAL, PokemonType.GRASS, 1.9, 92.5, Abilities.CHLOROPHYLL, Abilities.SAP_SIPPER, Abilities.SERENE_GRACE, 475, 80, 100, 70, 60, 70, 95, 75, 70, 166, false, null, true),
+    ),
+    new PokemonSpecies(Species.EMOLGA, 5, false, false, false, "Sky Squirrel Pokémon", PokemonType.ELECTRIC, PokemonType.FLYING, 0.4, 5, Abilities.STATIC, Abilities.NONE, Abilities.MOTOR_DRIVE, 428, 55, 75, 60, 75, 60, 103, 200, 50, 150, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.KARRABLAST, 5, false, false, false, "Clamping Pokémon", PokemonType.BUG, null, 0.5, 5.9, Abilities.SWARM, Abilities.SHED_SKIN, Abilities.NO_GUARD, 315, 50, 75, 45, 40, 45, 60, 200, 50, 63, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.ESCAVALIER, 5, false, false, false, "Cavalry Pokémon", PokemonType.BUG, PokemonType.STEEL, 1, 33, Abilities.SWARM, Abilities.SHELL_ARMOR, Abilities.OVERCOAT, 495, 70, 135, 105, 60, 105, 20, 75, 50, 173, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.FOONGUS, 5, false, false, false, "Mushroom Pokémon", PokemonType.GRASS, PokemonType.POISON, 0.2, 1, Abilities.EFFECT_SPORE, Abilities.NONE, Abilities.REGENERATOR, 294, 69, 55, 45, 55, 55, 15, 190, 50, 59, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.AMOONGUSS, 5, false, false, false, "Mushroom Pokémon", PokemonType.GRASS, PokemonType.POISON, 0.6, 10.5, Abilities.EFFECT_SPORE, Abilities.NONE, Abilities.REGENERATOR, 464, 114, 85, 70, 85, 80, 30, 75, 50, 162, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.FRILLISH, 5, false, false, false, "Floating Pokémon", PokemonType.WATER, PokemonType.GHOST, 1.2, 33, Abilities.WATER_ABSORB, Abilities.CURSED_BODY, Abilities.DAMP, 335, 55, 40, 50, 65, 85, 40, 190, 50, 67, GrowthRate.MEDIUM_FAST, 50, true),
+    new PokemonSpecies(Species.JELLICENT, 5, false, false, false, "Floating Pokémon", PokemonType.WATER, PokemonType.GHOST, 2.2, 135, Abilities.WATER_ABSORB, Abilities.CURSED_BODY, Abilities.DAMP, 480, 100, 60, 70, 85, 105, 60, 60, 50, 168, GrowthRate.MEDIUM_FAST, 50, true),
+    new PokemonSpecies(Species.ALOMOMOLA, 5, false, false, false, "Caring Pokémon", PokemonType.WATER, null, 1.2, 31.6, Abilities.HEALER, Abilities.HYDRATION, Abilities.REGENERATOR, 470, 165, 75, 80, 40, 45, 65, 75, 70, 165, GrowthRate.FAST, 50, false),
+    new PokemonSpecies(Species.JOLTIK, 5, false, false, false, "Attaching Pokémon", PokemonType.BUG, PokemonType.ELECTRIC, 0.1, 0.6, Abilities.COMPOUND_EYES, Abilities.UNNERVE, Abilities.SWARM, 319, 50, 47, 50, 57, 50, 65, 190, 50, 64, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.GALVANTULA, 5, false, false, false, "EleSpider Pokémon", PokemonType.BUG, PokemonType.ELECTRIC, 0.8, 14.3, Abilities.COMPOUND_EYES, Abilities.UNNERVE, Abilities.SWARM, 472, 70, 77, 60, 97, 60, 108, 75, 50, 165, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.FERROSEED, 5, false, false, false, "Thorn Seed Pokémon", PokemonType.GRASS, PokemonType.STEEL, 0.6, 18.8, Abilities.IRON_BARBS, Abilities.NONE, Abilities.ANTICIPATION, 305, 44, 50, 91, 24, 86, 10, 255, 50, 61, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.FERROTHORN, 5, false, false, false, "Thorn Pod Pokémon", PokemonType.GRASS, PokemonType.STEEL, 1, 110, Abilities.IRON_BARBS, Abilities.NONE, Abilities.ANTICIPATION, 489, 74, 94, 131, 54, 116, 20, 90, 50, 171, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.KLINK, 5, false, false, false, "Gear Pokémon", PokemonType.STEEL, null, 0.3, 21, Abilities.PLUS, Abilities.MINUS, Abilities.CLEAR_BODY, 300, 40, 55, 70, 45, 60, 30, 130, 50, 60, GrowthRate.MEDIUM_SLOW, null, false),
+    new PokemonSpecies(Species.KLANG, 5, false, false, false, "Gear Pokémon", PokemonType.STEEL, null, 0.6, 51, Abilities.PLUS, Abilities.MINUS, Abilities.CLEAR_BODY, 440, 60, 80, 95, 70, 85, 50, 60, 50, 154, GrowthRate.MEDIUM_SLOW, null, false),
+    new PokemonSpecies(Species.KLINKLANG, 5, false, false, false, "Gear Pokémon", PokemonType.STEEL, null, 0.6, 81, Abilities.PLUS, Abilities.MINUS, Abilities.CLEAR_BODY, 520, 60, 100, 115, 70, 85, 90, 30, 50, 260, GrowthRate.MEDIUM_SLOW, null, false),
+    new PokemonSpecies(Species.TYNAMO, 5, false, false, false, "EleFish Pokémon", PokemonType.ELECTRIC, null, 0.2, 0.3, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 275, 35, 55, 40, 45, 40, 60, 190, 70, 55, GrowthRate.SLOW, 50, false),
+    new PokemonSpecies(Species.EELEKTRIK, 5, false, false, false, "EleFish Pokémon", PokemonType.ELECTRIC, null, 1.2, 22, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 405, 65, 85, 70, 75, 70, 40, 60, 70, 142, GrowthRate.SLOW, 50, false),
+    new PokemonSpecies(Species.EELEKTROSS, 5, false, false, false, "EleFish Pokémon", PokemonType.ELECTRIC, null, 2.1, 80.5, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 515, 85, 115, 80, 105, 80, 50, 30, 70, 258, GrowthRate.SLOW, 50, false),
+    new PokemonSpecies(Species.ELGYEM, 5, false, false, false, "Cerebral Pokémon", PokemonType.PSYCHIC, null, 0.5, 9, Abilities.TELEPATHY, Abilities.SYNCHRONIZE, Abilities.ANALYTIC, 335, 55, 55, 55, 85, 55, 30, 255, 50, 67, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.BEHEEYEM, 5, false, false, false, "Cerebral Pokémon", PokemonType.PSYCHIC, null, 1, 34.5, Abilities.TELEPATHY, Abilities.SYNCHRONIZE, Abilities.ANALYTIC, 485, 75, 75, 75, 125, 95, 40, 90, 50, 170, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.LITWICK, 5, false, false, false, "Candle Pokémon", PokemonType.GHOST, PokemonType.FIRE, 0.3, 3.1, Abilities.FLASH_FIRE, Abilities.FLAME_BODY, Abilities.INFILTRATOR, 275, 50, 30, 55, 65, 55, 20, 190, 50, 55, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.LAMPENT, 5, false, false, false, "Lamp Pokémon", PokemonType.GHOST, PokemonType.FIRE, 0.6, 13, Abilities.FLASH_FIRE, Abilities.FLAME_BODY, Abilities.INFILTRATOR, 370, 60, 40, 60, 95, 60, 55, 90, 50, 130, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.CHANDELURE, 5, false, false, false, "Luring Pokémon", PokemonType.GHOST, PokemonType.FIRE, 1, 34.3, Abilities.FLASH_FIRE, Abilities.FLAME_BODY, Abilities.INFILTRATOR, 520, 60, 55, 90, 145, 90, 80, 45, 50, 260, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.AXEW, 5, false, false, false, "Tusk Pokémon", PokemonType.DRAGON, null, 0.6, 18, Abilities.RIVALRY, Abilities.MOLD_BREAKER, Abilities.UNNERVE, 320, 46, 87, 60, 30, 40, 57, 75, 35, 64, GrowthRate.SLOW, 50, false),
+    new PokemonSpecies(Species.FRAXURE, 5, false, false, false, "Axe Jaw Pokémon", PokemonType.DRAGON, null, 1, 36, Abilities.RIVALRY, Abilities.MOLD_BREAKER, Abilities.UNNERVE, 410, 66, 117, 70, 40, 50, 67, 60, 35, 144, GrowthRate.SLOW, 50, false),
+    new PokemonSpecies(Species.HAXORUS, 5, false, false, false, "Axe Jaw Pokémon", PokemonType.DRAGON, null, 1.8, 105.5, Abilities.RIVALRY, Abilities.MOLD_BREAKER, Abilities.UNNERVE, 540, 76, 147, 90, 60, 70, 97, 45, 35, 270, GrowthRate.SLOW, 50, false),
+    new PokemonSpecies(Species.CUBCHOO, 5, false, false, false, "Chill Pokémon", PokemonType.ICE, null, 0.5, 8.5, Abilities.SNOW_CLOAK, Abilities.SLUSH_RUSH, Abilities.RATTLED, 305, 55, 70, 40, 60, 40, 40, 120, 50, 61, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.BEARTIC, 5, false, false, false, "Freezing Pokémon", PokemonType.ICE, null, 2.6, 260, Abilities.SNOW_CLOAK, Abilities.SLUSH_RUSH, Abilities.SWIFT_SWIM, 505, 95, 130, 80, 70, 80, 50, 60, 50, 177, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.CRYOGONAL, 5, false, false, false, "Crystallizing Pokémon", PokemonType.ICE, null, 1.1, 148, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 515, 80, 50, 50, 95, 135, 105, 25, 50, 180, GrowthRate.MEDIUM_FAST, null, false),
+    new PokemonSpecies(Species.SHELMET, 5, false, false, false, "Snail Pokémon", PokemonType.BUG, null, 0.4, 7.7, Abilities.HYDRATION, Abilities.SHELL_ARMOR, Abilities.OVERCOAT, 305, 50, 40, 85, 40, 65, 25, 200, 50, 61, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.ACCELGOR, 5, false, false, false, "Shell Out Pokémon", PokemonType.BUG, null, 0.8, 25.3, Abilities.HYDRATION, Abilities.STICKY_HOLD, Abilities.UNBURDEN, 495, 80, 70, 40, 100, 60, 145, 75, 50, 173, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.STUNFISK, 5, false, false, false, "Trap Pokémon", PokemonType.GROUND, PokemonType.ELECTRIC, 0.7, 11, Abilities.STATIC, Abilities.LIMBER, Abilities.SAND_VEIL, 471, 109, 66, 84, 81, 99, 32, 75, 70, 165, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.MIENFOO, 5, false, false, false, "Martial Arts Pokémon", PokemonType.FIGHTING, null, 0.9, 20, Abilities.INNER_FOCUS, Abilities.REGENERATOR, Abilities.RECKLESS, 350, 45, 85, 50, 55, 50, 65, 180, 50, 70, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.MIENSHAO, 5, false, false, false, "Martial Arts Pokémon", PokemonType.FIGHTING, null, 1.4, 35.5, Abilities.INNER_FOCUS, Abilities.REGENERATOR, Abilities.RECKLESS, 510, 65, 125, 60, 95, 60, 105, 45, 50, 179, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.DRUDDIGON, 5, false, false, false, "Cave Pokémon", PokemonType.DRAGON, null, 1.6, 139, Abilities.ROUGH_SKIN, Abilities.SHEER_FORCE, Abilities.MOLD_BREAKER, 485, 77, 120, 90, 60, 90, 48, 45, 50, 170, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.GOLETT, 5, false, false, false, "Automaton Pokémon", PokemonType.GROUND, PokemonType.GHOST, 1, 92, Abilities.IRON_FIST, Abilities.KLUTZ, Abilities.NO_GUARD, 303, 59, 74, 50, 35, 50, 35, 190, 50, 61, GrowthRate.MEDIUM_FAST, null, false),
+    new PokemonSpecies(Species.GOLURK, 5, false, false, false, "Automaton Pokémon", PokemonType.GROUND, PokemonType.GHOST, 2.8, 330, Abilities.IRON_FIST, Abilities.KLUTZ, Abilities.NO_GUARD, 483, 89, 124, 80, 55, 80, 55, 90, 50, 169, GrowthRate.MEDIUM_FAST, null, false),
+    new PokemonSpecies(Species.PAWNIARD, 5, false, false, false, "Sharp Blade Pokémon", PokemonType.DARK, PokemonType.STEEL, 0.5, 10.2, Abilities.DEFIANT, Abilities.INNER_FOCUS, Abilities.PRESSURE, 340, 45, 85, 70, 40, 40, 60, 120, 35, 68, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.BISHARP, 5, false, false, false, "Sword Blade Pokémon", PokemonType.DARK, PokemonType.STEEL, 1.6, 70, Abilities.DEFIANT, Abilities.INNER_FOCUS, Abilities.PRESSURE, 490, 65, 125, 100, 60, 70, 70, 45, 35, 172, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.BOUFFALANT, 5, false, false, false, "Bash Buffalo Pokémon", PokemonType.NORMAL, null, 1.6, 94.6, Abilities.RECKLESS, Abilities.SAP_SIPPER, Abilities.SOUNDPROOF, 490, 95, 110, 95, 40, 95, 55, 45, 50, 172, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.RUFFLET, 5, false, false, false, "Eaglet Pokémon", PokemonType.NORMAL, PokemonType.FLYING, 0.5, 10.5, Abilities.KEEN_EYE, Abilities.SHEER_FORCE, Abilities.HUSTLE, 350, 70, 83, 50, 37, 50, 60, 190, 50, 70, GrowthRate.SLOW, 100, false),
+    new PokemonSpecies(Species.BRAVIARY, 5, false, false, false, "Valiant Pokémon", PokemonType.NORMAL, PokemonType.FLYING, 1.5, 41, Abilities.KEEN_EYE, Abilities.SHEER_FORCE, Abilities.DEFIANT, 510, 100, 123, 75, 57, 75, 80, 60, 50, 179, GrowthRate.SLOW, 100, false),
+    new PokemonSpecies(Species.VULLABY, 5, false, false, false, "Diapered Pokémon", PokemonType.DARK, PokemonType.FLYING, 0.5, 9, Abilities.BIG_PECKS, Abilities.OVERCOAT, Abilities.WEAK_ARMOR, 370, 70, 55, 75, 45, 65, 60, 190, 35, 74, GrowthRate.SLOW, 0, false),
+    new PokemonSpecies(Species.MANDIBUZZ, 5, false, false, false, "Bone Vulture Pokémon", PokemonType.DARK, PokemonType.FLYING, 1.2, 39.5, Abilities.BIG_PECKS, Abilities.OVERCOAT, Abilities.WEAK_ARMOR, 510, 110, 65, 105, 55, 95, 80, 60, 35, 179, GrowthRate.SLOW, 0, false),
+    new PokemonSpecies(Species.HEATMOR, 5, false, false, false, "Anteater Pokémon", PokemonType.FIRE, null, 1.4, 58, Abilities.GLUTTONY, Abilities.FLASH_FIRE, Abilities.WHITE_SMOKE, 484, 85, 97, 66, 105, 66, 65, 90, 50, 169, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.DURANT, 5, false, false, false, "Iron Ant Pokémon", PokemonType.BUG, PokemonType.STEEL, 0.3, 33, Abilities.SWARM, Abilities.HUSTLE, Abilities.TRUANT, 484, 58, 109, 112, 48, 48, 109, 90, 50, 169, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.DEINO, 5, false, false, false, "Irate Pokémon", PokemonType.DARK, PokemonType.DRAGON, 0.8, 17.3, Abilities.HUSTLE, Abilities.NONE, Abilities.NONE, 300, 52, 65, 50, 45, 50, 38, 45, 35, 60, GrowthRate.SLOW, 50, false),
+    new PokemonSpecies(Species.ZWEILOUS, 5, false, false, false, "Hostile Pokémon", PokemonType.DARK, PokemonType.DRAGON, 1.4, 50, Abilities.HUSTLE, Abilities.NONE, Abilities.NONE, 420, 72, 85, 70, 65, 70, 58, 45, 35, 147, GrowthRate.SLOW, 50, false),
+    new PokemonSpecies(Species.HYDREIGON, 5, false, false, false, "Brutal Pokémon", PokemonType.DARK, PokemonType.DRAGON, 1.8, 160, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 600, 92, 105, 90, 125, 90, 98, 45, 35, 300, GrowthRate.SLOW, 50, false),
+    new PokemonSpecies(Species.LARVESTA, 5, false, false, false, "Torch Pokémon", PokemonType.BUG, PokemonType.FIRE, 1.1, 28.8, Abilities.FLAME_BODY, Abilities.NONE, Abilities.SWARM, 360, 55, 85, 55, 50, 55, 60, 45, 50, 72, GrowthRate.SLOW, 50, false),
+    new PokemonSpecies(Species.VOLCARONA, 5, false, false, false, "Sun Pokémon", PokemonType.BUG, PokemonType.FIRE, 1.6, 46, Abilities.FLAME_BODY, Abilities.NONE, Abilities.SWARM, 550, 85, 60, 65, 135, 105, 100, 15, 50, 275, GrowthRate.SLOW, 50, false),
+    new PokemonSpecies(Species.COBALION, 5, true, false, false, "Iron Will Pokémon", PokemonType.STEEL, PokemonType.FIGHTING, 2.1, 250, Abilities.JUSTIFIED, Abilities.NONE, Abilities.NONE, 580, 91, 90, 129, 90, 72, 108, 3, 35, 290, GrowthRate.SLOW, null, false),
+    new PokemonSpecies(Species.TERRAKION, 5, true, false, false, "Cavern Pokémon", PokemonType.ROCK, PokemonType.FIGHTING, 1.9, 260, Abilities.JUSTIFIED, Abilities.NONE, Abilities.NONE, 580, 91, 129, 90, 72, 90, 108, 3, 35, 290, GrowthRate.SLOW, null, false),
+    new PokemonSpecies(Species.VIRIZION, 5, true, false, false, "Grassland Pokémon", PokemonType.GRASS, PokemonType.FIGHTING, 2, 200, Abilities.JUSTIFIED, Abilities.NONE, Abilities.NONE, 580, 91, 90, 72, 90, 129, 108, 3, 35, 290, GrowthRate.SLOW, null, false),
+    new PokemonSpecies(Species.TORNADUS, 5, true, false, false, "Cyclone Pokémon", PokemonType.FLYING, null, 1.5, 63, Abilities.PRANKSTER, Abilities.NONE, Abilities.DEFIANT, 580, 79, 115, 70, 125, 80, 111, 3, 90, 290, GrowthRate.SLOW, 100, false, true,
+      new PokemonForm("Incarnate Forme", "incarnate", PokemonType.FLYING, null, 1.5, 63, Abilities.PRANKSTER, Abilities.NONE, Abilities.DEFIANT, 580, 79, 115, 70, 125, 80, 111, 3, 90, 290, false, null, true),
+      new PokemonForm("Therian Forme", "therian", PokemonType.FLYING, null, 1.4, 63, Abilities.REGENERATOR, Abilities.NONE, Abilities.REGENERATOR, 580, 79, 100, 80, 110, 90, 121, 3, 90, 290),
+    ),
+    new PokemonSpecies(Species.THUNDURUS, 5, true, false, false, "Bolt Strike Pokémon", PokemonType.ELECTRIC, PokemonType.FLYING, 1.5, 61, Abilities.PRANKSTER, Abilities.NONE, Abilities.DEFIANT, 580, 79, 115, 70, 125, 80, 111, 3, 90, 290, GrowthRate.SLOW, 100, false, true,
+      new PokemonForm("Incarnate Forme", "incarnate", PokemonType.ELECTRIC, PokemonType.FLYING, 1.5, 61, Abilities.PRANKSTER, Abilities.NONE, Abilities.DEFIANT, 580, 79, 115, 70, 125, 80, 111, 3, 90, 290, false, null, true),
+      new PokemonForm("Therian Forme", "therian", PokemonType.ELECTRIC, PokemonType.FLYING, 3, 61, Abilities.VOLT_ABSORB, Abilities.NONE, Abilities.VOLT_ABSORB, 580, 79, 105, 70, 145, 80, 101, 3, 90, 290),
+    ),
+    new PokemonSpecies(Species.RESHIRAM, 5, false, true, false, "Vast White Pokémon", PokemonType.DRAGON, PokemonType.FIRE, 3.2, 330, Abilities.TURBOBLAZE, Abilities.NONE, Abilities.NONE, 680, 100, 120, 100, 150, 120, 90, 3, 0, 340, GrowthRate.SLOW, null, false),
+    new PokemonSpecies(Species.ZEKROM, 5, false, true, false, "Deep Black Pokémon", PokemonType.DRAGON, PokemonType.ELECTRIC, 2.9, 345, Abilities.TERAVOLT, Abilities.NONE, Abilities.NONE, 680, 100, 150, 120, 120, 100, 90, 3, 0, 340, GrowthRate.SLOW, null, false),
+    new PokemonSpecies(Species.LANDORUS, 5, true, false, false, "Abundance Pokémon", PokemonType.GROUND, PokemonType.FLYING, 1.5, 68, Abilities.SAND_FORCE, Abilities.NONE, Abilities.SHEER_FORCE, 600, 89, 125, 90, 115, 80, 101, 3, 90, 300, GrowthRate.SLOW, 100, false, true,
+      new PokemonForm("Incarnate Forme", "incarnate", PokemonType.GROUND, PokemonType.FLYING, 1.5, 68, Abilities.SAND_FORCE, Abilities.NONE, Abilities.SHEER_FORCE, 600, 89, 125, 90, 115, 80, 101, 3, 90, 300, false, null, true),
+      new PokemonForm("Therian Forme", "therian", PokemonType.GROUND, PokemonType.FLYING, 1.3, 68, Abilities.INTIMIDATE, Abilities.NONE, Abilities.INTIMIDATE, 600, 89, 145, 90, 105, 80, 91, 3, 90, 300),
+    ),
+    new PokemonSpecies(Species.KYUREM, 5, false, true, false, "Boundary Pokémon", PokemonType.DRAGON, PokemonType.ICE, 3, 325, Abilities.PRESSURE, Abilities.NONE, Abilities.NONE, 660, 125, 130, 90, 130, 90, 95, 3, 0, 330, GrowthRate.SLOW, null, false, true,
+      new PokemonForm("Normal", "", PokemonType.DRAGON, PokemonType.ICE, 3, 325, Abilities.PRESSURE, Abilities.NONE, Abilities.NONE, 660, 125, 130, 90, 130, 90, 95, 3, 0, 330, false, null, true),
+      new PokemonForm("Black", "black", PokemonType.DRAGON, PokemonType.ICE, 3.3, 325, Abilities.TERAVOLT, Abilities.NONE, Abilities.NONE, 700, 125, 170, 100, 120, 90, 95, 3, 0, 350),
+      new PokemonForm("White", "white", PokemonType.DRAGON, PokemonType.ICE, 3.6, 325, Abilities.TURBOBLAZE, Abilities.NONE, Abilities.NONE, 700, 125, 120, 90, 170, 100, 95, 3, 0, 350),
+    ),
+    new PokemonSpecies(Species.KELDEO, 5, false, false, true, "Colt Pokémon", PokemonType.WATER, PokemonType.FIGHTING, 1.4, 48.5, Abilities.JUSTIFIED, Abilities.NONE, Abilities.NONE, 580, 91, 72, 90, 129, 90, 108, 3, 35, 290, GrowthRate.SLOW, null, false, true,
+      new PokemonForm("Ordinary Form", "ordinary", PokemonType.WATER, PokemonType.FIGHTING, 1.4, 48.5, Abilities.JUSTIFIED, Abilities.NONE, Abilities.NONE, 580, 91, 72, 90, 129, 90, 108, 3, 35, 290, false, null, true),
+      new PokemonForm("Resolute", "resolute", PokemonType.WATER, PokemonType.FIGHTING, 1.4, 48.5, Abilities.JUSTIFIED, Abilities.NONE, Abilities.NONE, 580, 91, 72, 90, 129, 90, 108, 3, 35, 290),
+    ),
+    new PokemonSpecies(Species.MELOETTA, 5, false, false, true, "Melody Pokémon", PokemonType.NORMAL, PokemonType.PSYCHIC, 0.6, 6.5, Abilities.SERENE_GRACE, Abilities.NONE, Abilities.NONE, 600, 100, 77, 77, 128, 128, 90, 3, 100, 300, GrowthRate.SLOW, null, false, true,
+      new PokemonForm("Aria Forme", "aria", PokemonType.NORMAL, PokemonType.PSYCHIC, 0.6, 6.5, Abilities.SERENE_GRACE, Abilities.NONE, Abilities.NONE, 600, 100, 77, 77, 128, 128, 90, 3, 100, 300, false, null, true),
+      new PokemonForm("Pirouette Forme", "pirouette", PokemonType.NORMAL, PokemonType.FIGHTING, 0.6, 6.5, Abilities.SERENE_GRACE, Abilities.NONE, Abilities.NONE, 600, 100, 128, 90, 77, 77, 128, 3, 100, 300, false, null, true),
+    ),
+    new PokemonSpecies(Species.GENESECT, 5, false, false, true, "Paleozoic Pokémon", PokemonType.BUG, PokemonType.STEEL, 1.5, 82.5, Abilities.DOWNLOAD, Abilities.NONE, Abilities.NONE, 600, 71, 120, 95, 120, 95, 99, 3, 0, 300, GrowthRate.SLOW, null, false, true,
+      new PokemonForm("Normal", "", PokemonType.BUG, PokemonType.STEEL, 1.5, 82.5, Abilities.DOWNLOAD, Abilities.NONE, Abilities.NONE, 600, 71, 120, 95, 120, 95, 99, 3, 0, 300, false, null, true),
+      new PokemonForm("Shock Drive", "shock", PokemonType.BUG, PokemonType.STEEL, 1.5, 82.5, Abilities.DOWNLOAD, Abilities.NONE, Abilities.NONE, 600, 71, 120, 95, 120, 95, 99, 3, 0, 300),
+      new PokemonForm("Burn Drive", "burn", PokemonType.BUG, PokemonType.STEEL, 1.5, 82.5, Abilities.DOWNLOAD, Abilities.NONE, Abilities.NONE, 600, 71, 120, 95, 120, 95, 99, 3, 0, 300),
+      new PokemonForm("Chill Drive", "chill", PokemonType.BUG, PokemonType.STEEL, 1.5, 82.5, Abilities.DOWNLOAD, Abilities.NONE, Abilities.NONE, 600, 71, 120, 95, 120, 95, 99, 3, 0, 300),
+      new PokemonForm("Douse Drive", "douse", PokemonType.BUG, PokemonType.STEEL, 1.5, 82.5, Abilities.DOWNLOAD, Abilities.NONE, Abilities.NONE, 600, 71, 120, 95, 120, 95, 99, 3, 0, 300),
+    ),
+    new PokemonSpecies(Species.CHESPIN, 6, false, false, false, "Spiny Nut Pokémon", PokemonType.GRASS, null, 0.4, 9, Abilities.OVERGROW, Abilities.NONE, Abilities.BULLETPROOF, 313, 56, 61, 65, 48, 45, 38, 45, 70, 63, GrowthRate.MEDIUM_SLOW, 87.5, false),
+    new PokemonSpecies(Species.QUILLADIN, 6, false, false, false, "Spiny Armor Pokémon", PokemonType.GRASS, null, 0.7, 29, Abilities.OVERGROW, Abilities.NONE, Abilities.BULLETPROOF, 405, 61, 78, 95, 56, 58, 57, 45, 70, 142, GrowthRate.MEDIUM_SLOW, 87.5, false),
+    new PokemonSpecies(Species.CHESNAUGHT, 6, false, false, false, "Spiny Armor Pokémon", PokemonType.GRASS, PokemonType.FIGHTING, 1.6, 90, Abilities.OVERGROW, Abilities.NONE, Abilities.BULLETPROOF, 530, 88, 107, 122, 74, 75, 64, 45, 70, 265, GrowthRate.MEDIUM_SLOW, 87.5, false),
+    new PokemonSpecies(Species.FENNEKIN, 6, false, false, false, "Fox Pokémon", PokemonType.FIRE, null, 0.4, 9.4, Abilities.BLAZE, Abilities.NONE, Abilities.MAGICIAN, 307, 40, 45, 40, 62, 60, 60, 45, 70, 61, GrowthRate.MEDIUM_SLOW, 87.5, false),
+    new PokemonSpecies(Species.BRAIXEN, 6, false, false, false, "Fox Pokémon", PokemonType.FIRE, null, 1, 14.5, Abilities.BLAZE, Abilities.NONE, Abilities.MAGICIAN, 409, 59, 59, 58, 90, 70, 73, 45, 70, 143, GrowthRate.MEDIUM_SLOW, 87.5, false),
+    new PokemonSpecies(Species.DELPHOX, 6, false, false, false, "Fox Pokémon", PokemonType.FIRE, PokemonType.PSYCHIC, 1.5, 39, Abilities.BLAZE, Abilities.NONE, Abilities.MAGICIAN, 534, 75, 69, 72, 114, 100, 104, 45, 70, 267, GrowthRate.MEDIUM_SLOW, 87.5, false),
+    new PokemonSpecies(Species.FROAKIE, 6, false, false, false, "Bubble Frog Pokémon", PokemonType.WATER, null, 0.3, 7, Abilities.TORRENT, Abilities.NONE, Abilities.PROTEAN, 314, 41, 56, 40, 62, 44, 71, 45, 70, 63, GrowthRate.MEDIUM_SLOW, 87.5, false, false,
+      new PokemonForm("Normal", "", PokemonType.WATER, null, 0.3, 7, Abilities.TORRENT, Abilities.NONE, Abilities.PROTEAN, 314, 41, 56, 40, 62, 44, 71, 45, 70, 63, false, null, true),
+      new PokemonForm("Battle Bond", "battle-bond", PokemonType.WATER, null, 0.3, 7, Abilities.TORRENT, Abilities.NONE, Abilities.TORRENT, 314, 41, 56, 40, 62, 44, 71, 45, 70, 63, false, "", true),
+    ),
+    new PokemonSpecies(Species.FROGADIER, 6, false, false, false, "Bubble Frog Pokémon", PokemonType.WATER, null, 0.6, 10.9, Abilities.TORRENT, Abilities.NONE, Abilities.PROTEAN, 405, 54, 63, 52, 83, 56, 97, 45, 70, 142, GrowthRate.MEDIUM_SLOW, 87.5, false, false,
+      new PokemonForm("Normal", "", PokemonType.WATER, null, 0.6, 10.9, Abilities.TORRENT, Abilities.NONE, Abilities.PROTEAN, 405, 54, 63, 52, 83, 56, 97, 45, 70, 142, false, null, true),
+      new PokemonForm("Battle Bond", "battle-bond", PokemonType.WATER, null, 0.6, 10.9, Abilities.TORRENT, Abilities.NONE, Abilities.NONE, 405, 54, 63, 52, 83, 56, 97, 45, 70, 142, false, "", true),
+    ),
+    new PokemonSpecies(Species.GRENINJA, 6, false, false, false, "Ninja Pokémon", PokemonType.WATER, PokemonType.DARK, 1.5, 40, Abilities.TORRENT, Abilities.NONE, Abilities.PROTEAN, 530, 72, 95, 67, 103, 71, 122, 45, 70, 265, GrowthRate.MEDIUM_SLOW, 87.5, false, false,
+      new PokemonForm("Normal", "", PokemonType.WATER, PokemonType.DARK, 1.5, 40, Abilities.TORRENT, Abilities.NONE, Abilities.PROTEAN, 530, 72, 95, 67, 103, 71, 122, 45, 70, 265, false, null, true),
+      new PokemonForm("Battle Bond", "battle-bond", PokemonType.WATER, PokemonType.DARK, 1.5, 40, Abilities.BATTLE_BOND, Abilities.NONE, Abilities.BATTLE_BOND, 530, 72, 95, 67, 103, 71, 122, 45, 70, 265, false, "", true),
+      new PokemonForm("Ash", "ash", PokemonType.WATER, PokemonType.DARK, 1.5, 40, Abilities.BATTLE_BOND, Abilities.NONE, Abilities.NONE, 640, 72, 145, 67, 153, 71, 132, 45, 70, 265),
+    ),
+    new PokemonSpecies(Species.BUNNELBY, 6, false, false, false, "Digging Pokémon", PokemonType.NORMAL, null, 0.4, 5, Abilities.PICKUP, Abilities.CHEEK_POUCH, Abilities.HUGE_POWER, 237, 38, 36, 38, 32, 36, 57, 255, 50, 47, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.DIGGERSBY, 6, false, false, false, "Digging Pokémon", PokemonType.NORMAL, PokemonType.GROUND, 1, 42.4, Abilities.PICKUP, Abilities.CHEEK_POUCH, Abilities.HUGE_POWER, 423, 85, 56, 77, 50, 77, 78, 127, 50, 148, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.FLETCHLING, 6, false, false, false, "Tiny Robin Pokémon", PokemonType.NORMAL, PokemonType.FLYING, 0.3, 1.7, Abilities.BIG_PECKS, Abilities.NONE, Abilities.GALE_WINGS, 278, 45, 50, 43, 40, 38, 62, 255, 50, 56, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.FLETCHINDER, 6, false, false, false, "Ember Pokémon", PokemonType.FIRE, PokemonType.FLYING, 0.7, 16, Abilities.FLAME_BODY, Abilities.NONE, Abilities.GALE_WINGS, 382, 62, 73, 55, 56, 52, 84, 120, 50, 134, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.TALONFLAME, 6, false, false, false, "Scorching Pokémon", PokemonType.FIRE, PokemonType.FLYING, 1.2, 24.5, Abilities.FLAME_BODY, Abilities.NONE, Abilities.GALE_WINGS, 499, 78, 81, 71, 74, 69, 126, 45, 50, 175, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.SCATTERBUG, 6, false, false, false, "Scatterdust Pokémon", PokemonType.BUG, null, 0.3, 2.5, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 200, 38, 35, 40, 27, 25, 35, 255, 70, 40, GrowthRate.MEDIUM_FAST, 50, false, false,
+      new PokemonForm("Meadow Pattern", "meadow", PokemonType.BUG, null, 0.3, 2.5, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 200, 38, 35, 40, 27, 25, 35, 255, 70, 40, false, "", true),
+      new PokemonForm("Icy Snow Pattern", "icy-snow", PokemonType.BUG, null, 0.3, 2.5, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 200, 38, 35, 40, 27, 25, 35, 255, 70, 40, false, "", true),
+      new PokemonForm("Polar Pattern", "polar", PokemonType.BUG, null, 0.3, 2.5, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 200, 38, 35, 40, 27, 25, 35, 255, 70, 40, false, "", true),
+      new PokemonForm("Tundra Pattern", "tundra", PokemonType.BUG, null, 0.3, 2.5, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 200, 38, 35, 40, 27, 25, 35, 255, 70, 40, false, "", true),
+      new PokemonForm("Continental Pattern", "continental", PokemonType.BUG, null, 0.3, 2.5, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 200, 38, 35, 40, 27, 25, 35, 255, 70, 40, false, "", true),
+      new PokemonForm("Garden Pattern", "garden", PokemonType.BUG, null, 0.3, 2.5, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 200, 38, 35, 40, 27, 25, 35, 255, 70, 40, false, "", true),
+      new PokemonForm("Elegant Pattern", "elegant", PokemonType.BUG, null, 0.3, 2.5, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 200, 38, 35, 40, 27, 25, 35, 255, 70, 40, false, "", true),
+      new PokemonForm("Modern Pattern", "modern", PokemonType.BUG, null, 0.3, 2.5, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 200, 38, 35, 40, 27, 25, 35, 255, 70, 40, false, "", true),
+      new PokemonForm("Marine Pattern", "marine", PokemonType.BUG, null, 0.3, 2.5, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 200, 38, 35, 40, 27, 25, 35, 255, 70, 40, false, "", true),
+      new PokemonForm("Archipelago Pattern", "archipelago", PokemonType.BUG, null, 0.3, 2.5, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 200, 38, 35, 40, 27, 25, 35, 255, 70, 40, false, "", true),
+      new PokemonForm("High Plains Pattern", "high-plains", PokemonType.BUG, null, 0.3, 2.5, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 200, 38, 35, 40, 27, 25, 35, 255, 70, 40, false, "", true),
+      new PokemonForm("Sandstorm Pattern", "sandstorm", PokemonType.BUG, null, 0.3, 2.5, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 200, 38, 35, 40, 27, 25, 35, 255, 70, 40, false, "", true),
+      new PokemonForm("River Pattern", "river", PokemonType.BUG, null, 0.3, 2.5, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 200, 38, 35, 40, 27, 25, 35, 255, 70, 40, false, "", true),
+      new PokemonForm("Monsoon Pattern", "monsoon", PokemonType.BUG, null, 0.3, 2.5, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 200, 38, 35, 40, 27, 25, 35, 255, 70, 40, false, "", true),
+      new PokemonForm("Savanna Pattern", "savanna", PokemonType.BUG, null, 0.3, 2.5, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 200, 38, 35, 40, 27, 25, 35, 255, 70, 40, false, "", true),
+      new PokemonForm("Sun Pattern", "sun", PokemonType.BUG, null, 0.3, 2.5, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 200, 38, 35, 40, 27, 25, 35, 255, 70, 40, false, "", true),
+      new PokemonForm("Ocean Pattern", "ocean", PokemonType.BUG, null, 0.3, 2.5, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 200, 38, 35, 40, 27, 25, 35, 255, 70, 40, false, "", true),
+      new PokemonForm("Jungle Pattern", "jungle", PokemonType.BUG, null, 0.3, 2.5, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 200, 38, 35, 40, 27, 25, 35, 255, 70, 40, false, "", true),
+      new PokemonForm("Fancy Pattern", "fancy", PokemonType.BUG, null, 0.3, 2.5, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 200, 38, 35, 40, 27, 25, 35, 255, 70, 40, false, "", true),
+      new PokemonForm("Poké Ball Pattern", "poke-ball", PokemonType.BUG, null, 0.3, 2.5, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 200, 38, 35, 40, 27, 25, 35, 255, 70, 40, false, "", true),
+    ),
+    new PokemonSpecies(Species.SPEWPA, 6, false, false, false, "Scatterdust Pokémon", PokemonType.BUG, null, 0.3, 8.4, Abilities.SHED_SKIN, Abilities.SHED_SKIN, Abilities.FRIEND_GUARD, 213, 45, 22, 60, 27, 30, 29, 120, 70, 75, GrowthRate.MEDIUM_FAST, 50, false, false,
+      new PokemonForm("Meadow Pattern", "meadow", PokemonType.BUG, null, 0.3, 8.4, Abilities.SHED_SKIN, Abilities.NONE, Abilities.FRIEND_GUARD, 213, 45, 22, 60, 27, 30, 29, 120, 70, 75, false, "", true),
+      new PokemonForm("Icy Snow Pattern", "icy-snow", PokemonType.BUG, null, 0.3, 8.4, Abilities.SHED_SKIN, Abilities.NONE, Abilities.FRIEND_GUARD, 213, 45, 22, 60, 27, 30, 29, 120, 70, 75, false, "", true),
+      new PokemonForm("Polar Pattern", "polar", PokemonType.BUG, null, 0.3, 8.4, Abilities.SHED_SKIN, Abilities.NONE, Abilities.FRIEND_GUARD, 213, 45, 22, 60, 27, 30, 29, 120, 70, 75, false, "", true),
+      new PokemonForm("Tundra Pattern", "tundra", PokemonType.BUG, null, 0.3, 8.4, Abilities.SHED_SKIN, Abilities.NONE, Abilities.FRIEND_GUARD, 213, 45, 22, 60, 27, 30, 29, 120, 70, 75, false, "", true),
+      new PokemonForm("Continental Pattern", "continental", PokemonType.BUG, null, 0.3, 8.4, Abilities.SHED_SKIN, Abilities.NONE, Abilities.FRIEND_GUARD, 213, 45, 22, 60, 27, 30, 29, 120, 70, 75, false, "", true),
+      new PokemonForm("Garden Pattern", "garden", PokemonType.BUG, null, 0.3, 8.4, Abilities.SHED_SKIN, Abilities.NONE, Abilities.FRIEND_GUARD, 213, 45, 22, 60, 27, 30, 29, 120, 70, 75, false, "", true),
+      new PokemonForm("Elegant Pattern", "elegant", PokemonType.BUG, null, 0.3, 8.4, Abilities.SHED_SKIN, Abilities.NONE, Abilities.FRIEND_GUARD, 213, 45, 22, 60, 27, 30, 29, 120, 70, 75, false, "", true),
+      new PokemonForm("Modern Pattern", "modern", PokemonType.BUG, null, 0.3, 8.4, Abilities.SHED_SKIN, Abilities.NONE, Abilities.FRIEND_GUARD, 213, 45, 22, 60, 27, 30, 29, 120, 70, 75, false, "", true),
+      new PokemonForm("Marine Pattern", "marine", PokemonType.BUG, null, 0.3, 8.4, Abilities.SHED_SKIN, Abilities.NONE, Abilities.FRIEND_GUARD, 213, 45, 22, 60, 27, 30, 29, 120, 70, 75, false, "", true),
+      new PokemonForm("Archipelago Pattern", "archipelago", PokemonType.BUG, null, 0.3, 8.4, Abilities.SHED_SKIN, Abilities.NONE, Abilities.FRIEND_GUARD, 213, 45, 22, 60, 27, 30, 29, 120, 70, 75, false, "", true),
+      new PokemonForm("High Plains Pattern", "high-plains", PokemonType.BUG, null, 0.3, 8.4, Abilities.SHED_SKIN, Abilities.NONE, Abilities.FRIEND_GUARD, 213, 45, 22, 60, 27, 30, 29, 120, 70, 75, false, "", true),
+      new PokemonForm("Sandstorm Pattern", "sandstorm", PokemonType.BUG, null, 0.3, 8.4, Abilities.SHED_SKIN, Abilities.NONE, Abilities.FRIEND_GUARD, 213, 45, 22, 60, 27, 30, 29, 120, 70, 75, false, "", true),
+      new PokemonForm("River Pattern", "river", PokemonType.BUG, null, 0.3, 8.4, Abilities.SHED_SKIN, Abilities.NONE, Abilities.FRIEND_GUARD, 213, 45, 22, 60, 27, 30, 29, 120, 70, 75, false, "", true),
+      new PokemonForm("Monsoon Pattern", "monsoon", PokemonType.BUG, null, 0.3, 8.4, Abilities.SHED_SKIN, Abilities.NONE, Abilities.FRIEND_GUARD, 213, 45, 22, 60, 27, 30, 29, 120, 70, 75, false, "", true),
+      new PokemonForm("Savanna Pattern", "savanna", PokemonType.BUG, null, 0.3, 8.4, Abilities.SHED_SKIN, Abilities.NONE, Abilities.FRIEND_GUARD, 213, 45, 22, 60, 27, 30, 29, 120, 70, 75, false, "", true),
+      new PokemonForm("Sun Pattern", "sun", PokemonType.BUG, null, 0.3, 8.4, Abilities.SHED_SKIN, Abilities.NONE, Abilities.FRIEND_GUARD, 213, 45, 22, 60, 27, 30, 29, 120, 70, 75, false, "", true),
+      new PokemonForm("Ocean Pattern", "ocean", PokemonType.BUG, null, 0.3, 8.4, Abilities.SHED_SKIN, Abilities.NONE, Abilities.FRIEND_GUARD, 213, 45, 22, 60, 27, 30, 29, 120, 70, 75, false, "", true),
+      new PokemonForm("Jungle Pattern", "jungle", PokemonType.BUG, null, 0.3, 8.4, Abilities.SHED_SKIN, Abilities.NONE, Abilities.FRIEND_GUARD, 213, 45, 22, 60, 27, 30, 29, 120, 70, 75, false, "", true),
+      new PokemonForm("Fancy Pattern", "fancy", PokemonType.BUG, null, 0.3, 8.4, Abilities.SHED_SKIN, Abilities.NONE, Abilities.FRIEND_GUARD, 213, 45, 22, 60, 27, 30, 29, 120, 70, 75, false, "", true),
+      new PokemonForm("Poké Ball Pattern", "poke-ball", PokemonType.BUG, null, 0.3, 8.4, Abilities.SHED_SKIN, Abilities.NONE, Abilities.FRIEND_GUARD, 213, 45, 22, 60, 27, 30, 29, 120, 70, 75, false, "", true),
+    ),
+    new PokemonSpecies(Species.VIVILLON, 6, false, false, false, "Scale Pokémon", PokemonType.BUG, PokemonType.FLYING, 1.2, 17, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 411, 80, 52, 50, 90, 50, 89, 45, 70, 206, GrowthRate.MEDIUM_FAST, 50, false, false,
+      new PokemonForm("Meadow Pattern", "meadow", PokemonType.BUG, PokemonType.FLYING, 1.2, 17, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 411, 80, 52, 50, 90, 50, 89, 45, 70, 206, false, null, true),
+      new PokemonForm("Icy Snow Pattern", "icy-snow", PokemonType.BUG, PokemonType.FLYING, 1.2, 17, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 411, 80, 52, 50, 90, 50, 89, 45, 70, 206, false, null, true),
+      new PokemonForm("Polar Pattern", "polar", PokemonType.BUG, PokemonType.FLYING, 1.2, 17, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 411, 80, 52, 50, 90, 50, 89, 45, 70, 206, false, null, true),
+      new PokemonForm("Tundra Pattern", "tundra", PokemonType.BUG, PokemonType.FLYING, 1.2, 17, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 411, 80, 52, 50, 90, 50, 89, 45, 70, 206, false, null, true),
+      new PokemonForm("Continental Pattern", "continental", PokemonType.BUG, PokemonType.FLYING, 1.2, 17, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 411, 80, 52, 50, 90, 50, 89, 45, 70, 206, false, null, true),
+      new PokemonForm("Garden Pattern", "garden", PokemonType.BUG, PokemonType.FLYING, 1.2, 17, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 411, 80, 52, 50, 90, 50, 89, 45, 70, 206, false, null, true),
+      new PokemonForm("Elegant Pattern", "elegant", PokemonType.BUG, PokemonType.FLYING, 1.2, 17, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 411, 80, 52, 50, 90, 50, 89, 45, 70, 206, false, null, true),
+      new PokemonForm("Modern Pattern", "modern", PokemonType.BUG, PokemonType.FLYING, 1.2, 17, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 411, 80, 52, 50, 90, 50, 89, 45, 70, 206, false, null, true),
+      new PokemonForm("Marine Pattern", "marine", PokemonType.BUG, PokemonType.FLYING, 1.2, 17, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 411, 80, 52, 50, 90, 50, 89, 45, 70, 206, false, null, true),
+      new PokemonForm("Archipelago Pattern", "archipelago", PokemonType.BUG, PokemonType.FLYING, 1.2, 17, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 411, 80, 52, 50, 90, 50, 89, 45, 70, 206, false, null, true),
+      new PokemonForm("High Plains Pattern", "high-plains", PokemonType.BUG, PokemonType.FLYING, 1.2, 17, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 411, 80, 52, 50, 90, 50, 89, 45, 70, 206, false, null, true),
+      new PokemonForm("Sandstorm Pattern", "sandstorm", PokemonType.BUG, PokemonType.FLYING, 1.2, 17, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 411, 80, 52, 50, 90, 50, 89, 45, 70, 206, false, null, true),
+      new PokemonForm("River Pattern", "river", PokemonType.BUG, PokemonType.FLYING, 1.2, 17, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 411, 80, 52, 50, 90, 50, 89, 45, 70, 206, false, null, true),
+      new PokemonForm("Monsoon Pattern", "monsoon", PokemonType.BUG, PokemonType.FLYING, 1.2, 17, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 411, 80, 52, 50, 90, 50, 89, 45, 70, 206, false, null, true),
+      new PokemonForm("Savanna Pattern", "savanna", PokemonType.BUG, PokemonType.FLYING, 1.2, 17, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 411, 80, 52, 50, 90, 50, 89, 45, 70, 206, false, null, true),
+      new PokemonForm("Sun Pattern", "sun", PokemonType.BUG, PokemonType.FLYING, 1.2, 17, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 411, 80, 52, 50, 90, 50, 89, 45, 70, 206, false, null, true),
+      new PokemonForm("Ocean Pattern", "ocean", PokemonType.BUG, PokemonType.FLYING, 1.2, 17, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 411, 80, 52, 50, 90, 50, 89, 45, 70, 206, false, null, true),
+      new PokemonForm("Jungle Pattern", "jungle", PokemonType.BUG, PokemonType.FLYING, 1.2, 17, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 411, 80, 52, 50, 90, 50, 89, 45, 70, 206, false, null, true),
+      new PokemonForm("Fancy Pattern", "fancy", PokemonType.BUG, PokemonType.FLYING, 1.2, 17, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 411, 80, 52, 50, 90, 50, 89, 45, 70, 206, false, null, true),
+      new PokemonForm("Poké Ball Pattern", "poke-ball", PokemonType.BUG, PokemonType.FLYING, 1.2, 17, Abilities.SHIELD_DUST, Abilities.COMPOUND_EYES, Abilities.FRIEND_GUARD, 411, 80, 52, 50, 90, 50, 89, 45, 70, 206, false, null, true),
+    ),
+    new PokemonSpecies(Species.LITLEO, 6, false, false, false, "Lion Cub Pokémon", PokemonType.FIRE, PokemonType.NORMAL, 0.6, 13.5, Abilities.RIVALRY, Abilities.UNNERVE, Abilities.MOXIE, 369, 62, 50, 58, 73, 54, 72, 220, 70, 74, GrowthRate.MEDIUM_SLOW, 12.5, false),
+    new PokemonSpecies(Species.PYROAR, 6, false, false, false, "Royal Pokémon", PokemonType.FIRE, PokemonType.NORMAL, 1.5, 81.5, Abilities.RIVALRY, Abilities.UNNERVE, Abilities.MOXIE, 507, 86, 68, 72, 109, 66, 106, 65, 70, 177, GrowthRate.MEDIUM_SLOW, 12.5, true),
+    new PokemonSpecies(Species.FLABEBE, 6, false, false, false, "Single Bloom Pokémon", PokemonType.FAIRY, null, 0.1, 0.1, Abilities.FLOWER_VEIL, Abilities.NONE, Abilities.SYMBIOSIS, 303, 44, 38, 39, 61, 79, 42, 225, 70, 61, GrowthRate.MEDIUM_FAST, 0, false, false,
+      new PokemonForm("Red Flower", "red", PokemonType.FAIRY, null, 0.1, 0.1, Abilities.FLOWER_VEIL, Abilities.NONE, Abilities.SYMBIOSIS, 303, 44, 38, 39, 61, 79, 42, 225, 70, 61, false, null, true),
+      new PokemonForm("Yellow Flower", "yellow", PokemonType.FAIRY, null, 0.1, 0.1, Abilities.FLOWER_VEIL, Abilities.NONE, Abilities.SYMBIOSIS, 303, 44, 38, 39, 61, 79, 42, 225, 70, 61, false, null, true),
+      new PokemonForm("Orange Flower", "orange", PokemonType.FAIRY, null, 0.1, 0.1, Abilities.FLOWER_VEIL, Abilities.NONE, Abilities.SYMBIOSIS, 303, 44, 38, 39, 61, 79, 42, 225, 70, 61, false, null, true),
+      new PokemonForm("Blue Flower", "blue", PokemonType.FAIRY, null, 0.1, 0.1, Abilities.FLOWER_VEIL, Abilities.NONE, Abilities.SYMBIOSIS, 303, 44, 38, 39, 61, 79, 42, 225, 70, 61, false, null, true),
+      new PokemonForm("White Flower", "white", PokemonType.FAIRY, null, 0.1, 0.1, Abilities.FLOWER_VEIL, Abilities.NONE, Abilities.SYMBIOSIS, 303, 44, 38, 39, 61, 79, 42, 225, 70, 61, false, null, true),
+    ),
+    new PokemonSpecies(Species.FLOETTE, 6, false, false, false, "Single Bloom Pokémon", PokemonType.FAIRY, null, 0.2, 0.9, Abilities.FLOWER_VEIL, Abilities.NONE, Abilities.SYMBIOSIS, 371, 54, 45, 47, 75, 98, 52, 120, 70, 130, GrowthRate.MEDIUM_FAST, 0, false, false,
+      new PokemonForm("Red Flower", "red", PokemonType.FAIRY, null, 0.2, 0.9, Abilities.FLOWER_VEIL, Abilities.NONE, Abilities.SYMBIOSIS, 371, 54, 45, 47, 75, 98, 52, 120, 70, 130, false, null, true),
+      new PokemonForm("Yellow Flower", "yellow", PokemonType.FAIRY, null, 0.2, 0.9, Abilities.FLOWER_VEIL, Abilities.NONE, Abilities.SYMBIOSIS, 371, 54, 45, 47, 75, 98, 52, 120, 70, 130, false, null, true),
+      new PokemonForm("Orange Flower", "orange", PokemonType.FAIRY, null, 0.2, 0.9, Abilities.FLOWER_VEIL, Abilities.NONE, Abilities.SYMBIOSIS, 371, 54, 45, 47, 75, 98, 52, 120, 70, 130, false, null, true),
+      new PokemonForm("Blue Flower", "blue", PokemonType.FAIRY, null, 0.2, 0.9, Abilities.FLOWER_VEIL, Abilities.NONE, Abilities.SYMBIOSIS, 371, 54, 45, 47, 75, 98, 52, 120, 70, 130, false, null, true),
+      new PokemonForm("White Flower", "white", PokemonType.FAIRY, null, 0.2, 0.9, Abilities.FLOWER_VEIL, Abilities.NONE, Abilities.SYMBIOSIS, 371, 54, 45, 47, 75, 98, 52, 120, 70, 130, false, null, true),
+    ),
+    new PokemonSpecies(Species.FLORGES, 6, false, false, false, "Garden Pokémon", PokemonType.FAIRY, null, 1.1, 10, Abilities.FLOWER_VEIL, Abilities.NONE, Abilities.SYMBIOSIS, 552, 78, 65, 68, 112, 154, 75, 45, 70, 276, GrowthRate.MEDIUM_FAST, 0, false, false,
+      new PokemonForm("Red Flower", "red", PokemonType.FAIRY, null, 1.1, 10, Abilities.FLOWER_VEIL, Abilities.NONE, Abilities.SYMBIOSIS, 552, 78, 65, 68, 112, 154, 75, 45, 70, 276, false, null, true),
+      new PokemonForm("Yellow Flower", "yellow", PokemonType.FAIRY, null, 1.1, 10, Abilities.FLOWER_VEIL, Abilities.NONE, Abilities.SYMBIOSIS, 552, 78, 65, 68, 112, 154, 75, 45, 70, 276, false, null, true),
+      new PokemonForm("Orange Flower", "orange", PokemonType.FAIRY, null, 1.1, 10, Abilities.FLOWER_VEIL, Abilities.NONE, Abilities.SYMBIOSIS, 552, 78, 65, 68, 112, 154, 75, 45, 70, 276, false, null, true),
+      new PokemonForm("Blue Flower", "blue", PokemonType.FAIRY, null, 1.1, 10, Abilities.FLOWER_VEIL, Abilities.NONE, Abilities.SYMBIOSIS, 552, 78, 65, 68, 112, 154, 75, 45, 70, 276, false, null, true),
+      new PokemonForm("White Flower", "white", PokemonType.FAIRY, null, 1.1, 10, Abilities.FLOWER_VEIL, Abilities.NONE, Abilities.SYMBIOSIS, 552, 78, 65, 68, 112, 154, 75, 45, 70, 276, false, null, true),
+    ),
+    new PokemonSpecies(Species.SKIDDO, 6, false, false, false, "Mount Pokémon", PokemonType.GRASS, null, 0.9, 31, Abilities.SAP_SIPPER, Abilities.NONE, Abilities.GRASS_PELT, 350, 66, 65, 48, 62, 57, 52, 200, 70, 70, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.GOGOAT, 6, false, false, false, "Mount Pokémon", PokemonType.GRASS, null, 1.7, 91, Abilities.SAP_SIPPER, Abilities.NONE, Abilities.GRASS_PELT, 531, 123, 100, 62, 97, 81, 68, 45, 70, 186, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.PANCHAM, 6, false, false, false, "Playful Pokémon", PokemonType.FIGHTING, null, 0.6, 8, Abilities.IRON_FIST, Abilities.MOLD_BREAKER, Abilities.SCRAPPY, 348, 67, 82, 62, 46, 48, 43, 220, 50, 70, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.PANGORO, 6, false, false, false, "Daunting Pokémon", PokemonType.FIGHTING, PokemonType.DARK, 2.1, 136, Abilities.IRON_FIST, Abilities.MOLD_BREAKER, Abilities.SCRAPPY, 495, 95, 124, 78, 69, 71, 58, 65, 50, 173, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.FURFROU, 6, false, false, false, "Poodle Pokémon", PokemonType.NORMAL, null, 1.2, 28, Abilities.FUR_COAT, Abilities.NONE, Abilities.NONE, 472, 75, 80, 60, 65, 90, 102, 160, 70, 165, GrowthRate.MEDIUM_FAST, 50, false, true,
+      new PokemonForm("Natural Form", "", PokemonType.NORMAL, null, 1.2, 28, Abilities.FUR_COAT, Abilities.NONE, Abilities.NONE, 472, 75, 80, 60, 65, 90, 102, 160, 70, 165, false, null, true),
+      new PokemonForm("Heart Trim", "heart", PokemonType.NORMAL, null, 1.2, 28, Abilities.FUR_COAT, Abilities.NONE, Abilities.NONE, 472, 75, 80, 60, 65, 90, 102, 160, 70, 165, false, null, true),
+      new PokemonForm("Star Trim", "star", PokemonType.NORMAL, null, 1.2, 28, Abilities.FUR_COAT, Abilities.NONE, Abilities.NONE, 472, 75, 80, 60, 65, 90, 102, 160, 70, 165, false, null, true),
+      new PokemonForm("Diamond Trim", "diamond", PokemonType.NORMAL, null, 1.2, 28, Abilities.FUR_COAT, Abilities.NONE, Abilities.NONE, 472, 75, 80, 60, 65, 90, 102, 160, 70, 165, false, null, true),
+      new PokemonForm("Debutante Trim", "debutante", PokemonType.NORMAL, null, 1.2, 28, Abilities.FUR_COAT, Abilities.NONE, Abilities.NONE, 472, 75, 80, 60, 65, 90, 102, 160, 70, 165, false, null, true),
+      new PokemonForm("Matron Trim", "matron", PokemonType.NORMAL, null, 1.2, 28, Abilities.FUR_COAT, Abilities.NONE, Abilities.NONE, 472, 75, 80, 60, 65, 90, 102, 160, 70, 165, false, null, true),
+      new PokemonForm("Dandy Trim", "dandy", PokemonType.NORMAL, null, 1.2, 28, Abilities.FUR_COAT, Abilities.NONE, Abilities.NONE, 472, 75, 80, 60, 65, 90, 102, 160, 70, 165, false, null, true),
+      new PokemonForm("La Reine Trim", "la-reine", PokemonType.NORMAL, null, 1.2, 28, Abilities.FUR_COAT, Abilities.NONE, Abilities.NONE, 472, 75, 80, 60, 65, 90, 102, 160, 70, 165, false, null, true),
+      new PokemonForm("Kabuki Trim", "kabuki", PokemonType.NORMAL, null, 1.2, 28, Abilities.FUR_COAT, Abilities.NONE, Abilities.NONE, 472, 75, 80, 60, 65, 90, 102, 160, 70, 165, false, null, true),
+      new PokemonForm("Pharaoh Trim", "pharaoh", PokemonType.NORMAL, null, 1.2, 28, Abilities.FUR_COAT, Abilities.NONE, Abilities.NONE, 472, 75, 80, 60, 65, 90, 102, 160, 70, 165, false, null, true),
+    ),
+    new PokemonSpecies(Species.ESPURR, 6, false, false, false, "Restraint Pokémon", PokemonType.PSYCHIC, null, 0.3, 3.5, Abilities.KEEN_EYE, Abilities.INFILTRATOR, Abilities.OWN_TEMPO, 355, 62, 48, 54, 63, 60, 68, 190, 50, 71, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.MEOWSTIC, 6, false, false, false, "Constraint Pokémon", PokemonType.PSYCHIC, null, 0.6, 8.5, Abilities.KEEN_EYE, Abilities.INFILTRATOR, Abilities.PRANKSTER, 466, 74, 48, 76, 83, 81, 104, 75, 50, 163, GrowthRate.MEDIUM_FAST, 50, false, false,
+      new PokemonForm("Male", "male", PokemonType.PSYCHIC, null, 0.6, 8.5, Abilities.KEEN_EYE, Abilities.INFILTRATOR, Abilities.PRANKSTER, 466, 74, 48, 76, 83, 81, 104, 75, 50, 163, false, "", true),
+      new PokemonForm("Female", "female", PokemonType.PSYCHIC, null, 0.6, 8.5, Abilities.KEEN_EYE, Abilities.INFILTRATOR, Abilities.COMPETITIVE, 466, 74, 48, 76, 83, 81, 104, 75, 50, 163, false, null, true),
+    ),
+    new PokemonSpecies(Species.HONEDGE, 6, false, false, false, "Sword Pokémon", PokemonType.STEEL, PokemonType.GHOST, 0.8, 2, Abilities.NO_GUARD, Abilities.NONE, Abilities.NONE, 325, 45, 80, 100, 35, 37, 28, 180, 50, 65, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.DOUBLADE, 6, false, false, false, "Sword Pokémon", PokemonType.STEEL, PokemonType.GHOST, 0.8, 4.5, Abilities.NO_GUARD, Abilities.NONE, Abilities.NONE, 448, 59, 110, 150, 45, 49, 35, 90, 50, 157, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.AEGISLASH, 6, false, false, false, "Royal Sword Pokémon", PokemonType.STEEL, PokemonType.GHOST, 1.7, 53, Abilities.STANCE_CHANGE, Abilities.NONE, Abilities.NONE, 500, 60, 50, 140, 50, 140, 60, 45, 50, 250, GrowthRate.MEDIUM_FAST, 50, false, true,
+      new PokemonForm("Shield Forme", "shield", PokemonType.STEEL, PokemonType.GHOST, 1.7, 53, Abilities.STANCE_CHANGE, Abilities.NONE, Abilities.NONE, 500, 60, 50, 140, 50, 140, 60, 45, 50, 250, false, "", true),
+      new PokemonForm("Blade Forme", "blade", PokemonType.STEEL, PokemonType.GHOST, 1.7, 53, Abilities.STANCE_CHANGE, Abilities.NONE, Abilities.NONE, 500, 60, 140, 50, 140, 50, 60, 45, 50, 250),
+    ),
+    new PokemonSpecies(Species.SPRITZEE, 6, false, false, false, "Perfume Pokémon", PokemonType.FAIRY, null, 0.2, 0.5, Abilities.HEALER, Abilities.NONE, Abilities.AROMA_VEIL, 341, 78, 52, 60, 63, 65, 23, 200, 50, 68, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.AROMATISSE, 6, false, false, false, "Fragrance Pokémon", PokemonType.FAIRY, null, 0.8, 15.5, Abilities.HEALER, Abilities.NONE, Abilities.AROMA_VEIL, 462, 101, 72, 72, 99, 89, 29, 140, 50, 162, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.SWIRLIX, 6, false, false, false, "Cotton Candy Pokémon", PokemonType.FAIRY, null, 0.4, 3.5, Abilities.SWEET_VEIL, Abilities.NONE, Abilities.UNBURDEN, 341, 62, 48, 66, 59, 57, 49, 200, 50, 68, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.SLURPUFF, 6, false, false, false, "Meringue Pokémon", PokemonType.FAIRY, null, 0.8, 5, Abilities.SWEET_VEIL, Abilities.NONE, Abilities.UNBURDEN, 480, 82, 80, 86, 85, 75, 72, 140, 50, 168, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.INKAY, 6, false, false, false, "Revolving Pokémon", PokemonType.DARK, PokemonType.PSYCHIC, 0.4, 3.5, Abilities.CONTRARY, Abilities.SUCTION_CUPS, Abilities.INFILTRATOR, 288, 53, 54, 53, 37, 46, 45, 190, 50, 58, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.MALAMAR, 6, false, false, false, "Overturning Pokémon", PokemonType.DARK, PokemonType.PSYCHIC, 1.5, 47, Abilities.CONTRARY, Abilities.SUCTION_CUPS, Abilities.INFILTRATOR, 482, 86, 92, 88, 68, 75, 73, 80, 50, 169, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.BINACLE, 6, false, false, false, "Two-Handed Pokémon", PokemonType.ROCK, PokemonType.WATER, 0.5, 31, Abilities.TOUGH_CLAWS, Abilities.SNIPER, Abilities.PICKPOCKET, 306, 42, 52, 67, 39, 56, 50, 120, 50, 61, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.BARBARACLE, 6, false, false, false, "Collective Pokémon", PokemonType.ROCK, PokemonType.WATER, 1.3, 96, Abilities.TOUGH_CLAWS, Abilities.SNIPER, Abilities.PICKPOCKET, 500, 72, 105, 115, 54, 86, 68, 45, 50, 175, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.SKRELP, 6, false, false, false, "Mock Kelp Pokémon", PokemonType.POISON, PokemonType.WATER, 0.5, 7.3, Abilities.POISON_POINT, Abilities.POISON_TOUCH, Abilities.ADAPTABILITY, 320, 50, 60, 60, 60, 60, 30, 225, 50, 64, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.DRAGALGE, 6, false, false, false, "Mock Kelp Pokémon", PokemonType.POISON, PokemonType.DRAGON, 1.8, 81.5, Abilities.POISON_POINT, Abilities.POISON_TOUCH, Abilities.ADAPTABILITY, 494, 65, 75, 90, 97, 123, 44, 55, 50, 173, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.CLAUNCHER, 6, false, false, false, "Water Gun Pokémon", PokemonType.WATER, null, 0.5, 8.3, Abilities.MEGA_LAUNCHER, Abilities.NONE, Abilities.NONE, 330, 50, 53, 62, 58, 63, 44, 225, 50, 66, GrowthRate.SLOW, 50, false),
+    new PokemonSpecies(Species.CLAWITZER, 6, false, false, false, "Howitzer Pokémon", PokemonType.WATER, null, 1.3, 35.3, Abilities.MEGA_LAUNCHER, Abilities.NONE, Abilities.NONE, 500, 71, 73, 88, 120, 89, 59, 55, 50, 100, GrowthRate.SLOW, 50, false),
+    new PokemonSpecies(Species.HELIOPTILE, 6, false, false, false, "Generator Pokémon", PokemonType.ELECTRIC, PokemonType.NORMAL, 0.5, 6, Abilities.DRY_SKIN, Abilities.SAND_VEIL, Abilities.SOLAR_POWER, 289, 44, 38, 33, 61, 43, 70, 190, 50, 58, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.HELIOLISK, 6, false, false, false, "Generator Pokémon", PokemonType.ELECTRIC, PokemonType.NORMAL, 1, 21, Abilities.DRY_SKIN, Abilities.SAND_VEIL, Abilities.SOLAR_POWER, 481, 62, 55, 52, 109, 94, 109, 75, 50, 168, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.TYRUNT, 6, false, false, false, "Royal Heir Pokémon", PokemonType.ROCK, PokemonType.DRAGON, 0.8, 26, Abilities.STRONG_JAW, Abilities.NONE, Abilities.STURDY, 362, 58, 89, 77, 45, 45, 48, 45, 50, 72, GrowthRate.MEDIUM_FAST, 87.5, false),
+    new PokemonSpecies(Species.TYRANTRUM, 6, false, false, false, "Despot Pokémon", PokemonType.ROCK, PokemonType.DRAGON, 2.5, 270, Abilities.STRONG_JAW, Abilities.NONE, Abilities.ROCK_HEAD, 521, 82, 121, 119, 69, 59, 71, 45, 50, 182, GrowthRate.MEDIUM_FAST, 87.5, false),
+    new PokemonSpecies(Species.AMAURA, 6, false, false, false, "Tundra Pokémon", PokemonType.ROCK, PokemonType.ICE, 1.3, 25.2, Abilities.REFRIGERATE, Abilities.NONE, Abilities.SNOW_WARNING, 362, 77, 59, 50, 67, 63, 46, 45, 50, 72, GrowthRate.MEDIUM_FAST, 87.5, false),
+    new PokemonSpecies(Species.AURORUS, 6, false, false, false, "Tundra Pokémon", PokemonType.ROCK, PokemonType.ICE, 2.7, 225, Abilities.REFRIGERATE, Abilities.NONE, Abilities.SNOW_WARNING, 521, 123, 77, 72, 99, 92, 58, 45, 50, 104, GrowthRate.MEDIUM_FAST, 87.5, false),
+    new PokemonSpecies(Species.SYLVEON, 6, false, false, false, "Intertwining Pokémon", PokemonType.FAIRY, null, 1, 23.5, Abilities.CUTE_CHARM, Abilities.NONE, Abilities.PIXILATE, 525, 95, 65, 65, 110, 130, 60, 45, 50, 184, GrowthRate.MEDIUM_FAST, 87.5, false),
+    new PokemonSpecies(Species.HAWLUCHA, 6, false, false, false, "Wrestling Pokémon", PokemonType.FIGHTING, PokemonType.FLYING, 0.8, 21.5, Abilities.LIMBER, Abilities.UNBURDEN, Abilities.MOLD_BREAKER, 500, 78, 92, 75, 74, 63, 118, 100, 50, 175, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.DEDENNE, 6, false, false, false, "Antenna Pokémon", PokemonType.ELECTRIC, PokemonType.FAIRY, 0.2, 2.2, Abilities.CHEEK_POUCH, Abilities.PICKUP, Abilities.PLUS, 431, 67, 58, 57, 81, 67, 101, 180, 50, 151, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.CARBINK, 6, false, false, false, "Jewel Pokémon", PokemonType.ROCK, PokemonType.FAIRY, 0.3, 5.7, Abilities.CLEAR_BODY, Abilities.NONE, Abilities.STURDY, 500, 50, 50, 150, 50, 150, 50, 60, 50, 100, GrowthRate.SLOW, null, false),
+    new PokemonSpecies(Species.GOOMY, 6, false, false, false, "Soft Tissue Pokémon", PokemonType.DRAGON, null, 0.3, 2.8, Abilities.SAP_SIPPER, Abilities.HYDRATION, Abilities.GOOEY, 300, 45, 50, 35, 55, 75, 40, 45, 35, 60, GrowthRate.SLOW, 50, false),
+    new PokemonSpecies(Species.SLIGGOO, 6, false, false, false, "Soft Tissue Pokémon", PokemonType.DRAGON, null, 0.8, 17.5, Abilities.SAP_SIPPER, Abilities.HYDRATION, Abilities.GOOEY, 452, 68, 75, 53, 83, 113, 60, 45, 35, 158, GrowthRate.SLOW, 50, false),
+    new PokemonSpecies(Species.GOODRA, 6, false, false, false, "Dragon Pokémon", PokemonType.DRAGON, null, 2, 150.5, Abilities.SAP_SIPPER, Abilities.HYDRATION, Abilities.GOOEY, 600, 90, 100, 70, 110, 150, 80, 45, 35, 300, GrowthRate.SLOW, 50, false),
+    new PokemonSpecies(Species.KLEFKI, 6, false, false, false, "Key Ring Pokémon", PokemonType.STEEL, PokemonType.FAIRY, 0.2, 3, Abilities.PRANKSTER, Abilities.NONE, Abilities.MAGICIAN, 470, 57, 80, 91, 80, 87, 75, 75, 50, 165, GrowthRate.FAST, 50, false),
+    new PokemonSpecies(Species.PHANTUMP, 6, false, false, false, "Stump Pokémon", PokemonType.GHOST, PokemonType.GRASS, 0.4, 7, Abilities.NATURAL_CURE, Abilities.FRISK, Abilities.HARVEST, 309, 43, 70, 48, 50, 60, 38, 120, 50, 62, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.TREVENANT, 6, false, false, false, "Elder Tree Pokémon", PokemonType.GHOST, PokemonType.GRASS, 1.5, 71, Abilities.NATURAL_CURE, Abilities.FRISK, Abilities.HARVEST, 474, 85, 110, 76, 65, 82, 56, 60, 50, 166, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.PUMPKABOO, 6, false, false, false, "Pumpkin Pokémon", PokemonType.GHOST, PokemonType.GRASS, 0.4, 5, Abilities.PICKUP, Abilities.FRISK, Abilities.INSOMNIA, 335, 49, 66, 70, 44, 55, 51, 120, 50, 67, GrowthRate.MEDIUM_FAST, 50, false, false,
+      new PokemonForm("Average Size", "", PokemonType.GHOST, PokemonType.GRASS, 0.4, 5, Abilities.PICKUP, Abilities.FRISK, Abilities.INSOMNIA, 335, 49, 66, 70, 44, 55, 51, 120, 50, 67, false, null, true),
+      new PokemonForm("Small Size", "small", PokemonType.GHOST, PokemonType.GRASS, 0.3, 3.5, Abilities.PICKUP, Abilities.FRISK, Abilities.INSOMNIA, 335, 44, 66, 70, 44, 55, 56, 120, 50, 67, false, "", true),
+      new PokemonForm("Large Size", "large", PokemonType.GHOST, PokemonType.GRASS, 0.5, 7.5, Abilities.PICKUP, Abilities.FRISK, Abilities.INSOMNIA, 335, 54, 66, 70, 44, 55, 46, 120, 50, 67, false, "", true),
+      new PokemonForm("Super Size", "super", PokemonType.GHOST, PokemonType.GRASS, 0.8, 15, Abilities.PICKUP, Abilities.FRISK, Abilities.INSOMNIA, 335, 59, 66, 70, 44, 55, 41, 120, 50, 67, false, "", true),
+    ),
+    new PokemonSpecies(Species.GOURGEIST, 6, false, false, false, "Pumpkin Pokémon", PokemonType.GHOST, PokemonType.GRASS, 0.9, 12.5, Abilities.PICKUP, Abilities.FRISK, Abilities.INSOMNIA, 494, 65, 90, 122, 58, 75, 84, 60, 50, 173, GrowthRate.MEDIUM_FAST, 50, false, false,
+      new PokemonForm("Average Size", "", PokemonType.GHOST, PokemonType.GRASS, 0.9, 12.5, Abilities.PICKUP, Abilities.FRISK, Abilities.INSOMNIA, 494, 65, 90, 122, 58, 75, 84, 60, 50, 173, false, null, true),
+      new PokemonForm("Small Size", "small", PokemonType.GHOST, PokemonType.GRASS, 0.7, 9.5, Abilities.PICKUP, Abilities.FRISK, Abilities.INSOMNIA, 494, 55, 85, 122, 58, 75, 99, 60, 50, 173, false, "", true),
+      new PokemonForm("Large Size", "large", PokemonType.GHOST, PokemonType.GRASS, 1.1, 14, Abilities.PICKUP, Abilities.FRISK, Abilities.INSOMNIA, 494, 75, 95, 122, 58, 75, 69, 60, 50, 173, false, "", true),
+      new PokemonForm("Super Size", "super", PokemonType.GHOST, PokemonType.GRASS, 1.7, 39, Abilities.PICKUP, Abilities.FRISK, Abilities.INSOMNIA, 494, 85, 100, 122, 58, 75, 54, 60, 50, 173, false, "", true),
+    ),
+    new PokemonSpecies(Species.BERGMITE, 6, false, false, false, "Ice Chunk Pokémon", PokemonType.ICE, null, 1, 99.5, Abilities.OWN_TEMPO, Abilities.ICE_BODY, Abilities.STURDY, 304, 55, 69, 85, 32, 35, 28, 190, 50, 61, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.AVALUGG, 6, false, false, false, "Iceberg Pokémon", PokemonType.ICE, null, 2, 505, Abilities.OWN_TEMPO, Abilities.ICE_BODY, Abilities.STURDY, 514, 95, 117, 184, 44, 46, 28, 55, 50, 180, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.NOIBAT, 6, false, false, false, "Sound Wave Pokémon", PokemonType.FLYING, PokemonType.DRAGON, 0.5, 8, Abilities.FRISK, Abilities.INFILTRATOR, Abilities.TELEPATHY, 245, 40, 30, 35, 45, 40, 55, 190, 50, 49, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.NOIVERN, 6, false, false, false, "Sound Wave Pokémon", PokemonType.FLYING, PokemonType.DRAGON, 1.5, 85, Abilities.FRISK, Abilities.INFILTRATOR, Abilities.TELEPATHY, 535, 85, 70, 80, 97, 80, 123, 45, 50, 187, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.XERNEAS, 6, false, true, false, "Life Pokémon", PokemonType.FAIRY, null, 3, 215, Abilities.FAIRY_AURA, Abilities.NONE, Abilities.NONE, 680, 126, 131, 95, 131, 98, 99, 45, 0, 340, GrowthRate.SLOW, null, false, true,
+      new PokemonForm("Neutral Mode", "neutral", PokemonType.FAIRY, null, 3, 215, Abilities.FAIRY_AURA, Abilities.NONE, Abilities.NONE, 680, 126, 131, 95, 131, 98, 99, 45, 0, 340, false, null, true),
+      new PokemonForm("Active Mode", "active", PokemonType.FAIRY, null, 3, 215, Abilities.FAIRY_AURA, Abilities.NONE, Abilities.NONE, 680, 126, 131, 95, 131, 98, 99, 45, 0, 340)
+    ),
+    new PokemonSpecies(Species.YVELTAL, 6, false, true, false, "Destruction Pokémon", PokemonType.DARK, PokemonType.FLYING, 5.8, 203, Abilities.DARK_AURA, Abilities.NONE, Abilities.NONE, 680, 126, 131, 95, 131, 98, 99, 45, 0, 340, GrowthRate.SLOW, null, false),
+    new PokemonSpecies(Species.ZYGARDE, 6, false, true, false, "Order Pokémon", PokemonType.DRAGON, PokemonType.GROUND, 5, 305, Abilities.AURA_BREAK, Abilities.NONE, Abilities.NONE, 600, 108, 100, 121, 81, 95, 95, 3, 0, 300, GrowthRate.SLOW, null, false, false,
+      new PokemonForm("50% Forme", "50", PokemonType.DRAGON, PokemonType.GROUND, 5, 305, Abilities.AURA_BREAK, Abilities.NONE, Abilities.NONE, 600, 108, 100, 121, 81, 95, 95, 3, 0, 300, false, "", true),
+      new PokemonForm("10% Forme", "10", PokemonType.DRAGON, PokemonType.GROUND, 1.2, 33.5, Abilities.AURA_BREAK, Abilities.NONE, Abilities.NONE, 486, 54, 100, 71, 61, 85, 115, 3, 0, 243, false, null, true),
+      new PokemonForm("50% Forme Power Construct", "50-pc", PokemonType.DRAGON, PokemonType.GROUND, 5, 305, Abilities.POWER_CONSTRUCT, Abilities.NONE, Abilities.NONE, 600, 108, 100, 121, 81, 95, 95, 3, 0, 300, false, "", true),
+      new PokemonForm("10% Forme Power Construct", "10-pc", PokemonType.DRAGON, PokemonType.GROUND, 1.2, 33.5, Abilities.POWER_CONSTRUCT, Abilities.NONE, Abilities.NONE, 486, 54, 100, 71, 61, 85, 115, 3, 0, 243, false, "10", true),
+      new PokemonForm("Complete Forme (50% PC)", "complete", PokemonType.DRAGON, PokemonType.GROUND, 4.5, 610, Abilities.POWER_CONSTRUCT, Abilities.NONE, Abilities.NONE, 708, 216, 100, 121, 91, 95, 85, 3, 0, 354),
+      new PokemonForm("Complete Forme (10% PC)", "10-complete", PokemonType.DRAGON, PokemonType.GROUND, 4.5, 610, Abilities.POWER_CONSTRUCT, Abilities.NONE, Abilities.NONE, 708, 216, 100, 121, 91, 95, 85, 3, 0, 354, false, "complete"),
+    ),
+    new PokemonSpecies(Species.DIANCIE, 6, false, false, true, "Jewel Pokémon", PokemonType.ROCK, PokemonType.FAIRY, 0.7, 8.8, Abilities.CLEAR_BODY, Abilities.NONE, Abilities.NONE, 600, 50, 100, 150, 100, 150, 50, 3, 50, 300, GrowthRate.SLOW, null, false, true,
+      new PokemonForm("Normal", "", PokemonType.ROCK, PokemonType.FAIRY, 0.7, 8.8, Abilities.CLEAR_BODY, Abilities.NONE, Abilities.NONE, 600, 50, 100, 150, 100, 150, 50, 3, 50, 300, false, null, true),
+      new PokemonForm("Mega", SpeciesFormKey.MEGA, PokemonType.ROCK, PokemonType.FAIRY, 1.1, 27.8, Abilities.MAGIC_BOUNCE, Abilities.NONE, Abilities.NONE, 700, 50, 160, 110, 160, 110, 110, 3, 50, 300),
+    ),
+    new PokemonSpecies(Species.HOOPA, 6, false, false, true, "Mischief Pokémon", PokemonType.PSYCHIC, PokemonType.GHOST, 0.5, 9, Abilities.MAGICIAN, Abilities.NONE, Abilities.NONE, 600, 80, 110, 60, 150, 130, 70, 3, 100, 300, GrowthRate.SLOW, null, false, false,
+      new PokemonForm("Hoopa Confined", "", PokemonType.PSYCHIC, PokemonType.GHOST, 0.5, 9, Abilities.MAGICIAN, Abilities.NONE, Abilities.NONE, 600, 80, 110, 60, 150, 130, 70, 3, 100, 300, false, null, true),
+      new PokemonForm("Hoopa Unbound", "unbound", PokemonType.PSYCHIC, PokemonType.DARK, 6.5, 490, Abilities.MAGICIAN, Abilities.NONE, Abilities.NONE, 680, 80, 160, 60, 170, 130, 80, 3, 100, 340),
+    ),
+    new PokemonSpecies(Species.VOLCANION, 6, false, false, true, "Steam Pokémon", PokemonType.FIRE, PokemonType.WATER, 1.7, 195, Abilities.WATER_ABSORB, Abilities.NONE, Abilities.NONE, 600, 80, 110, 120, 130, 90, 70, 3, 100, 300, GrowthRate.SLOW, null, false),
+    new PokemonSpecies(Species.ROWLET, 7, false, false, false, "Grass Quill Pokémon", PokemonType.GRASS, PokemonType.FLYING, 0.3, 1.5, Abilities.OVERGROW, Abilities.NONE, Abilities.LONG_REACH, 320, 68, 55, 55, 50, 50, 42, 45, 50, 64, GrowthRate.MEDIUM_SLOW, 87.5, false),
+    new PokemonSpecies(Species.DARTRIX, 7, false, false, false, "Blade Quill Pokémon", PokemonType.GRASS, PokemonType.FLYING, 0.7, 16, Abilities.OVERGROW, Abilities.NONE, Abilities.LONG_REACH, 420, 78, 75, 75, 70, 70, 52, 45, 50, 147, GrowthRate.MEDIUM_SLOW, 87.5, false),
+    new PokemonSpecies(Species.DECIDUEYE, 7, false, false, false, "Arrow Quill Pokémon", PokemonType.GRASS, PokemonType.GHOST, 1.6, 36.6, Abilities.OVERGROW, Abilities.NONE, Abilities.LONG_REACH, 530, 78, 107, 75, 100, 100, 70, 45, 50, 265, GrowthRate.MEDIUM_SLOW, 87.5, false),
+    new PokemonSpecies(Species.LITTEN, 7, false, false, false, "Fire Cat Pokémon", PokemonType.FIRE, null, 0.4, 4.3, Abilities.BLAZE, Abilities.NONE, Abilities.INTIMIDATE, 320, 45, 65, 40, 60, 40, 70, 45, 50, 64, GrowthRate.MEDIUM_SLOW, 87.5, false),
+    new PokemonSpecies(Species.TORRACAT, 7, false, false, false, "Fire Cat Pokémon", PokemonType.FIRE, null, 0.7, 25, Abilities.BLAZE, Abilities.NONE, Abilities.INTIMIDATE, 420, 65, 85, 50, 80, 50, 90, 45, 50, 147, GrowthRate.MEDIUM_SLOW, 87.5, false),
+    new PokemonSpecies(Species.INCINEROAR, 7, false, false, false, "Heel Pokémon", PokemonType.FIRE, PokemonType.DARK, 1.8, 83, Abilities.BLAZE, Abilities.NONE, Abilities.INTIMIDATE, 530, 95, 115, 90, 80, 90, 60, 45, 50, 265, GrowthRate.MEDIUM_SLOW, 87.5, false),
+    new PokemonSpecies(Species.POPPLIO, 7, false, false, false, "Sea Lion Pokémon", PokemonType.WATER, null, 0.4, 7.5, Abilities.TORRENT, Abilities.NONE, Abilities.LIQUID_VOICE, 320, 50, 54, 54, 66, 56, 40, 45, 50, 64, GrowthRate.MEDIUM_SLOW, 87.5, false),
+    new PokemonSpecies(Species.BRIONNE, 7, false, false, false, "Pop Star Pokémon", PokemonType.WATER, null, 0.6, 17.5, Abilities.TORRENT, Abilities.NONE, Abilities.LIQUID_VOICE, 420, 60, 69, 69, 91, 81, 50, 45, 50, 147, GrowthRate.MEDIUM_SLOW, 87.5, false),
+    new PokemonSpecies(Species.PRIMARINA, 7, false, false, false, "Soloist Pokémon", PokemonType.WATER, PokemonType.FAIRY, 1.8, 44, Abilities.TORRENT, Abilities.NONE, Abilities.LIQUID_VOICE, 530, 80, 74, 74, 126, 116, 60, 45, 50, 265, GrowthRate.MEDIUM_SLOW, 87.5, false),
+    new PokemonSpecies(Species.PIKIPEK, 7, false, false, false, "Woodpecker Pokémon", PokemonType.NORMAL, PokemonType.FLYING, 0.3, 1.2, Abilities.KEEN_EYE, Abilities.SKILL_LINK, Abilities.PICKUP, 265, 35, 75, 30, 30, 30, 65, 255, 70, 53, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.TRUMBEAK, 7, false, false, false, "Bugle Beak Pokémon", PokemonType.NORMAL, PokemonType.FLYING, 0.6, 14.8, Abilities.KEEN_EYE, Abilities.SKILL_LINK, Abilities.PICKUP, 355, 55, 85, 50, 40, 50, 75, 120, 70, 124, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.TOUCANNON, 7, false, false, false, "Cannon Pokémon", PokemonType.NORMAL, PokemonType.FLYING, 1.1, 26, Abilities.KEEN_EYE, Abilities.SKILL_LINK, Abilities.SHEER_FORCE, 485, 80, 120, 75, 75, 75, 60, 45, 70, 243, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.YUNGOOS, 7, false, false, false, "Loitering Pokémon", PokemonType.NORMAL, null, 0.4, 6, Abilities.STAKEOUT, Abilities.STRONG_JAW, Abilities.ADAPTABILITY, 253, 48, 70, 30, 30, 30, 45, 255, 70, 51, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.GUMSHOOS, 7, false, false, false, "Stakeout Pokémon", PokemonType.NORMAL, null, 0.7, 14.2, Abilities.STAKEOUT, Abilities.STRONG_JAW, Abilities.ADAPTABILITY, 418, 88, 110, 60, 55, 60, 45, 127, 70, 146, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.GRUBBIN, 7, false, false, false, "Larva Pokémon", PokemonType.BUG, null, 0.4, 4.4, Abilities.SWARM, Abilities.NONE, Abilities.NONE, 300, 47, 62, 45, 55, 45, 46, 255, 50, 60, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.CHARJABUG, 7, false, false, false, "Battery Pokémon", PokemonType.BUG, PokemonType.ELECTRIC, 0.5, 10.5, Abilities.BATTERY, Abilities.NONE, Abilities.NONE, 400, 57, 82, 95, 55, 75, 36, 120, 50, 140, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.VIKAVOLT, 7, false, false, false, "Stag Beetle Pokémon", PokemonType.BUG, PokemonType.ELECTRIC, 1.5, 45, Abilities.LEVITATE, Abilities.NONE, Abilities.NONE, 500, 77, 70, 90, 145, 75, 43, 45, 50, 250, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.CRABRAWLER, 7, false, false, false, "Boxing Pokémon", PokemonType.FIGHTING, null, 0.6, 7, Abilities.HYPER_CUTTER, Abilities.IRON_FIST, Abilities.ANGER_POINT, 338, 47, 82, 57, 42, 47, 63, 225, 70, 68, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.CRABOMINABLE, 7, false, false, false, "Woolly Crab Pokémon", PokemonType.FIGHTING, PokemonType.ICE, 1.7, 180, Abilities.HYPER_CUTTER, Abilities.IRON_FIST, Abilities.ANGER_POINT, 478, 97, 132, 77, 62, 67, 43, 60, 70, 167, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.ORICORIO, 7, false, false, false, "Dancing Pokémon", PokemonType.FIRE, PokemonType.FLYING, 0.6, 3.4, Abilities.DANCER, Abilities.NONE, Abilities.NONE, 476, 75, 70, 70, 98, 70, 93, 45, 70, 167, GrowthRate.MEDIUM_FAST, 25, false, false,
+      new PokemonForm("Baile Style", "baile", PokemonType.FIRE, PokemonType.FLYING, 0.6, 3.4, Abilities.DANCER, Abilities.NONE, Abilities.NONE, 476, 75, 70, 70, 98, 70, 93, 45, 70, 167, false, "", true),
+      new PokemonForm("Pom-Pom Style", "pompom", PokemonType.ELECTRIC, PokemonType.FLYING, 0.6, 3.4, Abilities.DANCER, Abilities.NONE, Abilities.NONE, 476, 75, 70, 70, 98, 70, 93, 45, 70, 167, false, null, true),
+      new PokemonForm("Pau Style", "pau", PokemonType.PSYCHIC, PokemonType.FLYING, 0.6, 3.4, Abilities.DANCER, Abilities.NONE, Abilities.NONE, 476, 75, 70, 70, 98, 70, 93, 45, 70, 167, false, null, true),
+      new PokemonForm("Sensu Style", "sensu", PokemonType.GHOST, PokemonType.FLYING, 0.6, 3.4, Abilities.DANCER, Abilities.NONE, Abilities.NONE, 476, 75, 70, 70, 98, 70, 93, 45, 70, 167, false, null, true),
+    ),
+    new PokemonSpecies(Species.CUTIEFLY, 7, false, false, false, "Bee Fly Pokémon", PokemonType.BUG, PokemonType.FAIRY, 0.1, 0.2, Abilities.HONEY_GATHER, Abilities.SHIELD_DUST, Abilities.SWEET_VEIL, 304, 40, 45, 40, 55, 40, 84, 190, 50, 61, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.RIBOMBEE, 7, false, false, false, "Bee Fly Pokémon", PokemonType.BUG, PokemonType.FAIRY, 0.2, 0.5, Abilities.HONEY_GATHER, Abilities.SHIELD_DUST, Abilities.SWEET_VEIL, 464, 60, 55, 60, 95, 70, 124, 75, 50, 162, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.ROCKRUFF, 7, false, false, false, "Puppy Pokémon", PokemonType.ROCK, null, 0.5, 9.2, Abilities.KEEN_EYE, Abilities.VITAL_SPIRIT, Abilities.STEADFAST, 280, 45, 65, 40, 30, 40, 60, 190, 50, 56, GrowthRate.MEDIUM_FAST, 50, false, false,
+      new PokemonForm("Normal", "", PokemonType.ROCK, null, 0.5, 9.2, Abilities.KEEN_EYE, Abilities.VITAL_SPIRIT, Abilities.STEADFAST, 280, 45, 65, 40, 30, 40, 60, 190, 50, 56, false, null, true),
+      new PokemonForm("Own Tempo", "own-tempo", PokemonType.ROCK, null, 0.5, 9.2, Abilities.OWN_TEMPO, Abilities.NONE, Abilities.OWN_TEMPO, 280, 45, 65, 40, 30, 40, 60, 190, 50, 56, false, "", true),
+    ),
+    new PokemonSpecies(Species.LYCANROC, 7, false, false, false, "Wolf Pokémon", PokemonType.ROCK, null, 0.8, 25, Abilities.KEEN_EYE, Abilities.SAND_RUSH, Abilities.STEADFAST, 487, 75, 115, 65, 55, 65, 112, 90, 50, 170, GrowthRate.MEDIUM_FAST, 50, false, false,
+      new PokemonForm("Midday Form", "midday", PokemonType.ROCK, null, 0.8, 25, Abilities.KEEN_EYE, Abilities.SAND_RUSH, Abilities.STEADFAST, 487, 75, 115, 65, 55, 65, 112, 90, 50, 170, false, "", true),
+      new PokemonForm("Midnight Form", "midnight", PokemonType.ROCK, null, 1.1, 25, Abilities.KEEN_EYE, Abilities.VITAL_SPIRIT, Abilities.NO_GUARD, 487, 85, 115, 75, 55, 75, 82, 90, 50, 170, false, null, true),
+      new PokemonForm("Dusk Form", "dusk", PokemonType.ROCK, null, 0.8, 25, Abilities.TOUGH_CLAWS, Abilities.TOUGH_CLAWS, Abilities.TOUGH_CLAWS, 487, 75, 117, 65, 55, 65, 110, 90, 50, 170, false, null, true),
+    ),
+    new PokemonSpecies(Species.WISHIWASHI, 7, false, false, false, "Small Fry Pokémon", PokemonType.WATER, null, 0.2, 0.3, Abilities.SCHOOLING, Abilities.NONE, Abilities.NONE, 175, 45, 20, 20, 25, 25, 40, 60, 50, 61, GrowthRate.FAST, 50, false, false,
+      new PokemonForm("Solo Form", "", PokemonType.WATER, null, 0.2, 0.3, Abilities.SCHOOLING, Abilities.NONE, Abilities.NONE, 175, 45, 20, 20, 25, 25, 40, 60, 50, 61, false, null, true),
+      new PokemonForm("School", "school", PokemonType.WATER, null, 8.2, 78.6, Abilities.SCHOOLING, Abilities.NONE, Abilities.NONE, 620, 45, 140, 130, 140, 135, 30, 60, 50, 217),
+    ),
+    new PokemonSpecies(Species.MAREANIE, 7, false, false, false, "Brutal Star Pokémon", PokemonType.POISON, PokemonType.WATER, 0.4, 8, Abilities.MERCILESS, Abilities.LIMBER, Abilities.REGENERATOR, 305, 50, 53, 62, 43, 52, 45, 190, 50, 61, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.TOXAPEX, 7, false, false, false, "Brutal Star Pokémon", PokemonType.POISON, PokemonType.WATER, 0.7, 14.5, Abilities.MERCILESS, Abilities.LIMBER, Abilities.REGENERATOR, 495, 50, 63, 152, 53, 142, 35, 75, 50, 173, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.MUDBRAY, 7, false, false, false, "Donkey Pokémon", PokemonType.GROUND, null, 1, 110, Abilities.OWN_TEMPO, Abilities.STAMINA, Abilities.INNER_FOCUS, 385, 70, 100, 70, 45, 55, 45, 190, 50, 77, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.MUDSDALE, 7, false, false, false, "Draft Horse Pokémon", PokemonType.GROUND, null, 2.5, 920, Abilities.OWN_TEMPO, Abilities.STAMINA, Abilities.INNER_FOCUS, 500, 100, 125, 100, 55, 85, 35, 60, 50, 175, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.DEWPIDER, 7, false, false, false, "Water Bubble Pokémon", PokemonType.WATER, PokemonType.BUG, 0.3, 4, Abilities.WATER_BUBBLE, Abilities.NONE, Abilities.WATER_ABSORB, 269, 38, 40, 52, 40, 72, 27, 200, 50, 54, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.ARAQUANID, 7, false, false, false, "Water Bubble Pokémon", PokemonType.WATER, PokemonType.BUG, 1.8, 82, Abilities.WATER_BUBBLE, Abilities.NONE, Abilities.WATER_ABSORB, 454, 68, 70, 92, 50, 132, 42, 100, 50, 159, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.FOMANTIS, 7, false, false, false, "Sickle Grass Pokémon", PokemonType.GRASS, null, 0.3, 1.5, Abilities.LEAF_GUARD, Abilities.NONE, Abilities.CONTRARY, 250, 40, 55, 35, 50, 35, 35, 190, 50, 50, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.LURANTIS, 7, false, false, false, "Bloom Sickle Pokémon", PokemonType.GRASS, null, 0.9, 18.5, Abilities.LEAF_GUARD, Abilities.NONE, Abilities.CONTRARY, 480, 70, 105, 90, 80, 90, 45, 75, 50, 168, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.MORELULL, 7, false, false, false, "Illuminating Pokémon", PokemonType.GRASS, PokemonType.FAIRY, 0.2, 1.5, Abilities.ILLUMINATE, Abilities.EFFECT_SPORE, Abilities.RAIN_DISH, 285, 40, 35, 55, 65, 75, 15, 190, 50, 57, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.SHIINOTIC, 7, false, false, false, "Illuminating Pokémon", PokemonType.GRASS, PokemonType.FAIRY, 1, 11.5, Abilities.ILLUMINATE, Abilities.EFFECT_SPORE, Abilities.RAIN_DISH, 405, 60, 45, 80, 90, 100, 30, 75, 50, 142, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.SALANDIT, 7, false, false, false, "Toxic Lizard Pokémon", PokemonType.POISON, PokemonType.FIRE, 0.6, 4.8, Abilities.CORROSION, Abilities.NONE, Abilities.OBLIVIOUS, 320, 48, 44, 40, 71, 40, 77, 120, 50, 64, GrowthRate.MEDIUM_FAST, 87.5, false),
+    new PokemonSpecies(Species.SALAZZLE, 7, false, false, false, "Toxic Lizard Pokémon", PokemonType.POISON, PokemonType.FIRE, 1.2, 22.2, Abilities.CORROSION, Abilities.NONE, Abilities.OBLIVIOUS, 480, 68, 64, 60, 111, 60, 117, 45, 50, 168, GrowthRate.MEDIUM_FAST, 0, false),
+    new PokemonSpecies(Species.STUFFUL, 7, false, false, false, "Flailing Pokémon", PokemonType.NORMAL, PokemonType.FIGHTING, 0.5, 6.8, Abilities.FLUFFY, Abilities.KLUTZ, Abilities.CUTE_CHARM, 340, 70, 75, 50, 45, 50, 50, 140, 50, 68, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.BEWEAR, 7, false, false, false, "Strong Arm Pokémon", PokemonType.NORMAL, PokemonType.FIGHTING, 2.1, 135, Abilities.FLUFFY, Abilities.KLUTZ, Abilities.UNNERVE, 500, 120, 125, 80, 55, 60, 60, 70, 50, 175, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.BOUNSWEET, 7, false, false, false, "Fruit Pokémon", PokemonType.GRASS, null, 0.3, 3.2, Abilities.LEAF_GUARD, Abilities.OBLIVIOUS, Abilities.SWEET_VEIL, 210, 42, 30, 38, 30, 38, 32, 235, 50, 42, GrowthRate.MEDIUM_SLOW, 0, false),
+    new PokemonSpecies(Species.STEENEE, 7, false, false, false, "Fruit Pokémon", PokemonType.GRASS, null, 0.7, 8.2, Abilities.LEAF_GUARD, Abilities.OBLIVIOUS, Abilities.SWEET_VEIL, 290, 52, 40, 48, 40, 48, 62, 120, 50, 102, GrowthRate.MEDIUM_SLOW, 0, false),
+    new PokemonSpecies(Species.TSAREENA, 7, false, false, false, "Fruit Pokémon", PokemonType.GRASS, null, 1.2, 21.4, Abilities.LEAF_GUARD, Abilities.QUEENLY_MAJESTY, Abilities.SWEET_VEIL, 510, 72, 120, 98, 50, 98, 72, 45, 50, 255, GrowthRate.MEDIUM_SLOW, 0, false),
+    new PokemonSpecies(Species.COMFEY, 7, false, false, false, "Posy Picker Pokémon", PokemonType.FAIRY, null, 0.1, 0.3, Abilities.FLOWER_VEIL, Abilities.TRIAGE, Abilities.NATURAL_CURE, 485, 51, 52, 90, 82, 110, 100, 60, 50, 170, GrowthRate.FAST, 25, false),
+    new PokemonSpecies(Species.ORANGURU, 7, false, false, false, "Sage Pokémon", PokemonType.NORMAL, PokemonType.PSYCHIC, 1.5, 76, Abilities.INNER_FOCUS, Abilities.TELEPATHY, Abilities.SYMBIOSIS, 490, 90, 60, 80, 90, 110, 60, 45, 50, 172, GrowthRate.SLOW, 50, false),
+    new PokemonSpecies(Species.PASSIMIAN, 7, false, false, false, "Teamwork Pokémon", PokemonType.FIGHTING, null, 2, 82.8, Abilities.RECEIVER, Abilities.NONE, Abilities.DEFIANT, 490, 100, 120, 90, 40, 60, 80, 45, 50, 172, GrowthRate.SLOW, 50, false),
+    new PokemonSpecies(Species.WIMPOD, 7, false, false, false, "Turn Tail Pokémon", PokemonType.BUG, PokemonType.WATER, 0.5, 12, Abilities.WIMP_OUT, Abilities.NONE, Abilities.RUN_AWAY, 230, 25, 35, 40, 20, 30, 80, 90, 50, 46, GrowthRate.MEDIUM_FAST, 50, false), //Custom Hidden
+    new PokemonSpecies(Species.GOLISOPOD, 7, false, false, false, "Hard Scale Pokémon", PokemonType.BUG, PokemonType.WATER, 2, 108, Abilities.EMERGENCY_EXIT, Abilities.NONE, Abilities.ANTICIPATION, 530, 75, 125, 140, 60, 90, 40, 45, 50, 186, GrowthRate.MEDIUM_FAST, 50, false), //Custom Hidden
+    new PokemonSpecies(Species.SANDYGAST, 7, false, false, false, "Sand Heap Pokémon", PokemonType.GHOST, PokemonType.GROUND, 0.5, 70, Abilities.WATER_COMPACTION, Abilities.NONE, Abilities.SAND_VEIL, 320, 55, 55, 80, 70, 45, 15, 140, 50, 64, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.PALOSSAND, 7, false, false, false, "Sand Castle Pokémon", PokemonType.GHOST, PokemonType.GROUND, 1.3, 250, Abilities.WATER_COMPACTION, Abilities.NONE, Abilities.SAND_VEIL, 480, 85, 75, 110, 100, 75, 35, 60, 50, 168, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.PYUKUMUKU, 7, false, false, false, "Sea Cucumber Pokémon", PokemonType.WATER, null, 0.3, 1.2, Abilities.INNARDS_OUT, Abilities.NONE, Abilities.UNAWARE, 410, 55, 60, 130, 30, 130, 5, 60, 50, 144, GrowthRate.FAST, 50, false),
+    new PokemonSpecies(Species.TYPE_NULL, 7, true, false, false, "Synthetic Pokémon", PokemonType.NORMAL, null, 1.9, 120.5, Abilities.BATTLE_ARMOR, Abilities.NONE, Abilities.NONE, 534, 95, 95, 95, 95, 95, 59, 3, 0, 107, GrowthRate.SLOW, null, false),
+    new PokemonSpecies(Species.SILVALLY, 7, true, false, false, "Synthetic Pokémon", PokemonType.NORMAL, null, 2.3, 100.5, Abilities.RKS_SYSTEM, Abilities.NONE, Abilities.NONE, 570, 95, 95, 95, 95, 95, 95, 3, 0, 285, GrowthRate.SLOW, null, false, false,
+      new PokemonForm("Type: Normal", "normal", PokemonType.NORMAL, null, 2.3, 100.5, Abilities.RKS_SYSTEM, Abilities.NONE, Abilities.NONE, 570, 95, 95, 95, 95, 95, 95, 3, 0, 285, false, "", true),
+      new PokemonForm("Type: Fighting", "fighting", PokemonType.FIGHTING, null, 2.3, 100.5, Abilities.RKS_SYSTEM, Abilities.NONE, Abilities.NONE, 570, 95, 95, 95, 95, 95, 95, 3, 0, 285),
+      new PokemonForm("Type: Flying", "flying", PokemonType.FLYING, null, 2.3, 100.5, Abilities.RKS_SYSTEM, Abilities.NONE, Abilities.NONE, 570, 95, 95, 95, 95, 95, 95, 3, 0, 285),
+      new PokemonForm("Type: Poison", "poison", PokemonType.POISON, null, 2.3, 100.5, Abilities.RKS_SYSTEM, Abilities.NONE, Abilities.NONE, 570, 95, 95, 95, 95, 95, 95, 3, 0, 285),
+      new PokemonForm("Type: Ground", "ground", PokemonType.GROUND, null, 2.3, 100.5, Abilities.RKS_SYSTEM, Abilities.NONE, Abilities.NONE, 570, 95, 95, 95, 95, 95, 95, 3, 0, 285),
+      new PokemonForm("Type: Rock", "rock", PokemonType.ROCK, null, 2.3, 100.5, Abilities.RKS_SYSTEM, Abilities.NONE, Abilities.NONE, 570, 95, 95, 95, 95, 95, 95, 3, 0, 285),
+      new PokemonForm("Type: Bug", "bug", PokemonType.BUG, null, 2.3, 100.5, Abilities.RKS_SYSTEM, Abilities.NONE, Abilities.NONE, 570, 95, 95, 95, 95, 95, 95, 3, 0, 285),
+      new PokemonForm("Type: Ghost", "ghost", PokemonType.GHOST, null, 2.3, 100.5, Abilities.RKS_SYSTEM, Abilities.NONE, Abilities.NONE, 570, 95, 95, 95, 95, 95, 95, 3, 0, 285),
+      new PokemonForm("Type: Steel", "steel", PokemonType.STEEL, null, 2.3, 100.5, Abilities.RKS_SYSTEM, Abilities.NONE, Abilities.NONE, 570, 95, 95, 95, 95, 95, 95, 3, 0, 285),
+      new PokemonForm("Type: Fire", "fire", PokemonType.FIRE, null, 2.3, 100.5, Abilities.RKS_SYSTEM, Abilities.NONE, Abilities.NONE, 570, 95, 95, 95, 95, 95, 95, 3, 0, 285),
+      new PokemonForm("Type: Water", "water", PokemonType.WATER, null, 2.3, 100.5, Abilities.RKS_SYSTEM, Abilities.NONE, Abilities.NONE, 570, 95, 95, 95, 95, 95, 95, 3, 0, 285),
+      new PokemonForm("Type: Grass", "grass", PokemonType.GRASS, null, 2.3, 100.5, Abilities.RKS_SYSTEM, Abilities.NONE, Abilities.NONE, 570, 95, 95, 95, 95, 95, 95, 3, 0, 285),
+      new PokemonForm("Type: Electric", "electric", PokemonType.ELECTRIC, null, 2.3, 100.5, Abilities.RKS_SYSTEM, Abilities.NONE, Abilities.NONE, 570, 95, 95, 95, 95, 95, 95, 3, 0, 285),
+      new PokemonForm("Type: Psychic", "psychic", PokemonType.PSYCHIC, null, 2.3, 100.5, Abilities.RKS_SYSTEM, Abilities.NONE, Abilities.NONE, 570, 95, 95, 95, 95, 95, 95, 3, 0, 285),
+      new PokemonForm("Type: Ice", "ice", PokemonType.ICE, null, 2.3, 100.5, Abilities.RKS_SYSTEM, Abilities.NONE, Abilities.NONE, 570, 95, 95, 95, 95, 95, 95, 3, 0, 285),
+      new PokemonForm("Type: Dragon", "dragon", PokemonType.DRAGON, null, 2.3, 100.5, Abilities.RKS_SYSTEM, Abilities.NONE, Abilities.NONE, 570, 95, 95, 95, 95, 95, 95, 3, 0, 285),
+      new PokemonForm("Type: Dark", "dark", PokemonType.DARK, null, 2.3, 100.5, Abilities.RKS_SYSTEM, Abilities.NONE, Abilities.NONE, 570, 95, 95, 95, 95, 95, 95, 3, 0, 285),
+      new PokemonForm("Type: Fairy", "fairy", PokemonType.FAIRY, null, 2.3, 100.5, Abilities.RKS_SYSTEM, Abilities.NONE, Abilities.NONE, 570, 95, 95, 95, 95, 95, 95, 3, 0, 285),
+    ),
+    new PokemonSpecies(Species.MINIOR, 7, false, false, false, "Meteor Pokémon", PokemonType.ROCK, PokemonType.FLYING, 0.3, 40, Abilities.SHIELDS_DOWN, Abilities.NONE, Abilities.NONE, 440, 60, 60, 100, 60, 100, 60, 30, 70, 154, GrowthRate.MEDIUM_SLOW, null, false, false,
+      new PokemonForm("Red Meteor Form", "red-meteor", PokemonType.ROCK, PokemonType.FLYING, 0.3, 40, Abilities.SHIELDS_DOWN, Abilities.NONE, Abilities.NONE, 440, 60, 60, 100, 60, 100, 60, 30, 70, 154, false, "", true),
+      new PokemonForm("Orange Meteor Form", "orange-meteor", PokemonType.ROCK, PokemonType.FLYING, 0.3, 40, Abilities.SHIELDS_DOWN, Abilities.NONE, Abilities.NONE, 440, 60, 60, 100, 60, 100, 60, 30, 70, 154, false, "", true),
+      new PokemonForm("Yellow Meteor Form", "yellow-meteor", PokemonType.ROCK, PokemonType.FLYING, 0.3, 40, Abilities.SHIELDS_DOWN, Abilities.NONE, Abilities.NONE, 440, 60, 60, 100, 60, 100, 60, 30, 70, 154, false, "", true),
+      new PokemonForm("Green Meteor Form", "green-meteor", PokemonType.ROCK, PokemonType.FLYING, 0.3, 40, Abilities.SHIELDS_DOWN, Abilities.NONE, Abilities.NONE, 440, 60, 60, 100, 60, 100, 60, 30, 70, 154, false, "", true),
+      new PokemonForm("Blue Meteor Form", "blue-meteor", PokemonType.ROCK, PokemonType.FLYING, 0.3, 40, Abilities.SHIELDS_DOWN, Abilities.NONE, Abilities.NONE, 440, 60, 60, 100, 60, 100, 60, 30, 70, 154, false, "", true),
+      new PokemonForm("Indigo Meteor Form", "indigo-meteor", PokemonType.ROCK, PokemonType.FLYING, 0.3, 40, Abilities.SHIELDS_DOWN, Abilities.NONE, Abilities.NONE, 440, 60, 60, 100, 60, 100, 60, 30, 70, 154, false, "", true),
+      new PokemonForm("Violet Meteor Form", "violet-meteor", PokemonType.ROCK, PokemonType.FLYING, 0.3, 40, Abilities.SHIELDS_DOWN, Abilities.NONE, Abilities.NONE, 440, 60, 60, 100, 60, 100, 60, 30, 70, 154, false, "", true),
+      new PokemonForm("Red Core Form", "red", PokemonType.ROCK, PokemonType.FLYING, 0.3, 0.3, Abilities.SHIELDS_DOWN, Abilities.NONE, Abilities.NONE, 500, 60, 100, 60, 100, 60, 120, 30, 70, 175, false, null, true),
+      new PokemonForm("Orange Core Form", "orange", PokemonType.ROCK, PokemonType.FLYING, 0.3, 0.3, Abilities.SHIELDS_DOWN, Abilities.NONE, Abilities.NONE, 500, 60, 100, 60, 100, 60, 120, 30, 70, 175, false, null, true),
+      new PokemonForm("Yellow Core Form", "yellow", PokemonType.ROCK, PokemonType.FLYING, 0.3, 0.3, Abilities.SHIELDS_DOWN, Abilities.NONE, Abilities.NONE, 500, 60, 100, 60, 100, 60, 120, 30, 70, 175, false, null, true),
+      new PokemonForm("Green Core Form", "green", PokemonType.ROCK, PokemonType.FLYING, 0.3, 0.3, Abilities.SHIELDS_DOWN, Abilities.NONE, Abilities.NONE, 500, 60, 100, 60, 100, 60, 120, 30, 70, 175, false, null, true),
+      new PokemonForm("Blue Core Form", "blue", PokemonType.ROCK, PokemonType.FLYING, 0.3, 0.3, Abilities.SHIELDS_DOWN, Abilities.NONE, Abilities.NONE, 500, 60, 100, 60, 100, 60, 120, 30, 70, 175, false, null, true),
+      new PokemonForm("Indigo Core Form", "indigo", PokemonType.ROCK, PokemonType.FLYING, 0.3, 0.3, Abilities.SHIELDS_DOWN, Abilities.NONE, Abilities.NONE, 500, 60, 100, 60, 100, 60, 120, 30, 70, 175, false, null, true),
+      new PokemonForm("Violet Core Form", "violet", PokemonType.ROCK, PokemonType.FLYING, 0.3, 0.3, Abilities.SHIELDS_DOWN, Abilities.NONE, Abilities.NONE, 500, 60, 100, 60, 100, 60, 120, 30, 70, 175, false, null, true),
+    ),
+    new PokemonSpecies(Species.KOMALA, 7, false, false, false, "Drowsing Pokémon", PokemonType.NORMAL, null, 0.4, 19.9, Abilities.COMATOSE, Abilities.NONE, Abilities.NONE, 480, 65, 115, 65, 75, 95, 65, 45, 70, 168, GrowthRate.SLOW, 50, false),
+    new PokemonSpecies(Species.TURTONATOR, 7, false, false, false, "Blast Turtle Pokémon", PokemonType.FIRE, PokemonType.DRAGON, 2, 212, Abilities.SHELL_ARMOR, Abilities.NONE, Abilities.NONE, 485, 60, 78, 135, 91, 85, 36, 70, 50, 170, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.TOGEDEMARU, 7, false, false, false, "Roly-Poly Pokémon", PokemonType.ELECTRIC, PokemonType.STEEL, 0.3, 3.3, Abilities.IRON_BARBS, Abilities.LIGHTNING_ROD, Abilities.STURDY, 435, 65, 98, 63, 40, 73, 96, 180, 50, 152, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.MIMIKYU, 7, false, false, false, "Disguise Pokémon", PokemonType.GHOST, PokemonType.FAIRY, 0.2, 0.7, Abilities.DISGUISE, Abilities.NONE, Abilities.NONE, 476, 55, 90, 80, 50, 105, 96, 45, 50, 167, GrowthRate.MEDIUM_FAST, 50, false, false,
+      new PokemonForm("Disguised Form", "disguised", PokemonType.GHOST, PokemonType.FAIRY, 0.2, 0.7, Abilities.DISGUISE, Abilities.NONE, Abilities.NONE, 476, 55, 90, 80, 50, 105, 96, 45, 50, 167, false, null, true),
+      new PokemonForm("Busted Form", "busted", PokemonType.GHOST, PokemonType.FAIRY, 0.2, 0.7, Abilities.DISGUISE, Abilities.NONE, Abilities.NONE, 476, 55, 90, 80, 50, 105, 96, 45, 50, 167),
+    ),
+    new PokemonSpecies(Species.BRUXISH, 7, false, false, false, "Gnash Teeth Pokémon", PokemonType.WATER, PokemonType.PSYCHIC, 0.9, 19, Abilities.DAZZLING, Abilities.STRONG_JAW, Abilities.WONDER_SKIN, 475, 68, 105, 70, 70, 70, 92, 80, 70, 166, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.DRAMPA, 7, false, false, false, "Placid Pokémon", PokemonType.NORMAL, PokemonType.DRAGON, 3, 185, Abilities.BERSERK, Abilities.SAP_SIPPER, Abilities.CLOUD_NINE, 485, 78, 60, 85, 135, 91, 36, 70, 50, 170, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.DHELMISE, 7, false, false, false, "Sea Creeper Pokémon", PokemonType.GHOST, PokemonType.GRASS, 3.9, 210, Abilities.STEELWORKER, Abilities.NONE, Abilities.NONE, 517, 70, 131, 100, 86, 90, 40, 25, 50, 181, GrowthRate.MEDIUM_FAST, null, false),
+    new PokemonSpecies(Species.JANGMO_O, 7, false, false, false, "Scaly Pokémon", PokemonType.DRAGON, null, 0.6, 29.7, Abilities.BULLETPROOF, Abilities.SOUNDPROOF, Abilities.OVERCOAT, 300, 45, 55, 65, 45, 45, 45, 45, 50, 60, GrowthRate.SLOW, 50, false),
+    new PokemonSpecies(Species.HAKAMO_O, 7, false, false, false, "Scaly Pokémon", PokemonType.DRAGON, PokemonType.FIGHTING, 1.2, 47, Abilities.BULLETPROOF, Abilities.SOUNDPROOF, Abilities.OVERCOAT, 420, 55, 75, 90, 65, 70, 65, 45, 50, 147, GrowthRate.SLOW, 50, false),
+    new PokemonSpecies(Species.KOMMO_O, 7, false, false, false, "Scaly Pokémon", PokemonType.DRAGON, PokemonType.FIGHTING, 1.6, 78.2, Abilities.BULLETPROOF, Abilities.SOUNDPROOF, Abilities.OVERCOAT, 600, 75, 110, 125, 100, 105, 85, 45, 50, 300, GrowthRate.SLOW, 50, false),
+    new PokemonSpecies(Species.TAPU_KOKO, 7, true, false, false, "Land Spirit Pokémon", PokemonType.ELECTRIC, PokemonType.FAIRY, 1.8, 20.5, Abilities.ELECTRIC_SURGE, Abilities.NONE, Abilities.TELEPATHY, 570, 70, 115, 85, 95, 75, 130, 3, 50, 285, GrowthRate.SLOW, null, false),
+    new PokemonSpecies(Species.TAPU_LELE, 7, true, false, false, "Land Spirit Pokémon", PokemonType.PSYCHIC, PokemonType.FAIRY, 1.2, 18.6, Abilities.PSYCHIC_SURGE, Abilities.NONE, Abilities.TELEPATHY, 570, 70, 85, 75, 130, 115, 95, 3, 50, 285, GrowthRate.SLOW, null, false),
+    new PokemonSpecies(Species.TAPU_BULU, 7, true, false, false, "Land Spirit Pokémon", PokemonType.GRASS, PokemonType.FAIRY, 1.9, 45.5, Abilities.GRASSY_SURGE, Abilities.NONE, Abilities.TELEPATHY, 570, 70, 130, 115, 85, 95, 75, 3, 50, 285, GrowthRate.SLOW, null, false),
+    new PokemonSpecies(Species.TAPU_FINI, 7, true, false, false, "Land Spirit Pokémon", PokemonType.WATER, PokemonType.FAIRY, 1.3, 21.2, Abilities.MISTY_SURGE, Abilities.NONE, Abilities.TELEPATHY, 570, 70, 75, 115, 95, 130, 85, 3, 50, 285, GrowthRate.SLOW, null, false),
+    new PokemonSpecies(Species.COSMOG, 7, true, false, false, "Nebula Pokémon", PokemonType.PSYCHIC, null, 0.2, 0.1, Abilities.UNAWARE, Abilities.NONE, Abilities.NONE, 200, 43, 29, 31, 29, 31, 37, 45, 0, 40, GrowthRate.SLOW, null, false),
+    new PokemonSpecies(Species.COSMOEM, 7, true, false, false, "Protostar Pokémon", PokemonType.PSYCHIC, null, 0.1, 999.9, Abilities.STURDY, Abilities.NONE, Abilities.NONE, 400, 43, 29, 131, 29, 131, 37, 45, 0, 140, GrowthRate.SLOW, null, false),
+    new PokemonSpecies(Species.SOLGALEO, 7, false, true, false, "Sunne Pokémon", PokemonType.PSYCHIC, PokemonType.STEEL, 3.4, 230, Abilities.FULL_METAL_BODY, Abilities.NONE, Abilities.NONE, 680, 137, 137, 107, 113, 89, 97, 45, 0, 340, GrowthRate.SLOW, null, false),
+    new PokemonSpecies(Species.LUNALA, 7, false, true, false, "Moone Pokémon", PokemonType.PSYCHIC, PokemonType.GHOST, 4, 120, Abilities.SHADOW_SHIELD, Abilities.NONE, Abilities.NONE, 680, 137, 113, 89, 137, 107, 97, 45, 0, 340, GrowthRate.SLOW, null, false),
+    new PokemonSpecies(Species.NIHILEGO, 7, true, false, false, "Parasite Pokémon", PokemonType.ROCK, PokemonType.POISON, 1.2, 55.5, Abilities.BEAST_BOOST, Abilities.NONE, Abilities.NONE, 570, 109, 53, 47, 127, 131, 103, 45, 0, 285, GrowthRate.SLOW, null, false),
+    new PokemonSpecies(Species.BUZZWOLE, 7, true, false, false, "Swollen Pokémon", PokemonType.BUG, PokemonType.FIGHTING, 2.4, 333.6, Abilities.BEAST_BOOST, Abilities.NONE, Abilities.NONE, 570, 107, 139, 139, 53, 53, 79, 45, 0, 285, GrowthRate.SLOW, null, false),
+    new PokemonSpecies(Species.PHEROMOSA, 7, true, false, false, "Lissome Pokémon", PokemonType.BUG, PokemonType.FIGHTING, 1.8, 25, Abilities.BEAST_BOOST, Abilities.NONE, Abilities.NONE, 570, 71, 137, 37, 137, 37, 151, 45, 0, 285, GrowthRate.SLOW, null, false),
+    new PokemonSpecies(Species.XURKITREE, 7, true, false, false, "Glowing Pokémon", PokemonType.ELECTRIC, null, 3.8, 100, Abilities.BEAST_BOOST, Abilities.NONE, Abilities.NONE, 570, 83, 89, 71, 173, 71, 83, 45, 0, 285, GrowthRate.SLOW, null, false),
+    new PokemonSpecies(Species.CELESTEELA, 7, true, false, false, "Launch Pokémon", PokemonType.STEEL, PokemonType.FLYING, 9.2, 999.9, Abilities.BEAST_BOOST, Abilities.NONE, Abilities.NONE, 570, 97, 101, 103, 107, 101, 61, 45, 0, 285, GrowthRate.SLOW, null, false),
+    new PokemonSpecies(Species.KARTANA, 7, true, false, false, "Drawn Sword Pokémon", PokemonType.GRASS, PokemonType.STEEL, 0.3, 0.1, Abilities.BEAST_BOOST, Abilities.NONE, Abilities.NONE, 570, 59, 181, 131, 59, 31, 109, 45, 0, 285, GrowthRate.SLOW, null, false),
+    new PokemonSpecies(Species.GUZZLORD, 7, true, false, false, "Junkivore Pokémon", PokemonType.DARK, PokemonType.DRAGON, 5.5, 888, Abilities.BEAST_BOOST, Abilities.NONE, Abilities.NONE, 570, 223, 101, 53, 97, 53, 43, 45, 0, 285, GrowthRate.SLOW, null, false),
+    new PokemonSpecies(Species.NECROZMA, 7, false, true, false, "Prism Pokémon", PokemonType.PSYCHIC, null, 2.4, 230, Abilities.PRISM_ARMOR, Abilities.NONE, Abilities.NONE, 600, 97, 107, 101, 127, 89, 79, 255, 0, 300, GrowthRate.SLOW, null, false, false,
+      new PokemonForm("Normal", "", PokemonType.PSYCHIC, null, 2.4, 230, Abilities.PRISM_ARMOR, Abilities.NONE, Abilities.NONE, 600, 97, 107, 101, 127, 89, 79, 255, 0, 300, false, null, true),
+      new PokemonForm("Dusk Mane", "dusk-mane", PokemonType.PSYCHIC, PokemonType.STEEL, 3.8, 460, Abilities.PRISM_ARMOR, Abilities.NONE, Abilities.NONE, 680, 97, 157, 127, 113, 109, 77, 255, 0, 340),
+      new PokemonForm("Dawn Wings", "dawn-wings", PokemonType.PSYCHIC, PokemonType.GHOST, 4.2, 350, Abilities.PRISM_ARMOR, Abilities.NONE, Abilities.NONE, 680, 97, 113, 109, 157, 127, 77, 255, 0, 340),
+      new PokemonForm("Ultra", "ultra", PokemonType.PSYCHIC, PokemonType.DRAGON, 7.5, 230, Abilities.NEUROFORCE, Abilities.NONE, Abilities.NONE, 754, 97, 167, 97, 167, 97, 129, 255, 0, 377),
+    ),
+    new PokemonSpecies(Species.MAGEARNA, 7, false, false, true, "Artificial Pokémon", PokemonType.STEEL, PokemonType.FAIRY, 1, 80.5, Abilities.SOUL_HEART, Abilities.NONE, Abilities.NONE, 600, 80, 95, 115, 130, 115, 65, 3, 0, 300, GrowthRate.SLOW, null, false, false,
+      new PokemonForm("Normal", "", PokemonType.STEEL, PokemonType.FAIRY, 1, 80.5, Abilities.SOUL_HEART, Abilities.NONE, Abilities.NONE, 600, 80, 95, 115, 130, 115, 65, 3, 0, 300, false, null, true),
+      new PokemonForm("Original", "original", PokemonType.STEEL, PokemonType.FAIRY, 1, 80.5, Abilities.SOUL_HEART, Abilities.NONE, Abilities.NONE, 600, 80, 95, 115, 130, 115, 65, 3, 0, 300, false, null, true),
+    ),
+    new PokemonSpecies(Species.MARSHADOW, 7, false, false, true, "Gloomdweller Pokémon", PokemonType.FIGHTING, PokemonType.GHOST, 0.7, 22.2, Abilities.TECHNICIAN, Abilities.NONE, Abilities.NONE, 600, 90, 125, 80, 90, 90, 125, 3, 0, 300, GrowthRate.SLOW, null, false, true,
+      new PokemonForm("Normal", "", PokemonType.FIGHTING, PokemonType.GHOST, 0.7, 22.2, Abilities.TECHNICIAN, Abilities.NONE, Abilities.NONE, 600, 90, 125, 80, 90, 90, 125, 3, 0, 300, false, null, true),
+      new PokemonForm("Zenith", "zenith", PokemonType.FIGHTING, PokemonType.GHOST, 0.7, 22.2, Abilities.TECHNICIAN, Abilities.NONE, Abilities.NONE, 600, 90, 125, 80, 90, 90, 125, 3, 0, 300, false, null, false, true)
+    ),
+    new PokemonSpecies(Species.POIPOLE, 7, true, false, false, "Poison Pin Pokémon", PokemonType.POISON, null, 0.6, 1.8, Abilities.BEAST_BOOST, Abilities.NONE, Abilities.NONE, 420, 67, 73, 67, 73, 67, 73, 45, 0, 210, GrowthRate.SLOW, null, false),
+    new PokemonSpecies(Species.NAGANADEL, 7, true, false, false, "Poison Pin Pokémon", PokemonType.POISON, PokemonType.DRAGON, 3.6, 150, Abilities.BEAST_BOOST, Abilities.NONE, Abilities.NONE, 540, 73, 73, 73, 127, 73, 121, 45, 0, 270, GrowthRate.SLOW, null, false),
+    new PokemonSpecies(Species.STAKATAKA, 7, true, false, false, "Rampart Pokémon", PokemonType.ROCK, PokemonType.STEEL, 5.5, 820, Abilities.BEAST_BOOST, Abilities.NONE, Abilities.NONE, 570, 61, 131, 211, 53, 101, 13, 30, 0, 285, GrowthRate.SLOW, null, false),
+    new PokemonSpecies(Species.BLACEPHALON, 7, true, false, false, "Fireworks Pokémon", PokemonType.FIRE, PokemonType.GHOST, 1.8, 13, Abilities.BEAST_BOOST, Abilities.NONE, Abilities.NONE, 570, 53, 127, 53, 151, 79, 107, 30, 0, 285, GrowthRate.SLOW, null, false),
+    new PokemonSpecies(Species.ZERAORA, 7, false, false, true, "Thunderclap Pokémon", PokemonType.ELECTRIC, null, 1.5, 44.5, Abilities.VOLT_ABSORB, Abilities.NONE, Abilities.NONE, 600, 88, 112, 75, 102, 80, 143, 3, 0, 300, GrowthRate.SLOW, null, false),
+    new PokemonSpecies(Species.MELTAN, 7, false, false, true, "Hex Nut Pokémon", PokemonType.STEEL, null, 0.2, 8, Abilities.MAGNET_PULL, Abilities.NONE, Abilities.NONE, 300, 46, 65, 65, 55, 35, 34, 3, 0, 150, GrowthRate.SLOW, null, false),
+    new PokemonSpecies(Species.MELMETAL, 7, false, false, true, "Hex Nut Pokémon", PokemonType.STEEL, null, 2.5, 800, Abilities.IRON_FIST, Abilities.NONE, Abilities.NONE, 600, 135, 143, 143, 80, 65, 34, 3, 0, 300, GrowthRate.SLOW, null, false, true,
+      new PokemonForm("Normal", "", PokemonType.STEEL, null, 2.5, 800, Abilities.IRON_FIST, Abilities.NONE, Abilities.NONE, 600, 135, 143, 143, 80, 65, 34, 3, 0, 300, false, null, true),
+      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, PokemonType.STEEL, null, 25, 999.9, Abilities.IRON_FIST, Abilities.NONE, Abilities.NONE, 700, 170, 158, 158, 95, 75, 44, 3, 0, 300),
+    ),
+    new PokemonSpecies(Species.GROOKEY, 8, false, false, false, "Chimp Pokémon", PokemonType.GRASS, null, 0.3, 5, Abilities.OVERGROW, Abilities.NONE, Abilities.GRASSY_SURGE, 310, 50, 65, 50, 40, 40, 65, 45, 50, 62, GrowthRate.MEDIUM_SLOW, 87.5, false),
+    new PokemonSpecies(Species.THWACKEY, 8, false, false, false, "Beat Pokémon", PokemonType.GRASS, null, 0.7, 14, Abilities.OVERGROW, Abilities.NONE, Abilities.GRASSY_SURGE, 420, 70, 85, 70, 55, 60, 80, 45, 50, 147, GrowthRate.MEDIUM_SLOW, 87.5, false),
+    new PokemonSpecies(Species.RILLABOOM, 8, false, false, false, "Drummer Pokémon", PokemonType.GRASS, null, 2.1, 90, Abilities.OVERGROW, Abilities.NONE, Abilities.GRASSY_SURGE, 530, 100, 125, 90, 60, 70, 85, 45, 50, 265, GrowthRate.MEDIUM_SLOW, 87.5, false, true,
+      new PokemonForm("Normal", "", PokemonType.GRASS, null, 2.1, 90, Abilities.OVERGROW, Abilities.NONE, Abilities.GRASSY_SURGE, 530, 100, 125, 90, 60, 70, 85, 45, 50, 265, false, null, true),
+      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, PokemonType.GRASS, null, 28, 999.9, Abilities.GRASSY_SURGE, Abilities.NONE, Abilities.GRASSY_SURGE, 630, 125, 140, 105, 90, 85, 85, 45, 50, 265),
+    ),
+    new PokemonSpecies(Species.SCORBUNNY, 8, false, false, false, "Rabbit Pokémon", PokemonType.FIRE, null, 0.3, 4.5, Abilities.BLAZE, Abilities.NONE, Abilities.LIBERO, 310, 50, 71, 40, 40, 40, 69, 45, 50, 62, GrowthRate.MEDIUM_SLOW, 87.5, false),
+    new PokemonSpecies(Species.RABOOT, 8, false, false, false, "Rabbit Pokémon", PokemonType.FIRE, null, 0.6, 9, Abilities.BLAZE, Abilities.NONE, Abilities.LIBERO, 420, 65, 86, 60, 55, 60, 94, 45, 50, 147, GrowthRate.MEDIUM_SLOW, 87.5, false),
+    new PokemonSpecies(Species.CINDERACE, 8, false, false, false, "Striker Pokémon", PokemonType.FIRE, null, 1.4, 33, Abilities.BLAZE, Abilities.NONE, Abilities.LIBERO, 530, 80, 116, 75, 65, 75, 119, 45, 50, 265, GrowthRate.MEDIUM_SLOW, 87.5, false, true,
+      new PokemonForm("Normal", "", PokemonType.FIRE, null, 1.4, 33, Abilities.BLAZE, Abilities.NONE, Abilities.LIBERO, 530, 80, 116, 75, 65, 75, 119, 45, 50, 265, false, null, true),
+      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, PokemonType.FIRE, null, 27, 999.9, Abilities.LIBERO, Abilities.NONE, Abilities.LIBERO, 630, 100, 141, 80, 95, 80, 134, 45, 50, 265),
+    ),
+    new PokemonSpecies(Species.SOBBLE, 8, false, false, false, "Water Lizard Pokémon", PokemonType.WATER, null, 0.3, 4, Abilities.TORRENT, Abilities.NONE, Abilities.SNIPER, 310, 50, 40, 40, 70, 40, 70, 45, 50, 62, GrowthRate.MEDIUM_SLOW, 87.5, false),
+    new PokemonSpecies(Species.DRIZZILE, 8, false, false, false, "Water Lizard Pokémon", PokemonType.WATER, null, 0.7, 11.5, Abilities.TORRENT, Abilities.NONE, Abilities.SNIPER, 420, 65, 60, 55, 95, 55, 90, 45, 50, 147, GrowthRate.MEDIUM_SLOW, 87.5, false),
+    new PokemonSpecies(Species.INTELEON, 8, false, false, false, "Secret Agent Pokémon", PokemonType.WATER, null, 1.9, 45.2, Abilities.TORRENT, Abilities.NONE, Abilities.SNIPER, 530, 70, 85, 65, 125, 65, 120, 45, 50, 265, GrowthRate.MEDIUM_SLOW, 87.5, false, true,
+      new PokemonForm("Normal", "", PokemonType.WATER, null, 1.9, 45.2, Abilities.TORRENT, Abilities.NONE, Abilities.SNIPER, 530, 70, 85, 65, 125, 65, 120, 45, 50, 265, false, null, true),
+      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, PokemonType.WATER, null, 40, 999.9, Abilities.SNIPER, Abilities.NONE, Abilities.SNIPER, 630, 95, 117, 67, 147, 67, 137, 45, 50, 265),
+    ),
+    new PokemonSpecies(Species.SKWOVET, 8, false, false, false, "Cheeky Pokémon", PokemonType.NORMAL, null, 0.3, 2.5, Abilities.CHEEK_POUCH, Abilities.NONE, Abilities.GLUTTONY, 275, 70, 55, 55, 35, 35, 25, 255, 50, 55, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.GREEDENT, 8, false, false, false, "Greedy Pokémon", PokemonType.NORMAL, null, 0.6, 6, Abilities.CHEEK_POUCH, Abilities.NONE, Abilities.GLUTTONY, 460, 120, 95, 95, 55, 75, 20, 90, 50, 161, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.ROOKIDEE, 8, false, false, false, "Tiny Bird Pokémon", PokemonType.FLYING, null, 0.2, 1.8, Abilities.KEEN_EYE, Abilities.UNNERVE, Abilities.BIG_PECKS, 245, 38, 47, 35, 33, 35, 57, 255, 50, 49, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.CORVISQUIRE, 8, false, false, false, "Raven Pokémon", PokemonType.FLYING, null, 0.8, 16, Abilities.KEEN_EYE, Abilities.UNNERVE, Abilities.BIG_PECKS, 365, 68, 67, 55, 43, 55, 77, 120, 50, 128, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.CORVIKNIGHT, 8, false, false, false, "Raven Pokémon", PokemonType.FLYING, PokemonType.STEEL, 2.2, 75, Abilities.PRESSURE, Abilities.UNNERVE, Abilities.MIRROR_ARMOR, 495, 98, 87, 105, 53, 85, 67, 45, 50, 248, GrowthRate.MEDIUM_SLOW, 50, false, true,
+      new PokemonForm("Normal", "", PokemonType.FLYING, PokemonType.STEEL, 2.2, 75, Abilities.PRESSURE, Abilities.UNNERVE, Abilities.MIRROR_ARMOR, 495, 98, 87, 105, 53, 85, 67, 45, 50, 248, false, null, true),
+      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, PokemonType.FLYING, PokemonType.STEEL, 14, 999.9, Abilities.MIRROR_ARMOR, Abilities.MIRROR_ARMOR, Abilities.MIRROR_ARMOR, 595, 118, 112, 135, 63, 90, 77, 45, 50, 248),
+    ),
+    new PokemonSpecies(Species.BLIPBUG, 8, false, false, false, "Larva Pokémon", PokemonType.BUG, null, 0.4, 8, Abilities.SWARM, Abilities.COMPOUND_EYES, Abilities.TELEPATHY, 180, 25, 20, 20, 25, 45, 45, 255, 50, 36, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.DOTTLER, 8, false, false, false, "Radome Pokémon", PokemonType.BUG, PokemonType.PSYCHIC, 0.4, 19.5, Abilities.SWARM, Abilities.COMPOUND_EYES, Abilities.TELEPATHY, 335, 50, 35, 80, 50, 90, 30, 120, 50, 117, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.ORBEETLE, 8, false, false, false, "Seven Spot Pokémon", PokemonType.BUG, PokemonType.PSYCHIC, 0.4, 40.8, Abilities.SWARM, Abilities.FRISK, Abilities.TELEPATHY, 505, 60, 45, 110, 80, 120, 90, 45, 50, 253, GrowthRate.MEDIUM_FAST, 50, false, true,
+      new PokemonForm("Normal", "", PokemonType.BUG, PokemonType.PSYCHIC, 0.4, 40.8, Abilities.SWARM, Abilities.FRISK, Abilities.TELEPATHY, 505, 60, 45, 110, 80, 120, 90, 45, 50, 253, false, null, true),
+      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, PokemonType.BUG, PokemonType.PSYCHIC, 14, 999.9, Abilities.TRACE, Abilities.TRACE, Abilities.TRACE, 605, 75, 50, 140, 100, 150, 90, 45, 50, 253),
+    ),
+    new PokemonSpecies(Species.NICKIT, 8, false, false, false, "Fox Pokémon", PokemonType.DARK, null, 0.6, 8.9, Abilities.RUN_AWAY, Abilities.UNBURDEN, Abilities.STAKEOUT, 245, 40, 28, 28, 47, 52, 50, 255, 50, 49, GrowthRate.FAST, 50, false),
+    new PokemonSpecies(Species.THIEVUL, 8, false, false, false, "Fox Pokémon", PokemonType.DARK, null, 1.2, 19.9, Abilities.RUN_AWAY, Abilities.UNBURDEN, Abilities.STAKEOUT, 455, 70, 58, 58, 87, 92, 90, 127, 50, 159, GrowthRate.FAST, 50, false),
+    new PokemonSpecies(Species.GOSSIFLEUR, 8, false, false, false, "Flowering Pokémon", PokemonType.GRASS, null, 0.4, 2.2, Abilities.COTTON_DOWN, Abilities.REGENERATOR, Abilities.EFFECT_SPORE, 250, 40, 40, 60, 40, 60, 10, 190, 50, 50, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.ELDEGOSS, 8, false, false, false, "Cotton Bloom Pokémon", PokemonType.GRASS, null, 0.5, 2.5, Abilities.COTTON_DOWN, Abilities.REGENERATOR, Abilities.EFFECT_SPORE, 460, 60, 50, 90, 80, 120, 60, 75, 50, 161, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.WOOLOO, 8, false, false, false, "Sheep Pokémon", PokemonType.NORMAL, null, 0.6, 6, Abilities.FLUFFY, Abilities.RUN_AWAY, Abilities.BULLETPROOF, 270, 42, 40, 55, 40, 45, 48, 255, 50, 122, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.DUBWOOL, 8, false, false, false, "Sheep Pokémon", PokemonType.NORMAL, null, 1.3, 43, Abilities.FLUFFY, Abilities.STEADFAST, Abilities.BULLETPROOF, 490, 72, 80, 100, 60, 90, 88, 127, 50, 172, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.CHEWTLE, 8, false, false, false, "Snapping Pokémon", PokemonType.WATER, null, 0.3, 8.5, Abilities.STRONG_JAW, Abilities.SHELL_ARMOR, Abilities.SWIFT_SWIM, 284, 50, 64, 50, 38, 38, 44, 255, 50, 57, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.DREDNAW, 8, false, false, false, "Bite Pokémon", PokemonType.WATER, PokemonType.ROCK, 1, 115.5, Abilities.STRONG_JAW, Abilities.SHELL_ARMOR, Abilities.SWIFT_SWIM, 485, 90, 115, 90, 48, 68, 74, 75, 50, 170, GrowthRate.MEDIUM_FAST, 50, false, true,
+      new PokemonForm("Normal", "", PokemonType.WATER, PokemonType.ROCK, 1, 115.5, Abilities.STRONG_JAW, Abilities.SHELL_ARMOR, Abilities.SWIFT_SWIM, 485, 90, 115, 90, 48, 68, 74, 75, 50, 170, false, null, true),
+      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, PokemonType.WATER, PokemonType.ROCK, 24, 999.9, Abilities.STRONG_JAW, Abilities.STRONG_JAW, Abilities.STRONG_JAW, 585, 115, 137, 115, 61, 83, 74, 75, 50, 170),
+    ),
+    new PokemonSpecies(Species.YAMPER, 8, false, false, false, "Puppy Pokémon", PokemonType.ELECTRIC, null, 0.3, 13.5, Abilities.BALL_FETCH, Abilities.NONE, Abilities.RATTLED, 270, 59, 45, 50, 40, 50, 26, 255, 50, 54, GrowthRate.FAST, 50, false),
+    new PokemonSpecies(Species.BOLTUND, 8, false, false, false, "Dog Pokémon", PokemonType.ELECTRIC, null, 1, 34, Abilities.STRONG_JAW, Abilities.NONE, Abilities.COMPETITIVE, 490, 69, 90, 60, 90, 60, 121, 45, 50, 172, GrowthRate.FAST, 50, false),
+    new PokemonSpecies(Species.ROLYCOLY, 8, false, false, false, "Coal Pokémon", PokemonType.ROCK, null, 0.3, 12, Abilities.STEAM_ENGINE, Abilities.HEATPROOF, Abilities.FLASH_FIRE, 240, 30, 40, 50, 40, 50, 30, 255, 50, 48, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.CARKOL, 8, false, false, false, "Coal Pokémon", PokemonType.ROCK, PokemonType.FIRE, 1.1, 78, Abilities.STEAM_ENGINE, Abilities.FLAME_BODY, Abilities.FLASH_FIRE, 410, 80, 60, 90, 60, 70, 50, 120, 50, 144, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.COALOSSAL, 8, false, false, false, "Coal Pokémon", PokemonType.ROCK, PokemonType.FIRE, 2.8, 310.5, Abilities.STEAM_ENGINE, Abilities.FLAME_BODY, Abilities.FLASH_FIRE, 510, 110, 80, 120, 80, 90, 30, 45, 50, 255, GrowthRate.MEDIUM_SLOW, 50, false, true,
+      new PokemonForm("Normal", "", PokemonType.ROCK, PokemonType.FIRE, 2.8, 310.5, Abilities.STEAM_ENGINE, Abilities.FLAME_BODY, Abilities.FLASH_FIRE, 510, 110, 80, 120, 80, 90, 30, 45, 50, 255, false, null, true),
+      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, PokemonType.ROCK, PokemonType.FIRE, 42, 999.9, Abilities.STEAM_ENGINE, Abilities.STEAM_ENGINE, Abilities.STEAM_ENGINE, 610, 140, 100, 132, 95, 100, 43, 45, 50, 255),
+    ),
+    new PokemonSpecies(Species.APPLIN, 8, false, false, false, "Apple Core Pokémon", PokemonType.GRASS, PokemonType.DRAGON, 0.2, 0.5, Abilities.RIPEN, Abilities.GLUTTONY, Abilities.BULLETPROOF, 260, 40, 40, 80, 40, 40, 20, 255, 50, 52, GrowthRate.ERRATIC, 50, false),
+    new PokemonSpecies(Species.FLAPPLE, 8, false, false, false, "Apple Wing Pokémon", PokemonType.GRASS, PokemonType.DRAGON, 0.3, 1, Abilities.RIPEN, Abilities.GLUTTONY, Abilities.HUSTLE, 485, 70, 110, 80, 95, 60, 70, 45, 50, 170, GrowthRate.ERRATIC, 50, false, true,
+      new PokemonForm("Normal", "", PokemonType.GRASS, PokemonType.DRAGON, 0.3, 1, Abilities.RIPEN, Abilities.GLUTTONY, Abilities.HUSTLE, 485, 70, 110, 80, 95, 60, 70, 45, 50, 170, false, null, true),
+      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, PokemonType.GRASS, PokemonType.DRAGON, 24, 999.9, Abilities.HUSTLE, Abilities.HUSTLE, Abilities.HUSTLE, 585, 100, 125, 90, 105, 70, 95, 45, 50, 170),
+    ),
+    new PokemonSpecies(Species.APPLETUN, 8, false, false, false, "Apple Nectar Pokémon", PokemonType.GRASS, PokemonType.DRAGON, 0.4, 13, Abilities.RIPEN, Abilities.GLUTTONY, Abilities.THICK_FAT, 485, 110, 85, 80, 100, 80, 30, 45, 50, 170, GrowthRate.ERRATIC, 50, false, true,
+      new PokemonForm("Normal", "", PokemonType.GRASS, PokemonType.DRAGON, 0.4, 13, Abilities.RIPEN, Abilities.GLUTTONY, Abilities.THICK_FAT, 485, 110, 85, 80, 100, 80, 30, 45, 50, 170, false, null, true),
+      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, PokemonType.GRASS, PokemonType.DRAGON, 24, 999.9, Abilities.THICK_FAT, Abilities.THICK_FAT, Abilities.THICK_FAT, 585, 150, 100, 95, 115, 95, 30, 45, 50, 170),
+    ),
+    new PokemonSpecies(Species.SILICOBRA, 8, false, false, false, "Sand Snake Pokémon", PokemonType.GROUND, null, 2.2, 7.6, Abilities.SAND_SPIT, Abilities.SHED_SKIN, Abilities.SAND_VEIL, 315, 52, 57, 75, 35, 50, 46, 255, 50, 63, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.SANDACONDA, 8, false, false, false, "Sand Snake Pokémon", PokemonType.GROUND, null, 3.8, 65.5, Abilities.SAND_SPIT, Abilities.SHED_SKIN, Abilities.SAND_VEIL, 510, 72, 107, 125, 65, 70, 71, 120, 50, 179, GrowthRate.MEDIUM_FAST, 50, false, true,
+      new PokemonForm("Normal", "", PokemonType.GROUND, null, 3.8, 65.5, Abilities.SAND_SPIT, Abilities.SHED_SKIN, Abilities.SAND_VEIL, 510, 72, 107, 125, 65, 70, 71, 120, 50, 179, false, null, true),
+      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, PokemonType.GROUND, null, 22, 999.9, Abilities.SAND_SPIT, Abilities.SAND_SPIT, Abilities.SAND_SPIT, 610, 102, 137, 140, 70, 80, 81, 120, 50, 179),
+    ),
+    new PokemonSpecies(Species.CRAMORANT, 8, false, false, false, "Gulp Pokémon", PokemonType.FLYING, PokemonType.WATER, 0.8, 18, Abilities.GULP_MISSILE, Abilities.NONE, Abilities.NONE, 475, 70, 85, 55, 85, 95, 85, 45, 50, 166, GrowthRate.MEDIUM_FAST, 50, false, false,
+      new PokemonForm("Normal", "", PokemonType.FLYING, PokemonType.WATER, 0.8, 18, Abilities.GULP_MISSILE, Abilities.NONE, Abilities.NONE, 475, 70, 85, 55, 85, 95, 85, 45, 50, 166, false, null, true),
+      new PokemonForm("Gulping Form", "gulping", PokemonType.FLYING, PokemonType.WATER, 0.8, 18, Abilities.GULP_MISSILE, Abilities.NONE, Abilities.NONE, 475, 70, 85, 55, 85, 95, 85, 45, 50, 166),
+      new PokemonForm("Gorging Form", "gorging", PokemonType.FLYING, PokemonType.WATER, 0.8, 18, Abilities.GULP_MISSILE, Abilities.NONE, Abilities.NONE, 475, 70, 85, 55, 85, 95, 85, 45, 50, 166),
+    ),
+    new PokemonSpecies(Species.ARROKUDA, 8, false, false, false, "Rush Pokémon", PokemonType.WATER, null, 0.5, 1, Abilities.SWIFT_SWIM, Abilities.NONE, Abilities.PROPELLER_TAIL, 280, 41, 63, 40, 40, 30, 66, 255, 50, 56, GrowthRate.SLOW, 50, false),
+    new PokemonSpecies(Species.BARRASKEWDA, 8, false, false, false, "Skewer Pokémon", PokemonType.WATER, null, 1.3, 30, Abilities.SWIFT_SWIM, Abilities.NONE, Abilities.PROPELLER_TAIL, 490, 61, 123, 60, 60, 50, 136, 60, 50, 172, GrowthRate.SLOW, 50, false),
+    new PokemonSpecies(Species.TOXEL, 8, false, false, false, "Baby Pokémon", PokemonType.ELECTRIC, PokemonType.POISON, 0.4, 11, Abilities.RATTLED, Abilities.STATIC, Abilities.KLUTZ, 242, 40, 38, 35, 54, 35, 40, 75, 50, 48, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.TOXTRICITY, 8, false, false, false, "Punk Pokémon", PokemonType.ELECTRIC, PokemonType.POISON, 1.6, 40, Abilities.PUNK_ROCK, Abilities.PLUS, Abilities.TECHNICIAN, 502, 75, 98, 70, 114, 70, 75, 45, 50, 176, GrowthRate.MEDIUM_SLOW, 50, false, true,
+      new PokemonForm("Amped Form", "amped", PokemonType.ELECTRIC, PokemonType.POISON, 1.6, 40, Abilities.PUNK_ROCK, Abilities.PLUS, Abilities.TECHNICIAN, 502, 75, 98, 70, 114, 70, 75, 45, 50, 176, false, "", true),
+      new PokemonForm("Low-Key Form", "lowkey", PokemonType.ELECTRIC, PokemonType.POISON, 1.6, 40, Abilities.PUNK_ROCK, Abilities.MINUS, Abilities.TECHNICIAN, 502, 75, 98, 70, 114, 70, 75, 45, 50, 176, false, "lowkey", true),
+      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, PokemonType.ELECTRIC, PokemonType.POISON, 24, 999.9, Abilities.PUNK_ROCK, Abilities.PUNK_ROCK, Abilities.PUNK_ROCK, 602, 114, 105, 82, 137, 82, 82, 45, 50, 176),
+    ),
+    new PokemonSpecies(Species.SIZZLIPEDE, 8, false, false, false, "Radiator Pokémon", PokemonType.FIRE, PokemonType.BUG, 0.7, 1, Abilities.FLASH_FIRE, Abilities.WHITE_SMOKE, Abilities.FLAME_BODY, 305, 50, 65, 45, 50, 50, 45, 190, 50, 61, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.CENTISKORCH, 8, false, false, false, "Radiator Pokémon", PokemonType.FIRE, PokemonType.BUG, 3, 120, Abilities.FLASH_FIRE, Abilities.WHITE_SMOKE, Abilities.FLAME_BODY, 525, 100, 115, 65, 90, 90, 65, 75, 50, 184, GrowthRate.MEDIUM_FAST, 50, false, true,
+      new PokemonForm("Normal", "", PokemonType.FIRE, PokemonType.BUG, 3, 120, Abilities.FLASH_FIRE, Abilities.WHITE_SMOKE, Abilities.FLAME_BODY, 525, 100, 115, 65, 90, 90, 65, 75, 50, 184, false, null, true),
+      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, PokemonType.FIRE, PokemonType.BUG, 75, 999.9, Abilities.FLASH_FIRE, Abilities.FLASH_FIRE, Abilities.FLASH_FIRE, 625, 130, 125, 75, 94, 100, 101, 75, 50, 184),
+    ),
+    new PokemonSpecies(Species.CLOBBOPUS, 8, false, false, false, "Tantrum Pokémon", PokemonType.FIGHTING, null, 0.6, 4, Abilities.LIMBER, Abilities.NONE, Abilities.TECHNICIAN, 310, 50, 68, 60, 50, 50, 32, 180, 50, 62, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.GRAPPLOCT, 8, false, false, false, "Jujitsu Pokémon", PokemonType.FIGHTING, null, 1.6, 39, Abilities.LIMBER, Abilities.NONE, Abilities.TECHNICIAN, 480, 80, 118, 90, 70, 80, 42, 45, 50, 168, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.SINISTEA, 8, false, false, false, "Black Tea Pokémon", PokemonType.GHOST, null, 0.1, 0.2, Abilities.WEAK_ARMOR, Abilities.NONE, Abilities.CURSED_BODY, 308, 40, 45, 45, 74, 54, 50, 120, 50, 62, GrowthRate.MEDIUM_FAST, null, false, false,
+      new PokemonForm("Phony Form", "phony", PokemonType.GHOST, null, 0.1, 0.2, Abilities.WEAK_ARMOR, Abilities.NONE, Abilities.CURSED_BODY, 308, 40, 45, 45, 74, 54, 50, 120, 50, 62, false, "", true),
+      new PokemonForm("Antique Form", "antique", PokemonType.GHOST, null, 0.1, 0.2, Abilities.WEAK_ARMOR, Abilities.NONE, Abilities.CURSED_BODY, 308, 40, 45, 45, 74, 54, 50, 120, 50, 62, false, "", true, true),
+    ),
+    new PokemonSpecies(Species.POLTEAGEIST, 8, false, false, false, "Black Tea Pokémon", PokemonType.GHOST, null, 0.2, 0.4, Abilities.WEAK_ARMOR, Abilities.NONE, Abilities.CURSED_BODY, 508, 60, 65, 65, 134, 114, 70, 60, 50, 178, GrowthRate.MEDIUM_FAST, null, false, false,
+      new PokemonForm("Phony Form", "phony", PokemonType.GHOST, null, 0.2, 0.4, Abilities.WEAK_ARMOR, Abilities.NONE, Abilities.CURSED_BODY, 508, 60, 65, 65, 134, 114, 70, 60, 50, 178, false, "", true),
+      new PokemonForm("Antique Form", "antique", PokemonType.GHOST, null, 0.2, 0.4, Abilities.WEAK_ARMOR, Abilities.NONE, Abilities.CURSED_BODY, 508, 60, 65, 65, 134, 114, 70, 60, 50, 178, false, "", true, true),
+    ),
+    new PokemonSpecies(Species.HATENNA, 8, false, false, false, "Calm Pokémon", PokemonType.PSYCHIC, null, 0.4, 3.4, Abilities.HEALER, Abilities.ANTICIPATION, Abilities.MAGIC_BOUNCE, 265, 42, 30, 45, 56, 53, 39, 235, 50, 53, GrowthRate.SLOW, 0, false),
+    new PokemonSpecies(Species.HATTREM, 8, false, false, false, "Serene Pokémon", PokemonType.PSYCHIC, null, 0.6, 4.8, Abilities.HEALER, Abilities.ANTICIPATION, Abilities.MAGIC_BOUNCE, 370, 57, 40, 65, 86, 73, 49, 120, 50, 130, GrowthRate.SLOW, 0, false),
+    new PokemonSpecies(Species.HATTERENE, 8, false, false, false, "Silent Pokémon", PokemonType.PSYCHIC, PokemonType.FAIRY, 2.1, 5.1, Abilities.HEALER, Abilities.ANTICIPATION, Abilities.MAGIC_BOUNCE, 510, 57, 90, 95, 136, 103, 29, 45, 50, 255, GrowthRate.SLOW, 0, false, true,
+      new PokemonForm("Normal", "", PokemonType.PSYCHIC, PokemonType.FAIRY, 2.1, 5.1, Abilities.HEALER, Abilities.ANTICIPATION, Abilities.MAGIC_BOUNCE, 510, 57, 90, 95, 136, 103, 29, 45, 50, 255, false, null, true),
+      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, PokemonType.PSYCHIC, PokemonType.FAIRY, 26, 999.9, Abilities.MAGIC_BOUNCE, Abilities.MAGIC_BOUNCE, Abilities.MAGIC_BOUNCE, 610, 87, 100, 110, 146, 118, 49, 45, 50, 255),
+    ),
+    new PokemonSpecies(Species.IMPIDIMP, 8, false, false, false, "Wily Pokémon", PokemonType.DARK, PokemonType.FAIRY, 0.4, 5.5, Abilities.PRANKSTER, Abilities.FRISK, Abilities.PICKPOCKET, 265, 45, 45, 30, 55, 40, 50, 255, 50, 53, GrowthRate.MEDIUM_FAST, 100, false),
+    new PokemonSpecies(Species.MORGREM, 8, false, false, false, "Devious Pokémon", PokemonType.DARK, PokemonType.FAIRY, 0.8, 12.5, Abilities.PRANKSTER, Abilities.FRISK, Abilities.PICKPOCKET, 370, 65, 60, 45, 75, 55, 70, 120, 50, 130, GrowthRate.MEDIUM_FAST, 100, false),
+    new PokemonSpecies(Species.GRIMMSNARL, 8, false, false, false, "Bulk Up Pokémon", PokemonType.DARK, PokemonType.FAIRY, 1.5, 61, Abilities.PRANKSTER, Abilities.FRISK, Abilities.PICKPOCKET, 510, 95, 120, 65, 95, 75, 60, 45, 50, 255, GrowthRate.MEDIUM_FAST, 100, false, true,
+      new PokemonForm("Normal", "", PokemonType.DARK, PokemonType.FAIRY, 1.5, 61, Abilities.PRANKSTER, Abilities.FRISK, Abilities.PICKPOCKET, 510, 95, 120, 65, 95, 75, 60, 45, 50, 255, false, null, true),
+      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, PokemonType.DARK, PokemonType.FAIRY, 32, 999.9, Abilities.PRANKSTER, Abilities.PRANKSTER, Abilities.PRANKSTER, 610, 130, 138, 75, 110, 92, 65, 45, 50, 255),
+    ),
+    new PokemonSpecies(Species.OBSTAGOON, 8, false, false, false, "Blocking Pokémon", PokemonType.DARK, PokemonType.NORMAL, 1.6, 46, Abilities.RECKLESS, Abilities.GUTS, Abilities.DEFIANT, 520, 93, 90, 101, 60, 81, 95, 45, 50, 260, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.PERRSERKER, 8, false, false, false, "Viking Pokémon", PokemonType.STEEL, null, 0.8, 28, Abilities.BATTLE_ARMOR, Abilities.TOUGH_CLAWS, Abilities.STEELY_SPIRIT, 440, 70, 110, 100, 50, 60, 50, 90, 50, 154, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.CURSOLA, 8, false, false, false, "Coral Pokémon", PokemonType.GHOST, null, 1, 0.4, Abilities.WEAK_ARMOR, Abilities.NONE, Abilities.PERISH_BODY, 510, 60, 95, 50, 145, 130, 30, 30, 50, 179, GrowthRate.FAST, 25, false),
+    new PokemonSpecies(Species.SIRFETCHD, 8, false, false, false, "Wild Duck Pokémon", PokemonType.FIGHTING, null, 0.8, 117, Abilities.STEADFAST, Abilities.NONE, Abilities.SCRAPPY, 507, 62, 135, 95, 68, 82, 65, 45, 50, 177, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.MR_RIME, 8, false, false, false, "Comedian Pokémon", PokemonType.ICE, PokemonType.PSYCHIC, 1.5, 58.2, Abilities.TANGLED_FEET, Abilities.SCREEN_CLEANER, Abilities.ICE_BODY, 520, 80, 85, 75, 110, 100, 70, 45, 50, 182, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.RUNERIGUS, 8, false, false, false, "Grudge Pokémon", PokemonType.GROUND, PokemonType.GHOST, 1.6, 66.6, Abilities.WANDERING_SPIRIT, Abilities.NONE, Abilities.NONE, 483, 58, 95, 145, 50, 105, 30, 90, 50, 169, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.MILCERY, 8, false, false, false, "Cream Pokémon", PokemonType.FAIRY, null, 0.2, 0.3, Abilities.SWEET_VEIL, Abilities.NONE, Abilities.AROMA_VEIL, 270, 45, 40, 40, 50, 61, 34, 200, 50, 54, GrowthRate.MEDIUM_FAST, 0, false),
+    new PokemonSpecies(Species.ALCREMIE, 8, false, false, false, "Cream Pokémon", PokemonType.FAIRY, null, 0.3, 0.5, Abilities.SWEET_VEIL, Abilities.NONE, Abilities.AROMA_VEIL, 495, 65, 60, 75, 110, 121, 64, 100, 50, 173, GrowthRate.MEDIUM_FAST, 0, false, true,
+      new PokemonForm("Vanilla Cream", "vanilla-cream", PokemonType.FAIRY, null, 0.3, 0.5, Abilities.SWEET_VEIL, Abilities.NONE, Abilities.AROMA_VEIL, 495, 65, 60, 75, 110, 121, 64, 100, 50, 173, false, "", true),
+      new PokemonForm("Ruby Cream", "ruby-cream", PokemonType.FAIRY, null, 0.3, 0.5, Abilities.SWEET_VEIL, Abilities.NONE, Abilities.AROMA_VEIL, 495, 65, 60, 75, 110, 121, 64, 100, 50, 173, false, null, true),
+      new PokemonForm("Matcha Cream", "matcha-cream", PokemonType.FAIRY, null, 0.3, 0.5, Abilities.SWEET_VEIL, Abilities.NONE, Abilities.AROMA_VEIL, 495, 65, 60, 75, 110, 121, 64, 100, 50, 173, false, null, true),
+      new PokemonForm("Mint Cream", "mint-cream", PokemonType.FAIRY, null, 0.3, 0.5, Abilities.SWEET_VEIL, Abilities.NONE, Abilities.AROMA_VEIL, 495, 65, 60, 75, 110, 121, 64, 100, 50, 173, false, null, true),
+      new PokemonForm("Lemon Cream", "lemon-cream", PokemonType.FAIRY, null, 0.3, 0.5, Abilities.SWEET_VEIL, Abilities.NONE, Abilities.AROMA_VEIL, 495, 65, 60, 75, 110, 121, 64, 100, 50, 173, false, null, true),
+      new PokemonForm("Salted Cream", "salted-cream", PokemonType.FAIRY, null, 0.3, 0.5, Abilities.SWEET_VEIL, Abilities.NONE, Abilities.AROMA_VEIL, 495, 65, 60, 75, 110, 121, 64, 100, 50, 173, false, null, true),
+      new PokemonForm("Ruby Swirl", "ruby-swirl", PokemonType.FAIRY, null, 0.3, 0.5, Abilities.SWEET_VEIL, Abilities.NONE, Abilities.AROMA_VEIL, 495, 65, 60, 75, 110, 121, 64, 100, 50, 173, false, null, true),
+      new PokemonForm("Caramel Swirl", "caramel-swirl", PokemonType.FAIRY, null, 0.3, 0.5, Abilities.SWEET_VEIL, Abilities.NONE, Abilities.AROMA_VEIL, 495, 65, 60, 75, 110, 121, 64, 100, 50, 173, false, null, true),
+      new PokemonForm("Rainbow Swirl", "rainbow-swirl", PokemonType.FAIRY, null, 0.3, 0.5, Abilities.SWEET_VEIL, Abilities.NONE, Abilities.AROMA_VEIL, 495, 65, 60, 75, 110, 121, 64, 100, 50, 173, false, null, true),
+      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, PokemonType.FAIRY, null, 30, 999.9, Abilities.MISTY_SURGE, Abilities.NONE, Abilities.MISTY_SURGE, 595, 105, 70, 85, 130, 141, 64, 100, 50, 173),
+    ),
+    new PokemonSpecies(Species.FALINKS, 8, false, false, false, "Formation Pokémon", PokemonType.FIGHTING, null, 3, 62, Abilities.BATTLE_ARMOR, Abilities.NONE, Abilities.DEFIANT, 470, 65, 100, 100, 70, 60, 75, 45, 50, 165, GrowthRate.MEDIUM_FAST, null, false),
+    new PokemonSpecies(Species.PINCURCHIN, 8, false, false, false, "Sea Urchin Pokémon", PokemonType.ELECTRIC, null, 0.3, 1, Abilities.LIGHTNING_ROD, Abilities.NONE, Abilities.ELECTRIC_SURGE, 435, 48, 101, 95, 91, 85, 15, 75, 50, 152, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.SNOM, 8, false, false, false, "Worm Pokémon", PokemonType.ICE, PokemonType.BUG, 0.3, 3.8, Abilities.SHIELD_DUST, Abilities.NONE, Abilities.ICE_SCALES, 185, 30, 25, 35, 45, 30, 20, 190, 50, 37, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.FROSMOTH, 8, false, false, false, "Frost Moth Pokémon", PokemonType.ICE, PokemonType.BUG, 1.3, 42, Abilities.SHIELD_DUST, Abilities.NONE, Abilities.ICE_SCALES, 475, 70, 65, 60, 125, 90, 65, 75, 50, 166, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.STONJOURNER, 8, false, false, false, "Big Rock Pokémon", PokemonType.ROCK, null, 2.5, 520, Abilities.POWER_SPOT, Abilities.NONE, Abilities.NONE, 470, 100, 125, 135, 20, 20, 70, 60, 50, 165, GrowthRate.SLOW, 50, false),
+    new PokemonSpecies(Species.EISCUE, 8, false, false, false, "Penguin Pokémon", PokemonType.ICE, null, 1.4, 89, Abilities.ICE_FACE, Abilities.NONE, Abilities.NONE, 470, 75, 80, 110, 65, 90, 50, 60, 50, 165, GrowthRate.SLOW, 50, false, false,
+      new PokemonForm("Ice Face", "", PokemonType.ICE, null, 1.4, 89, Abilities.ICE_FACE, Abilities.NONE, Abilities.NONE, 470, 75, 80, 110, 65, 90, 50, 60, 50, 165, false, null, true),
+      new PokemonForm("No Ice", "no-ice", PokemonType.ICE, null, 1.4, 89, Abilities.ICE_FACE, Abilities.NONE, Abilities.NONE, 470, 75, 80, 70, 65, 50, 130, 60, 50, 165),
+    ),
+    new PokemonSpecies(Species.INDEEDEE, 8, false, false, false, "Emotion Pokémon", PokemonType.PSYCHIC, PokemonType.NORMAL, 0.9, 28, Abilities.INNER_FOCUS, Abilities.SYNCHRONIZE, Abilities.PSYCHIC_SURGE, 475, 60, 65, 55, 105, 95, 95, 30, 140, 166, GrowthRate.FAST, 50, false, false,
+      new PokemonForm("Male", "male", PokemonType.PSYCHIC, PokemonType.NORMAL, 0.9, 28, Abilities.INNER_FOCUS, Abilities.SYNCHRONIZE, Abilities.PSYCHIC_SURGE, 475, 60, 65, 55, 105, 95, 95, 30, 140, 166, false, "", true),
+      new PokemonForm("Female", "female", PokemonType.PSYCHIC, PokemonType.NORMAL, 0.9, 28, Abilities.OWN_TEMPO, Abilities.SYNCHRONIZE, Abilities.PSYCHIC_SURGE, 475, 70, 55, 65, 95, 105, 85, 30, 140, 166, false, null, true),
+    ),
+    new PokemonSpecies(Species.MORPEKO, 8, false, false, false, "Two-Sided Pokémon", PokemonType.ELECTRIC, PokemonType.DARK, 0.3, 3, Abilities.HUNGER_SWITCH, Abilities.NONE, Abilities.NONE, 436, 58, 95, 58, 70, 58, 97, 180, 50, 153, GrowthRate.MEDIUM_FAST, 50, false, false,
+      new PokemonForm("Full Belly Mode", "full-belly", PokemonType.ELECTRIC, PokemonType.DARK, 0.3, 3, Abilities.HUNGER_SWITCH, Abilities.NONE, Abilities.NONE, 436, 58, 95, 58, 70, 58, 97, 180, 50, 153, false, "", true),
+      new PokemonForm("Hangry Mode", "hangry", PokemonType.ELECTRIC, PokemonType.DARK, 0.3, 3, Abilities.HUNGER_SWITCH, Abilities.NONE, Abilities.NONE, 436, 58, 95, 58, 70, 58, 97, 180, 50, 153),
+    ),
+    new PokemonSpecies(Species.CUFANT, 8, false, false, false, "Copperderm Pokémon", PokemonType.STEEL, null, 1.2, 100, Abilities.SHEER_FORCE, Abilities.NONE, Abilities.HEAVY_METAL, 330, 72, 80, 49, 40, 49, 40, 190, 50, 66, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.COPPERAJAH, 8, false, false, false, "Copperderm Pokémon", PokemonType.STEEL, null, 3, 650, Abilities.SHEER_FORCE, Abilities.NONE, Abilities.HEAVY_METAL, 500, 122, 130, 69, 80, 69, 30, 90, 50, 175, GrowthRate.MEDIUM_FAST, 50, false, true,
+      new PokemonForm("Normal", "", PokemonType.STEEL, null, 3, 650, Abilities.SHEER_FORCE, Abilities.NONE, Abilities.HEAVY_METAL, 500, 122, 130, 69, 80, 69, 30, 90, 50, 175, false, null, true),
+      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, PokemonType.STEEL, PokemonType.GROUND, 23, 999.9, Abilities.MOLD_BREAKER, Abilities.NONE, Abilities.MOLD_BREAKER, 600, 177, 155, 79, 90, 79, 20, 90, 50, 175),
+    ),
+    new PokemonSpecies(Species.DRACOZOLT, 8, false, false, false, "Fossil Pokémon", PokemonType.ELECTRIC, PokemonType.DRAGON, 1.8, 190, Abilities.VOLT_ABSORB, Abilities.HUSTLE, Abilities.SAND_RUSH, 505, 90, 100, 90, 80, 70, 75, 45, 50, 177, GrowthRate.SLOW, null, false),
+    new PokemonSpecies(Species.ARCTOZOLT, 8, false, false, false, "Fossil Pokémon", PokemonType.ELECTRIC, PokemonType.ICE, 2.3, 150, Abilities.VOLT_ABSORB, Abilities.STATIC, Abilities.SLUSH_RUSH, 505, 90, 100, 90, 90, 80, 55, 45, 50, 177, GrowthRate.SLOW, null, false),
+    new PokemonSpecies(Species.DRACOVISH, 8, false, false, false, "Fossil Pokémon", PokemonType.WATER, PokemonType.DRAGON, 2.3, 215, Abilities.WATER_ABSORB, Abilities.STRONG_JAW, Abilities.SAND_RUSH, 505, 90, 90, 100, 70, 80, 75, 45, 50, 177, GrowthRate.SLOW, null, false),
+    new PokemonSpecies(Species.ARCTOVISH, 8, false, false, false, "Fossil Pokémon", PokemonType.WATER, PokemonType.ICE, 2, 175, Abilities.WATER_ABSORB, Abilities.ICE_BODY, Abilities.SLUSH_RUSH, 505, 90, 90, 100, 80, 90, 55, 45, 50, 177, GrowthRate.SLOW, null, false),
+    new PokemonSpecies(Species.DURALUDON, 8, false, false, false, "Alloy Pokémon", PokemonType.STEEL, PokemonType.DRAGON, 1.8, 40, Abilities.LIGHT_METAL, Abilities.HEAVY_METAL, Abilities.STALWART, 535, 70, 95, 115, 120, 50, 85, 45, 50, 187, GrowthRate.MEDIUM_FAST, 50, false, true,
+      new PokemonForm("Normal", "", PokemonType.STEEL, PokemonType.DRAGON, 1.8, 40, Abilities.LIGHT_METAL, Abilities.HEAVY_METAL, Abilities.STALWART, 535, 70, 95, 115, 120, 50, 85, 45, 50, 187, false, null, true),
+      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, PokemonType.STEEL, PokemonType.DRAGON, 43, 999.9, Abilities.LIGHTNING_ROD, Abilities.LIGHTNING_ROD, Abilities.LIGHTNING_ROD, 635, 100, 110, 120, 175, 60, 70, 45, 50, 187),
+    ),
+    new PokemonSpecies(Species.DREEPY, 8, false, false, false, "Lingering Pokémon", PokemonType.DRAGON, PokemonType.GHOST, 0.5, 2, Abilities.CLEAR_BODY, Abilities.INFILTRATOR, Abilities.CURSED_BODY, 270, 28, 60, 30, 40, 30, 82, 45, 50, 54, GrowthRate.SLOW, 50, false),
+    new PokemonSpecies(Species.DRAKLOAK, 8, false, false, false, "Caretaker Pokémon", PokemonType.DRAGON, PokemonType.GHOST, 1.4, 11, Abilities.CLEAR_BODY, Abilities.INFILTRATOR, Abilities.CURSED_BODY, 410, 68, 80, 50, 60, 50, 102, 45, 50, 144, GrowthRate.SLOW, 50, false),
+    new PokemonSpecies(Species.DRAGAPULT, 8, false, false, false, "Stealth Pokémon", PokemonType.DRAGON, PokemonType.GHOST, 3, 50, Abilities.CLEAR_BODY, Abilities.INFILTRATOR, Abilities.CURSED_BODY, 600, 88, 120, 75, 100, 75, 142, 45, 50, 300, GrowthRate.SLOW, 50, false),
+    new PokemonSpecies(Species.ZACIAN, 8, false, true, false, "Warrior Pokémon", PokemonType.FAIRY, null, 2.8, 110, Abilities.INTREPID_SWORD, Abilities.NONE, Abilities.NONE, 660, 92, 120, 115, 80, 115, 138, 10, 0, 335, GrowthRate.SLOW, null, false, false,
+      new PokemonForm("Hero of Many Battles", "hero-of-many-battles", PokemonType.FAIRY, null, 2.8, 110, Abilities.INTREPID_SWORD, Abilities.NONE, Abilities.NONE, 660, 92, 120, 115, 80, 115, 138, 10, 0, 335, false, "", true),
+      new PokemonForm("Crowned", "crowned", PokemonType.FAIRY, PokemonType.STEEL, 2.8, 355, Abilities.INTREPID_SWORD, Abilities.NONE, Abilities.NONE, 700, 92, 150, 115, 80, 115, 148, 10, 0, 360),
+    ),
+    new PokemonSpecies(Species.ZAMAZENTA, 8, false, true, false, "Warrior Pokémon", PokemonType.FIGHTING, null, 2.9, 210, Abilities.DAUNTLESS_SHIELD, Abilities.NONE, Abilities.NONE, 660, 92, 120, 115, 80, 115, 138, 10, 0, 335, GrowthRate.SLOW, null, false, false,
+      new PokemonForm("Hero of Many Battles", "hero-of-many-battles", PokemonType.FIGHTING, null, 2.9, 210, Abilities.DAUNTLESS_SHIELD, Abilities.NONE, Abilities.NONE, 660, 92, 120, 115, 80, 115, 138, 10, 0, 335, false, "", true),
+      new PokemonForm("Crowned", "crowned", PokemonType.FIGHTING, PokemonType.STEEL, 2.9, 785, Abilities.DAUNTLESS_SHIELD, Abilities.NONE, Abilities.NONE, 700, 92, 120, 140, 80, 140, 128, 10, 0, 360),
+    ),
+    new PokemonSpecies(Species.ETERNATUS, 8, false, true, false, "Gigantic Pokémon", PokemonType.POISON, PokemonType.DRAGON, 20, 950, Abilities.PRESSURE, Abilities.NONE, Abilities.NONE, 690, 140, 85, 95, 145, 95, 130, 255, 0, 345, GrowthRate.SLOW, null, false, true,
+      new PokemonForm("Normal", "", PokemonType.POISON, PokemonType.DRAGON, 20, 950, Abilities.PRESSURE, Abilities.NONE, Abilities.NONE, 690, 140, 85, 95, 145, 95, 130, 255, 0, 345, false, null, true),
+      new PokemonForm("E-Max", "eternamax", PokemonType.POISON, PokemonType.DRAGON, 100, 999.9, Abilities.PRESSURE, Abilities.NONE, Abilities.NONE, 1125, 255, 115, 250, 125, 250, 130, 255, 0, 345),
+    ),
+    new PokemonSpecies(Species.KUBFU, 8, true, false, false, "Wushu Pokémon", PokemonType.FIGHTING, null, 0.6, 12, Abilities.INNER_FOCUS, Abilities.NONE, Abilities.NONE, 385, 60, 90, 60, 53, 50, 72, 3, 50, 77, GrowthRate.SLOW, 87.5, false),
+    new PokemonSpecies(Species.URSHIFU, 8, true, false, false, "Wushu Pokémon", PokemonType.FIGHTING, PokemonType.DARK, 1.9, 105, Abilities.UNSEEN_FIST, Abilities.NONE, Abilities.NONE, 550, 100, 130, 100, 63, 60, 97, 3, 50, 275, GrowthRate.SLOW, 87.5, false, true,
+      new PokemonForm("Single Strike Style", "single-strike", PokemonType.FIGHTING, PokemonType.DARK, 1.9, 105, Abilities.UNSEEN_FIST, Abilities.NONE, Abilities.NONE, 550, 100, 130, 100, 63, 60, 97, 3, 50, 275, false, "", true),
+      new PokemonForm("Rapid Strike Style", "rapid-strike", PokemonType.FIGHTING, PokemonType.WATER, 1.9, 105, Abilities.UNSEEN_FIST, Abilities.NONE, Abilities.NONE, 550, 100, 130, 100, 63, 60, 97, 3, 50, 275, false, null, true),
+      new PokemonForm("G-Max Single Strike Style", SpeciesFormKey.GIGANTAMAX_SINGLE, PokemonType.FIGHTING, PokemonType.DARK, 29, 999.9, Abilities.UNSEEN_FIST, Abilities.NONE, Abilities.NONE, 650, 125, 145, 115, 83, 70, 112, 3, 50, 275),
+      new PokemonForm("G-Max Rapid Strike Style", SpeciesFormKey.GIGANTAMAX_RAPID, PokemonType.FIGHTING, PokemonType.WATER, 26, 999.9, Abilities.UNSEEN_FIST, Abilities.NONE, Abilities.NONE, 650, 125, 145, 115, 83, 70, 112, 3, 50, 275),
+    ),
+    new PokemonSpecies(Species.ZARUDE, 8, false, false, true, "Rogue Monkey Pokémon", PokemonType.DARK, PokemonType.GRASS, 1.8, 70, Abilities.LEAF_GUARD, Abilities.NONE, Abilities.NONE, 600, 105, 120, 105, 70, 95, 105, 3, 0, 300, GrowthRate.SLOW, null, false, false,
+      new PokemonForm("Normal", "", PokemonType.DARK, PokemonType.GRASS, 1.8, 70, Abilities.LEAF_GUARD, Abilities.NONE, Abilities.NONE, 600, 105, 120, 105, 70, 95, 105, 3, 0, 300, false, null, true),
+      new PokemonForm("Dada", "dada", PokemonType.DARK, PokemonType.GRASS, 1.8, 70, Abilities.LEAF_GUARD, Abilities.NONE, Abilities.NONE, 600, 105, 120, 105, 70, 95, 105, 3, 0, 300, false, null, true),
+    ),
+    new PokemonSpecies(Species.REGIELEKI, 8, true, false, false, "Electron Pokémon", PokemonType.ELECTRIC, null, 1.2, 145, Abilities.TRANSISTOR, Abilities.NONE, Abilities.NONE, 580, 80, 100, 50, 100, 50, 200, 3, 35, 290, GrowthRate.SLOW, null, false),
+    new PokemonSpecies(Species.REGIDRAGO, 8, true, false, false, "Dragon Orb Pokémon", PokemonType.DRAGON, null, 2.1, 200, Abilities.DRAGONS_MAW, Abilities.NONE, Abilities.NONE, 580, 200, 100, 50, 100, 50, 80, 3, 35, 290, GrowthRate.SLOW, null, false),
+    new PokemonSpecies(Species.GLASTRIER, 8, true, false, false, "Wild Horse Pokémon", PokemonType.ICE, null, 2.2, 800, Abilities.CHILLING_NEIGH, Abilities.NONE, Abilities.NONE, 580, 100, 145, 130, 65, 110, 30, 3, 35, 290, GrowthRate.SLOW, null, false),
+    new PokemonSpecies(Species.SPECTRIER, 8, true, false, false, "Swift Horse Pokémon", PokemonType.GHOST, null, 2, 44.5, Abilities.GRIM_NEIGH, Abilities.NONE, Abilities.NONE, 580, 100, 65, 60, 145, 80, 130, 3, 35, 290, GrowthRate.SLOW, null, false),
+    new PokemonSpecies(Species.CALYREX, 8, false, true, false, "King Pokémon", PokemonType.PSYCHIC, PokemonType.GRASS, 1.1, 7.7, Abilities.UNNERVE, Abilities.NONE, Abilities.NONE, 500, 100, 80, 80, 80, 80, 80, 3, 100, 250, GrowthRate.SLOW, null, false, true,
+      new PokemonForm("Normal", "", PokemonType.PSYCHIC, PokemonType.GRASS, 1.1, 7.7, Abilities.UNNERVE, Abilities.NONE, Abilities.NONE, 500, 100, 80, 80, 80, 80, 80, 3, 100, 250, false, null, true),
+      new PokemonForm("Ice", "ice", PokemonType.PSYCHIC, PokemonType.ICE, 2.4, 809.1, Abilities.AS_ONE_GLASTRIER, Abilities.NONE, Abilities.NONE, 680, 100, 165, 150, 85, 130, 50, 3, 100, 340),
+      new PokemonForm("Shadow", "shadow", PokemonType.PSYCHIC, PokemonType.GHOST, 2.4, 53.6, Abilities.AS_ONE_SPECTRIER, Abilities.NONE, Abilities.NONE, 680, 100, 85, 80, 165, 100, 150, 3, 100, 340),
+    ),
+    new PokemonSpecies(Species.WYRDEER, 8, false, false, false, "Big Horn Pokémon", PokemonType.NORMAL, PokemonType.PSYCHIC, 1.8, 95.1, Abilities.INTIMIDATE, Abilities.FRISK, Abilities.SAP_SIPPER, 525, 103, 105, 72, 105, 75, 65, 135, 50, 263, GrowthRate.SLOW, 50, false),
+    new PokemonSpecies(Species.KLEAVOR, 8, false, false, false, "Axe Pokémon", PokemonType.BUG, PokemonType.ROCK, 1.8, 89, Abilities.SWARM, Abilities.SHEER_FORCE, Abilities.SHARPNESS, 500, 70, 135, 95, 45, 70, 85, 115, 50, 175, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.URSALUNA, 8, false, false, false, "Peat Pokémon", PokemonType.GROUND, PokemonType.NORMAL, 2.4, 290, Abilities.GUTS, Abilities.BULLETPROOF, Abilities.UNNERVE, 550, 130, 140, 105, 45, 80, 50, 75, 50, 275, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.BASCULEGION, 8, false, false, false, "Big Fish Pokémon", PokemonType.WATER, PokemonType.GHOST, 3, 110, Abilities.SWIFT_SWIM, Abilities.ADAPTABILITY, Abilities.MOLD_BREAKER, 530, 120, 112, 65, 80, 75, 78, 135, 50, 265, GrowthRate.MEDIUM_FAST, 50, false, false,
+      new PokemonForm("Male", "male", PokemonType.WATER, PokemonType.GHOST, 3, 110, Abilities.SWIFT_SWIM, Abilities.ADAPTABILITY, Abilities.MOLD_BREAKER, 530, 120, 112, 65, 80, 75, 78, 135, 50, 265, false, "", true),
+      new PokemonForm("Female", "female", PokemonType.WATER, PokemonType.GHOST, 3, 110, Abilities.SWIFT_SWIM, Abilities.ADAPTABILITY, Abilities.MOLD_BREAKER, 530, 120, 92, 65, 100, 75, 78, 135, 50, 265, false, null, true),
+    ),
+    new PokemonSpecies(Species.SNEASLER, 8, false, false, false, "Free Climb Pokémon", PokemonType.FIGHTING, PokemonType.POISON, 1.3, 43, Abilities.PRESSURE, Abilities.UNBURDEN, Abilities.POISON_TOUCH, 510, 80, 130, 60, 40, 80, 120, 135, 50, 102, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.OVERQWIL, 8, false, false, false, "Pin Cluster Pokémon", PokemonType.DARK, PokemonType.POISON, 2.5, 60.5, Abilities.POISON_POINT, Abilities.SWIFT_SWIM, Abilities.INTIMIDATE, 510, 85, 115, 95, 65, 65, 85, 135, 50, 179, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.ENAMORUS, 8, true, false, false, "Love-Hate Pokémon", PokemonType.FAIRY, PokemonType.FLYING, 1.6, 48, Abilities.CUTE_CHARM, Abilities.NONE, Abilities.CONTRARY, 580, 74, 115, 70, 135, 80, 106, 3, 50, 116, GrowthRate.SLOW, 0, false, true,
+      new PokemonForm("Incarnate Forme", "incarnate", PokemonType.FAIRY, PokemonType.FLYING, 1.6, 48, Abilities.CUTE_CHARM, Abilities.NONE, Abilities.CONTRARY, 580, 74, 115, 70, 135, 80, 106, 3, 50, 116, false, null, true),
+      new PokemonForm("Therian Forme", "therian", PokemonType.FAIRY, PokemonType.FLYING, 1.6, 48, Abilities.OVERCOAT, Abilities.NONE, Abilities.OVERCOAT, 580, 74, 115, 110, 135, 100, 46, 3, 50, 116),
+    ),
+    new PokemonSpecies(Species.SPRIGATITO, 9, false, false, false, "Grass Cat Pokémon", PokemonType.GRASS, null, 0.4, 4.1, Abilities.OVERGROW, Abilities.NONE, Abilities.PROTEAN, 310, 40, 61, 54, 45, 45, 65, 45, 50, 62, GrowthRate.MEDIUM_SLOW, 87.5, false),
+    new PokemonSpecies(Species.FLORAGATO, 9, false, false, false, "Grass Cat Pokémon", PokemonType.GRASS, null, 0.9, 12.2, Abilities.OVERGROW, Abilities.NONE, Abilities.PROTEAN, 410, 61, 80, 63, 60, 63, 83, 45, 50, 144, GrowthRate.MEDIUM_SLOW, 87.5, false),
+    new PokemonSpecies(Species.MEOWSCARADA, 9, false, false, false, "Magician Pokémon", PokemonType.GRASS, PokemonType.DARK, 1.5, 31.2, Abilities.OVERGROW, Abilities.NONE, Abilities.PROTEAN, 530, 76, 110, 70, 81, 70, 123, 45, 50, 265, GrowthRate.MEDIUM_SLOW, 87.5, false),
+    new PokemonSpecies(Species.FUECOCO, 9, false, false, false, "Fire Croc Pokémon", PokemonType.FIRE, null, 0.4, 9.8, Abilities.BLAZE, Abilities.NONE, Abilities.UNAWARE, 310, 67, 45, 59, 63, 40, 36, 45, 50, 62, GrowthRate.MEDIUM_SLOW, 87.5, false),
+    new PokemonSpecies(Species.CROCALOR, 9, false, false, false, "Fire Croc Pokémon", PokemonType.FIRE, null, 1, 30.7, Abilities.BLAZE, Abilities.NONE, Abilities.UNAWARE, 411, 81, 55, 78, 90, 58, 49, 45, 50, 144, GrowthRate.MEDIUM_SLOW, 87.5, false),
+    new PokemonSpecies(Species.SKELEDIRGE, 9, false, false, false, "Singer Pokémon", PokemonType.FIRE, PokemonType.GHOST, 1.6, 326.5, Abilities.BLAZE, Abilities.NONE, Abilities.UNAWARE, 530, 104, 75, 100, 110, 75, 66, 45, 50, 265, GrowthRate.MEDIUM_SLOW, 87.5, false),
+    new PokemonSpecies(Species.QUAXLY, 9, false, false, false, "Duckling Pokémon", PokemonType.WATER, null, 0.5, 6.1, Abilities.TORRENT, Abilities.NONE, Abilities.MOXIE, 310, 55, 65, 45, 50, 45, 50, 45, 50, 62, GrowthRate.MEDIUM_SLOW, 87.5, false),
+    new PokemonSpecies(Species.QUAXWELL, 9, false, false, false, "Practicing Pokémon", PokemonType.WATER, null, 1.2, 21.5, Abilities.TORRENT, Abilities.NONE, Abilities.MOXIE, 410, 70, 85, 65, 65, 60, 65, 45, 50, 144, GrowthRate.MEDIUM_SLOW, 87.5, false),
+    new PokemonSpecies(Species.QUAQUAVAL, 9, false, false, false, "Dancer Pokémon", PokemonType.WATER, PokemonType.FIGHTING, 1.8, 61.9, Abilities.TORRENT, Abilities.NONE, Abilities.MOXIE, 530, 85, 120, 80, 85, 75, 85, 45, 50, 265, GrowthRate.MEDIUM_SLOW, 87.5, false),
+    new PokemonSpecies(Species.LECHONK, 9, false, false, false, "Hog Pokémon", PokemonType.NORMAL, null, 0.5, 10.2, Abilities.AROMA_VEIL, Abilities.GLUTTONY, Abilities.THICK_FAT, 254, 54, 45, 40, 35, 45, 35, 255, 50, 51, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.OINKOLOGNE, 9, false, false, false, "Hog Pokémon", PokemonType.NORMAL, null, 1, 120, Abilities.LINGERING_AROMA, Abilities.GLUTTONY, Abilities.THICK_FAT, 489, 110, 100, 75, 59, 80, 65, 100, 50, 171, GrowthRate.MEDIUM_FAST, 50, false, false,
+      new PokemonForm("Male", "male", PokemonType.NORMAL, null, 1, 120, Abilities.LINGERING_AROMA, Abilities.GLUTTONY, Abilities.THICK_FAT, 489, 110, 100, 75, 59, 80, 65, 100, 50, 171, false, "", true),
+      new PokemonForm("Female", "female", PokemonType.NORMAL, null, 1, 120, Abilities.AROMA_VEIL, Abilities.GLUTTONY, Abilities.THICK_FAT, 489, 115, 90, 70, 59, 90, 65, 100, 50, 171, false, null, true),
+    ),
+    new PokemonSpecies(Species.TAROUNTULA, 9, false, false, false, "String Ball Pokémon", PokemonType.BUG, null, 0.3, 4, Abilities.INSOMNIA, Abilities.NONE, Abilities.STAKEOUT, 210, 35, 41, 45, 29, 40, 20, 255, 50, 42, GrowthRate.ERRATIC, 50, false),
+    new PokemonSpecies(Species.SPIDOPS, 9, false, false, false, "Trap Pokémon", PokemonType.BUG, null, 1, 16.5, Abilities.INSOMNIA, Abilities.NONE, Abilities.STAKEOUT, 404, 60, 79, 92, 52, 86, 35, 120, 50, 141, GrowthRate.ERRATIC, 50, false),
+    new PokemonSpecies(Species.NYMBLE, 9, false, false, false, "Grasshopper Pokémon", PokemonType.BUG, null, 0.2, 1, Abilities.SWARM, Abilities.NONE, Abilities.TINTED_LENS, 210, 33, 46, 40, 21, 25, 45, 190, 20, 42, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.LOKIX, 9, false, false, false, "Grasshopper Pokémon", PokemonType.BUG, PokemonType.DARK, 1, 17.5, Abilities.SWARM, Abilities.NONE, Abilities.TINTED_LENS, 450, 71, 102, 78, 52, 55, 92, 30, 0, 158, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.PAWMI, 9, false, false, false, "Mouse Pokémon", PokemonType.ELECTRIC, null, 0.3, 2.5, Abilities.STATIC, Abilities.NATURAL_CURE, Abilities.IRON_FIST, 240, 45, 50, 20, 40, 25, 60, 190, 50, 48, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.PAWMO, 9, false, false, false, "Mouse Pokémon", PokemonType.ELECTRIC, PokemonType.FIGHTING, 0.4, 6.5, Abilities.VOLT_ABSORB, Abilities.NATURAL_CURE, Abilities.IRON_FIST, 350, 60, 75, 40, 50, 40, 85, 80, 50, 123, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.PAWMOT, 9, false, false, false, "Hands-On Pokémon", PokemonType.ELECTRIC, PokemonType.FIGHTING, 0.9, 41, Abilities.VOLT_ABSORB, Abilities.NATURAL_CURE, Abilities.IRON_FIST, 490, 70, 115, 70, 70, 60, 105, 45, 50, 245, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.TANDEMAUS, 9, false, false, false, "Couple Pokémon", PokemonType.NORMAL, null, 0.3, 1.8, Abilities.RUN_AWAY, Abilities.PICKUP, Abilities.OWN_TEMPO, 305, 50, 50, 45, 40, 45, 75, 150, 50, 61, GrowthRate.FAST, null, false),
+    new PokemonSpecies(Species.MAUSHOLD, 9, false, false, false, "Family Pokémon", PokemonType.NORMAL, null, 0.3, 2.3, Abilities.FRIEND_GUARD, Abilities.CHEEK_POUCH, Abilities.TECHNICIAN, 470, 74, 75, 70, 65, 75, 111, 75, 50, 165, GrowthRate.FAST, null, false, false,
+      new PokemonForm("Family of Four", "four", PokemonType.NORMAL, null, 0.3, 2.8, Abilities.FRIEND_GUARD, Abilities.CHEEK_POUCH, Abilities.TECHNICIAN, 470, 74, 75, 70, 65, 75, 111, 75, 50, 165),
+      new PokemonForm("Family of Three", "three", PokemonType.NORMAL, null, 0.3, 2.3, Abilities.FRIEND_GUARD, Abilities.CHEEK_POUCH, Abilities.TECHNICIAN, 470, 74, 75, 70, 65, 75, 111, 75, 50, 165),
+    ),
+    new PokemonSpecies(Species.FIDOUGH, 9, false, false, false, "Puppy Pokémon", PokemonType.FAIRY, null, 0.3, 10.9, Abilities.OWN_TEMPO, Abilities.NONE, Abilities.KLUTZ, 312, 37, 55, 70, 30, 55, 65, 190, 50, 62, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.DACHSBUN, 9, false, false, false, "Dog Pokémon", PokemonType.FAIRY, null, 0.5, 14.9, Abilities.WELL_BAKED_BODY, Abilities.NONE, Abilities.AROMA_VEIL, 477, 57, 80, 115, 50, 80, 95, 90, 50, 167, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.SMOLIV, 9, false, false, false, "Olive Pokémon", PokemonType.GRASS, PokemonType.NORMAL, 0.3, 6.5, Abilities.EARLY_BIRD, Abilities.NONE, Abilities.HARVEST, 260, 41, 35, 45, 58, 51, 30, 255, 50, 52, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.DOLLIV, 9, false, false, false, "Olive Pokémon", PokemonType.GRASS, PokemonType.NORMAL, 0.6, 11.9, Abilities.EARLY_BIRD, Abilities.NONE, Abilities.HARVEST, 354, 52, 53, 60, 78, 78, 33, 120, 50, 124, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.ARBOLIVA, 9, false, false, false, "Olive Pokémon", PokemonType.GRASS, PokemonType.NORMAL, 1.4, 48.2, Abilities.SEED_SOWER, Abilities.NONE, Abilities.HARVEST, 510, 78, 69, 90, 125, 109, 39, 45, 50, 255, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.SQUAWKABILLY, 9, false, false, false, "Parrot Pokémon", PokemonType.NORMAL, PokemonType.FLYING, 0.6, 2.4, Abilities.INTIMIDATE, Abilities.HUSTLE, Abilities.GUTS, 417, 82, 96, 51, 45, 51, 92, 190, 50, 146, GrowthRate.ERRATIC, 50, false, false,
+      new PokemonForm("Green Plumage", "green-plumage", PokemonType.NORMAL, PokemonType.FLYING, 0.6, 2.4, Abilities.INTIMIDATE, Abilities.HUSTLE, Abilities.GUTS, 417, 82, 96, 51, 45, 51, 92, 190, 50, 146, false, null, true),
+      new PokemonForm("Blue Plumage", "blue-plumage", PokemonType.NORMAL, PokemonType.FLYING, 0.6, 2.4, Abilities.INTIMIDATE, Abilities.HUSTLE, Abilities.GUTS, 417, 82, 96, 51, 45, 51, 92, 190, 50, 146, false, null, true),
+      new PokemonForm("Yellow Plumage", "yellow-plumage", PokemonType.NORMAL, PokemonType.FLYING, 0.6, 2.4, Abilities.INTIMIDATE, Abilities.HUSTLE, Abilities.SHEER_FORCE, 417, 82, 96, 51, 45, 51, 92, 190, 50, 146, false, null, true),
+      new PokemonForm("White Plumage", "white-plumage", PokemonType.NORMAL, PokemonType.FLYING, 0.6, 2.4, Abilities.INTIMIDATE, Abilities.HUSTLE, Abilities.SHEER_FORCE, 417, 82, 96, 51, 45, 51, 92, 190, 50, 146, false, null, true),
+    ),
+    new PokemonSpecies(Species.NACLI, 9, false, false, false, "Rock Salt Pokémon", PokemonType.ROCK, null, 0.4, 16, Abilities.PURIFYING_SALT, Abilities.STURDY, Abilities.CLEAR_BODY, 280, 55, 55, 75, 35, 35, 25, 255, 50, 56, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.NACLSTACK, 9, false, false, false, "Rock Salt Pokémon", PokemonType.ROCK, null, 0.6, 105, Abilities.PURIFYING_SALT, Abilities.STURDY, Abilities.CLEAR_BODY, 355, 60, 60, 100, 35, 65, 35, 120, 50, 124, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.GARGANACL, 9, false, false, false, "Rock Salt Pokémon", PokemonType.ROCK, null, 2.3, 240, Abilities.PURIFYING_SALT, Abilities.STURDY, Abilities.CLEAR_BODY, 500, 100, 100, 130, 45, 90, 35, 45, 50, 250, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.CHARCADET, 9, false, false, false, "Fire Child Pokémon", PokemonType.FIRE, null, 0.6, 10.5, Abilities.FLASH_FIRE, Abilities.NONE, Abilities.FLAME_BODY, 255, 40, 50, 40, 50, 40, 35, 90, 50, 51, GrowthRate.SLOW, 50, false),
+    new PokemonSpecies(Species.ARMAROUGE, 9, false, false, false, "Fire Warrior Pokémon", PokemonType.FIRE, PokemonType.PSYCHIC, 1.5, 85, Abilities.FLASH_FIRE, Abilities.NONE, Abilities.WEAK_ARMOR, 525, 85, 60, 100, 125, 80, 75, 25, 20, 263, GrowthRate.SLOW, 50, false),
+    new PokemonSpecies(Species.CERULEDGE, 9, false, false, false, "Fire Blades Pokémon", PokemonType.FIRE, PokemonType.GHOST, 1.6, 62, Abilities.FLASH_FIRE, Abilities.NONE, Abilities.WEAK_ARMOR, 525, 75, 125, 80, 60, 100, 85, 25, 20, 263, GrowthRate.SLOW, 50, false),
+    new PokemonSpecies(Species.TADBULB, 9, false, false, false, "EleTadpole Pokémon", PokemonType.ELECTRIC, null, 0.3, 0.4, Abilities.OWN_TEMPO, Abilities.STATIC, Abilities.DAMP, 272, 61, 31, 41, 59, 35, 45, 190, 50, 54, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.BELLIBOLT, 9, false, false, false, "EleFrog Pokémon", PokemonType.ELECTRIC, null, 1.2, 113, Abilities.ELECTROMORPHOSIS, Abilities.STATIC, Abilities.DAMP, 495, 109, 64, 91, 103, 83, 45, 50, 50, 173, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.WATTREL, 9, false, false, false, "Storm Petrel Pokémon", PokemonType.ELECTRIC, PokemonType.FLYING, 0.4, 3.6, Abilities.WIND_POWER, Abilities.VOLT_ABSORB, Abilities.COMPETITIVE, 280, 40, 40, 35, 55, 40, 70, 180, 50, 56, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.KILOWATTREL, 9, false, false, false, "Frigatebird Pokémon", PokemonType.ELECTRIC, PokemonType.FLYING, 1.4, 38.6, Abilities.WIND_POWER, Abilities.VOLT_ABSORB, Abilities.COMPETITIVE, 490, 70, 70, 60, 105, 60, 125, 90, 50, 172, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.MASCHIFF, 9, false, false, false, "Rascal Pokémon", PokemonType.DARK, null, 0.5, 16, Abilities.INTIMIDATE, Abilities.RUN_AWAY, Abilities.STAKEOUT, 340, 60, 78, 60, 40, 51, 51, 150, 50, 68, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.MABOSSTIFF, 9, false, false, false, "Boss Pokémon", PokemonType.DARK, null, 1.1, 61, Abilities.INTIMIDATE, Abilities.GUARD_DOG, Abilities.STAKEOUT, 505, 80, 120, 90, 60, 70, 85, 75, 50, 177, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.SHROODLE, 9, false, false, false, "Toxic Mouse Pokémon", PokemonType.POISON, PokemonType.NORMAL, 0.2, 0.7, Abilities.UNBURDEN, Abilities.PICKPOCKET, Abilities.PRANKSTER, 290, 40, 65, 35, 40, 35, 75, 190, 50, 58, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.GRAFAIAI, 9, false, false, false, "Toxic Monkey Pokémon", PokemonType.POISON, PokemonType.NORMAL, 0.7, 27.2, Abilities.UNBURDEN, Abilities.POISON_TOUCH, Abilities.PRANKSTER, 485, 63, 95, 65, 80, 72, 110, 90, 50, 170, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.BRAMBLIN, 9, false, false, false, "Tumbleweed Pokémon", PokemonType.GRASS, PokemonType.GHOST, 0.6, 0.6, Abilities.WIND_RIDER, Abilities.NONE, Abilities.INFILTRATOR, 275, 40, 65, 30, 45, 35, 60, 190, 50, 55, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.BRAMBLEGHAST, 9, false, false, false, "Tumbleweed Pokémon", PokemonType.GRASS, PokemonType.GHOST, 1.2, 6, Abilities.WIND_RIDER, Abilities.NONE, Abilities.INFILTRATOR, 480, 55, 115, 70, 80, 70, 90, 45, 50, 168, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.TOEDSCOOL, 9, false, false, false, "Woodear Pokémon", PokemonType.GROUND, PokemonType.GRASS, 0.9, 33, Abilities.MYCELIUM_MIGHT, Abilities.NONE, Abilities.NONE, 335, 40, 40, 35, 50, 100, 70, 190, 50, 67, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.TOEDSCRUEL, 9, false, false, false, "Woodear Pokémon", PokemonType.GROUND, PokemonType.GRASS, 1.9, 58, Abilities.MYCELIUM_MIGHT, Abilities.NONE, Abilities.NONE, 515, 80, 70, 65, 80, 120, 100, 90, 50, 180, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.KLAWF, 9, false, false, false, "Ambush Pokémon", PokemonType.ROCK, null, 1.3, 79, Abilities.ANGER_SHELL, Abilities.SHELL_ARMOR, Abilities.REGENERATOR, 450, 70, 100, 115, 35, 55, 75, 120, 50, 158, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.CAPSAKID, 9, false, false, false, "Spicy Pepper Pokémon", PokemonType.GRASS, null, 0.3, 3, Abilities.CHLOROPHYLL, Abilities.INSOMNIA, Abilities.KLUTZ, 304, 50, 62, 40, 62, 40, 50, 190, 50, 61, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.SCOVILLAIN, 9, false, false, false, "Spicy Pepper Pokémon", PokemonType.GRASS, PokemonType.FIRE, 0.9, 15, Abilities.CHLOROPHYLL, Abilities.INSOMNIA, Abilities.MOODY, 486, 65, 108, 65, 108, 65, 75, 75, 50, 170, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.RELLOR, 9, false, false, false, "Rolling Pokémon", PokemonType.BUG, null, 0.2, 1, Abilities.COMPOUND_EYES, Abilities.NONE, Abilities.SHED_SKIN, 270, 41, 50, 60, 31, 58, 30, 190, 50, 54, GrowthRate.FAST, 50, false),
+    new PokemonSpecies(Species.RABSCA, 9, false, false, false, "Rolling Pokémon", PokemonType.BUG, PokemonType.PSYCHIC, 0.3, 3.5, Abilities.SYNCHRONIZE, Abilities.NONE, Abilities.TELEPATHY, 470, 75, 50, 85, 115, 100, 45, 45, 50, 165, GrowthRate.FAST, 50, false),
+    new PokemonSpecies(Species.FLITTLE, 9, false, false, false, "Frill Pokémon", PokemonType.PSYCHIC, null, 0.2, 1.5, Abilities.ANTICIPATION, Abilities.FRISK, Abilities.SPEED_BOOST, 255, 30, 35, 30, 55, 30, 75, 120, 50, 51, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.ESPATHRA, 9, false, false, false, "Ostrich Pokémon", PokemonType.PSYCHIC, null, 1.9, 90, Abilities.OPPORTUNIST, Abilities.FRISK, Abilities.SPEED_BOOST, 481, 95, 60, 60, 101, 60, 105, 60, 50, 168, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.TINKATINK, 9, false, false, false, "Metalsmith Pokémon", PokemonType.FAIRY, PokemonType.STEEL, 0.4, 8.9, Abilities.MOLD_BREAKER, Abilities.OWN_TEMPO, Abilities.PICKPOCKET, 297, 50, 45, 45, 35, 64, 58, 190, 50, 59, GrowthRate.MEDIUM_SLOW, 0, false),
+    new PokemonSpecies(Species.TINKATUFF, 9, false, false, false, "Hammer Pokémon", PokemonType.FAIRY, PokemonType.STEEL, 0.7, 59.1, Abilities.MOLD_BREAKER, Abilities.OWN_TEMPO, Abilities.PICKPOCKET, 380, 65, 55, 55, 45, 82, 78, 90, 50, 133, GrowthRate.MEDIUM_SLOW, 0, false),
+    new PokemonSpecies(Species.TINKATON, 9, false, false, false, "Hammer Pokémon", PokemonType.FAIRY, PokemonType.STEEL, 0.7, 112.8, Abilities.MOLD_BREAKER, Abilities.OWN_TEMPO, Abilities.PICKPOCKET, 506, 85, 75, 77, 70, 105, 94, 45, 50, 253, GrowthRate.MEDIUM_SLOW, 0, false),
+    new PokemonSpecies(Species.WIGLETT, 9, false, false, false, "Garden Eel Pokémon", PokemonType.WATER, null, 1.2, 1.8, Abilities.GOOEY, Abilities.RATTLED, Abilities.SAND_VEIL, 245, 10, 55, 25, 35, 25, 95, 255, 50, 49, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.WUGTRIO, 9, false, false, false, "Garden Eel Pokémon", PokemonType.WATER, null, 1.2, 5.4, Abilities.GOOEY, Abilities.RATTLED, Abilities.SAND_VEIL, 425, 35, 100, 50, 50, 70, 120, 50, 50, 149, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.BOMBIRDIER, 9, false, false, false, "Item Drop Pokémon", PokemonType.FLYING, PokemonType.DARK, 1.5, 42.9, Abilities.BIG_PECKS, Abilities.KEEN_EYE, Abilities.ROCKY_PAYLOAD, 485, 70, 103, 85, 60, 85, 82, 25, 50, 243, GrowthRate.SLOW, 50, false),
+    new PokemonSpecies(Species.FINIZEN, 9, false, false, false, "Dolphin Pokémon", PokemonType.WATER, null, 1.3, 60.2, Abilities.WATER_VEIL, Abilities.NONE, Abilities.NONE, 315, 70, 45, 40, 45, 40, 75, 200, 50, 63, GrowthRate.SLOW, 50, false),
+    new PokemonSpecies(Species.PALAFIN, 9, false, false, false, "Dolphin Pokémon", PokemonType.WATER, null, 1.3, 60.2, Abilities.ZERO_TO_HERO, Abilities.NONE, Abilities.NONE, 457, 100, 70, 72, 53, 62, 100, 45, 50, 160, GrowthRate.SLOW, 50, false, true,
+      new PokemonForm("Zero Form", "zero", PokemonType.WATER, null, 1.3, 60.2, Abilities.ZERO_TO_HERO, Abilities.NONE, Abilities.ZERO_TO_HERO, 457, 100, 70, 72, 53, 62, 100, 45, 50, 160, false, null, true),
+      new PokemonForm("Hero Form", "hero", PokemonType.WATER, null, 1.8, 97.4, Abilities.ZERO_TO_HERO, Abilities.NONE, Abilities.ZERO_TO_HERO, 650, 100, 160, 97, 106, 87, 100, 45, 50, 160),
+    ),
+    new PokemonSpecies(Species.VAROOM, 9, false, false, false, "Single-Cyl Pokémon", PokemonType.STEEL, PokemonType.POISON, 1, 35, Abilities.OVERCOAT, Abilities.NONE, Abilities.SLOW_START, 300, 45, 70, 63, 30, 45, 47, 190, 50, 60, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.REVAVROOM, 9, false, false, false, "Multi-Cyl Pokémon", PokemonType.STEEL, PokemonType.POISON, 1.8, 120, Abilities.OVERCOAT, Abilities.NONE, Abilities.FILTER, 500, 80, 119, 90, 54, 67, 90, 75, 50, 175, GrowthRate.MEDIUM_FAST, 50, false, false,
+      new PokemonForm("Normal", "", PokemonType.STEEL, PokemonType.POISON, 1.8, 120, Abilities.OVERCOAT, Abilities.NONE, Abilities.FILTER, 500, 80, 119, 90, 54, 67, 90, 75, 50, 175, false, null, true),
+      new PokemonForm("Segin Starmobile", "segin-starmobile", PokemonType.STEEL, PokemonType.DARK, 1.8, 240, Abilities.INTIMIDATE, Abilities.NONE, Abilities.INTIMIDATE, 600, 110, 129, 100, 77, 79, 105, 75, 50, 175, false, null, false, true),
+      new PokemonForm("Schedar Starmobile", "schedar-starmobile", PokemonType.STEEL, PokemonType.FIRE, 1.8, 240, Abilities.SPEED_BOOST, Abilities.NONE, Abilities.SPEED_BOOST, 600, 110, 129, 100, 77, 79, 105, 75, 50, 175, false, null, false, true),
+      new PokemonForm("Navi Starmobile", "navi-starmobile", PokemonType.STEEL, PokemonType.POISON, 1.8, 240, Abilities.TOXIC_DEBRIS, Abilities.NONE, Abilities.TOXIC_DEBRIS, 600, 110, 129, 100, 77, 79, 105, 75, 50, 175, false, null, false, true),
+      new PokemonForm("Ruchbah Starmobile", "ruchbah-starmobile", PokemonType.STEEL, PokemonType.FAIRY, 1.8, 240, Abilities.MISTY_SURGE, Abilities.NONE, Abilities.MISTY_SURGE, 600, 110, 129, 100, 77, 79, 105, 75, 50, 175, false, null, false, true),
+      new PokemonForm("Caph Starmobile", "caph-starmobile", PokemonType.STEEL, PokemonType.FIGHTING, 1.8, 240, Abilities.STAMINA, Abilities.NONE, Abilities.STAMINA, 600, 110, 129, 100, 77, 79, 105, 75, 50, 175, false, null, false, true),
+    ),
+    new PokemonSpecies(Species.CYCLIZAR, 9, false, false, false, "Mount Pokémon", PokemonType.DRAGON, PokemonType.NORMAL, 1.6, 63, Abilities.SHED_SKIN, Abilities.NONE, Abilities.REGENERATOR, 501, 70, 95, 65, 85, 65, 121, 190, 50, 175, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.ORTHWORM, 9, false, false, false, "Earthworm Pokémon", PokemonType.STEEL, null, 2.5, 310, Abilities.EARTH_EATER, Abilities.NONE, Abilities.SAND_VEIL, 480, 70, 85, 145, 60, 55, 65, 25, 50, 240, GrowthRate.SLOW, 50, false),
+    new PokemonSpecies(Species.GLIMMET, 9, false, false, false, "Ore Pokémon", PokemonType.ROCK, PokemonType.POISON, 0.7, 8, Abilities.TOXIC_DEBRIS, Abilities.NONE, Abilities.CORROSION, 350, 48, 35, 42, 105, 60, 60, 70, 50, 70, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.GLIMMORA, 9, false, false, false, "Ore Pokémon", PokemonType.ROCK, PokemonType.POISON, 1.5, 45, Abilities.TOXIC_DEBRIS, Abilities.NONE, Abilities.CORROSION, 525, 83, 55, 90, 130, 81, 86, 25, 50, 184, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.GREAVARD, 9, false, false, false, "Ghost Dog Pokémon", PokemonType.GHOST, null, 0.6, 35, Abilities.PICKUP, Abilities.NONE, Abilities.FLUFFY, 290, 50, 61, 60, 30, 55, 34, 120, 50, 58, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.HOUNDSTONE, 9, false, false, false, "Ghost Dog Pokémon", PokemonType.GHOST, null, 2, 15, Abilities.SAND_RUSH, Abilities.NONE, Abilities.FLUFFY, 488, 72, 101, 100, 50, 97, 68, 60, 50, 171, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.FLAMIGO, 9, false, false, false, "Synchronize Pokémon", PokemonType.FLYING, PokemonType.FIGHTING, 1.6, 37, Abilities.SCRAPPY, Abilities.TANGLED_FEET, Abilities.COSTAR, 500, 82, 115, 74, 75, 64, 90, 100, 50, 175, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.CETODDLE, 9, false, false, false, "Terra Whale Pokémon", PokemonType.ICE, null, 1.2, 45, Abilities.THICK_FAT, Abilities.SNOW_CLOAK, Abilities.SHEER_FORCE, 334, 108, 68, 45, 30, 40, 43, 150, 50, 67, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.CETITAN, 9, false, false, false, "Terra Whale Pokémon", PokemonType.ICE, null, 4.5, 700, Abilities.THICK_FAT, Abilities.SLUSH_RUSH, Abilities.SHEER_FORCE, 521, 170, 113, 65, 45, 55, 73, 50, 50, 182, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.VELUZA, 9, false, false, false, "Jettison Pokémon", PokemonType.WATER, PokemonType.PSYCHIC, 2.5, 90, Abilities.MOLD_BREAKER, Abilities.NONE, Abilities.SHARPNESS, 478, 90, 102, 73, 78, 65, 70, 100, 50, 167, GrowthRate.FAST, 50, false),
+    new PokemonSpecies(Species.DONDOZO, 9, false, false, false, "Big Catfish Pokémon", PokemonType.WATER, null, 12, 220, Abilities.UNAWARE, Abilities.OBLIVIOUS, Abilities.WATER_VEIL, 530, 150, 100, 115, 65, 65, 35, 25, 50, 265, GrowthRate.SLOW, 50, false),
+    new PokemonSpecies(Species.TATSUGIRI, 9, false, false, false, "Mimicry Pokémon", PokemonType.DRAGON, PokemonType.WATER, 0.3, 8, Abilities.COMMANDER, Abilities.NONE, Abilities.STORM_DRAIN, 475, 68, 50, 60, 120, 95, 82, 100, 50, 166, GrowthRate.MEDIUM_SLOW, 50, false, false,
+      new PokemonForm("Curly Form", "curly", PokemonType.DRAGON, PokemonType.WATER, 0.3, 8, Abilities.COMMANDER, Abilities.NONE, Abilities.STORM_DRAIN, 475, 68, 50, 60, 120, 95, 82, 100, 50, 166, false, null, true),
+      new PokemonForm("Droopy Form", "droopy", PokemonType.DRAGON, PokemonType.WATER, 0.3, 8, Abilities.COMMANDER, Abilities.NONE, Abilities.STORM_DRAIN, 475, 68, 50, 60, 120, 95, 82, 100, 50, 166, false, null, true),
+      new PokemonForm("Stretchy Form", "stretchy", PokemonType.DRAGON, PokemonType.WATER, 0.3, 8, Abilities.COMMANDER, Abilities.NONE, Abilities.STORM_DRAIN, 475, 68, 50, 60, 120, 95, 82, 100, 50, 166, false, null, true),
+    ),
+    new PokemonSpecies(Species.ANNIHILAPE, 9, false, false, false, "Rage Monkey Pokémon", PokemonType.FIGHTING, PokemonType.GHOST, 1.2, 56, Abilities.VITAL_SPIRIT, Abilities.INNER_FOCUS, Abilities.DEFIANT, 535, 110, 115, 80, 50, 90, 90, 45, 50, 268, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.CLODSIRE, 9, false, false, false, "Spiny Fish Pokémon", PokemonType.POISON, PokemonType.GROUND, 1.8, 223, Abilities.POISON_POINT, Abilities.WATER_ABSORB, Abilities.UNAWARE, 430, 130, 75, 60, 45, 100, 20, 90, 50, 151, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.FARIGIRAF, 9, false, false, false, "Long Neck Pokémon", PokemonType.NORMAL, PokemonType.PSYCHIC, 3.2, 160, Abilities.CUD_CHEW, Abilities.ARMOR_TAIL, Abilities.SAP_SIPPER, 520, 120, 90, 70, 110, 70, 60, 45, 50, 260, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.DUDUNSPARCE, 9, false, false, false, "Land Snake Pokémon", PokemonType.NORMAL, null, 3.6, 39.2, Abilities.SERENE_GRACE, Abilities.RUN_AWAY, Abilities.RATTLED, 520, 125, 100, 80, 85, 75, 55, 45, 50, 182, GrowthRate.MEDIUM_FAST, 50, false, false,
+      new PokemonForm("Two-Segment Form", "two-segment", PokemonType.NORMAL, null, 3.6, 39.2, Abilities.SERENE_GRACE, Abilities.RUN_AWAY, Abilities.RATTLED, 520, 125, 100, 80, 85, 75, 55, 45, 50, 182, false, ""),
+      new PokemonForm("Three-Segment Form", "three-segment", PokemonType.NORMAL, null, 4.5, 47.4, Abilities.SERENE_GRACE, Abilities.RUN_AWAY, Abilities.RATTLED, 520, 125, 100, 80, 85, 75, 55, 45, 50, 182),
+    ),
+    new PokemonSpecies(Species.KINGAMBIT, 9, false, false, false, "Big Blade Pokémon", PokemonType.DARK, PokemonType.STEEL, 2, 120, Abilities.DEFIANT, Abilities.SUPREME_OVERLORD, Abilities.PRESSURE, 550, 100, 135, 120, 60, 85, 50, 25, 50, 275, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.GREAT_TUSK, 9, false, false, false, "Paradox Pokémon", PokemonType.GROUND, PokemonType.FIGHTING, 2.2, 320, Abilities.PROTOSYNTHESIS, Abilities.NONE, Abilities.NONE, 570, 115, 131, 131, 53, 53, 87, 30, 0, 285, GrowthRate.SLOW, null, false),
+    new PokemonSpecies(Species.SCREAM_TAIL, 9, false, false, false, "Paradox Pokémon", PokemonType.FAIRY, PokemonType.PSYCHIC, 1.2, 8, Abilities.PROTOSYNTHESIS, Abilities.NONE, Abilities.NONE, 570, 115, 65, 99, 65, 115, 111, 50, 0, 285, GrowthRate.SLOW, null, false),
+    new PokemonSpecies(Species.BRUTE_BONNET, 9, false, false, false, "Paradox Pokémon", PokemonType.GRASS, PokemonType.DARK, 1.2, 21, Abilities.PROTOSYNTHESIS, Abilities.NONE, Abilities.NONE, 570, 111, 127, 99, 79, 99, 55, 50, 0, 285, GrowthRate.SLOW, null, false),
+    new PokemonSpecies(Species.FLUTTER_MANE, 9, false, false, false, "Paradox Pokémon", PokemonType.GHOST, PokemonType.FAIRY, 1.4, 4, Abilities.PROTOSYNTHESIS, Abilities.NONE, Abilities.NONE, 570, 55, 55, 55, 135, 135, 135, 30, 0, 285, GrowthRate.SLOW, null, false),
+    new PokemonSpecies(Species.SLITHER_WING, 9, false, false, false, "Paradox Pokémon", PokemonType.BUG, PokemonType.FIGHTING, 3.2, 92, Abilities.PROTOSYNTHESIS, Abilities.NONE, Abilities.NONE, 570, 85, 135, 79, 85, 105, 81, 30, 0, 285, GrowthRate.SLOW, null, false),
+    new PokemonSpecies(Species.SANDY_SHOCKS, 9, false, false, false, "Paradox Pokémon", PokemonType.ELECTRIC, PokemonType.GROUND, 2.3, 60, Abilities.PROTOSYNTHESIS, Abilities.NONE, Abilities.NONE, 570, 85, 81, 97, 121, 85, 101, 30, 0, 285, GrowthRate.SLOW, null, false),
+    new PokemonSpecies(Species.IRON_TREADS, 9, false, false, false, "Paradox Pokémon", PokemonType.GROUND, PokemonType.STEEL, 0.9, 240, Abilities.QUARK_DRIVE, Abilities.NONE, Abilities.NONE, 570, 90, 112, 120, 72, 70, 106, 30, 0, 285, GrowthRate.SLOW, null, false),
+    new PokemonSpecies(Species.IRON_BUNDLE, 9, false, false, false, "Paradox Pokémon", PokemonType.ICE, PokemonType.WATER, 0.6, 11, Abilities.QUARK_DRIVE, Abilities.NONE, Abilities.NONE, 570, 56, 80, 114, 124, 60, 136, 50, 0, 285, GrowthRate.SLOW, null, false),
+    new PokemonSpecies(Species.IRON_HANDS, 9, false, false, false, "Paradox Pokémon", PokemonType.FIGHTING, PokemonType.ELECTRIC, 1.8, 380.7, Abilities.QUARK_DRIVE, Abilities.NONE, Abilities.NONE, 570, 154, 140, 108, 50, 68, 50, 50, 0, 285, GrowthRate.SLOW, null, false),
+    new PokemonSpecies(Species.IRON_JUGULIS, 9, false, false, false, "Paradox Pokémon", PokemonType.DARK, PokemonType.FLYING, 1.3, 111, Abilities.QUARK_DRIVE, Abilities.NONE, Abilities.NONE, 570, 94, 80, 86, 122, 80, 108, 30, 0, 285, GrowthRate.SLOW, null, false),
+    new PokemonSpecies(Species.IRON_MOTH, 9, false, false, false, "Paradox Pokémon", PokemonType.FIRE, PokemonType.POISON, 1.2, 36, Abilities.QUARK_DRIVE, Abilities.NONE, Abilities.NONE, 570, 80, 70, 60, 140, 110, 110, 30, 0, 285, GrowthRate.SLOW, null, false),
+    new PokemonSpecies(Species.IRON_THORNS, 9, false, false, false, "Paradox Pokémon", PokemonType.ROCK, PokemonType.ELECTRIC, 1.6, 303, Abilities.QUARK_DRIVE, Abilities.NONE, Abilities.NONE, 570, 100, 134, 110, 70, 84, 72, 30, 0, 285, GrowthRate.SLOW, null, false),
+    new PokemonSpecies(Species.FRIGIBAX, 9, false, false, false, "Ice Fin Pokémon", PokemonType.DRAGON, PokemonType.ICE, 0.5, 17, Abilities.THERMAL_EXCHANGE, Abilities.NONE, Abilities.ICE_BODY, 320, 65, 75, 45, 35, 45, 55, 45, 50, 64, GrowthRate.SLOW, 50, false),
+    new PokemonSpecies(Species.ARCTIBAX, 9, false, false, false, "Ice Fin Pokémon", PokemonType.DRAGON, PokemonType.ICE, 0.8, 30, Abilities.THERMAL_EXCHANGE, Abilities.NONE, Abilities.ICE_BODY, 423, 90, 95, 66, 45, 65, 62, 25, 50, 148, GrowthRate.SLOW, 50, false),
+    new PokemonSpecies(Species.BAXCALIBUR, 9, false, false, false, "Ice Dragon Pokémon", PokemonType.DRAGON, PokemonType.ICE, 2.1, 210, Abilities.THERMAL_EXCHANGE, Abilities.NONE, Abilities.ICE_BODY, 600, 115, 145, 92, 75, 86, 87, 10, 50, 300, GrowthRate.SLOW, 50, false),
+    new PokemonSpecies(Species.GIMMIGHOUL, 9, false, false, false, "Coin Chest Pokémon", PokemonType.GHOST, null, 0.3, 5, Abilities.RATTLED, Abilities.NONE, Abilities.NONE, 300, 45, 30, 70, 75, 70, 10, 45, 50, 60, GrowthRate.SLOW, null, false, false,
+      new PokemonForm("Chest Form", "chest", PokemonType.GHOST, null, 0.3, 5, Abilities.RATTLED, Abilities.NONE, Abilities.NONE, 300, 45, 30, 70, 75, 70, 10, 45, 50, 60, false, "", true),
+      new PokemonForm("Roaming Form", "roaming", PokemonType.GHOST, null, 0.1, 1, Abilities.RUN_AWAY, Abilities.NONE, Abilities.NONE, 300, 45, 30, 25, 75, 45, 80, 45, 50, 60, false, null, true),
+    ),
+    new PokemonSpecies(Species.GHOLDENGO, 9, false, false, false, "Coin Entity Pokémon", PokemonType.STEEL, PokemonType.GHOST, 1.2, 30, Abilities.GOOD_AS_GOLD, Abilities.NONE, Abilities.NONE, 550, 87, 60, 95, 133, 91, 84, 45, 50, 275, GrowthRate.SLOW, null, false),
+    new PokemonSpecies(Species.WO_CHIEN, 9, true, false, false, "Ruinous Pokémon", PokemonType.DARK, PokemonType.GRASS, 1.5, 74.2, Abilities.TABLETS_OF_RUIN, Abilities.NONE, Abilities.NONE, 570, 85, 85, 100, 95, 135, 70, 6, 0, 285, GrowthRate.SLOW, null, false),
+    new PokemonSpecies(Species.CHIEN_PAO, 9, true, false, false, "Ruinous Pokémon", PokemonType.DARK, PokemonType.ICE, 1.9, 152.2, Abilities.SWORD_OF_RUIN, Abilities.NONE, Abilities.NONE, 570, 80, 120, 80, 90, 65, 135, 6, 0, 285, GrowthRate.SLOW, null, false),
+    new PokemonSpecies(Species.TING_LU, 9, true, false, false, "Ruinous Pokémon", PokemonType.DARK, PokemonType.GROUND, 2.7, 699.7, Abilities.VESSEL_OF_RUIN, Abilities.NONE, Abilities.NONE, 570, 155, 110, 125, 55, 80, 45, 6, 0, 285, GrowthRate.SLOW, null, false),
+    new PokemonSpecies(Species.CHI_YU, 9, true, false, false, "Ruinous Pokémon", PokemonType.DARK, PokemonType.FIRE, 0.4, 4.9, Abilities.BEADS_OF_RUIN, Abilities.NONE, Abilities.NONE, 570, 55, 80, 80, 135, 120, 100, 6, 0, 285, GrowthRate.SLOW, null, false),
+    new PokemonSpecies(Species.ROARING_MOON, 9, false, false, false, "Paradox Pokémon", PokemonType.DRAGON, PokemonType.DARK, 2, 380, Abilities.PROTOSYNTHESIS, Abilities.NONE, Abilities.NONE, 590, 105, 139, 71, 55, 101, 119, 10, 0, 295, GrowthRate.SLOW, null, false),
+    new PokemonSpecies(Species.IRON_VALIANT, 9, false, false, false, "Paradox Pokémon", PokemonType.FAIRY, PokemonType.FIGHTING, 1.4, 35, Abilities.QUARK_DRIVE, Abilities.NONE, Abilities.NONE, 590, 74, 130, 90, 120, 60, 116, 10, 0, 295, GrowthRate.SLOW, null, false),
+    new PokemonSpecies(Species.KORAIDON, 9, false, true, false, "Paradox Pokémon", PokemonType.FIGHTING, PokemonType.DRAGON, 2.5, 303, Abilities.ORICHALCUM_PULSE, Abilities.NONE, Abilities.NONE, 670, 100, 135, 115, 85, 100, 135, 3, 0, 335, GrowthRate.SLOW, null, false, false,
+      new PokemonForm("Apex Build", "apex-build", PokemonType.FIGHTING, PokemonType.DRAGON, 2.5, 303, Abilities.ORICHALCUM_PULSE, Abilities.NONE, Abilities.NONE, 670, 100, 135, 115, 85, 100, 135, 3, 0, 335, false, null, true),
+    ),
+    new PokemonSpecies(Species.MIRAIDON, 9, false, true, false, "Paradox Pokémon", PokemonType.ELECTRIC, PokemonType.DRAGON, 3.5, 240, Abilities.HADRON_ENGINE, Abilities.NONE, Abilities.NONE, 670, 100, 85, 100, 135, 115, 135, 3, 0, 335, GrowthRate.SLOW, null, false, false,
+      new PokemonForm("Ultimate Mode", "ultimate-mode", PokemonType.ELECTRIC, PokemonType.DRAGON, 3.5, 240, Abilities.HADRON_ENGINE, Abilities.NONE, Abilities.NONE, 670, 100, 85, 100, 135, 115, 135, 3, 0, 335, false, null, true),
+    ),
+    new PokemonSpecies(Species.WALKING_WAKE, 9, false, false, false, "Paradox Pokémon", PokemonType.WATER, PokemonType.DRAGON, 3.5, 280, Abilities.PROTOSYNTHESIS, Abilities.NONE, Abilities.NONE, 590, 99, 83, 91, 125, 83, 109, 10, 0, 295, GrowthRate.SLOW, null, false), //Custom Catchrate, matching Gouging Fire and Raging Bolt
+    new PokemonSpecies(Species.IRON_LEAVES, 9, false, false, false, "Paradox Pokémon", PokemonType.GRASS, PokemonType.PSYCHIC, 1.5, 125, Abilities.QUARK_DRIVE, Abilities.NONE, Abilities.NONE, 590, 90, 130, 88, 70, 108, 104, 10, 0, 295, GrowthRate.SLOW, null, false), //Custom Catchrate, matching Iron Boulder and Iron Crown
+    new PokemonSpecies(Species.DIPPLIN, 9, false, false, false, "Candy Apple Pokémon", PokemonType.GRASS, PokemonType.DRAGON, 0.4, 9.7, Abilities.SUPERSWEET_SYRUP, Abilities.GLUTTONY, Abilities.STICKY_HOLD, 485, 80, 80, 110, 95, 80, 40, 45, 50, 170, GrowthRate.ERRATIC, 50, false),
+    new PokemonSpecies(Species.POLTCHAGEIST, 9, false, false, false, "Matcha Pokémon", PokemonType.GRASS, PokemonType.GHOST, 0.1, 1.1, Abilities.HOSPITALITY, Abilities.NONE, Abilities.HEATPROOF, 308, 40, 45, 45, 74, 54, 50, 120, 50, 62, GrowthRate.SLOW, null, false, false,
+      new PokemonForm("Counterfeit Form", "counterfeit", PokemonType.GRASS, PokemonType.GHOST, 0.1, 1.1, Abilities.HOSPITALITY, Abilities.NONE, Abilities.HEATPROOF, 308, 40, 45, 45, 74, 54, 50, 120, 50, 62, false, null, true),
+      new PokemonForm("Artisan Form", "artisan", PokemonType.GRASS, PokemonType.GHOST, 0.1, 1.1, Abilities.HOSPITALITY, Abilities.NONE, Abilities.HEATPROOF, 308, 40, 45, 45, 74, 54, 50, 120, 50, 62, false, null, false, true),
+    ),
+    new PokemonSpecies(Species.SINISTCHA, 9, false, false, false, "Matcha Pokémon", PokemonType.GRASS, PokemonType.GHOST, 0.2, 2.2, Abilities.HOSPITALITY, Abilities.NONE, Abilities.HEATPROOF, 508, 71, 60, 106, 121, 80, 70, 60, 50, 178, GrowthRate.SLOW, null, false, false,
+      new PokemonForm("Unremarkable Form", "unremarkable", PokemonType.GRASS, PokemonType.GHOST, 0.2, 2.2, Abilities.HOSPITALITY, Abilities.NONE, Abilities.HEATPROOF, 508, 71, 60, 106, 121, 80, 70, 60, 50, 178),
+      new PokemonForm("Masterpiece Form", "masterpiece", PokemonType.GRASS, PokemonType.GHOST, 0.2, 2.2, Abilities.HOSPITALITY, Abilities.NONE, Abilities.HEATPROOF, 508, 71, 60, 106, 121, 80, 70, 60, 50, 178, false, null, false, true),
+    ),
+    new PokemonSpecies(Species.OKIDOGI, 9, true, false, false, "Retainer Pokémon", PokemonType.POISON, PokemonType.FIGHTING, 1.8, 92.2, Abilities.TOXIC_CHAIN, Abilities.NONE, Abilities.GUARD_DOG, 555, 88, 128, 115, 58, 86, 80, 3, 0, 276, GrowthRate.SLOW, 100, false),
+    new PokemonSpecies(Species.MUNKIDORI, 9, true, false, false, "Retainer Pokémon", PokemonType.POISON, PokemonType.PSYCHIC, 1, 12.2, Abilities.TOXIC_CHAIN, Abilities.NONE, Abilities.FRISK, 555, 88, 75, 66, 130, 90, 106, 3, 0, 276, GrowthRate.SLOW, 100, false),
+    new PokemonSpecies(Species.FEZANDIPITI, 9, true, false, false, "Retainer Pokémon", PokemonType.POISON, PokemonType.FAIRY, 1.4, 30.1, Abilities.TOXIC_CHAIN, Abilities.NONE, Abilities.TECHNICIAN, 555, 88, 91, 82, 70, 125, 99, 3, 0, 276, GrowthRate.SLOW, 100, false),
+    new PokemonSpecies(Species.OGERPON, 9, true, false, false, "Mask Pokémon", PokemonType.GRASS, null, 1.2, 39.8, Abilities.DEFIANT, Abilities.NONE, Abilities.NONE, 550, 80, 120, 84, 60, 96, 110, 5, 50, 275, GrowthRate.SLOW, 0, false, false,
+      new PokemonForm("Teal Mask", "teal-mask", PokemonType.GRASS, null, 1.2, 39.8, Abilities.DEFIANT, Abilities.NONE, Abilities.NONE, 550, 80, 120, 84, 60, 96, 110, 5, 50, 275, false, null, true),
+      new PokemonForm("Wellspring Mask", "wellspring-mask", PokemonType.GRASS, PokemonType.WATER, 1.2, 39.8, Abilities.WATER_ABSORB, Abilities.NONE, Abilities.NONE, 550, 80, 120, 84, 60, 96, 110, 5, 50, 275),
+      new PokemonForm("Hearthflame Mask", "hearthflame-mask", PokemonType.GRASS, PokemonType.FIRE, 1.2, 39.8, Abilities.MOLD_BREAKER, Abilities.NONE, Abilities.NONE, 550, 80, 120, 84, 60, 96, 110, 5, 50, 275),
+      new PokemonForm("Cornerstone Mask", "cornerstone-mask", PokemonType.GRASS, PokemonType.ROCK, 1.2, 39.8, Abilities.STURDY, Abilities.NONE, Abilities.NONE, 550, 80, 120, 84, 60, 96, 110, 5, 50, 275),
+      new PokemonForm("Teal Mask Terastallized", "teal-mask-tera", PokemonType.GRASS, null, 1.2, 39.8, Abilities.EMBODY_ASPECT_TEAL, Abilities.NONE, Abilities.NONE, 550, 80, 120, 84, 60, 96, 110, 5, 50, 275),
+      new PokemonForm("Wellspring Mask Terastallized", "wellspring-mask-tera", PokemonType.GRASS, PokemonType.WATER, 1.2, 39.8, Abilities.EMBODY_ASPECT_WELLSPRING, Abilities.NONE, Abilities.NONE, 550, 80, 120, 84, 60, 96, 110, 5, 50, 275),
+      new PokemonForm("Hearthflame Mask Terastallized", "hearthflame-mask-tera", PokemonType.GRASS, PokemonType.FIRE, 1.2, 39.8, Abilities.EMBODY_ASPECT_HEARTHFLAME, Abilities.NONE, Abilities.NONE, 550, 80, 120, 84, 60, 96, 110, 5, 50, 275),
+      new PokemonForm("Cornerstone Mask Terastallized", "cornerstone-mask-tera", PokemonType.GRASS, PokemonType.ROCK, 1.2, 39.8, Abilities.EMBODY_ASPECT_CORNERSTONE, Abilities.NONE, Abilities.NONE, 550, 80, 120, 84, 60, 96, 110, 5, 50, 275),
+    ),
+    new PokemonSpecies(Species.ARCHALUDON, 9, false, false, false, "Alloy Pokémon", PokemonType.STEEL, PokemonType.DRAGON, 2, 60, Abilities.STAMINA, Abilities.STURDY, Abilities.STALWART, 600, 90, 105, 130, 125, 65, 85, 10, 50, 300, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.HYDRAPPLE, 9, false, false, false, "Apple Hydra Pokémon", PokemonType.GRASS, PokemonType.DRAGON, 1.8, 93, Abilities.SUPERSWEET_SYRUP, Abilities.REGENERATOR, Abilities.STICKY_HOLD, 540, 106, 80, 110, 120, 80, 44, 10, 50, 270, GrowthRate.ERRATIC, 50, false),
+    new PokemonSpecies(Species.GOUGING_FIRE, 9, false, false, false, "Paradox Pokémon", PokemonType.FIRE, PokemonType.DRAGON, 3.5, 590, Abilities.PROTOSYNTHESIS, Abilities.NONE, Abilities.NONE, 590, 105, 115, 121, 65, 93, 91, 10, 0, 295, GrowthRate.SLOW, null, false),
+    new PokemonSpecies(Species.RAGING_BOLT, 9, false, false, false, "Paradox Pokémon", PokemonType.ELECTRIC, PokemonType.DRAGON, 5.2, 480, Abilities.PROTOSYNTHESIS, Abilities.NONE, Abilities.NONE, 590, 125, 73, 91, 137, 89, 75, 10, 0, 295, GrowthRate.SLOW, null, false),
+    new PokemonSpecies(Species.IRON_BOULDER, 9, false, false, false, "Paradox Pokémon", PokemonType.ROCK, PokemonType.PSYCHIC, 1.5, 162.5, Abilities.QUARK_DRIVE, Abilities.NONE, Abilities.NONE, 590, 90, 120, 80, 68, 108, 124, 10, 0, 295, GrowthRate.SLOW, null, false),
+    new PokemonSpecies(Species.IRON_CROWN, 9, false, false, false, "Paradox Pokémon", PokemonType.STEEL, PokemonType.PSYCHIC, 1.6, 156, Abilities.QUARK_DRIVE, Abilities.NONE, Abilities.NONE, 590, 90, 72, 100, 122, 108, 98, 10, 0, 295, GrowthRate.SLOW, null, false),
+    new PokemonSpecies(Species.TERAPAGOS, 9, false, true, false, "Tera Pokémon", PokemonType.NORMAL, null, 0.2, 6.5, Abilities.TERA_SHIFT, Abilities.NONE, Abilities.NONE, 450, 90, 65, 85, 65, 85, 60, 5, 50, 90, GrowthRate.SLOW, 50, false, false,
+      new PokemonForm("Normal Form", "", PokemonType.NORMAL, null, 0.2, 6.5, Abilities.TERA_SHIFT, Abilities.NONE, Abilities.NONE, 450, 90, 65, 85, 65, 85, 60, 5, 50, 90, false, null, true),
+      new PokemonForm("Terastal Form", "terastal", PokemonType.NORMAL, null, 0.3, 16, Abilities.TERA_SHELL, Abilities.NONE, Abilities.NONE, 600, 95, 95, 110, 105, 110, 85, 5, 50, 120),
+      new PokemonForm("Stellar Form", "stellar", PokemonType.NORMAL, null, 1.7, 77, Abilities.TERAFORM_ZERO, Abilities.NONE, Abilities.NONE, 700, 160, 105, 110, 130, 110, 85, 5, 50, 140),
+    ),
+    new PokemonSpecies(Species.PECHARUNT, 9, false, false, true, "Subjugation Pokémon", PokemonType.POISON, PokemonType.GHOST, 0.3, 0.3, Abilities.POISON_PUPPETEER, Abilities.NONE, Abilities.NONE, 600, 88, 88, 160, 88, 88, 88, 3, 0, 300, GrowthRate.SLOW, null, false),
+    new PokemonSpecies(Species.ALOLA_RATTATA, 7, false, false, false, "Mouse Pokémon", PokemonType.DARK, PokemonType.NORMAL, 0.3, 3.8, Abilities.GLUTTONY, Abilities.HUSTLE, Abilities.THICK_FAT, 253, 30, 56, 35, 25, 35, 72, 255, 70, 51, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.ALOLA_RATICATE, 7, false, false, false, "Mouse Pokémon", PokemonType.DARK, PokemonType.NORMAL, 0.7, 25.5, Abilities.GLUTTONY, Abilities.HUSTLE, Abilities.THICK_FAT, 413, 75, 71, 70, 40, 80, 77, 127, 70, 145, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.ALOLA_RAICHU, 7, false, false, false, "Mouse Pokémon", PokemonType.ELECTRIC, PokemonType.PSYCHIC, 0.7, 21, Abilities.SURGE_SURFER, Abilities.NONE, Abilities.NONE, 485, 60, 85, 50, 95, 85, 110, 75, 50, 243, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.ALOLA_SANDSHREW, 7, false, false, false, "Mouse Pokémon", PokemonType.ICE, PokemonType.STEEL, 0.7, 40, Abilities.SNOW_CLOAK, Abilities.NONE, Abilities.SLUSH_RUSH, 300, 50, 75, 90, 10, 35, 40, 255, 50, 60, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.ALOLA_SANDSLASH, 7, false, false, false, "Mouse Pokémon", PokemonType.ICE, PokemonType.STEEL, 1.2, 55, Abilities.SNOW_CLOAK, Abilities.NONE, Abilities.SLUSH_RUSH, 450, 75, 100, 120, 25, 65, 65, 90, 50, 158, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.ALOLA_VULPIX, 7, false, false, false, "Fox Pokémon", PokemonType.ICE, null, 0.6, 9.9, Abilities.SNOW_CLOAK, Abilities.NONE, Abilities.SNOW_WARNING, 299, 38, 41, 40, 50, 65, 65, 190, 50, 60, GrowthRate.MEDIUM_FAST, 25, false),
+    new PokemonSpecies(Species.ALOLA_NINETALES, 7, false, false, false, "Fox Pokémon", PokemonType.ICE, PokemonType.FAIRY, 1.1, 19.9, Abilities.SNOW_CLOAK, Abilities.NONE, Abilities.SNOW_WARNING, 505, 73, 67, 75, 81, 100, 109, 75, 50, 177, GrowthRate.MEDIUM_FAST, 25, false),
+    new PokemonSpecies(Species.ALOLA_DIGLETT, 7, false, false, false, "Mole Pokémon", PokemonType.GROUND, PokemonType.STEEL, 0.2, 1, Abilities.SAND_VEIL, Abilities.TANGLING_HAIR, Abilities.SAND_FORCE, 265, 10, 55, 30, 35, 45, 90, 255, 50, 53, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.ALOLA_DUGTRIO, 7, false, false, false, "Mole Pokémon", PokemonType.GROUND, PokemonType.STEEL, 0.7, 66.6, Abilities.SAND_VEIL, Abilities.TANGLING_HAIR, Abilities.SAND_FORCE, 425, 35, 100, 60, 50, 70, 110, 50, 50, 149, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.ALOLA_MEOWTH, 7, false, false, false, "Scratch Cat Pokémon", PokemonType.DARK, null, 0.4, 4.2, Abilities.PICKUP, Abilities.TECHNICIAN, Abilities.RATTLED, 290, 40, 35, 35, 50, 40, 90, 255, 50, 58, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.ALOLA_PERSIAN, 7, false, false, false, "Classy Cat Pokémon", PokemonType.DARK, null, 1.1, 33, Abilities.FUR_COAT, Abilities.TECHNICIAN, Abilities.RATTLED, 440, 65, 60, 60, 75, 65, 115, 90, 50, 154, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.ALOLA_GEODUDE, 7, false, false, false, "Rock Pokémon", PokemonType.ROCK, PokemonType.ELECTRIC, 0.4, 20.3, Abilities.MAGNET_PULL, Abilities.STURDY, Abilities.GALVANIZE, 300, 40, 80, 100, 30, 30, 20, 255, 70, 60, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.ALOLA_GRAVELER, 7, false, false, false, "Rock Pokémon", PokemonType.ROCK, PokemonType.ELECTRIC, 1, 110, Abilities.MAGNET_PULL, Abilities.STURDY, Abilities.GALVANIZE, 390, 55, 95, 115, 45, 45, 35, 120, 70, 137, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.ALOLA_GOLEM, 7, false, false, false, "Megaton Pokémon", PokemonType.ROCK, PokemonType.ELECTRIC, 1.7, 316, Abilities.MAGNET_PULL, Abilities.STURDY, Abilities.GALVANIZE, 495, 80, 120, 130, 55, 65, 45, 45, 70, 223, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.ALOLA_GRIMER, 7, false, false, false, "Sludge Pokémon", PokemonType.POISON, PokemonType.DARK, 0.7, 42, Abilities.POISON_TOUCH, Abilities.GLUTTONY, Abilities.POWER_OF_ALCHEMY, 325, 80, 80, 50, 40, 50, 25, 190, 70, 65, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.ALOLA_MUK, 7, false, false, false, "Sludge Pokémon", PokemonType.POISON, PokemonType.DARK, 1, 52, Abilities.POISON_TOUCH, Abilities.GLUTTONY, Abilities.POWER_OF_ALCHEMY, 500, 105, 105, 75, 65, 100, 50, 75, 70, 175, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.ALOLA_EXEGGUTOR, 7, false, false, false, "Coconut Pokémon", PokemonType.GRASS, PokemonType.DRAGON, 10.9, 415.6, Abilities.FRISK, Abilities.NONE, Abilities.HARVEST, 530, 95, 105, 85, 125, 75, 45, 45, 50, 186, GrowthRate.SLOW, 50, false),
+    new PokemonSpecies(Species.ALOLA_MAROWAK, 7, false, false, false, "Bone Keeper Pokémon", PokemonType.FIRE, PokemonType.GHOST, 1, 34, Abilities.CURSED_BODY, Abilities.LIGHTNING_ROD, Abilities.ROCK_HEAD, 425, 60, 80, 110, 50, 80, 45, 75, 50, 149, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.ETERNAL_FLOETTE, 6, true, false, false, "Single Bloom Pokémon", PokemonType.FAIRY, null, 0.2, 0.9, Abilities.FLOWER_VEIL, Abilities.NONE, Abilities.SYMBIOSIS, 551, 74, 65, 67, 125, 128, 92, 120, 70, 243, GrowthRate.MEDIUM_FAST, 0, false), //Marked as Sub-Legend, for casing purposes
+    new PokemonSpecies(Species.GALAR_MEOWTH, 8, false, false, false, "Scratch Cat Pokémon", PokemonType.STEEL, null, 0.4, 7.5, Abilities.PICKUP, Abilities.TOUGH_CLAWS, Abilities.UNNERVE, 290, 50, 65, 55, 40, 40, 40, 255, 50, 58, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.GALAR_PONYTA, 8, false, false, false, "Fire Horse Pokémon", PokemonType.PSYCHIC, null, 0.8, 24, Abilities.RUN_AWAY, Abilities.PASTEL_VEIL, Abilities.ANTICIPATION, 410, 50, 85, 55, 65, 65, 90, 190, 50, 82, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.GALAR_RAPIDASH, 8, false, false, false, "Fire Horse Pokémon", PokemonType.PSYCHIC, PokemonType.FAIRY, 1.7, 80, Abilities.RUN_AWAY, Abilities.PASTEL_VEIL, Abilities.ANTICIPATION, 500, 65, 100, 70, 80, 80, 105, 60, 50, 175, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.GALAR_SLOWPOKE, 8, false, false, false, "Dopey Pokémon", PokemonType.PSYCHIC, null, 1.2, 36, Abilities.GLUTTONY, Abilities.OWN_TEMPO, Abilities.REGENERATOR, 315, 90, 65, 65, 40, 40, 15, 190, 50, 63, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.GALAR_SLOWBRO, 8, false, false, false, "Hermit Crab Pokémon", PokemonType.POISON, PokemonType.PSYCHIC, 1.6, 70.5, Abilities.QUICK_DRAW, Abilities.OWN_TEMPO, Abilities.REGENERATOR, 490, 95, 100, 95, 100, 70, 30, 75, 50, 172, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.GALAR_FARFETCHD, 8, false, false, false, "Wild Duck Pokémon", PokemonType.FIGHTING, null, 0.8, 42, Abilities.STEADFAST, Abilities.NONE, Abilities.SCRAPPY, 377, 52, 95, 55, 58, 62, 55, 45, 50, 132, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.GALAR_WEEZING, 8, false, false, false, "Poison Gas Pokémon", PokemonType.POISON, PokemonType.FAIRY, 3, 16, Abilities.LEVITATE, Abilities.NEUTRALIZING_GAS, Abilities.MISTY_SURGE, 490, 65, 90, 120, 85, 70, 60, 60, 50, 172, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.GALAR_MR_MIME, 8, false, false, false, "Barrier Pokémon", PokemonType.ICE, PokemonType.PSYCHIC, 1.4, 56.8, Abilities.VITAL_SPIRIT, Abilities.SCREEN_CLEANER, Abilities.ICE_BODY, 460, 50, 65, 65, 90, 90, 100, 45, 50, 161, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.GALAR_ARTICUNO, 8, true, false, false, "Freeze Pokémon", PokemonType.PSYCHIC, PokemonType.FLYING, 1.7, 50.9, Abilities.COMPETITIVE, Abilities.NONE, Abilities.NONE, 580, 90, 85, 85, 125, 100, 95, 3, 35, 290, GrowthRate.SLOW, null, false),
+    new PokemonSpecies(Species.GALAR_ZAPDOS, 8, true, false, false, "Electric Pokémon", PokemonType.FIGHTING, PokemonType.FLYING, 1.6, 58.2, Abilities.DEFIANT, Abilities.NONE, Abilities.NONE, 580, 90, 125, 90, 85, 90, 100, 3, 35, 290, GrowthRate.SLOW, null, false),
+    new PokemonSpecies(Species.GALAR_MOLTRES, 8, true, false, false, "Flame Pokémon", PokemonType.DARK, PokemonType.FLYING, 2, 66, Abilities.BERSERK, Abilities.NONE, Abilities.NONE, 580, 90, 85, 90, 100, 125, 90, 3, 35, 290, GrowthRate.SLOW, null, false),
+    new PokemonSpecies(Species.GALAR_SLOWKING, 8, false, false, false, "Royal Pokémon", PokemonType.POISON, PokemonType.PSYCHIC, 1.8, 79.5, Abilities.CURIOUS_MEDICINE, Abilities.OWN_TEMPO, Abilities.REGENERATOR, 490, 95, 65, 80, 110, 110, 30, 70, 50, 172, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.GALAR_CORSOLA, 8, false, false, false, "Coral Pokémon", PokemonType.GHOST, null, 0.6, 0.5, Abilities.WEAK_ARMOR, Abilities.NONE, Abilities.CURSED_BODY, 410, 60, 55, 100, 65, 100, 30, 60, 50, 144, GrowthRate.FAST, 25, false),
+    new PokemonSpecies(Species.GALAR_ZIGZAGOON, 8, false, false, false, "Tiny Raccoon Pokémon", PokemonType.DARK, PokemonType.NORMAL, 0.4, 17.5, Abilities.PICKUP, Abilities.GLUTTONY, Abilities.QUICK_FEET, 240, 38, 30, 41, 30, 41, 60, 255, 50, 56, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.GALAR_LINOONE, 8, false, false, false, "Rushing Pokémon", PokemonType.DARK, PokemonType.NORMAL, 0.5, 32.5, Abilities.PICKUP, Abilities.GLUTTONY, Abilities.QUICK_FEET, 420, 78, 70, 61, 50, 61, 100, 90, 50, 147, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.GALAR_DARUMAKA, 8, false, false, false, "Zen Charm Pokémon", PokemonType.ICE, null, 0.7, 40, Abilities.HUSTLE, Abilities.NONE, Abilities.INNER_FOCUS, 315, 70, 90, 45, 15, 45, 50, 120, 50, 63, GrowthRate.MEDIUM_SLOW, 50, false),
+    new PokemonSpecies(Species.GALAR_DARMANITAN, 8, false, false, false, "Blazing Pokémon", PokemonType.ICE, null, 1.7, 120, Abilities.GORILLA_TACTICS, Abilities.NONE, Abilities.ZEN_MODE, 480, 105, 140, 55, 30, 55, 95, 60, 50, 168, GrowthRate.MEDIUM_SLOW, 50, false, true,
+      new PokemonForm("Standard Mode", "", PokemonType.ICE, null, 1.7, 120, Abilities.GORILLA_TACTICS, Abilities.NONE, Abilities.ZEN_MODE, 480, 105, 140, 55, 30, 55, 95, 60, 50, 168, false, null, true),
+      new PokemonForm("Zen Mode", "zen", PokemonType.ICE, PokemonType.FIRE, 1.7, 120, Abilities.GORILLA_TACTICS, Abilities.NONE, Abilities.ZEN_MODE, 540, 105, 160, 55, 30, 55, 135, 60, 50, 189),
+    ),
+    new PokemonSpecies(Species.GALAR_YAMASK, 8, false, false, false, "Spirit Pokémon", PokemonType.GROUND, PokemonType.GHOST, 0.5, 1.5, Abilities.WANDERING_SPIRIT, Abilities.NONE, Abilities.NONE, 303, 38, 55, 85, 30, 65, 30, 190, 50, 61, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.GALAR_STUNFISK, 8, false, false, false, "Trap Pokémon", PokemonType.GROUND, PokemonType.STEEL, 0.7, 20.5, Abilities.MIMICRY, Abilities.NONE, Abilities.NONE, 471, 109, 81, 99, 66, 84, 32, 75, 70, 165, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.HISUI_GROWLITHE, 8, false, false, false, "Puppy Pokémon", PokemonType.FIRE, PokemonType.ROCK, 0.8, 22.7, Abilities.INTIMIDATE, Abilities.FLASH_FIRE, Abilities.ROCK_HEAD, 350, 60, 75, 45, 65, 50, 55, 190, 50, 70, GrowthRate.SLOW, 75, false),
+    new PokemonSpecies(Species.HISUI_ARCANINE, 8, false, false, false, "Legendary Pokémon", PokemonType.FIRE, PokemonType.ROCK, 2, 168, Abilities.INTIMIDATE, Abilities.FLASH_FIRE, Abilities.ROCK_HEAD, 555, 95, 115, 80, 95, 80, 90, 85, 50, 194, GrowthRate.SLOW, 75, false),
+    new PokemonSpecies(Species.HISUI_VOLTORB, 8, false, false, false, "Ball Pokémon", PokemonType.ELECTRIC, PokemonType.GRASS, 0.5, 13, Abilities.SOUNDPROOF, Abilities.STATIC, Abilities.AFTERMATH, 330, 40, 30, 50, 55, 55, 100, 190, 80, 66, GrowthRate.MEDIUM_FAST, null, false),
+    new PokemonSpecies(Species.HISUI_ELECTRODE, 8, false, false, false, "Ball Pokémon", PokemonType.ELECTRIC, PokemonType.GRASS, 1.2, 81, Abilities.SOUNDPROOF, Abilities.STATIC, Abilities.AFTERMATH, 490, 60, 50, 70, 80, 80, 150, 60, 70, 172, GrowthRate.MEDIUM_FAST, null, false),
+    new PokemonSpecies(Species.HISUI_TYPHLOSION, 8, false, false, false, "Volcano Pokémon", PokemonType.FIRE, PokemonType.GHOST, 1.6, 69.8, Abilities.BLAZE, Abilities.NONE, Abilities.FRISK, 534, 73, 84, 78, 119, 85, 95, 45, 70, 240, GrowthRate.MEDIUM_SLOW, 87.5, false),
+    new PokemonSpecies(Species.HISUI_QWILFISH, 8, false, false, false, "Balloon Pokémon", PokemonType.DARK, PokemonType.POISON, 0.5, 3.9, Abilities.POISON_POINT, Abilities.SWIFT_SWIM, Abilities.INTIMIDATE, 440, 65, 95, 85, 55, 55, 85, 45, 50, 88, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.HISUI_SNEASEL, 8, false, false, false, "Sharp Claw Pokémon", PokemonType.FIGHTING, PokemonType.POISON, 0.9, 27, Abilities.INNER_FOCUS, Abilities.KEEN_EYE, Abilities.PICKPOCKET, 430, 55, 95, 55, 35, 75, 115, 60, 35, 86, GrowthRate.MEDIUM_SLOW, 50, true),
+    new PokemonSpecies(Species.HISUI_SAMUROTT, 8, false, false, false, "Formidable Pokémon", PokemonType.WATER, PokemonType.DARK, 1.5, 58.2, Abilities.TORRENT, Abilities.NONE, Abilities.SHARPNESS, 528, 90, 108, 80, 100, 65, 85, 45, 80, 238, GrowthRate.MEDIUM_SLOW, 87.5, false),
+    new PokemonSpecies(Species.HISUI_LILLIGANT, 8, false, false, false, "Flowering Pokémon", PokemonType.GRASS, PokemonType.FIGHTING, 1.2, 19.2, Abilities.CHLOROPHYLL, Abilities.HUSTLE, Abilities.LEAF_GUARD, 480, 70, 105, 75, 50, 75, 105, 75, 50, 168, GrowthRate.MEDIUM_FAST, 0, false),
+    new PokemonSpecies(Species.HISUI_ZORUA, 8, false, false, false, "Tricky Fox Pokémon", PokemonType.NORMAL, PokemonType.GHOST, 0.7, 12.5, Abilities.ILLUSION, Abilities.NONE, Abilities.NONE, 330, 35, 60, 40, 85, 40, 70, 75, 50, 66, GrowthRate.MEDIUM_SLOW, 87.5, false),
+    new PokemonSpecies(Species.HISUI_ZOROARK, 8, false, false, false, "Illusion Fox Pokémon", PokemonType.NORMAL, PokemonType.GHOST, 1.6, 83, Abilities.ILLUSION, Abilities.NONE, Abilities.NONE, 510, 55, 100, 60, 125, 60, 110, 45, 50, 179, GrowthRate.MEDIUM_SLOW, 87.5, false),
+    new PokemonSpecies(Species.HISUI_BRAVIARY, 8, false, false, false, "Valiant Pokémon", PokemonType.PSYCHIC, PokemonType.FLYING, 1.7, 43.4, Abilities.KEEN_EYE, Abilities.SHEER_FORCE, Abilities.TINTED_LENS, 510, 110, 83, 70, 112, 70, 65, 60, 50, 179, GrowthRate.SLOW, 100, false),
+    new PokemonSpecies(Species.HISUI_SLIGGOO, 8, false, false, false, "Soft Tissue Pokémon", PokemonType.STEEL, PokemonType.DRAGON, 0.7, 68.5, Abilities.SAP_SIPPER, Abilities.SHELL_ARMOR, Abilities.GOOEY, 452, 58, 75, 83, 83, 113, 40, 45, 35, 158, GrowthRate.SLOW, 50, false),
+    new PokemonSpecies(Species.HISUI_GOODRA, 8, false, false, false, "Dragon Pokémon", PokemonType.STEEL, PokemonType.DRAGON, 1.7, 334.1, Abilities.SAP_SIPPER, Abilities.SHELL_ARMOR, Abilities.GOOEY, 600, 80, 100, 100, 110, 150, 60, 45, 35, 270, GrowthRate.SLOW, 50, false),
+    new PokemonSpecies(Species.HISUI_AVALUGG, 8, false, false, false, "Iceberg Pokémon", PokemonType.ICE, PokemonType.ROCK, 1.4, 262.4, Abilities.STRONG_JAW, Abilities.ICE_BODY, Abilities.STURDY, 514, 95, 127, 184, 34, 36, 38, 55, 50, 180, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.HISUI_DECIDUEYE, 8, false, false, false, "Arrow Quill Pokémon", PokemonType.GRASS, PokemonType.FIGHTING, 1.6, 37, Abilities.OVERGROW, Abilities.NONE, Abilities.SCRAPPY, 530, 88, 112, 80, 95, 95, 60, 45, 50, 239, GrowthRate.MEDIUM_SLOW, 87.5, false),
+    new PokemonSpecies(Species.PALDEA_TAUROS, 9, false, false, false, "Wild Bull Pokémon", PokemonType.FIGHTING, null, 1.4, 115, Abilities.INTIMIDATE, Abilities.ANGER_POINT, Abilities.CUD_CHEW, 490, 75, 110, 105, 30, 70, 100, 45, 50, 172, GrowthRate.SLOW, 100, false, false,
+      new PokemonForm("Combat Breed", "combat", PokemonType.FIGHTING, null, 1.4, 115, Abilities.INTIMIDATE, Abilities.ANGER_POINT, Abilities.CUD_CHEW, 490, 75, 110, 105, 30, 70, 100, 45, 50, 172, false, "", true),
+      new PokemonForm("Blaze Breed", "blaze", PokemonType.FIGHTING, PokemonType.FIRE, 1.4, 85, Abilities.INTIMIDATE, Abilities.ANGER_POINT, Abilities.CUD_CHEW, 490, 75, 110, 105, 30, 70, 100, 45, 50, 172, false, null, true),
+      new PokemonForm("Aqua Breed", "aqua", PokemonType.FIGHTING, PokemonType.WATER, 1.4, 110, Abilities.INTIMIDATE, Abilities.ANGER_POINT, Abilities.CUD_CHEW, 490, 75, 110, 105, 30, 70, 100, 45, 50, 172, false, null, true),
+    ),
+    new PokemonSpecies(Species.PALDEA_WOOPER, 9, false, false, false, "Water Fish Pokémon", PokemonType.POISON, PokemonType.GROUND, 0.4, 11, Abilities.POISON_POINT, Abilities.WATER_ABSORB, Abilities.UNAWARE, 210, 55, 45, 45, 25, 25, 15, 255, 50, 42, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.BLOODMOON_URSALUNA, 9, true, false, false, "Peat Pokémon", PokemonType.GROUND, PokemonType.NORMAL, 2.7, 333, Abilities.MINDS_EYE, Abilities.NONE, Abilities.NONE, 555, 113, 70, 120, 135, 65, 52, 75, 50, 278, GrowthRate.MEDIUM_FAST, 50, false), //Marked as Sub-Legend, for casing purposes
   );
 }
-
-// TODO: Remove
-{
-  //setTimeout(() => {
-  /*for (let tc of Object.keys(trainerConfigs)) {
-      console.log(TrainerType[tc], !trainerConfigs[tc].speciesFilter ? 'all' : [...new Set(allSpecies.filter(s => s.generation <= 9).filter(trainerConfigs[tc].speciesFilter).map(s => {
-        while (pokemonPrevolutions.hasOwnProperty(s.speciesId))
-				  s = getPokemonSpecies(pokemonPrevolutions[s.speciesId]);
-        return s;
-      }))].map(s => s.name));
-    }
-
-    const speciesFilter = (species: PokemonSpecies) => !species.legendary && !species.pseudoLegendary && !species.mythical && species.baseTotal >= 540;
-    console.log(!speciesFilter ? 'all' : [...new Set(allSpecies.filter(s => s.generation <= 9).filter(speciesFilter).map(s => {
-      while (pokemonPrevolutions.hasOwnProperty(s.speciesId))
-        s = getPokemonSpecies(pokemonPrevolutions[s.speciesId]);
-      return s;
-    }))].map(s => s.name));*/
-  //}, 1000);
-}
diff --git a/src/data/splash-messages.ts b/src/data/splash-messages.ts
index 1f00ce0d555..3223bbb019e 100644
--- a/src/data/splash-messages.ts
+++ b/src/data/splash-messages.ts
@@ -44,14 +44,17 @@ interface Season {
 //#region Constants
 
 /** The weight multiplier for the battles-won splash message */
-const BATTLES_WON_WEIGHT_MULTIPLIER = 10;
+const BATTLES_WON_WEIGHT_MULTIPLIER = 15;
+/** The weight multiplier for the Pokémon names splash message */
+const POKEMON_NAMES_WEIGHT_MULTIPLIER = 10;
 /** The weight multiplier for the seasonal splash messages */
-const SEASONAL_WEIGHT_MULTIPLIER = 10;
+const SEASONAL_WEIGHT_MULTIPLIER = 15;
 
 //#region Common Messages
 
 const commonSplashMessages = [
   ...Array(BATTLES_WON_WEIGHT_MULTIPLIER).fill("battlesWon"),
+  ...Array(POKEMON_NAMES_WEIGHT_MULTIPLIER).fill("underratedPokemon"),
   "joinTheDiscord",
   "infiniteLevels",
   "everythingIsStackable",
@@ -78,7 +81,7 @@ const commonSplashMessages = [
   "mostlyConsistentSeeds",
   "achievementPointsDontDoAnything",
   "nothingBeatsAJellyFilledDonut",
-  "dontTalkAboutTheTinkatonIncident",
+  "dontTalkAboutThePokemonIncident",
   "alsoTryPokengine",
   "alsoTryEmeraldRogue",
   "alsoTryRadicalRed",
@@ -176,35 +179,149 @@ const commonSplashMessages = [
   "timeForYourDeliDelivery",
   "goodFirstImpression",
   "iPreferRarerCandies",
+  "pocketRoguelite",
+  "porygonDidNothingWrong",
+  "critMattered",
+  "pickupNotRequired",
+  "stayHydrated",
+  "alsoTryCobblemon",
+  "alsoTryPokeDoku",
+  "mySleepStyleIsDoesnt",
+  "makeYourOwnWorldChampDifference",
+  "yoChampInTheMaking",
+  "notLiableForDecisionAnxiety",
+  "theAirIsTastyHere",
+  "continue",
+  "startANewRunToday",
+  "neverGiveUp",
+  "theresAlwaysNextTime",
+  "oneTwoThreeAndPoof",
+  "yourPokemonOnlyGoToLevelOneHundred",
+  "theBattlesWillBeLegendary",
+  "levelCurveBetterThanJohto",
+  "alsoTryShowering",
+  "wellStillBeHere",
+  "weHopeToSeeYouAgain",
+  "aHealthyTeamCanMeanGreaterRewards",
+  "aWildPokemonAppeared",
+  "isThisThingOn",
+  "needsMoreTesting",
+  "whoChecksStatChanges",
+  "whenTwoTrainersEyesMeet",
+  "notOfficiallyOnSteam",
+  "fiftyFifty",
+  "metaNotIncluded",
+  "bornToBeAWinner",
+  "onARollout",
+  "itsAlwaysNightDeepInTheAbyss",
+  "folksThisIsInsane",
 ];
 
 //#region Seasonal Messages
 
 const seasonalSplashMessages: Season[] = [
-  {
-    name: "Halloween",
-    start: "09-15",
-    end: "10-31",
-    messages: [ "halloween.pumpkabooAbout", "halloween.mayContainSpiders", "halloween.spookyScarySkeledirge", "halloween.gourgeistUsedTrickOrTreat", "halloween.letsSnuggleForever" ],
-  },
-  {
-    name: "XMAS",
-    start: "12-01",
-    end: "12-26",
-    messages: [ "xmas.happyHolidays", "xmas.unaffilicatedWithDelibirdServices", "xmas.delibirdSeason", "xmas.diamondsFromTheSky", "xmas.holidayStylePikachuNotIncluded" ],
-  },
   {
     name: "New Year's",
     start: "01-01",
-    end: "01-31",
-    messages: [ "newYears.happyNewYear" ],
+    end: "01-15",
+    messages: ["newYears.happyNewYear", "newYears.andAHappyNewYear"],
+  },
+  {
+    name: "Valentines",
+    start: "02-07",
+    end: "02-21",
+    messages: [
+      "valentines.happyValentines",
+      "valentines.fullOfLove",
+      "valentines.applinForYou",
+      "valentines.thePowerOfLoveIsThreeThirtyBST",
+      "valentines.haveAHeartScale",
+      "valentines.i<3You",
+    ],
+  },
+  {
+    name: "April Fools",
+    start: "04-01",
+    end: "04-03",
+    messages: [
+      "aprilFools.battlesOne",
+      "aprilFools.aprilFools",
+      "aprilFools.removedPokemon",
+      "aprilFools.helloKyleAmber",
+      "aprilFools.gotcha",
+      "aprilFools.alsoTryPokerogueTwo",
+      "aprilFools.nowWithSameScumCountermeasures",
+      "aprilFools.neverGonnaGiveYouGoodRolls",
+      "aprilFools.youBumblingBuffoon",
+      "aprilFools.doubleShinyOddsForTrainersOnly",
+      "aprilFools.nowWithZMoves",
+      "aprilFools.newLightType",
+      "aprilFools.removedMegas",
+      "aprilFools.nerfedYourFavorites",
+      "aprilFools.grrr",
+      "aprilFools.enabledEternatusPassiveGoodLuck",
+      "aprilFools.theDarkestDaySoundsLikeAFutureProblem",
+      "aprilFools.tmShopWhen",
+      "aprilFools.whoIsFinn",
+      "aprilFools.watchOutForShadowPokemon",
+      "aprilFools.nowWithDarkTypeLuxray",
+      "aprilFools.onlyOnPokerogueNetAGAIN",
+      "aprilFools.noFreeVouchers",
+      "aprilFools.altffourAchievementPoints",
+      "aprilFools.rokePogue",
+      "aprilFools.readMe",
+      "aprilFools.winningNotIncluded",
+      "aprilFools.timeForYourSoloUnownRun",
+      "aprilFools.nowARealTimeStrategyGame",
+      "aprilFools.nowWithQuickTimeEncounters",
+      "aprilFools.timeYourInputsForHigherCatchrate",
+      "aprilFools.certifiedButtonSimulator",
+      "aprilFools.iHopeYouGetSuckerPunched",
+    ],
+  },
+  {
+    name: "Halloween",
+    start: "10-15",
+    end: "10-31",
+    messages: [
+      "halloween.happyHalloween",
+      "halloween.boo",
+      "halloween.pumpkabooAbout",
+      "halloween.mayContainSpiders",
+      "halloween.spookyScarySkeledirge",
+      "halloween.gourgeistUsedTrickOrTreat",
+      "halloween.letsSnuggleForever",
+    ],
+  },
+  {
+    name: "Winter Holiday",
+    start: "12-01",
+    end: "12-31",
+    messages: [
+      "winterHoliday.happyHolidays",
+      "winterHoliday.unaffilicatedWithDelibirdServices",
+      "winterHoliday.delibirdSeason",
+      "winterHoliday.diamondsFromTheSky",
+      "winterHoliday.holidayStylePikachuNotIncluded",
+      "winterHoliday.delibirdDirectlyToYourHouse",
+      "winterHoliday.haveAnIceDay",
+      "winterHoliday.spinTheClaydol",
+      "winterHoliday.beGoodForGoodnessSake",
+      "winterHoliday.moomooMilkAndLavaCookies",
+      "winterHoliday.iNeedAYacheBerry",
+      "winterHoliday.getJolly",
+      "winterHoliday.tisTheSeasonToBeSpeSpa",
+      "winterHoliday.deckTheHalls",
+      "winterHoliday.saveScummingGetsYouOnTheNaughtyList",
+      "winterHoliday.badTrainersGetRolycoly",
+    ],
   },
 ];
 
 //#endregion
 
 export function getSplashMessages(): string[] {
-  const splashMessages: string[] = [ ...commonSplashMessages ];
+  const splashMessages: string[] = [...commonSplashMessages];
   console.log("use seasonal splash messages", USE_SEASONAL_SPLASH_MESSAGES);
   if (USE_SEASONAL_SPLASH_MESSAGES) {
     // add seasonal splash messages if the season is active
@@ -215,13 +332,13 @@ export function getSplashMessages(): string[] {
 
       if (now >= startDate && now <= endDate) {
         console.log(`Adding ${messages.length} ${name} splash messages (weight: x${SEASONAL_WEIGHT_MULTIPLIER})`);
-        messages.forEach((message) => {
+        for (const message of messages) {
           const weightedMessage = Array(SEASONAL_WEIGHT_MULTIPLIER).fill(message);
           splashMessages.push(...weightedMessage);
-        });
+        }
       }
     }
   }
 
-  return splashMessages.map((message) => `splashMessages:${message}`);
+  return splashMessages.map(message => `splashMessages:${message}`);
 }
diff --git a/src/data/status-effect.ts b/src/data/status-effect.ts
index 35a956cbb93..a90304c9f7d 100644
--- a/src/data/status-effect.ts
+++ b/src/data/status-effect.ts
@@ -1,4 +1,4 @@
-import { randIntRange } from "#app/utils";
+import { randIntRange } from "#app/utils/common";
 import { StatusEffect } from "#enums/status-effect";
 import type { ParseKeys } from "i18next";
 import i18next from "i18next";
@@ -6,10 +6,10 @@ import i18next from "i18next";
 export class Status {
   public effect: StatusEffect;
   /** Toxic damage is `1/16 max HP * toxicTurnCount` */
-  public toxicTurnCount: number = 0;
+  public toxicTurnCount = 0;
   public sleepTurnsRemaining?: number;
 
-  constructor(effect: StatusEffect, toxicTurnCount: number = 0, sleepTurnsRemaining?: number) {
+  constructor(effect: StatusEffect, toxicTurnCount = 0, sleepTurnsRemaining?: number) {
     this.effect = effect;
     this.toxicTurnCount = toxicTurnCount;
     this.sleepTurnsRemaining = sleepTurnsRemaining;
@@ -23,7 +23,9 @@ export class Status {
   }
 
   isPostTurn(): boolean {
-    return this.effect === StatusEffect.POISON || this.effect === StatusEffect.TOXIC || this.effect === StatusEffect.BURN;
+    return (
+      this.effect === StatusEffect.POISON || this.effect === StatusEffect.TOXIC || this.effect === StatusEffect.BURN
+    );
   }
 }
 
@@ -46,17 +48,24 @@ function getStatusEffectMessageKey(statusEffect: StatusEffect | undefined): stri
   }
 }
 
-export function getStatusEffectObtainText(statusEffect: StatusEffect | undefined, pokemonNameWithAffix: string, sourceText?: string): string {
+export function getStatusEffectObtainText(
+  statusEffect: StatusEffect | undefined,
+  pokemonNameWithAffix: string,
+  sourceText?: string,
+): string {
   if (statusEffect === StatusEffect.NONE) {
     return "";
   }
 
   if (!sourceText) {
-    const i18nKey = `${getStatusEffectMessageKey(statusEffect)}.obtain`as ParseKeys;
+    const i18nKey = `${getStatusEffectMessageKey(statusEffect)}.obtain` as ParseKeys;
     return i18next.t(i18nKey, { pokemonNameWithAffix: pokemonNameWithAffix });
   }
-  const i18nKey = `${getStatusEffectMessageKey(statusEffect)}.obtainSource`as ParseKeys;
-  return i18next.t(i18nKey, { pokemonNameWithAffix: pokemonNameWithAffix, sourceText: sourceText });
+  const i18nKey = `${getStatusEffectMessageKey(statusEffect)}.obtainSource` as ParseKeys;
+  return i18next.t(i18nKey, {
+    pokemonNameWithAffix: pokemonNameWithAffix,
+    sourceText: sourceText,
+  });
 }
 
 export function getStatusEffectActivationText(statusEffect: StatusEffect, pokemonNameWithAffix: string): string {
@@ -107,17 +116,17 @@ export function getStatusEffectCatchRateMultiplier(statusEffect: StatusEffect):
 }
 
 /**
-* Returns a random non-volatile StatusEffect
-*/
+ * Returns a random non-volatile StatusEffect
+ */
 export function generateRandomStatusEffect(): StatusEffect {
   return randIntRange(1, 6);
 }
 
 /**
-* Returns a random non-volatile StatusEffect between the two provided
-* @param statusEffectA The first StatusEffect
-* @param statusEffectA The second StatusEffect
-*/
+ * Returns a random non-volatile StatusEffect between the two provided
+ * @param statusEffectA The first StatusEffect
+ * @param statusEffectA The second StatusEffect
+ */
 export function getRandomStatusEffect(statusEffectA: StatusEffect, statusEffectB: StatusEffect): StatusEffect {
   if (statusEffectA === StatusEffect.NONE || statusEffectA === StatusEffect.FAINT) {
     return statusEffectB;
@@ -130,10 +139,10 @@ export function getRandomStatusEffect(statusEffectA: StatusEffect, statusEffectB
 }
 
 /**
-* Returns a random non-volatile StatusEffect between the two provided
-* @param statusA The first Status
-* @param statusB The second Status
-*/
+ * Returns a random non-volatile StatusEffect between the two provided
+ * @param statusA The first Status
+ * @param statusB The second Status
+ */
 export function getRandomStatus(statusA: Status | null, statusB: Status | null): Status | null {
   if (!statusA || statusA.effect === StatusEffect.NONE || statusA.effect === StatusEffect.FAINT) {
     return statusB;
@@ -142,7 +151,6 @@ export function getRandomStatus(statusA: Status | null, statusB: Status | null):
     return statusA;
   }
 
-
   return randIntRange(0, 2) ? statusA : statusB;
 }
 
@@ -150,14 +158,14 @@ export function getRandomStatus(statusA: Status | null, statusB: Status | null):
  * Gets all non volatile status effects
  * @returns A list containing all non volatile status effects
  */
-export function getNonVolatileStatusEffects():Array<StatusEffect> {
+export function getNonVolatileStatusEffects(): Array<StatusEffect> {
   return [
     StatusEffect.POISON,
     StatusEffect.TOXIC,
     StatusEffect.PARALYSIS,
     StatusEffect.SLEEP,
     StatusEffect.FREEZE,
-    StatusEffect.BURN
+    StatusEffect.BURN,
   ];
 }
 
diff --git a/src/data/terrain.ts b/src/data/terrain.ts
index 1ffe0adc8bf..5b6063cee68 100644
--- a/src/data/terrain.ts
+++ b/src/data/terrain.ts
@@ -1,7 +1,7 @@
 import type Pokemon from "../field/pokemon";
-import type Move from "./move";
-import { Type } from "#enums/type";
-import { ProtectAttr } from "./move";
+import type Move from "./moves/move";
+import { PokemonType } from "#enums/pokemon-type";
+import { ProtectAttr } from "./moves/move";
 import type { BattlerIndex } from "#app/battle";
 import i18next from "i18next";
 
@@ -10,7 +10,7 @@ export enum TerrainType {
   MISTY,
   ELECTRIC,
   GRASSY,
-  PSYCHIC
+  PSYCHIC,
 }
 
 export class Terrain {
@@ -30,20 +30,20 @@ export class Terrain {
     return true;
   }
 
-  getAttackTypeMultiplier(attackType: Type): number {
+  getAttackTypeMultiplier(attackType: PokemonType): number {
     switch (this.terrainType) {
       case TerrainType.ELECTRIC:
-        if (attackType === Type.ELECTRIC) {
+        if (attackType === PokemonType.ELECTRIC) {
           return 1.3;
         }
         break;
       case TerrainType.GRASSY:
-        if (attackType === Type.GRASS) {
+        if (attackType === PokemonType.GRASS) {
           return 1.3;
         }
         break;
       case TerrainType.PSYCHIC:
-        if (attackType === Type.PSYCHIC) {
+        if (attackType === PokemonType.PSYCHIC) {
           return 1.3;
         }
         break;
@@ -57,7 +57,10 @@ export class Terrain {
       case TerrainType.PSYCHIC:
         if (!move.hasAttr(ProtectAttr)) {
           // Cancels move if the move has positive priority and targets a Pokemon grounded on the Psychic Terrain
-          return move.getPriority(user) > 0 && user.getOpponents().some(o => targets.includes(o.getBattlerIndex()) && o.isGrounded());
+          return (
+            move.getPriority(user) > 0 &&
+            user.getOpponents(true).some(o => targets.includes(o.getBattlerIndex()) && o.isGrounded())
+          );
         }
     }
 
@@ -80,18 +83,17 @@ export function getTerrainName(terrainType: TerrainType): string {
   return "";
 }
 
-
-export function getTerrainColor(terrainType: TerrainType): [ number, number, number ] {
+export function getTerrainColor(terrainType: TerrainType): [number, number, number] {
   switch (terrainType) {
     case TerrainType.MISTY:
-      return [ 232, 136, 200 ];
+      return [232, 136, 200];
     case TerrainType.ELECTRIC:
-      return [ 248, 248, 120 ];
+      return [248, 248, 120];
     case TerrainType.GRASSY:
-      return [ 120, 200, 80 ];
+      return [120, 200, 80];
     case TerrainType.PSYCHIC:
-      return [ 160, 64, 160 ];
+      return [160, 64, 160];
   }
 
-  return [ 0, 0, 0 ];
+  return [0, 0, 0];
 }
diff --git a/src/data/trainer-config.ts b/src/data/trainer-config.ts
deleted file mode 100644
index 016a2c9bca6..00000000000
--- a/src/data/trainer-config.ts
+++ /dev/null
@@ -1,2859 +0,0 @@
-import { startingWave } from "#app/battle-scene";
-import { globalScene } from "#app/global-scene";
-import type { ModifierTypeFunc } from "#app/modifier/modifier-type";
-import { modifierTypes } from "#app/modifier/modifier-type";
-import type { EnemyPokemon } from "#app/field/pokemon";
-import { PokemonMove } from "#app/field/pokemon";
-import * as Utils from "#app/utils";
-import { PokeballType } from "#enums/pokeball";
-import { pokemonEvolutions, pokemonPrevolutions } from "#app/data/balance/pokemon-evolutions";
-import type { PokemonSpeciesFilter } from "#app/data/pokemon-species";
-import type PokemonSpecies from "#app/data/pokemon-species";
-import { getPokemonSpecies } from "#app/data/pokemon-species";
-import { tmSpecies } from "#app/data/balance/tms";
-import { Type } from "#enums/type";
-import { doubleBattleDialogue } from "#app/data/dialogue";
-import type { PersistentModifier } from "#app/modifier/modifier";
-import { TrainerVariant } from "#app/field/trainer";
-import { getIsInitialized, initI18n } from "#app/plugins/i18n";
-import i18next from "i18next";
-import { Moves } from "#enums/moves";
-import { PartyMemberStrength } from "#enums/party-member-strength";
-import { Species } from "#enums/species";
-import { TrainerType } from "#enums/trainer-type";
-import { Gender } from "#app/data/gender";
-
-/** Minimum BST for Pokemon generated onto the Elite Four's teams */
-const ELITE_FOUR_MINIMUM_BST = 460;
-
-export enum TrainerPoolTier {
-    COMMON,
-    UNCOMMON,
-    RARE,
-    SUPER_RARE,
-    ULTRA_RARE
-}
-
-export interface TrainerTierPools {
-    [key: number]: Species[]
-}
-
-export enum TrainerSlot {
-    NONE,
-    TRAINER,
-    TRAINER_PARTNER
-}
-
-export class TrainerPartyTemplate {
-  public size: number;
-  public strength: PartyMemberStrength;
-  public sameSpecies: boolean;
-  public balanced: boolean;
-
-  constructor(size: number, strength: PartyMemberStrength, sameSpecies?: boolean, balanced?: boolean) {
-    this.size = size;
-    this.strength = strength;
-    this.sameSpecies = !!sameSpecies;
-    this.balanced = !!balanced;
-  }
-
-  getStrength(index: number): PartyMemberStrength {
-    return this.strength;
-  }
-
-  isSameSpecies(index: number): boolean {
-    return this.sameSpecies;
-  }
-
-  isBalanced(index: number): boolean {
-    return this.balanced;
-  }
-}
-
-export class TrainerPartyCompoundTemplate extends TrainerPartyTemplate {
-  public templates: TrainerPartyTemplate[];
-
-  constructor(...templates: TrainerPartyTemplate[]) {
-    super(templates.reduce((total: number, template: TrainerPartyTemplate) => {
-      total += template.size;
-      return total;
-    }, 0), PartyMemberStrength.AVERAGE);
-    this.templates = templates;
-  }
-
-  getStrength(index: number): PartyMemberStrength {
-    let t = 0;
-    for (const template of this.templates) {
-      if (t + template.size > index) {
-        return template.getStrength(index - t);
-      }
-      t += template.size;
-    }
-
-    return super.getStrength(index);
-  }
-
-  isSameSpecies(index: number): boolean {
-    let t = 0;
-    for (const template of this.templates) {
-      if (t + template.size > index) {
-        return template.isSameSpecies(index - t);
-      }
-      t += template.size;
-    }
-
-    return super.isSameSpecies(index);
-  }
-
-  isBalanced(index: number): boolean {
-    let t = 0;
-    for (const template of this.templates) {
-      if (t + template.size > index) {
-        return template.isBalanced(index - t);
-      }
-      t += template.size;
-    }
-
-    return super.isBalanced(index);
-  }
-}
-
-export const trainerPartyTemplates = {
-  ONE_WEAK_ONE_STRONG: new TrainerPartyCompoundTemplate(new TrainerPartyTemplate(1, PartyMemberStrength.WEAK), new TrainerPartyTemplate(1, PartyMemberStrength.STRONG)),
-  ONE_AVG: new TrainerPartyTemplate(1, PartyMemberStrength.AVERAGE),
-  ONE_AVG_ONE_STRONG: new TrainerPartyCompoundTemplate(new TrainerPartyTemplate(1, PartyMemberStrength.AVERAGE), new TrainerPartyTemplate(1, PartyMemberStrength.STRONG)),
-  ONE_STRONG: new TrainerPartyTemplate(1, PartyMemberStrength.STRONG),
-  ONE_STRONGER: new TrainerPartyTemplate(1, PartyMemberStrength.STRONGER),
-  TWO_WEAKER: new TrainerPartyTemplate(2, PartyMemberStrength.WEAKER),
-  TWO_WEAK: new TrainerPartyTemplate(2, PartyMemberStrength.WEAK),
-  TWO_WEAK_ONE_AVG: new TrainerPartyCompoundTemplate(new TrainerPartyTemplate(2, PartyMemberStrength.WEAK), new TrainerPartyTemplate(1, PartyMemberStrength.AVERAGE)),
-  TWO_WEAK_SAME_ONE_AVG: new TrainerPartyCompoundTemplate(new TrainerPartyTemplate(2, PartyMemberStrength.WEAK, true), new TrainerPartyTemplate(1, PartyMemberStrength.AVERAGE)),
-  TWO_WEAK_SAME_TWO_WEAK_SAME: new TrainerPartyCompoundTemplate(new TrainerPartyTemplate(2, PartyMemberStrength.WEAK, true), new TrainerPartyTemplate(2, PartyMemberStrength.WEAK, true)),
-  TWO_WEAK_ONE_STRONG: new TrainerPartyCompoundTemplate(new TrainerPartyTemplate(2, PartyMemberStrength.WEAK), new TrainerPartyTemplate(1, PartyMemberStrength.STRONG)),
-  TWO_AVG: new TrainerPartyTemplate(2, PartyMemberStrength.AVERAGE),
-  TWO_AVG_ONE_STRONG: new TrainerPartyCompoundTemplate(new TrainerPartyTemplate(2, PartyMemberStrength.AVERAGE), new TrainerPartyTemplate(1, PartyMemberStrength.STRONG)),
-  TWO_AVG_SAME_ONE_AVG: new TrainerPartyCompoundTemplate(new TrainerPartyTemplate(2, PartyMemberStrength.AVERAGE, true), new TrainerPartyTemplate(1, PartyMemberStrength.AVERAGE)),
-  TWO_AVG_SAME_ONE_STRONG: new TrainerPartyCompoundTemplate(new TrainerPartyTemplate(2, PartyMemberStrength.AVERAGE, true), new TrainerPartyTemplate(1, PartyMemberStrength.STRONG)),
-  TWO_AVG_SAME_TWO_AVG_SAME: new TrainerPartyCompoundTemplate(new TrainerPartyTemplate(2, PartyMemberStrength.AVERAGE, true), new TrainerPartyTemplate(2, PartyMemberStrength.AVERAGE, true)),
-  TWO_STRONG: new TrainerPartyTemplate(2, PartyMemberStrength.STRONG),
-  THREE_WEAK: new TrainerPartyTemplate(3, PartyMemberStrength.WEAK),
-  THREE_WEAK_SAME: new TrainerPartyTemplate(3, PartyMemberStrength.WEAK, true),
-  THREE_AVG: new TrainerPartyTemplate(3, PartyMemberStrength.AVERAGE),
-  THREE_AVG_SAME: new TrainerPartyTemplate(3, PartyMemberStrength.AVERAGE, true),
-  THREE_WEAK_BALANCED: new TrainerPartyTemplate(3, PartyMemberStrength.WEAK, false, true),
-  FOUR_WEAKER: new TrainerPartyTemplate(4, PartyMemberStrength.WEAKER),
-  FOUR_WEAKER_SAME: new TrainerPartyTemplate(4, PartyMemberStrength.WEAKER, true),
-  FOUR_WEAK: new TrainerPartyTemplate(4, PartyMemberStrength.WEAK),
-  FOUR_WEAK_SAME: new TrainerPartyTemplate(4, PartyMemberStrength.WEAK, true),
-  FOUR_WEAK_BALANCED: new TrainerPartyTemplate(4, PartyMemberStrength.WEAK, false, true),
-  FIVE_WEAKER: new TrainerPartyTemplate(5, PartyMemberStrength.WEAKER),
-  FIVE_WEAK: new TrainerPartyTemplate(5, PartyMemberStrength.WEAK),
-  FIVE_WEAK_BALANCED: new TrainerPartyTemplate(5, PartyMemberStrength.WEAK, false, true),
-  SIX_WEAKER: new TrainerPartyTemplate(6, PartyMemberStrength.WEAKER),
-  SIX_WEAKER_SAME: new TrainerPartyTemplate(6, PartyMemberStrength.WEAKER, true),
-  SIX_WEAK_SAME: new TrainerPartyTemplate(6, PartyMemberStrength.WEAK, true),
-  SIX_WEAK_BALANCED: new TrainerPartyTemplate(6, PartyMemberStrength.WEAK, false, true),
-
-  GYM_LEADER_1: new TrainerPartyCompoundTemplate(new TrainerPartyTemplate(1, PartyMemberStrength.AVERAGE), new TrainerPartyTemplate(1, PartyMemberStrength.STRONG)),
-  GYM_LEADER_2: new TrainerPartyCompoundTemplate(new TrainerPartyTemplate(1, PartyMemberStrength.AVERAGE), new TrainerPartyTemplate(1, PartyMemberStrength.STRONG), new TrainerPartyTemplate(1, PartyMemberStrength.STRONGER)),
-  GYM_LEADER_3: new TrainerPartyCompoundTemplate(new TrainerPartyTemplate(2, PartyMemberStrength.AVERAGE), new TrainerPartyTemplate(1, PartyMemberStrength.STRONG), new TrainerPartyTemplate(1, PartyMemberStrength.STRONGER)),
-  GYM_LEADER_4: new TrainerPartyCompoundTemplate(new TrainerPartyTemplate(3, PartyMemberStrength.AVERAGE), new TrainerPartyTemplate(1, PartyMemberStrength.STRONG), new TrainerPartyTemplate(1, PartyMemberStrength.STRONGER)),
-  GYM_LEADER_5: new TrainerPartyCompoundTemplate(new TrainerPartyTemplate(3, PartyMemberStrength.AVERAGE), new TrainerPartyTemplate(2, PartyMemberStrength.STRONG), new TrainerPartyTemplate(1, PartyMemberStrength.STRONGER)),
-
-  ELITE_FOUR: new TrainerPartyCompoundTemplate(new TrainerPartyTemplate(2, PartyMemberStrength.AVERAGE), new TrainerPartyTemplate(3, PartyMemberStrength.STRONG), new TrainerPartyTemplate(1, PartyMemberStrength.STRONGER)),
-
-  CHAMPION: new TrainerPartyCompoundTemplate(new TrainerPartyTemplate(4, PartyMemberStrength.STRONG), new TrainerPartyTemplate(2, PartyMemberStrength.STRONGER, false, true)),
-
-  RIVAL: new TrainerPartyCompoundTemplate(new TrainerPartyTemplate(1, PartyMemberStrength.STRONG), new TrainerPartyTemplate(1, PartyMemberStrength.AVERAGE)),
-  RIVAL_2: new TrainerPartyCompoundTemplate(new TrainerPartyTemplate(1, PartyMemberStrength.STRONG), new TrainerPartyTemplate(1, PartyMemberStrength.AVERAGE), new TrainerPartyTemplate(1, PartyMemberStrength.WEAK, false, true)),
-  RIVAL_3: new TrainerPartyCompoundTemplate(new TrainerPartyTemplate(1, PartyMemberStrength.STRONG), new TrainerPartyTemplate(1, PartyMemberStrength.AVERAGE), new TrainerPartyTemplate(1, PartyMemberStrength.AVERAGE, false, true), new TrainerPartyTemplate(1, PartyMemberStrength.WEAK, false, true)),
-  RIVAL_4: new TrainerPartyCompoundTemplate(new TrainerPartyTemplate(1, PartyMemberStrength.STRONG), new TrainerPartyTemplate(1, PartyMemberStrength.AVERAGE), new TrainerPartyTemplate(2, PartyMemberStrength.AVERAGE, false, true), new TrainerPartyTemplate(1, PartyMemberStrength.WEAK, false, true)),
-  RIVAL_5: new TrainerPartyCompoundTemplate(new TrainerPartyTemplate(1, PartyMemberStrength.STRONG), new TrainerPartyTemplate(1, PartyMemberStrength.AVERAGE), new TrainerPartyTemplate(3, PartyMemberStrength.AVERAGE, false, true), new TrainerPartyTemplate(1, PartyMemberStrength.STRONG)),
-  RIVAL_6: new TrainerPartyCompoundTemplate(new TrainerPartyTemplate(1, PartyMemberStrength.STRONG), new TrainerPartyTemplate(1, PartyMemberStrength.AVERAGE), new TrainerPartyTemplate(3, PartyMemberStrength.AVERAGE, false, true), new TrainerPartyTemplate(1, PartyMemberStrength.STRONGER))
-};
-
-type PartyTemplateFunc = () => TrainerPartyTemplate;
-type PartyMemberFunc = (level: number, strength: PartyMemberStrength) => EnemyPokemon;
-type GenModifiersFunc = (party: EnemyPokemon[]) => PersistentModifier[];
-
-export interface PartyMemberFuncs {
-    [key: number]: PartyMemberFunc
-}
-
-export class TrainerConfig {
-  public trainerType: TrainerType;
-  public trainerTypeDouble: TrainerType;
-  public name: string;
-  public nameFemale: string;
-  public nameDouble: string;
-  public title: string;
-  public titleDouble: string;
-  public hasGenders: boolean = false;
-  public hasDouble: boolean = false;
-  public hasCharSprite: boolean = false;
-  public doubleOnly: boolean = false;
-  public moneyMultiplier: number = 1;
-  public isBoss: boolean = false;
-  public hasStaticParty: boolean = false;
-  public useSameSeedForAllMembers: boolean = false;
-  public mixedBattleBgm: string;
-  public battleBgm: string;
-  public encounterBgm: string;
-  public femaleEncounterBgm: string;
-  public doubleEncounterBgm: string;
-  public victoryBgm: string;
-  public genModifiersFunc: GenModifiersFunc;
-  public modifierRewardFuncs: ModifierTypeFunc[] = [];
-  public partyTemplates: TrainerPartyTemplate[];
-  public partyTemplateFunc: PartyTemplateFunc;
-  public eventRewardFuncs: ModifierTypeFunc[] = [];
-  public partyMemberFuncs: PartyMemberFuncs = {};
-  public speciesPools: TrainerTierPools;
-  public speciesFilter: PokemonSpeciesFilter;
-  public specialtyTypes: Type[] = [];
-  public hasVoucher: boolean = false;
-
-  public encounterMessages: string[] = [];
-  public victoryMessages: string[] = [];
-  public defeatMessages: string[] = [];
-
-  public femaleEncounterMessages: string[];
-  public femaleVictoryMessages: string[];
-  public femaleDefeatMessages: string[];
-
-  public doubleEncounterMessages: string[];
-  public doubleVictoryMessages: string[];
-  public doubleDefeatMessages: string[];
-
-  constructor(trainerType: TrainerType, allowLegendaries?: boolean) {
-    this.trainerType = trainerType;
-    this.name = Utils.toReadableString(TrainerType[this.getDerivedType()]);
-    this.battleBgm = "battle_trainer";
-    this.mixedBattleBgm = "battle_trainer";
-    this.victoryBgm = "victory_trainer";
-    this.partyTemplates = [ trainerPartyTemplates.TWO_AVG ];
-    this.speciesFilter = species => (allowLegendaries || (!species.legendary && !species.subLegendary && !species.mythical)) && !species.isTrainerForbidden();
-  }
-
-  getKey(): string {
-    return TrainerType[this.getDerivedType()].toString().toLowerCase();
-  }
-
-  getSpriteKey(female?: boolean, isDouble: boolean = false): string {
-    let ret = this.getKey();
-    if (this.hasGenders) {
-      ret += `_${female ? "f" : "m"}`;
-    }
-    // If a special double trainer class was set, set it as the sprite key
-    if (this.trainerTypeDouble && female && isDouble) {
-      // Get the derived type for the double trainer since the sprite key is based on the derived type
-      ret = TrainerType[this.getDerivedType(this.trainerTypeDouble)].toString().toLowerCase();
-    }
-    return ret;
-  }
-
-  setName(name: string): TrainerConfig {
-    if (name === "Finn") {
-      // Give the rival a localized name
-      // First check if i18n is initialized
-      if (!getIsInitialized()) {
-        initI18n();
-      }
-      // This is only the male name, because the female name is handled in a different function (setHasGenders)
-      if (name === "Finn") {
-        name = i18next.t("trainerNames:rival");
-      }
-    }
-
-    this.name = name;
-
-    return this;
-  }
-
-  /**
-   * Sets if a boss trainer will have a voucher or not.
-   * @param hasVoucher - If the boss trainer will have a voucher.
-   */
-  setHasVoucher(hasVoucher: boolean): void {
-    this.hasVoucher = hasVoucher;
-  }
-
-  setTitle(title: string): TrainerConfig {
-    // First check if i18n is initialized
-    if (!getIsInitialized()) {
-      initI18n();
-    }
-
-    // Make the title lowercase and replace spaces with underscores
-    title = title.toLowerCase().replace(/\s/g, "_");
-
-    // Get the title from the i18n file
-    this.title = i18next.t(`titles:${title}`);
-
-
-    return this;
-  }
-
-
-  /**
-     * Returns the derived trainer type for a given trainer type.
-     * @param trainerTypeToDeriveFrom - The trainer type to derive from. (If null, the this.trainerType property will be used.)
-     * @returns {TrainerType} - The derived trainer type.
-     */
-  getDerivedType(trainerTypeToDeriveFrom: TrainerType | null = null): TrainerType {
-    let trainerType = trainerTypeToDeriveFrom ? trainerTypeToDeriveFrom : this.trainerType;
-    switch (trainerType) {
-      case TrainerType.RIVAL_2:
-      case TrainerType.RIVAL_3:
-      case TrainerType.RIVAL_4:
-      case TrainerType.RIVAL_5:
-      case TrainerType.RIVAL_6:
-        trainerType = TrainerType.RIVAL;
-        break;
-      case TrainerType.LANCE_CHAMPION:
-        trainerType = TrainerType.LANCE;
-        break;
-      case TrainerType.LARRY_ELITE:
-        trainerType = TrainerType.LARRY;
-        break;
-      case TrainerType.ROCKET_BOSS_GIOVANNI_1:
-      case TrainerType.ROCKET_BOSS_GIOVANNI_2:
-        trainerType = TrainerType.GIOVANNI;
-        break;
-      case TrainerType.MAXIE_2:
-        trainerType = TrainerType.MAXIE;
-        break;
-      case TrainerType.ARCHIE_2:
-        trainerType = TrainerType.ARCHIE;
-        break;
-      case TrainerType.CYRUS_2:
-        trainerType = TrainerType.CYRUS;
-        break;
-      case TrainerType.GHETSIS_2:
-        trainerType = TrainerType.GHETSIS;
-        break;
-      case TrainerType.LYSANDRE_2:
-        trainerType = TrainerType.LYSANDRE;
-        break;
-      case TrainerType.LUSAMINE_2:
-        trainerType = TrainerType.LUSAMINE;
-        break;
-      case TrainerType.GUZMA_2:
-        trainerType = TrainerType.GUZMA;
-        break;
-      case TrainerType.ROSE_2:
-        trainerType = TrainerType.ROSE;
-        break;
-      case TrainerType.PENNY_2:
-        trainerType = TrainerType.PENNY;
-        break;
-      case TrainerType.MARNIE_ELITE:
-        trainerType = TrainerType.MARNIE;
-        break;
-      case TrainerType.NESSA_ELITE:
-        trainerType = TrainerType.NESSA;
-        break;
-      case TrainerType.BEA_ELITE:
-        trainerType = TrainerType.BEA;
-        break;
-      case TrainerType.ALLISTER_ELITE:
-        trainerType = TrainerType.ALLISTER;
-        break;
-      case TrainerType.RAIHAN_ELITE:
-        trainerType = TrainerType.RAIHAN;
-        break;
-    }
-
-    return trainerType;
-  }
-
-  /**
-     * Sets the configuration for trainers with genders, including the female name and encounter background music (BGM).
-     * @param {string} [nameFemale] The name of the female trainer. If 'Ivy', a localized name will be assigned.
-     * @param {TrainerType | string} [femaleEncounterBgm] The encounter BGM for the female trainer, which can be a TrainerType or a string.
-     * @returns {TrainerConfig} The updated TrainerConfig instance.
-     **/
-  setHasGenders(nameFemale?: string, femaleEncounterBgm?: TrainerType | string): TrainerConfig {
-    // If the female name is 'Ivy' (the rival), assign a localized name.
-    if (nameFemale === "Ivy") {
-      // Check if the internationalization (i18n) system is initialized.
-      if (!getIsInitialized()) {
-        // Initialize the i18n system if it is not already initialized.
-        initI18n();
-      }
-      // Set the localized name for the female rival.
-      this.nameFemale = i18next.t("trainerNames:rival_female");
-    } else {
-      // Otherwise, assign the provided female name.
-      this.nameFemale = nameFemale!; // TODO: is this bang correct?
-    }
-
-    // Indicate that this trainer configuration includes genders.
-    this.hasGenders = true;
-
-    // If a female encounter BGM is provided.
-    if (femaleEncounterBgm) {
-      // If the BGM is a TrainerType (number), convert it to a string, replace underscores with spaces, and convert to lowercase.
-      // Otherwise, assign the provided string as the BGM.
-      this.femaleEncounterBgm = typeof femaleEncounterBgm === "number"
-        ? TrainerType[femaleEncounterBgm].toString().replace(/_/g, " ").toLowerCase()
-        : femaleEncounterBgm;
-    }
-
-    // Return the updated TrainerConfig instance.
-    return this;
-  }
-
-  /**
-     * Sets the configuration for trainers with double battles, including the name of the double trainer and the encounter BGM.
-     * @param nameDouble The name of the double trainer (e.g., "Ace Duo" for Trainer Class Doubles or "red_blue_double" for NAMED trainer doubles).
-     * @param doubleEncounterBgm The encounter BGM for the double trainer, which can be a TrainerType or a string.
-     * @returns {TrainerConfig} The updated TrainerConfig instance.
-     */
-  setHasDouble(nameDouble: string, doubleEncounterBgm?: TrainerType | string): TrainerConfig {
-    this.hasDouble = true;
-    this.nameDouble = nameDouble;
-    if (doubleEncounterBgm) {
-      this.doubleEncounterBgm = typeof doubleEncounterBgm === "number" ? TrainerType[doubleEncounterBgm].toString().replace(/\_/g, " ").toLowerCase() : doubleEncounterBgm;
-    }
-    return this;
-  }
-
-  /**
-     * Sets the trainer type for double battles.
-     * @param trainerTypeDouble The TrainerType of the partner in a double battle.
-     * @returns {TrainerConfig} The updated TrainerConfig instance.
-     */
-  setDoubleTrainerType(trainerTypeDouble: TrainerType): TrainerConfig {
-    this.trainerTypeDouble = trainerTypeDouble;
-    this.setDoubleMessages(this.nameDouble);
-    return this;
-  }
-
-  /**
-     * Sets the encounter and victory messages for double trainers.
-     * @param nameDouble - The name of the pair (e.g. "red_blue_double").
-     */
-  setDoubleMessages(nameDouble: string) {
-    // Check if there is double battle dialogue for this trainer
-    if (doubleBattleDialogue[nameDouble]) {
-      // Set encounter and victory messages for double trainers
-      this.doubleEncounterMessages = doubleBattleDialogue[nameDouble].encounter;
-      this.doubleVictoryMessages = doubleBattleDialogue[nameDouble].victory;
-      this.doubleDefeatMessages = doubleBattleDialogue[nameDouble].defeat;
-    }
-  }
-
-  /**
-     * Sets the title for double trainers
-     * @param titleDouble The key for the title in the i18n file. (e.g., "champion_double").
-     * @returns {TrainerConfig} The updated TrainerConfig instance.
-     */
-  setDoubleTitle(titleDouble: string): TrainerConfig {
-    // First check if i18n is initialized
-    if (!getIsInitialized()) {
-      initI18n();
-    }
-
-    // Make the title lowercase and replace spaces with underscores
-    titleDouble = titleDouble.toLowerCase().replace(/\s/g, "_");
-
-    // Get the title from the i18n file
-    this.titleDouble = i18next.t(`titles:${titleDouble}`);
-
-    return this;
-  }
-
-  setHasCharSprite(): TrainerConfig {
-    this.hasCharSprite = true;
-    return this;
-  }
-
-  setDoubleOnly(): TrainerConfig {
-    this.doubleOnly = true;
-    return this;
-  }
-
-  setMoneyMultiplier(moneyMultiplier: number): TrainerConfig {
-    this.moneyMultiplier = moneyMultiplier;
-    return this;
-  }
-
-  setBoss(): TrainerConfig {
-    this.isBoss = true;
-    return this;
-  }
-
-  setStaticParty(): TrainerConfig {
-    this.hasStaticParty = true;
-    return this;
-  }
-
-  setUseSameSeedForAllMembers(): TrainerConfig {
-    this.useSameSeedForAllMembers = true;
-    return this;
-  }
-
-  setMixedBattleBgm(mixedBattleBgm: string): TrainerConfig {
-    this.mixedBattleBgm = mixedBattleBgm;
-    return this;
-  }
-
-  setBattleBgm(battleBgm: string): TrainerConfig {
-    this.battleBgm = battleBgm;
-    return this;
-  }
-
-  setEncounterBgm(encounterBgm: TrainerType | string): TrainerConfig {
-    this.encounterBgm = typeof encounterBgm === "number" ? TrainerType[encounterBgm].toString().toLowerCase() : encounterBgm;
-    return this;
-  }
-
-  setVictoryBgm(victoryBgm: string): TrainerConfig {
-    this.victoryBgm = victoryBgm;
-    return this;
-  }
-
-  setPartyTemplates(...partyTemplates: TrainerPartyTemplate[]): TrainerConfig {
-    this.partyTemplates = partyTemplates;
-    return this;
-  }
-
-  setPartyTemplateFunc(partyTemplateFunc: PartyTemplateFunc): TrainerConfig {
-    this.partyTemplateFunc = partyTemplateFunc;
-    return this;
-  }
-
-  setPartyMemberFunc(slotIndex: number, partyMemberFunc: PartyMemberFunc): TrainerConfig {
-    this.partyMemberFuncs[slotIndex] = partyMemberFunc;
-    return this;
-  }
-
-  setSpeciesPools(speciesPools: TrainerTierPools | Species[]): TrainerConfig {
-    this.speciesPools = (Array.isArray(speciesPools) ? { [TrainerPoolTier.COMMON]: speciesPools } : speciesPools) as unknown as TrainerTierPools;
-    return this;
-  }
-
-  setSpeciesFilter(speciesFilter: PokemonSpeciesFilter, allowLegendaries?: boolean): TrainerConfig {
-    const baseFilter = this.speciesFilter;
-    this.speciesFilter = allowLegendaries ? speciesFilter : species => speciesFilter(species) && baseFilter(species);
-    return this;
-  }
-
-  setSpecialtyTypes(...specialtyTypes: Type[]): TrainerConfig {
-    this.specialtyTypes = specialtyTypes;
-    return this;
-  }
-
-  setGenModifiersFunc(genModifiersFunc: GenModifiersFunc): TrainerConfig {
-    this.genModifiersFunc = genModifiersFunc;
-    return this;
-  }
-
-  setEventModifierRewardFuncs(...modifierTypeFuncs: (() => ModifierTypeFunc)[]): TrainerConfig {
-    this.eventRewardFuncs = modifierTypeFuncs.map(func => () => {
-      const modifierTypeFunc = func();
-      const modifierType = modifierTypeFunc();
-      modifierType.withIdFromFunc(modifierTypeFunc);
-      return modifierType;
-    });
-    return this;
-  }
-
-
-  setModifierRewardFuncs(...modifierTypeFuncs: (() => ModifierTypeFunc)[]): TrainerConfig {
-    this.modifierRewardFuncs = modifierTypeFuncs.map(func => () => {
-      const modifierTypeFunc = func();
-      const modifierType = modifierTypeFunc();
-      modifierType.withIdFromFunc(modifierTypeFunc);
-      return modifierType;
-    });
-    return this;
-  }
-
-  /**
-  * Returns the pool of species for an evil team admin
-  * @param team - The evil team the admin belongs to.
-  * @returns {TrainerTierPools}
-  */
-  speciesPoolPerEvilTeamAdmin(team): TrainerTierPools {
-    team = team.toLowerCase();
-    switch (team) {
-      case "rocket": {
-        return {
-          [TrainerPoolTier.COMMON]: [ Species.RATTATA, Species.KOFFING, Species.EKANS, Species.ZUBAT, Species.MAGIKARP, Species.HOUNDOUR, Species.ONIX, Species.CUBONE, Species.GROWLITHE, Species.MURKROW, Species.GASTLY, Species.EXEGGCUTE, Species.VOLTORB, Species.DROWZEE, Species.VILEPLUME ],
-          [TrainerPoolTier.UNCOMMON]: [ Species.PORYGON, Species.MANKEY, Species.MAGNEMITE, Species.ALOLA_SANDSHREW, Species.ALOLA_MEOWTH, Species.ALOLA_GRIMER, Species.ALOLA_GEODUDE, Species.PALDEA_TAUROS, Species.OMANYTE, Species.KABUTO, Species.MAGBY, Species.ELEKID ],
-          [TrainerPoolTier.RARE]: [ Species.DRATINI, Species.LARVITAR ]
-        };
-      }
-      case "magma": {
-        return {
-          [TrainerPoolTier.COMMON]: [ Species.GROWLITHE, Species.SLUGMA, Species.SOLROCK, Species.HIPPOPOTAS, Species.BALTOY, Species.ROLYCOLY, Species.GLIGAR, Species.TORKOAL, Species.HOUNDOUR, Species.MAGBY ],
-          [TrainerPoolTier.UNCOMMON]: [ Species.TRAPINCH, Species.SILICOBRA, Species.RHYHORN, Species.ANORITH, Species.LILEEP, Species.HISUI_GROWLITHE, Species.TURTONATOR, Species.ARON, Species.TOEDSCOOL ],
-          [TrainerPoolTier.RARE]: [ Species.CAPSAKID, Species.CHARCADET ]
-        };
-      }
-      case "aqua": {
-        return {
-          [TrainerPoolTier.COMMON]: [ Species.CORPHISH, Species.SPHEAL, Species.CLAMPERL, Species.CHINCHOU, Species.WOOPER, Species.WINGULL, Species.TENTACOOL, Species.AZURILL, Species.LOTAD, Species.WAILMER, Species.REMORAID, Species.BARBOACH ],
-          [TrainerPoolTier.UNCOMMON]: [ Species.MANTYKE, Species.HISUI_QWILFISH, Species.ARROKUDA, Species.DHELMISE, Species.CLOBBOPUS, Species.FEEBAS, Species.PALDEA_WOOPER, Species.HORSEA, Species.SKRELP ],
-          [TrainerPoolTier.RARE]: [ Species.DONDOZO, Species.BASCULEGION ]
-        };
-      }
-      case "galactic": {
-        return {
-          [TrainerPoolTier.COMMON]: [ Species.BRONZOR, Species.SWINUB, Species.YANMA, Species.LICKITUNG, Species.TANGELA, Species.MAGBY, Species.ELEKID, Species.SKORUPI, Species.ZUBAT, Species.MURKROW, Species.MAGIKARP, Species.VOLTORB ],
-          [TrainerPoolTier.UNCOMMON]: [ Species.HISUI_GROWLITHE, Species.HISUI_QWILFISH, Species.SNEASEL, Species.DUSKULL, Species.ROTOM, Species.HISUI_VOLTORB, Species.GLIGAR, Species.ABRA ],
-          [TrainerPoolTier.RARE]: [ Species.URSALUNA, Species.HISUI_LILLIGANT, Species.SPIRITOMB, Species.HISUI_SNEASEL ]
-        };
-      }
-      case "plasma": {
-        return {
-          [TrainerPoolTier.COMMON]: [ Species.YAMASK, Species.ROGGENROLA, Species.JOLTIK, Species.TYMPOLE, Species.FRILLISH, Species.FERROSEED, Species.SANDILE, Species.TIMBURR, Species.DARUMAKA, Species.FOONGUS, Species.CUBCHOO, Species.VANILLITE ],
-          [TrainerPoolTier.UNCOMMON]: [ Species.PAWNIARD, Species.VULLABY, Species.ZORUA, Species.DRILBUR, Species.KLINK, Species.TYNAMO, Species.GALAR_DARUMAKA, Species.GOLETT, Species.MIENFOO, Species.DURANT, Species.SIGILYPH ],
-          [TrainerPoolTier.RARE]: [ Species.HISUI_ZORUA, Species.AXEW, Species.DEINO, Species.HISUI_BRAVIARY ]
-        };
-      }
-      case "plasma_2": {
-        return {
-          [TrainerPoolTier.COMMON]: [ Species.MAGNEMITE, Species.GRIMER, Species.VOLTORB, Species.PORYGON, Species.BRONZOR, Species.MUNNA, Species.SOLOSIS, Species.JOLTIK, Species.FERROSEED, Species.TYNAMO, Species.ELGYEM ],
-          [TrainerPoolTier.UNCOMMON]: [ Species.BELDUM, Species.ROTOM, Species.TIRTOUGA, Species.ARCHEN, Species.GOLETT, Species.DURANT, Species.GRUBBIN, Species.BLIPBUG, Species.VAROOM, Species.ALOLA_GRIMER, Species.HISUI_VOLTORB ],
-          [TrainerPoolTier.RARE]: [ Species.ELEKID, Species.MAGBY, Species.PAWNIARD, Species.DURALUDON ]
-        };
-      }
-      case "flare": {
-        return {
-          [TrainerPoolTier.COMMON]: [ Species.FLETCHLING, Species.LITLEO, Species.INKAY, Species.FOONGUS, Species.HELIOPTILE, Species.ELECTRIKE, Species.SKORUPI, Species.PURRLOIN, Species.CLAWITZER, Species.PANCHAM, Species.ESPURR, Species.BUNNELBY ],
-          [TrainerPoolTier.UNCOMMON]: [ Species.LITWICK, Species.SNEASEL, Species.PUMPKABOO, Species.PHANTUMP, Species.HONEDGE, Species.BINACLE, Species.HOUNDOUR, Species.SKRELP, Species.SLIGGOO ],
-          [TrainerPoolTier.RARE]: [ Species.NOIBAT, Species.HISUI_AVALUGG, Species.HISUI_SLIGGOO ]
-        };
-      }
-      case "aether": {
-        return {
-          [TrainerPoolTier.COMMON]: [ Species.BRUXISH, Species.SLOWPOKE, Species.BALTOY, Species.EXEGGCUTE, Species.ABRA, Species.ALOLA_RAICHU, Species.ELGYEM, Species.NATU, Species.BLIPBUG, Species.GIRAFARIG, Species.ORANGURU ],
-          [TrainerPoolTier.UNCOMMON]: [ Species.GALAR_SLOWPOKE, Species.MEDITITE, Species.BELDUM, Species.HATENNA, Species.INKAY, Species.RALTS, Species.GALAR_MR_MIME ],
-          [TrainerPoolTier.RARE]: [ Species.ARMAROUGE, Species.HISUI_BRAVIARY, Species.PORYGON ]
-        };
-      }
-      case "skull": {
-        return {
-          [TrainerPoolTier.COMMON]: [ Species.MAREANIE, Species.ALOLA_GRIMER, Species.GASTLY, Species.ZUBAT, Species.FOMANTIS, Species.VENIPEDE, Species.BUDEW, Species.KOFFING, Species.STUNKY, Species.CROAGUNK, Species.NIDORAN_F ],
-          [TrainerPoolTier.UNCOMMON]: [ Species.GALAR_SLOWPOKE, Species.SKORUPI, Species.PALDEA_WOOPER, Species.VULLABY, Species.HISUI_QWILFISH, Species.GLIMMET ],
-          [TrainerPoolTier.RARE]: [ Species.SKRELP, Species.HISUI_SNEASEL ]
-        };
-      }
-      case "macro": {
-        return {
-          [TrainerPoolTier.COMMON]: [ Species.HATENNA, Species.FEEBAS, Species.BOUNSWEET, Species.SALANDIT, Species.GALAR_PONYTA, Species.GOTHITA, Species.FROSLASS, Species.VULPIX, Species.FRILLISH, Species.ODDISH, Species.SINISTEA ],
-          [TrainerPoolTier.UNCOMMON]: [ Species.VULLABY, Species.MAREANIE, Species.ALOLA_VULPIX, Species.TOGEPI, Species.GALAR_CORSOLA, Species.APPLIN ],
-          [TrainerPoolTier.RARE]: [ Species.TINKATINK, Species.HISUI_LILLIGANT ]
-        };
-      }
-      case "star_1": {
-        return {
-          [TrainerPoolTier.COMMON]: [ Species.MURKROW, Species.SEEDOT, Species.CACNEA, Species.STUNKY, Species.SANDILE, Species.NYMBLE, Species.MASCHIFF, Species.GALAR_ZIGZAGOON ],
-          [TrainerPoolTier.UNCOMMON]: [ Species.UMBREON, Species.SNEASEL, Species.CORPHISH, Species.ZORUA, Species.INKAY, Species.BOMBIRDIER ],
-          [TrainerPoolTier.RARE]: [ Species.DEINO, Species.SPRIGATITO ]
-        };
-      }
-      case "star_2": {
-        return {
-          [TrainerPoolTier.COMMON]: [ Species.GROWLITHE, Species.HOUNDOUR, Species.NUMEL, Species.LITWICK, Species.FLETCHLING, Species.LITLEO, Species.ROLYCOLY, Species.CAPSAKID ],
-          [TrainerPoolTier.UNCOMMON]: [ Species.PONYTA, Species.FLAREON, Species.MAGBY, Species.TORKOAL, Species.SALANDIT, Species.TURTONATOR ],
-          [TrainerPoolTier.RARE]: [ Species.LARVESTA, Species.FUECOCO ]
-        };
-      }
-      case "star_3": {
-        return {
-          [TrainerPoolTier.COMMON]: [ Species.ZUBAT, Species.GRIMER, Species.STUNKY, Species.FOONGUS, Species.MAREANIE, Species.TOXEL, Species.SHROODLE, Species.PALDEA_WOOPER ],
-          [TrainerPoolTier.UNCOMMON]: [ Species.GASTLY, Species.SEVIPER, Species.SKRELP, Species.ALOLA_GRIMER, Species.GALAR_SLOWPOKE, Species.HISUI_QWILFISH ],
-          [TrainerPoolTier.RARE]: [ Species.GLIMMET, Species.BULBASAUR ]
-        };
-      }
-      case "star_4": {
-        return {
-          [TrainerPoolTier.COMMON]: [ Species.CLEFFA, Species.IGGLYBUFF, Species.AZURILL, Species.COTTONEE, Species.FLABEBE, Species.HATENNA, Species.IMPIDIMP, Species.TINKATINK ],
-          [TrainerPoolTier.UNCOMMON]: [ Species.TOGEPI, Species.GARDEVOIR, Species.SYLVEON, Species.KLEFKI, Species.MIMIKYU, Species.ALOLA_VULPIX ],
-          [TrainerPoolTier.RARE]: [ Species.GALAR_PONYTA, Species.POPPLIO ]
-        };
-      }
-      case "star_5": {
-        return {
-          [TrainerPoolTier.COMMON]: [ Species.SHROOMISH, Species.MAKUHITA, Species.MEDITITE, Species.CROAGUNK, Species.SCRAGGY, Species.MIENFOO, Species.PAWMI, Species.PALDEA_TAUROS ],
-          [TrainerPoolTier.UNCOMMON]: [ Species.RIOLU, Species.TIMBURR, Species.HAWLUCHA, Species.PASSIMIAN, Species.FALINKS, Species.FLAMIGO ],
-          [TrainerPoolTier.RARE]: [ Species.JANGMO_O, Species.QUAXLY ]
-        };
-      }
-    }
-
-    console.warn(`Evil team admin for ${team} not found. Returning empty species pools.`);
-    return [];
-  }
-
-  /**
-     * Initializes the trainer configuration for an evil team admin.
-     * @param title The title of the evil team admin.
-     * @param poolName The evil team the admin belongs to.
-     * @param {Species | Species[]} signatureSpecies The signature species for the evil team leader.
-     * @returns {TrainerConfig} The updated TrainerConfig instance.
-     * **/
-  initForEvilTeamAdmin(title: string, poolName: string, signatureSpecies: (Species | Species[])[],): TrainerConfig {
-    if (!getIsInitialized()) {
-      initI18n();
-    }
-    this.setPartyTemplates(trainerPartyTemplates.RIVAL_5);
-
-    // Set the species pools for the evil team admin.
-    this.speciesPools = this.speciesPoolPerEvilTeamAdmin(poolName);
-
-    signatureSpecies.forEach((speciesPool, s) => {
-      if (!Array.isArray(speciesPool)) {
-        speciesPool = [ speciesPool ];
-      }
-      this.setPartyMemberFunc(-(s + 1), getRandomPartyMemberFunc(speciesPool));
-    });
-
-    const nameForCall = this.name.toLowerCase().replace(/\s/g, "_");
-    this.name = i18next.t(`trainerNames:${nameForCall}`);
-    this.setHasVoucher(false);
-    this.setTitle(title);
-    this.setMoneyMultiplier(1.5);
-    this.setBoss();
-    this.setStaticParty();
-    this.setBattleBgm("battle_plasma_boss");
-    this.setVictoryBgm("victory_team_plasma");
-
-    return this;
-  }
-
-  /**
-   * Initializes the trainer configuration for a Stat Trainer, as part of the Trainer's Test Mystery Encounter.
-   * @param {Species | Species[]} signatureSpecies The signature species for the Elite Four member.
-   * @param {Type[]} specialtyTypes The specialty types for the Stat Trainer.
-   * @param isMale Whether the Elite Four Member is Male or Female (for localization of the title).
-   * @returns {TrainerConfig} The updated TrainerConfig instance.
-   **/
-  initForStatTrainer(signatureSpecies: (Species | Species[])[], isMale: boolean, ...specialtyTypes: Type[]): TrainerConfig {
-    if (!getIsInitialized()) {
-      initI18n();
-    }
-
-    this.setPartyTemplates(trainerPartyTemplates.ELITE_FOUR);
-
-    signatureSpecies.forEach((speciesPool, s) => {
-      if (!Array.isArray(speciesPool)) {
-        speciesPool = [ speciesPool ];
-      }
-      this.setPartyMemberFunc(-(s + 1), getRandomPartyMemberFunc(speciesPool));
-    });
-    if (specialtyTypes.length) {
-      this.setSpeciesFilter(p => specialtyTypes.find(t => p.isOfType(t)) !== undefined);
-      this.setSpecialtyTypes(...specialtyTypes);
-    }
-    const nameForCall = this.name.toLowerCase().replace(/\s/g, "_");
-    this.name = i18next.t(`trainerNames:${nameForCall}`);
-    this.setMoneyMultiplier(2);
-    this.setBoss();
-    this.setStaticParty();
-
-    // TODO: replace with more suitable music?
-    this.setBattleBgm("battle_trainer");
-    this.setVictoryBgm("victory_trainer");
-
-    return this;
-  }
-
-  /**
-     * Initializes the trainer configuration for an evil team leader. Temporarily hardcoding evil leader teams though.
-     * @param {Species | Species[]} signatureSpecies The signature species for the evil team leader.
-     * @param {Type[]} specialtyTypes The specialty types for the evil team Leader.
-     * @param boolean Whether or not this is the rematch fight
-     * @returns {TrainerConfig} The updated TrainerConfig instance.
-     * **/
-  initForEvilTeamLeader(title: string, signatureSpecies: (Species | Species[])[], rematch: boolean = false, ...specialtyTypes: Type[]): TrainerConfig {
-    if (!getIsInitialized()) {
-      initI18n();
-    }
-    if (rematch) {
-      this.setPartyTemplates(trainerPartyTemplates.ELITE_FOUR);
-    } else {
-      this.setPartyTemplates(trainerPartyTemplates.RIVAL_5);
-    }
-    signatureSpecies.forEach((speciesPool, s) => {
-      if (!Array.isArray(speciesPool)) {
-        speciesPool = [ speciesPool ];
-      }
-      this.setPartyMemberFunc(-(s + 1), getRandomPartyMemberFunc(speciesPool));
-    });
-    if (specialtyTypes.length) {
-      this.setSpeciesFilter(p => specialtyTypes.find(t => p.isOfType(t)) !== undefined);
-      this.setSpecialtyTypes(...specialtyTypes);
-    }
-    const nameForCall = this.name.toLowerCase().replace(/\s/g, "_");
-    this.name = i18next.t(`trainerNames:${nameForCall}`);
-    this.setTitle(title);
-    this.setMoneyMultiplier(2.5);
-    this.setBoss();
-    this.setStaticParty();
-    this.setHasVoucher(true);
-    this.setBattleBgm("battle_plasma_boss");
-    this.setVictoryBgm("victory_team_plasma");
-
-    return this;
-  }
-
-  /**
-     * Initializes the trainer configuration for a Gym Leader.
-     * @param {Species | Species[]} signatureSpecies The signature species for the Gym Leader.
-     * @param {Type[]} specialtyTypes The specialty types for the Gym Leader.
-     * @param isMale Whether the Gym Leader is Male or Not (for localization of the title).
-     * @returns {TrainerConfig} The updated TrainerConfig instance.
-     * **/
-  initForGymLeader(signatureSpecies: (Species | Species[])[], isMale: boolean, ...specialtyTypes: Type[]): TrainerConfig {
-    // Check if the internationalization (i18n) system is initialized.
-    if (!getIsInitialized()) {
-      initI18n();
-    }
-
-    // Set the function to generate the Gym Leader's party template.
-    this.setPartyTemplateFunc(getGymLeaderPartyTemplate);
-
-    // Set up party members with their corresponding species.
-    signatureSpecies.forEach((speciesPool, s) => {
-      // Ensure speciesPool is an array.
-      if (!Array.isArray(speciesPool)) {
-        speciesPool = [ speciesPool ];
-      }
-      // Set a function to get a random party member from the species pool.
-      this.setPartyMemberFunc(-(s + 1), getRandomPartyMemberFunc(speciesPool));
-    });
-
-    // If specialty types are provided, set species filter and specialty types.
-    if (specialtyTypes.length) {
-      this.setSpeciesFilter(p => specialtyTypes.find(t => p.isOfType(t)) !== undefined);
-      this.setSpecialtyTypes(...specialtyTypes);
-    }
-
-    // Localize the trainer's name by converting it to lowercase and replacing spaces with underscores.
-    const nameForCall = this.name.toLowerCase().replace(/\s/g, "_");
-    this.name = i18next.t(`trainerNames:${nameForCall}`);
-
-    // Set the title to "gym_leader". (this is the key in the i18n file)
-    this.setTitle("gym_leader");
-    if (!isMale) {
-      this.setTitle("gym_leader_female");
-    }
-
-    // Configure various properties for the Gym Leader.
-    this.setMoneyMultiplier(2.5);
-    this.setBoss();
-    this.setStaticParty();
-    this.setHasVoucher(true);
-    this.setBattleBgm("battle_unova_gym");
-    this.setVictoryBgm("victory_gym");
-    this.setGenModifiersFunc(party => {
-      const waveIndex = globalScene.currentBattle.waveIndex;
-      return getRandomTeraModifiers(party, waveIndex >= 100 ? 1 : 0, specialtyTypes.length ? specialtyTypes : undefined);
-    });
-
-    return this;
-  }
-
-  /**
-     * Initializes the trainer configuration for an Elite Four member.
-     * @param {Species | Species[]} signatureSpecies The signature species for the Elite Four member.
-     * @param {Type[]} specialtyTypes The specialty types for the Elite Four member.
-     * @param isMale Whether the Elite Four Member is Male or Female (for localization of the title).
-     * @returns {TrainerConfig} The updated TrainerConfig instance.
-     **/
-  initForEliteFour(signatureSpecies: (Species | Species[])[], isMale: boolean, ...specialtyTypes: Type[]): TrainerConfig {
-    // Check if the internationalization (i18n) system is initialized.
-    if (!getIsInitialized()) {
-      initI18n();
-    }
-
-    // Set the party templates for the Elite Four.
-    this.setPartyTemplates(trainerPartyTemplates.ELITE_FOUR);
-
-    // Set up party members with their corresponding species.
-    signatureSpecies.forEach((speciesPool, s) => {
-      // Ensure speciesPool is an array.
-      if (!Array.isArray(speciesPool)) {
-        speciesPool = [ speciesPool ];
-      }
-      // Set a function to get a random party member from the species pool.
-      this.setPartyMemberFunc(-(s + 1), getRandomPartyMemberFunc(speciesPool));
-    });
-
-    // Set species filter and specialty types if provided, otherwise filter by base total.
-    if (specialtyTypes.length) {
-      this.setSpeciesFilter(p => specialtyTypes.some(t => p.isOfType(t)) && p.baseTotal >= ELITE_FOUR_MINIMUM_BST);
-      this.setSpecialtyTypes(...specialtyTypes);
-    } else {
-      this.setSpeciesFilter(p => p.baseTotal >= ELITE_FOUR_MINIMUM_BST);
-    }
-
-    // Localize the trainer's name by converting it to lowercase and replacing spaces with underscores.
-    const nameForCall = this.name.toLowerCase().replace(/\s/g, "_");
-    this.name = i18next.t(`trainerNames:${nameForCall}`);
-
-    // Set the title to "elite_four". (this is the key in the i18n file)
-    this.setTitle("elite_four");
-    if (!isMale) {
-      this.setTitle("elite_four_female");
-    }
-
-    // Configure various properties for the Elite Four member.
-    this.setMoneyMultiplier(3.25);
-    this.setBoss();
-    this.setStaticParty();
-    this.setHasVoucher(true);
-    this.setBattleBgm("battle_unova_elite");
-    this.setVictoryBgm("victory_gym");
-    this.setGenModifiersFunc(party => getRandomTeraModifiers(party, 1, specialtyTypes.length ? specialtyTypes : undefined));
-
-    return this;
-  }
-
-  /**
-     * Initializes the trainer configuration for a Champion.
-     * @param {Species | Species[]} signatureSpecies The signature species for the Champion.
-     * @param isMale Whether the Champion is Male or Female (for localization of the title).
-     * @returns {TrainerConfig} The updated TrainerConfig instance.
-     **/
-  initForChampion(isMale: boolean): TrainerConfig {
-    // Check if the internationalization (i18n) system is initialized.
-    if (!getIsInitialized()) {
-      initI18n();
-    }
-
-    // Set the party templates for the Champion.
-    this.setPartyTemplates(trainerPartyTemplates.CHAMPION);
-
-    // Localize the trainer's name by converting it to lowercase and replacing spaces with underscores.
-    const nameForCall = this.name.toLowerCase().replace(/\s/g, "_");
-    this.name = i18next.t(`trainerNames:${nameForCall}`);
-
-    // Set the title to "champion". (this is the key in the i18n file)
-    this.setTitle("champion");
-    if (!isMale) {
-      this.setTitle("champion_female");
-    }
-
-
-    // Configure various properties for the Champion.
-    this.setMoneyMultiplier(10);
-    this.setBoss();
-    this.setStaticParty();
-    this.setHasVoucher(true);
-    this.setBattleBgm("battle_champion_alder");
-    this.setVictoryBgm("victory_champion");
-
-    return this;
-  }
-
-  /**
-   * Sets a localized name for the trainer. This should only be used for trainers that dont use a "initFor" function and are considered "named" trainers
-   * @param name - The name of the trainer.
-   * @returns {TrainerConfig} The updated TrainerConfig instance.
-   */
-  setLocalizedName(name: string): TrainerConfig {
-    // Check if the internationalization (i18n) system is initialized.
-    if (!getIsInitialized()) {
-      initI18n();
-    }
-    this.name = i18next.t(`trainerNames:${name.toLowerCase().replace(/\s/g, "_")}`);
-    return this;
-  }
-
-  /**
-     * Retrieves the title for the trainer based on the provided trainer slot and variant.
-     * @param {TrainerSlot} trainerSlot - The slot to determine which title to use. Defaults to TrainerSlot.NONE.
-     * @param {TrainerVariant} variant - The variant of the trainer to determine the specific title.
-     * @returns {string} - The title of the trainer.
-     **/
-  getTitle(trainerSlot: TrainerSlot = TrainerSlot.NONE, variant: TrainerVariant): string {
-    const ret = this.name;
-
-    // Check if the variant is double and the name for double exists
-    if (!trainerSlot && variant === TrainerVariant.DOUBLE && this.nameDouble) {
-      return this.nameDouble;
-    }
-
-    // Female variant
-    if (this.hasGenders) {
-      // If the name is already set
-      if (this.nameFemale) {
-        // Check if the variant is either female or this is for the partner in a double battle
-        if (variant === TrainerVariant.FEMALE || (variant === TrainerVariant.DOUBLE && trainerSlot === TrainerSlot.TRAINER_PARTNER)) {
-          return this.nameFemale;
-        }
-      } else
-      // Check if !variant is true, if so return the name, else return the name with _female appended
-        if (variant) {
-          if (!getIsInitialized()) {
-            initI18n();
-          }
-          // Check if the female version exists in the i18n file
-          if (i18next.exists(`trainerClasses:${this.name.toLowerCase()}`)) {
-            // If it does, return
-            return ret + "_female";
-          } else {
-            // If it doesn't, we do not do anything and go to the normal return
-            // This is to prevent the game from displaying an error if a female version of the trainer does not exist in the localization
-          }
-        }
-    }
-
-    return ret;
-  }
-
-  loadAssets(variant: TrainerVariant): Promise<void> {
-    return new Promise(resolve => {
-      const isDouble = variant === TrainerVariant.DOUBLE;
-      const trainerKey = this.getSpriteKey(variant === TrainerVariant.FEMALE, false);
-      const partnerTrainerKey = this.getSpriteKey(true, true);
-      globalScene.loadAtlas(trainerKey, "trainer");
-      if (isDouble) {
-        globalScene.loadAtlas(partnerTrainerKey, "trainer");
-      }
-      globalScene.load.once(Phaser.Loader.Events.COMPLETE, () => {
-        const originalWarn = console.warn;
-        // Ignore warnings for missing frames, because there will be a lot
-        console.warn = () => {
-        };
-        const frameNames = globalScene.anims.generateFrameNames(trainerKey, {
-          zeroPad: 4,
-          suffix: ".png",
-          start: 1,
-          end: 128
-        });
-        const partnerFrameNames = isDouble
-          ? globalScene.anims.generateFrameNames(partnerTrainerKey, {
-            zeroPad: 4,
-            suffix: ".png",
-            start: 1,
-            end: 128
-          })
-          : "";
-        console.warn = originalWarn;
-        if (!(globalScene.anims.exists(trainerKey))) {
-          globalScene.anims.create({
-            key: trainerKey,
-            frames: frameNames,
-            frameRate: 24,
-            repeat: -1
-          });
-        }
-        if (isDouble && !(globalScene.anims.exists(partnerTrainerKey))) {
-          globalScene.anims.create({
-            key: partnerTrainerKey,
-            frames: partnerFrameNames,
-            frameRate: 24,
-            repeat: -1
-          });
-        }
-        resolve();
-      });
-      if (!globalScene.load.isLoading()) {
-        globalScene.load.start();
-      }
-    });
-  }
-
-  /**
-   * Creates a shallow copy of a trainer config so that it can be modified without affecting the {@link trainerConfigs} source map
-   */
-  clone(): TrainerConfig {
-    let clone = new TrainerConfig(this.trainerType);
-    clone = this.trainerTypeDouble ? clone.setDoubleTrainerType(this.trainerTypeDouble) : clone;
-    clone = this.name ? clone.setName(this.name) : clone;
-    clone = this.hasGenders ? clone.setHasGenders(this.nameFemale, this.femaleEncounterBgm) : clone;
-    clone = this.hasDouble ? clone.setHasDouble(this.nameDouble, this.doubleEncounterBgm) : clone;
-    clone = this.title ? clone.setTitle(this.title) : clone;
-    clone = this.titleDouble ? clone.setDoubleTitle(this.titleDouble) : clone;
-    clone = this.hasCharSprite ? clone.setHasCharSprite() : clone;
-    clone = this.doubleOnly ? clone.setDoubleOnly() : clone;
-    clone = this.moneyMultiplier ? clone.setMoneyMultiplier(this.moneyMultiplier) : clone;
-    clone = this.isBoss ? clone.setBoss() : clone;
-    clone = this.hasStaticParty ? clone.setStaticParty() : clone;
-    clone = this.useSameSeedForAllMembers ? clone.setUseSameSeedForAllMembers() : clone;
-    clone = this.battleBgm ? clone.setBattleBgm(this.battleBgm) : clone;
-    clone = this.encounterBgm ? clone.setEncounterBgm(this.encounterBgm) : clone;
-    clone = this.victoryBgm ? clone.setVictoryBgm(this.victoryBgm) : clone;
-    clone = this.genModifiersFunc ? clone.setGenModifiersFunc(this.genModifiersFunc) : clone;
-
-    if (this.modifierRewardFuncs) {
-      // Clones array instead of passing ref
-      clone.modifierRewardFuncs = this.modifierRewardFuncs.slice(0);
-    }
-
-    if (this.partyTemplates) {
-      clone.partyTemplates = this.partyTemplates.slice(0);
-    }
-
-    clone = this.partyTemplateFunc ? clone.setPartyTemplateFunc(this.partyTemplateFunc) : clone;
-
-    if (this.partyMemberFuncs) {
-      Object.keys(this.partyMemberFuncs).forEach((index) => {
-        clone = clone.setPartyMemberFunc(parseInt(index, 10), this.partyMemberFuncs[index]);
-      });
-    }
-
-    clone = this.speciesPools ? clone.setSpeciesPools(this.speciesPools) : clone;
-    clone = this.speciesFilter ? clone.setSpeciesFilter(this.speciesFilter) : clone;
-    if (this.specialtyTypes) {
-      clone.specialtyTypes = this.specialtyTypes.slice(0);
-    }
-
-    clone.encounterMessages = this.encounterMessages?.slice(0);
-    clone.victoryMessages = this.victoryMessages?.slice(0);
-    clone.defeatMessages = this.defeatMessages?.slice(0);
-
-    clone.femaleEncounterMessages = this.femaleEncounterMessages?.slice(0);
-    clone.femaleVictoryMessages = this.femaleVictoryMessages?.slice(0);
-    clone.femaleDefeatMessages = this.femaleDefeatMessages?.slice(0);
-
-    clone.doubleEncounterMessages = this.doubleEncounterMessages?.slice(0);
-    clone.doubleVictoryMessages = this.doubleVictoryMessages?.slice(0);
-    clone.doubleDefeatMessages = this.doubleDefeatMessages?.slice(0);
-
-    return clone;
-  }
-}
-
-let t = 0;
-
-interface TrainerConfigs {
-    [key: number]: TrainerConfig
-}
-
-/**
- * The function to get variable strength grunts
- * @returns the correct TrainerPartyTemplate
- */
-function getEvilGruntPartyTemplate(): TrainerPartyTemplate {
-  const waveIndex = globalScene.currentBattle?.waveIndex;
-  if (waveIndex < 40) {
-    return trainerPartyTemplates.TWO_AVG;
-  } else if (waveIndex < 63) {
-    return trainerPartyTemplates.THREE_AVG;
-  } else if (waveIndex < 65) {
-    return trainerPartyTemplates.TWO_AVG_ONE_STRONG;
-  } else if (waveIndex < 112) {
-    return trainerPartyTemplates.GYM_LEADER_4; // 3avg 1 strong 1 stronger
-  } else {
-    return trainerPartyTemplates.GYM_LEADER_5; // 3 avg 2 strong 1 stronger
-  }
-}
-
-function getWavePartyTemplate(...templates: TrainerPartyTemplate[]) {
-  return templates[Math.min(Math.max(Math.ceil((globalScene.gameMode.getWaveForDifficulty(globalScene.currentBattle?.waveIndex || startingWave, true) - 20) / 30), 0), templates.length - 1)];
-}
-
-function getGymLeaderPartyTemplate() {
-  return getWavePartyTemplate(trainerPartyTemplates.GYM_LEADER_1, trainerPartyTemplates.GYM_LEADER_2, trainerPartyTemplates.GYM_LEADER_3, trainerPartyTemplates.GYM_LEADER_4, trainerPartyTemplates.GYM_LEADER_5);
-}
-
-/**
- * Randomly selects one of the `Species` from `speciesPool`, determines its evolution, level, and strength.
- * Then adds Pokemon to globalScene.
- * @param speciesPool
- * @param trainerSlot
- * @param ignoreEvolution
- * @param postProcess
- */
-export function getRandomPartyMemberFunc(speciesPool: Species[], trainerSlot: TrainerSlot = TrainerSlot.TRAINER, ignoreEvolution: boolean = false, postProcess?: (enemyPokemon: EnemyPokemon) => void) {
-  return (level: number, strength: PartyMemberStrength) => {
-    let species = Utils.randSeedItem(speciesPool);
-    if (globalScene.gameMode.isClassic && globalScene.currentBattle.waveIndex === 20) {
-      ignoreEvolution = true;
-    }
-    if (!ignoreEvolution) {
-      species = getPokemonSpecies(species).getTrainerSpeciesForLevel(level, true, strength, globalScene.currentBattle.waveIndex);
-    }
-    return globalScene.addEnemyPokemon(getPokemonSpecies(species), level, trainerSlot, undefined, false, undefined, postProcess);
-  };
-}
-
-function getSpeciesFilterRandomPartyMemberFunc(
-  originalSpeciesFilter: PokemonSpeciesFilter,
-  trainerSlot: TrainerSlot = TrainerSlot.TRAINER,
-  allowLegendaries?: boolean,
-  postProcess?: (EnemyPokemon: EnemyPokemon) => void
-): PartyMemberFunc {
-
-  const speciesFilter = (species: PokemonSpecies): boolean => {
-    const notLegendary = !species.legendary && !species.subLegendary && !species.mythical;
-    return (allowLegendaries || notLegendary) && !species.isTrainerForbidden() && originalSpeciesFilter(species);
-  };
-
-  return (level: number, strength: PartyMemberStrength) => {
-    const waveIndex = globalScene.currentBattle.waveIndex;
-    const species = getPokemonSpecies(globalScene.randomSpecies(waveIndex, level, false, speciesFilter)
-      .getTrainerSpeciesForLevel(level, true, strength, waveIndex));
-
-    return globalScene.addEnemyPokemon(species, level, trainerSlot, undefined, false, undefined, postProcess);
-  };
-}
-
-function getRandomTeraModifiers(party: EnemyPokemon[], count: number, types?: Type[]): PersistentModifier[] {
-  const ret: PersistentModifier[] = [];
-  const partyMemberIndexes = new Array(party.length).fill(null).map((_, i) => i);
-  for (let t = 0; t < Math.min(count, party.length); t++) {
-    const randomIndex = Utils.randSeedItem(partyMemberIndexes);
-    partyMemberIndexes.splice(partyMemberIndexes.indexOf(randomIndex), 1);
-    ret.push(modifierTypes.TERA_SHARD().generateType([], [ Utils.randSeedItem(types ? types : party[randomIndex].getTypes()) ])!.withIdFromFunc(modifierTypes.TERA_SHARD).newModifier(party[randomIndex]) as PersistentModifier); // TODO: is the bang correct?
-  }
-  return ret;
-}
-
-type SignatureSpecies = {
-    [key in string]: (Species | Species[])[];
-};
-
-/*
- * The signature species for each Gym Leader, Elite Four member, and Champion.
- * The key is the trainer type, and the value is an array of Species or Species arrays.
- * This is in a separate const so it can be accessed from other places and not just the trainerConfigs
- */
-export const signatureSpecies: SignatureSpecies = {
-  BROCK: [ Species.GEODUDE, Species.ONIX ],
-  MISTY: [ Species.STARYU, Species.PSYDUCK ],
-  LT_SURGE: [ Species.VOLTORB, Species.PIKACHU, Species.ELECTABUZZ ],
-  ERIKA: [ Species.ODDISH, Species.BELLSPROUT, Species.TANGELA, Species.HOPPIP ],
-  JANINE: [ Species.VENONAT, Species.SPINARAK, Species.ZUBAT ],
-  SABRINA: [ Species.ABRA, Species.MR_MIME, Species.ESPEON ],
-  BLAINE: [ Species.GROWLITHE, Species.PONYTA, Species.MAGMAR ],
-  GIOVANNI: [ Species.SANDILE, Species.MURKROW, Species.NIDORAN_M, Species.NIDORAN_F ],
-  FALKNER: [ Species.PIDGEY, Species.HOOTHOOT, Species.DODUO ],
-  BUGSY: [ Species.SCYTHER, Species.HERACROSS, Species.SHUCKLE, Species.PINSIR ],
-  WHITNEY: [ Species.JIGGLYPUFF, Species.MILTANK, Species.AIPOM, Species.GIRAFARIG ],
-  MORTY: [ Species.GASTLY, Species.MISDREAVUS, Species.SABLEYE ],
-  CHUCK: [ Species.POLIWRATH, Species.MANKEY ],
-  JASMINE: [ Species.MAGNEMITE, Species.STEELIX ],
-  PRYCE: [ Species.SEEL, Species.SWINUB ],
-  CLAIR: [ Species.DRATINI, Species.HORSEA, Species.GYARADOS ],
-  ROXANNE: [ Species.GEODUDE, Species.NOSEPASS ],
-  BRAWLY: [ Species.MACHOP, Species.MAKUHITA ],
-  WATTSON: [ Species.MAGNEMITE, Species.VOLTORB, Species.ELECTRIKE ],
-  FLANNERY: [ Species.SLUGMA, Species.TORKOAL, Species.NUMEL ],
-  NORMAN: [ Species.SLAKOTH, Species.SPINDA, Species.ZIGZAGOON, Species.KECLEON ],
-  WINONA: [ Species.SWABLU, Species.WINGULL, Species.TROPIUS, Species.SKARMORY ],
-  TATE: [ Species.SOLROCK, Species.NATU, Species.CHIMECHO, Species.GALLADE ],
-  LIZA: [ Species.LUNATONE, Species.SPOINK, Species.BALTOY, Species.GARDEVOIR ],
-  JUAN: [ Species.HORSEA, Species.BARBOACH, Species.SPHEAL, Species.RELICANTH ],
-  ROARK: [ Species.CRANIDOS, Species.LARVITAR, Species.GEODUDE ],
-  GARDENIA: [ Species.ROSELIA, Species.TANGELA, Species.TURTWIG ],
-  MAYLENE: [ Species.LUCARIO, Species.MEDITITE, Species.CHIMCHAR ],
-  CRASHER_WAKE: [ Species.BUIZEL, Species.WOOPER, Species.PIPLUP, Species.MAGIKARP ],
-  FANTINA: [ Species.MISDREAVUS, Species.DRIFLOON, Species.SPIRITOMB ],
-  BYRON: [ Species.SHIELDON, Species.BRONZOR, Species.AGGRON ],
-  CANDICE: [ Species.SNEASEL, Species.SNOVER, Species.SNORUNT ],
-  VOLKNER: [ Species.SHINX, Species.CHINCHOU, Species.ROTOM ],
-  CILAN: [ Species.PANSAGE, Species.FOONGUS, Species.PETILIL ],
-  CHILI: [ Species.PANSEAR, Species.DARUMAKA, Species.NUMEL ],
-  CRESS: [ Species.PANPOUR, Species.TYMPOLE, Species.SLOWPOKE ],
-  CHEREN: [ Species.LILLIPUP, Species.MINCCINO, Species.PIDOVE ],
-  LENORA: [ Species.PATRAT, Species.DEERLING, Species.AUDINO ],
-  ROXIE: [ Species.VENIPEDE, Species.TRUBBISH, Species.SKORUPI ],
-  BURGH: [ Species.SEWADDLE, Species.SHELMET, Species.KARRABLAST ],
-  ELESA: [ Species.EMOLGA, Species.BLITZLE, Species.JOLTIK ],
-  CLAY: [ Species.DRILBUR, Species.SANDILE, Species.GOLETT ],
-  SKYLA: [ Species.DUCKLETT, Species.WOOBAT, Species.RUFFLET ],
-  BRYCEN: [ Species.CRYOGONAL, Species.VANILLITE, Species.CUBCHOO ],
-  DRAYDEN: [ Species.DRUDDIGON, Species.AXEW, Species.DEINO ],
-  MARLON: [ Species.WAILMER, Species.FRILLISH, Species.TIRTOUGA ],
-  VIOLA: [ Species.SURSKIT, Species.SCATTERBUG ],
-  GRANT: [ Species.AMAURA, Species.TYRUNT ],
-  KORRINA: [ Species.HAWLUCHA, Species.LUCARIO, Species.MIENFOO ],
-  RAMOS: [ Species.SKIDDO, Species.HOPPIP, Species.BELLSPROUT ],
-  CLEMONT: [ Species.HELIOPTILE, Species.MAGNEMITE, Species.EMOLGA ],
-  VALERIE: [ Species.SYLVEON, Species.MAWILE, Species.MR_MIME ],
-  OLYMPIA: [ Species.ESPURR, Species.SIGILYPH, Species.SLOWKING ],
-  WULFRIC: [ Species.BERGMITE, Species.SNOVER, Species.CRYOGONAL ],
-  MILO: [ Species.GOSSIFLEUR, Species.APPLIN, Species.BOUNSWEET ],
-  NESSA: [ Species.CHEWTLE, Species.ARROKUDA, Species.WIMPOD ],
-  KABU: [ Species.SIZZLIPEDE, Species.VULPIX, Species.TORKOAL ],
-  BEA: [ Species.GALAR_FARFETCHD, Species.MACHOP, Species.CLOBBOPUS ],
-  ALLISTER: [ Species.GALAR_YAMASK, Species.GALAR_CORSOLA, Species.GASTLY ],
-  OPAL: [ Species.MILCERY, Species.TOGETIC, Species.GALAR_WEEZING ],
-  BEDE: [ Species.HATENNA, Species.GALAR_PONYTA, Species.GARDEVOIR ],
-  GORDIE: [ Species.ROLYCOLY, Species.STONJOURNER, Species.BINACLE ],
-  MELONY: [ Species.SNOM, Species.GALAR_DARUMAKA, Species.GALAR_MR_MIME ],
-  PIERS: [ Species.GALAR_ZIGZAGOON, Species.SCRAGGY, Species.INKAY ],
-  MARNIE: [ Species.IMPIDIMP, Species.PURRLOIN, Species.MORPEKO ],
-  RAIHAN: [ Species.DURALUDON, Species.TURTONATOR, Species.GOOMY ],
-  KATY: [ Species.NYMBLE, Species.TAROUNTULA, Species.HERACROSS ],
-  BRASSIUS: [ Species.SMOLIV, Species.SHROOMISH, Species.ODDISH ],
-  IONO: [ Species.TADBULB, Species.WATTREL, Species.VOLTORB ],
-  KOFU: [ Species.VELUZA, Species.WIGLETT, Species.WINGULL ],
-  LARRY: [ Species.STARLY, Species.DUNSPARCE, Species.LECHONK, Species.KOMALA ],
-  RYME: [ Species.GREAVARD, Species.SHUPPET, Species.MIMIKYU ],
-  TULIP: [ Species.GIRAFARIG, Species.FLITTLE, Species.RALTS ],
-  GRUSHA: [ Species.CETODDLE, Species.ALOLA_VULPIX, Species.CUBCHOO ],
-  LORELEI: [ Species.JYNX, [ Species.SLOWBRO, Species.GALAR_SLOWBRO ], Species.LAPRAS, [ Species.ALOLA_SANDSLASH, Species.CLOYSTER ]],
-  BRUNO: [ Species.MACHAMP, Species.HITMONCHAN, Species.HITMONLEE, [ Species.ALOLA_GOLEM, Species.GOLEM ]],
-  AGATHA: [ Species.GENGAR, [ Species.ARBOK, Species.WEEZING ], Species.CROBAT, Species.ALOLA_MAROWAK ],
-  LANCE: [ Species.DRAGONITE, Species.GYARADOS, Species.AERODACTYL, Species.ALOLA_EXEGGUTOR ],
-  WILL: [ Species.XATU, Species.JYNX, [ Species.SLOWBRO, Species.SLOWKING ], Species.EXEGGUTOR ],
-  KOGA: [[ Species.WEEZING, Species.MUK ], [ Species.VENOMOTH, Species.ARIADOS ], Species.CROBAT, Species.TENTACRUEL ],
-  KAREN: [ Species.UMBREON, Species.HONCHKROW, Species.HOUNDOOM, Species.WEAVILE ],
-  SIDNEY: [[ Species.SHIFTRY, Species.CACTURNE ], [ Species.SHARPEDO, Species.CRAWDAUNT ], Species.ABSOL, Species.MIGHTYENA ],
-  PHOEBE: [ Species.SABLEYE, Species.DUSKNOIR, Species.BANETTE, [ Species.MISMAGIUS, Species.DRIFBLIM ]],
-  GLACIA: [ Species.GLALIE, Species.WALREIN, Species.FROSLASS, Species.ABOMASNOW ],
-  DRAKE: [ Species.ALTARIA, Species.SALAMENCE, Species.FLYGON, Species.KINGDRA ],
-  AARON: [[ Species.SCIZOR, Species.KLEAVOR ], Species.HERACROSS, [ Species.VESPIQUEN, Species.YANMEGA ], Species.DRAPION ],
-  BERTHA: [ Species.WHISCASH, Species.HIPPOWDON, Species.GLISCOR, Species.RHYPERIOR ],
-  FLINT: [[ Species.FLAREON, Species.RAPIDASH ], Species.MAGMORTAR, [ Species.STEELIX, Species.LOPUNNY ], Species.INFERNAPE ],
-  LUCIAN: [ Species.MR_MIME, Species.GALLADE, Species.BRONZONG, [ Species.ALAKAZAM, Species.ESPEON ]],
-  SHAUNTAL: [ Species.COFAGRIGUS, Species.CHANDELURE, Species.GOLURK, Species.JELLICENT ],
-  MARSHAL: [ Species.CONKELDURR, Species.MIENSHAO, Species.THROH, Species.SAWK ],
-  GRIMSLEY: [ Species.LIEPARD, Species.KINGAMBIT, Species.SCRAFTY, Species.KROOKODILE ],
-  CAITLIN: [ Species.MUSHARNA, Species.GOTHITELLE, Species.SIGILYPH, Species.REUNICLUS ],
-  MALVA: [ Species.PYROAR, Species.TORKOAL, Species.CHANDELURE, Species.TALONFLAME ],
-  SIEBOLD: [ Species.CLAWITZER, Species.GYARADOS, Species.BARBARACLE, Species.STARMIE ],
-  WIKSTROM: [ Species.KLEFKI, Species.PROBOPASS, Species.SCIZOR, Species.AEGISLASH ],
-  DRASNA: [ Species.DRAGALGE, Species.DRUDDIGON, Species.ALTARIA, Species.NOIVERN ],
-  HALA: [ Species.HARIYAMA, Species.BEWEAR, Species.CRABOMINABLE, [ Species.POLIWRATH, Species.ANNIHILAPE ]],
-  MOLAYNE: [ Species.KLEFKI, Species.MAGNEZONE, Species.METAGROSS, Species.ALOLA_DUGTRIO ],
-  OLIVIA: [ Species.RELICANTH, Species.CARBINK, Species.ALOLA_GOLEM, Species.LYCANROC ],
-  ACEROLA: [[ Species.BANETTE, Species.DRIFBLIM ], Species.MIMIKYU, Species.DHELMISE, Species.PALOSSAND ],
-  KAHILI: [[ Species.BRAVIARY, Species.MANDIBUZZ ], Species.HAWLUCHA, Species.ORICORIO, Species.TOUCANNON ],
-  MARNIE_ELITE: [ Species.MORPEKO, Species.LIEPARD, [ Species.TOXICROAK, Species.SCRAFTY ], Species.GRIMMSNARL ],
-  NESSA_ELITE: [ Species.GOLISOPOD, [ Species.PELIPPER, Species.QUAGSIRE ], Species.TOXAPEX, Species.DREDNAW ],
-  BEA_ELITE: [ Species.HAWLUCHA, [ Species.GRAPPLOCT, Species.SIRFETCHD ], Species.FALINKS, Species.MACHAMP ],
-  ALLISTER_ELITE: [ Species.DUSKNOIR, [ Species.POLTEAGEIST, Species.RUNERIGUS ], Species.CURSOLA, Species.GENGAR ],
-  RAIHAN_ELITE: [ Species.GOODRA, [ Species.TORKOAL, Species.TURTONATOR ], Species.FLYGON, Species.ARCHALUDON ],
-  RIKA: [ Species.WHISCASH, [ Species.DONPHAN, Species.DUGTRIO ], Species.CAMERUPT, Species.CLODSIRE ],
-  POPPY: [ Species.COPPERAJAH, Species.BRONZONG, Species.CORVIKNIGHT, Species.TINKATON ],
-  LARRY_ELITE: [ Species.STARAPTOR, Species.FLAMIGO, Species.ALTARIA, Species.TROPIUS ],
-  HASSEL: [ Species.NOIVERN, [ Species.FLAPPLE, Species.APPLETUN ], Species.DRAGALGE, Species.BAXCALIBUR ],
-  CRISPIN: [ Species.TALONFLAME, Species.CAMERUPT, Species.MAGMORTAR, Species.BLAZIKEN ],
-  AMARYS: [ Species.SKARMORY, Species.EMPOLEON, Species.SCIZOR, Species.METAGROSS ],
-  LACEY: [ Species.EXCADRILL, Species.PRIMARINA, [ Species.ALCREMIE, Species.GRANBULL ], Species.WHIMSICOTT ],
-  DRAYTON: [ Species.DRAGONITE, Species.ARCHALUDON, Species.HAXORUS, Species.SCEPTILE ],
-};
-
-export const trainerConfigs: TrainerConfigs = {
-  [TrainerType.UNKNOWN]: new TrainerConfig(0).setHasGenders(),
-  [TrainerType.ACE_TRAINER]: new TrainerConfig(++t).setHasGenders("Ace Trainer Female").setHasDouble("Ace Duo").setMoneyMultiplier(2.25).setEncounterBgm(TrainerType.ACE_TRAINER)
-    .setPartyTemplateFunc(() => getWavePartyTemplate(trainerPartyTemplates.THREE_WEAK_BALANCED, trainerPartyTemplates.FOUR_WEAK_BALANCED, trainerPartyTemplates.FIVE_WEAK_BALANCED, trainerPartyTemplates.SIX_WEAK_BALANCED)),
-  [TrainerType.ARTIST]: new TrainerConfig(++t).setEncounterBgm(TrainerType.RICH).setPartyTemplates(trainerPartyTemplates.ONE_STRONG, trainerPartyTemplates.TWO_AVG, trainerPartyTemplates.THREE_AVG)
-    .setSpeciesPools([ Species.SMEARGLE ]),
-  [TrainerType.BACKERS]: new TrainerConfig(++t).setHasGenders("Backers").setDoubleOnly().setEncounterBgm(TrainerType.CYCLIST),
-  [TrainerType.BACKPACKER]: new TrainerConfig(++t).setHasGenders("Backpacker Female").setHasDouble("Backpackers").setSpeciesFilter(s => s.isOfType(Type.FLYING) || s.isOfType(Type.ROCK)).setEncounterBgm(TrainerType.BACKPACKER)
-    .setPartyTemplates(trainerPartyTemplates.ONE_STRONG, trainerPartyTemplates.ONE_WEAK_ONE_STRONG, trainerPartyTemplates.ONE_AVG_ONE_STRONG)
-    .setSpeciesPools({
-      [TrainerPoolTier.COMMON]: [ Species.RHYHORN, Species.AIPOM, Species.MAKUHITA, Species.MAWILE, Species.NUMEL, Species.LILLIPUP, Species.SANDILE, Species.WOOLOO ],
-      [TrainerPoolTier.UNCOMMON]: [ Species.GIRAFARIG, Species.ZANGOOSE, Species.SEVIPER, Species.CUBCHOO, Species.PANCHAM, Species.SKIDDO, Species.MUDBRAY ],
-      [TrainerPoolTier.RARE]: [ Species.TAUROS, Species.STANTLER, Species.DARUMAKA, Species.BOUFFALANT, Species.DEERLING, Species.IMPIDIMP ],
-      [TrainerPoolTier.SUPER_RARE]: [ Species.GALAR_DARUMAKA, Species.TEDDIURSA ]
-    }),
-  [TrainerType.BAKER]: new TrainerConfig(++t).setEncounterBgm(TrainerType.CLERK).setMoneyMultiplier(1.35).setSpeciesFilter(s => s.isOfType(Type.GRASS) || s.isOfType(Type.FIRE)),
-  [TrainerType.BEAUTY]: new TrainerConfig(++t).setMoneyMultiplier(1.55).setEncounterBgm(TrainerType.PARASOL_LADY),
-  [TrainerType.BIKER]: new TrainerConfig(++t).setMoneyMultiplier(1.4).setEncounterBgm(TrainerType.ROUGHNECK).setSpeciesFilter(s => s.isOfType(Type.POISON)),
-  [TrainerType.BLACK_BELT]: new TrainerConfig(++t).setHasGenders("Battle Girl", TrainerType.PSYCHIC).setHasDouble("Crush Kin").setEncounterBgm(TrainerType.ROUGHNECK).setSpecialtyTypes(Type.FIGHTING)
-    .setPartyTemplates(trainerPartyTemplates.TWO_WEAK_ONE_AVG, trainerPartyTemplates.TWO_WEAK_ONE_AVG, trainerPartyTemplates.TWO_AVG, trainerPartyTemplates.TWO_AVG, trainerPartyTemplates.TWO_WEAK_ONE_STRONG, trainerPartyTemplates.THREE_AVG, trainerPartyTemplates.TWO_AVG_ONE_STRONG)
-    .setSpeciesPools({
-      [TrainerPoolTier.COMMON]: [ Species.NIDORAN_F, Species.NIDORAN_M, Species.MACHOP, Species.MAKUHITA, Species.MEDITITE, Species.CROAGUNK, Species.TIMBURR ],
-      [TrainerPoolTier.UNCOMMON]: [ Species.MANKEY, Species.POLIWRATH, Species.TYROGUE, Species.BRELOOM, Species.SCRAGGY, Species.MIENFOO, Species.PANCHAM, Species.STUFFUL, Species.CRABRAWLER ],
-      [TrainerPoolTier.RARE]: [ Species.HERACROSS, Species.RIOLU, Species.THROH, Species.SAWK, Species.PASSIMIAN, Species.CLOBBOPUS ],
-      [TrainerPoolTier.SUPER_RARE]: [ Species.HITMONTOP, Species.INFERNAPE, Species.GALLADE, Species.HAWLUCHA, Species.HAKAMO_O ],
-      [TrainerPoolTier.ULTRA_RARE]: [ Species.KUBFU ]
-    }),
-  [TrainerType.BREEDER]: new TrainerConfig(++t).setMoneyMultiplier(1.325).setEncounterBgm(TrainerType.POKEFAN).setHasGenders("Breeder Female").setHasDouble("Breeders")
-    .setPartyTemplateFunc(() => getWavePartyTemplate(trainerPartyTemplates.FOUR_WEAKER, trainerPartyTemplates.FIVE_WEAKER, trainerPartyTemplates.SIX_WEAKER))
-    .setSpeciesFilter(s => s.baseTotal < 450),
-  [TrainerType.CLERK]: new TrainerConfig(++t).setHasGenders("Clerk Female").setHasDouble("Colleagues").setEncounterBgm(TrainerType.CLERK)
-    .setPartyTemplates(trainerPartyTemplates.TWO_WEAK, trainerPartyTemplates.THREE_WEAK, trainerPartyTemplates.ONE_AVG, trainerPartyTemplates.TWO_AVG, trainerPartyTemplates.TWO_WEAK_ONE_AVG)
-    .setSpeciesPools({
-      [TrainerPoolTier.COMMON]: [ Species.MEOWTH, Species.PSYDUCK, Species.BUDEW, Species.PIDOVE, Species.CINCCINO, Species.LITLEO ],
-      [TrainerPoolTier.UNCOMMON]: [ Species.JIGGLYPUFF, Species.MAGNEMITE, Species.MARILL, Species.COTTONEE, Species.SKIDDO ],
-      [TrainerPoolTier.RARE]: [ Species.BUIZEL, Species.SNEASEL, Species.KLEFKI, Species.INDEEDEE ]
-    }),
-  [TrainerType.CYCLIST]: new TrainerConfig(++t).setMoneyMultiplier(1.3).setHasGenders("Cyclist Female").setHasDouble("Cyclists").setEncounterBgm(TrainerType.CYCLIST)
-    .setPartyTemplates(trainerPartyTemplates.TWO_WEAK, trainerPartyTemplates.ONE_AVG)
-    .setSpeciesPools({
-      [TrainerPoolTier.COMMON]: [ Species.PICHU, Species.STARLY, Species.TAILLOW, Species.BOLTUND ],
-      [TrainerPoolTier.UNCOMMON]: [ Species.DODUO, Species.ELECTRIKE, Species.BLITZLE, Species.WATTREL ],
-      [TrainerPoolTier.RARE]: [ Species.YANMA, Species.NINJASK, Species.WHIRLIPEDE, Species.EMOLGA ],
-      [TrainerPoolTier.SUPER_RARE]: [ Species.ACCELGOR, Species.DREEPY ]
-    }),
-  [TrainerType.DANCER]: new TrainerConfig(++t).setMoneyMultiplier(1.55).setEncounterBgm(TrainerType.CYCLIST)
-    .setPartyTemplates(trainerPartyTemplates.TWO_WEAK, trainerPartyTemplates.ONE_AVG, trainerPartyTemplates.TWO_AVG, trainerPartyTemplates.TWO_WEAK_SAME_TWO_WEAK_SAME)
-    .setSpeciesPools({
-      [TrainerPoolTier.COMMON]: [ Species.RALTS, Species.SPOINK, Species.LOTAD, Species.BUDEW ],
-      [TrainerPoolTier.UNCOMMON]: [ Species.SPINDA, Species.SWABLU, Species.MARACTUS, ],
-      [TrainerPoolTier.RARE]: [ Species.BELLOSSOM, Species.HITMONTOP, Species.MIME_JR, Species.ORICORIO ],
-      [TrainerPoolTier.SUPER_RARE]: [ Species.POPPLIO ]
-    }),
-  [TrainerType.DEPOT_AGENT]: new TrainerConfig(++t).setMoneyMultiplier(1.45).setEncounterBgm(TrainerType.CLERK),
-  [TrainerType.DOCTOR]: new TrainerConfig(++t).setHasGenders("Nurse", "lass").setHasDouble("Medical Team").setMoneyMultiplier(3).setEncounterBgm(TrainerType.CLERK)
-    .setSpeciesFilter(s => !!s.getLevelMoves().find(plm => plm[1] === Moves.HEAL_PULSE)),
-  [TrainerType.FIREBREATHER]: new TrainerConfig(++t).setMoneyMultiplier(1.4).setEncounterBgm(TrainerType.ROUGHNECK)
-    .setSpeciesFilter(s => !!s.getLevelMoves().find(plm => plm[1] === Moves.SMOG) || s.isOfType(Type.FIRE)),
-  [TrainerType.FISHERMAN]: new TrainerConfig(++t).setMoneyMultiplier(1.25).setEncounterBgm(TrainerType.BACKPACKER).setSpecialtyTypes(Type.WATER)
-    .setPartyTemplates(trainerPartyTemplates.TWO_WEAK_SAME_ONE_AVG, trainerPartyTemplates.ONE_AVG, trainerPartyTemplates.THREE_WEAK_SAME, trainerPartyTemplates.ONE_STRONG, trainerPartyTemplates.SIX_WEAKER)
-    .setSpeciesPools({
-      [TrainerPoolTier.COMMON]: [ Species.TENTACOOL, Species.MAGIKARP, Species.GOLDEEN, Species.STARYU, Species.REMORAID, Species.SKRELP, Species.CLAUNCHER, Species.ARROKUDA ],
-      [TrainerPoolTier.UNCOMMON]: [ Species.POLIWAG, Species.SHELLDER, Species.KRABBY, Species.HORSEA, Species.CARVANHA, Species.BARBOACH, Species.CORPHISH, Species.FINNEON, Species.TYMPOLE, Species.BASCULIN, Species.FRILLISH, Species.INKAY ],
-      [TrainerPoolTier.RARE]: [ Species.CHINCHOU, Species.CORSOLA, Species.WAILMER, Species.BARBOACH, Species.CLAMPERL, Species.LUVDISC, Species.MANTYKE, Species.ALOMOMOLA, Species.TATSUGIRI, Species.VELUZA ],
-      [TrainerPoolTier.SUPER_RARE]: [ Species.LAPRAS, Species.FEEBAS, Species.RELICANTH, Species.DONDOZO ]
-    }),
-  [TrainerType.GUITARIST]: new TrainerConfig(++t).setMoneyMultiplier(1.2).setEncounterBgm(TrainerType.ROUGHNECK).setSpecialtyTypes(Type.ELECTRIC).setSpeciesFilter(s => s.isOfType(Type.ELECTRIC)),
-  [TrainerType.HARLEQUIN]: new TrainerConfig(++t).setEncounterBgm(TrainerType.PSYCHIC).setSpeciesFilter(s => tmSpecies[Moves.TRICK_ROOM].indexOf(s.speciesId) > -1),
-  [TrainerType.HIKER]: new TrainerConfig(++t).setEncounterBgm(TrainerType.BACKPACKER)
-    .setPartyTemplates(trainerPartyTemplates.TWO_AVG_SAME_ONE_AVG, trainerPartyTemplates.TWO_AVG_SAME_ONE_STRONG, trainerPartyTemplates.TWO_AVG, trainerPartyTemplates.FOUR_WEAK, trainerPartyTemplates.ONE_STRONG)
-    .setSpeciesPools({
-      [TrainerPoolTier.COMMON]: [ Species.SANDSHREW, Species.DIGLETT, Species.GEODUDE, Species.MACHOP, Species.ARON, Species.ROGGENROLA, Species.DRILBUR, Species.NACLI ],
-      [TrainerPoolTier.UNCOMMON]: [ Species.ZUBAT, Species.RHYHORN, Species.ONIX, Species.CUBONE, Species.WOOBAT, Species.SWINUB, Species.NOSEPASS, Species.HIPPOPOTAS, Species.DWEBBLE, Species.KLAWF, Species.TOEDSCOOL ],
-      [TrainerPoolTier.RARE]: [ Species.TORKOAL, Species.TRAPINCH, Species.BARBOACH, Species.GOLETT, Species.ALOLA_DIGLETT, Species.ALOLA_GEODUDE, Species.GALAR_STUNFISK, Species.PALDEA_WOOPER ],
-      [TrainerPoolTier.SUPER_RARE]: [ Species.MAGBY, Species.LARVITAR ]
-    }),
-  [TrainerType.HOOLIGANS]: new TrainerConfig(++t).setDoubleOnly().setEncounterBgm(TrainerType.ROUGHNECK).setSpeciesFilter(s => s.isOfType(Type.POISON) || s.isOfType(Type.DARK)),
-  [TrainerType.HOOPSTER]: new TrainerConfig(++t).setMoneyMultiplier(1.2).setEncounterBgm(TrainerType.CYCLIST),
-  [TrainerType.INFIELDER]: new TrainerConfig(++t).setMoneyMultiplier(1.2).setEncounterBgm(TrainerType.CYCLIST),
-  [TrainerType.JANITOR]: new TrainerConfig(++t).setMoneyMultiplier(1.1).setEncounterBgm(TrainerType.CLERK),
-  [TrainerType.LINEBACKER]: new TrainerConfig(++t).setMoneyMultiplier(1.2).setEncounterBgm(TrainerType.CYCLIST),
-  [TrainerType.MAID]: new TrainerConfig(++t).setMoneyMultiplier(1.6).setEncounterBgm(TrainerType.RICH),
-  [TrainerType.MUSICIAN]: new TrainerConfig(++t).setEncounterBgm(TrainerType.ROUGHNECK).setSpeciesFilter(s => !!s.getLevelMoves().find(plm => plm[1] === Moves.SING)),
-  [TrainerType.HEX_MANIAC]: new TrainerConfig(++t).setMoneyMultiplier(1.5).setEncounterBgm(TrainerType.PSYCHIC)
-    .setPartyTemplates(trainerPartyTemplates.TWO_AVG, trainerPartyTemplates.ONE_AVG_ONE_STRONG, trainerPartyTemplates.TWO_AVG_SAME_ONE_AVG, trainerPartyTemplates.THREE_AVG, trainerPartyTemplates.TWO_STRONG)
-    .setSpeciesFilter(s => s.isOfType(Type.GHOST)),
-  [TrainerType.NURSERY_AIDE]: new TrainerConfig(++t).setMoneyMultiplier(1.3).setEncounterBgm("lass"),
-  [TrainerType.OFFICER]: new TrainerConfig(++t).setMoneyMultiplier(1.55).setEncounterBgm(TrainerType.CLERK)
-    .setPartyTemplates(trainerPartyTemplates.ONE_AVG, trainerPartyTemplates.ONE_STRONG, trainerPartyTemplates.TWO_AVG, trainerPartyTemplates.TWO_WEAK_SAME_ONE_AVG)
-    .setSpeciesPools({
-      [TrainerPoolTier.COMMON]: [ Species.VULPIX, Species.GROWLITHE, Species.SNUBBULL, Species.POOCHYENA, Species.ELECTRIKE, Species.LILLIPUP, Species.YAMPER, Species.FIDOUGH ],
-      [TrainerPoolTier.UNCOMMON]: [ Species.HOUNDOUR, Species.ROCKRUFF, Species.MASCHIFF ],
-      [TrainerPoolTier.RARE]: [ Species.JOLTEON, Species.RIOLU ],
-      [TrainerPoolTier.SUPER_RARE]: [],
-      [TrainerPoolTier.ULTRA_RARE]: [ Species.ENTEI, Species.SUICUNE, Species.RAIKOU ]
-    }),
-  [TrainerType.PARASOL_LADY]: new TrainerConfig(++t).setMoneyMultiplier(1.55).setEncounterBgm(TrainerType.PARASOL_LADY).setSpeciesFilter(s => s.isOfType(Type.WATER)),
-  [TrainerType.PILOT]: new TrainerConfig(++t).setEncounterBgm(TrainerType.CLERK).setSpeciesFilter(s => tmSpecies[Moves.FLY].indexOf(s.speciesId) > -1),
-  [TrainerType.POKEFAN]: new TrainerConfig(++t).setMoneyMultiplier(1.4).setName("PokéFan").setHasGenders("PokéFan Female").setHasDouble("PokéFan Family").setEncounterBgm(TrainerType.POKEFAN)
-    .setPartyTemplates(trainerPartyTemplates.SIX_WEAKER, trainerPartyTemplates.FOUR_WEAK, trainerPartyTemplates.TWO_AVG, trainerPartyTemplates.ONE_STRONG, trainerPartyTemplates.FOUR_WEAK_SAME, trainerPartyTemplates.FIVE_WEAK, trainerPartyTemplates.SIX_WEAKER_SAME),
-  [TrainerType.PRESCHOOLER]: new TrainerConfig(++t).setMoneyMultiplier(0.2).setEncounterBgm(TrainerType.YOUNGSTER).setHasGenders("Preschooler Female", "lass").setHasDouble("Preschoolers")
-    .setPartyTemplates(trainerPartyTemplates.THREE_WEAK, trainerPartyTemplates.FOUR_WEAKER, trainerPartyTemplates.TWO_WEAK_SAME_ONE_AVG, trainerPartyTemplates.FIVE_WEAKER)
-    .setSpeciesPools({
-      [TrainerPoolTier.COMMON]: [ Species.CATERPIE, Species.PICHU, Species.SANDSHREW, Species.LEDYBA, Species.BUDEW, Species.BURMY, Species.WOOLOO, Species.PAWMI, Species.SMOLIV ],
-      [TrainerPoolTier.UNCOMMON]: [ Species.EEVEE, Species.CLEFFA, Species.IGGLYBUFF, Species.SWINUB, Species.WOOPER, Species.DRIFLOON, Species.DEDENNE, Species.STUFFUL ],
-      [TrainerPoolTier.RARE]: [ Species.RALTS, Species.RIOLU, Species.JOLTIK, Species.TANDEMAUS ],
-      [TrainerPoolTier.SUPER_RARE]: [ Species.DARUMAKA, Species.TINKATINK ],
-    }),
-  [TrainerType.PSYCHIC]: new TrainerConfig(++t).setHasGenders("Psychic Female").setHasDouble("Psychics").setMoneyMultiplier(1.4).setEncounterBgm(TrainerType.PSYCHIC)
-    .setPartyTemplates(trainerPartyTemplates.TWO_WEAK, trainerPartyTemplates.TWO_AVG, trainerPartyTemplates.TWO_WEAK_SAME_ONE_AVG, trainerPartyTemplates.TWO_WEAK_SAME_TWO_WEAK_SAME, trainerPartyTemplates.ONE_STRONGER)
-    .setSpeciesPools({
-      [TrainerPoolTier.COMMON]: [ Species.ABRA, Species.DROWZEE, Species.RALTS, Species.SPOINK, Species.GOTHITA, Species.SOLOSIS, Species.BLIPBUG, Species.ESPURR, Species.HATENNA ],
-      [TrainerPoolTier.UNCOMMON]: [ Species.MIME_JR, Species.EXEGGCUTE, Species.MEDITITE, Species.NATU, Species.EXEGGCUTE, Species.WOOBAT, Species.INKAY, Species.ORANGURU ],
-      [TrainerPoolTier.RARE]: [ Species.ELGYEM, Species.SIGILYPH, Species.BALTOY, Species.GIRAFARIG, Species.MEOWSTIC ],
-      [TrainerPoolTier.SUPER_RARE]: [ Species.BELDUM, Species.ESPEON, Species.STANTLER ],
-    }),
-  [TrainerType.RANGER]: new TrainerConfig(++t).setMoneyMultiplier(1.4).setName("Pokémon Ranger").setEncounterBgm(TrainerType.BACKPACKER).setHasGenders("Pokémon Ranger Female").setHasDouble("Pokémon Rangers")
-    .setSpeciesPools({
-      [TrainerPoolTier.COMMON]: [ Species.PICHU, Species.GROWLITHE, Species.PONYTA, Species.ZIGZAGOON, Species.SEEDOT, Species.BIDOOF, Species.RIOLU, Species.SEWADDLE, Species.SKIDDO, Species.SALANDIT, Species.YAMPER ],
-      [TrainerPoolTier.UNCOMMON]: [ Species.AZURILL, Species.TAUROS, Species.MAREEP, Species.FARFETCHD, Species.TEDDIURSA, Species.SHROOMISH, Species.ELECTRIKE, Species.BUDEW, Species.BUIZEL, Species.MUDBRAY, Species.STUFFUL ],
-      [TrainerPoolTier.RARE]: [ Species.EEVEE, Species.SCYTHER, Species.KANGASKHAN, Species.RALTS, Species.MUNCHLAX, Species.ZORUA, Species.PALDEA_TAUROS, Species.TINKATINK, Species.CYCLIZAR, Species.FLAMIGO ],
-      [TrainerPoolTier.SUPER_RARE]: [ Species.LARVESTA ],
-    }),
-  [TrainerType.RICH]: new TrainerConfig(++t).setMoneyMultiplier(5).setName("Gentleman").setHasGenders("Madame").setHasDouble("Rich Couple"),
-  [TrainerType.RICH_KID]: new TrainerConfig(++t).setMoneyMultiplier(3.75).setName("Rich Boy").setHasGenders("Lady").setHasDouble("Rich Kids").setEncounterBgm(TrainerType.RICH),
-  [TrainerType.ROUGHNECK]: new TrainerConfig(++t).setMoneyMultiplier(1.4).setEncounterBgm(TrainerType.ROUGHNECK).setSpeciesFilter(s => s.isOfType(Type.DARK)),
-  [TrainerType.SAILOR]: new TrainerConfig(++t).setMoneyMultiplier(1.4).setEncounterBgm(TrainerType.BACKPACKER).setSpeciesFilter(s => s.isOfType(Type.WATER) || s.isOfType(Type.FIGHTING)),
-  [TrainerType.SCIENTIST]: new TrainerConfig(++t).setHasGenders("Scientist Female").setHasDouble("Scientists").setMoneyMultiplier(1.7).setEncounterBgm(TrainerType.SCIENTIST)
-    .setSpeciesPools({
-      [TrainerPoolTier.COMMON]: [ Species.MAGNEMITE, Species.GRIMER, Species.DROWZEE, Species.VOLTORB, Species.KOFFING ],
-      [TrainerPoolTier.UNCOMMON]: [ Species.BALTOY, Species.BRONZOR, Species.FERROSEED, Species.KLINK, Species.CHARJABUG, Species.BLIPBUG, Species.HELIOPTILE ],
-      [TrainerPoolTier.RARE]: [ Species.ABRA, Species.DITTO, Species.PORYGON, Species.ELEKID, Species.SOLOSIS, Species.GALAR_WEEZING ],
-      [TrainerPoolTier.SUPER_RARE]: [ Species.OMANYTE, Species.KABUTO, Species.AERODACTYL, Species.LILEEP, Species.ANORITH, Species.CRANIDOS, Species.SHIELDON, Species.TIRTOUGA, Species.ARCHEN, Species.ARCTOVISH, Species.ARCTOZOLT, Species.DRACOVISH, Species.DRACOZOLT ],
-      [TrainerPoolTier.ULTRA_RARE]: [ Species.ROTOM, Species.MELTAN ]
-    }),
-  [TrainerType.SMASHER]: new TrainerConfig(++t).setMoneyMultiplier(1.2).setEncounterBgm(TrainerType.CYCLIST),
-  [TrainerType.SNOW_WORKER]: new TrainerConfig(++t).setName("Worker").setHasDouble("Workers").setMoneyMultiplier(1.7).setEncounterBgm(TrainerType.CLERK).setSpeciesFilter(s => s.isOfType(Type.ICE) || s.isOfType(Type.STEEL)),
-  [TrainerType.STRIKER]: new TrainerConfig(++t).setMoneyMultiplier(1.2).setEncounterBgm(TrainerType.CYCLIST),
-  [TrainerType.SCHOOL_KID]: new TrainerConfig(++t).setMoneyMultiplier(0.75).setEncounterBgm(TrainerType.YOUNGSTER).setHasGenders("School Kid Female", "lass").setHasDouble("School Kids")
-    .setSpeciesPools({
-      [TrainerPoolTier.COMMON]: [ Species.ODDISH, Species.EXEGGCUTE, Species.TEDDIURSA, Species.WURMPLE, Species.RALTS, Species.SHROOMISH, Species.FLETCHLING ],
-      [TrainerPoolTier.UNCOMMON]: [ Species.VOLTORB, Species.WHISMUR, Species.MEDITITE, Species.MIME_JR, Species.NYMBLE ],
-      [TrainerPoolTier.RARE]: [ Species.TANGELA, Species.EEVEE, Species.YANMA ],
-      [TrainerPoolTier.SUPER_RARE]: [ Species.TADBULB ]
-    }),
-  [TrainerType.SWIMMER]: new TrainerConfig(++t).setMoneyMultiplier(1.3).setEncounterBgm(TrainerType.PARASOL_LADY).setHasGenders("Swimmer Female").setHasDouble("Swimmers").setSpecialtyTypes(Type.WATER).setSpeciesFilter(s => s.isOfType(Type.WATER)),
-  [TrainerType.TWINS]: new TrainerConfig(++t).setDoubleOnly().setMoneyMultiplier(0.65).setUseSameSeedForAllMembers()
-    .setPartyTemplateFunc(() => getWavePartyTemplate(trainerPartyTemplates.TWO_WEAK, trainerPartyTemplates.TWO_AVG, trainerPartyTemplates.TWO_STRONG))
-    .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.PLUSLE, Species.VOLBEAT, Species.PACHIRISU, Species.SILCOON, Species.METAPOD, Species.IGGLYBUFF, Species.PETILIL, Species.EEVEE ]))
-    .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.MINUN, Species.ILLUMISE, Species.EMOLGA, Species.CASCOON, Species.KAKUNA, Species.CLEFFA, Species.COTTONEE, Species.EEVEE ], TrainerSlot.TRAINER_PARTNER))
-    .setEncounterBgm(TrainerType.TWINS),
-  [TrainerType.VETERAN]: new TrainerConfig(++t).setHasGenders("Veteran Female").setHasDouble("Veteran Duo").setMoneyMultiplier(2.5).setEncounterBgm(TrainerType.ACE_TRAINER).setSpeciesFilter(s => s.isOfType(Type.DRAGON)),
-  [TrainerType.WAITER]: new TrainerConfig(++t).setHasGenders("Waitress").setHasDouble("Restaurant Staff").setMoneyMultiplier(1.5).setEncounterBgm(TrainerType.CLERK)
-    .setSpeciesPools({
-      [TrainerPoolTier.COMMON]: [ Species.CLEFFA, Species.CHATOT, Species.PANSAGE, Species.PANSEAR, Species.PANPOUR, Species.MINCCINO ],
-      [TrainerPoolTier.UNCOMMON]: [ Species.TROPIUS, Species.PETILIL, Species.BOUNSWEET, Species.INDEEDEE ],
-      [TrainerPoolTier.RARE]: [ Species.APPLIN, Species.SINISTEA, Species.POLTCHAGEIST ]
-    }),
-  [TrainerType.WORKER]: new TrainerConfig(++t).setHasGenders("Worker Female").setHasDouble("Workers").setEncounterBgm(TrainerType.CLERK).setMoneyMultiplier(1.7).setSpeciesFilter(s => s.isOfType(Type.ROCK) || s.isOfType(Type.STEEL)),
-  [TrainerType.YOUNGSTER]: new TrainerConfig(++t).setMoneyMultiplier(0.5).setEncounterBgm(TrainerType.YOUNGSTER).setHasGenders("Lass", "lass").setHasDouble("Beginners").setPartyTemplates(trainerPartyTemplates.TWO_WEAKER)
-    .setSpeciesPools(
-      [ Species.CATERPIE, Species.WEEDLE, Species.RATTATA, Species.SENTRET, Species.POOCHYENA, Species.ZIGZAGOON, Species.WURMPLE, Species.BIDOOF, Species.PATRAT, Species.LILLIPUP ]
-    ),
-  [TrainerType.ROCKET_GRUNT]: new TrainerConfig(++t).setHasGenders("Rocket Grunt Female").setHasDouble("Rocket Grunts").setMoneyMultiplier(1.0).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_rocket_grunt").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(() => getEvilGruntPartyTemplate())
-    .setSpeciesPools({
-      [TrainerPoolTier.COMMON]: [ Species.WEEDLE, Species.RATTATA, Species.EKANS, Species.SANDSHREW, Species.ZUBAT, Species.GEODUDE, Species.KOFFING, Species.GRIMER, Species.ODDISH, Species.SLOWPOKE ],
-      [TrainerPoolTier.UNCOMMON]: [ Species.GYARADOS, Species.LICKITUNG, Species.TAUROS, Species.MANKEY, Species.SCYTHER, Species.ELEKID, Species.MAGBY, Species.CUBONE, Species.GROWLITHE, Species.MURKROW, Species.GASTLY, Species.EXEGGCUTE, Species.VOLTORB, Species.MAGNEMITE ],
-      [TrainerPoolTier.RARE]: [ Species.PORYGON, Species.ALOLA_RATTATA, Species.ALOLA_SANDSHREW, Species.ALOLA_MEOWTH, Species.ALOLA_GRIMER, Species.ALOLA_GEODUDE, Species.PALDEA_TAUROS, Species.OMANYTE, Species.KABUTO ],
-      [TrainerPoolTier.SUPER_RARE]: [ Species.DRATINI, Species.LARVITAR ]
-    }),
-  [TrainerType.ARCHER]: new TrainerConfig(++t).setMoneyMultiplier(1.5).initForEvilTeamAdmin("rocket_admin", "rocket", [ Species.HOUNDOOM ]).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_rocket_grunt").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(() => getEvilGruntPartyTemplate()),
-  [TrainerType.ARIANA]: new TrainerConfig(++t).setMoneyMultiplier(1.5).initForEvilTeamAdmin("rocket_admin_female", "rocket", [ Species.ARBOK ]).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_rocket_grunt").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(() => getEvilGruntPartyTemplate()),
-  [TrainerType.PROTON]: new TrainerConfig(++t).setMoneyMultiplier(1.5).initForEvilTeamAdmin("rocket_admin", "rocket", [ Species.CROBAT ]).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_rocket_grunt").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(() => getEvilGruntPartyTemplate()),
-  [TrainerType.PETREL]: new TrainerConfig(++t).setMoneyMultiplier(1.5).initForEvilTeamAdmin("rocket_admin", "rocket", [ Species.WEEZING ]).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_rocket_grunt").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(() => getEvilGruntPartyTemplate()),
-  [TrainerType.MAGMA_GRUNT]: new TrainerConfig(++t).setHasGenders("Magma Grunt Female").setHasDouble("Magma Grunts").setMoneyMultiplier(1.0).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_aqua_magma_grunt").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(() => getEvilGruntPartyTemplate())
-    .setSpeciesPools({
-      [TrainerPoolTier.COMMON]: [ Species.SLUGMA, Species.POOCHYENA, Species.NUMEL, Species.ZIGZAGOON, Species.DIGLETT, Species.MAGBY, Species.TORKOAL, Species.GROWLITHE, Species.BALTOY ],
-      [TrainerPoolTier.UNCOMMON]: [ Species.SOLROCK, Species.HIPPOPOTAS, Species.SANDACONDA, Species.PHANPY, Species.ROLYCOLY, Species.GLIGAR, Species.RHYHORN, Species.HEATMOR ],
-      [TrainerPoolTier.RARE]: [ Species.TRAPINCH, Species.LILEEP, Species.ANORITH, Species.HISUI_GROWLITHE, Species.TURTONATOR, Species.ARON, Species.TOEDSCOOL ],
-      [TrainerPoolTier.SUPER_RARE]: [ Species.CAPSAKID, Species.CHARCADET ]
-    }),
-  [TrainerType.TABITHA]: new TrainerConfig(++t).setMoneyMultiplier(1.5).initForEvilTeamAdmin("magma_admin", "magma", [ Species.CAMERUPT ]).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_aqua_magma_grunt").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(() => getEvilGruntPartyTemplate()),
-  [TrainerType.COURTNEY]: new TrainerConfig(++t).setMoneyMultiplier(1.5).initForEvilTeamAdmin("magma_admin_female", "magma", [ Species.CAMERUPT ]).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_aqua_magma_grunt").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(() => getEvilGruntPartyTemplate()),
-  [TrainerType.AQUA_GRUNT]: new TrainerConfig(++t).setHasGenders("Aqua Grunt Female").setHasDouble("Aqua Grunts").setMoneyMultiplier(1.0).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_aqua_magma_grunt").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(() => getEvilGruntPartyTemplate())
-    .setSpeciesPools({
-      [TrainerPoolTier.COMMON]: [ Species.CARVANHA, Species.WAILMER, Species.ZIGZAGOON, Species.LOTAD, Species.CORPHISH, Species.SPHEAL, Species.REMORAID, Species.QWILFISH, Species.BARBOACH ],
-      [TrainerPoolTier.UNCOMMON]: [ Species.CLAMPERL, Species.CHINCHOU, Species.WOOPER, Species.WINGULL, Species.TENTACOOL, Species.AZURILL, Species.CLOBBOPUS, Species.HORSEA ],
-      [TrainerPoolTier.RARE]: [ Species.MANTYKE, Species.DHELMISE, Species.HISUI_QWILFISH, Species.ARROKUDA, Species.PALDEA_WOOPER, Species.SKRELP ],
-      [TrainerPoolTier.SUPER_RARE]: [ Species.DONDOZO, Species.BASCULEGION ]
-    }),
-  [TrainerType.MATT]: new TrainerConfig(++t).setMoneyMultiplier(1.5).initForEvilTeamAdmin("aqua_admin", "aqua", [ Species.SHARPEDO ]).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_aqua_magma_grunt").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(() => getEvilGruntPartyTemplate()),
-  [TrainerType.SHELLY]: new TrainerConfig(++t).setMoneyMultiplier(1.5).initForEvilTeamAdmin("aqua_admin_female", "aqua", [ Species.SHARPEDO ]).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_aqua_magma_grunt").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(() => getEvilGruntPartyTemplate()),
-  [TrainerType.GALACTIC_GRUNT]: new TrainerConfig(++t).setHasGenders("Galactic Grunt Female").setHasDouble("Galactic Grunts").setMoneyMultiplier(1.0).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_galactic_grunt").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(() => getEvilGruntPartyTemplate())
-    .setSpeciesPools({
-      [TrainerPoolTier.COMMON]: [ Species.GLAMEOW, Species.STUNKY, Species.CROAGUNK, Species.SHINX, Species.WURMPLE, Species.BRONZOR, Species.DRIFLOON, Species.BURMY, Species.CARNIVINE ],
-      [TrainerPoolTier.UNCOMMON]: [ Species.LICKITUNG, Species.RHYHORN, Species.TANGELA, Species.ZUBAT, Species.YANMA, Species.SKORUPI, Species.GLIGAR, Species.SWINUB ],
-      [TrainerPoolTier.RARE]: [ Species.HISUI_GROWLITHE, Species.HISUI_QWILFISH, Species.SNEASEL, Species.ELEKID, Species.MAGBY, Species.DUSKULL ],
-      [TrainerPoolTier.SUPER_RARE]: [ Species.ROTOM, Species.SPIRITOMB, Species.HISUI_SNEASEL ]
-    }),
-  [TrainerType.JUPITER]: new TrainerConfig(++t).setMoneyMultiplier(1.5).initForEvilTeamAdmin("galactic_commander_female", "galactic", [ Species.SKUNTANK ]).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_galactic_admin").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(() => getEvilGruntPartyTemplate()),
-  [TrainerType.MARS]: new TrainerConfig(++t).setMoneyMultiplier(1.5).initForEvilTeamAdmin("galactic_commander_female", "galactic", [ Species.PURUGLY ]).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_galactic_admin").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(() => getEvilGruntPartyTemplate()),
-  [TrainerType.SATURN]: new TrainerConfig(++t).setMoneyMultiplier(1.5).initForEvilTeamAdmin("galactic_commander", "galactic", [ Species.TOXICROAK ]).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_galactic_admin").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(() => getEvilGruntPartyTemplate()),
-  [TrainerType.PLASMA_GRUNT]: new TrainerConfig(++t).setHasGenders("Plasma Grunt Female").setHasDouble("Plasma Grunts").setMoneyMultiplier(1.0).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_plasma_grunt").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(() => getEvilGruntPartyTemplate())
-    .setSpeciesPools({
-      [TrainerPoolTier.COMMON]: [ Species.PATRAT, Species.LILLIPUP, Species.PURRLOIN, Species.SCRAFTY, Species.WOOBAT, Species.VANILLITE, Species.SANDILE, Species.TRUBBISH, Species.TYMPOLE ],
-      [TrainerPoolTier.UNCOMMON]: [ Species.FRILLISH, Species.VENIPEDE, Species.GOLETT, Species.TIMBURR, Species.DARUMAKA, Species.FOONGUS, Species.JOLTIK, Species.CUBCHOO, Species.KLINK ],
-      [TrainerPoolTier.RARE]: [ Species.PAWNIARD, Species.RUFFLET, Species.VULLABY, Species.ZORUA, Species.DRILBUR, Species.MIENFOO, Species.DURANT, Species.BOUFFALANT ],
-      [TrainerPoolTier.SUPER_RARE]: [ Species.DRUDDIGON, Species.HISUI_ZORUA, Species.AXEW, Species.DEINO ]
-    }),
-  [TrainerType.ZINZOLIN]: new TrainerConfig(++t).setMoneyMultiplier(1.5).initForEvilTeamAdmin("plasma_sage", "plasma", [ Species.CRYOGONAL ]).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_plasma_grunt").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(() => getEvilGruntPartyTemplate()),
-  [TrainerType.COLRESS]: new TrainerConfig(++t).setMoneyMultiplier(1.5).initForEvilTeamAdmin("plasma_boss", "plasma_2", [ Species.KLINKLANG ]).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_colress").setMixedBattleBgm("battle_colress").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(() => getEvilGruntPartyTemplate()),
-  [TrainerType.FLARE_GRUNT]: new TrainerConfig(++t).setHasGenders("Flare Grunt Female").setHasDouble("Flare Grunts").setMoneyMultiplier(1.0).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_flare_grunt").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(() => getEvilGruntPartyTemplate())
-    .setSpeciesPools({
-      [TrainerPoolTier.COMMON]: [ Species.FLETCHLING, Species.LITLEO, Species.PONYTA, Species.INKAY, Species.HOUNDOUR, Species.SKORUPI, Species.SCRAFTY, Species.CROAGUNK, Species.SCATTERBUG, Species.ESPURR ],
-      [TrainerPoolTier.UNCOMMON]: [ Species.HELIOPTILE, Species.ELECTRIKE, Species.SKRELP, Species.PANCHAM, Species.PURRLOIN, Species.POOCHYENA, Species.BINACLE, Species.CLAUNCHER, Species.PUMPKABOO, Species.PHANTUMP, Species.FOONGUS ],
-      [TrainerPoolTier.RARE]: [ Species.LITWICK, Species.SNEASEL, Species.PAWNIARD, Species.SLIGGOO ],
-      [TrainerPoolTier.SUPER_RARE]: [ Species.NOIBAT, Species.HISUI_SLIGGOO, Species.HISUI_AVALUGG ]
-    }),
-  [TrainerType.BRYONY]: new TrainerConfig(++t).setMoneyMultiplier(1.5).initForEvilTeamAdmin("flare_admin_female", "flare", [ Species.LIEPARD ]).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_flare_grunt").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(() => getEvilGruntPartyTemplate()),
-  [TrainerType.XEROSIC]: new TrainerConfig(++t).setMoneyMultiplier(1.5).initForEvilTeamAdmin("flare_admin", "flare", [ Species.MALAMAR ]).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_flare_grunt").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(() => getEvilGruntPartyTemplate()),
-  [TrainerType.AETHER_GRUNT]: new TrainerConfig(++t).setHasGenders("Aether Grunt Female").setHasDouble("Aether Grunts").setMoneyMultiplier(1.0).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_aether_grunt").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(() => getEvilGruntPartyTemplate())
-    .setSpeciesPools({
-      [TrainerPoolTier.COMMON]: [ Species.PIKIPEK, Species.ROCKRUFF, Species.ALOLA_DIGLETT, Species.ALOLA_EXEGGUTOR, Species.YUNGOOS, Species.CORSOLA, Species.ALOLA_GEODUDE, Species.ALOLA_RAICHU, Species.BOUNSWEET, Species.LILLIPUP, Species.KOMALA, Species.MORELULL, Species.COMFEY, Species.TOGEDEMARU ],
-      [TrainerPoolTier.UNCOMMON]: [ Species.POLIWAG, Species.STUFFUL, Species.ORANGURU, Species.PASSIMIAN, Species.BRUXISH, Species.MINIOR, Species.WISHIWASHI, Species.ALOLA_SANDSHREW, Species.ALOLA_VULPIX, Species.CRABRAWLER, Species.CUTIEFLY, Species.ORICORIO, Species.MUDBRAY, Species.PYUKUMUKU, Species.ALOLA_MAROWAK ],
-      [TrainerPoolTier.RARE]: [ Species.GALAR_CORSOLA, Species.TURTONATOR, Species.MIMIKYU, Species.MAGNEMITE, Species.DRAMPA ],
-      [TrainerPoolTier.SUPER_RARE]: [ Species.JANGMO_O, Species.PORYGON ]
-    }),
-  [TrainerType.FABA]: new TrainerConfig(++t).setMoneyMultiplier(1.5).initForEvilTeamAdmin("aether_admin", "aether", [ Species.HYPNO ]).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_aether_grunt").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(() => getEvilGruntPartyTemplate()),
-  [TrainerType.SKULL_GRUNT]: new TrainerConfig(++t).setHasGenders("Skull Grunt Female").setHasDouble("Skull Grunts").setMoneyMultiplier(1.0).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_skull_grunt").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(() => getEvilGruntPartyTemplate())
-    .setSpeciesPools({
-      [TrainerPoolTier.COMMON]: [ Species.SALANDIT, Species.ALOLA_RATTATA, Species.EKANS, Species.ALOLA_MEOWTH, Species.SCRAGGY, Species.KOFFING, Species.ALOLA_GRIMER, Species.MAREANIE, Species.SPINARAK, Species.TRUBBISH, Species.DROWZEE ],
-      [TrainerPoolTier.UNCOMMON]: [ Species.FOMANTIS, Species.SABLEYE, Species.SANDILE, Species.HOUNDOUR, Species.ALOLA_MAROWAK, Species.GASTLY, Species.PANCHAM, Species.ZUBAT, Species.VENIPEDE, Species.VULLABY ],
-      [TrainerPoolTier.RARE]: [ Species.SANDYGAST, Species.PAWNIARD, Species.MIMIKYU, Species.DHELMISE, Species.WISHIWASHI, Species.NYMBLE ],
-      [TrainerPoolTier.SUPER_RARE]: [ Species.GRUBBIN, Species.DEWPIDER ]
-    }),
-  [TrainerType.PLUMERIA]: new TrainerConfig(++t).setMoneyMultiplier(1.5).initForEvilTeamAdmin("skull_admin", "skull", [ Species.SALAZZLE ]).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_skull_admin").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(() => getEvilGruntPartyTemplate()),
-  [TrainerType.MACRO_GRUNT]: new TrainerConfig(++t).setHasGenders("Macro Grunt Female").setHasDouble("Macro Grunts").setMoneyMultiplier(1.0).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_macro_grunt").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(() => getEvilGruntPartyTemplate())
-    .setSpeciesPools({
-      [TrainerPoolTier.COMMON]: [ Species.CUFANT, Species.GALAR_MEOWTH, Species.KLINK, Species.ROOKIDEE, Species.CRAMORANT, Species.GALAR_ZIGZAGOON, Species.SKWOVET, Species.STEELIX, Species.MAWILE, Species.FERROSEED ],
-      [TrainerPoolTier.UNCOMMON]: [ Species.DRILBUR, Species.MAGNEMITE, Species.HATENNA, Species.ARROKUDA, Species.APPLIN, Species.GALAR_PONYTA, Species.GALAR_YAMASK, Species.SINISTEA, Species.RIOLU ],
-      [TrainerPoolTier.RARE]: [ Species.FALINKS, Species.BELDUM, Species.GALAR_FARFETCHD, Species.GALAR_MR_MIME, Species.HONEDGE, Species.SCIZOR, Species.GALAR_DARUMAKA ],
-      [TrainerPoolTier.SUPER_RARE]: [ Species.DURALUDON, Species.DREEPY ]
-    }),
-  [TrainerType.OLEANA]: new TrainerConfig(++t).setMoneyMultiplier(1.5).initForEvilTeamAdmin("macro_admin", "macro", [ Species.GARBODOR ]).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_oleana").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(() => getEvilGruntPartyTemplate()),
-  [TrainerType.STAR_GRUNT]: new TrainerConfig(++t).setHasGenders("Star Grunt Female").setHasDouble("Star Grunts").setMoneyMultiplier(1.0).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_star_grunt").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(() => getEvilGruntPartyTemplate())
-    .setSpeciesPools({
-      [TrainerPoolTier.COMMON]: [ Species.DUNSPARCE, Species.HOUNDOUR, Species.AZURILL, Species.GULPIN, Species.FOONGUS, Species.FLETCHLING, Species.LITLEO, Species.FLABEBE, Species.CRABRAWLER, Species.NYMBLE, Species.PAWMI, Species.FIDOUGH, Species.SQUAWKABILLY, Species.MASCHIFF, Species.SHROODLE, Species.KLAWF, Species.WIGLETT, Species.PALDEA_WOOPER ],
-      [TrainerPoolTier.UNCOMMON]: [ Species.KOFFING, Species.EEVEE, Species.GIRAFARIG, Species.RALTS, Species.TORKOAL, Species.SEVIPER, Species.SCRAGGY, Species.ZORUA, Species.MIMIKYU, Species.IMPIDIMP, Species.FALINKS, Species.CAPSAKID, Species.TINKATINK, Species.BOMBIRDIER, Species.CYCLIZAR, Species.FLAMIGO, Species.PALDEA_TAUROS ],
-      [TrainerPoolTier.RARE]: [ Species.MANKEY, Species.PAWNIARD, Species.CHARCADET, Species.FLITTLE, Species.VAROOM, Species.ORTHWORM ],
-      [TrainerPoolTier.SUPER_RARE]: [ Species.DONDOZO, Species.GIMMIGHOUL ]
-    }),
-  [TrainerType.GIACOMO]: new TrainerConfig(++t).setMoneyMultiplier(1.5).initForEvilTeamAdmin("star_admin", "star_1", [ Species.KINGAMBIT ]).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_star_admin").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(() => getEvilGruntPartyTemplate())
-    .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.REVAVROOM ], TrainerSlot.TRAINER, true, p => {
-      p.formIndex = 1; // Segin Starmobile
-      p.moveset = [ new PokemonMove(Moves.WICKED_TORQUE), new PokemonMove(Moves.SPIN_OUT), new PokemonMove(Moves.SHIFT_GEAR), new PokemonMove(Moves.HIGH_HORSEPOWER) ];
-    })),
-  [TrainerType.MELA]: new TrainerConfig(++t).setMoneyMultiplier(1.5).initForEvilTeamAdmin("star_admin", "star_2", [ Species.ARMAROUGE ]).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_star_admin").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(() => getEvilGruntPartyTemplate())
-    .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.REVAVROOM ], TrainerSlot.TRAINER, true, p => {
-      p.formIndex = 2; // Schedar Starmobile
-      p.moveset = [ new PokemonMove(Moves.BLAZING_TORQUE), new PokemonMove(Moves.SPIN_OUT), new PokemonMove(Moves.SHIFT_GEAR), new PokemonMove(Moves.HIGH_HORSEPOWER) ];
-    })),
-  [TrainerType.ATTICUS]: new TrainerConfig(++t).setMoneyMultiplier(1.5).initForEvilTeamAdmin("star_admin", "star_3", [ Species.REVAVROOM ]).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_star_admin").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(() => getEvilGruntPartyTemplate())
-    .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.REVAVROOM ], TrainerSlot.TRAINER, true, p => {
-      p.formIndex = 3; // Navi Starmobile
-      p.moveset = [ new PokemonMove(Moves.NOXIOUS_TORQUE), new PokemonMove(Moves.SPIN_OUT), new PokemonMove(Moves.SHIFT_GEAR), new PokemonMove(Moves.HIGH_HORSEPOWER) ];
-    })),
-  [TrainerType.ORTEGA]: new TrainerConfig(++t).setMoneyMultiplier(1.5).initForEvilTeamAdmin("star_admin", "star_4", [ Species.DACHSBUN ]).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_star_admin").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(() => getEvilGruntPartyTemplate())
-    .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.REVAVROOM ], TrainerSlot.TRAINER, true, p => {
-      p.formIndex = 4; // Ruchbah Starmobile
-      p.moveset = [ new PokemonMove(Moves.MAGICAL_TORQUE), new PokemonMove(Moves.SPIN_OUT), new PokemonMove(Moves.SHIFT_GEAR), new PokemonMove(Moves.HIGH_HORSEPOWER) ];
-    })),
-  [TrainerType.ERI]: new TrainerConfig(++t).setMoneyMultiplier(1.5).initForEvilTeamAdmin("star_admin", "star_5", [ Species.ANNIHILAPE ]).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_star_admin").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(() => getEvilGruntPartyTemplate())
-    .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.REVAVROOM ], TrainerSlot.TRAINER, true, p => {
-      p.formIndex = 5; // Caph Starmobile
-      p.moveset = [ new PokemonMove(Moves.COMBAT_TORQUE), new PokemonMove(Moves.SPIN_OUT), new PokemonMove(Moves.SHIFT_GEAR), new PokemonMove(Moves.HIGH_HORSEPOWER) ];
-    })),
-
-  [TrainerType.BROCK]: new TrainerConfig((t = TrainerType.BROCK)).initForGymLeader(signatureSpecies["BROCK"], true, Type.ROCK).setBattleBgm("battle_kanto_gym").setMixedBattleBgm("battle_kanto_gym"),
-  [TrainerType.MISTY]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["MISTY"], false, Type.WATER).setBattleBgm("battle_kanto_gym").setMixedBattleBgm("battle_kanto_gym"),
-  [TrainerType.LT_SURGE]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["LT_SURGE"], true, Type.ELECTRIC).setBattleBgm("battle_kanto_gym").setMixedBattleBgm("battle_kanto_gym"),
-  [TrainerType.ERIKA]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["ERIKA"], false, Type.GRASS).setBattleBgm("battle_kanto_gym").setMixedBattleBgm("battle_kanto_gym"),
-  [TrainerType.JANINE]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["JANINE"], false, Type.POISON).setBattleBgm("battle_kanto_gym").setMixedBattleBgm("battle_kanto_gym"),
-  [TrainerType.SABRINA]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["SABRINA"], false, Type.PSYCHIC).setBattleBgm("battle_kanto_gym").setMixedBattleBgm("battle_kanto_gym"),
-  [TrainerType.BLAINE]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["BLAINE"], true, Type.FIRE).setBattleBgm("battle_kanto_gym").setMixedBattleBgm("battle_kanto_gym"),
-  [TrainerType.GIOVANNI]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["GIOVANNI"], true, Type.DARK).setBattleBgm("battle_kanto_gym").setMixedBattleBgm("battle_kanto_gym"),
-  [TrainerType.FALKNER]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["FALKNER"], true, Type.FLYING).setBattleBgm("battle_johto_gym").setMixedBattleBgm("battle_johto_gym"),
-  [TrainerType.BUGSY]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["BUGSY"], true, Type.BUG).setBattleBgm("battle_johto_gym").setMixedBattleBgm("battle_johto_gym"),
-  [TrainerType.WHITNEY]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["WHITNEY"], false, Type.NORMAL).setBattleBgm("battle_johto_gym").setMixedBattleBgm("battle_johto_gym"),
-  [TrainerType.MORTY]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["MORTY"], true, Type.GHOST).setBattleBgm("battle_johto_gym").setMixedBattleBgm("battle_johto_gym"),
-  [TrainerType.CHUCK]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["CHUCK"], true, Type.FIGHTING).setBattleBgm("battle_johto_gym").setMixedBattleBgm("battle_johto_gym"),
-  [TrainerType.JASMINE]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["JASMINE"], false, Type.STEEL).setBattleBgm("battle_johto_gym").setMixedBattleBgm("battle_johto_gym"),
-  [TrainerType.PRYCE]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["PRYCE"], true, Type.ICE).setBattleBgm("battle_johto_gym").setMixedBattleBgm("battle_johto_gym"),
-  [TrainerType.CLAIR]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["CLAIR"], false, Type.DRAGON).setBattleBgm("battle_johto_gym").setMixedBattleBgm("battle_johto_gym"),
-  [TrainerType.ROXANNE]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["ROXANNE"], false, Type.ROCK).setBattleBgm("battle_hoenn_gym").setMixedBattleBgm("battle_hoenn_gym"),
-  [TrainerType.BRAWLY]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["BRAWLY"], true, Type.FIGHTING).setBattleBgm("battle_hoenn_gym").setMixedBattleBgm("battle_hoenn_gym"),
-  [TrainerType.WATTSON]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["WATTSON"], true, Type.ELECTRIC).setBattleBgm("battle_hoenn_gym").setMixedBattleBgm("battle_hoenn_gym"),
-  [TrainerType.FLANNERY]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["FLANNERY"], false, Type.FIRE).setBattleBgm("battle_hoenn_gym").setMixedBattleBgm("battle_hoenn_gym"),
-  [TrainerType.NORMAN]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["NORMAN"], true, Type.NORMAL).setBattleBgm("battle_hoenn_gym").setMixedBattleBgm("battle_hoenn_gym"),
-  [TrainerType.WINONA]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["WINONA"], false, Type.FLYING).setBattleBgm("battle_hoenn_gym").setMixedBattleBgm("battle_hoenn_gym"),
-  [TrainerType.TATE]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["TATE"], true, Type.PSYCHIC).setBattleBgm("battle_hoenn_gym").setMixedBattleBgm("battle_hoenn_gym").setHasDouble("tate_liza_double").setDoubleTrainerType(TrainerType.LIZA).setDoubleTitle("gym_leader_double"),
-  [TrainerType.LIZA]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["LIZA"], false, Type.PSYCHIC).setBattleBgm("battle_hoenn_gym").setMixedBattleBgm("battle_hoenn_gym").setHasDouble("liza_tate_double").setDoubleTrainerType(TrainerType.TATE).setDoubleTitle("gym_leader_double"),
-  [TrainerType.JUAN]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["JUAN"], true, Type.WATER).setBattleBgm("battle_hoenn_gym").setMixedBattleBgm("battle_hoenn_gym"),
-  [TrainerType.ROARK]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["ROARK"], true, Type.ROCK).setBattleBgm("battle_sinnoh_gym").setMixedBattleBgm("battle_sinnoh_gym"),
-  [TrainerType.GARDENIA]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["GARDENIA"], false, Type.GRASS).setBattleBgm("battle_sinnoh_gym").setMixedBattleBgm("battle_sinnoh_gym"),
-  [TrainerType.MAYLENE]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["MAYLENE"], false, Type.FIGHTING).setBattleBgm("battle_sinnoh_gym").setMixedBattleBgm("battle_sinnoh_gym"),
-  [TrainerType.CRASHER_WAKE]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["CRASHER_WAKE"], true, Type.WATER).setBattleBgm("battle_sinnoh_gym").setMixedBattleBgm("battle_sinnoh_gym"),
-  [TrainerType.FANTINA]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["FANTINA"], false, Type.GHOST).setBattleBgm("battle_sinnoh_gym").setMixedBattleBgm("battle_sinnoh_gym"),
-  [TrainerType.BYRON]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["BYRON"], true, Type.STEEL).setBattleBgm("battle_sinnoh_gym").setMixedBattleBgm("battle_sinnoh_gym"),
-  [TrainerType.CANDICE]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["CANDICE"], false, Type.ICE).setBattleBgm("battle_sinnoh_gym").setMixedBattleBgm("battle_sinnoh_gym"),
-  [TrainerType.VOLKNER]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["VOLKNER"], true, Type.ELECTRIC).setBattleBgm("battle_sinnoh_gym").setMixedBattleBgm("battle_sinnoh_gym"),
-  [TrainerType.CILAN]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["CILAN"], true, Type.GRASS).setMixedBattleBgm("battle_unova_gym"),
-  [TrainerType.CHILI]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["CHILI"], true, Type.FIRE).setMixedBattleBgm("battle_unova_gym"),
-  [TrainerType.CRESS]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["CRESS"], true, Type.WATER).setMixedBattleBgm("battle_unova_gym"),
-  [TrainerType.CHEREN]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["CHEREN"], true, Type.NORMAL).setMixedBattleBgm("battle_unova_gym"),
-  [TrainerType.LENORA]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["LENORA"], false, Type.NORMAL).setMixedBattleBgm("battle_unova_gym"),
-  [TrainerType.ROXIE]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["ROXIE"], false, Type.POISON).setMixedBattleBgm("battle_unova_gym"),
-  [TrainerType.BURGH]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["BURGH"], true, Type.BUG).setMixedBattleBgm("battle_unova_gym"),
-  [TrainerType.ELESA]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["ELESA"], false, Type.ELECTRIC).setMixedBattleBgm("battle_unova_gym"),
-  [TrainerType.CLAY]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["CLAY"], true, Type.GROUND).setMixedBattleBgm("battle_unova_gym"),
-  [TrainerType.SKYLA]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["SKYLA"], false, Type.FLYING).setMixedBattleBgm("battle_unova_gym"),
-  [TrainerType.BRYCEN]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["BRYCEN"], true, Type.ICE).setMixedBattleBgm("battle_unova_gym"),
-  [TrainerType.DRAYDEN]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["DRAYDEN"], true, Type.DRAGON).setMixedBattleBgm("battle_unova_gym"),
-  [TrainerType.MARLON]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["MARLON"], true, Type.WATER).setMixedBattleBgm("battle_unova_gym"),
-  [TrainerType.VIOLA]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["VIOLA"], false, Type.BUG).setMixedBattleBgm("battle_kalos_gym"),
-  [TrainerType.GRANT]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["GRANT"], true, Type.ROCK).setMixedBattleBgm("battle_kalos_gym"),
-  [TrainerType.KORRINA]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["KORRINA"], false, Type.FIGHTING).setMixedBattleBgm("battle_kalos_gym"),
-  [TrainerType.RAMOS]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["RAMOS"], true, Type.GRASS).setMixedBattleBgm("battle_kalos_gym"),
-  [TrainerType.CLEMONT]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["CLEMONT"], true, Type.ELECTRIC).setMixedBattleBgm("battle_kalos_gym"),
-  [TrainerType.VALERIE]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["VALERIE"], false, Type.FAIRY).setMixedBattleBgm("battle_kalos_gym"),
-  [TrainerType.OLYMPIA]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["OLYMPIA"], false, Type.PSYCHIC).setMixedBattleBgm("battle_kalos_gym"),
-  [TrainerType.WULFRIC]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["WULFRIC"], true, Type.ICE).setMixedBattleBgm("battle_kalos_gym"),
-  [TrainerType.MILO]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["MILO"], true, Type.GRASS).setMixedBattleBgm("battle_galar_gym"),
-  [TrainerType.NESSA]: new TrainerConfig(++t).setName("Nessa").initForGymLeader(signatureSpecies["NESSA"], false, Type.WATER).setMixedBattleBgm("battle_galar_gym"),
-  [TrainerType.KABU]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["KABU"], true, Type.FIRE).setMixedBattleBgm("battle_galar_gym"),
-  [TrainerType.BEA]: new TrainerConfig(++t).setName("Bea").initForGymLeader(signatureSpecies["BEA"], false, Type.FIGHTING).setMixedBattleBgm("battle_galar_gym"),
-  [TrainerType.ALLISTER]: new TrainerConfig(++t).setName("Allister").initForGymLeader(signatureSpecies["ALLISTER"], true, Type.GHOST).setMixedBattleBgm("battle_galar_gym"),
-  [TrainerType.OPAL]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["OPAL"], false, Type.FAIRY).setMixedBattleBgm("battle_galar_gym"),
-  [TrainerType.BEDE]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["BEDE"], true, Type.FAIRY).setMixedBattleBgm("battle_galar_gym"),
-  [TrainerType.GORDIE]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["GORDIE"], true, Type.ROCK).setMixedBattleBgm("battle_galar_gym"),
-  [TrainerType.MELONY]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["MELONY"], false, Type.ICE).setMixedBattleBgm("battle_galar_gym"),
-  [TrainerType.PIERS]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["PIERS"], true, Type.DARK).setHasDouble("piers_marnie_double").setDoubleTrainerType(TrainerType.MARNIE).setDoubleTitle("gym_leader_double").setMixedBattleBgm("battle_galar_gym"),
-  [TrainerType.MARNIE]: new TrainerConfig(++t).setName("Marnie").initForGymLeader(signatureSpecies["MARNIE"], false, Type.DARK).setHasDouble("marnie_piers_double").setDoubleTrainerType(TrainerType.PIERS).setDoubleTitle("gym_leader_double").setMixedBattleBgm("battle_galar_gym"),
-  [TrainerType.RAIHAN]: new TrainerConfig(++t).setName("Raihan").initForGymLeader(signatureSpecies["RAIHAN"], true, Type.DRAGON).setMixedBattleBgm("battle_galar_gym"),
-  [TrainerType.KATY]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["KATY"], false, Type.BUG).setMixedBattleBgm("battle_paldea_gym"),
-  [TrainerType.BRASSIUS]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["BRASSIUS"], true, Type.GRASS).setMixedBattleBgm("battle_paldea_gym"),
-  [TrainerType.IONO]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["IONO"], false, Type.ELECTRIC).setMixedBattleBgm("battle_paldea_gym"),
-  [TrainerType.KOFU]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["KOFU"], true, Type.WATER).setMixedBattleBgm("battle_paldea_gym"),
-  [TrainerType.LARRY]: new TrainerConfig(++t).setName("Larry").initForGymLeader(signatureSpecies["LARRY"], true, Type.NORMAL).setMixedBattleBgm("battle_paldea_gym"),
-  [TrainerType.RYME]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["RYME"], false, Type.GHOST).setMixedBattleBgm("battle_paldea_gym"),
-  [TrainerType.TULIP]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["TULIP"], false, Type.PSYCHIC).setMixedBattleBgm("battle_paldea_gym"),
-  [TrainerType.GRUSHA]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["GRUSHA"], true, Type.ICE).setMixedBattleBgm("battle_paldea_gym"),
-
-  [TrainerType.LORELEI]: new TrainerConfig((t = TrainerType.LORELEI)).initForEliteFour(signatureSpecies["LORELEI"], false, Type.ICE).setBattleBgm("battle_kanto_gym").setMixedBattleBgm("battle_kanto_gym"),
-  [TrainerType.BRUNO]: new TrainerConfig(++t).initForEliteFour(signatureSpecies["BRUNO"], true, Type.FIGHTING).setBattleBgm("battle_kanto_gym").setMixedBattleBgm("battle_kanto_gym"),
-  [TrainerType.AGATHA]: new TrainerConfig(++t).initForEliteFour(signatureSpecies["AGATHA"], false, Type.GHOST).setBattleBgm("battle_kanto_gym").setMixedBattleBgm("battle_kanto_gym"),
-  [TrainerType.LANCE]: new TrainerConfig(++t).setName("Lance").initForEliteFour(signatureSpecies["LANCE"], true, Type.DRAGON).setBattleBgm("battle_kanto_gym").setMixedBattleBgm("battle_kanto_gym"),
-  [TrainerType.WILL]: new TrainerConfig(++t).initForEliteFour(signatureSpecies["WILL"], true, Type.PSYCHIC).setBattleBgm("battle_johto_gym").setMixedBattleBgm("battle_johto_gym"),
-  [TrainerType.KOGA]: new TrainerConfig(++t).initForEliteFour(signatureSpecies["KOGA"], true, Type.POISON).setBattleBgm("battle_johto_gym").setMixedBattleBgm("battle_johto_gym"),
-  [TrainerType.KAREN]: new TrainerConfig(++t).initForEliteFour(signatureSpecies["KAREN"], false, Type.DARK).setBattleBgm("battle_johto_gym").setMixedBattleBgm("battle_johto_gym"),
-  [TrainerType.SIDNEY]: new TrainerConfig(++t).initForEliteFour(signatureSpecies["SIDNEY"], true, Type.DARK).setMixedBattleBgm("battle_hoenn_elite"),
-  [TrainerType.PHOEBE]: new TrainerConfig(++t).initForEliteFour(signatureSpecies["PHOEBE"], false, Type.GHOST).setMixedBattleBgm("battle_hoenn_elite"),
-  [TrainerType.GLACIA]: new TrainerConfig(++t).initForEliteFour(signatureSpecies["GLACIA"], false, Type.ICE).setMixedBattleBgm("battle_hoenn_elite"),
-  [TrainerType.DRAKE]: new TrainerConfig(++t).initForEliteFour(signatureSpecies["DRAKE"], true, Type.DRAGON).setMixedBattleBgm("battle_hoenn_elite"),
-  [TrainerType.AARON]: new TrainerConfig(++t).initForEliteFour(signatureSpecies["AARON"], true, Type.BUG).setBattleBgm("battle_sinnoh_gym").setMixedBattleBgm("battle_sinnoh_gym"),
-  [TrainerType.BERTHA]: new TrainerConfig(++t).initForEliteFour(signatureSpecies["BERTHA"], false, Type.GROUND).setBattleBgm("battle_sinnoh_gym").setMixedBattleBgm("battle_sinnoh_gym"),
-  [TrainerType.FLINT]: new TrainerConfig(++t).initForEliteFour(signatureSpecies["FLINT"], true, Type.FIRE).setBattleBgm("battle_sinnoh_gym").setMixedBattleBgm("battle_sinnoh_gym"),
-  [TrainerType.LUCIAN]: new TrainerConfig(++t).initForEliteFour(signatureSpecies["LUCIAN"], true, Type.PSYCHIC).setBattleBgm("battle_sinnoh_gym").setMixedBattleBgm("battle_sinnoh_gym"),
-  [TrainerType.SHAUNTAL]: new TrainerConfig(++t).initForEliteFour(signatureSpecies["SHAUNTAL"], false, Type.GHOST).setMixedBattleBgm("battle_unova_elite"),
-  [TrainerType.MARSHAL]: new TrainerConfig(++t).initForEliteFour(signatureSpecies["MARSHAL"], true, Type.FIGHTING).setMixedBattleBgm("battle_unova_elite"),
-  [TrainerType.GRIMSLEY]: new TrainerConfig(++t).initForEliteFour(signatureSpecies["GRIMSLEY"], true, Type.DARK).setMixedBattleBgm("battle_unova_elite"),
-  [TrainerType.CAITLIN]: new TrainerConfig(++t).initForEliteFour(signatureSpecies["CAITLIN"], false, Type.PSYCHIC).setMixedBattleBgm("battle_unova_elite"),
-  [TrainerType.MALVA]: new TrainerConfig(++t).initForEliteFour(signatureSpecies["MALVA"], false, Type.FIRE).setMixedBattleBgm("battle_kalos_elite"),
-  [TrainerType.SIEBOLD]: new TrainerConfig(++t).initForEliteFour(signatureSpecies["SIEBOLD"], true, Type.WATER).setMixedBattleBgm("battle_kalos_elite"),
-  [TrainerType.WIKSTROM]: new TrainerConfig(++t).initForEliteFour(signatureSpecies["WIKSTROM"], true, Type.STEEL).setMixedBattleBgm("battle_kalos_elite"),
-  [TrainerType.DRASNA]: new TrainerConfig(++t).initForEliteFour(signatureSpecies["DRASNA"], false, Type.DRAGON).setMixedBattleBgm("battle_kalos_elite"),
-  [TrainerType.HALA]: new TrainerConfig(++t).initForEliteFour(signatureSpecies["HALA"], true, Type.FIGHTING).setMixedBattleBgm("battle_alola_elite"),
-  [TrainerType.MOLAYNE]: new TrainerConfig(++t).initForEliteFour(signatureSpecies["MOLAYNE"], true, Type.STEEL).setMixedBattleBgm("battle_alola_elite"),
-  [TrainerType.OLIVIA]: new TrainerConfig(++t).initForEliteFour(signatureSpecies["OLIVIA"], false, Type.ROCK).setMixedBattleBgm("battle_alola_elite"),
-  [TrainerType.ACEROLA]: new TrainerConfig(++t).initForEliteFour(signatureSpecies["ACEROLA"], false, Type.GHOST).setMixedBattleBgm("battle_alola_elite"),
-  [TrainerType.KAHILI]: new TrainerConfig(++t).initForEliteFour(signatureSpecies["KAHILI"], false, Type.FLYING).setMixedBattleBgm("battle_alola_elite"),
-  [TrainerType.MARNIE_ELITE]: new TrainerConfig(++t).setName("Marnie").initForEliteFour(signatureSpecies["MARNIE_ELITE"], false, Type.DARK).setMixedBattleBgm("battle_galar_elite"),
-  [TrainerType.NESSA_ELITE]: new TrainerConfig(++t).setName("Nessa").initForEliteFour(signatureSpecies["NESSA_ELITE"], false, Type.WATER).setMixedBattleBgm("battle_galar_elite"),
-  [TrainerType.BEA_ELITE]: new TrainerConfig(++t).setName("Bea").initForEliteFour(signatureSpecies["BEA_ELITE"], false, Type.FIGHTING).setMixedBattleBgm("battle_galar_elite"),
-  [TrainerType.ALLISTER_ELITE]: new TrainerConfig(++t).setName("Allister").initForEliteFour(signatureSpecies["ALLISTER_ELITE"], true, Type.GHOST).setMixedBattleBgm("battle_galar_elite"),
-  [TrainerType.RAIHAN_ELITE]: new TrainerConfig(++t).setName("Raihan").initForEliteFour(signatureSpecies["RAIHAN_ELITE"], true, Type.DRAGON).setMixedBattleBgm("battle_galar_elite"),
-  [TrainerType.RIKA]: new TrainerConfig(++t).initForEliteFour(signatureSpecies["RIKA"], false, Type.GROUND).setMixedBattleBgm("battle_paldea_elite"),
-  [TrainerType.POPPY]: new TrainerConfig(++t).initForEliteFour(signatureSpecies["POPPY"], false, Type.STEEL).setMixedBattleBgm("battle_paldea_elite"),
-  [TrainerType.LARRY_ELITE]: new TrainerConfig(++t).setName("Larry").initForEliteFour(signatureSpecies["LARRY_ELITE"], true, Type.NORMAL, Type.FLYING).setMixedBattleBgm("battle_paldea_elite"),
-  [TrainerType.HASSEL]: new TrainerConfig(++t).initForEliteFour(signatureSpecies["HASSEL"], true, Type.DRAGON).setMixedBattleBgm("battle_paldea_elite"),
-  [TrainerType.CRISPIN]: new TrainerConfig(++t).initForEliteFour(signatureSpecies["CRISPIN"], true, Type.FIRE).setMixedBattleBgm("battle_bb_elite"),
-  [TrainerType.AMARYS]: new TrainerConfig(++t).initForEliteFour(signatureSpecies["AMARYS"], false, Type.STEEL).setMixedBattleBgm("battle_bb_elite"),
-  [TrainerType.LACEY]: new TrainerConfig(++t).initForEliteFour(signatureSpecies["LACEY"], false, Type.FAIRY).setMixedBattleBgm("battle_bb_elite"),
-  [TrainerType.DRAYTON]: new TrainerConfig(++t).initForEliteFour(signatureSpecies["DRAYTON"], true, Type.DRAGON).setMixedBattleBgm("battle_bb_elite"),
-
-  [TrainerType.BLUE]: new TrainerConfig((t = TrainerType.BLUE)).initForChampion(true).setBattleBgm("battle_kanto_champion").setMixedBattleBgm("battle_kanto_champion").setHasDouble("blue_red_double").setDoubleTrainerType(TrainerType.RED).setDoubleTitle("champion_double")
-    .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.ALAKAZAM ]))
-    .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.MACHAMP ]))
-    .setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.HO_OH ], TrainerSlot.TRAINER, true, p => {
-      p.generateAndPopulateMoveset();
-      p.pokeball = PokeballType.MASTER_BALL;
-    }))
-    .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.RHYPERIOR, Species.ELECTIVIRE, Species.MAGMORTAR ]))
-    .setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.ARCANINE, Species.EXEGGUTOR, Species.GYARADOS ], TrainerSlot.TRAINER, true, p => {
-      p.generateAndPopulateMoveset();
-      p.setBoss(true, 2);
-    }))
-    .setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.PIDGEOT ], TrainerSlot.TRAINER, true, p => {
-      p.formIndex = 1; // Mega Pidgeot
-      p.generateAndPopulateMoveset();
-      p.generateName();
-      p.gender = Gender.MALE;
-    }))
-    .setGenModifiersFunc(party => {
-      const teraPokemon = party[3];
-      return [ modifierTypes.TERA_SHARD().generateType([], [ teraPokemon.species.type1 ])!.withIdFromFunc(modifierTypes.TERA_SHARD).newModifier(teraPokemon) as PersistentModifier ];
-    }),
-  [TrainerType.RED]: new TrainerConfig(++t).initForChampion(true).setBattleBgm("battle_johto_champion").setMixedBattleBgm("battle_johto_champion").setHasDouble("red_blue_double").setDoubleTrainerType(TrainerType.BLUE).setDoubleTitle("champion_double")
-    .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.PIKACHU ], TrainerSlot.TRAINER, true, p => {
-      p.formIndex = 8; // G-Max Pikachu
-      p.generateAndPopulateMoveset();
-      p.generateName();
-      p.gender = Gender.MALE;
-    }))
-    .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.ESPEON, Species.UMBREON, Species.SYLVEON ]))
-    .setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.LUGIA ], TrainerSlot.TRAINER, true, p => {
-      p.generateAndPopulateMoveset();
-      p.pokeball = PokeballType.MASTER_BALL;
-    }))
-    .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.MEGANIUM, Species.TYPHLOSION, Species.FERALIGATR ]))
-    .setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.SNORLAX ], TrainerSlot.TRAINER, true, p => {
-      p.generateAndPopulateMoveset();
-      p.setBoss(true, 2);
-    }))
-    .setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.VENUSAUR, Species.CHARIZARD, Species.BLASTOISE ], TrainerSlot.TRAINER, true, p => {
-      p.formIndex = 1; // Mega Venusaur, Mega Charizard X, or Mega Blastoise
-      p.generateAndPopulateMoveset();
-      p.generateName();
-      p.gender = Gender.MALE;
-    }))
-    .setGenModifiersFunc(party => {
-      const teraPokemon = party[3];
-      return [ modifierTypes.TERA_SHARD().generateType([], [ teraPokemon.species.type1 ])!.withIdFromFunc(modifierTypes.TERA_SHARD).newModifier(teraPokemon) as PersistentModifier ];
-    }),
-  [TrainerType.LANCE_CHAMPION]: new TrainerConfig(++t).setName("Lance").initForChampion(true).setBattleBgm("battle_johto_champion").setMixedBattleBgm("battle_johto_champion")
-    .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.GYARADOS, Species.KINGDRA ]))
-    .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.AERODACTYL ]))
-    .setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.SALAMENCE ], TrainerSlot.TRAINER, true, p => {
-      p.formIndex = 1; // Mega Salamence
-      p.generateAndPopulateMoveset();
-      p.generateName();
-    }))
-    .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.CHARIZARD ]))
-    .setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.TYRANITAR, Species.GARCHOMP, Species.KOMMO_O ]))
-    .setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.DRAGONITE ], TrainerSlot.TRAINER, true, p => {
-      p.generateAndPopulateMoveset();
-      p.gender = Gender.MALE;
-      p.setBoss(true, 2);
-    }))
-    .setGenModifiersFunc(party => {
-      const teraPokemon = party[4];
-      return [ modifierTypes.TERA_SHARD().generateType([], [ teraPokemon.species.type1 ])!.withIdFromFunc(modifierTypes.TERA_SHARD).newModifier(teraPokemon) as PersistentModifier ];
-    }),
-  [TrainerType.STEVEN]: new TrainerConfig(++t).initForChampion(true).setBattleBgm("battle_hoenn_champion_g5").setMixedBattleBgm("battle_hoenn_champion_g6").setHasDouble("steven_wallace_double").setDoubleTrainerType(TrainerType.WALLACE).setDoubleTitle("champion_double")
-    .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.SKARMORY ]))
-    .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.CRADILY, Species.ARMALDO ]))
-    .setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.AGGRON ], TrainerSlot.TRAINER, true, p => {
-      p.generateAndPopulateMoveset();
-      p.setBoss(true, 2);
-    }))
-    .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.GOLURK, Species.RUNERIGUS ]))
-    .setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.REGIROCK, Species.REGICE, Species.REGISTEEL ], TrainerSlot.TRAINER, true, p => {
-      p.generateAndPopulateMoveset();
-      p.pokeball = PokeballType.ULTRA_BALL;
-    }))
-    .setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.METAGROSS ], TrainerSlot.TRAINER, true, p => {
-      p.formIndex = 1; // Mega Metagross
-      p.generateAndPopulateMoveset();
-      p.generateName();
-    }))
-    .setGenModifiersFunc(party => {
-      const teraPokemon = party[4];
-      return [ modifierTypes.TERA_SHARD().generateType([], [ teraPokemon.species.type1 ])!.withIdFromFunc(modifierTypes.TERA_SHARD).newModifier(teraPokemon) as PersistentModifier ];
-    }),
-  [TrainerType.WALLACE]: new TrainerConfig(++t).initForChampion(true).setBattleBgm("battle_hoenn_champion_g5").setMixedBattleBgm("battle_hoenn_champion_g6").setHasDouble("wallace_steven_double").setDoubleTrainerType(TrainerType.STEVEN).setDoubleTitle("champion_double")
-    .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.PELIPPER ], TrainerSlot.TRAINER, true, p => {
-      p.abilityIndex = 1; // Drizzle
-      p.generateAndPopulateMoveset();
-    }))
-    .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.LUDICOLO ]))
-    .setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.LATIAS, Species.LATIOS ], TrainerSlot.TRAINER, true, p => {
-      p.formIndex = 1; // Mega Latios or Mega Latias
-      p.generateAndPopulateMoveset();
-      p.generateName();
-      p.pokeball = PokeballType.MASTER_BALL;
-    }))
-    .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.SWAMPERT, Species.GASTRODON, Species.SEISMITOAD ]))
-    .setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.REGIELEKI, Species.REGIDRAGO ], TrainerSlot.TRAINER, true, p => {
-      p.generateAndPopulateMoveset();
-      p.pokeball = PokeballType.ULTRA_BALL;
-    }))
-    .setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.MILOTIC ], TrainerSlot.TRAINER, true, p => {
-      p.generateAndPopulateMoveset();
-      p.gender = Gender.FEMALE;
-      p.setBoss(true, 2);
-    }))
-    .setGenModifiersFunc(party => {
-      const teraPokemon = party[4];
-      return [ modifierTypes.TERA_SHARD().generateType([], [ teraPokemon.species.type1 ])!.withIdFromFunc(modifierTypes.TERA_SHARD).newModifier(teraPokemon) as PersistentModifier ];
-    }),
-  [TrainerType.CYNTHIA]: new TrainerConfig(++t).initForChampion(false).setBattleBgm("battle_sinnoh_champion").setMixedBattleBgm("battle_sinnoh_champion")
-    .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.SPIRITOMB ], TrainerSlot.TRAINER, true, p => {
-      p.generateAndPopulateMoveset();
-    }))
-    .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.LUCARIO ]))
-    .setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.GIRATINA ], TrainerSlot.TRAINER, true, p => {
-      p.generateAndPopulateMoveset();
-	  p.pokeball = PokeballType.MASTER_BALL;
-    }))
-    .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.MILOTIC, Species.ROSERADE, Species.HISUI_ARCANINE ]))
-    .setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.TOGEKISS ], TrainerSlot.TRAINER, true, p => {
-      p.generateAndPopulateMoveset();
-      p.setBoss(true, 2);
-    }))
-    .setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.GARCHOMP ], TrainerSlot.TRAINER, true, p => {
-      p.formIndex = 1; // Mega Garchomp
-      p.generateAndPopulateMoveset();
-      p.generateName();
-      p.gender = Gender.FEMALE;
-    }))
-    .setGenModifiersFunc(party => {
-      const teraPokemon = party[3];
-      return [ modifierTypes.TERA_SHARD().generateType([], [ teraPokemon.species.type1 ])!.withIdFromFunc(modifierTypes.TERA_SHARD).newModifier(teraPokemon) as PersistentModifier ];
-    }),
-  [TrainerType.ALDER]: new TrainerConfig(++t).initForChampion(true).setHasDouble("alder_iris_double").setDoubleTrainerType(TrainerType.IRIS).setDoubleTitle("champion_double").setBattleBgm("battle_champion_alder").setMixedBattleBgm("battle_champion_alder")
-    .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.BOUFFALANT, Species.BRAVIARY ]))
-    .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.HISUI_LILLIGANT, Species.HISUI_ZOROARK, Species.BASCULEGION ], TrainerSlot.TRAINER, true, p => {
-      p.generateAndPopulateMoveset();
-      p.pokeball = PokeballType.ROGUE_BALL;
-    }))
-    .setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.ZEKROM ], TrainerSlot.TRAINER, true, p => {
-      p.generateAndPopulateMoveset();
-      p.pokeball = PokeballType.MASTER_BALL;
-    }))
-    .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.KELDEO ], TrainerSlot.TRAINER, true, p => {
-      p.generateAndPopulateMoveset();
-      p.pokeball = PokeballType.ULTRA_BALL;
-    }))
-    .setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.CHANDELURE, Species.KROOKODILE, Species.REUNICLUS, Species.CONKELDURR ]))
-    .setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.VOLCARONA ], TrainerSlot.TRAINER, true, p => {
-      p.generateAndPopulateMoveset();
-      p.gender = Gender.MALE;
-      p.setBoss(true, 2);
-    }))
-    .setGenModifiersFunc(party => {
-      const pokemon = party[4];
-      return [ modifierTypes.TERA_SHARD().generateType([], [ pokemon.species.speciesId === Species.KROOKODILE ? pokemon.species.type2 : pokemon.species.type1 ])!.withIdFromFunc(modifierTypes.TERA_SHARD).newModifier(pokemon) as PersistentModifier ];
-    }),
-  [TrainerType.IRIS]: new TrainerConfig(++t).initForChampion(false).setBattleBgm("battle_champion_iris").setMixedBattleBgm("battle_champion_iris").setHasDouble("iris_alder_double").setDoubleTrainerType(TrainerType.ALDER).setDoubleTitle("champion_double")
-    .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.DRUDDIGON ]))
-    .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.ARCHEOPS ]))
-    .setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.RESHIRAM ], TrainerSlot.TRAINER, true, p => {
-      p.generateAndPopulateMoveset();
-      p.pokeball = PokeballType.MASTER_BALL;
-    }))
-    .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.SALAMENCE, Species.HYDREIGON, Species.ARCHALUDON ]))
-    .setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.LAPRAS ], TrainerSlot.TRAINER, true, p => {
-      p.formIndex = 1; // G-Max Lapras
-      p.generateAndPopulateMoveset();
-      p.generateName();
-    }))
-    .setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.HAXORUS ], TrainerSlot.TRAINER, true, p => {
-      p.abilityIndex = 1; // Mold Breaker
-      p.generateAndPopulateMoveset();
-      p.gender = Gender.FEMALE;
-      p.setBoss(true, 2);
-    }))
-    .setGenModifiersFunc(party => {
-      const teraPokemon = party[3];
-      return [ modifierTypes.TERA_SHARD().generateType([], [ Type.DRAGON ])!.withIdFromFunc(modifierTypes.TERA_SHARD).newModifier(teraPokemon) as PersistentModifier ];
-    }),
-  [TrainerType.DIANTHA]: new TrainerConfig(++t).initForChampion(false).setMixedBattleBgm("battle_kalos_champion")
-    .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.HAWLUCHA ], TrainerSlot.TRAINER, true, p => {
-      p.generateAndPopulateMoveset();
-    }))
-    .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.TREVENANT, Species.GOURGEIST ]))
-    .setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.XERNEAS ], TrainerSlot.TRAINER, true, p => {
-      p.generateAndPopulateMoveset();
-      p.pokeball = PokeballType.MASTER_BALL;
-    }))
-    .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.TYRANTRUM, Species.AURORUS ], TrainerSlot.TRAINER, true, p => {
-      p.generateAndPopulateMoveset();
-      p.abilityIndex = 2; // Rock Head Tyrantrum, Snow Warning Aurorus
-    }))
-    .setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.GOODRA ], TrainerSlot.TRAINER, true, p => {
-      p.generateAndPopulateMoveset();
-      p.setBoss(true, 2);
-    }))
-    .setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.GARDEVOIR ], TrainerSlot.TRAINER, true, p => {
-      p.formIndex = 1; // Mega Gardevoir
-      p.generateAndPopulateMoveset();
-      p.generateName();
-      p.gender = Gender.FEMALE;
-    }))
-    .setGenModifiersFunc(party => {
-      const teraPokemon = party[3];
-      return [ modifierTypes.TERA_SHARD().generateType([], [ teraPokemon.species.type2 ])!.withIdFromFunc(modifierTypes.TERA_SHARD).newModifier(teraPokemon) as PersistentModifier ];
-    }),
-  [TrainerType.KUKUI]: new TrainerConfig(++t).initForChampion(true).setMixedBattleBgm("battle_champion_kukui")
-    .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.LYCANROC ], TrainerSlot.TRAINER, true, p => {
-      p.generateAndPopulateMoveset();
-      p.formIndex = 2; // Dusk Lycanroc
-    }))
-    .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.MAGNEZONE, Species.ALOLA_NINETALES ]))
-    .setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.TORNADUS, Species.THUNDURUS, Species.LANDORUS ], TrainerSlot.TRAINER, true, p => {
-      p.formIndex = 1; // Therian Forms
-      p.generateAndPopulateMoveset();
-      p.pokeball = PokeballType.ULTRA_BALL;
-    }))
-    .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.TAPU_KOKO, Species.TAPU_FINI ], TrainerSlot.TRAINER, true, p => {
-      p.generateAndPopulateMoveset();
-      p.setBoss(true, 2);
-      p.pokeball = PokeballType.ULTRA_BALL;
-    }))
-    .setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.SNORLAX ], TrainerSlot.TRAINER, true, p => {
-      p.generateAndPopulateMoveset();
-      p.formIndex = 1; // G-Max Snorlax
-    }))
-    .setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.INCINEROAR, Species.HISUI_DECIDUEYE ], TrainerSlot.TRAINER, true, p => {
-      p.generateAndPopulateMoveset();
-      p.gender = Gender.MALE;
-    }))
-    .setGenModifiersFunc(party => {
-      const teraPokemon = party[5];
-      return [ modifierTypes.TERA_SHARD().generateType([], [ teraPokemon.species.type2 ])!.withIdFromFunc(modifierTypes.TERA_SHARD).newModifier(teraPokemon) as PersistentModifier ];
-    }),
-  [TrainerType.HAU]: new TrainerConfig(++t).initForChampion(true).setMixedBattleBgm("battle_alola_champion")
-    .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.ALOLA_RAICHU ], TrainerSlot.TRAINER, true, p => {
-      p.generateAndPopulateMoveset();
-    }))
-    .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.NOIVERN ]))
-    .setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.SOLGALEO ], TrainerSlot.TRAINER, true, p => {
-      p.generateAndPopulateMoveset();
-      p.pokeball = PokeballType.MASTER_BALL;
-    }))
-    .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.TAPU_LELE, Species.TAPU_BULU ], TrainerSlot.TRAINER, true, p => {
-      p.generateAndPopulateMoveset();
-      p.pokeball = PokeballType.ULTRA_BALL;
-    }))
-    .setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.ZYGARDE ], TrainerSlot.TRAINER, true, p => {
-      p.formIndex = 1; // Zygarde 10% forme, Aura Break
-      p.generateAndPopulateMoveset();
-      p.pokeball = PokeballType.ROGUE_BALL;
-    }))
-    .setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.DECIDUEYE, Species.PRIMARINA ], TrainerSlot.TRAINER, true, p => {
-      p.generateAndPopulateMoveset();
-      p.setBoss(true, 2);
-      p.gender = p.species.speciesId === Species.PRIMARINA ? Gender.FEMALE : Gender.MALE;
-    }))
-    .setGenModifiersFunc(party => {
-      const teraPokemon = party[3];
-      return [ modifierTypes.TERA_SHARD().generateType([], [ teraPokemon.species.type1 ])!.withIdFromFunc(modifierTypes.TERA_SHARD).newModifier(teraPokemon) as PersistentModifier ];
-    }),
-  [TrainerType.LEON]: new TrainerConfig(++t).initForChampion(true).setMixedBattleBgm("battle_galar_champion")
-    .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.AEGISLASH ], TrainerSlot.TRAINER, true, p => {
-      p.generateAndPopulateMoveset();
-    }))
-    .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.RHYPERIOR, Species.SEISMITOAD, Species.MR_RIME ]))
-    .setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.ZACIAN ], TrainerSlot.TRAINER, true, p => {
-      p.generateAndPopulateMoveset();
-      p.pokeball = PokeballType.MASTER_BALL;
-    }))
-    .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.DRAGAPULT ]))
-    .setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.RILLABOOM, Species.CINDERACE, Species.INTELEON ], TrainerSlot.TRAINER, true, p => {
-      p.generateAndPopulateMoveset();
-      p.setBoss(true, 2);
-    }))
-    .setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.CHARIZARD ], TrainerSlot.TRAINER, true, p => {
-      p.formIndex = 3; // G-Max Charizard
-      p.generateAndPopulateMoveset();
-      p.generateName();
-      p.gender = Gender.MALE;
-    }))
-    .setGenModifiersFunc(party => {
-      const teraPokemon = party[3];
-      return [ modifierTypes.TERA_SHARD().generateType([], [ teraPokemon.species.type1 ])!.withIdFromFunc(modifierTypes.TERA_SHARD).newModifier(teraPokemon) as PersistentModifier ];
-    }),
-  [TrainerType.MUSTARD]: new TrainerConfig(++t).initForChampion(true).setMixedBattleBgm("battle_mustard")
-    .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.CORVIKNIGHT ], TrainerSlot.TRAINER, true, p => {
-      p.generateAndPopulateMoveset();
-      p.pokeball = PokeballType.ULTRA_BALL;
-    }))
-    .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.KOMMO_O ], TrainerSlot.TRAINER, true, p => {
-      p.generateAndPopulateMoveset();
-      p.pokeball = PokeballType.ULTRA_BALL;
-    }))
-    .setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.GALAR_SLOWBRO, Species.GALAR_SLOWKING ], TrainerSlot.TRAINER, true, p => {
-      p.generateAndPopulateMoveset();
-      p.pokeball = PokeballType.ULTRA_BALL;
-    }))
-    .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.GALAR_DARMANITAN ], TrainerSlot.TRAINER, true, p => {
-      p.generateAndPopulateMoveset();
-      p.pokeball = PokeballType.ULTRA_BALL;
-    }))
-    .setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.BLASTOISE, Species.VENUSAUR ], TrainerSlot.TRAINER, true, p => {
-      p.generateAndPopulateMoveset();
-      p.setBoss(true, 2);
-      p.pokeball = PokeballType.ULTRA_BALL;
-    }))
-    .setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.URSHIFU ], TrainerSlot.TRAINER, true, p => {
-      p.formIndex = Utils.randSeedInt(2, 2); // Random G-Max Urshifu
-      p.generateAndPopulateMoveset();
-      p.generateName();
-      p.gender = Gender.MALE;
-      p.pokeball = PokeballType.ULTRA_BALL;
-    }))
-    .setGenModifiersFunc(party => {
-      const teraPokemon = party[2];
-      return [ modifierTypes.TERA_SHARD().generateType([], [ teraPokemon.species.type2 ])!.withIdFromFunc(modifierTypes.TERA_SHARD).newModifier(teraPokemon) as PersistentModifier ];
-    }),
-  [TrainerType.GEETA]: new TrainerConfig(++t).initForChampion(false).setMixedBattleBgm("battle_champion_geeta")
-    .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.GLIMMORA ], TrainerSlot.TRAINER, true, p => {
-      p.generateAndPopulateMoveset();
-      p.gender = Gender.MALE;
-      p.setBoss(true, 2);
-    }))
-    .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.ESPATHRA, Species.VELUZA ]))
-    .setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.MIRAIDON ], TrainerSlot.TRAINER, true, p => {
-      p.generateAndPopulateMoveset();
-      p.pokeball = PokeballType.MASTER_BALL;
-    }))
-    .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.BAXCALIBUR ]))
-    .setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.CHESNAUGHT, Species.DELPHOX, Species.GRENINJA ]))
-    .setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.KINGAMBIT ], TrainerSlot.TRAINER, true, p => {
-      p.generateAndPopulateMoveset();
-      p.abilityIndex = 1; // Supreme Overlord
-    }))
-    .setGenModifiersFunc(party => {
-      const teraPokemon = party[5];
-      return [ modifierTypes.TERA_SHARD().generateType([], [ Type.FLYING ])!.withIdFromFunc(modifierTypes.TERA_SHARD).newModifier(teraPokemon) as PersistentModifier ];
-    }),
-  [TrainerType.NEMONA]: new TrainerConfig(++t).initForChampion(false).setMixedBattleBgm("battle_champion_nemona")
-    .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.LYCANROC ], TrainerSlot.TRAINER, true, p => {
-      p.formIndex = 0; // Midday form
-      p.generateAndPopulateMoveset();
-    }))
-    .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.PAWMOT ]))
-    .setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.KORAIDON ], TrainerSlot.TRAINER, true, p => {
-      p.generateAndPopulateMoveset();
-      p.pokeball = PokeballType.MASTER_BALL;
-    }))
-    .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.GHOLDENGO ]))
-    .setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.ARMAROUGE, Species.CERULEDGE ]))
-    .setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.MEOWSCARADA, Species.SKELEDIRGE, Species.QUAQUAVAL ], TrainerSlot.TRAINER, true, p => {
-      p.generateAndPopulateMoveset();
-      p.gender = Gender.MALE;
-      p.setBoss(true, 2);
-    }))
-    .setGenModifiersFunc(party => {
-      const teraPokemon = party[4];
-      return [ modifierTypes.TERA_SHARD().generateType([], [ teraPokemon.species.type2 ])!.withIdFromFunc(modifierTypes.TERA_SHARD).newModifier(teraPokemon) as PersistentModifier ];
-    }),
-  [TrainerType.KIERAN]: new TrainerConfig(++t).initForChampion(true).setMixedBattleBgm("battle_champion_kieran")
-    .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.POLIWRATH, Species.POLITOED ], TrainerSlot.TRAINER, true, p => {
-      p.generateAndPopulateMoveset();
-    }))
-    .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.INCINEROAR, Species.GRIMMSNARL ], TrainerSlot.TRAINER, true, p => {
-      p.generateAndPopulateMoveset();
-      if (p.species.speciesId === Species.INCINEROAR) {
-        p.abilityIndex = 2; // Intimidate
-      } else if (p.species.speciesId === Species.GRIMMSNARL) {
-        p.abilityIndex = 0; // Prankster
-      }
-    }))
-    .setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.TERAPAGOS ], TrainerSlot.TRAINER, true, p => {
-      p.generateAndPopulateMoveset();
-      p.pokeball = PokeballType.MASTER_BALL;
-    }))
-    .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.URSALUNA, Species.BLOODMOON_URSALUNA ], TrainerSlot.TRAINER, true, p => {
-      p.generateAndPopulateMoveset();
-      p.pokeball = PokeballType.ULTRA_BALL;
-    }))
-    .setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.OGERPON ], TrainerSlot.TRAINER, true, p => {
-      p.formIndex = Utils.randSeedInt(4, 4); // Random Ogerpon Tera Mask
-      p.generateAndPopulateMoveset();
-      p.pokeball = PokeballType.ULTRA_BALL;
-      if (!p.moveset.some(move => !Utils.isNullOrUndefined(move) && move.moveId === Moves.IVY_CUDGEL)) { // Check if Ivy Cudgel is in the moveset, if not, replace the first move with Ivy Cudgel.
-        p.moveset[0] = new PokemonMove(Moves.IVY_CUDGEL);
-      }
-    }))
-    .setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.HYDRAPPLE ], TrainerSlot.TRAINER, true, p => {
-      p.generateAndPopulateMoveset();
-      p.gender = Gender.MALE;
-      p.setBoss(true, 2);
-    }))
-    .setGenModifiersFunc(party => {
-      const starter = party[4];
-      let teraShardType: Type;
-      const pokemonType2 = starter.species.forms[starter.formIndex].type2;
-      if (starter.formIndex === 4 || Utils.isNullOrUndefined(pokemonType2)) {
-        teraShardType = starter.species.type1;
-      } else {
-        teraShardType = pokemonType2;
-      }
-      return [ modifierTypes.TERA_SHARD().generateType([], [ teraShardType ])!.withIdFromFunc(modifierTypes.TERA_SHARD).newModifier(starter) as PersistentModifier ];
-    }),
-
-  [TrainerType.RIVAL]: new TrainerConfig((t = TrainerType.RIVAL)).setName("Finn").setHasGenders("Ivy").setHasCharSprite().setTitle("Rival").setStaticParty().setEncounterBgm(TrainerType.RIVAL).setBattleBgm("battle_rival").setMixedBattleBgm("battle_rival").setPartyTemplates(trainerPartyTemplates.RIVAL)
-    .setModifierRewardFuncs(() => modifierTypes.SUPER_EXP_CHARM, () => modifierTypes.EXP_SHARE)
-    .setEventModifierRewardFuncs(() => modifierTypes.SHINY_CHARM, () => modifierTypes.ABILITY_CHARM, () => modifierTypes.CATCHING_CHARM)
-    .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.BULBASAUR, Species.CHARMANDER, Species.SQUIRTLE, Species.CHIKORITA, Species.CYNDAQUIL, Species.TOTODILE, Species.TREECKO, Species.TORCHIC, Species.MUDKIP, Species.TURTWIG, Species.CHIMCHAR, Species.PIPLUP, Species.SNIVY, Species.TEPIG, Species.OSHAWOTT, Species.CHESPIN, Species.FENNEKIN, Species.FROAKIE, Species.ROWLET, Species.LITTEN, Species.POPPLIO, Species.GROOKEY, Species.SCORBUNNY, Species.SOBBLE, Species.SPRIGATITO, Species.FUECOCO, Species.QUAXLY ], TrainerSlot.TRAINER, true,
-      (p => p.abilityIndex = 0)))
-    .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.PIDGEY, Species.HOOTHOOT, Species.TAILLOW, Species.STARLY, Species.PIDOVE, Species.FLETCHLING, Species.PIKIPEK, Species.ROOKIDEE, Species.WATTREL ], TrainerSlot.TRAINER, true)),
-  [TrainerType.RIVAL_2]: new TrainerConfig(++t).setName("Finn").setHasGenders("Ivy").setHasCharSprite().setTitle("Rival").setStaticParty().setMoneyMultiplier(1.25).setEncounterBgm(TrainerType.RIVAL).setBattleBgm("battle_rival").setMixedBattleBgm("battle_rival").setPartyTemplates(trainerPartyTemplates.RIVAL_2)
-    .setModifierRewardFuncs(() => modifierTypes.EXP_SHARE)
-    .setEventModifierRewardFuncs(() => modifierTypes.SHINY_CHARM)
-    .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.IVYSAUR, Species.CHARMELEON, Species.WARTORTLE, Species.BAYLEEF, Species.QUILAVA, Species.CROCONAW, Species.GROVYLE, Species.COMBUSKEN, Species.MARSHTOMP, Species.GROTLE, Species.MONFERNO, Species.PRINPLUP, Species.SERVINE, Species.PIGNITE, Species.DEWOTT, Species.QUILLADIN, Species.BRAIXEN, Species.FROGADIER, Species.DARTRIX, Species.TORRACAT, Species.BRIONNE, Species.THWACKEY, Species.RABOOT, Species.DRIZZILE, Species.FLORAGATO, Species.CROCALOR, Species.QUAXWELL ], TrainerSlot.TRAINER, true,
-      (p => p.abilityIndex = 0)))
-    .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.PIDGEOTTO, Species.HOOTHOOT, Species.TAILLOW, Species.STARAVIA, Species.TRANQUILL, Species.FLETCHINDER, Species.TRUMBEAK, Species.CORVISQUIRE, Species.WATTREL ], TrainerSlot.TRAINER, true))
-    .setPartyMemberFunc(2, getSpeciesFilterRandomPartyMemberFunc((species: PokemonSpecies) => !pokemonEvolutions.hasOwnProperty(species.speciesId) && !pokemonPrevolutions.hasOwnProperty(species.speciesId) && species.baseTotal >= 450)),
-  [TrainerType.RIVAL_3]: new TrainerConfig(++t).setName("Finn").setHasGenders("Ivy").setHasCharSprite().setTitle("Rival").setStaticParty().setMoneyMultiplier(1.5).setEncounterBgm(TrainerType.RIVAL).setBattleBgm("battle_rival").setMixedBattleBgm("battle_rival").setPartyTemplates(trainerPartyTemplates.RIVAL_3)
-    .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.VENUSAUR, Species.CHARIZARD, Species.BLASTOISE, Species.MEGANIUM, Species.TYPHLOSION, Species.FERALIGATR, Species.SCEPTILE, Species.BLAZIKEN, Species.SWAMPERT, Species.TORTERRA, Species.INFERNAPE, Species.EMPOLEON, Species.SERPERIOR, Species.EMBOAR, Species.SAMUROTT, Species.CHESNAUGHT, Species.DELPHOX, Species.GRENINJA, Species.DECIDUEYE, Species.INCINEROAR, Species.PRIMARINA, Species.RILLABOOM, Species.CINDERACE, Species.INTELEON, Species.MEOWSCARADA, Species.SKELEDIRGE, Species.QUAQUAVAL ], TrainerSlot.TRAINER, true,
-      (p => p.abilityIndex = 0)))
-    .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.PIDGEOT, Species.NOCTOWL, Species.SWELLOW, Species.STARAPTOR, Species.UNFEZANT, Species.TALONFLAME, Species.TOUCANNON, Species.CORVIKNIGHT, Species.KILOWATTREL ], TrainerSlot.TRAINER, true))
-    .setPartyMemberFunc(2, getSpeciesFilterRandomPartyMemberFunc((species: PokemonSpecies) => !pokemonEvolutions.hasOwnProperty(species.speciesId) && !pokemonPrevolutions.hasOwnProperty(species.speciesId) && species.baseTotal >= 450))
-    .setSpeciesFilter(species => species.baseTotal >= 540),
-  [TrainerType.RIVAL_4]: new TrainerConfig(++t).setName("Finn").setHasGenders("Ivy").setHasCharSprite().setTitle("Rival").setBoss().setStaticParty().setMoneyMultiplier(1.75).setEncounterBgm(TrainerType.RIVAL).setBattleBgm("battle_rival_2").setMixedBattleBgm("battle_rival_2").setPartyTemplates(trainerPartyTemplates.RIVAL_4)
-    .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.VENUSAUR, Species.CHARIZARD, Species.BLASTOISE, Species.MEGANIUM, Species.TYPHLOSION, Species.FERALIGATR, Species.SCEPTILE, Species.BLAZIKEN, Species.SWAMPERT, Species.TORTERRA, Species.INFERNAPE, Species.EMPOLEON, Species.SERPERIOR, Species.EMBOAR, Species.SAMUROTT, Species.CHESNAUGHT, Species.DELPHOX, Species.GRENINJA, Species.DECIDUEYE, Species.INCINEROAR, Species.PRIMARINA, Species.RILLABOOM, Species.CINDERACE, Species.INTELEON, Species.MEOWSCARADA, Species.SKELEDIRGE, Species.QUAQUAVAL ], TrainerSlot.TRAINER, true,
-      (p => p.abilityIndex = 0)))
-    .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.PIDGEOT, Species.NOCTOWL, Species.SWELLOW, Species.STARAPTOR, Species.UNFEZANT, Species.TALONFLAME, Species.TOUCANNON, Species.CORVIKNIGHT, Species.KILOWATTREL ], TrainerSlot.TRAINER, true))
-    .setPartyMemberFunc(2, getSpeciesFilterRandomPartyMemberFunc((species: PokemonSpecies) => !pokemonEvolutions.hasOwnProperty(species.speciesId) && !pokemonPrevolutions.hasOwnProperty(species.speciesId) && species.baseTotal >= 450))
-    .setSpeciesFilter(species => species.baseTotal >= 540)
-    .setGenModifiersFunc(party => {
-      const starter = party[0];
-      return [ modifierTypes.TERA_SHARD().generateType([], [ starter.species.type1 ])!.withIdFromFunc(modifierTypes.TERA_SHARD).newModifier(starter) as PersistentModifier ]; // TODO: is the bang correct?
-    }),
-  [TrainerType.RIVAL_5]: new TrainerConfig(++t).setName("Finn").setHasGenders("Ivy").setHasCharSprite().setTitle("Rival").setBoss().setStaticParty().setMoneyMultiplier(2.25).setEncounterBgm(TrainerType.RIVAL).setBattleBgm("battle_rival_3").setMixedBattleBgm("battle_rival_3").setPartyTemplates(trainerPartyTemplates.RIVAL_5)
-    .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.VENUSAUR, Species.CHARIZARD, Species.BLASTOISE, Species.MEGANIUM, Species.TYPHLOSION, Species.FERALIGATR, Species.SCEPTILE, Species.BLAZIKEN, Species.SWAMPERT, Species.TORTERRA, Species.INFERNAPE, Species.EMPOLEON, Species.SERPERIOR, Species.EMBOAR, Species.SAMUROTT, Species.CHESNAUGHT, Species.DELPHOX, Species.GRENINJA, Species.DECIDUEYE, Species.INCINEROAR, Species.PRIMARINA, Species.RILLABOOM, Species.CINDERACE, Species.INTELEON, Species.MEOWSCARADA, Species.SKELEDIRGE, Species.QUAQUAVAL ], TrainerSlot.TRAINER, true,
-      p => {
-        p.setBoss(true, 2);
-        p.abilityIndex = 0;
-      }))
-    .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.PIDGEOT, Species.NOCTOWL, Species.SWELLOW, Species.STARAPTOR, Species.UNFEZANT, Species.TALONFLAME, Species.TOUCANNON, Species.CORVIKNIGHT, Species.KILOWATTREL ], TrainerSlot.TRAINER, true))
-    .setPartyMemberFunc(2, getSpeciesFilterRandomPartyMemberFunc((species: PokemonSpecies) => !pokemonEvolutions.hasOwnProperty(species.speciesId) && !pokemonPrevolutions.hasOwnProperty(species.speciesId) && species.baseTotal >= 450))
-    .setSpeciesFilter(species => species.baseTotal >= 540)
-    .setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.RAYQUAZA ], TrainerSlot.TRAINER, true, p => {
-      p.setBoss(true, 3);
-      p.pokeball = PokeballType.MASTER_BALL;
-      p.shiny = true;
-      p.variant = 1;
-    }))
-    .setGenModifiersFunc(party => {
-      const starter = party[0];
-      return [ modifierTypes.TERA_SHARD().generateType([], [ starter.species.type1 ])!.withIdFromFunc(modifierTypes.TERA_SHARD).newModifier(starter) as PersistentModifier ]; //TODO: is the bang correct?
-    }),
-  [TrainerType.RIVAL_6]: new TrainerConfig(++t).setName("Finn").setHasGenders("Ivy").setHasCharSprite().setTitle("Rival").setBoss().setStaticParty().setMoneyMultiplier(3).setEncounterBgm("final").setBattleBgm("battle_rival_3").setMixedBattleBgm("battle_rival_3").setPartyTemplates(trainerPartyTemplates.RIVAL_6)
-    .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.VENUSAUR, Species.CHARIZARD, Species.BLASTOISE, Species.MEGANIUM, Species.TYPHLOSION, Species.FERALIGATR, Species.SCEPTILE, Species.BLAZIKEN, Species.SWAMPERT, Species.TORTERRA, Species.INFERNAPE, Species.EMPOLEON, Species.SERPERIOR, Species.EMBOAR, Species.SAMUROTT, Species.CHESNAUGHT, Species.DELPHOX, Species.GRENINJA, Species.DECIDUEYE, Species.INCINEROAR, Species.PRIMARINA, Species.RILLABOOM, Species.CINDERACE, Species.INTELEON, Species.MEOWSCARADA, Species.SKELEDIRGE, Species.QUAQUAVAL ], TrainerSlot.TRAINER, true,
-      p => {
-        p.setBoss(true, 3);
-        p.abilityIndex = 0;
-        p.generateAndPopulateMoveset();
-      }))
-    .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.PIDGEOT, Species.NOCTOWL, Species.SWELLOW, Species.STARAPTOR, Species.UNFEZANT, Species.TALONFLAME, Species.TOUCANNON, Species.CORVIKNIGHT, Species.KILOWATTREL ], TrainerSlot.TRAINER, true,
-      p => {
-        p.setBoss(true, 2);
-        p.generateAndPopulateMoveset();
-      }))
-    .setPartyMemberFunc(2, getSpeciesFilterRandomPartyMemberFunc((species: PokemonSpecies) => !pokemonEvolutions.hasOwnProperty(species.speciesId) && !pokemonPrevolutions.hasOwnProperty(species.speciesId) && species.baseTotal >= 450))
-    .setSpeciesFilter(species => species.baseTotal >= 540)
-    .setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.RAYQUAZA ], TrainerSlot.TRAINER, true, p => {
-      p.setBoss();
-      p.generateAndPopulateMoveset();
-      p.pokeball = PokeballType.MASTER_BALL;
-      p.shiny = true;
-      p.variant = 1;
-      p.formIndex = 1; // Mega Rayquaza
-      p.generateName();
-    }))
-    .setGenModifiersFunc(party => {
-      const starter = party[0];
-      return [ modifierTypes.TERA_SHARD().generateType([], [ starter.species.type1 ])!.withIdFromFunc(modifierTypes.TERA_SHARD).newModifier(starter) as PersistentModifier ]; // TODO: is the bang correct?
-    }),
-
-  [TrainerType.ROCKET_BOSS_GIOVANNI_1]: new TrainerConfig(t = TrainerType.ROCKET_BOSS_GIOVANNI_1).setName("Giovanni").initForEvilTeamLeader("Rocket Boss", []).setMixedBattleBgm("battle_rocket_boss").setVictoryBgm("victory_team_plasma")
-    .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.PERSIAN ], TrainerSlot.TRAINER, true, p => {
-      p.generateAndPopulateMoveset();
-      p.gender = Gender.MALE;
-    }))
-    .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.DUGTRIO, Species.ALOLA_DUGTRIO ]))
-    .setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.HONCHKROW ]))
-    .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.NIDOQUEEN, Species.NIDOKING ]))
-    .setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.RHYPERIOR ]))
-    .setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.KANGASKHAN ], TrainerSlot.TRAINER, true, p => {
-      p.setBoss(true, 2);
-      p.generateAndPopulateMoveset();
-      p.pokeball = PokeballType.ULTRA_BALL;
-      p.formIndex = 1; // Mega Kangaskhan
-      p.generateName();
-    })),
-  [TrainerType.ROCKET_BOSS_GIOVANNI_2]: new TrainerConfig(++t).setName("Giovanni").initForEvilTeamLeader("Rocket Boss", [], true).setMixedBattleBgm("battle_rocket_boss").setVictoryBgm("victory_team_plasma")
-    .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.TYRANITAR, Species.IRON_THORNS ], TrainerSlot.TRAINER, true, p => {
-      p.setBoss(true, 2);
-      p.generateAndPopulateMoveset();
-      p.pokeball = PokeballType.ULTRA_BALL;
-    }))
-    .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.HIPPOWDON ]))
-    .setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.GARCHOMP, Species.EXCADRILL ]))
-    .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.GASTRODON, Species.SEISMITOAD ], TrainerSlot.TRAINER, true, p => {
-      if (p.species.speciesId === Species.GASTRODON) {
-        p.abilityIndex = 0; // Storm Drain
-      } else if (p.species.speciesId === Species.SEISMITOAD) {
-        p.abilityIndex = 2; // Water Absorb
-      }
-    }))
-    .setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.KANGASKHAN ], TrainerSlot.TRAINER, true, p => {
-      p.setBoss(true, 2);
-      p.generateAndPopulateMoveset();
-      p.pokeball = PokeballType.ULTRA_BALL;
-      p.formIndex = 1; // Mega Kangaskhan
-      p.generateName();
-    }))
-    .setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.MEWTWO ], TrainerSlot.TRAINER, true, p => {
-      p.setBoss(true, 2);
-      p.generateAndPopulateMoveset();
-      p.pokeball = PokeballType.MASTER_BALL;
-    })),
-  [TrainerType.MAXIE]: new TrainerConfig(++t).setName("Maxie").initForEvilTeamLeader("Magma Boss", []).setMixedBattleBgm("battle_aqua_magma_boss").setVictoryBgm("victory_team_plasma")
-    .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.SOLROCK ]))
-    .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.TALONFLAME ]))
-    .setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.WEEZING, Species.GALAR_WEEZING ]))
-    .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.TORKOAL ], TrainerSlot.TRAINER, true, p => {
-      p.generateAndPopulateMoveset();
-      p.abilityIndex = 1; // Drought
-    }))
-    .setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.DONPHAN ]))
-    .setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.CAMERUPT ], TrainerSlot.TRAINER, true, p => {
-      p.setBoss(true, 2);
-      p.generateAndPopulateMoveset();
-      p.pokeball = PokeballType.ULTRA_BALL;
-      p.formIndex = 1; // Mega Camerupt
-      p.generateName();
-      p.gender = Gender.MALE;
-    })),
-  [TrainerType.MAXIE_2]: new TrainerConfig(++t).setName("Maxie").initForEvilTeamLeader("Magma Boss", [], true).setMixedBattleBgm("battle_aqua_magma_boss").setVictoryBgm("victory_team_plasma")
-    .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.TYPHLOSION, Species.SOLROCK ], TrainerSlot.TRAINER, true, p => {
-      p.setBoss(true, 2);
-      p.generateAndPopulateMoveset();
-      p.pokeball = PokeballType.ULTRA_BALL;
-    }))
-    .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.NINETALES, Species.TORKOAL ], TrainerSlot.TRAINER, true, p => {
-      p.generateAndPopulateMoveset();
-      if (p.species.speciesId === Species.NINETALES) {
-        p.abilityIndex = 2; // Drought
-      } else if (p.species.speciesId === Species.TORKOAL) {
-        p.abilityIndex = 1; // Drought
-      }
-    }))
-    .setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.SCOVILLAIN ], TrainerSlot.TRAINER, true, p => {
-      p.generateAndPopulateMoveset();
-      p.abilityIndex = 0; // Chlorophyll
-    }))
-    .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.GREAT_TUSK ]))
-    .setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.CAMERUPT ], TrainerSlot.TRAINER, true, p => {
-      p.setBoss(true, 2);
-      p.generateAndPopulateMoveset();
-      p.pokeball = PokeballType.ULTRA_BALL;
-      p.formIndex = 1; // Mega Camerupt
-      p.generateName();
-      p.gender = Gender.MALE;
-    }))
-    .setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.GROUDON ], TrainerSlot.TRAINER, true, p => {
-      p.setBoss(true, 2);
-      p.generateAndPopulateMoveset();
-      p.pokeball = PokeballType.MASTER_BALL;
-    })),
-  [TrainerType.ARCHIE]: new TrainerConfig(++t).setName("Archie").initForEvilTeamLeader("Aqua Boss", []).setMixedBattleBgm("battle_aqua_magma_boss").setVictoryBgm("victory_team_plasma")
-    .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.LUDICOLO ]))
-    .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.PELIPPER ], TrainerSlot.TRAINER, true, p => {
-      p.generateAndPopulateMoveset();
-      p.abilityIndex = 1; // Drizzle
-    }))
-    .setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.MUK, Species.ALOLA_MUK ]))
-    .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.WAILORD ]))
-    .setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.QWILFISH ], TrainerSlot.TRAINER, true, p => {
-      p.generateAndPopulateMoveset();
-      p.abilityIndex = 1; // Swift Swim
-    }))
-    .setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.SHARPEDO ], TrainerSlot.TRAINER, true, p => {
-      p.setBoss(true, 2);
-      p.generateAndPopulateMoveset();
-      p.pokeball = PokeballType.ULTRA_BALL;
-      p.formIndex = 1; // Mega Sharpedo
-      p.generateName();
-      p.gender = Gender.MALE;
-    })),
-  [TrainerType.ARCHIE_2]: new TrainerConfig(++t).setName("Archie").initForEvilTeamLeader("Aqua Boss", [], true).setMixedBattleBgm("battle_aqua_magma_boss").setVictoryBgm("victory_team_plasma")
-    .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.LUDICOLO, Species.EMPOLEON ], TrainerSlot.TRAINER, true, p => {
-      p.setBoss(true, 2);
-      p.generateAndPopulateMoveset();
-      p.pokeball = PokeballType.ULTRA_BALL;
-    }))
-    .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.POLITOED, Species.PELIPPER ], TrainerSlot.TRAINER, true, p => {
-      p.generateAndPopulateMoveset();
-      if (p.species.speciesId === Species.POLITOED) {
-        p.abilityIndex = 2; // Drizzle
-      } else if (p.species.speciesId === Species.PELIPPER) {
-        p.abilityIndex = 1; // Drizzle
-      }
-    }))
-    .setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.DHELMISE ]))
-    .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.OVERQWIL ], TrainerSlot.TRAINER, true, p => {
-      p.generateAndPopulateMoveset();
-      p.abilityIndex = 1; // Swift Swim
-    }))
-    .setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.SHARPEDO ], TrainerSlot.TRAINER, true, p => {
-      p.setBoss(true, 2);
-      p.generateAndPopulateMoveset();
-      p.pokeball = PokeballType.ULTRA_BALL;
-      p.formIndex = 1; // Mega Sharpedo
-      p.generateName();
-      p.gender = Gender.MALE;
-    }))
-    .setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.KYOGRE ], TrainerSlot.TRAINER, true, p => {
-      p.setBoss(true, 2);
-      p.generateAndPopulateMoveset();
-      p.pokeball = PokeballType.MASTER_BALL;
-    })),
-  [TrainerType.CYRUS]: new TrainerConfig(++t).setName("Cyrus").initForEvilTeamLeader("Galactic Boss", []).setMixedBattleBgm("battle_galactic_boss").setVictoryBgm("victory_team_plasma")
-    .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.GYARADOS ]))
-    .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.HONCHKROW, Species.HISUI_BRAVIARY ]))
-    .setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.MAGNEZONE ]))
-    .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.UXIE, Species.MESPRIT, Species.AZELF ]))
-    .setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.HOUNDOOM ], TrainerSlot.TRAINER, true, p => {
-      p.generateAndPopulateMoveset();
-      p.pokeball = PokeballType.ULTRA_BALL;
-      p.formIndex = 1; // Mega Houndoom
-      p.generateName();
-    }))
-    .setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.WEAVILE ], TrainerSlot.TRAINER, true, p => {
-      p.setBoss(true, 2);
-      p.generateAndPopulateMoveset();
-      p.pokeball = PokeballType.ULTRA_BALL;
-      p.gender = Gender.MALE;
-    })),
-  [TrainerType.CYRUS_2]: new TrainerConfig(++t).setName("Cyrus").initForEvilTeamLeader("Galactic Boss", [], true).setMixedBattleBgm("battle_galactic_boss").setVictoryBgm("victory_team_plasma")
-    .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.CROBAT ], TrainerSlot.TRAINER, true, p => {
-      p.setBoss(true, 2);
-      p.generateAndPopulateMoveset();
-    }))
-    .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.MAGNEZONE ]))
-    .setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.UXIE, Species.MESPRIT, Species.AZELF ]))
-    .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.HOUNDOOM ], TrainerSlot.TRAINER, true, p => {
-      p.generateAndPopulateMoveset();
-      p.pokeball = PokeballType.ULTRA_BALL;
-      p.formIndex = 1; // Mega Houndoom
-      p.generateName();
-    }))
-    .setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.WEAVILE ], TrainerSlot.TRAINER, true, p => {
-      p.setBoss(true, 2);
-      p.generateAndPopulateMoveset();
-      p.pokeball = PokeballType.ULTRA_BALL;
-      p.gender = Gender.MALE;
-    }))
-    .setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.DIALGA, Species.PALKIA ], TrainerSlot.TRAINER, true, p => {
-      p.setBoss(true, 2);
-      p.generateAndPopulateMoveset();
-      p.pokeball = PokeballType.MASTER_BALL;
-    })),
-  [TrainerType.GHETSIS]: new TrainerConfig(++t).setName("Ghetsis").initForEvilTeamLeader("Plasma Boss", []).setMixedBattleBgm("battle_plasma_boss").setVictoryBgm("victory_team_plasma")
-    .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.COFAGRIGUS ]))
-    .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.SEISMITOAD ]))
-    .setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.GALVANTULA, Species.EELEKTROSS ]))
-    .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.DRAPION, Species.TOXICROAK ]))
-    .setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.KINGAMBIT ]))
-    .setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.HYDREIGON ], TrainerSlot.TRAINER, true, p => {
-      p.setBoss(true, 2);
-      p.generateAndPopulateMoveset();
-      p.pokeball = PokeballType.ULTRA_BALL;
-      p.gender = Gender.MALE;
-    })),
-  [TrainerType.GHETSIS_2]: new TrainerConfig(++t).setName("Ghetsis").initForEvilTeamLeader("Plasma Boss", [], true).setMixedBattleBgm("battle_plasma_boss").setVictoryBgm("victory_team_plasma")
-    .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.RUNERIGUS ], TrainerSlot.TRAINER, true, p => {
-      p.setBoss(true, 2);
-      p.generateAndPopulateMoveset();
-    }))
-    .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.JELLICENT, Species.BASCULEGION ], TrainerSlot.TRAINER, true, p => {
-      p.generateAndPopulateMoveset();
-      p.gender = Gender.MALE;
-      p.formIndex = 0;
-    }))
-    .setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.KINGAMBIT ]))
-    .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.VOLCARONA, Species.IRON_MOTH ]))
-    .setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.HYDREIGON, Species.IRON_JUGULIS ], TrainerSlot.TRAINER, true, p => {
-      p.setBoss(true, 2);
-      p.generateAndPopulateMoveset();
-      p.pokeball = PokeballType.ULTRA_BALL;
-      if (p.species.speciesId === Species.HYDREIGON) {
-        p.gender = Gender.MALE;
-      } else if (p.species.speciesId === Species.IRON_JUGULIS) {
-        p.gender = Gender.GENDERLESS;
-      }
-    }))
-    .setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.KYUREM ], TrainerSlot.TRAINER, true, p => {
-      p.setBoss(true, 2);
-      p.generateAndPopulateMoveset();
-      p.pokeball = PokeballType.MASTER_BALL;
-    })),
-  [TrainerType.LYSANDRE]: new TrainerConfig(++t).setName("Lysandre").initForEvilTeamLeader("Flare Boss", []).setMixedBattleBgm("battle_flare_boss").setVictoryBgm("victory_team_plasma")
-    .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.MIENSHAO ]))
-    .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.HONCHKROW, Species.TALONFLAME ]))
-    .setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.PYROAR ], TrainerSlot.TRAINER, true, p => {
-      p.generateAndPopulateMoveset();
-      p.gender = Gender.MALE;
-    }))
-    .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.DRAGALGE, Species.CLAWITZER ]))
-    .setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.GALLADE ], TrainerSlot.TRAINER, true, p => {
-      p.generateAndPopulateMoveset();
-      p.abilityIndex = 1; // Sharpness
-    }))
-    .setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.GYARADOS ], TrainerSlot.TRAINER, true, p => {
-      p.setBoss(true, 2);
-      p.generateAndPopulateMoveset();
-      p.pokeball = PokeballType.ULTRA_BALL;
-      p.formIndex = 1; // Mega Gyarados
-      p.generateName();
-      p.gender = Gender.MALE;
-    })),
-  [TrainerType.LYSANDRE_2]: new TrainerConfig(++t).setName("Lysandre").initForEvilTeamLeader("Flare Boss", [], true).setMixedBattleBgm("battle_flare_boss").setVictoryBgm("victory_team_plasma")
-    .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.PYROAR ], TrainerSlot.TRAINER, true, p => {
-      p.setBoss(true, 2);
-      p.generateAndPopulateMoveset();
-      p.gender = Gender.MALE;
-    }))
-    .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.DRAGALGE, Species.CLAWITZER ]))
-    .setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.AEGISLASH, Species.HISUI_GOODRA ]))
-    .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.IRON_VALIANT ], TrainerSlot.TRAINER, true, p => {
-      p.generateAndPopulateMoveset();
-      p.pokeball = PokeballType.ROGUE_BALL;
-    }))
-    .setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.GYARADOS ], TrainerSlot.TRAINER, true, p => {
-      p.setBoss(true, 2);
-      p.generateAndPopulateMoveset();
-      p.pokeball = PokeballType.ULTRA_BALL;
-      p.formIndex = 1; // Mega Gyardos
-      p.generateName();
-      p.gender = Gender.MALE;
-    }))
-    .setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.ZYGARDE ], TrainerSlot.TRAINER, true, p => {
-      p.setBoss(true, 2);
-      p.generateAndPopulateMoveset();
-      p.pokeball = PokeballType.MASTER_BALL;
-      p.formIndex = 0; // 50% Forme, Aura Break
-    })),
-  [TrainerType.LUSAMINE]: new TrainerConfig(++t).setName("Lusamine").initForEvilTeamLeader("Aether Boss", []).setMixedBattleBgm("battle_aether_boss").setVictoryBgm("victory_team_plasma")
-    .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.CLEFABLE ], TrainerSlot.TRAINER, true, p => {
-      p.generateAndPopulateMoveset();
-      p.gender = Gender.FEMALE;
-    }))
-    .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.LILLIGANT, Species.HISUI_LILLIGANT ]))
-    .setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.MILOTIC, Species.PRIMARINA ]))
-    .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.GALAR_SLOWBRO, Species.GALAR_SLOWKING ]))
-    .setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.BEWEAR ]))
-    .setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.NIHILEGO ], TrainerSlot.TRAINER, true, p => {
-      p.setBoss(true, 2);
-      p.generateAndPopulateMoveset();
-      p.pokeball = PokeballType.ROGUE_BALL;
-    })),
-  [TrainerType.LUSAMINE_2]: new TrainerConfig(++t).setName("Lusamine").initForEvilTeamLeader("Aether Boss", [], true).setMixedBattleBgm("battle_aether_boss").setVictoryBgm("victory_team_plasma")
-    .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.CLEFABLE ], TrainerSlot.TRAINER, true, p => {
-      p.setBoss(true, 2);
-      p.generateAndPopulateMoveset();
-      p.gender = Gender.FEMALE;
-    }))
-    .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.MILOTIC, Species.PRIMARINA ]))
-    .setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.SILVALLY ], TrainerSlot.TRAINER, true, p => {
-      p.formIndex = Utils.randSeedInt(18); // Random Silvally Form
-      p.generateAndPopulateMoveset();
-      p.pokeball = PokeballType.ROGUE_BALL;
-      if (!p.moveset.some(move => !Utils.isNullOrUndefined(move) && move.moveId === Moves.MULTI_ATTACK)) { // Check if Multi Attack is in the moveset, if not, replace the first move with Multi Attack.
-        p.moveset[0] = new PokemonMove(Moves.MULTI_ATTACK);
-      }
-    }))
-    .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.PHEROMOSA ], TrainerSlot.TRAINER, true, p => {
-      p.generateAndPopulateMoveset();
-      p.pokeball = PokeballType.ROGUE_BALL;
-    }))
-    .setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.NIHILEGO ], TrainerSlot.TRAINER, true, p => {
-      p.setBoss(true, 2);
-      p.generateAndPopulateMoveset();
-      p.pokeball = PokeballType.ROGUE_BALL;
-    }))
-    .setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.NECROZMA ], TrainerSlot.TRAINER, true, p => {
-      p.setBoss(true, 2);
-      p.formIndex = 2; // Dawn Wings
-      p.generateAndPopulateMoveset();
-      p.pokeball = PokeballType.MASTER_BALL;
-    })),
-  [TrainerType.GUZMA]: new TrainerConfig(++t).setName("Guzma").initForEvilTeamLeader("Skull Boss", []).setMixedBattleBgm("battle_skull_boss").setVictoryBgm("victory_team_plasma")
-    .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.YANMEGA, Species.LOKIX ], TrainerSlot.TRAINER, true, p => {
-      p.generateAndPopulateMoveset();
-      if (p.species.speciesId === Species.YANMEGA) {
-        p.abilityIndex = 1; // Tinted Lens
-      } else if (p.species.speciesId === Species.LOKIX) {
-        p.abilityIndex = 2; // Tinted Lens
-      }
-    }))
-    .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.HERACROSS ]))
-    .setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.SCIZOR, Species.KLEAVOR ], TrainerSlot.TRAINER, true, p => {
-      p.generateAndPopulateMoveset();
-      if (p.species.speciesId === Species.SCIZOR) {
-        p.abilityIndex = 1; // Technician
-      } else if (p.species.speciesId === Species.KLEAVOR) {
-        p.abilityIndex = 2; // Sharpness
-      }
-    }))
-    .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.GALVANTULA, Species.VIKAVOLT ]))
-    .setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.PINSIR ], TrainerSlot.TRAINER, true, p => {
-      p.generateAndPopulateMoveset();
-      p.formIndex = 1; // Mega Pinsir
-      p.pokeball = PokeballType.ULTRA_BALL;
-      p.generateName();
-    }))
-    .setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.GOLISOPOD ], TrainerSlot.TRAINER, true, p => {
-      p.setBoss(true, 2);
-      p.generateAndPopulateMoveset();
-      p.gender = Gender.MALE;
-    })),
-  [TrainerType.GUZMA_2]: new TrainerConfig(++t).setName("Guzma").initForEvilTeamLeader("Skull Boss", [], true).setMixedBattleBgm("battle_skull_boss").setVictoryBgm("victory_team_plasma")
-    .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.GOLISOPOD ], TrainerSlot.TRAINER, true, p => {
-      p.setBoss(true, 2);
-      p.generateAndPopulateMoveset();
-      p.abilityIndex = 2; // Anticipation
-      p.gender = Gender.MALE;
-    }))
-    .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.BUZZWOLE ], TrainerSlot.TRAINER, true, p => {
-      p.generateAndPopulateMoveset();
-      p.pokeball = PokeballType.ROGUE_BALL;
-    }))
-    .setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.CRAWDAUNT, Species.HISUI_SAMUROTT ], TrainerSlot.TRAINER, true, p => {
-      p.generateAndPopulateMoveset();
-      p.abilityIndex = 2; // Sharpness Hisui Samurott, Adaptability Crawdaunt
-    }))
-    .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.XURKITREE ], TrainerSlot.TRAINER, true, p => {
-      p.generateAndPopulateMoveset();
-      p.pokeball = PokeballType.ROGUE_BALL;
-    }))
-    .setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.GENESECT ], TrainerSlot.TRAINER, true, p => {
-      p.setBoss(true, 2);
-      p.generateAndPopulateMoveset();
-      p.pokeball = PokeballType.ULTRA_BALL;
-      p.formIndex = Utils.randSeedInt(4, 1); // Shock, Burn, Chill, or Douse Drive
-      if (!p.moveset.some(move => !Utils.isNullOrUndefined(move) && move.moveId === Moves.TECHNO_BLAST)) { // Check if Techno Blast is in the moveset, if not, replace the first move with Techno Blast.
-        p.moveset[0] = new PokemonMove(Moves.TECHNO_BLAST);
-      }
-    }))
-    .setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.PINSIR ], TrainerSlot.TRAINER, true, p => {
-      p.setBoss(true, 2);
-      p.formIndex = 1; // Mega Pinsir
-      p.generateAndPopulateMoveset();
-      p.generateName();
-      p.pokeball = PokeballType.ULTRA_BALL;
-    })),
-  [TrainerType.ROSE]: new TrainerConfig(++t).setName("Rose").initForEvilTeamLeader("Macro Boss", []).setMixedBattleBgm("battle_macro_boss").setVictoryBgm("victory_team_plasma")
-    .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.ARCHALUDON ]))
-    .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.ESCAVALIER, Species.FERROTHORN ]))
-    .setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.SIRFETCHD, Species.MR_RIME ]))
-    .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.CORVIKNIGHT ]))
-    .setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.KLINKLANG, Species.PERRSERKER ]))
-    .setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.COPPERAJAH ], TrainerSlot.TRAINER, true, p => {
-      p.setBoss(true, 2);
-      p.generateAndPopulateMoveset();
-      p.formIndex = 1; // G-Max Copperajah
-      p.generateName();
-      p.pokeball = PokeballType.ULTRA_BALL;
-      p.gender = Gender.FEMALE;
-    })),
-  [TrainerType.ROSE_2]: new TrainerConfig(++t).setName("Rose").initForEvilTeamLeader("Macro Boss", [], true).setMixedBattleBgm("battle_macro_boss").setVictoryBgm("victory_team_plasma")
-    .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.ARCHALUDON ], TrainerSlot.TRAINER, true, p => {
-      p.setBoss(true, 2);
-      p.generateAndPopulateMoveset();
-    }))
-    .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.AEGISLASH, Species.GHOLDENGO ]))
-    .setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.DRACOZOLT, Species.DRACOVISH ], TrainerSlot.TRAINER, true, p => {
-      p.generateAndPopulateMoveset();
-      p.abilityIndex = 1; //Strong Jaw Dracovish, Hustle Dracozolt
-    }))
-    .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.MELMETAL ]))
-    .setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.GALAR_ARTICUNO, Species.GALAR_ZAPDOS, Species.GALAR_MOLTRES ], TrainerSlot.TRAINER, true, p => {
-      p.setBoss(true, 2);
-      p.generateAndPopulateMoveset();
-      p.pokeball = PokeballType.ULTRA_BALL;
-    }))
-    .setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.COPPERAJAH ], TrainerSlot.TRAINER, true, p => {
-      p.setBoss(true, 2);
-      p.generateAndPopulateMoveset();
-      p.formIndex = 1; // G-Max Copperajah
-      p.generateName();
-      p.pokeball = PokeballType.ULTRA_BALL;
-      p.gender = Gender.FEMALE;
-    })),
-  [TrainerType.PENNY]: new TrainerConfig(++t).setName("Cassiopeia").initForEvilTeamLeader("Star Boss", []).setMixedBattleBgm("battle_star_boss").setVictoryBgm("victory_team_plasma")
-    .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.JOLTEON, Species.LEAFEON ]))
-    .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.VAPOREON, Species.UMBREON ]))
-    .setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.ESPEON, Species.GLACEON ]))
-    .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.FLAREON ]))
-    .setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.SYLVEON ], TrainerSlot.TRAINER, true, p => {
-      p.abilityIndex = 2; // Pixilate
-      p.generateAndPopulateMoveset();
-      p.gender = Gender.FEMALE;
-    }))
-    .setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.EEVEE ], TrainerSlot.TRAINER, true, p => {
-      p.setBoss(true, 2);
-      p.generateAndPopulateMoveset();
-      p.formIndex = 2; // G-Max Eevee
-      p.pokeball = PokeballType.ULTRA_BALL;
-      p.generateName();
-    }))
-    .setGenModifiersFunc(party => {
-      const teraPokemon = party[4];
-      return [ modifierTypes.TERA_SHARD().generateType([], [ teraPokemon.species.type1 ])!.withIdFromFunc(modifierTypes.TERA_SHARD).newModifier(teraPokemon) as PersistentModifier ]; //TODO: is the bang correct?
-    }),
-  [TrainerType.PENNY_2]: new TrainerConfig(++t).setName("Cassiopeia").initForEvilTeamLeader("Star Boss", [], true).setMixedBattleBgm("battle_star_boss").setVictoryBgm("victory_team_plasma")
-    .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.SYLVEON ], TrainerSlot.TRAINER, true, p => {
-      p.setBoss(true, 2);
-      p.abilityIndex = 2; // Pixilate
-      p.generateAndPopulateMoveset();
-      p.gender = Gender.FEMALE;
-    }))
-    .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.ROTOM ], TrainerSlot.TRAINER, true, p => {
-      p.generateAndPopulateMoveset();
-      p.formIndex = Utils.randSeedInt(5, 1); // Heat, Wash, Frost, Fan, or Mow
-    }))
-    .setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.RAIKOU, Species.ENTEI, Species.SUICUNE ]))
-    .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.REVAVROOM ], TrainerSlot.TRAINER, true, p => {
-      p.formIndex = Utils.randSeedInt(5, 1); // Random Starmobile form
-      p.generateAndPopulateMoveset();
-      p.pokeball = PokeballType.ROGUE_BALL;
-    }))
-    .setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.ZAMAZENTA ], TrainerSlot.TRAINER, true, p => {
-      p.setBoss(true, 2);
-      p.generateAndPopulateMoveset();
-      p.pokeball = PokeballType.MASTER_BALL;
-    }))
-    .setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.EEVEE ], TrainerSlot.TRAINER, true, p => {
-      p.setBoss(true, 2);
-      p.generateAndPopulateMoveset();
-      p.formIndex = 2;
-      p.generateName();
-      p.pokeball = PokeballType.ULTRA_BALL;
-    }))
-    .setGenModifiersFunc(party => {
-      const teraPokemon = party[0];
-      return [ modifierTypes.TERA_SHARD().generateType([], [ teraPokemon.species.type1 ])!.withIdFromFunc(modifierTypes.TERA_SHARD).newModifier(teraPokemon) as PersistentModifier ]; //TODO: is the bang correct?
-    }),
-  [TrainerType.BUCK]: new TrainerConfig(++t).setName("Buck").initForStatTrainer([], true)
-    .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.CLAYDOL ], TrainerSlot.TRAINER, true, p => {
-      p.setBoss(true, 3);
-      p.generateAndPopulateMoveset();
-      p.pokeball = PokeballType.ULTRA_BALL;
-    }))
-    .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.VENUSAUR, Species.COALOSSAL ], TrainerSlot.TRAINER, true, p => {
-      p.generateAndPopulateMoveset();
-      p.pokeball = PokeballType.GREAT_BALL;
-      if (p.species.speciesId === Species.VENUSAUR) {
-        p.formIndex = 2; // Gmax
-        p.abilityIndex = 2; // Venusaur gets Chlorophyll
-      } else {
-        p.formIndex = 1; // Gmax
-      }
-      p.generateName();
-    }))
-    .setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.AGGRON ], TrainerSlot.TRAINER, true, p => {
-      p.generateAndPopulateMoveset();
-      p.formIndex = 1; // Mega
-      p.generateName();
-    }))
-    .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.TORKOAL ], TrainerSlot.TRAINER, true, p => {
-      p.generateAndPopulateMoveset();
-      p.abilityIndex = 1; // Drought
-    }))
-    .setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.GREAT_TUSK ], TrainerSlot.TRAINER, true))
-    .setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.HEATRAN ], TrainerSlot.TRAINER, true, p => {
-      p.setBoss(true, 2);
-      p.generateAndPopulateMoveset();
-      p.pokeball = PokeballType.MASTER_BALL;
-    })),
-  [TrainerType.CHERYL]: new TrainerConfig(++t).setName("Cheryl").initForStatTrainer([], false)
-    .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.BLISSEY ], TrainerSlot.TRAINER, true, p => {
-      p.setBoss(true, 3);
-      p.generateAndPopulateMoveset();
-      p.pokeball = PokeballType.ULTRA_BALL;
-    }))
-    .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.SNORLAX, Species.LAPRAS ], TrainerSlot.TRAINER, true, p => {
-      p.generateAndPopulateMoveset();
-      p.pokeball = PokeballType.GREAT_BALL;
-      p.formIndex = 1; // Gmax
-      p.generateName();
-    }))
-    .setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.AUDINO ], TrainerSlot.TRAINER, true, p => {
-      p.generateAndPopulateMoveset();
-      p.formIndex = 1; // Mega
-      p.generateName();
-    }))
-    .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.GOODRA ], TrainerSlot.TRAINER, true))
-    .setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.IRON_HANDS ], TrainerSlot.TRAINER, true))
-    .setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.CRESSELIA, Species.ENAMORUS ], TrainerSlot.TRAINER, true, p => {
-      p.setBoss(true, 2);
-      p.generateAndPopulateMoveset();
-      if (p.species.speciesId === Species.ENAMORUS) {
-        p.formIndex = 1; // Therian
-        p.generateName();
-      }
-      p.pokeball = PokeballType.MASTER_BALL;
-    })),
-  [TrainerType.MARLEY]: new TrainerConfig(++t).setName("Marley").initForStatTrainer([], false)
-    .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.ARCANINE ], TrainerSlot.TRAINER, true, p => {
-      p.setBoss(true, 3);
-      p.generateAndPopulateMoveset();
-      p.pokeball = PokeballType.ULTRA_BALL;
-    }))
-    .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.CINDERACE, Species.INTELEON ], TrainerSlot.TRAINER, true, p => {
-      p.generateAndPopulateMoveset();
-      p.pokeball = PokeballType.GREAT_BALL;
-      p.formIndex = 1; // Gmax
-      p.generateName();
-    }))
-    .setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.AERODACTYL ], TrainerSlot.TRAINER, true, p => {
-      p.generateAndPopulateMoveset();
-      p.formIndex = 1; // Mega
-      p.generateName();
-    }))
-    .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.DRAGAPULT ], TrainerSlot.TRAINER, true))
-    .setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.IRON_BUNDLE ], TrainerSlot.TRAINER, true))
-    .setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.REGIELEKI ], TrainerSlot.TRAINER, true, p => {
-      p.setBoss(true, 2);
-      p.generateAndPopulateMoveset();
-      p.pokeball = PokeballType.MASTER_BALL;
-    })),
-  [TrainerType.MIRA]: new TrainerConfig(++t).setName("Mira").initForStatTrainer([], false)
-    .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.ALAKAZAM ], TrainerSlot.TRAINER, true, p => {
-      p.setBoss(true, 2);
-      p.generateAndPopulateMoveset();
-      p.formIndex = 1;
-      p.pokeball = PokeballType.ULTRA_BALL;
-      p.generateName();
-    }))
-    .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.GENGAR, Species.HATTERENE ], TrainerSlot.TRAINER, true, p => {
-      p.generateAndPopulateMoveset();
-      p.pokeball = PokeballType.GREAT_BALL;
-      p.formIndex = p.species.speciesId === Species.GENGAR ? 2 : 1; // Gmax
-      p.generateName();
-    }))
-    .setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.FLUTTER_MANE ], TrainerSlot.TRAINER, true))
-    .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.HYDREIGON ], TrainerSlot.TRAINER, true))
-    .setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.MAGNEZONE ], TrainerSlot.TRAINER, true))
-    .setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.LATIOS, Species.LATIAS ], TrainerSlot.TRAINER, true, p => {
-      p.setBoss(true, 2);
-      p.generateAndPopulateMoveset();
-      p.pokeball = PokeballType.MASTER_BALL;
-    })),
-  [TrainerType.RILEY]: new TrainerConfig(++t).setName("Riley").initForStatTrainer([], true)
-    .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.LUCARIO ], TrainerSlot.TRAINER, true, p => {
-      p.setBoss(true, 2);
-      p.generateAndPopulateMoveset();
-      p.formIndex = 1;
-      p.pokeball = PokeballType.ULTRA_BALL;
-      p.generateName();
-    }))
-    .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.RILLABOOM, Species.CENTISKORCH ], TrainerSlot.TRAINER, true, p => {
-      p.generateAndPopulateMoveset();
-      p.pokeball = PokeballType.GREAT_BALL;
-      p.formIndex = 1; // Gmax
-      p.generateName();
-    }))
-    .setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.TYRANITAR ], TrainerSlot.TRAINER, true))
-    .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.ROARING_MOON ], TrainerSlot.TRAINER, true))
-    .setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.URSALUNA ], TrainerSlot.TRAINER, true))
-    .setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.REGIGIGAS, Species.LANDORUS ], TrainerSlot.TRAINER, true, p => {
-      p.setBoss(true, 2);
-      p.generateAndPopulateMoveset();
-      if (p.species.speciesId === Species.LANDORUS) {
-        p.formIndex = 1; // Therian
-        p.generateName();
-      }
-      p.pokeball = PokeballType.MASTER_BALL;
-    })),
-  [TrainerType.VICTOR]: new TrainerConfig(++t).setTitle("The Winstrates").setLocalizedName("Victor")
-    .setMoneyMultiplier(1) // The Winstrate trainers have total money multiplier of 6
-    .setPartyTemplates(trainerPartyTemplates.ONE_AVG_ONE_STRONG),
-  [TrainerType.VICTORIA]: new TrainerConfig(++t).setTitle("The Winstrates").setLocalizedName("Victoria")
-    .setMoneyMultiplier(1)
-    .setPartyTemplates(trainerPartyTemplates.ONE_AVG_ONE_STRONG),
-  [TrainerType.VIVI]: new TrainerConfig(++t).setTitle("The Winstrates").setLocalizedName("Vivi")
-    .setMoneyMultiplier(1)
-    .setPartyTemplates(trainerPartyTemplates.TWO_AVG_ONE_STRONG),
-  [TrainerType.VICKY]: new TrainerConfig(++t).setTitle("The Winstrates").setLocalizedName("Vicky")
-    .setMoneyMultiplier(1)
-    .setPartyTemplates(trainerPartyTemplates.ONE_AVG),
-  [TrainerType.VITO]: new TrainerConfig(++t).setTitle("The Winstrates").setLocalizedName("Vito")
-    .setMoneyMultiplier(2)
-    .setPartyTemplates(new TrainerPartyCompoundTemplate(new TrainerPartyTemplate(3, PartyMemberStrength.AVERAGE), new TrainerPartyTemplate(2, PartyMemberStrength.STRONG))),
-  [TrainerType.BUG_TYPE_SUPERFAN]: new TrainerConfig(++t).setMoneyMultiplier(2.25).setEncounterBgm(TrainerType.ACE_TRAINER)
-    .setPartyTemplates(new TrainerPartyTemplate(2, PartyMemberStrength.AVERAGE)),
-  [TrainerType.EXPERT_POKEMON_BREEDER]: new TrainerConfig(++t).setMoneyMultiplier(3).setEncounterBgm(TrainerType.ACE_TRAINER).setLocalizedName("Expert Pokemon Breeder")
-    .setPartyTemplates(new TrainerPartyTemplate(3, PartyMemberStrength.AVERAGE)),
-  [TrainerType.FUTURE_SELF_M]: new TrainerConfig(++t)
-    .setMoneyMultiplier(0)
-    .setEncounterBgm("mystery_encounter_weird_dream")
-    .setBattleBgm("mystery_encounter_weird_dream")
-    .setMixedBattleBgm("mystery_encounter_weird_dream")
-    .setVictoryBgm("mystery_encounter_weird_dream")
-    .setLocalizedName("Future Self M")
-    .setPartyTemplates(new TrainerPartyTemplate(6, PartyMemberStrength.STRONG)),
-  [TrainerType.FUTURE_SELF_F]: new TrainerConfig(++t)
-    .setMoneyMultiplier(0)
-    .setEncounterBgm("mystery_encounter_weird_dream")
-    .setBattleBgm("mystery_encounter_weird_dream")
-    .setMixedBattleBgm("mystery_encounter_weird_dream")
-    .setVictoryBgm("mystery_encounter_weird_dream")
-    .setLocalizedName("Future Self F")
-    .setPartyTemplates(new TrainerPartyTemplate(6, PartyMemberStrength.STRONG))
-};
-
diff --git a/src/data/trainer-names.ts b/src/data/trainer-names.ts
index 8b0091d4398..8714dad0fc9 100644
--- a/src/data/trainer-names.ts
+++ b/src/data/trainer-names.ts
@@ -1,12 +1,12 @@
 import { TrainerType } from "#enums/trainer-type";
-import * as Utils from "../utils";
+import { toReadableString } from "#app/utils/common";
 
 class TrainerNameConfig {
   public urls: string[];
   public femaleUrls: string[] | null;
 
   constructor(type: TrainerType, ...urls: string[]) {
-    this.urls = urls.length ? urls : [ Utils.toReadableString(TrainerType[type]).replace(/ /g, "_") ];
+    this.urls = urls.length ? urls : [toReadableString(TrainerType[type]).replace(/ /g, "_")];
   }
 
   hasGenderVariant(...femaleUrls: string[]): TrainerNameConfig {
@@ -16,11 +16,11 @@ class TrainerNameConfig {
 }
 
 interface TrainerNameConfigs {
-  [key: number]: TrainerNameConfig
+  [key: number]: TrainerNameConfig;
 }
 
 // used in a commented code
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
+// biome-ignore lint/correctness/noUnusedVariables: Used by commented code
 const trainerNameConfigs: TrainerNameConfigs = {
   [TrainerType.ACE_TRAINER]: new TrainerNameConfig(TrainerType.ACE_TRAINER),
   [TrainerType.ARTIST]: new TrainerNameConfig(TrainerType.ARTIST),
@@ -71,65 +71,18 @@ const trainerNameConfigs: TrainerNameConfigs = {
   [TrainerType.VETERAN]: new TrainerNameConfig(TrainerType.VETERAN),
   [TrainerType.WAITER]: new TrainerNameConfig(TrainerType.WAITER).hasGenderVariant("Waitress"),
   [TrainerType.WORKER]: new TrainerNameConfig(TrainerType.WORKER),
-  [TrainerType.YOUNGSTER]: new TrainerNameConfig(TrainerType.YOUNGSTER).hasGenderVariant("Lass")
-};
-
-export const trainerNamePools = {
-  [TrainerType.ACE_TRAINER]: [[ "Aaron", "Allen", "Blake", "Brian", "Gaven", "Jake", "Kevin", "Mike", "Nick", "Paul", "Ryan", "Sean", "Darin", "Albert", "Berke", "Clyde", "Edgar", "George", "Leroy", "Owen", "Parker", "Randall", "Ruben", "Samuel", "Vincent", "Warren", "Wilton", "Zane", "Alfred", "Braxton", "Felix", "Gerald", "Jonathan", "Leonel", "Marcel", "Mitchell", "Quincy", "Roderick", "Colby", "Rolando", "Yuji", "Abel", "Anton", "Arthur", "Cesar", "Dalton", "Dennis", "Ernest", "Garrett", "Graham", "Henry", "Isaiah", "Jonah", "Jose", "Keenan", "Micah", "Omar", "Quinn", "Rodolfo", "Saul", "Sergio", "Skylar", "Stefan", "Zachery", "Alton", "Arabella", "Bonita", "Cal", "Cody", "French", "Kobe", "Paulo", "Shaye", "Austin", "Beckett", "Charlie", "Corky", "David", "Dwayne", "Elmer", "Jesse", "Jared", "Johan", "Jordan", "Kipp", "Lou", "Terry", "Tom", "Webster", "Billy", "Doyle", "Enzio", "Geoff", "Grant", "Kelsey", "Miguel", "Pierce", "Ray", "Santino", "Shel", "Adelbert", "Bence", "Emil", "Evan", "Mathis", "Maxim", "Neil", "Rico", "Robbie", "Theo", "Viktor", "Benedict", "Cornelius", "Hisato", "Leopold", "Neville", "Vito", "Chase", "Cole", "Hiroshi", "Jackson", "Jim", "Kekoa", "Makana", "Yuki", "Elwood", "Seth", "Alvin", "Arjun", "Arnold", "Cameron", "Carl", "Carlton", "Christopher", "Dave", "Dax", "Dominic", "Edmund", "Finn", "Fred", "Garret", "Grayson", "Jace", "Jaxson", "Jay", "Jirard", "Johnson", "Kayden", "Kite", "Louis", "Mac", "Marty", "Percy", "Raymond", "Ronnie", "Satch", "Tim", "Zach", "Conner", "Vince", "Bedro", "Boda", "Botan", "Daras", "Dury", "Herton", "Rewn", "Stum", "Tock", "Trilo", "Berki", "Cruik", "Dazon", "Desid", "Dillot", "Farfin", "Forgon", "Hebel", "Morfon", "Moril", "Shadd", "Vanhub", "Bardo", "Carben", "Degin", "Gorps", "Klept", "Lask", "Malex", "Mopar", "Niled", "Noxon", "Teslor", "Tetil" ], [ "Beth", "Carol", "Cybil", "Emma", "Fran", "Gwen", "Irene", "Jenn", "Joyce", "Kate", "Kelly", "Lois", "Lola", "Megan", "Quinn", "Reena", "Cara", "Alexa", "Brooke", "Caroline", "Elaine", "Hope", "Jennifer", "Jody", "Julie", "Lori", "Mary", "Michelle", "Shannon", "Wendy", "Alexia", "Alicia", "Athena", "Carolina", "Cristin", "Darcy", "Dianne", "Halle", "Jazmyn", "Katelynn", "Keira", "Marley", "Allyson", "Kathleen", "Naomi", "Alyssa", "Ariana", "Brandi", "Breanna", "Brenda", "Brenna", "Catherine", "Clarice", "Dana", "Deanna", "Destiny", "Jamie", "Jasmin", "Kassandra", "Laura", "Maria", "Mariah", "Maya", "Meagan", "Mikayla", "Monique", "Natasha", "Olivia", "Sandra", "Savannah", "Sydney", "Moira", "Piper", "Salma", "Allison", "Beverly", "Cathy", "Cheyenne", "Clara", "Dara", "Eileen", "Glinda", "Junko", "Lena", "Lucille", "Mariana", "Olwen", "Shanta", "Stella", "Angi", "Belle", "Chandra", "Cora", "Eve", "Jacqueline", "Jeanne", "Juliet", "Kathrine", "Layla", "Lucca", "Melina", "Miki", "Nina", "Sable", "Shelly", "Summer", "Trish", "Vicki", "Alanza", "Cordelia", "Hilde", "Imelda", "Michele", "Mireille", "Claudia", "Constance", "Harriet", "Honor", "Melba", "Portia", "Alexis", "Angela", "Karla", "Lindsey", "Tori", "Sheri", "Jada", "Kailee", "Amanda", "Annie", "Kindra", "Kyla", "Sofia", "Yvette", "Becky", "Flora", "Gloria", "Buna", "Ferda", "Lehan", "Liqui", "Lomen", "Neira", "Atilo", "Detta", "Gilly", "Gosney", "Levens", "Moden", "Rask", "Rateis", "Rosno", "Tynan", "Veron", "Zoel", "Cida", "Dibsin", "Dodin", "Ebson", "Equin", "Flostin", "Gabsen", "Halsion", "Hileon", "Quelor", "Rapeel", "Roze", "Tensin" ]],
-  [TrainerType.ARTIST]: [[ "Ismael", "William", "Horton", "Pierre", "Zach", "Gough", "Salvador", "Vincent", "Duncan" ], [ "Georgia" ]],
-  [TrainerType.BACKERS]: [[ "Alf & Fred", "Hawk & Dar", "Joe & Ross", "Les & Web", "Masa & Yas", "Stu & Art" ], [ "Ai & Ciel", "Ami & Eira", "Cam & Abby", "Fey & Sue", "Kat & Phae", "Kay & Ali", "Ava & Aya", "Cleo & Rio", "May & Mal" ]],
-  [TrainerType.BACKPACKER]: [[ "Alexander", "Carlos", "Herman", "Jerome", "Keane", "Kelsey", "Kiyo", "Michael", "Nate", "Peter", "Sam", "Stephen", "Talon", "Terrance", "Toru", "Waylon", "Boone", "Clifford", "Ivan", "Kendall", "Lowell", "Randall", "Reece", "Roland", "Shane", "Walt", "Farid", "Heike", "Joren", "Lane", "Roderick", "Darnell", "Deon", "Emory", "Graeme", "Grayson", "Aitor", "Alex", "Arturo", "Asier", "Jaime", "Jonathan", "Julio", "Kevin", "Kosuke", "Lander", "Markel", "Mateo", "Nil", "Pau", "Samuel" ], [ "Anna", "Corin", "Elaine", "Emi", "Jill", "Kumiko", "Liz", "Lois", "Lora", "Molly", "Patty", "Ruth", "Vicki", "Annie", "Blossom", "Clara", "Eileen", "Mae", "Myra", "Rachel", "Tami", "Ashley", "Mikiko", "Kiana", "Perdy", "Maria", "Yuho", "Peren", "Barbara", "Diane" ]],
-  [TrainerType.BAKER]: [ "Chris", "Jenn", "Lilly" ],
-  [TrainerType.BEAUTY]: [ "Cassie", "Julia", "Olivia", "Samantha", "Valerie", "Victoria", "Bridget", "Connie", "Jessica", "Johanna", "Melissa", "Sheila", "Shirley", "Tiffany", "Namiko", "Thalia", "Grace", "Lola", "Lori", "Maura", "Tamia", "Cyndy", "Devon", "Gabriella", "Harley", "Lindsay", "Nicola", "Callie", "Charlotte", "Kassandra", "December", "Fleming", "Nikola", "Aimee", "Anais", "Brigitte", "Cassandra", "Andrea", "Brittney", "Carolyn", "Krystal", "Alexis", "Alice", "Aina", "Anya", "Arianna", "Aubrey", "Beverly", "Camille", "Beauty", "Evette", "Hansol", "Haruka", "Jill", "Jo", "Lana", "Lois", "Lucy", "Mai", "Nickie", "Nicole", "Prita", "Rose", "Shelly", "Suzy", "Tessa", "Anita", "Alissa", "Rita", "Cudsy", "Eloff", "Miru", "Minot", "Nevah", "Niven", "Ogoin" ],
-  [TrainerType.BIKER]: [ "Charles", "Dwayne", "Glenn", "Harris", "Joel", "Riley", "Zeke", "Alex", "Billy", "Ernest", "Gerald", "Hideo", "Isaac", "Jared", "Jaren", "Jaxon", "Jordy", "Lao", "Lukas", "Malik", "Nikolas", "Ricardo", "Ruben", "Virgil", "William", "Aiden", "Dale", "Dan", "Jacob", "Markey", "Reese", "Teddy", "Theron", "Jeremy", "Morgann", "Phillip", "Philip", "Stanley", "Dillon" ],
-  [TrainerType.BLACK_BELT]: [[ "Kenji", "Lao", "Lung", "Nob", "Wai", "Yoshi", "Atsushi", "Daisuke", "Hideki", "Hitoshi", "Kiyo", "Koichi", "Koji", "Yuji", "Cristian", "Rhett", "Takao", "Theodore", "Zander", "Aaron", "Hugh", "Mike", "Nicolas", "Shea", "Takashi", "Adam", "Carl", "Colby", "Darren", "David", "Davon", "Derek", "Eddie", "Gregory", "Griffin", "Jarrett", "Jeffery", "Kendal", "Kyle", "Luke", "Miles", "Nathaniel", "Philip", "Rafael", "Ray", "Ricky", "Sean", "Willie", "Ander", "Manford", "Benjamin", "Corey", "Edward", "Grant", "Jay", "Kendrew", "Kentaro", "Ryder", "Teppei", "Thomas", "Tyrone", "Andrey", "Donny", "Drago", "Gordon", "Grigor", "Jeriel", "Kenneth", "Martell", "Mathis", "Rich", "Rocky", "Rodrigo", "Wesley", "Zachery", "Alonzo", "Cadoc", "Gunnar", "Igor", "Killian", "Markus", "Ricardo", "Yanis", "Banting", "Clayton", "Duane", "Earl", "Greg", "Roy", "Terry", "Tracy", "Walter", "Alvaro", "Curtis", "Francis", "Ross", "Brice", "Cheng", "Dudley", "Eric", "Kano", "Masahiro", "Randy", "Ryuji", "Steve", "Tadashi", "Wong", "Yuen", "Brian", "Carter", "Reece", "Nick", "Yang" ], [ "Cora", "Cyndy", "Jill", "Laura", "Sadie", "Tessa", "Vivian", "Aisha", "Callie", "Danielle", "Helene", "Jocelyn", "Lilith", "Paula", "Reyna", "Helen", "Kelsey", "Tyler", "Amy", "Chandra", "Hillary", "Janie", "Lee", "Maggie", "Mikiko", "Miriam", "Sharon", "Susie", "Xiao", "Alize", "Azra", "Brenda", "Chalina", "Chan", "Glinda", "Maki", "Tia", "Tiffany", "Wendy", "Andrea", "Gabrielle", "Gerardine", "Hailey", "Hedvig", "Justine", "Kinsey", "Sigrid", "Veronique", "Tess" ]],
-  [TrainerType.BREEDER]: [[ "Isaac", "Myles", "Salvadore", "Albert", "Kahlil", "Eustace", "Galen", "Owen", "Addison", "Marcus", "Foster", "Cory", "Glenn", "Jay", "Wesley", "William", "Adrian", "Bradley", "Jaime" ], [ "Allison", "Alize", "Bethany", "Lily", "Lydia", "Gabrielle", "Jayden", "Pat", "Veronica", "Amber", "Jennifer", "Kaylee", "Adelaide", "Brooke", "Ethel", "April", "Irene", "Magnolia", "Amala", "Mercy", "Amanda", "Ikue", "Savannah", "Yuka", "Chloe", "Debra", "Denise", "Elena" ]],
-  [TrainerType.CLERK]: [[ "Chaz", "Clemens", "Doug", "Fredric", "Ivan", "Isaac", "Nelson", "Wade", "Warren", "Augustin", "Gilligan", "Cody", "Jeremy", "Shane", "Dugal", "Royce", "Ronald" ], [ "Alberta", "Ingrid", "Katie", "Piper", "Trisha", "Wren", "Britney", "Lana", "Jessica", "Kristen", "Michelle", "Gabrielle" ]],
-  [TrainerType.CYCLIST]: [[ "Axel", "James", "John", "Ryan", "Hector", "Jeremiah" ], [ "Kayla", "Megan", "Nicole", "Rachel", "Krissa", "Adelaide" ]],
-  [TrainerType.DANCER]: [ "Brian", "Davey", "Dirk", "Edmond", "Mickey", "Raymond", "Cara", "Julia", "Maika", "Mireille", "Ronda", "Zoe" ],
-  [TrainerType.DEPOT_AGENT]: [ "Josh", "Hank", "Vincent" ],
-  [TrainerType.DOCTOR]: [[ "Hank", "Jerry", "Jules", "Logan", "Wayne", "Braid", "Derek", "Heath", "Julius", "Kit", "Graham" ], [ "Kirsten", "Sachiko", "Shery", "Carol", "Dixie", "Mariah" ]],
-  [TrainerType.FIREBREATHER]: [ "Bill", "Burt", "Cliff", "Dick", "Lyle", "Ned", "Otis", "Ray", "Richard", "Walt" ],
-  [TrainerType.FISHERMAN]: [ "Andre", "Arnold", "Barney", "Chris", "Edgar", "Henry", "Jonah", "Justin", "Kyle", "Martin", "Marvin", "Ralph", "Raymond", "Scott", "Stephen", "Wilton", "Tully", "Andrew", "Barny", "Carter", "Claude", "Dale", "Elliot", "Eugene", "Ivan", "Ned", "Nolan", "Roger", "Ronald", "Wade", "Wayne", "Darian", "Kai", "Chip", "Hank", "Kaden", "Tommy", "Tylor", "Alec", "Brett", "Cameron", "Cody", "Cole", "Cory", "Erick", "George", "Joseph", "Juan", "Kenneth", "Luc", "Miguel", "Travis", "Walter", "Zachary", "Josh", "Gideon", "Kyler", "Liam", "Murphy", "Bruce", "Damon", "Devon", "Hubert", "Jones", "Lydon", "Mick", "Pete", "Sean", "Sid", "Vince", "Bucky", "Dean", "Eustace", "Kenzo", "Leroy", "Mack", "Ryder", "Ewan", "Finn", "Murray", "Seward", "Shad", "Wharton", "Finley", "Fisher", "Fisk", "River", "Sheaffer", "Timin", "Carl", "Ernest", "Hal", "Herbert", "Hisato", "Mike", "Vernon", "Harriet", "Marina", "Chase" ],
-  [TrainerType.GUITARIST]: [ "Anna", "Beverly", "January", "Tina", "Alicia", "Claudia", "Julia", "Lidia", "Mireia", "Noelia", "Sara", "Sheila", "Tatiana" ],
-  [TrainerType.HARLEQUIN]: [ "Charley", "Ian", "Jack", "Kerry", "Louis", "Pat", "Paul", "Rick", "Anders", "Clarence", "Gary" ],
-  [TrainerType.HIKER]: [ "Anthony", "Bailey", "Benjamin", "Daniel", "Erik", "Jim", "Kenny", "Leonard", "Michael", "Parry", "Phillip", "Russell", "Sidney", "Tim", "Timothy", "Alan", "Brice", "Clark", "Eric", "Lenny", "Lucas", "Mike", "Trent", "Devan", "Eli", "Marc", "Sawyer", "Allen", "Daryl", "Dudley", "Earl", "Franklin", "Jeremy", "Marcos", "Nob", "Oliver", "Wayne", "Alexander", "Damon", "Jonathan", "Justin", "Kevin", "Lorenzo", "Louis", "Maurice", "Nicholas", "Reginald", "Robert", "Theodore", "Bruce", "Clarke", "Devin", "Dwight", "Edwin", "Eoin", "Noland", "Russel", "Andy", "Bret", "Darrell", "Gene", "Hardy", "Hugh", "Jebediah", "Jeremiah", "Kit", "Neil", "Terrell", "Don", "Doug", "Hunter", "Jared", "Jerome", "Keith", "Manuel", "Markus", "Otto", "Shelby", "Stephen", "Teppei", "Tobias", "Wade", "Zaiem", "Aaron", "Alain", "Bergin", "Bernard", "Brent", "Corwin", "Craig", "Delmon", "Dunstan", "Orestes", "Ross", "Davian", "Calhoun", "David", "Gabriel", "Ryan", "Thomas", "Travis", "Zachary", "Anuhea", "Barnaby", "Claus", "Collin", "Colson", "Dexter", "Dillan", "Eugine", "Farkas", "Hisato", "Julius", "Kenji", "Irwin", "Lionel", "Paul", "Richter", "Valentino", "Donald", "Douglas", "Kevyn", "Chester" ], //["Angela","Carla","Celia","Daniela","Estela","Fatima","Helena","Leire","Lucia","Luna","Manuela","Mar","Marina","Miyu","Nancy","Nerea","Paula","Rocio","Yanira"]
-  [TrainerType.HOOLIGANS]: [ "Jim & Cas", "Rob & Sal" ],
-  [TrainerType.HOOPSTER]: [ "Bobby", "John", "Lamarcus", "Derrick", "Nicolas" ],
-  [TrainerType.INFIELDER]: [ "Alex", "Connor", "Todd" ],
-  [TrainerType.JANITOR]: [ "Caleb", "Geoff", "Brady", "Felix", "Orville", "Melvin", "Shawn" ],
-  [TrainerType.LINEBACKER]: [ "Bob", "Dan", "Jonah" ],
-  [TrainerType.MAID]: [ "Belinda", "Sophie", "Emily", "Elena", "Clare", "Alica", "Tanya", "Tammy" ],
-  [TrainerType.MUSICIAN]: [ "Boris", "Preston", "Charles", "Clyde", "Vincent", "Dalton", "Kirk", "Shawn", "Fabian", "Fernando", "Joseph", "Marcos", "Arturo", "Jerry", "Lonnie", "Tony" ],
-  [TrainerType.NURSERY_AIDE]: [ "Autumn", "Briana", "Leah", "Miho", "Ethel", "Hollie", "Ilse", "June", "Kimya", "Rosalyn" ],
-  [TrainerType.OFFICER]: [ "Dirk", "Keith", "Alex", "Bobby", "Caleb", "Danny", "Dylan", "Thomas", "Daniel", "Jeff", "Braven", "Dell", "Neagle", "Haruki", "Mitchell", "Raymond" ],
-  [TrainerType.PARASOL_LADY]: [ "Angelica", "Clarissa", "Madeline", "Akari", "Annabell", "Kayley", "Rachel", "Alexa", "Sabrina", "April", "Gwyneth", "Laura", "Lumi", "Mariah", "Melita", "Nicole", "Tihana", "Ingrid", "Tyra" ],
-  [TrainerType.PILOT]: [ "Chase", "Leonard", "Ted", "Elron", "Ewing", "Flynn", "Winslow" ],
-  [TrainerType.POKEFAN]: [[ "Alex", "Allan", "Brandon", "Carter", "Colin", "Derek", "Jeremy", "Joshua", "Rex", "Robert", "Trevor", "William", "Colton", "Miguel", "Francisco", "Kaleb", "Leonard", "Boone", "Elliot", "Jude", "Norbert", "Corey", "Gabe", "Baxter" ], [ "Beverly", "Georgia", "Jaime", "Ruth", "Isabel", "Marissa", "Vanessa", "Annika", "Bethany", "Kimberly", "Meredith", "Rebekah", "Eleanor", "Darcy", "Lydia", "Sachiko", "Abigail", "Agnes", "Lydie", "Roisin", "Tara", "Carmen", "Janet" ]],
-  [TrainerType.PRESCHOOLER]: [[ "Billy", "Doyle", "Evan", "Homer", "Tully", "Albert", "Buster", "Greg", "Ike", "Jojo", "Tyrone", "Adrian", "Oliver", "Hayden", "Hunter", "Kaleb", "Liam", "Dylan" ], [ "Juliet", "Mia", "Sarah", "Wendy", "Winter", "Chrissy", "Eva", "Lin", "Samantha", "Ella", "Lily", "Natalie", "Ailey", "Hannah", "Malia", "Kindra", "Nancy" ]],
-  [TrainerType.PSYCHIC]: [[ "Fidel", "Franklin", "Gilbert", "Greg", "Herman", "Jared", "Mark", "Nathan", "Norman", "Phil", "Richard", "Rodney", "Cameron", "Edward", "Fritz", "Joshua", "Preston", "Virgil", "William", "Alvaro", "Blake", "Cedric", "Keenan", "Nicholas", "Dario", "Johan", "Lorenzo", "Tyron", "Bryce", "Corbin", "Deandre", "Elijah", "Kody", "Landon", "Maxwell", "Mitchell", "Sterling", "Eli", "Nelson", "Vernon", "Gaven", "Gerard", "Low", "Micki", "Perry", "Rudolf", "Tommy", "Al", "Nandor", "Tully", "Arthur", "Emanuel", "Franz", "Harry", "Paschal", "Robert", "Sayid", "Angelo", "Anton", "Arin", "Avery", "Danny", "Frasier", "Harrison", "Jaime", "Ross", "Rui", "Vlad", "Mason" ], [ "Alexis", "Hannah", "Jacki", "Jaclyn", "Kayla", "Maura", "Samantha", "Alix", "Brandi", "Edie", "Macey", "Mariella", "Marlene", "Laura", "Rodette", "Abigail", "Brittney", "Chelsey", "Daisy", "Desiree", "Kendra", "Lindsey", "Rachael", "Valencia", "Belle", "Cybil", "Doreen", "Dua", "Future", "Lin", "Madhu", "Alia", "Ena", "Joyce", "Lynette", "Olesia", "Sarah" ]],
-  [TrainerType.RANGER]: [[ "Carlos", "Jackson", "Sebastian", "Gav", "Lorenzo", "Logan", "Nicolas", "Trenton", "Deshawn", "Dwayne", "Jeffery", "Kyler", "Taylor", "Alain", "Claude", "Crofton", "Forrest", "Harry", "Jaden", "Keith", "Lewis", "Miguel", "Pedro", "Ralph", "Richard", "Bret", "Daryl", "Eddie", "Johan", "Leaf", "Louis", "Maxwell", "Parker", "Rick", "Steve", "Bjorn", "Chaise", "Dean", "Lee", "Maurice", "Nash", "Ralf", "Reed", "Shinobu", "Silas" ], [ "Catherine", "Jenna", "Sophia", "Merdith", "Nora", "Beth", "Chelsea", "Katelyn", "Madeline", "Allison", "Ashlee", "Felicia", "Krista", "Annie", "Audra", "Brenda", "Chloris", "Eliza", "Heidi", "Irene", "Mary", "Mylene", "Shanti", "Shelly", "Thalia", "Anja", "Briana", "Dianna", "Elaine", "Elle", "Hillary", "Katie", "Lena", "Lois", "Malory", "Melita", "Mikiko", "Naoko", "Serenity", "Ambre", "Brooke", "Clementine", "Melina", "Petra", "Twiggy" ]],
-  [TrainerType.RICH]: [[ "Alfred", "Edward", "Gregory", "Preston", "Thomas", "Tucker", "Walter", "Clifford", "Everett", "Micah", "Nate", "Pierre", "Terrance", "Arthur", "Brooks", "Emanuel", "Lamar", "Jeremy", "Leonardo", "Milton", "Frederic", "Renaud", "Robert", "Yan", "Daniel", "Sheldon", "Stonewall", "Gerald", "Ronald", "Smith", "Stanley", "Reginald", "Orson", "Wilco", "Caden", "Glenn" ], [ "Rebecca", "Reina", "Cassandra", "Emilia", "Grace", "Marian", "Elizabeth", "Kathleen", "Sayuri", "Caroline", "Judy" ]],
-  [TrainerType.RICH_KID]: [[ "Garret", "Winston", "Dawson", "Enrique", "Jason", "Roman", "Trey", "Liam", "Anthony", "Brad", "Cody", "Manuel", "Martin", "Pierce", "Rolan", "Keenan", "Filbert", "Antoin", "Cyus", "Diek", "Dugo", "Flitz", "Jurek", "Lond", "Perd", "Quint", "Basto", "Benit", "Brot", "Denc", "Guyit", "Marcon", "Perc", "Puros", "Roex", "Sainz", "Symin", "Tark", "Venak" ], [ "Anette", "Brianna", "Cindy", "Colleen", "Daphne", "Elizabeth", "Naomi", "Sarah", "Charlotte", "Gillian", "Jacki", "Lady", "Melissa", "Celeste", "Colette", "Elizandra", "Isabel", "Lynette", "Magnolia", "Sophie", "Lina", "Dulcie", "Auro", "Brin", "Caril", "Eloos", "Gwin", "Illa", "Kowly", "Rima", "Ristin", "Vesey", "Brena", "Deasy", "Denslon", "Kylet", "Nemi", "Rene", "Sanol", "Stouner", "Sturk", "Talmen", "Zoila" ]],
-  [TrainerType.ROUGHNECK]: [ "Camron", "Corey", "Gabriel", "Isaiah", "Jamal", "Koji", "Luke", "Paxton", "Raul", "Zeek", "Kirby", "Chance", "Dave", "Fletcher", "Johnny", "Reese", "Joey", "Ricky", "Silvester", "Martin" ],
-  [TrainerType.SAILOR]: [ "Alberto", "Bost", "Brennan", "Brenden", "Claude", "Cory", "Damian", "Dirk", "Duncan", "Dwayne", "Dylan", "Eddie", "Edmond", "Elijah", "Ernest", "Eugene", "Garrett", "Golos", "Gratin", "Grestly", "Harry", "Hols", "Hudson", "Huey", "Jebol", "Jeff", "Leonald", "Luther", "Kelvin", "Kenneth", "Kent", "Knook", "Marc", "Mifis", "Monar", "Morkor", "Ordes", "Oxlin", "Parker", "Paul", "Philip", "Roberto", "Samson", "Skyler", "Stanly", "Tebu", "Terrell", "Trevor", "Yasu", "Zachariah" ],
-  [TrainerType.SCIENTIST]: [[ "Jed", "Marc", "Mitch", "Rich", "Ross", "Beau", "Braydon", "Connor", "Ed", "Ivan", "Jerry", "Jose", "Joshua", "Parker", "Rodney", "Taylor", "Ted", "Travis", "Zackery", "Darrius", "Emilio", "Fredrick", "Shaun", "Stefano", "Travon", "Daniel", "Garett", "Gregg", "Linden", "Lowell", "Trenton", "Dudley", "Luke", "Markus", "Nathan", "Orville", "Randall", "Ron", "Ronald", "Simon", "Steve", "William", "Franklin", "Clarke", "Jacques", "Terrance", "Ernst", "Justus", "Ikaika", "Jayson", "Kyle", "Reid", "Tyrone", "Adam", "Albert", "Alphonse", "Cory", "Donnie", "Elton", "Francis", "Gordon", "Herbert", "Humphrey", "Jordan", "Julian", "Keaton", "Levi", "Melvin", "Murray", "West", "Craig", "Coren", "Dubik", "Kotan", "Lethco", "Mante", "Mort", "Myron", "Odlow", "Ribek", "Roeck", "Vogi", "Vonder", "Zogo", "Doimo", "Doton", "Durel", "Hildon", "Kukla", "Messa", "Nanot", "Platen", "Raburn", "Reman", "Acrod", "Coffy", "Elrok", "Foss", "Hardig", "Hombol", "Hospel", "Kaller", "Klots", "Krilok", "Limar", "Loket", "Mesak", "Morbit", "Newin", "Orill", "Tabor", "Tekot" ], [ "Blythe", "Chan", "Kathrine", "Marie", "Maria", "Naoko", "Samantha", "Satomi", "Shannon", "Athena", "Caroline", "Lumi", "Lumina", "Marissa", "Sonia" ]],
-  [TrainerType.SMASHER]: [ "Aspen", "Elena", "Mari", "Amy", "Lizzy" ],
-  [TrainerType.SNOW_WORKER]: [[ "Braden", "Brendon", "Colin", "Conrad", "Dillan", "Gary", "Gerardo", "Holden", "Jackson", "Mason", "Quentin", "Willy", "Noel", "Arnold", "Brady", "Brand", "Cairn", "Cliff", "Don", "Eddie", "Felix", "Filipe", "Glenn", "Gus", "Heath", "Matthew", "Patton", "Rich", "Rob", "Ryan", "Scott", "Shelby", "Sterling", "Tyler", "Victor", "Zack", "Friedrich", "Herman", "Isaac", "Leo", "Maynard", "Mitchell", "Morgann", "Nathan", "Niel", "Pasqual", "Paul", "Tavarius", "Tibor", "Dimitri", "Narek", "Yusif", "Frank", "Jeff", "Vaclav", "Ovid", "Francis", "Keith", "Russel", "Sangon", "Toway", "Bomber", "Chean", "Demit", "Hubor", "Kebile", "Laber", "Ordo", "Retay", "Ronix", "Wagel", "Dobit", "Kaster", "Lobel", "Releo", "Saken", "Rustix" ], [ "Georgia", "Sandra", "Yvonne" ]],
-  [TrainerType.STRIKER]: [ "Marco", "Roberto", "Tony" ],
-  [TrainerType.SCHOOL_KID]: [[ "Alan", "Billy", "Chad", "Danny", "Dudley", "Jack", "Joe", "Johnny", "Kipp", "Nate", "Ricky", "Tommy", "Jerry", "Paul", "Ted", "Chance", "Esteban", "Forrest", "Harrison", "Connor", "Sherman", "Torin", "Travis", "Al", "Carter", "Edgar", "Jem", "Sammy", "Shane", "Shayne", "Alvin", "Keston", "Neil", "Seymour", "William", "Carson", "Clark", "Nolan" ], [ "Georgia", "Karen", "Meiko", "Christine", "Mackenzie", "Tiera", "Ann", "Gina", "Lydia", "Marsha", "Millie", "Sally", "Serena", "Silvia", "Alberta", "Cassie", "Mara", "Rita", "Georgie", "Meena", "Nitzel" ]],
-  [TrainerType.SWIMMER]: [[ "Berke", "Cameron", "Charlie", "George", "Harold", "Jerome", "Kirk", "Mathew", "Parker", "Randall", "Seth", "Simon", "Tucker", "Austin", "Barry", "Chad", "Cody", "Darrin", "David", "Dean", "Douglas", "Franklin", "Gilbert", "Herman", "Jack", "Luis", "Matthew", "Reed", "Richard", "Rodney", "Roland", "Spencer", "Stan", "Tony", "Clarence", "Declan", "Dominik", "Harrison", "Kevin", "Leonardo", "Nolen", "Pete", "Santiago", "Axle", "Braden", "Finn", "Garrett", "Mymo", "Reece", "Samir", "Toby", "Adrian", "Colton", "Dillon", "Erik", "Evan", "Francisco", "Glenn", "Kurt", "Oscar", "Ricardo", "Sam", "Sheltin", "Troy", "Vincent", "Wade", "Wesley", "Duane", "Elmo", "Esteban", "Frankie", "Ronald", "Tyson", "Bart", "Matt", "Tim", "Wright", "Jeffery", "Kyle", "Alessandro", "Estaban", "Kieran", "Ramses", "Casey", "Dakota", "Jared", "Kalani", "Keoni", "Lawrence", "Logan", "Robert", "Roddy", "Yasu", "Derek", "Jacob", "Bruce", "Clayton" ], [ "Briana", "Dawn", "Denise", "Diana", "Elaine", "Kara", "Kaylee", "Lori", "Nicole", "Nikki", "Paula", "Susie", "Wendy", "Alice", "Beth", "Beverly", "Brenda", "Dana", "Debra", "Grace", "Jenny", "Katie", "Laurel", "Linda", "Missy", "Sharon", "Tanya", "Tara", "Tisha", "Carlee", "Imani", "Isabelle", "Kyla", "Sienna", "Abigail", "Amara", "Anya", "Connie", "Maria", "Melissa", "Nora", "Shirley", "Shania", "Tiffany", "Aubree", "Cassandra", "Claire", "Crystal", "Erica", "Gabrielle", "Haley", "Jessica", "Joanna", "Lydia", "Mallory", "Mary", "Miranda", "Paige", "Sophia", "Vanessa", "Chelan", "Debbie", "Joy", "Kendra", "Leona", "Mina", "Caroline", "Joyce", "Larissa", "Rebecca", "Tyra", "Dara", "Desiree", "Kaoru", "Ruth", "Coral", "Genevieve", "Isla", "Marissa", "Romy", "Sheryl", "Alexandria", "Alicia", "Chelsea", "Jade", "Kelsie", "Laura", "Portia", "Shelby", "Sara", "Tiare", "Kyra", "Natasha", "Layla", "Scarlett", "Cora" ]],
-  [TrainerType.TWINS]: [ "Amy & May", "Jo & Zoe", "Meg & Peg", "Ann & Anne", "Lea & Pia", "Amy & Liv", "Gina & Mia", "Miu & Yuki", "Tori & Tia", "Eli & Anne", "Jen & Kira", "Joy & Meg", "Kiri & Jan", "Miu & Mia", "Emma & Lil", "Liv & Liz", "Teri & Tia", "Amy & Mimi", "Clea & Gil", "Day & Dani", "Kay & Tia", "Tori & Til", "Saya & Aya", "Emy & Lin", "Kumi & Amy", "Mayo & May", "Ally & Amy", "Lia & Lily", "Rae & Ula", "Sola & Ana", "Tara & Val", "Faith & Joy", "Nana & Nina" ],
-  [TrainerType.VETERAN]: [[ "Armando", "Brenden", "Brian", "Clayton", "Edgar", "Emanuel", "Grant", "Harlan", "Terrell", "Arlen", "Chester", "Hugo", "Martell", "Ray", "Shaun", "Abraham", "Carter", "Claude", "Jerry", "Lucius", "Murphy", "Rayne", "Ron", "Sinan", "Sterling", "Vincent", "Zach", "Gerard", "Gilles", "Louis", "Timeo", "Akira", "Don", "Eric", "Harry", "Leon", "Roger", "Angus", "Aristo", "Brone", "Johnny" ], [ "Julia", "Karla", "Kim", "Sayuri", "Tiffany", "Cathy", "Cecile", "Chloris", "Denae", "Gina", "Maya", "Oriana", "Portia", "Rhona", "Rosaline", "Catrina", "Inga", "Trisha", "Heather", "Lynn", "Sheri", "Alonsa", "Ella", "Leticia", "Kiara" ]],
-  [TrainerType.WAITER]: [[ "Bert", "Clint", "Maxwell", "Lou" ], [ "Kati", "Aurora", "Bonita", "Flo", "Tia", "Jan", "Olwen", "Paget", "Paula", "Talia" ]],
-  [TrainerType.WORKER]: [[ "Braden", "Brendon", "Colin", "Conrad", "Dillan", "Gary", "Gerardo", "Holden", "Jackson", "Mason", "Quentin", "Willy", "Noel", "Arnold", "Brady", "Brand", "Cairn", "Cliff", "Don", "Eddie", "Felix", "Filipe", "Glenn", "Gus", "Heath", "Matthew", "Patton", "Rich", "Rob", "Ryan", "Scott", "Shelby", "Sterling", "Tyler", "Victor", "Zack", "Friedrich", "Herman", "Isaac", "Leo", "Maynard", "Mitchell", "Morgann", "Nathan", "Niel", "Pasqual", "Paul", "Tavarius", "Tibor", "Dimitri", "Narek", "Yusif", "Frank", "Jeff", "Vaclav", "Ovid", "Francis", "Keith", "Russel", "Sangon", "Toway", "Bomber", "Chean", "Demit", "Hubor", "Kebile", "Laber", "Ordo", "Retay", "Ronix", "Wagel", "Dobit", "Kaster", "Lobel", "Releo", "Saken", "Rustix" ], [ "Georgia", "Sandra", "Yvonne" ]],
-  [TrainerType.YOUNGSTER]: [[ "Albert", "Gordon", "Ian", "Jason", "Jimmy", "Mikey", "Owen", "Samuel", "Warren", "Allen", "Ben", "Billy", "Calvin", "Dillion", "Eddie", "Joey", "Josh", "Neal", "Timmy", "Tommy", "Breyden", "Deandre", "Demetrius", "Dillon", "Jaylen", "Johnson", "Shigenobu", "Chad", "Cole", "Cordell", "Dan", "Dave", "Destin", "Nash", "Tyler", "Yasu", "Austin", "Dallas", "Darius", "Donny", "Jonathon", "Logan", "Michael", "Oliver", "Sebastian", "Tristan", "Wayne", "Norman", "Roland", "Regis", "Abe", "Astor", "Keita", "Kenneth", "Kevin", "Kyle", "Lester", "Masao", "Nicholas", "Parker", "Wes", "Zachary", "Cody", "Henley", "Jaye", "Karl", "Kenny", "Masahiro", "Pedro", "Petey", "Sinclair", "Terrell", "Waylon", "Aidan", "Anthony", "David", "Jacob", "Jayden", "Cutler", "Ham", "Caleb", "Kai", "Honus", "Kenway", "Bret", "Chris", "Cid", "Dennis", "Easton", "Ken", "Robby", "Ronny", "Shawn", "Benjamin", "Jake", "Travis", "Adan", "Aday", "Beltran", "Elian", "Hernan", "Julen", "Luka", "Roi", "Bernie", "Dustin", "Jonathan", "Wyatt" ], [ "Alice", "Bridget", "Carrie", "Connie", "Dana", "Ellen", "Krise", "Laura", "Linda", "Michelle", "Shannon", "Andrea", "Crissy", "Janice", "Robin", "Sally", "Tiana", "Haley", "Ali", "Ann", "Dalia", "Dawn", "Iris", "Joana", "Julia", "Kay", "Lisa", "Megan", "Mikaela", "Miriam", "Paige", "Reli", "Blythe", "Briana", "Caroline", "Cassidy", "Kaitlin", "Madeline", "Molly", "Natalie", "Samantha", "Sarah", "Cathy", "Dye", "Eri", "Eva", "Fey", "Kara", "Lurleen", "Maki", "Mali", "Maya", "Miki", "Sibyl", "Daya", "Diana", "Flo", "Helia", "Henrietta", "Isabel", "Mai", "Persephone", "Serena", "Anna", "Charlotte", "Elin", "Elsa", "Lise", "Sara", "Suzette", "Audrey", "Emmy", "Isabella", "Madison", "Rika", "Rylee", "Salla", "Ellie", "Alexandra", "Amy", "Lass", "Brittany", "Chel", "Cindy", "Dianne", "Emily", "Emma", "Evelyn", "Hana", "Harleen", "Hazel", "Jocelyn", "Katrina", "Kimberly", "Lina", "Marge", "Mila", "Mizuki", "Rena", "Sal", "Satoko", "Summer", "Tomoe", "Vicky", "Yue", "Yumi", "Lauren", "Rei", "Riley", "Lois", "Nancy", "Tammy", "Terry" ]],
-  [TrainerType.HEX_MANIAC]: [ "Kindra", "Patricia", "Tammy", "Tasha", "Valerie", "Alaina", "Kathleen", "Leah", "Makie", "Sylvia", "Anina", "Arachna", "Carrie", "Desdemona", "Josette", "Luna", "Melanie", "Osanna", "Raziah" ],
+  [TrainerType.YOUNGSTER]: new TrainerNameConfig(TrainerType.YOUNGSTER).hasGenderVariant("Lass"),
 };
 
 // function used in a commented code
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-function fetchAndPopulateTrainerNames(url: string, parser: DOMParser, trainerNames: Set<string>, femaleTrainerNames: Set<string>, forceFemale: boolean = false) {
+// biome-ignore lint/correctness/noUnusedVariables: TODO make this into a script instead of having it be in src/data...
+function fetchAndPopulateTrainerNames(
+  url: string,
+  parser: DOMParser,
+  trainerNames: Set<string>,
+  femaleTrainerNames: Set<string>,
+  forceFemale = false,
+) {
   return new Promise<void>(resolve => {
     fetch(`https://bulbapedia.bulbagarden.net/wiki/${url}_(Trainer_class)`)
       .then(response => response.text())
@@ -140,19 +93,21 @@ function fetchAndPopulateTrainerNames(url: string, parser: DOMParser, trainerNam
         if (!trainerListHeader) {
           return [];
         }
-        const elements = [ ...(trainerListHeader?.parentElement?.childNodes ?? []) ];
+        const elements = [...(trainerListHeader?.parentElement?.childNodes ?? [])];
         const startChildIndex = elements.indexOf(trainerListHeader);
         const endChildIndex = elements.findIndex(h => h.nodeName === "H2" && elements.indexOf(h) > startChildIndex);
-        const tables = elements.filter(t => {
-          if (t.nodeName !== "TABLE" || t["className"] !== "expandable") {
-            return false;
-          }
-          const childIndex = elements.indexOf(t);
-          return childIndex > startChildIndex && childIndex < endChildIndex;
-        }).map(t => t as Element);
+        const tables = elements
+          .filter(t => {
+            if (t.nodeName !== "TABLE" || t["className"] !== "expandable") {
+              return false;
+            }
+            const childIndex = elements.indexOf(t);
+            return childIndex > startChildIndex && childIndex < endChildIndex;
+          })
+          .map(t => t as Element);
         console.log(url, tables);
         for (const table of tables) {
-          const trainerRows = [ ...table.querySelectorAll("tr:not(:first-child)") ].filter(r => r.children.length === 9);
+          const trainerRows = [...table.querySelectorAll("tr:not(:first-child)")].filter(r => r.children.length === 9);
           for (const row of trainerRows) {
             const nameCell = row.firstElementChild;
             if (!nameCell) {
diff --git a/src/data/trainers/TrainerPartyTemplate.ts b/src/data/trainers/TrainerPartyTemplate.ts
new file mode 100644
index 00000000000..ccc494218e9
--- /dev/null
+++ b/src/data/trainers/TrainerPartyTemplate.ts
@@ -0,0 +1,282 @@
+import { startingWave } from "#app/starting-wave";
+import { globalScene } from "#app/global-scene";
+import { PartyMemberStrength } from "#enums/party-member-strength";
+import { GameModes } from "#app/game-mode";
+import { ClassicFixedBossWaves } from "#enums/fixed-boss-waves";
+
+export class TrainerPartyTemplate {
+  public size: number;
+  public strength: PartyMemberStrength;
+  public sameSpecies: boolean;
+  public balanced: boolean;
+
+  constructor(size: number, strength: PartyMemberStrength, sameSpecies?: boolean, balanced?: boolean) {
+    this.size = size;
+    this.strength = strength;
+    this.sameSpecies = !!sameSpecies;
+    this.balanced = !!balanced;
+  }
+
+  getStrength(_index: number): PartyMemberStrength {
+    return this.strength;
+  }
+
+  isSameSpecies(_index: number): boolean {
+    return this.sameSpecies;
+  }
+
+  isBalanced(_index: number): boolean {
+    return this.balanced;
+  }
+}
+
+export class TrainerPartyCompoundTemplate extends TrainerPartyTemplate {
+  public templates: TrainerPartyTemplate[];
+
+  constructor(...templates: TrainerPartyTemplate[]) {
+    super(
+      templates.reduce((total: number, template: TrainerPartyTemplate) => {
+        total += template.size;
+        return total;
+      }, 0),
+      PartyMemberStrength.AVERAGE,
+    );
+    this.templates = templates;
+  }
+
+  getStrength(index: number): PartyMemberStrength {
+    let t = 0;
+    for (const template of this.templates) {
+      if (t + template.size > index) {
+        return template.getStrength(index - t);
+      }
+      t += template.size;
+    }
+
+    return super.getStrength(index);
+  }
+
+  isSameSpecies(index: number): boolean {
+    let t = 0;
+    for (const template of this.templates) {
+      if (t + template.size > index) {
+        return template.isSameSpecies(index - t);
+      }
+      t += template.size;
+    }
+
+    return super.isSameSpecies(index);
+  }
+
+  isBalanced(index: number): boolean {
+    let t = 0;
+    for (const template of this.templates) {
+      if (t + template.size > index) {
+        return template.isBalanced(index - t);
+      }
+      t += template.size;
+    }
+
+    return super.isBalanced(index);
+  }
+}
+
+export const trainerPartyTemplates = {
+  ONE_WEAK_ONE_STRONG: new TrainerPartyCompoundTemplate(
+    new TrainerPartyTemplate(1, PartyMemberStrength.WEAK),
+    new TrainerPartyTemplate(1, PartyMemberStrength.STRONG),
+  ),
+  ONE_AVG: new TrainerPartyTemplate(1, PartyMemberStrength.AVERAGE),
+  ONE_AVG_ONE_STRONG: new TrainerPartyCompoundTemplate(
+    new TrainerPartyTemplate(1, PartyMemberStrength.AVERAGE),
+    new TrainerPartyTemplate(1, PartyMemberStrength.STRONG),
+  ),
+  ONE_STRONG: new TrainerPartyTemplate(1, PartyMemberStrength.STRONG),
+  ONE_STRONGER: new TrainerPartyTemplate(1, PartyMemberStrength.STRONGER),
+  TWO_WEAKER: new TrainerPartyTemplate(2, PartyMemberStrength.WEAKER),
+  TWO_WEAK: new TrainerPartyTemplate(2, PartyMemberStrength.WEAK),
+  TWO_WEAK_ONE_AVG: new TrainerPartyCompoundTemplate(
+    new TrainerPartyTemplate(2, PartyMemberStrength.WEAK),
+    new TrainerPartyTemplate(1, PartyMemberStrength.AVERAGE),
+  ),
+  TWO_WEAK_SAME_ONE_AVG: new TrainerPartyCompoundTemplate(
+    new TrainerPartyTemplate(2, PartyMemberStrength.WEAK, true),
+    new TrainerPartyTemplate(1, PartyMemberStrength.AVERAGE),
+  ),
+  TWO_WEAK_SAME_TWO_WEAK_SAME: new TrainerPartyCompoundTemplate(
+    new TrainerPartyTemplate(2, PartyMemberStrength.WEAK, true),
+    new TrainerPartyTemplate(2, PartyMemberStrength.WEAK, true),
+  ),
+  TWO_WEAK_ONE_STRONG: new TrainerPartyCompoundTemplate(
+    new TrainerPartyTemplate(2, PartyMemberStrength.WEAK),
+    new TrainerPartyTemplate(1, PartyMemberStrength.STRONG),
+  ),
+  TWO_AVG: new TrainerPartyTemplate(2, PartyMemberStrength.AVERAGE),
+  TWO_AVG_ONE_STRONG: new TrainerPartyCompoundTemplate(
+    new TrainerPartyTemplate(2, PartyMemberStrength.AVERAGE),
+    new TrainerPartyTemplate(1, PartyMemberStrength.STRONG),
+  ),
+  TWO_AVG_SAME_ONE_AVG: new TrainerPartyCompoundTemplate(
+    new TrainerPartyTemplate(2, PartyMemberStrength.AVERAGE, true),
+    new TrainerPartyTemplate(1, PartyMemberStrength.AVERAGE),
+  ),
+  TWO_AVG_SAME_ONE_STRONG: new TrainerPartyCompoundTemplate(
+    new TrainerPartyTemplate(2, PartyMemberStrength.AVERAGE, true),
+    new TrainerPartyTemplate(1, PartyMemberStrength.STRONG),
+  ),
+  TWO_AVG_SAME_TWO_AVG_SAME: new TrainerPartyCompoundTemplate(
+    new TrainerPartyTemplate(2, PartyMemberStrength.AVERAGE, true),
+    new TrainerPartyTemplate(2, PartyMemberStrength.AVERAGE, true),
+  ),
+  TWO_STRONG: new TrainerPartyTemplate(2, PartyMemberStrength.STRONG),
+  THREE_WEAK: new TrainerPartyTemplate(3, PartyMemberStrength.WEAK),
+  THREE_WEAK_SAME: new TrainerPartyTemplate(3, PartyMemberStrength.WEAK, true),
+  THREE_AVG: new TrainerPartyTemplate(3, PartyMemberStrength.AVERAGE),
+  THREE_AVG_SAME: new TrainerPartyTemplate(3, PartyMemberStrength.AVERAGE, true),
+  THREE_WEAK_BALANCED: new TrainerPartyTemplate(3, PartyMemberStrength.WEAK, false, true),
+  FOUR_WEAKER: new TrainerPartyTemplate(4, PartyMemberStrength.WEAKER),
+  FOUR_WEAKER_SAME: new TrainerPartyTemplate(4, PartyMemberStrength.WEAKER, true),
+  FOUR_WEAK: new TrainerPartyTemplate(4, PartyMemberStrength.WEAK),
+  FOUR_WEAK_SAME: new TrainerPartyTemplate(4, PartyMemberStrength.WEAK, true),
+  FOUR_WEAK_BALANCED: new TrainerPartyTemplate(4, PartyMemberStrength.WEAK, false, true),
+  FIVE_WEAKER: new TrainerPartyTemplate(5, PartyMemberStrength.WEAKER),
+  FIVE_WEAK: new TrainerPartyTemplate(5, PartyMemberStrength.WEAK),
+  FIVE_WEAK_BALANCED: new TrainerPartyTemplate(5, PartyMemberStrength.WEAK, false, true),
+  SIX_WEAKER: new TrainerPartyTemplate(6, PartyMemberStrength.WEAKER),
+  SIX_WEAKER_SAME: new TrainerPartyTemplate(6, PartyMemberStrength.WEAKER, true),
+  SIX_WEAK_SAME: new TrainerPartyTemplate(6, PartyMemberStrength.WEAK, true),
+  SIX_WEAK_BALANCED: new TrainerPartyTemplate(6, PartyMemberStrength.WEAK, false, true),
+
+  GYM_LEADER_1: new TrainerPartyCompoundTemplate(
+    new TrainerPartyTemplate(1, PartyMemberStrength.AVERAGE),
+    new TrainerPartyTemplate(1, PartyMemberStrength.STRONG),
+  ),
+  GYM_LEADER_2: new TrainerPartyCompoundTemplate(
+    new TrainerPartyTemplate(1, PartyMemberStrength.AVERAGE),
+    new TrainerPartyTemplate(1, PartyMemberStrength.STRONG),
+    new TrainerPartyTemplate(1, PartyMemberStrength.STRONGER),
+  ),
+  GYM_LEADER_3: new TrainerPartyCompoundTemplate(
+    new TrainerPartyTemplate(2, PartyMemberStrength.AVERAGE),
+    new TrainerPartyTemplate(1, PartyMemberStrength.STRONG),
+    new TrainerPartyTemplate(1, PartyMemberStrength.STRONGER),
+  ),
+  GYM_LEADER_4: new TrainerPartyCompoundTemplate(
+    new TrainerPartyTemplate(3, PartyMemberStrength.AVERAGE),
+    new TrainerPartyTemplate(1, PartyMemberStrength.STRONG),
+    new TrainerPartyTemplate(1, PartyMemberStrength.STRONGER),
+  ),
+  GYM_LEADER_5: new TrainerPartyCompoundTemplate(
+    new TrainerPartyTemplate(3, PartyMemberStrength.AVERAGE),
+    new TrainerPartyTemplate(2, PartyMemberStrength.STRONG),
+    new TrainerPartyTemplate(1, PartyMemberStrength.STRONGER),
+  ),
+
+  ELITE_FOUR: new TrainerPartyCompoundTemplate(
+    new TrainerPartyTemplate(2, PartyMemberStrength.AVERAGE),
+    new TrainerPartyTemplate(3, PartyMemberStrength.STRONG),
+    new TrainerPartyTemplate(1, PartyMemberStrength.STRONGER),
+  ),
+
+  CHAMPION: new TrainerPartyCompoundTemplate(
+    new TrainerPartyTemplate(4, PartyMemberStrength.STRONG),
+    new TrainerPartyTemplate(2, PartyMemberStrength.STRONGER, false, true),
+  ),
+
+  RIVAL: new TrainerPartyCompoundTemplate(
+    new TrainerPartyTemplate(1, PartyMemberStrength.STRONG),
+    new TrainerPartyTemplate(1, PartyMemberStrength.AVERAGE),
+  ),
+  RIVAL_2: new TrainerPartyCompoundTemplate(
+    new TrainerPartyTemplate(1, PartyMemberStrength.STRONG),
+    new TrainerPartyTemplate(1, PartyMemberStrength.AVERAGE),
+    new TrainerPartyTemplate(1, PartyMemberStrength.WEAK, false, true),
+  ),
+  RIVAL_3: new TrainerPartyCompoundTemplate(
+    new TrainerPartyTemplate(1, PartyMemberStrength.STRONG),
+    new TrainerPartyTemplate(1, PartyMemberStrength.AVERAGE),
+    new TrainerPartyTemplate(1, PartyMemberStrength.AVERAGE, false, true),
+    new TrainerPartyTemplate(1, PartyMemberStrength.WEAK, false, true),
+  ),
+  RIVAL_4: new TrainerPartyCompoundTemplate(
+    new TrainerPartyTemplate(1, PartyMemberStrength.STRONG),
+    new TrainerPartyTemplate(1, PartyMemberStrength.AVERAGE),
+    new TrainerPartyTemplate(2, PartyMemberStrength.AVERAGE, false, true),
+    new TrainerPartyTemplate(1, PartyMemberStrength.WEAK, false, true),
+  ),
+  RIVAL_5: new TrainerPartyCompoundTemplate(
+    new TrainerPartyTemplate(1, PartyMemberStrength.STRONG),
+    new TrainerPartyTemplate(1, PartyMemberStrength.AVERAGE),
+    new TrainerPartyTemplate(3, PartyMemberStrength.AVERAGE, false, true),
+    new TrainerPartyTemplate(1, PartyMemberStrength.STRONG),
+  ),
+  RIVAL_6: new TrainerPartyCompoundTemplate(
+    new TrainerPartyTemplate(1, PartyMemberStrength.STRONG),
+    new TrainerPartyTemplate(1, PartyMemberStrength.AVERAGE),
+    new TrainerPartyTemplate(3, PartyMemberStrength.AVERAGE, false, true),
+    new TrainerPartyTemplate(1, PartyMemberStrength.STRONGER),
+  ),
+};
+
+/**
+ * The function to get variable strength grunts
+ * @returns the correct TrainerPartyTemplate
+ */
+export function getEvilGruntPartyTemplate(): TrainerPartyTemplate {
+  const waveIndex = globalScene.currentBattle?.waveIndex;
+  if (waveIndex <= ClassicFixedBossWaves.EVIL_GRUNT_1){
+    return trainerPartyTemplates.TWO_AVG;
+  }
+  if (waveIndex <= ClassicFixedBossWaves.EVIL_GRUNT_2){
+    return trainerPartyTemplates.THREE_AVG;
+  }
+  if (waveIndex <= ClassicFixedBossWaves.EVIL_GRUNT_3){
+    return trainerPartyTemplates.TWO_AVG_ONE_STRONG;
+  }
+  if (waveIndex <= ClassicFixedBossWaves.EVIL_ADMIN_1){
+    return trainerPartyTemplates.GYM_LEADER_4; // 3avg 1 strong 1 stronger
+  }
+  return trainerPartyTemplates.GYM_LEADER_5; // 3 avg 2 strong 1 stronger
+}
+
+export function getWavePartyTemplate(...templates: TrainerPartyTemplate[]) {
+  const { currentBattle, gameMode } = globalScene;
+  const wave = gameMode.getWaveForDifficulty(currentBattle?.waveIndex || startingWave, true);
+  const templateIndex = Math.ceil((wave - 20) / 30);
+  return templates[Phaser.Math.Clamp(templateIndex, 0, templates.length - 1)];
+}
+
+export function getGymLeaderPartyTemplate() {
+  const { currentBattle, gameMode } = globalScene;
+  switch (gameMode.modeId) {
+    case GameModes.DAILY:
+      if (currentBattle?.waveIndex <= 20) {
+        return trainerPartyTemplates.GYM_LEADER_2
+      }
+      return trainerPartyTemplates.GYM_LEADER_3;
+    case GameModes.CHALLENGE: // In the future, there may be a ChallengeType to call here. For now, use classic's.
+    case GameModes.CLASSIC:
+      if (currentBattle?.waveIndex <= 20) {
+        return trainerPartyTemplates.GYM_LEADER_1; // 1 avg 1 strong
+      }
+      else if (currentBattle?.waveIndex <= 30) {
+        return trainerPartyTemplates.GYM_LEADER_2; // 1 avg 1 strong 1 stronger
+      }
+      else if (currentBattle?.waveIndex <= 60) { // 50 and 60
+        return trainerPartyTemplates.GYM_LEADER_3; // 2 avg 1 strong 1 stronger
+      }
+      else if (currentBattle?.waveIndex <= 90) { // 80 and 90
+        return trainerPartyTemplates.GYM_LEADER_4; // 3 avg 1 strong 1 stronger
+      }
+      // 110+
+      return trainerPartyTemplates.GYM_LEADER_5; // 3 avg 2 strong 1 stronger
+    default:
+      return getWavePartyTemplate(
+        trainerPartyTemplates.GYM_LEADER_1,
+        trainerPartyTemplates.GYM_LEADER_2,
+        trainerPartyTemplates.GYM_LEADER_3,
+        trainerPartyTemplates.GYM_LEADER_4,
+        trainerPartyTemplates.GYM_LEADER_5,
+      );
+  }
+}
diff --git a/src/data/trainers/evil-admin-trainer-pools.ts b/src/data/trainers/evil-admin-trainer-pools.ts
new file mode 100644
index 00000000000..fe68cf50c9c
--- /dev/null
+++ b/src/data/trainers/evil-admin-trainer-pools.ts
@@ -0,0 +1,472 @@
+import type { TrainerTierPools } from "#app/data/trainers/typedefs";
+import { TrainerPoolTier } from "#enums/trainer-pool-tier";
+import { Species } from "#enums/species";
+
+/** Team Rocket's admin trainer pool. */
+const ROCKET: TrainerTierPools = {
+  [TrainerPoolTier.COMMON]: [
+    Species.RATTATA,
+    Species.SPEAROW,
+    Species.EKANS,
+    Species.VILEPLUME,
+    Species.DIGLETT,
+    Species.GROWLITHE,
+    Species.GRIMER,
+    Species.DROWZEE,
+    Species.VOLTORB,
+    Species.EXEGGCUTE,
+    Species.CUBONE,
+    Species.KOFFING,
+    Species.MAGIKARP,
+    Species.ZUBAT,
+    Species.ONIX,
+    Species.HOUNDOUR,
+    Species.MURKROW,
+  ],
+  [TrainerPoolTier.UNCOMMON]: [
+    Species.ABRA,
+    Species.GASTLY,
+    Species.OMANYTE,
+    Species.KABUTO,
+    Species.PORYGON,
+    Species.MANKEY,
+    Species.SCYTHER,
+    Species.ELEKID,
+    Species.MAGBY,
+    Species.ALOLA_SANDSHREW,
+    Species.ALOLA_MEOWTH,
+    Species.ALOLA_GEODUDE,
+    Species.ALOLA_GRIMER,
+    Species.PALDEA_TAUROS,
+  ],
+  [TrainerPoolTier.RARE]: [Species.DRATINI, Species.LARVITAR],
+};
+
+/** Team Magma's admin trainer pool */
+const MAGMA: TrainerTierPools = {
+  [TrainerPoolTier.COMMON]: [
+    Species.DIGLETT,
+    Species.GROWLITHE,
+    Species.VULPIX,
+    Species.KOFFING,
+    Species.RHYHORN,
+    Species.SLUGMA,
+    Species.HOUNDOUR,
+    Species.POOCHYENA,
+    Species.TORKOAL,
+    Species.ZANGOOSE,
+    Species.SOLROCK,
+    Species.BALTOY,
+    Species.ROLYCOLY,
+  ],
+  [TrainerPoolTier.UNCOMMON]: [
+    Species.MAGBY,
+    Species.TRAPINCH,
+    Species.LILEEP,
+    Species.ANORITH,
+    Species.GOLETT,
+    Species.FLETCHLING,
+    Species.SALANDIT,
+    Species.TURTONATOR,
+    Species.TOEDSCOOL,
+    Species.CAPSAKID,
+    Species.HISUI_GROWLITHE,
+  ],
+  [TrainerPoolTier.RARE]: [Species.CHARCADET, Species.ARON],
+};
+
+const AQUA: TrainerTierPools = {
+  [TrainerPoolTier.COMMON]: [
+    Species.TENTACOOL,
+    Species.GRIMER,
+    Species.AZURILL,
+    Species.CHINCHOU,
+    Species.REMORAID,
+    Species.POOCHYENA,
+    Species.LOTAD,
+    Species.WINGULL,
+    Species.WAILMER,
+    Species.SEVIPER,
+    Species.BARBOACH,
+    Species.CORPHISH,
+    Species.SPHEAL,
+    Species.CLAMPERL,
+  ],
+  [TrainerPoolTier.UNCOMMON]: [
+    Species.MANTYKE,
+    Species.HORSEA,
+    Species.FEEBAS,
+    Species.TYMPOLE,
+    Species.SKRELP,
+    Species.WIMPOD,
+    Species.DHELMISE,
+    Species.ARROKUDA,
+    Species.CLOBBOPUS,
+    Species.HISUI_QWILFISH,
+    Species.WIGLETT,
+  ],
+  [TrainerPoolTier.RARE]: [Species.BASCULEGION, Species.DONDOZO],
+};
+
+const GALACTIC: TrainerTierPools = {
+  [TrainerPoolTier.COMMON]: [
+    Species.ZUBAT,
+    Species.MAGNEMITE,
+    Species.RHYHORN,
+    Species.TANGELA,
+    Species.LICKITUNG,
+    Species.MAGIKARP,
+    Species.YANMA,
+    Species.MURKROW,
+    Species.SWINUB,
+    Species.ELEKID,
+    Species.MAGBY,
+    Species.BRONZOR,
+    Species.SKORUPI,
+  ],
+  [TrainerPoolTier.UNCOMMON]: [
+    Species.ABRA,
+    Species.GLIGAR,
+    Species.SNEASEL,
+    Species.DUSKULL,
+    Species.DRIFLOON,
+    Species.CRANIDOS,
+    Species.SHIELDON,
+    Species.ROTOM,
+    Species.HISUI_QWILFISH,
+  ],
+  [TrainerPoolTier.RARE]: [Species.SPIRITOMB, Species.TEDDIURSA, Species.HISUI_SNEASEL, Species.HISUI_LILLIGANT],
+};
+
+const PLASMA_ZINZOLIN: TrainerTierPools = {
+  [TrainerPoolTier.COMMON]: [
+    Species.SNEASEL,
+    Species.SWINUB,
+    Species.SNORUNT,
+    Species.SNOVER,
+    Species.TIMBURR,
+    Species.TYMPOLE,
+    Species.SANDILE,
+    Species.DARUMAKA,
+    Species.VANILLITE,
+    Species.FOONGUS,
+    Species.FRILLISH,
+    Species.JOLTIK,
+    Species.FERROSEED,
+    Species.CUBCHOO,
+    Species.GALAR_DARUMAKA,
+  ],
+  [TrainerPoolTier.UNCOMMON]: [
+    Species.SPHEAL,
+    Species.DRILBUR,
+    Species.SIGILYPH,
+    Species.YAMASK,
+    Species.ZORUA,
+    Species.TYNAMO,
+    Species.MIENFOO,
+    Species.GOLETT,
+    Species.PAWNIARD,
+    Species.VULLABY,
+    Species.DURANT,
+    Species.BERGMITE,
+    Species.EISCUE,
+    Species.ALOLA_SANDSHREW,
+    Species.HISUI_ZORUA,
+  ],
+  [TrainerPoolTier.RARE]: [Species.DEINO, Species.FRIGIBAX, Species.HISUI_BRAVIARY],
+};
+
+const PLASMA_COLRESS: TrainerTierPools = {
+  [TrainerPoolTier.COMMON]: [
+    Species.MAGNEMITE,
+    Species.GRIMER,
+    Species.VOLTORB,
+    Species.PORYGON,
+    Species.BRONZOR,
+    Species.ROTOM,
+    Species.MUNNA,
+    Species.DWEBBLE,
+    Species.FERROSEED,
+    Species.ELGYEM,
+  ],
+  [TrainerPoolTier.UNCOMMON]: [
+    Species.BELDUM,
+    Species.SIGILYPH,
+    Species.TIRTOUGA,
+    Species.ARCHEN,
+    Species.TYNAMO,
+    Species.GOLETT,
+    Species.BLIPBUG,
+    Species.VAROOM,
+    Species.ALOLA_GRIMER,
+    Species.HISUI_VOLTORB,
+  ],
+  [TrainerPoolTier.RARE]: [Species.ELEKID, Species.MAGBY, Species.PAWNIARD, Species.DURALUDON],
+};
+
+const FLARE: TrainerTierPools = {
+  [TrainerPoolTier.COMMON]: [
+    Species.ELECTRIKE,
+    Species.SKORUPI,
+    Species.PURRLOIN,
+    Species.FOONGUS,
+    Species.BUNNELBY,
+    Species.FLETCHLING,
+    Species.LITLEO,
+    Species.PANGORO,
+    Species.ESPURR,
+    Species.INKAY,
+    Species.CLAUNCHER,
+    Species.HELIOPTILE,
+  ],
+  [TrainerPoolTier.UNCOMMON]: [
+    Species.HOUNDOUR,
+    Species.SNEASEL,
+    Species.LITWICK,
+    Species.HONEDGE,
+    Species.BINACLE,
+    Species.SKRELP,
+    Species.NOIBAT,
+    Species.PHANTUMP,
+    Species.PUMPKABOO,
+  ],
+  [TrainerPoolTier.RARE]: [Species.GOOMY, Species.HISUI_AVALUGG],
+};
+
+const AETHER: TrainerTierPools = {
+  [TrainerPoolTier.COMMON]: [
+    Species.ABRA,
+    Species.SLOWPOKE,
+    Species.MAGNEMITE,
+    Species.EXEGGUTOR,
+    Species.NATU,
+    Species.BALTOY,
+    Species.MIME_JR,
+    Species.ELGYEM,
+    Species.INKAY,
+    Species.BRUXISH,
+    Species.BLIPBUG,
+    Species.ALOLA_RAICHU,
+  ],
+  [TrainerPoolTier.UNCOMMON]: [
+    Species.RALTS,
+    Species.MEDITITE,
+    Species.BELDUM,
+    Species.SOLOSIS,
+    Species.HATENNA,
+    Species.STANTLER,
+    Species.GIRAFARIG,
+    Species.ALOLA_GRIMER,
+    Species.GALAR_SLOWPOKE,
+  ],
+  [TrainerPoolTier.RARE]: [Species.PORYGON, Species.ARMAROUGE],
+};
+
+const SKULL: TrainerTierPools = {
+  [TrainerPoolTier.COMMON]: [
+    Species.GASTLY,
+    Species.KOFFING,
+    Species.ZUBAT,
+    Species.VENONAT,
+    Species.STUNKY,
+    Species.CROAGUNK,
+    Species.VENIPEDE,
+    Species.SCRAGGY,
+    Species.MAREANIE,
+    Species.FOMANTIS,
+    Species.ALOLA_GRIMER,
+  ],
+  [TrainerPoolTier.UNCOMMON]: [
+    Species.NIDORAN_F,
+    Species.SKORUPI,
+    Species.PAWNIARD,
+    Species.VULLABY,
+    Species.TOXEL,
+    Species.GLIMMET,
+    Species.PALDEA_WOOPER,
+    Species.GALAR_SLOWPOKE,
+  ],
+  [TrainerPoolTier.RARE]: [Species.SKRELP, Species.HISUI_SNEASEL],
+};
+
+const MACRO_COSMOS: TrainerTierPools = {
+  [TrainerPoolTier.COMMON]: [
+    Species.VULPIX,
+    Species.FEEBAS,
+    Species.MAWILE,
+    Species.FROSLASS,
+    Species.GOTHITA,
+    Species.FLABEBE,
+    Species.SALANDIT,
+    Species.TSAREENA,
+    Species.SINISTEA,
+    Species.HATENNA,
+    Species.INDEEDEE,
+    Species.GALAR_PONYTA,
+  ],
+  [TrainerPoolTier.UNCOMMON]: [
+    Species.TOGEPI,
+    Species.VULLABY,
+    Species.MAREANIE,
+    Species.CUFANT,
+    Species.TINKATINK,
+    Species.ALOLA_VULPIX,
+    Species.GALAR_CORSOLA,
+  ],
+  [TrainerPoolTier.RARE]: [Species.APPLIN, Species.HISUI_LILLIGANT],
+};
+
+const STAR_DARK: TrainerTierPools = {
+  [TrainerPoolTier.COMMON]: [
+    Species.MURKROW,
+    Species.SEEDOT,
+    Species.SABLEYE,
+    Species.CACNEA,
+    Species.STUNKY,
+    Species.SANDILE,
+    Species.INKAY,
+    Species.NYMBLE,
+    Species.MASCHIFF,
+  ],
+  [TrainerPoolTier.UNCOMMON]: [
+    Species.UMBREON,
+    Species.CORPHISH,
+    Species.SNEASEL,
+    Species.ZORUA,
+    Species.IMPIDIMP,
+    Species.BOMBIRDIER,
+    Species.GALAR_ZIGZAGOON,
+  ],
+  [TrainerPoolTier.RARE]: [Species.DEINO, Species.SPRIGATITO],
+};
+
+const STAR_FIRE: TrainerTierPools = {
+  [TrainerPoolTier.COMMON]: [
+    Species.GROWLITHE,
+    Species.HOUNDOUR,
+    Species.NUMEL,
+    Species.TORKOAL,
+    Species.FLETCHLING,
+    Species.LITLEO,
+    Species.SIZZLIPEDE,
+    Species.ROLYCOLY,
+    Species.CAPSAKID,
+  ],
+  [TrainerPoolTier.UNCOMMON]: [
+    Species.PONYTA,
+    Species.FLAREON,
+    Species.MAGBY,
+    Species.DARUMAKA,
+    Species.LITWICK,
+    Species.SALANDIT,
+    Species.TURTONATOR,
+  ],
+  [TrainerPoolTier.RARE]: [Species.LARVESTA, Species.FUECOCO],
+};
+
+const STAR_POISON: TrainerTierPools = {
+  [TrainerPoolTier.COMMON]: [
+    Species.GRIMER,
+    Species.VENONAT,
+    Species.SEVIPER,
+    Species.STUNKY,
+    Species.FOONGUS,
+    Species.MAREANIE,
+    Species.TOXEL,
+    Species.GRAFAIAI,
+    Species.PALDEA_WOOPER,
+  ],
+  [TrainerPoolTier.UNCOMMON]: [
+    Species.ZUBAT,
+    Species.GASTLY,
+    Species.SKRELP,
+    Species.OVERQWIL,
+    Species.ALOLA_GRIMER,
+    Species.GALAR_SLOWPOKE,
+  ],
+  [TrainerPoolTier.RARE]: [Species.GLIMMET, Species.BULBASAUR],
+};
+
+const STAR_FAIRY: TrainerTierPools = {
+  [TrainerPoolTier.COMMON]: [
+    Species.IGGLYBUFF,
+    Species.AZURILL,
+    Species.COTTONEE,
+    Species.FLABEBE,
+    Species.KLEFKI,
+    Species.CUTIEFLY,
+    Species.HATENNA,
+    Species.TINKATINK,
+  ],
+  [TrainerPoolTier.UNCOMMON]: [
+    Species.CLEFFA,
+    Species.TOGEPI,
+    Species.GARDEVOIR,
+    Species.SYLVEON,
+    Species.MIMIKYU,
+    Species.IMPIDIMP,
+    Species.ALOLA_VULPIX,
+  ],
+  [TrainerPoolTier.RARE]: [Species.GALAR_PONYTA, Species.POPPLIO],
+};
+
+const STAR_FIGHTING: TrainerTierPools = {
+  [TrainerPoolTier.COMMON]: [
+    Species.TYROGUE,
+    Species.SHROOMISH,
+    Species.MAKUHITA,
+    Species.RIOLU,
+    Species.CROAGUNK,
+    Species.SCRAGGY,
+    Species.MIENFOO,
+    Species.PASSIMIAN,
+    Species.PAWMI,
+  ],
+  [TrainerPoolTier.UNCOMMON]: [
+    Species.MEDITITE,
+    Species.GALLADE,
+    Species.TIMBURR,
+    Species.HAWLUCHA,
+    Species.STUFFUL,
+    Species.FALINKS,
+    Species.FLAMIGO,
+    Species.PALDEA_TAUROS,
+  ],
+  [TrainerPoolTier.RARE]: [Species.JANGMO_O, Species.QUAXLY],
+};
+
+export type EvilTeam =
+  | "rocket"
+  | "magma"
+  | "aqua"
+  | "galactic"
+  | "plasma_zinzolin"
+  | "plasma_colress"
+  | "flare"
+  | "aether"
+  | "skull"
+  | "macro_cosmos"
+  | "star_dark"
+  | "star_fire"
+  | "star_poison"
+  | "star_fairy"
+  | "star_fighting";
+
+/** Trainer pools for each evil admin team */
+export const evilAdminTrainerPools: Record<EvilTeam, TrainerTierPools> = {
+  rocket: ROCKET,
+  magma: MAGMA,
+  aqua: AQUA,
+  galactic: GALACTIC,
+  plasma_zinzolin: PLASMA_ZINZOLIN,
+  plasma_colress: PLASMA_COLRESS,
+  flare: FLARE,
+  aether: AETHER,
+  macro_cosmos: MACRO_COSMOS,
+  skull: SKULL,
+  star_dark: STAR_DARK,
+  star_fire: STAR_FIRE,
+  star_poison: STAR_POISON,
+  star_fairy: STAR_FAIRY,
+  star_fighting: STAR_FIGHTING,
+};
diff --git a/src/data/trainers/trainer-config.ts b/src/data/trainers/trainer-config.ts
new file mode 100644
index 00000000000..839a1cdc0cc
--- /dev/null
+++ b/src/data/trainers/trainer-config.ts
@@ -0,0 +1,6003 @@
+import { globalScene } from "#app/global-scene";
+import { modifierTypes } from "#app/modifier/modifier-type";
+import { PokemonMove } from "#app/field/pokemon";
+import { toReadableString, isNullOrUndefined, randSeedItem, randSeedInt, randSeedIntRange } from "#app/utils/common";
+import { pokemonEvolutions, pokemonPrevolutions } from "#app/data/balance/pokemon-evolutions";
+import { getPokemonSpecies } from "#app/data/pokemon-species";
+import { tmSpecies } from "#app/data/balance/tms";
+import { doubleBattleDialogue } from "#app/data/dialogue";
+import { TrainerVariant } from "#app/field/trainer";
+import { getIsInitialized, initI18n } from "#app/plugins/i18n";
+import i18next from "i18next";
+import { Gender } from "#app/data/gender";
+import { signatureSpecies } from "../balance/signature-species";
+import {
+  getEvilGruntPartyTemplate,
+  getGymLeaderPartyTemplate,
+  getWavePartyTemplate,
+  TrainerPartyCompoundTemplate,
+  TrainerPartyTemplate,
+  trainerPartyTemplates,
+} from "./TrainerPartyTemplate";
+import { evilAdminTrainerPools } from "./evil-admin-trainer-pools";
+
+// Enum imports
+import { PartyMemberStrength } from "#enums/party-member-strength";
+import { Species } from "#enums/species";
+import { PokeballType } from "#enums/pokeball";
+import { PokemonType } from "#enums/pokemon-type";
+import { Moves } from "#enums/moves";
+import { Abilities } from "#enums/abilities";
+import { TeraAIMode } from "#enums/tera-ai-mode";
+import { TrainerPoolTier } from "#enums/trainer-pool-tier";
+import { TrainerSlot } from "#enums/trainer-slot";
+import { TrainerType } from "#enums/trainer-type";
+import { timedEventManager } from "#app/global-event-manager";
+
+// Type imports
+import type { PokemonSpeciesFilter } from "#app/data/pokemon-species";
+import type PokemonSpecies from "#app/data/pokemon-species";
+import type { ModifierTypeFunc } from "#app/modifier/modifier-type";
+import type { EnemyPokemon } from "#app/field/pokemon";
+import type { EvilTeam } from "./evil-admin-trainer-pools";
+import type {
+  PartyMemberFunc,
+  GenModifiersFunc,
+  GenAIFunc,
+  PartyTemplateFunc,
+  TrainerTierPools,
+  TrainerConfigs,
+  PartyMemberFuncs,
+} from "./typedefs";
+
+/** Minimum BST for Pokemon generated onto the Elite Four's teams */
+const ELITE_FOUR_MINIMUM_BST = 460;
+
+/** The wave at which (non-Paldean) Gym Leaders start having Tera mons*/
+const GYM_LEADER_TERA_WAVE = 100;
+
+/**
+ * Stores data and helper functions about a trainers AI options.
+ */
+export class TrainerAI {
+  public teraMode: TeraAIMode = TeraAIMode.NO_TERA;
+  public instantTeras: number[];
+
+  /**
+   * @param canTerastallize Whether this trainer is allowed to tera
+   */
+  constructor(teraMode: TeraAIMode = TeraAIMode.NO_TERA) {
+    this.teraMode = teraMode;
+    this.instantTeras = [];
+  }
+
+  /**
+   * Checks if a trainer can tera
+   * @returns Whether this trainer can currently tera
+   */
+  public canTerastallize() {
+    return this.teraMode !== TeraAIMode.NO_TERA;
+  }
+
+  /**
+   * Sets a pokemon on this AI to just instantly Tera on first move used
+   * @param index The index of the pokemon to instantly tera.
+   */
+  public setInstantTera(index: number) {
+    this.teraMode = TeraAIMode.INSTANT_TERA;
+    this.instantTeras.push(index);
+  }
+}
+
+export class TrainerConfig {
+  public trainerType: TrainerType;
+  public trainerTypeDouble: TrainerType;
+  public name: string;
+  public nameFemale: string;
+  public nameDouble: string;
+  public title: string;
+  public titleDouble: string;
+  public hasGenders = false;
+  public hasDouble = false;
+  public hasCharSprite = false;
+  public doubleOnly = false;
+  public moneyMultiplier = 1;
+  public isBoss = false;
+  public hasStaticParty = false;
+  public useSameSeedForAllMembers = false;
+  public mixedBattleBgm: string;
+  public battleBgm: string;
+  public encounterBgm: string;
+  public femaleEncounterBgm: string;
+  public doubleEncounterBgm: string;
+  public victoryBgm: string;
+  public genModifiersFunc: GenModifiersFunc;
+  public genAIFuncs: GenAIFunc[] = [];
+  public modifierRewardFuncs: ModifierTypeFunc[] = [];
+  public partyTemplates: TrainerPartyTemplate[];
+  public partyTemplateFunc: PartyTemplateFunc;
+  public partyMemberFuncs: PartyMemberFuncs = {};
+  public speciesPools: TrainerTierPools;
+  public speciesFilter: PokemonSpeciesFilter;
+  public specialtyType: PokemonType;
+  public hasVoucher = false;
+  public trainerAI: TrainerAI;
+
+  public encounterMessages: string[] = [];
+  public victoryMessages: string[] = [];
+  public defeatMessages: string[] = [];
+
+  public femaleEncounterMessages: string[];
+  public femaleVictoryMessages: string[];
+  public femaleDefeatMessages: string[];
+
+  public doubleEncounterMessages: string[];
+  public doubleVictoryMessages: string[];
+  public doubleDefeatMessages: string[];
+
+  constructor(trainerType: TrainerType, allowLegendaries?: boolean) {
+    this.trainerType = trainerType;
+    this.trainerAI = new TrainerAI();
+    this.name = toReadableString(TrainerType[this.getDerivedType()]);
+    this.battleBgm = "battle_trainer";
+    this.mixedBattleBgm = "battle_trainer";
+    this.victoryBgm = "victory_trainer";
+    this.partyTemplates = [trainerPartyTemplates.TWO_AVG];
+    this.speciesFilter = species =>
+      (allowLegendaries || (!species.legendary && !species.subLegendary && !species.mythical)) &&
+      !species.isTrainerForbidden();
+  }
+
+  getKey(): string {
+    return TrainerType[this.getDerivedType()].toString().toLowerCase();
+  }
+
+  getSpriteKey(female?: boolean, isDouble = false): string {
+    let ret = this.getKey();
+    if (this.hasGenders) {
+      ret += `_${female ? "f" : "m"}`;
+    }
+    // If a special double trainer class was set, set it as the sprite key
+    if (this.trainerTypeDouble && female && isDouble) {
+      // Get the derived type for the double trainer since the sprite key is based on the derived type
+      ret = TrainerType[this.getDerivedType(this.trainerTypeDouble)].toString().toLowerCase();
+    }
+    return ret;
+  }
+
+  setName(name: string): TrainerConfig {
+    if (name === "Finn") {
+      // Give the rival a localized name
+      // First check if i18n is initialized
+      if (!getIsInitialized()) {
+        initI18n();
+      }
+      // This is only the male name, because the female name is handled in a different function (setHasGenders)
+      if (name === "Finn") {
+        name = i18next.t("trainerNames:rival");
+      }
+    }
+
+    this.name = name;
+
+    return this;
+  }
+
+  /**
+   * Sets if a boss trainer will have a voucher or not.
+   * @param hasVoucher - If the boss trainer will have a voucher.
+   */
+  setHasVoucher(hasVoucher: boolean): void {
+    this.hasVoucher = hasVoucher;
+  }
+
+  setTitle(title: string): TrainerConfig {
+    // First check if i18n is initialized
+    if (!getIsInitialized()) {
+      initI18n();
+    }
+
+    // Make the title lowercase and replace spaces with underscores
+    title = title.toLowerCase().replace(/\s/g, "_");
+
+    // Get the title from the i18n file
+    this.title = i18next.t(`titles:${title}`);
+
+    return this;
+  }
+
+  /**
+   * Returns the derived trainer type for a given trainer type.
+   * @param trainerTypeToDeriveFrom - The trainer type to derive from. (If null, the this.trainerType property will be used.)
+   * @returns {TrainerType} - The derived trainer type.
+   */
+  getDerivedType(trainerTypeToDeriveFrom: TrainerType | null = null): TrainerType {
+    let trainerType = trainerTypeToDeriveFrom ? trainerTypeToDeriveFrom : this.trainerType;
+    switch (trainerType) {
+      case TrainerType.RIVAL_2:
+      case TrainerType.RIVAL_3:
+      case TrainerType.RIVAL_4:
+      case TrainerType.RIVAL_5:
+      case TrainerType.RIVAL_6:
+        trainerType = TrainerType.RIVAL;
+        break;
+      case TrainerType.LANCE_CHAMPION:
+        trainerType = TrainerType.LANCE;
+        break;
+      case TrainerType.LARRY_ELITE:
+        trainerType = TrainerType.LARRY;
+        break;
+      case TrainerType.ROCKET_BOSS_GIOVANNI_1:
+      case TrainerType.ROCKET_BOSS_GIOVANNI_2:
+        trainerType = TrainerType.GIOVANNI;
+        break;
+      case TrainerType.MAXIE_2:
+        trainerType = TrainerType.MAXIE;
+        break;
+      case TrainerType.ARCHIE_2:
+        trainerType = TrainerType.ARCHIE;
+        break;
+      case TrainerType.CYRUS_2:
+        trainerType = TrainerType.CYRUS;
+        break;
+      case TrainerType.GHETSIS_2:
+        trainerType = TrainerType.GHETSIS;
+        break;
+      case TrainerType.LYSANDRE_2:
+        trainerType = TrainerType.LYSANDRE;
+        break;
+      case TrainerType.LUSAMINE_2:
+        trainerType = TrainerType.LUSAMINE;
+        break;
+      case TrainerType.GUZMA_2:
+        trainerType = TrainerType.GUZMA;
+        break;
+      case TrainerType.ROSE_2:
+        trainerType = TrainerType.ROSE;
+        break;
+      case TrainerType.PENNY_2:
+        trainerType = TrainerType.PENNY;
+        break;
+      case TrainerType.MARNIE_ELITE:
+        trainerType = TrainerType.MARNIE;
+        break;
+      case TrainerType.NESSA_ELITE:
+        trainerType = TrainerType.NESSA;
+        break;
+      case TrainerType.BEA_ELITE:
+        trainerType = TrainerType.BEA;
+        break;
+      case TrainerType.ALLISTER_ELITE:
+        trainerType = TrainerType.ALLISTER;
+        break;
+      case TrainerType.RAIHAN_ELITE:
+        trainerType = TrainerType.RAIHAN;
+        break;
+    }
+
+    return trainerType;
+  }
+
+  /**
+   * Sets the configuration for trainers with genders, including the female name and encounter background music (BGM).
+   * @param {string} [nameFemale] The name of the female trainer. If 'Ivy', a localized name will be assigned.
+   * @param {TrainerType | string} [femaleEncounterBgm] The encounter BGM for the female trainer, which can be a TrainerType or a string.
+   * @returns {TrainerConfig} The updated TrainerConfig instance.
+   **/
+  setHasGenders(nameFemale?: string, femaleEncounterBgm?: TrainerType | string): TrainerConfig {
+    // If the female name is 'Ivy' (the rival), assign a localized name.
+    if (nameFemale === "Ivy") {
+      // Check if the internationalization (i18n) system is initialized.
+      if (!getIsInitialized()) {
+        // Initialize the i18n system if it is not already initialized.
+        initI18n();
+      }
+      // Set the localized name for the female rival.
+      this.nameFemale = i18next.t("trainerNames:rival_female");
+    } else {
+      // Otherwise, assign the provided female name.
+      this.nameFemale = nameFemale!; // TODO: is this bang correct?
+    }
+
+    // Indicate that this trainer configuration includes genders.
+    this.hasGenders = true;
+
+    // If a female encounter BGM is provided.
+    if (femaleEncounterBgm) {
+      // If the BGM is a TrainerType (number), convert it to a string, replace underscores with spaces, and convert to lowercase.
+      // Otherwise, assign the provided string as the BGM.
+      this.femaleEncounterBgm =
+        typeof femaleEncounterBgm === "number"
+          ? TrainerType[femaleEncounterBgm].toString().replace(/_/g, " ").toLowerCase()
+          : femaleEncounterBgm;
+    }
+
+    // Return the updated TrainerConfig instance.
+    return this;
+  }
+
+  /**
+   * Sets the configuration for trainers with double battles, including the name of the double trainer and the encounter BGM.
+   * @param nameDouble The name of the double trainer (e.g., "Ace Duo" for Trainer Class Doubles or "red_blue_double" for NAMED trainer doubles).
+   * @param doubleEncounterBgm The encounter BGM for the double trainer, which can be a TrainerType or a string.
+   * @returns {TrainerConfig} The updated TrainerConfig instance.
+   */
+  setHasDouble(nameDouble: string, doubleEncounterBgm?: TrainerType | string): TrainerConfig {
+    this.hasDouble = true;
+    this.nameDouble = nameDouble;
+    if (doubleEncounterBgm) {
+      this.doubleEncounterBgm =
+        typeof doubleEncounterBgm === "number"
+          ? TrainerType[doubleEncounterBgm].toString().replace(/\_/g, " ").toLowerCase()
+          : doubleEncounterBgm;
+    }
+    return this;
+  }
+
+  /**
+   * Sets the trainer type for double battles.
+   * @param trainerTypeDouble The TrainerType of the partner in a double battle.
+   * @returns {TrainerConfig} The updated TrainerConfig instance.
+   */
+  setDoubleTrainerType(trainerTypeDouble: TrainerType): TrainerConfig {
+    this.trainerTypeDouble = trainerTypeDouble;
+    this.setDoubleMessages(this.nameDouble);
+    return this;
+  }
+
+  /**
+   * Sets the encounter and victory messages for double trainers.
+   * @param nameDouble - The name of the pair (e.g. "red_blue_double").
+   */
+  setDoubleMessages(nameDouble: string) {
+    // Check if there is double battle dialogue for this trainer
+    if (doubleBattleDialogue[nameDouble]) {
+      // Set encounter and victory messages for double trainers
+      this.doubleEncounterMessages = doubleBattleDialogue[nameDouble].encounter;
+      this.doubleVictoryMessages = doubleBattleDialogue[nameDouble].victory;
+      this.doubleDefeatMessages = doubleBattleDialogue[nameDouble].defeat;
+    }
+  }
+
+  /**
+   * Sets the title for double trainers
+   * @param titleDouble The key for the title in the i18n file. (e.g., "champion_double").
+   * @returns {TrainerConfig} The updated TrainerConfig instance.
+   */
+  setDoubleTitle(titleDouble: string): TrainerConfig {
+    // First check if i18n is initialized
+    if (!getIsInitialized()) {
+      initI18n();
+    }
+
+    // Make the title lowercase and replace spaces with underscores
+    titleDouble = titleDouble.toLowerCase().replace(/\s/g, "_");
+
+    // Get the title from the i18n file
+    this.titleDouble = i18next.t(`titles:${titleDouble}`);
+
+    return this;
+  }
+
+  setHasCharSprite(): TrainerConfig {
+    this.hasCharSprite = true;
+    return this;
+  }
+
+  setDoubleOnly(): TrainerConfig {
+    this.doubleOnly = true;
+    return this;
+  }
+
+  setMoneyMultiplier(moneyMultiplier: number): TrainerConfig {
+    this.moneyMultiplier = moneyMultiplier;
+    return this;
+  }
+
+  setBoss(): TrainerConfig {
+    this.isBoss = true;
+    return this;
+  }
+
+  setStaticParty(): TrainerConfig {
+    this.hasStaticParty = true;
+    return this;
+  }
+
+  setUseSameSeedForAllMembers(): TrainerConfig {
+    this.useSameSeedForAllMembers = true;
+    return this;
+  }
+
+  setMixedBattleBgm(mixedBattleBgm: string): TrainerConfig {
+    this.mixedBattleBgm = mixedBattleBgm;
+    return this;
+  }
+
+  setBattleBgm(battleBgm: string): TrainerConfig {
+    this.battleBgm = battleBgm;
+    return this;
+  }
+
+  setEncounterBgm(encounterBgm: TrainerType | string): TrainerConfig {
+    this.encounterBgm =
+      typeof encounterBgm === "number" ? TrainerType[encounterBgm].toString().toLowerCase() : encounterBgm;
+    return this;
+  }
+
+  setVictoryBgm(victoryBgm: string): TrainerConfig {
+    this.victoryBgm = victoryBgm;
+    return this;
+  }
+
+  setPartyTemplates(...partyTemplates: TrainerPartyTemplate[]): TrainerConfig {
+    this.partyTemplates = partyTemplates;
+    return this;
+  }
+
+  setPartyTemplateFunc(partyTemplateFunc: PartyTemplateFunc): TrainerConfig {
+    this.partyTemplateFunc = partyTemplateFunc;
+    return this;
+  }
+
+  setPartyMemberFunc(slotIndex: number, partyMemberFunc: PartyMemberFunc): TrainerConfig {
+    this.partyMemberFuncs[slotIndex] = partyMemberFunc;
+    return this;
+  }
+
+  setSpeciesPools(speciesPools: TrainerTierPools | Species[]): TrainerConfig {
+    this.speciesPools = (Array.isArray(speciesPools)
+      ? { [TrainerPoolTier.COMMON]: speciesPools }
+      : speciesPools) as unknown as TrainerTierPools;
+    return this;
+  }
+
+  setSpeciesFilter(speciesFilter: PokemonSpeciesFilter, allowLegendaries?: boolean): TrainerConfig {
+    const baseFilter = this.speciesFilter;
+    this.speciesFilter = allowLegendaries ? speciesFilter : species => speciesFilter(species) && baseFilter(species);
+    return this;
+  }
+
+  setSpecialtyType(specialtyType: PokemonType): TrainerConfig {
+    this.specialtyType = specialtyType;
+    return this;
+  }
+
+  setGenModifiersFunc(genModifiersFunc: GenModifiersFunc): TrainerConfig {
+    this.genModifiersFunc = genModifiersFunc;
+    return this;
+  }
+
+  /**
+   * Sets random pokemon from the trainer's team to instant tera. Also sets Tera type to specialty type and checks for Shedinja as appropriate.
+   * @param count A callback (yucky) to see how many teras should be used
+   * @param slot Optional, a specified slot that should be terastallized. Wraps to match party size (-1 will get the last slot and so on).
+   * @returns this
+   */
+  setRandomTeraModifiers(count: () => number, slot?: number): TrainerConfig {
+    this.genAIFuncs.push((party: EnemyPokemon[]) => {
+      const shedinjaCanTera = !this.hasSpecialtyType() || this.specialtyType === PokemonType.BUG; // Better to check one time than 6
+      const partyMemberIndexes = new Array(party.length)
+        .fill(null)
+        .map((_, i) => i)
+        .filter(i => shedinjaCanTera || party[i].species.speciesId !== Species.SHEDINJA); // Shedinja can only Tera on Bug specialty type (or no specialty type)
+      const setPartySlot = !isNullOrUndefined(slot) ? Phaser.Math.Wrap(slot, 0, party.length) : -1; // If we have a tera slot defined, wrap it to party size.
+      for (let t = 0; t < Math.min(count(), party.length); t++) {
+        const randomIndex =
+          partyMemberIndexes.indexOf(setPartySlot) > -1 ? setPartySlot : randSeedItem(partyMemberIndexes);
+        partyMemberIndexes.splice(partyMemberIndexes.indexOf(randomIndex), 1);
+        if (this.hasSpecialtyType()) {
+          party[randomIndex].teraType = this.specialtyType;
+        }
+        this.trainerAI.setInstantTera(randomIndex);
+      }
+    });
+    return this;
+  }
+
+  /**
+   * Sets a specific pokemon to instantly Tera
+   * @param index The index within the team to have instant Tera.
+   * @returns this
+   */
+  setInstantTera(index: number): TrainerConfig {
+    this.trainerAI.setInstantTera(index);
+    return this;
+  }
+
+  // function getRandomTeraModifiers(party: EnemyPokemon[], count: integer, types?: Type[]): PersistentModifier[] {
+  //   const ret: PersistentModifier[] = [];
+  //   const partyMemberIndexes = new Array(party.length).fill(null).map((_, i) => i);
+  //   for (let t = 0; t < Math.min(count, party.length); t++) {
+  //     const randomIndex = Utils.randSeedItem(partyMemberIndexes);
+  //     partyMemberIndexes.splice(partyMemberIndexes.indexOf(randomIndex), 1);
+  //     ret.push(modifierTypes.TERA_SHARD().generateType([], [ Utils.randSeedItem(types ? types : party[randomIndex].getTypes()) ])!.withIdFromFunc(modifierTypes.TERA_SHARD).newModifier(party[randomIndex]) as PersistentModifier); // TODO: is the bang correct?
+  //   }
+  //   return ret;
+  // }
+
+  setModifierRewardFuncs(...modifierTypeFuncs: (() => ModifierTypeFunc)[]): TrainerConfig {
+    this.modifierRewardFuncs = modifierTypeFuncs.map(func => () => {
+      const modifierTypeFunc = func();
+      const modifierType = modifierTypeFunc();
+      modifierType.withIdFromFunc(modifierTypeFunc);
+      return modifierType;
+    });
+    return this;
+  }
+
+  /**
+   * Initializes the trainer configuration for an evil team admin.
+   * @param title The title of the evil team admin.
+   * @param poolName The evil team the admin belongs to.
+   * @param {Species | Species[]} signatureSpecies The signature species for the evil team leader.
+   * @param specialtyType The specialty Type of the admin, if they have one
+   * @returns {TrainerConfig} The updated TrainerConfig instance.
+   * **/
+  initForEvilTeamAdmin(
+    title: string,
+    poolName: EvilTeam,
+    signatureSpecies: (Species | Species[])[],
+    specialtyType?: PokemonType,
+  ): TrainerConfig {
+    if (!getIsInitialized()) {
+      initI18n();
+    }
+
+    if (!isNullOrUndefined(specialtyType)) {
+      this.setSpecialtyType(specialtyType);
+    }
+
+    this.setPartyTemplates(trainerPartyTemplates.RIVAL_5);
+
+    // Set the species pools for the evil team admin.
+    this.speciesPools = evilAdminTrainerPools[poolName];
+
+    signatureSpecies.forEach((speciesPool, s) => {
+      if (!Array.isArray(speciesPool)) {
+        speciesPool = [speciesPool];
+      }
+      this.setPartyMemberFunc(-(s + 1), getRandomPartyMemberFunc(speciesPool));
+    });
+
+    const nameForCall = this.name.toLowerCase().replace(/\s/g, "_");
+    this.name = i18next.t(`trainerNames:${nameForCall}`);
+    this.setHasVoucher(false);
+    this.setTitle(title);
+    this.setMoneyMultiplier(1.5);
+    this.setBoss();
+    this.setStaticParty();
+    this.setBattleBgm("battle_plasma_boss");
+    this.setVictoryBgm("victory_team_plasma");
+
+    return this;
+  }
+
+  /**
+   * Initializes the trainer configuration for a Stat Trainer, as part of the Trainer's Test Mystery Encounter.
+   * @param _isMale Whether the stat trainer is Male or Female (for localization of the title).
+   * @returns {TrainerConfig} The updated TrainerConfig instance.
+   **/
+  initForStatTrainer(_isMale = false): TrainerConfig {
+    if (!getIsInitialized()) {
+      initI18n();
+    }
+
+    this.setPartyTemplates(trainerPartyTemplates.ELITE_FOUR);
+
+    const nameForCall = this.name.toLowerCase().replace(/\s/g, "_");
+    this.name = i18next.t(`trainerNames:${nameForCall}`);
+    this.setMoneyMultiplier(2);
+    this.setBoss();
+    this.setStaticParty();
+
+    // TODO: replace with more suitable music?
+    this.setBattleBgm("battle_trainer");
+    this.setVictoryBgm("victory_trainer");
+
+    return this;
+  }
+
+  /**
+   * Initializes the trainer configuration for an evil team leader. Temporarily hardcoding evil leader teams though.
+   * @param {Species | Species[]} signatureSpecies The signature species for the evil team leader.
+   * @param {PokemonType} specialtyType The specialty type for the evil team Leader.
+   * @param boolean Whether or not this is the rematch fight
+   * @returns {TrainerConfig} The updated TrainerConfig instance.
+   * **/
+  initForEvilTeamLeader(
+    title: string,
+    signatureSpecies: (Species | Species[])[],
+    rematch = false,
+    specialtyType?: PokemonType,
+  ): TrainerConfig {
+    if (!getIsInitialized()) {
+      initI18n();
+    }
+    if (rematch) {
+      this.setPartyTemplates(trainerPartyTemplates.ELITE_FOUR);
+    } else {
+      this.setPartyTemplates(trainerPartyTemplates.RIVAL_5);
+    }
+    signatureSpecies.forEach((speciesPool, s) => {
+      if (!Array.isArray(speciesPool)) {
+        speciesPool = [speciesPool];
+      }
+      this.setPartyMemberFunc(-(s + 1), getRandomPartyMemberFunc(speciesPool));
+    });
+    if (!isNullOrUndefined(specialtyType)) {
+      this.setSpeciesFilter(p => p.isOfType(specialtyType));
+      this.setSpecialtyType(specialtyType);
+    }
+    const nameForCall = this.name.toLowerCase().replace(/\s/g, "_");
+    this.name = i18next.t(`trainerNames:${nameForCall}`);
+    this.setTitle(title);
+    this.setMoneyMultiplier(2.5);
+    this.setBoss();
+    this.setStaticParty();
+    this.setHasVoucher(true);
+    this.setBattleBgm("battle_plasma_boss");
+    this.setVictoryBgm("victory_team_plasma");
+
+    return this;
+  }
+
+  /**
+   * Initializes the trainer configuration for a Gym Leader.
+   * @param {Species | Species[]} signatureSpecies The signature species for the Gym Leader. Added to party in reverse order.
+   * @param isMale Whether the Gym Leader is Male or Not (for localization of the title).
+   * @param {PokemonType} specialtyType The specialty type for the Gym Leader.
+   * @param ignoreMinTeraWave Whether the Gym Leader always uses Tera (true), or only Teras after {@linkcode GYM_LEADER_TERA_WAVE} (false). Defaults to false.
+   * @param teraSlot Optional, sets the party member in this slot to Terastallize. Wraps based on party size.
+   * @returns {TrainerConfig} The updated TrainerConfig instance.
+   * **/
+  initForGymLeader(
+    signatureSpecies: (Species | Species[])[],
+    isMale: boolean,
+    specialtyType: PokemonType,
+    ignoreMinTeraWave = false,
+    teraSlot?: number,
+  ): TrainerConfig {
+    // Check if the internationalization (i18n) system is initialized.
+    if (!getIsInitialized()) {
+      initI18n();
+    }
+
+    // Set the function to generate the Gym Leader's party template.
+    this.setPartyTemplateFunc(getGymLeaderPartyTemplate);
+
+    // Set up party members with their corresponding species.
+    signatureSpecies.forEach((speciesPool, s) => {
+      // Ensure speciesPool is an array.
+      if (!Array.isArray(speciesPool)) {
+        speciesPool = [speciesPool];
+      }
+      // Set a function to get a random party member from the species pool.
+      this.setPartyMemberFunc(-(s + 1), getRandomPartyMemberFunc(speciesPool));
+    });
+
+    // If specialty type is provided, set species filter and specialty type.
+    this.setSpeciesFilter(p => p.isOfType(specialtyType));
+    this.setSpecialtyType(specialtyType);
+
+    // Localize the trainer's name by converting it to lowercase and replacing spaces with underscores.
+    const nameForCall = this.name.toLowerCase().replace(/\s/g, "_");
+    this.name = i18next.t(`trainerNames:${nameForCall}`);
+
+    // Set the title to "gym_leader". (this is the key in the i18n file)
+    this.setTitle("gym_leader");
+    if (!isMale) {
+      this.setTitle("gym_leader_female");
+    }
+
+    // Configure various properties for the Gym Leader.
+    this.setMoneyMultiplier(2.5);
+    this.setBoss();
+    this.setStaticParty();
+    this.setHasVoucher(true);
+    this.setBattleBgm("battle_unova_gym");
+    this.setVictoryBgm("victory_gym");
+    this.setRandomTeraModifiers(
+      () => (ignoreMinTeraWave || globalScene.currentBattle.waveIndex >= GYM_LEADER_TERA_WAVE ? 1 : 0),
+      teraSlot,
+    );
+
+    return this;
+  }
+
+  /**
+   * Initializes the trainer configuration for an Elite Four member.
+   * @param signatureSpecies - The signature species for the Elite Four member.
+   * @param isMale - Whether the Elite Four Member is Male or Female (for localization of the title).
+   * @param specialtyType - The specialty type for the Elite Four member.
+   * @param teraSlot - Optional, sets the party member in this slot to Terastallize.
+   * @returns The updated TrainerConfig instance.
+   **/
+  initForEliteFour(
+    signatureSpecies: (Species | Species[])[],
+    isMale: boolean,
+    specialtyType?: PokemonType,
+    teraSlot?: number,
+  ): TrainerConfig {
+    // Check if the internationalization (i18n) system is initialized.
+    if (!getIsInitialized()) {
+      initI18n();
+    }
+
+    // Set the party templates for the Elite Four.
+    this.setPartyTemplates(trainerPartyTemplates.ELITE_FOUR);
+
+    // Set up party members with their corresponding species.
+    signatureSpecies.forEach((speciesPool, s) => {
+      // Ensure speciesPool is an array.
+      if (!Array.isArray(speciesPool)) {
+        speciesPool = [speciesPool];
+      }
+      // Set a function to get a random party member from the species pool.
+      this.setPartyMemberFunc(-(s + 1), getRandomPartyMemberFunc(speciesPool));
+    });
+
+    // Set species filter and specialty type if provided, otherwise filter by base total.
+    if (!isNullOrUndefined(specialtyType)) {
+      this.setSpeciesFilter(p => p.isOfType(specialtyType) && p.baseTotal >= ELITE_FOUR_MINIMUM_BST);
+      this.setSpecialtyType(specialtyType);
+    } else {
+      this.setSpeciesFilter(p => p.baseTotal >= ELITE_FOUR_MINIMUM_BST);
+    }
+
+    // Localize the trainer's name by converting it to lowercase and replacing spaces with underscores.
+    const nameForCall = this.name.toLowerCase().replace(/\s/g, "_");
+    this.name = i18next.t(`trainerNames:${nameForCall}`);
+
+    // Set the title to "elite_four". (this is the key in the i18n file)
+    this.setTitle("elite_four");
+    if (!isMale) {
+      this.setTitle("elite_four_female");
+    }
+
+    // Configure various properties for the Elite Four member.
+    this.setMoneyMultiplier(3.25);
+    this.setBoss();
+    this.setStaticParty();
+    this.setHasVoucher(true);
+    this.setBattleBgm("battle_unova_elite");
+    this.setVictoryBgm("victory_gym");
+    this.setRandomTeraModifiers(() => 1, teraSlot);
+
+    return this;
+  }
+
+  /**
+   * Initializes the trainer configuration for a Champion.
+   * @param {Species | Species[]} signatureSpecies The signature species for the Champion.
+   * @param isMale Whether the Champion is Male or Female (for localization of the title).
+   * @returns {TrainerConfig} The updated TrainerConfig instance.
+   **/
+  initForChampion(isMale: boolean): TrainerConfig {
+    // Check if the internationalization (i18n) system is initialized.
+    if (!getIsInitialized()) {
+      initI18n();
+    }
+
+    // Set the party templates for the Champion.
+    this.setPartyTemplates(trainerPartyTemplates.CHAMPION);
+
+    // Localize the trainer's name by converting it to lowercase and replacing spaces with underscores.
+    const nameForCall = this.name.toLowerCase().replace(/\s/g, "_");
+    this.name = i18next.t(`trainerNames:${nameForCall}`);
+
+    // Set the title to "champion". (this is the key in the i18n file)
+    this.setTitle("champion");
+    if (!isMale) {
+      this.setTitle("champion_female");
+    }
+
+    // Configure various properties for the Champion.
+    this.setMoneyMultiplier(10);
+    this.setBoss();
+    this.setStaticParty();
+    this.setHasVoucher(true);
+    this.setBattleBgm("battle_champion_alder");
+    this.setVictoryBgm("victory_champion");
+
+    return this;
+  }
+
+  /**
+   * Sets a localized name for the trainer. This should only be used for trainers that dont use a "initFor" function and are considered "named" trainers
+   * @param name - The name of the trainer.
+   * @returns {TrainerConfig} The updated TrainerConfig instance.
+   */
+  setLocalizedName(name: string): TrainerConfig {
+    // Check if the internationalization (i18n) system is initialized.
+    if (!getIsInitialized()) {
+      initI18n();
+    }
+    this.name = i18next.t(`trainerNames:${name.toLowerCase().replace(/\s/g, "_")}`);
+    return this;
+  }
+
+  /**
+   * Retrieves the title for the trainer based on the provided trainer slot and variant.
+   * @param {TrainerSlot} trainerSlot - The slot to determine which title to use. Defaults to TrainerSlot.NONE.
+   * @param {TrainerVariant} variant - The variant of the trainer to determine the specific title.
+   * @returns {string} - The title of the trainer.
+   **/
+  getTitle(trainerSlot: TrainerSlot = TrainerSlot.NONE, variant: TrainerVariant): string {
+    const ret = this.name;
+
+    // Check if the variant is double and the name for double exists
+    if (!trainerSlot && variant === TrainerVariant.DOUBLE && this.nameDouble) {
+      return this.nameDouble;
+    }
+
+    // Female variant
+    if (this.hasGenders) {
+      // If the name is already set
+      if (this.nameFemale) {
+        // Check if the variant is either female or this is for the partner in a double battle
+        if (
+          variant === TrainerVariant.FEMALE ||
+          (variant === TrainerVariant.DOUBLE && trainerSlot === TrainerSlot.TRAINER_PARTNER)
+        ) {
+          return this.nameFemale;
+        }
+      }
+      // Check if !variant is true, if so return the name, else return the name with _female appended
+      else if (variant) {
+        if (!getIsInitialized()) {
+          initI18n();
+        }
+        // Check if the female version exists in the i18n file
+        if (i18next.exists(`trainerClasses:${this.name.toLowerCase()}`)) {
+          // If it does, return
+          return ret + "_female";
+        }
+      }
+    }
+
+    return ret;
+  }
+
+  loadAssets(variant: TrainerVariant): Promise<void> {
+    return new Promise(resolve => {
+      const isDouble = variant === TrainerVariant.DOUBLE;
+      const trainerKey = this.getSpriteKey(variant === TrainerVariant.FEMALE, false);
+      const partnerTrainerKey = this.getSpriteKey(true, true);
+      globalScene.loadAtlas(trainerKey, "trainer");
+      if (isDouble) {
+        globalScene.loadAtlas(partnerTrainerKey, "trainer");
+      }
+      globalScene.load.once(Phaser.Loader.Events.COMPLETE, () => {
+        const originalWarn = console.warn;
+        // Ignore warnings for missing frames, because there will be a lot
+        console.warn = () => {};
+        const frameNames = globalScene.anims.generateFrameNames(trainerKey, {
+          zeroPad: 4,
+          suffix: ".png",
+          start: 1,
+          end: 128,
+        });
+        const partnerFrameNames = isDouble
+          ? globalScene.anims.generateFrameNames(partnerTrainerKey, {
+              zeroPad: 4,
+              suffix: ".png",
+              start: 1,
+              end: 128,
+            })
+          : "";
+        console.warn = originalWarn;
+        if (!globalScene.anims.exists(trainerKey)) {
+          globalScene.anims.create({
+            key: trainerKey,
+            frames: frameNames,
+            frameRate: 24,
+            repeat: -1,
+          });
+        }
+        if (isDouble && !globalScene.anims.exists(partnerTrainerKey)) {
+          globalScene.anims.create({
+            key: partnerTrainerKey,
+            frames: partnerFrameNames,
+            frameRate: 24,
+            repeat: -1,
+          });
+        }
+        resolve();
+      });
+      if (!globalScene.load.isLoading()) {
+        globalScene.load.start();
+      }
+    });
+  }
+
+  /**
+   * Helper function to check if a specialty type is set
+   * @returns true if specialtyType is defined and not Type.UNKNOWN
+   */
+  hasSpecialtyType(): boolean {
+    return !isNullOrUndefined(this.specialtyType) && this.specialtyType !== PokemonType.UNKNOWN;
+  }
+
+  /**
+   * Creates a shallow copy of a trainer config so that it can be modified without affecting the {@link trainerConfigs} source map
+   */
+  clone(): TrainerConfig {
+    let clone = new TrainerConfig(this.trainerType);
+    clone = this.trainerTypeDouble ? clone.setDoubleTrainerType(this.trainerTypeDouble) : clone;
+    clone = this.name ? clone.setName(this.name) : clone;
+    clone = this.hasGenders ? clone.setHasGenders(this.nameFemale, this.femaleEncounterBgm) : clone;
+    clone = this.hasDouble ? clone.setHasDouble(this.nameDouble, this.doubleEncounterBgm) : clone;
+    clone = this.title ? clone.setTitle(this.title) : clone;
+    clone = this.titleDouble ? clone.setDoubleTitle(this.titleDouble) : clone;
+    clone = this.hasCharSprite ? clone.setHasCharSprite() : clone;
+    clone = this.doubleOnly ? clone.setDoubleOnly() : clone;
+    clone = this.moneyMultiplier ? clone.setMoneyMultiplier(this.moneyMultiplier) : clone;
+    clone = this.isBoss ? clone.setBoss() : clone;
+    clone = this.hasStaticParty ? clone.setStaticParty() : clone;
+    clone = this.useSameSeedForAllMembers ? clone.setUseSameSeedForAllMembers() : clone;
+    clone = this.battleBgm ? clone.setBattleBgm(this.battleBgm) : clone;
+    clone = this.encounterBgm ? clone.setEncounterBgm(this.encounterBgm) : clone;
+    clone = this.victoryBgm ? clone.setVictoryBgm(this.victoryBgm) : clone;
+    clone = this.genModifiersFunc ? clone.setGenModifiersFunc(this.genModifiersFunc) : clone;
+
+    if (this.modifierRewardFuncs) {
+      // Clones array instead of passing ref
+      clone.modifierRewardFuncs = this.modifierRewardFuncs.slice(0);
+    }
+
+    if (this.partyTemplates) {
+      clone.partyTemplates = this.partyTemplates.slice(0);
+    }
+
+    clone = this.partyTemplateFunc ? clone.setPartyTemplateFunc(this.partyTemplateFunc) : clone;
+
+    if (this.partyMemberFuncs) {
+      Object.keys(this.partyMemberFuncs).forEach(index => {
+        clone = clone.setPartyMemberFunc(Number.parseInt(index, 10), this.partyMemberFuncs[index]);
+      });
+    }
+
+    clone = this.speciesPools ? clone.setSpeciesPools(this.speciesPools) : clone;
+    clone = this.speciesFilter ? clone.setSpeciesFilter(this.speciesFilter) : clone;
+    clone.specialtyType = this.specialtyType;
+
+    clone.encounterMessages = this.encounterMessages?.slice(0);
+    clone.victoryMessages = this.victoryMessages?.slice(0);
+    clone.defeatMessages = this.defeatMessages?.slice(0);
+
+    clone.femaleEncounterMessages = this.femaleEncounterMessages?.slice(0);
+    clone.femaleVictoryMessages = this.femaleVictoryMessages?.slice(0);
+    clone.femaleDefeatMessages = this.femaleDefeatMessages?.slice(0);
+
+    clone.doubleEncounterMessages = this.doubleEncounterMessages?.slice(0);
+    clone.doubleVictoryMessages = this.doubleVictoryMessages?.slice(0);
+    clone.doubleDefeatMessages = this.doubleDefeatMessages?.slice(0);
+
+    return clone;
+  }
+}
+
+let t = 0;
+
+/**
+ * Randomly selects one of the `Species` from `speciesPool`, determines its evolution, level, and strength.
+ * Then adds Pokemon to globalScene.
+ * @param speciesPool
+ * @param trainerSlot
+ * @param ignoreEvolution
+ * @param postProcess
+ */
+export function getRandomPartyMemberFunc(
+  speciesPool: Species[],
+  trainerSlot: TrainerSlot = TrainerSlot.TRAINER,
+  ignoreEvolution = false,
+  postProcess?: (enemyPokemon: EnemyPokemon) => void,
+) {
+  return (level: number, strength: PartyMemberStrength) => {
+    let species = randSeedItem(speciesPool);
+    if (!ignoreEvolution) {
+      species = getPokemonSpecies(species).getTrainerSpeciesForLevel(
+        level,
+        true,
+        strength,
+        globalScene.currentBattle.waveIndex,
+      );
+    }
+    return globalScene.addEnemyPokemon(
+      getPokemonSpecies(species),
+      level,
+      trainerSlot,
+      undefined,
+      false,
+      undefined,
+      postProcess,
+    );
+  };
+}
+
+function getSpeciesFilterRandomPartyMemberFunc(
+  originalSpeciesFilter: PokemonSpeciesFilter,
+  trainerSlot: TrainerSlot = TrainerSlot.TRAINER,
+  allowLegendaries?: boolean,
+  postProcess?: (EnemyPokemon: EnemyPokemon) => void,
+): PartyMemberFunc {
+  const speciesFilter = (species: PokemonSpecies): boolean => {
+    const notLegendary = !species.legendary && !species.subLegendary && !species.mythical;
+    return (allowLegendaries || notLegendary) && !species.isTrainerForbidden() && originalSpeciesFilter(species);
+  };
+
+  return (level: number, strength: PartyMemberStrength) => {
+    const waveIndex = globalScene.currentBattle.waveIndex;
+    const species = getPokemonSpecies(
+      globalScene
+        .randomSpecies(waveIndex, level, false, speciesFilter)
+        .getTrainerSpeciesForLevel(level, true, strength, waveIndex),
+    );
+
+    return globalScene.addEnemyPokemon(species, level, trainerSlot, undefined, false, undefined, postProcess);
+  };
+}
+
+export const trainerConfigs: TrainerConfigs = {
+  [TrainerType.UNKNOWN]: new TrainerConfig(0).setHasGenders(),
+  [TrainerType.ACE_TRAINER]: new TrainerConfig(++t)
+    .setHasGenders("Ace Trainer Female")
+    .setHasDouble("Ace Duo")
+    .setMoneyMultiplier(2.25)
+    .setEncounterBgm(TrainerType.ACE_TRAINER)
+    .setPartyTemplateFunc(() =>
+      getWavePartyTemplate(
+        trainerPartyTemplates.THREE_WEAK_BALANCED,
+        trainerPartyTemplates.FOUR_WEAK_BALANCED,
+        trainerPartyTemplates.FIVE_WEAK_BALANCED,
+        trainerPartyTemplates.SIX_WEAK_BALANCED,
+      ),
+    ),
+  [TrainerType.ARTIST]: new TrainerConfig(++t)
+    .setEncounterBgm(TrainerType.RICH)
+    .setPartyTemplates(trainerPartyTemplates.ONE_STRONG, trainerPartyTemplates.TWO_AVG, trainerPartyTemplates.THREE_AVG)
+    .setSpeciesPools([Species.SMEARGLE]),
+  [TrainerType.BACKERS]: new TrainerConfig(++t)
+    .setHasGenders("Backers")
+    .setDoubleOnly()
+    .setEncounterBgm(TrainerType.CYCLIST),
+  [TrainerType.BACKPACKER]: new TrainerConfig(++t)
+    .setHasGenders("Backpacker Female")
+    .setHasDouble("Backpackers")
+    .setSpeciesFilter(s => s.isOfType(PokemonType.FLYING) || s.isOfType(PokemonType.ROCK))
+    .setEncounterBgm(TrainerType.BACKPACKER)
+    .setPartyTemplates(
+      trainerPartyTemplates.ONE_STRONG,
+      trainerPartyTemplates.ONE_WEAK_ONE_STRONG,
+      trainerPartyTemplates.ONE_AVG_ONE_STRONG,
+    )
+    .setSpeciesPools({
+      [TrainerPoolTier.COMMON]: [
+        Species.RHYHORN,
+        Species.AIPOM,
+        Species.MAKUHITA,
+        Species.MAWILE,
+        Species.NUMEL,
+        Species.LILLIPUP,
+        Species.SANDILE,
+        Species.WOOLOO,
+      ],
+      [TrainerPoolTier.UNCOMMON]: [
+        Species.GIRAFARIG,
+        Species.ZANGOOSE,
+        Species.SEVIPER,
+        Species.CUBCHOO,
+        Species.PANCHAM,
+        Species.SKIDDO,
+        Species.MUDBRAY,
+      ],
+      [TrainerPoolTier.RARE]: [
+        Species.TAUROS,
+        Species.STANTLER,
+        Species.DARUMAKA,
+        Species.BOUFFALANT,
+        Species.DEERLING,
+        Species.IMPIDIMP,
+      ],
+      [TrainerPoolTier.SUPER_RARE]: [Species.GALAR_DARUMAKA, Species.TEDDIURSA],
+    }),
+  [TrainerType.BAKER]: new TrainerConfig(++t)
+    .setEncounterBgm(TrainerType.CLERK)
+    .setMoneyMultiplier(1.35)
+    .setSpeciesFilter(
+      s =>
+        [s.ability1, s.ability2, s.abilityHidden].some(
+          a =>
+            !!a &&
+            [
+              Abilities.WHITE_SMOKE,
+              Abilities.GLUTTONY,
+              Abilities.HONEY_GATHER,
+              Abilities.HARVEST,
+              Abilities.CHEEK_POUCH,
+              Abilities.SWEET_VEIL,
+              Abilities.RIPEN,
+              Abilities.PURIFYING_SALT,
+              Abilities.WELL_BAKED_BODY,
+              Abilities.SUPERSWEET_SYRUP,
+              Abilities.HOSPITALITY,
+            ].includes(a),
+        ) ||
+        s
+          .getLevelMoves()
+          .some(plm =>
+            [Moves.SOFT_BOILED, Moves.SPORE, Moves.MILK_DRINK, Moves.OVERHEAT, Moves.TEATIME].includes(plm[1]),
+          ),
+    ), // Mons with baking related abilities or who learn Overheat, Teatime, Milk Drink, Spore, or Soft-Boiled by level
+  [TrainerType.BEAUTY]: new TrainerConfig(++t)
+    .setMoneyMultiplier(1.55)
+    .setEncounterBgm(TrainerType.PARASOL_LADY)
+    .setPartyTemplates(
+      trainerPartyTemplates.TWO_AVG_SAME_ONE_AVG,
+      trainerPartyTemplates.TWO_AVG_SAME_ONE_STRONG,
+      trainerPartyTemplates.THREE_AVG_SAME,
+      trainerPartyTemplates.THREE_AVG,
+      trainerPartyTemplates.FOUR_WEAK,
+      trainerPartyTemplates.ONE_STRONG,
+    )
+    .setSpeciesPools({
+      [TrainerPoolTier.COMMON]: [
+        Species.MEOWTH,
+        Species.GOLDEEN,
+        Species.MAREEP,
+        Species.MARILL,
+        Species.SKITTY,
+        Species.GLAMEOW,
+        Species.PURRLOIN,
+      ],
+      [TrainerPoolTier.UNCOMMON]: [
+        Species.SMOOCHUM,
+        Species.ROSELIA,
+        Species.LUVDISC,
+        Species.BLITZLE,
+        Species.SEWADDLE,
+        Species.PETILIL,
+        Species.MINCCINO,
+        Species.GOTHITA,
+        Species.SPRITZEE,
+        Species.FLITTLE,
+      ],
+      [TrainerPoolTier.RARE]: [
+        Species.FEEBAS,
+        Species.FURFROU,
+        Species.SALANDIT,
+        Species.BRUXISH,
+        Species.HATENNA,
+        Species.SNOM,
+        Species.ALOLA_VULPIX,
+      ],
+      [TrainerPoolTier.SUPER_RARE]: [Species.CLAMPERL, Species.AMAURA, Species.SYLVEON, Species.GOOMY, Species.POPPLIO],
+    }),
+  [TrainerType.BIKER]: new TrainerConfig(++t)
+    .setMoneyMultiplier(1.4)
+    .setEncounterBgm(TrainerType.ROUGHNECK)
+    .setSpeciesPools({
+      [TrainerPoolTier.COMMON]: [Species.EKANS, Species.KOFFING, Species.CROAGUNK, Species.VENIPEDE, Species.SCRAGGY],
+      [TrainerPoolTier.UNCOMMON]: [
+        Species.GRIMER,
+        Species.VOLTORB,
+        Species.TEDDIURSA,
+        Species.MAGBY,
+        Species.SKORUPI,
+        Species.SANDILE,
+        Species.PAWNIARD,
+        Species.SHROODLE,
+      ],
+      [TrainerPoolTier.RARE]: [Species.VAROOM, Species.CYCLIZAR],
+    }),
+  [TrainerType.BLACK_BELT]: new TrainerConfig(++t)
+    .setHasGenders("Battle Girl", TrainerType.PSYCHIC)
+    .setHasDouble("Crush Kin")
+    .setEncounterBgm(TrainerType.ROUGHNECK)
+    .setSpecialtyType(PokemonType.FIGHTING)
+    .setPartyTemplates(
+      trainerPartyTemplates.TWO_WEAK_ONE_AVG,
+      trainerPartyTemplates.TWO_WEAK_ONE_AVG,
+      trainerPartyTemplates.TWO_AVG,
+      trainerPartyTemplates.TWO_AVG,
+      trainerPartyTemplates.TWO_WEAK_ONE_STRONG,
+      trainerPartyTemplates.THREE_AVG,
+      trainerPartyTemplates.TWO_AVG_ONE_STRONG,
+    )
+    .setSpeciesPools({
+      [TrainerPoolTier.COMMON]: [
+        Species.NIDORAN_F,
+        Species.NIDORAN_M,
+        Species.MACHOP,
+        Species.MAKUHITA,
+        Species.MEDITITE,
+        Species.CROAGUNK,
+        Species.TIMBURR,
+      ],
+      [TrainerPoolTier.UNCOMMON]: [
+        Species.MANKEY,
+        Species.POLIWRATH,
+        Species.TYROGUE,
+        Species.BRELOOM,
+        Species.SCRAGGY,
+        Species.MIENFOO,
+        Species.PANCHAM,
+        Species.STUFFUL,
+        Species.CRABRAWLER,
+      ],
+      [TrainerPoolTier.RARE]: [
+        Species.HERACROSS,
+        Species.RIOLU,
+        Species.THROH,
+        Species.SAWK,
+        Species.PASSIMIAN,
+        Species.CLOBBOPUS,
+      ],
+      [TrainerPoolTier.SUPER_RARE]: [
+        Species.HITMONTOP,
+        Species.INFERNAPE,
+        Species.GALLADE,
+        Species.HAWLUCHA,
+        Species.HAKAMO_O,
+      ],
+      [TrainerPoolTier.ULTRA_RARE]: [Species.KUBFU],
+    }),
+  [TrainerType.BREEDER]: new TrainerConfig(++t)
+    .setMoneyMultiplier(1.325)
+    .setEncounterBgm(TrainerType.POKEFAN)
+    .setHasGenders("Breeder Female")
+    .setHasDouble("Breeders")
+    .setPartyTemplateFunc(() =>
+      getWavePartyTemplate(
+        trainerPartyTemplates.FOUR_WEAKER,
+        trainerPartyTemplates.FIVE_WEAKER,
+        trainerPartyTemplates.SIX_WEAKER,
+      ),
+    )
+    .setSpeciesFilter(s => s.baseTotal < 450),
+  [TrainerType.CLERK]: new TrainerConfig(++t)
+    .setHasGenders("Clerk Female")
+    .setHasDouble("Colleagues")
+    .setEncounterBgm(TrainerType.CLERK)
+    .setPartyTemplates(
+      trainerPartyTemplates.TWO_WEAK,
+      trainerPartyTemplates.THREE_WEAK,
+      trainerPartyTemplates.ONE_AVG,
+      trainerPartyTemplates.TWO_AVG,
+      trainerPartyTemplates.TWO_WEAK_ONE_AVG,
+    )
+    .setSpeciesPools({
+      [TrainerPoolTier.COMMON]: [
+        Species.MEOWTH,
+        Species.PSYDUCK,
+        Species.BUDEW,
+        Species.PIDOVE,
+        Species.CINCCINO,
+        Species.LITLEO,
+      ],
+      [TrainerPoolTier.UNCOMMON]: [
+        Species.JIGGLYPUFF,
+        Species.MAGNEMITE,
+        Species.MARILL,
+        Species.COTTONEE,
+        Species.SKIDDO,
+      ],
+      [TrainerPoolTier.RARE]: [Species.BUIZEL, Species.SNEASEL, Species.KLEFKI, Species.INDEEDEE],
+    }),
+  [TrainerType.CYCLIST]: new TrainerConfig(++t)
+    .setMoneyMultiplier(1.3)
+    .setHasGenders("Cyclist Female")
+    .setHasDouble("Cyclists")
+    .setEncounterBgm(TrainerType.CYCLIST)
+    .setPartyTemplates(trainerPartyTemplates.TWO_WEAK, trainerPartyTemplates.ONE_AVG)
+    .setSpeciesPools({
+      [TrainerPoolTier.COMMON]: [Species.DODUO, Species.PICHU, Species.TAILLOW, Species.STARLY, Species.PONYTA],
+      [TrainerPoolTier.UNCOMMON]: [
+        Species.ELECTRIKE,
+        Species.SHINX,
+        Species.BLITZLE,
+        Species.DUCKLETT,
+        Species.WATTREL,
+      ],
+      [TrainerPoolTier.RARE]: [Species.YANMA, Species.NINJASK, Species.WHIRLIPEDE, Species.EMOLGA, Species.SKIDDO],
+      [TrainerPoolTier.SUPER_RARE]: [Species.ACCELGOR, Species.DREEPY],
+    }),
+  [TrainerType.DANCER]: new TrainerConfig(++t)
+    .setMoneyMultiplier(1.55)
+    .setEncounterBgm(TrainerType.CYCLIST)
+    .setPartyTemplates(
+      trainerPartyTemplates.TWO_WEAK,
+      trainerPartyTemplates.ONE_AVG,
+      trainerPartyTemplates.TWO_AVG,
+      trainerPartyTemplates.TWO_WEAK_SAME_TWO_WEAK_SAME,
+    )
+    .setSpeciesPools({
+      [TrainerPoolTier.COMMON]: [Species.RALTS, Species.SPOINK, Species.LOTAD, Species.BUDEW],
+      [TrainerPoolTier.UNCOMMON]: [Species.SPINDA, Species.SWABLU, Species.MARACTUS],
+      [TrainerPoolTier.RARE]: [Species.BELLOSSOM, Species.HITMONTOP, Species.MIME_JR, Species.ORICORIO],
+      [TrainerPoolTier.SUPER_RARE]: [Species.QUAXLY, Species.JANGMO_O],
+    }),
+  [TrainerType.DEPOT_AGENT]: new TrainerConfig(++t)
+    .setMoneyMultiplier(1.45)
+    .setEncounterBgm(TrainerType.CLERK)
+    .setPartyTemplates(
+      trainerPartyTemplates.TWO_AVG,
+      trainerPartyTemplates.THREE_WEAK,
+      trainerPartyTemplates.THREE_AVG,
+      trainerPartyTemplates.FOUR_WEAK,
+    )
+    .setSpeciesFilter(s => s.isOfType(PokemonType.GROUND)),
+  [TrainerType.DOCTOR]: new TrainerConfig(++t)
+    .setHasGenders("Nurse", "lass")
+    .setHasDouble("Medical Team")
+    .setMoneyMultiplier(3)
+    .setEncounterBgm(TrainerType.CLERK)
+    .setSpeciesFilter(s => !!s.getLevelMoves().find(plm => plm[1] === Moves.HEAL_PULSE)),
+  [TrainerType.FIREBREATHER]: new TrainerConfig(++t)
+    .setMoneyMultiplier(1.4)
+    .setEncounterBgm(TrainerType.ROUGHNECK)
+    .setSpeciesFilter(s => !!s.getLevelMoves().find(plm => plm[1] === Moves.SMOG) || s.isOfType(PokemonType.FIRE)),
+  [TrainerType.FISHERMAN]: new TrainerConfig(++t)
+    .setMoneyMultiplier(1.25)
+    .setEncounterBgm(TrainerType.BACKPACKER)
+    .setSpecialtyType(PokemonType.WATER)
+    .setPartyTemplates(
+      trainerPartyTemplates.TWO_WEAK_SAME_ONE_AVG,
+      trainerPartyTemplates.ONE_AVG,
+      trainerPartyTemplates.THREE_WEAK_SAME,
+      trainerPartyTemplates.ONE_STRONG,
+      trainerPartyTemplates.SIX_WEAKER,
+    )
+    .setSpeciesPools({
+      [TrainerPoolTier.COMMON]: [
+        Species.TENTACOOL,
+        Species.MAGIKARP,
+        Species.GOLDEEN,
+        Species.STARYU,
+        Species.REMORAID,
+        Species.SKRELP,
+        Species.CLAUNCHER,
+        Species.ARROKUDA,
+      ],
+      [TrainerPoolTier.UNCOMMON]: [
+        Species.POLIWAG,
+        Species.SHELLDER,
+        Species.KRABBY,
+        Species.HORSEA,
+        Species.CARVANHA,
+        Species.BARBOACH,
+        Species.CORPHISH,
+        Species.FINNEON,
+        Species.TYMPOLE,
+        Species.BASCULIN,
+        Species.FRILLISH,
+        Species.INKAY,
+      ],
+      [TrainerPoolTier.RARE]: [
+        Species.CHINCHOU,
+        Species.CORSOLA,
+        Species.WAILMER,
+        Species.CLAMPERL,
+        Species.LUVDISC,
+        Species.MANTYKE,
+        Species.ALOMOMOLA,
+        Species.TATSUGIRI,
+        Species.VELUZA,
+      ],
+      [TrainerPoolTier.SUPER_RARE]: [Species.LAPRAS, Species.FEEBAS, Species.RELICANTH, Species.DONDOZO],
+    }),
+  [TrainerType.GUITARIST]: new TrainerConfig(++t)
+    .setMoneyMultiplier(1.2)
+    .setEncounterBgm(TrainerType.ROUGHNECK)
+    .setSpecialtyType(PokemonType.ELECTRIC)
+    .setSpeciesFilter(s => s.isOfType(PokemonType.ELECTRIC)),
+  [TrainerType.HARLEQUIN]: new TrainerConfig(++t)
+    .setEncounterBgm(TrainerType.PSYCHIC)
+    .setSpeciesFilter(s => tmSpecies[Moves.TRICK_ROOM].indexOf(s.speciesId) > -1),
+  [TrainerType.HIKER]: new TrainerConfig(++t)
+    .setEncounterBgm(TrainerType.BACKPACKER)
+    .setPartyTemplates(
+      trainerPartyTemplates.TWO_AVG_SAME_ONE_AVG,
+      trainerPartyTemplates.TWO_AVG_SAME_ONE_STRONG,
+      trainerPartyTemplates.TWO_AVG,
+      trainerPartyTemplates.FOUR_WEAK,
+      trainerPartyTemplates.ONE_STRONG,
+    )
+    .setSpeciesPools({
+      [TrainerPoolTier.COMMON]: [
+        Species.SANDSHREW,
+        Species.DIGLETT,
+        Species.GEODUDE,
+        Species.MACHOP,
+        Species.ARON,
+        Species.ROGGENROLA,
+        Species.DRILBUR,
+        Species.NACLI,
+      ],
+      [TrainerPoolTier.UNCOMMON]: [
+        Species.ZUBAT,
+        Species.RHYHORN,
+        Species.ONIX,
+        Species.CUBONE,
+        Species.WOOBAT,
+        Species.SWINUB,
+        Species.NOSEPASS,
+        Species.HIPPOPOTAS,
+        Species.DWEBBLE,
+        Species.KLAWF,
+        Species.TOEDSCOOL,
+      ],
+      [TrainerPoolTier.RARE]: [
+        Species.TORKOAL,
+        Species.TRAPINCH,
+        Species.BARBOACH,
+        Species.GOLETT,
+        Species.ALOLA_DIGLETT,
+        Species.ALOLA_GEODUDE,
+        Species.GALAR_STUNFISK,
+        Species.PALDEA_WOOPER,
+      ],
+      [TrainerPoolTier.SUPER_RARE]: [Species.MAGBY, Species.LARVITAR],
+    }),
+  [TrainerType.HOOLIGANS]: new TrainerConfig(++t)
+    .setDoubleOnly()
+    .setMoneyMultiplier(1.5)
+    .setEncounterBgm(TrainerType.ROUGHNECK)
+    .setPartyTemplateFunc(() =>
+      getWavePartyTemplate(
+        trainerPartyTemplates.TWO_WEAK,
+        trainerPartyTemplates.TWO_AVG,
+        trainerPartyTemplates.ONE_AVG_ONE_STRONG,
+      ),
+    )
+    .setSpeciesFilter(s => s.isOfType(PokemonType.POISON) || s.isOfType(PokemonType.DARK)),
+  [TrainerType.HOOPSTER]: new TrainerConfig(++t).setMoneyMultiplier(1.2).setEncounterBgm(TrainerType.CYCLIST),
+  [TrainerType.INFIELDER]: new TrainerConfig(++t).setMoneyMultiplier(1.2).setEncounterBgm(TrainerType.CYCLIST),
+  [TrainerType.JANITOR]: new TrainerConfig(++t).setMoneyMultiplier(1.1).setEncounterBgm(TrainerType.CLERK),
+  [TrainerType.LINEBACKER]: new TrainerConfig(++t).setMoneyMultiplier(1.2).setEncounterBgm(TrainerType.CYCLIST),
+  [TrainerType.MAID]: new TrainerConfig(++t).setMoneyMultiplier(1.6).setEncounterBgm(TrainerType.RICH),
+  [TrainerType.MUSICIAN]: new TrainerConfig(++t)
+    .setMoneyMultiplier(1.1)
+    .setEncounterBgm(TrainerType.POKEFAN)
+    .setPartyTemplates(
+      trainerPartyTemplates.FOUR_WEAKER,
+      trainerPartyTemplates.THREE_WEAK,
+      trainerPartyTemplates.TWO_WEAK_ONE_AVG,
+      trainerPartyTemplates.TWO_AVG,
+    )
+    .setSpeciesFilter(s => !!s.getLevelMoves().find(plm => plm[1] === Moves.SING)),
+  [TrainerType.HEX_MANIAC]: new TrainerConfig(++t)
+    .setMoneyMultiplier(1.5)
+    .setEncounterBgm(TrainerType.PSYCHIC)
+    .setPartyTemplates(
+      trainerPartyTemplates.TWO_AVG,
+      trainerPartyTemplates.ONE_AVG_ONE_STRONG,
+      trainerPartyTemplates.TWO_AVG_SAME_ONE_AVG,
+      trainerPartyTemplates.THREE_AVG,
+      trainerPartyTemplates.TWO_STRONG,
+    )
+    .setSpeciesFilter(s => s.isOfType(PokemonType.GHOST) || s.isOfType(PokemonType.PSYCHIC)),
+  [TrainerType.NURSERY_AIDE]: new TrainerConfig(++t).setMoneyMultiplier(1.3).setEncounterBgm("lass"),
+  [TrainerType.OFFICER]: new TrainerConfig(++t)
+    .setMoneyMultiplier(1.55)
+    .setEncounterBgm(TrainerType.CLERK)
+    .setPartyTemplates(
+      trainerPartyTemplates.ONE_AVG,
+      trainerPartyTemplates.ONE_STRONG,
+      trainerPartyTemplates.TWO_AVG,
+      trainerPartyTemplates.TWO_WEAK_SAME_ONE_AVG,
+    )
+    .setSpeciesPools({
+      [TrainerPoolTier.COMMON]: [
+        Species.VULPIX,
+        Species.GROWLITHE,
+        Species.SNUBBULL,
+        Species.POOCHYENA,
+        Species.ELECTRIKE,
+        Species.LILLIPUP,
+        Species.YAMPER,
+        Species.FIDOUGH,
+      ],
+      [TrainerPoolTier.UNCOMMON]: [Species.HOUNDOUR, Species.ROCKRUFF, Species.MASCHIFF],
+      [TrainerPoolTier.RARE]: [Species.JOLTEON, Species.RIOLU],
+      [TrainerPoolTier.SUPER_RARE]: [],
+      [TrainerPoolTier.ULTRA_RARE]: [Species.ENTEI, Species.SUICUNE, Species.RAIKOU],
+    }),
+  [TrainerType.PARASOL_LADY]: new TrainerConfig(++t)
+    .setMoneyMultiplier(1.55)
+    .setEncounterBgm(TrainerType.PARASOL_LADY)
+    .setPartyTemplates(
+      trainerPartyTemplates.TWO_AVG_SAME_ONE_AVG,
+      trainerPartyTemplates.TWO_AVG_SAME_ONE_STRONG,
+      trainerPartyTemplates.TWO_AVG,
+      trainerPartyTemplates.FOUR_WEAK,
+      trainerPartyTemplates.ONE_STRONG,
+    )
+    .setSpeciesFilter(
+      s =>
+        [s.ability1, s.ability2, s.abilityHidden].some(
+          a =>
+            !!a &&
+            [
+              Abilities.DRIZZLE,
+              Abilities.SWIFT_SWIM,
+              Abilities.HYDRATION,
+              Abilities.RAIN_DISH,
+              Abilities.DRY_SKIN,
+              Abilities.WIND_POWER,
+            ].includes(a),
+        ) || s.getLevelMoves().some(plm => plm[1] === Moves.RAIN_DANCE),
+    ), // Mons with rain abilities or who learn Rain Dance by level
+  [TrainerType.PILOT]: new TrainerConfig(++t)
+    .setMoneyMultiplier(1.75)
+    .setEncounterBgm(TrainerType.CLERK)
+    .setPartyTemplates(
+      trainerPartyTemplates.THREE_WEAK,
+      trainerPartyTemplates.TWO_WEAK_ONE_AVG,
+      trainerPartyTemplates.TWO_AVG,
+      trainerPartyTemplates.THREE_AVG,
+    )
+    .setSpeciesFilter(s => tmSpecies[Moves.FLY].indexOf(s.speciesId) > -1),
+  [TrainerType.POKEFAN]: new TrainerConfig(++t)
+    .setMoneyMultiplier(1.4)
+    .setName("PokéFan")
+    .setHasGenders("PokéFan Female")
+    .setHasDouble("PokéFan Family")
+    .setEncounterBgm(TrainerType.POKEFAN)
+    .setPartyTemplates(
+      trainerPartyTemplates.SIX_WEAKER,
+      trainerPartyTemplates.FOUR_WEAK,
+      trainerPartyTemplates.TWO_AVG,
+      trainerPartyTemplates.ONE_STRONG,
+      trainerPartyTemplates.FOUR_WEAK_SAME,
+      trainerPartyTemplates.FIVE_WEAK,
+      trainerPartyTemplates.SIX_WEAKER_SAME,
+    )
+    .setSpeciesFilter(s => tmSpecies[Moves.HELPING_HAND].indexOf(s.speciesId) > -1),
+  [TrainerType.PRESCHOOLER]: new TrainerConfig(++t)
+    .setMoneyMultiplier(0.2)
+    .setEncounterBgm(TrainerType.YOUNGSTER)
+    .setHasGenders("Preschooler Female", "lass")
+    .setHasDouble("Preschoolers")
+    .setPartyTemplates(
+      trainerPartyTemplates.THREE_WEAK,
+      trainerPartyTemplates.FOUR_WEAKER,
+      trainerPartyTemplates.TWO_WEAK_SAME_ONE_AVG,
+      trainerPartyTemplates.FIVE_WEAKER,
+    )
+    .setSpeciesPools({
+      [TrainerPoolTier.COMMON]: [
+        Species.CATERPIE,
+        Species.PICHU,
+        Species.SANDSHREW,
+        Species.LEDYBA,
+        Species.BUDEW,
+        Species.BURMY,
+        Species.WOOLOO,
+        Species.PAWMI,
+        Species.SMOLIV,
+      ],
+      [TrainerPoolTier.UNCOMMON]: [
+        Species.EEVEE,
+        Species.CLEFFA,
+        Species.IGGLYBUFF,
+        Species.SWINUB,
+        Species.WOOPER,
+        Species.DRIFLOON,
+        Species.DEDENNE,
+        Species.STUFFUL,
+      ],
+      [TrainerPoolTier.RARE]: [Species.RALTS, Species.RIOLU, Species.JOLTIK, Species.TANDEMAUS],
+      [TrainerPoolTier.SUPER_RARE]: [Species.DARUMAKA, Species.TINKATINK],
+    }),
+  [TrainerType.PSYCHIC]: new TrainerConfig(++t)
+    .setHasGenders("Psychic Female")
+    .setHasDouble("Psychics")
+    .setMoneyMultiplier(1.4)
+    .setEncounterBgm(TrainerType.PSYCHIC)
+    .setPartyTemplates(
+      trainerPartyTemplates.TWO_WEAK,
+      trainerPartyTemplates.TWO_AVG,
+      trainerPartyTemplates.TWO_WEAK_SAME_ONE_AVG,
+      trainerPartyTemplates.TWO_WEAK_SAME_TWO_WEAK_SAME,
+      trainerPartyTemplates.ONE_STRONGER,
+    )
+    .setSpeciesPools({
+      [TrainerPoolTier.COMMON]: [
+        Species.ABRA,
+        Species.DROWZEE,
+        Species.RALTS,
+        Species.SPOINK,
+        Species.GOTHITA,
+        Species.SOLOSIS,
+        Species.BLIPBUG,
+        Species.ESPURR,
+        Species.HATENNA,
+      ],
+      [TrainerPoolTier.UNCOMMON]: [
+        Species.MIME_JR,
+        Species.EXEGGCUTE,
+        Species.MEDITITE,
+        Species.NATU,
+        Species.EXEGGCUTE,
+        Species.WOOBAT,
+        Species.INKAY,
+        Species.ORANGURU,
+      ],
+      [TrainerPoolTier.RARE]: [Species.ELGYEM, Species.SIGILYPH, Species.BALTOY, Species.GIRAFARIG, Species.MEOWSTIC],
+      [TrainerPoolTier.SUPER_RARE]: [Species.BELDUM, Species.ESPEON, Species.STANTLER],
+    }),
+  [TrainerType.RANGER]: new TrainerConfig(++t)
+    .setMoneyMultiplier(1.4)
+    .setName("Pokémon Ranger")
+    .setEncounterBgm(TrainerType.BACKPACKER)
+    .setHasGenders("Pokémon Ranger Female")
+    .setHasDouble("Pokémon Rangers")
+    .setSpeciesPools({
+      [TrainerPoolTier.COMMON]: [
+        Species.PICHU,
+        Species.GROWLITHE,
+        Species.PONYTA,
+        Species.ZIGZAGOON,
+        Species.SEEDOT,
+        Species.BIDOOF,
+        Species.RIOLU,
+        Species.SEWADDLE,
+        Species.SKIDDO,
+        Species.SALANDIT,
+        Species.YAMPER,
+      ],
+      [TrainerPoolTier.UNCOMMON]: [
+        Species.AZURILL,
+        Species.TAUROS,
+        Species.MAREEP,
+        Species.FARFETCHD,
+        Species.TEDDIURSA,
+        Species.SHROOMISH,
+        Species.ELECTRIKE,
+        Species.BUDEW,
+        Species.BUIZEL,
+        Species.MUDBRAY,
+        Species.STUFFUL,
+      ],
+      [TrainerPoolTier.RARE]: [
+        Species.EEVEE,
+        Species.SCYTHER,
+        Species.KANGASKHAN,
+        Species.RALTS,
+        Species.MUNCHLAX,
+        Species.ZORUA,
+        Species.PALDEA_TAUROS,
+        Species.TINKATINK,
+        Species.CYCLIZAR,
+        Species.FLAMIGO,
+      ],
+      [TrainerPoolTier.SUPER_RARE]: [Species.LARVESTA],
+    }),
+  [TrainerType.RICH]: new TrainerConfig(++t)
+    .setMoneyMultiplier(3.25)
+    .setName("Gentleman")
+    .setHasGenders("Madame")
+    .setHasDouble("Rich Couple")
+    .setPartyTemplates(
+      trainerPartyTemplates.THREE_WEAK,
+      trainerPartyTemplates.FOUR_WEAK,
+      trainerPartyTemplates.TWO_WEAK_ONE_AVG,
+      trainerPartyTemplates.THREE_AVG,
+    )
+    .setSpeciesFilter(s => s.isOfType(PokemonType.NORMAL) || s.isOfType(PokemonType.ELECTRIC)),
+  [TrainerType.RICH_KID]: new TrainerConfig(++t)
+    .setMoneyMultiplier(2.5)
+    .setName("Rich Boy")
+    .setHasGenders("Lady")
+    .setHasDouble("Rich Kids")
+    .setEncounterBgm(TrainerType.RICH)
+    .setPartyTemplates(
+      trainerPartyTemplates.FOUR_WEAKER,
+      trainerPartyTemplates.THREE_WEAK_SAME,
+      trainerPartyTemplates.TWO_WEAK_SAME_ONE_AVG,
+    )
+    .setSpeciesFilter(s => s.baseTotal <= 460),
+  [TrainerType.ROUGHNECK]: new TrainerConfig(++t)
+    .setMoneyMultiplier(1.4)
+    .setEncounterBgm(TrainerType.ROUGHNECK)
+    .setSpeciesFilter(s => s.isOfType(PokemonType.DARK)),
+  [TrainerType.SAILOR]: new TrainerConfig(++t)
+    .setMoneyMultiplier(1.4)
+    .setEncounterBgm(TrainerType.BACKPACKER)
+    .setSpeciesFilter(s => s.isOfType(PokemonType.WATER) || s.isOfType(PokemonType.FIGHTING)),
+  [TrainerType.SCIENTIST]: new TrainerConfig(++t)
+    .setHasGenders("Scientist Female")
+    .setHasDouble("Scientists")
+    .setMoneyMultiplier(1.7)
+    .setEncounterBgm(TrainerType.SCIENTIST)
+    .setSpeciesPools({
+      [TrainerPoolTier.COMMON]: [Species.MAGNEMITE, Species.GRIMER, Species.DROWZEE, Species.VOLTORB, Species.KOFFING],
+      [TrainerPoolTier.UNCOMMON]: [
+        Species.BALTOY,
+        Species.BRONZOR,
+        Species.FERROSEED,
+        Species.KLINK,
+        Species.CHARJABUG,
+        Species.BLIPBUG,
+        Species.HELIOPTILE,
+      ],
+      [TrainerPoolTier.RARE]: [
+        Species.ABRA,
+        Species.DITTO,
+        Species.PORYGON,
+        Species.ELEKID,
+        Species.SOLOSIS,
+        Species.GALAR_WEEZING,
+      ],
+      [TrainerPoolTier.SUPER_RARE]: [
+        Species.OMANYTE,
+        Species.KABUTO,
+        Species.AERODACTYL,
+        Species.LILEEP,
+        Species.ANORITH,
+        Species.CRANIDOS,
+        Species.SHIELDON,
+        Species.TIRTOUGA,
+        Species.ARCHEN,
+        Species.ARCTOVISH,
+        Species.ARCTOZOLT,
+        Species.DRACOVISH,
+        Species.DRACOZOLT,
+      ],
+      [TrainerPoolTier.ULTRA_RARE]: [Species.ROTOM, Species.MELTAN],
+    }),
+  [TrainerType.SMASHER]: new TrainerConfig(++t).setMoneyMultiplier(1.2).setEncounterBgm(TrainerType.CYCLIST),
+  [TrainerType.SNOW_WORKER]: new TrainerConfig(++t)
+    .setName("Worker")
+    .setHasDouble("Workers")
+    .setMoneyMultiplier(1.7)
+    .setEncounterBgm(TrainerType.CLERK)
+    .setSpeciesFilter(s => s.isOfType(PokemonType.ICE) || s.isOfType(PokemonType.STEEL)),
+  [TrainerType.STRIKER]: new TrainerConfig(++t).setMoneyMultiplier(1.2).setEncounterBgm(TrainerType.CYCLIST),
+  [TrainerType.SCHOOL_KID]: new TrainerConfig(++t)
+    .setMoneyMultiplier(0.75)
+    .setEncounterBgm(TrainerType.YOUNGSTER)
+    .setHasGenders("School Kid Female", "lass")
+    .setHasDouble("School Kids")
+    .setSpeciesPools({
+      [TrainerPoolTier.COMMON]: [
+        Species.ODDISH,
+        Species.EXEGGCUTE,
+        Species.TEDDIURSA,
+        Species.WURMPLE,
+        Species.RALTS,
+        Species.SHROOMISH,
+        Species.FLETCHLING,
+      ],
+      [TrainerPoolTier.UNCOMMON]: [Species.VOLTORB, Species.WHISMUR, Species.MEDITITE, Species.MIME_JR, Species.NYMBLE],
+      [TrainerPoolTier.RARE]: [Species.TANGELA, Species.EEVEE, Species.YANMA],
+      [TrainerPoolTier.SUPER_RARE]: [Species.TADBULB],
+    }),
+  [TrainerType.SWIMMER]: new TrainerConfig(++t)
+    .setMoneyMultiplier(1.3)
+    .setEncounterBgm(TrainerType.PARASOL_LADY)
+    .setHasGenders("Swimmer Female")
+    .setHasDouble("Swimmers")
+    .setSpecialtyType(PokemonType.WATER)
+    .setSpeciesFilter(s => s.isOfType(PokemonType.WATER)),
+  [TrainerType.TWINS]: new TrainerConfig(++t)
+    .setDoubleOnly()
+    .setMoneyMultiplier(0.65)
+    .setUseSameSeedForAllMembers()
+    .setPartyTemplateFunc(() =>
+      getWavePartyTemplate(
+        trainerPartyTemplates.TWO_WEAK,
+        trainerPartyTemplates.TWO_AVG,
+        trainerPartyTemplates.TWO_STRONG,
+      ),
+    )
+    .setPartyMemberFunc(
+      0,
+      getRandomPartyMemberFunc([
+        Species.PLUSLE,
+        Species.VOLBEAT,
+        Species.PACHIRISU,
+        Species.SILCOON,
+        Species.METAPOD,
+        Species.IGGLYBUFF,
+        Species.PETILIL,
+        Species.EEVEE,
+      ]),
+    )
+    .setPartyMemberFunc(
+      1,
+      getRandomPartyMemberFunc(
+        [
+          Species.MINUN,
+          Species.ILLUMISE,
+          Species.EMOLGA,
+          Species.CASCOON,
+          Species.KAKUNA,
+          Species.CLEFFA,
+          Species.COTTONEE,
+          Species.EEVEE,
+        ],
+        TrainerSlot.TRAINER_PARTNER,
+      ),
+    )
+    .setEncounterBgm(TrainerType.TWINS),
+  [TrainerType.VETERAN]: new TrainerConfig(++t)
+    .setHasGenders("Veteran Female")
+    .setHasDouble("Veteran Duo")
+    .setMoneyMultiplier(2.5)
+    .setEncounterBgm(TrainerType.ACE_TRAINER)
+    .setSpeciesFilter(s => s.isOfType(PokemonType.DRAGON)),
+  [TrainerType.WAITER]: new TrainerConfig(++t)
+    .setHasGenders("Waitress")
+    .setHasDouble("Restaurant Staff")
+    .setMoneyMultiplier(1.5)
+    .setEncounterBgm(TrainerType.CLERK)
+    .setSpeciesPools({
+      [TrainerPoolTier.COMMON]: [
+        Species.CLEFFA,
+        Species.CHATOT,
+        Species.PANSAGE,
+        Species.PANSEAR,
+        Species.PANPOUR,
+        Species.MINCCINO,
+      ],
+      [TrainerPoolTier.UNCOMMON]: [Species.TROPIUS, Species.PETILIL, Species.BOUNSWEET, Species.INDEEDEE],
+      [TrainerPoolTier.RARE]: [Species.APPLIN, Species.SINISTEA, Species.POLTCHAGEIST],
+    }),
+  [TrainerType.WORKER]: new TrainerConfig(++t)
+    .setHasGenders("Worker Female")
+    .setHasDouble("Workers")
+    .setEncounterBgm(TrainerType.CLERK)
+    .setMoneyMultiplier(1.7)
+    .setSpeciesFilter(s => s.isOfType(PokemonType.ROCK) || s.isOfType(PokemonType.STEEL)),
+  [TrainerType.YOUNGSTER]: new TrainerConfig(++t)
+    .setMoneyMultiplier(0.5)
+    .setEncounterBgm(TrainerType.YOUNGSTER)
+    .setHasGenders("Lass", "lass")
+    .setHasDouble("Beginners")
+    .setPartyTemplates(trainerPartyTemplates.TWO_WEAKER)
+    .setSpeciesPools([
+      Species.CATERPIE,
+      Species.WEEDLE,
+      Species.RATTATA,
+      Species.SENTRET,
+      Species.POOCHYENA,
+      Species.ZIGZAGOON,
+      Species.WURMPLE,
+      Species.BIDOOF,
+      Species.PATRAT,
+      Species.LILLIPUP,
+    ]),
+  [TrainerType.ROCKET_GRUNT]: new TrainerConfig(++t)
+    .setHasGenders("Rocket Grunt Female")
+    .setHasDouble("Rocket Grunts")
+    .setMoneyMultiplier(1.0)
+    .setEncounterBgm(TrainerType.PLASMA_GRUNT)
+    .setBattleBgm("battle_plasma_grunt")
+    .setMixedBattleBgm("battle_rocket_grunt")
+    .setVictoryBgm("victory_team_plasma")
+    .setPartyTemplateFunc(() => getEvilGruntPartyTemplate())
+    .setSpeciesPools({
+      [TrainerPoolTier.COMMON]: [
+        Species.WEEDLE,
+        Species.RATTATA,
+        Species.EKANS,
+        Species.SANDSHREW,
+        Species.ZUBAT,
+        Species.ODDISH,
+        Species.GEODUDE,
+        Species.SLOWPOKE,
+        Species.GRIMER,
+        Species.KOFFING,
+      ],
+      [TrainerPoolTier.UNCOMMON]: [
+        Species.MANKEY,
+        Species.GROWLITHE,
+        Species.MAGNEMITE,
+        Species.ONIX,
+        Species.VOLTORB,
+        Species.EXEGGCUTE,
+        Species.CUBONE,
+        Species.LICKITUNG,
+        Species.TAUROS,
+        Species.MAGIKARP,
+        Species.MURKROW,
+        Species.ELEKID,
+        Species.MAGBY,
+      ],
+      [TrainerPoolTier.RARE]: [
+        Species.ABRA,
+        Species.GASTLY,
+        Species.SCYTHER,
+        Species.PORYGON,
+        Species.OMANYTE,
+        Species.KABUTO,
+        Species.ALOLA_RATTATA,
+        Species.ALOLA_SANDSHREW,
+        Species.ALOLA_MEOWTH,
+        Species.ALOLA_GEODUDE,
+        Species.ALOLA_GRIMER,
+        Species.PALDEA_TAUROS,
+      ],
+      [TrainerPoolTier.SUPER_RARE]: [Species.DRATINI, Species.LARVITAR],
+    }),
+  [TrainerType.ARCHER]: new TrainerConfig(++t)
+    .setMoneyMultiplier(1.5)
+    .initForEvilTeamAdmin("rocket_admin", "rocket", [Species.HOUNDOOM])
+    .setEncounterBgm(TrainerType.PLASMA_GRUNT)
+    .setBattleBgm("battle_plasma_grunt")
+    .setMixedBattleBgm("battle_rocket_grunt")
+    .setVictoryBgm("victory_team_plasma")
+    .setPartyTemplateFunc(() => getEvilGruntPartyTemplate()),
+  [TrainerType.ARIANA]: new TrainerConfig(++t)
+    .setMoneyMultiplier(1.5)
+    .initForEvilTeamAdmin("rocket_admin_female", "rocket", [Species.ARBOK])
+    .setEncounterBgm(TrainerType.PLASMA_GRUNT)
+    .setBattleBgm("battle_plasma_grunt")
+    .setMixedBattleBgm("battle_rocket_grunt")
+    .setVictoryBgm("victory_team_plasma")
+    .setPartyTemplateFunc(() => getEvilGruntPartyTemplate()),
+  [TrainerType.PROTON]: new TrainerConfig(++t)
+    .setMoneyMultiplier(1.5)
+    .initForEvilTeamAdmin("rocket_admin", "rocket", [Species.CROBAT])
+    .setEncounterBgm(TrainerType.PLASMA_GRUNT)
+    .setBattleBgm("battle_plasma_grunt")
+    .setMixedBattleBgm("battle_rocket_grunt")
+    .setVictoryBgm("victory_team_plasma")
+    .setPartyTemplateFunc(() => getEvilGruntPartyTemplate()),
+  [TrainerType.PETREL]: new TrainerConfig(++t)
+    .setMoneyMultiplier(1.5)
+    .initForEvilTeamAdmin("rocket_admin", "rocket", [Species.WEEZING])
+    .setEncounterBgm(TrainerType.PLASMA_GRUNT)
+    .setBattleBgm("battle_plasma_grunt")
+    .setMixedBattleBgm("battle_rocket_grunt")
+    .setVictoryBgm("victory_team_plasma")
+    .setPartyTemplateFunc(() => getEvilGruntPartyTemplate()),
+  [TrainerType.MAGMA_GRUNT]: new TrainerConfig(++t)
+    .setHasGenders("Magma Grunt Female")
+    .setHasDouble("Magma Grunts")
+    .setMoneyMultiplier(1.0)
+    .setEncounterBgm(TrainerType.PLASMA_GRUNT)
+    .setBattleBgm("battle_plasma_grunt")
+    .setMixedBattleBgm("battle_aqua_magma_grunt")
+    .setVictoryBgm("victory_team_plasma")
+    .setPartyTemplateFunc(() => getEvilGruntPartyTemplate())
+    .setSpeciesPools({
+      [TrainerPoolTier.COMMON]: [
+        Species.DIGLETT,
+        Species.GROWLITHE,
+        Species.SLUGMA,
+        Species.POOCHYENA,
+        Species.ZIGZAGOON,
+        Species.NUMEL,
+        Species.TORKOAL,
+        Species.BALTOY,
+      ],
+      [TrainerPoolTier.UNCOMMON]: [
+        Species.RHYHORN,
+        Species.PHANPY,
+        Species.MAGBY,
+        Species.ZANGOOSE,
+        Species.SOLROCK,
+        Species.HEATMOR,
+        Species.ROLYCOLY,
+        Species.CAPSAKID,
+      ],
+      [TrainerPoolTier.RARE]: [
+        Species.TRAPINCH,
+        Species.LILEEP,
+        Species.ANORITH,
+        Species.GOLETT,
+        Species.TURTONATOR,
+        Species.TOEDSCOOL,
+        Species.HISUI_GROWLITHE,
+      ],
+      [TrainerPoolTier.SUPER_RARE]: [Species.CHARCADET, Species.ARON],
+    }),
+  [TrainerType.TABITHA]: new TrainerConfig(++t)
+    .setMoneyMultiplier(1.5)
+    .initForEvilTeamAdmin("magma_admin", "magma", [Species.CAMERUPT])
+    .setEncounterBgm(TrainerType.PLASMA_GRUNT)
+    .setBattleBgm("battle_plasma_grunt")
+    .setMixedBattleBgm("battle_aqua_magma_grunt")
+    .setVictoryBgm("victory_team_plasma")
+    .setPartyTemplateFunc(() => getEvilGruntPartyTemplate()),
+  [TrainerType.COURTNEY]: new TrainerConfig(++t)
+    .setMoneyMultiplier(1.5)
+    .initForEvilTeamAdmin("magma_admin_female", "magma", [Species.CAMERUPT])
+    .setEncounterBgm(TrainerType.PLASMA_GRUNT)
+    .setBattleBgm("battle_plasma_grunt")
+    .setMixedBattleBgm("battle_aqua_magma_grunt")
+    .setVictoryBgm("victory_team_plasma")
+    .setPartyTemplateFunc(() => getEvilGruntPartyTemplate()),
+  [TrainerType.AQUA_GRUNT]: new TrainerConfig(++t)
+    .setHasGenders("Aqua Grunt Female")
+    .setHasDouble("Aqua Grunts")
+    .setMoneyMultiplier(1.0)
+    .setEncounterBgm(TrainerType.PLASMA_GRUNT)
+    .setBattleBgm("battle_plasma_grunt")
+    .setMixedBattleBgm("battle_aqua_magma_grunt")
+    .setVictoryBgm("victory_team_plasma")
+    .setPartyTemplateFunc(() => getEvilGruntPartyTemplate())
+    .setSpeciesPools({
+      [TrainerPoolTier.COMMON]: [
+        Species.QWILFISH,
+        Species.REMORAID,
+        Species.ZIGZAGOON,
+        Species.LOTAD,
+        Species.WINGULL,
+        Species.CARVANHA,
+        Species.WAILMER,
+        Species.BARBOACH,
+        Species.CORPHISH,
+        Species.SPHEAL,
+      ],
+      [TrainerPoolTier.UNCOMMON]: [
+        Species.TENTACOOL,
+        Species.HORSEA,
+        Species.CHINCHOU,
+        Species.WOOPER,
+        Species.AZURILL,
+        Species.SEVIPER,
+        Species.CLAMPERL,
+        Species.WIMPOD,
+        Species.CLOBBOPUS,
+      ],
+      [TrainerPoolTier.RARE]: [
+        Species.MANTYKE,
+        Species.TYMPOLE,
+        Species.SKRELP,
+        Species.ARROKUDA,
+        Species.WIGLETT,
+        Species.HISUI_QWILFISH,
+        Species.PALDEA_WOOPER,
+      ],
+      [TrainerPoolTier.SUPER_RARE]: [Species.BASCULEGION, Species.DONDOZO],
+    }),
+  [TrainerType.MATT]: new TrainerConfig(++t)
+    .setMoneyMultiplier(1.5)
+    .initForEvilTeamAdmin("aqua_admin", "aqua", [Species.SHARPEDO])
+    .setEncounterBgm(TrainerType.PLASMA_GRUNT)
+    .setBattleBgm("battle_plasma_grunt")
+    .setMixedBattleBgm("battle_aqua_magma_grunt")
+    .setVictoryBgm("victory_team_plasma")
+    .setPartyTemplateFunc(() => getEvilGruntPartyTemplate()),
+  [TrainerType.SHELLY]: new TrainerConfig(++t)
+    .setMoneyMultiplier(1.5)
+    .initForEvilTeamAdmin("aqua_admin_female", "aqua", [Species.SHARPEDO])
+    .setEncounterBgm(TrainerType.PLASMA_GRUNT)
+    .setBattleBgm("battle_plasma_grunt")
+    .setMixedBattleBgm("battle_aqua_magma_grunt")
+    .setVictoryBgm("victory_team_plasma")
+    .setPartyTemplateFunc(() => getEvilGruntPartyTemplate()),
+  [TrainerType.GALACTIC_GRUNT]: new TrainerConfig(++t)
+    .setHasGenders("Galactic Grunt Female")
+    .setHasDouble("Galactic Grunts")
+    .setMoneyMultiplier(1.0)
+    .setEncounterBgm(TrainerType.PLASMA_GRUNT)
+    .setBattleBgm("battle_plasma_grunt")
+    .setMixedBattleBgm("battle_galactic_grunt")
+    .setVictoryBgm("victory_team_plasma")
+    .setPartyTemplateFunc(() => getEvilGruntPartyTemplate())
+    .setSpeciesPools({
+      [TrainerPoolTier.COMMON]: [
+        Species.WURMPLE,
+        Species.SHINX,
+        Species.BURMY,
+        Species.DRIFLOON,
+        Species.GLAMEOW,
+        Species.STUNKY,
+        Species.BRONZOR,
+        Species.CROAGUNK,
+        Species.CARNIVINE,
+      ],
+      [TrainerPoolTier.UNCOMMON]: [
+        Species.ZUBAT,
+        Species.LICKITUNG,
+        Species.RHYHORN,
+        Species.TANGELA,
+        Species.YANMA,
+        Species.GLIGAR,
+        Species.SWINUB,
+        Species.SKORUPI,
+      ],
+      [TrainerPoolTier.RARE]: [
+        Species.SNEASEL,
+        Species.TEDDIURSA,
+        Species.ELEKID,
+        Species.MAGBY,
+        Species.DUSKULL,
+        Species.HISUI_GROWLITHE,
+        Species.HISUI_QWILFISH,
+      ],
+      [TrainerPoolTier.SUPER_RARE]: [Species.SPIRITOMB, Species.ROTOM, Species.HISUI_SNEASEL],
+    }),
+  [TrainerType.JUPITER]: new TrainerConfig(++t)
+    .setMoneyMultiplier(1.5)
+    .initForEvilTeamAdmin("galactic_commander_female", "galactic", [Species.SKUNTANK])
+    .setEncounterBgm(TrainerType.PLASMA_GRUNT)
+    .setBattleBgm("battle_plasma_grunt")
+    .setMixedBattleBgm("battle_galactic_admin")
+    .setVictoryBgm("victory_team_plasma")
+    .setPartyTemplateFunc(() => getEvilGruntPartyTemplate()),
+  [TrainerType.MARS]: new TrainerConfig(++t)
+    .setMoneyMultiplier(1.5)
+    .initForEvilTeamAdmin("galactic_commander_female", "galactic", [Species.PURUGLY])
+    .setEncounterBgm(TrainerType.PLASMA_GRUNT)
+    .setBattleBgm("battle_plasma_grunt")
+    .setMixedBattleBgm("battle_galactic_admin")
+    .setVictoryBgm("victory_team_plasma")
+    .setPartyTemplateFunc(() => getEvilGruntPartyTemplate()),
+  [TrainerType.SATURN]: new TrainerConfig(++t)
+    .setMoneyMultiplier(1.5)
+    .initForEvilTeamAdmin("galactic_commander", "galactic", [Species.TOXICROAK])
+    .setEncounterBgm(TrainerType.PLASMA_GRUNT)
+    .setBattleBgm("battle_plasma_grunt")
+    .setMixedBattleBgm("battle_galactic_admin")
+    .setVictoryBgm("victory_team_plasma")
+    .setPartyTemplateFunc(() => getEvilGruntPartyTemplate()),
+  [TrainerType.PLASMA_GRUNT]: new TrainerConfig(++t)
+    .setHasGenders("Plasma Grunt Female")
+    .setHasDouble("Plasma Grunts")
+    .setMoneyMultiplier(1.0)
+    .setEncounterBgm(TrainerType.PLASMA_GRUNT)
+    .setBattleBgm("battle_plasma_grunt")
+    .setMixedBattleBgm("battle_plasma_grunt")
+    .setVictoryBgm("victory_team_plasma")
+    .setPartyTemplateFunc(() => getEvilGruntPartyTemplate())
+    .setSpeciesPools({
+      [TrainerPoolTier.COMMON]: [
+        Species.PATRAT,
+        Species.LILLIPUP,
+        Species.PURRLOIN,
+        Species.WOOBAT,
+        Species.TYMPOLE,
+        Species.SANDILE,
+        Species.SCRAGGY,
+        Species.TRUBBISH,
+        Species.VANILLITE,
+      ],
+      [TrainerPoolTier.UNCOMMON]: [
+        Species.TIMBURR,
+        Species.VENIPEDE,
+        Species.DARUMAKA,
+        Species.FOONGUS,
+        Species.FRILLISH,
+        Species.JOLTIK,
+        Species.KLINK,
+        Species.CUBCHOO,
+        Species.GOLETT,
+      ],
+      [TrainerPoolTier.RARE]: [
+        Species.DRILBUR,
+        Species.ZORUA,
+        Species.MIENFOO,
+        Species.PAWNIARD,
+        Species.BOUFFALANT,
+        Species.RUFFLET,
+        Species.VULLABY,
+        Species.DURANT,
+      ],
+      [TrainerPoolTier.SUPER_RARE]: [Species.AXEW, Species.DRUDDIGON, Species.DEINO, Species.HISUI_ZORUA],
+    }),
+  [TrainerType.ZINZOLIN]: new TrainerConfig(++t)
+    .setMoneyMultiplier(1.5)
+    .initForEvilTeamAdmin("plasma_sage", "plasma_zinzolin", [Species.CRYOGONAL])
+    .setEncounterBgm(TrainerType.PLASMA_GRUNT)
+    .setBattleBgm("battle_plasma_grunt")
+    .setMixedBattleBgm("battle_plasma_grunt")
+    .setVictoryBgm("victory_team_plasma")
+    .setPartyTemplateFunc(() => getEvilGruntPartyTemplate()),
+  [TrainerType.COLRESS]: new TrainerConfig(++t)
+    .setMoneyMultiplier(1.5)
+    .initForEvilTeamAdmin("plasma_boss", "plasma_colress", [Species.KLINKLANG])
+    .setEncounterBgm(TrainerType.PLASMA_GRUNT)
+    .setBattleBgm("battle_colress")
+    .setMixedBattleBgm("battle_colress")
+    .setVictoryBgm("victory_team_plasma")
+    .setPartyTemplateFunc(() => getEvilGruntPartyTemplate()),
+  [TrainerType.FLARE_GRUNT]: new TrainerConfig(++t)
+    .setHasGenders("Flare Grunt Female")
+    .setHasDouble("Flare Grunts")
+    .setMoneyMultiplier(1.0)
+    .setEncounterBgm(TrainerType.PLASMA_GRUNT)
+    .setBattleBgm("battle_plasma_grunt")
+    .setMixedBattleBgm("battle_flare_grunt")
+    .setVictoryBgm("victory_team_plasma")
+    .setPartyTemplateFunc(() => getEvilGruntPartyTemplate())
+    .setSpeciesPools({
+      [TrainerPoolTier.COMMON]: [
+        Species.HOUNDOUR,
+        Species.GULPIN,
+        Species.SKORUPI,
+        Species.CROAGUNK,
+        Species.PURRLOIN,
+        Species.SCRAGGY,
+        Species.FLETCHLING,
+        Species.SCATTERBUG,
+        Species.LITLEO,
+        Species.ESPURR,
+        Species.INKAY,
+      ],
+      [TrainerPoolTier.UNCOMMON]: [
+        Species.POOCHYENA,
+        Species.ELECTRIKE,
+        Species.FOONGUS,
+        Species.PANCHAM,
+        Species.BINACLE,
+        Species.SKRELP,
+        Species.CLAUNCHER,
+        Species.HELIOPTILE,
+        Species.PHANTUMP,
+        Species.PUMPKABOO,
+      ],
+      [TrainerPoolTier.RARE]: [Species.SNEASEL, Species.LITWICK, Species.PAWNIARD, Species.NOIBAT],
+      [TrainerPoolTier.SUPER_RARE]: [Species.SLIGGOO, Species.HISUI_SLIGGOO, Species.HISUI_AVALUGG],
+    }),
+  [TrainerType.BRYONY]: new TrainerConfig(++t)
+    .setMoneyMultiplier(1.5)
+    .initForEvilTeamAdmin("flare_admin_female", "flare", [Species.LIEPARD])
+    .setEncounterBgm(TrainerType.PLASMA_GRUNT)
+    .setBattleBgm("battle_plasma_grunt")
+    .setMixedBattleBgm("battle_flare_grunt")
+    .setVictoryBgm("victory_team_plasma")
+    .setPartyTemplateFunc(() => getEvilGruntPartyTemplate()),
+  [TrainerType.XEROSIC]: new TrainerConfig(++t)
+    .setMoneyMultiplier(1.5)
+    .initForEvilTeamAdmin("flare_admin", "flare", [Species.MALAMAR])
+    .setEncounterBgm(TrainerType.PLASMA_GRUNT)
+    .setBattleBgm("battle_plasma_grunt")
+    .setMixedBattleBgm("battle_flare_grunt")
+    .setVictoryBgm("victory_team_plasma")
+    .setPartyTemplateFunc(() => getEvilGruntPartyTemplate()),
+  [TrainerType.AETHER_GRUNT]: new TrainerConfig(++t)
+    .setHasGenders("Aether Grunt Female")
+    .setHasDouble("Aether Grunts")
+    .setMoneyMultiplier(1.0)
+    .setEncounterBgm(TrainerType.PLASMA_GRUNT)
+    .setBattleBgm("battle_plasma_grunt")
+    .setMixedBattleBgm("battle_aether_grunt")
+    .setVictoryBgm("victory_team_plasma")
+    .setPartyTemplateFunc(() => getEvilGruntPartyTemplate())
+    .setSpeciesPools({
+      [TrainerPoolTier.COMMON]: [
+        Species.CORSOLA,
+        Species.LILLIPUP,
+        Species.PIKIPEK,
+        Species.YUNGOOS,
+        Species.ROCKRUFF,
+        Species.MORELULL,
+        Species.BOUNSWEET,
+        Species.COMFEY,
+        Species.KOMALA,
+        Species.TOGEDEMARU,
+        Species.ALOLA_RAICHU,
+        Species.ALOLA_DIGLETT,
+        Species.ALOLA_GEODUDE,
+        Species.ALOLA_EXEGGUTOR,
+      ],
+      [TrainerPoolTier.UNCOMMON]: [
+        Species.POLIWAG,
+        Species.CRABRAWLER,
+        Species.ORICORIO,
+        Species.CUTIEFLY,
+        Species.WISHIWASHI,
+        Species.MUDBRAY,
+        Species.STUFFUL,
+        Species.ORANGURU,
+        Species.PASSIMIAN,
+        Species.PYUKUMUKU,
+        Species.BRUXISH,
+        Species.ALOLA_SANDSHREW,
+        Species.ALOLA_VULPIX,
+        Species.ALOLA_MAROWAK,
+      ],
+      [TrainerPoolTier.RARE]: [
+        Species.MINIOR,
+        Species.TURTONATOR,
+        Species.MIMIKYU,
+        Species.DRAMPA,
+        Species.GALAR_CORSOLA,
+      ],
+      [TrainerPoolTier.SUPER_RARE]: [Species.PORYGON, Species.JANGMO_O],
+    }),
+  [TrainerType.FABA]: new TrainerConfig(++t)
+    .setMoneyMultiplier(1.5)
+    .initForEvilTeamAdmin("aether_admin", "aether", [Species.HYPNO])
+    .setEncounterBgm(TrainerType.PLASMA_GRUNT)
+    .setBattleBgm("battle_plasma_grunt")
+    .setMixedBattleBgm("battle_aether_grunt")
+    .setVictoryBgm("victory_team_plasma")
+    .setPartyTemplateFunc(() => getEvilGruntPartyTemplate()),
+  [TrainerType.SKULL_GRUNT]: new TrainerConfig(++t)
+    .setHasGenders("Skull Grunt Female")
+    .setHasDouble("Skull Grunts")
+    .setMoneyMultiplier(1.0)
+    .setEncounterBgm(TrainerType.PLASMA_GRUNT)
+    .setBattleBgm("battle_plasma_grunt")
+    .setMixedBattleBgm("battle_skull_grunt")
+    .setVictoryBgm("victory_team_plasma")
+    .setPartyTemplateFunc(() => getEvilGruntPartyTemplate())
+    .setSpeciesPools({
+      [TrainerPoolTier.COMMON]: [
+        Species.EKANS,
+        Species.VENONAT,
+        Species.DROWZEE,
+        Species.KOFFING,
+        Species.SPINARAK,
+        Species.SCRAGGY,
+        Species.TRUBBISH,
+        Species.MAREANIE,
+        Species.SALANDIT,
+        Species.ALOLA_RATTATA,
+        Species.ALOLA_MEOWTH,
+        Species.ALOLA_GRIMER,
+      ],
+      [TrainerPoolTier.UNCOMMON]: [
+        Species.ZUBAT,
+        Species.GASTLY,
+        Species.HOUNDOUR,
+        Species.SABLEYE,
+        Species.VENIPEDE,
+        Species.SANDILE,
+        Species.VULLABY,
+        Species.PANCHAM,
+        Species.FOMANTIS,
+        Species.ALOLA_MAROWAK,
+      ],
+      [TrainerPoolTier.RARE]: [
+        Species.PAWNIARD,
+        Species.WISHIWASHI,
+        Species.SANDYGAST,
+        Species.MIMIKYU,
+        Species.DHELMISE,
+        Species.NYMBLE,
+      ],
+      [TrainerPoolTier.SUPER_RARE]: [Species.GRUBBIN, Species.DEWPIDER],
+    }),
+  [TrainerType.PLUMERIA]: new TrainerConfig(++t)
+    .setMoneyMultiplier(1.5)
+    .initForEvilTeamAdmin("skull_admin", "skull", [Species.SALAZZLE])
+    .setEncounterBgm(TrainerType.PLASMA_GRUNT)
+    .setBattleBgm("battle_plasma_grunt")
+    .setMixedBattleBgm("battle_skull_admin")
+    .setVictoryBgm("victory_team_plasma")
+    .setPartyTemplateFunc(() => getEvilGruntPartyTemplate()),
+  [TrainerType.MACRO_GRUNT]: new TrainerConfig(++t)
+    .setHasGenders("Macro Grunt Female")
+    .setHasDouble("Macro Grunts")
+    .setMoneyMultiplier(1.0)
+    .setEncounterBgm(TrainerType.PLASMA_GRUNT)
+    .setBattleBgm("battle_plasma_grunt")
+    .setMixedBattleBgm("battle_macro_grunt")
+    .setVictoryBgm("victory_team_plasma")
+    .setPartyTemplateFunc(() => getEvilGruntPartyTemplate())
+    .setSpeciesPools({
+      [TrainerPoolTier.COMMON]: [
+        Species.STEELIX,
+        Species.MAWILE,
+        Species.FERROSEED,
+        Species.KLINK,
+        Species.SKWOVET,
+        Species.ROOKIDEE,
+        Species.ROLYCOLY,
+        Species.CUFANT,
+        Species.GALAR_MEOWTH,
+        Species.GALAR_ZIGZAGOON,
+      ],
+      [TrainerPoolTier.UNCOMMON]: [
+        Species.MAGNEMITE,
+        Species.RIOLU,
+        Species.DRILBUR,
+        Species.APPLIN,
+        Species.CRAMORANT,
+        Species.ARROKUDA,
+        Species.SINISTEA,
+        Species.HATENNA,
+        Species.FALINKS,
+        Species.GALAR_PONYTA,
+        Species.GALAR_YAMASK,
+      ],
+      [TrainerPoolTier.RARE]: [
+        Species.SCIZOR,
+        Species.BELDUM,
+        Species.HONEDGE,
+        Species.GALAR_FARFETCHD,
+        Species.GALAR_MR_MIME,
+        Species.GALAR_DARUMAKA,
+      ],
+      [TrainerPoolTier.SUPER_RARE]: [Species.DURALUDON, Species.DREEPY],
+    }),
+  [TrainerType.OLEANA]: new TrainerConfig(++t)
+    .setMoneyMultiplier(1.5)
+    .initForEvilTeamAdmin("macro_admin", "macro_cosmos", [Species.GARBODOR])
+    .setEncounterBgm(TrainerType.PLASMA_GRUNT)
+    .setBattleBgm("battle_plasma_grunt")
+    .setMixedBattleBgm("battle_oleana")
+    .setVictoryBgm("victory_team_plasma")
+    .setPartyTemplateFunc(() => getEvilGruntPartyTemplate()),
+  [TrainerType.STAR_GRUNT]: new TrainerConfig(++t)
+    .setHasGenders("Star Grunt Female")
+    .setHasDouble("Star Grunts")
+    .setMoneyMultiplier(1.0)
+    .setEncounterBgm(TrainerType.PLASMA_GRUNT)
+    .setBattleBgm("battle_plasma_grunt")
+    .setMixedBattleBgm("battle_star_grunt")
+    .setVictoryBgm("victory_team_plasma")
+    .setPartyTemplateFunc(() => getEvilGruntPartyTemplate())
+    .setSpeciesPools({
+      [TrainerPoolTier.COMMON]: [
+        Species.DUNSPARCE,
+        Species.HOUNDOUR,
+        Species.AZURILL,
+        Species.GULPIN,
+        Species.FOONGUS,
+        Species.FLETCHLING,
+        Species.LITLEO,
+        Species.FLABEBE,
+        Species.CRABRAWLER,
+        Species.NYMBLE,
+        Species.PAWMI,
+        Species.FIDOUGH,
+        Species.SQUAWKABILLY,
+        Species.MASCHIFF,
+        Species.SHROODLE,
+        Species.KLAWF,
+        Species.WIGLETT,
+        Species.PALDEA_WOOPER,
+      ],
+      [TrainerPoolTier.UNCOMMON]: [
+        Species.KOFFING,
+        Species.EEVEE,
+        Species.GIRAFARIG,
+        Species.RALTS,
+        Species.TORKOAL,
+        Species.SEVIPER,
+        Species.SCRAGGY,
+        Species.ZORUA,
+        Species.MIMIKYU,
+        Species.IMPIDIMP,
+        Species.FALINKS,
+        Species.CAPSAKID,
+        Species.TINKATINK,
+        Species.BOMBIRDIER,
+        Species.CYCLIZAR,
+        Species.FLAMIGO,
+        Species.PALDEA_TAUROS,
+      ],
+      [TrainerPoolTier.RARE]: [
+        Species.MANKEY,
+        Species.PAWNIARD,
+        Species.CHARCADET,
+        Species.FLITTLE,
+        Species.VAROOM,
+        Species.ORTHWORM,
+      ],
+      [TrainerPoolTier.SUPER_RARE]: [Species.DONDOZO, Species.GIMMIGHOUL],
+    }),
+  [TrainerType.GIACOMO]: new TrainerConfig(++t)
+    .setMoneyMultiplier(1.5)
+    .initForEvilTeamAdmin("star_admin", "star_dark", [Species.KINGAMBIT], PokemonType.DARK)
+    .setEncounterBgm(TrainerType.PLASMA_GRUNT)
+    .setBattleBgm("battle_plasma_grunt")
+    .setMixedBattleBgm("battle_star_admin")
+    .setVictoryBgm("victory_team_plasma")
+    .setPartyTemplateFunc(() => getEvilGruntPartyTemplate())
+    .setPartyMemberFunc(
+      3,
+      getRandomPartyMemberFunc([Species.REVAVROOM], TrainerSlot.TRAINER, true, p => {
+        p.formIndex = 1; // Segin Starmobile
+        p.moveset = [
+          new PokemonMove(Moves.WICKED_TORQUE),
+          new PokemonMove(Moves.SPIN_OUT),
+          new PokemonMove(Moves.SHIFT_GEAR),
+          new PokemonMove(Moves.HIGH_HORSEPOWER),
+        ];
+      }),
+    ),
+  [TrainerType.MELA]: new TrainerConfig(++t)
+    .setMoneyMultiplier(1.5)
+    .initForEvilTeamAdmin("star_admin", "star_fire", [Species.ARMAROUGE], PokemonType.FIRE)
+    .setEncounterBgm(TrainerType.PLASMA_GRUNT)
+    .setBattleBgm("battle_plasma_grunt")
+    .setMixedBattleBgm("battle_star_admin")
+    .setVictoryBgm("victory_team_plasma")
+    .setPartyTemplateFunc(() => getEvilGruntPartyTemplate())
+    .setPartyMemberFunc(
+      3,
+      getRandomPartyMemberFunc([Species.REVAVROOM], TrainerSlot.TRAINER, true, p => {
+        p.formIndex = 2; // Schedar Starmobile
+        p.moveset = [
+          new PokemonMove(Moves.BLAZING_TORQUE),
+          new PokemonMove(Moves.SPIN_OUT),
+          new PokemonMove(Moves.SHIFT_GEAR),
+          new PokemonMove(Moves.HIGH_HORSEPOWER),
+        ];
+      }),
+    ),
+  [TrainerType.ATTICUS]: new TrainerConfig(++t)
+    .setMoneyMultiplier(1.5)
+    .initForEvilTeamAdmin("star_admin", "star_poison", [Species.REVAVROOM], PokemonType.POISON)
+    .setEncounterBgm(TrainerType.PLASMA_GRUNT)
+    .setBattleBgm("battle_plasma_grunt")
+    .setMixedBattleBgm("battle_star_admin")
+    .setVictoryBgm("victory_team_plasma")
+    .setPartyTemplateFunc(() => getEvilGruntPartyTemplate())
+    .setPartyMemberFunc(
+      3,
+      getRandomPartyMemberFunc([Species.REVAVROOM], TrainerSlot.TRAINER, true, p => {
+        p.formIndex = 3; // Navi Starmobile
+        p.moveset = [
+          new PokemonMove(Moves.NOXIOUS_TORQUE),
+          new PokemonMove(Moves.SPIN_OUT),
+          new PokemonMove(Moves.SHIFT_GEAR),
+          new PokemonMove(Moves.HIGH_HORSEPOWER),
+        ];
+      }),
+    ),
+  [TrainerType.ORTEGA]: new TrainerConfig(++t)
+    .setMoneyMultiplier(1.5)
+    .initForEvilTeamAdmin("star_admin", "star_fairy", [Species.DACHSBUN], PokemonType.FAIRY)
+    .setEncounterBgm(TrainerType.PLASMA_GRUNT)
+    .setBattleBgm("battle_plasma_grunt")
+    .setMixedBattleBgm("battle_star_admin")
+    .setVictoryBgm("victory_team_plasma")
+    .setPartyTemplateFunc(() => getEvilGruntPartyTemplate())
+    .setPartyMemberFunc(
+      3,
+      getRandomPartyMemberFunc([Species.REVAVROOM], TrainerSlot.TRAINER, true, p => {
+        p.formIndex = 4; // Ruchbah Starmobile
+        p.moveset = [
+          new PokemonMove(Moves.MAGICAL_TORQUE),
+          new PokemonMove(Moves.SPIN_OUT),
+          new PokemonMove(Moves.SHIFT_GEAR),
+          new PokemonMove(Moves.HIGH_HORSEPOWER),
+        ];
+      }),
+    ),
+  [TrainerType.ERI]: new TrainerConfig(++t)
+    .setMoneyMultiplier(1.5)
+    .initForEvilTeamAdmin("star_admin", "star_fighting", [Species.ANNIHILAPE], PokemonType.FIGHTING)
+    .setEncounterBgm(TrainerType.PLASMA_GRUNT)
+    .setBattleBgm("battle_plasma_grunt")
+    .setMixedBattleBgm("battle_star_admin")
+    .setVictoryBgm("victory_team_plasma")
+    .setPartyTemplateFunc(() => getEvilGruntPartyTemplate())
+    .setPartyMemberFunc(
+      3,
+      getRandomPartyMemberFunc([Species.REVAVROOM], TrainerSlot.TRAINER, true, p => {
+        p.formIndex = 5; // Caph Starmobile
+        p.moveset = [
+          new PokemonMove(Moves.COMBAT_TORQUE),
+          new PokemonMove(Moves.SPIN_OUT),
+          new PokemonMove(Moves.SHIFT_GEAR),
+          new PokemonMove(Moves.HIGH_HORSEPOWER),
+        ];
+      }),
+    ),
+
+  [TrainerType.BROCK]: new TrainerConfig((t = TrainerType.BROCK))
+    .initForGymLeader(signatureSpecies["BROCK"], true, PokemonType.ROCK, false, -1)
+    .setBattleBgm("battle_kanto_gym")
+    .setMixedBattleBgm("battle_kanto_gym"),
+  [TrainerType.MISTY]: new TrainerConfig(++t)
+    .initForGymLeader(signatureSpecies["MISTY"], false, PokemonType.WATER, false, -1)
+    .setBattleBgm("battle_kanto_gym")
+    .setMixedBattleBgm("battle_kanto_gym"),
+  [TrainerType.LT_SURGE]: new TrainerConfig(++t)
+    .initForGymLeader(signatureSpecies["LT_SURGE"], true, PokemonType.ELECTRIC, false, -1)
+    .setBattleBgm("battle_kanto_gym")
+    .setMixedBattleBgm("battle_kanto_gym"),
+  [TrainerType.ERIKA]: new TrainerConfig(++t)
+    .initForGymLeader(signatureSpecies["ERIKA"], false, PokemonType.GRASS, false, -1)
+    .setBattleBgm("battle_kanto_gym")
+    .setMixedBattleBgm("battle_kanto_gym"),
+  [TrainerType.JANINE]: new TrainerConfig(++t)
+    .initForGymLeader(signatureSpecies["JANINE"], false, PokemonType.POISON, false, -1)
+    .setBattleBgm("battle_kanto_gym")
+    .setMixedBattleBgm("battle_kanto_gym"),
+  [TrainerType.SABRINA]: new TrainerConfig(++t)
+    .initForGymLeader(signatureSpecies["SABRINA"], false, PokemonType.PSYCHIC, false, -1)
+    .setBattleBgm("battle_kanto_gym")
+    .setMixedBattleBgm("battle_kanto_gym"),
+  [TrainerType.BLAINE]: new TrainerConfig(++t)
+    .initForGymLeader(signatureSpecies["BLAINE"], true, PokemonType.FIRE, false, -1)
+    .setBattleBgm("battle_kanto_gym")
+    .setMixedBattleBgm("battle_kanto_gym"),
+  [TrainerType.GIOVANNI]: new TrainerConfig(++t)
+    .initForGymLeader(signatureSpecies["GIOVANNI"], true, PokemonType.GROUND, false, -2)
+    .setBattleBgm("battle_kanto_gym")
+    .setMixedBattleBgm("battle_kanto_gym"),
+  [TrainerType.FALKNER]: new TrainerConfig(++t)
+    .initForGymLeader(signatureSpecies["FALKNER"], true, PokemonType.FLYING, false, -1)
+    .setBattleBgm("battle_johto_gym")
+    .setMixedBattleBgm("battle_johto_gym"),
+  [TrainerType.BUGSY]: new TrainerConfig(++t)
+    .initForGymLeader(signatureSpecies["BUGSY"], true, PokemonType.BUG, false, -1)
+    .setBattleBgm("battle_johto_gym")
+    .setMixedBattleBgm("battle_johto_gym"),
+  [TrainerType.WHITNEY]: new TrainerConfig(++t)
+    .initForGymLeader(signatureSpecies["WHITNEY"], false, PokemonType.NORMAL, false, -1)
+    .setBattleBgm("battle_johto_gym")
+    .setMixedBattleBgm("battle_johto_gym"),
+  [TrainerType.MORTY]: new TrainerConfig(++t)
+    .initForGymLeader(signatureSpecies["MORTY"], true, PokemonType.GHOST, false, -1)
+    .setBattleBgm("battle_johto_gym")
+    .setMixedBattleBgm("battle_johto_gym"),
+  [TrainerType.CHUCK]: new TrainerConfig(++t)
+    .initForGymLeader(signatureSpecies["CHUCK"], true, PokemonType.FIGHTING, false, -1)
+    .setBattleBgm("battle_johto_gym")
+    .setMixedBattleBgm("battle_johto_gym"),
+  [TrainerType.JASMINE]: new TrainerConfig(++t)
+    .initForGymLeader(signatureSpecies["JASMINE"], false, PokemonType.STEEL, false, -1)
+    .setBattleBgm("battle_johto_gym")
+    .setMixedBattleBgm("battle_johto_gym"),
+  [TrainerType.PRYCE]: new TrainerConfig(++t)
+    .initForGymLeader(signatureSpecies["PRYCE"], true, PokemonType.ICE, false, -1)
+    .setBattleBgm("battle_johto_gym")
+    .setMixedBattleBgm("battle_johto_gym"),
+  [TrainerType.CLAIR]: new TrainerConfig(++t)
+    .initForGymLeader(signatureSpecies["CLAIR"], false, PokemonType.DRAGON, false, -3)
+    .setBattleBgm("battle_johto_gym")
+    .setMixedBattleBgm("battle_johto_gym"),
+  [TrainerType.ROXANNE]: new TrainerConfig(++t)
+    .initForGymLeader(signatureSpecies["ROXANNE"], false, PokemonType.ROCK, false, -1)
+    .setBattleBgm("battle_hoenn_gym")
+    .setMixedBattleBgm("battle_hoenn_gym"),
+  [TrainerType.BRAWLY]: new TrainerConfig(++t)
+    .initForGymLeader(signatureSpecies["BRAWLY"], true, PokemonType.FIGHTING, false, -1)
+    .setBattleBgm("battle_hoenn_gym")
+    .setMixedBattleBgm("battle_hoenn_gym"),
+  [TrainerType.WATTSON]: new TrainerConfig(++t)
+    .initForGymLeader(signatureSpecies["WATTSON"], true, PokemonType.ELECTRIC, false, -1)
+    .setBattleBgm("battle_hoenn_gym")
+    .setMixedBattleBgm("battle_hoenn_gym"),
+  [TrainerType.FLANNERY]: new TrainerConfig(++t)
+    .initForGymLeader(signatureSpecies["FLANNERY"], false, PokemonType.FIRE, false, -1)
+    .setBattleBgm("battle_hoenn_gym")
+    .setMixedBattleBgm("battle_hoenn_gym"),
+  [TrainerType.NORMAN]: new TrainerConfig(++t)
+    .initForGymLeader(signatureSpecies["NORMAN"], true, PokemonType.NORMAL, false, -1)
+    .setBattleBgm("battle_hoenn_gym")
+    .setMixedBattleBgm("battle_hoenn_gym"),
+  [TrainerType.WINONA]: new TrainerConfig(++t)
+    .initForGymLeader(signatureSpecies["WINONA"], false, PokemonType.FLYING, false, -1)
+    .setBattleBgm("battle_hoenn_gym")
+    .setMixedBattleBgm("battle_hoenn_gym"),
+  [TrainerType.TATE]: new TrainerConfig(++t)
+    .initForGymLeader(signatureSpecies["TATE"], true, PokemonType.PSYCHIC, false, -1)
+    .setBattleBgm("battle_hoenn_gym")
+    .setMixedBattleBgm("battle_hoenn_gym")
+    .setHasDouble("tate_liza_double")
+    .setDoubleTrainerType(TrainerType.LIZA)
+    .setDoubleTitle("gym_leader_double"),
+  [TrainerType.LIZA]: new TrainerConfig(++t)
+    .initForGymLeader(signatureSpecies["LIZA"], false, PokemonType.PSYCHIC, false, -1)
+    .setBattleBgm("battle_hoenn_gym")
+    .setMixedBattleBgm("battle_hoenn_gym")
+    .setHasDouble("liza_tate_double")
+    .setDoubleTrainerType(TrainerType.TATE)
+    .setDoubleTitle("gym_leader_double"),
+  [TrainerType.JUAN]: new TrainerConfig(++t)
+    .initForGymLeader(signatureSpecies["JUAN"], true, PokemonType.WATER, false, -1)
+    .setBattleBgm("battle_hoenn_gym")
+    .setMixedBattleBgm("battle_hoenn_gym"),
+  [TrainerType.ROARK]: new TrainerConfig(++t)
+    .initForGymLeader(signatureSpecies["ROARK"], true, PokemonType.ROCK, false, -1)
+    .setBattleBgm("battle_sinnoh_gym")
+    .setMixedBattleBgm("battle_sinnoh_gym"),
+  [TrainerType.GARDENIA]: new TrainerConfig(++t)
+    .initForGymLeader(signatureSpecies["GARDENIA"], false, PokemonType.GRASS, false, -1)
+    .setBattleBgm("battle_sinnoh_gym")
+    .setMixedBattleBgm("battle_sinnoh_gym"),
+  [TrainerType.MAYLENE]: new TrainerConfig(++t)
+    .initForGymLeader(signatureSpecies["MAYLENE"], false, PokemonType.FIGHTING, false, -1)
+    .setBattleBgm("battle_sinnoh_gym")
+    .setMixedBattleBgm("battle_sinnoh_gym"),
+  [TrainerType.CRASHER_WAKE]: new TrainerConfig(++t)
+    .initForGymLeader(signatureSpecies["CRASHER_WAKE"], true, PokemonType.WATER, false, -1)
+    .setBattleBgm("battle_sinnoh_gym")
+    .setMixedBattleBgm("battle_sinnoh_gym"),
+  [TrainerType.FANTINA]: new TrainerConfig(++t)
+    .initForGymLeader(signatureSpecies["FANTINA"], false, PokemonType.GHOST, false, -1)
+    .setBattleBgm("battle_sinnoh_gym")
+    .setMixedBattleBgm("battle_sinnoh_gym"),
+  [TrainerType.BYRON]: new TrainerConfig(++t)
+    .initForGymLeader(signatureSpecies["BYRON"], true, PokemonType.STEEL, false, -1)
+    .setBattleBgm("battle_sinnoh_gym")
+    .setMixedBattleBgm("battle_sinnoh_gym"),
+  [TrainerType.CANDICE]: new TrainerConfig(++t)
+    .initForGymLeader(signatureSpecies["CANDICE"], false, PokemonType.ICE, false, -1)
+    .setBattleBgm("battle_sinnoh_gym")
+    .setMixedBattleBgm("battle_sinnoh_gym"),
+  [TrainerType.VOLKNER]: new TrainerConfig(++t)
+    .initForGymLeader(signatureSpecies["VOLKNER"], true, PokemonType.ELECTRIC, false, -1)
+    .setBattleBgm("battle_sinnoh_gym")
+    .setMixedBattleBgm("battle_sinnoh_gym"),
+  [TrainerType.CILAN]: new TrainerConfig(++t)
+    .initForGymLeader(signatureSpecies["CILAN"], true, PokemonType.GRASS, false, -1)
+    .setMixedBattleBgm("battle_unova_gym"),
+  [TrainerType.CHILI]: new TrainerConfig(++t)
+    .initForGymLeader(signatureSpecies["CHILI"], true, PokemonType.FIRE, false, -1)
+    .setMixedBattleBgm("battle_unova_gym"),
+  [TrainerType.CRESS]: new TrainerConfig(++t)
+    .initForGymLeader(signatureSpecies["CRESS"], true, PokemonType.WATER, false, -1)
+    .setMixedBattleBgm("battle_unova_gym"),
+  [TrainerType.CHEREN]: new TrainerConfig(++t)
+    .initForGymLeader(signatureSpecies["CHEREN"], true, PokemonType.NORMAL, false, -1)
+    .setMixedBattleBgm("battle_unova_gym"),
+  [TrainerType.LENORA]: new TrainerConfig(++t)
+    .initForGymLeader(signatureSpecies["LENORA"], false, PokemonType.NORMAL, false, -1)
+    .setMixedBattleBgm("battle_unova_gym"),
+  [TrainerType.ROXIE]: new TrainerConfig(++t)
+    .initForGymLeader(signatureSpecies["ROXIE"], false, PokemonType.POISON, false, -1)
+    .setMixedBattleBgm("battle_unova_gym"),
+  [TrainerType.BURGH]: new TrainerConfig(++t)
+    .initForGymLeader(signatureSpecies["BURGH"], true, PokemonType.BUG, false, -1)
+    .setMixedBattleBgm("battle_unova_gym"),
+  [TrainerType.ELESA]: new TrainerConfig(++t)
+    .initForGymLeader(signatureSpecies["ELESA"], false, PokemonType.ELECTRIC, false, -1)
+    .setMixedBattleBgm("battle_unova_gym"),
+  [TrainerType.CLAY]: new TrainerConfig(++t)
+    .initForGymLeader(signatureSpecies["CLAY"], true, PokemonType.GROUND, false, -1)
+    .setMixedBattleBgm("battle_unova_gym"),
+  [TrainerType.SKYLA]: new TrainerConfig(++t)
+    .initForGymLeader(signatureSpecies["SKYLA"], false, PokemonType.FLYING, false, -1)
+    .setMixedBattleBgm("battle_unova_gym"),
+  [TrainerType.BRYCEN]: new TrainerConfig(++t)
+    .initForGymLeader(signatureSpecies["BRYCEN"], true, PokemonType.ICE, false, -1)
+    .setMixedBattleBgm("battle_unova_gym"),
+  [TrainerType.DRAYDEN]: new TrainerConfig(++t)
+    .initForGymLeader(signatureSpecies["DRAYDEN"], true, PokemonType.DRAGON, false, -1)
+    .setMixedBattleBgm("battle_unova_gym"),
+  [TrainerType.MARLON]: new TrainerConfig(++t)
+    .initForGymLeader(signatureSpecies["MARLON"], true, PokemonType.WATER, false, -1)
+    .setMixedBattleBgm("battle_unova_gym"),
+  [TrainerType.VIOLA]: new TrainerConfig(++t)
+    .initForGymLeader(signatureSpecies["VIOLA"], false, PokemonType.BUG, false, -1)
+    .setMixedBattleBgm("battle_kalos_gym"),
+  [TrainerType.GRANT]: new TrainerConfig(++t)
+    .initForGymLeader(signatureSpecies["GRANT"], true, PokemonType.ROCK, false, -1)
+    .setMixedBattleBgm("battle_kalos_gym"),
+  [TrainerType.KORRINA]: new TrainerConfig(++t)
+    .initForGymLeader(signatureSpecies["KORRINA"], false, PokemonType.FIGHTING, false, -1)
+    .setMixedBattleBgm("battle_kalos_gym"),
+  [TrainerType.RAMOS]: new TrainerConfig(++t)
+    .initForGymLeader(signatureSpecies["RAMOS"], true, PokemonType.GRASS, false, -1)
+    .setMixedBattleBgm("battle_kalos_gym"),
+  [TrainerType.CLEMONT]: new TrainerConfig(++t)
+    .initForGymLeader(signatureSpecies["CLEMONT"], true, PokemonType.ELECTRIC, false, -1)
+    .setMixedBattleBgm("battle_kalos_gym"),
+  [TrainerType.VALERIE]: new TrainerConfig(++t)
+    .initForGymLeader(signatureSpecies["VALERIE"], false, PokemonType.FAIRY, false, -1)
+    .setMixedBattleBgm("battle_kalos_gym"),
+  [TrainerType.OLYMPIA]: new TrainerConfig(++t)
+    .initForGymLeader(signatureSpecies["OLYMPIA"], false, PokemonType.PSYCHIC, false, -1)
+    .setMixedBattleBgm("battle_kalos_gym"),
+  [TrainerType.WULFRIC]: new TrainerConfig(++t)
+    .initForGymLeader(signatureSpecies["WULFRIC"], true, PokemonType.ICE, false, -1)
+    .setMixedBattleBgm("battle_kalos_gym"),
+  [TrainerType.MILO]: new TrainerConfig(++t)
+    .initForGymLeader(signatureSpecies["MILO"], true, PokemonType.GRASS, false, -1)
+    .setMixedBattleBgm("battle_galar_gym"),
+  [TrainerType.NESSA]: new TrainerConfig(++t)
+    .setName("Nessa")
+    .initForGymLeader(signatureSpecies["NESSA"], false, PokemonType.WATER, false, -1)
+    .setMixedBattleBgm("battle_galar_gym"),
+  [TrainerType.KABU]: new TrainerConfig(++t)
+    .initForGymLeader(signatureSpecies["KABU"], true, PokemonType.FIRE, false, -1)
+    .setMixedBattleBgm("battle_galar_gym"),
+  [TrainerType.BEA]: new TrainerConfig(++t)
+    .setName("Bea")
+    .initForGymLeader(signatureSpecies["BEA"], false, PokemonType.FIGHTING, false, -1)
+    .setMixedBattleBgm("battle_galar_gym"),
+  [TrainerType.ALLISTER]: new TrainerConfig(++t)
+    .setName("Allister")
+    .initForGymLeader(signatureSpecies["ALLISTER"], true, PokemonType.GHOST, false, -1)
+    .setMixedBattleBgm("battle_galar_gym"),
+  [TrainerType.OPAL]: new TrainerConfig(++t)
+    .initForGymLeader(signatureSpecies["OPAL"], false, PokemonType.FAIRY, false, -1)
+    .setMixedBattleBgm("battle_galar_gym"),
+  [TrainerType.BEDE]: new TrainerConfig(++t)
+    .initForGymLeader(signatureSpecies["BEDE"], true, PokemonType.FAIRY, false, -1)
+    .setMixedBattleBgm("battle_galar_gym"),
+  [TrainerType.GORDIE]: new TrainerConfig(++t)
+    .initForGymLeader(signatureSpecies["GORDIE"], true, PokemonType.ROCK, false, -1)
+    .setMixedBattleBgm("battle_galar_gym"),
+  [TrainerType.MELONY]: new TrainerConfig(++t)
+    .initForGymLeader(signatureSpecies["MELONY"], false, PokemonType.ICE, false, -1)
+    .setMixedBattleBgm("battle_galar_gym"),
+  [TrainerType.PIERS]: new TrainerConfig(++t)
+    .initForGymLeader(signatureSpecies["PIERS"], true, PokemonType.DARK, false, -3)
+    .setHasDouble("piers_marnie_double")
+    .setDoubleTrainerType(TrainerType.MARNIE)
+    .setDoubleTitle("gym_leader_double")
+    .setMixedBattleBgm("battle_galar_gym"),
+  [TrainerType.MARNIE]: new TrainerConfig(++t)
+    .setName("Marnie")
+    .initForGymLeader(signatureSpecies["MARNIE"], false, PokemonType.DARK, false, -4)
+    .setHasDouble("marnie_piers_double")
+    .setDoubleTrainerType(TrainerType.PIERS)
+    .setDoubleTitle("gym_leader_double")
+    .setMixedBattleBgm("battle_galar_gym"),
+  [TrainerType.RAIHAN]: new TrainerConfig(++t)
+    .setName("Raihan")
+    .initForGymLeader(signatureSpecies["RAIHAN"], true, PokemonType.DRAGON, false, -1)
+    .setMixedBattleBgm("battle_galar_gym"),
+  [TrainerType.KATY]: new TrainerConfig(++t)
+    .initForGymLeader(signatureSpecies["KATY"], false, PokemonType.BUG, true, -1)
+    .setMixedBattleBgm("battle_paldea_gym"),
+  [TrainerType.BRASSIUS]: new TrainerConfig(++t)
+    .initForGymLeader(signatureSpecies["BRASSIUS"], true, PokemonType.GRASS, true, -1)
+    .setMixedBattleBgm("battle_paldea_gym"),
+  [TrainerType.IONO]: new TrainerConfig(++t)
+    .initForGymLeader(signatureSpecies["IONO"], false, PokemonType.ELECTRIC, true, -1)
+    .setMixedBattleBgm("battle_paldea_gym"),
+  [TrainerType.KOFU]: new TrainerConfig(++t)
+    .initForGymLeader(signatureSpecies["KOFU"], true, PokemonType.WATER, true, -1)
+    .setMixedBattleBgm("battle_paldea_gym"),
+  [TrainerType.LARRY]: new TrainerConfig(++t)
+    .setName("Larry")
+    .initForGymLeader(signatureSpecies["LARRY"], true, PokemonType.NORMAL, true, -1)
+    .setMixedBattleBgm("battle_paldea_gym"),
+  [TrainerType.RYME]: new TrainerConfig(++t)
+    .initForGymLeader(signatureSpecies["RYME"], false, PokemonType.GHOST, true, -1)
+    .setMixedBattleBgm("battle_paldea_gym"),
+  [TrainerType.TULIP]: new TrainerConfig(++t)
+    .initForGymLeader(signatureSpecies["TULIP"], false, PokemonType.PSYCHIC, true, -1)
+    .setMixedBattleBgm("battle_paldea_gym"),
+  [TrainerType.GRUSHA]: new TrainerConfig(++t)
+    .initForGymLeader(signatureSpecies["GRUSHA"], true, PokemonType.ICE, true, -1)
+    .setMixedBattleBgm("battle_paldea_gym"),
+
+  [TrainerType.LORELEI]: new TrainerConfig((t = TrainerType.LORELEI))
+    .initForEliteFour(signatureSpecies["LORELEI"], false, PokemonType.ICE, 2)
+    .setBattleBgm("battle_kanto_gym")
+    .setMixedBattleBgm("battle_kanto_gym")
+    .setPartyMemberFunc(
+      0,
+      getRandomPartyMemberFunc([Species.DEWGONG], TrainerSlot.TRAINER, true, p => {
+        p.abilityIndex = 0; // Thick Fat
+        p.generateAndPopulateMoveset();
+      }),
+    )
+    .setPartyMemberFunc(
+      2,
+      getRandomPartyMemberFunc([Species.SLOWBRO, Species.GALAR_SLOWBRO], TrainerSlot.TRAINER, true, p => {
+        // Tera Ice Slowbro/G-Slowbro
+        p.generateAndPopulateMoveset();
+        if (!p.moveset.some(move => !isNullOrUndefined(move) && move.moveId === Moves.ICE_BEAM)) {
+          // Check if Ice Beam is in the moveset, if not, replace the third move with Ice Beam.
+          p.moveset[2] = new PokemonMove(Moves.ICE_BEAM);
+        }
+      }),
+    )
+    .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.JYNX]))
+    .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.CLOYSTER, Species.ALOLA_SANDSLASH]))
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.LAPRAS], TrainerSlot.TRAINER, true, p => {
+        p.setBoss(true, 2);
+        p.generateAndPopulateMoveset();
+      }),
+    ),
+  [TrainerType.BRUNO]: new TrainerConfig(++t)
+    .initForEliteFour(signatureSpecies["BRUNO"], true, PokemonType.FIGHTING, 2)
+    .setBattleBgm("battle_kanto_gym")
+    .setMixedBattleBgm("battle_kanto_gym")
+    .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.HITMONLEE, Species.HITMONCHAN, Species.HITMONTOP]))
+    .setPartyMemberFunc(
+      2,
+      getRandomPartyMemberFunc([Species.STEELIX], TrainerSlot.TRAINER, true, p => {
+        // Tera Fighting Steelix
+        p.generateAndPopulateMoveset();
+        if (!p.moveset.some(move => !isNullOrUndefined(move) && move.moveId === Moves.BODY_PRESS)) {
+          // Check if Body Press is in the moveset, if not, replace the third move with Body Press.
+          p.moveset[2] = new PokemonMove(Moves.BODY_PRESS);
+        }
+      }),
+    )
+    .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.POLIWRATH]))
+    .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.ANNIHILAPE]))
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.MACHAMP], TrainerSlot.TRAINER, true, p => {
+        p.setBoss(true, 2);
+        p.generateAndPopulateMoveset();
+      }),
+    ),
+  [TrainerType.AGATHA]: new TrainerConfig(++t)
+    .initForEliteFour(signatureSpecies["AGATHA"], false, PokemonType.GHOST, 2)
+    .setBattleBgm("battle_kanto_gym")
+    .setMixedBattleBgm("battle_kanto_gym")
+    .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.MISMAGIUS]))
+    .setPartyMemberFunc(
+      2,
+      getRandomPartyMemberFunc([Species.ARBOK, Species.WEEZING], TrainerSlot.TRAINER, true, p => {
+        // Tera Ghost Arbok/Weezing
+        p.generateAndPopulateMoveset();
+        if (!p.moveset.some(move => !isNullOrUndefined(move) && move.moveId === Moves.TERA_BLAST)) {
+          // Check if Tera Blast is in the moveset, if not, replace the third move with Tera Blast.
+          p.moveset[2] = new PokemonMove(Moves.TERA_BLAST);
+        }
+      }),
+    )
+    .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.ALOLA_MAROWAK]))
+    .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.CURSOLA]))
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.GENGAR], TrainerSlot.TRAINER, true, p => {
+        p.setBoss(true, 2);
+        p.generateAndPopulateMoveset();
+      }),
+    ),
+  [TrainerType.LANCE]: new TrainerConfig(++t)
+    .setName("Lance")
+    .initForEliteFour(signatureSpecies["LANCE"], true, PokemonType.DRAGON, 2)
+    .setBattleBgm("battle_kanto_gym")
+    .setMixedBattleBgm("battle_kanto_gym")
+    .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.KINGDRA]))
+    .setPartyMemberFunc(
+      2,
+      getRandomPartyMemberFunc([Species.GYARADOS, Species.AERODACTYL], TrainerSlot.TRAINER, true, p => {
+        // Tera Dragon Gyarados/Aerodactyl
+        p.generateAndPopulateMoveset();
+        if (!p.moveset.some(move => !isNullOrUndefined(move) && move.moveId === Moves.TERA_BLAST)) {
+          // Check if Tera Blast is in the moveset, if not, replace the third move with Tera Blast.
+          p.moveset[2] = new PokemonMove(Moves.TERA_BLAST);
+        }
+      }),
+    )
+    .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.ALOLA_EXEGGUTOR]))
+    .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.SALAMENCE]))
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.DRAGONITE], TrainerSlot.TRAINER, true, p => {
+        p.setBoss(true, 2);
+        p.generateAndPopulateMoveset();
+      }),
+    ),
+  [TrainerType.WILL]: new TrainerConfig(++t)
+    .initForEliteFour(signatureSpecies["WILL"], true, PokemonType.PSYCHIC, 2)
+    .setBattleBgm("battle_johto_gym")
+    .setMixedBattleBgm("battle_johto_gym")
+    .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.JYNX]))
+    .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.SLOWKING, Species.GALAR_SLOWKING])) // Tera Psychic Slowking/G-Slowking
+    .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.EXEGGUTOR]))
+    .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.WYRDEER, Species.FARIGIRAF]))
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.XATU], TrainerSlot.TRAINER, true, p => {
+        p.setBoss(true, 2);
+        p.generateAndPopulateMoveset();
+      }),
+    ),
+  [TrainerType.KOGA]: new TrainerConfig(++t)
+    .initForEliteFour(signatureSpecies["KOGA"], true, PokemonType.POISON, 2)
+    .setBattleBgm("battle_johto_gym")
+    .setMixedBattleBgm("battle_johto_gym")
+    .setPartyMemberFunc(
+      0,
+      getRandomPartyMemberFunc([Species.VENOMOTH], TrainerSlot.TRAINER, true, p => {
+        p.abilityIndex = 1; // Tinted Lens
+        p.generateAndPopulateMoveset();
+      }),
+    )
+    .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.MUK, Species.WEEZING])) // Tera Poison Muk/Weezing
+    .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.TENTACRUEL]))
+    .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.SNEASLER, Species.OVERQWIL]))
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.CROBAT], TrainerSlot.TRAINER, true, p => {
+        p.setBoss(true, 2);
+        p.generateAndPopulateMoveset();
+      }),
+    ),
+  [TrainerType.KAREN]: new TrainerConfig(++t)
+    .initForEliteFour(signatureSpecies["KAREN"], false, PokemonType.DARK, 2)
+    .setBattleBgm("battle_johto_gym")
+    .setMixedBattleBgm("battle_johto_gym")
+    .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.UMBREON]))
+    .setPartyMemberFunc(
+      2,
+      getRandomPartyMemberFunc([Species.GENGAR], TrainerSlot.TRAINER, true, p => {
+        // Tera Dark Gengar
+        p.generateAndPopulateMoveset();
+        if (!p.moveset.some(move => !isNullOrUndefined(move) && move.moveId === Moves.DARK_PULSE)) {
+          // Check if Dark Pulse is in the moveset, if not, replace the third move with Dark Pulse.
+          p.moveset[2] = new PokemonMove(Moves.DARK_PULSE);
+        }
+      }),
+    )
+    .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.HONCHKROW]))
+    .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.WEAVILE]))
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.HOUNDOOM], TrainerSlot.TRAINER, true, p => {
+        p.setBoss(true, 2);
+        p.generateAndPopulateMoveset();
+      }),
+    ),
+  [TrainerType.SIDNEY]: new TrainerConfig(++t)
+    .initForEliteFour(signatureSpecies["SIDNEY"], true, PokemonType.DARK, 2)
+    .setMixedBattleBgm("battle_hoenn_elite")
+    .setPartyMemberFunc(
+      0,
+      getRandomPartyMemberFunc([Species.MIGHTYENA], TrainerSlot.TRAINER, true, p => {
+        p.abilityIndex = 0; // Intimidate
+        p.generateAndPopulateMoveset();
+      }),
+    )
+    .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.OBSTAGOON])) // Tera Dark Obstagoon
+    .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.SHIFTRY, Species.CACTURNE]))
+    .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.SHARPEDO, Species.CRAWDAUNT]))
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.ABSOL], TrainerSlot.TRAINER, true, p => {
+        p.setBoss(true, 2);
+        p.generateAndPopulateMoveset();
+      }),
+    ),
+  [TrainerType.PHOEBE]: new TrainerConfig(++t)
+    .initForEliteFour(signatureSpecies["PHOEBE"], false, PokemonType.GHOST, 2)
+    .setMixedBattleBgm("battle_hoenn_elite")
+    .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.SABLEYE]))
+    .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.BANETTE])) // Tera Ghost Banette
+    .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.DRIFBLIM, Species.MISMAGIUS]))
+    .setPartyMemberFunc(
+      4,
+      getRandomPartyMemberFunc([Species.ORICORIO, Species.ALOLA_MAROWAK], TrainerSlot.TRAINER, true, p => {
+        p.generateAndPopulateMoveset();
+        p.formIndex = p.species.speciesId === Species.ORICORIO ? 3 : 0; // Oricorio-Sensu
+      }),
+    )
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.DUSKNOIR], TrainerSlot.TRAINER, true, p => {
+        p.setBoss(true, 2);
+        p.generateAndPopulateMoveset();
+      }),
+    ),
+  [TrainerType.GLACIA]: new TrainerConfig(++t)
+    .initForEliteFour(signatureSpecies["GLACIA"], false, PokemonType.ICE, 2)
+    .setMixedBattleBgm("battle_hoenn_elite")
+    .setPartyMemberFunc(
+      0,
+      getRandomPartyMemberFunc([Species.ABOMASNOW], TrainerSlot.TRAINER, true, p => {
+        p.abilityIndex = 0; // Snow Warning
+        p.generateAndPopulateMoveset();
+      }),
+    )
+    .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.GLALIE])) // Tera Ice Glalie
+    .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.FROSLASS]))
+    .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.ALOLA_NINETALES]))
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.WALREIN], TrainerSlot.TRAINER, true, p => {
+        p.setBoss(true, 2);
+        p.generateAndPopulateMoveset();
+      }),
+    ),
+  [TrainerType.DRAKE]: new TrainerConfig(++t)
+    .initForEliteFour(signatureSpecies["DRAKE"], true, PokemonType.DRAGON, 2)
+    .setMixedBattleBgm("battle_hoenn_elite")
+    .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.ALTARIA]))
+    .setPartyMemberFunc(
+      2,
+      getRandomPartyMemberFunc([Species.DHELMISE], TrainerSlot.TRAINER, true, p => {
+        // Tera Dragon Dhelmise
+        p.generateAndPopulateMoveset();
+        if (!p.moveset.some(move => !isNullOrUndefined(move) && move.moveId === Moves.TERA_BLAST)) {
+          // Check if Tera Blast is in the moveset, if not, replace the third move with Tera Blast.
+          p.moveset[2] = new PokemonMove(Moves.TERA_BLAST);
+        }
+      }),
+    )
+    .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.FLYGON]))
+    .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.KINGDRA]))
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.SALAMENCE], TrainerSlot.TRAINER, true, p => {
+        p.setBoss(true, 2);
+        p.generateAndPopulateMoveset();
+      }),
+    ),
+  [TrainerType.AARON]: new TrainerConfig(++t)
+    .initForEliteFour(signatureSpecies["AARON"], true, PokemonType.BUG, 5)
+    .setBattleBgm("battle_sinnoh_gym")
+    .setMixedBattleBgm("battle_sinnoh_gym")
+    .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.YANMEGA]))
+    .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.HERACROSS]))
+    .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.VESPIQUEN]))
+    .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.SCIZOR, Species.KLEAVOR]))
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.DRAPION], TrainerSlot.TRAINER, true, p => {
+        // Tera Bug Drapion
+        p.setBoss(true, 2);
+        p.abilityIndex = 1; // Sniper
+        p.generateAndPopulateMoveset();
+        if (!p.moveset.some(move => !isNullOrUndefined(move) && move.moveId === Moves.X_SCISSOR)) {
+          // Check if X-Scissor is in the moveset, if not, replace the third move with X-Scissor.
+          p.moveset[2] = new PokemonMove(Moves.X_SCISSOR);
+        }
+      }),
+    ),
+  [TrainerType.BERTHA]: new TrainerConfig(++t)
+    .initForEliteFour(signatureSpecies["BERTHA"], false, PokemonType.GROUND, 2)
+    .setBattleBgm("battle_sinnoh_gym")
+    .setMixedBattleBgm("battle_sinnoh_gym")
+    .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.WHISCASH]))
+    .setPartyMemberFunc(
+      2,
+      getRandomPartyMemberFunc([Species.HIPPOWDON], TrainerSlot.TRAINER, true, p => {
+        // Tera Ground Hippowdon
+        p.abilityIndex = 0; // Sand Stream
+        p.generateAndPopulateMoveset();
+      }),
+    )
+    .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.GLISCOR]))
+    .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.MAMOSWINE, Species.URSALUNA]))
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.RHYPERIOR], TrainerSlot.TRAINER, true, p => {
+        p.setBoss(true, 2);
+        p.abilityIndex = 1; // Solid Rock
+        p.generateAndPopulateMoveset();
+      }),
+    ),
+  [TrainerType.FLINT]: new TrainerConfig(++t)
+    .initForEliteFour(signatureSpecies["FLINT"], true, PokemonType.FIRE, 2)
+    .setBattleBgm("battle_sinnoh_gym")
+    .setMixedBattleBgm("battle_sinnoh_gym")
+    .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.RAPIDASH]))
+    .setPartyMemberFunc(
+      2,
+      getRandomPartyMemberFunc([Species.STEELIX, Species.LOPUNNY], TrainerSlot.TRAINER, true, p => {
+        // Tera Fire Steelix/Lopunny
+        p.generateAndPopulateMoveset();
+        if (!p.moveset.some(move => !isNullOrUndefined(move) && move.moveId === Moves.TERA_BLAST)) {
+          // Check if Tera Blast is in the moveset, if not, replace the third move with Tera Blast.
+          p.moveset[2] = new PokemonMove(Moves.TERA_BLAST);
+        }
+      }),
+    )
+    .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.INFERNAPE]))
+    .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.ARCANINE, Species.HISUI_ARCANINE]))
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.MAGMORTAR], TrainerSlot.TRAINER, true, p => {
+        p.setBoss(true, 2);
+        p.generateAndPopulateMoveset();
+      }),
+    ),
+  [TrainerType.LUCIAN]: new TrainerConfig(++t)
+    .initForEliteFour(signatureSpecies["LUCIAN"], true, PokemonType.PSYCHIC, 2)
+    .setBattleBgm("battle_sinnoh_gym")
+    .setMixedBattleBgm("battle_sinnoh_gym")
+    .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.ESPEON, Species.ALAKAZAM]))
+    .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.FARIGIRAF])) // Tera Psychic Farigiraf
+    .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.BRONZONG]))
+    .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.MR_RIME, Species.HISUI_BRAVIARY]))
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.GALLADE], TrainerSlot.TRAINER, true, p => {
+        p.setBoss(true, 2);
+        p.abilityIndex = 1; // Sharpness
+        p.generateAndPopulateMoveset();
+      }),
+    ),
+  [TrainerType.SHAUNTAL]: new TrainerConfig(++t)
+    .initForEliteFour(signatureSpecies["SHAUNTAL"], false, PokemonType.GHOST, 2)
+    .setMixedBattleBgm("battle_unova_elite")
+    .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.COFAGRIGUS]))
+    .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.GOLURK])) // Tera Ghost Golurk
+    .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.JELLICENT]))
+    .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.MISMAGIUS, Species.FROSLASS]))
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.CHANDELURE], TrainerSlot.TRAINER, true, p => {
+        p.setBoss(true, 2);
+        p.generateAndPopulateMoveset();
+      }),
+    ),
+  [TrainerType.MARSHAL]: new TrainerConfig(++t)
+    .initForEliteFour(signatureSpecies["MARSHAL"], true, PokemonType.FIGHTING, 2)
+    .setMixedBattleBgm("battle_unova_elite")
+    .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.THROH, Species.SAWK]))
+    .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.MIENSHAO])) // Tera Fighting Mienshao
+    .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.EMBOAR]))
+    .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.BRELOOM, Species.TOXICROAK]))
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.CONKELDURR], TrainerSlot.TRAINER, true, p => {
+        p.setBoss(true, 2);
+        p.generateAndPopulateMoveset();
+      }),
+    ),
+  [TrainerType.GRIMSLEY]: new TrainerConfig(++t)
+    .initForEliteFour(signatureSpecies["GRIMSLEY"], true, PokemonType.DARK, 2)
+    .setMixedBattleBgm("battle_unova_elite")
+    .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.LIEPARD]))
+    .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.KROOKODILE])) // Tera Dark Krookodile
+    .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.SCRAFTY]))
+    .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.ZOROARK, Species.HISUI_SAMUROTT]))
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.KINGAMBIT], TrainerSlot.TRAINER, true, p => {
+        p.setBoss(true, 2);
+        p.generateAndPopulateMoveset();
+      }),
+    ),
+  [TrainerType.CAITLIN]: new TrainerConfig(++t)
+    .initForEliteFour(signatureSpecies["CAITLIN"], false, PokemonType.PSYCHIC, 2)
+    .setMixedBattleBgm("battle_unova_elite")
+    .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.MUSHARNA]))
+    .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.REUNICLUS])) // Tera Psychic Reuniclus
+    .setPartyMemberFunc(
+      3,
+      getRandomPartyMemberFunc([Species.GALLADE], TrainerSlot.TRAINER, true, p => {
+        p.abilityIndex = 1; // Sharpness
+        p.generateAndPopulateMoveset();
+      }),
+    )
+    .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.SIGILYPH, Species.HISUI_BRAVIARY]))
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.GOTHITELLE], TrainerSlot.TRAINER, true, p => {
+        p.setBoss(true, 2);
+        p.generateAndPopulateMoveset();
+      }),
+    ),
+  [TrainerType.MALVA]: new TrainerConfig(++t)
+    .initForEliteFour(signatureSpecies["MALVA"], false, PokemonType.FIRE, 2)
+    .setMixedBattleBgm("battle_kalos_elite")
+    .setPartyMemberFunc(
+      0,
+      getRandomPartyMemberFunc([Species.PYROAR], TrainerSlot.TRAINER, true, p => {
+        p.generateAndPopulateMoveset();
+        p.gender = Gender.FEMALE;
+      }),
+    )
+    .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.HOUNDOOM])) // Tera Fire Houndoom
+    .setPartyMemberFunc(
+      3,
+      getRandomPartyMemberFunc([Species.TORKOAL], TrainerSlot.TRAINER, true, p => {
+        p.abilityIndex = 1; // Drought
+        p.generateAndPopulateMoveset();
+      }),
+    )
+    .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.CHANDELURE, Species.DELPHOX]))
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.TALONFLAME], TrainerSlot.TRAINER, true, p => {
+        p.setBoss(true, 2);
+        p.generateAndPopulateMoveset();
+      }),
+    ),
+  [TrainerType.SIEBOLD]: new TrainerConfig(++t)
+    .initForEliteFour(signatureSpecies["SIEBOLD"], true, PokemonType.WATER, 2)
+    .setMixedBattleBgm("battle_kalos_elite")
+    .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.CLAWITZER]))
+    .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.GYARADOS])) // Tera Water Gyarados
+    .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.STARMIE]))
+    .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.BLASTOISE, Species.DONDOZO]))
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.BARBARACLE], TrainerSlot.TRAINER, true, p => {
+        p.setBoss(true, 2);
+        p.abilityIndex = 1; // Tough Claws
+        p.generateAndPopulateMoveset();
+      }),
+    ),
+  [TrainerType.WIKSTROM]: new TrainerConfig(++t)
+    .initForEliteFour(signatureSpecies["WIKSTROM"], true, PokemonType.STEEL, 2)
+    .setMixedBattleBgm("battle_kalos_elite")
+    .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.KLEFKI]))
+    .setPartyMemberFunc(
+      2,
+      getRandomPartyMemberFunc([Species.CERULEDGE], TrainerSlot.TRAINER, true, p => {
+        // Tera Steel Ceruledge
+        p.generateAndPopulateMoveset();
+        if (!p.moveset.some(move => !isNullOrUndefined(move) && move.moveId === Moves.IRON_HEAD)) {
+          // Check if Iron Head is in the moveset, if not, replace the third move with Iron Head.
+          p.moveset[2] = new PokemonMove(Moves.IRON_HEAD);
+        }
+      }),
+    )
+    .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.SCIZOR]))
+    .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.CORVIKNIGHT]))
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.AEGISLASH], TrainerSlot.TRAINER, true, p => {
+        p.setBoss(true, 2);
+        p.generateAndPopulateMoveset();
+      }),
+    ),
+  [TrainerType.DRASNA]: new TrainerConfig(++t)
+    .initForEliteFour(signatureSpecies["DRASNA"], false, PokemonType.DRAGON, 2)
+    .setMixedBattleBgm("battle_kalos_elite")
+    .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.DRAGALGE]))
+    .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.GARCHOMP])) // Tera Dragon Garchomp
+    .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.ALTARIA]))
+    .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.DRUDDIGON]))
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.NOIVERN], TrainerSlot.TRAINER, true, p => {
+        p.setBoss(true, 2);
+        p.generateAndPopulateMoveset();
+      }),
+    ),
+  [TrainerType.HALA]: new TrainerConfig(++t)
+    .initForEliteFour(signatureSpecies["HALA"], true, PokemonType.FIGHTING, 2)
+    .setMixedBattleBgm("battle_alola_elite")
+    .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.HARIYAMA]))
+    .setPartyMemberFunc(
+      2,
+      getRandomPartyMemberFunc([Species.INCINEROAR], TrainerSlot.TRAINER, true, p => {
+        // Tera Fighting Incineroar
+        p.generateAndPopulateMoveset();
+        if (!p.moveset.some(move => !isNullOrUndefined(move) && move.moveId === Moves.CROSS_CHOP)) {
+          // Check if Cross Chop is in the moveset, if not, replace the third move with Cross Chop.
+          p.moveset[2] = new PokemonMove(Moves.CROSS_CHOP);
+        }
+      }),
+    )
+    .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.BEWEAR]))
+    .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.POLIWRATH, Species.ANNIHILAPE]))
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.CRABOMINABLE], TrainerSlot.TRAINER, true, p => {
+        p.setBoss(true, 2);
+        p.generateAndPopulateMoveset();
+      }),
+    ),
+  [TrainerType.MOLAYNE]: new TrainerConfig(++t)
+    .initForEliteFour(signatureSpecies["MOLAYNE"], true, PokemonType.STEEL, 2)
+    .setMixedBattleBgm("battle_alola_elite")
+    .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.KLEFKI]))
+    .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.ALOLA_SANDSLASH])) // Tera Steel A-Sandslash
+    .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.MAGNEZONE]))
+    .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.METAGROSS, Species.KINGAMBIT]))
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.ALOLA_DUGTRIO], TrainerSlot.TRAINER, true, p => {
+        p.setBoss(true, 2);
+        p.generateAndPopulateMoveset();
+      }),
+    ),
+  [TrainerType.OLIVIA]: new TrainerConfig(++t)
+    .initForEliteFour(signatureSpecies["OLIVIA"], false, PokemonType.ROCK, 2)
+    .setMixedBattleBgm("battle_alola_elite")
+    .setPartyMemberFunc(
+      0,
+      getRandomPartyMemberFunc([Species.GIGALITH], TrainerSlot.TRAINER, true, p => {
+        p.abilityIndex = 1; // Sand Stream
+        p.generateAndPopulateMoveset();
+      }),
+    )
+    .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.PROBOPASS])) // Tera Rock Probopass
+    .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.ALOLA_GOLEM]))
+    .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.RELICANTH, Species.CARBINK]))
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.LYCANROC], TrainerSlot.TRAINER, true, p => {
+        p.setBoss(true, 2);
+        p.formIndex = 1;
+        p.generateAndPopulateMoveset();
+      }),
+    ),
+  [TrainerType.ACEROLA]: new TrainerConfig(++t)
+    .initForEliteFour(signatureSpecies["ACEROLA"], false, PokemonType.GHOST, 2)
+    .setMixedBattleBgm("battle_alola_elite")
+    .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.DRIFBLIM]))
+    .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.MIMIKYU])) // Tera Ghost Mimikyu
+    .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.DHELMISE]))
+    .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.FROSLASS]))
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.PALOSSAND], TrainerSlot.TRAINER, true, p => {
+        p.setBoss(true, 2);
+        p.generateAndPopulateMoveset();
+      }),
+    ),
+  [TrainerType.KAHILI]: new TrainerConfig(++t)
+    .initForEliteFour(signatureSpecies["KAHILI"], false, PokemonType.FLYING, 2)
+    .setMixedBattleBgm("battle_alola_elite")
+    .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.HAWLUCHA]))
+    .setPartyMemberFunc(
+      2,
+      getRandomPartyMemberFunc([Species.DECIDUEYE], TrainerSlot.TRAINER, true, p => {
+        // Tera Flying Decidueye
+        p.generateAndPopulateMoveset();
+        if (!p.moveset.some(move => !isNullOrUndefined(move) && move.moveId === Moves.BRAVE_BIRD)) {
+          // Check if Brave Bird is in the moveset, if not, replace the third move with Brave Bird.
+          p.moveset[2] = new PokemonMove(Moves.BRAVE_BIRD);
+        }
+      }),
+    )
+    .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.BRAVIARY, Species.MANDIBUZZ]))
+    .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.ORICORIO]))
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.TOUCANNON], TrainerSlot.TRAINER, true, p => {
+        p.setBoss(true, 2);
+        p.generateAndPopulateMoveset();
+      }),
+    ),
+  [TrainerType.MARNIE_ELITE]: new TrainerConfig(++t)
+    .setName("Marnie")
+    .initForEliteFour(signatureSpecies["MARNIE_ELITE"], false, PokemonType.DARK, 2)
+    .setMixedBattleBgm("battle_galar_elite")
+    .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.LIEPARD]))
+    .setPartyMemberFunc(
+      2,
+      getRandomPartyMemberFunc([Species.TOXICROAK], TrainerSlot.TRAINER, true, p => {
+        // Tera Dark Toxicroak
+        p.generateAndPopulateMoveset();
+        if (!p.moveset.some(move => !isNullOrUndefined(move) && move.moveId === Moves.SUCKER_PUNCH)) {
+          // Check if Sucker Punch is in the moveset, if not, replace the third move with Sucker Punch.
+          p.moveset[2] = new PokemonMove(Moves.SUCKER_PUNCH);
+        }
+      }),
+    )
+    .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.SCRAFTY, Species.PANGORO]))
+    .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.MORPEKO]))
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.GRIMMSNARL], TrainerSlot.TRAINER, true, p => {
+        p.setBoss(true, 2);
+        p.generateAndPopulateMoveset();
+      }),
+    ),
+  [TrainerType.NESSA_ELITE]: new TrainerConfig(++t)
+    .setName("Nessa")
+    .initForEliteFour(signatureSpecies["NESSA_ELITE"], false, PokemonType.WATER, 2)
+    .setMixedBattleBgm("battle_galar_elite")
+    .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.GOLISOPOD]))
+    .setPartyMemberFunc(
+      2,
+      getRandomPartyMemberFunc([Species.EISCUE], TrainerSlot.TRAINER, true, p => {
+        // Tera Water Eiscue
+        p.generateAndPopulateMoveset();
+        if (!p.moveset.some(move => !isNullOrUndefined(move) && move.moveId === Moves.LIQUIDATION)) {
+          // Check if Liquidation is in the moveset, if not, replace the third move with Liquidation.
+          p.moveset[2] = new PokemonMove(Moves.LIQUIDATION);
+        }
+      }),
+    )
+    .setPartyMemberFunc(
+      3,
+      getRandomPartyMemberFunc([Species.PELIPPER], TrainerSlot.TRAINER, true, p => {
+        p.abilityIndex = 1; // Drizzle
+        p.generateAndPopulateMoveset();
+      }),
+    )
+    .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.TOXAPEX]))
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.DREDNAW], TrainerSlot.TRAINER, true, p => {
+        p.setBoss(true, 2);
+        p.generateAndPopulateMoveset();
+      }),
+    ),
+  [TrainerType.BEA_ELITE]: new TrainerConfig(++t)
+    .setName("Bea")
+    .initForEliteFour(signatureSpecies["BEA_ELITE"], false, PokemonType.FIGHTING, 2)
+    .setMixedBattleBgm("battle_galar_elite")
+    .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.HAWLUCHA]))
+    .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.SIRFETCHD])) // Tera Fighting Sirfetch'd
+    .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.GRAPPLOCT, Species.FALINKS]))
+    .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.HITMONTOP]))
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.MACHAMP], TrainerSlot.TRAINER, true, p => {
+        p.setBoss(true, 2);
+        p.generateAndPopulateMoveset();
+      }),
+    ),
+  [TrainerType.ALLISTER_ELITE]: new TrainerConfig(++t)
+    .setName("Allister")
+    .initForEliteFour(signatureSpecies["ALLISTER_ELITE"], true, PokemonType.GHOST, 2)
+    .setMixedBattleBgm("battle_galar_elite")
+    .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.DUSKNOIR]))
+    .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.RUNERIGUS])) // Tera Ghost Runerigus
+    .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.POLTEAGEIST, Species.SINISTCHA]))
+    .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.CURSOLA]))
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.GENGAR], TrainerSlot.TRAINER, true, p => {
+        p.setBoss(true, 2);
+        p.generateAndPopulateMoveset();
+      }),
+    ),
+  [TrainerType.RAIHAN_ELITE]: new TrainerConfig(++t)
+    .setName("Raihan")
+    .initForEliteFour(signatureSpecies["RAIHAN_ELITE"], true, PokemonType.DRAGON, 2)
+    .setMixedBattleBgm("battle_galar_elite")
+    .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.FLYGON]))
+    .setPartyMemberFunc(
+      2,
+      getRandomPartyMemberFunc([Species.TORKOAL], TrainerSlot.TRAINER, true, p => {
+        // Tera Dragon Torkoal
+        p.abilityIndex = 1; // Drought
+        p.generateAndPopulateMoveset();
+        if (!p.moveset.some(move => !isNullOrUndefined(move) && move.moveId === Moves.TERA_BLAST)) {
+          // Check if Tera Blast is in the moveset, if not, replace the third move with Tera Blast.
+          p.moveset[2] = new PokemonMove(Moves.TERA_BLAST);
+        }
+      }),
+    )
+    .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.GOODRA]))
+    .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.TURTONATOR]))
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.ARCHALUDON], TrainerSlot.TRAINER, true, p => {
+        p.setBoss(true, 2);
+        p.generateAndPopulateMoveset();
+      }),
+    ),
+  [TrainerType.RIKA]: new TrainerConfig(++t)
+    .initForEliteFour(signatureSpecies["RIKA"], false, PokemonType.GROUND, 5)
+    .setMixedBattleBgm("battle_paldea_elite")
+    .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.DUGTRIO]))
+    .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.DONPHAN]))
+    .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.SWAMPERT, Species.TORTERRA]))
+    .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.CAMERUPT]))
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.CLODSIRE], TrainerSlot.TRAINER, true, p => {
+        // Tera Ground Clodsire
+        p.setBoss(true, 2);
+        p.generateAndPopulateMoveset();
+      }),
+    ),
+  [TrainerType.POPPY]: new TrainerConfig(++t)
+    .initForEliteFour(signatureSpecies["POPPY"], false, PokemonType.STEEL, 5)
+    .setMixedBattleBgm("battle_paldea_elite")
+    .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.COPPERAJAH]))
+    .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.MAGNEZONE]))
+    .setPartyMemberFunc(
+      3,
+      getRandomPartyMemberFunc([Species.BRONZONG, Species.CORVIKNIGHT], TrainerSlot.TRAINER, true, p => {
+        p.abilityIndex = p.species.speciesId === Species.BRONZONG ? 0 : 1; // Levitate Bronzong, Unnerve Corviknight
+        p.generateAndPopulateMoveset();
+      }),
+    )
+    .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.STEELIX]))
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.TINKATON], TrainerSlot.TRAINER, true, p => {
+        // Tera Steel Tinkaton
+        p.setBoss(true, 2);
+        p.generateAndPopulateMoveset();
+      }),
+    ),
+  [TrainerType.LARRY_ELITE]: new TrainerConfig(++t)
+    .setName("Larry")
+    .initForEliteFour(signatureSpecies["LARRY_ELITE"], true, PokemonType.FLYING, 5)
+    .setMixedBattleBgm("battle_paldea_elite")
+    .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.ALTARIA]))
+    .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.BOMBIRDIER]))
+    .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.TROPIUS]))
+    .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.STARAPTOR]))
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.FLAMIGO], TrainerSlot.TRAINER, true, p => {
+        // Tera Flying Flamigo
+        p.setBoss(true, 2);
+        p.generateAndPopulateMoveset();
+      }),
+    ),
+  [TrainerType.HASSEL]: new TrainerConfig(++t)
+    .initForEliteFour(signatureSpecies["HASSEL"], true, PokemonType.DRAGON, 5)
+    .setMixedBattleBgm("battle_paldea_elite")
+    .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.NOIVERN]))
+    .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.DRAGALGE]))
+    .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.FLAPPLE, Species.APPLETUN, Species.HYDRAPPLE]))
+    .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.HAXORUS]))
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.BAXCALIBUR], TrainerSlot.TRAINER, true, p => {
+        // Tera Dragon Baxcalibur
+        p.setBoss(true, 2);
+        p.generateAndPopulateMoveset();
+      }),
+    ),
+  [TrainerType.CRISPIN]: new TrainerConfig(++t)
+    .initForEliteFour(signatureSpecies["CRISPIN"], true, PokemonType.FIRE, 2)
+    .setMixedBattleBgm("battle_bb_elite")
+    .setPartyMemberFunc(
+      0,
+      getRandomPartyMemberFunc([Species.ROTOM], TrainerSlot.TRAINER, true, p => {
+        p.formIndex = 1; // Heat Rotom
+        p.generateAndPopulateMoveset();
+      }),
+    )
+    .setPartyMemberFunc(
+      2,
+      getRandomPartyMemberFunc([Species.EXEGGUTOR], TrainerSlot.TRAINER, true, p => {
+        // Tera Fire Exeggutor
+        p.generateAndPopulateMoveset();
+        if (!p.moveset.some(move => !isNullOrUndefined(move) && move.moveId === Moves.TERA_BLAST)) {
+          // Check if Tera Blast is in the moveset, if not, replace the third move with Tera Blast.
+          p.moveset[2] = new PokemonMove(Moves.TERA_BLAST);
+        }
+      }),
+    )
+    .setPartyMemberFunc(
+      3,
+      getRandomPartyMemberFunc([Species.TALONFLAME], TrainerSlot.TRAINER, true, p => {
+        p.generateAndPopulateMoveset();
+        if (!p.moveset.some(move => !isNullOrUndefined(move) && move.moveId === Moves.SUNNY_DAY)) {
+          // Check if Sunny Day is in the moveset, if not, replace the third move with Sunny Day.
+          p.moveset[2] = new PokemonMove(Moves.SUNNY_DAY);
+        }
+      }),
+    )
+    .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.MAGMORTAR]))
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.BLAZIKEN], TrainerSlot.TRAINER, true, p => {
+        p.setBoss(true, 2);
+        p.generateAndPopulateMoveset();
+      }),
+    ),
+  [TrainerType.AMARYS]: new TrainerConfig(++t)
+    .initForEliteFour(signatureSpecies["AMARYS"], false, PokemonType.STEEL, 2)
+    .setMixedBattleBgm("battle_bb_elite")
+    .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.SKARMORY]))
+    .setPartyMemberFunc(
+      2,
+      getRandomPartyMemberFunc([Species.REUNICLUS], TrainerSlot.TRAINER, true, p => {
+        // Tera Steel Reuniclus
+        p.generateAndPopulateMoveset();
+        if (!p.moveset.some(move => !isNullOrUndefined(move) && move.moveId === Moves.FLASH_CANNON)) {
+          // Check if Flash Cannon is in the moveset, if not, replace the third move with Flash Cannon.
+          p.moveset[2] = new PokemonMove(Moves.FLASH_CANNON);
+        }
+      }),
+    )
+    .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.EMPOLEON]))
+    .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.SCIZOR]))
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.METAGROSS], TrainerSlot.TRAINER, true, p => {
+        p.setBoss(true, 2);
+        p.generateAndPopulateMoveset();
+      }),
+    ),
+  [TrainerType.LACEY]: new TrainerConfig(++t)
+    .initForEliteFour(signatureSpecies["LACEY"], false, PokemonType.FAIRY, 5)
+    .setMixedBattleBgm("battle_bb_elite")
+    .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.WHIMSICOTT]))
+    .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.PRIMARINA]))
+    .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.GRANBULL]))
+    .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.ALCREMIE]))
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.EXCADRILL], TrainerSlot.TRAINER, true, p => {
+        // Tera Fairy Excadrill
+        p.setBoss(true, 2);
+        p.generateAndPopulateMoveset();
+        if (!p.moveset.some(move => !isNullOrUndefined(move) && move.moveId === Moves.TERA_BLAST)) {
+          // Check if Tera Blast is in the moveset, if not, replace the third move with Tera Blast.
+          p.moveset[2] = new PokemonMove(Moves.TERA_BLAST);
+        }
+      }),
+    ),
+  [TrainerType.DRAYTON]: new TrainerConfig(++t)
+    .initForEliteFour(signatureSpecies["DRAYTON"], true, PokemonType.DRAGON, 2)
+    .setMixedBattleBgm("battle_bb_elite")
+    .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.DRAGONITE]))
+    .setPartyMemberFunc(
+      2,
+      getRandomPartyMemberFunc([Species.SCEPTILE], TrainerSlot.TRAINER, true, p => {
+        // Tera Dragon Sceptile
+        p.generateAndPopulateMoveset();
+        if (!p.moveset.some(move => !isNullOrUndefined(move) && move.moveId === Moves.DUAL_CHOP)) {
+          // Check if Dual Chop is in the moveset, if not, replace the third move with Dual Chop.
+          p.moveset[2] = new PokemonMove(Moves.DUAL_CHOP);
+        }
+      }),
+    )
+    .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.HAXORUS]))
+    .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.KINGDRA, Species.DRACOVISH]))
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.ARCHALUDON], TrainerSlot.TRAINER, true, p => {
+        p.setBoss(true, 2);
+        p.generateAndPopulateMoveset();
+      }),
+    ),
+
+  [TrainerType.BLUE]: new TrainerConfig((t = TrainerType.BLUE))
+    .initForChampion(true)
+    .setBattleBgm("battle_kanto_champion")
+    .setMixedBattleBgm("battle_kanto_champion")
+    .setHasDouble("blue_red_double")
+    .setDoubleTrainerType(TrainerType.RED)
+    .setDoubleTitle("champion_double")
+    .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.ALAKAZAM]))
+    .setPartyMemberFunc(1, getRandomPartyMemberFunc([Species.MACHAMP]))
+    .setPartyMemberFunc(
+      2,
+      getRandomPartyMemberFunc([Species.HO_OH], TrainerSlot.TRAINER, true, p => {
+        p.generateAndPopulateMoveset();
+        p.pokeball = PokeballType.MASTER_BALL;
+      }),
+    )
+    .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.RHYPERIOR, Species.ELECTIVIRE]))
+    .setPartyMemberFunc(
+      4,
+      getRandomPartyMemberFunc(
+        [Species.ARCANINE, Species.EXEGGUTOR, Species.GYARADOS],
+        TrainerSlot.TRAINER,
+        true,
+        p => {
+          p.generateAndPopulateMoveset();
+          p.setBoss(true, 2);
+        },
+      ),
+    )
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.PIDGEOT], TrainerSlot.TRAINER, true, p => {
+        p.formIndex = 1; // Mega Pidgeot
+        p.generateAndPopulateMoveset();
+        p.generateName();
+        p.gender = Gender.MALE;
+      }),
+    )
+    .setInstantTera(3), // Tera Ground or Rock Rhyperior / Electric Electivire / Fire Magmortar
+  [TrainerType.RED]: new TrainerConfig(++t)
+    .initForChampion(true)
+    .setBattleBgm("battle_johto_champion")
+    .setMixedBattleBgm("battle_johto_champion")
+    .setHasDouble("red_blue_double")
+    .setDoubleTrainerType(TrainerType.BLUE)
+    .setDoubleTitle("champion_double")
+    .setPartyMemberFunc(
+      0,
+      getRandomPartyMemberFunc([Species.PIKACHU], TrainerSlot.TRAINER, true, p => {
+        p.formIndex = 8; // G-Max Pikachu
+        p.generateAndPopulateMoveset();
+        p.generateName();
+        p.gender = Gender.MALE;
+      }),
+    )
+    .setPartyMemberFunc(1, getRandomPartyMemberFunc([Species.ESPEON, Species.UMBREON, Species.SYLVEON]))
+    .setPartyMemberFunc(
+      2,
+      getRandomPartyMemberFunc([Species.LUGIA], TrainerSlot.TRAINER, true, p => {
+        p.generateAndPopulateMoveset();
+        p.pokeball = PokeballType.MASTER_BALL;
+      }),
+    )
+    .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.MEGANIUM, Species.TYPHLOSION, Species.FERALIGATR]))
+    .setPartyMemberFunc(
+      4,
+      getRandomPartyMemberFunc([Species.SNORLAX], TrainerSlot.TRAINER, true, p => {
+        p.generateAndPopulateMoveset();
+        p.setBoss(true, 2);
+      }),
+    )
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc(
+        [Species.VENUSAUR, Species.CHARIZARD, Species.BLASTOISE],
+        TrainerSlot.TRAINER,
+        true,
+        p => {
+          p.formIndex = 1; // Mega Venusaur, Mega Charizard X, or Mega Blastoise
+          p.generateAndPopulateMoveset();
+          p.generateName();
+          p.gender = Gender.MALE;
+        },
+      ),
+    )
+    .setInstantTera(3), // Tera Grass Meganium / Fire Typhlosion / Water Feraligatr
+  [TrainerType.LANCE_CHAMPION]: new TrainerConfig(++t)
+    .setName("Lance")
+    .initForChampion(true)
+    .setBattleBgm("battle_johto_champion")
+    .setMixedBattleBgm("battle_johto_champion")
+    .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.GYARADOS, Species.KINGDRA]))
+    .setPartyMemberFunc(1, getRandomPartyMemberFunc([Species.AERODACTYL]))
+    .setPartyMemberFunc(
+      2,
+      getRandomPartyMemberFunc([Species.SALAMENCE], TrainerSlot.TRAINER, true, p => {
+        p.formIndex = 1; // Mega Salamence
+        p.generateAndPopulateMoveset();
+        p.generateName();
+      }),
+    )
+    .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.CHARIZARD]))
+    .setPartyMemberFunc(
+      4,
+      getRandomPartyMemberFunc([Species.TYRANITAR, Species.GARCHOMP, Species.KOMMO_O], TrainerSlot.TRAINER, true, p => {
+        p.teraType = PokemonType.DRAGON;
+        p.generateAndPopulateMoveset();
+        p.abilityIndex = p.species.speciesId === Species.KOMMO_O ? 1 : 2; // Soundproof Kommo-o, Unnerve Tyranitar, Rough Skin Garchomp
+      }),
+    )
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.DRAGONITE], TrainerSlot.TRAINER, true, p => {
+        p.generateAndPopulateMoveset();
+        p.gender = Gender.MALE;
+        p.setBoss(true, 2);
+      }),
+    )
+    .setInstantTera(4), // Tera Dragon Tyranitar / Garchomp / Kommo-o
+  [TrainerType.STEVEN]: new TrainerConfig(++t)
+    .initForChampion(true)
+    .setBattleBgm("battle_hoenn_champion_g5")
+    .setMixedBattleBgm("battle_hoenn_champion_g6")
+    .setHasDouble("steven_wallace_double")
+    .setDoubleTrainerType(TrainerType.WALLACE)
+    .setDoubleTitle("champion_double")
+    .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.SKARMORY]))
+    .setPartyMemberFunc(1, getRandomPartyMemberFunc([Species.CRADILY, Species.ARMALDO]))
+    .setPartyMemberFunc(
+      2,
+      getRandomPartyMemberFunc([Species.AGGRON], TrainerSlot.TRAINER, true, p => {
+        p.generateAndPopulateMoveset();
+        p.setBoss(true, 2);
+      }),
+    )
+    .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.GOLURK, Species.RUNERIGUS]))
+    .setPartyMemberFunc(
+      4,
+      getRandomPartyMemberFunc([Species.REGIROCK, Species.REGICE, Species.REGISTEEL], TrainerSlot.TRAINER, true, p => {
+        p.generateAndPopulateMoveset();
+        p.pokeball = PokeballType.ULTRA_BALL;
+      }),
+    )
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.METAGROSS], TrainerSlot.TRAINER, true, p => {
+        p.formIndex = 1; // Mega Metagross
+        p.generateAndPopulateMoveset();
+        p.generateName();
+      }),
+    )
+    .setInstantTera(4), // Tera Rock Regirock / Ice Regice / Steel Registeel
+  [TrainerType.WALLACE]: new TrainerConfig(++t)
+    .initForChampion(true)
+    .setBattleBgm("battle_hoenn_champion_g5")
+    .setMixedBattleBgm("battle_hoenn_champion_g6")
+    .setHasDouble("wallace_steven_double")
+    .setDoubleTrainerType(TrainerType.STEVEN)
+    .setDoubleTitle("champion_double")
+    .setPartyMemberFunc(
+      0,
+      getRandomPartyMemberFunc([Species.PELIPPER], TrainerSlot.TRAINER, true, p => {
+        p.abilityIndex = 1; // Drizzle
+        p.generateAndPopulateMoveset();
+      }),
+    )
+    .setPartyMemberFunc(1, getRandomPartyMemberFunc([Species.LUDICOLO]))
+    .setPartyMemberFunc(
+      2,
+      getRandomPartyMemberFunc([Species.LATIAS, Species.LATIOS], TrainerSlot.TRAINER, true, p => {
+        p.formIndex = 1; // Mega Latios or Mega Latias
+        p.generateAndPopulateMoveset();
+        p.generateName();
+        p.pokeball = PokeballType.MASTER_BALL;
+      }),
+    )
+    .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.SWAMPERT, Species.GASTRODON, Species.SEISMITOAD]))
+    .setPartyMemberFunc(
+      4,
+      getRandomPartyMemberFunc([Species.REGIELEKI, Species.REGIDRAGO], TrainerSlot.TRAINER, true, p => {
+        p.generateAndPopulateMoveset();
+        p.pokeball = PokeballType.ULTRA_BALL;
+      }),
+    )
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.MILOTIC], TrainerSlot.TRAINER, true, p => {
+        p.generateAndPopulateMoveset();
+        p.gender = Gender.FEMALE;
+        p.setBoss(true, 2);
+      }),
+    )
+    .setInstantTera(4), // Tera Electric Regieleki / Dragon Regidrago
+  [TrainerType.CYNTHIA]: new TrainerConfig(++t)
+    .initForChampion(false)
+    .setBattleBgm("battle_sinnoh_champion")
+    .setMixedBattleBgm("battle_sinnoh_champion")
+    .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.SPIRITOMB]))
+    .setPartyMemberFunc(1, getRandomPartyMemberFunc([Species.LUCARIO]))
+    .setPartyMemberFunc(
+      2,
+      getRandomPartyMemberFunc([Species.GIRATINA], TrainerSlot.TRAINER, true, p => {
+        p.generateAndPopulateMoveset();
+        p.pokeball = PokeballType.MASTER_BALL;
+      }),
+    )
+    .setPartyMemberFunc(
+      3,
+      getRandomPartyMemberFunc(
+        [Species.MILOTIC, Species.ROSERADE, Species.HISUI_ARCANINE],
+        TrainerSlot.TRAINER,
+        true,
+        p => {
+          p.generateAndPopulateMoveset();
+          p.teraType = p.species.type1;
+        },
+      ),
+    )
+    .setPartyMemberFunc(
+      4,
+      getRandomPartyMemberFunc([Species.TOGEKISS], TrainerSlot.TRAINER, true, p => {
+        p.generateAndPopulateMoveset();
+        p.setBoss(true, 2);
+      }),
+    )
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.GARCHOMP], TrainerSlot.TRAINER, true, p => {
+        p.formIndex = 1; // Mega Garchomp
+        p.generateAndPopulateMoveset();
+        p.generateName();
+        p.gender = Gender.FEMALE;
+      }),
+    )
+    .setInstantTera(3), // Tera Water Milotic / Grass Roserade / Fire Hisuian Arcanine
+  [TrainerType.ALDER]: new TrainerConfig(++t)
+    .initForChampion(true)
+    .setHasDouble("alder_iris_double")
+    .setDoubleTrainerType(TrainerType.IRIS)
+    .setDoubleTitle("champion_double")
+    .setBattleBgm("battle_champion_alder")
+    .setMixedBattleBgm("battle_champion_alder")
+    .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.BOUFFALANT, Species.BRAVIARY]))
+    .setPartyMemberFunc(
+      1,
+      getRandomPartyMemberFunc(
+        [Species.HISUI_LILLIGANT, Species.HISUI_ZOROARK, Species.BASCULEGION],
+        TrainerSlot.TRAINER,
+        true,
+        p => {
+          p.generateAndPopulateMoveset();
+          p.pokeball = PokeballType.ROGUE_BALL;
+        },
+      ),
+    )
+    .setPartyMemberFunc(
+      2,
+      getRandomPartyMemberFunc([Species.ZEKROM], TrainerSlot.TRAINER, true, p => {
+        p.generateAndPopulateMoveset();
+        p.pokeball = PokeballType.MASTER_BALL;
+      }),
+    )
+    .setPartyMemberFunc(
+      3,
+      getRandomPartyMemberFunc([Species.KELDEO], TrainerSlot.TRAINER, true, p => {
+        p.generateAndPopulateMoveset();
+        p.pokeball = PokeballType.ULTRA_BALL;
+      }),
+    )
+    .setPartyMemberFunc(
+      4,
+      getRandomPartyMemberFunc(
+        [Species.CHANDELURE, Species.KROOKODILE, Species.REUNICLUS, Species.CONKELDURR],
+        TrainerSlot.TRAINER,
+        true,
+        p => {
+          p.generateAndPopulateMoveset();
+          p.teraType = p.species.speciesId === Species.KROOKODILE ? PokemonType.DARK : p.species.type1;
+        },
+      ),
+    )
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.VOLCARONA], TrainerSlot.TRAINER, true, p => {
+        p.generateAndPopulateMoveset();
+        p.gender = Gender.MALE;
+        p.setBoss(true, 2);
+      }),
+    )
+    .setInstantTera(4), // Tera Ghost Chandelure / Dark Krookodile / Psychic Reuniclus / Fighting Conkeldurr
+  [TrainerType.IRIS]: new TrainerConfig(++t)
+    .initForChampion(false)
+    .setBattleBgm("battle_champion_iris")
+    .setMixedBattleBgm("battle_champion_iris")
+    .setHasDouble("iris_alder_double")
+    .setDoubleTrainerType(TrainerType.ALDER)
+    .setDoubleTitle("champion_double")
+    .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.DRUDDIGON]))
+    .setPartyMemberFunc(1, getRandomPartyMemberFunc([Species.ARCHEOPS]))
+    .setPartyMemberFunc(
+      2,
+      getRandomPartyMemberFunc([Species.RESHIRAM], TrainerSlot.TRAINER, true, p => {
+        p.generateAndPopulateMoveset();
+        p.pokeball = PokeballType.MASTER_BALL;
+      }),
+    )
+    .setPartyMemberFunc(
+      3,
+      getRandomPartyMemberFunc(
+        [Species.SALAMENCE, Species.HYDREIGON, Species.ARCHALUDON],
+        TrainerSlot.TRAINER,
+        true,
+        p => {
+          p.generateAndPopulateMoveset();
+          p.teraType = PokemonType.DRAGON;
+        },
+      ),
+    )
+    .setPartyMemberFunc(
+      4,
+      getRandomPartyMemberFunc([Species.LAPRAS], TrainerSlot.TRAINER, true, p => {
+        p.formIndex = 1; // G-Max Lapras
+        p.generateAndPopulateMoveset();
+        p.generateName();
+      }),
+    )
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.HAXORUS], TrainerSlot.TRAINER, true, p => {
+        p.abilityIndex = 1; // Mold Breaker
+        p.generateAndPopulateMoveset();
+        p.gender = Gender.FEMALE;
+        p.setBoss(true, 2);
+      }),
+    )
+    .setInstantTera(3), // Tera Dragon Salamence / Hydreigon / Archaludon
+  [TrainerType.DIANTHA]: new TrainerConfig(++t)
+    .initForChampion(false)
+    .setMixedBattleBgm("battle_kalos_champion")
+    .setPartyMemberFunc(
+      0,
+      getRandomPartyMemberFunc([Species.HAWLUCHA], TrainerSlot.TRAINER, true, p => {
+        p.generateAndPopulateMoveset();
+      }),
+    )
+    .setPartyMemberFunc(1, getRandomPartyMemberFunc([Species.TREVENANT, Species.GOURGEIST]))
+    .setPartyMemberFunc(
+      2,
+      getRandomPartyMemberFunc([Species.XERNEAS], TrainerSlot.TRAINER, true, p => {
+        p.generateAndPopulateMoveset();
+        p.pokeball = PokeballType.MASTER_BALL;
+      }),
+    )
+    .setPartyMemberFunc(
+      3,
+      getRandomPartyMemberFunc([Species.TYRANTRUM, Species.AURORUS], TrainerSlot.TRAINER, true, p => {
+        p.generateAndPopulateMoveset();
+        p.abilityIndex = 2; // Rock Head Tyrantrum, Snow Warning Aurorus
+        p.teraType = p.species.type2!;
+      }),
+    )
+    .setPartyMemberFunc(
+      4,
+      getRandomPartyMemberFunc([Species.GOODRA], TrainerSlot.TRAINER, true, p => {
+        p.generateAndPopulateMoveset();
+        p.setBoss(true, 2);
+      }),
+    )
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.GARDEVOIR], TrainerSlot.TRAINER, true, p => {
+        p.formIndex = 1; // Mega Gardevoir
+        p.generateAndPopulateMoveset();
+        p.generateName();
+        p.gender = Gender.FEMALE;
+      }),
+    )
+    .setInstantTera(3), // Tera Dragon Tyrantrum / Ice Aurorus
+  [TrainerType.KUKUI]: new TrainerConfig(++t)
+    .initForChampion(true)
+    .setMixedBattleBgm("battle_champion_kukui")
+    .setPartyMemberFunc(
+      0,
+      getRandomPartyMemberFunc([Species.LYCANROC], TrainerSlot.TRAINER, true, p => {
+        p.generateAndPopulateMoveset();
+        p.formIndex = 2; // Dusk Lycanroc
+      }),
+    )
+    .setPartyMemberFunc(1, getRandomPartyMemberFunc([Species.MAGNEZONE, Species.ALOLA_NINETALES]))
+    .setPartyMemberFunc(
+      2,
+      getRandomPartyMemberFunc(
+        [Species.TORNADUS, Species.THUNDURUS, Species.LANDORUS],
+        TrainerSlot.TRAINER,
+        true,
+        p => {
+          p.formIndex = 1; // Therian Formes
+          p.generateAndPopulateMoveset();
+          p.pokeball = PokeballType.ULTRA_BALL;
+        },
+      ),
+    )
+    .setPartyMemberFunc(
+      3,
+      getRandomPartyMemberFunc([Species.TAPU_KOKO, Species.TAPU_FINI], TrainerSlot.TRAINER, true, p => {
+        p.generateAndPopulateMoveset();
+        p.setBoss(true, 2);
+        p.pokeball = PokeballType.ULTRA_BALL;
+      }),
+    )
+    .setPartyMemberFunc(
+      4,
+      getRandomPartyMemberFunc([Species.SNORLAX], TrainerSlot.TRAINER, true, p => {
+        p.generateAndPopulateMoveset();
+        p.formIndex = 1; // G-Max Snorlax
+      }),
+    )
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.INCINEROAR, Species.HISUI_DECIDUEYE], TrainerSlot.TRAINER, true, p => {
+        p.generateAndPopulateMoveset();
+        p.gender = Gender.MALE;
+        p.teraType = p.species.type2!;
+      }),
+    )
+    .setInstantTera(5), // Tera Dark Incineroar / Fighting Hisuian Decidueye
+  [TrainerType.HAU]: new TrainerConfig(++t)
+    .initForChampion(true)
+    .setMixedBattleBgm("battle_alola_champion")
+    .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.ALOLA_RAICHU]))
+    .setPartyMemberFunc(1, getRandomPartyMemberFunc([Species.NOIVERN]))
+    .setPartyMemberFunc(
+      2,
+      getRandomPartyMemberFunc([Species.SOLGALEO], TrainerSlot.TRAINER, true, p => {
+        p.generateAndPopulateMoveset();
+        p.pokeball = PokeballType.MASTER_BALL;
+      }),
+    )
+    .setPartyMemberFunc(
+      3,
+      getRandomPartyMemberFunc([Species.TAPU_LELE, Species.TAPU_BULU], TrainerSlot.TRAINER, true, p => {
+        p.generateAndPopulateMoveset();
+        p.pokeball = PokeballType.ULTRA_BALL;
+        p.teraType = p.species.type1;
+      }),
+    )
+    .setPartyMemberFunc(
+      4,
+      getRandomPartyMemberFunc([Species.ZYGARDE], TrainerSlot.TRAINER, true, p => {
+        p.formIndex = 1; // Zygarde 10% forme, Aura Break
+        p.generateAndPopulateMoveset();
+        p.pokeball = PokeballType.ROGUE_BALL;
+      }),
+    )
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.DECIDUEYE, Species.PRIMARINA], TrainerSlot.TRAINER, true, p => {
+        p.generateAndPopulateMoveset();
+        p.setBoss(true, 2);
+        p.gender = p.species.speciesId === Species.PRIMARINA ? Gender.FEMALE : Gender.MALE;
+      }),
+    )
+    .setInstantTera(3), // Tera Psychic Tapu Lele / Grass Tapu Bulu
+  [TrainerType.LEON]: new TrainerConfig(++t)
+    .initForChampion(true)
+    .setMixedBattleBgm("battle_galar_champion")
+    .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.AEGISLASH]))
+    .setPartyMemberFunc(1, getRandomPartyMemberFunc([Species.RHYPERIOR, Species.SEISMITOAD, Species.MR_RIME]))
+    .setPartyMemberFunc(
+      2,
+      getRandomPartyMemberFunc([Species.ZACIAN], TrainerSlot.TRAINER, true, p => {
+        p.generateAndPopulateMoveset();
+        p.pokeball = PokeballType.MASTER_BALL;
+      }),
+    )
+    .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.DRAGAPULT]))
+    .setPartyMemberFunc(
+      4,
+      getRandomPartyMemberFunc(
+        [Species.RILLABOOM, Species.CINDERACE, Species.INTELEON],
+        TrainerSlot.TRAINER,
+        true,
+        p => {
+          p.generateAndPopulateMoveset();
+          p.setBoss(true, 2);
+        },
+      ),
+    )
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.CHARIZARD], TrainerSlot.TRAINER, true, p => {
+        p.formIndex = 3; // G-Max Charizard
+        p.generateAndPopulateMoveset();
+        p.generateName();
+        p.gender = Gender.MALE;
+      }),
+    )
+    .setInstantTera(3), // Tera Dragapult to Ghost or Dragon
+  [TrainerType.MUSTARD]: new TrainerConfig(++t)
+    .initForChampion(true)
+    .setMixedBattleBgm("battle_mustard")
+    .setPartyMemberFunc(
+      0,
+      getRandomPartyMemberFunc([Species.CORVIKNIGHT], TrainerSlot.TRAINER, true, p => {
+        p.generateAndPopulateMoveset();
+        p.pokeball = PokeballType.ULTRA_BALL;
+      }),
+    )
+    .setPartyMemberFunc(
+      1,
+      getRandomPartyMemberFunc([Species.KOMMO_O], TrainerSlot.TRAINER, true, p => {
+        p.generateAndPopulateMoveset();
+        p.pokeball = PokeballType.ULTRA_BALL;
+      }),
+    )
+    .setPartyMemberFunc(
+      2,
+      getRandomPartyMemberFunc([Species.GALAR_SLOWBRO, Species.GALAR_SLOWKING], TrainerSlot.TRAINER, true, p => {
+        p.generateAndPopulateMoveset();
+        p.pokeball = PokeballType.ULTRA_BALL;
+        p.teraType = p.species.type1;
+      }),
+    )
+    .setPartyMemberFunc(
+      3,
+      getRandomPartyMemberFunc([Species.GALAR_DARMANITAN], TrainerSlot.TRAINER, true, p => {
+        p.generateAndPopulateMoveset();
+        p.pokeball = PokeballType.ULTRA_BALL;
+      }),
+    )
+    .setPartyMemberFunc(
+      4,
+      getRandomPartyMemberFunc([Species.BLASTOISE, Species.VENUSAUR], TrainerSlot.TRAINER, true, p => {
+        p.generateAndPopulateMoveset();
+        p.setBoss(true, 2);
+        p.pokeball = PokeballType.ULTRA_BALL;
+      }),
+    )
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.URSHIFU], TrainerSlot.TRAINER, true, p => {
+        p.formIndex = randSeedIntRange(2, 3); // Random G-Max Urshifu
+        p.generateAndPopulateMoveset();
+        p.generateName();
+        p.gender = Gender.MALE;
+        p.pokeball = PokeballType.ULTRA_BALL;
+      }),
+    )
+    .setInstantTera(2), // Tera Poison Galar-Slowbro / Galar-Slowking
+  [TrainerType.GEETA]: new TrainerConfig(++t)
+    .initForChampion(false)
+    .setMixedBattleBgm("battle_champion_geeta")
+    .setPartyMemberFunc(
+      0,
+      getRandomPartyMemberFunc([Species.GLIMMORA], TrainerSlot.TRAINER, true, p => {
+        p.generateAndPopulateMoveset();
+        p.gender = Gender.MALE;
+        p.setBoss(true, 2);
+      }),
+    )
+    .setPartyMemberFunc(1, getRandomPartyMemberFunc([Species.ESPATHRA, Species.VELUZA]))
+    .setPartyMemberFunc(
+      2,
+      getRandomPartyMemberFunc([Species.MIRAIDON], TrainerSlot.TRAINER, true, p => {
+        p.generateAndPopulateMoveset();
+        p.pokeball = PokeballType.MASTER_BALL;
+      }),
+    )
+    .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.BAXCALIBUR]))
+    .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.CHESNAUGHT, Species.DELPHOX, Species.GRENINJA]))
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.KINGAMBIT], TrainerSlot.TRAINER, true, p => {
+        p.generateAndPopulateMoveset();
+        if (!p.moveset.some(move => !isNullOrUndefined(move) && move.moveId === Moves.TERA_BLAST)) {
+          // Check if Tera Blast is in the moveset, if not, replace the third move with Tera Blast.
+          p.moveset[2] = new PokemonMove(Moves.TERA_BLAST);
+        }
+        p.abilityIndex = 1; // Supreme Overlord
+        p.teraType = PokemonType.FLYING;
+      }),
+    )
+    .setInstantTera(5), // Tera Flying Kingambit
+  [TrainerType.NEMONA]: new TrainerConfig(++t)
+    .initForChampion(false)
+    .setMixedBattleBgm("battle_champion_nemona")
+    .setPartyMemberFunc(
+      0,
+      getRandomPartyMemberFunc([Species.LYCANROC], TrainerSlot.TRAINER, true, p => {
+        p.formIndex = 0; // Midday form
+        p.generateAndPopulateMoveset();
+      }),
+    )
+    .setPartyMemberFunc(1, getRandomPartyMemberFunc([Species.PAWMOT]))
+    .setPartyMemberFunc(
+      2,
+      getRandomPartyMemberFunc([Species.KORAIDON], TrainerSlot.TRAINER, true, p => {
+        p.generateAndPopulateMoveset();
+        p.pokeball = PokeballType.MASTER_BALL;
+      }),
+    )
+    .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.GHOLDENGO]))
+    .setPartyMemberFunc(
+      4,
+      getRandomPartyMemberFunc([Species.ARMAROUGE, Species.CERULEDGE], TrainerSlot.TRAINER, true, p => {
+        p.generateAndPopulateMoveset();
+        p.teraType = p.species.type2!;
+      }),
+    )
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc(
+        [Species.MEOWSCARADA, Species.SKELEDIRGE, Species.QUAQUAVAL],
+        TrainerSlot.TRAINER,
+        true,
+        p => {
+          p.generateAndPopulateMoveset();
+          p.gender = Gender.MALE;
+          p.setBoss(true, 2);
+        },
+      ),
+    )
+    .setInstantTera(4), // Tera Psychic Armarouge / Ghost Ceruledge
+  [TrainerType.KIERAN]: new TrainerConfig(++t)
+    .initForChampion(true)
+    .setMixedBattleBgm("battle_champion_kieran")
+    .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.POLIWRATH, Species.POLITOED]))
+    .setPartyMemberFunc(
+      1,
+      getRandomPartyMemberFunc([Species.INCINEROAR, Species.GRIMMSNARL], TrainerSlot.TRAINER, true, p => {
+        p.generateAndPopulateMoveset();
+        p.abilityIndex = p.species.speciesId === Species.INCINEROAR ? 2 : 0; // Intimidate Incineroar, Prankster Grimmsnarl
+      }),
+    )
+    .setPartyMemberFunc(
+      2,
+      getRandomPartyMemberFunc([Species.TERAPAGOS], TrainerSlot.TRAINER, true, p => {
+        p.generateAndPopulateMoveset();
+        p.pokeball = PokeballType.MASTER_BALL;
+      }),
+    )
+    .setPartyMemberFunc(
+      3,
+      getRandomPartyMemberFunc([Species.URSALUNA, Species.BLOODMOON_URSALUNA], TrainerSlot.TRAINER, true, p => {
+        p.generateAndPopulateMoveset();
+        p.pokeball = PokeballType.ULTRA_BALL;
+      }),
+    )
+    .setPartyMemberFunc(
+      4,
+      getRandomPartyMemberFunc([Species.OGERPON], TrainerSlot.TRAINER, true, p => {
+        p.formIndex = randSeedInt(4); // Random Ogerpon Tera Mask
+        p.generateAndPopulateMoveset();
+        p.pokeball = PokeballType.ULTRA_BALL;
+        if (!p.moveset.some(move => !isNullOrUndefined(move) && move.moveId === Moves.IVY_CUDGEL)) {
+          // Check if Ivy Cudgel is in the moveset, if not, replace the first move with Ivy Cudgel.
+          p.moveset[0] = new PokemonMove(Moves.IVY_CUDGEL);
+        }
+      }),
+    )
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.HYDRAPPLE], TrainerSlot.TRAINER, true, p => {
+        p.generateAndPopulateMoveset();
+        p.gender = Gender.MALE;
+        p.setBoss(true, 2);
+      }),
+    )
+    .setInstantTera(4), // Tera Ogerpon
+
+  [TrainerType.RIVAL]: new TrainerConfig((t = TrainerType.RIVAL))
+    .setName("Finn")
+    .setHasGenders("Ivy")
+    .setHasCharSprite()
+    .setTitle("Rival")
+    .setStaticParty()
+    .setEncounterBgm(TrainerType.RIVAL)
+    .setBattleBgm("battle_rival")
+    .setMixedBattleBgm("battle_rival")
+    .setPartyTemplates(trainerPartyTemplates.RIVAL)
+    .setModifierRewardFuncs(
+      () => modifierTypes.SUPER_EXP_CHARM,
+      () => modifierTypes.EXP_SHARE,
+    )
+    .setPartyMemberFunc(
+      0,
+      getRandomPartyMemberFunc(
+        [
+          Species.BULBASAUR,
+          Species.CHARMANDER,
+          Species.SQUIRTLE,
+          Species.CHIKORITA,
+          Species.CYNDAQUIL,
+          Species.TOTODILE,
+          Species.TREECKO,
+          Species.TORCHIC,
+          Species.MUDKIP,
+          Species.TURTWIG,
+          Species.CHIMCHAR,
+          Species.PIPLUP,
+          Species.SNIVY,
+          Species.TEPIG,
+          Species.OSHAWOTT,
+          Species.CHESPIN,
+          Species.FENNEKIN,
+          Species.FROAKIE,
+          Species.ROWLET,
+          Species.LITTEN,
+          Species.POPPLIO,
+          Species.GROOKEY,
+          Species.SCORBUNNY,
+          Species.SOBBLE,
+          Species.SPRIGATITO,
+          Species.FUECOCO,
+          Species.QUAXLY,
+        ],
+        TrainerSlot.TRAINER,
+        true,
+        p => (p.abilityIndex = 0),
+      ),
+    )
+    .setPartyMemberFunc(
+      1,
+      getRandomPartyMemberFunc(
+        [
+          Species.PIDGEY,
+          Species.HOOTHOOT,
+          Species.TAILLOW,
+          Species.STARLY,
+          Species.PIDOVE,
+          Species.FLETCHLING,
+          Species.PIKIPEK,
+          Species.ROOKIDEE,
+          Species.WATTREL,
+        ],
+        TrainerSlot.TRAINER,
+        true,
+      ),
+    ),
+  [TrainerType.RIVAL_2]: new TrainerConfig(++t)
+    .setName("Finn")
+    .setHasGenders("Ivy")
+    .setHasCharSprite()
+    .setTitle("Rival")
+    .setStaticParty()
+    .setMoneyMultiplier(1.25)
+    .setEncounterBgm(TrainerType.RIVAL)
+    .setBattleBgm("battle_rival")
+    .setMixedBattleBgm("battle_rival")
+    .setPartyTemplates(trainerPartyTemplates.RIVAL_2)
+    .setModifierRewardFuncs(() => modifierTypes.EXP_SHARE)
+    .setPartyMemberFunc(
+      0,
+      getRandomPartyMemberFunc(
+        [
+          Species.IVYSAUR,
+          Species.CHARMELEON,
+          Species.WARTORTLE,
+          Species.BAYLEEF,
+          Species.QUILAVA,
+          Species.CROCONAW,
+          Species.GROVYLE,
+          Species.COMBUSKEN,
+          Species.MARSHTOMP,
+          Species.GROTLE,
+          Species.MONFERNO,
+          Species.PRINPLUP,
+          Species.SERVINE,
+          Species.PIGNITE,
+          Species.DEWOTT,
+          Species.QUILLADIN,
+          Species.BRAIXEN,
+          Species.FROGADIER,
+          Species.DARTRIX,
+          Species.TORRACAT,
+          Species.BRIONNE,
+          Species.THWACKEY,
+          Species.RABOOT,
+          Species.DRIZZILE,
+          Species.FLORAGATO,
+          Species.CROCALOR,
+          Species.QUAXWELL,
+        ],
+        TrainerSlot.TRAINER,
+        true,
+        p => (p.abilityIndex = 0),
+      ),
+    )
+    .setPartyMemberFunc(
+      1,
+      getRandomPartyMemberFunc(
+        [
+          Species.PIDGEOTTO,
+          Species.HOOTHOOT,
+          Species.TAILLOW,
+          Species.STARAVIA,
+          Species.TRANQUILL,
+          Species.FLETCHINDER,
+          Species.TRUMBEAK,
+          Species.CORVISQUIRE,
+          Species.WATTREL,
+        ],
+        TrainerSlot.TRAINER,
+        true,
+      ),
+    )
+    .setPartyMemberFunc(
+      2,
+      getSpeciesFilterRandomPartyMemberFunc(
+        (species: PokemonSpecies) =>
+          !pokemonEvolutions.hasOwnProperty(species.speciesId) &&
+          !pokemonPrevolutions.hasOwnProperty(species.speciesId) &&
+          species.baseTotal >= 450,
+      ),
+    ),
+  [TrainerType.RIVAL_3]: new TrainerConfig(++t)
+    .setName("Finn")
+    .setHasGenders("Ivy")
+    .setHasCharSprite()
+    .setTitle("Rival")
+    .setStaticParty()
+    .setMoneyMultiplier(1.5)
+    .setEncounterBgm(TrainerType.RIVAL)
+    .setBattleBgm("battle_rival")
+    .setMixedBattleBgm("battle_rival")
+    .setPartyTemplates(trainerPartyTemplates.RIVAL_3)
+    .setPartyMemberFunc(
+      0,
+      getRandomPartyMemberFunc(
+        [
+          Species.VENUSAUR,
+          Species.CHARIZARD,
+          Species.BLASTOISE,
+          Species.MEGANIUM,
+          Species.TYPHLOSION,
+          Species.FERALIGATR,
+          Species.SCEPTILE,
+          Species.BLAZIKEN,
+          Species.SWAMPERT,
+          Species.TORTERRA,
+          Species.INFERNAPE,
+          Species.EMPOLEON,
+          Species.SERPERIOR,
+          Species.EMBOAR,
+          Species.SAMUROTT,
+          Species.CHESNAUGHT,
+          Species.DELPHOX,
+          Species.GRENINJA,
+          Species.DECIDUEYE,
+          Species.INCINEROAR,
+          Species.PRIMARINA,
+          Species.RILLABOOM,
+          Species.CINDERACE,
+          Species.INTELEON,
+          Species.MEOWSCARADA,
+          Species.SKELEDIRGE,
+          Species.QUAQUAVAL,
+        ],
+        TrainerSlot.TRAINER,
+        true,
+        p => (p.abilityIndex = 0),
+      ),
+    )
+    .setPartyMemberFunc(
+      1,
+      getRandomPartyMemberFunc(
+        [
+          Species.PIDGEOT,
+          Species.NOCTOWL,
+          Species.SWELLOW,
+          Species.STARAPTOR,
+          Species.UNFEZANT,
+          Species.TALONFLAME,
+          Species.TOUCANNON,
+          Species.CORVIKNIGHT,
+          Species.KILOWATTREL,
+        ],
+        TrainerSlot.TRAINER,
+        true,
+      ),
+    )
+    .setPartyMemberFunc(
+      2,
+      getSpeciesFilterRandomPartyMemberFunc(
+        (species: PokemonSpecies) =>
+          !pokemonEvolutions.hasOwnProperty(species.speciesId) &&
+          !pokemonPrevolutions.hasOwnProperty(species.speciesId) &&
+          species.baseTotal >= 450,
+      ),
+    )
+    .setSpeciesFilter(species => species.baseTotal >= 540),
+  [TrainerType.RIVAL_4]: new TrainerConfig(++t)
+    .setName("Finn")
+    .setHasGenders("Ivy")
+    .setHasCharSprite()
+    .setTitle("Rival")
+    .setBoss()
+    .setStaticParty()
+    .setMoneyMultiplier(1.75)
+    .setEncounterBgm(TrainerType.RIVAL)
+    .setBattleBgm("battle_rival_2")
+    .setMixedBattleBgm("battle_rival_2")
+    .setPartyTemplates(trainerPartyTemplates.RIVAL_4)
+    .setModifierRewardFuncs(() => modifierTypes.TERA_ORB)
+    .setPartyMemberFunc(
+      0,
+      getRandomPartyMemberFunc(
+        [
+          Species.VENUSAUR,
+          Species.CHARIZARD,
+          Species.BLASTOISE,
+          Species.MEGANIUM,
+          Species.TYPHLOSION,
+          Species.FERALIGATR,
+          Species.SCEPTILE,
+          Species.BLAZIKEN,
+          Species.SWAMPERT,
+          Species.TORTERRA,
+          Species.INFERNAPE,
+          Species.EMPOLEON,
+          Species.SERPERIOR,
+          Species.EMBOAR,
+          Species.SAMUROTT,
+          Species.CHESNAUGHT,
+          Species.DELPHOX,
+          Species.GRENINJA,
+          Species.DECIDUEYE,
+          Species.INCINEROAR,
+          Species.PRIMARINA,
+          Species.RILLABOOM,
+          Species.CINDERACE,
+          Species.INTELEON,
+          Species.MEOWSCARADA,
+          Species.SKELEDIRGE,
+          Species.QUAQUAVAL,
+        ],
+        TrainerSlot.TRAINER,
+        true,
+        p => {
+          p.abilityIndex = 0;
+          p.teraType = p.species.type1;
+        },
+      ),
+    )
+    .setPartyMemberFunc(
+      1,
+      getRandomPartyMemberFunc(
+        [
+          Species.PIDGEOT,
+          Species.NOCTOWL,
+          Species.SWELLOW,
+          Species.STARAPTOR,
+          Species.UNFEZANT,
+          Species.TALONFLAME,
+          Species.TOUCANNON,
+          Species.CORVIKNIGHT,
+          Species.KILOWATTREL,
+        ],
+        TrainerSlot.TRAINER,
+        true,
+      ),
+    )
+    .setPartyMemberFunc(
+      2,
+      getSpeciesFilterRandomPartyMemberFunc(
+        (species: PokemonSpecies) =>
+          !pokemonEvolutions.hasOwnProperty(species.speciesId) &&
+          !pokemonPrevolutions.hasOwnProperty(species.speciesId) &&
+          species.baseTotal >= 450,
+      ),
+    )
+    .setSpeciesFilter(species => species.baseTotal >= 540)
+    .setInstantTera(0), // Tera starter to primary type
+  [TrainerType.RIVAL_5]: new TrainerConfig(++t)
+    .setName("Finn")
+    .setHasGenders("Ivy")
+    .setHasCharSprite()
+    .setTitle("Rival")
+    .setBoss()
+    .setStaticParty()
+    .setMoneyMultiplier(2.25)
+    .setEncounterBgm(TrainerType.RIVAL)
+    .setBattleBgm("battle_rival_3")
+    .setMixedBattleBgm("battle_rival_3")
+    .setPartyTemplates(trainerPartyTemplates.RIVAL_5)
+    .setPartyMemberFunc(
+      0,
+      getRandomPartyMemberFunc(
+        [
+          Species.VENUSAUR,
+          Species.CHARIZARD,
+          Species.BLASTOISE,
+          Species.MEGANIUM,
+          Species.TYPHLOSION,
+          Species.FERALIGATR,
+          Species.SCEPTILE,
+          Species.BLAZIKEN,
+          Species.SWAMPERT,
+          Species.TORTERRA,
+          Species.INFERNAPE,
+          Species.EMPOLEON,
+          Species.SERPERIOR,
+          Species.EMBOAR,
+          Species.SAMUROTT,
+          Species.CHESNAUGHT,
+          Species.DELPHOX,
+          Species.GRENINJA,
+          Species.DECIDUEYE,
+          Species.INCINEROAR,
+          Species.PRIMARINA,
+          Species.RILLABOOM,
+          Species.CINDERACE,
+          Species.INTELEON,
+          Species.MEOWSCARADA,
+          Species.SKELEDIRGE,
+          Species.QUAQUAVAL,
+        ],
+        TrainerSlot.TRAINER,
+        true,
+        p => {
+          p.setBoss(true, 2);
+          p.abilityIndex = 0;
+          p.teraType = p.species.type1;
+        },
+      ),
+    )
+    .setPartyMemberFunc(
+      1,
+      getRandomPartyMemberFunc(
+        [
+          Species.PIDGEOT,
+          Species.NOCTOWL,
+          Species.SWELLOW,
+          Species.STARAPTOR,
+          Species.UNFEZANT,
+          Species.TALONFLAME,
+          Species.TOUCANNON,
+          Species.CORVIKNIGHT,
+          Species.KILOWATTREL,
+        ],
+        TrainerSlot.TRAINER,
+        true,
+      ),
+    )
+    .setPartyMemberFunc(
+      2,
+      getSpeciesFilterRandomPartyMemberFunc(
+        (species: PokemonSpecies) =>
+          !pokemonEvolutions.hasOwnProperty(species.speciesId) &&
+          !pokemonPrevolutions.hasOwnProperty(species.speciesId) &&
+          species.baseTotal >= 450,
+      ),
+    )
+    .setSpeciesFilter(species => species.baseTotal >= 540)
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.RAYQUAZA], TrainerSlot.TRAINER, true, p => {
+        p.setBoss(true, 3);
+        p.pokeball = PokeballType.MASTER_BALL;
+        p.shiny = timedEventManager.getClassicTrainerShinyChance() === 0;
+        p.variant = 1;
+      }),
+    )
+    .setInstantTera(0), // Tera starter to primary type
+  [TrainerType.RIVAL_6]: new TrainerConfig(++t)
+    .setName("Finn")
+    .setHasGenders("Ivy")
+    .setHasCharSprite()
+    .setTitle("Rival")
+    .setBoss()
+    .setStaticParty()
+    .setMoneyMultiplier(3)
+    .setEncounterBgm("final")
+    .setBattleBgm("battle_rival_3")
+    .setMixedBattleBgm("battle_rival_3")
+    .setPartyTemplates(trainerPartyTemplates.RIVAL_6)
+    .setPartyMemberFunc(
+      0,
+      getRandomPartyMemberFunc(
+        [
+          Species.VENUSAUR,
+          Species.CHARIZARD,
+          Species.BLASTOISE,
+          Species.MEGANIUM,
+          Species.TYPHLOSION,
+          Species.FERALIGATR,
+          Species.SCEPTILE,
+          Species.BLAZIKEN,
+          Species.SWAMPERT,
+          Species.TORTERRA,
+          Species.INFERNAPE,
+          Species.EMPOLEON,
+          Species.SERPERIOR,
+          Species.EMBOAR,
+          Species.SAMUROTT,
+          Species.CHESNAUGHT,
+          Species.DELPHOX,
+          Species.GRENINJA,
+          Species.DECIDUEYE,
+          Species.INCINEROAR,
+          Species.PRIMARINA,
+          Species.RILLABOOM,
+          Species.CINDERACE,
+          Species.INTELEON,
+          Species.MEOWSCARADA,
+          Species.SKELEDIRGE,
+          Species.QUAQUAVAL,
+        ],
+        TrainerSlot.TRAINER,
+        true,
+        p => {
+          p.setBoss(true, 3);
+          p.abilityIndex = 0;
+          p.teraType = p.species.type1;
+          p.generateAndPopulateMoveset();
+        },
+      ),
+    )
+    .setPartyMemberFunc(
+      1,
+      getRandomPartyMemberFunc(
+        [
+          Species.PIDGEOT,
+          Species.NOCTOWL,
+          Species.SWELLOW,
+          Species.STARAPTOR,
+          Species.UNFEZANT,
+          Species.TALONFLAME,
+          Species.TOUCANNON,
+          Species.CORVIKNIGHT,
+          Species.KILOWATTREL,
+        ],
+        TrainerSlot.TRAINER,
+        true,
+        p => {
+          p.setBoss(true, 2);
+          p.generateAndPopulateMoveset();
+        },
+      ),
+    )
+    .setPartyMemberFunc(
+      2,
+      getSpeciesFilterRandomPartyMemberFunc(
+        (species: PokemonSpecies) =>
+          !pokemonEvolutions.hasOwnProperty(species.speciesId) &&
+          !pokemonPrevolutions.hasOwnProperty(species.speciesId) &&
+          species.baseTotal >= 450,
+      ),
+    )
+    .setSpeciesFilter(species => species.baseTotal >= 540)
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.RAYQUAZA], TrainerSlot.TRAINER, true, p => {
+        p.setBoss();
+        p.generateAndPopulateMoveset();
+        p.pokeball = PokeballType.MASTER_BALL;
+        p.shiny = timedEventManager.getClassicTrainerShinyChance() === 0;
+        p.variant = 1;
+        p.formIndex = 1; // Mega Rayquaza
+        p.generateName();
+      }),
+    )
+    .setInstantTera(0), // Tera starter to primary type
+
+  [TrainerType.ROCKET_BOSS_GIOVANNI_1]: new TrainerConfig((t = TrainerType.ROCKET_BOSS_GIOVANNI_1))
+    .setName("Giovanni")
+    .initForEvilTeamLeader("Rocket Boss", [])
+    .setMixedBattleBgm("battle_rocket_boss")
+    .setVictoryBgm("victory_team_plasma")
+    .setPartyMemberFunc(
+      0,
+      getRandomPartyMemberFunc([Species.PERSIAN], TrainerSlot.TRAINER, true, p => {
+        p.generateAndPopulateMoveset();
+        p.gender = Gender.MALE;
+      }),
+    )
+    .setPartyMemberFunc(1, getRandomPartyMemberFunc([Species.DUGTRIO, Species.ALOLA_DUGTRIO]))
+    .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.HONCHKROW]))
+    .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.NIDOQUEEN, Species.NIDOKING]))
+    .setPartyMemberFunc(
+      4,
+      getRandomPartyMemberFunc([Species.RHYPERIOR], TrainerSlot.TRAINER, true, p => {
+        p.generateAndPopulateMoveset();
+        p.pokeball = PokeballType.ULTRA_BALL;
+        p.abilityIndex = 1; // Solid Rock
+      }),
+    )
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.KANGASKHAN], TrainerSlot.TRAINER, true, p => {
+        p.setBoss(true, 2);
+        p.generateAndPopulateMoveset();
+        p.pokeball = PokeballType.ULTRA_BALL;
+        p.formIndex = 1; // Mega Kangaskhan
+        p.generateName();
+      }),
+    ),
+  [TrainerType.ROCKET_BOSS_GIOVANNI_2]: new TrainerConfig(++t)
+    .setName("Giovanni")
+    .initForEvilTeamLeader("Rocket Boss", [], true)
+    .setMixedBattleBgm("battle_rocket_boss")
+    .setVictoryBgm("victory_team_plasma")
+    .setPartyMemberFunc(
+      0,
+      getRandomPartyMemberFunc([Species.TYRANITAR], TrainerSlot.TRAINER, true, p => {
+        p.setBoss(true, 2);
+        p.generateAndPopulateMoveset();
+        p.pokeball = PokeballType.ULTRA_BALL;
+      }),
+    )
+    .setPartyMemberFunc(
+      1,
+      getRandomPartyMemberFunc([Species.GASTRODON, Species.SEISMITOAD], TrainerSlot.TRAINER, true, p => {
+        if (p.species.speciesId === Species.GASTRODON) {
+          p.abilityIndex = 0; // Storm Drain
+        } else if (p.species.speciesId === Species.SEISMITOAD) {
+          p.abilityIndex = 2; // Water Absorb
+        }
+      }),
+    )
+    .setPartyMemberFunc(
+      2,
+      getRandomPartyMemberFunc([Species.GARCHOMP, Species.EXCADRILL], TrainerSlot.TRAINER, true, p => {
+        p.generateAndPopulateMoveset();
+        p.pokeball = PokeballType.ULTRA_BALL;
+        if (p.species.speciesId === Species.GARCHOMP) {
+          p.abilityIndex = 2; // Rough Skin
+        } else if (p.species.speciesId === Species.EXCADRILL) {
+          p.abilityIndex = 0; // Sand Rush
+        }
+      }),
+    )
+    .setPartyMemberFunc(
+      3,
+      getRandomPartyMemberFunc([Species.RHYPERIOR], TrainerSlot.TRAINER, true, p => {
+        p.generateAndPopulateMoveset();
+        p.pokeball = PokeballType.ULTRA_BALL;
+        p.abilityIndex = 1; // Solid Rock
+      }),
+    )
+    .setPartyMemberFunc(
+      4,
+      getRandomPartyMemberFunc([Species.KANGASKHAN], TrainerSlot.TRAINER, true, p => {
+        p.setBoss(true, 2);
+        p.generateAndPopulateMoveset();
+        p.pokeball = PokeballType.ULTRA_BALL;
+        p.formIndex = 1; // Mega Kangaskhan
+        p.generateName();
+      }),
+    )
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.MEWTWO], TrainerSlot.TRAINER, true, p => {
+        p.setBoss(true, 2);
+        p.generateAndPopulateMoveset();
+        p.pokeball = PokeballType.MASTER_BALL;
+      }),
+    ),
+  [TrainerType.MAXIE]: new TrainerConfig(++t)
+    .setName("Maxie")
+    .initForEvilTeamLeader("Magma Boss", [])
+    .setMixedBattleBgm("battle_aqua_magma_boss")
+    .setVictoryBgm("victory_team_plasma")
+    .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.SOLROCK]))
+    .setPartyMemberFunc(1, getRandomPartyMemberFunc([Species.TALONFLAME]))
+    .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.WEEZING, Species.GALAR_WEEZING]))
+    .setPartyMemberFunc(
+      3,
+      getRandomPartyMemberFunc([Species.TORKOAL], TrainerSlot.TRAINER, true, p => {
+        p.generateAndPopulateMoveset();
+        p.abilityIndex = 1; // Drought
+      }),
+    )
+    .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.DONPHAN]))
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.CAMERUPT], TrainerSlot.TRAINER, true, p => {
+        p.setBoss(true, 2);
+        p.generateAndPopulateMoveset();
+        p.pokeball = PokeballType.ULTRA_BALL;
+        p.formIndex = 1; // Mega Camerupt
+        p.generateName();
+        p.gender = Gender.MALE;
+      }),
+    ),
+  [TrainerType.MAXIE_2]: new TrainerConfig(++t)
+    .setName("Maxie")
+    .initForEvilTeamLeader("Magma Boss", [], true)
+    .setMixedBattleBgm("battle_aqua_magma_boss")
+    .setVictoryBgm("victory_team_plasma")
+    .setPartyMemberFunc(
+      0,
+      getRandomPartyMemberFunc([Species.TYPHLOSION, Species.SOLROCK], TrainerSlot.TRAINER, true, p => {
+        p.setBoss(true, 2);
+        p.generateAndPopulateMoveset();
+        p.pokeball = PokeballType.ULTRA_BALL;
+      }),
+    )
+    .setPartyMemberFunc(
+      1,
+      getRandomPartyMemberFunc([Species.NINETALES, Species.TORKOAL], TrainerSlot.TRAINER, true, p => {
+        p.generateAndPopulateMoveset();
+        if (p.species.speciesId === Species.NINETALES) {
+          p.abilityIndex = 2; // Drought
+        } else if (p.species.speciesId === Species.TORKOAL) {
+          p.abilityIndex = 1; // Drought
+        }
+      }),
+    )
+    .setPartyMemberFunc(
+      2,
+      getRandomPartyMemberFunc([Species.SCOVILLAIN], TrainerSlot.TRAINER, true, p => {
+        p.generateAndPopulateMoveset();
+        p.abilityIndex = 0; // Chlorophyll
+      }),
+    )
+    .setPartyMemberFunc(
+      3,
+      getRandomPartyMemberFunc([Species.GREAT_TUSK], TrainerSlot.TRAINER, true, p => {
+        p.generateAndPopulateMoveset();
+        p.pokeball = PokeballType.ROGUE_BALL;
+      }),
+    )
+    .setPartyMemberFunc(
+      4,
+      getRandomPartyMemberFunc([Species.CAMERUPT], TrainerSlot.TRAINER, true, p => {
+        p.setBoss(true, 2);
+        p.generateAndPopulateMoveset();
+        p.pokeball = PokeballType.ULTRA_BALL;
+        p.formIndex = 1; // Mega Camerupt
+        p.generateName();
+        p.gender = Gender.MALE;
+      }),
+    )
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.GROUDON], TrainerSlot.TRAINER, true, p => {
+        p.setBoss(true, 2);
+        p.generateAndPopulateMoveset();
+        p.pokeball = PokeballType.MASTER_BALL;
+      }),
+    ),
+  [TrainerType.ARCHIE]: new TrainerConfig(++t)
+    .setName("Archie")
+    .initForEvilTeamLeader("Aqua Boss", [])
+    .setMixedBattleBgm("battle_aqua_magma_boss")
+    .setVictoryBgm("victory_team_plasma")
+    .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.LUDICOLO]))
+    .setPartyMemberFunc(
+      1,
+      getRandomPartyMemberFunc([Species.PELIPPER], TrainerSlot.TRAINER, true, p => {
+        p.generateAndPopulateMoveset();
+        p.abilityIndex = 1; // Drizzle
+      }),
+    )
+    .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.MUK, Species.ALOLA_MUK]))
+    .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.WAILORD]))
+    .setPartyMemberFunc(
+      4,
+      getRandomPartyMemberFunc([Species.QWILFISH], TrainerSlot.TRAINER, true, p => {
+        p.generateAndPopulateMoveset();
+        p.abilityIndex = 1; // Swift Swim
+      }),
+    )
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.SHARPEDO], TrainerSlot.TRAINER, true, p => {
+        p.setBoss(true, 2);
+        p.generateAndPopulateMoveset();
+        p.pokeball = PokeballType.ULTRA_BALL;
+        p.formIndex = 1; // Mega Sharpedo
+        p.generateName();
+        p.gender = Gender.MALE;
+      }),
+    ),
+  [TrainerType.ARCHIE_2]: new TrainerConfig(++t)
+    .setName("Archie")
+    .initForEvilTeamLeader("Aqua Boss", [], true)
+    .setMixedBattleBgm("battle_aqua_magma_boss")
+    .setVictoryBgm("victory_team_plasma")
+    .setPartyMemberFunc(
+      0,
+      getRandomPartyMemberFunc([Species.LUDICOLO, Species.EMPOLEON], TrainerSlot.TRAINER, true, p => {
+        p.setBoss(true, 2);
+        p.generateAndPopulateMoveset();
+        p.pokeball = PokeballType.ULTRA_BALL;
+      }),
+    )
+    .setPartyMemberFunc(
+      1,
+      getRandomPartyMemberFunc([Species.POLITOED, Species.PELIPPER], TrainerSlot.TRAINER, true, p => {
+        p.generateAndPopulateMoveset();
+        if (p.species.speciesId === Species.POLITOED) {
+          p.abilityIndex = 2; // Drizzle
+        } else if (p.species.speciesId === Species.PELIPPER) {
+          p.abilityIndex = 1; // Drizzle
+        }
+      }),
+    )
+    .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.DHELMISE]))
+    .setPartyMemberFunc(
+      3,
+      getRandomPartyMemberFunc([Species.OVERQWIL], TrainerSlot.TRAINER, true, p => {
+        p.generateAndPopulateMoveset();
+        p.abilityIndex = 1; // Swift Swim
+      }),
+    )
+    .setPartyMemberFunc(
+      4,
+      getRandomPartyMemberFunc([Species.SHARPEDO], TrainerSlot.TRAINER, true, p => {
+        p.setBoss(true, 2);
+        p.generateAndPopulateMoveset();
+        p.pokeball = PokeballType.ULTRA_BALL;
+        p.formIndex = 1; // Mega Sharpedo
+        p.generateName();
+        p.gender = Gender.MALE;
+      }),
+    )
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.KYOGRE], TrainerSlot.TRAINER, true, p => {
+        p.setBoss(true, 2);
+        p.generateAndPopulateMoveset();
+        p.pokeball = PokeballType.MASTER_BALL;
+      }),
+    ),
+  [TrainerType.CYRUS]: new TrainerConfig(++t)
+    .setName("Cyrus")
+    .initForEvilTeamLeader("Galactic Boss", [])
+    .setMixedBattleBgm("battle_galactic_boss")
+    .setVictoryBgm("victory_team_plasma")
+    .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.GYARADOS]))
+    .setPartyMemberFunc(1, getRandomPartyMemberFunc([Species.HONCHKROW, Species.HISUI_BRAVIARY]))
+    .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.MAGNEZONE]))
+    .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.UXIE, Species.MESPRIT, Species.AZELF]))
+    .setPartyMemberFunc(
+      4,
+      getRandomPartyMemberFunc([Species.HOUNDOOM], TrainerSlot.TRAINER, true, p => {
+        p.generateAndPopulateMoveset();
+        p.pokeball = PokeballType.ULTRA_BALL;
+        p.formIndex = 1; // Mega Houndoom
+        p.generateName();
+      }),
+    )
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.WEAVILE], TrainerSlot.TRAINER, true, p => {
+        p.setBoss(true, 2);
+        p.generateAndPopulateMoveset();
+        p.pokeball = PokeballType.ULTRA_BALL;
+        p.gender = Gender.MALE;
+      }),
+    ),
+  [TrainerType.CYRUS_2]: new TrainerConfig(++t)
+    .setName("Cyrus")
+    .initForEvilTeamLeader("Galactic Boss", [], true)
+    .setMixedBattleBgm("battle_galactic_boss")
+    .setVictoryBgm("victory_team_plasma")
+    .setPartyMemberFunc(
+      0,
+      getRandomPartyMemberFunc([Species.CROBAT], TrainerSlot.TRAINER, true, p => {
+        p.setBoss(true, 2);
+        p.generateAndPopulateMoveset();
+      }),
+    )
+    .setPartyMemberFunc(1, getRandomPartyMemberFunc([Species.MAGNEZONE]))
+    .setPartyMemberFunc(
+      2,
+      getRandomPartyMemberFunc([Species.UXIE, Species.MESPRIT, Species.AZELF], TrainerSlot.TRAINER, true, p => {
+        p.generateAndPopulateMoveset();
+        p.pokeball = PokeballType.ROGUE_BALL;
+      }),
+    )
+    .setPartyMemberFunc(
+      3,
+      getRandomPartyMemberFunc([Species.HOUNDOOM], TrainerSlot.TRAINER, true, p => {
+        p.generateAndPopulateMoveset();
+        p.pokeball = PokeballType.ULTRA_BALL;
+        p.formIndex = 1; // Mega Houndoom
+        p.generateName();
+      }),
+    )
+    .setPartyMemberFunc(
+      4,
+      getRandomPartyMemberFunc([Species.WEAVILE], TrainerSlot.TRAINER, true, p => {
+        p.setBoss(true, 2);
+        p.generateAndPopulateMoveset();
+        p.pokeball = PokeballType.ULTRA_BALL;
+        p.gender = Gender.MALE;
+      }),
+    )
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.DIALGA, Species.PALKIA], TrainerSlot.TRAINER, true, p => {
+        p.setBoss(true, 2);
+        p.generateAndPopulateMoveset();
+        p.pokeball = PokeballType.MASTER_BALL;
+      }),
+    ),
+  [TrainerType.GHETSIS]: new TrainerConfig(++t)
+    .setName("Ghetsis")
+    .initForEvilTeamLeader("Plasma Boss", [])
+    .setMixedBattleBgm("battle_plasma_boss")
+    .setVictoryBgm("victory_team_plasma")
+    .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.COFAGRIGUS]))
+    .setPartyMemberFunc(1, getRandomPartyMemberFunc([Species.SEISMITOAD]))
+    .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.GALVANTULA, Species.EELEKTROSS]))
+    .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.DRAPION, Species.TOXICROAK]))
+    .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.KINGAMBIT]))
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.HYDREIGON], TrainerSlot.TRAINER, true, p => {
+        p.setBoss(true, 2);
+        p.generateAndPopulateMoveset();
+        p.pokeball = PokeballType.ULTRA_BALL;
+        p.gender = Gender.MALE;
+      }),
+    ),
+  [TrainerType.GHETSIS_2]: new TrainerConfig(++t)
+    .setName("Ghetsis")
+    .initForEvilTeamLeader("Plasma Boss", [], true)
+    .setMixedBattleBgm("battle_plasma_boss")
+    .setVictoryBgm("victory_team_plasma")
+    .setPartyMemberFunc(
+      0,
+      getRandomPartyMemberFunc([Species.RUNERIGUS], TrainerSlot.TRAINER, true, p => {
+        p.setBoss(true, 2);
+        p.generateAndPopulateMoveset();
+      }),
+    )
+    .setPartyMemberFunc(
+      1,
+      getRandomPartyMemberFunc([Species.JELLICENT, Species.BASCULEGION], TrainerSlot.TRAINER, true, p => {
+        p.generateAndPopulateMoveset();
+        p.gender = Gender.MALE;
+        p.formIndex = 0;
+      }),
+    )
+    .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.KINGAMBIT]))
+    .setPartyMemberFunc(
+      3,
+      getRandomPartyMemberFunc([Species.VOLCARONA, Species.IRON_MOTH], TrainerSlot.TRAINER, true, p => {
+        p.generateAndPopulateMoveset();
+        p.pokeball = PokeballType.ROGUE_BALL;
+      }),
+    )
+    .setPartyMemberFunc(
+      4,
+      getRandomPartyMemberFunc([Species.HYDREIGON, Species.IRON_JUGULIS], TrainerSlot.TRAINER, true, p => {
+        p.setBoss(true, 2);
+        p.generateAndPopulateMoveset();
+        p.pokeball = PokeballType.ULTRA_BALL;
+        if (p.species.speciesId === Species.HYDREIGON) {
+          p.gender = Gender.MALE;
+        } else if (p.species.speciesId === Species.IRON_JUGULIS) {
+          p.gender = Gender.GENDERLESS;
+        }
+      }),
+    )
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.KYUREM], TrainerSlot.TRAINER, true, p => {
+        p.setBoss(true, 2);
+        p.generateAndPopulateMoveset();
+        p.pokeball = PokeballType.MASTER_BALL;
+      }),
+    ),
+  [TrainerType.LYSANDRE]: new TrainerConfig(++t)
+    .setName("Lysandre")
+    .initForEvilTeamLeader("Flare Boss", [])
+    .setMixedBattleBgm("battle_flare_boss")
+    .setVictoryBgm("victory_team_plasma")
+    .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.MIENSHAO]))
+    .setPartyMemberFunc(1, getRandomPartyMemberFunc([Species.HONCHKROW, Species.TALONFLAME]))
+    .setPartyMemberFunc(
+      2,
+      getRandomPartyMemberFunc([Species.PYROAR], TrainerSlot.TRAINER, true, p => {
+        p.generateAndPopulateMoveset();
+        p.gender = Gender.MALE;
+      }),
+    )
+    .setPartyMemberFunc(
+      3,
+      getRandomPartyMemberFunc([Species.DRAGALGE, Species.CLAWITZER], TrainerSlot.TRAINER, true, p => {
+        p.generateAndPopulateMoveset();
+        if (p.species.speciesId === Species.DRAGALGE) {
+          p.abilityIndex = 2; // Adaptability
+        } else if (p.species.speciesId === Species.CLAWITZER) {
+          p.abilityIndex = 0; // Mega Launcher
+        }
+      }),
+    )
+    .setPartyMemberFunc(
+      4,
+      getRandomPartyMemberFunc([Species.GALLADE], TrainerSlot.TRAINER, true, p => {
+        p.generateAndPopulateMoveset();
+        p.abilityIndex = 1; // Sharpness
+      }),
+    )
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.GYARADOS], TrainerSlot.TRAINER, true, p => {
+        p.setBoss(true, 2);
+        p.generateAndPopulateMoveset();
+        p.pokeball = PokeballType.ULTRA_BALL;
+        p.formIndex = 1; // Mega Gyarados
+        p.generateName();
+        p.gender = Gender.MALE;
+      }),
+    ),
+  [TrainerType.LYSANDRE_2]: new TrainerConfig(++t)
+    .setName("Lysandre")
+    .initForEvilTeamLeader("Flare Boss", [], true)
+    .setMixedBattleBgm("battle_flare_boss")
+    .setVictoryBgm("victory_team_plasma")
+    .setPartyMemberFunc(
+      0,
+      getRandomPartyMemberFunc([Species.PYROAR], TrainerSlot.TRAINER, true, p => {
+        p.setBoss(true, 2);
+        p.generateAndPopulateMoveset();
+        p.gender = Gender.MALE;
+      }),
+    )
+    .setPartyMemberFunc(
+      1,
+      getRandomPartyMemberFunc([Species.DRAGALGE, Species.CLAWITZER], TrainerSlot.TRAINER, true, p => {
+        p.generateAndPopulateMoveset();
+        if (p.species.speciesId === Species.DRAGALGE) {
+          p.abilityIndex = 2; // Adaptability
+        } else if (p.species.speciesId === Species.CLAWITZER) {
+          p.abilityIndex = 0; // Mega Launcher
+        }
+      }),
+    )
+    .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.AEGISLASH, Species.HISUI_GOODRA]))
+    .setPartyMemberFunc(
+      3,
+      getRandomPartyMemberFunc([Species.IRON_VALIANT], TrainerSlot.TRAINER, true, p => {
+        p.generateAndPopulateMoveset();
+        p.pokeball = PokeballType.ROGUE_BALL;
+      }),
+    )
+    .setPartyMemberFunc(
+      4,
+      getRandomPartyMemberFunc([Species.GYARADOS], TrainerSlot.TRAINER, true, p => {
+        p.setBoss(true, 2);
+        p.generateAndPopulateMoveset();
+        p.pokeball = PokeballType.ULTRA_BALL;
+        p.formIndex = 1; // Mega Gyarados
+        p.generateName();
+        p.gender = Gender.MALE;
+      }),
+    )
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.ZYGARDE], TrainerSlot.TRAINER, true, p => {
+        p.setBoss(true, 2);
+        p.generateAndPopulateMoveset();
+        p.pokeball = PokeballType.MASTER_BALL;
+        p.formIndex = 0; // 50% Forme, Aura Break
+      }),
+    ),
+  [TrainerType.LUSAMINE]: new TrainerConfig(++t)
+    .setName("Lusamine")
+    .initForEvilTeamLeader("Aether Boss", [])
+    .setMixedBattleBgm("battle_aether_boss")
+    .setVictoryBgm("victory_team_plasma")
+    .setPartyMemberFunc(
+      0,
+      getRandomPartyMemberFunc([Species.CLEFABLE], TrainerSlot.TRAINER, true, p => {
+        p.generateAndPopulateMoveset();
+        p.gender = Gender.FEMALE;
+      }),
+    )
+    .setPartyMemberFunc(1, getRandomPartyMemberFunc([Species.LILLIGANT, Species.HISUI_LILLIGANT]))
+    .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.MILOTIC, Species.PRIMARINA]))
+    .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.GALAR_SLOWBRO, Species.GALAR_SLOWKING]))
+    .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.BEWEAR]))
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.NIHILEGO], TrainerSlot.TRAINER, true, p => {
+        p.setBoss(true, 2);
+        p.generateAndPopulateMoveset();
+        p.pokeball = PokeballType.ROGUE_BALL;
+      }),
+    ),
+  [TrainerType.LUSAMINE_2]: new TrainerConfig(++t)
+    .setName("Lusamine")
+    .initForEvilTeamLeader("Aether Boss", [], true)
+    .setMixedBattleBgm("battle_aether_boss")
+    .setVictoryBgm("victory_team_plasma")
+    .setPartyMemberFunc(
+      0,
+      getRandomPartyMemberFunc([Species.CLEFABLE], TrainerSlot.TRAINER, true, p => {
+        p.setBoss(true, 2);
+        p.generateAndPopulateMoveset();
+        p.gender = Gender.FEMALE;
+      }),
+    )
+    .setPartyMemberFunc(1, getRandomPartyMemberFunc([Species.MILOTIC, Species.PRIMARINA]))
+    .setPartyMemberFunc(
+      2,
+      getRandomPartyMemberFunc([Species.SILVALLY], TrainerSlot.TRAINER, true, p => {
+        p.formIndex = randSeedInt(18); // Random Silvally Form
+        p.generateAndPopulateMoveset();
+        p.pokeball = PokeballType.ROGUE_BALL;
+        if (!p.moveset.some(move => !isNullOrUndefined(move) && move.moveId === Moves.MULTI_ATTACK)) {
+          // Check if Multi Attack is in the moveset, if not, replace the first move with Multi Attack.
+          p.moveset[0] = new PokemonMove(Moves.MULTI_ATTACK);
+        }
+      }),
+    )
+    .setPartyMemberFunc(
+      3,
+      getRandomPartyMemberFunc([Species.PHEROMOSA], TrainerSlot.TRAINER, true, p => {
+        p.generateAndPopulateMoveset();
+        p.pokeball = PokeballType.ROGUE_BALL;
+      }),
+    )
+    .setPartyMemberFunc(
+      4,
+      getRandomPartyMemberFunc([Species.NIHILEGO], TrainerSlot.TRAINER, true, p => {
+        p.setBoss(true, 2);
+        p.generateAndPopulateMoveset();
+        p.pokeball = PokeballType.ROGUE_BALL;
+      }),
+    )
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.NECROZMA], TrainerSlot.TRAINER, true, p => {
+        p.setBoss(true, 2);
+        p.formIndex = 2; // Dawn Wings
+        p.generateAndPopulateMoveset();
+        p.pokeball = PokeballType.MASTER_BALL;
+      }),
+    ),
+  [TrainerType.GUZMA]: new TrainerConfig(++t)
+    .setName("Guzma")
+    .initForEvilTeamLeader("Skull Boss", [])
+    .setMixedBattleBgm("battle_skull_boss")
+    .setVictoryBgm("victory_team_plasma")
+    .setPartyMemberFunc(
+      0,
+      getRandomPartyMemberFunc([Species.YANMEGA, Species.LOKIX], TrainerSlot.TRAINER, true, p => {
+        p.generateAndPopulateMoveset();
+        if (p.species.speciesId === Species.YANMEGA) {
+          p.abilityIndex = 1; // Tinted Lens
+        } else if (p.species.speciesId === Species.LOKIX) {
+          p.abilityIndex = 2; // Tinted Lens
+        }
+      }),
+    )
+    .setPartyMemberFunc(1, getRandomPartyMemberFunc([Species.HERACROSS]))
+    .setPartyMemberFunc(
+      2,
+      getRandomPartyMemberFunc([Species.SCIZOR, Species.KLEAVOR], TrainerSlot.TRAINER, true, p => {
+        p.generateAndPopulateMoveset();
+        if (p.species.speciesId === Species.SCIZOR) {
+          p.abilityIndex = 1; // Technician
+        } else if (p.species.speciesId === Species.KLEAVOR) {
+          p.abilityIndex = 2; // Sharpness
+        }
+      }),
+    )
+    .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.GALVANTULA, Species.VIKAVOLT]))
+    .setPartyMemberFunc(
+      4,
+      getRandomPartyMemberFunc([Species.PINSIR], TrainerSlot.TRAINER, true, p => {
+        p.generateAndPopulateMoveset();
+        p.formIndex = 1; // Mega Pinsir
+        p.pokeball = PokeballType.ULTRA_BALL;
+        p.generateName();
+      }),
+    )
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.GOLISOPOD], TrainerSlot.TRAINER, true, p => {
+        p.setBoss(true, 2);
+        p.generateAndPopulateMoveset();
+        p.gender = Gender.MALE;
+      }),
+    ),
+  [TrainerType.GUZMA_2]: new TrainerConfig(++t)
+    .setName("Guzma")
+    .initForEvilTeamLeader("Skull Boss", [], true)
+    .setMixedBattleBgm("battle_skull_boss")
+    .setVictoryBgm("victory_team_plasma")
+    .setPartyMemberFunc(
+      0,
+      getRandomPartyMemberFunc([Species.GOLISOPOD], TrainerSlot.TRAINER, true, p => {
+        p.setBoss(true, 2);
+        p.generateAndPopulateMoveset();
+        p.abilityIndex = 2; // Anticipation
+        p.gender = Gender.MALE;
+      }),
+    )
+    .setPartyMemberFunc(
+      1,
+      getRandomPartyMemberFunc([Species.BUZZWOLE], TrainerSlot.TRAINER, true, p => {
+        p.generateAndPopulateMoveset();
+        p.pokeball = PokeballType.ROGUE_BALL;
+      }),
+    )
+    .setPartyMemberFunc(
+      2,
+      getRandomPartyMemberFunc([Species.CRAWDAUNT, Species.HISUI_SAMUROTT], TrainerSlot.TRAINER, true, p => {
+        p.generateAndPopulateMoveset();
+        p.abilityIndex = 2; // Sharpness Hisuian Samurott, Adaptability Crawdaunt
+      }),
+    )
+    .setPartyMemberFunc(
+      3,
+      getRandomPartyMemberFunc([Species.XURKITREE], TrainerSlot.TRAINER, true, p => {
+        p.generateAndPopulateMoveset();
+        p.pokeball = PokeballType.ROGUE_BALL;
+      }),
+    )
+    .setPartyMemberFunc(
+      4,
+      getRandomPartyMemberFunc([Species.GENESECT], TrainerSlot.TRAINER, true, p => {
+        p.setBoss(true, 2);
+        p.generateAndPopulateMoveset();
+        p.pokeball = PokeballType.ULTRA_BALL;
+        p.formIndex = randSeedInt(4, 1); // Shock, Burn, Chill, or Douse Drive
+        if (!p.moveset.some(move => !isNullOrUndefined(move) && move.moveId === Moves.TECHNO_BLAST)) {
+          // Check if Techno Blast is in the moveset, if not, replace the third move with Techno Blast.
+          p.moveset[2] = new PokemonMove(Moves.TECHNO_BLAST);
+        }
+      }),
+    )
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.PINSIR], TrainerSlot.TRAINER, true, p => {
+        p.setBoss(true, 2);
+        p.formIndex = 1; // Mega Pinsir
+        p.generateAndPopulateMoveset();
+        p.generateName();
+        p.pokeball = PokeballType.ULTRA_BALL;
+      }),
+    ),
+  [TrainerType.ROSE]: new TrainerConfig(++t)
+    .setName("Rose")
+    .initForEvilTeamLeader("Macro Boss", [])
+    .setMixedBattleBgm("battle_macro_boss")
+    .setVictoryBgm("victory_team_plasma")
+    .setPartyMemberFunc(
+      0,
+      getRandomPartyMemberFunc([Species.ARCHALUDON], TrainerSlot.TRAINER, true, p => {
+        p.generateAndPopulateMoveset();
+        p.pokeball = PokeballType.ULTRA_BALL;
+      }),
+    )
+    .setPartyMemberFunc(
+      1,
+      getRandomPartyMemberFunc([Species.ESCAVALIER, Species.FERROTHORN], TrainerSlot.TRAINER, true, p => {
+        p.generateAndPopulateMoveset();
+        p.pokeball = PokeballType.ULTRA_BALL;
+      }),
+    )
+    .setPartyMemberFunc(
+      2,
+      getRandomPartyMemberFunc([Species.SIRFETCHD, Species.MR_RIME], TrainerSlot.TRAINER, true, p => {
+        p.generateAndPopulateMoveset();
+        p.pokeball = PokeballType.ULTRA_BALL;
+      }),
+    )
+    .setPartyMemberFunc(
+      3,
+      getRandomPartyMemberFunc([Species.CORVIKNIGHT], TrainerSlot.TRAINER, true, p => {
+        p.generateAndPopulateMoveset();
+        p.pokeball = PokeballType.ULTRA_BALL;
+      }),
+    )
+    .setPartyMemberFunc(
+      4,
+      getRandomPartyMemberFunc([Species.KLINKLANG, Species.PERRSERKER], TrainerSlot.TRAINER, true, p => {
+        p.generateAndPopulateMoveset();
+        p.pokeball = PokeballType.ULTRA_BALL;
+      }),
+    )
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.COPPERAJAH], TrainerSlot.TRAINER, true, p => {
+        p.setBoss(true, 2);
+        p.generateAndPopulateMoveset();
+        p.formIndex = 1; // G-Max Copperajah
+        p.generateName();
+        p.pokeball = PokeballType.ULTRA_BALL;
+        p.gender = Gender.FEMALE;
+      }),
+    ),
+  [TrainerType.ROSE_2]: new TrainerConfig(++t)
+    .setName("Rose")
+    .initForEvilTeamLeader("Macro Boss", [], true)
+    .setMixedBattleBgm("battle_macro_boss")
+    .setVictoryBgm("victory_team_plasma")
+    .setPartyMemberFunc(
+      0,
+      getRandomPartyMemberFunc([Species.ARCHALUDON], TrainerSlot.TRAINER, true, p => {
+        p.setBoss(true, 2);
+        p.generateAndPopulateMoveset();
+        p.pokeball = PokeballType.ULTRA_BALL;
+      }),
+    )
+    .setPartyMemberFunc(
+      1,
+      getRandomPartyMemberFunc([Species.AEGISLASH, Species.GHOLDENGO], TrainerSlot.TRAINER, true, p => {
+        p.generateAndPopulateMoveset();
+        p.pokeball = PokeballType.ULTRA_BALL;
+      }),
+    )
+    .setPartyMemberFunc(
+      2,
+      getRandomPartyMemberFunc([Species.DRACOZOLT, Species.DRACOVISH], TrainerSlot.TRAINER, true, p => {
+        p.generateAndPopulateMoveset();
+        p.pokeball = PokeballType.ULTRA_BALL;
+        p.abilityIndex = 1; // Strong Jaw Dracovish, Hustle Dracozolt
+      }),
+    )
+    .setPartyMemberFunc(
+      3,
+      getRandomPartyMemberFunc([Species.MELMETAL], TrainerSlot.TRAINER, true, p => {
+        p.generateAndPopulateMoveset();
+        p.pokeball = PokeballType.ULTRA_BALL;
+      }),
+    )
+    .setPartyMemberFunc(
+      4,
+      getRandomPartyMemberFunc(
+        [Species.GALAR_ARTICUNO, Species.GALAR_ZAPDOS, Species.GALAR_MOLTRES],
+        TrainerSlot.TRAINER,
+        true,
+        p => {
+          p.setBoss(true, 2);
+          p.generateAndPopulateMoveset();
+          p.pokeball = PokeballType.ULTRA_BALL;
+        },
+      ),
+    )
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.COPPERAJAH], TrainerSlot.TRAINER, true, p => {
+        p.setBoss(true, 2);
+        p.generateAndPopulateMoveset();
+        p.formIndex = 1; // G-Max Copperajah
+        p.generateName();
+        p.pokeball = PokeballType.ULTRA_BALL;
+        p.gender = Gender.FEMALE;
+      }),
+    ),
+  [TrainerType.PENNY]: new TrainerConfig(++t)
+    .setName("Cassiopeia")
+    .initForEvilTeamLeader("Star Boss", [])
+    .setMixedBattleBgm("battle_star_boss")
+    .setVictoryBgm("victory_team_plasma")
+    .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.JOLTEON, Species.LEAFEON]))
+    .setPartyMemberFunc(1, getRandomPartyMemberFunc([Species.VAPOREON, Species.UMBREON]))
+    .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.ESPEON, Species.GLACEON]))
+    .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.FLAREON]))
+    .setPartyMemberFunc(
+      4,
+      getRandomPartyMemberFunc([Species.SYLVEON], TrainerSlot.TRAINER, true, p => {
+        p.abilityIndex = 2; // Pixilate
+        p.generateAndPopulateMoveset();
+        p.gender = Gender.FEMALE;
+      }),
+    )
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.EEVEE], TrainerSlot.TRAINER, true, p => {
+        p.setBoss(true, 2);
+        p.generateAndPopulateMoveset();
+        p.formIndex = 2; // G-Max Eevee
+        p.pokeball = PokeballType.ULTRA_BALL;
+        p.generateName();
+      }),
+    )
+    .setInstantTera(4), // Tera Fairy Sylveon
+  [TrainerType.PENNY_2]: new TrainerConfig(++t)
+    .setName("Cassiopeia")
+    .initForEvilTeamLeader("Star Boss", [], true)
+    .setMixedBattleBgm("battle_star_boss")
+    .setVictoryBgm("victory_team_plasma")
+    .setPartyMemberFunc(
+      0,
+      getRandomPartyMemberFunc([Species.SYLVEON], TrainerSlot.TRAINER, true, p => {
+        p.setBoss(true, 2);
+        p.abilityIndex = 2; // Pixilate
+        p.generateAndPopulateMoveset();
+        p.gender = Gender.FEMALE;
+      }),
+    )
+    .setPartyMemberFunc(
+      1,
+      getRandomPartyMemberFunc([Species.ROTOM], TrainerSlot.TRAINER, true, p => {
+        p.generateAndPopulateMoveset();
+        p.formIndex = randSeedInt(5, 1); // Heat, Wash, Frost, Fan, or Mow
+      }),
+    )
+    .setPartyMemberFunc(
+      2,
+      getRandomPartyMemberFunc([Species.RAIKOU, Species.ENTEI, Species.SUICUNE], TrainerSlot.TRAINER, true, p => {
+        p.generateAndPopulateMoveset();
+        p.pokeball = PokeballType.ULTRA_BALL;
+      }),
+    )
+    .setPartyMemberFunc(
+      3,
+      getRandomPartyMemberFunc([Species.REVAVROOM], TrainerSlot.TRAINER, true, p => {
+        p.formIndex = randSeedInt(5, 1); // Random Starmobile form
+        p.generateAndPopulateMoveset();
+        p.pokeball = PokeballType.ROGUE_BALL;
+      }),
+    )
+    .setPartyMemberFunc(
+      4,
+      getRandomPartyMemberFunc([Species.ZAMAZENTA], TrainerSlot.TRAINER, true, p => {
+        p.setBoss(true, 2);
+        p.generateAndPopulateMoveset();
+        p.pokeball = PokeballType.MASTER_BALL;
+      }),
+    )
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.EEVEE], TrainerSlot.TRAINER, true, p => {
+        p.setBoss(true, 2);
+        p.generateAndPopulateMoveset();
+        p.formIndex = 2;
+        p.generateName();
+        p.pokeball = PokeballType.ULTRA_BALL;
+      }),
+    )
+    .setInstantTera(0), // Tera Fairy Sylveon
+  [TrainerType.BUCK]: new TrainerConfig(++t)
+    .setName("Buck")
+    .initForStatTrainer(true)
+    .setPartyMemberFunc(
+      0,
+      getRandomPartyMemberFunc([Species.CLAYDOL], TrainerSlot.TRAINER, true, p => {
+        p.setBoss(true, 3);
+        p.generateAndPopulateMoveset();
+        p.pokeball = PokeballType.ULTRA_BALL;
+      }),
+    )
+    .setPartyMemberFunc(
+      1,
+      getRandomPartyMemberFunc([Species.VENUSAUR, Species.COALOSSAL], TrainerSlot.TRAINER, true, p => {
+        p.generateAndPopulateMoveset();
+        p.pokeball = PokeballType.GREAT_BALL;
+        if (p.species.speciesId === Species.VENUSAUR) {
+          p.formIndex = 2; // Gmax
+          p.abilityIndex = 2; // Venusaur gets Chlorophyll
+        } else {
+          p.formIndex = 1; // Gmax
+        }
+        p.generateName();
+      }),
+    )
+    .setPartyMemberFunc(
+      2,
+      getRandomPartyMemberFunc([Species.AGGRON], TrainerSlot.TRAINER, true, p => {
+        p.generateAndPopulateMoveset();
+        p.formIndex = 1; // Mega
+        p.generateName();
+      }),
+    )
+    .setPartyMemberFunc(
+      3,
+      getRandomPartyMemberFunc([Species.TORKOAL], TrainerSlot.TRAINER, true, p => {
+        p.generateAndPopulateMoveset();
+        p.abilityIndex = 1; // Drought
+      }),
+    )
+    .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.GREAT_TUSK], TrainerSlot.TRAINER, true))
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.HEATRAN], TrainerSlot.TRAINER, true, p => {
+        p.setBoss(true, 2);
+        p.generateAndPopulateMoveset();
+        p.pokeball = PokeballType.MASTER_BALL;
+      }),
+    ),
+  [TrainerType.CHERYL]: new TrainerConfig(++t)
+    .setName("Cheryl")
+    .initForStatTrainer()
+    .setPartyMemberFunc(
+      0,
+      getRandomPartyMemberFunc([Species.BLISSEY], TrainerSlot.TRAINER, true, p => {
+        p.setBoss(true, 3);
+        p.generateAndPopulateMoveset();
+        p.pokeball = PokeballType.ULTRA_BALL;
+      }),
+    )
+    .setPartyMemberFunc(
+      1,
+      getRandomPartyMemberFunc([Species.SNORLAX, Species.LAPRAS], TrainerSlot.TRAINER, true, p => {
+        p.generateAndPopulateMoveset();
+        p.pokeball = PokeballType.GREAT_BALL;
+        p.formIndex = 1; // Gmax
+        p.generateName();
+      }),
+    )
+    .setPartyMemberFunc(
+      2,
+      getRandomPartyMemberFunc([Species.AUDINO], TrainerSlot.TRAINER, true, p => {
+        p.generateAndPopulateMoveset();
+        p.formIndex = 1; // Mega
+        p.generateName();
+      }),
+    )
+    .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.GOODRA], TrainerSlot.TRAINER, true))
+    .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.IRON_HANDS], TrainerSlot.TRAINER, true))
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.CRESSELIA, Species.ENAMORUS], TrainerSlot.TRAINER, true, p => {
+        p.setBoss(true, 2);
+        p.generateAndPopulateMoveset();
+        if (p.species.speciesId === Species.ENAMORUS) {
+          p.formIndex = 1; // Therian
+          p.generateName();
+        }
+        p.pokeball = PokeballType.MASTER_BALL;
+      }),
+    ),
+  [TrainerType.MARLEY]: new TrainerConfig(++t)
+    .setName("Marley")
+    .initForStatTrainer()
+    .setPartyMemberFunc(
+      0,
+      getRandomPartyMemberFunc([Species.ARCANINE], TrainerSlot.TRAINER, true, p => {
+        p.setBoss(true, 3);
+        p.generateAndPopulateMoveset();
+        p.pokeball = PokeballType.ULTRA_BALL;
+      }),
+    )
+    .setPartyMemberFunc(
+      1,
+      getRandomPartyMemberFunc([Species.CINDERACE, Species.INTELEON], TrainerSlot.TRAINER, true, p => {
+        p.generateAndPopulateMoveset();
+        p.pokeball = PokeballType.GREAT_BALL;
+        p.formIndex = 1; // Gmax
+        p.generateName();
+      }),
+    )
+    .setPartyMemberFunc(
+      2,
+      getRandomPartyMemberFunc([Species.AERODACTYL], TrainerSlot.TRAINER, true, p => {
+        p.generateAndPopulateMoveset();
+        p.formIndex = 1; // Mega
+        p.generateName();
+      }),
+    )
+    .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.DRAGAPULT], TrainerSlot.TRAINER, true))
+    .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.IRON_BUNDLE], TrainerSlot.TRAINER, true))
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.REGIELEKI], TrainerSlot.TRAINER, true, p => {
+        p.setBoss(true, 2);
+        p.generateAndPopulateMoveset();
+        p.pokeball = PokeballType.MASTER_BALL;
+      }),
+    ),
+  [TrainerType.MIRA]: new TrainerConfig(++t)
+    .setName("Mira")
+    .initForStatTrainer()
+    .setPartyMemberFunc(
+      0,
+      getRandomPartyMemberFunc([Species.ALAKAZAM], TrainerSlot.TRAINER, true, p => {
+        p.setBoss(true, 2);
+        p.generateAndPopulateMoveset();
+        p.formIndex = 1;
+        p.pokeball = PokeballType.ULTRA_BALL;
+        p.generateName();
+      }),
+    )
+    .setPartyMemberFunc(
+      1,
+      getRandomPartyMemberFunc([Species.GENGAR, Species.HATTERENE], TrainerSlot.TRAINER, true, p => {
+        p.generateAndPopulateMoveset();
+        p.pokeball = PokeballType.GREAT_BALL;
+        p.formIndex = p.species.speciesId === Species.GENGAR ? 2 : 1; // Gmax
+        p.generateName();
+      }),
+    )
+    .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.FLUTTER_MANE], TrainerSlot.TRAINER, true))
+    .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.HYDREIGON], TrainerSlot.TRAINER, true))
+    .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.MAGNEZONE], TrainerSlot.TRAINER, true))
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.LATIOS, Species.LATIAS], TrainerSlot.TRAINER, true, p => {
+        p.setBoss(true, 2);
+        p.generateAndPopulateMoveset();
+        p.pokeball = PokeballType.MASTER_BALL;
+      }),
+    ),
+  [TrainerType.RILEY]: new TrainerConfig(++t)
+    .setName("Riley")
+    .initForStatTrainer(true)
+    .setPartyMemberFunc(
+      0,
+      getRandomPartyMemberFunc([Species.LUCARIO], TrainerSlot.TRAINER, true, p => {
+        p.setBoss(true, 2);
+        p.generateAndPopulateMoveset();
+        p.formIndex = 1;
+        p.pokeball = PokeballType.ULTRA_BALL;
+        p.generateName();
+      }),
+    )
+    .setPartyMemberFunc(
+      1,
+      getRandomPartyMemberFunc([Species.RILLABOOM, Species.CENTISKORCH], TrainerSlot.TRAINER, true, p => {
+        p.generateAndPopulateMoveset();
+        p.pokeball = PokeballType.GREAT_BALL;
+        p.formIndex = 1; // Gmax
+        p.generateName();
+      }),
+    )
+    .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.TYRANITAR], TrainerSlot.TRAINER, true))
+    .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.ROARING_MOON], TrainerSlot.TRAINER, true))
+    .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.URSALUNA], TrainerSlot.TRAINER, true))
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.REGIGIGAS, Species.LANDORUS], TrainerSlot.TRAINER, true, p => {
+        p.setBoss(true, 2);
+        p.generateAndPopulateMoveset();
+        if (p.species.speciesId === Species.LANDORUS) {
+          p.formIndex = 1; // Therian
+          p.generateName();
+        }
+        p.pokeball = PokeballType.MASTER_BALL;
+      }),
+    ),
+  [TrainerType.VICTOR]: new TrainerConfig(++t)
+    .setTitle("The Winstrates")
+    .setLocalizedName("Victor")
+    .setMoneyMultiplier(1) // The Winstrate trainers have total money multiplier of 6
+    .setPartyTemplates(trainerPartyTemplates.ONE_AVG_ONE_STRONG),
+  [TrainerType.VICTORIA]: new TrainerConfig(++t)
+    .setTitle("The Winstrates")
+    .setLocalizedName("Victoria")
+    .setMoneyMultiplier(1)
+    .setPartyTemplates(trainerPartyTemplates.ONE_AVG_ONE_STRONG),
+  [TrainerType.VIVI]: new TrainerConfig(++t)
+    .setTitle("The Winstrates")
+    .setLocalizedName("Vivi")
+    .setMoneyMultiplier(1)
+    .setPartyTemplates(trainerPartyTemplates.TWO_AVG_ONE_STRONG),
+  [TrainerType.VICKY]: new TrainerConfig(++t)
+    .setTitle("The Winstrates")
+    .setLocalizedName("Vicky")
+    .setMoneyMultiplier(1)
+    .setPartyTemplates(trainerPartyTemplates.ONE_AVG),
+  [TrainerType.VITO]: new TrainerConfig(++t)
+    .setTitle("The Winstrates")
+    .setLocalizedName("Vito")
+    .setMoneyMultiplier(2)
+    .setPartyTemplates(
+      new TrainerPartyCompoundTemplate(
+        new TrainerPartyTemplate(3, PartyMemberStrength.AVERAGE),
+        new TrainerPartyTemplate(2, PartyMemberStrength.STRONG),
+      ),
+    ),
+  [TrainerType.BUG_TYPE_SUPERFAN]: new TrainerConfig(++t)
+    .setMoneyMultiplier(2.25)
+    .setEncounterBgm(TrainerType.ACE_TRAINER)
+    .setPartyTemplates(new TrainerPartyTemplate(2, PartyMemberStrength.AVERAGE)),
+  [TrainerType.EXPERT_POKEMON_BREEDER]: new TrainerConfig(++t)
+    .setMoneyMultiplier(3)
+    .setEncounterBgm(TrainerType.ACE_TRAINER)
+    .setLocalizedName("Expert Pokemon Breeder")
+    .setPartyTemplates(new TrainerPartyTemplate(3, PartyMemberStrength.AVERAGE)),
+  [TrainerType.FUTURE_SELF_M]: new TrainerConfig(++t)
+    .setMoneyMultiplier(0)
+    .setEncounterBgm("mystery_encounter_weird_dream")
+    .setBattleBgm("mystery_encounter_weird_dream")
+    .setMixedBattleBgm("mystery_encounter_weird_dream")
+    .setVictoryBgm("mystery_encounter_weird_dream")
+    .setLocalizedName("Future Self M")
+    .setPartyTemplates(new TrainerPartyTemplate(6, PartyMemberStrength.STRONG)),
+  [TrainerType.FUTURE_SELF_F]: new TrainerConfig(++t)
+    .setMoneyMultiplier(0)
+    .setEncounterBgm("mystery_encounter_weird_dream")
+    .setBattleBgm("mystery_encounter_weird_dream")
+    .setMixedBattleBgm("mystery_encounter_weird_dream")
+    .setVictoryBgm("mystery_encounter_weird_dream")
+    .setLocalizedName("Future Self F")
+    .setPartyTemplates(new TrainerPartyTemplate(6, PartyMemberStrength.STRONG)),
+};
diff --git a/src/data/trainers/typedefs.ts b/src/data/trainers/typedefs.ts
new file mode 100644
index 00000000000..c6d286e961e
--- /dev/null
+++ b/src/data/trainers/typedefs.ts
@@ -0,0 +1,22 @@
+import type { EnemyPokemon } from "#app/field/pokemon";
+import type { PersistentModifier } from "#app/modifier/modifier";
+import type { PartyMemberStrength } from "#enums/party-member-strength";
+import type { Species } from "#enums/species";
+import type { TrainerConfig } from "./trainer-config";
+import type { TrainerPartyTemplate } from "./TrainerPartyTemplate";
+
+export type PartyTemplateFunc = () => TrainerPartyTemplate;
+export type PartyMemberFunc = (level: number, strength: PartyMemberStrength) => EnemyPokemon;
+export type GenModifiersFunc = (party: EnemyPokemon[]) => PersistentModifier[];
+export type GenAIFunc = (party: EnemyPokemon[]) => void;
+
+export interface TrainerTierPools {
+  [key: number]: Species[];
+}
+export interface TrainerConfigs {
+  [key: number]: TrainerConfig;
+}
+
+export interface PartyMemberFuncs {
+  [key: number]: PartyMemberFunc;
+}
diff --git a/src/data/type.ts b/src/data/type.ts
index 498394bf90e..c9bf346fb85 100644
--- a/src/data/type.ts
+++ b/src/data/type.ts
@@ -1,266 +1,266 @@
-import { Type } from "#enums/type";
+import { PokemonType } from "#enums/pokemon-type";
 
 export type TypeDamageMultiplier = 0 | 0.125 | 0.25 | 0.5 | 1 | 2 | 4 | 8;
 
-export function getTypeDamageMultiplier(attackType: Type, defType: Type): TypeDamageMultiplier {
-  if (attackType === Type.UNKNOWN || defType === Type.UNKNOWN) {
+export function getTypeDamageMultiplier(attackType: PokemonType, defType: PokemonType): TypeDamageMultiplier {
+  if (attackType === PokemonType.UNKNOWN || defType === PokemonType.UNKNOWN) {
     return 1;
   }
 
   switch (defType) {
-    case Type.NORMAL:
+    case PokemonType.NORMAL:
       switch (attackType) {
-        case Type.FIGHTING:
+        case PokemonType.FIGHTING:
           return 2;
-        case Type.GHOST:
+        case PokemonType.GHOST:
           return 0;
         default:
           return 1;
       }
-    case Type.FIGHTING:
+    case PokemonType.FIGHTING:
       switch (attackType) {
-        case Type.FLYING:
-        case Type.PSYCHIC:
-        case Type.FAIRY:
+        case PokemonType.FLYING:
+        case PokemonType.PSYCHIC:
+        case PokemonType.FAIRY:
           return 2;
-        case Type.ROCK:
-        case Type.BUG:
-        case Type.DARK:
+        case PokemonType.ROCK:
+        case PokemonType.BUG:
+        case PokemonType.DARK:
           return 0.5;
         default:
           return 1;
       }
-    case Type.FLYING:
+    case PokemonType.FLYING:
       switch (attackType) {
-        case Type.ROCK:
-        case Type.ELECTRIC:
-        case Type.ICE:
+        case PokemonType.ROCK:
+        case PokemonType.ELECTRIC:
+        case PokemonType.ICE:
           return 2;
-        case Type.FIGHTING:
-        case Type.BUG:
-        case Type.GRASS:
+        case PokemonType.FIGHTING:
+        case PokemonType.BUG:
+        case PokemonType.GRASS:
           return 0.5;
-        case Type.GROUND:
+        case PokemonType.GROUND:
           return 0;
         default:
           return 1;
       }
-    case Type.POISON:
+    case PokemonType.POISON:
       switch (attackType) {
-        case Type.GROUND:
-        case Type.PSYCHIC:
+        case PokemonType.GROUND:
+        case PokemonType.PSYCHIC:
           return 2;
-        case Type.FIGHTING:
-        case Type.POISON:
-        case Type.BUG:
-        case Type.GRASS:
-        case Type.FAIRY:
+        case PokemonType.FIGHTING:
+        case PokemonType.POISON:
+        case PokemonType.BUG:
+        case PokemonType.GRASS:
+        case PokemonType.FAIRY:
           return 0.5;
         default:
           return 1;
       }
-    case Type.GROUND:
+    case PokemonType.GROUND:
       switch (attackType) {
-        case Type.WATER:
-        case Type.GRASS:
-        case Type.ICE:
+        case PokemonType.WATER:
+        case PokemonType.GRASS:
+        case PokemonType.ICE:
           return 2;
-        case Type.POISON:
-        case Type.ROCK:
+        case PokemonType.POISON:
+        case PokemonType.ROCK:
           return 0.5;
-        case Type.ELECTRIC:
+        case PokemonType.ELECTRIC:
           return 0;
         default:
           return 1;
       }
-    case Type.ROCK:
+    case PokemonType.ROCK:
       switch (attackType) {
-        case Type.FIGHTING:
-        case Type.GROUND:
-        case Type.STEEL:
-        case Type.WATER:
-        case Type.GRASS:
+        case PokemonType.FIGHTING:
+        case PokemonType.GROUND:
+        case PokemonType.STEEL:
+        case PokemonType.WATER:
+        case PokemonType.GRASS:
           return 2;
-        case Type.NORMAL:
-        case Type.FLYING:
-        case Type.POISON:
-        case Type.FIRE:
+        case PokemonType.NORMAL:
+        case PokemonType.FLYING:
+        case PokemonType.POISON:
+        case PokemonType.FIRE:
           return 0.5;
         default:
           return 1;
       }
-    case Type.BUG:
+    case PokemonType.BUG:
       switch (attackType) {
-        case Type.FLYING:
-        case Type.ROCK:
-        case Type.FIRE:
+        case PokemonType.FLYING:
+        case PokemonType.ROCK:
+        case PokemonType.FIRE:
           return 2;
-        case Type.FIGHTING:
-        case Type.GROUND:
-        case Type.GRASS:
+        case PokemonType.FIGHTING:
+        case PokemonType.GROUND:
+        case PokemonType.GRASS:
           return 0.5;
         default:
           return 1;
       }
-    case Type.GHOST:
+    case PokemonType.GHOST:
       switch (attackType) {
-        case Type.GHOST:
-        case Type.DARK:
+        case PokemonType.GHOST:
+        case PokemonType.DARK:
           return 2;
-        case Type.POISON:
-        case Type.BUG:
+        case PokemonType.POISON:
+        case PokemonType.BUG:
           return 0.5;
-        case Type.NORMAL:
-        case Type.FIGHTING:
+        case PokemonType.NORMAL:
+        case PokemonType.FIGHTING:
           return 0;
         default:
           return 1;
       }
-    case Type.STEEL:
+    case PokemonType.STEEL:
       switch (attackType) {
-        case Type.FIGHTING:
-        case Type.GROUND:
-        case Type.FIRE:
+        case PokemonType.FIGHTING:
+        case PokemonType.GROUND:
+        case PokemonType.FIRE:
           return 2;
-        case Type.NORMAL:
-        case Type.FLYING:
-        case Type.ROCK:
-        case Type.BUG:
-        case Type.STEEL:
-        case Type.GRASS:
-        case Type.PSYCHIC:
-        case Type.ICE:
-        case Type.DRAGON:
-        case Type.FAIRY:
+        case PokemonType.NORMAL:
+        case PokemonType.FLYING:
+        case PokemonType.ROCK:
+        case PokemonType.BUG:
+        case PokemonType.STEEL:
+        case PokemonType.GRASS:
+        case PokemonType.PSYCHIC:
+        case PokemonType.ICE:
+        case PokemonType.DRAGON:
+        case PokemonType.FAIRY:
           return 0.5;
-        case Type.POISON:
+        case PokemonType.POISON:
           return 0;
         default:
           return 1;
       }
-    case Type.FIRE:
+    case PokemonType.FIRE:
       switch (attackType) {
-        case Type.GROUND:
-        case Type.ROCK:
-        case Type.WATER:
+        case PokemonType.GROUND:
+        case PokemonType.ROCK:
+        case PokemonType.WATER:
           return 2;
-        case Type.BUG:
-        case Type.STEEL:
-        case Type.FIRE:
-        case Type.GRASS:
-        case Type.ICE:
-        case Type.FAIRY:
+        case PokemonType.BUG:
+        case PokemonType.STEEL:
+        case PokemonType.FIRE:
+        case PokemonType.GRASS:
+        case PokemonType.ICE:
+        case PokemonType.FAIRY:
           return 0.5;
         default:
           return 1;
       }
-    case Type.WATER:
+    case PokemonType.WATER:
       switch (attackType) {
-        case Type.GRASS:
-        case Type.ELECTRIC:
+        case PokemonType.GRASS:
+        case PokemonType.ELECTRIC:
           return 2;
-        case Type.STEEL:
-        case Type.FIRE:
-        case Type.WATER:
-        case Type.ICE:
+        case PokemonType.STEEL:
+        case PokemonType.FIRE:
+        case PokemonType.WATER:
+        case PokemonType.ICE:
           return 0.5;
         default:
           return 1;
       }
-    case Type.GRASS:
+    case PokemonType.GRASS:
       switch (attackType) {
-        case Type.FLYING:
-        case Type.POISON:
-        case Type.BUG:
-        case Type.FIRE:
-        case Type.ICE:
+        case PokemonType.FLYING:
+        case PokemonType.POISON:
+        case PokemonType.BUG:
+        case PokemonType.FIRE:
+        case PokemonType.ICE:
           return 2;
-        case Type.GROUND:
-        case Type.WATER:
-        case Type.GRASS:
-        case Type.ELECTRIC:
+        case PokemonType.GROUND:
+        case PokemonType.WATER:
+        case PokemonType.GRASS:
+        case PokemonType.ELECTRIC:
           return 0.5;
         default:
           return 1;
       }
-    case Type.ELECTRIC:
+    case PokemonType.ELECTRIC:
       switch (attackType) {
-        case Type.GROUND:
+        case PokemonType.GROUND:
           return 2;
-        case Type.FLYING:
-        case Type.STEEL:
-        case Type.ELECTRIC:
+        case PokemonType.FLYING:
+        case PokemonType.STEEL:
+        case PokemonType.ELECTRIC:
           return 0.5;
         default:
           return 1;
       }
-    case Type.PSYCHIC:
+    case PokemonType.PSYCHIC:
       switch (attackType) {
-        case Type.BUG:
-        case Type.GHOST:
-        case Type.DARK:
+        case PokemonType.BUG:
+        case PokemonType.GHOST:
+        case PokemonType.DARK:
           return 2;
-        case Type.FIGHTING:
-        case Type.PSYCHIC:
+        case PokemonType.FIGHTING:
+        case PokemonType.PSYCHIC:
           return 0.5;
         default:
           return 1;
       }
-    case Type.ICE:
+    case PokemonType.ICE:
       switch (attackType) {
-        case Type.FIGHTING:
-        case Type.ROCK:
-        case Type.STEEL:
-        case Type.FIRE:
+        case PokemonType.FIGHTING:
+        case PokemonType.ROCK:
+        case PokemonType.STEEL:
+        case PokemonType.FIRE:
           return 2;
-        case Type.ICE:
+        case PokemonType.ICE:
           return 0.5;
         default:
           return 1;
       }
-    case Type.DRAGON:
+    case PokemonType.DRAGON:
       switch (attackType) {
-        case Type.ICE:
-        case Type.DRAGON:
-        case Type.FAIRY:
+        case PokemonType.ICE:
+        case PokemonType.DRAGON:
+        case PokemonType.FAIRY:
           return 2;
-        case Type.FIRE:
-        case Type.WATER:
-        case Type.GRASS:
-        case Type.ELECTRIC:
+        case PokemonType.FIRE:
+        case PokemonType.WATER:
+        case PokemonType.GRASS:
+        case PokemonType.ELECTRIC:
           return 0.5;
         default:
           return 1;
       }
-    case Type.DARK:
+    case PokemonType.DARK:
       switch (attackType) {
-        case Type.FIGHTING:
-        case Type.BUG:
-        case Type.FAIRY:
+        case PokemonType.FIGHTING:
+        case PokemonType.BUG:
+        case PokemonType.FAIRY:
           return 2;
-        case Type.GHOST:
-        case Type.DARK:
+        case PokemonType.GHOST:
+        case PokemonType.DARK:
           return 0.5;
-        case Type.PSYCHIC:
+        case PokemonType.PSYCHIC:
           return 0;
         default:
           return 1;
       }
-    case Type.FAIRY:
+    case PokemonType.FAIRY:
       switch (attackType) {
-        case Type.POISON:
-        case Type.STEEL:
+        case PokemonType.POISON:
+        case PokemonType.STEEL:
           return 2;
-        case Type.FIGHTING:
-        case Type.BUG:
-        case Type.DARK:
+        case PokemonType.FIGHTING:
+        case PokemonType.BUG:
+        case PokemonType.DARK:
           return 0.5;
-        case Type.DRAGON:
+        case PokemonType.DRAGON:
           return 0;
         default:
           return 1;
       }
-    case Type.STELLAR:
+    case PokemonType.STELLAR:
       return 1;
   }
 
@@ -271,7 +271,10 @@ export function getTypeDamageMultiplier(attackType: Type, defType: Type): TypeDa
  * Retrieve the color corresponding to a specific damage multiplier
  * @returns A color or undefined if the default color should be used
  */
-export function getTypeDamageMultiplierColor(multiplier: TypeDamageMultiplier, side: "defense" | "offense"): string | undefined {
+export function getTypeDamageMultiplierColor(
+  multiplier: TypeDamageMultiplier,
+  side: "defense" | "offense",
+): string | undefined {
   if (side === "offense") {
     switch (multiplier) {
       case 0:
@@ -291,7 +294,8 @@ export function getTypeDamageMultiplierColor(multiplier: TypeDamageMultiplier, s
       case 8:
         return "#52C200";
     }
-  } else if (side === "defense") {
+  }
+  if (side === "defense") {
     switch (multiplier) {
       case 0:
         return "#B1B100";
@@ -313,47 +317,47 @@ export function getTypeDamageMultiplierColor(multiplier: TypeDamageMultiplier, s
   }
 }
 
-export function getTypeRgb(type: Type): [ number, number, number ] {
+export function getTypeRgb(type: PokemonType): [number, number, number] {
   switch (type) {
-    case Type.NORMAL:
-      return [ 168, 168, 120 ];
-    case Type.FIGHTING:
-      return [ 192, 48, 40 ];
-    case Type.FLYING:
-      return [ 168, 144, 240 ];
-    case Type.POISON:
-      return [ 160, 64, 160 ];
-    case Type.GROUND:
-      return [ 224, 192, 104 ];
-    case Type.ROCK:
-      return [ 184, 160, 56 ];
-    case Type.BUG:
-      return [ 168, 184, 32 ];
-    case Type.GHOST:
-      return [ 112, 88, 152 ];
-    case Type.STEEL:
-      return [ 184, 184, 208 ];
-    case Type.FIRE:
-      return [ 240, 128, 48 ];
-    case Type.WATER:
-      return [ 104, 144, 240 ];
-    case Type.GRASS:
-      return [ 120, 200, 80 ];
-    case Type.ELECTRIC:
-      return [ 248, 208, 48 ];
-    case Type.PSYCHIC:
-      return [ 248, 88, 136 ];
-    case Type.ICE:
-      return [ 152, 216, 216 ];
-    case Type.DRAGON:
-      return [ 112, 56, 248 ];
-    case Type.DARK:
-      return [ 112, 88, 72 ];
-    case Type.FAIRY:
-      return [ 232, 136, 200 ];
-    case Type.STELLAR:
-      return [ 255, 255, 255 ];
+    case PokemonType.NORMAL:
+      return [168, 168, 120];
+    case PokemonType.FIGHTING:
+      return [192, 48, 40];
+    case PokemonType.FLYING:
+      return [168, 144, 240];
+    case PokemonType.POISON:
+      return [160, 64, 160];
+    case PokemonType.GROUND:
+      return [224, 192, 104];
+    case PokemonType.ROCK:
+      return [184, 160, 56];
+    case PokemonType.BUG:
+      return [168, 184, 32];
+    case PokemonType.GHOST:
+      return [112, 88, 152];
+    case PokemonType.STEEL:
+      return [184, 184, 208];
+    case PokemonType.FIRE:
+      return [240, 128, 48];
+    case PokemonType.WATER:
+      return [104, 144, 240];
+    case PokemonType.GRASS:
+      return [120, 200, 80];
+    case PokemonType.ELECTRIC:
+      return [248, 208, 48];
+    case PokemonType.PSYCHIC:
+      return [248, 88, 136];
+    case PokemonType.ICE:
+      return [152, 216, 216];
+    case PokemonType.DRAGON:
+      return [112, 56, 248];
+    case PokemonType.DARK:
+      return [112, 88, 72];
+    case PokemonType.FAIRY:
+      return [232, 136, 200];
+    case PokemonType.STELLAR:
+      return [255, 255, 255];
     default:
-      return [ 0, 0, 0 ];
+      return [0, 0, 0];
   }
 }
diff --git a/src/data/variant.ts b/src/data/variant.ts
deleted file mode 100644
index 13c11b0bb40..00000000000
--- a/src/data/variant.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import { VariantTier } from "#app/enums/variant-tier";
-
-export type Variant = 0 | 1 | 2;
-
-export type VariantSet = [Variant, Variant, Variant];
-
-export const variantData: any = {};
-
-export const variantColorCache = {};
-
-export function getVariantTint(variant: Variant): number {
-  switch (variant) {
-    case 0:
-      return 0xf8c020;
-    case 1:
-      return 0x20f8f0;
-    case 2:
-      return 0xe81048;
-  }
-}
-
-export function getVariantIcon(variant: Variant): number {
-  switch (variant) {
-    case 0:
-      return VariantTier.STANDARD;
-    case 1:
-      return VariantTier.RARE;
-    case 2:
-      return VariantTier.EPIC;
-  }
-}
diff --git a/src/data/weather.ts b/src/data/weather.ts
index 0c90f381130..be9107798df 100644
--- a/src/data/weather.ts
+++ b/src/data/weather.ts
@@ -2,15 +2,16 @@ import { Biome } from "#enums/biome";
 import { WeatherType } from "#enums/weather-type";
 import { getPokemonNameWithAffix } from "../messages";
 import type Pokemon from "../field/pokemon";
-import { Type } from "#enums/type";
-import type Move from "./move";
-import { AttackMove } from "./move";
-import * as Utils from "../utils";
-import { SuppressWeatherEffectAbAttr } from "./ability";
+import { PokemonType } from "#enums/pokemon-type";
+import type Move from "./moves/move";
+import { AttackMove } from "./moves/move";
+import { randSeedInt } from "#app/utils/common";
+import { SuppressWeatherEffectAbAttr } from "./abilities/ability";
 import { TerrainType, getTerrainName } from "./terrain";
 import i18next from "i18next";
 import { globalScene } from "#app/global-scene";
 import type { Arena } from "#app/field/arena";
+import { timedEventManager } from "#app/global-event-manager";
 
 export class Weather {
   public weatherType: WeatherType;
@@ -53,34 +54,34 @@ export class Weather {
     return false;
   }
 
-  isTypeDamageImmune(type: Type): boolean {
+  isTypeDamageImmune(type: PokemonType): boolean {
     switch (this.weatherType) {
       case WeatherType.SANDSTORM:
-        return type === Type.GROUND || type === Type.ROCK || type === Type.STEEL;
+        return type === PokemonType.GROUND || type === PokemonType.ROCK || type === PokemonType.STEEL;
       case WeatherType.HAIL:
-        return type === Type.ICE;
+        return type === PokemonType.ICE;
     }
 
     return false;
   }
 
-  getAttackTypeMultiplier(attackType: Type): number {
+  getAttackTypeMultiplier(attackType: PokemonType): number {
     switch (this.weatherType) {
       case WeatherType.SUNNY:
       case WeatherType.HARSH_SUN:
-        if (attackType === Type.FIRE) {
+        if (attackType === PokemonType.FIRE) {
           return 1.5;
         }
-        if (attackType === Type.WATER) {
+        if (attackType === PokemonType.WATER) {
           return 0.5;
         }
         break;
       case WeatherType.RAIN:
       case WeatherType.HEAVY_RAIN:
-        if (attackType === Type.FIRE) {
+        if (attackType === PokemonType.FIRE) {
           return 0.5;
         }
-        if (attackType === Type.WATER) {
+        if (attackType === PokemonType.WATER) {
           return 1.5;
         }
         break;
@@ -94,9 +95,9 @@ export class Weather {
 
     switch (this.weatherType) {
       case WeatherType.HARSH_SUN:
-        return move instanceof AttackMove && moveType === Type.WATER;
+        return move instanceof AttackMove && moveType === PokemonType.WATER;
       case WeatherType.HEAVY_RAIN:
-        return move instanceof AttackMove && moveType === Type.FIRE;
+        return move instanceof AttackMove && moveType === PokemonType.FIRE;
     }
 
     return false;
@@ -106,9 +107,13 @@ export class Weather {
     const field = globalScene.getField(true);
 
     for (const pokemon of field) {
-      let suppressWeatherEffectAbAttr: SuppressWeatherEffectAbAttr | null  = pokemon.getAbility().getAttrs(SuppressWeatherEffectAbAttr)[0];
+      let suppressWeatherEffectAbAttr: SuppressWeatherEffectAbAttr | null = pokemon
+        .getAbility()
+        .getAttrs(SuppressWeatherEffectAbAttr)[0];
       if (!suppressWeatherEffectAbAttr) {
-        suppressWeatherEffectAbAttr = pokemon.hasPassive() ? pokemon.getPassiveAbility().getAttrs(SuppressWeatherEffectAbAttr)[0] : null;
+        suppressWeatherEffectAbAttr = pokemon.hasPassive()
+          ? pokemon.getPassiveAbility().getAttrs(SuppressWeatherEffectAbAttr)[0]
+          : null;
       }
       if (suppressWeatherEffectAbAttr && (!this.isImmutable() || suppressWeatherEffectAbAttr.affectsImmutable)) {
         return true;
@@ -172,9 +177,13 @@ export function getWeatherLapseMessage(weatherType: WeatherType): string | null
 export function getWeatherDamageMessage(weatherType: WeatherType, pokemon: Pokemon): string | null {
   switch (weatherType) {
     case WeatherType.SANDSTORM:
-      return i18next.t("weather:sandstormDamageMessage", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) });
+      return i18next.t("weather:sandstormDamageMessage", {
+        pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
+      });
     case WeatherType.HAIL:
-      return i18next.t("weather:hailDamageMessage", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) });
+      return i18next.t("weather:hailDamageMessage", {
+        pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
+      });
   }
 
   return null;
@@ -205,6 +214,28 @@ export function getWeatherClearMessage(weatherType: WeatherType): string | null
   return null;
 }
 
+export function getLegendaryWeatherContinuesMessage(weatherType: WeatherType): string | null {
+  switch (weatherType) {
+    case WeatherType.HARSH_SUN:
+      return i18next.t("weather:harshSunContinueMessage");
+    case WeatherType.HEAVY_RAIN:
+      return i18next.t("weather:heavyRainContinueMessage");
+    case WeatherType.STRONG_WINDS:
+      return i18next.t("weather:strongWindsContinueMessage");
+  }
+  return null;
+}
+
+export function getWeatherBlockMessage(weatherType: WeatherType): string {
+  switch (weatherType) {
+    case WeatherType.HARSH_SUN:
+      return i18next.t("weather:harshSunEffectMessage");
+    case WeatherType.HEAVY_RAIN:
+      return i18next.t("weather:heavyRainEffectMessage");
+  }
+  return i18next.t("weather:defaultEffectMessage");
+}
+
 export function getTerrainStartMessage(terrainType: TerrainType): string | null {
   switch (terrainType) {
     case TerrainType.MISTY:
@@ -239,9 +270,14 @@ export function getTerrainClearMessage(terrainType: TerrainType): string | null
 
 export function getTerrainBlockMessage(pokemon: Pokemon, terrainType: TerrainType): string {
   if (terrainType === TerrainType.MISTY) {
-    return i18next.t("terrain:mistyBlockMessage", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) });
+    return i18next.t("terrain:mistyBlockMessage", {
+      pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
+    });
   }
-  return i18next.t("terrain:defaultBlockMessage", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), terrainName: getTerrainName(terrainType) });
+  return i18next.t("terrain:defaultBlockMessage", {
+    pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
+    terrainName: getTerrainName(terrainType),
+  });
 }
 
 export interface WeatherPoolEntry {
@@ -254,9 +290,7 @@ export function getRandomWeatherType(arena: Arena): WeatherType {
   const hasSun = arena.getTimeOfDay() < 2;
   switch (arena.biomeType) {
     case Biome.GRASS:
-      weatherPool = [
-        { weatherType: WeatherType.NONE, weight: 7 }
-      ];
+      weatherPool = [{ weatherType: WeatherType.NONE, weight: 7 }];
       if (hasSun) {
         weatherPool.push({ weatherType: WeatherType.SUNNY, weight: 3 });
       }
@@ -273,26 +307,26 @@ export function getRandomWeatherType(arena: Arena): WeatherType {
     case Biome.FOREST:
       weatherPool = [
         { weatherType: WeatherType.NONE, weight: 8 },
-        { weatherType: WeatherType.RAIN, weight: 5 }
+        { weatherType: WeatherType.RAIN, weight: 5 },
       ];
       break;
     case Biome.SEA:
       weatherPool = [
         { weatherType: WeatherType.NONE, weight: 3 },
-        { weatherType: WeatherType.RAIN, weight: 12 }
+        { weatherType: WeatherType.RAIN, weight: 12 },
       ];
       break;
     case Biome.SWAMP:
       weatherPool = [
         { weatherType: WeatherType.NONE, weight: 3 },
         { weatherType: WeatherType.RAIN, weight: 4 },
-        { weatherType: WeatherType.FOG, weight: 1 }
+        { weatherType: WeatherType.FOG, weight: 1 },
       ];
       break;
     case Biome.BEACH:
       weatherPool = [
         { weatherType: WeatherType.NONE, weight: 8 },
-        { weatherType: WeatherType.RAIN, weight: 3 }
+        { weatherType: WeatherType.RAIN, weight: 3 },
       ];
       if (hasSun) {
         weatherPool.push({ weatherType: WeatherType.SUNNY, weight: 5 });
@@ -302,27 +336,23 @@ export function getRandomWeatherType(arena: Arena): WeatherType {
       weatherPool = [
         { weatherType: WeatherType.NONE, weight: 10 },
         { weatherType: WeatherType.RAIN, weight: 5 },
-        { weatherType: WeatherType.FOG, weight: 1 }
+        { weatherType: WeatherType.FOG, weight: 1 },
       ];
       break;
     case Biome.SEABED:
-      weatherPool = [
-        { weatherType: WeatherType.RAIN, weight: 1 }
-      ];
+      weatherPool = [{ weatherType: WeatherType.RAIN, weight: 1 }];
       break;
     case Biome.BADLANDS:
       weatherPool = [
         { weatherType: WeatherType.NONE, weight: 8 },
-        { weatherType: WeatherType.SANDSTORM, weight: 2 }
+        { weatherType: WeatherType.SANDSTORM, weight: 2 },
       ];
       if (hasSun) {
         weatherPool.push({ weatherType: WeatherType.SUNNY, weight: 5 });
       }
       break;
     case Biome.DESERT:
-      weatherPool = [
-        { weatherType: WeatherType.SANDSTORM, weight: 2 }
-      ];
+      weatherPool = [{ weatherType: WeatherType.SANDSTORM, weight: 2 }];
       if (hasSun) {
         weatherPool.push({ weatherType: WeatherType.SUNNY, weight: 2 });
       }
@@ -331,37 +361,39 @@ export function getRandomWeatherType(arena: Arena): WeatherType {
       weatherPool = [
         { weatherType: WeatherType.NONE, weight: 3 },
         { weatherType: WeatherType.SNOW, weight: 4 },
-        { weatherType: WeatherType.HAIL, weight: 1 }
+        { weatherType: WeatherType.HAIL, weight: 1 },
       ];
       break;
     case Biome.MEADOW:
-      weatherPool = [
-        { weatherType: WeatherType.NONE, weight: 2 }
-      ];
+      weatherPool = [{ weatherType: WeatherType.NONE, weight: 2 }];
       if (hasSun) {
         weatherPool.push({ weatherType: WeatherType.SUNNY, weight: 2 });
       }
+      break;
     case Biome.VOLCANO:
       weatherPool = [
-        { weatherType: hasSun ? WeatherType.SUNNY : WeatherType.NONE, weight: 1 }
+        {
+          weatherType: hasSun ? WeatherType.SUNNY : WeatherType.NONE,
+          weight: 1,
+        },
       ];
       break;
     case Biome.GRAVEYARD:
       weatherPool = [
         { weatherType: WeatherType.NONE, weight: 3 },
-        { weatherType: WeatherType.FOG, weight: 1 }
+        { weatherType: WeatherType.FOG, weight: 1 },
       ];
       break;
     case Biome.JUNGLE:
       weatherPool = [
         { weatherType: WeatherType.NONE, weight: 8 },
-        { weatherType: WeatherType.RAIN, weight: 2 }
+        { weatherType: WeatherType.RAIN, weight: 2 },
       ];
       break;
     case Biome.SNOWY_FOREST:
       weatherPool = [
         { weatherType: WeatherType.SNOW, weight: 7 },
-        { weatherType: WeatherType.HAIL, weight: 1 }
+        { weatherType: WeatherType.HAIL, weight: 1 },
       ];
       break;
     case Biome.ISLAND:
@@ -375,15 +407,17 @@ export function getRandomWeatherType(arena: Arena): WeatherType {
       break;
   }
 
-  if (arena.biomeType === Biome.TOWN && globalScene.eventManager.isEventActive()) {
-    globalScene.eventManager.getWeather()?.map(w => weatherPool.push(w));
+  if (arena.biomeType === Biome.TOWN && timedEventManager.isEventActive()) {
+    timedEventManager.getWeather()?.map(w => weatherPool.push(w));
   }
 
   if (weatherPool.length > 1) {
     let totalWeight = 0;
-    weatherPool.forEach(w => totalWeight += w.weight);
+    for (const w of weatherPool) {
+      totalWeight += w.weight;
+    }
 
-    const rand = Utils.randSeedInt(totalWeight);
+    const rand = randSeedInt(totalWeight);
     let w = 0;
     for (const weather of weatherPool) {
       w += weather.weight;
@@ -393,7 +427,5 @@ export function getRandomWeatherType(arena: Arena): WeatherType {
     }
   }
 
-  return weatherPool.length
-    ? weatherPool[0].weatherType
-    : WeatherType.NONE;
+  return weatherPool.length ? weatherPool[0].weatherType : WeatherType.NONE;
 }
diff --git a/src/debug.js b/src/debug.js
index e0f27332d3d..6ddf6046c7a 100644
--- a/src/debug.js
+++ b/src/debug.js
@@ -3,7 +3,9 @@ export function getData() {
   if (!dataStr) {
     return null;
   }
-  return JSON.parse(atob(dataStr), (k, v) => k.endsWith("Attr") && ![ "natureAttr", "abilityAttr", "passiveAttr" ].includes(k) ? BigInt(v) : v);
+  return JSON.parse(atob(dataStr), (k, v) =>
+    k.endsWith("Attr") && !["natureAttr", "abilityAttr", "passiveAttr"].includes(k) ? BigInt(v) : v,
+  );
 }
 
 export function getSession() {
diff --git a/src/enums/MoveCategory.ts b/src/enums/MoveCategory.ts
new file mode 100644
index 00000000000..0408655e6db
--- /dev/null
+++ b/src/enums/MoveCategory.ts
@@ -0,0 +1,5 @@
+export enum MoveCategory {
+  PHYSICAL,
+  SPECIAL,
+  STATUS
+}
diff --git a/src/enums/MoveEffectTrigger.ts b/src/enums/MoveEffectTrigger.ts
new file mode 100644
index 00000000000..d22953c3690
--- /dev/null
+++ b/src/enums/MoveEffectTrigger.ts
@@ -0,0 +1,6 @@
+export enum MoveEffectTrigger {
+  PRE_APPLY,
+  POST_APPLY,
+  /** Triggers one time after all target effects have applied */
+  POST_TARGET
+}
diff --git a/src/enums/MoveFlags.ts b/src/enums/MoveFlags.ts
new file mode 100644
index 00000000000..0fc85fddec6
--- /dev/null
+++ b/src/enums/MoveFlags.ts
@@ -0,0 +1,46 @@
+export enum MoveFlags {
+  NONE = 0,
+  MAKES_CONTACT = 1 << 0,
+  IGNORE_PROTECT = 1 << 1,
+  /**
+   * Sound-based moves have the following effects:
+   * - Pokemon with the {@linkcode Abilities.SOUNDPROOF Soundproof Ability} are unaffected by other Pokemon's sound-based moves.
+   * - Pokemon affected by {@linkcode Moves.THROAT_CHOP Throat Chop} cannot use sound-based moves for two turns.
+   * - Sound-based moves used by a Pokemon with {@linkcode Abilities.LIQUID_VOICE Liquid Voice} become Water-type moves.
+   * - Sound-based moves used by a Pokemon with {@linkcode Abilities.PUNK_ROCK Punk Rock} are boosted by 30%. Pokemon with Punk Rock also take half damage from sound-based moves.
+   * - All sound-based moves (except Howl) can hit Pokemon behind an active {@linkcode Moves.SUBSTITUTE Substitute}.
+   *
+   * cf https://bulbapedia.bulbagarden.net/wiki/Sound-based_move
+   */
+  SOUND_BASED = 1 << 2,
+  HIDE_USER = 1 << 3,
+  HIDE_TARGET = 1 << 4,
+  BITING_MOVE = 1 << 5,
+  PULSE_MOVE = 1 << 6,
+  PUNCHING_MOVE = 1 << 7,
+  SLICING_MOVE = 1 << 8,
+  /**
+   * Indicates a move should be affected by {@linkcode Abilities.RECKLESS}
+   * @see {@linkcode Move.recklessMove()}
+   */
+  RECKLESS_MOVE = 1 << 9,
+  /** Indicates a move should be affected by {@linkcode Abilities.BULLETPROOF} */
+  BALLBOMB_MOVE = 1 << 10,
+  /** Grass types and pokemon with {@linkcode Abilities.OVERCOAT} are immune to powder moves */
+  POWDER_MOVE = 1 << 11,
+  /** Indicates a move should trigger {@linkcode Abilities.DANCER} */
+  DANCE_MOVE = 1 << 12,
+  /** Indicates a move should trigger {@linkcode Abilities.WIND_RIDER} */
+  WIND_MOVE = 1 << 13,
+  /** Indicates a move should trigger {@linkcode Abilities.TRIAGE} */
+  TRIAGE_MOVE = 1 << 14,
+  IGNORE_ABILITIES = 1 << 15,
+  /** Enables all hits of a multi-hit move to be accuracy checked individually */
+  CHECK_ALL_HITS = 1 << 16,
+  /** Indicates a move is able to bypass its target's Substitute (if the target has one) */
+  IGNORE_SUBSTITUTE = 1 << 17,
+  /** Indicates a move is able to be redirected to allies in a double battle if the attacker faints */
+  REDIRECT_COUNTER = 1 << 18,
+  /** Indicates a move is able to be reflected by {@linkcode Abilities.MAGIC_BOUNCE} and {@linkcode Moves.MAGIC_COAT} */
+  REFLECTABLE = 1 << 19
+}
diff --git a/src/enums/MoveTarget.ts b/src/enums/MoveTarget.ts
new file mode 100644
index 00000000000..615628cf4e8
--- /dev/null
+++ b/src/enums/MoveTarget.ts
@@ -0,0 +1,29 @@
+export enum MoveTarget {
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Category:Moves_that_target_the_user Moves that target the User} */
+  USER,
+  OTHER,
+  ALL_OTHERS,
+  NEAR_OTHER,
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Category:Moves_that_target_all_adjacent_Pok%C3%A9mon Moves that target all adjacent Pokemon} */
+  ALL_NEAR_OTHERS,
+  NEAR_ENEMY,
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Category:Moves_that_target_all_adjacent_foes Moves that target all adjacent foes} */
+  ALL_NEAR_ENEMIES,
+  RANDOM_NEAR_ENEMY,
+  ALL_ENEMIES,
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Category:Counterattacks Counterattacks} */
+  ATTACKER,
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Category:Moves_that_target_one_adjacent_ally Moves that target one adjacent ally} */
+  NEAR_ALLY,
+  ALLY,
+  USER_OR_NEAR_ALLY,
+  USER_AND_ALLIES,
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Category:Moves_that_target_all_Pok%C3%A9mon Moves that target all Pokemon} */
+  ALL,
+  USER_SIDE,
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Category:Entry_hazard-creating_moves Entry hazard-creating moves} */
+  ENEMY_SIDE,
+  BOTH_SIDES,
+  PARTY,
+  CURSE
+}
diff --git a/src/enums/MultiHitType.ts b/src/enums/MultiHitType.ts
new file mode 100644
index 00000000000..27e8214112e
--- /dev/null
+++ b/src/enums/MultiHitType.ts
@@ -0,0 +1,7 @@
+export enum MultiHitType {
+  _2,
+  _2_TO_5,
+  _3,
+  _10,
+  BEAT_UP
+}
diff --git a/src/enums/arena-tag-type.ts b/src/enums/arena-tag-type.ts
index 1c62ccb14a6..4180aa00ef5 100644
--- a/src/enums/arena-tag-type.ts
+++ b/src/enums/arena-tag-type.ts
@@ -29,4 +29,5 @@ export enum ArenaTagType {
   WATER_FIRE_PLEDGE = "WATER_FIRE_PLEDGE",
   GRASS_WATER_PLEDGE = "GRASS_WATER_PLEDGE",
   FAIRY_LOCK = "FAIRY_LOCK",
+  NEUTRALIZING_GAS = "NEUTRALIZING_GAS"
 }
diff --git a/src/enums/battle-type.ts b/src/enums/battle-type.ts
new file mode 100644
index 00000000000..81cf89ef488
--- /dev/null
+++ b/src/enums/battle-type.ts
@@ -0,0 +1,6 @@
+export enum BattleType {
+  WILD,
+  TRAINER,
+  CLEAR,
+  MYSTERY_ENCOUNTER
+}
diff --git a/src/enums/battler-tag-type.ts b/src/enums/battler-tag-type.ts
index f28ac37ae27..719b08c5b81 100644
--- a/src/enums/battler-tag-type.ts
+++ b/src/enums/battler-tag-type.ts
@@ -94,4 +94,5 @@ export enum BattlerTagType {
   PSYCHO_SHIFT = "PSYCHO_SHIFT",
   ENDURE_TOKEN = "ENDURE_TOKEN",
   POWDER = "POWDER",
+  MAGIC_COAT = "MAGIC_COAT",
 }
diff --git a/src/enums/biome.ts b/src/enums/biome.ts
index bb9eaf454cc..7284528767d 100644
--- a/src/enums/biome.ts
+++ b/src/enums/biome.ts
@@ -1,4 +1,5 @@
 export enum Biome {
+  // TODO: Should -1 be part of the enum signature (for "unknown place")
   TOWN,
   PLAINS,
   GRASS,
diff --git a/src/enums/buttons.ts b/src/enums/buttons.ts
index fe26023f8e7..f828b280d45 100644
--- a/src/enums/buttons.ts
+++ b/src/enums/buttons.ts
@@ -13,7 +13,7 @@ export enum Button {
 	CYCLE_GENDER,
 	CYCLE_ABILITY,
 	CYCLE_NATURE,
-	V,
+	CYCLE_TERA,
 	SPEED_UP,
-	SLOW_DOWN
+	SLOW_DOWN,
 }
diff --git a/src/enums/fixed-boss-waves.ts b/src/enums/fixed-boss-waves.ts
new file mode 100644
index 00000000000..623d9035472
--- /dev/null
+++ b/src/enums/fixed-boss-waves.ts
@@ -0,0 +1,22 @@
+export enum ClassicFixedBossWaves {
+  TOWN_YOUNGSTER = 5,
+  RIVAL_1 = 8,
+  RIVAL_2 = 25,
+  EVIL_GRUNT_1 = 35,
+  RIVAL_3 = 55,
+  EVIL_GRUNT_2 = 62,
+  EVIL_GRUNT_3 = 64,
+  EVIL_ADMIN_1 = 66,
+  RIVAL_4 = 95,
+  EVIL_GRUNT_4 = 112,
+  EVIL_ADMIN_2 = 114,
+  EVIL_BOSS_1 = 115,
+  RIVAL_5 = 145,
+  EVIL_BOSS_2 = 165,
+  ELITE_FOUR_1 = 182,
+  ELITE_FOUR_2 = 184,
+  ELITE_FOUR_3 = 186,
+  ELITE_FOUR_4 = 188,
+  CHAMPION = 190,
+  RIVAL_6 = 195
+}
diff --git a/src/enums/hit-check-result.ts b/src/enums/hit-check-result.ts
new file mode 100644
index 00000000000..cf8a2b17194
--- /dev/null
+++ b/src/enums/hit-check-result.ts
@@ -0,0 +1,23 @@
+/** The result of a hit check calculation */
+export const HitCheckResult = {
+  /** Hit checks haven't been evaluated yet in this pass */
+  PENDING: 0,
+  /** The move hits the target successfully */
+  HIT: 1,
+  /** The move has no effect on the target */
+  NO_EFFECT: 2,
+  /** The move has no effect on the target, but doesn't proc the default "no effect" message */
+  NO_EFFECT_NO_MESSAGE: 3,
+  /** The target protected itself against the move */
+  PROTECTED: 4,
+  /** The move missed the target */
+  MISS: 5,
+  /** The move is reflected by magic coat or magic bounce */
+  REFLECTED: 6,
+  /** The target is no longer on the field */
+  TARGET_NOT_ON_FIELD: 7,
+  /** The move failed unexpectedly */
+  ERROR: 8,
+} as const;
+
+export type HitCheckResult = typeof HitCheckResult[keyof typeof HitCheckResult];
diff --git a/src/enums/type.ts b/src/enums/pokemon-type.ts
similarity index 88%
rename from src/enums/type.ts
rename to src/enums/pokemon-type.ts
index a04849c2ca3..eca02bae275 100644
--- a/src/enums/type.ts
+++ b/src/enums/pokemon-type.ts
@@ -1,4 +1,4 @@
-export enum Type {
+export enum PokemonType {
   UNKNOWN = -1,
   NORMAL = 0,
   FIGHTING,
diff --git a/src/enums/stat.ts b/src/enums/stat.ts
index 6b3f7dc6d79..a2b81b7e64b 100644
--- a/src/enums/stat.ts
+++ b/src/enums/stat.ts
@@ -48,9 +48,11 @@ export type TempBattleStat = typeof TEMP_BATTLE_STATS[number];
 export function getStatStageChangeDescriptionKey(stages: number, isIncrease: boolean) {
   if (stages === 1) {
     return isIncrease ? "battle:statRose" : "battle:statFell";
-  } else if (stages === 2) {
+  }
+  if (stages === 2) {
     return isIncrease ? "battle:statSharplyRose" : "battle:statHarshlyFell";
-  } else if (stages > 2 && stages <= 6) {
+  }
+  if (stages > 2 && stages <= 6) {
     return isIncrease ? "battle:statRoseDrastically" : "battle:statSeverelyFell";
   }
   return isIncrease ? "battle:statWontGoAnyHigher" : "battle:statWontGoAnyLower";
diff --git a/src/enums/tera-ai-mode.ts b/src/enums/tera-ai-mode.ts
new file mode 100644
index 00000000000..35d4e4f3420
--- /dev/null
+++ b/src/enums/tera-ai-mode.ts
@@ -0,0 +1,5 @@
+export enum TeraAIMode {
+  NO_TERA,
+  INSTANT_TERA,
+  SMART_TERA
+}
diff --git a/src/enums/trainer-pool-tier.ts b/src/enums/trainer-pool-tier.ts
new file mode 100644
index 00000000000..da6355d021b
--- /dev/null
+++ b/src/enums/trainer-pool-tier.ts
@@ -0,0 +1,7 @@
+export enum TrainerPoolTier {
+  COMMON,
+  UNCOMMON,
+  RARE,
+  SUPER_RARE,
+  ULTRA_RARE
+}
diff --git a/src/enums/trainer-slot.ts b/src/enums/trainer-slot.ts
new file mode 100644
index 00000000000..2dfa468f74c
--- /dev/null
+++ b/src/enums/trainer-slot.ts
@@ -0,0 +1,5 @@
+export enum TrainerSlot {
+  NONE,
+  TRAINER,
+  TRAINER_PARTNER
+}
diff --git a/src/enums/ui-mode.ts b/src/enums/ui-mode.ts
new file mode 100644
index 00000000000..dcf6bd2a238
--- /dev/null
+++ b/src/enums/ui-mode.ts
@@ -0,0 +1,47 @@
+export enum UiMode {
+  MESSAGE,
+  TITLE,
+  COMMAND,
+  FIGHT,
+  BALL,
+  TARGET_SELECT,
+  MODIFIER_SELECT,
+  SAVE_SLOT,
+  PARTY,
+  SUMMARY,
+  STARTER_SELECT,
+  EVOLUTION_SCENE,
+  EGG_HATCH_SCENE,
+  EGG_HATCH_SUMMARY,
+  CONFIRM,
+  OPTION_SELECT,
+  MENU,
+  MENU_OPTION_SELECT,
+  SETTINGS,
+  SETTINGS_DISPLAY,
+  SETTINGS_AUDIO,
+  SETTINGS_GAMEPAD,
+  GAMEPAD_BINDING,
+  SETTINGS_KEYBOARD,
+  KEYBOARD_BINDING,
+  ACHIEVEMENTS,
+  GAME_STATS,
+  EGG_LIST,
+  EGG_GACHA,
+  POKEDEX,
+  POKEDEX_SCAN,
+  POKEDEX_PAGE,
+  LOGIN_FORM,
+  REGISTRATION_FORM,
+  LOADING,
+  SESSION_RELOAD,
+  UNAVAILABLE,
+  CHALLENGE_SELECT,
+  RENAME_POKEMON,
+  RUN_HISTORY,
+  RUN_INFO,
+  TEST_DIALOGUE,
+  AUTO_COMPLETE,
+  ADMIN,
+  MYSTERY_ENCOUNTER
+}
diff --git a/src/events/arena.ts b/src/events/arena.ts
index 660a113f96b..ad77289b76b 100644
--- a/src/events/arena.ts
+++ b/src/events/arena.ts
@@ -32,7 +32,7 @@ export class ArenaEvent extends Event {
 /**
  * Container class for {@linkcode ArenaEventType.WEATHER_CHANGED} events
  * @extends ArenaEvent
-*/
+ */
 export class WeatherChangedEvent extends ArenaEvent {
   /** The {@linkcode WeatherType} being overridden */
   public oldWeatherType: WeatherType;
@@ -48,7 +48,7 @@ export class WeatherChangedEvent extends ArenaEvent {
 /**
  * Container class for {@linkcode ArenaEventType.TERRAIN_CHANGED} events
  * @extends ArenaEvent
-*/
+ */
 export class TerrainChangedEvent extends ArenaEvent {
   /** The {@linkcode TerrainType} being overridden */
   public oldTerrainType: TerrainType;
@@ -65,7 +65,7 @@ export class TerrainChangedEvent extends ArenaEvent {
 /**
  * Container class for {@linkcode ArenaEventType.TAG_ADDED} events
  * @extends ArenaEvent
-*/
+ */
 export class TagAddedEvent extends ArenaEvent {
   /** The {@linkcode ArenaTagType} being added */
   public arenaTagType: ArenaTagType;
@@ -76,7 +76,13 @@ export class TagAddedEvent extends ArenaEvent {
   /** The maximum amount of layers of the arena trap. */
   public arenaTagMaxLayers: number;
 
-  constructor(arenaTagType: ArenaTagType, arenaTagSide: ArenaTagSide, duration: number, arenaTagLayers?: number, arenaTagMaxLayers?: number) {
+  constructor(
+    arenaTagType: ArenaTagType,
+    arenaTagSide: ArenaTagSide,
+    duration: number,
+    arenaTagLayers?: number,
+    arenaTagMaxLayers?: number,
+  ) {
     super(ArenaEventType.TAG_ADDED, duration);
 
     this.arenaTagType = arenaTagType;
@@ -88,7 +94,7 @@ export class TagAddedEvent extends ArenaEvent {
 /**
  * Container class for {@linkcode ArenaEventType.TAG_REMOVED} events
  * @extends ArenaEvent
-*/
+ */
 export class TagRemovedEvent extends ArenaEvent {
   /** The {@linkcode ArenaTagType} being removed */
   public arenaTagType: ArenaTagType;
diff --git a/src/events/battle-scene.ts b/src/events/battle-scene.ts
index 548666c96de..83d260bd7d2 100644
--- a/src/events/battle-scene.ts
+++ b/src/events/battle-scene.ts
@@ -1,4 +1,4 @@
-import type Move from "../data/move";
+import type Move from "../data/moves/move";
 import type { BerryModifier } from "../modifier/modifier";
 
 /** Alias for all {@linkcode BattleScene} events */
@@ -34,7 +34,7 @@ export enum BattleSceneEventType {
    * Triggers after a turn ends in battle
    * @see {@linkcode TurnEndEvent}
    */
-  TURN_END  = "onTurnEnd",
+  TURN_END = "onTurnEnd",
 
   /**
    * Triggers when a new {@linkcode Arena} is created during initialization
@@ -46,7 +46,7 @@ export enum BattleSceneEventType {
 /**
  * Container class for {@linkcode BattleSceneEventType.CANDY_UPGRADE_NOTIFICATION_CHANGED} events
  * @extends Event
-*/
+ */
 export class CandyUpgradeNotificationChangedEvent extends Event {
   /** The new value the setting was changed to */
   public newValue: number;
@@ -60,7 +60,7 @@ export class CandyUpgradeNotificationChangedEvent extends Event {
 /**
  * Container class for {@linkcode BattleSceneEventType.MOVE_USED} events
  * @extends Event
-*/
+ */
 export class MoveUsedEvent extends Event {
   /** The ID of the {@linkcode Pokemon} that used the {@linkcode Move} */
   public pokemonId: number;
@@ -79,7 +79,7 @@ export class MoveUsedEvent extends Event {
 /**
  * Container class for {@linkcode BattleSceneEventType.BERRY_USED} events
  * @extends Event
-*/
+ */
 export class BerryUsedEvent extends Event {
   /** The {@linkcode BerryModifier} being used */
   public berryModifier: BerryModifier;
@@ -93,7 +93,7 @@ export class BerryUsedEvent extends Event {
 /**
  * Container class for {@linkcode BattleSceneEventType.ENCOUNTER_PHASE} events
  * @extends Event
-*/
+ */
 export class EncounterPhaseEvent extends Event {
   constructor() {
     super(BattleSceneEventType.ENCOUNTER_PHASE);
@@ -102,7 +102,7 @@ export class EncounterPhaseEvent extends Event {
 /**
  * Container class for {@linkcode BattleSceneEventType.TURN_INIT} events
  * @extends Event
-*/
+ */
 export class TurnInitEvent extends Event {
   constructor() {
     super(BattleSceneEventType.TURN_INIT);
@@ -111,7 +111,7 @@ export class TurnInitEvent extends Event {
 /**
  * Container class for {@linkcode BattleSceneEventType.TURN_END} events
  * @extends Event
-*/
+ */
 export class TurnEndEvent extends Event {
   /** The amount of turns in the current battle */
   public turnCount: number;
@@ -124,7 +124,7 @@ export class TurnEndEvent extends Event {
 /**
  * Container class for {@linkcode BattleSceneEventType.NEW_ARENA} events
  * @extends Event
-*/
+ */
 export class NewArenaEvent extends Event {
   constructor() {
     super(BattleSceneEventType.NEW_ARENA);
diff --git a/src/events/egg.ts b/src/events/egg.ts
index dc3d2b55ffe..a0c26c82883 100644
--- a/src/events/egg.ts
+++ b/src/events/egg.ts
@@ -3,13 +3,13 @@ export enum EggEventType {
    * Triggers when egg count is changed.
    * @see {@linkcode MoveUsedEvent}
    */
-  EGG_COUNT_CHANGED = "onEggCountChanged"
+  EGG_COUNT_CHANGED = "onEggCountChanged",
 }
 
 /**
  * Container class for {@linkcode EggEventType.EGG_COUNT_CHANGED} events
  * @extends Event
-*/
+ */
 export class EggCountChangedEvent extends Event {
   /** The updated egg count. */
   public eggCount: number;
diff --git a/src/field/anims.ts b/src/field/anims.ts
index 9ffaae59bbc..2fd23e4262b 100644
--- a/src/field/anims.ts
+++ b/src/field/anims.ts
@@ -1,7 +1,7 @@
 import { globalScene } from "#app/global-scene";
 import { PokeballType } from "#enums/pokeball";
-import type { Variant } from "#app/data/variant";
-import { getFrameMs, randGauss } from "#app/utils";
+import type { Variant } from "#app/sprites/variant";
+import { getFrameMs, randGauss } from "#app/utils/common";
 
 export function addPokeballOpenParticles(x: number, y: number, pokeballType: PokeballType): void {
   switch (pokeballType) {
@@ -24,13 +24,17 @@ export function addPokeballOpenParticles(x: number, y: number, pokeballType: Pok
 }
 
 function doDefaultPbOpenParticles(x: number, y: number, radius: number) {
-  const pbOpenParticlesFrameNames = globalScene.anims.generateFrameNames("pb_particles", { start: 0, end: 3, suffix: ".png" });
-  if (!(globalScene.anims.exists("pb_open_particle"))) {
+  const pbOpenParticlesFrameNames = globalScene.anims.generateFrameNames("pb_particles", {
+    start: 0,
+    end: 3,
+    suffix: ".png",
+  });
+  if (!globalScene.anims.exists("pb_open_particle")) {
     globalScene.anims.create({
       key: "pb_open_particle",
       frames: pbOpenParticlesFrameNames,
       frameRate: 16,
-      repeat: -1
+      repeat: -1,
     });
   }
 
@@ -38,17 +42,17 @@ function doDefaultPbOpenParticles(x: number, y: number, radius: number) {
     const particle = globalScene.add.sprite(x, y, "pb_open_particle");
     globalScene.field.add(particle);
     const angle = index * 45;
-    const [ xCoord, yCoord ] = [ radius * Math.cos(angle * Math.PI / 180), radius * Math.sin(angle * Math.PI / 180) ];
+    const [xCoord, yCoord] = [radius * Math.cos((angle * Math.PI) / 180), radius * Math.sin((angle * Math.PI) / 180)];
     globalScene.tweens.add({
       targets: particle,
       x: x + xCoord,
       y: y + yCoord,
-      duration: 575
+      duration: 575,
     });
     particle.play({
       key: "pb_open_particle",
       startFrame: (index + 3) % 4,
-      frameRate: Math.floor(16 * globalScene.gameSpeed)
+      frameRate: Math.floor(16 * globalScene.gameSpeed),
     });
     globalScene.tweens.add({
       targets: particle,
@@ -56,7 +60,7 @@ function doDefaultPbOpenParticles(x: number, y: number, radius: number) {
       duration: 75,
       alpha: 0,
       ease: "Sine.easeIn",
-      onComplete: () => particle.destroy()
+      onComplete: () => particle.destroy(),
     });
   };
 
@@ -64,7 +68,7 @@ function doDefaultPbOpenParticles(x: number, y: number, radius: number) {
   globalScene.time.addEvent({
     delay: 20,
     repeat: 16,
-    callback: () => addParticle(++particleCount)
+    callback: () => addParticle(++particleCount),
   });
 }
 
@@ -84,7 +88,7 @@ function doUbOpenParticles(x: number, y: number, frameIndex: number) {
       for (const particle of particles) {
         particle.destroy();
       }
-    }
+    },
   });
 }
 
@@ -105,12 +109,20 @@ function doMbOpenParticles(x: number, y: number) {
         for (const particle of particles) {
           particle.destroy();
         }
-      }
+      },
     });
   }
 }
 
-function doFanOutParticle(trigIndex: number, x: number, y: number, xSpeed: number, ySpeed: number, angle: number, frameIndex: number): Phaser.GameObjects.Image {
+function doFanOutParticle(
+  trigIndex: number,
+  x: number,
+  y: number,
+  xSpeed: number,
+  ySpeed: number,
+  angle: number,
+  frameIndex: number,
+): Phaser.GameObjects.Image {
   let f = 0;
 
   const particle = globalScene.add.image(x, y, "pb_particles", `${frameIndex}.png`);
@@ -122,7 +134,7 @@ function doFanOutParticle(trigIndex: number, x: number, y: number, xSpeed: numbe
     }
     particle.x = x + sin(trigIndex, f * xSpeed);
     particle.y = y + cos(trigIndex, f * ySpeed);
-    trigIndex = (trigIndex + angle);
+    trigIndex = trigIndex + angle;
     f++;
   };
 
@@ -131,7 +143,7 @@ function doFanOutParticle(trigIndex: number, x: number, y: number, xSpeed: numbe
     duration: getFrameMs(1),
     onRepeat: () => {
       updateParticle();
-    }
+    },
   });
 
   return particle;
@@ -155,16 +167,16 @@ export function addPokeballCaptureStars(pokeball: Phaser.GameObjects.Sprite): vo
           y: pokeball.y,
           alpha: 0,
           ease: "Sine.easeIn",
-          duration: 250
+          duration: 250,
         });
-      }
+      },
     });
 
     const dist = randGauss(25);
     globalScene.tweens.add({
       targets: particle,
       x: pokeball.x + dist,
-      duration: 500
+      duration: 500,
     });
 
     globalScene.tweens.add({
@@ -172,7 +184,7 @@ export function addPokeballCaptureStars(pokeball: Phaser.GameObjects.Sprite): vo
       alpha: 0,
       delay: 425,
       duration: 75,
-      onComplete: () => particle.destroy()
+      onComplete: () => particle.destroy(),
     });
   };
 
@@ -200,7 +212,10 @@ export function doShinySparkleAnim(sparkleSprite: Phaser.GameObjects.Sprite, var
 
   // Make sure the animation exists, and create it if not
   if (!globalScene.anims.exists(animationKey)) {
-    const frameNames = globalScene.anims.generateFrameNames(spriteKey, { suffix: ".png", end: 34 });
+    const frameNames = globalScene.anims.generateFrameNames(spriteKey, {
+      suffix: ".png",
+      end: 34,
+    });
     globalScene.anims.create({
       key: `sparkle${keySuffix}`,
       frames: frameNames,
diff --git a/src/field/arena.ts b/src/field/arena.ts
index 67b83e9518f..f083180490b 100644
--- a/src/field/arena.ts
+++ b/src/field/arena.ts
@@ -1,14 +1,20 @@
 import { globalScene } from "#app/global-scene";
 import type { BiomeTierTrainerPools, PokemonPools } from "#app/data/balance/biomes";
 import { biomePokemonPools, BiomePoolTier, biomeTrainerPools } from "#app/data/balance/biomes";
-import type { Constructor } from "#app/utils";
-import * as Utils from "#app/utils";
+import { randSeedInt, NumberHolder, isNullOrUndefined, type Constructor } from "#app/utils/common";
 import type PokemonSpecies from "#app/data/pokemon-species";
 import { getPokemonSpecies } from "#app/data/pokemon-species";
-import { getTerrainClearMessage, getTerrainStartMessage, getWeatherClearMessage, getWeatherStartMessage, Weather } from "#app/data/weather";
+import {
+  getTerrainClearMessage,
+  getTerrainStartMessage,
+  getWeatherClearMessage,
+  getWeatherStartMessage,
+  getLegendaryWeatherContinuesMessage,
+  Weather,
+} from "#app/data/weather";
 import { CommonAnim } from "#app/data/battle-anims";
-import type { Type } from "#enums/type";
-import type Move from "#app/data/move";
+import type { PokemonType } from "#enums/pokemon-type";
+import type Move from "#app/data/moves/move";
 import type { ArenaTag } from "#app/data/arena-tag";
 import { ArenaTagSide, ArenaTrapTag, getArenaTag } from "#app/data/arena-tag";
 import type { BattlerIndex } from "#app/battle";
@@ -19,8 +25,8 @@ import {
   applyPostWeatherChangeAbAttrs,
   PostTerrainChangeAbAttr,
   PostWeatherChangeAbAttr,
-  TerrainEventTypeChangeAbAttr
-} from "#app/data/ability";
+  TerrainEventTypeChangeAbAttr,
+} from "#app/data/abilities/ability";
 import type Pokemon from "#app/field/pokemon";
 import Overrides from "#app/overrides";
 import { TagAddedEvent, TagRemovedEvent, TerrainChangedEvent, WeatherChangedEvent } from "#app/events/arena";
@@ -33,8 +39,8 @@ import { TrainerType } from "#enums/trainer-type";
 import { Abilities } from "#enums/abilities";
 import { SpeciesFormChangeRevertWeatherFormTrigger, SpeciesFormChangeWeatherTrigger } from "#app/data/pokemon-forms";
 import { CommonAnimPhase } from "#app/phases/common-anim-phase";
-import { ShowAbilityPhase } from "#app/phases/show-ability-phase";
 import { WeatherType } from "#enums/weather-type";
+import { FieldEffectModifier } from "#app/modifier/modifier";
 
 export class Arena {
   public biomeType: Biome;
@@ -44,6 +50,12 @@ export class Arena {
   public bgm: string;
   public ignoreAbilities: boolean;
   public ignoringEffectSource: BattlerIndex | null;
+  public playerTerasUsed: number;
+  /**
+   * Saves the number of times a party pokemon faints during a arena encounter.
+   * {@linkcode globalScene.currentBattle.enemyFaints} is the corresponding faint counter for the enemy (this resets every wave).
+   */
+  public playerFaints: number;
 
   private lastTimeOfDay: TimeOfDay;
 
@@ -52,12 +64,14 @@ export class Arena {
 
   public readonly eventTarget: EventTarget = new EventTarget();
 
-  constructor(biome: Biome, bgm: string) {
+  constructor(biome: Biome, bgm: string, playerFaints = 0) {
     this.biomeType = biome;
     this.tags = [];
     this.bgm = bgm;
     this.trainerPool = biomeTrainerPools[biome];
     this.updatePoolsForTimeOfDay();
+    this.playerTerasUsed = 0;
+    this.playerFaints = playerFaints;
   }
 
   init() {
@@ -80,29 +94,53 @@ export class Arena {
     if (timeOfDay !== this.lastTimeOfDay) {
       this.pokemonPool = {};
       for (const tier of Object.keys(biomePokemonPools[this.biomeType])) {
-        this.pokemonPool[tier] = Object.assign([], biomePokemonPools[this.biomeType][tier][TimeOfDay.ALL]).concat(biomePokemonPools[this.biomeType][tier][timeOfDay]);
+        this.pokemonPool[tier] = Object.assign([], biomePokemonPools[this.biomeType][tier][TimeOfDay.ALL]).concat(
+          biomePokemonPools[this.biomeType][tier][timeOfDay],
+        );
       }
       this.lastTimeOfDay = timeOfDay;
     }
   }
 
-  randomSpecies(waveIndex: number, level: number, attempt?: number, luckValue?: number, isBoss?: boolean): PokemonSpecies {
+  randomSpecies(
+    waveIndex: number,
+    level: number,
+    attempt?: number,
+    luckValue?: number,
+    isBoss?: boolean,
+  ): PokemonSpecies {
     const overrideSpecies = globalScene.gameMode.getOverrideSpecies(waveIndex);
     if (overrideSpecies) {
       return overrideSpecies;
     }
-    const isBossSpecies = !!globalScene.getEncounterBossSegments(waveIndex, level) && !!this.pokemonPool[BiomePoolTier.BOSS].length
-      && (this.biomeType !== Biome.END || globalScene.gameMode.isClassic || globalScene.gameMode.isWaveFinal(waveIndex));
+    const isBossSpecies =
+      !!globalScene.getEncounterBossSegments(waveIndex, level) &&
+      !!this.pokemonPool[BiomePoolTier.BOSS].length &&
+      (this.biomeType !== Biome.END || globalScene.gameMode.isClassic || globalScene.gameMode.isWaveFinal(waveIndex));
     const randVal = isBossSpecies ? 64 : 512;
     // luck influences encounter rarity
     let luckModifier = 0;
     if (typeof luckValue !== "undefined") {
       luckModifier = luckValue * (isBossSpecies ? 0.5 : 2);
     }
-    const tierValue = Utils.randSeedInt(randVal - luckModifier);
+    const tierValue = randSeedInt(randVal - luckModifier);
     let tier = !isBossSpecies
-      ? tierValue >= 156 ? BiomePoolTier.COMMON : tierValue >= 32 ? BiomePoolTier.UNCOMMON : tierValue >= 6 ? BiomePoolTier.RARE : tierValue >= 1 ? BiomePoolTier.SUPER_RARE : BiomePoolTier.ULTRA_RARE
-      : tierValue >= 20 ? BiomePoolTier.BOSS : tierValue >= 6 ? BiomePoolTier.BOSS_RARE : tierValue >= 1 ? BiomePoolTier.BOSS_SUPER_RARE : BiomePoolTier.BOSS_ULTRA_RARE;
+      ? tierValue >= 156
+        ? BiomePoolTier.COMMON
+        : tierValue >= 32
+          ? BiomePoolTier.UNCOMMON
+          : tierValue >= 6
+            ? BiomePoolTier.RARE
+            : tierValue >= 1
+              ? BiomePoolTier.SUPER_RARE
+              : BiomePoolTier.ULTRA_RARE
+      : tierValue >= 20
+        ? BiomePoolTier.BOSS
+        : tierValue >= 6
+          ? BiomePoolTier.BOSS_RARE
+          : tierValue >= 1
+            ? BiomePoolTier.BOSS_SUPER_RARE
+            : BiomePoolTier.BOSS_ULTRA_RARE;
     console.log(BiomePoolTier[tier]);
     while (!this.pokemonPool[tier].length) {
       console.log(`Downgraded rarity tier from ${BiomePoolTier[tier]} to ${BiomePoolTier[tier - 1]}`);
@@ -114,18 +152,18 @@ export class Arena {
     if (!tierPool.length) {
       ret = globalScene.randomSpecies(waveIndex, level);
     } else {
-      const entry = tierPool[Utils.randSeedInt(tierPool.length)];
+      const entry = tierPool[randSeedInt(tierPool.length)];
       let species: Species;
       if (typeof entry === "number") {
         species = entry as Species;
       } else {
         const levelThresholds = Object.keys(entry);
         for (let l = levelThresholds.length - 1; l >= 0; l--) {
-          const levelThreshold = parseInt(levelThresholds[l]);
+          const levelThreshold = Number.parseInt(levelThresholds[l]);
           if (level >= levelThreshold) {
             const speciesIds = entry[levelThreshold];
             if (speciesIds.length > 1) {
-              species = speciesIds[Utils.randSeedInt(speciesIds.length)];
+              species = speciesIds[randSeedInt(speciesIds.length)];
             } else {
               species = speciesIds[0];
             }
@@ -138,13 +176,13 @@ export class Arena {
 
       if (ret.subLegendary || ret.legendary || ret.mythical) {
         switch (true) {
-          case (ret.baseTotal >= 720):
+          case ret.baseTotal >= 720:
             regen = level < 90;
             break;
-          case (ret.baseTotal >= 670):
+          case ret.baseTotal >= 670:
             regen = level < 70;
             break;
-          case (ret.baseTotal >= 580):
+          case ret.baseTotal >= 580:
             regen = level < 50;
             break;
           default:
@@ -167,21 +205,36 @@ export class Arena {
     return ret;
   }
 
-  randomTrainerType(waveIndex: number, isBoss: boolean = false): TrainerType {
-    const isTrainerBoss = !!this.trainerPool[BiomePoolTier.BOSS].length
-      && (globalScene.gameMode.isTrainerBoss(waveIndex, this.biomeType, globalScene.offsetGym) || isBoss);
+  randomTrainerType(waveIndex: number, isBoss = false): TrainerType {
+    const isTrainerBoss =
+      !!this.trainerPool[BiomePoolTier.BOSS].length &&
+      (globalScene.gameMode.isTrainerBoss(waveIndex, this.biomeType, globalScene.offsetGym) || isBoss);
     console.log(isBoss, this.trainerPool);
-    const tierValue = Utils.randSeedInt(!isTrainerBoss ? 512 : 64);
+    const tierValue = randSeedInt(!isTrainerBoss ? 512 : 64);
     let tier = !isTrainerBoss
-      ? tierValue >= 156 ? BiomePoolTier.COMMON : tierValue >= 32 ? BiomePoolTier.UNCOMMON : tierValue >= 6 ? BiomePoolTier.RARE : tierValue >= 1 ? BiomePoolTier.SUPER_RARE : BiomePoolTier.ULTRA_RARE
-      : tierValue >= 20 ? BiomePoolTier.BOSS : tierValue >= 6 ? BiomePoolTier.BOSS_RARE : tierValue >= 1 ? BiomePoolTier.BOSS_SUPER_RARE : BiomePoolTier.BOSS_ULTRA_RARE;
+      ? tierValue >= 156
+        ? BiomePoolTier.COMMON
+        : tierValue >= 32
+          ? BiomePoolTier.UNCOMMON
+          : tierValue >= 6
+            ? BiomePoolTier.RARE
+            : tierValue >= 1
+              ? BiomePoolTier.SUPER_RARE
+              : BiomePoolTier.ULTRA_RARE
+      : tierValue >= 20
+        ? BiomePoolTier.BOSS
+        : tierValue >= 6
+          ? BiomePoolTier.BOSS_RARE
+          : tierValue >= 1
+            ? BiomePoolTier.BOSS_SUPER_RARE
+            : BiomePoolTier.BOSS_ULTRA_RARE;
     console.log(BiomePoolTier[tier]);
     while (tier && !this.trainerPool[tier].length) {
       console.log(`Downgraded trainer rarity tier from ${BiomePoolTier[tier]} to ${BiomePoolTier[tier - 1]}`);
       tier--;
     }
     const tierPool = this.trainerPool[tier] || [];
-    return !tierPool.length ? TrainerType.BREEDER : tierPool[Utils.randSeedInt(tierPool.length)];
+    return !tierPool.length ? TrainerType.BREEDER : tierPool[randSeedInt(tierPool.length)];
   }
 
   getSpeciesFormIndex(species: PokemonSpecies): number {
@@ -249,25 +302,50 @@ export class Arena {
     return true;
   }
 
+  /** Returns weather or not the weather can be changed to {@linkcode weather} */
+  canSetWeather(weather: WeatherType): boolean {
+    return !(this.weather?.weatherType === (weather || undefined));
+  }
+
   /**
    * Attempts to set a new weather to the battle
    * @param weather {@linkcode WeatherType} new {@linkcode WeatherType} to set
-   * @param hasPokemonSource boolean if the new weather is from a pokemon
+   * @param user {@linkcode Pokemon} that caused the weather effect
    * @returns true if new weather set, false if no weather provided or attempting to set the same weather as currently in use
    */
-  trySetWeather(weather: WeatherType, hasPokemonSource: boolean): boolean {
+  trySetWeather(weather: WeatherType, user?: Pokemon): boolean {
     if (Overrides.WEATHER_OVERRIDE) {
       return this.trySetWeatherOverride(Overrides.WEATHER_OVERRIDE);
     }
 
-    if (this.weather?.weatherType === (weather || undefined)) {
+    if (!this.canSetWeather(weather)) {
       return false;
     }
 
     const oldWeatherType = this.weather?.weatherType || WeatherType.NONE;
 
-    this.weather = weather ? new Weather(weather, hasPokemonSource ? 5 : 0) : null;
-    this.eventTarget.dispatchEvent(new WeatherChangedEvent(oldWeatherType, this.weather?.weatherType!, this.weather?.turnsLeft!)); // TODO: is this bang correct?
+    if (
+      this.weather?.isImmutable() &&
+      ![WeatherType.HARSH_SUN, WeatherType.HEAVY_RAIN, WeatherType.STRONG_WINDS, WeatherType.NONE].includes(weather)
+    ) {
+      globalScene.unshiftPhase(
+        new CommonAnimPhase(undefined, undefined, CommonAnim.SUNNY + (oldWeatherType - 1), true),
+      );
+      globalScene.queueMessage(getLegendaryWeatherContinuesMessage(oldWeatherType)!);
+      return false;
+    }
+
+    const weatherDuration = new NumberHolder(0);
+
+    if (!isNullOrUndefined(user)) {
+      weatherDuration.value = 5;
+      globalScene.applyModifier(FieldEffectModifier, user.isPlayer(), user, weatherDuration);
+    }
+
+    this.weather = weather ? new Weather(weather, weatherDuration.value) : null;
+    this.eventTarget.dispatchEvent(
+      new WeatherChangedEvent(oldWeatherType, this.weather?.weatherType!, this.weather?.turnsLeft!),
+    ); // TODO: is this bang correct?
 
     if (this.weather) {
       globalScene.unshiftPhase(new CommonAnimPhase(undefined, undefined, CommonAnim.SUNNY + (weather - 1), true));
@@ -276,10 +354,15 @@ export class Arena {
       globalScene.queueMessage(getWeatherClearMessage(oldWeatherType)!); // TODO: is this bang correct?
     }
 
-    globalScene.getField(true).filter(p => p.isOnField()).map(pokemon => {
-      pokemon.findAndRemoveTags(t => "weatherTypes" in t && !(t.weatherTypes as WeatherType[]).find(t => t === weather));
-      applyPostWeatherChangeAbAttrs(PostWeatherChangeAbAttr, pokemon, weather);
-    });
+    globalScene
+      .getField(true)
+      .filter(p => p.isOnField())
+      .map(pokemon => {
+        pokemon.findAndRemoveTags(
+          t => "weatherTypes" in t && !(t.weatherTypes as WeatherType[]).find(t => t === weather),
+        );
+        applyPostWeatherChangeAbAttrs(PostWeatherChangeAbAttr, pokemon, weather);
+      });
 
     return true;
   }
@@ -288,12 +371,11 @@ export class Arena {
    * Function to trigger all weather based form changes
    */
   triggerWeatherBasedFormChanges(): void {
-    globalScene.getField(true).forEach( p => {
-      const isCastformWithForecast = (p.hasAbility(Abilities.FORECAST) && p.species.speciesId === Species.CASTFORM);
-      const isCherrimWithFlowerGift = (p.hasAbility(Abilities.FLOWER_GIFT) && p.species.speciesId === Species.CHERRIM);
+    globalScene.getField(true).forEach(p => {
+      const isCastformWithForecast = p.hasAbility(Abilities.FORECAST) && p.species.speciesId === Species.CASTFORM;
+      const isCherrimWithFlowerGift = p.hasAbility(Abilities.FLOWER_GIFT) && p.species.speciesId === Species.CHERRIM;
 
       if (isCastformWithForecast || isCherrimWithFlowerGift) {
-        new ShowAbilityPhase(p.getBattlerIndex());
         globalScene.triggerPokemonFormChange(p, SpeciesFormChangeWeatherTrigger);
       }
     });
@@ -303,26 +385,49 @@ export class Arena {
    * Function to trigger all weather based form changes back into their normal forms
    */
   triggerWeatherBasedFormChangesToNormal(): void {
-    globalScene.getField(true).forEach( p => {
-      const isCastformWithForecast = (p.hasAbility(Abilities.FORECAST, false, true) && p.species.speciesId === Species.CASTFORM);
-      const isCherrimWithFlowerGift = (p.hasAbility(Abilities.FLOWER_GIFT, false, true) && p.species.speciesId === Species.CHERRIM);
+    globalScene.getField(true).forEach(p => {
+      const isCastformWithForecast =
+        p.hasAbility(Abilities.FORECAST, false, true) && p.species.speciesId === Species.CASTFORM;
+      const isCherrimWithFlowerGift =
+        p.hasAbility(Abilities.FLOWER_GIFT, false, true) && p.species.speciesId === Species.CHERRIM;
 
       if (isCastformWithForecast || isCherrimWithFlowerGift) {
-        new ShowAbilityPhase(p.getBattlerIndex());
         return globalScene.triggerPokemonFormChange(p, SpeciesFormChangeRevertWeatherFormTrigger);
       }
     });
   }
 
-  trySetTerrain(terrain: TerrainType, hasPokemonSource: boolean, ignoreAnim: boolean = false): boolean {
-    if (this.terrain?.terrainType === (terrain || undefined)) {
+  /** Returns whether or not the terrain can be set to {@linkcode terrain} */
+  canSetTerrain(terrain: TerrainType): boolean {
+    return !(this.terrain?.terrainType === (terrain || undefined));
+  }
+
+  /**
+   * Attempts to set a new terrain effect to the battle
+   * @param terrain {@linkcode TerrainType} new {@linkcode TerrainType} to set
+   * @param ignoreAnim boolean if the terrain animation should be ignored
+   * @param user {@linkcode Pokemon} that caused the terrain effect
+   * @returns true if new terrain set, false if no terrain provided or attempting to set the same terrain as currently in use
+   */
+  trySetTerrain(terrain: TerrainType, ignoreAnim = false, user?: Pokemon): boolean {
+    if (!this.canSetTerrain(terrain)) {
       return false;
     }
 
     const oldTerrainType = this.terrain?.terrainType || TerrainType.NONE;
 
-    this.terrain = terrain ? new Terrain(terrain, hasPokemonSource ? 5 : 0) : null;
-    this.eventTarget.dispatchEvent(new TerrainChangedEvent(oldTerrainType, this.terrain?.terrainType!, this.terrain?.turnsLeft!)); // TODO: are those bangs correct?
+    const terrainDuration = new NumberHolder(0);
+
+    if (!isNullOrUndefined(user)) {
+      terrainDuration.value = 5;
+      globalScene.applyModifier(FieldEffectModifier, user.isPlayer(), user, terrainDuration);
+    }
+
+    this.terrain = terrain ? new Terrain(terrain, terrainDuration.value) : null;
+
+    this.eventTarget.dispatchEvent(
+      new TerrainChangedEvent(oldTerrainType, this.terrain?.terrainType!, this.terrain?.turnsLeft!),
+    ); // TODO: are those bangs correct?
 
     if (this.terrain) {
       if (!ignoreAnim) {
@@ -333,11 +438,16 @@ export class Arena {
       globalScene.queueMessage(getTerrainClearMessage(oldTerrainType)!); // TODO: is this bang correct?
     }
 
-    globalScene.getField(true).filter(p => p.isOnField()).map(pokemon => {
-      pokemon.findAndRemoveTags(t => "terrainTypes" in t && !(t.terrainTypes as TerrainType[]).find(t => t === terrain));
-      applyPostTerrainChangeAbAttrs(PostTerrainChangeAbAttr, pokemon, terrain);
-      applyAbAttrs(TerrainEventTypeChangeAbAttr, pokemon, null, false);
-    });
+    globalScene
+      .getField(true)
+      .filter(p => p.isOnField())
+      .map(pokemon => {
+        pokemon.findAndRemoveTags(
+          t => "terrainTypes" in t && !(t.terrainTypes as TerrainType[]).find(t => t === terrain),
+        );
+        applyPostTerrainChangeAbAttrs(PostTerrainChangeAbAttr, pokemon, terrain);
+        applyAbAttrs(TerrainEventTypeChangeAbAttr, pokemon, null, false);
+      });
 
     return true;
   }
@@ -350,11 +460,15 @@ export class Arena {
     return !!this.terrain && this.terrain.isMoveTerrainCancelled(user, targets, move);
   }
 
+  public getWeatherType(): WeatherType {
+    return this.weather?.weatherType ?? WeatherType.NONE;
+  }
+
   public getTerrainType(): TerrainType {
     return this.terrain?.terrainType ?? TerrainType.NONE;
   }
 
-  getAttackTypeMultiplier(attackType: Type, grounded: boolean): number {
+  getAttackTypeMultiplier(attackType: PokemonType, grounded: boolean): number {
     let weatherMultiplier = 1;
     if (this.weather && !this.weather.isEffectSuppressed()) {
       weatherMultiplier = this.weather.getAttackTypeMultiplier(attackType);
@@ -460,16 +574,13 @@ export class Arena {
   overrideTint(): [number, number, number] {
     switch (Overrides.ARENA_TINT_OVERRIDE) {
       case TimeOfDay.DUSK:
-        return [ 98, 48, 73 ].map(c => Math.round((c + 128) / 2)) as [number, number, number];
-        break;
-      case (TimeOfDay.NIGHT):
-        return [ 64, 64, 64 ];
-        break;
+        return [98, 48, 73].map(c => Math.round((c + 128) / 2)) as [number, number, number];
+      case TimeOfDay.NIGHT:
+        return [64, 64, 64];
       case TimeOfDay.DAWN:
       case TimeOfDay.DAY:
       default:
-        return [ 128, 128, 128 ];
-        break;
+        return [128, 128, 128];
     }
   }
 
@@ -479,9 +590,9 @@ export class Arena {
     }
     switch (this.biomeType) {
       case Biome.ABYSS:
-        return [ 64, 64, 64 ];
+        return [64, 64, 64];
       default:
-        return [ 128, 128, 128 ];
+        return [128, 128, 128];
     }
   }
 
@@ -490,12 +601,12 @@ export class Arena {
       return this.overrideTint();
     }
     if (!this.isOutside()) {
-      return [ 0, 0, 0 ];
+      return [0, 0, 0];
     }
 
     switch (this.biomeType) {
       default:
-        return [ 98, 48, 73 ].map(c => Math.round((c + 128) / 2)) as [number, number, number];
+        return [98, 48, 73].map(c => Math.round((c + 128) / 2)) as [number, number, number];
     }
   }
 
@@ -511,12 +622,12 @@ export class Arena {
     }
 
     if (!this.isOutside()) {
-      return [ 64, 64, 64 ];
+      return [64, 64, 64];
     }
 
     switch (this.biomeType) {
       default:
-        return [ 48, 48, 98 ];
+        return [48, 48, 98];
     }
   }
 
@@ -532,10 +643,16 @@ export class Arena {
    * @param simulated if `true`, this applies arena tags without changing game state
    * @param args array of parameters that the called upon tags may need
    */
-  applyTagsForSide(tagType: ArenaTagType | Constructor<ArenaTag>, side: ArenaTagSide, simulated: boolean, ...args: unknown[]): void {
-    let tags = typeof tagType === "string"
-      ? this.tags.filter(t => t.tagType === tagType)
-      : this.tags.filter(t => t instanceof tagType);
+  applyTagsForSide(
+    tagType: ArenaTagType | Constructor<ArenaTag>,
+    side: ArenaTagSide,
+    simulated: boolean,
+    ...args: unknown[]
+  ): void {
+    let tags =
+      typeof tagType === "string"
+        ? this.tags.filter(t => t.tagType === tagType)
+        : this.tags.filter(t => t instanceof tagType);
     if (side !== ArenaTagSide.BOTH) {
       tags = tags.filter(t => t.side === side);
     }
@@ -564,10 +681,18 @@ export class Arena {
    * @param targetIndex The {@linkcode BattlerIndex} of the target pokemon
    * @returns `false` if there already exists a tag of this type in the Arena
    */
-  addTag(tagType: ArenaTagType, turnCount: number, sourceMove: Moves | undefined, sourceId: number, side: ArenaTagSide = ArenaTagSide.BOTH, quiet: boolean = false, targetIndex?: BattlerIndex): boolean {
+  addTag(
+    tagType: ArenaTagType,
+    turnCount: number,
+    sourceMove: Moves | undefined,
+    sourceId: number,
+    side: ArenaTagSide = ArenaTagSide.BOTH,
+    quiet = false,
+    targetIndex?: BattlerIndex,
+  ): boolean {
     const existingTag = this.getTagOnSide(tagType, side);
     if (existingTag) {
-      existingTag.onOverlap(this);
+      existingTag.onOverlap(this, globalScene.getPokemonById(sourceId));
 
       if (existingTag instanceof ArenaTrapTag) {
         const { tagType, side, turnCount, layers, maxLayers } = existingTag as ArenaTrapTag;
@@ -580,12 +705,14 @@ export class Arena {
     // creates a new tag object
     const newTag = getArenaTag(tagType, turnCount || 0, sourceMove, sourceId, targetIndex, side);
     if (newTag) {
-      this.tags.push(newTag);
       newTag.onAdd(this, quiet);
+      this.tags.push(newTag);
 
       const { layers = 0, maxLayers = 0 } = newTag instanceof ArenaTrapTag ? newTag : {};
 
-      this.eventTarget.dispatchEvent(new TagAddedEvent(newTag.tagType, newTag.side, newTag.turnCount, layers, maxLayers));
+      this.eventTarget.dispatchEvent(
+        new TagAddedEvent(newTag.tagType, newTag.side, newTag.turnCount, layers, maxLayers),
+      );
     }
 
     return true;
@@ -600,7 +727,7 @@ export class Arena {
     return this.getTagOnSide(tagType, ArenaTagSide.BOTH);
   }
 
-  hasTag(tagType: ArenaTagType) : boolean {
+  hasTag(tagType: ArenaTagType): boolean {
     return !!this.getTag(tagType);
   }
 
@@ -613,9 +740,13 @@ export class Arena {
    * @returns either the {@linkcode ArenaTag}, or `undefined` if it isn't there
    */
   getTagOnSide(tagType: ArenaTagType | Constructor<ArenaTag>, side: ArenaTagSide): ArenaTag | undefined {
-    return typeof(tagType) === "string"
-      ? this.tags.find(t => t.tagType === tagType && (side === ArenaTagSide.BOTH || t.side === ArenaTagSide.BOTH || t.side === side))
-      : this.tags.find(t => t instanceof tagType && (side === ArenaTagSide.BOTH || t.side === ArenaTagSide.BOTH || t.side === side));
+    return typeof tagType === "string"
+      ? this.tags.find(
+          t => t.tagType === tagType && (side === ArenaTagSide.BOTH || t.side === ArenaTagSide.BOTH || t.side === side),
+        )
+      : this.tags.find(
+          t => t instanceof tagType && (side === ArenaTagSide.BOTH || t.side === ArenaTagSide.BOTH || t.side === side),
+        );
   }
 
   /**
@@ -634,16 +765,20 @@ export class Arena {
    * @returns array of {@linkcode ArenaTag}s from which the Arena's tags return `true` and apply to the given side
    */
   findTagsOnSide(tagPredicate: (t: ArenaTag) => boolean, side: ArenaTagSide): ArenaTag[] {
-    return this.tags.filter(t => tagPredicate(t) && (side === ArenaTagSide.BOTH || t.side === ArenaTagSide.BOTH || t.side === side));
+    return this.tags.filter(
+      t => tagPredicate(t) && (side === ArenaTagSide.BOTH || t.side === ArenaTagSide.BOTH || t.side === side),
+    );
   }
 
   lapseTags(): void {
-    this.tags.filter(t => !(t.lapse(this))).forEach(t => {
-      t.onRemove(this);
-      this.tags.splice(this.tags.indexOf(t), 1);
+    this.tags
+      .filter(t => !t.lapse(this))
+      .forEach(t => {
+        t.onRemove(this);
+        this.tags.splice(this.tags.indexOf(t), 1);
 
-      this.eventTarget.dispatchEvent(new TagRemovedEvent(t.tagType, t.side, t.turnCount));
-    });
+        this.eventTarget.dispatchEvent(new TagRemovedEvent(t.tagType, t.side, t.turnCount));
+      });
   }
 
   removeTag(tagType: ArenaTagType): boolean {
@@ -658,7 +793,7 @@ export class Arena {
     return !!tag;
   }
 
-  removeTagOnSide(tagType: ArenaTagType, side: ArenaTagSide, quiet: boolean = false): boolean {
+  removeTagOnSide(tagType: ArenaTagType, side: ArenaTagSide, quiet = false): boolean {
     const tag = this.getTagOnSide(tagType, side);
     if (tag) {
       tag.onRemove(this, quiet);
@@ -669,11 +804,12 @@ export class Arena {
     return !!tag;
   }
 
-
   removeAllTags(): void {
     while (this.tags.length) {
       this.tags[0].onRemove(this);
-      this.eventTarget.dispatchEvent(new TagRemovedEvent(this.tags[0].tagType, this.tags[0].side, this.tags[0].turnCount));
+      this.eventTarget.dispatchEvent(
+        new TagRemovedEvent(this.tags[0].tagType, this.tags[0].side, this.tags[0].turnCount),
+      );
 
       this.tags.splice(0, 1);
     }
@@ -685,9 +821,10 @@ export class Arena {
   resetArenaEffects(): void {
     // Don't reset weather if a Biome's permanent weather is active
     if (this.weather?.turnsLeft !== 0) {
-      this.trySetWeather(WeatherType.NONE, false);
+      this.trySetWeather(WeatherType.NONE);
     }
-    this.trySetTerrain(TerrainType.NONE, false, true);
+    this.trySetTerrain(TerrainType.NONE, true);
+    this.resetPlayerFaintCount();
     this.removeAllTags();
   }
 
@@ -707,7 +844,7 @@ export class Arena {
       case Biome.TALL_GRASS:
         return 9.608;
       case Biome.METROPOLIS:
-        return 141.470;
+        return 141.47;
       case Biome.FOREST:
         return 0.341;
       case Biome.SEA:
@@ -719,17 +856,17 @@ export class Arena {
       case Biome.LAKE:
         return 7.215;
       case Biome.SEABED:
-        return 2.600;
+        return 2.6;
       case Biome.MOUNTAIN:
         return 4.018;
       case Biome.BADLANDS:
-        return 17.790;
+        return 17.79;
       case Biome.CAVE:
-        return 14.240;
+        return 14.24;
       case Biome.DESERT:
         return 1.143;
       case Biome.ICE_CAVE:
-        return 0.000;
+        return 0.0;
       case Biome.MEADOW:
         return 3.891;
       case Biome.POWER_PLANT:
@@ -743,17 +880,17 @@ export class Arena {
       case Biome.FACTORY:
         return 4.985;
       case Biome.RUINS:
-        return 0.000;
+        return 0.0;
       case Biome.WASTELAND:
         return 6.336;
       case Biome.ABYSS:
-        return 5.130;
+        return 5.13;
       case Biome.SPACE:
         return 20.036;
       case Biome.CONSTRUCTION_SITE:
         return 1.222;
       case Biome.JUNGLE:
-        return 0.000;
+        return 0.0;
       case Biome.FAIRY_CAVE:
         return 4.542;
       case Biome.TEMPLE:
@@ -763,7 +900,7 @@ export class Arena {
       case Biome.LABORATORY:
         return 114.862;
       case Biome.SLUM:
-        return 0.000;
+        return 0.0;
       case Biome.SNOWY_FOREST:
         return 3.047;
       case Biome.END:
@@ -773,6 +910,10 @@ export class Arena {
         return 0;
     }
   }
+
+  resetPlayerFaintCount(): void {
+    this.playerFaints = 0;
+  }
 }
 
 export function getBiomeKey(biome: Biome): string {
@@ -827,13 +968,14 @@ export class ArenaBase extends Phaser.GameObjects.Container {
     this.base = globalScene.addFieldSprite(0, 0, "plains_a", undefined, 1);
     this.base.setOrigin(0, 0);
 
-    this.props = !player ?
-      new Array(3).fill(null).map(() => {
-        const ret = globalScene.addFieldSprite(0, 0, "plains_b", undefined, 1);
-        ret.setOrigin(0, 0);
-        ret.setVisible(false);
-        return ret;
-      }) : [];
+    this.props = !player
+      ? new Array(3).fill(null).map(() => {
+          const ret = globalScene.addFieldSprite(0, 0, "plains_b", undefined, 1);
+          ret.setOrigin(0, 0);
+          ret.setVisible(false);
+          return ret;
+        })
+      : [];
   }
 
   setBiome(biome: Biome, propValue?: number): void {
@@ -845,13 +987,18 @@ export class ArenaBase extends Phaser.GameObjects.Container {
       this.base.setTexture(baseKey);
 
       if (this.base.texture.frameTotal > 1) {
-        const baseFrameNames = globalScene.anims.generateFrameNames(baseKey, { zeroPad: 4, suffix: ".png", start: 1, end: this.base.texture.frameTotal - 1 });
-        if (!(globalScene.anims.exists(baseKey))) {
+        const baseFrameNames = globalScene.anims.generateFrameNames(baseKey, {
+          zeroPad: 4,
+          suffix: ".png",
+          start: 1,
+          end: this.base.texture.frameTotal - 1,
+        });
+        if (!globalScene.anims.exists(baseKey)) {
           globalScene.anims.create({
             key: baseKey,
             frames: baseFrameNames,
             frameRate: 12,
-            repeat: -1
+            repeat: -1,
           });
         }
         this.base.play(baseKey);
@@ -863,33 +1010,40 @@ export class ArenaBase extends Phaser.GameObjects.Container {
     }
 
     if (!this.player) {
-      globalScene.executeWithSeedOffset(() => {
-        this.propValue = propValue === undefined
-          ? hasProps ? Utils.randSeedInt(8) : 0
-          : propValue;
-        this.props.forEach((prop, p) => {
-          const propKey = `${biomeKey}_b${hasProps ? `_${p + 1}` : ""}`;
-          prop.setTexture(propKey);
+      globalScene.executeWithSeedOffset(
+        () => {
+          this.propValue = propValue === undefined ? (hasProps ? randSeedInt(8) : 0) : propValue;
+          this.props.forEach((prop, p) => {
+            const propKey = `${biomeKey}_b${hasProps ? `_${p + 1}` : ""}`;
+            prop.setTexture(propKey);
 
-          if (hasProps && prop.texture.frameTotal > 1) {
-            const propFrameNames = globalScene.anims.generateFrameNames(propKey, { zeroPad: 4, suffix: ".png", start: 1, end: prop.texture.frameTotal - 1 });
-            if (!(globalScene.anims.exists(propKey))) {
-              globalScene.anims.create({
-                key: propKey,
-                frames: propFrameNames,
-                frameRate: 12,
-                repeat: -1
+            if (hasProps && prop.texture.frameTotal > 1) {
+              const propFrameNames = globalScene.anims.generateFrameNames(propKey, {
+                zeroPad: 4,
+                suffix: ".png",
+                start: 1,
+                end: prop.texture.frameTotal - 1,
               });
+              if (!globalScene.anims.exists(propKey)) {
+                globalScene.anims.create({
+                  key: propKey,
+                  frames: propFrameNames,
+                  frameRate: 12,
+                  repeat: -1,
+                });
+              }
+              prop.play(propKey);
+            } else {
+              prop.stop();
             }
-            prop.play(propKey);
-          } else {
-            prop.stop();
-          }
 
-          prop.setVisible(hasProps && !!(this.propValue & (1 << p)));
-          this.add(prop);
-        });
-      }, globalScene.currentBattle?.waveIndex || 0, globalScene.waveSeed);
+            prop.setVisible(hasProps && !!(this.propValue & (1 << p)));
+            this.add(prop);
+          });
+        },
+        globalScene.currentBattle?.waveIndex || 0,
+        globalScene.waveSeed,
+      );
     }
   }
 }
diff --git a/src/field/damage-number-handler.ts b/src/field/damage-number-handler.ts
index 1551edc9697..bfb85018dd6 100644
--- a/src/field/damage-number-handler.ts
+++ b/src/field/damage-number-handler.ts
@@ -2,11 +2,11 @@ import { TextStyle, addTextObject } from "../ui/text";
 import type { DamageResult } from "./pokemon";
 import type Pokemon from "./pokemon";
 import { HitResult } from "./pokemon";
-import * as Utils from "../utils";
+import { formatStat, fixedInt } from "#app/utils/common";
 import type { BattlerIndex } from "../battle";
 import { globalScene } from "#app/global-scene";
 
-type TextAndShadowArr = [ string | null, string | null ];
+type TextAndShadowArr = [string | null, string | null];
 
 export default class DamageNumberHandler {
   private damageNumbers: Map<BattlerIndex, Phaser.GameObjects.Text[]>;
@@ -15,35 +15,46 @@ export default class DamageNumberHandler {
     this.damageNumbers = new Map();
   }
 
-  add(target: Pokemon, amount: number, result: DamageResult | HitResult.HEAL = HitResult.EFFECTIVE, critical: boolean = false): void {
+  add(
+    target: Pokemon,
+    amount: number,
+    result: DamageResult | HitResult.HEAL = HitResult.EFFECTIVE,
+    critical = false,
+  ): void {
     if (!globalScene?.damageNumbersMode) {
       return;
     }
 
     const battlerIndex = target.getBattlerIndex();
     const baseScale = target.getSpriteScale() / 6;
-    const damageNumber = addTextObject(target.x, -(globalScene.game.canvas.height / 6) + target.y - target.getSprite().height / 2, Utils.formatStat(amount, true), TextStyle.SUMMARY);
+    const damageNumber = addTextObject(
+      target.x,
+      -(globalScene.game.canvas.height / 6) + target.y - target.getSprite().height / 2,
+      formatStat(amount, true),
+      TextStyle.SUMMARY,
+    );
     damageNumber.setName("text-damage-number");
     damageNumber.setOrigin(0.5, 1);
     damageNumber.setScale(baseScale);
 
-    let [ textColor, shadowColor ] : TextAndShadowArr = [ null, null ];
+    let [textColor, shadowColor]: TextAndShadowArr = [null, null];
 
     switch (result) {
       case HitResult.SUPER_EFFECTIVE:
-        [ textColor, shadowColor ] = [ "#f8d030", "#b8a038" ];
+        [textColor, shadowColor] = ["#f8d030", "#b8a038"];
         break;
       case HitResult.NOT_VERY_EFFECTIVE:
-        [ textColor, shadowColor ] = [ "#f08030", "#c03028" ];
+        [textColor, shadowColor] = ["#f08030", "#c03028"];
         break;
+      case HitResult.INDIRECT_KO:
       case HitResult.ONE_HIT_KO:
-        [ textColor, shadowColor ] = [ "#a040a0", "#483850" ];
+        [textColor, shadowColor] = ["#a040a0", "#483850"];
         break;
       case HitResult.HEAL:
-        [ textColor, shadowColor ] = [ "#78c850", "#588040" ];
+        [textColor, shadowColor] = ["#78c850", "#588040"];
         break;
       default:
-        [ textColor, shadowColor ] = [ "#ffffff", "#636363" ];
+        [textColor, shadowColor] = ["#ffffff", "#636363"];
         break;
     }
 
@@ -75,20 +86,20 @@ export default class DamageNumberHandler {
     if (globalScene.damageNumbersMode === 1) {
       globalScene.tweens.add({
         targets: damageNumber,
-        duration: Utils.fixedInt(750),
+        duration: fixedInt(750),
         alpha: 1,
-        y: "-=32"
+        y: "-=32",
       });
       globalScene.tweens.add({
         delay: 375,
         targets: damageNumber,
-        duration: Utils.fixedInt(625),
+        duration: fixedInt(625),
         alpha: 0,
         ease: "Sine.easeIn",
         onComplete: () => {
           this.damageNumbers.get(battlerIndex)!.splice(this.damageNumbers.get(battlerIndex)!.indexOf(damageNumber), 1);
           damageNumber.destroy(true);
-        }
+        },
       });
       return;
     }
@@ -99,82 +110,84 @@ export default class DamageNumberHandler {
       targets: damageNumber,
       tweens: [
         {
-          duration: Utils.fixedInt(250),
+          duration: fixedInt(250),
           alpha: 1,
           scaleX: 0.75 * baseScale,
           scaleY: 1.25 * baseScale,
           y: "-=16",
-          ease: "Cubic.easeOut"
+          ease: "Cubic.easeOut",
         },
         {
-          duration: Utils.fixedInt(175),
+          duration: fixedInt(175),
           alpha: 1,
           scaleX: 0.875 * baseScale,
           scaleY: 1.125 * baseScale,
           y: "+=16",
-          ease: "Cubic.easeIn"
+          ease: "Cubic.easeIn",
         },
         {
-          duration: Utils.fixedInt(100),
+          duration: fixedInt(100),
           scaleX: 1.25 * baseScale,
           scaleY: 0.75 * baseScale,
-          ease: "Cubic.easeOut"
+          ease: "Cubic.easeOut",
         },
         {
-          duration: Utils.fixedInt(175),
+          duration: fixedInt(175),
           scaleX: 0.875 * baseScale,
           scaleY: 1.125 * baseScale,
           y: "-=8",
-          ease: "Cubic.easeOut"
+          ease: "Cubic.easeOut",
         },
         {
-          duration: Utils.fixedInt(50),
+          duration: fixedInt(50),
           scaleX: 0.925 * baseScale,
           scaleY: 1.075 * baseScale,
           y: "+=8",
-          ease: "Cubic.easeIn"
+          ease: "Cubic.easeIn",
         },
         {
-          duration: Utils.fixedInt(100),
+          duration: fixedInt(100),
           scaleX: 1.125 * baseScale,
           scaleY: 0.875 * baseScale,
-          ease: "Cubic.easeOut"
+          ease: "Cubic.easeOut",
         },
         {
-          duration: Utils.fixedInt(175),
+          duration: fixedInt(175),
           scaleX: 0.925 * baseScale,
           scaleY: 1.075 * baseScale,
           y: "-=4",
-          ease: "Cubic.easeOut"
+          ease: "Cubic.easeOut",
         },
         {
-          duration: Utils.fixedInt(50),
+          duration: fixedInt(50),
           scaleX: 0.975 * baseScale,
           scaleY: 1.025 * baseScale,
           y: "+=4",
-          ease: "Cubic.easeIn"
+          ease: "Cubic.easeIn",
         },
         {
-          duration: Utils.fixedInt(100),
+          duration: fixedInt(100),
           scaleX: 1.075 * baseScale,
           scaleY: 0.925 * baseScale,
-          ease: "Cubic.easeOut"
+          ease: "Cubic.easeOut",
         },
         {
-          duration: Utils.fixedInt(25),
+          duration: fixedInt(25),
           scaleX: baseScale,
           scaleY: baseScale,
-          ease: "Cubic.easeOut"
+          ease: "Cubic.easeOut",
         },
         {
-          delay: Utils.fixedInt(500),
+          delay: fixedInt(500),
           alpha: 0,
           onComplete: () => {
-            this.damageNumbers.get(battlerIndex)!.splice(this.damageNumbers.get(battlerIndex)!.indexOf(damageNumber), 1);
+            this.damageNumbers
+              .get(battlerIndex)!
+              .splice(this.damageNumbers.get(battlerIndex)!.indexOf(damageNumber), 1);
             damageNumber.destroy(true);
-          }
-        }
-      ]
+          },
+        },
+      ],
     });
   }
 }
diff --git a/src/field/mystery-encounter-intro.ts b/src/field/mystery-encounter-intro.ts
index 1ea8f16e8f7..b6212b6b031 100644
--- a/src/field/mystery-encounter-intro.ts
+++ b/src/field/mystery-encounter-intro.ts
@@ -2,11 +2,12 @@ import type { GameObjects } from "phaser";
 import { globalScene } from "#app/global-scene";
 import type MysteryEncounter from "#app/data/mystery-encounters/mystery-encounter";
 import type { Species } from "#enums/species";
-import { isNullOrUndefined } from "#app/utils";
+import { isNullOrUndefined } from "#app/utils/common";
 import { getSpriteKeysFromSpecies } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils";
-import type { Variant } from "#app/data/variant";
+import type { Variant } from "#app/sprites/variant";
 import { doShinySparkleAnim } from "#app/field/anims";
 import PlayAnimationConfig = Phaser.Types.Animations.PlayAnimationConfig;
+import { loadPokemonVariantAssets } from "#app/sprites/pokemon-sprite";
 
 type KnownFileRoot =
   | "arenas"
@@ -36,7 +37,7 @@ export class MysteryEncounterSpriteConfig {
   /** The sprite key (which is the image file name). e.g. "ace_trainer_f" */
   spriteKey: string;
   /** Refer to [/public/images](../../public/images) directorty for all folder names */
-  fileRoot: KnownFileRoot & string | string;
+  fileRoot: (KnownFileRoot & string) | string;
   /** Optional replacement for `spriteKey`/`fileRoot`. Just know this defaults to male/genderless, form 0, no shiny */
   species?: Species;
   /** Enable shadow. Defaults to `false` */
@@ -80,7 +81,10 @@ export default class MysteryEncounterIntroVisuals extends Phaser.GameObjects.Con
   public encounter: MysteryEncounter;
   public spriteConfigs: MysteryEncounterSpriteConfig[];
   public enterFromRight: boolean;
-  private shinySparkleSprites: { sprite: Phaser.GameObjects.Sprite, variant: Variant }[];
+  private shinySparkleSprites: {
+    sprite: Phaser.GameObjects.Sprite;
+    variant: Variant;
+  }[];
 
   constructor(encounter: MysteryEncounter) {
     super(globalScene, -72, 76);
@@ -89,7 +93,7 @@ export default class MysteryEncounterIntroVisuals extends Phaser.GameObjects.Con
     // Shallow copy configs to allow visual config updates at runtime without dirtying master copy of Encounter
     this.spriteConfigs = encounter.spriteConfigs.map(config => {
       const result = {
-        ...config
+        ...config,
       };
 
       if (!isNullOrUndefined(result.species)) {
@@ -108,14 +112,22 @@ export default class MysteryEncounterIntroVisuals extends Phaser.GameObjects.Con
     const getSprite = (spriteKey: string, hasShadow?: boolean, yShadow?: number) => {
       const ret = globalScene.addFieldSprite(0, 0, spriteKey);
       ret.setOrigin(0.5, 1);
-      ret.setPipeline(globalScene.spritePipeline, { tone: [ 0.0, 0.0, 0.0, 0.0 ], hasShadow: !!hasShadow, yShadowOffset: yShadow ?? 0 });
+      ret.setPipeline(globalScene.spritePipeline, {
+        tone: [0.0, 0.0, 0.0, 0.0],
+        hasShadow: !!hasShadow,
+        yShadowOffset: yShadow ?? 0,
+      });
       return ret;
     };
 
     const getItemSprite = (spriteKey: string, hasShadow?: boolean, yShadow?: number) => {
       const icon = globalScene.add.sprite(-19, 2, "items", spriteKey);
       icon.setOrigin(0.5, 1);
-      icon.setPipeline(globalScene.spritePipeline, { tone: [ 0.0, 0.0, 0.0, 0.0 ], hasShadow: !!hasShadow, yShadowOffset: yShadow ?? 0 });
+      icon.setPipeline(globalScene.spritePipeline, {
+        tone: [0.0, 0.0, 0.0, 0.0],
+        hasShadow: !!hasShadow,
+        yShadowOffset: yShadow ?? 0,
+      });
       return icon;
     };
 
@@ -129,7 +141,7 @@ export default class MysteryEncounterIntroVisuals extends Phaser.GameObjects.Con
 
     this.shinySparkleSprites = [];
     const shinySparkleSprites = globalScene.add.container(0, 0);
-    this.spriteConfigs?.forEach((config) => {
+    this.spriteConfigs?.forEach(config => {
       const { spriteKey, isItem, hasShadow, scale, x, y, yShadow, alpha, isPokemon, isShiny, variant } = config;
 
       let sprite: GameObjects.Sprite;
@@ -154,7 +166,10 @@ export default class MysteryEncounterIntroVisuals extends Phaser.GameObjects.Con
           pokemonShinySparkle = globalScene.add.sprite(sprite.x, sprite.y, "shiny");
           pokemonShinySparkle.setOrigin(0.5, 1);
           pokemonShinySparkle.setVisible(false);
-          this.shinySparkleSprites.push({ sprite: pokemonShinySparkle, variant: variant ?? 0 });
+          this.shinySparkleSprites.push({
+            sprite: pokemonShinySparkle,
+            variant: variant ?? 0,
+          });
           shinySparkleSprites.add(pokemonShinySparkle);
         }
       }
@@ -216,11 +231,11 @@ export default class MysteryEncounterIntroVisuals extends Phaser.GameObjects.Con
       }
 
       const shinyPromises: Promise<void>[] = [];
-      this.spriteConfigs.forEach((config) => {
+      this.spriteConfigs.forEach(config => {
         if (config.isPokemon) {
           globalScene.loadPokemonAtlas(config.spriteKey, config.fileRoot);
-          if (config.isShiny) {
-            shinyPromises.push(globalScene.loadPokemonVariantAssets(config.spriteKey, config.fileRoot, config.variant));
+          if (config.isShiny && !isNullOrUndefined(config.variant)) {
+            shinyPromises.push(loadPokemonVariantAssets(config.spriteKey, config.fileRoot, config.variant));
           }
         } else if (config.isItem) {
           globalScene.loadAtlas("items", "");
@@ -230,7 +245,7 @@ export default class MysteryEncounterIntroVisuals extends Phaser.GameObjects.Con
       });
 
       globalScene.load.once(Phaser.Loader.Events.COMPLETE, () => {
-        this.spriteConfigs.every((config) => {
+        this.spriteConfigs.every(config => {
           if (config.isItem) {
             return true;
           }
@@ -238,17 +253,21 @@ export default class MysteryEncounterIntroVisuals extends Phaser.GameObjects.Con
           const originalWarn = console.warn;
 
           // Ignore warnings for missing frames, because there will be a lot
-          console.warn = () => {
-          };
-          const frameNames = globalScene.anims.generateFrameNames(config.spriteKey, { zeroPad: 4, suffix: ".png", start: 1, end: 128 });
+          console.warn = () => {};
+          const frameNames = globalScene.anims.generateFrameNames(config.spriteKey, {
+            zeroPad: 4,
+            suffix: ".png",
+            start: 1,
+            end: 128,
+          });
 
           console.warn = originalWarn;
-          if (!(globalScene.anims.exists(config.spriteKey))) {
+          if (!globalScene.anims.exists(config.spriteKey)) {
             globalScene.anims.create({
               key: config.spriteKey,
               frames: frameNames,
               frameRate: 10,
-              repeat: -1
+              repeat: -1,
             });
           }
 
@@ -313,7 +332,11 @@ export default class MysteryEncounterIntroVisuals extends Phaser.GameObjects.Con
    * @param animConfig {@linkcode Phaser.Types.Animations.PlayAnimationConfig} to pass to {@linkcode Phaser.GameObjects.Sprite.play}
    * @returns true if the sprite was able to be animated
    */
-  tryPlaySprite(sprite: Phaser.GameObjects.Sprite, tintSprite: Phaser.GameObjects.Sprite, animConfig: Phaser.Types.Animations.PlayAnimationConfig): boolean {
+  tryPlaySprite(
+    sprite: Phaser.GameObjects.Sprite,
+    tintSprite: Phaser.GameObjects.Sprite,
+    animConfig: Phaser.Types.Animations.PlayAnimationConfig,
+  ): boolean {
     // Show an error in the console if there isn't a texture loaded
     if (sprite.texture.key === "__MISSING") {
       console.error(`No texture found for '${animConfig.key}'!`);
@@ -359,7 +382,7 @@ export default class MysteryEncounterIntroVisuals extends Phaser.GameObjects.Con
         const trainerAnimConfig: PlayAnimationConfig = {
           key: config.spriteKey,
           repeat: config?.repeat ? -1 : 0,
-          startFrame: config?.startFrame ?? 0
+          startFrame: config?.startFrame ?? 0,
         };
 
         this.tryPlaySprite(sprites[i], tintSprites[i], trainerAnimConfig);
@@ -392,7 +415,7 @@ export default class MysteryEncounterIntroVisuals extends Phaser.GameObjects.Con
     }
 
     const ret: Phaser.GameObjects.Sprite[] = [];
-    this.spriteConfigs.forEach((config, i) => {
+    this.spriteConfigs.forEach((_, i) => {
       ret.push(this.getAt(i * 2));
     });
     return ret;
@@ -407,7 +430,7 @@ export default class MysteryEncounterIntroVisuals extends Phaser.GameObjects.Con
     }
 
     const ret: Phaser.GameObjects.Sprite[] = [];
-    this.spriteConfigs.forEach((config, i) => {
+    this.spriteConfigs.forEach((_, i) => {
       ret.push(this.getAt(i * 2 + 1));
     });
 
@@ -434,7 +457,7 @@ export default class MysteryEncounterIntroVisuals extends Phaser.GameObjects.Con
         targets: sprite,
         alpha: alpha || 1,
         duration: duration,
-        ease: ease || "Linear"
+        ease: ease || "Linear",
       });
     } else {
       sprite.setAlpha(alpha);
@@ -471,7 +494,7 @@ export default class MysteryEncounterIntroVisuals extends Phaser.GameObjects.Con
         onComplete: () => {
           sprite.setVisible(false);
           sprite.setAlpha(1);
-        }
+        },
       });
     } else {
       sprite.setVisible(false);
@@ -497,9 +520,9 @@ export default class MysteryEncounterIntroVisuals extends Phaser.GameObjects.Con
    * @param value - true for visible, false for hidden
    */
   setVisible(value: boolean): this {
-    this.getSprites().forEach(sprite => {
+    for (const sprite of this.getSprites()) {
       sprite.setVisible(value);
-    });
+    }
     return super.setVisible(value);
   }
 }
diff --git a/src/field/pokemon-sprite-sparkle-handler.ts b/src/field/pokemon-sprite-sparkle-handler.ts
index 074933f0f00..cceb0bd7717 100644
--- a/src/field/pokemon-sprite-sparkle-handler.ts
+++ b/src/field/pokemon-sprite-sparkle-handler.ts
@@ -1,6 +1,6 @@
 import { globalScene } from "#app/global-scene";
 import Pokemon from "./pokemon";
-import * as Utils from "../utils";
+import { fixedInt, randInt } from "#app/utils/common";
 
 export default class PokemonSpriteSparkleHandler {
   private sprites: Set<Phaser.GameObjects.Sprite>;
@@ -9,17 +9,19 @@ export default class PokemonSpriteSparkleHandler {
     this.sprites = new Set();
 
     globalScene.tweens.addCounter({
-      duration: Utils.fixedInt(200),
+      duration: fixedInt(200),
       from: 0,
       to: 1,
       yoyo: true,
       repeat: -1,
-      onRepeat: () => this.onLapse()
+      onRepeat: () => this.onLapse(),
     });
   }
 
   onLapse(): void {
-    Array.from(this.sprites.values()).filter(s => !s.scene).map(s => this.sprites.delete(s));
+    Array.from(this.sprites.values())
+      .filter(s => !s.scene)
+      .map(s => this.sprites.delete(s));
     for (const s of this.sprites.values()) {
       if (!s.pipelineData["teraColor"] || !(s.pipelineData["teraColor"] as number[]).find(c => c)) {
         continue;
@@ -27,29 +29,36 @@ export default class PokemonSpriteSparkleHandler {
       if (!s.visible || (s.parentContainer instanceof Pokemon && !s.parentContainer.parentContainer)) {
         continue;
       }
-      const pokemon = s.parentContainer instanceof Pokemon ? s.parentContainer as Pokemon : null;
+      if (!(s.parentContainer instanceof Pokemon) || !(s.parentContainer as Pokemon).isTerastallized) {
+        continue;
+      }
+      const pokemon = s.parentContainer instanceof Pokemon ? (s.parentContainer as Pokemon) : null;
       const parent = (pokemon || s).parentContainer;
       const texture = s.texture;
-      const [ width, height ] = [ texture.source[0].width, texture.source[0].height ];
-      const [ pixelX, pixelY ] = [ Utils.randInt(width), Utils.randInt(height) ];
+      const [width, height] = [texture.source[0].width, texture.source[0].height];
+      const [pixelX, pixelY] = [randInt(width), randInt(height)];
       const ratioX = s.width / width;
       const ratioY = s.height / height;
       const pixel = texture.manager.getPixel(pixelX, pixelY, texture.key, "__BASE");
       if (pixel?.alpha) {
-        const [ xOffset, yOffset ] = [ -s.originX * s.width, -s.originY * s.height ];
-        const sparkle = globalScene.addFieldSprite(((pokemon?.x || 0) + s.x + pixelX * ratioX + xOffset), ((pokemon?.y || 0) + s.y + pixelY * ratioY + yOffset), "tera_sparkle");
+        const [xOffset, yOffset] = [-s.originX * s.width, -s.originY * s.height];
+        const sparkle = globalScene.addFieldSprite(
+          (pokemon?.x || 0) + s.x + pixelX * ratioX + xOffset,
+          (pokemon?.y || 0) + s.y + pixelY * ratioY + yOffset,
+          "tera_sparkle",
+        );
         sparkle.pipelineData["ignoreTimeTint"] = s.pipelineData["ignoreTimeTint"];
         sparkle.setName("sprite-tera-sparkle");
         sparkle.play("tera_sparkle");
         parent.add(sparkle);
-        s.scene.time.delayedCall(Utils.fixedInt(Math.floor((1000 / 12) * 13)), () => sparkle.destroy());
+        s.scene.time.delayedCall(fixedInt(Math.floor((1000 / 12) * 13)), () => sparkle.destroy());
       }
     }
   }
 
   add(sprites: Phaser.GameObjects.Sprite | Phaser.GameObjects.Sprite[]): void {
     if (!Array.isArray(sprites)) {
-      sprites = [ sprites ];
+      sprites = [sprites];
     }
     for (const s of sprites) {
       if (this.sprites.has(s)) {
@@ -61,7 +70,7 @@ export default class PokemonSpriteSparkleHandler {
 
   remove(sprites: Phaser.GameObjects.Sprite | Phaser.GameObjects.Sprite[]): void {
     if (!Array.isArray(sprites)) {
-      sprites = [ sprites ];
+      sprites = [sprites];
     }
     for (const s of sprites) {
       this.sprites.delete(s);
diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts
index 16af8364502..b10a62eeb02 100644
--- a/src/field/pokemon.ts
+++ b/src/field/pokemon.ts
@@ -2,53 +2,222 @@ import Phaser from "phaser";
 import type { AnySound } from "#app/battle-scene";
 import type BattleScene from "#app/battle-scene";
 import { globalScene } from "#app/global-scene";
-import type { Variant, VariantSet } from "#app/data/variant";
-import { variantColorCache } from "#app/data/variant";
-import { variantData } from "#app/data/variant";
-import BattleInfo, { PlayerBattleInfo, EnemyBattleInfo } from "#app/ui/battle-info";
-import type Move from "#app/data/move";
-import { HighCritAttr, HitsTagAttr, applyMoveAttrs, FixedDamageAttr, VariableAtkAttr, allMoves, MoveCategory, TypelessAttr, CritOnlyAttr, getMoveTargets, OneHitKOAttr, VariableMoveTypeAttr, VariableDefAttr, AttackMove, ModifiedDamageAttr, VariableMoveTypeMultiplierAttr, IgnoreOpponentStatStagesAttr, SacrificialAttr, VariableMoveCategoryAttr, CounterDamageAttr, StatStageChangeAttr, RechargeAttr, IgnoreWeatherTypeDebuffAttr, BypassBurnDamageReductionAttr, SacrificialAttrOnHit, OneHitKOAccuracyAttr, RespectAttackTypeImmunityAttr, MoveTarget, CombinedPledgeStabBoostAttr, VariableMoveTypeChartAttr, HpSplitAttr } from "#app/data/move";
+import type { Variant } from "#app/sprites/variant";
+import { populateVariantColors, variantColorCache } from "#app/sprites/variant";
+import { variantData } from "#app/sprites/variant";
+import BattleInfo, {
+  PlayerBattleInfo,
+  EnemyBattleInfo,
+} from "#app/ui/battle-info";
+import type Move from "#app/data/moves/move";
+import {
+  HighCritAttr,
+  HitsTagAttr,
+  applyMoveAttrs,
+  FixedDamageAttr,
+  VariableAtkAttr,
+  allMoves,
+  TypelessAttr,
+  CritOnlyAttr,
+  getMoveTargets,
+  OneHitKOAttr,
+  VariableMoveTypeAttr,
+  VariableDefAttr,
+  AttackMove,
+  ModifiedDamageAttr,
+  VariableMoveTypeMultiplierAttr,
+  IgnoreOpponentStatStagesAttr,
+  SacrificialAttr,
+  VariableMoveCategoryAttr,
+  CounterDamageAttr,
+  StatStageChangeAttr,
+  RechargeAttr,
+  IgnoreWeatherTypeDebuffAttr,
+  BypassBurnDamageReductionAttr,
+  SacrificialAttrOnHit,
+  OneHitKOAccuracyAttr,
+  RespectAttackTypeImmunityAttr,
+  CombinedPledgeStabBoostAttr,
+  VariableMoveTypeChartAttr,
+  HpSplitAttr,
+} from "#app/data/moves/move";
+import { MoveTarget } from "#enums/MoveTarget";
+import { MoveCategory } from "#enums/MoveCategory";
 import type { PokemonSpeciesForm } from "#app/data/pokemon-species";
-import { default as PokemonSpecies, getFusedSpeciesName, getPokemonSpecies, getPokemonSpeciesForm } from "#app/data/pokemon-species";
-import { getStarterValueFriendshipCap, speciesStarterCosts } from "#app/data/balance/starters";
-import type { Constructor } from "#app/utils";
-import { isNullOrUndefined, randSeedInt, type nil } from "#app/utils";
-import * as Utils from "#app/utils";
+import {
+  default as PokemonSpecies,
+  getFusedSpeciesName,
+  getPokemonSpecies,
+  getPokemonSpeciesForm,
+} from "#app/data/pokemon-species";
+import {
+  getStarterValueFriendshipCap,
+  speciesStarterCosts,
+} from "#app/data/balance/starters";
+import { NumberHolder, randSeedInt, getIvsFromId, BooleanHolder, randSeedItem, isNullOrUndefined, getEnumValues, toDmgValue, fixedInt, rgbaToInt, rgbHexToRgba, rgbToHsv, deltaRgb, isBetween, type nil, type Constructor, randSeedIntRange } from "#app/utils/common";
 import type { TypeDamageMultiplier } from "#app/data/type";
 import { getTypeDamageMultiplier, getTypeRgb } from "#app/data/type";
-import { Type } from "#enums/type";
+import { PokemonType } from "#enums/pokemon-type";
 import { getLevelTotalExp } from "#app/data/exp";
-import { Stat, type PermanentStat, type BattleStat, type EffectiveStat, PERMANENT_STATS, BATTLE_STATS, EFFECTIVE_STATS } from "#enums/stat";
-import { DamageMoneyRewardModifier, EnemyDamageBoosterModifier, EnemyDamageReducerModifier, EnemyEndureChanceModifier, EnemyFusionChanceModifier, HiddenAbilityRateBoosterModifier, BaseStatModifier, PokemonFriendshipBoosterModifier, PokemonHeldItemModifier, PokemonNatureWeightModifier, ShinyRateBoosterModifier, SurviveDamageModifier, TempStatStageBoosterModifier, TempCritBoosterModifier, StatBoosterModifier, CritBoosterModifier, TerastallizeModifier, PokemonBaseStatFlatModifier, PokemonBaseStatTotalModifier, PokemonIncrementingStatModifier, EvoTrackerModifier, PokemonMultiHitModifier } from "#app/modifier/modifier";
+import {
+  Stat,
+  type PermanentStat,
+  type BattleStat,
+  type EffectiveStat,
+  PERMANENT_STATS,
+  BATTLE_STATS,
+  EFFECTIVE_STATS,
+} from "#enums/stat";
+import {
+  EnemyDamageBoosterModifier,
+  EnemyDamageReducerModifier,
+  EnemyFusionChanceModifier,
+  HiddenAbilityRateBoosterModifier,
+  BaseStatModifier,
+  PokemonFriendshipBoosterModifier,
+  PokemonHeldItemModifier,
+  PokemonNatureWeightModifier,
+  ShinyRateBoosterModifier,
+  SurviveDamageModifier,
+  TempStatStageBoosterModifier,
+  TempCritBoosterModifier,
+  StatBoosterModifier,
+  CritBoosterModifier,
+  PokemonBaseStatFlatModifier,
+  PokemonBaseStatTotalModifier,
+  PokemonIncrementingStatModifier,
+  EvoTrackerModifier,
+  PokemonMultiHitModifier,
+} from "#app/modifier/modifier";
 import { PokeballType } from "#enums/pokeball";
 import { Gender } from "#app/data/gender";
-import { initMoveAnim, loadMoveAnimAssets } from "#app/data/battle-anims";
 import { Status, getRandomStatus } from "#app/data/status-effect";
-import type { SpeciesFormEvolution, SpeciesEvolutionCondition } from "#app/data/balance/pokemon-evolutions";
-import { pokemonEvolutions, pokemonPrevolutions, FusionSpeciesFormEvolution } from "#app/data/balance/pokemon-evolutions";
-import { reverseCompatibleTms, tmSpecies, tmPoolTiers } from "#app/data/balance/tms";
-import { BattlerTag, BattlerTagLapseType, EncoreTag, GroundedTag, HighestStatBoostTag, SubstituteTag, TypeImmuneTag, getBattlerTag, SemiInvulnerableTag, TypeBoostTag, MoveRestrictionBattlerTag, ExposedTag, DragonCheerTag, CritBoostTag, TrappedTag, TarShotTag, AutotomizedTag, PowerTrickTag } from "../data/battler-tags";
+import type {
+  SpeciesFormEvolution,
+  SpeciesEvolutionCondition,
+} from "#app/data/balance/pokemon-evolutions";
+import {
+  pokemonEvolutions,
+  pokemonPrevolutions,
+  FusionSpeciesFormEvolution,
+} from "#app/data/balance/pokemon-evolutions";
+import {
+  reverseCompatibleTms,
+  tmSpecies,
+  tmPoolTiers,
+} from "#app/data/balance/tms";
+import {
+  BattlerTag,
+  BattlerTagLapseType,
+  EncoreTag,
+  GroundedTag,
+  HighestStatBoostTag,
+  SubstituteTag,
+  TypeImmuneTag,
+  getBattlerTag,
+  SemiInvulnerableTag,
+  MoveRestrictionBattlerTag,
+  ExposedTag,
+  DragonCheerTag,
+  CritBoostTag,
+  TrappedTag,
+  TarShotTag,
+  AutotomizedTag,
+  PowerTrickTag,
+  loadBattlerTag,
+  type GrudgeTag,
+} from "../data/battler-tags";
 import { WeatherType } from "#enums/weather-type";
-import { ArenaTagSide, NoCritTag, WeakenMoveScreenTag } from "#app/data/arena-tag";
-import type { Ability, AbAttr } from "#app/data/ability";
-import { StatMultiplierAbAttr, BlockCritAbAttr, BonusCritAbAttr, BypassBurnDamageReductionAbAttr, FieldPriorityMoveImmunityAbAttr, IgnoreOpponentStatStagesAbAttr, MoveImmunityAbAttr, PreDefendFullHpEndureAbAttr, ReceivedMoveDamageMultiplierAbAttr, StabBoostAbAttr, StatusEffectImmunityAbAttr, TypeImmunityAbAttr, WeightMultiplierAbAttr, allAbilities, applyAbAttrs, applyStatMultiplierAbAttrs, applyPreApplyBattlerTagAbAttrs, applyPreAttackAbAttrs, applyPreDefendAbAttrs, applyPreSetStatusAbAttrs, UnsuppressableAbilityAbAttr, SuppressFieldAbilitiesAbAttr, NoFusionAbilityAbAttr, MultCritAbAttr, IgnoreTypeImmunityAbAttr, DamageBoostAbAttr, IgnoreTypeStatusEffectImmunityAbAttr, ConditionalCritAbAttr, applyFieldStatMultiplierAbAttrs, FieldMultiplyStatAbAttr, AddSecondStrikeAbAttr, UserFieldStatusEffectImmunityAbAttr, UserFieldBattlerTagImmunityAbAttr, BattlerTagImmunityAbAttr, MoveTypeChangeAbAttr, FullHpResistTypeAbAttr, applyCheckTrappedAbAttrs, CheckTrappedAbAttr, PostSetStatusAbAttr, applyPostSetStatusAbAttrs, InfiltratorAbAttr, AlliedFieldDamageReductionAbAttr, PostDamageAbAttr, applyPostDamageAbAttrs, CommanderAbAttr, applyPostItemLostAbAttrs, PostItemLostAbAttr, PreLeaveFieldAbAttr, applyPreLeaveFieldAbAttrs } from "#app/data/ability";
+import {
+  ArenaTagSide,
+  NoCritTag,
+  WeakenMoveScreenTag,
+} from "#app/data/arena-tag";
+import type { SuppressAbilitiesTag } from "#app/data/arena-tag";
+import type { Ability } from "#app/data/abilities/ability-class";
+import type { AbAttr } from "#app/data/abilities/ab-attrs/ab-attr";
+import {
+  StatMultiplierAbAttr,
+  BlockCritAbAttr,
+  BonusCritAbAttr,
+  BypassBurnDamageReductionAbAttr,
+  FieldPriorityMoveImmunityAbAttr,
+  IgnoreOpponentStatStagesAbAttr,
+  MoveImmunityAbAttr,
+  PreDefendFullHpEndureAbAttr,
+  ReceivedMoveDamageMultiplierAbAttr,
+  StabBoostAbAttr,
+  StatusEffectImmunityAbAttr,
+  TypeImmunityAbAttr,
+  WeightMultiplierAbAttr,
+  applyAbAttrs,
+  applyStatMultiplierAbAttrs,
+  applyPreApplyBattlerTagAbAttrs,
+  applyPreAttackAbAttrs,
+  applyPreDefendAbAttrs,
+  applyPreSetStatusAbAttrs,
+  NoFusionAbilityAbAttr,
+  MultCritAbAttr,
+  IgnoreTypeImmunityAbAttr,
+  DamageBoostAbAttr,
+  IgnoreTypeStatusEffectImmunityAbAttr,
+  ConditionalCritAbAttr,
+  applyFieldStatMultiplierAbAttrs,
+  FieldMultiplyStatAbAttr,
+  AddSecondStrikeAbAttr,
+  UserFieldStatusEffectImmunityAbAttr,
+  UserFieldBattlerTagImmunityAbAttr,
+  BattlerTagImmunityAbAttr,
+  MoveTypeChangeAbAttr,
+  FullHpResistTypeAbAttr,
+  applyCheckTrappedAbAttrs,
+  CheckTrappedAbAttr, InfiltratorAbAttr,
+  AlliedFieldDamageReductionAbAttr,
+  PostDamageAbAttr,
+  applyPostDamageAbAttrs,
+  CommanderAbAttr,
+  applyPostItemLostAbAttrs,
+  PostItemLostAbAttr,
+  applyOnGainAbAttrs,
+  PreLeaveFieldAbAttr,
+  applyPreLeaveFieldAbAttrs,
+  applyOnLoseAbAttrs,
+  PreLeaveFieldRemoveSuppressAbilitiesSourceAbAttr,
+  applyAllyStatMultiplierAbAttrs,
+  AllyStatMultiplierAbAttr,
+  MoveAbilityBypassAbAttr,
+  PreSummonAbAttr,
+} from "#app/data/abilities/ability";
+import { allAbilities } from "#app/data/data-lists";
 import type PokemonData from "#app/system/pokemon-data";
 import { BattlerIndex } from "#app/battle";
-import { Mode } from "#app/ui/ui";
+import { UiMode } from "#enums/ui-mode";
 import type { PartyOption } from "#app/ui/party-ui-handler";
 import PartyUiHandler, { PartyUiMode } from "#app/ui/party-ui-handler";
 import SoundFade from "phaser3-rex-plugins/plugins/soundfade";
 import type { LevelMoves } from "#app/data/balance/pokemon-level-moves";
-import { EVOLVE_MOVE, RELEARN_MOVE } from "#app/data/balance/pokemon-level-moves";
-import { DamageAchv, achvs } from "#app/system/achv";
+import {
+  EVOLVE_MOVE,
+  RELEARN_MOVE,
+} from "#app/data/balance/pokemon-level-moves";
+import { achvs } from "#app/system/achv";
 import type { StarterDataEntry, StarterMoveset } from "#app/system/game-data";
 import { DexAttr } from "#app/system/game-data";
-import { QuantizerCelebi, argbFromRgba, rgbaFromArgb } from "@material/material-color-utilities";
+import {
+  QuantizerCelebi,
+  argbFromRgba,
+  rgbaFromArgb,
+} from "@material/material-color-utilities";
 import { getNatureStatMultiplier } from "#app/data/nature";
 import type { SpeciesFormChange } from "#app/data/pokemon-forms";
-import { SpeciesFormChangeActiveTrigger, SpeciesFormChangeMoveLearnedTrigger, SpeciesFormChangePostMoveTrigger, SpeciesFormChangeStatusEffectTrigger } from "#app/data/pokemon-forms";
+import {
+  SpeciesFormChangeActiveTrigger,
+  SpeciesFormChangeLapseTeraTrigger,
+  SpeciesFormChangeMoveLearnedTrigger,
+  SpeciesFormChangePostMoveTrigger
+} from "#app/data/pokemon-forms";
 import { TerrainType } from "#app/data/terrain";
-import type { TrainerSlot } from "#app/data/trainer-config";
+import type { TrainerSlot } from "#enums/trainer-slot";
 import Overrides from "#app/overrides";
 import i18next from "i18next";
 import { speciesEggMoves } from "#app/data/balance/egg-moves";
@@ -71,17 +240,26 @@ import { MoveEndPhase } from "#app/phases/move-end-phase";
 import { ObtainStatusEffectPhase } from "#app/phases/obtain-status-effect-phase";
 import { StatStageChangePhase } from "#app/phases/stat-stage-change-phase";
 import { SwitchSummonPhase } from "#app/phases/switch-summon-phase";
-import { ToggleDoublePositionPhase } from "#app/phases/toggle-double-position-phase";
 import { Challenges } from "#enums/challenges";
 import { PokemonAnimType } from "#enums/pokemon-anim-type";
 import { PLAYER_PARTY_MAX_SIZE } from "#app/constants";
 import { CustomPokemonData } from "#app/data/custom-pokemon-data";
 import { SwitchType } from "#enums/switch-type";
 import { SpeciesFormKey } from "#enums/species-form-key";
-import { BASE_HIDDEN_ABILITY_CHANCE, BASE_SHINY_CHANCE, SHINY_EPIC_CHANCE, SHINY_VARIANT_CHANCE } from "#app/data/balance/rates";
+import { getStatusEffectOverlapText } from "#app/data/status-effect";
+import {
+  BASE_HIDDEN_ABILITY_CHANCE,
+  BASE_SHINY_CHANCE,
+  SHINY_EPIC_CHANCE,
+  SHINY_VARIANT_CHANCE,
+} from "#app/data/balance/rates";
 import { Nature } from "#enums/nature";
 import { StatusEffect } from "#enums/status-effect";
 import { doShinySparkleAnim } from "#app/field/anims";
+import { MoveFlags } from "#enums/MoveFlags";
+import { timedEventManager } from "#app/global-event-manager";
+import { loadMoveAnimations } from "#app/sprites/pokemon-asset-loader";
+import { ResetStatusPhase } from "#app/phases/reset-status-phase";
 
 export enum LearnMoveSituation {
   MISC,
@@ -89,16 +267,52 @@ export enum LearnMoveSituation {
   RELEARN,
   EVOLUTION,
   EVOLUTION_FUSED, // If fusionSpecies has Evolved
-  EVOLUTION_FUSED_BASE // If fusion's base species has Evolved
+  EVOLUTION_FUSED_BASE, // If fusion's base species has Evolved
 }
 
 export enum FieldPosition {
   CENTER,
   LEFT,
-  RIGHT
+  RIGHT,
 }
 
+/** Base typeclass for damage parameter methods, used for DRY */
+type damageParams = {
+  /** The attacking {@linkcode Pokemon} */
+  source: Pokemon;
+  /** The move used in the attack */
+  move: Move;
+  /** The move's {@linkcode MoveCategory} after variable-category effects are applied */
+  moveCategory: MoveCategory;
+  /** If `true`, ignores this Pokemon's defensive ability effects */
+  ignoreAbility?: boolean;
+  /** If `true`, ignores the attacking Pokemon's ability effects */
+  ignoreSourceAbility?: boolean;
+  /** If `true`, ignores the ally Pokemon's ability effects */
+  ignoreAllyAbility?: boolean;
+  /** If `true`, ignores the ability effects of the attacking pokemon's ally */
+  ignoreSourceAllyAbility?: boolean;
+  /** If `true`, calculates damage for a critical hit */
+  isCritical?: boolean;
+  /** If `true`, suppresses changes to game state during the calculation */
+  simulated?: boolean;
+  /** If defined, used in place of calculated effectiveness values */
+  effectiveness?: number;
+}
+
+/** Type for the parameters of {@linkcode Pokemon#getBaseDamage | getBaseDamage} */
+type getBaseDamageParams = Omit<damageParams, "effectiveness">
+
+/** Type for the parameters of {@linkcode Pokemon#getAttackDamage | getAttackDamage} */
+type getAttackDamageParams = Omit<damageParams, "moveCategory">;
+
 export default abstract class Pokemon extends Phaser.GameObjects.Container {
+  /**
+   * This pokemon's {@link https://bulbapedia.bulbagarden.net/wiki/Personality_value | Personality value/PID},
+   * used to determine various parameters of this Pokemon.
+   * Represented as a random 32-bit unsigned integer.
+   * TODO: Stop treating this like a unique ID and stop treating 0 as no pokemon
+   */
   public id: number;
   public name: string;
   public nickname: string;
@@ -118,7 +332,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
   public stats: number[];
   public ivs: number[];
   public nature: Nature;
-  public moveset: (PokemonMove | null)[];
+  public moveset: PokemonMove[];
   public status: Status | null;
   public friendship: number;
   public metLevel: number;
@@ -128,8 +342,11 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
   public luck: number;
   public pauseEvolutions: boolean;
   public pokerus: boolean;
-  public switchOutStatus: boolean;
+  public switchOutStatus = false;
   public evoCounter: number;
+  public teraType: PokemonType;
+  public isTerastallized: boolean;
+  public stellarTypesBoosted: PokemonType[];
 
   public fusionSpecies: PokemonSpecies | null;
   public fusionFormIndex: number;
@@ -139,14 +356,25 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
   public fusionGender: Gender;
   public fusionLuck: number;
   public fusionCustomPokemonData: CustomPokemonData | null;
+  public fusionTeraType: PokemonType;
 
-  private summonDataPrimer: PokemonSummonData | null;
+  public customPokemonData: CustomPokemonData = new CustomPokemonData();
 
-  public summonData: PokemonSummonData;
-  public battleData: PokemonBattleData;
-  public battleSummonData: PokemonBattleSummonData;
-  public turnData: PokemonTurnData;
-  public customPokemonData: CustomPokemonData;
+  /* Pokemon data types, in vaguely decreasing order of precedence */
+
+  /**
+   * Data that resets only on *battle* end (hit count, harvest berries, etc.)
+   * Kept between waves.
+   */
+  public battleData: PokemonBattleData = new PokemonBattleData();
+  /** Data that resets on switch or battle end (stat stages, battler tags, etc.) */
+  public summonData: PokemonSummonData = new PokemonSummonData();
+  /** Similar to {@linkcode PokemonSummonData}, but is reset on reload (not saved to file). */
+  public tempSummonData: PokemonTempSummonData = new PokemonTempSummonData();
+  /** Wave data correponding to moves/ability information revealed */
+  public waveData: PokemonWaveData = new PokemonWaveData();
+  /** Per-turn data like hit count & flinch tracking */
+  public turnData: PokemonTurnData = new PokemonTurnData();
 
   /** Used by Mystery Encounters to execute pokemon-specific logic (such as stat boosts) at start of battle */
   public mysteryEncounterBattleEffects?: (pokemon: Pokemon) => void;
@@ -160,38 +388,33 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
 
   private shinySparkle: Phaser.GameObjects.Sprite;
 
-  constructor(x: number, y: number, species: PokemonSpecies, level: number, abilityIndex?: number, formIndex?: number, gender?: Gender, shiny?: boolean, variant?: Variant, ivs?: number[], nature?: Nature, dataSource?: Pokemon | PokemonData) {
+  // TODO: Rework this eventually
+  constructor(
+    x: number,
+    y: number,
+    species: PokemonSpecies,
+    level: number,
+    abilityIndex?: number,
+    formIndex?: number,
+    gender?: Gender,
+    shiny?: boolean,
+    variant?: Variant,
+    ivs?: number[],
+    nature?: Nature,
+    dataSource?: Pokemon | PokemonData,
+  ) {
     super(globalScene, x, y);
 
     if (!species.isObtainable() && this.isPlayer()) {
       throw `Cannot create a player Pokemon for species '${species.getName(formIndex)}'`;
     }
 
-    const hiddenAbilityChance = new Utils.IntegerHolder(BASE_HIDDEN_ABILITY_CHANCE);
-    if (!this.hasTrainer()) {
-      globalScene.applyModifiers(HiddenAbilityRateBoosterModifier, true, hiddenAbilityChance);
-    }
-
     this.species = species;
     this.pokeball = dataSource?.pokeball || PokeballType.POKEBALL;
     this.level = level;
-    this.switchOutStatus = false;
 
-    // Determine the ability index
-    if (abilityIndex !== undefined) {
-      this.abilityIndex = abilityIndex; // Use the provided ability index if it is defined
-    } else {
-      // If abilityIndex is not provided, determine it based on species and hidden ability
-      const hasHiddenAbility = !Utils.randSeedInt(hiddenAbilityChance.value);
-      const randAbilityIndex = Utils.randSeedInt(2);
-      if (species.abilityHidden && hasHiddenAbility) {
-        // If the species has a hidden ability and the hidden ability is present
-        this.abilityIndex = 2;
-      } else {
-        // If there is no hidden ability or species does not have a hidden ability
-        this.abilityIndex = species.ability2 !== species.ability1 ? randAbilityIndex : 0; // Use random ability index if species has a second ability, otherwise use 0
-      }
-    }
+    this.abilityIndex = abilityIndex ?? this.generateAbilityIndex()
+
     if (formIndex !== undefined) {
       this.formIndex = formIndex;
     }
@@ -204,8 +427,10 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
     if (variant !== undefined) {
       this.variant = variant;
     }
-    this.exp = dataSource?.exp || getLevelTotalExp(this.level, species.growthRate);
+    this.exp =
+      dataSource?.exp || getLevelTotalExp(this.level, species.growthRate);
     this.levelExp = dataSource?.levelExp || 0;
+
     if (dataSource) {
       this.id = dataSource.id;
       this.hp = dataSource.hp;
@@ -215,20 +440,32 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
       if (this.variant === undefined) {
         this.variant = 0;
       }
-      this.nature = dataSource.nature || 0 as Nature;
+      this.nature = dataSource.nature || (0 as Nature);
       this.nickname = dataSource.nickname;
       this.moveset = dataSource.moveset;
       this.status = dataSource.status!; // TODO: is this bang correct?
-      this.friendship = dataSource.friendship !== undefined ? dataSource.friendship : this.species.baseFriendship;
+      this.friendship =
+        dataSource.friendship !== undefined
+          ? dataSource.friendship
+          : this.species.baseFriendship;
       this.metLevel = dataSource.metLevel || 5;
       this.luck = dataSource.luck;
       this.metBiome = dataSource.metBiome;
-      this.metSpecies = dataSource.metSpecies ?? (this.metBiome !== -1 ? this.species.speciesId : this.species.getRootSpeciesId(true));
+      this.metSpecies =
+        dataSource.metSpecies ??
+        (this.metBiome !== -1
+          ? this.species.speciesId
+          : this.species.getRootSpeciesId(true));
       this.metWave = dataSource.metWave ?? (this.metBiome === -1 ? -1 : 0);
       this.pauseEvolutions = dataSource.pauseEvolutions;
       this.pokerus = !!dataSource.pokerus;
       this.evoCounter = dataSource.evoCounter ?? 0;
-      this.fusionSpecies = dataSource.fusionSpecies instanceof PokemonSpecies ? dataSource.fusionSpecies : dataSource.fusionSpecies ? getPokemonSpecies(dataSource.fusionSpecies) : null;
+      this.fusionSpecies =
+        dataSource.fusionSpecies instanceof PokemonSpecies
+          ? dataSource.fusionSpecies
+          : dataSource.fusionSpecies
+            ? getPokemonSpecies(dataSource.fusionSpecies)
+            : null;
       this.fusionFormIndex = dataSource.fusionFormIndex;
       this.fusionAbilityIndex = dataSource.fusionAbilityIndex;
       this.fusionShiny = dataSource.fusionShiny;
@@ -236,18 +473,29 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
       this.fusionGender = dataSource.fusionGender;
       this.fusionLuck = dataSource.fusionLuck;
       this.fusionCustomPokemonData = dataSource.fusionCustomPokemonData;
+      this.fusionTeraType = dataSource.fusionTeraType;
       this.usedTMs = dataSource.usedTMs ?? [];
-      this.customPokemonData = new CustomPokemonData(dataSource.customPokemonData);
+      this.customPokemonData = new CustomPokemonData(
+        dataSource.customPokemonData,
+      );
+      this.teraType = dataSource.teraType;
+      this.isTerastallized = dataSource.isTerastallized;
+      this.stellarTypesBoosted = dataSource.stellarTypesBoosted ?? [];
     } else {
-      this.id = Utils.randSeedInt(4294967296);
-      this.ivs = ivs || Utils.getIvsFromId(this.id);
+      this.id = randSeedInt(4294967296);
+      this.ivs = ivs || getIvsFromId(this.id);
 
       if (this.gender === undefined) {
         this.generateGender();
       }
 
       if (this.formIndex === undefined) {
-        this.formIndex = globalScene.getSpeciesFormIndex(species, this.gender, this.nature, this.isPlayer());
+        this.formIndex = globalScene.getSpeciesFormIndex(
+          species,
+          this.gender,
+          this.nature,
+          this.isPlayer(),
+        );
       }
 
       if (this.shiny === undefined) {
@@ -258,8 +506,6 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
         this.variant = this.shiny ? this.generateShinyVariant() : 0;
       }
 
-      this.customPokemonData = new CustomPokemonData();
-
       if (nature !== undefined) {
         this.setNature(nature);
       } else {
@@ -268,13 +514,19 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
 
       this.friendship = species.baseFriendship;
       this.metLevel = level;
-      this.metBiome = globalScene.currentBattle ? globalScene.arena.biomeType : -1;
+      this.metBiome = globalScene.currentBattle
+        ? globalScene.arena.biomeType
+        : -1;
       this.metSpecies = species.speciesId;
-      this.metWave = globalScene.currentBattle ? globalScene.currentBattle.waveIndex : -1;
+      this.metWave = globalScene.currentBattle
+        ? globalScene.currentBattle.waveIndex
+        : -1;
       this.pokerus = false;
 
       if (level > 1) {
-        const fused = new Utils.BooleanHolder(globalScene.gameMode.isSplicedOnly);
+        const fused = new BooleanHolder(
+          globalScene.gameMode.isSplicedOnly,
+        );
         if (!fused.value && !this.isPlayer() && !this.hasTrainer()) {
           globalScene.applyModifier(EnemyFusionChanceModifier, false, fused);
         }
@@ -284,10 +536,19 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
           this.generateFusionSpecies();
         }
       }
-      this.luck = (this.shiny ? this.variant + 1 : 0) + (this.fusionShiny ? this.fusionVariant + 1 : 0);
+      this.luck =
+        (this.shiny ? this.variant + 1 : 0) +
+        (this.fusionShiny ? this.fusionVariant + 1 : 0);
       this.fusionLuck = this.luck;
+
+      this.teraType = randSeedItem(this.getTypes(false, false, true));
+      this.isTerastallized = false;
+      this.stellarTypesBoosted = [];
     }
 
+    this.summonData = new PokemonSummonData(dataSource?.summonData);
+    this.battleData = new PokemonBattleData(dataSource?.battleData);
+
     this.generateName();
 
     if (!species.isObtainable()) {
@@ -297,32 +558,56 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
     if (!dataSource) {
       this.calculateStats();
     }
+
   }
 
-
-  getNameToRender() {
+  /**
+   * @param {boolean} useIllusion - Whether we want the fake name or the real name of the Pokemon (for Illusion ability).
+   */
+  getNameToRender(useIllusion: boolean = true) {
+    const name: string = (!useIllusion && this.summonData.illusion) ? this.summonData.illusion.basePokemon.name : this.name;
+    const nickname: string = (!useIllusion && this.summonData.illusion) ? this.summonData.illusion.basePokemon.nickname : this.nickname;
     try {
-      if (this.nickname) {
-        return decodeURIComponent(escape(atob(this.nickname)));
+      if (nickname) {
+        return decodeURIComponent(escape(atob(nickname)));
       }
-      return this.name;
+      return name;
     } catch (err) {
-      console.error(`Failed to decode nickname for ${this.name}`, err);
-      return this.name;
+      console.error(`Failed to decode nickname for ${name}`, err);
+      return name;
+    }
+  }
+
+  getPokeball(useIllusion = false){
+    if(useIllusion){
+      return this.summonData.illusion?.pokeball ?? this.pokeball
+    } else {
+      return this.pokeball
     }
   }
 
   init(): void {
     this.fieldPosition = FieldPosition.CENTER;
-
     this.initBattleInfo();
 
     globalScene.fieldUI.addAt(this.battleInfo, 0);
 
     const getSprite = (hasShadow?: boolean) => {
-      const ret = globalScene.addPokemonSprite(this, 0, 0, `pkmn__${this.isPlayer() ? "back__" : ""}sub`, undefined, true);
+      const ret = globalScene.addPokemonSprite(
+        this,
+        0,
+        0,
+        `pkmn__${this.isPlayer() ? "back__" : ""}sub`,
+        undefined,
+        true,
+      );
       ret.setOrigin(0.5, 1);
-      ret.setPipeline(globalScene.spritePipeline, { tone: [ 0.0, 0.0, 0.0, 0.0 ], hasShadow: !!hasShadow, teraColor: getTypeRgb(this.getTeraType()) });
+      ret.setPipeline(globalScene.spritePipeline, {
+        tone: [0.0, 0.0, 0.0, 0.0],
+        hasShadow: !!hasShadow,
+        teraColor: getTypeRgb(this.getTeraType()),
+        isTerastallized: this.isTerastallized,
+      });
       return ret;
     };
 
@@ -336,7 +621,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
     this.addAt(sprite, 0);
     this.addAt(tintSprite, 1);
 
-    if (this.isShiny() && !this.shinySparkle) {
+    if (this.isShiny(true) && !this.shinySparkle) {
       this.initShinySparkle();
     }
   }
@@ -359,8 +644,11 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
    * @param checkStatus `true` to also check that the pokemon's status is {@linkcode StatusEffect.FAINT}
    * @returns `true` if the pokemon is fainted
    */
-  public isFainted(checkStatus: boolean = false): boolean {
-    return this.hp <= 0 && (!checkStatus || this.status?.effect === StatusEffect.FAINT);
+  public isFainted(checkStatus = false): boolean {
+    return (
+      this.hp <= 0 &&
+      (!checkStatus || this.status?.effect === StatusEffect.FAINT)
+    );
   }
 
   /**
@@ -377,17 +665,22 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
    * @returns {boolean} `true` if pokemon is allowed in battle
    */
   public isAllowedInChallenge(): boolean {
-    const challengeAllowed = new Utils.BooleanHolder(true);
-    applyChallenges(globalScene.gameMode, ChallengeType.POKEMON_IN_BATTLE, this, challengeAllowed);
+    const challengeAllowed = new BooleanHolder(true);
+    applyChallenges(
+      ChallengeType.POKEMON_IN_BATTLE,
+      this,
+      challengeAllowed,
+    );
     return challengeAllowed.value;
   }
 
   /**
-   * Checks if the pokemon is allowed in battle (ie: not fainted, and allowed under any active challenges).
-   * @param onField `true` to also check if the pokemon is currently on the field, defaults to `false`
-   * @returns `true` if the pokemon is "active". Returns `false` if there is no active {@linkcode BattleScene}
+   * Checks if this {@linkcode Pokemon} is allowed in battle (ie: not fainted, and allowed under any active challenges).
+   * @param onField `true` to also check if the pokemon is currently on the field; default `false`
+   * @returns `true` if the pokemon is "active", as described above.
+   * Returns `false` if there is no active {@linkcode BattleScene} or the pokemon is disallowed.
    */
-  public isActive(onField: boolean = false): boolean {
+  public isActive(onField = false): boolean {
     if (!globalScene) {
       return false;
     }
@@ -398,7 +691,12 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
     let ret = 0n;
     ret |= this.gender !== Gender.FEMALE ? DexAttr.MALE : DexAttr.FEMALE;
     ret |= !this.shiny ? DexAttr.NON_SHINY : DexAttr.SHINY;
-    ret |= this.variant >= 2 ? DexAttr.VARIANT_3 : this.variant === 1 ? DexAttr.VARIANT_2 : DexAttr.DEFAULT_VARIANT;
+    ret |=
+      this.variant >= 2
+        ? DexAttr.VARIANT_3
+        : this.variant === 1
+          ? DexAttr.VARIANT_2
+          : DexAttr.DEFAULT_VARIANT;
     ret |= globalScene.gameData.getFormAttr(this.formIndex);
     return ret;
   }
@@ -413,12 +711,128 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
       this.name = this.species.getName(this.formIndex);
       return;
     }
-    this.name = getFusedSpeciesName(this.species.getName(this.formIndex), this.fusionSpecies.getName(this.fusionFormIndex));
+    this.name = getFusedSpeciesName(
+      this.species.getName(this.formIndex),
+      this.fusionSpecies.getName(this.fusionFormIndex),
+    );
     if (this.battleInfo) {
       this.updateInfo(true);
     }
   }
 
+  /** Generate `abilityIndex` based on species and hidden ability if not pre-defined. */
+  private generateAbilityIndex(): number {
+
+    // Roll for hidden ability chance, applying any ability charms for enemy mons
+    const hiddenAbilityChance = new NumberHolder(
+      BASE_HIDDEN_ABILITY_CHANCE,
+    );
+    if (!this.hasTrainer()) {
+      globalScene.applyModifiers(
+        HiddenAbilityRateBoosterModifier,
+        true,
+        hiddenAbilityChance,
+      );
+    }
+
+    // If the roll succeeded and we have one, use HA; otherwise pick a random ability
+    const hasHiddenAbility = !randSeedInt(hiddenAbilityChance.value);
+    if (this.species.abilityHidden && hasHiddenAbility) {
+      return 2;
+    }
+
+    // only use random ability if species has a second ability
+    return this.species.ability2 !== this.species.ability1 ? randSeedInt(2) : 0;
+  }
+
+
+
+  /**
+   * Generate an illusion of the last pokemon in the party, as other wild pokemon in the area.
+   */
+  setIllusion(pokemon: Pokemon): boolean {
+    if (this.summonData.illusion) {
+      this.breakIllusion();
+    }
+    if (this.hasTrainer()) {
+      const speciesId = pokemon.species.speciesId;
+
+      this.summonData.illusion = {
+        basePokemon: {
+          name: this.name,
+          nickname: this.nickname,
+          shiny: this.shiny,
+          variant: this.variant,
+          fusionShiny: this.fusionShiny,
+          fusionVariant: this.fusionVariant
+        },
+        species: speciesId,
+        formIndex: pokemon.formIndex,
+        gender: pokemon.gender,
+        pokeball: pokemon.pokeball,
+        fusionFormIndex: pokemon.fusionFormIndex,
+        fusionSpecies: pokemon.fusionSpecies || undefined,
+        fusionGender: pokemon.fusionGender
+      };
+
+      this.name = pokemon.name;
+      this.nickname = pokemon.nickname;
+      this.shiny = pokemon.shiny;
+      this.variant = pokemon.variant;
+      this.fusionVariant = pokemon.fusionVariant;
+      this.fusionShiny = pokemon.fusionShiny;
+      if (this.shiny) {
+        this.initShinySparkle();
+      }
+      this.loadAssets(false, true).then(() => this.playAnim());
+      this.updateInfo();
+    } else {
+      const randomIllusion: PokemonSpecies = globalScene.arena.randomSpecies(globalScene.currentBattle.waveIndex, this.level);
+
+      this.summonData.illusion = {
+        basePokemon: {
+          name: this.name,
+          nickname: this.nickname,
+          shiny: this.shiny,
+          variant: this.variant,
+          fusionShiny: this.fusionShiny,
+          fusionVariant: this.fusionVariant
+        },
+        species: randomIllusion.speciesId,
+        formIndex: randomIllusion.formIndex,
+        gender: this.gender,
+        pokeball: this.pokeball
+      };
+
+      this.name = randomIllusion.name;
+      this.loadAssets(false, true).then(() => this.playAnim());
+    }
+    return true;
+  }
+
+  breakIllusion(): boolean {
+    if (!this.summonData.illusion) {
+      return false;
+    } else {
+      this.name = this.summonData.illusion.basePokemon.name;
+      this.nickname = this.summonData.illusion.basePokemon.nickname;
+      this.shiny = this.summonData.illusion.basePokemon.shiny;
+      this.variant = this.summonData.illusion.basePokemon.variant;
+      this.fusionVariant = this.summonData.illusion.basePokemon.fusionVariant;
+      this.fusionShiny = this.summonData.illusion.basePokemon.fusionShiny;
+      this.summonData.illusion = null;
+    }
+    if (this.isOnField()) {
+      globalScene.playSound("PRSFX- Transform");
+    }
+    if (this.shiny) {
+      this.initShinySparkle();
+    }
+    this.loadAssets(false).then(() => this.playAnim());
+    this.updateInfo(true);
+    return true;
+  }
+
   abstract isPlayer(): boolean;
 
   abstract hasTrainer(): boolean;
@@ -427,75 +841,99 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
 
   abstract getBattlerIndex(): BattlerIndex;
 
-  loadAssets(ignoreOverride: boolean = true): Promise<void> {
-    return new Promise(resolve => {
-      const moveIds = this.getMoveset().map(m => m!.getMove().id); // TODO: is this bang correct?
-      Promise.allSettled(moveIds.map(m => initMoveAnim(m)))
-        .then(() => {
-          loadMoveAnimAssets(moveIds);
-          this.getSpeciesForm().loadAssets(this.getGender() === Gender.FEMALE, this.formIndex, this.shiny, this.variant);
-          if (this.isPlayer() || this.getFusionSpeciesForm()) {
-            globalScene.loadPokemonAtlas(this.getBattleSpriteKey(true, ignoreOverride), this.getBattleSpriteAtlasPath(true, ignoreOverride));
-          }
-          if (this.getFusionSpeciesForm()) {
-            this.getFusionSpeciesForm().loadAssets(this.getFusionGender() === Gender.FEMALE, this.fusionFormIndex, this.fusionShiny, this.fusionVariant);
-            globalScene.loadPokemonAtlas(this.getFusionBattleSpriteKey(true, ignoreOverride), this.getFusionBattleSpriteAtlasPath(true, ignoreOverride));
-          }
-          globalScene.load.once(Phaser.Loader.Events.COMPLETE, () => {
-            if (this.isPlayer()) {
-              const originalWarn = console.warn;
-              // Ignore warnings for missing frames, because there will be a lot
-              console.warn = () => {};
-              const battleFrameNames = globalScene.anims.generateFrameNames(this.getBattleSpriteKey(), { zeroPad: 4, suffix: ".png", start: 1, end: 400 });
-              console.warn = originalWarn;
-              if (!(globalScene.anims.exists(this.getBattleSpriteKey()))) {
-                globalScene.anims.create({
-                  key: this.getBattleSpriteKey(),
-                  frames: battleFrameNames,
-                  frameRate: 10,
-                  repeat: -1
-                });
-              }
-            }
-            this.playAnim();
-            const updateFusionPaletteAndResolve = () => {
-              this.updateFusionPalette();
-              if (this.summonData?.speciesForm) {
-                this.updateFusionPalette(true);
-              }
-              resolve();
-            };
-            if (this.shiny) {
-              const populateVariantColors = (isBackSprite: boolean = false): Promise<void> => {
-                return new Promise(async resolve => {
-                  const battleSpritePath = this.getBattleSpriteAtlasPath(isBackSprite, ignoreOverride).replace("variant/", "").replace(/_[1-3]$/, "");
-                  let config = variantData;
-                  const useExpSprite = globalScene.experimentalSprites && globalScene.hasExpSprite(this.getBattleSpriteKey(isBackSprite, ignoreOverride));
-                  battleSpritePath.split("/").map(p => config ? config = config[p] : null);
-                  const variantSet: VariantSet = config as VariantSet;
-                  if (variantSet && variantSet[this.variant] === 1) {
-                    const cacheKey = this.getBattleSpriteKey(isBackSprite);
-                    if (!variantColorCache.hasOwnProperty(cacheKey)) {
-                      await this.populateVariantColorCache(cacheKey, useExpSprite, battleSpritePath);
-                    }
-                  }
-                  resolve();
-                });
-              };
-              if (this.isPlayer()) {
-                Promise.all([ populateVariantColors(false), populateVariantColors(true) ]).then(() => updateFusionPaletteAndResolve());
-              } else {
-                populateVariantColors(false).then(() => updateFusionPaletteAndResolve());
-              }
-            } else {
-              updateFusionPaletteAndResolve();
-            }
-          });
-          if (!globalScene.load.isLoading()) {
-            globalScene.load.start();
-          }
+  /**
+   * @param useIllusion - Whether we want the illusion or not.
+   */
+  async loadAssets(ignoreOverride = true, useIllusion: boolean = false): Promise<void> {
+    /** Promises that are loading assets and can be run concurrently. */
+    const loadPromises: Promise<void>[] = [];
+    // Assets for moves
+    loadPromises.push(loadMoveAnimations(this.getMoveset().map(m => m.getMove().id)));
+
+    // Load the assets for the species form
+    const formIndex = useIllusion && this.summonData.illusion ? this.summonData.illusion.formIndex : this.formIndex;
+    loadPromises.push(
+      this.getSpeciesForm(false, useIllusion).loadAssets(
+        this.getGender(useIllusion) === Gender.FEMALE,
+        formIndex,
+        this.isShiny(useIllusion),
+        this.getVariant(useIllusion)
+      ),
+    );
+
+    if (this.isPlayer() || this.getFusionSpeciesForm(false, useIllusion)) {
+      globalScene.loadPokemonAtlas(
+        this.getBattleSpriteKey(true, ignoreOverride),
+        this.getBattleSpriteAtlasPath(true, ignoreOverride),
+      );
+    }
+    if (this.getFusionSpeciesForm()) {
+      const fusionFormIndex = useIllusion && this.summonData.illusion ? this.summonData.illusion.fusionFormIndex : this.fusionFormIndex;
+      const fusionShiny = !useIllusion && this.summonData.illusion?.basePokemon ? this.summonData.illusion.basePokemon.fusionShiny : this.fusionShiny;
+      const fusionVariant = !useIllusion && this.summonData.illusion?.basePokemon ? this.summonData.illusion.basePokemon.fusionVariant : this.fusionVariant;
+      loadPromises.push(this.getFusionSpeciesForm(false, useIllusion).loadAssets(
+        this.getFusionGender(false, useIllusion) === Gender.FEMALE,
+        fusionFormIndex,
+        fusionShiny,
+        fusionVariant
+      ));
+      globalScene.loadPokemonAtlas(
+        this.getFusionBattleSpriteKey(true, ignoreOverride),
+        this.getFusionBattleSpriteAtlasPath(true, ignoreOverride),
+      );
+    }
+
+    if (this.isShiny(true)) {
+      loadPromises.push(populateVariantColors(this, false, ignoreOverride))
+      if (this.isPlayer()) {
+        loadPromises.push(populateVariantColors(this, true, ignoreOverride));
+      }
+    }
+
+    await Promise.allSettled(loadPromises);
+
+    // This must be initiated before we queue loading, otherwise the load could have finished before
+    // we reach the line of code that adds the listener, causing a deadlock.
+    const waitOnLoadPromise = new Promise<void>(resolve => globalScene.load.once(Phaser.Loader.Events.COMPLETE, resolve));
+
+    if (!globalScene.load.isLoading()) {
+      globalScene.load.start();
+    }
+
+    // Wait for the assets we queued to load to finish loading, then...
+    // See https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Using_promises#creating_a_promise_around_an_old_callback_api
+    await waitOnLoadPromise;
+
+    // With the sprites loaded, generate the animation frame information
+    if (this.isPlayer()) {
+      const originalWarn = console.warn;
+      // Ignore warnings for missing frames, because there will be a lot
+      console.warn = () => {};
+      const battleSpriteKey = this.getBattleSpriteKey(this.isPlayer(), ignoreOverride);
+      const battleFrameNames = globalScene.anims.generateFrameNames(battleSpriteKey, {
+        zeroPad: 4,
+        suffix: ".png",
+        start: 1,
+        end: 400,
+      });
+      console.warn = originalWarn;
+      if (!globalScene.anims.exists(battleSpriteKey)) {
+        globalScene.anims.create({
+          key: battleSpriteKey,
+          frames: battleFrameNames,
+          frameRate: 10,
+          repeat: -1,
         });
-    });
+      }
+    }
+    // With everything loaded, now begin playing the animation.
+    this.playAnim();
+
+    // update the fusion palette
+    this.updateFusionPalette();
+    if (this.summonData.speciesForm) {
+      this.updateFusionPalette(true);
+    }
   }
 
   /**
@@ -508,7 +946,13 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
    * @param battleSpritePath the filename of the sprite
    * @param optionalParams any additional params to log
    */
-  async fallbackVariantColor(cacheKey: string, attemptedSpritePath: string, useExpSprite: boolean, battleSpritePath: string, ...optionalParams: any[]) {
+  async fallbackVariantColor(
+    cacheKey: string,
+    attemptedSpritePath: string,
+    useExpSprite: boolean,
+    battleSpritePath: string,
+    ...optionalParams: any[]
+  ) {
     console.warn(`Could not load ${attemptedSpritePath}!`, ...optionalParams);
     if (useExpSprite) {
       await this.populateVariantColorCache(cacheKey, false, battleSpritePath);
@@ -522,25 +966,49 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
    * @param useExpSprite should the experimental sprite be used
    * @param battleSpritePath the filename of the sprite
    */
-  async populateVariantColorCache(cacheKey: string, useExpSprite: boolean, battleSpritePath: string) {
+  async populateVariantColorCache(
+    cacheKey: string,
+    useExpSprite: boolean,
+    battleSpritePath: string,
+  ) {
     const spritePath = `./images/pokemon/variant/${useExpSprite ? "exp/" : ""}${battleSpritePath}.json`;
-    return globalScene.cachedFetch(spritePath).then(res => {
-      // Prevent the JSON from processing if it failed to load
-      if (!res.ok) {
-        return this.fallbackVariantColor(cacheKey, res.url, useExpSprite, battleSpritePath, res.status, res.statusText);
-      }
-      return res.json();
-    }).catch(error => {
-      return this.fallbackVariantColor(cacheKey, spritePath, useExpSprite, battleSpritePath, error);
-    }).then(c => {
-      if (!isNullOrUndefined(c)) {
-        variantColorCache[cacheKey] = c;
-      }
-    });
+    return globalScene
+      .cachedFetch(spritePath)
+      .then(res => {
+        // Prevent the JSON from processing if it failed to load
+        if (!res.ok) {
+          return this.fallbackVariantColor(
+            cacheKey,
+            res.url,
+            useExpSprite,
+            battleSpritePath,
+            res.status,
+            res.statusText,
+          );
+        }
+        return res.json();
+      })
+      .catch(error => {
+        return this.fallbackVariantColor(
+          cacheKey,
+          spritePath,
+          useExpSprite,
+          battleSpritePath,
+          error,
+        );
+      })
+      .then(c => {
+        if (!isNullOrUndefined(c)) {
+          variantColorCache[cacheKey] = c;
+        }
+      });
   }
 
   getFormKey(): string {
-    if (!this.species.forms.length || this.species.forms.length <= this.formIndex) {
+    if (
+      !this.species.forms.length ||
+      this.species.forms.length <= this.formIndex
+    ) {
       return "";
     }
     return this.species.forms[this.formIndex].formKey;
@@ -550,7 +1018,10 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
     if (!this.fusionSpecies) {
       return null;
     }
-    if (!this.fusionSpecies.forms.length || this.fusionSpecies.forms.length <= this.fusionFormIndex) {
+    if (
+      !this.fusionSpecies.forms.length ||
+      this.fusionSpecies.forms.length <= this.fusionFormIndex
+    ) {
       return "";
     }
     return this.fusionSpecies.forms[this.fusionFormIndex].formKey;
@@ -562,23 +1033,46 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
   }
 
   getBattleSpriteAtlasPath(back?: boolean, ignoreOverride?: boolean): string {
-    const spriteId = this.getBattleSpriteId(back, ignoreOverride).replace(/\_{2}/g, "/");
+    const spriteId = this.getBattleSpriteId(back, ignoreOverride).replace(
+      /\_{2}/g,
+      "/",
+    );
     return `${/_[1-3]$/.test(spriteId) ? "variant/" : ""}${spriteId}`;
   }
 
   getSpriteId(ignoreOverride?: boolean): string {
-    return this.getSpeciesForm(ignoreOverride).getSpriteId(this.getGender(ignoreOverride) === Gender.FEMALE, this.formIndex, this.shiny, this.variant);
+    const formIndex = this.summonData.illusion?.formIndex ?? this.formIndex;
+    return this.getSpeciesForm(ignoreOverride, true).getSpriteId(
+      this.getGender(ignoreOverride, true) === Gender.FEMALE,
+      formIndex,
+      this.shiny,
+      this.variant
+    );
   }
 
   getBattleSpriteId(back?: boolean, ignoreOverride?: boolean): string {
     if (back === undefined) {
       back = this.isPlayer();
     }
-    return this.getSpeciesForm(ignoreOverride).getSpriteId(this.getGender(ignoreOverride) === Gender.FEMALE, this.formIndex, this.shiny, this.variant, back);
+
+    const formIndex = this.summonData.illusion?.formIndex ?? this.formIndex;
+
+    return this.getSpeciesForm(ignoreOverride, true).getSpriteId(
+      this.getGender(ignoreOverride, true) === Gender.FEMALE,
+      formIndex,
+      this.shiny,
+      this.variant,
+      back
+    );
   }
 
   getSpriteKey(ignoreOverride?: boolean): string {
-    return this.getSpeciesForm(ignoreOverride).getSpriteKey(this.getGender(ignoreOverride) === Gender.FEMALE, this.formIndex, this.shiny, this.variant);
+    return this.getSpeciesForm(ignoreOverride, false).getSpriteKey(
+      this.getGender(ignoreOverride) === Gender.FEMALE,
+      this.formIndex,
+      this.summonData.illusion?.basePokemon.shiny ?? this.shiny,
+      this.summonData.illusion?.basePokemon.variant ?? this.variant
+    );
   }
 
   getBattleSpriteKey(back?: boolean, ignoreOverride?: boolean): string {
@@ -586,60 +1080,125 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
   }
 
   getFusionSpriteId(ignoreOverride?: boolean): string {
-    return this.getFusionSpeciesForm(ignoreOverride).getSpriteId(this.getFusionGender(ignoreOverride) === Gender.FEMALE, this.fusionFormIndex, this.fusionShiny, this.fusionVariant);
+    const fusionFormIndex = this.summonData.illusion?.fusionFormIndex ?? this.fusionFormIndex;
+    return this.getFusionSpeciesForm(ignoreOverride, true).getSpriteId(
+      this.getFusionGender(ignoreOverride, true) === Gender.FEMALE,
+      fusionFormIndex,
+      this.fusionShiny,
+      this.fusionVariant
+    );
   }
 
   getFusionBattleSpriteId(back?: boolean, ignoreOverride?: boolean): string {
     if (back === undefined) {
       back = this.isPlayer();
     }
-    return this.getFusionSpeciesForm(ignoreOverride).getSpriteId(this.getFusionGender(ignoreOverride) === Gender.FEMALE, this.fusionFormIndex, this.fusionShiny, this.fusionVariant, back);
+
+    const fusionFormIndex = this.summonData.illusion?.fusionFormIndex ?? this.fusionFormIndex;
+
+    return this.getFusionSpeciesForm(ignoreOverride, true).getSpriteId(
+      this.getFusionGender(ignoreOverride, true) === Gender.FEMALE,
+      fusionFormIndex,
+      this.fusionShiny,
+      this.fusionVariant,
+      back
+    );
   }
 
   getFusionBattleSpriteKey(back?: boolean, ignoreOverride?: boolean): string {
     return `pkmn__${this.getFusionBattleSpriteId(back, ignoreOverride)}`;
   }
 
-  getFusionBattleSpriteAtlasPath(back?: boolean, ignoreOverride?: boolean): string {
-    return this.getFusionBattleSpriteId(back, ignoreOverride).replace(/\_{2}/g, "/");
+  getFusionBattleSpriteAtlasPath(
+    back?: boolean,
+    ignoreOverride?: boolean,
+  ): string {
+    return this.getFusionBattleSpriteId(back, ignoreOverride).replace(
+      /\_{2}/g,
+      "/",
+    );
   }
 
-  getIconAtlasKey(ignoreOverride?: boolean): string {
-    return this.getSpeciesForm(ignoreOverride).getIconAtlasKey(this.formIndex, this.shiny, this.variant);
+  getIconAtlasKey(ignoreOverride?: boolean, useIllusion: boolean = true): string {
+    const formIndex = useIllusion && this.summonData.illusion?.formIndex ? this.summonData.illusion?.formIndex : this.formIndex;
+    const variant = !useIllusion && !!this.summonData.illusion ? this.summonData.illusion?.basePokemon.variant : this.variant;
+    return this.getSpeciesForm(ignoreOverride, useIllusion).getIconAtlasKey(
+      formIndex,
+      this.isBaseShiny(useIllusion),
+      variant
+    );
   }
 
-  getFusionIconAtlasKey(ignoreOverride?: boolean): string {
-    return this.getFusionSpeciesForm(ignoreOverride).getIconAtlasKey(this.fusionFormIndex, this.fusionShiny, this.fusionVariant);
+  getFusionIconAtlasKey(ignoreOverride?: boolean, useIllusion: boolean = true): string {
+    const fusionFormIndex = useIllusion && this.summonData.illusion?.fusionFormIndex ? this.summonData.illusion?.fusionFormIndex : this.fusionFormIndex;
+    const fusionVariant = !useIllusion && !!this.summonData.illusion ? this.summonData.illusion?.basePokemon.fusionVariant : this.fusionVariant;
+    return this.getFusionSpeciesForm(ignoreOverride, useIllusion).getIconAtlasKey(
+      fusionFormIndex,
+      this.isFusionShiny(),
+      fusionVariant
+    );
   }
 
-  getIconId(ignoreOverride?: boolean): string {
-    return this.getSpeciesForm(ignoreOverride).getIconId(this.getGender(ignoreOverride) === Gender.FEMALE, this.formIndex, this.shiny, this.variant);
+  getIconId(ignoreOverride?: boolean, useIllusion: boolean = true): string {
+    const formIndex = useIllusion && this.summonData.illusion?.formIndex ? this.summonData.illusion?.formIndex : this.formIndex;
+    const variant = !useIllusion && !!this.summonData.illusion ? this.summonData.illusion?.basePokemon.variant : this.variant;
+    return this.getSpeciesForm(ignoreOverride, useIllusion).getIconId(
+      this.getGender(ignoreOverride, useIllusion) === Gender.FEMALE,
+      formIndex,
+      this.isBaseShiny(),
+      variant
+    );
   }
 
-  getFusionIconId(ignoreOverride?: boolean): string {
-    return this.getFusionSpeciesForm(ignoreOverride).getIconId(this.getFusionGender(ignoreOverride) === Gender.FEMALE, this.fusionFormIndex, this.fusionShiny, this.fusionVariant);
+  getFusionIconId(ignoreOverride?: boolean, useIllusion: boolean = true): string {
+    const fusionFormIndex = useIllusion && this.summonData.illusion?.fusionFormIndex ? this.summonData.illusion?.fusionFormIndex : this.fusionFormIndex;
+    const fusionVariant = !useIllusion && !!this.summonData.illusion ? this.summonData.illusion?.basePokemon.fusionVariant : this.fusionVariant;
+    return this.getFusionSpeciesForm(ignoreOverride, useIllusion).getIconId(
+      this.getFusionGender(ignoreOverride, useIllusion) === Gender.FEMALE,
+      fusionFormIndex,
+      this.isFusionShiny(),
+      fusionVariant
+    );
   }
 
-  getSpeciesForm(ignoreOverride?: boolean): PokemonSpeciesForm {
-    if (!ignoreOverride && this.summonData?.speciesForm) {
+  /**
+   * Get this {@linkcode Pokemon}'s {@linkcode PokemonSpeciesForm}.
+   * @param ignoreOverride - Whether to ignore overridden species from {@linkcode Moves.TRANSFORM}, default `false`.
+   * This overrides `useIllusion` if `true`.
+   * @param useIllusion - `true` to use the speciesForm of the illusion; default `false`.
+   */
+  getSpeciesForm(ignoreOverride: boolean = false, useIllusion: boolean = false): PokemonSpeciesForm {
+    if (!ignoreOverride && this.summonData.speciesForm) {
       return this.summonData.speciesForm;
     }
-    if (this.species.forms && this.species.forms.length > 0) {
-      return this.species.forms[this.formIndex];
+
+    const species: PokemonSpecies = useIllusion && this.summonData.illusion ? getPokemonSpecies(this.summonData.illusion.species) : this.species;
+    const formIndex = useIllusion && this.summonData.illusion ? this.summonData.illusion.formIndex : this.formIndex;
+
+    if (species.forms && species.forms.length > 0) {
+      return species.forms[formIndex];
     }
 
-    return this.species;
+    return species;
   }
 
-  getFusionSpeciesForm(ignoreOverride?: boolean): PokemonSpeciesForm {
-    if (!ignoreOverride && this.summonData?.speciesForm) {
+  /**
+   * @param {boolean} useIllusion - Whether we want the fusionSpeciesForm of the illusion or not.
+   */
+  getFusionSpeciesForm(ignoreOverride?: boolean, useIllusion: boolean = false): PokemonSpeciesForm {
+    const fusionSpecies: PokemonSpecies = useIllusion && this.summonData.illusion ? this.summonData.illusion.fusionSpecies! : this.fusionSpecies!;
+    const fusionFormIndex = useIllusion && this.summonData.illusion ? this.summonData.illusion.fusionFormIndex! : this.fusionFormIndex;
+
+    if (!ignoreOverride && this.summonData.fusionSpeciesForm) {
       return this.summonData.fusionSpeciesForm;
     }
-    if (!this.fusionSpecies?.forms?.length || this.fusionFormIndex >= this.fusionSpecies?.forms.length) {
-      //@ts-ignore
-      return this.fusionSpecies; // TODO: I don't even know how to fix this... A complete cluster of classes involved + null
+    if (
+      !fusionSpecies?.forms?.length ||
+      fusionFormIndex >= fusionSpecies?.forms.length
+    ) {
+      return fusionSpecies;
     }
-    return this.fusionSpecies?.forms[this.fusionFormIndex];
+    return fusionSpecies?.forms[fusionFormIndex];
   }
 
   getSprite(): Phaser.GameObjects.Sprite {
@@ -648,18 +1207,29 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
 
   getTintSprite(): Phaser.GameObjects.Sprite | null {
     return !this.maskEnabled
-      ? this.getAt(1) as Phaser.GameObjects.Sprite
+      ? (this.getAt(1) as Phaser.GameObjects.Sprite)
       : this.maskSprite;
   }
 
   getSpriteScale(): number {
     const formKey = this.getFormKey();
-    if (this.isMax() === true || formKey === "segin-starmobile" || formKey === "schedar-starmobile" || formKey === "navi-starmobile" || formKey === "ruchbah-starmobile" || formKey === "caph-starmobile") {
+    if (
+      this.isMax() === true ||
+      formKey === "segin-starmobile" ||
+      formKey === "schedar-starmobile" ||
+      formKey === "navi-starmobile" ||
+      formKey === "ruchbah-starmobile" ||
+      formKey === "caph-starmobile"
+    ) {
+      // G-Max and starmobiles have flat 1.5x scale
       return 1.5;
-    } else if (this.customPokemonData.spriteScale > 0) {
-      return this.customPokemonData.spriteScale;
     }
-    return 1;
+
+    // TODO: Rather than using -1 as a default... why don't we just change it to 1????????
+    if (this.customPokemonData.spriteScale <= 0) {
+      return 1;
+    }
+    return this.customPokemonData.spriteScale;
   }
 
   /** Resets the pokemon's field sprite properties, including position, alpha, and scale */
@@ -682,7 +1252,10 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
     if (!globalScene) {
       return [];
     }
-    return globalScene.findModifiers(m => m instanceof PokemonHeldItemModifier && m.pokemonId === this.id, this.isPlayer()) as PokemonHeldItemModifier[];
+    return globalScene.findModifiers(
+      m => m instanceof PokemonHeldItemModifier && m.pokemonId === this.id,
+      this.isPlayer(),
+    ) as PokemonHeldItemModifier[];
   }
 
   updateScale(): void {
@@ -690,7 +1263,12 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
   }
 
   updateSpritePipelineData(): void {
-    [ this.getSprite(), this.getTintSprite() ].filter(s => !!s).map(s => s.pipelineData["teraColor"] = getTypeRgb(this.getTeraType()));
+    [this.getSprite(), this.getTintSprite()]
+      .filter(s => !!s)
+      .map(s => {
+        s.pipelineData["teraColor"] = getTypeRgb(this.getTeraType());
+        s.pipelineData["isTerastallized"] = this.isTerastallized;
+      });
     this.updateInfo(true);
   }
 
@@ -711,13 +1289,20 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
    * @param animConfig {@linkcode String} to pass to {@linkcode Phaser.GameObjects.Sprite.play}
    * @returns true if the sprite was able to be animated
    */
-  tryPlaySprite(sprite: Phaser.GameObjects.Sprite, tintSprite: Phaser.GameObjects.Sprite, key: string): boolean {
+  tryPlaySprite(
+    sprite: Phaser.GameObjects.Sprite,
+    tintSprite: Phaser.GameObjects.Sprite,
+    key: string,
+  ): boolean {
     // Catch errors when trying to play an animation that doesn't exist
     try {
       sprite.play(key);
       tintSprite.play(key);
     } catch (error: unknown) {
-      console.error(`Couldn't play animation for '${key}'!\nIs the image for this Pokemon missing?\n`, error);
+      console.error(
+        `Couldn't play animation for '${key}'!\nIs the image for this Pokemon missing?\n`,
+        error,
+      );
 
       return false;
     }
@@ -726,17 +1311,21 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
   }
 
   playAnim(): void {
-    this.tryPlaySprite(this.getSprite(), this.getTintSprite()!, this.getBattleSpriteKey()); // TODO: is the bag correct?
+    this.tryPlaySprite(
+      this.getSprite(),
+      this.getTintSprite()!,
+      this.getBattleSpriteKey(),
+    ); // TODO: is the bag correct?
   }
 
-  getFieldPositionOffset(): [ number, number ] {
+  getFieldPositionOffset(): [number, number] {
     switch (this.fieldPosition) {
       case FieldPosition.CENTER:
-        return [ 0, 0 ];
+        return [0, 0];
       case FieldPosition.LEFT:
-        return [ -32, -8 ];
+        return [-32, -8];
       case FieldPosition.RIGHT:
-        return [ 32, 0 ];
+        return [32, 0];
     }
   }
 
@@ -746,8 +1335,8 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
    * @see {@linkcode SubstituteTag}
    * @see {@linkcode getFieldPositionOffset}
    */
-  getSubstituteOffset(): [ number, number ] {
-    return this.isPlayer() ? [ -30, 10 ] : [ 30, -10 ];
+  getSubstituteOffset(): [number, number] {
+    return this.isPlayer() ? [-30, 10] : [30, -10];
   }
 
   /**
@@ -764,7 +1353,10 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
 
       // During the Pokemon's MoveEffect phase, the offset is removed to put the Pokemon "in focus"
       const currentPhase = globalScene.getCurrentPhase();
-      if (currentPhase instanceof MoveEffectPhase && currentPhase.getPokemon() === this) {
+      if (
+        currentPhase instanceof MoveEffectPhase &&
+        currentPhase.getPokemon() === this
+      ) {
         return false;
       }
       return true;
@@ -781,7 +1373,10 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
     }
   }
 
-  setFieldPosition(fieldPosition: FieldPosition, duration?: number): Promise<void> {
+  setFieldPosition(
+    fieldPosition: FieldPosition,
+    duration?: number,
+  ): Promise<void> {
     return new Promise(resolve => {
       if (fieldPosition === this.fieldPosition) {
         resolve();
@@ -804,7 +1399,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
 
       if (duration) {
         // TODO: can this use stricter typing?
-        const targets: any[] = [ this ];
+        const targets: any[] = [this];
         if (subTag?.sprite) {
           targets.push(subTag.sprite);
         }
@@ -814,7 +1409,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
           y: (_target, _key, value: number) => value + relY,
           duration: duration,
           ease: "Sine.easeOut",
-          onComplete: () => resolve()
+          onComplete: () => resolve(),
         });
       } else {
         this.x += relX;
@@ -828,12 +1423,12 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
   }
 
   /**
-   * Retrieves the entire set of stats of the {@linkcode Pokemon}.
-   * @param bypassSummonData prefer actual stats (`true` by default) or in-battle overriden stats (`false`)
-   * @returns the numeric values of the {@linkcode Pokemon}'s stats
+   * Retrieves the entire set of stats of this {@linkcode Pokemon}.
+   * @param bypassSummonData - whether to use actual stats or in-battle overriden stats from Transform; default `true`
+   * @returns the numeric values of this {@linkcode Pokemon}'s stats
    */
-  getStats(bypassSummonData: boolean = true): number[] {
-    if (!bypassSummonData && this.summonData?.stats) {
+  getStats(bypassSummonData = true): number[] {
+    if (!bypassSummonData && this.summonData.stats) {
       return this.summonData.stats;
     }
     return this.stats;
@@ -845,8 +1440,11 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
    * @param bypassSummonData prefer actual stats (`true` by default) or in-battle overridden stats (`false`)
    * @returns the numeric value of the desired {@linkcode Stat}
    */
-  getStat(stat: PermanentStat, bypassSummonData: boolean = true): number {
-    if (!bypassSummonData && this.summonData && (this.summonData.stats[stat] !== 0)) {
+  getStat(stat: PermanentStat, bypassSummonData = true): number {
+    if (
+      !bypassSummonData &&
+      this.summonData.stats[stat] !== 0
+    ) {
       return this.summonData.stats[stat];
     }
     return this.stats[stat];
@@ -860,13 +1458,15 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
    * @param value the desired numeric value
    * @param bypassSummonData write to actual stats (`true` by default) or in-battle overridden stats (`false`)
    */
-  setStat(stat: PermanentStat, value: number, bypassSummonData: boolean = true): void {
-    if (value >= 0) {
-      if (!bypassSummonData && this.summonData) {
-        this.summonData.stats[stat] = value;
-      } else {
-        this.stats[stat] = value;
-      }
+  setStat(stat: PermanentStat, value: number, bypassSummonData = true): void {
+    if (value < 0) {
+      return;
+    }
+
+    if (!bypassSummonData) {
+      this.summonData.stats[stat] = value;
+    } else {
+      this.stats[stat] = value;
     }
   }
 
@@ -875,7 +1475,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
    * @returns the numeric values of the {@linkcode Pokemon}'s in-battle stat stages if available, a fresh stat stage array otherwise
    */
   getStatStages(): number[] {
-    return this.summonData ? this.summonData.statStages : [ 0, 0, 0, 0, 0, 0, 0 ];
+    return this.summonData ? this.summonData.statStages : [0, 0, 0, 0, 0, 0, 0];
   }
 
   /**
@@ -895,38 +1495,32 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
    * @param value the desired numeric value
    */
   setStatStage(stat: BattleStat, value: number): void {
-    if (this.summonData) {
-      if (value >= -6) {
-        this.summonData.statStages[stat - 1] = Math.min(value, 6);
-      } else {
-        this.summonData.statStages[stat - 1] = Math.max(value, -6);
-      }
+    if (value >= -6) {
+      this.summonData.statStages[stat - 1] = Math.min(value, 6);
+    } else {
+      this.summonData.statStages[stat - 1] = Math.max(value, -6);
     }
   }
 
   /**
-   * Retrieves the critical-hit stage considering the move used and the Pokemon
-   * who used it.
-   * @param source the {@linkcode Pokemon} who using the move
-   * @param move the {@linkcode Move} being used
-   * @returns the final critical-hit stage value
+   * Calculate the critical-hit stage of a move used against this pokemon by
+   * the given source
+   * @param source - The {@linkcode Pokemon} using the move
+   * @param move - The {@linkcode Move} being used
+   * @returns The final critical-hit stage value
    */
   getCritStage(source: Pokemon, move: Move): number {
-    const critStage = new Utils.IntegerHolder(0);
+    const critStage = new NumberHolder(0);
     applyMoveAttrs(HighCritAttr, source, this, move, critStage);
     globalScene.applyModifiers(CritBoosterModifier, source.isPlayer(), source, critStage);
     globalScene.applyModifiers(TempCritBoosterModifier, source.isPlayer(), critStage);
-    const bonusCrit = new Utils.BooleanHolder(false);
-    //@ts-ignore
-    if (applyAbAttrs(BonusCritAbAttr, source, null, false, bonusCrit)) { // TODO: resolve ts-ignore. This is a promise. Checking a promise is bogus.
-      if (bonusCrit.value) {
-        critStage.value += 1;
-      }
-    }
+    applyAbAttrs(BonusCritAbAttr, source, null, false, critStage);
     const critBoostTag = source.getTag(CritBoostTag);
     if (critBoostTag) {
       if (critBoostTag instanceof DragonCheerTag) {
-        critStage.value += critBoostTag.typesOnAdd.includes(Type.DRAGON) ? 2 : 1;
+        critStage.value += critBoostTag.typesOnAdd.includes(PokemonType.DRAGON)
+          ? 2
+          : 1;
       } else {
         critStage.value += 2;
       }
@@ -936,6 +1530,19 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
     return critStage.value;
   }
 
+  /**
+   * Calculates the category of a move when used by this pokemon after
+   * category-changing move effects are applied.
+   * @param target - The {@linkcode Pokemon} using the move
+   * @param move - The {@linkcode Move} being used
+   * @returns The given move's final category
+   */
+  getMoveCategory(target: Pokemon, move: Move): MoveCategory {
+    const moveCategory = new NumberHolder(move.category);
+    applyMoveAttrs(VariableMoveCategoryAttr, this, target, move, moveCategory);
+    return moveCategory.value;
+  }
+
   /**
    * Calculates and retrieves the final value of a stat considering any held
    * items, move effects, opponent abilities, and whether there was a critical
@@ -945,27 +1552,76 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
    * @param move the {@linkcode Move} being used
    * @param ignoreAbility determines whether this Pokemon's abilities should be ignored during the stat calculation
    * @param ignoreOppAbility during an attack, determines whether the opposing Pokemon's abilities should be ignored during the stat calculation.
+   * @param ignoreAllyAbility during an attack, determines whether the ally Pokemon's abilities should be ignored during the stat calculation.
    * @param isCritical determines whether a critical hit has occurred or not (`false` by default)
    * @param simulated if `true`, nullifies any effects that produce any changes to game state from triggering
+   * @param ignoreHeldItems determines whether this Pokemon's held items should be ignored during the stat calculation, default `false`
    * @returns the final in-battle value of a stat
    */
-  getEffectiveStat(stat: EffectiveStat, opponent?: Pokemon, move?: Move, ignoreAbility: boolean = false, ignoreOppAbility: boolean = false, isCritical: boolean = false, simulated: boolean = true): number {
-    const statValue = new Utils.NumberHolder(this.getStat(stat, false));
-    globalScene.applyModifiers(StatBoosterModifier, this.isPlayer(), this, stat, statValue);
+  getEffectiveStat(
+    stat: EffectiveStat,
+    opponent?: Pokemon,
+    move?: Move,
+    ignoreAbility = false,
+    ignoreOppAbility = false,
+    ignoreAllyAbility = false,
+    isCritical = false,
+    simulated = true,
+    ignoreHeldItems = false,
+  ): number {
+    const statValue = new NumberHolder(this.getStat(stat, false));
+    if (!ignoreHeldItems) {
+      globalScene.applyModifiers(
+        StatBoosterModifier,
+        this.isPlayer(),
+        this,
+        stat,
+        statValue,
+      );
+    }
 
     // The Ruin abilities here are never ignored, but they reveal themselves on summon anyway
-    const fieldApplied = new Utils.BooleanHolder(false);
+    const fieldApplied = new BooleanHolder(false);
     for (const pokemon of globalScene.getField(true)) {
-      applyFieldStatMultiplierAbAttrs(FieldMultiplyStatAbAttr, pokemon, stat, statValue, this, fieldApplied, simulated);
+      applyFieldStatMultiplierAbAttrs(
+        FieldMultiplyStatAbAttr,
+        pokemon,
+        stat,
+        statValue,
+        this,
+        fieldApplied,
+        simulated,
+      );
       if (fieldApplied.value) {
         break;
       }
     }
     if (!ignoreAbility) {
-      applyStatMultiplierAbAttrs(StatMultiplierAbAttr, this, stat, statValue, simulated);
+      applyStatMultiplierAbAttrs(
+        StatMultiplierAbAttr,
+        this,
+        stat,
+        statValue,
+        simulated,
+      );
     }
 
-    let ret = statValue.value * this.getStatStageMultiplier(stat, opponent, move, ignoreOppAbility, isCritical, simulated);
+    const ally = this.getAlly();
+    if (!isNullOrUndefined(ally)) {
+      applyAllyStatMultiplierAbAttrs(AllyStatMultiplierAbAttr, ally, stat, statValue, simulated, this, move?.hasFlag(MoveFlags.IGNORE_ABILITIES) || ignoreAllyAbility);
+    }
+
+    let ret =
+      statValue.value *
+      this.getStatStageMultiplier(
+        stat,
+        opponent,
+        move,
+        ignoreOppAbility,
+        isCritical,
+        simulated,
+        ignoreHeldItems,
+      );
 
     switch (stat) {
       case Stat.ATK:
@@ -974,14 +1630,20 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
         }
         break;
       case Stat.DEF:
-        if (this.isOfType(Type.ICE) && globalScene.arena.weather?.weatherType === WeatherType.SNOW) {
+        if (
+          this.isOfType(PokemonType.ICE) &&
+          globalScene.arena.weather?.weatherType === WeatherType.SNOW
+        ) {
           ret *= 1.5;
         }
         break;
       case Stat.SPATK:
         break;
       case Stat.SPDEF:
-        if (this.isOfType(Type.ROCK) && globalScene.arena.weather?.weatherType === WeatherType.SANDSTORM) {
+        if (
+          this.isOfType(PokemonType.ROCK) &&
+          globalScene.arena.weather?.weatherType === WeatherType.SANDSTORM
+        ) {
           ret *= 1.5;
         }
         break;
@@ -990,7 +1652,9 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
         if (globalScene.arena.getTagOnSide(ArenaTagType.TAILWIND, side)) {
           ret *= 2;
         }
-        if (globalScene.arena.getTagOnSide(ArenaTagType.GRASS_WATER_PLEDGE, side)) {
+        if (
+          globalScene.arena.getTagOnSide(ArenaTagType.GRASS_WATER_PLEDGE, side)
+        ) {
           ret >>= 2;
         }
 
@@ -1000,13 +1664,20 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
         if (this.status && this.status.effect === StatusEffect.PARALYSIS) {
           ret >>= 1;
         }
-        if (this.getTag(BattlerTagType.UNBURDEN) && this.hasAbility(Abilities.UNBURDEN)) {
+        if (
+          this.getTag(BattlerTagType.UNBURDEN) &&
+          this.hasAbility(Abilities.UNBURDEN)
+        ) {
           ret *= 2;
         }
         break;
     }
 
-    const highestStatBoost = this.findTag(t => t instanceof HighestStatBoostTag && (t as HighestStatBoostTag).stat === stat) as HighestStatBoostTag;
+    const highestStatBoost = this.findTag(
+      t =>
+        t instanceof HighestStatBoostTag &&
+        (t as HighestStatBoostTag).stat === stat,
+    ) as HighestStatBoostTag;
     if (highestStatBoost) {
       ret *= highestStatBoost.multiplier;
     }
@@ -1016,17 +1687,25 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
 
   calculateStats(): void {
     if (!this.stats) {
-      this.stats = [ 0, 0, 0, 0, 0, 0 ];
+      this.stats = [0, 0, 0, 0, 0, 0];
     }
 
     // Get and manipulate base stats
     const baseStats = this.calculateBaseStats();
     // Using base stats, calculate and store stats one by one
     for (const s of PERMANENT_STATS) {
-      const statHolder = new Utils.IntegerHolder(Math.floor(((2 * baseStats[s] + this.ivs[s]) * this.level) * 0.01));
+      const statHolder = new NumberHolder(
+        Math.floor((2 * baseStats[s] + this.ivs[s]) * this.level * 0.01),
+      );
       if (s === Stat.HP) {
         statHolder.value = statHolder.value + this.level + 10;
-        globalScene.applyModifier(PokemonIncrementingStatModifier, this.isPlayer(), this, s, statHolder);
+        globalScene.applyModifier(
+          PokemonIncrementingStatModifier,
+          this.isPlayer(),
+          this,
+          s,
+          statHolder,
+        );
         if (this.hasAbility(Abilities.WONDER_GUARD, false, true)) {
           statHolder.value = 1;
         }
@@ -1040,15 +1719,37 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
         }
       } else {
         statHolder.value += 5;
-        const natureStatMultiplier = new Utils.NumberHolder(getNatureStatMultiplier(this.getNature(), s));
-        globalScene.applyModifier(PokemonNatureWeightModifier, this.isPlayer(), this, natureStatMultiplier);
+        const natureStatMultiplier = new NumberHolder(
+          getNatureStatMultiplier(this.getNature(), s),
+        );
+        globalScene.applyModifier(
+          PokemonNatureWeightModifier,
+          this.isPlayer(),
+          this,
+          natureStatMultiplier,
+        );
         if (natureStatMultiplier.value !== 1) {
-          statHolder.value = Math.max(Math[natureStatMultiplier.value > 1 ? "ceil" : "floor"](statHolder.value * natureStatMultiplier.value), 1);
+          statHolder.value = Math.max(
+            Math[natureStatMultiplier.value > 1 ? "ceil" : "floor"](
+              statHolder.value * natureStatMultiplier.value,
+            ),
+            1,
+          );
         }
-        globalScene.applyModifier(PokemonIncrementingStatModifier, this.isPlayer(), this, s, statHolder);
+        globalScene.applyModifier(
+          PokemonIncrementingStatModifier,
+          this.isPlayer(),
+          this,
+          s,
+          statHolder,
+        );
       }
 
-      statHolder.value = Phaser.Math.Clamp(statHolder.value, 1, Number.MAX_SAFE_INTEGER);
+      statHolder.value = Phaser.Math.Clamp(
+        statHolder.value,
+        1,
+        Number.MAX_SAFE_INTEGER,
+      );
 
       this.setStat(s, statHolder.value);
     }
@@ -1056,13 +1757,33 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
 
   calculateBaseStats(): number[] {
     const baseStats = this.getSpeciesForm(true).baseStats.slice(0);
-    applyChallenges(globalScene.gameMode, ChallengeType.FLIP_STAT, this, baseStats);
+    applyChallenges(
+      ChallengeType.FLIP_STAT,
+      this,
+      baseStats,
+    );
     // Shuckle Juice
-    globalScene.applyModifiers(PokemonBaseStatTotalModifier, this.isPlayer(), this, baseStats);
+    globalScene.applyModifiers(
+      PokemonBaseStatTotalModifier,
+      this.isPlayer(),
+      this,
+      baseStats,
+    );
     // Old Gateau
-    globalScene.applyModifiers(PokemonBaseStatFlatModifier, this.isPlayer(), this, baseStats);
+    globalScene.applyModifiers(
+      PokemonBaseStatFlatModifier,
+      this.isPlayer(),
+      this,
+      baseStats,
+    );
     if (this.isFusion()) {
       const fusionBaseStats = this.getFusionSpeciesForm(true).baseStats;
+      applyChallenges(
+        ChallengeType.FLIP_STAT,
+        this,
+        fusionBaseStats,
+      );
+
       for (const s of PERMANENT_STATS) {
         baseStats[s] = Math.ceil((baseStats[s] + fusionBaseStats[s]) / 2);
       }
@@ -1072,13 +1793,20 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
       }
     }
     // Vitamins
-    globalScene.applyModifiers(BaseStatModifier, this.isPlayer(), this, baseStats);
+    globalScene.applyModifiers(
+      BaseStatModifier,
+      this.isPlayer(),
+      this,
+      baseStats,
+    );
 
     return baseStats;
   }
 
   getNature(): Nature {
-    return this.customPokemonData.nature !== -1 ? this.customPokemonData.nature : this.nature;
+    return this.customPokemonData.nature !== -1
+      ? this.customPokemonData.nature
+      : this.nature;
   }
 
   setNature(nature: Nature): void {
@@ -1093,9 +1821,9 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
 
   generateNature(naturePool?: Nature[]): void {
     if (naturePool === undefined) {
-      naturePool = Utils.getEnumValues(Nature);
+      naturePool = getEnumValues(Nature);
     }
-    const nature = naturePool[Utils.randSeedInt(naturePool.length)];
+    const nature = naturePool[randSeedInt(naturePool.length)];
     this.setNature(nature);
   }
 
@@ -1112,7 +1840,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
     return this.getMaxHp() - this.hp;
   }
 
-  getHpRatio(precise: boolean = false): number {
+  getHpRatio(precise = false): number {
     return precise
       ? this.hp / this.getMaxHp()
       : Math.round((this.hp / this.getMaxHp()) * 100) / 100;
@@ -1131,36 +1859,113 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
     }
   }
 
-  getGender(ignoreOverride?: boolean): Gender {
-    if (!ignoreOverride && this.summonData?.gender !== undefined) {
+  /**
+   * @param {boolean} useIllusion - Whether we want the fake or real gender (illusion ability).
+   */
+  getGender(ignoreOverride?: boolean, useIllusion: boolean = false): Gender {
+    if (useIllusion && this.summonData.illusion) {
+      return this.summonData.illusion.gender;
+    } else if (!ignoreOverride && !isNullOrUndefined(this.summonData.gender)) {
       return this.summonData.gender;
     }
     return this.gender;
   }
 
-  getFusionGender(ignoreOverride?: boolean): Gender {
-    if (!ignoreOverride && this.summonData?.fusionGender !== undefined) {
+  /**
+   * @param {boolean} useIllusion - Whether we want the fake or real gender (illusion ability).
+   */
+  getFusionGender(ignoreOverride?: boolean, useIllusion: boolean = false): Gender {
+    if (useIllusion && this.summonData.illusion?.fusionGender) {
+      return this.summonData.illusion.fusionGender;
+    } else if (!ignoreOverride && !isNullOrUndefined(this.summonData.fusionGender)) {
       return this.summonData.fusionGender;
     }
     return this.fusionGender;
   }
 
-  isShiny(): boolean {
-    return this.shiny || (this.isFusion() && this.fusionShiny);
+  /**
+   * @param {boolean} useIllusion - Whether we want the fake or real shininess (illusion ability).
+   */
+  isShiny(useIllusion: boolean = false): boolean {
+    if (!useIllusion && this.summonData.illusion) {
+      return this.summonData.illusion.basePokemon?.shiny || (this.summonData.illusion.fusionSpecies && this.summonData.illusion.basePokemon?.fusionShiny) || false;
+    } else {
+      return this.shiny || (this.isFusion(useIllusion) && this.fusionShiny);
+    }
   }
 
-  getVariant(): Variant {
-    return !this.isFusion() ? this.variant : Math.max(this.variant, this.fusionVariant) as Variant;
+  isBaseShiny(useIllusion: boolean = false){
+    if (!useIllusion && this.summonData.illusion) {
+      return !!this.summonData.illusion.basePokemon?.shiny;
+    } else {
+      return this.shiny;
+    }
+  }
+
+  isFusionShiny(useIllusion: boolean = false){
+    if (!useIllusion && this.summonData.illusion) {
+      return !!this.summonData.illusion.basePokemon?.fusionShiny;
+    } else {
+      return this.isFusion(useIllusion) && this.fusionShiny;
+    }
+  }
+
+  /**
+   *
+   * @param useIllusion - Whether we want the fake or real shininess (illusion ability).
+   * @returns `true` if the {@linkcode Pokemon} is shiny and the fusion is shiny as well, `false` otherwise
+   */
+  isDoubleShiny(useIllusion: boolean = false): boolean {
+    if (!useIllusion && this.summonData.illusion?.basePokemon) {
+      return this.isFusion(false) && this.summonData.illusion.basePokemon.shiny && this.summonData.illusion.basePokemon.fusionShiny;
+    } else {
+      return this.isFusion(useIllusion) && this.shiny && this.fusionShiny;
+    }
+  }
+
+  /**
+   * @param {boolean} useIllusion - Whether we want the fake or real variant (illusion ability).
+   */
+  getVariant(useIllusion: boolean = false): Variant {
+    if (!useIllusion && this.summonData.illusion) {
+      return !this.isFusion(false)
+      ? this.summonData.illusion.basePokemon!.variant
+      : Math.max(this.variant, this.fusionVariant) as Variant;
+    } else {
+      return !this.isFusion(true)
+      ? this.variant
+      : Math.max(this.variant, this.fusionVariant) as Variant;
+    }
+  }
+
+  getBaseVariant(doubleShiny: boolean): Variant {
+    if (doubleShiny) {
+      return this.summonData.illusion?.basePokemon?.variant ?? this.variant;
+    }
+
+    return this.getVariant();
   }
 
   getLuck(): number {
     return this.luck + (this.isFusion() ? this.fusionLuck : 0);
   }
 
-  isFusion(): boolean {
+  isFusion(useIllusion: boolean = false): boolean {
+    if (useIllusion && this.summonData.illusion) {
+      return !!this.summonData.illusion.fusionSpecies;
+    }
     return !!this.fusionSpecies;
   }
 
+  /**
+   * @param {boolean} useIllusion - Whether we want the fake name or the real name of the Pokemon (for Illusion ability).
+   */
+  getName(useIllusion: boolean = false): string {
+    return (!useIllusion && this.summonData.illusion?.basePokemon)
+    ? this.summonData.illusion.basePokemon.name
+    : this.name;
+  }
+
   /**
    * Checks if the {@linkcode Pokemon} has a fusion with the specified {@linkcode Species}.
    * @param species the pokemon {@linkcode Species} to check
@@ -1170,17 +1975,37 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
     return this.fusionSpecies?.speciesId === species;
   }
 
+  /**
+   * Checks if the {@linkcode Pokemon} has is the specified {@linkcode Species} or is fused with it.
+   * @param species the pokemon {@linkcode Species} to check
+   * @param formKey If provided, requires the species to be in that form
+   * @returns `true` if the pokemon is the species or is fused with it, `false` otherwise
+   */
+  hasSpecies(species: Species, formKey?: string): boolean {
+    if (isNullOrUndefined(formKey)) {
+      return (
+      this.species.speciesId === species ||
+      this.fusionSpecies?.speciesId === species
+    );
+    }
+
+    return (this.species.speciesId === species && this.getFormKey() === formKey) || (this.fusionSpecies?.speciesId === species && this.getFusionFormKey() === formKey);
+  }
+
   abstract isBoss(): boolean;
 
-  getMoveset(ignoreOverride?: boolean): (PokemonMove | null)[] {
-    const ret = !ignoreOverride && this.summonData?.moveset
-      ? this.summonData.moveset
-      : this.moveset;
+  getMoveset(ignoreOverride?: boolean): PokemonMove[] {
+    const ret =
+      !ignoreOverride && this.summonData.moveset
+        ? this.summonData.moveset
+        : this.moveset;
 
     // Overrides moveset based on arrays specified in overrides.ts
-    let overrideArray: Moves | Array<Moves> = this.isPlayer() ? Overrides.MOVESET_OVERRIDE : Overrides.OPP_MOVESET_OVERRIDE;
+    let overrideArray: Moves | Array<Moves> = this.isPlayer()
+      ? Overrides.MOVESET_OVERRIDE
+      : Overrides.OPP_MOVESET_OVERRIDE;
     if (!Array.isArray(overrideArray)) {
-      overrideArray = [ overrideArray ];
+      overrideArray = [overrideArray];
     }
     if (overrideArray.length > 0) {
       if (!this.isPlayer()) {
@@ -1188,7 +2013,10 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
       }
       overrideArray.forEach((move: Moves, index: number) => {
         const ppUsed = this.moveset[index]?.ppUsed ?? 0;
-        this.moveset[index] = new PokemonMove(move, Math.min(ppUsed, allMoves[move].pp));
+        this.moveset[index] = new PokemonMove(
+          move,
+          Math.min(ppUsed, allMoves[move].pp),
+        );
       });
     }
 
@@ -1204,7 +2032,10 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
    */
   getUnlockedEggMoves(): Moves[] {
     const moves: Moves[] = [];
-    const species = this.metSpecies in speciesEggMoves ? this.metSpecies : this.getSpeciesForm(true).getRootSpeciesId(true);
+    const species =
+      this.metSpecies in speciesEggMoves
+        ? this.metSpecies
+        : this.getSpeciesForm(true).getRootSpeciesId(true);
     if (species in speciesEggMoves) {
       for (let i = 0; i < 4; i++) {
         if (globalScene.gameData.starterData[species].eggMoves & (1 << i)) {
@@ -1226,13 +2057,19 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
    */
   public getLearnableLevelMoves(): Moves[] {
     let levelMoves = this.getLevelMoves(1, true, false, true).map(lm => lm[1]);
-    if (this.metBiome === -1 && !globalScene.gameMode.isFreshStartChallenge() && !globalScene.gameMode.isDaily) {
+    if (
+      this.metBiome === -1 &&
+      !globalScene.gameMode.isFreshStartChallenge() &&
+      !globalScene.gameMode.isDaily
+    ) {
       levelMoves = this.getUnlockedEggMoves().concat(levelMoves);
     }
     if (Array.isArray(this.usedTMs) && this.usedTMs.length > 0) {
-      levelMoves = this.usedTMs.filter(m => !levelMoves.includes(m)).concat(levelMoves);
+      levelMoves = this.usedTMs
+        .filter(m => !levelMoves.includes(m))
+        .concat(levelMoves);
     }
-    levelMoves = levelMoves.filter(lm => !this.moveset.some(m => m?.moveId === lm));
+    levelMoves = levelMoves.filter(lm => !this.moveset.some(m => m.moveId === lm));
     return levelMoves;
   }
 
@@ -1241,42 +2078,65 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
    * @param includeTeraType - `true` to include tera-formed type; Default: `false`
    * @param forDefend - `true` if the pokemon is defending from an attack; Default: `false`
    * @param ignoreOverride - If `true`, ignore ability changing effects; Default: `false`
-   * @returns array of {@linkcode Type}
+   * @param useIllusion - `true` to return the types of the illusion instead of the actual types; Default: `false`
+   * @returns array of {@linkcode PokemonType}
    */
-  public getTypes(includeTeraType = false, forDefend: boolean = false, ignoreOverride: boolean = false): Type[] {
-    const types: Type[] = [];
+  public getTypes(
+    includeTeraType = false,
+    forDefend: boolean = false,
+    ignoreOverride: boolean = false,
+    useIllusion: boolean = false
+  ): PokemonType[] {
+    const types: PokemonType[] = [];
 
-    if (includeTeraType) {
+    if (includeTeraType && this.isTerastallized) {
       const teraType = this.getTeraType();
-      if (teraType !== Type.UNKNOWN) {
+      if (this.isTerastallized && !(forDefend && teraType === PokemonType.STELLAR)) {
+        // Stellar tera uses its original types defensively
         types.push(teraType);
         if (forDefend) {
           return types;
         }
       }
     }
-
     if (!types.length || !includeTeraType) {
-      if (!ignoreOverride && this.summonData?.types && this.summonData.types.length > 0) {
+
+      if (
+        !ignoreOverride &&
+        this.summonData.types &&
+        this.summonData.types.length > 0 &&
+        (!this.summonData.illusion || !useIllusion)
+      ) {
         this.summonData.types.forEach(t => types.push(t));
       } else {
-        const speciesForm = this.getSpeciesForm(ignoreOverride);
-        const fusionSpeciesForm = this.getFusionSpeciesForm(ignoreOverride);
+        const speciesForm = this.getSpeciesForm(ignoreOverride, useIllusion);
+        const fusionSpeciesForm = this.getFusionSpeciesForm(ignoreOverride, useIllusion);
         const customTypes = this.customPokemonData.types?.length > 0;
 
         // First type, checking for "permanently changed" types from ME
-        const firstType = (customTypes && this.customPokemonData.types[0] !== Type.UNKNOWN) ? this.customPokemonData.types[0] : speciesForm.type1;
+        const firstType =
+          customTypes && this.customPokemonData.types[0] !== PokemonType.UNKNOWN
+            ? this.customPokemonData.types[0]
+            : speciesForm.type1;
         types.push(firstType);
 
         // Second type
-        let secondType: Type = Type.UNKNOWN;
+        let secondType: PokemonType = PokemonType.UNKNOWN;
 
         if (fusionSpeciesForm) {
           // Check if the fusion Pokemon also has permanent changes from ME when determining the fusion types
-          const fusionType1 = (this.fusionCustomPokemonData?.types && this.fusionCustomPokemonData.types.length > 0 && this.fusionCustomPokemonData.types[0] !== Type.UNKNOWN)
-            ? this.fusionCustomPokemonData.types[0] : fusionSpeciesForm.type1;
-          const fusionType2 = (this.fusionCustomPokemonData?.types && this.fusionCustomPokemonData.types.length > 1 && this.fusionCustomPokemonData.types[1] !== Type.UNKNOWN)
-            ? this.fusionCustomPokemonData.types[1] : fusionSpeciesForm.type2;
+          const fusionType1 =
+            this.fusionCustomPokemonData?.types &&
+            this.fusionCustomPokemonData.types.length > 0 &&
+            this.fusionCustomPokemonData.types[0] !== PokemonType.UNKNOWN
+              ? this.fusionCustomPokemonData.types[0]
+              : fusionSpeciesForm.type1;
+          const fusionType2 =
+            this.fusionCustomPokemonData?.types &&
+            this.fusionCustomPokemonData.types.length > 1 &&
+            this.fusionCustomPokemonData.types[1] !== PokemonType.UNKNOWN
+              ? this.fusionCustomPokemonData.types[1]
+              : fusionSpeciesForm.type2;
 
           // Assign second type if the fusion can provide one
           if (fusionType2 !== null && fusionType2 !== types[0]) {
@@ -1284,13 +2144,30 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
           } else if (fusionType1 !== types[0]) {
             secondType = fusionType1;
           }
+
+          if (
+            secondType === PokemonType.UNKNOWN &&
+            isNullOrUndefined(fusionType2)
+          ) {
+            // If second pokemon was monotype and shared its primary type
+            secondType =
+              customTypes &&
+              this.customPokemonData.types.length > 1 &&
+              this.customPokemonData.types[1] !== PokemonType.UNKNOWN
+                ? this.customPokemonData.types[1]
+                : (speciesForm.type2 ?? PokemonType.UNKNOWN);
+          }
         } else {
           // If not a fusion, just get the second type from the species, checking for permanent changes from ME
-          secondType = (customTypes && this.customPokemonData.types.length > 1 && this.customPokemonData.types[1] !== Type.UNKNOWN)
-            ? this.customPokemonData.types[1] : (speciesForm.type2 ?? Type.UNKNOWN);
+          secondType =
+            customTypes &&
+            this.customPokemonData.types.length > 1 &&
+            this.customPokemonData.types[1] !== PokemonType.UNKNOWN
+              ? this.customPokemonData.types[1]
+              : (speciesForm.type2 ?? PokemonType.UNKNOWN);
         }
 
-        if (secondType !== Type.UNKNOWN) {
+        if (secondType !== PokemonType.UNKNOWN) {
           types.push(secondType);
         }
       }
@@ -1298,19 +2175,23 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
 
     // become UNKNOWN if no types are present
     if (!types.length) {
-      types.push(Type.UNKNOWN);
+      types.push(PokemonType.UNKNOWN);
     }
 
     // remove UNKNOWN if other types are present
-    if (types.length > 1 && types.includes(Type.UNKNOWN)) {
-      const index = types.indexOf(Type.UNKNOWN);
+    if (types.length > 1 && types.includes(PokemonType.UNKNOWN)) {
+      const index = types.indexOf(PokemonType.UNKNOWN);
       if (index !== -1) {
         types.splice(index, 1);
       }
     }
 
-    // the type added to Pokemon from moves like Forest's Curse or Trick Or Treat
-    if (!ignoreOverride && this.summonData && this.summonData.addedType && !types.includes(this.summonData.addedType)) {
+    // check type added to Pokemon from moves like Forest's Curse or Trick Or Treat
+    if (
+      !ignoreOverride &&
+      this.summonData.addedType &&
+      !types.includes(this.summonData.addedType)
+    ) {
       types.push(this.summonData.addedType);
     }
 
@@ -1324,14 +2205,21 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
 
   /**
    * Checks if the pokemon's typing includes the specified type
-   * @param type - {@linkcode Type} to check
+   * @param type - {@linkcode PokemonType} to check
    * @param includeTeraType - `true` to include tera-formed type; Default: `true`
    * @param forDefend - `true` if the pokemon is defending from an attack; Default: `false`
    * @param ignoreOverride - If `true`, ignore ability changing effects; Default: `false`
    * @returns `true` if the Pokemon's type matches
    */
-  public isOfType(type: Type, includeTeraType: boolean = true, forDefend: boolean = false, ignoreOverride: boolean = false): boolean {
-    return this.getTypes(includeTeraType, forDefend, ignoreOverride).some((t) => t === type);
+  public isOfType(
+    type: PokemonType,
+    includeTeraType = true,
+    forDefend = false,
+    ignoreOverride = false,
+  ): boolean {
+    return this.getTypes(includeTeraType, forDefend, ignoreOverride).some(
+      t => t === type,
+    );
   }
 
   /**
@@ -1342,8 +2230,8 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
    * @param ignoreOverride - If `true`, ignore ability changing effects; Default: `false`
    * @returns The non-passive {@linkcode Ability} of the pokemon
    */
-  public getAbility(ignoreOverride: boolean = false): Ability {
-    if (!ignoreOverride && this.summonData?.ability) {
+  public getAbility(ignoreOverride = false): Ability {
+    if (!ignoreOverride && this.summonData.ability) {
       return allAbilities[this.summonData.ability];
     }
     if (Overrides.ABILITY_OVERRIDE && this.isPlayer()) {
@@ -1353,16 +2241,27 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
       return allAbilities[Overrides.OPP_ABILITY_OVERRIDE];
     }
     if (this.isFusion()) {
-      if (!isNullOrUndefined(this.fusionCustomPokemonData?.ability) && this.fusionCustomPokemonData.ability !== -1) {
+      if (
+        !isNullOrUndefined(this.fusionCustomPokemonData?.ability) &&
+        this.fusionCustomPokemonData.ability !== -1
+      ) {
         return allAbilities[this.fusionCustomPokemonData.ability];
-      } else {
-        return allAbilities[this.getFusionSpeciesForm(ignoreOverride).getAbility(this.fusionAbilityIndex)];
       }
+      return allAbilities[
+        this.getFusionSpeciesForm(ignoreOverride).getAbility(
+          this.fusionAbilityIndex,
+        )
+      ];
     }
-    if (!isNullOrUndefined(this.customPokemonData.ability) && this.customPokemonData.ability !== -1) {
+    if (
+      !isNullOrUndefined(this.customPokemonData.ability) &&
+      this.customPokemonData.ability !== -1
+    ) {
       return allAbilities[this.customPokemonData.ability];
     }
-    let abilityId = this.getSpeciesForm(ignoreOverride).getAbility(this.abilityIndex);
+    let abilityId = this.getSpeciesForm(ignoreOverride).getAbility(
+      this.abilityIndex,
+    );
     if (abilityId === Abilities.NONE) {
       abilityId = this.species.ability1;
     }
@@ -1383,7 +2282,10 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
     if (Overrides.OPP_PASSIVE_ABILITY_OVERRIDE && !this.isPlayer()) {
       return allAbilities[Overrides.OPP_PASSIVE_ABILITY_OVERRIDE];
     }
-    if (!isNullOrUndefined(this.customPokemonData.passive) && this.customPokemonData.passive !== -1) {
+    if (
+      !isNullOrUndefined(this.customPokemonData.passive) &&
+      this.customPokemonData.passive !== -1
+    ) {
       return allAbilities[this.customPokemonData.passive];
     }
 
@@ -1395,15 +2297,21 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
    * Accounts for all the various effects which can affect whether an ability will be present or
    * in effect, and both passive and non-passive.
    * @param attrType - {@linkcode AbAttr} The ability attribute to check for.
-   * @param canApply - If `false`, it doesn't check whether the ability is currently active; Default `true`
-   * @param ignoreOverride - If `true`, it ignores ability changing effects; Default `false`
+   * @param canApply - Whether to check if the ability is currently active; Default `true`
+   * @param ignoreOverride - Whether to ignore ability changing effects; Default `false`
    * @returns An array of all the ability attributes on this ability.
    */
-  public getAbilityAttrs<T extends AbAttr = AbAttr>(attrType: { new(...args: any[]): T }, canApply: boolean = true, ignoreOverride: boolean = false): T[] {
+  public getAbilityAttrs<T extends AbAttr = AbAttr>(
+    attrType: { new (...args: any[]): T },
+    canApply = true,
+    ignoreOverride = false,
+  ): T[] {
     const abilityAttrs: T[] = [];
 
     if (!canApply || this.canApplyAbility()) {
-      abilityAttrs.push(...this.getAbility(ignoreOverride).getAttrs<T>(attrType));
+      abilityAttrs.push(
+        ...this.getAbility(ignoreOverride).getAttrs<T>(attrType),
+      );
     }
 
     if (!canApply || this.canApplyAbility(true)) {
@@ -1413,6 +2321,30 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
     return abilityAttrs;
   }
 
+  /**
+   * Sets the {@linkcode Pokemon}'s ability and activates it if it normally activates on summon
+   *
+   * Also clears primal weather if it is from the ability being changed
+   * @param ability New Ability
+   */
+  public setTempAbility(ability: Ability, passive = false): void {
+    applyOnLoseAbAttrs(this, passive);
+    if (passive) {
+      this.summonData.passiveAbility = ability.id;
+    } else {
+      this.summonData.ability = ability.id;
+    }
+    applyOnGainAbAttrs(this, passive);
+  }
+
+  /**
+   * Suppresses an ability and calls its onlose attributes
+   */
+  public suppressAbility() {
+    [true, false].forEach(passive => applyOnLoseAbAttrs(this, passive));
+    this.summonData.abilitySuppressed = true;
+  }
+
   /**
    * Checks if a pokemon has a passive either from:
    *  - bought with starter candy
@@ -1423,14 +2355,18 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
   public hasPassive(): boolean {
     // returns override if valid for current case
     if (
-      (Overrides.HAS_PASSIVE_ABILITY_OVERRIDE === false && this.isPlayer())
-      || (Overrides.OPP_HAS_PASSIVE_ABILITY_OVERRIDE === false && !this.isPlayer())
+      (Overrides.HAS_PASSIVE_ABILITY_OVERRIDE === false && this.isPlayer()) ||
+      (Overrides.OPP_HAS_PASSIVE_ABILITY_OVERRIDE === false && !this.isPlayer())
     ) {
       return false;
     }
     if (
-      ((Overrides.PASSIVE_ABILITY_OVERRIDE !== Abilities.NONE || Overrides.HAS_PASSIVE_ABILITY_OVERRIDE) && this.isPlayer())
-      || ((Overrides.OPP_PASSIVE_ABILITY_OVERRIDE !== Abilities.NONE || Overrides.OPP_HAS_PASSIVE_ABILITY_OVERRIDE) && !this.isPlayer())
+      ((Overrides.PASSIVE_ABILITY_OVERRIDE !== Abilities.NONE ||
+        Overrides.HAS_PASSIVE_ABILITY_OVERRIDE) &&
+        this.isPlayer()) ||
+      ((Overrides.OPP_PASSIVE_ABILITY_OVERRIDE !== Abilities.NONE ||
+        Overrides.OPP_HAS_PASSIVE_ABILITY_OVERRIDE) &&
+        !this.isPlayer())
     ) {
       return true;
     }
@@ -1438,10 +2374,12 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
     // Classic Final boss and Endless Minor/Major bosses do not have passive
     const { currentBattle, gameMode } = globalScene;
     const waveIndex = currentBattle?.waveIndex;
-    if (this instanceof EnemyPokemon &&
+    if (
+      this instanceof EnemyPokemon &&
       (currentBattle?.battleSpec === BattleSpec.FINAL_BOSS ||
-      gameMode.isEndlessMinorBoss(waveIndex) ||
-      gameMode.isEndlessMajorBoss(waveIndex))) {
+        gameMode.isEndlessMinorBoss(waveIndex) ||
+        gameMode.isEndlessMajorBoss(waveIndex))
+    ) {
       return false;
     }
 
@@ -1455,52 +2393,86 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
    * @param passive If true, check if passive can be applied instead of non-passive
    * @returns `true` if the ability can be applied
    */
-  public canApplyAbility(passive: boolean = false): boolean {
+  public canApplyAbility(passive = false): boolean {
     if (passive && !this.hasPassive()) {
       return false;
     }
-    const ability = (!passive ? this.getAbility() : this.getPassiveAbility());
+    const ability = !passive ? this.getAbility() : this.getPassiveAbility();
     if (this.isFusion() && ability.hasAttr(NoFusionAbilityAbAttr)) {
       return false;
     }
     const arena = globalScene?.arena;
-    if (arena.ignoreAbilities && arena.ignoringEffectSource !== this.getBattlerIndex() && ability.isIgnorable) {
+    if (
+      arena.ignoreAbilities &&
+      arena.ignoringEffectSource !== this.getBattlerIndex() &&
+      ability.isIgnorable
+    ) {
       return false;
     }
-    if (this.summonData?.abilitySuppressed && !ability.hasAttr(UnsuppressableAbilityAbAttr)) {
+    if (
+      this.summonData.abilitySuppressed &&
+      ability.isSuppressable
+    ) {
       return false;
     }
-    if (this.isOnField() && !ability.hasAttr(SuppressFieldAbilitiesAbAttr)) {
-      const suppressed = new Utils.BooleanHolder(false);
-      globalScene.getField(true).filter(p => p !== this).map(p => {
-        if (p.getAbility().hasAttr(SuppressFieldAbilitiesAbAttr) && p.canApplyAbility()) {
-          p.getAbility().getAttrs(SuppressFieldAbilitiesAbAttr).map(a => a.apply(this, false, false, suppressed, [ ability ]));
-        }
-        if (p.getPassiveAbility().hasAttr(SuppressFieldAbilitiesAbAttr) && p.canApplyAbility(true)) {
-          p.getPassiveAbility().getAttrs(SuppressFieldAbilitiesAbAttr).map(a => a.apply(this, true, false, suppressed, [ ability ]));
-        }
-      });
-      if (suppressed.value) {
+    const suppressAbilitiesTag = arena.getTag(
+      ArenaTagType.NEUTRALIZING_GAS,
+    ) as SuppressAbilitiesTag;
+    const suppressOffField = ability.hasAttr(PreSummonAbAttr);
+    if (
+      (this.isOnField() || suppressOffField) &&
+      suppressAbilitiesTag &&
+      !suppressAbilitiesTag.isBeingRemoved()
+    ) {
+      const thisAbilitySuppressing = ability.hasAttr(
+        PreLeaveFieldRemoveSuppressAbilitiesSourceAbAttr,
+      );
+      const hasSuppressingAbility = this.hasAbilityWithAttr(
+        PreLeaveFieldRemoveSuppressAbilitiesSourceAbAttr,
+        false,
+      );
+      // Neutralizing gas is up - suppress abilities unless they are unsuppressable or this pokemon is responsible for the gas
+      // (Balance decided that the other ability of a neutralizing gas pokemon should not be neutralized)
+      // If the ability itself is neutralizing gas, don't suppress it (handled through arena tag)
+      const unsuppressable =
+        !ability.isSuppressable ||
+        thisAbilitySuppressing ||
+        (hasSuppressingAbility && !suppressAbilitiesTag.shouldApplyToSelf());
+      if (!unsuppressable) {
         return false;
       }
     }
-    return (this.hp > 0 || ability.isBypassFaint) && !ability.conditions.find(condition => !condition(this));
+    return (
+      (this.hp > 0 || ability.isBypassFaint) &&
+      !ability.conditions.find(condition => !condition(this))
+    );
   }
 
   /**
    * Checks whether a pokemon has the specified ability and it's in effect. Accounts for all the various
    * effects which can affect whether an ability will be present or in effect, and both passive and
    * non-passive. This is the primary way to check whether a pokemon has a particular ability.
-   * @param {Abilities} ability The ability to check for
-   * @param {boolean} canApply If false, it doesn't check whether the ability is currently active
-   * @param {boolean} ignoreOverride If true, it ignores ability changing effects
-   * @returns {boolean} Whether the ability is present and active
+   * @param ability The ability to check for
+   * @param canApply - Whether to check if the ability is currently active; default `true`
+   * @param ignoreOverride Whether to ignore ability changing effects; default `false`
+   * @returns `true` if the ability is present and active
    */
-  public hasAbility(ability: Abilities, canApply: boolean = true, ignoreOverride?: boolean): boolean {
-    if (this.getAbility(ignoreOverride).id === ability && (!canApply || this.canApplyAbility())) {
+  public hasAbility(
+    ability: Abilities,
+    canApply = true,
+    ignoreOverride = false,
+  ): boolean {
+    if (
+      this.getAbility(ignoreOverride).id === ability &&
+      (!canApply || this.canApplyAbility())
+    ) {
       return true;
     }
-    if (this.getPassiveAbility().id === ability && this.hasPassive() && (!canApply || this.canApplyAbility(true))) {
+    if (
+      this.getPassiveAbility().id === ability &&
+      this.hasPassive() &&
+      (!canApply || this.canApplyAbility(true))
+    ) {
       return true;
     }
     return false;
@@ -1511,16 +2483,27 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
    * Accounts for all the various effects which can affect whether an ability will be present or
    * in effect, and both passive and non-passive. This is one of the two primary ways to check
    * whether a pokemon has a particular ability.
-   * @param {AbAttr} attrType The ability attribute to check for
-   * @param {boolean} canApply If false, it doesn't check whether the ability is currently active
-   * @param {boolean} ignoreOverride If true, it ignores ability changing effects
-   * @returns {boolean} Whether an ability with that attribute is present and active
+   * @param attrType The {@link AbAttr | ability attribute} to check for
+   * @param canApply - Whether to check if the ability is currently active; default `true`
+   * @param ignoreOverride Whether to ignore ability changing effects; default `false`
+   * @returns `true` if an ability with the given {@linkcode AbAttr} is present and active
    */
-  public hasAbilityWithAttr(attrType: Constructor<AbAttr>, canApply: boolean = true, ignoreOverride?: boolean): boolean {
-    if ((!canApply || this.canApplyAbility()) && this.getAbility(ignoreOverride).hasAttr(attrType)) {
+  public hasAbilityWithAttr(
+    attrType: Constructor<AbAttr>,
+    canApply = true,
+    ignoreOverride = false,
+  ): boolean {
+    if (
+      (!canApply || this.canApplyAbility()) &&
+      this.getAbility(ignoreOverride).hasAttr(attrType)
+    ) {
       return true;
     }
-    if (this.hasPassive() && (!canApply || this.canApplyAbility(true)) && this.getPassiveAbility().hasAttr(attrType)) {
+    if (
+      this.hasPassive() &&
+      (!canApply || this.canApplyAbility(true)) &&
+      this.getPassiveAbility().hasAttr(attrType)
+    ) {
       return true;
     }
     return false;
@@ -1534,11 +2517,11 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
   public getWeight(): number {
     const autotomizedTag = this.getTag(AutotomizedTag);
     let weightRemoved = 0;
-    if (!Utils.isNullOrUndefined(autotomizedTag)) {
+    if (!isNullOrUndefined(autotomizedTag)) {
       weightRemoved = 100 * autotomizedTag!.autotomizeCount;
     }
     const minWeight = 0.1;
-    const weight = new Utils.NumberHolder(this.species.weight - weightRemoved);
+    const weight = new NumberHolder(this.species.weight - weightRemoved);
 
     // This will trigger the ability overlay so only call this function when necessary
     applyAbAttrs(WeightMultiplierAbAttr, this, null, false, weight);
@@ -1546,27 +2529,46 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
   }
 
   /**
-   * @returns the pokemon's current tera {@linkcode Type}, or `Type.UNKNOWN` if the pokemon is not terastallized
+   * @returns the pokemon's current tera {@linkcode PokemonType}
    */
-  public getTeraType(): Type {
-    // I don't think this should be possible anymore, please report if you encounter this. --NightKev
-    if (globalScene === undefined) {
-      console.warn("Pokemon.getTeraType(): Global scene is not defined!");
-      return Type.UNKNOWN;
+  getTeraType(): PokemonType {
+    if (this.hasSpecies(Species.TERAPAGOS)) {
+      return PokemonType.STELLAR;
     }
-    const teraModifier = globalScene.findModifier(m =>
-      m instanceof TerastallizeModifier
-      && m.pokemonId === this.id
-      && m.getBattlesLeft() > 0, this.isPlayer()) as TerastallizeModifier;
-    return teraModifier?.teraType ?? Type.UNKNOWN;
-  }
-
-  public isTerastallized(): boolean {
-    return this.getTeraType() !== Type.UNKNOWN;
+    if (this.hasSpecies(Species.OGERPON)) {
+      const ogerponForm =
+        this.species.speciesId === Species.OGERPON
+          ? this.formIndex
+          : this.fusionFormIndex;
+      switch (ogerponForm) {
+        case 0:
+        case 4:
+          return PokemonType.GRASS;
+        case 1:
+        case 5:
+          return PokemonType.WATER;
+        case 2:
+        case 6:
+          return PokemonType.FIRE;
+        case 3:
+        case 7:
+          return PokemonType.ROCK;
+      }
+    }
+    if (this.hasSpecies(Species.SHEDINJA)) {
+      return PokemonType.BUG;
+    }
+    return this.teraType;
   }
 
   public isGrounded(): boolean {
-    return !!this.getTag(GroundedTag) || (!this.isOfType(Type.FLYING, true, true) && !this.hasAbility(Abilities.LEVITATE) && !this.getTag(BattlerTagType.FLOATING) && !this.getTag(SemiInvulnerableTag));
+    return (
+      !!this.getTag(GroundedTag) ||
+      (!this.isOfType(PokemonType.FLYING, true, true) &&
+        !this.hasAbility(Abilities.LEVITATE) &&
+        !this.getTag(BattlerTagType.FLOATING) &&
+        !this.getTag(SemiInvulnerableTag))
+    );
   }
 
   /**
@@ -1577,30 +2579,48 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
    * @param simulated - If `true`, applies abilities via simulated calls.
    * @returns `true` if the pokemon is trapped
    */
-  public isTrapped(trappedAbMessages: string[] = [], simulated: boolean = true): boolean {
+  public isTrapped(
+    trappedAbMessages: string[] = [],
+    simulated = true,
+  ): boolean {
     const commandedTag = this.getTag(BattlerTagType.COMMANDED);
     if (commandedTag?.getSourcePokemon()?.isActive(true)) {
       return true;
     }
 
-    if (this.isOfType(Type.GHOST)) {
+    if (this.isOfType(PokemonType.GHOST)) {
       return false;
     }
 
-    const trappedByAbility = new Utils.BooleanHolder(false);
+    const trappedByAbility = new BooleanHolder(false);
     /**
      * Contains opposing Pokemon (Enemy/Player Pokemon) depending on perspective
      * Afterwards, it filters out Pokemon that have been switched out of the field so trapped abilities/moves do not trigger
      */
-    const opposingFieldUnfiltered = this.isPlayer() ? globalScene.getEnemyField() : globalScene.getPlayerField();
-    const opposingField = opposingFieldUnfiltered.filter(enemyPkm => enemyPkm.switchOutStatus === false);
-
-    opposingField.forEach((opponent) =>
-      applyCheckTrappedAbAttrs(CheckTrappedAbAttr, opponent, trappedByAbility, this, trappedAbMessages, simulated)
+    const opposingFieldUnfiltered = this.isPlayer()
+      ? globalScene.getEnemyField()
+      : globalScene.getPlayerField();
+    const opposingField = opposingFieldUnfiltered.filter(
+      enemyPkm => enemyPkm.switchOutStatus === false,
     );
 
+    for (const opponent of opposingField) {
+      applyCheckTrappedAbAttrs(
+        CheckTrappedAbAttr,
+        opponent,
+        trappedByAbility,
+        this,
+        trappedAbMessages,
+        simulated,
+      );
+    }
+
     const side = this.isPlayer() ? ArenaTagSide.PLAYER : ArenaTagSide.ENEMY;
-    return (trappedByAbility.value || !!this.getTag(TrappedTag) || !!globalScene.arena.getTagOnSide(ArenaTagType.FAIRY_LOCK, side));
+    return (
+      trappedByAbility.value ||
+      !!this.getTag(TrappedTag) ||
+      !!globalScene.arena.getTagOnSide(ArenaTagType.FAIRY_LOCK, side)
+    );
   }
 
   /**
@@ -1608,22 +2628,38 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
    * type-changing move and ability attributes have applied.
    * @param move - {@linkcode Move} The move being used.
    * @param simulated - If `true`, prevents showing abilities applied in this calculation.
-   * @returns The {@linkcode Type} of the move after attributes are applied
+   * @returns The {@linkcode PokemonType} of the move after attributes are applied
    */
-  public getMoveType(move: Move, simulated: boolean = true): Type {
-    const moveTypeHolder = new Utils.NumberHolder(move.type);
+  public getMoveType(move: Move, simulated = true): PokemonType {
+    const moveTypeHolder = new NumberHolder(move.type);
 
     applyMoveAttrs(VariableMoveTypeAttr, this, null, move, moveTypeHolder);
-    applyPreAttackAbAttrs(MoveTypeChangeAbAttr, this, null, move, simulated, moveTypeHolder);
+    applyPreAttackAbAttrs(
+      MoveTypeChangeAbAttr,
+      this,
+      null,
+      move,
+      simulated,
+      moveTypeHolder
+    );
 
-    globalScene.arena.applyTags(ArenaTagType.ION_DELUGE, simulated, moveTypeHolder);
-    if (this.getTag(BattlerTagType.ELECTRIFIED)) {
-      moveTypeHolder.value = Type.ELECTRIC;
+    // If the user is terastallized and the move is tera blast, or tera starstorm that is stellar type,
+    // then bypass the check for ion deluge and electrify
+    if (this.isTerastallized && (move.id === Moves.TERA_BLAST || move.id === Moves.TERA_STARSTORM && moveTypeHolder.value === PokemonType.STELLAR)) {
+      return moveTypeHolder.value as PokemonType;
     }
 
-    return moveTypeHolder.value as Type;
-  }
+    globalScene.arena.applyTags(
+      ArenaTagType.ION_DELUGE,
+      simulated,
+      moveTypeHolder,
+    );
+    if (this.getTag(BattlerTagType.ELECTRIFIED)) {
+      moveTypeHolder.value = PokemonType.ELECTRIC;
+    }
 
+    return moveTypeHolder.value as PokemonType;
+  }
 
   /**
    * Calculates the effectiveness of a move against the Pokémon.
@@ -1632,12 +2668,19 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
    * @param move {@linkcode Move} The move being used by the attacking Pokémon.
    * @param ignoreAbility Whether to ignore abilities that might affect type effectiveness or immunity (defaults to `false`).
    * @param simulated Whether to apply abilities via simulated calls (defaults to `true`)
-   * @param cancelled {@linkcode Utils.BooleanHolder} Stores whether the move was cancelled by a non-type-based immunity.
-   * Currently only used by {@linkcode Pokemon.apply} to determine whether a "No effect" message should be shown.
+   * @param cancelled {@linkcode BooleanHolder} Stores whether the move was cancelled by a non-type-based immunity.
+   * @param useIllusion - Whether we want the attack move effectiveness on the illusion or not
    * @returns The type damage multiplier, indicating the effectiveness of the move
    */
-  getMoveEffectiveness(source: Pokemon, move: Move, ignoreAbility: boolean = false, simulated: boolean = true, cancelled?: Utils.BooleanHolder): TypeDamageMultiplier {
-    if (!Utils.isNullOrUndefined(this.turnData?.moveEffectiveness)) {
+  getMoveEffectiveness(
+    source: Pokemon,
+    move: Move,
+    ignoreAbility = false,
+    simulated = true,
+    cancelled?: BooleanHolder,
+    useIllusion: boolean = false
+  ): TypeDamageMultiplier {
+    if (!isNullOrUndefined(this.turnData?.moveEffectiveness)) {
       return this.turnData?.moveEffectiveness;
     }
 
@@ -1646,36 +2689,84 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
     }
     const moveType = source.getMoveType(move);
 
-    const typeMultiplier = new Utils.NumberHolder((move.category !== MoveCategory.STATUS || move.hasAttr(RespectAttackTypeImmunityAttr))
-      ? this.getAttackTypeEffectiveness(moveType, source, false, simulated, move)
+    const typeMultiplier = new NumberHolder(
+      move.category !== MoveCategory.STATUS ||
+      move.hasAttr(RespectAttackTypeImmunityAttr)
+      ? this.getAttackTypeEffectiveness(
+        moveType,
+        source,
+        false,
+        simulated,
+        move,
+        useIllusion
+      )
       : 1);
 
-    applyMoveAttrs(VariableMoveTypeMultiplierAttr, source, this, move, typeMultiplier);
-    if (this.getTypes(true, true).find(t => move.isTypeImmune(source, this, t))) {
+    applyMoveAttrs(
+      VariableMoveTypeMultiplierAttr,
+      source,
+      this,
+      move,
+      typeMultiplier,
+    );
+    if (
+      this.getTypes(true, true).find(t => move.isTypeImmune(source, this, t))
+    ) {
       typeMultiplier.value = 0;
     }
 
-    if (this.getTag(TarShotTag) && (this.getMoveType(move) === Type.FIRE)) {
+    if (this.getTag(TarShotTag) && this.getMoveType(move) === PokemonType.FIRE) {
       typeMultiplier.value *= 2;
     }
 
-    const cancelledHolder = cancelled ?? new Utils.BooleanHolder(false);
+    const cancelledHolder = cancelled ?? new BooleanHolder(false);
     if (!ignoreAbility) {
-      applyPreDefendAbAttrs(TypeImmunityAbAttr, this, source, move, cancelledHolder, simulated, typeMultiplier);
+      applyPreDefendAbAttrs(
+        TypeImmunityAbAttr,
+        this,
+        source,
+        move,
+        cancelledHolder,
+        simulated,
+        typeMultiplier,
+      );
 
       if (!cancelledHolder.value) {
-        applyPreDefendAbAttrs(MoveImmunityAbAttr, this, source, move, cancelledHolder, simulated, typeMultiplier);
+        applyPreDefendAbAttrs(
+          MoveImmunityAbAttr,
+          this,
+          source,
+          move,
+          cancelledHolder,
+          simulated,
+          typeMultiplier,
+        );
       }
 
       if (!cancelledHolder.value) {
-        const defendingSidePlayField = this.isPlayer() ? globalScene.getPlayerField() : globalScene.getEnemyField();
-        defendingSidePlayField.forEach((p) => applyPreDefendAbAttrs(FieldPriorityMoveImmunityAbAttr, p, source, move, cancelledHolder));
+        const defendingSidePlayField = this.isPlayer()
+          ? globalScene.getPlayerField()
+          : globalScene.getEnemyField();
+        defendingSidePlayField.forEach(p =>
+          applyPreDefendAbAttrs(
+            FieldPriorityMoveImmunityAbAttr,
+            p,
+            source,
+            move,
+            cancelledHolder,
+          ),
+        );
       }
     }
 
-    const immuneTags = this.findTags(tag => tag instanceof TypeImmuneTag && tag.immuneType === moveType);
+    const immuneTags = this.findTags(
+      tag => tag instanceof TypeImmuneTag && tag.immuneType === moveType,
+    );
     for (const tag of immuneTags) {
-      if (move && !move.getAttrs(HitsTagAttr).some(attr => attr.tagType === tag.tagType)) {
+      if (
+        move &&
+        !move.getAttrs(HitsTagAttr).some(attr => attr.tagType === tag.tagType)
+      ) {
         typeMultiplier.value = 0;
         break;
       }
@@ -1683,72 +2774,133 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
 
     // Apply Tera Shell's effect to attacks after all immunities are accounted for
     if (!ignoreAbility && move.category !== MoveCategory.STATUS) {
-      applyPreDefendAbAttrs(FullHpResistTypeAbAttr, this, source, move, cancelledHolder, simulated, typeMultiplier);
+      applyPreDefendAbAttrs(
+        FullHpResistTypeAbAttr,
+        this,
+        source,
+        move,
+        cancelledHolder,
+        simulated,
+        typeMultiplier,
+      );
     }
 
-    if (move.category === MoveCategory.STATUS && move.hitsSubstitute(source, this)) {
+    if (
+      move.category === MoveCategory.STATUS &&
+      move.hitsSubstitute(source, this)
+    ) {
       typeMultiplier.value = 0;
     }
 
-    return (!cancelledHolder.value ? typeMultiplier.value : 0) as TypeDamageMultiplier;
+    return (
+      !cancelledHolder.value ? typeMultiplier.value : 0
+    ) as TypeDamageMultiplier;
   }
 
   /**
    * Calculates the move's type effectiveness multiplier based on the target's type/s.
-   * @param moveType {@linkcode Type} the type of the move being used
+   * @param moveType {@linkcode PokemonType} the type of the move being used
    * @param source {@linkcode Pokemon} the Pokemon using the move
    * @param ignoreStrongWinds whether or not this ignores strong winds (anticipation, forewarn, stealth rocks)
    * @param simulated tag to only apply the strong winds effect message when the move is used
    * @param move (optional) the move whose type effectiveness is to be checked. Used for applying {@linkcode VariableMoveTypeChartAttr}
+   * @param useIllusion - Whether we want the attack type effectiveness on the illusion or not
    * @returns a multiplier for the type effectiveness
    */
-  getAttackTypeEffectiveness(moveType: Type, source?: Pokemon, ignoreStrongWinds: boolean = false, simulated: boolean = true, move?: Move): TypeDamageMultiplier {
-    if (moveType === Type.STELLAR) {
-      return this.isTerastallized() ? 2 : 1;
+  getAttackTypeEffectiveness(
+    moveType: PokemonType,
+    source?: Pokemon,
+    ignoreStrongWinds: boolean = false,
+    simulated: boolean = true,
+    move?: Move,
+    useIllusion: boolean = false
+  ): TypeDamageMultiplier {
+    if (moveType === PokemonType.STELLAR) {
+      return this.isTerastallized ? 2 : 1;
     }
-    const types = this.getTypes(true, true);
+    const types = this.getTypes(true, true, undefined, useIllusion);
     const arena = globalScene.arena;
 
     // Handle flying v ground type immunity without removing flying type so effective types are still effective
     // Related to https://github.com/pagefaultgames/pokerogue/issues/524
-    if (moveType === Type.GROUND && (this.isGrounded() || arena.hasTag(ArenaTagType.GRAVITY))) {
-      const flyingIndex = types.indexOf(Type.FLYING);
+    if (
+      moveType === PokemonType.GROUND &&
+      (this.isGrounded() || arena.hasTag(ArenaTagType.GRAVITY))
+    ) {
+      const flyingIndex = types.indexOf(PokemonType.FLYING);
       if (flyingIndex > -1) {
         types.splice(flyingIndex, 1);
       }
     }
 
-    let multiplier = types.map(defType => {
-      const multiplier = new Utils.NumberHolder(getTypeDamageMultiplier(moveType, defType));
-      applyChallenges(globalScene.gameMode, ChallengeType.TYPE_EFFECTIVENESS, multiplier);
-      if (move) {
-        applyMoveAttrs(VariableMoveTypeChartAttr, null, this, move, multiplier, defType);
-      }
-      if (source) {
-        const ignoreImmunity = new Utils.BooleanHolder(false);
-        if (source.isActive(true) && source.hasAbilityWithAttr(IgnoreTypeImmunityAbAttr)) {
-          applyAbAttrs(IgnoreTypeImmunityAbAttr, source, ignoreImmunity, simulated, moveType, defType);
+    let multiplier = types
+      .map(defType => {
+        const multiplier = new NumberHolder(
+          getTypeDamageMultiplier(moveType, defType),
+        );
+        applyChallenges(
+          ChallengeType.TYPE_EFFECTIVENESS,
+          multiplier,
+        );
+        if (move) {
+          applyMoveAttrs(
+            VariableMoveTypeChartAttr,
+            null,
+            this,
+            move,
+            multiplier,
+            defType,
+          );
         }
-        if (ignoreImmunity.value) {
-          if (multiplier.value === 0) {
-            return 1;
+        if (source) {
+          const ignoreImmunity = new BooleanHolder(false);
+          if (
+            source.isActive(true) &&
+            source.hasAbilityWithAttr(IgnoreTypeImmunityAbAttr)
+          ) {
+            applyAbAttrs(
+              IgnoreTypeImmunityAbAttr,
+              source,
+              ignoreImmunity,
+              simulated,
+              moveType,
+              defType,
+            );
+          }
+          if (ignoreImmunity.value) {
+            if (multiplier.value === 0) {
+              return 1;
+            }
+          }
+
+          const exposedTags = this.findTags(
+            tag => tag instanceof ExposedTag,
+          ) as ExposedTag[];
+          if (exposedTags.some(t => t.ignoreImmunity(defType, moveType))) {
+            if (multiplier.value === 0) {
+              return 1;
+            }
           }
         }
+        return multiplier.value;
+      })
+      .reduce((acc, cur) => acc * cur, 1) as TypeDamageMultiplier;
 
-        const exposedTags = this.findTags(tag => tag instanceof ExposedTag) as ExposedTag[];
-        if (exposedTags.some(t => t.ignoreImmunity(defType, moveType))) {
-          if (multiplier.value === 0) {
-            return 1;
-          }
-        }
-      }
-      return multiplier.value;
-    }).reduce((acc, cur) => acc * cur, 1) as TypeDamageMultiplier;
-
-    const typeMultiplierAgainstFlying = new Utils.NumberHolder(getTypeDamageMultiplier(moveType, Type.FLYING));
-    applyChallenges(globalScene.gameMode, ChallengeType.TYPE_EFFECTIVENESS, typeMultiplierAgainstFlying);
+    const typeMultiplierAgainstFlying = new NumberHolder(
+      getTypeDamageMultiplier(moveType, PokemonType.FLYING),
+    );
+    applyChallenges(
+      ChallengeType.TYPE_EFFECTIVENESS,
+      typeMultiplierAgainstFlying,
+    );
     // Handle strong winds lowering effectiveness of types super effective against pure flying
-    if (!ignoreStrongWinds && arena.weather?.weatherType === WeatherType.STRONG_WINDS && !arena.weather.isEffectSuppressed() && this.isOfType(Type.FLYING) && typeMultiplierAgainstFlying.value === 2) {
+    if (
+      !ignoreStrongWinds &&
+      arena.weather?.weatherType === WeatherType.STRONG_WINDS &&
+      !arena.weather.isEffectSuppressed() &&
+      this.isOfType(PokemonType.FLYING) &&
+      typeMultiplierAgainstFlying.value === 2
+    ) {
       multiplier /= 2;
       if (!simulated) {
         globalScene.queueMessage(i18next.t("weather:strongWindsEffectMessage"));
@@ -1765,24 +2917,31 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
    */
   getMatchupScore(opponent: Pokemon): number {
     const types = this.getTypes(true);
-    const enemyTypes = opponent.getTypes(true, true);
+
+    const enemyTypes = opponent.getTypes(true, true, false, true);
     /** Is this Pokemon faster than the opponent? */
-    const outspeed = (this.isActive(true) ? this.getEffectiveStat(Stat.SPD, opponent) : this.getStat(Stat.SPD, false)) >= opponent.getEffectiveStat(Stat.SPD, this);
+    const outspeed =
+      (this.isActive(true)
+        ? this.getEffectiveStat(Stat.SPD, opponent)
+        : this.getStat(Stat.SPD, false)) >=
+      opponent.getEffectiveStat(Stat.SPD, this);
     /**
      * Based on how effective this Pokemon's types are offensively against the opponent's types.
      * This score is increased by 25 percent if this Pokemon is faster than the opponent.
      */
-    let atkScore = opponent.getAttackTypeEffectiveness(types[0], this) * (outspeed ? 1.25 : 1);
+    let atkScore = opponent.getAttackTypeEffectiveness(types[0], this, false, true, undefined, true) * (outspeed ? 1.25 : 1);
     /**
      * Based on how effectively this Pokemon defends against the opponent's types.
      * This score cannot be higher than 4.
      */
-    let defScore = 1 / Math.max(this.getAttackTypeEffectiveness(enemyTypes[0], opponent), 0.25);
+    let defScore =
+      1 /
+      Math.max(this.getAttackTypeEffectiveness(enemyTypes[0], opponent), 0.25);
     if (types.length > 1) {
       atkScore *= opponent.getAttackTypeEffectiveness(types[1], this);
     }
     if (enemyTypes.length > 1) {
-      defScore *= (1 / Math.max(this.getAttackTypeEffectiveness(enemyTypes[1], opponent), 0.25));
+      defScore *= (1 / Math.max(this.getAttackTypeEffectiveness(enemyTypes[1], opponent, false, false, undefined, true), 0.25));
     }
     /**
      * Based on this Pokemon's HP ratio compared to that of the opponent.
@@ -1800,19 +2959,41 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
     if (pokemonEvolutions.hasOwnProperty(this.species.speciesId)) {
       const evolutions = pokemonEvolutions[this.species.speciesId];
       for (const e of evolutions) {
-        if (!e.item && this.level >= e.level && (isNullOrUndefined(e.preFormKey) || this.getFormKey() === e.preFormKey)) {
-          if (e.condition === null || (e.condition as SpeciesEvolutionCondition).predicate(this)) {
+        if (
+          !e.item &&
+          this.level >= e.level &&
+          (isNullOrUndefined(e.preFormKey) ||
+            this.getFormKey() === e.preFormKey)
+        ) {
+          if (
+            e.condition === null ||
+            (e.condition as SpeciesEvolutionCondition).predicate(this)
+          ) {
             return e;
           }
         }
       }
     }
 
-    if (this.isFusion() && this.fusionSpecies && pokemonEvolutions.hasOwnProperty(this.fusionSpecies.speciesId)) {
-      const fusionEvolutions = pokemonEvolutions[this.fusionSpecies.speciesId].map(e => new FusionSpeciesFormEvolution(this.species.speciesId, e));
+    if (
+      this.isFusion() &&
+      this.fusionSpecies &&
+      pokemonEvolutions.hasOwnProperty(this.fusionSpecies.speciesId)
+    ) {
+      const fusionEvolutions = pokemonEvolutions[
+        this.fusionSpecies.speciesId
+      ].map(e => new FusionSpeciesFormEvolution(this.species.speciesId, e));
       for (const fe of fusionEvolutions) {
-        if (!fe.item && this.level >= fe.level && (isNullOrUndefined(fe.preFormKey) || this.getFusionFormKey() === fe.preFormKey)) {
-          if (fe.condition === null || (fe.condition as SpeciesEvolutionCondition).predicate(this)) {
+        if (
+          !fe.item &&
+          this.level >= fe.level &&
+          (isNullOrUndefined(fe.preFormKey) ||
+            this.getFusionFormKey() === fe.preFormKey)
+        ) {
+          if (
+            fe.condition === null ||
+            (fe.condition as SpeciesEvolutionCondition).predicate(this)
+          ) {
             return fe;
           }
         }
@@ -1830,48 +3011,125 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
    * @param {boolean} includeRelearnerMoves Whether to include moves that would require a relearner. Note the move relearner inherently allows evolution moves
    * @returns {LevelMoves} A list of moves and the levels they can be learned at
    */
-  getLevelMoves(startingLevel?: number, includeEvolutionMoves: boolean = false, simulateEvolutionChain: boolean = false, includeRelearnerMoves: boolean = false, learnSituation: LearnMoveSituation = LearnMoveSituation.MISC): LevelMoves {
+  getLevelMoves(
+    startingLevel?: number,
+    includeEvolutionMoves = false,
+    simulateEvolutionChain = false,
+    includeRelearnerMoves = false,
+    learnSituation: LearnMoveSituation = LearnMoveSituation.MISC,
+  ): LevelMoves {
     const ret: LevelMoves = [];
     let levelMoves: LevelMoves = [];
     if (!startingLevel) {
       startingLevel = this.level;
     }
-    if (learnSituation === LearnMoveSituation.EVOLUTION_FUSED && this.fusionSpecies) { // For fusion evolutions, get ONLY the moves of the component mon that evolved
-      levelMoves = this.getFusionSpeciesForm(true).getLevelMoves().filter(lm => (includeEvolutionMoves && lm[0] === EVOLVE_MOVE) || (includeRelearnerMoves && lm[0] === RELEARN_MOVE) || lm[0] > 0);
+    if (
+      learnSituation === LearnMoveSituation.EVOLUTION_FUSED &&
+      this.fusionSpecies
+    ) {
+      // For fusion evolutions, get ONLY the moves of the component mon that evolved
+      levelMoves = this.getFusionSpeciesForm(true)
+        .getLevelMoves()
+        .filter(
+          lm =>
+            (includeEvolutionMoves && lm[0] === EVOLVE_MOVE) ||
+            (includeRelearnerMoves && lm[0] === RELEARN_MOVE) ||
+            lm[0] > 0,
+        );
     } else {
       if (simulateEvolutionChain) {
-        const evolutionChain = this.species.getSimulatedEvolutionChain(this.level, this.hasTrainer(), this.isBoss(), this.isPlayer());
+        const evolutionChain = this.species.getSimulatedEvolutionChain(
+          this.level,
+          this.hasTrainer(),
+          this.isBoss(),
+          this.isPlayer(),
+        );
         for (let e = 0; e < evolutionChain.length; e++) {
           // TODO: Might need to pass specific form index in simulated evolution chain
-          const speciesLevelMoves = getPokemonSpeciesForm(evolutionChain[e][0], this.formIndex).getLevelMoves();
+          const speciesLevelMoves = getPokemonSpeciesForm(
+            evolutionChain[e][0],
+            this.formIndex,
+          ).getLevelMoves();
           if (includeRelearnerMoves) {
             levelMoves.push(...speciesLevelMoves);
           } else {
-            levelMoves.push(...speciesLevelMoves.filter(lm => (includeEvolutionMoves && lm[0] === EVOLVE_MOVE) || ((!e || lm[0] > 1) && (e === evolutionChain.length - 1 || lm[0] <= evolutionChain[e + 1][1]))));
+            levelMoves.push(
+              ...speciesLevelMoves.filter(
+                lm =>
+                  (includeEvolutionMoves && lm[0] === EVOLVE_MOVE) ||
+                  ((!e || lm[0] > 1) &&
+                    (e === evolutionChain.length - 1 ||
+                      lm[0] <= evolutionChain[e + 1][1])),
+              ),
+            );
           }
         }
       } else {
-        levelMoves = this.getSpeciesForm(true).getLevelMoves().filter(lm => (includeEvolutionMoves && lm[0] === EVOLVE_MOVE) || (includeRelearnerMoves && lm[0] === RELEARN_MOVE) || lm[0] > 0);
+        levelMoves = this.getSpeciesForm(true)
+          .getLevelMoves()
+          .filter(
+            lm =>
+              (includeEvolutionMoves && lm[0] === EVOLVE_MOVE) ||
+              (includeRelearnerMoves && lm[0] === RELEARN_MOVE) ||
+              lm[0] > 0,
+          );
       }
-      if (this.fusionSpecies && learnSituation !== LearnMoveSituation.EVOLUTION_FUSED_BASE) {  // For fusion evolutions, get ONLY the moves of the component mon that evolved
+      if (
+        this.fusionSpecies &&
+        learnSituation !== LearnMoveSituation.EVOLUTION_FUSED_BASE
+      ) {
+        // For fusion evolutions, get ONLY the moves of the component mon that evolved
         if (simulateEvolutionChain) {
-          const fusionEvolutionChain = this.fusionSpecies.getSimulatedEvolutionChain(this.level, this.hasTrainer(), this.isBoss(), this.isPlayer());
+          const fusionEvolutionChain =
+            this.fusionSpecies.getSimulatedEvolutionChain(
+              this.level,
+              this.hasTrainer(),
+              this.isBoss(),
+              this.isPlayer(),
+            );
           for (let e = 0; e < fusionEvolutionChain.length; e++) {
             // TODO: Might need to pass specific form index in simulated evolution chain
-            const speciesLevelMoves = getPokemonSpeciesForm(fusionEvolutionChain[e][0], this.fusionFormIndex).getLevelMoves();
+            const speciesLevelMoves = getPokemonSpeciesForm(
+              fusionEvolutionChain[e][0],
+              this.fusionFormIndex,
+            ).getLevelMoves();
             if (includeRelearnerMoves) {
-              levelMoves.push(...speciesLevelMoves.filter(lm => (includeEvolutionMoves && lm[0] === EVOLVE_MOVE) || lm[0] !== EVOLVE_MOVE));
+              levelMoves.push(
+                ...speciesLevelMoves.filter(
+                  lm =>
+                    (includeEvolutionMoves && lm[0] === EVOLVE_MOVE) ||
+                    lm[0] !== EVOLVE_MOVE,
+                ),
+              );
             } else {
-              levelMoves.push(...speciesLevelMoves.filter(lm => (includeEvolutionMoves && lm[0] === EVOLVE_MOVE) || ((!e || lm[0] > 1) && (e === fusionEvolutionChain.length - 1 || lm[0] <= fusionEvolutionChain[e + 1][1]))));
+              levelMoves.push(
+                ...speciesLevelMoves.filter(
+                  lm =>
+                    (includeEvolutionMoves && lm[0] === EVOLVE_MOVE) ||
+                    ((!e || lm[0] > 1) &&
+                      (e === fusionEvolutionChain.length - 1 ||
+                        lm[0] <= fusionEvolutionChain[e + 1][1])),
+                ),
+              );
             }
           }
         } else {
-          levelMoves.push(...this.getFusionSpeciesForm(true).getLevelMoves().filter(lm => (includeEvolutionMoves && lm[0] === EVOLVE_MOVE) || (includeRelearnerMoves && lm[0] === RELEARN_MOVE) || lm[0] > 0));
+          levelMoves.push(
+            ...this.getFusionSpeciesForm(true)
+              .getLevelMoves()
+              .filter(
+                lm =>
+                  (includeEvolutionMoves && lm[0] === EVOLVE_MOVE) ||
+                  (includeRelearnerMoves && lm[0] === RELEARN_MOVE) ||
+                  lm[0] > 0,
+              ),
+          );
         }
       }
     }
-    levelMoves.sort((lma: [number, number], lmb: [number, number]) => lma[0] > lmb[0] ? 1 : lma[0] < lmb[0] ? -1 : 0);
-
+    levelMoves.sort((lma: [number, number], lmb: [number, number]) =>
+      lma[0] > lmb[0] ? 1 : lma[0] < lmb[0] ? -1 : 0,
+    );
 
     /**
      * Filter out moves not within the correct level range(s)
@@ -1881,10 +3139,12 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
     levelMoves = levelMoves.filter(lm => {
       const level = lm[0];
       const isRelearner = level < startingLevel;
-      const allowedEvolutionMove = (level === 0) && includeEvolutionMoves;
+      const allowedEvolutionMove = level === 0 && includeEvolutionMoves;
 
-      return !(level > this.level)
-          && (includeRelearnerMoves || !isRelearner || allowedEvolutionMove);
+      return (
+        !(level > this.level) &&
+        (includeRelearnerMoves || !isRelearner || allowedEvolutionMove)
+      );
     });
 
     /**
@@ -1907,8 +3167,8 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
    * @param levelMoves the input array to search for non-duplicates from
    * @param ret the output array to be pushed into.
    */
-  private getUniqueMoves(levelMoves: LevelMoves, ret: LevelMoves ): void {
-    const uniqueMoves : Moves[] = [];
+  private getUniqueMoves(levelMoves: LevelMoves, ret: LevelMoves): void {
+    const uniqueMoves: Moves[] = [];
     for (const lm of levelMoves) {
       if (!uniqueMoves.find(m => m === lm[1])) {
         uniqueMoves.push(lm[1]);
@@ -1917,20 +3177,22 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
     }
   }
 
-
   /**
    * Get a list of all egg moves
    *
    * @returns list of egg moves
    */
-  getEggMoves() : Moves[] | undefined {
+  getEggMoves(): Moves[] | undefined {
     return speciesEggMoves[this.getSpeciesForm().getRootSpeciesId()];
   }
 
   setMove(moveIndex: number, moveId: Moves): void {
-    const move = moveId ? new PokemonMove(moveId) : null;
+    if (moveId === Moves.NONE) {
+      return;
+    }
+    const move = new PokemonMove(moveId);
     this.moveset[moveIndex] = move;
-    if (this.summonData?.moveset) {
+    if (this.summonData.moveset) {
       this.summonData.moveset[moveIndex] = move;
     }
   }
@@ -1948,23 +3210,34 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
    */
   trySetShiny(thresholdOverride?: number): boolean {
     // Shiny Pokemon should not spawn in the end biome in endless
-    if (globalScene.gameMode.isEndless && globalScene.arena.biomeType === Biome.END) {
+    if (
+      globalScene.gameMode.isEndless &&
+      globalScene.arena.biomeType === Biome.END
+    ) {
       return false;
     }
 
-    const rand1 = (this.id & 0xFFFF0000) >>> 16;
-    const rand2 = (this.id & 0x0000FFFF);
+    const rand1 = (this.id & 0xffff0000) >>> 16;
+    const rand2 = this.id & 0x0000ffff;
 
     const E = globalScene.gameData.trainerId ^ globalScene.gameData.secretId;
     const F = rand1 ^ rand2;
 
-    const shinyThreshold = new Utils.NumberHolder(BASE_SHINY_CHANCE);
+    const shinyThreshold = new NumberHolder(BASE_SHINY_CHANCE);
     if (thresholdOverride === undefined) {
-      if (globalScene.eventManager.isEventActive()) {
-        shinyThreshold.value *= globalScene.eventManager.getShinyMultiplier();
+      if (timedEventManager.isEventActive()) {
+        const tchance = timedEventManager.getClassicTrainerShinyChance();
+        shinyThreshold.value *= timedEventManager.getShinyMultiplier();
+        if (this.hasTrainer() && tchance > 0) {
+          shinyThreshold.value = Math.max(tchance, shinyThreshold.value); // Choose the higher boost
+        }
       }
       if (!this.hasTrainer()) {
-        globalScene.applyModifiers(ShinyRateBoosterModifier, true, shinyThreshold);
+        globalScene.applyModifiers(
+          ShinyRateBoosterModifier,
+          true,
+          shinyThreshold,
+        );
       }
     } else {
       shinyThreshold.value = thresholdOverride;
@@ -1982,34 +3255,44 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
   /**
    * Function that tries to set a Pokemon shiny based on seed.
    * For manual use only, usually to roll a Pokemon's shiny chance a second time.
-   * If it rolls shiny, also sets a random variant and give the Pokemon the associated luck.
+   * If it rolls shiny, or if it's already shiny, also sets a random variant and give the Pokemon the associated luck.
    *
    * The base shiny odds are {@linkcode BASE_SHINY_CHANCE} / `65536`
    * @param thresholdOverride number that is divided by `2^16` (`65536`) to get the shiny chance, overrides {@linkcode shinyThreshold} if set (bypassing shiny rate modifiers such as Shiny Charm)
    * @param applyModifiersToOverride If {@linkcode thresholdOverride} is set and this is true, will apply Shiny Charm and event modifiers to {@linkcode thresholdOverride}
    * @returns `true` if the Pokemon has been set as a shiny, `false` otherwise
    */
-  public trySetShinySeed(thresholdOverride?: number, applyModifiersToOverride?: boolean): boolean {
-    const shinyThreshold = new Utils.NumberHolder(BASE_SHINY_CHANCE);
-    if (thresholdOverride === undefined || applyModifiersToOverride) {
-      if (thresholdOverride !== undefined && applyModifiersToOverride) {
+  public trySetShinySeed(
+    thresholdOverride?: number,
+    applyModifiersToOverride?: boolean,
+  ): boolean {
+    if (!this.shiny) {
+      const shinyThreshold = new NumberHolder(BASE_SHINY_CHANCE);
+      if (thresholdOverride === undefined || applyModifiersToOverride) {
+        if (thresholdOverride !== undefined && applyModifiersToOverride) {
+          shinyThreshold.value = thresholdOverride;
+        }
+        if (timedEventManager.isEventActive()) {
+          shinyThreshold.value *= timedEventManager.getShinyMultiplier();
+        }
+        globalScene.applyModifiers(
+          ShinyRateBoosterModifier,
+          true,
+          shinyThreshold,
+        );
+      }
+      else {
         shinyThreshold.value = thresholdOverride;
       }
-      if (globalScene.eventManager.isEventActive()) {
-        shinyThreshold.value *= globalScene.eventManager.getShinyMultiplier();
-      }
-      if (!this.hasTrainer()) {
-        globalScene.applyModifiers(ShinyRateBoosterModifier, true, shinyThreshold);
-      }
-    } else {
-      shinyThreshold.value = thresholdOverride;
+
+      this.shiny = randSeedInt(65536) < shinyThreshold.value;
     }
 
-    this.shiny = randSeedInt(65536) < shinyThreshold.value;
-
     if (this.shiny) {
-      this.variant = this.generateShinyVariant();
-      this.luck = this.variant + 1 + (this.fusionShiny ? this.fusionVariant + 1 : 0);
+      this.variant = this.variant ?? 0;
+      this.variant = Math.max(this.generateShinyVariant(), this.variant) as Variant; // Don't set a variant lower than the current one
+      this.luck =
+        this.variant + 1 + (this.fusionShiny ? this.fusionVariant + 1 : 0);
       this.initShinySparkle();
     }
 
@@ -2033,20 +3316,28 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
       }
     }
     // Checks if there is no variant data for both the index or index with form
-    if (!this.shiny || (!variantData.hasOwnProperty(variantDataIndex) && !variantData.hasOwnProperty(this.species.speciesId))) {
+    if (
+      !this.shiny ||
+      (!variantData.hasOwnProperty(variantDataIndex) &&
+        !variantData.hasOwnProperty(this.species.speciesId))
+    ) {
       return 0;
     }
-    const rand = new Utils.NumberHolder(0);
-    globalScene.executeWithSeedOffset(() => {
-      rand.value = Utils.randSeedInt(10);
-    }, this.id, globalScene.waveSeed);
+    const rand = new NumberHolder(0);
+    globalScene.executeWithSeedOffset(
+      () => {
+        rand.value = randSeedInt(10);
+      },
+      this.id,
+      globalScene.waveSeed,
+    );
     if (rand.value >= SHINY_VARIANT_CHANCE) {
-      return 0;             // 6/10
-    } else if (rand.value >= SHINY_EPIC_CHANCE) {
-      return 1;             // 3/10
-    } else {
-      return 2;             // 1/10
+      return 0; // 6/10
     }
+    if (rand.value >= SHINY_EPIC_CHANCE) {
+      return 1; // 3/10
+    }
+    return 2; // 1/10
   }
 
   /**
@@ -2058,17 +3349,24 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
    * @param applyModifiersToOverride If {@linkcode thresholdOverride} is set and this is true, will apply Ability Charm to {@linkcode thresholdOverride}
    * @returns `true` if the Pokemon has been set to have its hidden ability, `false` otherwise
    */
-  public tryRerollHiddenAbilitySeed(thresholdOverride?: number, applyModifiersToOverride?: boolean): boolean {
+  public tryRerollHiddenAbilitySeed(
+    thresholdOverride?: number,
+    applyModifiersToOverride?: boolean,
+  ): boolean {
     if (!this.species.abilityHidden) {
       return false;
     }
-    const haThreshold = new Utils.NumberHolder(BASE_HIDDEN_ABILITY_CHANCE);
+    const haThreshold = new NumberHolder(BASE_HIDDEN_ABILITY_CHANCE);
     if (thresholdOverride === undefined || applyModifiersToOverride) {
       if (thresholdOverride !== undefined && applyModifiersToOverride) {
         haThreshold.value = thresholdOverride;
       }
       if (!this.hasTrainer()) {
-        globalScene.applyModifiers(HiddenAbilityRateBoosterModifier, true, haThreshold);
+        globalScene.applyModifiers(
+          HiddenAbilityRateBoosterModifier,
+          true,
+          haThreshold,
+        );
       }
     } else {
       haThreshold.value = thresholdOverride;
@@ -2082,37 +3380,67 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
   }
 
   public generateFusionSpecies(forStarter?: boolean): void {
-    const hiddenAbilityChance = new Utils.NumberHolder(BASE_HIDDEN_ABILITY_CHANCE);
+    const hiddenAbilityChance = new NumberHolder(
+      BASE_HIDDEN_ABILITY_CHANCE,
+    );
     if (!this.hasTrainer()) {
-      globalScene.applyModifiers(HiddenAbilityRateBoosterModifier, true, hiddenAbilityChance);
+      globalScene.applyModifiers(
+        HiddenAbilityRateBoosterModifier,
+        true,
+        hiddenAbilityChance,
+      );
     }
 
-    const hasHiddenAbility = !Utils.randSeedInt(hiddenAbilityChance.value);
-    const randAbilityIndex = Utils.randSeedInt(2);
+    const hasHiddenAbility = !randSeedInt(hiddenAbilityChance.value);
+    const randAbilityIndex = randSeedInt(2);
 
-    const filter = !forStarter ?
-      this.species.getCompatibleFusionSpeciesFilter()
+    const filter = !forStarter
+      ? this.species.getCompatibleFusionSpeciesFilter()
       : (species: PokemonSpecies) => {
-        return pokemonEvolutions.hasOwnProperty(species.speciesId)
-          && !pokemonPrevolutions.hasOwnProperty(species.speciesId)
-          && !species.subLegendary
-          && !species.legendary
-          && !species.mythical
-          && !species.isTrainerForbidden()
-          && species.speciesId !== this.species.speciesId
-          && species.speciesId !== Species.DITTO;
-      };
+          return (
+            pokemonEvolutions.hasOwnProperty(species.speciesId) &&
+            !pokemonPrevolutions.hasOwnProperty(species.speciesId) &&
+            !species.subLegendary &&
+            !species.legendary &&
+            !species.mythical &&
+            !species.isTrainerForbidden() &&
+            species.speciesId !== this.species.speciesId &&
+            species.speciesId !== Species.DITTO
+          );
+        };
 
     let fusionOverride: PokemonSpecies | undefined = undefined;
 
-    if (forStarter && this instanceof PlayerPokemon && Overrides.STARTER_FUSION_SPECIES_OVERRIDE) {
-      fusionOverride = getPokemonSpecies(Overrides.STARTER_FUSION_SPECIES_OVERRIDE);
-    } else if (this instanceof EnemyPokemon && Overrides.OPP_FUSION_SPECIES_OVERRIDE) {
+    if (
+      forStarter &&
+      this instanceof PlayerPokemon &&
+      Overrides.STARTER_FUSION_SPECIES_OVERRIDE
+    ) {
+      fusionOverride = getPokemonSpecies(
+        Overrides.STARTER_FUSION_SPECIES_OVERRIDE,
+      );
+    } else if (
+      this instanceof EnemyPokemon &&
+      Overrides.OPP_FUSION_SPECIES_OVERRIDE
+    ) {
       fusionOverride = getPokemonSpecies(Overrides.OPP_FUSION_SPECIES_OVERRIDE);
     }
 
-    this.fusionSpecies = fusionOverride ?? globalScene.randomSpecies(globalScene.currentBattle?.waveIndex || 0, this.level, false, filter, true);
-    this.fusionAbilityIndex = (this.fusionSpecies.abilityHidden && hasHiddenAbility ? 2 : this.fusionSpecies.ability2 !== this.fusionSpecies.ability1 ? randAbilityIndex : 0);
+    this.fusionSpecies =
+      fusionOverride ??
+      globalScene.randomSpecies(
+        globalScene.currentBattle?.waveIndex || 0,
+        this.level,
+        false,
+        filter,
+        true,
+      );
+    this.fusionAbilityIndex =
+      this.fusionSpecies.abilityHidden && hasHiddenAbility
+        ? 2
+        : this.fusionSpecies.ability2 !== this.fusionSpecies.ability1
+          ? randAbilityIndex
+          : 0;
     this.fusionShiny = this.shiny;
     this.fusionVariant = this.variant;
 
@@ -2127,7 +3455,12 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
       }
     }
 
-    this.fusionFormIndex = globalScene.getSpeciesFormIndex(this.fusionSpecies, this.fusionGender, this.getNature(), true);
+    this.fusionFormIndex = globalScene.getSpeciesFormIndex(
+      this.fusionSpecies,
+      this.fusionGender,
+      this.getNature(),
+      true,
+    );
     this.fusionLuck = this.luck;
 
     this.generateName();
@@ -2153,7 +3486,10 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
     let movePool: [Moves, number][] = [];
     const allLevelMoves = this.getLevelMoves(1, true, true);
     if (!allLevelMoves) {
-      console.warn("Error encountered trying to generate moveset for:", this.species.name);
+      console.warn(
+        "Error encountered trying to generate moveset for:",
+        this.species.name,
+      );
       return;
     }
 
@@ -2164,41 +3500,62 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
       }
       let weight = levelMove[0];
       // Evolution Moves
-      if (weight === 0) {
+      if (weight === EVOLVE_MOVE) {
         weight = 50;
       }
-      // Assume level 1 moves with 80+ BP are "move reminder" moves and bump their weight
-      if (weight === 1 && allMoves[levelMove[1]].power >= 80) {
+      // Assume level 1 moves with 80+ BP are "move reminder" moves and bump their weight. Trainers use actual relearn moves.
+      if (weight === 1 && allMoves[levelMove[1]].power >= 80 || weight === RELEARN_MOVE && this.hasTrainer()) {
         weight = 40;
       }
-      if (!movePool.some(m => m[0] === levelMove[1]) && !allMoves[levelMove[1]].name.endsWith(" (N)")) {
-        movePool.push([ levelMove[1], weight ]);
+      if (
+        !movePool.some(m => m[0] === levelMove[1]) &&
+        !allMoves[levelMove[1]].name.endsWith(" (N)")
+      ) {
+        movePool.push([levelMove[1], weight]);
       }
     }
 
     if (this.hasTrainer()) {
       const tms = Object.keys(tmSpecies);
       for (const tm of tms) {
-        const moveId = parseInt(tm) as Moves;
+        const moveId = Number.parseInt(tm) as Moves;
         let compatible = false;
         for (const p of tmSpecies[tm]) {
           if (Array.isArray(p)) {
-            if (p[0] === this.species.speciesId || (this.fusionSpecies && p[0] === this.fusionSpecies.speciesId) && p.slice(1).indexOf(this.species.forms[this.formIndex]) > -1) {
+            if (
+              p[0] === this.species.speciesId ||
+              (this.fusionSpecies &&
+                p[0] === this.fusionSpecies.speciesId &&
+                p.slice(1).indexOf(this.species.forms[this.formIndex]) > -1)
+            ) {
               compatible = true;
               break;
             }
-          } else if (p === this.species.speciesId || (this.fusionSpecies && p === this.fusionSpecies.speciesId)) {
+          } else if (
+            p === this.species.speciesId ||
+            (this.fusionSpecies && p === this.fusionSpecies.speciesId)
+          ) {
             compatible = true;
             break;
           }
         }
-        if (compatible && !movePool.some(m => m[0] === moveId) && !allMoves[moveId].name.endsWith(" (N)")) {
+        if (
+          compatible &&
+          !movePool.some(m => m[0] === moveId) &&
+          !allMoves[moveId].name.endsWith(" (N)")
+        ) {
           if (tmPoolTiers[moveId] === ModifierTier.COMMON && this.level >= 15) {
-            movePool.push([ moveId, 4 ]);
-          } else if (tmPoolTiers[moveId] === ModifierTier.GREAT && this.level >= 30) {
-            movePool.push([ moveId, 8 ]);
-          } else if (tmPoolTiers[moveId] === ModifierTier.ULTRA && this.level >= 50) {
-            movePool.push([ moveId, 14 ]);
+            movePool.push([moveId, 4]);
+          } else if (
+            tmPoolTiers[moveId] === ModifierTier.GREAT &&
+            this.level >= 30
+          ) {
+            movePool.push([moveId, 8]);
+          } else if (
+            tmPoolTiers[moveId] === ModifierTier.ULTRA &&
+            this.level >= 50
+          ) {
+            movePool.push([moveId, 14]);
           }
         }
       }
@@ -2207,26 +3564,44 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
       if (this.level >= 60) {
         for (let i = 0; i < 3; i++) {
           const moveId = speciesEggMoves[this.species.getRootSpeciesId()][i];
-          if (!movePool.some(m => m[0] === moveId) && !allMoves[moveId].name.endsWith(" (N)")) {
-            movePool.push([ moveId, 40 ]);
+          if (
+            !movePool.some(m => m[0] === moveId) &&
+            !allMoves[moveId].name.endsWith(" (N)")
+          ) {
+            movePool.push([moveId, 40]);
           }
         }
         const moveId = speciesEggMoves[this.species.getRootSpeciesId()][3];
         // No rare egg moves before e4
-        if (this.level >= 170 && !movePool.some(m => m[0] === moveId) && !allMoves[moveId].name.endsWith(" (N)") && !this.isBoss()) {
-          movePool.push([ moveId, 30 ]);
+        if (
+          this.level >= 170 &&
+          !movePool.some(m => m[0] === moveId) &&
+          !allMoves[moveId].name.endsWith(" (N)") &&
+          !this.isBoss()
+        ) {
+          movePool.push([moveId, 30]);
         }
         if (this.fusionSpecies) {
           for (let i = 0; i < 3; i++) {
-            const moveId = speciesEggMoves[this.fusionSpecies.getRootSpeciesId()][i];
-            if (!movePool.some(m => m[0] === moveId) && !allMoves[moveId].name.endsWith(" (N)")) {
-              movePool.push([ moveId, 40 ]);
+            const moveId =
+              speciesEggMoves[this.fusionSpecies.getRootSpeciesId()][i];
+            if (
+              !movePool.some(m => m[0] === moveId) &&
+              !allMoves[moveId].name.endsWith(" (N)")
+            ) {
+              movePool.push([moveId, 40]);
             }
           }
-          const moveId = speciesEggMoves[this.fusionSpecies.getRootSpeciesId()][3];
+          const moveId =
+            speciesEggMoves[this.fusionSpecies.getRootSpeciesId()][3];
           // No rare egg moves before e4
-          if (this.level >= 170 && !movePool.some(m => m[0] === moveId) && !allMoves[moveId].name.endsWith(" (N)") && !this.isBoss()) {
-            movePool.push([ moveId, 30 ]);
+          if (
+            this.level >= 170 &&
+            !movePool.some(m => m[0] === moveId) &&
+            !allMoves[moveId].name.endsWith(" (N)") &&
+            !this.isBoss()
+          ) {
+            movePool.push([moveId, 30]);
           }
         }
       }
@@ -2234,93 +3609,158 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
 
     // Bosses never get self ko moves or Pain Split
     if (this.isBoss()) {
-      movePool = movePool.filter(m => !allMoves[m[0]].hasAttr(SacrificialAttr));
-      movePool = movePool.filter(m => !allMoves[m[0]].hasAttr(HpSplitAttr));
+      movePool = movePool.filter(m => !allMoves[m[0]].hasAttr(SacrificialAttr) && !allMoves[m[0]].hasAttr(HpSplitAttr));
     }
-    movePool = movePool.filter(m => !allMoves[m[0]].hasAttr(SacrificialAttrOnHit));
+    // No one gets Memento or Final Gambit
+    movePool = movePool.filter(
+      m => !allMoves[m[0]].hasAttr(SacrificialAttrOnHit),
+    );
     if (this.hasTrainer()) {
       // Trainers never get OHKO moves
       movePool = movePool.filter(m => !allMoves[m[0]].hasAttr(OneHitKOAttr));
       // Half the weight of self KO moves
-      movePool = movePool.map(m => [ m[0], m[1] * (!!allMoves[m[0]].hasAttr(SacrificialAttr) ? 0.5 : 1) ]);
-      movePool = movePool.map(m => [ m[0], m[1] * (!!allMoves[m[0]].hasAttr(SacrificialAttrOnHit) ? 0.5 : 1) ]);
+      movePool = movePool.map(m => [
+        m[0],
+        m[1] * (allMoves[m[0]].hasAttr(SacrificialAttr) ? 0.5 : 1),
+      ]);
       // Trainers get a weight bump to stat buffing moves
-      movePool = movePool.map(m => [ m[0], m[1] * (allMoves[m[0]].getAttrs(StatStageChangeAttr).some(a => a.stages > 1 && a.selfTarget) ? 1.25 : 1) ]);
+      movePool = movePool.map(m => [
+        m[0],
+        m[1] *
+          (allMoves[m[0]]
+            .getAttrs(StatStageChangeAttr)
+            .some(a => a.stages > 1 && a.selfTarget)
+            ? 1.25
+            : 1),
+      ]);
       // Trainers get a weight decrease to multiturn moves
-      movePool = movePool.map(m => [ m[0], m[1] * (!!allMoves[m[0]].isChargingMove() || !!allMoves[m[0]].hasAttr(RechargeAttr) ? 0.7 : 1) ]);
+      movePool = movePool.map(m => [
+        m[0],
+        m[1] *
+          (!!allMoves[m[0]].isChargingMove() ||
+          !!allMoves[m[0]].hasAttr(RechargeAttr)
+            ? 0.7
+            : 1),
+      ]);
     }
 
     // Weight towards higher power moves, by reducing the power of moves below the highest power.
     // Caps max power at 90 to avoid something like hyper beam ruining the stats.
     // This is a pretty soft weighting factor, although it is scaled with the weight multiplier.
-    const maxPower = Math.min(movePool.reduce((v, m) => Math.max(allMoves[m[0]].power, v), 40), 90);
-    movePool = movePool.map(m => [ m[0], m[1] * (allMoves[m[0]].category === MoveCategory.STATUS ? 1 : Math.max(Math.min(allMoves[m[0]].power / maxPower, 1), 0.5)) ]);
+    const maxPower = Math.min(
+      movePool.reduce(
+        (v, m) => Math.max(allMoves[m[0]].calculateEffectivePower(), v),
+        40,
+      ),
+      90,
+    );
+    movePool = movePool.map(m => [
+      m[0],
+      m[1] *
+        (allMoves[m[0]].category === MoveCategory.STATUS
+          ? 1
+          : Math.max(
+              Math.min(allMoves[m[0]].calculateEffectivePower() / maxPower, 1),
+              0.5,
+            )),
+    ]);
 
-    // Weight damaging moves against the lower stat
+    // Weight damaging moves against the lower stat. This uses a non-linear relationship.
+    // If the higher stat is 1 - 1.09x higher, no change. At higher stat ~1.38x lower stat, off-stat moves have half weight.
+    // One third weight at ~1.58x higher, one quarter weight at ~1.73x higher, one fifth at ~1.87x, and one tenth at ~2.35x higher.
     const atk = this.getStat(Stat.ATK);
     const spAtk = this.getStat(Stat.SPATK);
-    const worseCategory: MoveCategory = atk > spAtk ? MoveCategory.SPECIAL : MoveCategory.PHYSICAL;
-    const statRatio = worseCategory === MoveCategory.PHYSICAL ? atk / spAtk : spAtk / atk;
-    movePool = movePool.map(m => [ m[0], m[1] * (allMoves[m[0]].category === worseCategory ? statRatio : 1) ]);
+    const worseCategory: MoveCategory =
+      atk > spAtk ? MoveCategory.SPECIAL : MoveCategory.PHYSICAL;
+    const statRatio =
+      worseCategory === MoveCategory.PHYSICAL ? atk / spAtk : spAtk / atk;
+    movePool = movePool.map(m => [
+      m[0],
+      m[1] *
+        (allMoves[m[0]].category === worseCategory
+          ? Math.min(Math.pow(statRatio, 3) * 1.3, 1)
+          : 1),
+    ]);
 
     /** The higher this is the more the game weights towards higher level moves. At `0` all moves are equal weight. */
-    let weightMultiplier = 0.9;
-    if (this.hasTrainer()) {
-      weightMultiplier += 0.7;
-    }
+    let weightMultiplier = 1.6;
     if (this.isBoss()) {
       weightMultiplier += 0.4;
     }
-    const baseWeights: [Moves, number][] = movePool.map(m => [ m[0], Math.ceil(Math.pow(m[1], weightMultiplier) * 100) ]);
+    const baseWeights: [Moves, number][] = movePool.map(m => [
+      m[0],
+      Math.ceil(Math.pow(m[1], weightMultiplier) * 100),
+    ]);
 
-    // Trainers and bosses always force a stab move
-    if (this.hasTrainer() || this.isBoss()) {
-      const stabMovePool = baseWeights.filter(m => allMoves[m[0]].category !== MoveCategory.STATUS && this.isOfType(allMoves[m[0]].type));
+    // All Pokemon force a STAB move first
+    const stabMovePool = baseWeights.filter(
+      m =>
+        allMoves[m[0]].category !== MoveCategory.STATUS &&
+        this.isOfType(allMoves[m[0]].type),
+    );
 
-      if (stabMovePool.length) {
-        const totalWeight = stabMovePool.reduce((v, m) => v + m[1], 0);
-        let rand = Utils.randSeedInt(totalWeight);
-        let index = 0;
-        while (rand > stabMovePool[index][1]) {
-          rand -= stabMovePool[index++][1];
-        }
-        this.moveset.push(new PokemonMove(stabMovePool[index][0], 0, 0));
-      }
-    } else { // Normal wild pokemon just force a random damaging move
-      const attackMovePool = baseWeights.filter(m => allMoves[m[0]].category !== MoveCategory.STATUS);
-      if (attackMovePool.length) {
-        const totalWeight = attackMovePool.reduce((v, m) => v + m[1], 0);
-        let rand = Utils.randSeedInt(totalWeight);
-        let index = 0;
-        while (rand > attackMovePool[index][1]) {
-          rand -= attackMovePool[index++][1];
-        }
-        this.moveset.push(new PokemonMove(attackMovePool[index][0], 0, 0));
+    if (stabMovePool.length) {
+      const totalWeight = stabMovePool.reduce((v, m) => v + m[1], 0);
+      let rand = randSeedInt(totalWeight);
+      let index = 0;
+      while (rand > stabMovePool[index][1]) {
+        rand -= stabMovePool[index++][1];
       }
+      this.moveset.push(new PokemonMove(stabMovePool[index][0], 0, 0));
     }
 
-    while (baseWeights.length > this.moveset.length && this.moveset.length < 4) {
+    while (
+      baseWeights.length > this.moveset.length &&
+      this.moveset.length < 4
+    ) {
       if (this.hasTrainer()) {
         // Sqrt the weight of any damaging moves with overlapping types. This is about a 0.05 - 0.1 multiplier.
-        // Other damaging moves 2x weight if 0-1 damaging moves, 0.5x if 2, 0.125x if 3. These weights double if STAB.
+        // Other damaging moves 2x weight if 0-1 damaging moves, 0.5x if 2, 0.125x if 3. These weights get 20x if STAB.
         // Status moves remain unchanged on weight, this encourages 1-2
-        movePool = baseWeights.filter(m => !this.moveset.some(mo => m[0] === mo?.moveId)).map((m) => {
-          let ret: number;
-          if (this.moveset.some(mo => mo?.getMove().category !== MoveCategory.STATUS && mo?.getMove().type === allMoves[m[0]].type)) {
-            ret = Math.ceil(Math.sqrt(m[1]));
-          } else if (allMoves[m[0]].category !== MoveCategory.STATUS) {
-            ret = Math.ceil(m[1] / Math.max(Math.pow(4, this.moveset.filter(mo => (mo?.getMove().power ?? 0) > 1).length) / 8, 0.5) * (this.isOfType(allMoves[m[0]].type) ? 2 : 1));
-          } else {
-            ret = m[1];
-          }
-          return [ m[0], ret ];
-        });
+        movePool = baseWeights
+          .filter(m => !this.moveset.some(
+            mo => 
+              m[0] === mo.moveId ||
+              (allMoves[m[0]].hasAttr(SacrificialAttr) && mo.getMove().hasAttr(SacrificialAttr)) // Only one self-KO move allowed
+          ))
+          .map(m => {
+            let ret: number;
+            if (
+              this.moveset.some(
+                mo =>
+                  mo.getMove().category !== MoveCategory.STATUS &&
+                  mo.getMove().type === allMoves[m[0]].type,
+              )
+            ) {
+              ret = Math.ceil(Math.sqrt(m[1]));
+            } else if (allMoves[m[0]].category !== MoveCategory.STATUS) {
+              ret = Math.ceil(
+                (m[1] /
+                  Math.max(
+                    Math.pow(
+                      4,
+                      this.moveset.filter(mo => (mo.getMove().power ?? 0) > 1)
+                        .length,
+                    ) / 8,
+                    0.5,
+                  )) *
+                  (this.isOfType(allMoves[m[0]].type) ? 20 : 1),
+              );
+            } else {
+              ret = m[1];
+            }
+            return [m[0], ret];
+          });
       } else {
         // Non-trainer pokemon just use normal weights
-        movePool = baseWeights.filter(m => !this.moveset.some(mo => m[0] === mo?.moveId));
+        movePool = baseWeights.filter(m => !this.moveset.some(
+          mo => 
+            m[0] === mo.moveId ||
+            (allMoves[m[0]].hasAttr(SacrificialAttr) && mo.getMove().hasAttr(SacrificialAttr)) // Only one self-KO move allowed
+        ));
       }
       const totalWeight = movePool.reduce((v, m) => v + m[1], 0);
-      let rand = Utils.randSeedInt(totalWeight);
+      let rand = randSeedInt(totalWeight);
       let index = 0;
       while (rand > movePool[index][1]) {
         rand -= movePool[index++][1];
@@ -2329,37 +3769,56 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
     }
 
     // Trigger FormChange, except for enemy Pokemon during Mystery Encounters, to avoid crashes
-    if (this.isPlayer() || !globalScene.currentBattle?.isBattleMysteryEncounter() || !globalScene.currentBattle?.mysteryEncounter) {
-      globalScene.triggerPokemonFormChange(this, SpeciesFormChangeMoveLearnedTrigger);
+    if (
+      this.isPlayer() ||
+      !globalScene.currentBattle?.isBattleMysteryEncounter() ||
+      !globalScene.currentBattle?.mysteryEncounter
+    ) {
+      globalScene.triggerPokemonFormChange(
+        this,
+        SpeciesFormChangeMoveLearnedTrigger,
+      );
     }
   }
 
   public trySelectMove(moveIndex: number, ignorePp?: boolean): boolean {
-    const move = this.getMoveset().length > moveIndex
-      ? this.getMoveset()[moveIndex]
-      : null;
+    const move =
+      this.getMoveset().length > moveIndex
+        ? this.getMoveset()[moveIndex]
+        : null;
     return move?.isUsable(this, ignorePp) ?? false;
   }
 
   showInfo(): void {
     if (!this.battleInfo.visible) {
-      const otherBattleInfo = globalScene.fieldUI.getAll().slice(0, 4).filter(ui => ui instanceof BattleInfo && ((ui as BattleInfo) instanceof PlayerBattleInfo) === this.isPlayer()).find(() => true);
+      const otherBattleInfo = globalScene.fieldUI
+        .getAll()
+        .slice(0, 4)
+        .filter(
+          ui =>
+            ui instanceof BattleInfo &&
+            (ui as BattleInfo) instanceof PlayerBattleInfo === this.isPlayer(),
+        )
+        .find(() => true);
       if (!otherBattleInfo || !this.getFieldIndex()) {
         globalScene.fieldUI.sendToBack(this.battleInfo);
         globalScene.sendTextToBack(); // Push the top right text objects behind everything else
       } else {
         globalScene.fieldUI.moveAbove(this.battleInfo, otherBattleInfo);
       }
-      this.battleInfo.setX(this.battleInfo.x + (this.isPlayer() ? 150 : !this.isBoss() ? -150 : -198));
+      this.battleInfo.setX(
+        this.battleInfo.x +
+          (this.isPlayer() ? 150 : !this.isBoss() ? -150 : -198),
+      );
       this.battleInfo.setVisible(true);
       if (this.isPlayer()) {
         this.battleInfo.expMaskRect.x += 150;
       }
       globalScene.tweens.add({
-        targets: [ this.battleInfo, this.battleInfo.expMaskRect ],
+        targets: [this.battleInfo, this.battleInfo.expMaskRect],
         x: this.isPlayer() ? "-=150" : `+=${!this.isBoss() ? 150 : 246}`,
         duration: 1000,
-        ease: "Cubic.easeOut"
+        ease: "Cubic.easeOut",
       });
     }
   }
@@ -2368,7 +3827,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
     return new Promise(resolve => {
       if (this.battleInfo && this.battleInfo.visible) {
         globalScene.tweens.add({
-          targets: [ this.battleInfo, this.battleInfo.expMaskRect ],
+          targets: [this.battleInfo, this.battleInfo.expMaskRect],
           x: this.isPlayer() ? "+=150" : `-=${!this.isBoss() ? 150 : 246}`,
           duration: 500,
           ease: "Cubic.easeIn",
@@ -2377,9 +3836,12 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
               this.battleInfo.expMaskRect.x -= 150;
             }
             this.battleInfo.setVisible(false);
-            this.battleInfo.setX(this.battleInfo.x - (this.isPlayer() ? 150 : !this.isBoss() ? -150 : -198));
+            this.battleInfo.setX(
+              this.battleInfo.x -
+                (this.isPlayer() ? 150 : !this.isBoss() ? -150 : -198),
+            );
             resolve();
-          }
+          },
         });
       } else {
         resolve();
@@ -2420,18 +3882,29 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
    * @param exp The amount of experience to add
    * @param ignoreLevelCap Whether to ignore level caps when adding experience (defaults to false)
    */
-  addExp(exp: number, ignoreLevelCap: boolean = false) {
+  addExp(exp: number, ignoreLevelCap = false) {
     const maxExpLevel = globalScene.getMaxExpLevel(ignoreLevelCap);
     const initialExp = this.exp;
     this.exp += exp;
-    while (this.level < maxExpLevel && this.exp >= getLevelTotalExp(this.level + 1, this.species.growthRate)) {
+    while (
+      this.level < maxExpLevel &&
+      this.exp >= getLevelTotalExp(this.level + 1, this.species.growthRate)
+    ) {
       this.level++;
     }
     if (this.level >= maxExpLevel) {
-      console.log(initialExp, this.exp, getLevelTotalExp(this.level, this.species.growthRate));
-      this.exp = Math.max(getLevelTotalExp(this.level, this.species.growthRate), initialExp);
+      console.log(
+        initialExp,
+        this.exp,
+        getLevelTotalExp(this.level, this.species.growthRate),
+      );
+      this.exp = Math.max(
+        getLevelTotalExp(this.level, this.species.growthRate),
+        initialExp,
+      );
     }
-    this.levelExp = this.exp - getLevelTotalExp(this.level, this.species.growthRate);
+    this.levelExp =
+      this.exp - getLevelTotalExp(this.level, this.species.growthRate);
   }
 
   /**
@@ -2445,14 +3918,23 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
 
   getOpponent(targetIndex: number): Pokemon | null {
     const ret = this.getOpponents()[targetIndex];
-    if (ret.summonData) {
+    if (ret.summonData) { // TODO: why does this check for summonData and can we remove it?
       return ret;
     }
     return null;
   }
 
-  getOpponents(): Pokemon[] {
-    return ((this.isPlayer() ? globalScene.getEnemyField() : globalScene.getPlayerField()) as Pokemon[]).filter(p => p.isActive());
+  /**
+   * Returns the pokemon that oppose this one and are active
+   *
+   * @param onField - whether to also check if the pokemon is currently on the field (defaults to true)
+   */
+  getOpponents(onField = true): Pokemon[] {
+    return (
+      (this.isPlayer()
+        ? globalScene.getEnemyField()
+        : globalScene.getPlayerField()) as Pokemon[]
+    ).filter(p => p.isActive(onField));
   }
 
   getOpponentDescriptor(): string {
@@ -2460,11 +3942,17 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
     if (opponents.length === 1) {
       return opponents[0].name;
     }
-    return this.isPlayer() ? i18next.t("arenaTag:opposingTeam") : i18next.t("arenaTag:yourTeam");
+    return this.isPlayer()
+      ? i18next.t("arenaTag:opposingTeam")
+      : i18next.t("arenaTag:yourTeam");
   }
 
-  getAlly(): Pokemon {
-    return (this.isPlayer() ? globalScene.getPlayerField() : globalScene.getEnemyField())[this.getFieldIndex() ? 0 : 1];
+  getAlly(): Pokemon | undefined {
+    return (
+      this.isPlayer()
+        ? globalScene.getPlayerField()
+        : globalScene.getEnemyField()
+    )[this.getFieldIndex() ? 0 : 1];
   }
 
   /**
@@ -2473,7 +3961,9 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
    * @returns An array of Pokémon on the allied field.
    */
   getAlliedField(): Pokemon[] {
-    return this instanceof PlayerPokemon ? globalScene.getPlayerField() : globalScene.getEnemyField();
+    return this instanceof PlayerPokemon
+      ? globalScene.getPlayerField()
+      : globalScene.getEnemyField();
   }
 
   /**
@@ -2487,11 +3977,20 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
    * @param ignoreOppAbility determines whether the effects of the opponent's abilities (i.e. Unaware) should be ignored (`false` by default)
    * @param isCritical determines whether a critical hit has occurred or not (`false` by default)
    * @param simulated determines whether effects are applied without altering game state (`true` by default)
+   * @param ignoreHeldItems determines whether this Pokemon's held items should be ignored during the stat calculation, default `false`
    * @return the stat stage multiplier to be used for effective stat calculation
    */
-  getStatStageMultiplier(stat: EffectiveStat, opponent?: Pokemon, move?: Move, ignoreOppAbility: boolean = false, isCritical: boolean = false, simulated: boolean = true): number {
-    const statStage = new Utils.IntegerHolder(this.getStatStage(stat));
-    const ignoreStatStage = new Utils.BooleanHolder(false);
+  getStatStageMultiplier(
+    stat: EffectiveStat,
+    opponent?: Pokemon,
+    move?: Move,
+    ignoreOppAbility = false,
+    isCritical = false,
+    simulated = true,
+    ignoreHeldItems = false,
+  ): number {
+    const statStage = new NumberHolder(this.getStatStage(stat));
+    const ignoreStatStage = new BooleanHolder(false);
 
     if (opponent) {
       if (isCritical) {
@@ -2507,16 +4006,38 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
         }
       }
       if (!ignoreOppAbility) {
-        applyAbAttrs(IgnoreOpponentStatStagesAbAttr, opponent, null, simulated, stat, ignoreStatStage);
+        applyAbAttrs(
+          IgnoreOpponentStatStagesAbAttr,
+          opponent,
+          null,
+          simulated,
+          stat,
+          ignoreStatStage,
+        );
       }
       if (move) {
-        applyMoveAttrs(IgnoreOpponentStatStagesAttr, this, opponent, move, ignoreStatStage);
+        applyMoveAttrs(
+          IgnoreOpponentStatStagesAttr,
+          this,
+          opponent,
+          move,
+          ignoreStatStage,
+        );
       }
     }
 
     if (!ignoreStatStage.value) {
-      const statStageMultiplier = new Utils.NumberHolder(Math.max(2, 2 + statStage.value) / Math.max(2, 2 - statStage.value));
-      globalScene.applyModifiers(TempStatStageBoosterModifier, this.isPlayer(), stat, statStageMultiplier);
+      const statStageMultiplier = new NumberHolder(
+        Math.max(2, 2 + statStage.value) / Math.max(2, 2 - statStage.value),
+      );
+      if (!ignoreHeldItems) {
+        globalScene.applyModifiers(
+          TempStatStageBoosterModifier,
+          this.isPlayer(),
+          stat,
+          statStageMultiplier,
+        );
+      }
       return Math.min(statStageMultiplier.value, 4);
     }
     return 1;
@@ -2538,36 +4059,85 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
       return 1;
     }
 
-    const userAccStage = new Utils.IntegerHolder(this.getStatStage(Stat.ACC));
-    const targetEvaStage = new Utils.IntegerHolder(target.getStatStage(Stat.EVA));
+    const userAccStage = new NumberHolder(this.getStatStage(Stat.ACC));
+    const targetEvaStage = new NumberHolder(
+      target.getStatStage(Stat.EVA),
+    );
 
-    const ignoreAccStatStage = new Utils.BooleanHolder(false);
-    const ignoreEvaStatStage = new Utils.BooleanHolder(false);
+    const ignoreAccStatStage = new BooleanHolder(false);
+    const ignoreEvaStatStage = new BooleanHolder(false);
 
-    applyAbAttrs(IgnoreOpponentStatStagesAbAttr, target, null, false, Stat.ACC, ignoreAccStatStage);
-    applyAbAttrs(IgnoreOpponentStatStagesAbAttr, this, null, false, Stat.EVA, ignoreEvaStatStage);
-    applyMoveAttrs(IgnoreOpponentStatStagesAttr, this, target, sourceMove, ignoreEvaStatStage);
+    applyAbAttrs(
+      IgnoreOpponentStatStagesAbAttr,
+      target,
+      null,
+      false,
+      Stat.ACC,
+      ignoreAccStatStage,
+    );
+    applyAbAttrs(
+      IgnoreOpponentStatStagesAbAttr,
+      this,
+      null,
+      false,
+      Stat.EVA,
+      ignoreEvaStatStage,
+    );
+    applyMoveAttrs(
+      IgnoreOpponentStatStagesAttr,
+      this,
+      target,
+      sourceMove,
+      ignoreEvaStatStage,
+    );
 
-    globalScene.applyModifiers(TempStatStageBoosterModifier, this.isPlayer(), Stat.ACC, userAccStage);
+    globalScene.applyModifiers(
+      TempStatStageBoosterModifier,
+      this.isPlayer(),
+      Stat.ACC,
+      userAccStage,
+    );
 
-    userAccStage.value = ignoreAccStatStage.value ? 0 : Math.min(userAccStage.value, 6);
+    userAccStage.value = ignoreAccStatStage.value
+      ? 0
+      : Math.min(userAccStage.value, 6);
     targetEvaStage.value = ignoreEvaStatStage.value ? 0 : targetEvaStage.value;
 
     if (target.findTag(t => t instanceof ExposedTag)) {
       targetEvaStage.value = Math.min(0, targetEvaStage.value);
     }
 
-    const accuracyMultiplier = new Utils.NumberHolder(1);
+    const accuracyMultiplier = new NumberHolder(1);
     if (userAccStage.value !== targetEvaStage.value) {
-      accuracyMultiplier.value = userAccStage.value > targetEvaStage.value
-        ? (3 + Math.min(userAccStage.value - targetEvaStage.value, 6)) / 3
-        : 3 / (3 + Math.min(targetEvaStage.value - userAccStage.value, 6));
+      accuracyMultiplier.value =
+        userAccStage.value > targetEvaStage.value
+          ? (3 + Math.min(userAccStage.value - targetEvaStage.value, 6)) / 3
+          : 3 / (3 + Math.min(targetEvaStage.value - userAccStage.value, 6));
     }
 
-    applyStatMultiplierAbAttrs(StatMultiplierAbAttr, this, Stat.ACC, accuracyMultiplier, false, sourceMove);
+    applyStatMultiplierAbAttrs(
+      StatMultiplierAbAttr,
+      this,
+      Stat.ACC,
+      accuracyMultiplier,
+      false,
+      sourceMove,
+    );
 
-    const evasionMultiplier = new Utils.NumberHolder(1);
-    applyStatMultiplierAbAttrs(StatMultiplierAbAttr, target, Stat.EVA, evasionMultiplier);
+    const evasionMultiplier = new NumberHolder(1);
+    applyStatMultiplierAbAttrs(
+      StatMultiplierAbAttr,
+      target,
+      Stat.EVA,
+      evasionMultiplier,
+    );
+
+    const ally = this.getAlly();
+    if (!isNullOrUndefined(ally)) {
+      const ignore = this.hasAbilityWithAttr(MoveAbilityBypassAbAttr) || sourceMove.hasFlag(MoveFlags.IGNORE_ABILITIES);
+      applyAllyStatMultiplierAbAttrs(AllyStatMultiplierAbAttr, ally, Stat.ACC, accuracyMultiplier, false, this, ignore);
+      applyAllyStatMultiplierAbAttrs(AllyStatMultiplierAbAttr, ally, Stat.EVA, evasionMultiplier, false, this, ignore);
+    }
 
     return accuracyMultiplier.value / evasionMultiplier.value;
   }
@@ -2575,20 +4145,33 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
   /**
    * Calculates the base damage of the given move against this Pokemon when attacked by the given source.
    * Used during damage calculation and for Shell Side Arm's forecasting effect.
-   * @param source the attacking {@linkcode Pokemon}.
-   * @param move the {@linkcode Move} used in the attack.
-   * @param moveCategory the move's {@linkcode MoveCategory} after variable-category effects are applied.
-   * @param ignoreAbility if `true`, ignores this Pokemon's defensive ability effects (defaults to `false`).
-   * @param ignoreSourceAbility if `true`, ignore's the attacking Pokemon's ability effects (defaults to `false`).
-   * @param isCritical if `true`, calculates effective stats as if the hit were critical (defaults to `false`).
-   * @param simulated if `true`, suppresses changes to game state during calculation (defaults to `true`).
+   * @param source - The attacking {@linkcode Pokemon}.
+   * @param move - The {@linkcode Move} used in the attack.
+   * @param moveCategory - The move's {@linkcode MoveCategory} after variable-category effects are applied.
+   * @param ignoreAbility - If `true`, ignores this Pokemon's defensive ability effects (defaults to `false`).
+   * @param ignoreSourceAbility - If `true`, ignore's the attacking Pokemon's ability effects (defaults to `false`).
+   * @param ignoreAllyAbility - If `true`, ignores the ally Pokemon's ability effects (defaults to `false`).
+   * @param ignoreSourceAllyAbility - If `true`, ignores the attacking Pokemon's ally's ability effects (defaults to `false`).
+   * @param isCritical - if `true`, calculates effective stats as if the hit were critical (defaults to `false`).
+   * @param simulated - if `true`, suppresses changes to game state during calculation (defaults to `true`).
    * @returns The move's base damage against this Pokemon when used by the source Pokemon.
    */
-  getBaseDamage(source: Pokemon, move: Move, moveCategory: MoveCategory, ignoreAbility: boolean = false, ignoreSourceAbility: boolean = false, isCritical: boolean = false, simulated: boolean = true): number {
+  getBaseDamage(
+    {
+    source,
+    move,
+    moveCategory,
+    ignoreAbility = false,
+    ignoreSourceAbility = false,
+    ignoreAllyAbility = false,
+    ignoreSourceAllyAbility = false,
+    isCritical = false,
+    simulated = true}: getBaseDamageParams
+  ): number {
     const isPhysical = moveCategory === MoveCategory.PHYSICAL;
 
     /** A base damage multiplier based on the source's level */
-    const levelMultiplier = (2 * source.level / 5 + 2);
+    const levelMultiplier = (2 * source.level) / 5 + 2;
 
     /** The power of the move after power boosts from abilities, etc. have applied */
     const power = move.calculateBattlePower(source, this, simulated);
@@ -2597,56 +4180,161 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
      * The attacker's offensive stat for the given move's category.
      * Critical hits cause negative stat stages to be ignored.
      */
-    const sourceAtk = new Utils.NumberHolder(source.getEffectiveStat(isPhysical ? Stat.ATK : Stat.SPATK, this, undefined, ignoreSourceAbility, ignoreAbility, isCritical, simulated));
+    const sourceAtk = new NumberHolder(
+      source.getEffectiveStat(
+        isPhysical ? Stat.ATK : Stat.SPATK,
+        this,
+        undefined,
+        ignoreSourceAbility,
+        ignoreAbility,
+        ignoreAllyAbility,
+        isCritical,
+        simulated,
+      ),
+    );
     applyMoveAttrs(VariableAtkAttr, source, this, move, sourceAtk);
 
     /**
      * This Pokemon's defensive stat for the given move's category.
      * Critical hits cause positive stat stages to be ignored.
      */
-    const targetDef = new Utils.NumberHolder(this.getEffectiveStat(isPhysical ? Stat.DEF : Stat.SPDEF, source, move, ignoreAbility, ignoreSourceAbility, isCritical, simulated));
+    const targetDef = new NumberHolder(
+      this.getEffectiveStat(
+        isPhysical ? Stat.DEF : Stat.SPDEF,
+        source,
+        move,
+        ignoreAbility,
+        ignoreSourceAbility,
+        ignoreSourceAllyAbility,
+        isCritical,
+        simulated,
+      ),
+    );
     applyMoveAttrs(VariableDefAttr, source, this, move, targetDef);
 
     /**
      * The attack's base damage, as determined by the source's level, move power
      * and Attack stat as well as this Pokemon's Defense stat
      */
-    const baseDamage = ((levelMultiplier * power * sourceAtk.value / targetDef.value) / 50) + 2;
+    const baseDamage =
+      (levelMultiplier * power * sourceAtk.value) / targetDef.value / 50 + 2;
 
     /** Debug message for non-simulated calls (i.e. when damage is actually dealt) */
     if (!simulated) {
-      console.log("base damage", baseDamage, move.name, power, sourceAtk.value, targetDef.value);
+      console.log(
+        "base damage",
+        baseDamage,
+        move.name,
+        power,
+        sourceAtk.value,
+        targetDef.value,
+      );
     }
 
     return baseDamage;
   }
 
+
+  /** Determine the STAB multiplier for a move used against this pokemon.
+   *
+   * @param source - The attacking {@linkcode Pokemon}
+   * @param move - The {@linkcode Move} used in the attack
+   * @param ignoreSourceAbility - If `true`, ignores the attacking Pokemon's ability effects
+   * @param simulated - If `true`, suppresses changes to game state during the calculation
+   *
+   * @returns The STAB multiplier for the move used against this Pokemon
+   */
+  calculateStabMultiplier(source: Pokemon, move: Move, ignoreSourceAbility: boolean, simulated: boolean): number {
+    // If the move has the Typeless attribute, it doesn't get STAB (e.g. struggle)
+    if (move.hasAttr(TypelessAttr)) {
+      return 1;
+    }
+    const sourceTypes = source.getTypes();
+    const sourceTeraType = source.getTeraType();
+    const moveType = source.getMoveType(move);
+    const matchesSourceType = sourceTypes.includes(source.getMoveType(move));
+    const stabMultiplier = new NumberHolder(1);
+    if (matchesSourceType && moveType !== PokemonType.STELLAR) {
+      stabMultiplier.value += 0.5;
+    }
+
+    applyMoveAttrs(
+      CombinedPledgeStabBoostAttr,
+      source,
+      this,
+      move,
+      stabMultiplier,
+    );
+
+    if (!ignoreSourceAbility) {
+      applyAbAttrs(StabBoostAbAttr, source, null, simulated, stabMultiplier);
+    }
+
+    if (
+      source.isTerastallized &&
+      sourceTeraType === moveType &&
+      moveType !== PokemonType.STELLAR
+    ) {
+      stabMultiplier.value += 0.5;
+    }
+
+    if (
+      source.isTerastallized &&
+      source.getTeraType() === PokemonType.STELLAR &&
+      (!source.stellarTypesBoosted.includes(moveType) ||
+        source.hasSpecies(Species.TERAPAGOS))
+    ) {
+      stabMultiplier.value += matchesSourceType ? 0.5 : 0.2;
+    }
+
+    return Math.min(stabMultiplier.value, 2.25);
+  }
+
   /**
    * Calculates the damage of an attack made by another Pokemon against this Pokemon
    * @param source {@linkcode Pokemon} the attacking Pokemon
-   * @param move {@linkcode Pokemon} the move used in the attack
+   * @param move The {@linkcode Move} used in the attack
    * @param ignoreAbility If `true`, ignores this Pokemon's defensive ability effects
    * @param ignoreSourceAbility If `true`, ignores the attacking Pokemon's ability effects
+   * @param ignoreAllyAbility If `true`, ignores the ally Pokemon's ability effects
+   * @param ignoreSourceAllyAbility If `true`, ignores the ability effects of the attacking pokemon's ally
    * @param isCritical If `true`, calculates damage for a critical hit.
    * @param simulated If `true`, suppresses changes to game state during the calculation.
-   * @returns a {@linkcode DamageCalculationResult} object with three fields:
-   * - `cancelled`: `true` if the move was cancelled by another effect.
-   * - `result`: {@linkcode HitResult} indicates the attack's type effectiveness.
-   * - `damage`: `number` the attack's final damage output.
+   * @param effectiveness If defined, used in place of calculated effectiveness values
+   * @returns The {@linkcode DamageCalculationResult}
    */
-  getAttackDamage(source: Pokemon, move: Move, ignoreAbility: boolean = false, ignoreSourceAbility: boolean = false, isCritical: boolean = false, simulated: boolean = true): DamageCalculationResult {
-    const damage = new Utils.NumberHolder(0);
-    const defendingSide = this.isPlayer() ? ArenaTagSide.PLAYER : ArenaTagSide.ENEMY;
+  getAttackDamage(
+    {
+      source,
+      move,
+      ignoreAbility = false,
+      ignoreSourceAbility = false,
+      ignoreAllyAbility = false,
+      ignoreSourceAllyAbility = false,
+      isCritical = false,
+      simulated = true,
+      effectiveness}: getAttackDamageParams,
+  ): DamageCalculationResult {
+    const damage = new NumberHolder(0);
+    const defendingSide = this.isPlayer()
+      ? ArenaTagSide.PLAYER
+      : ArenaTagSide.ENEMY;
 
-    const variableCategory = new Utils.NumberHolder(move.category);
-    applyMoveAttrs(VariableMoveCategoryAttr, source, this, move, variableCategory);
+    const variableCategory = new NumberHolder(move.category);
+    applyMoveAttrs(
+      VariableMoveCategoryAttr,
+      source,
+      this,
+      move,
+      variableCategory,
+    );
     const moveCategory = variableCategory.value as MoveCategory;
 
     /** The move's type after type-changing effects are applied */
     const moveType = source.getMoveType(move);
 
     /** If `value` is `true`, cancels the move and suppresses "No Effect" messages */
-    const cancelled = new Utils.BooleanHolder(false);
+    const cancelled = new BooleanHolder(false);
 
     /**
      * The effectiveness of the move being used. Along with type matchups, this
@@ -2655,47 +4343,71 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
      *
      * Note that the source's abilities are not ignored here
      */
-    const typeMultiplier = this.getMoveEffectiveness(source, move, ignoreAbility, simulated, cancelled);
+    const typeMultiplier = effectiveness ?? this.getMoveEffectiveness(
+      source,
+      move,
+      ignoreAbility,
+      simulated,
+      cancelled,
+    );
 
     const isPhysical = moveCategory === MoveCategory.PHYSICAL;
 
     /** Combined damage multiplier from field effects such as weather, terrain, etc. */
-    const arenaAttackTypeMultiplier = new Utils.NumberHolder(globalScene.arena.getAttackTypeMultiplier(moveType, source.isGrounded()));
-    applyMoveAttrs(IgnoreWeatherTypeDebuffAttr, source, this, move, arenaAttackTypeMultiplier);
+    const arenaAttackTypeMultiplier = new NumberHolder(
+      globalScene.arena.getAttackTypeMultiplier(moveType, source.isGrounded()),
+    );
+    applyMoveAttrs(
+      IgnoreWeatherTypeDebuffAttr,
+      source,
+      this,
+      move,
+      arenaAttackTypeMultiplier,
+    );
 
-    const isTypeImmune = (typeMultiplier * arenaAttackTypeMultiplier.value) === 0;
+    const isTypeImmune = typeMultiplier * arenaAttackTypeMultiplier.value === 0;
 
     if (cancelled.value || isTypeImmune) {
       return {
         cancelled: cancelled.value,
-        result: move.id === Moves.SHEER_COLD ? HitResult.IMMUNE : HitResult.NO_EFFECT,
-        damage: 0
+        result:
+          move.id === Moves.SHEER_COLD ? HitResult.IMMUNE : HitResult.NO_EFFECT,
+        damage: 0,
       };
     }
 
     // If the attack deals fixed damage, return a result with that much damage
-    const fixedDamage = new Utils.NumberHolder(0);
+    const fixedDamage = new NumberHolder(0);
     applyMoveAttrs(FixedDamageAttr, source, this, move, fixedDamage);
     if (fixedDamage.value) {
-      const multiLensMultiplier = new Utils.NumberHolder(1);
-      globalScene.applyModifiers(PokemonMultiHitModifier, source.isPlayer(), source, move.id, null, multiLensMultiplier);
-      fixedDamage.value = Utils.toDmgValue(fixedDamage.value * multiLensMultiplier.value);
+      const multiLensMultiplier = new NumberHolder(1);
+      globalScene.applyModifiers(
+        PokemonMultiHitModifier,
+        source.isPlayer(),
+        source,
+        move.id,
+        null,
+        multiLensMultiplier,
+      );
+      fixedDamage.value = toDmgValue(
+        fixedDamage.value * multiLensMultiplier.value,
+      );
 
       return {
         cancelled: false,
         result: HitResult.EFFECTIVE,
-        damage: fixedDamage.value
+        damage: fixedDamage.value,
       };
     }
 
     // If the attack is a one-hit KO move, return a result with damage equal to this Pokemon's HP
-    const isOneHitKo = new Utils.BooleanHolder(false);
+    const isOneHitKo = new BooleanHolder(false);
     applyMoveAttrs(OneHitKOAttr, source, this, move, isOneHitKo);
     if (isOneHitKo.value) {
       return {
         cancelled: false,
         result: HitResult.ONE_HIT_KO,
-        damage: this.hp
+        damage: this.hp,
       };
     }
 
@@ -2703,72 +4415,103 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
      * The attack's base damage, as determined by the source's level, move power
      * and Attack stat as well as this Pokemon's Defense stat
      */
-    const baseDamage = this.getBaseDamage(source, move, moveCategory, ignoreAbility, ignoreSourceAbility, isCritical, simulated);
+    const baseDamage = this.getBaseDamage({
+      source,
+      move,
+      moveCategory,
+      ignoreAbility,
+      ignoreSourceAbility,
+      ignoreAllyAbility,
+      ignoreSourceAllyAbility,
+      isCritical,
+      simulated,
+    });
 
     /** 25% damage debuff on moves hitting more than one non-fainted target (regardless of immunities) */
     const { targets, multiple } = getMoveTargets(source, move.id);
     const numTargets = multiple ? targets.length : 1;
-    const targetMultiplier = (numTargets > 1) ? 0.75 : 1;
+    const targetMultiplier = numTargets > 1 ? 0.75 : 1;
 
     /** Multiplier for moves enhanced by Multi-Lens and/or Parental Bond */
-    const multiStrikeEnhancementMultiplier = new Utils.NumberHolder(1);
-    globalScene.applyModifiers(PokemonMultiHitModifier, source.isPlayer(), source, move.id, null, multiStrikeEnhancementMultiplier);
+    const multiStrikeEnhancementMultiplier = new NumberHolder(1);
+    globalScene.applyModifiers(
+      PokemonMultiHitModifier,
+      source.isPlayer(),
+      source,
+      move.id,
+      null,
+      multiStrikeEnhancementMultiplier,
+    );
     if (!ignoreSourceAbility) {
-      applyPreAttackAbAttrs(AddSecondStrikeAbAttr, source, this, move, simulated, null, multiStrikeEnhancementMultiplier);
+      applyPreAttackAbAttrs(
+        AddSecondStrikeAbAttr,
+        source,
+        this,
+        move,
+        simulated,
+        null,
+        multiStrikeEnhancementMultiplier,
+      );
     }
 
     /** Doubles damage if this Pokemon's last move was Glaive Rush */
-    const glaiveRushMultiplier = new Utils.IntegerHolder(1);
+    const glaiveRushMultiplier = new NumberHolder(1);
     if (this.getTag(BattlerTagType.RECEIVE_DOUBLE_DAMAGE)) {
       glaiveRushMultiplier.value = 2;
     }
 
     /** The damage multiplier when the given move critically hits */
-    const criticalMultiplier = new Utils.NumberHolder(isCritical ? 1.5 : 1);
+    const criticalMultiplier = new NumberHolder(isCritical ? 1.5 : 1);
     applyAbAttrs(MultCritAbAttr, source, null, simulated, criticalMultiplier);
 
     /**
      * A multiplier for random damage spread in the range [0.85, 1]
      * This is always 1 for simulated calls.
      */
-    const randomMultiplier = simulated ? 1 : ((this.randSeedIntRange(85, 100)) / 100);
+    const randomMultiplier = simulated
+      ? 1
+      : this.randBattleSeedIntRange(85, 100) / 100;
+
 
-    const sourceTypes = source.getTypes();
-    const sourceTeraType = source.getTeraType();
-    const matchesSourceType = sourceTypes.includes(moveType);
     /** A damage multiplier for when the attack is of the attacker's type and/or Tera type. */
-    const stabMultiplier = new Utils.NumberHolder(1);
-    if (matchesSourceType) {
-      stabMultiplier.value += 0.5;
-    }
-    applyMoveAttrs(CombinedPledgeStabBoostAttr, source, this, move, stabMultiplier);
-    if (sourceTeraType !== Type.UNKNOWN && sourceTeraType === moveType) {
-      stabMultiplier.value += 0.5;
-    }
-
-    if (!ignoreSourceAbility) {
-      applyAbAttrs(StabBoostAbAttr, source, null, simulated, stabMultiplier);
-    }
-
-    stabMultiplier.value = Math.min(stabMultiplier.value, 2.25);
+    const stabMultiplier = this.calculateStabMultiplier(source, move, ignoreSourceAbility, simulated);
 
     /** Halves damage if the attacker is using a physical attack while burned */
-    const burnMultiplier = new Utils.NumberHolder(1);
-    if (isPhysical && source.status && source.status.effect === StatusEffect.BURN) {
-      if (!move.hasAttr(BypassBurnDamageReductionAttr)) {
-        const burnDamageReductionCancelled = new Utils.BooleanHolder(false);
-        if (!ignoreSourceAbility) {
-          applyAbAttrs(BypassBurnDamageReductionAbAttr, source, burnDamageReductionCancelled, simulated);
-        }
-        if (!burnDamageReductionCancelled.value) {
-          burnMultiplier.value = 0.5;
-        }
+    let burnMultiplier = 1;
+    if (
+      isPhysical &&
+      source.status &&
+      source.status.effect === StatusEffect.BURN &&
+      !move.hasAttr(BypassBurnDamageReductionAttr)
+    ) {
+      const burnDamageReductionCancelled = new BooleanHolder(false);
+      if (!ignoreSourceAbility) {
+        applyAbAttrs(
+          BypassBurnDamageReductionAbAttr,
+          source,
+          burnDamageReductionCancelled,
+          simulated,
+        );
+      }
+      if (!burnDamageReductionCancelled.value) {
+        burnMultiplier = 0.5;
       }
     }
 
     /** Reduces damage if this Pokemon has a relevant screen (e.g. Light Screen for special attacks) */
-    const screenMultiplier = new Utils.NumberHolder(1);
-    globalScene.arena.applyTagsForSide(WeakenMoveScreenTag, defendingSide, simulated, source, moveCategory, screenMultiplier);
+    const screenMultiplier = new NumberHolder(1);
+
+    // Critical hits should bypass screens
+    if (!isCritical) {
+      globalScene.arena.applyTagsForSide(
+      WeakenMoveScreenTag,
+      defendingSide,
+      simulated,
+      source,
+      moveCategory,
+      screenMultiplier,
+    );
+    }
 
     /**
      * For each {@linkcode HitsTagAttr} the move has, doubles the damage of the move if:
@@ -2776,37 +4519,50 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
      * AND
      * The move doubles damage when used against that tag
      */
-    const hitsTagMultiplier = new Utils.NumberHolder(1);
-    move.getAttrs(HitsTagAttr).filter(hta => hta.doubleDamage).forEach(hta => {
-      if (this.getTag(hta.tagType)) {
-        hitsTagMultiplier.value *= 2;
-      }
-    });
+    const hitsTagMultiplier = new NumberHolder(1);
+    move
+      .getAttrs(HitsTagAttr)
+      .filter(hta => hta.doubleDamage)
+      .forEach(hta => {
+        if (this.getTag(hta.tagType)) {
+          hitsTagMultiplier.value *= 2;
+        }
+      });
 
     /** Halves damage if this Pokemon is grounded in Misty Terrain against a Dragon-type attack */
-    const mistyTerrainMultiplier = (globalScene.arena.terrain?.terrainType === TerrainType.MISTY && this.isGrounded() && moveType === Type.DRAGON)
-      ? 0.5
-      : 1;
+    const mistyTerrainMultiplier =
+      globalScene.arena.terrain?.terrainType === TerrainType.MISTY &&
+      this.isGrounded() &&
+      moveType === PokemonType.DRAGON
+        ? 0.5
+        : 1;
 
-    damage.value = Utils.toDmgValue(
-      baseDamage
-      * targetMultiplier
-      * multiStrikeEnhancementMultiplier.value
-      * arenaAttackTypeMultiplier.value
-      * glaiveRushMultiplier.value
-      * criticalMultiplier.value
-      * randomMultiplier
-      * stabMultiplier.value
-      * typeMultiplier
-      * burnMultiplier.value
-      * screenMultiplier.value
-      * hitsTagMultiplier.value
-      * mistyTerrainMultiplier
+    damage.value = toDmgValue(
+      baseDamage *
+        targetMultiplier *
+        multiStrikeEnhancementMultiplier.value *
+        arenaAttackTypeMultiplier.value *
+        glaiveRushMultiplier.value *
+        criticalMultiplier.value *
+        randomMultiplier *
+        stabMultiplier *
+        typeMultiplier *
+        burnMultiplier *
+        screenMultiplier.value *
+        hitsTagMultiplier.value *
+        mistyTerrainMultiplier,
     );
 
     /** Doubles damage if the attacker has Tinted Lens and is using a resisted move */
     if (!ignoreSourceAbility) {
-      applyPreAttackAbAttrs(DamageBoostAbAttr, source, this, move, simulated, damage);
+      applyPreAttackAbAttrs(
+        DamageBoostAbAttr,
+        source,
+        this,
+        move,
+        simulated,
+        damage,
+      );
     }
 
     /** Apply the enemy's Damage and Resistance tokens */
@@ -2817,14 +4573,30 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
       globalScene.applyModifiers(EnemyDamageReducerModifier, false, damage);
     }
 
-
     /** Apply this Pokemon's post-calc defensive modifiers (e.g. Fur Coat) */
     if (!ignoreAbility) {
-      applyPreDefendAbAttrs(ReceivedMoveDamageMultiplierAbAttr, this, source, move, cancelled, simulated, damage);
+      applyPreDefendAbAttrs(
+        ReceivedMoveDamageMultiplierAbAttr,
+        this,
+        source,
+        move,
+        cancelled,
+        simulated,
+        damage,
+      );
 
+      const ally = this.getAlly();
       /** Additionally apply friend guard damage reduction if ally has it. */
-      if (globalScene.currentBattle.double && this.getAlly()?.isActive(true)) {
-        applyPreDefendAbAttrs(AlliedFieldDamageReductionAbAttr, this.getAlly(), source, move, cancelled, simulated, damage);
+      if (globalScene.currentBattle.double && !isNullOrUndefined(ally) && ally.isActive(true)) {
+        applyPreDefendAbAttrs(
+          AlliedFieldDamageReductionAbAttr,
+          ally,
+          source,
+          move,
+          cancelled,
+          simulated,
+          damage,
+        );
       }
     }
 
@@ -2832,7 +4604,15 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
     applyMoveAttrs(ModifiedDamageAttr, source, this, move, damage);
 
     if (this.isFullHp() && !ignoreAbility) {
-      applyPreDefendAbAttrs(PreDefendFullHpEndureAbAttr, this, source, move, cancelled, false, damage);
+      applyPreDefendAbAttrs(
+        PreDefendFullHpEndureAbAttr,
+        this,
+        source,
+        move,
+        cancelled,
+        false,
+        damage,
+      );
     }
 
     // debug message for when damage is applied (i.e. not simulated)
@@ -2852,160 +4632,62 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
     return {
       cancelled: cancelled.value,
       result: hitResult,
-      damage: damage.value
+      damage: damage.value,
     };
   }
 
-  /**
-   * Applies the results of a move to this pokemon
-   * @param source The {@linkcode Pokemon} using the move
-   * @param move The {@linkcode Move} being used
-   * @returns The {@linkcode HitResult} of the attack
-   */
-  apply(source: Pokemon, move: Move): HitResult {
+  /** Calculate whether the given move critically hits this pokemon
+   * @param source - The {@linkcode Pokemon} using the move
+   * @param move - The {@linkcode Move} being used
+   * @param simulated - If `true`, suppresses changes to game state during calculation (defaults to `true`)
+   * @returns whether the move critically hits the pokemon
+  */
+  getCriticalHitResult(source: Pokemon, move: Move, simulated: boolean = true): boolean {
     const defendingSide = this.isPlayer() ? ArenaTagSide.PLAYER : ArenaTagSide.ENEMY;
-    const moveCategory = new Utils.NumberHolder(move.category);
-    applyMoveAttrs(VariableMoveCategoryAttr, source, this, move, moveCategory);
-    if (moveCategory.value === MoveCategory.STATUS) {
-      const cancelled = new Utils.BooleanHolder(false);
-      const typeMultiplier = this.getMoveEffectiveness(source, move, false, false, cancelled);
-
-      if (!cancelled.value && typeMultiplier === 0) {
-        globalScene.queueMessage(i18next.t("battle:hitResultNoEffect", { pokemonName: getPokemonNameWithAffix(this) }));
-      }
-      return (typeMultiplier === 0) ? HitResult.NO_EFFECT : HitResult.STATUS;
-    } else {
-      /** Determines whether the attack critically hits */
-      let isCritical: boolean;
-      const critOnly = new Utils.BooleanHolder(false);
-      const critAlways = source.getTag(BattlerTagType.ALWAYS_CRIT);
-      applyMoveAttrs(CritOnlyAttr, source, this, move, critOnly);
-      applyAbAttrs(ConditionalCritAbAttr, source, null, false, critOnly, this, move);
-      if (critOnly.value || critAlways) {
-        isCritical = true;
-      } else {
-        const critChance = [ 24, 8, 2, 1 ][Math.max(0, Math.min(this.getCritStage(source, move), 3))];
-        isCritical = critChance === 1 || !globalScene.randBattleSeedInt(critChance);
-      }
-
-      const noCritTag = globalScene.arena.getTagOnSide(NoCritTag, defendingSide);
-      const blockCrit = new Utils.BooleanHolder(false);
-      applyAbAttrs(BlockCritAbAttr, this, null, false, blockCrit);
-      if (noCritTag || blockCrit.value || Overrides.NEVER_CRIT_OVERRIDE) {
-        isCritical = false;
-      }
-
-      const { cancelled, result, damage: dmg } = this.getAttackDamage(source, move, false, false, isCritical, false);
-
-      const typeBoost = source.findTag(t => t instanceof TypeBoostTag && t.boostedType === source.getMoveType(move)) as TypeBoostTag;
-      if (typeBoost?.oneUse) {
-        source.removeTag(typeBoost.tagType);
-      }
-
-      if (cancelled || result === HitResult.IMMUNE || result === HitResult.NO_EFFECT) {
-        source.stopMultiHit(this);
-
-        if (!cancelled) {
-          if (result === HitResult.IMMUNE) {
-            globalScene.queueMessage(i18next.t("battle:hitResultImmune", { pokemonName: getPokemonNameWithAffix(this) }));
-          } else {
-            globalScene.queueMessage(i18next.t("battle:hitResultNoEffect", { pokemonName: getPokemonNameWithAffix(this) }));
-          }
-        }
-        return result;
-      }
-
-      // In case of fatal damage, this tag would have gotten cleared before we could lapse it.
-      const destinyTag = this.getTag(BattlerTagType.DESTINY_BOND);
-      const grudgeTag = this.getTag(BattlerTagType.GRUDGE);
-
-      const isOneHitKo = result === HitResult.ONE_HIT_KO;
-
-      if (dmg) {
-        this.lapseTags(BattlerTagLapseType.HIT);
-
-        const substitute = this.getTag(SubstituteTag);
-        const isBlockedBySubstitute = !!substitute && move.hitsSubstitute(source, this);
-        if (isBlockedBySubstitute) {
-          substitute.hp -= dmg;
-        }
-        if (!this.isPlayer() && dmg >= this.hp) {
-          globalScene.applyModifiers(EnemyEndureChanceModifier, false, this);
-        }
-
-        /**
-         * We explicitly require to ignore the faint phase here, as we want to show the messages
-         * about the critical hit and the super effective/not very effective messages before the faint phase.
-         */
-        const damage = this.damageAndUpdate(isBlockedBySubstitute ? 0 : dmg, result as DamageResult, isCritical, isOneHitKo, isOneHitKo, true, source);
-
-        if (damage > 0) {
-          if (source.isPlayer()) {
-            globalScene.validateAchvs(DamageAchv, new Utils.NumberHolder(damage));
-            if (damage > globalScene.gameData.gameStats.highestDamage) {
-              globalScene.gameData.gameStats.highestDamage = damage;
-            }
-          }
-          source.turnData.totalDamageDealt += damage;
-          source.turnData.singleHitDamageDealt = damage;
-          this.turnData.damageTaken += damage;
-          this.battleData.hitCount++;
-
-          const attackResult = { move: move.id, result: result as DamageResult, damage: damage, critical: isCritical, sourceId: source.id, sourceBattlerIndex: source.getBattlerIndex() };
-          this.turnData.attacksReceived.unshift(attackResult);
-          if (source.isPlayer() && !this.isPlayer()) {
-            globalScene.applyModifiers(DamageMoneyRewardModifier, true, source, new Utils.NumberHolder(damage));
-          }
-        }
-      }
-
-      if (isCritical) {
-        globalScene.queueMessage(i18next.t("battle:hitResultCriticalHit"));
-      }
-
-      // want to include is.Fainted() in case multi hit move ends early, still want to render message
-      if (source.turnData.hitsLeft === 1 || this.isFainted()) {
-        switch (result) {
-          case HitResult.SUPER_EFFECTIVE:
-            globalScene.queueMessage(i18next.t("battle:hitResultSuperEffective"));
-            break;
-          case HitResult.NOT_VERY_EFFECTIVE:
-            globalScene.queueMessage(i18next.t("battle:hitResultNotVeryEffective"));
-            break;
-          case HitResult.ONE_HIT_KO:
-            globalScene.queueMessage(i18next.t("battle:hitResultOneHitKO"));
-            break;
-        }
-      }
-
-      if (this.isFainted()) {
-        // set splice index here, so future scene queues happen before FaintedPhase
-        globalScene.setPhaseQueueSplice();
-        globalScene.unshiftPhase(new FaintPhase(this.getBattlerIndex(), isOneHitKo, destinyTag, grudgeTag, source));
-
-        this.destroySubstitute();
-        this.lapseTag(BattlerTagType.COMMANDED);
-        this.resetSummonData();
-      }
-
-      return result;
+    const noCritTag = globalScene.arena.getTagOnSide(NoCritTag, defendingSide);
+    if (noCritTag || Overrides.NEVER_CRIT_OVERRIDE || move.hasAttr(FixedDamageAttr)) {
+      return false;
     }
+    const isCritical = new BooleanHolder(false);
+
+    if (source.getTag(BattlerTagType.ALWAYS_CRIT)) {
+      isCritical.value = true;
+    }
+    applyMoveAttrs(CritOnlyAttr, source, this, move, isCritical);
+    applyAbAttrs(ConditionalCritAbAttr, source, null, simulated, isCritical, this, move);
+    if (!isCritical.value) {
+      const critChance = [24, 8, 2, 1][
+        Math.max(0, Math.min(this.getCritStage(source, move), 3))
+      ];
+      isCritical.value = critChance === 1 || !globalScene.randBattleSeedInt(critChance);
+    }
+
+    applyAbAttrs(BlockCritAbAttr, this, null, simulated, isCritical);
+
+    return isCritical.value;
+
   }
 
   /**
    * Called by damageAndUpdate()
    * @param damage integer
    * @param ignoreSegments boolean, not currently used
-   * @param preventEndure  used to update damage if endure or sturdy
-   * @param ignoreFaintPhase  flag on wheter to add FaintPhase if pokemon after applying damage faints
-   * @returns integer representing damage
+   * @param preventEndure used to update damage if endure or sturdy
+   * @param ignoreFaintPhas  flag on whether to add FaintPhase if pokemon after applying damage faints
+   * @returns integer representing damage dealt
    */
-  damage(damage: number, ignoreSegments: boolean = false, preventEndure: boolean = false, ignoreFaintPhase: boolean = false): number {
+  damage(
+    damage: number,
+    _ignoreSegments = false,
+    preventEndure = false,
+    ignoreFaintPhase = false,
+  ): number {
     if (this.isFainted()) {
       return 0;
     }
-    const surviveDamage = new Utils.BooleanHolder(false);
+    const surviveDamage = new BooleanHolder(false);
 
+    // check for endure and other abilities that would prevent us from death
     if (!preventEndure && this.hp - damage <= 0) {
       if (this.hp >= 1 && this.getTag(BattlerTagType.ENDURING)) {
         surviveDamage.value = this.lapseTag(BattlerTagType.ENDURING);
@@ -3015,7 +4697,12 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
         surviveDamage.value = this.lapseTag(BattlerTagType.ENDURE_TOKEN);
       }
       if (!surviveDamage.value) {
-        globalScene.applyModifiers(SurviveDamageModifier, this.isPlayer(), this, surviveDamage);
+        globalScene.applyModifiers(
+          SurviveDamageModifier,
+          this.isPlayer(),
+          this,
+          surviveDamage,
+        );
       }
       if (surviveDamage.value) {
         damage = this.hp - 1;
@@ -3033,31 +4720,65 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
        * Once the MoveEffectPhase is over (and calls it's .end() function, shiftPhase() will reset the PhaseQueueSplice via clearPhaseQueueSplice() )
        */
       globalScene.setPhaseQueueSplice();
-      globalScene.unshiftPhase(new FaintPhase(this.getBattlerIndex(), preventEndure));
+      globalScene.unshiftPhase(
+        new FaintPhase(this.getBattlerIndex(), preventEndure),
+      );
       this.destroySubstitute();
       this.lapseTag(BattlerTagType.COMMANDED);
-      this.resetSummonData();
     }
     return damage;
   }
 
   /**
-   * Called by apply(), given the damage, adds a new DamagePhase and actually updates HP values, etc.
+   * Given the damage, adds a new DamagePhase and update HP values, etc.
+   *
+   * Checks for 'Indirect' HitResults to account for Endure/Reviver Seed applying correctly
    * @param damage integer - passed to damage()
    * @param result an enum if it's super effective, not very, etc.
-   * @param critical boolean if move is a critical hit
+   * @param isCritical boolean if move is a critical hit
    * @param ignoreSegments boolean, passed to damage() and not used currently
    * @param preventEndure boolean, ignore endure properties of pokemon, passed to damage()
    * @param ignoreFaintPhase boolean to ignore adding a FaintPhase, passsed to damage()
    * @returns integer of damage done
    */
-  damageAndUpdate(damage: number, result?: DamageResult, critical: boolean = false, ignoreSegments: boolean = false, preventEndure: boolean = false, ignoreFaintPhase: boolean = false, source?: Pokemon): number {
-    const damagePhase = new DamageAnimPhase(this.getBattlerIndex(), damage, result as DamageResult, critical);
+  damageAndUpdate(damage: number,
+    {
+      result = HitResult.EFFECTIVE,
+      isCritical = false,
+      ignoreSegments = false,
+      ignoreFaintPhase = false,
+      source = undefined,
+    }:
+    {
+      result?: DamageResult,
+      isCritical?: boolean,
+      ignoreSegments?: boolean,
+      ignoreFaintPhase?: boolean,
+      source?: Pokemon,
+    } = {}
+  ): number {
+    const isIndirectDamage = [ HitResult.INDIRECT, HitResult.INDIRECT_KO ].includes(result);
+    const damagePhase = new DamageAnimPhase(
+      this.getBattlerIndex(),
+      damage,
+      result as DamageResult,
+      isCritical
+    );
     globalScene.unshiftPhase(damagePhase);
     if (this.switchOutStatus && source) {
       damage = 0;
     }
-    damage = this.damage(damage, ignoreSegments, preventEndure, ignoreFaintPhase);
+    damage = this.damage(
+      damage,
+      ignoreSegments,
+      isIndirectDamage,
+      ignoreFaintPhase,
+    );
+    // Ensure the battle-info bar's HP is updated, though only if the battle info is visible
+    // TODO: When battle-info UI is refactored, make this only update the HP bar
+    if (this.battleInfo.visible) {
+      this.updateInfo();
+    }
     // Damage amount may have changed, but needed to be queued before calling damage function
     damagePhase.updateAmount(damage);
     /**
@@ -3065,7 +4786,15 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
      * Multi-hits are handled in move-effect-phase.ts for PostDamageAbAttr
      */
     if (!source || source.turnData.hitCount <= 1) {
-      applyPostDamageAbAttrs(PostDamageAbAttr, this, damage, this.hasPassive(), false, [], source);
+      applyPostDamageAbAttrs(
+        PostDamageAbAttr,
+        this,
+        damage,
+        this.hasPassive(),
+        false,
+        [],
+        source,
+      );
     }
     return damage;
   }
@@ -3085,6 +4814,11 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
     return maxForms.includes(this.getFormKey()) || (!!this.getFusionFormKey() && maxForms.includes(this.getFusionFormKey()!));
   }
 
+  isMega(): boolean {
+    const megaForms = [ SpeciesFormKey.MEGA, SpeciesFormKey.MEGA_X, SpeciesFormKey.MEGA_Y, SpeciesFormKey.PRIMAL ] as string[];
+    return megaForms.includes(this.getFormKey()) || (!!this.getFusionFormKey() && megaForms.includes(this.getFusionFormKey()!));
+  }
+
   canAddTag(tagType: BattlerTagType): boolean {
     if (this.getTag(tagType)) {
       return false;
@@ -3092,16 +4826,36 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
 
     const stubTag = new BattlerTag(tagType, 0, 0);
 
-    const cancelled = new Utils.BooleanHolder(false);
-    applyPreApplyBattlerTagAbAttrs(BattlerTagImmunityAbAttr, this, stubTag, cancelled, true);
+    const cancelled = new BooleanHolder(false);
+    applyPreApplyBattlerTagAbAttrs(
+      BattlerTagImmunityAbAttr,
+      this,
+      stubTag,
+      cancelled,
+      true,
+    );
 
     const userField = this.getAlliedField();
-    userField.forEach(pokemon => applyPreApplyBattlerTagAbAttrs(UserFieldBattlerTagImmunityAbAttr, pokemon, stubTag, cancelled, true));
+    userField.forEach(pokemon =>
+      applyPreApplyBattlerTagAbAttrs(
+        UserFieldBattlerTagImmunityAbAttr,
+        pokemon,
+        stubTag,
+        cancelled,
+        true,
+        this,
+      ),
+    );
 
     return !cancelled.value;
   }
 
-  addTag(tagType: BattlerTagType, turnCount: number = 0, sourceMove?: Moves, sourceId?: number): boolean {
+  addTag(
+    tagType: BattlerTagType,
+    turnCount = 0,
+    sourceMove?: Moves,
+    sourceId?: number,
+  ): boolean {
     const existingTag = this.getTag(tagType);
     if (existingTag) {
       existingTag.onOverlap(this);
@@ -3110,93 +4864,121 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
 
     const newTag = getBattlerTag(tagType, turnCount, sourceMove!, sourceId!); // TODO: are the bangs correct?
 
-    const cancelled = new Utils.BooleanHolder(false);
-    applyPreApplyBattlerTagAbAttrs(BattlerTagImmunityAbAttr, this, newTag, cancelled);
+    const cancelled = new BooleanHolder(false);
+    applyPreApplyBattlerTagAbAttrs(
+      BattlerTagImmunityAbAttr,
+      this,
+      newTag,
+      cancelled,
+    );
+    if (cancelled.value) {
+      return false;
+    }
 
-    const userField = this.getAlliedField();
-    userField.forEach(pokemon => applyPreApplyBattlerTagAbAttrs(UserFieldBattlerTagImmunityAbAttr, pokemon, newTag, cancelled));
+    for (const pokemon of this.getAlliedField()) {
+      applyPreApplyBattlerTagAbAttrs(
+        UserFieldBattlerTagImmunityAbAttr,
+        pokemon,
+        newTag,
+        cancelled,
+        false,
+        this
+      );
+      if (cancelled.value) {
+        return false;
+      }
+    }
 
-    if (!cancelled.value && newTag.canAdd(this)) {
+    if (newTag.canAdd(this)) {
       this.summonData.tags.push(newTag);
       newTag.onAdd(this);
-
       return true;
     }
 
     return false;
   }
 
-  /** @overload */
-  getTag(tagType: BattlerTagType): BattlerTag | nil;
+  /**@overload */
+  getTag(tagType: BattlerTagType.GRUDGE): GrudgeTag | nil;
 
   /** @overload */
-  getTag<T extends BattlerTag>(tagType: Constructor<T>): T | nil;
+  getTag(tagType: BattlerTagType): BattlerTag | undefined;
 
-  getTag(tagType: BattlerTagType | Constructor<BattlerTag>): BattlerTag | nil {
-    if (!this.summonData) {
-      return null;
-    }
-    return (tagType instanceof Function
+  /** @overload */
+  getTag<T extends BattlerTag>(tagType: Constructor<T>): T | undefined;
+
+  getTag(tagType: BattlerTagType | Constructor<BattlerTag>): BattlerTag | undefined {
+    return tagType instanceof Function
       ? this.summonData.tags.find(t => t instanceof tagType)
-      : this.summonData.tags.find(t => t.tagType === tagType)
-    );
+      : this.summonData.tags.find(t => t.tagType === tagType);
   }
 
-  findTag(tagFilter: ((tag: BattlerTag) => boolean)) {
-    if (!this.summonData) {
-      return null;
-    }
+  findTag(tagFilter: (tag: BattlerTag) => boolean) {
     return this.summonData.tags.find(t => tagFilter(t));
   }
 
-  findTags(tagFilter: ((tag: BattlerTag) => boolean)): BattlerTag[] {
-    if (!this.summonData) {
-      return [];
-    }
+  findTags(tagFilter: (tag: BattlerTag) => boolean): BattlerTag[] {
     return this.summonData.tags.filter(t => tagFilter(t));
   }
 
+  /**
+   * Tick down the first {@linkcode BattlerTag} found matching the given {@linkcode BattlerTagType},
+   * removing it if its duration goes below 0.
+   * @param tagType the {@linkcode BattlerTagType} to check against
+   * @returns `true` if the tag was present
+   */
   lapseTag(tagType: BattlerTagType): boolean {
-    if (!this.summonData) {
-      return false;
-    }
     const tags = this.summonData.tags;
     const tag = tags.find(t => t.tagType === tagType);
-    if (tag && !(tag.lapse(this, BattlerTagLapseType.CUSTOM))) {
+    if (!tag) {
+      return false
+    }
+
+    if (!tag.lapse(this, BattlerTagLapseType.CUSTOM)) {
       tag.onRemove(this);
       tags.splice(tags.indexOf(tag), 1);
     }
-    return !!tag;
+    return true
   }
 
+  /**
+   * Tick down all {@linkcode BattlerTags} matching the given {@linkcode BattlerTagLapseType},
+   * removing any whose durations fall below 0.
+   * @param tagType the {@linkcode BattlerTagLapseType} to tick down
+   */
   lapseTags(lapseType: BattlerTagLapseType): void {
-    if (!this.summonData) {
-      return;
-    }
     const tags = this.summonData.tags;
-    tags.filter(t => lapseType === BattlerTagLapseType.FAINT || ((t.lapseTypes.some(lType => lType === lapseType)) && !(t.lapse(this, lapseType)))).forEach(t => {
-      t.onRemove(this);
-      tags.splice(tags.indexOf(t), 1);
-    });
+    tags
+      .filter(
+        t =>
+          lapseType === BattlerTagLapseType.FAINT ||
+          (t.lapseTypes.some(lType => lType === lapseType) &&
+            !t.lapse(this, lapseType)),
+      )
+      .forEach(t => {
+        t.onRemove(this);
+        tags.splice(tags.indexOf(t), 1);
+      });
   }
 
-  removeTag(tagType: BattlerTagType): boolean {
-    if (!this.summonData) {
-      return false;
-    }
+  /**
+   * Remove the first tag matching the given {@linkcode BattlerTagType}.
+   * @param tagType the {@linkcode BattlerTagType} to search for and remove
+   */
+  removeTag(tagType: BattlerTagType): void {
     const tags = this.summonData.tags;
     const tag = tags.find(t => t.tagType === tagType);
     if (tag) {
       tag.onRemove(this);
       tags.splice(tags.indexOf(tag), 1);
     }
-    return !!tag;
   }
 
-  findAndRemoveTags(tagFilter: ((tag: BattlerTag) => boolean)): boolean {
-    if (!this.summonData) {
-      return false;
-    }
+  /**
+   * Find and remove all {@linkcode BattlerTag}s matching the given function.
+   * @param tagFilter a function dictating which tags to remove
+   */
+  findAndRemoveTags(tagFilter: (tag: BattlerTag) => boolean): void {
     const tags = this.summonData.tags;
     const tagsToRemove = tags.filter(t => tagFilter(t));
     for (const tag of tagsToRemove) {
@@ -3204,7 +4986,6 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
       tag.onRemove(this);
       tags.splice(tags.indexOf(tag), 1);
     }
-    return true;
   }
 
   removeTagsBySourceId(sourceId: number): void {
@@ -3212,11 +4993,11 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
   }
 
   transferTagsBySourceId(sourceId: number, newSourceId: number): void {
-    if (!this.summonData) {
-      return;
-    }
-    const tags = this.summonData.tags;
-    tags.filter(t => t.sourceId === sourceId).forEach(t => t.sourceId = newSourceId);
+    this.summonData.tags.forEach(t => {
+      if (t.sourceId === sourceId) {
+        t.sourceId = newSourceId;
+      }
+    })
   }
 
   /**
@@ -3227,14 +5008,19 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
     // Copy all stat stages
     for (const s of BATTLE_STATS) {
       const sourceStage = source.getStatStage(s);
-      if ((this instanceof PlayerPokemon) && (sourceStage === 6)) {
+      if (this instanceof PlayerPokemon && sourceStage === 6) {
         globalScene.validateAchv(achvs.TRANSFER_MAX_STAT_STAGE);
       }
       this.setStatStage(s, sourceStage);
     }
 
     for (const tag of source.summonData.tags) {
-      if (!tag.isBatonPassable || (tag.tagType === BattlerTagType.TELEKINESIS && this.species.speciesId === Species.GENGAR && this.getFormKey() === "mega")) {
+      if (
+        !tag.isBatonPassable ||
+        (tag.tagType === BattlerTagType.TELEKINESIS &&
+          this.species.speciesId === Species.GENGAR &&
+          this.getFormKey() === "mega")
+      ) {
         continue;
       }
 
@@ -3251,8 +5037,8 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
   /**
    * Gets whether the given move is currently disabled for this Pokemon.
    *
-   * @param {Moves} moveId {@linkcode Moves} ID of the move to check
-   * @returns {boolean} `true` if the move is disabled for this Pokemon, otherwise `false`
+   * @param moveId - The {@linkcode Moves} ID of the move to check
+   * @returns `true` if the move is disabled for this Pokemon, otherwise `false`
    *
    * @see {@linkcode MoveRestrictionBattlerTag}
    */
@@ -3263,18 +5049,30 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
   /**
    * Gets whether the given move is currently disabled for the user based on the player's target selection
    *
-   * @param {Moves} moveId {@linkcode Moves} ID of the move to check
-   * @param {Pokemon} user {@linkcode Pokemon} the move user
-   * @param {Pokemon} target {@linkcode Pokemon} the target of the move
+   * @param moveId - The {@linkcode Moves} ID of the move to check
+   * @param user - The move user
+   * @param target - The target of the move
    *
    * @returns {boolean} `true` if the move is disabled for this Pokemon due to the player's target selection
    *
    * @see {@linkcode MoveRestrictionBattlerTag}
    */
-  isMoveTargetRestricted(moveId: Moves, user: Pokemon, target: Pokemon): boolean {
-    for (const tag of this.findTags(t => t instanceof MoveRestrictionBattlerTag)) {
-      if ((tag as MoveRestrictionBattlerTag).isMoveTargetRestricted(moveId, user, target)) {
-        return (tag as MoveRestrictionBattlerTag !== null);
+  isMoveTargetRestricted(
+    moveId: Moves,
+    user: Pokemon,
+    target: Pokemon,
+  ): boolean {
+    for (const tag of this.findTags(
+      t => t instanceof MoveRestrictionBattlerTag,
+    )) {
+      if (
+        (tag as MoveRestrictionBattlerTag).isMoveTargetRestricted(
+          moveId,
+          user,
+          target,
+        )
+      ) {
+        return (tag as MoveRestrictionBattlerTag) !== null;
       }
     }
     return false;
@@ -3283,16 +5081,31 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
   /**
    * Gets the {@link MoveRestrictionBattlerTag} that is restricting a move, if it exists.
    *
-   * @param {Moves} moveId {@linkcode Moves} ID of the move to check
-   * @param {Pokemon} user {@linkcode Pokemon} the move user, optional and used when the target is a factor in the move's restricted status
-   * @param {Pokemon} target {@linkcode Pokemon} the target of the move, optional and used when the target is a factor in the move's restricted status
-   * @returns {MoveRestrictionBattlerTag | null} the first tag on this Pokemon that restricts the move, or `null` if the move is not restricted.
+   * @param moveId - {@linkcode Moves} ID of the move to check
+   * @param user - {@linkcode Pokemon} the move user, optional and used when the target is a factor in the move's restricted status
+   * @param target - {@linkcode Pokemon} the target of the move, optional and used when the target is a factor in the move's restricted status
+   * @returns The first tag on this Pokemon that restricts the move, or `null` if the move is not restricted.
    */
-  getRestrictingTag(moveId: Moves, user?: Pokemon, target?: Pokemon): MoveRestrictionBattlerTag | null {
-    for (const tag of this.findTags(t => t instanceof MoveRestrictionBattlerTag)) {
+  getRestrictingTag(
+    moveId: Moves,
+    user?: Pokemon,
+    target?: Pokemon,
+  ): MoveRestrictionBattlerTag | null {
+    for (const tag of this.findTags(
+      t => t instanceof MoveRestrictionBattlerTag,
+    )) {
       if ((tag as MoveRestrictionBattlerTag).isMoveRestricted(moveId, user)) {
         return tag as MoveRestrictionBattlerTag;
-      } else if (user && target && (tag as MoveRestrictionBattlerTag).isMoveTargetRestricted(moveId, user, target)) {
+      }
+      if (
+        user &&
+        target &&
+        (tag as MoveRestrictionBattlerTag).isMoveTargetRestricted(
+          moveId,
+          user,
+          target,
+        )
+      ) {
         return tag as MoveRestrictionBattlerTag;
       }
     }
@@ -3300,7 +5113,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
   }
 
   public getMoveHistory(): TurnMove[] {
-    return this.battleSummonData.moveHistory;
+    return this.summonData.moveHistory;
   }
 
   public pushMoveHistory(turnMove: TurnMove): void {
@@ -3319,36 +5132,30 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
    *   Default is `1`.
    * @returns A list of {@linkcode TurnMove}, as specified above.
    */
-  getLastXMoves(moveCount: number = 1): TurnMove[] {
+  getLastXMoves(moveCount = 1): TurnMove[] {
     const moveHistory = this.getMoveHistory();
     if (moveCount >= 0) {
-      return moveHistory.slice(Math.max(moveHistory.length - moveCount, 0)).reverse();
-    } else {
-      return moveHistory.slice(0).reverse();
+      return moveHistory
+        .slice(Math.max(moveHistory.length - moveCount, 0))
+        .reverse();
     }
+    return moveHistory.slice(0).reverse();
   }
 
   getMoveQueue(): TurnMove[] {
     return this.summonData.moveQueue;
   }
 
-  /**
-   * If this Pokemon is using a multi-hit move, cancels all subsequent strikes
-   * @param {Pokemon} target If specified, this only cancels subsequent strikes against the given target
-   */
-  stopMultiHit(target?: Pokemon): void {
-    const effectPhase = globalScene.getCurrentPhase();
-    if (effectPhase instanceof MoveEffectPhase && effectPhase.getUserPokemon() === this) {
-      effectPhase.stopMultiHit(target);
-    }
-  }
-
   changeForm(formChange: SpeciesFormChange): Promise<void> {
     return new Promise(resolve => {
-      this.formIndex = Math.max(this.species.forms.findIndex(f => f.formKey === formChange.formKey), 0);
+      this.formIndex = Math.max(
+        this.species.forms.findIndex(f => f.formKey === formChange.formKey),
+        0,
+      );
       this.generateName();
       const abilityCount = this.getSpeciesForm().getAbilityCount();
-      if (this.abilityIndex >= abilityCount) {// Shouldn't happen
+      if (this.abilityIndex >= abilityCount) {
+        // Shouldn't happen
         this.abilityIndex = abilityCount - 1;
       }
       globalScene.gameData.setPokemonSeen(this, false);
@@ -3356,24 +5163,47 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
       this.loadAssets().then(() => {
         this.calculateStats();
         globalScene.updateModifiers(this.isPlayer(), true);
-        Promise.all([ this.updateInfo(), globalScene.updateFieldScale() ]).then(() => resolve());
+        Promise.all([this.updateInfo(), globalScene.updateFieldScale()]).then(
+          () => resolve(),
+        );
       });
     });
   }
 
-  cry(soundConfig?: Phaser.Types.Sound.SoundConfig, sceneOverride?: BattleScene): AnySound {
+  cry(
+    soundConfig?: Phaser.Types.Sound.SoundConfig,
+    sceneOverride?: BattleScene,
+  ): AnySound {
     const scene = sceneOverride ?? globalScene; // TODO: is `sceneOverride` needed?
-    const cry = this.getSpeciesForm().cry(soundConfig);
+    const cry = this.getSpeciesForm(undefined, true).cry(soundConfig);
     let duration = cry.totalDuration * 1000;
-    if (this.fusionSpecies && this.getSpeciesForm() !== this.getFusionSpeciesForm()) {
-      let fusionCry = this.getFusionSpeciesForm().cry(soundConfig, true);
+    if (
+      this.fusionSpecies &&
+      this.getSpeciesForm(undefined, true) !== this.getFusionSpeciesForm(undefined, true)
+    ) {
+      let fusionCry = this.getFusionSpeciesForm(undefined, true).cry(soundConfig, true);
       duration = Math.min(duration, fusionCry.totalDuration * 1000);
       fusionCry.destroy();
-      scene.time.delayedCall(Utils.fixedInt(Math.ceil(duration * 0.4)), () => {
+      scene.time.delayedCall(fixedInt(Math.ceil(duration * 0.4)), () => {
         try {
-          SoundFade.fadeOut(scene, cry, Utils.fixedInt(Math.ceil(duration * 0.2)));
-          fusionCry = this.getFusionSpeciesForm().cry(Object.assign({ seek: Math.max(fusionCry.totalDuration * 0.4, 0) }, soundConfig));
-          SoundFade.fadeIn(scene, fusionCry, Utils.fixedInt(Math.ceil(duration * 0.2)), scene.masterVolume * scene.fieldVolume, 0);
+          SoundFade.fadeOut(
+            scene,
+            cry,
+            fixedInt(Math.ceil(duration * 0.2)),
+          );
+          fusionCry = this.getFusionSpeciesForm(undefined, true).cry(
+            Object.assign(
+              { seek: Math.max(fusionCry.totalDuration * 0.4, 0) },
+              soundConfig,
+            ),
+          );
+          SoundFade.fadeIn(
+            scene,
+            fusionCry,
+            fixedInt(Math.ceil(duration * 0.2)),
+            scene.masterVolume * scene.fieldVolume,
+            0,
+          );
         } catch (err) {
           console.error(err);
         }
@@ -3383,8 +5213,12 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
     return cry;
   }
 
+  // biome-ignore lint: there are a ton of issues..
   faintCry(callback: Function): void {
-    if (this.fusionSpecies && this.getSpeciesForm() !== this.getFusionSpeciesForm()) {
+    if (
+      this.fusionSpecies &&
+      this.getSpeciesForm() !== this.getFusionSpeciesForm()
+    ) {
       return this.fusionFaintCry(callback);
     }
 
@@ -3404,34 +5238,35 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
     sprite.anims.pause();
     tintSprite?.anims.pause();
 
-    let faintCryTimer : Phaser.Time.TimerEvent | null = globalScene.time.addEvent({
-      delay: Utils.fixedInt(delay),
-      repeat: -1,
-      callback: () => {
-        frameThreshold = sprite.anims.msPerFrame / rate;
-        frameProgress += delay;
-        while (frameProgress > frameThreshold) {
-          if (sprite.anims.duration) {
-            sprite.anims.nextFrame();
-            tintSprite?.anims.nextFrame();
+    let faintCryTimer: Phaser.Time.TimerEvent | null =
+      globalScene.time.addEvent({
+        delay: fixedInt(delay),
+        repeat: -1,
+        callback: () => {
+          frameThreshold = sprite.anims.msPerFrame / rate;
+          frameProgress += delay;
+          while (frameProgress > frameThreshold) {
+            if (sprite.anims.duration) {
+              sprite.anims.nextFrame();
+              tintSprite?.anims.nextFrame();
+            }
+            frameProgress -= frameThreshold;
           }
-          frameProgress -= frameThreshold;
-        }
-        if (cry && !cry.pendingRemove) {
-          rate *= 0.99;
-          cry.setRate(rate);
-        } else {
-          faintCryTimer?.destroy();
-          faintCryTimer = null;
-          if (callback) {
-            callback();
+          if (cry && !cry.pendingRemove) {
+            rate *= 0.99;
+            cry.setRate(rate);
+          } else {
+            faintCryTimer?.destroy();
+            faintCryTimer = null;
+            if (callback) {
+              callback();
+            }
           }
-        }
-      }
-    });
+        },
+      });
 
     // Failsafe
-    globalScene.time.delayedCall(Utils.fixedInt(3000), () => {
+    globalScene.time.delayedCall(fixedInt(3000), () => {
       if (!faintCryTimer || !globalScene) {
         return;
       }
@@ -3445,6 +5280,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
     });
   }
 
+  // biome-ignore lint/complexity/noBannedTypes: Consider refactoring to change type of Function
   private fusionFaintCry(callback: Function): void {
     const key = this.species.getCryKey(this.formIndex);
     let i = 0;
@@ -3455,7 +5291,9 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
     let duration = cry.totalDuration * 1000;
 
     const fusionCryKey = this.fusionSpecies!.getCryKey(this.fusionFormIndex);
-    let fusionCry = globalScene.playSound(fusionCryKey, { rate: rate }) as AnySound;
+    let fusionCry = globalScene.playSound(fusionCryKey, {
+      rate: rate,
+    }) as AnySound;
     if (!cry || !fusionCry || globalScene.fieldVolume === 0) {
       return callback();
     }
@@ -3485,44 +5323,64 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
     sprite.anims.pause();
     tintSprite?.anims.pause();
 
-    let faintCryTimer: Phaser.Time.TimerEvent | null = globalScene.time.addEvent({
-      delay: Utils.fixedInt(delay),
-      repeat: -1,
-      callback: () => {
-        ++i;
-        frameThreshold = sprite.anims.msPerFrame / rate;
-        frameProgress += delay;
-        while (frameProgress > frameThreshold) {
-          if (sprite.anims.duration) {
-            sprite.anims.nextFrame();
-            tintSprite?.anims.nextFrame();
+    let faintCryTimer: Phaser.Time.TimerEvent | null =
+      globalScene.time.addEvent({
+        delay: fixedInt(delay),
+        repeat: -1,
+        callback: () => {
+          ++i;
+          frameThreshold = sprite.anims.msPerFrame / rate;
+          frameProgress += delay;
+          while (frameProgress > frameThreshold) {
+            if (sprite.anims.duration) {
+              sprite.anims.nextFrame();
+              tintSprite?.anims.nextFrame();
+            }
+            frameProgress -= frameThreshold;
           }
-          frameProgress -= frameThreshold;
-        }
-        if (i === transitionIndex && fusionCryKey) {
-          SoundFade.fadeOut(globalScene, cry, Utils.fixedInt(Math.ceil((duration / rate) * 0.2)));
-          fusionCry = globalScene.playSound(fusionCryKey, Object.assign({ seek: Math.max(fusionCry.totalDuration * 0.4, 0), rate: rate }));
-          SoundFade.fadeIn(globalScene, fusionCry, Utils.fixedInt(Math.ceil((duration / rate) * 0.2)), globalScene.masterVolume * globalScene.fieldVolume, 0);
-        }
-        rate *= 0.99;
-        if (cry && !cry.pendingRemove) {
-          cry.setRate(rate);
-        }
-        if (fusionCry && !fusionCry.pendingRemove) {
-          fusionCry.setRate(rate);
-        }
-        if ((!cry || cry.pendingRemove) && (!fusionCry || fusionCry.pendingRemove)) {
-          faintCryTimer?.destroy();
-          faintCryTimer = null;
-          if (callback) {
-            callback();
+          if (i === transitionIndex && fusionCryKey) {
+            SoundFade.fadeOut(
+              globalScene,
+              cry,
+              fixedInt(Math.ceil((duration / rate) * 0.2)),
+            );
+            fusionCry = globalScene.playSound(
+              fusionCryKey,
+              Object.assign({
+                seek: Math.max(fusionCry.totalDuration * 0.4, 0),
+                rate: rate,
+              }),
+            );
+            SoundFade.fadeIn(
+              globalScene,
+              fusionCry,
+              fixedInt(Math.ceil((duration / rate) * 0.2)),
+              globalScene.masterVolume * globalScene.fieldVolume,
+              0,
+            );
           }
-        }
-      }
-    });
+          rate *= 0.99;
+          if (cry && !cry.pendingRemove) {
+            cry.setRate(rate);
+          }
+          if (fusionCry && !fusionCry.pendingRemove) {
+            fusionCry.setRate(rate);
+          }
+          if (
+            (!cry || cry.pendingRemove) &&
+            (!fusionCry || fusionCry.pendingRemove)
+          ) {
+            faintCryTimer?.destroy();
+            faintCryTimer = null;
+            if (callback) {
+              callback();
+            }
+          }
+        },
+      });
 
     // Failsafe
-    globalScene.time.delayedCall(Utils.fixedInt(3000), () => {
+    globalScene.time.delayedCall(fixedInt(3000), () => {
       if (!faintCryTimer || !globalScene) {
         return;
       }
@@ -3540,7 +5398,23 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
   }
 
   isOppositeGender(pokemon: Pokemon): boolean {
-    return this.gender !== Gender.GENDERLESS && pokemon.gender === (this.gender === Gender.MALE ? Gender.FEMALE : Gender.MALE);
+    return (
+      this.gender !== Gender.GENDERLESS &&
+      pokemon.gender ===
+        (this.gender === Gender.MALE ? Gender.FEMALE : Gender.MALE)
+    );
+  }
+
+  queueImmuneMessage(quiet: boolean, effect?: StatusEffect): void {
+    if (!effect || quiet) {
+      return;
+    }
+    const message = effect && this.status?.effect === effect
+    ? getStatusEffectOverlapText(effect ?? StatusEffect.NONE, getPokemonNameWithAffix(this))
+    : i18next.t("abilityTriggers:moveImmunity", {
+        pokemonNameWithAffix: getPokemonNameWithAffix(this),
+      });
+    globalScene.queueMessage(message);
   }
 
   /**
@@ -3552,87 +5426,157 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
    * @param sourcePokemon The Pokemon that is setting the status effect
    * @param ignoreField Whether any field effects (weather, terrain, etc.) should be considered
    */
-  canSetStatus(effect: StatusEffect | undefined, quiet: boolean = false, overrideStatus: boolean = false, sourcePokemon: Pokemon | null = null, ignoreField: boolean = false): boolean {
+  canSetStatus(
+    effect: StatusEffect | undefined,
+    quiet = false,
+    overrideStatus = false,
+    sourcePokemon: Pokemon | null = null,
+    ignoreField = false,
+  ): boolean {
     if (effect !== StatusEffect.FAINT) {
       if (overrideStatus ? this.status?.effect === effect : this.status) {
+        this.queueImmuneMessage(quiet, effect);
         return false;
       }
-      if (this.isGrounded() && (!ignoreField && globalScene.arena.terrain?.terrainType === TerrainType.MISTY)) {
+      if (
+        this.isGrounded() &&
+        !ignoreField &&
+        globalScene.arena.terrain?.terrainType === TerrainType.MISTY
+      ) {
+        this.queueImmuneMessage(quiet, effect);
         return false;
       }
     }
 
-    if (sourcePokemon && sourcePokemon !== this && this.isSafeguarded(sourcePokemon)) {
-      return false;
-    }
-
     const types = this.getTypes(true, true);
 
     switch (effect) {
       case StatusEffect.POISON:
       case StatusEffect.TOXIC:
-      // Check if the Pokemon is immune to Poison/Toxic or if the source pokemon is canceling the immunity
+        // Check if the Pokemon is immune to Poison/Toxic or if the source pokemon is canceling the immunity
         const poisonImmunity = types.map(defType => {
-        // Check if the Pokemon is not immune to Poison/Toxic
-          if (defType !== Type.POISON && defType !== Type.STEEL) {
+          // Check if the Pokemon is not immune to Poison/Toxic
+          if (defType !== PokemonType.POISON && defType !== PokemonType.STEEL) {
             return false;
           }
 
           // Check if the source Pokemon has an ability that cancels the Poison/Toxic immunity
-          const cancelImmunity = new Utils.BooleanHolder(false);
+          const cancelImmunity = new BooleanHolder(false);
           if (sourcePokemon) {
-            applyAbAttrs(IgnoreTypeStatusEffectImmunityAbAttr, sourcePokemon, cancelImmunity, false, effect, defType);
+            applyAbAttrs(
+              IgnoreTypeStatusEffectImmunityAbAttr,
+              sourcePokemon,
+              cancelImmunity,
+              false,
+              effect,
+              defType,
+            );
             if (cancelImmunity.value) {
               return false;
             }
           }
 
-          return true;
+            return true;
         });
 
-        if (this.isOfType(Type.POISON) || this.isOfType(Type.STEEL)) {
+        if (this.isOfType(PokemonType.POISON) || this.isOfType(PokemonType.STEEL)) {
           if (poisonImmunity.includes(true)) {
+            this.queueImmuneMessage(quiet, effect);
             return false;
           }
         }
         break;
       case StatusEffect.PARALYSIS:
-        if (this.isOfType(Type.ELECTRIC)) {
+        if (this.isOfType(PokemonType.ELECTRIC)) {
+          this.queueImmuneMessage(quiet, effect);
           return false;
         }
         break;
       case StatusEffect.SLEEP:
-        if (this.isGrounded() && globalScene.arena.terrain?.terrainType === TerrainType.ELECTRIC) {
+        if (
+          this.isGrounded() &&
+          globalScene.arena.terrain?.terrainType === TerrainType.ELECTRIC
+        ) {
+          this.queueImmuneMessage(quiet, effect);
           return false;
         }
         break;
       case StatusEffect.FREEZE:
-        if (this.isOfType(Type.ICE) || (!ignoreField && (globalScene?.arena?.weather?.weatherType && [ WeatherType.SUNNY, WeatherType.HARSH_SUN ].includes(globalScene.arena.weather.weatherType)))) {
+        if (
+          this.isOfType(PokemonType.ICE) ||
+          (!ignoreField &&
+            globalScene?.arena?.weather?.weatherType &&
+            [WeatherType.SUNNY, WeatherType.HARSH_SUN].includes(
+              globalScene.arena.weather.weatherType,
+            ))
+        ) {
+          this.queueImmuneMessage(quiet, effect);
           return false;
         }
         break;
       case StatusEffect.BURN:
-        if (this.isOfType(Type.FIRE)) {
+        if (this.isOfType(PokemonType.FIRE)) {
+          this.queueImmuneMessage(quiet, effect);
           return false;
         }
         break;
     }
 
-    const cancelled = new Utils.BooleanHolder(false);
-    applyPreSetStatusAbAttrs(StatusEffectImmunityAbAttr, this, effect, cancelled, quiet);
+    const cancelled = new BooleanHolder(false);
+    applyPreSetStatusAbAttrs(
+      StatusEffectImmunityAbAttr,
+      this,
+      effect,
+      cancelled,
+      quiet,
+    );
+    if (cancelled.value) {
+      return false;
+    }
 
-    const userField = this.getAlliedField();
-    userField.forEach(pokemon => applyPreSetStatusAbAttrs(UserFieldStatusEffectImmunityAbAttr, pokemon, effect, cancelled, quiet));
+    for (const pokemon of this.getAlliedField()) {
+      applyPreSetStatusAbAttrs(
+        UserFieldStatusEffectImmunityAbAttr,
+        pokemon,
+        effect,
+        cancelled,
+        quiet, this, sourcePokemon,
+      )
+      if (cancelled.value) {
+        break;
+      }
+    }
 
     if (cancelled.value) {
       return false;
     }
 
+    if (
+      sourcePokemon &&
+      sourcePokemon !== this &&
+      this.isSafeguarded(sourcePokemon)
+    ) {
+      if(!quiet){
+        globalScene.queueMessage(
+          i18next.t("moveTriggers:safeguard", { targetName: getPokemonNameWithAffix(this)
+        }));
+      }
+      return false;
+    }
+
     return true;
   }
 
-  trySetStatus(effect?: StatusEffect, asPhase: boolean = false, sourcePokemon: Pokemon | null = null, turnsRemaining: number = 0, sourceText: string | null = null): boolean {
-    if (!this.canSetStatus(effect, asPhase, false, sourcePokemon)) {
+  trySetStatus(
+    effect?: StatusEffect,
+    asPhase = false,
+    sourcePokemon: Pokemon | null = null,
+    turnsRemaining = 0,
+    sourceText: string | null = null,
+    overrideStatus?: boolean,
+    quiet = true,
+  ): boolean {
+    if (!this.canSetStatus(effect, quiet, overrideStatus, sourcePokemon)) {
       return false;
     }
     if (this.isFainted() && effect !== StatusEffect.FAINT) {
@@ -3644,18 +5588,33 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
      * cancel the attack's subsequent hits.
      */
     if (effect === StatusEffect.SLEEP || effect === StatusEffect.FREEZE) {
-      this.stopMultiHit();
+      const currentPhase = globalScene.getCurrentPhase();
+      if (currentPhase instanceof MoveEffectPhase && currentPhase.getUserPokemon() === this) {
+        this.turnData.hitCount = 1;
+        this.turnData.hitsLeft = 1;
+      }
     }
 
     if (asPhase) {
-      globalScene.unshiftPhase(new ObtainStatusEffectPhase(this.getBattlerIndex(), effect, turnsRemaining, sourceText, sourcePokemon));
+      if (overrideStatus) {
+        this.resetStatus(false);
+      }
+      globalScene.unshiftPhase(
+        new ObtainStatusEffectPhase(
+          this.getBattlerIndex(),
+          effect,
+          turnsRemaining,
+          sourceText,
+          sourcePokemon,
+        ),
+      );
       return true;
     }
 
-    let sleepTurnsRemaining: Utils.NumberHolder;
+    let sleepTurnsRemaining: NumberHolder;
 
     if (effect === StatusEffect.SLEEP) {
-      sleepTurnsRemaining = new Utils.NumberHolder(this.randSeedIntRange(2, 4));
+      sleepTurnsRemaining = new NumberHolder(this.randBattleSeedIntRange(2, 4));
 
       this.setFrameRate(4);
 
@@ -3664,10 +5623,10 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
         BattlerTagType.UNDERGROUND,
         BattlerTagType.UNDERWATER,
         BattlerTagType.HIDDEN,
-        BattlerTagType.FLYING
+        BattlerTagType.FLYING,
       ];
 
-      const tag = invulnerableTags.find((t) => this.getTag(t));
+      const tag = invulnerableTags.find(t => this.getTag(t));
 
       if (tag) {
         this.removeTag(tag);
@@ -3679,25 +5638,36 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
     effect = effect!; // If `effect` is undefined then `trySetStatus()` will have already returned early via the `canSetStatus()` call
     this.status = new Status(effect, 0, sleepTurnsRemaining?.value);
 
-    if (effect !== StatusEffect.FAINT) {
-      globalScene.triggerPokemonFormChange(this, SpeciesFormChangeStatusEffectTrigger, true);
-      applyPostSetStatusAbAttrs(PostSetStatusAbAttr, this, effect, sourcePokemon);
-    }
-
     return true;
   }
 
   /**
-  * Resets the status of a pokemon.
-  * @param revive Whether revive should be cured; defaults to true.
-  * @param confusion Whether resetStatus should include confusion or not; defaults to false.
-  * @param reloadAssets Whether to reload the assets or not; defaults to false.
-  */
-  resetStatus(revive: boolean = true, confusion: boolean = false, reloadAssets: boolean = false): void {
+   * Resets the status of a pokemon.
+   * @param revive Whether revive should be cured; defaults to true.
+   * @param confusion Whether resetStatus should include confusion or not; defaults to false.
+   * @param reloadAssets Whether to reload the assets or not; defaults to false.
+   * @param asPhase Whether to reset the status in a phase or immediately
+   */
+  resetStatus(revive = true, confusion = false, reloadAssets = false, asPhase = true): void {
     const lastStatus = this.status?.effect;
     if (!revive && lastStatus === StatusEffect.FAINT) {
       return;
     }
+
+    if (asPhase) {
+      globalScene.unshiftPhase(new ResetStatusPhase(this, confusion, reloadAssets));
+    } else {
+      this.clearStatus(confusion, reloadAssets);
+    }
+  }
+
+  /**
+   * Performs the action of clearing a Pokemon's status
+   *
+   * This is a helper to {@linkcode resetStatus}, which should be called directly instead of this method
+   */
+  public clearStatus(confusion: boolean, reloadAssets: boolean) {
+    const lastStatus = this.status?.effect;
     this.status = null;
     if (lastStatus === StatusEffect.SLEEP) {
       this.setFrameRate(10);
@@ -3713,6 +5683,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
     if (reloadAssets) {
       this.loadAssets(false).then(() => this.playAnim());
     }
+    this.updateInfo(true);
   }
 
   /**
@@ -3721,9 +5692,11 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
    * @returns `true` if this Pokemon is protected by Safeguard; `false` otherwise.
    */
   isSafeguarded(attacker: Pokemon): boolean {
-    const defendingSide = this.isPlayer() ? ArenaTagSide.PLAYER : ArenaTagSide.ENEMY;
+    const defendingSide = this.isPlayer()
+      ? ArenaTagSide.PLAYER
+      : ArenaTagSide.ENEMY;
     if (globalScene.arena.getTagOnSide(ArenaTagType.SAFEGUARD, defendingSide)) {
-      const bypassed = new Utils.BooleanHolder(false);
+      const bypassed = new BooleanHolder(false);
       if (attacker) {
         applyAbAttrs(InfiltratorAbAttr, attacker, null, false, bypassed);
       }
@@ -3732,55 +5705,87 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
     return false;
   }
 
-  primeSummonData(summonDataPrimer: PokemonSummonData): void {
-    this.summonDataPrimer = summonDataPrimer;
+  /**
+   * Performs miscellaneous setup for when the Pokemon is summoned, like generating the substitute sprite
+   * @param resetSummonData - Whether to additionally reset the Pokemon's summon data (default: `false`)
+   */
+  public fieldSetup(resetSummonData?: boolean): void {
+    this.setSwitchOutStatus(false);
+    if (globalScene) {
+      globalScene.triggerPokemonFormChange(
+        this,
+        SpeciesFormChangePostMoveTrigger,
+        true,
+      );
+    }
+    // If this Pokemon has a Substitute when loading in, play an animation to add its sprite
+    if (this.getTag(SubstituteTag)) {
+      globalScene.triggerPokemonBattleAnim(
+        this,
+        PokemonAnimType.SUBSTITUTE_ADD,
+      );
+      this.getTag(SubstituteTag)!.sourceInFocus = false;
+    }
+
+    // If this Pokemon has Commander and Dondozo as an active ally, hide this Pokemon's sprite.
+    if (
+      this.hasAbilityWithAttr(CommanderAbAttr) &&
+      globalScene.currentBattle.double &&
+      this.getAlly()?.species.speciesId === Species.DONDOZO
+    ) {
+      this.setVisible(false);
+    }
+
+    if (resetSummonData) {
+      this.resetSummonData();
+    }
   }
 
+  /**
+   * Reset this Pokemon's {@linkcode PokemonSummonData | SummonData} and {@linkcode PokemonTempSummonData | TempSummonData}
+   * in preparation for switching pokemon, as well as removing any relevant on-switch tags.
+   */
   resetSummonData(): void {
-    if (this.summonData?.speciesForm) {
+    const illusion: IllusionData | null = this.summonData.illusion;
+    if (this.summonData.speciesForm) {
       this.summonData.speciesForm = null;
       this.updateFusionPalette();
     }
     this.summonData = new PokemonSummonData();
-    this.setSwitchOutStatus(false);
-    if (!this.battleData) {
-      this.resetBattleData();
-    }
-    this.resetBattleSummonData();
-    if (this.summonDataPrimer) {
-      for (const k of Object.keys(this.summonData)) {
-        if (this.summonDataPrimer[k]) {
-          this.summonData[k] = this.summonDataPrimer[k];
-        }
-      }
-      // If this Pokemon has a Substitute when loading in, play an animation to add its sprite
-      if (this.getTag(SubstituteTag)) {
-        globalScene.triggerPokemonBattleAnim(this, PokemonAnimType.SUBSTITUTE_ADD);
-        this.getTag(SubstituteTag)!.sourceInFocus = false;
-      }
-
-      // If this Pokemon has Commander and Dondozo as an active ally, hide this Pokemon's sprite.
-      if (this.hasAbilityWithAttr(CommanderAbAttr)
-          && globalScene.currentBattle.double
-          && this.getAlly()?.species.speciesId === Species.DONDOZO) {
-        this.setVisible(false);
-      }
-      this.summonDataPrimer = null;
-    }
+    this.tempSummonData = new PokemonTempSummonData();
+    this.summonData.illusion = illusion
     this.updateInfo();
   }
 
-  resetBattleData(): void {
+  /**
+   * Reset a {@linkcode Pokemon}'s per-battle {@linkcode PokemonBattleData | battleData},
+   * as well as any transient {@linkcode PokemonWaveData | waveData} for the current wave.
+   * Should be called once per arena transition (new biome/trainer battle/Mystery Encounter).
+  */
+  resetBattleAndWaveData(): void {
     this.battleData = new PokemonBattleData();
+    this.resetWaveData();
   }
 
-  resetBattleSummonData(): void {
-    this.battleSummonData = new PokemonBattleSummonData();
-    if (this.getTag(BattlerTagType.SEEDED)) {
-      this.lapseTag(BattlerTagType.SEEDED);
-    }
-    if (globalScene) {
-      globalScene.triggerPokemonFormChange(this, SpeciesFormChangePostMoveTrigger, true);
+  /**
+   * Reset a {@linkcode Pokemon}'s {@linkcode PokemonWaveData | waveData}.
+   * Should be called upon starting a new wave in addition to whenever an arena transition occurs.
+   * @see {@linkcode resetBattleAndWaveData()}
+   */
+  resetWaveData(): void {
+    this.waveData = new PokemonWaveData();
+  }
+
+  resetTera(): void {
+    const wasTerastallized = this.isTerastallized;
+    this.isTerastallized = false;
+    this.stellarTypesBoosted = [];
+    if (wasTerastallized) {
+      this.updateSpritePipelineData();
+      globalScene.triggerPokemonFormChange(
+        this,
+        SpeciesFormChangeLapseTeraTrigger,
+      );
     }
   }
 
@@ -3790,7 +5795,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
 
   getExpValue(): number {
     // Logic to factor in victor level has been removed for balancing purposes, so the player doesn't have to focus on EXP maxxing
-    return ((this.getSpeciesForm().getBaseExp() * this.level) / 5 + 1);
+    return (this.getSpeciesForm().getBaseExp() * this.level) / 5 + 1;
   }
 
   setFrameRate(frameRate: number) {
@@ -3798,12 +5803,18 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
     try {
       this.getSprite().play(this.getBattleSpriteKey());
     } catch (err: unknown) {
-      console.error(`Failed to play animation for ${this.getBattleSpriteKey()}`, err);
+      console.error(
+        `Failed to play animation for ${this.getBattleSpriteKey()}`,
+        err,
+      );
     }
     try {
       this.getTintSprite()?.play(this.getBattleSpriteKey());
     } catch (err: unknown) {
-      console.error(`Failed to play animation for ${this.getBattleSpriteKey()}`, err);
+      console.error(
+        `Failed to play animation for ${this.getBattleSpriteKey()}`,
+        err,
+      );
     }
   }
 
@@ -3819,7 +5830,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
         targets: tintSprite,
         alpha: alpha || 1,
         duration: duration,
-        ease: ease || "Linear"
+        ease: ease || "Linear",
       });
     } else {
       tintSprite?.setAlpha(alpha);
@@ -3838,7 +5849,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
         onComplete: () => {
           tintSprite?.setVisible(false);
           tintSprite?.setAlpha(1);
-        }
+        },
       });
     } else {
       tintSprite?.setVisible(false);
@@ -3850,9 +5861,13 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
     if (!this.maskEnabled) {
       this.maskSprite = this.getTintSprite();
       this.maskSprite?.setVisible(true);
-      this.maskSprite?.setPosition(this.x * this.parentContainer.scale + this.parentContainer.x,
-        this.y * this.parentContainer.scale + this.parentContainer.y);
-      this.maskSprite?.setScale(this.getSpriteScale() * this.parentContainer.scale);
+      this.maskSprite?.setPosition(
+        this.x * this.parentContainer.scale + this.parentContainer.x,
+        this.y * this.parentContainer.scale + this.parentContainer.y,
+      );
+      this.maskSprite?.setScale(
+        this.getSpriteScale() * this.parentContainer.scale,
+      );
       this.maskEnabled = true;
     }
   }
@@ -3875,28 +5890,68 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
 
   updateFusionPalette(ignoreOveride?: boolean): void {
     if (!this.getFusionSpeciesForm(ignoreOveride)) {
-      [ this.getSprite(), this.getTintSprite() ].filter(s => !!s).map(s => {
-        s.pipelineData[`spriteColors${ignoreOveride && this.summonData?.speciesForm ? "Base" : ""}`] = [];
-        s.pipelineData[`fusionSpriteColors${ignoreOveride && this.summonData?.speciesForm ? "Base" : ""}`] = [];
-      });
+      [this.getSprite(), this.getTintSprite()]
+        .filter(s => !!s)
+        .map(s => {
+          s.pipelineData[
+            `spriteColors${ignoreOveride && this.summonData.speciesForm ? "Base" : ""}`
+          ] = [];
+          s.pipelineData[
+            `fusionSpriteColors${ignoreOveride && this.summonData.speciesForm ? "Base" : ""}`
+          ] = [];
+        });
       return;
     }
 
     const speciesForm = this.getSpeciesForm(ignoreOveride);
     const fusionSpeciesForm = this.getFusionSpeciesForm(ignoreOveride);
 
-    const spriteKey = speciesForm.getSpriteKey(this.getGender(ignoreOveride) === Gender.FEMALE, speciesForm.formIndex, this.shiny, this.variant);
-    const backSpriteKey = speciesForm.getSpriteKey(this.getGender(ignoreOveride) === Gender.FEMALE, speciesForm.formIndex, this.shiny, this.variant).replace("pkmn__", "pkmn__back__");
-    const fusionSpriteKey = fusionSpeciesForm.getSpriteKey(this.getFusionGender(ignoreOveride) === Gender.FEMALE, fusionSpeciesForm.formIndex, this.fusionShiny, this.fusionVariant);
-    const fusionBackSpriteKey = fusionSpeciesForm.getSpriteKey(this.getFusionGender(ignoreOveride) === Gender.FEMALE, fusionSpeciesForm.formIndex, this.fusionShiny, this.fusionVariant).replace("pkmn__", "pkmn__back__");
+    const spriteKey = speciesForm.getSpriteKey(
+      this.getGender(ignoreOveride) === Gender.FEMALE,
+      speciesForm.formIndex,
+      this.shiny,
+      this.variant,
+    );
+    const backSpriteKey = speciesForm
+      .getSpriteKey(
+        this.getGender(ignoreOveride) === Gender.FEMALE,
+        speciesForm.formIndex,
+        this.shiny,
+        this.variant,
+      )
+      .replace("pkmn__", "pkmn__back__");
+    const fusionSpriteKey = fusionSpeciesForm.getSpriteKey(
+      this.getFusionGender(ignoreOveride) === Gender.FEMALE,
+      fusionSpeciesForm.formIndex,
+      this.fusionShiny,
+      this.fusionVariant,
+    );
+    const fusionBackSpriteKey = fusionSpeciesForm
+      .getSpriteKey(
+        this.getFusionGender(ignoreOveride) === Gender.FEMALE,
+        fusionSpeciesForm.formIndex,
+        this.fusionShiny,
+        this.fusionVariant,
+      )
+      .replace("pkmn__", "pkmn__back__");
 
     const sourceTexture = globalScene.textures.get(spriteKey);
     const sourceBackTexture = globalScene.textures.get(backSpriteKey);
     const fusionTexture = globalScene.textures.get(fusionSpriteKey);
     const fusionBackTexture = globalScene.textures.get(fusionBackSpriteKey);
 
-    const [ sourceFrame, sourceBackFrame, fusionFrame, fusionBackFrame ] = [ sourceTexture, sourceBackTexture, fusionTexture, fusionBackTexture ].map(texture => texture.frames[texture.firstFrame]);
-    const [ sourceImage, sourceBackImage, fusionImage, fusionBackImage ] = [ sourceTexture, sourceBackTexture, fusionTexture, fusionBackTexture ].map(i => i.getSourceImage() as HTMLImageElement);
+    const [sourceFrame, sourceBackFrame, fusionFrame, fusionBackFrame] = [
+      sourceTexture,
+      sourceBackTexture,
+      fusionTexture,
+      fusionBackTexture,
+    ].map(texture => texture.frames[texture.firstFrame]);
+    const [sourceImage, sourceBackImage, fusionImage, fusionBackImage] = [
+      sourceTexture,
+      sourceBackTexture,
+      fusionTexture,
+      fusionBackTexture,
+    ].map(i => i.getSourceImage() as HTMLImageElement);
 
     const canvas = document.createElement("canvas");
     const backCanvas = document.createElement("canvas");
@@ -3906,43 +5961,70 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
     const spriteColors: number[][] = [];
     const pixelData: Uint8ClampedArray[] = [];
 
-    [ canvas, backCanvas, fusionCanvas, fusionBackCanvas ].forEach((canv: HTMLCanvasElement, c: number) => {
-      const context = canv.getContext("2d");
-      const frame = [ sourceFrame, sourceBackFrame, fusionFrame, fusionBackFrame ][c];
-      canv.width = frame.width;
-      canv.height = frame.height;
+    [canvas, backCanvas, fusionCanvas, fusionBackCanvas].forEach(
+      (canv: HTMLCanvasElement, c: number) => {
+        const context = canv.getContext("2d");
+        const frame = [
+          sourceFrame,
+          sourceBackFrame,
+          fusionFrame,
+          fusionBackFrame,
+        ][c];
+        canv.width = frame.width;
+        canv.height = frame.height;
 
-      if (context) {
-        context.drawImage([ sourceImage, sourceBackImage, fusionImage, fusionBackImage ][c], frame.cutX, frame.cutY, frame.width, frame.height, 0, 0, frame.width, frame.height);
-        const imageData = context.getImageData(frame.cutX, frame.cutY, frame.width, frame.height);
-        pixelData.push(imageData.data);
-      }
-    });
+        if (context) {
+          context.drawImage(
+            [sourceImage, sourceBackImage, fusionImage, fusionBackImage][c],
+            frame.cutX,
+            frame.cutY,
+            frame.width,
+            frame.height,
+            0,
+            0,
+            frame.width,
+            frame.height,
+          );
+          const imageData = context.getImageData(
+            frame.cutX,
+            frame.cutY,
+            frame.width,
+            frame.height,
+          );
+          pixelData.push(imageData.data);
+        }
+      },
+    );
 
     for (let f = 0; f < 2; f++) {
       const variantColors = variantColorCache[!f ? spriteKey : backSpriteKey];
       const variantColorSet = new Map<number, number[]>();
       if (this.shiny && variantColors && variantColors[this.variant]) {
         Object.keys(variantColors[this.variant]).forEach(k => {
-          variantColorSet.set(Utils.rgbaToInt(Array.from(Object.values(Utils.rgbHexToRgba(k)))), Array.from(Object.values(Utils.rgbHexToRgba(variantColors[this.variant][k]))));
+          variantColorSet.set(
+            rgbaToInt(Array.from(Object.values(rgbHexToRgba(k)))),
+            Array.from(
+              Object.values(rgbHexToRgba(variantColors[this.variant][k])),
+            ),
+          );
         });
       }
 
       for (let i = 0; i < pixelData[f].length; i += 4) {
         if (pixelData[f][i + 3]) {
           const pixel = pixelData[f].slice(i, i + 4);
-          let [ r, g, b, a ] = pixel;
+          let [r, g, b, a] = pixel;
           if (variantColors) {
-            const color = Utils.rgbaToInt([ r, g, b, a ]);
+            const color = rgbaToInt([r, g, b, a]);
             if (variantColorSet.has(color)) {
               const mappedPixel = variantColorSet.get(color);
               if (mappedPixel) {
-                [ r, g, b, a ] = mappedPixel;
+                [r, g, b, a] = mappedPixel;
               }
             }
           }
           if (!spriteColors.find(c => c[0] === r && c[1] === g && c[2] === b)) {
-            spriteColors.push([ r, g, b, a ]);
+            spriteColors.push([r, g, b, a]);
           }
         }
       }
@@ -3953,35 +6035,63 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
     const pixelColors: number[] = [];
     for (let f = 0; f < 2; f++) {
       for (let i = 0; i < pixelData[f].length; i += 4) {
-        const total = pixelData[f].slice(i, i + 3).reduce((total: number, value: number) => total + value, 0);
+        const total = pixelData[f]
+          .slice(i, i + 3)
+          .reduce((total: number, value: number) => total + value, 0);
         if (!total) {
           continue;
         }
-        pixelColors.push(argbFromRgba({ r: pixelData[f][i], g: pixelData[f][i + 1], b: pixelData[f][i + 2], a: pixelData[f][i + 3] }));
+        pixelColors.push(
+          argbFromRgba({
+            r: pixelData[f][i],
+            g: pixelData[f][i + 1],
+            b: pixelData[f][i + 2],
+            a: pixelData[f][i + 3],
+          }),
+        );
       }
     }
 
-    const fusionPixelColors : number[] = [];
+    const fusionPixelColors: number[] = [];
     for (let f = 0; f < 2; f++) {
-      const variantColors = variantColorCache[!f ? fusionSpriteKey : fusionBackSpriteKey];
+      const variantColors =
+        variantColorCache[!f ? fusionSpriteKey : fusionBackSpriteKey];
       const variantColorSet = new Map<number, number[]>();
-      if (this.fusionShiny && variantColors && variantColors[this.fusionVariant]) {
-        Object.keys(variantColors[this.fusionVariant]).forEach(k => {
-          variantColorSet.set(Utils.rgbaToInt(Array.from(Object.values(Utils.rgbHexToRgba(k)))), Array.from(Object.values(Utils.rgbHexToRgba(variantColors[this.fusionVariant][k]))));
-        });
+      if (
+        this.fusionShiny &&
+        variantColors &&
+        variantColors[this.fusionVariant]
+      ) {
+        for (const k of Object.keys(variantColors[this.fusionVariant])) {
+          variantColorSet.set(
+            rgbaToInt(Array.from(Object.values(rgbHexToRgba(k)))),
+            Array.from(
+              Object.values(
+                rgbHexToRgba(variantColors[this.fusionVariant][k]),
+              ),
+            ),
+          );
+        }
       }
       for (let i = 0; i < pixelData[2 + f].length; i += 4) {
-        const total = pixelData[2 + f].slice(i, i + 3).reduce((total: number, value: number) => total + value, 0);
+        const total = pixelData[2 + f]
+          .slice(i, i + 3)
+          .reduce((total: number, value: number) => total + value, 0);
         if (!total) {
           continue;
         }
-        let [ r, g, b, a ] = [ pixelData[2 + f][i], pixelData[2 + f][i + 1], pixelData[2 + f][i + 2], pixelData[2 + f][i + 3] ];
+        let [r, g, b, a] = [
+          pixelData[2 + f][i],
+          pixelData[2 + f][i + 1],
+          pixelData[2 + f][i + 2],
+          pixelData[2 + f][i + 3],
+        ];
         if (variantColors) {
-          const color = Utils.rgbaToInt([ r, g, b, a ]);
+          const color = rgbaToInt([r, g, b, a]);
           if (variantColorSet.has(color)) {
             const mappedPixel = variantColorSet.get(color);
             if (mappedPixel) {
-              [ r, g, b, a ] = mappedPixel;
+              [r, g, b, a] = mappedPixel;
             }
           }
         }
@@ -3989,24 +6099,37 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
       }
     }
 
+    if (fusionPixelColors.length === 0) {
+      // ERROR HANDLING IS NOT OPTIONAL BUDDY
+      console.log("Failed to create fusion palette");
+      return;
+    }
+
     let paletteColors: Map<number, number>;
     let fusionPaletteColors: Map<number, number>;
 
     const originalRandom = Math.random;
     Math.random = () => Phaser.Math.RND.realInRange(0, 1);
 
-    globalScene.executeWithSeedOffset(() => {
-      paletteColors = QuantizerCelebi.quantize(pixelColors, 4);
-      fusionPaletteColors = QuantizerCelebi.quantize(fusionPixelColors, 4);
-    }, 0, "This result should not vary");
+    globalScene.executeWithSeedOffset(
+      () => {
+        paletteColors = QuantizerCelebi.quantize(pixelColors, 4);
+        fusionPaletteColors = QuantizerCelebi.quantize(fusionPixelColors, 4);
+      },
+      0,
+      "This result should not vary",
+    );
 
     Math.random = originalRandom;
 
-    paletteColors = paletteColors!; // tell TS compiler that paletteColors is defined!
-    fusionPaletteColors = fusionPaletteColors!; // TS compiler that fusionPaletteColors is defined!
-    const [ palette, fusionPalette ] = [ paletteColors, fusionPaletteColors ]
-      .map(paletteColors => {
-        let keys = Array.from(paletteColors.keys()).sort((a: number, b: number) => paletteColors.get(a)! < paletteColors.get(b)! ? 1 : -1);
+    paletteColors = paletteColors!; // erroneously tell TS compiler that paletteColors is defined!
+    fusionPaletteColors = fusionPaletteColors!; // mischievously misinform TS compiler that fusionPaletteColors is defined!
+    const [palette, fusionPalette] = [paletteColors, fusionPaletteColors].map(
+      paletteColors => {
+        let keys = Array.from(paletteColors.keys()).sort(
+          (a: number, b: number) =>
+            paletteColors.get(a)! < paletteColors.get(b)! ? 1 : -1,
+        );
         let rgbaColors: Map<number, number[]>;
         let hsvColors: Map<number, number[]>;
 
@@ -4016,13 +6139,17 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
           mappedColors.clear();
 
           rgbaColors = keys.reduce((map: Map<number, number[]>, k: number) => {
-            map.set(k, Object.values(rgbaFromArgb(k))); return map;
-          }, new Map<number, number[]>());
-          hsvColors = Array.from(rgbaColors.keys()).reduce((map: Map<number, number[]>, k: number) => {
-            const rgb = rgbaColors.get(k)!.slice(0, 3);
-            map.set(k, Utils.rgbToHsv(rgb[0], rgb[1], rgb[2]));
+            map.set(k, Object.values(rgbaFromArgb(k)));
             return map;
           }, new Map<number, number[]>());
+          hsvColors = Array.from(rgbaColors.keys()).reduce(
+            (map: Map<number, number[]>, k: number) => {
+              const rgb = rgbaColors.get(k)!.slice(0, 3);
+              map.set(k, rgbToHsv(rgb[0], rgb[1], rgb[2]));
+              return map;
+            },
+            new Map<number, number[]>(),
+          );
 
           for (let c = keys.length - 1; c >= 0; c--) {
             const hsv = hsvColors.get(keys[c])!;
@@ -4033,7 +6160,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
                 if (mappedColors.has(keys[c])) {
                   mappedColors.get(keys[c])!.push(keys[c2]);
                 } else {
-                  mappedColors.set(keys[c], [ keys[c2] ]);
+                  mappedColors.set(keys[c], [keys[c2]]);
                 }
                 break;
               }
@@ -4054,7 +6181,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
             }
 
             for (let c = 0; c < 3; c++) {
-              color[c] *= (paletteColors.get(key)! / count);
+              color[c] *= paletteColors.get(key)! / count;
               values.forEach((value: number, i: number) => {
                 if (paletteColors.has(value)) {
                   const valueCount = paletteColors.get(value)!;
@@ -4072,22 +6199,33 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
               }
             }
 
-            paletteColors.set(argbFromRgba({ r: color[0], g: color[1], b: color[2], a: color[3] }), count);
+            paletteColors.set(
+              argbFromRgba({
+                r: color[0],
+                g: color[1],
+                b: color[2],
+                a: color[3],
+              }),
+              count,
+            );
           });
 
-          keys = Array.from(paletteColors.keys()).sort((a: number, b: number) => paletteColors.get(a)! < paletteColors.get(b)! ? 1 : -1);
+          keys = Array.from(paletteColors.keys()).sort(
+            (a: number, b: number) =>
+              paletteColors.get(a)! < paletteColors.get(b)! ? 1 : -1,
+          );
         } while (mappedColors.size);
 
         return keys.map(c => Object.values(rgbaFromArgb(c)));
-      }
-      );
+      },
+    );
 
     const paletteDeltas: number[][] = [];
 
     spriteColors.forEach((sc: number[], i: number) => {
       paletteDeltas.push([]);
       for (let p = 0; p < palette.length; p++) {
-        paletteDeltas[i].push(Utils.deltaRgb(sc, palette[p]));
+        paletteDeltas[i].push(deltaRgb(sc, palette[p]));
       }
     });
 
@@ -4095,21 +6233,33 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
 
     for (let sc = 0; sc < spriteColors.length; sc++) {
       const delta = Math.min(...paletteDeltas[sc]);
-      const paletteIndex = Math.min(paletteDeltas[sc].findIndex(pd => pd === delta), fusionPalette.length - 1);
+      const paletteIndex = Math.min(
+        paletteDeltas[sc].findIndex(pd => pd === delta),
+        fusionPalette.length - 1,
+      );
       if (delta < 255) {
         const ratio = easeFunc(delta / 255);
-        const color = [ 0, 0, 0, fusionSpriteColors[sc][3] ];
+        const color = [0, 0, 0, fusionSpriteColors[sc][3]];
         for (let c = 0; c < 3; c++) {
-          color[c] = Math.round((fusionSpriteColors[sc][c] * ratio) + (fusionPalette[paletteIndex][c] * (1 - ratio)));
+          color[c] = Math.round(
+            fusionSpriteColors[sc][c] * ratio +
+              fusionPalette[paletteIndex][c] * (1 - ratio),
+          );
         }
         fusionSpriteColors[sc] = color;
       }
     }
 
-    [ this.getSprite(), this.getTintSprite() ].filter(s => !!s).map(s => {
-      s.pipelineData[`spriteColors${ignoreOveride && this.summonData?.speciesForm ? "Base" : ""}`] = spriteColors;
-      s.pipelineData[`fusionSpriteColors${ignoreOveride && this.summonData?.speciesForm ? "Base" : ""}`] = fusionSpriteColors;
-    });
+    [this.getSprite(), this.getTintSprite()]
+      .filter(s => !!s)
+      .map(s => {
+        s.pipelineData[
+          `spriteColors${ignoreOveride && this.summonData.speciesForm ? "Base" : ""}`
+        ] = spriteColors;
+        s.pipelineData[
+          `fusionSpriteColors${ignoreOveride && this.summonData.speciesForm ? "Base" : ""}`
+        ] = fusionSpriteColors;
+      });
 
     canvas.remove();
     fusionCanvas.remove();
@@ -4120,17 +6270,17 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
    * <!-- @import "../battle".Battle -->
    * This calls either {@linkcode BattleScene.randBattleSeedInt}({@linkcode range}, {@linkcode min}) in `src/battle-scene.ts`
    * which calls {@linkcode Battle.randSeedInt}({@linkcode range}, {@linkcode min}) in `src/battle.ts`
-   * which calls {@linkcode Utils.randSeedInt randSeedInt}({@linkcode range}, {@linkcode min}) in `src/utils.ts`,
-   * or it directly calls {@linkcode Utils.randSeedInt randSeedInt}({@linkcode range}, {@linkcode min}) in `src/utils.ts` if there is no current battle
+   * which calls {@linkcode randSeedInt randSeedInt}({@linkcode range}, {@linkcode min}) in `src/utils.ts`,
+   * or it directly calls {@linkcode randSeedInt randSeedInt}({@linkcode range}, {@linkcode min}) in `src/utils.ts` if there is no current battle
    *
    * @param range How large of a range of random numbers to choose from. If {@linkcode range} <= 1, returns {@linkcode min}
    * @param min The minimum integer to pick, default `0`
    * @returns A random integer between {@linkcode min} and ({@linkcode min} + {@linkcode range} - 1)
    */
-  randSeedInt(range: number, min: number = 0): number {
+  randBattleSeedInt(range: number, min = 0): number {
     return globalScene.currentBattle
       ? globalScene.randBattleSeedInt(range, min)
-      : Utils.randSeedInt(range, min);
+      : randSeedInt(range, min);
   }
 
   /**
@@ -4139,8 +6289,10 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
    * @param max The maximum integer to generate
    * @returns a random integer between {@linkcode min} and {@linkcode max} inclusive
    */
-  randSeedIntRange(min: number, max: number): number {
-    return this.randSeedInt((max - min) + 1, min);
+  randBattleSeedIntRange(min: number, max: number): number {
+    return globalScene.currentBattle
+      ? globalScene.randBattleSeedInt(max - min + 1, min)
+      : randSeedIntRange(min, max);
   }
 
   /**
@@ -4150,14 +6302,17 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
    * @param hideInfo Indicates if this should also play the animation to hide the Pokemon's
    * info container.
    */
-  leaveField(clearEffects: boolean = true, hideInfo: boolean = true, destroy: boolean = false) {
+  leaveField(clearEffects = true, hideInfo = true, destroy = false) {
     this.resetSprite();
     this.resetTurnData();
-    globalScene.getField(true).filter(p => p !== this).forEach(p => p.removeTagsBySourceId(this.id));
+    globalScene
+      .getField(true)
+      .filter(p => p !== this)
+      .forEach(p => p.removeTagsBySourceId(this.id));
 
     if (clearEffects) {
       this.destroySubstitute();
-      this.resetSummonData(); // this also calls `resetBattleSummonData`
+      this.resetSummonData();
     }
     if (hideInfo) {
       this.hideInfo();
@@ -4165,7 +6320,11 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
     // Trigger abilities that activate upon leaving the field
     applyPreLeaveFieldAbAttrs(PreLeaveFieldAbAttr, this);
     this.setSwitchOutStatus(true);
-    globalScene.triggerPokemonFormChange(this, SpeciesFormChangeActiveTrigger, true);
+    globalScene.triggerPokemonFormChange(
+      this,
+      SpeciesFormChangeActiveTrigger,
+      true,
+    );
     globalScene.field.remove(this, destroy);
   }
 
@@ -4187,7 +6346,10 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
   hasSameAbilityInRootForm(abilityIndex: number): boolean {
     const currentAbilityIndex = this.abilityIndex;
     const rootForm = getPokemonSpecies(this.species.getRootSpeciesId());
-    return rootForm.getAbility(abilityIndex) === rootForm.getAbility(currentAbilityIndex);
+    return (
+      rootForm.getAbility(abilityIndex) ===
+      rootForm.getAbility(currentAbilityIndex)
+    );
   }
 
   /**
@@ -4216,8 +6378,15 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
    * @param forBattle If `false`, do not trigger in-battle effects (such as Unburden) from losing the item. For example, set this to `false` if the Pokemon is giving away the held item for a Mystery Encounter. Default is `true`.
    * @returns `true` if the item was removed successfully, `false` otherwise.
    */
-  public loseHeldItem(heldItem: PokemonHeldItemModifier, forBattle: boolean = true): boolean {
-    if (heldItem.pokemonId === -1 || heldItem.pokemonId === this.id) {
+  public loseHeldItem(
+    heldItem: PokemonHeldItemModifier,
+    forBattle = true,
+  ): boolean {
+    if (heldItem.pokemonId !== -1 && heldItem.pokemonId !== this.id) {
+      return false;
+    }
+    console.log("================================================== LOSING HELD ITEM ==================================================");
+
       heldItem.stackCount--;
       if (heldItem.stackCount <= 0) {
         globalScene.removeModifier(heldItem, !this.isPlayer());
@@ -4225,18 +6394,55 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
       if (forBattle) {
         applyPostItemLostAbAttrs(PostItemLostAbAttr, this, false);
       }
+
       return true;
-    } else {
-      return false;
+  }
+
+  /**
+   * Record a berry being eaten for ability and move triggers.
+   * Only tracks things that proc _every_ time a berry is eaten.
+   * @param berryType The type of berry being eaten.
+   * @param updateHarvest Whether to track the berry for harvest; default `true`.
+   */
+  public recordEatenBerry(berryType: BerryType, updateHarvest: boolean = true) {
+    this.battleData.hasEatenBerry = true;
+    if (updateHarvest) {
+      // Only track for harvest if we actually consumed the berry
+      this.battleData.berriesEaten.push(berryType)
     }
+    this.turnData.berriesEaten.push(berryType);
   }
 }
 
 export class PlayerPokemon extends Pokemon {
   public compatibleTms: Moves[];
 
-  constructor(species: PokemonSpecies, level: number, abilityIndex?: number, formIndex?: number, gender?: Gender, shiny?: boolean, variant?: Variant, ivs?: number[], nature?: Nature, dataSource?: Pokemon | PokemonData) {
-    super(106, 148, species, level, abilityIndex, formIndex, gender, shiny, variant, ivs, nature, dataSource);
+  constructor(
+    species: PokemonSpecies,
+    level: number,
+    abilityIndex?: number,
+    formIndex?: number,
+    gender?: Gender,
+    shiny?: boolean,
+    variant?: Variant,
+    ivs?: number[],
+    nature?: Nature,
+    dataSource?: Pokemon | PokemonData,
+  ) {
+    super(
+      106,
+      148,
+      species,
+      level,
+      abilityIndex,
+      formIndex,
+      gender,
+      shiny,
+      variant,
+      ivs,
+      nature,
+      dataSource,
+    );
 
     if (Overrides.STATUS_OVERRIDE) {
       this.status = new Status(Overrides.STATUS_OVERRIDE, 0, 4);
@@ -4293,16 +6499,23 @@ export class PlayerPokemon extends Pokemon {
 
     const tms = Object.keys(tmSpecies);
     for (const tm of tms) {
-      const moveId = parseInt(tm) as Moves;
+      const moveId = Number.parseInt(tm) as Moves;
       let compatible = false;
       for (const p of tmSpecies[tm]) {
         if (Array.isArray(p)) {
-          const [ pkm, form ] = p;
-          if ((pkm === this.species.speciesId || this.fusionSpecies && pkm === this.fusionSpecies.speciesId) && form === this.getFormKey()) {
+          const [pkm, form] = p;
+          if (
+            (pkm === this.species.speciesId ||
+              (this.fusionSpecies && pkm === this.fusionSpecies.speciesId)) &&
+            form === this.getFormKey()
+          ) {
             compatible = true;
             break;
           }
-        } else if (p === this.species.speciesId || (this.fusionSpecies && p === this.fusionSpecies.speciesId)) {
+        } else if (
+          p === this.species.speciesId ||
+          (this.fusionSpecies && p === this.fusionSpecies.speciesId)
+        ) {
           compatible = true;
           break;
         }
@@ -4317,7 +6530,13 @@ export class PlayerPokemon extends Pokemon {
   }
 
   tryPopulateMoveset(moveset: StarterMoveset): boolean {
-    if (!this.getSpeciesForm().validateStarterMoveset(moveset, globalScene.gameData.starterData[this.species.getRootSpeciesId()].eggMoves)) {
+    if (
+      !this.getSpeciesForm().validateStarterMoveset(
+        moveset,
+        globalScene.gameData.starterData[this.species.getRootSpeciesId()]
+          .eggMoves,
+      )
+    ) {
       return false;
     }
 
@@ -4337,27 +6556,65 @@ export class PlayerPokemon extends Pokemon {
     return new Promise(resolve => {
       this.leaveField(switchType === SwitchType.SWITCH);
 
-      globalScene.ui.setMode(Mode.PARTY, PartyUiMode.FAINT_SWITCH, this.getFieldIndex(), (slotIndex: number, option: PartyOption) => {
-        if (slotIndex >= globalScene.currentBattle.getBattlerCount() && slotIndex < 6) {
-          globalScene.prependToPhase(new SwitchSummonPhase(switchType, this.getFieldIndex(), slotIndex, false), MoveEndPhase);
-        }
-        globalScene.ui.setMode(Mode.MESSAGE).then(resolve);
-      }, PartyUiHandler.FilterNonFainted);
+      globalScene.ui.setMode(
+        UiMode.PARTY,
+        PartyUiMode.FAINT_SWITCH,
+        this.getFieldIndex(),
+        (slotIndex: number, option: PartyOption) => {
+          if (
+            slotIndex >= globalScene.currentBattle.getBattlerCount() &&
+            slotIndex < 6
+          ) {
+            globalScene.prependToPhase(
+              new SwitchSummonPhase(
+                switchType,
+                this.getFieldIndex(),
+                slotIndex,
+                false,
+              ),
+              MoveEndPhase,
+            );
+          }
+          globalScene.ui.setMode(UiMode.MESSAGE).then(resolve);
+        },
+        PartyUiHandler.FilterNonFainted,
+      );
     });
   }
 
   addFriendship(friendship: number): void {
     if (friendship > 0) {
       const starterSpeciesId = this.species.getRootSpeciesId();
-      const fusionStarterSpeciesId = this.isFusion() && this.fusionSpecies ? this.fusionSpecies.getRootSpeciesId() : 0;
+      const fusionStarterSpeciesId =
+        this.isFusion() && this.fusionSpecies
+          ? this.fusionSpecies.getRootSpeciesId()
+          : 0;
       const starterData = [
         globalScene.gameData.starterData[starterSpeciesId],
-        fusionStarterSpeciesId ? globalScene.gameData.starterData[fusionStarterSpeciesId] : null
+        fusionStarterSpeciesId
+          ? globalScene.gameData.starterData[fusionStarterSpeciesId]
+          : null,
       ].filter(d => !!d);
-      const amount = new Utils.NumberHolder(friendship);
-      globalScene.applyModifier(PokemonFriendshipBoosterModifier, true, this, amount);
-      const candyFriendshipMultiplier = globalScene.eventManager.getClassicFriendshipMultiplier();
-      const starterAmount = new Utils.NumberHolder(Math.floor(amount.value * (globalScene.gameMode.isClassic ? candyFriendshipMultiplier : 1) / (fusionStarterSpeciesId ? 2 : 1)));
+      const amount = new NumberHolder(friendship);
+      globalScene.applyModifier(
+        PokemonFriendshipBoosterModifier,
+        true,
+        this,
+        amount,
+      );
+      const candyFriendshipMultiplier = globalScene.gameMode.isClassic
+        ? timedEventManager.getClassicFriendshipMultiplier()
+        : 1;
+      const fusionReduction = fusionStarterSpeciesId
+        ? timedEventManager.areFusionsBoosted()
+          ? 1.5 // Divide candy gain for fusions by 1.5 during events
+          : 2 // 2 for fusions outside events
+        : 1; // 1 for non-fused mons
+      const starterAmount = new NumberHolder(
+        Math.floor(
+          (amount.value * candyFriendshipMultiplier) / fusionReduction,
+        ),
+      );
 
       // Add friendship to this PlayerPokemon
       this.friendship = Math.min(this.friendship + amount.value, 255);
@@ -4366,9 +6623,14 @@ export class PlayerPokemon extends Pokemon {
       }
       // Add to candy progress for this mon's starter species and its fused species (if it has one)
       starterData.forEach((sd: StarterDataEntry, i: number) => {
-        const speciesId = !i ? starterSpeciesId : fusionStarterSpeciesId as Species;
+        const speciesId = !i
+          ? starterSpeciesId
+          : (fusionStarterSpeciesId as Species);
         sd.friendship = (sd.friendship || 0) + starterAmount.value;
-        if (sd.friendship >= getStarterValueFriendshipCap(speciesStarterCosts[speciesId])) {
+        if (
+          sd.friendship >=
+          getStarterValueFriendshipCap(speciesStarterCosts[speciesId])
+        ) {
           globalScene.gameData.addStarterCandy(getPokemonSpecies(speciesId), 1);
           sd.friendship = 0;
         }
@@ -4378,45 +6640,10 @@ export class PlayerPokemon extends Pokemon {
       this.friendship = Math.max(this.friendship + friendship, 0);
     }
   }
-  /**
-   * Handles Revival Blessing when used by player.
-   * @returns Promise to revive a pokemon.
-   * @see {@linkcode RevivalBlessingAttr}
-   */
-  revivalBlessing(): Promise<void> {
-    return new Promise(resolve => {
-      globalScene.ui.setMode(Mode.PARTY, PartyUiMode.REVIVAL_BLESSING, this.getFieldIndex(), (slotIndex:number, option: PartyOption) => {
-        if (slotIndex >= 0 && slotIndex < 6) {
-          const pokemon = globalScene.getPlayerParty()[slotIndex];
-          if (!pokemon || !pokemon.isFainted()) {
-            resolve();
-          }
 
-          pokemon.resetTurnData();
-          pokemon.resetStatus();
-          pokemon.heal(Math.min(Utils.toDmgValue(0.5 * pokemon.getMaxHp()), pokemon.getMaxHp()));
-          globalScene.queueMessage(i18next.t("moveTriggers:revivalBlessing", { pokemonName: pokemon.name }), 0, true);
-
-          if (globalScene.currentBattle.double && globalScene.getPlayerParty().length > 1) {
-            const allyPokemon = this.getAlly();
-            if (slotIndex <= 1) {
-              // Revived ally pokemon
-              globalScene.unshiftPhase(new SwitchSummonPhase(SwitchType.SWITCH, pokemon.getFieldIndex(), slotIndex, false, true));
-              globalScene.unshiftPhase(new ToggleDoublePositionPhase(true));
-            } else if (allyPokemon.isFainted()) {
-              // Revived party pokemon, and ally pokemon is fainted
-              globalScene.unshiftPhase(new SwitchSummonPhase(SwitchType.SWITCH, allyPokemon.getFieldIndex(), slotIndex, false, true));
-              globalScene.unshiftPhase(new ToggleDoublePositionPhase(true));
-            }
-          }
-
-        }
-        globalScene.ui.setMode(Mode.MESSAGE).then(() => resolve());
-      }, PartyUiHandler.FilterFainted);
-    });
-  }
-
-  getPossibleEvolution(evolution: SpeciesFormEvolution | null): Promise<Pokemon> {
+  getPossibleEvolution(
+    evolution: SpeciesFormEvolution | null,
+  ): Promise<Pokemon> {
     if (!evolution) {
       return new Promise(resolve => resolve(this));
     }
@@ -4428,19 +6655,60 @@ export class PlayerPokemon extends Pokemon {
         const originalFusionSpecies = this.fusionSpecies;
         const originalFusionFormIndex = this.fusionFormIndex;
         this.fusionSpecies = evolutionSpecies;
-        this.fusionFormIndex = evolution.evoFormKey !== null ? Math.max(evolutionSpecies.forms.findIndex(f => f.formKey === evolution.evoFormKey), 0) : this.fusionFormIndex;
-        ret = globalScene.addPlayerPokemon(this.species, this.level, this.abilityIndex, this.formIndex, this.gender, this.shiny, this.variant, this.ivs, this.nature, this);
+        this.fusionFormIndex =
+          evolution.evoFormKey !== null
+            ? Math.max(
+                evolutionSpecies.forms.findIndex(
+                  f => f.formKey === evolution.evoFormKey,
+                ),
+                0,
+              )
+            : this.fusionFormIndex;
+        ret = globalScene.addPlayerPokemon(
+          this.species,
+          this.level,
+          this.abilityIndex,
+          this.formIndex,
+          this.gender,
+          this.shiny,
+          this.variant,
+          this.ivs,
+          this.nature,
+          this,
+        );
         this.fusionSpecies = originalFusionSpecies;
         this.fusionFormIndex = originalFusionFormIndex;
       } else {
-        const formIndex = evolution.evoFormKey !== null && !isFusion ? Math.max(evolutionSpecies.forms.findIndex(f => f.formKey === evolution.evoFormKey), 0) : this.formIndex;
-        ret = globalScene.addPlayerPokemon(!isFusion ? evolutionSpecies : this.species, this.level, this.abilityIndex, formIndex, this.gender, this.shiny, this.variant, this.ivs, this.nature, this);
+        const formIndex =
+          evolution.evoFormKey !== null && !isFusion
+            ? Math.max(
+                evolutionSpecies.forms.findIndex(
+                  f => f.formKey === evolution.evoFormKey,
+                ),
+                0,
+              )
+            : this.formIndex;
+        ret = globalScene.addPlayerPokemon(
+          !isFusion ? evolutionSpecies : this.species,
+          this.level,
+          this.abilityIndex,
+          formIndex,
+          this.gender,
+          this.shiny,
+          this.variant,
+          this.ivs,
+          this.nature,
+          this,
+        );
       }
       ret.loadAssets().then(() => resolve(ret));
     });
   }
 
-  evolve(evolution: SpeciesFormEvolution | null, preEvolution: PokemonSpeciesForm): Promise<void> {
+  evolve(
+    evolution: SpeciesFormEvolution | null,
+    preEvolution: PokemonSpeciesForm,
+  ): Promise<void> {
     if (!evolution) {
       return new Promise(resolve => resolve());
     }
@@ -4455,7 +6723,13 @@ export class PlayerPokemon extends Pokemon {
         this.fusionSpecies = getPokemonSpecies(evolution.speciesId);
       }
       if (evolution.preFormKey !== null) {
-        const formIndex = Math.max((!isFusion || !this.fusionSpecies ? this.species : this.fusionSpecies).forms.findIndex(f => f.formKey === evolution.evoFormKey), 0);
+        const formIndex = Math.max(
+          (!isFusion || !this.fusionSpecies
+            ? this.species
+            : this.fusionSpecies
+          ).forms.findIndex(f => f.formKey === evolution.evoFormKey),
+          0,
+        );
         if (!isFusion) {
           this.formIndex = formIndex;
         } else {
@@ -4466,25 +6740,39 @@ export class PlayerPokemon extends Pokemon {
       if (!isFusion) {
         const abilityCount = this.getSpeciesForm().getAbilityCount();
         const preEvoAbilityCount = preEvolution.getAbilityCount();
-        if ([ 0, 1, 2 ].includes(this.abilityIndex)) {
+        if ([0, 1, 2].includes(this.abilityIndex)) {
           // Handles cases where a Pokemon with 3 abilities evolves into a Pokemon with 2 abilities (ie: Eevee -> any Eeveelution)
-          if (this.abilityIndex === 2 && preEvoAbilityCount === 3 && abilityCount === 2) {
+          if (
+            this.abilityIndex === 2 &&
+            preEvoAbilityCount === 3 &&
+            abilityCount === 2
+          ) {
             this.abilityIndex = 1;
           }
-        } else { // Prevent pokemon with an illegal ability value from breaking things
-          console.warn("this.abilityIndex is somehow an illegal value, please report this");
+        } else {
+          // Prevent pokemon with an illegal ability value from breaking things
+          console.warn(
+            "this.abilityIndex is somehow an illegal value, please report this",
+          );
           console.warn(this.abilityIndex);
           this.abilityIndex = 0;
         }
-      } else { // Do the same as above, but for fusions
+      } else {
+        // Do the same as above, but for fusions
         const abilityCount = this.getFusionSpeciesForm().getAbilityCount();
         const preEvoAbilityCount = preEvolution.getAbilityCount();
-        if ([ 0, 1, 2 ].includes(this.fusionAbilityIndex)) {
-          if (this.fusionAbilityIndex === 2 && preEvoAbilityCount === 3 && abilityCount === 2) {
+        if ([0, 1, 2].includes(this.fusionAbilityIndex)) {
+          if (
+            this.fusionAbilityIndex === 2 &&
+            preEvoAbilityCount === 3 &&
+            abilityCount === 2
+          ) {
             this.fusionAbilityIndex = 1;
           }
         } else {
-          console.warn("this.fusionAbilityIndex is somehow an illegal value, please report this");
+          console.warn(
+            "this.fusionAbilityIndex is somehow an illegal value, please report this",
+          );
           console.warn(this.fusionAbilityIndex);
           this.fusionAbilityIndex = 0;
         }
@@ -4498,15 +6786,22 @@ export class PlayerPokemon extends Pokemon {
         });
       };
       if (preEvolution.speciesId === Species.GIMMIGHOUL) {
-        const evotracker = this.getHeldItems().filter(m => m instanceof EvoTrackerModifier)[0] ?? null;
+        const evotracker =
+          this.getHeldItems().filter(m => m instanceof EvoTrackerModifier)[0] ??
+          null;
         if (evotracker) {
           globalScene.removeModifier(evotracker);
         }
       }
       if (!globalScene.gameMode.isDaily || this.metBiome > -1) {
-        globalScene.gameData.updateSpeciesDexIvs(this.species.speciesId, this.ivs);
+        globalScene.gameData.updateSpeciesDexIvs(
+          this.species.speciesId,
+          this.ivs,
+        );
         globalScene.gameData.setPokemonSeen(this, false);
-        globalScene.gameData.setPokemonCaught(this, false).then(() => updateAndResolve());
+        globalScene.gameData
+          .setPokemonCaught(this, false)
+          .then(() => updateAndResolve());
       } else {
         updateAndResolve();
       }
@@ -4516,12 +6811,25 @@ export class PlayerPokemon extends Pokemon {
   private handleSpecialEvolutions(evolution: SpeciesFormEvolution) {
     const isFusion = evolution instanceof FusionSpeciesFormEvolution;
 
-    const evoSpecies = (!isFusion ? this.species : this.fusionSpecies);
-    if (evoSpecies?.speciesId === Species.NINCADA && evolution.speciesId === Species.NINJASK) {
+    const evoSpecies = !isFusion ? this.species : this.fusionSpecies;
+    if (
+      evoSpecies?.speciesId === Species.NINCADA &&
+      evolution.speciesId === Species.NINJASK
+    ) {
       const newEvolution = pokemonEvolutions[evoSpecies.speciesId][1];
 
       if (newEvolution.condition?.predicate(this)) {
-        const newPokemon = globalScene.addPlayerPokemon(this.species, this.level, this.abilityIndex, this.formIndex, undefined, this.shiny, this.variant, this.ivs, this.nature);
+        const newPokemon = globalScene.addPlayerPokemon(
+          this.species,
+          this.level,
+          this.abilityIndex,
+          this.formIndex,
+          undefined,
+          this.shiny,
+          this.variant,
+          this.ivs,
+          this.nature,
+        );
         newPokemon.passive = this.passive;
         newPokemon.moveset = this.moveset.slice();
         newPokemon.moveset = this.copyMoveset();
@@ -4538,12 +6846,21 @@ export class PlayerPokemon extends Pokemon {
         newPokemon.fusionVariant = this.fusionVariant;
         newPokemon.fusionGender = this.fusionGender;
         newPokemon.fusionLuck = this.fusionLuck;
+        newPokemon.fusionTeraType = this.fusionTeraType;
         newPokemon.usedTMs = this.usedTMs;
+        newPokemon.evoCounter = this.evoCounter;
 
         globalScene.getPlayerParty().push(newPokemon);
-        newPokemon.evolve((!isFusion ? newEvolution : new FusionSpeciesFormEvolution(this.id, newEvolution)), evoSpecies);
-        const modifiers = globalScene.findModifiers(m => m instanceof PokemonHeldItemModifier
-          && m.pokemonId === this.id, true) as PokemonHeldItemModifier[];
+        newPokemon.evolve(
+          !isFusion
+            ? newEvolution
+            : new FusionSpeciesFormEvolution(this.id, newEvolution),
+          evoSpecies,
+        );
+        const modifiers = globalScene.findModifiers(
+          m => m instanceof PokemonHeldItemModifier && m.pokemonId === this.id,
+          true,
+        ) as PokemonHeldItemModifier[];
         modifiers.forEach(m => {
           const clonedModifier = m.clone() as PokemonHeldItemModifier;
           clonedModifier.pokemonId = newPokemon.id;
@@ -4556,18 +6873,36 @@ export class PlayerPokemon extends Pokemon {
 
   getPossibleForm(formChange: SpeciesFormChange): Promise<Pokemon> {
     return new Promise(resolve => {
-      const formIndex = Math.max(this.species.forms.findIndex(f => f.formKey === formChange.formKey), 0);
-      const ret = globalScene.addPlayerPokemon(this.species, this.level, this.abilityIndex, formIndex, this.gender, this.shiny, this.variant, this.ivs, this.nature, this);
+      const formIndex = Math.max(
+        this.species.forms.findIndex(f => f.formKey === formChange.formKey),
+        0,
+      );
+      const ret = globalScene.addPlayerPokemon(
+        this.species,
+        this.level,
+        this.abilityIndex,
+        formIndex,
+        this.gender,
+        this.shiny,
+        this.variant,
+        this.ivs,
+        this.nature,
+        this,
+      );
       ret.loadAssets().then(() => resolve(ret));
     });
   }
 
   changeForm(formChange: SpeciesFormChange): Promise<void> {
     return new Promise(resolve => {
-      this.formIndex = Math.max(this.species.forms.findIndex(f => f.formKey === formChange.formKey), 0);
+      this.formIndex = Math.max(
+        this.species.forms.findIndex(f => f.formKey === formChange.formKey),
+        0,
+      );
       this.generateName();
       const abilityCount = this.getSpeciesForm().getAbilityCount();
-      if (this.abilityIndex >= abilityCount) { // Shouldn't happen
+      if (this.abilityIndex >= abilityCount) {
+        // Shouldn't happen
         this.abilityIndex = abilityCount - 1;
       }
 
@@ -4582,7 +6917,9 @@ export class PlayerPokemon extends Pokemon {
       };
       if (!globalScene.gameMode.isDaily || this.metBiome > -1) {
         globalScene.gameData.setPokemonSeen(this, false);
-        globalScene.gameData.setPokemonCaught(this, false).then(() => updateAndResolve());
+        globalScene.gameData
+          .setPokemonCaught(this, false)
+          .then(() => updateAndResolve());
       } else {
         updateAndResolve();
       }
@@ -4595,70 +6932,83 @@ export class PlayerPokemon extends Pokemon {
   }
 
   /**
-  * Returns a Promise to fuse two PlayerPokemon together
-  * @param pokemon The PlayerPokemon to fuse to this one
-  */
-  fuse(pokemon: PlayerPokemon): Promise<void> {
-    return new Promise(resolve => {
-      this.fusionSpecies = pokemon.species;
-      this.fusionFormIndex = pokemon.formIndex;
-      this.fusionAbilityIndex = pokemon.abilityIndex;
-      this.fusionShiny = pokemon.shiny;
-      this.fusionVariant = pokemon.variant;
-      this.fusionGender = pokemon.gender;
-      this.fusionLuck = pokemon.luck;
-      this.fusionCustomPokemonData = pokemon.customPokemonData;
-      if ((pokemon.pauseEvolutions) || (this.pauseEvolutions)) {
-        this.pauseEvolutions = true;
-      }
+   * Returns a Promise to fuse two PlayerPokemon together
+   * @param pokemon The PlayerPokemon to fuse to this one
+   */
+  fuse(pokemon: PlayerPokemon): void {
+    this.fusionSpecies = pokemon.species;
+    this.fusionFormIndex = pokemon.formIndex;
+    this.fusionAbilityIndex = pokemon.abilityIndex;
+    this.fusionShiny = pokemon.shiny;
+    this.fusionVariant = pokemon.variant;
+    this.fusionGender = pokemon.gender;
+    this.fusionLuck = pokemon.luck;
+    this.fusionCustomPokemonData = pokemon.customPokemonData;
+    this.evoCounter = Math.max(pokemon.evoCounter, this.evoCounter);
+    if (pokemon.pauseEvolutions || this.pauseEvolutions) {
+      this.pauseEvolutions = true;
+    }
 
-      globalScene.validateAchv(achvs.SPLICE);
-      globalScene.gameData.gameStats.pokemonFused++;
+    globalScene.validateAchv(achvs.SPLICE);
+    globalScene.gameData.gameStats.pokemonFused++;
 
-      // Store the average HP% that each Pokemon has
-      const maxHp = this.getMaxHp();
-      const newHpPercent = ((pokemon.hp / pokemon.getMaxHp()) + (this.hp / maxHp)) / 2;
+    // Store the average HP% that each Pokemon has
+    const maxHp = this.getMaxHp();
+    const newHpPercent =
+      (pokemon.hp / pokemon.getMaxHp() + this.hp / maxHp) / 2;
 
-      this.generateName();
-      this.calculateStats();
+    this.generateName();
+    this.calculateStats();
 
-      // Set this Pokemon's HP to the average % of both fusion components
-      this.hp = Math.round(maxHp * newHpPercent);
-      if (!this.isFainted()) {
-        // If this Pokemon hasn't fainted, make sure the HP wasn't set over the new maximum
-        this.hp = Math.min(this.hp, maxHp);
-        this.status = getRandomStatus(this.status, pokemon.status); // Get a random valid status between the two
-      } else if (!pokemon.isFainted()) {
-        // If this Pokemon fainted but the other hasn't, make sure the HP wasn't set to zero
-        this.hp = Math.max(this.hp, 1);
-        this.status = pokemon.status; // Inherit the other Pokemon's status
-      }
+    // Set this Pokemon's HP to the average % of both fusion components
+    this.hp = Math.round(maxHp * newHpPercent);
+    if (!this.isFainted()) {
+      // If this Pokemon hasn't fainted, make sure the HP wasn't set over the new maximum
+      this.hp = Math.min(this.hp, maxHp);
+      this.status = getRandomStatus(this.status, pokemon.status); // Get a random valid status between the two
+    } else if (!pokemon.isFainted()) {
+      // If this Pokemon fainted but the other hasn't, make sure the HP wasn't set to zero
+      this.hp = Math.max(this.hp, 1);
+      this.status = pokemon.status; // Inherit the other Pokemon's status
+    }
 
-      this.generateCompatibleTms();
-      this.updateInfo(true);
-      const fusedPartyMemberIndex = globalScene.getPlayerParty().indexOf(pokemon);
-      let partyMemberIndex = globalScene.getPlayerParty().indexOf(this);
-      if (partyMemberIndex > fusedPartyMemberIndex) {
-        partyMemberIndex--;
-      }
-      const fusedPartyMemberHeldModifiers = globalScene.findModifiers(m => m instanceof PokemonHeldItemModifier
-        && m.pokemonId === pokemon.id, true) as PokemonHeldItemModifier[];
-      const transferModifiers: Promise<boolean>[] = [];
-      for (const modifier of fusedPartyMemberHeldModifiers) {
-        transferModifiers.push(globalScene.tryTransferHeldItemModifier(modifier, this, false, modifier.getStackCount(), true, true, false));
-      }
-      Promise.allSettled(transferModifiers).then(() => {
-        globalScene.updateModifiers(true, true).then(() => {
-          globalScene.removePartyMemberModifiers(fusedPartyMemberIndex);
-          globalScene.getPlayerParty().splice(fusedPartyMemberIndex, 1)[0];
-          const newPartyMemberIndex = globalScene.getPlayerParty().indexOf(this);
-          pokemon.getMoveset(true).map((m: PokemonMove) => globalScene.unshiftPhase(new LearnMovePhase(newPartyMemberIndex, m.getMove().id)));
-          pokemon.destroy();
-          this.updateFusionPalette();
-          resolve();
-        });
-      });
-    });
+    this.generateCompatibleTms();
+    this.updateInfo(true);
+    const fusedPartyMemberIndex = globalScene.getPlayerParty().indexOf(pokemon);
+    let partyMemberIndex = globalScene.getPlayerParty().indexOf(this);
+    if (partyMemberIndex > fusedPartyMemberIndex) {
+      partyMemberIndex--;
+    }
+
+    // combine the two mons' held items
+    const fusedPartyMemberHeldModifiers = globalScene.findModifiers(
+      m => m instanceof PokemonHeldItemModifier && m.pokemonId === pokemon.id,
+      true,
+    ) as PokemonHeldItemModifier[];
+    for (const modifier of fusedPartyMemberHeldModifiers) {
+      globalScene.tryTransferHeldItemModifier(
+        modifier,
+        this,
+        false,
+        modifier.getStackCount(),
+        true,
+        true,
+        false,
+      );
+    }
+    globalScene.updateModifiers(true, true);
+    globalScene.removePartyMemberModifiers(fusedPartyMemberIndex);
+    globalScene.getPlayerParty().splice(fusedPartyMemberIndex, 1)[0];
+    const newPartyMemberIndex = globalScene.getPlayerParty().indexOf(this);
+    pokemon
+      .getMoveset(true)
+      .map((m: PokemonMove) =>
+        globalScene.unshiftPhase(
+          new LearnMovePhase(newPartyMemberIndex, m.getMove().id),
+        ),
+      );
+    pokemon.destroy();
+    this.updateFusionPalette();
   }
 
   unfuse(): Promise<void> {
@@ -4672,12 +7022,9 @@ export class PlayerPokemon extends Pokemon {
 
   /** Returns a deep copy of this Pokemon's moveset array */
   copyMoveset(): PokemonMove[] {
-    const newMoveset : PokemonMove[] = [];
-    this.moveset.forEach((move) => {
-      // TODO: refactor `moveset` to not accept `null`s
-      if (move) {
-        newMoveset.push(new PokemonMove(move.moveId, 0, move.ppUp, move.virtual, move.maxPpOverride));
-      }
+    const newMoveset: PokemonMove[] = [];
+    this.moveset.forEach(move => {
+      newMoveset.push(new PokemonMove(move.moveId, 0, move.ppUp, move.virtual, move.maxPpOverride));
     });
 
     return newMoveset;
@@ -4689,15 +7036,35 @@ export class EnemyPokemon extends Pokemon {
   public aiType: AiType;
   public bossSegments: number;
   public bossSegmentIndex: number;
+  public initialTeamIndex: number;
   /** To indicate if the instance was populated with a dataSource -> e.g. loaded & populated from session data */
   public readonly isPopulatedFromDataSource: boolean;
 
-  constructor(species: PokemonSpecies, level: number, trainerSlot: TrainerSlot, boss: boolean, shinyLock: boolean = false, dataSource?: PokemonData) {
-    super(236, 84, species, level, dataSource?.abilityIndex, dataSource?.formIndex, dataSource?.gender,
-      (!shinyLock && dataSource) ? dataSource.shiny : false, (!shinyLock && dataSource) ? dataSource.variant : undefined,
-      undefined, dataSource ? dataSource.nature : undefined, dataSource);
+  constructor(
+    species: PokemonSpecies,
+    level: number,
+    trainerSlot: TrainerSlot,
+    boss: boolean,
+    shinyLock = false,
+    dataSource?: PokemonData,
+  ) {
+    super(
+      236,
+      84,
+      species,
+      level,
+      dataSource?.abilityIndex,
+      dataSource?.formIndex,
+      dataSource?.gender,
+      !shinyLock && dataSource ? dataSource.shiny : false,
+      !shinyLock && dataSource ? dataSource.variant : undefined,
+      undefined,
+      dataSource ? dataSource.nature : undefined,
+      dataSource,
+    );
 
     this.trainerSlot = trainerSlot;
+    this.initialTeamIndex = globalScene.currentBattle?.enemyParty.length ?? 0;
     this.isPopulatedFromDataSource = !!dataSource; // if a dataSource is provided, then it was populated from dataSource
     if (boss) {
       this.setBoss(boss, dataSource?.bossSegments);
@@ -4714,16 +7081,15 @@ export class EnemyPokemon extends Pokemon {
     const speciesId = this.species.speciesId;
 
     if (
-      speciesId in Overrides.OPP_FORM_OVERRIDES
-      && Overrides.OPP_FORM_OVERRIDES[speciesId]
-      && this.species.forms[Overrides.OPP_FORM_OVERRIDES[speciesId]]
+      speciesId in Overrides.OPP_FORM_OVERRIDES &&
+      !isNullOrUndefined(Overrides.OPP_FORM_OVERRIDES[speciesId]) &&
+      this.species.forms[Overrides.OPP_FORM_OVERRIDES[speciesId]]
     ) {
-      this.formIndex = Overrides.OPP_FORM_OVERRIDES[speciesId] ?? 0;
+      this.formIndex = Overrides.OPP_FORM_OVERRIDES[speciesId];
     }
 
     if (!dataSource) {
       this.generateAndPopulateMoveset();
-
       if (shinyLock || Overrides.OPP_SHINY_OVERRIDE === false) {
         this.shiny = false;
       } else {
@@ -4742,27 +7108,43 @@ export class EnemyPokemon extends Pokemon {
         }
       }
 
-      this.luck = (this.shiny ? this.variant + 1 : 0) + (this.fusionShiny ? this.fusionVariant + 1 : 0);
+      this.luck =
+        (this.shiny ? this.variant + 1 : 0) +
+        (this.fusionShiny ? this.fusionVariant + 1 : 0);
 
       let prevolution: Species;
       let speciesId = species.speciesId;
       while ((prevolution = pokemonPrevolutions[speciesId])) {
-        const evolution = pokemonEvolutions[prevolution].find(pe => pe.speciesId === speciesId && (!pe.evoFormKey || pe.evoFormKey === this.getFormKey()));
+        const evolution = pokemonEvolutions[prevolution].find(
+          pe =>
+            pe.speciesId === speciesId &&
+            (!pe.evoFormKey || pe.evoFormKey === this.getFormKey()),
+        );
         if (evolution?.condition?.enforceFunc) {
           evolution.condition.enforceFunc(this);
         }
         speciesId = prevolution;
       }
+
+      if (this.hasTrainer() && globalScene.currentBattle) {
+        const { waveIndex } = globalScene.currentBattle;
+        const ivs: number[] = [];
+        while (ivs.length < 6) {
+          ivs.push(randSeedIntRange(Math.floor(waveIndex / 10), 31));
+        }
+        this.ivs = ivs;
+      }
     }
 
-    this.aiType = boss || this.hasTrainer() ? AiType.SMART : AiType.SMART_RANDOM;
+    this.aiType =
+      boss || this.hasTrainer() ? AiType.SMART : AiType.SMART_RANDOM;
   }
 
   initBattleInfo(): void {
     if (!this.battleInfo) {
       this.battleInfo = new EnemyBattleInfo();
-      this.battleInfo.updateBossSegments(this);
       this.battleInfo.initInfo(this);
+      this.battleInfo.updateBossSegments(this);
     } else {
       this.battleInfo.updateBossSegments(this);
     }
@@ -4775,9 +7157,16 @@ export class EnemyPokemon extends Pokemon {
    * @param boss if the pokemon is a boss
    * @param bossSegments amount of boss segments (health-bar segments)
    */
-  setBoss(boss: boolean = true, bossSegments: number = 0): void {
+  setBoss(boss = true, bossSegments = 0): void {
     if (boss) {
-      this.bossSegments = bossSegments || globalScene.getEncounterBossSegments(globalScene.currentBattle.waveIndex, this.level, this.species, true);
+      this.bossSegments =
+        bossSegments ||
+        globalScene.getEncounterBossSegments(
+          globalScene.currentBattle.waveIndex,
+          this.level,
+          this.species,
+          true,
+        );
       this.bossSegmentIndex = this.bossSegments - 1;
     } else {
       this.bossSegments = 0;
@@ -4787,28 +7176,28 @@ export class EnemyPokemon extends Pokemon {
 
   generateAndPopulateMoveset(formIndex?: number): void {
     switch (true) {
-      case (this.species.speciesId === Species.SMEARGLE):
+      case this.species.speciesId === Species.SMEARGLE:
         this.moveset = [
           new PokemonMove(Moves.SKETCH),
           new PokemonMove(Moves.SKETCH),
           new PokemonMove(Moves.SKETCH),
-          new PokemonMove(Moves.SKETCH)
+          new PokemonMove(Moves.SKETCH),
         ];
         break;
-      case (this.species.speciesId === Species.ETERNATUS):
+      case this.species.speciesId === Species.ETERNATUS:
         this.moveset = (formIndex !== undefined ? formIndex : this.formIndex)
           ? [
-            new PokemonMove(Moves.DYNAMAX_CANNON),
-            new PokemonMove(Moves.CROSS_POISON),
-            new PokemonMove(Moves.FLAMETHROWER),
-            new PokemonMove(Moves.RECOVER, 0, -4)
-          ]
+              new PokemonMove(Moves.DYNAMAX_CANNON),
+              new PokemonMove(Moves.CROSS_POISON),
+              new PokemonMove(Moves.FLAMETHROWER),
+              new PokemonMove(Moves.RECOVER, 0, -4),
+            ]
           : [
-            new PokemonMove(Moves.ETERNABEAM),
-            new PokemonMove(Moves.SLUDGE_BOMB),
-            new PokemonMove(Moves.FLAMETHROWER),
-            new PokemonMove(Moves.COSMIC_POWER)
-          ];
+              new PokemonMove(Moves.ETERNABEAM),
+              new PokemonMove(Moves.SLUDGE_BOMB),
+              new PokemonMove(Moves.FLAMETHROWER),
+              new PokemonMove(Moves.COSMIC_POWER),
+            ];
         if (globalScene.gameMode.hasChallenge(Challenges.INVERSE_BATTLE)) {
           this.moveset[2] = new PokemonMove(Moves.THUNDERBOLT);
         }
@@ -4830,8 +7219,8 @@ export class EnemyPokemon extends Pokemon {
     if (moveQueue.length !== 0) {
       const queuedMove = moveQueue[0];
       if (queuedMove) {
-        const moveIndex = this.getMoveset().findIndex(m => m?.moveId === queuedMove.move);
-        if ((moveIndex > -1 && this.getMoveset()[moveIndex]!.isUsable(this, queuedMove.ignorePP)) || queuedMove.virtual) {
+        const moveIndex = this.getMoveset().findIndex(m => m.moveId === queuedMove.move);
+        if ((moveIndex > -1 && this.getMoveset()[moveIndex].isUsable(this, queuedMove.ignorePP)) || queuedMove.virtual) {
           return queuedMove;
         } else {
           this.getMoveQueue().shift();
@@ -4841,32 +7230,35 @@ export class EnemyPokemon extends Pokemon {
     }
 
     // Filter out any moves this Pokemon cannot use
-    let movePool = this.getMoveset().filter(m => m?.isUsable(this));
+    let movePool = this.getMoveset().filter(m => m.isUsable(this));
     // If no moves are left, use Struggle. Otherwise, continue with move selection
     if (movePool.length) {
       // If there's only 1 move in the move pool, use it.
       if (movePool.length === 1) {
-        return { move: movePool[0]!.moveId, targets: this.getNextTargets(movePool[0]!.moveId) }; // TODO: are the bangs correct?
+        return { move: movePool[0].moveId, targets: this.getNextTargets(movePool[0].moveId) };
       }
       // If a move is forced because of Encore, use it.
       const encoreTag = this.getTag(EncoreTag) as EncoreTag;
       if (encoreTag) {
-        const encoreMove = movePool.find(m => m?.moveId === encoreTag.moveId);
+        const encoreMove = movePool.find(m => m.moveId === encoreTag.moveId);
         if (encoreMove) {
-          return { move: encoreMove.moveId, targets: this.getNextTargets(encoreMove.moveId) };
+          return {
+            move: encoreMove.moveId,
+            targets: this.getNextTargets(encoreMove.moveId),
+          };
         }
       }
       switch (this.aiType) {
         case AiType.RANDOM: // No enemy should spawn with this AI type in-game
-          const moveId = movePool[globalScene.randBattleSeedInt(movePool.length)]!.moveId; // TODO: is the bang correct?
+          const moveId = movePool[globalScene.randBattleSeedInt(movePool.length)].moveId;
           return { move: moveId, targets: this.getNextTargets(moveId) };
         case AiType.SMART_RANDOM:
         case AiType.SMART:
-        /**
-         * Search this Pokemon's move pool for moves that will KO an opposing target.
-         * If there are any moves that can KO an opponent (i.e. a player Pokemon),
-         * those moves are the only ones considered for selection on this turn.
-         */
+          /**
+           * Search this Pokemon's move pool for moves that will KO an opposing target.
+           * If there are any moves that can KO an opponent (i.e. a player Pokemon),
+           * those moves are the only ones considered for selection on this turn.
+           */
           const koMoves = movePool.filter(pkmnMove => {
             if (!pkmnMove) {
               return false;
@@ -4878,17 +7270,39 @@ export class EnemyPokemon extends Pokemon {
             }
 
             const fieldPokemon = globalScene.getField();
-            const moveTargets = getMoveTargets(this, move.id).targets
-              .map(ind => fieldPokemon[ind])
+            const moveTargets = getMoveTargets(this, move.id)
+              .targets.map(ind => fieldPokemon[ind])
               .filter(p => this.isPlayer() !== p.isPlayer());
             // Only considers critical hits for crit-only moves or when this Pokemon is under the effect of Laser Focus
-            const isCritical = move.hasAttr(CritOnlyAttr) || !!this.getTag(BattlerTagType.ALWAYS_CRIT);
+            const isCritical =
+              move.hasAttr(CritOnlyAttr) ||
+              !!this.getTag(BattlerTagType.ALWAYS_CRIT);
 
-            return move.category !== MoveCategory.STATUS
-            && moveTargets.some(p => {
-              const doesNotFail = move.applyConditions(this, p, move) || [ Moves.SUCKER_PUNCH, Moves.UPPER_HAND, Moves.THUNDERCLAP ].includes(move.id);
-              return doesNotFail && p.getAttackDamage(this, move, !p.battleData.abilityRevealed, false, isCritical).damage >= p.hp;
-            });
+            return (
+              move.category !== MoveCategory.STATUS &&
+              moveTargets.some(p => {
+                const doesNotFail =
+                  move.applyConditions(this, p, move) ||
+                  [
+                    Moves.SUCKER_PUNCH,
+                    Moves.UPPER_HAND,
+                    Moves.THUNDERCLAP,
+                  ].includes(move.id);
+                return (
+                  doesNotFail &&
+                  p.getAttackDamage({
+                    source: this,
+                    move,
+                    ignoreAbility: !p.waveData.abilityRevealed,
+                    ignoreSourceAbility: false,
+                    ignoreAllyAbility: !p.getAlly()?.waveData.abilityRevealed,
+                    ignoreSourceAllyAbility: false,
+                    isCritical,
+                  }
+                  ).damage >= p.hp
+                );
+              })
+            );
           }, this);
 
           if (koMoves.length > 0) {
@@ -4896,47 +7310,65 @@ export class EnemyPokemon extends Pokemon {
           }
 
           /**
-         * Move selection is based on the move's calculated "benefit score" against the
-         * best possible target(s) (as determined by {@linkcode getNextTargets}).
-         * For more information on how benefit scores are calculated, see `docs/enemy-ai.md`.
-         */
+           * Move selection is based on the move's calculated "benefit score" against the
+           * best possible target(s) (as determined by {@linkcode getNextTargets}).
+           * For more information on how benefit scores are calculated, see `docs/enemy-ai.md`.
+           */
           const moveScores = movePool.map(() => 0);
-          const moveTargets = Object.fromEntries(movePool.map(m => [ m!.moveId, this.getNextTargets(m!.moveId) ])); // TODO: are those bangs correct?
+          const moveTargets = Object.fromEntries(movePool.map(m => [ m.moveId, this.getNextTargets(m.moveId) ]));
           for (const m in movePool) {
-            const pokemonMove = movePool[m]!; // TODO: is the bang correct?
+            const pokemonMove = movePool[m];
             const move = pokemonMove.getMove();
 
             let moveScore = moveScores[m];
             const targetScores: number[] = [];
 
             for (const mt of moveTargets[move.id]) {
-            // Prevent a target score from being calculated when the target is whoever attacks the user
+              // Prevent a target score from being calculated when the target is whoever attacks the user
               if (mt === BattlerIndex.ATTACKER) {
                 break;
               }
 
               const target = globalScene.getField()[mt];
               /**
-             * The "target score" of a move is given by the move's user benefit score + the move's target benefit score.
-             * If the target is an ally, the target benefit score is multiplied by -1.
-             */
-              let targetScore = move.getUserBenefitScore(this, target, move) + move.getTargetBenefitScore(this, target, move) * (mt < BattlerIndex.ENEMY === this.isPlayer() ? 1 : -1);
+               * The "target score" of a move is given by the move's user benefit score + the move's target benefit score.
+               * If the target is an ally, the target benefit score is multiplied by -1.
+               */
+              let targetScore =
+                move.getUserBenefitScore(this, target, move) +
+                move.getTargetBenefitScore(this, target, move) *
+                  (mt < BattlerIndex.ENEMY === this.isPlayer() ? 1 : -1);
               if (Number.isNaN(targetScore)) {
                 console.error(`Move ${move.name} returned score of NaN`);
                 targetScore = 0;
               }
               /**
-             * If this move is unimplemented, or the move is known to fail when used, set its
-             * target score to -20
-             */
-              if ((move.name.endsWith(" (N)") || !move.applyConditions(this, target, move)) && ![ Moves.SUCKER_PUNCH, Moves.UPPER_HAND, Moves.THUNDERCLAP ].includes(move.id)) {
+               * If this move is unimplemented, or the move is known to fail when used, set its
+               * target score to -20
+               */
+              if (
+                (move.name.endsWith(" (N)") ||
+                  !move.applyConditions(this, target, move)) &&
+                ![
+                  Moves.SUCKER_PUNCH,
+                  Moves.UPPER_HAND,
+                  Moves.THUNDERCLAP,
+                ].includes(move.id)
+              ) {
                 targetScore = -20;
               } else if (move instanceof AttackMove) {
-              /**
-               * Attack moves are given extra multipliers to their base benefit score based on
-               * the move's type effectiveness against the target and whether the move is a STAB move.
-               */
-                const effectiveness = target.getMoveEffectiveness(this, move, !target.battleData?.abilityRevealed);
+                /**
+                 * Attack moves are given extra multipliers to their base benefit score based on
+                 * the move's type effectiveness against the target and whether the move is a STAB move.
+                */
+                const effectiveness = target.getMoveEffectiveness(
+                  this,
+                  move,
+                  !target.waveData.abilityRevealed,
+                  undefined,
+                  undefined,
+                  true);
+
                 if (target.isPlayer() !== this.isPlayer()) {
                   targetScore *= effectiveness;
                   if (this.isOfType(move.type)) {
@@ -4973,23 +7405,39 @@ export class EnemyPokemon extends Pokemon {
           });
           let r = 0;
           if (this.aiType === AiType.SMART_RANDOM) {
-          // Has a 5/8 chance to select the best move, and a 3/8 chance to advance to the next best move (and repeat this roll)
-            while (r < sortedMovePool.length - 1 && globalScene.randBattleSeedInt(8) >= 5) {
+            // Has a 5/8 chance to select the best move, and a 3/8 chance to advance to the next best move (and repeat this roll)
+            while (
+              r < sortedMovePool.length - 1 &&
+              globalScene.randBattleSeedInt(8) >= 5
+            ) {
               r++;
             }
           } else if (this.aiType === AiType.SMART) {
-          // The chance to advance to the next best move increases when the compared moves' scores are closer to each other.
-            while (r < sortedMovePool.length - 1 && (moveScores[movePool.indexOf(sortedMovePool[r + 1])] / moveScores[movePool.indexOf(sortedMovePool[r])]) >= 0
-              && globalScene.randBattleSeedInt(100) < Math.round((moveScores[movePool.indexOf(sortedMovePool[r + 1])] / moveScores[movePool.indexOf(sortedMovePool[r])]) * 50)) {
+            // The chance to advance to the next best move increases when the compared moves' scores are closer to each other.
+            while (
+              r < sortedMovePool.length - 1 &&
+              moveScores[movePool.indexOf(sortedMovePool[r + 1])] /
+                moveScores[movePool.indexOf(sortedMovePool[r])] >=
+                0 &&
+              globalScene.randBattleSeedInt(100) <
+                Math.round(
+                  (moveScores[movePool.indexOf(sortedMovePool[r + 1])] /
+                    moveScores[movePool.indexOf(sortedMovePool[r])]) *
+                    50,
+                )
+            ) {
               r++;
             }
           }
-          console.log(movePool.map(m => m!.getName()), moveScores, r, sortedMovePool.map(m => m!.getName())); // TODO: are those bangs correct?
+          console.log(movePool.map(m => m.getName()), moveScores, r, sortedMovePool.map(m => m.getName()));
           return { move: sortedMovePool[r]!.moveId, targets: moveTargets[sortedMovePool[r]!.moveId] };
       }
     }
 
-    return { move: Moves.STRUGGLE, targets: this.getNextTargets(Moves.STRUGGLE) };
+    return {
+      move: Moves.STRUGGLE,
+      targets: this.getNextTargets(Moves.STRUGGLE),
+    };
   }
 
   /**
@@ -4999,7 +7447,9 @@ export class EnemyPokemon extends Pokemon {
    */
   getNextTargets(moveId: Moves): BattlerIndex[] {
     const moveTargets = getMoveTargets(this, moveId);
-    const targets = globalScene.getField(true).filter(p => moveTargets.targets.indexOf(p.getBattlerIndex()) > -1);
+    const targets = globalScene
+      .getField(true)
+      .filter(p => moveTargets.targets.indexOf(p.getBattlerIndex()) > -1);
     // If the move is multi-target, return all targets' indexes
     if (moveTargets.multiple) {
       return targets.map(p => p.getBattlerIndex());
@@ -5011,8 +7461,11 @@ export class EnemyPokemon extends Pokemon {
      * Get the move's target benefit score against each potential target.
      * For allies, this score is multiplied by -1.
      */
-    const benefitScores = targets
-      .map(p => [ p.getBattlerIndex(), move.getTargetBenefitScore(this, p, move) * (p.isPlayer() === this.isPlayer() ? 1 : -1) ]);
+    const benefitScores = targets.map(p => [
+      p.getBattlerIndex(),
+      move.getTargetBenefitScore(this, p, move) *
+        (p.isPlayer() === this.isPlayer() ? 1 : -1),
+    ]);
 
     const sortedBenefitScores = benefitScores.slice(0);
     sortedBenefitScores.sort((a, b) => {
@@ -5025,7 +7478,7 @@ export class EnemyPokemon extends Pokemon {
       // Set target to BattlerIndex.ATTACKER when using a counter move
       // This is the same as when the player does so
       if (move.hasAttr(CounterDamageAttr)) {
-        return [ BattlerIndex.ATTACKER ];
+        return [BattlerIndex.ATTACKER];
       }
 
       return [];
@@ -5042,13 +7495,15 @@ export class EnemyPokemon extends Pokemon {
     }
 
     // Remove any targets whose weights are less than half the max of the target weights from consideration
-    const benefitCutoffIndex = targetWeights.findIndex(s => s < targetWeights[0] / 2);
+    const benefitCutoffIndex = targetWeights.findIndex(
+      s => s < targetWeights[0] / 2,
+    );
     if (benefitCutoffIndex > -1) {
       targetWeights = targetWeights.slice(0, benefitCutoffIndex);
     }
 
     const thresholds: number[] = [];
-    let totalWeight: number = 0;
+    let totalWeight = 0;
     targetWeights.reduce((total: number, w: number) => {
       total += w;
       thresholds.push(total);
@@ -5062,7 +7517,7 @@ export class EnemyPokemon extends Pokemon {
      * is greater than that random number.
      */
     const randValue = globalScene.randBattleSeedInt(totalWeight);
-    let targetIndex: number = 0;
+    let targetIndex = 0;
 
     thresholds.every((t, i) => {
       if (randValue >= t) {
@@ -5073,7 +7528,7 @@ export class EnemyPokemon extends Pokemon {
       return false;
     });
 
-    return [ sortedBenefitScores[targetIndex][0] ];
+    return [sortedBenefitScores[targetIndex][0]];
   }
 
   isPlayer() {
@@ -5101,14 +7556,17 @@ export class EnemyPokemon extends Pokemon {
     return 0;
   }
 
-  damage(damage: number, ignoreSegments: boolean = false, preventEndure: boolean = false, ignoreFaintPhase: boolean = false): number {
+  damage(
+    damage: number,
+    ignoreSegments = false,
+    preventEndure = false,
+    ignoreFaintPhase = false,
+  ): number {
     if (this.isFainted()) {
       return 0;
     }
 
-    let clearedBossSegmentIndex = this.isBoss()
-      ? this.bossSegmentIndex + 1
-      : 0;
+    let clearedBossSegmentIndex = this.isBoss() ? this.bossSegmentIndex + 1 : 0;
 
     if (this.isBoss() && !ignoreSegments) {
       const segmentSize = this.getMaxHp() / this.bossSegments;
@@ -5119,12 +7577,19 @@ export class EnemyPokemon extends Pokemon {
           if (this.hp - damage <= roundedHpThreshold) {
             const hpRemainder = this.hp - roundedHpThreshold;
             let segmentsBypassed = 0;
-            while (segmentsBypassed < this.bossSegmentIndex && this.canBypassBossSegments(segmentsBypassed + 1) && (damage - hpRemainder) >= Math.round(segmentSize * Math.pow(2, segmentsBypassed + 1))) {
+            while (
+              segmentsBypassed < this.bossSegmentIndex &&
+              this.canBypassBossSegments(segmentsBypassed + 1) &&
+              damage - hpRemainder >=
+                Math.round(segmentSize * Math.pow(2, segmentsBypassed + 1))
+            ) {
               segmentsBypassed++;
               //console.log('damage', damage, 'segment', segmentsBypassed + 1, 'segment size', segmentSize, 'damage needed', Math.round(segmentSize * Math.pow(2, segmentsBypassed + 1)));
             }
 
-            damage = Utils.toDmgValue(this.hp - hpThreshold + segmentSize * segmentsBypassed);
+            damage = toDmgValue(
+              this.hp - hpThreshold + segmentSize * segmentsBypassed,
+            );
             clearedBossSegmentIndex = s - segmentsBypassed;
           }
           break;
@@ -5139,7 +7604,12 @@ export class EnemyPokemon extends Pokemon {
         }
     }
 
-    const ret = super.damage(damage, ignoreSegments, preventEndure, ignoreFaintPhase);
+    const ret = super.damage(
+      damage,
+      ignoreSegments,
+      preventEndure,
+      ignoreFaintPhase,
+    );
 
     if (this.isBoss()) {
       if (ignoreSegments) {
@@ -5155,9 +7625,9 @@ export class EnemyPokemon extends Pokemon {
     return ret;
   }
 
-  canBypassBossSegments(segmentCount: number = 1): boolean {
+  canBypassBossSegments(segmentCount = 1): boolean {
     if (globalScene.currentBattle.battleSpec === BattleSpec.FINAL_BOSS) {
-      if (!this.formIndex && (this.bossSegmentIndex - segmentCount) < 1) {
+      if (!this.formIndex && this.bossSegmentIndex - segmentCount < 1) {
         return false;
       }
     }
@@ -5173,10 +7643,17 @@ export class EnemyPokemon extends Pokemon {
    * @param segmentIndex index of the segment to get down to (0 = no shield left, 1 = 1 shield left, etc.)
    */
   handleBossSegmentCleared(segmentIndex: number): void {
-    while (this.bossSegmentIndex > 0 && segmentIndex - 1 < this.bossSegmentIndex) {
+    while (
+      this.bossSegmentIndex > 0 &&
+      segmentIndex - 1 < this.bossSegmentIndex
+    ) {
       // Filter out already maxed out stat stages and weigh the rest based on existing stats
-      const leftoverStats = EFFECTIVE_STATS.filter((s: EffectiveStat) => this.getStatStage(s) < 6);
-      const statWeights = leftoverStats.map((s: EffectiveStat) => this.getStat(s, false));
+      const leftoverStats = EFFECTIVE_STATS.filter(
+        (s: EffectiveStat) => this.getStatStage(s) < 6,
+      );
+      const statWeights = leftoverStats.map((s: EffectiveStat) =>
+        this.getStat(s, false),
+      );
 
       let boostedStat: EffectiveStat;
       const statThresholds: number[] = [];
@@ -5188,7 +7665,7 @@ export class EnemyPokemon extends Pokemon {
       }
 
       // Pick a random stat from the leftover stats to increase its stages
-      const randInt = Utils.randSeedInt(totalWeight);
+      const randInt = randSeedInt(totalWeight);
       for (const i in statThresholds) {
         if (randInt < statThresholds[i]) {
           boostedStat = leftoverStats[i];
@@ -5207,7 +7684,16 @@ export class EnemyPokemon extends Pokemon {
         stages++;
       }
 
-      globalScene.unshiftPhase(new StatStageChangePhase(this.getBattlerIndex(), true, [ boostedStat! ], stages, true, true));
+      globalScene.unshiftPhase(
+        new StatStageChangePhase(
+          this.getBattlerIndex(),
+          true,
+          [boostedStat!],
+          stages,
+          true,
+          true,
+        ),
+      );
       this.bossSegmentIndex--;
     }
   }
@@ -5227,7 +7713,7 @@ export class EnemyPokemon extends Pokemon {
    * @param slotIndex an optional index to place the pokemon in the party
    * @returns the pokemon that was added or null if the pokemon could not be added
    */
-  addToParty(pokeballType: PokeballType, slotIndex: number = -1) {
+  addToParty(pokeballType: PokeballType, slotIndex = -1) {
     const party = globalScene.getPlayerParty();
     let ret: PlayerPokemon | null = null;
 
@@ -5237,9 +7723,20 @@ export class EnemyPokemon extends Pokemon {
       this.metBiome = globalScene.arena.biomeType;
       this.metWave = globalScene.currentBattle.waveIndex;
       this.metSpecies = this.species.speciesId;
-      const newPokemon = globalScene.addPlayerPokemon(this.species, this.level, this.abilityIndex, this.formIndex, this.gender, this.shiny, this.variant, this.ivs, this.nature, this);
+      const newPokemon = globalScene.addPlayerPokemon(
+        this.species,
+        this.level,
+        this.abilityIndex,
+        this.formIndex,
+        this.gender,
+        this.shiny,
+        this.variant,
+        this.ivs,
+        this.nature,
+        this,
+      );
 
-      if (Utils.isBetween(slotIndex, 0, PLAYER_PARTY_MAX_SIZE - 1)) {
+      if (isBetween(slotIndex, 0, PLAYER_PARTY_MAX_SIZE - 1)) {
         party.splice(slotIndex, 0, newPokemon);
       } else {
         party.push(newPokemon);
@@ -5249,13 +7746,53 @@ export class EnemyPokemon extends Pokemon {
       newPokemon.setVisible(false);
 
       ret = newPokemon;
-      globalScene.triggerPokemonFormChange(newPokemon, SpeciesFormChangeActiveTrigger, true);
+      globalScene.triggerPokemonFormChange(
+        newPokemon,
+        SpeciesFormChangeActiveTrigger,
+        true,
+      );
     }
 
     return ret;
   }
 }
 
+/**
+ * Illusion property
+ */
+interface IllusionData {
+  basePokemon: {
+    /** The actual name of the Pokemon */
+    name: string;
+    /** The actual nickname of the Pokemon */
+    nickname: string;
+    /** Whether the base pokemon is shiny or not */
+    shiny: boolean;
+    /** The shiny variant of the base pokemon */
+    variant: Variant;
+    /** Whether the fusion species of the base pokemon is shiny or not */
+    fusionShiny: boolean;
+    /** The variant of the fusion species of the base pokemon */
+    fusionVariant: Variant;
+  };
+  /** The species of the illusion */
+  species: Species;
+  /** The formIndex of the illusion */
+  formIndex: number;
+  /** The gender of the illusion */
+  gender: Gender;
+  /** The pokeball of the illusion */
+  pokeball: PokeballType;
+  /** The fusion species of the illusion if it's a fusion */
+  fusionSpecies?: PokemonSpecies;
+  /** The fusionFormIndex of the illusion */
+  fusionFormIndex?: number;
+  /** The fusionGender of the illusion if it's a fusion */
+  fusionGender?: Gender;
+  /** The level of the illusion (not used currently) */
+  level?: number
+}
+
 export interface TurnMove {
   move: Moves;
   targets: BattlerIndex[];
@@ -5274,79 +7811,171 @@ export interface AttackMoveResult {
   sourceBattlerIndex: BattlerIndex;
 }
 
+/**
+ * Persistent in-battle data for a {@linkcode Pokemon}.
+ * Resets on switch or new battle.
+ */
 export class PokemonSummonData {
   /** [Atk, Def, SpAtk, SpDef, Spd, Acc, Eva] */
-  public statStages: number[] = [ 0, 0, 0, 0, 0, 0, 0 ];
+  public statStages: number[] = [0, 0, 0, 0, 0, 0, 0];
   public moveQueue: TurnMove[] = [];
   public tags: BattlerTag[] = [];
-  public abilitySuppressed: boolean = false;
-  public abilitiesApplied: Abilities[] = [];
-  public speciesForm: PokemonSpeciesForm | null;
-  public fusionSpeciesForm: PokemonSpeciesForm;
-  public ability: Abilities = Abilities.NONE;
-  public passiveAbility: Abilities = Abilities.NONE;
-  public gender: Gender;
-  public fusionGender: Gender;
-  public stats: number[] = [ 0, 0, 0, 0, 0, 0 ];
-  public moveset: (PokemonMove | null)[];
+  public abilitySuppressed = false;
+
+  // Overrides for transform.
+  // TODO: Move these into a separate class & add rage fist hit count
+  public speciesForm: PokemonSpeciesForm | null = null;
+  public fusionSpeciesForm: PokemonSpeciesForm | null = null;
+  public ability: Abilities | undefined;
+  public passiveAbility: Abilities | undefined;
+  public gender: Gender | undefined;
+  public fusionGender: Gender | undefined;
+  public stats: number[] = [0, 0, 0, 0, 0, 0];
+  public moveset: PokemonMove[] | null;
+
   // If not initialized this value will not be populated from save data.
-  public types: Type[] = [];
-  public addedType: Type | null = null;
-}
+  public types: PokemonType[] = [];
+  public addedType: PokemonType | null = null;
 
-export class PokemonBattleData {
-  /** counts the hits the pokemon received */
-  public hitCount: number = 0;
-  /** used for {@linkcode Moves.RAGE_FIST} in order to save hit Counts received before Rage Fist is applied */
-  public prevHitCount: number = 0;
-  public endured: boolean = false;
-  public berriesEaten: BerryType[] = [];
-  public abilitiesApplied: Abilities[] = [];
-  public abilityRevealed: boolean = false;
-}
+  /** Data pertaining to this pokemon's illusion. */
+  public illusion: IllusionData | null = null;
+  public illusionBroken: boolean = false;
 
-export class PokemonBattleSummonData {
-  /** The number of turns the pokemon has passed since entering the battle */
-  public turnCount: number = 1;
-  /** The number of turns the pokemon has passed since the start of the wave */
-  public waveTurnCount: number = 1;
-  /** The list of moves the pokemon has used since entering the battle */
+  /** Array containing all berries eaten in the last turn; used by {@linkcode Abilities.CUD_CHEW} */
+  public berriesEatenLast: BerryType[] = [];
+
+  /**
+   * An array of all moves this pokemon has used since entering the battle.
+   * Used for most moves and abilities that check prior move usage or copy already-used moves.
+   */
   public moveHistory: TurnMove[] = [];
+
+  constructor(source?: PokemonSummonData | Partial<PokemonSummonData>) {
+    if (isNullOrUndefined(source)) {
+      return;
+    }
+
+    // TODO: Rework this into an actual generic function for use elsewhere
+    for (const [key, value] of Object.entries(source)) {
+      if (isNullOrUndefined(value) && this.hasOwnProperty(key)) {
+        continue;
+      }
+
+      if (key === "moveset") {
+        this.moveset = value?.map((m: any) => PokemonMove.loadMove(m));
+        continue;
+      }
+
+      if (key === "tags") {
+        // load battler tags
+        this.tags = value.map((t: BattlerTag) => loadBattlerTag(t));
+        continue;
+      }
+      this[key] = value;
+    }
+  }
 }
 
+ // TODO: Merge this inside `summmonData` but exclude from save if/when a save data serializer is added
+export class PokemonTempSummonData {
+  /**
+   * The number of turns this pokemon has spent without switching out.
+   * Only currently used for positioning the battle cursor.
+   */
+  turnCount: number = 1;
+
+    /**
+   * The number of turns this pokemon has spent in the active position since the start of the wave
+   * without switching out.
+   * Reset on switch and new wave, but not stored in `SummonData` to avoid being written to the save file.
+
+   * Used to evaluate "first turn only" conditions such as
+   * {@linkcode Moves.FAKE_OUT | Fake Out} and {@linkcode Moves.FIRST_IMPRESSION | First Impression}).
+   */
+  waveTurnCount = 1;
+
+}
+
+/**
+ * Persistent data for a {@linkcode Pokemon}.
+ * Resets at the start of a new battle (but not on switch).
+ */
+export class PokemonBattleData {
+  /** Counter tracking direct hits this Pokemon has received during this battle; used for {@linkcode Moves.RAGE_FIST} */
+  public hitCount = 0;
+  /** Whether this Pokemon has eaten a berry this battle; used for {@linkcode Moves.BELCH} */
+  public hasEatenBerry: boolean = false;
+  /** Array containing all berries eaten and not yet recovered during this current battle; used by {@linkcode Abilities.HARVEST} */
+  public berriesEaten: BerryType[] = [];
+
+  constructor(source?: PokemonBattleData | Partial<PokemonBattleData>) {
+    if (!isNullOrUndefined(source)) {
+      this.hitCount = source.hitCount ?? 0;
+      this.hasEatenBerry = source.hasEatenBerry ?? false;
+      this.berriesEaten = source.berriesEaten ?? [];
+    }
+  }
+}
+
+/**
+ * Temporary data for a {@linkcode Pokemon}.
+ * Resets on new wave/battle start (but not on switch).
+ */
+export class PokemonWaveData {
+  /** Whether the pokemon has endured due to a {@linkcode BattlerTagType.ENDURE_TOKEN} */
+  public endured = false;
+  /**
+   * A set of all the abilities this {@linkcode Pokemon} has used in this wave.
+   * Used to track once per battle conditions, as well as (hopefully) by the updated AI for move effectiveness.
+   */
+  public abilitiesApplied: Set<Abilities> = new Set<Abilities>;
+  /** Whether the pokemon's ability has been revealed or not */
+  public abilityRevealed = false;
+}
+
+/**
+ * Temporary data for a {@linkcode Pokemon}.
+ * Resets at the start of a new turn, as well as on switch.
+ */
 export class PokemonTurnData {
-  public flinched: boolean = false;
-  public acted: boolean = false;
-  /** How many times the move should hit the target(s) */
-  public hitCount: number = 0;
+  public flinched = false;
+  public acted = false;
+  /** How many times the current move should hit the target(s) */
+  public hitCount = 0;
   /**
    * - `-1` = Calculate how many hits are left
    * - `0` = Move is finished
    */
-  public hitsLeft: number = -1;
-  public totalDamageDealt: number = 0;
-  public singleHitDamageDealt: number = 0;
-  public damageTaken: number = 0;
+  public hitsLeft = -1;
+  public totalDamageDealt = 0;
+  public singleHitDamageDealt = 0;
+  public damageTaken = 0;
   public attacksReceived: AttackMoveResult[] = [];
   public order: number;
-  public statStagesIncreased: boolean = false;
-  public statStagesDecreased: boolean = false;
+  public statStagesIncreased = false;
+  public statStagesDecreased = false;
   public moveEffectiveness: TypeDamageMultiplier | null = null;
   public combiningPledge?: Moves;
-  public switchedInThisTurn: boolean = false;
-  public failedRunAway: boolean = false;
-  public joinedRound: boolean = false;
+  public switchedInThisTurn = false;
+  public failedRunAway = false;
+  public joinedRound = false;
   /**
    * Used to make sure multi-hits occur properly when the user is
    * forced to act again in the same turn
    */
-  public extraTurns: number = 0;
+  public extraTurns = 0;
+  /**
+   * All berries eaten by this pokemon in this turn.
+   * Saved into {@linkcode PokemonSummonData | SummonData} by {@linkcode Abilities.CUD_CHEW} on turn end.
+   * @see {@linkcode PokemonSummonData.berriesEatenLast}
+  */
+  public berriesEaten: BerryType[] = []
 }
 
 export enum AiType {
   RANDOM,
   SMART_RANDOM,
-  SMART
+  SMART,
 }
 
 export enum MoveResult {
@@ -5354,7 +7983,7 @@ export enum MoveResult {
   SUCCESS,
   FAIL,
   MISS,
-  OTHER
+  OTHER,
 }
 
 export enum HitResult {
@@ -5367,11 +7996,20 @@ export enum HitResult {
   HEAL,
   FAIL,
   MISS,
-  OTHER,
-  IMMUNE
+  INDIRECT,
+  IMMUNE,
+  CONFUSION,
+  INDIRECT_KO,
 }
 
-export type DamageResult = HitResult.EFFECTIVE | HitResult.SUPER_EFFECTIVE | HitResult.NOT_VERY_EFFECTIVE | HitResult.ONE_HIT_KO | HitResult.OTHER;
+export type DamageResult =
+  | HitResult.EFFECTIVE
+  | HitResult.SUPER_EFFECTIVE
+  | HitResult.NOT_VERY_EFFECTIVE
+  | HitResult.ONE_HIT_KO
+  | HitResult.CONFUSION
+  | HitResult.INDIRECT_KO
+  | HitResult.INDIRECT;
 
 /** Interface containing the results of a damage calculation for a given move */
 export interface DamageCalculationResult {
@@ -5387,8 +8025,8 @@ export interface DamageCalculationResult {
  * Wrapper class for the {@linkcode Move} class for Pokemon to interact with.
  * These are the moves assigned to a {@linkcode Pokemon} object.
  * It links to {@linkcode Move} class via the move ID.
- * Compared to {@linkcode Move}, this class also tracks if a move has received.
- * PP Ups, amount of PP used, and things like that.
+ * Compared to {@linkcode Move}, this class also tracks things like
+ * PP Ups recieved, PP used, etc.
  * @see {@linkcode isUsable} - checks if move is restricted, out of PP, or not implemented.
  * @see {@linkcode getMove} - returns {@linkcode Move} object by looking it up via ID.
  * @see {@linkcode usePp} - removes a point of PP from the move.
@@ -5408,7 +8046,13 @@ export class PokemonMove {
    */
   public maxPpOverride?: number;
 
-  constructor(moveId: Moves, ppUsed: number = 0, ppUp: number = 0, virtual: boolean = false, maxPpOverride?: number) {
+  constructor(
+    moveId: Moves,
+    ppUsed = 0,
+    ppUp = 0,
+    virtual = false,
+    maxPpOverride?: number,
+  ) {
     this.moveId = moveId;
     this.ppUsed = ppUsed;
     this.ppUp = ppUp;
@@ -5425,8 +8069,16 @@ export class PokemonMove {
    * @param {boolean} ignoreRestrictionTags If `true`, skips the check for move restriction tags (see {@link MoveRestrictionBattlerTag})
    * @returns `true` if the move can be selected and used by the Pokemon, otherwise `false`.
    */
-  isUsable(pokemon: Pokemon, ignorePp: boolean = false, ignoreRestrictionTags: boolean = false): boolean {
-    if (this.moveId && !ignoreRestrictionTags && pokemon.isMoveRestricted(this.moveId, pokemon)) {
+  isUsable(
+    pokemon: Pokemon,
+    ignorePp = false,
+    ignoreRestrictionTags = false,
+  ): boolean {
+    if (
+      this.moveId &&
+      !ignoreRestrictionTags &&
+      pokemon.isMoveRestricted(this.moveId, pokemon)
+    ) {
       return false;
     }
 
@@ -5434,7 +8086,9 @@ export class PokemonMove {
       return false;
     }
 
-    return (ignorePp || this.ppUsed < this.getMovePp() || this.getMove().pp === -1);
+    return (
+      ignorePp || this.ppUsed < this.getMovePp() || this.getMove().pp === -1
+    );
   }
 
   getMove(): Move {
@@ -5443,18 +8097,21 @@ export class PokemonMove {
 
   /**
    * Sets {@link ppUsed} for this move and ensures the value does not exceed {@link getMovePp}
-   * @param {number} count Amount of PP to use
+   * @param count Amount of PP to use
    */
   usePp(count: number = 1) {
     this.ppUsed = Math.min(this.ppUsed + count, this.getMovePp());
   }
 
   getMovePp(): number {
-    return this.maxPpOverride || (this.getMove().pp + this.ppUp * Utils.toDmgValue(this.getMove().pp / 5));
+    return (
+      this.maxPpOverride ||
+      this.getMove().pp + this.ppUp * toDmgValue(this.getMove().pp / 5)
+    );
   }
 
   getPpRatio(): number {
-    return 1 - (this.ppUsed / this.getMovePp());
+    return 1 - this.ppUsed / this.getMovePp();
   }
 
   getName(): string {
@@ -5462,11 +8119,17 @@ export class PokemonMove {
   }
 
   /**
-  * Copies an existing move or creates a valid PokemonMove object from json representing one
-  * @param {PokemonMove | any} source The data for the move to copy
-  * @return {PokemonMove} A valid pokemonmove object
-  */
+   * Copies an existing move or creates a valid {@linkcode PokemonMove} object from json representing one
+   * @param source The data for the move to copy; can be a {@linkcode PokemonMove} or JSON object representing one
+   * @returns A valid {@linkcode PokemonMove} object
+   */
   static loadMove(source: PokemonMove | any): PokemonMove {
-    return new PokemonMove(source.moveId, source.ppUsed, source.ppUp, source.virtual, source.maxPpOverride);
+    return new PokemonMove(
+      source.moveId,
+      source.ppUsed,
+      source.ppUp,
+      source.virtual,
+      source.maxPpOverride,
+    );
   }
 }
diff --git a/src/field/trainer.ts b/src/field/trainer.ts
index 65bca641163..6b0a54b2103 100644
--- a/src/field/trainer.ts
+++ b/src/field/trainer.ts
@@ -2,32 +2,29 @@ import { globalScene } from "#app/global-scene";
 import { pokemonPrevolutions } from "#app/data/balance/pokemon-evolutions";
 import type PokemonSpecies from "#app/data/pokemon-species";
 import { getPokemonSpecies } from "#app/data/pokemon-species";
-import type {
-  TrainerConfig,
-  TrainerPartyTemplate } from "#app/data/trainer-config";
-import {
-  TrainerPartyCompoundTemplate,
-  TrainerPoolTier,
-  TrainerSlot,
-  trainerConfigs,
-  trainerPartyTemplates,
-  signatureSpecies
-} from "#app/data/trainer-config";
+import type { TrainerConfig } from "#app/data/trainers/trainer-config";
+import type { TrainerPartyTemplate } from "#app/data/trainers/TrainerPartyTemplate";
+import { trainerConfigs } from "#app/data/trainers/trainer-config";
+import { trainerPartyTemplates } from "#app/data/trainers/TrainerPartyTemplate";
+import { TrainerPartyCompoundTemplate } from "#app/data/trainers/TrainerPartyTemplate";
+import { TrainerSlot } from "#enums/trainer-slot";
+import { TrainerPoolTier } from "#enums/trainer-pool-tier";
+import { TeraAIMode } from "#enums/tera-ai-mode";
 import type { EnemyPokemon } from "#app/field/pokemon";
-import * as Utils from "#app/utils";
+import { randSeedWeightedItem, randSeedItem, randSeedInt } from "#app/utils/common";
 import type { PersistentModifier } from "#app/modifier/modifier";
-import { trainerNamePools } from "#app/data/trainer-names";
 import { ArenaTagSide, ArenaTrapTag } from "#app/data/arena-tag";
 import { getIsInitialized, initI18n } from "#app/plugins/i18n";
 import i18next from "i18next";
 import { PartyMemberStrength } from "#enums/party-member-strength";
 import { Species } from "#enums/species";
 import { TrainerType } from "#enums/trainer-type";
+import { signatureSpecies } from "#app/data/balance/signature-species";
 
 export enum TrainerVariant {
-    DEFAULT,
-    FEMALE,
-    DOUBLE
+  DEFAULT,
+  FEMALE,
+  DOUBLE,
 }
 
 export default class Trainer extends Phaser.GameObjects.Container {
@@ -36,8 +33,18 @@ export default class Trainer extends Phaser.GameObjects.Container {
   public partyTemplateIndex: number;
   public name: string;
   public partnerName: string;
+  public nameKey: string;
+  public partnerNameKey: string | undefined;
+  public originalIndexes: { [key: number]: number } = {};
 
-  constructor(trainerType: TrainerType, variant: TrainerVariant, partyTemplateIndex?: number, name?: string, partnerName?: string, trainerConfigOverride?: TrainerConfig) {
+  constructor(
+    trainerType: TrainerType,
+    variant: TrainerVariant,
+    partyTemplateIndex?: number,
+    nameKey?: string,
+    partnerNameKey?: string,
+    trainerConfigOverride?: TrainerConfig,
+  ) {
     super(globalScene, -72, 80);
     this.config = trainerConfigs.hasOwnProperty(trainerType)
       ? trainerConfigs[trainerType]
@@ -48,20 +55,45 @@ export default class Trainer extends Phaser.GameObjects.Container {
     }
 
     this.variant = variant;
-    this.partyTemplateIndex = Math.min(partyTemplateIndex !== undefined ? partyTemplateIndex : Utils.randSeedWeightedItem(this.config.partyTemplates.map((_, i) => i)),
-      this.config.partyTemplates.length - 1);
-    if (trainerNamePools.hasOwnProperty(trainerType)) {
-      const namePool = trainerNamePools[trainerType];
-      this.name = name || Utils.randSeedItem(Array.isArray(namePool[0]) ? namePool[variant === TrainerVariant.FEMALE ? 1 : 0] : namePool);
+    this.partyTemplateIndex = Math.min(
+      partyTemplateIndex !== undefined
+        ? partyTemplateIndex
+        : randSeedWeightedItem(this.config.partyTemplates.map((_, i) => i)),
+      this.config.partyTemplates.length - 1,
+    );
+    const classKey = `trainersCommon:${TrainerType[trainerType]}`;
+    if (i18next.exists(classKey, { returnObjects: true })) {
+      if (nameKey) {
+        this.nameKey = nameKey;
+      } else {
+        const genderKey = i18next.exists(`${classKey}.MALE`)
+          ? variant === TrainerVariant.FEMALE
+            ? ".FEMALE"
+            : ".MALE"
+          : "";
+        const trainerKey = randSeedItem(Object.keys(i18next.t(`${classKey}${genderKey}`, { returnObjects: true })));
+        this.nameKey = `${classKey}${genderKey}.${trainerKey}`;
+      }
+      this.name = i18next.t(this.nameKey);
       if (variant === TrainerVariant.DOUBLE) {
         if (this.config.doubleOnly) {
-          if (partnerName) {
-            this.partnerName = partnerName;
+          if (partnerNameKey) {
+            this.partnerNameKey = partnerNameKey;
+            this.partnerName = i18next.t(this.partnerNameKey);
           } else {
-            [ this.name, this.partnerName ] = this.name.split(" & ");
+            [this.name, this.partnerName] = this.name.split(" & ");
           }
         } else {
-          this.partnerName = partnerName || Utils.randSeedItem(Array.isArray(namePool[0]) ? namePool[1] : namePool);
+          const partnerGenderKey = i18next.exists(`${classKey}.FEMALE`) ? ".FEMALE" : "";
+          const partnerTrainerKey = randSeedItem(
+            Object.keys(
+              i18next.t(`${classKey}${partnerGenderKey}`, {
+                returnObjects: true,
+              }),
+            ),
+          );
+          this.partnerNameKey = `${classKey}${partnerGenderKey}.${partnerTrainerKey}`;
+          this.partnerName = i18next.t(this.partnerNameKey);
         }
       }
     }
@@ -79,12 +111,21 @@ export default class Trainer extends Phaser.GameObjects.Container {
         break;
     }
 
-    console.log(Object.keys(trainerPartyTemplates)[Object.values(trainerPartyTemplates).indexOf(this.getPartyTemplate())]);
+    console.log(
+      Object.keys(trainerPartyTemplates)[Object.values(trainerPartyTemplates).indexOf(this.getPartyTemplate())],
+    );
 
     const getSprite = (hasShadow?: boolean, forceFemale?: boolean) => {
-      const ret = globalScene.addFieldSprite(0, 0, this.config.getSpriteKey(variant === TrainerVariant.FEMALE || forceFemale, this.isDouble()));
+      const ret = globalScene.addFieldSprite(
+        0,
+        0,
+        this.config.getSpriteKey(variant === TrainerVariant.FEMALE || forceFemale, this.isDouble()),
+      );
       ret.setOrigin(0.5, 1);
-      ret.setPipeline(globalScene.spritePipeline, { tone: [ 0.0, 0.0, 0.0, 0.0 ], hasShadow: !!hasShadow });
+      ret.setPipeline(globalScene.spritePipeline, {
+        tone: [0.0, 0.0, 0.0, 0.0],
+        hasShadow: !!hasShadow,
+      });
       return ret;
     };
 
@@ -122,13 +163,13 @@ export default class Trainer extends Phaser.GameObjects.Container {
    * @param {boolean} includeTitle - Whether to include the title in the returned name. Defaults to false.
    * @returns {string} - The formatted name of the trainer.
    **/
-  getName(trainerSlot: TrainerSlot = TrainerSlot.NONE, includeTitle: boolean = false): string {
+  getName(trainerSlot: TrainerSlot = TrainerSlot.NONE, includeTitle = false): string {
     // Get the base title based on the trainer slot and variant.
     let name = this.config.getTitle(trainerSlot, this.variant);
 
     // Determine the title to include based on the configuration and includeTitle flag.
     let title = includeTitle && this.config.title ? this.config.title : null;
-    const evilTeamTitles = [ "grunt" ];
+    const evilTeamTitles = ["grunt"];
     if (this.name === "" && evilTeamTitles.some(t => name.toLocaleLowerCase().includes(t))) {
       // This is a evil team grunt so we localize it by only using the "name" as the title
       title = i18next.t(`trainerClasses:${name.toLowerCase().replace(/\s/g, "_")}`);
@@ -178,11 +219,17 @@ export default class Trainer extends Phaser.GameObjects.Container {
     return title ? `${title} ${name}` : name;
   }
 
-
   isDouble(): boolean {
     return this.config.doubleOnly || this.variant === TrainerVariant.DOUBLE;
   }
 
+  /**
+   * Return whether the trainer is a duo, like Tate & Liza
+   */
+  isPartner(): boolean {
+    return this.variant === TrainerVariant.DOUBLE;
+  }
+
   getMixedBattleBgm(): string {
     return this.config.mixedBattleBgm;
   }
@@ -192,19 +239,34 @@ export default class Trainer extends Phaser.GameObjects.Container {
   }
 
   getEncounterBgm(): string {
-    return !this.variant ? this.config.encounterBgm : (this.variant === TrainerVariant.DOUBLE ? this.config.doubleEncounterBgm : this.config.femaleEncounterBgm) || this.config.encounterBgm;
+    return !this.variant
+      ? this.config.encounterBgm
+      : (this.variant === TrainerVariant.DOUBLE ? this.config.doubleEncounterBgm : this.config.femaleEncounterBgm) ||
+          this.config.encounterBgm;
   }
 
   getEncounterMessages(): string[] {
-    return !this.variant ? this.config.encounterMessages : (this.variant === TrainerVariant.DOUBLE ? this.config.doubleEncounterMessages : this.config.femaleEncounterMessages) || this.config.encounterMessages;
+    return !this.variant
+      ? this.config.encounterMessages
+      : (this.variant === TrainerVariant.DOUBLE
+          ? this.config.doubleEncounterMessages
+          : this.config.femaleEncounterMessages) || this.config.encounterMessages;
   }
 
   getVictoryMessages(): string[] {
-    return !this.variant ? this.config.victoryMessages : (this.variant === TrainerVariant.DOUBLE ? this.config.doubleVictoryMessages : this.config.femaleVictoryMessages) || this.config.victoryMessages;
+    return !this.variant
+      ? this.config.victoryMessages
+      : (this.variant === TrainerVariant.DOUBLE
+          ? this.config.doubleVictoryMessages
+          : this.config.femaleVictoryMessages) || this.config.victoryMessages;
   }
 
   getDefeatMessages(): string[] {
-    return !this.variant ? this.config.defeatMessages : (this.variant === TrainerVariant.DOUBLE ? this.config.doubleDefeatMessages : this.config.femaleDefeatMessages) || this.config.defeatMessages;
+    return !this.variant
+      ? this.config.defeatMessages
+      : (this.variant === TrainerVariant.DOUBLE
+          ? this.config.doubleDefeatMessages
+          : this.config.femaleDefeatMessages) || this.config.defeatMessages;
   }
 
   getPartyTemplate(): TrainerPartyTemplate {
@@ -268,139 +330,169 @@ export default class Trainer extends Phaser.GameObjects.Container {
 
     let ret: EnemyPokemon;
 
-    globalScene.executeWithSeedOffset(() => {
-      const template = this.getPartyTemplate();
-      const strength: PartyMemberStrength = template.getStrength(index);
+    globalScene.executeWithSeedOffset(
+      () => {
+        const template = this.getPartyTemplate();
+        const strength: PartyMemberStrength = template.getStrength(index);
 
-
-      // If the battle is not one of the named trainer doubles
-      if (!(this.config.trainerTypeDouble && this.isDouble() && !this.config.doubleOnly)) {
-
-        if (this.config.partyMemberFuncs.hasOwnProperty(index)) {
-          ret = this.config.partyMemberFuncs[index](level, strength);
-          return;
-        }
-        if (this.config.partyMemberFuncs.hasOwnProperty(index - template.size)) {
-          ret = this.config.partyMemberFuncs[index - template.size](level, template.getStrength(index));
-          return;
-        }
-      }
-      let offset = 0;
-
-      if (template instanceof TrainerPartyCompoundTemplate) {
-        for (const innerTemplate of template.templates) {
-          if (offset + innerTemplate.size > index) {
-            break;
+        // If the battle is not one of the named trainer doubles
+        if (!(this.config.trainerTypeDouble && this.isDouble() && !this.config.doubleOnly)) {
+          if (this.config.partyMemberFuncs.hasOwnProperty(index)) {
+            ret = this.config.partyMemberFuncs[index](level, strength);
+            return;
+          }
+          if (this.config.partyMemberFuncs.hasOwnProperty(index - template.size)) {
+            ret = this.config.partyMemberFuncs[index - template.size](level, template.getStrength(index));
+            return;
           }
-          offset += innerTemplate.size;
         }
-      }
+        let offset = 0;
 
-      // Create an empty species pool (which will be set to one of the species pools based on the index)
-      let newSpeciesPool: Species[] = [];
-      let useNewSpeciesPool = false;
-
-      // If we are in a double battle of named trainers, we need to use alternate species pools (generate half the party from each trainer)
-      if (this.config.trainerTypeDouble && this.isDouble() && !this.config.doubleOnly) {
-
-        // Use the new species pool for this party generation
-        useNewSpeciesPool = true;
-
-
-        // Get the species pool for the partner trainer and the current trainer
-        const speciesPoolPartner = signatureSpecies[TrainerType[this.config.trainerTypeDouble]];
-        const speciesPool = signatureSpecies[TrainerType[this.config.trainerType]];
-
-
-        // Get the species that are already in the enemy party so we dont generate the same species twice
-        const AlreadyUsedSpecies = battle.enemyParty.map(p => p.species.speciesId);
-
-        // Filter out the species that are already in the enemy party from the main trainer species pool
-        const speciesPoolFiltered = speciesPool.filter(species => {
-          // Since some species pools have arrays in them (use either of those species), we need to check if one of the species is already in the party and filter the whole array if it is
-          if (Array.isArray(species)) {
-            return !species.some(s => AlreadyUsedSpecies.includes(s));
+        if (template instanceof TrainerPartyCompoundTemplate) {
+          for (const innerTemplate of template.templates) {
+            if (offset + innerTemplate.size > index) {
+              break;
+            }
+            offset += innerTemplate.size;
           }
-          return !AlreadyUsedSpecies.includes(species);
-        }).flat();
+        }
 
-        // Filter out the species that are already in the enemy party from the partner trainer species pool
-        const speciesPoolPartnerFiltered = speciesPoolPartner.filter(species => {
-          // Since some species pools have arrays in them (use either of those species), we need to check if one of the species is already in the party and filter the whole array if it is
-          if (Array.isArray(species)) {
-            return !species.some(s => AlreadyUsedSpecies.includes(s));
-          }
-          return !AlreadyUsedSpecies.includes(species);
-        }).flat();
+        // Create an empty species pool (which will be set to one of the species pools based on the index)
+        let newSpeciesPool: Species[] = [];
+        let useNewSpeciesPool = false;
 
+        // If we are in a double battle of named trainers, we need to use alternate species pools (generate half the party from each trainer)
+        if (this.config.trainerTypeDouble && this.isDouble() && !this.config.doubleOnly) {
+          // Use the new species pool for this party generation
+          useNewSpeciesPool = true;
 
-        // If the index is even, use the species pool for the main trainer (that way he only uses his own pokemon in battle)
-        if (!(index % 2)) {
-          // Since the only currently allowed double battle with named trainers is Tate & Liza, we need to make sure that Solrock is the first pokemon in the party for Tate and Lunatone for Liza
-          if (index === 0 && (TrainerType[this.config.trainerType] === TrainerType[TrainerType.TATE])) {
-            newSpeciesPool = [ Species.SOLROCK ];
-          } else if (index === 0 && (TrainerType[this.config.trainerType] === TrainerType[TrainerType.LIZA])) {
-            newSpeciesPool = [ Species.LUNATONE ];
+          // Get the species pool for the partner trainer and the current trainer
+          const speciesPoolPartner = signatureSpecies[TrainerType[this.config.trainerTypeDouble]];
+          const speciesPool = signatureSpecies[TrainerType[this.config.trainerType]];
+
+          // Get the species that are already in the enemy party so we dont generate the same species twice
+          const AlreadyUsedSpecies = battle.enemyParty.map(p => p.species.speciesId);
+
+          // Filter out the species that are already in the enemy party from the main trainer species pool
+          const speciesPoolFiltered = speciesPool
+            .filter(species => {
+              // Since some species pools have arrays in them (use either of those species), we need to check if one of the species is already in the party and filter the whole array if it is
+              if (Array.isArray(species)) {
+                return !species.some(s => AlreadyUsedSpecies.includes(s));
+              }
+              return !AlreadyUsedSpecies.includes(species);
+            })
+            .flat();
+
+          // Filter out the species that are already in the enemy party from the partner trainer species pool
+          const speciesPoolPartnerFiltered = speciesPoolPartner
+            .filter(species => {
+              // Since some species pools have arrays in them (use either of those species), we need to check if one of the species is already in the party and filter the whole array if it is
+              if (Array.isArray(species)) {
+                return !species.some(s => AlreadyUsedSpecies.includes(s));
+              }
+              return !AlreadyUsedSpecies.includes(species);
+            })
+            .flat();
+
+          // If the index is even, use the species pool for the main trainer (that way he only uses his own pokemon in battle)
+          if (!(index % 2)) {
+            // Since the only currently allowed double battle with named trainers is Tate & Liza, we need to make sure that Solrock is the first pokemon in the party for Tate and Lunatone for Liza
+            if (index === 0 && TrainerType[this.config.trainerType] === TrainerType[TrainerType.TATE]) {
+              newSpeciesPool = [Species.SOLROCK];
+            } else if (index === 0 && TrainerType[this.config.trainerType] === TrainerType[TrainerType.LIZA]) {
+              newSpeciesPool = [Species.LUNATONE];
+            } else {
+              newSpeciesPool = speciesPoolFiltered;
+            }
           } else {
-            newSpeciesPool = speciesPoolFiltered;
+            // If the index is odd, use the species pool for the partner trainer (that way he only uses his own pokemon in battle)
+            // Since the only currently allowed double battle with named trainers is Tate & Liza, we need to make sure that Solrock is the first pokemon in the party for Tate and Lunatone for Liza
+            if (index === 1 && TrainerType[this.config.trainerTypeDouble] === TrainerType[TrainerType.TATE]) {
+              newSpeciesPool = [Species.SOLROCK];
+            } else if (index === 1 && TrainerType[this.config.trainerTypeDouble] === TrainerType[TrainerType.LIZA]) {
+              newSpeciesPool = [Species.LUNATONE];
+            } else {
+              newSpeciesPool = speciesPoolPartnerFiltered;
+            }
           }
-        } else {
-          // If the index is odd, use the species pool for the partner trainer (that way he only uses his own pokemon in battle)
-          // Since the only currently allowed double battle with named trainers is Tate & Liza, we need to make sure that Solrock is the first pokemon in the party for Tate and Lunatone for Liza
-          if (index === 1 && (TrainerType[this.config.trainerTypeDouble] === TrainerType[TrainerType.TATE])) {
-            newSpeciesPool = [ Species.SOLROCK ];
-          } else if (index === 1 && (TrainerType[this.config.trainerTypeDouble] === TrainerType[TrainerType.LIZA])) {
-            newSpeciesPool = [ Species.LUNATONE ];
-          } else {
-            newSpeciesPool = speciesPoolPartnerFiltered;
+          // Fallback for when the species pool is empty
+          if (newSpeciesPool.length === 0) {
+            // If all pokemon from this pool are already in the party, generate a random species
+            useNewSpeciesPool = false;
           }
         }
-        // Fallback for when the species pool is empty
-        if (newSpeciesPool.length === 0) {
-          // If all pokemon from this pool are already in the party, generate a random species
-          useNewSpeciesPool = false;
+
+        // If useNewSpeciesPool is true, we need to generate a new species from the new species pool, otherwise we generate a random species
+        let species = useNewSpeciesPool
+          ? getPokemonSpecies(newSpeciesPool[Math.floor(randSeedInt(newSpeciesPool.length))])
+          : template.isSameSpecies(index) && index > offset
+            ? getPokemonSpecies(
+                battle.enemyParty[offset].species.getTrainerSpeciesForLevel(
+                  level,
+                  false,
+                  template.getStrength(offset),
+                  globalScene.currentBattle.waveIndex,
+                ),
+              )
+            : this.genNewPartyMemberSpecies(level, strength);
+
+        // If the species is from newSpeciesPool, we need to adjust it based on the level and strength
+        if (newSpeciesPool) {
+          species = getPokemonSpecies(
+            species.getSpeciesForLevel(level, true, true, strength, globalScene.currentBattle.waveIndex),
+          );
         }
-      }
 
-      // If useNewSpeciesPool is true, we need to generate a new species from the new species pool, otherwise we generate a random species
-      let species = useNewSpeciesPool
-        ? getPokemonSpecies(newSpeciesPool[Math.floor(Utils.randSeedInt(newSpeciesPool.length))])
-        : template.isSameSpecies(index) && index > offset
-          ? getPokemonSpecies(battle.enemyParty[offset].species.getTrainerSpeciesForLevel(level, false, template.getStrength(offset), globalScene.currentBattle.waveIndex))
-          : this.genNewPartyMemberSpecies(level, strength);
-
-      // If the species is from newSpeciesPool, we need to adjust it based on the level and strength
-      if (newSpeciesPool) {
-        species = getPokemonSpecies(species.getSpeciesForLevel(level, true, true, strength, globalScene.currentBattle.waveIndex));
-      }
-
-      ret = globalScene.addEnemyPokemon(species, level, !this.isDouble() || !(index % 2) ? TrainerSlot.TRAINER : TrainerSlot.TRAINER_PARTNER);
-    }, this.config.hasStaticParty ? this.config.getDerivedType() + ((index + 1) << 8) : globalScene.currentBattle.waveIndex + (this.config.getDerivedType() << 10) + (((!this.config.useSameSeedForAllMembers ? index : 0) + 1) << 8));
+        ret = globalScene.addEnemyPokemon(
+          species,
+          level,
+          !this.isDouble() || !(index % 2) ? TrainerSlot.TRAINER : TrainerSlot.TRAINER_PARTNER,
+        );
+      },
+      this.config.hasStaticParty
+        ? this.config.getDerivedType() + ((index + 1) << 8)
+        : globalScene.currentBattle.waveIndex +
+            (this.config.getDerivedType() << 10) +
+            (((!this.config.useSameSeedForAllMembers ? index : 0) + 1) << 8),
+    );
 
     return ret!; // TODO: is this bang correct?
   }
 
-
   genNewPartyMemberSpecies(level: number, strength: PartyMemberStrength, attempt?: number): PokemonSpecies {
     const battle = globalScene.currentBattle;
     const template = this.getPartyTemplate();
 
     let baseSpecies: PokemonSpecies;
     if (this.config.speciesPools) {
-      const tierValue = Utils.randSeedInt(512);
-      let tier = tierValue >= 156 ? TrainerPoolTier.COMMON : tierValue >= 32 ? TrainerPoolTier.UNCOMMON : tierValue >= 6 ? TrainerPoolTier.RARE : tierValue >= 1 ? TrainerPoolTier.SUPER_RARE : TrainerPoolTier.ULTRA_RARE;
+      const tierValue = randSeedInt(512);
+      let tier =
+        tierValue >= 156
+          ? TrainerPoolTier.COMMON
+          : tierValue >= 32
+            ? TrainerPoolTier.UNCOMMON
+            : tierValue >= 6
+              ? TrainerPoolTier.RARE
+              : tierValue >= 1
+                ? TrainerPoolTier.SUPER_RARE
+                : TrainerPoolTier.ULTRA_RARE;
       console.log(TrainerPoolTier[tier]);
       while (!this.config.speciesPools.hasOwnProperty(tier) || !this.config.speciesPools[tier].length) {
-        console.log(`Downgraded trainer Pokemon rarity tier from ${TrainerPoolTier[tier]} to ${TrainerPoolTier[tier - 1]}`);
+        console.log(
+          `Downgraded trainer Pokemon rarity tier from ${TrainerPoolTier[tier]} to ${TrainerPoolTier[tier - 1]}`,
+        );
         tier--;
       }
       const tierPool = this.config.speciesPools[tier];
-      baseSpecies = getPokemonSpecies(Utils.randSeedItem(tierPool));
+      baseSpecies = getPokemonSpecies(randSeedItem(tierPool));
     } else {
       baseSpecies = globalScene.randomSpecies(battle.waveIndex, level, false, this.config.speciesFilter);
     }
 
-    let ret = getPokemonSpecies(baseSpecies.getTrainerSpeciesForLevel(level, true, strength, globalScene.currentBattle.waveIndex));
+    let ret = getPokemonSpecies(
+      baseSpecies.getTrainerSpeciesForLevel(level, true, strength, globalScene.currentBattle.waveIndex),
+    );
     let retry = false;
 
     console.log(ret.getName());
@@ -408,20 +500,27 @@ export default class Trainer extends Phaser.GameObjects.Container {
     if (pokemonPrevolutions.hasOwnProperty(baseSpecies.speciesId) && ret.speciesId !== baseSpecies.speciesId) {
       retry = true;
     } else if (template.isBalanced(battle.enemyParty.length)) {
-      const partyMemberTypes = battle.enemyParty.map(p => p.getTypes(true)).flat();
-      if (partyMemberTypes.indexOf(ret.type1) > -1 || (ret.type2 !== null && partyMemberTypes.indexOf(ret.type2) > -1)) {
+      const partyMemberTypes = battle.enemyParty.flatMap(p => p.getTypes(true));
+      if (
+        partyMemberTypes.indexOf(ret.type1) > -1 ||
+        (ret.type2 !== null && partyMemberTypes.indexOf(ret.type2) > -1)
+      ) {
         retry = true;
       }
     }
 
-    if (!retry && this.config.specialtyTypes.length && !this.config.specialtyTypes.find(t => ret.isOfType(t))) {
+    // Prompts reroll of party member species if doesn't fit specialty type.
+    // Can be removed by adding a type parameter to getTrainerSpeciesForLevel and filtering the list of evolutions for that type.
+    if (!retry && this.config.hasSpecialtyType() && !ret.isOfType(this.config.specialtyType)) {
       retry = true;
       console.log("Attempting reroll of species evolution to fit specialty type...");
       let evoAttempt = 0;
       while (retry && evoAttempt++ < 10) {
-        ret = getPokemonSpecies(baseSpecies.getTrainerSpeciesForLevel(level, true, strength, globalScene.currentBattle.waveIndex));
+        ret = getPokemonSpecies(
+          baseSpecies.getTrainerSpeciesForLevel(level, true, strength, globalScene.currentBattle.waveIndex),
+        );
         console.log(ret.name);
-        if (this.config.specialtyTypes.find(t => ret.isOfType(t))) {
+        if (ret.isOfType(this.config.specialtyType)) {
           retry = false;
         }
       }
@@ -462,13 +561,16 @@ export default class Trainer extends Phaser.GameObjects.Container {
     return currentSpecies.includes(baseSpecies) || staticSpecies.includes(baseSpecies);
   }
 
-  getPartyMemberMatchupScores(trainerSlot: TrainerSlot = TrainerSlot.NONE, forSwitch: boolean = false): [number, number][] {
+  getPartyMemberMatchupScores(trainerSlot: TrainerSlot = TrainerSlot.NONE, forSwitch = false): [number, number][] {
     if (trainerSlot && !this.isDouble()) {
       trainerSlot = TrainerSlot.NONE;
     }
 
     const party = globalScene.getEnemyParty();
-    const nonFaintedLegalPartyMembers = party.slice(globalScene.currentBattle.getBattlerCount()).filter(p => p.isAllowedInBattle()).filter(p => !trainerSlot || p.trainerSlot === trainerSlot);
+    const nonFaintedLegalPartyMembers = party
+      .slice(globalScene.currentBattle.getBattlerCount())
+      .filter(p => p.isAllowedInBattle())
+      .filter(p => !trainerSlot || p.trainerSlot === trainerSlot);
     const partyMemberScores = nonFaintedLegalPartyMembers.map(p => {
       const playerField = globalScene.getPlayerField().filter(p => p.isAllowedInBattle());
       let score = 0;
@@ -482,11 +584,13 @@ export default class Trainer extends Phaser.GameObjects.Container {
         }
         score /= playerField.length;
         if (forSwitch && !p.isOnField()) {
-          globalScene.arena.findTagsOnSide(t => t instanceof ArenaTrapTag, ArenaTagSide.ENEMY).map(t => score *= (t as ArenaTrapTag).getMatchupScoreMultiplier(p));
+          globalScene.arena
+            .findTagsOnSide(t => t instanceof ArenaTrapTag, ArenaTagSide.ENEMY)
+            .map(t => (score *= (t as ArenaTrapTag).getMatchupScoreMultiplier(p)));
         }
       }
 
-      return [ party.indexOf(p), score ];
+      return [party.indexOf(p), score];
     }) as [number, number][];
 
     return partyMemberScores;
@@ -503,18 +607,26 @@ export default class Trainer extends Phaser.GameObjects.Container {
     return sortedPartyMemberScores;
   }
 
-  getNextSummonIndex(trainerSlot: TrainerSlot = TrainerSlot.NONE, partyMemberScores: [number, number][] = this.getPartyMemberMatchupScores(trainerSlot)): number {
+  getNextSummonIndex(
+    trainerSlot: TrainerSlot = TrainerSlot.NONE,
+    partyMemberScores: [number, number][] = this.getPartyMemberMatchupScores(trainerSlot),
+  ): number {
     if (trainerSlot && !this.isDouble()) {
       trainerSlot = TrainerSlot.NONE;
     }
 
     const sortedPartyMemberScores = this.getSortedPartyMemberMatchupScores(partyMemberScores);
 
-    const maxScorePartyMemberIndexes = partyMemberScores.filter(pms => pms[1] === sortedPartyMemberScores[0][1]).map(pms => pms[0]);
+    const maxScorePartyMemberIndexes = partyMemberScores
+      .filter(pms => pms[1] === sortedPartyMemberScores[0][1])
+      .map(pms => pms[0]);
 
     if (maxScorePartyMemberIndexes.length > 1) {
       let rand: number;
-      globalScene.executeWithSeedOffset(() => rand = Utils.randSeedInt(maxScorePartyMemberIndexes.length), globalScene.currentBattle.turn << 2);
+      globalScene.executeWithSeedOffset(
+        () => (rand = randSeedInt(maxScorePartyMemberIndexes.length)),
+        globalScene.currentBattle.turn << 2,
+      );
       return maxScorePartyMemberIndexes[rand!];
     }
 
@@ -546,6 +658,13 @@ export default class Trainer extends Phaser.GameObjects.Container {
     return [];
   }
 
+  genAI(party: EnemyPokemon[]) {
+    if (this.config.genAIFuncs) {
+      this.config.genAIFuncs.forEach(f => f(party));
+    }
+    console.log("Generated AI funcs");
+  }
+
   loadAssets(): Promise<void> {
     return this.config.loadAssets(this.variant);
   }
@@ -563,7 +682,11 @@ export default class Trainer extends Phaser.GameObjects.Container {
    * @param animConfig {@linkcode Phaser.Types.Animations.PlayAnimationConfig} to pass to {@linkcode Phaser.GameObjects.Sprite.play}
    * @returns true if the sprite was able to be animated
    */
-  tryPlaySprite(sprite: Phaser.GameObjects.Sprite, tintSprite: Phaser.GameObjects.Sprite, animConfig: Phaser.Types.Animations.PlayAnimationConfig): boolean {
+  tryPlaySprite(
+    sprite: Phaser.GameObjects.Sprite,
+    tintSprite: Phaser.GameObjects.Sprite,
+    animConfig: Phaser.Types.Animations.PlayAnimationConfig,
+  ): boolean {
     // Show an error in the console if there isn't a texture loaded
     if (sprite.texture.key === "__MISSING") {
       console.error(`No texture found for '${animConfig.key}'!`);
@@ -587,7 +710,7 @@ export default class Trainer extends Phaser.GameObjects.Container {
     const trainerAnimConfig = {
       key: this.getKey(),
       repeat: 0,
-      startFrame: 0
+      startFrame: 0,
     };
     const sprites = this.getSprites();
     const tintSprites = this.getTintSprites();
@@ -599,7 +722,7 @@ export default class Trainer extends Phaser.GameObjects.Container {
       const partnerTrainerAnimConfig = {
         key: this.getKey(true),
         repeat: 0,
-        startFrame: 0
+        startFrame: 0,
       };
 
       this.tryPlaySprite(sprites[1], tintSprites[1], partnerTrainerAnimConfig);
@@ -607,9 +730,7 @@ export default class Trainer extends Phaser.GameObjects.Container {
   }
 
   getSprites(): Phaser.GameObjects.Sprite[] {
-    const ret: Phaser.GameObjects.Sprite[] = [
-      this.getAt(0)
-    ];
+    const ret: Phaser.GameObjects.Sprite[] = [this.getAt(0)];
     if (this.variant === TrainerVariant.DOUBLE && !this.config.doubleOnly) {
       ret.push(this.getAt(2));
     }
@@ -617,9 +738,7 @@ export default class Trainer extends Phaser.GameObjects.Container {
   }
 
   getTintSprites(): Phaser.GameObjects.Sprite[] {
-    const ret: Phaser.GameObjects.Sprite[] = [
-      this.getAt(1)
-    ];
+    const ret: Phaser.GameObjects.Sprite[] = [this.getAt(1)];
     if (this.variant === TrainerVariant.DOUBLE && !this.config.doubleOnly) {
       ret.push(this.getAt(3));
     }
@@ -639,7 +758,7 @@ export default class Trainer extends Phaser.GameObjects.Container {
           targets: tintSprite,
           alpha: alpha || 1,
           duration: duration,
-          ease: ease || "Linear"
+          ease: ease || "Linear",
         });
       } else {
         tintSprite.setAlpha(alpha);
@@ -659,7 +778,7 @@ export default class Trainer extends Phaser.GameObjects.Container {
           onComplete: () => {
             tintSprite.setVisible(false);
             tintSprite.setAlpha(1);
-          }
+          },
         });
       } else {
         tintSprite.setVisible(false);
@@ -667,4 +786,18 @@ export default class Trainer extends Phaser.GameObjects.Container {
       }
     });
   }
+
+  /**
+   * Determines whether a Trainer should Terastallize their Pokemon
+   * @param pokemon {@linkcode EnemyPokemon} Trainer Pokemon in question
+   * @returns boolean Whether the EnemyPokemon should Terastalize this turn
+   */
+  shouldTera(pokemon: EnemyPokemon): boolean {
+    if (this.config.trainerAI.teraMode === TeraAIMode.INSTANT_TERA) {
+      if (!pokemon.isTerastallized && this.config.trainerAI.instantTeras.includes(pokemon.initialTeamIndex)) {
+        return true;
+      }
+    }
+    return false;
+  }
 }
diff --git a/src/game-mode.ts b/src/game-mode.ts
index 1da125ea55a..ec7171b0024 100644
--- a/src/game-mode.ts
+++ b/src/game-mode.ts
@@ -7,19 +7,20 @@ import type PokemonSpecies from "./data/pokemon-species";
 import { allSpecies } from "./data/pokemon-species";
 import type { Arena } from "./field/arena";
 import Overrides from "#app/overrides";
-import * as Utils from "./utils";
+import { randSeedInt, randSeedItem } from "#app/utils/common";
 import { Biome } from "#enums/biome";
 import { Species } from "#enums/species";
 import { Challenges } from "./enums/challenges";
 import { globalScene } from "#app/global-scene";
 import { getDailyStartingBiome } from "./data/daily-run";
+import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES, CHALLENGE_MODE_MYSTERY_ENCOUNTER_WAVES } from "./constants";
 
 export enum GameModes {
   CLASSIC,
   ENDLESS,
   SPLICED_ENDLESS,
   DAILY,
-  CHALLENGE
+  CHALLENGE,
 }
 
 interface GameModeConfig {
@@ -36,10 +37,6 @@ interface GameModeConfig {
   hasMysteryEncounters?: boolean;
 }
 
-// Describes min and max waves for MEs in specific game modes
-export const CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES: [number, number] = [ 10, 180 ];
-export const CHALLENGE_MODE_MYSTERY_ENCOUNTER_WAVES: [number, number] = [ 10, 180 ];
-
 export class GameMode implements GameModeConfig {
   public modeId: GameModes;
   public isClassic: boolean;
@@ -68,6 +65,19 @@ export class GameMode implements GameModeConfig {
     this.battleConfig = battleConfig || {};
   }
 
+  /**
+   * Enables challenges if they are disabled and sets the specified challenge's value
+   * @param challenge The challenge to set
+   * @param value The value to give the challenge. Impact depends on the specific challenge
+   */
+  setChallengeValue(challenge: Challenges, value: number) {
+    if (!this.isChallenge) {
+      this.isChallenge = true;
+      this.challenges = allChallenges.map(c => copyChallenge(c));
+    }
+    this.challenges.filter((chal: Challenge) => chal.id === challenge).map((chal: Challenge) => (chal.value = value));
+  }
+
   /**
    * Helper function to see if a GameMode has a specific challenge type
    * @param challenge the Challenges it looks for
@@ -127,7 +137,7 @@ export class GameMode implements GameModeConfig {
     }
   }
 
-  getWaveForDifficulty(waveIndex: number, ignoreCurveChanges: boolean = false): number {
+  getWaveForDifficulty(waveIndex: number, ignoreCurveChanges = false): number {
     switch (this.modeId) {
       case GameModes.DAILY:
         return waveIndex + 30 + (!ignoreCurveChanges ? Math.floor(waveIndex / 5) : 0);
@@ -149,9 +159,10 @@ export class GameMode implements GameModeConfig {
     if (this.isDaily) {
       return waveIndex % 10 === 5 || (!(waveIndex % 10) && waveIndex > 10 && !this.isWaveFinal(waveIndex));
     }
-    if ((waveIndex % 30) === (globalScene.offsetGym ? 0 : 20) && !this.isWaveFinal(waveIndex)) {
+    if (waveIndex % 30 === (globalScene.offsetGym ? 0 : 20) && !this.isWaveFinal(waveIndex)) {
       return true;
-    } else if (waveIndex % 10 !== 1 && waveIndex % 10) {
+    }
+    if (waveIndex % 10 !== 1 && waveIndex % 10) {
       /**
        * Do not check X1 floors since there's a bug that stops trainer sprites from appearing
        * after a X0 full party heal
@@ -165,13 +176,14 @@ export class GameMode implements GameModeConfig {
           if (w === waveIndex) {
             continue;
           }
-          if ((w % 30) === (globalScene.offsetGym ? 0 : 20) || this.isFixedBattle(w)) {
+          if (w % 30 === (globalScene.offsetGym ? 0 : 20) || this.isFixedBattle(w)) {
             allowTrainerBattle = false;
             break;
-          } else if (w < waveIndex) {
+          }
+          if (w < waveIndex) {
             globalScene.executeWithSeedOffset(() => {
               const waveTrainerChance = arena.getTrainerChance();
-              if (!Utils.randSeedInt(waveTrainerChance)) {
+              if (!randSeedInt(waveTrainerChance)) {
                 allowTrainerBattle = false;
               }
             }, w);
@@ -181,7 +193,7 @@ export class GameMode implements GameModeConfig {
           }
         }
       }
-      return Boolean(allowTrainerBattle && trainerChance && !Utils.randSeedInt(trainerChance));
+      return Boolean(allowTrainerBattle && trainerChance && !randSeedInt(trainerChance));
     }
     return false;
   }
@@ -191,15 +203,23 @@ export class GameMode implements GameModeConfig {
       case GameModes.DAILY:
         return waveIndex > 10 && waveIndex < 50 && !(waveIndex % 10);
       default:
-        return (waveIndex % 30) === (offsetGym ? 0 : 20) && (biomeType !== Biome.END || this.isClassic || this.isWaveFinal(waveIndex));
+        return (
+          waveIndex % 30 === (offsetGym ? 0 : 20) &&
+          (biomeType !== Biome.END || this.isClassic || this.isWaveFinal(waveIndex))
+        );
     }
   }
 
   getOverrideSpecies(waveIndex: number): PokemonSpecies | null {
     if (this.isDaily && this.isWaveFinal(waveIndex)) {
-      const allFinalBossSpecies = allSpecies.filter(s => (s.subLegendary || s.legendary || s.mythical)
-        && s.baseTotal >= 600 && s.speciesId !== Species.ETERNATUS && s.speciesId !== Species.ARCEUS);
-      return Utils.randSeedItem(allFinalBossSpecies);
+      const allFinalBossSpecies = allSpecies.filter(
+        s =>
+          (s.subLegendary || s.legendary || s.mythical) &&
+          s.baseTotal >= 600 &&
+          s.speciesId !== Species.ETERNATUS &&
+          s.speciesId !== Species.ARCEUS,
+      );
+      return randSeedItem(allFinalBossSpecies);
     }
 
     return null;
@@ -225,9 +245,9 @@ export class GameMode implements GameModeConfig {
   }
 
   /**
-     * Every 10 waves is a boss battle
-     * @returns true if waveIndex is a multiple of 10
-     */
+   * Every 10 waves is a boss battle
+   * @returns true if waveIndex is a multiple of 10
+   */
   isBoss(waveIndex: number): boolean {
     return waveIndex % 10 === 0;
   }
@@ -240,33 +260,30 @@ export class GameMode implements GameModeConfig {
   }
 
   /**
-     * Every 50 waves of an Endless mode is a boss
-     * At this time it is paradox pokemon
-     * @returns true if waveIndex is a multiple of 50 in Endless
-     */
+   * Every 50 waves of an Endless mode is a boss
+   * At this time it is paradox pokemon
+   * @returns true if waveIndex is a multiple of 50 in Endless
+   */
   isEndlessBoss(waveIndex: number): boolean {
-    return waveIndex % 50 === 0 &&
-        (this.modeId === GameModes.ENDLESS || this.modeId === GameModes.SPLICED_ENDLESS);
+    return waveIndex % 50 === 0 && (this.modeId === GameModes.ENDLESS || this.modeId === GameModes.SPLICED_ENDLESS);
   }
 
   /**
-     * Every 250 waves of an Endless mode is a minor boss
-     * At this time it is Eternatus
-     * @returns true if waveIndex is a multiple of 250 in Endless
-     */
+   * Every 250 waves of an Endless mode is a minor boss
+   * At this time it is Eternatus
+   * @returns true if waveIndex is a multiple of 250 in Endless
+   */
   isEndlessMinorBoss(waveIndex: number): boolean {
-    return waveIndex % 250 === 0 &&
-        (this.modeId === GameModes.ENDLESS || this.modeId === GameModes.SPLICED_ENDLESS);
+    return waveIndex % 250 === 0 && (this.modeId === GameModes.ENDLESS || this.modeId === GameModes.SPLICED_ENDLESS);
   }
 
   /**
-     * Every 1000 waves of an Endless mode is a major boss
-     * At this time it is Eternamax Eternatus
-     * @returns true if waveIndex is a multiple of 1000 in Endless
-     */
+   * Every 1000 waves of an Endless mode is a major boss
+   * At this time it is Eternamax Eternatus
+   * @returns true if waveIndex is a multiple of 1000 in Endless
+   */
   isEndlessMajorBoss(waveIndex: number): boolean {
-    return waveIndex % 1000 === 0 &&
-        (this.modeId === GameModes.ENDLESS || this.modeId === GameModes.SPLICED_ENDLESS);
+    return waveIndex % 1000 === 0 && (this.modeId === GameModes.ENDLESS || this.modeId === GameModes.SPLICED_ENDLESS);
   }
 
   /**
@@ -276,7 +293,10 @@ export class GameMode implements GameModeConfig {
    */
   isFixedBattle(waveIndex: number): boolean {
     const dummyConfig = new FixedBattleConfig();
-    return this.battleConfig.hasOwnProperty(waveIndex) || applyChallenges(this, ChallengeType.FIXED_BATTLES, waveIndex, dummyConfig);
+    return (
+      this.battleConfig.hasOwnProperty(waveIndex) ||
+      applyChallenges(ChallengeType.FIXED_BATTLES, waveIndex, dummyConfig)
+    );
   }
 
   /**
@@ -286,14 +306,12 @@ export class GameMode implements GameModeConfig {
    */
   getFixedBattle(waveIndex: number): FixedBattleConfig {
     const challengeConfig = new FixedBattleConfig();
-    if (applyChallenges(this, ChallengeType.FIXED_BATTLES, waveIndex, challengeConfig)) {
+    if (applyChallenges(ChallengeType.FIXED_BATTLES, waveIndex, challengeConfig)) {
       return challengeConfig;
-    } else {
-      return this.battleConfig[waveIndex];
     }
+    return this.battleConfig[waveIndex];
   }
 
-
   getClearScoreBonus(): number {
     switch (this.modeId) {
       case GameModes.CLASSIC:
@@ -338,12 +356,12 @@ export class GameMode implements GameModeConfig {
    */
   getMysteryEncounterLegalWaves(): [number, number] {
     switch (this.modeId) {
-      default:
-        return [ 0, 0 ];
       case GameModes.CLASSIC:
         return CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES;
       case GameModes.CHALLENGE:
         return CHALLENGE_MODE_MYSTERY_ENCOUNTER_WAVES;
+      default:
+        return [0, 0];
     }
   }
 
@@ -366,14 +384,40 @@ export class GameMode implements GameModeConfig {
 export function getGameMode(gameMode: GameModes): GameMode {
   switch (gameMode) {
     case GameModes.CLASSIC:
-      return new GameMode(GameModes.CLASSIC, { isClassic: true, hasTrainers: true, hasMysteryEncounters: true }, classicFixedBattles);
+      return new GameMode(
+        GameModes.CLASSIC,
+        { isClassic: true, hasTrainers: true, hasMysteryEncounters: true },
+        classicFixedBattles,
+      );
     case GameModes.ENDLESS:
-      return new GameMode(GameModes.ENDLESS, { isEndless: true, hasShortBiomes: true, hasRandomBosses: true });
+      return new GameMode(GameModes.ENDLESS, {
+        isEndless: true,
+        hasShortBiomes: true,
+        hasRandomBosses: true,
+      });
     case GameModes.SPLICED_ENDLESS:
-      return new GameMode(GameModes.SPLICED_ENDLESS, { isEndless: true, hasShortBiomes: true, hasRandomBosses: true, isSplicedOnly: true });
+      return new GameMode(GameModes.SPLICED_ENDLESS, {
+        isEndless: true,
+        hasShortBiomes: true,
+        hasRandomBosses: true,
+        isSplicedOnly: true,
+      });
     case GameModes.DAILY:
-      return new GameMode(GameModes.DAILY, { isDaily: true, hasTrainers: true, hasNoShop: true });
+      return new GameMode(GameModes.DAILY, {
+        isDaily: true,
+        hasTrainers: true,
+        hasNoShop: true,
+      });
     case GameModes.CHALLENGE:
-      return new GameMode(GameModes.CHALLENGE, { isClassic: true, hasTrainers: true, isChallenge: true, hasMysteryEncounters: true }, classicFixedBattles);
+      return new GameMode(
+        GameModes.CHALLENGE,
+        {
+          isClassic: true,
+          hasTrainers: true,
+          isChallenge: true,
+          hasMysteryEncounters: true,
+        },
+        classicFixedBattles,
+      );
   }
 }
diff --git a/src/global-event-manager.ts b/src/global-event-manager.ts
new file mode 100644
index 00000000000..3df3d17b5e9
--- /dev/null
+++ b/src/global-event-manager.ts
@@ -0,0 +1,3 @@
+import { TimedEventManager } from "./timed-event-manager";
+
+export const timedEventManager = new TimedEventManager();
diff --git a/src/global-vars/bypass-login.ts b/src/global-vars/bypass-login.ts
new file mode 100644
index 00000000000..3595a076101
--- /dev/null
+++ b/src/global-vars/bypass-login.ts
@@ -0,0 +1 @@
+export const bypassLogin = import.meta.env.VITE_BYPASS_LOGIN === "1";
diff --git a/src/global-vars/starter-colors.ts b/src/global-vars/starter-colors.ts
new file mode 100644
index 00000000000..6abe028be99
--- /dev/null
+++ b/src/global-vars/starter-colors.ts
@@ -0,0 +1,4 @@
+export const starterColors: StarterColors = {};
+interface StarterColors {
+  [key: string]: [string, string];
+}
diff --git a/src/inputs-controller.ts b/src/inputs-controller.ts
index d382caf6cb6..02a95f71ac4 100644
--- a/src/inputs-controller.ts
+++ b/src/inputs-controller.ts
@@ -1,20 +1,16 @@
 import Phaser from "phaser";
-import * as Utils from "./utils";
-import { deepCopy } from "./utils";
+import { getEnumValues } from "#app/utils/common";
+import { deepCopy } from "#app/utils/data";
 import pad_generic from "./configs/inputs/pad_generic";
 import pad_unlicensedSNES from "./configs/inputs/pad_unlicensedSNES";
 import pad_xbox360 from "./configs/inputs/pad_xbox360";
 import pad_dualshock from "./configs/inputs/pad_dualshock";
 import pad_procon from "./configs/inputs/pad_procon";
-import { Mode } from "./ui/ui";
+import { UiMode } from "#enums/ui-mode";
 import type SettingsGamepadUiHandler from "./ui/settings/settings-gamepad-ui-handler";
 import type SettingsKeyboardUiHandler from "./ui/settings/settings-keyboard-ui-handler";
 import cfg_keyboard_qwerty from "./configs/inputs/cfg_keyboard_qwerty";
-import {
-  assign,
-  getButtonWithKeycode,
-  getIconForLatestInput, swap,
-} from "#app/configs/inputs/configHandler";
+import { assign, getButtonWithKeycode, getIconForLatestInput, swap } from "#app/configs/inputs/configHandler";
 import { globalScene } from "#app/global-scene";
 import type { SettingGamepad } from "#app/system/settings/settings-gamepad";
 import type { SettingKeyboard } from "#app/system/settings/settings-keyboard";
@@ -24,29 +20,29 @@ import { Device } from "#enums/devices";
 import MoveTouchControlsHandler from "./ui/settings/move-touch-controls-handler";
 
 export interface DeviceMapping {
-    [key: string]: number;
+  [key: string]: number;
 }
 
 export interface IconsMapping {
-    [key: string]: string;
+  [key: string]: string;
 }
 
 export interface SettingMapping {
-    [key: string]: Button;
+  [key: string]: Button;
 }
 
 export interface MappingLayout {
-    [key: string]: SettingGamepad | SettingKeyboard | number;
+  [key: string]: SettingGamepad | SettingKeyboard | number;
 }
 
 export interface InterfaceConfig {
-    padID: string;
-    padType: string;
-    deviceMapping: DeviceMapping;
-    icons: IconsMapping;
-    settings: SettingMapping;
-    default: MappingLayout;
-    custom?: MappingLayout;
+  padID: string;
+  padType: string;
+  deviceMapping: DeviceMapping;
+  icons: IconsMapping;
+  settings: SettingMapping;
+  default: MappingLayout;
+  custom?: MappingLayout;
 }
 
 const repeatInputDelayMillis = 250;
@@ -81,33 +77,32 @@ export class InputsController {
   private interactions: Map<Button, Map<string, boolean>> = new Map();
   private configs: Map<string, InterfaceConfig> = new Map();
 
-  public gamepadSupport: boolean = true;
+  public gamepadSupport = true;
   public selectedDevice;
 
-  private disconnectedGamepads: Array<String> = new Array();
+  private disconnectedGamepads: Array<string> = new Array();
 
-
-  public lastSource: string = "keyboard";
+  public lastSource = "keyboard";
   private inputInterval: NodeJS.Timeout[] = new Array();
   private touchControls: TouchControl;
   public moveTouchControlsHandler: MoveTouchControlsHandler;
 
   /**
-     * Initializes a new instance of the game control system, setting up initial state and configurations.
-     *
-     * @remarks
-     * This constructor initializes the game control system with necessary setups for handling inputs.
-     * It prepares an interactions array indexed by button identifiers and configures default states for each button.
-     * Specific buttons like MENU and STATS are set not to repeat their actions.
-     * It concludes by calling the `init` method to complete the setup.
-     */
+   * Initializes a new instance of the game control system, setting up initial state and configurations.
+   *
+   * @remarks
+   * This constructor initializes the game control system with necessary setups for handling inputs.
+   * It prepares an interactions array indexed by button identifiers and configures default states for each button.
+   * Specific buttons like MENU and STATS are set not to repeat their actions.
+   * It concludes by calling the `init` method to complete the setup.
+   */
   constructor() {
     this.selectedDevice = {
       [Device.GAMEPAD]: null,
-      [Device.KEYBOARD]: "default"
+      [Device.KEYBOARD]: "default",
     };
 
-    for (const b of Utils.getEnumValues(Button)) {
+    for (const b of getEnumValues(Button)) {
       this.interactions[b] = {
         pressTime: false,
         isPressed: false,
@@ -121,13 +116,13 @@ export class InputsController {
   }
 
   /**
-     * Sets up event handlers and initializes gamepad and keyboard controls.
-     *
-     * @remarks
-     * This method configures event listeners for both gamepad and keyboard inputs.
-     * It handles gamepad connections/disconnections and button press events, and ensures keyboard controls are set up.
-     * Additionally, it manages the game's behavior when it loses focus to prevent unwanted game actions during this state.
-     */
+   * Sets up event handlers and initializes gamepad and keyboard controls.
+   *
+   * @remarks
+   * This method configures event listeners for both gamepad and keyboard inputs.
+   * It handles gamepad connections/disconnections and button press events, and ensures keyboard controls are set up.
+   * Additionally, it manages the game's behavior when it loses focus to prevent unwanted game actions during this state.
+   */
   init(): void {
     this.events = globalScene.game.events;
 
@@ -136,18 +131,26 @@ export class InputsController {
     });
 
     if (typeof globalScene.input.gamepad !== "undefined") {
-      globalScene.input.gamepad?.on("connected", function (thisGamepad) {
-        if (!thisGamepad) {
-          return;
-        }
-        this.refreshGamepads();
-        this.setupGamepad(thisGamepad);
-        this.onReconnect(thisGamepad);
-      }, this);
+      globalScene.input.gamepad?.on(
+        "connected",
+        function (thisGamepad) {
+          if (!thisGamepad) {
+            return;
+          }
+          this.refreshGamepads();
+          this.setupGamepad(thisGamepad);
+          this.onReconnect(thisGamepad);
+        },
+        this,
+      );
 
-      globalScene.input.gamepad?.on("disconnected", function (thisGamepad) {
-        this.onDisconnect(thisGamepad); // when a gamepad is disconnected
-      }, this);
+      globalScene.input.gamepad?.on(
+        "disconnected",
+        function (thisGamepad) {
+          this.onDisconnect(thisGamepad); // when a gamepad is disconnected
+        },
+        this,
+      );
 
       // Check to see if the gamepad has already been setup by the browser
       globalScene.input.gamepad?.refreshPads();
@@ -168,24 +171,24 @@ export class InputsController {
   }
 
   /**
-     * Handles actions to take when the game loses focus, such as deactivating pressed keys.
-     *
-     * @remarks
-     * This method is triggered when the game or the browser tab loses focus. It ensures that any keys pressed are deactivated to prevent stuck keys affecting gameplay when the game is not active.
-     */
+   * Handles actions to take when the game loses focus, such as deactivating pressed keys.
+   *
+   * @remarks
+   * This method is triggered when the game or the browser tab loses focus. It ensures that any keys pressed are deactivated to prevent stuck keys affecting gameplay when the game is not active.
+   */
   loseFocus(): void {
     this.deactivatePressedKey();
     this.touchControls.deactivatePressedKey();
   }
 
   /**
-     * Enables or disables support for gamepad input.
-     *
-     * @param value - A boolean indicating whether gamepad support should be enabled (true) or disabled (false).
-     *
-     * @remarks
-     * This method toggles gamepad support. If disabled, it also ensures that all currently pressed gamepad buttons are deactivated to avoid stuck inputs.
-     */
+   * Enables or disables support for gamepad input.
+   *
+   * @param value - A boolean indicating whether gamepad support should be enabled (true) or disabled (false).
+   *
+   * @remarks
+   * This method toggles gamepad support. If disabled, it also ensures that all currently pressed gamepad buttons are deactivated to avoid stuck inputs.
+   */
   setGamepadSupport(value: boolean): void {
     if (value) {
       this.gamepadSupport = true;
@@ -196,92 +199,92 @@ export class InputsController {
   }
 
   /**
-     * Sets the currently chosen gamepad and initializes related settings.
-     * This method first deactivates any active key presses and then initializes the gamepad settings.
-     *
-     * @param gamepad - The identifier of the gamepad to set as chosen.
-     */
-  setChosenGamepad(gamepad: String): void {
+   * Sets the currently chosen gamepad and initializes related settings.
+   * This method first deactivates any active key presses and then initializes the gamepad settings.
+   *
+   * @param gamepad - The identifier of the gamepad to set as chosen.
+   */
+  setChosenGamepad(gamepad: string): void {
     this.deactivatePressedKey();
     this.initChosenGamepad(gamepad);
   }
 
   /**
-     * Sets the currently chosen keyboard layout and initializes related settings.
-     *
-     * @param layoutKeyboard - The identifier of the keyboard layout to set as chosen.
-     */
-  setChosenKeyboardLayout(layoutKeyboard: String): void {
+   * Sets the currently chosen keyboard layout and initializes related settings.
+   *
+   * @param layoutKeyboard - The identifier of the keyboard layout to set as chosen.
+   */
+  setChosenKeyboardLayout(layoutKeyboard: string): void {
     this.deactivatePressedKey();
     this.initChosenLayoutKeyboard(layoutKeyboard);
   }
 
   /**
-     * Retrieves the identifiers of all connected gamepads, excluding any that are currently marked as disconnected.
-     * @returns Array<String> An array of strings representing the IDs of the connected gamepads.
-     */
-  getGamepadsName(): Array<String> {
+   * Retrieves the identifiers of all connected gamepads, excluding any that are currently marked as disconnected.
+   * @returns Array<String> An array of strings representing the IDs of the connected gamepads.
+   */
+  getGamepadsName(): Array<string> {
     return this.gamepads.filter(g => !this.disconnectedGamepads.includes(g.id)).map(g => g.id);
   }
 
   /**
-     * Initializes the chosen gamepad by setting its identifier in the local storage and updating the UI to reflect the chosen gamepad.
-     * If a gamepad name is provided, it uses that as the chosen gamepad; otherwise, it defaults to the currently chosen gamepad.
-     * @param gamepadName Optional parameter to specify the name of the gamepad to initialize as chosen.
-     */
-  initChosenGamepad(gamepadName?: String): void {
+   * Initializes the chosen gamepad by setting its identifier in the local storage and updating the UI to reflect the chosen gamepad.
+   * If a gamepad name is provided, it uses that as the chosen gamepad; otherwise, it defaults to the currently chosen gamepad.
+   * @param gamepadName Optional parameter to specify the name of the gamepad to initialize as chosen.
+   */
+  initChosenGamepad(gamepadName?: string): void {
     if (gamepadName) {
       this.selectedDevice[Device.GAMEPAD] = gamepadName.toLowerCase();
     }
-    const handler = globalScene.ui?.handlers[Mode.SETTINGS_GAMEPAD] as SettingsGamepadUiHandler;
-    handler && handler.updateChosenGamepadDisplay();
+    const handler = globalScene.ui?.handlers[UiMode.SETTINGS_GAMEPAD] as SettingsGamepadUiHandler;
+    handler?.updateChosenGamepadDisplay();
   }
 
   /**
-     * Initializes the chosen keyboard layout by setting its identifier in the local storage and updating the UI to reflect the chosen layout.
-     * If a layout name is provided, it uses that as the chosen layout; otherwise, it defaults to the currently chosen layout.
-     * @param layoutKeyboard Optional parameter to specify the name of the keyboard layout to initialize as chosen.
-     */
-  initChosenLayoutKeyboard(layoutKeyboard?: String): void {
+   * Initializes the chosen keyboard layout by setting its identifier in the local storage and updating the UI to reflect the chosen layout.
+   * If a layout name is provided, it uses that as the chosen layout; otherwise, it defaults to the currently chosen layout.
+   * @param layoutKeyboard Optional parameter to specify the name of the keyboard layout to initialize as chosen.
+   */
+  initChosenLayoutKeyboard(layoutKeyboard?: string): void {
     if (layoutKeyboard) {
       this.selectedDevice[Device.KEYBOARD] = layoutKeyboard.toLowerCase();
     }
-    const handler = globalScene.ui?.handlers[Mode.SETTINGS_KEYBOARD] as SettingsKeyboardUiHandler;
-    handler && handler.updateChosenKeyboardDisplay();
+    const handler = globalScene.ui?.handlers[UiMode.SETTINGS_KEYBOARD] as SettingsKeyboardUiHandler;
+    handler?.updateChosenKeyboardDisplay();
   }
 
   /**
-     * Handles the disconnection of a gamepad by adding its identifier to a list of disconnected gamepads.
-     * This is necessary because Phaser retains memory of previously connected gamepads, and without tracking
-     * disconnections, it would be impossible to determine the connection status of gamepads. This method ensures
-     * that disconnected gamepads are recognized and can be appropriately hidden in the gamepad selection menu.
-     *
-     * @param thisGamepad The gamepad that has been disconnected.
-     */
+   * Handles the disconnection of a gamepad by adding its identifier to a list of disconnected gamepads.
+   * This is necessary because Phaser retains memory of previously connected gamepads, and without tracking
+   * disconnections, it would be impossible to determine the connection status of gamepads. This method ensures
+   * that disconnected gamepads are recognized and can be appropriately hidden in the gamepad selection menu.
+   *
+   * @param thisGamepad The gamepad that has been disconnected.
+   */
   onDisconnect(thisGamepad: Phaser.Input.Gamepad.Gamepad): void {
     this.disconnectedGamepads.push(thisGamepad.id);
   }
 
   /**
-     * Updates the tracking of disconnected gamepads when a gamepad is reconnected.
-     * It removes the reconnected gamepad's identifier from the `disconnectedGamepads` array,
-     * effectively updating its status to connected.
-     *
-     * @param thisGamepad The gamepad that has been reconnected.
-     */
+   * Updates the tracking of disconnected gamepads when a gamepad is reconnected.
+   * It removes the reconnected gamepad's identifier from the `disconnectedGamepads` array,
+   * effectively updating its status to connected.
+   *
+   * @param thisGamepad The gamepad that has been reconnected.
+   */
   onReconnect(thisGamepad: Phaser.Input.Gamepad.Gamepad): void {
     this.disconnectedGamepads = this.disconnectedGamepads.filter(g => g !== thisGamepad.id);
   }
 
   /**
-     * Initializes or updates configurations for connected gamepads.
-     * It retrieves the names of all connected gamepads, sets up their configurations according to stored or default settings,
-     * and ensures these configurations are saved. If the connected gamepad is the currently chosen one,
-     * it reinitializes the chosen gamepad settings.
-     *
-     * @param thisGamepad The gamepad that is being set up.
-     */
-  setupGamepad(thisGamepad: Phaser.Input.Gamepad.Gamepad): void {
+   * Initializes or updates configurations for connected gamepads.
+   * It retrieves the names of all connected gamepads, sets up their configurations according to stored or default settings,
+   * and ensures these configurations are saved. If the connected gamepad is the currently chosen one,
+   * it reinitializes the chosen gamepad settings.
+   *
+   * @param thisGamepad The gamepad that is being set up.
+   */
+  setupGamepad(_thisGamepad: Phaser.Input.Gamepad.Gamepad): void {
     const allGamepads = this.getGamepadsName();
     for (const gamepad of allGamepads) {
       const gamepadID = gamepad.toLowerCase();
@@ -294,15 +297,15 @@ export class InputsController {
       globalScene.gameData?.saveMappingConfigs(gamepadID, this.configs[gamepadID]);
     }
     this.lastSource = "gamepad";
-    const handler = globalScene.ui?.handlers[Mode.SETTINGS_GAMEPAD] as SettingsGamepadUiHandler;
-    handler && handler.updateChosenGamepadDisplay();
+    const handler = globalScene.ui?.handlers[UiMode.SETTINGS_GAMEPAD] as SettingsGamepadUiHandler;
+    handler?.updateChosenGamepadDisplay();
   }
 
   /**
-     * Initializes or updates configurations for connected keyboards.
-     */
+   * Initializes or updates configurations for connected keyboards.
+   */
   setupKeyboard(): void {
-    for (const layout of [ "default" ]) {
+    for (const layout of ["default"]) {
       const config = deepCopy(this.getConfigKeyboard(layout)) as InterfaceConfig;
       config.custom = this.configs[layout]?.custom || { ...config.default };
       this.configs[layout] = config;
@@ -312,28 +315,26 @@ export class InputsController {
   }
 
   /**
-     * Refreshes and re-indexes the list of connected gamepads.
-     *
-     * @remarks
-     * This method updates the list of gamepads to exclude any that are undefined.
-     * It corrects the index of each gamepad to account for any previously undefined entries,
-     * ensuring that all gamepads are properly indexed and can be accurately referenced within the game.
-     */
+   * Refreshes and re-indexes the list of connected gamepads.
+   *
+   * @remarks
+   * This method updates the list of gamepads to exclude any that are undefined.
+   * It corrects the index of each gamepad to account for any previously undefined entries,
+   * ensuring that all gamepads are properly indexed and can be accurately referenced within the game.
+   */
   refreshGamepads(): void {
     // Sometimes, gamepads are undefined. For some reason.
-    this.gamepads = globalScene.input.gamepad?.gamepads.filter(function (el) {
-      return el !== null;
-    }) ?? [];
+    this.gamepads = globalScene.input.gamepad?.gamepads.filter(el => el !== null) ?? [];
 
-    for (const [ index, thisGamepad ] of this.gamepads.entries()) {
+    for (const [index, thisGamepad] of this.gamepads.entries()) {
       thisGamepad.index = index; // Overwrite the gamepad index, in case we had undefined gamepads earlier
     }
   }
 
   /**
-     * Ensures the keyboard is initialized by checking if there is an active configuration for the keyboard.
-     * If not, it sets up the keyboard with default configurations.
-     */
+   * Ensures the keyboard is initialized by checking if there is an active configuration for the keyboard.
+   * If not, it sets up the keyboard with default configurations.
+   */
   ensureKeyboardIsInit(): void {
     if (!this.getActiveConfig(Device.KEYBOARD)?.padID) {
       this.setupKeyboard();
@@ -341,10 +342,10 @@ export class InputsController {
   }
 
   /**
-     * Handles the keydown event for the keyboard.
-     *
-     * @param event The keyboard event.
-     */
+   * Handles the keydown event for the keyboard.
+   *
+   * @param event The keyboard event.
+   */
   keyboardKeyDown(event): void {
     this.lastSource = "keyboard";
     this.ensureKeyboardIsInit();
@@ -369,10 +370,10 @@ export class InputsController {
   }
 
   /**
-     * Handles the keyup event for the keyboard.
-     *
-     * @param event The keyboard event.
-     */
+   * Handles the keyup event for the keyboard.
+   *
+   * @param event The keyboard event.
+   */
   keyboardKeyUp(event): void {
     this.lastSource = "keyboard";
     const buttonUp = getButtonWithKeycode(this.getActiveConfig(Device.KEYBOARD), event.keyCode);
@@ -388,15 +389,15 @@ export class InputsController {
   }
 
   /**
-     * Handles button press events on a gamepad. This method sets the gamepad as chosen on the first input if no gamepad is currently chosen.
-     * It checks if gamepad support is enabled and if the event comes from the chosen gamepad. If so, it maps the button press to a specific
-     * action using a custom configuration, emits an event for the button press, and records the time of the action.
-     *
-     * @param pad The gamepad on which the button was pressed.
-     * @param button The specific button that was pressed.
-     * @param value The intensity or value of the button press, if applicable.
-     */
-  gamepadButtonDown(pad: Phaser.Input.Gamepad.Gamepad, button: Phaser.Input.Gamepad.Button, value: number): void {
+   * Handles button press events on a gamepad. This method sets the gamepad as chosen on the first input if no gamepad is currently chosen.
+   * It checks if gamepad support is enabled and if the event comes from the chosen gamepad. If so, it maps the button press to a specific
+   * action using a custom configuration, emits an event for the button press, and records the time of the action.
+   *
+   * @param pad The gamepad on which the button was pressed.
+   * @param button The specific button that was pressed.
+   * @param value The intensity or value of the button press, if applicable.
+   */
+  gamepadButtonDown(pad: Phaser.Input.Gamepad.Gamepad, button: Phaser.Input.Gamepad.Button, _value: number): void {
     if (!this.configs[this.selectedDevice[Device.KEYBOARD]]?.padID) {
       this.setupKeyboard();
     }
@@ -404,7 +405,11 @@ export class InputsController {
       return;
     }
     this.lastSource = "gamepad";
-    if (!this.selectedDevice[Device.GAMEPAD] || (globalScene.ui.getMode() !== Mode.GAMEPAD_BINDING && this.selectedDevice[Device.GAMEPAD] !== pad.id.toLowerCase())) {
+    if (
+      !this.selectedDevice[Device.GAMEPAD] ||
+      (globalScene.ui.getMode() !== UiMode.GAMEPAD_BINDING &&
+        this.selectedDevice[Device.GAMEPAD] !== pad.id.toLowerCase())
+    ) {
       this.setChosenGamepad(pad.id);
     }
     if (!this.gamepadSupport || pad.id.toLowerCase() !== this.selectedDevice[Device.GAMEPAD].toLowerCase()) {
@@ -436,15 +441,15 @@ export class InputsController {
   }
 
   /**
-     * Responds to a button release event on a gamepad by checking if the gamepad is supported and currently chosen.
-     * If conditions are met, it identifies the configured action for the button, emits an event signaling the button release,
-     * and clears the record of the button.
-     *
-     * @param pad The gamepad from which the button was released.
-     * @param button The specific button that was released.
-     * @param value The intensity or value of the button release, if applicable.
-     */
-  gamepadButtonUp(pad: Phaser.Input.Gamepad.Gamepad, button: Phaser.Input.Gamepad.Button, value: number): void {
+   * Responds to a button release event on a gamepad by checking if the gamepad is supported and currently chosen.
+   * If conditions are met, it identifies the configured action for the button, emits an event signaling the button release,
+   * and clears the record of the button.
+   *
+   * @param pad The gamepad from which the button was released.
+   * @param button The specific button that was released.
+   * @param value The intensity or value of the button release, if applicable.
+   */
+  gamepadButtonUp(pad: Phaser.Input.Gamepad.Gamepad, button: Phaser.Input.Gamepad.Button, _value: number): void {
     if (!pad) {
       return;
     }
@@ -465,23 +470,26 @@ export class InputsController {
   }
 
   /**
-     * Retrieves the configuration object for a gamepad based on its identifier. The method identifies specific gamepad models
-     * based on substrings in the identifier and returns predefined configurations for recognized models.
-     * If no specific configuration matches, it defaults to a generic gamepad configuration.
-     *
-     * @param id The identifier string of the gamepad.
-     * @returns InterfaceConfig The configuration object corresponding to the identified gamepad type.
-     */
+   * Retrieves the configuration object for a gamepad based on its identifier. The method identifies specific gamepad models
+   * based on substrings in the identifier and returns predefined configurations for recognized models.
+   * If no specific configuration matches, it defaults to a generic gamepad configuration.
+   *
+   * @param id The identifier string of the gamepad.
+   * @returns InterfaceConfig The configuration object corresponding to the identified gamepad type.
+   */
   getConfig(id: string): InterfaceConfig {
     id = id.toLowerCase();
 
     if (id.includes("081f") && id.includes("e401")) {
       return pad_unlicensedSNES;
-    } else if (id.includes("xbox") && id.includes("360")) {
+    }
+    if (id.includes("xbox") && id.includes("360")) {
       return pad_xbox360;
-    } else if (id.includes("054c")) {
+    }
+    if (id.includes("054c")) {
       return pad_dualshock;
-    } else if (id.includes("057e") && id.includes("2009")) {
+    }
+    if (id.includes("057e") && id.includes("2009")) {
       return pad_procon;
     }
 
@@ -489,11 +497,11 @@ export class InputsController {
   }
 
   /**
-     * Retrieves the configuration object for a keyboard layout based on its identifier.
-     *
-     * @param id The identifier string of the keyboard layout.
-     * @returns InterfaceConfig The configuration object corresponding to the identified keyboard layout.
-     */
+   * Retrieves the configuration object for a keyboard layout based on its identifier.
+   *
+   * @param id The identifier string of the keyboard layout.
+   * @returns InterfaceConfig The configuration object corresponding to the identified keyboard layout.
+   */
   getConfigKeyboard(id: string): InterfaceConfig {
     if (id === "default") {
       return cfg_keyboard_qwerty;
@@ -503,8 +511,8 @@ export class InputsController {
   }
 
   /**
-     * Deactivates all currently pressed keys.
-     */
+   * Deactivates all currently pressed keys.
+   */
   deactivatePressedKey(): void {
     for (const key of Object.keys(this.inputInterval)) {
       clearInterval(this.inputInterval[key]);
@@ -513,11 +521,11 @@ export class InputsController {
   }
 
   /**
-     * Retrieves the active configuration for the currently chosen device.
-     * It checks if a specific device ID is stored in configurations and returns it.
-     *
-     * @returns InterfaceConfig The configuration object for the active gamepad, or null if not set.
-     */
+   * Retrieves the active configuration for the currently chosen device.
+   * It checks if a specific device ID is stored in configurations and returns it.
+   *
+   * @returns InterfaceConfig The configuration object for the active gamepad, or null if not set.
+   */
   getActiveConfig(device: Device) {
     if (this.configs[this.selectedDevice[device]]?.padID) {
       return this.configs[this.selectedDevice[device]];
@@ -535,9 +543,8 @@ export class InputsController {
   getLastSourceDevice(): Device {
     if (this.lastSource === "gamepad") {
       return Device.GAMEPAD;
-    } else {
-      return Device.KEYBOARD;
     }
+    return Device.KEYBOARD;
   }
 
   getLastSourceConfig() {
@@ -554,16 +561,25 @@ export class InputsController {
   }
 
   /**
-     * Injects a custom mapping configuration into the configuration for a specific gamepad.
-     * If the device does not have an existing configuration, it initializes one first.
-     *
-     * @param selectedDevice The identifier of the device to configure.
-     * @param mappingConfigs The mapping configuration to apply to the device.
-     */
+   * Injects a custom mapping configuration into the configuration for a specific gamepad.
+   * If the device does not have an existing configuration, it initializes one first.
+   *
+   * @param selectedDevice The identifier of the device to configure.
+   * @param mappingConfigs The mapping configuration to apply to the device.
+   */
   injectConfig(selectedDevice: string, mappingConfigs): void {
     if (!this.configs[selectedDevice]) {
       this.configs[selectedDevice] = {};
     }
+    // A proper way of handling migrating keybinds would be much better
+    const mappingOverrides = {
+      BUTTON_CYCLE_VARIANT: "BUTTON_CYCLE_TERA",
+    };
+    for (const key in mappingConfigs.custom) {
+      if (mappingConfigs.custom[key] in mappingOverrides) {
+        mappingConfigs.custom[key] = mappingOverrides[mappingConfigs.custom[key]];
+      }
+    }
     this.configs[selectedDevice].custom = mappingConfigs.custom;
   }
 
@@ -576,18 +592,17 @@ export class InputsController {
   }
 
   /**
-     * Swaps a binding in the configuration.
-     *
-     * @param config The configuration object.
-     * @param settingName The name of the setting to swap.
-     * @param pressedButton The button that was pressed.
-     */
+   * Swaps a binding in the configuration.
+   *
+   * @param config The configuration object.
+   * @param settingName The name of the setting to swap.
+   * @param pressedButton The button that was pressed.
+   */
   assignBinding(config, settingName, pressedButton): boolean {
     this.deactivatePressedKey();
     if (config.padType === "keyboard") {
       return assign(config, settingName, pressedButton);
-    } else {
-      return swap(config, settingName, pressedButton);
     }
+    return swap(config, settingName, pressedButton);
   }
 }
diff --git a/src/interfaces/locales.ts b/src/interfaces/locales.ts
index 4405095e0fe..2d26911f82f 100644
--- a/src/interfaces/locales.ts
+++ b/src/interfaces/locales.ts
@@ -1,93 +1,93 @@
 export interface Localizable {
-    localize(): void;
-  }
+  localize(): void;
+}
 
 export interface TranslationEntries {
-  [key: string]: string | { [key: string]: string }
+  [key: string]: string | { [key: string]: string };
 }
 export interface SimpleTranslationEntries {
-    [key: string]: string
-  }
+  [key: string]: string;
+}
 
 export interface MoveTranslationEntry {
-    name: string,
-    effect: string
-  }
+  name: string;
+  effect: string;
+}
 
 export interface MoveTranslationEntries {
-    [key: string]: MoveTranslationEntry
-  }
+  [key: string]: MoveTranslationEntry;
+}
 
 export interface AbilityTranslationEntry {
-    name: string,
-    description: string
-  }
+  name: string;
+  description: string;
+}
 
 export interface AbilityTranslationEntries {
-    [key: string]: AbilityTranslationEntry
-  }
+  [key: string]: AbilityTranslationEntry;
+}
 
 export interface ModifierTypeTranslationEntry {
-    name?: string,
-    description?: string,
-    extra?: SimpleTranslationEntries
-  }
+  name?: string;
+  description?: string;
+  extra?: SimpleTranslationEntries;
+}
 
 export interface ModifierTypeTranslationEntries {
-    ModifierType: { [key: string]: ModifierTypeTranslationEntry },
-    SpeciesBoosterItem: { [key: string]: ModifierTypeTranslationEntry },
-    AttackTypeBoosterItem: SimpleTranslationEntries,
-    TempStatStageBoosterItem: SimpleTranslationEntries,
-    BaseStatBoosterItem: SimpleTranslationEntries,
-    EvolutionItem: SimpleTranslationEntries,
-    FormChangeItem: SimpleTranslationEntries,
-  }
+  ModifierType: { [key: string]: ModifierTypeTranslationEntry };
+  SpeciesBoosterItem: { [key: string]: ModifierTypeTranslationEntry };
+  AttackTypeBoosterItem: SimpleTranslationEntries;
+  TempStatStageBoosterItem: SimpleTranslationEntries;
+  BaseStatBoosterItem: SimpleTranslationEntries;
+  EvolutionItem: SimpleTranslationEntries;
+  FormChangeItem: SimpleTranslationEntries;
+}
 
 export interface PokemonInfoTranslationEntries {
-    Stat: SimpleTranslationEntries,
-    Type: SimpleTranslationEntries,
-  }
+  Stat: SimpleTranslationEntries;
+  Type: SimpleTranslationEntries;
+}
 
 export interface BerryTranslationEntry {
-    name: string,
-    effect: string,
-  }
+  name: string;
+  effect: string;
+}
 
 export interface BerryTranslationEntries {
-    [key: string]: BerryTranslationEntry
-  }
+  [key: string]: BerryTranslationEntry;
+}
 
 export interface StatusEffectTranslationEntries {
-  [key: string]: StatusEffectTranslationEntry
+  [key: string]: StatusEffectTranslationEntry;
 }
 
 export interface StatusEffectTranslationEntry {
-  name: string,
-  obtain: string,
-  obtainSource: string,
-  activation: string,
-  overlap: string,
-  heal: string
-  description: string,
+  name: string;
+  obtain: string;
+  obtainSource: string;
+  activation: string;
+  overlap: string;
+  heal: string;
+  description: string;
 }
 
 export interface AchievementTranslationEntry {
-    name?: string,
-    description?: string,
-  }
+  name?: string;
+  description?: string;
+}
 
 export interface AchievementTranslationEntries {
-    [key: string]: AchievementTranslationEntry;
-  }
+  [key: string]: AchievementTranslationEntry;
+}
 
 export interface DialogueTranslationEntry {
-    [key: number]: string;
-  }
+  [key: number]: string;
+}
 
 export interface DialogueTranslationCategory {
-    [category: string]: DialogueTranslationEntry;
-  }
+  [category: string]: DialogueTranslationEntry;
+}
 
 export interface DialogueTranslationEntries {
-    [trainertype: string]: DialogueTranslationCategory;
-  }
+  [trainertype: string]: DialogueTranslationCategory;
+}
diff --git a/src/loading-scene.ts b/src/loading-scene.ts
index 60a0513f608..914e6e961e2 100644
--- a/src/loading-scene.ts
+++ b/src/loading-scene.ts
@@ -4,14 +4,14 @@ import CacheBustedLoaderPlugin from "#app/plugins/cache-busted-loader-plugin";
 import { SceneBase } from "#app/scene-base";
 import { WindowVariant, getWindowVariantSuffix } from "#app/ui/ui-theme";
 import { isMobile } from "#app/touch-controls";
-import * as Utils from "#app/utils";
+import { localPing, getEnumValues, hasAllLocalizedSprites, getEnumKeys } from "#app/utils/common";
 import { initPokemonPrevolutions, initPokemonStarters } from "#app/data/balance/pokemon-evolutions";
 import { initBiomes } from "#app/data/balance/biomes";
 import { initEggMoves } from "#app/data/balance/egg-moves";
 import { initPokemonForms } from "#app/data/pokemon-forms";
 import { initSpecies } from "#app/data/pokemon-species";
-import { initMoves } from "#app/data/move";
-import { initAbilities } from "#app/data/ability";
+import { initMoves } from "#app/data/moves/move";
+import { initAbilities } from "#app/data/abilities/ability";
 import { initAchievements } from "#app/system/achv";
 import { initTrainerTypeDialogue } from "#app/data/dialogue";
 import { initChallenges } from "#app/data/challenge";
@@ -20,6 +20,7 @@ import { initStatsKeys } from "#app/ui/game-stats-ui-handler";
 import { initVouchers } from "#app/system/voucher";
 import { Biome } from "#enums/biome";
 import { initMysteryEncounters } from "#app/data/mystery-encounters/mystery-encounters";
+import { timedEventManager } from "./global-event-manager";
 
 export class LoadingScene extends SceneBase {
   public static readonly KEY = "loading";
@@ -33,7 +34,7 @@ export class LoadingScene extends SceneBase {
   }
 
   preload() {
-    Utils.localPing();
+    localPing();
     this.load["manifest"] = this.game["manifest"];
 
     this.loadImage("loading_bg", "arenas");
@@ -48,7 +49,7 @@ export class LoadingScene extends SceneBase {
     this.loadImage("friendship_overlay", "ui");
     this.loadImage("cursor", "ui");
     this.loadImage("cursor_reverse", "ui");
-    for (const wv of Utils.getEnumValues(WindowVariant)) {
+    for (const wv of getEnumValues(WindowVariant)) {
       for (let w = 1; w <= 5; w++) {
         this.loadImage(`window_${w}${getWindowVariantSuffix(wv)}`, "ui/windows");
       }
@@ -79,6 +80,7 @@ export class LoadingScene extends SceneBase {
     this.loadImage("icon_owned", "ui");
     this.loadImage("icon_egg_move", "ui");
     this.loadImage("ability_bar_left", "ui");
+    this.loadImage("ability_bar_right", "ui");
     this.loadImage("bgm_bar", "ui");
     this.loadImage("party_exp_bar", "ui");
     this.loadImage("achv_bar", "ui");
@@ -101,8 +103,10 @@ export class LoadingScene extends SceneBase {
     this.loadImage("icon_lock", "ui", "icon_lock.png");
     this.loadImage("icon_stop", "ui", "icon_stop.png");
     this.loadImage("icon_tera", "ui");
+    this.loadImage("cursor_tera", "ui");
     this.loadImage("type_tera", "ui");
     this.loadAtlas("type_bgs", "ui");
+    this.loadAtlas("button_tera", "ui");
     this.loadImage("mystery_egg", "ui");
     this.loadImage("normal_memory", "ui");
 
@@ -136,10 +140,10 @@ export class LoadingScene extends SceneBase {
     this.loadImage("summary_bg", "ui");
     this.loadImage("summary_overlay_shiny", "ui");
     this.loadImage("summary_profile", "ui");
-    this.loadImage("summary_profile_prompt_z", "ui");      // The pixel Z button prompt
-    this.loadImage("summary_profile_prompt_a", "ui");     // The pixel A button prompt
-    this.loadImage("summary_profile_ability", "ui");      // Pixel text 'ABILITY'
-    this.loadImage("summary_profile_passive", "ui");      // Pixel text 'PASSIVE'
+    this.loadImage("summary_profile_prompt_z", "ui"); // The pixel Z button prompt
+    this.loadImage("summary_profile_prompt_a", "ui"); // The pixel A button prompt
+    this.loadImage("summary_profile_ability", "ui"); // Pixel text 'ABILITY'
+    this.loadImage("summary_profile_passive", "ui"); // Pixel text 'PASSIVE'
     this.loadImage("summary_status", "ui");
     this.loadImage("summary_stats", "ui");
     this.loadImage("summary_stats_overlay_exp", "ui");
@@ -173,7 +177,7 @@ export class LoadingScene extends SceneBase {
 
     this.loadImage("default_bg", "arenas");
     // Load arena images
-    Utils.getEnumValues(Biome).map(bt => {
+    getEnumValues(Biome).map(bt => {
       const btKey = Biome[bt].toLowerCase();
       const isBaseAnimated = btKey === "end";
       const baseAKey = `${btKey}_a`;
@@ -191,7 +195,7 @@ export class LoadingScene extends SceneBase {
       }
       if (getBiomeHasProps(bt)) {
         for (let p = 1; p <= 3; p++) {
-          const isPropAnimated = p === 3 && [ "power_plant", "end" ].find(b => b === btKey);
+          const isPropAnimated = p === 3 && ["power_plant", "end"].find(b => b === btKey);
           const propKey = `${btKey}_b_${p}`;
           if (!isPropAnimated) {
             this.loadImage(propKey, "arenas");
@@ -235,7 +239,7 @@ export class LoadingScene extends SceneBase {
     // Get current lang and load the types atlas for it. English will only load types while all other languages will load types and types_<lang>
     const lang = i18next.resolvedLanguage;
     if (lang !== "en") {
-      if (Utils.hasAllLocalizedSprites(lang)) {
+      if (hasAllLocalizedSprites(lang)) {
         this.loadAtlas(`statuses_${lang}`, "");
         this.loadAtlas(`types_${lang}`, "");
       } else {
@@ -247,11 +251,13 @@ export class LoadingScene extends SceneBase {
       this.loadAtlas("statuses", "");
       this.loadAtlas("types", "");
     }
-    const availableLangs = [ "en", "de", "it", "fr", "ja", "ko", "es-ES", "pt-BR", "zh-CN" ];
-    if (lang && availableLangs.includes(lang)) {
-      this.loadImage("yearofthesnakeevent-" + lang, "events");
-    } else {
-      this.loadImage("yearofthesnakeevent-en", "events");
+    if (timedEventManager.activeEventHasBanner()) {
+      const availableLangs = timedEventManager.getEventBannerLangs();
+      if (lang && availableLangs.includes(lang)) {
+        this.loadImage(`${timedEventManager.getEventBannerFilename()}-${lang}`, "events");
+      } else {
+        this.loadImage(`${timedEventManager.getEventBannerFilename()}-en`, "events");
+      }
     }
 
     this.loadAtlas("statuses", "");
@@ -262,11 +268,11 @@ export class LoadingScene extends SceneBase {
     this.loadAtlas("egg_icons", "egg");
     this.loadAtlas("egg_shard", "egg");
     this.loadAtlas("egg_lightrays", "egg");
-    Utils.getEnumKeys(GachaType).forEach(gt => {
+    for (const gt of getEnumKeys(GachaType)) {
       const key = gt.toLowerCase();
       this.loadImage(`gacha_${key}`, "egg");
       this.loadAtlas(`gacha_underlay_${key}`, "egg");
-    });
+    }
     this.loadImage("gacha_glass", "egg");
     this.loadImage("gacha_eggs", "egg");
     this.loadAtlas("gacha_hatch", "egg");
@@ -349,7 +355,11 @@ export class LoadingScene extends SceneBase {
     this.loadBgm("evolution", "bw/evolution.mp3");
     this.loadBgm("evolution_fanfare", "bw/evolution_fanfare.mp3");
 
-    this.load.plugin("rextexteditplugin", "https://raw.githubusercontent.com/rexrainbow/phaser3-rex-notes/master/dist/rextexteditplugin.min.js", true);
+    this.load.plugin(
+      "rextexteditplugin",
+      "https://raw.githubusercontent.com/rexrainbow/phaser3-rex-notes/master/dist/rextexteditplugin.min.js",
+      true,
+    );
 
     this.loadLoadingScreen();
 
@@ -439,12 +449,22 @@ export class LoadingScene extends SceneBase {
       style: {
         font: "48px emerald",
         color: "#ffffff",
-        align: "center"
+        align: "center",
       },
     });
     disclaimerDescriptionText.setOrigin(0.5, 0.5);
 
-    loadingGraphics.push(bg, graphics, progressBar, progressBox, logo, percentText, assetText, disclaimerText, disclaimerDescriptionText);
+    loadingGraphics.push(
+      bg,
+      graphics,
+      progressBar,
+      progressBox,
+      logo,
+      percentText,
+      assetText,
+      disclaimerText,
+      disclaimerDescriptionText,
+    );
 
     if (!mobile) {
       loadingGraphics.map(g => g.setVisible(false));
@@ -459,7 +479,9 @@ export class LoadingScene extends SceneBase {
         ease: "Sine.easeIn",
         onComplete: () => video.destroy(),
       });
-      loadingGraphics.forEach(g => g.setVisible(true));
+      for (const g of loadingGraphics) {
+        g.setVisible(true);
+      }
     });
     intro.setOrigin(0, 0);
     intro.setScale(3);
@@ -500,7 +522,9 @@ export class LoadingScene extends SceneBase {
     });
 
     this.load.on(this.LOAD_EVENTS.COMPLETE, () => {
-      loadingGraphics.forEach(go => go.destroy());
+      for (const go of loadingGraphics) {
+        go.destroy();
+      }
       intro.destroy();
     });
   }
diff --git a/src/main.ts b/src/main.ts
index 993bd1018ae..7db663d14c7 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -7,9 +7,8 @@ import InputTextPlugin from "phaser3-rex-plugins/plugins/inputtext-plugin";
 import TransitionImagePackPlugin from "phaser3-rex-plugins/templates/transitionimagepack/transitionimagepack-plugin";
 import { initI18n } from "./plugins/i18n";
 
-
 // Catch global errors and display them in an alert so users can report the issue.
-window.onerror = function (message, source, lineno, colno, error) {
+window.onerror = (_message, _source, _lineno, _colno, error) => {
   console.error(error);
   // const errorString = `Received unhandled error. Open browser console and click OK to see details.\nError: ${message}\nSource: ${source}\nLine: ${lineno}\nColumn: ${colno}\nStack: ${error.stack}`;
   //alert(errorString);
@@ -18,7 +17,7 @@ window.onerror = function (message, source, lineno, colno, error) {
 };
 
 // Catch global promise rejections and display them in an alert so users can report the issue.
-window.addEventListener("unhandledrejection", (event) => {
+window.addEventListener("unhandledrejection", event => {
   // const errorString = `Received unhandled promise rejection. Open browser console and click OK to see details.\nReason: ${event.reason}`;
   console.error(event.reason);
   //alert(errorString);
@@ -41,7 +40,7 @@ Phaser.GameObjects.Text.prototype.setPositionRelative = setPositionRelative;
 Phaser.GameObjects.Rectangle.prototype.setPositionRelative = setPositionRelative;
 
 document.fonts.load("16px emerald").then(() => document.fonts.load("10px pkmnems"));
-
+// biome-ignore lint/suspicious/noImplicitAnyLet: TODO
 let game;
 
 const startGame = async (manifest?: any) => {
@@ -54,44 +53,50 @@ const startGame = async (manifest?: any) => {
     scale: {
       width: 1920,
       height: 1080,
-      mode: Phaser.Scale.FIT
+      mode: Phaser.Scale.FIT,
     },
     plugins: {
-      global: [{
-        key: "rexInputTextPlugin",
-        plugin: InputTextPlugin,
-        start: true
-      }, {
-        key: "rexBBCodeTextPlugin",
-        plugin: BBCodeTextPlugin,
-        start: true
-      }, {
-        key: "rexTransitionImagePackPlugin",
-        plugin: TransitionImagePackPlugin,
-        start: true
-      }],
-      scene: [{
-        key: "rexUI",
-        plugin: UIPlugin,
-        mapping: "rexUI"
-      }]
+      global: [
+        {
+          key: "rexInputTextPlugin",
+          plugin: InputTextPlugin,
+          start: true,
+        },
+        {
+          key: "rexBBCodeTextPlugin",
+          plugin: BBCodeTextPlugin,
+          start: true,
+        },
+        {
+          key: "rexTransitionImagePackPlugin",
+          plugin: TransitionImagePackPlugin,
+          start: true,
+        },
+      ],
+      scene: [
+        {
+          key: "rexUI",
+          plugin: UIPlugin,
+          mapping: "rexUI",
+        },
+      ],
     },
     input: {
       mouse: {
-        target: "app"
+        target: "app",
       },
       touch: {
-        target: "app"
+        target: "app",
       },
-      gamepad: true
+      gamepad: true,
     },
     dom: {
-      createContainer: true
+      createContainer: true,
     },
-    pixelArt: true,
-    pipeline: [ InvertPostFX ] as unknown as Phaser.Types.Core.PipelineConfig,
-    scene: [ LoadingScene, BattleScene ],
-    version: version
+    antialias: false,
+    pipeline: [InvertPostFX] as unknown as Phaser.Types.Core.PipelineConfig,
+    scene: [LoadingScene, BattleScene],
+    version: version,
   });
   game.sound.pauseOnBlur = false;
   if (manifest) {
@@ -103,7 +108,8 @@ fetch("/manifest.json")
   .then(res => res.json())
   .then(jsonResponse => {
     startGame(jsonResponse.manifest);
-  }).catch(() => {
+  })
+  .catch(() => {
     // Manifest not found (likely local build)
     startGame();
   });
diff --git a/src/messages.ts b/src/messages.ts
index 26fd3353cc6..c29151a98b3 100644
--- a/src/messages.ts
+++ b/src/messages.ts
@@ -6,9 +6,10 @@ import i18next from "i18next";
 /**
  * Retrieves the Pokemon's name, potentially with an affix indicating its role (wild or foe) in the current battle context, translated
  * @param pokemon {@linkcode Pokemon} name and battle context will be retrieved from this instance
+ * @param {boolean} useIllusion - Whether we want the name of the illusion or not. Default value : true
  * @returns {string} ex: "Wild Gengar", "Ectoplasma sauvage"
  */
-export function getPokemonNameWithAffix(pokemon: Pokemon | undefined): string {
+export function getPokemonNameWithAffix(pokemon: Pokemon | undefined, useIllusion = true): string {
   if (!pokemon) {
     return "Missigno";
   }
@@ -18,17 +19,17 @@ export function getPokemonNameWithAffix(pokemon: Pokemon | undefined): string {
       return !pokemon.isPlayer()
         ? pokemon.hasTrainer()
           ? i18next.t("battle:foePokemonWithAffix", {
-            pokemonName: pokemon.getNameToRender(),
-          })
+              pokemonName: pokemon.getNameToRender(useIllusion),
+            })
           : i18next.t("battle:wildPokemonWithAffix", {
-            pokemonName: pokemon.getNameToRender(),
-          })
-        : pokemon.getNameToRender();
+              pokemonName: pokemon.getNameToRender(useIllusion),
+            })
+        : pokemon.getNameToRender(useIllusion);
     case BattleSpec.FINAL_BOSS:
       return !pokemon.isPlayer()
-        ? i18next.t("battle:foePokemonWithAffix", { pokemonName: pokemon.getNameToRender() })
-        : pokemon.getNameToRender();
+        ? i18next.t("battle:foePokemonWithAffix", { pokemonName: pokemon.getNameToRender(useIllusion) })
+        : pokemon.getNameToRender(useIllusion);
     default:
-      return pokemon.getNameToRender();
+      return pokemon.getNameToRender(useIllusion);
   }
 }
diff --git a/src/modifier/modifier-tier.ts b/src/modifier/modifier-tier.ts
index 81bb1ad8ae5..d8a75e41b0a 100644
--- a/src/modifier/modifier-tier.ts
+++ b/src/modifier/modifier-tier.ts
@@ -4,5 +4,5 @@ export enum ModifierTier {
   ULTRA,
   ROGUE,
   MASTER,
-  LUXURY
+  LUXURY,
 }
diff --git a/src/modifier/modifier-type.ts b/src/modifier/modifier-type.ts
index b65f1b53441..608eca1157e 100644
--- a/src/modifier/modifier-type.ts
+++ b/src/modifier/modifier-type.ts
@@ -2,16 +2,103 @@ import { globalScene } from "#app/global-scene";
 import { EvolutionItem, pokemonEvolutions } from "#app/data/balance/pokemon-evolutions";
 import { tmPoolTiers, tmSpecies } from "#app/data/balance/tms";
 import { getBerryEffectDescription, getBerryName } from "#app/data/berry";
-import { allMoves, AttackMove, selfStatLowerMoves } from "#app/data/move";
+import { allMoves, AttackMove } from "#app/data/moves/move";
 import { getNatureName, getNatureStatMultiplier } from "#app/data/nature";
 import { getPokeballCatchMultiplier, getPokeballName, MAX_PER_TYPE_POKEBALLS } from "#app/data/pokeball";
-import { FormChangeItem, pokemonFormChanges, SpeciesFormChangeCondition, SpeciesFormChangeItemTrigger } from "#app/data/pokemon-forms";
+import {
+  FormChangeItem,
+  pokemonFormChanges,
+  SpeciesFormChangeCondition,
+  SpeciesFormChangeItemTrigger,
+} from "#app/data/pokemon-forms";
 import { getStatusEffectDescriptor } from "#app/data/status-effect";
-import { Type } from "#enums/type";
+import { PokemonType } from "#enums/pokemon-type";
 import type { EnemyPokemon, PlayerPokemon, PokemonMove } from "#app/field/pokemon";
 import type Pokemon from "#app/field/pokemon";
 import { getPokemonNameWithAffix } from "#app/messages";
-import { AddPokeballModifier, AddVoucherModifier, AttackTypeBoosterModifier, BaseStatModifier, BerryModifier, BoostBugSpawnModifier, BypassSpeedChanceModifier, ContactHeldItemTransferChanceModifier, CritBoosterModifier, DamageMoneyRewardModifier, DoubleBattleChanceBoosterModifier, EnemyAttackStatusEffectChanceModifier, EnemyDamageBoosterModifier, EnemyDamageReducerModifier, EnemyEndureChanceModifier, EnemyFusionChanceModifier, EnemyStatusEffectHealChanceModifier, EnemyTurnHealModifier, EvolutionItemModifier, EvolutionStatBoosterModifier, EvoTrackerModifier, ExpBalanceModifier, ExpBoosterModifier, ExpShareModifier, ExtraModifierModifier, FlinchChanceModifier, FusePokemonModifier, GigantamaxAccessModifier, HealingBoosterModifier, HealShopCostModifier, HiddenAbilityRateBoosterModifier, HitHealModifier, IvScannerModifier, LevelIncrementBoosterModifier, LockModifierTiersModifier, MapModifier, MegaEvolutionAccessModifier, MoneyInterestModifier, MoneyMultiplierModifier, MoneyRewardModifier, MultipleParticipantExpBonusModifier, PokemonAllMovePpRestoreModifier, PokemonBaseStatFlatModifier, PokemonBaseStatTotalModifier, PokemonExpBoosterModifier, PokemonFormChangeItemModifier, PokemonFriendshipBoosterModifier, PokemonHeldItemModifier, PokemonHpRestoreModifier, PokemonIncrementingStatModifier, PokemonInstantReviveModifier, PokemonLevelIncrementModifier, PokemonMoveAccuracyBoosterModifier, PokemonMultiHitModifier, PokemonNatureChangeModifier, PokemonNatureWeightModifier, PokemonPpRestoreModifier, PokemonPpUpModifier, PokemonStatusHealModifier, PreserveBerryModifier, RememberMoveModifier, ResetNegativeStatStageModifier, ShinyRateBoosterModifier, SpeciesCritBoosterModifier, SpeciesStatBoosterModifier, SurviveDamageModifier, SwitchEffectTransferModifier, TempCritBoosterModifier, TempStatStageBoosterModifier, TerastallizeAccessModifier, TerastallizeModifier, TmModifier, TurnHealModifier, TurnHeldItemTransferModifier, TurnStatusEffectModifier, type EnemyPersistentModifier, type Modifier, type PersistentModifier, TempExtraModifierModifier, CriticalCatchChanceBoosterModifier } from "#app/modifier/modifier";
+import {
+  AddPokeballModifier,
+  AddVoucherModifier,
+  AttackTypeBoosterModifier,
+  BaseStatModifier,
+  BerryModifier,
+  BoostBugSpawnModifier,
+  BypassSpeedChanceModifier,
+  ContactHeldItemTransferChanceModifier,
+  CritBoosterModifier,
+  DamageMoneyRewardModifier,
+  DoubleBattleChanceBoosterModifier,
+  EnemyAttackStatusEffectChanceModifier,
+  EnemyDamageBoosterModifier,
+  EnemyDamageReducerModifier,
+  EnemyEndureChanceModifier,
+  EnemyFusionChanceModifier,
+  EnemyStatusEffectHealChanceModifier,
+  EnemyTurnHealModifier,
+  EvolutionItemModifier,
+  EvolutionStatBoosterModifier,
+  EvoTrackerModifier,
+  ExpBalanceModifier,
+  ExpBoosterModifier,
+  ExpShareModifier,
+  ExtraModifierModifier,
+  FlinchChanceModifier,
+  FusePokemonModifier,
+  GigantamaxAccessModifier,
+  HealingBoosterModifier,
+  HealShopCostModifier,
+  HiddenAbilityRateBoosterModifier,
+  HitHealModifier,
+  IvScannerModifier,
+  LevelIncrementBoosterModifier,
+  LockModifierTiersModifier,
+  MapModifier,
+  MegaEvolutionAccessModifier,
+  MoneyInterestModifier,
+  MoneyMultiplierModifier,
+  MoneyRewardModifier,
+  MultipleParticipantExpBonusModifier,
+  PokemonAllMovePpRestoreModifier,
+  PokemonBaseStatFlatModifier,
+  PokemonBaseStatTotalModifier,
+  PokemonExpBoosterModifier,
+  PokemonFormChangeItemModifier,
+  PokemonFriendshipBoosterModifier,
+  PokemonHeldItemModifier,
+  PokemonHpRestoreModifier,
+  PokemonIncrementingStatModifier,
+  PokemonInstantReviveModifier,
+  PokemonLevelIncrementModifier,
+  PokemonMoveAccuracyBoosterModifier,
+  PokemonMultiHitModifier,
+  PokemonNatureChangeModifier,
+  PokemonNatureWeightModifier,
+  PokemonPpRestoreModifier,
+  PokemonPpUpModifier,
+  PokemonStatusHealModifier,
+  PreserveBerryModifier,
+  RememberMoveModifier,
+  ResetNegativeStatStageModifier,
+  ShinyRateBoosterModifier,
+  SpeciesCritBoosterModifier,
+  SpeciesStatBoosterModifier,
+  SurviveDamageModifier,
+  SwitchEffectTransferModifier,
+  TempCritBoosterModifier,
+  TempStatStageBoosterModifier,
+  TerastallizeAccessModifier,
+  TerrastalizeModifier,
+  TmModifier,
+  TurnHealModifier,
+  TurnHeldItemTransferModifier,
+  TurnStatusEffectModifier,
+  type EnemyPersistentModifier,
+  type Modifier,
+  type PersistentModifier,
+  TempExtraModifierModifier,
+  CriticalCatchChanceBoosterModifier,
+  FieldEffectModifier,
+} from "#app/modifier/modifier";
 import { ModifierTier } from "#app/modifier/modifier-tier";
 import Overrides from "#app/overrides";
 import { Unlockables } from "#app/system/unlockables";
@@ -19,7 +106,15 @@ import { getVoucherTypeIcon, getVoucherTypeName, VoucherType } from "#app/system
 import type { PokemonMoveSelectFilter, PokemonSelectFilter } from "#app/ui/party-ui-handler";
 import PartyUiHandler from "#app/ui/party-ui-handler";
 import { getModifierTierTextTint } from "#app/ui/text";
-import { formatMoney, getEnumKeys, getEnumValues, isNullOrUndefined, NumberHolder, padInt, randSeedInt, randSeedItem } from "#app/utils";
+import {
+  formatMoney,
+  getEnumKeys,
+  getEnumValues,
+  isNullOrUndefined,
+  NumberHolder,
+  padInt,
+  randSeedInt,
+} from "#app/utils/common";
 import { Abilities } from "#enums/abilities";
 import { BattlerTagType } from "#enums/battler-tag-type";
 import { BerryType } from "#enums/berry-type";
@@ -32,6 +127,8 @@ import type { PermanentStat, TempBattleStat } from "#enums/stat";
 import { getStatKey, Stat, TEMP_BATTLE_STATS } from "#enums/stat";
 import { StatusEffect } from "#enums/status-effect";
 import i18next from "i18next";
+import { timedEventManager } from "#app/global-event-manager";
+import { TYPE_BOOST_ITEM_BOOST_PERCENT } from "#app/constants";
 
 const outputModifierData = false;
 const useMaxWeightForOutput = false;
@@ -41,7 +138,7 @@ export enum ModifierPoolType {
   WILD,
   TRAINER,
   ENEMY_BUFF,
-  DAILY_STARTER
+  DAILY_STARTER,
 }
 
 type NewModifierFunc = (type: ModifierType, args: any[]) => Modifier;
@@ -55,7 +152,13 @@ export class ModifierType {
   public tier: ModifierTier;
   protected newModifierFunc: NewModifierFunc | null;
 
-  constructor(localeKey: string | null, iconImage: string | null, newModifierFunc: NewModifierFunc | null, group?: string, soundName?: string) {
+  constructor(
+    localeKey: string | null,
+    iconImage: string | null,
+    newModifierFunc: NewModifierFunc | null,
+    group?: string,
+    soundName?: string,
+  ) {
     this.localeKey = localeKey!; // TODO: is this bang correct?
     this.iconImage = iconImage!; // TODO: is this bang correct?
     this.group = group!; // TODO: is this bang correct?
@@ -85,16 +188,16 @@ export class ModifierType {
     let poolTypes: ModifierPoolType[];
     switch (poolType) {
       case ModifierPoolType.PLAYER:
-        poolTypes = [ poolType, ModifierPoolType.TRAINER, ModifierPoolType.WILD ];
+        poolTypes = [poolType, ModifierPoolType.TRAINER, ModifierPoolType.WILD];
         break;
       case ModifierPoolType.WILD:
-        poolTypes = [ poolType, ModifierPoolType.PLAYER, ModifierPoolType.TRAINER ];
+        poolTypes = [poolType, ModifierPoolType.PLAYER, ModifierPoolType.TRAINER];
         break;
       case ModifierPoolType.TRAINER:
-        poolTypes = [ poolType, ModifierPoolType.PLAYER, ModifierPoolType.WILD ];
+        poolTypes = [poolType, ModifierPoolType.PLAYER, ModifierPoolType.WILD];
         break;
       default:
-        poolTypes = [ poolType ];
+        poolTypes = [poolType];
         break;
     }
     // Try multiple pool types in case of stolen items
@@ -133,7 +236,11 @@ export class ModifierType {
    *  if not provided or empty, the weight check will be ignored
    * @param rerollCount Default `0`. Used to check the weight of modifiers with conditional weight (see {@linkcode WeightedModifierTypeWeightFunc})
    */
-  withTierFromPool(poolType: ModifierPoolType = ModifierPoolType.PLAYER, party?: PlayerPokemon[], rerollCount: number = 0): ModifierType {
+  withTierFromPool(
+    poolType: ModifierPoolType = ModifierPoolType.PLAYER,
+    party?: PlayerPokemon[],
+    rerollCount = 0,
+  ): ModifierType {
     let defaultTier: undefined | ModifierTier;
     for (const tier of Object.values(getModifierPoolForType(poolType))) {
       for (const modifier of tier) {
@@ -147,7 +254,8 @@ export class ModifierType {
           if (weight > 0) {
             this.tier = modifier.modifierType.tier;
             return this;
-          } else if (isNullOrUndefined(defaultTier)) {
+          }
+          if (isNullOrUndefined(defaultTier)) {
             // If weight is 0, keep track of the first tier where the item was found
             defaultTier = modifier.modifierType.tier;
           }
@@ -164,6 +272,7 @@ export class ModifierType {
   }
 
   newModifier(...args: any[]): Modifier | null {
+    // biome-ignore lint/complexity/useOptionalChain: Changing to optional would coerce null return into undefined
     return this.newModifierFunc && this.newModifierFunc(this, args);
   }
 }
@@ -171,7 +280,7 @@ export class ModifierType {
 type ModifierTypeGeneratorFunc = (party: Pokemon[], pregenArgs?: any[]) => ModifierType | null;
 
 export class ModifierTypeGenerator extends ModifierType {
-  private genTypeFunc:  ModifierTypeGeneratorFunc;
+  private genTypeFunc: ModifierTypeGeneratorFunc;
 
   constructor(genTypeFunc: ModifierTypeGeneratorFunc) {
     super(null, null, null);
@@ -204,17 +313,20 @@ class AddPokeballModifierType extends ModifierType {
 
   get name(): string {
     return i18next.t("modifierType:ModifierType.AddPokeballModifierType.name", {
-      "modifierCount": this.count,
-      "pokeballName": getPokeballName(this.pokeballType),
+      modifierCount: this.count,
+      pokeballName: getPokeballName(this.pokeballType),
     });
   }
 
   getDescription(): string {
     return i18next.t("modifierType:ModifierType.AddPokeballModifierType.description", {
-      "modifierCount": this.count,
-      "pokeballName": getPokeballName(this.pokeballType),
-      "catchRate": getPokeballCatchMultiplier(this.pokeballType) > -1 ? `${getPokeballCatchMultiplier(this.pokeballType)}x` : "100%",
-      "pokeballAmount": `${globalScene.pokeballCounts[this.pokeballType]}`,
+      modifierCount: this.count,
+      pokeballName: getPokeballName(this.pokeballType),
+      catchRate:
+        getPokeballCatchMultiplier(this.pokeballType) > -1
+          ? `${getPokeballCatchMultiplier(this.pokeballType)}x`
+          : "100%",
+      pokeballAmount: `${globalScene.pokeballCounts[this.pokeballType]}`,
     });
   }
 }
@@ -224,22 +336,27 @@ class AddVoucherModifierType extends ModifierType {
   private count: number;
 
   constructor(voucherType: VoucherType, count: number) {
-    super("", getVoucherTypeIcon(voucherType), (_type, _args) => new AddVoucherModifier(this, voucherType, count), "voucher");
+    super(
+      "",
+      getVoucherTypeIcon(voucherType),
+      (_type, _args) => new AddVoucherModifier(this, voucherType, count),
+      "voucher",
+    );
     this.count = count;
     this.voucherType = voucherType;
   }
 
   get name(): string {
     return i18next.t("modifierType:ModifierType.AddVoucherModifierType.name", {
-      "modifierCount": this.count,
-      "voucherTypeName": getVoucherTypeName(this.voucherType),
+      modifierCount: this.count,
+      voucherTypeName: getVoucherTypeName(this.voucherType),
     });
   }
 
   getDescription(): string {
     return i18next.t("modifierType:ModifierType.AddVoucherModifierType.description", {
-      "modifierCount": this.count,
-      "voucherTypeName": getVoucherTypeName(this.voucherType),
+      modifierCount: this.count,
+      voucherTypeName: getVoucherTypeName(this.voucherType),
     });
   }
 }
@@ -247,7 +364,14 @@ class AddVoucherModifierType extends ModifierType {
 export class PokemonModifierType extends ModifierType {
   public selectFilter: PokemonSelectFilter | undefined;
 
-  constructor(localeKey: string, iconImage: string, newModifierFunc: NewModifierFunc, selectFilter?: PokemonSelectFilter, group?: string, soundName?: string) {
+  constructor(
+    localeKey: string,
+    iconImage: string,
+    newModifierFunc: NewModifierFunc,
+    selectFilter?: PokemonSelectFilter,
+    group?: string,
+    soundName?: string,
+  ) {
     super(localeKey, iconImage, newModifierFunc, group, soundName);
 
     this.selectFilter = selectFilter;
@@ -255,19 +379,38 @@ export class PokemonModifierType extends ModifierType {
 }
 
 export class PokemonHeldItemModifierType extends PokemonModifierType {
-  constructor(localeKey: string, iconImage: string, newModifierFunc: NewModifierFunc, group?: string, soundName?: string) {
-    super(localeKey, iconImage, newModifierFunc, (pokemon: PlayerPokemon) => {
-      const dummyModifier = this.newModifier(pokemon);
-      const matchingModifier = globalScene.findModifier(m => m instanceof PokemonHeldItemModifier && m.pokemonId === pokemon.id && m.matchType(dummyModifier)) as PokemonHeldItemModifier;
-      const maxStackCount = dummyModifier.getMaxStackCount();
-      if (!maxStackCount) {
-        return i18next.t("modifierType:ModifierType.PokemonHeldItemModifierType.extra.inoperable", { "pokemonName": getPokemonNameWithAffix(pokemon) });
-      }
-      if (matchingModifier && matchingModifier.stackCount === maxStackCount) {
-        return i18next.t("modifierType:ModifierType.PokemonHeldItemModifierType.extra.tooMany", { "pokemonName": getPokemonNameWithAffix(pokemon) });
-      }
-      return null;
-    }, group, soundName);
+  constructor(
+    localeKey: string,
+    iconImage: string,
+    newModifierFunc: NewModifierFunc,
+    group?: string,
+    soundName?: string,
+  ) {
+    super(
+      localeKey,
+      iconImage,
+      newModifierFunc,
+      (pokemon: PlayerPokemon) => {
+        const dummyModifier = this.newModifier(pokemon);
+        const matchingModifier = globalScene.findModifier(
+          m => m instanceof PokemonHeldItemModifier && m.pokemonId === pokemon.id && m.matchType(dummyModifier),
+        ) as PokemonHeldItemModifier;
+        const maxStackCount = dummyModifier.getMaxStackCount();
+        if (!maxStackCount) {
+          return i18next.t("modifierType:ModifierType.PokemonHeldItemModifierType.extra.inoperable", {
+            pokemonName: getPokemonNameWithAffix(pokemon),
+          });
+        }
+        if (matchingModifier && matchingModifier.stackCount === maxStackCount) {
+          return i18next.t("modifierType:ModifierType.PokemonHeldItemModifierType.extra.tooMany", {
+            pokemonName: getPokemonNameWithAffix(pokemon),
+          });
+        }
+        return null;
+      },
+      group,
+      soundName,
+    );
   }
 
   newModifier(...args: any[]): PokemonHeldItemModifier {
@@ -275,19 +418,87 @@ export class PokemonHeldItemModifierType extends PokemonModifierType {
   }
 }
 
+export class TerastallizeModifierType extends PokemonModifierType {
+  private teraType: PokemonType;
+
+  constructor(teraType: PokemonType) {
+    super(
+      "",
+      `${PokemonType[teraType].toLowerCase()}_tera_shard`,
+      (type, args) => new TerrastalizeModifier(type as TerastallizeModifierType, (args[0] as Pokemon).id, teraType),
+      (pokemon: PlayerPokemon) => {
+        if (
+          [pokemon.species.speciesId, pokemon.fusionSpecies?.speciesId].filter(
+            s => s === Species.TERAPAGOS || s === Species.OGERPON || s === Species.SHEDINJA,
+          ).length > 0
+        ) {
+          return PartyUiHandler.NoEffectMessage;
+        }
+        return null;
+      },
+      "tera_shard",
+    );
+
+    this.teraType = teraType;
+  }
+
+  get name(): string {
+    return i18next.t("modifierType:ModifierType.TerastallizeModifierType.name", {
+      teraType: i18next.t(`pokemonInfo:Type.${PokemonType[this.teraType]}`),
+    });
+  }
+
+  getDescription(): string {
+    return i18next.t("modifierType:ModifierType.TerastallizeModifierType.description", {
+      teraType: i18next.t(`pokemonInfo:Type.${PokemonType[this.teraType]}`),
+    });
+  }
+
+  getPregenArgs(): any[] {
+    return [this.teraType];
+  }
+}
+
 export class PokemonHpRestoreModifierType extends PokemonModifierType {
   protected restorePoints: number;
   protected restorePercent: number;
   protected healStatus: boolean;
 
-  constructor(localeKey: string, iconImage: string, restorePoints: number, restorePercent: number, healStatus: boolean = false, newModifierFunc?: NewModifierFunc, selectFilter?: PokemonSelectFilter, group?: string) {
-    super(localeKey, iconImage, newModifierFunc || ((_type, args) => new PokemonHpRestoreModifier(this, (args[0] as PlayerPokemon).id, this.restorePoints, this.restorePercent, this.healStatus, false)),
-      selectFilter || ((pokemon: PlayerPokemon) => {
-        if (!pokemon.hp || (pokemon.isFullHp() && (!this.healStatus || (!pokemon.status && !pokemon.getTag(BattlerTagType.CONFUSED))))) {
-          return PartyUiHandler.NoEffectMessage;
-        }
-        return null;
-      }), group || "potion");
+  constructor(
+    localeKey: string,
+    iconImage: string,
+    restorePoints: number,
+    restorePercent: number,
+    healStatus = false,
+    newModifierFunc?: NewModifierFunc,
+    selectFilter?: PokemonSelectFilter,
+    group?: string,
+  ) {
+    super(
+      localeKey,
+      iconImage,
+      newModifierFunc ||
+        ((_type, args) =>
+          new PokemonHpRestoreModifier(
+            this,
+            (args[0] as PlayerPokemon).id,
+            this.restorePoints,
+            this.restorePercent,
+            this.healStatus,
+            false,
+          )),
+      selectFilter ||
+        ((pokemon: PlayerPokemon) => {
+          if (
+            !pokemon.hp ||
+            (pokemon.isFullHp() && (!this.healStatus || (!pokemon.status && !pokemon.getTag(BattlerTagType.CONFUSED))))
+          ) {
+            return PartyUiHandler.NoEffectMessage;
+          }
+          return null;
+        }),
+      group || "potion",
+    );
 
     this.restorePoints = restorePoints;
     this.restorePercent = restorePercent;
@@ -297,9 +508,9 @@ export class PokemonHpRestoreModifierType extends PokemonModifierType {
   getDescription(): string {
     return this.restorePoints
       ? i18next.t("modifierType:ModifierType.PokemonHpRestoreModifierType.description", {
-        restorePoints: this.restorePoints,
-        restorePercent: this.restorePercent,
-      })
+          restorePoints: this.restorePoints,
+          restorePercent: this.restorePercent,
+        })
       : this.healStatus
         ? i18next.t("modifierType:ModifierType.PokemonHpRestoreModifierType.extra.fullyWithStatus")
         : i18next.t("modifierType:ModifierType.PokemonHpRestoreModifierType.extra.fully");
@@ -308,13 +519,22 @@ export class PokemonHpRestoreModifierType extends PokemonModifierType {
 
 export class PokemonReviveModifierType extends PokemonHpRestoreModifierType {
   constructor(localeKey: string, iconImage: string, restorePercent: number) {
-    super(localeKey, iconImage, 0, restorePercent, false, (_type, args) => new PokemonHpRestoreModifier(this, (args[0] as PlayerPokemon).id, 0, this.restorePercent, false, true),
-      ((pokemon: PlayerPokemon) => {
+    super(
+      localeKey,
+      iconImage,
+      0,
+      restorePercent,
+      false,
+      (_type, args) =>
+        new PokemonHpRestoreModifier(this, (args[0] as PlayerPokemon).id, 0, this.restorePercent, false, true),
+      (pokemon: PlayerPokemon) => {
         if (!pokemon.isFainted()) {
           return PartyUiHandler.NoEffectMessage;
         }
         return null;
-      }), "revive");
+      },
+      "revive",
+    );
 
     this.selectFilter = (pokemon: PlayerPokemon) => {
       if (pokemon.hp) {
@@ -325,19 +545,25 @@ export class PokemonReviveModifierType extends PokemonHpRestoreModifierType {
   }
 
   getDescription(): string {
-    return i18next.t("modifierType:ModifierType.PokemonReviveModifierType.description", { restorePercent: this.restorePercent });
+    return i18next.t("modifierType:ModifierType.PokemonReviveModifierType.description", {
+      restorePercent: this.restorePercent,
+    });
   }
 }
 
 export class PokemonStatusHealModifierType extends PokemonModifierType {
   constructor(localeKey: string, iconImage: string) {
-    super(localeKey, iconImage, ((_type, args) => new PokemonStatusHealModifier(this, (args[0] as PlayerPokemon).id)),
-      ((pokemon: PlayerPokemon) => {
+    super(
+      localeKey,
+      iconImage,
+      (_type, args) => new PokemonStatusHealModifier(this, (args[0] as PlayerPokemon).id),
+      (pokemon: PlayerPokemon) => {
         if (!pokemon.hp || (!pokemon.status && !pokemon.getTag(BattlerTagType.CONFUSED))) {
           return PartyUiHandler.NoEffectMessage;
         }
         return null;
-      }));
+      },
+    );
   }
 
   getDescription(): string {
@@ -348,7 +574,14 @@ export class PokemonStatusHealModifierType extends PokemonModifierType {
 export abstract class PokemonMoveModifierType extends PokemonModifierType {
   public moveSelectFilter: PokemonMoveSelectFilter | undefined;
 
-  constructor(localeKey: string, iconImage: string, newModifierFunc: NewModifierFunc, selectFilter?: PokemonSelectFilter, moveSelectFilter?: PokemonMoveSelectFilter, group?: string) {
+  constructor(
+    localeKey: string,
+    iconImage: string,
+    newModifierFunc: NewModifierFunc,
+    selectFilter?: PokemonSelectFilter,
+    moveSelectFilter?: PokemonMoveSelectFilter,
+    group?: string,
+  ) {
     super(localeKey, iconImage, newModifierFunc, selectFilter, group);
 
     this.moveSelectFilter = moveSelectFilter;
@@ -359,24 +592,32 @@ export class PokemonPpRestoreModifierType extends PokemonMoveModifierType {
   protected restorePoints: number;
 
   constructor(localeKey: string, iconImage: string, restorePoints: number) {
-    super(localeKey, iconImage, (_type, args) => new PokemonPpRestoreModifier(this, (args[0] as PlayerPokemon).id, (args[1] as number), this.restorePoints),
+    super(
+      localeKey,
+      iconImage,
+      (_type, args) =>
+        new PokemonPpRestoreModifier(this, (args[0] as PlayerPokemon).id, args[1] as number, this.restorePoints),
       (_pokemon: PlayerPokemon) => {
         return null;
-      }, (pokemonMove: PokemonMove) => {
+      },
+      (pokemonMove: PokemonMove) => {
         if (!pokemonMove.ppUsed) {
           return PartyUiHandler.NoEffectMessage;
         }
         return null;
-      }, "ether");
+      },
+      "ether",
+    );
 
     this.restorePoints = restorePoints;
   }
 
   getDescription(): string {
     return this.restorePoints > -1
-      ? i18next.t("modifierType:ModifierType.PokemonPpRestoreModifierType.description", { restorePoints: this.restorePoints })
-      : i18next.t("modifierType:ModifierType.PokemonPpRestoreModifierType.extra.fully")
-    ;
+      ? i18next.t("modifierType:ModifierType.PokemonPpRestoreModifierType.description", {
+          restorePoints: this.restorePoints,
+        })
+      : i18next.t("modifierType:ModifierType.PokemonPpRestoreModifierType.extra.fully");
   }
 }
 
@@ -384,22 +625,28 @@ export class PokemonAllMovePpRestoreModifierType extends PokemonModifierType {
   protected restorePoints: number;
 
   constructor(localeKey: string, iconImage: string, restorePoints: number) {
-    super(localeKey, iconImage, (_type, args) => new PokemonAllMovePpRestoreModifier(this, (args[0] as PlayerPokemon).id, this.restorePoints),
+    super(
+      localeKey,
+      iconImage,
+      (_type, args) => new PokemonAllMovePpRestoreModifier(this, (args[0] as PlayerPokemon).id, this.restorePoints),
       (pokemon: PlayerPokemon) => {
-        if (!pokemon.getMoveset().filter(m => m?.ppUsed).length) {
+        if (!pokemon.getMoveset().filter(m => m.ppUsed).length) {
           return PartyUiHandler.NoEffectMessage;
         }
         return null;
-      }, "elixir");
+      },
+      "elixir",
+    );
 
     this.restorePoints = restorePoints;
   }
 
   getDescription(): string {
     return this.restorePoints > -1
-      ? i18next.t("modifierType:ModifierType.PokemonAllMovePpRestoreModifierType.description", { restorePoints: this.restorePoints })
-      : i18next.t("modifierType:ModifierType.PokemonAllMovePpRestoreModifierType.extra.fully")
-    ;
+      ? i18next.t("modifierType:ModifierType.PokemonAllMovePpRestoreModifierType.description", {
+          restorePoints: this.restorePoints,
+        })
+      : i18next.t("modifierType:ModifierType.PokemonAllMovePpRestoreModifierType.extra.fully");
   }
 }
 
@@ -407,15 +654,21 @@ export class PokemonPpUpModifierType extends PokemonMoveModifierType {
   protected upPoints: number;
 
   constructor(localeKey: string, iconImage: string, upPoints: number) {
-    super(localeKey, iconImage, (_type, args) => new PokemonPpUpModifier(this, (args[0] as PlayerPokemon).id, (args[1] as number), this.upPoints),
+    super(
+      localeKey,
+      iconImage,
+      (_type, args) => new PokemonPpUpModifier(this, (args[0] as PlayerPokemon).id, args[1] as number, this.upPoints),
       (_pokemon: PlayerPokemon) => {
         return null;
-      }, (pokemonMove: PokemonMove) => {
+      },
+      (pokemonMove: PokemonMove) => {
         if (pokemonMove.getMove().pp < 5 || pokemonMove.ppUp >= 3 || pokemonMove.maxPpOverride) {
           return PartyUiHandler.NoEffectMessage;
         }
         return null;
-      }, "ppUp");
+      },
+      "ppUp",
+    );
 
     this.upPoints = upPoints;
   }
@@ -429,35 +682,53 @@ export class PokemonNatureChangeModifierType extends PokemonModifierType {
   protected nature: Nature;
 
   constructor(nature: Nature) {
-    super("", `mint_${getEnumKeys(Stat).find(s => getNatureStatMultiplier(nature, Stat[s]) > 1)?.toLowerCase() || "neutral" }`, ((_type, args) => new PokemonNatureChangeModifier(this, (args[0] as PlayerPokemon).id, this.nature)),
-      ((pokemon: PlayerPokemon) => {
+    super(
+      "",
+      `mint_${
+        getEnumKeys(Stat)
+          .find(s => getNatureStatMultiplier(nature, Stat[s]) > 1)
+          ?.toLowerCase() || "neutral"
+      }`,
+      (_type, args) => new PokemonNatureChangeModifier(this, (args[0] as PlayerPokemon).id, this.nature),
+      (pokemon: PlayerPokemon) => {
         if (pokemon.getNature() === this.nature) {
           return PartyUiHandler.NoEffectMessage;
         }
         return null;
-      }), "mint");
+      },
+      "mint",
+    );
 
     this.nature = nature;
   }
 
   get name(): string {
-    return i18next.t("modifierType:ModifierType.PokemonNatureChangeModifierType.name", { natureName: getNatureName(this.nature) });
+    return i18next.t("modifierType:ModifierType.PokemonNatureChangeModifierType.name", {
+      natureName: getNatureName(this.nature),
+    });
   }
 
   getDescription(): string {
-    return i18next.t("modifierType:ModifierType.PokemonNatureChangeModifierType.description", { natureName: getNatureName(this.nature, true, true, true) });
+    return i18next.t("modifierType:ModifierType.PokemonNatureChangeModifierType.description", {
+      natureName: getNatureName(this.nature, true, true, true),
+    });
   }
 }
 
 export class RememberMoveModifierType extends PokemonModifierType {
   constructor(localeKey: string, iconImage: string, group?: string) {
-    super(localeKey, iconImage, (type, args) => new RememberMoveModifier(type, (args[0] as PlayerPokemon).id, (args[1] as number)),
+    super(
+      localeKey,
+      iconImage,
+      (type, args) => new RememberMoveModifier(type, (args[0] as PlayerPokemon).id, args[1] as number),
       (pokemon: PlayerPokemon) => {
         if (!pokemon.getLearnableLevelMoves().length) {
           return PartyUiHandler.NoEffectMessage;
         }
         return null;
-      }, group);
+      },
+      group,
+    );
   }
 }
 
@@ -472,7 +743,7 @@ export class DoubleBattleChanceBoosterModifierType extends ModifierType {
 
   getDescription(): string {
     return i18next.t("modifierType:ModifierType.DoubleBattleChanceBoosterModifierType.description", {
-      battleCount: this.maxBattles
+      battleCount: this.maxBattles,
     });
   }
 }
@@ -488,7 +759,7 @@ export class TempStatStageBoosterModifierType extends ModifierType implements Ge
 
     this.stat = stat;
     this.nameKey = nameKey;
-    this.quantityKey = (stat !== Stat.ACC) ? "percentage" : "stage";
+    this.quantityKey = stat !== Stat.ACC ? "percentage" : "stage";
   }
 
   get name(): string {
@@ -498,12 +769,12 @@ export class TempStatStageBoosterModifierType extends ModifierType implements Ge
   getDescription(): string {
     return i18next.t("modifierType:ModifierType.TempStatStageBoosterModifierType.description", {
       stat: i18next.t(getStatKey(this.stat)),
-      amount: i18next.t(`modifierType:ModifierType.TempStatStageBoosterModifierType.extra.${this.quantityKey}`)
+      amount: i18next.t(`modifierType:ModifierType.TempStatStageBoosterModifierType.extra.${this.quantityKey}`),
     });
   }
 
   getPregenArgs(): any[] {
-    return [ this.stat ];
+    return [this.stat];
   }
 }
 
@@ -511,9 +782,15 @@ export class BerryModifierType extends PokemonHeldItemModifierType implements Ge
   private berryType: BerryType;
 
   constructor(berryType: BerryType) {
-    super("", `${BerryType[berryType].toLowerCase()}_berry`, (type, args) => new BerryModifier(type, (args[0] as Pokemon).id, berryType), "berry");
+    super(
+      "",
+      `${BerryType[berryType].toLowerCase()}_berry`,
+      (type, args) => new BerryModifier(type, (args[0] as Pokemon).id, berryType),
+      "berry",
+    );
 
     this.berryType = berryType;
+    this.id = "BERRY"; // needed to prevent harvest item deletion; remove after modifier rework
   }
 
   get name(): string {
@@ -525,7 +802,7 @@ export class BerryModifierType extends PokemonHeldItemModifierType implements Ge
   }
 
   getPregenArgs(): any[] {
-    return [ this.berryType ];
+    return [this.berryType];
   }
 }
 
@@ -547,16 +824,22 @@ enum AttackTypeBoosterItem {
   NEVER_MELT_ICE,
   DRAGON_FANG,
   BLACK_GLASSES,
-  FAIRY_FEATHER
+  FAIRY_FEATHER,
 }
 
-export class AttackTypeBoosterModifierType extends PokemonHeldItemModifierType implements GeneratedPersistentModifierType {
-  public moveType: Type;
+export class AttackTypeBoosterModifierType
+  extends PokemonHeldItemModifierType
+  implements GeneratedPersistentModifierType
+{
+  public moveType: PokemonType;
   public boostPercent: number;
 
-  constructor(moveType: Type, boostPercent: number) {
-    super("", `${AttackTypeBoosterItem[moveType]?.toLowerCase()}`,
-      (_type, args) => new AttackTypeBoosterModifier(this, (args[0] as Pokemon).id, moveType, boostPercent));
+  constructor(moveType: PokemonType, boostPercent: number) {
+    super(
+      "",
+      `${AttackTypeBoosterItem[moveType]?.toLowerCase()}`,
+      (_type, args) => new AttackTypeBoosterModifier(this, (args[0] as Pokemon).id, moveType, boostPercent),
+    );
 
     this.moveType = moveType;
     this.boostPercent = boostPercent;
@@ -568,11 +851,13 @@ export class AttackTypeBoosterModifierType extends PokemonHeldItemModifierType i
 
   getDescription(): string {
     // TODO: Need getTypeName?
-    return i18next.t("modifierType:ModifierType.AttackTypeBoosterModifierType.description", { moveType: i18next.t(`pokemonInfo:Type.${Type[this.moveType]}`) });
+    return i18next.t("modifierType:ModifierType.AttackTypeBoosterModifierType.description", {
+      moveType: i18next.t(`pokemonInfo:Type.${PokemonType[this.moveType]}`),
+    });
   }
 
   getPregenArgs(): any[] {
-    return [ this.moveType ];
+    return [this.moveType];
   }
 }
 
@@ -583,24 +868,37 @@ export type SpeciesStatBoosterItem = keyof typeof SpeciesStatBoosterModifierType
  * @extends PokemonHeldItemModifierType
  * @implements GeneratedPersistentModifierType
  */
-export class SpeciesStatBoosterModifierType extends PokemonHeldItemModifierType implements GeneratedPersistentModifierType {
+export class SpeciesStatBoosterModifierType
+  extends PokemonHeldItemModifierType
+  implements GeneratedPersistentModifierType
+{
   private key: SpeciesStatBoosterItem;
 
   constructor(key: SpeciesStatBoosterItem) {
     const item = SpeciesStatBoosterModifierTypeGenerator.items[key];
-    super(`modifierType:SpeciesBoosterItem.${key}`, key.toLowerCase(), (type, args) => new SpeciesStatBoosterModifier(type, (args[0] as Pokemon).id, item.stats, item.multiplier, item.species));
+    super(
+      `modifierType:SpeciesBoosterItem.${key}`,
+      key.toLowerCase(),
+      (type, args) =>
+        new SpeciesStatBoosterModifier(type, (args[0] as Pokemon).id, item.stats, item.multiplier, item.species),
+    );
 
     this.key = key;
   }
 
   getPregenArgs(): any[] {
-    return [ this.key ];
+    return [this.key];
   }
 }
 
 export class PokemonLevelIncrementModifierType extends PokemonModifierType {
   constructor(localeKey: string, iconImage: string) {
-    super(localeKey, iconImage, (_type, args) => new PokemonLevelIncrementModifier(this, (args[0] as PlayerPokemon).id), (_pokemon: PlayerPokemon) => null);
+    super(
+      localeKey,
+      iconImage,
+      (_type, args) => new PokemonLevelIncrementModifier(this, (args[0] as PlayerPokemon).id),
+      (_pokemon: PlayerPokemon) => null,
+    );
   }
 
   getDescription(): string {
@@ -628,7 +926,10 @@ export class AllPokemonLevelIncrementModifierType extends ModifierType {
   }
 }
 
-export class BaseStatBoosterModifierType extends PokemonHeldItemModifierType implements GeneratedPersistentModifierType {
+export class BaseStatBoosterModifierType
+  extends PokemonHeldItemModifierType
+  implements GeneratedPersistentModifierType
+{
   private stat: PermanentStat;
   private key: string;
 
@@ -645,47 +946,71 @@ export class BaseStatBoosterModifierType extends PokemonHeldItemModifierType imp
   }
 
   getDescription(): string {
-    return i18next.t("modifierType:ModifierType.BaseStatBoosterModifierType.description", { stat: i18next.t(getStatKey(this.stat)) });
+    return i18next.t("modifierType:ModifierType.BaseStatBoosterModifierType.description", {
+      stat: i18next.t(getStatKey(this.stat)),
+    });
   }
 
   getPregenArgs(): any[] {
-    return [ this.stat ];
+    return [this.stat];
   }
 }
 
 /**
  * Shuckle Juice item
  */
-export class PokemonBaseStatTotalModifierType extends PokemonHeldItemModifierType implements GeneratedPersistentModifierType {
+export class PokemonBaseStatTotalModifierType
+  extends PokemonHeldItemModifierType
+  implements GeneratedPersistentModifierType
+{
   private readonly statModifier: number;
 
   constructor(statModifier: number) {
-    super("modifierType:ModifierType.MYSTERY_ENCOUNTER_SHUCKLE_JUICE", "berry_juice", (_type, args) => new PokemonBaseStatTotalModifier(this, (args[0] as Pokemon).id, this.statModifier));
+    super(
+      "modifierType:ModifierType.MYSTERY_ENCOUNTER_SHUCKLE_JUICE",
+      "berry_juice",
+      (_type, args) => new PokemonBaseStatTotalModifier(this, (args[0] as Pokemon).id, this.statModifier),
+    );
     this.statModifier = statModifier;
   }
 
   override getDescription(): string {
     return i18next.t("modifierType:ModifierType.PokemonBaseStatTotalModifierType.description", {
-      increaseDecrease: i18next.t(this.statModifier >= 0 ? "modifierType:ModifierType.PokemonBaseStatTotalModifierType.extra.increase" : "modifierType:ModifierType.PokemonBaseStatTotalModifierType.extra.decrease"),
-      blessCurse: i18next.t(this.statModifier >= 0 ? "modifierType:ModifierType.PokemonBaseStatTotalModifierType.extra.blessed" : "modifierType:ModifierType.PokemonBaseStatTotalModifierType.extra.cursed"),
+      increaseDecrease: i18next.t(
+        this.statModifier >= 0
+          ? "modifierType:ModifierType.PokemonBaseStatTotalModifierType.extra.increase"
+          : "modifierType:ModifierType.PokemonBaseStatTotalModifierType.extra.decrease",
+      ),
+      blessCurse: i18next.t(
+        this.statModifier >= 0
+          ? "modifierType:ModifierType.PokemonBaseStatTotalModifierType.extra.blessed"
+          : "modifierType:ModifierType.PokemonBaseStatTotalModifierType.extra.cursed",
+      ),
       statValue: this.statModifier,
     });
   }
 
   public getPregenArgs(): any[] {
-    return [ this.statModifier ];
+    return [this.statModifier];
   }
 }
 
 /**
  * Old Gateau item
  */
-export class PokemonBaseStatFlatModifierType extends PokemonHeldItemModifierType implements GeneratedPersistentModifierType {
+export class PokemonBaseStatFlatModifierType
+  extends PokemonHeldItemModifierType
+  implements GeneratedPersistentModifierType
+{
   private readonly statModifier: number;
   private readonly stats: Stat[];
 
   constructor(statModifier: number, stats: Stat[]) {
-    super("modifierType:ModifierType.MYSTERY_ENCOUNTER_OLD_GATEAU", "old_gateau", (_type, args) => new PokemonBaseStatFlatModifier(this, (args[0] as Pokemon).id, this.statModifier, this.stats));
+    super(
+      "modifierType:ModifierType.MYSTERY_ENCOUNTER_OLD_GATEAU",
+      "old_gateau",
+      (_type, args) => new PokemonBaseStatFlatModifier(this, (args[0] as Pokemon).id, this.statModifier, this.stats),
+    );
     this.statModifier = statModifier;
     this.stats = stats;
   }
@@ -698,7 +1023,7 @@ export class PokemonBaseStatFlatModifierType extends PokemonHeldItemModifierType
   }
 
   public getPregenArgs(): any[] {
-    return [ this.statModifier, this.stats ];
+    return [this.statModifier, this.stats];
   }
 }
 
@@ -706,19 +1031,30 @@ class AllPokemonFullHpRestoreModifierType extends ModifierType {
   private descriptionKey: string;
 
   constructor(localeKey: string, iconImage: string, descriptionKey?: string, newModifierFunc?: NewModifierFunc) {
-    super(localeKey, iconImage, newModifierFunc || ((_type, _args) => new PokemonHpRestoreModifier(this, -1, 0, 100, false)));
+    super(
+      localeKey,
+      iconImage,
+      newModifierFunc || ((_type, _args) => new PokemonHpRestoreModifier(this, -1, 0, 100, false)),
+    );
 
     this.descriptionKey = descriptionKey!; // TODO: is this bang correct?
   }
 
   getDescription(): string {
-    return i18next.t(`${this.descriptionKey || "modifierType:ModifierType.AllPokemonFullHpRestoreModifierType"}.description` as any);
+    return i18next.t(
+      `${this.descriptionKey || "modifierType:ModifierType.AllPokemonFullHpRestoreModifierType"}.description` as any,
+    );
   }
 }
 
 class AllPokemonFullReviveModifierType extends AllPokemonFullHpRestoreModifierType {
   constructor(localeKey: string, iconImage: string) {
-    super(localeKey, iconImage, "modifierType:ModifierType.AllPokemonFullReviveModifierType", (_type, _args) => new PokemonHpRestoreModifier(this, -1, 0, 100, false, true));
+    super(
+      localeKey,
+      iconImage,
+      "modifierType:ModifierType.AllPokemonFullReviveModifierType",
+      (_type, _args) => new PokemonHpRestoreModifier(this, -1, 0, 100, false, true),
+    );
   }
 }
 
@@ -755,7 +1091,9 @@ export class ExpBoosterModifierType extends ModifierType {
   }
 
   getDescription(): string {
-    return i18next.t("modifierType:ModifierType.ExpBoosterModifierType.description", { boostPercent: this.boostPercent });
+    return i18next.t("modifierType:ModifierType.ExpBoosterModifierType.description", {
+      boostPercent: this.boostPercent,
+    });
   }
 }
 
@@ -763,13 +1101,19 @@ export class PokemonExpBoosterModifierType extends PokemonHeldItemModifierType {
   private boostPercent: number;
 
   constructor(localeKey: string, iconImage: string, boostPercent: number) {
-    super(localeKey, iconImage, (_type, args) => new PokemonExpBoosterModifier(this, (args[0] as Pokemon).id, boostPercent));
+    super(
+      localeKey,
+      iconImage,
+      (_type, args) => new PokemonExpBoosterModifier(this, (args[0] as Pokemon).id, boostPercent),
+    );
 
     this.boostPercent = boostPercent;
   }
 
   getDescription(): string {
-    return i18next.t("modifierType:ModifierType.PokemonExpBoosterModifierType.description", { boostPercent: this.boostPercent });
+    return i18next.t("modifierType:ModifierType.PokemonExpBoosterModifierType.description", {
+      boostPercent: this.boostPercent,
+    });
   }
 }
 
@@ -787,19 +1131,31 @@ export class PokemonMoveAccuracyBoosterModifierType extends PokemonHeldItemModif
   private amount: number;
 
   constructor(localeKey: string, iconImage: string, amount: number, group?: string, soundName?: string) {
-    super(localeKey, iconImage, (_type, args) => new PokemonMoveAccuracyBoosterModifier(this, (args[0] as Pokemon).id, amount), group, soundName);
+    super(
+      localeKey,
+      iconImage,
+      (_type, args) => new PokemonMoveAccuracyBoosterModifier(this, (args[0] as Pokemon).id, amount),
+      group,
+      soundName,
+    );
 
     this.amount = amount;
   }
 
   getDescription(): string {
-    return i18next.t("modifierType:ModifierType.PokemonMoveAccuracyBoosterModifierType.description", { accuracyAmount: this.amount });
+    return i18next.t("modifierType:ModifierType.PokemonMoveAccuracyBoosterModifierType.description", {
+      accuracyAmount: this.amount,
+    });
   }
 }
 
 export class PokemonMultiHitModifierType extends PokemonHeldItemModifierType {
   constructor(localeKey: string, iconImage: string) {
-    super(localeKey, iconImage, (type, args) => new PokemonMultiHitModifier(type as PokemonMultiHitModifierType, (args[0] as Pokemon).id));
+    super(
+      localeKey,
+      iconImage,
+      (type, args) => new PokemonMultiHitModifier(type as PokemonMultiHitModifierType, (args[0] as Pokemon).id),
+    );
   }
 
   getDescription(): string {
@@ -811,13 +1167,21 @@ export class TmModifierType extends PokemonModifierType {
   public moveId: Moves;
 
   constructor(moveId: Moves) {
-    super("", `tm_${Type[allMoves[moveId].type].toLowerCase()}`, (_type, args) => new TmModifier(this, (args[0] as PlayerPokemon).id),
+    super(
+      "",
+      `tm_${PokemonType[allMoves[moveId].type].toLowerCase()}`,
+      (_type, args) => new TmModifier(this, (args[0] as PlayerPokemon).id),
       (pokemon: PlayerPokemon) => {
-        if (pokemon.compatibleTms.indexOf(moveId) === -1 || pokemon.getMoveset().filter(m => m?.moveId === moveId).length) {
+        if (
+          pokemon.compatibleTms.indexOf(moveId) === -1 ||
+          pokemon.getMoveset().filter(m => m.moveId === moveId).length
+        ) {
           return PartyUiHandler.NoEffectMessage;
         }
         return null;
-      }, "tm");
+      },
+      "tm",
+    );
 
     this.moveId = moveId;
   }
@@ -830,7 +1194,12 @@ export class TmModifierType extends PokemonModifierType {
   }
 
   getDescription(): string {
-    return i18next.t(globalScene.enableMoveInfo ? "modifierType:ModifierType.TmModifierTypeWithInfo.description" : "modifierType:ModifierType.TmModifierType.description", { moveName: allMoves[this.moveId].name });
+    return i18next.t(
+      globalScene.enableMoveInfo
+        ? "modifierType:ModifierType.TmModifierTypeWithInfo.description"
+        : "modifierType:ModifierType.TmModifierType.description",
+      { moveName: allMoves[this.moveId].name },
+    );
   }
 }
 
@@ -838,18 +1207,41 @@ export class EvolutionItemModifierType extends PokemonModifierType implements Ge
   public evolutionItem: EvolutionItem;
 
   constructor(evolutionItem: EvolutionItem) {
-    super("", EvolutionItem[evolutionItem].toLowerCase(), (_type, args) => new EvolutionItemModifier(this, (args[0] as PlayerPokemon).id),
+    super(
+      "",
+      EvolutionItem[evolutionItem].toLowerCase(),
+      (_type, args) => new EvolutionItemModifier(this, (args[0] as PlayerPokemon).id),
       (pokemon: PlayerPokemon) => {
-        if (pokemonEvolutions.hasOwnProperty(pokemon.species.speciesId) && pokemonEvolutions[pokemon.species.speciesId].filter(e => e.item === this.evolutionItem
-          && (!e.condition || e.condition.predicate(pokemon)) && (e.preFormKey === null || e.preFormKey === pokemon.getFormKey())).length && (pokemon.getFormKey() !== SpeciesFormKey.GIGANTAMAX)) {
+        if (
+          pokemonEvolutions.hasOwnProperty(pokemon.species.speciesId) &&
+          pokemonEvolutions[pokemon.species.speciesId].filter(
+            e =>
+              e.item === this.evolutionItem &&
+              (!e.condition || e.condition.predicate(pokemon)) &&
+              (e.preFormKey === null || e.preFormKey === pokemon.getFormKey()),
+          ).length &&
+          pokemon.getFormKey() !== SpeciesFormKey.GIGANTAMAX
+        ) {
           return null;
-        } else if (pokemon.isFusion() && pokemon.fusionSpecies && pokemonEvolutions.hasOwnProperty(pokemon.fusionSpecies.speciesId) && pokemonEvolutions[pokemon.fusionSpecies.speciesId].filter(e => e.item === this.evolutionItem
-        && (!e.condition || e.condition.predicate(pokemon)) && (e.preFormKey === null || e.preFormKey === pokemon.getFusionFormKey())).length && (pokemon.getFusionFormKey() !== SpeciesFormKey.GIGANTAMAX)) {
+        }
+        if (
+          pokemon.isFusion() &&
+          pokemon.fusionSpecies &&
+          pokemonEvolutions.hasOwnProperty(pokemon.fusionSpecies.speciesId) &&
+          pokemonEvolutions[pokemon.fusionSpecies.speciesId].filter(
+            e =>
+              e.item === this.evolutionItem &&
+              (!e.condition || e.condition.predicate(pokemon)) &&
+              (e.preFormKey === null || e.preFormKey === pokemon.getFusionFormKey()),
+          ).length &&
+          pokemon.getFusionFormKey() !== SpeciesFormKey.GIGANTAMAX
+        ) {
           return null;
         }
 
         return PartyUiHandler.NoEffectMessage;
-      });
+      },
+    );
 
     this.evolutionItem = evolutionItem;
   }
@@ -863,7 +1255,7 @@ export class EvolutionItemModifierType extends PokemonModifierType implements Ge
   }
 
   getPregenArgs(): any[] {
-    return [ this.evolutionItem ];
+    return [this.evolutionItem];
   }
 }
 
@@ -874,21 +1266,30 @@ export class FormChangeItemModifierType extends PokemonModifierType implements G
   public formChangeItem: FormChangeItem;
 
   constructor(formChangeItem: FormChangeItem) {
-    super("", FormChangeItem[formChangeItem].toLowerCase(), (_type, args) => new PokemonFormChangeItemModifier(this, (args[0] as PlayerPokemon).id, formChangeItem, true),
+    super(
+      "",
+      FormChangeItem[formChangeItem].toLowerCase(),
+      (_type, args) => new PokemonFormChangeItemModifier(this, (args[0] as PlayerPokemon).id, formChangeItem, true),
       (pokemon: PlayerPokemon) => {
         // Make sure the Pokemon has alternate forms
-        if (pokemonFormChanges.hasOwnProperty(pokemon.species.speciesId)
+        if (
+          pokemonFormChanges.hasOwnProperty(pokemon.species.speciesId) &&
           // Get all form changes for this species with an item trigger, including any compound triggers
-          && pokemonFormChanges[pokemon.species.speciesId].filter(fc => fc.trigger.hasTriggerType(SpeciesFormChangeItemTrigger) && (fc.preFormKey === pokemon.getFormKey()))
-          // Returns true if any form changes match this item
-            .map(fc => fc.findTrigger(SpeciesFormChangeItemTrigger) as SpeciesFormChangeItemTrigger)
-            .flat().flatMap(fc => fc.item).includes(this.formChangeItem)
+          pokemonFormChanges[pokemon.species.speciesId]
+            .filter(
+              fc => fc.trigger.hasTriggerType(SpeciesFormChangeItemTrigger) && fc.preFormKey === pokemon.getFormKey(),
+            )
+            // Returns true if any form changes match this item
+            .flatMap(fc => fc.findTrigger(SpeciesFormChangeItemTrigger) as SpeciesFormChangeItemTrigger)
+            .flatMap(fc => fc.item)
+            .includes(this.formChangeItem)
         ) {
           return null;
         }
 
         return PartyUiHandler.NoEffectMessage;
-      });
+      },
+    );
 
     this.formChangeItem = formChangeItem;
   }
@@ -902,19 +1303,23 @@ export class FormChangeItemModifierType extends PokemonModifierType implements G
   }
 
   getPregenArgs(): any[] {
-    return [ this.formChangeItem ];
+    return [this.formChangeItem];
   }
 }
 
 export class FusePokemonModifierType extends PokemonModifierType {
   constructor(localeKey: string, iconImage: string) {
-    super(localeKey, iconImage, (_type, args) => new FusePokemonModifier(this, (args[0] as PlayerPokemon).id, (args[1] as PlayerPokemon).id),
+    super(
+      localeKey,
+      iconImage,
+      (_type, args) => new FusePokemonModifier(this, (args[0] as PlayerPokemon).id, (args[1] as PlayerPokemon).id),
       (pokemon: PlayerPokemon) => {
         if (pokemon.isFusion()) {
           return PartyUiHandler.NoEffectMessage;
         }
         return null;
-      });
+      },
+    );
   }
 
   getDescription(): string {
@@ -925,20 +1330,27 @@ export class FusePokemonModifierType extends PokemonModifierType {
 class AttackTypeBoosterModifierTypeGenerator extends ModifierTypeGenerator {
   constructor() {
     super((party: Pokemon[], pregenArgs?: any[]) => {
-      if (pregenArgs && (pregenArgs.length === 1) && (pregenArgs[0] in Type)) {
-        return new AttackTypeBoosterModifierType(pregenArgs[0] as Type, 20);
+      if (pregenArgs && pregenArgs.length === 1 && pregenArgs[0] in PokemonType) {
+        return new AttackTypeBoosterModifierType(pregenArgs[0] as PokemonType, TYPE_BOOST_ITEM_BOOST_PERCENT);
       }
 
-      const attackMoveTypes = party.map(p => p.getMoveset().map(m => m?.getMove()).filter(m => m instanceof AttackMove).map(m => m.type)).flat();
+      const attackMoveTypes = party.flatMap(p =>
+        p
+          .getMoveset()
+          .map(m => m.getMove())
+          .filter(m => m instanceof AttackMove)
+          .map(m => m.type),
+      );
       if (!attackMoveTypes.length) {
         return null;
       }
 
-      const attackMoveTypeWeights = new Map<Type, number>();
+      const attackMoveTypeWeights = new Map<PokemonType, number>();
       let totalWeight = 0;
       for (const t of attackMoveTypes) {
         if (attackMoveTypeWeights.has(t)) {
-          if (attackMoveTypeWeights.get(t)! < 3) { // attackMoveTypeWeights.has(t) was checked before
+          if (attackMoveTypeWeights.get(t)! < 3) {
+            // attackMoveTypeWeights.has(t) was checked before
             attackMoveTypeWeights.set(t, attackMoveTypeWeights.get(t)! + 1);
           } else {
             continue;
@@ -953,7 +1365,7 @@ class AttackTypeBoosterModifierTypeGenerator extends ModifierTypeGenerator {
         return null;
       }
 
-      let type: Type;
+      let type: PokemonType;
 
       const randInt = randSeedInt(totalWeight);
       let weight = 0;
@@ -967,7 +1379,7 @@ class AttackTypeBoosterModifierTypeGenerator extends ModifierTypeGenerator {
         weight += typeWeight;
       }
 
-      return new AttackTypeBoosterModifierType(type!, 20);
+      return new AttackTypeBoosterModifierType(type!, TYPE_BOOST_ITEM_BOOST_PERCENT);
     });
   }
 }
@@ -979,7 +1391,7 @@ class BaseStatBoosterModifierTypeGenerator extends ModifierTypeGenerator {
     [Stat.DEF]: "iron",
     [Stat.SPATK]: "calcium",
     [Stat.SPDEF]: "zinc",
-    [Stat.SPD]: "carbos"
+    [Stat.SPD]: "carbos",
   };
 
   constructor() {
@@ -1000,12 +1412,12 @@ class TempStatStageBoosterModifierTypeGenerator extends ModifierTypeGenerator {
     [Stat.SPATK]: "x_sp_atk",
     [Stat.SPDEF]: "x_sp_def",
     [Stat.SPD]: "x_speed",
-    [Stat.ACC]: "x_accuracy"
+    [Stat.ACC]: "x_accuracy",
   };
 
   constructor() {
     super((_party: Pokemon[], pregenArgs?: any[]) => {
-      if (pregenArgs && (pregenArgs.length === 1) && TEMP_BATTLE_STATS.includes(pregenArgs[0])) {
+      if (pregenArgs && pregenArgs.length === 1 && TEMP_BATTLE_STATS.includes(pregenArgs[0])) {
         return new TempStatStageBoosterModifierType(pregenArgs[0]);
       }
       const randStat: TempBattleStat = randSeedInt(Stat.ACC, Stat.ATK);
@@ -1023,16 +1435,32 @@ class TempStatStageBoosterModifierTypeGenerator extends ModifierTypeGenerator {
 class SpeciesStatBoosterModifierTypeGenerator extends ModifierTypeGenerator {
   /** Object comprised of the currently available species-based stat boosting held items */
   public static readonly items = {
-    LIGHT_BALL: { stats: [ Stat.ATK, Stat.SPATK ], multiplier: 2, species: [ Species.PIKACHU ]},
-    THICK_CLUB: { stats: [ Stat.ATK ], multiplier: 2, species: [ Species.CUBONE, Species.MAROWAK, Species.ALOLA_MAROWAK ]},
-    METAL_POWDER: { stats: [ Stat.DEF ], multiplier: 2, species: [ Species.DITTO ]},
-    QUICK_POWDER: { stats: [ Stat.SPD ], multiplier: 2, species: [ Species.DITTO ]},
+    LIGHT_BALL: {
+      stats: [Stat.ATK, Stat.SPATK],
+      multiplier: 2,
+      species: [Species.PIKACHU],
+    },
+    THICK_CLUB: {
+      stats: [Stat.ATK],
+      multiplier: 2,
+      species: [Species.CUBONE, Species.MAROWAK, Species.ALOLA_MAROWAK],
+    },
+    METAL_POWDER: {
+      stats: [Stat.DEF],
+      multiplier: 2,
+      species: [Species.DITTO],
+    },
+    QUICK_POWDER: {
+      stats: [Stat.SPD],
+      multiplier: 2,
+      species: [Species.DITTO],
+    },
   };
 
   constructor() {
     super((party: Pokemon[], pregenArgs?: any[]) => {
       const items = SpeciesStatBoosterModifierTypeGenerator.items;
-      if (pregenArgs && (pregenArgs.length === 1) && (pregenArgs[0] in items)) {
+      if (pregenArgs && pregenArgs.length === 1 && pregenArgs[0] in items) {
         return new SpeciesStatBoosterModifierType(pregenArgs[0] as SpeciesStatBoosterItem);
       }
 
@@ -1044,15 +1472,20 @@ class SpeciesStatBoosterModifierTypeGenerator extends ModifierTypeGenerator {
         const speciesId = p.getSpeciesForm(true).speciesId;
         const fusionSpeciesId = p.isFusion() ? p.getFusionSpeciesForm(true).speciesId : null;
         // TODO: Use commented boolean when Fling is implemented
-        const hasFling = false; /* p.getMoveset(true).some(m => m?.moveId === Moves.FLING) */
+        const hasFling = false; /* p.getMoveset(true).some(m => m.moveId === Moves.FLING) */
 
         for (const i in values) {
           const checkedSpecies = values[i].species;
           const checkedStats = values[i].stats;
 
           // If party member already has the item being weighted currently, skip to the next item
-          const hasItem = p.getHeldItems().some(m => m instanceof SpeciesStatBoosterModifier
-            && (m as SpeciesStatBoosterModifier).contains(checkedSpecies[0], checkedStats[0]));
+          const hasItem = p
+            .getHeldItems()
+            .some(
+              m =>
+                m instanceof SpeciesStatBoosterModifier &&
+                (m as SpeciesStatBoosterModifier).contains(checkedSpecies[0], checkedStats[0]),
+            );
 
           if (!hasItem) {
             if (checkedSpecies.includes(speciesId) || (!!fusionSpeciesId && checkedSpecies.includes(fusionSpeciesId))) {
@@ -1094,14 +1527,20 @@ class SpeciesStatBoosterModifierTypeGenerator extends ModifierTypeGenerator {
 class TmModifierTypeGenerator extends ModifierTypeGenerator {
   constructor(tier: ModifierTier) {
     super((party: Pokemon[], pregenArgs?: any[]) => {
-      if (pregenArgs && (pregenArgs.length === 1) && (pregenArgs[0] in Moves)) {
+      if (pregenArgs && pregenArgs.length === 1 && pregenArgs[0] in Moves) {
         return new TmModifierType(pregenArgs[0] as Moves);
       }
       const partyMemberCompatibleTms = party.map(p => {
         const previousLevelMoves = p.getLearnableLevelMoves();
-        return (p as PlayerPokemon).compatibleTms.filter(tm => !p.moveset.find(m => m?.moveId === tm) && !previousLevelMoves.find(lm=>lm === tm));
+        return (p as PlayerPokemon).compatibleTms.filter(
+          tm => !p.moveset.find(m => m.moveId === tm) && !previousLevelMoves.find(lm => lm === tm),
+        );
       });
-      const tierUniqueCompatibleTms = partyMemberCompatibleTms.flat().filter(tm => tmPoolTiers[tm] === tier).filter(tm => !allMoves[tm].name.endsWith(" (N)")).filter((tm, i, array) => array.indexOf(tm) === i);
+      const tierUniqueCompatibleTms = partyMemberCompatibleTms
+        .flat()
+        .filter(tm => tmPoolTiers[tm] === tier)
+        .filter(tm => !allMoves[tm].name.endsWith(" (N)"))
+        .filter((tm, i, array) => array.indexOf(tm) === i);
       if (!tierUniqueCompatibleTms.length) {
         return null;
       }
@@ -1114,20 +1553,49 @@ class TmModifierTypeGenerator extends ModifierTypeGenerator {
 class EvolutionItemModifierTypeGenerator extends ModifierTypeGenerator {
   constructor(rare: boolean) {
     super((party: Pokemon[], pregenArgs?: any[]) => {
-      if (pregenArgs && (pregenArgs.length === 1) && (pregenArgs[0] in EvolutionItem)) {
+      if (pregenArgs && pregenArgs.length === 1 && pregenArgs[0] in EvolutionItem) {
         return new EvolutionItemModifierType(pregenArgs[0] as EvolutionItem);
       }
 
       const evolutionItemPool = [
-        party.filter(p => pokemonEvolutions.hasOwnProperty(p.species.speciesId) && (!p.pauseEvolutions || p.species.speciesId === Species.SLOWPOKE || p.species.speciesId === Species.EEVEE)).map(p => {
-          const evolutions = pokemonEvolutions[p.species.speciesId];
-          return evolutions.filter(e => e.item !== EvolutionItem.NONE && (e.evoFormKey === null || (e.preFormKey || "") === p.getFormKey()) && (!e.condition || e.condition.predicate(p)));
-        }).flat(),
-        party.filter(p => p.isFusion() && p.fusionSpecies && pokemonEvolutions.hasOwnProperty(p.fusionSpecies.speciesId) && (!p.pauseEvolutions || p.fusionSpecies.speciesId === Species.SLOWPOKE || p.fusionSpecies.speciesId === Species.EEVEE)).map(p => {
-          const evolutions = pokemonEvolutions[p.fusionSpecies!.speciesId];
-          return evolutions.filter(e => e.item !== EvolutionItem.NONE && (e.evoFormKey === null || (e.preFormKey || "") === p.getFusionFormKey()) && (!e.condition || e.condition.predicate(p)));
-        }).flat()
-      ].flat().flatMap(e => e.item).filter(i => (!!i && i > 50) === rare);
+        party
+          .filter(
+            p =>
+              pokemonEvolutions.hasOwnProperty(p.species.speciesId) &&
+              (!p.pauseEvolutions || p.species.speciesId === Species.SLOWPOKE || p.species.speciesId === Species.EEVEE),
+          )
+          .flatMap(p => {
+            const evolutions = pokemonEvolutions[p.species.speciesId];
+            return evolutions.filter(
+              e =>
+                e.item !== EvolutionItem.NONE &&
+                (e.evoFormKey === null || (e.preFormKey || "") === p.getFormKey()) &&
+                (!e.condition || e.condition.predicate(p)),
+            );
+          }),
+        party
+          .filter(
+            p =>
+              p.isFusion() &&
+              p.fusionSpecies &&
+              pokemonEvolutions.hasOwnProperty(p.fusionSpecies.speciesId) &&
+              (!p.pauseEvolutions ||
+                p.fusionSpecies.speciesId === Species.SLOWPOKE ||
+                p.fusionSpecies.speciesId === Species.EEVEE),
+          )
+          .flatMap(p => {
+            const evolutions = pokemonEvolutions[p.fusionSpecies!.speciesId];
+            return evolutions.filter(
+              e =>
+                e.item !== EvolutionItem.NONE &&
+                (e.evoFormKey === null || (e.preFormKey || "") === p.getFusionFormKey()) &&
+                (!e.condition || e.condition.predicate(p)),
+            );
+          }),
+      ]
+        .flat()
+        .flatMap(e => e.item)
+        .filter(i => (!!i && i > 50) === rare);
 
       if (!evolutionItemPool.length) {
         return null;
@@ -1141,46 +1609,77 @@ class EvolutionItemModifierTypeGenerator extends ModifierTypeGenerator {
 class FormChangeItemModifierTypeGenerator extends ModifierTypeGenerator {
   constructor(isRareFormChangeItem: boolean) {
     super((party: Pokemon[], pregenArgs?: any[]) => {
-      if (pregenArgs && (pregenArgs.length === 1) && (pregenArgs[0] in FormChangeItem)) {
+      if (pregenArgs && pregenArgs.length === 1 && pregenArgs[0] in FormChangeItem) {
         return new FormChangeItemModifierType(pregenArgs[0] as FormChangeItem);
       }
 
-      const formChangeItemPool = [ ...new Set(party.filter(p => pokemonFormChanges.hasOwnProperty(p.species.speciesId)).map(p => {
-        const formChanges = pokemonFormChanges[p.species.speciesId];
-        let formChangeItemTriggers = formChanges.filter(fc => ((fc.formKey.indexOf(SpeciesFormKey.MEGA) === -1 && fc.formKey.indexOf(SpeciesFormKey.PRIMAL) === -1) || globalScene.getModifiers(MegaEvolutionAccessModifier).length)
-          && ((fc.formKey.indexOf(SpeciesFormKey.GIGANTAMAX) === -1 && fc.formKey.indexOf(SpeciesFormKey.ETERNAMAX) === -1) || globalScene.getModifiers(GigantamaxAccessModifier).length)
-          && (!fc.conditions.length || fc.conditions.filter(cond => cond instanceof SpeciesFormChangeCondition && cond.predicate(p)).length)
-          && (fc.preFormKey === p.getFormKey()))
-          .map(fc => fc.findTrigger(SpeciesFormChangeItemTrigger) as SpeciesFormChangeItemTrigger)
-          .filter(t => t && t.active && !globalScene.findModifier(m => m instanceof PokemonFormChangeItemModifier && m.pokemonId === p.id && m.formChangeItem === t.item));
+      const formChangeItemPool = [
+        ...new Set(
+          party
+            .filter(p => pokemonFormChanges.hasOwnProperty(p.species.speciesId))
+            .flatMap(p => {
+              const formChanges = pokemonFormChanges[p.species.speciesId];
+              let formChangeItemTriggers = formChanges
+                .filter(
+                  fc =>
+                    ((fc.formKey.indexOf(SpeciesFormKey.MEGA) === -1 &&
+                      fc.formKey.indexOf(SpeciesFormKey.PRIMAL) === -1) ||
+                      globalScene.getModifiers(MegaEvolutionAccessModifier).length) &&
+                    ((fc.formKey.indexOf(SpeciesFormKey.GIGANTAMAX) === -1 &&
+                      fc.formKey.indexOf(SpeciesFormKey.ETERNAMAX) === -1) ||
+                      globalScene.getModifiers(GigantamaxAccessModifier).length) &&
+                    (!fc.conditions.length ||
+                      fc.conditions.filter(cond => cond instanceof SpeciesFormChangeCondition && cond.predicate(p))
+                        .length) &&
+                    fc.preFormKey === p.getFormKey(),
+                )
+                .map(fc => fc.findTrigger(SpeciesFormChangeItemTrigger) as SpeciesFormChangeItemTrigger)
+                .filter(
+                  t =>
+                    t?.active &&
+                    !globalScene.findModifier(
+                      m =>
+                        m instanceof PokemonFormChangeItemModifier &&
+                        m.pokemonId === p.id &&
+                        m.formChangeItem === t.item,
+                    ),
+                );
 
-        if (p.species.speciesId === Species.NECROZMA) {
-          // technically we could use a simplified version and check for formChanges.length > 3, but in case any code changes later, this might break...
-
-          let foundULTRA_Z = false,
-            foundN_LUNA = false,
-            foundN_SOLAR = false;
-          formChangeItemTriggers.forEach((fc, _i) => {
-            switch (fc.item) {
-              case FormChangeItem.ULTRANECROZIUM_Z:
-                foundULTRA_Z = true;
-                break;
-              case FormChangeItem.N_LUNARIZER:
-                foundN_LUNA = true;
-                break;
-              case FormChangeItem.N_SOLARIZER:
-                foundN_SOLAR = true;
-                break;
-            }
-          });
-          if (foundULTRA_Z && foundN_LUNA && foundN_SOLAR) {
-            // all three items are present -> user hasn't acquired any of the N_*ARIZERs -> block ULTRANECROZIUM_Z acquisition.
-            formChangeItemTriggers = formChangeItemTriggers.filter(fc => fc.item !== FormChangeItem.ULTRANECROZIUM_Z);
-          }
-        }
-        return formChangeItemTriggers;
-      }).flat())
-      ].flat().flatMap(fc => fc.item).filter(i => (i && i < 100) === isRareFormChangeItem);
+              if (p.species.speciesId === Species.NECROZMA) {
+                // technically we could use a simplified version and check for formChanges.length > 3, but in case any code changes later, this might break...
+                let foundULTRA_Z = false,
+                  foundN_LUNA = false,
+                  foundN_SOLAR = false;
+                formChangeItemTriggers.forEach((fc, _i) => {
+                  console.log("Checking ", fc.item);
+                  switch (fc.item) {
+                    case FormChangeItem.ULTRANECROZIUM_Z:
+                      foundULTRA_Z = true;
+                      break;
+                    case FormChangeItem.N_LUNARIZER:
+                      foundN_LUNA = true;
+                      break;
+                    case FormChangeItem.N_SOLARIZER:
+                      foundN_SOLAR = true;
+                      break;
+                  }
+                });
+                if (foundULTRA_Z && foundN_LUNA && foundN_SOLAR) {
+                  // all three items are present -> user hasn't acquired any of the N_*ARIZERs -> block ULTRANECROZIUM_Z acquisition.
+                  formChangeItemTriggers = formChangeItemTriggers.filter(
+                    fc => fc.item !== FormChangeItem.ULTRANECROZIUM_Z,
+                  );
+                } else {
+                  console.log("DID NOT FIND ");
+                }
+              }
+              return formChangeItemTriggers;
+            }),
+        ),
+      ]
+        .flat()
+        .flatMap(fc => fc.item)
+        .filter(i => (i && i < 100) === isRareFormChangeItem);
       // convert it into a set to remove duplicate values, which can appear when the same species with a potential form change is in the party.
 
       if (!formChangeItemPool.length) {
@@ -1192,45 +1691,37 @@ class FormChangeItemModifierTypeGenerator extends ModifierTypeGenerator {
   }
 }
 
-export class TerastallizeModifierType extends PokemonHeldItemModifierType implements GeneratedPersistentModifierType {
-  private teraType: Type;
-
-  constructor(teraType: Type) {
-    super("", `${Type[teraType].toLowerCase()}_tera_shard`, (type, args) => new TerastallizeModifier(type as TerastallizeModifierType, (args[0] as Pokemon).id, teraType), "tera_shard");
-
-    this.teraType = teraType;
-  }
-
-  get name(): string {
-    return i18next.t("modifierType:ModifierType.TerastallizeModifierType.name", { teraType: i18next.t(`pokemonInfo:Type.${Type[this.teraType]}`) });
-  }
-
-  getDescription(): string {
-    return i18next.t("modifierType:ModifierType.TerastallizeModifierType.description", { teraType: i18next.t(`pokemonInfo:Type.${Type[this.teraType]}`) });
-  }
-
-  getPregenArgs(): any[] {
-    return [ this.teraType ];
-  }
-}
-
 export class ContactHeldItemTransferChanceModifierType extends PokemonHeldItemModifierType {
   private chancePercent: number;
 
   constructor(localeKey: string, iconImage: string, chancePercent: number, group?: string, soundName?: string) {
-    super(localeKey, iconImage, (type, args) => new ContactHeldItemTransferChanceModifier(type, (args[0] as Pokemon).id, chancePercent), group, soundName);
+    super(
+      localeKey,
+      iconImage,
+      (type, args) => new ContactHeldItemTransferChanceModifier(type, (args[0] as Pokemon).id, chancePercent),
+      group,
+      soundName,
+    );
 
     this.chancePercent = chancePercent;
   }
 
   getDescription(): string {
-    return i18next.t("modifierType:ModifierType.ContactHeldItemTransferChanceModifierType.description", { chancePercent: this.chancePercent });
+    return i18next.t("modifierType:ModifierType.ContactHeldItemTransferChanceModifierType.description", {
+      chancePercent: this.chancePercent,
+    });
   }
 }
 
 export class TurnHeldItemTransferModifierType extends PokemonHeldItemModifierType {
   constructor(localeKey: string, iconImage: string, group?: string, soundName?: string) {
-    super(localeKey, iconImage, (type, args) => new TurnHeldItemTransferModifier(type, (args[0] as Pokemon).id), group, soundName);
+    super(
+      localeKey,
+      iconImage,
+      (type, args) => new TurnHeldItemTransferModifier(type, (args[0] as Pokemon).id),
+      group,
+      soundName,
+    );
   }
 
   getDescription(): string {
@@ -1243,7 +1734,12 @@ export class EnemyAttackStatusEffectChanceModifierType extends ModifierType {
   private effect: StatusEffect;
 
   constructor(localeKey: string, iconImage: string, chancePercent: number, effect: StatusEffect, stackCount?: number) {
-    super(localeKey, iconImage, (type, _args) => new EnemyAttackStatusEffectChanceModifier(type, effect, chancePercent, stackCount), "enemy_status_chance");
+    super(
+      localeKey,
+      iconImage,
+      (type, _args) => new EnemyAttackStatusEffectChanceModifier(type, effect, chancePercent, stackCount),
+      "enemy_status_chance",
+    );
 
     this.chancePercent = chancePercent;
     this.effect = effect;
@@ -1267,7 +1763,9 @@ export class EnemyEndureChanceModifierType extends ModifierType {
   }
 
   getDescription(): string {
-    return i18next.t("modifierType:ModifierType.EnemyEndureChanceModifierType.description", { chancePercent: this.chancePercent });
+    return i18next.t("modifierType:ModifierType.EnemyEndureChanceModifierType.description", {
+      chancePercent: this.chancePercent,
+    });
   }
 }
 
@@ -1283,7 +1781,7 @@ type WeightedModifierTypeWeightFunc = (party: Pokemon[], rerollCount?: number) =
  */
 function skipInClassicAfterWave(wave: number, defaultWeight: number): WeightedModifierTypeWeightFunc {
   return () => {
-    const gameMode =  globalScene.gameMode;
+    const gameMode = globalScene.gameMode;
     const currentWave = globalScene.currentBattle.waveIndex;
     return gameMode.isClassic && currentWave >= wave ? 0 : defaultWeight;
   };
@@ -1295,7 +1793,7 @@ function skipInClassicAfterWave(wave: number, defaultWeight: number): WeightedMo
  * @param defaultWeight ModifierType default weight
  * @returns A WeightedModifierTypeWeightFunc
  */
-function skipInLastClassicWaveOrDefault(defaultWeight: number) : WeightedModifierTypeWeightFunc {
+function skipInLastClassicWaveOrDefault(defaultWeight: number): WeightedModifierTypeWeightFunc {
   return skipInClassicAfterWave(199, defaultWeight);
 }
 
@@ -1309,7 +1807,11 @@ function skipInLastClassicWaveOrDefault(defaultWeight: number) : WeightedModifie
 function lureWeightFunc(maxBattles: number, weight: number): WeightedModifierTypeWeightFunc {
   return () => {
     const lures = globalScene.getModifiers(DoubleBattleChanceBoosterModifier);
-    return !(globalScene.gameMode.isClassic && globalScene.currentBattle.waveIndex === 199) && (lures.length === 0 || lures.filter(m => m.getMaxBattles() === maxBattles && m.getBattleCount() >= maxBattles * 0.6).length === 0) ? weight : 0;
+    return !(globalScene.gameMode.isClassic && globalScene.currentBattle.waveIndex === 199) &&
+      (lures.length === 0 ||
+        lures.filter(m => m.getMaxBattles() === maxBattles && m.getBattleCount() >= maxBattles * 0.6).length === 0)
+      ? weight
+      : 0;
   };
 }
 class WeightedModifierType {
@@ -1317,7 +1819,11 @@ class WeightedModifierType {
   public weight: number | WeightedModifierTypeWeightFunc;
   public maxWeight: number | WeightedModifierTypeWeightFunc;
 
-  constructor(modifierTypeFunc: ModifierTypeFunc, weight: number | WeightedModifierTypeWeightFunc, maxWeight?: number | WeightedModifierTypeWeightFunc) {
+  constructor(
+    modifierTypeFunc: ModifierTypeFunc,
+    weight: number | WeightedModifierTypeWeightFunc,
+    maxWeight?: number | WeightedModifierTypeWeightFunc,
+  ) {
     this.modifierType = modifierTypeFunc();
     this.modifierType.id = Object.keys(modifierTypes).find(k => modifierTypes[k] === modifierTypeFunc)!; // TODO: is this bang correct?
     this.weight = weight;
@@ -1356,7 +1862,7 @@ export type GeneratorModifierOverride = {
     }
   | {
       name: keyof Pick<typeof modifierTypes, "ATTACK_TYPE_BOOSTER" | "TERA_SHARD">;
-      type?: Type;
+      type?: PokemonType;
     }
   | {
       name: keyof Pick<typeof modifierTypes, "BERRY">;
@@ -1396,20 +1902,42 @@ export const modifierTypes = {
   FORM_CHANGE_ITEM: () => new FormChangeItemModifierTypeGenerator(false),
   RARE_FORM_CHANGE_ITEM: () => new FormChangeItemModifierTypeGenerator(true),
 
-  EVOLUTION_TRACKER_GIMMIGHOUL: () => new PokemonHeldItemModifierType("modifierType:ModifierType.EVOLUTION_TRACKER_GIMMIGHOUL", "relic_gold",
-    (type, args) => new EvoTrackerModifier(type, (args[0] as Pokemon).id, Species.GIMMIGHOUL, 10)),
+  EVOLUTION_TRACKER_GIMMIGHOUL: () =>
+    new PokemonHeldItemModifierType(
+      "modifierType:ModifierType.EVOLUTION_TRACKER_GIMMIGHOUL",
+      "relic_gold",
+      (type, args) => new EvoTrackerModifier(type, (args[0] as Pokemon).id, Species.GIMMIGHOUL, 10),
+    ),
 
-  MEGA_BRACELET: () => new ModifierType("modifierType:ModifierType.MEGA_BRACELET", "mega_bracelet", (type, _args) => new MegaEvolutionAccessModifier(type)),
-  DYNAMAX_BAND: () => new ModifierType("modifierType:ModifierType.DYNAMAX_BAND", "dynamax_band", (type, _args) => new GigantamaxAccessModifier(type)),
-  TERA_ORB: () => new ModifierType("modifierType:ModifierType.TERA_ORB", "tera_orb", (type, _args) => new TerastallizeAccessModifier(type)),
+  MEGA_BRACELET: () =>
+    new ModifierType(
+      "modifierType:ModifierType.MEGA_BRACELET",
+      "mega_bracelet",
+      (type, _args) => new MegaEvolutionAccessModifier(type),
+    ),
+  DYNAMAX_BAND: () =>
+    new ModifierType(
+      "modifierType:ModifierType.DYNAMAX_BAND",
+      "dynamax_band",
+      (type, _args) => new GigantamaxAccessModifier(type),
+    ),
+  TERA_ORB: () =>
+    new ModifierType(
+      "modifierType:ModifierType.TERA_ORB",
+      "tera_orb",
+      (type, _args) => new TerastallizeAccessModifier(type),
+    ),
 
   MAP: () => new ModifierType("modifierType:ModifierType.MAP", "map", (type, _args) => new MapModifier(type)),
 
   POTION: () => new PokemonHpRestoreModifierType("modifierType:ModifierType.POTION", "potion", 20, 10),
-  SUPER_POTION: () => new PokemonHpRestoreModifierType("modifierType:ModifierType.SUPER_POTION", "super_potion", 50, 25),
-  HYPER_POTION: () => new PokemonHpRestoreModifierType("modifierType:ModifierType.HYPER_POTION", "hyper_potion", 200, 50),
+  SUPER_POTION: () =>
+    new PokemonHpRestoreModifierType("modifierType:ModifierType.SUPER_POTION", "super_potion", 50, 25),
+  HYPER_POTION: () =>
+    new PokemonHpRestoreModifierType("modifierType:ModifierType.HYPER_POTION", "hyper_potion", 200, 50),
   MAX_POTION: () => new PokemonHpRestoreModifierType("modifierType:ModifierType.MAX_POTION", "max_potion", 0, 100),
-  FULL_RESTORE: () => new PokemonHpRestoreModifierType("modifierType:ModifierType.FULL_RESTORE", "full_restore", 0, 100, true),
+  FULL_RESTORE: () =>
+    new PokemonHpRestoreModifierType("modifierType:ModifierType.FULL_RESTORE", "full_restore", 0, 100, true),
 
   REVIVE: () => new PokemonReviveModifierType("modifierType:ModifierType.REVIVE", "revive", 50),
   MAX_REVIVE: () => new PokemonReviveModifierType("modifierType:ModifierType.MAX_REVIVE", "max_revive", 100),
@@ -1418,8 +1946,18 @@ export const modifierTypes = {
 
   SACRED_ASH: () => new AllPokemonFullReviveModifierType("modifierType:ModifierType.SACRED_ASH", "sacred_ash"),
 
-  REVIVER_SEED: () => new PokemonHeldItemModifierType("modifierType:ModifierType.REVIVER_SEED", "reviver_seed", (type, args) => new PokemonInstantReviveModifier(type, (args[0] as Pokemon).id)),
-  WHITE_HERB: () => new PokemonHeldItemModifierType("modifierType:ModifierType.WHITE_HERB", "white_herb", (type, args) => new ResetNegativeStatStageModifier(type, (args[0] as Pokemon).id)),
+  REVIVER_SEED: () =>
+    new PokemonHeldItemModifierType(
+      "modifierType:ModifierType.REVIVER_SEED",
+      "reviver_seed",
+      (type, args) => new PokemonInstantReviveModifier(type, (args[0] as Pokemon).id),
+    ),
+  WHITE_HERB: () =>
+    new PokemonHeldItemModifierType(
+      "modifierType:ModifierType.WHITE_HERB",
+      "white_herb",
+      (type, args) => new ResetNegativeStatStageModifier(type, (args[0] as Pokemon).id),
+    ),
 
   ETHER: () => new PokemonPpRestoreModifierType("modifierType:ModifierType.ETHER", "ether", 10),
   MAX_ETHER: () => new PokemonPpRestoreModifierType("modifierType:ModifierType.MAX_ETHER", "max_ether", -1),
@@ -1442,61 +1980,79 @@ export const modifierTypes = {
 
   TEMP_STAT_STAGE_BOOSTER: () => new TempStatStageBoosterModifierTypeGenerator(),
 
-  DIRE_HIT: () => new class extends ModifierType {
-    getDescription(): string {
-      return i18next.t("modifierType:ModifierType.TempStatStageBoosterModifierType.description", {
-        stat: i18next.t("modifierType:ModifierType.DIRE_HIT.extra.raises"),
-        amount: i18next.t("modifierType:ModifierType.TempStatStageBoosterModifierType.extra.stage")
-      });
-    }
-  }("modifierType:ModifierType.DIRE_HIT", "dire_hit", (type, _args) => new TempCritBoosterModifier(type, 5)),
+  DIRE_HIT: () =>
+    new (class extends ModifierType {
+      getDescription(): string {
+        return i18next.t("modifierType:ModifierType.TempStatStageBoosterModifierType.description", {
+          stat: i18next.t("modifierType:ModifierType.DIRE_HIT.extra.raises"),
+          amount: i18next.t("modifierType:ModifierType.TempStatStageBoosterModifierType.extra.stage"),
+        });
+      }
+    })("modifierType:ModifierType.DIRE_HIT", "dire_hit", (type, _args) => new TempCritBoosterModifier(type, 5)),
 
   BASE_STAT_BOOSTER: () => new BaseStatBoosterModifierTypeGenerator(),
 
   ATTACK_TYPE_BOOSTER: () => new AttackTypeBoosterModifierTypeGenerator(),
 
-  MINT: () => new ModifierTypeGenerator((_party: Pokemon[], pregenArgs?: any[]) => {
-    if (pregenArgs && (pregenArgs.length === 1) && (pregenArgs[0] in Nature)) {
-      return new PokemonNatureChangeModifierType(pregenArgs[0] as Nature);
-    }
-    return new PokemonNatureChangeModifierType(randSeedInt(getEnumValues(Nature).length) as Nature);
-  }),
+  MINT: () =>
+    new ModifierTypeGenerator((_party: Pokemon[], pregenArgs?: any[]) => {
+      if (pregenArgs && pregenArgs.length === 1 && pregenArgs[0] in Nature) {
+        return new PokemonNatureChangeModifierType(pregenArgs[0] as Nature);
+      }
+      return new PokemonNatureChangeModifierType(randSeedInt(getEnumValues(Nature).length) as Nature);
+    }),
 
-  TERA_SHARD: () => new ModifierTypeGenerator((party: Pokemon[], pregenArgs?: any[]) => {
-    if (pregenArgs && (pregenArgs.length === 1) && (pregenArgs[0] in Type)) {
-      return new TerastallizeModifierType(pregenArgs[0] as Type);
-    }
-    if (!globalScene.getModifiers(TerastallizeAccessModifier).length) {
-      return null;
-    }
-    let type: Type;
-    if (!randSeedInt(3)) {
-      const partyMemberTypes = party.map(p => p.getTypes(false, false, true)).flat();
-      type = randSeedItem(partyMemberTypes);
-    } else {
-      type = randSeedInt(64) ? randSeedInt(18) as Type : Type.STELLAR;
-    }
-    return new TerastallizeModifierType(type);
-  }),
+  MYSTICAL_ROCK: () =>
+    new PokemonHeldItemModifierType(
+      "modifierType:ModifierType.MYSTICAL_ROCK",
+      "mystical_rock",
+      (type, args) => new FieldEffectModifier(type, (args[0] as Pokemon).id),
+    ),
 
-  BERRY: () => new ModifierTypeGenerator((_party: Pokemon[], pregenArgs?: any[]) => {
-    if (pregenArgs && (pregenArgs.length === 1) && (pregenArgs[0] in BerryType)) {
-      return new BerryModifierType(pregenArgs[0] as BerryType);
-    }
-    const berryTypes = getEnumValues(BerryType);
-    let randBerryType: BerryType;
-    const rand = randSeedInt(12);
-    if (rand < 2) {
-      randBerryType = BerryType.SITRUS;
-    } else if (rand < 4) {
-      randBerryType = BerryType.LUM;
-    } else if (rand < 6) {
-      randBerryType = BerryType.LEPPA;
-    } else {
-      randBerryType = berryTypes[randSeedInt(berryTypes.length - 3) + 2];
-    }
-    return new BerryModifierType(randBerryType);
-  }),
+  TERA_SHARD: () =>
+    new ModifierTypeGenerator((party: Pokemon[], pregenArgs?: any[]) => {
+      if (pregenArgs && pregenArgs.length === 1 && pregenArgs[0] in PokemonType) {
+        return new TerastallizeModifierType(pregenArgs[0] as PokemonType);
+      }
+      if (!globalScene.getModifiers(TerastallizeAccessModifier).length) {
+        return null;
+      }
+      const teraTypes: PokemonType[] = [];
+      for (const p of party) {
+        if (!(p.hasSpecies(Species.TERAPAGOS) || p.hasSpecies(Species.OGERPON) || p.hasSpecies(Species.SHEDINJA))) {
+          teraTypes.push(p.teraType);
+        }
+      }
+      let excludedType = PokemonType.UNKNOWN;
+      if (teraTypes.length > 0 && teraTypes.filter(t => t === teraTypes[0]).length === teraTypes.length) {
+        excludedType = teraTypes[0];
+      }
+      let shardType = randSeedInt(64) ? (randSeedInt(18) as PokemonType) : PokemonType.STELLAR;
+      while (shardType === excludedType) {
+        shardType = randSeedInt(64) ? (randSeedInt(18) as PokemonType) : PokemonType.STELLAR;
+      }
+      return new TerastallizeModifierType(shardType);
+    }),
+
+  BERRY: () =>
+    new ModifierTypeGenerator((_party: Pokemon[], pregenArgs?: any[]) => {
+      if (pregenArgs && pregenArgs.length === 1 && pregenArgs[0] in BerryType) {
+        return new BerryModifierType(pregenArgs[0] as BerryType);
+      }
+      const berryTypes = getEnumValues(BerryType);
+      let randBerryType: BerryType;
+      const rand = randSeedInt(12);
+      if (rand < 2) {
+        randBerryType = BerryType.SITRUS;
+      } else if (rand < 4) {
+        randBerryType = BerryType.LUM;
+      } else if (rand < 6) {
+        randBerryType = BerryType.LEPPA;
+      } else {
+        randBerryType = berryTypes[randSeedInt(berryTypes.length - 3) + 2];
+      }
+      return new BerryModifierType(randBerryType);
+    }),
 
   TM_COMMON: () => new TmModifierTypeGenerator(ModifierTier.COMMON),
   TM_GREAT: () => new TmModifierTypeGenerator(ModifierTier.GREAT),
@@ -1504,113 +2060,343 @@ export const modifierTypes = {
 
   MEMORY_MUSHROOM: () => new RememberMoveModifierType("modifierType:ModifierType.MEMORY_MUSHROOM", "big_mushroom"),
 
-  EXP_SHARE: () => new ModifierType("modifierType:ModifierType.EXP_SHARE", "exp_share", (type, _args) => new ExpShareModifier(type)),
-  EXP_BALANCE: () => new ModifierType("modifierType:ModifierType.EXP_BALANCE", "exp_balance", (type, _args) => new ExpBalanceModifier(type)),
+  EXP_SHARE: () =>
+    new ModifierType("modifierType:ModifierType.EXP_SHARE", "exp_share", (type, _args) => new ExpShareModifier(type)),
+  EXP_BALANCE: () =>
+    new ModifierType(
+      "modifierType:ModifierType.EXP_BALANCE",
+      "exp_balance",
+      (type, _args) => new ExpBalanceModifier(type),
+    ),
 
-  OVAL_CHARM: () => new ModifierType("modifierType:ModifierType.OVAL_CHARM", "oval_charm", (type, _args) => new MultipleParticipantExpBonusModifier(type)),
+  OVAL_CHARM: () =>
+    new ModifierType(
+      "modifierType:ModifierType.OVAL_CHARM",
+      "oval_charm",
+      (type, _args) => new MultipleParticipantExpBonusModifier(type),
+    ),
 
   EXP_CHARM: () => new ExpBoosterModifierType("modifierType:ModifierType.EXP_CHARM", "exp_charm", 25),
   SUPER_EXP_CHARM: () => new ExpBoosterModifierType("modifierType:ModifierType.SUPER_EXP_CHARM", "super_exp_charm", 60),
-  GOLDEN_EXP_CHARM: () => new ExpBoosterModifierType("modifierType:ModifierType.GOLDEN_EXP_CHARM", "golden_exp_charm", 100),
+  GOLDEN_EXP_CHARM: () =>
+    new ExpBoosterModifierType("modifierType:ModifierType.GOLDEN_EXP_CHARM", "golden_exp_charm", 100),
 
   LUCKY_EGG: () => new PokemonExpBoosterModifierType("modifierType:ModifierType.LUCKY_EGG", "lucky_egg", 40),
   GOLDEN_EGG: () => new PokemonExpBoosterModifierType("modifierType:ModifierType.GOLDEN_EGG", "golden_egg", 100),
 
   SOOTHE_BELL: () => new PokemonFriendshipBoosterModifierType("modifierType:ModifierType.SOOTHE_BELL", "soothe_bell"),
 
-  SCOPE_LENS: () => new PokemonHeldItemModifierType("modifierType:ModifierType.SCOPE_LENS", "scope_lens", (type, args) => new CritBoosterModifier(type, (args[0] as Pokemon).id, 1)),
-  LEEK: () => new PokemonHeldItemModifierType("modifierType:ModifierType.LEEK", "leek", (type, args) => new SpeciesCritBoosterModifier(type, (args[0] as Pokemon).id, 2, [ Species.FARFETCHD, Species.GALAR_FARFETCHD, Species.SIRFETCHD ])),
+  SCOPE_LENS: () =>
+    new PokemonHeldItemModifierType(
+      "modifierType:ModifierType.SCOPE_LENS",
+      "scope_lens",
+      (type, args) => new CritBoosterModifier(type, (args[0] as Pokemon).id, 1),
+    ),
+  LEEK: () =>
+    new PokemonHeldItemModifierType(
+      "modifierType:ModifierType.LEEK",
+      "leek",
+      (type, args) =>
+        new SpeciesCritBoosterModifier(type, (args[0] as Pokemon).id, 2, [
+          Species.FARFETCHD,
+          Species.GALAR_FARFETCHD,
+          Species.SIRFETCHD,
+        ]),
+    ),
 
-  EVIOLITE: () => new PokemonHeldItemModifierType("modifierType:ModifierType.EVIOLITE", "eviolite", (type, args) => new EvolutionStatBoosterModifier(type, (args[0] as Pokemon).id, [ Stat.DEF, Stat.SPDEF ], 1.5)),
+  EVIOLITE: () =>
+    new PokemonHeldItemModifierType(
+      "modifierType:ModifierType.EVIOLITE",
+      "eviolite",
+      (type, args) => new EvolutionStatBoosterModifier(type, (args[0] as Pokemon).id, [Stat.DEF, Stat.SPDEF], 1.5),
+    ),
 
-  SOUL_DEW: () => new PokemonHeldItemModifierType("modifierType:ModifierType.SOUL_DEW", "soul_dew", (type, args) => new PokemonNatureWeightModifier(type, (args[0] as Pokemon).id)),
+  SOUL_DEW: () =>
+    new PokemonHeldItemModifierType(
+      "modifierType:ModifierType.SOUL_DEW",
+      "soul_dew",
+      (type, args) => new PokemonNatureWeightModifier(type, (args[0] as Pokemon).id),
+    ),
 
-  NUGGET: () => new MoneyRewardModifierType("modifierType:ModifierType.NUGGET", "nugget", 1, "modifierType:ModifierType.MoneyRewardModifierType.extra.small"),
-  BIG_NUGGET: () => new MoneyRewardModifierType("modifierType:ModifierType.BIG_NUGGET", "big_nugget", 2.5, "modifierType:ModifierType.MoneyRewardModifierType.extra.moderate"),
-  RELIC_GOLD: () => new MoneyRewardModifierType("modifierType:ModifierType.RELIC_GOLD", "relic_gold", 10, "modifierType:ModifierType.MoneyRewardModifierType.extra.large"),
+  NUGGET: () =>
+    new MoneyRewardModifierType(
+      "modifierType:ModifierType.NUGGET",
+      "nugget",
+      1,
+      "modifierType:ModifierType.MoneyRewardModifierType.extra.small",
+    ),
+  BIG_NUGGET: () =>
+    new MoneyRewardModifierType(
+      "modifierType:ModifierType.BIG_NUGGET",
+      "big_nugget",
+      2.5,
+      "modifierType:ModifierType.MoneyRewardModifierType.extra.moderate",
+    ),
+  RELIC_GOLD: () =>
+    new MoneyRewardModifierType(
+      "modifierType:ModifierType.RELIC_GOLD",
+      "relic_gold",
+      10,
+      "modifierType:ModifierType.MoneyRewardModifierType.extra.large",
+    ),
 
-  AMULET_COIN: () => new ModifierType("modifierType:ModifierType.AMULET_COIN", "amulet_coin", (type, _args) => new MoneyMultiplierModifier(type)),
-  GOLDEN_PUNCH: () => new PokemonHeldItemModifierType("modifierType:ModifierType.GOLDEN_PUNCH", "golden_punch", (type, args) => new DamageMoneyRewardModifier(type, (args[0] as Pokemon).id)),
-  COIN_CASE: () => new ModifierType("modifierType:ModifierType.COIN_CASE", "coin_case", (type, _args) => new MoneyInterestModifier(type)),
+  AMULET_COIN: () =>
+    new ModifierType(
+      "modifierType:ModifierType.AMULET_COIN",
+      "amulet_coin",
+      (type, _args) => new MoneyMultiplierModifier(type),
+    ),
+  GOLDEN_PUNCH: () =>
+    new PokemonHeldItemModifierType(
+      "modifierType:ModifierType.GOLDEN_PUNCH",
+      "golden_punch",
+      (type, args) => new DamageMoneyRewardModifier(type, (args[0] as Pokemon).id),
+    ),
+  COIN_CASE: () =>
+    new ModifierType(
+      "modifierType:ModifierType.COIN_CASE",
+      "coin_case",
+      (type, _args) => new MoneyInterestModifier(type),
+    ),
 
-  LOCK_CAPSULE: () => new ModifierType("modifierType:ModifierType.LOCK_CAPSULE", "lock_capsule", (type, _args) => new LockModifierTiersModifier(type)),
+  LOCK_CAPSULE: () =>
+    new ModifierType(
+      "modifierType:ModifierType.LOCK_CAPSULE",
+      "lock_capsule",
+      (type, _args) => new LockModifierTiersModifier(type),
+    ),
 
-  GRIP_CLAW: () => new ContactHeldItemTransferChanceModifierType("modifierType:ModifierType.GRIP_CLAW", "grip_claw", 10),
+  GRIP_CLAW: () =>
+    new ContactHeldItemTransferChanceModifierType("modifierType:ModifierType.GRIP_CLAW", "grip_claw", 10),
   WIDE_LENS: () => new PokemonMoveAccuracyBoosterModifierType("modifierType:ModifierType.WIDE_LENS", "wide_lens", 5),
 
   MULTI_LENS: () => new PokemonMultiHitModifierType("modifierType:ModifierType.MULTI_LENS", "zoom_lens"),
 
-  HEALING_CHARM: () => new ModifierType("modifierType:ModifierType.HEALING_CHARM", "healing_charm", (type, _args) => new HealingBoosterModifier(type, 1.1)),
-  CANDY_JAR: () => new ModifierType("modifierType:ModifierType.CANDY_JAR", "candy_jar", (type, _args) => new LevelIncrementBoosterModifier(type)),
+  HEALING_CHARM: () =>
+    new ModifierType(
+      "modifierType:ModifierType.HEALING_CHARM",
+      "healing_charm",
+      (type, _args) => new HealingBoosterModifier(type, 1.1),
+    ),
+  CANDY_JAR: () =>
+    new ModifierType(
+      "modifierType:ModifierType.CANDY_JAR",
+      "candy_jar",
+      (type, _args) => new LevelIncrementBoosterModifier(type),
+    ),
 
-  BERRY_POUCH: () => new ModifierType("modifierType:ModifierType.BERRY_POUCH", "berry_pouch", (type, _args) => new PreserveBerryModifier(type)),
+  BERRY_POUCH: () =>
+    new ModifierType(
+      "modifierType:ModifierType.BERRY_POUCH",
+      "berry_pouch",
+      (type, _args) => new PreserveBerryModifier(type),
+    ),
 
-  FOCUS_BAND: () => new PokemonHeldItemModifierType("modifierType:ModifierType.FOCUS_BAND", "focus_band", (type, args) => new SurviveDamageModifier(type, (args[0] as Pokemon).id)),
+  FOCUS_BAND: () =>
+    new PokemonHeldItemModifierType(
+      "modifierType:ModifierType.FOCUS_BAND",
+      "focus_band",
+      (type, args) => new SurviveDamageModifier(type, (args[0] as Pokemon).id),
+    ),
 
-  QUICK_CLAW: () => new PokemonHeldItemModifierType("modifierType:ModifierType.QUICK_CLAW", "quick_claw", (type, args) => new BypassSpeedChanceModifier(type, (args[0] as Pokemon).id)),
+  QUICK_CLAW: () =>
+    new PokemonHeldItemModifierType(
+      "modifierType:ModifierType.QUICK_CLAW",
+      "quick_claw",
+      (type, args) => new BypassSpeedChanceModifier(type, (args[0] as Pokemon).id),
+    ),
 
-  KINGS_ROCK: () => new PokemonHeldItemModifierType("modifierType:ModifierType.KINGS_ROCK", "kings_rock", (type, args) => new FlinchChanceModifier(type, (args[0] as Pokemon).id)),
+  KINGS_ROCK: () =>
+    new PokemonHeldItemModifierType(
+      "modifierType:ModifierType.KINGS_ROCK",
+      "kings_rock",
+      (type, args) => new FlinchChanceModifier(type, (args[0] as Pokemon).id),
+    ),
 
-  LEFTOVERS: () => new PokemonHeldItemModifierType("modifierType:ModifierType.LEFTOVERS", "leftovers", (type, args) => new TurnHealModifier(type, (args[0] as Pokemon).id)),
-  SHELL_BELL: () => new PokemonHeldItemModifierType("modifierType:ModifierType.SHELL_BELL", "shell_bell", (type, args) => new HitHealModifier(type, (args[0] as Pokemon).id)),
+  LEFTOVERS: () =>
+    new PokemonHeldItemModifierType(
+      "modifierType:ModifierType.LEFTOVERS",
+      "leftovers",
+      (type, args) => new TurnHealModifier(type, (args[0] as Pokemon).id),
+    ),
+  SHELL_BELL: () =>
+    new PokemonHeldItemModifierType(
+      "modifierType:ModifierType.SHELL_BELL",
+      "shell_bell",
+      (type, args) => new HitHealModifier(type, (args[0] as Pokemon).id),
+    ),
 
-  TOXIC_ORB: () => new PokemonHeldItemModifierType("modifierType:ModifierType.TOXIC_ORB", "toxic_orb", (type, args) => new TurnStatusEffectModifier(type, (args[0] as Pokemon).id)),
-  FLAME_ORB: () => new PokemonHeldItemModifierType("modifierType:ModifierType.FLAME_ORB", "flame_orb", (type, args) => new TurnStatusEffectModifier(type, (args[0] as Pokemon).id)),
+  TOXIC_ORB: () =>
+    new PokemonHeldItemModifierType(
+      "modifierType:ModifierType.TOXIC_ORB",
+      "toxic_orb",
+      (type, args) => new TurnStatusEffectModifier(type, (args[0] as Pokemon).id),
+    ),
+  FLAME_ORB: () =>
+    new PokemonHeldItemModifierType(
+      "modifierType:ModifierType.FLAME_ORB",
+      "flame_orb",
+      (type, args) => new TurnStatusEffectModifier(type, (args[0] as Pokemon).id),
+    ),
 
-  BATON: () => new PokemonHeldItemModifierType("modifierType:ModifierType.BATON", "baton", (type, args) => new SwitchEffectTransferModifier(type, (args[0] as Pokemon).id)),
+  BATON: () =>
+    new PokemonHeldItemModifierType(
+      "modifierType:ModifierType.BATON",
+      "baton",
+      (type, args) => new SwitchEffectTransferModifier(type, (args[0] as Pokemon).id),
+    ),
 
-  SHINY_CHARM: () => new ModifierType("modifierType:ModifierType.SHINY_CHARM", "shiny_charm", (type, _args) => new ShinyRateBoosterModifier(type)),
-  ABILITY_CHARM: () => new ModifierType("modifierType:ModifierType.ABILITY_CHARM", "ability_charm", (type, _args) => new HiddenAbilityRateBoosterModifier(type)),
-  CATCHING_CHARM: () => new ModifierType("modifierType:ModifierType.CATCHING_CHARM", "catching_charm", (type, _args) => new CriticalCatchChanceBoosterModifier(type)),
+  SHINY_CHARM: () =>
+    new ModifierType(
+      "modifierType:ModifierType.SHINY_CHARM",
+      "shiny_charm",
+      (type, _args) => new ShinyRateBoosterModifier(type),
+    ),
+  ABILITY_CHARM: () =>
+    new ModifierType(
+      "modifierType:ModifierType.ABILITY_CHARM",
+      "ability_charm",
+      (type, _args) => new HiddenAbilityRateBoosterModifier(type),
+    ),
+  CATCHING_CHARM: () =>
+    new ModifierType(
+      "modifierType:ModifierType.CATCHING_CHARM",
+      "catching_charm",
+      (type, _args) => new CriticalCatchChanceBoosterModifier(type),
+    ),
 
-  IV_SCANNER: () => new ModifierType("modifierType:ModifierType.IV_SCANNER", "scanner", (type, _args) => new IvScannerModifier(type)),
+  IV_SCANNER: () =>
+    new ModifierType("modifierType:ModifierType.IV_SCANNER", "scanner", (type, _args) => new IvScannerModifier(type)),
 
   DNA_SPLICERS: () => new FusePokemonModifierType("modifierType:ModifierType.DNA_SPLICERS", "dna_splicers"),
 
-  MINI_BLACK_HOLE: () => new TurnHeldItemTransferModifierType("modifierType:ModifierType.MINI_BLACK_HOLE", "mini_black_hole"),
+  MINI_BLACK_HOLE: () =>
+    new TurnHeldItemTransferModifierType("modifierType:ModifierType.MINI_BLACK_HOLE", "mini_black_hole"),
 
   VOUCHER: () => new AddVoucherModifierType(VoucherType.REGULAR, 1),
   VOUCHER_PLUS: () => new AddVoucherModifierType(VoucherType.PLUS, 1),
   VOUCHER_PREMIUM: () => new AddVoucherModifierType(VoucherType.PREMIUM, 1),
 
-  GOLDEN_POKEBALL: () => new ModifierType("modifierType:ModifierType.GOLDEN_POKEBALL", "pb_gold", (type, _args) => new ExtraModifierModifier(type), undefined, "se/pb_bounce_1"),
-  SILVER_POKEBALL: () => new ModifierType("modifierType:ModifierType.SILVER_POKEBALL", "pb_silver", (type, _args) => new TempExtraModifierModifier(type, 100), undefined, "se/pb_bounce_1"),
+  GOLDEN_POKEBALL: () =>
+    new ModifierType(
+      "modifierType:ModifierType.GOLDEN_POKEBALL",
+      "pb_gold",
+      (type, _args) => new ExtraModifierModifier(type),
+      undefined,
+      "se/pb_bounce_1",
+    ),
+  SILVER_POKEBALL: () =>
+    new ModifierType(
+      "modifierType:ModifierType.SILVER_POKEBALL",
+      "pb_silver",
+      (type, _args) => new TempExtraModifierModifier(type, 100),
+      undefined,
+      "se/pb_bounce_1",
+    ),
 
-  ENEMY_DAMAGE_BOOSTER: () => new ModifierType("modifierType:ModifierType.ENEMY_DAMAGE_BOOSTER", "wl_item_drop", (type, _args) => new EnemyDamageBoosterModifier(type, 5)),
-  ENEMY_DAMAGE_REDUCTION: () => new ModifierType("modifierType:ModifierType.ENEMY_DAMAGE_REDUCTION", "wl_guard_spec", (type, _args) => new EnemyDamageReducerModifier(type, 2.5)),
+  ENEMY_DAMAGE_BOOSTER: () =>
+    new ModifierType(
+      "modifierType:ModifierType.ENEMY_DAMAGE_BOOSTER",
+      "wl_item_drop",
+      (type, _args) => new EnemyDamageBoosterModifier(type, 5),
+    ),
+  ENEMY_DAMAGE_REDUCTION: () =>
+    new ModifierType(
+      "modifierType:ModifierType.ENEMY_DAMAGE_REDUCTION",
+      "wl_guard_spec",
+      (type, _args) => new EnemyDamageReducerModifier(type, 2.5),
+    ),
   //ENEMY_SUPER_EFFECT_BOOSTER: () => new ModifierType('Type Advantage Token', 'Increases damage of super effective attacks by 30%', (type, _args) => new EnemySuperEffectiveDamageBoosterModifier(type, 30), 'wl_custom_super_effective'),
-  ENEMY_HEAL: () => new ModifierType("modifierType:ModifierType.ENEMY_HEAL", "wl_potion", (type, _args) => new EnemyTurnHealModifier(type, 2, 10)),
-  ENEMY_ATTACK_POISON_CHANCE: () => new EnemyAttackStatusEffectChanceModifierType("modifierType:ModifierType.ENEMY_ATTACK_POISON_CHANCE", "wl_antidote", 5, StatusEffect.POISON, 10),
-  ENEMY_ATTACK_PARALYZE_CHANCE: () => new EnemyAttackStatusEffectChanceModifierType("modifierType:ModifierType.ENEMY_ATTACK_PARALYZE_CHANCE", "wl_paralyze_heal", 2.5, StatusEffect.PARALYSIS, 10),
-  ENEMY_ATTACK_BURN_CHANCE: () => new EnemyAttackStatusEffectChanceModifierType("modifierType:ModifierType.ENEMY_ATTACK_BURN_CHANCE", "wl_burn_heal", 5, StatusEffect.BURN, 10),
-  ENEMY_STATUS_EFFECT_HEAL_CHANCE: () => new ModifierType("modifierType:ModifierType.ENEMY_STATUS_EFFECT_HEAL_CHANCE", "wl_full_heal", (type, _args) => new EnemyStatusEffectHealChanceModifier(type, 2.5, 10)),
-  ENEMY_ENDURE_CHANCE: () => new EnemyEndureChanceModifierType("modifierType:ModifierType.ENEMY_ENDURE_CHANCE", "wl_reset_urge", 2),
-  ENEMY_FUSED_CHANCE: () => new ModifierType("modifierType:ModifierType.ENEMY_FUSED_CHANCE", "wl_custom_spliced", (type, _args) => new EnemyFusionChanceModifier(type, 1)),
+  ENEMY_HEAL: () =>
+    new ModifierType(
+      "modifierType:ModifierType.ENEMY_HEAL",
+      "wl_potion",
+      (type, _args) => new EnemyTurnHealModifier(type, 2, 10),
+    ),
+  ENEMY_ATTACK_POISON_CHANCE: () =>
+    new EnemyAttackStatusEffectChanceModifierType(
+      "modifierType:ModifierType.ENEMY_ATTACK_POISON_CHANCE",
+      "wl_antidote",
+      5,
+      StatusEffect.POISON,
+      10,
+    ),
+  ENEMY_ATTACK_PARALYZE_CHANCE: () =>
+    new EnemyAttackStatusEffectChanceModifierType(
+      "modifierType:ModifierType.ENEMY_ATTACK_PARALYZE_CHANCE",
+      "wl_paralyze_heal",
+      2.5,
+      StatusEffect.PARALYSIS,
+      10,
+    ),
+  ENEMY_ATTACK_BURN_CHANCE: () =>
+    new EnemyAttackStatusEffectChanceModifierType(
+      "modifierType:ModifierType.ENEMY_ATTACK_BURN_CHANCE",
+      "wl_burn_heal",
+      5,
+      StatusEffect.BURN,
+      10,
+    ),
+  ENEMY_STATUS_EFFECT_HEAL_CHANCE: () =>
+    new ModifierType(
+      "modifierType:ModifierType.ENEMY_STATUS_EFFECT_HEAL_CHANCE",
+      "wl_full_heal",
+      (type, _args) => new EnemyStatusEffectHealChanceModifier(type, 2.5, 10),
+    ),
+  ENEMY_ENDURE_CHANCE: () =>
+    new EnemyEndureChanceModifierType("modifierType:ModifierType.ENEMY_ENDURE_CHANCE", "wl_reset_urge", 2),
+  ENEMY_FUSED_CHANCE: () =>
+    new ModifierType(
+      "modifierType:ModifierType.ENEMY_FUSED_CHANCE",
+      "wl_custom_spliced",
+      (type, _args) => new EnemyFusionChanceModifier(type, 1),
+    ),
 
-  MYSTERY_ENCOUNTER_SHUCKLE_JUICE: () => new ModifierTypeGenerator((_party: Pokemon[], pregenArgs?: any[]) => {
-    if (pregenArgs) {
-      return new PokemonBaseStatTotalModifierType(pregenArgs[0] as number);
-    }
-    return new PokemonBaseStatTotalModifierType(randSeedInt(20, 1));
-  }),
-  MYSTERY_ENCOUNTER_OLD_GATEAU: () => new ModifierTypeGenerator((_party: Pokemon[], pregenArgs?: any[]) => {
-    if (pregenArgs) {
-      return new PokemonBaseStatFlatModifierType(pregenArgs[0] as number, pregenArgs[1] as Stat[]);
-    }
-    return new PokemonBaseStatFlatModifierType(randSeedInt(20, 1), [ Stat.HP, Stat.ATK, Stat.DEF ]);
-  }),
-  MYSTERY_ENCOUNTER_BLACK_SLUDGE: () => new ModifierTypeGenerator((_party: Pokemon[], pregenArgs?: any[]) => {
-    if (pregenArgs) {
-      return new ModifierType("modifierType:ModifierType.MYSTERY_ENCOUNTER_BLACK_SLUDGE", "black_sludge", (type, _args) => new HealShopCostModifier(type, pregenArgs[0] as number));
-    }
-    return new ModifierType("modifierType:ModifierType.MYSTERY_ENCOUNTER_BLACK_SLUDGE", "black_sludge", (type, _args) => new HealShopCostModifier(type, 2.5));
-  }),
-  MYSTERY_ENCOUNTER_MACHO_BRACE: () => new PokemonHeldItemModifierType("modifierType:ModifierType.MYSTERY_ENCOUNTER_MACHO_BRACE", "macho_brace", (type, args) => new PokemonIncrementingStatModifier(type, (args[0] as Pokemon).id)),
-  MYSTERY_ENCOUNTER_GOLDEN_BUG_NET: () => new ModifierType("modifierType:ModifierType.MYSTERY_ENCOUNTER_GOLDEN_BUG_NET", "golden_net", (type, _args) => new BoostBugSpawnModifier(type)),
+  MYSTERY_ENCOUNTER_SHUCKLE_JUICE: () =>
+    new ModifierTypeGenerator((_party: Pokemon[], pregenArgs?: any[]) => {
+      if (pregenArgs) {
+        return new PokemonBaseStatTotalModifierType(pregenArgs[0] as number);
+      }
+      return new PokemonBaseStatTotalModifierType(randSeedInt(20, 1));
+    }),
+  MYSTERY_ENCOUNTER_OLD_GATEAU: () =>
+    new ModifierTypeGenerator((_party: Pokemon[], pregenArgs?: any[]) => {
+      if (pregenArgs) {
+        return new PokemonBaseStatFlatModifierType(pregenArgs[0] as number, pregenArgs[1] as Stat[]);
+      }
+      return new PokemonBaseStatFlatModifierType(randSeedInt(20, 1), [Stat.HP, Stat.ATK, Stat.DEF]);
+    }),
+  MYSTERY_ENCOUNTER_BLACK_SLUDGE: () =>
+    new ModifierTypeGenerator((_party: Pokemon[], pregenArgs?: any[]) => {
+      if (pregenArgs) {
+        return new ModifierType(
+          "modifierType:ModifierType.MYSTERY_ENCOUNTER_BLACK_SLUDGE",
+          "black_sludge",
+          (type, _args) => new HealShopCostModifier(type, pregenArgs[0] as number),
+        );
+      }
+      return new ModifierType(
+        "modifierType:ModifierType.MYSTERY_ENCOUNTER_BLACK_SLUDGE",
+        "black_sludge",
+        (type, _args) => new HealShopCostModifier(type, 2.5),
+      );
+    }),
+  MYSTERY_ENCOUNTER_MACHO_BRACE: () =>
+    new PokemonHeldItemModifierType(
+      "modifierType:ModifierType.MYSTERY_ENCOUNTER_MACHO_BRACE",
+      "macho_brace",
+      (type, args) => new PokemonIncrementingStatModifier(type, (args[0] as Pokemon).id),
+    ),
+  MYSTERY_ENCOUNTER_GOLDEN_BUG_NET: () =>
+    new ModifierType(
+      "modifierType:ModifierType.MYSTERY_ENCOUNTER_GOLDEN_BUG_NET",
+      "golden_net",
+      (type, _args) => new BoostBugSpawnModifier(type),
+    ),
 };
 
 interface ModifierPool {
-  [tier: string]: WeightedModifierType[]
+  [tier: string]: WeightedModifierType[];
 }
 
 /**
@@ -1619,219 +2405,474 @@ interface ModifierPool {
  * @returns boolean: true if the player has the maximum of a given ball type
  */
 function hasMaximumBalls(ballType: PokeballType): boolean {
-  return (globalScene.gameMode.isClassic && globalScene.pokeballCounts[ballType] >= MAX_PER_TYPE_POKEBALLS);
+  return globalScene.gameMode.isClassic && globalScene.pokeballCounts[ballType] >= MAX_PER_TYPE_POKEBALLS;
 }
 
 const modifierPool: ModifierPool = {
   [ModifierTier.COMMON]: [
-    new WeightedModifierType(modifierTypes.POKEBALL, () => (hasMaximumBalls(PokeballType.POKEBALL)) ? 0 : 6, 6),
+    new WeightedModifierType(modifierTypes.POKEBALL, () => (hasMaximumBalls(PokeballType.POKEBALL) ? 0 : 6), 6),
     new WeightedModifierType(modifierTypes.RARE_CANDY, 2),
-    new WeightedModifierType(modifierTypes.POTION, (party: Pokemon[]) => {
-      const thresholdPartyMemberCount = Math.min(party.filter(p => (p.getInverseHp() >= 10 && p.getHpRatio() <= 0.875) && !p.isFainted()).length, 3);
-      return thresholdPartyMemberCount * 3;
-    }, 9),
-    new WeightedModifierType(modifierTypes.SUPER_POTION, (party: Pokemon[]) => {
-      const thresholdPartyMemberCount = Math.min(party.filter(p => (p.getInverseHp() >= 25 && p.getHpRatio() <= 0.75) && !p.isFainted()).length, 3);
-      return thresholdPartyMemberCount;
-    }, 3),
-    new WeightedModifierType(modifierTypes.ETHER, (party: Pokemon[]) => {
-      const thresholdPartyMemberCount = Math.min(party.filter(p => p.hp && !p.getHeldItems().some(m => m instanceof BerryModifier && m.berryType === BerryType.LEPPA)
-        && p.getMoveset().filter(m => m?.ppUsed && (m.getMovePp() - m.ppUsed) <= 5 && m.ppUsed > Math.floor(m.getMovePp() / 2)).length).length, 3);
-      return thresholdPartyMemberCount * 3;
-    }, 9),
-    new WeightedModifierType(modifierTypes.MAX_ETHER, (party: Pokemon[]) => {
-      const thresholdPartyMemberCount = Math.min(party.filter(p => p.hp && !p.getHeldItems().some(m => m instanceof BerryModifier && m.berryType === BerryType.LEPPA)
-        && p.getMoveset().filter(m => m?.ppUsed && (m.getMovePp() - m.ppUsed) <= 5 && m.ppUsed > Math.floor(m.getMovePp() / 2)).length).length, 3);
-      return thresholdPartyMemberCount;
-    }, 3),
+    new WeightedModifierType(
+      modifierTypes.POTION,
+      (party: Pokemon[]) => {
+        const thresholdPartyMemberCount = Math.min(
+          party.filter(p => p.getInverseHp() >= 10 && p.getHpRatio() <= 0.875 && !p.isFainted()).length,
+          3,
+        );
+        return thresholdPartyMemberCount * 3;
+      },
+      9,
+    ),
+    new WeightedModifierType(
+      modifierTypes.SUPER_POTION,
+      (party: Pokemon[]) => {
+        const thresholdPartyMemberCount = Math.min(
+          party.filter(p => p.getInverseHp() >= 25 && p.getHpRatio() <= 0.75 && !p.isFainted()).length,
+          3,
+        );
+        return thresholdPartyMemberCount;
+      },
+      3,
+    ),
+    new WeightedModifierType(
+      modifierTypes.ETHER,
+      (party: Pokemon[]) => {
+        const thresholdPartyMemberCount = Math.min(
+          party.filter(
+            p =>
+              p.hp &&
+              !p.getHeldItems().some(m => m instanceof BerryModifier && m.berryType === BerryType.LEPPA) &&
+              p
+                .getMoveset()
+                .filter(m => m.ppUsed && m.getMovePp() - m.ppUsed <= 5 && m.ppUsed > Math.floor(m.getMovePp() / 2))
+                .length,
+          ).length,
+          3,
+        );
+        return thresholdPartyMemberCount * 3;
+      },
+      9,
+    ),
+    new WeightedModifierType(
+      modifierTypes.MAX_ETHER,
+      (party: Pokemon[]) => {
+        const thresholdPartyMemberCount = Math.min(
+          party.filter(
+            p =>
+              p.hp &&
+              !p.getHeldItems().some(m => m instanceof BerryModifier && m.berryType === BerryType.LEPPA) &&
+              p
+                .getMoveset()
+                .filter(m => m.ppUsed && m.getMovePp() - m.ppUsed <= 5 && m.ppUsed > Math.floor(m.getMovePp() / 2))
+                .length,
+          ).length,
+          3,
+        );
+        return thresholdPartyMemberCount;
+      },
+      3,
+    ),
     new WeightedModifierType(modifierTypes.LURE, lureWeightFunc(10, 2)),
     new WeightedModifierType(modifierTypes.TEMP_STAT_STAGE_BOOSTER, 4),
     new WeightedModifierType(modifierTypes.BERRY, 2),
     new WeightedModifierType(modifierTypes.TM_COMMON, 2),
   ].map(m => {
-    m.setTier(ModifierTier.COMMON); return m;
+    m.setTier(ModifierTier.COMMON);
+    return m;
   }),
   [ModifierTier.GREAT]: [
-    new WeightedModifierType(modifierTypes.GREAT_BALL, () => (hasMaximumBalls(PokeballType.GREAT_BALL)) ? 0 : 6, 6),
+    new WeightedModifierType(modifierTypes.GREAT_BALL, () => (hasMaximumBalls(PokeballType.GREAT_BALL) ? 0 : 6), 6),
     new WeightedModifierType(modifierTypes.PP_UP, 2),
-    new WeightedModifierType(modifierTypes.FULL_HEAL, (party: Pokemon[]) => {
-      const statusEffectPartyMemberCount = Math.min(party.filter(p => p.hp && !!p.status && !p.getHeldItems().some(i => {
-        if (i instanceof TurnStatusEffectModifier) {
-          return (i as TurnStatusEffectModifier).getStatusEffect() === p.status?.effect;
-        }
-        return false;
-      })).length, 3);
-      return statusEffectPartyMemberCount * 6;
-    }, 18),
-    new WeightedModifierType(modifierTypes.REVIVE, (party: Pokemon[]) => {
-      const faintedPartyMemberCount = Math.min(party.filter(p => p.isFainted()).length, 3);
-      return faintedPartyMemberCount * 9;
-    }, 27),
-    new WeightedModifierType(modifierTypes.MAX_REVIVE, (party: Pokemon[]) => {
-      const faintedPartyMemberCount = Math.min(party.filter(p => p.isFainted()).length, 3);
-      return faintedPartyMemberCount * 3;
-    }, 9),
-    new WeightedModifierType(modifierTypes.SACRED_ASH, (party: Pokemon[]) => {
-      return party.filter(p => p.isFainted()).length >= Math.ceil(party.length / 2) ? 1 : 0;
-    }, 1),
-    new WeightedModifierType(modifierTypes.HYPER_POTION, (party: Pokemon[]) => {
-      const thresholdPartyMemberCount = Math.min(party.filter(p => (p.getInverseHp() >= 100 && p.getHpRatio() <= 0.625) && !p.isFainted()).length, 3);
-      return thresholdPartyMemberCount * 3;
-    }, 9),
-    new WeightedModifierType(modifierTypes.MAX_POTION, (party: Pokemon[]) => {
-      const thresholdPartyMemberCount = Math.min(party.filter(p => (p.getInverseHp() >= 100 && p.getHpRatio() <= 0.5) && !p.isFainted()).length, 3);
-      return thresholdPartyMemberCount;
-    }, 3),
-    new WeightedModifierType(modifierTypes.FULL_RESTORE, (party: Pokemon[]) => {
-      const statusEffectPartyMemberCount = Math.min(party.filter(p => p.hp && !!p.status && !p.getHeldItems().some(i => {
-        if (i instanceof TurnStatusEffectModifier) {
-          return (i as TurnStatusEffectModifier).getStatusEffect() === p.status?.effect;
-        }
-        return false;
-      })).length, 3);
-      const thresholdPartyMemberCount = Math.floor((Math.min(party.filter(p => (p.getInverseHp() >= 100 && p.getHpRatio() <= 0.5) && !p.isFainted()).length, 3) + statusEffectPartyMemberCount) / 2);
-      return thresholdPartyMemberCount;
-    }, 3),
-    new WeightedModifierType(modifierTypes.ELIXIR, (party: Pokemon[]) => {
-      const thresholdPartyMemberCount = Math.min(party.filter(p => p.hp && !p.getHeldItems().some(m => m instanceof BerryModifier && m.berryType === BerryType.LEPPA)
-        && p.getMoveset().filter(m => m?.ppUsed && (m.getMovePp() - m.ppUsed) <= 5 && m.ppUsed > Math.floor(m.getMovePp() / 2)).length).length, 3);
-      return thresholdPartyMemberCount * 3;
-    }, 9),
-    new WeightedModifierType(modifierTypes.MAX_ELIXIR, (party: Pokemon[]) => {
-      const thresholdPartyMemberCount = Math.min(party.filter(p => p.hp && !p.getHeldItems().some(m => m instanceof BerryModifier && m.berryType === BerryType.LEPPA)
-        && p.getMoveset().filter(m => m?.ppUsed && (m.getMovePp() - m.ppUsed) <= 5 && m.ppUsed > Math.floor(m.getMovePp() / 2)).length).length, 3);
-      return thresholdPartyMemberCount;
-    }, 3),
+    new WeightedModifierType(
+      modifierTypes.FULL_HEAL,
+      (party: Pokemon[]) => {
+        const statusEffectPartyMemberCount = Math.min(
+          party.filter(
+            p =>
+              p.hp &&
+              !!p.status &&
+              !p.getHeldItems().some(i => {
+                if (i instanceof TurnStatusEffectModifier) {
+                  return (i as TurnStatusEffectModifier).getStatusEffect() === p.status?.effect;
+                }
+                return false;
+              }),
+          ).length,
+          3,
+        );
+        return statusEffectPartyMemberCount * 6;
+      },
+      18,
+    ),
+    new WeightedModifierType(
+      modifierTypes.REVIVE,
+      (party: Pokemon[]) => {
+        const faintedPartyMemberCount = Math.min(party.filter(p => p.isFainted()).length, 3);
+        return faintedPartyMemberCount * 9;
+      },
+      27,
+    ),
+    new WeightedModifierType(
+      modifierTypes.MAX_REVIVE,
+      (party: Pokemon[]) => {
+        const faintedPartyMemberCount = Math.min(party.filter(p => p.isFainted()).length, 3);
+        return faintedPartyMemberCount * 3;
+      },
+      9,
+    ),
+    new WeightedModifierType(
+      modifierTypes.SACRED_ASH,
+      (party: Pokemon[]) => {
+        return party.filter(p => p.isFainted()).length >= Math.ceil(party.length / 2) ? 1 : 0;
+      },
+      1,
+    ),
+    new WeightedModifierType(
+      modifierTypes.HYPER_POTION,
+      (party: Pokemon[]) => {
+        const thresholdPartyMemberCount = Math.min(
+          party.filter(p => p.getInverseHp() >= 100 && p.getHpRatio() <= 0.625 && !p.isFainted()).length,
+          3,
+        );
+        return thresholdPartyMemberCount * 3;
+      },
+      9,
+    ),
+    new WeightedModifierType(
+      modifierTypes.MAX_POTION,
+      (party: Pokemon[]) => {
+        const thresholdPartyMemberCount = Math.min(
+          party.filter(p => p.getInverseHp() >= 100 && p.getHpRatio() <= 0.5 && !p.isFainted()).length,
+          3,
+        );
+        return thresholdPartyMemberCount;
+      },
+      3,
+    ),
+    new WeightedModifierType(
+      modifierTypes.FULL_RESTORE,
+      (party: Pokemon[]) => {
+        const statusEffectPartyMemberCount = Math.min(
+          party.filter(
+            p =>
+              p.hp &&
+              !!p.status &&
+              !p.getHeldItems().some(i => {
+                if (i instanceof TurnStatusEffectModifier) {
+                  return (i as TurnStatusEffectModifier).getStatusEffect() === p.status?.effect;
+                }
+                return false;
+              }),
+          ).length,
+          3,
+        );
+        const thresholdPartyMemberCount = Math.floor(
+          (Math.min(party.filter(p => p.getInverseHp() >= 100 && p.getHpRatio() <= 0.5 && !p.isFainted()).length, 3) +
+            statusEffectPartyMemberCount) /
+            2,
+        );
+        return thresholdPartyMemberCount;
+      },
+      3,
+    ),
+    new WeightedModifierType(
+      modifierTypes.ELIXIR,
+      (party: Pokemon[]) => {
+        const thresholdPartyMemberCount = Math.min(
+          party.filter(
+            p =>
+              p.hp &&
+              !p.getHeldItems().some(m => m instanceof BerryModifier && m.berryType === BerryType.LEPPA) &&
+              p
+                .getMoveset()
+                .filter(m => m.ppUsed && m.getMovePp() - m.ppUsed <= 5 && m.ppUsed > Math.floor(m.getMovePp() / 2))
+                .length,
+          ).length,
+          3,
+        );
+        return thresholdPartyMemberCount * 3;
+      },
+      9,
+    ),
+    new WeightedModifierType(
+      modifierTypes.MAX_ELIXIR,
+      (party: Pokemon[]) => {
+        const thresholdPartyMemberCount = Math.min(
+          party.filter(
+            p =>
+              p.hp &&
+              !p.getHeldItems().some(m => m instanceof BerryModifier && m.berryType === BerryType.LEPPA) &&
+              p
+                .getMoveset()
+                .filter(m => m.ppUsed && m.getMovePp() - m.ppUsed <= 5 && m.ppUsed > Math.floor(m.getMovePp() / 2))
+                .length,
+          ).length,
+          3,
+        );
+        return thresholdPartyMemberCount;
+      },
+      3,
+    ),
     new WeightedModifierType(modifierTypes.DIRE_HIT, 4),
     new WeightedModifierType(modifierTypes.SUPER_LURE, lureWeightFunc(15, 4)),
     new WeightedModifierType(modifierTypes.NUGGET, skipInLastClassicWaveOrDefault(5)),
-    new WeightedModifierType(modifierTypes.EVOLUTION_ITEM, () => {
-      return Math.min(Math.ceil(globalScene.currentBattle.waveIndex / 15), 8);
-    }, 8),
-    new WeightedModifierType(modifierTypes.MAP, () => globalScene.gameMode.isClassic && globalScene.currentBattle.waveIndex < 180 ? 2 : 0, 2),
+    new WeightedModifierType(
+      modifierTypes.EVOLUTION_ITEM,
+      () => {
+        return Math.min(Math.ceil(globalScene.currentBattle.waveIndex / 15), 8);
+      },
+      8,
+    ),
+    new WeightedModifierType(
+      modifierTypes.MAP,
+      () => (globalScene.gameMode.isClassic && globalScene.currentBattle.waveIndex < 180 ? 2 : 0),
+      2,
+    ),
     new WeightedModifierType(modifierTypes.SOOTHE_BELL, 2),
     new WeightedModifierType(modifierTypes.TM_GREAT, 3),
-    new WeightedModifierType(modifierTypes.MEMORY_MUSHROOM, (party: Pokemon[]) => {
-      if (!party.find(p => p.getLearnableLevelMoves().length)) {
-        return 0;
-      }
-      const highestPartyLevel = party.map(p => p.level).reduce((highestLevel: number, level: number) => Math.max(highestLevel, level), 1);
-      return Math.min(Math.ceil(highestPartyLevel / 20), 4);
-    }, 4),
+    new WeightedModifierType(
+      modifierTypes.MEMORY_MUSHROOM,
+      (party: Pokemon[]) => {
+        if (!party.find(p => p.getLearnableLevelMoves().length)) {
+          return 0;
+        }
+        const highestPartyLevel = party
+          .map(p => p.level)
+          .reduce((highestLevel: number, level: number) => Math.max(highestLevel, level), 1);
+        return Math.min(Math.ceil(highestPartyLevel / 20), 4);
+      },
+      4,
+    ),
     new WeightedModifierType(modifierTypes.BASE_STAT_BOOSTER, 3),
-    new WeightedModifierType(modifierTypes.TERA_SHARD, 1),
-    new WeightedModifierType(modifierTypes.DNA_SPLICERS, (party: Pokemon[]) => globalScene.gameMode.isSplicedOnly && party.filter(p => !p.fusionSpecies).length > 1 ? 4 : 0),
-    new WeightedModifierType(modifierTypes.VOUCHER, (_party: Pokemon[], rerollCount: number) => !globalScene.gameMode.isDaily ? Math.max(1 - rerollCount, 0) : 0, 1),
+    new WeightedModifierType(modifierTypes.TERA_SHARD, (party: Pokemon[]) =>
+      party.filter(
+        p => !(p.hasSpecies(Species.TERAPAGOS) || p.hasSpecies(Species.OGERPON) || p.hasSpecies(Species.SHEDINJA)),
+      ).length > 0
+        ? 1
+        : 0,
+    ),
+    new WeightedModifierType(
+      modifierTypes.DNA_SPLICERS,
+      (party: Pokemon[]) => {
+        if (party.filter(p => !p.fusionSpecies).length > 1) {
+          if (globalScene.gameMode.isSplicedOnly) {
+            return 4;
+          }
+          if (globalScene.gameMode.isClassic && timedEventManager.areFusionsBoosted()) {
+            return 2;
+          }
+        }
+        return 0;
+      },
+      4,
+    ),
+    new WeightedModifierType(
+      modifierTypes.VOUCHER,
+      (_party: Pokemon[], rerollCount: number) => (!globalScene.gameMode.isDaily ? Math.max(1 - rerollCount, 0) : 0),
+      1,
+    ),
   ].map(m => {
-    m.setTier(ModifierTier.GREAT); return m;
+    m.setTier(ModifierTier.GREAT);
+    return m;
   }),
   [ModifierTier.ULTRA]: [
-    new WeightedModifierType(modifierTypes.ULTRA_BALL, () => (hasMaximumBalls(PokeballType.ULTRA_BALL)) ? 0 : 15, 15),
+    new WeightedModifierType(modifierTypes.ULTRA_BALL, () => (hasMaximumBalls(PokeballType.ULTRA_BALL) ? 0 : 15), 15),
     new WeightedModifierType(modifierTypes.MAX_LURE, lureWeightFunc(30, 4)),
     new WeightedModifierType(modifierTypes.BIG_NUGGET, skipInLastClassicWaveOrDefault(12)),
     new WeightedModifierType(modifierTypes.PP_MAX, 3),
     new WeightedModifierType(modifierTypes.MINT, 4),
-    new WeightedModifierType(modifierTypes.RARE_EVOLUTION_ITEM, () => Math.min(Math.ceil(globalScene.currentBattle.waveIndex / 15) * 4, 32), 32),
-    new WeightedModifierType(modifierTypes.FORM_CHANGE_ITEM, () => Math.min(Math.ceil(globalScene.currentBattle.waveIndex / 50), 4) * 6, 24),
+    new WeightedModifierType(
+      modifierTypes.RARE_EVOLUTION_ITEM,
+      () => Math.min(Math.ceil(globalScene.currentBattle.waveIndex / 15) * 4, 32),
+      32,
+    ),
+    new WeightedModifierType(
+      modifierTypes.FORM_CHANGE_ITEM,
+      () => Math.min(Math.ceil(globalScene.currentBattle.waveIndex / 50), 4) * 6,
+      24,
+    ),
     new WeightedModifierType(modifierTypes.AMULET_COIN, skipInLastClassicWaveOrDefault(3)),
     new WeightedModifierType(modifierTypes.EVIOLITE, (party: Pokemon[]) => {
       const { gameMode, gameData } = globalScene;
       if (gameMode.isDaily || (!gameMode.isFreshStartChallenge() && gameData.isUnlocked(Unlockables.EVIOLITE))) {
         return party.some(p => {
           // Check if Pokemon's species (or fusion species, if applicable) can evolve or if they're G-Max'd
-          if (!p.isMax() && ((p.getSpeciesForm(true).speciesId in pokemonEvolutions) || (p.isFusion() && (p.getFusionSpeciesForm(true).speciesId in pokemonEvolutions)))) {
+          if (
+            !p.isMax() &&
+            (p.getSpeciesForm(true).speciesId in pokemonEvolutions ||
+              (p.isFusion() && p.getFusionSpeciesForm(true).speciesId in pokemonEvolutions))
+          ) {
             // Check if Pokemon is already holding an Eviolite
             return !p.getHeldItems().some(i => i.type.id === "EVIOLITE");
           }
           return false;
-        }) ? 10 : 0;
+        })
+          ? 10
+          : 0;
       }
       return 0;
     }),
     new WeightedModifierType(modifierTypes.SPECIES_STAT_BOOSTER, 12),
-    new WeightedModifierType(modifierTypes.LEEK, (party: Pokemon[]) => {
-      const checkedSpecies = [ Species.FARFETCHD, Species.GALAR_FARFETCHD, Species.SIRFETCHD ];
-      // If a party member doesn't already have a Leek and is one of the relevant species, Leek can appear
-      return party.some(p => !p.getHeldItems().some(i => i instanceof SpeciesCritBoosterModifier)
-        && (checkedSpecies.includes(p.getSpeciesForm(true).speciesId)
-        || (p.isFusion() && checkedSpecies.includes(p.getFusionSpeciesForm(true).speciesId)))) ? 12 : 0;
-    }, 12),
-    new WeightedModifierType(modifierTypes.TOXIC_ORB, (party: Pokemon[]) => {
-      return party.some(p => {
-        const isHoldingOrb = p.getHeldItems().some(i => i.type.id === "FLAME_ORB" || i.type.id === "TOXIC_ORB");
+    new WeightedModifierType(
+      modifierTypes.LEEK,
+      (party: Pokemon[]) => {
+        const checkedSpecies = [Species.FARFETCHD, Species.GALAR_FARFETCHD, Species.SIRFETCHD];
+        // If a party member doesn't already have a Leek and is one of the relevant species, Leek can appear
+        return party.some(
+          p =>
+            !p.getHeldItems().some(i => i instanceof SpeciesCritBoosterModifier) &&
+            (checkedSpecies.includes(p.getSpeciesForm(true).speciesId) ||
+              (p.isFusion() && checkedSpecies.includes(p.getFusionSpeciesForm(true).speciesId))),
+        )
+          ? 12
+          : 0;
+      },
+      12,
+    ),
+    new WeightedModifierType(
+      modifierTypes.TOXIC_ORB,
+      (party: Pokemon[]) => {
+        return party.some(p => {
+          const isHoldingOrb = p.getHeldItems().some(i => i.type.id === "FLAME_ORB" || i.type.id === "TOXIC_ORB");
 
-        if (!isHoldingOrb) {
-          const moveset = p.getMoveset(true).filter(m => !isNullOrUndefined(m)).map(m => m.moveId);
-          const canSetStatus = p.canSetStatus(StatusEffect.TOXIC, true, true, null, true);
+          if (!isHoldingOrb) {
+            const moveset = p
+              .getMoveset(true)
+              .filter(m => !isNullOrUndefined(m))
+              .map(m => m.moveId);
+            const canSetStatus = p.canSetStatus(StatusEffect.TOXIC, true, true, null, true);
 
-          // Moves that take advantage of obtaining the actual status effect
-          const hasStatusMoves = [ Moves.FACADE, Moves.PSYCHO_SHIFT ]
-            .some(m => moveset.includes(m));
-          // Moves that take advantage of being able to give the target a status orb
-          // TODO: Take moves (Trick, Fling, Switcheroo) from comment when they are implemented
-          const hasItemMoves = [ /* Moves.TRICK, Moves.FLING, Moves.SWITCHEROO */ ]
-            .some(m => moveset.includes(m));
+            // Moves that take advantage of obtaining the actual status effect
+            const hasStatusMoves = [Moves.FACADE, Moves.PSYCHO_SHIFT].some(m => moveset.includes(m));
+            // Moves that take advantage of being able to give the target a status orb
+            // TODO: Take moves (Trick, Fling, Switcheroo) from comment when they are implemented
+            const hasItemMoves = [
+              /* Moves.TRICK, Moves.FLING, Moves.SWITCHEROO */
+            ].some(m => moveset.includes(m));
 
-          if (canSetStatus) {
-            // Abilities that take advantage of obtaining the actual status effect, separated based on specificity to the orb
-            const hasGeneralAbility = [ Abilities.QUICK_FEET, Abilities.GUTS, Abilities.MARVEL_SCALE, Abilities.MAGIC_GUARD ]
-              .some(a => p.hasAbility(a, false, true));
-            const hasSpecificAbility = [ Abilities.TOXIC_BOOST, Abilities.POISON_HEAL ]
-              .some(a => p.hasAbility(a, false, true));
-            const hasOppositeAbility = [ Abilities.FLARE_BOOST ]
-              .some(a => p.hasAbility(a, false, true));
+            if (canSetStatus) {
+              // Abilities that take advantage of obtaining the actual status effect, separated based on specificity to the orb
+              const hasGeneralAbility = [
+                Abilities.QUICK_FEET,
+                Abilities.GUTS,
+                Abilities.MARVEL_SCALE,
+                Abilities.MAGIC_GUARD,
+              ].some(a => p.hasAbility(a, false, true));
+              const hasSpecificAbility = [Abilities.TOXIC_BOOST, Abilities.POISON_HEAL].some(a =>
+                p.hasAbility(a, false, true),
+              );
+              const hasOppositeAbility = [Abilities.FLARE_BOOST].some(a => p.hasAbility(a, false, true));
 
-            return hasSpecificAbility || (hasGeneralAbility && !hasOppositeAbility) || hasStatusMoves;
-          } else {
+              return hasSpecificAbility || (hasGeneralAbility && !hasOppositeAbility) || hasStatusMoves;
+            }
             return hasItemMoves;
           }
-        }
 
-        return false;
-      }) ? 10 : 0;
-    }, 10),
-    new WeightedModifierType(modifierTypes.FLAME_ORB, (party: Pokemon[]) => {
-      return party.some(p => {
-        const isHoldingOrb = p.getHeldItems().some(i => i.type.id === "FLAME_ORB" || i.type.id === "TOXIC_ORB");
+          return false;
+        })
+          ? 10
+          : 0;
+      },
+      10,
+    ),
+    new WeightedModifierType(
+      modifierTypes.FLAME_ORB,
+      (party: Pokemon[]) => {
+        return party.some(p => {
+          const isHoldingOrb = p.getHeldItems().some(i => i.type.id === "FLAME_ORB" || i.type.id === "TOXIC_ORB");
 
-        if (!isHoldingOrb) {
-          const moveset = p.getMoveset(true).filter(m => !isNullOrUndefined(m)).map(m => m.moveId);
-          const canSetStatus = p.canSetStatus(StatusEffect.TOXIC, true, true, null, true);
+          if (!isHoldingOrb) {
+            const moveset = p
+              .getMoveset(true)
+              .filter(m => !isNullOrUndefined(m))
+              .map(m => m.moveId);
+            const canSetStatus = p.canSetStatus(StatusEffect.BURN, true, true, null, true);
 
-          // Moves that take advantage of obtaining the actual status effect
-          const hasStatusMoves = [ Moves.FACADE, Moves.PSYCHO_SHIFT ]
-            .some(m => moveset.includes(m));
-          // Moves that take advantage of being able to give the target a status orb
-          // TODO: Take moves (Trick, Fling, Switcheroo) from comment when they are implemented
-          const hasItemMoves = [ /* Moves.TRICK, Moves.FLING, Moves.SWITCHEROO */ ]
-            .some(m => moveset.includes(m));
+            // Moves that take advantage of obtaining the actual status effect
+            const hasStatusMoves = [Moves.FACADE, Moves.PSYCHO_SHIFT].some(m => moveset.includes(m));
+            // Moves that take advantage of being able to give the target a status orb
+            // TODO: Take moves (Trick, Fling, Switcheroo) from comment when they are implemented
+            const hasItemMoves = [
+              /* Moves.TRICK, Moves.FLING, Moves.SWITCHEROO */
+            ].some(m => moveset.includes(m));
 
-          if (canSetStatus) {
-            // Abilities that take advantage of obtaining the actual status effect, separated based on specificity to the orb
-            const hasGeneralAbility = [ Abilities.QUICK_FEET, Abilities.GUTS, Abilities.MARVEL_SCALE, Abilities.MAGIC_GUARD ]
-              .some(a => p.hasAbility(a, false, true));
-            const hasSpecificAbility = [ Abilities.FLARE_BOOST ]
-              .some(a => p.hasAbility(a, false, true));
-            const hasOppositeAbility = [ Abilities.TOXIC_BOOST, Abilities.POISON_HEAL ]
-              .some(a => p.hasAbility(a, false, true));
+            if (canSetStatus) {
+              // Abilities that take advantage of obtaining the actual status effect, separated based on specificity to the orb
+              const hasGeneralAbility = [
+                Abilities.QUICK_FEET,
+                Abilities.GUTS,
+                Abilities.MARVEL_SCALE,
+                Abilities.MAGIC_GUARD,
+              ].some(a => p.hasAbility(a, false, true));
+              const hasSpecificAbility = [Abilities.FLARE_BOOST].some(a => p.hasAbility(a, false, true));
+              const hasOppositeAbility = [Abilities.TOXIC_BOOST, Abilities.POISON_HEAL].some(a =>
+                p.hasAbility(a, false, true),
+              );
 
-            return hasSpecificAbility || (hasGeneralAbility && !hasOppositeAbility) || hasStatusMoves;
-          } else {
+              return hasSpecificAbility || (hasGeneralAbility && !hasOppositeAbility) || hasStatusMoves;
+            }
             return hasItemMoves;
           }
-        }
 
-        return false;
-      }) ? 10 : 0;
-    }, 10),
-    new WeightedModifierType(modifierTypes.WHITE_HERB, (party: Pokemon[]) => {
-      const checkedAbilities = [ Abilities.WEAK_ARMOR, Abilities.CONTRARY, Abilities.MOODY, Abilities.ANGER_SHELL, Abilities.COMPETITIVE, Abilities.DEFIANT ];
-      const weightMultiplier = party.filter(
-        p => !p.getHeldItems().some(i => i instanceof ResetNegativeStatStageModifier && i.stackCount >= i.getMaxHeldItemCount(p)) &&
-          (checkedAbilities.some(a => p.hasAbility(a, false, true)) || p.getMoveset(true).some(m => m && selfStatLowerMoves.includes(m.moveId)))).length;
-      // If a party member has one of the above moves or abilities and doesn't have max herbs, the herb will appear more frequently
-      return 0 * (weightMultiplier ? 2 : 1) + (weightMultiplier ? weightMultiplier * 0 : 0);
-    }, 10),
+          return false;
+        })
+          ? 10
+          : 0;
+      },
+      10,
+    ),
+    new WeightedModifierType(
+      modifierTypes.MYSTICAL_ROCK,
+      (party: Pokemon[]) => {
+        return party.some(p => {
+          let isHoldingMax = false;
+          for (const i of p.getHeldItems()) {
+            if (i.type.id === "MYSTICAL_ROCK") {
+              isHoldingMax = i.getStackCount() === i.getMaxStackCount();
+              break;
+            }
+          }
+
+          if (!isHoldingMax) {
+            const moveset = p.getMoveset(true).map(m => m.moveId);
+
+            const hasAbility = [
+              Abilities.DROUGHT,
+              Abilities.ORICHALCUM_PULSE,
+              Abilities.DRIZZLE,
+              Abilities.SAND_STREAM,
+              Abilities.SAND_SPIT,
+              Abilities.SNOW_WARNING,
+              Abilities.ELECTRIC_SURGE,
+              Abilities.HADRON_ENGINE,
+              Abilities.PSYCHIC_SURGE,
+              Abilities.GRASSY_SURGE,
+              Abilities.SEED_SOWER,
+              Abilities.MISTY_SURGE,
+            ].some(a => p.hasAbility(a, false, true));
+
+            const hasMoves = [
+              Moves.SUNNY_DAY,
+              Moves.RAIN_DANCE,
+              Moves.SANDSTORM,
+              Moves.SNOWSCAPE,
+              Moves.HAIL,
+              Moves.CHILLY_RECEPTION,
+              Moves.ELECTRIC_TERRAIN,
+              Moves.PSYCHIC_TERRAIN,
+              Moves.GRASSY_TERRAIN,
+              Moves.MISTY_TERRAIN,
+            ].some(m => moveset.includes(m));
+
+            return hasAbility || hasMoves;
+          }
+          return false;
+        })
+          ? 10
+          : 0;
+      },
+      10,
+    ),
     new WeightedModifierType(modifierTypes.REVIVER_SEED, 4),
     new WeightedModifierType(modifierTypes.CANDY_JAR, skipInLastClassicWaveOrDefault(5)),
     new WeightedModifierType(modifierTypes.ATTACK_TYPE_BOOSTER, 9),
@@ -1841,15 +2882,22 @@ const modifierPool: ModifierPool = {
     new WeightedModifierType(modifierTypes.IV_SCANNER, skipInLastClassicWaveOrDefault(4)),
     new WeightedModifierType(modifierTypes.EXP_CHARM, skipInLastClassicWaveOrDefault(8)),
     new WeightedModifierType(modifierTypes.EXP_SHARE, skipInLastClassicWaveOrDefault(10)),
-    new WeightedModifierType(modifierTypes.EXP_BALANCE, skipInLastClassicWaveOrDefault(3)),
-    new WeightedModifierType(modifierTypes.TERA_ORB, () => Math.min(Math.max(Math.floor(globalScene.currentBattle.waveIndex / 50) * 2, 1), 4), 4),
+    new WeightedModifierType(
+      modifierTypes.TERA_ORB,
+      () =>
+        !globalScene.gameMode.isClassic
+          ? Math.min(Math.max(Math.floor(globalScene.currentBattle.waveIndex / 50) * 2, 1), 4)
+          : 0,
+      4,
+    ),
     new WeightedModifierType(modifierTypes.QUICK_CLAW, 3),
-    new WeightedModifierType(modifierTypes.WIDE_LENS, 4),
+    new WeightedModifierType(modifierTypes.WIDE_LENS, 7),
   ].map(m => {
-    m.setTier(ModifierTier.ULTRA); return m;
+    m.setTier(ModifierTier.ULTRA);
+    return m;
   }),
   [ModifierTier.ROGUE]: [
-    new WeightedModifierType(modifierTypes.ROGUE_BALL, () => (hasMaximumBalls(PokeballType.ROGUE_BALL)) ? 0 : 16, 16),
+    new WeightedModifierType(modifierTypes.ROGUE_BALL, () => (hasMaximumBalls(PokeballType.ROGUE_BALL) ? 0 : 16), 16),
     new WeightedModifierType(modifierTypes.RELIC_GOLD, skipInLastClassicWaveOrDefault(2)),
     new WeightedModifierType(modifierTypes.LEFTOVERS, 3),
     new WeightedModifierType(modifierTypes.SHELL_BELL, 3),
@@ -1858,80 +2906,119 @@ const modifierPool: ModifierPool = {
     new WeightedModifierType(modifierTypes.SCOPE_LENS, 4),
     new WeightedModifierType(modifierTypes.BATON, 2),
     new WeightedModifierType(modifierTypes.SOUL_DEW, 7),
-    //new WeightedModifierType(modifierTypes.OVAL_CHARM, 6),
-    new WeightedModifierType(modifierTypes.CATCHING_CHARM, () => globalScene.gameMode.isDaily || (!globalScene.gameMode.isFreshStartChallenge() && globalScene.gameData.getSpeciesCount(d => !!d.caughtAttr) > 100) ? 4 : 0, 4),
+    new WeightedModifierType(modifierTypes.CATCHING_CHARM, () => (!globalScene.gameMode.isClassic ? 4 : 0), 4),
     new WeightedModifierType(modifierTypes.ABILITY_CHARM, skipInClassicAfterWave(189, 6)),
     new WeightedModifierType(modifierTypes.FOCUS_BAND, 5),
     new WeightedModifierType(modifierTypes.KINGS_ROCK, 3),
-    new WeightedModifierType(modifierTypes.LOCK_CAPSULE, () => globalScene.gameMode.isClassic ? 0 : 3),
+    new WeightedModifierType(modifierTypes.LOCK_CAPSULE, () => (globalScene.gameMode.isClassic ? 0 : 3)),
     new WeightedModifierType(modifierTypes.SUPER_EXP_CHARM, skipInLastClassicWaveOrDefault(8)),
-    new WeightedModifierType(modifierTypes.RARE_FORM_CHANGE_ITEM, () => Math.min(Math.ceil(globalScene.currentBattle.waveIndex / 50), 4) * 6, 24),
-    new WeightedModifierType(modifierTypes.MEGA_BRACELET, () => Math.min(Math.ceil(globalScene.currentBattle.waveIndex / 50), 4) * 9, 36),
-    new WeightedModifierType(modifierTypes.DYNAMAX_BAND, () => Math.min(Math.ceil(globalScene.currentBattle.waveIndex / 50), 4) * 9, 36),
-    new WeightedModifierType(modifierTypes.VOUCHER_PLUS, (_party: Pokemon[], rerollCount: number) => !globalScene.gameMode.isDaily ? Math.max(3 - rerollCount * 1, 0) : 0, 3),
+    new WeightedModifierType(
+      modifierTypes.RARE_FORM_CHANGE_ITEM,
+      () => Math.min(Math.ceil(globalScene.currentBattle.waveIndex / 50), 4) * 6,
+      24,
+    ),
+    new WeightedModifierType(
+      modifierTypes.MEGA_BRACELET,
+      () => Math.min(Math.ceil(globalScene.currentBattle.waveIndex / 50), 4) * 9,
+      36,
+    ),
+    new WeightedModifierType(
+      modifierTypes.DYNAMAX_BAND,
+      () => Math.min(Math.ceil(globalScene.currentBattle.waveIndex / 50), 4) * 9,
+      36,
+    ),
+    new WeightedModifierType(
+      modifierTypes.VOUCHER_PLUS,
+      (_party: Pokemon[], rerollCount: number) =>
+        !globalScene.gameMode.isDaily ? Math.max(3 - rerollCount * 1, 0) : 0,
+      3,
+    ),
   ].map(m => {
-    m.setTier(ModifierTier.ROGUE); return m;
+    m.setTier(ModifierTier.ROGUE);
+    return m;
   }),
   [ModifierTier.MASTER]: [
-    new WeightedModifierType(modifierTypes.MASTER_BALL, () => (hasMaximumBalls(PokeballType.MASTER_BALL)) ? 0 : 24, 24),
+    new WeightedModifierType(modifierTypes.MASTER_BALL, () => (hasMaximumBalls(PokeballType.MASTER_BALL) ? 0 : 24), 24),
     new WeightedModifierType(modifierTypes.SHINY_CHARM, 14),
     new WeightedModifierType(modifierTypes.HEALING_CHARM, 18),
     new WeightedModifierType(modifierTypes.MULTI_LENS, 18),
-    new WeightedModifierType(modifierTypes.VOUCHER_PREMIUM, (_party: Pokemon[], rerollCount: number) =>
-      !globalScene.gameMode.isDaily && !globalScene.gameMode.isEndless && !globalScene.gameMode.isSplicedOnly ? Math.max(5 - rerollCount * 2, 0) : 0, 5),
-    new WeightedModifierType(modifierTypes.DNA_SPLICERS, (party: Pokemon[]) => !globalScene.gameMode.isSplicedOnly && party.filter(p => !p.fusionSpecies).length > 1 ? 24 : 0, 24),
-    new WeightedModifierType(modifierTypes.MINI_BLACK_HOLE, () => (globalScene.gameMode.isDaily || (!globalScene.gameMode.isFreshStartChallenge() && globalScene.gameData.isUnlocked(Unlockables.MINI_BLACK_HOLE))) ? 1 : 0, 1),
+    new WeightedModifierType(
+      modifierTypes.VOUCHER_PREMIUM,
+      (_party: Pokemon[], rerollCount: number) =>
+        !globalScene.gameMode.isDaily && !globalScene.gameMode.isEndless && !globalScene.gameMode.isSplicedOnly
+          ? Math.max(5 - rerollCount * 2, 0)
+          : 0,
+      5,
+    ),
+    new WeightedModifierType(
+      modifierTypes.DNA_SPLICERS,
+      (party: Pokemon[]) =>
+        !(globalScene.gameMode.isClassic && timedEventManager.areFusionsBoosted()) &&
+        !globalScene.gameMode.isSplicedOnly &&
+        party.filter(p => !p.fusionSpecies).length > 1
+          ? 24
+          : 0,
+      24,
+    ),
+    new WeightedModifierType(
+      modifierTypes.MINI_BLACK_HOLE,
+      () =>
+        globalScene.gameMode.isDaily ||
+        (!globalScene.gameMode.isFreshStartChallenge() && globalScene.gameData.isUnlocked(Unlockables.MINI_BLACK_HOLE))
+          ? 1
+          : 0,
+      1,
+    ),
   ].map(m => {
-    m.setTier(ModifierTier.MASTER); return m;
-  })
+    m.setTier(ModifierTier.MASTER);
+    return m;
+  }),
 };
 
 const wildModifierPool: ModifierPool = {
-  [ModifierTier.COMMON]: [
-    new WeightedModifierType(modifierTypes.BERRY, 1)
-  ].map(m => {
-    m.setTier(ModifierTier.COMMON); return m;
+  [ModifierTier.COMMON]: [new WeightedModifierType(modifierTypes.BERRY, 1)].map(m => {
+    m.setTier(ModifierTier.COMMON);
+    return m;
   }),
-  [ModifierTier.GREAT]: [
-    new WeightedModifierType(modifierTypes.BASE_STAT_BOOSTER, 1)
-  ].map(m => {
-    m.setTier(ModifierTier.GREAT); return m;
-  }),
-  [ModifierTier.ULTRA]: [
-    new WeightedModifierType(modifierTypes.ATTACK_TYPE_BOOSTER, 10),
-    new WeightedModifierType(modifierTypes.WHITE_HERB, 0)
-  ].map(m => {
-    m.setTier(ModifierTier.ULTRA); return m;
-  }),
-  [ModifierTier.ROGUE]: [
-    new WeightedModifierType(modifierTypes.LUCKY_EGG, 4),
-  ].map(m => {
-    m.setTier(ModifierTier.ROGUE); return m;
-  }),
-  [ModifierTier.MASTER]: [
-    new WeightedModifierType(modifierTypes.GOLDEN_EGG, 1)
-  ].map(m => {
-    m.setTier(ModifierTier.MASTER); return m;
-  })
-};
-
-const trainerModifierPool: ModifierPool = {
-  [ModifierTier.COMMON]: [
-    new WeightedModifierType(modifierTypes.BERRY, 8),
-    new WeightedModifierType(modifierTypes.BASE_STAT_BOOSTER, 3)
-  ].map(m => {
-    m.setTier(ModifierTier.COMMON); return m;
-  }),
-  [ModifierTier.GREAT]: [
-    new WeightedModifierType(modifierTypes.BASE_STAT_BOOSTER, 3),
-  ].map(m => {
-    m.setTier(ModifierTier.GREAT); return m;
+  [ModifierTier.GREAT]: [new WeightedModifierType(modifierTypes.BASE_STAT_BOOSTER, 1)].map(m => {
+    m.setTier(ModifierTier.GREAT);
+    return m;
   }),
   [ModifierTier.ULTRA]: [
     new WeightedModifierType(modifierTypes.ATTACK_TYPE_BOOSTER, 10),
     new WeightedModifierType(modifierTypes.WHITE_HERB, 0),
   ].map(m => {
-    m.setTier(ModifierTier.ULTRA); return m;
+    m.setTier(ModifierTier.ULTRA);
+    return m;
+  }),
+  [ModifierTier.ROGUE]: [new WeightedModifierType(modifierTypes.LUCKY_EGG, 4)].map(m => {
+    m.setTier(ModifierTier.ROGUE);
+    return m;
+  }),
+  [ModifierTier.MASTER]: [new WeightedModifierType(modifierTypes.GOLDEN_EGG, 1)].map(m => {
+    m.setTier(ModifierTier.MASTER);
+    return m;
+  }),
+};
+
+const trainerModifierPool: ModifierPool = {
+  [ModifierTier.COMMON]: [
+    new WeightedModifierType(modifierTypes.BERRY, 8),
+    new WeightedModifierType(modifierTypes.BASE_STAT_BOOSTER, 3),
+  ].map(m => {
+    m.setTier(ModifierTier.COMMON);
+    return m;
+  }),
+  [ModifierTier.GREAT]: [new WeightedModifierType(modifierTypes.BASE_STAT_BOOSTER, 3)].map(m => {
+    m.setTier(ModifierTier.GREAT);
+    return m;
+  }),
+  [ModifierTier.ULTRA]: [
+    new WeightedModifierType(modifierTypes.ATTACK_TYPE_BOOSTER, 10),
+    new WeightedModifierType(modifierTypes.WHITE_HERB, 0),
+  ].map(m => {
+    m.setTier(ModifierTier.ULTRA);
+    return m;
   }),
   [ModifierTier.ROGUE]: [
     new WeightedModifierType(modifierTypes.FOCUS_BAND, 2),
@@ -1940,7 +3027,8 @@ const trainerModifierPool: ModifierPool = {
     new WeightedModifierType(modifierTypes.GRIP_CLAW, 1),
     new WeightedModifierType(modifierTypes.WIDE_LENS, 1),
   ].map(m => {
-    m.setTier(ModifierTier.ROGUE); return m;
+    m.setTier(ModifierTier.ROGUE);
+    return m;
   }),
   [ModifierTier.MASTER]: [
     new WeightedModifierType(modifierTypes.KINGS_ROCK, 1),
@@ -1948,8 +3036,9 @@ const trainerModifierPool: ModifierPool = {
     new WeightedModifierType(modifierTypes.SHELL_BELL, 1),
     new WeightedModifierType(modifierTypes.SCOPE_LENS, 1),
   ].map(m => {
-    m.setTier(ModifierTier.MASTER); return m;
-  })
+    m.setTier(ModifierTier.MASTER);
+    return m;
+  }),
 };
 
 const enemyBuffModifierPool: ModifierPool = {
@@ -1961,18 +3050,20 @@ const enemyBuffModifierPool: ModifierPool = {
     new WeightedModifierType(modifierTypes.ENEMY_ATTACK_BURN_CHANCE, 3),
     new WeightedModifierType(modifierTypes.ENEMY_STATUS_EFFECT_HEAL_CHANCE, 9),
     new WeightedModifierType(modifierTypes.ENEMY_ENDURE_CHANCE, 4),
-    new WeightedModifierType(modifierTypes.ENEMY_FUSED_CHANCE, 1)
+    new WeightedModifierType(modifierTypes.ENEMY_FUSED_CHANCE, 1),
   ].map(m => {
-    m.setTier(ModifierTier.COMMON); return m;
+    m.setTier(ModifierTier.COMMON);
+    return m;
   }),
   [ModifierTier.GREAT]: [
     new WeightedModifierType(modifierTypes.ENEMY_DAMAGE_BOOSTER, 5),
     new WeightedModifierType(modifierTypes.ENEMY_DAMAGE_REDUCTION, 5),
     new WeightedModifierType(modifierTypes.ENEMY_STATUS_EFFECT_HEAL_CHANCE, 5),
     new WeightedModifierType(modifierTypes.ENEMY_ENDURE_CHANCE, 5),
-    new WeightedModifierType(modifierTypes.ENEMY_FUSED_CHANCE, 1)
+    new WeightedModifierType(modifierTypes.ENEMY_FUSED_CHANCE, 1),
   ].map(m => {
-    m.setTier(ModifierTier.GREAT); return m;
+    m.setTier(ModifierTier.GREAT);
+    return m;
   }),
   [ModifierTier.ULTRA]: [
     new WeightedModifierType(modifierTypes.ENEMY_DAMAGE_BOOSTER, 10),
@@ -1980,16 +3071,19 @@ const enemyBuffModifierPool: ModifierPool = {
     new WeightedModifierType(modifierTypes.ENEMY_HEAL, 10),
     new WeightedModifierType(modifierTypes.ENEMY_STATUS_EFFECT_HEAL_CHANCE, 10),
     new WeightedModifierType(modifierTypes.ENEMY_ENDURE_CHANCE, 10),
-    new WeightedModifierType(modifierTypes.ENEMY_FUSED_CHANCE, 5)
+    new WeightedModifierType(modifierTypes.ENEMY_FUSED_CHANCE, 5),
   ].map(m => {
-    m.setTier(ModifierTier.ULTRA); return m;
+    m.setTier(ModifierTier.ULTRA);
+    return m;
   }),
-  [ModifierTier.ROGUE]: [ ].map((m: WeightedModifierType) => {
-    m.setTier(ModifierTier.ROGUE); return m;
+  [ModifierTier.ROGUE]: [].map((m: WeightedModifierType) => {
+    m.setTier(ModifierTier.ROGUE);
+    return m;
+  }),
+  [ModifierTier.MASTER]: [].map((m: WeightedModifierType) => {
+    m.setTier(ModifierTier.MASTER);
+    return m;
   }),
-  [ModifierTier.MASTER]: [ ].map((m: WeightedModifierType) => {
-    m.setTier(ModifierTier.MASTER); return m;
-  })
 };
 
 const dailyStarterModifierPool: ModifierPool = {
@@ -1997,12 +3091,12 @@ const dailyStarterModifierPool: ModifierPool = {
     new WeightedModifierType(modifierTypes.BASE_STAT_BOOSTER, 1),
     new WeightedModifierType(modifierTypes.BERRY, 3),
   ].map(m => {
-    m.setTier(ModifierTier.COMMON); return m;
+    m.setTier(ModifierTier.COMMON);
+    return m;
   }),
-  [ModifierTier.GREAT]: [
-    new WeightedModifierType(modifierTypes.ATTACK_TYPE_BOOSTER, 5),
-  ].map(m => {
-    m.setTier(ModifierTier.GREAT); return m;
+  [ModifierTier.GREAT]: [new WeightedModifierType(modifierTypes.ATTACK_TYPE_BOOSTER, 5)].map(m => {
+    m.setTier(ModifierTier.GREAT);
+    return m;
   }),
   [ModifierTier.ULTRA]: [
     new WeightedModifierType(modifierTypes.REVIVER_SEED, 4),
@@ -2010,7 +3104,8 @@ const dailyStarterModifierPool: ModifierPool = {
     new WeightedModifierType(modifierTypes.SOUL_DEW, 1),
     new WeightedModifierType(modifierTypes.GOLDEN_PUNCH, 1),
   ].map(m => {
-    m.setTier(ModifierTier.ULTRA); return m;
+    m.setTier(ModifierTier.ULTRA);
+    return m;
   }),
   [ModifierTier.ROGUE]: [
     new WeightedModifierType(modifierTypes.GRIP_CLAW, 5),
@@ -2019,14 +3114,16 @@ const dailyStarterModifierPool: ModifierPool = {
     new WeightedModifierType(modifierTypes.QUICK_CLAW, 3),
     new WeightedModifierType(modifierTypes.KINGS_ROCK, 3),
   ].map(m => {
-    m.setTier(ModifierTier.ROGUE); return m;
+    m.setTier(ModifierTier.ROGUE);
+    return m;
   }),
   [ModifierTier.MASTER]: [
     new WeightedModifierType(modifierTypes.LEFTOVERS, 1),
     new WeightedModifierType(modifierTypes.SHELL_BELL, 1),
   ].map(m => {
-    m.setTier(ModifierTier.MASTER); return m;
-  })
+    m.setTier(ModifierTier.MASTER);
+    return m;
+  }),
 };
 
 export function getModifierType(modifierTypeFunc: ModifierTypeFunc): ModifierType {
@@ -2041,13 +3138,16 @@ let modifierPoolThresholds = {};
 let ignoredPoolIndexes = {};
 
 let dailyStarterModifierPoolThresholds = {};
-let ignoredDailyStarterPoolIndexes = {}; // eslint-disable-line @typescript-eslint/no-unused-vars
+// biome-ignore lint/correctness/noUnusedVariables: TODO explain why this is marked as OK
+let ignoredDailyStarterPoolIndexes = {};
 
 let enemyModifierPoolThresholds = {};
-let enemyIgnoredPoolIndexes = {}; // eslint-disable-line @typescript-eslint/no-unused-vars
+// biome-ignore lint/correctness/noUnusedVariables: TODO explain why this is marked as OK
+let enemyIgnoredPoolIndexes = {};
 
 let enemyBuffModifierPoolThresholds = {};
-let enemyBuffIgnoredPoolIndexes = {}; // eslint-disable-line @typescript-eslint/no-unused-vars
+// biome-ignore lint/correctness/noUnusedVariables: TODO explain why this is marked as OK
+let enemyBuffIgnoredPoolIndexes = {};
 
 export function getModifierPoolForType(poolType: ModifierPoolType): ModifierPool {
   let pool: ModifierPool;
@@ -2071,13 +3171,13 @@ export function getModifierPoolForType(poolType: ModifierPoolType): ModifierPool
   return pool;
 }
 
-const tierWeights = [ 768 / 1024, 195 / 1024, 48 / 1024, 12 / 1024, 1 / 1024 ];
+const tierWeights = [768 / 1024, 195 / 1024, 48 / 1024, 12 / 1024, 1 / 1024];
 /**
  * Allows a unit test to check if an item exists in the Modifier Pool. Checks the pool directly, rather than attempting to reroll for the item.
  */
 export const itemPoolChecks: Map<ModifierTypeKeys, boolean | undefined> = new Map();
 
-export function regenerateModifierPoolThresholds(party: Pokemon[], poolType: ModifierPoolType, rerollCount: number = 0) {
+export function regenerateModifierPoolThresholds(party: Pokemon[], poolType: ModifierPoolType, rerollCount = 0) {
   const pool = getModifierPoolForType(poolType);
   itemPoolChecks.forEach((_v, k) => {
     itemPoolChecks.set(k, false);
@@ -2085,52 +3185,68 @@ export function regenerateModifierPoolThresholds(party: Pokemon[], poolType: Mod
 
   const ignoredIndexes = {};
   const modifierTableData = {};
-  const thresholds = Object.fromEntries(new Map(Object.keys(pool).map(t => {
-    ignoredIndexes[t] = [];
-    const thresholds = new Map();
-    const tierModifierIds: string[] = [];
-    let tierMaxWeight = 0;
-    let i = 0;
-    pool[t].reduce((total: number, modifierType: WeightedModifierType) => {
-      const weightedModifierType = modifierType as WeightedModifierType;
-      const existingModifiers = globalScene.findModifiers(m => m.type.id === weightedModifierType.modifierType.id, poolType === ModifierPoolType.PLAYER);
-      const itemModifierType = weightedModifierType.modifierType instanceof ModifierTypeGenerator
-        ? weightedModifierType.modifierType.generateType(party)
-        : weightedModifierType.modifierType;
-      const weight = !existingModifiers.length
-        || itemModifierType instanceof PokemonHeldItemModifierType
-        || itemModifierType instanceof FormChangeItemModifierType
-        || existingModifiers.find(m => m.stackCount < m.getMaxStackCount(true))
-        ? weightedModifierType.weight instanceof Function
-          ? (weightedModifierType.weight as Function)(party, rerollCount)
-          : weightedModifierType.weight as number
-        : 0;
-      if (weightedModifierType.maxWeight) {
-        const modifierId = weightedModifierType.modifierType.id;
-        tierModifierIds.push(modifierId);
-        const outputWeight = useMaxWeightForOutput ? weightedModifierType.maxWeight : weight;
-        modifierTableData[modifierId] = { weight: outputWeight, tier: parseInt(t), tierPercent: 0, totalPercent: 0 };
-        tierMaxWeight += outputWeight;
-      }
-      if (weight) {
-        total += weight;
-      } else {
-        ignoredIndexes[t].push(i++);
-        return total;
-      }
-      if (itemPoolChecks.has(modifierType.modifierType.id as ModifierTypeKeys)) {
-        itemPoolChecks.set(modifierType.modifierType.id as ModifierTypeKeys, true);
-      }
-      thresholds.set(total, i++);
-      return total;
-    }, 0);
-    for (const id of tierModifierIds) {
-      modifierTableData[id].tierPercent = Math.floor((modifierTableData[id].weight / tierMaxWeight) * 10000) / 100;
-    }
-    return [ t, Object.fromEntries(thresholds) ];
-  })));
+  const thresholds = Object.fromEntries(
+    new Map(
+      Object.keys(pool).map(t => {
+        ignoredIndexes[t] = [];
+        const thresholds = new Map();
+        const tierModifierIds: string[] = [];
+        let tierMaxWeight = 0;
+        let i = 0;
+        pool[t].reduce((total: number, modifierType: WeightedModifierType) => {
+          const weightedModifierType = modifierType as WeightedModifierType;
+          const existingModifiers = globalScene.findModifiers(
+            m => m.type.id === weightedModifierType.modifierType.id,
+            poolType === ModifierPoolType.PLAYER,
+          );
+          const itemModifierType =
+            weightedModifierType.modifierType instanceof ModifierTypeGenerator
+              ? weightedModifierType.modifierType.generateType(party)
+              : weightedModifierType.modifierType;
+          const weight =
+            !existingModifiers.length ||
+            itemModifierType instanceof PokemonHeldItemModifierType ||
+            itemModifierType instanceof FormChangeItemModifierType ||
+            existingModifiers.find(m => m.stackCount < m.getMaxStackCount(true))
+              ? weightedModifierType.weight instanceof Function
+                ? // biome-ignore lint/complexity/noBannedTypes: TODO: refactor to not use Function type
+                  (weightedModifierType.weight as Function)(party, rerollCount)
+                : (weightedModifierType.weight as number)
+              : 0;
+          if (weightedModifierType.maxWeight) {
+            const modifierId = weightedModifierType.modifierType.id;
+            tierModifierIds.push(modifierId);
+            const outputWeight = useMaxWeightForOutput ? weightedModifierType.maxWeight : weight;
+            modifierTableData[modifierId] = {
+              weight: outputWeight,
+              tier: Number.parseInt(t),
+              tierPercent: 0,
+              totalPercent: 0,
+            };
+            tierMaxWeight += outputWeight;
+          }
+          if (weight) {
+            total += weight;
+          } else {
+            ignoredIndexes[t].push(i++);
+            return total;
+          }
+          if (itemPoolChecks.has(modifierType.modifierType.id as ModifierTypeKeys)) {
+            itemPoolChecks.set(modifierType.modifierType.id as ModifierTypeKeys, true);
+          }
+          thresholds.set(total, i++);
+          return total;
+        }, 0);
+        for (const id of tierModifierIds) {
+          modifierTableData[id].tierPercent = Math.floor((modifierTableData[id].weight / tierMaxWeight) * 10000) / 100;
+        }
+        return [t, Object.fromEntries(thresholds)];
+      }),
+    ),
+  );
   for (const id of Object.keys(modifierTableData)) {
-    modifierTableData[id].totalPercent = Math.floor(modifierTableData[id].tierPercent * tierWeights[modifierTableData[id].tier] * 100) / 100;
+    modifierTableData[id].totalPercent =
+      Math.floor(modifierTableData[id].tierPercent * tierWeights[modifierTableData[id].tier] * 100) / 100;
     modifierTableData[id].tier = ModifierTier[modifierTableData[id].tier];
   }
   if (outputModifierData) {
@@ -2187,21 +3303,39 @@ export function getModifierTypeFuncById(id: string): ModifierTypeFunc {
  *  - `rerollMultiplier?: number` If specified, can adjust the amount of money required for a shop reroll. If set to a negative value, the shop will not allow rerolls at all.
  *  - `allowLuckUpgrades?: boolean` Default `true`, if `false` will prevent set item tiers from upgrading via luck
  */
-export function getPlayerModifierTypeOptions(count: number, party: PlayerPokemon[], modifierTiers?: ModifierTier[], customModifierSettings?: CustomModifierSettings): ModifierTypeOption[] {
+export function getPlayerModifierTypeOptions(
+  count: number,
+  party: PlayerPokemon[],
+  modifierTiers?: ModifierTier[],
+  customModifierSettings?: CustomModifierSettings,
+): ModifierTypeOption[] {
   const options: ModifierTypeOption[] = [];
   const retryCount = Math.min(count * 5, 50);
   if (!customModifierSettings) {
     new Array(count).fill(0).map((_, i) => {
-      options.push(getModifierTypeOptionWithRetry(options, retryCount, party, modifierTiers && modifierTiers.length > i ? modifierTiers[i] : undefined));
+      options.push(
+        getModifierTypeOptionWithRetry(
+          options,
+          retryCount,
+          party,
+          modifierTiers && modifierTiers.length > i ? modifierTiers[i] : undefined,
+        ),
+      );
     });
   } else {
     // Guaranteed mod options first
-    if (customModifierSettings?.guaranteedModifierTypeOptions && customModifierSettings.guaranteedModifierTypeOptions.length > 0) {
+    if (
+      customModifierSettings?.guaranteedModifierTypeOptions &&
+      customModifierSettings.guaranteedModifierTypeOptions.length > 0
+    ) {
       options.push(...customModifierSettings.guaranteedModifierTypeOptions!);
     }
 
     // Guaranteed mod functions second
-    if (customModifierSettings.guaranteedModifierTypeFuncs && customModifierSettings.guaranteedModifierTypeFuncs.length > 0) {
+    if (
+      customModifierSettings.guaranteedModifierTypeFuncs &&
+      customModifierSettings.guaranteedModifierTypeFuncs.length > 0
+    ) {
       customModifierSettings.guaranteedModifierTypeFuncs!.forEach((mod, _i) => {
         const modifierId = Object.keys(modifierTypes).find(k => modifierTypes[k] === mod) as string;
         let guaranteedMod: ModifierType = modifierTypes[modifierId]?.();
@@ -2211,7 +3345,8 @@ export function getPlayerModifierTypeOptions(count: number, party: PlayerPokemon
           .withIdFromFunc(modifierTypes[modifierId])
           .withTierFromPool(ModifierPoolType.PLAYER, party);
 
-        const modType = guaranteedMod instanceof ModifierTypeGenerator ? guaranteedMod.generateType(party) : guaranteedMod;
+        const modType =
+          guaranteedMod instanceof ModifierTypeGenerator ? guaranteedMod.generateType(party) : guaranteedMod;
         if (modType) {
           const option = new ModifierTypeOption(modType, 0);
           options.push(option);
@@ -2222,9 +3357,9 @@ export function getPlayerModifierTypeOptions(count: number, party: PlayerPokemon
     // Guaranteed tiers third
     if (customModifierSettings.guaranteedModifierTiers && customModifierSettings.guaranteedModifierTiers.length > 0) {
       const allowLuckUpgrades = customModifierSettings.allowLuckUpgrades ?? true;
-      customModifierSettings.guaranteedModifierTiers.forEach((tier) => {
+      for (const tier of customModifierSettings.guaranteedModifierTiers) {
         options.push(getModifierTypeOptionWithRetry(options, retryCount, party, tier, allowLuckUpgrades));
-      });
+      }
     }
 
     // Fill remaining
@@ -2248,12 +3383,29 @@ export function getPlayerModifierTypeOptions(count: number, party: PlayerPokemon
  * @param tier If specified will generate item of tier
  * @param allowLuckUpgrades `true` to allow items to upgrade tiers (the little animation that plays and is affected by luck)
  */
-function getModifierTypeOptionWithRetry(existingOptions: ModifierTypeOption[], retryCount: number, party: PlayerPokemon[], tier?: ModifierTier, allowLuckUpgrades?: boolean): ModifierTypeOption {
+function getModifierTypeOptionWithRetry(
+  existingOptions: ModifierTypeOption[],
+  retryCount: number,
+  party: PlayerPokemon[],
+  tier?: ModifierTier,
+  allowLuckUpgrades?: boolean,
+): ModifierTypeOption {
   allowLuckUpgrades = allowLuckUpgrades ?? true;
   let candidate = getNewModifierTypeOption(party, ModifierPoolType.PLAYER, tier, undefined, 0, allowLuckUpgrades);
   let r = 0;
-  while (existingOptions.length && ++r < retryCount && existingOptions.filter(o => o.type.name === candidate?.type.name || o.type.group === candidate?.type.group).length) {
-    candidate = getNewModifierTypeOption(party, ModifierPoolType.PLAYER, candidate?.type.tier ?? tier, candidate?.upgradeCount, 0, allowLuckUpgrades);
+  while (
+    existingOptions.length &&
+    ++r < retryCount &&
+    existingOptions.filter(o => o.type.name === candidate?.type.name || o.type.group === candidate?.type.group).length
+  ) {
+    candidate = getNewModifierTypeOption(
+      party,
+      ModifierPoolType.PLAYER,
+      candidate?.type.tier ?? tier,
+      candidate?.upgradeCount,
+      0,
+      allowLuckUpgrades,
+    );
   }
   return candidate!;
 }
@@ -2273,7 +3425,7 @@ export function overridePlayerModifierTypeOptions(options: ModifierTypeOption[],
     let modifierType: ModifierType | null = modifierFunc();
 
     if (modifierType instanceof ModifierTypeGenerator) {
-      const pregenArgs = ("type" in override) && (override.type !== null) ? [ override.type ] : undefined;
+      const pregenArgs = "type" in override && override.type !== null ? [override.type] : undefined;
       modifierType = modifierType.generateType(party, pregenArgs);
     }
 
@@ -2292,7 +3444,7 @@ export function getPlayerShopModifierTypeOptionsForWave(waveIndex: number, baseC
     [
       new ModifierTypeOption(modifierTypes.POTION(), 0, baseCost * 0.2),
       new ModifierTypeOption(modifierTypes.ETHER(), 0, baseCost * 0.4),
-      new ModifierTypeOption(modifierTypes.REVIVE(), 0, baseCost * 2)
+      new ModifierTypeOption(modifierTypes.REVIVE(), 0, baseCost * 2),
     ],
     [
       new ModifierTypeOption(modifierTypes.SUPER_POTION(), 0, baseCost * 0.45),
@@ -2300,28 +3452,27 @@ export function getPlayerShopModifierTypeOptionsForWave(waveIndex: number, baseC
     ],
     [
       new ModifierTypeOption(modifierTypes.ELIXIR(), 0, baseCost),
-      new ModifierTypeOption(modifierTypes.MAX_ETHER(), 0, baseCost)
+      new ModifierTypeOption(modifierTypes.MAX_ETHER(), 0, baseCost),
     ],
     [
       new ModifierTypeOption(modifierTypes.HYPER_POTION(), 0, baseCost * 0.8),
       new ModifierTypeOption(modifierTypes.MAX_REVIVE(), 0, baseCost * 2.75),
-      new ModifierTypeOption(modifierTypes.MEMORY_MUSHROOM(), 0, baseCost * 4)
+      new ModifierTypeOption(modifierTypes.MEMORY_MUSHROOM(), 0, baseCost * 4),
     ],
     [
       new ModifierTypeOption(modifierTypes.MAX_POTION(), 0, baseCost * 1.5),
-      new ModifierTypeOption(modifierTypes.MAX_ELIXIR(), 0, baseCost * 2.5)
+      new ModifierTypeOption(modifierTypes.MAX_ELIXIR(), 0, baseCost * 2.5),
     ],
-    [
-      new ModifierTypeOption(modifierTypes.FULL_RESTORE(), 0, baseCost * 2.25)
-    ],
-    [
-      new ModifierTypeOption(modifierTypes.SACRED_ASH(), 0, baseCost * 10)
-    ]
+    [new ModifierTypeOption(modifierTypes.FULL_RESTORE(), 0, baseCost * 2.25)],
+    [new ModifierTypeOption(modifierTypes.SACRED_ASH(), 0, baseCost * 10)],
   ];
   return options.slice(0, Math.ceil(Math.max(waveIndex + 10, 0) / 30)).flat();
 }
 
-export function getEnemyBuffModifierForWave(tier: ModifierTier, enemyModifiers: PersistentModifier[]): EnemyPersistentModifier {
+export function getEnemyBuffModifierForWave(
+  tier: ModifierTier,
+  enemyModifiers: PersistentModifier[],
+): EnemyPersistentModifier {
   let tierStackCount: number;
   switch (tier) {
     case ModifierTier.ULTRA:
@@ -2339,7 +3490,11 @@ export function getEnemyBuffModifierForWave(tier: ModifierTier, enemyModifiers:
   let candidate = getNewModifierTypeOption([], ModifierPoolType.ENEMY_BUFF, tier);
   let r = 0;
   let matchingModifier: PersistentModifier | undefined;
-  while (++r < retryCount && (matchingModifier = enemyModifiers.find(m => m.type.id === candidate?.type?.id)) && matchingModifier.getMaxStackCount() < matchingModifier.stackCount + (r < 10 ? tierStackCount : 1)) {
+  while (
+    ++r < retryCount &&
+    (matchingModifier = enemyModifiers.find(m => m.type.id === candidate?.type?.id)) &&
+    matchingModifier.getMaxStackCount() < matchingModifier.stackCount + (r < 10 ? tierStackCount : 1)
+  ) {
     candidate = getNewModifierTypeOption([], ModifierPoolType.ENEMY_BUFF, tier);
   }
 
@@ -2349,8 +3504,20 @@ export function getEnemyBuffModifierForWave(tier: ModifierTier, enemyModifiers:
   return modifier;
 }
 
-export function getEnemyModifierTypesForWave(waveIndex: number, count: number, party: EnemyPokemon[], poolType: ModifierPoolType.WILD | ModifierPoolType.TRAINER, upgradeChance: number = 0): PokemonHeldItemModifierType[] {
-  const ret = new Array(count).fill(0).map(() => getNewModifierTypeOption(party, poolType, undefined, upgradeChance && !randSeedInt(upgradeChance) ? 1 : 0)?.type as PokemonHeldItemModifierType);
+export function getEnemyModifierTypesForWave(
+  waveIndex: number,
+  count: number,
+  party: EnemyPokemon[],
+  poolType: ModifierPoolType.WILD | ModifierPoolType.TRAINER,
+  upgradeChance = 0,
+): PokemonHeldItemModifierType[] {
+  const ret = new Array(count)
+    .fill(0)
+    .map(
+      () =>
+        getNewModifierTypeOption(party, poolType, undefined, upgradeChance && !randSeedInt(upgradeChance) ? 1 : 0)
+          ?.type as PokemonHeldItemModifierType,
+    );
   if (!(waveIndex % 1000)) {
     ret.push(getModifierType(modifierTypes.MINI_BLACK_HOLE) as PokemonHeldItemModifierType);
   }
@@ -2376,7 +3543,9 @@ export function getDailyRunStarterModifiers(party: PlayerPokemon[]): PokemonHeld
         tier = ModifierTier.MASTER;
       }
 
-      const modifier = getNewModifierTypeOption(party, ModifierPoolType.DAILY_STARTER, tier)?.type?.newModifier(p) as PokemonHeldItemModifier;
+      const modifier = getNewModifierTypeOption(party, ModifierPoolType.DAILY_STARTER, tier)?.type?.newModifier(
+        p,
+      ) as PokemonHeldItemModifier;
       ret.push(modifier);
     }
   }
@@ -2393,7 +3562,14 @@ export function getDailyRunStarterModifiers(party: PlayerPokemon[]): PokemonHeld
  * @param retryCount Max allowed tries before the next tier down is checked for a valid ModifierType
  * @param allowLuckUpgrades Default true. If false, will not allow ModifierType to randomly upgrade to next tier
  */
-function getNewModifierTypeOption(party: Pokemon[], poolType: ModifierPoolType, tier?: ModifierTier, upgradeCount?: number, retryCount: number = 0, allowLuckUpgrades: boolean = true): ModifierTypeOption | null {
+function getNewModifierTypeOption(
+  party: Pokemon[],
+  poolType: ModifierPoolType,
+  tier?: ModifierTier,
+  upgradeCount?: number,
+  retryCount = 0,
+  allowLuckUpgrades = true,
+): ModifierTypeOption | null {
   const player = !poolType;
   const pool = getModifierPoolForType(poolType);
   let thresholds: object;
@@ -2453,10 +3629,10 @@ function getNewModifierTypeOption(party: Pokemon[], poolType: ModifierPoolType,
   } else if (upgradeCount === undefined && player) {
     upgradeCount = 0;
     if (tier < ModifierTier.MASTER && allowLuckUpgrades) {
-      const partyShinyCount = party.filter(p => p.isShiny() && !p.isFainted()).length;
-      const upgradeOdds = Math.floor(32 / ((partyShinyCount + 2) / 2));
+      const partyLuckValue = getPartyLuckValue(party);
+      const upgradeOdds = Math.floor(128 / ((partyLuckValue + 4) / 4));
       while (modifierPool.hasOwnProperty(tier + upgradeCount + 1) && modifierPool[tier + upgradeCount + 1].length) {
-        if (!randSeedInt(upgradeOdds)) {
+        if (randSeedInt(upgradeOdds) < 4) {
           upgradeCount++;
         } else {
           break;
@@ -2464,17 +3640,17 @@ function getNewModifierTypeOption(party: Pokemon[], poolType: ModifierPoolType,
       }
       tier += upgradeCount;
     }
-  } else if (retryCount === 10 && tier) {
+  } else if (retryCount >= 100 && tier) {
     retryCount = 0;
     tier--;
   }
 
   const tierThresholds = Object.keys(thresholds[tier]);
-  const totalWeight = parseInt(tierThresholds[tierThresholds.length - 1]);
+  const totalWeight = Number.parseInt(tierThresholds[tierThresholds.length - 1]);
   const value = randSeedInt(totalWeight);
   let index: number | undefined;
   for (const t of tierThresholds) {
-    const threshold = parseInt(t);
+    const threshold = Number.parseInt(t);
     if (value < threshold) {
       index = thresholds[tier][threshold];
       break;
@@ -2488,7 +3664,7 @@ function getNewModifierTypeOption(party: Pokemon[], poolType: ModifierPoolType,
   if (player) {
     console.log(index, ignoredPoolIndexes[tier].filter(i => i <= index).length, ignoredPoolIndexes[tier]);
   }
-  let modifierType: ModifierType | null = (pool[tier][index]).modifierType;
+  let modifierType: ModifierType | null = pool[tier][index].modifierType;
   if (modifierType instanceof ModifierTypeGenerator) {
     modifierType = (modifierType as ModifierTypeGenerator).generateType(party);
     if (modifierType === null) {
@@ -2517,7 +3693,7 @@ export class ModifierTypeOption {
   public upgradeCount: number;
   public cost: number;
 
-  constructor(type: ModifierType, upgradeCount: number, cost: number = 0) {
+  constructor(type: ModifierType, upgradeCount: number, cost = 0) {
     this.type = type;
     this.upgradeCount = upgradeCount;
     this.cost = Math.min(Math.round(cost), Number.MAX_SAFE_INTEGER);
@@ -2532,19 +3708,28 @@ export class ModifierTypeOption {
 export function getPartyLuckValue(party: Pokemon[]): number {
   if (globalScene.gameMode.isDaily) {
     const DailyLuck = new NumberHolder(0);
-    globalScene.executeWithSeedOffset(() => {
-      DailyLuck.value = randSeedInt(15); // Random number between 0 and 14
-    }, 0, globalScene.seed);
+    globalScene.executeWithSeedOffset(
+      () => {
+        DailyLuck.value = randSeedInt(15); // Random number between 0 and 14
+      },
+      0,
+      globalScene.seed,
+    );
     return DailyLuck.value;
   }
-  const eventSpecies = globalScene.eventManager.getEventLuckBoostedSpecies();
-  const luck = Phaser.Math.Clamp(party.map(p => p.isAllowedInBattle() ? p.getLuck() + (eventSpecies.includes(p.species.speciesId) ? 1 : 0) : 0)
-    .reduce((total: number, value: number) => total += value, 0), 0, 14);
-  return Math.min(globalScene.eventManager.getEventLuckBoost() + (luck ?? 0), 14);
+  const eventSpecies = timedEventManager.getEventLuckBoostedSpecies();
+  const luck = Phaser.Math.Clamp(
+    party
+      .map(p => (p.isAllowedInBattle() ? p.getLuck() + (eventSpecies.includes(p.species.speciesId) ? 1 : 0) : 0))
+      .reduce((total: number, value: number) => (total += value), 0),
+    0,
+    14,
+  );
+  return Math.min(timedEventManager.getEventLuckBoost() + (luck ?? 0), 14);
 }
 
 export function getLuckString(luckValue: number): string {
-  return [ "D", "C", "C+", "B-", "B", "B+", "A-", "A", "A+", "A++", "S", "S+", "SS", "SS+", "SSS" ][luckValue];
+  return ["D", "C", "C+", "B-", "B", "B+", "A-", "A", "A+", "A++", "S", "S+", "SS", "SS+", "SSS"][luckValue];
 }
 
 export function getLuckTextTint(luckValue: number): number {
diff --git a/src/modifier/modifier.ts b/src/modifier/modifier.ts
index 041bf31853e..57e26ee5599 100644
--- a/src/modifier/modifier.ts
+++ b/src/modifier/modifier.ts
@@ -1,9 +1,9 @@
 import { FusionSpeciesFormEvolution, pokemonEvolutions } from "#app/data/balance/pokemon-evolutions";
 import { getBerryEffectFunc, getBerryPredicate } from "#app/data/berry";
 import { getLevelTotalExp } from "#app/data/exp";
-import { allMoves } from "#app/data/move";
+import { allMoves } from "#app/data/moves/move";
 import { MAX_PER_TYPE_POKEBALLS } from "#app/data/pokeball";
-import { type FormChangeItem, SpeciesFormChangeItemTrigger, SpeciesFormChangeLapseTeraTrigger, SpeciesFormChangeTeraTrigger } from "#app/data/pokemon-forms";
+import { type FormChangeItem, SpeciesFormChangeItemTrigger } from "#app/data/pokemon-forms";
 import { getStatusEffectHealText } from "#app/data/status-effect";
 import Pokemon, { type PlayerPokemon } from "#app/field/pokemon";
 import { getPokemonNameWithAffix } from "#app/messages";
@@ -12,11 +12,10 @@ import { EvolutionPhase } from "#app/phases/evolution-phase";
 import { LearnMovePhase, LearnMoveType } from "#app/phases/learn-move-phase";
 import { LevelUpPhase } from "#app/phases/level-up-phase";
 import { PokemonHealPhase } from "#app/phases/pokemon-heal-phase";
-import { achvs } from "#app/system/achv";
 import type { VoucherType } from "#app/system/voucher";
 import { Command } from "#app/ui/command-ui-handler";
 import { addTextObject, TextStyle } from "#app/ui/text";
-import { BooleanHolder, hslToHex, isNullOrUndefined, NumberHolder, toDmgValue } from "#app/utils";
+import { BooleanHolder, hslToHex, isNullOrUndefined, NumberHolder, toDmgValue } from "#app/utils/common";
 import { BattlerTagType } from "#enums/battler-tag-type";
 import { BerryType } from "#enums/berry-type";
 import type { Moves } from "#enums/moves";
@@ -25,12 +24,35 @@ import type { PokeballType } from "#enums/pokeball";
 import { Species } from "#enums/species";
 import { type PermanentStat, type TempBattleStat, BATTLE_STATS, Stat, TEMP_BATTLE_STATS } from "#enums/stat";
 import { StatusEffect } from "#enums/status-effect";
-import { Type } from "#enums/type";
+import { PokemonType } from "#enums/pokemon-type";
 import i18next from "i18next";
-import { type DoubleBattleChanceBoosterModifierType, type EvolutionItemModifierType, type FormChangeItemModifierType, type ModifierOverride, type ModifierType, type PokemonBaseStatTotalModifierType, type PokemonExpBoosterModifierType, type PokemonFriendshipBoosterModifierType, type PokemonMoveAccuracyBoosterModifierType, type PokemonMultiHitModifierType, type TerastallizeModifierType, type TmModifierType, getModifierType, ModifierPoolType, ModifierTypeGenerator, modifierTypes, PokemonHeldItemModifierType } from "./modifier-type";
+import {
+  type DoubleBattleChanceBoosterModifierType,
+  type EvolutionItemModifierType,
+  type FormChangeItemModifierType,
+  type ModifierOverride,
+  type ModifierType,
+  type PokemonBaseStatTotalModifierType,
+  type PokemonExpBoosterModifierType,
+  type PokemonFriendshipBoosterModifierType,
+  type PokemonMoveAccuracyBoosterModifierType,
+  type PokemonMultiHitModifierType,
+  type TerastallizeModifierType,
+  type TmModifierType,
+  getModifierType,
+  ModifierPoolType,
+  ModifierTypeGenerator,
+  modifierTypes,
+  PokemonHeldItemModifierType,
+} from "./modifier-type";
 import { Color, ShadowColor } from "#enums/color";
 import { FRIENDSHIP_GAIN_FROM_RARE_CANDY } from "#app/data/balance/starters";
-import { applyAbAttrs, CommanderAbAttr } from "#app/data/ability";
+import {
+  applyAbAttrs,
+  applyPostItemLostAbAttrs,
+  CommanderAbAttr,
+  PostItemLostAbAttr,
+} from "#app/data/abilities/ability";
 import { globalScene } from "#app/global-scene";
 
 export type ModifierPredicate = (modifier: Modifier) => boolean;
@@ -46,19 +68,19 @@ export const modifierSortFunc = (a: Modifier, b: Modifier): number => {
   //First sort by pokemonID
   if (aId < bId) {
     return 1;
-  } else if (aId > bId) {
+  }
+  if (aId > bId) {
     return -1;
-  } else if (aId === bId) {
+  }
+  if (aId === bId) {
     //Then sort by item type
     if (typeNameMatch === 0) {
       return itemNameMatch;
       //Finally sort by item name
-    } else {
-      return typeNameMatch;
     }
-  } else {
-    return 0;
+    return typeNameMatch;
   }
+  return 0;
 };
 
 export class ModifierBar extends Phaser.GameObjects.Container {
@@ -77,16 +99,20 @@ export class ModifierBar extends Phaser.GameObjects.Container {
    * @param {PersistentModifier[]} modifiers - The list of modifiers to be displayed in the {@linkcode ModifierBar}
    * @param {boolean} hideHeldItems - If set to "true", only modifiers not assigned to a Pokémon are displayed
    */
-  updateModifiers(modifiers: PersistentModifier[], hideHeldItems: boolean = false) {
+  updateModifiers(modifiers: PersistentModifier[], hideHeldItems = false) {
     this.removeAll(true);
 
     const visibleIconModifiers = modifiers.filter(m => m.isIconVisible());
-    const nonPokemonSpecificModifiers = visibleIconModifiers.filter(m => !(m as PokemonHeldItemModifier).pokemonId).sort(modifierSortFunc);
-    const pokemonSpecificModifiers = visibleIconModifiers.filter(m => (m as PokemonHeldItemModifier).pokemonId).sort(modifierSortFunc);
+    const nonPokemonSpecificModifiers = visibleIconModifiers
+      .filter(m => !(m as PokemonHeldItemModifier).pokemonId)
+      .sort(modifierSortFunc);
+    const pokemonSpecificModifiers = visibleIconModifiers
+      .filter(m => (m as PokemonHeldItemModifier).pokemonId)
+      .sort(modifierSortFunc);
 
-    const sortedVisibleIconModifiers = hideHeldItems ? nonPokemonSpecificModifiers : nonPokemonSpecificModifiers.concat(pokemonSpecificModifiers);
-
-    const thisArg = this;
+    const sortedVisibleIconModifiers = hideHeldItems
+      ? nonPokemonSpecificModifiers
+      : nonPokemonSpecificModifiers.concat(pokemonSpecificModifiers);
 
     sortedVisibleIconModifiers.forEach((modifier: PersistentModifier, i: number) => {
       const icon = modifier.getIcon();
@@ -99,13 +125,13 @@ export class ModifierBar extends Phaser.GameObjects.Container {
       icon.on("pointerover", () => {
         globalScene.ui.showTooltip(modifier.type.name, modifier.type.getDescription());
         if (this.modifierCache && this.modifierCache.length > iconOverflowIndex) {
-          thisArg.updateModifierOverflowVisibility(true);
+          this.updateModifierOverflowVisibility(true);
         }
       });
       icon.on("pointerout", () => {
         globalScene.ui.hideTooltip();
         if (this.modifierCache && this.modifierCache.length > iconOverflowIndex) {
-          thisArg.updateModifierOverflowVisibility(false);
+          this.updateModifierOverflowVisibility(false);
         }
       });
     });
@@ -125,9 +151,9 @@ export class ModifierBar extends Phaser.GameObjects.Container {
   }
 
   setModifierIconPosition(icon: Phaser.GameObjects.Container, modifierCount: number) {
-    const rowIcons: number = 12 + 6 * Math.max((Math.ceil(Math.min(modifierCount, 24) / 12) - 2), 0);
+    const rowIcons: number = 12 + 6 * Math.max(Math.ceil(Math.min(modifierCount, 24) / 12) - 2, 0);
 
-    const x = (this.getIndex(icon) % rowIcons) * 26 / (rowIcons / 12);
+    const x = ((this.getIndex(icon) % rowIcons) * 26) / (rowIcons / 12);
     const y = Math.floor(this.getIndex(icon) / rowIcons) * 20;
 
     icon.setPosition(this.player ? x : -x, y);
@@ -158,16 +184,16 @@ export abstract class Modifier {
    * Handles applying of {@linkcode Modifier}
    * @param args collection of all passed parameters
    */
-  abstract apply(...args: unknown[]): boolean | Promise<boolean>;
+  abstract apply(...args: unknown[]): boolean;
 }
 
 export abstract class PersistentModifier extends Modifier {
   public stackCount: number;
   public virtualStackCount: number;
 
-  constructor(type: ModifierType, stackCount?: number) {
+  constructor(type: ModifierType, stackCount = 1) {
     super(type);
-    this.stackCount = stackCount === undefined ? 1 : stackCount;
+    this.stackCount = stackCount;
     this.virtualStackCount = 0;
   }
 
@@ -211,11 +237,15 @@ export abstract class PersistentModifier extends Modifier {
 
   abstract getMaxStackCount(forThreshold?: boolean): number;
 
+  getCountUnderMax(): number {
+    return this.getMaxStackCount() - this.getStackCount();
+  }
+
   isIconVisible(): boolean {
     return true;
   }
 
-  getIcon(forSummary?: boolean): Phaser.GameObjects.Container {
+  getIcon(_forSummary?: boolean): Phaser.GameObjects.Container {
     const container = globalScene.add.container(0, 0);
 
     const item = globalScene.add.sprite(0, 12, "items");
@@ -253,10 +283,6 @@ export abstract class PersistentModifier extends Modifier {
 }
 
 export abstract class ConsumableModifier extends Modifier {
-  constructor(type: ModifierType) {
-    super(type);
-  }
-
   add(_modifiers: Modifier[]): boolean {
     return true;
   }
@@ -280,7 +306,10 @@ export class AddPokeballModifier extends ConsumableModifier {
    */
   override apply(): boolean {
     const pokeballCounts = globalScene.pokeballCounts;
-    pokeballCounts[this.pokeballType] = Math.min(pokeballCounts[this.pokeballType] + this.count, MAX_PER_TYPE_POKEBALLS);
+    pokeballCounts[this.pokeballType] = Math.min(
+      pokeballCounts[this.pokeballType] + this.count,
+      MAX_PER_TYPE_POKEBALLS,
+    );
 
     return true;
   }
@@ -418,7 +447,7 @@ export abstract class LapsingPersistentModifier extends PersistentModifier {
   }
 
   getArgs(): any[] {
-    return [ this.maxBattles, this.battleCount ];
+    return [this.maxBattles, this.battleCount];
   }
 
   getMaxStackCount(_forThreshold?: boolean): number {
@@ -436,16 +465,17 @@ export abstract class LapsingPersistentModifier extends PersistentModifier {
 export class DoubleBattleChanceBoosterModifier extends LapsingPersistentModifier {
   public override type: DoubleBattleChanceBoosterModifierType;
 
-  constructor(type: ModifierType, maxBattles:number, battleCount?: number, stackCount?: number) {
-    super(type, maxBattles, battleCount, stackCount);
-  }
-
   match(modifier: Modifier): boolean {
-    return (modifier instanceof DoubleBattleChanceBoosterModifier) && (modifier.getMaxBattles() === this.getMaxBattles());
+    return modifier instanceof DoubleBattleChanceBoosterModifier && modifier.getMaxBattles() === this.getMaxBattles();
   }
 
   clone(): DoubleBattleChanceBoosterModifier {
-    return new DoubleBattleChanceBoosterModifier(this.type, this.getMaxBattles(), this.getBattleCount(), this.stackCount);
+    return new DoubleBattleChanceBoosterModifier(
+      this.type,
+      this.getMaxBattles(),
+      this.getBattleCount(),
+      this.stackCount,
+    );
   }
 
   /**
@@ -481,23 +511,29 @@ export class TempStatStageBoosterModifier extends LapsingPersistentModifier {
     this.stat = stat;
     // Note that, because we want X Accuracy to maintain its original behavior,
     // it will increment as it did previously, directly to the stat stage.
-    this.boost = (stat !== Stat.ACC) ? 0.3 : 1;
+    this.boost = stat !== Stat.ACC ? 0.3 : 1;
   }
 
   match(modifier: Modifier): boolean {
     if (modifier instanceof TempStatStageBoosterModifier) {
       const modifierInstance = modifier as TempStatStageBoosterModifier;
-      return (modifierInstance.stat === this.stat);
+      return modifierInstance.stat === this.stat;
     }
     return false;
   }
 
   clone() {
-    return new TempStatStageBoosterModifier(this.type, this.stat, this.getMaxBattles(), this.getBattleCount(), this.stackCount);
+    return new TempStatStageBoosterModifier(
+      this.type,
+      this.stat,
+      this.getMaxBattles(),
+      this.getBattleCount(),
+      this.stackCount,
+    );
   }
 
   getArgs(): any[] {
-    return [ this.stat, ...super.getArgs() ];
+    return [this.stat, ...super.getArgs()];
   }
 
   /**
@@ -508,7 +544,9 @@ export class TempStatStageBoosterModifier extends LapsingPersistentModifier {
    * @returns `true` if the modifier can be applied, false otherwise
    */
   override shouldApply(tempBattleStat?: TempBattleStat, statLevel?: NumberHolder): boolean {
-    return !!tempBattleStat && !!statLevel && TEMP_BATTLE_STATS.includes(tempBattleStat) && (tempBattleStat === this.stat);
+    return (
+      !!tempBattleStat && !!statLevel && TEMP_BATTLE_STATS.includes(tempBattleStat) && tempBattleStat === this.stat
+    );
   }
 
   /**
@@ -529,16 +567,12 @@ export class TempStatStageBoosterModifier extends LapsingPersistentModifier {
  * @see {@linkcode apply}
  */
 export class TempCritBoosterModifier extends LapsingPersistentModifier {
-  constructor(type: ModifierType, maxBattles: number, battleCount?: number, stackCount?: number) {
-    super(type, maxBattles, battleCount, stackCount);
-  }
-
   clone() {
     return new TempCritBoosterModifier(this.type, this.getMaxBattles(), this.getBattleCount(), this.stackCount);
   }
 
   match(modifier: Modifier): boolean {
-    return (modifier instanceof TempCritBoosterModifier);
+    return modifier instanceof TempCritBoosterModifier;
   }
 
   /**
@@ -562,10 +596,6 @@ export class TempCritBoosterModifier extends LapsingPersistentModifier {
 }
 
 export class MapModifier extends PersistentModifier {
-  constructor(type: ModifierType, stackCount?: number) {
-    super(type, stackCount);
-  }
-
   clone(): MapModifier {
     return new MapModifier(this.type, this.stackCount);
   }
@@ -580,10 +610,6 @@ export class MapModifier extends PersistentModifier {
 }
 
 export class MegaEvolutionAccessModifier extends PersistentModifier {
-  constructor(type: ModifierType, stackCount?: number) {
-    super(type, stackCount);
-  }
-
   clone(): MegaEvolutionAccessModifier {
     return new MegaEvolutionAccessModifier(this.type, this.stackCount);
   }
@@ -598,10 +624,6 @@ export class MegaEvolutionAccessModifier extends PersistentModifier {
 }
 
 export class GigantamaxAccessModifier extends PersistentModifier {
-  constructor(type: ModifierType, stackCount?: number) {
-    super(type, stackCount);
-  }
-
   clone(): GigantamaxAccessModifier {
     return new GigantamaxAccessModifier(this.type, this.stackCount);
   }
@@ -621,10 +643,6 @@ export class GigantamaxAccessModifier extends PersistentModifier {
 }
 
 export class TerastallizeAccessModifier extends PersistentModifier {
-  constructor(type: ModifierType, stackCount?: number) {
-    super(type, stackCount);
-  }
-
   clone(): TerastallizeAccessModifier {
     return new TerastallizeAccessModifier(this.type, this.stackCount);
   }
@@ -644,8 +662,10 @@ export class TerastallizeAccessModifier extends PersistentModifier {
 }
 
 export abstract class PokemonHeldItemModifier extends PersistentModifier {
+  /** The ID of the {@linkcode Pokemon} that this item belongs to. */
   public pokemonId: number;
-  public isTransferable: boolean = true;
+  /** Whether this item can be transfered to or stolen by another Pokemon. */
+  public isTransferable = true;
 
   constructor(type: ModifierType, pokemonId: number, stackCount?: number) {
     super(type, stackCount);
@@ -660,7 +680,7 @@ export abstract class PokemonHeldItemModifier extends PersistentModifier {
   }
 
   getArgs(): any[] {
-    return [ this.pokemonId ];
+    return [this.pokemonId];
   }
 
   /**
@@ -681,7 +701,7 @@ export abstract class PokemonHeldItemModifier extends PersistentModifier {
   }
 
   isIconVisible(): boolean {
-    return !!(this.getPokemon()?.isOnField());
+    return !!this.getPokemon()?.isOnField();
   }
 
   getIcon(forSummary?: boolean): Phaser.GameObjects.Container {
@@ -690,7 +710,7 @@ export abstract class PokemonHeldItemModifier extends PersistentModifier {
     if (!forSummary) {
       const pokemon = this.getPokemon();
       if (pokemon) {
-        const pokemonIcon = globalScene.addPokemonIcon(pokemon, -2, 10, 0, 0.5);
+        const pokemonIcon = globalScene.addPokemonIcon(pokemon, -2, 10, 0, 0.5, undefined, true);
         container.add(pokemonIcon);
         container.setName(pokemon.id.toString());
       }
@@ -718,7 +738,7 @@ export abstract class PokemonHeldItemModifier extends PersistentModifier {
   }
 
   getPokemon(): Pokemon | undefined {
-    return this.pokemonId ? globalScene.getPokemonById(this.pokemonId) ?? undefined : undefined;
+    return this.pokemonId ? (globalScene.getPokemonById(this.pokemonId) ?? undefined) : undefined;
   }
 
   getScoreMultiplier(): number {
@@ -731,7 +751,10 @@ export abstract class PokemonHeldItemModifier extends PersistentModifier {
       return 0;
     }
     if (pokemon.isPlayer() && forThreshold) {
-      return globalScene.getPlayerParty().map(p => this.getMaxHeldItemCount(p)).reduce((stackCount: number, maxStackCount: number) => Math.max(stackCount, maxStackCount), 0);
+      return globalScene
+        .getPlayerParty()
+        .map(p => this.getMaxHeldItemCount(p))
+        .reduce((stackCount: number, maxStackCount: number) => Math.max(stackCount, maxStackCount), 0);
     }
     return this.getMaxHeldItemCount(pokemon);
   }
@@ -741,7 +764,7 @@ export abstract class PokemonHeldItemModifier extends PersistentModifier {
 
 export abstract class LapsingPokemonHeldItemModifier extends PokemonHeldItemModifier {
   protected battlesLeft: number;
-  public isTransferable: boolean = false;
+  public isTransferable = false;
 
   constructor(type: ModifierType, pokemonId: number, battlesLeft?: number, stackCount?: number) {
     super(type, pokemonId, stackCount);
@@ -767,7 +790,10 @@ export abstract class LapsingPokemonHeldItemModifier extends PokemonHeldItemModi
     const container = super.getIcon(forSummary);
 
     if (this.getPokemon()?.isPlayer()) {
-      const battleCountText = addTextObject(27, 0, this.battlesLeft.toString(), TextStyle.PARTY, { fontSize: "66px", color: Color.PINK });
+      const battleCountText = addTextObject(27, 0, this.battlesLeft.toString(), TextStyle.PARTY, {
+        fontSize: "66px",
+        color: Color.PINK,
+      });
       battleCountText.setShadow(0, 0);
       battleCountText.setStroke(ShadowColor.RED, 16);
       battleCountText.setOrigin(1, 0);
@@ -781,73 +807,7 @@ export abstract class LapsingPokemonHeldItemModifier extends PokemonHeldItemModi
     return this.battlesLeft;
   }
 
-  getMaxStackCount(forThreshold?: boolean): number {
-    return 1;
-  }
-}
-
-export class TerastallizeModifier extends LapsingPokemonHeldItemModifier {
-  public override type: TerastallizeModifierType;
-  public teraType: Type;
-  public isTransferable: boolean = false;
-
-  constructor(type: TerastallizeModifierType, pokemonId: number, teraType: Type, battlesLeft?: number, stackCount?: number) {
-    super(type, pokemonId, battlesLeft || 10, stackCount);
-
-    this.teraType = teraType;
-  }
-
-  matchType(modifier: Modifier): boolean {
-    if (modifier instanceof TerastallizeModifier && modifier.teraType === this.teraType) {
-      return true;
-    }
-    return false;
-  }
-
-  clone(): TerastallizeModifier {
-    return new TerastallizeModifier(this.type, this.pokemonId, this.teraType, this.battlesLeft, this.stackCount);
-  }
-
-  getArgs(): any[] {
-    return [ this.pokemonId, this.teraType, this.battlesLeft ];
-  }
-
-  /**
-   * Applies the {@linkcode TerastallizeModifier} to the specified {@linkcode Pokemon}.
-   * @param pokemon the {@linkcode Pokemon} to be terastallized
-   * @returns always `true`
-   */
-  override apply(pokemon: Pokemon): boolean {
-    if (pokemon.isPlayer()) {
-      globalScene.triggerPokemonFormChange(pokemon, SpeciesFormChangeTeraTrigger);
-      globalScene.validateAchv(achvs.TERASTALLIZE);
-      if (this.teraType === Type.STELLAR) {
-        globalScene.validateAchv(achvs.STELLAR_TERASTALLIZE);
-      }
-    }
-    pokemon.updateSpritePipelineData();
-    return true;
-  }
-
-  /**
-   * Triggers {@linkcode LapsingPokemonHeldItemModifier.lapse} and if it returns `0` a form change is triggered.
-   * @param pokemon THe {@linkcode Pokemon} to be terastallized
-   * @returns the result of {@linkcode LapsingPokemonHeldItemModifier.lapse}
-   */
-  public override lapse(pokemon: Pokemon): boolean {
-    const ret = super.lapse(pokemon);
-    if (!ret) {
-      globalScene.triggerPokemonFormChange(pokemon, SpeciesFormChangeLapseTeraTrigger);
-      pokemon.updateSpritePipelineData();
-    }
-    return ret;
-  }
-
-  getScoreMultiplier(): number {
-    return 1.25;
-  }
-
-  getMaxHeldItemCount(pokemon: Pokemon): number {
+  getMaxStackCount(_forThreshold?: boolean): number {
     return 1;
   }
 }
@@ -860,7 +820,7 @@ export class TerastallizeModifier extends LapsingPokemonHeldItemModifier {
  */
 export class BaseStatModifier extends PokemonHeldItemModifier {
   protected stat: PermanentStat;
-  public isTransferable: boolean = false;
+  public isTransferable = false;
 
   constructor(type: ModifierType, pokemonId: number, stat: PermanentStat, stackCount?: number) {
     super(type, pokemonId, stackCount);
@@ -915,7 +875,7 @@ export class BaseStatModifier extends PokemonHeldItemModifier {
 export class EvoTrackerModifier extends PokemonHeldItemModifier {
   protected species: Species;
   protected required: number;
-  public isTransferable: boolean = false;
+  public isTransferable = false;
 
   constructor(type: ModifierType, pokemonId: number, species: Species, required: number, stackCount?: number) {
     super(type, pokemonId, stackCount);
@@ -924,7 +884,9 @@ export class EvoTrackerModifier extends PokemonHeldItemModifier {
   }
 
   matchType(modifier: Modifier): boolean {
-    return modifier instanceof EvoTrackerModifier && modifier.species === this.species && modifier.required === this.required;
+    return (
+      modifier instanceof EvoTrackerModifier && modifier.species === this.species && modifier.required === this.required
+    );
   }
 
   clone(): PersistentModifier {
@@ -932,7 +894,7 @@ export class EvoTrackerModifier extends PokemonHeldItemModifier {
   }
 
   getArgs(): any[] {
-    return super.getArgs().concat([ this.species, this.required ]);
+    return super.getArgs().concat([this.species, this.required]);
   }
 
   /**
@@ -951,8 +913,14 @@ export class EvoTrackerModifier extends PokemonHeldItemModifier {
     const pokemon = globalScene.getPokemonById(this.pokemonId);
 
     this.stackCount = pokemon
-      ? pokemon.evoCounter + pokemon.getHeldItems().filter(m => m instanceof DamageMoneyRewardModifier).length
-        + globalScene.findModifiers(m => m instanceof MoneyMultiplierModifier || m instanceof ExtraModifierModifier || m instanceof TempExtraModifierModifier).length
+      ? pokemon.evoCounter +
+        pokemon.getHeldItems().filter(m => m instanceof DamageMoneyRewardModifier).length +
+        globalScene.findModifiers(
+          m =>
+            m instanceof MoneyMultiplierModifier ||
+            m instanceof ExtraModifierModifier ||
+            m instanceof TempExtraModifierModifier,
+        ).length
       : this.stackCount;
 
     const text = globalScene.add.bitmapText(10, 15, "item-count", this.stackCount.toString(), 11);
@@ -966,8 +934,15 @@ export class EvoTrackerModifier extends PokemonHeldItemModifier {
   }
 
   getMaxHeldItemCount(pokemon: Pokemon): number {
-    this.stackCount = pokemon.evoCounter + pokemon.getHeldItems().filter(m => m instanceof DamageMoneyRewardModifier).length
-      + globalScene.findModifiers(m => m instanceof MoneyMultiplierModifier || m instanceof ExtraModifierModifier || m instanceof TempExtraModifierModifier).length;
+    this.stackCount =
+      pokemon.evoCounter +
+      pokemon.getHeldItems().filter(m => m instanceof DamageMoneyRewardModifier).length +
+      globalScene.findModifiers(
+        m =>
+          m instanceof MoneyMultiplierModifier ||
+          m instanceof ExtraModifierModifier ||
+          m instanceof TempExtraModifierModifier,
+      ).length;
     return 999;
   }
 }
@@ -977,7 +952,7 @@ export class EvoTrackerModifier extends PokemonHeldItemModifier {
  */
 export class PokemonBaseStatTotalModifier extends PokemonHeldItemModifier {
   public override type: PokemonBaseStatTotalModifierType;
-  public isTransferable: boolean = false;
+  public isTransferable = false;
 
   private statModifier: number;
 
@@ -1029,7 +1004,7 @@ export class PokemonBaseStatTotalModifier extends PokemonHeldItemModifier {
     return 1.2;
   }
 
-  override getMaxHeldItemCount(pokemon: Pokemon): number {
+  override getMaxHeldItemCount(_pokemon: Pokemon): number {
     return 2;
   }
 }
@@ -1040,9 +1015,9 @@ export class PokemonBaseStatTotalModifier extends PokemonHeldItemModifier {
 export class PokemonBaseStatFlatModifier extends PokemonHeldItemModifier {
   private statModifier: number;
   private stats: Stat[];
-  public isTransferable: boolean = false;
+  public isTransferable = false;
 
-  constructor (type: ModifierType, pokemonId: number, statModifier: number, stats: Stat[], stackCount?: number) {
+  constructor(type: ModifierType, pokemonId: number, statModifier: number, stats: Stat[], stackCount?: number) {
     super(type, pokemonId, stackCount);
 
     this.statModifier = statModifier;
@@ -1050,7 +1025,11 @@ export class PokemonBaseStatFlatModifier extends PokemonHeldItemModifier {
   }
 
   override matchType(modifier: Modifier): boolean {
-    return modifier instanceof PokemonBaseStatFlatModifier && modifier.statModifier === this.statModifier && this.stats.every(s => modifier.stats.some(stat => s === stat));
+    return (
+      modifier instanceof PokemonBaseStatFlatModifier &&
+      modifier.statModifier === this.statModifier &&
+      this.stats.every(s => modifier.stats.some(stat => s === stat))
+    );
   }
 
   override clone(): PersistentModifier {
@@ -1058,7 +1037,7 @@ export class PokemonBaseStatFlatModifier extends PokemonHeldItemModifier {
   }
 
   override getArgs(): any[] {
-    return [ ...super.getArgs(), this.statModifier, this.stats ];
+    return [...super.getArgs(), this.statModifier, this.stats];
   }
 
   /**
@@ -1093,7 +1072,7 @@ export class PokemonBaseStatFlatModifier extends PokemonHeldItemModifier {
     return 1.1;
   }
 
-  override getMaxHeldItemCount(pokemon: Pokemon): number {
+  override getMaxHeldItemCount(_pokemon: Pokemon): number {
     return 1;
   }
 }
@@ -1102,11 +1081,7 @@ export class PokemonBaseStatFlatModifier extends PokemonHeldItemModifier {
  * Currently used by Macho Brace item
  */
 export class PokemonIncrementingStatModifier extends PokemonHeldItemModifier {
-  public isTransferable: boolean = false;
-
-  constructor (type: ModifierType, pokemonId: number, stackCount?: number) {
-    super(type, pokemonId, stackCount);
-  }
+  public isTransferable = false;
 
   matchType(modifier: Modifier): boolean {
     return modifier instanceof PokemonIncrementingStatModifier;
@@ -1139,20 +1114,20 @@ export class PokemonIncrementingStatModifier extends PokemonHeldItemModifier {
    * @returns always `true`
    */
   override apply(_pokemon: Pokemon, stat: Stat, statHolder: NumberHolder): boolean {
-    // Modifies the passed in stat number holder by +1 per stack for HP, +2 per stack for other stats
-    // If the Macho Brace is at max stacks (50), adds additional 5% to total HP and 10% to other stats
+    // Modifies the passed in stat number holder by +2 per stack for HP, +1 per stack for other stats
+    // If the Macho Brace is at max stacks (50), adds additional 10% to total HP and 5% to other stats
     const isHp = stat === Stat.HP;
 
     if (isHp) {
-      statHolder.value += this.stackCount;
-      if (this.stackCount === this.getMaxHeldItemCount()) {
-        statHolder.value = Math.floor(statHolder.value * 1.05);
-      }
-    } else {
       statHolder.value += 2 * this.stackCount;
       if (this.stackCount === this.getMaxHeldItemCount()) {
         statHolder.value = Math.floor(statHolder.value * 1.1);
       }
+    } else {
+      statHolder.value += this.stackCount;
+      if (this.stackCount === this.getMaxHeldItemCount()) {
+        statHolder.value = Math.floor(statHolder.value * 1.05);
+      }
     }
 
     return true;
@@ -1162,7 +1137,7 @@ export class PokemonIncrementingStatModifier extends PokemonHeldItemModifier {
     return 1.2;
   }
 
-  getMaxHeldItemCount(pokemon?: Pokemon): number {
+  getMaxHeldItemCount(_pokemon?: Pokemon): number {
     return 50;
   }
 }
@@ -1191,13 +1166,13 @@ export class StatBoosterModifier extends PokemonHeldItemModifier {
   }
 
   getArgs(): any[] {
-    return [ ...super.getArgs(), this.stats, this.multiplier ];
+    return [...super.getArgs(), this.stats, this.multiplier];
   }
 
   matchType(modifier: Modifier): boolean {
     if (modifier instanceof StatBoosterModifier) {
       const modifierInstance = modifier as StatBoosterModifier;
-      if ((modifierInstance.multiplier === this.multiplier) && (modifierInstance.stats.length === this.stats.length)) {
+      if (modifierInstance.multiplier === this.multiplier && modifierInstance.stats.length === this.stats.length) {
         return modifierInstance.stats.every((e, i) => e === this.stats[i]);
       }
     }
@@ -1277,11 +1252,12 @@ export class EvolutionStatBoosterModifier extends StatBoosterModifier {
   override apply(pokemon: Pokemon, stat: Stat, statValue: NumberHolder): boolean {
     const isUnevolved = pokemon.getSpeciesForm(true).speciesId in pokemonEvolutions;
 
-    if (pokemon.isFusion() && (pokemon.getFusionSpeciesForm(true).speciesId in pokemonEvolutions) !== isUnevolved) {
+    if (pokemon.isFusion() && pokemon.getFusionSpeciesForm(true).speciesId in pokemonEvolutions !== isUnevolved) {
       // Half boost applied if pokemon is fused and either part of fusion is fully evolved
       statValue.value *= 1 + (this.multiplier - 1) / 2;
       return true;
-    } else if (isUnevolved) {
+    }
+    if (isUnevolved) {
       // Full boost applied if holder is unfused and unevolved or, if fused, both parts of fusion are unevolved
       return super.apply(pokemon, stat, statValue);
     }
@@ -1300,18 +1276,32 @@ export class SpeciesStatBoosterModifier extends StatBoosterModifier {
   /** The species that the held item's stat boost(s) apply to */
   private species: Species[];
 
-  constructor(type: ModifierType, pokemonId: number, stats: Stat[], multiplier: number, species: Species[], stackCount?: number) {
+  constructor(
+    type: ModifierType,
+    pokemonId: number,
+    stats: Stat[],
+    multiplier: number,
+    species: Species[],
+    stackCount?: number,
+  ) {
     super(type, pokemonId, stats, multiplier, stackCount);
 
     this.species = species;
   }
 
   clone() {
-    return new SpeciesStatBoosterModifier(this.type, this.pokemonId, this.stats, this.multiplier, this.species, this.stackCount);
+    return new SpeciesStatBoosterModifier(
+      this.type,
+      this.pokemonId,
+      this.stats,
+      this.multiplier,
+      this.species,
+      this.stackCount,
+    );
   }
 
   getArgs(): any[] {
-    return [ ...super.getArgs(), this.species ];
+    return [...super.getArgs(), this.species];
   }
 
   matchType(modifier: Modifier): boolean {
@@ -1334,7 +1324,11 @@ export class SpeciesStatBoosterModifier extends StatBoosterModifier {
    * @returns `true` if the stat could be boosted, false otherwise
    */
   override shouldApply(pokemon: Pokemon, stat: Stat, statValue: NumberHolder): boolean {
-    return super.shouldApply(pokemon, stat, statValue) && (this.species.includes(pokemon.getSpeciesForm(true).speciesId) || (pokemon.isFusion() && this.species.includes(pokemon.getFusionSpeciesForm(true).speciesId)));
+    return (
+      super.shouldApply(pokemon, stat, statValue) &&
+      (this.species.includes(pokemon.getSpeciesForm(true).speciesId) ||
+        (pokemon.isFusion() && this.species.includes(pokemon.getFusionSpeciesForm(true).speciesId)))
+    );
   }
 
   /**
@@ -1412,11 +1406,17 @@ export class SpeciesCritBoosterModifier extends CritBoosterModifier {
   }
 
   clone() {
-    return new SpeciesCritBoosterModifier(this.type, this.pokemonId, this.stageIncrement, this.species, this.stackCount);
+    return new SpeciesCritBoosterModifier(
+      this.type,
+      this.pokemonId,
+      this.stageIncrement,
+      this.species,
+      this.stackCount,
+    );
   }
 
   getArgs(): any[] {
-    return [ ...super.getArgs(), this.species ];
+    return [...super.getArgs(), this.species];
   }
 
   matchType(modifier: Modifier): boolean {
@@ -1431,7 +1431,11 @@ export class SpeciesCritBoosterModifier extends CritBoosterModifier {
    * @returns `true` if the critical-hit level can be incremented, false otherwise
    */
   override shouldApply(pokemon: Pokemon, critStage: NumberHolder): boolean {
-    return super.shouldApply(pokemon, critStage) && (this.species.includes(pokemon.getSpeciesForm(true).speciesId) || (pokemon.isFusion() && this.species.includes(pokemon.getFusionSpeciesForm(true).speciesId)));
+    return (
+      super.shouldApply(pokemon, critStage) &&
+      (this.species.includes(pokemon.getSpeciesForm(true).speciesId) ||
+        (pokemon.isFusion() && this.species.includes(pokemon.getFusionSpeciesForm(true).speciesId)))
+    );
   }
 }
 
@@ -1439,10 +1443,10 @@ export class SpeciesCritBoosterModifier extends CritBoosterModifier {
  * Applies Specific Type item boosts (e.g., Magnet)
  */
 export class AttackTypeBoosterModifier extends PokemonHeldItemModifier {
-  public moveType: Type;
+  public moveType: PokemonType;
   private boostMultiplier: number;
 
-  constructor(type: ModifierType, pokemonId: number, moveType: Type, boostPercent: number, stackCount?: number) {
+  constructor(type: ModifierType, pokemonId: number, moveType: PokemonType, boostPercent: number, stackCount?: number) {
     super(type, pokemonId, stackCount);
 
     this.moveType = moveType;
@@ -1452,41 +1456,57 @@ export class AttackTypeBoosterModifier extends PokemonHeldItemModifier {
   matchType(modifier: Modifier): boolean {
     if (modifier instanceof AttackTypeBoosterModifier) {
       const attackTypeBoosterModifier = modifier as AttackTypeBoosterModifier;
-      return attackTypeBoosterModifier.moveType === this.moveType && attackTypeBoosterModifier.boostMultiplier === this.boostMultiplier;
+      return (
+        attackTypeBoosterModifier.moveType === this.moveType &&
+        attackTypeBoosterModifier.boostMultiplier === this.boostMultiplier
+      );
     }
 
     return false;
   }
 
   clone() {
-    return new AttackTypeBoosterModifier(this.type, this.pokemonId, this.moveType, this.boostMultiplier * 100, this.stackCount);
+    return new AttackTypeBoosterModifier(
+      this.type,
+      this.pokemonId,
+      this.moveType,
+      this.boostMultiplier * 100,
+      this.stackCount,
+    );
   }
 
   getArgs(): any[] {
-    return super.getArgs().concat([ this.moveType, this.boostMultiplier * 100 ]);
+    return super.getArgs().concat([this.moveType, this.boostMultiplier * 100]);
   }
 
   /**
    * Checks if {@linkcode AttackTypeBoosterModifier} should be applied
    * @param pokemon the {@linkcode Pokemon} that holds the held item
-   * @param moveType the {@linkcode Type} of the move being used
+   * @param moveType the {@linkcode PokemonType} of the move being used
    * @param movePower the {@linkcode NumberHolder} that holds the power of the move
    * @returns `true` if boosts should be applied to the move.
    */
-  override shouldApply(pokemon?: Pokemon, moveType?: Type, movePower?: NumberHolder): boolean {
-    return super.shouldApply(pokemon, moveType, movePower) && typeof moveType === "number" && movePower instanceof NumberHolder;
+  override shouldApply(pokemon?: Pokemon, moveType?: PokemonType, movePower?: NumberHolder): boolean {
+    return (
+      super.shouldApply(pokemon, moveType, movePower) &&
+      typeof moveType === "number" &&
+      movePower instanceof NumberHolder &&
+      this.moveType === moveType
+    );
   }
 
   /**
    * Applies {@linkcode AttackTypeBoosterModifier}
    * @param pokemon {@linkcode Pokemon} that holds the held item
-   * @param moveType {@linkcode Type} of the move being used
+   * @param moveType {@linkcode PokemonType} of the move being used
    * @param movePower {@linkcode NumberHolder} that holds the power of the move
    * @returns `true` if boosts have been applied to the move.
    */
-  override apply(_pokemon: Pokemon, moveType: Type, movePower: NumberHolder): boolean {
+  override apply(_pokemon: Pokemon, moveType: PokemonType, movePower: NumberHolder): boolean {
     if (moveType === this.moveType && movePower.value >= 1) {
-      (movePower as NumberHolder).value = Math.floor((movePower as NumberHolder).value * (1 + (this.getStackCount() * this.boostMultiplier)));
+      (movePower as NumberHolder).value = Math.floor(
+        (movePower as NumberHolder).value * (1 + this.getStackCount() * this.boostMultiplier),
+      );
       return true;
     }
 
@@ -1497,16 +1517,12 @@ export class AttackTypeBoosterModifier extends PokemonHeldItemModifier {
     return 1.2;
   }
 
-  getMaxHeldItemCount(pokemon: Pokemon): number {
+  getMaxHeldItemCount(_pokemon: Pokemon): number {
     return 99;
   }
 }
 
 export class SurviveDamageModifier extends PokemonHeldItemModifier {
-  constructor(type: ModifierType, pokemonId: number, stackCount?: number) {
-    super(type, pokemonId, stackCount);
-  }
-
   matchType(modifier: Modifier): boolean {
     return modifier instanceof SurviveDamageModifier;
   }
@@ -1532,26 +1548,27 @@ export class SurviveDamageModifier extends PokemonHeldItemModifier {
    * @returns `true` if the survive damage has been applied
    */
   override apply(pokemon: Pokemon, surviveDamage: BooleanHolder): boolean {
-    if (!surviveDamage.value && pokemon.randSeedInt(10) < this.getStackCount()) {
+    if (!surviveDamage.value && pokemon.randBattleSeedInt(10) < this.getStackCount()) {
       surviveDamage.value = true;
 
-      globalScene.queueMessage(i18next.t("modifier:surviveDamageApply", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), typeName: this.type.name }));
+      globalScene.queueMessage(
+        i18next.t("modifier:surviveDamageApply", {
+          pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
+          typeName: this.type.name,
+        }),
+      );
       return true;
     }
 
     return false;
   }
 
-  getMaxHeldItemCount(pokemon: Pokemon): number {
+  getMaxHeldItemCount(_pokemon: Pokemon): number {
     return 5;
   }
 }
 
 export class BypassSpeedChanceModifier extends PokemonHeldItemModifier {
-  constructor(type: ModifierType, pokemonId: number, stackCount?: number) {
-    super(type, pokemonId, stackCount);
-  }
-
   matchType(modifier: Modifier) {
     return modifier instanceof BypassSpeedChanceModifier;
   }
@@ -1577,13 +1594,19 @@ export class BypassSpeedChanceModifier extends PokemonHeldItemModifier {
    * @returns `true` if {@linkcode BypassSpeedChanceModifier} has been applied
    */
   override apply(pokemon: Pokemon, doBypassSpeed: BooleanHolder): boolean {
-    if (!doBypassSpeed.value && pokemon.randSeedInt(10) < this.getStackCount()) {
+    if (!doBypassSpeed.value && pokemon.randBattleSeedInt(10) < this.getStackCount()) {
       doBypassSpeed.value = true;
-      const isCommandFight = globalScene.currentBattle.turnCommands[pokemon.getBattlerIndex()]?.command === Command.FIGHT;
+      const isCommandFight =
+        globalScene.currentBattle.turnCommands[pokemon.getBattlerIndex()]?.command === Command.FIGHT;
       const hasQuickClaw = this.type instanceof PokemonHeldItemModifierType && this.type.id === "QUICK_CLAW";
 
       if (isCommandFight && hasQuickClaw) {
-        globalScene.queueMessage(i18next.t("modifier:bypassSpeedChanceApply", { pokemonName: getPokemonNameWithAffix(pokemon), itemName: i18next.t("modifierType:ModifierType.QUICK_CLAW.name") }));
+        globalScene.queueMessage(
+          i18next.t("modifier:bypassSpeedChanceApply", {
+            pokemonName: getPokemonNameWithAffix(pokemon),
+            itemName: i18next.t("modifierType:ModifierType.QUICK_CLAW.name"),
+          }),
+        );
       }
       return true;
     }
@@ -1591,7 +1614,7 @@ export class BypassSpeedChanceModifier extends PokemonHeldItemModifier {
     return false;
   }
 
-  getMaxHeldItemCount(pokemon: Pokemon): number {
+  getMaxHeldItemCount(_pokemon: Pokemon): number {
     return 3;
   }
 }
@@ -1627,14 +1650,15 @@ export class FlinchChanceModifier extends PokemonHeldItemModifier {
   }
 
   /**
-   * Applies {@linkcode FlinchChanceModifier}
-   * @param pokemon the {@linkcode Pokemon} that holds the item
-   * @param flinched {@linkcode BooleanHolder} that is `true` if the pokemon flinched
-   * @returns `true` if {@linkcode FlinchChanceModifier} has been applied
+   * Applies {@linkcode FlinchChanceModifier} to randomly flinch targets hit.
+   * @param pokemon - The {@linkcode Pokemon} that holds the item
+   * @param flinched - A {@linkcode BooleanHolder} holding whether the pokemon has flinched
+   * @returns `true` if {@linkcode FlinchChanceModifier} was applied successfully
    */
   override apply(pokemon: Pokemon, flinched: BooleanHolder): boolean {
-    // The check for pokemon.battleSummonData is to ensure that a crash doesn't occur when a Pokemon with King's Rock procs a flinch
-    if (pokemon.battleSummonData && !flinched.value && pokemon.randSeedInt(100) < (this.getStackCount() * this.chance)) {
+    // The check for pokemon.summonData is to ensure that a crash doesn't occur when a Pokemon with King's Rock procs a flinch
+    // TODO: Since summonData is always defined now, we can probably remove this
+    if (pokemon.summonData && !flinched.value && pokemon.randBattleSeedInt(100) < this.getStackCount() * this.chance) {
       flinched.value = true;
       return true;
     }
@@ -1648,10 +1672,6 @@ export class FlinchChanceModifier extends PokemonHeldItemModifier {
 }
 
 export class TurnHealModifier extends PokemonHeldItemModifier {
-  constructor(type: ModifierType, pokemonId: number, stackCount?: number) {
-    super(type, pokemonId, stackCount);
-  }
-
   matchType(modifier: Modifier) {
     return modifier instanceof TurnHealModifier;
   }
@@ -1667,15 +1687,24 @@ export class TurnHealModifier extends PokemonHeldItemModifier {
    */
   override apply(pokemon: Pokemon): boolean {
     if (!pokemon.isFullHp()) {
-      globalScene.unshiftPhase(new PokemonHealPhase(pokemon.getBattlerIndex(),
-        toDmgValue(pokemon.getMaxHp() / 16) * this.stackCount, i18next.t("modifier:turnHealApply", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), typeName: this.type.name }), true));
+      globalScene.unshiftPhase(
+        new PokemonHealPhase(
+          pokemon.getBattlerIndex(),
+          toDmgValue(pokemon.getMaxHp() / 16) * this.stackCount,
+          i18next.t("modifier:turnHealApply", {
+            pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
+            typeName: this.type.name,
+          }),
+          true,
+        ),
+      );
       return true;
     }
 
     return false;
   }
 
-  getMaxHeldItemCount(pokemon: Pokemon): number {
+  getMaxHeldItemCount(_pokemon: Pokemon): number {
     return 4;
   }
 }
@@ -1690,7 +1719,7 @@ export class TurnStatusEffectModifier extends PokemonHeldItemModifier {
   /** The status effect to be applied by the held item */
   private effect: StatusEffect;
 
-  constructor (type: ModifierType, pokemonId: number, stackCount?: number) {
+  constructor(type: ModifierType, pokemonId: number, stackCount?: number) {
     super(type, pokemonId, stackCount);
 
     switch (type.id) {
@@ -1730,7 +1759,7 @@ export class TurnStatusEffectModifier extends PokemonHeldItemModifier {
     return pokemon.trySetStatus(this.effect, true, undefined, undefined, this.type.name);
   }
 
-  getMaxHeldItemCount(pokemon: Pokemon): number {
+  getMaxHeldItemCount(_pokemon: Pokemon): number {
     return 1;
   }
 
@@ -1740,10 +1769,6 @@ export class TurnStatusEffectModifier extends PokemonHeldItemModifier {
 }
 
 export class HitHealModifier extends PokemonHeldItemModifier {
-  constructor(type: ModifierType, pokemonId: number, stackCount?: number) {
-    super(type, pokemonId, stackCount);
-  }
-
   matchType(modifier: Modifier) {
     return modifier instanceof HitHealModifier;
   }
@@ -1759,23 +1784,29 @@ export class HitHealModifier extends PokemonHeldItemModifier {
    */
   override apply(pokemon: Pokemon): boolean {
     if (pokemon.turnData.totalDamageDealt && !pokemon.isFullHp()) {
-      globalScene.unshiftPhase(new PokemonHealPhase(pokemon.getBattlerIndex(),
-        toDmgValue(pokemon.turnData.totalDamageDealt / 8) * this.stackCount, i18next.t("modifier:hitHealApply", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), typeName: this.type.name }), true));
+      // TODO: this shouldn't be undefined AFAIK
+      globalScene.unshiftPhase(
+        new PokemonHealPhase(
+          pokemon.getBattlerIndex(),
+          toDmgValue(pokemon.turnData.totalDamageDealt / 8) * this.stackCount,
+          i18next.t("modifier:hitHealApply", {
+            pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
+            typeName: this.type.name,
+          }),
+          true,
+        ),
+      );
     }
 
     return true;
   }
 
-  getMaxHeldItemCount(pokemon: Pokemon): number {
+  getMaxHeldItemCount(_pokemon: Pokemon): number {
     return 4;
   }
 }
 
 export class LevelIncrementBoosterModifier extends PersistentModifier {
-  constructor(type: ModifierType, stackCount?: number) {
-    super(type, stackCount);
-  }
-
   match(modifier: Modifier) {
     return modifier instanceof LevelIncrementBoosterModifier;
   }
@@ -1804,23 +1835,23 @@ export class LevelIncrementBoosterModifier extends PersistentModifier {
     return true;
   }
 
-  getMaxStackCount(forThreshold?: boolean): number {
+  getMaxStackCount(_forThreshold?: boolean): number {
     return 99;
   }
 }
 
-const berryNaturalGiftMap: { [key in BerryType]: { power: number; type: Type } } = {
-  [BerryType.SITRUS]: { power: 80, type: Type.PSYCHIC },
-  [BerryType.LUM]: { power: 80, type: Type.FLYING },
-  [BerryType.ENIGMA]: { power: 100, type: Type.BUG },
-  [BerryType.LIECHI]: { power: 100, type: Type.GRASS },
-  [BerryType.GANLON]: { power: 100, type: Type.ICE },
-  [BerryType.PETAYA]: { power: 100, type: Type.POISON },
-  [BerryType.APICOT]: { power: 100, type: Type.GROUND },
-  [BerryType.SALAC]: { power: 100, type: Type.FIGHTING },
-  [BerryType.LANSAT]: { power: 100, type: Type.FLYING },
-  [BerryType.STARF]: { power: 100, type: Type.PSYCHIC },
-  [BerryType.LEPPA]: { power: 80, type: Type.FIGHTING },
+const berryNaturalGiftMap: { [key in BerryType]: { power: number; type: PokemonType } } = {
+  [BerryType.SITRUS]: { power: 80, type: PokemonType.PSYCHIC },
+  [BerryType.LUM]: { power: 80, type: PokemonType.FLYING },
+  [BerryType.ENIGMA]: { power: 100, type: PokemonType.BUG },
+  [BerryType.LIECHI]: { power: 100, type: PokemonType.GRASS },
+  [BerryType.GANLON]: { power: 100, type: PokemonType.ICE },
+  [BerryType.PETAYA]: { power: 100, type: PokemonType.POISON },
+  [BerryType.APICOT]: { power: 100, type: PokemonType.GROUND },
+  [BerryType.SALAC]: { power: 100, type: PokemonType.FIGHTING },
+  [BerryType.LANSAT]: { power: 100, type: PokemonType.FLYING },
+  [BerryType.STARF]: { power: 100, type: PokemonType.PSYCHIC },
+  [BerryType.LEPPA]: { power: 80, type: PokemonType.FIGHTING },
 };
 
 export class BerryModifier extends PokemonHeldItemModifier {
@@ -1863,17 +1894,21 @@ export class BerryModifier extends PokemonHeldItemModifier {
   override apply(pokemon: Pokemon): boolean {
     const preserve = new BooleanHolder(false);
     globalScene.applyModifiers(PreserveBerryModifier, pokemon.isPlayer(), pokemon, preserve);
+    this.consumed = !preserve.value;
 
+    // munch the berry and trigger unburden-like effects
     getBerryEffectFunc(this.berryType)(pokemon);
-    if (!preserve.value) {
-      this.consumed = true;
-    }
+    applyPostItemLostAbAttrs(PostItemLostAbAttr, pokemon, false);
+
+    // Update berry eaten trackers for Belch, Harvest, Cud Chew, etc.
+    // Don't recover it if we proc berry pouch (no item duplication)
+    pokemon.recordEatenBerry(this.berryType, this.consumed);
 
     return true;
   }
 
-  getMaxHeldItemCount(pokemon: Pokemon): number {
-    if ([ BerryType.LUM, BerryType.LEPPA, BerryType.SITRUS, BerryType.ENIGMA ].includes(this.berryType)) {
+  getMaxHeldItemCount(_pokemon: Pokemon): number {
+    if ([BerryType.LUM, BerryType.LEPPA, BerryType.SITRUS, BerryType.ENIGMA].includes(this.berryType)) {
       return 2;
     }
     return 3;
@@ -1883,16 +1918,12 @@ export class BerryModifier extends PokemonHeldItemModifier {
     return berryNaturalGiftMap[this.berryType].power ?? 0;
   }
 
-  getNaturalGiftType(): Type {
+  getNaturalGiftType(): PokemonType {
     return berryNaturalGiftMap[this.berryType].type ?? null;
   }
 }
 
 export class PreserveBerryModifier extends PersistentModifier {
-  constructor(type: ModifierType, stackCount?: number) {
-    super(type, stackCount);
-  }
-
   match(modifier: Modifier) {
     return modifier instanceof PreserveBerryModifier;
   }
@@ -1918,9 +1949,7 @@ export class PreserveBerryModifier extends PersistentModifier {
    * @returns always `true`
    */
   override apply(pokemon: Pokemon, doPreserve: BooleanHolder): boolean {
-    if (!doPreserve.value) {
-      doPreserve.value = pokemon.randSeedInt(10) < this.getStackCount() * 3;
-    }
+    doPreserve.value ||= pokemon.randBattleSeedInt(10) < this.getStackCount() * 3;
 
     return true;
   }
@@ -1931,10 +1960,6 @@ export class PreserveBerryModifier extends PersistentModifier {
 }
 
 export class PokemonInstantReviveModifier extends PokemonHeldItemModifier {
-  constructor(type: ModifierType, pokemonId: number, stackCount?: number) {
-    super(type, pokemonId, stackCount);
-  }
-
   matchType(modifier: Modifier) {
     return modifier instanceof PokemonInstantReviveModifier;
   }
@@ -1950,19 +1975,32 @@ export class PokemonInstantReviveModifier extends PokemonHeldItemModifier {
    */
   override apply(pokemon: Pokemon): boolean {
     // Restore the Pokemon to half HP
-    globalScene.unshiftPhase(new PokemonHealPhase(pokemon.getBattlerIndex(),
-      toDmgValue(pokemon.getMaxHp() / 2), i18next.t("modifier:pokemonInstantReviveApply", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), typeName: this.type.name }), false, false, true));
+    globalScene.unshiftPhase(
+      new PokemonHealPhase(
+        pokemon.getBattlerIndex(),
+        toDmgValue(pokemon.getMaxHp() / 2),
+        i18next.t("modifier:pokemonInstantReviveApply", {
+          pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
+          typeName: this.type.name,
+        }),
+        false,
+        false,
+        true,
+      ),
+    );
 
     // Remove the Pokemon's FAINT status
-    pokemon.resetStatus(true, false, true);
+    pokemon.resetStatus(true, false, true, false);
 
     // Reapply Commander on the Pokemon's side of the field, if applicable
     const field = pokemon.isPlayer() ? globalScene.getPlayerField() : globalScene.getEnemyField();
-    field.forEach((p) => applyAbAttrs(CommanderAbAttr, p, null, false));
+    for (const p of field) {
+      applyAbAttrs(CommanderAbAttr, p, null, false);
+    }
     return true;
   }
 
-  getMaxHeldItemCount(pokemon: Pokemon): number {
+  getMaxHeldItemCount(_pokemon: Pokemon): number {
     return 1;
   }
 }
@@ -1974,10 +2012,6 @@ export class PokemonInstantReviveModifier extends PokemonHeldItemModifier {
  * @see {@linkcode apply}
  */
 export class ResetNegativeStatStageModifier extends PokemonHeldItemModifier {
-  constructor(type: ModifierType, pokemonId: number, stackCount?: number) {
-    super(type, pokemonId, stackCount);
-  }
-
   matchType(modifier: Modifier) {
     return modifier instanceof ResetNegativeStatStageModifier;
   }
@@ -2003,7 +2037,12 @@ export class ResetNegativeStatStageModifier extends PokemonHeldItemModifier {
     }
 
     if (statRestored) {
-      globalScene.queueMessage(i18next.t("modifier:resetNegativeStatStageApply", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), typeName: this.type.name }));
+      globalScene.queueMessage(
+        i18next.t("modifier:resetNegativeStatStageApply", {
+          pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
+          typeName: this.type.name,
+        }),
+      );
     }
     return statRestored;
   }
@@ -2013,6 +2052,38 @@ export class ResetNegativeStatStageModifier extends PokemonHeldItemModifier {
   }
 }
 
+/**
+ * Modifier used for held items, namely Mystical Rock, that extend the
+ * duration of weather and terrain effects.
+ * @extends PokemonHeldItemModifier
+ * @see {@linkcode apply}
+ */
+export class FieldEffectModifier extends PokemonHeldItemModifier {
+  /**
+   * Provides two more turns per stack to any weather or terrain effect caused
+   * by the holder.
+   * @param pokemon {@linkcode Pokemon} that holds the held item
+   * @param fieldDuration {@linkcode NumberHolder} that stores the current field effect duration
+   * @returns `true` if the field effect extension was applied successfully
+   */
+  override apply(_pokemon: Pokemon, fieldDuration: NumberHolder): boolean {
+    fieldDuration.value += 2 * this.stackCount;
+    return true;
+  }
+
+  override matchType(modifier: Modifier): boolean {
+    return modifier instanceof FieldEffectModifier;
+  }
+
+  override clone(): FieldEffectModifier {
+    return new FieldEffectModifier(this.type, this.pokemonId, this.stackCount);
+  }
+
+  override getMaxHeldItemCount(_pokemon?: Pokemon): number {
+    return 2;
+  }
+}
+
 export abstract class ConsumablePokemonModifier extends ConsumableModifier {
   public pokemonId: number;
 
@@ -2037,20 +2108,62 @@ export abstract class ConsumablePokemonModifier extends ConsumableModifier {
    * @param playerPokemon The {@linkcode PlayerPokemon} that consumes the item
    * @param args Additional arguments passed to {@linkcode ConsumablePokemonModifier.apply}
    */
-  abstract override apply(playerPokemon: PlayerPokemon, ...args: unknown[]): boolean | Promise<boolean>;
+  abstract override apply(playerPokemon: PlayerPokemon, ...args: unknown[]): boolean;
 
   getPokemon() {
     return globalScene.getPlayerParty().find(p => p.id === this.pokemonId);
   }
 }
 
+export class TerrastalizeModifier extends ConsumablePokemonModifier {
+  public override type: TerastallizeModifierType;
+  public teraType: PokemonType;
+
+  constructor(type: TerastallizeModifierType, pokemonId: number, teraType: PokemonType) {
+    super(type, pokemonId);
+
+    this.teraType = teraType;
+  }
+
+  /**
+   * Checks if {@linkcode TerrastalizeModifier} should be applied
+   * @param playerPokemon The {@linkcode PlayerPokemon} that consumes the item
+   * @returns `true` if the {@linkcode TerrastalizeModifier} should be applied
+   */
+  override shouldApply(playerPokemon?: PlayerPokemon): boolean {
+    return (
+      super.shouldApply(playerPokemon) &&
+      [playerPokemon?.species.speciesId, playerPokemon?.fusionSpecies?.speciesId].filter(
+        s => s === Species.TERAPAGOS || s === Species.OGERPON || s === Species.SHEDINJA,
+      ).length === 0
+    );
+  }
+
+  /**
+   * Applies {@linkcode TerrastalizeModifier}
+   * @param pokemon The {@linkcode PlayerPokemon} that consumes the item
+   * @returns `true` if hp was restored
+   */
+  override apply(pokemon: Pokemon): boolean {
+    pokemon.teraType = this.teraType;
+    return true;
+  }
+}
+
 export class PokemonHpRestoreModifier extends ConsumablePokemonModifier {
   private restorePoints: number;
   private restorePercent: number;
   private healStatus: boolean;
   public fainted: boolean;
 
-  constructor(type: ModifierType, pokemonId: number, restorePoints: number, restorePercent: number, healStatus: boolean, fainted?: boolean) {
+  constructor(
+    type: ModifierType,
+    pokemonId: number,
+    restorePoints: number,
+    restorePercent: number,
+    healStatus: boolean,
+    fainted?: boolean,
+  ) {
     super(type, pokemonId);
 
     this.restorePoints = restorePoints;
@@ -2066,7 +2179,10 @@ export class PokemonHpRestoreModifier extends ConsumablePokemonModifier {
    * @returns `true` if the {@linkcode PokemonHpRestoreModifier} should be applied
    */
   override shouldApply(playerPokemon?: PlayerPokemon, multiplier?: number): boolean {
-    return super.shouldApply(playerPokemon) && (this.fainted || (!isNullOrUndefined(multiplier) && typeof(multiplier) === "number"));
+    return (
+      super.shouldApply(playerPokemon) &&
+      (this.fainted || (!isNullOrUndefined(multiplier) && typeof multiplier === "number"))
+    );
   }
 
   /**
@@ -2082,9 +2198,13 @@ export class PokemonHpRestoreModifier extends ConsumablePokemonModifier {
         restorePoints = Math.floor(restorePoints * multiplier);
       }
       if (this.fainted || this.healStatus) {
-        pokemon.resetStatus(true, true);
+        pokemon.resetStatus(true, true, false, false);
       }
-      pokemon.hp = Math.min(pokemon.hp + Math.max(Math.ceil(Math.max(Math.floor((this.restorePercent * 0.01) * pokemon.getMaxHp()), restorePoints)), 1), pokemon.getMaxHp());
+      pokemon.hp = Math.min(
+        pokemon.hp +
+          Math.max(Math.ceil(Math.max(Math.floor(this.restorePercent * 0.01 * pokemon.getMaxHp()), restorePoints)), 1),
+        pokemon.getMaxHp(),
+      );
       return true;
     }
     return false;
@@ -2092,17 +2212,13 @@ export class PokemonHpRestoreModifier extends ConsumablePokemonModifier {
 }
 
 export class PokemonStatusHealModifier extends ConsumablePokemonModifier {
-  constructor(type: ModifierType, pokemonId: number) {
-    super(type, pokemonId);
-  }
-
   /**
    * Applies {@linkcode PokemonStatusHealModifier}
    * @param playerPokemon The {@linkcode PlayerPokemon} that gets healed from the status
    * @returns always `true`
    */
   override apply(playerPokemon: PlayerPokemon): boolean {
-    playerPokemon.resetStatus(true, true);
+    playerPokemon.resetStatus(true, true, false, false);
     return true;
   }
 }
@@ -2215,10 +2331,6 @@ export class PokemonNatureChangeModifier extends ConsumablePokemonModifier {
 }
 
 export class PokemonLevelIncrementModifier extends ConsumablePokemonModifier {
-  constructor(type: ModifierType, pokemonId: number) {
-    super(type, pokemonId);
-  }
-
   /**
    * Applies {@linkcode PokemonLevelIncrementModifier}
    * @param playerPokemon The {@linkcode PlayerPokemon} that should get levels incremented
@@ -2236,7 +2348,13 @@ export class PokemonLevelIncrementModifier extends ConsumablePokemonModifier {
 
     playerPokemon.addFriendship(FRIENDSHIP_GAIN_FROM_RARE_CANDY);
 
-    globalScene.unshiftPhase(new LevelUpPhase(globalScene.getPlayerParty().indexOf(playerPokemon), playerPokemon.level - levelCount.value, playerPokemon.level));
+    globalScene.unshiftPhase(
+      new LevelUpPhase(
+        globalScene.getPlayerParty().indexOf(playerPokemon),
+        playerPokemon.level - levelCount.value,
+        playerPokemon.level,
+      ),
+    );
 
     return true;
   }
@@ -2245,18 +2363,15 @@ export class PokemonLevelIncrementModifier extends ConsumablePokemonModifier {
 export class TmModifier extends ConsumablePokemonModifier {
   public override type: TmModifierType;
 
-  constructor(type: TmModifierType, pokemonId: number) {
-    super(type, pokemonId);
-  }
-
   /**
    * Applies {@linkcode TmModifier}
    * @param playerPokemon The {@linkcode PlayerPokemon} that should learn the TM
    * @returns always `true`
    */
   override apply(playerPokemon: PlayerPokemon): boolean {
-
-    globalScene.unshiftPhase(new LearnMovePhase(globalScene.getPlayerParty().indexOf(playerPokemon), this.type.moveId, LearnMoveType.TM));
+    globalScene.unshiftPhase(
+      new LearnMovePhase(globalScene.getPlayerParty().indexOf(playerPokemon), this.type.moveId, LearnMoveType.TM),
+    );
 
     return true;
   }
@@ -2277,8 +2392,14 @@ export class RememberMoveModifier extends ConsumablePokemonModifier {
    * @returns always `true`
    */
   override apply(playerPokemon: PlayerPokemon, cost?: number): boolean {
-
-    globalScene.unshiftPhase(new LearnMovePhase(globalScene.getPlayerParty().indexOf(playerPokemon), playerPokemon.getLearnableLevelMoves()[this.levelMoveIndex], LearnMoveType.MEMORY, cost));
+    globalScene.unshiftPhase(
+      new LearnMovePhase(
+        globalScene.getPlayerParty().indexOf(playerPokemon),
+        playerPokemon.getLearnableLevelMoves()[this.levelMoveIndex],
+        LearnMoveType.MEMORY,
+        cost,
+      ),
+    );
 
     return true;
   }
@@ -2286,11 +2407,6 @@ export class RememberMoveModifier extends ConsumablePokemonModifier {
 
 export class EvolutionItemModifier extends ConsumablePokemonModifier {
   public override type: EvolutionItemModifierType;
-
-  constructor(type: EvolutionItemModifierType, pokemonId: number) {
-    super(type, pokemonId);
-  }
-
   /**
    * Applies {@linkcode EvolutionItemModifier}
    * @param playerPokemon The {@linkcode PlayerPokemon} that should evolve via item
@@ -2298,15 +2414,21 @@ export class EvolutionItemModifier extends ConsumablePokemonModifier {
    */
   override apply(playerPokemon: PlayerPokemon): boolean {
     let matchingEvolution = pokemonEvolutions.hasOwnProperty(playerPokemon.species.speciesId)
-      ? pokemonEvolutions[playerPokemon.species.speciesId].find(e => e.item === this.type.evolutionItem
-        && (e.evoFormKey === null || (e.preFormKey || "") === playerPokemon.getFormKey())
-        && (!e.condition || e.condition.predicate(playerPokemon)))
+      ? pokemonEvolutions[playerPokemon.species.speciesId].find(
+          e =>
+            e.item === this.type.evolutionItem &&
+            (e.evoFormKey === null || (e.preFormKey || "") === playerPokemon.getFormKey()) &&
+            (!e.condition || e.condition.predicate(playerPokemon)),
+        )
       : null;
 
     if (!matchingEvolution && playerPokemon.isFusion()) {
-      matchingEvolution = pokemonEvolutions[playerPokemon.fusionSpecies!.speciesId].find(e => e.item === this.type.evolutionItem // TODO: is the bang correct?
-        && (e.evoFormKey === null || (e.preFormKey || "") === playerPokemon.getFusionFormKey())
-        && (!e.condition || e.condition.predicate(playerPokemon)));
+      matchingEvolution = pokemonEvolutions[playerPokemon.fusionSpecies!.speciesId].find(
+        e =>
+          e.item === this.type.evolutionItem && // TODO: is the bang correct?
+          (e.evoFormKey === null || (e.preFormKey || "") === playerPokemon.getFusionFormKey()) &&
+          (!e.condition || e.condition.predicate(playerPokemon)),
+      );
       if (matchingEvolution) {
         matchingEvolution = new FusionSpeciesFormEvolution(playerPokemon.species.speciesId, matchingEvolution);
       }
@@ -2337,7 +2459,9 @@ export class FusePokemonModifier extends ConsumablePokemonModifier {
    * @returns `true` if {@linkcode FusePokemonModifier} should be applied
    */
   override shouldApply(playerPokemon?: PlayerPokemon, playerPokemon2?: PlayerPokemon): boolean {
-    return super.shouldApply(playerPokemon, playerPokemon2) && !!playerPokemon2 && this.fusePokemonId === playerPokemon2.id;
+    return (
+      super.shouldApply(playerPokemon, playerPokemon2) && !!playerPokemon2 && this.fusePokemonId === playerPokemon2.id
+    );
   }
 
   /**
@@ -2346,17 +2470,13 @@ export class FusePokemonModifier extends ConsumablePokemonModifier {
    * @param playerPokemon2 {@linkcode PlayerPokemon} that should be fused with {@linkcode playerPokemon}
    * @returns always Promise<true>
    */
-  override async apply(playerPokemon: PlayerPokemon, playerPokemon2: PlayerPokemon): Promise<boolean> {
-    await playerPokemon.fuse(playerPokemon2);
+  override apply(playerPokemon: PlayerPokemon, playerPokemon2: PlayerPokemon): boolean {
+    playerPokemon.fuse(playerPokemon2);
     return true;
   }
 }
 
 export class MultipleParticipantExpBonusModifier extends PersistentModifier {
-  constructor(type: ModifierType, stackCount?: number) {
-    super(type, stackCount);
-  }
-
   match(modifier: Modifier): boolean {
     return modifier instanceof MultipleParticipantExpBonusModifier;
   }
@@ -2396,7 +2516,7 @@ export class HealingBoosterModifier extends PersistentModifier {
   }
 
   getArgs(): any[] {
-    return [ this.multiplier ];
+    return [this.multiplier];
   }
 
   /**
@@ -2405,7 +2525,7 @@ export class HealingBoosterModifier extends PersistentModifier {
    * @returns always `true`
    */
   override apply(healingMultiplier: NumberHolder): boolean {
-    healingMultiplier.value *= 1 + ((this.multiplier - 1) * this.getStackCount());
+    healingMultiplier.value *= 1 + (this.multiplier - 1) * this.getStackCount();
 
     return true;
   }
@@ -2437,7 +2557,7 @@ export class ExpBoosterModifier extends PersistentModifier {
   }
 
   getArgs(): any[] {
-    return [ this.boostMultiplier * 100 ];
+    return [this.boostMultiplier * 100];
   }
 
   /**
@@ -2446,13 +2566,13 @@ export class ExpBoosterModifier extends PersistentModifier {
    * @returns always `true`
    */
   override apply(boost: NumberHolder): boolean {
-    boost.value = Math.floor(boost.value * (1 + (this.getStackCount() * this.boostMultiplier)));
+    boost.value = Math.floor(boost.value * (1 + this.getStackCount() * this.boostMultiplier));
 
     return true;
   }
 
-  getMaxStackCount(forThreshold?: boolean): number {
-    return this.boostMultiplier < 1 ? this.boostMultiplier < 0.6 ? 99 : 30 : 10;
+  getMaxStackCount(_forThreshold?: boolean): number {
+    return this.boostMultiplier < 1 ? (this.boostMultiplier < 0.6 ? 99 : 30) : 10;
   }
 }
 
@@ -2499,21 +2619,17 @@ export class PokemonExpBoosterModifier extends PokemonHeldItemModifier {
    * @returns always `true`
    */
   override apply(_pokemon: Pokemon, boost: NumberHolder): boolean {
-    boost.value = Math.floor(boost.value * (1 + (this.getStackCount() * this.boostMultiplier)));
+    boost.value = Math.floor(boost.value * (1 + this.getStackCount() * this.boostMultiplier));
 
     return true;
   }
 
-  getMaxHeldItemCount(pokemon: Pokemon): number {
+  getMaxHeldItemCount(_pokemon: Pokemon): number {
     return 99;
   }
 }
 
 export class ExpShareModifier extends PersistentModifier {
-  constructor(type: ModifierType, stackCount?: number) {
-    super(type, stackCount);
-  }
-
   match(modifier: Modifier): boolean {
     return modifier instanceof ExpShareModifier;
   }
@@ -2536,10 +2652,6 @@ export class ExpShareModifier extends PersistentModifier {
 }
 
 export class ExpBalanceModifier extends PersistentModifier {
-  constructor(type: ModifierType, stackCount?: number) {
-    super(type, stackCount);
-  }
-
   match(modifier: Modifier): boolean {
     return modifier instanceof ExpBalanceModifier;
   }
@@ -2564,10 +2676,6 @@ export class ExpBalanceModifier extends PersistentModifier {
 export class PokemonFriendshipBoosterModifier extends PokemonHeldItemModifier {
   public override type: PokemonFriendshipBoosterModifierType;
 
-  constructor(type: PokemonFriendshipBoosterModifierType, pokemonId: number, stackCount?: number) {
-    super(type, pokemonId, stackCount);
-  }
-
   matchType(modifier: Modifier): boolean {
     return modifier instanceof PokemonFriendshipBoosterModifier;
   }
@@ -2588,16 +2696,12 @@ export class PokemonFriendshipBoosterModifier extends PokemonHeldItemModifier {
     return true;
   }
 
-  getMaxHeldItemCount(pokemon: Pokemon): number {
+  getMaxHeldItemCount(_pokemon: Pokemon): number {
     return 3;
   }
 }
 
 export class PokemonNatureWeightModifier extends PokemonHeldItemModifier {
-  constructor(type: ModifierType, pokemonId: number, stackCount?: number) {
-    super(type, pokemonId, stackCount);
-  }
-
   matchType(modifier: Modifier): boolean {
     return modifier instanceof PokemonNatureWeightModifier;
   }
@@ -2621,7 +2725,7 @@ export class PokemonNatureWeightModifier extends PokemonHeldItemModifier {
     return false;
   }
 
-  getMaxHeldItemCount(pokemon: Pokemon): number {
+  getMaxHeldItemCount(_pokemon: Pokemon): number {
     return 10;
   }
 }
@@ -2668,12 +2772,12 @@ export class PokemonMoveAccuracyBoosterModifier extends PokemonHeldItemModifier
    * @returns always `true`
    */
   override apply(_pokemon: Pokemon, moveAccuracy: NumberHolder): boolean {
-    moveAccuracy.value = Math.min(moveAccuracy.value + this.accuracyAmount * this.getStackCount(), 100);
+    moveAccuracy.value = moveAccuracy.value + this.accuracyAmount * this.getStackCount();
 
     return true;
   }
 
-  getMaxHeldItemCount(pokemon: Pokemon): number {
+  getMaxHeldItemCount(_pokemon: Pokemon): number {
     return 3;
   }
 }
@@ -2681,10 +2785,6 @@ export class PokemonMoveAccuracyBoosterModifier extends PokemonHeldItemModifier
 export class PokemonMultiHitModifier extends PokemonHeldItemModifier {
   public override type: PokemonMultiHitModifierType;
 
-  constructor(type: PokemonMultiHitModifierType, pokemonId: number, stackCount?: number) {
-    super(type, pokemonId, stackCount);
-  }
-
   matchType(modifier: Modifier): boolean {
     return modifier instanceof PokemonMultiHitModifier;
   }
@@ -2701,7 +2801,12 @@ export class PokemonMultiHitModifier extends PokemonHeldItemModifier {
    * @param damageMultiplier {@linkcode NumberHolder} holding a damage multiplier applied to a strike of this move
    * @returns always `true`
    */
-  override apply(pokemon: Pokemon, moveId: Moves, count: NumberHolder | null = null, damageMultiplier: NumberHolder | null = null): boolean {
+  override apply(
+    pokemon: Pokemon,
+    moveId: Moves,
+    count: NumberHolder | null = null,
+    damageMultiplier: NumberHolder | null = null,
+  ): boolean {
     const move = allMoves[moveId];
     /**
      * The move must meet Parental Bond's restrictions for this item
@@ -2718,7 +2823,8 @@ export class PokemonMultiHitModifier extends PokemonHeldItemModifier {
 
     if (!isNullOrUndefined(count)) {
       return this.applyHitCountBoost(count);
-    } else if (!isNullOrUndefined(damageMultiplier)) {
+    }
+    if (!isNullOrUndefined(damageMultiplier)) {
       return this.applyDamageModifier(pokemon, damageMultiplier);
     }
 
@@ -2741,17 +2847,17 @@ export class PokemonMultiHitModifier extends PokemonHeldItemModifier {
       // Reduce first hit by 25% for each stack count
       damageMultiplier.value *= 1 - 0.25 * this.getStackCount();
       return true;
-    } else if (pokemon.turnData.hitCount - pokemon.turnData.hitsLeft !== this.getStackCount() + 1) {
+    }
+    if (pokemon.turnData.hitCount - pokemon.turnData.hitsLeft !== this.getStackCount() + 1) {
       // Deal 25% damage for each remaining Multi Lens hit
       damageMultiplier.value *= 0.25;
       return true;
-    } else {
-      // An extra hit not caused by Multi Lens -- assume it is Parental Bond
-      return false;
     }
+    // An extra hit not caused by Multi Lens -- assume it is Parental Bond
+    return false;
   }
 
-  getMaxHeldItemCount(pokemon: Pokemon): number {
+  getMaxHeldItemCount(_pokemon: Pokemon): number {
     return 2;
   }
 }
@@ -2760,9 +2866,15 @@ export class PokemonFormChangeItemModifier extends PokemonHeldItemModifier {
   public override type: FormChangeItemModifierType;
   public formChangeItem: FormChangeItem;
   public active: boolean;
-  public isTransferable: boolean = false;
+  public isTransferable = false;
 
-  constructor(type: FormChangeItemModifierType, pokemonId: number, formChangeItem: FormChangeItem, active: boolean, stackCount?: number) {
+  constructor(
+    type: FormChangeItemModifierType,
+    pokemonId: number,
+    formChangeItem: FormChangeItem,
+    active: boolean,
+    stackCount?: number,
+  ) {
     super(type, pokemonId, stackCount);
     this.formChangeItem = formChangeItem;
     this.active = active;
@@ -2773,7 +2885,13 @@ export class PokemonFormChangeItemModifier extends PokemonHeldItemModifier {
   }
 
   clone(): PersistentModifier {
-    return new PokemonFormChangeItemModifier(this.type, this.pokemonId, this.formChangeItem, this.active, this.stackCount);
+    return new PokemonFormChangeItemModifier(
+      this.type,
+      this.pokemonId,
+      this.formChangeItem,
+      this.active,
+      this.stackCount,
+    );
   }
 
   getArgs(): any[] {
@@ -2802,7 +2920,7 @@ export class PokemonFormChangeItemModifier extends PokemonHeldItemModifier {
     return ret;
   }
 
-  getMaxHeldItemCount(pokemon: Pokemon): number {
+  getMaxHeldItemCount(_pokemon: Pokemon): number {
     return 1;
   }
 }
@@ -2829,8 +2947,12 @@ export class MoneyRewardModifier extends ConsumableModifier {
 
     globalScene.getPlayerParty().map(p => {
       if (p.species?.speciesId === Species.GIMMIGHOUL || p.fusionSpecies?.speciesId === Species.GIMMIGHOUL) {
-        p.evoCounter ? p.evoCounter += Math.min(Math.floor(this.moneyMultiplier), 3) : p.evoCounter = Math.min(Math.floor(this.moneyMultiplier), 3);
-        const modifier = getModifierType(modifierTypes.EVOLUTION_TRACKER_GIMMIGHOUL).newModifier(p) as EvoTrackerModifier;
+        p.evoCounter
+          ? (p.evoCounter += Math.min(Math.floor(this.moneyMultiplier), 3))
+          : (p.evoCounter = Math.min(Math.floor(this.moneyMultiplier), 3));
+        const modifier = getModifierType(modifierTypes.EVOLUTION_TRACKER_GIMMIGHOUL).newModifier(
+          p,
+        ) as EvoTrackerModifier;
         globalScene.addModifier(modifier);
       }
     });
@@ -2840,10 +2962,6 @@ export class MoneyRewardModifier extends ConsumableModifier {
 }
 
 export class MoneyMultiplierModifier extends PersistentModifier {
-  constructor(type: ModifierType, stackCount?: number) {
-    super(type, stackCount);
-  }
-
   match(modifier: Modifier): boolean {
     return modifier instanceof MoneyMultiplierModifier;
   }
@@ -2869,10 +2987,6 @@ export class MoneyMultiplierModifier extends PersistentModifier {
 }
 
 export class DamageMoneyRewardModifier extends PokemonHeldItemModifier {
-  constructor(type: ModifierType, pokemonId: number, stackCount?: number) {
-    super(type, pokemonId, stackCount);
-  }
-
   matchType(modifier: Modifier): boolean {
     return modifier instanceof DamageMoneyRewardModifier;
   }
@@ -2887,7 +3001,7 @@ export class DamageMoneyRewardModifier extends PokemonHeldItemModifier {
    * @param multiplier {@linkcode NumberHolder} holding the multiplier value
    * @returns always `true`
    */
-  override apply(pokemon: Pokemon, multiplier: NumberHolder): boolean {
+  override apply(_pokemon: Pokemon, multiplier: NumberHolder): boolean {
     const moneyAmount = new NumberHolder(Math.floor(multiplier.value * (0.5 * this.getStackCount())));
     globalScene.applyModifiers(MoneyMultiplierModifier, true, moneyAmount);
     globalScene.addMoney(moneyAmount.value);
@@ -2895,16 +3009,12 @@ export class DamageMoneyRewardModifier extends PokemonHeldItemModifier {
     return true;
   }
 
-  getMaxHeldItemCount(pokemon: Pokemon): number {
+  getMaxHeldItemCount(_pokemon: Pokemon): number {
     return 5;
   }
 }
 
 export class MoneyInterestModifier extends PersistentModifier {
-  constructor(type: ModifierType, stackCount?: number) {
-    super(type, stackCount);
-  }
-
   match(modifier: Modifier): boolean {
     return modifier instanceof MoneyInterestModifier;
   }
@@ -2919,7 +3029,10 @@ export class MoneyInterestModifier extends PersistentModifier {
 
     const userLocale = navigator.language || "en-US";
     const formattedMoneyAmount = interestAmount.toLocaleString(userLocale);
-    const message = i18next.t("modifier:moneyInterestApply", { moneyAmount: formattedMoneyAmount, typeName: this.type.name });
+    const message = i18next.t("modifier:moneyInterestApply", {
+      moneyAmount: formattedMoneyAmount,
+      typeName: this.type.name,
+    });
     globalScene.queueMessage(message, undefined, true);
 
     return true;
@@ -2935,10 +3048,6 @@ export class MoneyInterestModifier extends PersistentModifier {
 }
 
 export class HiddenAbilityRateBoosterModifier extends PersistentModifier {
-  constructor(type: ModifierType, stackCount?: number) {
-    super(type, stackCount);
-  }
-
   match(modifier: Modifier): boolean {
     return modifier instanceof HiddenAbilityRateBoosterModifier;
   }
@@ -2964,10 +3073,6 @@ export class HiddenAbilityRateBoosterModifier extends PersistentModifier {
 }
 
 export class ShinyRateBoosterModifier extends PersistentModifier {
-  constructor(type: ModifierType, stackCount?: number) {
-    super(type, stackCount);
-  }
-
   match(modifier: Modifier): boolean {
     return modifier instanceof ShinyRateBoosterModifier;
   }
@@ -2993,10 +3098,6 @@ export class ShinyRateBoosterModifier extends PersistentModifier {
 }
 
 export class CriticalCatchChanceBoosterModifier extends PersistentModifier {
-  constructor(type: ModifierType, stackCount?: number) {
-    super(type, stackCount);
-  }
-
   match(modifier: Modifier): boolean {
     return modifier instanceof CriticalCatchChanceBoosterModifier;
   }
@@ -3025,10 +3126,6 @@ export class CriticalCatchChanceBoosterModifier extends PersistentModifier {
 }
 
 export class LockModifierTiersModifier extends PersistentModifier {
-  constructor(type: ModifierType, stackCount?: number) {
-    super(type, stackCount);
-  }
-
   match(modifier: Modifier): boolean {
     return modifier instanceof LockModifierTiersModifier;
   }
@@ -3091,10 +3188,6 @@ export class HealShopCostModifier extends PersistentModifier {
 }
 
 export class BoostBugSpawnModifier extends PersistentModifier {
-  constructor(type: ModifierType, stackCount?: number) {
-    super(type, stackCount);
-  }
-
   match(modifier: Modifier): boolean {
     return modifier instanceof BoostBugSpawnModifier;
   }
@@ -3117,10 +3210,6 @@ export class BoostBugSpawnModifier extends PersistentModifier {
 }
 
 export class SwitchEffectTransferModifier extends PokemonHeldItemModifier {
-  constructor(type: ModifierType, pokemonId: number, stackCount?: number) {
-    super(type, pokemonId, stackCount);
-  }
-
   matchType(modifier: Modifier): boolean {
     return modifier instanceof SwitchEffectTransferModifier;
   }
@@ -3137,7 +3226,7 @@ export class SwitchEffectTransferModifier extends PokemonHeldItemModifier {
     return true;
   }
 
-  getMaxHeldItemCount(pokemon: Pokemon): number {
+  getMaxHeldItemCount(_pokemon: Pokemon): number {
     return 1;
   }
 }
@@ -3148,10 +3237,6 @@ export class SwitchEffectTransferModifier extends PokemonHeldItemModifier {
  * @see {@linkcode ContactHeldItemTransferChanceModifier}
  */
 export abstract class HeldItemTransferModifier extends PokemonHeldItemModifier {
-  constructor(type: ModifierType, pokemonId: number, stackCount?: number) {
-    super(type, pokemonId, stackCount);
-  }
-
   /**
    * Determines the targets to transfer items from when this applies.
    * @param pokemon the {@linkcode Pokemon} holding this item
@@ -3159,9 +3244,7 @@ export abstract class HeldItemTransferModifier extends PokemonHeldItemModifier {
    * @returns the opponents of the source {@linkcode Pokemon}
    */
   getTargets(pokemon?: Pokemon, ..._args: unknown[]): Pokemon[] {
-    return pokemon instanceof Pokemon
-      ? pokemon.getOpponents()
-      : [];
+    return pokemon instanceof Pokemon ? pokemon.getOpponents() : [];
   }
 
   /**
@@ -3179,23 +3262,29 @@ export abstract class HeldItemTransferModifier extends PokemonHeldItemModifier {
       return false;
     }
 
-    const targetPokemon = opponents[pokemon.randSeedInt(opponents.length)];
+    const targetPokemon = opponents[pokemon.randBattleSeedInt(opponents.length)];
 
     const transferredItemCount = this.getTransferredItemCount();
     if (!transferredItemCount) {
       return false;
     }
 
-    const poolType = pokemon.isPlayer() ? ModifierPoolType.PLAYER : pokemon.hasTrainer() ? ModifierPoolType.TRAINER : ModifierPoolType.WILD;
+    const poolType = pokemon.isPlayer()
+      ? ModifierPoolType.PLAYER
+      : pokemon.hasTrainer()
+        ? ModifierPoolType.TRAINER
+        : ModifierPoolType.WILD;
 
     const transferredModifierTypes: ModifierType[] = [];
-    const itemModifiers = globalScene.findModifiers(m => m instanceof PokemonHeldItemModifier
-        && m.pokemonId === targetPokemon.id && m.isTransferable, targetPokemon.isPlayer()) as PokemonHeldItemModifier[];
-    let highestItemTier = itemModifiers.map(m => m.type.getOrInferTier(poolType)).reduce((highestTier, tier) => Math.max(tier!, highestTier), 0); // TODO: is this bang correct?
+    const itemModifiers = globalScene.findModifiers(
+      m => m instanceof PokemonHeldItemModifier && m.pokemonId === targetPokemon.id && m.isTransferable,
+      targetPokemon.isPlayer(),
+    ) as PokemonHeldItemModifier[];
+    let highestItemTier = itemModifiers
+      .map(m => m.type.getOrInferTier(poolType))
+      .reduce((highestTier, tier) => Math.max(tier!, highestTier), 0); // TODO: is this bang correct?
     let tierItemModifiers = itemModifiers.filter(m => m.type.getOrInferTier(poolType) === highestItemTier);
 
-    const heldItemTransferPromises: Promise<void>[] = [];
-
     for (let i = 0; i < transferredItemCount; i++) {
       if (!tierItemModifiers.length) {
         while (highestItemTier-- && !tierItemModifiers.length) {
@@ -3205,21 +3294,17 @@ export abstract class HeldItemTransferModifier extends PokemonHeldItemModifier {
           break;
         }
       }
-      const randItemIndex = pokemon.randSeedInt(itemModifiers.length);
+      const randItemIndex = pokemon.randBattleSeedInt(itemModifiers.length);
       const randItem = itemModifiers[randItemIndex];
-      heldItemTransferPromises.push(globalScene.tryTransferHeldItemModifier(randItem, pokemon, false).then(success => {
-        if (success) {
-          transferredModifierTypes.push(randItem.type);
-          itemModifiers.splice(randItemIndex, 1);
-        }
-      }));
+      if (globalScene.tryTransferHeldItemModifier(randItem, pokemon, false)) {
+        transferredModifierTypes.push(randItem.type);
+        itemModifiers.splice(randItemIndex, 1);
+      }
     }
 
-    Promise.all(heldItemTransferPromises).then(() => {
-      for (const mt of transferredModifierTypes) {
-        globalScene.queueMessage(this.getTransferMessage(pokemon, targetPokemon, mt));
-      }
-    });
+    for (const mt of transferredModifierTypes) {
+      globalScene.queueMessage(this.getTransferMessage(pokemon, targetPokemon, mt));
+    }
 
     return !!transferredModifierTypes.length;
   }
@@ -3235,10 +3320,7 @@ export abstract class HeldItemTransferModifier extends PokemonHeldItemModifier {
  * @see {@linkcode modifierTypes[MINI_BLACK_HOLE]}
  */
 export class TurnHeldItemTransferModifier extends HeldItemTransferModifier {
-  isTransferable: boolean = true;
-  constructor(type: ModifierType, pokemonId: number, stackCount?: number) {
-    super(type, pokemonId, stackCount);
-  }
+  isTransferable = true;
 
   matchType(modifier: Modifier): boolean {
     return modifier instanceof TurnHeldItemTransferModifier;
@@ -3253,10 +3335,15 @@ export class TurnHeldItemTransferModifier extends HeldItemTransferModifier {
   }
 
   getTransferMessage(pokemon: Pokemon, targetPokemon: Pokemon, item: ModifierType): string {
-    return i18next.t("modifier:turnHeldItemTransferApply", { pokemonNameWithAffix: getPokemonNameWithAffix(targetPokemon), itemName: item.name, pokemonName: pokemon.getNameToRender(), typeName: this.type.name });
+    return i18next.t("modifier:turnHeldItemTransferApply", {
+      pokemonNameWithAffix: getPokemonNameWithAffix(targetPokemon),
+      itemName: item.name,
+      pokemonName: pokemon.getNameToRender(),
+      typeName: this.type.name,
+    });
   }
 
-  getMaxHeldItemCount(pokemon: Pokemon): number {
+  getMaxHeldItemCount(_pokemon: Pokemon): number {
     return 1;
   }
 
@@ -3287,7 +3374,7 @@ export class ContactHeldItemTransferChanceModifier extends HeldItemTransferModif
    * @returns The target {@linkcode Pokemon} as array for further use in `apply` implementations
    */
   override getTargets(_holderPokemon: Pokemon, targetPokemon: Pokemon): Pokemon[] {
-    return !!targetPokemon ? [ targetPokemon ] : [];
+    return targetPokemon ? [targetPokemon] : [];
   }
 
   matchType(modifier: Modifier): boolean {
@@ -3303,21 +3390,26 @@ export class ContactHeldItemTransferChanceModifier extends HeldItemTransferModif
   }
 
   getTransferredItemCount(): number {
-    return Phaser.Math.RND.realInRange(0, 1) < (this.chance * this.getStackCount()) ? 1 : 0;
+    return Phaser.Math.RND.realInRange(0, 1) < this.chance * this.getStackCount() ? 1 : 0;
   }
 
   getTransferMessage(pokemon: Pokemon, targetPokemon: Pokemon, item: ModifierType): string {
-    return i18next.t("modifier:contactHeldItemTransferApply", { pokemonNameWithAffix: getPokemonNameWithAffix(targetPokemon), itemName: item.name, pokemonName: getPokemonNameWithAffix(pokemon), typeName: this.type.name });
+    return i18next.t("modifier:contactHeldItemTransferApply", {
+      pokemonNameWithAffix: getPokemonNameWithAffix(targetPokemon),
+      itemName: item.name,
+      pokemonName: getPokemonNameWithAffix(pokemon),
+      typeName: this.type.name,
+    });
   }
 
-  getMaxHeldItemCount(pokemon: Pokemon): number {
+  getMaxHeldItemCount(_pokemon: Pokemon): number {
     return 5;
   }
 }
 
 export class IvScannerModifier extends PersistentModifier {
-  constructor(type: ModifierType, stackCount?: number) {
-    super(type, stackCount);
+  constructor(type: ModifierType, _stackCount?: number) {
+    super(type);
   }
 
   match(modifier: Modifier): boolean {
@@ -3325,7 +3417,7 @@ export class IvScannerModifier extends PersistentModifier {
   }
 
   clone(): IvScannerModifier {
-    return new IvScannerModifier(this.type, this.stackCount);
+    return new IvScannerModifier(this.type);
   }
 
   /**
@@ -3333,19 +3425,15 @@ export class IvScannerModifier extends PersistentModifier {
    * @returns always `true`
    */
   override apply(): boolean {
-    return true;
+    return true; //Dude are you kidding me
   }
 
   getMaxStackCount(): number {
-    return 3;
+    return 1;
   }
 }
 
 export class ExtraModifierModifier extends PersistentModifier {
-  constructor(type: ModifierType, stackCount?: number) {
-    super(type, stackCount);
-  }
-
   match(modifier: Modifier): boolean {
     return modifier instanceof ExtraModifierModifier;
   }
@@ -3376,10 +3464,6 @@ export class ExtraModifierModifier extends PersistentModifier {
  * @see {@linkcode apply}
  */
 export class TempExtraModifierModifier extends LapsingPersistentModifier {
-  constructor(type: ModifierType, maxBattles: number, battleCount?: number, stackCount?: number) {
-    super(type, maxBattles, battleCount, stackCount);
-  }
-
   /**
    * Goes through existing modifiers for any that match Silver Pokeball,
    * which will then add the max count of the new item to the existing count of the current item.
@@ -3409,7 +3493,7 @@ export class TempExtraModifierModifier extends LapsingPersistentModifier {
   }
 
   match(modifier: Modifier): boolean {
-    return (modifier instanceof TempExtraModifierModifier);
+    return modifier instanceof TempExtraModifierModifier;
   }
 
   /**
@@ -3424,10 +3508,6 @@ export class TempExtraModifierModifier extends LapsingPersistentModifier {
 }
 
 export abstract class EnemyPersistentModifier extends PersistentModifier {
-  constructor(type: ModifierType, stackCount?: number) {
-    super(type, stackCount);
-  }
-
   getMaxStackCount(): number {
     return 5;
   }
@@ -3448,7 +3528,7 @@ abstract class EnemyDamageMultiplierModifier extends EnemyPersistentModifier {
    * @returns always `true`
    */
   override apply(multiplier: NumberHolder): boolean {
-    multiplier.value = Math.floor(multiplier.value * Math.pow(this.damageMultiplier, this.getStackCount()));
+    multiplier.value = toDmgValue(multiplier.value * Math.pow(this.damageMultiplier, this.getStackCount()));
 
     return true;
   }
@@ -3459,7 +3539,7 @@ abstract class EnemyDamageMultiplierModifier extends EnemyPersistentModifier {
 }
 
 export class EnemyDamageBoosterModifier extends EnemyDamageMultiplierModifier {
-  constructor(type: ModifierType, boostPercent: number, stackCount?: number) {
+  constructor(type: ModifierType, _boostPercent: number, stackCount?: number) {
     //super(type, 1 + ((boostPercent || 10) * 0.01), stackCount);
     super(type, 1.05, stackCount); // Hardcode multiplier temporarily
   }
@@ -3473,7 +3553,7 @@ export class EnemyDamageBoosterModifier extends EnemyDamageMultiplierModifier {
   }
 
   getArgs(): any[] {
-    return [ (this.damageMultiplier - 1) * 100 ];
+    return [(this.damageMultiplier - 1) * 100];
   }
 
   getMaxStackCount(): number {
@@ -3482,7 +3562,7 @@ export class EnemyDamageBoosterModifier extends EnemyDamageMultiplierModifier {
 }
 
 export class EnemyDamageReducerModifier extends EnemyDamageMultiplierModifier {
-  constructor(type: ModifierType, reductionPercent: number, stackCount?: number) {
+  constructor(type: ModifierType, _reductionPercent: number, stackCount?: number) {
     //super(type, 1 - ((reductionPercent || 5) * 0.01), stackCount);
     super(type, 0.975, stackCount); // Hardcode multiplier temporarily
   }
@@ -3496,7 +3576,7 @@ export class EnemyDamageReducerModifier extends EnemyDamageMultiplierModifier {
   }
 
   getArgs(): any[] {
-    return [ (1 - this.damageMultiplier) * 100 ];
+    return [(1 - this.damageMultiplier) * 100];
   }
 
   getMaxStackCount(): number {
@@ -3507,7 +3587,7 @@ export class EnemyDamageReducerModifier extends EnemyDamageMultiplierModifier {
 export class EnemyTurnHealModifier extends EnemyPersistentModifier {
   public healPercent: number;
 
-  constructor(type: ModifierType, healPercent: number, stackCount?: number) {
+  constructor(type: ModifierType, _healPercent: number, stackCount?: number) {
     super(type, stackCount);
 
     // Hardcode temporarily
@@ -3523,7 +3603,7 @@ export class EnemyTurnHealModifier extends EnemyPersistentModifier {
   }
 
   getArgs(): any[] {
-    return [ this.healPercent ];
+    return [this.healPercent];
   }
 
   /**
@@ -3533,8 +3613,20 @@ export class EnemyTurnHealModifier extends EnemyPersistentModifier {
    */
   override apply(enemyPokemon: Pokemon): boolean {
     if (!enemyPokemon.isFullHp()) {
-      globalScene.unshiftPhase(new PokemonHealPhase(enemyPokemon.getBattlerIndex(),
-        Math.max(Math.floor(enemyPokemon.getMaxHp() / (100 / this.healPercent)) * this.stackCount, 1), i18next.t("modifier:enemyTurnHealApply", { pokemonNameWithAffix: getPokemonNameWithAffix(enemyPokemon) }), true, false, false, false, true));
+      globalScene.unshiftPhase(
+        new PokemonHealPhase(
+          enemyPokemon.getBattlerIndex(),
+          Math.max(Math.floor(enemyPokemon.getMaxHp() / (100 / this.healPercent)) * this.stackCount, 1),
+          i18next.t("modifier:enemyTurnHealApply", {
+            pokemonNameWithAffix: getPokemonNameWithAffix(enemyPokemon),
+          }),
+          true,
+          false,
+          false,
+          false,
+          true,
+        ),
+      );
       return true;
     }
 
@@ -3550,12 +3642,12 @@ export class EnemyAttackStatusEffectChanceModifier extends EnemyPersistentModifi
   public effect: StatusEffect;
   public chance: number;
 
-  constructor(type: ModifierType, effect: StatusEffect, chancePercent: number, stackCount?: number) {
+  constructor(type: ModifierType, effect: StatusEffect, _chancePercent: number, stackCount?: number) {
     super(type, stackCount);
 
     this.effect = effect;
-    //Hardcode temporarily
-    this.chance = .025 * ((this.effect === StatusEffect.BURN || this.effect === StatusEffect.POISON) ? 2 : 1);
+    // Hardcode temporarily
+    this.chance = 0.025 * (this.effect === StatusEffect.BURN || this.effect === StatusEffect.POISON ? 2 : 1);
   }
 
   match(modifier: Modifier): boolean {
@@ -3567,7 +3659,7 @@ export class EnemyAttackStatusEffectChanceModifier extends EnemyPersistentModifi
   }
 
   getArgs(): any[] {
-    return [ this.effect, this.chance * 100 ];
+    return [this.effect, this.chance * 100];
   }
 
   /**
@@ -3576,7 +3668,7 @@ export class EnemyAttackStatusEffectChanceModifier extends EnemyPersistentModifi
    * @returns `true` if the {@linkcode Pokemon} was affected
    */
   override apply(enemyPokemon: Pokemon): boolean {
-    if (Phaser.Math.RND.realInRange(0, 1) < (this.chance * this.getStackCount())) {
+    if (Phaser.Math.RND.realInRange(0, 1) < this.chance * this.getStackCount()) {
       return enemyPokemon.trySetStatus(this.effect, true);
     }
 
@@ -3591,11 +3683,11 @@ export class EnemyAttackStatusEffectChanceModifier extends EnemyPersistentModifi
 export class EnemyStatusEffectHealChanceModifier extends EnemyPersistentModifier {
   public chance: number;
 
-  constructor(type: ModifierType, chancePercent: number, stackCount?: number) {
+  constructor(type: ModifierType, _chancePercent: number, stackCount?: number) {
     super(type, stackCount);
 
     //Hardcode temporarily
-    this.chance = .025;
+    this.chance = 0.025;
   }
 
   match(modifier: Modifier): boolean {
@@ -3607,7 +3699,7 @@ export class EnemyStatusEffectHealChanceModifier extends EnemyPersistentModifier
   }
 
   getArgs(): any[] {
-    return [ this.chance * 100 ];
+    return [this.chance * 100];
   }
 
   /**
@@ -3616,8 +3708,10 @@ export class EnemyStatusEffectHealChanceModifier extends EnemyPersistentModifier
    * @returns `true` if the {@linkcode Pokemon} was healed
    */
   override apply(enemyPokemon: Pokemon): boolean {
-    if (enemyPokemon.status && Phaser.Math.RND.realInRange(0, 1) < (this.chance * this.getStackCount())) {
-      globalScene.queueMessage(getStatusEffectHealText(enemyPokemon.status.effect, getPokemonNameWithAffix(enemyPokemon)));
+    if (enemyPokemon.status && Phaser.Math.RND.realInRange(0, 1) < this.chance * this.getStackCount()) {
+      globalScene.queueMessage(
+        getStatusEffectHealText(enemyPokemon.status.effect, getPokemonNameWithAffix(enemyPokemon)),
+      );
       enemyPokemon.resetStatus();
       enemyPokemon.updateInfo();
       return true;
@@ -3634,7 +3728,7 @@ export class EnemyStatusEffectHealChanceModifier extends EnemyPersistentModifier
 export class EnemyEndureChanceModifier extends EnemyPersistentModifier {
   public chance: number;
 
-  constructor(type: ModifierType, chancePercent?: number, stackCount?: number) {
+  constructor(type: ModifierType, _chancePercent?: number, stackCount?: number) {
     super(type, stackCount || 10);
 
     //Hardcode temporarily
@@ -3650,7 +3744,7 @@ export class EnemyEndureChanceModifier extends EnemyPersistentModifier {
   }
 
   getArgs(): any[] {
-    return [ this.chance ];
+    return [this.chance];
   }
 
   /**
@@ -3659,13 +3753,13 @@ export class EnemyEndureChanceModifier extends EnemyPersistentModifier {
    * @returns `true` if {@linkcode Pokemon} endured
    */
   override apply(target: Pokemon): boolean {
-    if (target.battleData.endured || target.randSeedInt(100) >= (this.chance * this.getStackCount())) {
+    if (target.waveData.endured || target.randBattleSeedInt(100) >= this.chance * this.getStackCount()) {
       return false;
     }
 
     target.addTag(BattlerTagType.ENDURE_TOKEN, 1);
 
-    target.battleData.endured = true;
+    target.waveData.endured = true;
 
     return true;
   }
@@ -3693,7 +3787,7 @@ export class EnemyFusionChanceModifier extends EnemyPersistentModifier {
   }
 
   getArgs(): any[] {
-    return [ this.chance * 100 ];
+    return [this.chance * 100];
   }
 
   /**
@@ -3702,7 +3796,7 @@ export class EnemyFusionChanceModifier extends EnemyPersistentModifier {
    * @returns `true` if the {@linkcode EnemyPokemon} is a fusion
    */
   override apply(isFusion: BooleanHolder): boolean {
-    if (Phaser.Math.RND.realInRange(0, 1) >= (this.chance * this.getStackCount())) {
+    if (Phaser.Math.RND.realInRange(0, 1) >= this.chance * this.getStackCount()) {
       return false;
     }
 
@@ -3722,8 +3816,10 @@ export class EnemyFusionChanceModifier extends EnemyPersistentModifier {
  *  - The enemy
  * @param isPlayer {@linkcode boolean} for whether the player (`true`) or enemy (`false`) is being overridden
  */
-export function overrideModifiers(isPlayer: boolean = true): void {
-  const modifiersOverride: ModifierOverride[] = isPlayer ? Overrides.STARTING_MODIFIER_OVERRIDE : Overrides.OPP_MODIFIER_OVERRIDE;
+export function overrideModifiers(isPlayer = true): void {
+  const modifiersOverride: ModifierOverride[] = isPlayer
+    ? Overrides.STARTING_MODIFIER_OVERRIDE
+    : Overrides.OPP_MODIFIER_OVERRIDE;
   if (!modifiersOverride || modifiersOverride.length === 0 || !globalScene) {
     return;
   }
@@ -3733,16 +3829,16 @@ export function overrideModifiers(isPlayer: boolean = true): void {
     globalScene.clearEnemyModifiers();
   }
 
-  modifiersOverride.forEach(item => {
+  for (const item of modifiersOverride) {
     const modifierFunc = modifierTypes[item.name];
     let modifierType: ModifierType | null = modifierFunc();
 
     if (modifierType instanceof ModifierTypeGenerator) {
-      const pregenArgs = ("type" in item) && (item.type !== null) ? [ item.type ] : undefined;
+      const pregenArgs = "type" in item && item.type !== null ? [item.type] : undefined;
       modifierType = modifierType.generateType([], pregenArgs);
     }
 
-    const modifier = modifierType && modifierType.withIdFromFunc(modifierFunc).newModifier() as PersistentModifier;
+    const modifier = modifierType && (modifierType.withIdFromFunc(modifierFunc).newModifier() as PersistentModifier);
     if (modifier) {
       modifier.stackCount = item.count || 1;
 
@@ -3752,7 +3848,7 @@ export function overrideModifiers(isPlayer: boolean = true): void {
         globalScene.addEnemyModifier(modifier, true, true);
       }
     }
-  });
+  }
 }
 
 /**
@@ -3762,8 +3858,10 @@ export function overrideModifiers(isPlayer: boolean = true): void {
  * @param pokemon {@linkcode Pokemon} whose held items are being overridden
  * @param isPlayer {@linkcode boolean} for whether the {@linkcode pokemon} is the player's (`true`) or an enemy (`false`)
  */
-export function overrideHeldItems(pokemon: Pokemon, isPlayer: boolean = true): void {
-  const heldItemsOverride: ModifierOverride[] = isPlayer ? Overrides.STARTING_HELD_ITEMS_OVERRIDE : Overrides.OPP_HELD_ITEMS_OVERRIDE;
+export function overrideHeldItems(pokemon: Pokemon, isPlayer = true): void {
+  const heldItemsOverride: ModifierOverride[] = isPlayer
+    ? Overrides.STARTING_HELD_ITEMS_OVERRIDE
+    : Overrides.OPP_HELD_ITEMS_OVERRIDE;
   if (!heldItemsOverride || heldItemsOverride.length === 0 || !globalScene) {
     return;
   }
@@ -3772,17 +3870,18 @@ export function overrideHeldItems(pokemon: Pokemon, isPlayer: boolean = true): v
     globalScene.clearEnemyHeldItemModifiers(pokemon);
   }
 
-  heldItemsOverride.forEach(item => {
+  for (const item of heldItemsOverride) {
     const modifierFunc = modifierTypes[item.name];
     let modifierType: ModifierType | null = modifierFunc();
     const qty = item.count || 1;
 
     if (modifierType instanceof ModifierTypeGenerator) {
-      const pregenArgs = ("type" in item) && (item.type !== null) ? [ item.type ] : undefined;
+      const pregenArgs = "type" in item && item.type !== null ? [item.type] : undefined;
       modifierType = modifierType.generateType([], pregenArgs);
     }
 
-    const heldItemModifier = modifierType && modifierType.withIdFromFunc(modifierFunc).newModifier(pokemon) as PokemonHeldItemModifier;
+    const heldItemModifier =
+      modifierType && (modifierType.withIdFromFunc(modifierFunc).newModifier(pokemon) as PokemonHeldItemModifier);
     if (heldItemModifier) {
       heldItemModifier.pokemonId = pokemon.id;
       heldItemModifier.stackCount = qty;
@@ -3792,5 +3891,5 @@ export function overrideHeldItems(pokemon: Pokemon, isPlayer: boolean = true): v
         globalScene.addEnemyModifier(heldItemModifier, true, true);
       }
     }
-  });
+  }
 }
diff --git a/src/overrides.ts b/src/overrides.ts
index e53d3b766c4..5bbd29b355f 100644
--- a/src/overrides.ts
+++ b/src/overrides.ts
@@ -1,22 +1,33 @@
-/* eslint-disable @typescript-eslint/consistent-type-imports */
 import { type PokeballCounts } from "#app/battle-scene";
+import { EvolutionItem } from "#app/data/balance/pokemon-evolutions";
 import { Gender } from "#app/data/gender";
-import { Variant } from "#app/data/variant";
+import { FormChangeItem } from "#app/data/pokemon-forms";
 import { type ModifierOverride } from "#app/modifier/modifier-type";
+import { Variant } from "#app/sprites/variant";
 import { Unlockables } from "#app/system/unlockables";
 import { Abilities } from "#enums/abilities";
+import { BattleType } from "#enums/battle-type";
+import { BerryType } from "#enums/berry-type";
 import { Biome } from "#enums/biome";
 import { EggTier } from "#enums/egg-type";
 import { Moves } from "#enums/moves";
 import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
 import { MysteryEncounterType } from "#enums/mystery-encounter-type";
 import { PokeballType } from "#enums/pokeball";
+import { PokemonType } from "#enums/pokemon-type";
 import { Species } from "#enums/species";
+import { Stat } from "#enums/stat";
 import { StatusEffect } from "#enums/status-effect";
 import { TimeOfDay } from "#enums/time-of-day";
+import { TrainerType } from "#enums/trainer-type";
 import { VariantTier } from "#enums/variant-tier";
 import { WeatherType } from "#enums/weather-type";
 
+/**
+ * This comment block exists to prevent IDEs from automatically removing unused imports
+ * {@linkcode BerryType}, {@linkcode EvolutionItem}, {@linkcode FormChangeItem}
+ * {@linkcode Stat}, {@linkcode PokemonType}
+ */
 /**
  * Overrides that are using when testing different in game situations
  *
@@ -32,7 +43,7 @@ import { WeatherType } from "#enums/weather-type";
  * }
  * ```
  */
-const overrides = {} satisfies Partial<InstanceType<typeof DefaultOverrides>>;
+const overrides = {} satisfies Partial<InstanceType<OverridesType>>;
 
 /**
  * If you need to add Overrides values for local testing do that inside {@linkcode overrides}
@@ -47,6 +58,7 @@ class DefaultOverrides {
   // -----------------
   /** a specific seed (default: a random string of 24 characters) */
   readonly SEED_OVERRIDE: string = "";
+  readonly DAILY_RUN_SEED_OVERRIDE: string | null = null;
   readonly WEATHER_OVERRIDE: WeatherType = WeatherType.NONE;
   /**
    * If `null`, ignore this override.
@@ -59,7 +71,7 @@ class DefaultOverrides {
    *
    * If `"odd-doubles"`, follow the `"double"` rule on odd wave numbers, and follow the `"single"` rule on even wave numbers.
    */
-  readonly BATTLE_TYPE_OVERRIDE: BattleStyle | null = null;
+  readonly BATTLE_STYLE_OVERRIDE: BattleStyle | null = null;
   readonly STARTING_WAVE_OVERRIDE: number = 0;
   readonly STARTING_BIOME_OVERRIDE: Biome = Biome.TOWN;
   readonly ARENA_TINT_OVERRIDE: TimeOfDay | null = null;
@@ -92,8 +104,16 @@ class DefaultOverrides {
   readonly BYPASS_TUTORIAL_SKIP_OVERRIDE: boolean = false;
   /** Set to `true` to be able to re-earn already unlocked achievements */
   readonly ACHIEVEMENTS_REUNLOCK_OVERRIDE: boolean = false;
-  /** Set to `true` to force Paralysis and Freeze to always activate, or `false` to force them to not activate */
+  /**
+   * Set to `true` to force Paralysis and Freeze to always activate,
+   * or `false` to force them to not activate (or clear for freeze).
+   */
   readonly STATUS_ACTIVATION_OVERRIDE: boolean | null = null;
+  /**
+   * Set to `true` to force confusion to always trigger,
+   * or `false` to force it to never trigger.
+   */
+  readonly CONFUSION_ACTIVATION_OVERRIDE: boolean | null = null;
 
   // ----------------
   // PLAYER OVERRIDES
@@ -244,6 +264,21 @@ class DefaultOverrides {
    * Note that, for all items in the array, `count` is not used.
    */
   readonly ITEM_REWARD_OVERRIDE: ModifierOverride[] = [];
+
+  /**
+   * If `true`, disable all non-scripted opponent trainer encounters.
+   */
+  readonly DISABLE_STANDARD_TRAINERS_OVERRIDE: boolean = false;
+
+  /**
+   * Set all non-scripted waves to use the selected battle type.
+   * 
+   * Ignored if set to {@linkcode BattleType.TRAINER} and `DISABLE_STANDARD_TRAINERS_OVERRIDE` is `true`.
+   */
+  readonly BATTLE_TYPE_OVERRIDE: Exclude<BattleType, BattleType.CLEAR> | null = null;
+
+  /** Force all random trainer types to be the provided type. */
+  readonly RANDOM_TRAINER_OVERRIDE: RandomTrainerOverride | null = null;
 }
 
 export const defaultOverrides = new DefaultOverrides();
@@ -254,3 +289,13 @@ export default {
 } satisfies InstanceType<typeof DefaultOverrides>;
 
 export type BattleStyle = "double" | "single" | "even-doubles" | "odd-doubles";
+
+export type RandomTrainerOverride = {
+  /** The Type of trainer to force */
+  trainerType: Exclude<TrainerType, TrainerType.UNKNOWN>,
+  /* If the selected trainer type has a double version, it will always use its double version. */
+  alwaysDouble?: boolean
+}
+
+/** The type of the {@linkcode DefaultOverrides} class */
+export type OverridesType = typeof DefaultOverrides;
\ No newline at end of file
diff --git a/src/phase.ts b/src/phase.ts
index 8da00d78b61..20cc7cc4063 100644
--- a/src/phase.ts
+++ b/src/phase.ts
@@ -1,11 +1,7 @@
 import { globalScene } from "#app/global-scene";
 
 export class Phase {
-  start() {
-    if (globalScene.abilityBar.shown) {
-      globalScene.abilityBar.resetAutoHideTimer();
-    }
-  }
+  start() {}
 
   end() {
     globalScene.shiftPhase();
diff --git a/src/phases/add-enemy-buff-modifier-phase.ts b/src/phases/add-enemy-buff-modifier-phase.ts
index d79b4f6eca5..16ed78e6d0d 100644
--- a/src/phases/add-enemy-buff-modifier-phase.ts
+++ b/src/phases/add-enemy-buff-modifier-phase.ts
@@ -1,26 +1,38 @@
 import { ModifierTier } from "#app/modifier/modifier-tier";
-import { regenerateModifierPoolThresholds, ModifierPoolType, getEnemyBuffModifierForWave } from "#app/modifier/modifier-type";
+import {
+  regenerateModifierPoolThresholds,
+  ModifierPoolType,
+  getEnemyBuffModifierForWave,
+} from "#app/modifier/modifier-type";
 import { EnemyPersistentModifier } from "#app/modifier/modifier";
 import { Phase } from "#app/phase";
 import { globalScene } from "#app/global-scene";
 
 export class AddEnemyBuffModifierPhase extends Phase {
-  constructor() {
-    super();
-  }
-
   start() {
     super.start();
 
     const waveIndex = globalScene.currentBattle.waveIndex;
-    const tier = !(waveIndex % 1000) ? ModifierTier.ULTRA : !(waveIndex % 250) ? ModifierTier.GREAT : ModifierTier.COMMON;
+    const tier = !(waveIndex % 1000)
+      ? ModifierTier.ULTRA
+      : !(waveIndex % 250)
+        ? ModifierTier.GREAT
+        : ModifierTier.COMMON;
 
     regenerateModifierPoolThresholds(globalScene.getEnemyParty(), ModifierPoolType.ENEMY_BUFF);
 
     const count = Math.ceil(waveIndex / 250);
     for (let i = 0; i < count; i++) {
-      globalScene.addEnemyModifier(getEnemyBuffModifierForWave(tier, globalScene.findModifiers(m => m instanceof EnemyPersistentModifier, false)), true, true);
+      globalScene.addEnemyModifier(
+        getEnemyBuffModifierForWave(
+          tier,
+          globalScene.findModifiers(m => m instanceof EnemyPersistentModifier, false),
+        ),
+        true,
+        true,
+      );
     }
-    globalScene.updateModifiers(false, true).then(() => this.end());
+    globalScene.updateModifiers(false, true);
+    this.end();
   }
 }
diff --git a/src/phases/attempt-capture-phase.ts b/src/phases/attempt-capture-phase.ts
index 77a8043aee9..8592cd98508 100644
--- a/src/phases/attempt-capture-phase.ts
+++ b/src/phases/attempt-capture-phase.ts
@@ -1,7 +1,13 @@
 import { BattlerIndex } from "#app/battle";
 import { PLAYER_PARTY_MAX_SIZE } from "#app/constants";
 import { SubstituteTag } from "#app/data/battler-tags";
-import { doPokeballBounceAnim, getPokeballAtlasKey, getPokeballCatchMultiplier, getPokeballTintColor, getCriticalCaptureChance } from "#app/data/pokeball";
+import {
+  doPokeballBounceAnim,
+  getPokeballAtlasKey,
+  getPokeballCatchMultiplier,
+  getPokeballTintColor,
+  getCriticalCaptureChance,
+} from "#app/data/pokeball";
 import { getStatusEffectCatchRateMultiplier } from "#app/data/status-effect";
 import { addPokeballCaptureStars, addPokeballOpenParticles } from "#app/field/anims";
 import type { EnemyPokemon } from "#app/field/pokemon";
@@ -13,11 +19,12 @@ import { achvs } from "#app/system/achv";
 import type { PartyOption } from "#app/ui/party-ui-handler";
 import { PartyUiMode } from "#app/ui/party-ui-handler";
 import { SummaryUiMode } from "#app/ui/summary-ui-handler";
-import { Mode } from "#app/ui/ui";
+import { UiMode } from "#enums/ui-mode";
 import type { PokeballType } from "#enums/pokeball";
 import { StatusEffect } from "#enums/status-effect";
 import i18next from "i18next";
 import { globalScene } from "#app/global-scene";
+import { Gender } from "#app/data/gender";
 
 export class AttemptCapturePhase extends PokemonPhase {
   private pokeballType: PokeballType;
@@ -54,9 +61,9 @@ export class AttemptCapturePhase extends PokemonPhase {
     const pokeballMultiplier = getPokeballCatchMultiplier(this.pokeballType);
     const statusMultiplier = pokemon.status ? getStatusEffectCatchRateMultiplier(pokemon.status.effect) : 1;
     const modifiedCatchRate = Math.round((((_3m - _2h) * catchRate * pokeballMultiplier) / _3m) * statusMultiplier);
-    const shakeProbability = Math.round(65536 / Math.pow((255 / modifiedCatchRate), 0.1875)); // Formula taken from gen 6
+    const shakeProbability = Math.round(65536 / Math.pow(255 / modifiedCatchRate, 0.1875)); // Formula taken from gen 6
     const criticalCaptureChance = getCriticalCaptureChance(modifiedCatchRate);
-    const isCritical = pokemon.randSeedInt(256) < criticalCaptureChance;
+    const isCritical = pokemon.randBattleSeedInt(256) < criticalCaptureChance;
     const fpOffset = pokemon.getFieldPositionOffset();
 
     const pokeballAtlasKey = getPokeballAtlasKey(this.pokeballType);
@@ -124,13 +131,18 @@ export class AttemptCapturePhase extends PokemonPhase {
                     this.failCatch(shakeCount);
                   } else if (shakeCount++ < (isCritical ? 1 : 3)) {
                     // Shake check (skip check for critical or guaranteed captures, but still play the sound)
-                    if (pokeballMultiplier === -1 || isCritical || modifiedCatchRate >= 255 || pokemon.randSeedInt(65536) < shakeProbability) {
+                    if (
+                      pokeballMultiplier === -1 ||
+                      isCritical ||
+                      modifiedCatchRate >= 255 ||
+                      pokemon.randBattleSeedInt(65536) < shakeProbability
+                    ) {
                       globalScene.playSound("se/pb_move");
                     } else {
                       shakeCounter.stop();
                       this.failCatch(shakeCount);
                     }
-                  } else if (isCritical && pokemon.randSeedInt(65536) >= shakeProbability) {
+                  } else if (isCritical && pokemon.randBattleSeedInt(65536) >= shakeProbability) {
                     // Above, perform the one shake check for critical captures after the ball shakes once
                     shakeCounter.stop();
                     this.failCatch(shakeCount);
@@ -154,27 +166,29 @@ export class AttemptCapturePhase extends PokemonPhase {
                           alpha: 0,
                           duration: 200,
                           easing: "Sine.easeIn",
-                          onComplete: () => pbTint.destroy()
+                          onComplete: () => pbTint.destroy(),
                         });
-                      }
+                      },
                     });
                   }
                 },
                 onComplete: () => {
                   this.catch();
-                }
+                },
               });
             };
 
             // Ball bounces (handled in pokemon.ts)
-            globalScene.time.delayedCall(250, () => doPokeballBounceAnim(this.pokeball, 16, 72, 350, doShake, isCritical));
-          }
+            globalScene.time.delayedCall(250, () =>
+              doPokeballBounceAnim(this.pokeball, 16, 72, 350, doShake, isCritical),
+            );
+          },
         });
-      }
+      },
     });
   }
 
-  failCatch(shakeCount: number) {
+  failCatch(_shakeCount: number) {
     const pokemon = this.getPokemon();
 
     globalScene.playSound("se/pb_rel");
@@ -199,7 +213,7 @@ export class AttemptCapturePhase extends PokemonPhase {
       targets: pokemon,
       duration: 250,
       ease: "Sine.easeOut",
-      scale: 1
+      scale: 1,
     });
 
     globalScene.currentBattle.lastUsedPokeball = this.pokeballType;
@@ -212,7 +226,10 @@ export class AttemptCapturePhase extends PokemonPhase {
 
     const speciesForm = !pokemon.fusionSpecies ? pokemon.getSpeciesForm() : pokemon.getFusionSpeciesForm();
 
-    if (speciesForm.abilityHidden && (pokemon.fusionSpecies ? pokemon.fusionAbilityIndex : pokemon.abilityIndex) === speciesForm.getAbilityCount() - 1) {
+    if (
+      speciesForm.abilityHidden &&
+      (pokemon.fusionSpecies ? pokemon.fusionAbilityIndex : pokemon.abilityIndex) === speciesForm.getAbilityCount() - 1
+    ) {
       globalScene.validateAchv(achvs.HIDDEN_ABILITY);
     }
 
@@ -232,72 +249,135 @@ export class AttemptCapturePhase extends PokemonPhase {
 
     globalScene.gameData.updateSpeciesDexIvs(pokemon.species.getRootSpeciesId(true), pokemon.ivs);
 
-    globalScene.ui.showText(i18next.t("battle:pokemonCaught", { pokemonName: getPokemonNameWithAffix(pokemon) }), null, () => {
-      const end = () => {
-        globalScene.unshiftPhase(new VictoryPhase(this.battlerIndex));
-        globalScene.pokemonInfoContainer.hide();
-        this.removePb();
-        this.end();
-      };
-      const removePokemon = () => {
-        globalScene.addFaintedEnemyScore(pokemon);
-        pokemon.hp = 0;
-        pokemon.trySetStatus(StatusEffect.FAINT);
-        globalScene.clearEnemyHeldItemModifiers();
-        pokemon.leaveField(true, true, true);
-      };
-      const addToParty = (slotIndex?: number) => {
-        const newPokemon = pokemon.addToParty(this.pokeballType, slotIndex);
-        const modifiers = globalScene.findModifiers(m => m instanceof PokemonHeldItemModifier, false);
-        if (globalScene.getPlayerParty().filter(p => p.isShiny()).length === PLAYER_PARTY_MAX_SIZE) {
-          globalScene.validateAchv(achvs.SHINY_PARTY);
-        }
-        Promise.all(modifiers.map(m => globalScene.addModifier(m, true))).then(() => {
-          globalScene.updateModifiers(true);
-          removePokemon();
-          if (newPokemon) {
-            newPokemon.loadAssets().then(end);
+    globalScene.ui.showText(
+      i18next.t("battle:pokemonCaught", {
+        pokemonName: getPokemonNameWithAffix(pokemon),
+      }),
+      null,
+      () => {
+        const end = () => {
+          globalScene.unshiftPhase(new VictoryPhase(this.battlerIndex));
+          globalScene.pokemonInfoContainer.hide();
+          this.removePb();
+          this.end();
+        };
+        const removePokemon = () => {
+          globalScene.addFaintedEnemyScore(pokemon);
+          pokemon.hp = 0;
+          pokemon.trySetStatus(StatusEffect.FAINT);
+          globalScene.clearEnemyHeldItemModifiers();
+          pokemon.leaveField(true, true, true);
+        };
+        const addToParty = (slotIndex?: number) => {
+          const newPokemon = pokemon.addToParty(this.pokeballType, slotIndex);
+          const modifiers = globalScene.findModifiers(m => m instanceof PokemonHeldItemModifier, false);
+          if (globalScene.getPlayerParty().filter(p => p.isShiny()).length === PLAYER_PARTY_MAX_SIZE) {
+            globalScene.validateAchv(achvs.SHINY_PARTY);
+          }
+          Promise.all(modifiers.map(m => globalScene.addModifier(m, true))).then(() => {
+            globalScene.updateModifiers(true);
+            removePokemon();
+            if (newPokemon) {
+              newPokemon.loadAssets().then(end);
+            } else {
+              end();
+            }
+          });
+        };
+        Promise.all([pokemon.hideInfo(), globalScene.gameData.setPokemonCaught(pokemon)]).then(() => {
+          if (globalScene.getPlayerParty().length === PLAYER_PARTY_MAX_SIZE) {
+            const promptRelease = () => {
+              globalScene.ui.showText(
+                i18next.t("battle:partyFull", {
+                  pokemonName: pokemon.getNameToRender(),
+                }),
+                null,
+                () => {
+                  globalScene.pokemonInfoContainer.makeRoomForConfirmUi(1, true);
+                  globalScene.ui.setMode(
+                    UiMode.CONFIRM,
+                    () => {
+                      const newPokemon = globalScene.addPlayerPokemon(
+                        pokemon.species,
+                        pokemon.level,
+                        pokemon.abilityIndex,
+                        pokemon.formIndex,
+                        pokemon.gender,
+                        pokemon.shiny,
+                        pokemon.variant,
+                        pokemon.ivs,
+                        pokemon.nature,
+                        pokemon,
+                      );
+                      globalScene.ui.setMode(
+                        UiMode.SUMMARY,
+                        newPokemon,
+                        0,
+                        SummaryUiMode.DEFAULT,
+                        () => {
+                          globalScene.ui.setMode(UiMode.MESSAGE).then(() => {
+                            promptRelease();
+                          });
+                        },
+                        false,
+                      );
+                    },
+                    () => {
+                      const attributes = {
+                        shiny: pokemon.shiny,
+                        variant: pokemon.variant,
+                        form: pokemon.formIndex,
+                        female: pokemon.gender === Gender.FEMALE,
+                      };
+                      globalScene.ui.setOverlayMode(
+                        UiMode.POKEDEX_PAGE,
+                        pokemon.species,
+                        attributes,
+                        null,
+                        null,
+                        () => {
+                          globalScene.ui.setMode(UiMode.MESSAGE).then(() => {
+                            promptRelease();
+                          });
+                        },
+                      );
+                    },
+                    () => {
+                      globalScene.ui.setMode(
+                        UiMode.PARTY,
+                        PartyUiMode.RELEASE,
+                        this.fieldIndex,
+                        (slotIndex: number, _option: PartyOption) => {
+                          globalScene.ui.setMode(UiMode.MESSAGE).then(() => {
+                            if (slotIndex < 6) {
+                              addToParty(slotIndex);
+                            } else {
+                              promptRelease();
+                            }
+                          });
+                        },
+                      );
+                    },
+                    () => {
+                      globalScene.ui.setMode(UiMode.MESSAGE).then(() => {
+                        removePokemon();
+                        end();
+                      });
+                    },
+                    "fullParty",
+                  );
+                },
+              );
+            };
+            promptRelease();
           } else {
-            end();
+            addToParty();
           }
         });
-      };
-      Promise.all([ pokemon.hideInfo(), globalScene.gameData.setPokemonCaught(pokemon) ]).then(() => {
-        if (globalScene.getPlayerParty().length === PLAYER_PARTY_MAX_SIZE) {
-          const promptRelease = () => {
-            globalScene.ui.showText(i18next.t("battle:partyFull", { pokemonName: pokemon.getNameToRender() }), null, () => {
-              globalScene.pokemonInfoContainer.makeRoomForConfirmUi(1, true);
-              globalScene.ui.setMode(Mode.CONFIRM, () => {
-                const newPokemon = globalScene.addPlayerPokemon(pokemon.species, pokemon.level, pokemon.abilityIndex, pokemon.formIndex, pokemon.gender, pokemon.shiny, pokemon.variant, pokemon.ivs, pokemon.nature, pokemon);
-                globalScene.ui.setMode(Mode.SUMMARY, newPokemon, 0, SummaryUiMode.DEFAULT, () => {
-                  globalScene.ui.setMode(Mode.MESSAGE).then(() => {
-                    promptRelease();
-                  });
-                }, false);
-              }, () => {
-                globalScene.ui.setMode(Mode.PARTY, PartyUiMode.RELEASE, this.fieldIndex, (slotIndex: number, _option: PartyOption) => {
-                  globalScene.ui.setMode(Mode.MESSAGE).then(() => {
-                    if (slotIndex < 6) {
-                      addToParty(slotIndex);
-                    } else {
-                      promptRelease();
-                    }
-                  });
-                });
-              }, () => {
-                globalScene.ui.setMode(Mode.MESSAGE).then(() => {
-                  removePokemon();
-                  end();
-                });
-              }, "fullParty");
-            });
-          };
-          promptRelease();
-        } else {
-          addToParty();
-        }
-      });
-    }, 0, true);
+      },
+      0,
+      true,
+    );
   }
 
   removePb() {
@@ -307,7 +387,7 @@ export class AttemptCapturePhase extends PokemonPhase {
       delay: 250,
       ease: "Sine.easeIn",
       alpha: 0,
-      onComplete: () => this.pokeball.destroy()
+      onComplete: () => this.pokeball.destroy(),
     });
   }
 }
diff --git a/src/phases/attempt-run-phase.ts b/src/phases/attempt-run-phase.ts
index 72a108c1991..15c521c01fc 100644
--- a/src/phases/attempt-run-phase.ts
+++ b/src/phases/attempt-run-phase.ts
@@ -1,24 +1,25 @@
-import { applyAbAttrs, RunSuccessAbAttr } from "#app/data/ability";
-import { Stat } from "#app/enums/stat";
-import { StatusEffect } from "#app/enums/status-effect";
+import {
+  applyAbAttrs,
+  applyPreLeaveFieldAbAttrs,
+  PreLeaveFieldAbAttr,
+  RunSuccessAbAttr,
+} from "#app/data/abilities/ability";
+import { Stat } from "#enums/stat";
+import { StatusEffect } from "#enums/status-effect";
 import type { PlayerPokemon, EnemyPokemon } from "#app/field/pokemon";
 import type Pokemon from "#app/field/pokemon";
 import i18next from "i18next";
-import * as Utils from "#app/utils";
+import { NumberHolder } from "#app/utils/common";
 import { BattleEndPhase } from "./battle-end-phase";
 import { NewBattlePhase } from "./new-battle-phase";
 import { PokemonPhase } from "./pokemon-phase";
 import { globalScene } from "#app/global-scene";
+import { SelectBiomePhase } from "./select-biome-phase";
 
 export class AttemptRunPhase extends PokemonPhase {
-
   /** For testing purposes: this is to force the pokemon to fail and escape */
   public forceFailEscape = false;
 
-  constructor(fieldIndex: number) {
-    super(fieldIndex);
-  }
-
   start() {
     super.start();
 
@@ -27,26 +28,31 @@ export class AttemptRunPhase extends PokemonPhase {
 
     const playerPokemon = this.getPokemon();
 
-    const escapeChance = new Utils.NumberHolder(0);
+    const escapeChance = new NumberHolder(0);
 
     this.attemptRunAway(playerField, enemyField, escapeChance);
 
     applyAbAttrs(RunSuccessAbAttr, playerPokemon, null, false, escapeChance);
 
-    if (playerPokemon.randSeedInt(100) < escapeChance.value && !this.forceFailEscape) {
+    if (playerPokemon.randBattleSeedInt(100) < escapeChance.value && !this.forceFailEscape) {
+      enemyField.forEach(enemyPokemon => applyPreLeaveFieldAbAttrs(PreLeaveFieldAbAttr, enemyPokemon));
+
       globalScene.playSound("se/flee");
       globalScene.queueMessage(i18next.t("battle:runAwaySuccess"), null, true, 500);
 
       globalScene.tweens.add({
-        targets: [ globalScene.arenaEnemy, enemyField ].flat(),
+        targets: [globalScene.arenaEnemy, enemyField].flat(),
         alpha: 0,
         duration: 250,
         ease: "Sine.easeIn",
-        onComplete: () => enemyField.forEach(enemyPokemon => enemyPokemon.destroy())
+        onComplete: () =>
+          // biome-ignore lint/complexity/noForEach: TODO
+          enemyField.forEach(enemyPokemon => enemyPokemon.destroy()),
       });
 
       globalScene.clearEnemyHeldItemModifiers();
 
+      // biome-ignore lint/complexity/noForEach: TODO
       enemyField.forEach(enemyPokemon => {
         enemyPokemon.hideInfo().then(() => enemyPokemon.destroy());
         enemyPokemon.hp = 0;
@@ -54,6 +60,11 @@ export class AttemptRunPhase extends PokemonPhase {
       });
 
       globalScene.pushPhase(new BattleEndPhase(false));
+
+      if (globalScene.gameMode.hasRandomBiomes || globalScene.isNewBiome()) {
+        globalScene.pushPhase(new SelectBiomePhase());
+      }
+
       globalScene.pushPhase(new NewBattlePhase());
     } else {
       playerPokemon.turnData.failedRunAway = true;
@@ -63,11 +74,17 @@ export class AttemptRunPhase extends PokemonPhase {
     this.end();
   }
 
-  attemptRunAway(playerField: PlayerPokemon[], enemyField: EnemyPokemon[], escapeChance: Utils.NumberHolder) {
+  attemptRunAway(playerField: PlayerPokemon[], enemyField: EnemyPokemon[], escapeChance: NumberHolder) {
     /** Sum of the speed of all enemy pokemon on the field */
-    const enemySpeed = enemyField.reduce((total: number, enemyPokemon: Pokemon) => total + enemyPokemon.getStat(Stat.SPD), 0);
+    const enemySpeed = enemyField.reduce(
+      (total: number, enemyPokemon: Pokemon) => total + enemyPokemon.getStat(Stat.SPD),
+      0,
+    );
     /** Sum of the speed of all player pokemon on the field */
-    const playerSpeed = playerField.reduce((total: number, playerPokemon: Pokemon) => total + playerPokemon.getStat(Stat.SPD), 0);
+    const playerSpeed = playerField.reduce(
+      (total: number, playerPokemon: Pokemon) => total + playerPokemon.getStat(Stat.SPD),
+      0,
+    );
 
     /*  The way the escape chance works is by looking at the difference between your speed and the enemy field's average speed as a ratio. The higher this ratio, the higher your chance of success.
      *  However, there is a cap for the ratio of your speed vs enemy speed which beyond that point, you won't gain any advantage. It also looks at how many times you've tried to escape.
@@ -104,6 +121,10 @@ export class AttemptRunPhase extends PokemonPhase {
     const escapeSlope = (maxChance - minChance) / speedCap;
 
     // This will calculate the escape chance given all of the above and clamp it to the range of [`minChance`, `maxChance`]
-    escapeChance.value = Phaser.Math.Clamp(Math.round((escapeSlope * speedRatio) + minChance + (escapeBonus * globalScene.currentBattle.escapeAttempts++)), minChance, maxChance);
+    escapeChance.value = Phaser.Math.Clamp(
+      Math.round(escapeSlope * speedRatio + minChance + escapeBonus * globalScene.currentBattle.escapeAttempts++),
+      minChance,
+      maxChance,
+    );
   }
 }
diff --git a/src/phases/battle-end-phase.ts b/src/phases/battle-end-phase.ts
index edffd8498d6..b4bb28fe55e 100644
--- a/src/phases/battle-end-phase.ts
+++ b/src/phases/battle-end-phase.ts
@@ -1,5 +1,5 @@
 import { globalScene } from "#app/global-scene";
-import { applyPostBattleAbAttrs, PostBattleAbAttr } from "#app/data/ability";
+import { applyPostBattleAbAttrs, PostBattleAbAttr } from "#app/data/abilities/ability";
 import { LapsingPersistentModifier, LapsingPokemonHeldItemModifier } from "#app/modifier/modifier";
 import { BattlePhase } from "./battle-phase";
 import { GameOverPhase } from "./game-over-phase";
@@ -17,8 +17,30 @@ export class BattleEndPhase extends BattlePhase {
   start() {
     super.start();
 
+    // cull any extra `BattleEnd` phases from the queue.
+    globalScene.phaseQueue = globalScene.phaseQueue.filter(phase => {
+      if (phase instanceof BattleEndPhase) {
+        this.isVictory ||= phase.isVictory;
+        return false;
+      }
+      return true;
+    });
+    // `phaseQueuePrepend` is private, so we have to use this inefficient loop.
+    while (
+      globalScene.tryRemoveUnshiftedPhase(phase => {
+        if (phase instanceof BattleEndPhase) {
+          this.isVictory ||= phase.isVictory;
+          return true;
+        }
+        return false;
+      })
+    ) {}
+
     globalScene.gameData.gameStats.battles++;
-    if (globalScene.gameMode.isEndless && globalScene.currentBattle.waveIndex + 1 > globalScene.gameData.gameStats.highestEndlessWave) {
+    if (
+      globalScene.gameMode.isEndless &&
+      globalScene.currentBattle.waveIndex + 1 > globalScene.gameData.gameStats.highestEndlessWave
+    ) {
       globalScene.gameData.gameStats.highestEndlessWave = globalScene.currentBattle.waveIndex + 1;
     }
 
@@ -37,8 +59,8 @@ export class BattleEndPhase extends BattlePhase {
     }
 
     for (const pokemon of globalScene.getField()) {
-      if (pokemon && pokemon.battleSummonData) {
-        pokemon.battleSummonData.waveTurnCount = 1;
+      if (pokemon) {
+        pokemon.tempSummonData.waveTurnCount = 1;
       }
     }
 
@@ -51,8 +73,17 @@ export class BattleEndPhase extends BattlePhase {
     }
 
     globalScene.clearEnemyHeldItemModifiers();
+    for (const p of globalScene.getEnemyParty()) {
+      try {
+        p.destroy();
+      } catch {
+        console.warn("Unable to destroy stale pokemon object in BattleEndPhase:", p);
+      }
+    }
 
-    const lapsingModifiers = globalScene.findModifiers(m => m instanceof LapsingPersistentModifier || m instanceof LapsingPokemonHeldItemModifier) as (LapsingPersistentModifier | LapsingPokemonHeldItemModifier)[];
+    const lapsingModifiers = globalScene.findModifiers(
+      m => m instanceof LapsingPersistentModifier || m instanceof LapsingPokemonHeldItemModifier,
+    ) as (LapsingPersistentModifier | LapsingPokemonHeldItemModifier)[];
     for (const m of lapsingModifiers) {
       const args: any[] = [];
       if (m instanceof LapsingPokemonHeldItemModifier) {
@@ -63,6 +94,7 @@ export class BattleEndPhase extends BattlePhase {
       }
     }
 
-    globalScene.updateModifiers().then(() => this.end());
+    globalScene.updateModifiers();
+    this.end();
   }
 }
diff --git a/src/phases/battle-phase.ts b/src/phases/battle-phase.ts
index 4fc826b7957..d70b3909639 100644
--- a/src/phases/battle-phase.ts
+++ b/src/phases/battle-phase.ts
@@ -1,18 +1,18 @@
 import { globalScene } from "#app/global-scene";
-import { TrainerSlot } from "#app/data/trainer-config";
+import { TrainerSlot } from "#enums/trainer-slot";
 import { Phase } from "#app/phase";
 
 export class BattlePhase extends Phase {
-  constructor() {
-    super();
-  }
-
   showEnemyTrainer(trainerSlot: TrainerSlot = TrainerSlot.NONE): void {
-    const sprites = globalScene.currentBattle.trainer?.getSprites()!; // TODO: is this bang correct?
-    const tintSprites = globalScene.currentBattle.trainer?.getTintSprites()!; // TODO: is this bang correct?
+    if (!globalScene.currentBattle.trainer) {
+      console.warn("Enemy trainer is missing!");
+      return;
+    }
+    const sprites = globalScene.currentBattle.trainer.getSprites();
+    const tintSprites = globalScene.currentBattle.trainer.getTintSprites();
     for (let i = 0; i < sprites.length; i++) {
       const visible = !trainerSlot || !i === (trainerSlot === TrainerSlot.TRAINER) || sprites.length < 2;
-      [ sprites[i], tintSprites[i] ].map(sprite => {
+      [sprites[i], tintSprites[i]].map(sprite => {
         if (visible) {
           sprite.x = trainerSlot || sprites.length < 2 ? 0 : i ? 16 : -16;
         }
@@ -30,7 +30,7 @@ export class BattlePhase extends Phase {
       y: "+=16",
       alpha: 1,
       ease: "Sine.easeInOut",
-      duration: 750
+      duration: 750,
     });
   }
 
@@ -41,7 +41,7 @@ export class BattlePhase extends Phase {
       y: "-=16",
       alpha: 0,
       ease: "Sine.easeInOut",
-      duration: 750
+      duration: 750,
     });
   }
 }
diff --git a/src/phases/berry-phase.ts b/src/phases/berry-phase.ts
index dd56e8b37d7..b027469ea5e 100644
--- a/src/phases/berry-phase.ts
+++ b/src/phases/berry-phase.ts
@@ -1,50 +1,77 @@
-import { applyAbAttrs, PreventBerryUseAbAttr, HealFromBerryUseAbAttr } from "#app/data/ability";
+import {
+  applyAbAttrs,
+  PreventBerryUseAbAttr,
+  HealFromBerryUseAbAttr,
+  RepeatBerryNextTurnAbAttr,
+} from "#app/data/abilities/ability";
 import { CommonAnim } from "#app/data/battle-anims";
 import { BerryUsedEvent } from "#app/events/battle-scene";
 import { getPokemonNameWithAffix } from "#app/messages";
 import { BerryModifier } from "#app/modifier/modifier";
 import i18next from "i18next";
-import * as Utils from "#app/utils";
+import { BooleanHolder } from "#app/utils/common";
 import { FieldPhase } from "./field-phase";
 import { CommonAnimPhase } from "./common-anim-phase";
 import { globalScene } from "#app/global-scene";
+import type Pokemon from "#app/field/pokemon";
 
-/** The phase after attacks where the pokemon eat berries */
+/**
+ * The phase after attacks where the pokemon eat berries.
+ * Also triggers Cud Chew's "repeat berry use" effects
+ */
 export class BerryPhase extends FieldPhase {
   start() {
     super.start();
 
-    this.executeForAll((pokemon) => {
-      const hasUsableBerry = !!globalScene.findModifier((m) => {
-        return m instanceof BerryModifier && m.shouldApply(pokemon);
-      }, pokemon.isPlayer());
-
-      if (hasUsableBerry) {
-        const cancelled = new Utils.BooleanHolder(false);
-        pokemon.getOpponents().map((opp) => applyAbAttrs(PreventBerryUseAbAttr, opp, cancelled));
-
-        if (cancelled.value) {
-          globalScene.queueMessage(i18next.t("abilityTriggers:preventBerryUse", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
-        } else {
-          globalScene.unshiftPhase(
-            new CommonAnimPhase(pokemon.getBattlerIndex(), pokemon.getBattlerIndex(), CommonAnim.USE_ITEM)
-          );
-
-          for (const berryModifier of globalScene.applyModifiers(BerryModifier, pokemon.isPlayer(), pokemon)) {
-            if (berryModifier.consumed) {
-              berryModifier.consumed = false;
-              pokemon.loseHeldItem(berryModifier);
-            }
-            globalScene.eventTarget.dispatchEvent(new BerryUsedEvent(berryModifier)); // Announce a berry was used
-          }
-
-          globalScene.updateModifiers(pokemon.isPlayer());
-
-          applyAbAttrs(HealFromBerryUseAbAttr, pokemon, new Utils.BooleanHolder(false));
-        }
-      }
+    this.executeForAll(pokemon => {
+      this.eatBerries(pokemon);
+      applyAbAttrs(RepeatBerryNextTurnAbAttr, pokemon, null);
     });
 
     this.end();
   }
+
+  /**
+   * Attempt to eat all of a given {@linkcode Pokemon}'s berries once.
+   * @param pokemon - The {@linkcode Pokemon} to check
+   */
+  eatBerries(pokemon: Pokemon): void {
+    const hasUsableBerry = !!globalScene.findModifier(
+      m => m instanceof BerryModifier && m.shouldApply(pokemon),
+      pokemon.isPlayer(),
+    );
+
+    if (!hasUsableBerry) {
+      return;
+    }
+
+    // TODO: If both opponents on field have unnerve, which one displays its message?
+    const cancelled = new BooleanHolder(false);
+    pokemon.getOpponents().forEach(opp => applyAbAttrs(PreventBerryUseAbAttr, opp, cancelled));
+    if (cancelled.value) {
+      globalScene.queueMessage(
+        i18next.t("abilityTriggers:preventBerryUse", {
+          pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
+        }),
+      );
+      return;
+    }
+
+    globalScene.unshiftPhase(
+      new CommonAnimPhase(pokemon.getBattlerIndex(), pokemon.getBattlerIndex(), CommonAnim.USE_ITEM),
+    );
+
+    for (const berryModifier of globalScene.applyModifiers(BerryModifier, pokemon.isPlayer(), pokemon)) {
+      // No need to track berries being eaten; already done inside applyModifiers
+      if (berryModifier.consumed) {
+        berryModifier.consumed = false;
+        pokemon.loseHeldItem(berryModifier);
+      }
+      globalScene.eventTarget.dispatchEvent(new BerryUsedEvent(berryModifier));
+    }
+    globalScene.updateModifiers(pokemon.isPlayer());
+
+    // Abilities.CHEEK_POUCH only works once per round of nom noms
+    applyAbAttrs(HealFromBerryUseAbAttr, pokemon, new BooleanHolder(false));
+  }
 }
diff --git a/src/phases/check-status-effect-phase.ts b/src/phases/check-status-effect-phase.ts
index 683c1ea1cd2..f59dfea9f02 100644
--- a/src/phases/check-status-effect-phase.ts
+++ b/src/phases/check-status-effect-phase.ts
@@ -4,8 +4,8 @@ import type { BattlerIndex } from "#app/battle";
 import { globalScene } from "#app/global-scene";
 
 export class CheckStatusEffectPhase extends Phase {
-  private order : BattlerIndex[];
-  constructor(order : BattlerIndex[]) {
+  private order: BattlerIndex[];
+  constructor(order: BattlerIndex[]) {
     super();
     this.order = order;
   }
@@ -13,7 +13,7 @@ export class CheckStatusEffectPhase extends Phase {
   start() {
     const field = globalScene.getField();
     for (const o of this.order) {
-      if (field[o].status && field[o].status.isPostTurn()) {
+      if (field[o].status?.isPostTurn()) {
         globalScene.unshiftPhase(new PostTurnStatusEffectPhase(o));
       }
     }
diff --git a/src/phases/check-switch-phase.ts b/src/phases/check-switch-phase.ts
index ea16e91b990..9d73411fd37 100644
--- a/src/phases/check-switch-phase.ts
+++ b/src/phases/check-switch-phase.ts
@@ -2,7 +2,7 @@ import { globalScene } from "#app/global-scene";
 import { BattleStyle } from "#app/enums/battle-style";
 import { BattlerTagType } from "#app/enums/battler-tag-type";
 import { getPokemonNameWithAffix } from "#app/messages";
-import { Mode } from "#app/ui/ui";
+import { UiMode } from "#enums/ui-mode";
 import i18next from "i18next";
 import { BattlePhase } from "./battle-phase";
 import { SummonMissingPhase } from "./summon-missing-phase";
@@ -39,26 +39,43 @@ export class CheckSwitchPhase extends BattlePhase {
     }
 
     // ...if there are no other allowed Pokemon in the player's party to switch with
-    if (!globalScene.getPlayerParty().slice(1).filter(p => p.isActive()).length) {
+    if (
+      !globalScene
+        .getPlayerParty()
+        .slice(1)
+        .filter(p => p.isActive()).length
+    ) {
       return super.end();
     }
 
     // ...or if any player Pokemon has an effect that prevents the checked Pokemon from switching
-    if (pokemon.getTag(BattlerTagType.FRENZY)
-        || pokemon.isTrapped()
-        || globalScene.getPlayerField().some(p => p.getTag(BattlerTagType.COMMANDED))) {
+    if (
+      pokemon.getTag(BattlerTagType.FRENZY) ||
+      pokemon.isTrapped() ||
+      globalScene.getPlayerField().some(p => p.getTag(BattlerTagType.COMMANDED))
+    ) {
       return super.end();
     }
 
-    globalScene.ui.showText(i18next.t("battle:switchQuestion", { pokemonName: this.useName ? getPokemonNameWithAffix(pokemon) : i18next.t("battle:pokemon") }), null, () => {
-      globalScene.ui.setMode(Mode.CONFIRM, () => {
-        globalScene.ui.setMode(Mode.MESSAGE);
-        globalScene.unshiftPhase(new SwitchPhase(SwitchType.INITIAL_SWITCH, this.fieldIndex, false, true));
-        this.end();
-      }, () => {
-        globalScene.ui.setMode(Mode.MESSAGE);
-        this.end();
-      });
-    });
+    globalScene.ui.showText(
+      i18next.t("battle:switchQuestion", {
+        pokemonName: this.useName ? getPokemonNameWithAffix(pokemon) : i18next.t("battle:pokemon"),
+      }),
+      null,
+      () => {
+        globalScene.ui.setMode(
+          UiMode.CONFIRM,
+          () => {
+            globalScene.ui.setMode(UiMode.MESSAGE);
+            globalScene.unshiftPhase(new SwitchPhase(SwitchType.INITIAL_SWITCH, this.fieldIndex, false, true));
+            this.end();
+          },
+          () => {
+            globalScene.ui.setMode(UiMode.MESSAGE);
+            this.end();
+          },
+        );
+      },
+    );
   }
 }
diff --git a/src/phases/command-phase.ts b/src/phases/command-phase.ts
index 632344be335..c3e558e1d86 100644
--- a/src/phases/command-phase.ts
+++ b/src/phases/command-phase.ts
@@ -1,10 +1,10 @@
 import { globalScene } from "#app/global-scene";
 import type { TurnCommand } from "#app/battle";
-import { BattleType } from "#app/battle";
+import { BattleType } from "#enums/battle-type";
 import type { EncoreTag } from "#app/data/battler-tags";
 import { TrappedTag } from "#app/data/battler-tags";
-import type { MoveTargetSet } from "#app/data/move";
-import { getMoveTargets } from "#app/data/move";
+import type { MoveTargetSet } from "#app/data/moves/move";
+import { getMoveTargets } from "#app/data/moves/move";
 import { speciesStarterCosts } from "#app/data/balance/starters";
 import { Abilities } from "#app/enums/abilities";
 import { BattlerTagType } from "#app/enums/battler-tag-type";
@@ -15,12 +15,12 @@ import type { PlayerPokemon, TurnMove } from "#app/field/pokemon";
 import { FieldPosition } from "#app/field/pokemon";
 import { getPokemonNameWithAffix } from "#app/messages";
 import { Command } from "#app/ui/command-ui-handler";
-import { Mode } from "#app/ui/ui";
+import { UiMode } from "#enums/ui-mode";
 import i18next from "i18next";
 import { FieldPhase } from "./field-phase";
 import { SelectTargetPhase } from "./select-target-phase";
 import { MysteryEncounterMode } from "#enums/mystery-encounter-mode";
-import { isNullOrUndefined } from "#app/utils";
+import { isNullOrUndefined } from "#app/utils/common";
 import { ArenaTagSide } from "#app/data/arena-tag";
 import { ArenaTagType } from "#app/enums/arena-tag-type";
 
@@ -38,15 +38,19 @@ export class CommandPhase extends FieldPhase {
 
     globalScene.updateGameInfo();
 
-    const commandUiHandler = globalScene.ui.handlers[Mode.COMMAND];
+    const commandUiHandler = globalScene.ui.handlers[UiMode.COMMAND];
 
     // If one of these conditions is true, we always reset the cursor to Command.FIGHT
-    const cursorResetEvent = globalScene.currentBattle.battleType === BattleType.MYSTERY_ENCOUNTER ||
-                              globalScene.currentBattle.battleType === BattleType.TRAINER ||
-                              globalScene.arena.biomeType === Biome.END;
+    const cursorResetEvent =
+      globalScene.currentBattle.battleType === BattleType.MYSTERY_ENCOUNTER ||
+      globalScene.currentBattle.battleType === BattleType.TRAINER ||
+      globalScene.arena.biomeType === Biome.END;
 
     if (commandUiHandler) {
-      if ((globalScene.currentBattle.turn === 1 && (!globalScene.commandCursorMemory || cursorResetEvent)) || commandUiHandler.getCursor() === Command.POKEMON) {
+      if (
+        (globalScene.currentBattle.turn === 1 && (!globalScene.commandCursorMemory || cursorResetEvent)) ||
+        commandUiHandler.getCursor() === Command.POKEMON
+      ) {
         commandUiHandler.setCursor(Command.FIGHT);
       } else {
         commandUiHandler.setCursor(commandUiHandler.getCursor());
@@ -61,14 +65,24 @@ export class CommandPhase extends FieldPhase {
       } else {
         const allyCommand = globalScene.currentBattle.turnCommands[this.fieldIndex - 1];
         if (allyCommand?.command === Command.BALL || allyCommand?.command === Command.RUN) {
-          globalScene.currentBattle.turnCommands[this.fieldIndex] = { command: allyCommand?.command, skip: true };
+          globalScene.currentBattle.turnCommands[this.fieldIndex] = {
+            command: allyCommand?.command,
+            skip: true,
+          };
         }
       }
     }
 
     // If the Pokemon has applied Commander's effects to its ally, skip this command
-    if (globalScene.currentBattle?.double && this.getPokemon().getAlly()?.getTag(BattlerTagType.COMMANDED)?.getSourcePokemon() === this.getPokemon()) {
-      globalScene.currentBattle.turnCommands[this.fieldIndex] = { command: Command.FIGHT, move: { move: Moves.NONE, targets: []}, skip: true };
+    if (
+      globalScene.currentBattle?.double &&
+      this.getPokemon().getAlly()?.getTag(BattlerTagType.COMMANDED)?.getSourcePokemon() === this.getPokemon()
+    ) {
+      globalScene.currentBattle.turnCommands[this.fieldIndex] = {
+        command: Command.FIGHT,
+        move: { move: Moves.NONE, targets: [] },
+        skip: true,
+      };
     }
 
     // Checks if the Pokemon is under the effects of Encore. If so, Encore can end early if the encored move has no more PP.
@@ -85,9 +99,19 @@ export class CommandPhase extends FieldPhase {
 
     const moveQueue = playerPokemon.getMoveQueue();
 
-    while (moveQueue.length && moveQueue[0]
-        && moveQueue[0].move && !moveQueue[0].virtual && (!playerPokemon.getMoveset().find(m => m?.moveId === moveQueue[0].move)
-          || !playerPokemon.getMoveset()[playerPokemon.getMoveset().findIndex(m => m?.moveId === moveQueue[0].move)]!.isUsable(playerPokemon, moveQueue[0].ignorePP))) { // TODO: is the bang correct?
+    while (
+      moveQueue.length &&
+      moveQueue[0] &&
+      moveQueue[0].move &&
+      !moveQueue[0].virtual &&
+      (!playerPokemon.getMoveset().find(m => m.moveId === moveQueue[0].move) ||
+        !playerPokemon
+          .getMoveset()
+          [playerPokemon.getMoveset().findIndex(m => m.moveId === moveQueue[0].move)].isUsable(
+            playerPokemon,
+            moveQueue[0].ignorePP,
+          ))
+    ) {
       moveQueue.shift();
     }
 
@@ -96,124 +120,214 @@ export class CommandPhase extends FieldPhase {
       if (!queuedMove.move) {
         this.handleCommand(Command.FIGHT, -1);
       } else {
-        const moveIndex = playerPokemon.getMoveset().findIndex(m => m?.moveId === queuedMove.move);
-        if ((moveIndex > -1 && playerPokemon.getMoveset()[moveIndex]!.isUsable(playerPokemon, queuedMove.ignorePP)) || queuedMove.virtual) { // TODO: is the bang correct?
+        const moveIndex = playerPokemon.getMoveset().findIndex(m => m.moveId === queuedMove.move);
+        if (
+          (moveIndex > -1 && playerPokemon.getMoveset()[moveIndex].isUsable(playerPokemon, queuedMove.ignorePP)) ||
+          queuedMove.virtual
+        ) {
           this.handleCommand(Command.FIGHT, moveIndex, queuedMove.ignorePP, queuedMove);
         } else {
-          globalScene.ui.setMode(Mode.COMMAND, this.fieldIndex);
+          globalScene.ui.setMode(UiMode.COMMAND, this.fieldIndex);
         }
       }
     } else {
-      if (globalScene.currentBattle.isBattleMysteryEncounter() && globalScene.currentBattle.mysteryEncounter?.skipToFightInput) {
+      if (
+        globalScene.currentBattle.isBattleMysteryEncounter() &&
+        globalScene.currentBattle.mysteryEncounter?.skipToFightInput
+      ) {
         globalScene.ui.clearText();
-        globalScene.ui.setMode(Mode.FIGHT, this.fieldIndex);
+        globalScene.ui.setMode(UiMode.FIGHT, this.fieldIndex);
       } else {
-        globalScene.ui.setMode(Mode.COMMAND, this.fieldIndex);
+        globalScene.ui.setMode(UiMode.COMMAND, this.fieldIndex);
       }
     }
   }
 
   handleCommand(command: Command, cursor: number, ...args: any[]): boolean {
     const playerPokemon = globalScene.getPlayerField()[this.fieldIndex];
-    let success: boolean = false;
+    let success = false;
 
     switch (command) {
+      case Command.TERA:
       case Command.FIGHT:
         let useStruggle = false;
-        const turnMove: TurnMove | undefined = (args.length === 2 ? (args[1] as TurnMove) : undefined);
-        if (cursor === -1 ||
-            playerPokemon.trySelectMove(cursor, args[0] as boolean) ||
-            (useStruggle = cursor > -1 && !playerPokemon.getMoveset().filter(m => m?.isUsable(playerPokemon)).length)) {
-
+        const turnMove: TurnMove | undefined = args.length === 2 ? (args[1] as TurnMove) : undefined;
+        if (
+          cursor === -1 ||
+          playerPokemon.trySelectMove(cursor, args[0] as boolean) ||
+          (useStruggle = cursor > -1 && !playerPokemon.getMoveset().filter(m => m.isUsable(playerPokemon)).length)
+        ) {
           let moveId: Moves;
           if (useStruggle) {
             moveId = Moves.STRUGGLE;
           } else if (turnMove !== undefined) {
             moveId = turnMove.move;
           } else if (cursor > -1) {
-            moveId = playerPokemon.getMoveset()[cursor]!.moveId;
+            moveId = playerPokemon.getMoveset()[cursor].moveId;
           } else {
             moveId = Moves.NONE;
           }
 
-          const turnCommand: TurnCommand = { command: Command.FIGHT, cursor: cursor, move: { move: moveId, targets: [], ignorePP: args[0] }, args: args };
-          const moveTargets: MoveTargetSet = turnMove === undefined ? getMoveTargets(playerPokemon, moveId) : { targets: turnMove.targets, multiple: turnMove.targets.length > 1 };
+          const turnCommand: TurnCommand = {
+            command: Command.FIGHT,
+            cursor: cursor,
+            move: { move: moveId, targets: [], ignorePP: args[0] },
+            args: args,
+          };
+          const preTurnCommand: TurnCommand = {
+            command: command,
+            targets: [this.fieldIndex],
+            skip: command === Command.FIGHT,
+          };
+          const moveTargets: MoveTargetSet =
+            turnMove === undefined
+              ? getMoveTargets(playerPokemon, moveId)
+              : {
+                  targets: turnMove.targets,
+                  multiple: turnMove.targets.length > 1,
+                };
           if (!moveId) {
-            turnCommand.targets = [ this.fieldIndex ];
+            turnCommand.targets = [this.fieldIndex];
           }
           console.log(moveTargets, getPokemonNameWithAffix(playerPokemon));
           if (moveTargets.targets.length > 1 && moveTargets.multiple) {
             globalScene.unshiftPhase(new SelectTargetPhase(this.fieldIndex));
           }
-          if (moveTargets.targets.length <= 1 || moveTargets.multiple) {
-            turnCommand.move!.targets = moveTargets.targets; //TODO: is the bang correct here?
-          } else if (playerPokemon.getTag(BattlerTagType.CHARGING) && playerPokemon.getMoveQueue().length >= 1) {
-            turnCommand.move!.targets = playerPokemon.getMoveQueue()[0].targets; //TODO: is the bang correct here?
+          if (turnCommand.move && (moveTargets.targets.length <= 1 || moveTargets.multiple)) {
+            turnCommand.move.targets = moveTargets.targets;
+          } else if (
+            turnCommand.move &&
+            playerPokemon.getTag(BattlerTagType.CHARGING) &&
+            playerPokemon.getMoveQueue().length >= 1
+          ) {
+            turnCommand.move.targets = playerPokemon.getMoveQueue()[0].targets;
           } else {
             globalScene.unshiftPhase(new SelectTargetPhase(this.fieldIndex));
           }
+          globalScene.currentBattle.preTurnCommands[this.fieldIndex] = preTurnCommand;
           globalScene.currentBattle.turnCommands[this.fieldIndex] = turnCommand;
           success = true;
         } else if (cursor < playerPokemon.getMoveset().length) {
-          const move = playerPokemon.getMoveset()[cursor]!; //TODO: is this bang correct?
-          globalScene.ui.setMode(Mode.MESSAGE);
+          const move = playerPokemon.getMoveset()[cursor];
+          globalScene.ui.setMode(UiMode.MESSAGE);
 
           // Decides between a Disabled, Not Implemented, or No PP translation message
-          const errorMessage =
-          playerPokemon.isMoveRestricted(move.moveId, playerPokemon)
-            ? playerPokemon.getRestrictingTag(move.moveId, playerPokemon)!.selectionDeniedText(playerPokemon, move.moveId)
-            : move.getName().endsWith(" (N)") ? "battle:moveNotImplemented" : "battle:moveNoPP";
+          const errorMessage = playerPokemon.isMoveRestricted(move.moveId, playerPokemon)
+            ? playerPokemon
+                .getRestrictingTag(move.moveId, playerPokemon)!
+                .selectionDeniedText(playerPokemon, move.moveId)
+            : move.getName().endsWith(" (N)")
+              ? "battle:moveNotImplemented"
+              : "battle:moveNoPP";
           const moveName = move.getName().replace(" (N)", ""); // Trims off the indicator
 
-          globalScene.ui.showText(i18next.t(errorMessage, { moveName: moveName }), null, () => {
-            globalScene.ui.clearText();
-            globalScene.ui.setMode(Mode.FIGHT, this.fieldIndex);
-          }, null, true);
+          globalScene.ui.showText(
+            i18next.t(errorMessage, { moveName: moveName }),
+            null,
+            () => {
+              globalScene.ui.clearText();
+              globalScene.ui.setMode(UiMode.FIGHT, this.fieldIndex);
+            },
+            null,
+            true,
+          );
         }
         break;
       case Command.BALL:
-        const notInDex = (globalScene.getEnemyField().filter(p => p.isActive(true)).some(p => !globalScene.gameData.dexData[p.species.speciesId].caughtAttr) && globalScene.gameData.getStarterCount(d => !!d.caughtAttr) < Object.keys(speciesStarterCosts).length - 1);
-        if (globalScene.arena.biomeType === Biome.END && (!globalScene.gameMode.isClassic || globalScene.gameMode.isFreshStartChallenge() || notInDex )) {
-          globalScene.ui.setMode(Mode.COMMAND, this.fieldIndex);
-          globalScene.ui.setMode(Mode.MESSAGE);
-          globalScene.ui.showText(i18next.t("battle:noPokeballForce"), null, () => {
-            globalScene.ui.showText("", 0);
-            globalScene.ui.setMode(Mode.COMMAND, this.fieldIndex);
-          }, null, true);
-        } else if (globalScene.currentBattle.battleType === BattleType.TRAINER) {
-          globalScene.ui.setMode(Mode.COMMAND, this.fieldIndex);
-          globalScene.ui.setMode(Mode.MESSAGE);
-          globalScene.ui.showText(i18next.t("battle:noPokeballTrainer"), null, () => {
-            globalScene.ui.showText("", 0);
-            globalScene.ui.setMode(Mode.COMMAND, this.fieldIndex);
-          }, null, true);
-        } else if (globalScene.currentBattle.isBattleMysteryEncounter() && !globalScene.currentBattle.mysteryEncounter!.catchAllowed) {
-          globalScene.ui.setMode(Mode.COMMAND, this.fieldIndex);
-          globalScene.ui.setMode(Mode.MESSAGE);
-          globalScene.ui.showText(i18next.t("battle:noPokeballMysteryEncounter"), null, () => {
-            globalScene.ui.showText("", 0);
-            globalScene.ui.setMode(Mode.COMMAND, this.fieldIndex);
-          }, null, true);
-        } else {
-          const targets = globalScene.getEnemyField().filter(p => p.isActive(true)).map(p => p.getBattlerIndex());
-          if (targets.length > 1) {
-            globalScene.ui.setMode(Mode.COMMAND, this.fieldIndex);
-            globalScene.ui.setMode(Mode.MESSAGE);
-            globalScene.ui.showText(i18next.t("battle:noPokeballMulti"), null, () => {
+        const notInDex =
+          globalScene
+            .getEnemyField()
+            .filter(p => p.isActive(true))
+            .some(p => !globalScene.gameData.dexData[p.species.speciesId].caughtAttr) &&
+          globalScene.gameData.getStarterCount(d => !!d.caughtAttr) < Object.keys(speciesStarterCosts).length - 1;
+        if (
+          globalScene.arena.biomeType === Biome.END &&
+          (!globalScene.gameMode.isClassic || globalScene.gameMode.isFreshStartChallenge() || notInDex)
+        ) {
+          globalScene.ui.setMode(UiMode.COMMAND, this.fieldIndex);
+          globalScene.ui.setMode(UiMode.MESSAGE);
+          globalScene.ui.showText(
+            i18next.t("battle:noPokeballForce"),
+            null,
+            () => {
               globalScene.ui.showText("", 0);
-              globalScene.ui.setMode(Mode.COMMAND, this.fieldIndex);
-            }, null, true);
+              globalScene.ui.setMode(UiMode.COMMAND, this.fieldIndex);
+            },
+            null,
+            true,
+          );
+        } else if (globalScene.currentBattle.battleType === BattleType.TRAINER) {
+          globalScene.ui.setMode(UiMode.COMMAND, this.fieldIndex);
+          globalScene.ui.setMode(UiMode.MESSAGE);
+          globalScene.ui.showText(
+            i18next.t("battle:noPokeballTrainer"),
+            null,
+            () => {
+              globalScene.ui.showText("", 0);
+              globalScene.ui.setMode(UiMode.COMMAND, this.fieldIndex);
+            },
+            null,
+            true,
+          );
+        } else if (
+          globalScene.currentBattle.isBattleMysteryEncounter() &&
+          !globalScene.currentBattle.mysteryEncounter!.catchAllowed
+        ) {
+          globalScene.ui.setMode(UiMode.COMMAND, this.fieldIndex);
+          globalScene.ui.setMode(UiMode.MESSAGE);
+          globalScene.ui.showText(
+            i18next.t("battle:noPokeballMysteryEncounter"),
+            null,
+            () => {
+              globalScene.ui.showText("", 0);
+              globalScene.ui.setMode(UiMode.COMMAND, this.fieldIndex);
+            },
+            null,
+            true,
+          );
+        } else {
+          const targets = globalScene
+            .getEnemyField()
+            .filter(p => p.isActive(true))
+            .map(p => p.getBattlerIndex());
+          if (targets.length > 1) {
+            globalScene.ui.setMode(UiMode.COMMAND, this.fieldIndex);
+            globalScene.ui.setMode(UiMode.MESSAGE);
+            globalScene.ui.showText(
+              i18next.t("battle:noPokeballMulti"),
+              null,
+              () => {
+                globalScene.ui.showText("", 0);
+                globalScene.ui.setMode(UiMode.COMMAND, this.fieldIndex);
+              },
+              null,
+              true,
+            );
           } else if (cursor < 5) {
             const targetPokemon = globalScene.getEnemyField().find(p => p.isActive(true));
-            if (targetPokemon?.isBoss() && targetPokemon?.bossSegmentIndex >= 1 && !targetPokemon?.hasAbility(Abilities.WONDER_GUARD, false, true) && cursor < PokeballType.MASTER_BALL) {
-              globalScene.ui.setMode(Mode.COMMAND, this.fieldIndex);
-              globalScene.ui.setMode(Mode.MESSAGE);
-              globalScene.ui.showText(i18next.t("battle:noPokeballStrong"), null, () => {
-                globalScene.ui.showText("", 0);
-                globalScene.ui.setMode(Mode.COMMAND, this.fieldIndex);
-              }, null, true);
+            if (
+              targetPokemon?.isBoss() &&
+              targetPokemon?.bossSegmentIndex >= 1 &&
+              !targetPokemon?.hasAbility(Abilities.WONDER_GUARD, false, true) &&
+              cursor < PokeballType.MASTER_BALL
+            ) {
+              globalScene.ui.setMode(UiMode.COMMAND, this.fieldIndex);
+              globalScene.ui.setMode(UiMode.MESSAGE);
+              globalScene.ui.showText(
+                i18next.t("battle:noPokeballStrong"),
+                null,
+                () => {
+                  globalScene.ui.showText("", 0);
+                  globalScene.ui.setMode(UiMode.COMMAND, this.fieldIndex);
+                },
+                null,
+                true,
+              );
             } else {
-              globalScene.currentBattle.turnCommands[this.fieldIndex] = { command: Command.BALL, cursor: cursor };
+              globalScene.currentBattle.turnCommands[this.fieldIndex] = {
+                command: Command.BALL,
+                cursor: cursor,
+              };
               globalScene.currentBattle.turnCommands[this.fieldIndex]!.targets = targets;
               if (this.fieldIndex) {
                 globalScene.currentBattle.turnCommands[this.fieldIndex - 1]!.skip = true;
@@ -228,22 +342,42 @@ export class CommandPhase extends FieldPhase {
         const isSwitch = command === Command.POKEMON;
         const { currentBattle, arena } = globalScene;
         const mysteryEncounterFleeAllowed = currentBattle.mysteryEncounter?.fleeAllowed;
-        if (!isSwitch && (arena.biomeType === Biome.END || (!isNullOrUndefined(mysteryEncounterFleeAllowed) && !mysteryEncounterFleeAllowed))) {
-          globalScene.ui.setMode(Mode.COMMAND, this.fieldIndex);
-          globalScene.ui.setMode(Mode.MESSAGE);
-          globalScene.ui.showText(i18next.t("battle:noEscapeForce"), null, () => {
-            globalScene.ui.showText("", 0);
-            globalScene.ui.setMode(Mode.COMMAND, this.fieldIndex);
-          }, null, true);
-        } else if (!isSwitch && (currentBattle.battleType === BattleType.TRAINER || currentBattle.mysteryEncounter?.encounterMode === MysteryEncounterMode.TRAINER_BATTLE)) {
-          globalScene.ui.setMode(Mode.COMMAND, this.fieldIndex);
-          globalScene.ui.setMode(Mode.MESSAGE);
-          globalScene.ui.showText(i18next.t("battle:noEscapeTrainer"), null, () => {
-            globalScene.ui.showText("", 0);
-            globalScene.ui.setMode(Mode.COMMAND, this.fieldIndex);
-          }, null, true);
+        if (
+          !isSwitch &&
+          (arena.biomeType === Biome.END ||
+            (!isNullOrUndefined(mysteryEncounterFleeAllowed) && !mysteryEncounterFleeAllowed))
+        ) {
+          globalScene.ui.setMode(UiMode.COMMAND, this.fieldIndex);
+          globalScene.ui.setMode(UiMode.MESSAGE);
+          globalScene.ui.showText(
+            i18next.t("battle:noEscapeForce"),
+            null,
+            () => {
+              globalScene.ui.showText("", 0);
+              globalScene.ui.setMode(UiMode.COMMAND, this.fieldIndex);
+            },
+            null,
+            true,
+          );
+        } else if (
+          !isSwitch &&
+          (currentBattle.battleType === BattleType.TRAINER ||
+            currentBattle.mysteryEncounter?.encounterMode === MysteryEncounterMode.TRAINER_BATTLE)
+        ) {
+          globalScene.ui.setMode(UiMode.COMMAND, this.fieldIndex);
+          globalScene.ui.setMode(UiMode.MESSAGE);
+          globalScene.ui.showText(
+            i18next.t("battle:noEscapeTrainer"),
+            null,
+            () => {
+              globalScene.ui.showText("", 0);
+              globalScene.ui.setMode(UiMode.COMMAND, this.fieldIndex);
+            },
+            null,
+            true,
+          );
         } else {
-          const batonPass = isSwitch && args[0] as boolean;
+          const batonPass = isSwitch && (args[0] as boolean);
           const trappedAbMessages: string[] = [];
           if (batonPass || !playerPokemon.isTrapped(trappedAbMessages)) {
             currentBattle.turnCommands[this.fieldIndex] = isSwitch
@@ -251,18 +385,24 @@ export class CommandPhase extends FieldPhase {
               : { command: Command.RUN };
             success = true;
             if (!isSwitch && this.fieldIndex) {
-            currentBattle.turnCommands[this.fieldIndex - 1]!.skip = true;
+              currentBattle.turnCommands[this.fieldIndex - 1]!.skip = true;
             }
           } else if (trappedAbMessages.length > 0) {
             if (!isSwitch) {
-              globalScene.ui.setMode(Mode.MESSAGE);
+              globalScene.ui.setMode(UiMode.MESSAGE);
             }
-            globalScene.ui.showText(trappedAbMessages[0], null, () => {
-              globalScene.ui.showText("", 0);
-              if (!isSwitch) {
-                globalScene.ui.setMode(Mode.COMMAND, this.fieldIndex);
-              }
-            }, null, true);
+            globalScene.ui.showText(
+              trappedAbMessages[0],
+              null,
+              () => {
+                globalScene.ui.showText("", 0);
+                if (!isSwitch) {
+                  globalScene.ui.setMode(UiMode.COMMAND, this.fieldIndex);
+                }
+              },
+              null,
+              true,
+            );
           } else {
             const trapTag = playerPokemon.getTag(TrappedTag);
             const fairyLockTag = globalScene.arena.getTagOnSide(ArenaTagType.FAIRY_LOCK, ArenaTagSide.PLAYER);
@@ -272,25 +412,28 @@ export class CommandPhase extends FieldPhase {
               break;
             }
             if (!isSwitch) {
-              globalScene.ui.setMode(Mode.COMMAND, this.fieldIndex);
-              globalScene.ui.setMode(Mode.MESSAGE);
+              globalScene.ui.setMode(UiMode.COMMAND, this.fieldIndex);
+              globalScene.ui.setMode(UiMode.MESSAGE);
             }
             const showNoEscapeText = (tag: any) => {
               globalScene.ui.showText(
                 i18next.t("battle:noEscapePokemon", {
-                  pokemonName: tag.sourceId && globalScene.getPokemonById(tag.sourceId) ? getPokemonNameWithAffix(globalScene.getPokemonById(tag.sourceId)!) : "",
+                  pokemonName:
+                    tag.sourceId && globalScene.getPokemonById(tag.sourceId)
+                      ? getPokemonNameWithAffix(globalScene.getPokemonById(tag.sourceId)!)
+                      : "",
                   moveName: tag.getMoveName(),
-                  escapeVerb: isSwitch ? i18next.t("battle:escapeVerbSwitch") : i18next.t("battle:escapeVerbFlee")
+                  escapeVerb: isSwitch ? i18next.t("battle:escapeVerbSwitch") : i18next.t("battle:escapeVerbFlee"),
                 }),
                 null,
                 () => {
                   globalScene.ui.showText("", 0);
                   if (!isSwitch) {
-                    globalScene.ui.setMode(Mode.COMMAND, this.fieldIndex);
+                    globalScene.ui.setMode(UiMode.COMMAND, this.fieldIndex);
                   }
                 },
                 null,
-                true
+                true,
               );
             };
 
@@ -328,6 +471,6 @@ export class CommandPhase extends FieldPhase {
   }
 
   end() {
-    globalScene.ui.setMode(Mode.MESSAGE).then(() => super.end());
+    globalScene.ui.setMode(UiMode.MESSAGE).then(() => super.end());
   }
 }
diff --git a/src/phases/common-anim-phase.ts b/src/phases/common-anim-phase.ts
index 9ca74ed5a77..5be5e112389 100644
--- a/src/phases/common-anim-phase.ts
+++ b/src/phases/common-anim-phase.ts
@@ -6,13 +6,18 @@ import { PokemonPhase } from "./pokemon-phase";
 
 export class CommonAnimPhase extends PokemonPhase {
   private anim: CommonAnim | null;
-  private targetIndex: number | undefined;
+  private targetIndex?: BattlerIndex;
   private playOnEmptyField: boolean;
 
-  constructor(battlerIndex?: BattlerIndex, targetIndex?: BattlerIndex, anim?: CommonAnim, playOnEmptyField: boolean = false) {
+  constructor(
+    battlerIndex?: BattlerIndex,
+    targetIndex?: BattlerIndex,
+    anim: CommonAnim | null = null,
+    playOnEmptyField = false,
+  ) {
     super(battlerIndex);
 
-    this.anim = anim!; // TODO: is this bang correct?
+    this.anim = anim;
     this.targetIndex = targetIndex;
     this.playOnEmptyField = playOnEmptyField;
   }
@@ -22,7 +27,10 @@ export class CommonAnimPhase extends PokemonPhase {
   }
 
   start() {
-    const target = this.targetIndex !== undefined ? (this.player ? globalScene.getEnemyField() : globalScene.getPlayerField())[this.targetIndex] : this.getPokemon();
+    const target =
+      this.targetIndex !== undefined
+        ? (this.player ? globalScene.getEnemyField() : globalScene.getPlayerField())[this.targetIndex]
+        : this.getPokemon();
     new CommonBattleAnim(this.anim, this.getPokemon(), target).play(false, () => {
       this.end();
     });
diff --git a/src/phases/damage-anim-phase.ts b/src/phases/damage-anim-phase.ts
index a21d9d4622a..b9581573f2e 100644
--- a/src/phases/damage-anim-phase.ts
+++ b/src/phases/damage-anim-phase.ts
@@ -1,8 +1,8 @@
 import { globalScene } from "#app/global-scene";
-import { type BattlerIndex } from "#app/battle";
+import type { BattlerIndex } from "#app/battle";
 import { BattleSpec } from "#enums/battle-spec";
 import { type DamageResult, HitResult } from "#app/field/pokemon";
-import { fixedInt } from "#app/utils";
+import { fixedInt } from "#app/utils/common";
 import { PokemonPhase } from "#app/phases/pokemon-phase";
 
 export class DamageAnimPhase extends PokemonPhase {
@@ -10,18 +10,23 @@ export class DamageAnimPhase extends PokemonPhase {
   private damageResult: DamageResult;
   private critical: boolean;
 
-  constructor(battlerIndex: BattlerIndex, amount: number, damageResult?: DamageResult, critical: boolean = false) {
+  constructor(
+    battlerIndex: BattlerIndex,
+    amount: number,
+    damageResult: DamageResult = HitResult.EFFECTIVE,
+    critical = false,
+  ) {
     super(battlerIndex);
 
     this.amount = amount;
-    this.damageResult = damageResult || HitResult.EFFECTIVE;
+    this.damageResult = damageResult;
     this.critical = critical;
   }
 
   start() {
     super.start();
 
-    if (this.damageResult === HitResult.ONE_HIT_KO) {
+    if (this.damageResult === HitResult.ONE_HIT_KO || this.damageResult === HitResult.INDIRECT_KO) {
       if (globalScene.moveAnimations) {
         globalScene.toggleInvert(true);
       }
@@ -42,9 +47,11 @@ export class DamageAnimPhase extends PokemonPhase {
   applyDamage() {
     switch (this.damageResult) {
       case HitResult.EFFECTIVE:
+      case HitResult.CONFUSION:
         globalScene.playSound("se/hit");
         break;
       case HitResult.SUPER_EFFECTIVE:
+      case HitResult.INDIRECT_KO:
       case HitResult.ONE_HIT_KO:
         globalScene.playSound("se/hit_strong");
         break;
@@ -57,20 +64,26 @@ export class DamageAnimPhase extends PokemonPhase {
       globalScene.damageNumberHandler.add(this.getPokemon(), this.amount, this.damageResult, this.critical);
     }
 
-    if (this.damageResult !== HitResult.OTHER && this.amount > 0) {
+    if (this.damageResult !== HitResult.INDIRECT && this.amount > 0) {
       const flashTimer = globalScene.time.addEvent({
         delay: 100,
         repeat: 5,
         startAt: 200,
         callback: () => {
-          this.getPokemon().getSprite().setVisible(flashTimer.repeatCount % 2 === 0);
+          this.getPokemon()
+            .getSprite()
+            .setVisible(flashTimer.repeatCount % 2 === 0);
           if (!flashTimer.repeatCount) {
-            this.getPokemon().updateInfo().then(() => this.end());
+            this.getPokemon()
+              .updateInfo()
+              .then(() => this.end());
           }
-        }
+        },
       });
     } else {
-      this.getPokemon().updateInfo().then(() => this.end());
+      this.getPokemon()
+        .updateInfo()
+        .then(() => this.end());
     }
   }
 
diff --git a/src/phases/egg-hatch-phase.ts b/src/phases/egg-hatch-phase.ts
index 2d0aa24dd1f..69bcf741383 100644
--- a/src/phases/egg-hatch-phase.ts
+++ b/src/phases/egg-hatch-phase.ts
@@ -3,21 +3,19 @@ import { globalScene } from "#app/global-scene";
 import type { Egg } from "#app/data/egg";
 import { EggCountChangedEvent } from "#app/events/egg";
 import type { PlayerPokemon } from "#app/field/pokemon";
-import { getPokemonNameWithAffix } from "#app/messages";
 import { Phase } from "#app/phase";
 import { achvs } from "#app/system/achv";
 import EggCounterContainer from "#app/ui/egg-counter-container";
 import type EggHatchSceneHandler from "#app/ui/egg-hatch-scene-handler";
 import PokemonInfoContainer from "#app/ui/pokemon-info-container";
-import { Mode } from "#app/ui/ui";
+import { UiMode } from "#enums/ui-mode";
 import i18next from "i18next";
 import SoundFade from "phaser3-rex-plugins/plugins/soundfade";
-import * as Utils from "#app/utils";
+import { fixedInt, getFrameMs, randInt } from "#app/utils/common";
 import type { EggLapsePhase } from "./egg-lapse-phase";
 import type { EggHatchData } from "#app/data/egg-hatch-data";
 import { doShinySparkleAnim } from "#app/field/anims";
 
-
 /**
  * Class that represents egg hatching
  */
@@ -78,8 +76,7 @@ export class EggHatchPhase extends Phase {
   start() {
     super.start();
 
-    globalScene.ui.setModeForceTransition(Mode.EGG_HATCH_SCENE).then(() => {
-
+    globalScene.ui.setModeForceTransition(UiMode.EGG_HATCH_SCENE).then(() => {
       if (!this.egg) {
         return this.end();
       }
@@ -102,13 +99,21 @@ export class EggHatchPhase extends Phase {
       this.eggHatchBg.setOrigin(0, 0);
       this.eggHatchContainer.add(this.eggHatchBg);
 
-      this.eggContainer = globalScene.add.container(this.eggHatchBg.displayWidth / 2, this.eggHatchBg.displayHeight / 2);
+      this.eggContainer = globalScene.add.container(
+        this.eggHatchBg.displayWidth / 2,
+        this.eggHatchBg.displayHeight / 2,
+      );
 
       this.eggSprite = globalScene.add.sprite(0, 0, "egg", `egg_${this.egg.getKey()}`);
       this.eggCrackSprite = globalScene.add.sprite(0, 0, "egg_crack", "0");
       this.eggCrackSprite.setVisible(false);
 
-      this.eggLightraysOverlay = globalScene.add.sprite((-this.eggHatchBg.displayWidth / 2) + 4, -this.eggHatchBg.displayHeight / 2, "egg_lightrays", "3");
+      this.eggLightraysOverlay = globalScene.add.sprite(
+        -this.eggHatchBg.displayWidth / 2 + 4,
+        -this.eggHatchBg.displayHeight / 2,
+        "egg_lightrays",
+        "3",
+      );
       this.eggLightraysOverlay.setOrigin(0, 0);
       this.eggLightraysOverlay.setVisible(false);
 
@@ -121,8 +126,15 @@ export class EggHatchPhase extends Phase {
       this.eggHatchContainer.add(this.eggCounterContainer);
 
       const getPokemonSprite = () => {
-        const ret = globalScene.add.sprite(this.eggHatchBg.displayWidth / 2, this.eggHatchBg.displayHeight / 2, "pkmn__sub");
-        ret.setPipeline(globalScene.spritePipeline, { tone: [ 0.0, 0.0, 0.0, 0.0 ], ignoreTimeTint: true });
+        const ret = globalScene.add.sprite(
+          this.eggHatchBg.displayWidth / 2,
+          this.eggHatchBg.displayHeight / 2,
+          "pkmn__sub",
+        );
+        ret.setPipeline(globalScene.spritePipeline, {
+          tone: [0.0, 0.0, 0.0, 0.0],
+          ignoreTimeTint: true,
+        });
         return ret;
       };
 
@@ -133,7 +145,13 @@ export class EggHatchPhase extends Phase {
 
       this.eggHatchContainer.add(this.pokemonShinySparkle);
 
-      this.eggHatchOverlay = globalScene.add.rectangle(0, -globalScene.game.canvas.height / 6, globalScene.game.canvas.width / 6, globalScene.game.canvas.height / 6, 0xFFFFFF);
+      this.eggHatchOverlay = globalScene.add.rectangle(
+        0,
+        -globalScene.game.canvas.height / 6,
+        globalScene.game.canvas.width / 6,
+        globalScene.game.canvas.height / 6,
+        0xffffff,
+      );
       this.eggHatchOverlay.setOrigin(0, 0);
       this.eggHatchOverlay.setAlpha(0);
       globalScene.fieldUI.add(this.eggHatchOverlay);
@@ -206,7 +224,7 @@ export class EggHatchPhase extends Phase {
   }
 
   end() {
-    if (globalScene.findPhase((p) => p instanceof EggHatchPhase)) {
+    if (globalScene.findPhase(p => p instanceof EggHatchPhase)) {
       this.eggHatchHandler.clear();
     } else {
       globalScene.time.delayedCall(250, () => globalScene.setModifiersVisible(true));
@@ -243,7 +261,8 @@ export class EggHatchPhase extends Phase {
             duration: 250,
             onComplete: () => {
               count!++;
-              if (count! < repeatCount!) { // we know they are defined
+              if (count! < repeatCount!) {
+                // we know they are defined
                 return this.doEggShake(intensity, repeatCount, count).then(() => resolve());
               }
               globalScene.tweens.add({
@@ -251,11 +270,11 @@ export class EggHatchPhase extends Phase {
                 x: `-=${intensity / 2}`,
                 ease: "Sine.easeInOut",
                 duration: 125,
-                onComplete: () => resolve()
+                onComplete: () => resolve(),
               });
-            }
+            },
           });
-        }
+        },
       });
     });
   }
@@ -287,24 +306,26 @@ export class EggHatchPhase extends Phase {
     this.canSkip = false;
     this.hatched = true;
     if (this.evolutionBgm) {
-      SoundFade.fadeOut(globalScene, this.evolutionBgm, Utils.fixedInt(100));
+      SoundFade.fadeOut(globalScene, this.evolutionBgm, fixedInt(100));
     }
     for (let e = 0; e < 5; e++) {
-      globalScene.time.delayedCall(Utils.fixedInt(375 * e), () => globalScene.playSound("se/egg_hatch", { volume: 1 - (e * 0.2) }));
+      globalScene.time.delayedCall(fixedInt(375 * e), () =>
+        globalScene.playSound("se/egg_hatch", { volume: 1 - e * 0.2 }),
+      );
     }
     this.eggLightraysOverlay.setVisible(true);
     this.eggLightraysOverlay.play("egg_lightrays");
     globalScene.tweens.add({
-      duration: Utils.fixedInt(125),
+      duration: fixedInt(125),
       targets: this.eggHatchOverlay,
       alpha: 1,
       ease: "Cubic.easeIn",
       onComplete: () => {
         this.skipped = false;
         this.canSkip = true;
-      }
+      },
     });
-    globalScene.time.delayedCall(Utils.fixedInt(1500), () => {
+    globalScene.time.delayedCall(fixedInt(1500), () => {
       this.canSkip = false;
       if (!this.skipped) {
         this.doReveal();
@@ -342,37 +363,46 @@ export class EggHatchPhase extends Phase {
     this.pokemonSprite.setPipelineData("shiny", this.pokemon.shiny);
     this.pokemonSprite.setPipelineData("variant", this.pokemon.variant);
     this.pokemonSprite.setVisible(true);
-    globalScene.time.delayedCall(Utils.fixedInt(250), () => {
+    globalScene.time.delayedCall(fixedInt(250), () => {
       this.eggsToHatchCount--;
       this.eggHatchHandler.eventTarget.dispatchEvent(new EggCountChangedEvent(this.eggsToHatchCount));
       this.pokemon.cry();
       if (isShiny) {
-        globalScene.time.delayedCall(Utils.fixedInt(500), () => {
+        globalScene.time.delayedCall(fixedInt(500), () => {
           doShinySparkleAnim(this.pokemonShinySparkle, this.pokemon.variant);
         });
       }
-      globalScene.time.delayedCall(Utils.fixedInt(!this.skipped ? !isShiny ? 1250 : 1750 : !isShiny ? 250 : 750), () => {
+      globalScene.time.delayedCall(fixedInt(!this.skipped ? (!isShiny ? 1250 : 1750) : !isShiny ? 250 : 750), () => {
         this.infoContainer.show(this.pokemon, false, this.skipped ? 2 : 1);
 
         globalScene.playSoundWithoutBgm("evolution_fanfare");
 
-        globalScene.ui.showText(i18next.t("egg:hatchFromTheEgg", { pokemonName: getPokemonNameWithAffix(this.pokemon) }), null, () => {
-          globalScene.gameData.updateSpeciesDexIvs(this.pokemon.species.speciesId, this.pokemon.ivs);
-          globalScene.gameData.setPokemonCaught(this.pokemon, true, true).then(() => {
-            globalScene.gameData.setEggMoveUnlocked(this.pokemon.species, this.eggMoveIndex).then((value) => {
-              this.eggHatchData.setEggMoveUnlocked(value);
-              globalScene.ui.showText("", 0);
-              this.end();
+        globalScene.ui.showText(
+          i18next.t("egg:hatchFromTheEgg", {
+            pokemonName: this.pokemon.species.getExpandedSpeciesName(),
+          }),
+          null,
+          () => {
+            globalScene.gameData.updateSpeciesDexIvs(this.pokemon.species.speciesId, this.pokemon.ivs);
+            globalScene.gameData.setPokemonCaught(this.pokemon, true, true).then(() => {
+              globalScene.gameData.setEggMoveUnlocked(this.pokemon.species, this.eggMoveIndex).then(value => {
+                this.eggHatchData.setEggMoveUnlocked(value);
+                globalScene.ui.showText("", 0);
+                this.end();
+              });
             });
-          });
-        }, null, true, 3000);
+          },
+          null,
+          true,
+          3000,
+        );
       });
     });
     globalScene.tweens.add({
-      duration: Utils.fixedInt(this.skipped ? 500 : 3000),
+      duration: fixedInt(this.skipped ? 500 : 3000),
       targets: this.eggHatchOverlay,
       alpha: 0,
-      ease: "Cubic.easeOut"
+      ease: "Cubic.easeOut",
     });
   }
 
@@ -394,10 +424,10 @@ export class EggHatchPhase extends Phase {
   doSpray(intensity: number, offsetY?: number) {
     globalScene.tweens.addCounter({
       repeat: intensity,
-      duration: Utils.getFrameMs(1),
+      duration: getFrameMs(1),
       onRepeat: () => {
-        this.doSprayParticle(Utils.randInt(8), offsetY || 0);
-      }
+        this.doSprayParticle(randInt(8), offsetY || 0);
+      },
     });
   }
 
@@ -415,15 +445,15 @@ export class EggHatchPhase extends Phase {
 
     let f = 0;
     let yOffset = 0;
-    const speed = 3 - Utils.randInt(8);
-    const amp = 24 + Utils.randInt(32);
+    const speed = 3 - randInt(8);
+    const amp = 24 + randInt(32);
 
     const particleTimer = globalScene.tweens.addCounter({
       repeat: -1,
-      duration: Utils.getFrameMs(1),
+      duration: getFrameMs(1),
       onRepeat: () => {
         updateParticle();
-      }
+      },
     });
 
     const updateParticle = () => {
@@ -433,7 +463,7 @@ export class EggHatchPhase extends Phase {
         particle.setPosition(initialX + (speed * f) / 3, initialY + yOffset);
         particle.y += -this.sin(trigIndex, amp);
         if (f > 108) {
-          particle.setScale((1 - (f - 108) / 20));
+          particle.setScale(1 - (f - 108) / 20);
         }
         trigIndex += 2 * speedMultiplier;
         f += speedMultiplier;
@@ -446,7 +476,6 @@ export class EggHatchPhase extends Phase {
     updateParticle();
   }
 
-
   /**
    * Generates a Pokemon to be hatched by the egg
    * Also stores the generated pokemon in this.eggHatchData
diff --git a/src/phases/egg-lapse-phase.ts b/src/phases/egg-lapse-phase.ts
index 62da0edf5b7..4632e264c1d 100644
--- a/src/phases/egg-lapse-phase.ts
+++ b/src/phases/egg-lapse-phase.ts
@@ -5,7 +5,7 @@ import { Phase } from "#app/phase";
 import i18next from "i18next";
 import Overrides from "#app/overrides";
 import { EggHatchPhase } from "./egg-hatch-phase";
-import { Mode } from "#app/ui/ui";
+import { UiMode } from "#enums/ui-mode";
 import { achvs } from "#app/system/achv";
 import type { PlayerPokemon } from "#app/field/pokemon";
 import { EggSummaryPhase } from "./egg-summary-phase";
@@ -16,12 +16,8 @@ import { EggHatchData } from "#app/data/egg-hatch-data";
  * Also handles prompts for skipping animation, and calling the egg summary phase
  */
 export class EggLapsePhase extends Phase {
-
   private eggHatchData: EggHatchData[] = [];
   private readonly minEggsToSkip: number = 2;
-  constructor() {
-    super();
-  }
 
   start() {
     super.start();
@@ -33,19 +29,37 @@ export class EggLapsePhase extends Phase {
 
     if (eggsToHatchCount > 0) {
       if (eggsToHatchCount >= this.minEggsToSkip && globalScene.eggSkipPreference === 1) {
-        globalScene.ui.showText(i18next.t("battle:eggHatching"), 0, () => {
-          // show prompt for skip, blocking inputs for 1 second
-          globalScene.ui.showText(i18next.t("battle:eggSkipPrompt", { eggsToHatch: eggsToHatchCount }), 0);
-          globalScene.ui.setModeWithoutClear(Mode.CONFIRM, () => {
-            this.hatchEggsSkipped(eggsToHatch);
-            this.showSummary();
-          }, () => {
-            this.hatchEggsRegular(eggsToHatch);
-            this.end();
+        globalScene.ui.showText(
+          i18next.t("battle:eggHatching"),
+          0,
+          () => {
+            // show prompt for skip, blocking inputs for 1 second
+            globalScene.ui.showText(
+              i18next.t("battle:eggSkipPrompt", {
+                eggsToHatch: eggsToHatchCount,
+              }),
+              0,
+            );
+            globalScene.ui.setModeWithoutClear(
+              UiMode.CONFIRM,
+              () => {
+                this.hatchEggsSkipped(eggsToHatch);
+                this.showSummary();
+              },
+              () => {
+                this.hatchEggsRegular(eggsToHatch);
+                this.end();
+              },
+              null,
+              null,
+              null,
+              1000,
+              true,
+            );
           },
-          null, null, null, 1000, true
-          );
-        }, 100, true);
+          100,
+          true,
+        );
       } else if (eggsToHatchCount >= this.minEggsToSkip && globalScene.eggSkipPreference === 2) {
         globalScene.queueMessage(i18next.t("battle:eggHatching"));
         this.hatchEggsSkipped(eggsToHatch);
@@ -118,7 +132,6 @@ export class EggLapsePhase extends Phase {
     if (pokemon.isShiny()) {
       globalScene.validateAchv(achvs.HATCH_SHINY);
     }
-
   }
 
   /**
@@ -129,14 +142,16 @@ export class EggLapsePhase extends Phase {
   generatePokemon(egg: Egg): EggHatchData {
     let ret: PlayerPokemon;
     let newHatchData: EggHatchData;
-    globalScene.executeWithSeedOffset(() => {
-      ret = egg.generatePlayerPokemon();
-      newHatchData = new EggHatchData(ret, egg.eggMoveIndex);
-      newHatchData.setDex();
-      this.eggHatchData.push(newHatchData);
-
-    }, egg.id, EGG_SEED.toString());
+    globalScene.executeWithSeedOffset(
+      () => {
+        ret = egg.generatePlayerPokemon();
+        newHatchData = new EggHatchData(ret, egg.eggMoveIndex);
+        newHatchData.setDex();
+        this.eggHatchData.push(newHatchData);
+      },
+      egg.id,
+      EGG_SEED.toString(),
+    );
     return newHatchData!;
   }
-
 }
diff --git a/src/phases/egg-summary-phase.ts b/src/phases/egg-summary-phase.ts
index 56741c5820f..d16cafa7611 100644
--- a/src/phases/egg-summary-phase.ts
+++ b/src/phases/egg-summary-phase.ts
@@ -1,6 +1,6 @@
 import { globalScene } from "#app/global-scene";
 import { Phase } from "#app/phase";
-import { Mode } from "#app/ui/ui";
+import { UiMode } from "#enums/ui-mode";
 import type { EggHatchData } from "#app/data/egg-hatch-data";
 
 /**
@@ -22,10 +22,9 @@ export class EggSummaryPhase extends Phase {
     // updates next pokemon once the current update has been completed
     const updateNextPokemon = (i: number) => {
       if (i >= this.eggHatchData.length) {
-        globalScene.ui.setModeForceTransition(Mode.EGG_HATCH_SUMMARY, this.eggHatchData).then(() => {
+        globalScene.ui.setModeForceTransition(UiMode.EGG_HATCH_SUMMARY, this.eggHatchData).then(() => {
           globalScene.fadeOutBgm(undefined, false);
         });
-
       } else {
         this.eggHatchData[i].setDex();
         this.eggHatchData[i].updatePokemon().then(() => {
@@ -36,12 +35,11 @@ export class EggSummaryPhase extends Phase {
       }
     };
     updateNextPokemon(0);
-
   }
 
   end() {
     globalScene.time.delayedCall(250, () => globalScene.setModifiersVisible(true));
-    globalScene.ui.setModeForceTransition(Mode.MESSAGE).then(() => {
+    globalScene.ui.setModeForceTransition(UiMode.MESSAGE).then(() => {
       super.end();
     });
   }
diff --git a/src/phases/encounter-phase.ts b/src/phases/encounter-phase.ts
index 7e62ca17f7c..3cfd2b9a901 100644
--- a/src/phases/encounter-phase.ts
+++ b/src/phases/encounter-phase.ts
@@ -1,13 +1,19 @@
-import { BattlerIndex, BattleType } from "#app/battle";
+import { BattlerIndex } from "#app/battle";
+import { BattleType } from "#enums/battle-type";
 import { globalScene } from "#app/global-scene";
 import { PLAYER_PARTY_MAX_SIZE } from "#app/constants";
-import { applyAbAttrs, SyncEncounterNatureAbAttr } from "#app/data/ability";
+import {
+  applyAbAttrs,
+  SyncEncounterNatureAbAttr,
+  applyPreSummonAbAttrs,
+  PreSummonAbAttr,
+} from "#app/data/abilities/ability";
 import { initEncounterAnims, loadEncounterAnimAssets } from "#app/data/battle-anims";
 import { getCharVariantFromDialogue } from "#app/data/dialogue";
 import { getEncounterText } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils";
 import { doTrainerExclamation } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
 import { getGoldenBugNetSpecies } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils";
-import { TrainerSlot } from "#app/data/trainer-config";
+import { TrainerSlot } from "#enums/trainer-slot";
 import { getRandomWeatherType } from "#app/data/weather";
 import { EncounterPhaseEvent } from "#app/events/battle-scene";
 import type Pokemon from "#app/field/pokemon";
@@ -28,8 +34,8 @@ import { SummonPhase } from "#app/phases/summon-phase";
 import { ToggleDoublePositionPhase } from "#app/phases/toggle-double-position-phase";
 import { achvs } from "#app/system/achv";
 import { handleTutorial, Tutorial } from "#app/tutorial";
-import { Mode } from "#app/ui/ui";
-import { randSeedInt, randSeedItem } from "#app/utils";
+import { UiMode } from "#enums/ui-mode";
+import { randSeedInt, randSeedItem } from "#app/utils/common";
 import { BattleSpec } from "#enums/battle-spec";
 import { Biome } from "#enums/biome";
 import { MysteryEncounterMode } from "#enums/mystery-encounter-mode";
@@ -38,14 +44,15 @@ import { Species } from "#enums/species";
 import { overrideHeldItems, overrideModifiers } from "#app/modifier/modifier";
 import i18next from "i18next";
 import { WEIGHT_INCREMENT_ON_SPAWN_MISS } from "#app/data/mystery-encounters/mystery-encounters";
+import { getNatureName } from "#app/data/nature";
 
 export class EncounterPhase extends BattlePhase {
   private loaded: boolean;
 
-  constructor(loaded?: boolean) {
+  constructor(loaded = false) {
     super();
 
-    this.loaded = !!loaded;
+    this.loaded = loaded;
   }
 
   start() {
@@ -87,7 +94,9 @@ export class EncounterPhase extends BattlePhase {
 
       // Add any special encounter animations to load
       if (mysteryEncounter.encounterAnimations && mysteryEncounter.encounterAnimations.length > 0) {
-        loadEnemyAssets.push(initEncounterAnims(mysteryEncounter.encounterAnimations).then(() => loadEncounterAnimAssets(true)));
+        loadEnemyAssets.push(
+          initEncounterAnims(mysteryEncounter.encounterAnimations).then(() => loadEncounterAnimAssets(true)),
+        );
       }
 
       // Add intro visuals for mystery encounter
@@ -104,43 +113,56 @@ export class EncounterPhase extends BattlePhase {
       }
       if (!this.loaded) {
         if (battle.battleType === BattleType.TRAINER) {
-          //resets hitRecCount during Trainer ecnounter
-          for (const pokemon of globalScene.getPlayerParty()) {
-            if (pokemon) {
-              pokemon.customPokemonData.resetHitReceivedCount();
-            }
-          }
           battle.enemyParty[e] = battle.trainer?.genPartyMember(e)!; // TODO:: is the bang correct here?
         } else {
           let enemySpecies = globalScene.randomSpecies(battle.waveIndex, level, true);
           // If player has golden bug net, rolls 10% chance to replace non-boss wave wild species from the golden bug net bug pool
-          if (globalScene.findModifier(m => m instanceof BoostBugSpawnModifier)
-            && !globalScene.gameMode.isBoss(battle.waveIndex)
-            && globalScene.arena.biomeType !== Biome.END
-            && randSeedInt(10) === 0) {
+          if (
+            globalScene.findModifier(m => m instanceof BoostBugSpawnModifier) &&
+            !globalScene.gameMode.isBoss(battle.waveIndex) &&
+            globalScene.arena.biomeType !== Biome.END &&
+            randSeedInt(10) === 0
+          ) {
             enemySpecies = getGoldenBugNetSpecies(level);
           }
-          battle.enemyParty[e] = globalScene.addEnemyPokemon(enemySpecies, level, TrainerSlot.NONE, !!globalScene.getEncounterBossSegments(battle.waveIndex, level, enemySpecies));
+          battle.enemyParty[e] = globalScene.addEnemyPokemon(
+            enemySpecies,
+            level,
+            TrainerSlot.NONE,
+            !!globalScene.getEncounterBossSegments(battle.waveIndex, level, enemySpecies),
+          );
           if (globalScene.currentBattle.battleSpec === BattleSpec.FINAL_BOSS) {
             battle.enemyParty[e].ivs = new Array(6).fill(31);
           }
-          globalScene.getPlayerParty().slice(0, !battle.double ? 1 : 2).reverse().forEach(playerPokemon => {
-            applyAbAttrs(SyncEncounterNatureAbAttr, playerPokemon, null, false, battle.enemyParty[e]);
-          });
+          globalScene
+            .getPlayerParty()
+            .slice(0, !battle.double ? 1 : 2)
+            .reverse()
+            .forEach(playerPokemon => {
+              applyAbAttrs(SyncEncounterNatureAbAttr, playerPokemon, null, false, battle.enemyParty[e]);
+            });
         }
       }
       const enemyPokemon = globalScene.getEnemyParty()[e];
       if (e < (battle.double ? 2 : 1)) {
         enemyPokemon.setX(-66 + enemyPokemon.getFieldPositionOffset()[0]);
-        enemyPokemon.resetSummonData();
+        enemyPokemon.fieldSetup(true);
       }
 
       if (!this.loaded) {
-        globalScene.gameData.setPokemonSeen(enemyPokemon, true, battle.battleType === BattleType.TRAINER || battle?.mysteryEncounter?.encounterMode === MysteryEncounterMode.TRAINER_BATTLE);
+        globalScene.gameData.setPokemonSeen(
+          enemyPokemon,
+          true,
+          battle.battleType === BattleType.TRAINER ||
+            battle?.mysteryEncounter?.encounterMode === MysteryEncounterMode.TRAINER_BATTLE,
+        );
       }
 
       if (enemyPokemon.species.speciesId === Species.ETERNATUS) {
-        if (globalScene.gameMode.isClassic && (battle.battleSpec === BattleSpec.FINAL_BOSS || globalScene.gameMode.isWaveFinal(battle.waveIndex))) {
+        if (
+          globalScene.gameMode.isClassic &&
+          (battle.battleSpec === BattleSpec.FINAL_BOSS || globalScene.gameMode.isWaveFinal(battle.waveIndex))
+        ) {
           if (battle.battleSpec !== BattleSpec.FINAL_BOSS) {
             enemyPokemon.formIndex = 1;
             enemyPokemon.updateScale();
@@ -156,7 +178,32 @@ export class EncounterPhase extends BattlePhase {
 
       loadEnemyAssets.push(enemyPokemon.loadAssets());
 
-      console.log(`Pokemon: ${getPokemonNameWithAffix(enemyPokemon)}`, `Species ID: ${enemyPokemon.species.speciesId}`, `Stats: ${enemyPokemon.stats}`, `Ability: ${enemyPokemon.getAbility().name}`, `Passive Ability: ${enemyPokemon.getPassiveAbility().name}`);
+      const stats: string[] = [
+        `HP: ${enemyPokemon.stats[0]} (${enemyPokemon.ivs[0]})`,
+        ` Atk: ${enemyPokemon.stats[1]} (${enemyPokemon.ivs[1]})`,
+        ` Def: ${enemyPokemon.stats[2]} (${enemyPokemon.ivs[2]})`,
+        ` Spatk: ${enemyPokemon.stats[3]} (${enemyPokemon.ivs[3]})`,
+        ` Spdef: ${enemyPokemon.stats[4]} (${enemyPokemon.ivs[4]})`,
+        ` Spd: ${enemyPokemon.stats[5]} (${enemyPokemon.ivs[5]})`,
+      ];
+      const moveset: string[] = [];
+      for (const move of enemyPokemon.getMoveset()) {
+        moveset.push(move.getName());
+      }
+
+      console.log(
+        `Pokemon: ${getPokemonNameWithAffix(enemyPokemon)}`,
+        `| Species ID: ${enemyPokemon.species.speciesId}`,
+        `| Level: ${enemyPokemon.level}`,
+        `| Nature: ${getNatureName(enemyPokemon.nature, true, true, true)}`,
+      );
+      console.log(`Stats (IVs): ${stats}`);
+      console.log(
+        `Ability: ${enemyPokemon.getAbility().name}`,
+        `| Passive Ability${enemyPokemon.hasPassive() ? "" : " (inactive)"}: ${enemyPokemon.getPassiveAbility().name}`,
+        `${enemyPokemon.isBoss() ? `| Boss Bars: ${enemyPokemon.bossSegments}` : ""}`,
+      );
+      console.log("Moveset:", moveset);
       return true;
     });
 
@@ -168,20 +215,26 @@ export class EncounterPhase extends BattlePhase {
       loadEnemyAssets.push(battle.trainer?.loadAssets().then(() => battle.trainer?.initSprite())!); // TODO: is this bang correct?
     } else if (battle.isBattleMysteryEncounter()) {
       if (battle.mysteryEncounter?.introVisuals) {
-        loadEnemyAssets.push(battle.mysteryEncounter.introVisuals.loadAssets().then(() => battle.mysteryEncounter!.introVisuals!.initSprite()));
+        loadEnemyAssets.push(
+          battle.mysteryEncounter.introVisuals
+            .loadAssets()
+            .then(() => battle.mysteryEncounter!.introVisuals!.initSprite()),
+        );
       }
       if (battle.mysteryEncounter?.loadAssets && battle.mysteryEncounter.loadAssets.length > 0) {
         loadEnemyAssets.push(...battle.mysteryEncounter.loadAssets);
       }
       // Load Mystery Encounter Exclamation bubble and sfx
-      loadEnemyAssets.push(new Promise<void>(resolve => {
-        globalScene.loadSe("GEN8- Exclaim", "battle_anims", "GEN8- Exclaim.wav");
-        globalScene.loadImage("encounter_exclaim", "mystery-encounters");
-        globalScene.load.once(Phaser.Loader.Events.COMPLETE, () => resolve());
-        if (!globalScene.load.isLoading()) {
-          globalScene.load.start();
-        }
-      }));
+      loadEnemyAssets.push(
+        new Promise<void>(resolve => {
+          globalScene.loadSe("GEN8- Exclaim", "battle_anims", "GEN8- Exclaim.wav");
+          globalScene.loadImage("encounter_exclaim", "mystery-encounters");
+          globalScene.load.once(Phaser.Loader.Events.COMPLETE, () => resolve());
+          if (!globalScene.load.isLoading()) {
+            globalScene.load.start();
+          }
+        }),
+      );
     } else {
       const overridedBossSegments = Overrides.OPP_HEALTH_SEGMENTS_OVERRIDE > 1;
       // for double battles, reduce the health segments for boss Pokemon unless there is an override
@@ -189,7 +242,10 @@ export class EncounterPhase extends BattlePhase {
         for (const enemyPokemon of battle.enemyParty) {
           // If the enemy pokemon is a boss and wasn't populated from data source, then update the number of segments
           if (enemyPokemon.isBoss() && !enemyPokemon.isPopulatedFromDataSource) {
-            enemyPokemon.setBoss(true, Math.ceil(enemyPokemon.bossSegments * (enemyPokemon.getSpeciesForm().baseTotal / totalBst)));
+            enemyPokemon.setBoss(
+              true,
+              Math.ceil(enemyPokemon.bossSegments * (enemyPokemon.getSpeciesForm().baseTotal / totalBst)),
+            );
             enemyPokemon.initBattleInfo();
           }
         }
@@ -203,6 +259,9 @@ export class EncounterPhase extends BattlePhase {
         }
         if (e < (battle.double ? 2 : 1)) {
           if (battle.battleType === BattleType.WILD) {
+            for (const pokemon of globalScene.getField()) {
+              applyPreSummonAbAttrs(PreSummonAbAttr, pokemon, []);
+            }
             globalScene.field.add(enemyPokemon);
             battle.seenEnemyPartyMemberIds.add(enemyPokemon.id);
             const playerPokemon = globalScene.getPlayerPokemon();
@@ -222,27 +281,37 @@ export class EncounterPhase extends BattlePhase {
       });
 
       if (!this.loaded && battle.battleType !== BattleType.MYSTERY_ENCOUNTER) {
-        regenerateModifierPoolThresholds(globalScene.getEnemyField(), battle.battleType === BattleType.TRAINER ? ModifierPoolType.TRAINER : ModifierPoolType.WILD);
+        // generate modifiers for MEs, overriding prior ones as applicable
+        regenerateModifierPoolThresholds(
+          globalScene.getEnemyField(),
+          battle.battleType === BattleType.TRAINER ? ModifierPoolType.TRAINER : ModifierPoolType.WILD,
+        );
         globalScene.generateEnemyModifiers();
         overrideModifiers(false);
-        globalScene.getEnemyField().forEach(enemy => {
-          overrideHeldItems(enemy, false);
-        });
 
+        for (const enemy of globalScene.getEnemyField()) {
+          overrideHeldItems(enemy, false);
+        }
       }
 
-      globalScene.ui.setMode(Mode.MESSAGE).then(() => {
+      if (battle.battleType === BattleType.TRAINER && globalScene.currentBattle.trainer) {
+        globalScene.currentBattle.trainer.genAI(globalScene.getEnemyParty());
+      }
+
+      globalScene.ui.setMode(UiMode.MESSAGE).then(() => {
         if (!this.loaded) {
           this.trySetWeatherIfNewBiome(); // Set weather before session gets saved
           // Game syncs to server on waves X1 and X6 (As of 1.2.0)
-          globalScene.gameData.saveAll(true, battle.waveIndex % 5 === 1 || (globalScene.lastSavePlayTime ?? 0) >= 300).then(success => {
-            globalScene.disableMenu = false;
-            if (!success) {
-              return globalScene.reset(true);
-            }
-            this.doEncounter();
-            globalScene.resetSeed();
-          });
+          globalScene.gameData
+            .saveAll(true, battle.waveIndex % 5 === 1 || (globalScene.lastSavePlayTime ?? 0) >= 300)
+            .then(success => {
+              globalScene.disableMenu = false;
+              if (!success) {
+                return globalScene.reset(true);
+              }
+              this.doEncounter();
+              globalScene.resetSeed();
+            });
         } else {
           this.doEncounter();
           globalScene.resetSeed();
@@ -257,28 +326,39 @@ export class EncounterPhase extends BattlePhase {
     globalScene.setFieldScale(1);
 
     const { battleType, waveIndex } = globalScene.currentBattle;
-    if (globalScene.isMysteryEncounterValidForWave(battleType,  waveIndex) && !globalScene.currentBattle.isBattleMysteryEncounter()) {
+    if (
+      globalScene.isMysteryEncounterValidForWave(battleType, waveIndex) &&
+      !globalScene.currentBattle.isBattleMysteryEncounter()
+    ) {
       // Increment ME spawn chance if an ME could have spawned but did not
       // Only do this AFTER session has been saved to avoid duplicating increments
       globalScene.mysteryEncounterSaveData.encounterSpawnChance += WEIGHT_INCREMENT_ON_SPAWN_MISS;
     }
 
     for (const pokemon of globalScene.getPlayerParty()) {
+      // Currently, a new wave is not considered a new battle if there is no arena reset
+      // Therefore, we only reset wave data here
       if (pokemon) {
-        pokemon.resetBattleData();
+        pokemon.resetWaveData();
       }
     }
 
     const enemyField = globalScene.getEnemyField();
     globalScene.tweens.add({
-      targets: [ globalScene.arenaEnemy, globalScene.currentBattle.trainer, enemyField, globalScene.arenaPlayer, globalScene.trainer ].flat(),
-      x: (_target, _key, value, fieldIndex: number) => fieldIndex < 2 + (enemyField.length) ? value + 300 : value - 300,
+      targets: [
+        globalScene.arenaEnemy,
+        globalScene.currentBattle.trainer,
+        enemyField,
+        globalScene.arenaPlayer,
+        globalScene.trainer,
+      ].flat(),
+      x: (_target, _key, value, fieldIndex: number) => (fieldIndex < 2 + enemyField.length ? value + 300 : value - 300),
       duration: 2000,
       onComplete: () => {
         if (!this.tryOverrideForBattleSpec()) {
           this.doEncounterCommon();
         }
-      }
+      },
     });
 
     const encounterIntroVisuals = globalScene.currentBattle?.mysteryEncounter?.introVisuals;
@@ -290,7 +370,7 @@ export class EncounterPhase extends BattlePhase {
       globalScene.tweens.add({
         targets: encounterIntroVisuals,
         x: enterFromRight ? "-=200" : "+=300",
-        duration: 2000
+        duration: 2000,
       });
     }
   }
@@ -299,35 +379,44 @@ export class EncounterPhase extends BattlePhase {
     const enemyField = globalScene.getEnemyField();
 
     if (globalScene.currentBattle.battleSpec === BattleSpec.FINAL_BOSS) {
-      return i18next.t("battle:bossAppeared", { bossName: getPokemonNameWithAffix(enemyField[0]) });
+      return i18next.t("battle:bossAppeared", {
+        bossName: getPokemonNameWithAffix(enemyField[0]),
+      });
     }
 
     if (globalScene.currentBattle.battleType === BattleType.TRAINER) {
       if (globalScene.currentBattle.double) {
-        return i18next.t("battle:trainerAppearedDouble", { trainerName: globalScene.currentBattle.trainer?.getName(TrainerSlot.NONE, true) });
-
-      } else {
-        return i18next.t("battle:trainerAppeared", { trainerName: globalScene.currentBattle.trainer?.getName(TrainerSlot.NONE, true) });
+        return i18next.t("battle:trainerAppearedDouble", {
+          trainerName: globalScene.currentBattle.trainer?.getName(TrainerSlot.NONE, true),
+        });
       }
+      return i18next.t("battle:trainerAppeared", {
+        trainerName: globalScene.currentBattle.trainer?.getName(TrainerSlot.NONE, true),
+      });
     }
 
     return enemyField.length === 1
-      ? i18next.t("battle:singleWildAppeared", { pokemonName: enemyField[0].getNameToRender() })
-      : i18next.t("battle:multiWildAppeared", { pokemonName1: enemyField[0].getNameToRender(), pokemonName2: enemyField[1].getNameToRender() });
+      ? i18next.t("battle:singleWildAppeared", {
+          pokemonName: enemyField[0].getNameToRender(),
+        })
+      : i18next.t("battle:multiWildAppeared", {
+          pokemonName1: enemyField[0].getNameToRender(),
+          pokemonName2: enemyField[1].getNameToRender(),
+        });
   }
 
-  doEncounterCommon(showEncounterMessage: boolean = true) {
+  doEncounterCommon(showEncounterMessage = true) {
     const enemyField = globalScene.getEnemyField();
 
     if (globalScene.currentBattle.battleType === BattleType.WILD) {
-      enemyField.forEach(enemyPokemon => {
+      for (const enemyPokemon of enemyField) {
         enemyPokemon.untint(100, "Sine.easeOut");
         enemyPokemon.cry();
         enemyPokemon.showInfo();
         if (enemyPokemon.isShiny()) {
           globalScene.validateAchv(achvs.SEE_SHINY);
         }
-      });
+      }
       globalScene.updateFieldScale();
       if (showEncounterMessage) {
         globalScene.ui.showText(this.getEncounterMessage(), null, () => this.end(), 1500);
@@ -366,7 +455,10 @@ export class EncounterPhase extends BattlePhase {
         doSummon();
       } else {
         let message: string;
-        globalScene.executeWithSeedOffset(() => message = randSeedItem(encounterMessages), globalScene.currentBattle.waveIndex);
+        globalScene.executeWithSeedOffset(
+          () => (message = randSeedItem(encounterMessages)),
+          globalScene.currentBattle.waveIndex,
+        );
         message = message!; // tell TS compiler it's defined now
         const showDialogueAndSummon = () => {
           globalScene.ui.showDialogue(message, trainer?.getName(TrainerSlot.NONE, true), null, () => {
@@ -374,7 +466,13 @@ export class EncounterPhase extends BattlePhase {
           });
         };
         if (globalScene.currentBattle.trainer?.config.hasCharSprite && !globalScene.ui.shouldSkipDialogue(message)) {
-          globalScene.showFieldOverlay(500).then(() => globalScene.charSprite.showCharacter(trainer?.getKey()!, getCharVariantFromDialogue(encounterMessages[0])).then(() => showDialogueAndSummon())); // TODO: is this bang correct?
+          globalScene
+            .showFieldOverlay(500)
+            .then(() =>
+              globalScene.charSprite
+                .showCharacter(trainer?.getKey()!, getCharVariantFromDialogue(encounterMessages[0]))
+                .then(() => showDialogueAndSummon()),
+            ); // TODO: is this bang correct?
         } else {
           showDialogueAndSummon();
         }
@@ -414,7 +512,14 @@ export class EncounterPhase extends BattlePhase {
               const text = getEncounterText(dialogue.text)!;
               i++;
               if (title) {
-                globalScene.ui.showDialogue(text, title, null, nextAction, 0, i === 1 ? FIRST_DIALOGUE_PROMPT_DELAY : 0);
+                globalScene.ui.showDialogue(
+                  text,
+                  title,
+                  null,
+                  nextAction,
+                  0,
+                  i === 1 ? FIRST_DIALOGUE_PROMPT_DELAY : 0,
+                );
               } else {
                 globalScene.ui.showText(text, null, nextAction, i === 1 ? FIRST_DIALOGUE_PROMPT_DELAY : 0, true);
               }
@@ -446,12 +551,19 @@ export class EncounterPhase extends BattlePhase {
     const enemyField = globalScene.getEnemyField();
 
     enemyField.forEach((enemyPokemon, e) => {
-      if (enemyPokemon.isShiny()) {
+      if (enemyPokemon.isShiny(true)) {
         globalScene.unshiftPhase(new ShinySparklePhase(BattlerIndex.ENEMY + e));
       }
-      /** This sets Eternatus' held item to be untransferrable, preventing it from being stolen  */
-      if (enemyPokemon.species.speciesId === Species.ETERNATUS && (globalScene.gameMode.isBattleClassicFinalBoss(globalScene.currentBattle.waveIndex) || globalScene.gameMode.isEndlessMajorBoss(globalScene.currentBattle.waveIndex))) {
-        const enemyMBH = globalScene.findModifier(m => m instanceof TurnHeldItemTransferModifier, false) as TurnHeldItemTransferModifier;
+      /** This sets Eternatus' held item to be untransferrable, preventing it from being stolen */
+      if (
+        enemyPokemon.species.speciesId === Species.ETERNATUS &&
+        (globalScene.gameMode.isBattleClassicFinalBoss(globalScene.currentBattle.waveIndex) ||
+          globalScene.gameMode.isEndlessMajorBoss(globalScene.currentBattle.waveIndex))
+      ) {
+        const enemyMBH = globalScene.findModifier(
+          m => m instanceof TurnHeldItemTransferModifier,
+          false,
+        ) as TurnHeldItemTransferModifier;
         if (enemyMBH) {
           globalScene.removeModifier(enemyMBH, true);
           enemyMBH.setTransferrableFalse();
@@ -460,25 +572,27 @@ export class EncounterPhase extends BattlePhase {
       }
     });
 
-    if (![ BattleType.TRAINER, BattleType.MYSTERY_ENCOUNTER ].includes(globalScene.currentBattle.battleType)) {
-      enemyField.map(p => globalScene.pushConditionalPhase(new PostSummonPhase(p.getBattlerIndex()), () => {
-        // if there is not a player party, we can't continue
-        if (!globalScene.getPlayerParty().length) {
-          return false;
-        }
-        // how many player pokemon are on the field ?
-        const pokemonsOnFieldCount = globalScene.getPlayerParty().filter(p => p.isOnField()).length;
-        // if it's a 2vs1, there will never be a 2nd pokemon on our field even
-        const requiredPokemonsOnField = Math.min(globalScene.getPlayerParty().filter((p) => !p.isFainted()).length, 2);
-        // if it's a double, there should be 2, otherwise 1
-        if (globalScene.currentBattle.double) {
-          return pokemonsOnFieldCount === requiredPokemonsOnField;
-        }
-        return pokemonsOnFieldCount === 1;
-      }));
+    if (![BattleType.TRAINER, BattleType.MYSTERY_ENCOUNTER].includes(globalScene.currentBattle.battleType)) {
+      enemyField.map(p =>
+        globalScene.pushConditionalPhase(new PostSummonPhase(p.getBattlerIndex()), () => {
+          // if there is not a player party, we can't continue
+          if (!globalScene.getPlayerParty().length) {
+            return false;
+          }
+          // how many player pokemon are on the field ?
+          const pokemonsOnFieldCount = globalScene.getPlayerParty().filter(p => p.isOnField()).length;
+          // if it's a 2vs1, there will never be a 2nd pokemon on our field even
+          const requiredPokemonsOnField = Math.min(globalScene.getPlayerParty().filter(p => !p.isFainted()).length, 2);
+          // if it's a double, there should be 2, otherwise 1
+          if (globalScene.currentBattle.double) {
+            return pokemonsOnFieldCount === requiredPokemonsOnField;
+          }
+          return pokemonsOnFieldCount === 1;
+        }),
+      );
       const ivScannerModifier = globalScene.findModifier(m => m instanceof IvScannerModifier);
       if (ivScannerModifier) {
-        enemyField.map(p => globalScene.pushPhase(new ScanIvsPhase(p.getBattlerIndex(), Math.min(ivScannerModifier.getStackCount() * 2, 6))));
+        enemyField.map(p => globalScene.pushPhase(new ScanIvsPhase(p.getBattlerIndex())));
       }
     }
 
@@ -503,7 +617,10 @@ export class EncounterPhase extends BattlePhase {
         globalScene.pushPhase(new ToggleDoublePositionPhase(false));
       }
 
-      if (globalScene.currentBattle.battleType !== BattleType.TRAINER && (globalScene.currentBattle.waveIndex > 1 || !globalScene.gameMode.isDaily)) {
+      if (
+        globalScene.currentBattle.battleType !== BattleType.TRAINER &&
+        (globalScene.currentBattle.waveIndex > 1 || !globalScene.gameMode.isDaily)
+      ) {
         const minPartySize = globalScene.currentBattle.double ? 2 : 1;
         if (availablePartyMembers.length > minPartySize) {
           globalScene.pushPhase(new CheckSwitchPhase(0, globalScene.currentBattle.double));
@@ -518,31 +635,47 @@ export class EncounterPhase extends BattlePhase {
 
   tryOverrideForBattleSpec(): boolean {
     switch (globalScene.currentBattle.battleSpec) {
-      case BattleSpec.FINAL_BOSS:
+      case BattleSpec.FINAL_BOSS: {
         const enemy = globalScene.getEnemyPokemon();
-        globalScene.ui.showText(this.getEncounterMessage(), null, () => {
-          const localizationKey = "battleSpecDialogue:encounter";
-          if (globalScene.ui.shouldSkipDialogue(localizationKey)) {
-          // Logging mirrors logging found in dialogue-ui-handler
-            console.log(`Dialogue ${localizationKey} skipped`);
-            this.doEncounterCommon(false);
-          } else {
-            const count = 5643853 + globalScene.gameData.gameStats.classicSessionsPlayed;
-            // The line below checks if an English ordinal is necessary or not based on whether an entry for encounterLocalizationKey exists in the language or not.
-            const ordinalUsed = !i18next.exists(localizationKey, { fallbackLng: []}) || i18next.resolvedLanguage === "en" ? i18next.t("battleSpecDialogue:key", { count: count, ordinal: true }) : "";
-            const cycleCount = count.toLocaleString() + ordinalUsed;
-            const genderIndex = globalScene.gameData.gender ?? PlayerGender.UNSET;
-            const genderStr = PlayerGender[genderIndex].toLowerCase();
-            const encounterDialogue = i18next.t(localizationKey, { context: genderStr, cycleCount: cycleCount });
-            if (!globalScene.gameData.getSeenDialogues()[localizationKey]) {
-              globalScene.gameData.saveSeenDialogue(localizationKey);
-            }
-            globalScene.ui.showDialogue(encounterDialogue, enemy?.species.name, null, () => {
+        globalScene.ui.showText(
+          this.getEncounterMessage(),
+          null,
+          () => {
+            const localizationKey = "battleSpecDialogue:encounter";
+            if (globalScene.ui.shouldSkipDialogue(localizationKey)) {
+              // Logging mirrors logging found in dialogue-ui-handler
+              console.log(`Dialogue ${localizationKey} skipped`);
               this.doEncounterCommon(false);
-            });
-          }
-        }, 1500, true);
+            } else {
+              const count = 5643853 + globalScene.gameData.gameStats.classicSessionsPlayed;
+              // The line below checks if an English ordinal is necessary or not based on whether an entry for encounterLocalizationKey exists in the language or not.
+              const ordinalUsed =
+                !i18next.exists(localizationKey, { fallbackLng: [] }) || i18next.resolvedLanguage === "en"
+                  ? i18next.t("battleSpecDialogue:key", {
+                      count: count,
+                      ordinal: true,
+                    })
+                  : "";
+              const cycleCount = count.toLocaleString() + ordinalUsed;
+              const genderIndex = globalScene.gameData.gender ?? PlayerGender.UNSET;
+              const genderStr = PlayerGender[genderIndex].toLowerCase();
+              const encounterDialogue = i18next.t(localizationKey, {
+                context: genderStr,
+                cycleCount: cycleCount,
+              });
+              if (!globalScene.gameData.getSeenDialogues()[localizationKey]) {
+                globalScene.gameData.saveSeenDialogue(localizationKey);
+              }
+              globalScene.ui.showDialogue(encounterDialogue, enemy?.species.name, null, () => {
+                this.doEncounterCommon(false);
+              });
+            }
+          },
+          1500,
+          true,
+        );
         return true;
+      }
     }
     return false;
   }
@@ -557,7 +690,7 @@ export class EncounterPhase extends BattlePhase {
    */
   trySetWeatherIfNewBiome(): void {
     if (!this.loaded) {
-      globalScene.arena.trySetWeather(getRandomWeatherType(globalScene.arena), false);
+      globalScene.arena.trySetWeather(getRandomWeatherType(globalScene.arena));
     }
   }
 }
diff --git a/src/phases/end-card-phase.ts b/src/phases/end-card-phase.ts
index 4615a60e661..41775248b67 100644
--- a/src/phases/end-card-phase.ts
+++ b/src/phases/end-card-phase.ts
@@ -7,34 +7,44 @@ import i18next from "i18next";
 export class EndCardPhase extends Phase {
   public endCard: Phaser.GameObjects.Image;
   public text: Phaser.GameObjects.Text;
-
-  constructor() {
-    super();
-  }
-
   start(): void {
     super.start();
 
     globalScene.ui.getMessageHandler().bg.setVisible(false);
     globalScene.ui.getMessageHandler().nameBoxContainer.setVisible(false);
 
-    this.endCard = globalScene.add.image(0, 0, `end_${globalScene.gameData.gender === PlayerGender.FEMALE ? "f" : "m"}`);
+    this.endCard = globalScene.add.image(
+      0,
+      0,
+      `end_${globalScene.gameData.gender === PlayerGender.FEMALE ? "f" : "m"}`,
+    );
     this.endCard.setOrigin(0);
     this.endCard.setScale(0.5);
     globalScene.field.add(this.endCard);
 
-    this.text = addTextObject(globalScene.game.canvas.width / 12, (globalScene.game.canvas.height / 6) - 16, i18next.t("battle:congratulations"), TextStyle.SUMMARY, { fontSize: "128px" });
+    this.text = addTextObject(
+      globalScene.game.canvas.width / 12,
+      globalScene.game.canvas.height / 6 - 16,
+      i18next.t("battle:congratulations"),
+      TextStyle.SUMMARY,
+      { fontSize: "128px" },
+    );
     this.text.setOrigin(0.5);
     globalScene.field.add(this.text);
 
     globalScene.ui.clearText();
 
     globalScene.ui.fadeIn(1000).then(() => {
-
-      globalScene.ui.showText("", null, () => {
-        globalScene.ui.getMessageHandler().bg.setVisible(true);
-        this.end();
-      }, null, true);
+      globalScene.ui.showText(
+        "",
+        null,
+        () => {
+          globalScene.ui.getMessageHandler().bg.setVisible(true);
+          this.end();
+        },
+        null,
+        true,
+      );
     });
   }
 }
diff --git a/src/phases/end-evolution-phase.ts b/src/phases/end-evolution-phase.ts
index 58e2e203482..579920dde90 100644
--- a/src/phases/end-evolution-phase.ts
+++ b/src/phases/end-evolution-phase.ts
@@ -1,16 +1,11 @@
 import { globalScene } from "#app/global-scene";
 import { Phase } from "#app/phase";
-import { Mode } from "#app/ui/ui";
+import { UiMode } from "#enums/ui-mode";
 
 export class EndEvolutionPhase extends Phase {
-
-  constructor() {
-    super();
-  }
-
   start() {
     super.start();
 
-    globalScene.ui.setModeForceTransition(Mode.MESSAGE).then(() => this.end());
+    globalScene.ui.setModeForceTransition(UiMode.MESSAGE).then(() => this.end());
   }
 }
diff --git a/src/phases/enemy-command-phase.ts b/src/phases/enemy-command-phase.ts
index e76518bb71e..166b8c1ae2d 100644
--- a/src/phases/enemy-command-phase.ts
+++ b/src/phases/enemy-command-phase.ts
@@ -16,7 +16,7 @@ import { BattlerTagType } from "#enums/battler-tag-type";
  */
 export class EnemyCommandPhase extends FieldPhase {
   protected fieldIndex: number;
-  protected skipTurn: boolean = false;
+  protected skipTurn = false;
 
   constructor(fieldIndex: number) {
     super();
@@ -36,20 +36,23 @@ export class EnemyCommandPhase extends FieldPhase {
 
     const trainer = battle.trainer;
 
-    if (battle.double && enemyPokemon.hasAbility(Abilities.COMMANDER)
-        && enemyPokemon.getAlly().getTag(BattlerTagType.COMMANDED)) {
+    if (
+      battle.double &&
+      enemyPokemon.hasAbility(Abilities.COMMANDER) &&
+      enemyPokemon.getAlly()?.getTag(BattlerTagType.COMMANDED)
+    ) {
       this.skipTurn = true;
     }
 
     /**
-       * If the enemy has a trainer, decide whether or not the enemy should switch
-       * to another member in its party.
-       *
-       * This block compares the active enemy Pokemon's {@linkcode Pokemon.getMatchupScore | matchup score}
-       * against the active player Pokemon with the enemy party's other non-fainted Pokemon. If a party
-       * member's matchup score is 3x the active enemy's score (or 2x for "boss" trainers),
-       * the enemy will switch to that Pokemon.
-       */
+     * If the enemy has a trainer, decide whether or not the enemy should switch
+     * to another member in its party.
+     *
+     * This block compares the active enemy Pokemon's {@linkcode Pokemon.getMatchupScore | matchup score}
+     * against the active player Pokemon with the enemy party's other non-fainted Pokemon. If a party
+     * member's matchup score is 3x the active enemy's score (or 2x for "boss" trainers),
+     * the enemy will switch to that Pokemon.
+     */
     if (trainer && !enemyPokemon.getMoveQueue().length) {
       const opponents = enemyPokemon.getOpponents();
 
@@ -58,17 +61,21 @@ export class EnemyCommandPhase extends FieldPhase {
 
         if (partyMemberScores.length) {
           const matchupScores = opponents.map(opp => enemyPokemon.getMatchupScore(opp));
-          const matchupScore = matchupScores.reduce((total, score) => total += score, 0) / matchupScores.length;
+          const matchupScore = matchupScores.reduce((total, score) => (total += score), 0) / matchupScores.length;
 
           const sortedPartyMemberScores = trainer.getSortedPartyMemberMatchupScores(partyMemberScores);
 
-          const switchMultiplier = 1 - (battle.enemySwitchCounter ? Math.pow(0.1, (1 / battle.enemySwitchCounter)) : 0);
+          const switchMultiplier = 1 - (battle.enemySwitchCounter ? Math.pow(0.1, 1 / battle.enemySwitchCounter) : 0);
 
           if (sortedPartyMemberScores[0][1] * switchMultiplier >= matchupScore * (trainer.config.isBoss ? 2 : 3)) {
             const index = trainer.getNextSummonIndex(enemyPokemon.trainerSlot, partyMemberScores);
 
-            battle.turnCommands[this.fieldIndex + BattlerIndex.ENEMY] =
-                { command: Command.POKEMON, cursor: index, args: [ false ], skip: this.skipTurn };
+            battle.turnCommands[this.fieldIndex + BattlerIndex.ENEMY] = {
+              command: Command.POKEMON,
+              cursor: index,
+              args: [false],
+              skip: this.skipTurn,
+            };
 
             battle.enemySwitchCounter++;
 
@@ -81,8 +88,15 @@ export class EnemyCommandPhase extends FieldPhase {
     /** Select a move to use (and a target to use it against, if applicable) */
     const nextMove = enemyPokemon.getNextMove();
 
-    globalScene.currentBattle.turnCommands[this.fieldIndex + BattlerIndex.ENEMY] =
-        { command: Command.FIGHT, move: nextMove, skip: this.skipTurn };
+    if (trainer?.shouldTera(enemyPokemon)) {
+      globalScene.currentBattle.preTurnCommands[this.fieldIndex + BattlerIndex.ENEMY] = { command: Command.TERA };
+    }
+
+    globalScene.currentBattle.turnCommands[this.fieldIndex + BattlerIndex.ENEMY] = {
+      command: Command.FIGHT,
+      move: nextMove,
+      skip: this.skipTurn,
+    };
 
     globalScene.currentBattle.enemySwitchCounter = Math.max(globalScene.currentBattle.enemySwitchCounter - 1, 0);
 
diff --git a/src/phases/evolution-phase.ts b/src/phases/evolution-phase.ts
index 533edd320e3..8fc8a8be031 100644
--- a/src/phases/evolution-phase.ts
+++ b/src/phases/evolution-phase.ts
@@ -5,8 +5,8 @@ import { globalScene } from "#app/global-scene";
 import type { SpeciesFormEvolution } from "#app/data/balance/pokemon-evolutions";
 import { FusionSpeciesFormEvolution } from "#app/data/balance/pokemon-evolutions";
 import type EvolutionSceneHandler from "#app/ui/evolution-scene-handler";
-import * as Utils from "#app/utils";
-import { Mode } from "#app/ui/ui";
+import { fixedInt, getFrameMs, randInt } from "#app/utils/common";
+import { UiMode } from "#enums/ui-mode";
 import { cos, sin } from "#app/field/anims";
 import type { PlayerPokemon } from "#app/field/pokemon";
 import type Pokemon from "#app/field/pokemon";
@@ -53,14 +53,13 @@ export class EvolutionPhase extends Phase {
   }
 
   setMode(): Promise<void> {
-    return globalScene.ui.setModeForceTransition(Mode.EVOLUTION_SCENE);
+    return globalScene.ui.setModeForceTransition(UiMode.EVOLUTION_SCENE);
   }
 
   start() {
     super.start();
 
     this.setMode().then(() => {
-
       if (!this.validate()) {
         return this.end();
       }
@@ -81,14 +80,28 @@ export class EvolutionPhase extends Phase {
       this.evolutionBg.setVisible(false);
       this.evolutionContainer.add(this.evolutionBg);
 
-      this.evolutionBgOverlay = globalScene.add.rectangle(0, 0, globalScene.game.canvas.width / 6, globalScene.game.canvas.height / 6, 0x262626);
+      this.evolutionBgOverlay = globalScene.add.rectangle(
+        0,
+        0,
+        globalScene.game.canvas.width / 6,
+        globalScene.game.canvas.height / 6,
+        0x262626,
+      );
       this.evolutionBgOverlay.setOrigin(0, 0);
       this.evolutionBgOverlay.setAlpha(0);
       this.evolutionContainer.add(this.evolutionBgOverlay);
 
       const getPokemonSprite = () => {
-        const ret = globalScene.addPokemonSprite(this.pokemon, this.evolutionBaseBg.displayWidth / 2, this.evolutionBaseBg.displayHeight / 2, "pkmn__sub");
-        ret.setPipeline(globalScene.spritePipeline, { tone: [ 0.0, 0.0, 0.0, 0.0 ], ignoreTimeTint: true });
+        const ret = globalScene.addPokemonSprite(
+          this.pokemon,
+          this.evolutionBaseBg.displayWidth / 2,
+          this.evolutionBaseBg.displayHeight / 2,
+          "pkmn__sub",
+        );
+        ret.setPipeline(globalScene.spritePipeline, {
+          tone: [0.0, 0.0, 0.0, 0.0],
+          ignoreTimeTint: true,
+        });
         return ret;
       };
 
@@ -98,17 +111,23 @@ export class EvolutionPhase extends Phase {
       this.evolutionContainer.add((this.pokemonEvoTintSprite = getPokemonSprite()));
 
       this.pokemonTintSprite.setAlpha(0);
-      this.pokemonTintSprite.setTintFill(0xFFFFFF);
+      this.pokemonTintSprite.setTintFill(0xffffff);
       this.pokemonEvoSprite.setVisible(false);
       this.pokemonEvoTintSprite.setVisible(false);
-      this.pokemonEvoTintSprite.setTintFill(0xFFFFFF);
+      this.pokemonEvoTintSprite.setTintFill(0xffffff);
 
-      this.evolutionOverlay = globalScene.add.rectangle(0, -globalScene.game.canvas.height / 6, globalScene.game.canvas.width / 6, (globalScene.game.canvas.height / 6) - 48, 0xFFFFFF);
+      this.evolutionOverlay = globalScene.add.rectangle(
+        0,
+        -globalScene.game.canvas.height / 6,
+        globalScene.game.canvas.width / 6,
+        globalScene.game.canvas.height / 6 - 48,
+        0xffffff,
+      );
       this.evolutionOverlay.setOrigin(0, 0);
       this.evolutionOverlay.setAlpha(0);
       globalScene.ui.add(this.evolutionOverlay);
 
-      [ this.pokemonSprite, this.pokemonTintSprite, this.pokemonEvoSprite, this.pokemonEvoTintSprite ].map(sprite => {
+      [this.pokemonSprite, this.pokemonTintSprite, this.pokemonEvoSprite, this.pokemonEvoTintSprite].map(sprite => {
         const spriteKey = this.pokemon.getSpriteKey(true);
         try {
           sprite.play(spriteKey);
@@ -116,13 +135,18 @@ export class EvolutionPhase extends Phase {
           console.error(`Failed to play animation for ${spriteKey}`, err);
         }
 
-        sprite.setPipeline(globalScene.spritePipeline, { tone: [ 0.0, 0.0, 0.0, 0.0 ], hasShadow: false, teraColor: getTypeRgb(this.pokemon.getTeraType()) });
+        sprite.setPipeline(globalScene.spritePipeline, {
+          tone: [0.0, 0.0, 0.0, 0.0],
+          hasShadow: false,
+          teraColor: getTypeRgb(this.pokemon.getTeraType()),
+          isTerastallized: this.pokemon.isTerastallized,
+        });
         sprite.setPipelineData("ignoreTimeTint", true);
         sprite.setPipelineData("spriteKey", this.pokemon.getSpriteKey());
         sprite.setPipelineData("shiny", this.pokemon.shiny);
         sprite.setPipelineData("variant", this.pokemon.variant);
-        [ "spriteColors", "fusionSpriteColors" ].map(k => {
-          if (this.pokemon.summonData?.speciesForm) {
+        ["spriteColors", "fusionSpriteColors"].map(k => {
+          if (this.pokemon.summonData.speciesForm) {
             k += "Base";
           }
           sprite.pipelineData[k] = this.pokemon.getSprite().pipelineData[k];
@@ -134,83 +158,87 @@ export class EvolutionPhase extends Phase {
   }
 
   doEvolution(): void {
-    globalScene.ui.showText(i18next.t("menu:evolving", { pokemonName: this.preEvolvedPokemonName }), null, () => {
-      this.pokemon.cry();
+    globalScene.ui.showText(
+      i18next.t("menu:evolving", { pokemonName: this.preEvolvedPokemonName }),
+      null,
+      () => {
+        this.pokemon.cry();
 
-      this.pokemon.getPossibleEvolution(this.evolution).then(evolvedPokemon => {
-
-        [ this.pokemonEvoSprite, this.pokemonEvoTintSprite ].map(sprite => {
-          const spriteKey = evolvedPokemon.getSpriteKey(true);
-          try {
-            sprite.play(spriteKey);
-          } catch (err: unknown) {
-            console.error(`Failed to play animation for ${spriteKey}`, err);
-          }
-
-          sprite.setPipelineData("ignoreTimeTint", true);
-          sprite.setPipelineData("spriteKey", evolvedPokemon.getSpriteKey());
-          sprite.setPipelineData("shiny", evolvedPokemon.shiny);
-          sprite.setPipelineData("variant", evolvedPokemon.variant);
-          [ "spriteColors", "fusionSpriteColors" ].map(k => {
-            if (evolvedPokemon.summonData?.speciesForm) {
-              k += "Base";
+        this.pokemon.getPossibleEvolution(this.evolution).then(evolvedPokemon => {
+          [this.pokemonEvoSprite, this.pokemonEvoTintSprite].map(sprite => {
+            const spriteKey = evolvedPokemon.getSpriteKey(true);
+            try {
+              sprite.play(spriteKey);
+            } catch (err: unknown) {
+              console.error(`Failed to play animation for ${spriteKey}`, err);
             }
-            sprite.pipelineData[k] = evolvedPokemon.getSprite().pipelineData[k];
-          });
-        });
 
-        globalScene.time.delayedCall(1000, () => {
-          this.evolutionBgm = globalScene.playSoundWithoutBgm("evolution");
-          globalScene.tweens.add({
-            targets: this.evolutionBgOverlay,
-            alpha: 1,
-            delay: 500,
-            duration: 1500,
-            ease: "Sine.easeOut",
-            onComplete: () => {
-              globalScene.time.delayedCall(1000, () => {
-                globalScene.tweens.add({
-                  targets: this.evolutionBgOverlay,
-                  alpha: 0,
-                  duration: 250
+            sprite.setPipelineData("ignoreTimeTint", true);
+            sprite.setPipelineData("spriteKey", evolvedPokemon.getSpriteKey());
+            sprite.setPipelineData("shiny", evolvedPokemon.shiny);
+            sprite.setPipelineData("variant", evolvedPokemon.variant);
+            ["spriteColors", "fusionSpriteColors"].map(k => {
+              if (evolvedPokemon.summonData.speciesForm) {
+                k += "Base";
+              }
+              sprite.pipelineData[k] = evolvedPokemon.getSprite().pipelineData[k];
+            });
+          });
+
+          globalScene.time.delayedCall(1000, () => {
+            this.evolutionBgm = globalScene.playSoundWithoutBgm("evolution");
+            globalScene.tweens.add({
+              targets: this.evolutionBgOverlay,
+              alpha: 1,
+              delay: 500,
+              duration: 1500,
+              ease: "Sine.easeOut",
+              onComplete: () => {
+                globalScene.time.delayedCall(1000, () => {
+                  globalScene.tweens.add({
+                    targets: this.evolutionBgOverlay,
+                    alpha: 0,
+                    duration: 250,
+                  });
+                  this.evolutionBg.setVisible(true);
+                  this.evolutionBg.play();
                 });
-                this.evolutionBg.setVisible(true);
-                this.evolutionBg.play();
-              });
-              globalScene.playSound("se/charge");
-              this.doSpiralUpward();
-              globalScene.tweens.addCounter({
-                from: 0,
-                to: 1,
-                duration: 2000,
-                onUpdate: t => {
-                  this.pokemonTintSprite.setAlpha(t.getValue());
-                },
-                onComplete: () => {
-                  this.pokemonSprite.setVisible(false);
-                  globalScene.time.delayedCall(1100, () => {
-                    globalScene.playSound("se/beam");
-                    this.doArcDownward();
-                    globalScene.time.delayedCall(1500, () => {
-                      this.pokemonEvoTintSprite.setScale(0.25);
-                      this.pokemonEvoTintSprite.setVisible(true);
-                      this.evolutionHandler.canCancel = true;
-                      this.doCycle(1).then(success => {
-                        if (success) {
-                          this.handleSuccessEvolution(evolvedPokemon);
-                        } else {
-                          this.handleFailedEvolution(evolvedPokemon);
-                        }
+                globalScene.playSound("se/charge");
+                this.doSpiralUpward();
+                globalScene.tweens.addCounter({
+                  from: 0,
+                  to: 1,
+                  duration: 2000,
+                  onUpdate: t => {
+                    this.pokemonTintSprite.setAlpha(t.getValue());
+                  },
+                  onComplete: () => {
+                    this.pokemonSprite.setVisible(false);
+                    globalScene.time.delayedCall(1100, () => {
+                      globalScene.playSound("se/beam");
+                      this.doArcDownward();
+                      globalScene.time.delayedCall(1500, () => {
+                        this.pokemonEvoTintSprite.setScale(0.25);
+                        this.pokemonEvoTintSprite.setVisible(true);
+                        this.evolutionHandler.canCancel = true;
+                        this.doCycle(1).then(success => {
+                          if (success) {
+                            this.handleSuccessEvolution(evolvedPokemon);
+                          } else {
+                            this.handleFailedEvolution(evolvedPokemon);
+                          }
+                        });
                       });
                     });
-                  });
-                }
-              });
-            }
+                  },
+                });
+              },
+            });
           });
         });
-      });
-    }, 1000);
+      },
+      1000,
+    );
   }
 
   /**
@@ -221,36 +249,61 @@ export class EvolutionPhase extends Phase {
     this.pokemonSprite.setVisible(true);
     this.pokemonTintSprite.setScale(1);
     globalScene.tweens.add({
-      targets: [ this.evolutionBg, this.pokemonTintSprite, this.pokemonEvoSprite, this.pokemonEvoTintSprite ],
+      targets: [this.evolutionBg, this.pokemonTintSprite, this.pokemonEvoSprite, this.pokemonEvoTintSprite],
       alpha: 0,
       duration: 250,
       onComplete: () => {
         this.evolutionBg.setVisible(false);
-      }
+      },
     });
 
     SoundFade.fadeOut(globalScene, this.evolutionBgm, 100);
 
     globalScene.unshiftPhase(new EndEvolutionPhase());
 
-    globalScene.ui.showText(i18next.t("menu:stoppedEvolving", { pokemonName: this.preEvolvedPokemonName }), null, () => {
-      globalScene.ui.showText(i18next.t("menu:pauseEvolutionsQuestion", { pokemonName: this.preEvolvedPokemonName }), null, () => {
-        const end = () => {
-          globalScene.ui.showText("", 0);
-          globalScene.playBgm();
-          evolvedPokemon.destroy();
-          this.end();
-        };
-        globalScene.ui.setOverlayMode(Mode.CONFIRM, () => {
-          globalScene.ui.revertMode();
-          this.pokemon.pauseEvolutions = true;
-          globalScene.ui.showText(i18next.t("menu:evolutionsPaused", { pokemonName: this.preEvolvedPokemonName }), null, end, 3000);
-        }, () => {
-          globalScene.ui.revertMode();
-          globalScene.time.delayedCall(3000, end);
-        });
-      });
-    }, null, true);
+    globalScene.ui.showText(
+      i18next.t("menu:stoppedEvolving", {
+        pokemonName: this.preEvolvedPokemonName,
+      }),
+      null,
+      () => {
+        globalScene.ui.showText(
+          i18next.t("menu:pauseEvolutionsQuestion", {
+            pokemonName: this.preEvolvedPokemonName,
+          }),
+          null,
+          () => {
+            const end = () => {
+              globalScene.ui.showText("", 0);
+              globalScene.playBgm();
+              evolvedPokemon.destroy();
+              this.end();
+            };
+            globalScene.ui.setOverlayMode(
+              UiMode.CONFIRM,
+              () => {
+                globalScene.ui.revertMode();
+                this.pokemon.pauseEvolutions = true;
+                globalScene.ui.showText(
+                  i18next.t("menu:evolutionsPaused", {
+                    pokemonName: this.preEvolvedPokemonName,
+                  }),
+                  null,
+                  end,
+                  3000,
+                );
+              },
+              () => {
+                globalScene.ui.revertMode();
+                globalScene.time.delayedCall(3000, end);
+              },
+            );
+          },
+        );
+      },
+      null,
+      true,
+    );
   }
 
   /**
@@ -270,8 +323,18 @@ export class EvolutionPhase extends Phase {
           globalScene.playSoundWithoutBgm("evolution_fanfare");
 
           evolvedPokemon.destroy();
-          globalScene.ui.showText(i18next.t("menu:evolutionDone", { pokemonName: this.preEvolvedPokemonName, evolvedPokemonName: this.pokemon.name }), null, () => this.end(), null, true, Utils.fixedInt(4000));
-          globalScene.time.delayedCall(Utils.fixedInt(4250), () => globalScene.playBgm());
+          globalScene.ui.showText(
+            i18next.t("menu:evolutionDone", {
+              pokemonName: this.preEvolvedPokemonName,
+              evolvedPokemonName: this.pokemon.species.getExpandedSpeciesName(),
+            }),
+            null,
+            () => this.end(),
+            null,
+            true,
+            fixedInt(4000),
+          );
+          globalScene.time.delayedCall(fixedInt(4250), () => globalScene.playBgm());
         });
       });
     };
@@ -280,8 +343,14 @@ export class EvolutionPhase extends Phase {
       this.evolutionHandler.canCancel = false;
 
       this.pokemon.evolve(this.evolution, this.pokemon.species).then(() => {
-        const learnSituation: LearnMoveSituation = this.fusionSpeciesEvolved ? LearnMoveSituation.EVOLUTION_FUSED : this.pokemon.fusionSpecies ? LearnMoveSituation.EVOLUTION_FUSED_BASE : LearnMoveSituation.EVOLUTION;
-        const levelMoves = this.pokemon.getLevelMoves(this.lastLevel + 1, true, false, false, learnSituation).filter(lm => lm[0] === EVOLVE_MOVE);
+        const learnSituation: LearnMoveSituation = this.fusionSpeciesEvolved
+          ? LearnMoveSituation.EVOLUTION_FUSED
+          : this.pokemon.fusionSpecies
+            ? LearnMoveSituation.EVOLUTION_FUSED_BASE
+            : LearnMoveSituation.EVOLUTION;
+        const levelMoves = this.pokemon
+          .getLevelMoves(this.lastLevel + 1, true, false, false, learnSituation)
+          .filter(lm => lm[0] === EVOLVE_MOVE);
         for (const lm of levelMoves) {
           globalScene.unshiftPhase(new LearnMovePhase(globalScene.getPlayerParty().indexOf(this.pokemon), lm[1]));
         }
@@ -298,7 +367,7 @@ export class EvolutionPhase extends Phase {
             this.evolutionBgOverlay.setAlpha(1);
             this.evolutionBg.setVisible(false);
             globalScene.tweens.add({
-              targets: [ this.evolutionOverlay, this.pokemonEvoTintSprite ],
+              targets: [this.evolutionOverlay, this.pokemonEvoTintSprite],
               alpha: 0,
               duration: 2000,
               delay: 150,
@@ -308,11 +377,11 @@ export class EvolutionPhase extends Phase {
                   targets: this.evolutionBgOverlay,
                   alpha: 0,
                   duration: 250,
-                  onComplete: onEvolutionComplete
+                  onComplete: onEvolutionComplete,
                 });
-              }
+              },
             });
-          }
+          },
         });
       });
     });
@@ -323,7 +392,7 @@ export class EvolutionPhase extends Phase {
 
     globalScene.tweens.addCounter({
       repeat: 64,
-      duration: Utils.getFrameMs(1),
+      duration: getFrameMs(1),
       onRepeat: () => {
         if (f < 64) {
           if (!(f & 7)) {
@@ -333,7 +402,7 @@ export class EvolutionPhase extends Phase {
           }
           f++;
         }
-      }
+      },
     });
   }
 
@@ -342,7 +411,7 @@ export class EvolutionPhase extends Phase {
 
     globalScene.tweens.addCounter({
       repeat: 96,
-      duration: Utils.getFrameMs(1),
+      duration: getFrameMs(1),
       onRepeat: () => {
         if (f < 96) {
           if (f < 6) {
@@ -352,11 +421,11 @@ export class EvolutionPhase extends Phase {
           }
           f++;
         }
-      }
+      },
     });
   }
 
-  doCycle(l: number, lastCycle: number = 15): Promise<boolean> {
+  doCycle(l: number, lastCycle = 15): Promise<boolean> {
     return new Promise(resolve => {
       const isLastCycle = l === lastCycle;
       globalScene.tweens.add({
@@ -364,7 +433,7 @@ export class EvolutionPhase extends Phase {
         scale: 0.25,
         ease: "Cubic.easeInOut",
         duration: 500 / l,
-        yoyo: !isLastCycle
+        yoyo: !isLastCycle,
       });
       globalScene.tweens.add({
         targets: this.pokemonEvoTintSprite,
@@ -382,7 +451,7 @@ export class EvolutionPhase extends Phase {
             this.pokemonTintSprite.setVisible(false);
             resolve(true);
           }
-        }
+        },
       });
     });
   }
@@ -392,7 +461,7 @@ export class EvolutionPhase extends Phase {
 
     globalScene.tweens.addCounter({
       repeat: 48,
-      duration: Utils.getFrameMs(1),
+      duration: getFrameMs(1),
       onRepeat: () => {
         if (!f) {
           for (let i = 0; i < 16; i++) {
@@ -404,7 +473,7 @@ export class EvolutionPhase extends Phase {
           }
         }
         f++;
-      }
+      },
     });
   }
 
@@ -413,17 +482,17 @@ export class EvolutionPhase extends Phase {
 
     globalScene.tweens.addCounter({
       repeat: 48,
-      duration: Utils.getFrameMs(1),
+      duration: getFrameMs(1),
       onRepeat: () => {
         if (!f) {
           for (let i = 0; i < 8; i++) {
             this.doSprayParticle(i);
           }
         } else if (f < 50) {
-          this.doSprayParticle(Utils.randInt(8));
+          this.doSprayParticle(randInt(8));
         }
         f++;
-      }
+      },
     });
   }
 
@@ -437,10 +506,10 @@ export class EvolutionPhase extends Phase {
 
     const particleTimer = globalScene.tweens.addCounter({
       repeat: -1,
-      duration: Utils.getFrameMs(1),
+      duration: getFrameMs(1),
       onRepeat: () => {
         updateParticle();
-      }
+      },
     });
 
     const updateParticle = () => {
@@ -448,7 +517,7 @@ export class EvolutionPhase extends Phase {
         particle.setPosition(initialX, 88 - (f * f) / 80);
         particle.y += sin(trigIndex, amp) / 4;
         particle.x += cos(trigIndex, amp);
-        particle.setScale(1 - (f / 80));
+        particle.setScale(1 - f / 80);
         trigIndex += 4;
         if (f & 1) {
           amp--;
@@ -474,10 +543,10 @@ export class EvolutionPhase extends Phase {
 
     const particleTimer = globalScene.tweens.addCounter({
       repeat: -1,
-      duration: Utils.getFrameMs(1),
+      duration: getFrameMs(1),
       onRepeat: () => {
         updateParticle();
-      }
+      },
     });
 
     const updateParticle = () => {
@@ -506,10 +575,10 @@ export class EvolutionPhase extends Phase {
 
     const particleTimer = globalScene.tweens.addCounter({
       repeat: -1,
-      duration: Utils.getFrameMs(1),
+      duration: getFrameMs(1),
       onRepeat: () => {
         updateParticle();
-      }
+      },
     });
 
     const updateParticle = () => {
@@ -536,15 +605,15 @@ export class EvolutionPhase extends Phase {
 
     let f = 0;
     let yOffset = 0;
-    const speed = 3 - Utils.randInt(8);
-    const amp = 48 + Utils.randInt(64);
+    const speed = 3 - randInt(8);
+    const amp = 48 + randInt(64);
 
     const particleTimer = globalScene.tweens.addCounter({
       repeat: -1,
-      duration: Utils.getFrameMs(1),
+      duration: getFrameMs(1),
       onRepeat: () => {
         updateParticle();
-      }
+      },
     });
 
     const updateParticle = () => {
@@ -555,7 +624,7 @@ export class EvolutionPhase extends Phase {
         particle.setPosition(initialX + (speed * f) / 3, initialY + yOffset);
         particle.y += -sin(trigIndex, amp);
         if (f > 108) {
-          particle.setScale((1 - (f - 108) / 20));
+          particle.setScale(1 - (f - 108) / 20);
         }
         trigIndex++;
         f++;
diff --git a/src/phases/exp-phase.ts b/src/phases/exp-phase.ts
index 7cf953851a1..8841a90d5b1 100644
--- a/src/phases/exp-phase.ts
+++ b/src/phases/exp-phase.ts
@@ -2,7 +2,7 @@ import { globalScene } from "#app/global-scene";
 import { getPokemonNameWithAffix } from "#app/messages";
 import { ExpBoosterModifier } from "#app/modifier/modifier";
 import i18next from "i18next";
-import * as Utils from "#app/utils";
+import { NumberHolder } from "#app/utils/common";
 import { PlayerPartyMemberPokemonPhase } from "./player-party-member-pokemon-phase";
 import { LevelUpPhase } from "./level-up-phase";
 
@@ -19,17 +19,26 @@ export class ExpPhase extends PlayerPartyMemberPokemonPhase {
     super.start();
 
     const pokemon = this.getPokemon();
-    const exp = new Utils.NumberHolder(this.expValue);
+    const exp = new NumberHolder(this.expValue);
     globalScene.applyModifiers(ExpBoosterModifier, true, exp);
     exp.value = Math.floor(exp.value);
-    globalScene.ui.showText(i18next.t("battle:expGain", { pokemonName: getPokemonNameWithAffix(pokemon), exp: exp.value }), null, () => {
-      const lastLevel = pokemon.level;
-      pokemon.addExp(exp.value);
-      const newLevel = pokemon.level;
-      if (newLevel > lastLevel) {
-        globalScene.unshiftPhase(new LevelUpPhase(this.partyMemberIndex, lastLevel, newLevel));
-      }
-      pokemon.updateInfo().then(() => this.end());
-    }, null, true);
+    globalScene.ui.showText(
+      i18next.t("battle:expGain", {
+        pokemonName: getPokemonNameWithAffix(pokemon),
+        exp: exp.value,
+      }),
+      null,
+      () => {
+        const lastLevel = pokemon.level;
+        pokemon.addExp(exp.value);
+        const newLevel = pokemon.level;
+        if (newLevel > lastLevel) {
+          globalScene.unshiftPhase(new LevelUpPhase(this.partyMemberIndex, lastLevel, newLevel));
+        }
+        pokemon.updateInfo().then(() => this.end());
+      },
+      null,
+      true,
+    );
   }
 }
diff --git a/src/phases/faint-phase.ts b/src/phases/faint-phase.ts
index 414aa84ce6c..1aa24d59fa0 100644
--- a/src/phases/faint-phase.ts
+++ b/src/phases/faint-phase.ts
@@ -1,11 +1,17 @@
 import type { BattlerIndex } from "#app/battle";
-import { BattleType } from "#app/battle";
+import { BattleType } from "#enums/battle-type";
 import { globalScene } from "#app/global-scene";
-import { applyPostFaintAbAttrs, applyPostKnockOutAbAttrs, applyPostVictoryAbAttrs, PostFaintAbAttr, PostKnockOutAbAttr, PostVictoryAbAttr } from "#app/data/ability";
-import type { DestinyBondTag, GrudgeTag } from "#app/data/battler-tags";
+import {
+  applyPostFaintAbAttrs,
+  applyPostKnockOutAbAttrs,
+  applyPostVictoryAbAttrs,
+  PostFaintAbAttr,
+  PostKnockOutAbAttr,
+  PostVictoryAbAttr,
+} from "#app/data/abilities/ability";
 import { BattlerTagLapseType } from "#app/data/battler-tags";
 import { battleSpecDialogue } from "#app/data/dialogue";
-import { allMoves, PostVictoryStatStageChangeAttr } from "#app/data/move";
+import { allMoves, PostVictoryStatStageChangeAttr } from "#app/data/moves/move";
 import { SpeciesFormChangeActiveTrigger } from "#app/data/pokemon-forms";
 import { BattleSpec } from "#app/enums/battle-spec";
 import { StatusEffect } from "#app/enums/status-effect";
@@ -23,36 +29,25 @@ import { SwitchPhase } from "./switch-phase";
 import { SwitchSummonPhase } from "./switch-summon-phase";
 import { ToggleDoublePositionPhase } from "./toggle-double-position-phase";
 import { VictoryPhase } from "./victory-phase";
-import { isNullOrUndefined } from "#app/utils";
+import { isNullOrUndefined } from "#app/utils/common";
 import { FRIENDSHIP_LOSS_FROM_FAINT } from "#app/data/balance/starters";
+import { BattlerTagType } from "#enums/battler-tag-type";
 
 export class FaintPhase extends PokemonPhase {
   /**
-   * Whether or not enduring (for this phase's purposes, Reviver Seed) should be prevented
+   * Whether or not instant revive should be prevented
    */
-  private preventEndure: boolean;
-
-  /**
-   * Destiny Bond tag belonging to the currently fainting Pokemon, if applicable
-   */
-  private destinyTag?: DestinyBondTag | null;
-
-  /**
-   * Grudge tag belonging to the currently fainting Pokemon, if applicable
-   */
-  private grudgeTag?: GrudgeTag | null;
+  private preventInstantRevive: boolean;
 
   /**
    * The source Pokemon that dealt fatal damage
    */
   private source?: Pokemon;
 
-  constructor(battlerIndex: BattlerIndex, preventEndure: boolean = false, destinyTag?: DestinyBondTag | null, grudgeTag?: GrudgeTag | null, source?: Pokemon) {
+  constructor(battlerIndex: BattlerIndex, preventInstantRevive = false, source?: Pokemon) {
     super(battlerIndex);
 
-    this.preventEndure = preventEndure;
-    this.destinyTag = destinyTag;
-    this.grudgeTag = grudgeTag;
+    this.preventInstantRevive = preventInstantRevive;
     this.source = source;
   }
 
@@ -61,16 +56,19 @@ export class FaintPhase extends PokemonPhase {
 
     const faintPokemon = this.getPokemon();
 
-    if (!isNullOrUndefined(this.destinyTag) && !isNullOrUndefined(this.source)) {
-      this.destinyTag.lapse(this.source, BattlerTagLapseType.CUSTOM);
+    if (this.source) {
+      faintPokemon.getTag(BattlerTagType.DESTINY_BOND)?.lapse(this.source, BattlerTagLapseType.CUSTOM);
+      faintPokemon.getTag(BattlerTagType.GRUDGE)?.lapse(faintPokemon, BattlerTagLapseType.CUSTOM, this.source);
     }
 
-    if (!isNullOrUndefined(this.grudgeTag) && !isNullOrUndefined(this.source)) {
-      this.grudgeTag.lapse(faintPokemon, BattlerTagLapseType.CUSTOM, this.source);
-    }
+    faintPokemon.resetSummonData();
 
-    if (!this.preventEndure) {
-      const instantReviveModifier = globalScene.applyModifier(PokemonInstantReviveModifier, this.player, faintPokemon) as PokemonInstantReviveModifier;
+    if (!this.preventInstantRevive) {
+      const instantReviveModifier = globalScene.applyModifier(
+        PokemonInstantReviveModifier,
+        this.player,
+        faintPokemon,
+      ) as PokemonInstantReviveModifier;
 
       if (instantReviveModifier) {
         faintPokemon.loseHeldItem(instantReviveModifier);
@@ -80,13 +78,11 @@ export class FaintPhase extends PokemonPhase {
     }
 
     /** In case the current pokemon was just switched in, make sure it is counted as participating in the combat */
-    globalScene.getPlayerField().forEach((pokemon, i) => {
-      if (pokemon?.isActive(true)) {
-        if (pokemon.isPlayer()) {
-          globalScene.currentBattle.addParticipant(pokemon as PlayerPokemon);
-        }
+    for (const pokemon of globalScene.getPlayerField()) {
+      if (pokemon?.isActive(true) && pokemon.isPlayer()) {
+        globalScene.currentBattle.addParticipant(pokemon as PlayerPokemon);
       }
-    });
+    }
 
     if (!this.tryOverrideForBattleSpec()) {
       this.doFaint();
@@ -96,29 +92,51 @@ export class FaintPhase extends PokemonPhase {
   doFaint(): void {
     const pokemon = this.getPokemon();
 
-
-    // Track total times pokemon have been KO'd for supreme overlord/last respects
+    // Track total times pokemon have been KO'd for Last Respects/Supreme Overlord
     if (pokemon.isPlayer()) {
-      globalScene.currentBattle.playerFaints += 1;
-      globalScene.currentBattle.playerFaintsHistory.push({ pokemon: pokemon, turn: globalScene.currentBattle.turn });
+      globalScene.arena.playerFaints += 1;
+      globalScene.currentBattle.playerFaintsHistory.push({
+        pokemon: pokemon,
+        turn: globalScene.currentBattle.turn,
+      });
     } else {
       globalScene.currentBattle.enemyFaints += 1;
-      globalScene.currentBattle.enemyFaintsHistory.push({ pokemon: pokemon, turn: globalScene.currentBattle.turn });
+      globalScene.currentBattle.enemyFaintsHistory.push({
+        pokemon: pokemon,
+        turn: globalScene.currentBattle.turn,
+      });
     }
 
-    globalScene.queueMessage(i18next.t("battle:fainted", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }), null, true);
+    globalScene.queueMessage(
+      i18next.t("battle:fainted", {
+        pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
+      }),
+      null,
+      true,
+    );
     globalScene.triggerPokemonFormChange(pokemon, SpeciesFormChangeActiveTrigger, true);
 
-    if (pokemon.turnData?.attacksReceived?.length) {
+    pokemon.resetTera();
+
+    if (pokemon.turnData.attacksReceived?.length) {
       const lastAttack = pokemon.turnData.attacksReceived[0];
-      applyPostFaintAbAttrs(PostFaintAbAttr, pokemon, globalScene.getPokemonById(lastAttack.sourceId)!, new PokemonMove(lastAttack.move).getMove(), lastAttack.result); // TODO: is this bang correct?
-    } else { //If killed by indirect damage, apply post-faint abilities without providing a last move
+      applyPostFaintAbAttrs(
+        PostFaintAbAttr,
+        pokemon,
+        globalScene.getPokemonById(lastAttack.sourceId)!,
+        new PokemonMove(lastAttack.move).getMove(),
+        lastAttack.result,
+      ); // TODO: is this bang correct?
+    } else {
+      //If killed by indirect damage, apply post-faint abilities without providing a last move
       applyPostFaintAbAttrs(PostFaintAbAttr, pokemon);
     }
 
     const alivePlayField = globalScene.getField(true);
-    alivePlayField.forEach(p => applyPostKnockOutAbAttrs(PostKnockOutAbAttr, p, pokemon));
-    if (pokemon.turnData?.attacksReceived?.length) {
+    for (const p of alivePlayField) {
+      applyPostKnockOutAbAttrs(PostKnockOutAbAttr, p, pokemon);
+    }
+    if (pokemon.turnData.attacksReceived?.length) {
       const defeatSource = this.source;
 
       if (defeatSource?.isOnField()) {
@@ -141,7 +159,11 @@ export class FaintPhase extends PokemonPhase {
       if (!legalPlayerPokemon.length) {
         /** If the player doesn't have any legal Pokemon, end the game */
         globalScene.unshiftPhase(new GameOverPhase());
-      } else if (globalScene.currentBattle.double && legalPlayerPokemon.length === 1 && legalPlayerPartyPokemon.length === 0) {
+      } else if (
+        globalScene.currentBattle.double &&
+        legalPlayerPokemon.length === 1 &&
+        legalPlayerPartyPokemon.length === 0
+      ) {
         /**
          * If the player has exactly one Pokemon in total at this point in a double battle, and that Pokemon
          * is already on the field, unshift a phase that moves that Pokemon to center position.
@@ -156,8 +178,11 @@ export class FaintPhase extends PokemonPhase {
       }
     } else {
       globalScene.unshiftPhase(new VictoryPhase(this.battlerIndex));
-      if ([ BattleType.TRAINER, BattleType.MYSTERY_ENCOUNTER ].includes(globalScene.currentBattle.battleType)) {
-        const hasReservePartyMember = !!globalScene.getEnemyParty().filter(p => p.isActive() && !p.isOnField() && p.trainerSlot === (pokemon as EnemyPokemon).trainerSlot).length;
+      if ([BattleType.TRAINER, BattleType.MYSTERY_ENCOUNTER].includes(globalScene.currentBattle.battleType)) {
+        const hasReservePartyMember = !!globalScene
+          .getEnemyParty()
+          .filter(p => p.isActive() && !p.isOnField() && p.trainerSlot === (pokemon as EnemyPokemon).trainerSlot)
+          .length;
         if (hasReservePartyMember) {
           globalScene.pushPhase(new SwitchSummonPhase(SwitchType.SWITCH, this.fieldIndex, -1, false, false));
         }
@@ -165,8 +190,8 @@ export class FaintPhase extends PokemonPhase {
     }
 
     // in double battles redirect potential moves off fainted pokemon
-    if (globalScene.currentBattle.double) {
-      const allyPokemon = pokemon.getAlly();
+    const allyPokemon = pokemon.getAlly();
+    if (globalScene.currentBattle.double && !isNullOrUndefined(allyPokemon)) {
       globalScene.redirectPokemonMoves(pokemon, allyPokemon);
     }
 
@@ -194,7 +219,7 @@ export class FaintPhase extends PokemonPhase {
           }
           pokemon.leaveField();
           this.end();
-        }
+        },
       });
     });
   }
@@ -205,11 +230,16 @@ export class FaintPhase extends PokemonPhase {
         if (!this.player) {
           const enemy = this.getPokemon();
           if (enemy.formIndex) {
-            globalScene.ui.showDialogue(battleSpecDialogue[BattleSpec.FINAL_BOSS].secondStageWin, enemy.species.name, null, () => this.doFaint());
+            globalScene.ui.showDialogue(
+              battleSpecDialogue[BattleSpec.FINAL_BOSS].secondStageWin,
+              enemy.species.name,
+              null,
+              () => this.doFaint(),
+            );
           } else {
-          // Final boss' HP threshold has been bypassed; cancel faint and force check for 2nd phase
+            // Final boss' HP threshold has been bypassed; cancel faint and force check for 2nd phase
             enemy.hp++;
-            globalScene.unshiftPhase(new DamageAnimPhase(enemy.getBattlerIndex(), 0, HitResult.OTHER));
+            globalScene.unshiftPhase(new DamageAnimPhase(enemy.getBattlerIndex(), 0, HitResult.INDIRECT));
             this.end();
           }
           return true;
diff --git a/src/phases/field-phase.ts b/src/phases/field-phase.ts
index 0836d1171c0..c37f0e960e7 100644
--- a/src/phases/field-phase.ts
+++ b/src/phases/field-phase.ts
@@ -6,7 +6,8 @@ type PokemonFunc = (pokemon: Pokemon) => void;
 
 export abstract class FieldPhase extends BattlePhase {
   executeForAll(func: PokemonFunc): void {
-    const field = globalScene.getField(true).filter(p => p.summonData);
-    field.forEach(pokemon => func(pokemon));
+    for (const pokemon of globalScene.getField(true)) {
+      func(pokemon);
+    }
   }
 }
diff --git a/src/phases/form-change-phase.ts b/src/phases/form-change-phase.ts
index 353fed7b76c..5517fb0f402 100644
--- a/src/phases/form-change-phase.ts
+++ b/src/phases/form-change-phase.ts
@@ -1,15 +1,15 @@
 import { globalScene } from "#app/global-scene";
-import * as Utils from "../utils";
+import { fixedInt } from "#app/utils/common";
 import { achvs } from "../system/achv";
 import type { SpeciesFormChange } from "../data/pokemon-forms";
 import { getSpeciesFormChangeMessage } from "../data/pokemon-forms";
 import type { PlayerPokemon } from "../field/pokemon";
-import { Mode } from "../ui/ui";
+import { UiMode } from "#enums/ui-mode";
 import type PartyUiHandler from "../ui/party-ui-handler";
 import { getPokemonNameWithAffix } from "../messages";
 import { EndEvolutionPhase } from "./end-evolution-phase";
 import { EvolutionPhase } from "./evolution-phase";
-import { BattlerTagType } from "#app/enums/battler-tag-type";
+import { BattlerTagType } from "#enums/battler-tag-type";
 import { SpeciesFormKey } from "#enums/species-form-key";
 
 export class FormChangePhase extends EvolutionPhase {
@@ -31,15 +31,14 @@ export class FormChangePhase extends EvolutionPhase {
     if (!this.modal) {
       return super.setMode();
     }
-    return globalScene.ui.setOverlayMode(Mode.EVOLUTION_SCENE);
+    return globalScene.ui.setOverlayMode(UiMode.EVOLUTION_SCENE);
   }
 
   doEvolution(): void {
     const preName = getPokemonNameWithAffix(this.pokemon);
 
     this.pokemon.getPossibleForm(this.formChange).then(transformedPokemon => {
-
-      [ this.pokemonEvoSprite, this.pokemonEvoTintSprite ].map(sprite => {
+      [this.pokemonEvoSprite, this.pokemonEvoTintSprite].map(sprite => {
         const spriteKey = transformedPokemon.getSpriteKey(true);
         try {
           sprite.play(spriteKey);
@@ -51,8 +50,8 @@ export class FormChangePhase extends EvolutionPhase {
         sprite.setPipelineData("spriteKey", transformedPokemon.getSpriteKey());
         sprite.setPipelineData("shiny", transformedPokemon.shiny);
         sprite.setPipelineData("variant", transformedPokemon.variant);
-        [ "spriteColors", "fusionSpriteColors" ].map(k => {
-          if (transformedPokemon.summonData?.speciesForm) {
+        ["spriteColors", "fusionSpriteColors"].map(k => {
+          if (transformedPokemon.summonData.speciesForm) {
             k += "Base";
           }
           sprite.pipelineData[k] = transformedPokemon.getSprite().pipelineData[k];
@@ -71,7 +70,7 @@ export class FormChangePhase extends EvolutionPhase {
               globalScene.tweens.add({
                 targets: this.evolutionBgOverlay,
                 alpha: 0,
-                duration: 250
+                duration: 250,
               });
               this.evolutionBg.setVisible(true);
               this.evolutionBg.play();
@@ -114,7 +113,7 @@ export class FormChangePhase extends EvolutionPhase {
                               this.evolutionBgOverlay.setAlpha(1);
                               this.evolutionBg.setVisible(false);
                               globalScene.tweens.add({
-                                targets: [ this.evolutionOverlay, this.pokemonEvoTintSprite ],
+                                targets: [this.evolutionOverlay, this.pokemonEvoTintSprite],
                                 alpha: 0,
                                 duration: 2000,
                                 delay: 150,
@@ -132,33 +131,47 @@ export class FormChangePhase extends EvolutionPhase {
                                           if (this.formChange.formKey.indexOf(SpeciesFormKey.MEGA) > -1) {
                                             globalScene.validateAchv(achvs.MEGA_EVOLVE);
                                             playEvolutionFanfare = true;
-                                          } else if (this.formChange.formKey.indexOf(SpeciesFormKey.GIGANTAMAX) > -1 || this.formChange.formKey.indexOf(SpeciesFormKey.ETERNAMAX) > -1) {
+                                          } else if (
+                                            this.formChange.formKey.indexOf(SpeciesFormKey.GIGANTAMAX) > -1 ||
+                                            this.formChange.formKey.indexOf(SpeciesFormKey.ETERNAMAX) > -1
+                                          ) {
                                             globalScene.validateAchv(achvs.GIGANTAMAX);
                                             playEvolutionFanfare = true;
                                           }
 
                                           const delay = playEvolutionFanfare ? 4000 : 1750;
-                                          globalScene.playSoundWithoutBgm(playEvolutionFanfare ? "evolution_fanfare" : "minor_fanfare");
+                                          globalScene.playSoundWithoutBgm(
+                                            playEvolutionFanfare ? "evolution_fanfare" : "minor_fanfare",
+                                          );
 
                                           transformedPokemon.destroy();
-                                          globalScene.ui.showText(getSpeciesFormChangeMessage(this.pokemon, this.formChange, preName), null, () => this.end(), null, true, Utils.fixedInt(delay));
-                                          globalScene.time.delayedCall(Utils.fixedInt(delay + 250), () => globalScene.playBgm());
+                                          globalScene.ui.showText(
+                                            getSpeciesFormChangeMessage(this.pokemon, this.formChange, preName),
+                                            null,
+                                            () => this.end(),
+                                            null,
+                                            true,
+                                            fixedInt(delay),
+                                          );
+                                          globalScene.time.delayedCall(fixedInt(delay + 250), () =>
+                                            globalScene.playBgm(),
+                                          );
                                         });
                                       });
-                                    }
+                                    },
                                   });
-                                }
+                                },
                               });
-                            }
+                            },
                           });
                         });
                       });
                     });
                   });
                 });
-              }
+              },
             });
-          }
+          },
         });
       });
     });
@@ -168,7 +181,7 @@ export class FormChangePhase extends EvolutionPhase {
     this.pokemon.findAndRemoveTags(t => t.tagType === BattlerTagType.AUTOTOMIZED);
     if (this.modal) {
       globalScene.ui.revertMode().then(() => {
-        if (globalScene.ui.getMode() === Mode.PARTY) {
+        if (globalScene.ui.getMode() === UiMode.PARTY) {
           const partyUiHandler = globalScene.ui.getHandler() as PartyUiHandler;
           partyUiHandler.clearPartySlots();
           partyUiHandler.populatePartySlots();
diff --git a/src/phases/game-over-modifier-reward-phase.ts b/src/phases/game-over-modifier-reward-phase.ts
index c98bb5fff04..ab6f6554c99 100644
--- a/src/phases/game-over-modifier-reward-phase.ts
+++ b/src/phases/game-over-modifier-reward-phase.ts
@@ -1,27 +1,30 @@
 import { globalScene } from "#app/global-scene";
-import type { ModifierTypeFunc } from "#app/modifier/modifier-type";
-import { Mode } from "#app/ui/ui";
+import { UiMode } from "#enums/ui-mode";
 import i18next from "i18next";
 import { ModifierRewardPhase } from "./modifier-reward-phase";
 
 export class GameOverModifierRewardPhase extends ModifierRewardPhase {
-  constructor(modifierTypeFunc: ModifierTypeFunc) {
-    super(modifierTypeFunc);
-  }
-
   doReward(): Promise<void> {
     return new Promise<void>(resolve => {
       const newModifier = this.modifierType.newModifier();
-      globalScene.addModifier(newModifier).then(() => {
-        // Sound loaded into game as is
-        globalScene.playSound("level_up_fanfare");
-        globalScene.ui.setMode(Mode.MESSAGE);
-        globalScene.ui.fadeIn(250).then(() => {
-          globalScene.ui.showText(i18next.t("battle:rewardGain", { modifierName: newModifier?.type.name }), null, () => {
+      globalScene.addModifier(newModifier);
+      // Sound loaded into game as is
+      globalScene.playSound("level_up_fanfare");
+      globalScene.ui.setMode(UiMode.MESSAGE);
+      globalScene.ui.fadeIn(250).then(() => {
+        globalScene.ui.showText(
+          i18next.t("battle:rewardGain", {
+            modifierName: newModifier?.type.name,
+          }),
+          null,
+          () => {
             globalScene.time.delayedCall(1500, () => globalScene.arenaBg.setVisible(true));
             resolve();
-          }, null, true, 1500);
-        });
+          },
+          null,
+          true,
+          1500,
+        );
       });
     });
   }
diff --git a/src/phases/game-over-phase.ts b/src/phases/game-over-phase.ts
index 5e4e8e1cdf7..3a3305fd45e 100644
--- a/src/phases/game-over-phase.ts
+++ b/src/phases/game-over-phase.ts
@@ -1,11 +1,11 @@
 import { clientSessionId } from "#app/account";
-import { BattleType } from "#app/battle";
+import { BattleType } from "#enums/battle-type";
 import { globalScene } from "#app/global-scene";
 import { pokemonEvolutions } from "#app/data/balance/pokemon-evolutions";
 import { getCharVariantFromDialogue } from "#app/data/dialogue";
 import type PokemonSpecies from "#app/data/pokemon-species";
 import { getPokemonSpecies } from "#app/data/pokemon-species";
-import { trainerConfigs } from "#app/data/trainer-config";
+import { trainerConfigs } from "#app/data/trainers/trainer-config";
 import type Pokemon from "#app/field/pokemon";
 import { modifierTypes } from "#app/modifier/modifier-type";
 import { BattlePhase } from "#app/phases/battle-phase";
@@ -19,8 +19,8 @@ import { SummonPhase } from "#app/phases/summon-phase";
 import { UnlockPhase } from "#app/phases/unlock-phase";
 import { achvs, ChallengeAchv } from "#app/system/achv";
 import { Unlockables } from "#app/system/unlockables";
-import { Mode } from "#app/ui/ui";
-import * as Utils from "#app/utils";
+import { UiMode } from "#enums/ui-mode";
+import { isLocal, isLocalServerConnected } from "#app/utils/common";
 import { PlayerGender } from "#enums/player-gender";
 import { TrainerType } from "#enums/trainer-type";
 import i18next from "i18next";
@@ -31,12 +31,13 @@ import ChallengeData from "#app/system/challenge-data";
 import TrainerData from "#app/system/trainer-data";
 import ArenaData from "#app/system/arena-data";
 import { pokerogueApi } from "#app/plugins/api/pokerogue-api";
+import { MessagePhase } from "./message-phase";
 
 export class GameOverPhase extends BattlePhase {
   private isVictory: boolean;
   private firstRibbons: PokemonSpecies[] = [];
 
-  constructor(isVictory: boolean = false) {
+  constructor(isVictory = false) {
     super();
 
     this.isVictory = isVictory;
@@ -45,6 +46,8 @@ export class GameOverPhase extends BattlePhase {
   start() {
     super.start();
 
+    globalScene.hideAbilityBar();
+
     // Failsafe if players somehow skip floor 200 in classic mode
     if (globalScene.gameMode.isClassic && globalScene.currentBattle.waveIndex > 200) {
       this.isVictory = true;
@@ -52,7 +55,11 @@ export class GameOverPhase extends BattlePhase {
 
     // Handle Mystery Encounter special Game Over cases
     // Situations such as when player lost a battle, but it isn't treated as full Game Over
-    if (!this.isVictory && globalScene.currentBattle.mysteryEncounter?.onGameOver && !globalScene.currentBattle.mysteryEncounter.onGameOver()) {
+    if (
+      !this.isVictory &&
+      globalScene.currentBattle.mysteryEncounter?.onGameOver &&
+      !globalScene.currentBattle.mysteryEncounter.onGameOver()
+    ) {
       // Do not end the game
       return this.end();
     }
@@ -61,36 +68,52 @@ export class GameOverPhase extends BattlePhase {
     if (this.isVictory && globalScene.gameMode.isEndless) {
       const genderIndex = globalScene.gameData.gender ?? PlayerGender.UNSET;
       const genderStr = PlayerGender[genderIndex].toLowerCase();
-      globalScene.ui.showDialogue(i18next.t("miscDialogue:ending_endless", { context: genderStr }), i18next.t("miscDialogue:ending_name"), 0, () => this.handleGameOver());
+      globalScene.ui.showDialogue(
+        i18next.t("miscDialogue:ending_endless", { context: genderStr }),
+        i18next.t("miscDialogue:ending_name"),
+        0,
+        () => this.handleGameOver(),
+      );
     } else if (this.isVictory || !globalScene.enableRetries) {
       this.handleGameOver();
     } else {
       globalScene.ui.showText(i18next.t("battle:retryBattle"), null, () => {
-        globalScene.ui.setMode(Mode.CONFIRM, () => {
-          globalScene.ui.fadeOut(1250).then(() => {
-            globalScene.reset();
-            globalScene.clearPhaseQueue();
-            globalScene.gameData.loadSession(globalScene.sessionSlotId).then(() => {
-              globalScene.pushPhase(new EncounterPhase(true));
+        globalScene.ui.setMode(
+          UiMode.CONFIRM,
+          () => {
+            globalScene.ui.fadeOut(1250).then(() => {
+              globalScene.reset();
+              globalScene.clearPhaseQueue();
+              globalScene.gameData.loadSession(globalScene.sessionSlotId).then(() => {
+                globalScene.pushPhase(new EncounterPhase(true));
 
-              const availablePartyMembers = globalScene.getPokemonAllowedInBattle().length;
+                const availablePartyMembers = globalScene.getPokemonAllowedInBattle().length;
 
-              globalScene.pushPhase(new SummonPhase(0));
-              if (globalScene.currentBattle.double && availablePartyMembers > 1) {
-                globalScene.pushPhase(new SummonPhase(1));
-              }
-              if (globalScene.currentBattle.waveIndex > 1 && globalScene.currentBattle.battleType !== BattleType.TRAINER) {
-                globalScene.pushPhase(new CheckSwitchPhase(0, globalScene.currentBattle.double));
+                globalScene.pushPhase(new SummonPhase(0));
                 if (globalScene.currentBattle.double && availablePartyMembers > 1) {
-                  globalScene.pushPhase(new CheckSwitchPhase(1, globalScene.currentBattle.double));
+                  globalScene.pushPhase(new SummonPhase(1));
+                }
+                if (
+                  globalScene.currentBattle.waveIndex > 1 &&
+                  globalScene.currentBattle.battleType !== BattleType.TRAINER
+                ) {
+                  globalScene.pushPhase(new CheckSwitchPhase(0, globalScene.currentBattle.double));
+                  if (globalScene.currentBattle.double && availablePartyMembers > 1) {
+                    globalScene.pushPhase(new CheckSwitchPhase(1, globalScene.currentBattle.double));
+                  }
                 }
-              }
 
-              globalScene.ui.fadeIn(1250);
-              this.end();
+                globalScene.ui.fadeIn(1250);
+                this.end();
+              });
             });
-          });
-        }, () => this.handleGameOver(), false, 0, 0, 1000);
+          },
+          () => this.handleGameOver(),
+          false,
+          0,
+          0,
+          1000,
+        );
       });
     }
   }
@@ -100,7 +123,7 @@ export class GameOverPhase extends BattlePhase {
       globalScene.disableMenu = true;
       globalScene.time.delayedCall(1000, () => {
         let firstClear = false;
-        if (this.isVictory && newClear) {
+        if (this.isVictory) {
           if (globalScene.gameMode.isClassic) {
             firstClear = globalScene.validateAchv(achvs.CLASSIC_VICTORY);
             globalScene.validateAchv(achvs.UNEVOLVED_CLASSIC_VICTORY);
@@ -158,17 +181,29 @@ export class GameOverPhase extends BattlePhase {
                 const genderStr = PlayerGender[genderIndex].toLowerCase();
                 // Dialogue has to be retrieved so that the rival's expressions can be loaded and shown via getCharVariantFromDialogue
                 const dialogue = i18next.t(dialogueKey, { context: genderStr });
-                globalScene.charSprite.showCharacter(`rival_${globalScene.gameData.gender === PlayerGender.FEMALE ? "m" : "f"}`, getCharVariantFromDialogue(dialogue)).then(() => {
-                  globalScene.ui.showDialogue(dialogueKey, globalScene.gameData.gender === PlayerGender.FEMALE ? trainerConfigs[TrainerType.RIVAL].name : trainerConfigs[TrainerType.RIVAL].nameFemale, null, () => {
-                    globalScene.ui.fadeOut(500).then(() => {
-                      globalScene.charSprite.hide().then(() => {
-                        const endCardPhase = new EndCardPhase();
-                        globalScene.unshiftPhase(endCardPhase);
-                        clear(endCardPhase);
-                      });
-                    });
+                globalScene.charSprite
+                  .showCharacter(
+                    `rival_${globalScene.gameData.gender === PlayerGender.FEMALE ? "m" : "f"}`,
+                    getCharVariantFromDialogue(dialogue),
+                  )
+                  .then(() => {
+                    globalScene.ui.showDialogue(
+                      dialogueKey,
+                      globalScene.gameData.gender === PlayerGender.FEMALE
+                        ? trainerConfigs[TrainerType.RIVAL].name
+                        : trainerConfigs[TrainerType.RIVAL].nameFemale,
+                      null,
+                      () => {
+                        globalScene.ui.fadeOut(500).then(() => {
+                          globalScene.charSprite.hide().then(() => {
+                            const endCardPhase = new EndCardPhase();
+                            globalScene.unshiftPhase(endCardPhase);
+                            clear(endCardPhase);
+                          });
+                        });
+                      },
+                    );
                   });
-                });
               });
             } else {
               const endCardPhase = new EndCardPhase();
@@ -185,9 +220,24 @@ export class GameOverPhase extends BattlePhase {
     /* Added a local check to see if the game is running offline
       If Online, execute apiFetch as intended
       If Offline, execute offlineNewClear() only for victory, a localStorage implementation of newClear daily run checks */
-    if (!Utils.isLocal || Utils.isLocalServerConnected) {
-      pokerogueApi.savedata.session.newclear({ slot: globalScene.sessionSlotId, isVictory: this.isVictory, clientSessionId: clientSessionId })
-        .then((success) => doGameOver(!!success));
+    if (!isLocal || isLocalServerConnected) {
+      pokerogueApi.savedata.session
+        .newclear({
+          slot: globalScene.sessionSlotId,
+          isVictory: this.isVictory,
+          clientSessionId: clientSessionId,
+        })
+        .then(success => doGameOver(!globalScene.gameMode.isDaily || !!success))
+        .catch(_err => {
+          globalScene.clearPhaseQueue();
+          globalScene.clearPhaseQueueSplice();
+          globalScene.unshiftPhase(new MessagePhase(i18next.t("menu:serverCommunicationFailed"), 2500));
+          // force the game to reload after 2 seconds.
+          setTimeout(() => {
+            window.location.reload();
+          }, 2000);
+          this.end();
+        });
     } else if (this.isVictory) {
       globalScene.gameData.offlineNewClear().then(result => {
         doGameOver(result);
@@ -202,19 +252,25 @@ export class GameOverPhase extends BattlePhase {
       if (!globalScene.gameData.unlocks[Unlockables.ENDLESS_MODE]) {
         globalScene.unshiftPhase(new UnlockPhase(Unlockables.ENDLESS_MODE));
       }
-      if (globalScene.getPlayerParty().filter(p => p.fusionSpecies).length && !globalScene.gameData.unlocks[Unlockables.SPLICED_ENDLESS_MODE]) {
+      if (
+        globalScene.getPlayerParty().filter(p => p.fusionSpecies).length &&
+        !globalScene.gameData.unlocks[Unlockables.SPLICED_ENDLESS_MODE]
+      ) {
         globalScene.unshiftPhase(new UnlockPhase(Unlockables.SPLICED_ENDLESS_MODE));
       }
       if (!globalScene.gameData.unlocks[Unlockables.MINI_BLACK_HOLE]) {
         globalScene.unshiftPhase(new UnlockPhase(Unlockables.MINI_BLACK_HOLE));
       }
-      if (!globalScene.gameData.unlocks[Unlockables.EVIOLITE] && globalScene.getPlayerParty().some(p => p.getSpeciesForm(true).speciesId in pokemonEvolutions)) {
+      if (
+        !globalScene.gameData.unlocks[Unlockables.EVIOLITE] &&
+        globalScene.getPlayerParty().some(p => p.getSpeciesForm(true).speciesId in pokemonEvolutions)
+      ) {
         globalScene.unshiftPhase(new UnlockPhase(Unlockables.EVIOLITE));
       }
     }
   }
 
-  awardRibbon(pokemon: Pokemon, forStarter: boolean = false): void {
+  awardRibbon(pokemon: Pokemon, forStarter = false): void {
     const speciesId = getPokemonSpecies(pokemon.species.speciesId);
     const speciesRibbonCount = globalScene.gameData.incrementRibbonCount(speciesId, forStarter);
     // first time classic win, award voucher
@@ -236,8 +292,12 @@ export class GameOverPhase extends BattlePhase {
       gameMode: globalScene.gameMode.modeId,
       party: globalScene.getPlayerParty().map(p => new PokemonData(p)),
       enemyParty: globalScene.getEnemyParty().map(p => new PokemonData(p)),
-      modifiers: preWaveSessionData ? preWaveSessionData.modifiers : globalScene.findModifiers(() => true).map(m => new PersistentModifierData(m, true)),
-      enemyModifiers: preWaveSessionData ? preWaveSessionData.enemyModifiers : globalScene.findModifiers(() => true, false).map(m => new PersistentModifierData(m, false)),
+      modifiers: preWaveSessionData
+        ? preWaveSessionData.modifiers
+        : globalScene.findModifiers(() => true).map(m => new PersistentModifierData(m, true)),
+      enemyModifiers: preWaveSessionData
+        ? preWaveSessionData.enemyModifiers
+        : globalScene.findModifiers(() => true, false).map(m => new PersistentModifierData(m, false)),
       arena: new ArenaData(globalScene.arena),
       pokeballCounts: globalScene.pokeballCounts,
       money: Math.floor(globalScene.money),
@@ -249,8 +309,8 @@ export class GameOverPhase extends BattlePhase {
       timestamp: new Date().getTime(),
       challenges: globalScene.gameMode.challenges.map(c => new ChallengeData(c)),
       mysteryEncounterType: globalScene.currentBattle.mysteryEncounter?.encounterType ?? -1,
-      mysteryEncounterSaveData: globalScene.mysteryEncounterSaveData
+      mysteryEncounterSaveData: globalScene.mysteryEncounterSaveData,
+      playerFaints: globalScene.arena.playerFaints,
     } as SessionSaveData;
   }
 }
-
diff --git a/src/phases/hide-ability-phase.ts b/src/phases/hide-ability-phase.ts
new file mode 100644
index 00000000000..142bb4b251d
--- /dev/null
+++ b/src/phases/hide-ability-phase.ts
@@ -0,0 +1,12 @@
+import { globalScene } from "#app/global-scene";
+import { Phase } from "#app/phase";
+
+export class HideAbilityPhase extends Phase {
+  start() {
+    super.start();
+
+    globalScene.abilityBar.hide().then(() => {
+      this.end();
+    });
+  }
+}
diff --git a/src/phases/hide-party-exp-bar-phase.ts b/src/phases/hide-party-exp-bar-phase.ts
index 0dce41044c0..52cfd1f71d6 100644
--- a/src/phases/hide-party-exp-bar-phase.ts
+++ b/src/phases/hide-party-exp-bar-phase.ts
@@ -2,10 +2,6 @@ import { globalScene } from "#app/global-scene";
 import { BattlePhase } from "./battle-phase";
 
 export class HidePartyExpBarPhase extends BattlePhase {
-  constructor() {
-    super();
-  }
-
   start() {
     super.start();
 
diff --git a/src/phases/learn-move-phase.ts b/src/phases/learn-move-phase.ts
index c1f3042dbbe..515ce492b92 100644
--- a/src/phases/learn-move-phase.ts
+++ b/src/phases/learn-move-phase.ts
@@ -1,14 +1,14 @@
 import { globalScene } from "#app/global-scene";
 import { initMoveAnim, loadMoveAnimAssets } from "#app/data/battle-anims";
-import type Move from "#app/data/move";
-import { allMoves } from "#app/data/move";
+import type Move from "#app/data/moves/move";
+import { allMoves } from "#app/data/moves/move";
 import { SpeciesFormChangeMoveLearnedTrigger } from "#app/data/pokemon-forms";
 import { Moves } from "#enums/moves";
 import { getPokemonNameWithAffix } from "#app/messages";
 import Overrides from "#app/overrides";
 import EvolutionSceneHandler from "#app/ui/evolution-scene-handler";
 import { SummaryUiMode } from "#app/ui/summary-ui-handler";
-import { Mode } from "#app/ui/ui";
+import { UiMode } from "#enums/ui-mode";
 import i18next from "i18next";
 import { PlayerPartyMemberPokemonPhase } from "#app/phases/player-party-member-pokemon-phase";
 import type Pokemon from "#app/field/pokemon";
@@ -20,16 +20,21 @@ export enum LearnMoveType {
   /** For learning a move via Memory Mushroom */
   MEMORY,
   /** For learning a move via TM */
-  TM
+  TM,
 }
 
 export class LearnMovePhase extends PlayerPartyMemberPokemonPhase {
   private moveId: Moves;
-  private messageMode: Mode;
+  private messageMode: UiMode;
   private learnMoveType: LearnMoveType;
   private cost: number;
 
-  constructor(partyMemberIndex: number, moveId: Moves, learnMoveType: LearnMoveType = LearnMoveType.LEARN_MOVE, cost: number = -1) {
+  constructor(
+    partyMemberIndex: number,
+    moveId: Moves,
+    learnMoveType: LearnMoveType = LearnMoveType.LEARN_MOVE,
+    cost = -1,
+  ) {
     super(partyMemberIndex);
     this.moveId = moveId;
     this.learnMoveType = learnMoveType;
@@ -44,12 +49,13 @@ export class LearnMovePhase extends PlayerPartyMemberPokemonPhase {
     const currentMoveset = pokemon.getMoveset();
 
     // The game first checks if the Pokemon already has the move and ends the phase if it does.
-    const hasMoveAlready = currentMoveset.some(m => m?.moveId === move.id) && this.moveId !== Moves.SKETCH;
+    const hasMoveAlready = currentMoveset.some(m => m.moveId === move.id) && this.moveId !== Moves.SKETCH;
     if (hasMoveAlready) {
       return this.end();
     }
 
-    this.messageMode = globalScene.ui.getHandler() instanceof EvolutionSceneHandler ? Mode.EVOLUTION_SCENE : Mode.MESSAGE;
+    this.messageMode =
+      globalScene.ui.getHandler() instanceof EvolutionSceneHandler ? UiMode.EVOLUTION_SCENE : UiMode.MESSAGE;
     globalScene.ui.setMode(this.messageMode);
     // If the Pokemon has less than 4 moves, the new move is added to the largest empty moveset index
     // If it has 4 moves, the phase then checks if the player wants to replace the move itself.
@@ -70,18 +76,27 @@ export class LearnMovePhase extends PlayerPartyMemberPokemonPhase {
    * @param Pokemon The Pokemon learning the move
    */
   async replaceMoveCheck(move: Move, pokemon: Pokemon) {
-    const learnMovePrompt = i18next.t("battle:learnMovePrompt", { pokemonName: getPokemonNameWithAffix(pokemon), moveName: move.name });
-    const moveLimitReached = i18next.t("battle:learnMoveLimitReached", { pokemonName: getPokemonNameWithAffix(pokemon) });
-    const shouldReplaceQ = i18next.t("battle:learnMoveReplaceQuestion", { moveName: move.name });
-    const preQText = [ learnMovePrompt, moveLimitReached ].join("$");
+    const learnMovePrompt = i18next.t("battle:learnMovePrompt", {
+      pokemonName: getPokemonNameWithAffix(pokemon),
+      moveName: move.name,
+    });
+    const moveLimitReached = i18next.t("battle:learnMoveLimitReached", {
+      pokemonName: getPokemonNameWithAffix(pokemon),
+    });
+    const shouldReplaceQ = i18next.t("battle:learnMoveReplaceQuestion", {
+      moveName: move.name,
+    });
+    const preQText = [learnMovePrompt, moveLimitReached].join("$");
     await globalScene.ui.showTextPromise(preQText);
     await globalScene.ui.showTextPromise(shouldReplaceQ, undefined, false);
-    await globalScene.ui.setModeWithoutClear(Mode.CONFIRM,
+    await globalScene.ui.setModeWithoutClear(
+      UiMode.CONFIRM,
       () => this.forgetMoveProcess(move, pokemon), // Yes
-      () => { // No
+      () => {
+        // No
         globalScene.ui.setMode(this.messageMode);
         this.rejectMoveAndEnd(move, pokemon);
-      }
+      },
     );
   }
 
@@ -99,15 +114,26 @@ export class LearnMovePhase extends PlayerPartyMemberPokemonPhase {
   async forgetMoveProcess(move: Move, pokemon: Pokemon) {
     globalScene.ui.setMode(this.messageMode);
     await globalScene.ui.showTextPromise(i18next.t("battle:learnMoveForgetQuestion"), undefined, true);
-    await globalScene.ui.setModeWithoutClear(Mode.SUMMARY, pokemon, SummaryUiMode.LEARN_MOVE, move, (moveIndex: number) => {
-      if (moveIndex === 4) {
-        globalScene.ui.setMode(this.messageMode).then(() => this.rejectMoveAndEnd(move, pokemon));
-        return;
-      }
-      const forgetSuccessText = i18next.t("battle:learnMoveForgetSuccess", { pokemonName: getPokemonNameWithAffix(pokemon), moveName: pokemon.moveset[moveIndex]!.getName() });
-      const fullText = [ i18next.t("battle:countdownPoof"), forgetSuccessText, i18next.t("battle:learnMoveAnd") ].join("$");
-      globalScene.ui.setMode(this.messageMode).then(() => this.learnMove(moveIndex, move, pokemon, fullText));
-    });
+    await globalScene.ui.setModeWithoutClear(
+      UiMode.SUMMARY,
+      pokemon,
+      SummaryUiMode.LEARN_MOVE,
+      move,
+      (moveIndex: number) => {
+        if (moveIndex === 4) {
+          globalScene.ui.setMode(this.messageMode).then(() => this.rejectMoveAndEnd(move, pokemon));
+          return;
+        }
+        const forgetSuccessText = i18next.t("battle:learnMoveForgetSuccess", {
+          pokemonName: getPokemonNameWithAffix(pokemon),
+          moveName: pokemon.moveset[moveIndex]!.getName(),
+        });
+        const fullText = [i18next.t("battle:countdownPoof"), forgetSuccessText, i18next.t("battle:learnMoveAnd")].join(
+          "$",
+        );
+        globalScene.ui.setMode(this.messageMode).then(() => this.learnMove(moveIndex, move, pokemon, fullText));
+      },
+    );
   }
 
   /**
@@ -121,16 +147,30 @@ export class LearnMovePhase extends PlayerPartyMemberPokemonPhase {
    * @param Pokemon The Pokemon learning the move
    */
   async rejectMoveAndEnd(move: Move, pokemon: Pokemon) {
-    await globalScene.ui.showTextPromise(i18next.t("battle:learnMoveStopTeaching", { moveName: move.name }), undefined, false);
-    globalScene.ui.setModeWithoutClear(Mode.CONFIRM,
+    await globalScene.ui.showTextPromise(
+      i18next.t("battle:learnMoveStopTeaching", { moveName: move.name }),
+      undefined,
+      false,
+    );
+    globalScene.ui.setModeWithoutClear(
+      UiMode.CONFIRM,
       () => {
         globalScene.ui.setMode(this.messageMode);
-        globalScene.ui.showTextPromise(i18next.t("battle:learnMoveNotLearned", { pokemonName: getPokemonNameWithAffix(pokemon), moveName: move.name }), undefined, true).then(() => this.end());
+        globalScene.ui
+          .showTextPromise(
+            i18next.t("battle:learnMoveNotLearned", {
+              pokemonName: getPokemonNameWithAffix(pokemon),
+              moveName: move.name,
+            }),
+            undefined,
+            true,
+          )
+          .then(() => this.end());
       },
       () => {
         globalScene.ui.setMode(this.messageMode);
         this.replaceMoveCheck(move, pokemon);
-      }
+      },
     );
   }
 
@@ -155,7 +195,7 @@ export class LearnMovePhase extends PlayerPartyMemberPokemonPhase {
         pokemon.usedTMs = [];
       }
       pokemon.usedTMs.push(this.moveId);
-      globalScene.tryRemovePhase((phase) => phase instanceof SelectModifierPhase);
+      globalScene.tryRemovePhase(phase => phase instanceof SelectModifierPhase);
     } else if (this.learnMoveType === LearnMoveType.MEMORY) {
       if (this.cost !== -1) {
         if (!Overrides.WAIVE_ROLL_FEE_OVERRIDE) {
@@ -165,22 +205,31 @@ export class LearnMovePhase extends PlayerPartyMemberPokemonPhase {
         }
         globalScene.playSound("se/buy");
       } else {
-        globalScene.tryRemovePhase((phase) => phase instanceof SelectModifierPhase);
+        globalScene.tryRemovePhase(phase => phase instanceof SelectModifierPhase);
       }
     }
     pokemon.setMove(index, this.moveId);
     initMoveAnim(this.moveId).then(() => {
-      loadMoveAnimAssets([ this.moveId ], true);
+      loadMoveAnimAssets([this.moveId], true);
     });
     globalScene.ui.setMode(this.messageMode);
-    const learnMoveText = i18next.t("battle:learnMove", { pokemonName: getPokemonNameWithAffix(pokemon), moveName: move.name });
+    const learnMoveText = i18next.t("battle:learnMove", {
+      pokemonName: getPokemonNameWithAffix(pokemon),
+      moveName: move.name,
+    });
     if (textMessage) {
       await globalScene.ui.showTextPromise(textMessage);
     }
     globalScene.playSound("level_up_fanfare"); // Sound loaded into game as is
-    globalScene.ui.showText(learnMoveText, null, () => {
-      globalScene.triggerPokemonFormChange(pokemon, SpeciesFormChangeMoveLearnedTrigger, true);
-      this.end();
-    }, this.messageMode === Mode.EVOLUTION_SCENE ? 1000 : undefined, true);
+    globalScene.ui.showText(
+      learnMoveText,
+      null,
+      () => {
+        globalScene.triggerPokemonFormChange(pokemon, SpeciesFormChangeMoveLearnedTrigger, true);
+        this.end();
+      },
+      this.messageMode === UiMode.EVOLUTION_SCENE ? 1000 : undefined,
+      true,
+    );
   }
 }
diff --git a/src/phases/level-cap-phase.ts b/src/phases/level-cap-phase.ts
index d75bc3be6d4..6f3fa6fdb39 100644
--- a/src/phases/level-cap-phase.ts
+++ b/src/phases/level-cap-phase.ts
@@ -1,20 +1,24 @@
 import { globalScene } from "#app/global-scene";
-import { Mode } from "#app/ui/ui";
+import { UiMode } from "#enums/ui-mode";
 import i18next from "i18next";
 import { FieldPhase } from "./field-phase";
 
 export class LevelCapPhase extends FieldPhase {
-  constructor() {
-    super();
-  }
-
   start(): void {
     super.start();
 
-    globalScene.ui.setMode(Mode.MESSAGE).then(() => {
+    globalScene.ui.setMode(UiMode.MESSAGE).then(() => {
       // Sound loaded into game as is
       globalScene.playSound("level_up_fanfare");
-      globalScene.ui.showText(i18next.t("battle:levelCapUp", { levelCap: globalScene.getMaxExpLevel() }), null, () => this.end(), null, true);
+      globalScene.ui.showText(
+        i18next.t("battle:levelCapUp", {
+          levelCap: globalScene.getMaxExpLevel(),
+        }),
+        null,
+        () => this.end(),
+        null,
+        true,
+      );
       this.executeForAll(pokemon => pokemon.updateInfo(true));
     });
   }
diff --git a/src/phases/level-up-phase.ts b/src/phases/level-up-phase.ts
index 450ecca0c70..8c4f4f58095 100644
--- a/src/phases/level-up-phase.ts
+++ b/src/phases/level-up-phase.ts
@@ -6,7 +6,7 @@ import { EvolutionPhase } from "#app/phases/evolution-phase";
 import { LearnMovePhase } from "#app/phases/learn-move-phase";
 import { PlayerPartyMemberPokemonPhase } from "#app/phases/player-party-member-pokemon-phase";
 import { LevelAchv } from "#app/system/achv";
-import { NumberHolder } from "#app/utils";
+import { NumberHolder } from "#app/utils/common";
 import i18next from "i18next";
 
 export class LevelUpPhase extends PlayerPartyMemberPokemonPhase {
@@ -36,20 +36,33 @@ export class LevelUpPhase extends PlayerPartyMemberPokemonPhase {
     if (globalScene.expParty === ExpNotification.DEFAULT) {
       globalScene.playSound("level_up_fanfare");
       globalScene.ui.showText(
-        i18next.t("battle:levelUp", { pokemonName: getPokemonNameWithAffix(this.pokemon), level: this.level }),
+        i18next.t("battle:levelUp", {
+          pokemonName: getPokemonNameWithAffix(this.pokemon),
+          level: this.level,
+        }),
         null,
-        () => globalScene.ui.getMessageHandler().promptLevelUpStats(this.partyMemberIndex, prevStats, false)
-          .then(() => this.end()), null, true);
+        () =>
+          globalScene.ui
+            .getMessageHandler()
+            .promptLevelUpStats(this.partyMemberIndex, prevStats, false)
+            .then(() => this.end()),
+        null,
+        true,
+      );
     } else if (globalScene.expParty === ExpNotification.SKIP) {
       this.end();
     } else {
       // we still want to display the stats if activated
-      globalScene.ui.getMessageHandler().promptLevelUpStats(this.partyMemberIndex, prevStats, false).then(() => this.end());
+      globalScene.ui
+        .getMessageHandler()
+        .promptLevelUpStats(this.partyMemberIndex, prevStats, false)
+        .then(() => this.end());
     }
   }
 
   public override end() {
-    if (this.lastLevel < 100) { // this feels like an unnecessary optimization
+    if (this.lastLevel < 100) {
+      // this feels like an unnecessary optimization
       const levelMoves = this.getPokemon().getLevelMoves(this.lastLevel + 1);
       for (const lm of levelMoves) {
         globalScene.unshiftPhase(new LearnMovePhase(this.partyMemberIndex, lm[1]));
@@ -58,6 +71,7 @@ export class LevelUpPhase extends PlayerPartyMemberPokemonPhase {
     if (!this.pokemon.pauseEvolutions) {
       const evolution = this.pokemon.getEvolution();
       if (evolution) {
+        this.pokemon.breakIllusion();
         globalScene.unshiftPhase(new EvolutionPhase(this.pokemon, evolution, this.lastLevel));
       }
     }
diff --git a/src/phases/load-move-anim-phase.ts b/src/phases/load-move-anim-phase.ts
new file mode 100644
index 00000000000..3d914f738a7
--- /dev/null
+++ b/src/phases/load-move-anim-phase.ts
@@ -0,0 +1,20 @@
+import { initMoveAnim, loadMoveAnimAssets } from "#app/data/battle-anims";
+import type { Moves } from "#enums/moves";
+import { Phase } from "#app/phase";
+
+/**
+ * Phase for synchronous move animation loading.
+ * Should be used when a move invokes another move that
+ * isn't already loaded (e.g. for Metronome)
+ */
+export class LoadMoveAnimPhase extends Phase {
+  constructor(protected moveId: Moves) {
+    super();
+  }
+
+  public override start(): void {
+    initMoveAnim(this.moveId)
+      .then(() => loadMoveAnimAssets([this.moveId], true))
+      .then(() => this.end());
+  }
+}
diff --git a/src/phases/login-phase.ts b/src/phases/login-phase.ts
index 0ed8b6feb88..673b94b1148 100644
--- a/src/phases/login-phase.ts
+++ b/src/phases/login-phase.ts
@@ -1,30 +1,31 @@
 import { updateUserInfo } from "#app/account";
-import { bypassLogin } from "#app/battle-scene";
+import { bypassLogin } from "#app/global-vars/bypass-login";
 import { globalScene } from "#app/global-scene";
 import { Phase } from "#app/phase";
 import { handleTutorial, Tutorial } from "#app/tutorial";
-import { Mode } from "#app/ui/ui";
+import { UiMode } from "#enums/ui-mode";
 import i18next, { t } from "i18next";
-import * as Utils from "#app/utils";
+import { sessionIdKey, executeIf } from "#app/utils/common";
+import { getCookie, removeCookie } from "#app/utils/cookies";
 import { SelectGenderPhase } from "./select-gender-phase";
 import { UnavailablePhase } from "./unavailable-phase";
 
 export class LoginPhase extends Phase {
   private showText: boolean;
 
-  constructor(showText?: boolean) {
+  constructor(showText = true) {
     super();
 
-    this.showText = showText === undefined || !!showText;
+    this.showText = showText;
   }
 
   start(): void {
     super.start();
 
-    const hasSession = !!Utils.getCookie(Utils.sessionIdKey);
+    const hasSession = !!getCookie(sessionIdKey);
 
-    globalScene.ui.setMode(Mode.LOADING, { buttonActions: []});
-    Utils.executeIf(bypassLogin || hasSession, updateUserInfo).then(response => {
+    globalScene.ui.setMode(UiMode.LOADING, { buttonActions: [] });
+    executeIf(bypassLogin || hasSession, updateUserInfo).then(response => {
       const success = response ? response[0] : false;
       const statusCode = response ? response[1] : null;
       if (!success) {
@@ -38,7 +39,7 @@ export class LoginPhase extends Phase {
           const loadData = () => {
             updateUserInfo().then(success => {
               if (!success[0]) {
-                Utils.removeCookie(Utils.sessionIdKey);
+                removeCookie(sessionIdKey);
                 globalScene.reset(true, true);
                 return;
               }
@@ -46,67 +47,70 @@ export class LoginPhase extends Phase {
             });
           };
 
-          globalScene.ui.setMode(Mode.LOGIN_FORM, {
+          globalScene.ui.setMode(UiMode.LOGIN_FORM, {
             buttonActions: [
               () => {
                 globalScene.ui.playSelect();
                 loadData();
-              }, () => {
+              },
+              () => {
                 globalScene.playSound("menu_open");
-                globalScene.ui.setMode(Mode.REGISTRATION_FORM, {
+                globalScene.ui.setMode(UiMode.REGISTRATION_FORM, {
                   buttonActions: [
                     () => {
                       globalScene.ui.playSelect();
                       updateUserInfo().then(success => {
                         if (!success[0]) {
-                          Utils.removeCookie(Utils.sessionIdKey);
+                          removeCookie(sessionIdKey);
                           globalScene.reset(true, true);
                           return;
                         }
                         this.end();
-                      } );
-                    }, () => {
+                      });
+                    },
+                    () => {
                       globalScene.unshiftPhase(new LoginPhase(false));
                       this.end();
-                    }
-                  ]
+                    },
+                  ],
                 });
-              }, () => {
+              },
+              () => {
                 const redirectUri = encodeURIComponent(`${import.meta.env.VITE_SERVER_URL}/auth/discord/callback`);
                 const discordId = import.meta.env.VITE_DISCORD_CLIENT_ID;
                 const discordUrl = `https://discord.com/api/oauth2/authorize?client_id=${discordId}&redirect_uri=${redirectUri}&response_type=code&scope=identify&prompt=none`;
                 window.open(discordUrl, "_self");
-              }, () => {
+              },
+              () => {
                 const redirectUri = encodeURIComponent(`${import.meta.env.VITE_SERVER_URL}/auth/google/callback`);
                 const googleId = import.meta.env.VITE_GOOGLE_CLIENT_ID;
                 const googleUrl = `https://accounts.google.com/o/oauth2/auth?client_id=${googleId}&redirect_uri=${redirectUri}&response_type=code&scope=openid`;
                 window.open(googleUrl, "_self");
-              }
-            ]
+              },
+            ],
           });
         } else if (statusCode === 401) {
-          Utils.removeCookie(Utils.sessionIdKey);
+          removeCookie(sessionIdKey);
           globalScene.reset(true, true);
         } else {
           globalScene.unshiftPhase(new UnavailablePhase());
           super.end();
         }
         return null;
-      } else {
-        globalScene.gameData.loadSystem().then(success => {
-          if (success || bypassLogin) {
-            this.end();
-          } else {
-            globalScene.ui.setMode(Mode.MESSAGE);
-            globalScene.ui.showText(t("menu:failedToLoadSaveData"));
-          }
-        });
       }
+      globalScene.gameData.loadSystem().then(success => {
+        if (success || bypassLogin) {
+          this.end();
+        } else {
+          globalScene.ui.setMode(UiMode.MESSAGE);
+          globalScene.ui.showText(t("menu:failedToLoadSaveData"));
+        }
+      });
     });
   }
 
   end(): void {
-    globalScene.ui.setMode(Mode.MESSAGE);
+    globalScene.ui.setMode(UiMode.MESSAGE);
 
     if (!globalScene.gameData.gender) {
       globalScene.unshiftPhase(new SelectGenderPhase());
diff --git a/src/phases/message-phase.ts b/src/phases/message-phase.ts
index 366fd324376..b277d67de82 100644
--- a/src/phases/message-phase.ts
+++ b/src/phases/message-phase.ts
@@ -3,18 +3,24 @@ import { Phase } from "#app/phase";
 
 export class MessagePhase extends Phase {
   private text: string;
-  private callbackDelay: number | null;
-  private prompt: boolean | null;
-  private promptDelay: number | null;
+  private callbackDelay?: number | null;
+  private prompt?: boolean | null;
+  private promptDelay?: number | null;
   private speaker?: string;
 
-  constructor(text: string, callbackDelay?: number | null, prompt?: boolean | null, promptDelay?: number | null, speaker?: string) {
+  constructor(
+    text: string,
+    callbackDelay?: number | null,
+    prompt?: boolean | null,
+    promptDelay?: number | null,
+    speaker?: string,
+  ) {
     super();
 
     this.text = text;
-    this.callbackDelay = callbackDelay!; // TODO: is this bang correct?
-    this.prompt = prompt!; // TODO: is this bang correct?
-    this.promptDelay = promptDelay!; // TODO: is this bang correct?
+    this.callbackDelay = callbackDelay;
+    this.prompt = prompt;
+    this.promptDelay = promptDelay;
     this.speaker = speaker;
   }
 
@@ -22,23 +28,50 @@ export class MessagePhase extends Phase {
     super.start();
 
     if (this.text.indexOf("$") > -1) {
+      const pokename: string[] = [];
+      const repname = ["#POKEMON1", "#POKEMON2"];
+      for (let p = 0; p < globalScene.getPlayerField().length; p++) {
+        pokename.push(globalScene.getPlayerField()[p].getNameToRender());
+        this.text = this.text.split(pokename[p]).join(repname[p]);
+      }
       const pageIndex = this.text.indexOf("$");
-      globalScene.unshiftPhase(new MessagePhase(this.text.slice(pageIndex + 1), this.callbackDelay, this.prompt, this.promptDelay, this.speaker));
-      this.text = this.text.slice(0, pageIndex).trim();
+      if (pageIndex !== -1) {
+        let page0 = this.text.slice(0, pageIndex);
+        let page1 = this.text.slice(pageIndex + 1);
+        // Pokemon names must be re-inserted _after_ the split, otherwise the index will be wrong
+        for (let p = 0; p < globalScene.getPlayerField().length; p++) {
+          page0 = page0.split(repname[p]).join(pokename[p]);
+          page1 = page1.split(repname[p]).join(pokename[p]);
+        }
+        globalScene.unshiftPhase(
+          new MessagePhase(page1, this.callbackDelay, this.prompt, this.promptDelay, this.speaker),
+        );
+        this.text = page0.trim();
+      } else {
+        for (let p = 0; p < globalScene.getPlayerField().length; p++) {
+          this.text = this.text.split(repname[p]).join(pokename[p]);
+        }
+      }
     }
 
     if (this.speaker) {
-      globalScene.ui.showDialogue(this.text, this.speaker, null, () => this.end(), this.callbackDelay || (this.prompt ? 0 : 1500), this.promptDelay ?? 0);
+      globalScene.ui.showDialogue(
+        this.text,
+        this.speaker,
+        null,
+        () => this.end(),
+        this.callbackDelay || (this.prompt ? 0 : 1500),
+        this.promptDelay ?? 0,
+      );
     } else {
-      globalScene.ui.showText(this.text, null, () => this.end(), this.callbackDelay || (this.prompt ? 0 : 1500), this.prompt, this.promptDelay);
+      globalScene.ui.showText(
+        this.text,
+        null,
+        () => this.end(),
+        this.callbackDelay || (this.prompt ? 0 : 1500),
+        this.prompt,
+        this.promptDelay,
+      );
     }
   }
-
-  end() {
-    if (globalScene.abilityBar.shown) {
-      globalScene.abilityBar.hide();
-    }
-
-    super.end();
-  }
 }
diff --git a/src/phases/modifier-reward-phase.ts b/src/phases/modifier-reward-phase.ts
index 1cdfd6b2721..c94c4deb819 100644
--- a/src/phases/modifier-reward-phase.ts
+++ b/src/phases/modifier-reward-phase.ts
@@ -22,10 +22,17 @@ export class ModifierRewardPhase extends BattlePhase {
   doReward(): Promise<void> {
     return new Promise<void>(resolve => {
       const newModifier = this.modifierType.newModifier();
-      globalScene.addModifier(newModifier).then(() => {
-        globalScene.playSound("item_fanfare");
-        globalScene.ui.showText(i18next.t("battle:rewardGain", { modifierName: newModifier?.type.name }), null, () => resolve(), null, true);
-      });
+      globalScene.addModifier(newModifier);
+      globalScene.playSound("item_fanfare");
+      globalScene.ui.showText(
+        i18next.t("battle:rewardGain", {
+          modifierName: newModifier?.type.name,
+        }),
+        null,
+        () => resolve(),
+        null,
+        true,
+      );
     });
   }
 }
diff --git a/src/phases/money-reward-phase.ts b/src/phases/money-reward-phase.ts
index 70f0019227c..708bb3a2fa8 100644
--- a/src/phases/money-reward-phase.ts
+++ b/src/phases/money-reward-phase.ts
@@ -2,7 +2,7 @@ import { globalScene } from "#app/global-scene";
 import { ArenaTagType } from "#app/enums/arena-tag-type";
 import { MoneyMultiplierModifier } from "#app/modifier/modifier";
 import i18next from "i18next";
-import * as Utils from "#app/utils";
+import { NumberHolder } from "#app/utils/common";
 import { BattlePhase } from "./battle-phase";
 
 export class MoneyRewardPhase extends BattlePhase {
@@ -15,7 +15,7 @@ export class MoneyRewardPhase extends BattlePhase {
   }
 
   start() {
-    const moneyAmount = new Utils.IntegerHolder(globalScene.getWaveMoneyAmount(this.moneyMultiplier));
+    const moneyAmount = new NumberHolder(globalScene.getWaveMoneyAmount(this.moneyMultiplier));
 
     globalScene.applyModifiers(MoneyMultiplierModifier, true, moneyAmount);
 
@@ -27,7 +27,9 @@ export class MoneyRewardPhase extends BattlePhase {
 
     const userLocale = navigator.language || "en-US";
     const formattedMoneyAmount = moneyAmount.value.toLocaleString(userLocale);
-    const message = i18next.t("battle:moneyWon", { moneyAmount: formattedMoneyAmount });
+    const message = i18next.t("battle:moneyWon", {
+      moneyAmount: formattedMoneyAmount,
+    });
 
     globalScene.ui.showText(message, null, () => this.end(), null, true);
   }
diff --git a/src/phases/move-anim-phase.ts b/src/phases/move-anim-phase.ts
new file mode 100644
index 00000000000..830e72cb8be
--- /dev/null
+++ b/src/phases/move-anim-phase.ts
@@ -0,0 +1,20 @@
+import type { MoveAnim } from "#app/data/battle-anims";
+import { Phase } from "#app/phase";
+
+/**
+ * Plays the given {@linkcode MoveAnim} sequentially.
+ */
+export class MoveAnimPhase<Anim extends MoveAnim> extends Phase {
+  constructor(
+    protected anim: Anim,
+    protected onSubstitute = false,
+  ) {
+    super();
+  }
+
+  public override start(): void {
+    super.start();
+
+    this.anim.play(this.onSubstitute, () => this.end());
+  }
+}
diff --git a/src/phases/move-anim-test-phase.ts b/src/phases/move-anim-test-phase.ts
deleted file mode 100644
index 588fc402357..00000000000
--- a/src/phases/move-anim-test-phase.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-import { globalScene } from "#app/global-scene";
-import { initMoveAnim, loadMoveAnimAssets, MoveAnim } from "#app/data/battle-anims";
-import { allMoves, SelfStatusMove } from "#app/data/move";
-import { Moves } from "#app/enums/moves";
-import * as Utils from "#app/utils";
-import { BattlePhase } from "./battle-phase";
-
-export class MoveAnimTestPhase extends BattlePhase {
-  private moveQueue: Moves[];
-
-  constructor(moveQueue?: Moves[]) {
-    super();
-
-    this.moveQueue = moveQueue || Utils.getEnumValues(Moves).slice(1);
-  }
-
-  start() {
-    const moveQueue = this.moveQueue.slice(0);
-    this.playMoveAnim(moveQueue, true);
-  }
-
-  playMoveAnim(moveQueue: Moves[], player: boolean) {
-    const moveId = player ? moveQueue[0] : moveQueue.shift();
-    if (moveId === undefined) {
-      this.playMoveAnim(this.moveQueue.slice(0), true);
-      return;
-    } else if (player) {
-      console.log(Moves[moveId]);
-    }
-
-    initMoveAnim(moveId).then(() => {
-      loadMoveAnimAssets([ moveId ], true)
-        .then(() => {
-          const user = player ? globalScene.getPlayerPokemon()! : globalScene.getEnemyPokemon()!;
-          const target = (player !== (allMoves[moveId] instanceof SelfStatusMove)) ? globalScene.getEnemyPokemon()! : globalScene.getPlayerPokemon()!;
-          new MoveAnim(moveId, user, target.getBattlerIndex()).play(allMoves[moveId].hitsSubstitute(user, target), () => { // TODO: are the bangs correct here?
-            if (player) {
-              this.playMoveAnim(moveQueue, false);
-            } else {
-              this.playMoveAnim(moveQueue, true);
-            }
-          });
-        });
-    });
-  }
-}
diff --git a/src/phases/move-charge-phase.ts b/src/phases/move-charge-phase.ts
index b0925f1f6cb..ea43f1ddb88 100644
--- a/src/phases/move-charge-phase.ts
+++ b/src/phases/move-charge-phase.ts
@@ -1,11 +1,11 @@
 import { globalScene } from "#app/global-scene";
 import type { BattlerIndex } from "#app/battle";
 import { MoveChargeAnim } from "#app/data/battle-anims";
-import { applyMoveChargeAttrs, MoveEffectAttr, InstantChargeAttr } from "#app/data/move";
+import { applyMoveChargeAttrs, MoveEffectAttr, InstantChargeAttr } from "#app/data/moves/move";
 import type { PokemonMove } from "#app/field/pokemon";
 import type Pokemon from "#app/field/pokemon";
 import { MoveResult } from "#app/field/pokemon";
-import { BooleanHolder } from "#app/utils";
+import { BooleanHolder } from "#app/utils/common";
 import { MovePhase } from "#app/phases/move-phase";
 import { PokemonPhase } from "#app/phases/pokemon-phase";
 import { BattlerTagType } from "#enums/battler-tag-type";
@@ -36,7 +36,7 @@ export class MoveChargePhase extends PokemonPhase {
 
     // If the target is somehow not defined, or the move is somehow not a ChargingMove,
     // immediately end this phase.
-    if (!target || !(move.isChargingMove())) {
+    if (!target || !move.isChargingMove()) {
       console.warn("Invalid parameters for MoveChargePhase");
       return super.end();
     }
@@ -44,10 +44,9 @@ export class MoveChargePhase extends PokemonPhase {
     new MoveChargeAnim(move.chargeAnim, move.id, user).play(false, () => {
       move.showChargeText(user, target);
 
-      applyMoveChargeAttrs(MoveEffectAttr, user, target, move).then(() => {
-        user.addTag(BattlerTagType.CHARGING, 1, move.id, user.id);
-        this.end();
-      });
+      applyMoveChargeAttrs(MoveEffectAttr, user, target, move);
+      user.addTag(BattlerTagType.CHARGING, 1, move.id, user.id);
+      this.end();
     });
   }
 
@@ -63,15 +62,19 @@ export class MoveChargePhase extends PokemonPhase {
 
       if (instantCharge.value) {
         // this MoveEndPhase will be duplicated by the queued MovePhase if not removed
-        globalScene.tryRemovePhase((phase) => phase instanceof MoveEndPhase && phase.getPokemon() === user);
+        globalScene.tryRemovePhase(phase => phase instanceof MoveEndPhase && phase.getPokemon() === user);
         // queue a new MovePhase for this move's attack phase
-        globalScene.unshiftPhase(new MovePhase(user, [ this.targetIndex ], this.move, false));
+        globalScene.unshiftPhase(new MovePhase(user, [this.targetIndex], this.move, false));
       } else {
-        user.getMoveQueue().push({ move: move.id, targets: [ this.targetIndex ]});
+        user.getMoveQueue().push({ move: move.id, targets: [this.targetIndex] });
       }
 
       // Add this move's charging phase to the user's move history
-      user.pushMoveHistory({ move: this.move.moveId, targets: [ this.targetIndex ], result: MoveResult.OTHER });
+      user.pushMoveHistory({
+        move: this.move.moveId,
+        targets: [this.targetIndex],
+        result: MoveResult.OTHER,
+      });
     }
     super.end();
   }
@@ -81,6 +84,6 @@ export class MoveChargePhase extends PokemonPhase {
   }
 
   public getTargetPokemon(): Pokemon | undefined {
-    return globalScene.getField(true).find((p) => this.targetIndex === p.getBattlerIndex());
+    return globalScene.getField(true).find(p => this.targetIndex === p.getBattlerIndex());
   }
 }
diff --git a/src/phases/move-effect-phase.ts b/src/phases/move-effect-phase.ts
index fff8caf38b5..e3773952214 100644
--- a/src/phases/move-effect-phase.ts
+++ b/src/phases/move-effect-phase.ts
@@ -12,8 +12,8 @@ import {
   PostAttackAbAttr,
   PostDamageAbAttr,
   PostDefendAbAttr,
-  TypeImmunityAbAttr,
-} from "#app/data/ability";
+  ReflectStatusMoveAbAttr,
+} from "#app/data/abilities/ability";
 import { ArenaTagSide, ConditionalProtectTag } from "#app/data/arena-tag";
 import { MoveAnim } from "#app/data/battle-anims";
 import {
@@ -22,65 +22,227 @@ import {
   ProtectedTag,
   SemiInvulnerableTag,
   SubstituteTag,
+  TypeBoostTag,
 } from "#app/data/battler-tags";
-import type {
-  MoveAttr } from "#app/data/move";
+import type { MoveAttr } from "#app/data/moves/move";
 import {
   applyFilteredMoveAttrs,
   applyMoveAttrs,
   AttackMove,
   DelayedAttackAttr,
   FlinchAttr,
+  getMoveTargets,
   HitsTagAttr,
   MissEffectAttr,
-  MoveCategory,
   MoveEffectAttr,
-  MoveEffectTrigger,
-  MoveFlags,
-  MoveTarget,
   MultiHitAttr,
   NoEffectAttr,
   OneHitKOAttr,
   OverrideMoveEffectAttr,
+  StatChangeBeforeDmgCalcAttr,
   ToxicAccuracyAttr,
-  VariableTargetAttr,
-} from "#app/data/move";
+} from "#app/data/moves/move";
+import { MoveEffectTrigger } from "#enums/MoveEffectTrigger";
+import { MoveFlags } from "#enums/MoveFlags";
+import { MoveTarget } from "#enums/MoveTarget";
+import { MoveCategory } from "#enums/MoveCategory";
 import { SpeciesFormChangePostMoveTrigger } from "#app/data/pokemon-forms";
-import { Type } from "#enums/type";
-import type { PokemonMove } from "#app/field/pokemon";
+import { PokemonType } from "#enums/pokemon-type";
+import { DamageResult, PokemonMove, type TurnMove } from "#app/field/pokemon";
 import type Pokemon from "#app/field/pokemon";
 import { HitResult, MoveResult } from "#app/field/pokemon";
 import { getPokemonNameWithAffix } from "#app/messages";
 import {
   ContactHeldItemTransferChanceModifier,
+  DamageMoneyRewardModifier,
   EnemyAttackStatusEffectChanceModifier,
+  EnemyEndureChanceModifier,
   FlinchChanceModifier,
   HitHealModifier,
   PokemonMultiHitModifier,
 } from "#app/modifier/modifier";
 import { PokemonPhase } from "#app/phases/pokemon-phase";
-import { BooleanHolder, executeIf, isNullOrUndefined, NumberHolder } from "#app/utils";
+import { BooleanHolder, isNullOrUndefined, NumberHolder } from "#app/utils/common";
+import type { nil } from "#app/utils/common";
 import { BattlerTagType } from "#enums/battler-tag-type";
-import type { Moves } from "#enums/moves";
+import { Moves } from "#enums/moves";
 import i18next from "i18next";
+import type { Phase } from "#app/phase";
+import { ShowAbilityPhase } from "./show-ability-phase";
+import { MovePhase } from "./move-phase";
+import { MoveEndPhase } from "./move-end-phase";
+import { HideAbilityPhase } from "#app/phases/hide-ability-phase";
+import { TypeDamageMultiplier } from "#app/data/type";
+import { HitCheckResult } from "#enums/hit-check-result";
+import type Move from "#app/data/moves/move";
+import { isFieldTargeted } from "#app/data/moves/move-utils";
+import { FaintPhase } from "./faint-phase";
+import { DamageAchv } from "#app/system/achv";
+
+type HitCheckEntry = [HitCheckResult, TypeDamageMultiplier];
 
 export class MoveEffectPhase extends PokemonPhase {
-  public move: PokemonMove;
+  public move: Move;
+  private virtual = false;
   protected targets: BattlerIndex[];
+  protected reflected = false;
 
-  constructor(battlerIndex: BattlerIndex, targets: BattlerIndex[], move: PokemonMove) {
+  /** The result of the hit check against each target */
+  private hitChecks: HitCheckEntry[];
+
+  /** The move history entry for the move */
+  private moveHistoryEntry: TurnMove;
+
+  /** Is this the first strike of a move? */
+  private firstHit: boolean;
+  /** Is this the last strike of a move? */
+  private lastHit: boolean;
+
+  /** Phases queued during moves */
+  private queuedPhases: Phase[] = [];
+
+  /**
+   * @param reflected Indicates that the move was reflected by the user due to magic coat or magic bounce
+   * @param virtual Indicates that the move is a virtual move (i.e. called by metronome)
+   */
+  constructor(battlerIndex: BattlerIndex, targets: BattlerIndex[], move: Move, reflected = false, virtual = false) {
     super(battlerIndex);
     this.move = move;
+    this.virtual = virtual;
+
+    this.reflected = reflected;
     /**
      * In double battles, if the right Pokemon selects a spread move and the left Pokemon dies
      * with no party members available to switch in, then the right Pokemon takes the index
      * of the left Pokemon and gets hit unless this is checked.
      */
-    if (targets.includes(battlerIndex) && this.move.getMove().moveTarget === MoveTarget.ALL_NEAR_OTHERS) {
+    if (targets.includes(battlerIndex) && this.move.moveTarget === MoveTarget.ALL_NEAR_OTHERS) {
       const i = targets.indexOf(battlerIndex);
       targets.splice(i, i + 1);
     }
     this.targets = targets;
+
+    this.hitChecks = Array(this.targets.length).fill([HitCheckResult.PENDING, 0]);
+  }
+
+  /**
+   * Compute targets and the results of hit checks of the invoked move against all targets,
+   * organized by battler index.
+   *
+   * **This is *not* a pure function**; it has the following side effects
+   * - `this.hitChecks` - The results of the hit checks against each target
+   * - `this.moveHistoryEntry` - Sets success or failure based on the hit check results
+   * - user.turnData.hitCount and user.turnData.hitsLeft - Both set to 1 if the
+   *   move was unsuccessful against all targets
+   *
+   * @returns The targets of the invoked move
+   * @see {@linkcode hitCheck}
+   */
+  private conductHitChecks(user: Pokemon, fieldMove: boolean): Pokemon[] {
+    /** All Pokemon targeted by this phase's invoked move */
+    /** Whether any hit check ended in a success */
+    let anySuccess = false;
+    /** Whether the attack missed all of its targets */
+    let allMiss = true;
+
+    let targets = this.getTargets();
+
+    // For field targeted moves, we only look for the first target that may magic bounce
+
+    for (const [i, target] of targets.entries()) {
+      const hitCheck = this.hitCheck(target);
+      // If the move bounced and was a field targeted move,
+      // then immediately stop processing other targets
+      if (fieldMove && hitCheck[0] === HitCheckResult.REFLECTED) {
+        targets = [target];
+        this.hitChecks = [hitCheck];
+        break;
+      }
+      if (hitCheck[0] === HitCheckResult.HIT) {
+        anySuccess = true;
+      } else {
+        allMiss ||= hitCheck[0] === HitCheckResult.MISS;
+      }
+      this.hitChecks[i] = hitCheck;
+    }
+
+    if (anySuccess) {
+      this.moveHistoryEntry.result = MoveResult.SUCCESS;
+    } else {
+      user.turnData.hitCount = 1;
+      user.turnData.hitsLeft = 1;
+      this.moveHistoryEntry.result = allMiss ? MoveResult.MISS : MoveResult.FAIL;
+    }
+
+    return targets;
+  }
+
+  /**
+   * Queue the phaes that should occur when the target reflects the move back to the user
+   * @param user - The {@linkcode Pokemon} using this phase's invoked move
+   * @param target - The {@linkcode Pokemon} that is reflecting the move
+   *
+   */
+  private queueReflectedMove(user: Pokemon, target: Pokemon): void {
+    const newTargets = this.move.isMultiTarget()
+      ? getMoveTargets(target, this.move.id).targets
+      : [user.getBattlerIndex()];
+    // TODO: ability displays should be handled by the ability
+    if (!target.getTag(BattlerTagType.MAGIC_COAT)) {
+      this.queuedPhases.push(
+        new ShowAbilityPhase(target.getBattlerIndex(), target.getPassiveAbility().hasAttr(ReflectStatusMoveAbAttr)),
+      );
+      this.queuedPhases.push(new HideAbilityPhase());
+    }
+
+    this.queuedPhases.push(
+      new MovePhase(target, newTargets, new PokemonMove(this.move.id, 0, 0, true), true, true, true),
+    );
+  }
+
+  /**
+   * Apply the move to each of the resolved targets.
+   * @param targets - The resolved set of targets of the move
+   * @throws Error if there was an unexpected hit check result
+   */
+  private applyToTargets(user: Pokemon, targets: Pokemon[]): void {
+    let firstHit = true;
+    for (const [i, target] of targets.entries()) {
+      const [hitCheckResult, effectiveness] = this.hitChecks[i];
+      switch (hitCheckResult) {
+        case HitCheckResult.HIT:
+          this.applyMoveEffects(target, effectiveness, firstHit);
+          firstHit = false;
+          if (isFieldTargeted(this.move)) {
+            // Stop processing other targets if the move is a field move
+            return;
+          }
+          break;
+        case HitCheckResult.NO_EFFECT:
+          globalScene.queueMessage(
+            i18next.t(this.move.id === Moves.SHEER_COLD ? "battle:hitResultImmune" : "battle:hitResultNoEffect", {
+              pokemonName: getPokemonNameWithAffix(target),
+            }),
+          );
+        case HitCheckResult.NO_EFFECT_NO_MESSAGE:
+        case HitCheckResult.PROTECTED:
+        case HitCheckResult.TARGET_NOT_ON_FIELD:
+          applyMoveAttrs(NoEffectAttr, user, target, this.move);
+          break;
+        case HitCheckResult.MISS:
+          globalScene.queueMessage(
+            i18next.t("battle:attackMissed", { pokemonNameWithAffix: getPokemonNameWithAffix(target) }),
+          );
+          applyMoveAttrs(MissEffectAttr, user, target, this.move);
+          break;
+        case HitCheckResult.REFLECTED:
+          this.queueReflectedMove(user, target);
+          break;
+        case HitCheckResult.PENDING:
+        case HitCheckResult.ERROR:
+          throw new Error("Unexpected hit check result");
+      }
+    }
   }
 
   public override start(): void {
@@ -88,30 +250,34 @@ export class MoveEffectPhase extends PokemonPhase {
 
     /** The Pokemon using this phase's invoked move */
     const user = this.getUserPokemon();
-    /** All Pokemon targeted by this phase's invoked move */
-    const targets = this.getTargets();
 
     if (!user) {
-      return super.end();
+      super.end();
+      return;
     }
 
-    const isDelayedAttack = this.move.getMove().hasAttr(DelayedAttackAttr);
+    /** If an enemy used this move, set this as last enemy that used move or ability */
+    if (!user.isPlayer()) {
+      globalScene.currentBattle.lastEnemyInvolved = this.fieldIndex;
+    } else {
+      globalScene.currentBattle.lastPlayerInvolved = this.fieldIndex;
+    }
+
+    const isDelayedAttack = this.move.hasAttr(DelayedAttackAttr);
     /** If the user was somehow removed from the field and it's not a delayed attack, end this phase */
     if (!user.isOnField()) {
       if (!isDelayedAttack) {
-        return super.end();
-      } else {
-        if (!user.scene) {
-          /**
-           * This happens if the Pokemon that used the delayed attack gets caught and released
-           * on the turn the attack would have triggered. Having access to the global scene
-           * in the future may solve this entirely, so for now we just cancel the hit
-           */
-          return super.end();
-        }
-        if (isNullOrUndefined(user.turnData)) {
-          user.resetTurnData();
-        }
+        super.end();
+        return;
+      }
+      if (!user.scene) {
+        /*
+         * This happens if the Pokemon that used the delayed attack gets caught and released
+         * on the turn the attack would have triggered. Having access to the global scene
+         * in the future may solve this entirely, so for now we just cancel the hit
+         */
+        super.end();
+        return;
       }
     }
 
@@ -120,280 +286,114 @@ export class MoveEffectPhase extends PokemonPhase {
      * e.g. Charging moves (Fly, etc.) on their first turn of use.
      */
     const overridden = new BooleanHolder(false);
-    /** The {@linkcode Move} object from {@linkcode allMoves} invoked by this phase */
-    const move = this.move.getMove();
+    const move = this.move;
 
     // Assume single target for override
-    applyMoveAttrs(OverrideMoveEffectAttr, user, this.getFirstTarget() ?? null, move, overridden, this.move.virtual).then(() => {
-      // If other effects were overriden, stop this phase before they can be applied
-      if (overridden.value) {
-        return this.end();
-      }
+    applyMoveAttrs(OverrideMoveEffectAttr, user, this.getFirstTarget() ?? null, move, overridden, this.virtual);
 
-      user.lapseTags(BattlerTagLapseType.MOVE_EFFECT);
+    // If other effects were overriden, stop this phase before they can be applied
+    if (overridden.value) {
+      return this.end();
+    }
 
-      // If the user is acting again (such as due to Instruct), reset hitsLeft/hitCount so that
-      // the move executes correctly (ensures all hits of a multi-hit are properly calculated)
-      if (user.turnData.hitsLeft === 0 && user.turnData.hitCount > 0 && user.turnData.extraTurns > 0) {
-        user.turnData.hitsLeft = -1;
-        user.turnData.hitCount = 0;
-        user.turnData.extraTurns--;
-      }
+    // Lapse `MOVE_EFFECT` effects (i.e. semi-invulnerability) when applicable
+    user.lapseTags(BattlerTagLapseType.MOVE_EFFECT);
 
-      /**
-       * If this phase is for the first hit of the invoked move,
-       * resolve the move's total hit count. This block combines the
-       * effects of the move itself, Parental Bond, and Multi-Lens to do so.
-       */
-      if (user.turnData.hitsLeft === -1) {
-        const hitCount = new NumberHolder(1);
-        // Assume single target for multi hit
-        applyMoveAttrs(MultiHitAttr, user, this.getFirstTarget() ?? null, move, hitCount);
-        // If Parental Bond is applicable, add another hit
-        applyPreAttackAbAttrs(AddSecondStrikeAbAttr, user, null, move, false, hitCount, null);
-        // If Multi-Lens is applicable, add hits equal to the number of held Multi-Lenses
-        globalScene.applyModifiers(PokemonMultiHitModifier, user.isPlayer(), user, move.id, hitCount);
-        // Set the user's relevant turnData fields to reflect the final hit count
-        user.turnData.hitCount = hitCount.value;
-        user.turnData.hitsLeft = hitCount.value;
-      }
+    // If the user is acting again (such as due to Instruct), reset hitsLeft/hitCount so that
+    // the move executes correctly (ensures all hits of a multi-hit are properly calculated)
+    if (user.turnData.hitsLeft === 0 && user.turnData.hitCount > 0 && user.turnData.extraTurns > 0) {
+      user.turnData.hitsLeft = -1;
+      user.turnData.hitCount = 0;
+      user.turnData.extraTurns--;
+    }
 
-      /**
-       * Log to be entered into the user's move history once the move result is resolved.
-       * Note that `result` (a {@linkcode MoveResult}) logs whether the move was successfully
-       * used in the sense of "Does it have an effect on the user?".
-       */
-      const moveHistoryEntry = { move: this.move.moveId, targets: this.targets, result: MoveResult.PENDING, virtual: this.move.virtual };
+    /**
+     * If this phase is for the first hit of the invoked move,
+     * resolve the move's total hit count. This block combines the
+     * effects of the move itself, Parental Bond, and Multi-Lens to do so.
+     */
+    if (user.turnData.hitsLeft === -1) {
+      const hitCount = new NumberHolder(1);
+      // Assume single target for multi hit
+      applyMoveAttrs(MultiHitAttr, user, this.getFirstTarget() ?? null, move, hitCount);
+      // If Parental Bond is applicable, add another hit
+      applyPreAttackAbAttrs(AddSecondStrikeAbAttr, user, null, move, false, hitCount, null);
+      // If Multi-Lens is applicable, add hits equal to the number of held Multi-Lenses
+      globalScene.applyModifiers(PokemonMultiHitModifier, user.isPlayer(), user, move.id, hitCount);
+      // Set the user's relevant turnData fields to reflect the final hit count
+      user.turnData.hitCount = hitCount.value;
+      user.turnData.hitsLeft = hitCount.value;
+    }
 
-      /**
-       * Stores results of hit checks of the invoked move against all targets, organized by battler index.
-       * @see {@linkcode hitCheck}
-       */
-      const targetHitChecks = Object.fromEntries(targets.map(p => [ p.getBattlerIndex(), this.hitCheck(p) ]));
-      const hasActiveTargets = targets.some(t => t.isActive(true));
+    /*
+     * Log to be entered into the user's move history once the move result is resolved.
+     * Note that `result` logs whether the move was successfully
+     * used in the sense of "Does it have an effect on the user?".
+     */
+    this.moveHistoryEntry = {
+      move: this.move.id,
+      targets: this.targets,
+      result: MoveResult.PENDING,
+      virtual: this.virtual,
+    };
 
-      /** Check if the target is immune via ability to the attacking move, and NOT in semi invulnerable state */
-      const isImmune = targets[0]?.hasAbilityWithAttr(TypeImmunityAbAttr)
-        && (targets[0]?.getAbility()?.getAttrs(TypeImmunityAbAttr)?.[0]?.getImmuneType() === user.getMoveType(move))
-        && !targets[0]?.getTag(SemiInvulnerableTag);
+    const fieldMove = isFieldTargeted(move);
 
-      /**
-       * If no targets are left for the move to hit (FAIL), or the invoked move is single-target
-       * (and not random target) and failed the hit check against its target (MISS), log the move
-       * as FAILed or MISSed (depending on the conditions above) and end this phase.
-       */
-      if (!hasActiveTargets || (!move.hasAttr(VariableTargetAttr) && !move.isMultiTarget() && !targetHitChecks[this.targets[0]] && !targets[0].getTag(ProtectedTag) && !isImmune)) {
-        this.stopMultiHit();
-        if (hasActiveTargets) {
-          globalScene.queueMessage(i18next.t("battle:attackMissed", { pokemonNameWithAffix: this.getFirstTarget() ? getPokemonNameWithAffix(this.getFirstTarget()!) : "" }));
-          moveHistoryEntry.result = MoveResult.MISS;
-          applyMoveAttrs(MissEffectAttr, user, null, this.move.getMove());
-        } else {
-          globalScene.queueMessage(i18next.t("battle:attackFailed"));
-          moveHistoryEntry.result = MoveResult.FAIL;
-        }
-        user.pushMoveHistory(moveHistoryEntry);
-        return this.end();
-      }
+    const targets = this.conductHitChecks(user, fieldMove);
 
-      /** All move effect attributes are chained together in this array to be applied asynchronously. */
-      const applyAttrs: Promise<void>[] = [];
+    this.firstHit = user.turnData.hitCount === user.turnData.hitsLeft;
+    this.lastHit = user.turnData.hitsLeft === 1 || !targets.some(t => t.isActive(true));
 
-      const playOnEmptyField = globalScene.currentBattle?.mysteryEncounter?.hasBattleAnimationsWithoutTargets ?? false;
-      // Move animation only needs one target
-      new MoveAnim(move.id as Moves, user, this.getFirstTarget()!.getBattlerIndex(), playOnEmptyField).play(move.hitsSubstitute(user, this.getFirstTarget()!), () => {
-        /** Has the move successfully hit a target (for damage) yet? */
-        let hasHit: boolean = false;
-        for (const target of targets) {
-          // Prevent ENEMY_SIDE targeted moves from occurring twice in double battles
-          if (move.moveTarget === MoveTarget.ENEMY_SIDE && target !== targets[targets.length - 1]) {
-            continue;
-          }
+    // Play the animation if the move was successful against any of its targets or it has a POST_TARGET effect (like self destruct)
+    if (
+      this.moveHistoryEntry.result === MoveResult.SUCCESS ||
+      move.getAttrs(MoveEffectAttr).some(attr => attr.trigger === MoveEffectTrigger.POST_TARGET)
+    ) {
+      const firstTarget = this.getFirstTarget();
+      new MoveAnim(
+        move.id as Moves,
+        user,
+        firstTarget?.getBattlerIndex() ?? BattlerIndex.ATTACKER,
+        // Some moves used in mystery encounters should be played even on an empty field
+        globalScene.currentBattle?.mysteryEncounter?.hasBattleAnimationsWithoutTargets ?? false,
+      ).play(move.hitsSubstitute(user, firstTarget), () => this.postAnimCallback(user, targets));
 
-          /** The {@linkcode ArenaTagSide} to which the target belongs */
-          const targetSide = target.isPlayer() ? ArenaTagSide.PLAYER : ArenaTagSide.ENEMY;
-          /** Has the invoked move been cancelled by conditional protection (e.g Quick Guard)? */
-          const hasConditionalProtectApplied = new BooleanHolder(false);
-          /** Does the applied conditional protection bypass Protect-ignoring effects? */
-          const bypassIgnoreProtect = new BooleanHolder(false);
-          /** If the move is not targeting a Pokemon on the user's side, try to apply conditional protection effects */
-          if (!this.move.getMove().isAllyTarget()) {
-            globalScene.arena.applyTagsForSide(ConditionalProtectTag, targetSide, false, hasConditionalProtectApplied, user, target, move.id, bypassIgnoreProtect);
-          }
+      return;
+    }
+    this.postAnimCallback(user, targets);
+  }
 
-          /** Is the target protected by Protect, etc. or a relevant conditional protection effect? */
-          const isProtected = (
-            bypassIgnoreProtect.value
-            || !this.move.getMove().checkFlag(MoveFlags.IGNORE_PROTECT, user, target))
-            && (hasConditionalProtectApplied.value
-              || (!target.findTags(t => t instanceof DamageProtectedTag).length
-                && target.findTags(t => t instanceof ProtectedTag).find(t => target.lapseTag(t.tagType)))
-              || (this.move.getMove().category !== MoveCategory.STATUS
-                && target.findTags(t => t instanceof DamageProtectedTag).find(t => target.lapseTag(t.tagType))));
+  /**
+   * Callback to be called after the move animation is played
+   */
+  private postAnimCallback(user: Pokemon, targets: Pokemon[]) {
+    // Add to the move history entry
+    if (this.firstHit) {
+      user.pushMoveHistory(this.moveHistoryEntry);
+    }
 
-          /** Is the pokemon immune due to an ablility, and also not in a semi invulnerable state?  */
-          const isImmune = target.hasAbilityWithAttr(TypeImmunityAbAttr)
-            && (target.getAbility()?.getAttrs(TypeImmunityAbAttr)?.[0]?.getImmuneType() === user.getMoveType(move))
-            && !target.getTag(SemiInvulnerableTag);
+    try {
+      this.applyToTargets(user, targets);
+    } catch (e) {
+      console.warn(e.message || "Unexpected error in move effect phase");
+      this.end();
+      return;
+    }
 
-          /** Is the target hidden by the effects of its Commander ability? */
-          const isCommanding = globalScene.currentBattle.double && target.getAlly()?.getTag(BattlerTagType.COMMANDED)?.getSourcePokemon() === target;
+    if (this.queuedPhases.length) {
+      globalScene.appendToPhase(this.queuedPhases, MoveEndPhase);
+    }
+    const moveType = user.getMoveType(this.move, true);
+    if (this.move.category !== MoveCategory.STATUS && !user.stellarTypesBoosted.includes(moveType)) {
+      user.stellarTypesBoosted.push(moveType);
+    }
 
-          /**
-           * If the move missed a target, stop all future hits against that target
-           * and move on to the next target (if there is one).
-           */
-          if (target.switchOutStatus || isCommanding || (!isImmune && !isProtected && !targetHitChecks[target.getBattlerIndex()])) {
-            this.stopMultiHit(target);
-            if (!target.switchOutStatus) {
-              globalScene.queueMessage(i18next.t("battle:attackMissed", { pokemonNameWithAffix: getPokemonNameWithAffix(target) }));
-            }
-            if (moveHistoryEntry.result === MoveResult.PENDING) {
-              moveHistoryEntry.result = MoveResult.MISS;
-            }
-            user.pushMoveHistory(moveHistoryEntry);
-            applyMoveAttrs(MissEffectAttr, user, null, move);
-            continue;
-          }
+    if (this.lastHit) {
+      this.triggerMoveEffects(MoveEffectTrigger.POST_TARGET, user, null);
+    }
 
-          /** Does this phase represent the invoked move's first strike? */
-          const firstHit = (user.turnData.hitsLeft === user.turnData.hitCount);
-
-          // Only log the move's result on the first strike
-          if (firstHit) {
-            user.pushMoveHistory(moveHistoryEntry);
-          }
-
-          /**
-           * Since all fail/miss checks have applied, the move is considered successfully applied.
-           * It's worth noting that if the move has no effect or is protected against, this assignment
-           * is overwritten and the move is logged as a FAIL.
-           */
-          moveHistoryEntry.result = MoveResult.SUCCESS;
-
-          /**
-           * Stores the result of applying the invoked move to the target.
-           * If the target is protected, the result is always `NO_EFFECT`.
-           * Otherwise, the hit result is based on type effectiveness, immunities,
-           * and other factors that may negate the attack or status application.
-           *
-           * Internally, the call to {@linkcode Pokemon.apply} is where damage is calculated
-           * (for attack moves) and the target's HP is updated. However, this isn't
-           * made visible to the user until the resulting {@linkcode DamagePhase}
-           * is invoked.
-           */
-          const hitResult = !isProtected ? target.apply(user, move) : HitResult.NO_EFFECT;
-
-          /** Does {@linkcode hitResult} indicate that damage was dealt to the target? */
-          const dealsDamage = [
-            HitResult.EFFECTIVE,
-            HitResult.SUPER_EFFECTIVE,
-            HitResult.NOT_VERY_EFFECTIVE,
-            HitResult.ONE_HIT_KO
-          ].includes(hitResult);
-
-          /** Is this target the first one hit by the move on its current strike? */
-          const firstTarget = dealsDamage && !hasHit;
-          if (firstTarget) {
-            hasHit = true;
-          }
-
-          /**
-           * If the move has no effect on the target (i.e. the target is protected or immune),
-           * change the logged move result to FAIL.
-           */
-          if (hitResult === HitResult.NO_EFFECT) {
-            moveHistoryEntry.result = MoveResult.FAIL;
-          }
-
-          /** Does this phase represent the invoked move's last strike? */
-          const lastHit = (user.turnData.hitsLeft === 1 || !this.getFirstTarget()?.isActive());
-
-          /**
-           * If the user can change forms by using the invoked move,
-           * it only changes forms after the move's last hit
-           * (see Relic Song's interaction with Parental Bond when used by Meloetta).
-           */
-          if (lastHit) {
-            globalScene.triggerPokemonFormChange(user, SpeciesFormChangePostMoveTrigger);
-            /**
-             * Multi-Lens, Multi Hit move and Parental Bond check for PostDamageAbAttr
-             * other damage source are calculated in damageAndUpdate in pokemon.ts
-             */
-            if (user.turnData.hitCount > 1) {
-              applyPostDamageAbAttrs(PostDamageAbAttr, target, 0, target.hasPassive(), false, [], user);
-            }
-          }
-
-          /**
-           * Create a Promise that applies *all* effects from the invoked move's MoveEffectAttrs.
-           * These are ordered by trigger type (see {@linkcode MoveEffectTrigger}), and each trigger
-           * type requires different conditions to be met with respect to the move's hit result.
-           */
-          const k = new Promise<void>((resolve) => {
-            //Start promise chain and apply PRE_APPLY move attributes
-            let promiseChain: Promise<void | null> = applyFilteredMoveAttrs((attr: MoveAttr) =>
-              attr instanceof MoveEffectAttr
-              && attr.trigger === MoveEffectTrigger.PRE_APPLY
-              && (!attr.firstHitOnly || firstHit)
-              && (!attr.lastHitOnly || lastHit)
-              && hitResult !== HitResult.NO_EFFECT, user, target, move);
-
-            /** Don't complete if the move failed */
-            if (hitResult === HitResult.FAIL) {
-              return resolve();
-            }
-
-            /** Apply Move/Ability Effects in correct order */
-            promiseChain = promiseChain
-              .then(this.applySelfTargetEffects(user, target, firstHit, lastHit));
-
-            if (hitResult !== HitResult.NO_EFFECT) {
-              promiseChain
-                .then(this.applyPostApplyEffects(user, target, firstHit, lastHit))
-                .then(this.applyHeldItemFlinchCheck(user, target, dealsDamage))
-                .then(this.applySuccessfulAttackEffects(user, target, firstHit, lastHit, !!isProtected, hitResult, firstTarget))
-                .then(() => resolve());
-            } else {
-              promiseChain
-                .then(() => applyMoveAttrs(NoEffectAttr, user, null, move))
-                .then(resolve);
-            }
-          });
-
-          applyAttrs.push(k);
-        }
-
-        // Apply the move's POST_TARGET effects on the move's last hit, after all targeted effects have resolved
-        const postTarget = (user.turnData.hitsLeft === 1 || !this.getFirstTarget()?.isActive()) ?
-          applyFilteredMoveAttrs((attr: MoveAttr) => attr instanceof MoveEffectAttr && attr.trigger === MoveEffectTrigger.POST_TARGET, user, null, move) :
-          null;
-
-        if (postTarget) {
-          if (applyAttrs.length) { // If there is a pending asynchronous move effect, do this after
-            applyAttrs[applyAttrs.length - 1].then(() => postTarget);
-          } else { // Otherwise, push a new asynchronous move effect
-            applyAttrs.push(postTarget);
-          }
-        }
-
-        // Wait for all move effects to finish applying, then end this phase
-        Promise.allSettled(applyAttrs).then(() => {
-          /**
-           * Remove the target's substitute (if it exists and has expired)
-           * after all targeted effects have applied.
-           * This prevents blocked effects from applying until after this hit resolves.
-           */
-          targets.forEach(target => {
-            const substitute = target.getTag(SubstituteTag);
-            if (substitute && substitute.hp <= 0) {
-              target.lapseTag(BattlerTagType.SUBSTITUTE);
-            }
-          });
-          this.end();
-        });
-      });
-    });
+    this.updateSubstitutes();
+    this.end();
   }
 
   public override end(): void {
@@ -417,69 +417,13 @@ export class MoveEffectPhase extends PokemonPhase {
           globalScene.queueMessage(i18next.t("battle:attackHitsCount", { count: hitsTotal }));
         }
         globalScene.applyModifiers(HitHealModifier, this.player, user);
-        // Clear all cached move effectiveness values among targets
-        this.getTargets().forEach((target) => target.turnData.moveEffectiveness = null);
+        this.getTargets().forEach(target => (target.turnData.moveEffectiveness = null));
       }
     }
 
     super.end();
   }
 
-  /**
-   * Apply self-targeted effects that trigger `POST_APPLY`
-   *
-   * @param user - The {@linkcode Pokemon} using this phase's invoked move
-   * @param target - {@linkcode Pokemon} the current target of this phase's invoked move
-   * @param firstHit - `true` if this is the first hit in a multi-hit attack
-   * @param lastHit - `true` if this is the last hit in a multi-hit attack
-   * @returns a function intended to be passed into a `then()` call.
-   */
-  protected applySelfTargetEffects(user: Pokemon, target: Pokemon, firstHit: boolean, lastHit: boolean): () => Promise<void | null> {
-    return () => applyFilteredMoveAttrs((attr: MoveAttr) =>
-      attr instanceof MoveEffectAttr
-      && attr.trigger === MoveEffectTrigger.POST_APPLY
-      && attr.selfTarget
-      && (!attr.firstHitOnly || firstHit)
-      && (!attr.lastHitOnly || lastHit), user, target, this.move.getMove());
-  }
-
-  /**
-   * Applies non-self-targeted effects that trigger `POST_APPLY`
-   * (i.e. Smelling Salts curing Paralysis, and the forced switch from U-Turn, Dragon Tail, etc)
-   * @param user - The {@linkcode Pokemon} using this phase's invoked move
-   * @param target - {@linkcode Pokemon} the current target of this phase's invoked move
-   * @param firstHit - `true` if this is the first hit in a multi-hit attack
-   * @param lastHit - `true` if this is the last hit in a multi-hit attack
-   * @returns a function intended to be passed into a `then()` call.
-   */
-  protected applyPostApplyEffects(user: Pokemon, target: Pokemon, firstHit: boolean, lastHit: boolean): () => Promise<void | null> {
-    return () => applyFilteredMoveAttrs((attr: MoveAttr) =>
-      attr instanceof MoveEffectAttr
-      && attr.trigger === MoveEffectTrigger.POST_APPLY
-      && !attr.selfTarget
-      && (!attr.firstHitOnly || firstHit)
-      && (!attr.lastHitOnly || lastHit), user, target, this.move.getMove());
-  }
-
-  /**
-   * Applies effects that trigger on HIT
-   * (i.e. Final Gambit, Power-Up Punch, Drain Punch)
-   * @param user - The {@linkcode Pokemon} using this phase's invoked move
-   * @param target - {@linkcode Pokemon} the current target of this phase's invoked move
-   * @param firstHit - `true` if this is the first hit in a multi-hit attack
-   * @param lastHit - `true` if this is the last hit in a multi-hit attack
-   * @param firstTarget - `true` if {@linkcode target} is the first target hit by this strike of {@linkcode move}
-   * @returns a function intended to be passed into a `then()` call.
-   */
-  protected applyOnHitEffects(user: Pokemon, target: Pokemon, firstHit : boolean, lastHit: boolean, firstTarget: boolean): Promise<void> {
-    return applyFilteredMoveAttrs((attr: MoveAttr) =>
-      attr instanceof MoveEffectAttr
-      && attr.trigger === MoveEffectTrigger.HIT
-      && (!attr.firstHitOnly || firstHit)
-      && (!attr.lastHitOnly || lastHit)
-      && (!attr.firstTargetOnly || firstTarget), user, target, this.move.getMove());
-  }
-
   /**
    * Applies reactive effects that occur when a Pokémon is hit.
    * (i.e. Effect Spore, Disguise, Liquid Ooze, Beak Blast)
@@ -488,46 +432,9 @@ export class MoveEffectPhase extends PokemonPhase {
    * @param hitResult - The {@linkcode HitResult} of the attempted move
    * @returns a `Promise` intended to be passed into a `then()` call.
    */
-  protected applyOnGetHitAbEffects(user: Pokemon, target: Pokemon, hitResult: HitResult): Promise<void | null> {
-    return executeIf(!target.isFainted() || target.canApplyAbility(), () =>
-      applyPostDefendAbAttrs(PostDefendAbAttr, target, user, this.move.getMove(), hitResult)
-        .then(() => {
-
-          if (!this.move.getMove().hitsSubstitute(user, target)) {
-            if (!user.isPlayer() && this.move.getMove() instanceof AttackMove) {
-              globalScene.applyShuffledModifiers(EnemyAttackStatusEffectChanceModifier, false, target);
-            }
-
-            target.lapseTags(BattlerTagLapseType.AFTER_HIT);
-          }
-
-        })
-    );
-  }
-
-  /**
-   * Applies all effects and attributes that require a move to connect with a target,
-   * namely reactive effects like Weak Armor, on-hit effects like that of Power-Up Punch, and item stealing effects
-   * @param user - The {@linkcode Pokemon} using this phase's invoked move
-   * @param target - {@linkcode Pokemon} the current target of this phase's invoked move
-   * @param firstHit - `true` if this is the first hit in a multi-hit attack
-   * @param lastHit - `true` if this is the last hit in a multi-hit attack
-   * @param isProtected - `true` if the target is protected by effects such as Protect
-   * @param hitResult - The {@linkcode HitResult} of the attempted move
-   * @param firstTarget - `true` if {@linkcode target} is the first target hit by this strike of {@linkcode move}
-   * @returns a function intended to be passed into a `then()` call.
-   */
-  protected applySuccessfulAttackEffects(user: Pokemon, target: Pokemon, firstHit : boolean, lastHit: boolean, isProtected : boolean, hitResult: HitResult, firstTarget: boolean) : () => Promise<void | null> {
-    return () => executeIf(!isProtected, () =>
-      this.applyOnHitEffects(user, target, firstHit, lastHit, firstTarget).then(() =>
-        this.applyOnGetHitAbEffects(user, target, hitResult)).then(() =>
-        applyPostAttackAbAttrs(PostAttackAbAttr, user, target, this.move.getMove(), hitResult)).then(() => {  // Item Stealing Effects
-
-        if (this.move.getMove() instanceof AttackMove) {
-          globalScene.applyModifiers(ContactHeldItemTransferChanceModifier, this.player, user, target);
-        }
-      })
-    );
+  protected applyOnGetHitAbEffects(user: Pokemon, target: Pokemon, hitResult: HitResult): void {
+    applyPostDefendAbAttrs(PostDefendAbAttr, target, user, this.move, hitResult);
+    target.lapseTags(BattlerTagLapseType.AFTER_HIT);
   }
 
   /**
@@ -537,83 +444,216 @@ export class MoveEffectPhase extends PokemonPhase {
    * @param dealsDamage - `true` if the attempted move successfully dealt damage
    * @returns a function intended to be passed into a `then()` call.
    */
-  protected applyHeldItemFlinchCheck(user: Pokemon, target: Pokemon, dealsDamage: boolean) : () => void {
-    return () => {
-      if (this.move.getMove().hasAttr(FlinchAttr)) {
-        return;
-      }
+  protected applyHeldItemFlinchCheck(user: Pokemon, target: Pokemon, dealsDamage: boolean): void {
+    if (this.move.hasAttr(FlinchAttr)) {
+      return;
+    }
 
-      if (dealsDamage && !target.hasAbilityWithAttr(IgnoreMoveEffectsAbAttr) && !this.move.getMove().hitsSubstitute(user, target)) {
-        const flinched = new BooleanHolder(false);
-        globalScene.applyModifiers(FlinchChanceModifier, user.isPlayer(), user, flinched);
-        if (flinched.value) {
-          target.addTag(BattlerTagType.FLINCHED, undefined, this.move.moveId, user.id);
-        }
+    if (dealsDamage && !target.hasAbilityWithAttr(IgnoreMoveEffectsAbAttr) && !this.move.hitsSubstitute(user, target)) {
+      const flinched = new BooleanHolder(false);
+      globalScene.applyModifiers(FlinchChanceModifier, user.isPlayer(), user, flinched);
+      if (flinched.value) {
+        target.addTag(BattlerTagType.FLINCHED, undefined, this.move.id, user.id);
       }
-    };
+    }
+  }
+
+  /** Return whether the target is protected by protect or a relevant conditional protection
+   * @param user - The {@linkcode Pokemon} using this phase's invoked move
+   * @param target - {@linkcode Pokemon} the target to check for protection
+   * @param move - The {@linkcode Move} being used
+   */
+  private protectedCheck(user: Pokemon, target: Pokemon) {
+    /** The {@linkcode ArenaTagSide} to which the target belongs */
+    const targetSide = target.isPlayer() ? ArenaTagSide.PLAYER : ArenaTagSide.ENEMY;
+    /** Has the invoked move been cancelled by conditional protection (e.g Quick Guard)? */
+    const hasConditionalProtectApplied = new BooleanHolder(false);
+    /** Does the applied conditional protection bypass Protect-ignoring effects? */
+    const bypassIgnoreProtect = new BooleanHolder(false);
+    /** If the move is not targeting a Pokemon on the user's side, try to apply conditional protection effects */
+    if (!this.move.isAllyTarget()) {
+      globalScene.arena.applyTagsForSide(
+        ConditionalProtectTag,
+        targetSide,
+        false,
+        hasConditionalProtectApplied,
+        user,
+        target,
+        this.move.id,
+        bypassIgnoreProtect,
+      );
+    }
+
+    return (
+      ![MoveTarget.ENEMY_SIDE, MoveTarget.BOTH_SIDES].includes(this.move.moveTarget) &&
+      (bypassIgnoreProtect.value || !this.move.doesFlagEffectApply({ flag: MoveFlags.IGNORE_PROTECT, user, target })) &&
+      (hasConditionalProtectApplied.value ||
+        (!target.findTags(t => t instanceof DamageProtectedTag).length &&
+          target.findTags(t => t instanceof ProtectedTag).find(t => target.lapseTag(t.tagType))) ||
+        (this.move.category !== MoveCategory.STATUS &&
+          target.findTags(t => t instanceof DamageProtectedTag).find(t => target.lapseTag(t.tagType))))
+    );
   }
 
   /**
-   * Resolves whether this phase's invoked move hits the given target
+   * Conduct the hit check and type effectiveness for this move against the target
+   *
+   * Checks occur in the following order:
+   * 1. if the move is self-target
+   * 2. if the target is on the field
+   * 3. if the target is hidden by the effects of its commander ability
+   * 4. if the target is in an applicable semi-invulnerable state
+   * 5. if the target has an applicable protection effect
+   * 6. if the move is reflected by magic coat or magic bounce
+   * 7. type effectiveness calculation, including immunities from abilities and typing
+   * 9. if accuracy is checked, whether the roll passes the accuracy check
    * @param target - The {@linkcode Pokemon} targeted by the invoked move
-   * @returns `true` if the move hits the target
+   * @returns a {@linkcode HitCheckEntry} containing the attack's {@linkcode HitCheckResult}
+   *  and {@linkcode TypeDamageMultiplier | effectiveness} against the target.
    */
-  public hitCheck(target: Pokemon): boolean {
-    // Moves targeting the user and entry hazards can't miss
-    if ([ MoveTarget.USER, MoveTarget.ENEMY_SIDE ].includes(this.move.getMove().moveTarget)) {
-      return true;
-    }
-
+  public hitCheck(target: Pokemon): HitCheckEntry {
     const user = this.getUserPokemon();
+    const move = this.move;
 
     if (!user) {
-      return false;
+      return [HitCheckResult.ERROR, 0];
     }
 
-    // Hit check only calculated on first hit for multi-hit moves unless flag is set to check all hits.
-    // However, if an ability with the MaxMultiHitAbAttr, namely Skill Link, is present, act as a normal
-    // multi-hit move and proceed with all hits
+    // Moves targeting the user bypass all checks
+    if (move.moveTarget === MoveTarget.USER) {
+      return [HitCheckResult.HIT, 1];
+    }
+
+    const fieldTargeted = isFieldTargeted(move);
+
+    if (!target.isActive(true) && !fieldTargeted) {
+      return [HitCheckResult.TARGET_NOT_ON_FIELD, 0];
+    }
+
+    // Commander causes moves used against the target to miss
+    if (
+      !fieldTargeted &&
+      globalScene.currentBattle.double &&
+      target.getAlly()?.getTag(BattlerTagType.COMMANDED)?.getSourcePokemon() === target
+    ) {
+      return [HitCheckResult.MISS, 0];
+    }
+
+    /** Whether both accuracy and invulnerability checks can be skipped */
+    const bypassAccAndInvuln = fieldTargeted || this.checkBypassAccAndInvuln(target);
+    const semiInvulnerableTag = target.getTag(SemiInvulnerableTag);
+
+    if (semiInvulnerableTag && !bypassAccAndInvuln && !this.checkBypassSemiInvuln(semiInvulnerableTag)) {
+      return [HitCheckResult.MISS, 0];
+    }
+
+    if (!fieldTargeted && this.protectedCheck(user, target)) {
+      return [HitCheckResult.PROTECTED, 0];
+    }
+
+    if (!this.reflected && move.doesFlagEffectApply({ flag: MoveFlags.REFLECTABLE, user, target })) {
+      return [HitCheckResult.REFLECTED, 0];
+    }
+
+    // After the magic bounce check, field targeted moves are always successful
+    if (fieldTargeted) {
+      return [HitCheckResult.HIT, 1];
+    }
+
+    const cancelNoEffectMessage = new BooleanHolder(false);
+
+    /**
+     * The effectiveness of the move against the given target.
+     * Accounts for type and move immunities from defensive typing, abilities, and other effects.
+     */
+    const effectiveness = target.getMoveEffectiveness(user, move, false, false, cancelNoEffectMessage);
+    if (effectiveness === 0) {
+      return [
+        cancelNoEffectMessage.value ? HitCheckResult.NO_EFFECT_NO_MESSAGE : HitCheckResult.NO_EFFECT,
+        effectiveness,
+      ];
+    }
+
+    const moveAccuracy = move.calculateBattleAccuracy(user, target);
+
+    // Strikes after the first in a multi-strike move are guaranteed to hit,
+    // unless the move is flagged to check all hits and the user does not have Skill Link.
     if (user.turnData.hitsLeft < user.turnData.hitCount) {
-      if (!this.move.getMove().hasFlag(MoveFlags.CHECK_ALL_HITS) || user.hasAbilityWithAttr(MaxMultiHitAbAttr)) {
-        return true;
+      if (!move.hasFlag(MoveFlags.CHECK_ALL_HITS) || user.hasAbilityWithAttr(MaxMultiHitAbAttr)) {
+        return [HitCheckResult.HIT, effectiveness];
       }
     }
 
+    const bypassAccuracy =
+      bypassAccAndInvuln ||
+      target.getTag(BattlerTagType.ALWAYS_GET_HIT) ||
+      (target.getTag(BattlerTagType.TELEKINESIS) && !this.move.hasAttr(OneHitKOAttr));
+
+    if (moveAccuracy === -1 || bypassAccuracy) {
+      return [HitCheckResult.HIT, effectiveness];
+    }
+
+    const accuracyMultiplier = user.getAccuracyMultiplier(target, this.move);
+    const rand = user.randBattleSeedInt(100);
+
+    if (rand < moveAccuracy * accuracyMultiplier) {
+      return [HitCheckResult.HIT, effectiveness];
+    }
+
+    return [HitCheckResult.MISS, 0];
+  }
+
+  /**
+   * Check whether the move should bypass *both* the accuracy *and* semi-invulnerable states.
+   * @param target - The {@linkcode Pokemon} targeted by the invoked move
+   * @returns `true` if the move should bypass accuracy and semi-invulnerability
+   *
+   * Accuracy and semi-invulnerability can be bypassed by:
+   * - An ability like {@linkcode Abilities.NO_GUARD | No Guard}
+   * - A poison type using {@linkcode Moves.TOXIC | Toxic}
+   * - A move like {@linkcode Moves.LOCK_ON | Lock-On} or {@linkcode Moves.MIND_READER | Mind Reader}.
+   * - A field-targeted move like spikes
+   *
+   * Does *not* check against effects {@linkcode Moves.GLAIVE_RUSH | Glaive Rush} status (which
+   * should not bypass semi-invulnerability), or interactions like Earthquake hitting against Dig,
+   * (which should not bypass the accuracy check).
+   *
+   * @see {@linkcode hitCheck}
+   */
+  public checkBypassAccAndInvuln(target: Pokemon) {
+    const user = this.getUserPokemon();
+    if (!user) {
+      return false;
+    }
     if (user.hasAbilityWithAttr(AlwaysHitAbAttr) || target.hasAbilityWithAttr(AlwaysHitAbAttr)) {
       return true;
     }
-
-    // If the user should ignore accuracy on a target, check who the user targeted last turn and see if they match
-    if (user.getTag(BattlerTagType.IGNORE_ACCURACY) && (user.getLastXMoves().find(() => true)?.targets || []).indexOf(target.getBattlerIndex()) !== -1) {
+    if (this.move.hasAttr(ToxicAccuracyAttr) && user.isOfType(PokemonType.POISON)) {
       return true;
     }
-
-    if (target.getTag(BattlerTagType.ALWAYS_GET_HIT)) {
-      return true;
-    }
-
-    if (target.getTag(BattlerTagType.TELEKINESIS) && !target.getTag(SemiInvulnerableTag) && !this.move.getMove().hasAttr(OneHitKOAttr)) {
-      return true;
-    }
-
-    const semiInvulnerableTag = target.getTag(SemiInvulnerableTag);
-    if (semiInvulnerableTag
-        && !this.move.getMove().getAttrs(HitsTagAttr).some(hta => hta.tagType === semiInvulnerableTag.tagType)
-        && !(this.move.getMove().hasAttr(ToxicAccuracyAttr) && user.isOfType(Type.POISON))
+    // TODO: Fix lock on / mind reader check.
+    if (
+      user.getTag(BattlerTagType.IGNORE_ACCURACY) &&
+      (user.getLastXMoves().find(() => true)?.targets || []).indexOf(target.getBattlerIndex()) !== -1
     ) {
+      return true;
+    }
+    if (isFieldTargeted(this.move)) {
+      return true;
+    }
+  }
+
+  /**
+   * Check whether the move is able to ignore the given `semiInvulnerableTag`
+   * @param semiInvulnerableTag - The semiInvulnerable tag to check against
+   * @returns `true` if the move can ignore the semi-invulnerable state
+   */
+  public checkBypassSemiInvuln(semiInvulnerableTag: SemiInvulnerableTag | nil): boolean {
+    if (!semiInvulnerableTag) {
       return false;
     }
-
-    const moveAccuracy = this.move.getMove().calculateBattleAccuracy(user, target);
-
-    if (moveAccuracy === -1) {
-      return true;
-    }
-
-    const accuracyMultiplier = user.getAccuracyMultiplier(target, this.move.getMove());
-    const rand = user.randSeedInt(100);
-
-    return rand < (moveAccuracy * accuracyMultiplier);
+    const move = this.move;
+    return move.getAttrs(HitsTagAttr).some(hta => hta.tagType === semiInvulnerableTag.tagType);
   }
 
   /** @returns The {@linkcode Pokemon} using this phase's invoked move */
@@ -641,7 +681,10 @@ export class MoveEffectPhase extends PokemonPhase {
   protected removeTarget(target: Pokemon): void {
     const targetIndex = this.targets.findIndex(ind => ind === target.getBattlerIndex());
     if (targetIndex !== -1) {
-      this.targets.splice(this.targets.findIndex(ind => ind === target.getBattlerIndex()), 1);
+      this.targets.splice(
+        this.targets.findIndex(ind => ind === target.getBattlerIndex()),
+        1,
+      );
     }
   }
 
@@ -660,7 +703,7 @@ export class MoveEffectPhase extends PokemonPhase {
     }
     // If no target specified, or the specified target was the last of this move's
     // targets, completely cancel all subsequent strikes.
-    if (!target || this.targets.length === 0 ) {
+    if (!target || this.targets.length === 0) {
       user.turnData.hitCount = 1;
       user.turnData.hitsLeft = 1;
     }
@@ -668,6 +711,287 @@ export class MoveEffectPhase extends PokemonPhase {
 
   /** @returns A new `MoveEffectPhase` with the same properties as this phase */
   protected getNewHitPhase(): MoveEffectPhase {
-    return new MoveEffectPhase(this.battlerIndex, this.targets, this.move);
+    return new MoveEffectPhase(this.battlerIndex, this.targets, this.move, this.reflected, this.virtual);
+  }
+
+  /** Removes all substitutes that were broken by this phase's invoked move */
+  protected updateSubstitutes(): void {
+    const targets = this.getTargets();
+    for (const target of targets) {
+      const substitute = target.getTag(SubstituteTag);
+      if (substitute && substitute.hp <= 0) {
+        target.lapseTag(BattlerTagType.SUBSTITUTE);
+      }
+    }
+  }
+
+  /**
+   * Triggers move effects of the given move effect trigger.
+   * @param triggerType The {@linkcode MoveEffectTrigger} being applied
+   * @param user The {@linkcode Pokemon} using the move
+   * @param target The {@linkcode Pokemon} targeted by the move
+   * @param firstTarget Whether the target is the first to be hit by the current strike
+   * @param selfTarget If defined, limits the effects triggered to either self-targeted
+   *  effects (if set to `true`) or targeted effects (if set to `false`).
+   * @returns a `Promise` applying the relevant move effects.
+   */
+  protected triggerMoveEffects(
+    triggerType: MoveEffectTrigger,
+    user: Pokemon,
+    target: Pokemon | null,
+    firstTarget?: boolean | null,
+    selfTarget?: boolean,
+  ): void {
+    return applyFilteredMoveAttrs(
+      (attr: MoveAttr) =>
+        attr instanceof MoveEffectAttr &&
+        attr.trigger === triggerType &&
+        (isNullOrUndefined(selfTarget) || attr.selfTarget === selfTarget) &&
+        (!attr.firstHitOnly || this.firstHit) &&
+        (!attr.lastHitOnly || this.lastHit) &&
+        (!attr.firstTargetOnly || (firstTarget ?? true)),
+      user,
+      target,
+      this.move,
+    );
+  }
+
+  /**
+   * Applies all move effects that trigger in the event of a successful hit:
+   *
+   * - {@linkcode MoveEffectTrigger.PRE_APPLY | PRE_APPLY} effects`
+   * - Applying damage to the target
+   * - {@linkcode MoveEffectTrigger.POST_APPLY | POST_APPLY} effects
+   * - Invoking {@linkcode applyOnTargetEffects} if the move does not hit a substitute
+   * - Triggering form changes and emergency exit / wimp out if this is the last hit
+   *
+   * @param target - the {@linkcode Pokemon} hit by this phase's move.
+   * @param effectiveness - The effectiveness of the move (as previously evaluated in {@linkcode hitCheck})
+   * @param firstTarget - Whether this is the first target successfully struck by the move
+   */
+  protected applyMoveEffects(target: Pokemon, effectiveness: TypeDamageMultiplier, firstTarget: boolean): void {
+    const user = this.getUserPokemon();
+    if (isNullOrUndefined(user)) {
+      return;
+    }
+
+    this.triggerMoveEffects(MoveEffectTrigger.PRE_APPLY, user, target);
+
+    const hitResult = this.applyMove(user, target, effectiveness);
+
+    this.triggerMoveEffects(MoveEffectTrigger.POST_APPLY, user, target, firstTarget, true);
+    if (!this.move.hitsSubstitute(user, target)) {
+      this.applyOnTargetEffects(user, target, hitResult, firstTarget);
+    }
+    if (this.lastHit) {
+      globalScene.triggerPokemonFormChange(user, SpeciesFormChangePostMoveTrigger);
+
+      // Multi-hit check for Wimp Out/Emergency Exit
+      if (user.turnData.hitCount > 1) {
+        applyPostDamageAbAttrs(PostDamageAbAttr, target, 0, target.hasPassive(), false, [], user);
+      }
+    }
+  }
+
+  /**
+   * Sub-method of for {@linkcode applyMoveEffects} that applies damage to the target.
+   *
+   * @param user - The {@linkcode Pokemon} using this phase's invoked move
+   * @param target - The {@linkcode Pokemon} targeted by the move
+   * @param effectiveness - The effectiveness of the move against the target
+   */
+  protected applyMoveDamage(user: Pokemon, target: Pokemon, effectiveness: TypeDamageMultiplier): HitResult {
+    const isCritical = target.getCriticalHitResult(user, this.move, false);
+
+    /*
+     * Apply stat changes from {@linkcode move} and gives it to {@linkcode source}
+     * before damage calculation
+     */
+    applyMoveAttrs(StatChangeBeforeDmgCalcAttr, user, target, this.move);
+
+    const { result: result, damage: dmg } = target.getAttackDamage({
+      source: user,
+      move: this.move,
+      ignoreAbility: false,
+      ignoreSourceAbility: false,
+      ignoreAllyAbility: false,
+      ignoreSourceAllyAbility: false,
+      simulated: false,
+      effectiveness,
+      isCritical,
+    });
+
+    const typeBoost = user.findTag(
+      t => t instanceof TypeBoostTag && t.boostedType === user.getMoveType(this.move),
+    ) as TypeBoostTag;
+    if (typeBoost?.oneUse) {
+      user.removeTag(typeBoost.tagType);
+    }
+
+    const isOneHitKo = result === HitResult.ONE_HIT_KO;
+
+    if (!dmg) {
+      return result;
+    }
+
+    target.lapseTags(BattlerTagLapseType.HIT);
+
+    const substitute = target.getTag(SubstituteTag);
+    const isBlockedBySubstitute = substitute && this.move.hitsSubstitute(user, target);
+    if (isBlockedBySubstitute) {
+      substitute.hp -= dmg;
+    } else if (!target.isPlayer() && dmg >= target.hp) {
+      globalScene.applyModifiers(EnemyEndureChanceModifier, false, target);
+    }
+
+    const damage = isBlockedBySubstitute
+      ? 0
+      : target.damageAndUpdate(dmg, {
+          result: result as DamageResult,
+          ignoreFaintPhase: true,
+          ignoreSegments: isOneHitKo,
+          isCritical,
+          source: user,
+        });
+
+    if (isCritical) {
+      globalScene.queueMessage(i18next.t("battle:hitResultCriticalHit"));
+    }
+
+    if (damage <= 0) {
+      return result;
+    }
+
+    if (user.isPlayer()) {
+      globalScene.validateAchvs(DamageAchv, new NumberHolder(damage));
+
+      if (damage > globalScene.gameData.gameStats.highestDamage) {
+        globalScene.gameData.gameStats.highestDamage = damage;
+      }
+    }
+
+    user.turnData.totalDamageDealt += damage;
+    user.turnData.singleHitDamageDealt = damage;
+    target.battleData.hitCount++;
+    target.turnData.damageTaken += damage;
+
+    target.turnData.attacksReceived.unshift({
+      move: this.move.id,
+      result: result as DamageResult,
+      damage: damage,
+      critical: isCritical,
+      sourceId: user.id,
+      sourceBattlerIndex: user.getBattlerIndex(),
+    });
+
+    if (user.isPlayer() && !target.isPlayer()) {
+      globalScene.applyModifiers(DamageMoneyRewardModifier, true, user, new NumberHolder(damage));
+    }
+
+    return result;
+  }
+
+  /**
+   * Sub-method of {@linkcode applyMove} that handles the event of a target fainting.
+   * @param user - The {@linkcode Pokemon} using this phase's invoked move
+   * @param target - The {@linkcode Pokemon} that fainted
+   */
+  protected onFaintTarget(user: Pokemon, target: Pokemon): void {
+    // set splice index here, so future scene queues happen before FaintedPhase
+    globalScene.setPhaseQueueSplice();
+
+    globalScene.unshiftPhase(new FaintPhase(target.getBattlerIndex(), false, user));
+
+    target.destroySubstitute();
+    target.lapseTag(BattlerTagType.COMMANDED);
+
+    // Force `lastHit` to be true if this is a multi hit move with hits left
+    // `hitsLeft` must be left as-is in order for the message displaying the number of hits
+    // to display the proper number.
+    // Note: When Dragon Darts' smart targeting is implemented, this logic may need to be adjusted.
+    if (!this.lastHit && user.turnData.hitsLeft > 1) {
+      this.lastHit = true;
+    }
+  }
+
+  /**
+   * Sub-method of {@linkcode applyMove} that queues the hit-result message
+   * on the final strike of the move against a target
+   * @param result - The {@linkcode HitResult} of the move
+   */
+  protected queueHitResultMessage(result: HitResult) {
+    let msg: string | undefined;
+    switch (result) {
+      case HitResult.SUPER_EFFECTIVE:
+        msg = i18next.t("battle:hitResultSuperEffective");
+        break;
+      case HitResult.NOT_VERY_EFFECTIVE:
+        msg = i18next.t("battle:hitResultNotVeryEffective");
+        break;
+      case HitResult.ONE_HIT_KO:
+        msg = i18next.t("battle:hitResultOneHitKO");
+        break;
+    }
+    if (msg) {
+      globalScene.queueMessage(msg);
+    }
+  }
+
+  /** Apply the result of this phase's move to the given target
+   * @param user - The {@linkcode Pokemon} using this phase's invoked move
+   * @param target - The {@linkcode Pokemon} struck by the move
+   * @param effectiveness - The effectiveness of the move against the target
+   */
+  protected applyMove(user: Pokemon, target: Pokemon, effectiveness: TypeDamageMultiplier): HitResult {
+    const moveCategory = user.getMoveCategory(target, this.move);
+
+    if (moveCategory === MoveCategory.STATUS) {
+      return HitResult.STATUS;
+    }
+
+    const result = this.applyMoveDamage(user, target, effectiveness);
+
+    if (user.turnData.hitsLeft === 1 || target.isFainted()) {
+      this.queueHitResultMessage(result);
+    }
+
+    if (target.isFainted()) {
+      this.onFaintTarget(user, target);
+    }
+
+    return result;
+  }
+
+  /**
+   * Applies all effects aimed at the move's target.
+   * To be used when the target is successfully and directly hit by the move.
+   * @param user - The {@linkcode Pokemon} using the move
+   * @param target - The {@linkcode Pokemon} targeted by the move
+   * @param hitResult - The {@linkcode HitResult} obtained from applying the move
+   * @param firstTarget - `true` if the target is the first Pokemon hit by the attack
+   */
+  protected applyOnTargetEffects(user: Pokemon, target: Pokemon, hitResult: HitResult, firstTarget: boolean): void {
+    /** Does {@linkcode hitResult} indicate that damage was dealt to the target? */
+    const dealsDamage = [
+      HitResult.EFFECTIVE,
+      HitResult.SUPER_EFFECTIVE,
+      HitResult.NOT_VERY_EFFECTIVE,
+      HitResult.ONE_HIT_KO,
+    ].includes(hitResult);
+
+    this.triggerMoveEffects(MoveEffectTrigger.POST_APPLY, user, target, firstTarget, false);
+    this.applyHeldItemFlinchCheck(user, target, dealsDamage);
+    this.applyOnGetHitAbEffects(user, target, hitResult);
+    applyPostAttackAbAttrs(PostAttackAbAttr, user, target, this.move, hitResult);
+
+    // We assume only enemy Pokemon are able to have the EnemyAttackStatusEffectChanceModifier from tokens
+    if (!user.isPlayer() && this.move instanceof AttackMove) {
+      globalScene.applyShuffledModifiers(EnemyAttackStatusEffectChanceModifier, false, target);
+    }
+
+    // Apply Grip Claw's chance to steal an item from the target
+    if (this.move instanceof AttackMove) {
+      globalScene.applyModifiers(ContactHeldItemTransferChanceModifier, this.player, user, target);
+    }
   }
 }
diff --git a/src/phases/move-end-phase.ts b/src/phases/move-end-phase.ts
index 428dacd639a..037596dca59 100644
--- a/src/phases/move-end-phase.ts
+++ b/src/phases/move-end-phase.ts
@@ -1,23 +1,38 @@
 import { globalScene } from "#app/global-scene";
-import type { BattlerIndex } from "#app/battle";
 import { BattlerTagLapseType } from "#app/data/battler-tags";
 import { PokemonPhase } from "./pokemon-phase";
+import type { BattlerIndex } from "#app/battle";
+import { applyPostSummonAbAttrs, PostSummonRemoveEffectAbAttr } from "#app/data/abilities/ability";
+import type Pokemon from "#app/field/pokemon";
 
 export class MoveEndPhase extends PokemonPhase {
-  constructor(battlerIndex: BattlerIndex) {
+  private wasFollowUp: boolean;
+
+  /** Targets from the preceding MovePhase */
+  private targets: Pokemon[];
+  constructor(battlerIndex: BattlerIndex, targets: Pokemon[], wasFollowUp = false) {
     super(battlerIndex);
+
+    this.targets = targets;
+    this.wasFollowUp = wasFollowUp;
   }
 
   start() {
     super.start();
 
     const pokemon = this.getPokemon();
-    if (pokemon.isActive(true)) {
+    if (!this.wasFollowUp && pokemon?.isActive(true)) {
       pokemon.lapseTags(BattlerTagLapseType.AFTER_MOVE);
     }
-
     globalScene.arena.setIgnoreAbilities(false);
 
+    // Remove effects which were set on a Pokemon which removes them on summon (i.e. via Mold Breaker)
+    for (const target of this.targets) {
+      if (target) {
+        applyPostSummonAbAttrs(PostSummonRemoveEffectAbAttr, target);
+      }
+    }
+
     this.end();
   }
 }
diff --git a/src/phases/move-header-phase.ts b/src/phases/move-header-phase.ts
index 6a982646b50..c320df462d1 100644
--- a/src/phases/move-header-phase.ts
+++ b/src/phases/move-header-phase.ts
@@ -1,4 +1,4 @@
-import { applyMoveAttrs, MoveHeaderAttr } from "#app/data/move";
+import { applyMoveAttrs, MoveHeaderAttr } from "#app/data/moves/move";
 import type { PokemonMove } from "#app/field/pokemon";
 import type Pokemon from "#app/field/pokemon";
 import { BattlePhase } from "./battle-phase";
@@ -22,9 +22,8 @@ export class MoveHeaderPhase extends BattlePhase {
     super.start();
 
     if (this.canMove()) {
-      applyMoveAttrs(MoveHeaderAttr, this.pokemon, null, this.move.getMove()).then(() => this.end());
-    } else {
-      this.end();
+      applyMoveAttrs(MoveHeaderAttr, this.pokemon, null, this.move.getMove());
     }
+    this.end();
   }
 }
diff --git a/src/phases/move-phase.ts b/src/phases/move-phase.ts
index 5330540c8b2..5d63fe6efea 100644
--- a/src/phases/move-phase.ts
+++ b/src/phases/move-phase.ts
@@ -9,12 +9,13 @@ import {
   PokemonTypeChangeAbAttr,
   PostMoveUsedAbAttr,
   RedirectMoveAbAttr,
-  ReduceStatusEffectDurationAbAttr
-} from "#app/data/ability";
+  ReduceStatusEffectDurationAbAttr,
+} from "#app/data/abilities/ability";
 import type { DelayedAttackTag } from "#app/data/arena-tag";
 import { CommonAnim } from "#app/data/battle-anims";
 import { BattlerTagLapseType, CenterOfAttentionTag } from "#app/data/battler-tags";
 import {
+  AddArenaTrapTagAttr,
   allMoves,
   applyMoveAttrs,
   BypassRedirectAttr,
@@ -23,13 +24,14 @@ import {
   DelayedAttackAttr,
   frenzyMissFunc,
   HealStatusEffectAttr,
-  MoveFlags,
-  PreMoveMessageAttr
-} from "#app/data/move";
+  PreMoveMessageAttr,
+  PreUseInterruptAttr,
+} from "#app/data/moves/move";
+import { MoveFlags } from "#enums/MoveFlags";
 import { SpeciesFormChangePreMoveTrigger } from "#app/data/pokemon-forms";
 import { getStatusEffectActivationText, getStatusEffectHealText } from "#app/data/status-effect";
-import { Type } from "#enums/type";
-import { getTerrainBlockMessage } from "#app/data/weather";
+import { PokemonType } from "#enums/pokemon-type";
+import { getTerrainBlockMessage, getWeatherBlockMessage } from "#app/data/weather";
 import { MoveUsedEvent } from "#app/events/battle-scene";
 import type { PokemonMove } from "#app/field/pokemon";
 import type Pokemon from "#app/field/pokemon";
@@ -41,8 +43,7 @@ import { CommonAnimPhase } from "#app/phases/common-anim-phase";
 import { MoveChargePhase } from "#app/phases/move-charge-phase";
 import { MoveEffectPhase } from "#app/phases/move-effect-phase";
 import { MoveEndPhase } from "#app/phases/move-end-phase";
-import { ShowAbilityPhase } from "#app/phases/show-ability-phase";
-import { BooleanHolder, NumberHolder } from "#app/utils";
+import { NumberHolder } from "#app/utils/common";
 import { Abilities } from "#enums/abilities";
 import { ArenaTagType } from "#enums/arena-tag-type";
 import { BattlerTagType } from "#enums/battler-tag-type";
@@ -56,8 +57,10 @@ export class MovePhase extends BattlePhase {
   protected _targets: BattlerIndex[];
   protected followUp: boolean;
   protected ignorePp: boolean;
-  protected failed: boolean = false;
-  protected cancelled: boolean = false;
+  protected forcedLast: boolean;
+  protected failed = false;
+  protected cancelled = false;
+  protected reflected = false;
 
   public get pokemon(): Pokemon {
     return this._pokemon;
@@ -84,10 +87,21 @@ export class MovePhase extends BattlePhase {
   }
 
   /**
-   * @param followUp Indicates that the move being uses is a "follow-up" - for example, a move being used by Metronome or Dancer.
+   * @param followUp Indicates that the move being used is a "follow-up" - for example, a move being used by Metronome or Dancer.
    *                 Follow-ups bypass a few failure conditions, including flinches, sleep/paralysis/freeze and volatile status checks, etc.
+   * @param reflected Indicates that the move was reflected by Magic Coat or Magic Bounce.
+   *                  Reflected moves cannot be reflected again and will not trigger Dancer.
    */
-  constructor(pokemon: Pokemon, targets: BattlerIndex[], move: PokemonMove, followUp: boolean = false, ignorePp: boolean = false) {
+
+  constructor(
+    pokemon: Pokemon,
+    targets: BattlerIndex[],
+    move: PokemonMove,
+    followUp = false,
+    ignorePp = false,
+    reflected = false,
+    forcedLast = false,
+  ) {
     super();
 
     this.pokemon = pokemon;
@@ -95,6 +109,8 @@ export class MovePhase extends BattlePhase {
     this.move = move;
     this.followUp = followUp;
     this.ignorePp = ignorePp;
+    this.reflected = reflected;
+    this.forcedLast = forcedLast;
   }
 
   /**
@@ -102,8 +118,12 @@ export class MovePhase extends BattlePhase {
    * @param ignoreDisableTags `true` to not check if the move is disabled
    * @returns `true` if all the checks pass
    */
-  public canMove(ignoreDisableTags: boolean = false): boolean {
-    return this.pokemon.isActive(true) && this.move.isUsable(this.pokemon, this.ignorePp, ignoreDisableTags) && !!this.targets.length;
+  public canMove(ignoreDisableTags = false): boolean {
+    return (
+      this.pokemon.isActive(true) &&
+      this.move.isUsable(this.pokemon, this.ignorePp, ignoreDisableTags) &&
+      !!this.targets.length
+    );
   }
 
   /**Signifies the current move should fail but still use PP */
@@ -116,6 +136,14 @@ export class MovePhase extends BattlePhase {
     this.cancelled = true;
   }
 
+  /**
+   * Shows whether the current move has been forced to the end of the turn
+   * Needed for speed order, see {@linkcode Moves.QUASH}
+   * */
+  public isForcedLast(): boolean {
+    return this.forcedLast;
+  }
+
   public start(): void {
     super.start();
 
@@ -140,8 +168,12 @@ export class MovePhase extends BattlePhase {
     }
 
     // Check move to see if arena.ignoreAbilities should be true.
-    if (!this.followUp) {
-      if (this.move.getMove().checkFlag(MoveFlags.IGNORE_ABILITIES, this.pokemon, null)) {
+    if (!this.followUp || this.reflected) {
+      if (
+        this.move
+          .getMove()
+          .doesFlagEffectApply({ flag: MoveFlags.IGNORE_ABILITIES, user: this.pokemon, isFollowUp: this.followUp })
+      ) {
         globalScene.arena.setIgnoreAbilities(true, this.pokemon.getBattlerIndex());
       }
     }
@@ -174,7 +206,10 @@ export class MovePhase extends BattlePhase {
     const targets = this.getActiveTargetPokemon();
     const moveQueue = this.pokemon.getMoveQueue();
 
-    if (targets.length === 0 || (moveQueue.length && moveQueue[0].move === Moves.NONE)) {
+    if (
+      (targets.length === 0 && !this.move.getMove().hasAttr(AddArenaTrapTagAttr)) ||
+      (moveQueue.length && moveQueue[0].move === Moves.NONE)
+    ) {
       this.showMoveText();
       this.showFailedText();
       this.cancel();
@@ -196,24 +231,35 @@ export class MovePhase extends BattlePhase {
 
       switch (this.pokemon.status.effect) {
         case StatusEffect.PARALYSIS:
-          activated = (!this.pokemon.randSeedInt(4) || Overrides.STATUS_ACTIVATION_OVERRIDE === true) && Overrides.STATUS_ACTIVATION_OVERRIDE !== false;
+          activated =
+            (!this.pokemon.randBattleSeedInt(4) || Overrides.STATUS_ACTIVATION_OVERRIDE === true) &&
+            Overrides.STATUS_ACTIVATION_OVERRIDE !== false;
           break;
-        case StatusEffect.SLEEP:
+        case StatusEffect.SLEEP: {
           applyMoveAttrs(BypassSleepAttr, this.pokemon, null, this.move.getMove());
           const turnsRemaining = new NumberHolder(this.pokemon.status.sleepTurnsRemaining ?? 0);
-          applyAbAttrs(ReduceStatusEffectDurationAbAttr, this.pokemon, null, false, this.pokemon.status.effect, turnsRemaining);
+          applyAbAttrs(
+            ReduceStatusEffectDurationAbAttr,
+            this.pokemon,
+            null,
+            false,
+            this.pokemon.status.effect,
+            turnsRemaining,
+          );
           this.pokemon.status.sleepTurnsRemaining = turnsRemaining.value;
           healed = this.pokemon.status.sleepTurnsRemaining <= 0;
           activated = !healed && !this.pokemon.getTag(BattlerTagType.BYPASS_SLEEP);
           break;
+        }
         case StatusEffect.FREEZE:
           healed =
-            !!this.move.getMove().findAttr((attr) =>
-              attr instanceof HealStatusEffectAttr
-              && attr.selfTarget
-              && attr.isOfEffect(StatusEffect.FREEZE))
-            || (!this.pokemon.randSeedInt(5) && Overrides.STATUS_ACTIVATION_OVERRIDE !== true)
-            || Overrides.STATUS_ACTIVATION_OVERRIDE === false;
+            !!this.move
+              .getMove()
+              .findAttr(
+                attr => attr instanceof HealStatusEffectAttr && attr.selfTarget && attr.isOfEffect(StatusEffect.FREEZE),
+              ) ||
+            (!this.pokemon.randBattleSeedInt(5) && Overrides.STATUS_ACTIVATION_OVERRIDE !== true) ||
+            Overrides.STATUS_ACTIVATION_OVERRIDE === false;
 
           activated = !healed;
           break;
@@ -221,10 +267,20 @@ export class MovePhase extends BattlePhase {
 
       if (activated) {
         this.cancel();
-        globalScene.queueMessage(getStatusEffectActivationText(this.pokemon.status.effect, getPokemonNameWithAffix(this.pokemon)));
-        globalScene.unshiftPhase(new CommonAnimPhase(this.pokemon.getBattlerIndex(), undefined, CommonAnim.POISON + (this.pokemon.status.effect - 1)));
+        globalScene.queueMessage(
+          getStatusEffectActivationText(this.pokemon.status.effect, getPokemonNameWithAffix(this.pokemon)),
+        );
+        globalScene.unshiftPhase(
+          new CommonAnimPhase(
+            this.pokemon.getBattlerIndex(),
+            undefined,
+            CommonAnim.POISON + (this.pokemon.status.effect - 1),
+          ),
+        );
       } else if (healed) {
-        globalScene.queueMessage(getStatusEffectHealText(this.pokemon.status.effect, getPokemonNameWithAffix(this.pokemon)));
+        globalScene.queueMessage(
+          getStatusEffectHealText(this.pokemon.status.effect, getPokemonNameWithAffix(this.pokemon)),
+        );
         this.pokemon.resetStatus();
         this.pokemon.updateInfo();
       }
@@ -254,7 +310,7 @@ export class MovePhase extends BattlePhase {
     const isDelayedAttack = this.move.getMove().hasAttr(DelayedAttackAttr);
     if (isDelayedAttack) {
       // Check the player side arena if future sight is active
-      const futureSightTags = globalScene.arena.findTags(t => t.tagType ===  ArenaTagType.FUTURE_SIGHT);
+      const futureSightTags = globalScene.arena.findTags(t => t.tagType === ArenaTagType.FUTURE_SIGHT);
       const doomDesireTags = globalScene.arena.findTags(t => t.tagType === ArenaTagType.DOOM_DESIRE);
       let fail = false;
       const currentTargetIndex = targets[0].getBattlerIndex();
@@ -277,7 +333,18 @@ export class MovePhase extends BattlePhase {
       }
     }
 
-    this.showMoveText();
+    let success = true;
+    // Check if there are any attributes that can interrupt the move, overriding the fail message.
+    for (const move of this.move.getMove().getAttrs(PreUseInterruptAttr)) {
+      if (move.apply(this.pokemon, targets[0], this.move.getMove())) {
+        success = false;
+        break;
+      }
+    }
+
+    if (success) {
+      this.showMoveText();
+    }
 
     if (moveQueue.length > 0) {
       // Using .shift here clears out two turn moves once they've been used
@@ -313,11 +380,14 @@ export class MovePhase extends BattlePhase {
      * Move conditions assume the move has a single target
      * TODO: is this sustainable?
      */
-    const passesConditions = move.applyConditions(this.pokemon, targets[0], move);
-    const failedDueToWeather: boolean = globalScene.arena.isMoveWeatherCancelled(this.pokemon, move);
-    const failedDueToTerrain: boolean = globalScene.arena.isMoveTerrainCancelled(this.pokemon, this.targets, move);
-
-    const success = passesConditions && !failedDueToWeather && !failedDueToTerrain;
+    let failedDueToTerrain = false;
+    let failedDueToWeather = false;
+    if (success) {
+      const passesConditions = move.applyConditions(this.pokemon, targets[0], move);
+      failedDueToWeather = globalScene.arena.isMoveWeatherCancelled(this.pokemon, move);
+      failedDueToTerrain = globalScene.arena.isMoveTerrainCancelled(this.pokemon, this.targets, move);
+      success = passesConditions && !failedDueToWeather && !failedDueToTerrain;
+    }
 
     // Update the battle's "last move" pointer, unless we're currently mimicking a move.
     if (!allMoves[this.move.moveId].hasAttr(CopyMoveAttr)) {
@@ -334,23 +404,31 @@ export class MovePhase extends BattlePhase {
      * if the move fails.
      */
     if (success) {
-      applyPreAttackAbAttrs(PokemonTypeChangeAbAttr, this.pokemon, null, this.move.getMove());
-      globalScene.unshiftPhase(new MoveEffectPhase(this.pokemon.getBattlerIndex(), this.targets, this.move));
-
+      const move = this.move.getMove();
+      applyPreAttackAbAttrs(PokemonTypeChangeAbAttr, this.pokemon, null, move);
+      globalScene.unshiftPhase(
+        new MoveEffectPhase(this.pokemon.getBattlerIndex(), this.targets, move, this.reflected, this.move.virtual),
+      );
     } else {
-      if ([ Moves.ROAR, Moves.WHIRLWIND, Moves.TRICK_OR_TREAT, Moves.FORESTS_CURSE ].includes(this.move.moveId)) {
+      if ([Moves.ROAR, Moves.WHIRLWIND, Moves.TRICK_OR_TREAT, Moves.FORESTS_CURSE].includes(this.move.moveId)) {
         applyPreAttackAbAttrs(PokemonTypeChangeAbAttr, this.pokemon, null, this.move.getMove());
       }
 
-      this.pokemon.pushMoveHistory({ move: this.move.moveId, targets: this.targets, result: MoveResult.FAIL, virtual: this.move.virtual });
+      this.pokemon.pushMoveHistory({
+        move: this.move.moveId,
+        targets: this.targets,
+        result: MoveResult.FAIL,
+        virtual: this.move.virtual,
+      });
 
+      const failureMessage = move.getFailedText(this.pokemon, targets[0], move);
       let failedText: string | undefined;
-      const failureMessage = move.getFailedText(this.pokemon, targets[0], move, new BooleanHolder(false));
-
       if (failureMessage) {
         failedText = failureMessage;
       } else if (failedDueToTerrain) {
-        failedText = getTerrainBlockMessage(this.pokemon, globalScene.arena.getTerrainType());
+        failedText = getTerrainBlockMessage(targets[0], globalScene.arena.getTerrainType());
+      } else if (failedDueToWeather) {
+        failedText = getWeatherBlockMessage(globalScene.arena.getWeatherType());
       }
 
       this.showFailedText(failedText);
@@ -380,9 +458,14 @@ export class MovePhase extends BattlePhase {
       this.showMoveText();
       globalScene.unshiftPhase(new MoveChargePhase(this.pokemon.getBattlerIndex(), this.targets[0], this.move));
     } else {
-      this.pokemon.pushMoveHistory({ move: this.move.moveId, targets: this.targets, result: MoveResult.FAIL, virtual: this.move.virtual });
+      this.pokemon.pushMoveHistory({
+        move: this.move.moveId,
+        targets: this.targets,
+        result: MoveResult.FAIL,
+        virtual: this.move.virtual,
+      });
 
-      const failureMessage = move.getFailedText(this.pokemon, targets[0], move, new BooleanHolder(false));
+      const failureMessage = move.getFailedText(this.pokemon, targets[0], move);
       this.showMoveText();
       this.showFailedText(failureMessage ?? undefined);
 
@@ -392,13 +475,12 @@ export class MovePhase extends BattlePhase {
   }
 
   /**
-   * Queues a {@linkcode MoveEndPhase} if the move wasn't a {@linkcode followUp} and {@linkcode canMove()} returns `true`,
-   * then ends the phase.
+   * Queues a {@linkcode MoveEndPhase} and then ends the phase
    */
   public end(): void {
-    if (!this.followUp && this.canMove()) {
-      globalScene.unshiftPhase(new MoveEndPhase(this.pokemon.getBattlerIndex()));
-    }
+    globalScene.unshiftPhase(
+      new MoveEndPhase(this.pokemon.getBattlerIndex(), this.getActiveTargetPokemon(), this.followUp),
+    );
 
     super.end();
   }
@@ -410,7 +492,9 @@ export class MovePhase extends BattlePhase {
    * TODO: This hardcodes the PP increase at 1 per opponent, rather than deferring to the ability.
    */
   public getPpIncreaseFromPressure(targets: Pokemon[]): number {
-    const foesWithPressure = this.pokemon.getOpponents().filter(o => targets.includes(o) && o.isActive(true) && o.hasAbilityWithAttr(IncreasePpAbAttr));
+    const foesWithPressure = this.pokemon
+      .getOpponents()
+      .filter(o => targets.includes(o) && o.isActive(true) && o.hasAbilityWithAttr(IncreasePpAbAttr));
     return foesWithPressure.length;
   }
 
@@ -425,10 +509,13 @@ export class MovePhase extends BattlePhase {
       const redirectTarget = new NumberHolder(currentTarget);
 
       // check move redirection abilities of every pokemon *except* the user.
-      globalScene.getField(true).filter(p => p !== this.pokemon).forEach(p => applyAbAttrs(RedirectMoveAbAttr, p, null, false, this.move.moveId, redirectTarget));
+      globalScene
+        .getField(true)
+        .filter(p => p !== this.pokemon)
+        .forEach(p => applyAbAttrs(RedirectMoveAbAttr, p, null, false, this.move.moveId, redirectTarget, this.pokemon));
 
       /** `true` if an Ability is responsible for redirecting the move to another target; `false` otherwise */
-      let redirectedByAbility = (currentTarget !== redirectTarget.value);
+      let redirectedByAbility = currentTarget !== redirectTarget.value;
 
       // check for center-of-attention tags (note that this will override redirect abilities)
       this.pokemon.getOpponents().forEach(p => {
@@ -436,7 +523,11 @@ export class MovePhase extends BattlePhase {
 
         // TODO: don't hardcode this interaction.
         // Handle interaction between the rage powder center-of-attention tag and moves used by grass types/overcoat-havers (which are immune to RP's redirect)
-        if (redirectTag && (!redirectTag.powder || (!this.pokemon.isOfType(Type.GRASS) && !this.pokemon.hasAbility(Abilities.OVERCOAT)))) {
+        if (
+          redirectTag &&
+          (!redirectTag.powder ||
+            (!this.pokemon.isOfType(PokemonType.GRASS) && !this.pokemon.hasAbility(Abilities.OVERCOAT)))
+        ) {
           redirectTarget.value = p.getBattlerIndex();
           redirectedByAbility = false;
         }
@@ -444,7 +535,7 @@ export class MovePhase extends BattlePhase {
 
       if (currentTarget !== redirectTarget.value) {
         const bypassRedirectAttrs = this.move.getMove().getAttrs(BypassRedirectAttr);
-        bypassRedirectAttrs.forEach((attr) => {
+        bypassRedirectAttrs.forEach(attr => {
           if (!attr.abilitiesOnly || redirectedByAbility) {
             redirectTarget.value = currentTarget;
           }
@@ -452,7 +543,17 @@ export class MovePhase extends BattlePhase {
 
         if (this.pokemon.hasAbilityWithAttr(BlockRedirectAbAttr)) {
           redirectTarget.value = currentTarget;
-          globalScene.unshiftPhase(new ShowAbilityPhase(this.pokemon.getBattlerIndex(), this.pokemon.getPassiveAbility().hasAttr(BlockRedirectAbAttr)));
+          // TODO: Ability displays should be handled by the ability
+          globalScene.queueAbilityDisplay(
+            this.pokemon,
+            this.pokemon.getPassiveAbility().hasAttr(BlockRedirectAbAttr),
+            true,
+          );
+          globalScene.queueAbilityDisplay(
+            this.pokemon,
+            this.pokemon.getPassiveAbility().hasAttr(BlockRedirectAbAttr),
+            false,
+          );
         }
 
         this.targets[0] = redirectTarget.value;
@@ -517,11 +618,15 @@ export class MovePhase extends BattlePhase {
         globalScene.eventTarget.dispatchEvent(new MoveUsedEvent(this.pokemon?.id, this.move.getMove(), ppUsed));
       }
 
-      if (this.cancelled && this.pokemon.summonData?.tags?.find(t => t.tagType === BattlerTagType.FRENZY)) {
+      if (this.cancelled && this.pokemon.summonData.tags?.find(t => t.tagType === BattlerTagType.FRENZY)) {
         frenzyMissFunc(this.pokemon, this.move.getMove());
       }
 
-      this.pokemon.pushMoveHistory({ move: Moves.NONE, result: MoveResult.FAIL, targets: this.targets });
+      this.pokemon.pushMoveHistory({
+        move: Moves.NONE,
+        result: MoveResult.FAIL,
+        targets: this.targets,
+      });
 
       this.pokemon.lapseTags(BattlerTagLapseType.MOVE_EFFECT);
       this.pokemon.lapseTags(BattlerTagLapseType.AFTER_MOVE);
@@ -543,14 +648,17 @@ export class MovePhase extends BattlePhase {
       return;
     }
 
-    globalScene.queueMessage(i18next.t("battle:useMove", {
-      pokemonNameWithAffix: getPokemonNameWithAffix(this.pokemon),
-      moveName: this.move.getName()
-    }), 500);
-    applyMoveAttrs(PreMoveMessageAttr, this.pokemon, this.pokemon.getOpponents()[0], this.move.getMove());
+    globalScene.queueMessage(
+      i18next.t(this.reflected ? "battle:magicCoatActivated" : "battle:useMove", {
+        pokemonNameWithAffix: getPokemonNameWithAffix(this.pokemon),
+        moveName: this.move.getName(),
+      }),
+      500,
+    );
+    applyMoveAttrs(PreMoveMessageAttr, this.pokemon, this.pokemon.getOpponents(false)[0], this.move.getMove());
   }
 
-  public showFailedText(failedText?: string): void {
-    globalScene.queueMessage(failedText ?? i18next.t("battle:attackFailed"));
+  public showFailedText(failedText: string = i18next.t("battle:attackFailed")): void {
+    globalScene.queueMessage(failedText);
   }
 }
diff --git a/src/phases/mystery-encounter-phases.ts b/src/phases/mystery-encounter-phases.ts
index be07dbfc196..fd0c4ef7949 100644
--- a/src/phases/mystery-encounter-phases.ts
+++ b/src/phases/mystery-encounter-phases.ts
@@ -22,12 +22,12 @@ import { globalScene } from "#app/global-scene";
 import { getCharVariantFromDialogue } from "../data/dialogue";
 import type { OptionSelectSettings } from "../data/mystery-encounters/utils/encounter-phase-utils";
 import { transitionMysteryEncounterIntroVisuals } from "../data/mystery-encounters/utils/encounter-phase-utils";
-import { TrainerSlot } from "../data/trainer-config";
+import { TrainerSlot } from "#enums/trainer-slot";
 import { IvScannerModifier } from "../modifier/modifier";
 import { Phase } from "../phase";
-import { Mode } from "../ui/ui";
-import * as Utils from "../utils";
-import { isNullOrUndefined } from "../utils";
+import { UiMode } from "#enums/ui-mode";
+import { isNullOrUndefined, randSeedItem } from "#app/utils/common";
+import { SelectBiomePhase } from "./select-biome-phase";
 
 /**
  * Will handle (in order):
@@ -67,11 +67,13 @@ export class MysteryEncounterPhase extends Phase {
     if (!this.optionSelectSettings) {
       // Sets flag that ME was encountered, only if this is not a followup option select phase
       // Can be used in later MEs to check for requirements to spawn, run history, etc.
-      globalScene.mysteryEncounterSaveData.encounteredEvents.push(new SeenEncounterData(encounter.encounterType, encounter.encounterTier, globalScene.currentBattle.waveIndex));
+      globalScene.mysteryEncounterSaveData.encounteredEvents.push(
+        new SeenEncounterData(encounter.encounterType, encounter.encounterTier, globalScene.currentBattle.waveIndex),
+      );
     }
 
     // Initiates encounter dialogue window and option select
-    globalScene.ui.setMode(Mode.MYSTERY_ENCOUNTER, this.optionSelectSettings);
+    globalScene.ui.setMode(UiMode.MYSTERY_ENCOUNTER, this.optionSelectSettings);
   }
 
   /**
@@ -86,7 +88,10 @@ export class MysteryEncounterPhase extends Phase {
     if (!this.optionSelectSettings) {
       // Saves the selected option in the ME save data, only if this is not a followup option select phase
       // Can be used for analytics purposes to track what options are popular on certain encounters
-      const encounterSaveData = globalScene.mysteryEncounterSaveData.encounteredEvents[globalScene.mysteryEncounterSaveData.encounteredEvents.length - 1];
+      const encounterSaveData =
+        globalScene.mysteryEncounterSaveData.encounteredEvents[
+          globalScene.mysteryEncounterSaveData.encounteredEvents.length - 1
+        ];
       if (encounterSaveData.type === globalScene.currentBattle.mysteryEncounter?.encounterType) {
         encounterSaveData.selectedOption = index;
       }
@@ -101,12 +106,11 @@ export class MysteryEncounterPhase extends Phase {
 
     if (option.onPreOptionPhase) {
       globalScene.executeWithSeedOffset(async () => {
-        return await option.onPreOptionPhase!()
-          .then((result) => {
-            if (isNullOrUndefined(result) || result) {
-              this.continueEncounter();
-            }
-          });
+        return await option.onPreOptionPhase!().then(result => {
+          if (isNullOrUndefined(result) || result) {
+            this.continueEncounter();
+          }
+        });
       }, globalScene.currentBattle.mysteryEncounter?.getSeedOffset());
     } else {
       this.continueEncounter();
@@ -127,7 +131,7 @@ export class MysteryEncounterPhase extends Phase {
     const optionSelectDialogue = globalScene.currentBattle?.mysteryEncounter?.selectedOption?.dialogue;
     if (optionSelectDialogue?.selected && optionSelectDialogue.selected.length > 0) {
       // Handle intermediate dialogue (between player selection event and the onOptionSelect logic)
-      globalScene.ui.setMode(Mode.MESSAGE);
+      globalScene.ui.setMode(UiMode.MESSAGE);
       const selectedDialogue = optionSelectDialogue.selected;
       let i = 0;
       const showNextDialogue = () => {
@@ -141,7 +145,14 @@ export class MysteryEncounterPhase extends Phase {
 
         i++;
         if (title) {
-          globalScene.ui.showDialogue(text ?? "", title, null, nextAction, 0, i === 1 ? this.FIRST_DIALOGUE_PROMPT_DELAY : 0);
+          globalScene.ui.showDialogue(
+            text ?? "",
+            title,
+            null,
+            nextAction,
+            0,
+            i === 1 ? this.FIRST_DIALOGUE_PROMPT_DELAY : 0,
+          );
         } else {
           globalScene.ui.showText(text ?? "", null, nextAction, i === 1 ? this.FIRST_DIALOGUE_PROMPT_DELAY : 0, true);
         }
@@ -157,7 +168,7 @@ export class MysteryEncounterPhase extends Phase {
    * Ends phase
    */
   end() {
-    globalScene.ui.setMode(Mode.MESSAGE).then(() => super.end());
+    globalScene.ui.setMode(UiMode.MESSAGE).then(() => super.end());
   }
 }
 
@@ -210,10 +221,6 @@ export class MysteryEncounterOptionSelectedPhase extends Phase {
  * See {@linkcode TurnEndPhase} for more details
  */
 export class MysteryEncounterBattleStartCleanupPhase extends Phase {
-  constructor() {
-    super();
-  }
-
   /**
    * Cleans up `TURN_END` tags, any {@linkcode PostTurnStatusEffectPhase}s, checks for Pokemon switches, then continues
    */
@@ -221,20 +228,24 @@ export class MysteryEncounterBattleStartCleanupPhase extends Phase {
     super.start();
 
     // Lapse any residual flinches/endures but ignore all other turn-end battle tags
-    const includedLapseTags = [ BattlerTagType.FLINCHED, BattlerTagType.ENDURING ];
-    const field = globalScene.getField(true).filter(p => p.summonData);
-    field.forEach(pokemon => {
+    const includedLapseTags = [BattlerTagType.FLINCHED, BattlerTagType.ENDURING];
+    globalScene.getField(true).forEach(pokemon => {
       const tags = pokemon.summonData.tags;
-      tags.filter(t => includedLapseTags.includes(t.tagType)
-        && t.lapseTypes.includes(BattlerTagLapseType.TURN_END)
-        && !(t.lapse(pokemon, BattlerTagLapseType.TURN_END))).forEach(t => {
-        t.onRemove(pokemon);
-        tags.splice(tags.indexOf(t), 1);
-      });
+      tags
+        .filter(
+          t =>
+            includedLapseTags.includes(t.tagType) &&
+            t.lapseTypes.includes(BattlerTagLapseType.TURN_END) &&
+            !t.lapse(pokemon, BattlerTagLapseType.TURN_END),
+        )
+        .forEach(t => {
+          t.onRemove(pokemon);
+          tags.splice(tags.indexOf(t), 1);
+        });
     });
 
     // Remove any status tick phases
-    while (!!globalScene.findPhase(p => p instanceof PostTurnStatusEffectPhase)) {
+    while (globalScene.findPhase(p => p instanceof PostTurnStatusEffectPhase)) {
       globalScene.tryRemovePhase(p => p instanceof PostTurnStatusEffectPhase);
     }
 
@@ -303,16 +314,23 @@ export class MysteryEncounterBattlePhase extends Phase {
 
     if (encounterMode === MysteryEncounterMode.TRAINER_BATTLE) {
       if (globalScene.currentBattle.double) {
-        return i18next.t("battle:trainerAppearedDouble", { trainerName: globalScene.currentBattle.trainer?.getName(TrainerSlot.NONE, true) });
-
-      } else {
-        return i18next.t("battle:trainerAppeared", { trainerName: globalScene.currentBattle.trainer?.getName(TrainerSlot.NONE, true) });
+        return i18next.t("battle:trainerAppearedDouble", {
+          trainerName: globalScene.currentBattle.trainer?.getName(TrainerSlot.NONE, true),
+        });
       }
+      return i18next.t("battle:trainerAppeared", {
+        trainerName: globalScene.currentBattle.trainer?.getName(TrainerSlot.NONE, true),
+      });
     }
 
     return enemyField.length === 1
-      ? i18next.t("battle:singleWildAppeared", { pokemonName: enemyField[0].name })
-      : i18next.t("battle:multiWildAppeared", { pokemonName1: enemyField[0].name, pokemonName2: enemyField[1].name });
+      ? i18next.t("battle:singleWildAppeared", {
+          pokemonName: enemyField[0].name,
+        })
+      : i18next.t("battle:multiWildAppeared", {
+          pokemonName1: enemyField[0].name,
+          pokemonName2: enemyField[1].name,
+        });
   }
 
   /**
@@ -367,7 +385,10 @@ export class MysteryEncounterBattlePhase extends Phase {
       } else {
         const trainer = globalScene.currentBattle.trainer;
         let message: string;
-        globalScene.executeWithSeedOffset(() => message = Utils.randSeedItem(encounterMessages), globalScene.currentBattle.mysteryEncounter?.getSeedOffset());
+        globalScene.executeWithSeedOffset(
+          () => (message = randSeedItem(encounterMessages)),
+          globalScene.currentBattle.mysteryEncounter?.getSeedOffset(),
+        );
         message = message!; // tell TS compiler it's defined now
         const showDialogueAndSummon = () => {
           globalScene.ui.showDialogue(message, trainer?.getName(TrainerSlot.NONE, true), null, () => {
@@ -375,7 +396,13 @@ export class MysteryEncounterBattlePhase extends Phase {
           });
         };
         if (globalScene.currentBattle.trainer?.config.hasCharSprite && !globalScene.ui.shouldSkipDialogue(message)) {
-          globalScene.showFieldOverlay(500).then(() => globalScene.charSprite.showCharacter(trainer?.getKey()!, getCharVariantFromDialogue(encounterMessages[0])).then(() => showDialogueAndSummon())); // TODO: is this bang correct?
+          globalScene
+            .showFieldOverlay(500)
+            .then(() =>
+              globalScene.charSprite
+                .showCharacter(trainer?.getKey()!, getCharVariantFromDialogue(encounterMessages[0]))
+                .then(() => showDialogueAndSummon()),
+            ); // TODO: is this bang correct?
         } else {
           showDialogueAndSummon();
         }
@@ -396,7 +423,7 @@ export class MysteryEncounterBattlePhase extends Phase {
     if (encounterMode !== MysteryEncounterMode.TRAINER_BATTLE) {
       const ivScannerModifier = globalScene.findModifier(m => m instanceof IvScannerModifier);
       if (ivScannerModifier) {
-        enemyField.map(p => globalScene.pushPhase(new ScanIvsPhase(p.getBattlerIndex(), Math.min(ivScannerModifier.getStackCount() * 2, 6))));
+        enemyField.map(p => globalScene.pushPhase(new ScanIvsPhase(p.getBattlerIndex())));
       }
     }
 
@@ -415,7 +442,7 @@ export class MysteryEncounterBattlePhase extends Phase {
       }
     } else {
       if (availablePartyMembers.length > 1 && availablePartyMembers[1].isOnField()) {
-        globalScene.getPlayerField().forEach((pokemon) => pokemon.lapseTag(BattlerTagType.COMMANDED));
+        globalScene.getPlayerField().forEach(pokemon => pokemon.lapseTag(BattlerTagType.COMMANDED));
         globalScene.pushPhase(new ReturnPhase(1));
       }
       globalScene.pushPhase(new ToggleDoublePositionPhase(false));
@@ -458,7 +485,7 @@ export class MysteryEncounterBattlePhase extends Phase {
       onComplete: () => {
         trainer.untint(100, "Sine.easeOut");
         trainer.playAnim();
-      }
+      },
     });
   }
 
@@ -469,7 +496,7 @@ export class MysteryEncounterBattlePhase extends Phase {
       y: "-=16",
       alpha: 0,
       ease: "Sine.easeInOut",
-      duration: 750
+      duration: 750,
     });
   }
 }
@@ -488,7 +515,7 @@ export class MysteryEncounterBattlePhase extends Phase {
 export class MysteryEncounterRewardsPhase extends Phase {
   addHealPhase: boolean;
 
-  constructor(addHealPhase: boolean = false) {
+  constructor(addHealPhase = false) {
     super();
     this.addHealPhase = addHealPhase;
   }
@@ -532,7 +559,12 @@ export class MysteryEncounterRewardsPhase extends Phase {
       encounter.doEncounterRewards();
     } else if (this.addHealPhase) {
       globalScene.tryRemovePhase(p => p instanceof SelectModifierPhase);
-      globalScene.unshiftPhase(new SelectModifierPhase(0, undefined, { fillRemaining: false, rerollMultiplier: -1 }));
+      globalScene.unshiftPhase(
+        new SelectModifierPhase(0, undefined, {
+          fillRemaining: false,
+          rerollMultiplier: -1,
+        }),
+      );
     }
 
     globalScene.pushPhase(new PostMysteryEncounterPhase());
@@ -564,12 +596,11 @@ export class PostMysteryEncounterPhase extends Phase {
 
     if (this.onPostOptionSelect) {
       globalScene.executeWithSeedOffset(async () => {
-        return await this.onPostOptionSelect!()
-          .then((result) => {
-            if (isNullOrUndefined(result) || result) {
-              this.continueEncounter();
-            }
-          });
+        return await this.onPostOptionSelect!().then(result => {
+          if (isNullOrUndefined(result) || result) {
+            this.continueEncounter();
+          }
+        });
       }, globalScene.currentBattle.mysteryEncounter?.getSeedOffset() * 2000);
     } else {
       this.continueEncounter();
@@ -581,6 +612,10 @@ export class PostMysteryEncounterPhase extends Phase {
    */
   continueEncounter() {
     const endPhase = () => {
+      if (globalScene.gameMode.hasRandomBiomes || globalScene.isNewBiome()) {
+        globalScene.pushPhase(new SelectBiomePhase());
+      }
+
       globalScene.pushPhase(new NewBattlePhase());
       this.end();
     };
@@ -598,9 +633,16 @@ export class PostMysteryEncounterPhase extends Phase {
         }
 
         i++;
-        globalScene.ui.setMode(Mode.MESSAGE);
+        globalScene.ui.setMode(UiMode.MESSAGE);
         if (title) {
-          globalScene.ui.showDialogue(text ?? "", title, null, nextAction, 0, i === 1 ? this.FIRST_DIALOGUE_PROMPT_DELAY : 0);
+          globalScene.ui.showDialogue(
+            text ?? "",
+            title,
+            null,
+            nextAction,
+            0,
+            i === 1 ? this.FIRST_DIALOGUE_PROMPT_DELAY : 0,
+          );
         } else {
           globalScene.ui.showText(text ?? "", null, nextAction, i === 1 ? this.FIRST_DIALOGUE_PROMPT_DELAY : 0, true);
         }
diff --git a/src/phases/new-battle-phase.ts b/src/phases/new-battle-phase.ts
index 8cdbdc5891a..09b8ab1d335 100644
--- a/src/phases/new-battle-phase.ts
+++ b/src/phases/new-battle-phase.ts
@@ -5,6 +5,11 @@ export class NewBattlePhase extends BattlePhase {
   start() {
     super.start();
 
+    // cull any extra `NewBattle` phases from the queue.
+    globalScene.phaseQueue = globalScene.phaseQueue.filter(phase => !(phase instanceof NewBattlePhase));
+    // `phaseQueuePrepend` is private, so we have to use this inefficient loop.
+    while (globalScene.tryRemoveUnshiftedPhase(phase => phase instanceof NewBattlePhase)) {}
+
     globalScene.newBattle();
 
     this.end();
diff --git a/src/phases/new-biome-encounter-phase.ts b/src/phases/new-biome-encounter-phase.ts
index 2de9a4300c5..ef027bfd77a 100644
--- a/src/phases/new-biome-encounter-phase.ts
+++ b/src/phases/new-biome-encounter-phase.ts
@@ -1,29 +1,25 @@
 import { globalScene } from "#app/global-scene";
-import { applyAbAttrs, PostBiomeChangeAbAttr } from "#app/data/ability";
+import { applyAbAttrs, PostBiomeChangeAbAttr } from "#app/data/abilities/ability";
 import { getRandomWeatherType } from "#app/data/weather";
 import { NextEncounterPhase } from "./next-encounter-phase";
 
 export class NewBiomeEncounterPhase extends NextEncounterPhase {
-  constructor() {
-    super();
-  }
-
   doEncounter(): void {
     globalScene.playBgm(undefined, true);
 
+    // Reset all battle and wave data, perform form changes, etc.
+    // We do this because new biomes are considered "arena transitions" akin to MEs and trainer battles
     for (const pokemon of globalScene.getPlayerParty()) {
       if (pokemon) {
-        pokemon.resetBattleData();
-        pokemon.customPokemonData.resetHitReceivedCount();
+        pokemon.resetBattleAndWaveData();
+        if (pokemon.isOnField()) {
+          applyAbAttrs(PostBiomeChangeAbAttr, pokemon, null);
+        }
       }
     }
 
-    for (const pokemon of globalScene.getPlayerParty().filter(p => p.isOnField())) {
-      applyAbAttrs(PostBiomeChangeAbAttr, pokemon, null);
-    }
-
     const enemyField = globalScene.getEnemyField();
-    const moveTargets: any[]  = [ globalScene.arenaEnemy, enemyField ];
+    const moveTargets: any[] = [globalScene.arenaEnemy, enemyField];
     const mysteryEncounter = globalScene.currentBattle?.mysteryEncounter?.introVisuals;
     if (mysteryEncounter) {
       moveTargets.push(mysteryEncounter);
@@ -37,7 +33,7 @@ export class NewBiomeEncounterPhase extends NextEncounterPhase {
         if (!this.tryOverrideForBattleSpec()) {
           this.doEncounterCommon();
         }
-      }
+      },
     });
   }
 
@@ -45,6 +41,6 @@ export class NewBiomeEncounterPhase extends NextEncounterPhase {
    * Set biome weather.
    */
   trySetWeatherIfNewBiome(): void {
-    globalScene.arena.trySetWeather(getRandomWeatherType(globalScene.arena), false);
+    globalScene.arena.trySetWeather(getRandomWeatherType(globalScene.arena));
   }
 }
diff --git a/src/phases/next-encounter-phase.ts b/src/phases/next-encounter-phase.ts
index 229d37f9a69..30b4004363c 100644
--- a/src/phases/next-encounter-phase.ts
+++ b/src/phases/next-encounter-phase.ts
@@ -1,11 +1,11 @@
 import { globalScene } from "#app/global-scene";
 import { EncounterPhase } from "./encounter-phase";
 
+/**
+ * The phase between defeating an encounter and starting another wild wave.
+ * Handles generating, loading and preparing for it.
+ */
 export class NextEncounterPhase extends EncounterPhase {
-  constructor() {
-    super();
-  }
-
   start() {
     super.start();
   }
@@ -13,9 +13,12 @@ export class NextEncounterPhase extends EncounterPhase {
   doEncounter(): void {
     globalScene.playBgm(undefined, true);
 
+    // Reset all player transient wave data/intel before starting a new wild encounter.
+    // We exclusively reset wave data here as wild waves are considered one continuous "battle"
+    // for lack of an arena transition.
     for (const pokemon of globalScene.getPlayerParty()) {
       if (pokemon) {
-        pokemon.resetBattleData();
+        pokemon.resetWaveData();
       }
     }
 
@@ -23,7 +26,13 @@ export class NextEncounterPhase extends EncounterPhase {
     globalScene.arenaNextEnemy.setVisible(true);
 
     const enemyField = globalScene.getEnemyField();
-    const moveTargets: any[] = [ globalScene.arenaEnemy, globalScene.arenaNextEnemy, globalScene.currentBattle.trainer, enemyField, globalScene.lastEnemyTrainer ];
+    const moveTargets: any[] = [
+      globalScene.arenaEnemy,
+      globalScene.arenaNextEnemy,
+      globalScene.currentBattle.trainer,
+      enemyField,
+      globalScene.lastEnemyTrainer,
+    ];
     const lastEncounterVisuals = globalScene.lastMysteryEncounter?.introVisuals;
     if (lastEncounterVisuals) {
       moveTargets.push(lastEncounterVisuals);
@@ -36,7 +45,7 @@ export class NextEncounterPhase extends EncounterPhase {
         globalScene.tweens.add({
           targets: nextEncounterVisuals,
           x: "-=200",
-          duration: 2000
+          duration: 2000,
         });
       } else {
         moveTargets.push(nextEncounterVisuals);
@@ -64,13 +73,12 @@ export class NextEncounterPhase extends EncounterPhase {
         if (!this.tryOverrideForBattleSpec()) {
           this.doEncounterCommon();
         }
-      }
+      },
     });
   }
 
   /**
    * Do nothing (since this is simply the next wave in the same biome).
    */
-  trySetWeatherIfNewBiome(): void {
-  }
+  trySetWeatherIfNewBiome(): void {}
 }
diff --git a/src/phases/obtain-status-effect-phase.ts b/src/phases/obtain-status-effect-phase.ts
index b01a90bd235..47cae2dcbf6 100644
--- a/src/phases/obtain-status-effect-phase.ts
+++ b/src/phases/obtain-status-effect-phase.ts
@@ -6,6 +6,9 @@ import { StatusEffect } from "#app/enums/status-effect";
 import type Pokemon from "#app/field/pokemon";
 import { getPokemonNameWithAffix } from "#app/messages";
 import { PokemonPhase } from "./pokemon-phase";
+import { SpeciesFormChangeStatusEffectTrigger } from "#app/data/pokemon-forms";
+import { applyPostSetStatusAbAttrs, PostSetStatusAbAttr } from "#app/data/abilities/ability";
+import { isNullOrUndefined } from "#app/utils/common";
 
 export class ObtainStatusEffectPhase extends PokemonPhase {
   private statusEffect?: StatusEffect;
@@ -13,7 +16,13 @@ export class ObtainStatusEffectPhase extends PokemonPhase {
   private sourceText?: string | null;
   private sourcePokemon?: Pokemon | null;
 
-  constructor(battlerIndex: BattlerIndex, statusEffect?: StatusEffect, turnsRemaining?: number, sourceText?: string | null, sourcePokemon?: Pokemon | null) {
+  constructor(
+    battlerIndex: BattlerIndex,
+    statusEffect?: StatusEffect,
+    turnsRemaining?: number,
+    sourceText?: string | null,
+    sourcePokemon?: Pokemon | null,
+  ) {
     super(battlerIndex);
 
     this.statusEffect = statusEffect;
@@ -31,13 +40,27 @@ export class ObtainStatusEffectPhase extends PokemonPhase {
         }
         pokemon.updateInfo(true);
         new CommonBattleAnim(CommonAnim.POISON + (this.statusEffect! - 1), pokemon).play(false, () => {
-          globalScene.queueMessage(getStatusEffectObtainText(this.statusEffect, getPokemonNameWithAffix(pokemon), this.sourceText ?? undefined));
+          globalScene.queueMessage(
+            getStatusEffectObtainText(
+              this.statusEffect,
+              getPokemonNameWithAffix(pokemon),
+              this.sourceText ?? undefined,
+            ),
+          );
+          if (!isNullOrUndefined(this.statusEffect) && this.statusEffect !== StatusEffect.FAINT) {
+            globalScene.triggerPokemonFormChange(pokemon, SpeciesFormChangeStatusEffectTrigger, true);
+            // If mold breaker etc was used to set this status, it shouldn't apply to abilities activated afterwards
+            globalScene.arena.setIgnoreAbilities(false);
+            applyPostSetStatusAbAttrs(PostSetStatusAbAttr, pokemon, this.statusEffect, this.sourcePokemon);
+          }
           this.end();
         });
         return;
       }
     } else if (pokemon.status?.effect === this.statusEffect) {
-      globalScene.queueMessage(getStatusEffectOverlapText(this.statusEffect ?? StatusEffect.NONE, getPokemonNameWithAffix(pokemon)));
+      globalScene.queueMessage(
+        getStatusEffectOverlapText(this.statusEffect ?? StatusEffect.NONE, getPokemonNameWithAffix(pokemon)),
+      );
     }
     this.end();
   }
diff --git a/src/phases/party-heal-phase.ts b/src/phases/party-heal-phase.ts
index 2c1a6c33163..4a9f8a0c888 100644
--- a/src/phases/party-heal-phase.ts
+++ b/src/phases/party-heal-phase.ts
@@ -1,5 +1,5 @@
 import { globalScene } from "#app/global-scene";
-import * as Utils from "#app/utils";
+import { fixedInt } from "#app/utils/common";
 import { BattlePhase } from "./battle-phase";
 
 export class PartyHealPhase extends BattlePhase {
@@ -21,14 +21,14 @@ export class PartyHealPhase extends BattlePhase {
     globalScene.ui.fadeOut(1000).then(() => {
       for (const pokemon of globalScene.getPlayerParty()) {
         pokemon.hp = pokemon.getMaxHp();
-        pokemon.resetStatus();
+        pokemon.resetStatus(true, false, false, true);
         for (const move of pokemon.moveset) {
-            move!.ppUsed = 0; // TODO: is this bang correct?
+          move.ppUsed = 0;
         }
         pokemon.updateInfo(true);
       }
       const healSong = globalScene.playSoundWithoutBgm("heal");
-      globalScene.time.delayedCall(Utils.fixedInt(healSong.totalDuration * 1000), () => {
+      globalScene.time.delayedCall(fixedInt(healSong.totalDuration * 1000), () => {
         healSong.destroy();
         if (this.resumeBgm && bgmPlaying) {
           globalScene.playBgm();
@@ -36,5 +36,6 @@ export class PartyHealPhase extends BattlePhase {
         globalScene.ui.fadeIn(500).then(() => this.end());
       });
     });
+    globalScene.arena.playerTerasUsed = 0;
   }
 }
diff --git a/src/phases/party-member-pokemon-phase.ts b/src/phases/party-member-pokemon-phase.ts
index 592f35834aa..a782eabda38 100644
--- a/src/phases/party-member-pokemon-phase.ts
+++ b/src/phases/party-member-pokemon-phase.ts
@@ -11,9 +11,7 @@ export abstract class PartyMemberPokemonPhase extends FieldPhase {
     super();
 
     this.partyMemberIndex = partyMemberIndex;
-    this.fieldIndex = partyMemberIndex < globalScene.currentBattle.getBattlerCount()
-      ? partyMemberIndex
-      : -1;
+    this.fieldIndex = partyMemberIndex < globalScene.currentBattle.getBattlerCount() ? partyMemberIndex : -1;
     this.player = player;
   }
 
diff --git a/src/phases/pokemon-anim-phase.ts b/src/phases/pokemon-anim-phase.ts
index 54140ec96b5..1889b238f05 100644
--- a/src/phases/pokemon-anim-phase.ts
+++ b/src/phases/pokemon-anim-phase.ts
@@ -2,25 +2,24 @@ import { globalScene } from "#app/global-scene";
 import { SubstituteTag } from "#app/data/battler-tags";
 import type Pokemon from "#app/field/pokemon";
 import { BattlePhase } from "#app/phases/battle-phase";
-import { isNullOrUndefined } from "#app/utils";
+import { isNullOrUndefined } from "#app/utils/common";
 import { PokemonAnimType } from "#enums/pokemon-anim-type";
 import { Species } from "#enums/species";
 
-
 export class PokemonAnimPhase extends BattlePhase {
   /** The type of animation to play in this phase */
-  private key: PokemonAnimType;
+  protected key: PokemonAnimType;
   /** The Pokemon to which this animation applies */
-  private pokemon: Pokemon;
+  protected pokemon: Pokemon;
   /** Any other field sprites affected by this animation */
-  private fieldAssets: Phaser.GameObjects.Sprite[];
+  protected fieldAssets: Phaser.GameObjects.Sprite[];
 
-  constructor(key: PokemonAnimType, pokemon: Pokemon, fieldAssets?: Phaser.GameObjects.Sprite[]) {
+  constructor(key: PokemonAnimType, pokemon: Pokemon, fieldAssets: Phaser.GameObjects.Sprite[] = []) {
     super();
 
     this.key = key;
     this.pokemon = pokemon;
-    this.fieldAssets = fieldAssets ?? [];
+    this.fieldAssets = fieldAssets;
   }
 
   start(): void {
@@ -60,19 +59,19 @@ export class PokemonAnimPhase extends BattlePhase {
       const sprite = globalScene.addFieldSprite(
         this.pokemon.x + this.pokemon.getSprite().x,
         this.pokemon.y + this.pokemon.getSprite().y,
-        `pkmn${this.pokemon.isPlayer() ? "__back" : ""}__sub`
+        `pkmn${this.pokemon.isPlayer() ? "__back" : ""}__sub`,
       );
       sprite.setOrigin(0.5, 1);
       globalScene.field.add(sprite);
       return sprite;
     };
 
-    const [ subSprite, subTintSprite ] = [ getSprite(), getSprite() ];
+    const [subSprite, subTintSprite] = [getSprite(), getSprite()];
     const subScale = this.pokemon.getSpriteScale() * (this.pokemon.isPlayer() ? 0.5 : 1);
 
     subSprite.setVisible(false);
     subSprite.setScale(subScale);
-    subTintSprite.setTintFill(0xFFFFFF);
+    subTintSprite.setTintFill(0xffffff);
     subTintSprite.setScale(0.01);
 
     if (this.pokemon.isPlayer()) {
@@ -87,7 +86,7 @@ export class PokemonAnimPhase extends BattlePhase {
       x: this.pokemon.x + this.pokemon.getSubstituteOffset()[0],
       y: this.pokemon.y + this.pokemon.getSubstituteOffset()[1],
       alpha: 0.5,
-      ease: "Sine.easeIn"
+      ease: "Sine.easeIn",
     });
 
     globalScene.tweens.add({
@@ -108,9 +107,9 @@ export class PokemonAnimPhase extends BattlePhase {
             subTintSprite.destroy();
             substitute.sprite = subSprite;
             this.end();
-          }
+          },
         });
-      }
+      },
     });
   }
 
@@ -128,7 +127,7 @@ export class PokemonAnimPhase extends BattlePhase {
       targets: subSprite,
       alpha: 0,
       ease: "Sine.easeInOut",
-      duration: 500
+      duration: 500,
     });
 
     globalScene.tweens.add({
@@ -139,7 +138,7 @@ export class PokemonAnimPhase extends BattlePhase {
       ease: "Sine.easeInOut",
       delay: 250,
       duration: 500,
-      onComplete: () => this.end()
+      onComplete: () => this.end(),
     });
   }
 
@@ -159,7 +158,7 @@ export class PokemonAnimPhase extends BattlePhase {
       y: subSprite.y + this.pokemon.getSubstituteOffset()[1],
       alpha: 0.5,
       ease: "Sine.easeInOut",
-      duration: 500
+      duration: 500,
     });
 
     globalScene.tweens.add({
@@ -168,7 +167,7 @@ export class PokemonAnimPhase extends BattlePhase {
       ease: "Sine.easeInOut",
       delay: 250,
       duration: 500,
-      onComplete: () => this.end()
+      onComplete: () => this.end(),
     });
   }
 
@@ -186,7 +185,7 @@ export class PokemonAnimPhase extends BattlePhase {
       const sprite = globalScene.addFieldSprite(
         subSprite.x,
         subSprite.y,
-        `pkmn${this.pokemon.isPlayer() ? "__back" : ""}__sub`
+        `pkmn${this.pokemon.isPlayer() ? "__back" : ""}__sub`,
       );
       sprite.setOrigin(0.5, 1);
       globalScene.field.add(sprite);
@@ -196,7 +195,7 @@ export class PokemonAnimPhase extends BattlePhase {
     const subTintSprite = getSprite();
     const subScale = this.pokemon.getSpriteScale() * (this.pokemon.isPlayer() ? 0.5 : 1);
     subTintSprite.setAlpha(0);
-    subTintSprite.setTintFill(0xFFFFFF);
+    subTintSprite.setTintFill(0xffffff);
     subTintSprite.setScale(subScale);
 
     globalScene.tweens.add({
@@ -219,7 +218,7 @@ export class PokemonAnimPhase extends BattlePhase {
                 targets: subTintSprite,
                 scale: 0.01,
                 ease: "Sine.cubicEaseIn",
-                duration: 500
+                duration: 500,
               });
 
               globalScene.tweens.add({
@@ -233,12 +232,12 @@ export class PokemonAnimPhase extends BattlePhase {
                 onComplete: () => {
                   subTintSprite.destroy();
                   this.end();
-                }
+                },
               });
             }
-          }
+          },
         });
-      }
+      },
     });
   }
 
@@ -256,8 +255,17 @@ export class PokemonAnimPhase extends BattlePhase {
     const tatsugiriY = this.pokemon.y + this.pokemon.getSprite().y;
 
     const getSourceSprite = () => {
-      const sprite = globalScene.addPokemonSprite(this.pokemon, tatsugiriX, tatsugiriY, this.pokemon.getSprite().texture, this.pokemon.getSprite()!.frame.name, true);
-      [ "spriteColors", "fusionSpriteColors" ].map(k => sprite.pipelineData[k] = this.pokemon.getSprite().pipelineData[k]);
+      const sprite = globalScene.addPokemonSprite(
+        this.pokemon,
+        tatsugiriX,
+        tatsugiriY,
+        this.pokemon.getSprite().texture,
+        this.pokemon.getSprite()!.frame.name,
+        true,
+      );
+      ["spriteColors", "fusionSpriteColors"].map(
+        k => (sprite.pipelineData[k] = this.pokemon.getSprite().pipelineData[k]),
+      );
       sprite.setPipelineData("spriteKey", this.pokemon.getBattleSpriteKey());
       sprite.setPipelineData("shiny", this.pokemon.shiny);
       sprite.setPipelineData("variant", this.pokemon.variant);
@@ -281,8 +289,14 @@ export class PokemonAnimPhase extends BattlePhase {
       targets: sourceSprite,
       duration: 375,
       scale: 0.5,
-      x: { value: tatsugiriX + (dondozoFpOffset[0] - sourceFpOffset[0]) / 2, ease: "Linear" },
-      y: { value: (this.pokemon.isPlayer() ? 100 : 65) + sourceFpOffset[1], ease: "Sine.easeOut" },
+      x: {
+        value: tatsugiriX + (dondozoFpOffset[0] - sourceFpOffset[0]) / 2,
+        ease: "Linear",
+      },
+      y: {
+        value: (this.pokemon.isPlayer() ? 100 : 65) + sourceFpOffset[1],
+        ease: "Sine.easeOut",
+      },
       onComplete: () => {
         globalScene.field.bringToTop(dondozo);
         globalScene.tweens.add({
@@ -300,11 +314,11 @@ export class PokemonAnimPhase extends BattlePhase {
               ease: "Sine.easeInOut",
               scale: 0.85,
               yoyo: true,
-              onComplete: () => this.end()
+              onComplete: () => this.end(),
             });
-          }
+          },
         });
-      }
+      },
     });
   }
 
@@ -323,9 +337,11 @@ export class PokemonAnimPhase extends BattlePhase {
       this.pokemon.y + this.pokemon.getSprite().y + this.pokemon.height / 2,
       tatsugiri.getSprite().texture,
       tatsugiri.getSprite()!.frame.name,
-      true
+      true,
+    );
+    ["spriteColors", "fusionSpriteColors"].map(
+      k => (tatsuSprite.pipelineData[k] = tatsugiri.getSprite().pipelineData[k]),
     );
-    [ "spriteColors", "fusionSpriteColors" ].map(k => tatsuSprite.pipelineData[k] = tatsugiri.getSprite().pipelineData[k]);
     tatsuSprite.setPipelineData("spriteKey", tatsugiri.getBattleSpriteKey());
     tatsuSprite.setPipelineData("shiny", tatsugiri.shiny);
     tatsuSprite.setPipelineData("variant", tatsugiri.variant);
@@ -352,14 +368,17 @@ export class PokemonAnimPhase extends BattlePhase {
           duration: 500,
           scale: 1,
           x: { value: tatsugiri.x + tatsugiri.getSprite().x, ease: "Linear" },
-          y: { value: tatsugiri.y + tatsugiri.getSprite().y, ease: "Sine.easeIn" },
+          y: {
+            value: tatsugiri.y + tatsugiri.getSprite().y,
+            ease: "Sine.easeIn",
+          },
           onComplete: () => {
             tatsugiri.setVisible(true);
             tatsuSprite.destroy();
             this.end();
-          }
+          },
         });
-      }
+      },
     });
   }
 }
diff --git a/src/phases/pokemon-heal-phase.ts b/src/phases/pokemon-heal-phase.ts
index a544d47df70..7cb013251f6 100644
--- a/src/phases/pokemon-heal-phase.ts
+++ b/src/phases/pokemon-heal-phase.ts
@@ -3,13 +3,12 @@ import type { BattlerIndex } from "#app/battle";
 import { CommonAnim } from "#app/data/battle-anims";
 import { getStatusEffectHealText } from "#app/data/status-effect";
 import { StatusEffect } from "#app/enums/status-effect";
-import type { DamageResult } from "#app/field/pokemon";
 import { HitResult } from "#app/field/pokemon";
 import { getPokemonNameWithAffix } from "#app/messages";
 import { HealingBoosterModifier } from "#app/modifier/modifier";
 import { HealAchv } from "#app/system/achv";
 import i18next from "i18next";
-import * as Utils from "#app/utils";
+import { NumberHolder } from "#app/utils/common";
 import { CommonAnimPhase } from "./common-anim-phase";
 import { BattlerTagType } from "#app/enums/battler-tag-type";
 import type { HealBlockTag } from "#app/data/battler-tags";
@@ -24,7 +23,17 @@ export class PokemonHealPhase extends CommonAnimPhase {
   private preventFullHeal: boolean;
   private fullRestorePP: boolean;
 
-  constructor(battlerIndex: BattlerIndex, hpHealed: number, message: string | null, showFullHpMessage: boolean, skipAnim: boolean = false, revive: boolean = false, healStatus: boolean = false, preventFullHeal: boolean = false, fullRestorePP: boolean = false) {
+  constructor(
+    battlerIndex: BattlerIndex,
+    hpHealed: number,
+    message: string | null,
+    showFullHpMessage: boolean,
+    skipAnim = false,
+    revive = false,
+    healStatus = false,
+    preventFullHeal = false,
+    fullRestorePP = false,
+  ) {
     super(battlerIndex, undefined, CommonAnim.HEALTH_UP);
 
     this.hpHealed = hpHealed;
@@ -53,7 +62,7 @@ export class PokemonHealPhase extends CommonAnimPhase {
     }
 
     const hasMessage = !!this.message;
-    const healOrDamage = (!pokemon.isFullHp() || this.hpHealed < 0);
+    const healOrDamage = !pokemon.isFullHp() || this.hpHealed < 0;
     const healBlock = pokemon.getTag(BattlerTagType.HEAL_BLOCK) as HealBlockTag;
     let lastStatusEffect = StatusEffect.NONE;
 
@@ -61,19 +70,20 @@ export class PokemonHealPhase extends CommonAnimPhase {
       globalScene.queueMessage(healBlock.onActivation(pokemon));
       this.message = null;
       return super.end();
-    } else if (healOrDamage) {
-      const hpRestoreMultiplier = new Utils.IntegerHolder(1);
+    }
+    if (healOrDamage) {
+      const hpRestoreMultiplier = new NumberHolder(1);
       if (!this.revive) {
         globalScene.applyModifiers(HealingBoosterModifier, this.player, hpRestoreMultiplier);
       }
-      const healAmount = new Utils.NumberHolder(Math.floor(this.hpHealed * hpRestoreMultiplier.value));
+      const healAmount = new NumberHolder(Math.floor(this.hpHealed * hpRestoreMultiplier.value));
       if (healAmount.value < 0) {
-        pokemon.damageAndUpdate(healAmount.value * -1, HitResult.HEAL as DamageResult);
+        pokemon.damageAndUpdate(healAmount.value * -1, { result: HitResult.INDIRECT });
         healAmount.value = 0;
       }
       // Prevent healing to full if specified (in case of healing tokens so Sturdy doesn't cause a softlock)
       if (this.preventFullHeal && pokemon.hp + healAmount.value >= pokemon.getMaxHp()) {
-        healAmount.value = (pokemon.getMaxHp() - pokemon.hp) - 1;
+        healAmount.value = pokemon.getMaxHp() - pokemon.hp - 1;
       }
       healAmount.value = pokemon.heal(healAmount.value);
       if (healAmount.value) {
@@ -102,7 +112,9 @@ export class PokemonHealPhase extends CommonAnimPhase {
       pokemon.resetStatus();
       pokemon.updateInfo().then(() => super.end());
     } else if (this.showFullHpMessage) {
-      this.message = i18next.t("battle:hpIsFull", { pokemonName: getPokemonNameWithAffix(pokemon) });
+      this.message = i18next.t("battle:hpIsFull", {
+        pokemonName: getPokemonNameWithAffix(pokemon),
+      });
     }
 
     if (this.message) {
diff --git a/src/phases/pokemon-phase.ts b/src/phases/pokemon-phase.ts
index bf4193adb6d..8c30512cdc4 100644
--- a/src/phases/pokemon-phase.ts
+++ b/src/phases/pokemon-phase.ts
@@ -11,8 +11,14 @@ export abstract class PokemonPhase extends FieldPhase {
   constructor(battlerIndex?: BattlerIndex | number) {
     super();
 
+    battlerIndex =
+      battlerIndex ??
+      globalScene
+        .getField()
+        .find(p => p?.isActive())! // TODO: is the bang correct here?
+        .getBattlerIndex();
     if (battlerIndex === undefined) {
-      battlerIndex = globalScene.getField().find(p => p?.isActive())!.getBattlerIndex(); // TODO: is the bang correct here?
+      console.warn("There are no Pokemon on the field!"); // TODO: figure out a suitable fallback behavior
     }
 
     this.battlerIndex = battlerIndex;
diff --git a/src/phases/pokemon-transform-phase.ts b/src/phases/pokemon-transform-phase.ts
new file mode 100644
index 00000000000..b33689321b5
--- /dev/null
+++ b/src/phases/pokemon-transform-phase.ts
@@ -0,0 +1,85 @@
+import type { BattlerIndex } from "#app/battle";
+import { BattlerTagType } from "#enums/battler-tag-type";
+import { Moves } from "#enums/moves";
+import { EFFECTIVE_STATS, BATTLE_STATS } from "#enums/stat";
+import { PokemonMove } from "#app/field/pokemon";
+import { globalScene } from "#app/global-scene";
+import { PokemonPhase } from "./pokemon-phase";
+import { getPokemonNameWithAffix } from "#app/messages";
+import i18next from "i18next";
+
+/**
+ * Transforms a Pokemon into another Pokemon on the field.
+ * Used for Transform (move) and Imposter (ability)
+ */
+export class PokemonTransformPhase extends PokemonPhase {
+  protected targetIndex: BattlerIndex;
+  private playSound: boolean;
+
+  constructor(userIndex: BattlerIndex, targetIndex: BattlerIndex, playSound = false) {
+    super(userIndex);
+
+    this.targetIndex = targetIndex;
+    this.playSound = playSound;
+  }
+
+  public override start(): void {
+    const user = this.getPokemon();
+    const target = globalScene.getField(true).find(p => p.getBattlerIndex() === this.targetIndex);
+
+    if (!target) {
+      return this.end();
+    }
+
+    user.summonData.speciesForm = target.getSpeciesForm();
+    user.summonData.ability = target.getAbility().id;
+    user.summonData.gender = target.getGender();
+
+    // Power Trick's effect is removed after using Transform
+    user.removeTag(BattlerTagType.POWER_TRICK);
+
+    // Copy all stats (except HP)
+    for (const s of EFFECTIVE_STATS) {
+      user.setStat(s, target.getStat(s, false), false);
+    }
+
+    // Copy all stat stages
+    for (const s of BATTLE_STATS) {
+      user.setStatStage(s, target.getStatStage(s));
+    }
+
+    user.summonData.moveset = target.getMoveset().map(m => {
+      if (m) {
+        // If PP value is less than 5, do nothing. If greater, we need to reduce the value to 5.
+        return new PokemonMove(m.moveId, 0, 0, false, Math.min(m.getMove().pp, 5));
+      }
+      console.warn(`Transform: somehow iterating over a ${m} value when copying moveset!`);
+      return new PokemonMove(Moves.NONE);
+    });
+    user.summonData.types = target.getTypes();
+
+    const promises = [user.updateInfo()];
+
+    if (this.playSound) {
+      globalScene.playSound("battle_anims/PRSFX- Transform");
+    }
+
+    globalScene.queueMessage(
+      i18next.t("abilityTriggers:postSummonTransform", {
+        pokemonNameWithAffix: getPokemonNameWithAffix(user),
+        targetName: target.name,
+      }),
+    );
+
+    promises.push(
+      user.loadAssets(false).then(() => {
+        user.playAnim();
+        user.updateInfo();
+        // If the new ability activates immediately, it needs to happen after all the transform animations
+        user.setTempAbility(target.getAbility());
+      }),
+    );
+
+    Promise.allSettled(promises).then(() => this.end());
+  }
+}
diff --git a/src/phases/post-game-over-phase.ts b/src/phases/post-game-over-phase.ts
index 4643d4d1bef..753251e992f 100644
--- a/src/phases/post-game-over-phase.ts
+++ b/src/phases/post-game-over-phase.ts
@@ -4,12 +4,12 @@ import type { EndCardPhase } from "./end-card-phase";
 import { TitlePhase } from "./title-phase";
 
 export class PostGameOverPhase extends Phase {
-  private endCardPhase: EndCardPhase | null;
+  private endCardPhase?: EndCardPhase;
 
   constructor(endCardPhase?: EndCardPhase) {
     super();
 
-    this.endCardPhase = endCardPhase!; // TODO: is this bang correct?
+    this.endCardPhase = endCardPhase;
   }
 
   start() {
@@ -20,14 +20,16 @@ export class PostGameOverPhase extends Phase {
         if (!success) {
           return globalScene.reset(true);
         }
-        globalScene.gameData.tryClearSession(globalScene.sessionSlotId).then((success: boolean | [boolean, boolean]) => {
-          if (!success[0]) {
-            return globalScene.reset(true);
-          }
-          globalScene.reset();
-          globalScene.unshiftPhase(new TitlePhase());
-          this.end();
-        });
+        globalScene.gameData
+          .tryClearSession(globalScene.sessionSlotId)
+          .then((success: boolean | [boolean, boolean]) => {
+            if (!success[0]) {
+              return globalScene.reset(true);
+            }
+            globalScene.reset();
+            globalScene.unshiftPhase(new TitlePhase());
+            this.end();
+          });
       });
     };
 
diff --git a/src/phases/post-summon-phase.ts b/src/phases/post-summon-phase.ts
index d76708b7050..446d45bb2fa 100644
--- a/src/phases/post-summon-phase.ts
+++ b/src/phases/post-summon-phase.ts
@@ -1,6 +1,5 @@
 import { globalScene } from "#app/global-scene";
-import type { BattlerIndex } from "#app/battle";
-import { applyAbAttrs, applyPostSummonAbAttrs, CommanderAbAttr, PostSummonAbAttr } from "#app/data/ability";
+import { applyAbAttrs, applyPostSummonAbAttrs, CommanderAbAttr, PostSummonAbAttr } from "#app/data/abilities/ability";
 import { ArenaTrapTag } from "#app/data/arena-tag";
 import { StatusEffect } from "#app/enums/status-effect";
 import { PokemonPhase } from "./pokemon-phase";
@@ -8,10 +7,6 @@ import { MysteryEncounterPostSummonTag } from "#app/data/battler-tags";
 import { BattlerTagType } from "#enums/battler-tag-type";
 
 export class PostSummonPhase extends PokemonPhase {
-  constructor(battlerIndex: BattlerIndex) {
-    super(battlerIndex);
-  }
-
   start() {
     super.start();
 
@@ -23,16 +18,19 @@ export class PostSummonPhase extends PokemonPhase {
     globalScene.arena.applyTags(ArenaTrapTag, false, pokemon);
 
     // If this is mystery encounter and has post summon phase tag, apply post summon effects
-    if (globalScene.currentBattle.isBattleMysteryEncounter() && pokemon.findTags(t => t instanceof MysteryEncounterPostSummonTag).length > 0) {
+    if (
+      globalScene.currentBattle.isBattleMysteryEncounter() &&
+      pokemon.findTags(t => t instanceof MysteryEncounterPostSummonTag).length > 0
+    ) {
       pokemon.lapseTag(BattlerTagType.MYSTERY_ENCOUNTER_POST_SUMMON);
     }
 
-    applyPostSummonAbAttrs(PostSummonAbAttr, pokemon)
-      .then(() => {
-        const field = pokemon.isPlayer() ? globalScene.getPlayerField() : globalScene.getEnemyField();
-        field.forEach((p) => applyAbAttrs(CommanderAbAttr, p, null, false));
+    applyPostSummonAbAttrs(PostSummonAbAttr, pokemon);
+    const field = pokemon.isPlayer() ? globalScene.getPlayerField() : globalScene.getEnemyField();
+    for (const p of field) {
+      applyAbAttrs(CommanderAbAttr, p, null, false);
+    }
 
-        this.end();
-      });
+    this.end();
   }
 }
diff --git a/src/phases/post-turn-status-effect-phase.ts b/src/phases/post-turn-status-effect-phase.ts
index 13cac6eed7c..9b530d48196 100644
--- a/src/phases/post-turn-status-effect-phase.ts
+++ b/src/phases/post-turn-status-effect-phase.ts
@@ -1,15 +1,23 @@
 import { globalScene } from "#app/global-scene";
 import type { BattlerIndex } from "#app/battle";
-import { applyAbAttrs, applyPostDamageAbAttrs, BlockNonDirectDamageAbAttr, BlockStatusDamageAbAttr, PostDamageAbAttr, ReduceBurnDamageAbAttr } from "#app/data/ability";
+import {
+  applyAbAttrs,
+  applyPostDamageAbAttrs,
+  BlockNonDirectDamageAbAttr,
+  BlockStatusDamageAbAttr,
+  PostDamageAbAttr,
+  ReduceBurnDamageAbAttr,
+} from "#app/data/abilities/ability";
 import { CommonBattleAnim, CommonAnim } from "#app/data/battle-anims";
 import { getStatusEffectActivationText } from "#app/data/status-effect";
 import { BattleSpec } from "#app/enums/battle-spec";
 import { StatusEffect } from "#app/enums/status-effect";
 import { getPokemonNameWithAffix } from "#app/messages";
-import * as Utils from "#app/utils";
+import { BooleanHolder, NumberHolder } from "#app/utils/common";
 import { PokemonPhase } from "./pokemon-phase";
 
 export class PostTurnStatusEffectPhase extends PokemonPhase {
+  // biome-ignore lint/complexity/noUselessConstructor: Not unnecessary as it makes battlerIndex required
   constructor(battlerIndex: BattlerIndex) {
     super(battlerIndex);
   }
@@ -18,13 +26,15 @@ export class PostTurnStatusEffectPhase extends PokemonPhase {
     const pokemon = this.getPokemon();
     if (pokemon?.isActive(true) && pokemon.status && pokemon.status.isPostTurn() && !pokemon.switchOutStatus) {
       pokemon.status.incrementTurn();
-      const cancelled = new Utils.BooleanHolder(false);
+      const cancelled = new BooleanHolder(false);
       applyAbAttrs(BlockNonDirectDamageAbAttr, pokemon, cancelled);
       applyAbAttrs(BlockStatusDamageAbAttr, pokemon, cancelled);
 
       if (!cancelled.value) {
-        globalScene.queueMessage(getStatusEffectActivationText(pokemon.status.effect, getPokemonNameWithAffix(pokemon)));
-        const damage = new Utils.NumberHolder(0);
+        globalScene.queueMessage(
+          getStatusEffectActivationText(pokemon.status.effect, getPokemonNameWithAffix(pokemon)),
+        );
+        const damage = new NumberHolder(0);
         switch (pokemon.status.effect) {
           case StatusEffect.POISON:
             damage.value = Math.max(pokemon.getMaxHp() >> 3, 1);
diff --git a/src/phases/quiet-form-change-phase.ts b/src/phases/quiet-form-change-phase.ts
index 185156a20c7..76411f62f77 100644
--- a/src/phases/quiet-form-change-phase.ts
+++ b/src/phases/quiet-form-change-phase.ts
@@ -1,7 +1,7 @@
 import { globalScene } from "#app/global-scene";
 import { SemiInvulnerableTag } from "#app/data/battler-tags";
 import type { SpeciesFormChange } from "#app/data/pokemon-forms";
-import { getSpeciesFormChangeMessage } from "#app/data/pokemon-forms";
+import { getSpeciesFormChangeMessage, SpeciesFormChangeTeraTrigger } from "#app/data/pokemon-forms";
 import { getTypeRgb } from "#app/data/type";
 import { BattleSpec } from "#app/enums/battle-spec";
 import { BattlerTagType } from "#app/enums/battler-tag-type";
@@ -11,6 +11,12 @@ import { getPokemonNameWithAffix } from "#app/messages";
 import { BattlePhase } from "./battle-phase";
 import { MovePhase } from "./move-phase";
 import { PokemonHealPhase } from "./pokemon-heal-phase";
+import {
+  applyAbAttrs,
+  ClearTerrainAbAttr,
+  ClearWeatherAbAttr,
+  PostTeraFormChangeStatChangeAbAttr,
+} from "#app/data/abilities/ability";
 
 export class QuietFormChangePhase extends BattlePhase {
   protected pokemon: Pokemon;
@@ -34,7 +40,12 @@ export class QuietFormChangePhase extends BattlePhase {
     if (!this.pokemon.isOnField() || this.pokemon.getTag(SemiInvulnerableTag) || this.pokemon.isFainted()) {
       if (this.pokemon.isPlayer() || this.pokemon.isActive()) {
         this.pokemon.changeForm(this.formChange).then(() => {
-          globalScene.ui.showText(getSpeciesFormChangeMessage(this.pokemon, this.formChange, preName), null, () => this.end(), 1500);
+          globalScene.ui.showText(
+            getSpeciesFormChangeMessage(this.pokemon, this.formChange, preName),
+            null,
+            () => this.end(),
+            1500,
+          );
         });
       } else {
         this.end();
@@ -43,7 +54,12 @@ export class QuietFormChangePhase extends BattlePhase {
     }
 
     const getPokemonSprite = () => {
-      const sprite = globalScene.addPokemonSprite(this.pokemon, this.pokemon.x + this.pokemon.getSprite().x, this.pokemon.y + this.pokemon.getSprite().y, "pkmn__sub");
+      const sprite = globalScene.addPokemonSprite(
+        this.pokemon,
+        this.pokemon.x + this.pokemon.getSprite().x,
+        this.pokemon.y + this.pokemon.getSprite().y,
+        "pkmn__sub",
+      );
       sprite.setOrigin(0.5, 1);
       const spriteKey = this.pokemon.getBattleSpriteKey();
       try {
@@ -51,9 +67,14 @@ export class QuietFormChangePhase extends BattlePhase {
       } catch (err: unknown) {
         console.error(`Failed to play animation for ${spriteKey}`, err);
       }
-      sprite.setPipeline(globalScene.spritePipeline, { tone: [ 0.0, 0.0, 0.0, 0.0 ], hasShadow: false, teraColor: getTypeRgb(this.pokemon.getTeraType()) });
-      [ "spriteColors", "fusionSpriteColors" ].map(k => {
-        if (this.pokemon.summonData?.speciesForm) {
+      sprite.setPipeline(globalScene.spritePipeline, {
+        tone: [0.0, 0.0, 0.0, 0.0],
+        hasShadow: false,
+        teraColor: getTypeRgb(this.pokemon.getTeraType()),
+        isTerastallized: this.pokemon.isTerastallized,
+      });
+      ["spriteColors", "fusionSpriteColors"].map(k => {
+        if (this.pokemon.summonData.speciesForm) {
           k += "Base";
         }
         sprite.pipelineData[k] = this.pokemon.getSprite().pipelineData[k];
@@ -62,7 +83,7 @@ export class QuietFormChangePhase extends BattlePhase {
       return sprite;
     };
 
-    const [ pokemonTintSprite, pokemonFormTintSprite ] = [ getPokemonSprite(), getPokemonSprite() ];
+    const [pokemonTintSprite, pokemonFormTintSprite] = [getPokemonSprite(), getPokemonSprite()];
 
     this.pokemon.getSprite().on("animationupdate", (_anim, frame) => {
       if (frame.textureKey === pokemonTintSprite.texture.key) {
@@ -73,9 +94,9 @@ export class QuietFormChangePhase extends BattlePhase {
     });
 
     pokemonTintSprite.setAlpha(0);
-    pokemonTintSprite.setTintFill(0xFFFFFF);
+    pokemonTintSprite.setTintFill(0xffffff);
     pokemonFormTintSprite.setVisible(false);
-    pokemonFormTintSprite.setTintFill(0xFFFFFF);
+    pokemonFormTintSprite.setTintFill(0xffffff);
 
     globalScene.playSound("battle_anims/PRSFX- Transform");
 
@@ -101,7 +122,7 @@ export class QuietFormChangePhase extends BattlePhase {
             scale: 0.01,
             ease: "Cubic.easeInOut",
             duration: 500,
-            onComplete: () => pokemonTintSprite.destroy()
+            onComplete: () => pokemonTintSprite.destroy(),
           });
           globalScene.tweens.add({
             targets: pokemonFormTintSprite,
@@ -119,13 +140,18 @@ export class QuietFormChangePhase extends BattlePhase {
                 duration: 1000,
                 onComplete: () => {
                   pokemonTintSprite.setVisible(false);
-                  globalScene.ui.showText(getSpeciesFormChangeMessage(this.pokemon, this.formChange, preName), null, () => this.end(), 1500);
-                }
+                  globalScene.ui.showText(
+                    getSpeciesFormChangeMessage(this.pokemon, this.formChange, preName),
+                    null,
+                    () => this.end(),
+                    1500,
+                  );
+                },
               });
-            }
+            },
           });
         });
-      }
+      },
     });
   }
 
@@ -133,7 +159,9 @@ export class QuietFormChangePhase extends BattlePhase {
     this.pokemon.findAndRemoveTags(t => t.tagType === BattlerTagType.AUTOTOMIZED);
     if (globalScene?.currentBattle.battleSpec === BattleSpec.FINAL_BOSS && this.pokemon instanceof EnemyPokemon) {
       globalScene.playBgm();
-      globalScene.unshiftPhase(new PokemonHealPhase(this.pokemon.getBattlerIndex(), this.pokemon.getMaxHp(), null, false, false, false, true));
+      globalScene.unshiftPhase(
+        new PokemonHealPhase(this.pokemon.getBattlerIndex(), this.pokemon.getMaxHp(), null, false, false, false, true),
+      );
       this.pokemon.findAndRemoveTags(() => true);
       this.pokemon.bossSegments = 5;
       this.pokemon.bossSegmentIndex = 4;
@@ -145,6 +173,11 @@ export class QuietFormChangePhase extends BattlePhase {
         movePhase.cancel();
       }
     }
+    if (this.formChange.trigger instanceof SpeciesFormChangeTeraTrigger) {
+      applyAbAttrs(PostTeraFormChangeStatChangeAbAttr, this.pokemon, null);
+      applyAbAttrs(ClearWeatherAbAttr, this.pokemon, null);
+      applyAbAttrs(ClearTerrainAbAttr, this.pokemon, null);
+    }
 
     super.end();
   }
diff --git a/src/phases/reload-session-phase.ts b/src/phases/reload-session-phase.ts
index a88cb1b1de3..8cd5f67b43a 100644
--- a/src/phases/reload-session-phase.ts
+++ b/src/phases/reload-session-phase.ts
@@ -1,24 +1,24 @@
 import { globalScene } from "#app/global-scene";
 import { Phase } from "#app/phase";
-import { Mode } from "#app/ui/ui";
-import * as Utils from "#app/utils";
+import { UiMode } from "#enums/ui-mode";
+import { fixedInt } from "#app/utils/common";
 
 export class ReloadSessionPhase extends Phase {
-  private systemDataStr: string | null;
+  private systemDataStr?: string;
 
   constructor(systemDataStr?: string) {
     super();
 
-    this.systemDataStr = systemDataStr ?? null;
+    this.systemDataStr = systemDataStr;
   }
 
   start(): void {
-    globalScene.ui.setMode(Mode.SESSION_RELOAD);
+    globalScene.ui.setMode(UiMode.SESSION_RELOAD);
 
     let delayElapsed = false;
     let loaded = false;
 
-    globalScene.time.delayedCall(Utils.fixedInt(1500), () => {
+    globalScene.time.delayedCall(fixedInt(1500), () => {
       if (loaded) {
         this.end();
       } else {
@@ -28,12 +28,14 @@ export class ReloadSessionPhase extends Phase {
 
     globalScene.gameData.clearLocalData();
 
-    (this.systemDataStr ? globalScene.gameData.initSystem(this.systemDataStr) : globalScene.gameData.loadSystem()).then(() => {
-      if (delayElapsed) {
-        this.end();
-      } else {
-        loaded = true;
-      }
-    });
+    (this.systemDataStr ? globalScene.gameData.initSystem(this.systemDataStr) : globalScene.gameData.loadSystem()).then(
+      () => {
+        if (delayElapsed) {
+          this.end();
+        } else {
+          loaded = true;
+        }
+      },
+    );
   }
 }
diff --git a/src/phases/reset-status-phase.ts b/src/phases/reset-status-phase.ts
new file mode 100644
index 00000000000..19bfc3027e2
--- /dev/null
+++ b/src/phases/reset-status-phase.ts
@@ -0,0 +1,26 @@
+import type Pokemon from "#app/field/pokemon";
+import { BattlePhase } from "#app/phases/battle-phase";
+
+/**
+ * Phase which handles resetting a Pokemon's status to none
+ *
+ * This is necessary to perform in a phase primarly to ensure that the status icon disappears at the correct time in the battle
+ */
+export class ResetStatusPhase extends BattlePhase {
+  private readonly pokemon: Pokemon;
+  private readonly affectConfusion: boolean;
+  private readonly reloadAssets: boolean;
+
+  constructor(pokemon: Pokemon, affectConfusion: boolean, reloadAssets: boolean) {
+    super();
+
+    this.pokemon = pokemon;
+    this.affectConfusion = affectConfusion;
+    this.reloadAssets = reloadAssets;
+  }
+
+  public override start() {
+    this.pokemon.clearStatus(this.affectConfusion, this.reloadAssets);
+    this.end();
+  }
+}
diff --git a/src/phases/return-phase.ts b/src/phases/return-phase.ts
index 8a876268c8e..6dee982a4f0 100644
--- a/src/phases/return-phase.ts
+++ b/src/phases/return-phase.ts
@@ -12,7 +12,7 @@ export class ReturnPhase extends SwitchSummonPhase {
     this.end();
   }
 
-  summon(): void { }
+  summon(): void {}
 
   onEnd(): void {
     const pokemon = this.getPokemon();
diff --git a/src/phases/revival-blessing-phase.ts b/src/phases/revival-blessing-phase.ts
new file mode 100644
index 00000000000..598d9109abc
--- /dev/null
+++ b/src/phases/revival-blessing-phase.ts
@@ -0,0 +1,71 @@
+import { SwitchType } from "#enums/switch-type";
+import { globalScene } from "#app/global-scene";
+import type { PartyOption } from "#app/ui/party-ui-handler";
+import PartyUiHandler, { PartyUiMode } from "#app/ui/party-ui-handler";
+import { UiMode } from "#enums/ui-mode";
+import i18next from "i18next";
+import { toDmgValue, isNullOrUndefined } from "#app/utils/common";
+import { BattlePhase } from "#app/phases/battle-phase";
+import { SwitchSummonPhase } from "#app/phases/switch-summon-phase";
+import { ToggleDoublePositionPhase } from "#app/phases/toggle-double-position-phase";
+import type { PlayerPokemon } from "#app/field/pokemon";
+
+/**
+ * Sets the Party UI and handles the effect of Revival Blessing
+ * when used by one of the player's Pokemon.
+ */
+export class RevivalBlessingPhase extends BattlePhase {
+  constructor(protected user: PlayerPokemon) {
+    super();
+  }
+
+  public override start(): void {
+    globalScene.ui.setMode(
+      UiMode.PARTY,
+      PartyUiMode.REVIVAL_BLESSING,
+      this.user.getFieldIndex(),
+      (slotIndex: integer, _option: PartyOption) => {
+        if (slotIndex >= 0 && slotIndex < 6) {
+          const pokemon = globalScene.getPlayerParty()[slotIndex];
+          if (!pokemon || !pokemon.isFainted()) {
+            return this.end();
+          }
+
+          pokemon.resetTurnData();
+          pokemon.resetStatus(true, false, false, false);
+          pokemon.heal(Math.min(toDmgValue(0.5 * pokemon.getMaxHp()), pokemon.getMaxHp()));
+          globalScene.queueMessage(
+            i18next.t("moveTriggers:revivalBlessing", {
+              pokemonName: pokemon.name,
+            }),
+            0,
+            true,
+          );
+
+          const allyPokemon = this.user.getAlly();
+          if (
+            globalScene.currentBattle.double &&
+            globalScene.getPlayerParty().length > 1 &&
+            !isNullOrUndefined(allyPokemon)
+          ) {
+            if (slotIndex <= 1) {
+              // Revived ally pokemon
+              globalScene.unshiftPhase(
+                new SwitchSummonPhase(SwitchType.SWITCH, pokemon.getFieldIndex(), slotIndex, false, true),
+              );
+              globalScene.unshiftPhase(new ToggleDoublePositionPhase(true));
+            } else if (allyPokemon.isFainted()) {
+              // Revived party pokemon, and ally pokemon is fainted
+              globalScene.unshiftPhase(
+                new SwitchSummonPhase(SwitchType.SWITCH, allyPokemon.getFieldIndex(), slotIndex, false, true),
+              );
+              globalScene.unshiftPhase(new ToggleDoublePositionPhase(true));
+            }
+          }
+        }
+        globalScene.ui.setMode(UiMode.MESSAGE).then(() => this.end());
+      },
+      PartyUiHandler.FilterFainted,
+    );
+  }
+}
diff --git a/src/phases/ribbon-modifier-reward-phase.ts b/src/phases/ribbon-modifier-reward-phase.ts
index 8cf15ba8f2c..21114ab3de9 100644
--- a/src/phases/ribbon-modifier-reward-phase.ts
+++ b/src/phases/ribbon-modifier-reward-phase.ts
@@ -1,7 +1,7 @@
 import { globalScene } from "#app/global-scene";
 import type PokemonSpecies from "#app/data/pokemon-species";
 import type { ModifierTypeFunc } from "#app/modifier/modifier-type";
-import { Mode } from "#app/ui/ui";
+import { UiMode } from "#enums/ui-mode";
 import i18next from "i18next";
 import { ModifierRewardPhase } from "./modifier-reward-phase";
 
@@ -17,17 +17,23 @@ export class RibbonModifierRewardPhase extends ModifierRewardPhase {
   doReward(): Promise<void> {
     return new Promise<void>(resolve => {
       const newModifier = this.modifierType.newModifier();
-      globalScene.addModifier(newModifier).then(() => {
-        globalScene.playSound("level_up_fanfare");
-        globalScene.ui.setMode(Mode.MESSAGE);
-        globalScene.ui.showText(i18next.t("battle:beatModeFirstTime", {
+      globalScene.addModifier(newModifier);
+      globalScene.playSound("level_up_fanfare");
+      globalScene.ui.setMode(UiMode.MESSAGE);
+      globalScene.ui.showText(
+        i18next.t("battle:beatModeFirstTime", {
           speciesName: this.species.name,
           gameMode: globalScene.gameMode.getName(),
-          newModifier: newModifier?.type.name
-        }), null, () => {
+          newModifier: newModifier?.type.name,
+        }),
+        null,
+        () => {
           resolve();
-        }, null, true, 1500);
-      });
+        },
+        null,
+        true,
+        1500,
+      );
     });
   }
 }
diff --git a/src/phases/scan-ivs-phase.ts b/src/phases/scan-ivs-phase.ts
index 519d7913b79..d79a32bd47e 100644
--- a/src/phases/scan-ivs-phase.ts
+++ b/src/phases/scan-ivs-phase.ts
@@ -1,29 +1,21 @@
 import { globalScene } from "#app/global-scene";
 import type { BattlerIndex } from "#app/battle";
-import { CommonBattleAnim, CommonAnim } from "#app/data/battle-anims";
-import { Stat } from "#app/enums/stat";
+import { PERMANENT_STATS, Stat } from "#app/enums/stat";
 import { getPokemonNameWithAffix } from "#app/messages";
 import { getTextColor, TextStyle } from "#app/ui/text";
-import { Mode } from "#app/ui/ui";
+import { UiMode } from "#enums/ui-mode";
 import i18next from "i18next";
 import { PokemonPhase } from "./pokemon-phase";
 
 export class ScanIvsPhase extends PokemonPhase {
-  private shownIvs: number;
-
-  constructor(battlerIndex: BattlerIndex, shownIvs: number) {
+  // biome-ignore lint/complexity/noUselessConstructor: This changes `battlerIndex` to be required
+  constructor(battlerIndex: BattlerIndex) {
     super(battlerIndex);
-
-    this.shownIvs = shownIvs;
   }
 
   start() {
     super.start();
 
-    if (!this.shownIvs) {
-      return this.end();
-    }
-
     const pokemon = this.getPokemon();
 
     let enemyIvs: number[] = [];
@@ -33,14 +25,17 @@ export class ScanIvsPhase extends PokemonPhase {
     const uiTheme = globalScene.uiTheme; // Assuming uiTheme is accessible
     for (let e = 0; e < enemyField.length; e++) {
       enemyIvs = enemyField[e].ivs;
-      const currentIvs = globalScene.gameData.dexData[enemyField[e].species.getRootSpeciesId()].ivs;  // we are using getRootSpeciesId() here because we want to check against the baby form, not the mid form if it exists
-      const ivsToShow = globalScene.ui.getMessageHandler().getTopIvs(enemyIvs, this.shownIvs);
+      // we are using getRootSpeciesId() here because we want to check against the baby form, not the mid form if it exists
+      const currentIvs = globalScene.gameData.dexData[enemyField[e].species.getRootSpeciesId()].ivs;
       statsContainer = enemyField[e].getBattleInfo().getStatsValueContainer().list as Phaser.GameObjects.Sprite[];
       statsContainerLabels = statsContainer.filter(m => m.name.indexOf("icon_stat_label") >= 0);
       for (let s = 0; s < statsContainerLabels.length; s++) {
         const ivStat = Stat[statsContainerLabels[s].frame.name];
-        if (enemyIvs[ivStat] > currentIvs[ivStat] && ivsToShow.indexOf(Number(ivStat)) >= 0) {
-          const hexColour = enemyIvs[ivStat] === 31 ? getTextColor(TextStyle.PERFECT_IV, false, uiTheme) : getTextColor(TextStyle.SUMMARY_GREEN, false, uiTheme);
+        if (enemyIvs[ivStat] > currentIvs[ivStat] && PERMANENT_STATS.indexOf(Number(ivStat)) >= 0) {
+          const hexColour =
+            enemyIvs[ivStat] === 31
+              ? getTextColor(TextStyle.PERFECT_IV, false, uiTheme)
+              : getTextColor(TextStyle.SUMMARY_GREEN, false, uiTheme);
           const hexTextColour = Phaser.Display.Color.HexStringToColor(hexColour).color;
           statsContainerLabels[s].setTint(hexTextColour);
         }
@@ -49,19 +44,30 @@ export class ScanIvsPhase extends PokemonPhase {
     }
 
     if (!globalScene.hideIvs) {
-      globalScene.ui.showText(i18next.t("battle:ivScannerUseQuestion", { pokemonName: getPokemonNameWithAffix(pokemon) }), null, () => {
-        globalScene.ui.setMode(Mode.CONFIRM, () => {
-          globalScene.ui.setMode(Mode.MESSAGE);
-          globalScene.ui.clearText();
-          new CommonBattleAnim(CommonAnim.LOCK_ON, pokemon, pokemon).play(false, () => {
-            globalScene.ui.getMessageHandler().promptIvs(pokemon.id, pokemon.ivs, this.shownIvs).then(() => this.end());
-          });
-        }, () => {
-          globalScene.ui.setMode(Mode.MESSAGE);
-          globalScene.ui.clearText();
-          this.end();
-        });
-      });
+      globalScene.ui.showText(
+        i18next.t("battle:ivScannerUseQuestion", {
+          pokemonName: getPokemonNameWithAffix(pokemon),
+        }),
+        null,
+        () => {
+          globalScene.ui.setMode(
+            UiMode.CONFIRM,
+            () => {
+              globalScene.ui.setMode(UiMode.MESSAGE);
+              globalScene.ui.clearText();
+              globalScene.ui
+                .getMessageHandler()
+                .promptIvs(pokemon.id, pokemon.ivs)
+                .then(() => this.end());
+            },
+            () => {
+              globalScene.ui.setMode(UiMode.MESSAGE);
+              globalScene.ui.clearText();
+              this.end();
+            },
+          );
+        },
+      );
     } else {
       this.end();
     }
diff --git a/src/phases/select-biome-phase.ts b/src/phases/select-biome-phase.ts
index ea4dcc4274b..efd376eb5ba 100644
--- a/src/phases/select-biome-phase.ts
+++ b/src/phases/select-biome-phase.ts
@@ -3,24 +3,23 @@ import { biomeLinks, getBiomeName } from "#app/data/balance/biomes";
 import { Biome } from "#app/enums/biome";
 import { MoneyInterestModifier, MapModifier } from "#app/modifier/modifier";
 import type { OptionSelectItem } from "#app/ui/abstact-option-select-ui-handler";
-import { Mode } from "#app/ui/ui";
+import { UiMode } from "#enums/ui-mode";
 import { BattlePhase } from "./battle-phase";
-import * as Utils from "#app/utils";
+import { randSeedInt } from "#app/utils/common";
 import { PartyHealPhase } from "./party-heal-phase";
 import { SwitchBiomePhase } from "./switch-biome-phase";
 
 export class SelectBiomePhase extends BattlePhase {
-  constructor() {
-    super();
-  }
-
   start() {
     super.start();
 
+    globalScene.resetSeed();
+
     const currentBiome = globalScene.arena.biomeType;
+    const nextWaveIndex = globalScene.currentBattle.waveIndex + 1;
 
     const setNextBiome = (nextBiome: Biome) => {
-      if (globalScene.currentBattle.waveIndex % 10 === 1) {
+      if (nextWaveIndex % 10 === 1) {
         globalScene.applyModifiers(MoneyInterestModifier, true);
         globalScene.unshiftPhase(new PartyHealPhase(false));
       }
@@ -28,57 +27,49 @@ export class SelectBiomePhase extends BattlePhase {
       this.end();
     };
 
-    if ((globalScene.gameMode.isClassic && globalScene.gameMode.isWaveFinal(globalScene.currentBattle.waveIndex + 9))
-        || (globalScene.gameMode.isDaily && globalScene.gameMode.isWaveFinal(globalScene.currentBattle.waveIndex))
-        || (globalScene.gameMode.hasShortBiomes && !(globalScene.currentBattle.waveIndex % 50))) {
+    if (
+      (globalScene.gameMode.isClassic && globalScene.gameMode.isWaveFinal(nextWaveIndex + 9)) ||
+      (globalScene.gameMode.isDaily && globalScene.gameMode.isWaveFinal(nextWaveIndex)) ||
+      (globalScene.gameMode.hasShortBiomes && !(nextWaveIndex % 50))
+    ) {
       setNextBiome(Biome.END);
     } else if (globalScene.gameMode.hasRandomBiomes) {
-      setNextBiome(this.generateNextBiome());
+      setNextBiome(this.generateNextBiome(nextWaveIndex));
     } else if (Array.isArray(biomeLinks[currentBiome])) {
-      let biomes: Biome[] = [];
-      globalScene.executeWithSeedOffset(() => {
-        biomes = (biomeLinks[currentBiome] as (Biome | [Biome, number])[])
-          .filter(b => !Array.isArray(b) || !Utils.randSeedInt(b[1]))
-          .map(b => !Array.isArray(b) ? b : b[0]);
-      }, globalScene.currentBattle.waveIndex);
+      const biomes: Biome[] = (biomeLinks[currentBiome] as (Biome | [Biome, number])[])
+        .filter(b => !Array.isArray(b) || !randSeedInt(b[1]))
+        .map(b => (!Array.isArray(b) ? b : b[0]));
+
       if (biomes.length > 1 && globalScene.findModifier(m => m instanceof MapModifier)) {
-        let biomeChoices: Biome[] = [];
-        globalScene.executeWithSeedOffset(() => {
-          biomeChoices = (!Array.isArray(biomeLinks[currentBiome])
-            ? [ biomeLinks[currentBiome] as Biome ]
-            : biomeLinks[currentBiome] as (Biome | [Biome, number])[])
-            .filter((b, i) => !Array.isArray(b) || !Utils.randSeedInt(b[1]))
-            .map(b => Array.isArray(b) ? b[0] : b);
-        }, globalScene.currentBattle.waveIndex);
-        const biomeSelectItems = biomeChoices.map(b => {
+        const biomeSelectItems = biomes.map(b => {
           const ret: OptionSelectItem = {
             label: getBiomeName(b),
             handler: () => {
-              globalScene.ui.setMode(Mode.MESSAGE);
+              globalScene.ui.setMode(UiMode.MESSAGE);
               setNextBiome(b);
               return true;
-            }
+            },
           };
           return ret;
         });
-        globalScene.ui.setMode(Mode.OPTION_SELECT, {
+        globalScene.ui.setMode(UiMode.OPTION_SELECT, {
           options: biomeSelectItems,
-          delay: 1000
+          delay: 1000,
         });
       } else {
-        setNextBiome(biomes[Utils.randSeedInt(biomes.length)]);
+        setNextBiome(biomes[randSeedInt(biomes.length)]);
       }
     } else if (biomeLinks.hasOwnProperty(currentBiome)) {
       setNextBiome(biomeLinks[currentBiome] as Biome);
     } else {
-      setNextBiome(this.generateNextBiome());
+      setNextBiome(this.generateNextBiome(nextWaveIndex));
     }
   }
 
-  generateNextBiome(): Biome {
-    if (!(globalScene.currentBattle.waveIndex % 50)) {
+  generateNextBiome(waveIndex: number): Biome {
+    if (!(waveIndex % 50)) {
       return Biome.END;
     }
-    return globalScene.generateRandomBiome(globalScene.currentBattle.waveIndex);
+    return globalScene.generateRandomBiome(waveIndex);
   }
 }
diff --git a/src/phases/select-challenge-phase.ts b/src/phases/select-challenge-phase.ts
index 2a6797d3556..76ac8a60c4f 100644
--- a/src/phases/select-challenge-phase.ts
+++ b/src/phases/select-challenge-phase.ts
@@ -1,17 +1,13 @@
 import { globalScene } from "#app/global-scene";
 import { Phase } from "#app/phase";
-import { Mode } from "#app/ui/ui";
+import { UiMode } from "#enums/ui-mode";
 
 export class SelectChallengePhase extends Phase {
-  constructor() {
-    super();
-  }
-
   start() {
     super.start();
 
     globalScene.playBgm("menu");
 
-    globalScene.ui.setMode(Mode.CHALLENGE_SELECT);
+    globalScene.ui.setMode(UiMode.CHALLENGE_SELECT);
   }
 }
diff --git a/src/phases/select-gender-phase.ts b/src/phases/select-gender-phase.ts
index 45cbb70dcac..a1171c1a5db 100644
--- a/src/phases/select-gender-phase.ts
+++ b/src/phases/select-gender-phase.ts
@@ -2,19 +2,15 @@ import { globalScene } from "#app/global-scene";
 import { PlayerGender } from "#app/enums/player-gender";
 import { Phase } from "#app/phase";
 import { SettingKeys } from "#app/system/settings/settings";
-import { Mode } from "#app/ui/ui";
+import { UiMode } from "#enums/ui-mode";
 import i18next from "i18next";
 
 export class SelectGenderPhase extends Phase {
-  constructor() {
-    super();
-  }
-
   start(): void {
     super.start();
 
     globalScene.ui.showText(i18next.t("menu:boyOrGirl"), null, () => {
-      globalScene.ui.setMode(Mode.OPTION_SELECT, {
+      globalScene.ui.setMode(UiMode.OPTION_SELECT, {
         options: [
           {
             label: i18next.t("settings:boy"),
@@ -23,7 +19,7 @@ export class SelectGenderPhase extends Phase {
               globalScene.gameData.saveSetting(SettingKeys.Player_Gender, 0);
               globalScene.gameData.saveSystem().then(() => this.end());
               return true;
-            }
+            },
           },
           {
             label: i18next.t("settings:girl"),
@@ -32,15 +28,15 @@ export class SelectGenderPhase extends Phase {
               globalScene.gameData.saveSetting(SettingKeys.Player_Gender, 1);
               globalScene.gameData.saveSystem().then(() => this.end());
               return true;
-            }
-          }
-        ]
+            },
+          },
+        ],
       });
     });
   }
 
   end(): void {
-    globalScene.ui.setMode(Mode.MESSAGE);
+    globalScene.ui.setMode(UiMode.MESSAGE);
     super.end();
   }
 }
diff --git a/src/phases/select-modifier-phase.ts b/src/phases/select-modifier-phase.ts
index 3b9a0a0405c..5f11441333b 100644
--- a/src/phases/select-modifier-phase.ts
+++ b/src/phases/select-modifier-phase.ts
@@ -1,19 +1,35 @@
 import { globalScene } from "#app/global-scene";
 import type { ModifierTier } from "#app/modifier/modifier-tier";
 import type { ModifierTypeOption, ModifierType } from "#app/modifier/modifier-type";
-import { regenerateModifierPoolThresholds, getPlayerShopModifierTypeOptionsForWave, PokemonModifierType, FusePokemonModifierType, PokemonMoveModifierType, TmModifierType, RememberMoveModifierType, PokemonPpRestoreModifierType, PokemonPpUpModifierType, ModifierPoolType, getPlayerModifierTypeOptions } from "#app/modifier/modifier-type";
+import {
+  regenerateModifierPoolThresholds,
+  getPlayerShopModifierTypeOptionsForWave,
+  PokemonModifierType,
+  FusePokemonModifierType,
+  PokemonMoveModifierType,
+  TmModifierType,
+  RememberMoveModifierType,
+  PokemonPpRestoreModifierType,
+  PokemonPpUpModifierType,
+  ModifierPoolType,
+  getPlayerModifierTypeOptions,
+} from "#app/modifier/modifier-type";
 import type { Modifier } from "#app/modifier/modifier";
-import { ExtraModifierModifier, HealShopCostModifier, PokemonHeldItemModifier, TempExtraModifierModifier } from "#app/modifier/modifier";
+import {
+  ExtraModifierModifier,
+  HealShopCostModifier,
+  PokemonHeldItemModifier,
+  TempExtraModifierModifier,
+} from "#app/modifier/modifier";
 import type ModifierSelectUiHandler from "#app/ui/modifier-select-ui-handler";
 import { SHOP_OPTIONS_ROW_LIMIT } from "#app/ui/modifier-select-ui-handler";
 import PartyUiHandler, { PartyUiMode, PartyOption } from "#app/ui/party-ui-handler";
-import { Mode } from "#app/ui/ui";
+import { UiMode } from "#enums/ui-mode";
 import i18next from "i18next";
-import * as Utils from "#app/utils";
 import { BattlePhase } from "./battle-phase";
 import Overrides from "#app/overrides";
 import type { CustomModifierSettings } from "#app/modifier/modifier-type";
-import { isNullOrUndefined, NumberHolder } from "#app/utils";
+import { isNullOrUndefined, NumberHolder } from "#app/utils/common";
 
 export class SelectModifierPhase extends BattlePhase {
   private rerollCount: number;
@@ -23,7 +39,12 @@ export class SelectModifierPhase extends BattlePhase {
 
   private typeOptions: ModifierTypeOption[];
 
-  constructor(rerollCount: number = 0, modifierTiers?: ModifierTier[], customModifierSettings?: CustomModifierSettings, isCopy: boolean = false) {
+  constructor(
+    rerollCount = 0,
+    modifierTiers?: ModifierTier[],
+    customModifierSettings?: CustomModifierSettings,
+    isCopy = false,
+  ) {
     super();
 
     this.rerollCount = rerollCount;
@@ -45,15 +66,16 @@ export class SelectModifierPhase extends BattlePhase {
     if (!this.isCopy) {
       regenerateModifierPoolThresholds(party, this.getPoolType(), this.rerollCount);
     }
-    const modifierCount = new Utils.IntegerHolder(3);
+    const modifierCount = new NumberHolder(3);
     if (this.isPlayer()) {
       globalScene.applyModifiers(ExtraModifierModifier, true, modifierCount);
       globalScene.applyModifiers(TempExtraModifierModifier, true, modifierCount);
     }
 
     // If custom modifiers are specified, overrides default item count
-    if (!!this.customModifierSettings) {
-      const newItemCount = (this.customModifierSettings.guaranteedModifierTiers?.length || 0) +
+    if (this.customModifierSettings) {
+      const newItemCount =
+        (this.customModifierSettings.guaranteedModifierTiers?.length || 0) +
         (this.customModifierSettings.guaranteedModifierTypeOptions?.length || 0) +
         (this.customModifierSettings.guaranteedModifierTypeFuncs?.length || 0);
       if (this.customModifierSettings.fillRemaining) {
@@ -69,11 +91,22 @@ export class SelectModifierPhase extends BattlePhase {
     const modifierSelectCallback = (rowCursor: number, cursor: number) => {
       if (rowCursor < 0 || cursor < 0) {
         globalScene.ui.showText(i18next.t("battle:skipItemQuestion"), null, () => {
-          globalScene.ui.setOverlayMode(Mode.CONFIRM, () => {
-            globalScene.ui.revertMode();
-            globalScene.ui.setMode(Mode.MESSAGE);
-            super.end();
-          }, () => globalScene.ui.setMode(Mode.MODIFIER_SELECT, this.isPlayer(), this.typeOptions, modifierSelectCallback, this.getRerollCost(globalScene.lockModifierTiers)));
+          globalScene.ui.setOverlayMode(
+            UiMode.CONFIRM,
+            () => {
+              globalScene.ui.revertMode();
+              globalScene.ui.setMode(UiMode.MESSAGE);
+              super.end();
+            },
+            () =>
+              globalScene.ui.setMode(
+                UiMode.MODIFIER_SELECT,
+                this.isPlayer(),
+                this.typeOptions,
+                modifierSelectCallback,
+                this.getRerollCost(globalScene.lockModifierTiers),
+              ),
+          );
         });
         return false;
       }
@@ -87,34 +120,74 @@ export class SelectModifierPhase extends BattlePhase {
               if (rerollCost < 0 || globalScene.money < rerollCost) {
                 globalScene.ui.playError();
                 return false;
-              } else {
-                globalScene.reroll = true;
-                globalScene.unshiftPhase(new SelectModifierPhase(this.rerollCount + 1, this.typeOptions.map(o => o.type?.tier).filter(t => t !== undefined) as ModifierTier[]));
-                globalScene.ui.clearText();
-                globalScene.ui.setMode(Mode.MESSAGE).then(() => super.end());
-                if (!Overrides.WAIVE_ROLL_FEE_OVERRIDE) {
-                  globalScene.money -= rerollCost;
-                  globalScene.updateMoneyText();
-                  globalScene.animateMoneyChanged(false);
-                }
-                globalScene.playSound("se/buy");
               }
+              globalScene.reroll = true;
+              globalScene.unshiftPhase(
+                new SelectModifierPhase(
+                  this.rerollCount + 1,
+                  this.typeOptions.map(o => o.type?.tier).filter(t => t !== undefined) as ModifierTier[],
+                ),
+              );
+              globalScene.ui.clearText();
+              globalScene.ui.setMode(UiMode.MESSAGE).then(() => super.end());
+              if (!Overrides.WAIVE_ROLL_FEE_OVERRIDE) {
+                globalScene.money -= rerollCost;
+                globalScene.updateMoneyText();
+                globalScene.animateMoneyChanged(false);
+              }
+              globalScene.playSound("se/buy");
               break;
             case 1:
-              globalScene.ui.setModeWithoutClear(Mode.PARTY, PartyUiMode.MODIFIER_TRANSFER, -1, (fromSlotIndex: number, itemIndex: number, itemQuantity: number, toSlotIndex: number) => {
-                if (toSlotIndex !== undefined && fromSlotIndex < 6 && toSlotIndex < 6 && fromSlotIndex !== toSlotIndex && itemIndex > -1) {
-                  const itemModifiers = globalScene.findModifiers(m => m instanceof PokemonHeldItemModifier
-                      && m.isTransferable && m.pokemonId === party[fromSlotIndex].id) as PokemonHeldItemModifier[];
-                  const itemModifier = itemModifiers[itemIndex];
-                  globalScene.tryTransferHeldItemModifier(itemModifier, party[toSlotIndex], true, itemQuantity, undefined, undefined, false);
-                } else {
-                  globalScene.ui.setMode(Mode.MODIFIER_SELECT, this.isPlayer(), this.typeOptions, modifierSelectCallback, this.getRerollCost(globalScene.lockModifierTiers));
-                }
-              }, PartyUiHandler.FilterItemMaxStacks);
+              globalScene.ui.setModeWithoutClear(
+                UiMode.PARTY,
+                PartyUiMode.MODIFIER_TRANSFER,
+                -1,
+                (fromSlotIndex: number, itemIndex: number, itemQuantity: number, toSlotIndex: number) => {
+                  if (
+                    toSlotIndex !== undefined &&
+                    fromSlotIndex < 6 &&
+                    toSlotIndex < 6 &&
+                    fromSlotIndex !== toSlotIndex &&
+                    itemIndex > -1
+                  ) {
+                    const itemModifiers = globalScene.findModifiers(
+                      m =>
+                        m instanceof PokemonHeldItemModifier &&
+                        m.isTransferable &&
+                        m.pokemonId === party[fromSlotIndex].id,
+                    ) as PokemonHeldItemModifier[];
+                    const itemModifier = itemModifiers[itemIndex];
+                    globalScene.tryTransferHeldItemModifier(
+                      itemModifier,
+                      party[toSlotIndex],
+                      true,
+                      itemQuantity,
+                      undefined,
+                      undefined,
+                      false,
+                    );
+                  } else {
+                    globalScene.ui.setMode(
+                      UiMode.MODIFIER_SELECT,
+                      this.isPlayer(),
+                      this.typeOptions,
+                      modifierSelectCallback,
+                      this.getRerollCost(globalScene.lockModifierTiers),
+                    );
+                  }
+                },
+                PartyUiHandler.FilterItemMaxStacks,
+              );
               break;
             case 2:
-              globalScene.ui.setModeWithoutClear(Mode.PARTY, PartyUiMode.CHECK, -1, () => {
-                globalScene.ui.setMode(Mode.MODIFIER_SELECT, this.isPlayer(), this.typeOptions, modifierSelectCallback, this.getRerollCost(globalScene.lockModifierTiers));
+              globalScene.ui.setModeWithoutClear(UiMode.PARTY, PartyUiMode.CHECK, -1, () => {
+                globalScene.ui.setMode(
+                  UiMode.MODIFIER_SELECT,
+                  this.isPlayer(),
+                  this.typeOptions,
+                  modifierSelectCallback,
+                  this.getRerollCost(globalScene.lockModifierTiers),
+                );
               });
               break;
             case 3:
@@ -134,7 +207,7 @@ export class SelectModifierPhase extends BattlePhase {
         case 1:
           if (this.typeOptions.length === 0) {
             globalScene.ui.clearText();
-            globalScene.ui.setMode(Mode.MESSAGE);
+            globalScene.ui.setMode(UiMode.MESSAGE);
             super.end();
             return true;
           }
@@ -143,8 +216,14 @@ export class SelectModifierPhase extends BattlePhase {
           }
           break;
         default:
-          const shopOptions = getPlayerShopModifierTypeOptionsForWave(globalScene.currentBattle.waveIndex, globalScene.getWaveMoneyAmount(1));
-          const shopOption = shopOptions[rowCursor > 2 || shopOptions.length <= SHOP_OPTIONS_ROW_LIMIT ? cursor : cursor + SHOP_OPTIONS_ROW_LIMIT];
+          const shopOptions = getPlayerShopModifierTypeOptionsForWave(
+            globalScene.currentBattle.waveIndex,
+            globalScene.getWaveMoneyAmount(1),
+          );
+          const shopOption =
+            shopOptions[
+              rowCursor > 2 || shopOptions.length <= SHOP_OPTIONS_ROW_LIMIT ? cursor : cursor + SHOP_OPTIONS_ROW_LIMIT
+            ];
           if (shopOption.type) {
             modifierType = shopOption.type;
           }
@@ -155,96 +234,130 @@ export class SelectModifierPhase extends BattlePhase {
           break;
       }
 
-      if (cost! && (globalScene.money < cost) && !Overrides.WAIVE_ROLL_FEE_OVERRIDE) { // TODO: is the bang on cost correct?
+      if (cost! && globalScene.money < cost && !Overrides.WAIVE_ROLL_FEE_OVERRIDE) {
+        // TODO: is the bang on cost correct?
         globalScene.ui.playError();
         return false;
       }
 
-      const applyModifier = (modifier: Modifier, playSound: boolean = false) => {
+      const applyModifier = (modifier: Modifier, playSound = false) => {
         const result = globalScene.addModifier(modifier, false, playSound, undefined, undefined, cost);
         // Queue a copy of this phase when applying a TM or Memory Mushroom.
         // If the player selects either of these, then escapes out of consuming them,
         // they are returned to a shop in the same state.
-        if (modifier.type instanceof RememberMoveModifierType ||
-            modifier.type instanceof TmModifierType) {
+        if (modifier.type instanceof RememberMoveModifierType || modifier.type instanceof TmModifierType) {
           globalScene.unshiftPhase(this.copy());
         }
 
         if (cost && !(modifier.type instanceof RememberMoveModifierType)) {
-          result.then(success => {
-            if (success) {
-              if (!Overrides.WAIVE_ROLL_FEE_OVERRIDE) {
-                globalScene.money -= cost;
-                globalScene.updateMoneyText();
-                globalScene.animateMoneyChanged(false);
-              }
-              globalScene.playSound("se/buy");
-              (globalScene.ui.getHandler() as ModifierSelectUiHandler).updateCostText();
-            } else {
-              globalScene.ui.playError();
+          if (result) {
+            if (!Overrides.WAIVE_ROLL_FEE_OVERRIDE) {
+              globalScene.money -= cost;
+              globalScene.updateMoneyText();
+              globalScene.animateMoneyChanged(false);
             }
-          });
-        } else {
-          const doEnd = () => {
-            globalScene.ui.clearText();
-            globalScene.ui.setMode(Mode.MESSAGE);
-            super.end();
-          };
-          if (result instanceof Promise) {
-            result.then(() => doEnd());
+            globalScene.playSound("se/buy");
+            (globalScene.ui.getHandler() as ModifierSelectUiHandler).updateCostText();
           } else {
-            doEnd();
+            globalScene.ui.playError();
           }
+        } else {
+          globalScene.ui.clearText();
+          globalScene.ui.setMode(UiMode.MESSAGE);
+          super.end();
         }
       };
 
-      if (modifierType! instanceof PokemonModifierType) { //TODO: is the bang correct?
+      if (modifierType! instanceof PokemonModifierType) {
+        //TODO: is the bang correct?
         if (modifierType instanceof FusePokemonModifierType) {
-          globalScene.ui.setModeWithoutClear(Mode.PARTY, PartyUiMode.SPLICE, -1, (fromSlotIndex: number, spliceSlotIndex: number) => {
-            if (spliceSlotIndex !== undefined && fromSlotIndex < 6 && spliceSlotIndex < 6 && fromSlotIndex !== spliceSlotIndex) {
-              globalScene.ui.setMode(Mode.MODIFIER_SELECT, this.isPlayer()).then(() => {
-                const modifier = modifierType.newModifier(party[fromSlotIndex], party[spliceSlotIndex])!; //TODO: is the bang correct?
-                applyModifier(modifier, true);
-              });
-            } else {
-              globalScene.ui.setMode(Mode.MODIFIER_SELECT, this.isPlayer(), this.typeOptions, modifierSelectCallback, this.getRerollCost(globalScene.lockModifierTiers));
-            }
-          }, modifierType.selectFilter);
+          globalScene.ui.setModeWithoutClear(
+            UiMode.PARTY,
+            PartyUiMode.SPLICE,
+            -1,
+            (fromSlotIndex: number, spliceSlotIndex: number) => {
+              if (
+                spliceSlotIndex !== undefined &&
+                fromSlotIndex < 6 &&
+                spliceSlotIndex < 6 &&
+                fromSlotIndex !== spliceSlotIndex
+              ) {
+                globalScene.ui.setMode(UiMode.MODIFIER_SELECT, this.isPlayer()).then(() => {
+                  const modifier = modifierType.newModifier(party[fromSlotIndex], party[spliceSlotIndex])!; //TODO: is the bang correct?
+                  applyModifier(modifier, true);
+                });
+              } else {
+                globalScene.ui.setMode(
+                  UiMode.MODIFIER_SELECT,
+                  this.isPlayer(),
+                  this.typeOptions,
+                  modifierSelectCallback,
+                  this.getRerollCost(globalScene.lockModifierTiers),
+                );
+              }
+            },
+            modifierType.selectFilter,
+          );
         } else {
           const pokemonModifierType = modifierType as PokemonModifierType;
           const isMoveModifier = modifierType instanceof PokemonMoveModifierType;
           const isTmModifier = modifierType instanceof TmModifierType;
           const isRememberMoveModifier = modifierType instanceof RememberMoveModifierType;
-          const isPpRestoreModifier = (modifierType instanceof PokemonPpRestoreModifierType || modifierType instanceof PokemonPpUpModifierType);
-          const partyUiMode = isMoveModifier ? PartyUiMode.MOVE_MODIFIER
-            : isTmModifier ? PartyUiMode.TM_MODIFIER
-              : isRememberMoveModifier ? PartyUiMode.REMEMBER_MOVE_MODIFIER
+          const isPpRestoreModifier =
+            modifierType instanceof PokemonPpRestoreModifierType || modifierType instanceof PokemonPpUpModifierType;
+          const partyUiMode = isMoveModifier
+            ? PartyUiMode.MOVE_MODIFIER
+            : isTmModifier
+              ? PartyUiMode.TM_MODIFIER
+              : isRememberMoveModifier
+                ? PartyUiMode.REMEMBER_MOVE_MODIFIER
                 : PartyUiMode.MODIFIER;
-          const tmMoveId = isTmModifier
-            ? (modifierType as TmModifierType).moveId
-            : undefined;
-          globalScene.ui.setModeWithoutClear(Mode.PARTY, partyUiMode, -1, (slotIndex: number, option: PartyOption) => {
-            if (slotIndex < 6) {
-              globalScene.ui.setMode(Mode.MODIFIER_SELECT, this.isPlayer()).then(() => {
-                const modifier = !isMoveModifier
-                  ? !isRememberMoveModifier
-                    ? modifierType.newModifier(party[slotIndex])
-                    : modifierType.newModifier(party[slotIndex], option as number)
-                  : modifierType.newModifier(party[slotIndex], option - PartyOption.MOVE_1);
-                applyModifier(modifier!, true); // TODO: is the bang correct?
-              });
-            } else {
-              globalScene.ui.setMode(Mode.MODIFIER_SELECT, this.isPlayer(), this.typeOptions, modifierSelectCallback, this.getRerollCost(globalScene.lockModifierTiers));
-            }
-          }, pokemonModifierType.selectFilter, modifierType instanceof PokemonMoveModifierType ? (modifierType as PokemonMoveModifierType).moveSelectFilter : undefined, tmMoveId, isPpRestoreModifier);
+          const tmMoveId = isTmModifier ? (modifierType as TmModifierType).moveId : undefined;
+          globalScene.ui.setModeWithoutClear(
+            UiMode.PARTY,
+            partyUiMode,
+            -1,
+            (slotIndex: number, option: PartyOption) => {
+              if (slotIndex < 6) {
+                globalScene.ui.setMode(UiMode.MODIFIER_SELECT, this.isPlayer()).then(() => {
+                  const modifier = !isMoveModifier
+                    ? !isRememberMoveModifier
+                      ? modifierType.newModifier(party[slotIndex])
+                      : modifierType.newModifier(party[slotIndex], option as number)
+                    : modifierType.newModifier(party[slotIndex], option - PartyOption.MOVE_1);
+                  applyModifier(modifier!, true); // TODO: is the bang correct?
+                });
+              } else {
+                globalScene.ui.setMode(
+                  UiMode.MODIFIER_SELECT,
+                  this.isPlayer(),
+                  this.typeOptions,
+                  modifierSelectCallback,
+                  this.getRerollCost(globalScene.lockModifierTiers),
+                );
+              }
+            },
+            pokemonModifierType.selectFilter,
+            modifierType instanceof PokemonMoveModifierType
+              ? (modifierType as PokemonMoveModifierType).moveSelectFilter
+              : undefined,
+            tmMoveId,
+            isPpRestoreModifier,
+          );
         }
       } else {
         applyModifier(modifierType!.newModifier()!); // TODO: is the bang correct?
       }
 
-      return !cost!;// TODO: is the bang correct?
+      return !cost!; // TODO: is the bang correct?
     };
-    globalScene.ui.setMode(Mode.MODIFIER_SELECT, this.isPlayer(), this.typeOptions, modifierSelectCallback, this.getRerollCost(globalScene.lockModifierTiers));
+    globalScene.ui.setMode(
+      UiMode.MODIFIER_SELECT,
+      this.isPlayer(),
+      this.typeOptions,
+      modifierSelectCallback,
+      this.getRerollCost(globalScene.lockModifierTiers),
+    );
   }
 
   updateSeed(): void {
@@ -259,8 +372,9 @@ export class SelectModifierPhase extends BattlePhase {
     let baseValue = 0;
     if (Overrides.WAIVE_ROLL_FEE_OVERRIDE) {
       return baseValue;
-    } else if (lockRarities) {
-      const tierValues = [ 50, 125, 300, 750, 2000 ];
+    }
+    if (lockRarities) {
+      const tierValues = [50, 125, 300, 750, 2000];
       for (const opt of this.typeOptions) {
         baseValue += tierValues[opt.type.tier ?? 0];
       }
@@ -279,7 +393,10 @@ export class SelectModifierPhase extends BattlePhase {
       multiplier = this.customModifierSettings.rerollMultiplier;
     }
 
-    const baseMultiplier = Math.min(Math.ceil(globalScene.currentBattle.waveIndex / 10) * baseValue * (2 ** this.rerollCount) * multiplier, Number.MAX_SAFE_INTEGER);
+    const baseMultiplier = Math.min(
+      Math.ceil(globalScene.currentBattle.waveIndex / 10) * baseValue * 2 ** this.rerollCount * multiplier,
+      Number.MAX_SAFE_INTEGER,
+    );
 
     // Apply Black Sludge to reroll cost
     const modifiedRerollCost = new NumberHolder(baseMultiplier);
@@ -292,19 +409,28 @@ export class SelectModifierPhase extends BattlePhase {
   }
 
   getModifierTypeOptions(modifierCount: number): ModifierTypeOption[] {
-    return getPlayerModifierTypeOptions(modifierCount, globalScene.getPlayerParty(), globalScene.lockModifierTiers ? this.modifierTiers : undefined, this.customModifierSettings);
+    return getPlayerModifierTypeOptions(
+      modifierCount,
+      globalScene.getPlayerParty(),
+      globalScene.lockModifierTiers ? this.modifierTiers : undefined,
+      this.customModifierSettings,
+    );
   }
 
   copy(): SelectModifierPhase {
     return new SelectModifierPhase(
       this.rerollCount,
       this.modifierTiers,
-      { guaranteedModifierTypeOptions: this.typeOptions, rerollMultiplier: this.customModifierSettings?.rerollMultiplier, allowLuckUpgrades: false },
-      true
+      {
+        guaranteedModifierTypeOptions: this.typeOptions,
+        rerollMultiplier: this.customModifierSettings?.rerollMultiplier,
+        allowLuckUpgrades: false,
+      },
+      true,
     );
   }
 
-  addModifier(modifier: Modifier): Promise<boolean> {
+  addModifier(modifier: Modifier): boolean {
     return globalScene.addModifier(modifier, false, true);
   }
 }
diff --git a/src/phases/select-starter-phase.ts b/src/phases/select-starter-phase.ts
index 79012901a3a..0a76df31a2c 100644
--- a/src/phases/select-starter-phase.ts
+++ b/src/phases/select-starter-phase.ts
@@ -9,24 +9,20 @@ import { Phase } from "#app/phase";
 import { TitlePhase } from "#app/phases/title-phase";
 import { SaveSlotUiMode } from "#app/ui/save-slot-select-ui-handler";
 import type { Starter } from "#app/ui/starter-select-ui-handler";
-import { Mode } from "#app/ui/ui";
+import { UiMode } from "#enums/ui-mode";
 import type { Species } from "#enums/species";
 import SoundFade from "phaser3-rex-plugins/plugins/soundfade";
+import { isNullOrUndefined } from "#app/utils/common";
 
 export class SelectStarterPhase extends Phase {
-
-  constructor() {
-    super();
-  }
-
   start() {
     super.start();
 
     globalScene.playBgm("menu");
 
-    globalScene.ui.setMode(Mode.STARTER_SELECT, (starters: Starter[]) => {
+    globalScene.ui.setMode(UiMode.STARTER_SELECT, (starters: Starter[]) => {
       globalScene.ui.clearText();
-      globalScene.ui.setMode(Mode.SAVE_SLOT, SaveSlotUiMode.SAVE, (slotId: number) => {
+      globalScene.ui.setMode(UiMode.SAVE_SLOT, SaveSlotUiMode.SAVE, (slotId: number) => {
         if (slotId === -1) {
           globalScene.clearPhaseQueue();
           globalScene.pushPhase(new TitlePhase());
@@ -53,24 +49,36 @@ export class SelectStarterPhase extends Phase {
       let starterFormIndex = Math.min(starterProps.formIndex, Math.max(starter.species.forms.length - 1, 0));
       if (
         starter.species.speciesId in Overrides.STARTER_FORM_OVERRIDES &&
+        !isNullOrUndefined(Overrides.STARTER_FORM_OVERRIDES[starter.species.speciesId]) &&
         starter.species.forms[Overrides.STARTER_FORM_OVERRIDES[starter.species.speciesId]!]
       ) {
         starterFormIndex = Overrides.STARTER_FORM_OVERRIDES[starter.species.speciesId]!;
       }
 
-      let starterGender = starter.species.malePercent !== null
-        ? !starterProps.female ? Gender.MALE : Gender.FEMALE
-        : Gender.GENDERLESS;
+      let starterGender =
+        starter.species.malePercent !== null ? (!starterProps.female ? Gender.MALE : Gender.FEMALE) : Gender.GENDERLESS;
       if (Overrides.GENDER_OVERRIDE !== null) {
         starterGender = Overrides.GENDER_OVERRIDE;
       }
       const starterIvs = globalScene.gameData.dexData[starter.species.speciesId].ivs.slice(0);
-      const starterPokemon = globalScene.addPlayerPokemon(starter.species, globalScene.gameMode.getStartingLevel(), starter.abilityIndex, starterFormIndex, starterGender, starterProps.shiny, starterProps.variant, starterIvs, starter.nature);
+      const starterPokemon = globalScene.addPlayerPokemon(
+        starter.species,
+        globalScene.gameMode.getStartingLevel(),
+        starter.abilityIndex,
+        starterFormIndex,
+        starterGender,
+        starterProps.shiny,
+        starterProps.variant,
+        starterIvs,
+        starter.nature,
+      );
       starter.moveset && starterPokemon.tryPopulateMoveset(starter.moveset);
       if (starter.passive) {
         starterPokemon.passive = true;
       }
-      starterPokemon.luck = globalScene.gameData.getDexAttrLuck(globalScene.gameData.dexData[starter.species.speciesId].caughtAttr);
+      starterPokemon.luck = globalScene.gameData.getDexAttrLuck(
+        globalScene.gameData.dexData[starter.species.speciesId].caughtAttr,
+      );
       if (starter.pokerus) {
         starterPokemon.pokerus = true;
       }
@@ -79,11 +87,17 @@ export class SelectStarterPhase extends Phase {
         starterPokemon.nickname = starter.nickname;
       }
 
+      if (!isNullOrUndefined(starter.teraType)) {
+        starterPokemon.teraType = starter.teraType;
+      } else {
+        starterPokemon.teraType = starterPokemon.species.type1;
+      }
+
       if (globalScene.gameMode.isSplicedOnly || Overrides.STARTER_FUSION_OVERRIDE) {
         starterPokemon.generateFusionSpecies(true);
       }
       starterPokemon.setVisible(false);
-      applyChallenges(globalScene.gameMode, ChallengeType.STARTER_MODIFY, starterPokemon);
+      applyChallenges(ChallengeType.STARTER_MODIFY, starterPokemon);
       party.push(starterPokemon);
       loadPokemonAssets.push(starterPokemon.loadAssets());
     });
@@ -102,7 +116,7 @@ export class SelectStarterPhase extends Phase {
       globalScene.sessionPlayTime = 0;
       globalScene.lastSavePlayTime = 0;
       // Ensures Keldeo (or any future Pokemon that have this type of form change) starts in the correct form
-      globalScene.getPlayerParty().forEach((p) => {
+      globalScene.getPlayerParty().forEach(p => {
         globalScene.triggerPokemonFormChange(p, SpeciesFormChangeMoveLearnedTrigger);
       });
       this.end();
diff --git a/src/phases/select-target-phase.ts b/src/phases/select-target-phase.ts
index a30ef9000a5..c969b9ca421 100644
--- a/src/phases/select-target-phase.ts
+++ b/src/phases/select-target-phase.ts
@@ -1,13 +1,14 @@
 import { globalScene } from "#app/global-scene";
 import type { BattlerIndex } from "#app/battle";
 import { Command } from "#app/ui/command-ui-handler";
-import { Mode } from "#app/ui/ui";
+import { UiMode } from "#enums/ui-mode";
 import { CommandPhase } from "./command-phase";
 import { PokemonPhase } from "./pokemon-phase";
 import i18next from "#app/plugins/i18n";
-import { allMoves } from "#app/data/move";
+import { allMoves } from "#app/data/moves/move";
 
 export class SelectTargetPhase extends PokemonPhase {
+  // biome-ignore lint/complexity/noUselessConstructor: This makes `fieldIndex` required
   constructor(fieldIndex: number) {
     super(fieldIndex);
   }
@@ -17,13 +18,15 @@ export class SelectTargetPhase extends PokemonPhase {
 
     const turnCommand = globalScene.currentBattle.turnCommands[this.fieldIndex];
     const move = turnCommand?.move?.move;
-    globalScene.ui.setMode(Mode.TARGET_SELECT, this.fieldIndex, move, (targets: BattlerIndex[]) => {
-      globalScene.ui.setMode(Mode.MESSAGE);
+    globalScene.ui.setMode(UiMode.TARGET_SELECT, this.fieldIndex, move, (targets: BattlerIndex[]) => {
+      globalScene.ui.setMode(UiMode.MESSAGE);
       const fieldSide = globalScene.getField();
       const user = fieldSide[this.fieldIndex];
       const moveObject = allMoves[move!];
       if (moveObject && user.isMoveTargetRestricted(moveObject.id, user, fieldSide[targets[0]])) {
-        const errorMessage = user.getRestrictingTag(move!, user, fieldSide[targets[0]])!.selectionDeniedText(user, moveObject.id);
+        const errorMessage = user
+          .getRestrictingTag(move!, user, fieldSide[targets[0]])!
+          .selectionDeniedText(user, moveObject.id);
         globalScene.queueMessage(i18next.t(errorMessage, { moveName: moveObject.name }), 0, true);
         targets = [];
       }
@@ -31,10 +34,10 @@ export class SelectTargetPhase extends PokemonPhase {
         globalScene.currentBattle.turnCommands[this.fieldIndex] = null;
         globalScene.unshiftPhase(new CommandPhase(this.fieldIndex));
       } else {
-          turnCommand!.targets = targets; //TODO: is the bang correct here?
+        turnCommand!.targets = targets; //TODO: is the bang correct here?
       }
       if (turnCommand?.command === Command.BALL && this.fieldIndex) {
-          globalScene.currentBattle.turnCommands[this.fieldIndex - 1]!.skip = true; //TODO: is the bang correct here?
+        globalScene.currentBattle.turnCommands[this.fieldIndex - 1]!.skip = true; //TODO: is the bang correct here?
       }
       this.end();
     });
diff --git a/src/phases/shiny-sparkle-phase.ts b/src/phases/shiny-sparkle-phase.ts
index 2540d98fb79..87a7db29cf6 100644
--- a/src/phases/shiny-sparkle-phase.ts
+++ b/src/phases/shiny-sparkle-phase.ts
@@ -3,6 +3,7 @@ import type { BattlerIndex } from "#app/battle";
 import { PokemonPhase } from "./pokemon-phase";
 
 export class ShinySparklePhase extends PokemonPhase {
+  // biome-ignore lint/complexity/noUselessConstructor: This makes `battlerIndex` required
   constructor(battlerIndex: BattlerIndex) {
     super(battlerIndex);
   }
diff --git a/src/phases/show-ability-phase.ts b/src/phases/show-ability-phase.ts
index a0db660ded5..d6193ac3946 100644
--- a/src/phases/show-ability-phase.ts
+++ b/src/phases/show-ability-phase.ts
@@ -1,29 +1,58 @@
 import { globalScene } from "#app/global-scene";
 import type { BattlerIndex } from "#app/battle";
 import { PokemonPhase } from "./pokemon-phase";
+import { getPokemonNameWithAffix } from "#app/messages";
+import { HideAbilityPhase } from "#app/phases/hide-ability-phase";
 
 export class ShowAbilityPhase extends PokemonPhase {
   private passive: boolean;
+  private pokemonName: string;
+  private abilityName: string;
+  private pokemonOnField: boolean;
 
-  constructor(battlerIndex: BattlerIndex, passive: boolean = false) {
+  constructor(battlerIndex: BattlerIndex, passive = false) {
     super(battlerIndex);
 
     this.passive = passive;
+
+    const pokemon = this.getPokemon();
+    if (pokemon) {
+      // Set these now as the pokemon object may change before the queued phase is run
+      this.pokemonName = getPokemonNameWithAffix(pokemon);
+      this.abilityName = (passive ? this.getPokemon().getPassiveAbility() : this.getPokemon().getAbility()).name;
+      this.pokemonOnField = true;
+    } else {
+      this.pokemonOnField = false;
+    }
   }
 
   start() {
     super.start();
 
-    const pokemon = this.getPokemon();
-
-    if (pokemon) {
-      globalScene.abilityBar.showAbility(pokemon, this.passive);
-
-      if (pokemon?.battleData) {
-        pokemon.battleData.abilityRevealed = true;
-      }
+    if (!this.pokemonOnField || !this.getPokemon()) {
+      return this.end();
     }
 
-    this.end();
+    // If the bar is already out, hide it before showing the new one
+    if (globalScene.abilityBar.isVisible()) {
+      globalScene.unshiftPhase(new HideAbilityPhase());
+      globalScene.unshiftPhase(new ShowAbilityPhase(this.battlerIndex, this.passive));
+      return this.end();
+    }
+
+    const pokemon = this.getPokemon();
+
+    if (!pokemon.isPlayer()) {
+      /** If its an enemy pokemon, list it as last enemy to use ability or move */
+      globalScene.currentBattle.lastEnemyInvolved = pokemon.getBattlerIndex() % 2;
+    } else {
+      globalScene.currentBattle.lastPlayerInvolved = pokemon.getBattlerIndex() % 2;
+    }
+
+    globalScene.abilityBar.showAbility(this.pokemonName, this.abilityName, this.passive, this.player).then(() => {
+      pokemon.waveData.abilityRevealed = true;
+
+      this.end();
+    });
   }
 }
diff --git a/src/phases/show-party-exp-bar-phase.ts b/src/phases/show-party-exp-bar-phase.ts
index 004592bc335..89bec6d8fdd 100644
--- a/src/phases/show-party-exp-bar-phase.ts
+++ b/src/phases/show-party-exp-bar-phase.ts
@@ -2,7 +2,7 @@ import { globalScene } from "#app/global-scene";
 import { ExpGainsSpeed } from "#app/enums/exp-gains-speed";
 import { ExpNotification } from "#app/enums/exp-notification";
 import { ExpBoosterModifier } from "#app/modifier/modifier";
-import * as Utils from "#app/utils";
+import { NumberHolder } from "#app/utils/common";
 import { HidePartyExpBarPhase } from "./hide-party-exp-bar-phase";
 import { LevelUpPhase } from "./level-up-phase";
 import { PlayerPartyMemberPokemonPhase } from "./player-party-member-pokemon-phase";
@@ -20,7 +20,7 @@ export class ShowPartyExpBarPhase extends PlayerPartyMemberPokemonPhase {
     super.start();
 
     const pokemon = this.getPokemon();
-    const exp = new Utils.NumberHolder(this.expValue);
+    const exp = new NumberHolder(this.expValue);
     globalScene.applyModifiers(ExpBoosterModifier, true, exp);
     exp.value = Math.floor(exp.value);
 
@@ -36,12 +36,15 @@ export class ShowPartyExpBarPhase extends PlayerPartyMemberPokemonPhase {
     if (globalScene.expParty === ExpNotification.SKIP) {
       this.end();
     } else if (globalScene.expParty === ExpNotification.ONLY_LEVEL_UP) {
-      if (newLevel > lastLevel) { // this means if we level up
+      if (newLevel > lastLevel) {
+        // this means if we level up
         // instead of displaying the exp gain in the small frame, we display the new level
         // we use the same method for mode 0 & 1, by giving a parameter saying to display the exp or the level
-        globalScene.partyExpBar.showPokemonExp(pokemon, exp.value, globalScene.expParty === ExpNotification.ONLY_LEVEL_UP, newLevel).then(() => {
-          setTimeout(() => this.end(), 800 / Math.pow(2, globalScene.expGainsSpeed));
-        });
+        globalScene.partyExpBar
+          .showPokemonExp(pokemon, exp.value, globalScene.expParty === ExpNotification.ONLY_LEVEL_UP, newLevel)
+          .then(() => {
+            setTimeout(() => this.end(), 800 / Math.pow(2, globalScene.expGainsSpeed));
+          });
       } else {
         this.end();
       }
@@ -52,6 +55,5 @@ export class ShowPartyExpBarPhase extends PlayerPartyMemberPokemonPhase {
     } else {
       this.end();
     }
-
   }
 }
diff --git a/src/phases/show-trainer-phase.ts b/src/phases/show-trainer-phase.ts
index 17106b54048..b6c1e345c70 100644
--- a/src/phases/show-trainer-phase.ts
+++ b/src/phases/show-trainer-phase.ts
@@ -3,10 +3,6 @@ import { PlayerGender } from "#app/enums/player-gender";
 import { BattlePhase } from "./battle-phase";
 
 export class ShowTrainerPhase extends BattlePhase {
-  constructor() {
-    super();
-  }
-
   start() {
     super.start();
 
@@ -18,7 +14,7 @@ export class ShowTrainerPhase extends BattlePhase {
       targets: globalScene.trainer,
       x: 106,
       duration: 1000,
-      onComplete: () => this.end()
+      onComplete: () => this.end(),
     });
   }
 }
diff --git a/src/phases/stat-stage-change-phase.ts b/src/phases/stat-stage-change-phase.ts
index 359610b320c..6731e45025c 100644
--- a/src/phases/stat-stage-change-phase.ts
+++ b/src/phases/stat-stage-change-phase.ts
@@ -1,17 +1,34 @@
 import { globalScene } from "#app/global-scene";
 import type { BattlerIndex } from "#app/battle";
-import { applyAbAttrs, applyPostStatStageChangeAbAttrs, applyPreStatStageChangeAbAttrs, PostStatStageChangeAbAttr, ProtectStatAbAttr, StatStageChangeCopyAbAttr, StatStageChangeMultiplierAbAttr } from "#app/data/ability";
+import {
+  applyAbAttrs,
+  applyPostStatStageChangeAbAttrs,
+  applyPreStatStageChangeAbAttrs,
+  ConditionalUserFieldProtectStatAbAttr,
+  PostStatStageChangeAbAttr,
+  ProtectStatAbAttr,
+  ReflectStatStageChangeAbAttr,
+  StatStageChangeCopyAbAttr,
+  StatStageChangeMultiplierAbAttr,
+} from "#app/data/abilities/ability";
 import { ArenaTagSide, MistTag } from "#app/data/arena-tag";
+import type { ArenaTag } from "#app/data/arena-tag";
 import type Pokemon from "#app/field/pokemon";
 import { getPokemonNameWithAffix } from "#app/messages";
 import { ResetNegativeStatStageModifier } from "#app/modifier/modifier";
 import { handleTutorial, Tutorial } from "#app/tutorial";
-import { NumberHolder, BooleanHolder } from "#app/utils";
+import { NumberHolder, BooleanHolder, isNullOrUndefined } from "#app/utils/common";
 import i18next from "i18next";
 import { PokemonPhase } from "./pokemon-phase";
 import { Stat, type BattleStat, getStatKey, getStatStageChangeDescriptionKey } from "#enums/stat";
+import { OctolockTag } from "#app/data/battler-tags";
+import { ArenaTagType } from "#app/enums/arena-tag-type";
 
-export type StatStageChangeCallback = (target: Pokemon | null, changed: BattleStat[], relativeChanges: number[]) => void;
+export type StatStageChangeCallback = (
+  target: Pokemon | null,
+  changed: BattleStat[],
+  relativeChanges: number[],
+) => void;
 
 export class StatStageChangePhase extends PokemonPhase {
   private stats: BattleStat[];
@@ -21,9 +38,21 @@ export class StatStageChangePhase extends PokemonPhase {
   private ignoreAbilities: boolean;
   private canBeCopied: boolean;
   private onChange: StatStageChangeCallback | null;
+  private comingFromMirrorArmorUser: boolean;
+  private comingFromStickyWeb: boolean;
 
-
-  constructor(battlerIndex: BattlerIndex, selfTarget: boolean, stats: BattleStat[], stages: number, showMessage: boolean = true, ignoreAbilities: boolean = false, canBeCopied: boolean = true, onChange: StatStageChangeCallback | null = null) {
+  constructor(
+    battlerIndex: BattlerIndex,
+    selfTarget: boolean,
+    stats: BattleStat[],
+    stages: number,
+    showMessage = true,
+    ignoreAbilities = false,
+    canBeCopied = true,
+    onChange: StatStageChangeCallback | null = null,
+    comingFromMirrorArmorUser = false,
+    comingFromStickyWeb = false,
+  ) {
     super(battlerIndex);
 
     this.selfTarget = selfTarget;
@@ -33,20 +62,67 @@ export class StatStageChangePhase extends PokemonPhase {
     this.ignoreAbilities = ignoreAbilities;
     this.canBeCopied = canBeCopied;
     this.onChange = onChange;
+    this.comingFromMirrorArmorUser = comingFromMirrorArmorUser;
+    this.comingFromStickyWeb = comingFromStickyWeb;
   }
 
   start() {
-
     // Check if multiple stats are being changed at the same time, then run SSCPhase for each of them
     if (this.stats.length > 1) {
       for (let i = 0; i < this.stats.length; i++) {
-        const stat = [ this.stats[i] ];
-        globalScene.unshiftPhase(new StatStageChangePhase(this.battlerIndex, this.selfTarget, stat, this.stages, this.showMessage, this.ignoreAbilities, this.canBeCopied, this.onChange));
+        const stat = [this.stats[i]];
+        globalScene.unshiftPhase(
+          new StatStageChangePhase(
+            this.battlerIndex,
+            this.selfTarget,
+            stat,
+            this.stages,
+            this.showMessage,
+            this.ignoreAbilities,
+            this.canBeCopied,
+            this.onChange,
+            this.comingFromMirrorArmorUser,
+          ),
+        );
       }
       return this.end();
     }
 
     const pokemon = this.getPokemon();
+    let opponentPokemon: Pokemon | undefined;
+
+    /** Gets the position of last enemy or player pokemon that used ability or move, primarily for double battles involving Mirror Armor */
+    if (pokemon.isPlayer()) {
+      /** If this SSCP is not from sticky web, then we find the opponent pokemon that last did something */
+      if (!this.comingFromStickyWeb) {
+        opponentPokemon = globalScene.getEnemyField()[globalScene.currentBattle.lastEnemyInvolved];
+      } else {
+        /** If this SSCP is from sticky web, then check if pokemon that last sucessfully used sticky web is on field */
+        const stickyTagID = globalScene.arena.findTagsOnSide(
+          (t: ArenaTag) => t.tagType === ArenaTagType.STICKY_WEB,
+          ArenaTagSide.PLAYER,
+        )[0].sourceId;
+        globalScene.getEnemyField().forEach(e => {
+          if (e.id === stickyTagID) {
+            opponentPokemon = e;
+          }
+        });
+      }
+    } else {
+      if (!this.comingFromStickyWeb) {
+        opponentPokemon = globalScene.getPlayerField()[globalScene.currentBattle.lastPlayerInvolved];
+      } else {
+        const stickyTagID = globalScene.arena.findTagsOnSide(
+          (t: ArenaTag) => t.tagType === ArenaTagType.STICKY_WEB,
+          ArenaTagSide.ENEMY,
+        )[0].sourceId;
+        globalScene.getPlayerField().forEach(e => {
+          if (e.id === stickyTagID) {
+            opponentPokemon = e;
+          }
+        });
+      }
+    }
 
     if (!pokemon.isActive(true)) {
       return this.end();
@@ -65,11 +141,53 @@ export class StatStageChangePhase extends PokemonPhase {
 
       if (!this.selfTarget && stages.value < 0) {
         // TODO: add a reference to the source of the stat change to fix Infiltrator interaction
-        globalScene.arena.applyTagsForSide(MistTag, pokemon.isPlayer() ? ArenaTagSide.PLAYER : ArenaTagSide.ENEMY, false, null, cancelled);
+        globalScene.arena.applyTagsForSide(
+          MistTag,
+          pokemon.isPlayer() ? ArenaTagSide.PLAYER : ArenaTagSide.ENEMY,
+          false,
+          null,
+          cancelled,
+        );
       }
 
       if (!cancelled.value && !this.selfTarget && stages.value < 0) {
         applyPreStatStageChangeAbAttrs(ProtectStatAbAttr, pokemon, stat, cancelled, simulate);
+        applyPreStatStageChangeAbAttrs(
+          ConditionalUserFieldProtectStatAbAttr,
+          pokemon,
+          stat,
+          cancelled,
+          simulate,
+          pokemon,
+        );
+        const ally = pokemon.getAlly();
+        if (!isNullOrUndefined(ally)) {
+          applyPreStatStageChangeAbAttrs(
+            ConditionalUserFieldProtectStatAbAttr,
+            ally,
+            stat,
+            cancelled,
+            simulate,
+            pokemon,
+          );
+        }
+
+        /** Potential stat reflection due to Mirror Armor, does not apply to Octolock end of turn effect */
+        if (
+          opponentPokemon !== undefined &&
+          !pokemon.findTag(t => t instanceof OctolockTag) &&
+          !this.comingFromMirrorArmorUser
+        ) {
+          applyPreStatStageChangeAbAttrs(
+            ReflectStatStageChangeAbAttr,
+            pokemon,
+            stat,
+            cancelled,
+            simulate,
+            opponentPokemon,
+            this.stages,
+          );
+        }
       }
 
       // If one stat stage decrease is cancelled, simulate the rest of the applications
@@ -80,9 +198,14 @@ export class StatStageChangePhase extends PokemonPhase {
       return !cancelled.value;
     });
 
-    const relLevels = filteredStats.map(s => (stages.value >= 1 ? Math.min(pokemon.getStatStage(s) + stages.value, 6) : Math.max(pokemon.getStatStage(s) + stages.value, -6)) - pokemon.getStatStage(s));
+    const relLevels = filteredStats.map(
+      s =>
+        (stages.value >= 1
+          ? Math.min(pokemon.getStatStage(s) + stages.value, 6)
+          : Math.max(pokemon.getStatStage(s) + stages.value, -6)) - pokemon.getStatStage(s),
+    );
 
-    this.onChange && this.onChange(this.getPokemon(), filteredStats, relLevels);
+    this.onChange?.(this.getPokemon(), filteredStats, relLevels);
 
     const end = () => {
       if (this.showMessage) {
@@ -94,16 +217,8 @@ export class StatStageChangePhase extends PokemonPhase {
 
       for (const s of filteredStats) {
         if (stages.value > 0 && pokemon.getStatStage(s) < 6) {
-          if (!pokemon.turnData) {
-            // Temporary fix for missing turn data struct on turn 1
-            pokemon.resetTurnData();
-          }
           pokemon.turnData.statStagesIncreased = true;
         } else if (stages.value < 0 && pokemon.getStatStage(s) > -6) {
-          if (!pokemon.turnData) {
-            // Temporary fix for missing turn data struct on turn 1
-            pokemon.resetTurnData();
-          }
           pokemon.turnData.statStagesDecreased = true;
         }
 
@@ -119,10 +234,16 @@ export class StatStageChangePhase extends PokemonPhase {
       applyPostStatStageChangeAbAttrs(PostStatStageChangeAbAttr, pokemon, filteredStats, this.stages, this.selfTarget);
 
       // Look for any other stat change phases; if this is the last one, do White Herb check
-      const existingPhase = globalScene.findPhase(p => p instanceof StatStageChangePhase && p.battlerIndex === this.battlerIndex);
+      const existingPhase = globalScene.findPhase(
+        p => p instanceof StatStageChangePhase && p.battlerIndex === this.battlerIndex,
+      );
       if (!(existingPhase instanceof StatStageChangePhase)) {
         // Apply White Herb if needed
-        const whiteHerb = globalScene.applyModifier(ResetNegativeStatStageModifier, this.player, pokemon) as ResetNegativeStatStageModifier;
+        const whiteHerb = globalScene.applyModifier(
+          ResetNegativeStatStageModifier,
+          this.player,
+          pokemon,
+        ) as ResetNegativeStatStageModifier;
         // If the White Herb was applied, consume it
         if (whiteHerb) {
           pokemon.loseHeldItem(whiteHerb);
@@ -140,7 +261,8 @@ export class StatStageChangePhase extends PokemonPhase {
       const pokemonMaskSprite = pokemon.maskSprite;
 
       const tileX = (this.player ? 106 : 236) * pokemon.getSpriteScale() * globalScene.field.scale;
-      const tileY = ((this.player ? 148 : 84) + (stages.value >= 1 ? 160 : 0)) * pokemon.getSpriteScale() * globalScene.field.scale;
+      const tileY =
+        ((this.player ? 148 : 84) + (stages.value >= 1 ? 160 : 0)) * pokemon.getSpriteScale() * globalScene.field.scale;
       const tileWidth = 156 * globalScene.field.scale * pokemon.getSpriteScale();
       const tileHeight = 316 * globalScene.field.scale * pokemon.getSpriteScale();
 
@@ -166,15 +288,15 @@ export class StatStageChangePhase extends PokemonPhase {
             targets: statSprite,
             delay: 1000,
             duration: 250,
-            alpha: 0
+            alpha: 0,
           });
-        }
+        },
       });
 
       globalScene.tweens.add({
         targets: statSprite,
         duration: 1500,
-        y: `${stages.value >= 1 ? "-" : "+"}=${160 * 6}`
+        y: `${stages.value >= 1 ? "-" : "+"}=${160 * 6}`,
       });
 
       globalScene.time.delayedCall(1750, () => {
@@ -187,13 +309,22 @@ export class StatStageChangePhase extends PokemonPhase {
   }
 
   aggregateStatStageChanges(): void {
-    const accEva: BattleStat[] = [ Stat.ACC, Stat.EVA ];
+    const accEva: BattleStat[] = [Stat.ACC, Stat.EVA];
     const isAccEva = accEva.some(s => this.stats.includes(s));
     let existingPhase: StatStageChangePhase;
     if (this.stats.length === 1) {
-      while ((existingPhase = (globalScene.findPhase(p => p instanceof StatStageChangePhase && p.battlerIndex === this.battlerIndex && p.stats.length === 1
-        && (p.stats[0] === this.stats[0])
-        && p.selfTarget === this.selfTarget && p.showMessage === this.showMessage && p.ignoreAbilities === this.ignoreAbilities) as StatStageChangePhase))) {
+      while (
+        (existingPhase = globalScene.findPhase(
+          p =>
+            p instanceof StatStageChangePhase &&
+            p.battlerIndex === this.battlerIndex &&
+            p.stats.length === 1 &&
+            p.stats[0] === this.stats[0] &&
+            p.selfTarget === this.selfTarget &&
+            p.showMessage === this.showMessage &&
+            p.ignoreAbilities === this.ignoreAbilities,
+        ) as StatStageChangePhase)
+      ) {
         this.stages += existingPhase.stages;
 
         if (!globalScene.tryRemovePhase(p => p === existingPhase)) {
@@ -201,9 +332,18 @@ export class StatStageChangePhase extends PokemonPhase {
         }
       }
     }
-    while ((existingPhase = (globalScene.findPhase(p => p instanceof StatStageChangePhase && p.battlerIndex === this.battlerIndex && p.selfTarget === this.selfTarget
-      && (accEva.some(s => p.stats.includes(s)) === isAccEva)
-      && p.stages === this.stages && p.showMessage === this.showMessage && p.ignoreAbilities === this.ignoreAbilities) as StatStageChangePhase))) {
+    while (
+      (existingPhase = globalScene.findPhase(
+        p =>
+          p instanceof StatStageChangePhase &&
+          p.battlerIndex === this.battlerIndex &&
+          p.selfTarget === this.selfTarget &&
+          accEva.some(s => p.stats.includes(s)) === isAccEva &&
+          p.stages === this.stages &&
+          p.showMessage === this.showMessage &&
+          p.ignoreAbilities === this.ignoreAbilities,
+      ) as StatStageChangePhase)
+    ) {
       this.stats.push(...existingPhase.stats);
       if (!globalScene.tryRemovePhase(p => p === existingPhase)) {
         break;
@@ -228,21 +368,31 @@ export class StatStageChangePhase extends PokemonPhase {
       let statsFragment = "";
 
       if (relStageStats.length > 1) {
-        statsFragment = relStageStats.length >= 5
-          ? i18next.t("battle:stats")
-          : `${relStageStats.slice(0, -1).map(s => i18next.t(getStatKey(s))).join(", ")}${relStageStats.length > 2 ? "," : ""} ${i18next.t("battle:statsAnd")} ${i18next.t(getStatKey(relStageStats[relStageStats.length - 1]))}`;
-        messages.push(i18next.t(getStatStageChangeDescriptionKey(Math.abs(parseInt(rl)), stages >= 1), {
-          pokemonNameWithAffix: getPokemonNameWithAffix(this.getPokemon()),
-          stats: statsFragment,
-          count: relStageStats.length
-        }));
+        statsFragment =
+          relStageStats.length >= 5
+            ? i18next.t("battle:stats")
+            : `${relStageStats
+                .slice(0, -1)
+                .map(s => i18next.t(getStatKey(s)))
+                .join(
+                  ", ",
+                )}${relStageStats.length > 2 ? "," : ""} ${i18next.t("battle:statsAnd")} ${i18next.t(getStatKey(relStageStats[relStageStats.length - 1]))}`;
+        messages.push(
+          i18next.t(getStatStageChangeDescriptionKey(Math.abs(Number.parseInt(rl)), stages >= 1), {
+            pokemonNameWithAffix: getPokemonNameWithAffix(this.getPokemon()),
+            stats: statsFragment,
+            count: relStageStats.length,
+          }),
+        );
       } else {
         statsFragment = i18next.t(getStatKey(relStageStats[0]));
-        messages.push(i18next.t(getStatStageChangeDescriptionKey(Math.abs(parseInt(rl)), stages >= 1), {
-          pokemonNameWithAffix: getPokemonNameWithAffix(this.getPokemon()),
-          stats: statsFragment,
-          count: relStageStats.length
-        }));
+        messages.push(
+          i18next.t(getStatStageChangeDescriptionKey(Math.abs(Number.parseInt(rl)), stages >= 1), {
+            pokemonNameWithAffix: getPokemonNameWithAffix(this.getPokemon()),
+            stats: statsFragment,
+            count: relStageStats.length,
+          }),
+        );
       }
     });
 
diff --git a/src/phases/summon-missing-phase.ts b/src/phases/summon-missing-phase.ts
index 459a0399964..a692455ce47 100644
--- a/src/phases/summon-missing-phase.ts
+++ b/src/phases/summon-missing-phase.ts
@@ -4,12 +4,12 @@ import { SummonPhase } from "./summon-phase";
 import { globalScene } from "#app/global-scene";
 
 export class SummonMissingPhase extends SummonPhase {
-  constructor(fieldIndex: number) {
-    super(fieldIndex);
-  }
-
   preSummon(): void {
-    globalScene.ui.showText(i18next.t("battle:sendOutPokemon", { pokemonName: getPokemonNameWithAffix(this.getPokemon()) }));
+    globalScene.ui.showText(
+      i18next.t("battle:sendOutPokemon", {
+        pokemonName: getPokemonNameWithAffix(this.getPokemon()),
+      }),
+    );
     globalScene.time.delayedCall(250, () => this.summon());
   }
 }
diff --git a/src/phases/summon-phase.ts b/src/phases/summon-phase.ts
index 09eded9e52f..c217583f163 100644
--- a/src/phases/summon-phase.ts
+++ b/src/phases/summon-phase.ts
@@ -1,7 +1,7 @@
-import { BattleType } from "#app/battle";
+import { BattleType } from "#enums/battle-type";
 import { getPokeballAtlasKey, getPokeballTintColor } from "#app/data/pokeball";
 import { SpeciesFormChangeActiveTrigger } from "#app/data/pokemon-forms";
-import { TrainerSlot } from "#app/data/trainer-config";
+import { TrainerSlot } from "#enums/trainer-slot";
 import { PlayerGender } from "#app/enums/player-gender";
 import { addPokeballOpenParticles } from "#app/field/anims";
 import type Pokemon from "#app/field/pokemon";
@@ -13,12 +13,13 @@ import { PostSummonPhase } from "./post-summon-phase";
 import { GameOverPhase } from "./game-over-phase";
 import { ShinySparklePhase } from "./shiny-sparkle-phase";
 import { MysteryEncounterMode } from "#enums/mystery-encounter-mode";
+import { applyPreSummonAbAttrs, PreSummonAbAttr } from "#app/data/abilities/ability";
 import { globalScene } from "#app/global-scene";
 
 export class SummonPhase extends PartyMemberPokemonPhase {
   private loaded: boolean;
 
-  constructor(fieldIndex: number, player: boolean = true, loaded: boolean = false) {
+  constructor(fieldIndex: number, player = true, loaded = false) {
     super(fieldIndex, player);
 
     this.loaded = loaded;
@@ -27,17 +28,20 @@ export class SummonPhase extends PartyMemberPokemonPhase {
   start() {
     super.start();
 
+    applyPreSummonAbAttrs(PreSummonAbAttr, this.getPokemon());
     this.preSummon();
   }
 
   /**
-    * Sends out a Pokemon before the battle begins and shows the appropriate messages
-    */
+   * Sends out a Pokemon before the battle begins and shows the appropriate messages
+   */
   preSummon(): void {
     const partyMember = this.getPokemon();
     // If the Pokemon about to be sent out is fainted, illegal under a challenge, or no longer in the party for some reason, switch to the first non-fainted legal Pokemon
     if (!partyMember.isAllowedInBattle() || (this.player && !this.getParty().some(p => p.id === partyMember.id))) {
-      console.warn("The Pokemon about to be sent out is fainted or illegal under a challenge. Attempting to resolve...");
+      console.warn(
+        "The Pokemon about to be sent out is fainted or illegal under a challenge. Attempting to resolve...",
+      );
 
       // First check if they're somehow still in play, if so remove them.
       if (partyMember.isOnField()) {
@@ -58,16 +62,28 @@ export class SummonPhase extends PartyMemberPokemonPhase {
       }
 
       // Swaps the fainted Pokemon and the first non-fainted legal Pokemon in the party
-      [ party[this.partyMemberIndex], party[legalIndex] ] = [ party[legalIndex], party[this.partyMemberIndex] ];
-      console.warn("Swapped %s %O with %s %O", getPokemonNameWithAffix(partyMember), partyMember, getPokemonNameWithAffix(party[0]), party[0]);
+      [party[this.partyMemberIndex], party[legalIndex]] = [party[legalIndex], party[this.partyMemberIndex]];
+      console.warn(
+        "Swapped %s %O with %s %O",
+        getPokemonNameWithAffix(partyMember),
+        partyMember,
+        getPokemonNameWithAffix(party[0]),
+        party[0],
+      );
     }
 
     if (this.player) {
-      globalScene.ui.showText(i18next.t("battle:playerGo", { pokemonName: getPokemonNameWithAffix(this.getPokemon()) }));
+      globalScene.ui.showText(
+        i18next.t("battle:playerGo", {
+          pokemonName: getPokemonNameWithAffix(this.getPokemon()),
+        }),
+      );
       if (this.player) {
         globalScene.pbTray.hide();
       }
-      globalScene.trainer.setTexture(`trainer_${globalScene.gameData.gender === PlayerGender.FEMALE ? "f" : "m"}_back_pb`);
+      globalScene.trainer.setTexture(
+        `trainer_${globalScene.gameData.gender === PlayerGender.FEMALE ? "f" : "m"}_back_pb`,
+      );
       globalScene.time.delayedCall(562, () => {
         globalScene.trainer.setFrame("2");
         globalScene.time.delayedCall(64, () => {
@@ -78,13 +94,21 @@ export class SummonPhase extends PartyMemberPokemonPhase {
         targets: globalScene.trainer,
         x: -36,
         duration: 1000,
-        onComplete: () => globalScene.trainer.setVisible(false)
+        onComplete: () => globalScene.trainer.setVisible(false),
       });
       globalScene.time.delayedCall(750, () => this.summon());
-    } else if (globalScene.currentBattle.battleType === BattleType.TRAINER || globalScene.currentBattle.mysteryEncounter?.encounterMode === MysteryEncounterMode.TRAINER_BATTLE) {
-      const trainerName = globalScene.currentBattle.trainer?.getName(!(this.fieldIndex % 2) ? TrainerSlot.TRAINER : TrainerSlot.TRAINER_PARTNER);
+    } else if (
+      globalScene.currentBattle.battleType === BattleType.TRAINER ||
+      globalScene.currentBattle.mysteryEncounter?.encounterMode === MysteryEncounterMode.TRAINER_BATTLE
+    ) {
+      const trainerName = globalScene.currentBattle.trainer?.getName(
+        !(this.fieldIndex % 2) ? TrainerSlot.TRAINER : TrainerSlot.TRAINER_PARTNER,
+      );
       const pokemonName = this.getPokemon().getNameToRender();
-      const message = i18next.t("battle:trainerSendOut", { trainerName, pokemonName });
+      const message = i18next.t("battle:trainerSendOut", {
+        trainerName,
+        pokemonName,
+      });
 
       globalScene.pbTrayEnemy.hide();
       globalScene.ui.showText(message, null, () => this.summon());
@@ -100,7 +124,12 @@ export class SummonPhase extends PartyMemberPokemonPhase {
   summon(): void {
     const pokemon = this.getPokemon();
 
-    const pokeball = globalScene.addFieldSprite(this.player ? 36 : 248, this.player ? 80 : 44, "pb", getPokeballAtlasKey(pokemon.pokeball));
+    const pokeball = globalScene.addFieldSprite(
+      this.player ? 36 : 248,
+      this.player ? 80 : 44,
+      "pb",
+      getPokeballAtlasKey(pokemon.getPokeball(true)),
+    );
     pokeball.setVisible(false);
     pokeball.setOrigin(0.5, 0.625);
     globalScene.field.add(pokeball);
@@ -109,7 +138,9 @@ export class SummonPhase extends PartyMemberPokemonPhase {
       pokemon.setFieldPosition(FieldPosition.RIGHT, 0);
     } else {
       const availablePartyMembers = this.getParty().filter(p => p.isAllowedInBattle()).length;
-      pokemon.setFieldPosition(!globalScene.currentBattle.double || availablePartyMembers === 1 ? FieldPosition.CENTER : FieldPosition.LEFT);
+      pokemon.setFieldPosition(
+        !globalScene.currentBattle.double || availablePartyMembers === 1 ? FieldPosition.CENTER : FieldPosition.LEFT,
+      );
     }
 
     const fpOffset = pokemon.getFieldPositionOffset();
@@ -119,7 +150,7 @@ export class SummonPhase extends PartyMemberPokemonPhase {
     globalScene.tweens.add({
       targets: pokeball,
       duration: 650,
-      x: (this.player ? 100 : 236) + fpOffset[0]
+      x: (this.player ? 100 : 236) + fpOffset[0],
     });
 
     globalScene.tweens.add({
@@ -146,7 +177,7 @@ export class SummonPhase extends PartyMemberPokemonPhase {
               }
               globalScene.currentBattle.seenEnemyPartyMemberIds.add(pokemon.id);
             }
-            addPokeballOpenParticles(pokemon.x, pokemon.y - 16, pokemon.pokeball);
+            addPokeballOpenParticles(pokemon.x, pokemon.y - 16, pokemon.getPokeball(true));
             globalScene.updateModifiers(this.player);
             globalScene.updateFieldScale();
             pokemon.showInfo();
@@ -154,7 +185,7 @@ export class SummonPhase extends PartyMemberPokemonPhase {
             pokemon.setVisible(true);
             pokemon.getSprite().setVisible(true);
             pokemon.setScale(0.5);
-            pokemon.tint(getPokeballTintColor(pokemon.pokeball));
+            pokemon.tint(getPokeballTintColor(pokemon.getPokeball(true)));
             pokemon.untint(250, "Sine.easeIn");
             globalScene.updateFieldScale();
             globalScene.tweens.add({
@@ -165,13 +196,17 @@ export class SummonPhase extends PartyMemberPokemonPhase {
               onComplete: () => {
                 pokemon.cry(pokemon.getHpRatio() > 0.25 ? undefined : { rate: 0.85 });
                 pokemon.getSprite().clearTint();
-                pokemon.resetSummonData();
+                pokemon.fieldSetup();
+                // necessary to stay transformed during wild waves
+                if (pokemon.summonData.speciesForm) {
+                  pokemon.loadAssets(false);
+                }
                 globalScene.time.delayedCall(1000, () => this.end());
-              }
+              },
             });
-          }
+          },
         });
-      }
+      },
     });
   }
 
@@ -187,7 +222,9 @@ export class SummonPhase extends PartyMemberPokemonPhase {
       pokemon.setFieldPosition(FieldPosition.RIGHT, 0);
     } else {
       const availablePartyMembers = this.getParty().filter(p => !p.isFainted()).length;
-      pokemon.setFieldPosition(!globalScene.currentBattle.double || availablePartyMembers === 1 ? FieldPosition.CENTER : FieldPosition.LEFT);
+      pokemon.setFieldPosition(
+        !globalScene.currentBattle.double || availablePartyMembers === 1 ? FieldPosition.CENTER : FieldPosition.LEFT,
+      );
     }
 
     globalScene.add.existing(pokemon);
@@ -225,23 +262,27 @@ export class SummonPhase extends PartyMemberPokemonPhase {
       onComplete: () => {
         pokemon.cry(pokemon.getHpRatio() > 0.25 ? undefined : { rate: 0.85 });
         pokemon.getSprite().clearTint();
-        pokemon.resetSummonData();
+        pokemon.fieldSetup();
         globalScene.updateFieldScale();
         globalScene.time.delayedCall(1000, () => this.end());
-      }
+      },
     });
   }
 
   onEnd(): void {
     const pokemon = this.getPokemon();
 
-    if (pokemon.isShiny()) {
+    if (pokemon.isShiny(true)) {
       globalScene.unshiftPhase(new ShinySparklePhase(pokemon.getBattlerIndex()));
     }
 
     pokemon.resetTurnData();
 
-    if (!this.loaded || [ BattleType.TRAINER, BattleType.MYSTERY_ENCOUNTER ].includes(globalScene.currentBattle.battleType) || (globalScene.currentBattle.waveIndex % 10) === 1) {
+    if (
+      !this.loaded ||
+      [BattleType.TRAINER, BattleType.MYSTERY_ENCOUNTER].includes(globalScene.currentBattle.battleType) ||
+      globalScene.currentBattle.waveIndex % 10 === 1
+    ) {
       globalScene.triggerPokemonFormChange(pokemon, SpeciesFormChangeActiveTrigger, true);
       this.queuePostSummon();
     }
diff --git a/src/phases/switch-biome-phase.ts b/src/phases/switch-biome-phase.ts
index 88addb4ef47..f708830318e 100644
--- a/src/phases/switch-biome-phase.ts
+++ b/src/phases/switch-biome-phase.ts
@@ -19,8 +19,12 @@ export class SwitchBiomePhase extends BattlePhase {
       return this.end();
     }
 
+    // Before switching biomes, make sure to set the last encounter for other phases that need it too.
+    globalScene.lastEnemyTrainer = globalScene.currentBattle?.trainer ?? null;
+    globalScene.lastMysteryEncounter = globalScene.currentBattle?.mysteryEncounter;
+
     globalScene.tweens.add({
-      targets: [ globalScene.arenaEnemy, globalScene.lastEnemyTrainer ],
+      targets: [globalScene.arenaEnemy, globalScene.lastEnemyTrainer],
       x: "+=300",
       duration: 2000,
       onComplete: () => {
@@ -38,11 +42,11 @@ export class SwitchBiomePhase extends BattlePhase {
         globalScene.arenaPlayerTransition.setVisible(true);
 
         globalScene.tweens.add({
-          targets: [ globalScene.arenaPlayer, globalScene.arenaBgTransition, globalScene.arenaPlayerTransition ],
+          targets: [globalScene.arenaPlayer, globalScene.arenaBgTransition, globalScene.arenaPlayerTransition],
           duration: 1000,
           delay: 1000,
           ease: "Sine.easeInOut",
-          alpha: (target: any) => target === globalScene.arenaPlayer ? 0 : 1,
+          alpha: (target: any) => (target === globalScene.arenaPlayer ? 0 : 1),
           onComplete: () => {
             globalScene.arenaBg.setTexture(bgTexture);
             globalScene.arenaPlayer.setBiome(this.nextBiome);
@@ -57,9 +61,9 @@ export class SwitchBiomePhase extends BattlePhase {
             }
 
             this.end();
-          }
+          },
         });
-      }
+      },
     });
   }
 }
diff --git a/src/phases/switch-phase.ts b/src/phases/switch-phase.ts
index 34b70aeaf63..c056b186021 100644
--- a/src/phases/switch-phase.ts
+++ b/src/phases/switch-phase.ts
@@ -1,6 +1,6 @@
 import { globalScene } from "#app/global-scene";
 import PartyUiHandler, { PartyOption, PartyUiMode } from "#app/ui/party-ui-handler";
-import { Mode } from "#app/ui/ui";
+import { UiMode } from "#enums/ui-mode";
 import { SwitchType } from "#enums/switch-type";
 import { BattlePhase } from "./battle-phase";
 import { PostSummonPhase } from "./post-summon-phase";
@@ -17,14 +17,14 @@ export class SwitchPhase extends BattlePhase {
   private readonly doReturn: boolean;
 
   /**
-     * Creates a new SwitchPhase
-     * @param switchType {@linkcode SwitchType} The type of switch logic this phase implements
-     * @param fieldIndex Field index to switch out
-     * @param isModal Indicates if the switch should be forced (true) or is
-     * optional (false).
-     * @param doReturn Indicates if the party member on the field should be
-     * recalled to ball or has already left the field. Passed to {@linkcode SwitchSummonPhase}.
-     */
+   * Creates a new SwitchPhase
+   * @param switchType {@linkcode SwitchType} The type of switch logic this phase implements
+   * @param fieldIndex Field index to switch out
+   * @param isModal Indicates if the switch should be forced (true) or is
+   * optional (false).
+   * @param doReturn Indicates if the party member on the field should be
+   * recalled to ball or has already left the field. Passed to {@linkcode SwitchSummonPhase}.
+   */
   constructor(switchType: SwitchType, fieldIndex: number, isModal: boolean, doReturn: boolean) {
     super();
 
@@ -54,22 +54,35 @@ export class SwitchPhase extends BattlePhase {
     }
 
     // Check if there is any space still in field
-    if (this.isModal && globalScene.getPlayerField().filter(p => p.isAllowedInBattle() && p.isActive(true)).length >= globalScene.currentBattle.getBattlerCount()) {
+    if (
+      this.isModal &&
+      globalScene.getPlayerField().filter(p => p.isAllowedInBattle() && p.isActive(true)).length >=
+        globalScene.currentBattle.getBattlerCount()
+    ) {
       return super.end();
     }
 
     // Override field index to 0 in case of double battle where 2/3 remaining legal party members fainted at once
-    const fieldIndex = globalScene.currentBattle.getBattlerCount() === 1 || globalScene.getPokemonAllowedInBattle().length > 1 ? this.fieldIndex : 0;
+    const fieldIndex =
+      globalScene.currentBattle.getBattlerCount() === 1 || globalScene.getPokemonAllowedInBattle().length > 1
+        ? this.fieldIndex
+        : 0;
 
-    globalScene.ui.setMode(Mode.PARTY, this.isModal ? PartyUiMode.FAINT_SWITCH : PartyUiMode.POST_BATTLE_SWITCH, fieldIndex, (slotIndex: number, option: PartyOption) => {
-      if (slotIndex >= globalScene.currentBattle.getBattlerCount() && slotIndex < 6) {
-        // Remove any pre-existing PostSummonPhase under the same field index.
-        // Pre-existing PostSummonPhases may occur when this phase is invoked during a prompt to switch at the start of a wave.
-        globalScene.tryRemovePhase(p => p instanceof PostSummonPhase && p.player && p.fieldIndex === this.fieldIndex);
-        const switchType = (option === PartyOption.PASS_BATON) ? SwitchType.BATON_PASS : this.switchType;
-        globalScene.unshiftPhase(new SwitchSummonPhase(switchType, fieldIndex, slotIndex, this.doReturn));
-      }
-      globalScene.ui.setMode(Mode.MESSAGE).then(() => super.end());
-    }, PartyUiHandler.FilterNonFainted);
+    globalScene.ui.setMode(
+      UiMode.PARTY,
+      this.isModal ? PartyUiMode.FAINT_SWITCH : PartyUiMode.POST_BATTLE_SWITCH,
+      fieldIndex,
+      (slotIndex: number, option: PartyOption) => {
+        if (slotIndex >= globalScene.currentBattle.getBattlerCount() && slotIndex < 6) {
+          // Remove any pre-existing PostSummonPhase under the same field index.
+          // Pre-existing PostSummonPhases may occur when this phase is invoked during a prompt to switch at the start of a wave.
+          globalScene.tryRemovePhase(p => p instanceof PostSummonPhase && p.player && p.fieldIndex === this.fieldIndex);
+          const switchType = option === PartyOption.PASS_BATON ? SwitchType.BATON_PASS : this.switchType;
+          globalScene.unshiftPhase(new SwitchSummonPhase(switchType, fieldIndex, slotIndex, this.doReturn));
+        }
+        globalScene.ui.setMode(UiMode.MESSAGE).then(() => super.end());
+      },
+      PartyUiHandler.FilterNonFainted,
+    );
   }
 }
diff --git a/src/phases/switch-summon-phase.ts b/src/phases/switch-summon-phase.ts
index dad0f6f11ad..a063b6e6863 100644
--- a/src/phases/switch-summon-phase.ts
+++ b/src/phases/switch-summon-phase.ts
@@ -1,9 +1,15 @@
 import { globalScene } from "#app/global-scene";
-import { applyPreSwitchOutAbAttrs, PostDamageForceSwitchAbAttr, PreSwitchOutAbAttr } from "#app/data/ability";
-import { allMoves, ForceSwitchOutAttr } from "#app/data/move";
+import {
+  applyPreSummonAbAttrs,
+  applyPreSwitchOutAbAttrs,
+  PostDamageForceSwitchAbAttr,
+  PreSummonAbAttr,
+  PreSwitchOutAbAttr,
+} from "#app/data/abilities/ability";
+import { allMoves, ForceSwitchOutAttr } from "#app/data/moves/move";
 import { getPokeballTintColor } from "#app/data/pokeball";
 import { SpeciesFormChangeActiveTrigger } from "#app/data/pokemon-forms";
-import { TrainerSlot } from "#app/data/trainer-config";
+import { TrainerSlot } from "#enums/trainer-slot";
 import type Pokemon from "#app/field/pokemon";
 import { getPokemonNameWithAffix } from "#app/messages";
 import { SwitchEffectTransferModifier } from "#app/modifier/modifier";
@@ -22,15 +28,15 @@ export class SwitchSummonPhase extends SummonPhase {
   private lastPokemon: Pokemon;
 
   /**
-     * Constructor for creating a new SwitchSummonPhase
-     * @param switchType the type of switch behavior
-     * @param fieldIndex integer representing position on the battle field
-     * @param slotIndex integer for the index of pokemon (in party of 6) to switch into
-     * @param doReturn boolean whether to render "comeback" dialogue
-     * @param player boolean if the switch is from the player
-     */
-  constructor(switchType: SwitchType, fieldIndex: number, slotIndex: number, doReturn: boolean, player?: boolean) {
-    super(fieldIndex, player !== undefined ? player : true);
+   * Constructor for creating a new SwitchSummonPhase
+   * @param switchType - The type of switch behavior
+   * @param fieldIndex - Position on the battle field
+   * @param slotIndex - The index of pokemon (in party of 6) to switch into
+   * @param doReturn - Whether to render "comeback" dialogue
+   * @param player - Whether the switch came from the player or enemy; default `true`
+   */
+  constructor(switchType: SwitchType, fieldIndex: number, slotIndex: number, doReturn: boolean, player = true) {
+    super(fieldIndex, player);
 
     this.switchType = switchType;
     this.slotIndex = slotIndex;
@@ -45,7 +51,9 @@ export class SwitchSummonPhase extends SummonPhase {
     if (!this.player) {
       if (this.slotIndex === -1) {
         //@ts-ignore
-        this.slotIndex = globalScene.currentBattle.trainer?.getNextSummonIndex(!this.fieldIndex ? TrainerSlot.TRAINER : TrainerSlot.TRAINER_PARTNER); // TODO: what would be the default trainer-slot fallback?
+        this.slotIndex = globalScene.currentBattle.trainer?.getNextSummonIndex(
+          !this.fieldIndex ? TrainerSlot.TRAINER : TrainerSlot.TRAINER_PARTNER,
+        ); // TODO: what would be the default trainer-slot fallback?
       }
       if (this.slotIndex > -1) {
         this.showEnemyTrainer(!(this.fieldIndex % 2) ? TrainerSlot.TRAINER : TrainerSlot.TRAINER_PARTNER);
@@ -53,17 +61,23 @@ export class SwitchSummonPhase extends SummonPhase {
       }
     }
 
-    if (!this.doReturn || (this.slotIndex !== -1 && !(this.player ? globalScene.getPlayerParty() : globalScene.getEnemyParty())[this.slotIndex])) {
+    if (
+      !this.doReturn ||
+      (this.slotIndex !== -1 &&
+        !(this.player ? globalScene.getPlayerParty() : globalScene.getEnemyParty())[this.slotIndex])
+    ) {
       if (this.player) {
-        return this.switchAndSummon();
-      } else {
-        globalScene.time.delayedCall(750, () => this.switchAndSummon());
+        this.switchAndSummon();
         return;
       }
+      globalScene.time.delayedCall(750, () => this.switchAndSummon());
+      return;
     }
 
     const pokemon = this.getPokemon();
-    (this.player ? globalScene.getEnemyField() : globalScene.getPlayerField()).forEach(enemyPokemon => enemyPokemon.removeTagsBySourceId(pokemon.id));
+    (this.player ? globalScene.getEnemyField() : globalScene.getPlayerField()).forEach(enemyPokemon =>
+      enemyPokemon.removeTagsBySourceId(pokemon.id),
+    );
 
     if (this.switchType === SwitchType.SWITCH || this.switchType === SwitchType.INITIAL_SWITCH) {
       const substitute = pokemon.getTag(SubstituteTag);
@@ -73,21 +87,26 @@ export class SwitchSummonPhase extends SummonPhase {
           duration: 250,
           scale: substitute.sprite.scale * 0.5,
           ease: "Sine.easeIn",
-          onComplete: () => substitute.sprite.destroy()
+          onComplete: () => substitute.sprite.destroy(),
         });
       }
     }
 
-    globalScene.ui.showText(this.player ?
-      i18next.t("battle:playerComeBack", { pokemonName: getPokemonNameWithAffix(pokemon) }) :
-      i18next.t("battle:trainerComeBack", {
-        trainerName: globalScene.currentBattle.trainer?.getName(!(this.fieldIndex % 2) ? TrainerSlot.TRAINER : TrainerSlot.TRAINER_PARTNER),
-        pokemonName: pokemon.getNameToRender()
-      })
+    globalScene.ui.showText(
+      this.player
+        ? i18next.t("battle:playerComeBack", {
+            pokemonName: getPokemonNameWithAffix(pokemon),
+          })
+        : i18next.t("battle:trainerComeBack", {
+            trainerName: globalScene.currentBattle.trainer?.getName(
+              !(this.fieldIndex % 2) ? TrainerSlot.TRAINER : TrainerSlot.TRAINER_PARTNER,
+            ),
+            pokemonName: pokemon.getNameToRender(),
+          }),
     );
     globalScene.playSound("se/pb_rel");
     pokemon.hideInfo();
-    pokemon.tint(getPokeballTintColor(pokemon.pokeball), 1, 250, "Sine.easeIn");
+    pokemon.tint(getPokeballTintColor(pokemon.getPokeball(true)), 1, 250, "Sine.easeIn");
     globalScene.tweens.add({
       targets: pokemon,
       duration: 250,
@@ -96,63 +115,97 @@ export class SwitchSummonPhase extends SummonPhase {
       onComplete: () => {
         globalScene.time.delayedCall(750, () => this.switchAndSummon());
         pokemon.leaveField(this.switchType === SwitchType.SWITCH, false);
-      }
+      },
     });
   }
 
   switchAndSummon() {
     const party = this.player ? this.getParty() : globalScene.getEnemyParty();
-    const switchedInPokemon = party[this.slotIndex];
+    const switchedInPokemon: Pokemon | undefined = party[this.slotIndex];
     this.lastPokemon = this.getPokemon();
+
+    applyPreSummonAbAttrs(PreSummonAbAttr, switchedInPokemon);
     applyPreSwitchOutAbAttrs(PreSwitchOutAbAttr, this.lastPokemon);
-    if (this.switchType === SwitchType.BATON_PASS && switchedInPokemon) {
-      (this.player ? globalScene.getEnemyField() : globalScene.getPlayerField()).forEach(enemyPokemon => enemyPokemon.transferTagsBySourceId(this.lastPokemon.id, switchedInPokemon.id));
-      if (!globalScene.findModifier(m => m instanceof SwitchEffectTransferModifier && (m as SwitchEffectTransferModifier).pokemonId === switchedInPokemon.id)) {
-        const batonPassModifier = globalScene.findModifier(m => m instanceof SwitchEffectTransferModifier
-            && (m as SwitchEffectTransferModifier).pokemonId === this.lastPokemon.id) as SwitchEffectTransferModifier;
-        if (batonPassModifier && !globalScene.findModifier(m => m instanceof SwitchEffectTransferModifier && (m as SwitchEffectTransferModifier).pokemonId === switchedInPokemon.id)) {
-          globalScene.tryTransferHeldItemModifier(batonPassModifier, switchedInPokemon, false, undefined, undefined, undefined, false);
+    if (!switchedInPokemon) {
+      this.end();
+      return;
+    }
+
+    if (this.switchType === SwitchType.BATON_PASS) {
+      // If switching via baton pass, update opposing tags coming from the prior pokemon
+      (this.player ? globalScene.getEnemyField() : globalScene.getPlayerField()).forEach((enemyPokemon: Pokemon) =>
+        enemyPokemon.transferTagsBySourceId(this.lastPokemon.id, switchedInPokemon.id),
+      );
+
+      // If the recipient pokemon lacks a baton, give our baton to it during the swap
+      if (
+        !globalScene.findModifier(
+          m =>
+            m instanceof SwitchEffectTransferModifier &&
+            (m as SwitchEffectTransferModifier).pokemonId === switchedInPokemon.id,
+        )
+      ) {
+        const batonPassModifier = globalScene.findModifier(
+          m =>
+            m instanceof SwitchEffectTransferModifier &&
+            (m as SwitchEffectTransferModifier).pokemonId === this.lastPokemon.id,
+        ) as SwitchEffectTransferModifier;
+
+        if (batonPassModifier) {
+          globalScene.tryTransferHeldItemModifier(
+            batonPassModifier,
+            switchedInPokemon,
+            false,
+            undefined,
+            undefined,
+            undefined,
+            false,
+          );
         }
       }
     }
-    if (switchedInPokemon) {
-      party[this.slotIndex] = this.lastPokemon;
-      party[this.fieldIndex] = switchedInPokemon;
-      const showTextAndSummon = () => {
-        globalScene.ui.showText(this.player ?
-          i18next.t("battle:playerGo", { pokemonName: getPokemonNameWithAffix(switchedInPokemon) }) :
-          i18next.t("battle:trainerGo", {
-            trainerName: globalScene.currentBattle.trainer?.getName(!(this.fieldIndex % 2) ? TrainerSlot.TRAINER : TrainerSlot.TRAINER_PARTNER),
-            pokemonName: this.getPokemon().getNameToRender()
-          })
-        );
-        /**
-         * If this switch is passing a Substitute, make the switched Pokemon match the returned Pokemon's state as it left.
-         * Otherwise, clear any persisting tags on the returned Pokemon.
-         */
-        if (this.switchType === SwitchType.BATON_PASS || this.switchType === SwitchType.SHED_TAIL) {
-          const substitute = this.lastPokemon.getTag(SubstituteTag);
-          if (substitute) {
-            switchedInPokemon.x += this.lastPokemon.getSubstituteOffset()[0];
-            switchedInPokemon.y += this.lastPokemon.getSubstituteOffset()[1];
-            switchedInPokemon.setAlpha(0.5);
-          }
-        } else {
-          switchedInPokemon.resetSummonData();
+
+    party[this.slotIndex] = this.lastPokemon;
+    party[this.fieldIndex] = switchedInPokemon;
+    const showTextAndSummon = () => {
+      globalScene.ui.showText(
+        this.player
+          ? i18next.t("battle:playerGo", {
+              pokemonName: getPokemonNameWithAffix(switchedInPokemon),
+            })
+          : i18next.t("battle:trainerGo", {
+              trainerName: globalScene.currentBattle.trainer?.getName(
+                !(this.fieldIndex % 2) ? TrainerSlot.TRAINER : TrainerSlot.TRAINER_PARTNER,
+              ),
+              pokemonName: this.getPokemon().getNameToRender(),
+            }),
+      );
+
+      /**
+       * If this switch is passing a Substitute, make the switched Pokemon matches the returned Pokemon's state as it left.
+       * Otherwise, clear any persisting tags on the returned Pokemon.
+       */
+      if (this.switchType === SwitchType.BATON_PASS || this.switchType === SwitchType.SHED_TAIL) {
+        const substitute = this.lastPokemon.getTag(SubstituteTag);
+        if (substitute) {
+          switchedInPokemon.x += this.lastPokemon.getSubstituteOffset()[0];
+          switchedInPokemon.y += this.lastPokemon.getSubstituteOffset()[1];
+          switchedInPokemon.setAlpha(0.5);
         }
-        this.summon();
-      };
-      if (this.player) {
-        showTextAndSummon();
       } else {
-        globalScene.time.delayedCall(1500, () => {
-          this.hideEnemyTrainer();
-          globalScene.pbTrayEnemy.hide();
-          showTextAndSummon();
-        });
+        switchedInPokemon.fieldSetup(true);
       }
+      this.summon();
+    };
+
+    if (this.player) {
+      showTextAndSummon();
     } else {
-      this.end();
+      globalScene.time.delayedCall(1500, () => {
+        this.hideEnemyTrainer();
+        globalScene.pbTrayEnemy.hide();
+        showTextAndSummon();
+      });
     }
   }
 
@@ -165,14 +218,20 @@ export class SwitchSummonPhase extends SummonPhase {
     const lastUsedMove = moveId ? allMoves[moveId] : undefined;
 
     const currentCommand = globalScene.currentBattle.turnCommands[this.fieldIndex]?.command;
-    const lastPokemonIsForceSwitchedAndNotFainted = lastUsedMove?.hasAttr(ForceSwitchOutAttr) && !this.lastPokemon.isFainted();
-    const lastPokemonHasForceSwitchAbAttr = this.lastPokemon.hasAbilityWithAttr(PostDamageForceSwitchAbAttr) && !this.lastPokemon.isFainted();
+    const lastPokemonIsForceSwitchedAndNotFainted =
+      lastUsedMove?.hasAttr(ForceSwitchOutAttr) && !this.lastPokemon.isFainted();
+    const lastPokemonHasForceSwitchAbAttr =
+      this.lastPokemon.hasAbilityWithAttr(PostDamageForceSwitchAbAttr) && !this.lastPokemon.isFainted();
 
-    // Compensate for turn spent summoning
-    // Or compensate for force switch move if switched out pokemon is not fainted
-    if (currentCommand === Command.POKEMON || lastPokemonIsForceSwitchedAndNotFainted || lastPokemonHasForceSwitchAbAttr) {
-      pokemon.battleSummonData.turnCount--;
-      pokemon.battleSummonData.waveTurnCount--;
+    // Compensate for turn spent summoning/forced switch if switched out pokemon is not fainted.
+    // Needed as we increment turn counters in `TurnEndPhase`.
+    if (
+      currentCommand === Command.POKEMON ||
+      lastPokemonIsForceSwitchedAndNotFainted ||
+      lastPokemonHasForceSwitchAbAttr
+    ) {
+      pokemon.tempSummonData.turnCount--;
+      pokemon.tempSummonData.waveTurnCount--;
     }
 
     if (this.switchType === SwitchType.BATON_PASS && pokemon) {
@@ -184,12 +243,13 @@ export class SwitchSummonPhase extends SummonPhase {
       }
     }
 
+    // Reset turn data if not initial switch (since it gets initialized to an empty object on turn start)
     if (this.switchType !== SwitchType.INITIAL_SWITCH) {
       pokemon.resetTurnData();
       pokemon.turnData.switchedInThisTurn = true;
     }
 
-    this.lastPokemon?.resetSummonData();
+    this.lastPokemon.resetSummonData();
 
     globalScene.triggerPokemonFormChange(pokemon, SpeciesFormChangeActiveTrigger, true);
     // Reverts to weather-based forms when weather suppressors (Cloud Nine/Air Lock) are switched out
diff --git a/src/phases/tera-phase.ts b/src/phases/tera-phase.ts
new file mode 100644
index 00000000000..c9320daf12f
--- /dev/null
+++ b/src/phases/tera-phase.ts
@@ -0,0 +1,53 @@
+import type Pokemon from "#app/field/pokemon";
+import { getPokemonNameWithAffix } from "#app/messages";
+import { BattlePhase } from "./battle-phase";
+import i18next from "i18next";
+import { globalScene } from "#app/global-scene";
+import { PokemonType } from "#enums/pokemon-type";
+import { achvs } from "#app/system/achv";
+import { SpeciesFormChangeTeraTrigger } from "#app/data/pokemon-forms";
+import { CommonAnim, CommonBattleAnim } from "#app/data/battle-anims";
+
+export class TeraPhase extends BattlePhase {
+  public pokemon: Pokemon;
+
+  constructor(pokemon: Pokemon) {
+    super();
+
+    this.pokemon = pokemon;
+  }
+
+  start() {
+    super.start();
+
+    globalScene.queueMessage(
+      i18next.t("battle:pokemonTerastallized", {
+        pokemonNameWithAffix: getPokemonNameWithAffix(this.pokemon),
+        type: i18next.t(`pokemonInfo:Type.${PokemonType[this.pokemon.getTeraType()]}`),
+      }),
+    );
+    new CommonBattleAnim(CommonAnim.TERASTALLIZE, this.pokemon).play(false, () => {
+      this.end();
+    });
+  }
+
+  end() {
+    this.pokemon.isTerastallized = true;
+    this.pokemon.updateSpritePipelineData();
+
+    if (this.pokemon.isPlayer()) {
+      globalScene.arena.playerTerasUsed += 1;
+    }
+
+    globalScene.triggerPokemonFormChange(this.pokemon, SpeciesFormChangeTeraTrigger);
+
+    if (this.pokemon.isPlayer()) {
+      globalScene.validateAchv(achvs.TERASTALLIZE);
+      if (this.pokemon.getTeraType() === PokemonType.STELLAR) {
+        globalScene.validateAchv(achvs.STELLAR_TERASTALLIZE);
+      }
+    }
+
+    super.end();
+  }
+}
diff --git a/src/phases/test-message-phase.ts b/src/phases/test-message-phase.ts
deleted file mode 100644
index d5e74efd490..00000000000
--- a/src/phases/test-message-phase.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { MessagePhase } from "./message-phase";
-
-export class TestMessagePhase extends MessagePhase {
-  constructor(message: string) {
-    super(message, null, true);
-  }
-}
diff --git a/src/phases/title-phase.ts b/src/phases/title-phase.ts
index 0d486da1998..56057c23372 100644
--- a/src/phases/title-phase.ts
+++ b/src/phases/title-phase.ts
@@ -1,19 +1,24 @@
 import { loggedInUser } from "#app/account";
-import { BattleType } from "#app/battle";
+import { BattleType } from "#enums/battle-type";
 import { fetchDailyRunSeed, getDailyRunStarters } from "#app/data/daily-run";
 import { Gender } from "#app/data/gender";
 import { getBiomeKey } from "#app/field/arena";
 import { GameMode, GameModes, getGameMode } from "#app/game-mode";
 import type { Modifier } from "#app/modifier/modifier";
-import { getDailyRunStarterModifiers, ModifierPoolType, modifierTypes, regenerateModifierPoolThresholds } from "#app/modifier/modifier-type";
+import {
+  getDailyRunStarterModifiers,
+  ModifierPoolType,
+  modifierTypes,
+  regenerateModifierPoolThresholds,
+} from "#app/modifier/modifier-type";
 import { Phase } from "#app/phase";
 import type { SessionSaveData } from "#app/system/game-data";
 import { Unlockables } from "#app/system/unlockables";
 import { vouchers } from "#app/system/voucher";
 import type { OptionSelectConfig, OptionSelectItem } from "#app/ui/abstact-option-select-ui-handler";
 import { SaveSlotUiMode } from "#app/ui/save-slot-select-ui-handler";
-import { Mode } from "#app/ui/ui";
-import * as Utils from "#app/utils";
+import { UiMode } from "#enums/ui-mode";
+import { isLocal, isLocalServerConnected, isNullOrUndefined } from "#app/utils/common";
 import i18next from "i18next";
 import { CheckSwitchPhase } from "./check-switch-phase";
 import { EncounterPhase } from "./encounter-phase";
@@ -21,19 +26,13 @@ import { SelectChallengePhase } from "./select-challenge-phase";
 import { SelectStarterPhase } from "./select-starter-phase";
 import { SummonPhase } from "./summon-phase";
 import { globalScene } from "#app/global-scene";
-
+import Overrides from "#app/overrides";
 
 export class TitlePhase extends Phase {
-  private loaded: boolean;
+  private loaded = false;
   private lastSessionData: SessionSaveData;
   public gameMode: GameModes;
 
-  constructor() {
-    super();
-
-    this.loaded = false;
-  }
-
   start(): void {
     super.start();
 
@@ -42,18 +41,21 @@ export class TitlePhase extends Phase {
 
     globalScene.playBgm("title", true);
 
-    globalScene.gameData.getSession(loggedInUser?.lastSessionSlot ?? -1).then(sessionData => {
-      if (sessionData) {
-        this.lastSessionData = sessionData;
-        const biomeKey = getBiomeKey(sessionData.arena.biome);
-        const bgTexture = `${biomeKey}_bg`;
-        globalScene.arenaBg.setTexture(bgTexture);
-      }
-      this.showOptions();
-    }).catch(err => {
-      console.error(err);
-      this.showOptions();
-    });
+    globalScene.gameData
+      .getSession(loggedInUser?.lastSessionSlot ?? -1)
+      .then(sessionData => {
+        if (sessionData) {
+          this.lastSessionData = sessionData;
+          const biomeKey = getBiomeKey(sessionData.arena.biome);
+          const bgTexture = `${biomeKey}_bg`;
+          globalScene.arenaBg.setTexture(bgTexture);
+        }
+        this.showOptions();
+      })
+      .catch(err => {
+        console.error(err);
+        this.showOptions();
+      });
   }
 
   showOptions(): void {
@@ -64,129 +66,137 @@ export class TitlePhase extends Phase {
         handler: () => {
           this.loadSaveSlot(this.lastSessionData || !loggedInUser ? -1 : loggedInUser.lastSessionSlot);
           return true;
-        }
+        },
       });
     }
-    options.push({
-      label: i18next.t("menu:newGame"),
-      handler: () => {
-        const setModeAndEnd = (gameMode: GameModes) => {
-          this.gameMode = gameMode;
-          globalScene.ui.setMode(Mode.MESSAGE);
-          globalScene.ui.clearText();
-          this.end();
-        };
-        const { gameData } = globalScene;
-        const options: OptionSelectItem[] = [];
-        options.push({
-          label: GameMode.getModeName(GameModes.CLASSIC),
-          handler: () => {
-            setModeAndEnd(GameModes.CLASSIC);
-            return true;
-          }
-        });
-        options.push({
-          label: i18next.t("menu:dailyRun"),
-          handler: () => {
-            this.initDailyRun();
-            return true;
-          }
-        });
-        if (gameData.isUnlocked(Unlockables.ENDLESS_MODE)) {
+    options.push(
+      {
+        label: i18next.t("menu:newGame"),
+        handler: () => {
+          const setModeAndEnd = (gameMode: GameModes) => {
+            this.gameMode = gameMode;
+            globalScene.ui.setMode(UiMode.MESSAGE);
+            globalScene.ui.clearText();
+            this.end();
+          };
+          const { gameData } = globalScene;
+          const options: OptionSelectItem[] = [];
           options.push({
-            label: GameMode.getModeName(GameModes.CHALLENGE),
+            label: GameMode.getModeName(GameModes.CLASSIC),
             handler: () => {
-              setModeAndEnd(GameModes.CHALLENGE);
+              setModeAndEnd(GameModes.CLASSIC);
               return true;
-            }
+            },
           });
           options.push({
-            label: GameMode.getModeName(GameModes.ENDLESS),
+            label: i18next.t("menu:dailyRun"),
             handler: () => {
-              setModeAndEnd(GameModes.ENDLESS);
+              this.initDailyRun();
               return true;
-            }
+            },
           });
-          if (gameData.isUnlocked(Unlockables.SPLICED_ENDLESS_MODE)) {
+          if (gameData.isUnlocked(Unlockables.ENDLESS_MODE)) {
             options.push({
-              label: GameMode.getModeName(GameModes.SPLICED_ENDLESS),
+              label: GameMode.getModeName(GameModes.CHALLENGE),
               handler: () => {
-                setModeAndEnd(GameModes.SPLICED_ENDLESS);
+                setModeAndEnd(GameModes.CHALLENGE);
                 return true;
-              }
+              },
             });
+            options.push({
+              label: GameMode.getModeName(GameModes.ENDLESS),
+              handler: () => {
+                setModeAndEnd(GameModes.ENDLESS);
+                return true;
+              },
+            });
+            if (gameData.isUnlocked(Unlockables.SPLICED_ENDLESS_MODE)) {
+              options.push({
+                label: GameMode.getModeName(GameModes.SPLICED_ENDLESS),
+                handler: () => {
+                  setModeAndEnd(GameModes.SPLICED_ENDLESS);
+                  return true;
+                },
+              });
+            }
           }
-        }
-        options.push({
-          label: i18next.t("menu:cancel"),
-          handler: () => {
-            globalScene.clearPhaseQueue();
-            globalScene.pushPhase(new TitlePhase());
-            super.end();
-            return true;
-          }
-        });
-        globalScene.ui.showText(i18next.t("menu:selectGameMode"), null, () => globalScene.ui.setOverlayMode(Mode.OPTION_SELECT, { options: options }));
-        return true;
-      }
-    },
-    {
-      label: i18next.t("menu:loadGame"),
-      handler: () => {
-        globalScene.ui.setOverlayMode(Mode.SAVE_SLOT, SaveSlotUiMode.LOAD,
-          (slotId: number) => {
+          options.push({
+            label: i18next.t("menu:cancel"),
+            handler: () => {
+              globalScene.clearPhaseQueue();
+              globalScene.pushPhase(new TitlePhase());
+              super.end();
+              return true;
+            },
+          });
+          globalScene.ui.showText(i18next.t("menu:selectGameMode"), null, () =>
+            globalScene.ui.setOverlayMode(UiMode.OPTION_SELECT, {
+              options: options,
+            }),
+          );
+          return true;
+        },
+      },
+      {
+        label: i18next.t("menu:loadGame"),
+        handler: () => {
+          globalScene.ui.setOverlayMode(UiMode.SAVE_SLOT, SaveSlotUiMode.LOAD, (slotId: number) => {
             if (slotId === -1) {
               return this.showOptions();
             }
             this.loadSaveSlot(slotId);
           });
-        return true;
-      }
-    },
-    {
-      label: i18next.t("menu:runHistory"),
-      handler: () => {
-        globalScene.ui.setOverlayMode(Mode.RUN_HISTORY);
-        return true;
+          return true;
+        },
       },
-      keepOpen: true
-    },
-    {
-      label: i18next.t("menu:settings"),
-      handler: () => {
-        globalScene.ui.setOverlayMode(Mode.SETTINGS);
-        return true;
+      {
+        label: i18next.t("menu:runHistory"),
+        handler: () => {
+          globalScene.ui.setOverlayMode(UiMode.RUN_HISTORY);
+          return true;
+        },
+        keepOpen: true,
       },
-      keepOpen: true
-    });
+      {
+        label: i18next.t("menu:settings"),
+        handler: () => {
+          globalScene.ui.setOverlayMode(UiMode.SETTINGS);
+          return true;
+        },
+        keepOpen: true,
+      },
+    );
     const config: OptionSelectConfig = {
       options: options,
       noCancel: true,
-      yOffset: 47
+      yOffset: 47,
     };
-    globalScene.ui.setMode(Mode.TITLE, config);
+    globalScene.ui.setMode(UiMode.TITLE, config);
   }
 
   loadSaveSlot(slotId: number): void {
     globalScene.sessionSlotId = slotId > -1 || !loggedInUser ? slotId : loggedInUser.lastSessionSlot;
-    globalScene.ui.setMode(Mode.MESSAGE);
+    globalScene.ui.setMode(UiMode.MESSAGE);
     globalScene.ui.resetModeChain();
-    globalScene.gameData.loadSession(slotId, slotId === -1 ? this.lastSessionData : undefined).then((success: boolean) => {
-      if (success) {
-        this.loaded = true;
-        globalScene.ui.showText(i18next.t("menu:sessionSuccess"), null, () => this.end());
-      } else {
-        this.end();
-      }
-    }).catch(err => {
-      console.error(err);
-      globalScene.ui.showText(i18next.t("menu:failedToLoadSession"), null);
-    });
+    globalScene.gameData
+      .loadSession(slotId, slotId === -1 ? this.lastSessionData : undefined)
+      .then((success: boolean) => {
+        if (success) {
+          this.loaded = true;
+          globalScene.ui.showText(i18next.t("menu:sessionSuccess"), null, () => this.end());
+        } else {
+          this.end();
+        }
+      })
+      .catch(err => {
+        console.error(err);
+        globalScene.ui.showText(i18next.t("menu:failedToLoadSession"), null);
+      });
   }
 
   initDailyRun(): void {
     globalScene.ui.clearText();
-    globalScene.ui.setMode(Mode.SAVE_SLOT, SaveSlotUiMode.SAVE, (slotId: number) => {
+    globalScene.ui.setMode(UiMode.SAVE_SLOT, SaveSlotUiMode.SAVE, (slotId: number) => {
       globalScene.clearPhaseQueue();
       if (slotId === -1) {
         globalScene.pushPhase(new TitlePhase());
@@ -196,6 +206,8 @@ export class TitlePhase extends Phase {
 
       const generateDaily = (seed: string) => {
         globalScene.gameMode = getGameMode(GameModes.DAILY);
+        // Daily runs don't support all challenges yet (starter select restrictions aren't considered)
+        globalScene.eventManager.startEventChallenges();
 
         globalScene.setSeed(seed);
         globalScene.resetSeed(0);
@@ -210,10 +222,23 @@ export class TitlePhase extends Phase {
         for (const starter of starters) {
           const starterProps = globalScene.gameData.getSpeciesDexAttrProps(starter.species, starter.dexAttr);
           const starterFormIndex = Math.min(starterProps.formIndex, Math.max(starter.species.forms.length - 1, 0));
-          const starterGender = starter.species.malePercent !== null
-            ? !starterProps.female ? Gender.MALE : Gender.FEMALE
-            : Gender.GENDERLESS;
-          const starterPokemon = globalScene.addPlayerPokemon(starter.species, startingLevel, starter.abilityIndex, starterFormIndex, starterGender, starterProps.shiny, starterProps.variant, undefined, starter.nature);
+          const starterGender =
+            starter.species.malePercent !== null
+              ? !starterProps.female
+                ? Gender.MALE
+                : Gender.FEMALE
+              : Gender.GENDERLESS;
+          const starterPokemon = globalScene.addPlayerPokemon(
+            starter.species,
+            startingLevel,
+            starter.abilityIndex,
+            starterFormIndex,
+            starterGender,
+            starterProps.shiny,
+            starterProps.variant,
+            undefined,
+            starter.nature,
+          );
           starterPokemon.setVisible(false);
           party.push(starterPokemon);
           loadPokemonAssets.push(starterPokemon.loadAssets());
@@ -221,11 +246,17 @@ export class TitlePhase extends Phase {
 
         regenerateModifierPoolThresholds(party, ModifierPoolType.DAILY_STARTER);
 
-        const modifiers: Modifier[] = Array(3).fill(null).map(() => modifierTypes.EXP_SHARE().withIdFromFunc(modifierTypes.EXP_SHARE).newModifier())
-          .concat(Array(3).fill(null).map(() => modifierTypes.GOLDEN_EXP_CHARM().withIdFromFunc(modifierTypes.GOLDEN_EXP_CHARM).newModifier()))
-          .concat([ modifierTypes.MAP().withIdFromFunc(modifierTypes.MAP).newModifier() ])
+        const modifiers: Modifier[] = Array(3)
+          .fill(null)
+          .map(() => modifierTypes.EXP_SHARE().withIdFromFunc(modifierTypes.EXP_SHARE).newModifier())
+          .concat(
+            Array(3)
+              .fill(null)
+              .map(() => modifierTypes.GOLDEN_EXP_CHARM().withIdFromFunc(modifierTypes.GOLDEN_EXP_CHARM).newModifier()),
+          )
+          .concat([modifierTypes.MAP().withIdFromFunc(modifierTypes.MAP).newModifier()])
           .concat(getDailyRunStarterModifiers(party))
-          .filter((m) => m !== null);
+          .filter(m => m !== null);
 
         for (const m of modifiers) {
           globalScene.addModifier(m, true, false, false, true);
@@ -245,18 +276,24 @@ export class TitlePhase extends Phase {
       };
 
       // If Online, calls seed fetch from db to generate daily run. If Offline, generates a daily run based on current date.
-      if (!Utils.isLocal || Utils.isLocalServerConnected) {
-        fetchDailyRunSeed().then(seed => {
-          if (seed) {
-            generateDaily(seed);
-          } else {
-            throw new Error("Daily run seed is null!");
-          }
-        }).catch(err => {
-          console.error("Failed to load daily run:\n", err);
-        });
+      if (!isLocal || isLocalServerConnected) {
+        fetchDailyRunSeed()
+          .then(seed => {
+            if (seed) {
+              generateDaily(seed);
+            } else {
+              throw new Error("Daily run seed is null!");
+            }
+          })
+          .catch(err => {
+            console.error("Failed to load daily run:\n", err);
+          });
       } else {
-        generateDaily(btoa(new Date().toISOString().substring(0, 10)));
+        let seed: string = btoa(new Date().toISOString().substring(0, 10));
+        if (!isNullOrUndefined(Overrides.DAILY_RUN_SEED_OVERRIDE)) {
+          seed = Overrides.DAILY_RUN_SEED_OVERRIDE;
+        }
+        generateDaily(seed);
       }
     });
   }
@@ -285,7 +322,10 @@ export class TitlePhase extends Phase {
         globalScene.pushPhase(new SummonPhase(1, true, true));
       }
 
-      if (globalScene.currentBattle.battleType !== BattleType.TRAINER && (globalScene.currentBattle.waveIndex > 1 || !globalScene.gameMode.isDaily)) {
+      if (
+        globalScene.currentBattle.battleType !== BattleType.TRAINER &&
+        (globalScene.currentBattle.waveIndex > 1 || !globalScene.gameMode.isDaily)
+      ) {
         const minPartySize = globalScene.currentBattle.double ? 2 : 1;
         if (availablePartyMembers > minPartySize) {
           globalScene.pushPhase(new CheckSwitchPhase(0, globalScene.currentBattle.double));
diff --git a/src/phases/toggle-double-position-phase.ts b/src/phases/toggle-double-position-phase.ts
index f61577444d2..37f47d5cf95 100644
--- a/src/phases/toggle-double-position-phase.ts
+++ b/src/phases/toggle-double-position-phase.ts
@@ -16,14 +16,19 @@ export class ToggleDoublePositionPhase extends BattlePhase {
 
     const playerPokemon = globalScene.getPlayerField().find(p => p.isActive(true));
     if (playerPokemon) {
-      playerPokemon.setFieldPosition(this.double && globalScene.getPokemonAllowedInBattle().length > 1 ? FieldPosition.LEFT : FieldPosition.CENTER, 500).then(() => {
-        if (playerPokemon.getFieldIndex() === 1) {
-          const party = globalScene.getPlayerParty();
-          party[1] = party[0];
-          party[0] = playerPokemon;
-        }
-        this.end();
-      });
+      playerPokemon
+        .setFieldPosition(
+          this.double && globalScene.getPokemonAllowedInBattle().length > 1 ? FieldPosition.LEFT : FieldPosition.CENTER,
+          500,
+        )
+        .then(() => {
+          if (playerPokemon.getFieldIndex() === 1) {
+            const party = globalScene.getPlayerParty();
+            party[1] = party[0];
+            party[0] = playerPokemon;
+          }
+          this.end();
+        });
     } else {
       this.end();
     }
diff --git a/src/phases/trainer-message-test-phase.ts b/src/phases/trainer-message-test-phase.ts
deleted file mode 100644
index 34ce2e8b53e..00000000000
--- a/src/phases/trainer-message-test-phase.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import { globalScene } from "#app/global-scene";
-import { trainerConfigs } from "#app/data/trainer-config";
-import type { TrainerType } from "#app/enums/trainer-type";
-import { BattlePhase } from "./battle-phase";
-import { TestMessagePhase } from "./test-message-phase";
-
-export class TrainerMessageTestPhase extends BattlePhase {
-  private trainerTypes: TrainerType[];
-
-  constructor(...trainerTypes: TrainerType[]) {
-    super();
-
-    this.trainerTypes = trainerTypes;
-  }
-
-  start() {
-    super.start();
-
-    const testMessages: string[] = [];
-
-    for (const t of Object.keys(trainerConfigs)) {
-      const type = parseInt(t);
-      if (this.trainerTypes.length && !this.trainerTypes.find(tt => tt === type as TrainerType)) {
-        continue;
-      }
-      const config = trainerConfigs[type];
-      [ config.encounterMessages, config.femaleEncounterMessages, config.victoryMessages, config.femaleVictoryMessages, config.defeatMessages, config.femaleDefeatMessages ]
-        .map(messages => {
-          if (messages?.length) {
-            testMessages.push(...messages);
-          }
-        });
-    }
-
-    for (const message of testMessages) {
-      globalScene.pushPhase(new TestMessagePhase(message));
-    }
-
-    this.end();
-  }
-}
diff --git a/src/phases/trainer-victory-phase.ts b/src/phases/trainer-victory-phase.ts
index e2617f598da..f7005b1300d 100644
--- a/src/phases/trainer-victory-phase.ts
+++ b/src/phases/trainer-victory-phase.ts
@@ -3,20 +3,17 @@ import { TrainerType } from "#app/enums/trainer-type";
 import { modifierTypes } from "#app/modifier/modifier-type";
 import { vouchers } from "#app/system/voucher";
 import i18next from "i18next";
-import * as Utils from "#app/utils";
+import { randSeedItem } from "#app/utils/common";
 import { BattlePhase } from "./battle-phase";
 import { ModifierRewardPhase } from "./modifier-reward-phase";
 import { MoneyRewardPhase } from "./money-reward-phase";
-import { TrainerSlot } from "#app/data/trainer-config";
+import { TrainerSlot } from "#enums/trainer-slot";
 import { globalScene } from "#app/global-scene";
 import { Biome } from "#app/enums/biome";
 import { achvs } from "#app/system/achv";
+import { timedEventManager } from "#app/global-event-manager";
 
 export class TrainerVictoryPhase extends BattlePhase {
-  constructor() {
-    super();
-  }
-
   start() {
     globalScene.disableMenu = true;
 
@@ -29,56 +26,95 @@ export class TrainerVictoryPhase extends BattlePhase {
       globalScene.unshiftPhase(new ModifierRewardPhase(modifierRewardFunc));
     }
 
-    if (globalScene.eventManager.isEventActive()) {
-      for (const rewardFunc of globalScene.currentBattle.trainer?.config.eventRewardFuncs!) {
-        globalScene.unshiftPhase(new ModifierRewardPhase(rewardFunc));
-      }
-    }
-
     const trainerType = globalScene.currentBattle.trainer?.config.trainerType!; // TODO: is this bang correct?
     // Validate Voucher for boss trainers
     if (vouchers.hasOwnProperty(TrainerType[trainerType])) {
-      if (!globalScene.validateVoucher(vouchers[TrainerType[trainerType]]) && globalScene.currentBattle.trainer?.config.isBoss) {
-        if (globalScene.eventManager.getUpgradeUnlockedVouchers()) {
-          globalScene.unshiftPhase(new ModifierRewardPhase([ modifierTypes.VOUCHER_PLUS, modifierTypes.VOUCHER_PLUS, modifierTypes.VOUCHER_PLUS, modifierTypes.VOUCHER_PREMIUM ][vouchers[TrainerType[trainerType]].voucherType]));
+      if (
+        !globalScene.validateVoucher(vouchers[TrainerType[trainerType]]) &&
+        globalScene.currentBattle.trainer?.config.isBoss
+      ) {
+        if (timedEventManager.getUpgradeUnlockedVouchers()) {
+          globalScene.unshiftPhase(
+            new ModifierRewardPhase(
+              [
+                modifierTypes.VOUCHER_PLUS,
+                modifierTypes.VOUCHER_PLUS,
+                modifierTypes.VOUCHER_PLUS,
+                modifierTypes.VOUCHER_PREMIUM,
+              ][vouchers[TrainerType[trainerType]].voucherType],
+            ),
+          );
         } else {
-          globalScene.unshiftPhase(new ModifierRewardPhase([ modifierTypes.VOUCHER, modifierTypes.VOUCHER, modifierTypes.VOUCHER_PLUS, modifierTypes.VOUCHER_PREMIUM ][vouchers[TrainerType[trainerType]].voucherType]));
+          globalScene.unshiftPhase(
+            new ModifierRewardPhase(
+              [modifierTypes.VOUCHER, modifierTypes.VOUCHER, modifierTypes.VOUCHER_PLUS, modifierTypes.VOUCHER_PREMIUM][
+                vouchers[TrainerType[trainerType]].voucherType
+              ],
+            ),
+          );
         }
       }
     }
     // Breeders in Space achievement
     if (
-      globalScene.arena.biomeType === Biome.SPACE
-      && (trainerType === TrainerType.BREEDER || trainerType === TrainerType.EXPERT_POKEMON_BREEDER)
+      globalScene.arena.biomeType === Biome.SPACE &&
+      (trainerType === TrainerType.BREEDER || trainerType === TrainerType.EXPERT_POKEMON_BREEDER)
     ) {
       globalScene.validateAchv(achvs.BREEDERS_IN_SPACE);
     }
 
-    globalScene.ui.showText(i18next.t("battle:trainerDefeated", { trainerName: globalScene.currentBattle.trainer?.getName(TrainerSlot.NONE, true) }), null, () => {
-      const victoryMessages = globalScene.currentBattle.trainer?.getVictoryMessages()!; // TODO: is this bang correct?
-      let message: string;
-      globalScene.executeWithSeedOffset(() => message = Utils.randSeedItem(victoryMessages), globalScene.currentBattle.waveIndex);
-      message = message!; // tell TS compiler it's defined now
+    globalScene.ui.showText(
+      i18next.t("battle:trainerDefeated", {
+        trainerName: globalScene.currentBattle.trainer?.getName(TrainerSlot.NONE, true),
+      }),
+      null,
+      () => {
+        const victoryMessages = globalScene.currentBattle.trainer?.getVictoryMessages()!; // TODO: is this bang correct?
+        let message: string;
+        globalScene.executeWithSeedOffset(
+          () => (message = randSeedItem(victoryMessages)),
+          globalScene.currentBattle.waveIndex,
+        );
+        message = message!; // tell TS compiler it's defined now
 
-      const showMessage = () => {
-        const originalFunc = showMessageOrEnd;
-        showMessageOrEnd = () => globalScene.ui.showDialogue(message, globalScene.currentBattle.trainer?.getName(TrainerSlot.TRAINER, true), null, originalFunc);
-
-        showMessageOrEnd();
-      };
-      let showMessageOrEnd = () => this.end();
-      if (victoryMessages?.length) {
-        if (globalScene.currentBattle.trainer?.config.hasCharSprite && !globalScene.ui.shouldSkipDialogue(message)) {
+        const showMessage = () => {
           const originalFunc = showMessageOrEnd;
-          showMessageOrEnd = () => globalScene.charSprite.hide().then(() => globalScene.hideFieldOverlay(250).then(() => originalFunc()));
-          globalScene.showFieldOverlay(500).then(() => globalScene.charSprite.showCharacter(globalScene.currentBattle.trainer?.getKey()!, getCharVariantFromDialogue(victoryMessages[0])).then(() => showMessage())); // TODO: is this bang correct?
+          showMessageOrEnd = () =>
+            globalScene.ui.showDialogue(
+              message,
+              globalScene.currentBattle.trainer?.getName(TrainerSlot.TRAINER, true),
+              null,
+              originalFunc,
+            );
+
+          showMessageOrEnd();
+        };
+        let showMessageOrEnd = () => this.end();
+        if (victoryMessages?.length) {
+          if (globalScene.currentBattle.trainer?.config.hasCharSprite && !globalScene.ui.shouldSkipDialogue(message)) {
+            const originalFunc = showMessageOrEnd;
+            showMessageOrEnd = () =>
+              globalScene.charSprite.hide().then(() => globalScene.hideFieldOverlay(250).then(() => originalFunc()));
+            globalScene
+              .showFieldOverlay(500)
+              .then(() =>
+                globalScene.charSprite
+                  .showCharacter(
+                    globalScene.currentBattle.trainer?.getKey()!,
+                    getCharVariantFromDialogue(victoryMessages[0]),
+                  )
+                  .then(() => showMessage()),
+              ); // TODO: is this bang correct?
+          } else {
+            showMessage();
+          }
         } else {
-          showMessage();
+          showMessageOrEnd();
         }
-      } else {
-        showMessageOrEnd();
-      }
-    }, null, true);
+      },
+      null,
+      true,
+    );
 
     this.showEnemyTrainer();
   }
diff --git a/src/phases/turn-end-phase.ts b/src/phases/turn-end-phase.ts
index fc4190ef2eb..756c497802b 100644
--- a/src/phases/turn-end-phase.ts
+++ b/src/phases/turn-end-phase.ts
@@ -1,27 +1,31 @@
-import { applyPostTurnAbAttrs, PostTurnAbAttr } from "#app/data/ability";
+import { applyPostTurnAbAttrs, PostTurnAbAttr } from "#app/data/abilities/ability";
 import { BattlerTagLapseType } from "#app/data/battler-tags";
 import { TerrainType } from "#app/data/terrain";
 import { WeatherType } from "#app/enums/weather-type";
 import { TurnEndEvent } from "#app/events/battle-scene";
 import type Pokemon from "#app/field/pokemon";
 import { getPokemonNameWithAffix } from "#app/messages";
-import { TurnHealModifier, EnemyTurnHealModifier, EnemyStatusEffectHealChanceModifier, TurnStatusEffectModifier, TurnHeldItemTransferModifier } from "#app/modifier/modifier";
+import {
+  TurnHealModifier,
+  EnemyTurnHealModifier,
+  EnemyStatusEffectHealChanceModifier,
+  TurnStatusEffectModifier,
+  TurnHeldItemTransferModifier,
+} from "#app/modifier/modifier";
 import i18next from "i18next";
 import { FieldPhase } from "./field-phase";
 import { PokemonHealPhase } from "./pokemon-heal-phase";
 import { globalScene } from "#app/global-scene";
 
 export class TurnEndPhase extends FieldPhase {
-  constructor() {
-    super();
-  }
-
   start() {
     super.start();
 
     globalScene.currentBattle.incrementTurn();
     globalScene.eventTarget.dispatchEvent(new TurnEndEvent(globalScene.currentBattle.turn));
 
+    globalScene.hideAbilityBar();
+
     const handlePokemon = (pokemon: Pokemon) => {
       if (!pokemon.switchOutStatus) {
         pokemon.lapseTags(BattlerTagLapseType.TURN_END);
@@ -29,8 +33,16 @@ export class TurnEndPhase extends FieldPhase {
         globalScene.applyModifiers(TurnHealModifier, pokemon.isPlayer(), pokemon);
 
         if (globalScene.arena.terrain?.terrainType === TerrainType.GRASSY && pokemon.isGrounded()) {
-          globalScene.unshiftPhase(new PokemonHealPhase(pokemon.getBattlerIndex(),
-            Math.max(pokemon.getMaxHp() >> 4, 1), i18next.t("battle:turnEndHpRestore", { pokemonName: getPokemonNameWithAffix(pokemon) }), true));
+          globalScene.unshiftPhase(
+            new PokemonHealPhase(
+              pokemon.getBattlerIndex(),
+              Math.max(pokemon.getMaxHp() >> 4, 1),
+              i18next.t("battle:turnEndHpRestore", {
+                pokemonName: getPokemonNameWithAffix(pokemon),
+              }),
+              true,
+            ),
+          );
         }
 
         if (!pokemon.isPlayer()) {
@@ -42,11 +54,10 @@ export class TurnEndPhase extends FieldPhase {
       }
 
       globalScene.applyModifiers(TurnStatusEffectModifier, pokemon.isPlayer(), pokemon);
-
       globalScene.applyModifiers(TurnHeldItemTransferModifier, pokemon.isPlayer(), pokemon);
 
-      pokemon.battleSummonData.turnCount++;
-      pokemon.battleSummonData.waveTurnCount++;
+      pokemon.tempSummonData.turnCount++;
+      pokemon.tempSummonData.waveTurnCount++;
     };
 
     this.executeForAll(handlePokemon);
@@ -54,12 +65,12 @@ export class TurnEndPhase extends FieldPhase {
     globalScene.arena.lapseTags();
 
     if (globalScene.arena.weather && !globalScene.arena.weather.lapse()) {
-      globalScene.arena.trySetWeather(WeatherType.NONE, false);
+      globalScene.arena.trySetWeather(WeatherType.NONE);
       globalScene.arena.triggerWeatherBasedFormChangesToNormal();
     }
 
     if (globalScene.arena.terrain && !globalScene.arena.terrain.lapse()) {
-      globalScene.arena.trySetTerrain(TerrainType.NONE, false);
+      globalScene.arena.trySetTerrain(TerrainType.NONE);
     }
 
     this.end();
diff --git a/src/phases/turn-init-phase.ts b/src/phases/turn-init-phase.ts
index 946c9626718..0c110024af7 100644
--- a/src/phases/turn-init-phase.ts
+++ b/src/phases/turn-init-phase.ts
@@ -1,5 +1,8 @@
 import { BattlerIndex } from "#app/battle";
-import { handleMysteryEncounterBattleStartEffects, handleMysteryEncounterTurnStartEffects } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
+import {
+  handleMysteryEncounterBattleStartEffects,
+  handleMysteryEncounterTurnStartEffects,
+} from "#app/data/mystery-encounters/utils/encounter-phase-utils";
 import { TurnInitEvent } from "#app/events/battle-scene";
 import type { PlayerPokemon } from "#app/field/pokemon";
 import i18next from "i18next";
@@ -12,17 +15,13 @@ import { TurnStartPhase } from "./turn-start-phase";
 import { globalScene } from "#app/global-scene";
 
 export class TurnInitPhase extends FieldPhase {
-  constructor() {
-    super();
-  }
-
   start() {
     super.start();
 
     globalScene.getPlayerField().forEach(p => {
       // If this pokemon is in play and evolved into something illegal under the current challenge, force a switch
       if (p.isOnField() && !p.isAllowedInBattle()) {
-        globalScene.queueMessage(i18next.t("challenges:illegalEvolution", { "pokemon": p.name }), null, true);
+        globalScene.queueMessage(i18next.t("challenges:illegalEvolution", { pokemon: p.name }), null, true);
 
         const allowedPokemon = globalScene.getPokemonAllowedInBattle();
 
@@ -30,7 +29,10 @@ export class TurnInitPhase extends FieldPhase {
           // If there are no longer any legal pokemon in the party, game over.
           globalScene.clearPhaseQueue();
           globalScene.unshiftPhase(new GameOverPhase());
-        } else if (allowedPokemon.length >= globalScene.currentBattle.getBattlerCount() || (globalScene.currentBattle.double && !allowedPokemon[0].isActive(true))) {
+        } else if (
+          allowedPokemon.length >= globalScene.currentBattle.getBattlerCount() ||
+          (globalScene.currentBattle.double && !allowedPokemon[0].isActive(true))
+        ) {
           // If there is at least one pokemon in the back that is legal to switch in, force a switch.
           p.switchOut();
         } else {
diff --git a/src/phases/turn-start-phase.ts b/src/phases/turn-start-phase.ts
index c64d7ddf526..b802780bbb8 100644
--- a/src/phases/turn-start-phase.ts
+++ b/src/phases/turn-start-phase.ts
@@ -1,12 +1,12 @@
-import { applyAbAttrs, BypassSpeedChanceAbAttr, PreventBypassSpeedChanceAbAttr } from "#app/data/ability";
-import { allMoves, MoveHeaderAttr } from "#app/data/move";
+import { applyAbAttrs, BypassSpeedChanceAbAttr, PreventBypassSpeedChanceAbAttr } from "#app/data/abilities/ability";
+import { allMoves, MoveHeaderAttr } from "#app/data/moves/move";
 import { Abilities } from "#app/enums/abilities";
 import { Stat } from "#app/enums/stat";
 import type Pokemon from "#app/field/pokemon";
 import { PokemonMove } from "#app/field/pokemon";
 import { BypassSpeedChanceModifier } from "#app/modifier/modifier";
 import { Command } from "#app/ui/command-ui-handler";
-import * as Utils from "#app/utils";
+import { randSeedShuffle, BooleanHolder } from "#app/utils/common";
 import { AttemptCapturePhase } from "./attempt-capture-phase";
 import { AttemptRunPhase } from "./attempt-run-phase";
 import { BerryPhase } from "./berry-phase";
@@ -21,12 +21,9 @@ import { BattlerIndex } from "#app/battle";
 import { TrickRoomTag } from "#app/data/arena-tag";
 import { SwitchType } from "#enums/switch-type";
 import { globalScene } from "#app/global-scene";
+import { TeraPhase } from "./tera-phase";
 
 export class TurnStartPhase extends FieldPhase {
-  constructor() {
-    super();
-  }
-
   /**
    * This orders the active Pokemon on the field by speed into an BattlerIndex array and returns that array.
    * It also checks for Trick Room and reverses the array if it is present.
@@ -40,12 +37,16 @@ export class TurnStartPhase extends FieldPhase {
     let orderedTargets: Pokemon[] = playerField.concat(enemyField);
     // We seed it with the current turn to prevent an inconsistency where it
     // was varying based on how long since you last reloaded
-    globalScene.executeWithSeedOffset(() => {
-      orderedTargets = Utils.randSeedShuffle(orderedTargets);
-    }, globalScene.currentBattle.turn, globalScene.waveSeed);
+    globalScene.executeWithSeedOffset(
+      () => {
+        orderedTargets = randSeedShuffle(orderedTargets);
+      },
+      globalScene.currentBattle.turn,
+      globalScene.waveSeed,
+    );
 
     // Next, a check for Trick Room is applied to determine sort order.
-    const speedReversed = new Utils.BooleanHolder(false);
+    const speedReversed = new BooleanHolder(false);
     globalScene.arena.applyTags(TrickRoomTag, false, speedReversed);
 
     // Adjust the sort function based on whether Trick Room is active.
@@ -71,9 +72,9 @@ export class TurnStartPhase extends FieldPhase {
     // This occurs before the main loop because of battles with more than two Pokemon
     const battlerBypassSpeed = {};
 
-    globalScene.getField(true).filter(p => p.summonData).map(p => {
-      const bypassSpeed = new Utils.BooleanHolder(false);
-      const canCheckHeldItems = new Utils.BooleanHolder(true);
+    globalScene.getField(true).map(p => {
+      const bypassSpeed = new BooleanHolder(false);
+      const canCheckHeldItems = new BooleanHolder(true);
       applyAbAttrs(BypassSpeedChanceAbAttr, p, null, false, bypassSpeed);
       applyAbAttrs(PreventBypassSpeedChanceAbAttr, p, null, false, bypassSpeed, canCheckHeldItems);
       if (canCheckHeldItems.value) {
@@ -92,7 +93,8 @@ export class TurnStartPhase extends FieldPhase {
       if (aCommand?.command !== bCommand?.command) {
         if (aCommand?.command === Command.FIGHT) {
           return 1;
-        } else if (bCommand?.command === Command.FIGHT) {
+        }
+        if (bCommand?.command === Command.FIGHT) {
           return -1;
         }
       } else if (aCommand?.command === Command.FIGHT) {
@@ -114,7 +116,7 @@ export class TurnStartPhase extends FieldPhase {
           if (isSameBracket && battlerBypassSpeed[a].value !== battlerBypassSpeed[b].value) {
             return battlerBypassSpeed[a].value ? -1 : 1;
           }
-          return (aPriority < bPriority) ? 1 : -1;
+          return aPriority < bPriority ? 1 : -1;
         }
       }
 
@@ -139,8 +141,21 @@ export class TurnStartPhase extends FieldPhase {
 
     let orderIndex = 0;
 
-    for (const o of moveOrder) {
+    for (const o of this.getSpeedOrder()) {
+      const pokemon = field[o];
+      const preTurnCommand = globalScene.currentBattle.preTurnCommands[o];
 
+      if (preTurnCommand?.skip) {
+        continue;
+      }
+
+      switch (preTurnCommand?.command) {
+        case Command.TERA:
+          globalScene.pushPhase(new TeraPhase(pokemon));
+      }
+    }
+
+    for (const o of moveOrder) {
       const pokemon = field[o];
       const turnCommand = globalScene.currentBattle.turnCommands[o];
 
@@ -155,42 +170,62 @@ export class TurnStartPhase extends FieldPhase {
           if (!queuedMove) {
             continue;
           }
-          const move = pokemon.getMoveset().find(m => m?.moveId === queuedMove.move && m?.ppUsed < m?.getMovePp()) || new PokemonMove(queuedMove.move);
+          const move =
+            pokemon.getMoveset().find(m => m.moveId === queuedMove.move && m.ppUsed < m.getMovePp()) ||
+            new PokemonMove(queuedMove.move);
           if (move.getMove().hasAttr(MoveHeaderAttr)) {
             globalScene.unshiftPhase(new MoveHeaderPhase(pokemon, move));
           }
           if (pokemon.isPlayer()) {
             if (turnCommand.cursor === -1) {
-              globalScene.pushPhase(new MovePhase(pokemon, turnCommand.targets || turnCommand.move!.targets, move));//TODO: is the bang correct here?
+              globalScene.pushPhase(new MovePhase(pokemon, turnCommand.targets || turnCommand.move!.targets, move)); //TODO: is the bang correct here?
             } else {
-              const playerPhase = new MovePhase(pokemon, turnCommand.targets || turnCommand.move!.targets, move, false, queuedMove.ignorePP);//TODO: is the bang correct here?
+              const playerPhase = new MovePhase(
+                pokemon,
+                turnCommand.targets || turnCommand.move!.targets,
+                move,
+                false,
+                queuedMove.ignorePP,
+              ); //TODO: is the bang correct here?
               globalScene.pushPhase(playerPhase);
             }
           } else {
-            globalScene.pushPhase(new MovePhase(pokemon, turnCommand.targets || turnCommand.move!.targets, move, false, queuedMove.ignorePP));//TODO: is the bang correct here?
+            globalScene.pushPhase(
+              new MovePhase(
+                pokemon,
+                turnCommand.targets || turnCommand.move!.targets,
+                move,
+                false,
+                queuedMove.ignorePP,
+              ),
+            ); //TODO: is the bang correct here?
           }
           break;
         case Command.BALL:
-          globalScene.unshiftPhase(new AttemptCapturePhase(turnCommand.targets![0] % 2, turnCommand.cursor!));//TODO: is the bang correct here?
+          globalScene.unshiftPhase(new AttemptCapturePhase(turnCommand.targets![0] % 2, turnCommand.cursor!)); //TODO: is the bang correct here?
           break;
         case Command.POKEMON:
           const switchType = turnCommand.args?.[0] ? SwitchType.BATON_PASS : SwitchType.SWITCH;
-          globalScene.unshiftPhase(new SwitchSummonPhase(switchType, pokemon.getFieldIndex(), turnCommand.cursor!, true, pokemon.isPlayer()));
+          globalScene.unshiftPhase(
+            new SwitchSummonPhase(switchType, pokemon.getFieldIndex(), turnCommand.cursor!, true, pokemon.isPlayer()),
+          );
           break;
         case Command.RUN:
           let runningPokemon = pokemon;
           if (globalScene.currentBattle.double) {
             const playerActivePokemon = field.filter(pokemon => {
-              if (!!pokemon) {
+              if (pokemon) {
                 return pokemon.isPlayer() && pokemon.isActive();
-              } else {
-                return;
               }
+              return;
             });
             // if only one pokemon is alive, use that one
             if (playerActivePokemon.length > 1) {
-            // find which active pokemon has faster speed
-              const fasterPokemon = playerActivePokemon[0].getStat(Stat.SPD) > playerActivePokemon[1].getStat(Stat.SPD) ? playerActivePokemon[0] : playerActivePokemon[1];
+              // find which active pokemon has faster speed
+              const fasterPokemon =
+                playerActivePokemon[0].getStat(Stat.SPD) > playerActivePokemon[1].getStat(Stat.SPD)
+                  ? playerActivePokemon[0]
+                  : playerActivePokemon[1];
               // check if either active pokemon has the ability "Run Away"
               const hasRunAway = playerActivePokemon.find(p => p.hasAbility(Abilities.RUN_AWAY));
               runningPokemon = hasRunAway !== undefined ? hasRunAway : fasterPokemon;
@@ -210,10 +245,10 @@ export class TurnStartPhase extends FieldPhase {
     globalScene.pushPhase(new TurnEndPhase());
 
     /**
-       * this.end() will call shiftPhase(), which dumps everything from PrependQueue (aka everything that is unshifted()) to the front
-       * of the queue and dequeues to start the next phase
-       * this is important since stuff like SwitchSummon, AttemptRun, AttemptCapture Phases break the "flow" and should take precedence
-       */
+     * this.end() will call shiftPhase(), which dumps everything from PrependQueue (aka everything that is unshifted()) to the front
+     * of the queue and dequeues to start the next phase
+     * this is important since stuff like SwitchSummon, AttemptRun, AttemptCapture Phases break the "flow" and should take precedence
+     */
     this.end();
   }
 }
diff --git a/src/phases/unavailable-phase.ts b/src/phases/unavailable-phase.ts
index c0b5d4224c5..e5f1d899191 100644
--- a/src/phases/unavailable-phase.ts
+++ b/src/phases/unavailable-phase.ts
@@ -1,15 +1,11 @@
 import { globalScene } from "#app/global-scene";
 import { Phase } from "#app/phase";
-import { Mode } from "#app/ui/ui";
+import { UiMode } from "#enums/ui-mode";
 import { LoginPhase } from "./login-phase";
 
 export class UnavailablePhase extends Phase {
-  constructor() {
-    super();
-  }
-
   start(): void {
-    globalScene.ui.setMode(Mode.UNAVAILABLE, () => {
+    globalScene.ui.setMode(UiMode.UNAVAILABLE, () => {
       globalScene.unshiftPhase(new LoginPhase(true));
       this.end();
     });
diff --git a/src/phases/unlock-phase.ts b/src/phases/unlock-phase.ts
index 2d24ee92baf..7a69fc207bb 100644
--- a/src/phases/unlock-phase.ts
+++ b/src/phases/unlock-phase.ts
@@ -2,7 +2,7 @@ import { globalScene } from "#app/global-scene";
 import { Phase } from "#app/phase";
 import type { Unlockables } from "#app/system/unlockables";
 import { getUnlockableName } from "#app/system/unlockables";
-import { Mode } from "#app/ui/ui";
+import { UiMode } from "#enums/ui-mode";
 import i18next from "i18next";
 
 export class UnlockPhase extends Phase {
@@ -19,11 +19,20 @@ export class UnlockPhase extends Phase {
       globalScene.gameData.unlocks[this.unlockable] = true;
       // Sound loaded into game as is
       globalScene.playSound("level_up_fanfare");
-      globalScene.ui.setMode(Mode.MESSAGE);
-      globalScene.ui.showText(i18next.t("battle:unlockedSomething", { unlockedThing: getUnlockableName(this.unlockable) }), null, () => {
-        globalScene.time.delayedCall(1500, () => globalScene.arenaBg.setVisible(true));
-        this.end();
-      }, null, true, 1500);
+      globalScene.ui.setMode(UiMode.MESSAGE);
+      globalScene.ui.showText(
+        i18next.t("battle:unlockedSomething", {
+          unlockedThing: getUnlockableName(this.unlockable),
+        }),
+        null,
+        () => {
+          globalScene.time.delayedCall(1500, () => globalScene.arenaBg.setVisible(true));
+          this.end();
+        },
+        null,
+        true,
+        1500,
+      );
     });
   }
 }
diff --git a/src/phases/victory-phase.ts b/src/phases/victory-phase.ts
index 13e04569ef3..1204877fec2 100644
--- a/src/phases/victory-phase.ts
+++ b/src/phases/victory-phase.ts
@@ -1,5 +1,6 @@
 import type { BattlerIndex } from "#app/battle";
-import { BattleType, ClassicFixedBossWaves } from "#app/battle";
+import { ClassicFixedBossWaves } from "#enums/fixed-boss-waves";
+import { BattleType } from "#enums/battle-type";
 import type { CustomModifierSettings } from "#app/modifier/modifier-type";
 import { modifierTypes } from "#app/modifier/modifier-type";
 import { BattleEndPhase } from "./battle-end-phase";
@@ -13,12 +14,14 @@ import { SelectModifierPhase } from "./select-modifier-phase";
 import { TrainerVictoryPhase } from "./trainer-victory-phase";
 import { handleMysteryEncounterVictory } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
 import { globalScene } from "#app/global-scene";
+import { timedEventManager } from "#app/global-event-manager";
+import { SelectBiomePhase } from "./select-biome-phase";
 
 export class VictoryPhase extends PokemonPhase {
   /** If true, indicates that the phase is intended for EXP purposes only, and not to continue a battle to next phase */
   isExpOnly: boolean;
 
-  constructor(battlerIndex: BattlerIndex | number, isExpOnly: boolean = false) {
+  constructor(battlerIndex: BattlerIndex | number, isExpOnly = false) {
     super(battlerIndex);
 
     this.isExpOnly = isExpOnly;
@@ -42,22 +45,40 @@ export class VictoryPhase extends PokemonPhase {
       return this.end();
     }
 
-    if (!globalScene.getEnemyParty().find(p => globalScene.currentBattle.battleType === BattleType.WILD ? p.isOnField() : !p?.isFainted(true))) {
+    if (
+      !globalScene
+        .getEnemyParty()
+        .find(p => (globalScene.currentBattle.battleType === BattleType.WILD ? p.isOnField() : !p?.isFainted(true)))
+    ) {
       globalScene.pushPhase(new BattleEndPhase(true));
       if (globalScene.currentBattle.battleType === BattleType.TRAINER) {
         globalScene.pushPhase(new TrainerVictoryPhase());
       }
       if (globalScene.gameMode.isEndless || !globalScene.gameMode.isWaveFinal(globalScene.currentBattle.waveIndex)) {
         globalScene.pushPhase(new EggLapsePhase());
-        if (globalScene.gameMode.isClassic && globalScene.currentBattle.waveIndex === ClassicFixedBossWaves.EVIL_BOSS_2) {
-          // Should get Lock Capsule on 165 before shop phase so it can be used in the rewards shop
-          globalScene.pushPhase(new ModifierRewardPhase(modifierTypes.LOCK_CAPSULE));
+        if (globalScene.gameMode.isClassic) {
+          switch (globalScene.currentBattle.waveIndex) {
+            case ClassicFixedBossWaves.RIVAL_1:
+            case ClassicFixedBossWaves.RIVAL_2:
+              // Get event modifiers for this wave
+              timedEventManager
+                .getFixedBattleEventRewards(globalScene.currentBattle.waveIndex)
+                .map(r => globalScene.pushPhase(new ModifierRewardPhase(modifierTypes[r])));
+              break;
+            case ClassicFixedBossWaves.EVIL_BOSS_2:
+              // Should get Lock Capsule on 165 before shop phase so it can be used in the rewards shop
+              globalScene.pushPhase(new ModifierRewardPhase(modifierTypes.LOCK_CAPSULE));
+              break;
+          }
         }
         if (globalScene.currentBattle.waveIndex % 10) {
           globalScene.pushPhase(new SelectModifierPhase(undefined, undefined, this.getFixedBattleCustomModifiers()));
         } else if (globalScene.gameMode.isDaily) {
           globalScene.pushPhase(new ModifierRewardPhase(modifierTypes.EXP_CHARM));
-          if (globalScene.currentBattle.waveIndex > 10 && !globalScene.gameMode.isWaveFinal(globalScene.currentBattle.waveIndex)) {
+          if (
+            globalScene.currentBattle.waveIndex > 10 &&
+            !globalScene.gameMode.isWaveFinal(globalScene.currentBattle.waveIndex)
+          ) {
             globalScene.pushPhase(new ModifierRewardPhase(modifierTypes.GOLDEN_POKEBALL));
           }
         } else {
@@ -65,17 +86,37 @@ export class VictoryPhase extends PokemonPhase {
           if (globalScene.gameMode.isEndless && globalScene.currentBattle.waveIndex === 10) {
             globalScene.pushPhase(new ModifierRewardPhase(modifierTypes.EXP_SHARE));
           }
-          if (globalScene.currentBattle.waveIndex <= 750 && (globalScene.currentBattle.waveIndex <= 500 || (globalScene.currentBattle.waveIndex % 30) === superExpWave)) {
-            globalScene.pushPhase(new ModifierRewardPhase((globalScene.currentBattle.waveIndex % 30) !== superExpWave || globalScene.currentBattle.waveIndex > 250 ? modifierTypes.EXP_CHARM : modifierTypes.SUPER_EXP_CHARM));
+          if (
+            globalScene.currentBattle.waveIndex <= 750 &&
+            (globalScene.currentBattle.waveIndex <= 500 || globalScene.currentBattle.waveIndex % 30 === superExpWave)
+          ) {
+            globalScene.pushPhase(
+              new ModifierRewardPhase(
+                globalScene.currentBattle.waveIndex % 30 !== superExpWave || globalScene.currentBattle.waveIndex > 250
+                  ? modifierTypes.EXP_CHARM
+                  : modifierTypes.SUPER_EXP_CHARM,
+              ),
+            );
           }
           if (globalScene.currentBattle.waveIndex <= 150 && !(globalScene.currentBattle.waveIndex % 50)) {
             globalScene.pushPhase(new ModifierRewardPhase(modifierTypes.GOLDEN_POKEBALL));
           }
           if (globalScene.gameMode.isEndless && !(globalScene.currentBattle.waveIndex % 50)) {
-            globalScene.pushPhase(new ModifierRewardPhase(!(globalScene.currentBattle.waveIndex % 250) ? modifierTypes.VOUCHER_PREMIUM : modifierTypes.VOUCHER_PLUS));
+            globalScene.pushPhase(
+              new ModifierRewardPhase(
+                !(globalScene.currentBattle.waveIndex % 250)
+                  ? modifierTypes.VOUCHER_PREMIUM
+                  : modifierTypes.VOUCHER_PLUS,
+              ),
+            );
             globalScene.pushPhase(new AddEnemyBuffModifierPhase());
           }
         }
+
+        if (globalScene.gameMode.hasRandomBiomes || globalScene.isNewBiome()) {
+          globalScene.pushPhase(new SelectBiomePhase());
+        }
+
         globalScene.pushPhase(new NewBattlePhase());
       } else {
         globalScene.currentBattle.battleType = BattleType.CLEAR;
diff --git a/src/phases/weather-effect-phase.ts b/src/phases/weather-effect-phase.ts
index aa09f8a850d..d89c78e96c7 100644
--- a/src/phases/weather-effect-phase.ts
+++ b/src/phases/weather-effect-phase.ts
@@ -1,5 +1,13 @@
 import { globalScene } from "#app/global-scene";
-import { applyPreWeatherEffectAbAttrs, SuppressWeatherEffectAbAttr, PreWeatherDamageAbAttr, applyAbAttrs, BlockNonDirectDamageAbAttr, applyPostWeatherLapseAbAttrs, PostWeatherLapseAbAttr } from "#app/data/ability";
+import {
+  applyPreWeatherEffectAbAttrs,
+  SuppressWeatherEffectAbAttr,
+  PreWeatherDamageAbAttr,
+  applyAbAttrs,
+  BlockNonDirectDamageAbAttr,
+  applyPostWeatherLapseAbAttrs,
+  PostWeatherLapseAbAttr,
+} from "#app/data/abilities/ability";
 import { CommonAnim } from "#app/data/battle-anims";
 import type { Weather } from "#app/data/weather";
 import { getWeatherDamageMessage, getWeatherLapseMessage } from "#app/data/weather";
@@ -7,14 +15,18 @@ import { BattlerTagType } from "#app/enums/battler-tag-type";
 import { WeatherType } from "#app/enums/weather-type";
 import type Pokemon from "#app/field/pokemon";
 import { HitResult } from "#app/field/pokemon";
-import * as Utils from "#app/utils";
+import { BooleanHolder, toDmgValue } from "#app/utils/common";
 import { CommonAnimPhase } from "./common-anim-phase";
 
 export class WeatherEffectPhase extends CommonAnimPhase {
   public weather: Weather | null;
 
   constructor() {
-    super(undefined, undefined, CommonAnim.SUNNY + ((globalScene?.arena?.weather?.weatherType || WeatherType.NONE) - 1));
+    super(
+      undefined,
+      undefined,
+      CommonAnim.SUNNY + ((globalScene?.arena?.weather?.weatherType || WeatherType.NONE) - 1),
+    );
     this.weather = globalScene?.arena?.weather;
   }
 
@@ -23,37 +35,44 @@ export class WeatherEffectPhase extends CommonAnimPhase {
     this.weather = globalScene?.arena?.weather;
 
     if (!this.weather) {
-      this.end();
-      return;
+      return this.end();
     }
 
     this.setAnimation(CommonAnim.SUNNY + (this.weather.weatherType - 1));
 
     if (this.weather.isDamaging()) {
+      const cancelled = new BooleanHolder(false);
 
-      const cancelled = new Utils.BooleanHolder(false);
-
-      this.executeForAll((pokemon: Pokemon) => applyPreWeatherEffectAbAttrs(SuppressWeatherEffectAbAttr, pokemon, this.weather, cancelled));
+      this.executeForAll((pokemon: Pokemon) =>
+        applyPreWeatherEffectAbAttrs(SuppressWeatherEffectAbAttr, pokemon, this.weather, cancelled),
+      );
 
       if (!cancelled.value) {
         const inflictDamage = (pokemon: Pokemon) => {
-          const cancelled = new Utils.BooleanHolder(false);
+          const cancelled = new BooleanHolder(false);
 
           applyPreWeatherEffectAbAttrs(PreWeatherDamageAbAttr, pokemon, this.weather, cancelled);
           applyAbAttrs(BlockNonDirectDamageAbAttr, pokemon, cancelled);
 
-          if (cancelled.value || pokemon.getTag(BattlerTagType.UNDERGROUND) || pokemon.getTag(BattlerTagType.UNDERWATER)) {
+          if (
+            cancelled.value ||
+            pokemon.getTag(BattlerTagType.UNDERGROUND) ||
+            pokemon.getTag(BattlerTagType.UNDERWATER)
+          ) {
             return;
           }
 
-          const damage = Utils.toDmgValue(pokemon.getMaxHp() / 16);
+          const damage = toDmgValue(pokemon.getMaxHp() / 16);
 
-          globalScene.queueMessage(getWeatherDamageMessage(this.weather?.weatherType!, pokemon)!); // TODO: are those bangs correct?
-          pokemon.damageAndUpdate(damage, HitResult.EFFECTIVE, false, false, true);
+          globalScene.queueMessage(getWeatherDamageMessage(this.weather!.weatherType, pokemon) ?? "");
+          pokemon.damageAndUpdate(damage, { result: HitResult.INDIRECT, ignoreSegments: true });
         };
 
         this.executeForAll((pokemon: Pokemon) => {
-          const immune = !pokemon || !!pokemon.getTypes(true, true).filter(t => this.weather?.isTypeDamageImmune(t)).length || pokemon.switchOutStatus;
+          const immune =
+            !pokemon ||
+            !!pokemon.getTypes(true, true).filter(t => this.weather?.isTypeDamageImmune(t)).length ||
+            pokemon.switchOutStatus;
           if (!immune) {
             inflictDamage(pokemon);
           }
diff --git a/src/pipelines/field-sprite.ts b/src/pipelines/field-sprite.ts
index f81845073c1..a6e248c9998 100644
--- a/src/pipelines/field-sprite.ts
+++ b/src/pipelines/field-sprite.ts
@@ -1,226 +1,26 @@
 import { globalScene } from "#app/global-scene";
 import { TerrainType, getTerrainColor } from "../data/terrain";
-import * as Utils from "../utils";
-
-const spriteFragShader = `
-#ifdef GL_FRAGMENT_PRECISION_HIGH
-precision highp float;
-#else
-precision mediump float;
-#endif
-
-uniform sampler2D uMainSampler[%count%];
-
-varying vec2 outTexCoord;
-varying float outTexId;
-varying float outTintEffect;
-varying vec4 outTint;
-
-uniform float time;
-uniform int ignoreTimeTint;
-uniform int isOutside;
-uniform vec3 dayTint;
-uniform vec3 duskTint;
-uniform vec3 nightTint;
-uniform vec3 terrainColor;
-uniform float terrainColorRatio;
-
-float blendOverlay(float base, float blend) {
-	return base<0.5?(2.0*base*blend):(1.0-2.0*(1.0-base)*(1.0-blend));
-}
-
-vec3 blendOverlay(vec3 base, vec3 blend) {
-	return vec3(blendOverlay(base.r,blend.r),blendOverlay(base.g,blend.g),blendOverlay(base.b,blend.b));
-}
-
-vec3 blendHardLight(vec3 base, vec3 blend) {
-	return blendOverlay(blend, base);
-}
-
-float hue2rgb(float f1, float f2, float hue) {
-	if (hue < 0.0)
-		hue += 1.0;
-	else if (hue > 1.0)
-		hue -= 1.0;
-	float res;
-	if ((6.0 * hue) < 1.0)
-		res = f1 + (f2 - f1) * 6.0 * hue;
-	else if ((2.0 * hue) < 1.0)
-		res = f2;
-	else if ((3.0 * hue) < 2.0)
-		res = f1 + (f2 - f1) * ((2.0 / 3.0) - hue) * 6.0;
-	else
-		res = f1;
-	return res;
-}
-
-vec3 rgb2hsl(vec3 color) {
-	vec3 hsl;
-	
-	float fmin = min(min(color.r, color.g), color.b);
-	float fmax = max(max(color.r, color.g), color.b);
-	float delta = fmax - fmin;
-
-	hsl.z = (fmax + fmin) / 2.0;
-
-	if (delta == 0.0) {
-		hsl.x = 0.0;
-		hsl.y = 0.0;
-	} else {
-		if (hsl.z < 0.5)
-			hsl.y = delta / (fmax + fmin);
-		else
-			hsl.y = delta / (2.0 - fmax - fmin);
-		
-		float deltaR = (((fmax - color.r) / 6.0) + (delta / 2.0)) / delta;
-		float deltaG = (((fmax - color.g) / 6.0) + (delta / 2.0)) / delta;
-		float deltaB = (((fmax - color.b) / 6.0) + (delta / 2.0)) / delta;
-
-		if (color.r == fmax )
-			hsl.x = deltaB - deltaG;
-		else if (color.g == fmax)
-			hsl.x = (1.0 / 3.0) + deltaR - deltaB;
-		else if (color.b == fmax)
-			hsl.x = (2.0 / 3.0) + deltaG - deltaR;
-
-		if (hsl.x < 0.0)
-			hsl.x += 1.0;
-		else if (hsl.x > 1.0)
-			hsl.x -= 1.0;
-	}
-
-	return hsl;
-}
-
-vec3 hsl2rgb(vec3 hsl) {
-	vec3 rgb;
-	
-	if (hsl.y == 0.0)
-		rgb = vec3(hsl.z);
-	else {
-		float f2;
-		
-		if (hsl.z < 0.5)
-			f2 = hsl.z * (1.0 + hsl.y);
-		else
-			f2 = (hsl.z + hsl.y) - (hsl.y * hsl.z);
-			
-		float f1 = 2.0 * hsl.z - f2;
-		
-		rgb.r = hue2rgb(f1, f2, hsl.x + (1.0/3.0));
-		rgb.g = hue2rgb(f1, f2, hsl.x);
-		rgb.b = hue2rgb(f1, f2, hsl.x - (1.0/3.0));
-	}
-	
-	return rgb;
-}
-
-vec3 blendHue(vec3 base, vec3 blend) {
-	vec3 baseHSL = rgb2hsl(base);
-	return hsl2rgb(vec3(rgb2hsl(blend).r, baseHSL.g, baseHSL.b));
-}
-
-void main() {
-    vec4 texture;
-
-    %forloop%
-
-    vec4 texel = vec4(outTint.bgr * outTint.a, outTint.a);
-
-    //  Multiply texture tint
-    vec4 color = texture * texel;
-
-    if (outTintEffect == 1.0) {
-        //  Solid color + texture alpha
-        color.rgb = mix(texture.rgb, outTint.bgr * outTint.a, texture.a);
-    } else if (outTintEffect == 2.0) {
-        //  Solid color, no texture
-        color = texel;
-    }
-
-    /* Apply day/night tint */
-    if (color.a > 0.0 && ignoreTimeTint == 0) {
-        vec3 dayNightTint;
-
-        if (time < 0.25) {
-            dayNightTint = dayTint;
-        } else if (isOutside == 0 && time < 0.5) {
-            dayNightTint = mix(dayTint, nightTint, (time - 0.25) / 0.25);
-        } else if (time < 0.375) {
-            dayNightTint = mix(dayTint, duskTint, (time - 0.25) / 0.125);
-        } else if (time < 0.5) {
-            dayNightTint = mix(duskTint, nightTint, (time - 0.375) / 0.125);
-        } else if (time < 0.75) {
-            dayNightTint = nightTint;
-        } else if (isOutside == 0) {
-            dayNightTint = mix(nightTint, dayTint, (time - 0.75) / 0.25);
-        } else if (time < 0.875) {
-            dayNightTint = mix(nightTint, duskTint, (time - 0.75) / 0.125);
-        } else {
-            dayNightTint = mix(duskTint, dayTint, (time - 0.875) / 0.125);
-        }
-
-        color = vec4(blendHardLight(color.rgb, dayNightTint), color.a);
-    }
-
-    if (terrainColorRatio > 0.0 && (1.0 - terrainColorRatio) < outTexCoord.y) {
-        if (color.a > 0.0 && (terrainColor.r > 0.0 || terrainColor.g > 0.0 || terrainColor.b > 0.0)) {
-            color.rgb = mix(color.rgb, blendHue(color.rgb, terrainColor), 1.0);
-        }
-    }
-
-    gl_FragColor = color;
-}
-`;
-
-const spriteVertShader = `
-precision mediump float;
-
-uniform mat4 uProjectionMatrix;
-uniform int uRoundPixels;
-uniform vec2 uResolution;
-
-attribute vec2 inPosition;
-attribute vec2 inTexCoord;
-attribute float inTexId;
-attribute float inTintEffect;
-attribute vec4 inTint;
-
-varying vec2 outTexCoord;
-varying float outTexId;
-varying vec2 outPosition;
-varying float outTintEffect;
-varying vec4 outTint;
-
-void main() {
-    gl_Position = uProjectionMatrix * vec4(inPosition, 1.0, 1.0);
-    if (uRoundPixels == 1)
-    {
-        gl_Position.xy = floor(((gl_Position.xy + 1.0) * 0.5 * uResolution) + 0.5) / uResolution * 2.0 - 1.0;
-    }
-    outTexCoord = inTexCoord;
-    outTexId = inTexId;
-    outPosition = inPosition;
-    outTint = inTint;
-    outTintEffect = inTintEffect;
-}
-`;
+import { getCurrentTime } from "#app/utils/common";
+import fieldSpriteFragShader from "./glsl/fieldSpriteFragShader.frag?raw";
+import spriteVertShader from "./glsl/spriteShader.vert?raw";
 
 export default class FieldSpritePipeline extends Phaser.Renderer.WebGL.Pipelines.MultiPipeline {
   constructor(game: Phaser.Game, config?: Phaser.Types.Renderer.WebGL.WebGLPipelineConfig) {
-    super(config || {
-      game: game,
-      name: "field-sprite",
-      fragShader: spriteFragShader,
-      vertShader: spriteVertShader
-    });
+    super(
+      config || {
+        game: game,
+        name: "field-sprite",
+        fragShader: fieldSpriteFragShader,
+        vertShader: spriteVertShader,
+      },
+    );
   }
 
   onPreRender(): void {
     this.set1f("time", 0);
     this.set1i("ignoreTimeTint", 0);
     this.set1f("terrainColorRatio", 0);
-    this.set3fv("terrainColor", [ 0, 0, 0 ]);
+    this.set3fv("terrainColor", [0, 0, 0]);
   }
 
   onBind(gameObject: Phaser.GameObjects.GameObject): void {
@@ -230,18 +30,30 @@ export default class FieldSpritePipeline extends Phaser.Renderer.WebGL.Pipelines
 
     const data = sprite.pipelineData;
     const ignoreTimeTint = data["ignoreTimeTint"] as boolean;
-    const terrainColorRatio = data["terrainColorRatio"] as number || 0;
+    const terrainColorRatio = (data["terrainColorRatio"] as number) || 0;
 
     const time = globalScene.currentBattle?.waveIndex
       ? ((globalScene.currentBattle.waveIndex + globalScene.waveCycleOffset) % 40) / 40 // ((new Date().getSeconds() * 1000 + new Date().getMilliseconds()) % 10000) / 10000
-      : Utils.getCurrentTime();
+      : getCurrentTime();
     this.set1f("time", time);
     this.set1i("ignoreTimeTint", ignoreTimeTint ? 1 : 0);
     this.set1i("isOutside", globalScene.arena.isOutside() ? 1 : 0);
-    this.set3fv("dayTint", globalScene.arena.getDayTint().map(c => c / 255));
-    this.set3fv("duskTint", globalScene.arena.getDuskTint().map(c => c / 255));
-    this.set3fv("nightTint", globalScene.arena.getNightTint().map(c => c / 255));
-    this.set3fv("terrainColor", getTerrainColor(globalScene.arena.terrain?.terrainType || TerrainType.NONE).map(c => c / 255));
+    this.set3fv(
+      "dayTint",
+      globalScene.arena.getDayTint().map(c => c / 255),
+    );
+    this.set3fv(
+      "duskTint",
+      globalScene.arena.getDuskTint().map(c => c / 255),
+    );
+    this.set3fv(
+      "nightTint",
+      globalScene.arena.getNightTint().map(c => c / 255),
+    );
+    this.set3fv(
+      "terrainColor",
+      getTerrainColor(globalScene.arena.terrain?.terrainType || TerrainType.NONE).map(c => c / 255),
+    );
     this.set1f("terrainColorRatio", terrainColorRatio);
   }
 
diff --git a/src/pipelines/glsl/fieldSpriteFragShader.frag b/src/pipelines/glsl/fieldSpriteFragShader.frag
new file mode 100644
index 00000000000..e79dea86fe9
--- /dev/null
+++ b/src/pipelines/glsl/fieldSpriteFragShader.frag
@@ -0,0 +1,168 @@
+#ifdef GL_FRAGMENT_PRECISION_HIGH
+precision highp float;
+#else
+precision mediump float;
+#endif
+
+uniform sampler2D uMainSampler[%count%];
+
+varying vec2 outTexCoord;
+varying float outTexId;
+varying float outTintEffect;
+varying vec4 outTint;
+
+uniform float time;
+uniform int ignoreTimeTint;
+uniform int isOutside;
+uniform vec3 dayTint;
+uniform vec3 duskTint;
+uniform vec3 nightTint;
+uniform vec3 terrainColor;
+uniform float terrainColorRatio;
+
+float blendOverlay(float base, float blend) {
+	return base<0.5?(2.0*base*blend):(1.0-2.0*(1.0-base)*(1.0-blend));
+}
+
+vec3 blendOverlay(vec3 base, vec3 blend) {
+	return vec3(blendOverlay(base.r,blend.r),blendOverlay(base.g,blend.g),blendOverlay(base.b,blend.b));
+}
+
+vec3 blendHardLight(vec3 base, vec3 blend) {
+	return blendOverlay(blend, base);
+}
+
+float hue2rgb(float f1, float f2, float hue) {
+	if (hue < 0.0)
+		hue += 1.0;
+	else if (hue > 1.0)
+		hue -= 1.0;
+	float res;
+	if ((6.0 * hue) < 1.0)
+		res = f1 + (f2 - f1) * 6.0 * hue;
+	else if ((2.0 * hue) < 1.0)
+		res = f2;
+	else if ((3.0 * hue) < 2.0)
+		res = f1 + (f2 - f1) * ((2.0 / 3.0) - hue) * 6.0;
+	else
+		res = f1;
+	return res;
+}
+
+vec3 rgb2hsl(vec3 color) {
+	vec3 hsl;
+	
+	float fmin = min(min(color.r, color.g), color.b);
+	float fmax = max(max(color.r, color.g), color.b);
+	float delta = fmax - fmin;
+
+	hsl.z = (fmax + fmin) / 2.0;
+
+	if (delta == 0.0) {
+		hsl.x = 0.0;
+		hsl.y = 0.0;
+	} else {
+		if (hsl.z < 0.5)
+			hsl.y = delta / (fmax + fmin);
+		else
+			hsl.y = delta / (2.0 - fmax - fmin);
+		
+		float deltaR = (((fmax - color.r) / 6.0) + (delta / 2.0)) / delta;
+		float deltaG = (((fmax - color.g) / 6.0) + (delta / 2.0)) / delta;
+		float deltaB = (((fmax - color.b) / 6.0) + (delta / 2.0)) / delta;
+
+		if (color.r == fmax )
+			hsl.x = deltaB - deltaG;
+		else if (color.g == fmax)
+			hsl.x = (1.0 / 3.0) + deltaR - deltaB;
+		else if (color.b == fmax)
+			hsl.x = (2.0 / 3.0) + deltaG - deltaR;
+
+		if (hsl.x < 0.0)
+			hsl.x += 1.0;
+		else if (hsl.x > 1.0)
+			hsl.x -= 1.0;
+	}
+
+	return hsl;
+}
+
+vec3 hsl2rgb(vec3 hsl) {
+	vec3 rgb;
+	
+	if (hsl.y == 0.0)
+		rgb = vec3(hsl.z);
+	else {
+		float f2;
+		
+		if (hsl.z < 0.5)
+			f2 = hsl.z * (1.0 + hsl.y);
+		else
+			f2 = (hsl.z + hsl.y) - (hsl.y * hsl.z);
+			
+		float f1 = 2.0 * hsl.z - f2;
+		
+		rgb.r = hue2rgb(f1, f2, hsl.x + (1.0/3.0));
+		rgb.g = hue2rgb(f1, f2, hsl.x);
+		rgb.b = hue2rgb(f1, f2, hsl.x - (1.0/3.0));
+	}
+	
+	return rgb;
+}
+
+vec3 blendHue(vec3 base, vec3 blend) {
+	vec3 baseHSL = rgb2hsl(base);
+	return hsl2rgb(vec3(rgb2hsl(blend).r, baseHSL.g, baseHSL.b));
+}
+
+void main() {
+	vec4 texture;
+
+	%forloop%
+
+	vec4 texel = vec4(outTint.bgr * outTint.a, outTint.a);
+
+	//  Multiply texture tint
+	vec4 color = texture * texel;
+
+	if (outTintEffect == 1.0) {
+		//  Solid color + texture alpha
+		color.rgb = mix(texture.rgb, outTint.bgr * outTint.a, texture.a);
+	} else if (outTintEffect == 2.0) {
+		//  Solid color, no texture
+		color = texel;
+	}
+
+	/* Apply day/night tint */
+	if (color.a > 0.0 && ignoreTimeTint == 0) {
+		vec3 dayNightTint;
+
+		if (time < 0.25) {
+			dayNightTint = dayTint;
+		} else if (isOutside == 0 && time < 0.5) {
+			dayNightTint = mix(dayTint, nightTint, (time - 0.25) / 0.25);
+		} else if (time < 0.375) {
+			dayNightTint = mix(dayTint, duskTint, (time - 0.25) / 0.125);
+		} else if (time < 0.5) {
+			dayNightTint = mix(duskTint, nightTint, (time - 0.375) / 0.125);
+		} else if (time < 0.75) {
+			dayNightTint = nightTint;
+		} else if (isOutside == 0) {
+			dayNightTint = mix(nightTint, dayTint, (time - 0.75) / 0.25);
+		} else if (time < 0.875) {
+			dayNightTint = mix(nightTint, duskTint, (time - 0.75) / 0.125);
+		} else {
+			dayNightTint = mix(duskTint, dayTint, (time - 0.875) / 0.125);
+		}
+
+		color = vec4(blendHardLight(color.rgb, dayNightTint), color.a);
+	}
+
+	if (terrainColorRatio > 0.0 && (1.0 - terrainColorRatio) < outTexCoord.y) {
+		if (color.a > 0.0 && (terrainColor.r > 0.0 || terrainColor.g > 0.0 || terrainColor.b > 0.0)) {
+			color.rgb = mix(color.rgb, blendHue(color.rgb, terrainColor), 1.0);
+		}
+	}
+
+	gl_FragColor = color;
+}
\ No newline at end of file
diff --git a/src/pipelines/glsl/invert.frag b/src/pipelines/glsl/invert.frag
new file mode 100644
index 00000000000..24d9ee83a55
--- /dev/null
+++ b/src/pipelines/glsl/invert.frag
@@ -0,0 +1,10 @@
+precision mediump float;
+
+uniform sampler2D uMainSampler;
+
+varying vec2 outTexCoord;
+
+void main()
+{
+	gl_FragColor = 1.0 - texture2D(uMainSampler, outTexCoord);
+}
\ No newline at end of file
diff --git a/src/pipelines/glsl/spriteFragShader.frag b/src/pipelines/glsl/spriteFragShader.frag
new file mode 100644
index 00000000000..03f8c8c27bc
--- /dev/null
+++ b/src/pipelines/glsl/spriteFragShader.frag
@@ -0,0 +1,267 @@
+#ifdef GL_FRAGMENT_PRECISION_HIGH
+precision highp float;
+#else
+precision mediump float;
+#endif
+
+uniform sampler2D uMainSampler[%count%];
+
+varying vec2 outTexCoord;
+varying float outTexId;
+varying vec2 outPosition;
+varying float outTintEffect;
+varying vec4 outTint;
+
+uniform float time;
+uniform int ignoreTimeTint;
+uniform int isOutside;
+uniform vec3 dayTint;
+uniform vec3 duskTint;
+uniform vec3 nightTint;
+uniform float teraTime;
+uniform vec3 teraColor;
+uniform int hasShadow;
+uniform int yCenter;
+uniform float fieldScale;
+uniform float vCutoff;
+uniform vec2 relPosition;
+uniform vec2 texFrameUv;
+uniform vec2 size;
+uniform vec2 texSize;
+uniform float yOffset;
+uniform float yShadowOffset;
+uniform vec4 tone;
+uniform vec4 baseVariantColors[32];
+uniform vec4 variantColors[32];
+uniform vec4 spriteColors[32];
+uniform ivec4 fusionSpriteColors[32];
+
+const vec3 lumaF = vec3(.299, .587, .114);
+
+float blendOverlay(float base, float blend) {
+	return base<0.5?(2.0*base*blend):(1.0-2.0*(1.0-base)*(1.0-blend));
+}
+
+vec3 blendOverlay(vec3 base, vec3 blend) {
+	return vec3(blendOverlay(base.r,blend.r),blendOverlay(base.g,blend.g),blendOverlay(base.b,blend.b));
+}
+
+vec3 blendHardLight(vec3 base, vec3 blend) {
+	return blendOverlay(blend, base);
+}
+
+float hue2rgb(float f1, float f2, float hue) {
+	if (hue < 0.0)
+		hue += 1.0;
+	else if (hue > 1.0)
+		hue -= 1.0;
+	float res;
+	if ((6.0 * hue) < 1.0)
+		res = f1 + (f2 - f1) * 6.0 * hue;
+	else if ((2.0 * hue) < 1.0)
+		res = f2;
+	else if ((3.0 * hue) < 2.0)
+		res = f1 + (f2 - f1) * ((2.0 / 3.0) - hue) * 6.0;
+	else
+		res = f1;
+	return res;
+}
+
+vec3 rgb2hsl(vec3 color) {
+	vec3 hsl;
+	float fmin = min(min(color.r, color.g), color.b);
+	float fmax = max(max(color.r, color.g), color.b);
+	float delta = fmax - fmin;
+
+	hsl.z = (fmax + fmin) / 2.0;
+
+	if (delta == 0.0) {
+		hsl.x = 0.0;
+		hsl.y = 0.0;
+	} else {
+		if (hsl.z < 0.5)
+			hsl.y = delta / (fmax + fmin);
+		else
+			hsl.y = delta / (2.0 - fmax - fmin);
+		
+		float deltaR = (((fmax - color.r) / 6.0) + (delta / 2.0)) / delta;
+		float deltaG = (((fmax - color.g) / 6.0) + (delta / 2.0)) / delta;
+		float deltaB = (((fmax - color.b) / 6.0) + (delta / 2.0)) / delta;
+
+		if (color.r == fmax )
+			hsl.x = deltaB - deltaG;
+		else if (color.g == fmax)
+			hsl.x = (1.0 / 3.0) + deltaR - deltaB;
+		else if (color.b == fmax)
+			hsl.x = (2.0 / 3.0) + deltaG - deltaR;
+
+		if (hsl.x < 0.0)
+			hsl.x += 1.0;
+		else if (hsl.x > 1.0)
+			hsl.x -= 1.0;
+	}
+
+	return hsl;
+}
+
+vec3 hsl2rgb(vec3 hsl) {
+	vec3 rgb;
+	
+	if (hsl.y == 0.0)
+		rgb = vec3(hsl.z);
+	else {
+		float f2;
+		
+		if (hsl.z < 0.5)
+			f2 = hsl.z * (1.0 + hsl.y);
+		else
+			f2 = (hsl.z + hsl.y) - (hsl.y * hsl.z);
+			
+		float f1 = 2.0 * hsl.z - f2;
+		
+		rgb.r = hue2rgb(f1, f2, hsl.x + (1.0/3.0));
+		rgb.g = hue2rgb(f1, f2, hsl.x);
+		rgb.b= hue2rgb(f1, f2, hsl.x - (1.0/3.0));
+	}
+	
+	return rgb;
+}
+
+vec3 blendHue(vec3 base, vec3 blend) {
+	vec3 baseHSL = rgb2hsl(base);
+	return hsl2rgb(vec3(rgb2hsl(blend).r, baseHSL.g, baseHSL.b));
+}
+
+vec3 rgb2hsv(vec3 c) {
+	vec4 K = vec4(0.0, -1.0 / 3.0, 2.0 / 3.0, -1.0);
+	vec4 p = mix(vec4(c.bg, K.wz), vec4(c.gb, K.xy), step(c.b, c.g));
+	vec4 q = mix(vec4(p.xyw, c.r), vec4(c.r, p.yzx), step(p.x, c.r));
+
+	float d = q.x - min(q.w, q.y);
+	float e = 1.0e-10;
+	return vec3(abs(q.z + (q.w - q.y) / (6.0 * d + e)), d / (q.x + e), q.x);
+}
+
+vec3 hsv2rgb(vec3 c) {
+	vec4 K = vec4(1.0, 2.0 / 3.0, 1.0 / 3.0, 3.0);
+	vec3 p = abs(fract(c.xxx + K.xyz) * 6.0 - K.www);
+	return c.z * mix(K.xxx, clamp(p - K.xxx, 0.0, 1.0), c.y);
+}
+
+void main() {
+	vec4 texture = texture2D(uMainSampler[0], outTexCoord);
+
+	for (int i = 0; i < 32; i++) {
+		if (baseVariantColors[i].a == 0.0)
+			break;
+		if (texture.a > 0.0 && all(lessThan(abs(texture.rgb - baseVariantColors[i].rgb), vec3(1.0/255.0)))) {
+			texture.rgb = variantColors[i].rgb;
+			break;
+		}
+	}
+
+	for (int i = 0; i < 32; i++) {
+		if (spriteColors[i][3] == 0.0)
+			break;
+		if (texture.a > 0.0 && all(lessThan(abs(texture.rgb - spriteColors[i].rgb), vec3(1.0/255.0)))) {
+			vec3 fusionColor = vec3(fusionSpriteColors[i].rgb) / 255.0;
+			vec3 bg = spriteColors[i].rgb;
+			float gray = (bg.r + bg.g + bg.b) / 3.0;
+			bg = vec3(gray);
+			vec3 fg = fusionColor;
+			texture.rgb = mix(1.0 - 2.0 * (1.0 - bg) * (1.0 - fg), 2.0 * bg * fg, step(bg, vec3(0.5)));
+			break;
+		}
+	}
+
+	vec4 texel = vec4(outTint.bgr * outTint.a, outTint.a);
+
+	//  Multiply texture tint
+	vec4 color = texture * texel;
+
+	if (color.a > 0.0 && teraColor.r > 0.0 && teraColor.g > 0.0 && teraColor.b > 0.0) {
+		vec2 relUv = (outTexCoord.xy - texFrameUv.xy) / (size.xy / texSize.xy);
+		vec2 teraTexCoord = vec2(relUv.x * (size.x / 200.0), relUv.y * (size.y / 120.0));
+		vec4 teraCol = texture2D(uMainSampler[1], teraTexCoord);
+		float floorValue = 86.0 / 255.0;
+		vec3 teraPatternHsv = rgb2hsv(teraCol.rgb);
+		teraCol.rgb = hsv2rgb(vec3((teraPatternHsv.b - floorValue) * 4.0 + teraTexCoord.x * fieldScale / 2.0 + teraTexCoord.y * fieldScale / 2.0 + teraTime * 255.0, teraPatternHsv.b, teraPatternHsv.b));
+
+		color.rgb = mix(color.rgb, blendHue(color.rgb, teraColor), 0.625);
+		teraCol.rgb = mix(teraCol.rgb, teraColor, 0.5);
+		color.rgb = blendOverlay(color.rgb, teraCol.rgb);
+
+		if (any(lessThan(teraCol.rgb, vec3(1.0)))) {
+			vec3 teraColHsv = rgb2hsv(teraColor);
+			color.rgb = mix(color.rgb, teraColor, (1.0 - teraColHsv.g) / 2.0);
+		}
+	}
+
+	if (outTintEffect == 1.0) {
+		//  Solid color + texture alpha
+		color.rgb = mix(texture.rgb, outTint.bgr * outTint.a, texture.a);
+	} else if (outTintEffect == 2.0) {
+		//  Solid color, no texture
+		color = texel;
+	}
+
+	/* Apply gray */
+	float luma = dot(color.rgb, lumaF);
+	color.rgb = mix(color.rgb, vec3(luma), tone.w);
+
+	/* Apply tone */
+	color.rgb += tone.rgb * (color.a / 255.0);
+
+	/* Apply day/night tint */
+	if (color.a > 0.0 && ignoreTimeTint == 0) {
+		vec3 dayNightTint;
+
+		if (time < 0.25) {
+			dayNightTint = dayTint;
+		} else if (isOutside == 0 && time < 0.5) {
+			dayNightTint = mix(dayTint, nightTint, (time - 0.25) / 0.25);
+		} else if (time < 0.375) {
+			dayNightTint = mix(dayTint, duskTint, (time - 0.25) / 0.125);
+		} else if (time < 0.5) {
+			dayNightTint = mix(duskTint, nightTint, (time - 0.375) / 0.125);
+		} else if (time < 0.75) {
+			dayNightTint = nightTint;
+		} else if (isOutside == 0) {
+			dayNightTint = mix(nightTint, dayTint, (time - 0.75) / 0.25);
+		} else if (time < 0.875) {
+			dayNightTint = mix(nightTint, duskTint, (time - 0.75) / 0.125);
+		} else {
+			dayNightTint = mix(duskTint, dayTint, (time - 0.875) / 0.125);
+		}
+
+		color.rgb = blendHardLight(color.rgb, dayNightTint);
+	}
+
+	if (hasShadow == 1) {
+		float width = size.x - (yOffset / 2.0);
+
+		float spriteX = ((floor(outPosition.x / fieldScale) - relPosition.x) / width) + 0.5;
+		float spriteY = ((floor(outPosition.y / fieldScale) - relPosition.y - yShadowOffset) / size.y);
+
+		if (yCenter == 1) {
+			spriteY += 0.5;
+		} else {
+			spriteY += 1.0;
+		}
+
+		bool yOverflow = outTexCoord.y >= vCutoff;
+
+		if ((spriteY >= 0.9 && (color.a == 0.0 || yOverflow))) {
+			float shadowSpriteY = (spriteY - 0.9) * (1.0 / 0.15);
+			if (distance(vec2(spriteX, shadowSpriteY), vec2(0.5)) < 0.5) {
+				color = vec4(vec3(0.0), 0.5);
+			} else if (yOverflow) {
+				discard;
+			}
+		} else if (yOverflow) {
+			discard;
+		}
+	}
+
+	gl_FragColor = color;
+}
\ No newline at end of file
diff --git a/src/pipelines/glsl/spriteShader.vert b/src/pipelines/glsl/spriteShader.vert
new file mode 100644
index 00000000000..84e73834f49
--- /dev/null
+++ b/src/pipelines/glsl/spriteShader.vert
@@ -0,0 +1,31 @@
+precision mediump float;
+
+uniform mat4 uProjectionMatrix;
+uniform int uRoundPixels;
+uniform vec2 uResolution;
+
+attribute vec2 inPosition;
+attribute vec2 inTexCoord;
+attribute float inTexId;
+attribute float inTintEffect;
+attribute vec4 inTint;
+
+varying vec2 outTexCoord;
+varying float outTexId;
+varying vec2 outPosition;
+varying float outTintEffect;
+varying vec4 outTint;
+
+void main()
+{
+	gl_Position = uProjectionMatrix * vec4(inPosition, 1.0, 1.0);
+	if (uRoundPixels == 1)
+	{
+		gl_Position.xy = floor(((gl_Position.xy + 1.0) * 0.5 * uResolution) + 0.5) / uResolution * 2.0 - 1.0;
+	}
+	outTexCoord = inTexCoord;
+	outTexId = inTexId;
+	outPosition = inPosition;
+	outTint = inTint;
+	outTintEffect = inTintEffect;
+}
\ No newline at end of file
diff --git a/src/pipelines/invert.ts b/src/pipelines/invert.ts
index 9c30f2b5cee..0ebc3ad865f 100644
--- a/src/pipelines/invert.ts
+++ b/src/pipelines/invert.ts
@@ -1,27 +1,13 @@
 import type { Game } from "phaser";
-
-const fragShader = `
-precision mediump float;
-
-uniform sampler2D uMainSampler;
-
-varying vec2 outTexCoord;
-
-void main()
-{
-    gl_FragColor = 1.0 - texture2D(uMainSampler, outTexCoord);
-}
-`;
+import fragShader from "./glsl/invert.frag?raw";
 
 export default class InvertPostFX extends Phaser.Renderer.WebGL.Pipelines.PostFXPipeline {
-  constructor (game: Game) {
+  constructor(game: Game) {
     super({
       game,
       name: "InvertPostFX",
       fragShader,
-      uniforms: [
-        "uMainSampler"
-      ]
+      uniforms: ["uMainSampler"],
     } as Phaser.Types.Renderer.WebGL.WebGLPipelineConfig);
   }
 }
diff --git a/src/pipelines/sprite.ts b/src/pipelines/sprite.ts
index 67639d6450a..307c2cee4cc 100644
--- a/src/pipelines/sprite.ts
+++ b/src/pipelines/sprite.ts
@@ -1,318 +1,12 @@
-import { variantColorCache } from "#app/data/variant";
+import { variantColorCache } from "#app/sprites/variant";
 import MysteryEncounterIntroVisuals from "#app/field/mystery-encounter-intro";
 import Pokemon from "#app/field/pokemon";
 import Trainer from "#app/field/trainer";
 import { globalScene } from "#app/global-scene";
-import * as Utils from "#app/utils";
+import { rgbHexToRgba } from "#app/utils/common";
 import FieldSpritePipeline from "./field-sprite";
-
-const spriteFragShader = `
-#ifdef GL_FRAGMENT_PRECISION_HIGH
-precision highp float;
-#else
-precision mediump float;
-#endif
-
-uniform sampler2D uMainSampler[%count%];
-
-varying vec2 outTexCoord;
-varying float outTexId;
-varying vec2 outPosition;
-varying float outTintEffect;
-varying vec4 outTint;
-
-uniform float time;
-uniform int ignoreTimeTint;
-uniform int isOutside;
-uniform vec3 dayTint;
-uniform vec3 duskTint;
-uniform vec3 nightTint;
-uniform float teraTime;
-uniform vec3 teraColor;
-uniform int hasShadow;
-uniform int yCenter;
-uniform float fieldScale;
-uniform float vCutoff;
-uniform vec2 relPosition;
-uniform vec2 texFrameUv;
-uniform vec2 size;
-uniform vec2 texSize;
-uniform float yOffset;
-uniform float yShadowOffset;
-uniform vec4 tone;
-uniform ivec4 baseVariantColors[32];
-uniform vec4 variantColors[32];
-uniform ivec4 spriteColors[32];
-uniform ivec4 fusionSpriteColors[32];
-
-const vec3 lumaF = vec3(.299, .587, .114);
-
-float blendOverlay(float base, float blend) {
-	return base<0.5?(2.0*base*blend):(1.0-2.0*(1.0-base)*(1.0-blend));
-}
-
-vec3 blendOverlay(vec3 base, vec3 blend) {
-	return vec3(blendOverlay(base.r,blend.r),blendOverlay(base.g,blend.g),blendOverlay(base.b,blend.b));
-}
-
-vec3 blendHardLight(vec3 base, vec3 blend) {
-	return blendOverlay(blend, base);
-}
-
-float hue2rgb(float f1, float f2, float hue) {
-	if (hue < 0.0)
-		hue += 1.0;
-	else if (hue > 1.0)
-		hue -= 1.0;
-	float res;
-	if ((6.0 * hue) < 1.0)
-		res = f1 + (f2 - f1) * 6.0 * hue;
-	else if ((2.0 * hue) < 1.0)
-		res = f2;
-	else if ((3.0 * hue) < 2.0)
-		res = f1 + (f2 - f1) * ((2.0 / 3.0) - hue) * 6.0;
-	else
-		res = f1;
-	return res;
-}
-
-vec3 rgb2hsl(vec3 color) {
-	vec3 hsl;
-	
-	float fmin = min(min(color.r, color.g), color.b);
-	float fmax = max(max(color.r, color.g), color.b);
-	float delta = fmax - fmin;
-
-	hsl.z = (fmax + fmin) / 2.0;
-
-	if (delta == 0.0) {
-		hsl.x = 0.0;
-		hsl.y = 0.0;
-	} else {
-		if (hsl.z < 0.5)
-			hsl.y = delta / (fmax + fmin);
-		else
-			hsl.y = delta / (2.0 - fmax - fmin);
-		
-		float deltaR = (((fmax - color.r) / 6.0) + (delta / 2.0)) / delta;
-		float deltaG = (((fmax - color.g) / 6.0) + (delta / 2.0)) / delta;
-		float deltaB = (((fmax - color.b) / 6.0) + (delta / 2.0)) / delta;
-
-		if (color.r == fmax )
-			hsl.x = deltaB - deltaG;
-		else if (color.g == fmax)
-			hsl.x = (1.0 / 3.0) + deltaR - deltaB;
-		else if (color.b == fmax)
-			hsl.x = (2.0 / 3.0) + deltaG - deltaR;
-
-		if (hsl.x < 0.0)
-			hsl.x += 1.0;
-		else if (hsl.x > 1.0)
-			hsl.x -= 1.0;
-	}
-
-	return hsl;
-}
-
-vec3 hsl2rgb(vec3 hsl) {
-	vec3 rgb;
-	
-	if (hsl.y == 0.0)
-		rgb = vec3(hsl.z);
-	else {
-		float f2;
-		
-		if (hsl.z < 0.5)
-			f2 = hsl.z * (1.0 + hsl.y);
-		else
-			f2 = (hsl.z + hsl.y) - (hsl.y * hsl.z);
-			
-		float f1 = 2.0 * hsl.z - f2;
-		
-		rgb.r = hue2rgb(f1, f2, hsl.x + (1.0/3.0));
-		rgb.g = hue2rgb(f1, f2, hsl.x);
-		rgb.b= hue2rgb(f1, f2, hsl.x - (1.0/3.0));
-	}
-	
-	return rgb;
-}
-
-vec3 blendHue(vec3 base, vec3 blend) {
-	vec3 baseHSL = rgb2hsl(base);
-	return hsl2rgb(vec3(rgb2hsl(blend).r, baseHSL.g, baseHSL.b));
-}
-
-vec3 rgb2hsv(vec3 c) {
-    vec4 K = vec4(0.0, -1.0 / 3.0, 2.0 / 3.0, -1.0);
-    vec4 p = mix(vec4(c.bg, K.wz), vec4(c.gb, K.xy), step(c.b, c.g));
-    vec4 q = mix(vec4(p.xyw, c.r), vec4(c.r, p.yzx), step(p.x, c.r));
-
-    float d = q.x - min(q.w, q.y);
-    float e = 1.0e-10;
-    return vec3(abs(q.z + (q.w - q.y) / (6.0 * d + e)), d / (q.x + e), q.x);
-}
-
-vec3 hsv2rgb(vec3 c) {
-    vec4 K = vec4(1.0, 2.0 / 3.0, 1.0 / 3.0, 3.0);
-    vec3 p = abs(fract(c.xxx + K.xyz) * 6.0 - K.www);
-    return c.z * mix(K.xxx, clamp(p - K.xxx, 0.0, 1.0), c.y);
-}
-
-void main() {
-    vec4 texture = texture2D(uMainSampler[0], outTexCoord);
-
-    ivec4 colorInt = ivec4(int(texture.r * 255.0), int(texture.g * 255.0), int(texture.b * 255.0), int(texture.a * 255.0));
-
-    for (int i = 0; i < 32; i++) {
-        if (baseVariantColors[i][3] == 0)
-            break;
-        if (texture.a > 0.0 && colorInt.r == baseVariantColors[i].r && colorInt.g == baseVariantColors[i].g && colorInt.b == baseVariantColors[i].b) {
-            texture.rgb = variantColors[i].rgb;
-            break;
-        }
-    }
-
-    for (int i = 0; i < 32; i++) {
-        if (spriteColors[i][3] == 0)
-            break;
-        if (texture.a > 0.0 && colorInt.r == spriteColors[i].r && colorInt.g == spriteColors[i].g && colorInt.b == spriteColors[i].b) {
-            vec3 fusionColor = vec3(float(fusionSpriteColors[i].r) / 255.0, float(fusionSpriteColors[i].g) / 255.0, float(fusionSpriteColors[i].b) / 255.0);
-            vec3 bg = vec3(float(spriteColors[i].r) / 255.0, float(spriteColors[i].g) / 255.0, float(spriteColors[i].b) / 255.0);
-            float gray = (bg.r + bg.g + bg.b) / 3.0;
-            bg = vec3(gray, gray, gray);
-            vec3 fg = fusionColor;
-            texture.rgb = mix(1.0 - 2.0 * (1.0 - bg) * (1.0 - fg), 2.0 * bg * fg, step(bg, vec3(0.5)));
-            break;
-        }
-    }
-
-    vec4 texel = vec4(outTint.bgr * outTint.a, outTint.a);
-
-    //  Multiply texture tint
-    vec4 color = texture * texel;
-
-    if (color.a > 0.0 && teraColor.r > 0.0 && teraColor.g > 0.0 && teraColor.b > 0.0) {
-        vec2 relUv = vec2((outTexCoord.x - texFrameUv.x) / (size.x / texSize.x), (outTexCoord.y - texFrameUv.y) / (size.y / texSize.y));
-        vec2 teraTexCoord = vec2(relUv.x * (size.x / 200.0), relUv.y * (size.y / 120.0));
-        vec4 teraCol = texture2D(uMainSampler[1], teraTexCoord);
-        float floorValue = 86.0 / 255.0;
-        vec3 teraPatternHsv = rgb2hsv(teraCol.rgb);
-        teraCol.rgb = hsv2rgb(vec3((teraPatternHsv.b - floorValue) * 4.0 + teraTexCoord.x * fieldScale / 2.0 + teraTexCoord.y * fieldScale / 2.0 + teraTime * 255.0, teraPatternHsv.b, teraPatternHsv.b));
-
-        color.rgb = mix(color.rgb, blendHue(color.rgb, teraColor), 0.625);
-        teraCol.rgb = mix(teraCol.rgb, teraColor, 0.5);
-        color.rgb = blendOverlay(color.rgb, teraCol.rgb);
-
-        if (teraColor.r < 1.0 || teraColor.g < 1.0 || teraColor.b < 1.0) {
-            vec3 teraColHsv = rgb2hsv(teraColor);
-            color.rgb = mix(color.rgb, teraColor, (1.0 - teraColHsv.g) / 2.0);
-        }
-    }
-
-    if (outTintEffect == 1.0) {
-        //  Solid color + texture alpha
-        color.rgb = mix(texture.rgb, outTint.bgr * outTint.a, texture.a);
-    } else if (outTintEffect == 2.0) {
-        //  Solid color, no texture
-        color = texel;
-    }
-
-    /* Apply gray */
-    float luma = dot(color.rgb, lumaF);
-    color.rgb = mix(color.rgb, vec3(luma), tone.w);
-
-    /* Apply tone */
-    color.rgb += tone.rgb * (color.a / 255.0);
-
-    /* Apply day/night tint */
-    if (color.a > 0.0 && ignoreTimeTint == 0) {
-        vec3 dayNightTint;
-
-        if (time < 0.25) {
-            dayNightTint = dayTint;
-        } else if (isOutside == 0 && time < 0.5) {
-            dayNightTint = mix(dayTint, nightTint, (time - 0.25) / 0.25);
-        } else if (time < 0.375) {
-            dayNightTint = mix(dayTint, duskTint, (time - 0.25) / 0.125);
-        } else if (time < 0.5) {
-            dayNightTint = mix(duskTint, nightTint, (time - 0.375) / 0.125);
-        } else if (time < 0.75) {
-            dayNightTint = nightTint;
-        } else if (isOutside == 0) {
-            dayNightTint = mix(nightTint, dayTint, (time - 0.75) / 0.25);
-        } else if (time < 0.875) {
-            dayNightTint = mix(nightTint, duskTint, (time - 0.75) / 0.125);
-        } else {
-            dayNightTint = mix(duskTint, dayTint, (time - 0.875) / 0.125);
-        }
-
-        color.rgb = blendHardLight(color.rgb, dayNightTint);
-    }
-
-    if (hasShadow == 1) {
-        float width = size.x - (yOffset / 2.0);
-
-        float spriteX = ((floor(outPosition.x / fieldScale) - relPosition.x) / width) + 0.5;
-        float spriteY = ((floor(outPosition.y / fieldScale) - relPosition.y - yShadowOffset) / size.y);
-
-        if (yCenter == 1) {
-            spriteY += 0.5;
-        } else {
-            spriteY += 1.0;
-        }
-
-        bool yOverflow = outTexCoord.y >= vCutoff;
-
-        if ((spriteY >= 0.9 && (color.a == 0.0 || yOverflow))) {
-            float shadowSpriteY = (spriteY - 0.9) * (1.0 / 0.15);
-            if (distance(vec2(spriteX, shadowSpriteY), vec2(0.5, 0.5)) < 0.5) {
-                color = vec4(vec3(0.0, 0.0, 0.0), 0.5);
-            } else if (yOverflow) {
-                discard;
-            }
-        } else if (yOverflow) {
-            discard;
-        }
-    }
-
-    gl_FragColor = color;
-}
-`;
-
-const spriteVertShader = `
-precision mediump float;
-
-uniform mat4 uProjectionMatrix;
-uniform int uRoundPixels;
-uniform vec2 uResolution;
-
-attribute vec2 inPosition;
-attribute vec2 inTexCoord;
-attribute float inTexId;
-attribute float inTintEffect;
-attribute vec4 inTint;
-
-varying vec2 outTexCoord;
-varying vec2 outtexFrameUv;
-varying float outTexId;
-varying vec2 outPosition;
-varying float outTintEffect;
-varying vec4 outTint;
-
-void main()
-{
-    gl_Position = uProjectionMatrix * vec4(inPosition, 1.0, 1.0);
-    if (uRoundPixels == 1)
-    {
-        gl_Position.xy = floor(((gl_Position.xy + 1.0) * 0.5 * uResolution) + 0.5) / uResolution * 2.0 - 1.0;
-    }
-    outTexCoord = inTexCoord;
-    outTexId = inTexId;
-    outPosition = inPosition;
-    outTint = inTint;
-    outTintEffect = inTintEffect;
-}
-`;
+import spriteFragShader from "./glsl/spriteFragShader.frag?raw";
+import spriteVertShader from "./glsl/spriteShader.vert?raw";
 
 export default class SpritePipeline extends FieldSpritePipeline {
   private _tone: number[];
@@ -322,17 +16,17 @@ export default class SpritePipeline extends FieldSpritePipeline {
       game: game,
       name: "sprite",
       fragShader: spriteFragShader,
-      vertShader: spriteVertShader
+      vertShader: spriteVertShader,
     });
 
-    this._tone = [ 0, 0, 0, 0 ];
+    this._tone = [0, 0, 0, 0];
   }
 
   onPreRender(): void {
     super.onPreRender();
 
     this.set1f("teraTime", 0);
-    this.set3fv("teraColor", [ 0, 0, 0 ]);
+    this.set3fv("teraColor", [0, 0, 0]);
     this.set1i("hasShadow", 0);
     this.set1i("yCenter", 0);
     this.set2f("relPosition", 0, 0);
@@ -347,31 +41,38 @@ export default class SpritePipeline extends FieldSpritePipeline {
   onBind(gameObject: Phaser.GameObjects.GameObject): void {
     super.onBind(gameObject);
 
-    const sprite = (gameObject as Phaser.GameObjects.Sprite);
+    const sprite = gameObject as Phaser.GameObjects.Sprite;
 
     const data = sprite.pipelineData;
     const tone = data["tone"] as number[];
-    const teraColor = data["teraColor"] as number[] ?? [ 0, 0, 0 ];
+    const teraColor = (data["isTerastallized"] as boolean) ? ((data["teraColor"] as number[]) ?? [0, 0, 0]) : [0, 0, 0];
     const hasShadow = data["hasShadow"] as boolean;
     const yShadowOffset = data["yShadowOffset"] as number;
     const ignoreFieldPos = data["ignoreFieldPos"] as boolean;
     const ignoreOverride = data["ignoreOverride"] as boolean;
 
-    const isEntityObj = sprite.parentContainer instanceof Pokemon || sprite.parentContainer instanceof Trainer || sprite.parentContainer instanceof MysteryEncounterIntroVisuals;
+    const isEntityObj =
+      sprite.parentContainer instanceof Pokemon ||
+      sprite.parentContainer instanceof Trainer ||
+      sprite.parentContainer instanceof MysteryEncounterIntroVisuals;
     const field = isEntityObj ? sprite.parentContainer.parentContainer : sprite.parentContainer;
-    const position = isEntityObj
-      ? [ sprite.parentContainer.x, sprite.parentContainer.y ]
-      : [ sprite.x, sprite.y ];
+    const position = isEntityObj ? [sprite.parentContainer.x, sprite.parentContainer.y] : [sprite.x, sprite.y];
     if (field) {
       position[0] += field.x / field.scale;
       position[1] += field.y / field.scale;
     }
-    position[0] += -(sprite.width - (sprite.frame.width)) / 2 + sprite.frame.x + (!ignoreFieldPos ? (sprite.x - field.x) : 0);
+    position[0] +=
+      -(sprite.width - sprite.frame.width) / 2 + sprite.frame.x + (!ignoreFieldPos ? sprite.x - field.x : 0);
     if (sprite.originY === 0.5) {
-      position[1] += (sprite.height / 2) * ((isEntityObj ? sprite.parentContainer : sprite).scale - 1) + (!ignoreFieldPos ? (sprite.y - field.y) : 0);
+      position[1] +=
+        (sprite.height / 2) * ((isEntityObj ? sprite.parentContainer : sprite).scale - 1) +
+        (!ignoreFieldPos ? sprite.y - field.y : 0);
     }
     this.set1f("teraTime", (this.game.getTime() % 500000) / 500000);
-    this.set3fv("teraColor", teraColor.map(c => c / 255));
+    this.set3fv(
+      "teraColor",
+      teraColor.map(c => c / 255),
+    );
     this.set1i("hasShadow", hasShadow ? 1 : 0);
     this.set1i("yCenter", sprite.originY === 0.5 ? 1 : 0);
     this.set1f("fieldScale", field?.scale || 1);
@@ -379,51 +80,73 @@ export default class SpritePipeline extends FieldSpritePipeline {
     this.set2f("texFrameUv", sprite.frame.u0, sprite.frame.v0);
     this.set2f("size", sprite.frame.width, sprite.height);
     this.set2f("texSize", sprite.texture.source[0].width, sprite.texture.source[0].height);
-    this.set1f("yOffset", sprite.height - sprite.frame.height * (isEntityObj ? sprite.parentContainer.scale : sprite.scale));
+    this.set1f(
+      "yOffset",
+      sprite.height - sprite.frame.height * (isEntityObj ? sprite.parentContainer.scale : sprite.scale),
+    );
     this.set1f("yShadowOffset", yShadowOffset ?? 0);
     this.set4fv("tone", tone);
     this.bindTexture(this.game.textures.get("tera").source[0].glTexture!, 1); // TODO: is this bang correct?
 
     if (globalScene.fusionPaletteSwaps) {
       const spriteColors = ((ignoreOverride && data["spriteColorsBase"]) || data["spriteColors"] || []) as number[][];
-      const fusionSpriteColors = ((ignoreOverride && data["fusionSpriteColorsBase"]) || data["fusionSpriteColors"] || []) as number[][];
+      const fusionSpriteColors = ((ignoreOverride && data["fusionSpriteColorsBase"]) ||
+        data["fusionSpriteColors"] ||
+        []) as number[][];
 
-      const emptyColors = [ 0, 0, 0, 0 ];
+      const emptyColors = [0, 0, 0, 0];
       const flatSpriteColors: number[] = [];
       const flatFusionSpriteColors: number[] = [];
       for (let c = 0; c < 32; c++) {
-        flatSpriteColors.splice(flatSpriteColors.length, 0, ...(c < spriteColors.length ? spriteColors[c] : emptyColors));
-        flatFusionSpriteColors.splice(flatFusionSpriteColors.length, 0, ...(c < fusionSpriteColors.length ? fusionSpriteColors[c] : emptyColors));
+        flatSpriteColors.splice(
+          flatSpriteColors.length,
+          0,
+          ...(c < spriteColors.length ? spriteColors[c].map(x => x / 255.0) : emptyColors),
+        );
+        flatFusionSpriteColors.splice(
+          flatFusionSpriteColors.length,
+          0,
+          ...(c < fusionSpriteColors.length ? fusionSpriteColors[c] : emptyColors),
+        );
       }
 
-      this.set4iv("spriteColors", flatSpriteColors.flat());
+      this.set4fv("spriteColors", flatSpriteColors.flat());
       this.set4iv("fusionSpriteColors", flatFusionSpriteColors.flat());
     }
   }
 
   onBatch(gameObject: Phaser.GameObjects.GameObject): void {
     if (gameObject) {
-      const sprite = (gameObject as Phaser.GameObjects.Sprite);
+      const sprite = gameObject as Phaser.GameObjects.Sprite;
       const data = sprite.pipelineData;
 
       const variant: number = data.hasOwnProperty("variant")
         ? data["variant"]
-        : sprite.parentContainer instanceof Pokemon ? sprite.parentContainer.variant
+        : sprite.parentContainer instanceof Pokemon
+          ? sprite.parentContainer.variant
           : 0;
-      let variantColors;
+      let variantColors: { [x: string]: string }[];
 
-      const emptyColors = [ 0, 0, 0, 0 ];
+      const emptyColors = [0, 0, 0, 0];
       const flatBaseColors: number[] = [];
       const flatVariantColors: number[] = [];
 
-      if ((sprite.parentContainer instanceof Pokemon ? sprite.parentContainer.shiny : !!data["shiny"])
-                && (variantColors = variantColorCache[sprite.parentContainer instanceof Pokemon ? sprite.parentContainer.getSprite().texture.key : data["spriteKey"]]) && variantColors.hasOwnProperty(variant)) {
+      if (
+        (sprite.parentContainer instanceof Pokemon ? sprite.parentContainer.shiny : !!data["shiny"]) &&
+        (variantColors =
+          variantColorCache[
+            sprite.parentContainer instanceof Pokemon
+              ? sprite.parentContainer.getSprite().texture.key
+              : data["spriteKey"]
+          ]) &&
+        variantColors.hasOwnProperty(variant)
+      ) {
         const baseColors = Object.keys(variantColors[variant]);
         for (let c = 0; c < 32; c++) {
           if (c < baseColors.length) {
-            const baseColor = Array.from(Object.values(Utils.rgbHexToRgba(baseColors[c])));
-            const variantColor = Array.from(Object.values(Utils.rgbHexToRgba(variantColors[variant][baseColors[c]])));
-            flatBaseColors.splice(flatBaseColors.length, 0, ...baseColor);
+            const baseColor = Array.from(Object.values(rgbHexToRgba(baseColors[c])));
+            const variantColor = Array.from(Object.values(rgbHexToRgba(variantColors[variant][baseColors[c]])));
+            flatBaseColors.splice(flatBaseColors.length, 0, ...baseColor.map(c => c / 255.0));
             flatVariantColors.splice(flatVariantColors.length, 0, ...variantColor.map(c => c / 255.0));
           } else {
             flatBaseColors.splice(flatBaseColors.length, 0, ...emptyColors);
@@ -437,37 +160,79 @@ export default class SpritePipeline extends FieldSpritePipeline {
         }
       }
 
-      this.set4iv("baseVariantColors", flatBaseColors.flat());
+      this.set4fv("baseVariantColors", flatBaseColors.flat());
       this.set4fv("variantColors", flatVariantColors.flat());
     }
 
     super.onBatch(gameObject);
   }
 
-  batchQuad(gameObject: Phaser.GameObjects.GameObject, x0: number, y0: number, x1: number, y1: number, x2: number, y2: number, x3: number, y3: number,
-    u0: number, v0: number, u1: number, v1: number, tintTL: number, tintTR: number, tintBL: number, tintBR: number, tintEffect: number | boolean,
-    texture?: Phaser.Renderer.WebGL.Wrappers.WebGLTextureWrapper, unit?: number): boolean {
+  batchQuad(
+    gameObject: Phaser.GameObjects.GameObject,
+    x0: number,
+    y0: number,
+    x1: number,
+    y1: number,
+    x2: number,
+    y2: number,
+    x3: number,
+    y3: number,
+    u0: number,
+    v0: number,
+    u1: number,
+    v1: number,
+    tintTL: number,
+    tintTR: number,
+    tintBL: number,
+    tintBR: number,
+    tintEffect: number | boolean,
+    texture?: Phaser.Renderer.WebGL.Wrappers.WebGLTextureWrapper,
+    unit?: number,
+  ): boolean {
     const sprite = gameObject as Phaser.GameObjects.Sprite;
 
     this.set1f("vCutoff", v1);
 
     const hasShadow = sprite.pipelineData["hasShadow"] as boolean;
-    const yShadowOffset = sprite.pipelineData["yShadowOffset"] as number ?? 0;
+    const yShadowOffset = (sprite.pipelineData["yShadowOffset"] as number) ?? 0;
     if (hasShadow) {
-      const isEntityObj = sprite.parentContainer instanceof Pokemon || sprite.parentContainer instanceof Trainer || sprite.parentContainer instanceof MysteryEncounterIntroVisuals;
+      const isEntityObj =
+        sprite.parentContainer instanceof Pokemon ||
+        sprite.parentContainer instanceof Trainer ||
+        sprite.parentContainer instanceof MysteryEncounterIntroVisuals;
       const field = isEntityObj ? sprite.parentContainer.parentContainer : sprite.parentContainer;
       const fieldScaleRatio = field.scale / 6;
-      const baseY = (isEntityObj
-        ? sprite.parentContainer.y
-        : sprite.y + sprite.height) * 6 / fieldScaleRatio;
-      const bottomPadding = Math.ceil(sprite.height * 0.05 + Math.max(yShadowOffset, 0)) * 6 / fieldScaleRatio;
+      const baseY = ((isEntityObj ? sprite.parentContainer.y : sprite.y + sprite.height) * 6) / fieldScaleRatio;
+      const bottomPadding = (Math.ceil(sprite.height * 0.05 + Math.max(yShadowOffset, 0)) * 6) / fieldScaleRatio;
       const yDelta = (baseY - y1) / field.scale;
       y2 = y1 = baseY + bottomPadding;
-      const pixelHeight = (v1 - v0) / (sprite.frame.height * (isEntityObj ? sprite.parentContainer.scale : sprite.scale));
+      const pixelHeight =
+        (v1 - v0) / (sprite.frame.height * (isEntityObj ? sprite.parentContainer.scale : sprite.scale));
       v1 += (yDelta + bottomPadding / field.scale) * pixelHeight;
     }
 
-    return super.batchQuad(gameObject, x0, y0, x1, y1, x2, y2, x3, y3, u0, v0, u1, v1, tintTL, tintTR, tintBL, tintBR, tintEffect, texture, unit);
+    return super.batchQuad(
+      gameObject,
+      x0,
+      y0,
+      x1,
+      y1,
+      x2,
+      y2,
+      x3,
+      y3,
+      u0,
+      v0,
+      u1,
+      v1,
+      tintTL,
+      tintTR,
+      tintBL,
+      tintBR,
+      tintEffect,
+      texture,
+      unit,
+    );
   }
 
   get tone(): number[] {
diff --git a/src/plugins/api/api-base.ts b/src/plugins/api/api-base.ts
index 5c1a30ff3ab..f55ffe2d3fd 100644
--- a/src/plugins/api/api-base.ts
+++ b/src/plugins/api/api-base.ts
@@ -1,5 +1,5 @@
 import { SESSION_ID_COOKIE_NAME } from "#app/constants";
-import { getCookie } from "#app/utils";
+import { getCookie } from "#app/utils/cookies";
 
 type DataType = "json" | "form-urlencoded";
 
@@ -85,8 +85,8 @@ export abstract class ApiBase {
    */
   protected toUrlSearchParams<D extends Record<string, any>>(data: D) {
     const arr = Object.entries(data)
-      .map(([ key, value ]) => (value !== undefined ? [ key, String(value) ] : [ key, "" ]))
-      .filter(([ , value ]) => value !== "");
+      .map(([key, value]) => (value !== undefined ? [key, String(value)] : [key, ""]))
+      .filter(([, value]) => value !== "");
 
     return new URLSearchParams(arr);
   }
diff --git a/src/plugins/api/pokerogue-account-api.ts b/src/plugins/api/pokerogue-account-api.ts
index 66ab8d67520..9cd82c24430 100644
--- a/src/plugins/api/pokerogue-account-api.ts
+++ b/src/plugins/api/pokerogue-account-api.ts
@@ -6,7 +6,7 @@ import type {
 } from "#app/@types/PokerogueAccountApi";
 import { SESSION_ID_COOKIE_NAME } from "#app/constants";
 import { ApiBase } from "#app/plugins/api/api-base";
-import { removeCookie, setCookie } from "#app/utils";
+import { removeCookie, setCookie } from "#app/utils/cookies";
 
 /**
  * A wrapper for PokéRogue account API requests.
@@ -24,14 +24,13 @@ export class PokerogueAccountApi extends ApiBase {
 
       if (response.ok) {
         const resData = (await response.json()) as AccountInfoResponse;
-        return [ resData, response.status ];
-      } else {
-        console.warn("Could not get account info!", response.status, response.statusText);
-        return [ null, response.status ];
+        return [resData, response.status];
       }
+      console.warn("Could not get account info!", response.status, response.statusText);
+      return [null, response.status];
     } catch (err) {
       console.warn("Could not get account info!", err);
-      return [ null, 500 ];
+      return [null, 500];
     }
   }
 
@@ -46,9 +45,8 @@ export class PokerogueAccountApi extends ApiBase {
 
       if (response.ok) {
         return null;
-      } else {
-        return response.text();
       }
+      return response.text();
     } catch (err) {
       console.warn("Register failed!", err);
     }
@@ -70,10 +68,9 @@ export class PokerogueAccountApi extends ApiBase {
         const loginResponse = (await response.json()) as AccountLoginResponse;
         setCookie(SESSION_ID_COOKIE_NAME, loginResponse.token);
         return null;
-      } else {
-        console.warn("Login failed!", response.status, response.statusText);
-        return response.text();
       }
+      console.warn("Login failed!", response.status, response.statusText);
+      return response.text();
     } catch (err) {
       console.warn("Login failed!", err);
     }
diff --git a/src/plugins/api/pokerogue-admin-api.ts b/src/plugins/api/pokerogue-admin-api.ts
index eeba5319adc..5923f286430 100644
--- a/src/plugins/api/pokerogue-admin-api.ts
+++ b/src/plugins/api/pokerogue-admin-api.ts
@@ -22,12 +22,11 @@ export class PokerogueAdminApi extends ApiBase {
 
       if (response.ok) {
         return null;
-      } else {
-        console.warn("Could not link account with discord!", response.status, response.statusText);
+      }
+      console.warn("Could not link account with discord!", response.status, response.statusText);
 
-        if (response.status === 404) {
-          return this.ERR_USERNAME_NOT_FOUND;
-        }
+      if (response.status === 404) {
+        return this.ERR_USERNAME_NOT_FOUND;
       }
     } catch (err) {
       console.warn("Could not link account with discord!", err);
@@ -47,12 +46,11 @@ export class PokerogueAdminApi extends ApiBase {
 
       if (response.ok) {
         return null;
-      } else {
-        console.warn("Could not unlink account from discord!", response.status, response.statusText);
+      }
+      console.warn("Could not unlink account from discord!", response.status, response.statusText);
 
-        if (response.status === 404) {
-          return this.ERR_USERNAME_NOT_FOUND;
-        }
+      if (response.status === 404) {
+        return this.ERR_USERNAME_NOT_FOUND;
       }
     } catch (err) {
       console.warn("Could not unlink account from discord!", err);
@@ -72,12 +70,11 @@ export class PokerogueAdminApi extends ApiBase {
 
       if (response.ok) {
         return null;
-      } else {
-        console.warn("Could not link account with google!", response.status, response.statusText);
+      }
+      console.warn("Could not link account with google!", response.status, response.statusText);
 
-        if (response.status === 404) {
-          return this.ERR_USERNAME_NOT_FOUND;
-        }
+      if (response.status === 404) {
+        return this.ERR_USERNAME_NOT_FOUND;
       }
     } catch (err) {
       console.warn("Could not link account with google!", err);
@@ -97,12 +94,11 @@ export class PokerogueAdminApi extends ApiBase {
 
       if (response.ok) {
         return null;
-      } else {
-        console.warn("Could not unlink account from google!", response.status, response.statusText);
+      }
+      console.warn("Could not unlink account from google!", response.status, response.statusText);
 
-        if (response.status === 404) {
-          return this.ERR_USERNAME_NOT_FOUND;
-        }
+      if (response.status === 404) {
+        return this.ERR_USERNAME_NOT_FOUND;
       }
     } catch (err) {
       console.warn("Could not unlink account from google!", err);
@@ -123,18 +119,17 @@ export class PokerogueAdminApi extends ApiBase {
 
       if (response.ok) {
         const resData: SearchAccountResponse = await response.json();
-        return [ resData, undefined ];
-      } else {
-        console.warn("Could not find account!", response.status, response.statusText);
+        return [resData, undefined];
+      }
+      console.warn("Could not find account!", response.status, response.statusText);
 
-        if (response.status === 404) {
-          return [ undefined, this.ERR_USERNAME_NOT_FOUND ];
-        }
+      if (response.status === 404) {
+        return [undefined, this.ERR_USERNAME_NOT_FOUND];
       }
     } catch (err) {
       console.warn("Could not find account!", err);
     }
 
-    return [ undefined, this.ERR_GENERIC ];
+    return [undefined, this.ERR_GENERIC];
   }
 }
diff --git a/src/plugins/api/pokerogue-api.ts b/src/plugins/api/pokerogue-api.ts
index 92d0ff1bbbb..c6dfae019a5 100644
--- a/src/plugins/api/pokerogue-api.ts
+++ b/src/plugins/api/pokerogue-api.ts
@@ -48,9 +48,8 @@ export class PokerogueApi extends ApiBase {
       const response = await this.doPost("/auth/discord/logout");
       if (response.ok) {
         return true;
-      } else {
-        console.warn(`Discord unlink failed (${response.status}: ${response.statusText})`);
       }
+      console.warn(`Discord unlink failed (${response.status}: ${response.statusText})`);
     } catch (err) {
       console.warn("Could not unlink Discord!", err);
     }
@@ -67,9 +66,8 @@ export class PokerogueApi extends ApiBase {
       const response = await this.doPost("/auth/google/logout");
       if (response.ok) {
         return true;
-      } else {
-        console.warn(`Google unlink failed (${response.status}: ${response.statusText})`);
       }
+      console.warn(`Google unlink failed (${response.status}: ${response.statusText})`);
     } catch (err) {
       console.warn("Could not unlink Google!", err);
     }
diff --git a/src/plugins/api/pokerogue-savedata-api.ts b/src/plugins/api/pokerogue-savedata-api.ts
index 184bfbb4bdb..b8531e82d4f 100644
--- a/src/plugins/api/pokerogue-savedata-api.ts
+++ b/src/plugins/api/pokerogue-savedata-api.ts
@@ -29,7 +29,7 @@ export class PokerogueSavedataApi extends ApiBase {
   public async updateAll(bodyData: UpdateAllSavedataRequest) {
     try {
       const rawBodyData = JSON.stringify(bodyData, (_k: any, v: any) =>
-        typeof v === "bigint" ? (v <= MAX_INT_ATTR_VALUE ? Number(v) : v.toString()) : v
+        typeof v === "bigint" ? (v <= MAX_INT_ATTR_VALUE ? Number(v) : v.toString()) : v,
       );
       const response = await this.doPost("/savedata/updateall", rawBodyData);
       return await response.text();
diff --git a/src/plugins/api/pokerogue-session-savedata-api.ts b/src/plugins/api/pokerogue-session-savedata-api.ts
index 44a7b463849..aac8b9b93ad 100644
--- a/src/plugins/api/pokerogue-session-savedata-api.ts
+++ b/src/plugins/api/pokerogue-session-savedata-api.ts
@@ -20,17 +20,20 @@ export class PokerogueSessionSavedataApi extends ApiBase {
    * *This is **NOT** the same as {@linkcode clear | clear()}.*
    * @param params The {@linkcode NewClearSessionSavedataRequest} to send
    * @returns The raw savedata as `string`.
+   * @throws Error if the request fails
    */
   public async newclear(params: NewClearSessionSavedataRequest) {
     try {
       const urlSearchParams = this.toUrlSearchParams(params);
       const response = await this.doGet(`/savedata/session/newclear?${urlSearchParams}`);
       const json = await response.json();
-
-      return Boolean(json);
+      if (response.ok) {
+        return Boolean(json);
+      }
+      throw new Error("Could not newclear session!");
     } catch (err) {
       console.warn("Could not newclear session!", err);
-      return false;
+      throw new Error("Could not newclear session!");
     }
   }
 
@@ -82,9 +85,8 @@ export class PokerogueSessionSavedataApi extends ApiBase {
 
       if (response.ok) {
         return null;
-      } else {
-        return await response.text();
       }
+      return await response.text();
     } catch (err) {
       console.warn("Could not delete session savedata!", err);
       return "Unknown error";
diff --git a/src/plugins/api/pokerogue-system-savedata-api.ts b/src/plugins/api/pokerogue-system-savedata-api.ts
index 659584776c4..d6fbb39ae0a 100644
--- a/src/plugins/api/pokerogue-system-savedata-api.ts
+++ b/src/plugins/api/pokerogue-system-savedata-api.ts
@@ -15,14 +15,17 @@ export class PokerogueSystemSavedataApi extends ApiBase {
   /**
    * Get a system savedata.
    * @param params The {@linkcode GetSystemSavedataRequest} to send
-   * @returns The system savedata as `string` or `null` on error
+   * @returns The system savedata as `string` or either the status code or `null` on error
    */
-  public async get(params: GetSystemSavedataRequest) {
+  public async get(params: GetSystemSavedataRequest): Promise<string | number | null> {
     try {
       const urlSearchParams = this.toUrlSearchParams(params);
       const response = await this.doGet(`/savedata/system/get?${urlSearchParams}`);
       const rawSavedata = await response.text();
-
+      if (!response.ok) {
+        console.warn("Could not get system savedata!", response.status, rawSavedata);
+        return response.status;
+      }
       return rawSavedata;
     } catch (err) {
       console.warn("Could not get system savedata!", err);
diff --git a/src/plugins/cache-busted-loader-plugin.ts b/src/plugins/cache-busted-loader-plugin.ts
index 344da3eaa66..e5b1abb5903 100644
--- a/src/plugins/cache-busted-loader-plugin.ts
+++ b/src/plugins/cache-busted-loader-plugin.ts
@@ -15,7 +15,7 @@ export default class CacheBustedLoaderPlugin extends Phaser.Loader.LoaderPlugin
 
   addFile(file): void {
     if (!Array.isArray(file)) {
-      file = [ file ];
+      file = [file];
     }
 
     file.forEach(item => {
diff --git a/src/plugins/i18n.ts b/src/plugins/i18n.ts
index 904b51c6dc7..ff9e54fcf50 100644
--- a/src/plugins/i18n.ts
+++ b/src/plugins/i18n.ts
@@ -1,4 +1,4 @@
-import { camelCaseToKebabCase, } from "#app/utils";
+import { camelCaseToKebabCase } from "#app/utils/common";
 import i18next from "i18next";
 import LanguageDetector from "i18next-browser-languagedetector";
 import HttpBackend from "i18next-http-backend";
@@ -8,9 +8,9 @@ import pkg from "../../package.json";
 //#region Interfaces/Types
 
 interface LoadingFontFaceProperty {
-  face: FontFace,
-  extraOptions?: { [key:string]: any },
-  only?: Array<string>
+  face: FontFace;
+  extraOptions?: { [key: string]: any };
+  only?: Array<string>;
 }
 
 //#region Constants
@@ -23,52 +23,70 @@ const unicodeRanges = {
   kana: "U+3040-30FF",
   CJKCommon: "U+2E80-2EFF,U+3000-303F,U+31C0-31EF,U+3200-32FF,U+3400-4DBF,U+F900-FAFF,U+FE30-FE4F",
   CJKIdeograph: "U+4E00-9FFF",
-  specialCharacters: "U+266A,U+2605,U+2665,U+2663" //♪.★,♥,♣
+  specialCharacters: "U+266A,U+2605,U+2665,U+2663", //♪.★,♥,♣
 };
 
 const rangesByLanguage = {
-  korean: [ unicodeRanges.CJKCommon, unicodeRanges.hangul ].join(","),
-  chinese: [ unicodeRanges.CJKCommon, unicodeRanges.fullwidth, unicodeRanges.CJKIdeograph ].join(","),
-  japanese: [ unicodeRanges.CJKCommon, unicodeRanges.fullwidth, unicodeRanges.kana, unicodeRanges.CJKIdeograph ].join(",")
+  korean: [unicodeRanges.CJKCommon, unicodeRanges.hangul].join(","),
+  chinese: [unicodeRanges.CJKCommon, unicodeRanges.fullwidth, unicodeRanges.CJKIdeograph].join(","),
+  japanese: [unicodeRanges.CJKCommon, unicodeRanges.fullwidth, unicodeRanges.kana, unicodeRanges.CJKIdeograph].join(
+    ",",
+  ),
 };
 
 const fonts: Array<LoadingFontFaceProperty> = [
   // unicode (special character from PokePT)
   {
-    face: new FontFace("emerald", "url(./fonts/PokePT_Wansung.woff2)", { unicodeRange: unicodeRanges.specialCharacters }),
+    face: new FontFace("emerald", "url(./fonts/PokePT_Wansung.woff2)", {
+      unicodeRange: unicodeRanges.specialCharacters,
+    }),
   },
   {
-    face: new FontFace("pkmnems", "url(./fonts/PokePT_Wansung.woff2)", { unicodeRange: unicodeRanges.specialCharacters }),
+    face: new FontFace("pkmnems", "url(./fonts/PokePT_Wansung.woff2)", {
+      unicodeRange: unicodeRanges.specialCharacters,
+    }),
     extraOptions: { sizeAdjust: "133%" },
   },
   // unicode (korean)
   {
-    face: new FontFace("emerald", "url(./fonts/PokePT_Wansung.woff2)", { unicodeRange: rangesByLanguage.korean }),
+    face: new FontFace("emerald", "url(./fonts/PokePT_Wansung.woff2)", {
+      unicodeRange: rangesByLanguage.korean,
+    }),
   },
   {
-    face: new FontFace("pkmnems", "url(./fonts/PokePT_Wansung.woff2)", { unicodeRange: rangesByLanguage.korean }),
+    face: new FontFace("pkmnems", "url(./fonts/PokePT_Wansung.woff2)", {
+      unicodeRange: rangesByLanguage.korean,
+    }),
     extraOptions: { sizeAdjust: "133%" },
   },
   // unicode (chinese)
   {
-    face: new FontFace("emerald", "url(./fonts/unifont-15.1.05.subset.woff2)", { unicodeRange: rangesByLanguage.chinese }),
+    face: new FontFace("emerald", "url(./fonts/unifont-15.1.05.subset.woff2)", {
+      unicodeRange: rangesByLanguage.chinese,
+    }),
     extraOptions: { sizeAdjust: "70%", format: "woff2" },
-    only: [ "en", "es", "fr", "it", "de", "zh", "pt", "ko", "ca" ],
+    only: ["en", "es", "fr", "it", "de", "zh", "pt", "ko", "ca"],
   },
   {
-    face: new FontFace("pkmnems", "url(./fonts/unifont-15.1.05.subset.woff2)", { unicodeRange: rangesByLanguage.chinese }),
+    face: new FontFace("pkmnems", "url(./fonts/unifont-15.1.05.subset.woff2)", {
+      unicodeRange: rangesByLanguage.chinese,
+    }),
     extraOptions: { format: "woff2" },
-    only: [ "en", "es", "fr", "it", "de", "zh", "pt", "ko", "ca" ],
+    only: ["en", "es", "fr", "it", "de", "zh", "pt", "ko", "ca"],
   },
   // japanese
   {
-    face: new FontFace("emerald", "url(./fonts/Galmuri11.subset.woff2)", { unicodeRange: rangesByLanguage.japanese }),
+    face: new FontFace("emerald", "url(./fonts/Galmuri11.subset.woff2)", {
+      unicodeRange: rangesByLanguage.japanese,
+    }),
     extraOptions: { sizeAdjust: "66%" },
-    only: [ "ja" ],
+    only: ["ja"],
   },
   {
-    face: new FontFace("pkmnems", "url(./fonts/Galmuri9.subset.woff2)", { unicodeRange: rangesByLanguage.japanese }),
-    only: [ "ja" ],
+    face: new FontFace("pkmnems", "url(./fonts/Galmuri9.subset.woff2)", {
+      unicodeRange: rangesByLanguage.japanese,
+    }),
+    only: ["ja"],
   },
 ];
 
@@ -91,7 +109,7 @@ async function initFonts(language: string | undefined) {
   const results = await Promise.allSettled(
     fonts
       .filter(font => !font.only || font.only.some(exclude => language?.indexOf(exclude) === 0))
-      .map(font => Object.assign(font.face, font.extraOptions ?? {}).load())
+      .map(font => Object.assign(font.face, font.extraOptions ?? {}).load()),
   );
   for (const result of results) {
     if (result.status === "fulfilled") {
@@ -111,7 +129,7 @@ async function initFonts(language: string | undefined) {
  * @returns a money formatted string
  */
 function i18nMoneyFormatter(amount: any): string {
-  if (isNaN(Number(amount))) {
+  if (Number.isNaN(Number(amount))) {
     console.warn(`i18nMoneyFormatter: value "${amount}" is not a number!`);
   }
 
@@ -152,10 +170,13 @@ export async function initI18n(): Promise<void> {
   i18next.use(processor);
   i18next.use(new KoreanPostpositionProcessor());
   await i18next.init({
-    fallbackLng: "en",
-    supportedLngs: [ "en", "es-ES", "fr", "it", "de", "zh-CN", "zh-TW", "pt-BR", "ko", "ja", "ca-ES" ],
+    fallbackLng: {
+      "es-MX": ["es-ES", "en"],
+      default: ["en"],
+    },
+    supportedLngs: ["en", "es-ES", "es-MX", "fr", "it", "de", "zh-CN", "zh-TW", "pt-BR", "ko", "ja", "ca-ES"],
     backend: {
-      loadPath(lng: string, [ ns ]: string[]) {
+      loadPath(lng: string, [ns]: string[]) {
         let fileName: string;
         if (namespaceMap[ns]) {
           fileName = namespaceMap[ns];
@@ -219,6 +240,7 @@ export async function initI18n(): Promise<void> {
       "terrain",
       "titles",
       "trainerClasses",
+      "trainersCommon",
       "trainerNames",
       "tutorial",
       "voucher",
@@ -261,16 +283,15 @@ export async function initI18n(): Promise<void> {
       "mysteryEncounterMessages",
     ],
     detection: {
-      lookupLocalStorage: "prLang"
+      lookupLocalStorage: "prLang",
     },
     debug: Number(import.meta.env.VITE_I18N_DEBUG) === 1,
     interpolation: {
       escapeValue: false,
     },
-    postProcess: [ "korean-postposition" ],
+    postProcess: ["korean-postposition"],
   });
 
-
   if (i18next.services.formatter) {
     i18next.services.formatter.add("money", i18nMoneyFormatter);
   }
diff --git a/src/plugins/vite/vite-minify-json-plugin.ts b/src/plugins/vite/vite-minify-json-plugin.ts
index a638271562f..f14fdf7042d 100644
--- a/src/plugins/vite/vite-minify-json-plugin.ts
+++ b/src/plugins/vite/vite-minify-json-plugin.ts
@@ -1,6 +1,6 @@
 import path from "path";
 import fs from "fs";
-import { type Plugin as VitePlugin } from "vite";
+import type { Plugin as VitePlugin } from "vite";
 
 /**
  * Crawl a directory (recursively if wanted) for json files and minifies found ones.
@@ -8,7 +8,7 @@ import { type Plugin as VitePlugin } from "vite";
  * @param recursive if true, will crawl subdirectories
  */
 function applyToDir(dir: string, recursive?: boolean) {
-  const files = fs.readdirSync(dir).filter((file) => !/^\..*/.test(file));
+  const files = fs.readdirSync(dir).filter(file => !/^\..*/.test(file));
 
   for (const file of files) {
     const filePath = path.join(dir, file);
@@ -41,9 +41,9 @@ export function minifyJsonPlugin(basePath: string | string[], recursive?: boolea
     },
     async closeBundle() {
       console.log("Minifying JSON files...");
-      const basePathes = Array.isArray(basePath) ? basePath : [ basePath ];
+      const basePathes = Array.isArray(basePath) ? basePath : [basePath];
 
-      basePathes.forEach((basePath) => {
+      basePathes.forEach(basePath => {
         const baseDir = path.resolve(buildDir, basePath);
         if (fs.existsSync(baseDir)) {
           applyToDir(baseDir, recursive);
diff --git a/src/scene-base.ts b/src/scene-base.ts
index c6ca9bb8ba2..430a9bc8aac 100644
--- a/src/scene-base.ts
+++ b/src/scene-base.ts
@@ -12,11 +12,8 @@ export class SceneBase extends Phaser.Scene {
    */
   public readonly scaledCanvas = {
     width: 1920 / 6,
-    height: 1080 / 6
+    height: 1080 / 6,
   };
-  constructor(config?: string | Phaser.Types.Scenes.SettingsConfig) {
-    super(config);
-  }
 
   getCachedUrl(url: string): string {
     const manifest = this.game["manifest"];
@@ -45,11 +42,17 @@ export class SceneBase extends Phaser.Scene {
     if (!filename) {
       filename = `${key}.png`;
     }
-    this.load.spritesheet(key, this.getCachedUrl(`images/${folder}/${filename}`), { frameWidth: size, frameHeight: size });
+    this.load.spritesheet(key, this.getCachedUrl(`images/${folder}/${filename}`), {
+      frameWidth: size,
+      frameHeight: size,
+    });
     if (folder.startsWith("ui")) {
       legacyCompatibleImages.push(key);
       folder = folder.replace("ui", "ui/legacy");
-      this.load.spritesheet(`${key}_legacy`, this.getCachedUrl(`images/${folder}/${filename}`), { frameWidth: size, frameHeight: size });
+      this.load.spritesheet(`${key}_legacy`, this.getCachedUrl(`images/${folder}/${filename}`), {
+        frameWidth: size,
+        frameHeight: size,
+      });
     }
   }
 
@@ -60,11 +63,19 @@ export class SceneBase extends Phaser.Scene {
     if (folder) {
       folder += "/";
     }
-    this.load.atlas(key, this.getCachedUrl(`images/${folder}${filenameRoot}.png`), this.getCachedUrl(`images/${folder}${filenameRoot}.json`));
+    this.load.atlas(
+      key,
+      this.getCachedUrl(`images/${folder}${filenameRoot}.png`),
+      this.getCachedUrl(`images/${folder}${filenameRoot}.json`),
+    );
     if (folder.startsWith("ui")) {
       legacyCompatibleImages.push(key);
       folder = folder.replace("ui", "ui/legacy");
-      this.load.atlas(`${key}_legacy`, this.getCachedUrl(`images/${folder}${filenameRoot}.png`), this.getCachedUrl(`images/${folder}${filenameRoot}.json`));
+      this.load.atlas(
+        `${key}_legacy`,
+        this.getCachedUrl(`images/${folder}${filenameRoot}.png`),
+        this.getCachedUrl(`images/${folder}${filenameRoot}.json`),
+      );
     }
   }
 
@@ -78,7 +89,7 @@ export class SceneBase extends Phaser.Scene {
       folder += "/";
     }
     if (!Array.isArray(filenames)) {
-      filenames = [ filenames ];
+      filenames = [filenames];
     }
     for (const f of filenames as string[]) {
       this.load.audio(folder + key, this.getCachedUrl(`audio/${folder}${f}`));
diff --git a/src/sprites/pokemon-asset-loader.ts b/src/sprites/pokemon-asset-loader.ts
new file mode 100644
index 00000000000..4ce88f4f1fb
--- /dev/null
+++ b/src/sprites/pokemon-asset-loader.ts
@@ -0,0 +1,11 @@
+import type { Moves } from "#enums/moves";
+import { initMoveAnim, loadMoveAnimAssets } from "#app/data/battle-anims";
+
+/**
+ * Asynchronously load the animations and assets for the provided moves.
+ * @param moveIds - An array of move IDs to load assets for.
+ */
+export async function loadMoveAnimations(moveIds: Moves[]): Promise<void> {
+  await Promise.allSettled(moveIds.map(m => initMoveAnim(m)));
+  await loadMoveAnimAssets(moveIds);
+}
diff --git a/src/sprites/pokemon-sprite.ts b/src/sprites/pokemon-sprite.ts
new file mode 100644
index 00000000000..66432f5a4ea
--- /dev/null
+++ b/src/sprites/pokemon-sprite.ts
@@ -0,0 +1,79 @@
+import { globalScene } from "#app/global-scene";
+import { variantColorCache, variantData } from "#app/sprites/variant";
+import { Gender } from "#app/data/gender";
+import { hasExpSprite } from "./sprite-utils";
+import type { Variant, VariantSet } from "#app/sprites/variant";
+import type Pokemon from "#app/field/pokemon";
+import type BattleScene from "#app/battle-scene";
+
+// Regex patterns
+
+/** Regex matching double underscores */
+const DUNDER_REGEX = /\_{2}/g;
+
+/**
+ * Calculate the sprite ID from a pokemon form.
+ */
+export function getSpriteId(pokemon: Pokemon, ignoreOverride?: boolean): string {
+  return pokemon
+    .getSpeciesForm(ignoreOverride)
+    .getSpriteId(
+      pokemon.getGender(ignoreOverride) === Gender.FEMALE,
+      pokemon.formIndex,
+      pokemon.shiny,
+      pokemon.variant,
+    );
+}
+
+export function getBattleSpriteId(pokemon: Pokemon, back?: boolean, ignoreOverride = false): string {
+  if (back === undefined) {
+    back = pokemon.isPlayer();
+  }
+  return pokemon
+    .getSpeciesForm(ignoreOverride)
+    .getSpriteId(
+      pokemon.getGender(ignoreOverride) === Gender.FEMALE,
+      pokemon.formIndex,
+      pokemon.shiny,
+      pokemon.variant,
+      back,
+    );
+}
+
+/** Compute the path to the sprite atlas by converting double underscores to path components (/)
+ */
+export function getSpriteAtlasPath(pokemon: Pokemon, ignoreOverride = false): string {
+  const spriteId = getSpriteId(pokemon, ignoreOverride).replace(DUNDER_REGEX, "/");
+  return `${/_[1-3]$/.test(spriteId) ? "variant/" : ""}${spriteId}`;
+}
+
+/**
+ * Load the variant assets for the given sprite and store it in {@linkcode variantColorCache}.
+ * @param spriteKey - The key of the sprite to load
+ * @param fileRoot - The root path of the sprite file
+ * @param variant - The variant to load
+ * @param scene - The scene to load the assets in (defaults to the global scene)
+ */
+export async function loadPokemonVariantAssets(
+  spriteKey: string,
+  fileRoot: string,
+  variant: Variant,
+  scene: BattleScene = globalScene,
+): Promise<void> {
+  if (variantColorCache.hasOwnProperty(spriteKey)) {
+    return;
+  }
+  const useExpSprite = scene.experimentalSprites && hasExpSprite(spriteKey);
+  if (useExpSprite) {
+    fileRoot = `exp/${fileRoot}`;
+  }
+  let variantConfig = variantData;
+  fileRoot.split("/").map(p => (variantConfig ? (variantConfig = variantConfig[p]) : null));
+  const variantSet = variantConfig as VariantSet;
+  if (!variantConfig || variantSet[variant] !== 1) {
+    return;
+  }
+  variantColorCache[spriteKey] = await scene
+    .cachedFetch(`./images/pokemon/variant/${fileRoot}.json`)
+    .then(res => res.json());
+}
diff --git a/src/sprites/sprite-keys.ts b/src/sprites/sprite-keys.ts
new file mode 100644
index 00000000000..f023df089f6
--- /dev/null
+++ b/src/sprites/sprite-keys.ts
@@ -0,0 +1 @@
+export const expSpriteKeys: Set<string> = new Set();
diff --git a/src/sprites/sprite-utils.ts b/src/sprites/sprite-utils.ts
new file mode 100644
index 00000000000..8a352de3d55
--- /dev/null
+++ b/src/sprites/sprite-utils.ts
@@ -0,0 +1,28 @@
+import { expSpriteKeys } from "#app/sprites/sprite-keys";
+
+const expKeyRegex = /^pkmn__?(back__)?(shiny__)?(female__)?(\d+)(\-.*?)?(?:_[1-3])?$/;
+
+export function hasExpSprite(key: string): boolean {
+  const keyMatch = expKeyRegex.exec(key);
+  if (!keyMatch) {
+    return false;
+  }
+
+  let k = keyMatch[4]!;
+  if (keyMatch[2]) {
+    k += "s";
+  }
+  if (keyMatch[1]) {
+    k += "b";
+  }
+  if (keyMatch[3]) {
+    k += "f";
+  }
+  if (keyMatch[5]) {
+    k += keyMatch[5];
+  }
+  if (!expSpriteKeys.has(k)) {
+    return false;
+  }
+  return true;
+}
diff --git a/src/sprites/variant.ts b/src/sprites/variant.ts
new file mode 100644
index 00000000000..985068015c6
--- /dev/null
+++ b/src/sprites/variant.ts
@@ -0,0 +1,145 @@
+import { VariantTier } from "#app/enums/variant-tier";
+import { hasExpSprite } from "#app/sprites/sprite-utils";
+import { globalScene } from "#app/global-scene";
+import type Pokemon from "#app/field/pokemon";
+import { isNullOrUndefined } from "#app/utils/common";
+
+export type Variant = 0 | 1 | 2;
+
+export type VariantSet = [Variant, Variant, Variant];
+
+export const variantData: any = {};
+
+/** Caches variant colors that have been generated */
+export const variantColorCache = {};
+
+export function getVariantTint(variant: Variant): number {
+  switch (variant) {
+    case 0:
+      return 0xf8c020;
+    case 1:
+      return 0x20f8f0;
+    case 2:
+      return 0xe81048;
+  }
+}
+
+export function getVariantIcon(variant: Variant): number {
+  switch (variant) {
+    case 0:
+      return VariantTier.STANDARD;
+    case 1:
+      return VariantTier.RARE;
+    case 2:
+      return VariantTier.EPIC;
+  }
+}
+
+/** Delete all of the keys in variantData */
+export function clearVariantData(): void {
+  for (const key in variantData) {
+    delete variantData[key];
+  }
+}
+
+/** Update the variant data to use experiment sprite files for variants that have experimental sprites. */
+export async function mergeExperimentalData(mainData: any, expData: any): Promise<void> {
+  if (!expData) {
+    return;
+  }
+
+  for (const key of Object.keys(expData)) {
+    if (typeof expData[key] === "object" && !Array.isArray(expData[key])) {
+      // If the value is an object, recursively merge.
+      if (!mainData[key]) {
+        mainData[key] = {};
+      }
+      mergeExperimentalData(mainData[key], expData[key]);
+    } else {
+      // Otherwise, replace the value
+      mainData[key] = expData[key];
+    }
+  }
+}
+
+/**
+ * Populate the variant color cache with the variant colors for this pokemon.
+ * The global scene must be initialized before this function is called.
+ */
+export async function populateVariantColors(
+  pokemon: Pokemon,
+  isBackSprite = false,
+  ignoreOverride = true,
+): Promise<void> {
+  const battleSpritePath = pokemon
+    .getBattleSpriteAtlasPath(isBackSprite, ignoreOverride)
+    .replace("variant/", "")
+    .replace(/_[1-3]$/, "");
+  let config = variantData;
+  const useExpSprite =
+    globalScene.experimentalSprites && hasExpSprite(pokemon.getBattleSpriteKey(isBackSprite, ignoreOverride));
+  battleSpritePath.split("/").map(p => (config ? (config = config[p]) : null));
+  const variantSet: VariantSet = config as VariantSet;
+  if (!variantSet || variantSet[pokemon.variant] !== 1) {
+    return;
+  }
+  const cacheKey = pokemon.getBattleSpriteKey(isBackSprite);
+  if (!variantColorCache.hasOwnProperty(cacheKey)) {
+    await populateVariantColorCache(cacheKey, useExpSprite, battleSpritePath);
+  }
+}
+
+/**
+ * Gracefully handle errors loading a variant sprite. Log if it fails and attempt to fall back on
+ * non-experimental sprites before giving up.
+ *
+ * @param cacheKey - The cache key for the variant color sprite
+ * @param attemptedSpritePath - The sprite path that failed to load
+ * @param useExpSprite - Was the attempted sprite experimental
+ * @param battleSpritePath - The filename of the sprite
+ * @param optionalParams - Any additional params to log
+ */
+async function fallbackVariantColor(
+  cacheKey: string,
+  attemptedSpritePath: string,
+  useExpSprite: boolean,
+  battleSpritePath: string,
+  ...optionalParams: any[]
+): Promise<void> {
+  console.warn(`Could not load ${attemptedSpritePath}!`, ...optionalParams);
+  if (useExpSprite) {
+    await populateVariantColorCache(cacheKey, false, battleSpritePath);
+  }
+}
+
+/**
+ * Fetch a variant color sprite from the key and store it in the variant color cache.
+ *
+ * @param cacheKey - The cache key for the variant color sprite
+ * @param useExpSprite - Should the experimental sprite be used
+ * @param battleSpritePath - The filename of the sprite
+ */
+export async function populateVariantColorCache(
+  cacheKey: string,
+  useExpSprite: boolean,
+  battleSpritePath: string,
+): Promise<void> {
+  const spritePath = `./images/pokemon/variant/${useExpSprite ? "exp/" : ""}${battleSpritePath}.json`;
+  return globalScene
+    .cachedFetch(spritePath)
+    .then(res => {
+      // Prevent the JSON from processing if it failed to load
+      if (!res.ok) {
+        return fallbackVariantColor(cacheKey, res.url, useExpSprite, battleSpritePath, res.status, res.statusText);
+      }
+      return res.json();
+    })
+    .catch(error => {
+      return fallbackVariantColor(cacheKey, spritePath, useExpSprite, battleSpritePath, error);
+    })
+    .then(c => {
+      if (!isNullOrUndefined(c)) {
+        variantColorCache[cacheKey] = c;
+      }
+    });
+}
diff --git a/src/starter-colors.ts b/src/starter-colors.ts
new file mode 100644
index 00000000000..6abe028be99
--- /dev/null
+++ b/src/starter-colors.ts
@@ -0,0 +1,4 @@
+export const starterColors: StarterColors = {};
+interface StarterColors {
+  [key: string]: [string, string];
+}
diff --git a/src/starting-wave.ts b/src/starting-wave.ts
new file mode 100644
index 00000000000..3d36dabe652
--- /dev/null
+++ b/src/starting-wave.ts
@@ -0,0 +1,3 @@
+import Overrides from "./overrides";
+
+export const startingWave = Overrides.STARTING_WAVE_OVERRIDE || 1;
diff --git a/src/system/achv.ts b/src/system/achv.ts
index bd9348a52bf..90816ff65c3 100644
--- a/src/system/achv.ts
+++ b/src/system/achv.ts
@@ -2,10 +2,16 @@ import type { Modifier } from "typescript";
 import { TurnHeldItemTransferModifier } from "../modifier/modifier";
 import { pokemonEvolutions } from "#app/data/balance/pokemon-evolutions";
 import i18next from "i18next";
-import * as Utils from "../utils";
+import { NumberHolder } from "#app/utils/common";
 import { PlayerGender } from "#enums/player-gender";
 import type { Challenge } from "#app/data/challenge";
-import { FlipStatChallenge, FreshStartChallenge, SingleGenerationChallenge, SingleTypeChallenge, InverseBattleChallenge } from "#app/data/challenge";
+import {
+  FlipStatChallenge,
+  FreshStartChallenge,
+  SingleGenerationChallenge,
+  SingleTypeChallenge,
+  InverseBattleChallenge,
+} from "#app/data/challenge";
 import type { ConditionFn } from "#app/@types/common";
 import { Stat, getShortenedStatKey } from "#app/enums/stat";
 import { Challenges } from "#app/enums/challenges";
@@ -16,7 +22,7 @@ export enum AchvTier {
   GREAT,
   ULTRA,
   ROGUE,
-  MASTER
+  MASTER,
 }
 
 export class Achv {
@@ -33,7 +39,14 @@ export class Achv {
 
   private conditionFunc: ConditionFn | undefined;
 
-  constructor(localizationKey:string, name: string, description: string, iconImage: string, score: number, conditionFunc?: ConditionFn) {
+  constructor(
+    localizationKey: string,
+    name: string,
+    description: string,
+    iconImage: string,
+    score: number,
+    conditionFunc?: ConditionFn,
+  ) {
     this.name = name;
     this.description = description;
     this.iconImage = iconImage;
@@ -50,7 +63,9 @@ export class Achv {
   getName(playerGender: PlayerGender = PlayerGender.UNSET): string {
     const genderStr = PlayerGender[playerGender].toLowerCase();
     // Localization key is used to get the name of the achievement
-    return i18next.t(`achv:${this.localizationKey}.name`, { context: genderStr });
+    return i18next.t(`achv:${this.localizationKey}.name`, {
+      context: genderStr,
+    });
   }
 
   getDescription(): string {
@@ -101,7 +116,14 @@ export class RibbonAchv extends Achv {
   ribbonAmount: number;
 
   constructor(localizationKey: string, name: string, ribbonAmount: number, iconImage: string, score: number) {
-    super(localizationKey, name, "", iconImage, score, (_args: any[]) => globalScene.gameData.gameStats.ribbonsOwned >= this.ribbonAmount);
+    super(
+      localizationKey,
+      name,
+      "",
+      iconImage,
+      score,
+      (_args: any[]) => globalScene.gameData.gameStats.ribbonsOwned >= this.ribbonAmount,
+    );
     this.ribbonAmount = ribbonAmount;
   }
 }
@@ -110,7 +132,14 @@ export class DamageAchv extends Achv {
   damageAmount: number;
 
   constructor(localizationKey: string, name: string, damageAmount: number, iconImage: string, score: number) {
-    super(localizationKey, name, "", iconImage, score, (args: any[]) => (args[0] instanceof Utils.NumberHolder ? args[0].value : args[0]) >= this.damageAmount);
+    super(
+      localizationKey,
+      name,
+      "",
+      iconImage,
+      score,
+      (args: any[]) => (args[0] instanceof NumberHolder ? args[0].value : args[0]) >= this.damageAmount,
+    );
     this.damageAmount = damageAmount;
   }
 }
@@ -119,7 +148,14 @@ export class HealAchv extends Achv {
   healAmount: number;
 
   constructor(localizationKey: string, name: string, healAmount: number, iconImage: string, score: number) {
-    super(localizationKey, name, "", iconImage, score, (args: any[]) => (args[0] instanceof Utils.NumberHolder ? args[0].value : args[0]) >= this.healAmount);
+    super(
+      localizationKey,
+      name,
+      "",
+      iconImage,
+      score,
+      (args: any[]) => (args[0] instanceof NumberHolder ? args[0].value : args[0]) >= this.healAmount,
+    );
     this.healAmount = healAmount;
   }
 }
@@ -128,24 +164,44 @@ export class LevelAchv extends Achv {
   level: number;
 
   constructor(localizationKey: string, name: string, level: number, iconImage: string, score: number) {
-    super(localizationKey, name, "", iconImage, score, (args: any[]) => (args[0] instanceof Utils.NumberHolder ? args[0].value : args[0]) >= this.level);
+    super(
+      localizationKey,
+      name,
+      "",
+      iconImage,
+      score,
+      (args: any[]) => (args[0] instanceof NumberHolder ? args[0].value : args[0]) >= this.level,
+    );
     this.level = level;
   }
 }
 
 export class ModifierAchv extends Achv {
-  constructor(localizationKey: string, name: string, description: string, iconImage: string, score: number, modifierFunc: (modifier: Modifier) => boolean) {
-    super(localizationKey, name, description, iconImage, score, (args: any[]) => modifierFunc((args[0] as Modifier)));
+  constructor(
+    localizationKey: string,
+    name: string,
+    description: string,
+    iconImage: string,
+    score: number,
+    modifierFunc: (modifier: Modifier) => boolean,
+  ) {
+    super(localizationKey, name, description, iconImage, score, (args: any[]) => modifierFunc(args[0] as Modifier));
   }
 }
 
 export class ChallengeAchv extends Achv {
-  constructor(localizationKey: string, name: string, description: string, iconImage: string, score: number, challengeFunc: (challenge: Challenge) => boolean) {
+  constructor(
+    localizationKey: string,
+    name: string,
+    description: string,
+    iconImage: string,
+    score: number,
+    challengeFunc: (challenge: Challenge) => boolean,
+  ) {
     super(localizationKey, name, description, iconImage, score, (args: any[]) => challengeFunc(args[0] as Challenge));
   }
 }
 
-
 /**
  * Get the description of an achievement from the localization file with all the necessary variables filled in
  * @param localizationKey The localization key of the achievement
@@ -158,49 +214,117 @@ export function getAchievementDescription(localizationKey: string): string {
 
   switch (localizationKey) {
     case "10K_MONEY":
-      return i18next.t("achv:MoneyAchv.description", { context: genderStr, "moneyAmount": achvs._10K_MONEY.moneyAmount.toLocaleString("en-US") });
+      return i18next.t("achv:MoneyAchv.description", {
+        context: genderStr,
+        moneyAmount: achvs._10K_MONEY.moneyAmount.toLocaleString("en-US"),
+      });
     case "100K_MONEY":
-      return i18next.t("achv:MoneyAchv.description", { context: genderStr, "moneyAmount": achvs._100K_MONEY.moneyAmount.toLocaleString("en-US") });
+      return i18next.t("achv:MoneyAchv.description", {
+        context: genderStr,
+        moneyAmount: achvs._100K_MONEY.moneyAmount.toLocaleString("en-US"),
+      });
     case "1M_MONEY":
-      return i18next.t("achv:MoneyAchv.description", { context: genderStr, "moneyAmount": achvs._1M_MONEY.moneyAmount.toLocaleString("en-US") });
+      return i18next.t("achv:MoneyAchv.description", {
+        context: genderStr,
+        moneyAmount: achvs._1M_MONEY.moneyAmount.toLocaleString("en-US"),
+      });
     case "10M_MONEY":
-      return i18next.t("achv:MoneyAchv.description", { context: genderStr, "moneyAmount": achvs._10M_MONEY.moneyAmount.toLocaleString("en-US") });
+      return i18next.t("achv:MoneyAchv.description", {
+        context: genderStr,
+        moneyAmount: achvs._10M_MONEY.moneyAmount.toLocaleString("en-US"),
+      });
     case "250_DMG":
-      return i18next.t("achv:DamageAchv.description", { context: genderStr, "damageAmount": achvs._250_DMG.damageAmount.toLocaleString("en-US") });
+      return i18next.t("achv:DamageAchv.description", {
+        context: genderStr,
+        damageAmount: achvs._250_DMG.damageAmount.toLocaleString("en-US"),
+      });
     case "1000_DMG":
-      return i18next.t("achv:DamageAchv.description", { context: genderStr, "damageAmount": achvs._1000_DMG.damageAmount.toLocaleString("en-US") });
+      return i18next.t("achv:DamageAchv.description", {
+        context: genderStr,
+        damageAmount: achvs._1000_DMG.damageAmount.toLocaleString("en-US"),
+      });
     case "2500_DMG":
-      return i18next.t("achv:DamageAchv.description", { context: genderStr, "damageAmount": achvs._2500_DMG.damageAmount.toLocaleString("en-US") });
+      return i18next.t("achv:DamageAchv.description", {
+        context: genderStr,
+        damageAmount: achvs._2500_DMG.damageAmount.toLocaleString("en-US"),
+      });
     case "10000_DMG":
-      return i18next.t("achv:DamageAchv.description", { context: genderStr, "damageAmount": achvs._10000_DMG.damageAmount.toLocaleString("en-US") });
+      return i18next.t("achv:DamageAchv.description", {
+        context: genderStr,
+        damageAmount: achvs._10000_DMG.damageAmount.toLocaleString("en-US"),
+      });
     case "250_HEAL":
-      return i18next.t("achv:HealAchv.description", { context: genderStr, "healAmount": achvs._250_HEAL.healAmount.toLocaleString("en-US"), "HP": i18next.t(getShortenedStatKey(Stat.HP)) });
+      return i18next.t("achv:HealAchv.description", {
+        context: genderStr,
+        healAmount: achvs._250_HEAL.healAmount.toLocaleString("en-US"),
+        HP: i18next.t(getShortenedStatKey(Stat.HP)),
+      });
     case "1000_HEAL":
-      return i18next.t("achv:HealAchv.description", { context: genderStr, "healAmount": achvs._1000_HEAL.healAmount.toLocaleString("en-US"), "HP": i18next.t(getShortenedStatKey(Stat.HP)) });
+      return i18next.t("achv:HealAchv.description", {
+        context: genderStr,
+        healAmount: achvs._1000_HEAL.healAmount.toLocaleString("en-US"),
+        HP: i18next.t(getShortenedStatKey(Stat.HP)),
+      });
     case "2500_HEAL":
-      return i18next.t("achv:HealAchv.description", { context: genderStr, "healAmount": achvs._2500_HEAL.healAmount.toLocaleString("en-US"), "HP": i18next.t(getShortenedStatKey(Stat.HP)) });
+      return i18next.t("achv:HealAchv.description", {
+        context: genderStr,
+        healAmount: achvs._2500_HEAL.healAmount.toLocaleString("en-US"),
+        HP: i18next.t(getShortenedStatKey(Stat.HP)),
+      });
     case "10000_HEAL":
-      return i18next.t("achv:HealAchv.description", { context: genderStr, "healAmount": achvs._10000_HEAL.healAmount.toLocaleString("en-US"), "HP": i18next.t(getShortenedStatKey(Stat.HP)) });
+      return i18next.t("achv:HealAchv.description", {
+        context: genderStr,
+        healAmount: achvs._10000_HEAL.healAmount.toLocaleString("en-US"),
+        HP: i18next.t(getShortenedStatKey(Stat.HP)),
+      });
     case "LV_100":
-      return i18next.t("achv:LevelAchv.description", { context: genderStr, "level": achvs.LV_100.level });
+      return i18next.t("achv:LevelAchv.description", {
+        context: genderStr,
+        level: achvs.LV_100.level,
+      });
     case "LV_250":
-      return i18next.t("achv:LevelAchv.description", { context: genderStr, "level": achvs.LV_250.level });
+      return i18next.t("achv:LevelAchv.description", {
+        context: genderStr,
+        level: achvs.LV_250.level,
+      });
     case "LV_1000":
-      return i18next.t("achv:LevelAchv.description", { context: genderStr, "level": achvs.LV_1000.level });
+      return i18next.t("achv:LevelAchv.description", {
+        context: genderStr,
+        level: achvs.LV_1000.level,
+      });
     case "10_RIBBONS":
-      return i18next.t("achv:RibbonAchv.description", { context: genderStr, "ribbonAmount": achvs._10_RIBBONS.ribbonAmount.toLocaleString("en-US") });
+      return i18next.t("achv:RibbonAchv.description", {
+        context: genderStr,
+        ribbonAmount: achvs._10_RIBBONS.ribbonAmount.toLocaleString("en-US"),
+      });
     case "25_RIBBONS":
-      return i18next.t("achv:RibbonAchv.description", { context: genderStr, "ribbonAmount": achvs._25_RIBBONS.ribbonAmount.toLocaleString("en-US") });
+      return i18next.t("achv:RibbonAchv.description", {
+        context: genderStr,
+        ribbonAmount: achvs._25_RIBBONS.ribbonAmount.toLocaleString("en-US"),
+      });
     case "50_RIBBONS":
-      return i18next.t("achv:RibbonAchv.description", { context: genderStr, "ribbonAmount": achvs._50_RIBBONS.ribbonAmount.toLocaleString("en-US") });
+      return i18next.t("achv:RibbonAchv.description", {
+        context: genderStr,
+        ribbonAmount: achvs._50_RIBBONS.ribbonAmount.toLocaleString("en-US"),
+      });
     case "75_RIBBONS":
-      return i18next.t("achv:RibbonAchv.description", { context: genderStr, "ribbonAmount": achvs._75_RIBBONS.ribbonAmount.toLocaleString("en-US") });
+      return i18next.t("achv:RibbonAchv.description", {
+        context: genderStr,
+        ribbonAmount: achvs._75_RIBBONS.ribbonAmount.toLocaleString("en-US"),
+      });
     case "100_RIBBONS":
-      return i18next.t("achv:RibbonAchv.description", { context: genderStr, "ribbonAmount": achvs._100_RIBBONS.ribbonAmount.toLocaleString("en-US") });
+      return i18next.t("achv:RibbonAchv.description", {
+        context: genderStr,
+        ribbonAmount: achvs._100_RIBBONS.ribbonAmount.toLocaleString("en-US"),
+      });
     case "TRANSFER_MAX_STAT_STAGE":
-      return i18next.t("achv:TRANSFER_MAX_STAT_STAGE.description", { context: genderStr });
+      return i18next.t("achv:TRANSFER_MAX_STAT_STAGE.description", {
+        context: genderStr,
+      });
     case "MAX_FRIENDSHIP":
-      return i18next.t("achv:MAX_FRIENDSHIP.description", { context: genderStr });
+      return i18next.t("achv:MAX_FRIENDSHIP.description", {
+        context: genderStr,
+      });
     case "MEGA_EVOLVE":
       return i18next.t("achv:MEGA_EVOLVE.description", { context: genderStr });
     case "GIGANTAMAX":
@@ -208,55 +332,89 @@ export function getAchievementDescription(localizationKey: string): string {
     case "TERASTALLIZE":
       return i18next.t("achv:TERASTALLIZE.description", { context: genderStr });
     case "STELLAR_TERASTALLIZE":
-      return i18next.t("achv:STELLAR_TERASTALLIZE.description", { context: genderStr });
+      return i18next.t("achv:STELLAR_TERASTALLIZE.description", {
+        context: genderStr,
+      });
     case "SPLICE":
       return i18next.t("achv:SPLICE.description", { context: genderStr });
     case "MINI_BLACK_HOLE":
-      return i18next.t("achv:MINI_BLACK_HOLE.description", { context: genderStr });
+      return i18next.t("achv:MINI_BLACK_HOLE.description", {
+        context: genderStr,
+      });
     case "CATCH_MYTHICAL":
-      return i18next.t("achv:CATCH_MYTHICAL.description", { context: genderStr });
+      return i18next.t("achv:CATCH_MYTHICAL.description", {
+        context: genderStr,
+      });
     case "CATCH_SUB_LEGENDARY":
-      return i18next.t("achv:CATCH_SUB_LEGENDARY.description", { context: genderStr });
+      return i18next.t("achv:CATCH_SUB_LEGENDARY.description", {
+        context: genderStr,
+      });
     case "CATCH_LEGENDARY":
-      return i18next.t("achv:CATCH_LEGENDARY.description", { context: genderStr });
+      return i18next.t("achv:CATCH_LEGENDARY.description", {
+        context: genderStr,
+      });
     case "SEE_SHINY":
       return i18next.t("achv:SEE_SHINY.description", { context: genderStr });
     case "SHINY_PARTY":
       return i18next.t("achv:SHINY_PARTY.description", { context: genderStr });
     case "HATCH_MYTHICAL":
-      return i18next.t("achv:HATCH_MYTHICAL.description", { context: genderStr });
+      return i18next.t("achv:HATCH_MYTHICAL.description", {
+        context: genderStr,
+      });
     case "HATCH_SUB_LEGENDARY":
-      return i18next.t("achv:HATCH_SUB_LEGENDARY.description", { context: genderStr });
+      return i18next.t("achv:HATCH_SUB_LEGENDARY.description", {
+        context: genderStr,
+      });
     case "HATCH_LEGENDARY":
-      return i18next.t("achv:HATCH_LEGENDARY.description", { context: genderStr });
+      return i18next.t("achv:HATCH_LEGENDARY.description", {
+        context: genderStr,
+      });
     case "HATCH_SHINY":
       return i18next.t("achv:HATCH_SHINY.description", { context: genderStr });
     case "HIDDEN_ABILITY":
-      return i18next.t("achv:HIDDEN_ABILITY.description", { context: genderStr });
+      return i18next.t("achv:HIDDEN_ABILITY.description", {
+        context: genderStr,
+      });
     case "PERFECT_IVS":
       return i18next.t("achv:PERFECT_IVS.description", { context: genderStr });
     case "CLASSIC_VICTORY":
-      return i18next.t("achv:CLASSIC_VICTORY.description", { context: genderStr });
+      return i18next.t("achv:CLASSIC_VICTORY.description", {
+        context: genderStr,
+      });
     case "UNEVOLVED_CLASSIC_VICTORY":
-      return i18next.t("achv:UNEVOLVED_CLASSIC_VICTORY.description", { context: genderStr });
+      return i18next.t("achv:UNEVOLVED_CLASSIC_VICTORY.description", {
+        context: genderStr,
+      });
     case "MONO_GEN_ONE":
       return i18next.t("achv:MONO_GEN_ONE.description", { context: genderStr });
     case "MONO_GEN_TWO":
       return i18next.t("achv:MONO_GEN_TWO.description", { context: genderStr });
     case "MONO_GEN_THREE":
-      return i18next.t("achv:MONO_GEN_THREE.description", { context: genderStr });
+      return i18next.t("achv:MONO_GEN_THREE.description", {
+        context: genderStr,
+      });
     case "MONO_GEN_FOUR":
-      return i18next.t("achv:MONO_GEN_FOUR.description", { context: genderStr });
+      return i18next.t("achv:MONO_GEN_FOUR.description", {
+        context: genderStr,
+      });
     case "MONO_GEN_FIVE":
-      return i18next.t("achv:MONO_GEN_FIVE.description", { context: genderStr });
+      return i18next.t("achv:MONO_GEN_FIVE.description", {
+        context: genderStr,
+      });
     case "MONO_GEN_SIX":
       return i18next.t("achv:MONO_GEN_SIX.description", { context: genderStr });
     case "MONO_GEN_SEVEN":
-      return i18next.t("achv:MONO_GEN_SEVEN.description", { context: genderStr });
+      return i18next.t("achv:MONO_GEN_SEVEN.description", {
+        context: genderStr,
+      });
     case "MONO_GEN_EIGHT":
-      return i18next.t("achv:MONO_GEN_EIGHT.description", { context: genderStr });
+      return i18next.t("achv:MONO_GEN_EIGHT.description", {
+        context: genderStr,
+      });
     case "MONO_GEN_NINE":
-      return i18next.t("achv:MONO_GEN_NINE.description", { context: genderStr });
+      return i18next.t("achv:MONO_GEN_NINE.description", {
+        context: genderStr,
+      });
     case "MONO_NORMAL":
     case "MONO_FIGHTING":
     case "MONO_FLYING":
@@ -275,21 +433,27 @@ export function getAchievementDescription(localizationKey: string): string {
     case "MONO_DRAGON":
     case "MONO_DARK":
     case "MONO_FAIRY":
-      return i18next.t("achv:MonoType.description", { context: genderStr, "type": i18next.t(`pokemonInfo:Type.${localizationKey.slice(5)}`) });
+      return i18next.t("achv:MonoType.description", {
+        context: genderStr,
+        type: i18next.t(`pokemonInfo:Type.${localizationKey.slice(5)}`),
+      });
     case "FRESH_START":
       return i18next.t("achv:FRESH_START.description", { context: genderStr });
     case "INVERSE_BATTLE":
-      return i18next.t("achv:INVERSE_BATTLE.description", { context: genderStr });
+      return i18next.t("achv:INVERSE_BATTLE.description", {
+        context: genderStr,
+      });
     case "FLIP_STATS":
       return i18next.t("achv:FLIP_STATS.description", { context: genderStr });
     case "FLIP_INVERSE":
       return i18next.t("achv:FLIP_INVERSE.description", { context: genderStr });
     case "BREEDERS_IN_SPACE":
-      return i18next.t("achv:BREEDERS_IN_SPACE.description", { context: genderStr });
+      return i18next.t("achv:BREEDERS_IN_SPACE.description", {
+        context: genderStr,
+      });
     default:
       return "";
   }
-
 }
 
 export const achvs = {
@@ -313,58 +477,451 @@ export const achvs = {
   _50_RIBBONS: new RibbonAchv("50_RIBBONS", "", 50, "ultra_ribbon", 50).setSecret(true),
   _75_RIBBONS: new RibbonAchv("75_RIBBONS", "", 75, "rogue_ribbon", 75).setSecret(true),
   _100_RIBBONS: new RibbonAchv("100_RIBBONS", "", 100, "master_ribbon", 100).setSecret(true),
-  TRANSFER_MAX_STAT_STAGE: new Achv("TRANSFER_MAX_STAT_STAGE", "",  "TRANSFER_MAX_STAT_STAGE.description", "baton", 20),
+  TRANSFER_MAX_STAT_STAGE: new Achv("TRANSFER_MAX_STAT_STAGE", "", "TRANSFER_MAX_STAT_STAGE.description", "baton", 20),
   MAX_FRIENDSHIP: new Achv("MAX_FRIENDSHIP", "", "MAX_FRIENDSHIP.description", "soothe_bell", 25),
   MEGA_EVOLVE: new Achv("MEGA_EVOLVE", "", "MEGA_EVOLVE.description", "mega_bracelet", 50),
   GIGANTAMAX: new Achv("GIGANTAMAX", "", "GIGANTAMAX.description", "dynamax_band", 50),
-  TERASTALLIZE: new Achv("TERASTALLIZE", "",  "TERASTALLIZE.description", "tera_orb", 25),
-  STELLAR_TERASTALLIZE: new Achv("STELLAR_TERASTALLIZE", "", "STELLAR_TERASTALLIZE.description", "stellar_tera_shard", 25).setSecret(true),
-  SPLICE: new Achv("SPLICE", "",  "SPLICE.description", "dna_splicers", 10),
-  MINI_BLACK_HOLE: new ModifierAchv("MINI_BLACK_HOLE", "",  "MINI_BLACK_HOLE.description", "mini_black_hole", 25, modifier => modifier instanceof TurnHeldItemTransferModifier).setSecret(),
-  CATCH_MYTHICAL: new Achv("CATCH_MYTHICAL", "",  "CATCH_MYTHICAL.description", "strange_ball", 50).setSecret(),
-  CATCH_SUB_LEGENDARY: new Achv("CATCH_SUB_LEGENDARY", "",  "CATCH_SUB_LEGENDARY.description", "rb", 75).setSecret(),
+  TERASTALLIZE: new Achv("TERASTALLIZE", "", "TERASTALLIZE.description", "tera_orb", 25),
+  STELLAR_TERASTALLIZE: new Achv(
+    "STELLAR_TERASTALLIZE",
+    "",
+    "STELLAR_TERASTALLIZE.description",
+    "stellar_tera_shard",
+    25,
+  ).setSecret(true),
+  SPLICE: new Achv("SPLICE", "", "SPLICE.description", "dna_splicers", 10),
+  MINI_BLACK_HOLE: new ModifierAchv(
+    "MINI_BLACK_HOLE",
+    "",
+    "MINI_BLACK_HOLE.description",
+    "mini_black_hole",
+    25,
+    modifier => modifier instanceof TurnHeldItemTransferModifier,
+  ).setSecret(),
+  CATCH_MYTHICAL: new Achv("CATCH_MYTHICAL", "", "CATCH_MYTHICAL.description", "strange_ball", 50).setSecret(),
+  CATCH_SUB_LEGENDARY: new Achv("CATCH_SUB_LEGENDARY", "", "CATCH_SUB_LEGENDARY.description", "rb", 75).setSecret(),
   CATCH_LEGENDARY: new Achv("CATCH_LEGENDARY", "", "CATCH_LEGENDARY.description", "mb", 100).setSecret(),
   SEE_SHINY: new Achv("SEE_SHINY", "", "SEE_SHINY.description", "pb_gold", 75),
   SHINY_PARTY: new Achv("SHINY_PARTY", "", "SHINY_PARTY.description", "shiny_charm", 100).setSecret(true),
   HATCH_MYTHICAL: new Achv("HATCH_MYTHICAL", "", "HATCH_MYTHICAL.description", "mystery_egg", 75).setSecret(),
-  HATCH_SUB_LEGENDARY: new Achv("HATCH_SUB_LEGENDARY", "",  "HATCH_SUB_LEGENDARY.description", "oval_stone", 100).setSecret(),
-  HATCH_LEGENDARY: new Achv("HATCH_LEGENDARY", "",  "HATCH_LEGENDARY.description", "lucky_egg", 125).setSecret(),
-  HATCH_SHINY: new Achv("HATCH_SHINY", "",  "HATCH_SHINY.description", "golden_egg", 100).setSecret(),
-  HIDDEN_ABILITY: new Achv("HIDDEN_ABILITY", "",  "HIDDEN_ABILITY.description", "ability_charm", 75),
-  PERFECT_IVS: new Achv("PERFECT_IVS", "",  "PERFECT_IVS.description", "blunder_policy", 100),
-  CLASSIC_VICTORY: new Achv("CLASSIC_VICTORY", "",  "CLASSIC_VICTORY.description", "relic_crown", 150, (_) => globalScene.gameData.gameStats.sessionsWon === 0),
-  UNEVOLVED_CLASSIC_VICTORY: new Achv("UNEVOLVED_CLASSIC_VICTORY", "", "UNEVOLVED_CLASSIC_VICTORY.description", "eviolite", 175, (_) => globalScene.getPlayerParty().some(p => p.getSpeciesForm(true).speciesId in pokemonEvolutions)),
-  MONO_GEN_ONE_VICTORY: new ChallengeAchv("MONO_GEN_ONE", "",  "MONO_GEN_ONE.description", "ribbon_gen1", 100, (c) => c instanceof SingleGenerationChallenge && c.value === 1 && !globalScene.gameMode.challenges.some(c => [ Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT ].includes(c.id) && c.value > 0)),
-  MONO_GEN_TWO_VICTORY: new ChallengeAchv("MONO_GEN_TWO", "",  "MONO_GEN_TWO.description", "ribbon_gen2", 100, (c) => c instanceof SingleGenerationChallenge && c.value === 2 && !globalScene.gameMode.challenges.some(c => [ Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT ].includes(c.id) && c.value > 0)),
-  MONO_GEN_THREE_VICTORY: new ChallengeAchv("MONO_GEN_THREE", "",  "MONO_GEN_THREE.description", "ribbon_gen3", 100, (c) => c instanceof SingleGenerationChallenge && c.value === 3 && !globalScene.gameMode.challenges.some(c => [ Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT ].includes(c.id) && c.value > 0)),
-  MONO_GEN_FOUR_VICTORY: new ChallengeAchv("MONO_GEN_FOUR", "",  "MONO_GEN_FOUR.description", "ribbon_gen4", 100, (c) => c instanceof SingleGenerationChallenge && c.value === 4 && !globalScene.gameMode.challenges.some(c => [ Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT ].includes(c.id) && c.value > 0)),
-  MONO_GEN_FIVE_VICTORY: new ChallengeAchv("MONO_GEN_FIVE", "",  "MONO_GEN_FIVE.description", "ribbon_gen5", 100, (c) => c instanceof SingleGenerationChallenge && c.value === 5 && !globalScene.gameMode.challenges.some(c => [ Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT ].includes(c.id) && c.value > 0)),
-  MONO_GEN_SIX_VICTORY: new ChallengeAchv("MONO_GEN_SIX", "",  "MONO_GEN_SIX.description", "ribbon_gen6", 100, (c) => c instanceof SingleGenerationChallenge && c.value === 6 && !globalScene.gameMode.challenges.some(c => [ Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT ].includes(c.id) && c.value > 0)),
-  MONO_GEN_SEVEN_VICTORY: new ChallengeAchv("MONO_GEN_SEVEN", "",  "MONO_GEN_SEVEN.description", "ribbon_gen7", 100, (c) => c instanceof SingleGenerationChallenge && c.value === 7 && !globalScene.gameMode.challenges.some(c => [ Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT ].includes(c.id) && c.value > 0)),
-  MONO_GEN_EIGHT_VICTORY: new ChallengeAchv("MONO_GEN_EIGHT", "",  "MONO_GEN_EIGHT.description", "ribbon_gen8", 100, (c) => c instanceof SingleGenerationChallenge && c.value === 8 && !globalScene.gameMode.challenges.some(c => [ Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT ].includes(c.id) && c.value > 0)),
-  MONO_GEN_NINE_VICTORY: new ChallengeAchv("MONO_GEN_NINE", "",  "MONO_GEN_NINE.description", "ribbon_gen9", 100, (c) => c instanceof SingleGenerationChallenge && c.value === 9 && !globalScene.gameMode.challenges.some(c => [ Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT ].includes(c.id) && c.value > 0)),
-  MONO_NORMAL: new ChallengeAchv("MONO_NORMAL", "", "MONO_NORMAL.description", "silk_scarf", 100, (c) => c instanceof SingleTypeChallenge && c.value === 1 && !globalScene.gameMode.challenges.some(c => [ Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT ].includes(c.id) && c.value > 0)),
-  MONO_FIGHTING: new ChallengeAchv("MONO_FIGHTING", "", "MONO_FIGHTING.description", "black_belt", 100, (c) => c instanceof SingleTypeChallenge && c.value === 2 && !globalScene.gameMode.challenges.some(c => [ Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT ].includes(c.id) && c.value > 0)),
-  MONO_FLYING: new ChallengeAchv("MONO_FLYING", "", "MONO_FLYING.description", "sharp_beak", 100, (c) => c instanceof SingleTypeChallenge && c.value === 3 && !globalScene.gameMode.challenges.some(c => [ Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT ].includes(c.id) && c.value > 0)),
-  MONO_POISON: new ChallengeAchv("MONO_POISON", "", "MONO_POISON.description", "poison_barb", 100, (c) => c instanceof SingleTypeChallenge && c.value === 4 && !globalScene.gameMode.challenges.some(c => [ Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT ].includes(c.id) && c.value > 0)),
-  MONO_GROUND: new ChallengeAchv("MONO_GROUND", "", "MONO_GROUND.description", "soft_sand", 100, (c) => c instanceof SingleTypeChallenge && c.value === 5 && !globalScene.gameMode.challenges.some(c => [ Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT ].includes(c.id) && c.value > 0)),
-  MONO_ROCK: new ChallengeAchv("MONO_ROCK", "", "MONO_ROCK.description", "hard_stone", 100, (c) => c instanceof SingleTypeChallenge && c.value === 6 && !globalScene.gameMode.challenges.some(c => [ Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT ].includes(c.id) && c.value > 0)),
-  MONO_BUG: new ChallengeAchv("MONO_BUG", "", "MONO_BUG.description", "silver_powder", 100, (c) => c instanceof SingleTypeChallenge && c.value === 7 && !globalScene.gameMode.challenges.some(c => [ Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT ].includes(c.id) && c.value > 0)),
-  MONO_GHOST: new ChallengeAchv("MONO_GHOST", "", "MONO_GHOST.description", "spell_tag", 100, (c) => c instanceof SingleTypeChallenge && c.value === 8 && !globalScene.gameMode.challenges.some(c => [ Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT ].includes(c.id) && c.value > 0)),
-  MONO_STEEL: new ChallengeAchv("MONO_STEEL", "", "MONO_STEEL.description", "metal_coat", 100, (c) => c instanceof SingleTypeChallenge && c.value === 9 && !globalScene.gameMode.challenges.some(c => [ Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT ].includes(c.id) && c.value > 0)),
-  MONO_FIRE: new ChallengeAchv("MONO_FIRE", "", "MONO_FIRE.description", "charcoal", 100, (c) => c instanceof SingleTypeChallenge && c.value === 10 && !globalScene.gameMode.challenges.some(c => [ Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT ].includes(c.id) && c.value > 0)),
-  MONO_WATER: new ChallengeAchv("MONO_WATER", "", "MONO_WATER.description", "mystic_water", 100, (c) => c instanceof SingleTypeChallenge && c.value === 11 && !globalScene.gameMode.challenges.some(c => [ Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT ].includes(c.id) && c.value > 0)),
-  MONO_GRASS: new ChallengeAchv("MONO_GRASS", "", "MONO_GRASS.description", "miracle_seed", 100, (c) => c instanceof SingleTypeChallenge && c.value === 12 && !globalScene.gameMode.challenges.some(c => [ Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT ].includes(c.id) && c.value > 0)),
-  MONO_ELECTRIC: new ChallengeAchv("MONO_ELECTRIC", "", "MONO_ELECTRIC.description", "magnet", 100, (c) => c instanceof SingleTypeChallenge && c.value === 13 && !globalScene.gameMode.challenges.some(c => [ Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT ].includes(c.id) && c.value > 0)),
-  MONO_PSYCHIC: new ChallengeAchv("MONO_PSYCHIC", "", "MONO_PSYCHIC.description", "twisted_spoon", 100, (c) => c instanceof SingleTypeChallenge && c.value === 14 && !globalScene.gameMode.challenges.some(c => [ Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT ].includes(c.id) && c.value > 0)),
-  MONO_ICE: new ChallengeAchv("MONO_ICE", "", "MONO_ICE.description", "never_melt_ice", 100, (c) => c instanceof SingleTypeChallenge && c.value === 15 && !globalScene.gameMode.challenges.some(c => [ Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT ].includes(c.id) && c.value > 0)),
-  MONO_DRAGON: new ChallengeAchv("MONO_DRAGON", "", "MONO_DRAGON.description", "dragon_fang", 100, (c) => c instanceof SingleTypeChallenge && c.value === 16 && !globalScene.gameMode.challenges.some(c => [ Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT ].includes(c.id) && c.value > 0)),
-  MONO_DARK: new ChallengeAchv("MONO_DARK", "", "MONO_DARK.description", "black_glasses", 100, (c) => c instanceof SingleTypeChallenge && c.value === 17 && !globalScene.gameMode.challenges.some(c => [ Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT ].includes(c.id) && c.value > 0)),
-  MONO_FAIRY: new ChallengeAchv("MONO_FAIRY", "", "MONO_FAIRY.description", "fairy_feather", 100, (c) => c instanceof SingleTypeChallenge && c.value === 18 && !globalScene.gameMode.challenges.some(c => [ Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT ].includes(c.id) && c.value > 0)),
-  FRESH_START: new ChallengeAchv("FRESH_START", "", "FRESH_START.description", "reviver_seed", 100, (c) => c instanceof FreshStartChallenge && c.value > 0 && !globalScene.gameMode.challenges.some(c => [ Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT ].includes(c.id) && c.value > 0)),
-  INVERSE_BATTLE: new ChallengeAchv("INVERSE_BATTLE", "", "INVERSE_BATTLE.description", "inverse", 100, (c) => c instanceof InverseBattleChallenge && c.value > 0),
-  FLIP_STATS: new ChallengeAchv("FLIP_STATS", "", "FLIP_STATS.description", "dubious_disc", 100, (c) => c instanceof FlipStatChallenge && c.value > 0),
-  FLIP_INVERSE: new ChallengeAchv("FLIP_INVERSE", "", "FLIP_INVERSE.description", "cracked_pot", 100, (c) => c instanceof FlipStatChallenge && c.value > 0 && globalScene.gameMode.challenges.some(c => c.id === Challenges.INVERSE_BATTLE && c.value > 0)).setSecret(),
+  HATCH_SUB_LEGENDARY: new Achv(
+    "HATCH_SUB_LEGENDARY",
+    "",
+    "HATCH_SUB_LEGENDARY.description",
+    "oval_stone",
+    100,
+  ).setSecret(),
+  HATCH_LEGENDARY: new Achv("HATCH_LEGENDARY", "", "HATCH_LEGENDARY.description", "lucky_egg", 125).setSecret(),
+  HATCH_SHINY: new Achv("HATCH_SHINY", "", "HATCH_SHINY.description", "golden_egg", 100).setSecret(),
+  HIDDEN_ABILITY: new Achv("HIDDEN_ABILITY", "", "HIDDEN_ABILITY.description", "ability_charm", 75),
+  PERFECT_IVS: new Achv("PERFECT_IVS", "", "PERFECT_IVS.description", "blunder_policy", 100),
+  CLASSIC_VICTORY: new Achv(
+    "CLASSIC_VICTORY",
+    "",
+    "CLASSIC_VICTORY.description",
+    "relic_crown",
+    150,
+    _ => globalScene.gameData.gameStats.sessionsWon === 0,
+  ),
+  UNEVOLVED_CLASSIC_VICTORY: new Achv(
+    "UNEVOLVED_CLASSIC_VICTORY",
+    "",
+    "UNEVOLVED_CLASSIC_VICTORY.description",
+    "eviolite",
+    175,
+    _ => globalScene.getPlayerParty().some(p => p.getSpeciesForm(true).speciesId in pokemonEvolutions),
+  ),
+  MONO_GEN_ONE_VICTORY: new ChallengeAchv(
+    "MONO_GEN_ONE",
+    "",
+    "MONO_GEN_ONE.description",
+    "ribbon_gen1",
+    100,
+    c =>
+      c instanceof SingleGenerationChallenge &&
+      c.value === 1 &&
+      !globalScene.gameMode.challenges.some(
+        c => [Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT].includes(c.id) && c.value > 0,
+      ),
+  ),
+  MONO_GEN_TWO_VICTORY: new ChallengeAchv(
+    "MONO_GEN_TWO",
+    "",
+    "MONO_GEN_TWO.description",
+    "ribbon_gen2",
+    100,
+    c =>
+      c instanceof SingleGenerationChallenge &&
+      c.value === 2 &&
+      !globalScene.gameMode.challenges.some(
+        c => [Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT].includes(c.id) && c.value > 0,
+      ),
+  ),
+  MONO_GEN_THREE_VICTORY: new ChallengeAchv(
+    "MONO_GEN_THREE",
+    "",
+    "MONO_GEN_THREE.description",
+    "ribbon_gen3",
+    100,
+    c =>
+      c instanceof SingleGenerationChallenge &&
+      c.value === 3 &&
+      !globalScene.gameMode.challenges.some(
+        c => [Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT].includes(c.id) && c.value > 0,
+      ),
+  ),
+  MONO_GEN_FOUR_VICTORY: new ChallengeAchv(
+    "MONO_GEN_FOUR",
+    "",
+    "MONO_GEN_FOUR.description",
+    "ribbon_gen4",
+    100,
+    c =>
+      c instanceof SingleGenerationChallenge &&
+      c.value === 4 &&
+      !globalScene.gameMode.challenges.some(
+        c => [Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT].includes(c.id) && c.value > 0,
+      ),
+  ),
+  MONO_GEN_FIVE_VICTORY: new ChallengeAchv(
+    "MONO_GEN_FIVE",
+    "",
+    "MONO_GEN_FIVE.description",
+    "ribbon_gen5",
+    100,
+    c =>
+      c instanceof SingleGenerationChallenge &&
+      c.value === 5 &&
+      !globalScene.gameMode.challenges.some(
+        c => [Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT].includes(c.id) && c.value > 0,
+      ),
+  ),
+  MONO_GEN_SIX_VICTORY: new ChallengeAchv(
+    "MONO_GEN_SIX",
+    "",
+    "MONO_GEN_SIX.description",
+    "ribbon_gen6",
+    100,
+    c =>
+      c instanceof SingleGenerationChallenge &&
+      c.value === 6 &&
+      !globalScene.gameMode.challenges.some(
+        c => [Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT].includes(c.id) && c.value > 0,
+      ),
+  ),
+  MONO_GEN_SEVEN_VICTORY: new ChallengeAchv(
+    "MONO_GEN_SEVEN",
+    "",
+    "MONO_GEN_SEVEN.description",
+    "ribbon_gen7",
+    100,
+    c =>
+      c instanceof SingleGenerationChallenge &&
+      c.value === 7 &&
+      !globalScene.gameMode.challenges.some(
+        c => [Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT].includes(c.id) && c.value > 0,
+      ),
+  ),
+  MONO_GEN_EIGHT_VICTORY: new ChallengeAchv(
+    "MONO_GEN_EIGHT",
+    "",
+    "MONO_GEN_EIGHT.description",
+    "ribbon_gen8",
+    100,
+    c =>
+      c instanceof SingleGenerationChallenge &&
+      c.value === 8 &&
+      !globalScene.gameMode.challenges.some(
+        c => [Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT].includes(c.id) && c.value > 0,
+      ),
+  ),
+  MONO_GEN_NINE_VICTORY: new ChallengeAchv(
+    "MONO_GEN_NINE",
+    "",
+    "MONO_GEN_NINE.description",
+    "ribbon_gen9",
+    100,
+    c =>
+      c instanceof SingleGenerationChallenge &&
+      c.value === 9 &&
+      !globalScene.gameMode.challenges.some(
+        c => [Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT].includes(c.id) && c.value > 0,
+      ),
+  ),
+  MONO_NORMAL: new ChallengeAchv(
+    "MONO_NORMAL",
+    "",
+    "MONO_NORMAL.description",
+    "silk_scarf",
+    100,
+    c =>
+      c instanceof SingleTypeChallenge &&
+      c.value === 1 &&
+      !globalScene.gameMode.challenges.some(
+        c => [Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT].includes(c.id) && c.value > 0,
+      ),
+  ),
+  MONO_FIGHTING: new ChallengeAchv(
+    "MONO_FIGHTING",
+    "",
+    "MONO_FIGHTING.description",
+    "black_belt",
+    100,
+    c =>
+      c instanceof SingleTypeChallenge &&
+      c.value === 2 &&
+      !globalScene.gameMode.challenges.some(
+        c => [Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT].includes(c.id) && c.value > 0,
+      ),
+  ),
+  MONO_FLYING: new ChallengeAchv(
+    "MONO_FLYING",
+    "",
+    "MONO_FLYING.description",
+    "sharp_beak",
+    100,
+    c =>
+      c instanceof SingleTypeChallenge &&
+      c.value === 3 &&
+      !globalScene.gameMode.challenges.some(
+        c => [Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT].includes(c.id) && c.value > 0,
+      ),
+  ),
+  MONO_POISON: new ChallengeAchv(
+    "MONO_POISON",
+    "",
+    "MONO_POISON.description",
+    "poison_barb",
+    100,
+    c =>
+      c instanceof SingleTypeChallenge &&
+      c.value === 4 &&
+      !globalScene.gameMode.challenges.some(
+        c => [Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT].includes(c.id) && c.value > 0,
+      ),
+  ),
+  MONO_GROUND: new ChallengeAchv(
+    "MONO_GROUND",
+    "",
+    "MONO_GROUND.description",
+    "soft_sand",
+    100,
+    c =>
+      c instanceof SingleTypeChallenge &&
+      c.value === 5 &&
+      !globalScene.gameMode.challenges.some(
+        c => [Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT].includes(c.id) && c.value > 0,
+      ),
+  ),
+  MONO_ROCK: new ChallengeAchv(
+    "MONO_ROCK",
+    "",
+    "MONO_ROCK.description",
+    "hard_stone",
+    100,
+    c =>
+      c instanceof SingleTypeChallenge &&
+      c.value === 6 &&
+      !globalScene.gameMode.challenges.some(
+        c => [Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT].includes(c.id) && c.value > 0,
+      ),
+  ),
+  MONO_BUG: new ChallengeAchv(
+    "MONO_BUG",
+    "",
+    "MONO_BUG.description",
+    "silver_powder",
+    100,
+    c =>
+      c instanceof SingleTypeChallenge &&
+      c.value === 7 &&
+      !globalScene.gameMode.challenges.some(
+        c => [Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT].includes(c.id) && c.value > 0,
+      ),
+  ),
+  MONO_GHOST: new ChallengeAchv(
+    "MONO_GHOST",
+    "",
+    "MONO_GHOST.description",
+    "spell_tag",
+    100,
+    c =>
+      c instanceof SingleTypeChallenge &&
+      c.value === 8 &&
+      !globalScene.gameMode.challenges.some(
+        c => [Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT].includes(c.id) && c.value > 0,
+      ),
+  ),
+  MONO_STEEL: new ChallengeAchv(
+    "MONO_STEEL",
+    "",
+    "MONO_STEEL.description",
+    "metal_coat",
+    100,
+    c =>
+      c instanceof SingleTypeChallenge &&
+      c.value === 9 &&
+      !globalScene.gameMode.challenges.some(
+        c => [Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT].includes(c.id) && c.value > 0,
+      ),
+  ),
+  MONO_FIRE: new ChallengeAchv(
+    "MONO_FIRE",
+    "",
+    "MONO_FIRE.description",
+    "charcoal",
+    100,
+    c =>
+      c instanceof SingleTypeChallenge &&
+      c.value === 10 &&
+      !globalScene.gameMode.challenges.some(
+        c => [Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT].includes(c.id) && c.value > 0,
+      ),
+  ),
+  MONO_WATER: new ChallengeAchv(
+    "MONO_WATER",
+    "",
+    "MONO_WATER.description",
+    "mystic_water",
+    100,
+    c =>
+      c instanceof SingleTypeChallenge &&
+      c.value === 11 &&
+      !globalScene.gameMode.challenges.some(
+        c => [Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT].includes(c.id) && c.value > 0,
+      ),
+  ),
+  MONO_GRASS: new ChallengeAchv(
+    "MONO_GRASS",
+    "",
+    "MONO_GRASS.description",
+    "miracle_seed",
+    100,
+    c =>
+      c instanceof SingleTypeChallenge &&
+      c.value === 12 &&
+      !globalScene.gameMode.challenges.some(
+        c => [Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT].includes(c.id) && c.value > 0,
+      ),
+  ),
+  MONO_ELECTRIC: new ChallengeAchv(
+    "MONO_ELECTRIC",
+    "",
+    "MONO_ELECTRIC.description",
+    "magnet",
+    100,
+    c =>
+      c instanceof SingleTypeChallenge &&
+      c.value === 13 &&
+      !globalScene.gameMode.challenges.some(
+        c => [Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT].includes(c.id) && c.value > 0,
+      ),
+  ),
+  MONO_PSYCHIC: new ChallengeAchv(
+    "MONO_PSYCHIC",
+    "",
+    "MONO_PSYCHIC.description",
+    "twisted_spoon",
+    100,
+    c =>
+      c instanceof SingleTypeChallenge &&
+      c.value === 14 &&
+      !globalScene.gameMode.challenges.some(
+        c => [Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT].includes(c.id) && c.value > 0,
+      ),
+  ),
+  MONO_ICE: new ChallengeAchv(
+    "MONO_ICE",
+    "",
+    "MONO_ICE.description",
+    "never_melt_ice",
+    100,
+    c =>
+      c instanceof SingleTypeChallenge &&
+      c.value === 15 &&
+      !globalScene.gameMode.challenges.some(
+        c => [Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT].includes(c.id) && c.value > 0,
+      ),
+  ),
+  MONO_DRAGON: new ChallengeAchv(
+    "MONO_DRAGON",
+    "",
+    "MONO_DRAGON.description",
+    "dragon_fang",
+    100,
+    c =>
+      c instanceof SingleTypeChallenge &&
+      c.value === 16 &&
+      !globalScene.gameMode.challenges.some(
+        c => [Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT].includes(c.id) && c.value > 0,
+      ),
+  ),
+  MONO_DARK: new ChallengeAchv(
+    "MONO_DARK",
+    "",
+    "MONO_DARK.description",
+    "black_glasses",
+    100,
+    c =>
+      c instanceof SingleTypeChallenge &&
+      c.value === 17 &&
+      !globalScene.gameMode.challenges.some(
+        c => [Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT].includes(c.id) && c.value > 0,
+      ),
+  ),
+  MONO_FAIRY: new ChallengeAchv(
+    "MONO_FAIRY",
+    "",
+    "MONO_FAIRY.description",
+    "fairy_feather",
+    100,
+    c =>
+      c instanceof SingleTypeChallenge &&
+      c.value === 18 &&
+      !globalScene.gameMode.challenges.some(
+        c => [Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT].includes(c.id) && c.value > 0,
+      ),
+  ),
+  FRESH_START: new ChallengeAchv(
+    "FRESH_START",
+    "",
+    "FRESH_START.description",
+    "reviver_seed",
+    100,
+    c =>
+      c instanceof FreshStartChallenge &&
+      c.value > 0 &&
+      !globalScene.gameMode.challenges.some(
+        c => [Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT].includes(c.id) && c.value > 0,
+      ),
+  ),
+  INVERSE_BATTLE: new ChallengeAchv(
+    "INVERSE_BATTLE",
+    "",
+    "INVERSE_BATTLE.description",
+    "inverse",
+    100,
+    c => c instanceof InverseBattleChallenge && c.value > 0,
+  ),
+  FLIP_STATS: new ChallengeAchv(
+    "FLIP_STATS",
+    "",
+    "FLIP_STATS.description",
+    "dubious_disc",
+    100,
+    c => c instanceof FlipStatChallenge && c.value > 0,
+  ),
+  FLIP_INVERSE: new ChallengeAchv(
+    "FLIP_INVERSE",
+    "",
+    "FLIP_INVERSE.description",
+    "cracked_pot",
+    100,
+    c =>
+      c instanceof FlipStatChallenge &&
+      c.value > 0 &&
+      globalScene.gameMode.challenges.some(c => c.id === Challenges.INVERSE_BATTLE && c.value > 0),
+  ).setSecret(),
   BREEDERS_IN_SPACE: new Achv("BREEDERS_IN_SPACE", "", "BREEDERS_IN_SPACE.description", "moon_stone", 50).setSecret(),
 };
 
diff --git a/src/system/arena-data.ts b/src/system/arena-data.ts
index 98ab611ff3c..07396b31d1b 100644
--- a/src/system/arena-data.ts
+++ b/src/system/arena-data.ts
@@ -10,12 +10,22 @@ export default class ArenaData {
   public weather: Weather | null;
   public terrain: Terrain | null;
   public tags: ArenaTag[];
+  public playerTerasUsed: number;
 
   constructor(source: Arena | any) {
-    const sourceArena = source instanceof Arena ? source as Arena : null;
+    const sourceArena = source instanceof Arena ? (source as Arena) : null;
     this.biome = sourceArena ? sourceArena.biomeType : source.biome;
-    this.weather = sourceArena ? sourceArena.weather : source.weather ? new Weather(source.weather.weatherType, source.weather.turnsLeft) : null;
-    this.terrain = sourceArena ? sourceArena.terrain : source.terrain ? new Terrain(source.terrain.terrainType, source.terrain.turnsLeft) : null;
+    this.weather = sourceArena
+      ? sourceArena.weather
+      : source.weather
+        ? new Weather(source.weather.weatherType, source.weather.turnsLeft)
+        : null;
+    this.terrain = sourceArena
+      ? sourceArena.terrain
+      : source.terrain
+        ? new Terrain(source.terrain.terrainType, source.terrain.turnsLeft)
+        : null;
+    this.playerTerasUsed = (sourceArena ? sourceArena.playerTerasUsed : source.playerTerasUsed) ?? 0;
     this.tags = [];
 
     if (source.tags) {
diff --git a/src/system/egg-data.ts b/src/system/egg-data.ts
index 8296c2da98e..8fb8335bcf7 100644
--- a/src/system/egg-data.ts
+++ b/src/system/egg-data.ts
@@ -17,9 +17,9 @@ export default class EggData {
   public overrideHiddenAbility: boolean;
 
   constructor(source: Egg | any) {
-    const sourceEgg = source instanceof Egg ? source as Egg : null;
+    const sourceEgg = source instanceof Egg ? (source as Egg) : null;
     this.id = sourceEgg ? sourceEgg.id : source.id;
-    this.tier = sourceEgg ? sourceEgg.tier : (source.tier  ?? Math.floor(this.id / EGG_SEED));
+    this.tier = sourceEgg ? sourceEgg.tier : (source.tier ?? Math.floor(this.id / EGG_SEED));
     // legacy egg
     if (source.species === 0) {
       // check if it has a gachaType (deprecated)
@@ -39,11 +39,25 @@ export default class EggData {
   toEgg(): Egg {
     // Species will be 0 if an old legacy is loaded from DB
     if (!this.species) {
-      return new Egg({ id: this.id, hatchWaves: this.hatchWaves, sourceType: this.sourceType, timestamp: this.timestamp, tier: Math.floor(this.id / EGG_SEED) });
-    } else {
-      return new Egg({ id: this.id, tier: this.tier, sourceType: this.sourceType, hatchWaves: this.hatchWaves,
-        timestamp: this.timestamp, variantTier: this.variantTier, isShiny: this.isShiny, species: this.species,
-        eggMoveIndex: this.eggMoveIndex, overrideHiddenAbility: this.overrideHiddenAbility });
+      return new Egg({
+        id: this.id,
+        hatchWaves: this.hatchWaves,
+        sourceType: this.sourceType,
+        timestamp: this.timestamp,
+        tier: Math.floor(this.id / EGG_SEED),
+      });
     }
+    return new Egg({
+      id: this.id,
+      tier: this.tier,
+      sourceType: this.sourceType,
+      hatchWaves: this.hatchWaves,
+      timestamp: this.timestamp,
+      variantTier: this.variantTier,
+      isShiny: this.isShiny,
+      species: this.species,
+      eggMoveIndex: this.eggMoveIndex,
+      overrideHiddenAbility: this.overrideHiddenAbility,
+    });
   }
 }
diff --git a/src/system/game-data.ts b/src/system/game-data.ts
index 7282d2730a4..0c5e0b349ed 100644
--- a/src/system/game-data.ts
+++ b/src/system/game-data.ts
@@ -1,6 +1,6 @@
 import i18next from "i18next";
 import type { PokeballCounts } from "#app/battle-scene";
-import { bypassLogin } from "#app/battle-scene";
+import { bypassLogin } from "#app/global-vars/bypass-login";
 import { globalScene } from "#app/global-scene";
 import type { EnemyPokemon, PlayerPokemon } from "#app/field/pokemon";
 import type Pokemon from "#app/field/pokemon";
@@ -8,35 +8,36 @@ import { pokemonPrevolutions } from "#app/data/balance/pokemon-evolutions";
 import type PokemonSpecies from "#app/data/pokemon-species";
 import { allSpecies, getPokemonSpecies } from "#app/data/pokemon-species";
 import { speciesStarterCosts } from "#app/data/balance/starters";
-import * as Utils from "#app/utils";
+import { randInt, getEnumKeys, isLocal, executeIf, fixedInt, randSeedItem, NumberHolder } from "#app/utils/common";
 import Overrides from "#app/overrides";
 import PokemonData from "#app/system/pokemon-data";
 import PersistentModifierData from "#app/system/modifier-data";
 import ArenaData from "#app/system/arena-data";
 import { Unlockables } from "#app/system/unlockables";
 import { GameModes, getGameMode } from "#app/game-mode";
-import { BattleType } from "#app/battle";
+import { BattleType } from "#enums/battle-type";
 import TrainerData from "#app/system/trainer-data";
-import { trainerConfigs } from "#app/data/trainer-config";
+import { trainerConfigs } from "#app/data/trainers/trainer-config";
 import { resetSettings, setSetting, SettingKeys } from "#app/system/settings/settings";
 import { achvs } from "#app/system/achv";
 import EggData from "#app/system/egg-data";
 import type { Egg } from "#app/data/egg";
 import { vouchers, VoucherType } from "#app/system/voucher";
 import { AES, enc } from "crypto-js";
-import { Mode } from "#app/ui/ui";
+import { UiMode } from "#enums/ui-mode";
 import { clientSessionId, loggedInUser, updateUserInfo } from "#app/account";
 import { Nature } from "#enums/nature";
 import { GameStats } from "#app/system/game-stats";
 import { Tutorial } from "#app/tutorial";
 import { speciesEggMoves } from "#app/data/balance/egg-moves";
-import { allMoves } from "#app/data/move";
+import { allMoves } from "#app/data/moves/move";
 import { TrainerVariant } from "#app/field/trainer";
-import type { Variant } from "#app/data/variant";
+import type { Variant } from "#app/sprites/variant";
 import { setSettingGamepad, SettingGamepad, settingGamepadDefaults } from "#app/system/settings/settings-gamepad";
 import type { SettingKeyboard } from "#app/system/settings/settings-keyboard";
 import { setSettingKeyboard } from "#app/system/settings/settings-keyboard";
 import { TagAddedEvent, TerrainChangedEvent, WeatherChangedEvent } from "#app/events/arena";
+// biome-ignore lint/style/noNamespaceImport: Something weird is going on here and I don't want to touch it
 import * as Modifier from "#app/modifier/modifier";
 import { StatusEffect } from "#enums/status-effect";
 import ChallengeData from "#app/system/challenge-data";
@@ -50,36 +51,61 @@ import { WeatherType } from "#enums/weather-type";
 import { TerrainType } from "#app/data/terrain";
 import { ReloadSessionPhase } from "#app/phases/reload-session-phase";
 import { RUN_HISTORY_LIMIT } from "#app/ui/run-history-ui-handler";
-import { applySessionVersionMigration, applySystemVersionMigration, applySettingsVersionMigration } from "./version_migration/version_converter";
+import {
+  applySessionVersionMigration,
+  applySystemVersionMigration,
+  applySettingsVersionMigration,
+} from "./version_migration/version_converter";
 import { MysteryEncounterSaveData } from "#app/data/mystery-encounters/mystery-encounter-save-data";
 import type { MysteryEncounterType } from "#enums/mystery-encounter-type";
 import { pokerogueApi } from "#app/plugins/api/pokerogue-api";
 import { ArenaTrapTag } from "#app/data/arena-tag";
+import { pokemonFormChanges } from "#app/data/pokemon-forms";
+import type { PokemonType } from "#enums/pokemon-type";
 
 export const defaultStarterSpecies: Species[] = [
-  Species.BULBASAUR, Species.CHARMANDER, Species.SQUIRTLE,
-  Species.CHIKORITA, Species.CYNDAQUIL, Species.TOTODILE,
-  Species.TREECKO, Species.TORCHIC, Species.MUDKIP,
-  Species.TURTWIG, Species.CHIMCHAR, Species.PIPLUP,
-  Species.SNIVY, Species.TEPIG, Species.OSHAWOTT,
-  Species.CHESPIN, Species.FENNEKIN, Species.FROAKIE,
-  Species.ROWLET, Species.LITTEN, Species.POPPLIO,
-  Species.GROOKEY, Species.SCORBUNNY, Species.SOBBLE,
-  Species.SPRIGATITO, Species.FUECOCO, Species.QUAXLY
+  Species.BULBASAUR,
+  Species.CHARMANDER,
+  Species.SQUIRTLE,
+  Species.CHIKORITA,
+  Species.CYNDAQUIL,
+  Species.TOTODILE,
+  Species.TREECKO,
+  Species.TORCHIC,
+  Species.MUDKIP,
+  Species.TURTWIG,
+  Species.CHIMCHAR,
+  Species.PIPLUP,
+  Species.SNIVY,
+  Species.TEPIG,
+  Species.OSHAWOTT,
+  Species.CHESPIN,
+  Species.FENNEKIN,
+  Species.FROAKIE,
+  Species.ROWLET,
+  Species.LITTEN,
+  Species.POPPLIO,
+  Species.GROOKEY,
+  Species.SCORBUNNY,
+  Species.SOBBLE,
+  Species.SPRIGATITO,
+  Species.FUECOCO,
+  Species.QUAXLY,
 ];
 
 const saveKey = "x0i2O7WRiANTqPmZ"; // Temporary; secure encryption is not yet necessary
 
-export function getDataTypeKey(dataType: GameDataType, slotId: number = 0): string {
+export function getDataTypeKey(dataType: GameDataType, slotId = 0): string {
   switch (dataType) {
     case GameDataType.SYSTEM:
       return "data";
-    case GameDataType.SESSION:
+    case GameDataType.SESSION: {
       let ret = "sessionData";
       if (slotId) {
         ret += slotId;
       }
       return ret;
+    }
     case GameDataType.SETTINGS:
       return "settings";
     case GameDataType.TUTORIALS:
@@ -93,14 +119,16 @@ export function getDataTypeKey(dataType: GameDataType, slotId: number = 0): stri
 
 export function encrypt(data: string, bypassLogin: boolean): string {
   return (bypassLogin
-    ? (data: string) => btoa(data)
+    ? (data: string) => btoa(encodeURIComponent(data))
     : (data: string) => AES.encrypt(data, saveKey))(data) as unknown as string; // TODO: is this correct?
 }
 
 export function decrypt(data: string, bypassLogin: boolean): string {
-  return (bypassLogin
-    ? (data: string) => atob(data)
-    : (data: string) => AES.decrypt(data, saveKey).toString(enc.Utf8))(data);
+  return (
+    bypassLogin
+      ? (data: string) => decodeURIComponent(atob(data))
+      : (data: string) => AES.decrypt(data, saveKey).toString(enc.Utf8)
+  )(data);
 }
 
 export interface SystemSaveData {
@@ -141,6 +169,10 @@ export interface SessionSaveData {
   challenges: ChallengeData[];
   mysteryEncounterType: MysteryEncounterType | -1; // Only defined when current wave is ME,
   mysteryEncounterSaveData: MysteryEncounterSaveData;
+  /**
+   * Counts the amount of pokemon fainted in your party during the current arena encounter.
+   */
+  playerFaints: number;
 }
 
 interface Unlocks {
@@ -148,72 +180,39 @@ interface Unlocks {
 }
 
 interface AchvUnlocks {
-  [key: string]: number
+  [key: string]: number;
 }
 
 interface VoucherUnlocks {
-  [key: string]: number
+  [key: string]: number;
 }
 
 export interface VoucherCounts {
-    [type: string]: number;
+  [type: string]: number;
 }
 
 export interface DexData {
-  [key: number]: DexEntry
+  [key: number]: DexEntry;
 }
 
 export interface DexEntry {
   seenAttr: bigint;
   caughtAttr: bigint;
-  natureAttr: number,
+  natureAttr: number;
   seenCount: number;
   caughtCount: number;
   hatchedCount: number;
   ivs: number[];
 }
 
-export const DexAttr = {
-  NON_SHINY: 1n,
-  SHINY: 2n,
-  MALE: 4n,
-  FEMALE: 8n,
-  DEFAULT_VARIANT: 16n,
-  VARIANT_2: 32n,
-  VARIANT_3: 64n,
-  DEFAULT_FORM: 128n
-};
-
-export interface DexAttrProps {
-  shiny: boolean;
-  female: boolean;
-  variant: Variant;
-  formIndex: number;
-}
-
-export const AbilityAttr = {
-  ABILITY_1: 1,
-  ABILITY_2: 2,
-  ABILITY_HIDDEN: 4
-};
-
-export type RunHistoryData = Record<number, RunEntry>;
-
-export interface RunEntry {
-  entry: SessionSaveData;
-  isVictory: boolean;
-  /*Automatically set to false at the moment - implementation TBD*/
-  isFavorite: boolean;
-}
-
-export type StarterMoveset = [ Moves ] | [ Moves, Moves ] | [ Moves, Moves, Moves ] | [ Moves, Moves, Moves, Moves ];
+export type StarterMoveset = [Moves] | [Moves, Moves] | [Moves, Moves, Moves] | [Moves, Moves, Moves, Moves];
 
 export interface StarterFormMoveData {
-  [key: number]: StarterMoveset
+  [key: number]: StarterMoveset;
 }
 
 export interface StarterMoveData {
-  [key: number]: StarterMoveset | StarterFormMoveData
+  [key: number]: StarterMoveset | StarterFormMoveData;
 }
 
 export interface StarterAttributes {
@@ -225,41 +224,75 @@ export interface StarterAttributes {
   shiny?: boolean;
   favorite?: boolean;
   nickname?: string;
+  tera?: PokemonType;
 }
 
 export interface StarterPreferences {
   [key: number]: StarterAttributes;
 }
 
+export interface DexAttrProps {
+  shiny: boolean;
+  female: boolean;
+  variant: Variant;
+  formIndex: number;
+}
+
+export type RunHistoryData = Record<number, RunEntry>;
+
+export interface RunEntry {
+  entry: SessionSaveData;
+  isVictory: boolean;
+  /*Automatically set to false at the moment - implementation TBD*/
+  isFavorite: boolean;
+}
+
+export const DexAttr = {
+  NON_SHINY: 1n,
+  SHINY: 2n,
+  MALE: 4n,
+  FEMALE: 8n,
+  DEFAULT_VARIANT: 16n,
+  VARIANT_2: 32n,
+  VARIANT_3: 64n,
+  DEFAULT_FORM: 128n,
+};
+
+export const AbilityAttr = {
+  ABILITY_1: 1,
+  ABILITY_2: 2,
+  ABILITY_HIDDEN: 4,
+};
+
 // the latest data saved/loaded for the Starter Preferences. Required to reduce read/writes. Initialize as "{}", since this is the default value and no data needs to be stored if present.
 // if they ever add private static variables, move this into StarterPrefs
-const StarterPrefers_DEFAULT : string = "{}";
-let StarterPrefers_private_latest : string = StarterPrefers_DEFAULT;
+const StarterPrefers_DEFAULT: string = "{}";
+let StarterPrefers_private_latest: string = StarterPrefers_DEFAULT;
 
+// called on starter selection show once
+export function loadStarterPreferences(): StarterPreferences {
+  return JSON.parse(
+    (StarterPrefers_private_latest =
+      localStorage.getItem(`starterPrefs_${loggedInUser?.username}`) || StarterPrefers_DEFAULT),
+  );
+}
+
+// called on starter selection clear, always
+export function saveStarterPreferences(prefs: StarterPreferences): void {
+  const pStr: string = JSON.stringify(prefs);
+  if (pStr !== StarterPrefers_private_latest) {
+    // something changed, store the update
+    localStorage.setItem(`starterPrefs_${loggedInUser?.username}`, pStr);
+    // update the latest prefs
+    StarterPrefers_private_latest = pStr;
+  }
+}
 // This is its own class as StarterPreferences...
 // - don't need to be loaded on startup
 // - isn't stored with other data
 // - don't require to be encrypted
 // - shouldn't require calls outside of the starter selection
-export class StarterPrefs {
-  // called on starter selection show once
-  static load(): StarterPreferences {
-    return JSON.parse(
-      StarterPrefers_private_latest = (localStorage.getItem(`starterPrefs_${loggedInUser?.username}`) || StarterPrefers_DEFAULT)
-    );
-  }
-
-  // called on starter selection clear, always
-  static save(prefs: StarterPreferences): void {
-    const pStr : string = JSON.stringify(prefs);
-    if (pStr !== StarterPrefers_private_latest) {
-      // something changed, store the update
-      localStorage.setItem(`starterPrefs_${loggedInUser?.username}`, pStr);
-      // update the latest prefs
-      StarterPrefers_private_latest = pStr;
-    }
-  }
-}
+export class StarterPrefs {}
 
 export interface StarterDataEntry {
   moveset: StarterMoveset | StarterFormMoveData | null;
@@ -273,11 +306,11 @@ export interface StarterDataEntry {
 }
 
 export interface StarterData {
-  [key: number]: StarterDataEntry
+  [key: number]: StarterDataEntry;
 }
 
 export interface TutorialFlags {
-  [key: string]: boolean
+  [key: string]: boolean;
 }
 
 export interface SeenDialogues {
@@ -299,7 +332,7 @@ const systemShortKeys = {
   abilityAttr: "$a",
   passiveAttr: "$pa",
   valueReduction: "$vr",
-  classicWinCount: "$wc"
+  classicWinCount: "$wc",
 };
 
 export class GameData {
@@ -330,8 +363,8 @@ export class GameData {
     this.loadSettings();
     this.loadGamepadSettings();
     this.loadMappingConfigs();
-    this.trainerId = Utils.randInt(65536);
-    this.secretId = Utils.randInt(65536);
+    this.trainerId = randInt(65536);
+    this.secretId = randInt(65536);
     this.starterData = {};
     this.gameStats = new GameStats();
     this.runHistory = {};
@@ -339,7 +372,7 @@ export class GameData {
       [Unlockables.ENDLESS_MODE]: false,
       [Unlockables.MINI_BLACK_HOLE]: false,
       [Unlockables.SPLICED_ENDLESS_MODE]: false,
-      [Unlockables.EVIOLITE]: false
+      [Unlockables.EVIOLITE]: false,
     };
     this.achvUnlocks = {};
     this.voucherUnlocks = {};
@@ -347,11 +380,11 @@ export class GameData {
       [VoucherType.REGULAR]: 0,
       [VoucherType.PLUS]: 0,
       [VoucherType.PREMIUM]: 0,
-      [VoucherType.GOLDEN]: 0
+      [VoucherType.GOLDEN]: 0,
     };
     this.eggs = [];
-    this.eggPity = [ 0, 0, 0, 0 ];
-    this.unlockPity = [ 0, 0, 0, 0 ];
+    this.eggPity = [0, 0, 0, 0];
+    this.unlockPity = [0, 0, 0, 0];
     this.initDexData();
     this.initStarterData();
   }
@@ -372,7 +405,7 @@ export class GameData {
       gameVersion: globalScene.game.config.gameVersion,
       timestamp: new Date().getTime(),
       eggPity: this.eggPity.slice(0),
-      unlockPity: this.unlockPity.slice(0)
+      unlockPity: this.unlockPity.slice(0),
     };
   }
 
@@ -394,24 +427,25 @@ export class GameData {
       const data = this.getSystemSaveData();
 
       const maxIntAttrValue = 0x80000000;
-      const systemData = JSON.stringify(data, (k: any, v: any) => typeof v === "bigint" ? v <= maxIntAttrValue ? Number(v) : v.toString() : v);
+      const systemData = JSON.stringify(data, (_k: any, v: any) =>
+        typeof v === "bigint" ? (v <= maxIntAttrValue ? Number(v) : v.toString()) : v,
+      );
 
       localStorage.setItem(`data_${loggedInUser?.username}`, encrypt(systemData, bypassLogin));
 
       if (!bypassLogin) {
-        pokerogueApi.savedata.system.update({ clientSessionId }, systemData)
-          .then(error => {
-            globalScene.ui.savingIcon.hide();
-            if (error) {
-              if (error.startsWith("session out of date")) {
-                globalScene.clearPhaseQueue();
-                globalScene.unshiftPhase(new ReloadSessionPhase());
-              }
-              console.error(error);
-              return resolve(false);
+        pokerogueApi.savedata.system.update({ clientSessionId }, systemData).then(error => {
+          globalScene.ui.savingIcon.hide();
+          if (error) {
+            if (error.startsWith("session out of date")) {
+              globalScene.clearPhaseQueue();
+              globalScene.unshiftPhase(new ReloadSessionPhase());
             }
-            resolve(true);
-          });
+            console.error(error);
+            return resolve(false);
+          }
+          resolve(true);
+        });
       } else {
         globalScene.ui.savingIcon.hide();
 
@@ -429,23 +463,38 @@ export class GameData {
       }
 
       if (!bypassLogin) {
-        pokerogueApi.savedata.system.get({ clientSessionId })
-          .then(saveDataOrErr => {
-            if (!saveDataOrErr || saveDataOrErr.length === 0 || saveDataOrErr[0] !== "{") {
-              if (saveDataOrErr?.startsWith("sql: no rows in result set")) {
-                globalScene.queueMessage("Save data could not be found. If this is a new account, you can safely ignore this message.", null, true);
-                return resolve(true);
-              } else if (saveDataOrErr?.includes("Too many connections")) {
-                globalScene.queueMessage("Too many people are trying to connect and the server is overloaded. Please try again later.", null, true);
-                return resolve(false);
-              }
-              console.error(saveDataOrErr);
+        pokerogueApi.savedata.system.get({ clientSessionId }).then(saveDataOrErr => {
+          if (
+            typeof saveDataOrErr === "number" ||
+            !saveDataOrErr ||
+            saveDataOrErr.length === 0 ||
+            saveDataOrErr[0] !== "{"
+          ) {
+            if (saveDataOrErr === 404) {
+              globalScene.queueMessage(
+                "Save data could not be found. If this is a new account, you can safely ignore this message.",
+                null,
+                true,
+              );
+              return resolve(true);
+            }
+            if (typeof saveDataOrErr === "string" && saveDataOrErr?.includes("Too many connections")) {
+              globalScene.queueMessage(
+                "Too many people are trying to connect and the server is overloaded. Please try again later.",
+                null,
+                true,
+              );
               return resolve(false);
             }
+            return resolve(false);
+          }
 
-            const cachedSystem = localStorage.getItem(`data_${loggedInUser?.username}`);
-            this.initSystem(saveDataOrErr, cachedSystem ? AES.decrypt(cachedSystem, saveKey).toString(enc.Utf8) : undefined).then(resolve);
-          });
+          const cachedSystem = localStorage.getItem(`data_${loggedInUser?.username}`);
+          this.initSystem(
+            saveDataOrErr,
+            cachedSystem ? AES.decrypt(cachedSystem, saveKey).toString(enc.Utf8) : undefined,
+          ).then(resolve);
+        });
       } else {
         this.initSystem(decrypt(localStorage.getItem(`data_${loggedInUser?.username}`)!, bypassLogin)).then(resolve); // TODO: is this bang correct?
       }
@@ -506,7 +555,7 @@ export class GameData {
 
           this.migrateStarterAbilities(systemData, this.starterData);
 
-          const starterIds = Object.keys(this.starterData).map(s => parseInt(s) as Species);
+          const starterIds = Object.keys(this.starterData).map(s => Number.parseInt(s) as Species);
           for (const s of starterIds) {
             this.starterData[s].candyCount += systemData.dexData[s].caughtCount;
             this.starterData[s].candyCount += systemData.dexData[s].hatchedCount * 2;
@@ -547,18 +596,16 @@ export class GameData {
         }
 
         if (systemData.voucherCounts) {
-          Utils.getEnumKeys(VoucherType).forEach(key => {
+          getEnumKeys(VoucherType).forEach(key => {
             const index = VoucherType[key];
             this.voucherCounts[index] = systemData.voucherCounts[index] || 0;
           });
         }
 
-        this.eggs = systemData.eggs
-          ? systemData.eggs.map(e => e.toEgg())
-          : [];
+        this.eggs = systemData.eggs ? systemData.eggs.map(e => e.toEgg()) : [];
 
-        this.eggPity = systemData.eggPity ? systemData.eggPity.slice(0) : [ 0, 0, 0, 0 ];
-        this.unlockPity = systemData.unlockPity ? systemData.unlockPity.slice(0) : [ 0, 0, 0, 0 ];
+        this.eggPity = systemData.eggPity ? systemData.eggPity.slice(0) : [0, 0, 0, 0];
+        this.unlockPity = systemData.unlockPity ? systemData.unlockPity.slice(0) : [0, 0, 0, 0];
 
         this.dexData = Object.assign(this.dexData, systemData.dexData);
         this.consolidateDexData(this.dexData);
@@ -577,7 +624,7 @@ export class GameData {
    * At the moment, only retrievable from locale cache
    */
   async getRunHistoryData(): Promise<RunHistoryData> {
-    if (!Utils.isLocal) {
+    if (!isLocal) {
       /**
        * Networking Code DO NOT DELETE!
        * Note: Might have to be migrated to `pokerogue-api.ts`
@@ -588,7 +635,7 @@ export class GameData {
       const lsItemKey = `runHistoryData_${loggedInUser?.username}`;
       const lsItem = localStorage.getItem(lsItemKey);
       if (lsItem) {
-        const cachedResponse  = lsItem;
+        const cachedResponse = lsItem;
         if (cachedResponse) {
           const runHistory = JSON.parse(decrypt(cachedResponse, bypassLogin));
           return runHistory;
@@ -602,25 +649,22 @@ export class GameData {
           return cachedRHData;
         }
         */
-      } else {
-        localStorage.setItem(`runHistoryData_${loggedInUser?.username}`, "");
-        return {};
-      }
-    } else {
-      const lsItemKey = `runHistoryData_${loggedInUser?.username}`;
-      const lsItem = localStorage.getItem(lsItemKey);
-      if (lsItem) {
-        const cachedResponse = lsItem;
-        if (cachedResponse) {
-          const runHistory : RunHistoryData = JSON.parse(decrypt(cachedResponse, bypassLogin));
-          return runHistory;
-        }
-        return {};
-      } else {
-        localStorage.setItem(`runHistoryData_${loggedInUser?.username}`, "");
-        return {};
       }
+      localStorage.setItem(`runHistoryData_${loggedInUser?.username}`, "");
+      return {};
     }
+    const lsItemKey = `runHistoryData_${loggedInUser?.username}`;
+    const lsItem = localStorage.getItem(lsItemKey);
+    if (lsItem) {
+      const cachedResponse = lsItem;
+      if (cachedResponse) {
+        const runHistory: RunHistoryData = JSON.parse(decrypt(cachedResponse, bypassLogin));
+        return runHistory;
+      }
+      return {};
+    }
+    localStorage.setItem(`runHistoryData_${loggedInUser?.username}`, "");
+    return {};
   }
 
   /**
@@ -629,25 +673,28 @@ export class GameData {
    * @param isVictory: result of the run
    * Arbitrary limit of 25 runs per player - Will delete runs, starting with the oldest one, if needed
    */
-  async saveRunHistory(runEntry : SessionSaveData, isVictory: boolean): Promise<boolean> {
+  async saveRunHistory(runEntry: SessionSaveData, isVictory: boolean): Promise<boolean> {
     const runHistoryData = await this.getRunHistoryData();
     // runHistoryData should always return run history or {} empty object
     let timestamps = Object.keys(runHistoryData).map(Number);
 
     // Arbitrary limit of 25 entries per user --> Can increase or decrease
-    while (timestamps.length >= RUN_HISTORY_LIMIT ) {
-      const oldestTimestamp = (Math.min.apply(Math, timestamps)).toString();
+    while (timestamps.length >= RUN_HISTORY_LIMIT) {
+      const oldestTimestamp = Math.min.apply(Math, timestamps).toString();
       delete runHistoryData[oldestTimestamp];
       timestamps = Object.keys(runHistoryData).map(Number);
     }
 
-    const timestamp = (runEntry.timestamp).toString();
+    const timestamp = runEntry.timestamp.toString();
     runHistoryData[timestamp] = {
       entry: runEntry,
       isVictory: isVictory,
       isFavorite: false,
     };
-    localStorage.setItem(`runHistoryData_${loggedInUser?.username}`, encrypt(JSON.stringify(runHistoryData), bypassLogin));
+    localStorage.setItem(
+      `runHistoryData_${loggedInUser?.username}`,
+      encrypt(JSON.stringify(runHistoryData), bypassLogin),
+    );
     /**
      * Networking Code DO NOT DELETE
      *
@@ -669,7 +716,8 @@ export class GameData {
     return JSON.parse(dataStr, (k: string, v: any) => {
       if (k === "gameStats") {
         return new GameStats(v);
-      } else if (k === "eggs") {
+      }
+      if (k === "eggs") {
         const ret: EggData[] = [];
         if (v === null) {
           v = [];
@@ -680,11 +728,11 @@ export class GameData {
         return ret;
       }
 
-      return k.endsWith("Attr") && ![ "natureAttr", "abilityAttr", "passiveAttr" ].includes(k) ? BigInt(v ?? 0) : v;
+      return k.endsWith("Attr") && !["natureAttr", "abilityAttr", "passiveAttr"].includes(k) ? BigInt(v ?? 0) : v;
     }) as SystemSaveData;
   }
 
-  convertSystemDataStr(dataStr: string, shorten: boolean = false): string {
+  convertSystemDataStr(dataStr: string, shorten = false): string {
     if (!shorten) {
       // Account for past key oversight
       dataStr = dataStr.replace(/\$pAttr/g, "$pa");
@@ -705,7 +753,9 @@ export class GameData {
       return true;
     }
 
-    const systemData = await pokerogueApi.savedata.system.verify({ clientSessionId });
+    const systemData = await pokerogueApi.savedata.system.verify({
+      clientSessionId,
+    });
 
     if (systemData) {
       globalScene.clearPhaseQueue();
@@ -757,17 +807,18 @@ export class GameData {
    * @returns `true` if the configurations are successfully saved.
    */
   public saveMappingConfigs(deviceName: string, config): boolean {
-    const key = deviceName.toLowerCase();  // Convert the gamepad name to lowercase to use as a key
-    let mappingConfigs: object = {};  // Initialize an empty object to hold the mapping configurations
-    if (localStorage.hasOwnProperty("mappingConfigs")) {// Check if 'mappingConfigs' exists in localStorage
+    const key = deviceName.toLowerCase(); // Convert the gamepad name to lowercase to use as a key
+    let mappingConfigs: object = {}; // Initialize an empty object to hold the mapping configurations
+    if (localStorage.hasOwnProperty("mappingConfigs")) {
+      // Check if 'mappingConfigs' exists in localStorage
       mappingConfigs = JSON.parse(localStorage.getItem("mappingConfigs")!); // TODO: is this bang correct?
-    }  // Parse the existing 'mappingConfigs' from localStorage
+    } // Parse the existing 'mappingConfigs' from localStorage
     if (!mappingConfigs[key]) {
       mappingConfigs[key] = {};
-    }  // If there is no configuration for the given key, create an empty object for it
-    mappingConfigs[key].custom = config.custom;  // Assign the custom configuration to the mapping configuration for the given key
-    localStorage.setItem("mappingConfigs", JSON.stringify(mappingConfigs));  // Save the updated mapping configurations back to localStorage
-    return true;  // Return true to indicate the operation was successful
+    } // If there is no configuration for the given key, create an empty object for it
+    mappingConfigs[key].custom = config.custom; // Assign the custom configuration to the mapping configuration for the given key
+    localStorage.setItem("mappingConfigs", JSON.stringify(mappingConfigs)); // Save the updated mapping configurations back to localStorage
+    return true; // Return true to indicate the operation was successful
   }
 
   /**
@@ -781,23 +832,26 @@ export class GameData {
    * for the corresponding gamepad or device key. The method then returns `true` to indicate success.
    */
   public loadMappingConfigs(): boolean {
-    if (!localStorage.hasOwnProperty("mappingConfigs")) {// Check if 'mappingConfigs' exists in localStorage
+    if (!localStorage.hasOwnProperty("mappingConfigs")) {
+      // Check if 'mappingConfigs' exists in localStorage
       return false;
-    }  // If 'mappingConfigs' does not exist, return false
+    } // If 'mappingConfigs' does not exist, return false
 
-    const mappingConfigs = JSON.parse(localStorage.getItem("mappingConfigs")!);  // Parse the existing 'mappingConfigs' from localStorage // TODO: is this bang correct?
+    const mappingConfigs = JSON.parse(localStorage.getItem("mappingConfigs")!); // Parse the existing 'mappingConfigs' from localStorage // TODO: is this bang correct?
 
-    for (const key of Object.keys(mappingConfigs)) {// Iterate over the keys of the mapping configurations
+    for (const key of Object.keys(mappingConfigs)) {
+      // Iterate over the keys of the mapping configurations
       globalScene.inputController.injectConfig(key, mappingConfigs[key]);
-    }  // Inject each configuration into the input controller for the corresponding key
+    } // Inject each configuration into the input controller for the corresponding key
 
-    return true;  // Return true to indicate the operation was successful
+    return true; // Return true to indicate the operation was successful
   }
 
   public resetMappingToFactory(): boolean {
-    if (!localStorage.hasOwnProperty("mappingConfigs")) {// Check if 'mappingConfigs' exists in localStorage
+    if (!localStorage.hasOwnProperty("mappingConfigs")) {
+      // Check if 'mappingConfigs' exists in localStorage
       return false;
-    }  // If 'mappingConfigs' does not exist, return false
+    } // If 'mappingConfigs' does not exist, return false
     localStorage.removeItem("mappingConfigs");
     globalScene.inputController.resetConfigs();
     return true; // TODO: is `true` the correct return value?
@@ -816,11 +870,18 @@ export class GameData {
    * to update the specified setting with the new value. Finally, it saves the updated settings back
    * to localStorage and returns `true` to indicate success.
    */
-  public saveControlSetting(device: Device, localStoragePropertyName: string, setting: SettingGamepad|SettingKeyboard, settingDefaults, valueIndex: number): boolean {
-    let settingsControls: object = {};  // Initialize an empty object to hold the gamepad settings
+  public saveControlSetting(
+    device: Device,
+    localStoragePropertyName: string,
+    setting: SettingGamepad | SettingKeyboard,
+    settingDefaults,
+    valueIndex: number,
+  ): boolean {
+    let settingsControls: object = {}; // Initialize an empty object to hold the gamepad settings
 
-    if (localStorage.hasOwnProperty(localStoragePropertyName)) {  // Check if 'settingsControls' exists in localStorage
-      settingsControls = JSON.parse(localStorage.getItem(localStoragePropertyName)!);  // Parse the existing 'settingsControls' from localStorage // TODO: is this bang correct?
+    if (localStorage.hasOwnProperty(localStoragePropertyName)) {
+      // Check if 'settingsControls' exists in localStorage
+      settingsControls = JSON.parse(localStorage.getItem(localStoragePropertyName)!); // Parse the existing 'settingsControls' from localStorage // TODO: is this bang correct?
     }
 
     if (device === Device.GAMEPAD) {
@@ -829,15 +890,17 @@ export class GameData {
       setSettingKeyboard(setting as SettingKeyboard, valueIndex);
     }
 
-    Object.keys(settingDefaults).forEach(s => {  // Iterate over the default gamepad settings
-      if (s === setting) {// If the current setting matches, update its value
+    Object.keys(settingDefaults).forEach(s => {
+      // Iterate over the default gamepad settings
+      if (s === setting) {
+        // If the current setting matches, update its value
         settingsControls[s] = valueIndex;
       }
     });
 
-    localStorage.setItem(localStoragePropertyName, JSON.stringify(settingsControls));  // Save the updated gamepad settings back to localStorage
+    localStorage.setItem(localStoragePropertyName, JSON.stringify(settingsControls)); // Save the updated gamepad settings back to localStorage
 
-    return true;  // Return true to indicate the operation was successful
+    return true; // Return true to indicate the operation was successful
   }
 
   /**
@@ -863,7 +926,9 @@ export class GameData {
   }
 
   private loadGamepadSettings(): boolean {
-    Object.values(SettingGamepad).map(setting => setting as SettingGamepad).forEach(setting => setSettingGamepad(setting, settingGamepadDefaults[setting]));
+    Object.values(SettingGamepad)
+      .map(setting => setting as SettingGamepad)
+      .forEach(setting => setSettingGamepad(setting, settingGamepadDefaults[setting]));
 
     if (!localStorage.hasOwnProperty("settingsGamepad")) {
       return false;
@@ -884,14 +949,16 @@ export class GameData {
       tutorials = JSON.parse(localStorage.getItem(key)!); // TODO: is this bang correct?
     }
 
-    Object.keys(Tutorial).map(t => t as Tutorial).forEach(t => {
-      const key = Tutorial[t];
-      if (key === tutorial) {
-        tutorials[key] = flag;
-      } else {
-        tutorials[key] ??= false;
-      }
-    });
+    Object.keys(Tutorial)
+      .map(t => t as Tutorial)
+      .forEach(t => {
+        const key = Tutorial[t];
+        if (key === tutorial) {
+          tutorials[key] = flag;
+        } else {
+          tutorials[key] ??= false;
+        }
+      });
 
     localStorage.setItem(key, JSON.stringify(tutorials));
 
@@ -901,7 +968,9 @@ export class GameData {
   public getTutorialFlags(): TutorialFlags {
     const key = getDataTypeKey(GameDataType.TUTORIALS);
     const ret: TutorialFlags = {};
-    Object.values(Tutorial).map(tutorial => tutorial as Tutorial).forEach(tutorial => ret[Tutorial[tutorial]] = false);
+    Object.values(Tutorial)
+      .map(tutorial => tutorial as Tutorial)
+      .forEach(tutorial => (ret[Tutorial[tutorial]] = false));
 
     if (!localStorage.hasOwnProperty(key)) {
       return ret;
@@ -959,16 +1028,21 @@ export class GameData {
       score: globalScene.score,
       waveIndex: globalScene.currentBattle.waveIndex,
       battleType: globalScene.currentBattle.battleType,
-      trainer: globalScene.currentBattle.battleType === BattleType.TRAINER ? new TrainerData(globalScene.currentBattle.trainer) : null,
+      trainer:
+        globalScene.currentBattle.battleType === BattleType.TRAINER
+          ? new TrainerData(globalScene.currentBattle.trainer)
+          : null,
       gameVersion: globalScene.game.config.gameVersion,
       timestamp: new Date().getTime(),
       challenges: globalScene.gameMode.challenges.map(c => new ChallengeData(c)),
       mysteryEncounterType: globalScene.currentBattle.mysteryEncounter?.encounterType ?? -1,
-      mysteryEncounterSaveData: globalScene.mysteryEncounterSaveData
+      mysteryEncounterSaveData: globalScene.mysteryEncounterSaveData,
+      playerFaints: globalScene.arena.playerFaints,
     } as SessionSaveData;
   }
 
   getSession(slotId: number): Promise<SessionSaveData | null> {
+    // biome-ignore lint/suspicious/noAsyncPromiseExecutor: <explanation>
     return new Promise(async (resolve, reject) => {
       if (slotId < 0) {
         return resolve(null);
@@ -984,17 +1058,19 @@ export class GameData {
       };
 
       if (!bypassLogin && !localStorage.getItem(`sessionData${slotId ? slotId : ""}_${loggedInUser?.username}`)) {
-        pokerogueApi.savedata.session.get({ slot: slotId, clientSessionId })
-          .then(async response => {
-            if (!response || response?.length === 0 || response?.[0] !== "{") {
-              console.error(response);
-              return resolve(null);
-            }
+        pokerogueApi.savedata.session.get({ slot: slotId, clientSessionId }).then(async response => {
+          if (!response || response?.length === 0 || response?.[0] !== "{") {
+            console.error(response);
+            return resolve(null);
+          }
 
-            localStorage.setItem(`sessionData${slotId ? slotId : ""}_${loggedInUser?.username}`, encrypt(response, bypassLogin));
+          localStorage.setItem(
+            `sessionData${slotId ? slotId : ""}_${loggedInUser?.username}`,
+            encrypt(response, bypassLogin),
+          );
 
-            await handleSessionData(response);
-          });
+          await handleSessionData(response);
+        });
       } else {
         const sessionData = localStorage.getItem(`sessionData${slotId ? slotId : ""}_${loggedInUser?.username}`);
         if (sessionData) {
@@ -1007,6 +1083,7 @@ export class GameData {
   }
 
   loadSession(slotId: number, sessionData?: SessionSaveData): Promise<boolean> {
+    // biome-ignore lint/suspicious/noAsyncPromiseExecutor: <explanation>
     return new Promise(async (resolve, reject) => {
       try {
         const initSessionFromData = async (sessionData: SessionSaveData) => {
@@ -1033,7 +1110,7 @@ export class GameData {
           for (const p of sessionData.party) {
             const pokemon = p.toPokemon() as PlayerPokemon;
             pokemon.setVisible(false);
-            loadPokemonAssets.push(pokemon.loadAssets());
+            loadPokemonAssets.push(pokemon.loadAssets(false));
             party.push(pokemon);
           }
 
@@ -1056,18 +1133,31 @@ export class GameData {
 
           globalScene.mysteryEncounterSaveData = new MysteryEncounterSaveData(sessionData.mysteryEncounterSaveData);
 
-          globalScene.newArena(sessionData.arena.biome);
+          globalScene.newArena(sessionData.arena.biome, sessionData.playerFaints);
 
           const battleType = sessionData.battleType || 0;
           const trainerConfig = sessionData.trainer ? trainerConfigs[sessionData.trainer.trainerType] : null;
-          const mysteryEncounterType = sessionData.mysteryEncounterType !== -1 ? sessionData.mysteryEncounterType : undefined;
-          const battle = globalScene.newBattle(sessionData.waveIndex, battleType, sessionData.trainer, battleType === BattleType.TRAINER ? trainerConfig?.doubleOnly || sessionData.trainer?.variant === TrainerVariant.DOUBLE : sessionData.enemyParty.length > 1, mysteryEncounterType)!; // TODO: is this bang correct?
+          const mysteryEncounterType =
+            sessionData.mysteryEncounterType !== -1 ? sessionData.mysteryEncounterType : undefined;
+          const battle = globalScene.newBattle(
+            sessionData.waveIndex,
+            battleType,
+            sessionData.trainer,
+            battleType === BattleType.TRAINER
+              ? trainerConfig?.doubleOnly || sessionData.trainer?.variant === TrainerVariant.DOUBLE
+              : sessionData.enemyParty.length > 1,
+            mysteryEncounterType,
+          );
           battle.enemyLevels = sessionData.enemyParty.map(p => p.level);
 
           globalScene.arena.init();
 
           sessionData.enemyParty.forEach((enemyData, e) => {
-            const enemyPokemon = enemyData.toPokemon(battleType, e, sessionData.trainer?.variant === TrainerVariant.DOUBLE) as EnemyPokemon;
+            const enemyPokemon = enemyData.toPokemon(
+              battleType,
+              e,
+              sessionData.trainer?.variant === TrainerVariant.DOUBLE,
+            ) as EnemyPokemon;
             battle.enemyParty[e] = enemyPokemon;
             if (battleType === BattleType.WILD) {
               battle.seenEnemyPartyMemberIds.add(enemyPokemon.id);
@@ -1077,30 +1167,49 @@ export class GameData {
           });
 
           globalScene.arena.weather = sessionData.arena.weather;
-          globalScene.arena.eventTarget.dispatchEvent(new WeatherChangedEvent(WeatherType.NONE, globalScene.arena.weather?.weatherType!, globalScene.arena.weather?.turnsLeft!)); // TODO: is this bang correct?
+          globalScene.arena.eventTarget.dispatchEvent(
+            new WeatherChangedEvent(
+              WeatherType.NONE,
+              globalScene.arena.weather?.weatherType!,
+              globalScene.arena.weather?.turnsLeft!,
+            ),
+          ); // TODO: is this bang correct?
 
           globalScene.arena.terrain = sessionData.arena.terrain;
-          globalScene.arena.eventTarget.dispatchEvent(new TerrainChangedEvent(TerrainType.NONE, globalScene.arena.terrain?.terrainType!, globalScene.arena.terrain?.turnsLeft!)); // TODO: is this bang correct?
+          globalScene.arena.eventTarget.dispatchEvent(
+            new TerrainChangedEvent(
+              TerrainType.NONE,
+              globalScene.arena.terrain?.terrainType!,
+              globalScene.arena.terrain?.turnsLeft!,
+            ),
+          ); // TODO: is this bang correct?
+
+          globalScene.arena.playerTerasUsed = sessionData.arena.playerTerasUsed;
 
           globalScene.arena.tags = sessionData.arena.tags;
           if (globalScene.arena.tags) {
             for (const tag of globalScene.arena.tags) {
               if (tag instanceof ArenaTrapTag) {
                 const { tagType, side, turnCount, layers, maxLayers } = tag as ArenaTrapTag;
-                globalScene.arena.eventTarget.dispatchEvent(new TagAddedEvent(tagType, side, turnCount, layers, maxLayers));
+                globalScene.arena.eventTarget.dispatchEvent(
+                  new TagAddedEvent(tagType, side, turnCount, layers, maxLayers),
+                );
               } else {
                 globalScene.arena.eventTarget.dispatchEvent(new TagAddedEvent(tag.tagType, tag.side, tag.turnCount));
               }
             }
           }
 
+          if (globalScene.modifiers.length) {
+            console.warn("Existing modifiers not cleared on session load, deleting...");
+            globalScene.modifiers = [];
+          }
           for (const modifierData of sessionData.modifiers) {
             const modifier = modifierData.toModifier(Modifier[modifierData.className]);
             if (modifier) {
               globalScene.addModifier(modifier, true);
             }
           }
-
           globalScene.updateModifiers(true);
 
           for (const enemyModifierData of sessionData.enemyModifiers) {
@@ -1163,7 +1272,6 @@ export class GameData {
 
             localStorage.removeItem(`sessionData${slotId ? slotId : ""}_${loggedInUser?.username}`);
             resolve(true);
-
           }
         });
       });
@@ -1184,53 +1292,52 @@ export class GameData {
           daily = JSON.parse(atob(localStorage.getItem("daily")!)); // TODO: is this bang correct?
           if (daily.includes(seed)) {
             return resolve(false);
-          } else {
-            daily.push(seed);
-            localStorage.setItem("daily", btoa(JSON.stringify(daily)));
-            return resolve(true);
           }
-        } else {
           daily.push(seed);
           localStorage.setItem("daily", btoa(JSON.stringify(daily)));
           return resolve(true);
         }
-      } else {
+        daily.push(seed);
+        localStorage.setItem("daily", btoa(JSON.stringify(daily)));
         return resolve(true);
       }
+      return resolve(true);
     });
   }
 
-
   /**
    * Attempt to clear session data after the end of a run
    * After session data is removed, attempt to update user info so the menu updates
    * To delete an unfinished run instead, use {@linkcode deleteSession}
    */
   async tryClearSession(slotId: number): Promise<[success: boolean, newClear: boolean]> {
-    let result: [boolean, boolean] = [ false, false ];
+    let result: [boolean, boolean] = [false, false];
 
     if (bypassLogin) {
       localStorage.removeItem(`sessionData${slotId ? slotId : ""}_${loggedInUser?.username}`);
-      result = [ true, true ];
+      result = [true, true];
     } else {
       const sessionData = this.getSessionSaveData();
       const { trainerId } = this;
-      const jsonResponse = await pokerogueApi.savedata.session.clear({ slot: slotId, trainerId, clientSessionId }, sessionData);
+      const jsonResponse = await pokerogueApi.savedata.session.clear(
+        { slot: slotId, trainerId, clientSessionId },
+        sessionData,
+      );
 
       if (!jsonResponse?.error) {
-        result = [ true, jsonResponse?.success ?? false ];
+        result = [true, jsonResponse?.success ?? false];
         if (loggedInUser) {
           loggedInUser!.lastSessionSlot = -1;
         }
         localStorage.removeItem(`sessionData${slotId ? slotId : ""}_${loggedInUser?.username}`);
       } else {
-        if (jsonResponse && jsonResponse.error?.startsWith("session out of date")) {
+        if (jsonResponse?.error?.startsWith("session out of date")) {
           globalScene.clearPhaseQueue();
           globalScene.unshiftPhase(new ReloadSessionPhase());
         }
 
         console.error(jsonResponse);
-        result = [ false, false ];
+        result = [false, false];
       }
     }
 
@@ -1240,64 +1347,67 @@ export class GameData {
   }
 
   parseSessionData(dataStr: string): SessionSaveData {
+    // TODO: Add `null`/`undefined` to the corresponding type signatures for this
+    // (or prevent them from being null)
+    // If the value is able to *not exist*, it should say so in the code
     const sessionData = JSON.parse(dataStr, (k: string, v: any) => {
-      if (k === "party" || k === "enemyParty") {
-        const ret: PokemonData[] = [];
-        if (v === null) {
-          v = [];
-        }
-        for (const pd of v) {
-          ret.push(new PokemonData(pd));
-        }
-        return ret;
-      }
-
-      if (k === "trainer") {
-        return v ? new TrainerData(v) : null;
-      }
-
-      if (k === "modifiers" || k === "enemyModifiers") {
-        const player = k === "modifiers";
-        const ret: PersistentModifierData[] = [];
-        if (v === null) {
-          v = [];
-        }
-        for (const md of v) {
-          if (md?.className === "ExpBalanceModifier") { // Temporarily limit EXP Balance until it gets reworked
-            md.stackCount = Math.min(md.stackCount, 4);
+      // TODO: Add pre-parse migrate scripts
+      switch (k) {
+        case "party":
+        case "enemyParty": {
+          const ret: PokemonData[] = [];
+          for (const pd of v ?? []) {
+            ret.push(new PokemonData(pd));
           }
-          if (md instanceof Modifier.EnemyAttackStatusEffectChanceModifier && md.effect === StatusEffect.FREEZE || md.effect === StatusEffect.SLEEP) {
-            continue;
+          return ret;
+        }
+
+        case "trainer":
+          return v ? new TrainerData(v) : null;
+
+        case "modifiers":
+        case "enemyModifiers": {
+          const ret: PersistentModifierData[] = [];
+          for (const md of v ?? []) {
+            if (md?.className === "ExpBalanceModifier") {
+              // Temporarily limit EXP Balance until it gets reworked
+              md.stackCount = Math.min(md.stackCount, 4);
+            }
+
+            if (
+              md instanceof Modifier.EnemyAttackStatusEffectChanceModifier &&
+              (md.effect === StatusEffect.FREEZE || md.effect === StatusEffect.SLEEP)
+            ) {
+              // Discard any old "sleep/freeze chance tokens".
+              // TODO: make this migrate script
+              continue;
+            }
+
+            ret.push(new PersistentModifierData(md, k === "modifiers"));
           }
-          ret.push(new PersistentModifierData(md, player));
+          return ret;
         }
-        return ret;
-      }
 
-      if (k === "arena") {
-        return new ArenaData(v);
-      }
+        case "arena":
+          return new ArenaData(v);
 
-      if (k === "challenges") {
-        const ret: ChallengeData[] = [];
-        if (v === null) {
-          v = [];
+        case "challenges": {
+          const ret: ChallengeData[] = [];
+          for (const c of v ?? []) {
+            ret.push(new ChallengeData(c));
+          }
+          return ret;
         }
-        for (const c of v) {
-          ret.push(new ChallengeData(c));
-        }
-        return ret;
-      }
 
-      if (k === "mysteryEncounterType") {
-        return v as MysteryEncounterType;
-      }
+        case "mysteryEncounterType":
+          return v as MysteryEncounterType;
 
-      if (k === "mysteryEncounterSaveData") {
-        return new MysteryEncounterSaveData(v);
-      }
+        case "mysteryEncounterSaveData":
+          return new MysteryEncounterSaveData(v);
 
-      return v;
+        default:
+          return v;
+      }
     }) as SessionSaveData;
 
     applySessionVersionMigration(sessionData);
@@ -1305,52 +1415,69 @@ export class GameData {
     return sessionData;
   }
 
-  saveAll(skipVerification: boolean = false, sync: boolean = false, useCachedSession: boolean = false, useCachedSystem: boolean = false): Promise<boolean> {
+  saveAll(skipVerification = false, sync = false, useCachedSession = false, useCachedSystem = false): Promise<boolean> {
     return new Promise<boolean>(resolve => {
-      Utils.executeIf(!skipVerification, updateUserInfo).then(success => {
+      executeIf(!skipVerification, updateUserInfo).then(success => {
         if (success !== null && !success) {
           return resolve(false);
         }
         if (sync) {
           globalScene.ui.savingIcon.show();
         }
-        const sessionData = useCachedSession ?
-          this.parseSessionData(decrypt(localStorage.getItem(`sessionData${globalScene.sessionSlotId ? globalScene.sessionSlotId : ""}_${loggedInUser?.username}`)!, bypassLogin)) // TODO: is this bang correct?
+        const sessionData = useCachedSession
+          ? this.parseSessionData(
+              decrypt(
+                localStorage.getItem(
+                  `sessionData${globalScene.sessionSlotId ? globalScene.sessionSlotId : ""}_${loggedInUser?.username}`,
+                )!,
+                bypassLogin,
+              ),
+            ) // TODO: is this bang correct?
           : this.getSessionSaveData();
-
         const maxIntAttrValue = 0x80000000;
-        const systemData = useCachedSystem ? this.parseSystemData(decrypt(localStorage.getItem(`data_${loggedInUser?.username}`)!, bypassLogin)) : this.getSystemSaveData(); // TODO: is this bang correct?
+        const systemData = useCachedSystem
+          ? this.parseSystemData(decrypt(localStorage.getItem(`data_${loggedInUser?.username}`)!, bypassLogin))
+          : this.getSystemSaveData(); // TODO: is this bang correct?
 
         const request = {
           system: systemData,
           session: sessionData,
           sessionSlotId: globalScene.sessionSlotId,
-          clientSessionId: clientSessionId
+          clientSessionId: clientSessionId,
         };
 
-        localStorage.setItem(`data_${loggedInUser?.username}`, encrypt(JSON.stringify(systemData, (k: any, v: any) => typeof v === "bigint" ? v <= maxIntAttrValue ? Number(v) : v.toString() : v), bypassLogin));
+        localStorage.setItem(
+          `data_${loggedInUser?.username}`,
+          encrypt(
+            JSON.stringify(systemData, (_k: any, v: any) =>
+              typeof v === "bigint" ? (v <= maxIntAttrValue ? Number(v) : v.toString()) : v,
+            ),
+            bypassLogin,
+          ),
+        );
+        localStorage.setItem(
+          `sessionData${globalScene.sessionSlotId ? globalScene.sessionSlotId : ""}_${loggedInUser?.username}`,
+          encrypt(JSON.stringify(sessionData), bypassLogin),
+        );
 
-        localStorage.setItem(`sessionData${globalScene.sessionSlotId ? globalScene.sessionSlotId : ""}_${loggedInUser?.username}`, encrypt(JSON.stringify(sessionData), bypassLogin));
-
-        console.debug("Session data saved");
+        console.debug("Session data saved!");
 
         if (!bypassLogin && sync) {
-          pokerogueApi.savedata.updateAll(request)
-            .then(error => {
-              if (sync) {
-                globalScene.lastSavePlayTime = 0;
-                globalScene.ui.savingIcon.hide();
+          pokerogueApi.savedata.updateAll(request).then(error => {
+            if (sync) {
+              globalScene.lastSavePlayTime = 0;
+              globalScene.ui.savingIcon.hide();
+            }
+            if (error) {
+              if (error.startsWith("session out of date")) {
+                globalScene.clearPhaseQueue();
+                globalScene.unshiftPhase(new ReloadSessionPhase());
               }
-              if (error) {
-                if (error.startsWith("session out of date")) {
-                  globalScene.clearPhaseQueue();
-                  globalScene.unshiftPhase(new ReloadSessionPhase());
-                }
-                console.error(error);
-                return resolve(false);
-              }
-              resolve(true);
-            });
+              console.error(error);
+              return resolve(false);
+            }
+            resolve(true);
+          });
         } else {
           this.verify().then(success => {
             globalScene.ui.savingIcon.hide();
@@ -1361,7 +1488,7 @@ export class GameData {
     });
   }
 
-  public tryExportData(dataType: GameDataType, slotId: number = 0): Promise<boolean> {
+  public tryExportData(dataType: GameDataType, slotId = 0): Promise<boolean> {
     return new Promise<boolean>(resolve => {
       const dataKey: string = `${getDataTypeKey(dataType, slotId)}_${loggedInUser?.username}`;
       const handleData = (dataStr: string) => {
@@ -1371,7 +1498,9 @@ export class GameData {
             break;
         }
         const encryptedData = AES.encrypt(dataStr, saveKey);
-        const blob = new Blob([ encryptedData.toString() ], { type: "text/json" });
+        const blob = new Blob([encryptedData.toString()], {
+          type: "text/json",
+        });
         const link = document.createElement("a");
         link.href = window.URL.createObjectURL(blob);
         link.download = `${dataKey}.prsv`;
@@ -1379,16 +1508,19 @@ export class GameData {
         link.remove();
       };
       if (!bypassLogin && dataType < GameDataType.SETTINGS) {
-        let promise: Promise<string | null> = Promise.resolve(null);
+        let promise: Promise<string | null | number> = Promise.resolve(null);
 
         if (dataType === GameDataType.SYSTEM) {
           promise = pokerogueApi.savedata.system.get({ clientSessionId });
         } else if (dataType === GameDataType.SESSION) {
-          promise = pokerogueApi.savedata.session.get({ slot: slotId, clientSessionId });
+          promise = pokerogueApi.savedata.session.get({
+            slot: slotId,
+            clientSessionId,
+          });
         }
 
         promise.then(response => {
-          if (!response?.length || response[0] !== "{") {
+          if (typeof response === "number" || !response?.length || response[0] !== "{") {
             console.error(response);
             resolve(false);
             return;
@@ -1407,7 +1539,7 @@ export class GameData {
     });
   }
 
-  public importData(dataType: GameDataType, slotId: number = 0): void {
+  public importData(dataType: GameDataType, slotId = 0): void {
     const dataKey = `${getDataTypeKey(dataType, slotId)}_${loggedInUser?.username}`;
 
     let saveFile: any = document.getElementById("saveFile");
@@ -1420,91 +1552,123 @@ export class GameData {
     saveFile.type = "file";
     saveFile.accept = ".prsv";
     saveFile.style.display = "none";
-    saveFile.addEventListener("change",
-      e => {
-        const reader = new FileReader();
+    saveFile.addEventListener("change", e => {
+      const reader = new FileReader();
 
-        reader.onload = (_ => {
-          return e => {
-            let dataName: string;
-            let dataStr = AES.decrypt(e.target?.result?.toString()!, saveKey).toString(enc.Utf8); // TODO: is this bang correct?
-            let valid = false;
-            try {
-              dataName = GameDataType[dataType].toLowerCase();
-              switch (dataType) {
-                case GameDataType.SYSTEM:
-                  dataStr = this.convertSystemDataStr(dataStr);
-                  const systemData = this.parseSystemData(dataStr);
-                  valid = !!systemData.dexData && !!systemData.timestamp;
-                  break;
-                case GameDataType.SESSION:
-                  const sessionData = this.parseSessionData(dataStr);
-                  valid = !!sessionData.party && !!sessionData.enemyParty && !!sessionData.timestamp;
-                  break;
-                case GameDataType.RUN_HISTORY:
-                  const data = JSON.parse(dataStr);
-                  const keys = Object.keys(data);
-                  dataName = i18next.t("menuUiHandler:RUN_HISTORY").toLowerCase();
-                  keys.forEach((key) => {
-                    const entryKeys = Object.keys(data[key]);
-                    valid = [ "isFavorite", "isVictory", "entry" ].every(v => entryKeys.includes(v)) && entryKeys.length === 3;
-                  });
-                  break;
-                case GameDataType.SETTINGS:
-                case GameDataType.TUTORIALS:
-                  valid = true;
-                  break;
+      reader.onload = (_ => {
+        return e => {
+          let dataName: string;
+          let dataStr = AES.decrypt(e.target?.result?.toString()!, saveKey).toString(enc.Utf8); // TODO: is this bang correct?
+          let valid = false;
+          try {
+            dataName = GameDataType[dataType].toLowerCase();
+            switch (dataType) {
+              case GameDataType.SYSTEM: {
+                dataStr = this.convertSystemDataStr(dataStr);
+                const systemData = this.parseSystemData(dataStr);
+                valid = !!systemData.dexData && !!systemData.timestamp;
+                break;
               }
-            } catch (ex) {
-              console.error(ex);
+              case GameDataType.SESSION: {
+                const sessionData = this.parseSessionData(dataStr);
+                valid = !!sessionData.party && !!sessionData.enemyParty && !!sessionData.timestamp;
+                break;
+              }
+              case GameDataType.RUN_HISTORY: {
+                const data = JSON.parse(dataStr);
+                const keys = Object.keys(data);
+                dataName = i18next.t("menuUiHandler:RUN_HISTORY").toLowerCase();
+                keys.forEach(key => {
+                  const entryKeys = Object.keys(data[key]);
+                  valid =
+                    ["isFavorite", "isVictory", "entry"].every(v => entryKeys.includes(v)) && entryKeys.length === 3;
+                });
+                break;
+              }
+              case GameDataType.SETTINGS:
+              case GameDataType.TUTORIALS:
+                valid = true;
+                break;
             }
+          } catch (ex) {
+            console.error(ex);
+          }
 
-            const displayError = (error: string) => globalScene.ui.showText(error, null, () => globalScene.ui.showText("", 0), Utils.fixedInt(1500));
-            dataName = dataName!; // tell TS compiler that dataName is defined!
+          const displayError = (error: string) =>
+            globalScene.ui.showText(error, null, () => globalScene.ui.showText("", 0), fixedInt(1500));
+          dataName = dataName!; // tell TS compiler that dataName is defined!
 
-            if (!valid) {
-              return globalScene.ui.showText(`Your ${dataName} data could not be loaded. It may be corrupted.`, null, () => globalScene.ui.showText("", 0), Utils.fixedInt(1500));
-            }
+          if (!valid) {
+            return globalScene.ui.showText(
+              `Your ${dataName} data could not be loaded. It may be corrupted.`,
+              null,
+              () => globalScene.ui.showText("", 0),
+              fixedInt(1500),
+            );
+          }
 
-            globalScene.ui.showText(`Your ${dataName} data will be overridden and the page will reload. Proceed?`, null, () => {
-              globalScene.ui.setOverlayMode(Mode.CONFIRM, () => {
-                localStorage.setItem(dataKey, encrypt(dataStr, bypassLogin));
+          globalScene.ui.showText(
+            `Your ${dataName} data will be overridden and the page will reload. Proceed?`,
+            null,
+            () => {
+              globalScene.ui.setOverlayMode(
+                UiMode.CONFIRM,
+                () => {
+                  localStorage.setItem(dataKey, encrypt(dataStr, bypassLogin));
 
-                if (!bypassLogin && dataType < GameDataType.SETTINGS) {
-                  updateUserInfo().then(success => {
-                    if (!success[0]) {
-                      return displayError(`Could not contact the server. Your ${dataName} data could not be imported.`);
-                    }
-                    const { trainerId, secretId } = this;
-                    let updatePromise: Promise<string | null>;
-                    if (dataType === GameDataType.SESSION) {
-                      updatePromise = pokerogueApi.savedata.session.update({ slot: slotId, trainerId, secretId, clientSessionId }, dataStr);
-                    } else {
-                      updatePromise = pokerogueApi.savedata.system.update({ trainerId, secretId, clientSessionId }, dataStr);
-                    }
-                    updatePromise
-                      .then(error => {
+                  if (!bypassLogin && dataType < GameDataType.SETTINGS) {
+                    updateUserInfo().then(success => {
+                      if (!success[0]) {
+                        return displayError(
+                          `Could not contact the server. Your ${dataName} data could not be imported.`,
+                        );
+                      }
+                      const { trainerId, secretId } = this;
+                      let updatePromise: Promise<string | null>;
+                      if (dataType === GameDataType.SESSION) {
+                        updatePromise = pokerogueApi.savedata.session.update(
+                          {
+                            slot: slotId,
+                            trainerId,
+                            secretId,
+                            clientSessionId,
+                          },
+                          dataStr,
+                        );
+                      } else {
+                        updatePromise = pokerogueApi.savedata.system.update(
+                          { trainerId, secretId, clientSessionId },
+                          dataStr,
+                        );
+                      }
+                      updatePromise.then(error => {
                         if (error) {
                           console.error(error);
-                          return displayError(`An error occurred while updating ${dataName} data. Please contact the administrator.`);
+                          return displayError(
+                            `An error occurred while updating ${dataName} data. Please contact the administrator.`,
+                          );
                         }
-                        window.location = window.location;
+                        window.location.reload();
                       });
-                  });
-                } else {
-                  window.location = window.location;
-                }
-              }, () => {
-                globalScene.ui.revertMode();
-                globalScene.ui.showText("", 0);
-              }, false, -98);
-            });
-          };
-        })((e.target as any).files[0]);
+                    });
+                  } else {
+                    window.location.reload();
+                  }
+                },
+                () => {
+                  globalScene.ui.revertMode();
+                  globalScene.ui.showText("", 0);
+                },
+                false,
+                -98,
+              );
+            },
+          );
+        };
+      })((e.target as any).files[0]);
 
-        reader.readAsText((e.target as any).files[0]);
-      }
-    );
+      reader.readAsText((e.target as any).files[0]);
+    });
     saveFile.click();
   }
 
@@ -1513,20 +1677,31 @@ export class GameData {
 
     for (const species of allSpecies) {
       data[species.speciesId] = {
-        seenAttr: 0n, caughtAttr: 0n, natureAttr: 0, seenCount: 0, caughtCount: 0, hatchedCount: 0, ivs: [ 0, 0, 0, 0, 0, 0 ]
+        seenAttr: 0n,
+        caughtAttr: 0n,
+        natureAttr: 0,
+        seenCount: 0,
+        caughtCount: 0,
+        hatchedCount: 0,
+        ivs: [0, 0, 0, 0, 0, 0],
       };
     }
 
-    const defaultStarterAttr = DexAttr.NON_SHINY | DexAttr.MALE | DexAttr.FEMALE | DexAttr.DEFAULT_VARIANT | DexAttr.DEFAULT_FORM;
+    const defaultStarterAttr =
+      DexAttr.NON_SHINY | DexAttr.MALE | DexAttr.FEMALE | DexAttr.DEFAULT_VARIANT | DexAttr.DEFAULT_FORM;
 
     const defaultStarterNatures: Nature[] = [];
 
-    globalScene.executeWithSeedOffset(() => {
-      const neutralNatures = [ Nature.HARDY, Nature.DOCILE, Nature.SERIOUS, Nature.BASHFUL, Nature.QUIRKY ];
-      for (let s = 0; s < defaultStarterSpecies.length; s++) {
-        defaultStarterNatures.push(Utils.randSeedItem(neutralNatures));
-      }
-    }, 0, "default");
+    globalScene.executeWithSeedOffset(
+      () => {
+        const neutralNatures = [Nature.HARDY, Nature.DOCILE, Nature.SERIOUS, Nature.BASHFUL, Nature.QUIRKY];
+        for (let s = 0; s < defaultStarterSpecies.length; s++) {
+          defaultStarterNatures.push(randSeedItem(neutralNatures));
+        }
+      },
+      0,
+      "default",
+    );
 
     for (let ds = 0; ds < defaultStarterSpecies.length; ds++) {
       const entry = data[defaultStarterSpecies[ds]] as DexEntry;
@@ -1545,7 +1720,7 @@ export class GameData {
   private initStarterData(): void {
     const starterData: StarterData = {};
 
-    const starterSpeciesIds = Object.keys(speciesStarterCosts).map(k => parseInt(k) as Species);
+    const starterSpeciesIds = Object.keys(speciesStarterCosts).map(k => Number.parseInt(k) as Species);
 
     for (const speciesId of starterSpeciesIds) {
       starterData[speciesId] = {
@@ -1556,16 +1731,19 @@ export class GameData {
         abilityAttr: defaultStarterSpecies.includes(speciesId) ? AbilityAttr.ABILITY_1 : 0,
         passiveAttr: 0,
         valueReduction: 0,
-        classicWinCount: 0
+        classicWinCount: 0,
       };
     }
 
     this.starterData = starterData;
   }
 
-  setPokemonSeen(pokemon: Pokemon, incrementCount: boolean = true, trainer: boolean = false): void {
+  setPokemonSeen(pokemon: Pokemon, incrementCount = true, trainer = false): void {
     // Some Mystery Encounters block updates to these stats
-    if (globalScene.currentBattle?.isBattleMysteryEncounter() && globalScene.currentBattle.mysteryEncounter?.preventGameStatsUpdates) {
+    if (
+      globalScene.currentBattle?.isBattleMysteryEncounter() &&
+      globalScene.currentBattle.mysteryEncounter?.preventGameStatsUpdates
+    ) {
       return;
     }
     const dexEntry = this.dexData[pokemon.species.speciesId];
@@ -1594,15 +1772,14 @@ export class GameData {
    * @param showMessage
    * @returns `true` if Pokemon catch unlocked a new starter, `false` if Pokemon catch did not unlock a starter
    */
-  setPokemonCaught(pokemon: Pokemon, incrementCount: boolean = true, fromEgg: boolean = false, showMessage: boolean = true): Promise<boolean> {
+  setPokemonCaught(pokemon: Pokemon, incrementCount = true, fromEgg = false, showMessage = true): Promise<boolean> {
     // If incrementCount === false (not a catch scenario), only update the pokemon's dex data if the Pokemon has already been marked as caught in dex
     // Prevents form changes, nature changes, etc. from unintentionally updating the dex data of a "rental" pokemon
     const speciesRootForm = pokemon.species.getRootSpeciesId();
     if (!incrementCount && !globalScene.gameData.dexData[speciesRootForm].caughtAttr) {
       return Promise.resolve(false);
-    } else {
-      return this.setPokemonSpeciesCaught(pokemon, pokemon.species, incrementCount, fromEgg, showMessage);
     }
+    return this.setPokemonSpeciesCaught(pokemon, pokemon.species, incrementCount, fromEgg, showMessage);
   }
 
   /**
@@ -1614,22 +1791,63 @@ export class GameData {
    * @param showMessage
    * @returns `true` if Pokemon catch unlocked a new starter, `false` if Pokemon catch did not unlock a starter
    */
-  setPokemonSpeciesCaught(pokemon: Pokemon, species: PokemonSpecies, incrementCount: boolean = true, fromEgg: boolean = false, showMessage: boolean = true): Promise<boolean> {
+  setPokemonSpeciesCaught(
+    pokemon: Pokemon,
+    species: PokemonSpecies,
+    incrementCount = true,
+    fromEgg = false,
+    showMessage = true,
+  ): Promise<boolean> {
     return new Promise<boolean>(resolve => {
       const dexEntry = this.dexData[species.speciesId];
       const caughtAttr = dexEntry.caughtAttr;
       const formIndex = pokemon.formIndex;
-      const dexAttr = pokemon.getDexAttr();
-      pokemon.formIndex = formIndex;
+
+      // This makes sure that we do not try to unlock data which cannot be unlocked
+      const dexAttr = pokemon.getDexAttr() & species.getFullUnlocksData();
 
       // Mark as caught
       dexEntry.caughtAttr |= dexAttr;
 
+      // If the caught form is a battleform, we want to also mark the base form as caught.
+      // This snippet assumes that the base form has formIndex equal to 0, which should be
+      // always true except for the case of Urshifu.
+      const formKey = pokemon.getFormKey();
+      if (formIndex > 0) {
+        // In case a Pikachu with formIndex > 0 was unlocked, base form Pichu is also unlocked
+        if (pokemon.species.speciesId === Species.PIKACHU && species.speciesId === Species.PICHU) {
+          dexEntry.caughtAttr |= globalScene.gameData.getFormAttr(0);
+        }
+        if (pokemon.species.speciesId === Species.URSHIFU) {
+          if (formIndex === 2) {
+            dexEntry.caughtAttr |= globalScene.gameData.getFormAttr(0);
+          } else if (formIndex === 3) {
+            dexEntry.caughtAttr |= globalScene.gameData.getFormAttr(1);
+          }
+        } else if (pokemon.species.speciesId === Species.ZYGARDE) {
+          if (formIndex === 4) {
+            dexEntry.caughtAttr |= globalScene.gameData.getFormAttr(2);
+          } else if (formIndex === 5) {
+            dexEntry.caughtAttr |= globalScene.gameData.getFormAttr(3);
+          }
+        } else {
+          const allFormChanges = pokemonFormChanges.hasOwnProperty(species.speciesId)
+            ? pokemonFormChanges[species.speciesId]
+            : [];
+          const toCurrentFormChanges = allFormChanges.filter(f => f.formKey === formKey);
+          if (toCurrentFormChanges.length > 0) {
+            // Needs to do this or Castform can unlock the wrong form, etc.
+            dexEntry.caughtAttr |= globalScene.gameData.getFormAttr(0);
+          }
+        }
+      }
+
       // Unlock ability
       if (speciesStarterCosts.hasOwnProperty(species.speciesId)) {
-        this.starterData[species.speciesId].abilityAttr |= pokemon.abilityIndex !== 1 || pokemon.species.ability2
-          ? 1 << pokemon.abilityIndex
-          : AbilityAttr.ABILITY_HIDDEN;
+        this.starterData[species.speciesId].abilityAttr |=
+          pokemon.abilityIndex !== 1 || pokemon.species.ability2
+            ? 1 << pokemon.abilityIndex
+            : AbilityAttr.ABILITY_HIDDEN;
       }
 
       // Unlock nature
@@ -1669,14 +1887,23 @@ export class GameData {
         }
 
         if (!hasPrevolution && (!globalScene.gameMode.isDaily || hasNewAttr || fromEgg)) {
-          this.addStarterCandy(species, (1 * (pokemon.isShiny() ? 5 * (1 << (pokemon.variant ?? 0)) : 1)) * (fromEgg || pokemon.isBoss() ? 2 : 1));
+          this.addStarterCandy(
+            species,
+            1 * (pokemon.isShiny() ? 5 * (1 << (pokemon.variant ?? 0)) : 1) * (fromEgg || pokemon.isBoss() ? 2 : 1),
+          );
         }
       }
 
       const checkPrevolution = (newStarter: boolean) => {
         if (hasPrevolution) {
           const prevolutionSpecies = pokemonPrevolutions[species.speciesId];
-          this.setPokemonSpeciesCaught(pokemon, getPokemonSpecies(prevolutionSpecies), incrementCount, fromEgg, showMessage).then(result => resolve(result));
+          this.setPokemonSpeciesCaught(
+            pokemon,
+            getPokemonSpecies(prevolutionSpecies),
+            incrementCount,
+            fromEgg,
+            showMessage,
+          ).then(result => resolve(result));
         } else {
           resolve(newStarter);
         }
@@ -1688,14 +1915,20 @@ export class GameData {
           return;
         }
         globalScene.playSound("level_up_fanfare");
-        globalScene.ui.showText(i18next.t("battle:addedAsAStarter", { pokemonName: species.name }), null, () => checkPrevolution(true), null, true);
+        globalScene.ui.showText(
+          i18next.t("battle:addedAsAStarter", { pokemonName: species.name }),
+          null,
+          () => checkPrevolution(true),
+          null,
+          true,
+        );
       } else {
         checkPrevolution(false);
       }
     });
   }
 
-  incrementRibbonCount(species: PokemonSpecies, forStarter: boolean = false): number {
+  incrementRibbonCount(species: PokemonSpecies, forStarter = false): number {
     const speciesIdToIncrement: Species = species.getRootSpeciesId(forStarter);
 
     if (!this.starterData[speciesIdToIncrement].classicWinCount) {
@@ -1749,7 +1982,12 @@ export class GameData {
    * @param showMessage Default true. If true, will display message for unlocked egg move
    * @param prependSpeciesToMessage Default false. If true, will change message from "X Egg Move Unlocked!" to "Bulbasaur X Egg Move Unlocked!"
    */
-  setEggMoveUnlocked(species: PokemonSpecies, eggMoveIndex: number, showMessage: boolean = true, prependSpeciesToMessage: boolean = false): Promise<boolean> {
+  setEggMoveUnlocked(
+    species: PokemonSpecies,
+    eggMoveIndex: number,
+    showMessage = true,
+    prependSpeciesToMessage = false,
+  ): Promise<boolean> {
     return new Promise<boolean>(resolve => {
       const speciesId = species.speciesId;
       if (!speciesEggMoves.hasOwnProperty(speciesId) || !speciesEggMoves[speciesId][eggMoveIndex]) {
@@ -1776,7 +2014,10 @@ export class GameData {
       globalScene.playSound("level_up_fanfare");
       const moveName = allMoves[speciesEggMoves[speciesId][eggMoveIndex]].name;
       let message = prependSpeciesToMessage ? species.getName() + " " : "";
-      message += eggMoveIndex === 3 ? i18next.t("egg:rareEggMoveUnlock", { moveName: moveName }) : i18next.t("egg:eggMoveUnlock", { moveName: moveName });
+      message +=
+        eggMoveIndex === 3
+          ? i18next.t("egg:rareEggMoveUnlock", { moveName: moveName })
+          : i18next.t("egg:eggMoveUnlock", { moveName: moveName });
 
       globalScene.ui.showText(message, null, () => resolve(true), null, true);
     });
@@ -1847,7 +2088,7 @@ export class GameData {
     return starterCount;
   }
 
-  getSpeciesDefaultDexAttr(species: PokemonSpecies, _forSeen: boolean = false, optimistic: boolean = false): bigint {
+  getSpeciesDefaultDexAttr(species: PokemonSpecies, _forSeen = false, optimistic = false): bigint {
     let ret = 0n;
     const dexEntry = this.dexData[species.speciesId];
     const attr = dexEntry.caughtAttr;
@@ -1868,7 +2109,7 @@ export class GameData {
       }
     } else {
       // Default to non shiny. Fallback to shiny if it's the only thing that's unlocked
-      ret |= (attr & DexAttr.NON_SHINY || !(attr & DexAttr.SHINY)) ? DexAttr.NON_SHINY : DexAttr.SHINY;
+      ret |= attr & DexAttr.NON_SHINY || !(attr & DexAttr.SHINY) ? DexAttr.NON_SHINY : DexAttr.SHINY;
 
       if (attr & DexAttr.DEFAULT_VARIANT) {
         ret |= DexAttr.DEFAULT_VARIANT;
@@ -1885,7 +2126,7 @@ export class GameData {
     return ret;
   }
 
-  getSpeciesDexAttrProps(species: PokemonSpecies, dexAttr: bigint): DexAttrProps {
+  getSpeciesDexAttrProps(_species: PokemonSpecies, dexAttr: bigint): DexAttrProps {
     const shiny = !(dexAttr & DexAttr.NON_SHINY);
     const female = !(dexAttr & DexAttr.MALE);
     let variant: Variant = 0;
@@ -1902,7 +2143,7 @@ export class GameData {
       shiny,
       female,
       variant,
-      formIndex
+      formIndex,
     };
   }
 
@@ -1922,14 +2163,14 @@ export class GameData {
   }
 
   getSpeciesDefaultNatureAttr(species: PokemonSpecies): number {
-    return 1 << (this.getSpeciesDefaultNature(species));
+    return 1 << this.getSpeciesDefaultNature(species);
   }
 
   getDexAttrLuck(dexAttr: bigint): number {
-    return dexAttr & DexAttr.SHINY ? dexAttr & DexAttr.VARIANT_3 ? 3 : dexAttr & DexAttr.VARIANT_2 ? 2 : 1 : 0;
+    return dexAttr & DexAttr.SHINY ? (dexAttr & DexAttr.VARIANT_3 ? 3 : dexAttr & DexAttr.VARIANT_2 ? 2 : 1) : 0;
   }
 
-  getNaturesForAttr(natureAttr: number = 0): Nature[] {
+  getNaturesForAttr(natureAttr = 0): Nature[] {
     const ret: Nature[] = [];
     for (let n = 0; n < 25; n++) {
       if (natureAttr & (1 << (n + 1))) {
@@ -1956,8 +2197,8 @@ export class GameData {
       value = decrementValue(value);
     }
 
-    const cost = new Utils.NumberHolder(value);
-    applyChallenges(globalScene.gameMode, ChallengeType.STARTER_COST, speciesId, cost);
+    const cost = new NumberHolder(value);
+    applyChallenges(ChallengeType.STARTER_COST, speciesId, cost);
 
     return cost.value;
   }
@@ -1984,20 +2225,21 @@ export class GameData {
         entry.hatchedCount = 0;
       }
       if (!entry.hasOwnProperty("natureAttr") || (entry.caughtAttr && !entry.natureAttr)) {
-        entry.natureAttr = this.defaultDexData?.[k].natureAttr || (1 << Utils.randInt(25, 1));
+        entry.natureAttr = this.defaultDexData?.[k].natureAttr || 1 << randInt(25, 1);
       }
     }
   }
 
   migrateStarterAbilities(systemData: SystemSaveData, initialStarterData?: StarterData): void {
-    const starterIds = Object.keys(this.starterData).map(s => parseInt(s) as Species);
+    const starterIds = Object.keys(this.starterData).map(s => Number.parseInt(s) as Species);
     const starterData = initialStarterData || systemData.starterData;
     const dexData = systemData.dexData;
     for (const s of starterIds) {
       const dexAttr = dexData[s].caughtAttr;
-      starterData[s].abilityAttr = (dexAttr & DexAttr.DEFAULT_VARIANT ? AbilityAttr.ABILITY_1 : 0)
-        | (dexAttr & DexAttr.VARIANT_2 ? AbilityAttr.ABILITY_2 : 0)
-        | (dexAttr & DexAttr.VARIANT_3 ? AbilityAttr.ABILITY_HIDDEN : 0);
+      starterData[s].abilityAttr =
+        (dexAttr & DexAttr.DEFAULT_VARIANT ? AbilityAttr.ABILITY_1 : 0) |
+        (dexAttr & DexAttr.VARIANT_2 ? AbilityAttr.ABILITY_2 : 0) |
+        (dexAttr & DexAttr.VARIANT_3 ? AbilityAttr.ABILITY_HIDDEN : 0);
       if (dexAttr) {
         if (!(dexAttr & DexAttr.DEFAULT_VARIANT)) {
           dexData[s].caughtAttr ^= DexAttr.DEFAULT_VARIANT;
diff --git a/src/system/game-speed.ts b/src/system/game-speed.ts
index 4b34a04b5f8..712870dfaf1 100644
--- a/src/system/game-speed.ts
+++ b/src/system/game-speed.ts
@@ -3,19 +3,19 @@ import type FadeIn from "phaser3-rex-plugins/plugins/audio/fade/FadeIn";
 import type FadeOut from "phaser3-rex-plugins/plugins/audio/fade/FadeOut";
 import type BattleScene from "#app/battle-scene";
 import { globalScene } from "#app/global-scene";
-import * as Utils from "../utils";
+import { FixedInt } from "#app/utils/common";
 
-type FadeIn = typeof FadeIn;
-type FadeOut = typeof FadeOut;
+type FadeInType = typeof FadeIn;
+type FadeOutType = typeof FadeOut;
 
 export function initGameSpeed() {
   const thisArg = this as BattleScene;
 
-  const transformValue = (value: number | Utils.FixedInt): number => {
-    if (value instanceof Utils.FixedInt) {
-      return (value as Utils.FixedInt).value;
+  const transformValue = (value: number | FixedInt): number => {
+    if (value instanceof FixedInt) {
+      return (value as FixedInt).value;
     }
-    return thisArg.gameSpeed === 1 ? value : Math.ceil(value /= thisArg.gameSpeed);
+    return thisArg.gameSpeed === 1 ? value : Math.ceil((value /= thisArg.gameSpeed));
   };
 
   const originalAddEvent = this.time.addEvent;
@@ -23,15 +23,21 @@ export function initGameSpeed() {
     if (!(config instanceof Phaser.Time.TimerEvent) && config.delay) {
       config.delay = transformValue(config.delay);
     }
-    return originalAddEvent.apply(this, [ config ]);
+    return originalAddEvent.apply(this, [config]);
   };
   const originalTweensAdd = this.tweens.add;
-  this.tweens.add = function (config: Phaser.Types.Tweens.TweenBuilderConfig | Phaser.Types.Tweens.TweenChainBuilderConfig | Phaser.Tweens.Tween | Phaser.Tweens.TweenChain) {
+  this.tweens.add = function (
+    config:
+      | Phaser.Types.Tweens.TweenBuilderConfig
+      | Phaser.Types.Tweens.TweenChainBuilderConfig
+      | Phaser.Tweens.Tween
+      | Phaser.Tweens.TweenChain,
+  ) {
     if (config.loopDelay) {
       config.loopDelay = transformValue(config.loopDelay as number);
     }
 
-    if (!(config instanceof Phaser.Tweens.TweenChain) ) {
+    if (!(config instanceof Phaser.Tweens.TweenChain)) {
       if (config.duration) {
         config.duration = transformValue(config.duration);
       }
@@ -48,12 +54,12 @@ export function initGameSpeed() {
         }
       }
     }
-    return originalTweensAdd.apply(this, [ config ]);
+    return originalTweensAdd.apply(this, [config]);
   };
   const originalTweensChain = this.tweens.chain;
   this.tweens.chain = function (config: Phaser.Types.Tweens.TweenChainBuilderConfig): Phaser.Tweens.TweenChain {
     if (config.tweens) {
-      config.tweens.forEach(t => {
+      for (const t of config.tweens) {
         if (t.duration) {
           t.duration = transformValue(t.duration);
         }
@@ -69,9 +75,9 @@ export function initGameSpeed() {
         if (t.hold) {
           t.hold = transformValue(t.hold);
         }
-      });
+      }
     }
-    return originalTweensChain.apply(this, [ config ]);
+    return originalTweensChain.apply(this, [config]);
   };
   const originalAddCounter = this.tweens.addCounter;
   this.tweens.addCounter = function (config: Phaser.Types.Tweens.NumberTweenBuilderConfig) {
@@ -90,23 +96,19 @@ export function initGameSpeed() {
     if (config.hold) {
       config.hold = transformValue(config.hold);
     }
-    return originalAddCounter.apply(this, [ config ]);
+    return originalAddCounter.apply(this, [config]);
   };
 
   const originalFadeOut = SoundFade.fadeOut;
-  SoundFade.fadeOut = ((
-    scene: Phaser.Scene,
-    sound: Phaser.Sound.BaseSound,
-    duration: number,
-    destroy?: boolean
-  ) => originalFadeOut(globalScene, sound, transformValue(duration), destroy)) as FadeOut;
+  SoundFade.fadeOut = ((_scene: Phaser.Scene, sound: Phaser.Sound.BaseSound, duration: number, destroy?: boolean) =>
+    originalFadeOut(globalScene, sound, transformValue(duration), destroy)) as FadeOutType;
 
   const originalFadeIn = SoundFade.fadeIn;
   SoundFade.fadeIn = ((
-    scene: Phaser.Scene,
+    _scene: Phaser.Scene,
     sound: string | Phaser.Sound.BaseSound,
     duration: number,
     endVolume?: number,
-    startVolume?: number
-  ) => originalFadeIn(globalScene, sound, transformValue(duration), endVolume, startVolume)) as FadeIn;
+    startVolume?: number,
+  ) => originalFadeIn(globalScene, sound, transformValue(duration), endVolume, startVolume)) as FadeInType;
 }
diff --git a/src/system/modifier-data.ts b/src/system/modifier-data.ts
index 4816115f586..cbda45572ac 100644
--- a/src/system/modifier-data.ts
+++ b/src/system/modifier-data.ts
@@ -13,7 +13,7 @@ export default class ModifierData {
   public className: string;
 
   constructor(source: PersistentModifier | any, player: boolean) {
-    const sourceModifier = source instanceof PersistentModifier ? source as PersistentModifier : null;
+    const sourceModifier = source instanceof PersistentModifier ? (source as PersistentModifier) : null;
     this.player = player;
     this.typeId = sourceModifier ? sourceModifier.type.id : source.typeId;
     if (sourceModifier) {
@@ -28,7 +28,7 @@ export default class ModifierData {
     this.className = sourceModifier ? sourceModifier.constructor.name : source.className;
   }
 
-  toModifier(constructor: any): PersistentModifier | null {
+  toModifier(_constructor: any): PersistentModifier | null {
     const typeFunc = getModifierTypeFuncById(this.typeId);
     if (!typeFunc) {
       return null;
@@ -39,10 +39,16 @@ export default class ModifierData {
       type.id = this.typeId;
 
       if (type instanceof ModifierTypeGenerator) {
-        type = (type as ModifierTypeGenerator).generateType(this.player ? globalScene.getPlayerParty() : globalScene.getEnemyField(), this.typePregenArgs);
+        type = (type as ModifierTypeGenerator).generateType(
+          this.player ? globalScene.getPlayerParty() : globalScene.getEnemyField(),
+          this.typePregenArgs,
+        );
       }
 
-      const ret = Reflect.construct(constructor, ([ type ] as any[]).concat(this.args).concat(this.stackCount)) as PersistentModifier;
+      const ret = Reflect.construct(
+        _constructor,
+        ([type] as any[]).concat(this.args).concat(this.stackCount),
+      ) as PersistentModifier;
 
       if (ret.stackCount > ret.getMaxStackCount()) {
         ret.stackCount = ret.getMaxStackCount();
diff --git a/src/system/pokemon-data.ts b/src/system/pokemon-data.ts
index 6459bb5033d..00169678ed0 100644
--- a/src/system/pokemon-data.ts
+++ b/src/system/pokemon-data.ts
@@ -1,18 +1,18 @@
-import { BattleType } from "../battle";
+import { BattleType } from "#enums/battle-type";
 import { globalScene } from "#app/global-scene";
 import type { Gender } from "../data/gender";
-import type { Nature } from "#enums/nature";
-import type { PokeballType } from "#enums/pokeball";
-import { getPokemonSpecies } from "../data/pokemon-species";
+import { Nature } from "#enums/nature";
+import { PokeballType } from "#enums/pokeball";
+import { getPokemonSpecies, getPokemonSpeciesForm } from "../data/pokemon-species";
 import { Status } from "../data/status-effect";
-import Pokemon, { EnemyPokemon, PokemonMove, PokemonSummonData } from "../field/pokemon";
-import { TrainerSlot } from "../data/trainer-config";
-import type { Variant } from "#app/data/variant";
-import { loadBattlerTag } from "../data/battler-tags";
+import Pokemon, { EnemyPokemon, PokemonBattleData, PokemonMove, PokemonSummonData } from "../field/pokemon";
+import { TrainerSlot } from "#enums/trainer-slot";
+import type { Variant } from "#app/sprites/variant";
 import type { Biome } from "#enums/biome";
-import { Moves } from "#enums/moves";
+import type { Moves } from "#enums/moves";
 import type { Species } from "#enums/species";
 import { CustomPokemonData } from "#app/data/custom-pokemon-data";
+import type { PokemonType } from "#enums/pokemon-type";
 
 export default class PokemonData {
   public id: number;
@@ -33,18 +33,21 @@ export default class PokemonData {
   public stats: number[];
   public ivs: number[];
   public nature: Nature;
-  public moveset: (PokemonMove | null)[];
+  public moveset: PokemonMove[];
   public status: Status | null;
   public friendship: number;
   public metLevel: number;
-  public metBiome: Biome | -1;        // -1 for starters
+  public metBiome: Biome | -1; // -1 for starters
   public metSpecies: Species;
-  public metWave: number;            // 0 for unknown (previous saves), -1 for starters
+  public metWave: number; // 0 for unknown (previous saves), -1 for starters
   public luck: number;
   public pauseEvolutions: boolean;
   public pokerus: boolean;
   public usedTMs: Moves[];
   public evoCounter: number;
+  public teraType: PokemonType;
+  public isTerastallized: boolean;
+  public stellarTypesBoosted: PokemonType[];
 
   public fusionSpecies: Species;
   public fusionFormIndex: number;
@@ -53,127 +56,142 @@ export default class PokemonData {
   public fusionVariant: Variant;
   public fusionGender: Gender;
   public fusionLuck: number;
+  public fusionTeraType: PokemonType;
 
   public boss: boolean;
-  public bossSegments?: number;
+  public bossSegments: number;
 
+  // Effects that need to be preserved between waves
   public summonData: PokemonSummonData;
+  public battleData: PokemonBattleData;
+  public summonDataSpeciesFormIndex: number;
 
-  /** Data that can customize a Pokemon in non-standard ways from its Species */
   public customPokemonData: CustomPokemonData;
   public fusionCustomPokemonData: CustomPokemonData;
 
   // Deprecated attributes, needed for now to allow SessionData migration (see PR#4619 comments)
+  // TODO: Remove these once pre-session migration is implemented
   public natureOverride: Nature | -1;
   public mysteryEncounterPokemonData: CustomPokemonData | null;
   public fusionMysteryEncounterPokemonData: CustomPokemonData | null;
 
-  constructor(source: Pokemon | any, forHistory: boolean = false) {
-    const sourcePokemon = source instanceof Pokemon ? source : null;
+  /**
+   * Construct a new {@linkcode PokemonData} instance out of a {@linkcode Pokemon}
+   * or JSON representation thereof.
+   * @param source The {@linkcode Pokemon} to convert into data (or a JSON object representing one)
+   */
+  // TODO: Remove any from type signature in favor of 2 separate method funcs
+  constructor(source: Pokemon | any) {
+    const sourcePokemon = source instanceof Pokemon ? source : undefined;
+
     this.id = source.id;
-    this.player = sourcePokemon ? sourcePokemon.isPlayer() : source.player;
-    this.species = sourcePokemon ? sourcePokemon.species.speciesId : source.species;
-    this.nickname = sourcePokemon ? sourcePokemon.nickname : source.nickname;
+    this.player = sourcePokemon?.isPlayer() ?? source.player;
+    this.species = sourcePokemon?.species.speciesId ?? source.species;
+    this.nickname = sourcePokemon?.summonData.illusion?.basePokemon.nickname ?? source.nickname;
     this.formIndex = Math.max(Math.min(source.formIndex, getPokemonSpecies(this.species).forms.length - 1), 0);
     this.abilityIndex = source.abilityIndex;
     this.passive = source.passive;
-    this.shiny = source.shiny;
-    this.variant = source.variant;
-    this.pokeball = source.pokeball;
+    this.shiny = sourcePokemon?.summonData.illusion?.basePokemon.shiny ?? source.shiny;
+    this.variant = sourcePokemon?.summonData.illusion?.basePokemon.variant ?? source.variant;
+    this.pokeball = source.pokeball ?? PokeballType.POKEBALL;
     this.level = source.level;
     this.exp = source.exp;
-    if (!forHistory) {
-      this.levelExp = source.levelExp;
-    }
+    this.levelExp = source.levelExp;
     this.gender = source.gender;
-    if (!forHistory) {
-      this.hp = source.hp;
-    }
+    this.hp = source.hp;
     this.stats = source.stats;
     this.ivs = source.ivs;
-    this.nature = source.nature !== undefined ? source.nature : 0 as Nature;
-    this.friendship = source.friendship !== undefined ? source.friendship : getPokemonSpecies(this.species).baseFriendship;
+
+    // TODO: Can't we move some of this verification stuff to an upgrade script?
+    this.nature = source.nature ?? Nature.HARDY;
+    this.moveset = source.moveset.map((m: any) => PokemonMove.loadMove(m));
+    this.status = source.status
+      ? new Status(source.status.effect, source.status.toxicTurnCount, source.status.sleepTurnsRemaining)
+      : null;
+    this.friendship = source.friendship ?? getPokemonSpecies(this.species).baseFriendship;
     this.metLevel = source.metLevel || 5;
-    this.metBiome = source.metBiome !== undefined ? source.metBiome : -1;
+    this.metBiome = source.metBiome ?? -1;
     this.metSpecies = source.metSpecies;
     this.metWave = source.metWave ?? (this.metBiome === -1 ? -1 : 0);
-    this.luck = source.luck !== undefined ? source.luck : (source.shiny ? (source.variant + 1) : 0);
-    if (!forHistory) {
-      this.pauseEvolutions = !!source.pauseEvolutions;
-      this.evoCounter = source.evoCounter ?? 0;
-    }
+    this.luck = source.luck ?? (source.shiny ? source.variant + 1 : 0);
+    this.pauseEvolutions = !!source.pauseEvolutions;
     this.pokerus = !!source.pokerus;
-
-    this.fusionSpecies = sourcePokemon ? sourcePokemon.fusionSpecies?.speciesId : source.fusionSpecies;
-    this.fusionFormIndex = source.fusionFormIndex;
-    this.fusionAbilityIndex = source.fusionAbilityIndex;
-    this.fusionShiny = source.fusionShiny;
-    this.fusionVariant = source.fusionVariant;
-    this.fusionGender = source.fusionGender;
-    this.fusionLuck = source.fusionLuck !== undefined ? source.fusionLuck : (source.fusionShiny ? source.fusionVariant + 1 : 0);
-    this.fusionCustomPokemonData = new CustomPokemonData(source.fusionCustomPokemonData);
     this.usedTMs = source.usedTMs ?? [];
-
-    this.customPokemonData = new CustomPokemonData(source.customPokemonData);
+    this.evoCounter = source.evoCounter ?? 0;
+    this.teraType = source.teraType as PokemonType;
+    this.isTerastallized = !!source.isTerastallized;
+    this.stellarTypesBoosted = source.stellarTypesBoosted ?? [];
 
     // Deprecated, but needed for session data migration
     this.natureOverride = source.natureOverride;
-    this.mysteryEncounterPokemonData = source.mysteryEncounterPokemonData ? new CustomPokemonData(source.mysteryEncounterPokemonData) : null;
-    this.fusionMysteryEncounterPokemonData = source.fusionMysteryEncounterPokemonData ? new CustomPokemonData(source.fusionMysteryEncounterPokemonData) : null;
+    this.mysteryEncounterPokemonData = source.mysteryEncounterPokemonData
+      ? new CustomPokemonData(source.mysteryEncounterPokemonData)
+      : null;
+    this.fusionMysteryEncounterPokemonData = source.fusionMysteryEncounterPokemonData
+      ? new CustomPokemonData(source.fusionMysteryEncounterPokemonData)
+      : null;
 
-    if (!forHistory) {
-      this.boss = (source instanceof EnemyPokemon && !!source.bossSegments) || (!this.player && !!source.boss);
-      this.bossSegments = source.bossSegments;
-    }
+    this.fusionSpecies = sourcePokemon?.fusionSpecies?.speciesId ?? source.fusionSpecies;
+    this.fusionFormIndex = source.fusionFormIndex;
+    this.fusionAbilityIndex = source.fusionAbilityIndex;
+    this.fusionShiny = sourcePokemon?.summonData.illusion?.basePokemon.fusionShiny ?? source.fusionShiny;
+    this.fusionVariant = sourcePokemon?.summonData.illusion?.basePokemon.fusionVariant ?? source.fusionVariant;
+    this.fusionGender = source.fusionGender;
+    this.fusionLuck = source.fusionLuck ?? (source.fusionShiny ? source.fusionVariant + 1 : 0);
+    this.fusionTeraType = (source.fusionTeraType ?? 0) as PokemonType;
 
-    if (sourcePokemon) {
-      this.moveset = sourcePokemon.moveset;
-      if (!forHistory) {
-        this.status = sourcePokemon.status;
-        if (this.player) {
-          this.summonData = sourcePokemon.summonData;
-        }
-      }
-    } else {
-      this.moveset = (source.moveset || [ new PokemonMove(Moves.TACKLE), new PokemonMove(Moves.GROWL) ]).filter(m => m).map((m: any) => new PokemonMove(m.moveId, m.ppUsed, m.ppUp, m.virtual, m.maxPpOverride));
-      if (!forHistory) {
-        this.status = source.status
-          ? new Status(source.status.effect, source.status.toxicTurnCount, source.status.sleepTurnsRemaining)
-          : null;
-      }
+    this.boss = (source instanceof EnemyPokemon && !!source.bossSegments) || (!this.player && !!source.boss);
+    this.bossSegments = source.bossSegments ?? 0;
 
-      this.summonData = new PokemonSummonData();
-      if (!forHistory && source.summonData) {
-        this.summonData.stats = source.summonData.stats;
-        this.summonData.statStages = source.summonData.statStages;
-        this.summonData.moveQueue = source.summonData.moveQueue;
-        this.summonData.abilitySuppressed = source.summonData.abilitySuppressed;
-        this.summonData.abilitiesApplied = source.summonData.abilitiesApplied;
+    this.summonData = new PokemonSummonData(source.summonData);
+    this.battleData = new PokemonBattleData(source.battleData);
+    this.summonDataSpeciesFormIndex =
+      sourcePokemon?.summonData.speciesForm?.formIndex ?? source.summonDataSpeciesFormIndex;
 
-        this.summonData.ability = source.summonData.ability;
-        this.summonData.moveset = source.summonData.moveset?.map(m => PokemonMove.loadMove(m));
-        this.summonData.types = source.summonData.types;
-
-        if (source.summonData.tags) {
-          this.summonData.tags = source.summonData.tags?.map(t => loadBattlerTag(t));
-        } else {
-          this.summonData.tags = [];
-        }
-      }
-    }
+    this.customPokemonData = new CustomPokemonData(source.customPokemonData);
+    this.fusionCustomPokemonData = new CustomPokemonData(source.fusionCustomPokemonData);
   }
 
-  toPokemon(battleType?: BattleType, partyMemberIndex: number = 0, double: boolean = false): Pokemon {
+  toPokemon(battleType?: BattleType, partyMemberIndex = 0, double = false): Pokemon {
     const species = getPokemonSpecies(this.species);
     const ret: Pokemon = this.player
-      ? globalScene.addPlayerPokemon(species, this.level, this.abilityIndex, this.formIndex, this.gender, this.shiny, this.variant, this.ivs, this.nature, this, (playerPokemon) => {
-        if (this.nickname) {
-          playerPokemon.nickname = this.nickname;
-        }
-      })
-      : globalScene.addEnemyPokemon(species, this.level, battleType === BattleType.TRAINER ? !double || !(partyMemberIndex % 2) ? TrainerSlot.TRAINER : TrainerSlot.TRAINER_PARTNER : TrainerSlot.NONE, this.boss, false, this);
-    if (this.summonData) {
-      ret.primeSummonData(this.summonData);
+      ? globalScene.addPlayerPokemon(
+          species,
+          this.level,
+          this.abilityIndex,
+          this.formIndex,
+          this.gender,
+          this.shiny,
+          this.variant,
+          this.ivs,
+          this.nature,
+          this,
+          playerPokemon => {
+            if (this.nickname) {
+              playerPokemon.nickname = this.nickname;
+            }
+          },
+        )
+      : globalScene.addEnemyPokemon(
+          species,
+          this.level,
+          battleType === BattleType.TRAINER
+            ? !double || !(partyMemberIndex % 2)
+              ? TrainerSlot.TRAINER
+              : TrainerSlot.TRAINER_PARTNER
+            : TrainerSlot.NONE,
+          this.boss,
+          false,
+          this,
+        );
+
+    // when loading from saved session, recover summonData.speciesFrom and form index species object
+    // used to stay transformed on reload session
+    if (this.summonData.speciesForm) {
+      ret.summonData.speciesForm = getPokemonSpeciesForm(
+        this.summonData.speciesForm.speciesId,
+        this.summonDataSpeciesFormIndex,
+      );
     }
     return ret;
   }
diff --git a/src/system/session-history.ts b/src/system/session-history.ts
index d9dd2022d8f..8eb81cb6efe 100644
--- a/src/system/session-history.ts
+++ b/src/system/session-history.ts
@@ -5,13 +5,13 @@ import type PersistentModifierData from "./modifier-data";
 export enum SessionHistoryResult {
   ACTIVE,
   WIN,
-  LOSS
+  LOSS,
 }
 
 export interface SessionHistory {
   seed: string;
   playTime: number;
-  result: SessionHistoryResult,
+  result: SessionHistoryResult;
   gameMode: GameModes;
   party: PokemonData[];
   modifiers: PersistentModifierData[];
diff --git a/src/system/settings/settings-gamepad.ts b/src/system/settings/settings-gamepad.ts
index d26c0c9f019..12add905096 100644
--- a/src/system/settings/settings-gamepad.ts
+++ b/src/system/settings/settings-gamepad.ts
@@ -1,54 +1,54 @@
 import type SettingsGamepadUiHandler from "../../ui/settings/settings-gamepad-ui-handler";
-import { Mode } from "../../ui/ui";
-import { truncateString } from "../../utils";
+import { UiMode } from "#enums/ui-mode";
+import { truncateString } from "../../utils/common";
 import { Button } from "#enums/buttons";
 import { SettingKeyboard } from "#app/system/settings/settings-keyboard";
 import { globalScene } from "#app/global-scene";
 
 export enum SettingGamepad {
-    Controller = "CONTROLLER",
-    Gamepad_Support = "GAMEPAD_SUPPORT",
-    Button_Up = "BUTTON_UP",
-    Button_Down = "BUTTON_DOWN",
-    Button_Left = "BUTTON_LEFT",
-    Button_Right = "BUTTON_RIGHT",
-    Button_Action = "BUTTON_ACTION",
-    Button_Cancel = "BUTTON_CANCEL",
-    Button_Menu = "BUTTON_MENU",
-    Button_Stats = "BUTTON_STATS",
-    Button_Cycle_Form = "BUTTON_CYCLE_FORM",
-    Button_Cycle_Shiny = "BUTTON_CYCLE_SHINY",
-    Button_Cycle_Gender = "BUTTON_CYCLE_GENDER",
-    Button_Cycle_Ability = "BUTTON_CYCLE_ABILITY",
-    Button_Cycle_Nature = "BUTTON_CYCLE_NATURE",
-    Button_Cycle_Variant = "BUTTON_CYCLE_VARIANT",
-    Button_Speed_Up = "BUTTON_SPEED_UP",
-    Button_Slow_Down = "BUTTON_SLOW_DOWN",
-    Button_Submit = "BUTTON_SUBMIT",
+  Controller = "CONTROLLER",
+  Gamepad_Support = "GAMEPAD_SUPPORT",
+  Button_Up = "BUTTON_UP",
+  Button_Down = "BUTTON_DOWN",
+  Button_Left = "BUTTON_LEFT",
+  Button_Right = "BUTTON_RIGHT",
+  Button_Action = "BUTTON_ACTION",
+  Button_Cancel = "BUTTON_CANCEL",
+  Button_Menu = "BUTTON_MENU",
+  Button_Stats = "BUTTON_STATS",
+  Button_Cycle_Form = "BUTTON_CYCLE_FORM",
+  Button_Cycle_Shiny = "BUTTON_CYCLE_SHINY",
+  Button_Cycle_Gender = "BUTTON_CYCLE_GENDER",
+  Button_Cycle_Ability = "BUTTON_CYCLE_ABILITY",
+  Button_Cycle_Nature = "BUTTON_CYCLE_NATURE",
+  Button_Cycle_Tera = "BUTTON_CYCLE_TERA",
+  Button_Speed_Up = "BUTTON_SPEED_UP",
+  Button_Slow_Down = "BUTTON_SLOW_DOWN",
+  Button_Submit = "BUTTON_SUBMIT",
 }
 
 const pressAction = "Press action to assign";
 
 export const settingGamepadOptions = {
-  [SettingGamepad.Controller]: [ "Default", "Change" ],
-  [SettingGamepad.Gamepad_Support]: [ "Auto", "Disabled" ],
-  [SettingGamepad.Button_Up]: [ `KEY ${Button.UP.toString()}`, pressAction ],
-  [SettingGamepad.Button_Down]: [ `KEY ${Button.DOWN.toString()}`, pressAction ],
-  [SettingGamepad.Button_Left]: [ `KEY ${Button.LEFT.toString()}`, pressAction ],
-  [SettingGamepad.Button_Right]: [ `KEY ${Button.RIGHT.toString()}`, pressAction ],
-  [SettingGamepad.Button_Action]: [ `KEY ${Button.ACTION.toString()}`, pressAction ],
-  [SettingGamepad.Button_Cancel]: [ `KEY ${Button.CANCEL.toString()}`, pressAction ],
-  [SettingGamepad.Button_Menu]: [ `KEY ${Button.MENU.toString()}`, pressAction ],
-  [SettingGamepad.Button_Stats]: [ `KEY ${Button.STATS.toString()}`, pressAction ],
-  [SettingGamepad.Button_Cycle_Form]: [ `KEY ${Button.CYCLE_FORM.toString()}`, pressAction ],
-  [SettingGamepad.Button_Cycle_Shiny]: [ `KEY ${Button.CYCLE_SHINY.toString()}`, pressAction ],
-  [SettingGamepad.Button_Cycle_Gender]: [ `KEY ${Button.CYCLE_GENDER.toString()}`, pressAction ],
-  [SettingGamepad.Button_Cycle_Ability]: [ `KEY ${Button.CYCLE_ABILITY.toString()}`, pressAction ],
-  [SettingGamepad.Button_Cycle_Nature]: [ `KEY ${Button.CYCLE_NATURE.toString()}`, pressAction ],
-  [SettingGamepad.Button_Cycle_Variant]: [ `KEY ${Button.V.toString()}`, pressAction ],
-  [SettingGamepad.Button_Speed_Up]: [ `KEY ${Button.SPEED_UP.toString()}`, pressAction ],
-  [SettingGamepad.Button_Slow_Down]: [ `KEY ${Button.SLOW_DOWN.toString()}`, pressAction ],
-  [SettingGamepad.Button_Submit]: [ `KEY ${Button.SUBMIT.toString()}`, pressAction ],
+  [SettingGamepad.Controller]: ["Default", "Change"],
+  [SettingGamepad.Gamepad_Support]: ["Auto", "Disabled"],
+  [SettingGamepad.Button_Up]: [`KEY ${Button.UP.toString()}`, pressAction],
+  [SettingGamepad.Button_Down]: [`KEY ${Button.DOWN.toString()}`, pressAction],
+  [SettingGamepad.Button_Left]: [`KEY ${Button.LEFT.toString()}`, pressAction],
+  [SettingGamepad.Button_Right]: [`KEY ${Button.RIGHT.toString()}`, pressAction],
+  [SettingGamepad.Button_Action]: [`KEY ${Button.ACTION.toString()}`, pressAction],
+  [SettingGamepad.Button_Cancel]: [`KEY ${Button.CANCEL.toString()}`, pressAction],
+  [SettingGamepad.Button_Menu]: [`KEY ${Button.MENU.toString()}`, pressAction],
+  [SettingGamepad.Button_Stats]: [`KEY ${Button.STATS.toString()}`, pressAction],
+  [SettingGamepad.Button_Cycle_Form]: [`KEY ${Button.CYCLE_FORM.toString()}`, pressAction],
+  [SettingGamepad.Button_Cycle_Shiny]: [`KEY ${Button.CYCLE_SHINY.toString()}`, pressAction],
+  [SettingGamepad.Button_Cycle_Gender]: [`KEY ${Button.CYCLE_GENDER.toString()}`, pressAction],
+  [SettingGamepad.Button_Cycle_Ability]: [`KEY ${Button.CYCLE_ABILITY.toString()}`, pressAction],
+  [SettingGamepad.Button_Cycle_Nature]: [`KEY ${Button.CYCLE_NATURE.toString()}`, pressAction],
+  [SettingGamepad.Button_Cycle_Tera]: [`KEY ${Button.CYCLE_TERA.toString()}`, pressAction],
+  [SettingGamepad.Button_Speed_Up]: [`KEY ${Button.SPEED_UP.toString()}`, pressAction],
+  [SettingGamepad.Button_Slow_Down]: [`KEY ${Button.SLOW_DOWN.toString()}`, pressAction],
+  [SettingGamepad.Button_Submit]: [`KEY ${Button.SUBMIT.toString()}`, pressAction],
 };
 
 export const settingGamepadDefaults = {
@@ -67,7 +67,7 @@ export const settingGamepadDefaults = {
   [SettingGamepad.Button_Cycle_Gender]: 0,
   [SettingGamepad.Button_Cycle_Ability]: 0,
   [SettingGamepad.Button_Cycle_Nature]: 0,
-  [SettingGamepad.Button_Cycle_Variant]: 0,
+  [SettingGamepad.Button_Cycle_Tera]: 0,
   [SettingGamepad.Button_Speed_Up]: 0,
   [SettingGamepad.Button_Slow_Down]: 0,
   [SettingGamepad.Button_Submit]: 0,
@@ -83,8 +83,8 @@ export const settingGamepadBlackList = [
 export function setSettingGamepad(setting: SettingGamepad, value: number): boolean {
   switch (setting) {
     case SettingGamepad.Gamepad_Support:
-    // if we change the value of the gamepad support, we call a method in the inputController to
-    // activate or deactivate the controller listener
+      // if we change the value of the gamepad support, we call a method in the inputController to
+      // activate or deactivate the controller listener
       globalScene.inputController.setGamepadSupport(settingGamepadOptions[setting][value] !== "Disabled");
       break;
     case SettingGamepad.Button_Action:
@@ -96,18 +96,18 @@ export function setSettingGamepad(setting: SettingGamepad, value: number): boole
     case SettingGamepad.Button_Cycle_Gender:
     case SettingGamepad.Button_Cycle_Ability:
     case SettingGamepad.Button_Cycle_Nature:
-    case SettingGamepad.Button_Cycle_Variant:
+    case SettingGamepad.Button_Cycle_Tera:
     case SettingGamepad.Button_Speed_Up:
     case SettingGamepad.Button_Slow_Down:
     case SettingGamepad.Button_Submit:
       if (value) {
         if (globalScene.ui) {
-          const cancelHandler = (success: boolean = false) : boolean => {
+          const cancelHandler = (success = false): boolean => {
             globalScene.ui.revertMode();
             (globalScene.ui.getHandler() as SettingsGamepadUiHandler).updateBindings();
             return success;
           };
-          globalScene.ui.setOverlayMode(Mode.GAMEPAD_BINDING, {
+          globalScene.ui.setOverlayMode(UiMode.GAMEPAD_BINDING, {
             target: setting,
             cancelHandler: cancelHandler,
           });
@@ -120,7 +120,11 @@ export function setSettingGamepad(setting: SettingGamepad, value: number): boole
         if (globalScene.ui && gp) {
           const cancelHandler = () => {
             globalScene.ui.revertMode();
-            (globalScene.ui.getHandler() as SettingsGamepadUiHandler).setOptionCursor(Object.values(SettingGamepad).indexOf(SettingGamepad.Controller), 0, true);
+            (globalScene.ui.getHandler() as SettingsGamepadUiHandler).setOptionCursor(
+              Object.values(SettingGamepad).indexOf(SettingGamepad.Controller),
+              0,
+              true,
+            );
             (globalScene.ui.getHandler() as SettingsGamepadUiHandler).updateBindings();
             return false;
           };
@@ -129,14 +133,17 @@ export function setSettingGamepad(setting: SettingGamepad, value: number): boole
             cancelHandler();
             return true;
           };
-          globalScene.ui.setOverlayMode(Mode.OPTION_SELECT, {
-            options: [ ...gp.map((g: string) => ({
-              label: truncateString(g, 30), // Truncate the gamepad name for display
-              handler: () => changeGamepadHandler(g)
-            })), {
-              label: "Cancel",
-              handler: cancelHandler,
-            }]
+          globalScene.ui.setOverlayMode(UiMode.OPTION_SELECT, {
+            options: [
+              ...gp.map((g: string) => ({
+                label: truncateString(g, 30), // Truncate the gamepad name for display
+                handler: () => changeGamepadHandler(g),
+              })),
+              {
+                label: "Cancel",
+                handler: cancelHandler,
+              },
+            ],
           });
           return false;
         }
diff --git a/src/system/settings/settings-keyboard.ts b/src/system/settings/settings-keyboard.ts
index 95ad4ba41f1..ec5c9ad6b0e 100644
--- a/src/system/settings/settings-keyboard.ts
+++ b/src/system/settings/settings-keyboard.ts
@@ -1,85 +1,85 @@
 import { Button } from "#enums/buttons";
-import { Mode } from "#app/ui/ui";
+import { UiMode } from "#enums/ui-mode";
 import type SettingsKeyboardUiHandler from "#app/ui/settings/settings-keyboard-ui-handler";
 import i18next from "i18next";
 import { globalScene } from "#app/global-scene";
 
 export enum SettingKeyboard {
-    // Default_Layout = "DEFAULT_LAYOUT",
-    Button_Up = "BUTTON_UP",
-    Alt_Button_Up = "ALT_BUTTON_UP",
-    Button_Down = "BUTTON_DOWN",
-    Alt_Button_Down = "ALT_BUTTON_DOWN",
-    Button_Left = "BUTTON_LEFT",
-    Alt_Button_Left = "ALT_BUTTON_LEFT",
-    Button_Right = "BUTTON_RIGHT",
-    Alt_Button_Right = "ALT_BUTTON_RIGHT",
-    Button_Action = "BUTTON_ACTION",
-    Alt_Button_Action = "ALT_BUTTON_ACTION",
-    Button_Cancel = "BUTTON_CANCEL",
-    Alt_Button_Cancel = "ALT_BUTTON_CANCEL",
-    Button_Menu = "BUTTON_MENU",
-    Alt_Button_Menu = "ALT_BUTTON_MENU",
-    Button_Stats = "BUTTON_STATS",
-    Alt_Button_Stats = "ALT_BUTTON_STATS",
-    Button_Cycle_Form = "BUTTON_CYCLE_FORM",
-    Alt_Button_Cycle_Form = "ALT_BUTTON_CYCLE_FORM",
-    Button_Cycle_Shiny = "BUTTON_CYCLE_SHINY",
-    Alt_Button_Cycle_Shiny = "ALT_BUTTON_CYCLE_SHINY",
-    Button_Cycle_Gender = "BUTTON_CYCLE_GENDER",
-    Alt_Button_Cycle_Gender = "ALT_BUTTON_CYCLE_GENDER",
-    Button_Cycle_Ability = "BUTTON_CYCLE_ABILITY",
-    Alt_Button_Cycle_Ability = "ALT_BUTTON_CYCLE_ABILITY",
-    Button_Cycle_Nature = "BUTTON_CYCLE_NATURE",
-    Alt_Button_Cycle_Nature = "ALT_BUTTON_CYCLE_NATURE",
-    Button_Cycle_Variant = "BUTTON_CYCLE_VARIANT",
-    Alt_Button_Cycle_Variant = "ALT_BUTTON_CYCLE_VARIANT",
-    Button_Speed_Up = "BUTTON_SPEED_UP",
-    Alt_Button_Speed_Up = "ALT_BUTTON_SPEED_UP",
-    Button_Slow_Down = "BUTTON_SLOW_DOWN",
-    Alt_Button_Slow_Down = "ALT_BUTTON_SLOW_DOWN",
-    Button_Submit = "BUTTON_SUBMIT",
-    Alt_Button_Submit = "ALT_BUTTON_SUBMIT",
+  // Default_Layout = "DEFAULT_LAYOUT",
+  Button_Up = "BUTTON_UP",
+  Alt_Button_Up = "ALT_BUTTON_UP",
+  Button_Down = "BUTTON_DOWN",
+  Alt_Button_Down = "ALT_BUTTON_DOWN",
+  Button_Left = "BUTTON_LEFT",
+  Alt_Button_Left = "ALT_BUTTON_LEFT",
+  Button_Right = "BUTTON_RIGHT",
+  Alt_Button_Right = "ALT_BUTTON_RIGHT",
+  Button_Action = "BUTTON_ACTION",
+  Alt_Button_Action = "ALT_BUTTON_ACTION",
+  Button_Cancel = "BUTTON_CANCEL",
+  Alt_Button_Cancel = "ALT_BUTTON_CANCEL",
+  Button_Menu = "BUTTON_MENU",
+  Alt_Button_Menu = "ALT_BUTTON_MENU",
+  Button_Stats = "BUTTON_STATS",
+  Alt_Button_Stats = "ALT_BUTTON_STATS",
+  Button_Cycle_Form = "BUTTON_CYCLE_FORM",
+  Alt_Button_Cycle_Form = "ALT_BUTTON_CYCLE_FORM",
+  Button_Cycle_Shiny = "BUTTON_CYCLE_SHINY",
+  Alt_Button_Cycle_Shiny = "ALT_BUTTON_CYCLE_SHINY",
+  Button_Cycle_Gender = "BUTTON_CYCLE_GENDER",
+  Alt_Button_Cycle_Gender = "ALT_BUTTON_CYCLE_GENDER",
+  Button_Cycle_Ability = "BUTTON_CYCLE_ABILITY",
+  Alt_Button_Cycle_Ability = "ALT_BUTTON_CYCLE_ABILITY",
+  Button_Cycle_Nature = "BUTTON_CYCLE_NATURE",
+  Alt_Button_Cycle_Nature = "ALT_BUTTON_CYCLE_NATURE",
+  Button_Cycle_Tera = "BUTTON_CYCLE_TERA",
+  Alt_Button_Cycle_Tera = "ALT_BUTTON_CYCLE_TERA",
+  Button_Speed_Up = "BUTTON_SPEED_UP",
+  Alt_Button_Speed_Up = "ALT_BUTTON_SPEED_UP",
+  Button_Slow_Down = "BUTTON_SLOW_DOWN",
+  Alt_Button_Slow_Down = "ALT_BUTTON_SLOW_DOWN",
+  Button_Submit = "BUTTON_SUBMIT",
+  Alt_Button_Submit = "ALT_BUTTON_SUBMIT",
 }
 
 const pressAction = i18next.t("settings:pressToBind");
 
 export const settingKeyboardOptions = {
   // [SettingKeyboard.Default_Layout]: ['Default'],
-  [SettingKeyboard.Button_Up]: [ `KEY ${Button.UP.toString()}`, pressAction ],
-  [SettingKeyboard.Button_Down]: [ `KEY ${Button.DOWN.toString()}`, pressAction ],
-  [SettingKeyboard.Alt_Button_Up]: [ `KEY ${Button.UP.toString()}`, pressAction ],
-  [SettingKeyboard.Button_Left]: [ `KEY ${Button.LEFT.toString()}`, pressAction ],
-  [SettingKeyboard.Button_Right]: [ `KEY ${Button.RIGHT.toString()}`, pressAction ],
-  [SettingKeyboard.Button_Action]: [ `KEY ${Button.ACTION.toString()}`, pressAction ],
-  [SettingKeyboard.Button_Menu]: [ `KEY ${Button.MENU.toString()}`, pressAction ],
-  [SettingKeyboard.Button_Submit]: [ `KEY ${Button.SUBMIT.toString()}`, pressAction ],
-  [SettingKeyboard.Alt_Button_Down]: [ `KEY ${Button.DOWN.toString()}`, pressAction ],
-  [SettingKeyboard.Alt_Button_Left]: [ `KEY ${Button.LEFT.toString()}`, pressAction ],
-  [SettingKeyboard.Alt_Button_Right]: [ `KEY ${Button.RIGHT.toString()}`, pressAction ],
-  [SettingKeyboard.Alt_Button_Action]: [ `KEY ${Button.ACTION.toString()}`, pressAction ],
-  [SettingKeyboard.Button_Cancel]: [ `KEY ${Button.CANCEL.toString()}`, pressAction ],
-  [SettingKeyboard.Alt_Button_Cancel]: [ `KEY ${Button.CANCEL.toString()}`, pressAction ],
-  [SettingKeyboard.Alt_Button_Menu]: [ `KEY ${Button.MENU.toString()}`, pressAction ],
-  [SettingKeyboard.Button_Stats]: [ `KEY ${Button.STATS.toString()}`, pressAction ],
-  [SettingKeyboard.Alt_Button_Stats]: [ `KEY ${Button.STATS.toString()}`, pressAction ],
-  [SettingKeyboard.Button_Cycle_Form]: [ `KEY ${Button.CYCLE_FORM.toString()}`, pressAction ],
-  [SettingKeyboard.Alt_Button_Cycle_Form]: [ `KEY ${Button.CYCLE_FORM.toString()}`, pressAction ],
-  [SettingKeyboard.Button_Cycle_Shiny]: [ `KEY ${Button.CYCLE_SHINY.toString()}`, pressAction ],
-  [SettingKeyboard.Alt_Button_Cycle_Shiny]: [ `KEY ${Button.CYCLE_SHINY.toString()}`, pressAction ],
-  [SettingKeyboard.Button_Cycle_Gender]: [ `KEY ${Button.CYCLE_GENDER.toString()}`, pressAction ],
-  [SettingKeyboard.Alt_Button_Cycle_Gender]: [ `KEY ${Button.CYCLE_GENDER.toString()}`, pressAction ],
-  [SettingKeyboard.Button_Cycle_Ability]: [ `KEY ${Button.CYCLE_ABILITY.toString()}`, pressAction ],
-  [SettingKeyboard.Alt_Button_Cycle_Ability]: [ `KEY ${Button.CYCLE_ABILITY.toString()}`, pressAction ],
-  [SettingKeyboard.Button_Cycle_Nature]: [ `KEY ${Button.CYCLE_NATURE.toString()}`, pressAction ],
-  [SettingKeyboard.Alt_Button_Cycle_Nature]: [ `KEY ${Button.CYCLE_NATURE.toString()}`, pressAction ],
-  [SettingKeyboard.Button_Cycle_Variant]: [ `KEY ${Button.V.toString()}`, pressAction ],
-  [SettingKeyboard.Alt_Button_Cycle_Variant]: [ `KEY ${Button.V.toString()}`, pressAction ],
-  [SettingKeyboard.Button_Speed_Up]: [ `KEY ${Button.SPEED_UP.toString()}`, pressAction ],
-  [SettingKeyboard.Alt_Button_Speed_Up]: [ `KEY ${Button.SPEED_UP.toString()}`, pressAction ],
-  [SettingKeyboard.Button_Slow_Down]: [ `KEY ${Button.SLOW_DOWN.toString()}`, pressAction ],
-  [SettingKeyboard.Alt_Button_Slow_Down]: [ `KEY ${Button.SLOW_DOWN.toString()}`, pressAction ],
-  [SettingKeyboard.Alt_Button_Submit]: [ `KEY ${Button.SUBMIT.toString()}`, pressAction ],
+  [SettingKeyboard.Button_Up]: [`KEY ${Button.UP.toString()}`, pressAction],
+  [SettingKeyboard.Button_Down]: [`KEY ${Button.DOWN.toString()}`, pressAction],
+  [SettingKeyboard.Alt_Button_Up]: [`KEY ${Button.UP.toString()}`, pressAction],
+  [SettingKeyboard.Button_Left]: [`KEY ${Button.LEFT.toString()}`, pressAction],
+  [SettingKeyboard.Button_Right]: [`KEY ${Button.RIGHT.toString()}`, pressAction],
+  [SettingKeyboard.Button_Action]: [`KEY ${Button.ACTION.toString()}`, pressAction],
+  [SettingKeyboard.Button_Menu]: [`KEY ${Button.MENU.toString()}`, pressAction],
+  [SettingKeyboard.Button_Submit]: [`KEY ${Button.SUBMIT.toString()}`, pressAction],
+  [SettingKeyboard.Alt_Button_Down]: [`KEY ${Button.DOWN.toString()}`, pressAction],
+  [SettingKeyboard.Alt_Button_Left]: [`KEY ${Button.LEFT.toString()}`, pressAction],
+  [SettingKeyboard.Alt_Button_Right]: [`KEY ${Button.RIGHT.toString()}`, pressAction],
+  [SettingKeyboard.Alt_Button_Action]: [`KEY ${Button.ACTION.toString()}`, pressAction],
+  [SettingKeyboard.Button_Cancel]: [`KEY ${Button.CANCEL.toString()}`, pressAction],
+  [SettingKeyboard.Alt_Button_Cancel]: [`KEY ${Button.CANCEL.toString()}`, pressAction],
+  [SettingKeyboard.Alt_Button_Menu]: [`KEY ${Button.MENU.toString()}`, pressAction],
+  [SettingKeyboard.Button_Stats]: [`KEY ${Button.STATS.toString()}`, pressAction],
+  [SettingKeyboard.Alt_Button_Stats]: [`KEY ${Button.STATS.toString()}`, pressAction],
+  [SettingKeyboard.Button_Cycle_Form]: [`KEY ${Button.CYCLE_FORM.toString()}`, pressAction],
+  [SettingKeyboard.Alt_Button_Cycle_Form]: [`KEY ${Button.CYCLE_FORM.toString()}`, pressAction],
+  [SettingKeyboard.Button_Cycle_Shiny]: [`KEY ${Button.CYCLE_SHINY.toString()}`, pressAction],
+  [SettingKeyboard.Alt_Button_Cycle_Shiny]: [`KEY ${Button.CYCLE_SHINY.toString()}`, pressAction],
+  [SettingKeyboard.Button_Cycle_Gender]: [`KEY ${Button.CYCLE_GENDER.toString()}`, pressAction],
+  [SettingKeyboard.Alt_Button_Cycle_Gender]: [`KEY ${Button.CYCLE_GENDER.toString()}`, pressAction],
+  [SettingKeyboard.Button_Cycle_Ability]: [`KEY ${Button.CYCLE_ABILITY.toString()}`, pressAction],
+  [SettingKeyboard.Alt_Button_Cycle_Ability]: [`KEY ${Button.CYCLE_ABILITY.toString()}`, pressAction],
+  [SettingKeyboard.Button_Cycle_Nature]: [`KEY ${Button.CYCLE_NATURE.toString()}`, pressAction],
+  [SettingKeyboard.Alt_Button_Cycle_Nature]: [`KEY ${Button.CYCLE_NATURE.toString()}`, pressAction],
+  [SettingKeyboard.Button_Cycle_Tera]: [`KEY ${Button.CYCLE_TERA.toString()}`, pressAction],
+  [SettingKeyboard.Alt_Button_Cycle_Tera]: [`KEY ${Button.CYCLE_TERA.toString()}`, pressAction],
+  [SettingKeyboard.Button_Speed_Up]: [`KEY ${Button.SPEED_UP.toString()}`, pressAction],
+  [SettingKeyboard.Alt_Button_Speed_Up]: [`KEY ${Button.SPEED_UP.toString()}`, pressAction],
+  [SettingKeyboard.Button_Slow_Down]: [`KEY ${Button.SLOW_DOWN.toString()}`, pressAction],
+  [SettingKeyboard.Alt_Button_Slow_Down]: [`KEY ${Button.SLOW_DOWN.toString()}`, pressAction],
+  [SettingKeyboard.Alt_Button_Submit]: [`KEY ${Button.SUBMIT.toString()}`, pressAction],
 };
 
 export const settingKeyboardDefaults = {
@@ -112,8 +112,8 @@ export const settingKeyboardDefaults = {
   [SettingKeyboard.Alt_Button_Cycle_Ability]: 0,
   [SettingKeyboard.Button_Cycle_Nature]: 0,
   [SettingKeyboard.Alt_Button_Cycle_Nature]: 0,
-  [SettingKeyboard.Button_Cycle_Variant]: 0,
-  [SettingKeyboard.Alt_Button_Cycle_Variant]: 0,
+  [SettingKeyboard.Button_Cycle_Tera]: 0,
+  [SettingKeyboard.Alt_Button_Cycle_Tera]: 0,
   [SettingKeyboard.Button_Speed_Up]: 0,
   [SettingKeyboard.Alt_Button_Speed_Up]: 0,
   [SettingKeyboard.Button_Slow_Down]: 0,
@@ -132,7 +132,6 @@ export const settingKeyboardBlackList = [
   SettingKeyboard.Button_Right,
 ];
 
-
 export function setSettingKeyboard(setting: SettingKeyboard, value: number): boolean {
   switch (setting) {
     case SettingKeyboard.Button_Up:
@@ -148,7 +147,7 @@ export function setSettingKeyboard(setting: SettingKeyboard, value: number): boo
     case SettingKeyboard.Button_Cycle_Gender:
     case SettingKeyboard.Button_Cycle_Ability:
     case SettingKeyboard.Button_Cycle_Nature:
-    case SettingKeyboard.Button_Cycle_Variant:
+    case SettingKeyboard.Button_Cycle_Tera:
     case SettingKeyboard.Button_Speed_Up:
     case SettingKeyboard.Button_Slow_Down:
     case SettingKeyboard.Alt_Button_Up:
@@ -164,18 +163,18 @@ export function setSettingKeyboard(setting: SettingKeyboard, value: number): boo
     case SettingKeyboard.Alt_Button_Cycle_Gender:
     case SettingKeyboard.Alt_Button_Cycle_Ability:
     case SettingKeyboard.Alt_Button_Cycle_Nature:
-    case SettingKeyboard.Alt_Button_Cycle_Variant:
+    case SettingKeyboard.Alt_Button_Cycle_Tera:
     case SettingKeyboard.Alt_Button_Speed_Up:
     case SettingKeyboard.Alt_Button_Slow_Down:
     case SettingKeyboard.Alt_Button_Submit:
       if (value) {
         if (globalScene.ui) {
-          const cancelHandler = (success: boolean = false) : boolean => {
+          const cancelHandler = (success = false): boolean => {
             globalScene.ui.revertMode();
             (globalScene.ui.getHandler() as SettingsKeyboardUiHandler).updateBindings();
             return success;
           };
-          globalScene.ui.setOverlayMode(Mode.KEYBOARD_BINDING, {
+          globalScene.ui.setOverlayMode(UiMode.KEYBOARD_BINDING, {
             target: setting,
             cancelHandler: cancelHandler,
           });
@@ -184,5 +183,4 @@ export function setSettingKeyboard(setting: SettingKeyboard, value: number): boo
       break;
   }
   return true;
-
 }
diff --git a/src/system/settings/settings.ts b/src/system/settings/settings.ts
index b750400d6f5..8bbba267bd6 100644
--- a/src/system/settings/settings.ts
+++ b/src/system/settings/settings.ts
@@ -1,4 +1,4 @@
-import { Mode } from "#app/ui/ui";
+import { UiMode } from "#enums/ui-mode";
 import i18next from "i18next";
 import { globalScene } from "#app/global-scene";
 import { hasTouchscreen } from "#app/touch-controls";
@@ -9,15 +9,19 @@ import { EaseType } from "#enums/ease-type";
 import { MoneyFormat } from "#enums/money-format";
 import { PlayerGender } from "#enums/player-gender";
 import { ShopCursorTarget } from "#enums/shop-cursor-target";
-import { isLocal } from "#app/utils";
+import { isLocal } from "#app/utils/common";
 
-const VOLUME_OPTIONS: SettingOption[] = new Array(11).fill(null).map((_, i) => i ? {
-  value: (i * 10).toString(),
-  label: (i * 10).toString(),
-} : {
-  value: "Mute",
-  label: i18next.t("settings:mute")
-});
+const VOLUME_OPTIONS: SettingOption[] = new Array(11).fill(null).map((_, i) =>
+  i
+    ? {
+        value: (i * 10).toString(),
+        label: (i * 10).toString(),
+      }
+    : {
+        value: "Mute",
+        label: i18next.t("settings:mute"),
+      },
+);
 
 const SHOP_OVERLAY_OPACITY_OPTIONS: SettingOption[] = new Array(9).fill(null).map((_, i) => {
   const value = ((i + 1) * 10).toString();
@@ -30,55 +34,55 @@ const SHOP_OVERLAY_OPACITY_OPTIONS: SettingOption[] = new Array(9).fill(null).ma
 const OFF_ON: SettingOption[] = [
   {
     value: "Off",
-    label: i18next.t("settings:off")
+    label: i18next.t("settings:off"),
   },
   {
     value: "On",
-    label: i18next.t("settings:on")
-  }
+    label: i18next.t("settings:on"),
+  },
 ];
 
 const AUTO_DISABLED: SettingOption[] = [
   {
     value: "Auto",
-    label: i18next.t("settings:auto")
+    label: i18next.t("settings:auto"),
   },
   {
     value: "Disabled",
-    label: i18next.t("settings:disabled")
-  }
+    label: i18next.t("settings:disabled"),
+  },
 ];
 
 const TOUCH_CONTROLS_OPTIONS: SettingOption[] = [
   {
     value: "Auto",
-    label: i18next.t("settings:auto")
+    label: i18next.t("settings:auto"),
   },
   {
     value: "Disabled",
     label: i18next.t("settings:disabled"),
     needConfirmation: true,
-    confirmationMessage: i18next.t("settings:confirmDisableTouch")
-  }
+    confirmationMessage: i18next.t("settings:confirmDisableTouch"),
+  },
 ];
 
 const SHOP_CURSOR_TARGET_OPTIONS: SettingOption[] = [
   {
     value: "Rewards",
-    label: i18next.t("settings:rewards")
+    label: i18next.t("settings:rewards"),
   },
   {
     value: "Shop",
-    label: i18next.t("settings:shop")
+    label: i18next.t("settings:shop"),
   },
   {
     value: "Reroll",
-    label: i18next.t("settings:reroll")
+    label: i18next.t("settings:reroll"),
   },
   {
     value: "Check Team",
-    label: i18next.t("settings:checkTeam")
-  }
+    label: i18next.t("settings:checkTeam"),
+  },
 ];
 
 const shopCursorTargetIndexMap = SHOP_CURSOR_TARGET_OPTIONS.map(option => {
@@ -102,27 +106,27 @@ const shopCursorTargetIndexMap = SHOP_CURSOR_TARGET_OPTIONS.map(option => {
 export enum SettingType {
   GENERAL,
   DISPLAY,
-  AUDIO
+  AUDIO,
 }
 
 type SettingOption = {
-  value: string,
-  label: string,
-  needConfirmation?: boolean,
-  confirmationMessage?: string
+  value: string;
+  label: string;
+  needConfirmation?: boolean;
+  confirmationMessage?: string;
 };
 
 export interface Setting {
-  key: string
-  label: string
-  options: SettingOption[]
-  default: number
-  type: SettingType
-  requireReload?: boolean
+  key: string;
+  label: string;
+  options: SettingOption[];
+  default: number;
+  type: SettingType;
+  requireReload?: boolean;
   /** Whether the setting can be activated or not */
-  activatable?: boolean
+  activatable?: boolean;
   /** Determines whether the setting should be hidden from the UI */
-  isHidden?: () => boolean
+  isHidden?: () => boolean;
 }
 
 /**
@@ -171,12 +175,12 @@ export const SettingKeys = {
   Battle_Music: "BATTLE_MUSIC",
   Show_BGM_Bar: "SHOW_BGM_BAR",
   Move_Touch_Controls: "MOVE_TOUCH_CONTROLS",
-  Shop_Overlay_Opacity: "SHOP_OVERLAY_OPACITY"
+  Shop_Overlay_Opacity: "SHOP_OVERLAY_OPACITY",
 };
 
 export enum MusicPreference {
   GENFIVE,
-  ALLGENS
+  ALLGENS,
 }
 
 /**
@@ -189,39 +193,39 @@ export const Setting: Array<Setting> = [
     options: [
       {
         value: "1",
-        label: "1x"
+        label: "1x",
       },
       {
         value: "1.25",
-        label: "1.25x"
+        label: "1.25x",
       },
       {
         value: "1.5",
-        label: "1.5x"
+        label: "1.5x",
       },
       {
         value: "2",
-        label: "2x"
+        label: "2x",
       },
       {
         value: "2.5",
-        label: "2.5x"
+        label: "2.5x",
       },
       {
         value: "3",
-        label: "3x"
+        label: "3x",
       },
       {
         value: "4",
-        label: "4x"
+        label: "4x",
       },
       {
         value: "5",
-        label: "5x"
-      }
+        label: "5x",
+      },
     ],
     default: 3,
-    type: SettingType.GENERAL
+    type: SettingType.GENERAL,
   },
   {
     key: SettingKeys.HP_Bar_Speed,
@@ -229,23 +233,23 @@ export const Setting: Array<Setting> = [
     options: [
       {
         value: "Normal",
-        label: i18next.t("settings:normal")
+        label: i18next.t("settings:normal"),
       },
       {
         value: "Fast",
-        label: i18next.t("settings:fast")
+        label: i18next.t("settings:fast"),
       },
       {
         value: "Faster",
-        label: i18next.t("settings:faster")
+        label: i18next.t("settings:faster"),
       },
       {
         value: "Skip",
-        label: i18next.t("settings:skip")
-      }
+        label: i18next.t("settings:skip"),
+      },
     ],
     default: 0,
-    type: SettingType.GENERAL
+    type: SettingType.GENERAL,
   },
   {
     key: SettingKeys.EXP_Gains_Speed,
@@ -253,23 +257,23 @@ export const Setting: Array<Setting> = [
     options: [
       {
         value: "Normal",
-        label: i18next.t("settings:normal")
+        label: i18next.t("settings:normal"),
       },
       {
         value: "Fast",
-        label: i18next.t("settings:fast")
+        label: i18next.t("settings:fast"),
       },
       {
         value: "Faster",
-        label: i18next.t("settings:faster")
+        label: i18next.t("settings:faster"),
       },
       {
         value: "Skip",
-        label: i18next.t("settings:skip")
-      }
+        label: i18next.t("settings:skip"),
+      },
     ],
     default: 0,
-    type: SettingType.GENERAL
+    type: SettingType.GENERAL,
   },
   {
     key: SettingKeys.EXP_Party_Display,
@@ -277,26 +281,26 @@ export const Setting: Array<Setting> = [
     options: [
       {
         value: "Normal",
-        label: i18next.t("settings:normal")
+        label: i18next.t("settings:normal"),
       },
       {
         value: "Level Up Notification",
-        label: i18next.t("settings:levelUpNotifications")
+        label: i18next.t("settings:levelUpNotifications"),
       },
       {
         value: "Skip",
-        label: i18next.t("settings:skip")
-      }
+        label: i18next.t("settings:skip"),
+      },
     ],
     default: 0,
-    type: SettingType.GENERAL
+    type: SettingType.GENERAL,
   },
   {
     key: SettingKeys.Skip_Seen_Dialogues,
     label: i18next.t("settings:skipSeenDialogues"),
     options: OFF_ON,
     default: 0,
-    type: SettingType.GENERAL
+    type: SettingType.GENERAL,
   },
   {
     key: SettingKeys.Egg_Skip,
@@ -304,19 +308,19 @@ export const Setting: Array<Setting> = [
     options: [
       {
         value: "Never",
-        label: i18next.t("settings:never")
+        label: i18next.t("settings:never"),
       },
       {
         value: "Ask",
-        label: i18next.t("settings:ask")
+        label: i18next.t("settings:ask"),
       },
       {
         value: "Always",
-        label: i18next.t("settings:always")
-      }
+        label: i18next.t("settings:always"),
+      },
     ],
     default: 1,
-    type: SettingType.GENERAL
+    type: SettingType.GENERAL,
   },
   {
     key: SettingKeys.Battle_Style,
@@ -324,50 +328,50 @@ export const Setting: Array<Setting> = [
     options: [
       {
         value: "Switch",
-        label: i18next.t("settings:switch")
+        label: i18next.t("settings:switch"),
       },
       {
         value: "Set",
-        label: i18next.t("settings:set")
-      }
+        label: i18next.t("settings:set"),
+      },
     ],
     default: 0,
-    type: SettingType.GENERAL
+    type: SettingType.GENERAL,
   },
   {
     key: SettingKeys.Command_Cursor_Memory,
     label: i18next.t("settings:commandCursorMemory"),
     options: OFF_ON,
     default: 0,
-    type: SettingType.GENERAL
+    type: SettingType.GENERAL,
   },
   {
     key: SettingKeys.Enable_Retries,
     label: i18next.t("settings:enableRetries"),
     options: OFF_ON,
     default: 0,
-    type: SettingType.GENERAL
+    type: SettingType.GENERAL,
   },
   {
     key: SettingKeys.Hide_IVs,
     label: i18next.t("settings:hideIvs"),
     options: OFF_ON,
     default: 0,
-    type: SettingType.GENERAL
+    type: SettingType.GENERAL,
   },
   {
     key: SettingKeys.Tutorials,
     label: i18next.t("settings:tutorials"),
     options: OFF_ON,
     default: 1,
-    type: SettingType.GENERAL
+    type: SettingType.GENERAL,
   },
   {
     key: SettingKeys.Vibration,
     label: i18next.t("settings:vibrations"),
     options: AUTO_DISABLED,
     default: 0,
-    type: SettingType.GENERAL
+    type: SettingType.GENERAL,
   },
   {
     key: SettingKeys.Touch_Controls,
@@ -375,7 +379,7 @@ export const Setting: Array<Setting> = [
     options: TOUCH_CONTROLS_OPTIONS,
     default: 0,
     type: SettingType.GENERAL,
-    isHidden: () => !hasTouchscreen()
+    isHidden: () => !hasTouchscreen(),
   },
   {
     key: SettingKeys.Move_Touch_Controls,
@@ -383,13 +387,13 @@ export const Setting: Array<Setting> = [
     options: [
       {
         value: "Configure",
-        label: i18next.t("settings:change")
-      }
+        label: i18next.t("settings:change"),
+      },
     ],
     default: 0,
     type: SettingType.GENERAL,
     activatable: true,
-    isHidden: () => !hasTouchscreen()
+    isHidden: () => !hasTouchscreen(),
   },
   {
     key: SettingKeys.Language,
@@ -397,16 +401,16 @@ export const Setting: Array<Setting> = [
     options: [
       {
         value: "English",
-        label: "English"
+        label: "English",
       },
       {
         value: "Change",
-        label: i18next.t("settings:change")
-      }
+        label: i18next.t("settings:change"),
+      },
     ],
     default: 0,
     type: SettingType.DISPLAY,
-    requireReload: true
+    requireReload: true,
   },
   {
     key: SettingKeys.UI_Theme,
@@ -414,16 +418,16 @@ export const Setting: Array<Setting> = [
     options: [
       {
         value: "Default",
-        label: i18next.t("settings:default")
+        label: i18next.t("settings:default"),
       },
       {
         value: "Legacy",
-        label: i18next.t("settings:legacy")
-      }
+        label: i18next.t("settings:legacy"),
+      },
     ],
     default: 0,
     type: SettingType.DISPLAY,
-    requireReload: true
+    requireReload: true,
   },
   {
     key: SettingKeys.Window_Type,
@@ -432,11 +436,11 @@ export const Setting: Array<Setting> = [
       const windowType = (i + 1).toString();
       return {
         value: windowType,
-        label: windowType
+        label: windowType,
       };
     }),
     default: 0,
-    type: SettingType.DISPLAY
+    type: SettingType.DISPLAY,
   },
   {
     key: SettingKeys.Money_Format,
@@ -444,15 +448,15 @@ export const Setting: Array<Setting> = [
     options: [
       {
         value: "Normal",
-        label: i18next.t("settings:normal")
+        label: i18next.t("settings:normal"),
       },
       {
         value: "Abbreviated",
-        label: i18next.t("settings:abbreviated")
-      }
+        label: i18next.t("settings:abbreviated"),
+      },
     ],
     default: 0,
-    type: SettingType.DISPLAY
+    type: SettingType.DISPLAY,
   },
   {
     key: SettingKeys.Damage_Numbers,
@@ -460,33 +464,33 @@ export const Setting: Array<Setting> = [
     options: [
       {
         value: "Off",
-        label: i18next.t("settings:off")
+        label: i18next.t("settings:off"),
       },
       {
         value: "Simple",
-        label: i18next.t("settings:simple")
+        label: i18next.t("settings:simple"),
       },
       {
         value: "Fancy",
-        label: i18next.t("settings:fancy")
-      }
+        label: i18next.t("settings:fancy"),
+      },
     ],
     default: 0,
-    type: SettingType.DISPLAY
+    type: SettingType.DISPLAY,
   },
   {
     key: SettingKeys.Move_Animations,
     label: i18next.t("settings:moveAnimations"),
     options: OFF_ON,
     default: 1,
-    type: SettingType.DISPLAY
+    type: SettingType.DISPLAY,
   },
   {
     key: SettingKeys.Show_Stats_on_Level_Up,
     label: i18next.t("settings:showStatsOnLevelUp"),
     options: OFF_ON,
     default: 1,
-    type: SettingType.DISPLAY
+    type: SettingType.DISPLAY,
   },
   {
     key: SettingKeys.Candy_Upgrade_Notification,
@@ -494,19 +498,19 @@ export const Setting: Array<Setting> = [
     options: [
       {
         value: "Off",
-        label: i18next.t("settings:off")
+        label: i18next.t("settings:off"),
       },
       {
         value: "Passives Only",
-        label: i18next.t("settings:passivesOnly")
+        label: i18next.t("settings:passivesOnly"),
       },
       {
         value: "On",
-        label: i18next.t("settings:on")
-      }
+        label: i18next.t("settings:on"),
+      },
     ],
     default: 0,
-    type: SettingType.DISPLAY
+    type: SettingType.DISPLAY,
   },
   {
     key: SettingKeys.Candy_Upgrade_Display,
@@ -514,37 +518,37 @@ export const Setting: Array<Setting> = [
     options: [
       {
         value: "Icon",
-        label: i18next.t("settings:icon")
+        label: i18next.t("settings:icon"),
       },
       {
         value: "Animation",
-        label: i18next.t("settings:animation")
-      }
+        label: i18next.t("settings:animation"),
+      },
     ],
     default: 0,
     type: SettingType.DISPLAY,
-    requireReload: true
+    requireReload: true,
   },
   {
     key: SettingKeys.Move_Info,
     label: i18next.t("settings:moveInfo"),
     options: OFF_ON,
     default: 1,
-    type: SettingType.DISPLAY
+    type: SettingType.DISPLAY,
   },
   {
     key: SettingKeys.Show_Moveset_Flyout,
     label: i18next.t("settings:showMovesetFlyout"),
     options: OFF_ON,
     default: 1,
-    type: SettingType.DISPLAY
+    type: SettingType.DISPLAY,
   },
   {
     key: SettingKeys.Show_Arena_Flyout,
     label: i18next.t("settings:showArenaFlyout"),
     options: OFF_ON,
     default: 1,
-    type: SettingType.DISPLAY
+    type: SettingType.DISPLAY,
   },
   {
     key: SettingKeys.Show_Time_Of_Day_Widget,
@@ -560,15 +564,15 @@ export const Setting: Array<Setting> = [
     options: [
       {
         value: "Bounce",
-        label: i18next.t("settings:bounce")
+        label: i18next.t("settings:bounce"),
       },
       {
         value: "Back",
-        label: i18next.t("settings:timeOfDay_back")
-      }
+        label: i18next.t("settings:timeOfDay_back"),
+      },
     ],
     default: 0,
-    type: SettingType.DISPLAY
+    type: SettingType.DISPLAY,
   },
   {
     key: SettingKeys.Sprite_Set,
@@ -576,23 +580,23 @@ export const Setting: Array<Setting> = [
     options: [
       {
         value: "Consistent",
-        label: i18next.t("settings:consistent")
+        label: i18next.t("settings:consistent"),
       },
       {
         value: "Experimental",
-        label: i18next.t("settings:experimental")
-      }
+        label: i18next.t("settings:experimental"),
+      },
     ],
     default: 0,
     type: SettingType.DISPLAY,
-    requireReload: true
+    requireReload: true,
   },
   {
     key: SettingKeys.Fusion_Palette_Swaps,
     label: i18next.t("settings:fusionPaletteSwaps"),
     options: OFF_ON,
     default: 1,
-    type: SettingType.DISPLAY
+    type: SettingType.DISPLAY,
   },
   {
     key: SettingKeys.Player_Gender,
@@ -600,64 +604,64 @@ export const Setting: Array<Setting> = [
     options: [
       {
         value: "Boy",
-        label: i18next.t("settings:boy")
+        label: i18next.t("settings:boy"),
       },
       {
         value: "Girl",
-        label: i18next.t("settings:girl")
-      }
+        label: i18next.t("settings:girl"),
+      },
     ],
     default: 0,
-    type: SettingType.DISPLAY
+    type: SettingType.DISPLAY,
   },
   {
     key: SettingKeys.Type_Hints,
     label: i18next.t("settings:typeHints"),
     options: OFF_ON,
     default: 0,
-    type: SettingType.DISPLAY
+    type: SettingType.DISPLAY,
   },
   {
     key: SettingKeys.Show_BGM_Bar,
     label: i18next.t("settings:showBgmBar"),
     options: OFF_ON,
     default: 1,
-    type: SettingType.DISPLAY
+    type: SettingType.DISPLAY,
   },
   {
     key: SettingKeys.Master_Volume,
     label: i18next.t("settings:masterVolume"),
     options: VOLUME_OPTIONS,
     default: 5,
-    type: SettingType.AUDIO
+    type: SettingType.AUDIO,
   },
   {
     key: SettingKeys.BGM_Volume,
     label: i18next.t("settings:bgmVolume"),
     options: VOLUME_OPTIONS,
     default: 10,
-    type: SettingType.AUDIO
+    type: SettingType.AUDIO,
   },
   {
     key: SettingKeys.Field_Volume,
     label: i18next.t("settings:fieldVolume"),
     options: VOLUME_OPTIONS,
     default: 10,
-    type: SettingType.AUDIO
+    type: SettingType.AUDIO,
   },
   {
     key: SettingKeys.SE_Volume,
     label: i18next.t("settings:seVolume"),
     options: VOLUME_OPTIONS,
     default: 10,
-    type: SettingType.AUDIO
+    type: SettingType.AUDIO,
   },
   {
     key: SettingKeys.UI_Volume,
     label: i18next.t("settings:uiVolume"),
     options: VOLUME_OPTIONS,
     default: 10,
-    type: SettingType.AUDIO
+    type: SettingType.AUDIO,
   },
   {
     key: SettingKeys.Battle_Music,
@@ -665,23 +669,23 @@ export const Setting: Array<Setting> = [
     options: [
       {
         value: "Gen V",
-        label: i18next.t("settings:musicGenFive")
+        label: i18next.t("settings:musicGenFive"),
       },
       {
         value: "All Gens",
-        label: i18next.t("settings:musicAllGens")
-      }
+        label: i18next.t("settings:musicAllGens"),
+      },
     ],
     default: MusicPreference.ALLGENS,
     type: SettingType.AUDIO,
-    requireReload: true
+    requireReload: true,
   },
   {
     key: SettingKeys.Shop_Cursor_Target,
     label: i18next.t("settings:shopCursorTarget"),
     options: SHOP_CURSOR_TARGET_OPTIONS,
     default: 0,
-    type: SettingType.DISPLAY
+    type: SettingType.DISPLAY,
   },
   {
     key: SettingKeys.Shop_Overlay_Opacity,
@@ -689,8 +693,8 @@ export const Setting: Array<Setting> = [
     options: SHOP_OVERLAY_OPACITY_OPTIONS,
     default: 7,
     type: SettingType.DISPLAY,
-    requireReload: false
-  }
+    requireReload: false,
+  },
 ];
 
 if (isLocal) {
@@ -699,7 +703,7 @@ if (isLocal) {
     label: i18next.t("settings:dexForDevs"),
     options: OFF_ON,
     default: 0,
-    type: SettingType.GENERAL
+    type: SettingType.GENERAL,
   });
 }
 
@@ -716,7 +720,9 @@ export function settingIndex(key: string) {
  * Resets all settings to their defaults
  */
 export function resetSettings() {
-  Setting.forEach(s => setSetting(s.key, s.default));
+  for (const s of Setting) {
+    setSetting(s.key, s.default);
+  }
 }
 
 /**
@@ -732,26 +738,26 @@ export function setSetting(setting: string, value: number): boolean {
   }
   switch (Setting[index].key) {
     case SettingKeys.Game_Speed:
-      globalScene.gameSpeed = parseFloat(Setting[index].options[value].value.replace("x", ""));
+      globalScene.gameSpeed = Number.parseFloat(Setting[index].options[value].value.replace("x", ""));
       break;
     case SettingKeys.Master_Volume:
-      globalScene.masterVolume = value ? parseInt(Setting[index].options[value].value) * 0.01 : 0;
+      globalScene.masterVolume = value ? Number.parseInt(Setting[index].options[value].value) * 0.01 : 0;
       globalScene.updateSoundVolume();
       break;
     case SettingKeys.BGM_Volume:
-      globalScene.bgmVolume = value ? parseInt(Setting[index].options[value].value) * 0.01 : 0;
+      globalScene.bgmVolume = value ? Number.parseInt(Setting[index].options[value].value) * 0.01 : 0;
       globalScene.updateSoundVolume();
       break;
     case SettingKeys.Field_Volume:
-      globalScene.fieldVolume = value ? parseInt(Setting[index].options[value].value) * 0.01 : 0;
+      globalScene.fieldVolume = value ? Number.parseInt(Setting[index].options[value].value) * 0.01 : 0;
       globalScene.updateSoundVolume();
       break;
     case SettingKeys.SE_Volume:
-      globalScene.seVolume = value ? parseInt(Setting[index].options[value].value) * 0.01 : 0;
+      globalScene.seVolume = value ? Number.parseInt(Setting[index].options[value].value) * 0.01 : 0;
       globalScene.updateSoundVolume();
       break;
     case SettingKeys.UI_Volume:
-      globalScene.uiVolume = value ? parseInt(Setting[index].options[value].value) * 0.01 : 0;
+      globalScene.uiVolume = value ? Number.parseInt(Setting[index].options[value].value) * 0.01 : 0;
       break;
     case SettingKeys.Battle_Music:
       globalScene.musicPreference = value;
@@ -763,7 +769,7 @@ export function setSetting(setting: string, value: number): boolean {
       globalScene.uiTheme = value;
       break;
     case SettingKeys.Window_Type:
-      updateWindowType(parseInt(Setting[index].options[value].value));
+      updateWindowType(Number.parseInt(Setting[index].options[value].value));
       break;
     case SettingKeys.Tutorials:
       globalScene.enableTutorials = Setting[index].options[value].value === "On";
@@ -798,6 +804,7 @@ export function setSetting(setting: string, value: number): boolean {
       break;
     case SettingKeys.Candy_Upgrade_Display:
       globalScene.candyUpgradeDisplay = value;
+      break;
     case SettingKeys.Money_Format:
       switch (Setting[index].options[value].value) {
         case "Normal":
@@ -828,15 +835,17 @@ export function setSetting(setting: string, value: number): boolean {
       globalScene.showTimeOfDayWidget = Setting[index].options[value].value === "On";
       break;
     case SettingKeys.Time_Of_Day_Animation:
-      globalScene.timeOfDayAnimation = Setting[index].options[value].value === "Bounce" ? EaseType.BOUNCE : EaseType.BACK;
+      globalScene.timeOfDayAnimation =
+        Setting[index].options[value].value === "Bounce" ? EaseType.BOUNCE : EaseType.BACK;
       break;
     case SettingKeys.Show_Stats_on_Level_Up:
       globalScene.showLevelUpStats = Setting[index].options[value].value === "On";
       break;
-    case SettingKeys.Shop_Cursor_Target:
+    case SettingKeys.Shop_Cursor_Target: {
       const selectedValue = shopCursorTargetIndexMap[value];
       globalScene.shopCursorTarget = selectedValue;
       break;
+    }
     case SettingKeys.Command_Cursor_Memory:
       globalScene.commandCursorMemory = Setting[index].options[value].value === "On";
       break;
@@ -864,13 +873,14 @@ export function setSetting(setting: string, value: number): boolean {
         return false;
       }
       break;
-    case SettingKeys.Touch_Controls:
+    case SettingKeys.Touch_Controls: {
       globalScene.enableTouchControls = Setting[index].options[value].value !== "Disabled" && hasTouchscreen();
       const touchControls = document.getElementById("touchControls");
       if (touchControls) {
         touchControls.classList.toggle("visible", globalScene.enableTouchControls);
       }
       break;
+    }
     case SettingKeys.Vibration:
       globalScene.enableVibration = Setting[index].options[value].value !== "Disabled" && hasTouchscreen();
       break;
@@ -897,65 +907,69 @@ export function setSetting(setting: string, value: number): boolean {
               return false;
             }
           };
-          globalScene.ui.setOverlayMode(Mode.OPTION_SELECT, {
+          globalScene.ui.setOverlayMode(UiMode.OPTION_SELECT, {
             options: [
               {
                 label: "English",
-                handler: () => changeLocaleHandler("en")
+                handler: () => changeLocaleHandler("en"),
               },
               {
                 label: "Español (ES)",
-                handler: () => changeLocaleHandler("es-ES")
+                handler: () => changeLocaleHandler("es-ES"),
+              },
+              {
+                label: "Español (LATAM)",
+                handler: () => changeLocaleHandler("es-MX"),
               },
               {
                 label: "Italiano",
-                handler: () => changeLocaleHandler("it")
+                handler: () => changeLocaleHandler("it"),
               },
               {
                 label: "Français",
-                handler: () => changeLocaleHandler("fr")
+                handler: () => changeLocaleHandler("fr"),
               },
               {
                 label: "Deutsch",
-                handler: () => changeLocaleHandler("de")
+                handler: () => changeLocaleHandler("de"),
               },
               {
                 label: "Português (BR)",
-                handler: () => changeLocaleHandler("pt-BR")
+                handler: () => changeLocaleHandler("pt-BR"),
               },
               {
                 label: "简体中文",
-                handler: () => changeLocaleHandler("zh-CN")
+                handler: () => changeLocaleHandler("zh-CN"),
               },
               {
                 label: "繁體中文",
-                handler: () => changeLocaleHandler("zh-TW")
+                handler: () => changeLocaleHandler("zh-TW"),
               },
               {
                 label: "한국어",
-                handler: () => changeLocaleHandler("ko")
+                handler: () => changeLocaleHandler("ko"),
               },
               {
                 label: "日本語",
-                handler: () => changeLocaleHandler("ja")
+                handler: () => changeLocaleHandler("ja"),
+              },
+              {
+                label: "Català",
+                handler: () => changeLocaleHandler("ca-ES"),
               },
-              // {
-              //   label: "Català",
-              //   handler: () => changeLocaleHandler("ca-ES")
-              // },
               {
                 label: i18next.t("settings:back"),
-                handler: () => cancelHandler()
-              }
+                handler: () => cancelHandler(),
+              },
             ],
-            maxOptions: 7
+            maxOptions: 7,
           });
           return false;
         }
       }
       break;
     case SettingKeys.Shop_Overlay_Opacity:
-      globalScene.updateShopOverlayOpacity(parseInt(Setting[index].options[value].value) * .01);
+      globalScene.updateShopOverlayOpacity(Number.parseInt(Setting[index].options[value].value) * 0.01);
       break;
   }
 
diff --git a/src/system/trainer-data.ts b/src/system/trainer-data.ts
index 134d16e25ef..0e6298309bc 100644
--- a/src/system/trainer-data.ts
+++ b/src/system/trainer-data.ts
@@ -5,19 +5,23 @@ export default class TrainerData {
   public trainerType: TrainerType;
   public variant: TrainerVariant;
   public partyTemplateIndex: number;
-  public name: string;
-  public partnerName: string;
+  public nameKey: string;
+  public partnerNameKey: string | undefined;
 
   constructor(source: Trainer | any) {
-    const sourceTrainer = source instanceof Trainer ? source as Trainer : null;
+    const sourceTrainer = source instanceof Trainer ? (source as Trainer) : null;
     this.trainerType = sourceTrainer ? sourceTrainer.config.trainerType : source.trainerType;
-    this.variant = source.hasOwnProperty("variant") ? source.variant : source.female ? TrainerVariant.FEMALE : TrainerVariant.DEFAULT;
+    this.variant = source.hasOwnProperty("variant")
+      ? source.variant
+      : source.female
+        ? TrainerVariant.FEMALE
+        : TrainerVariant.DEFAULT;
     this.partyTemplateIndex = source.partyMemberTemplateIndex;
-    this.name = source.name;
-    this.partnerName = source.partnerName;
+    this.nameKey = source.nameKey;
+    this.partnerNameKey = source.partnerNameKey;
   }
 
   toTrainer(): Trainer {
-    return new Trainer(this.trainerType, this.variant, this.partyTemplateIndex, this.name, this.partnerName);
+    return new Trainer(this.trainerType, this.variant, this.partyTemplateIndex, this.nameKey, this.partnerNameKey);
   }
 }
diff --git a/src/system/unlockables.ts b/src/system/unlockables.ts
index 0a666e2c755..2c396aad1f9 100644
--- a/src/system/unlockables.ts
+++ b/src/system/unlockables.ts
@@ -5,7 +5,7 @@ export enum Unlockables {
   ENDLESS_MODE,
   MINI_BLACK_HOLE,
   SPLICED_ENDLESS_MODE,
-  EVIOLITE
+  EVIOLITE,
 }
 
 export function getUnlockableName(unlockable: Unlockables) {
diff --git a/src/system/version_migration/version_converter.ts b/src/system/version_migration/version_converter.ts
index aee84805143..798115e0395 100644
--- a/src/system/version_migration/version_converter.ts
+++ b/src/system/version_migration/version_converter.ts
@@ -1,13 +1,112 @@
-import type { SessionSaveData, SystemSaveData } from "../game-data";
+import type { SessionSaveMigrator } from "#app/@types/SessionSaveMigrator";
+import type { SettingsSaveMigrator } from "#app/@types/SettingsSaveMigrator";
+import type { SystemSaveMigrator } from "#app/@types/SystemSaveMigrator";
+import type { SessionSaveData, SystemSaveData } from "#app/system/game-data";
+import { compareVersions } from "compare-versions";
 import { version } from "../../../package.json";
 
+/*
+// template for save migrator creation
+// versions/vA_B_C.ts
+
+// The version for each migrator should match the filename, ie: `vA_B_C.ts` -> `version: "A.B.C"
+// This is the target version (aka the version we're ending up on after the migrators are run)
+
+// The name for each migrator should match its purpose. For example, if you're fixing
+// the ability index of a pokemon, it might be called `migratePokemonAbilityIndex`
+
+const systemMigratorA: SystemSaveMigrator = {
+  version: "A.B.C",
+  migrate: (data: SystemSaveData): void => {
+    // migration code goes here
+  },
+};
+
+export const systemMigrators: Readonly<SystemSaveMigrator[]> = [systemMigratorA] as const;
+
+const sessionMigratorA: SessionSaveMigrator = {
+  version: "A.B.C",
+  migrate: (data: SessionSaveData): void => {
+    // migration code goes here
+  },
+};
+
+export const sessionMigrators: Readonly<SessionSaveMigrator[]> = [sessionMigratorA] as const;
+
+const settingsMigratorA: SettingsSaveMigrator = {
+  version: "A.B.C",
+  // biome-ignore lint/complexity/noBannedTypes: TODO - refactor settings
+  migrate: (data: Object): void => {
+    // migration code goes here
+  },
+};
+
+export const settingsMigrators: Readonly<SettingsSaveMigrator[]> = [settingsMigratorA] as const;
+*/
+
+// --- vA.B.C PATCHES --- //
+// import * as vA_B_C from "./versions/vA_B_C";
+
 // --- v1.0.4 (and below) PATCHES --- //
+// biome-ignore lint/style/noNamespaceImport: Convenience (TODO: make this a file-wide ignore when Biome supports those)
 import * as v1_0_4 from "./versions/v1_0_4";
 
-// --- v1.1.0 PATCHES --- //
-import * as v1_1_0 from "./versions/v1_1_0";
+// --- v1.7.0 PATCHES --- //
+// biome-ignore lint/style/noNamespaceImport: Convenience
+import * as v1_7_0 from "./versions/v1_7_0";
 
-const LATEST_VERSION = version.split(".").map(value => parseInt(value));
+// --- v1.8.3 PATCHES --- //
+// biome-ignore lint/style/noNamespaceImport: Convenience
+import * as v1_8_3 from "./versions/v1_8_3";
+
+// --- v1.9.0 PATCHES --- //
+// biome-ignore lint/style/noNamespaceImport: Convenience
+import * as v1_9_0 from "./versions/v1_9_0";
+
+/** Current game version */
+const LATEST_VERSION = version;
+
+type SaveMigrator = SystemSaveMigrator | SessionSaveMigrator | SettingsSaveMigrator;
+
+// biome-ignore lint/complexity/noBannedTypes: TODO - refactor settings
+type SaveData = SystemSaveData | SessionSaveData | Object;
+
+// To add a new set of migrators, create a new `.push()` line like so:
+// `systemMigrators.push(...vA_B_C.systemMigrators);`
+
+/** All system save migrators */
+const systemMigrators: SystemSaveMigrator[] = [];
+systemMigrators.push(...v1_0_4.systemMigrators);
+systemMigrators.push(...v1_7_0.systemMigrators);
+systemMigrators.push(...v1_8_3.systemMigrators);
+
+/** All session save migrators */
+const sessionMigrators: SessionSaveMigrator[] = [];
+sessionMigrators.push(...v1_0_4.sessionMigrators);
+sessionMigrators.push(...v1_7_0.sessionMigrators);
+sessionMigrators.push(...v1_9_0.sessionMigrators);
+
+/** All settings migrators */
+const settingsMigrators: SettingsSaveMigrator[] = [];
+settingsMigrators.push(...v1_0_4.settingsMigrators);
+
+/** Sorts migrators by their stated version, ensuring they are applied in order from oldest to newest */
+const sortMigrators = (migrators: SaveMigrator[]): void => {
+  migrators.sort((a, b) => compareVersions(a.version, b.version));
+};
+
+sortMigrators(systemMigrators);
+sortMigrators(sessionMigrators);
+sortMigrators(settingsMigrators);
+
+const applyMigrators = (migrators: readonly SaveMigrator[], data: SaveData, saveVersion: string) => {
+  for (const migrator of migrators) {
+    const isMigratorVersionHigher = compareVersions(saveVersion, migrator.version) === -1;
+    if (isMigratorVersionHigher) {
+      migrator.migrate(data as any);
+    }
+  }
+};
 
 /**
  * Converts incoming {@linkcode SystemSaveData} that has a version below the
@@ -20,12 +119,12 @@ const LATEST_VERSION = version.split(".").map(value => parseInt(value));
  * @see {@link SystemVersionConverter}
  */
 export function applySystemVersionMigration(data: SystemSaveData) {
-  const curVersion = data.gameVersion.split(".").map(value => parseInt(value));
+  const prevVersion = data.gameVersion;
+  const isCurrentVersionHigher = compareVersions(prevVersion, LATEST_VERSION) === -1;
 
-  if (!curVersion.every((value, index) => value === LATEST_VERSION[index])) {
-    const converter = new SystemVersionConverter();
-    converter.applyStaticPreprocessors(data);
-    converter.applyMigration(data, curVersion);
+  if (isCurrentVersionHigher) {
+    applyMigrators(systemMigrators, data, prevVersion);
+    console.log(`System data successfully migrated to v${LATEST_VERSION}!`);
   }
 }
 
@@ -40,12 +139,15 @@ export function applySystemVersionMigration(data: SystemSaveData) {
  * @see {@link SessionVersionConverter}
  */
 export function applySessionVersionMigration(data: SessionSaveData) {
-  const curVersion = data.gameVersion.split(".").map(value => parseInt(value));
+  const prevVersion = data.gameVersion;
+  const isCurrentVersionHigher = compareVersions(prevVersion, LATEST_VERSION) === -1;
 
-  if (!curVersion.every((value, index) => value === LATEST_VERSION[index])) {
-    const converter = new SessionVersionConverter();
-    converter.applyStaticPreprocessors(data);
-    converter.applyMigration(data, curVersion);
+  if (isCurrentVersionHigher) {
+    // Always sanitize money as a safeguard
+    data.money = Math.floor(data.money);
+
+    applyMigrators(sessionMigrators, data, prevVersion);
+    console.log(`Session data successfully migrated to v${LATEST_VERSION}!`);
   }
 }
 
@@ -59,139 +161,13 @@ export function applySessionVersionMigration(data: SessionSaveData) {
  * @param data Settings data object
  * @see {@link SettingsVersionConverter}
  */
+// biome-ignore lint/complexity/noBannedTypes: TODO - refactor settings
 export function applySettingsVersionMigration(data: Object) {
-  const gameVersion: string = data.hasOwnProperty("gameVersion") ? data["gameVersion"] : "1.0.0";
-  const curVersion = gameVersion.split(".").map(value => parseInt(value));
+  const prevVersion: string = data.hasOwnProperty("gameVersion") ? data["gameVersion"] : "1.0.0";
+  const isCurrentVersionHigher = compareVersions(prevVersion, LATEST_VERSION) === -1;
 
-  if (!curVersion.every((value, index) => value === LATEST_VERSION[index])) {
-    const converter = new SettingsVersionConverter();
-    converter.applyStaticPreprocessors(data);
-    converter.applyMigration(data, curVersion);
-  }
-}
-
-/**
- * Abstract class encapsulating the logic for migrating data from a given version up to
- * the current version listed in `package.json`.
- *
- * Note that, for any version converter, the corresponding `applyMigration`
- * function would only need to be changed once when the first migration for a
- * given version is introduced. Similarly, a version file (within the `versions`
- * folder) would only need to be created for a version once with the appropriate
- * array nomenclature.
- */
-abstract class VersionConverter {
-  /**
-   * Iterates through an array of designated migration functions that are each
-   * called one by one to transform the data.
-   * @param data The data to be operated on
-   * @param migrationArr An array of functions that will transform the incoming data
-   */
-  callMigrators(data: any, migrationArr: readonly any[]) {
-    for (const migrate of migrationArr) {
-      migrate(data);
-    }
-  }
-
-  /**
-   * Applies any version-agnostic data sanitation as defined within the function
-   * body.
-   * @param data The data to be operated on
-   */
-  applyStaticPreprocessors(_data: any): void {
-  }
-
-  /**
-   * Uses the current version the incoming data to determine the starting point
-   * of the migration which will cascade up to the latest version, calling the
-   * necessary migration functions in the process.
-   * @param data The data to be operated on
-   * @param curVersion [0] Current major version
-   *                   [1] Current minor version
-   *                   [2] Current patch version
-   */
-  abstract applyMigration(data: any, curVersion: number[]): void;
-}
-
-/**
- * Class encapsulating the logic for migrating {@linkcode SessionSaveData} from
- * a given version up to the current version listed in `package.json`.
- * @extends VersionConverter
- */
-class SessionVersionConverter extends VersionConverter {
-  override applyStaticPreprocessors(data: SessionSaveData): void {
-    // Always sanitize money as a safeguard
-    data.money = Math.floor(data.money);
-  }
-
-  override applyMigration(data: SessionSaveData, curVersion: number[]): void {
-    const [ curMajor, curMinor, curPatch ] = curVersion;
-
-    if (curMajor === 1) {
-      if (curMinor === 0) {
-        if (curPatch <= 5) {
-          console.log("Applying v1.0.4 session data migration!");
-          this.callMigrators(data, v1_0_4.sessionMigrators);
-        }
-      }
-      if (curMinor <= 1) {
-        console.log("Applying v1.1.0 session data migration!");
-        this.callMigrators(data, v1_1_0.sessionMigrators);
-      }
-    }
-
-    console.log(`Session data successfully migrated to v${version}!`);
-  }
-}
-
-/**
- * Class encapsulating the logic for migrating {@linkcode SystemSaveData} from
- * a given version up to the current version listed in `package.json`.
- * @extends VersionConverter
- */
-class SystemVersionConverter extends VersionConverter {
-  override applyMigration(data: SystemSaveData, curVersion: number[]): void {
-    const [ curMajor, curMinor, curPatch ] = curVersion;
-
-    if (curMajor === 1) {
-      if (curMinor === 0) {
-        if (curPatch <= 4) {
-          console.log("Applying v1.0.4 system data migraton!");
-          this.callMigrators(data, v1_0_4.systemMigrators);
-        }
-      }
-      if (curMinor <= 1) {
-        console.log("Applying v1.1.0 system data migraton!");
-        this.callMigrators(data, v1_1_0.systemMigrators);
-      }
-    }
-
-    console.log(`System data successfully migrated to v${version}!`);
-  }
-}
-
-/**
- * Class encapsulating the logic for migrating settings data from
- * a given version up to the current version listed in `package.json`.
- * @extends VersionConverter
- */
-class SettingsVersionConverter extends VersionConverter {
-  override applyMigration(data: Object, curVersion: number[]): void {
-    const [ curMajor, curMinor, curPatch ] = curVersion;
-
-    if (curMajor === 1) {
-      if (curMinor === 0) {
-        if (curPatch <= 4) {
-          console.log("Applying v1.0.4 settings data migraton!");
-          this.callMigrators(data, v1_0_4.settingsMigrators);
-        }
-      }
-      if (curMinor <= 1) {
-        console.log("Applying v1.1.0 settings data migraton!");
-        this.callMigrators(data, v1_1_0.settingsMigrators);
-      }
-    }
-
-    console.log(`System data successfully migrated to v${version}!`);
+  if (isCurrentVersionHigher) {
+    applyMigrators(settingsMigrators, data, prevVersion);
+    console.log(`Settings successfully migrated to v${LATEST_VERSION}!`);
   }
 }
diff --git a/src/system/version_migration/versions/v1_0_4.ts b/src/system/version_migration/versions/v1_0_4.ts
index 2795e940866..9e30ccdc2a7 100644
--- a/src/system/version_migration/versions/v1_0_4.ts
+++ b/src/system/version_migration/versions/v1_0_4.ts
@@ -1,54 +1,85 @@
 import { SettingKeys } from "#app/system/settings/settings";
-import type { SystemSaveData, SessionSaveData  } from "#app/system/game-data";
-import { AbilityAttr, defaultStarterSpecies, DexAttr  } from "#app/system/game-data";
+import type { SystemSaveData, SessionSaveData } from "#app/system/game-data";
+import { AbilityAttr, defaultStarterSpecies, DexAttr } from "#app/system/game-data";
 import { allSpecies } from "#app/data/pokemon-species";
 import { CustomPokemonData } from "#app/data/custom-pokemon-data";
-import { isNullOrUndefined } from "#app/utils";
+import { isNullOrUndefined } from "#app/utils/common";
+import type { SystemSaveMigrator } from "#app/@types/SystemSaveMigrator";
+import type { SettingsSaveMigrator } from "#app/@types/SettingsSaveMigrator";
+import type { SessionSaveMigrator } from "#app/@types/SessionSaveMigrator";
 
-export const systemMigrators = [
-  /**
-   * Migrate ability starter data if empty for caught species.
-   * @param data {@linkcode SystemSaveData}
-   */
-  function migrateAbilityData(data: SystemSaveData) {
+/**
+ * Migrate ability starter data if empty for caught species.
+ * @param data - {@linkcode SystemSaveData}
+ */
+const migrateAbilityData: SystemSaveMigrator = {
+  version: "1.0.4",
+  migrate: (data: SystemSaveData): void => {
     if (data.starterData && data.dexData) {
       Object.keys(data.starterData).forEach(sd => {
-        if (data.dexData[sd]?.caughtAttr && (data.starterData[sd] && !data.starterData[sd].abilityAttr)) {
+        if (data.dexData[sd]?.caughtAttr && data.starterData[sd] && !data.starterData[sd].abilityAttr) {
           data.starterData[sd].abilityAttr = 1;
         }
       });
     }
   },
+};
 
-  /**
-   * Populate legendary Pokémon statistics if they are missing.
-   * @param data {@linkcode SystemSaveData}
-   */
-  function fixLegendaryStats(data: SystemSaveData) {
-    if (data.gameStats && (data.gameStats.legendaryPokemonCaught !== undefined && data.gameStats.subLegendaryPokemonCaught === undefined)) {
+/**
+ * Populate legendary Pokémon statistics if they are missing.
+ * @param data - {@linkcode SystemSaveData}
+ */
+const fixLegendaryStats: SystemSaveMigrator = {
+  version: "1.0.4",
+  migrate: (data: SystemSaveData): void => {
+    if (
+      data.gameStats &&
+      data.gameStats.legendaryPokemonCaught !== undefined &&
+      data.gameStats.subLegendaryPokemonCaught === undefined
+    ) {
       data.gameStats.subLegendaryPokemonSeen = 0;
       data.gameStats.subLegendaryPokemonCaught = 0;
       data.gameStats.subLegendaryPokemonHatched = 0;
-      allSpecies.filter(s => s.subLegendary).forEach(s => {
-        const dexEntry = data.dexData[s.speciesId];
-        data.gameStats.subLegendaryPokemonSeen += dexEntry.seenCount;
-        data.gameStats.legendaryPokemonSeen = Math.max(data.gameStats.legendaryPokemonSeen - dexEntry.seenCount, 0);
-        data.gameStats.subLegendaryPokemonCaught += dexEntry.caughtCount;
-        data.gameStats.legendaryPokemonCaught = Math.max(data.gameStats.legendaryPokemonCaught - dexEntry.caughtCount, 0);
-        data.gameStats.subLegendaryPokemonHatched += dexEntry.hatchedCount;
-        data.gameStats.legendaryPokemonHatched = Math.max(data.gameStats.legendaryPokemonHatched - dexEntry.hatchedCount, 0);
-      });
-      data.gameStats.subLegendaryPokemonSeen = Math.max(data.gameStats.subLegendaryPokemonSeen, data.gameStats.subLegendaryPokemonCaught);
-      data.gameStats.legendaryPokemonSeen = Math.max(data.gameStats.legendaryPokemonSeen, data.gameStats.legendaryPokemonCaught);
-      data.gameStats.mythicalPokemonSeen = Math.max(data.gameStats.mythicalPokemonSeen, data.gameStats.mythicalPokemonCaught);
+      allSpecies
+        .filter(s => s.subLegendary)
+        .forEach(s => {
+          const dexEntry = data.dexData[s.speciesId];
+          data.gameStats.subLegendaryPokemonSeen += dexEntry.seenCount;
+          data.gameStats.legendaryPokemonSeen = Math.max(data.gameStats.legendaryPokemonSeen - dexEntry.seenCount, 0);
+          data.gameStats.subLegendaryPokemonCaught += dexEntry.caughtCount;
+          data.gameStats.legendaryPokemonCaught = Math.max(
+            data.gameStats.legendaryPokemonCaught - dexEntry.caughtCount,
+            0,
+          );
+          data.gameStats.subLegendaryPokemonHatched += dexEntry.hatchedCount;
+          data.gameStats.legendaryPokemonHatched = Math.max(
+            data.gameStats.legendaryPokemonHatched - dexEntry.hatchedCount,
+            0,
+          );
+        });
+      data.gameStats.subLegendaryPokemonSeen = Math.max(
+        data.gameStats.subLegendaryPokemonSeen,
+        data.gameStats.subLegendaryPokemonCaught,
+      );
+      data.gameStats.legendaryPokemonSeen = Math.max(
+        data.gameStats.legendaryPokemonSeen,
+        data.gameStats.legendaryPokemonCaught,
+      );
+      data.gameStats.mythicalPokemonSeen = Math.max(
+        data.gameStats.mythicalPokemonSeen,
+        data.gameStats.mythicalPokemonCaught,
+      );
     }
   },
+};
 
-  /**
-   * Unlock all starters' first ability and female gender option.
-   * @param data {@linkcode SystemSaveData}
-   */
-  function fixStarterData(data: SystemSaveData) {
+/**
+ * Unlock all starters' first ability and female gender option.
+ * @param data - {@linkcode SystemSaveData}
+ */
+const fixStarterData: SystemSaveMigrator = {
+  version: "1.0.4",
+  migrate: (data: SystemSaveData): void => {
     if (!isNullOrUndefined(data.starterData)) {
       for (const starterId of defaultStarterSpecies) {
         if (data.starterData[starterId]?.abilityAttr) {
@@ -59,33 +90,45 @@ export const systemMigrators = [
         }
       }
     }
-  }
+  },
+};
+
+export const systemMigrators: Readonly<SystemSaveMigrator[]> = [
+  migrateAbilityData,
+  fixLegendaryStats,
+  fixStarterData,
 ] as const;
 
-export const settingsMigrators = [
-  /**
-   * Migrate from "REROLL_TARGET" property to {@linkcode
-   * SettingKeys.Shop_Cursor_Target}.
-   * @param data the `settings` object
-   */
-  function fixRerollTarget(data: Object) {
+/**
+ * Migrate from `REROLL_TARGET` property to {@linkcode SettingKeys.Shop_Cursor_Target}
+ * @param data - The `settings` object
+ */
+const fixRerollTarget: SettingsSaveMigrator = {
+  version: "1.0.4",
+  // biome-ignore lint/complexity/noBannedTypes: TODO - refactor settings
+  migrate: (data: Object): void => {
     if (data.hasOwnProperty("REROLL_TARGET") && !data.hasOwnProperty(SettingKeys.Shop_Cursor_Target)) {
       data[SettingKeys.Shop_Cursor_Target] = data["REROLL_TARGET"];
+      // biome-ignore lint/performance/noDelete: intentional
       delete data["REROLL_TARGET"];
       localStorage.setItem("settings", JSON.stringify(data));
     }
-  }
-] as const;
+  },
+};
 
-export const sessionMigrators = [
-  /**
-   *  Converts old lapsing modifiers (battle items, lures, and Dire Hit) and
-   *  other miscellaneous modifiers (vitamins, White Herb) to any new class
-   *  names and/or change in reload arguments.
-   *  @param data {@linkcode SessionSaveData}
-   */
-  function migrateModifiers(data: SessionSaveData) {
-    data.modifiers.forEach((m) => {
+export const settingsMigrators: Readonly<SettingsSaveMigrator[]> = [fixRerollTarget] as const;
+
+/**
+ *  Converts old lapsing modifiers (battle items, lures, and Dire Hit) and
+ *  other miscellaneous modifiers (vitamins, White Herb) to any new class
+ *  names and/or change in reload arguments.
+ *  @param data - {@linkcode SessionSaveData}
+ */
+const migrateModifiers: SessionSaveMigrator = {
+  version: "1.0.4",
+  // biome-ignore lint/complexity/noExcessiveCognitiveComplexity: necessary?
+  migrate: (data: SessionSaveData): void => {
+    for (const m of data.modifiers) {
       if (m.className === "PokemonBaseStatModifier") {
         m.className = "BaseStatModifier";
       } else if (m.className === "PokemonResetNegativeStatStageModifier") {
@@ -102,13 +145,13 @@ export const sessionMigrators = [
           m.typePregenArgs[0] = newStat;
 
           // From [ stat, battlesLeft ] to [ stat, maxBattles, battleCount ]
-          m.args = [ newStat, maxBattles, Math.min(m.args[1], maxBattles) ];
+          m.args = [newStat, maxBattles, Math.min(m.args[1], maxBattles)];
         } else {
           m.className = "TempCritBoosterModifier";
           m.typePregenArgs = [];
 
           // From [ stat, battlesLeft ] to [ maxBattles, battleCount ]
-          m.args = [ maxBattles, Math.min(m.args[1], maxBattles) ];
+          m.args = [maxBattles, Math.min(m.args[1], maxBattles)];
         }
       } else if (m.className === "DoubleBattleChanceBoosterModifier" && m.args.length === 1) {
         let maxBattles: number;
@@ -125,26 +168,25 @@ export const sessionMigrators = [
         }
 
         // From [ battlesLeft ] to [ maxBattles, battleCount ]
-        m.args = [ maxBattles, Math.min(m.args[0], maxBattles) ];
+        m.args = [maxBattles, Math.min(m.args[0], maxBattles)];
       }
-    });
+    }
 
-    data.enemyModifiers.forEach((m) => {
+    for (const m of data.enemyModifiers) {
       if (m.className === "PokemonBaseStatModifier") {
         m.className = "BaseStatModifier";
       } else if (m.className === "PokemonResetNegativeStatStageModifier") {
         m.className = "ResetNegativeStatStageModifier";
       }
-    });
+    }
   },
-  /**
-   *  Converts old Pokemon natureOverride and mysteryEncounterData
-   *  to use the new conjoined {@linkcode Pokemon.customPokemonData} structure instead.
-   *  @param data {@linkcode SessionSaveData}
-   */
-  function migrateCustomPokemonDataAndNatureOverrides(data: SessionSaveData) {
+};
+
+const migrateCustomPokemonData: SessionSaveMigrator = {
+  version: "1.0.4",
+  migrate: (data: SessionSaveData): void => {
     // Fix Pokemon nature overrides and custom data migration
-    data.party.forEach(pokemon => {
+    for (const pokemon of data.party) {
       if (pokemon["mysteryEncounterPokemonData"]) {
         pokemon.customPokemonData = new CustomPokemonData(pokemon["mysteryEncounterPokemonData"]);
         pokemon["mysteryEncounterPokemonData"] = null;
@@ -158,6 +200,8 @@ export const sessionMigrators = [
         pokemon.customPokemonData.nature = pokemon["natureOverride"];
         pokemon["natureOverride"] = -1;
       }
-    });
-  }
-] as const;
+    }
+  },
+};
+
+export const sessionMigrators: Readonly<SessionSaveMigrator[]> = [migrateModifiers, migrateCustomPokemonData] as const;
diff --git a/src/system/version_migration/versions/v1_1_0.ts b/src/system/version_migration/versions/v1_1_0.ts
deleted file mode 100644
index 5d6247aeaa2..00000000000
--- a/src/system/version_migration/versions/v1_1_0.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export const systemMigrators = [] as const;
-
-export const settingsMigrators = [] as const;
-
-export const sessionMigrators = [] as const;
diff --git a/src/system/version_migration/versions/v1_7_0.ts b/src/system/version_migration/versions/v1_7_0.ts
new file mode 100644
index 00000000000..dc7c0f48640
--- /dev/null
+++ b/src/system/version_migration/versions/v1_7_0.ts
@@ -0,0 +1,83 @@
+import type { SessionSaveMigrator } from "#app/@types/SessionSaveMigrator";
+import type { SystemSaveMigrator } from "#app/@types/SystemSaveMigrator";
+import { getPokemonSpecies, getPokemonSpeciesForm } from "#app/data/pokemon-species";
+import { globalScene } from "#app/global-scene";
+import { DexAttr, type SessionSaveData, type SystemSaveData } from "#app/system/game-data";
+import { isNullOrUndefined } from "#app/utils/common";
+
+/**
+ * If a starter is caught, but the only forms registered as caught are not starterSelectable,
+ * unlock the default form.
+ * @param data - {@linkcode SystemSaveData}
+ */
+const migrateUnselectableForms: SystemSaveMigrator = {
+  version: "1.7.0",
+  migrate: (data: SystemSaveData): void => {
+    if (data.starterData && data.dexData) {
+      Object.keys(data.starterData).forEach(sd => {
+        const caughtAttr = data.dexData[sd]?.caughtAttr;
+        const speciesNumber = Number(sd);
+        if (!speciesNumber) {
+          // An unknown bug at some point in time caused some accounts to have starter data for pokedex number 0 which crashes
+          return;
+        }
+        const species = getPokemonSpecies(speciesNumber);
+        if (caughtAttr && species.forms?.length > 1) {
+          const selectableForms = species.forms.filter(
+            (form, formIndex) => form.isStarterSelectable && caughtAttr & globalScene.gameData.getFormAttr(formIndex),
+          );
+          if (selectableForms.length === 0) {
+            data.dexData[sd].caughtAttr += DexAttr.DEFAULT_FORM;
+          }
+        }
+      });
+    }
+  },
+};
+
+export const systemMigrators: Readonly<SystemSaveMigrator[]> = [migrateUnselectableForms] as const;
+
+const migrateTera: SessionSaveMigrator = {
+  version: "1.7.0",
+  migrate: (data: SessionSaveData): void => {
+    for (let i = 0; i < data.modifiers.length; ) {
+      if (data.modifiers[i].className === "TerastallizeModifier") {
+        data.party.forEach(p => {
+          if (p.id === data.modifiers[i].args[0]) {
+            p.teraType = data.modifiers[i].args[1];
+          }
+        });
+        data.modifiers.splice(i, 1);
+      } else {
+        i++;
+      }
+    }
+
+    for (let i = 0; i < data.enemyModifiers.length; ) {
+      if (data.enemyModifiers[i].className === "TerastallizeModifier") {
+        data.enemyParty.forEach(p => {
+          if (p.id === data.enemyModifiers[i].args[0]) {
+            p.teraType = data.enemyModifiers[i].args[1];
+          }
+        });
+        data.enemyModifiers.splice(i, 1);
+      } else {
+        i++;
+      }
+    }
+
+    data.party.forEach(p => {
+      if (isNullOrUndefined(p.teraType)) {
+        p.teraType = getPokemonSpeciesForm(p.species, p.formIndex).type1;
+      }
+    });
+
+    data.enemyParty.forEach(p => {
+      if (isNullOrUndefined(p.teraType)) {
+        p.teraType = getPokemonSpeciesForm(p.species, p.formIndex).type1;
+      }
+    });
+  },
+};
+
+export const sessionMigrators: Readonly<SessionSaveMigrator[]> = [migrateTera] as const;
diff --git a/src/system/version_migration/versions/v1_8_3.ts b/src/system/version_migration/versions/v1_8_3.ts
new file mode 100644
index 00000000000..6e2d96d3673
--- /dev/null
+++ b/src/system/version_migration/versions/v1_8_3.ts
@@ -0,0 +1,30 @@
+import type { SystemSaveMigrator } from "#app/@types/SystemSaveMigrator";
+import { getPokemonSpecies } from "#app/data/pokemon-species";
+import { DexAttr, type SystemSaveData } from "#app/system/game-data";
+import { Species } from "#enums/species";
+
+/**
+ * If a starter is caught, but the only forms registered as caught are not starterSelectable,
+ * unlock the default form.
+ * @param data - {@linkcode SystemSaveData}
+ */
+const migratePichuForms: SystemSaveMigrator = {
+  version: "1.8.3",
+  migrate: (data: SystemSaveData): void => {
+    if (data.starterData && data.dexData) {
+      // This is Pichu's Pokédex number
+      const sd = 172;
+      const caughtAttr = data.dexData[sd]?.caughtAttr;
+      const species = getPokemonSpecies(sd);
+      // An extra check because you never know
+      if (species.speciesId === Species.PICHU && caughtAttr) {
+        // Ensuring that only existing forms are unlocked
+        data.dexData[sd].caughtAttr &= species.getFullUnlocksData();
+        // If no forms are unlocked now, since Pichu is caught, we unlock form 0
+        data.dexData[sd].caughtAttr |= DexAttr.DEFAULT_FORM;
+      }
+    }
+  },
+};
+
+export const systemMigrators: Readonly<SystemSaveMigrator[]> = [migratePichuForms] as const;
diff --git a/src/system/version_migration/versions/v1_9_0.ts b/src/system/version_migration/versions/v1_9_0.ts
new file mode 100644
index 00000000000..c517896cf45
--- /dev/null
+++ b/src/system/version_migration/versions/v1_9_0.ts
@@ -0,0 +1,41 @@
+import type { SessionSaveMigrator } from "#app/@types/SessionSaveMigrator";
+import { PokemonMove } from "#app/field/pokemon";
+import type { SessionSaveData } from "#app/system/game-data";
+import type PokemonData from "#app/system/pokemon-data";
+import { Moves } from "#enums/moves";
+
+/**
+ * Migrate all lingering rage fist data inside `CustomPokemonData`,
+ * as well as enforcing default values across the board.
+ * @param data - {@linkcode SystemSaveData}
+ */
+const migratePartyData: SessionSaveMigrator = {
+  version: "1.9.0",
+  migrate: (data: SessionSaveData): void => {
+    // this stuff is copied straight from the constructor fwiw
+    const mapParty = (pkmnData: PokemonData) => {
+      // remove empty moves from moveset
+      pkmnData.moveset = (pkmnData.moveset ?? [new PokemonMove(Moves.TACKLE), new PokemonMove(Moves.GROWL)])
+        .filter(m => !!m)
+        .map(m => PokemonMove.loadMove(m));
+      // only edit summondata moveset if exists
+      pkmnData.summonData.moveset &&= pkmnData.summonData.moveset.filter(m => !!m).map(m => PokemonMove.loadMove(m));
+
+      if (
+        pkmnData.customPokemonData &&
+        "hitsRecCount" in pkmnData.customPokemonData &&
+        typeof pkmnData.customPokemonData["hitsRecCount"] === "number"
+      ) {
+        // transfer old hit count stat to battleData.
+        pkmnData.battleData.hitCount = pkmnData.customPokemonData["hitsRecCount"];
+        pkmnData.customPokemonData["hitsRecCount"] = null;
+      }
+      return pkmnData;
+    };
+
+    data.party = data.party.map(mapParty);
+    data.enemyParty = data.enemyParty.map(mapParty);
+  },
+};
+
+export const sessionMigrators: Readonly<SessionSaveMigrator[]> = [migratePartyData] as const;
diff --git a/src/system/voucher.ts b/src/system/voucher.ts
index e6bee131797..ce10560c3e2 100644
--- a/src/system/voucher.ts
+++ b/src/system/voucher.ts
@@ -3,13 +3,13 @@ import { AchvTier, achvs, getAchievementDescription } from "./achv";
 import type { PlayerGender } from "#enums/player-gender";
 import { TrainerType } from "#enums/trainer-type";
 import type { ConditionFn } from "#app/@types/common";
-import { trainerConfigs } from "#app/data/trainer-config";
+import { trainerConfigs } from "#app/data/trainers/trainer-config";
 
 export enum VoucherType {
   REGULAR,
   PLUS,
   PREMIUM,
-  GOLDEN
+  GOLDEN,
 }
 
 export class Voucher {
@@ -31,10 +31,10 @@ export class Voucher {
 
   /**
    * Get the name of the voucher
-   * @param playerGender - this is ignored here. It's only there to match the signature of the function in the Achv class
+   * @param _playerGender - this is ignored here. It's only there to match the signature of the function in the Achv class
    * @returns the name of the voucher
    */
-  getName(playerGender: PlayerGender): string {
+  getName(_playerGender: PlayerGender): string {
     return getVoucherTypeName(this.voucherType);
   }
 
@@ -89,32 +89,32 @@ export interface Vouchers {
 export const vouchers: Vouchers = {};
 
 export function initVouchers() {
-  for (const achv of [ achvs.CLASSIC_VICTORY ]) {
-    const voucherType = achv.score >= 150
-      ? VoucherType.GOLDEN
-      : achv.score >= 100
-        ? VoucherType.PREMIUM
-        : achv.score >= 75
-          ? VoucherType.PLUS
-          : VoucherType.REGULAR;
+  for (const achv of [achvs.CLASSIC_VICTORY]) {
+    const voucherType =
+      achv.score >= 150
+        ? VoucherType.GOLDEN
+        : achv.score >= 100
+          ? VoucherType.PREMIUM
+          : achv.score >= 75
+            ? VoucherType.PLUS
+            : VoucherType.REGULAR;
     vouchers[achv.id] = new Voucher(voucherType, getAchievementDescription(achv.localizationKey));
   }
 
-  const bossTrainerTypes = Object.keys(trainerConfigs)
-    .filter(tt => trainerConfigs[tt].isBoss && trainerConfigs[tt].getDerivedType() !== TrainerType.RIVAL && trainerConfigs[tt].hasVoucher);
+  const bossTrainerTypes = Object.keys(trainerConfigs).filter(
+    tt =>
+      trainerConfigs[tt].isBoss &&
+      trainerConfigs[tt].getDerivedType() !== TrainerType.RIVAL &&
+      trainerConfigs[tt].hasVoucher,
+  );
 
   for (const trainerType of bossTrainerTypes) {
-    const voucherType = trainerConfigs[trainerType].moneyMultiplier < 10
-      ? VoucherType.PLUS
-      : VoucherType.PREMIUM;
+    const voucherType = trainerConfigs[trainerType].moneyMultiplier < 10 ? VoucherType.PLUS : VoucherType.PREMIUM;
     const key = TrainerType[trainerType];
     const trainerName = trainerConfigs[trainerType].name;
     const trainer = trainerConfigs[trainerType];
     const title = trainer.title ? ` (${trainer.title})` : "";
-    vouchers[key] = new Voucher(
-      voucherType,
-      `${i18next.t("voucher:defeatTrainer", { trainerName })} ${title}`,
-    );
+    vouchers[key] = new Voucher(voucherType, `${i18next.t("voucher:defeatTrainer", { trainerName })} ${title}`);
   }
   const voucherKeys = Object.keys(vouchers);
   for (const k of voucherKeys) {
diff --git a/src/test/abilities/costar.test.ts b/src/test/abilities/costar.test.ts
deleted file mode 100644
index 3be29ea2dcf..00000000000
--- a/src/test/abilities/costar.test.ts
+++ /dev/null
@@ -1,85 +0,0 @@
-import { Stat } from "#enums/stat";
-import { Abilities } from "#app/enums/abilities";
-import { Moves } from "#app/enums/moves";
-import { Species } from "#app/enums/species";
-import { CommandPhase } from "#app/phases/command-phase";
-import { MessagePhase } from "#app/phases/message-phase";
-import GameManager from "#test/utils/gameManager";
-import Phaser from "phaser";
-import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest";
-
-
-describe("Abilities - COSTAR", () => {
-  let phaserGame: Phaser.Game;
-  let game: GameManager;
-
-  beforeAll(() => {
-    phaserGame = new Phaser.Game({
-      type: Phaser.HEADLESS,
-    });
-  });
-
-  afterEach(() => {
-    game.phaseInterceptor.restoreOg();
-  });
-
-  beforeEach(() => {
-    game = new GameManager(phaserGame);
-    game.override.battleType("double");
-    game.override.ability(Abilities.COSTAR);
-    game.override.moveset([ Moves.SPLASH, Moves.NASTY_PLOT ]);
-    game.override.enemyMoveset(Moves.SPLASH);
-  });
-
-
-  test(
-    "ability copies positive stat stages",
-    async () => {
-      game.override.enemyAbility(Abilities.BALL_FETCH);
-
-      await game.startBattle([ Species.MAGIKARP, Species.MAGIKARP, Species.FLAMIGO ]);
-
-      let [ leftPokemon, rightPokemon ] = game.scene.getPlayerField();
-
-      game.move.select(Moves.NASTY_PLOT);
-      await game.phaseInterceptor.to(CommandPhase);
-      game.move.select(Moves.SPLASH, 1);
-      await game.toNextTurn();
-
-      expect(leftPokemon.getStatStage(Stat.SPATK)).toBe(2);
-      expect(rightPokemon.getStatStage(Stat.SPATK)).toBe(0);
-
-      game.move.select(Moves.SPLASH);
-      await game.phaseInterceptor.to(CommandPhase);
-      game.doSwitchPokemon(2);
-      await game.phaseInterceptor.to(MessagePhase);
-
-      [ leftPokemon, rightPokemon ] = game.scene.getPlayerField();
-      expect(leftPokemon.getStatStage(Stat.SPATK)).toBe(2);
-      expect(rightPokemon.getStatStage(Stat.SPATK)).toBe(2);
-    },
-  );
-
-  test(
-    "ability copies negative stat stages",
-    async () => {
-      game.override.enemyAbility(Abilities.INTIMIDATE);
-
-      await game.startBattle([ Species.MAGIKARP, Species.MAGIKARP, Species.FLAMIGO ]);
-
-      let [ leftPokemon, rightPokemon ] = game.scene.getPlayerField();
-
-      expect(leftPokemon.getStatStage(Stat.ATK)).toBe(-2);
-      expect(leftPokemon.getStatStage(Stat.ATK)).toBe(-2);
-
-      game.move.select(Moves.SPLASH);
-      await game.phaseInterceptor.to(CommandPhase);
-      game.doSwitchPokemon(2);
-      await game.phaseInterceptor.to(MessagePhase);
-
-      [ leftPokemon, rightPokemon ] = game.scene.getPlayerField();
-      expect(leftPokemon.getStatStage(Stat.ATK)).toBe(-2);
-      expect(rightPokemon.getStatStage(Stat.ATK)).toBe(-2);
-    },
-  );
-});
diff --git a/src/test/abilities/flower_gift.test.ts b/src/test/abilities/flower_gift.test.ts
deleted file mode 100644
index 04ada598f22..00000000000
--- a/src/test/abilities/flower_gift.test.ts
+++ /dev/null
@@ -1,153 +0,0 @@
-import { BattlerIndex } from "#app/battle";
-import { Abilities } from "#app/enums/abilities";
-import { Stat } from "#app/enums/stat";
-import { WeatherType } from "#app/enums/weather-type";
-import { Moves } from "#enums/moves";
-import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
-import Phaser from "phaser";
-import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
-
-describe("Abilities - Flower Gift", () => {
-  let phaserGame: Phaser.Game;
-  let game: GameManager;
-  const OVERCAST_FORM = 0;
-  const SUNSHINE_FORM = 1;
-
-  /**
-   * Tests reverting to normal form when Cloud Nine/Air Lock is active on the field
-   * @param {GameManager} game The game manager instance
-   * @param {Abilities} ability The ability that is active on the field
-   */
-  const testRevertFormAgainstAbility = async (game: GameManager, ability: Abilities) => {
-    game.override.starterForms({ [Species.CASTFORM]: SUNSHINE_FORM }).enemyAbility(ability);
-    await game.classicMode.startBattle([ Species.CASTFORM ]);
-
-    game.move.select(Moves.SPLASH);
-
-    expect(game.scene.getPlayerPokemon()?.formIndex).toBe(OVERCAST_FORM);
-  };
-
-  beforeAll(() => {
-    phaserGame = new Phaser.Game({
-      type: Phaser.HEADLESS,
-    });
-  });
-
-  afterEach(() => {
-    game.phaseInterceptor.restoreOg();
-  });
-
-  beforeEach(() => {
-    game = new GameManager(phaserGame);
-    game.override
-      .moveset([ Moves.SPLASH, Moves.RAIN_DANCE, Moves.SUNNY_DAY, Moves.SKILL_SWAP ])
-      .enemySpecies(Species.MAGIKARP)
-      .enemyMoveset(Moves.SPLASH)
-      .enemyAbility(Abilities.BALL_FETCH);
-  });
-
-  // TODO: Uncomment expect statements when the ability is implemented - currently does not increase stats of allies
-  it("increases the ATK and SPDEF stat stages of the Pokémon with this Ability and its allies by 1.5× during Harsh Sunlight", async () => {
-    game.override.battleType("double");
-    await game.classicMode.startBattle([ Species.CHERRIM, Species.MAGIKARP ]);
-
-    const [ cherrim ] = game.scene.getPlayerField();
-    const cherrimAtkStat = cherrim.getEffectiveStat(Stat.ATK);
-    const cherrimSpDefStat = cherrim.getEffectiveStat(Stat.SPDEF);
-
-    // const magikarpAtkStat = magikarp.getEffectiveStat(Stat.ATK);;
-    // const magikarpSpDefStat = magikarp.getEffectiveStat(Stat.SPDEF);
-
-    game.move.select(Moves.SUNNY_DAY, 0);
-    game.move.select(Moves.SPLASH, 1);
-
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2 ]);
-    await game.phaseInterceptor.to("TurnEndPhase");
-
-    expect(cherrim.formIndex).toBe(SUNSHINE_FORM);
-    expect(cherrim.getEffectiveStat(Stat.ATK)).toBe(Math.floor(cherrimAtkStat * 1.5));
-    expect(cherrim.getEffectiveStat(Stat.SPDEF)).toBe(Math.floor(cherrimSpDefStat * 1.5));
-    // expect(magikarp.getEffectiveStat(Stat.ATK)).toBe(Math.floor(magikarpAtkStat * 1.5));
-    // expect(magikarp.getEffectiveStat(Stat.SPDEF)).toBe(Math.floor(magikarpSpDefStat * 1.5));
-  });
-
-  it("changes the Pokemon's form during Harsh Sunlight", async () => {
-    game.override.weather(WeatherType.HARSH_SUN);
-    await game.classicMode.startBattle([ Species.CHERRIM ]);
-
-    const cherrim = game.scene.getPlayerPokemon()!;
-    expect(cherrim.formIndex).toBe(SUNSHINE_FORM);
-
-    game.move.select(Moves.SPLASH);
-  });
-
-  it("reverts to Overcast Form if a Pokémon on the field has Air Lock", async () => {
-    await testRevertFormAgainstAbility(game, Abilities.AIR_LOCK);
-  });
-
-  it("reverts to Overcast Form if a Pokémon on the field has Cloud Nine", async () => {
-    await testRevertFormAgainstAbility(game, Abilities.CLOUD_NINE);
-  });
-
-  it("reverts to Overcast Form when the Pokémon loses Flower Gift, changes form under Harsh Sunlight/Sunny when it regains it", async () => {
-    game.override.enemyMoveset([ Moves.SKILL_SWAP ]).weather(WeatherType.HARSH_SUN);
-
-    await game.classicMode.startBattle([ Species.CHERRIM ]);
-
-    const cherrim = game.scene.getPlayerPokemon()!;
-
-    game.move.select(Moves.SKILL_SWAP);
-
-    await game.phaseInterceptor.to("TurnStartPhase");
-    expect(cherrim.formIndex).toBe(SUNSHINE_FORM);
-
-    await game.phaseInterceptor.to("MoveEndPhase");
-    expect(cherrim.formIndex).toBe(OVERCAST_FORM);
-
-    await game.phaseInterceptor.to("MoveEndPhase");
-    expect(cherrim.formIndex).toBe(SUNSHINE_FORM);
-  });
-
-  it("reverts to Overcast Form when the Flower Gift is suppressed, changes form under Harsh Sunlight/Sunny when it regains it", async () => {
-    game.override.enemyMoveset([ Moves.GASTRO_ACID ]).weather(WeatherType.HARSH_SUN);
-
-    await game.classicMode.startBattle([ Species.CHERRIM, Species.MAGIKARP ]);
-
-    const cherrim = game.scene.getPlayerPokemon()!;
-
-    expect(cherrim.formIndex).toBe(SUNSHINE_FORM);
-
-    game.move.select(Moves.SPLASH);
-    await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]);
-    await game.phaseInterceptor.to("TurnEndPhase");
-
-    expect(cherrim.summonData.abilitySuppressed).toBe(true);
-    expect(cherrim.formIndex).toBe(OVERCAST_FORM);
-
-    await game.toNextTurn();
-
-    game.doSwitchPokemon(1);
-    await game.toNextTurn();
-
-    game.doSwitchPokemon(1);
-    await game.phaseInterceptor.to("MovePhase");
-
-    expect(cherrim.summonData.abilitySuppressed).toBe(false);
-    expect(cherrim.formIndex).toBe(SUNSHINE_FORM);
-  });
-
-  it("should be in Overcast Form after the user is switched out", async () => {
-    game.override.weather(WeatherType.SUNNY);
-
-    await game.classicMode.startBattle([ Species.CASTFORM, Species.MAGIKARP ]);
-    const cherrim = game.scene.getPlayerPokemon()!;
-
-    expect(cherrim.formIndex).toBe(SUNSHINE_FORM);
-
-    game.doSwitchPokemon(1);
-    await game.toNextTurn();
-
-    expect(cherrim.formIndex).toBe(OVERCAST_FORM);
-  });
-});
diff --git a/src/test/abilities/forecast.test.ts b/src/test/abilities/forecast.test.ts
deleted file mode 100644
index 6d1f776da16..00000000000
--- a/src/test/abilities/forecast.test.ts
+++ /dev/null
@@ -1,297 +0,0 @@
-import { BattlerIndex } from "#app/battle";
-import { allAbilities } from "#app/data/ability";
-import { Abilities } from "#app/enums/abilities";
-import { WeatherType } from "#app/enums/weather-type";
-import { DamageAnimPhase } from "#app/phases/damage-anim-phase";
-import { MovePhase } from "#app/phases/move-phase";
-import { PostSummonPhase } from "#app/phases/post-summon-phase";
-import { QuietFormChangePhase } from "#app/phases/quiet-form-change-phase";
-import { TurnEndPhase } from "#app/phases/turn-end-phase";
-import { Moves } from "#enums/moves";
-import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
-import Phaser from "phaser";
-import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
-
-describe("Abilities - Forecast", () => {
-  let phaserGame: Phaser.Game;
-  let game: GameManager;
-  const NORMAL_FORM = 0;
-  const SUNNY_FORM = 1;
-  const RAINY_FORM = 2;
-  const SNOWY_FORM = 3;
-
-  /**
-   * Tests form changes based on weather changes
-   * @param {GameManager} game The game manager instance
-   * @param {WeatherType} weather The active weather to set
-   * @param form The expected form based on the active weather
-   * @param initialForm The initial form pre form change
-   */
-  const testWeatherFormChange = async (game: GameManager, weather: WeatherType, form: number, initialForm?: number) => {
-    game.override.weather(weather).starterForms({ [Species.CASTFORM]: initialForm });
-    await game.startBattle([ Species.CASTFORM ]);
-
-    game.move.select(Moves.SPLASH);
-
-    expect(game.scene.getPlayerPokemon()?.formIndex).toBe(form);
-  };
-
-  /**
-   * Tests reverting to normal form when Cloud Nine/Air Lock is active on the field
-   * @param {GameManager} game The game manager instance
-   * @param {Abilities} ability The ability that is active on the field
-   */
-  const testRevertFormAgainstAbility = async (game: GameManager, ability: Abilities) => {
-    game.override.starterForms({ [Species.CASTFORM]: SUNNY_FORM }).enemyAbility(ability);
-    await game.startBattle([ Species.CASTFORM ]);
-
-    game.move.select(Moves.SPLASH);
-
-    expect(game.scene.getPlayerPokemon()?.formIndex).toBe(NORMAL_FORM);
-  };
-
-  beforeAll(() => {
-    phaserGame = new Phaser.Game({
-      type: Phaser.HEADLESS,
-    });
-  });
-
-  afterEach(() => {
-    game.phaseInterceptor.restoreOg();
-  });
-
-  beforeEach(() => {
-    game = new GameManager(phaserGame);
-    game.override
-      .moveset([ Moves.SPLASH, Moves.RAIN_DANCE, Moves.SUNNY_DAY, Moves.TACKLE ])
-      .enemySpecies(Species.MAGIKARP)
-      .enemyMoveset(Moves.SPLASH)
-      .enemyAbility(Abilities.BALL_FETCH);
-  });
-
-  it("changes form based on weather", async () => {
-    game.override
-      .moveset([ Moves.RAIN_DANCE, Moves.SUNNY_DAY, Moves.SNOWSCAPE, Moves.SPLASH ])
-      .battleType("double")
-      .starterForms({
-        [Species.KYOGRE]: 1,
-        [Species.GROUDON]: 1,
-        [Species.RAYQUAZA]: 1
-      });
-    await game.startBattle([ Species.CASTFORM, Species.FEEBAS, Species.KYOGRE, Species.GROUDON, Species.RAYQUAZA, Species.ALTARIA ]);
-
-    vi.spyOn(game.scene.getPlayerParty()[5], "getAbility").mockReturnValue(allAbilities[Abilities.CLOUD_NINE]);
-
-    const castform = game.scene.getPlayerField()[0];
-    expect(castform.formIndex).toBe(NORMAL_FORM);
-
-    game.move.select(Moves.RAIN_DANCE);
-    game.move.select(Moves.SPLASH, 1);
-    await game.phaseInterceptor.to("MovePhase");
-    await game.toNextTurn();
-
-    expect(castform.formIndex).toBe(RAINY_FORM);
-
-    game.move.select(Moves.SUNNY_DAY);
-    game.move.select(Moves.SPLASH, 1);
-    await game.phaseInterceptor.to("MovePhase");
-    await game.toNextTurn();
-
-    expect(castform.formIndex).toBe(SUNNY_FORM);
-
-    game.move.select(Moves.SNOWSCAPE);
-    game.move.select(Moves.SPLASH, 1);
-    await game.phaseInterceptor.to("MovePhase");
-    await game.toNextTurn();
-
-    expect(castform.formIndex).toBe(SNOWY_FORM);
-
-    game.override.moveset([ Moves.HAIL, Moves.SANDSTORM, Moves.SNOWSCAPE, Moves.SPLASH ]);
-
-    game.move.select(Moves.SANDSTORM);
-    game.move.select(Moves.SPLASH, 1);
-    await game.phaseInterceptor.to("MovePhase");
-    await game.toNextTurn();
-
-    expect(castform.formIndex).toBe(NORMAL_FORM);
-
-    game.move.select(Moves.HAIL);
-    game.move.select(Moves.SPLASH, 1);
-    await game.phaseInterceptor.to("MovePhase");
-    await game.toNextTurn();
-
-    expect(castform.formIndex).toBe(SNOWY_FORM);
-
-    game.move.select(Moves.SPLASH);
-    game.doSwitchPokemon(2); // Feebas now 2, Kyogre 1
-    await game.phaseInterceptor.to("MovePhase");
-    await game.toNextTurn();
-
-    expect(castform.formIndex).toBe(RAINY_FORM);
-
-    game.move.select(Moves.SPLASH);
-    game.doSwitchPokemon(3); // Kyogre now 3, Groudon 1
-    await game.phaseInterceptor.to("MovePhase");
-    await game.toNextTurn();
-
-    expect(castform.formIndex).toBe(SUNNY_FORM);
-
-    game.move.select(Moves.SPLASH);
-    game.doSwitchPokemon(4); // Groudon now 4, Rayquaza 1
-    await game.phaseInterceptor.to("MovePhase");
-    await game.toNextTurn();
-
-    expect(castform.formIndex).toBe(NORMAL_FORM);
-
-    game.move.select(Moves.SPLASH);
-    game.doSwitchPokemon(2); // Rayquaza now 2, Feebas 1
-    await game.phaseInterceptor.to("MovePhase");
-    await game.toNextTurn();
-
-    expect(castform.formIndex).toBe(NORMAL_FORM);
-
-    game.move.select(Moves.SNOWSCAPE);
-    game.move.select(Moves.SPLASH, 1);
-    await game.phaseInterceptor.to("MovePhase");
-    await game.toNextTurn();
-
-    expect(castform.formIndex).toBe(SNOWY_FORM);
-
-    game.move.select(Moves.SPLASH);
-    game.doSwitchPokemon(5); // Feebas now 5, Altaria 1
-    await game.phaseInterceptor.to("MovePhase");
-    await game.toNextTurn();
-
-    expect(castform.formIndex).toBe(NORMAL_FORM);
-
-    game.move.select(Moves.SPLASH);
-    game.doSwitchPokemon(5); // Altaria now 5, Feebas 1
-    await game.phaseInterceptor.to("MovePhase");
-    await game.toNextTurn();
-
-    expect(castform.formIndex).toBe(SNOWY_FORM);
-
-    game.scene.arena.trySetWeather(WeatherType.FOG, false);
-    game.move.select(Moves.SPLASH);
-    game.move.select(Moves.SPLASH, 1);
-    await game.phaseInterceptor.to("TurnStartPhase");
-
-    expect(castform.formIndex).toBe(NORMAL_FORM);
-  }, 30 * 1000);
-
-  it("reverts to Normal Form during Clear weather", async () => {
-    await testWeatherFormChange(game, WeatherType.NONE, NORMAL_FORM, SUNNY_FORM);
-  });
-
-  it("reverts to Normal Form if a Pokémon on the field has Air Lock", async () => {
-    await testRevertFormAgainstAbility(game, Abilities.AIR_LOCK);
-  });
-
-  it("has no effect on Pokémon other than Castform", async () => {
-    game.override.enemyAbility(Abilities.FORECAST).enemySpecies(Species.SHUCKLE);
-    await game.startBattle([ Species.CASTFORM ]);
-
-    game.move.select(Moves.RAIN_DANCE);
-    await game.phaseInterceptor.to(TurnEndPhase);
-
-    expect(game.scene.getPlayerPokemon()?.formIndex).toBe(RAINY_FORM);
-    expect(game.scene.getEnemyPokemon()?.formIndex).not.toBe(RAINY_FORM);
-  });
-
-  it("reverts to Normal Form when Castform loses Forecast, changes form to match the weather when it regains it", async () => {
-    game.override.moveset([ Moves.SKILL_SWAP, Moves.WORRY_SEED, Moves.SPLASH ]).weather(WeatherType.RAIN).battleType("double");
-    await game.startBattle([ Species.CASTFORM, Species.FEEBAS ]);
-
-    const castform = game.scene.getPlayerField()[0];
-
-    expect(castform.formIndex).toBe(RAINY_FORM);
-
-    game.move.select(Moves.SKILL_SWAP, 0, BattlerIndex.PLAYER_2);
-    game.move.select(Moves.SKILL_SWAP, 1, BattlerIndex.PLAYER);
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2 ]);
-
-    await game.phaseInterceptor.to("MoveEndPhase");
-    expect(castform.formIndex).toBe(NORMAL_FORM);
-
-    await game.phaseInterceptor.to("MoveEndPhase");
-    expect(castform.formIndex).toBe(RAINY_FORM);
-
-    await game.toNextTurn();
-
-    game.move.select(Moves.SPLASH);
-    game.move.select(Moves.WORRY_SEED, 1, BattlerIndex.PLAYER);
-    await game.setTurnOrder([ BattlerIndex.PLAYER_2, BattlerIndex.PLAYER, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2 ]);
-    await game.phaseInterceptor.to("MoveEndPhase");
-
-    expect(castform.formIndex).toBe(NORMAL_FORM);
-  });
-
-  it("reverts to Normal Form when Forecast is suppressed, changes form to match the weather when it regains it", async () => {
-    game.override.enemyMoveset([ Moves.GASTRO_ACID ]).weather(WeatherType.RAIN);
-    await game.startBattle([ Species.CASTFORM, Species.PIKACHU ]);
-    const castform = game.scene.getPlayerPokemon()!;
-
-    expect(castform.formIndex).toBe(RAINY_FORM);
-
-    // First turn - Forecast is suppressed
-    game.move.select(Moves.SPLASH);
-    await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]);
-    await game.move.forceHit();
-
-    await game.phaseInterceptor.to(TurnEndPhase);
-
-    expect(castform.summonData.abilitySuppressed).toBe(true);
-    expect(castform.formIndex).toBe(NORMAL_FORM);
-
-    await game.toNextTurn();
-
-    // Second turn - switch out Castform, regains Forecast
-    game.doSwitchPokemon(1);
-    await game.toNextTurn();
-
-    // Third turn - switch in Castform
-    game.doSwitchPokemon(1);
-    await game.phaseInterceptor.to(MovePhase);
-
-    expect(castform.summonData.abilitySuppressed).toBe(false);
-    expect(castform.formIndex).toBe(RAINY_FORM);
-  });
-
-  it("does not change Castform's form until after Stealth Rock deals damage", async () => {
-    game.override.weather(WeatherType.RAIN).enemyMoveset([ Moves.STEALTH_ROCK ]);
-    await game.startBattle([ Species.PIKACHU, Species.CASTFORM ]);
-
-    // First turn - set up stealth rock
-    game.move.select(Moves.SPLASH);
-    await game.toNextTurn();
-
-    // Second turn - switch in Castform, regains Forecast
-    game.doSwitchPokemon(1);
-    await game.phaseInterceptor.to(PostSummonPhase);
-
-    const castform = game.scene.getPlayerPokemon()!;
-
-    // Damage phase should come first
-    await game.phaseInterceptor.to(DamageAnimPhase);
-    expect(castform.hp).toBeLessThan(castform.getMaxHp());
-
-    // Then change form
-    await game.phaseInterceptor.to(QuietFormChangePhase);
-    expect(castform.formIndex).toBe(RAINY_FORM);
-  });
-
-  it("should be in Normal Form after the user is switched out", async () => {
-    game.override.weather(WeatherType.RAIN);
-
-    await game.startBattle([ Species.CASTFORM, Species.MAGIKARP ]);
-    const castform = game.scene.getPlayerPokemon()!;
-
-    expect(castform.formIndex).toBe(RAINY_FORM);
-
-    game.doSwitchPokemon(1);
-    await game.toNextTurn();
-
-    expect(castform.formIndex).toBe(NORMAL_FORM);
-  });
-});
diff --git a/src/test/abilities/galvanize.test.ts b/src/test/abilities/galvanize.test.ts
deleted file mode 100644
index 80e767866ea..00000000000
--- a/src/test/abilities/galvanize.test.ts
+++ /dev/null
@@ -1,131 +0,0 @@
-import { BattlerIndex } from "#app/battle";
-import { allMoves } from "#app/data/move";
-import { Type } from "#enums/type";
-import { Abilities } from "#app/enums/abilities";
-import { Moves } from "#app/enums/moves";
-import { Species } from "#app/enums/species";
-import { HitResult } from "#app/field/pokemon";
-import GameManager from "#test/utils/gameManager";
-import Phaser from "phaser";
-import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
-
-
-describe("Abilities - Galvanize", () => {
-  let phaserGame: Phaser.Game;
-  let game: GameManager;
-
-  beforeAll(() => {
-    phaserGame = new Phaser.Game({
-      type: Phaser.HEADLESS,
-    });
-  });
-
-  afterEach(() => {
-    game.phaseInterceptor.restoreOg();
-  });
-
-  beforeEach(() => {
-    game = new GameManager(phaserGame);
-
-    game.override
-      .battleType("single")
-      .startingLevel(100)
-      .ability(Abilities.GALVANIZE)
-      .moveset([ Moves.TACKLE, Moves.REVELATION_DANCE, Moves.FURY_SWIPES ])
-      .enemySpecies(Species.DUSCLOPS)
-      .enemyAbility(Abilities.BALL_FETCH)
-      .enemyMoveset(Moves.SPLASH)
-      .enemyLevel(100);
-  });
-
-  it("should change Normal-type attacks to Electric type and boost their power", async () => {
-    await game.startBattle();
-
-    const playerPokemon = game.scene.getPlayerPokemon()!;
-    vi.spyOn(playerPokemon, "getMoveType");
-
-    const enemyPokemon = game.scene.getEnemyPokemon()!;
-    vi.spyOn(enemyPokemon, "apply");
-
-    const move = allMoves[Moves.TACKLE];
-    vi.spyOn(move, "calculateBattlePower");
-
-    game.move.select(Moves.TACKLE);
-
-    await game.phaseInterceptor.to("BerryPhase", false);
-
-    expect(playerPokemon.getMoveType).toHaveLastReturnedWith(Type.ELECTRIC);
-    expect(enemyPokemon.apply).toHaveReturnedWith(HitResult.EFFECTIVE);
-    expect(move.calculateBattlePower).toHaveReturnedWith(48);
-    expect(enemyPokemon.hp).toBeLessThan(enemyPokemon.getMaxHp());
-  });
-
-  it("should cause Normal-type attacks to activate Volt Absorb", async () => {
-    game.override.enemyAbility(Abilities.VOLT_ABSORB);
-
-    await game.startBattle();
-
-    const playerPokemon = game.scene.getPlayerPokemon()!;
-    vi.spyOn(playerPokemon, "getMoveType");
-
-    const enemyPokemon = game.scene.getEnemyPokemon()!;
-    vi.spyOn(enemyPokemon, "apply");
-
-    enemyPokemon.hp = Math.floor(enemyPokemon.getMaxHp() * 0.8);
-
-    game.move.select(Moves.TACKLE);
-
-    await game.phaseInterceptor.to("BerryPhase", false);
-
-    expect(playerPokemon.getMoveType).toHaveLastReturnedWith(Type.ELECTRIC);
-    expect(enemyPokemon.apply).toHaveReturnedWith(HitResult.NO_EFFECT);
-    expect(enemyPokemon.hp).toBe(enemyPokemon.getMaxHp());
-  });
-
-  it("should not change the type of variable-type moves", async () => {
-    game.override.enemySpecies(Species.MIGHTYENA);
-
-    await game.startBattle([ Species.ESPEON ]);
-
-    const playerPokemon = game.scene.getPlayerPokemon()!;
-    vi.spyOn(playerPokemon, "getMoveType");
-
-    const enemyPokemon = game.scene.getEnemyPokemon()!;
-    vi.spyOn(enemyPokemon, "apply");
-
-    game.move.select(Moves.REVELATION_DANCE);
-    await game.phaseInterceptor.to("BerryPhase", false);
-
-    expect(playerPokemon.getMoveType).not.toHaveLastReturnedWith(Type.ELECTRIC);
-    expect(enemyPokemon.apply).toHaveReturnedWith(HitResult.NO_EFFECT);
-    expect(enemyPokemon.hp).toBe(enemyPokemon.getMaxHp());
-  });
-
-  it("should affect all hits of a Normal-type multi-hit move", async () => {
-    await game.startBattle();
-
-    const playerPokemon = game.scene.getPlayerPokemon()!;
-    vi.spyOn(playerPokemon, "getMoveType");
-
-    const enemyPokemon = game.scene.getEnemyPokemon()!;
-    vi.spyOn(enemyPokemon, "apply");
-
-    game.move.select(Moves.FURY_SWIPES);
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]);
-    await game.move.forceHit();
-
-    await game.phaseInterceptor.to("MoveEffectPhase");
-    expect(playerPokemon.turnData.hitCount).toBeGreaterThan(1);
-    expect(enemyPokemon.hp).toBeLessThan(enemyPokemon.getMaxHp());
-
-    while (playerPokemon.turnData.hitsLeft > 0) {
-      const enemyStartingHp = enemyPokemon.hp;
-      await game.phaseInterceptor.to("MoveEffectPhase");
-
-      expect(playerPokemon.getMoveType).toHaveLastReturnedWith(Type.ELECTRIC);
-      expect(enemyPokemon.hp).toBeLessThan(enemyStartingHp);
-    }
-
-    expect(enemyPokemon.apply).not.toHaveReturnedWith(HitResult.NO_EFFECT);
-  });
-});
diff --git a/src/test/abilities/libero.test.ts b/src/test/abilities/libero.test.ts
deleted file mode 100644
index 42627da51a3..00000000000
--- a/src/test/abilities/libero.test.ts
+++ /dev/null
@@ -1,347 +0,0 @@
-import { allMoves } from "#app/data/move";
-import { Type } from "#enums/type";
-import { Weather } from "#app/data/weather";
-import type { PlayerPokemon } from "#app/field/pokemon";
-import { TurnEndPhase } from "#app/phases/turn-end-phase";
-import { Abilities } from "#enums/abilities";
-import { BattlerTagType } from "#enums/battler-tag-type";
-import { Biome } from "#enums/biome";
-import { Moves } from "#enums/moves";
-import { Species } from "#enums/species";
-import { WeatherType } from "#enums/weather-type";
-import GameManager from "#test/utils/gameManager";
-import Phaser from "phaser";
-import { afterEach, beforeAll, beforeEach, describe, expect, test, vi } from "vitest";
-
-
-describe("Abilities - Libero", () => {
-  let phaserGame: Phaser.Game;
-  let game: GameManager;
-
-  beforeAll(() => {
-    phaserGame = new Phaser.Game({
-      type: Phaser.HEADLESS,
-    });
-  });
-
-  afterEach(() => {
-    game.phaseInterceptor.restoreOg();
-  });
-
-  beforeEach(() => {
-    game = new GameManager(phaserGame);
-    game.override.battleType("single");
-    game.override.ability(Abilities.LIBERO);
-    game.override.startingLevel(100);
-    game.override.enemySpecies(Species.RATTATA);
-    game.override.enemyMoveset([ Moves.ENDURE, Moves.ENDURE, Moves.ENDURE, Moves.ENDURE ]);
-  });
-
-  test(
-    "ability applies and changes a pokemon's type",
-    async () => {
-      game.override.moveset([ Moves.SPLASH ]);
-
-      await game.startBattle([ Species.MAGIKARP ]);
-
-      const leadPokemon = game.scene.getPlayerPokemon()!;
-      expect(leadPokemon).not.toBe(undefined);
-
-      game.move.select(Moves.SPLASH);
-      await game.phaseInterceptor.to(TurnEndPhase);
-
-      testPokemonTypeMatchesDefaultMoveType(leadPokemon, Moves.SPLASH);
-    },
-  );
-
-  // Test for Gen9+ functionality, we are using previous funcionality
-  test.skip(
-    "ability applies only once per switch in",
-    async () => {
-      game.override.moveset([ Moves.SPLASH, Moves.AGILITY ]);
-
-      await game.startBattle([ Species.MAGIKARP, Species.BULBASAUR ]);
-
-      let leadPokemon = game.scene.getPlayerPokemon()!;
-      expect(leadPokemon).not.toBe(undefined);
-
-      game.move.select(Moves.SPLASH);
-      await game.phaseInterceptor.to(TurnEndPhase);
-
-      testPokemonTypeMatchesDefaultMoveType(leadPokemon, Moves.SPLASH);
-
-      game.move.select(Moves.AGILITY);
-      await game.phaseInterceptor.to(TurnEndPhase);
-
-      expect(leadPokemon.summonData.abilitiesApplied.filter((a) => a === Abilities.LIBERO)).toHaveLength(1);
-      const leadPokemonType = Type[leadPokemon.getTypes()[0]];
-      const moveType = Type[allMoves[Moves.AGILITY].type];
-      expect(leadPokemonType).not.toBe(moveType);
-
-      await game.toNextTurn();
-      game.doSwitchPokemon(1);
-      await game.toNextTurn();
-      game.doSwitchPokemon(1);
-      await game.toNextTurn();
-
-      leadPokemon = game.scene.getPlayerPokemon()!;
-      expect(leadPokemon).not.toBe(undefined);
-
-      game.move.select(Moves.SPLASH);
-      await game.phaseInterceptor.to(TurnEndPhase);
-
-      testPokemonTypeMatchesDefaultMoveType(leadPokemon, Moves.SPLASH);
-    },
-  );
-
-  test(
-    "ability applies correctly even if the pokemon's move has a variable type",
-    async () => {
-      game.override.moveset([ Moves.WEATHER_BALL ]);
-
-      await game.startBattle([ Species.MAGIKARP ]);
-
-      const leadPokemon = game.scene.getPlayerPokemon()!;
-      expect(leadPokemon).not.toBe(undefined);
-
-      game.scene.arena.weather = new Weather(WeatherType.SUNNY);
-      game.move.select(Moves.WEATHER_BALL);
-      await game.phaseInterceptor.to(TurnEndPhase);
-
-      expect(leadPokemon.summonData.abilitiesApplied).toContain(Abilities.LIBERO);
-      expect(leadPokemon.getTypes()).toHaveLength(1);
-      const leadPokemonType = Type[leadPokemon.getTypes()[0]],
-        moveType = Type[Type.FIRE];
-      expect(leadPokemonType).toBe(moveType);
-    },
-  );
-
-  test(
-    "ability applies correctly even if the type has changed by another ability",
-    async () => {
-      game.override.moveset([ Moves.TACKLE ]);
-      game.override.passiveAbility(Abilities.REFRIGERATE);
-
-      await game.startBattle([ Species.MAGIKARP ]);
-
-      const leadPokemon = game.scene.getPlayerPokemon()!;
-      expect(leadPokemon).not.toBe(undefined);
-
-      game.move.select(Moves.TACKLE);
-      await game.phaseInterceptor.to(TurnEndPhase);
-
-      expect(leadPokemon.summonData.abilitiesApplied).toContain(Abilities.LIBERO);
-      expect(leadPokemon.getTypes()).toHaveLength(1);
-      const leadPokemonType = Type[leadPokemon.getTypes()[0]],
-        moveType = Type[Type.ICE];
-      expect(leadPokemonType).toBe(moveType);
-    },
-  );
-
-  test(
-    "ability applies correctly even if the pokemon's move calls another move",
-    async () => {
-      game.override.moveset([ Moves.NATURE_POWER ]);
-
-      await game.startBattle([ Species.MAGIKARP ]);
-
-      const leadPokemon = game.scene.getPlayerPokemon()!;
-      expect(leadPokemon).not.toBe(undefined);
-
-      game.scene.arena.biomeType = Biome.MOUNTAIN;
-      game.move.select(Moves.NATURE_POWER);
-      await game.phaseInterceptor.to(TurnEndPhase);
-
-      testPokemonTypeMatchesDefaultMoveType(leadPokemon, Moves.AIR_SLASH);
-    },
-  );
-
-  test(
-    "ability applies correctly even if the pokemon's move is delayed / charging",
-    async () => {
-      game.override.moveset([ Moves.DIG ]);
-
-      await game.startBattle([ Species.MAGIKARP ]);
-
-      const leadPokemon = game.scene.getPlayerPokemon()!;
-      expect(leadPokemon).not.toBe(undefined);
-
-      game.move.select(Moves.DIG);
-      await game.phaseInterceptor.to(TurnEndPhase);
-
-      testPokemonTypeMatchesDefaultMoveType(leadPokemon, Moves.DIG);
-    },
-  );
-
-  test(
-    "ability applies correctly even if the pokemon's move misses",
-    async () => {
-      game.override.moveset([ Moves.TACKLE ]);
-      game.override.enemyMoveset(Moves.SPLASH);
-
-      await game.startBattle([ Species.MAGIKARP ]);
-
-      const leadPokemon = game.scene.getPlayerPokemon()!;
-      expect(leadPokemon).not.toBe(undefined);
-
-      game.move.select(Moves.TACKLE);
-      await game.move.forceMiss();
-      await game.phaseInterceptor.to(TurnEndPhase);
-
-      const enemyPokemon = game.scene.getEnemyPokemon()!;
-      expect(enemyPokemon.isFullHp()).toBe(true);
-      testPokemonTypeMatchesDefaultMoveType(leadPokemon, Moves.TACKLE);
-    },
-  );
-
-  test(
-    "ability applies correctly even if the pokemon's move is protected against",
-    async () => {
-      game.override.moveset([ Moves.TACKLE ]);
-      game.override.enemyMoveset([ Moves.PROTECT, Moves.PROTECT, Moves.PROTECT, Moves.PROTECT ]);
-
-      await game.startBattle([ Species.MAGIKARP ]);
-
-      const leadPokemon = game.scene.getPlayerPokemon()!;
-      expect(leadPokemon).not.toBe(undefined);
-
-      game.move.select(Moves.TACKLE);
-      await game.phaseInterceptor.to(TurnEndPhase);
-
-      testPokemonTypeMatchesDefaultMoveType(leadPokemon, Moves.TACKLE);
-    },
-  );
-
-  test(
-    "ability applies correctly even if the pokemon's move fails because of type immunity",
-    async () => {
-      game.override.moveset([ Moves.TACKLE ]);
-      game.override.enemySpecies(Species.GASTLY);
-
-      await game.startBattle([ Species.MAGIKARP ]);
-
-      const leadPokemon = game.scene.getPlayerPokemon()!;
-      expect(leadPokemon).not.toBe(undefined);
-
-      game.move.select(Moves.TACKLE);
-      await game.phaseInterceptor.to(TurnEndPhase);
-
-      testPokemonTypeMatchesDefaultMoveType(leadPokemon, Moves.TACKLE);
-    },
-  );
-
-  test(
-    "ability is not applied if pokemon's type is the same as the move's type",
-    async () => {
-      game.override.moveset([ Moves.SPLASH ]);
-
-      await game.startBattle([ Species.MAGIKARP ]);
-
-      const leadPokemon = game.scene.getPlayerPokemon()!;
-      expect(leadPokemon).not.toBe(undefined);
-
-      leadPokemon.summonData.types = [ allMoves[Moves.SPLASH].type ];
-      game.move.select(Moves.SPLASH);
-      await game.phaseInterceptor.to(TurnEndPhase);
-
-      expect(leadPokemon.summonData.abilitiesApplied).not.toContain(Abilities.LIBERO);
-    },
-  );
-
-  test(
-    "ability is not applied if pokemon is terastallized",
-    async () => {
-      game.override.moveset([ Moves.SPLASH ]);
-
-      await game.startBattle([ Species.MAGIKARP ]);
-
-      const leadPokemon = game.scene.getPlayerPokemon()!;
-      expect(leadPokemon).not.toBe(undefined);
-
-      vi.spyOn(leadPokemon, "isTerastallized").mockReturnValue(true);
-
-      game.move.select(Moves.SPLASH);
-      await game.phaseInterceptor.to(TurnEndPhase);
-
-      expect(leadPokemon.summonData.abilitiesApplied).not.toContain(Abilities.LIBERO);
-    },
-  );
-
-  test(
-    "ability is not applied if pokemon uses struggle",
-    async () => {
-      game.override.moveset([ Moves.STRUGGLE ]);
-
-      await game.startBattle([ Species.MAGIKARP ]);
-
-      const leadPokemon = game.scene.getPlayerPokemon()!;
-      expect(leadPokemon).not.toBe(undefined);
-
-      game.move.select(Moves.STRUGGLE);
-      await game.phaseInterceptor.to(TurnEndPhase);
-
-      expect(leadPokemon.summonData.abilitiesApplied).not.toContain(Abilities.LIBERO);
-    },
-  );
-
-  test(
-    "ability is not applied if the pokemon's move fails",
-    async () => {
-      game.override.moveset([ Moves.BURN_UP ]);
-
-      await game.startBattle([ Species.MAGIKARP ]);
-
-      const leadPokemon = game.scene.getPlayerPokemon()!;
-      expect(leadPokemon).not.toBe(undefined);
-
-      game.move.select(Moves.BURN_UP);
-      await game.phaseInterceptor.to(TurnEndPhase);
-
-      expect(leadPokemon.summonData.abilitiesApplied).not.toContain(Abilities.LIBERO);
-    },
-  );
-
-  test(
-    "ability applies correctly even if the pokemon's Trick-or-Treat fails",
-    async () => {
-      game.override.moveset([ Moves.TRICK_OR_TREAT ]);
-      game.override.enemySpecies(Species.GASTLY);
-
-      await game.startBattle([ Species.MAGIKARP ]);
-
-      const leadPokemon = game.scene.getPlayerPokemon()!;
-      expect(leadPokemon).not.toBe(undefined);
-
-      game.move.select(Moves.TRICK_OR_TREAT);
-      await game.phaseInterceptor.to(TurnEndPhase);
-
-      testPokemonTypeMatchesDefaultMoveType(leadPokemon, Moves.TRICK_OR_TREAT);
-    },
-  );
-
-  test(
-    "ability applies correctly and the pokemon curses itself",
-    async () => {
-      game.override.moveset([ Moves.CURSE ]);
-
-      await game.startBattle([ Species.MAGIKARP ]);
-
-      const leadPokemon = game.scene.getPlayerPokemon()!;
-      expect(leadPokemon).not.toBe(undefined);
-
-      game.move.select(Moves.CURSE);
-      await game.phaseInterceptor.to(TurnEndPhase);
-
-      testPokemonTypeMatchesDefaultMoveType(leadPokemon, Moves.CURSE);
-      expect(leadPokemon.getTag(BattlerTagType.CURSED)).not.toBe(undefined);
-    },
-  );
-});
-
-function testPokemonTypeMatchesDefaultMoveType(pokemon: PlayerPokemon, move: Moves) {
-  expect(pokemon.summonData.abilitiesApplied).toContain(Abilities.LIBERO);
-  expect(pokemon.getTypes()).toHaveLength(1);
-  const pokemonType = Type[pokemon.getTypes()[0]],
-    moveType = Type[allMoves[move].type];
-  expect(pokemonType).toBe(moveType);
-}
diff --git a/src/test/abilities/magic_guard.test.ts b/src/test/abilities/magic_guard.test.ts
deleted file mode 100644
index 7c038354748..00000000000
--- a/src/test/abilities/magic_guard.test.ts
+++ /dev/null
@@ -1,468 +0,0 @@
-import { ArenaTagSide, getArenaTag } from "#app/data/arena-tag";
-import { getStatusEffectCatchRateMultiplier } from "#app/data/status-effect";
-import { TurnEndPhase } from "#app/phases/turn-end-phase";
-import { Abilities } from "#enums/abilities";
-import { ArenaTagType } from "#enums/arena-tag-type";
-import { BattlerTagType } from "#enums/battler-tag-type";
-import { Moves } from "#enums/moves";
-import { Species } from "#enums/species";
-import { StatusEffect } from "#enums/status-effect";
-import { WeatherType } from "#enums/weather-type";
-import GameManager from "#test/utils/gameManager";
-import Phaser from "phaser";
-import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
-
-describe("Abilities - Magic Guard", () => {
-  let phaserGame: Phaser.Game;
-  let game: GameManager;
-
-  beforeAll(() => {
-    phaserGame = new Phaser.Game({
-      type: Phaser.HEADLESS,
-    });
-  });
-
-  afterEach(() => {
-    game.phaseInterceptor.restoreOg();
-  });
-
-  beforeEach(() => {
-    game = new GameManager(phaserGame);
-
-    /** Player Pokemon overrides */
-    game.override.ability(Abilities.MAGIC_GUARD);
-    game.override.moveset([ Moves.SPLASH ]);
-    game.override.startingLevel(100);
-
-    /** Enemy Pokemon overrides */
-    game.override.enemySpecies(Species.SNORLAX);
-    game.override.enemyAbility(Abilities.INSOMNIA);
-    game.override.enemyMoveset(Moves.SPLASH);
-    game.override.enemyLevel(100);
-  });
-
-  //Bulbapedia Reference: https://bulbapedia.bulbagarden.net/wiki/Magic_Guard_(Ability)
-
-  it(
-    "ability should prevent damage caused by weather",
-    async () => {
-      game.override.weather(WeatherType.SANDSTORM);
-
-      await game.startBattle([ Species.MAGIKARP ]);
-
-      const leadPokemon = game.scene.getPlayerPokemon()!;
-
-      const enemyPokemon = game.scene.getEnemyPokemon()!;
-      expect(enemyPokemon).toBeDefined();
-
-      game.move.select(Moves.SPLASH);
-
-      await game.phaseInterceptor.to(TurnEndPhase);
-
-      /**
-       * Expect:
-       * - The player Pokemon (with Magic Guard) has not taken damage from weather
-       * - The enemy Pokemon (without Magic Guard) has taken damage from weather
-       */
-      expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp());
-      expect(enemyPokemon.hp).toBeLessThan(enemyPokemon.getMaxHp());
-    }
-  );
-
-  it(
-    "ability should prevent damage caused by status effects but other non-damage effects still apply",
-    async () => {
-      //Toxic keeps track of the turn counters -> important that Magic Guard keeps track of post-Toxic turns
-      game.override.statusEffect(StatusEffect.POISON);
-
-      await game.startBattle([ Species.MAGIKARP ]);
-
-      const leadPokemon = game.scene.getPlayerPokemon()!;
-
-      game.move.select(Moves.SPLASH);
-
-      await game.phaseInterceptor.to(TurnEndPhase);
-
-      /**
-       * Expect:
-       * - The player Pokemon (with Magic Guard) has not taken damage from poison
-       * - The Pokemon's CatchRateMultiplier should be 1.5
-       */
-      expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp());
-      expect(getStatusEffectCatchRateMultiplier(leadPokemon.status!.effect)).toBe(1.5);
-    }
-  );
-
-  it(
-    "ability effect should not persist when the ability is replaced",
-    async () => {
-      game.override.enemyMoveset([ Moves.WORRY_SEED, Moves.WORRY_SEED, Moves.WORRY_SEED, Moves.WORRY_SEED ]);
-      game.override.statusEffect(StatusEffect.POISON);
-
-      await game.startBattle([ Species.MAGIKARP ]);
-
-      const leadPokemon = game.scene.getPlayerPokemon()!;
-
-      game.move.select(Moves.SPLASH);
-
-      await game.phaseInterceptor.to(TurnEndPhase);
-
-      /**
-       * Expect:
-       * - The player Pokemon (that just lost its Magic Guard ability) has taken damage from poison
-       */
-      expect(leadPokemon.hp).toBeLessThan(leadPokemon.getMaxHp());
-    }
-  );
-
-
-  it("Magic Guard prevents damage caused by burn but other non-damaging effects are still applied",
-    async () => {
-      game.override.enemyStatusEffect(StatusEffect.BURN);
-      game.override.enemyAbility(Abilities.MAGIC_GUARD);
-
-      await game.startBattle([ Species.MAGIKARP ]);
-
-      game.move.select(Moves.SPLASH);
-
-      const enemyPokemon = game.scene.getEnemyPokemon()!;
-
-      await game.phaseInterceptor.to(TurnEndPhase);
-
-      /**
-       * Expect:
-       * - The enemy Pokemon (with Magic Guard) has not taken damage from burn
-       * - The enemy Pokemon's physical attack damage is halved (TBD)
-       * - The enemy Pokemon's hypothetical CatchRateMultiplier should be 1.5
-       */
-      expect(enemyPokemon.hp).toBe(enemyPokemon.getMaxHp());
-      expect(getStatusEffectCatchRateMultiplier(enemyPokemon.status!.effect)).toBe(1.5);
-    }
-  );
-
-  it("Magic Guard prevents damage caused by toxic but other non-damaging effects are still applied",
-    async () => {
-      game.override.enemyStatusEffect(StatusEffect.TOXIC);
-      game.override.enemyAbility(Abilities.MAGIC_GUARD);
-
-      await game.startBattle([ Species.MAGIKARP ]);
-
-      game.move.select(Moves.SPLASH);
-
-      const enemyPokemon = game.scene.getEnemyPokemon()!;
-
-      const toxicStartCounter = enemyPokemon.status!.toxicTurnCount;
-      //should be 0
-
-      await game.phaseInterceptor.to(TurnEndPhase);
-
-      /**
-       * Expect:
-       * - The enemy Pokemon (with Magic Guard) has not taken damage from toxic
-       * - The enemy Pokemon's status effect duration should be incremented
-       * - The enemy Pokemon's hypothetical CatchRateMultiplier should be 1.5
-       */
-      expect(enemyPokemon.hp).toBe(enemyPokemon.getMaxHp());
-      expect(enemyPokemon.status!.toxicTurnCount).toBeGreaterThan(toxicStartCounter);
-      expect(getStatusEffectCatchRateMultiplier(enemyPokemon.status!.effect)).toBe(1.5);
-    }
-  );
-
-
-  it("Magic Guard prevents damage caused by entry hazards", async () => {
-    //Adds and applies Spikes to both sides of the arena
-    const newTag = getArenaTag(ArenaTagType.SPIKES, 5, Moves.SPIKES, 0, 0, ArenaTagSide.BOTH)!;
-    game.scene.arena.tags.push(newTag);
-
-    await game.startBattle([ Species.MAGIKARP ]);
-    const leadPokemon = game.scene.getPlayerPokemon()!;
-
-    game.move.select(Moves.SPLASH);
-
-    const enemyPokemon = game.scene.getEnemyPokemon()!;
-
-    await game.phaseInterceptor.to(TurnEndPhase);
-
-    /**
-    * Expect:
-    * - The player Pokemon (with Magic Guard) has not taken damage from spikes
-    * - The enemy Pokemon (without Magic Guard) has taken damage from spikes
-    */
-    expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp());
-    expect(enemyPokemon.hp).toBeLessThan(enemyPokemon.getMaxHp());
-  }
-  );
-
-  it("Magic Guard does not prevent poison from Toxic Spikes", async () => {
-    //Adds and applies Spikes to both sides of the arena
-    const playerTag = getArenaTag(ArenaTagType.TOXIC_SPIKES, 5, Moves.TOXIC_SPIKES, 0, 0, ArenaTagSide.PLAYER)!;
-    const enemyTag = getArenaTag(ArenaTagType.TOXIC_SPIKES, 5, Moves.TOXIC_SPIKES, 0, 0, ArenaTagSide.ENEMY)!;
-    game.scene.arena.tags.push(playerTag);
-    game.scene.arena.tags.push(enemyTag);
-
-    await game.startBattle([ Species.MAGIKARP ]);
-    const leadPokemon = game.scene.getPlayerPokemon()!;
-
-    game.move.select(Moves.SPLASH);
-
-    const enemyPokemon = game.scene.getEnemyPokemon()!;
-
-    await game.phaseInterceptor.to(TurnEndPhase);
-
-    /**
-    * Expect:
-    * - Both Pokemon gain the poison status effect
-    * - The player Pokemon (with Magic Guard) has not taken damage from poison
-    * - The enemy Pokemon (without Magic Guard) has taken damage from poison
-    */
-    expect(leadPokemon.status!.effect).toBe(StatusEffect.POISON);
-    expect(enemyPokemon.status!.effect).toBe(StatusEffect.POISON);
-    expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp());
-    expect(enemyPokemon.hp).toBeLessThan(enemyPokemon.getMaxHp());
-  }
-  );
-
-  it("Magic Guard prevents against damage from volatile status effects",
-    async () => {
-      await game.startBattle([ Species.DUSKULL ]);
-      game.override.moveset([ Moves.CURSE ]);
-      game.override.enemyAbility(Abilities.MAGIC_GUARD);
-
-      const leadPokemon = game.scene.getPlayerPokemon()!;
-
-      game.move.select(Moves.CURSE);
-
-      const enemyPokemon = game.scene.getEnemyPokemon()!;
-
-      await game.phaseInterceptor.to(TurnEndPhase);
-
-      /**
-    * Expect:
-    * - The player Pokemon (with Magic Guard) has cut its HP to inflict curse
-    * - The enemy Pokemon (with Magic Guard) is cursed
-    * - The enemy Pokemon (with Magic Guard) does not lose HP from being cursed
-    */
-      expect(leadPokemon.hp).toBeLessThan(leadPokemon.getMaxHp());
-      expect(enemyPokemon.getTag(BattlerTagType.CURSED)).not.toBe(undefined);
-      expect(enemyPokemon.hp).toBe(enemyPokemon.getMaxHp());
-    }
-  );
-
-  it("Magic Guard prevents crash damage", async () => {
-    game.override.moveset([ Moves.HIGH_JUMP_KICK ]);
-    await game.startBattle([ Species.MAGIKARP ]);
-
-    const leadPokemon = game.scene.getPlayerPokemon()!;
-
-    game.move.select(Moves.HIGH_JUMP_KICK);
-    await game.move.forceMiss();
-
-    await game.phaseInterceptor.to(TurnEndPhase);
-
-    /**
-    * Expect:
-    * - The player Pokemon (with Magic Guard) misses High Jump Kick but does not lose HP as a result
-    */
-    expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp());
-  }
-  );
-
-  it("Magic Guard prevents damage from recoil", async () => {
-    game.override.moveset([ Moves.TAKE_DOWN ]);
-    await game.startBattle([ Species.MAGIKARP ]);
-
-    const leadPokemon = game.scene.getPlayerPokemon()!;
-
-    game.move.select(Moves.TAKE_DOWN);
-
-    await game.phaseInterceptor.to(TurnEndPhase);
-
-    /**
-    * Expect:
-    * - The player Pokemon (with Magic Guard) uses a recoil move but does not lose HP from recoil
-    */
-    expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp());
-  }
-  );
-
-  it("Magic Guard does not prevent damage from Struggle's recoil", async () => {
-    game.override.moveset([ Moves.STRUGGLE ]);
-    await game.startBattle([ Species.MAGIKARP ]);
-
-    const leadPokemon = game.scene.getPlayerPokemon()!;
-
-    game.move.select(Moves.STRUGGLE);
-
-    await game.phaseInterceptor.to(TurnEndPhase);
-
-    /**
-    * Expect:
-    * - The player Pokemon (with Magic Guard) uses Struggle but does lose HP from Struggle's recoil
-    */
-    expect(leadPokemon.hp).toBeLessThan(leadPokemon.getMaxHp());
-  }
-  );
-
-  //This tests different move attributes than the recoil tests above
-  it("Magic Guard prevents self-damage from attacking moves", async () => {
-    game.override.moveset([ Moves.STEEL_BEAM ]);
-    await game.startBattle([ Species.MAGIKARP ]);
-
-    const leadPokemon = game.scene.getPlayerPokemon()!;
-
-    game.move.select(Moves.STEEL_BEAM);
-
-    await game.phaseInterceptor.to(TurnEndPhase);
-
-    /**
-    * Expect:
-    * - The player Pokemon (with Magic Guard) uses a move with an HP cost but does not lose HP from using it
-    */
-    expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp());
-  }
-  );
-
-  /*
-  it("Magic Guard does not prevent self-damage from confusion", async () => {
-    await game.startBattle([Species.MAGIKARP]);
-
-    game.move.select(Moves.CHARM);
-
-    await game.phaseInterceptor.to(TurnEndPhase);
-  });
-*/
-
-  it("Magic Guard does not prevent self-damage from non-attacking moves", async () => {
-    game.override.moveset([ Moves.BELLY_DRUM ]);
-    await game.startBattle([ Species.MAGIKARP ]);
-
-    const leadPokemon = game.scene.getPlayerPokemon()!;
-
-    game.move.select(Moves.BELLY_DRUM);
-
-    await game.phaseInterceptor.to(TurnEndPhase);
-
-    /**
-    * Expect:
-    * - The player Pokemon (with Magic Guard) uses a non-attacking move with an HP cost and thus loses HP from using it
-    */
-    expect(leadPokemon.hp).toBeLessThan(leadPokemon.getMaxHp());
-  }
-  );
-
-  it("Magic Guard prevents damage from abilities with PostTurnHurtIfSleepingAbAttr", async () => {
-    //Tests the ability Bad Dreams
-    game.override.statusEffect(StatusEffect.SLEEP);
-    //enemy pokemon is given Spore just in case player pokemon somehow awakens during test
-    game.override.enemyMoveset([ Moves.SPORE, Moves.SPORE, Moves.SPORE, Moves.SPORE ]);
-    game.override.enemyAbility(Abilities.BAD_DREAMS);
-
-    await game.startBattle([ Species.MAGIKARP ]);
-
-    const leadPokemon = game.scene.getPlayerPokemon()!;
-
-    game.move.select(Moves.SPLASH);
-
-    await game.phaseInterceptor.to(TurnEndPhase);
-
-    /**
-    * Expect:
-    * - The player Pokemon (with Magic Guard) should not lose HP due to this ability attribute
-    * - The player Pokemon is asleep
-    */
-    expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp());
-    expect(leadPokemon.status!.effect).toBe(StatusEffect.SLEEP);
-  }
-  );
-
-  it("Magic Guard prevents damage from abilities with PostFaintContactDamageAbAttr", async () => {
-    //Tests the abilities Innards Out/Aftermath
-    game.override.moveset([ Moves.TACKLE ]);
-    game.override.enemyAbility(Abilities.AFTERMATH);
-
-    await game.startBattle([ Species.MAGIKARP ]);
-
-    const leadPokemon = game.scene.getPlayerPokemon()!;
-
-    const enemyPokemon = game.scene.getEnemyPokemon()!;
-    enemyPokemon.hp = 1;
-
-    game.move.select(Moves.TACKLE);
-    await game.phaseInterceptor.to(TurnEndPhase);
-
-    /**
-    * Expect:
-    * - The player Pokemon (with Magic Guard) should not lose HP due to this ability attribute
-    * - The enemy Pokemon has fainted
-    */
-    expect(enemyPokemon.hp).toBe(0);
-    expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp());
-  }
-  );
-
-  it("Magic Guard prevents damage from abilities with PostDefendContactDamageAbAttr", async () => {
-    //Tests the abilities Iron Barbs/Rough Skin
-    game.override.moveset([ Moves.TACKLE ]);
-    game.override.enemyAbility(Abilities.IRON_BARBS);
-
-    await game.startBattle([ Species.MAGIKARP ]);
-
-    const leadPokemon = game.scene.getPlayerPokemon()!;
-
-    const enemyPokemon = game.scene.getEnemyPokemon()!;
-
-    game.move.select(Moves.TACKLE);
-    await game.phaseInterceptor.to(TurnEndPhase);
-
-    /**
-    * Expect:
-    * - The player Pokemon (with Magic Guard) should not lose HP due to this ability attribute
-    * - The player Pokemon's move should have connected
-    */
-    expect(enemyPokemon.hp).toBeLessThan(enemyPokemon.getMaxHp());
-    expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp());
-  }
-  );
-
-  it("Magic Guard prevents damage from abilities with ReverseDrainAbAttr", async () => {
-    //Tests the ability Liquid Ooze
-    game.override.moveset([ Moves.ABSORB ]);
-    game.override.enemyAbility(Abilities.LIQUID_OOZE);
-
-    await game.startBattle([ Species.MAGIKARP ]);
-
-    const leadPokemon = game.scene.getPlayerPokemon()!;
-
-    const enemyPokemon = game.scene.getEnemyPokemon()!;
-
-    game.move.select(Moves.ABSORB);
-    await game.phaseInterceptor.to(TurnEndPhase);
-
-    /**
-    * Expect:
-    * - The player Pokemon (with Magic Guard) should not lose HP due to this ability attribute
-    * - The player Pokemon's move should have connected
-    */
-    expect(enemyPokemon.hp).toBeLessThan(enemyPokemon.getMaxHp());
-    expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp());
-  }
-  );
-
-  it("Magic Guard prevents HP loss from abilities with PostWeatherLapseDamageAbAttr", async () => {
-    //Tests the abilities Solar Power/Dry Skin
-    game.override.passiveAbility(Abilities.SOLAR_POWER);
-    game.override.weather(WeatherType.SUNNY);
-
-    await game.startBattle([ Species.MAGIKARP ]);
-    const leadPokemon = game.scene.getPlayerPokemon()!;
-    game.move.select(Moves.SPLASH);
-    await game.phaseInterceptor.to(TurnEndPhase);
-
-    /**
-    * Expect:
-    * - The player Pokemon (with Magic Guard) should not lose HP due to this ability attribute
-    */
-    expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp());
-  }
-  );
-});
diff --git a/src/test/abilities/moody.test.ts b/src/test/abilities/moody.test.ts
deleted file mode 100644
index 166f69b0fe3..00000000000
--- a/src/test/abilities/moody.test.ts
+++ /dev/null
@@ -1,88 +0,0 @@
-import { BATTLE_STATS, EFFECTIVE_STATS } from "#enums/stat";
-import { Abilities } from "#enums/abilities";
-import { Moves } from "#enums/moves";
-import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
-import Phaser from "phaser";
-import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
-
-describe("Abilities - Moody", () => {
-  let phaserGame: Phaser.Game;
-  let game: GameManager;
-
-  beforeAll(() => {
-    phaserGame = new Phaser.Game({
-      type: Phaser.HEADLESS,
-    });
-  });
-
-  afterEach(() => {
-    game.phaseInterceptor.restoreOg();
-  });
-
-  beforeEach(() => {
-    game = new GameManager(phaserGame);
-
-    game.override
-      .battleType("single")
-      .enemySpecies(Species.RATTATA)
-      .enemyAbility(Abilities.BALL_FETCH)
-      .ability(Abilities.MOODY)
-      .enemyMoveset(Moves.SPLASH)
-      .moveset(Moves.SPLASH);
-  });
-
-  it("should increase one stat stage by 2 and decrease a different stat stage by 1",
-    async () => {
-      await game.classicMode.startBattle();
-
-      const playerPokemon = game.scene.getPlayerPokemon()!;
-      game.move.select(Moves.SPLASH);
-      await game.toNextTurn();
-
-      // Find the increased and decreased stats, make sure they are different.
-      const changedStats = EFFECTIVE_STATS.filter(s => playerPokemon.getStatStage(s) === 2 || playerPokemon.getStatStage(s) === -1);
-
-      expect(changedStats).toBeTruthy();
-      expect(changedStats.length).toBe(2);
-      expect(changedStats[0] !== changedStats[1]).toBeTruthy();
-    });
-
-  it("should only increase one stat stage by 2 if all stat stages are at -6",
-    async () => {
-      await game.classicMode.startBattle();
-
-      const playerPokemon = game.scene.getPlayerPokemon()!;
-
-      // Set all stat stages to -6
-      vi.spyOn(playerPokemon.summonData, "statStages", "get").mockReturnValue(new Array(BATTLE_STATS.length).fill(-6));
-
-      game.move.select(Moves.SPLASH);
-      await game.toNextTurn();
-
-      // Should increase one stat stage by 2 (from -6, meaning it will be -4)
-      const increasedStat = EFFECTIVE_STATS.filter(s => playerPokemon.getStatStage(s) === -4);
-
-      expect(increasedStat).toBeTruthy();
-      expect(increasedStat.length).toBe(1);
-    });
-
-  it("should only decrease one stat stage by 1 stage if all stat stages are at 6",
-    async () => {
-      await game.classicMode.startBattle();
-
-      const playerPokemon = game.scene.getPlayerPokemon()!;
-
-      // Set all stat stages to 6
-      vi.spyOn(playerPokemon.summonData, "statStages", "get").mockReturnValue(new Array(BATTLE_STATS.length).fill(6));
-
-      game.move.select(Moves.SPLASH);
-      await game.toNextTurn();
-
-      // Should decrease one stat stage by 1 (from 6, meaning it will be 5)
-      const decreasedStat = EFFECTIVE_STATS.filter(s => playerPokemon.getStatStage(s) === 5);
-
-      expect(decreasedStat).toBeTruthy();
-      expect(decreasedStat.length).toBe(1);
-    });
-});
diff --git a/src/test/abilities/parental_bond.test.ts b/src/test/abilities/parental_bond.test.ts
deleted file mode 100644
index c2f54fa4cfc..00000000000
--- a/src/test/abilities/parental_bond.test.ts
+++ /dev/null
@@ -1,494 +0,0 @@
-import { Type } from "#enums/type";
-import { BattlerTagType } from "#enums/battler-tag-type";
-import { toDmgValue } from "#app/utils";
-import { Abilities } from "#enums/abilities";
-import { Moves } from "#enums/moves";
-import { Species } from "#enums/species";
-import { Stat } from "#enums/stat";
-import { StatusEffect } from "#enums/status-effect";
-import GameManager from "#test/utils/gameManager";
-import Phaser from "phaser";
-import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
-
-
-describe("Abilities - Parental Bond", () => {
-  let phaserGame: Phaser.Game;
-  let game: GameManager;
-
-  beforeAll(() => {
-    phaserGame = new Phaser.Game({
-      type: Phaser.HEADLESS,
-    });
-  });
-
-  afterEach(() => {
-    game.phaseInterceptor.restoreOg();
-  });
-
-  beforeEach(() => {
-    game = new GameManager(phaserGame);
-    game.override.battleType("single");
-    game.override.disableCrits();
-    game.override.ability(Abilities.PARENTAL_BOND);
-    game.override.enemySpecies(Species.SNORLAX);
-    game.override.enemyAbility(Abilities.FUR_COAT);
-    game.override.enemyMoveset(Moves.SPLASH);
-    game.override.startingLevel(100);
-    game.override.enemyLevel(100);
-  });
-
-  it(
-    "should add second strike to attack move",
-    async () => {
-      game.override.moveset([ Moves.TACKLE ]);
-
-      await game.classicMode.startBattle([ Species.MAGIKARP ]);
-
-      const leadPokemon = game.scene.getPlayerPokemon()!;
-      const enemyPokemon = game.scene.getEnemyPokemon()!;
-
-      let enemyStartingHp = enemyPokemon.hp;
-
-      game.move.select(Moves.TACKLE);
-
-      await game.phaseInterceptor.to("DamageAnimPhase");
-      const firstStrikeDamage = enemyStartingHp - enemyPokemon.hp;
-      enemyStartingHp = enemyPokemon.hp;
-
-      await game.phaseInterceptor.to("BerryPhase", false);
-
-      const secondStrikeDamage = enemyStartingHp - enemyPokemon.hp;
-
-      expect(leadPokemon.turnData.hitCount).toBe(2);
-      expect(secondStrikeDamage).toBe(toDmgValue(0.25 * firstStrikeDamage));
-    }
-  );
-
-  it(
-    "should apply secondary effects to both strikes",
-    async () => {
-      game.override.moveset([ Moves.POWER_UP_PUNCH ]);
-      game.override.enemySpecies(Species.AMOONGUSS);
-
-      await game.classicMode.startBattle([ Species.MAGIKARP ]);
-
-      const leadPokemon = game.scene.getPlayerPokemon()!;
-
-      game.move.select(Moves.POWER_UP_PUNCH);
-
-      await game.phaseInterceptor.to("BerryPhase", false);
-
-      expect(leadPokemon.turnData.hitCount).toBe(2);
-      expect(leadPokemon.getStatStage(Stat.ATK)).toBe(2);
-    }
-  );
-
-  it(
-    "should not apply to Status moves",
-    async () => {
-      game.override.moveset([ Moves.BABY_DOLL_EYES ]);
-
-      await game.classicMode.startBattle([ Species.MAGIKARP ]);
-
-      const enemyPokemon = game.scene.getEnemyPokemon()!;
-
-      game.move.select(Moves.BABY_DOLL_EYES);
-
-      await game.phaseInterceptor.to("BerryPhase", false);
-
-      expect(enemyPokemon.getStatStage(Stat.ATK)).toBe(-1);
-    }
-  );
-
-  it(
-    "should not apply to multi-hit moves",
-    async () => {
-      game.override.moveset([ Moves.DOUBLE_HIT ]);
-
-      await game.classicMode.startBattle([ Species.MAGIKARP ]);
-
-      const leadPokemon = game.scene.getPlayerPokemon()!;
-
-      game.move.select(Moves.DOUBLE_HIT);
-      await game.move.forceHit();
-
-      await game.phaseInterceptor.to("BerryPhase", false);
-
-      expect(leadPokemon.turnData.hitCount).toBe(2);
-    }
-  );
-
-  it(
-    "should not apply to self-sacrifice moves",
-    async () => {
-      game.override.moveset([ Moves.SELF_DESTRUCT ]);
-
-      await game.classicMode.startBattle([ Species.MAGIKARP ]);
-
-      const leadPokemon = game.scene.getPlayerPokemon()!;
-
-      game.move.select(Moves.SELF_DESTRUCT);
-
-      await game.phaseInterceptor.to("DamageAnimPhase", false);
-
-      expect(leadPokemon.turnData.hitCount).toBe(1);
-    }
-  );
-
-  it(
-    "should not apply to Rollout",
-    async () => {
-      game.override.moveset([ Moves.ROLLOUT ]);
-
-      await game.classicMode.startBattle([ Species.MAGIKARP ]);
-
-      const leadPokemon = game.scene.getPlayerPokemon()!;
-
-      game.move.select(Moves.ROLLOUT);
-      await game.move.forceHit();
-
-      await game.phaseInterceptor.to("DamageAnimPhase", false);
-
-      expect(leadPokemon.turnData.hitCount).toBe(1);
-    }
-  );
-
-  it(
-    "should not apply multiplier to fixed-damage moves",
-    async () => {
-      game.override.moveset([ Moves.DRAGON_RAGE ]);
-
-      await game.classicMode.startBattle([ Species.MAGIKARP ]);
-
-      const enemyPokemon = game.scene.getEnemyPokemon()!;
-
-      game.move.select(Moves.DRAGON_RAGE);
-      await game.phaseInterceptor.to("BerryPhase", false);
-
-      expect(enemyPokemon.hp).toBe(enemyPokemon.getMaxHp() - 80);
-    }
-  );
-
-  it(
-    "should not apply multiplier to counter moves",
-    async () => {
-      game.override.moveset([ Moves.COUNTER ]);
-      game.override.enemyMoveset([ Moves.TACKLE ]);
-
-      await game.classicMode.startBattle([ Species.SHUCKLE ]);
-
-      const leadPokemon = game.scene.getPlayerPokemon()!;
-      const enemyPokemon = game.scene.getEnemyPokemon()!;
-
-      game.move.select(Moves.COUNTER);
-      await game.phaseInterceptor.to("DamageAnimPhase");
-
-      const playerDamage = leadPokemon.getMaxHp() - leadPokemon.hp;
-
-      await game.phaseInterceptor.to("BerryPhase", false);
-
-      expect(enemyPokemon.hp).toBe(enemyPokemon.getMaxHp() - 4 * playerDamage);
-    }
-  );
-
-  it(
-    "should not apply to multi-target moves",
-    async () => {
-      game.override.battleType("double");
-      game.override.moveset([ Moves.EARTHQUAKE ]);
-      game.override.passiveAbility(Abilities.LEVITATE);
-
-      await game.classicMode.startBattle([ Species.MAGIKARP, Species.FEEBAS ]);
-
-      const playerPokemon = game.scene.getPlayerField();
-
-      game.move.select(Moves.EARTHQUAKE);
-      game.move.select(Moves.EARTHQUAKE, 1);
-
-      await game.phaseInterceptor.to("BerryPhase", false);
-
-      playerPokemon.forEach(p => expect(p.turnData.hitCount).toBe(1));
-    }
-  );
-
-  it(
-    "should apply to multi-target moves when hitting only one target",
-    async () => {
-      game.override.moveset([ Moves.EARTHQUAKE ]);
-
-      await game.classicMode.startBattle([ Species.MAGIKARP ]);
-
-      const leadPokemon = game.scene.getPlayerPokemon()!;
-
-      game.move.select(Moves.EARTHQUAKE);
-      await game.phaseInterceptor.to("DamageAnimPhase", false);
-
-      expect(leadPokemon.turnData.hitCount).toBe(2);
-    }
-  );
-
-  it(
-    "should only trigger post-target move effects once",
-    async () => {
-      game.override.moveset([ Moves.MIND_BLOWN ]);
-
-      await game.classicMode.startBattle([ Species.MAGIKARP ]);
-
-      const leadPokemon = game.scene.getPlayerPokemon()!;
-
-      game.move.select(Moves.MIND_BLOWN);
-
-      await game.phaseInterceptor.to("DamageAnimPhase", false);
-
-      expect(leadPokemon.turnData.hitCount).toBe(2);
-
-      // This test will time out if the user faints
-      await game.phaseInterceptor.to("BerryPhase", false);
-
-      expect(leadPokemon.hp).toBe(Math.ceil(leadPokemon.getMaxHp() / 2));
-    }
-  );
-
-  it(
-    "Burn Up only removes type after the second strike",
-    async () => {
-      game.override.moveset([ Moves.BURN_UP ]);
-
-      await game.classicMode.startBattle([ Species.CHARIZARD ]);
-
-      const leadPokemon = game.scene.getPlayerPokemon()!;
-      const enemyPokemon = game.scene.getEnemyPokemon()!;
-
-      game.move.select(Moves.BURN_UP);
-
-      await game.phaseInterceptor.to("MoveEffectPhase");
-
-      expect(leadPokemon.turnData.hitCount).toBe(2);
-      expect(enemyPokemon.hp).toBeGreaterThan(0);
-      expect(leadPokemon.isOfType(Type.FIRE)).toBe(true);
-
-      await game.phaseInterceptor.to("BerryPhase", false);
-
-      expect(leadPokemon.isOfType(Type.FIRE)).toBe(false);
-    }
-  );
-
-  it(
-    "Moves boosted by this ability and Multi-Lens should strike 3 times",
-    async () => {
-      game.override.moveset([ Moves.TACKLE ]);
-      game.override.startingHeldItems([{ name: "MULTI_LENS", count: 1 }]);
-
-      await game.classicMode.startBattle([ Species.MAGIKARP ]);
-
-      const leadPokemon = game.scene.getPlayerPokemon()!;
-
-      game.move.select(Moves.TACKLE);
-
-      await game.phaseInterceptor.to("DamageAnimPhase");
-
-      expect(leadPokemon.turnData.hitCount).toBe(3);
-    }
-  );
-
-  it(
-    "Seismic Toss boosted by this ability and Multi-Lens should strike 3 times",
-    async () => {
-      game.override.moveset([ Moves.SEISMIC_TOSS ]);
-      game.override.startingHeldItems([{ name: "MULTI_LENS", count: 1 }]);
-
-      await game.classicMode.startBattle([ Species.MAGIKARP ]);
-
-      const leadPokemon = game.scene.getPlayerPokemon()!;
-      const enemyPokemon = game.scene.getEnemyPokemon()!;
-
-      const enemyStartingHp = enemyPokemon.hp;
-
-      game.move.select(Moves.SEISMIC_TOSS);
-      await game.move.forceHit();
-
-      await game.phaseInterceptor.to("DamageAnimPhase");
-
-      expect(leadPokemon.turnData.hitCount).toBe(3);
-
-      await game.phaseInterceptor.to("MoveEndPhase", false);
-
-      expect(enemyPokemon.hp).toBe(enemyStartingHp - 200);
-    }
-  );
-
-  it(
-    "Hyper Beam boosted by this ability should strike twice, then recharge",
-    async () => {
-      game.override.moveset([ Moves.HYPER_BEAM ]);
-
-      await game.classicMode.startBattle([ Species.MAGIKARP ]);
-
-      const leadPokemon = game.scene.getPlayerPokemon()!;
-
-      game.move.select(Moves.HYPER_BEAM);
-      await game.move.forceHit();
-
-      await game.phaseInterceptor.to("DamageAnimPhase");
-
-      expect(leadPokemon.turnData.hitCount).toBe(2);
-      expect(leadPokemon.getTag(BattlerTagType.RECHARGING)).toBeUndefined();
-
-      await game.phaseInterceptor.to("TurnEndPhase");
-
-      expect(leadPokemon.getTag(BattlerTagType.RECHARGING)).toBeDefined();
-    }
-  );
-
-  it(
-    "Anchor Shot boosted by this ability should only trap the target after the second hit",
-    async () => {
-      game.override.moveset([ Moves.ANCHOR_SHOT ]);
-
-      await game.classicMode.startBattle([ Species.MAGIKARP ]);
-
-      const leadPokemon = game.scene.getPlayerPokemon()!;
-      const enemyPokemon = game.scene.getEnemyPokemon()!;
-
-      game.move.select(Moves.ANCHOR_SHOT);
-      await game.move.forceHit();
-
-      await game.phaseInterceptor.to("DamageAnimPhase");
-
-      expect(leadPokemon.turnData.hitCount).toBe(2);
-      expect(enemyPokemon.getTag(BattlerTagType.TRAPPED)).toBeUndefined();
-
-      await game.phaseInterceptor.to("MoveEndPhase");
-      expect(enemyPokemon.getTag(BattlerTagType.TRAPPED)).toBeDefined();
-
-      await game.phaseInterceptor.to("TurnEndPhase");
-
-      expect(enemyPokemon.getTag(BattlerTagType.TRAPPED)).toBeDefined();
-    }
-  );
-
-  it(
-    "Smack Down boosted by this ability should only ground the target after the second hit",
-    async () => {
-      game.override.moveset([ Moves.SMACK_DOWN ]);
-
-      await game.classicMode.startBattle([ Species.MAGIKARP ]);
-
-      const leadPokemon = game.scene.getPlayerPokemon()!;
-      const enemyPokemon = game.scene.getEnemyPokemon()!;
-
-      game.move.select(Moves.SMACK_DOWN);
-      await game.move.forceHit();
-
-      await game.phaseInterceptor.to("DamageAnimPhase");
-
-      expect(leadPokemon.turnData.hitCount).toBe(2);
-      expect(enemyPokemon.getTag(BattlerTagType.IGNORE_FLYING)).toBeUndefined();
-
-      await game.phaseInterceptor.to("TurnEndPhase");
-
-      expect(enemyPokemon.getTag(BattlerTagType.IGNORE_FLYING)).toBeDefined();
-    }
-  );
-
-  it(
-    "U-turn boosted by this ability should strike twice before forcing a switch",
-    async () => {
-      game.override.moveset([ Moves.U_TURN ]);
-
-      await game.classicMode.startBattle([ Species.MAGIKARP, Species.BLASTOISE ]);
-
-      const leadPokemon = game.scene.getPlayerPokemon()!;
-
-      game.move.select(Moves.U_TURN);
-      await game.move.forceHit();
-
-      await game.phaseInterceptor.to("MoveEffectPhase");
-      expect(leadPokemon.turnData.hitCount).toBe(2);
-
-      // This will cause this test to time out if the switch was forced on the first hit.
-      await game.phaseInterceptor.to("MoveEffectPhase", false);
-    }
-  );
-
-  it(
-    "Wake-Up Slap boosted by this ability should only wake up the target after the second hit",
-    async () => {
-      game.override.moveset([ Moves.WAKE_UP_SLAP ]).enemyStatusEffect(StatusEffect.SLEEP);
-
-      await game.classicMode.startBattle([ Species.MAGIKARP ]);
-
-      const leadPokemon = game.scene.getPlayerPokemon()!;
-      const enemyPokemon = game.scene.getEnemyPokemon()!;
-
-      game.move.select(Moves.WAKE_UP_SLAP);
-      await game.move.forceHit();
-
-      await game.phaseInterceptor.to("DamageAnimPhase");
-
-      expect(leadPokemon.turnData.hitCount).toBe(2);
-      expect(enemyPokemon.status?.effect).toBe(StatusEffect.SLEEP);
-
-      await game.phaseInterceptor.to("BerryPhase", false);
-
-      expect(enemyPokemon.status?.effect).toBeUndefined();
-    }
-  );
-
-  it(
-    "should not cause user to hit into King's Shield more than once",
-    async () => {
-      game.override.moveset([ Moves.TACKLE ]);
-      game.override.enemyMoveset([ Moves.KINGS_SHIELD ]);
-
-      await game.classicMode.startBattle([ Species.MAGIKARP ]);
-
-      const leadPokemon = game.scene.getPlayerPokemon()!;
-
-      game.move.select(Moves.TACKLE);
-
-      await game.phaseInterceptor.to("BerryPhase", false);
-
-      expect(leadPokemon.getStatStage(Stat.ATK)).toBe(-1);
-    }
-  );
-
-  it(
-    "should not cause user to hit into Storm Drain more than once",
-    async () => {
-      game.override.moveset([ Moves.WATER_GUN ]);
-      game.override.enemyAbility(Abilities.STORM_DRAIN);
-
-      await game.classicMode.startBattle([ Species.MAGIKARP ]);
-
-      const enemyPokemon = game.scene.getEnemyPokemon()!;
-
-      game.move.select(Moves.WATER_GUN);
-
-      await game.phaseInterceptor.to("BerryPhase", false);
-
-      expect(enemyPokemon.getStatStage(Stat.SPATK)).toBe(1);
-    }
-  );
-
-  it("should not allow Future Sight to hit infinitely many times if the user switches out", async () => {
-    game.override.enemyLevel(1000)
-      .moveset(Moves.FUTURE_SIGHT);
-    await game.classicMode.startBattle([ Species.BULBASAUR, Species.CHARMANDER, Species.SQUIRTLE ]);
-
-    const enemyPokemon = game.scene.getEnemyPokemon()!;
-    vi.spyOn(enemyPokemon, "damageAndUpdate");
-
-    game.move.select(Moves.FUTURE_SIGHT);
-    await game.toNextTurn();
-
-    game.doSwitchPokemon(1);
-    await game.toNextTurn();
-
-    game.doSwitchPokemon(2);
-    await game.toNextTurn();
-
-    // TODO: Update hit count to 1 once Future Sight is fixed to not activate abilities if user is off the field
-    expect(enemyPokemon.damageAndUpdate).toHaveBeenCalledTimes(2);
-  });
-});
diff --git a/src/test/abilities/power_construct.test.ts b/src/test/abilities/power_construct.test.ts
deleted file mode 100644
index aaab5ddb5c4..00000000000
--- a/src/test/abilities/power_construct.test.ts
+++ /dev/null
@@ -1,94 +0,0 @@
-import { Status } from "#app/data/status-effect";
-import { QuietFormChangePhase } from "#app/phases/quiet-form-change-phase";
-import { TurnEndPhase } from "#app/phases/turn-end-phase";
-import { Abilities } from "#enums/abilities";
-import { Moves } from "#enums/moves";
-import { Species } from "#enums/species";
-import { StatusEffect } from "#enums/status-effect";
-import GameManager from "#test/utils/gameManager";
-import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest";
-
-
-describe("Abilities - POWER CONSTRUCT", () => {
-  let phaserGame: Phaser.Game;
-  let game: GameManager;
-
-  beforeAll(() => {
-    phaserGame = new Phaser.Game({
-      type: Phaser.HEADLESS,
-    });
-  });
-
-  afterEach(() => {
-    game.phaseInterceptor.restoreOg();
-  });
-
-  beforeEach(() => {
-    game = new GameManager(phaserGame);
-    const moveToUse = Moves.SPLASH;
-    game.override.battleType("single");
-    game.override.ability(Abilities.POWER_CONSTRUCT);
-    game.override.moveset([ moveToUse ]);
-    game.override.enemyMoveset([ Moves.TACKLE, Moves.TACKLE, Moves.TACKLE, Moves.TACKLE ]);
-  });
-
-  test(
-    "check if fainted 50% Power Construct Pokemon switches to base form on arena reset",
-    async () => {
-      const baseForm = 2,
-        completeForm = 4;
-      game.override.startingWave(4);
-      game.override.starterForms({
-        [Species.ZYGARDE]: completeForm,
-      });
-
-      await game.classicMode.startBattle([ Species.MAGIKARP, Species.ZYGARDE ]);
-
-      const zygarde = game.scene.getPlayerParty().find((p) => p.species.speciesId === Species.ZYGARDE);
-      expect(zygarde).not.toBe(undefined);
-      expect(zygarde!.formIndex).toBe(completeForm);
-
-      zygarde!.hp = 0;
-      zygarde!.status = new Status(StatusEffect.FAINT);
-      expect(zygarde!.isFainted()).toBe(true);
-
-      game.move.select(Moves.SPLASH);
-      await game.doKillOpponents();
-      await game.phaseInterceptor.to(TurnEndPhase);
-      game.doSelectModifier();
-      await game.phaseInterceptor.to(QuietFormChangePhase);
-
-      expect(zygarde!.formIndex).toBe(baseForm);
-    },
-  );
-
-  test(
-    "check if fainted 10% Power Construct Pokemon switches to base form on arena reset",
-    async () => {
-      const baseForm = 3,
-        completeForm = 5;
-      game.override.startingWave(4);
-      game.override.starterForms({
-        [Species.ZYGARDE]: completeForm,
-      });
-
-      await game.classicMode.startBattle([ Species.MAGIKARP, Species.ZYGARDE ]);
-
-      const zygarde = game.scene.getPlayerParty().find((p) => p.species.speciesId === Species.ZYGARDE);
-      expect(zygarde).not.toBe(undefined);
-      expect(zygarde!.formIndex).toBe(completeForm);
-
-      zygarde!.hp = 0;
-      zygarde!.status = new Status(StatusEffect.FAINT);
-      expect(zygarde!.isFainted()).toBe(true);
-
-      game.move.select(Moves.SPLASH);
-      await game.doKillOpponents();
-      await game.phaseInterceptor.to(TurnEndPhase);
-      game.doSelectModifier();
-      await game.phaseInterceptor.to(QuietFormChangePhase);
-
-      expect(zygarde!.formIndex).toBe(baseForm);
-    },
-  );
-});
diff --git a/src/test/abilities/protean.test.ts b/src/test/abilities/protean.test.ts
deleted file mode 100644
index 787834f8a9d..00000000000
--- a/src/test/abilities/protean.test.ts
+++ /dev/null
@@ -1,347 +0,0 @@
-import { allMoves } from "#app/data/move";
-import { Type } from "#enums/type";
-import { Weather } from "#app/data/weather";
-import type { PlayerPokemon } from "#app/field/pokemon";
-import { TurnEndPhase } from "#app/phases/turn-end-phase";
-import { Abilities } from "#enums/abilities";
-import { BattlerTagType } from "#enums/battler-tag-type";
-import { Biome } from "#enums/biome";
-import { Moves } from "#enums/moves";
-import { Species } from "#enums/species";
-import { WeatherType } from "#enums/weather-type";
-import GameManager from "#test/utils/gameManager";
-import Phaser from "phaser";
-import { afterEach, beforeAll, beforeEach, describe, expect, test, vi } from "vitest";
-
-
-describe("Abilities - Protean", () => {
-  let phaserGame: Phaser.Game;
-  let game: GameManager;
-
-  beforeAll(() => {
-    phaserGame = new Phaser.Game({
-      type: Phaser.HEADLESS,
-    });
-  });
-
-  afterEach(() => {
-    game.phaseInterceptor.restoreOg();
-  });
-
-  beforeEach(() => {
-    game = new GameManager(phaserGame);
-    game.override.battleType("single");
-    game.override.ability(Abilities.PROTEAN);
-    game.override.startingLevel(100);
-    game.override.enemySpecies(Species.RATTATA);
-    game.override.enemyMoveset([ Moves.ENDURE, Moves.ENDURE, Moves.ENDURE, Moves.ENDURE ]);
-  });
-
-  test(
-    "ability applies and changes a pokemon's type",
-    async () => {
-      game.override.moveset([ Moves.SPLASH ]);
-
-      await game.startBattle([ Species.MAGIKARP ]);
-
-      const leadPokemon = game.scene.getPlayerPokemon()!;
-      expect(leadPokemon).not.toBe(undefined);
-
-      game.move.select(Moves.SPLASH);
-      await game.phaseInterceptor.to(TurnEndPhase);
-
-      testPokemonTypeMatchesDefaultMoveType(leadPokemon, Moves.SPLASH);
-    },
-  );
-
-  // Test for Gen9+ functionality, we are using previous funcionality
-  test.skip(
-    "ability applies only once per switch in",
-    async () => {
-      game.override.moveset([ Moves.SPLASH, Moves.AGILITY ]);
-
-      await game.startBattle([ Species.MAGIKARP, Species.BULBASAUR ]);
-
-      let leadPokemon = game.scene.getPlayerPokemon()!;
-      expect(leadPokemon).not.toBe(undefined);
-
-      game.move.select(Moves.SPLASH);
-      await game.phaseInterceptor.to(TurnEndPhase);
-
-      testPokemonTypeMatchesDefaultMoveType(leadPokemon, Moves.SPLASH);
-
-      game.move.select(Moves.AGILITY);
-      await game.phaseInterceptor.to(TurnEndPhase);
-
-      expect(leadPokemon.summonData.abilitiesApplied.filter((a) => a === Abilities.PROTEAN)).toHaveLength(1);
-      const leadPokemonType = Type[leadPokemon.getTypes()[0]];
-      const moveType = Type[allMoves[Moves.AGILITY].type];
-      expect(leadPokemonType).not.toBe(moveType);
-
-      await game.toNextTurn();
-      game.doSwitchPokemon(1);
-      await game.toNextTurn();
-      game.doSwitchPokemon(1);
-      await game.toNextTurn();
-
-      leadPokemon = game.scene.getPlayerPokemon()!;
-      expect(leadPokemon).not.toBe(undefined);
-
-      game.move.select(Moves.SPLASH);
-      await game.phaseInterceptor.to(TurnEndPhase);
-
-      testPokemonTypeMatchesDefaultMoveType(leadPokemon, Moves.SPLASH);
-    },
-  );
-
-  test(
-    "ability applies correctly even if the pokemon's move has a variable type",
-    async () => {
-      game.override.moveset([ Moves.WEATHER_BALL ]);
-
-      await game.startBattle([ Species.MAGIKARP ]);
-
-      const leadPokemon = game.scene.getPlayerPokemon()!;
-      expect(leadPokemon).not.toBe(undefined);
-
-      game.scene.arena.weather = new Weather(WeatherType.SUNNY);
-      game.move.select(Moves.WEATHER_BALL);
-      await game.phaseInterceptor.to(TurnEndPhase);
-
-      expect(leadPokemon.summonData.abilitiesApplied).toContain(Abilities.PROTEAN);
-      expect(leadPokemon.getTypes()).toHaveLength(1);
-      const leadPokemonType = Type[leadPokemon.getTypes()[0]],
-        moveType = Type[Type.FIRE];
-      expect(leadPokemonType).toBe(moveType);
-    },
-  );
-
-  test(
-    "ability applies correctly even if the type has changed by another ability",
-    async () => {
-      game.override.moveset([ Moves.TACKLE ]);
-      game.override.passiveAbility(Abilities.REFRIGERATE);
-
-      await game.startBattle([ Species.MAGIKARP ]);
-
-      const leadPokemon = game.scene.getPlayerPokemon()!;
-      expect(leadPokemon).not.toBe(undefined);
-
-      game.move.select(Moves.TACKLE);
-      await game.phaseInterceptor.to(TurnEndPhase);
-
-      expect(leadPokemon.summonData.abilitiesApplied).toContain(Abilities.PROTEAN);
-      expect(leadPokemon.getTypes()).toHaveLength(1);
-      const leadPokemonType = Type[leadPokemon.getTypes()[0]],
-        moveType = Type[Type.ICE];
-      expect(leadPokemonType).toBe(moveType);
-    },
-  );
-
-  test(
-    "ability applies correctly even if the pokemon's move calls another move",
-    async () => {
-      game.override.moveset([ Moves.NATURE_POWER ]);
-
-      await game.startBattle([ Species.MAGIKARP ]);
-
-      const leadPokemon = game.scene.getPlayerPokemon()!;
-      expect(leadPokemon).not.toBe(undefined);
-
-      game.scene.arena.biomeType = Biome.MOUNTAIN;
-      game.move.select(Moves.NATURE_POWER);
-      await game.phaseInterceptor.to(TurnEndPhase);
-
-      testPokemonTypeMatchesDefaultMoveType(leadPokemon, Moves.AIR_SLASH);
-    },
-  );
-
-  test(
-    "ability applies correctly even if the pokemon's move is delayed / charging",
-    async () => {
-      game.override.moveset([ Moves.DIG ]);
-
-      await game.startBattle([ Species.MAGIKARP ]);
-
-      const leadPokemon = game.scene.getPlayerPokemon()!;
-      expect(leadPokemon).not.toBe(undefined);
-
-      game.move.select(Moves.DIG);
-      await game.phaseInterceptor.to(TurnEndPhase);
-
-      testPokemonTypeMatchesDefaultMoveType(leadPokemon, Moves.DIG);
-    },
-  );
-
-  test(
-    "ability applies correctly even if the pokemon's move misses",
-    async () => {
-      game.override.moveset([ Moves.TACKLE ]);
-      game.override.enemyMoveset(Moves.SPLASH);
-
-      await game.startBattle([ Species.MAGIKARP ]);
-
-      const leadPokemon = game.scene.getPlayerPokemon()!;
-      expect(leadPokemon).not.toBe(undefined);
-
-      game.move.select(Moves.TACKLE);
-      await game.move.forceMiss();
-      await game.phaseInterceptor.to(TurnEndPhase);
-
-      const enemyPokemon = game.scene.getEnemyPokemon()!;
-      expect(enemyPokemon.isFullHp()).toBe(true);
-      testPokemonTypeMatchesDefaultMoveType(leadPokemon, Moves.TACKLE);
-    },
-  );
-
-  test(
-    "ability applies correctly even if the pokemon's move is protected against",
-    async () => {
-      game.override.moveset([ Moves.TACKLE ]);
-      game.override.enemyMoveset([ Moves.PROTECT, Moves.PROTECT, Moves.PROTECT, Moves.PROTECT ]);
-
-      await game.startBattle([ Species.MAGIKARP ]);
-
-      const leadPokemon = game.scene.getPlayerPokemon()!;
-      expect(leadPokemon).not.toBe(undefined);
-
-      game.move.select(Moves.TACKLE);
-      await game.phaseInterceptor.to(TurnEndPhase);
-
-      testPokemonTypeMatchesDefaultMoveType(leadPokemon, Moves.TACKLE);
-    },
-  );
-
-  test(
-    "ability applies correctly even if the pokemon's move fails because of type immunity",
-    async () => {
-      game.override.moveset([ Moves.TACKLE ]);
-      game.override.enemySpecies(Species.GASTLY);
-
-      await game.startBattle([ Species.MAGIKARP ]);
-
-      const leadPokemon = game.scene.getPlayerPokemon()!;
-      expect(leadPokemon).not.toBe(undefined);
-
-      game.move.select(Moves.TACKLE);
-      await game.phaseInterceptor.to(TurnEndPhase);
-
-      testPokemonTypeMatchesDefaultMoveType(leadPokemon, Moves.TACKLE);
-    },
-  );
-
-  test(
-    "ability is not applied if pokemon's type is the same as the move's type",
-    async () => {
-      game.override.moveset([ Moves.SPLASH ]);
-
-      await game.startBattle([ Species.MAGIKARP ]);
-
-      const leadPokemon = game.scene.getPlayerPokemon()!;
-      expect(leadPokemon).not.toBe(undefined);
-
-      leadPokemon.summonData.types = [ allMoves[Moves.SPLASH].type ];
-      game.move.select(Moves.SPLASH);
-      await game.phaseInterceptor.to(TurnEndPhase);
-
-      expect(leadPokemon.summonData.abilitiesApplied).not.toContain(Abilities.PROTEAN);
-    },
-  );
-
-  test(
-    "ability is not applied if pokemon is terastallized",
-    async () => {
-      game.override.moveset([ Moves.SPLASH ]);
-
-      await game.startBattle([ Species.MAGIKARP ]);
-
-      const leadPokemon = game.scene.getPlayerPokemon()!;
-      expect(leadPokemon).not.toBe(undefined);
-
-      vi.spyOn(leadPokemon, "isTerastallized").mockReturnValue(true);
-
-      game.move.select(Moves.SPLASH);
-      await game.phaseInterceptor.to(TurnEndPhase);
-
-      expect(leadPokemon.summonData.abilitiesApplied).not.toContain(Abilities.PROTEAN);
-    },
-  );
-
-  test(
-    "ability is not applied if pokemon uses struggle",
-    async () => {
-      game.override.moveset([ Moves.STRUGGLE ]);
-
-      await game.startBattle([ Species.MAGIKARP ]);
-
-      const leadPokemon = game.scene.getPlayerPokemon()!;
-      expect(leadPokemon).not.toBe(undefined);
-
-      game.move.select(Moves.STRUGGLE);
-      await game.phaseInterceptor.to(TurnEndPhase);
-
-      expect(leadPokemon.summonData.abilitiesApplied).not.toContain(Abilities.PROTEAN);
-    },
-  );
-
-  test(
-    "ability is not applied if the pokemon's move fails",
-    async () => {
-      game.override.moveset([ Moves.BURN_UP ]);
-
-      await game.startBattle([ Species.MAGIKARP ]);
-
-      const leadPokemon = game.scene.getPlayerPokemon()!;
-      expect(leadPokemon).not.toBe(undefined);
-
-      game.move.select(Moves.BURN_UP);
-      await game.phaseInterceptor.to(TurnEndPhase);
-
-      expect(leadPokemon.summonData.abilitiesApplied).not.toContain(Abilities.PROTEAN);
-    },
-  );
-
-  test(
-    "ability applies correctly even if the pokemon's Trick-or-Treat fails",
-    async () => {
-      game.override.moveset([ Moves.TRICK_OR_TREAT ]);
-      game.override.enemySpecies(Species.GASTLY);
-
-      await game.startBattle([ Species.MAGIKARP ]);
-
-      const leadPokemon = game.scene.getPlayerPokemon()!;
-      expect(leadPokemon).not.toBe(undefined);
-
-      game.move.select(Moves.TRICK_OR_TREAT);
-      await game.phaseInterceptor.to(TurnEndPhase);
-
-      testPokemonTypeMatchesDefaultMoveType(leadPokemon, Moves.TRICK_OR_TREAT);
-    },
-  );
-
-  test(
-    "ability applies correctly and the pokemon curses itself",
-    async () => {
-      game.override.moveset([ Moves.CURSE ]);
-
-      await game.startBattle([ Species.MAGIKARP ]);
-
-      const leadPokemon = game.scene.getPlayerPokemon()!;
-      expect(leadPokemon).not.toBe(undefined);
-
-      game.move.select(Moves.CURSE);
-      await game.phaseInterceptor.to(TurnEndPhase);
-
-      testPokemonTypeMatchesDefaultMoveType(leadPokemon, Moves.CURSE);
-      expect(leadPokemon.getTag(BattlerTagType.CURSED)).not.toBe(undefined);
-    },
-  );
-});
-
-function testPokemonTypeMatchesDefaultMoveType(pokemon: PlayerPokemon, move: Moves) {
-  expect(pokemon.summonData.abilitiesApplied).toContain(Abilities.PROTEAN);
-  expect(pokemon.getTypes()).toHaveLength(1);
-  const pokemonType = Type[pokemon.getTypes()[0]],
-    moveType = Type[allMoves[move].type];
-  expect(pokemonType).toBe(moveType);
-}
diff --git a/src/test/abilities/sand_veil.test.ts b/src/test/abilities/sand_veil.test.ts
deleted file mode 100644
index ee8ca450df9..00000000000
--- a/src/test/abilities/sand_veil.test.ts
+++ /dev/null
@@ -1,79 +0,0 @@
-import { StatMultiplierAbAttr, allAbilities } from "#app/data/ability";
-import { CommandPhase } from "#app/phases/command-phase";
-import { MoveEffectPhase } from "#app/phases/move-effect-phase";
-import { MoveEndPhase } from "#app/phases/move-end-phase";
-import { Abilities } from "#enums/abilities";
-import { Moves } from "#enums/moves";
-import { Species } from "#enums/species";
-import { Stat } from "#enums/stat";
-import { WeatherType } from "#enums/weather-type";
-import GameManager from "#test/utils/gameManager";
-import Phaser from "phaser";
-import { afterEach, beforeAll, beforeEach, describe, expect, test, vi } from "vitest";
-
-
-describe("Abilities - Sand Veil", () => {
-  let phaserGame: Phaser.Game;
-  let game: GameManager;
-
-  beforeAll(() => {
-    phaserGame = new Phaser.Game({
-      type: Phaser.HEADLESS,
-    });
-  });
-
-  afterEach(() => {
-    game.phaseInterceptor.restoreOg();
-  });
-
-  beforeEach(() => {
-    game = new GameManager(phaserGame);
-    game.override.moveset([ Moves.SPLASH ]);
-    game.override.enemySpecies(Species.MEOWSCARADA);
-    game.override.enemyAbility(Abilities.INSOMNIA);
-    game.override.enemyMoveset([ Moves.TWISTER, Moves.TWISTER, Moves.TWISTER, Moves.TWISTER ]);
-    game.override.startingLevel(100);
-    game.override.enemyLevel(100);
-    game.override
-      .weather(WeatherType.SANDSTORM)
-      .battleType("double");
-  });
-
-  test(
-    "ability should increase the evasiveness of the source",
-    async () => {
-      await game.startBattle([ Species.SNORLAX, Species.BLISSEY ]);
-
-      const leadPokemon = game.scene.getPlayerField();
-
-      vi.spyOn(leadPokemon[0], "getAbility").mockReturnValue(allAbilities[Abilities.SAND_VEIL]);
-
-      const sandVeilAttr = allAbilities[Abilities.SAND_VEIL].getAttrs(StatMultiplierAbAttr)[0];
-      vi.spyOn(sandVeilAttr, "applyStatStage").mockImplementation(
-        (_pokemon, _passive, _simulated, stat, statValue, _args) => {
-          if (stat === Stat.EVA && game.scene.arena.weather?.weatherType === WeatherType.SANDSTORM) {
-            statValue.value *= -1; // will make all attacks miss
-            return true;
-          }
-          return false;
-        }
-      );
-
-      expect(leadPokemon[0].hasAbility(Abilities.SAND_VEIL)).toBe(true);
-      expect(leadPokemon[1].hasAbility(Abilities.SAND_VEIL)).toBe(false);
-
-      game.move.select(Moves.SPLASH);
-
-      await game.phaseInterceptor.to(CommandPhase);
-
-      game.move.select(Moves.SPLASH, 1);
-
-      await game.phaseInterceptor.to(MoveEffectPhase, false);
-
-      await game.phaseInterceptor.to(MoveEndPhase, false);
-
-      expect(leadPokemon[0].isFullHp()).toBe(true);
-      expect(leadPokemon[1].hp).toBeLessThan(leadPokemon[1].getMaxHp());
-    }
-  );
-});
diff --git a/src/test/abilities/schooling.test.ts b/src/test/abilities/schooling.test.ts
deleted file mode 100644
index e1ec58f517e..00000000000
--- a/src/test/abilities/schooling.test.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-import { Status } from "#app/data/status-effect";
-import { QuietFormChangePhase } from "#app/phases/quiet-form-change-phase";
-import { TurnEndPhase } from "#app/phases/turn-end-phase";
-import { Abilities } from "#enums/abilities";
-import { Moves } from "#enums/moves";
-import { Species } from "#enums/species";
-import { StatusEffect } from "#enums/status-effect";
-import GameManager from "#test/utils/gameManager";
-import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest";
-
-
-describe("Abilities - SCHOOLING", () => {
-  let phaserGame: Phaser.Game;
-  let game: GameManager;
-
-  beforeAll(() => {
-    phaserGame = new Phaser.Game({
-      type: Phaser.HEADLESS,
-    });
-  });
-
-  afterEach(() => {
-    game.phaseInterceptor.restoreOg();
-  });
-
-  beforeEach(() => {
-    game = new GameManager(phaserGame);
-    const moveToUse = Moves.SPLASH;
-    game.override.battleType("single");
-    game.override.ability(Abilities.SCHOOLING);
-    game.override.moveset([ moveToUse ]);
-    game.override.enemyMoveset([ Moves.TACKLE, Moves.TACKLE, Moves.TACKLE, Moves.TACKLE ]);
-  });
-
-  test(
-    "check if fainted pokemon switches to base form on arena reset",
-    async () => {
-      const soloForm = 0,
-        schoolForm = 1;
-      game.override.startingWave(4);
-      game.override.starterForms({
-        [Species.WISHIWASHI]: schoolForm,
-      });
-
-      await game.startBattle([ Species.MAGIKARP, Species.WISHIWASHI ]);
-
-      const wishiwashi = game.scene.getPlayerParty().find((p) => p.species.speciesId === Species.WISHIWASHI)!;
-      expect(wishiwashi).not.toBe(undefined);
-      expect(wishiwashi.formIndex).toBe(schoolForm);
-
-      wishiwashi.hp = 0;
-      wishiwashi.status = new Status(StatusEffect.FAINT);
-      expect(wishiwashi.isFainted()).toBe(true);
-
-      game.move.select(Moves.SPLASH);
-      await game.doKillOpponents();
-      await game.phaseInterceptor.to(TurnEndPhase);
-      game.doSelectModifier();
-      await game.phaseInterceptor.to(QuietFormChangePhase);
-
-      expect(wishiwashi.formIndex).toBe(soloForm);
-    },
-  );
-});
diff --git a/src/test/abilities/shields_down.test.ts b/src/test/abilities/shields_down.test.ts
deleted file mode 100644
index ca6d945824e..00000000000
--- a/src/test/abilities/shields_down.test.ts
+++ /dev/null
@@ -1,207 +0,0 @@
-import { Status } from "#app/data/status-effect";
-import { BattlerTagType } from "#app/enums/battler-tag-type";
-import { QuietFormChangePhase } from "#app/phases/quiet-form-change-phase";
-import { TurnEndPhase } from "#app/phases/turn-end-phase";
-import { Abilities } from "#enums/abilities";
-import { Moves } from "#enums/moves";
-import { Species } from "#enums/species";
-import { StatusEffect } from "#enums/status-effect";
-import GameManager from "#test/utils/gameManager";
-import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest";
-
-
-describe("Abilities - SHIELDS DOWN", () => {
-  let phaserGame: Phaser.Game;
-  let game: GameManager;
-
-  beforeAll(() => {
-    phaserGame = new Phaser.Game({
-      type: Phaser.HEADLESS,
-    });
-  });
-
-  afterEach(() => {
-    game.phaseInterceptor.restoreOg();
-  });
-
-  beforeEach(() => {
-    game = new GameManager(phaserGame);
-    const moveToUse = Moves.SPLASH;
-    game.override.battleType("single");
-    game.override.ability(Abilities.SHIELDS_DOWN);
-    game.override.moveset([ moveToUse ]);
-    game.override.enemyMoveset([ Moves.TACKLE ]);
-  });
-
-  test(
-    "check if fainted pokemon switched to base form on arena reset",
-    async () => {
-      const meteorForm = 0,
-        coreForm = 7;
-      game.override.startingWave(4);
-      game.override.starterForms({
-        [Species.MINIOR]: coreForm,
-      });
-
-      await game.classicMode.startBattle([ Species.MAGIKARP, Species.MINIOR ]);
-
-      const minior = game.scene.getPlayerParty().find((p) => p.species.speciesId === Species.MINIOR)!;
-      expect(minior).not.toBe(undefined);
-      expect(minior.formIndex).toBe(coreForm);
-
-      minior.hp = 0;
-      minior.status = new Status(StatusEffect.FAINT);
-      expect(minior.isFainted()).toBe(true);
-
-      game.move.select(Moves.SPLASH);
-      await game.doKillOpponents();
-      await game.phaseInterceptor.to(TurnEndPhase);
-      game.doSelectModifier();
-      await game.phaseInterceptor.to(QuietFormChangePhase);
-
-      expect(minior.formIndex).toBe(meteorForm);
-    },
-  );
-
-  test("should ignore non-volatile status moves",
-    async () => {
-      game.override.enemyMoveset([ Moves.SPORE ]);
-
-      await game.classicMode.startBattle([ Species.MINIOR ]);
-      game.move.select(Moves.SPLASH);
-      await game.phaseInterceptor.to(TurnEndPhase);
-
-      expect(game.scene.getPlayerPokemon()!.status).toBe(undefined);
-    }
-  );
-
-  test("should still ignore non-volatile status moves used by a pokemon with mold breaker",
-    async () => {
-      game.override.enemyAbility(Abilities.MOLD_BREAKER);
-      game.override.enemyMoveset([ Moves.SPORE ]);
-
-      await game.classicMode.startBattle([ Species.MINIOR ]);
-
-      game.move.select(Moves.SPLASH);
-      await game.forceEnemyMove(Moves.SPORE);
-      await game.phaseInterceptor.to(TurnEndPhase);
-
-      expect(game.scene.getPlayerPokemon()!.status).toBe(undefined);
-    }
-  );
-
-  test("should ignore non-volatile secondary status effects",
-    async() => {
-      game.override.enemyMoveset([ Moves.NUZZLE ]);
-
-      await game.classicMode.startBattle([ Species.MINIOR ]);
-
-      game.move.select(Moves.SPLASH);
-      await game.phaseInterceptor.to(TurnEndPhase);
-
-      expect(game.scene.getPlayerPokemon()!.status).toBe(undefined);
-    }
-  );
-
-  test("should ignore status moves even through mold breaker",
-    async () => {
-      game.override.enemyMoveset([ Moves.SPORE ]);
-      game.override.enemyAbility(Abilities.MOLD_BREAKER);
-
-      await game.classicMode.startBattle([ Species.MINIOR ]);
-
-      game.move.select(Moves.SPLASH);
-
-      await game.phaseInterceptor.to(TurnEndPhase);
-
-      expect(game.scene.getPlayerPokemon()!.status).toBe(undefined);
-    }
-  );
-
-
-  // toxic spikes currently does not poison flying types when gravity is in effect
-  test.todo("should become poisoned by toxic spikes when grounded",
-    async () => {
-      game.override.enemyMoveset([ Moves.GRAVITY, Moves.TOXIC_SPIKES, Moves.SPLASH ]);
-      game.override.moveset([ Moves.GRAVITY, Moves.SPLASH ]);
-
-      await game.classicMode.startBattle([ Species.MAGIKARP, Species.MINIOR ]);
-
-      // turn 1
-      game.move.select(Moves.GRAVITY);
-      await game.forceEnemyMove(Moves.TOXIC_SPIKES);
-      await game.toNextTurn();
-
-      // turn 2
-      game.doSwitchPokemon(1);
-      await game.forceEnemyMove(Moves.SPLASH);
-      await game.toNextTurn();
-
-      expect(game.scene.getPlayerPokemon()!.species.speciesId).toBe(Species.MINIOR);
-      expect(game.scene.getPlayerPokemon()!.species.formIndex).toBe(0);
-      expect(game.scene.getPlayerPokemon()!.status?.effect).toBe(StatusEffect.POISON);
-    }
-  );
-
-  test("should ignore yawn",
-    async () => {
-      game.override.enemyMoveset([ Moves.YAWN ]);
-
-      await game.classicMode.startBattle([ Species.MAGIKARP, Species.MINIOR ]);
-
-      game.move.select(Moves.SPLASH);
-      await game.forceEnemyMove(Moves.YAWN);
-
-      await game.phaseInterceptor.to(TurnEndPhase);
-      expect(game.scene.getPlayerPokemon()!.findTag( (tag ) => tag.tagType === BattlerTagType.DROWSY)).toBe(undefined);
-    }
-  );
-
-  test("should not ignore volatile status effects",
-    async () => {
-      game.override.enemyMoveset([ Moves.CONFUSE_RAY ]);
-
-      await game.classicMode.startBattle([ Species.MINIOR ]);
-
-      game.move.select(Moves.SPLASH);
-      await game.forceEnemyMove(Moves.CONFUSE_RAY);
-
-      await game.phaseInterceptor.to(TurnEndPhase);
-
-      expect(game.scene.getPlayerPokemon()!.findTag( (tag ) => tag.tagType === BattlerTagType.CONFUSED)).not.toBe(undefined);
-    }
-  );
-
-  // the `NoTransformAbilityAbAttr` attribute is not checked anywhere, so this test cannot pass.
-  test.todo("ditto should not be immune to status after transforming",
-    async () => {
-      game.override.enemySpecies(Species.DITTO);
-      game.override.enemyAbility(Abilities.IMPOSTER);
-      game.override.moveset([ Moves.SPLASH, Moves.SPORE ]);
-
-      await game.classicMode.startBattle([ Species.MINIOR ]);
-
-      game.move.select(Moves.SPORE);
-      await game.forceEnemyMove(Moves.SPLASH);
-
-      await game.phaseInterceptor.to(TurnEndPhase);
-      expect(game.scene.getEnemyPokemon()!.status?.effect).toBe(StatusEffect.SLEEP);
-    }
-  );
-
-  test("should not prevent minior from receiving the fainted status effect in trainer battles", async () => {
-    game.override.enemyMoveset([ Moves.TACKLE ]);
-    game.override.moveset([ Moves.THUNDERBOLT ]);
-    game.override.startingLevel(100);
-    game.override.startingWave(5);
-    game.override.enemySpecies(Species.MINIOR);
-    await game.classicMode.startBattle([ Species.REGIELEKI ]);
-    const minior = game.scene.getEnemyPokemon()!;
-
-    game.move.select(Moves.THUNDERBOLT);
-    await game.toNextTurn();
-    expect(minior.isFainted()).toBe(true);
-    expect(minior.status?.effect).toBe(StatusEffect.FAINT);
-  });
-
-});
diff --git a/src/test/abilities/speed_boost.test.ts b/src/test/abilities/speed_boost.test.ts
deleted file mode 100644
index 74ee6a8cb92..00000000000
--- a/src/test/abilities/speed_boost.test.ts
+++ /dev/null
@@ -1,129 +0,0 @@
-import { Stat } from "#enums/stat";
-import { Abilities } from "#enums/abilities";
-import { Moves } from "#enums/moves";
-import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
-import Phaser from "phaser";
-import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
-import type { CommandPhase } from "#app/phases/command-phase";
-import { Command } from "#app/ui/command-ui-handler";
-import { AttemptRunPhase } from "#app/phases/attempt-run-phase";
-
-describe("Abilities - Speed Boost", () => {
-  let phaserGame: Phaser.Game;
-  let game: GameManager;
-
-  beforeAll(() => {
-    phaserGame = new Phaser.Game({
-      type: Phaser.HEADLESS,
-    });
-  });
-
-  afterEach(() => {
-    game.phaseInterceptor.restoreOg();
-  });
-
-  beforeEach(() => {
-    game = new GameManager(phaserGame);
-
-    game.override
-      .battleType("single")
-      .enemySpecies(Species.SHUCKLE)
-      .enemyAbility(Abilities.BALL_FETCH)
-      .enemyLevel(100)
-      .ability(Abilities.SPEED_BOOST)
-      .enemyMoveset(Moves.SPLASH)
-      .moveset([ Moves.SPLASH, Moves.U_TURN ]);
-  });
-
-  it("should increase speed by 1 stage at end of turn",
-    async () => {
-      await game.classicMode.startBattle();
-
-      const playerPokemon = game.scene.getPlayerPokemon()!;
-      game.move.select(Moves.SPLASH);
-      await game.toNextTurn();
-
-      expect(playerPokemon.getStatStage(Stat.SPD)).toBe(1);
-    });
-
-  it("should not trigger this turn if pokemon was switched into combat via attack, but the turn after",
-    async () => {
-      await game.classicMode.startBattle([
-        Species.SHUCKLE,
-        Species.NINJASK
-      ]);
-
-      game.move.select(Moves.U_TURN);
-      game.doSelectPartyPokemon(1);
-      await game.toNextTurn();
-      const playerPokemon = game.scene.getPlayerPokemon()!;
-      expect(playerPokemon.getStatStage(Stat.SPD)).toBe(0);
-
-      game.move.select(Moves.SPLASH);
-      await game.toNextTurn();
-      expect(playerPokemon.getStatStage(Stat.SPD)).toBe(1);
-    });
-
-  it("checking back to back swtiches",
-    async () => {
-      await game.classicMode.startBattle([
-        Species.SHUCKLE,
-        Species.NINJASK
-      ]);
-
-      const [ shuckle, ninjask ] = game.scene.getPlayerParty();
-
-      game.move.select(Moves.U_TURN);
-      game.doSelectPartyPokemon(1);
-      await game.toNextTurn();
-      expect(game.scene.getPlayerPokemon()!).toBe(ninjask);
-      expect(ninjask.getStatStage(Stat.SPD)).toBe(0);
-
-      game.move.select(Moves.U_TURN);
-      game.doSelectPartyPokemon(1);
-      await game.toNextTurn();
-      expect(game.scene.getPlayerPokemon()!).toBe(shuckle);
-      expect(shuckle.getStatStage(Stat.SPD)).toBe(0);
-
-      game.move.select(Moves.SPLASH);
-      await game.toNextTurn();
-      expect(shuckle.getStatStage(Stat.SPD)).toBe(1);
-    });
-
-  it("should not trigger this turn if pokemon was switched into combat via normal switch, but the turn after",
-    async () => {
-      await game.classicMode.startBattle([
-        Species.SHUCKLE,
-        Species.NINJASK
-      ]);
-
-      game.doSwitchPokemon(1);
-      await game.toNextTurn();
-      const playerPokemon = game.scene.getPlayerPokemon()!;
-      expect(playerPokemon.getStatStage(Stat.SPD)).toBe(0);
-
-      game.move.select(Moves.SPLASH);
-      await game.toNextTurn();
-      expect(playerPokemon.getStatStage(Stat.SPD)).toBe(1);
-    });
-
-  it("should not trigger if pokemon fails to escape",
-    async () => {
-      await game.classicMode.startBattle([ Species.SHUCKLE ]);
-
-      const commandPhase = game.scene.getCurrentPhase() as CommandPhase;
-      commandPhase.handleCommand(Command.RUN, 0);
-      const runPhase = game.scene.getCurrentPhase() as AttemptRunPhase;
-      runPhase.forceFailEscape = true;
-      await game.phaseInterceptor.to(AttemptRunPhase);
-      await game.toNextTurn();
-
-      const playerPokemon = game.scene.getPlayerPokemon()!;
-      expect(playerPokemon.getStatStage(Stat.SPD)).toBe(0);
-
-      game.move.select(Moves.SPLASH);
-      await game.toNextTurn();
-      expect(playerPokemon.getStatStage(Stat.SPD)).toBe(1);
-    });
-});
diff --git a/src/test/abilities/sturdy.test.ts b/src/test/abilities/sturdy.test.ts
deleted file mode 100644
index 8f134338f12..00000000000
--- a/src/test/abilities/sturdy.test.ts
+++ /dev/null
@@ -1,92 +0,0 @@
-import type { EnemyPokemon } from "#app/field/pokemon";
-import { DamageAnimPhase } from "#app/phases/damage-anim-phase";
-import { MoveEndPhase } from "#app/phases/move-end-phase";
-import { Abilities } from "#enums/abilities";
-import { Moves } from "#enums/moves";
-import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
-import Phaser from "phaser";
-import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest";
-
-
-describe("Abilities - Sturdy", () => {
-  let phaserGame: Phaser.Game;
-  let game: GameManager;
-
-  beforeAll(() => {
-    phaserGame = new Phaser.Game({
-      type: Phaser.HEADLESS,
-    });
-  });
-
-  afterEach(() => {
-    game.phaseInterceptor.restoreOg();
-  });
-
-  beforeEach(() => {
-    game = new GameManager(phaserGame);
-    game.override.battleType("single");
-
-    game.override.starterSpecies(Species.LUCARIO);
-    game.override.startingLevel(100);
-    game.override.moveset([ Moves.CLOSE_COMBAT, Moves.FISSURE ]);
-
-    game.override.enemySpecies(Species.ARON);
-    game.override.enemyLevel(5);
-    game.override.enemyAbility(Abilities.STURDY);
-  });
-
-  test(
-    "Sturdy activates when user is at full HP",
-    async () => {
-      await game.startBattle();
-      game.move.select(Moves.CLOSE_COMBAT);
-      await game.phaseInterceptor.to(MoveEndPhase);
-      expect(game.scene.getEnemyParty()[0].hp).toBe(1);
-    },
-  );
-
-  test(
-    "Sturdy doesn't activate when user is not at full HP",
-    async () => {
-      await game.startBattle();
-
-      const enemyPokemon: EnemyPokemon = game.scene.getEnemyParty()[0];
-      enemyPokemon.hp = enemyPokemon.getMaxHp() - 1;
-
-      game.move.select(Moves.CLOSE_COMBAT);
-      await game.phaseInterceptor.to(DamageAnimPhase);
-
-      expect(enemyPokemon.hp).toBe(0);
-      expect(enemyPokemon.isFainted()).toBe(true);
-    },
-  );
-
-  test(
-    "Sturdy pokemon should be immune to OHKO moves",
-    async () => {
-      await game.startBattle();
-      game.move.select(Moves.FISSURE);
-      await game.phaseInterceptor.to(MoveEndPhase);
-
-      const enemyPokemon: EnemyPokemon = game.scene.getEnemyParty()[0];
-      expect(enemyPokemon.isFullHp()).toBe(true);
-    },
-  );
-
-  test(
-    "Sturdy is ignored by pokemon with `Abilities.MOLD_BREAKER`",
-    async () => {
-      game.override.ability(Abilities.MOLD_BREAKER);
-
-      await game.startBattle();
-      game.move.select(Moves.CLOSE_COMBAT);
-      await game.phaseInterceptor.to(DamageAnimPhase);
-
-      const enemyPokemon: EnemyPokemon = game.scene.getEnemyParty()[0];
-      expect(enemyPokemon.hp).toBe(0);
-      expect(enemyPokemon.isFainted()).toBe(true);
-    },
-  );
-
-});
diff --git a/src/test/abilities/tera_shell.test.ts b/src/test/abilities/tera_shell.test.ts
deleted file mode 100644
index 01382d0fd9a..00000000000
--- a/src/test/abilities/tera_shell.test.ts
+++ /dev/null
@@ -1,132 +0,0 @@
-import { BattlerIndex } from "#app/battle";
-import { Abilities } from "#app/enums/abilities";
-import { Moves } from "#app/enums/moves";
-import { Species } from "#app/enums/species";
-import { HitResult } from "#app/field/pokemon";
-import GameManager from "#test/utils/gameManager";
-import Phaser from "phaser";
-import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
-
-describe("Abilities - Tera Shell", () => {
-  let phaserGame: Phaser.Game;
-  let game: GameManager;
-
-  beforeAll(() => {
-    phaserGame = new Phaser.Game({
-      type: Phaser.HEADLESS,
-    });
-  });
-
-  afterEach(() => {
-    game.phaseInterceptor.restoreOg();
-  });
-
-  beforeEach(() => {
-    game = new GameManager(phaserGame);
-    game.override
-      .battleType("single")
-      .ability(Abilities.TERA_SHELL)
-      .moveset([ Moves.SPLASH ])
-      .enemySpecies(Species.SNORLAX)
-      .enemyAbility(Abilities.INSOMNIA)
-      .enemyMoveset([ Moves.MACH_PUNCH ])
-      .startingLevel(100)
-      .enemyLevel(100);
-  });
-
-  it(
-    "should change the effectiveness of non-resisted attacks when the source is at full HP",
-    async () => {
-      await game.classicMode.startBattle([ Species.SNORLAX ]);
-
-      const playerPokemon = game.scene.getPlayerPokemon()!;
-      vi.spyOn(playerPokemon, "getMoveEffectiveness");
-
-      game.move.select(Moves.SPLASH);
-
-      await game.phaseInterceptor.to("MoveEndPhase");
-      expect(playerPokemon.getMoveEffectiveness).toHaveLastReturnedWith(0.5);
-
-      await game.toNextTurn();
-
-      game.move.select(Moves.SPLASH);
-
-      await game.phaseInterceptor.to("MoveEndPhase");
-      expect(playerPokemon.getMoveEffectiveness).toHaveLastReturnedWith(2);
-    }
-  );
-
-  it(
-    "should not override type immunities",
-    async () => {
-      game.override.enemyMoveset([ Moves.SHADOW_SNEAK ]);
-
-      await game.classicMode.startBattle([ Species.SNORLAX ]);
-
-      const playerPokemon = game.scene.getPlayerPokemon()!;
-      vi.spyOn(playerPokemon, "getMoveEffectiveness");
-
-      game.move.select(Moves.SPLASH);
-
-      await game.phaseInterceptor.to("MoveEndPhase");
-      expect(playerPokemon.getMoveEffectiveness).toHaveLastReturnedWith(0);
-    }
-  );
-
-  it(
-    "should not override type multipliers less than 0.5x",
-    async () => {
-      game.override.enemyMoveset([ Moves.QUICK_ATTACK ]);
-
-      await game.classicMode.startBattle([ Species.AGGRON ]);
-
-      const playerPokemon = game.scene.getPlayerPokemon()!;
-      vi.spyOn(playerPokemon, "getMoveEffectiveness");
-
-      game.move.select(Moves.SPLASH);
-
-      await game.phaseInterceptor.to("MoveEndPhase");
-      expect(playerPokemon.getMoveEffectiveness).toHaveLastReturnedWith(0.25);
-    }
-  );
-
-  it(
-    "should not affect the effectiveness of fixed-damage moves",
-    async () => {
-      game.override.enemyMoveset([ Moves.DRAGON_RAGE ]);
-
-      await game.classicMode.startBattle([ Species.CHARIZARD ]);
-
-      const playerPokemon = game.scene.getPlayerPokemon()!;
-      vi.spyOn(playerPokemon, "apply");
-
-      game.move.select(Moves.SPLASH);
-
-      await game.phaseInterceptor.to("BerryPhase", false);
-      expect(playerPokemon.apply).toHaveLastReturnedWith(HitResult.EFFECTIVE);
-      expect(playerPokemon.hp).toBe(playerPokemon.getMaxHp() - 40);
-    }
-  );
-
-  it(
-    "should change the effectiveness of all strikes of a multi-strike move",
-    async () => {
-      game.override.enemyMoveset([ Moves.DOUBLE_HIT ]);
-
-      await game.classicMode.startBattle([ Species.SNORLAX ]);
-
-      const playerPokemon = game.scene.getPlayerPokemon()!;
-      vi.spyOn(playerPokemon, "apply");
-
-      game.move.select(Moves.SPLASH);
-
-      await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]);
-      await game.move.forceHit();
-      for (let i = 0; i < 2; i++) {
-        await game.phaseInterceptor.to("MoveEffectPhase");
-        expect(playerPokemon.apply).toHaveLastReturnedWith(HitResult.NOT_VERY_EFFECTIVE);
-      }
-      expect(playerPokemon.apply).toHaveReturnedTimes(2);
-    }
-  );
-});
diff --git a/src/test/abilities/unseen_fist.test.ts b/src/test/abilities/unseen_fist.test.ts
deleted file mode 100644
index f8fa8a723fe..00000000000
--- a/src/test/abilities/unseen_fist.test.ts
+++ /dev/null
@@ -1,107 +0,0 @@
-import { TurnEndPhase } from "#app/phases/turn-end-phase";
-import { Abilities } from "#enums/abilities";
-import { Moves } from "#enums/moves";
-import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
-import Phaser from "phaser";
-import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
-import { BattlerTagType } from "#app/enums/battler-tag-type";
-import { BerryPhase } from "#app/phases/berry-phase";
-
-
-describe("Abilities - Unseen Fist", () => {
-  let phaserGame: Phaser.Game;
-  let game: GameManager;
-
-  beforeAll(() => {
-    phaserGame = new Phaser.Game({
-      type: Phaser.HEADLESS,
-    });
-  });
-
-  afterEach(() => {
-    game.phaseInterceptor.restoreOg();
-  });
-
-  beforeEach(() => {
-    game = new GameManager(phaserGame);
-    game.override.battleType("single");
-    game.override.starterSpecies(Species.URSHIFU);
-    game.override.enemySpecies(Species.SNORLAX);
-    game.override.enemyMoveset([ Moves.PROTECT, Moves.PROTECT, Moves.PROTECT, Moves.PROTECT ]);
-    game.override.startingLevel(100);
-    game.override.enemyLevel(100);
-  });
-
-  it(
-    "should cause a contact move to ignore Protect",
-    () => testUnseenFistHitResult(game, Moves.QUICK_ATTACK, Moves.PROTECT, true),
-  );
-
-  it(
-    "should not cause a non-contact move to ignore Protect",
-    () => testUnseenFistHitResult(game, Moves.ABSORB, Moves.PROTECT, false),
-  );
-
-  it(
-    "should not apply if the source has Long Reach",
-    () => {
-      game.override.passiveAbility(Abilities.LONG_REACH);
-      testUnseenFistHitResult(game, Moves.QUICK_ATTACK, Moves.PROTECT, false);
-    }
-  );
-
-  it(
-    "should cause a contact move to ignore Wide Guard",
-    () => testUnseenFistHitResult(game, Moves.BREAKING_SWIPE, Moves.WIDE_GUARD, true),
-  );
-
-  it(
-    "should not cause a non-contact move to ignore Wide Guard",
-    () => testUnseenFistHitResult(game, Moves.BULLDOZE, Moves.WIDE_GUARD, false),
-  );
-
-  it(
-    "should cause a contact move to ignore Protect, but not Substitute",
-    async () => {
-      game.override.enemyLevel(1);
-      game.override.moveset([ Moves.TACKLE ]);
-
-      await game.startBattle();
-
-      const enemyPokemon = game.scene.getEnemyPokemon()!;
-      enemyPokemon.addTag(BattlerTagType.SUBSTITUTE, 0, Moves.NONE, enemyPokemon.id);
-
-      game.move.select(Moves.TACKLE);
-
-      await game.phaseInterceptor.to(BerryPhase, false);
-
-      expect(enemyPokemon.getTag(BattlerTagType.SUBSTITUTE)).toBeUndefined();
-      expect(enemyPokemon.hp).toBe(enemyPokemon.getMaxHp());
-    }
-  );
-});
-
-async function testUnseenFistHitResult(game: GameManager, attackMove: Moves, protectMove: Moves, shouldSucceed: boolean = true): Promise<void> {
-  game.override.moveset([ attackMove ]);
-  game.override.enemyMoveset([ protectMove, protectMove, protectMove, protectMove ]);
-
-  await game.startBattle();
-
-  const leadPokemon = game.scene.getPlayerPokemon()!;
-  expect(leadPokemon).not.toBe(undefined);
-
-  const enemyPokemon = game.scene.getEnemyPokemon()!;
-  expect(enemyPokemon).not.toBe(undefined);
-
-  const enemyStartingHp = enemyPokemon.hp;
-
-  game.move.select(attackMove);
-  await game.phaseInterceptor.to(TurnEndPhase, false);
-
-  if (shouldSucceed) {
-    expect(enemyPokemon.hp).toBeLessThan(enemyStartingHp);
-  } else {
-    expect(enemyPokemon.hp).toBe(enemyStartingHp);
-  }
-}
diff --git a/src/test/battle/special_battle.test.ts b/src/test/battle/special_battle.test.ts
deleted file mode 100644
index af9e3dddbec..00000000000
--- a/src/test/battle/special_battle.test.ts
+++ /dev/null
@@ -1,143 +0,0 @@
-import { CommandPhase } from "#app/phases/command-phase";
-import { Mode } from "#app/ui/ui";
-import { Abilities } from "#enums/abilities";
-import { Moves } from "#enums/moves";
-import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
-import Phaser from "phaser";
-import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
-
-describe("Test Battle Phase", () => {
-  let phaserGame: Phaser.Game;
-  let game: GameManager;
-
-  beforeAll(() => {
-    phaserGame = new Phaser.Game({
-      type: Phaser.HEADLESS,
-    });
-  });
-
-  afterEach(() => {
-    game.phaseInterceptor.restoreOg();
-  });
-
-  beforeEach(() => {
-    game = new GameManager(phaserGame);
-    game.override.enemySpecies(Species.RATTATA);
-    game.override.startingLevel(2000);
-    game.override.moveset([ Moves.TACKLE ]);
-    game.override.enemyAbility(Abilities.HYDRATION);
-    game.override.ability(Abilities.HYDRATION);
-    game.override.enemyMoveset([ Moves.TACKLE, Moves.TACKLE, Moves.TACKLE, Moves.TACKLE ]);
-  });
-
-  it("startBattle 2vs1 boss", async() => {
-    game.override
-      .battleType("single")
-      .startingWave(10);
-    await game.startBattle([
-      Species.BLASTOISE,
-      Species.CHARIZARD,
-    ]);
-    expect(game.scene.ui?.getMode()).toBe(Mode.COMMAND);
-    expect(game.scene.getCurrentPhase()!.constructor.name).toBe(CommandPhase.name);
-  }, 20000);
-
-  it("startBattle 2vs2 boss", async() => {
-    game.override
-      .battleType("double")
-      .startingWave(10);
-    await game.startBattle([
-      Species.BLASTOISE,
-      Species.CHARIZARD,
-    ]);
-    expect(game.scene.ui?.getMode()).toBe(Mode.COMMAND);
-    expect(game.scene.getCurrentPhase()!.constructor.name).toBe(CommandPhase.name);
-  }, 20000);
-
-  it("startBattle 2vs2 trainer", async() => {
-    game.override
-      .battleType("double")
-      .startingWave(5);
-    await game.startBattle([
-      Species.BLASTOISE,
-      Species.CHARIZARD,
-    ]);
-    expect(game.scene.ui?.getMode()).toBe(Mode.COMMAND);
-    expect(game.scene.getCurrentPhase()!.constructor.name).toBe(CommandPhase.name);
-  }, 20000);
-
-  it("startBattle 2vs1 trainer", async() => {
-    game.override
-      .battleType("single")
-      .startingWave(5);
-    await game.startBattle([
-      Species.BLASTOISE,
-      Species.CHARIZARD,
-    ]);
-    expect(game.scene.ui?.getMode()).toBe(Mode.COMMAND);
-    expect(game.scene.getCurrentPhase()!.constructor.name).toBe(CommandPhase.name);
-  }, 20000);
-
-  it("startBattle 2vs1 rival", async() => {
-    game.override
-      .battleType("single")
-      .startingWave(8);
-    await game.startBattle([
-      Species.BLASTOISE,
-      Species.CHARIZARD,
-    ]);
-    expect(game.scene.ui?.getMode()).toBe(Mode.COMMAND);
-    expect(game.scene.getCurrentPhase()!.constructor.name).toBe(CommandPhase.name);
-  }, 20000);
-
-  it("startBattle 2vs2 rival", async() => {
-    game.override
-      .battleType("double")
-      .startingWave(8);
-    await game.startBattle([
-      Species.BLASTOISE,
-      Species.CHARIZARD,
-    ]);
-    expect(game.scene.ui?.getMode()).toBe(Mode.COMMAND);
-    expect(game.scene.getCurrentPhase()!.constructor.name).toBe(CommandPhase.name);
-  }, 20000);
-
-  it("startBattle 1vs1 trainer", async() => {
-    game.override
-      .battleType("single")
-      .startingWave(5);
-    await game.startBattle([
-      Species.BLASTOISE,
-    ]);
-    expect(game.scene.ui?.getMode()).toBe(Mode.COMMAND);
-    expect(game.scene.getCurrentPhase()!.constructor.name).toBe(CommandPhase.name);
-  }, 20000);
-
-  it("startBattle 2vs2 trainer", async() => {
-    game.override
-      .battleType("double")
-      .startingWave(5);
-    await game.startBattle([
-      Species.BLASTOISE,
-      Species.CHARIZARD,
-    ]);
-    expect(game.scene.ui?.getMode()).toBe(Mode.COMMAND);
-    expect(game.scene.getCurrentPhase()!.constructor.name).toBe(CommandPhase.name);
-  }, 20000);
-
-  it("startBattle 4vs2 trainer", async() => {
-    game.override
-      .battleType("double")
-      .startingWave(5);
-    await game.startBattle([
-      Species.BLASTOISE,
-      Species.CHARIZARD,
-      Species.DARKRAI,
-      Species.GABITE,
-    ]);
-    expect(game.scene.ui?.getMode()).toBe(Mode.COMMAND);
-    expect(game.scene.getCurrentPhase()!.constructor.name).toBe(CommandPhase.name);
-  }, 20000);
-});
-
diff --git a/src/test/battlerTags/substitute.test.ts b/src/test/battlerTags/substitute.test.ts
deleted file mode 100644
index 4bf7e584ed3..00000000000
--- a/src/test/battlerTags/substitute.test.ts
+++ /dev/null
@@ -1,231 +0,0 @@
-import { beforeEach, describe, expect, it, vi } from "vitest";
-import type { PokemonTurnData, TurnMove, PokemonMove } from "#app/field/pokemon";
-import type Pokemon from "#app/field/pokemon";
-import { MoveResult } from "#app/field/pokemon";
-import BattleScene from "#app/battle-scene";
-import { BattlerTagLapseType, BindTag, SubstituteTag } from "#app/data/battler-tags";
-import { Moves } from "#app/enums/moves";
-import { PokemonAnimType } from "#app/enums/pokemon-anim-type";
-import * as messages from "#app/messages";
-import { allMoves } from "#app/data/move";
-import type { MoveEffectPhase } from "#app/phases/move-effect-phase";
-
-describe("BattlerTag - SubstituteTag", () => {
-  let mockPokemon: Pokemon;
-
-  describe("onAdd behavior", () => {
-    beforeEach(() => {
-      mockPokemon = {
-        scene: new BattleScene(),
-        hp: 101,
-        id: 0,
-        getMaxHp: vi.fn().mockReturnValue(101) as Pokemon["getMaxHp"],
-        findAndRemoveTags: vi.fn().mockImplementation((tagFilter) => {
-          // simulate a Trapped tag set by another Pokemon, then expect the filter to catch it.
-          const trapTag = new BindTag(5, 0);
-          expect(tagFilter(trapTag)).toBeTruthy();
-          return true;
-        }) as Pokemon["findAndRemoveTags"]
-      } as unknown as Pokemon;
-
-      vi.spyOn(messages, "getPokemonNameWithAffix").mockReturnValue("");
-      vi.spyOn(mockPokemon.scene as BattleScene, "getPokemonById").mockImplementation(pokemonId => mockPokemon.id === pokemonId ? mockPokemon : null);
-    });
-
-    it(
-      "sets the tag's HP to 1/4 of the source's max HP (rounded down)",
-      async () => {
-        const subject = new SubstituteTag(Moves.SUBSTITUTE, mockPokemon.id);
-
-        vi.spyOn(mockPokemon.scene as BattleScene, "triggerPokemonBattleAnim").mockReturnValue(true);
-        vi.spyOn(mockPokemon.scene as BattleScene, "queueMessage").mockReturnValue();
-
-        subject.onAdd(mockPokemon);
-
-        expect(subject.hp).toBe(25);
-      }
-    );
-
-    it(
-      "triggers on-add effects that bring the source out of focus",
-      async () => {
-        const subject = new SubstituteTag(Moves.SUBSTITUTE, mockPokemon.id);
-
-        vi.spyOn(mockPokemon.scene as BattleScene, "triggerPokemonBattleAnim").mockImplementation(
-          (pokemon, battleAnimType, fieldAssets?, delayed?) => {
-            expect(battleAnimType).toBe(PokemonAnimType.SUBSTITUTE_ADD);
-            return true;
-          }
-        );
-
-        vi.spyOn(mockPokemon.scene as BattleScene, "queueMessage").mockReturnValue();
-
-        subject.onAdd(mockPokemon);
-
-        expect(subject.sourceInFocus).toBeFalsy();
-        expect((mockPokemon.scene as BattleScene).triggerPokemonBattleAnim).toHaveBeenCalledTimes(1);
-        expect((mockPokemon.scene as BattleScene).queueMessage).toHaveBeenCalledTimes(1);
-      }
-    );
-
-    it(
-      "removes effects that trap the source",
-      async () => {
-        const subject = new SubstituteTag(Moves.SUBSTITUTE, mockPokemon.id);
-
-        vi.spyOn(mockPokemon.scene as BattleScene, "queueMessage").mockReturnValue();
-
-        subject.onAdd(mockPokemon);
-        expect(mockPokemon.findAndRemoveTags).toHaveBeenCalledTimes(1);
-      }
-    );
-  });
-
-  describe("onRemove behavior", () => {
-    beforeEach(() => {
-      mockPokemon = {
-        scene: new BattleScene(),
-        hp: 101,
-        id: 0,
-        isFainted: vi.fn().mockReturnValue(false) as Pokemon["isFainted"]
-      } as unknown as Pokemon;
-
-      vi.spyOn(messages, "getPokemonNameWithAffix").mockReturnValue("");
-    });
-
-    it(
-      "triggers on-remove animation and message",
-      async () => {
-        const subject = new SubstituteTag(Moves.SUBSTITUTE, mockPokemon.id);
-        subject.sourceInFocus = false;
-
-        vi.spyOn(mockPokemon.scene as BattleScene, "triggerPokemonBattleAnim").mockImplementation(
-          (pokemon, battleAnimType, fieldAssets?, delayed?) => {
-            expect(battleAnimType).toBe(PokemonAnimType.SUBSTITUTE_REMOVE);
-            return true;
-          }
-        );
-
-        vi.spyOn(mockPokemon.scene as BattleScene, "queueMessage").mockReturnValue();
-
-        subject.onRemove(mockPokemon);
-
-        expect((mockPokemon.scene as BattleScene).triggerPokemonBattleAnim).toHaveBeenCalledTimes(1);
-        expect((mockPokemon.scene as BattleScene).queueMessage).toHaveBeenCalledTimes(1);
-      }
-    );
-  });
-
-  describe("lapse behavior", () => {
-    beforeEach(() => {
-      mockPokemon = {
-        scene: new BattleScene(),
-        hp: 101,
-        id: 0,
-        turnData: { acted: true } as PokemonTurnData,
-        getLastXMoves: vi.fn().mockReturnValue([ { move: Moves.TACKLE, result: MoveResult.SUCCESS } as TurnMove ]) as Pokemon["getLastXMoves"],
-      } as unknown as Pokemon;
-
-      vi.spyOn(messages, "getPokemonNameWithAffix").mockReturnValue("");
-    });
-
-    it(
-      "PRE_MOVE lapse triggers pre-move animation",
-      async () => {
-        const subject = new SubstituteTag(Moves.SUBSTITUTE, mockPokemon.id);
-
-        vi.spyOn(mockPokemon.scene as BattleScene, "triggerPokemonBattleAnim").mockImplementation(
-          (pokemon, battleAnimType, fieldAssets?, delayed?) => {
-            expect(battleAnimType).toBe(PokemonAnimType.SUBSTITUTE_PRE_MOVE);
-            return true;
-          }
-        );
-
-        vi.spyOn(mockPokemon.scene as BattleScene, "queueMessage").mockReturnValue();
-
-        expect(subject.lapse(mockPokemon, BattlerTagLapseType.PRE_MOVE)).toBeTruthy();
-
-        expect(subject.sourceInFocus).toBeTruthy();
-        expect((mockPokemon.scene as BattleScene).triggerPokemonBattleAnim).toHaveBeenCalledTimes(1);
-        expect((mockPokemon.scene as BattleScene).queueMessage).not.toHaveBeenCalled();
-      }
-    );
-
-    it(
-      "AFTER_MOVE lapse triggers post-move animation",
-      async () => {
-        const subject = new SubstituteTag(Moves.SUBSTITUTE, mockPokemon.id);
-
-        vi.spyOn(mockPokemon.scene as BattleScene, "triggerPokemonBattleAnim").mockImplementation(
-          (pokemon, battleAnimType, fieldAssets?, delayed?) => {
-            expect(battleAnimType).toBe(PokemonAnimType.SUBSTITUTE_POST_MOVE);
-            return true;
-          }
-        );
-
-        vi.spyOn(mockPokemon.scene as BattleScene, "queueMessage").mockReturnValue();
-
-        expect(subject.lapse(mockPokemon, BattlerTagLapseType.AFTER_MOVE)).toBeTruthy();
-
-        expect(subject.sourceInFocus).toBeFalsy();
-        expect((mockPokemon.scene as BattleScene).triggerPokemonBattleAnim).toHaveBeenCalledTimes(1);
-        expect((mockPokemon.scene as BattleScene).queueMessage).not.toHaveBeenCalled();
-      }
-    );
-
-    // TODO: Figure out how to mock a MoveEffectPhase correctly for this test
-    it.todo(
-      "HIT lapse triggers on-hit message",
-      async () => {
-        const subject = new SubstituteTag(Moves.SUBSTITUTE, mockPokemon.id);
-
-        vi.spyOn(mockPokemon.scene as BattleScene, "triggerPokemonBattleAnim").mockReturnValue(true);
-        vi.spyOn(mockPokemon.scene as BattleScene, "queueMessage").mockReturnValue();
-
-        const pokemonMove = {
-          getMove: vi.fn().mockReturnValue(allMoves[Moves.TACKLE]) as PokemonMove["getMove"]
-        } as PokemonMove;
-
-        const moveEffectPhase = {
-          move: pokemonMove,
-          getUserPokemon: vi.fn().mockReturnValue(undefined) as MoveEffectPhase["getUserPokemon"]
-        } as MoveEffectPhase;
-
-        vi.spyOn(mockPokemon.scene as BattleScene, "getCurrentPhase").mockReturnValue(moveEffectPhase);
-        vi.spyOn(allMoves[Moves.TACKLE], "hitsSubstitute").mockReturnValue(true);
-
-        expect(subject.lapse(mockPokemon, BattlerTagLapseType.HIT)).toBeTruthy();
-
-        expect((mockPokemon.scene as BattleScene).triggerPokemonBattleAnim).not.toHaveBeenCalled();
-        expect((mockPokemon.scene as BattleScene).queueMessage).toHaveBeenCalledTimes(1);
-      }
-    );
-
-    it(
-      "CUSTOM lapse flags the tag for removal",
-      async () => {
-        const subject = new SubstituteTag(Moves.SUBSTITUTE, mockPokemon.id);
-
-        vi.spyOn(mockPokemon.scene as BattleScene, "triggerPokemonBattleAnim").mockReturnValue(true);
-        vi.spyOn(mockPokemon.scene as BattleScene, "queueMessage").mockReturnValue();
-
-        expect(subject.lapse(mockPokemon, BattlerTagLapseType.CUSTOM)).toBeFalsy();
-      }
-    );
-
-    it(
-      "Unsupported lapse type does nothing",
-      async () => {
-        const subject = new SubstituteTag(Moves.SUBSTITUTE, mockPokemon.id);
-
-        vi.spyOn(mockPokemon.scene as BattleScene, "triggerPokemonBattleAnim").mockReturnValue(true);
-        vi.spyOn(mockPokemon.scene as BattleScene, "queueMessage").mockReturnValue();
-
-        expect(subject.lapse(mockPokemon, BattlerTagLapseType.TURN_END)).toBeTruthy();
-
-        expect((mockPokemon.scene as BattleScene).triggerPokemonBattleAnim).not.toHaveBeenCalled();
-        expect((mockPokemon.scene as BattleScene).queueMessage).not.toHaveBeenCalled();
-      }
-    );
-  });
-});
diff --git a/src/test/enemy_command.test.ts b/src/test/enemy_command.test.ts
deleted file mode 100644
index 647c0be279a..00000000000
--- a/src/test/enemy_command.test.ts
+++ /dev/null
@@ -1,109 +0,0 @@
-import type BattleScene from "#app/battle-scene";
-import { allMoves, MoveCategory } from "#app/data/move";
-import { Abilities } from "#app/enums/abilities";
-import { Moves } from "#app/enums/moves";
-import { Species } from "#app/enums/species";
-import type { EnemyPokemon } from "#app/field/pokemon";
-import { AiType } from "#app/field/pokemon";
-import { randSeedInt } from "#app/utils";
-import GameManager from "#test/utils/gameManager";
-import Phaser from "phaser";
-import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
-
-let globalScene: BattleScene;
-const NUM_TRIALS = 300;
-
-type MoveChoiceSet = { [key: number]: number };
-
-function getEnemyMoveChoices(pokemon: EnemyPokemon, moveChoices: MoveChoiceSet): void {
-  // Use an unseeded random number generator in place of the mocked-out randBattleSeedInt
-  vi.spyOn(globalScene, "randBattleSeedInt").mockImplementation((range, min?) => {
-    return randSeedInt(range, min);
-  });
-  for (let i = 0; i < NUM_TRIALS; i++) {
-    const queuedMove = pokemon.getNextMove();
-    moveChoices[queuedMove.move]++;
-  }
-
-  for (const [ moveId, count ] of Object.entries(moveChoices)) {
-    console.log(`Move: ${allMoves[moveId].name}   Count: ${count} (${count / NUM_TRIALS * 100}%)`);
-  }
-}
-
-describe("Enemy Commands - Move Selection", () => {
-  let phaserGame: Phaser.Game;
-  let game: GameManager;
-
-  beforeAll(() => {
-    phaserGame = new Phaser.Game({
-      type: Phaser.HEADLESS,
-    });
-  });
-
-  afterEach(() => {
-    game.phaseInterceptor.restoreOg();
-  });
-
-  beforeEach(() => {
-    game = new GameManager(phaserGame);
-    globalScene = game.scene;
-
-    game.override
-      .ability(Abilities.BALL_FETCH)
-      .enemyAbility(Abilities.BALL_FETCH);
-  });
-
-  it(
-    "should never use Status moves if an attack can KO",
-    async () => {
-      game.override
-        .enemySpecies(Species.ETERNATUS)
-        .enemyMoveset([ Moves.ETERNABEAM, Moves.SLUDGE_BOMB, Moves.DRAGON_DANCE, Moves.COSMIC_POWER ])
-        .startingLevel(1)
-        .enemyLevel(100);
-
-      await game.classicMode.startBattle([ Species.MAGIKARP ]);
-
-      const enemyPokemon = game.scene.getEnemyPokemon()!;
-      enemyPokemon.aiType = AiType.SMART_RANDOM;
-
-      const moveChoices: MoveChoiceSet = {};
-      const enemyMoveset = enemyPokemon.getMoveset();
-      enemyMoveset.forEach(mv => moveChoices[mv!.moveId] = 0);
-      getEnemyMoveChoices(enemyPokemon, moveChoices);
-
-      enemyMoveset.forEach(mv => {
-        if (mv?.getMove().category === MoveCategory.STATUS) {
-          expect(moveChoices[mv.moveId]).toBe(0);
-        }
-      });
-    }
-  );
-
-  it(
-    "should not select Last Resort if it would fail, even if the move KOs otherwise",
-    async () => {
-      game.override
-        .enemySpecies(Species.KANGASKHAN)
-        .enemyMoveset([ Moves.LAST_RESORT, Moves.GIGA_IMPACT, Moves.SPLASH, Moves.SWORDS_DANCE ])
-        .startingLevel(1)
-        .enemyLevel(100);
-
-      await game.classicMode.startBattle([ Species.MAGIKARP ]);
-
-      const enemyPokemon = game.scene.getEnemyPokemon()!;
-      enemyPokemon.aiType = AiType.SMART_RANDOM;
-
-      const moveChoices: MoveChoiceSet = {};
-      const enemyMoveset = enemyPokemon.getMoveset();
-      enemyMoveset.forEach(mv => moveChoices[mv!.moveId] = 0);
-      getEnemyMoveChoices(enemyPokemon, moveChoices);
-
-      enemyMoveset.forEach(mv => {
-        if (mv?.getMove().category === MoveCategory.STATUS || mv?.moveId === Moves.LAST_RESORT) {
-          expect(moveChoices[mv.moveId]).toBe(0);
-        }
-      });
-    }
-  );
-});
diff --git a/src/test/moves/autotomize.test.ts b/src/test/moves/autotomize.test.ts
deleted file mode 100644
index e15642b7ce5..00000000000
--- a/src/test/moves/autotomize.test.ts
+++ /dev/null
@@ -1,98 +0,0 @@
-import { Abilities } from "#enums/abilities";
-import { Moves } from "#enums/moves";
-import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
-import Phaser from "phaser";
-import { afterEach, beforeAll, beforeEach, describe, it, expect } from "vitest";
-
-describe("Moves - Autotomize", () => {
-  let phaserGame: Phaser.Game;
-  let game: GameManager;
-  const TIMEOUT = 20 * 1000;
-
-  beforeAll(() => {
-    phaserGame = new Phaser.Game({
-      type: Phaser.HEADLESS,
-    });
-  });
-
-  afterEach(() => {
-    game.phaseInterceptor.restoreOg();
-  });
-
-  beforeEach(() => {
-    game = new GameManager(phaserGame);
-    game.override
-      .moveset([ Moves.AUTOTOMIZE, Moves.KINGS_SHIELD, Moves.FALSE_SWIPE ])
-      .battleType("single")
-      .enemyAbility(Abilities.BALL_FETCH)
-      .enemyMoveset(Moves.SPLASH);
-  });
-
-  it("Autotomize should reduce weight", async () => {
-    const baseDracozoltWeight = 190;
-    const oneAutotomizeDracozoltWeight = 90;
-    const twoAutotomizeDracozoltWeight = 0.1;
-    const threeAutotomizeDracozoltWeight = 0.1;
-
-    await game.classicMode.startBattle([ Species.DRACOZOLT ]);
-    const playerPokemon = game.scene.getPlayerPokemon()!;
-    expect(playerPokemon.getWeight()).toBe(baseDracozoltWeight);
-    game.move.select(Moves.AUTOTOMIZE);
-    await game.toNextTurn();
-    expect(playerPokemon.getWeight()).toBe(oneAutotomizeDracozoltWeight);
-
-    game.move.select(Moves.AUTOTOMIZE);
-    await game.toNextTurn();
-    expect(playerPokemon.getWeight()).toBe(twoAutotomizeDracozoltWeight);
-
-
-    game.move.select(Moves.AUTOTOMIZE);
-    await game.toNextTurn();
-    expect(playerPokemon.getWeight()).toBe(threeAutotomizeDracozoltWeight);
-  }, TIMEOUT);
-
-  it("Changing forms should revert weight", async () => {
-    const baseAegislashWeight = 53;
-    const autotomizeAegislashWeight = 0.1;
-
-    await game.classicMode.startBattle([ Species.AEGISLASH ]);
-    const playerPokemon = game.scene.getPlayerPokemon()!;
-
-    expect(playerPokemon.getWeight()).toBe(baseAegislashWeight);
-
-    game.move.select(Moves.AUTOTOMIZE);
-    await game.toNextTurn();
-    expect(playerPokemon.getWeight()).toBe(autotomizeAegislashWeight);
-
-    // Transform to sword form
-    game.move.select(Moves.FALSE_SWIPE);
-    await game.toNextTurn();
-    expect(playerPokemon.getWeight()).toBe(baseAegislashWeight);
-
-    game.move.select(Moves.AUTOTOMIZE);
-    await game.toNextTurn();
-    expect(playerPokemon.getWeight()).toBe(autotomizeAegislashWeight);
-
-    // Transform to shield form
-    game.move.select(Moves.KINGS_SHIELD);
-    await game.toNextTurn();
-    expect(playerPokemon.getWeight()).toBe(baseAegislashWeight);
-
-    game.move.select(Moves.AUTOTOMIZE);
-    await game.toNextTurn();
-    expect(playerPokemon.getWeight()).toBe(autotomizeAegislashWeight);
-  }, TIMEOUT);
-
-  it("Autotomize should interact with light metal correctly", async () => {
-    const baseLightGroudonWeight = 475;
-    const autotomizeLightGroudonWeight = 425;
-    game.override.ability(Abilities.LIGHT_METAL);
-    await game.classicMode.startBattle([ Species.GROUDON ]);
-    const playerPokemon = game.scene.getPlayerPokemon()!;
-    expect(playerPokemon.getWeight()).toBe(baseLightGroudonWeight);
-    game.move.select(Moves.AUTOTOMIZE);
-    await game.toNextTurn();
-    expect(playerPokemon.getWeight()).toBe(autotomizeLightGroudonWeight);
-  }, TIMEOUT);
-});
diff --git a/src/test/moves/baneful_bunker.test.ts b/src/test/moves/baneful_bunker.test.ts
deleted file mode 100644
index a0fc0f21ee2..00000000000
--- a/src/test/moves/baneful_bunker.test.ts
+++ /dev/null
@@ -1,92 +0,0 @@
-import Phaser from "phaser";
-import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest";
-import GameManager from "../utils/gameManager";
-import { Species } from "#enums/species";
-import { Abilities } from "#enums/abilities";
-import { Moves } from "#enums/moves";
-import { BattlerIndex } from "#app/battle";
-import { StatusEffect } from "#app/enums/status-effect";
-
-
-describe("Moves - Baneful Bunker", () => {
-  let phaserGame: Phaser.Game;
-  let game: GameManager;
-
-  beforeAll(() => {
-    phaserGame = new Phaser.Game({
-      type: Phaser.HEADLESS,
-    });
-  });
-
-  afterEach(() => {
-    game.phaseInterceptor.restoreOg();
-  });
-
-  beforeEach(() => {
-    game = new GameManager(phaserGame);
-
-    game.override.battleType("single");
-
-    game.override.moveset(Moves.SLASH);
-
-    game.override.enemySpecies(Species.SNORLAX);
-    game.override.enemyAbility(Abilities.INSOMNIA);
-    game.override.enemyMoveset(Moves.BANEFUL_BUNKER);
-
-    game.override.startingLevel(100);
-    game.override.enemyLevel(100);
-  });
-  test(
-    "should protect the user and poison attackers that make contact",
-    async () => {
-      await game.classicMode.startBattle([ Species.CHARIZARD ]);
-
-      const leadPokemon = game.scene.getPlayerPokemon()!;
-      const enemyPokemon = game.scene.getEnemyPokemon()!;
-
-      game.move.select(Moves.SLASH);
-      await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]);
-      await game.phaseInterceptor.to("BerryPhase", false);
-      expect(enemyPokemon.hp).toBe(enemyPokemon.getMaxHp());
-      expect(leadPokemon.status?.effect  === StatusEffect.POISON).toBeTruthy();
-    }
-  );
-  test(
-    "should protect the user and poison attackers that make contact, regardless of accuracy checks",
-    async () => {
-      await game.classicMode.startBattle([ Species.CHARIZARD ]);
-
-      const leadPokemon = game.scene.getPlayerPokemon()!;
-      const enemyPokemon = game.scene.getEnemyPokemon()!;
-
-      game.move.select(Moves.SLASH);
-      await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]);
-      await game.phaseInterceptor.to("MoveEffectPhase");
-
-      await game.move.forceMiss();
-      await game.phaseInterceptor.to("BerryPhase", false);
-      expect(enemyPokemon.hp).toBe(enemyPokemon.getMaxHp());
-      expect(leadPokemon.status?.effect  === StatusEffect.POISON).toBeTruthy();
-    }
-  );
-
-  test(
-    "should not poison attackers that don't make contact",
-    async () => {
-      game.override.moveset(Moves.FLASH_CANNON);
-      await game.classicMode.startBattle([ Species.CHARIZARD ]);
-
-      const leadPokemon = game.scene.getPlayerPokemon()!;
-      const enemyPokemon = game.scene.getEnemyPokemon()!;
-
-      game.move.select(Moves.FLASH_CANNON);
-      await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]);
-      await game.phaseInterceptor.to("MoveEffectPhase");
-
-      await game.move.forceMiss();
-      await game.phaseInterceptor.to("BerryPhase", false);
-      expect(enemyPokemon.hp).toBe(enemyPokemon.getMaxHp());
-      expect(leadPokemon.status?.effect  === StatusEffect.POISON).toBeFalsy();
-    }
-  );
-});
diff --git a/src/test/moves/beak_blast.test.ts b/src/test/moves/beak_blast.test.ts
deleted file mode 100644
index 0c1e7bbeed9..00000000000
--- a/src/test/moves/beak_blast.test.ts
+++ /dev/null
@@ -1,135 +0,0 @@
-import { BattlerTagType } from "#app/enums/battler-tag-type";
-import { StatusEffect } from "#app/enums/status-effect";
-import { BerryPhase } from "#app/phases/berry-phase";
-import { MovePhase } from "#app/phases/move-phase";
-import { TurnEndPhase } from "#app/phases/turn-end-phase";
-import { Abilities } from "#enums/abilities";
-import { Moves } from "#enums/moves";
-import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
-import Phaser from "phaser";
-import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
-
-
-describe("Moves - Beak Blast", () => {
-  let phaserGame: Phaser.Game;
-  let game: GameManager;
-
-  beforeAll(() => {
-    phaserGame = new Phaser.Game({
-      type: Phaser.HEADLESS,
-    });
-  });
-
-  afterEach(() => {
-    game.phaseInterceptor.restoreOg();
-  });
-
-  beforeEach(() => {
-    game = new GameManager(phaserGame);
-    game.override
-      .battleType("single")
-      .ability(Abilities.UNNERVE)
-      .moveset([ Moves.BEAK_BLAST ])
-      .enemySpecies(Species.SNORLAX)
-      .enemyAbility(Abilities.INSOMNIA)
-      .enemyMoveset([ Moves.TACKLE ])
-      .startingLevel(100)
-      .enemyLevel(100);
-  });
-
-  it(
-    "should add a charge effect that burns attackers on contact",
-    async () => {
-      await game.startBattle([ Species.BLASTOISE ]);
-
-      const leadPokemon = game.scene.getPlayerPokemon()!;
-      const enemyPokemon = game.scene.getEnemyPokemon()!;
-
-      game.move.select(Moves.BEAK_BLAST);
-
-      await game.phaseInterceptor.to(MovePhase, false);
-      expect(leadPokemon.getTag(BattlerTagType.BEAK_BLAST_CHARGING)).toBeDefined();
-
-      await game.phaseInterceptor.to(BerryPhase, false);
-      expect(enemyPokemon.status?.effect).toBe(StatusEffect.BURN);
-    }
-  );
-
-  it(
-    "should still charge and burn opponents if the user is sleeping",
-    async () => {
-      game.override.statusEffect(StatusEffect.SLEEP);
-
-      await game.startBattle([ Species.BLASTOISE ]);
-
-      const leadPokemon = game.scene.getPlayerPokemon()!;
-      const enemyPokemon = game.scene.getEnemyPokemon()!;
-
-      game.move.select(Moves.BEAK_BLAST);
-
-      await game.phaseInterceptor.to(MovePhase, false);
-      expect(leadPokemon.getTag(BattlerTagType.BEAK_BLAST_CHARGING)).toBeDefined();
-
-      await game.phaseInterceptor.to(BerryPhase, false);
-      expect(enemyPokemon.status?.effect).toBe(StatusEffect.BURN);
-    }
-  );
-
-  it(
-    "should not burn attackers that don't make contact",
-    async () => {
-      game.override.enemyMoveset([ Moves.WATER_GUN ]);
-
-      await game.startBattle([ Species.BLASTOISE ]);
-
-      const leadPokemon = game.scene.getPlayerPokemon()!;
-      const enemyPokemon = game.scene.getEnemyPokemon()!;
-
-      game.move.select(Moves.BEAK_BLAST);
-
-      await game.phaseInterceptor.to(MovePhase, false);
-      expect(leadPokemon.getTag(BattlerTagType.BEAK_BLAST_CHARGING)).toBeDefined();
-
-      await game.phaseInterceptor.to(BerryPhase, false);
-      expect(enemyPokemon.status?.effect).not.toBe(StatusEffect.BURN);
-    }
-  );
-
-  it(
-    "should only hit twice with Multi-Lens",
-    async () => {
-      game.override.startingHeldItems([{ name: "MULTI_LENS", count: 1 }]);
-
-      await game.startBattle([ Species.BLASTOISE ]);
-
-      const leadPokemon = game.scene.getPlayerPokemon()!;
-
-      game.move.select(Moves.BEAK_BLAST);
-
-      await game.phaseInterceptor.to(BerryPhase, false);
-      expect(leadPokemon.turnData.hitCount).toBe(2);
-    }
-  );
-
-  it(
-    "should be blocked by Protect",
-    async () => {
-      game.override.enemyMoveset([ Moves.PROTECT ]);
-
-      await game.startBattle([ Species.BLASTOISE ]);
-
-      const leadPokemon = game.scene.getPlayerPokemon()!;
-      const enemyPokemon = game.scene.getEnemyPokemon()!;
-
-      game.move.select(Moves.BEAK_BLAST);
-
-      await game.phaseInterceptor.to(MovePhase, false);
-      expect(leadPokemon.getTag(BattlerTagType.BEAK_BLAST_CHARGING)).toBeDefined();
-
-      await game.phaseInterceptor.to(TurnEndPhase);
-      expect(enemyPokemon.hp).toBe(enemyPokemon.getMaxHp());
-      expect(leadPokemon.getTag(BattlerTagType.BEAK_BLAST_CHARGING)).toBeUndefined();
-    }
-  );
-});
diff --git a/src/test/moves/beat_up.test.ts b/src/test/moves/beat_up.test.ts
deleted file mode 100644
index 41e5b63471f..00000000000
--- a/src/test/moves/beat_up.test.ts
+++ /dev/null
@@ -1,77 +0,0 @@
-import { Abilities } from "#app/enums/abilities";
-import { Moves } from "#app/enums/moves";
-import { Species } from "#app/enums/species";
-import { StatusEffect } from "#app/enums/status-effect";
-import { MoveEffectPhase } from "#app/phases/move-effect-phase";
-import GameManager from "#test/utils/gameManager";
-import Phaser from "phaser";
-import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
-
-describe("Moves - Beat Up", () => {
-  let phaserGame: Phaser.Game;
-  let game: GameManager;
-
-  beforeAll(() => {
-    phaserGame = new Phaser.Game({
-      type: Phaser.HEADLESS,
-    });
-  });
-
-  afterEach(() => {
-    game.phaseInterceptor.restoreOg();
-  });
-
-  beforeEach(() => {
-    game = new GameManager(phaserGame);
-    game.override.battleType("single");
-
-    game.override.enemySpecies(Species.SNORLAX);
-    game.override.enemyLevel(100);
-    game.override.enemyMoveset([ Moves.SPLASH ]);
-    game.override.enemyAbility(Abilities.INSOMNIA);
-
-    game.override.startingLevel(100);
-    game.override.moveset([ Moves.BEAT_UP ]);
-  });
-
-  it(
-    "should hit once for each healthy player Pokemon",
-    async () => {
-      await game.startBattle([ Species.MAGIKARP, Species.BULBASAUR, Species.CHARMANDER, Species.SQUIRTLE, Species.PIKACHU, Species.EEVEE ]);
-
-      const playerPokemon = game.scene.getPlayerPokemon()!;
-      const enemyPokemon = game.scene.getEnemyPokemon()!;
-      let enemyStartingHp = enemyPokemon.hp;
-
-      game.move.select(Moves.BEAT_UP);
-
-      await game.phaseInterceptor.to(MoveEffectPhase);
-
-      expect(playerPokemon.turnData.hitCount).toBe(6);
-      expect(enemyPokemon.hp).toBeLessThan(enemyStartingHp);
-
-      while (playerPokemon.turnData.hitsLeft > 0) {
-        enemyStartingHp = enemyPokemon.hp;
-        await game.phaseInterceptor.to(MoveEffectPhase);
-        expect(enemyPokemon.hp).toBeLessThan(enemyStartingHp);
-      }
-    }
-  );
-
-  it(
-    "should not count player Pokemon with status effects towards hit count",
-    async () => {
-      await game.startBattle([ Species.MAGIKARP, Species.BULBASAUR, Species.CHARMANDER, Species.SQUIRTLE, Species.PIKACHU, Species.EEVEE ]);
-
-      const playerPokemon = game.scene.getPlayerPokemon()!;
-
-      game.scene.getPlayerParty()[1].trySetStatus(StatusEffect.BURN);
-
-      game.move.select(Moves.BEAT_UP);
-
-      await game.phaseInterceptor.to(MoveEffectPhase);
-
-      expect(playerPokemon.turnData.hitCount).toBe(5);
-    }
-  );
-});
diff --git a/src/test/moves/belly_drum.test.ts b/src/test/moves/belly_drum.test.ts
deleted file mode 100644
index 0bed1248e7e..00000000000
--- a/src/test/moves/belly_drum.test.ts
+++ /dev/null
@@ -1,111 +0,0 @@
-import { TurnEndPhase } from "#app/phases/turn-end-phase";
-import { toDmgValue } from "#app/utils";
-import { Moves } from "#enums/moves";
-import { Species } from "#enums/species";
-import { Stat } from "#enums/stat";
-import GameManager from "#test/utils/gameManager";
-import Phaser from "phaser";
-import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest";
-import { Abilities } from "#app/enums/abilities";
-
-
-// RATIO : HP Cost of Move
-const RATIO = 2;
-// PREDAMAGE : Amount of extra HP lost
-const PREDAMAGE = 15;
-
-describe("Moves - BELLY DRUM", () => {
-  let phaserGame: Phaser.Game;
-  let game: GameManager;
-
-  beforeAll(() => {
-    phaserGame = new Phaser.Game({
-      type: Phaser.HEADLESS,
-    });
-  });
-
-  afterEach(() => {
-    game.phaseInterceptor.restoreOg();
-  });
-
-  beforeEach(() => {
-    game = new GameManager(phaserGame);
-    game.override
-      .starterSpecies(Species.MAGIKARP)
-      .enemySpecies(Species.SNORLAX)
-      .startingLevel(100)
-      .enemyLevel(100)
-      .moveset([ Moves.BELLY_DRUM ])
-      .enemyMoveset(Moves.SPLASH)
-      .enemyAbility(Abilities.BALL_FETCH);
-  });
-
-  // Bulbapedia Reference: https://bulbapedia.bulbagarden.net/wiki/Belly_Drum_(move)
-
-  test("raises the user's ATK stat stage to its max, at the cost of 1/2 of its maximum HP",
-    async() => {
-      await game.startBattle([ Species.MAGIKARP ]);
-
-      const leadPokemon = game.scene.getPlayerPokemon()!;
-      const hpLost = toDmgValue(leadPokemon.getMaxHp() / RATIO);
-
-      game.move.select(Moves.BELLY_DRUM);
-      await game.phaseInterceptor.to(TurnEndPhase);
-
-      expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp() - hpLost);
-      expect(leadPokemon.getStatStage(Stat.ATK)).toBe(6);
-    }
-  );
-
-  test("will still take effect if an uninvolved stat stage is at max",
-    async() => {
-      await game.startBattle([ Species.MAGIKARP ]);
-
-      const leadPokemon = game.scene.getPlayerPokemon()!;
-      const hpLost = toDmgValue(leadPokemon.getMaxHp() / RATIO);
-
-      // Here - Stat.ATK -> -3 and Stat.SPATK -> 6
-      leadPokemon.setStatStage(Stat.ATK, -3);
-      leadPokemon.setStatStage(Stat.SPATK, 6);
-
-      game.move.select(Moves.BELLY_DRUM);
-      await game.phaseInterceptor.to(TurnEndPhase);
-
-      expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp() - hpLost);
-      expect(leadPokemon.getStatStage(Stat.ATK)).toBe(6);
-      expect(leadPokemon.getStatStage(Stat.SPATK)).toBe(6);
-    }
-  );
-
-  test("fails if the pokemon's ATK stat stage is at its maximum",
-    async() => {
-      await game.startBattle([ Species.MAGIKARP ]);
-
-      const leadPokemon = game.scene.getPlayerPokemon()!;
-
-      leadPokemon.setStatStage(Stat.ATK, 6);
-
-      game.move.select(Moves.BELLY_DRUM);
-      await game.phaseInterceptor.to(TurnEndPhase);
-
-      expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp());
-      expect(leadPokemon.getStatStage(Stat.ATK)).toBe(6);
-    }
-  );
-
-  test("fails if the user's health is less than 1/2",
-    async() => {
-      await game.startBattle([ Species.MAGIKARP ]);
-
-      const leadPokemon = game.scene.getPlayerPokemon()!;
-      const hpLost = toDmgValue(leadPokemon.getMaxHp() / RATIO);
-      leadPokemon.hp = hpLost - PREDAMAGE;
-
-      game.move.select(Moves.BELLY_DRUM);
-      await game.phaseInterceptor.to(TurnEndPhase);
-
-      expect(leadPokemon.hp).toBe(hpLost - PREDAMAGE);
-      expect(leadPokemon.getStatStage(Stat.ATK)).toBe(0);
-    }
-  );
-});
diff --git a/src/test/moves/ceaseless_edge.test.ts b/src/test/moves/ceaseless_edge.test.ts
deleted file mode 100644
index 3fbbb7b0aaf..00000000000
--- a/src/test/moves/ceaseless_edge.test.ts
+++ /dev/null
@@ -1,118 +0,0 @@
-import { ArenaTagSide, ArenaTrapTag } from "#app/data/arena-tag";
-import { allMoves } from "#app/data/move";
-import { Abilities } from "#app/enums/abilities";
-import { ArenaTagType } from "#app/enums/arena-tag-type";
-import { MoveEffectPhase } from "#app/phases/move-effect-phase";
-import { TurnEndPhase } from "#app/phases/turn-end-phase";
-import { Moves } from "#enums/moves";
-import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
-import Phaser from "phaser";
-import { afterEach, beforeAll, beforeEach, describe, expect, test, vi } from "vitest";
-
-
-describe("Moves - Ceaseless Edge", () => {
-  let phaserGame: Phaser.Game;
-  let game: GameManager;
-
-  beforeAll(() => {
-    phaserGame = new Phaser.Game({
-      type: Phaser.HEADLESS,
-    });
-  });
-
-  afterEach(() => {
-    game.phaseInterceptor.restoreOg();
-  });
-
-  beforeEach(() => {
-    game = new GameManager(phaserGame);
-    game.override.battleType("single");
-    game.override.enemySpecies(Species.RATTATA);
-    game.override.enemyAbility(Abilities.RUN_AWAY);
-    game.override.enemyPassiveAbility(Abilities.RUN_AWAY);
-    game.override.startingLevel(100);
-    game.override.enemyLevel(100);
-    game.override.moveset([ Moves.CEASELESS_EDGE, Moves.SPLASH, Moves.ROAR ]);
-    game.override.enemyMoveset(Moves.SPLASH);
-    vi.spyOn(allMoves[Moves.CEASELESS_EDGE], "accuracy", "get").mockReturnValue(100);
-
-  });
-
-  test(
-    "move should hit and apply spikes",
-    async () => {
-      await game.classicMode.startBattle([ Species.ILLUMISE ]);
-
-      const enemyPokemon = game.scene.getEnemyPokemon()!;
-
-      const enemyStartingHp = enemyPokemon.hp;
-
-      game.move.select(Moves.CEASELESS_EDGE);
-
-      await game.phaseInterceptor.to(MoveEffectPhase, false);
-      // Spikes should not have any layers before move effect is applied
-      const tagBefore = game.scene.arena.getTagOnSide(ArenaTagType.SPIKES, ArenaTagSide.ENEMY) as ArenaTrapTag;
-      expect(tagBefore instanceof ArenaTrapTag).toBeFalsy();
-
-      await game.phaseInterceptor.to(TurnEndPhase);
-      const tagAfter = game.scene.arena.getTagOnSide(ArenaTagType.SPIKES, ArenaTagSide.ENEMY) as ArenaTrapTag;
-      expect(tagAfter instanceof ArenaTrapTag).toBeTruthy();
-      expect(tagAfter.layers).toBe(1);
-      expect(enemyPokemon.hp).toBeLessThan(enemyStartingHp);
-    }
-  );
-
-  test(
-    "move should hit twice with multi lens and apply two layers of spikes",
-    async () => {
-      game.override.startingHeldItems([{ name: "MULTI_LENS" }]);
-      await game.classicMode.startBattle([ Species.ILLUMISE ]);
-
-      const enemyPokemon = game.scene.getEnemyPokemon()!;
-
-      const enemyStartingHp = enemyPokemon.hp;
-
-      game.move.select(Moves.CEASELESS_EDGE);
-
-      await game.phaseInterceptor.to(MoveEffectPhase, false);
-      // Spikes should not have any layers before move effect is applied
-      const tagBefore = game.scene.arena.getTagOnSide(ArenaTagType.SPIKES, ArenaTagSide.ENEMY) as ArenaTrapTag;
-      expect(tagBefore instanceof ArenaTrapTag).toBeFalsy();
-
-      await game.phaseInterceptor.to(TurnEndPhase);
-      const tagAfter = game.scene.arena.getTagOnSide(ArenaTagType.SPIKES, ArenaTagSide.ENEMY) as ArenaTrapTag;
-      expect(tagAfter instanceof ArenaTrapTag).toBeTruthy();
-      expect(tagAfter.layers).toBe(2);
-      expect(enemyPokemon.hp).toBeLessThan(enemyStartingHp);
-    }
-  );
-
-  test(
-    "trainer - move should hit twice, apply two layers of spikes, force switch opponent - opponent takes damage",
-    async () => {
-      game.override.startingHeldItems([{ name: "MULTI_LENS" }]);
-      game.override.startingWave(25);
-
-      await game.classicMode.startBattle([ Species.ILLUMISE ]);
-
-      game.move.select(Moves.CEASELESS_EDGE);
-      await game.phaseInterceptor.to(MoveEffectPhase, false);
-      // Spikes should not have any layers before move effect is applied
-      const tagBefore = game.scene.arena.getTagOnSide(ArenaTagType.SPIKES, ArenaTagSide.ENEMY) as ArenaTrapTag;
-      expect(tagBefore instanceof ArenaTrapTag).toBeFalsy();
-
-      await game.toNextTurn();
-      const tagAfter = game.scene.arena.getTagOnSide(ArenaTagType.SPIKES, ArenaTagSide.ENEMY) as ArenaTrapTag;
-      expect(tagAfter instanceof ArenaTrapTag).toBeTruthy();
-      expect(tagAfter.layers).toBe(2);
-
-      const hpBeforeSpikes = game.scene.currentBattle.enemyParty[1].hp;
-      // Check HP of pokemon that WILL BE switched in (index 1)
-      game.forceEnemyToSwitch();
-      game.move.select(Moves.SPLASH);
-      await game.phaseInterceptor.to(TurnEndPhase, false);
-      expect(game.scene.currentBattle.enemyParty[0].hp).toBeLessThan(hpBeforeSpikes);
-    }
-  );
-});
diff --git a/src/test/moves/clangorous_soul.test.ts b/src/test/moves/clangorous_soul.test.ts
deleted file mode 100644
index 52e980cc4fa..00000000000
--- a/src/test/moves/clangorous_soul.test.ts
+++ /dev/null
@@ -1,128 +0,0 @@
-import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
-import Phaser from "phaser";
-import GameManager from "#test/utils/gameManager";
-import { TurnEndPhase } from "#app/phases/turn-end-phase";
-import { Moves } from "#enums/moves";
-import { Species } from "#enums/species";
-import { Stat } from "#enums/stat";
-
-
-/** HP Cost of Move */
-const RATIO = 3;
-/** Amount of extra HP lost */
-const PREDAMAGE = 15;
-
-describe("Moves - Clangorous Soul", () => {
-  let phaserGame: Phaser.Game;
-  let game: GameManager;
-
-  beforeAll(() => {
-    phaserGame = new Phaser.Game({
-      type: Phaser.HEADLESS,
-    });
-  });
-
-  afterEach(() => {
-    game.phaseInterceptor.restoreOg();
-  });
-
-  beforeEach(() => {
-    game = new GameManager(phaserGame);
-    game.override.starterSpecies(Species.MAGIKARP);
-    game.override.enemySpecies(Species.SNORLAX);
-    game.override.startingLevel(100);
-    game.override.enemyLevel(100);
-    game.override.moveset([ Moves.CLANGOROUS_SOUL ]);
-    game.override.enemyMoveset(Moves.SPLASH);
-  });
-
-  //Bulbapedia Reference: https://bulbapedia.bulbagarden.net/wiki/Clangorous_Soul_(move)
-
-  it("raises the user's ATK, DEF, SPATK, SPDEF, and SPD stat stages by 1 each at the cost of 1/3 of its maximum HP",
-  	async() => {
-      await game.startBattle([ Species.MAGIKARP ]);
-
-      const leadPokemon = game.scene.getPlayerPokemon()!;
-      const hpLost = Math.floor(leadPokemon.getMaxHp() / RATIO);
-
-      game.move.select(Moves.CLANGOROUS_SOUL);
-      await game.phaseInterceptor.to(TurnEndPhase);
-
-      expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp() - hpLost);
-      expect(leadPokemon.getStatStage(Stat.ATK)).toBe(1);
-      expect(leadPokemon.getStatStage(Stat.DEF)).toBe(1);
-      expect(leadPokemon.getStatStage(Stat.SPATK)).toBe(1);
-      expect(leadPokemon.getStatStage(Stat.SPDEF)).toBe(1);
-      expect(leadPokemon.getStatStage(Stat.SPD)).toBe(1);
-    }
-  );
-
-  it("will still take effect if one or more of the involved stat stages are not at max",
-    async() => {
-      await game.startBattle([ Species.MAGIKARP ]);
-
-      const leadPokemon = game.scene.getPlayerPokemon()!;
-      const hpLost = Math.floor(leadPokemon.getMaxHp() / RATIO);
-
-      //Here - Stat.SPD -> 0 and Stat.SPDEF -> 4
-      leadPokemon.setStatStage(Stat.ATK, 6);
-      leadPokemon.setStatStage(Stat.DEF, 6);
-      leadPokemon.setStatStage(Stat.SPATK, 6);
-      leadPokemon.setStatStage(Stat.SPDEF, 4);
-
-      game.move.select(Moves.CLANGOROUS_SOUL);
-      await game.phaseInterceptor.to(TurnEndPhase);
-
-      expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp() - hpLost);
-      expect(leadPokemon.getStatStage(Stat.ATK)).toBe(6);
-      expect(leadPokemon.getStatStage(Stat.DEF)).toBe(6);
-      expect(leadPokemon.getStatStage(Stat.SPATK)).toBe(6);
-      expect(leadPokemon.getStatStage(Stat.SPDEF)).toBe(5);
-      expect(leadPokemon.getStatStage(Stat.SPD)).toBe(1);
-    }
-  );
-
-  it("fails if all stat stages involved are at max",
-    async() => {
-      await game.startBattle([ Species.MAGIKARP ]);
-
-      const leadPokemon = game.scene.getPlayerPokemon()!;
-
-      leadPokemon.setStatStage(Stat.ATK, 6);
-      leadPokemon.setStatStage(Stat.DEF, 6);
-      leadPokemon.setStatStage(Stat.SPATK, 6);
-      leadPokemon.setStatStage(Stat.SPDEF, 6);
-      leadPokemon.setStatStage(Stat.SPD, 6);
-
-      game.move.select(Moves.CLANGOROUS_SOUL);
-      await game.phaseInterceptor.to(TurnEndPhase);
-
-      expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp());
-      expect(leadPokemon.getStatStage(Stat.ATK)).toBe(6);
-      expect(leadPokemon.getStatStage(Stat.DEF)).toBe(6);
-      expect(leadPokemon.getStatStage(Stat.SPATK)).toBe(6);
-      expect(leadPokemon.getStatStage(Stat.SPDEF)).toBe(6);
-      expect(leadPokemon.getStatStage(Stat.SPD)).toBe(6);
-    }
-  );
-
-  it("fails if the user's health is less than 1/3",
-    async() => {
-      await game.startBattle([ Species.MAGIKARP ]);
-
-      const leadPokemon = game.scene.getPlayerPokemon()!;
-      const hpLost = Math.floor(leadPokemon.getMaxHp() / RATIO);
-      leadPokemon.hp = hpLost - PREDAMAGE;
-
-      game.move.select(Moves.CLANGOROUS_SOUL);
-      await game.phaseInterceptor.to(TurnEndPhase);
-
-      expect(leadPokemon.hp).toBe(hpLost - PREDAMAGE);
-      expect(leadPokemon.getStatStage(Stat.ATK)).toBe(0);
-      expect(leadPokemon.getStatStage(Stat.DEF)).toBe(0);
-      expect(leadPokemon.getStatStage(Stat.SPATK)).toBe(0);
-      expect(leadPokemon.getStatStage(Stat.SPDEF)).toBe(0);
-      expect(leadPokemon.getStatStage(Stat.SPD)).toBe(0);
-    }
-  );
-});
diff --git a/src/test/moves/crafty_shield.test.ts b/src/test/moves/crafty_shield.test.ts
deleted file mode 100644
index 93dd4a02538..00000000000
--- a/src/test/moves/crafty_shield.test.ts
+++ /dev/null
@@ -1,123 +0,0 @@
-import Phaser from "phaser";
-import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest";
-import GameManager from "../utils/gameManager";
-import { Species } from "#enums/species";
-import { Abilities } from "#enums/abilities";
-import { Moves } from "#enums/moves";
-import { Stat } from "#enums/stat";
-import { BattlerTagType } from "#app/enums/battler-tag-type";
-import { BerryPhase } from "#app/phases/berry-phase";
-import { CommandPhase } from "#app/phases/command-phase";
-
-
-describe("Moves - Crafty Shield", () => {
-  let phaserGame: Phaser.Game;
-  let game: GameManager;
-
-  beforeAll(() => {
-    phaserGame = new Phaser.Game({
-      type: Phaser.HEADLESS,
-    });
-  });
-
-  afterEach(() => {
-    game.phaseInterceptor.restoreOg();
-  });
-
-  beforeEach(() => {
-    game = new GameManager(phaserGame);
-
-    game.override.battleType("double");
-
-    game.override.moveset([ Moves.CRAFTY_SHIELD, Moves.SPLASH, Moves.SWORDS_DANCE ]);
-
-    game.override.enemySpecies(Species.SNORLAX);
-    game.override.enemyMoveset([ Moves.GROWL ]);
-    game.override.enemyAbility(Abilities.INSOMNIA);
-
-    game.override.startingLevel(100);
-    game.override.enemyLevel(100);
-  });
-
-  test(
-    "should protect the user and allies from status moves",
-    async () => {
-      await game.startBattle([ Species.CHARIZARD, Species.BLASTOISE ]);
-
-      const leadPokemon = game.scene.getPlayerField();
-
-      game.move.select(Moves.CRAFTY_SHIELD);
-
-      await game.phaseInterceptor.to(CommandPhase);
-
-      game.move.select(Moves.SPLASH, 1);
-
-      await game.phaseInterceptor.to(BerryPhase, false);
-
-      leadPokemon.forEach(p => expect(p.getStatStage(Stat.ATK)).toBe(0));
-    }
-  );
-
-  test(
-    "should not protect the user and allies from attack moves",
-    async () => {
-      game.override.enemyMoveset([ Moves.TACKLE ]);
-
-      await game.startBattle([ Species.CHARIZARD, Species.BLASTOISE ]);
-
-      const leadPokemon = game.scene.getPlayerField();
-
-      game.move.select(Moves.CRAFTY_SHIELD);
-
-      await game.phaseInterceptor.to(CommandPhase);
-
-      game.move.select(Moves.SPLASH, 1);
-
-      await game.phaseInterceptor.to(BerryPhase, false);
-
-      expect(leadPokemon.some(p => p.hp < p.getMaxHp())).toBeTruthy();
-    }
-  );
-
-  test(
-    "should protect the user and allies from moves that ignore other protection",
-    async () => {
-      game.override.enemySpecies(Species.DUSCLOPS);
-      game.override.enemyMoveset([ Moves.CURSE ]);
-
-      await game.startBattle([ Species.CHARIZARD, Species.BLASTOISE ]);
-
-      const leadPokemon = game.scene.getPlayerField();
-
-      game.move.select(Moves.CRAFTY_SHIELD);
-
-      await game.phaseInterceptor.to(CommandPhase);
-
-      game.move.select(Moves.SPLASH, 1);
-
-      await game.phaseInterceptor.to(BerryPhase, false);
-
-      leadPokemon.forEach(p => expect(p.getTag(BattlerTagType.CURSED)).toBeUndefined());
-    }
-  );
-
-  test(
-    "should not block allies' self-targeted moves",
-    async () => {
-      await game.startBattle([ Species.CHARIZARD, Species.BLASTOISE ]);
-
-      const leadPokemon = game.scene.getPlayerField();
-
-      game.move.select(Moves.CRAFTY_SHIELD);
-
-      await game.phaseInterceptor.to(CommandPhase);
-
-      game.move.select(Moves.SWORDS_DANCE, 1);
-
-      await game.phaseInterceptor.to(BerryPhase, false);
-
-      expect(leadPokemon[0].getStatStage(Stat.ATK)).toBe(0);
-      expect(leadPokemon[1].getStatStage(Stat.ATK)).toBe(2);
-    }
-  );
-});
diff --git a/src/test/moves/effectiveness.test.ts b/src/test/moves/effectiveness.test.ts
deleted file mode 100644
index c78416b1237..00000000000
--- a/src/test/moves/effectiveness.test.ts
+++ /dev/null
@@ -1,113 +0,0 @@
-import { allMoves } from "#app/data/move";
-import { getPokemonSpecies } from "#app/data/pokemon-species";
-import { TrainerSlot } from "#app/data/trainer-config";
-import { Type } from "#enums/type";
-import { Abilities } from "#app/enums/abilities";
-import { Moves } from "#app/enums/moves";
-import { Species } from "#app/enums/species";
-import * as Messages from "#app/messages";
-import { TerastallizeModifier, overrideHeldItems } from "#app/modifier/modifier";
-import GameManager from "#test/utils/gameManager";
-import Phaser from "phaser";
-import { afterEach, beforeAll, describe, expect, it, vi } from "vitest";
-
-function testMoveEffectiveness(game: GameManager, move: Moves, targetSpecies: Species,
-  expected: number, targetAbility: Abilities = Abilities.BALL_FETCH, teraType?: Type): void {
-  // Suppress getPokemonNameWithAffix because it calls on a null battle spec
-  vi.spyOn(Messages, "getPokemonNameWithAffix").mockReturnValue("");
-  game.override
-    .enemyAbility(targetAbility)
-    .enemyHeldItems([{ name:"TERA_SHARD", type: teraType }]);
-
-  const user = game.scene.addPlayerPokemon(getPokemonSpecies(Species.SNORLAX), 5);
-  const target = game.scene.addEnemyPokemon(getPokemonSpecies(targetSpecies), 5, TrainerSlot.NONE);
-
-  if (teraType !== undefined) {
-    overrideHeldItems(target, false);
-  }
-
-  expect(target.getMoveEffectiveness(user, allMoves[move])).toBe(expected);
-  user.destroy();
-  target.destroy();
-}
-
-describe("Moves - Type Effectiveness", () => {
-  let phaserGame: Phaser.Game;
-  let game: GameManager;
-
-  beforeAll(() => {
-    phaserGame = new Phaser.Game({
-      type: Phaser.HEADLESS,
-    });
-    game = new GameManager(phaserGame);
-    TerastallizeModifier.prototype.apply = (args) => true;
-
-    game.override.ability(Abilities.BALL_FETCH);
-  });
-
-  afterEach(() => {
-    game.phaseInterceptor.restoreOg();
-  });
-
-  it("Normal-type attacks are neutrally effective against Normal-type Pokemon",
-    () => testMoveEffectiveness(game, Moves.TACKLE, Species.SNORLAX, 1)
-  );
-
-  it("Normal-type attacks are not very effective against Steel-type Pokemon",
-    () => testMoveEffectiveness(game, Moves.TACKLE, Species.REGISTEEL, 0.5)
-  );
-
-  it("Normal-type attacks are doubly resisted by Steel/Rock-type Pokemon",
-    () => testMoveEffectiveness(game, Moves.TACKLE, Species.AGGRON, 0.25)
-  );
-
-  it("Normal-type attacks have no effect on Ghost-type Pokemon",
-    () => testMoveEffectiveness(game, Moves.TACKLE, Species.DUSCLOPS, 0)
-  );
-
-  it("Normal-type status moves are not affected by type matchups",
-    () => testMoveEffectiveness(game, Moves.GROWL, Species.DUSCLOPS, 1)
-  );
-
-  it("Electric-type attacks are super-effective against Water-type Pokemon",
-    () => testMoveEffectiveness(game, Moves.THUNDERBOLT, Species.BLASTOISE, 2)
-  );
-
-  it("Ghost-type attacks have no effect on Normal-type Pokemon",
-    () => testMoveEffectiveness(game, Moves.SHADOW_BALL, Species.URSALUNA, 0)
-  );
-
-  it("Electric-type attacks are doubly super-effective against Water/Flying-type Pokemon",
-    () => testMoveEffectiveness(game, Moves.THUNDERBOLT, Species.GYARADOS, 4)
-  );
-
-  it("Electric-type attacks are negated by Volt Absorb",
-    () => testMoveEffectiveness(game, Moves.THUNDERBOLT, Species.GYARADOS, 0, Abilities.VOLT_ABSORB)
-  );
-
-  it("Electric-type attacks are super-effective against Tera-Water Pokemon",
-    () => testMoveEffectiveness(game, Moves.THUNDERBOLT, Species.EXCADRILL, 2, Abilities.BALL_FETCH, Type.WATER)
-  );
-
-  it("Powder moves have no effect on Grass-type Pokemon",
-    () => testMoveEffectiveness(game, Moves.SLEEP_POWDER, Species.AMOONGUSS, 0)
-  );
-
-  it("Powder moves have no effect on Tera-Grass Pokemon",
-    () => testMoveEffectiveness(game, Moves.SLEEP_POWDER, Species.SNORLAX, 0, Abilities.BALL_FETCH, Type.GRASS)
-  );
-
-  it("Prankster-boosted status moves have no effect on Dark-type Pokemon",
-    () => {
-      game.override.ability(Abilities.PRANKSTER);
-      testMoveEffectiveness(game, Moves.BABY_DOLL_EYES, Species.MIGHTYENA, 0);
-    }
-  );
-
-  it("Prankster-boosted status moves have no effect on Tera-Dark Pokemon",
-    () => {
-      game.override.ability(Abilities.PRANKSTER);
-      testMoveEffectiveness(game, Moves.BABY_DOLL_EYES, Species.SNORLAX, 0, Abilities.BALL_FETCH, Type.DARK);
-    }
-  );
-});
diff --git a/src/test/moves/endure.test.ts b/src/test/moves/endure.test.ts
deleted file mode 100644
index bde5a26f68e..00000000000
--- a/src/test/moves/endure.test.ts
+++ /dev/null
@@ -1,65 +0,0 @@
-import { Abilities } from "#enums/abilities";
-import { Moves } from "#enums/moves";
-import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
-import Phaser from "phaser";
-import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
-
-describe("Moves - Endure", () => {
-  let phaserGame: Phaser.Game;
-  let game: GameManager;
-
-  beforeAll(() => {
-    phaserGame = new Phaser.Game({
-      type: Phaser.HEADLESS,
-    });
-  });
-
-  afterEach(() => {
-    game.phaseInterceptor.restoreOg();
-  });
-
-  beforeEach(() => {
-    game = new GameManager(phaserGame);
-    game.override
-      .moveset([ Moves.THUNDER, Moves.BULLET_SEED, Moves.TOXIC ])
-      .ability(Abilities.SKILL_LINK)
-      .startingLevel(100)
-      .battleType("single")
-      .disableCrits()
-      .enemySpecies(Species.MAGIKARP)
-      .enemyAbility(Abilities.NO_GUARD)
-      .enemyMoveset(Moves.ENDURE);
-  });
-
-  it("should let the pokemon survive with 1 HP", async () => {
-    await game.classicMode.startBattle([ Species.ARCEUS ]);
-
-    game.move.select(Moves.THUNDER);
-    await game.phaseInterceptor.to("BerryPhase");
-
-    expect(game.scene.getEnemyPokemon()!.hp).toBe(1);
-  });
-
-  it("should let the pokemon survive with 1 HP when hit with a multihit move", async () => {
-    await game.classicMode.startBattle([ Species.ARCEUS ]);
-
-    game.move.select(Moves.BULLET_SEED);
-    await game.phaseInterceptor.to("BerryPhase");
-
-    expect(game.scene.getEnemyPokemon()!.hp).toBe(1);
-  });
-
-  it("shouldn't prevent fainting from indirect damage", async () => {
-    game.override.enemyLevel(100);
-    await game.classicMode.startBattle([ Species.ARCEUS ]);
-
-    const enemy = game.scene.getEnemyPokemon()!;
-    enemy.hp = 2;
-
-    game.move.select(Moves.TOXIC);
-    await game.phaseInterceptor.to("VictoryPhase");
-
-    expect(enemy.isFainted()).toBe(true);
-  });
-});
diff --git a/src/test/moves/fake_out.test.ts b/src/test/moves/fake_out.test.ts
deleted file mode 100644
index f20b6db3a13..00000000000
--- a/src/test/moves/fake_out.test.ts
+++ /dev/null
@@ -1,99 +0,0 @@
-import GameManager from "#app/test/utils/gameManager";
-import { Moves } from "#enums/moves";
-import { Species } from "#enums/species";
-import Phaser from "phaser";
-import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
-
-describe("Moves - Fake Out", () => {
-  let phaserGame: Phaser.Game;
-  let game: GameManager;
-
-  beforeAll(() => {
-    phaserGame = new Phaser.Game({
-      type: Phaser.HEADLESS,
-    });
-  });
-
-  afterEach(() => {
-    game.phaseInterceptor.restoreOg();
-  });
-
-  beforeEach(() => {
-    game = new GameManager(phaserGame);
-    game.override
-      .battleType("single")
-      .enemySpecies(Species.CORVIKNIGHT)
-      .moveset([ Moves.FAKE_OUT, Moves.SPLASH ])
-      .enemyMoveset(Moves.SPLASH)
-      .enemyLevel(10)
-      .startingLevel(10) // prevent LevelUpPhase from happening
-      .disableCrits();
-  });
-
-  it("can only be used on the first turn a pokemon is sent out in a battle", async() => {
-    await game.classicMode.startBattle([ Species.FEEBAS ]);
-
-    const enemy = game.scene.getEnemyPokemon()!;
-
-    game.move.select(Moves.FAKE_OUT);
-    await game.toNextTurn();
-
-    expect(enemy.hp).toBeLessThan(enemy.getMaxHp());
-    const postTurnOneHp = enemy.hp;
-
-    game.move.select(Moves.FAKE_OUT);
-    await game.toNextTurn();
-
-    expect(enemy.hp).toBe(postTurnOneHp);
-  }, 20000);
-
-  // This is a PokeRogue buff to Fake Out
-  it("can be used at the start of every wave even if the pokemon wasn't recalled", async() => {
-    await game.classicMode.startBattle([ Species.FEEBAS ]);
-
-    const enemy = game.scene.getEnemyPokemon()!;
-    enemy.damageAndUpdate(enemy.getMaxHp() - 1);
-
-    game.move.select(Moves.FAKE_OUT);
-    await game.toNextWave();
-
-    game.move.select(Moves.FAKE_OUT);
-    await game.toNextTurn();
-
-    expect(game.scene.getEnemyPokemon()!.isFullHp()).toBe(false);
-  }, 20000);
-
-  it("can be used again if recalled and sent back out", async() => {
-    game.override.startingWave(4);
-    await game.classicMode.startBattle([ Species.FEEBAS, Species.MAGIKARP ]);
-
-    const enemy1 = game.scene.getEnemyPokemon()!;
-
-    game.move.select(Moves.FAKE_OUT);
-    await game.phaseInterceptor.to("MoveEndPhase");
-
-    expect(enemy1.hp).toBeLessThan(enemy1.getMaxHp());
-
-    await game.doKillOpponents();
-    await game.toNextWave();
-
-    game.move.select(Moves.FAKE_OUT);
-    await game.toNextTurn();
-
-    const enemy2 = game.scene.getEnemyPokemon()!;
-
-    expect(enemy2.hp).toBeLessThan(enemy2.getMaxHp());
-    enemy2.hp = enemy2.getMaxHp();
-
-    game.doSwitchPokemon(1);
-    await game.toNextTurn();
-
-    game.doSwitchPokemon(1);
-    await game.toNextTurn();
-
-    game.move.select(Moves.FAKE_OUT);
-    await game.toNextTurn();
-
-    expect(enemy2.hp).toBeLessThan(enemy2.getMaxHp());
-  }, 20000);
-});
diff --git a/src/test/moves/fillet_away.test.ts b/src/test/moves/fillet_away.test.ts
deleted file mode 100644
index aa3243270cb..00000000000
--- a/src/test/moves/fillet_away.test.ts
+++ /dev/null
@@ -1,117 +0,0 @@
-import { TurnEndPhase } from "#app/phases/turn-end-phase";
-import { toDmgValue } from "#app/utils";
-import { Moves } from "#enums/moves";
-import { Species } from "#enums/species";
-import { Stat } from "#enums/stat";
-import GameManager from "#test/utils/gameManager";
-import Phaser from "phaser";
-import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest";
-
-
-/** HP Cost of Move */
-const RATIO = 2;
-/** Amount of extra HP lost */
-const PREDAMAGE = 15;
-
-describe("Moves - FILLET AWAY", () => {
-  let phaserGame: Phaser.Game;
-  let game: GameManager;
-
-  beforeAll(() => {
-    phaserGame = new Phaser.Game({
-      type: Phaser.HEADLESS,
-    });
-  });
-
-  afterEach(() => {
-    game.phaseInterceptor.restoreOg();
-  });
-
-  beforeEach(() => {
-    game = new GameManager(phaserGame);
-    game.override.starterSpecies(Species.MAGIKARP);
-    game.override.enemySpecies(Species.SNORLAX);
-    game.override.startingLevel(100);
-    game.override.enemyLevel(100);
-    game.override.moveset([ Moves.FILLET_AWAY ]);
-    game.override.enemyMoveset(Moves.SPLASH);
-  });
-
-  //Bulbapedia Reference: https://bulbapedia.bulbagarden.net/wiki/fillet_away_(move)
-
-  test("raises the user's ATK, SPATK, and SPD stat stages by 2 each, at the cost of 1/2 of its maximum HP",
-    async() => {
-      await game.startBattle([ Species.MAGIKARP ]);
-
-      const leadPokemon = game.scene.getPlayerPokemon()!;
-      const hpLost = toDmgValue(leadPokemon.getMaxHp() / RATIO);
-
-      game.move.select(Moves.FILLET_AWAY);
-      await game.phaseInterceptor.to(TurnEndPhase);
-
-      expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp() - hpLost);
-      expect(leadPokemon.getStatStage(Stat.ATK)).toBe(2);
-      expect(leadPokemon.getStatStage(Stat.SPATK)).toBe(2);
-      expect(leadPokemon.getStatStage(Stat.SPD)).toBe(2);
-    }
-  );
-
-  test("still takes effect if one or more of the involved stat stages are not at max",
-    async() => {
-      await game.startBattle([ Species.MAGIKARP ]);
-
-      const leadPokemon = game.scene.getPlayerPokemon()!;
-      const hpLost = toDmgValue(leadPokemon.getMaxHp() / RATIO);
-
-      //Here - Stat.SPD -> 0 and Stat.SPATK -> 3
-      leadPokemon.setStatStage(Stat.ATK, 6);
-      leadPokemon.setStatStage(Stat.SPATK, 3);
-
-      game.move.select(Moves.FILLET_AWAY);
-      await game.phaseInterceptor.to(TurnEndPhase);
-
-      expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp() - hpLost);
-      expect(leadPokemon.getStatStage(Stat.ATK)).toBe(6);
-      expect(leadPokemon.getStatStage(Stat.SPATK)).toBe(5);
-      expect(leadPokemon.getStatStage(Stat.SPD)).toBe(2);
-    }
-  );
-
-  test("fails if all stat stages involved are at max",
-    async() => {
-      await game.startBattle([ Species.MAGIKARP ]);
-
-      const leadPokemon = game.scene.getPlayerPokemon()!;
-
-      leadPokemon.setStatStage(Stat.ATK, 6);
-      leadPokemon.setStatStage(Stat.SPATK, 6);
-      leadPokemon.setStatStage(Stat.SPD, 6);
-
-      game.move.select(Moves.FILLET_AWAY);
-      await game.phaseInterceptor.to(TurnEndPhase);
-
-      expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp());
-      expect(leadPokemon.getStatStage(Stat.ATK)).toBe(6);
-      expect(leadPokemon.getStatStage(Stat.SPATK)).toBe(6);
-      expect(leadPokemon.getStatStage(Stat.SPD)).toBe(6);
-    }
-  );
-
-  test("fails if the user's health is less than 1/2",
-    async() => {
-      await game.startBattle([ Species.MAGIKARP ]);
-
-      const leadPokemon = game.scene.getPlayerPokemon()!;
-      const hpLost = toDmgValue(leadPokemon.getMaxHp() / RATIO);
-      leadPokemon.hp = hpLost - PREDAMAGE;
-
-      game.move.select(Moves.FILLET_AWAY);
-      await game.phaseInterceptor.to(TurnEndPhase);
-
-      expect(leadPokemon.hp).toBe(hpLost - PREDAMAGE);
-      expect(leadPokemon.getStatStage(Stat.ATK)).toBe(0);
-      expect(leadPokemon.getStatStage(Stat.SPATK)).toBe(0);
-      expect(leadPokemon.getStatStage(Stat.SPD)).toBe(0);
-    }
-  );
-});
diff --git a/src/test/moves/focus_punch.test.ts b/src/test/moves/focus_punch.test.ts
deleted file mode 100644
index 352e3b60aa4..00000000000
--- a/src/test/moves/focus_punch.test.ts
+++ /dev/null
@@ -1,133 +0,0 @@
-import { BerryPhase } from "#app/phases/berry-phase";
-import { MessagePhase } from "#app/phases/message-phase";
-import { MoveHeaderPhase } from "#app/phases/move-header-phase";
-import { SwitchSummonPhase } from "#app/phases/switch-summon-phase";
-import { TurnStartPhase } from "#app/phases/turn-start-phase";
-import { Abilities } from "#enums/abilities";
-import { Moves } from "#enums/moves";
-import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
-import Phaser from "phaser";
-import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
-
-
-describe("Moves - Focus Punch", () => {
-  let phaserGame: Phaser.Game;
-  let game: GameManager;
-
-  beforeAll(() => {
-    phaserGame = new Phaser.Game({
-      type: Phaser.HEADLESS,
-    });
-  });
-
-  afterEach(() => {
-    game.phaseInterceptor.restoreOg();
-  });
-
-  beforeEach(() => {
-    game = new GameManager(phaserGame);
-    game.override
-      .battleType("single")
-      .ability(Abilities.UNNERVE)
-      .moveset([ Moves.FOCUS_PUNCH ])
-      .enemySpecies(Species.GROUDON)
-      .enemyAbility(Abilities.INSOMNIA)
-      .enemyMoveset(Moves.SPLASH)
-      .startingLevel(100)
-      .enemyLevel(100);
-  });
-
-  it(
-    "should deal damage at the end of turn if uninterrupted",
-    async () => {
-      await game.startBattle([ Species.CHARIZARD ]);
-
-      const leadPokemon = game.scene.getPlayerPokemon()!;
-      const enemyPokemon = game.scene.getEnemyPokemon()!;
-
-      const enemyStartingHp = enemyPokemon.hp;
-
-      game.move.select(Moves.FOCUS_PUNCH);
-
-      await game.phaseInterceptor.to(MessagePhase);
-
-      expect(enemyPokemon.hp).toBe(enemyStartingHp);
-      expect(leadPokemon.getMoveHistory().length).toBe(0);
-
-      await game.phaseInterceptor.to(BerryPhase, false);
-
-      expect(enemyPokemon.hp).toBeLessThan(enemyStartingHp);
-      expect(leadPokemon.getMoveHistory().length).toBe(1);
-      expect(leadPokemon.turnData.totalDamageDealt).toBe(enemyStartingHp - enemyPokemon.hp);
-    }
-  );
-
-  it(
-    "should fail if the user is hit",
-    async () => {
-      game.override.enemyMoveset([ Moves.TACKLE ]);
-
-      await game.startBattle([ Species.CHARIZARD ]);
-
-      const leadPokemon = game.scene.getPlayerPokemon()!;
-      const enemyPokemon = game.scene.getEnemyPokemon()!;
-
-      const enemyStartingHp = enemyPokemon.hp;
-
-      game.move.select(Moves.FOCUS_PUNCH);
-
-      await game.phaseInterceptor.to(MessagePhase);
-
-      expect(enemyPokemon.hp).toBe(enemyStartingHp);
-      expect(leadPokemon.getMoveHistory().length).toBe(0);
-
-      await game.phaseInterceptor.to(BerryPhase, false);
-
-      expect(enemyPokemon.hp).toBe(enemyStartingHp);
-      expect(leadPokemon.getMoveHistory().length).toBe(1);
-      expect(leadPokemon.turnData.totalDamageDealt).toBe(0);
-    }
-  );
-
-  it(
-    "should be cancelled if the user falls asleep mid-turn",
-    async () => {
-      game.override.enemyMoveset([ Moves.SPORE ]);
-
-      await game.startBattle([ Species.CHARIZARD ]);
-
-      const leadPokemon = game.scene.getPlayerPokemon()!;
-      const enemyPokemon = game.scene.getEnemyPokemon()!;
-
-      game.move.select(Moves.FOCUS_PUNCH);
-
-      await game.phaseInterceptor.to(MessagePhase); // Header message
-
-      expect(leadPokemon.getMoveHistory().length).toBe(0);
-
-      await game.phaseInterceptor.to(BerryPhase, false);
-
-      expect(leadPokemon.getMoveHistory().length).toBe(1);
-      expect(enemyPokemon.hp).toBe(enemyPokemon.getMaxHp());
-    }
-  );
-
-  it(
-    "should not queue its pre-move message before an enemy switches",
-    async () => {
-      /** Guarantee a Trainer battle with multiple enemy Pokemon */
-      game.override.startingWave(25);
-
-      await game.startBattle([ Species.CHARIZARD ]);
-
-      game.forceEnemyToSwitch();
-      game.move.select(Moves.FOCUS_PUNCH);
-
-      await game.phaseInterceptor.to(TurnStartPhase);
-
-      expect(game.scene.getCurrentPhase() instanceof SwitchSummonPhase).toBeTruthy();
-      expect(game.scene.phaseQueue.find(phase => phase instanceof MoveHeaderPhase)).toBeDefined();
-    }
-  );
-});
diff --git a/src/test/moves/follow_me.test.ts b/src/test/moves/follow_me.test.ts
deleted file mode 100644
index fba7937f812..00000000000
--- a/src/test/moves/follow_me.test.ts
+++ /dev/null
@@ -1,129 +0,0 @@
-import { Stat } from "#enums/stat";
-import { BattlerIndex } from "#app/battle";
-import { Abilities } from "#app/enums/abilities";
-import { TurnEndPhase } from "#app/phases/turn-end-phase";
-import { Moves } from "#enums/moves";
-import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
-import Phaser from "phaser";
-import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest";
-
-
-describe("Moves - Follow Me", () => {
-  let phaserGame: Phaser.Game;
-  let game: GameManager;
-
-  beforeAll(() => {
-    phaserGame = new Phaser.Game({
-      type: Phaser.HEADLESS,
-    });
-  });
-
-  afterEach(() => {
-    game.phaseInterceptor.restoreOg();
-  });
-
-  beforeEach(() => {
-    game = new GameManager(phaserGame);
-    game.override.battleType("double");
-    game.override.starterSpecies(Species.AMOONGUSS);
-    game.override.ability(Abilities.BALL_FETCH);
-    game.override.enemySpecies(Species.SNORLAX);
-    game.override.startingLevel(100);
-    game.override.enemyLevel(100);
-    game.override.moveset([ Moves.FOLLOW_ME, Moves.RAGE_POWDER, Moves.SPOTLIGHT, Moves.QUICK_ATTACK ]);
-    game.override.enemyMoveset([ Moves.TACKLE, Moves.FOLLOW_ME, Moves.SPLASH ]);
-  });
-
-  test(
-    "move should redirect enemy attacks to the user",
-    async () => {
-      await game.classicMode.startBattle([ Species.AMOONGUSS, Species.CHARIZARD ]);
-
-      const playerPokemon = game.scene.getPlayerField();
-
-      game.move.select(Moves.FOLLOW_ME);
-      game.move.select(Moves.QUICK_ATTACK, 1, BattlerIndex.ENEMY);
-
-      // Force both enemies to target the player Pokemon that did not use Follow Me
-      await game.forceEnemyMove(Moves.TACKLE, BattlerIndex.PLAYER_2);
-      await game.forceEnemyMove(Moves.TACKLE, BattlerIndex.PLAYER_2);
-
-      await game.phaseInterceptor.to(TurnEndPhase, false);
-
-      expect(playerPokemon[0].hp).toBeLessThan(playerPokemon[0].getMaxHp());
-      expect(playerPokemon[1].hp).toBe(playerPokemon[1].getMaxHp());
-    }
-  );
-
-  test(
-    "move should redirect enemy attacks to the first ally that uses it",
-    async () => {
-      await game.classicMode.startBattle([ Species.AMOONGUSS, Species.CHARIZARD ]);
-
-      const playerPokemon = game.scene.getPlayerField();
-
-      game.move.select(Moves.FOLLOW_ME);
-      game.move.select(Moves.FOLLOW_ME, 1);
-
-      // Each player is targeted by an enemy
-      await game.forceEnemyMove(Moves.TACKLE, BattlerIndex.PLAYER);
-      await game.forceEnemyMove(Moves.TACKLE, BattlerIndex.PLAYER_2);
-
-      await game.phaseInterceptor.to(TurnEndPhase, false);
-
-      playerPokemon.sort((a, b) => a.getEffectiveStat(Stat.SPD) - b.getEffectiveStat(Stat.SPD));
-
-      expect(playerPokemon[1].hp).toBeLessThan(playerPokemon[1].getMaxHp());
-      expect(playerPokemon[0].hp).toBe(playerPokemon[0].getMaxHp());
-    }
-  );
-
-  test(
-    "move effect should be bypassed by Stalwart",
-    async () => {
-      game.override.ability(Abilities.STALWART);
-      game.override.moveset([ Moves.QUICK_ATTACK ]);
-
-      await game.classicMode.startBattle([ Species.AMOONGUSS, Species.CHARIZARD ]);
-
-      const enemyPokemon = game.scene.getEnemyField();
-
-      game.move.select(Moves.QUICK_ATTACK, 0, BattlerIndex.ENEMY);
-      game.move.select(Moves.QUICK_ATTACK, 1, BattlerIndex.ENEMY_2);
-
-      // Target doesn't need to be specified if the move is self-targeted
-      await game.forceEnemyMove(Moves.FOLLOW_ME);
-      await game.forceEnemyMove(Moves.SPLASH);
-
-      await game.phaseInterceptor.to(TurnEndPhase, false);
-
-      // If redirection was bypassed, both enemies should be damaged
-      expect(enemyPokemon[0].hp).toBeLessThan(enemyPokemon[0].getMaxHp());
-      expect(enemyPokemon[1].hp).toBeLessThan(enemyPokemon[1].getMaxHp());
-    }
-  );
-
-  test(
-    "move effect should be bypassed by Snipe Shot",
-    async () => {
-      game.override.moveset([ Moves.SNIPE_SHOT ]);
-
-      await game.classicMode.startBattle([ Species.AMOONGUSS, Species.CHARIZARD ]);
-
-      const enemyPokemon = game.scene.getEnemyField();
-
-      game.move.select(Moves.SNIPE_SHOT, 0, BattlerIndex.ENEMY);
-      game.move.select(Moves.SNIPE_SHOT, 1, BattlerIndex.ENEMY_2);
-
-      await game.forceEnemyMove(Moves.FOLLOW_ME);
-      await game.forceEnemyMove(Moves.SPLASH);
-
-      await game.phaseInterceptor.to(TurnEndPhase, false);
-
-      // If redirection was bypassed, both enemies should be damaged
-      expect(enemyPokemon[0].hp).toBeLessThan(enemyPokemon[0].getMaxHp());
-      expect(enemyPokemon[1].hp).toBeLessThan(enemyPokemon[1].getMaxHp());
-    }
-  );
-});
diff --git a/src/test/moves/freezy_frost.test.ts b/src/test/moves/freezy_frost.test.ts
deleted file mode 100644
index 09d7779474f..00000000000
--- a/src/test/moves/freezy_frost.test.ts
+++ /dev/null
@@ -1,105 +0,0 @@
-import { Stat } from "#enums/stat";
-import { Abilities } from "#enums/abilities";
-import { Moves } from "#enums/moves";
-import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
-import Phaser from "phaser";
-import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
-import { allMoves } from "#app/data/move";
-import { CommandPhase } from "#app/phases/command-phase";
-
-describe("Moves - Freezy Frost", () => {
-  let phaserGame: Phaser.Game;
-  let game: GameManager;
-
-  beforeAll(() => {
-    phaserGame = new Phaser.Game({ type: Phaser.HEADLESS });
-  });
-
-  afterEach(() => {
-    game.phaseInterceptor.restoreOg();
-  });
-
-  beforeEach(() => {
-    game = new GameManager(phaserGame);
-
-    game.override
-      .battleType("single")
-      .enemySpecies(Species.RATTATA)
-      .enemyLevel(100)
-      .enemyMoveset([ Moves.HOWL, Moves.HOWL, Moves.HOWL, Moves.HOWL ])
-      .enemyAbility(Abilities.BALL_FETCH)
-      .startingLevel(100)
-      .moveset([ Moves.FREEZY_FROST, Moves.HOWL, Moves.SPLASH ])
-      .ability(Abilities.BALL_FETCH);
-
-    vi.spyOn(allMoves[Moves.FREEZY_FROST], "accuracy", "get").mockReturnValue(100);
-  });
-
-  it(
-    "should clear stat changes of user and opponent",
-    async () => {
-      await game.classicMode.startBattle([ Species.SHUCKLE ]);
-      const user = game.scene.getPlayerPokemon()!;
-      const enemy = game.scene.getEnemyPokemon()!;
-
-      game.move.select(Moves.HOWL);
-      await game.toNextTurn();
-
-      expect(user.getStatStage(Stat.ATK)).toBe(1);
-      expect(enemy.getStatStage(Stat.ATK)).toBe(1);
-
-      game.move.select(Moves.FREEZY_FROST);
-      await game.toNextTurn();
-
-      expect(user.getStatStage(Stat.ATK)).toBe(0);
-      expect(enemy.getStatStage(Stat.ATK)).toBe(0);
-    });
-
-  it(
-    "should clear all stat changes even when enemy uses the move",
-    async () => {
-      game.override.enemyMoveset([ Moves.FREEZY_FROST, Moves.FREEZY_FROST, Moves.FREEZY_FROST, Moves.FREEZY_FROST ]);
-      await game.classicMode.startBattle([ Species.SHUCKLE ]); // Shuckle for slower Howl on first turn so Freezy Frost doesn't affect it.
-      const user = game.scene.getPlayerPokemon()!;
-
-      game.move.select(Moves.HOWL);
-      await game.toNextTurn();
-
-      const userAtkBefore = user.getStatStage(Stat.ATK);
-      expect(userAtkBefore).toBe(1);
-
-      game.move.select(Moves.SPLASH);
-      await game.toNextTurn();
-      expect(user.getStatStage(Stat.ATK)).toBe(0);
-    });
-
-  it(
-    "should clear all stat changes in double battle",
-    async () => {
-      game.override.battleType("double");
-      await game.classicMode.startBattle([ Species.SHUCKLE, Species.RATTATA ]);
-      const [ leftPlayer, rightPlayer ] = game.scene.getPlayerField();
-      const [ leftOpp, rightOpp ] = game.scene.getEnemyField();
-
-      game.move.select(Moves.HOWL, 0);
-      await game.phaseInterceptor.to(CommandPhase);
-      game.move.select(Moves.SPLASH, 1);
-      await game.toNextTurn();
-
-      expect(leftPlayer.getStatStage(Stat.ATK)).toBe(1);
-      expect(rightPlayer.getStatStage(Stat.ATK)).toBe(1);
-      expect(leftOpp.getStatStage(Stat.ATK)).toBe(2); // Both enemies use Howl
-      expect(rightOpp.getStatStage(Stat.ATK)).toBe(2);
-
-      game.move.select(Moves.FREEZY_FROST, 0, leftOpp.getBattlerIndex());
-      await game.phaseInterceptor.to(CommandPhase);
-      game.move.select(Moves.SPLASH, 1);
-      await game.toNextTurn();
-
-      expect(leftPlayer.getStatStage(Stat.ATK)).toBe(0);
-      expect(rightPlayer.getStatStage(Stat.ATK)).toBe(0);
-      expect(leftOpp.getStatStage(Stat.ATK)).toBe(0);
-      expect(rightOpp.getStatStage(Stat.ATK)).toBe(0);
-    });
-});
diff --git a/src/test/moves/hyper_beam.test.ts b/src/test/moves/hyper_beam.test.ts
deleted file mode 100644
index af8440a0911..00000000000
--- a/src/test/moves/hyper_beam.test.ts
+++ /dev/null
@@ -1,70 +0,0 @@
-import { allMoves } from "#app/data/move";
-import { Abilities } from "#app/enums/abilities";
-import { BattlerTagType } from "#app/enums/battler-tag-type";
-import { Moves } from "#app/enums/moves";
-import { Species } from "#app/enums/species";
-import { BerryPhase } from "#app/phases/berry-phase";
-import { TurnEndPhase } from "#app/phases/turn-end-phase";
-import GameManager from "#test/utils/gameManager";
-import Phaser from "phaser";
-import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
-
-describe("Moves - Hyper Beam", () => {
-  let phaserGame: Phaser.Game;
-  let game: GameManager;
-
-  beforeAll(() => {
-    phaserGame = new Phaser.Game({
-      type: Phaser.HEADLESS
-    });
-  });
-
-  afterEach(() => {
-    game.phaseInterceptor.restoreOg();
-  });
-
-  beforeEach(() => {
-    game = new GameManager(phaserGame);
-
-    game.override.battleType("single");
-    game.override.ability(Abilities.BALL_FETCH);
-    game.override.enemySpecies(Species.SNORLAX);
-    game.override.enemyAbility(Abilities.BALL_FETCH);
-    game.override.enemyMoveset([ Moves.SPLASH ]);
-    game.override.enemyLevel(100);
-
-    game.override.moveset([ Moves.HYPER_BEAM, Moves.TACKLE ]);
-    vi.spyOn(allMoves[Moves.HYPER_BEAM], "accuracy", "get").mockReturnValue(100);
-  });
-
-  it(
-    "should force the user to recharge on the next turn (and only that turn)",
-    async () => {
-      await game.startBattle([ Species.MAGIKARP ]);
-
-      const leadPokemon = game.scene.getPlayerPokemon()!;
-      const enemyPokemon = game.scene.getEnemyPokemon()!;
-
-      game.move.select(Moves.HYPER_BEAM);
-
-      await game.phaseInterceptor.to(TurnEndPhase);
-
-      expect(enemyPokemon.hp).toBeLessThan(enemyPokemon.getMaxHp());
-      expect(leadPokemon.getTag(BattlerTagType.RECHARGING)).toBeDefined();
-
-      const enemyPostAttackHp = enemyPokemon.hp;
-
-      /** Game should progress without a new command from the player */
-      await game.phaseInterceptor.to(TurnEndPhase);
-
-      expect(enemyPokemon.hp).toBe(enemyPostAttackHp);
-      expect(leadPokemon.getTag(BattlerTagType.RECHARGING)).toBeUndefined();
-
-      game.move.select(Moves.TACKLE);
-
-      await game.phaseInterceptor.to(BerryPhase, false);
-
-      expect(enemyPokemon.hp).toBeLessThan(enemyPostAttackHp);
-    }
-  );
-});
diff --git a/src/test/moves/jaw_lock.test.ts b/src/test/moves/jaw_lock.test.ts
deleted file mode 100644
index 30dbcac64a8..00000000000
--- a/src/test/moves/jaw_lock.test.ts
+++ /dev/null
@@ -1,169 +0,0 @@
-import { BattlerIndex } from "#app/battle";
-import { Abilities } from "#app/enums/abilities";
-import { BattlerTagType } from "#app/enums/battler-tag-type";
-import { BerryPhase } from "#app/phases/berry-phase";
-import { FaintPhase } from "#app/phases/faint-phase";
-import { MoveEffectPhase } from "#app/phases/move-effect-phase";
-import { TurnEndPhase } from "#app/phases/turn-end-phase";
-import GameManager from "#app/test/utils/gameManager";
-import { Moves } from "#enums/moves";
-import { Species } from "#enums/species";
-import Phaser from "phaser";
-import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
-
-
-describe("Moves - Jaw Lock", () => {
-  let phaserGame: Phaser.Game;
-  let game: GameManager;
-
-  beforeAll(() => {
-    phaserGame = new Phaser.Game({
-      type: Phaser.HEADLESS,
-    });
-  });
-
-  afterEach(() => {
-    game.phaseInterceptor.restoreOg();
-  });
-
-  beforeEach(() => {
-    game = new GameManager(phaserGame);
-
-    game.override
-      .battleType("single")
-      .enemySpecies(Species.SNORLAX)
-      .enemyAbility(Abilities.INSOMNIA)
-      .enemyMoveset(Moves.SPLASH)
-      .moveset([ Moves.JAW_LOCK, Moves.SPLASH ])
-      .startingLevel(100)
-      .enemyLevel(100)
-      .disableCrits();
-  });
-
-  it(
-    "should trap the move's user and target",
-    async () => {
-      await game.startBattle([ Species.BULBASAUR ]);
-
-      const leadPokemon = game.scene.getPlayerPokemon()!;
-      const enemyPokemon = game.scene.getEnemyPokemon()!;
-
-      game.move.select(Moves.JAW_LOCK);
-      await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]);
-
-      await game.phaseInterceptor.to(MoveEffectPhase, false);
-
-      expect(leadPokemon.getTag(BattlerTagType.TRAPPED)).toBeUndefined();
-      expect(enemyPokemon.getTag(BattlerTagType.TRAPPED)).toBeUndefined();
-
-      await game.phaseInterceptor.to(TurnEndPhase);
-
-      expect(leadPokemon.getTag(BattlerTagType.TRAPPED)).toBeDefined();
-      expect(enemyPokemon.getTag(BattlerTagType.TRAPPED)).toBeDefined();
-    }
-  );
-
-  it(
-    "should not trap either pokemon if the target faints",
-    async () => {
-      game.override.enemyLevel(1);
-      await game.startBattle([ Species.BULBASAUR ]);
-
-      const leadPokemon = game.scene.getPlayerPokemon()!;
-      const enemyPokemon = game.scene.getEnemyPokemon()!;
-
-      game.move.select(Moves.JAW_LOCK);
-      await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]);
-
-      await game.phaseInterceptor.to(MoveEffectPhase, false);
-
-      expect(leadPokemon.getTag(BattlerTagType.TRAPPED)).toBeUndefined();
-      expect(enemyPokemon.getTag(BattlerTagType.TRAPPED)).toBeUndefined();
-
-      await game.phaseInterceptor.to(MoveEffectPhase);
-
-      expect(leadPokemon.getTag(BattlerTagType.TRAPPED)).toBeUndefined();
-      expect(enemyPokemon.getTag(BattlerTagType.TRAPPED)).toBeUndefined();
-
-      await game.phaseInterceptor.to(FaintPhase);
-
-      expect(leadPokemon.getTag(BattlerTagType.TRAPPED)).toBeUndefined();
-      expect(enemyPokemon.getTag(BattlerTagType.TRAPPED)).toBeUndefined();
-    }
-  );
-
-  it(
-    "should only trap the user until the target faints",
-    async () => {
-      await game.startBattle([ Species.BULBASAUR ]);
-
-      const leadPokemon = game.scene.getPlayerPokemon()!;
-      const enemyPokemon = game.scene.getEnemyPokemon()!;
-
-      game.move.select(Moves.JAW_LOCK);
-      await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]);
-
-      await game.phaseInterceptor.to(MoveEffectPhase);
-
-      expect(leadPokemon.getTag(BattlerTagType.TRAPPED)).toBeDefined();
-      expect(enemyPokemon.getTag(BattlerTagType.TRAPPED)).toBeDefined();
-
-      await game.phaseInterceptor.to(TurnEndPhase);
-
-      await game.doKillOpponents();
-
-      expect(leadPokemon.getTag(BattlerTagType.TRAPPED)).toBeUndefined();
-    }
-  );
-
-  it(
-    "should not trap other targets after the first target is trapped",
-    async () => {
-      game.override.battleType("double");
-
-      await game.startBattle([ Species.CHARMANDER, Species.BULBASAUR ]);
-
-      const playerPokemon = game.scene.getPlayerField();
-      const enemyPokemon = game.scene.getEnemyField();
-
-      game.move.select(Moves.JAW_LOCK, 0, BattlerIndex.ENEMY);
-      game.move.select(Moves.SPLASH, 1);
-      await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2 ]);
-
-      await game.phaseInterceptor.to(MoveEffectPhase);
-
-      expect(playerPokemon[0].getTag(BattlerTagType.TRAPPED)).toBeDefined();
-      expect(enemyPokemon[0].getTag(BattlerTagType.TRAPPED)).toBeDefined();
-
-      await game.toNextTurn();
-
-      game.move.select(Moves.JAW_LOCK, 0, BattlerIndex.ENEMY_2);
-      game.move.select(Moves.SPLASH, 1);
-
-      await game.phaseInterceptor.to(MoveEffectPhase);
-
-      expect(enemyPokemon[1].getTag(BattlerTagType.TRAPPED)).toBeUndefined();
-      expect(playerPokemon[0].getTag(BattlerTagType.TRAPPED)).toBeDefined();
-      expect(playerPokemon[0].getTag(BattlerTagType.TRAPPED)?.sourceId).toBe(enemyPokemon[0].id);
-    }
-  );
-
-  it(
-    "should not trap either pokemon if the target is protected",
-    async () => {
-      game.override.enemyMoveset([ Moves.PROTECT ]);
-
-      await game.startBattle([ Species.BULBASAUR ]);
-
-      const playerPokemon = game.scene.getPlayerPokemon()!;
-      const enemyPokemon = game.scene.getEnemyPokemon()!;
-
-      game.move.select(Moves.JAW_LOCK);
-
-      await game.phaseInterceptor.to(BerryPhase, false);
-
-      expect(playerPokemon.getTag(BattlerTagType.TRAPPED)).toBeUndefined();
-      expect(enemyPokemon.getTag(BattlerTagType.TRAPPED)).toBeUndefined();
-    }
-  );
-});
diff --git a/src/test/moves/lucky_chant.test.ts b/src/test/moves/lucky_chant.test.ts
deleted file mode 100644
index 02e9dd24465..00000000000
--- a/src/test/moves/lucky_chant.test.ts
+++ /dev/null
@@ -1,112 +0,0 @@
-import { Abilities } from "#app/enums/abilities";
-import { BattlerTagType } from "#app/enums/battler-tag-type";
-import { Moves } from "#app/enums/moves";
-import { Species } from "#app/enums/species";
-import { BerryPhase } from "#app/phases/berry-phase";
-import { TurnEndPhase } from "#app/phases/turn-end-phase";
-import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
-import GameManager from "../utils/gameManager";
-
-
-describe("Moves - Lucky Chant", () => {
-  let phaserGame: Phaser.Game;
-  let game: GameManager;
-
-  beforeAll(() => {
-    phaserGame = new Phaser.Game({
-      type: Phaser.HEADLESS
-    });
-  });
-
-  afterEach(() => {
-    game.phaseInterceptor.restoreOg();
-  });
-
-  beforeEach(() => {
-    game = new GameManager(phaserGame);
-
-    game.override
-      .battleType("single")
-      .moveset([ Moves.LUCKY_CHANT, Moves.SPLASH, Moves.FOLLOW_ME ])
-      .enemySpecies(Species.SNORLAX)
-      .enemyAbility(Abilities.INSOMNIA)
-      .enemyMoveset([ Moves.FLOWER_TRICK ])
-      .startingLevel(100)
-      .enemyLevel(100);
-  });
-
-  it(
-    "should prevent critical hits from moves",
-    async () => {
-      await game.startBattle([ Species.CHARIZARD ]);
-
-      const playerPokemon = game.scene.getPlayerPokemon()!;
-
-      game.move.select(Moves.SPLASH);
-
-      await game.phaseInterceptor.to(TurnEndPhase);
-
-      const firstTurnDamage = playerPokemon.getMaxHp() - playerPokemon.hp;
-
-      game.move.select(Moves.LUCKY_CHANT);
-
-      await game.phaseInterceptor.to(BerryPhase, false);
-
-      const secondTurnDamage = playerPokemon.getMaxHp() - playerPokemon.hp - firstTurnDamage;
-      expect(secondTurnDamage).toBeLessThan(firstTurnDamage);
-    }
-  );
-
-  it(
-    "should prevent critical hits against the user's ally",
-    async () => {
-      game.override.battleType("double");
-
-      await game.startBattle([ Species.CHARIZARD, Species.BLASTOISE ]);
-
-      const playerPokemon = game.scene.getPlayerField();
-
-      game.move.select(Moves.FOLLOW_ME);
-      game.move.select(Moves.SPLASH, 1);
-
-      await game.phaseInterceptor.to(TurnEndPhase);
-
-      const firstTurnDamage = playerPokemon[0].getMaxHp() - playerPokemon[0].hp;
-
-      game.move.select(Moves.FOLLOW_ME);
-      game.move.select(Moves.LUCKY_CHANT, 1);
-
-      await game.phaseInterceptor.to(BerryPhase, false);
-
-      const secondTurnDamage = playerPokemon[0].getMaxHp() - playerPokemon[0].hp - firstTurnDamage;
-      expect(secondTurnDamage).toBeLessThan(firstTurnDamage);
-    }
-  );
-
-  it(
-    "should prevent critical hits from field effects",
-    async () => {
-      game.override.enemyMoveset([ Moves.TACKLE ]);
-
-      await game.startBattle([ Species.CHARIZARD ]);
-
-      const playerPokemon = game.scene.getPlayerPokemon()!;
-      const enemyPokemon = game.scene.getEnemyPokemon()!;
-
-      enemyPokemon.addTag(BattlerTagType.ALWAYS_CRIT, 2, Moves.NONE, 0);
-
-      game.move.select(Moves.SPLASH);
-
-      await game.phaseInterceptor.to(TurnEndPhase);
-
-      const firstTurnDamage = playerPokemon.getMaxHp() - playerPokemon.hp;
-
-      game.move.select(Moves.LUCKY_CHANT);
-
-      await game.phaseInterceptor.to(BerryPhase, false);
-
-      const secondTurnDamage = playerPokemon.getMaxHp() - playerPokemon.hp - firstTurnDamage;
-      expect(secondTurnDamage).toBeLessThan(firstTurnDamage);
-    }
-  );
-});
diff --git a/src/test/moves/mat_block.test.ts b/src/test/moves/mat_block.test.ts
deleted file mode 100644
index a4d9177cbdc..00000000000
--- a/src/test/moves/mat_block.test.ts
+++ /dev/null
@@ -1,107 +0,0 @@
-import Phaser from "phaser";
-import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest";
-import GameManager from "../utils/gameManager";
-import { Species } from "#enums/species";
-import { Abilities } from "#enums/abilities";
-import { Moves } from "#enums/moves";
-import { Stat } from "#enums/stat";
-import { BerryPhase } from "#app/phases/berry-phase";
-import { CommandPhase } from "#app/phases/command-phase";
-import { TurnEndPhase } from "#app/phases/turn-end-phase";
-
-
-describe("Moves - Mat Block", () => {
-  let phaserGame: Phaser.Game;
-  let game: GameManager;
-
-  beforeAll(() => {
-    phaserGame = new Phaser.Game({
-      type: Phaser.HEADLESS,
-    });
-  });
-
-  afterEach(() => {
-    game.phaseInterceptor.restoreOg();
-  });
-
-  beforeEach(() => {
-    game = new GameManager(phaserGame);
-
-    game.override.battleType("double");
-
-    game.override.moveset([ Moves.MAT_BLOCK, Moves.SPLASH ]);
-
-    game.override.enemySpecies(Species.SNORLAX);
-    game.override.enemyMoveset([ Moves.TACKLE ]);
-    game.override.enemyAbility(Abilities.INSOMNIA);
-
-    game.override.startingLevel(100);
-    game.override.enemyLevel(100);
-  });
-
-  test(
-    "should protect the user and allies from attack moves",
-    async () => {
-      await game.startBattle([ Species.CHARIZARD, Species.BLASTOISE ]);
-
-      const leadPokemon = game.scene.getPlayerField();
-
-      game.move.select(Moves.MAT_BLOCK);
-
-      await game.phaseInterceptor.to(CommandPhase);
-
-      game.move.select(Moves.SPLASH, 1);
-
-      await game.phaseInterceptor.to(BerryPhase, false);
-
-      leadPokemon.forEach(p => expect(p.hp).toBe(p.getMaxHp()));
-    }
-  );
-
-  test(
-    "should not protect the user and allies from status moves",
-    async () => {
-      game.override.enemyMoveset([ Moves.GROWL ]);
-
-      await game.startBattle([ Species.CHARIZARD, Species.BLASTOISE ]);
-
-      const leadPokemon = game.scene.getPlayerField();
-
-      game.move.select(Moves.MAT_BLOCK);
-
-      await game.phaseInterceptor.to(CommandPhase);
-
-      game.move.select(Moves.SPLASH, 1);
-
-      await game.phaseInterceptor.to(BerryPhase, false);
-
-      leadPokemon.forEach(p => expect(p.getStatStage(Stat.ATK)).toBe(-2));
-    }
-  );
-
-  test(
-    "should fail when used after the first turn",
-    async () => {
-      await game.startBattle([ Species.BLASTOISE, Species.CHARIZARD ]);
-
-      const leadPokemon = game.scene.getPlayerField();
-
-      game.move.select(Moves.SPLASH);
-      await game.phaseInterceptor.to(CommandPhase);
-      game.move.select(Moves.SPLASH, 1);
-
-      await game.phaseInterceptor.to(TurnEndPhase);
-
-      const leadStartingHp = leadPokemon.map(p => p.hp);
-
-      await game.phaseInterceptor.to(CommandPhase, false);
-      game.move.select(Moves.MAT_BLOCK);
-      await game.phaseInterceptor.to(CommandPhase);
-      game.move.select(Moves.MAT_BLOCK, 1);
-
-      await game.phaseInterceptor.to(BerryPhase, false);
-
-      expect(leadPokemon.some((p, i) => p.hp < leadStartingHp[i])).toBeTruthy();
-    }
-  );
-});
diff --git a/src/test/moves/pledge_moves.test.ts b/src/test/moves/pledge_moves.test.ts
deleted file mode 100644
index 64d586e7ba4..00000000000
--- a/src/test/moves/pledge_moves.test.ts
+++ /dev/null
@@ -1,337 +0,0 @@
-import { BattlerIndex } from "#app/battle";
-import { allAbilities } from "#app/data/ability";
-import { ArenaTagSide } from "#app/data/arena-tag";
-import { allMoves, FlinchAttr } from "#app/data/move";
-import { Type } from "#enums/type";
-import { ArenaTagType } from "#enums/arena-tag-type";
-import { Stat } from "#enums/stat";
-import { toDmgValue } from "#app/utils";
-import { Abilities } from "#enums/abilities";
-import { Moves } from "#enums/moves";
-import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
-import Phaser from "phaser";
-import { afterEach, beforeAll, beforeEach, describe, it, expect, vi } from "vitest";
-
-describe("Moves - Pledge Moves", () => {
-  let phaserGame: Phaser.Game;
-  let game: GameManager;
-
-  beforeAll(() => {
-    phaserGame = new Phaser.Game({
-      type: Phaser.HEADLESS
-    });
-  });
-
-  afterEach(() => {
-    game.phaseInterceptor.restoreOg();
-  });
-
-  beforeEach(() => {
-    game = new GameManager(phaserGame);
-    game.override
-      .battleType("double")
-      .startingLevel(100)
-      .moveset([ Moves.FIRE_PLEDGE, Moves.GRASS_PLEDGE, Moves.WATER_PLEDGE, Moves.SPLASH ])
-      .enemySpecies(Species.SNORLAX)
-      .enemyLevel(100)
-      .enemyAbility(Abilities.BALL_FETCH)
-      .enemyMoveset(Moves.SPLASH);
-  });
-
-  it(
-    "Fire Pledge - should be an 80-power Fire-type attack outside of combination",
-    async () => {
-      await game.classicMode.startBattle([ Species.BLASTOISE, Species.CHARIZARD ]);
-
-      const firePledge = allMoves[Moves.FIRE_PLEDGE];
-      vi.spyOn(firePledge, "calculateBattlePower");
-
-      const playerPokemon = game.scene.getPlayerField();
-      vi.spyOn(playerPokemon[0], "getMoveType");
-
-      game.move.select(Moves.FIRE_PLEDGE, 0, BattlerIndex.ENEMY);
-      game.move.select(Moves.SPLASH, 1);
-
-      await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2 ]);
-      await game.phaseInterceptor.to("MoveEndPhase", false);
-
-      expect(firePledge.calculateBattlePower).toHaveLastReturnedWith(80);
-      expect(playerPokemon[0].getMoveType).toHaveLastReturnedWith(Type.FIRE);
-    }
-  );
-
-  it(
-    "Fire Pledge - should not combine with an ally using Fire Pledge",
-    async () => {
-      await game.classicMode.startBattle([ Species.BLASTOISE, Species.CHARIZARD ]);
-
-      const firePledge = allMoves[Moves.FIRE_PLEDGE];
-      vi.spyOn(firePledge, "calculateBattlePower");
-
-      const playerPokemon = game.scene.getPlayerField();
-      playerPokemon.forEach(p => vi.spyOn(p, "getMoveType"));
-
-      const enemyPokemon = game.scene.getEnemyField();
-
-      game.move.select(Moves.FIRE_PLEDGE, 0, BattlerIndex.ENEMY);
-      game.move.select(Moves.FIRE_PLEDGE, 0, BattlerIndex.ENEMY_2);
-
-      await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2 ]);
-
-      await game.phaseInterceptor.to("MoveEndPhase");
-      expect(firePledge.calculateBattlePower).toHaveLastReturnedWith(80);
-      expect(playerPokemon[0].getMoveType).toHaveLastReturnedWith(Type.FIRE);
-
-      await game.phaseInterceptor.to("BerryPhase", false);
-      expect(firePledge.calculateBattlePower).toHaveLastReturnedWith(80);
-      expect(playerPokemon[1].getMoveType).toHaveLastReturnedWith(Type.FIRE);
-
-      enemyPokemon.forEach(p => expect(p.hp).toBeLessThan(p.getMaxHp()));
-    }
-  );
-
-  it(
-    "Fire Pledge - should not combine with an enemy's Pledge move",
-    async () => {
-      game.override
-        .battleType("single")
-        .enemyMoveset(Moves.GRASS_PLEDGE);
-
-      await game.classicMode.startBattle([ Species.CHARIZARD ]);
-
-      const playerPokemon = game.scene.getPlayerPokemon()!;
-      const enemyPokemon = game.scene.getEnemyPokemon()!;
-
-      game.move.select(Moves.FIRE_PLEDGE);
-
-      await game.toNextTurn();
-
-      // Neither Pokemon should defer their move's effects as they would
-      // if they combined moves, so both should be damaged.
-      expect(playerPokemon.hp).toBeLessThan(playerPokemon.getMaxHp());
-      expect(enemyPokemon.hp).toBeLessThan(enemyPokemon.getMaxHp());
-      expect(game.scene.arena.getTag(ArenaTagType.FIRE_GRASS_PLEDGE)).toBeUndefined();
-    }
-  );
-
-  it(
-    "Grass Pledge - should combine with Fire Pledge to form a 150-power Fire-type attack that creates a 'sea of fire'",
-    async () => {
-      await game.classicMode.startBattle([ Species.CHARIZARD, Species.BLASTOISE ]);
-
-      const grassPledge = allMoves[Moves.GRASS_PLEDGE];
-      vi.spyOn(grassPledge, "calculateBattlePower");
-
-      const playerPokemon = game.scene.getPlayerField();
-      const enemyPokemon = game.scene.getEnemyField();
-
-      vi.spyOn(playerPokemon[1], "getMoveType");
-      const baseDmgMock = vi.spyOn(enemyPokemon[0], "getBaseDamage");
-
-      game.move.select(Moves.FIRE_PLEDGE, 0, BattlerIndex.ENEMY_2);
-      game.move.select(Moves.GRASS_PLEDGE, 1, BattlerIndex.ENEMY);
-
-      await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2 ]);
-      // advance to the end of PLAYER_2's move this turn
-      for (let i = 0; i < 2; i++) {
-        await game.phaseInterceptor.to("MoveEndPhase");
-      }
-      expect(playerPokemon[1].getMoveType).toHaveLastReturnedWith(Type.FIRE);
-      expect(grassPledge.calculateBattlePower).toHaveLastReturnedWith(150);
-
-      const baseDmg = baseDmgMock.mock.results[baseDmgMock.mock.results.length - 1].value;
-      expect(enemyPokemon[0].getMaxHp() - enemyPokemon[0].hp).toBe(toDmgValue(baseDmg * 1.5));
-      expect(enemyPokemon[1].hp).toBe(enemyPokemon[1].getMaxHp()); // PLAYER should not have attacked
-      expect(game.scene.arena.getTagOnSide(ArenaTagType.FIRE_GRASS_PLEDGE, ArenaTagSide.ENEMY)).toBeDefined();
-
-      const enemyStartingHp = enemyPokemon.map(p => p.hp);
-      await game.toNextTurn();
-      enemyPokemon.forEach((p, i) => expect(enemyStartingHp[i] - p.hp).toBe(toDmgValue(p.getMaxHp() / 8)));
-    }
-  );
-
-  it(
-    "Fire Pledge - should combine with Water Pledge to form a 150-power Water-type attack that creates a 'rainbow'",
-    async () => {
-      game.override.moveset([ Moves.FIRE_PLEDGE, Moves.WATER_PLEDGE, Moves.FIERY_DANCE, Moves.SPLASH ]);
-
-      await game.classicMode.startBattle([ Species.BLASTOISE, Species.VENUSAUR ]);
-
-      const firePledge = allMoves[Moves.FIRE_PLEDGE];
-      vi.spyOn(firePledge, "calculateBattlePower");
-
-      const playerPokemon = game.scene.getPlayerField();
-      const enemyPokemon = game.scene.getEnemyField();
-
-      vi.spyOn(playerPokemon[1], "getMoveType");
-
-      game.move.select(Moves.WATER_PLEDGE, 0, BattlerIndex.ENEMY_2);
-      game.move.select(Moves.FIRE_PLEDGE, 1, BattlerIndex.ENEMY);
-
-      await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2 ]);
-      // advance to the end of PLAYER_2's move this turn
-      for (let i = 0; i < 2; i++) {
-        await game.phaseInterceptor.to("MoveEndPhase");
-      }
-      expect(playerPokemon[1].getMoveType).toHaveLastReturnedWith(Type.WATER);
-      expect(firePledge.calculateBattlePower).toHaveLastReturnedWith(150);
-      expect(enemyPokemon[1].hp).toBe(enemyPokemon[1].getMaxHp()); // PLAYER should not have attacked
-      expect(game.scene.arena.getTagOnSide(ArenaTagType.WATER_FIRE_PLEDGE, ArenaTagSide.PLAYER)).toBeDefined();
-
-      await game.toNextTurn();
-
-      game.move.select(Moves.FIERY_DANCE, 0, BattlerIndex.ENEMY_2);
-      game.move.select(Moves.SPLASH, 1);
-      await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2 ]);
-      await game.phaseInterceptor.to("MoveEndPhase");
-
-      // Rainbow effect should increase Fiery Dance's chance of raising Sp. Atk to 100%
-      expect(playerPokemon[0].getStatStage(Stat.SPATK)).toBe(1);
-    }
-  );
-
-  it(
-    "Water Pledge - should combine with Grass Pledge to form a 150-power Grass-type attack that creates a 'swamp'",
-    async () => {
-      await game.classicMode.startBattle([ Species.BLASTOISE, Species.CHARIZARD ]);
-
-      const waterPledge = allMoves[Moves.WATER_PLEDGE];
-      vi.spyOn(waterPledge, "calculateBattlePower");
-
-      const playerPokemon = game.scene.getPlayerField();
-      const enemyPokemon = game.scene.getEnemyField();
-      const enemyStartingSpd = enemyPokemon.map(p => p.getEffectiveStat(Stat.SPD));
-
-      vi.spyOn(playerPokemon[1], "getMoveType");
-
-      game.move.select(Moves.GRASS_PLEDGE, 0, BattlerIndex.ENEMY_2);
-      game.move.select(Moves.WATER_PLEDGE, 1, BattlerIndex.ENEMY);
-
-      await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2 ]);
-      // advance to the end of PLAYER_2's move this turn
-      for (let i = 0; i < 2; i++) {
-        await game.phaseInterceptor.to("MoveEndPhase");
-      }
-
-      expect(playerPokemon[1].getMoveType).toHaveLastReturnedWith(Type.GRASS);
-      expect(waterPledge.calculateBattlePower).toHaveLastReturnedWith(150);
-      expect(enemyPokemon[1].hp).toBe(enemyPokemon[1].getMaxHp());
-
-      expect(game.scene.arena.getTagOnSide(ArenaTagType.GRASS_WATER_PLEDGE, ArenaTagSide.ENEMY)).toBeDefined();
-      enemyPokemon.forEach((p, i) => expect(p.getEffectiveStat(Stat.SPD)).toBe(Math.floor(enemyStartingSpd[i] / 4)));
-    }
-  );
-
-  it(
-    "Pledge Moves - should alter turn order when used in combination",
-    async () => {
-      await game.classicMode.startBattle([ Species.CHARIZARD, Species.BLASTOISE ]);
-
-      const enemyPokemon = game.scene.getEnemyField();
-
-      game.move.select(Moves.WATER_PLEDGE, 0, BattlerIndex.ENEMY);
-      game.move.select(Moves.FIRE_PLEDGE, 1, BattlerIndex.ENEMY_2);
-
-      await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2, BattlerIndex.PLAYER_2 ]);
-      // PLAYER_2 should act with a combined move immediately after PLAYER as the second move in the turn
-      for (let i = 0; i < 2; i++) {
-        await game.phaseInterceptor.to("MoveEndPhase");
-      }
-      expect(enemyPokemon[0].hp).toBe(enemyPokemon[0].getMaxHp());
-      expect(enemyPokemon[1].hp).toBeLessThan(enemyPokemon[1].getMaxHp());
-    }
-  );
-
-  it(
-    "Pledge Moves - 'rainbow' effect should not stack with Serene Grace when applied to flinching moves",
-    async () => {
-      game.override
-        .ability(Abilities.SERENE_GRACE)
-        .moveset([ Moves.FIRE_PLEDGE, Moves.WATER_PLEDGE, Moves.IRON_HEAD, Moves.SPLASH ]);
-
-      await game.classicMode.startBattle([ Species.BLASTOISE, Species.CHARIZARD ]);
-
-      const ironHeadFlinchAttr = allMoves[Moves.IRON_HEAD].getAttrs(FlinchAttr)[0];
-      vi.spyOn(ironHeadFlinchAttr, "getMoveChance");
-
-      game.move.select(Moves.WATER_PLEDGE, 0, BattlerIndex.ENEMY);
-      game.move.select(Moves.FIRE_PLEDGE, 1, BattlerIndex.ENEMY_2);
-
-      await game.phaseInterceptor.to("TurnEndPhase");
-
-      expect(game.scene.arena.getTagOnSide(ArenaTagType.WATER_FIRE_PLEDGE, ArenaTagSide.PLAYER)).toBeDefined();
-
-      game.move.select(Moves.IRON_HEAD, 0, BattlerIndex.ENEMY);
-      game.move.select(Moves.SPLASH, 1);
-
-      await game.phaseInterceptor.to("BerryPhase", false);
-
-      expect(ironHeadFlinchAttr.getMoveChance).toHaveLastReturnedWith(60);
-    }
-  );
-
-  it(
-    "Pledge Moves - should have no effect when the second ally's move is cancelled",
-    async () => {
-      game.override
-        .enemyMoveset([ Moves.SPLASH, Moves.SPORE ]);
-
-      await game.classicMode.startBattle([ Species.BLASTOISE, Species.CHARIZARD ]);
-
-      const enemyPokemon = game.scene.getEnemyField();
-
-      game.move.select(Moves.FIRE_PLEDGE, 0, BattlerIndex.ENEMY);
-      game.move.select(Moves.GRASS_PLEDGE, 1, BattlerIndex.ENEMY_2);
-
-      await game.forceEnemyMove(Moves.SPORE, BattlerIndex.PLAYER_2);
-      await game.forceEnemyMove(Moves.SPLASH);
-
-      await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY_2 ]);
-
-      await game.phaseInterceptor.to("BerryPhase", false);
-
-      enemyPokemon.forEach((p) => expect(p.hp).toBe(p.getMaxHp()));
-    }
-  );
-
-  it(
-    "Pledge Moves - should ignore redirection from another Pokemon's Storm Drain",
-    async () => {
-      await game.classicMode.startBattle([ Species.BLASTOISE, Species.CHARIZARD ]);
-
-      const enemyPokemon = game.scene.getEnemyField();
-      vi.spyOn(enemyPokemon[1], "getAbility").mockReturnValue(allAbilities[Abilities.STORM_DRAIN]);
-
-      game.move.select(Moves.WATER_PLEDGE, 0, BattlerIndex.ENEMY);
-      game.move.select(Moves.SPLASH, 1);
-
-      await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2 ]);
-
-      await game.phaseInterceptor.to("MoveEndPhase", false);
-
-      expect(enemyPokemon[0].hp).toBeLessThan(enemyPokemon[0].getMaxHp());
-      expect(enemyPokemon[1].getStatStage(Stat.SPATK)).toBe(0);
-    }
-  );
-
-  it(
-    "Pledge Moves - should not ignore redirection from another Pokemon's Follow Me",
-    async () => {
-      game.override.enemyMoveset([ Moves.FOLLOW_ME, Moves.SPLASH ]);
-      await game.classicMode.startBattle([ Species.BLASTOISE, Species.CHARIZARD ]);
-
-      game.move.select(Moves.WATER_PLEDGE, 0, BattlerIndex.ENEMY);
-      game.move.select(Moves.SPLASH, 1);
-
-      await game.forceEnemyMove(Moves.SPLASH);
-      await game.forceEnemyMove(Moves.FOLLOW_ME);
-
-      await game.phaseInterceptor.to("BerryPhase", false);
-
-      const enemyPokemon = game.scene.getEnemyField();
-      expect(enemyPokemon[0].hp).toBe(enemyPokemon[0].getMaxHp());
-      expect(enemyPokemon[1].hp).toBeLessThan(enemyPokemon[1].getMaxHp());
-    }
-  );
-});
diff --git a/src/test/moves/powder.test.ts b/src/test/moves/powder.test.ts
deleted file mode 100644
index a1db2bced3a..00000000000
--- a/src/test/moves/powder.test.ts
+++ /dev/null
@@ -1,318 +0,0 @@
-import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
-import Phaser from "phaser";
-import GameManager from "#test/utils/gameManager";
-import { Abilities } from "#enums/abilities";
-import { Moves } from "#enums/moves";
-import { Species } from "#enums/species";
-import { BerryPhase } from "#app/phases/berry-phase";
-import { MoveResult, PokemonMove } from "#app/field/pokemon";
-import { Type } from "#enums/type";
-import { MoveEffectPhase } from "#app/phases/move-effect-phase";
-import { StatusEffect } from "#enums/status-effect";
-import { BattlerIndex } from "#app/battle";
-
-describe("Moves - Powder", () => {
-  let phaserGame: Phaser.Game;
-  let game: GameManager;
-
-  beforeAll(() => {
-    phaserGame = new Phaser.Game({
-      type: Phaser.HEADLESS,
-    });
-  });
-
-  afterEach(() => {
-    game.phaseInterceptor.restoreOg();
-  });
-
-  beforeEach(() => {
-    game = new GameManager(phaserGame);
-    game.override.battleType("single");
-
-    game.override
-      .enemySpecies(Species.SNORLAX)
-      .enemyLevel(100)
-      .enemyMoveset(Moves.EMBER)
-      .enemyAbility(Abilities.INSOMNIA)
-      .startingLevel(100)
-      .moveset([ Moves.POWDER, Moves.SPLASH, Moves.FIERY_DANCE, Moves.ROAR ]);
-  });
-
-  it(
-    "should cancel the target's Fire-type move, damage the target, and still consume the target's PP",
-    async () => {
-      // Cannot use enemy moveset override for this test, since it interferes with checking PP
-      game.override.enemyMoveset([]);
-      await game.classicMode.startBattle([ Species.CHARIZARD ]);
-
-      const enemyPokemon = game.scene.getEnemyPokemon()!;
-      enemyPokemon.moveset = [ new PokemonMove(Moves.EMBER) ];
-
-      game.move.select(Moves.POWDER);
-
-      await game.phaseInterceptor.to(BerryPhase, false);
-      expect(enemyPokemon.getLastXMoves()[0].result).toBe(MoveResult.FAIL);
-      expect(enemyPokemon.hp).toBe(Math.ceil(3 * enemyPokemon.getMaxHp() / 4));
-      expect(enemyPokemon.moveset[0]!.ppUsed).toBe(1);
-
-      await game.toNextTurn();
-
-      game.move.select(Moves.SPLASH);
-
-      await game.phaseInterceptor.to(BerryPhase, false);
-      expect(enemyPokemon.getLastXMoves()[0].result).toBe(MoveResult.SUCCESS);
-      expect(enemyPokemon.hp).toBe(Math.ceil(3 * enemyPokemon.getMaxHp() / 4));
-      expect(enemyPokemon.moveset[0]!.ppUsed).toBe(2);
-    });
-
-  it(
-    "should have no effect against Grass-type Pokemon",
-    async () => {
-      game.override.enemySpecies(Species.AMOONGUSS);
-
-      await game.classicMode.startBattle([ Species.CHARIZARD ]);
-
-      const enemyPokemon = game.scene.getEnemyPokemon()!;
-
-      game.move.select(Moves.POWDER);
-
-      await game.phaseInterceptor.to(BerryPhase, false);
-      expect(enemyPokemon.getLastXMoves()[0].result).toBe(MoveResult.SUCCESS);
-      expect(enemyPokemon.hp).toBe(enemyPokemon.getMaxHp());
-    });
-
-  it(
-    "should have no effect against Pokemon with Overcoat",
-    async () => {
-      game.override.enemyAbility(Abilities.OVERCOAT);
-
-      await game.classicMode.startBattle([ Species.CHARIZARD ]);
-
-      const enemyPokemon = game.scene.getEnemyPokemon()!;
-
-      game.move.select(Moves.POWDER);
-
-      await game.phaseInterceptor.to(BerryPhase, false);
-      expect(enemyPokemon.getLastXMoves()[0].result).toBe(MoveResult.SUCCESS);
-      expect(enemyPokemon.hp).toBe(enemyPokemon.getMaxHp());
-    });
-
-  it(
-    "should not damage the target if the target has Magic Guard",
-    async () => {
-      game.override.enemyAbility(Abilities.MAGIC_GUARD);
-
-      await game.classicMode.startBattle([ Species.CHARIZARD ]);
-
-      const enemyPokemon = game.scene.getEnemyPokemon()!;
-
-      game.move.select(Moves.POWDER);
-
-      await game.phaseInterceptor.to(BerryPhase, false);
-      expect(enemyPokemon.getLastXMoves()[0].result).toBe(MoveResult.FAIL);
-      expect(enemyPokemon.hp).toBe(enemyPokemon.getMaxHp());
-    });
-
-  it(
-    "should not damage the target if Primordial Sea is active",
-    async () => {
-      game.override.enemyAbility(Abilities.PRIMORDIAL_SEA);
-
-      await game.classicMode.startBattle([ Species.CHARIZARD ]);
-
-      const enemyPokemon = game.scene.getEnemyPokemon()!;
-
-      game.move.select(Moves.POWDER);
-
-      await game.phaseInterceptor.to(BerryPhase, false);
-      expect(enemyPokemon.getLastXMoves()[0].result).toBe(MoveResult.FAIL);
-      expect(enemyPokemon.hp).toBe(enemyPokemon.getMaxHp());
-    });
-
-  it(
-    "should not prevent the target from thawing out with Flame Wheel",
-    async () => {
-      game.override
-        .enemyMoveset(Array(4).fill(Moves.FLAME_WHEEL))
-        .enemyStatusEffect(StatusEffect.FREEZE);
-
-      await game.classicMode.startBattle([ Species.CHARIZARD ]);
-
-      const enemyPokemon = game.scene.getEnemyPokemon()!;
-
-      game.move.select(Moves.POWDER);
-
-      await game.phaseInterceptor.to(BerryPhase, false);
-      expect(enemyPokemon.status?.effect).not.toBe(StatusEffect.FREEZE);
-      expect(enemyPokemon.getLastXMoves()[0].result).toBe(MoveResult.FAIL);
-      expect(enemyPokemon.hp).toBe(Math.ceil(3 * enemyPokemon.getMaxHp() / 4));
-    }
-  );
-
-  it(
-    "should not allow a target with Protean to change to Fire type",
-    async () => {
-      game.override.enemyAbility(Abilities.PROTEAN);
-
-      await game.classicMode.startBattle([ Species.CHARIZARD ]);
-
-      const enemyPokemon = game.scene.getEnemyPokemon()!;
-
-      game.move.select(Moves.POWDER);
-
-      await game.phaseInterceptor.to(BerryPhase, false);
-      expect(enemyPokemon.getLastXMoves()[0].result).toBe(MoveResult.FAIL);
-      expect(enemyPokemon.hp).toBeLessThan(enemyPokemon.getMaxHp());
-      expect(enemyPokemon.summonData?.types).not.toBe(Type.FIRE);
-    });
-
-  it(
-    "should cancel Fire-type moves generated by the target's Dancer ability",
-    async () => {
-      game.override
-        .battleType("double")
-        .enemySpecies(Species.BLASTOISE)
-        .enemyAbility(Abilities.DANCER);
-
-      await game.classicMode.startBattle([ Species.CHARIZARD, Species.CHARIZARD ]);
-
-      const playerPokemon = game.scene.getPlayerPokemon()!;
-      const enemyPokemon = game.scene.getEnemyPokemon()!;
-
-      // Turn 1: Roar away 1 opponent
-      game.move.select(Moves.ROAR, 0, BattlerIndex.ENEMY_2);
-      game.move.select(Moves.SPLASH, 1);
-      await game.toNextTurn();
-      await game.toNextTurn(); // Requires game.toNextTurn() twice due to double battle
-
-      // Turn 2: Enemy should activate Powder twice: From using Ember, and from copying Fiery Dance via Dancer
-      playerPokemon.hp = playerPokemon.getMaxHp();
-      game.move.select(Moves.FIERY_DANCE, 0, BattlerIndex.ENEMY);
-      game.move.select(Moves.POWDER, 1, BattlerIndex.ENEMY);
-
-      await game.phaseInterceptor.to(MoveEffectPhase);
-      const enemyStartingHp = enemyPokemon.hp;
-
-      await game.phaseInterceptor.to(BerryPhase, false);
-
-
-      // player should not take damage
-      expect(enemyPokemon.getLastXMoves()[0].result).toBe(MoveResult.FAIL);
-      expect(playerPokemon.hp).toBe(playerPokemon.getMaxHp());
-      // enemy should have taken damage from player's Fiery Dance + 2 Powder procs
-      expect(enemyPokemon.hp).toBe(enemyStartingHp - playerPokemon.turnData.totalDamageDealt - 2 * Math.floor(enemyPokemon.getMaxHp() / 4));
-    });
-
-  it(
-    "should cancel Fiery Dance, then prevent it from triggering Dancer",
-    async () => {
-      game.override.ability(Abilities.DANCER)
-        .enemyMoveset(Moves.FIERY_DANCE);
-
-      await game.classicMode.startBattle([ Species.CHARIZARD ]);
-
-      const playerPokemon = game.scene.getPlayerPokemon()!;
-      const enemyPokemon = game.scene.getEnemyPokemon()!;
-
-      game.move.select(Moves.POWDER);
-
-      await game.phaseInterceptor.to(BerryPhase, false);
-      expect(enemyPokemon.getLastXMoves()[0].result).toBe(MoveResult.FAIL);
-      expect(enemyPokemon.hp).toBe(Math.ceil(3 * enemyPokemon.getMaxHp() / 4));
-      expect(playerPokemon.getLastXMoves()[0].move).toBe(Moves.POWDER);
-    });
-
-  it(
-    "should cancel Revelation Dance if it becomes a Fire-type move",
-    async () => {
-      game.override
-        .enemySpecies(Species.CHARIZARD)
-        .enemyMoveset(Array(4).fill(Moves.REVELATION_DANCE));
-
-      await game.classicMode.startBattle([ Species.CHARIZARD ]);
-
-      const enemyPokemon = game.scene.getEnemyPokemon()!;
-
-      game.move.select(Moves.POWDER);
-
-      await game.phaseInterceptor.to(BerryPhase, false);
-      expect(enemyPokemon.getLastXMoves()[0].result).toBe(MoveResult.FAIL);
-      expect(enemyPokemon.hp).toBe(Math.ceil(3 * enemyPokemon.getMaxHp() / 4));
-    });
-
-  it(
-    "should cancel Shell Trap and damage the target, even if the move would fail",
-    async () => {
-      game.override.enemyMoveset(Array(4).fill(Moves.SHELL_TRAP));
-
-      await game.classicMode.startBattle([ Species.CHARIZARD ]);
-
-      const enemyPokemon = game.scene.getEnemyPokemon()!;
-
-      game.move.select(Moves.POWDER);
-
-      await game.phaseInterceptor.to(BerryPhase, false);
-      expect(enemyPokemon.getLastXMoves()[0].result).toBe(MoveResult.FAIL);
-      expect(enemyPokemon.hp).toBe(Math.ceil(3 * enemyPokemon.getMaxHp() / 4));
-    });
-
-  it(
-    "should cancel Grass Pledge if used after ally's Fire Pledge",
-    async () => {
-      game.override.enemyMoveset([ Moves.FIRE_PLEDGE, Moves.GRASS_PLEDGE ])
-        .battleType("double");
-
-      await game.classicMode.startBattle([ Species.CHARIZARD, Species.CHARIZARD ]);
-      const enemyPokemon = game.scene.getEnemyPokemon()!;
-
-      game.move.select(Moves.POWDER, 0, BattlerIndex.ENEMY);
-      game.move.select(Moves.SPLASH, 1);
-      await game.forceEnemyMove(Moves.GRASS_PLEDGE, BattlerIndex.PLAYER);
-      await game.forceEnemyMove(Moves.FIRE_PLEDGE, BattlerIndex.PLAYER);
-      await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY_2, BattlerIndex.ENEMY ]);
-
-      await game.phaseInterceptor.to(BerryPhase, false);
-      expect(enemyPokemon.getLastXMoves()[0].result).toBe(MoveResult.FAIL);
-      expect(enemyPokemon.hp).toBe(Math.ceil(3 * enemyPokemon.getMaxHp() / 4));
-    });
-
-  it(
-    "should cancel Fire Pledge if used before ally's Water Pledge",
-    async () => {
-      game.override.enemyMoveset([ Moves.FIRE_PLEDGE, Moves.WATER_PLEDGE ])
-        .battleType("double");
-
-      await game.classicMode.startBattle([ Species.CHARIZARD, Species.CHARIZARD ]);
-      const enemyPokemon = game.scene.getEnemyPokemon()!;
-
-      game.move.select(Moves.POWDER, 0, BattlerIndex.ENEMY);
-      game.move.select(Moves.SPLASH, 1);
-      await game.forceEnemyMove(Moves.FIRE_PLEDGE, BattlerIndex.PLAYER);
-      await game.forceEnemyMove(Moves.WATER_PLEDGE, BattlerIndex.PLAYER);
-      await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2 ]);
-
-      await game.phaseInterceptor.to(BerryPhase, false);
-      expect(enemyPokemon.getLastXMoves()[0].result).toBe(MoveResult.FAIL);
-      expect(enemyPokemon.hp).toBe(Math.ceil(3 * enemyPokemon.getMaxHp() / 4));
-    });
-
-  it(
-    "should NOT cancel Fire Pledge if used after ally's Water Pledge",
-    async () => {
-      game.override.enemyMoveset([ Moves.FIRE_PLEDGE, Moves.WATER_PLEDGE ])
-        .battleType("double");
-
-      await game.classicMode.startBattle([ Species.CHARIZARD, Species.CHARIZARD ]);
-      const enemyPokemon = game.scene.getEnemyPokemon()!;
-
-      game.move.select(Moves.POWDER, 0, BattlerIndex.ENEMY);
-      game.move.select(Moves.SPLASH, 1);
-      await game.forceEnemyMove(Moves.FIRE_PLEDGE, BattlerIndex.PLAYER);
-      await game.forceEnemyMove(Moves.WATER_PLEDGE, BattlerIndex.PLAYER);
-      await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY_2, BattlerIndex.ENEMY ]);
-
-      await game.phaseInterceptor.to(BerryPhase, false);
-      expect(enemyPokemon.getLastXMoves()[0].result).toBe(MoveResult.SUCCESS);
-      expect(enemyPokemon.hp).toBe(enemyPokemon.getMaxHp());
-    });
-});
diff --git a/src/test/moves/protect.test.ts b/src/test/moves/protect.test.ts
deleted file mode 100644
index e639969ddf0..00000000000
--- a/src/test/moves/protect.test.ts
+++ /dev/null
@@ -1,133 +0,0 @@
-import Phaser from "phaser";
-import { afterEach, beforeAll, beforeEach, describe, expect, test, vi } from "vitest";
-import GameManager from "../utils/gameManager";
-import { Species } from "#enums/species";
-import { Abilities } from "#enums/abilities";
-import { Moves } from "#enums/moves";
-import { Stat } from "#enums/stat";
-import { allMoves } from "#app/data/move";
-import { ArenaTagSide, ArenaTrapTag } from "#app/data/arena-tag";
-import { BattlerIndex } from "#app/battle";
-import { MoveResult } from "#app/field/pokemon";
-
-
-describe("Moves - Protect", () => {
-  let phaserGame: Phaser.Game;
-  let game: GameManager;
-
-  beforeAll(() => {
-    phaserGame = new Phaser.Game({
-      type: Phaser.HEADLESS,
-    });
-  });
-
-  afterEach(() => {
-    game.phaseInterceptor.restoreOg();
-  });
-
-  beforeEach(() => {
-    game = new GameManager(phaserGame);
-
-    game.override.battleType("single");
-
-    game.override.moveset([ Moves.PROTECT ]);
-    game.override.enemySpecies(Species.SNORLAX);
-
-    game.override.enemyAbility(Abilities.INSOMNIA);
-    game.override.enemyMoveset([ Moves.TACKLE ]);
-
-    game.override.startingLevel(100);
-    game.override.enemyLevel(100);
-  });
-
-  test(
-    "should protect the user from attacks",
-    async () => {
-      await game.classicMode.startBattle([ Species.CHARIZARD ]);
-
-      const leadPokemon = game.scene.getPlayerPokemon()!;
-
-      game.move.select(Moves.PROTECT);
-
-      await game.phaseInterceptor.to("BerryPhase", false);
-
-      expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp());
-    }
-  );
-
-  test(
-    "should prevent secondary effects from the opponent's attack",
-    async () => {
-      game.override.enemyMoveset([ Moves.CEASELESS_EDGE ]);
-      vi.spyOn(allMoves[Moves.CEASELESS_EDGE], "accuracy", "get").mockReturnValue(100);
-
-      await game.classicMode.startBattle([ Species.CHARIZARD ]);
-
-      const leadPokemon = game.scene.getPlayerPokemon()!;
-
-      game.move.select(Moves.PROTECT);
-
-      await game.phaseInterceptor.to("BerryPhase", false);
-
-      expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp());
-      expect(game.scene.arena.getTagOnSide(ArenaTrapTag, ArenaTagSide.ENEMY)).toBeUndefined();
-    }
-  );
-
-  test(
-    "should protect the user from status moves",
-    async () => {
-      game.override.enemyMoveset([ Moves.CHARM ]);
-
-      await game.classicMode.startBattle([ Species.CHARIZARD ]);
-
-      const leadPokemon = game.scene.getPlayerPokemon()!;
-
-      game.move.select(Moves.PROTECT);
-
-      await game.phaseInterceptor.to("BerryPhase", false);
-
-      expect(leadPokemon.getStatStage(Stat.ATK)).toBe(0);
-    }
-  );
-
-  test(
-    "should stop subsequent hits of a multi-hit move",
-    async () => {
-      game.override.enemyMoveset([ Moves.TACHYON_CUTTER ]);
-
-      await game.classicMode.startBattle([ Species.CHARIZARD ]);
-
-      const leadPokemon = game.scene.getPlayerPokemon()!;
-      const enemyPokemon = game.scene.getEnemyPokemon()!;
-
-      game.move.select(Moves.PROTECT);
-
-      await game.phaseInterceptor.to("BerryPhase", false);
-
-      expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp());
-      expect(enemyPokemon.turnData.hitCount).toBe(1);
-    }
-  );
-
-  test(
-    "should fail if the user is the last to move in the turn",
-    async () => {
-      game.override.enemyMoveset([ Moves.PROTECT ]);
-
-      await game.classicMode.startBattle([ Species.CHARIZARD ]);
-
-      const leadPokemon = game.scene.getPlayerPokemon()!;
-      const enemyPokemon = game.scene.getEnemyPokemon()!;
-
-      game.move.select(Moves.PROTECT);
-
-      await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]);
-
-      await game.phaseInterceptor.to("BerryPhase", false);
-
-      expect(enemyPokemon.getLastXMoves()[0].result).toBe(MoveResult.SUCCESS);
-      expect(leadPokemon.getLastXMoves()[0].result).toBe(MoveResult.FAIL);
-    }
-  );
-});
diff --git a/src/test/moves/purify.test.ts b/src/test/moves/purify.test.ts
deleted file mode 100644
index d72b4a87d2a..00000000000
--- a/src/test/moves/purify.test.ts
+++ /dev/null
@@ -1,78 +0,0 @@
-import { BattlerIndex } from "#app/battle";
-import { Status } from "#app/data/status-effect";
-import type { EnemyPokemon, PlayerPokemon } from "#app/field/pokemon";
-import { MoveEndPhase } from "#app/phases/move-end-phase";
-import { Moves } from "#enums/moves";
-import { Species } from "#enums/species";
-import { StatusEffect } from "#enums/status-effect";
-import GameManager from "#test/utils/gameManager";
-import Phaser from "phaser";
-import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest";
-
-
-describe("Moves - Purify", () => {
-  let phaserGame: Phaser.Game;
-  let game: GameManager;
-
-  beforeAll(() => {
-    phaserGame = new Phaser.Game({
-      type: Phaser.HEADLESS,
-    });
-  });
-
-  afterEach(() => {
-    game.phaseInterceptor.restoreOg();
-  });
-
-  beforeEach(() => {
-    game = new GameManager(phaserGame);
-    game.override.battleType("single");
-
-    game.override.starterSpecies(Species.PYUKUMUKU);
-    game.override.startingLevel(10);
-    game.override.moveset([ Moves.PURIFY, Moves.SIZZLY_SLIDE ]);
-
-    game.override.enemySpecies(Species.MAGIKARP);
-    game.override.enemyLevel(10);
-    game.override.enemyMoveset([ Moves.SPLASH, Moves.NONE, Moves.NONE, Moves.NONE ]);
-  });
-
-  test(
-    "Purify heals opponent status effect and restores user hp",
-    async () => {
-      await game.startBattle();
-
-      const enemyPokemon: EnemyPokemon = game.scene.getEnemyPokemon()!;
-      const playerPokemon: PlayerPokemon = game.scene.getPlayerPokemon()!;
-
-      playerPokemon.hp = playerPokemon.getMaxHp() - 1;
-      enemyPokemon.status = new Status(StatusEffect.BURN);
-
-      game.move.select(Moves.PURIFY);
-      await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]);
-      await game.phaseInterceptor.to(MoveEndPhase);
-
-      expect(enemyPokemon.status).toBeNull();
-      expect(playerPokemon.isFullHp()).toBe(true);
-    },
-  );
-
-  test(
-    "Purify does not heal if opponent doesnt have any status effect",
-    async () => {
-      await game.startBattle();
-
-      const playerPokemon: PlayerPokemon = game.scene.getPlayerPokemon()!;
-
-      playerPokemon.hp = playerPokemon.getMaxHp() - 1;
-      const playerInitialHp = playerPokemon.hp;
-
-      game.move.select(Moves.PURIFY);
-      await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]);
-      await game.phaseInterceptor.to(MoveEndPhase);
-
-      expect(playerPokemon.hp).toBe(playerInitialHp);
-    },
-  );
-
-});
diff --git a/src/test/moves/quick_guard.test.ts b/src/test/moves/quick_guard.test.ts
deleted file mode 100644
index 7bda71782aa..00000000000
--- a/src/test/moves/quick_guard.test.ts
+++ /dev/null
@@ -1,117 +0,0 @@
-import Phaser from "phaser";
-import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest";
-import GameManager from "../utils/gameManager";
-import { Species } from "#enums/species";
-import { Abilities } from "#enums/abilities";
-import { Moves } from "#enums/moves";
-import { Stat } from "#enums/stat";
-import { BattlerIndex } from "#app/battle";
-import { MoveResult } from "#app/field/pokemon";
-
-
-describe("Moves - Quick Guard", () => {
-  let phaserGame: Phaser.Game;
-  let game: GameManager;
-
-  beforeAll(() => {
-    phaserGame = new Phaser.Game({
-      type: Phaser.HEADLESS,
-    });
-  });
-
-  afterEach(() => {
-    game.phaseInterceptor.restoreOg();
-  });
-
-  beforeEach(() => {
-    game = new GameManager(phaserGame);
-
-    game.override.battleType("double");
-
-    game.override.moveset([ Moves.QUICK_GUARD, Moves.SPLASH, Moves.FOLLOW_ME ]);
-
-    game.override.enemySpecies(Species.SNORLAX);
-    game.override.enemyMoveset([ Moves.QUICK_ATTACK ]);
-    game.override.enemyAbility(Abilities.INSOMNIA);
-
-    game.override.startingLevel(100);
-    game.override.enemyLevel(100);
-  });
-
-  test(
-    "should protect the user and allies from priority moves",
-    async () => {
-      await game.classicMode.startBattle([ Species.CHARIZARD, Species.BLASTOISE ]);
-
-      const playerPokemon = game.scene.getPlayerField();
-
-      game.move.select(Moves.QUICK_GUARD);
-      game.move.select(Moves.SPLASH, 1);
-
-      await game.phaseInterceptor.to("BerryPhase", false);
-
-      playerPokemon.forEach(p => expect(p.hp).toBe(p.getMaxHp()));
-    }
-  );
-
-  test(
-    "should protect the user and allies from Prankster-boosted moves",
-    async () => {
-      game.override.enemyAbility(Abilities.PRANKSTER);
-      game.override.enemyMoveset([ Moves.GROWL ]);
-
-      await game.classicMode.startBattle([ Species.CHARIZARD, Species.BLASTOISE ]);
-
-      const playerPokemon = game.scene.getPlayerField();
-
-      game.move.select(Moves.QUICK_GUARD);
-      game.move.select(Moves.SPLASH, 1);
-
-      await game.phaseInterceptor.to("BerryPhase", false);
-
-      playerPokemon.forEach(p => expect(p.getStatStage(Stat.ATK)).toBe(0));
-    }
-  );
-
-  test(
-    "should stop subsequent hits of a multi-hit priority move",
-    async () => {
-      game.override.enemyMoveset([ Moves.WATER_SHURIKEN ]);
-
-      await game.classicMode.startBattle([ Species.CHARIZARD, Species.BLASTOISE ]);
-
-      const playerPokemon = game.scene.getPlayerField();
-      const enemyPokemon = game.scene.getEnemyField();
-
-      game.move.select(Moves.QUICK_GUARD);
-      game.move.select(Moves.FOLLOW_ME, 1);
-
-      await game.phaseInterceptor.to("BerryPhase", false);
-
-      playerPokemon.forEach(p => expect(p.hp).toBe(p.getMaxHp()));
-      enemyPokemon.forEach(p => expect(p.turnData.hitCount).toBe(1));
-    }
-  );
-
-  test(
-    "should fail if the user is the last to move in the turn",
-    async () => {
-      game.override.battleType("single");
-      game.override.enemyMoveset([ Moves.QUICK_GUARD ]);
-
-      await game.classicMode.startBattle([ Species.CHARIZARD ]);
-
-      const playerPokemon = game.scene.getPlayerPokemon()!;
-      const enemyPokemon = game.scene.getEnemyPokemon()!;
-
-      game.move.select(Moves.QUICK_GUARD);
-
-      await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]);
-
-      await game.phaseInterceptor.to("BerryPhase", false);
-
-      expect(enemyPokemon.getLastXMoves()[0].result).toBe(MoveResult.SUCCESS);
-      expect(playerPokemon.getLastXMoves()[0].result).toBe(MoveResult.FAIL);
-    }
-  );
-});
diff --git a/src/test/moves/rage_fist.test.ts b/src/test/moves/rage_fist.test.ts
deleted file mode 100644
index a85be5a88d9..00000000000
--- a/src/test/moves/rage_fist.test.ts
+++ /dev/null
@@ -1,143 +0,0 @@
-import { BattlerIndex } from "#app/battle";
-import { Abilities } from "#enums/abilities";
-import { Moves } from "#enums/moves";
-import { Species } from "#enums/species";
-import { allMoves } from "#app/data/move";
-import GameManager from "#test/utils/gameManager";
-import Phaser from "phaser";
-import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
-
-describe("Moves - Rage Fist", () => {
-  let phaserGame: Phaser.Game;
-  let game: GameManager;
-  const move = allMoves[Moves.RAGE_FIST];
-
-  beforeAll(() => {
-    phaserGame = new Phaser.Game({
-      type: Phaser.HEADLESS,
-    });
-  });
-
-  afterEach(() => {
-    game.phaseInterceptor.restoreOg();
-  });
-
-  beforeEach(() => {
-    game = new GameManager(phaserGame);
-    game.override
-      .battleType("single")
-      .moveset([ Moves.RAGE_FIST, Moves.SPLASH, Moves.SUBSTITUTE ])
-      .startingLevel(100)
-      .enemyLevel(1)
-      .enemyAbility(Abilities.BALL_FETCH)
-      .enemyMoveset(Moves.DOUBLE_KICK);
-
-    vi.spyOn(move, "calculateBattlePower");
-  });
-
-  it("should have 100 more power if hit twice before calling Rage Fist", async () => {
-    game.override
-      .enemySpecies(Species.MAGIKARP);
-
-    await game.classicMode.startBattle([ Species.MAGIKARP ]);
-
-    game.move.select(Moves.RAGE_FIST);
-    await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]);
-    await game.phaseInterceptor.to("TurnEndPhase");
-
-    expect(move.calculateBattlePower).toHaveLastReturnedWith(150);
-  });
-
-  it("should maintain its power during next battle if it is within the same arena encounter", async () => {
-    game.override
-      .enemySpecies(Species.MAGIKARP)
-      .startingWave(1);
-
-    await game.classicMode.startBattle([ Species.MAGIKARP ]);
-
-    game.move.select(Moves.RAGE_FIST);
-    await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]);
-    await game.toNextWave();
-
-    game.move.select(Moves.RAGE_FIST);
-    await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]);
-    await game.phaseInterceptor.to("BerryPhase", false);
-
-    expect(move.calculateBattlePower).toHaveLastReturnedWith(250);
-  });
-
-  it("should reset the hitRecCounter if we enter new trainer battle", async () => {
-    game.override
-      .enemySpecies(Species.MAGIKARP)
-      .startingWave(4);
-
-    await game.classicMode.startBattle([ Species.MAGIKARP ]);
-
-    game.move.select(Moves.RAGE_FIST);
-    await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]);
-    await game.toNextWave();
-
-    game.move.select(Moves.RAGE_FIST);
-    await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]);
-    await game.phaseInterceptor.to("BerryPhase", false);
-
-    expect(move.calculateBattlePower).toHaveLastReturnedWith(150);
-  });
-
-  it("should not increase the hitCounter if Substitute is hit", async () => {
-    game.override
-      .enemySpecies(Species.MAGIKARP)
-      .startingWave(4);
-
-    await game.classicMode.startBattle([ Species.MAGIKARP ]);
-
-    game.move.select(Moves.SUBSTITUTE);
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]);
-    await game.phaseInterceptor.to("MoveEffectPhase");
-
-    expect(game.scene.getPlayerPokemon()?.customPokemonData.hitsRecCount).toBe(0);
-  });
-
-  it("should reset the hitRecCounter if we enter new biome", async () => {
-    game.override
-      .enemySpecies(Species.MAGIKARP)
-      .startingWave(10);
-
-    await game.classicMode.startBattle([ Species.MAGIKARP ]);
-
-    game.move.select(Moves.RAGE_FIST);
-    await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]);
-    await game.toNextTurn();
-
-    game.move.select(Moves.RAGE_FIST);
-    await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]);
-    await game.phaseInterceptor.to("BerryPhase", false);
-
-    expect(move.calculateBattlePower).toHaveLastReturnedWith(150);
-  });
-
-  it("should not reset the hitRecCounter if switched out", async () => {
-    game.override
-      .enemySpecies(Species.MAGIKARP)
-      .startingWave(1)
-      .enemyMoveset(Moves.TACKLE);
-
-    await game.classicMode.startBattle([ Species.CHARIZARD, Species.BLASTOISE ]);
-
-    game.move.select(Moves.SPLASH);
-    await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]);
-    await game.toNextTurn();
-
-    game.doSwitchPokemon(1);
-    await game.toNextTurn();
-
-    game.doSwitchPokemon(1);
-    await game.toNextTurn();
-
-    game.move.select(Moves.RAGE_FIST);
-    await game.phaseInterceptor.to("MoveEndPhase");
-
-    expect(game.scene.getPlayerParty()[0].species.speciesId).toBe(Species.CHARIZARD);
-    expect(move.calculateBattlePower).toHaveLastReturnedWith(150);
-  });
-});
diff --git a/src/test/moves/rage_powder.test.ts b/src/test/moves/rage_powder.test.ts
deleted file mode 100644
index 1b73a7f0f5f..00000000000
--- a/src/test/moves/rage_powder.test.ts
+++ /dev/null
@@ -1,80 +0,0 @@
-import { BattlerIndex } from "#app/battle";
-import { Abilities } from "#enums/abilities";
-import { Moves } from "#enums/moves";
-import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
-import Phaser from "phaser";
-import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest";
-
-
-describe("Moves - Rage Powder", () => {
-  let phaserGame: Phaser.Game;
-  let game: GameManager;
-
-  beforeAll(() => {
-    phaserGame = new Phaser.Game({
-      type: Phaser.HEADLESS,
-    });
-  });
-
-  afterEach(() => {
-    game.phaseInterceptor.restoreOg();
-  });
-
-  beforeEach(() => {
-    game = new GameManager(phaserGame);
-    game.override.battleType("double");
-    game.override.enemySpecies(Species.SNORLAX);
-    game.override.startingLevel(100);
-    game.override.enemyLevel(100);
-    game.override.moveset([ Moves.FOLLOW_ME, Moves.RAGE_POWDER, Moves.SPOTLIGHT, Moves.QUICK_ATTACK ]);
-    game.override.enemyMoveset([ Moves.RAGE_POWDER, Moves.TACKLE, Moves.SPLASH ]);
-  });
-
-  test(
-    "move effect should be bypassed by Grass type",
-    async () => {
-      await game.classicMode.startBattle([ Species.AMOONGUSS, Species.VENUSAUR ]);
-
-      const enemyPokemon = game.scene.getEnemyField();
-
-      game.move.select(Moves.QUICK_ATTACK, 0, BattlerIndex.ENEMY);
-      game.move.select(Moves.QUICK_ATTACK, 1, BattlerIndex.ENEMY_2);
-
-      await game.forceEnemyMove(Moves.RAGE_POWDER);
-      await game.forceEnemyMove(Moves.SPLASH);
-
-      await game.phaseInterceptor.to("BerryPhase", false);
-
-      // If redirection was bypassed, both enemies should be damaged
-      expect(enemyPokemon[0].hp).toBeLessThan(enemyPokemon[0].getMaxHp());
-      expect(enemyPokemon[1].hp).toBeLessThan(enemyPokemon[0].getMaxHp());
-    }
-  );
-
-  test(
-    "move effect should be bypassed by Overcoat",
-    async () => {
-      game.override.ability(Abilities.OVERCOAT);
-
-      // Test with two non-Grass type player Pokemon
-      await game.classicMode.startBattle([ Species.BLASTOISE, Species.CHARIZARD ]);
-
-      const enemyPokemon = game.scene.getEnemyField();
-
-      const enemyStartingHp = enemyPokemon.map(p => p.hp);
-
-      game.move.select(Moves.QUICK_ATTACK, 0, BattlerIndex.ENEMY);
-      game.move.select(Moves.QUICK_ATTACK, 1, BattlerIndex.ENEMY_2);
-
-      await game.forceEnemyMove(Moves.RAGE_POWDER);
-      await game.forceEnemyMove(Moves.SPLASH);
-
-      await game.phaseInterceptor.to("BerryPhase", false);
-
-      // If redirection was bypassed, both enemies should be damaged
-      expect(enemyPokemon[0].hp).toBeLessThan(enemyStartingHp[0]);
-      expect(enemyPokemon[1].hp).toBeLessThan(enemyStartingHp[1]);
-    }
-  );
-});
diff --git a/src/test/moves/roost.test.ts b/src/test/moves/roost.test.ts
deleted file mode 100644
index 69301dc86cf..00000000000
--- a/src/test/moves/roost.test.ts
+++ /dev/null
@@ -1,268 +0,0 @@
-import { BattlerIndex } from "#app/battle";
-import { Type } from "#enums/type";
-import { BattlerTagType } from "#app/enums/battler-tag-type";
-import { Moves } from "#app/enums/moves";
-import { Species } from "#app/enums/species";
-import { MoveEffectPhase } from "#app/phases/move-effect-phase";
-import { TurnEndPhase } from "#app/phases/turn-end-phase";
-import GameManager from "#test/utils/gameManager";
-import Phaser from "phaser";
-import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest";
-
-
-describe("Moves - Roost", () => {
-  let phaserGame: Phaser.Game;
-  let game: GameManager;
-
-  beforeAll(() => {
-    phaserGame = new Phaser.Game({
-      type: Phaser.HEADLESS,
-    });
-  });
-
-  afterEach(() => {
-    game.phaseInterceptor.restoreOg();
-  });
-
-  beforeEach(() => {
-    game = new GameManager(phaserGame);
-    game.override.battleType("single");
-    game.override.enemySpecies(Species.RELICANTH);
-    game.override.startingLevel(100);
-    game.override.enemyLevel(100);
-    game.override.enemyMoveset(Moves.EARTHQUAKE);
-    game.override.moveset([ Moves.ROOST, Moves.BURN_UP, Moves.DOUBLE_SHOCK ]);
-  });
-
-  /**
-   * Roost's behavior should be defined as:
-   * The pokemon loses its flying type for a turn. If the pokemon was ungroundd solely due to being a flying type, it will be grounded until end of turn.
-   * 1. Pure Flying type pokemon -> become normal type until end of turn
-   * 2. Dual Flying/X type pokemon -> become type X until end of turn
-   * 3. Pokemon that use burn up into roost (ex. Moltres) -> become flying due to burn up, then typeless until end of turn after using roost
-   * 4. If a pokemon is afflicted with Forest's Curse or Trick or treat, dual type pokemon will become 3 type pokemon after the flying type is regained
-   *    Pure flying types become (Grass or Ghost) and then back to flying/ (Grass or Ghost),
-   *    and pokemon post Burn up become ()
-   * 5. If a pokemon is also ungrounded due to other reasons (such as levitate), it will stay ungrounded post roost, despite not being flying type.
-   * 6. Non flying types using roost (such as dunsparce) are already grounded, so this move will only heal and have no other effects.
-   */
-
-  test(
-    "Non flying type uses roost -> no type change, took damage",
-    async () => {
-      await game.classicMode.startBattle([ Species.DUNSPARCE ]);
-      const playerPokemon = game.scene.getPlayerPokemon()!;
-      const playerPokemonStartingHP = playerPokemon.hp;
-      game.move.select(Moves.ROOST);
-      await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]);
-      await game.phaseInterceptor.to(MoveEffectPhase);
-
-      // Should only be normal type, and NOT flying type
-      let playerPokemonTypes = playerPokemon.getTypes();
-      expect(playerPokemonTypes[0] === Type.NORMAL).toBeTruthy();
-      expect(playerPokemonTypes.length === 1).toBeTruthy();
-      expect(playerPokemon.isGrounded()).toBeTruthy();
-
-      await game.phaseInterceptor.to(TurnEndPhase);
-
-      // Lose HP, still normal type
-      playerPokemonTypes = playerPokemon.getTypes();
-      expect(playerPokemon.hp).toBeLessThan(playerPokemonStartingHP);
-      expect(playerPokemonTypes[0] === Type.NORMAL).toBeTruthy();
-      expect(playerPokemonTypes.length === 1).toBeTruthy();
-      expect(playerPokemon.isGrounded()).toBeTruthy();
-    }
-  );
-
-  test(
-    "Pure flying type -> becomes normal after roost and takes damage from ground moves -> regains flying",
-    async () => {
-      await game.classicMode.startBattle([ Species.TORNADUS ]);
-      const playerPokemon = game.scene.getPlayerPokemon()!;
-      const playerPokemonStartingHP = playerPokemon.hp;
-      game.move.select(Moves.ROOST);
-      await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]);
-      await game.phaseInterceptor.to(MoveEffectPhase);
-
-      // Should only be normal type, and NOT flying type
-      let playerPokemonTypes = playerPokemon.getTypes();
-      expect(playerPokemonTypes[0] === Type.NORMAL).toBeTruthy();
-      expect(playerPokemonTypes[0] === Type.FLYING).toBeFalsy();
-      expect(playerPokemon.isGrounded()).toBeTruthy();
-
-      await game.phaseInterceptor.to(TurnEndPhase);
-
-      // Should have lost HP and is now back to being pure flying
-      playerPokemonTypes = playerPokemon.getTypes();
-      expect(playerPokemon.hp).toBeLessThan(playerPokemonStartingHP);
-      expect(playerPokemonTypes[0] === Type.NORMAL).toBeFalsy();
-      expect(playerPokemonTypes[0] === Type.FLYING).toBeTruthy();
-      expect(playerPokemon.isGrounded()).toBeFalsy();
-
-    }
-  );
-
-  test(
-    "Dual X/flying type -> becomes type X after roost and takes damage from ground moves -> regains flying",
-    async () => {
-      await game.classicMode.startBattle([ Species.HAWLUCHA ]);
-      const playerPokemon = game.scene.getPlayerPokemon()!;
-      const playerPokemonStartingHP = playerPokemon.hp;
-      game.move.select(Moves.ROOST);
-      await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]);
-      await game.phaseInterceptor.to(MoveEffectPhase);
-
-      // Should only be pure fighting type and grounded
-      let playerPokemonTypes = playerPokemon.getTypes();
-      expect(playerPokemonTypes[0] === Type.FIGHTING).toBeTruthy();
-      expect(playerPokemonTypes.length === 1).toBeTruthy();
-      expect(playerPokemon.isGrounded()).toBeTruthy();
-
-      await game.phaseInterceptor.to(TurnEndPhase);
-
-      // Should have lost HP and is now back to being fighting/flying
-      playerPokemonTypes = playerPokemon.getTypes();
-      expect(playerPokemon.hp).toBeLessThan(playerPokemonStartingHP);
-      expect(playerPokemonTypes[0] === Type.FIGHTING).toBeTruthy();
-      expect(playerPokemonTypes[1] === Type.FLYING).toBeTruthy();
-      expect(playerPokemon.isGrounded()).toBeFalsy();
-
-    }
-  );
-
-  test(
-    "Pokemon with levitate after using roost should lose flying type but still be unaffected by ground moves",
-    async () => {
-      game.override.starterForms({ [Species.ROTOM]: 4 });
-      await game.classicMode.startBattle([ Species.ROTOM ]);
-      const playerPokemon = game.scene.getPlayerPokemon()!;
-      const playerPokemonStartingHP = playerPokemon.hp;
-      game.move.select(Moves.ROOST);
-      await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]);
-      await game.phaseInterceptor.to(MoveEffectPhase);
-
-      // Should only be pure eletric type and grounded
-      let playerPokemonTypes = playerPokemon.getTypes();
-      expect(playerPokemonTypes[0] === Type.ELECTRIC).toBeTruthy();
-      expect(playerPokemonTypes.length === 1).toBeTruthy();
-      expect(playerPokemon.isGrounded()).toBeFalsy();
-
-      await game.phaseInterceptor.to(TurnEndPhase);
-
-      // Should have lost HP and is now back to being electric/flying
-      playerPokemonTypes = playerPokemon.getTypes();
-      expect(playerPokemon.hp).toBe(playerPokemonStartingHP);
-      expect(playerPokemonTypes[0] === Type.ELECTRIC).toBeTruthy();
-      expect(playerPokemonTypes[1] === Type.FLYING).toBeTruthy();
-      expect(playerPokemon.isGrounded()).toBeFalsy();
-
-    }
-  );
-
-  test(
-    "A fire/flying type that uses burn up, then roost should be typeless until end of turn",
-    async () => {
-      await game.classicMode.startBattle([ Species.MOLTRES ]);
-      const playerPokemon = game.scene.getPlayerPokemon()!;
-      const playerPokemonStartingHP = playerPokemon.hp;
-      game.move.select(Moves.BURN_UP);
-      await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]);
-      await game.phaseInterceptor.to(MoveEffectPhase);
-
-      // Should only be pure flying type after burn up
-      let playerPokemonTypes = playerPokemon.getTypes();
-      expect(playerPokemonTypes[0] === Type.FLYING).toBeTruthy();
-      expect(playerPokemonTypes.length === 1).toBeTruthy();
-
-      await game.phaseInterceptor.to(TurnEndPhase);
-      game.move.select(Moves.ROOST);
-      await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]);
-      await game.phaseInterceptor.to(MoveEffectPhase);
-
-      // Should only be typeless type after roost and is grounded
-      playerPokemonTypes = playerPokemon.getTypes();
-      expect(playerPokemon.getTag(BattlerTagType.ROOSTED)).toBeDefined();
-      expect(playerPokemonTypes[0] === Type.UNKNOWN).toBeTruthy();
-      expect(playerPokemonTypes.length === 1).toBeTruthy();
-      expect(playerPokemon.isGrounded()).toBeTruthy();
-
-      await game.phaseInterceptor.to(TurnEndPhase);
-
-      // Should go back to being pure flying and have taken damage from earthquake, and is ungrounded again
-      playerPokemonTypes = playerPokemon.getTypes();
-      expect(playerPokemon.hp).toBeLessThan(playerPokemonStartingHP);
-      expect(playerPokemonTypes[0] === Type.FLYING).toBeTruthy();
-      expect(playerPokemonTypes.length === 1).toBeTruthy();
-      expect(playerPokemon.isGrounded()).toBeFalsy();
-
-    }
-  );
-
-  test(
-    "An electric/flying type that uses double shock, then roost should be typeless until end of turn",
-    async () => {
-      game.override.enemySpecies(Species.ZEKROM);
-      await game.classicMode.startBattle([ Species.ZAPDOS ]);
-      const playerPokemon = game.scene.getPlayerPokemon()!;
-      const playerPokemonStartingHP = playerPokemon.hp;
-      game.move.select(Moves.DOUBLE_SHOCK);
-      await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]);
-      await game.phaseInterceptor.to(MoveEffectPhase);
-
-      // Should only be pure flying type after burn up
-      let playerPokemonTypes = playerPokemon.getTypes();
-      expect(playerPokemonTypes[0] === Type.FLYING).toBeTruthy();
-      expect(playerPokemonTypes.length === 1).toBeTruthy();
-
-      await game.phaseInterceptor.to(TurnEndPhase);
-      game.move.select(Moves.ROOST);
-      await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]);
-      await game.phaseInterceptor.to(MoveEffectPhase);
-
-      // Should only be typeless type after roost and is grounded
-      playerPokemonTypes = playerPokemon.getTypes();
-      expect(playerPokemon.getTag(BattlerTagType.ROOSTED)).toBeDefined();
-      expect(playerPokemonTypes[0] === Type.UNKNOWN).toBeTruthy();
-      expect(playerPokemonTypes.length === 1).toBeTruthy();
-      expect(playerPokemon.isGrounded()).toBeTruthy();
-
-      await game.phaseInterceptor.to(TurnEndPhase);
-
-      // Should go back to being pure flying and have taken damage from earthquake, and is ungrounded again
-      playerPokemonTypes = playerPokemon.getTypes();
-      expect(playerPokemon.hp).toBeLessThan(playerPokemonStartingHP);
-      expect(playerPokemonTypes[0] === Type.FLYING).toBeTruthy();
-      expect(playerPokemonTypes.length === 1).toBeTruthy();
-      expect(playerPokemon.isGrounded()).toBeFalsy();
-
-    }
-  );
-
-  test(
-    "Dual Type Pokemon afflicted with Forests Curse/Trick or Treat and post roost will become dual type and then become 3 type at end of turn",
-    async () => {
-      game.override.enemyMoveset([ Moves.TRICK_OR_TREAT, Moves.TRICK_OR_TREAT, Moves.TRICK_OR_TREAT, Moves.TRICK_OR_TREAT ]);
-      await game.classicMode.startBattle([ Species.MOLTRES ]);
-      const playerPokemon = game.scene.getPlayerPokemon()!;
-      game.move.select(Moves.ROOST);
-      await game.phaseInterceptor.to(MoveEffectPhase);
-
-      let playerPokemonTypes = playerPokemon.getTypes();
-      expect(playerPokemonTypes[0] === Type.FIRE).toBeTruthy();
-      expect(playerPokemonTypes.length === 1).toBeTruthy();
-      expect(playerPokemon.isGrounded()).toBeTruthy();
-
-      await game.phaseInterceptor.to(TurnEndPhase);
-
-      // Should be fire/flying/ghost
-      playerPokemonTypes = playerPokemon.getTypes();
-      expect(playerPokemonTypes.filter(type => type === Type.FLYING)).toHaveLength(1);
-      expect(playerPokemonTypes.filter(type => type === Type.FIRE)).toHaveLength(1);
-      expect(playerPokemonTypes.filter(type => type === Type.GHOST)).toHaveLength(1);
-      expect(playerPokemonTypes.length === 3).toBeTruthy();
-      expect(playerPokemon.isGrounded()).toBeFalsy();
-
-    }
-  );
-
-});
diff --git a/src/test/moves/shell_trap.test.ts b/src/test/moves/shell_trap.test.ts
deleted file mode 100644
index 04d3cf998b1..00000000000
--- a/src/test/moves/shell_trap.test.ts
+++ /dev/null
@@ -1,162 +0,0 @@
-import { BattlerIndex } from "#app/battle";
-import { allMoves } from "#app/data/move";
-import { Moves } from "#app/enums/moves";
-import { Species } from "#app/enums/species";
-import { MoveResult } from "#app/field/pokemon";
-import { BerryPhase } from "#app/phases/berry-phase";
-import { MoveEndPhase } from "#app/phases/move-end-phase";
-import { MovePhase } from "#app/phases/move-phase";
-import GameManager from "#test/utils/gameManager";
-import Phaser from "phaser";
-import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
-
-
-describe("Moves - Shell Trap", () => {
-  let phaserGame: Phaser.Game;
-  let game: GameManager;
-
-  beforeAll(() => {
-    phaserGame = new Phaser.Game({
-      type: Phaser.HEADLESS,
-    });
-  });
-
-  afterEach(() => {
-    game.phaseInterceptor.restoreOg();
-  });
-
-  beforeEach(() => {
-    game = new GameManager(phaserGame);
-    game.override
-      .battleType("double")
-      .moveset([ Moves.SHELL_TRAP, Moves.SPLASH, Moves.BULLDOZE ])
-      .enemySpecies(Species.SNORLAX)
-      .enemyMoveset([ Moves.RAZOR_LEAF ])
-      .startingLevel(100)
-      .enemyLevel(100);
-
-    vi.spyOn(allMoves[Moves.RAZOR_LEAF], "accuracy", "get").mockReturnValue(100);
-  });
-
-  it(
-    "should activate after the user is hit by a physical attack",
-    async () => {
-      await game.startBattle([ Species.CHARIZARD, Species.TURTONATOR ]);
-
-      const playerPokemon = game.scene.getPlayerField();
-      const enemyPokemon = game.scene.getEnemyField();
-
-      game.move.select(Moves.SPLASH);
-      game.move.select(Moves.SHELL_TRAP, 1);
-
-      await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.ENEMY_2, BattlerIndex.PLAYER, BattlerIndex.PLAYER_2 ]);
-
-      await game.phaseInterceptor.to(MoveEndPhase);
-
-      const movePhase = game.scene.getCurrentPhase();
-      expect(movePhase instanceof MovePhase).toBeTruthy();
-      expect((movePhase as MovePhase).pokemon).toBe(playerPokemon[1]);
-
-      await game.phaseInterceptor.to(MoveEndPhase);
-      enemyPokemon.forEach(p => expect(p.hp).toBeLessThan(p.getMaxHp()));
-    }
-  );
-
-  it(
-    "should fail if the user is only hit by special attacks",
-    async () => {
-      game.override.enemyMoveset([ Moves.SWIFT ]);
-
-      await game.startBattle([ Species.CHARIZARD, Species.TURTONATOR ]);
-
-      const playerPokemon = game.scene.getPlayerField();
-      const enemyPokemon = game.scene.getEnemyField();
-
-      game.move.select(Moves.SPLASH);
-      game.move.select(Moves.SHELL_TRAP, 1);
-
-      await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.ENEMY_2, BattlerIndex.PLAYER, BattlerIndex.PLAYER_2 ]);
-
-      await game.phaseInterceptor.to(MoveEndPhase);
-
-      const movePhase = game.scene.getCurrentPhase();
-      expect(movePhase instanceof MovePhase).toBeTruthy();
-      expect((movePhase as MovePhase).pokemon).not.toBe(playerPokemon[1]);
-
-      await game.phaseInterceptor.to(BerryPhase, false);
-      enemyPokemon.forEach(p => expect(p.hp).toBe(p.getMaxHp()));
-    }
-  );
-
-  it(
-    "should fail if the user isn't hit with any attack",
-    async () => {
-      game.override.enemyMoveset(Moves.SPLASH);
-
-      await game.startBattle([ Species.CHARIZARD, Species.TURTONATOR ]);
-
-      const playerPokemon = game.scene.getPlayerField();
-      const enemyPokemon = game.scene.getEnemyField();
-
-      game.move.select(Moves.SPLASH);
-      game.move.select(Moves.SHELL_TRAP, 1);
-
-      await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.ENEMY_2, BattlerIndex.PLAYER, BattlerIndex.PLAYER_2 ]);
-
-      await game.phaseInterceptor.to(MoveEndPhase);
-
-      const movePhase = game.scene.getCurrentPhase();
-      expect(movePhase instanceof MovePhase).toBeTruthy();
-      expect((movePhase as MovePhase).pokemon).not.toBe(playerPokemon[1]);
-
-      await game.phaseInterceptor.to(BerryPhase, false);
-      enemyPokemon.forEach(p => expect(p.hp).toBe(p.getMaxHp()));
-    }
-  );
-
-  it(
-    "should not activate from an ally's attack",
-    async () => {
-      game.override.enemyMoveset(Moves.SPLASH);
-
-      await game.startBattle([ Species.BLASTOISE, Species.CHARIZARD ]);
-
-      const playerPokemon = game.scene.getPlayerField();
-      const enemyPokemon = game.scene.getEnemyField();
-
-      game.move.select(Moves.SHELL_TRAP);
-      game.move.select(Moves.BULLDOZE, 1);
-
-      await game.phaseInterceptor.to(MoveEndPhase);
-
-      const movePhase = game.scene.getCurrentPhase();
-      expect(movePhase instanceof MovePhase).toBeTruthy();
-      expect((movePhase as MovePhase).pokemon).not.toBe(playerPokemon[1]);
-
-      const enemyStartingHp = enemyPokemon.map(p => p.hp);
-
-      await game.phaseInterceptor.to(BerryPhase, false);
-      enemyPokemon.forEach((p, i) => expect(p.hp).toBe(enemyStartingHp[i]));
-    }
-  );
-
-  it(
-    "should not activate from a subsequent physical attack",
-    async () => {
-      game.override.battleType("single");
-      vi.spyOn(allMoves[Moves.RAZOR_LEAF], "priority", "get").mockReturnValue(-4);
-
-      await game.startBattle([ Species.CHARIZARD ]);
-
-      const playerPokemon = game.scene.getPlayerPokemon()!;
-      const enemyPokemon = game.scene.getEnemyPokemon()!;
-
-      game.move.select(Moves.SHELL_TRAP);
-
-      await game.phaseInterceptor.to(BerryPhase, false);
-
-      expect(playerPokemon.getLastXMoves()[0].result).toBe(MoveResult.FAIL);
-      expect(enemyPokemon.hp).toBe(enemyPokemon.getMaxHp());
-    }
-  );
-});
diff --git a/src/test/moves/spotlight.test.ts b/src/test/moves/spotlight.test.ts
deleted file mode 100644
index 095f7d80bfe..00000000000
--- a/src/test/moves/spotlight.test.ts
+++ /dev/null
@@ -1,74 +0,0 @@
-import { BattlerIndex } from "#app/battle";
-import { TurnEndPhase } from "#app/phases/turn-end-phase";
-import { Moves } from "#enums/moves";
-import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
-import Phaser from "phaser";
-import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest";
-
-
-describe("Moves - Spotlight", () => {
-  let phaserGame: Phaser.Game;
-  let game: GameManager;
-
-  beforeAll(() => {
-    phaserGame = new Phaser.Game({
-      type: Phaser.HEADLESS,
-    });
-  });
-
-  afterEach(() => {
-    game.phaseInterceptor.restoreOg();
-  });
-
-  beforeEach(() => {
-    game = new GameManager(phaserGame);
-    game.override.battleType("double");
-    game.override.starterSpecies(Species.AMOONGUSS);
-    game.override.enemySpecies(Species.SNORLAX);
-    game.override.startingLevel(100);
-    game.override.enemyLevel(100);
-    game.override.moveset([ Moves.FOLLOW_ME, Moves.RAGE_POWDER, Moves.SPOTLIGHT, Moves.QUICK_ATTACK ]);
-    game.override.enemyMoveset([ Moves.FOLLOW_ME, Moves.SPLASH ]);
-  });
-
-  test(
-    "move should redirect attacks to the target",
-    async () => {
-      await game.classicMode.startBattle([ Species.AMOONGUSS, Species.CHARIZARD ]);
-
-      const enemyPokemon = game.scene.getEnemyField();
-
-      game.move.select(Moves.SPOTLIGHT, 0, BattlerIndex.ENEMY);
-      game.move.select(Moves.QUICK_ATTACK, 1, BattlerIndex.ENEMY_2);
-
-      await game.forceEnemyMove(Moves.SPLASH);
-      await game.forceEnemyMove(Moves.SPLASH);
-
-      await game.phaseInterceptor.to(TurnEndPhase, false);
-
-      expect(enemyPokemon[0].hp).toBeLessThan(enemyPokemon[0].getMaxHp());
-      expect(enemyPokemon[1].hp).toBe(enemyPokemon[1].getMaxHp());
-    }
-  );
-
-  test(
-    "move should cause other redirection moves to fail",
-    async () => {
-      await game.classicMode.startBattle([ Species.AMOONGUSS, Species.CHARIZARD ]);
-
-      const enemyPokemon = game.scene.getEnemyField();
-
-      game.move.select(Moves.SPOTLIGHT, 0, BattlerIndex.ENEMY);
-      game.move.select(Moves.QUICK_ATTACK, 1, BattlerIndex.ENEMY_2);
-
-      await game.forceEnemyMove(Moves.SPLASH);
-      await game.forceEnemyMove(Moves.FOLLOW_ME);
-
-      await game.phaseInterceptor.to("BerryPhase", false);
-
-      expect(enemyPokemon[0].hp).toBeLessThan(enemyPokemon[0].getMaxHp());
-      expect(enemyPokemon[1].hp).toBe(enemyPokemon[1].getMaxHp());
-    }
-  );
-});
diff --git a/src/test/moves/substitute.test.ts b/src/test/moves/substitute.test.ts
deleted file mode 100644
index 18b0c6ea536..00000000000
--- a/src/test/moves/substitute.test.ts
+++ /dev/null
@@ -1,602 +0,0 @@
-import { BattlerIndex } from "#app/battle";
-import { ArenaTagSide } from "#app/data/arena-tag";
-import { SubstituteTag, TrappedTag } from "#app/data/battler-tags";
-import { allMoves, StealHeldItemChanceAttr } from "#app/data/move";
-import { MoveResult } from "#app/field/pokemon";
-import type { CommandPhase } from "#app/phases/command-phase";
-import GameManager from "#app/test/utils/gameManager";
-import { Command } from "#app/ui/command-ui-handler";
-import { Mode } from "#app/ui/ui";
-import { Abilities } from "#enums/abilities";
-import { ArenaTagType } from "#enums/arena-tag-type";
-import { BattlerTagType } from "#enums/battler-tag-type";
-import { BerryType } from "#enums/berry-type";
-import { Moves } from "#enums/moves";
-import { Species } from "#enums/species";
-import { Stat } from "#enums/stat";
-import { StatusEffect } from "#enums/status-effect";
-import Phaser from "phaser";
-import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
-
-
-describe("Moves - Substitute", () => {
-  let phaserGame: Phaser.Game;
-  let game: GameManager;
-
-  beforeAll(() => {
-    phaserGame = new Phaser.Game({
-      type: Phaser.HEADLESS,
-    });
-  });
-
-  afterEach(() => {
-    game.phaseInterceptor.restoreOg();
-  });
-
-  beforeEach(() => {
-    game = new GameManager(phaserGame);
-
-    game.override
-      .battleType("single")
-      .moveset([ Moves.SUBSTITUTE, Moves.SWORDS_DANCE, Moves.TACKLE, Moves.SPLASH ])
-      .enemySpecies(Species.SNORLAX)
-      .enemyAbility(Abilities.INSOMNIA)
-      .enemyMoveset(Moves.SPLASH)
-      .startingLevel(100)
-      .enemyLevel(100);
-  });
-
-  it(
-    "should cause the user to take damage",
-    async () => {
-      await game.classicMode.startBattle([ Species.MAGIKARP ]);
-
-      const leadPokemon = game.scene.getPlayerPokemon()!;
-
-      game.move.select(Moves.SUBSTITUTE);
-
-      await game.phaseInterceptor.to("MoveEndPhase", false);
-
-      expect(leadPokemon.hp).toBe(Math.ceil(leadPokemon.getMaxHp() * 3 / 4));
-    }
-  );
-
-  it(
-    "should redirect enemy attack damage to the Substitute doll",
-    async () => {
-      game.override.enemyMoveset(Moves.TACKLE);
-
-      await game.classicMode.startBattle([ Species.SKARMORY ]);
-
-      const leadPokemon = game.scene.getPlayerPokemon()!;
-
-      game.move.select(Moves.SUBSTITUTE);
-
-      await game.phaseInterceptor.to("MoveEndPhase", false);
-
-      expect(leadPokemon.hp).toBe(Math.ceil(leadPokemon.getMaxHp() * 3 / 4));
-      expect(leadPokemon.getTag(BattlerTagType.SUBSTITUTE)).toBeDefined();
-      const postSubHp = leadPokemon.hp;
-
-      await game.phaseInterceptor.to("BerryPhase", false);
-
-      expect(leadPokemon.hp).toBe(postSubHp);
-      expect(leadPokemon.getTag(BattlerTagType.SUBSTITUTE)).toBeDefined();
-    }
-  );
-
-  it(
-    "should fade after redirecting more damage than its remaining HP",
-    async () => {
-      // Giga Impact OHKOs Magikarp if substitute isn't up
-      game.override.enemyMoveset(Moves.GIGA_IMPACT);
-      vi.spyOn(allMoves[Moves.GIGA_IMPACT], "accuracy", "get").mockReturnValue(100);
-
-      await game.classicMode.startBattle([ Species.MAGIKARP ]);
-
-      const leadPokemon = game.scene.getPlayerPokemon()!;
-
-      game.move.select(Moves.SUBSTITUTE);
-
-      await game.phaseInterceptor.to("MoveEndPhase", false);
-
-      expect(leadPokemon.hp).toBe(Math.ceil(leadPokemon.getMaxHp() * 3 / 4));
-      expect(leadPokemon.getTag(BattlerTagType.SUBSTITUTE)).toBeDefined();
-      const postSubHp = leadPokemon.hp;
-
-      await game.phaseInterceptor.to("BerryPhase", false);
-
-      expect(leadPokemon.hp).toBe(postSubHp);
-      expect(leadPokemon.getTag(BattlerTagType.SUBSTITUTE)).toBeUndefined();
-    }
-  );
-
-  it(
-    "should block stat changes from status moves",
-    async () => {
-      game.override.enemyMoveset(Moves.CHARM);
-
-      await game.classicMode.startBattle([ Species.MAGIKARP ]);
-
-      const leadPokemon = game.scene.getPlayerPokemon()!;
-
-      game.move.select(Moves.SUBSTITUTE);
-
-      await game.phaseInterceptor.to("BerryPhase", false);
-
-      expect(leadPokemon.getStatStage(Stat.ATK)).toBe(0);
-      expect(leadPokemon.getTag(BattlerTagType.SUBSTITUTE)).toBeDefined();
-    }
-  );
-
-  it(
-    "should be bypassed by sound-based moves",
-    async () => {
-      game.override.enemyMoveset(Moves.ECHOED_VOICE);
-
-      await game.classicMode.startBattle([ Species.BLASTOISE ]);
-
-      const leadPokemon = game.scene.getPlayerPokemon()!;
-
-      game.move.select(Moves.SUBSTITUTE);
-
-      await game.phaseInterceptor.to("MoveEndPhase");
-
-      expect(leadPokemon.getTag(BattlerTagType.SUBSTITUTE)).toBeDefined();
-      const postSubHp = leadPokemon.hp;
-
-      await game.phaseInterceptor.to("BerryPhase", false);
-
-      expect(leadPokemon.getTag(BattlerTagType.SUBSTITUTE)).toBeDefined();
-      expect(leadPokemon.hp).toBeLessThan(postSubHp);
-    }
-  );
-
-  it(
-    "should be bypassed by attackers with Infiltrator",
-    async () => {
-      game.override.enemyMoveset(Moves.TACKLE);
-      game.override.enemyAbility(Abilities.INFILTRATOR);
-
-      await game.classicMode.startBattle([ Species.BLASTOISE ]);
-
-      const leadPokemon = game.scene.getPlayerPokemon()!;
-
-      game.move.select(Moves.SUBSTITUTE);
-
-      await game.phaseInterceptor.to("MoveEndPhase");
-
-      expect(leadPokemon.getTag(BattlerTagType.SUBSTITUTE)).toBeDefined();
-      const postSubHp = leadPokemon.hp;
-
-      await game.phaseInterceptor.to("BerryPhase", false);
-
-      expect(leadPokemon.getTag(BattlerTagType.SUBSTITUTE)).toBeDefined();
-      expect(leadPokemon.hp).toBeLessThan(postSubHp);
-    }
-  );
-
-  it(
-    "shouldn't block the user's own status moves",
-    async () => {
-      await game.classicMode.startBattle([ Species.BLASTOISE ]);
-
-      const leadPokemon = game.scene.getPlayerPokemon()!;
-
-      game.move.select(Moves.SUBSTITUTE);
-
-      await game.phaseInterceptor.to("MoveEndPhase");
-      await game.toNextTurn();
-
-      game.move.select(Moves.SWORDS_DANCE);
-
-      await game.phaseInterceptor.to("MoveEndPhase", false);
-
-      expect(leadPokemon.getStatStage(Stat.ATK)).toBe(2);
-    }
-  );
-
-  it(
-    "shouldn't block moves that target the user's side of the field",
-    async () => {
-      game.override.moveset(Moves.LIGHT_SCREEN);
-
-      await game.classicMode.startBattle([ Species.BLASTOISE ]);
-
-      const leadPokemon = game.scene.getPlayerPokemon()!;
-      vi.spyOn(leadPokemon, "getMoveEffectiveness");
-
-      leadPokemon.addTag(BattlerTagType.SUBSTITUTE, 0, Moves.NONE, leadPokemon.id);
-
-      game.move.select(Moves.LIGHT_SCREEN);
-
-      await game.toNextTurn();
-
-      expect(leadPokemon.getMoveEffectiveness).not.toHaveReturnedWith(0);
-      expect(game.scene.arena.getTagOnSide(ArenaTagType.LIGHT_SCREEN, ArenaTagSide.PLAYER)).toBeDefined();
-    }
-  );
-
-  it(
-    "shouldn't block the opponent from setting hazards",
-    async () => {
-      game.override.enemyMoveset(Moves.STEALTH_ROCK);
-
-      await game.classicMode.startBattle([ Species.BLASTOISE ]);
-
-      const leadPokemon = game.scene.getPlayerPokemon()!;
-      vi.spyOn(leadPokemon, "getMoveEffectiveness");
-
-      game.move.select(Moves.SUBSTITUTE);
-
-      await game.toNextTurn();
-
-      expect(leadPokemon.getMoveEffectiveness).not.toHaveReturnedWith(0);
-      expect(game.scene.arena.getTagOnSide(ArenaTagType.STEALTH_ROCK, ArenaTagSide.PLAYER)).toBeDefined();
-    }
-  );
-
-  it(
-    "shouldn't block moves that target both sides of the field",
-    async () => {
-      game.override
-        .moveset(Moves.TRICK_ROOM)
-        .enemyMoveset(Moves.GRAVITY);
-
-      await game.classicMode.startBattle([ Species.BLASTOISE ]);
-
-      const pokemon = game.scene.getField(true);
-      pokemon.forEach(p => {
-        vi.spyOn(p, "getMoveEffectiveness");
-        p.addTag(BattlerTagType.SUBSTITUTE, 0, Moves.NONE, p.id);
-      });
-
-      game.move.select(Moves.TRICK_ROOM);
-
-      await game.toNextTurn();
-
-      pokemon.forEach(p => expect(p.getMoveEffectiveness).not.toHaveReturnedWith(0));
-      expect(game.scene.arena.getTag(ArenaTagType.TRICK_ROOM)).toBeDefined();
-      expect(game.scene.arena.getTag(ArenaTagType.GRAVITY)).toBeDefined();
-    }
-  );
-
-  it(
-    "should protect the user from flinching",
-    async () => {
-      game.override.enemyMoveset(Moves.FAKE_OUT);
-      game.override.startingLevel(1); // Ensures the Substitute will break
-
-      await game.classicMode.startBattle([ Species.BLASTOISE ]);
-
-      const leadPokemon = game.scene.getPlayerPokemon()!;
-      const enemyPokemon = game.scene.getEnemyPokemon()!;
-
-      leadPokemon.addTag(BattlerTagType.SUBSTITUTE, 0, Moves.NONE, leadPokemon.id);
-
-      game.move.select(Moves.TACKLE);
-
-      await game.phaseInterceptor.to("BerryPhase", false);
-
-      expect(enemyPokemon.hp).toBeLessThan(enemyPokemon.getMaxHp());
-    }
-  );
-
-  it(
-    "should protect the user from being trapped",
-    async () => {
-      vi.spyOn(allMoves[Moves.SAND_TOMB], "accuracy", "get").mockReturnValue(100);
-      game.override.enemyMoveset(Moves.SAND_TOMB);
-
-      await game.classicMode.startBattle([ Species.BLASTOISE ]);
-
-      const leadPokemon = game.scene.getPlayerPokemon()!;
-
-      leadPokemon.addTag(BattlerTagType.SUBSTITUTE, 0, Moves.NONE, leadPokemon.id);
-
-      game.move.select(Moves.SPLASH);
-
-      await game.phaseInterceptor.to("BerryPhase", false);
-
-      expect(leadPokemon.getTag(TrappedTag)).toBeUndefined();
-    }
-  );
-
-  it(
-    "should prevent the user's stats from being lowered",
-    async () => {
-      vi.spyOn(allMoves[Moves.LIQUIDATION], "chance", "get").mockReturnValue(100);
-      game.override.enemyMoveset(Moves.LIQUIDATION);
-
-      await game.classicMode.startBattle([ Species.BLASTOISE ]);
-
-      const leadPokemon = game.scene.getPlayerPokemon()!;
-
-      leadPokemon.addTag(BattlerTagType.SUBSTITUTE, 0, Moves.NONE, leadPokemon.id);
-
-      game.move.select(Moves.SPLASH);
-
-      await game.phaseInterceptor.to("BerryPhase", false);
-
-      expect(leadPokemon.getStatStage(Stat.DEF)).toBe(0);
-    }
-  );
-
-  it(
-    "should protect the user from being afflicted with status effects",
-    async () => {
-      game.override.enemyMoveset(Moves.NUZZLE);
-
-      await game.classicMode.startBattle([ Species.BLASTOISE ]);
-
-      const leadPokemon = game.scene.getPlayerPokemon()!;
-
-      leadPokemon.addTag(BattlerTagType.SUBSTITUTE, 0, Moves.NONE, leadPokemon.id);
-
-      game.move.select(Moves.SPLASH);
-
-      await game.phaseInterceptor.to("BerryPhase", false);
-
-      expect(leadPokemon.status?.effect).not.toBe(StatusEffect.PARALYSIS);
-    }
-  );
-
-  it(
-    "should prevent the user's items from being stolen",
-    async () => {
-      game.override.enemyMoveset(Moves.THIEF);
-      vi.spyOn(allMoves[Moves.THIEF], "attrs", "get").mockReturnValue([ new StealHeldItemChanceAttr(1.0) ]); // give Thief 100% steal rate
-      game.override.startingHeldItems([{ name: "BERRY", type: BerryType.SITRUS }]);
-
-      await game.classicMode.startBattle([ Species.BLASTOISE ]);
-
-      const leadPokemon = game.scene.getPlayerPokemon()!;
-
-      leadPokemon.addTag(BattlerTagType.SUBSTITUTE, 0, Moves.NONE, leadPokemon.id);
-
-      game.move.select(Moves.SPLASH);
-
-      await game.phaseInterceptor.to("BerryPhase", false);
-
-      expect(leadPokemon.getHeldItems().length).toBe(1);
-    }
-  );
-
-  it(
-    "should prevent the user's items from being removed",
-    async () => {
-      game.override.moveset([ Moves.KNOCK_OFF ]);
-      game.override.enemyHeldItems([{ name: "BERRY", type: BerryType.SITRUS }]);
-
-      await game.classicMode.startBattle([ Species.BLASTOISE ]);
-
-      const enemyPokemon = game.scene.getEnemyPokemon()!;
-
-      enemyPokemon.addTag(BattlerTagType.SUBSTITUTE, 0, Moves.NONE, enemyPokemon.id);
-      const enemyNumItems = enemyPokemon.getHeldItems().length;
-
-      game.move.select(Moves.KNOCK_OFF);
-
-      await game.phaseInterceptor.to("MoveEndPhase", false);
-
-      expect(enemyPokemon.getHeldItems().length).toBe(enemyNumItems);
-    }
-  );
-
-  it(
-    "move effect should prevent the user's berries from being stolen and eaten",
-    async () => {
-      game.override.enemyMoveset(Moves.BUG_BITE);
-      game.override.startingHeldItems([{ name: "BERRY", type: BerryType.SITRUS }]);
-
-      await game.classicMode.startBattle([ Species.BLASTOISE ]);
-
-      const leadPokemon = game.scene.getPlayerPokemon()!;
-      const enemyPokemon = game.scene.getEnemyPokemon()!;
-
-      leadPokemon.addTag(BattlerTagType.SUBSTITUTE, 0, Moves.NONE, leadPokemon.id);
-
-      game.move.select(Moves.TACKLE);
-
-      await game.phaseInterceptor.to("MoveEndPhase", false);
-      const enemyPostAttackHp = enemyPokemon.hp;
-
-      await game.phaseInterceptor.to("BerryPhase", false);
-
-      expect(leadPokemon.getHeldItems().length).toBe(1);
-      expect(enemyPokemon.hp).toBe(enemyPostAttackHp);
-    }
-  );
-
-  it(
-    "should prevent the user's stats from being reset by Clear Smog",
-    async () => {
-      game.override.enemyMoveset(Moves.CLEAR_SMOG);
-
-      await game.classicMode.startBattle([ Species.BLASTOISE ]);
-
-      const leadPokemon = game.scene.getPlayerPokemon()!;
-
-      leadPokemon.addTag(BattlerTagType.SUBSTITUTE, 0, Moves.NONE, leadPokemon.id);
-
-      game.move.select(Moves.SWORDS_DANCE);
-
-      await game.phaseInterceptor.to("BerryPhase", false);
-
-      expect(leadPokemon.getStatStage(Stat.ATK)).toBe(2);
-    }
-  );
-
-  it(
-    "should prevent the user from becoming confused",
-    async () => {
-      game.override.enemyMoveset(Moves.MAGICAL_TORQUE);
-      vi.spyOn(allMoves[Moves.MAGICAL_TORQUE], "chance", "get").mockReturnValue(100);
-
-      await game.classicMode.startBattle([ Species.BLASTOISE ]);
-
-      const leadPokemon = game.scene.getPlayerPokemon()!;
-
-      leadPokemon.addTag(BattlerTagType.SUBSTITUTE, 0, Moves.NONE, leadPokemon.id);
-
-      game.move.select(Moves.SWORDS_DANCE);
-
-      await game.phaseInterceptor.to("BerryPhase", false);
-
-      expect(leadPokemon.getTag(BattlerTagType.CONFUSED)).toBeUndefined();
-      expect(leadPokemon.getStatStage(Stat.ATK)).toBe(2);
-    }
-  );
-
-  it(
-    "should transfer to the switched in Pokemon when the source uses Baton Pass",
-    async () => {
-      game.override.moveset([ Moves.SUBSTITUTE, Moves.BATON_PASS ]);
-
-      await game.classicMode.startBattle([ Species.BLASTOISE, Species.CHARIZARD ]);
-
-      const leadPokemon = game.scene.getPlayerPokemon()!;
-
-      leadPokemon.addTag(BattlerTagType.SUBSTITUTE, 0, Moves.NONE, leadPokemon.id);
-
-      // Simulate a Baton switch for the player this turn
-      game.onNextPrompt("CommandPhase", Mode.COMMAND, () => {
-        (game.scene.getCurrentPhase() as CommandPhase).handleCommand(Command.POKEMON, 1, true);
-      });
-
-      await game.phaseInterceptor.to("MovePhase", false);
-
-      const switchedPokemon = game.scene.getPlayerPokemon()!;
-      const subTag = switchedPokemon.getTag(SubstituteTag)!;
-      expect(subTag).toBeDefined();
-      expect(subTag.hp).toBe(Math.floor(leadPokemon.getMaxHp() * 1 / 4));
-    }
-  );
-
-  it(
-    "should prevent the source's Rough Skin from activating when hit",
-    async () => {
-      game.override.enemyMoveset(Moves.TACKLE);
-      game.override.ability(Abilities.ROUGH_SKIN);
-
-      await game.classicMode.startBattle([ Species.BLASTOISE ]);
-
-      const enemyPokemon = game.scene.getEnemyPokemon()!;
-
-      game.move.select(Moves.SUBSTITUTE);
-
-      await game.phaseInterceptor.to("BerryPhase", false);
-
-      expect(enemyPokemon.hp).toBe(enemyPokemon.getMaxHp());
-    }
-  );
-
-  it(
-    "should prevent the source's Focus Punch from failing when hit",
-    async () => {
-      game.override.enemyMoveset(Moves.TACKLE);
-      game.override.moveset([ Moves.FOCUS_PUNCH ]);
-
-      // Make Focus Punch 40 power to avoid a KO
-      vi.spyOn(allMoves[Moves.FOCUS_PUNCH], "calculateBattlePower").mockReturnValue(40);
-
-      await game.classicMode.startBattle([ Species.BLASTOISE ]);
-
-      const playerPokemon = game.scene.getPlayerPokemon()!;
-      const enemyPokemon = game.scene.getEnemyPokemon()!;
-
-      playerPokemon.addTag(BattlerTagType.SUBSTITUTE, 0, Moves.NONE, playerPokemon.id);
-
-      game.move.select(Moves.FOCUS_PUNCH);
-
-      await game.phaseInterceptor.to("BerryPhase", false);
-
-      expect(playerPokemon.getLastXMoves()[0].result).toBe(MoveResult.SUCCESS);
-      expect(enemyPokemon.hp).toBeLessThan(enemyPokemon.getMaxHp());
-    }
-  );
-
-  it(
-    "should not allow Shell Trap to activate when attacked",
-    async () => {
-      game.override.enemyMoveset(Moves.TACKLE);
-      game.override.moveset([ Moves.SHELL_TRAP ]);
-
-      await game.classicMode.startBattle([ Species.BLASTOISE ]);
-
-      const playerPokemon = game.scene.getPlayerPokemon()!;
-
-      playerPokemon.addTag(BattlerTagType.SUBSTITUTE, 0, Moves.NONE, playerPokemon.id);
-
-      game.move.select(Moves.SHELL_TRAP);
-
-      await game.phaseInterceptor.to("BerryPhase", false);
-
-      expect(playerPokemon.getLastXMoves()[0].result).toBe(MoveResult.FAIL);
-    }
-  );
-
-  it(
-    "should not allow Beak Blast to burn opponents when hit",
-    async () => {
-      game.override.enemyMoveset(Moves.TACKLE);
-      game.override.moveset([ Moves.BEAK_BLAST ]);
-
-      await game.classicMode.startBattle([ Species.BLASTOISE ]);
-
-      const playerPokemon = game.scene.getPlayerPokemon()!;
-      const enemyPokemon = game.scene.getEnemyPokemon()!;
-
-      playerPokemon.addTag(BattlerTagType.SUBSTITUTE, 0, Moves.NONE, playerPokemon.id);
-
-      game.move.select(Moves.BEAK_BLAST);
-
-      await game.phaseInterceptor.to("MoveEndPhase");
-
-      expect(enemyPokemon.status?.effect).not.toBe(StatusEffect.BURN);
-    }
-  );
-
-  it(
-    "should cause incoming attacks to not activate Counter",
-    async () => {
-      game.override.enemyMoveset(Moves.TACKLE);
-      game.override.moveset([ Moves.COUNTER ]);
-
-      await game.classicMode.startBattle([ Species.BLASTOISE ]);
-
-      const playerPokemon = game.scene.getPlayerPokemon()!;
-      const enemyPokemon = game.scene.getEnemyPokemon()!;
-
-      playerPokemon.addTag(BattlerTagType.SUBSTITUTE, 0, Moves.NONE, playerPokemon.id);
-
-      game.move.select(Moves.COUNTER);
-
-      await game.phaseInterceptor.to("BerryPhase", false);
-
-      expect(playerPokemon.getLastXMoves()[0].result).toBe(MoveResult.FAIL);
-      expect(enemyPokemon.hp).toBe(enemyPokemon.getMaxHp());
-    }
-  );
-
-  it(
-    "should prevent Sappy Seed from applying its Leech Seed effect to the user",
-    async () => {
-      game.override.enemyMoveset(Moves.SAPPY_SEED);
-
-      await game.classicMode.startBattle([ Species.CHARIZARD ]);
-
-      const playerPokemon = game.scene.getPlayerPokemon()!;
-
-      playerPokemon.addTag(BattlerTagType.SUBSTITUTE, 0, Moves.NONE, playerPokemon.id);
-
-      game.move.select(Moves.SPLASH);
-
-      await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]); // enemy uses Sappy Seed first
-      await game.move.forceHit(); // forces Sappy Seed to hit
-      await game.phaseInterceptor.to("MoveEndPhase");
-
-      expect(playerPokemon.getTag(BattlerTagType.SEEDED)).toBeUndefined();
-    }
-  );
-});
diff --git a/src/test/moves/syrup_bomb.test.ts b/src/test/moves/syrup_bomb.test.ts
deleted file mode 100644
index ea2f8b6bab3..00000000000
--- a/src/test/moves/syrup_bomb.test.ts
+++ /dev/null
@@ -1,96 +0,0 @@
-import { Moves } from "#enums/moves";
-import { Species } from "#enums/species";
-import { Abilities } from "#enums/abilities";
-import { BattlerTagType } from "#enums/battler-tag-type";
-import { Stat } from "#enums/stat";
-import GameManager from "#test/utils/gameManager";
-import Phaser from "phaser";
-import { BattlerIndex } from "#app/battle";
-import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
-
-describe("Moves - SYRUP BOMB", () => {
-  let phaserGame: Phaser.Game;
-  let game: GameManager;
-
-  beforeAll(() => {
-    phaserGame = new Phaser.Game({
-      type: Phaser.HEADLESS,
-    });
-  });
-
-  afterEach(() => {
-    game.phaseInterceptor.restoreOg();
-  });
-
-  beforeEach(() => {
-    game = new GameManager(phaserGame);
-    game.override
-      .battleType("single")
-      .enemySpecies(Species.SNORLAX)
-      .enemyAbility(Abilities.BALL_FETCH)
-      .ability(Abilities.BALL_FETCH)
-      .startingLevel(30)
-      .enemyLevel(100)
-      .moveset([ Moves.SYRUP_BOMB, Moves.SPLASH ])
-      .enemyMoveset(Moves.SPLASH);
-  });
-
-  //Bulbapedia Reference: https://bulbapedia.bulbagarden.net/wiki/syrup_bomb_(move)
-
-  it("decreases the target Pokemon's speed stat once per turn for 3 turns",
-    async () => {
-      await game.classicMode.startBattle([ Species.MAGIKARP ]);
-
-      const targetPokemon = game.scene.getEnemyPokemon()!;
-      expect(targetPokemon.getStatStage(Stat.SPD)).toBe(0);
-
-      game.move.select(Moves.SYRUP_BOMB);
-      await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]);
-      await game.move.forceHit();
-      await game.toNextTurn();
-      expect(targetPokemon.getTag(BattlerTagType.SYRUP_BOMB)).toBeDefined();
-      expect(targetPokemon.getStatStage(Stat.SPD)).toBe(-1);
-
-      game.move.select(Moves.SPLASH);
-      await game.toNextTurn();
-      expect(targetPokemon.getTag(BattlerTagType.SYRUP_BOMB)).toBeDefined();
-      expect(targetPokemon.getStatStage(Stat.SPD)).toBe(-2);
-
-      game.move.select(Moves.SPLASH);
-      await game.toNextTurn();
-      expect(targetPokemon.getTag(BattlerTagType.SYRUP_BOMB)).toBeUndefined();
-      expect(targetPokemon.getStatStage(Stat.SPD)).toBe(-3);
-    }
-  );
-
-  it("does not affect Pokemon with the ability Bulletproof",
-    async () => {
-      game.override.enemyAbility(Abilities.BULLETPROOF);
-      await game.classicMode.startBattle([ Species.MAGIKARP ]);
-
-      const targetPokemon = game.scene.getEnemyPokemon()!;
-
-      game.move.select(Moves.SYRUP_BOMB);
-      await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]);
-      await game.move.forceHit();
-      await game.toNextTurn();
-      expect(targetPokemon.isFullHp()).toBe(true);
-      expect(targetPokemon.getTag(BattlerTagType.SYRUP_BOMB)).toBeUndefined();
-      expect(targetPokemon.getStatStage(Stat.SPD)).toBe(0);
-    }
-  );
-
-  it("stops lowering the target's speed if the user leaves the field", async () => {
-    await game.classicMode.startBattle([ Species.FEEBAS, Species.MILOTIC ]);
-
-    game.move.select(Moves.SYRUP_BOMB);
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]);
-    await game.move.forceHit();
-    await game.toNextTurn();
-
-    game.doSwitchPokemon(1);
-    await game.toNextTurn();
-
-    expect(game.scene.getEnemyPokemon()!.getStatStage(Stat.SPD)).toBe(-1);
-  });
-});
diff --git a/src/test/moves/tera_blast.test.ts b/src/test/moves/tera_blast.test.ts
deleted file mode 100644
index 44dc29f68b5..00000000000
--- a/src/test/moves/tera_blast.test.ts
+++ /dev/null
@@ -1,116 +0,0 @@
-import { BattlerIndex } from "#app/battle";
-import { Stat } from "#enums/stat";
-import { allMoves } from "#app/data/move";
-import { Type } from "#enums/type";
-import { Abilities } from "#app/enums/abilities";
-import { HitResult } from "#app/field/pokemon";
-import { Moves } from "#enums/moves";
-import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
-import Phaser from "phaser";
-import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
-
-describe("Moves - Tera Blast", () => {
-  let phaserGame: Phaser.Game;
-  let game: GameManager;
-  const moveToCheck = allMoves[Moves.TERA_BLAST];
-
-  beforeAll(() => {
-    phaserGame = new Phaser.Game({
-      type: Phaser.HEADLESS,
-    });
-  });
-
-  afterEach(() => {
-    game.phaseInterceptor.restoreOg();
-  });
-
-  beforeEach(() => {
-    game = new GameManager(phaserGame);
-
-    game.override
-      .battleType("single")
-      .disableCrits()
-      .starterSpecies(Species.FEEBAS)
-      .moveset([ Moves.TERA_BLAST ])
-      .ability(Abilities.BALL_FETCH)
-      .startingHeldItems([{ name: "TERA_SHARD", type: Type.FIRE }])
-      .enemySpecies(Species.MAGIKARP)
-      .enemyMoveset(Moves.SPLASH)
-      .enemyAbility(Abilities.BALL_FETCH)
-      .enemyLevel(20);
-
-    vi.spyOn(moveToCheck, "calculateBattlePower");
-  });
-
-  it("changes type to match user's tera type", async () => {
-    game.override
-      .enemySpecies(Species.FURRET)
-      .startingHeldItems([{ name: "TERA_SHARD", type: Type.FIGHTING }]);
-    await game.startBattle();
-    const enemyPokemon = game.scene.getEnemyPokemon()!;
-    vi.spyOn(enemyPokemon, "apply");
-
-    game.move.select(Moves.TERA_BLAST);
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]);
-    await game.phaseInterceptor.to("MoveEffectPhase");
-
-    expect(enemyPokemon.apply).toHaveReturnedWith(HitResult.SUPER_EFFECTIVE);
-  }, 20000);
-
-  it("increases power if user is Stellar tera type", async () => {
-    game.override.startingHeldItems([{ name: "TERA_SHARD", type: Type.STELLAR }]);
-
-    await game.startBattle();
-
-    game.move.select(Moves.TERA_BLAST);
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]);
-    await game.phaseInterceptor.to("MoveEffectPhase");
-
-    expect(moveToCheck.calculateBattlePower).toHaveReturnedWith(100);
-  }, 20000);
-
-  it("is super effective against terastallized targets if user is Stellar tera type", async () => {
-    game.override.startingHeldItems([{ name: "TERA_SHARD", type: Type.STELLAR }]);
-
-    await game.startBattle();
-
-    const enemyPokemon = game.scene.getEnemyPokemon()!;
-    vi.spyOn(enemyPokemon, "apply");
-    vi.spyOn(enemyPokemon, "isTerastallized").mockReturnValue(true);
-
-    game.move.select(Moves.TERA_BLAST);
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]);
-    await game.phaseInterceptor.to("MoveEffectPhase");
-
-    expect(enemyPokemon.apply).toHaveReturnedWith(HitResult.SUPER_EFFECTIVE);
-  });
-
-  // Currently abilities are bugged and can't see when a move's category is changed
-  it.todo("uses the higher stat of the user's Atk and SpAtk for damage calculation", async () => {
-    game.override.enemyAbility(Abilities.TOXIC_DEBRIS);
-    await game.startBattle();
-
-    const playerPokemon = game.scene.getPlayerPokemon()!;
-    playerPokemon.stats[Stat.ATK] = 100;
-    playerPokemon.stats[Stat.SPATK] = 1;
-
-    game.move.select(Moves.TERA_BLAST);
-    await game.phaseInterceptor.to("TurnEndPhase");
-    expect(game.scene.getEnemyPokemon()!.battleData.abilityRevealed).toBe(true);
-  }, 20000);
-
-  it("causes stat drops if user is Stellar tera type", async () => {
-    game.override.startingHeldItems([{ name: "TERA_SHARD", type: Type.STELLAR }]);
-    await game.startBattle();
-
-    const playerPokemon = game.scene.getPlayerPokemon()!;
-
-    game.move.select(Moves.TERA_BLAST);
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]);
-    await game.phaseInterceptor.to("MoveEndPhase");
-
-    expect(playerPokemon.getStatStage(Stat.SPATK)).toBe(-1);
-    expect(playerPokemon.getStatStage(Stat.ATK)).toBe(-1);
-  }, 20000);
-});
diff --git a/src/test/moves/thousand_arrows.test.ts b/src/test/moves/thousand_arrows.test.ts
deleted file mode 100644
index 976b4352ee4..00000000000
--- a/src/test/moves/thousand_arrows.test.ts
+++ /dev/null
@@ -1,99 +0,0 @@
-import { Abilities } from "#app/enums/abilities";
-import { BattlerTagType } from "#app/enums/battler-tag-type";
-import { BerryPhase } from "#app/phases/berry-phase";
-import { MoveEffectPhase } from "#app/phases/move-effect-phase";
-import { Moves } from "#enums/moves";
-import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
-import Phaser from "phaser";
-import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
-
-
-describe("Moves - Thousand Arrows", () => {
-  let phaserGame: Phaser.Game;
-  let game: GameManager;
-
-  beforeAll(() => {
-    phaserGame = new Phaser.Game({
-      type: Phaser.HEADLESS,
-    });
-  });
-
-  afterEach(() => {
-    game.phaseInterceptor.restoreOg();
-  });
-
-  beforeEach(() => {
-    game = new GameManager(phaserGame);
-    game.override.battleType("single");
-    game.override.enemySpecies(Species.TOGETIC);
-    game.override.startingLevel(100);
-    game.override.enemyLevel(100);
-    game.override.moveset([ Moves.THOUSAND_ARROWS ]);
-    game.override.enemyMoveset([ Moves.SPLASH, Moves.SPLASH, Moves.SPLASH, Moves.SPLASH ]);
-  });
-
-  it(
-    "move should hit and ground Flying-type targets",
-    async () => {
-      await game.startBattle([ Species.ILLUMISE ]);
-
-      const enemyPokemon = game.scene.getEnemyPokemon()!;
-
-      game.move.select(Moves.THOUSAND_ARROWS);
-
-      await game.phaseInterceptor.to(MoveEffectPhase, false);
-      // Enemy should not be grounded before move effect is applied
-      expect(enemyPokemon.getTag(BattlerTagType.IGNORE_FLYING)).toBeUndefined();
-
-      await game.phaseInterceptor.to(BerryPhase, false);
-
-      expect(enemyPokemon.getTag(BattlerTagType.IGNORE_FLYING)).toBeDefined();
-      expect(enemyPokemon.hp).toBeLessThan(enemyPokemon.getMaxHp());
-    }
-  );
-
-  it(
-    "move should hit and ground targets with Levitate",
-    async () => {
-      game.override.enemySpecies(Species.SNORLAX);
-      game.override.enemyAbility(Abilities.LEVITATE);
-
-      await game.startBattle([ Species.ILLUMISE ]);
-
-      const enemyPokemon = game.scene.getEnemyPokemon()!;
-
-      game.move.select(Moves.THOUSAND_ARROWS);
-
-      await game.phaseInterceptor.to(MoveEffectPhase, false);
-      // Enemy should not be grounded before move effect is applied
-      expect(enemyPokemon.getTag(BattlerTagType.IGNORE_FLYING)).toBeUndefined();
-
-      await game.phaseInterceptor.to(BerryPhase, false);
-
-      expect(enemyPokemon.getTag(BattlerTagType.IGNORE_FLYING)).toBeDefined();
-      expect(enemyPokemon.hp).toBeLessThan(enemyPokemon.getMaxHp());
-    }
-  );
-
-  it(
-    "move should hit and ground targets under the effects of Magnet Rise",
-    async () => {
-      game.override.enemySpecies(Species.SNORLAX);
-
-      await game.startBattle([ Species.ILLUMISE ]);
-
-      const enemyPokemon = game.scene.getEnemyPokemon()!;
-
-      enemyPokemon.addTag(BattlerTagType.FLOATING, undefined, Moves.MAGNET_RISE);
-
-      game.move.select(Moves.THOUSAND_ARROWS);
-
-      await game.phaseInterceptor.to(BerryPhase, false);
-
-      expect(enemyPokemon.getTag(BattlerTagType.FLOATING)).toBeUndefined();
-      expect(enemyPokemon.getTag(BattlerTagType.IGNORE_FLYING)).toBeDefined();
-      expect(enemyPokemon.hp).toBeLessThan(enemyPokemon.getMaxHp());
-    }
-  );
-});
diff --git a/src/test/moves/transform.test.ts b/src/test/moves/transform.test.ts
deleted file mode 100644
index adb97b42af7..00000000000
--- a/src/test/moves/transform.test.ts
+++ /dev/null
@@ -1,119 +0,0 @@
-import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
-import Phaser from "phaser";
-import GameManager from "#app/test/utils/gameManager";
-import { Species } from "#enums/species";
-import { TurnEndPhase } from "#app/phases/turn-end-phase";
-import { Moves } from "#enums/moves";
-import { Stat, BATTLE_STATS, EFFECTIVE_STATS } from "#enums/stat";
-import { Abilities } from "#enums/abilities";
-
-// TODO: Add more tests once Transform is fully implemented
-describe("Moves - Transform", () => {
-  let phaserGame: Phaser.Game;
-  let game: GameManager;
-
-  beforeAll(() => {
-    phaserGame = new Phaser.Game({
-      type: Phaser.HEADLESS,
-    });
-  });
-
-  afterEach(() => {
-    game.phaseInterceptor.restoreOg();
-  });
-
-  beforeEach(() => {
-    game = new GameManager(phaserGame);
-    game.override
-      .battleType("single")
-      .enemySpecies(Species.MEW)
-      .enemyLevel(200)
-      .enemyAbility(Abilities.BEAST_BOOST)
-      .enemyPassiveAbility(Abilities.BALL_FETCH)
-      .enemyMoveset(Moves.SPLASH)
-      .ability(Abilities.INTIMIDATE)
-      .moveset([ Moves.TRANSFORM ]);
-  });
-
-  it("should copy species, ability, gender, all stats except HP, all stat stages, moveset, and types of target", async () => {
-    await game.classicMode.startBattle([ Species.DITTO ]);
-
-    game.move.select(Moves.TRANSFORM);
-    await game.phaseInterceptor.to(TurnEndPhase);
-
-    const player = game.scene.getPlayerPokemon()!;
-    const enemy = game.scene.getEnemyPokemon()!;
-
-    expect(player.getSpeciesForm().speciesId).toBe(enemy.getSpeciesForm().speciesId);
-    expect(player.getAbility()).toBe(enemy.getAbility());
-    expect(player.getGender()).toBe(enemy.getGender());
-
-    expect(player.getStat(Stat.HP, false)).not.toBe(enemy.getStat(Stat.HP));
-    for (const s of EFFECTIVE_STATS) {
-      expect(player.getStat(s, false)).toBe(enemy.getStat(s, false));
-    }
-
-    for (const s of BATTLE_STATS) {
-      expect(player.getStatStage(s)).toBe(enemy.getStatStage(s));
-    }
-
-    const playerMoveset = player.getMoveset();
-    const enemyMoveset = player.getMoveset();
-
-    expect(playerMoveset.length).toBe(enemyMoveset.length);
-    for (let i = 0; i < playerMoveset.length && i < enemyMoveset.length; i++) {
-      expect(playerMoveset[i]?.moveId).toBe(enemyMoveset[i]?.moveId);
-    }
-
-    const playerTypes = player.getTypes();
-    const enemyTypes = enemy.getTypes();
-
-    expect(playerTypes.length).toBe(enemyTypes.length);
-    for (let i = 0; i < playerTypes.length && i < enemyTypes.length; i++) {
-      expect(playerTypes[i]).toBe(enemyTypes[i]);
-    }
-  });
-
-  it("should copy in-battle overridden stats", async () => {
-    game.override.enemyMoveset([ Moves.POWER_SPLIT ]);
-
-    await game.classicMode.startBattle([ Species.DITTO ]);
-
-    const player = game.scene.getPlayerPokemon()!;
-    const enemy = game.scene.getEnemyPokemon()!;
-
-    const avgAtk = Math.floor((player.getStat(Stat.ATK, false) + enemy.getStat(Stat.ATK, false)) / 2);
-    const avgSpAtk = Math.floor((player.getStat(Stat.SPATK, false) + enemy.getStat(Stat.SPATK, false)) / 2);
-
-    game.move.select(Moves.TRANSFORM);
-    await game.phaseInterceptor.to(TurnEndPhase);
-
-    expect(player.getStat(Stat.ATK, false)).toBe(avgAtk);
-    expect(enemy.getStat(Stat.ATK, false)).toBe(avgAtk);
-
-    expect(player.getStat(Stat.SPATK, false)).toBe(avgSpAtk);
-    expect(enemy.getStat(Stat.SPATK, false)).toBe(avgSpAtk);
-  });
-
-  it("should set each move's pp to a maximum of 5", async () => {
-    game.override.enemyMoveset([ Moves.SWORDS_DANCE, Moves.GROWL, Moves.SKETCH, Moves.RECOVER ]);
-
-    await game.classicMode.startBattle([ Species.DITTO ]);
-    const player = game.scene.getPlayerPokemon()!;
-
-    game.move.select(Moves.TRANSFORM);
-    await game.phaseInterceptor.to(TurnEndPhase);
-
-    player.getMoveset().forEach(move => {
-      // Should set correct maximum PP without touching `ppUp`
-      if (move) {
-        if (move.moveId === Moves.SKETCH) {
-          expect(move.getMovePp()).toBe(1);
-        } else {
-          expect(move.getMovePp()).toBe(5);
-        }
-        expect(move.ppUp).toBe(0);
-      }
-    });
-  });
-});
diff --git a/src/test/moves/whirlwind.test.ts b/src/test/moves/whirlwind.test.ts
deleted file mode 100644
index 69232bee43a..00000000000
--- a/src/test/moves/whirlwind.test.ts
+++ /dev/null
@@ -1,159 +0,0 @@
-import { BattlerTagType } from "#enums/battler-tag-type";
-import { Challenges } from "#enums/challenges";
-import { Type } from "#enums/type";
-import { MoveResult } from "#app/field/pokemon";
-import { Abilities } from "#enums/abilities";
-import { Moves } from "#enums/moves";
-import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
-import Phaser from "phaser";
-import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
-import { Status } from "#app/data/status-effect";
-import { StatusEffect } from "#enums/status-effect";
-
-describe("Moves - Whirlwind", () => {
-  let phaserGame: Phaser.Game;
-  let game: GameManager;
-
-  beforeAll(() => {
-    phaserGame = new Phaser.Game({
-      type: Phaser.HEADLESS,
-    });
-  });
-
-  afterEach(() => {
-    game.phaseInterceptor.restoreOg();
-  });
-
-  beforeEach(() => {
-    game = new GameManager(phaserGame);
-    game.override
-      .battleType("single")
-      .moveset(Moves.SPLASH)
-      .enemyAbility(Abilities.BALL_FETCH)
-      .enemyMoveset([ Moves.SPLASH, Moves.WHIRLWIND ])
-      .enemySpecies(Species.PIDGEY);
-  });
-
-  it.each([
-    { move: Moves.FLY, name: "Fly" },
-    { move: Moves.BOUNCE, name: "Bounce" },
-    { move: Moves.SKY_DROP, name: "Sky Drop" },
-  ])("should not hit a flying target: $name (=$move)", async ({ move }) => {
-    game.override.moveset([ move ]);
-    await game.classicMode.startBattle([ Species.STARAPTOR ]);
-
-    const staraptor = game.scene.getPlayerPokemon()!;
-
-    game.move.select(move);
-    await game.forceEnemyMove(Moves.WHIRLWIND);
-
-    await game.phaseInterceptor.to("BerryPhase", false);
-
-    expect(staraptor.findTag((t) => t.tagType === BattlerTagType.FLYING)).toBeDefined();
-    expect(game.scene.getEnemyPokemon()!.getLastXMoves(1)[0].result).toBe(MoveResult.MISS);
-  });
-
-  it("should force switches randomly", async () => {
-    await game.classicMode.startBattle([ Species.BULBASAUR, Species.CHARMANDER, Species.SQUIRTLE ]);
-
-    const [ bulbasaur, charmander, squirtle ] = game.scene.getPlayerParty();
-
-    // Turn 1: Mock an RNG call that calls for switching to 1st backup Pokemon (Charmander)
-    vi.spyOn(game.scene, "randBattleSeedInt").mockImplementation((range, min: number = 0) => {
-      return min;
-    });
-    game.move.select(Moves.SPLASH);
-    await game.forceEnemyMove(Moves.WHIRLWIND);
-    await game.toNextTurn();
-
-    expect(bulbasaur.isOnField()).toBe(false);
-    expect(charmander.isOnField()).toBe(true);
-    expect(squirtle.isOnField()).toBe(false);
-
-    // Turn 2: Mock an RNG call that calls for switching to 2nd backup Pokemon (Squirtle)
-    vi.spyOn(game.scene, "randBattleSeedInt").mockImplementation((range, min: number = 0) => {
-      return min + 1;
-    });
-    game.move.select(Moves.SPLASH);
-    await game.forceEnemyMove(Moves.WHIRLWIND);
-    await game.toNextTurn();
-
-    expect(bulbasaur.isOnField()).toBe(false);
-    expect(charmander.isOnField()).toBe(false);
-    expect(squirtle.isOnField()).toBe(true);
-  });
-
-  it("should not force a switch to a challenge-ineligible Pokemon", async () => {
-    // Mono-Water challenge, Eevee is ineligible
-    game.challengeMode.addChallenge(Challenges.SINGLE_TYPE, Type.WATER + 1, 0);
-    await game.challengeMode.startBattle([ Species.LAPRAS, Species.EEVEE, Species.TOXAPEX, Species.PRIMARINA ]);
-
-    const [ lapras, eevee, toxapex, primarina ] = game.scene.getPlayerParty();
-
-    // Turn 1: Mock an RNG call that would normally call for switching to Eevee, but it is ineligible
-    vi.spyOn(game.scene, "randBattleSeedInt").mockImplementation((range, min: number = 0) => {
-      return min;
-    });
-    game.move.select(Moves.SPLASH);
-    await game.forceEnemyMove(Moves.WHIRLWIND);
-    await game.toNextTurn();
-
-    expect(lapras.isOnField()).toBe(false);
-    expect(eevee.isOnField()).toBe(false);
-    expect(toxapex.isOnField()).toBe(true);
-    expect(primarina.isOnField()).toBe(false);
-  });
-
-  it("should not force a switch to a fainted Pokemon", async () => {
-    await game.classicMode.startBattle([ Species.LAPRAS, Species.EEVEE, Species.TOXAPEX, Species.PRIMARINA ]);
-
-    const [ lapras, eevee, toxapex, primarina ] = game.scene.getPlayerParty();
-
-    // Turn 1: Eevee faints
-    eevee.hp = 0;
-    eevee.status = new Status(StatusEffect.FAINT);
-    expect(eevee.isFainted()).toBe(true);
-    game.move.select(Moves.SPLASH);
-    await game.forceEnemyMove(Moves.SPLASH);
-    await game.toNextTurn();
-
-    // Turn 2: Mock an RNG call that would normally call for switching to Eevee, but it is fainted
-    vi.spyOn(game.scene, "randBattleSeedInt").mockImplementation((range, min: number = 0) => {
-      return min;
-    });
-    game.move.select(Moves.SPLASH);
-    await game.forceEnemyMove(Moves.WHIRLWIND);
-    await game.toNextTurn();
-
-    expect(lapras.isOnField()).toBe(false);
-    expect(eevee.isOnField()).toBe(false);
-    expect(toxapex.isOnField()).toBe(true);
-    expect(primarina.isOnField()).toBe(false);
-  });
-
-  it("should not force a switch if there are no available Pokemon to switch into", async () => {
-    await game.classicMode.startBattle([ Species.LAPRAS, Species.EEVEE ]);
-
-    const [ lapras, eevee ] = game.scene.getPlayerParty();
-
-    // Turn 1: Eevee faints
-    eevee.hp = 0;
-    eevee.status = new Status(StatusEffect.FAINT);
-    expect(eevee.isFainted()).toBe(true);
-    game.move.select(Moves.SPLASH);
-    await game.forceEnemyMove(Moves.SPLASH);
-    await game.toNextTurn();
-
-    // Turn 2: Mock an RNG call that would normally call for switching to Eevee, but it is fainted
-    vi.spyOn(game.scene, "randBattleSeedInt").mockImplementation((range, min: number = 0) => {
-      return min;
-    });
-    game.move.select(Moves.SPLASH);
-    await game.forceEnemyMove(Moves.WHIRLWIND);
-    await game.toNextTurn();
-
-    expect(lapras.isOnField()).toBe(true);
-    expect(eevee.isOnField()).toBe(false);
-  });
-});
diff --git a/src/test/moves/wide_guard.test.ts b/src/test/moves/wide_guard.test.ts
deleted file mode 100644
index c25a700c981..00000000000
--- a/src/test/moves/wide_guard.test.ts
+++ /dev/null
@@ -1,124 +0,0 @@
-import Phaser from "phaser";
-import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest";
-import GameManager from "../utils/gameManager";
-import { Species } from "#enums/species";
-import { Abilities } from "#enums/abilities";
-import { Moves } from "#enums/moves";
-import { Stat } from "#enums/stat";
-import { BerryPhase } from "#app/phases/berry-phase";
-import { CommandPhase } from "#app/phases/command-phase";
-
-
-describe("Moves - Wide Guard", () => {
-  let phaserGame: Phaser.Game;
-  let game: GameManager;
-
-  beforeAll(() => {
-    phaserGame = new Phaser.Game({
-      type: Phaser.HEADLESS,
-    });
-  });
-
-  afterEach(() => {
-    game.phaseInterceptor.restoreOg();
-  });
-
-  beforeEach(() => {
-    game = new GameManager(phaserGame);
-
-    game.override.battleType("double");
-
-    game.override.moveset([ Moves.WIDE_GUARD, Moves.SPLASH, Moves.SURF ]);
-
-    game.override.enemySpecies(Species.SNORLAX);
-    game.override.enemyMoveset([ Moves.SWIFT ]);
-    game.override.enemyAbility(Abilities.INSOMNIA);
-
-    game.override.startingLevel(100);
-    game.override.enemyLevel(100);
-  });
-
-  test(
-    "should protect the user and allies from multi-target attack moves",
-    async () => {
-      await game.startBattle([ Species.CHARIZARD, Species.BLASTOISE ]);
-
-      const leadPokemon = game.scene.getPlayerField();
-
-      game.move.select(Moves.WIDE_GUARD);
-
-      await game.phaseInterceptor.to(CommandPhase);
-
-      game.move.select(Moves.SPLASH, 1);
-
-      await game.phaseInterceptor.to(BerryPhase, false);
-
-      leadPokemon.forEach(p => expect(p.hp).toBe(p.getMaxHp()));
-    }
-  );
-
-  test(
-    "should protect the user and allies from multi-target status moves",
-    async () => {
-      game.override.enemyMoveset([ Moves.GROWL ]);
-
-      await game.startBattle([ Species.CHARIZARD, Species.BLASTOISE ]);
-
-      const leadPokemon = game.scene.getPlayerField();
-
-      game.move.select(Moves.WIDE_GUARD);
-
-      await game.phaseInterceptor.to(CommandPhase);
-
-      game.move.select(Moves.SPLASH, 1);
-
-      await game.phaseInterceptor.to(BerryPhase, false);
-
-      leadPokemon.forEach(p => expect(p.getStatStage(Stat.ATK)).toBe(0));
-    }
-  );
-
-  test(
-    "should not protect the user and allies from single-target moves",
-    async () => {
-      game.override.enemyMoveset([ Moves.TACKLE ]);
-
-      await game.startBattle([ Species.CHARIZARD, Species.BLASTOISE ]);
-
-      const leadPokemon = game.scene.getPlayerField();
-
-      game.move.select(Moves.WIDE_GUARD);
-
-      await game.phaseInterceptor.to(CommandPhase);
-
-      game.move.select(Moves.SPLASH, 1);
-
-      await game.phaseInterceptor.to(BerryPhase, false);
-
-      expect(leadPokemon.some(p => p.hp < p.getMaxHp())).toBeTruthy();
-    }
-  );
-
-  test(
-    "should protect the user from its ally's multi-target move",
-    async () => {
-      game.override.enemyMoveset([ Moves.SPLASH ]);
-
-      await game.startBattle([ Species.CHARIZARD, Species.BLASTOISE ]);
-
-      const leadPokemon = game.scene.getPlayerField();
-      const enemyPokemon = game.scene.getEnemyField();
-
-      game.move.select(Moves.WIDE_GUARD);
-
-      await game.phaseInterceptor.to(CommandPhase);
-
-      game.move.select(Moves.SURF, 1);
-
-      await game.phaseInterceptor.to(BerryPhase, false);
-
-      expect(leadPokemon[0].hp).toBe(leadPokemon[0].getMaxHp());
-      enemyPokemon.forEach(p => expect(p.hp).toBeLessThan(p.getMaxHp()));
-    }
-  );
-});
diff --git a/src/test/pre.test.ts b/src/test/pre.test.ts
deleted file mode 100644
index 6ed29dce481..00000000000
--- a/src/test/pre.test.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import Overrides, { defaultOverrides } from "#app/overrides";
-import { expect, test } from "vitest";
-
-test("Overrides are default values", () => {
-  expect(Overrides).toEqual(defaultOverrides);
-});
diff --git a/src/test/ui/type-hints.test.ts b/src/test/ui/type-hints.test.ts
deleted file mode 100644
index 9046d82c1df..00000000000
--- a/src/test/ui/type-hints.test.ts
+++ /dev/null
@@ -1,89 +0,0 @@
-import { Button } from "#app/enums/buttons";
-import { Moves } from "#app/enums/moves";
-import { Species } from "#app/enums/species";
-import { CommandPhase } from "#app/phases/command-phase";
-import FightUiHandler from "#app/ui/fight-ui-handler";
-import { Mode } from "#app/ui/ui";
-import GameManager from "#test/utils/gameManager";
-import Phaser from "phaser";
-import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
-import type MockText from "#test/utils/mocks/mocksContainer/mockText";
-import i18next from "i18next";
-
-describe("UI - Type Hints", () => {
-  let phaserGame: Phaser.Game;
-  let game: GameManager;
-
-  beforeAll(() => {
-    phaserGame = new Phaser.Game({
-      type: Phaser.HEADLESS,
-    });
-  });
-
-  afterEach(() => {
-    game.phaseInterceptor.restoreOg();
-  });
-
-  beforeEach(async () => {
-    game = new GameManager(phaserGame);
-    game.settings.typeHints(true); //activate type hints
-    game.override.battleType("single").startingLevel(100).startingWave(1).enemyMoveset(Moves.SPLASH);
-  });
-
-  it("check immunity color", async () => {
-    game.override
-      .battleType("single")
-      .startingLevel(100)
-      .startingWave(1)
-      .enemySpecies(Species.FLORGES)
-      .enemyMoveset(Moves.SPLASH)
-      .moveset([ Moves.DRAGON_CLAW ]);
-    game.settings.typeHints(true); //activate type hints
-
-    await game.startBattle([ Species.RAYQUAZA ]);
-
-    game.onNextPrompt("CommandPhase", Mode.COMMAND, () => {
-      const { ui } = game.scene;
-      const handler = ui.getHandler<FightUiHandler>();
-      handler.processInput(Button.ACTION); // select "Fight"
-      game.phaseInterceptor.unlock();
-    });
-
-    game.onNextPrompt("CommandPhase", Mode.FIGHT, () => {
-      const { ui } = game.scene;
-      const movesContainer = ui.getByName<Phaser.GameObjects.Container>(FightUiHandler.MOVES_CONTAINER_NAME);
-      const dragonClawText = movesContainer
-        .getAll<Phaser.GameObjects.Text>()
-        .find((text) => text.text === i18next.t("move:dragonClaw.name"))! as unknown as MockText;
-
-      expect.soft(dragonClawText.color).toBe("#929292");
-      ui.getHandler().processInput(Button.ACTION);
-    });
-    await game.phaseInterceptor.to(CommandPhase);
-  });
-
-  it("check status move color", async () => {
-    game.override.enemySpecies(Species.FLORGES).moveset([ Moves.GROWL ]);
-
-    await game.startBattle([ Species.RAYQUAZA ]);
-
-    game.onNextPrompt("CommandPhase", Mode.COMMAND, () => {
-      const { ui } = game.scene;
-      const handler = ui.getHandler<FightUiHandler>();
-      handler.processInput(Button.ACTION); // select "Fight"
-      game.phaseInterceptor.unlock();
-    });
-
-    game.onNextPrompt("CommandPhase", Mode.FIGHT, () => {
-      const { ui } = game.scene;
-      const movesContainer = ui.getByName<Phaser.GameObjects.Container>(FightUiHandler.MOVES_CONTAINER_NAME);
-      const growlText = movesContainer
-        .getAll<Phaser.GameObjects.Text>()
-        .find((text) => text.text === i18next.t("move:growl.name"))! as unknown as MockText;
-
-      expect.soft(growlText.color).toBe(undefined);
-      ui.getHandler().processInput(Button.ACTION);
-    });
-    await game.phaseInterceptor.to(CommandPhase);
-  });
-});
diff --git a/src/test/utils/mocks/mockConsoleLog.ts b/src/test/utils/mocks/mockConsoleLog.ts
deleted file mode 100644
index 9c3cbca6bb6..00000000000
--- a/src/test/utils/mocks/mockConsoleLog.ts
+++ /dev/null
@@ -1,82 +0,0 @@
-const MockConsoleLog = (_logDisabled = false, _phaseText = false) => {
-  let logs: any[] = [];
-  const logDisabled: boolean = _logDisabled;
-  const phaseText: boolean = _phaseText;
-  const originalLog = console.log;
-  const originalError = console.error;
-  const originalDebug = console.debug;
-  const originalWarn = console.warn;
-  const notified: any[] = [];
-
-  const blacklist = [ "Phaser", "variant icon does not exist", "Texture \"%s\" not found" ];
-  const whitelist = [ "Phase" ];
-
-  return ({
-    log(...args) {
-      const argsStr = this.getStr(args);
-      logs.push(argsStr);
-      if (logDisabled && (!phaseText)) {
-        return;
-      }
-      if ((phaseText && !whitelist.some((b) => argsStr.includes(b))) || blacklist.some((b) => argsStr.includes(b))) {
-        return;
-      }
-      originalLog(args);
-    },
-    error(...args) {
-      const argsStr = this.getStr(args);
-      logs.push(argsStr);
-      originalError(args); // Appelle le console.error originel
-    },
-    debug(...args) {
-      const argsStr = this.getStr(args);
-      logs.push(argsStr);
-      if (logDisabled && (!phaseText)) {
-        return;
-      }
-      if (!whitelist.some((b) => argsStr.includes(b)) || blacklist.some((b) => argsStr.includes(b))) {
-        return;
-      }
-      originalDebug(args);
-    },
-    warn(...args) {
-      const argsStr = this.getStr(args);
-      logs.push(args);
-      if (logDisabled && (!phaseText)) {
-        return;
-      }
-      if (!whitelist.some((b) => argsStr.includes(b)) || blacklist.some((b) => argsStr.includes(b))) {
-        return;
-      }
-      originalWarn(args);
-    },
-    notify(msg) {
-      originalLog(msg);
-      notified.push(msg);
-    },
-    getLogs() {
-      return logs;
-    },
-    clearLogs() {
-      logs = [];
-    },
-    getStr(...args) {
-      return args.map(arg => {
-        if (typeof arg === "object" && arg !== null) {
-          // Handle objects including arrays
-          return JSON.stringify(arg, (key, value) =>
-            typeof value === "bigint" ? value.toString() : value
-          );
-        } else if (typeof arg === "bigint") {
-          // Handle BigInt values
-          return arg.toString();
-        } else {
-          // Handle all other types
-          return arg.toString();
-        }
-      }).join(";");
-    },
-  });
-};
-
-export default MockConsoleLog;
diff --git a/src/test/utils/mocks/mocksContainer/mockPolygon.ts b/src/test/utils/mocks/mocksContainer/mockPolygon.ts
deleted file mode 100644
index 12b60904a96..00000000000
--- a/src/test/utils/mocks/mocksContainer/mockPolygon.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import MockContainer from "#test/utils/mocks/mocksContainer/mockContainer";
-
-
-export default class MockPolygon extends MockContainer {
-  constructor(textureManager, x, y, content, fillColor, fillAlpha) {
-    super(textureManager, x, y);
-  }
-}
-
diff --git a/src/timed-event-manager.ts b/src/timed-event-manager.ts
index 7a9f0e59993..163afdc098b 100644
--- a/src/timed-event-manager.ts
+++ b/src/timed-event-manager.ts
@@ -1,7 +1,7 @@
 import { globalScene } from "#app/global-scene";
 import { TextStyle, addTextObject } from "#app/ui/text";
-import type { nil } from "#app/utils";
-import { isNullOrUndefined } from "#app/utils";
+import type { nil } from "#app/utils/common";
+import { isNullOrUndefined } from "#app/utils/common";
 import i18next from "i18next";
 import { Species } from "#enums/species";
 import type { WeatherPoolEntry } from "#app/data/weather";
@@ -9,11 +9,12 @@ import { WeatherType } from "#enums/weather-type";
 import { CLASSIC_CANDY_FRIENDSHIP_MULTIPLIER } from "./data/balance/starters";
 import { MysteryEncounterType } from "./enums/mystery-encounter-type";
 import { MysteryEncounterTier } from "./enums/mystery-encounter-tier";
+import { Challenges } from "#enums/challenges";
 
 export enum EventType {
   SHINY,
   NO_TIMER_DISPLAY,
-  LUCK
+  LUCK,
 }
 
 interface EventBanner {
@@ -27,6 +28,7 @@ interface EventBanner {
 interface EventEncounter {
   species: Species;
   blockEvolution?: boolean;
+  formIndex?: number;
 }
 
 interface EventMysteryEncounterTier {
@@ -35,6 +37,18 @@ interface EventMysteryEncounterTier {
   disable?: boolean;
 }
 
+interface EventWaveReward {
+  wave: number;
+  type: string;
+}
+
+type EventMusicReplacement = [string, string];
+
+interface EventChallenge {
+  challenge: Challenges;
+  value: number;
+}
+
 interface TimedEvent extends EventBanner {
   name: string;
   eventType: EventType;
@@ -49,6 +63,11 @@ interface TimedEvent extends EventBanner {
   weather?: WeatherPoolEntry[];
   mysteryEncounterTierChanges?: EventMysteryEncounterTier[];
   luckBoostedSpecies?: Species[];
+  boostFusions?: boolean; //MODIFIER REWORK PLEASE
+  classicWaveRewards?: EventWaveReward[]; // Rival battle rewards
+  trainerShinyChance?: number; // Odds over 65536 of trainer mon generating as shiny
+  music?: EventMusicReplacement[];
+  dailyRunChallenges?: EventChallenge[];
 }
 
 const timedEvents: TimedEvent[] = [
@@ -59,9 +78,9 @@ const timedEvents: TimedEvent[] = [
     upgradeUnlockedVouchers: true,
     startDate: new Date(Date.UTC(2024, 11, 21, 0)),
     endDate: new Date(Date.UTC(2025, 0, 4, 0)),
-    bannerKey: "winter_holidays2024-event-",
+    bannerKey: "winter_holidays2024-event",
     scale: 0.21,
-    availableLangs: [ "en", "de", "it", "fr", "ja", "ko", "es-ES", "pt-BR", "zh-CN" ],
+    availableLangs: ["en", "de", "it", "fr", "ja", "ko", "es-ES", "pt-BR", "zh-CN"],
     eventEncounters: [
       { species: Species.GIMMIGHOUL, blockEvolution: true },
       { species: Species.DELIBIRD },
@@ -82,17 +101,32 @@ const timedEvents: TimedEvent[] = [
       { species: Species.SMOLIV },
       { species: Species.ALOLA_VULPIX },
       { species: Species.GALAR_DARUMAKA },
-      { species: Species.IRON_BUNDLE }
+      { species: Species.IRON_BUNDLE },
     ],
-    delibirdyBuff: [ "CATCHING_CHARM", "SHINY_CHARM", "ABILITY_CHARM", "EXP_CHARM", "SUPER_EXP_CHARM", "HEALING_CHARM" ],
+    delibirdyBuff: ["CATCHING_CHARM", "SHINY_CHARM", "ABILITY_CHARM", "EXP_CHARM", "SUPER_EXP_CHARM", "HEALING_CHARM"],
     weather: [{ weatherType: WeatherType.SNOW, weight: 1 }],
     mysteryEncounterTierChanges: [
-      { mysteryEncounter: MysteryEncounterType.DELIBIRDY, tier: MysteryEncounterTier.COMMON },
+      {
+        mysteryEncounter: MysteryEncounterType.DELIBIRDY,
+        tier: MysteryEncounterTier.COMMON,
+      },
       { mysteryEncounter: MysteryEncounterType.PART_TIMER, disable: true },
-      { mysteryEncounter: MysteryEncounterType.AN_OFFER_YOU_CANT_REFUSE, disable: true },
+      {
+        mysteryEncounter: MysteryEncounterType.AN_OFFER_YOU_CANT_REFUSE,
+        disable: true,
+      },
       { mysteryEncounter: MysteryEncounterType.FIELD_TRIP, disable: true },
-      { mysteryEncounter: MysteryEncounterType.DEPARTMENT_STORE_SALE, disable: true }
-    ]
+      {
+        mysteryEncounter: MysteryEncounterType.DEPARTMENT_STORE_SALE,
+        disable: true,
+      },
+    ],
+    classicWaveRewards: [
+      { wave: 8, type: "SHINY_CHARM" },
+      { wave: 8, type: "ABILITY_CHARM" },
+      { wave: 8, type: "CATCHING_CHARM" },
+      { wave: 25, type: "SHINY_CHARM" },
+    ],
   },
   {
     name: "Year of the Snake",
@@ -100,9 +134,9 @@ const timedEvents: TimedEvent[] = [
     luckBoost: 1,
     startDate: new Date(Date.UTC(2025, 0, 29, 0)),
     endDate: new Date(Date.UTC(2025, 1, 3, 0)),
-    bannerKey: "yearofthesnakeevent-",
+    bannerKey: "yearofthesnakeevent",
     scale: 0.21,
-    availableLangs: [ "en", "de", "it", "fr", "ja", "ko", "es-ES", "pt-BR", "zh-CN" ],
+    availableLangs: ["en", "de", "it", "fr", "ja", "ko", "es-ES", "pt-BR", "zh-CN"],
     eventEncounters: [
       { species: Species.EKANS },
       { species: Species.ONIX },
@@ -118,43 +152,210 @@ const timedEvents: TimedEvent[] = [
       { species: Species.DARUMAKA },
       { species: Species.DRAMPA },
       { species: Species.SILICOBRA },
-      { species: Species.BLOODMOON_URSALUNA }
+      { species: Species.BLOODMOON_URSALUNA },
     ],
     luckBoostedSpecies: [
-      Species.EKANS, Species.ARBOK,
-      Species.ONIX, Species.STEELIX,
-      Species.DRATINI, Species.DRAGONAIR, Species.DRAGONITE,
-      Species.CLEFFA, Species.CLEFAIRY, Species.CLEFABLE,
+      Species.EKANS,
+      Species.ARBOK,
+      Species.ONIX,
+      Species.STEELIX,
+      Species.DRATINI,
+      Species.DRAGONAIR,
+      Species.DRAGONITE,
+      Species.CLEFFA,
+      Species.CLEFAIRY,
+      Species.CLEFABLE,
       Species.UMBREON,
-      Species.DUNSPARCE, Species.DUDUNSPARCE,
-      Species.TEDDIURSA, Species.URSARING, Species.URSALUNA,
+      Species.DUNSPARCE,
+      Species.DUDUNSPARCE,
+      Species.TEDDIURSA,
+      Species.URSARING,
+      Species.URSALUNA,
       Species.SEVIPER,
       Species.LUNATONE,
       Species.RAYQUAZA,
-      Species.CHINGLING, Species.CHIMECHO,
+      Species.CHINGLING,
+      Species.CHIMECHO,
       Species.CRESSELIA,
       Species.DARKRAI,
-      Species.SNIVY, Species.SERVINE, Species.SERPERIOR,
-      Species.DARUMAKA, Species.DARMANITAN,
+      Species.SNIVY,
+      Species.SERVINE,
+      Species.SERPERIOR,
+      Species.DARUMAKA,
+      Species.DARMANITAN,
       Species.ZYGARDE,
       Species.DRAMPA,
       Species.LUNALA,
       Species.BLACEPHALON,
-      Species.SILICOBRA, Species.SANDACONDA,
+      Species.SILICOBRA,
+      Species.SANDACONDA,
       Species.ROARING_MOON,
-      Species.BLOODMOON_URSALUNA
-    ]
-  }
+      Species.BLOODMOON_URSALUNA,
+    ],
+    classicWaveRewards: [
+      { wave: 8, type: "SHINY_CHARM" },
+      { wave: 8, type: "ABILITY_CHARM" },
+      { wave: 8, type: "CATCHING_CHARM" },
+      { wave: 25, type: "SHINY_CHARM" },
+    ],
+  },
+  {
+    name: "Valentine",
+    eventType: EventType.SHINY,
+    startDate: new Date(Date.UTC(2025, 1, 10)),
+    endDate: new Date(Date.UTC(2025, 1, 21)),
+    boostFusions: true,
+    shinyMultiplier: 2,
+    bannerKey: "valentines2025event",
+    scale: 0.21,
+    availableLangs: ["en", "de", "it", "fr", "ja", "ko", "es-ES", "pt-BR", "zh-CN"],
+    eventEncounters: [
+      { species: Species.NIDORAN_F },
+      { species: Species.NIDORAN_M },
+      { species: Species.IGGLYBUFF },
+      { species: Species.SMOOCHUM },
+      { species: Species.VOLBEAT },
+      { species: Species.ILLUMISE },
+      { species: Species.ROSELIA },
+      { species: Species.LUVDISC },
+      { species: Species.WOOBAT },
+      { species: Species.FRILLISH },
+      { species: Species.ALOMOMOLA },
+      { species: Species.FURFROU, formIndex: 1 }, // Heart Trim
+      { species: Species.ESPURR },
+      { species: Species.SPRITZEE },
+      { species: Species.SWIRLIX },
+      { species: Species.APPLIN },
+      { species: Species.MILCERY },
+      { species: Species.INDEEDEE },
+      { species: Species.TANDEMAUS },
+      { species: Species.ENAMORUS },
+    ],
+    luckBoostedSpecies: [Species.LUVDISC],
+    classicWaveRewards: [
+      { wave: 8, type: "SHINY_CHARM" },
+      { wave: 8, type: "ABILITY_CHARM" },
+      { wave: 8, type: "CATCHING_CHARM" },
+      { wave: 25, type: "SHINY_CHARM" },
+    ],
+  },
+  {
+    name: "PKMNDAY2025",
+    eventType: EventType.LUCK,
+    startDate: new Date(Date.UTC(2025, 1, 27)),
+    endDate: new Date(Date.UTC(2025, 2, 4)),
+    classicFriendshipMultiplier: 4,
+    bannerKey: "pkmnday2025event",
+    scale: 0.21,
+    availableLangs: ["en", "de", "it", "fr", "ja", "ko", "es-ES", "pt-BR", "zh-CN"],
+    eventEncounters: [
+      { species: Species.PIKACHU, formIndex: 1, blockEvolution: true }, // Partner Form
+      { species: Species.EEVEE, formIndex: 1, blockEvolution: true }, // Partner Form
+      { species: Species.CHIKORITA },
+      { species: Species.TOTODILE },
+      { species: Species.TEPIG },
+    ],
+    luckBoostedSpecies: [
+      Species.PICHU,
+      Species.PIKACHU,
+      Species.RAICHU,
+      Species.ALOLA_RAICHU,
+      Species.PSYDUCK,
+      Species.GOLDUCK,
+      Species.EEVEE,
+      Species.FLAREON,
+      Species.JOLTEON,
+      Species.VAPOREON,
+      Species.ESPEON,
+      Species.UMBREON,
+      Species.LEAFEON,
+      Species.GLACEON,
+      Species.SYLVEON,
+      Species.CHIKORITA,
+      Species.BAYLEEF,
+      Species.MEGANIUM,
+      Species.TOTODILE,
+      Species.CROCONAW,
+      Species.FERALIGATR,
+      Species.TEPIG,
+      Species.PIGNITE,
+      Species.EMBOAR,
+      Species.ZYGARDE,
+      Species.ETERNAL_FLOETTE,
+    ],
+    classicWaveRewards: [
+      { wave: 8, type: "SHINY_CHARM" },
+      { wave: 8, type: "ABILITY_CHARM" },
+      { wave: 8, type: "CATCHING_CHARM" },
+      { wave: 25, type: "SHINY_CHARM" },
+    ],
+  },
+  {
+    name: "April Fools 2025",
+    eventType: EventType.LUCK,
+    startDate: new Date(Date.UTC(2025, 2, 31)),
+    endDate: new Date(Date.UTC(2025, 3, 3)),
+    bannerKey: "aprf25",
+    scale: 0.21,
+    availableLangs: ["en", "de", "it", "fr", "ja", "ko", "es-ES", "es-MX", "pt-BR", "zh-CN"],
+    trainerShinyChance: 13107, // 13107/65536 = 1/5
+    music: [
+      ["title", "title_afd"],
+      ["battle_rival_3", "battle_rival_3_afd"],
+    ],
+    dailyRunChallenges: [
+      {
+        challenge: Challenges.INVERSE_BATTLE,
+        value: 1,
+      },
+    ],
+  },
+  {
+    name: "Shining Spring",
+    eventType: EventType.SHINY,
+    startDate: new Date(Date.UTC(2025, 4, 3)),
+    endDate: new Date(Date.UTC(2025, 4, 13)),
+    bannerKey: "spr25event",
+    scale: 0.21,
+    availableLangs: ["en", "de", "it", "fr", "ja", "ko", "es-ES", "es-MX", "pt-BR", "zh-CN"],
+    shinyMultiplier: 2,
+    upgradeUnlockedVouchers: true,
+    eventEncounters: [
+      { species: Species.HOPPIP },
+      { species: Species.CELEBI },
+      { species: Species.VOLBEAT },
+      { species: Species.ILLUMISE },
+      { species: Species.SPOINK },
+      { species: Species.LILEEP },
+      { species: Species.SHINX },
+      { species: Species.PACHIRISU },
+      { species: Species.CHERUBI },
+      { species: Species.MUNCHLAX },
+      { species: Species.TEPIG },
+      { species: Species.PANSAGE },
+      { species: Species.PANSEAR },
+      { species: Species.PANPOUR },
+      { species: Species.DARUMAKA },
+      { species: Species.ARCHEN },
+      { species: Species.DEERLING, formIndex: 0 }, // Spring Deerling
+      { species: Species.CLAUNCHER },
+      { species: Species.WISHIWASHI },
+      { species: Species.DRAMPA },
+      { species: Species.JANGMO_O },
+      { species: Species.APPLIN },
+    ],
+    classicWaveRewards: [
+      { wave: 8, type: "SHINY_CHARM" },
+      { wave: 8, type: "ABILITY_CHARM" },
+      { wave: 8, type: "CATCHING_CHARM" },
+      { wave: 25, type: "SHINY_CHARM" },
+    ],
+  },
 ];
 
 export class TimedEventManager {
-  constructor() {}
-
   isActive(event: TimedEvent) {
-    return (
-      event.startDate < new Date() &&
-        new Date() < event.endDate
-    );
+    return event.startDate < new Date() && new Date() < event.endDate;
   }
 
   activeEvent(): TimedEvent | undefined {
@@ -166,16 +367,16 @@ export class TimedEventManager {
   }
 
   activeEventHasBanner(): boolean {
-    const activeEvents = timedEvents.filter((te) => this.isActive(te) && te.hasOwnProperty("bannerFilename"));
+    const activeEvents = timedEvents.filter(te => this.isActive(te) && te.hasOwnProperty("bannerKey"));
     return activeEvents.length > 0;
   }
 
   getShinyMultiplier(): number {
     let multiplier = 1;
-    const shinyEvents = timedEvents.filter((te) => te.eventType === EventType.SHINY && this.isActive(te));
-    shinyEvents.forEach((se) => {
+    const shinyEvents = timedEvents.filter(te => te.eventType === EventType.SHINY && this.isActive(te));
+    for (const se of shinyEvents) {
       multiplier *= se.shinyMultiplier ?? 1;
-    });
+    }
 
     return multiplier;
   }
@@ -184,13 +385,21 @@ export class TimedEventManager {
     return timedEvents.find((te: TimedEvent) => this.isActive(te))?.bannerKey ?? "";
   }
 
+  getEventBannerLangs(): string[] {
+    const ret: string[] = [];
+    ret.push(...timedEvents.find(te => this.isActive(te) && !isNullOrUndefined(te.availableLangs))?.availableLangs!);
+    return ret;
+  }
+
   getEventEncounters(): EventEncounter[] {
     const ret: EventEncounter[] = [];
-    timedEvents.filter((te) => this.isActive(te)).map((te) => {
-      if (!isNullOrUndefined(te.eventEncounters)) {
-        ret.push(...te.eventEncounters);
-      }
-    });
+    timedEvents
+      .filter(te => this.isActive(te))
+      .map(te => {
+        if (!isNullOrUndefined(te.eventEncounters)) {
+          ret.push(...te.eventEncounters);
+        }
+      });
     return ret;
   }
 
@@ -200,12 +409,12 @@ export class TimedEventManager {
    */
   getClassicFriendshipMultiplier(): number {
     let multiplier = CLASSIC_CANDY_FRIENDSHIP_MULTIPLIER;
-    const classicFriendshipEvents = timedEvents.filter((te) => this.isActive(te));
-    classicFriendshipEvents.forEach((fe) => {
+    const classicFriendshipEvents = timedEvents.filter(te => this.isActive(te));
+    for (const fe of classicFriendshipEvents) {
       if (!isNullOrUndefined(fe.classicFriendshipMultiplier) && fe.classicFriendshipMultiplier > multiplier) {
         multiplier = fe.classicFriendshipMultiplier;
       }
-    });
+    }
     return multiplier;
   }
 
@@ -214,7 +423,7 @@ export class TimedEventManager {
    * @returns Whether vouchers should be upgraded
    */
   getUpgradeUnlockedVouchers(): boolean {
-    return timedEvents.some((te) => this.isActive(te) && (te.upgradeUnlockedVouchers ?? false));
+    return timedEvents.some(te => this.isActive(te) && (te.upgradeUnlockedVouchers ?? false));
   }
 
   /**
@@ -223,11 +432,13 @@ export class TimedEventManager {
    */
   getDelibirdyBuff(): string[] {
     const ret: string[] = [];
-    timedEvents.filter((te) => this.isActive(te)).map((te) => {
-      if (!isNullOrUndefined(te.delibirdyBuff)) {
-        ret.push(...te.delibirdyBuff);
-      }
-    });
+    timedEvents
+      .filter(te => this.isActive(te))
+      .map(te => {
+        if (!isNullOrUndefined(te.delibirdyBuff)) {
+          ret.push(...te.delibirdyBuff);
+        }
+      });
     return ret;
   }
 
@@ -237,66 +448,132 @@ export class TimedEventManager {
    */
   getWeather(): WeatherPoolEntry[] {
     const ret: WeatherPoolEntry[] = [];
-    timedEvents.filter((te) => this.isActive(te)).map((te) => {
-      if (!isNullOrUndefined(te.weather)) {
-        ret.push(...te.weather);
-      }
-    });
+    timedEvents
+      .filter(te => this.isActive(te))
+      .map(te => {
+        if (!isNullOrUndefined(te.weather)) {
+          ret.push(...te.weather);
+        }
+      });
     return ret;
   }
 
   getAllMysteryEncounterChanges(): EventMysteryEncounterTier[] {
     const ret: EventMysteryEncounterTier[] = [];
-    timedEvents.filter((te) => this.isActive(te)).map((te) => {
-      if (!isNullOrUndefined(te.mysteryEncounterTierChanges)) {
-        ret.push(...te.mysteryEncounterTierChanges);
-      }
-    });
+    timedEvents
+      .filter(te => this.isActive(te))
+      .map(te => {
+        if (!isNullOrUndefined(te.mysteryEncounterTierChanges)) {
+          ret.push(...te.mysteryEncounterTierChanges);
+        }
+      });
     return ret;
   }
 
   getEventMysteryEncountersDisabled(): MysteryEncounterType[] {
     const ret: MysteryEncounterType[] = [];
-    timedEvents.filter((te) => this.isActive(te) && !isNullOrUndefined(te.mysteryEncounterTierChanges)).map((te) => {
-      te.mysteryEncounterTierChanges?.map((metc) => {
-        if (metc.disable) {
-          ret.push(metc.mysteryEncounter);
-        }
+    timedEvents
+      .filter(te => this.isActive(te) && !isNullOrUndefined(te.mysteryEncounterTierChanges))
+      .map(te => {
+        te.mysteryEncounterTierChanges?.map(metc => {
+          if (metc.disable) {
+            ret.push(metc.mysteryEncounter);
+          }
+        });
       });
-    });
     return ret;
   }
 
-  getMysteryEncounterTierForEvent(encounterType: MysteryEncounterType, normal: MysteryEncounterTier): MysteryEncounterTier {
+  getMysteryEncounterTierForEvent(
+    encounterType: MysteryEncounterType,
+    normal: MysteryEncounterTier,
+  ): MysteryEncounterTier {
     let ret = normal;
-    timedEvents.filter((te) => this.isActive(te) && !isNullOrUndefined(te.mysteryEncounterTierChanges)).map((te) => {
-      te.mysteryEncounterTierChanges?.map((metc) => {
-        if (metc.mysteryEncounter === encounterType) {
-          ret = metc.tier ?? normal;
-        }
+    timedEvents
+      .filter(te => this.isActive(te) && !isNullOrUndefined(te.mysteryEncounterTierChanges))
+      .map(te => {
+        te.mysteryEncounterTierChanges?.map(metc => {
+          if (metc.mysteryEncounter === encounterType) {
+            ret = metc.tier ?? normal;
+          }
+        });
       });
-    });
     return ret;
   }
 
   getEventLuckBoost(): number {
     let ret = 0;
-    const luckEvents = timedEvents.filter((te) => this.isActive(te) && !isNullOrUndefined(te.luckBoost));
-    luckEvents.forEach((le) => {
+    const luckEvents = timedEvents.filter(te => this.isActive(te) && !isNullOrUndefined(te.luckBoost));
+    for (const le of luckEvents) {
       ret += le.luckBoost!;
-    });
+    }
     return ret;
   }
 
   getEventLuckBoostedSpecies(): Species[] {
     const ret: Species[] = [];
-    timedEvents.filter((te) => this.isActive(te)).map((te) => {
-      if (!isNullOrUndefined(te.luckBoostedSpecies)) {
-        ret.push(...te.luckBoostedSpecies.filter(s => !ret.includes(s)));
+    timedEvents
+      .filter(te => this.isActive(te))
+      .map(te => {
+        if (!isNullOrUndefined(te.luckBoostedSpecies)) {
+          ret.push(...te.luckBoostedSpecies.filter(s => !ret.includes(s)));
+        }
+      });
+    return ret;
+  }
+
+  areFusionsBoosted(): boolean {
+    return timedEvents.some(te => this.isActive(te) && te.boostFusions);
+  }
+
+  /**
+   * Gets all the modifier types associated with a certain wave during an event
+   * @see EventWaveReward
+   * @param wave the wave to check for associated rewards
+   * @returns array of strings of the event modifier reward types
+   */
+  getFixedBattleEventRewards(wave: number): string[] {
+    const ret: string[] = [];
+    timedEvents
+      .filter(te => this.isActive(te) && !isNullOrUndefined(te.classicWaveRewards))
+      .map(te => {
+        ret.push(...te.classicWaveRewards!.filter(cwr => cwr.wave === wave).map(cwr => cwr.type));
+      });
+    return ret;
+  }
+
+  // Gets the extra shiny chance for trainers due to event (odds/65536)
+  getClassicTrainerShinyChance(): number {
+    let ret = 0;
+    const tsEvents = timedEvents.filter(te => this.isActive(te) && !isNullOrUndefined(te.trainerShinyChance));
+    tsEvents.map(t => (ret += t.trainerShinyChance!));
+    return ret;
+  }
+
+  getEventBgmReplacement(bgm: string): string {
+    let ret = bgm;
+    timedEvents.map(te => {
+      if (this.isActive(te) && !isNullOrUndefined(te.music)) {
+        te.music.map(mr => {
+          if (mr[0] === bgm) {
+            console.log(`it is ${te.name} so instead of ${mr[0]} we play ${mr[1]}`);
+            ret = mr[1];
+          }
+        });
       }
     });
     return ret;
   }
+
+  /**
+   * Activates any challenges on {@linkcode globalScene.gameMode} for the currently active event
+   */
+  startEventChallenges(): void {
+    const challenges = this.activeEvent()?.dailyRunChallenges;
+    challenges?.forEach((eventChal: EventChallenge) =>
+      globalScene.gameMode.setChallengeValue(eventChal.challenge, eventChal.value),
+    );
+  }
 }
 
 export class TimedEventDisplay extends Phaser.GameObjects.Container {
@@ -332,15 +609,16 @@ export class TimedEventDisplay extends Phaser.GameObjects.Container {
 
   setup() {
     const lang = i18next.resolvedLanguage;
-    if (this.event && this.event.bannerKey) {
+    if (this.event?.bannerKey) {
       let key = this.event.bannerKey;
       if (lang && this.event.availableLangs && this.event.availableLangs.length > 0) {
         if (this.event.availableLangs.includes(lang)) {
-          key += lang;
+          key += "-" + lang;
         } else {
-          key += "en";
+          key += "-en";
         }
       }
+      console.log(key);
       console.log(this.event.bannerKey);
       const padding = 5;
       const showTimer = this.event.eventType !== EventType.NO_TIMER_DISPLAY;
@@ -354,7 +632,7 @@ export class TimedEventDisplay extends Phaser.GameObjects.Container {
           this.banner.x,
           this.banner.y + 2,
           this.timeToGo(this.event.endDate),
-          TextStyle.WINDOW
+          TextStyle.WINDOW,
         );
         this.eventTimerText.setName("text-event-timer");
         this.eventTimerText.setScale(0.15);
@@ -382,7 +660,6 @@ export class TimedEventDisplay extends Phaser.GameObjects.Container {
   }
 
   private timeToGo(date: Date) {
-
     // Utility to add leading zero
     function z(n) {
       return (n < 10 ? "0" : "") + n;
@@ -394,13 +671,18 @@ export class TimedEventDisplay extends Phaser.GameObjects.Container {
     diff = Math.abs(diff);
 
     // Get time components
-    const days = diff / 8.64e7 | 0;
-    const hours = diff % 8.64e7 / 3.6e6 | 0;
-    const mins  = diff % 3.6e6 / 6e4 | 0;
-    const secs  = Math.round(diff % 6e4 / 1e3);
+    const days = (diff / 8.64e7) | 0;
+    const hours = ((diff % 8.64e7) / 3.6e6) | 0;
+    const mins = ((diff % 3.6e6) / 6e4) | 0;
+    const secs = Math.round((diff % 6e4) / 1e3);
 
     // Return formatted string
-    return i18next.t("menu:eventTimer", { days: z(days), hours: z(hours), mins: z(mins), secs: z(secs) });
+    return i18next.t("menu:eventTimer", {
+      days: z(days),
+      hours: z(hours),
+      mins: z(mins),
+      secs: z(secs),
+    });
   }
 
   updateCountdown() {
diff --git a/src/touch-controls.ts b/src/touch-controls.ts
index db2ae223d3f..e2b5ad05baa 100644
--- a/src/touch-controls.ts
+++ b/src/touch-controls.ts
@@ -9,9 +9,9 @@ export default class TouchControl {
   private buttonLock: string[] = new Array();
   private inputInterval: NodeJS.Timeout[] = new Array();
   /** Whether touch controls are disabled */
-  private disabled: boolean = false;
+  private disabled = false;
   /** Whether the last touch event has finished before disabling */
-  private finishedLastTouch: boolean = false;
+  private finishedLastTouch = false;
 
   constructor() {
     this.events = globalScene.game.events;
@@ -23,12 +23,12 @@ export default class TouchControl {
    */
   disable() {
     this.disabled = true;
-	  this.finishedLastTouch = false;
+    this.finishedLastTouch = false;
   }
 
   /**
    * Enable touch controls
-	 */
+   */
   enable() {
     this.disabled = false;
     this.finishedLastTouch = false;
@@ -39,7 +39,7 @@ export default class TouchControl {
    */
   init() {
     this.preventElementZoom(document.querySelector("#dpad"));
-    document.querySelectorAll(".apad-button").forEach((element) => this.preventElementZoom(element as HTMLElement));
+    document.querySelectorAll(".apad-button").forEach(element => this.preventElementZoom(element as HTMLElement));
     // Select all elements with the 'data-key' attribute and bind keys to them
     for (const button of document.querySelectorAll("[data-key]")) {
       // @ts-ignore - Bind the key to the button using the dataset key
@@ -87,11 +87,10 @@ export default class TouchControl {
     }, repeatInputDelayMillis);
     this.buttonLock.push(key);
     node.classList.add("active");
-
   }
 
   touchButtonUp(node: HTMLElement, key: string, id: string) {
-    if (!this.buttonLock.includes(key) || this.disabled && this.finishedLastTouch) {
+    if (!this.buttonLock.includes(key) || (this.disabled && this.finishedLastTouch)) {
       return;
     }
     this.finishedLastTouch = true;
@@ -126,14 +125,14 @@ export default class TouchControl {
         this.events.emit("input_down", {
           controller_type: "keyboard",
           button: button,
-          isTouch: true
+          isTouch: true,
         });
         break;
       case "keyup":
         this.events.emit("input_up", {
           controller_type: "keyboard",
           button: button,
-          isTouch: true
+          isTouch: true,
         });
         break;
     }
@@ -151,7 +150,6 @@ export default class TouchControl {
       return;
     }
     element.addEventListener("touchstart", (event: TouchEvent) => {
-
       if (!(event.currentTarget instanceof HTMLElement)) {
         return;
       }
@@ -175,8 +173,8 @@ export default class TouchControl {
   }
 
   /**
-     * Deactivates all currently pressed keys.
-     */
+   * Deactivates all currently pressed keys.
+   */
   deactivatePressedKey(): void {
     for (const key of Object.keys(this.inputInterval)) {
       clearInterval(this.inputInterval[key]);
@@ -204,9 +202,16 @@ export function hasTouchscreen(): boolean {
  */
 export function isMobile(): boolean {
   let ret = false;
-  (function (a) {
+  (a => {
     // Check the user agent string against a regex for mobile devices
-    if (/(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino|android|ipad|playbook|silk/i.test(a) || /1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i.test(a.substr(0, 4))) {
+    if (
+      /(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino|android|ipad|playbook|silk/i.test(
+        a,
+      ) ||
+      /1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i.test(
+        a.substr(0, 4),
+      )
+    ) {
       ret = true;
     }
   })(navigator.userAgent || navigator.vendor || window["opera"]);
diff --git a/src/tutorial.ts b/src/tutorial.ts
index 6890075a642..d9ae3a03290 100644
--- a/src/tutorial.ts
+++ b/src/tutorial.ts
@@ -1,7 +1,7 @@
 import { globalScene } from "#app/global-scene";
 import AwaitableUiHandler from "./ui/awaitable-ui-handler";
 import type UiHandler from "./ui/ui-handler";
-import { Mode } from "./ui/ui";
+import { UiMode } from "#enums/ui-mode";
 import i18next from "i18next";
 import Overrides from "#app/overrides";
 
@@ -14,7 +14,7 @@ export enum Tutorial {
   Pokerus = "POKERUS",
   Stat_Change = "STAT_CHANGE",
   Select_Item = "SELECT_ITEM",
-  Egg_Gacha = "EGG_GACHA"
+  Egg_Gacha = "EGG_GACHA",
 }
 
 const tutorialHandlers = {
@@ -28,40 +28,93 @@ const tutorialHandlers = {
       if (globalScene.enableTouchControls) {
         return resolve();
       }
-      globalScene.showFieldOverlay(1000).then(() => globalScene.ui.showText(i18next.t("tutorial:accessMenu"), null, () => globalScene.hideFieldOverlay(1000).then(() => resolve()), null, true));
+      globalScene
+        .showFieldOverlay(1000)
+        .then(() =>
+          globalScene.ui.showText(
+            i18next.t("tutorial:accessMenu"),
+            null,
+            () => globalScene.hideFieldOverlay(1000).then(() => resolve()),
+            null,
+            true,
+          ),
+        );
     });
   },
   [Tutorial.Menu]: () => {
     return new Promise<void>(resolve => {
       globalScene.gameData.saveTutorialFlag(Tutorial.Access_Menu, true);
-      globalScene.ui.showText(i18next.t("tutorial:menu"), null, () => globalScene.ui.showText("", null, () => resolve()), null, true);
+      globalScene.ui.showText(
+        i18next.t("tutorial:menu"),
+        null,
+        () => globalScene.ui.showText("", null, () => resolve()),
+        null,
+        true,
+      );
     });
   },
   [Tutorial.Starter_Select]: () => {
     return new Promise<void>(resolve => {
-      globalScene.ui.showText(i18next.t("tutorial:starterSelect"), null, () => globalScene.ui.showText("", null, () => resolve()), null, true);
+      globalScene.ui.showText(
+        i18next.t("tutorial:starterSelect"),
+        null,
+        () => globalScene.ui.showText("", null, () => resolve()),
+        null,
+        true,
+      );
     });
   },
   [Tutorial.Pokerus]: () => {
     return new Promise<void>(resolve => {
-      globalScene.ui.showText(i18next.t("tutorial:pokerus"), null, () => globalScene.ui.showText("", null, () => resolve()), null, true);
+      globalScene.ui.showText(
+        i18next.t("tutorial:pokerus"),
+        null,
+        () => globalScene.ui.showText("", null, () => resolve()),
+        null,
+        true,
+      );
     });
   },
   [Tutorial.Stat_Change]: () => {
     return new Promise<void>(resolve => {
-      globalScene.showFieldOverlay(1000).then(() => globalScene.ui.showText(i18next.t("tutorial:statChange"), null, () => globalScene.ui.showText("", null, () => globalScene.hideFieldOverlay(1000).then(() => resolve())), null, true));
+      globalScene
+        .showFieldOverlay(1000)
+        .then(() =>
+          globalScene.ui.showText(
+            i18next.t("tutorial:statChange"),
+            null,
+            () => globalScene.ui.showText("", null, () => globalScene.hideFieldOverlay(1000).then(() => resolve())),
+            null,
+            true,
+          ),
+        );
     });
   },
   [Tutorial.Select_Item]: () => {
     return new Promise<void>(resolve => {
-      globalScene.ui.setModeWithoutClear(Mode.MESSAGE).then(() => {
-        globalScene.ui.showText(i18next.t("tutorial:selectItem"), null, () => globalScene.ui.showText("", null, () => globalScene.ui.setModeWithoutClear(Mode.MODIFIER_SELECT).then(() => resolve())), null, true);
+      globalScene.ui.setModeWithoutClear(UiMode.MESSAGE).then(() => {
+        globalScene.ui.showText(
+          i18next.t("tutorial:selectItem"),
+          null,
+          () =>
+            globalScene.ui.showText("", null, () =>
+              globalScene.ui.setModeWithoutClear(UiMode.MODIFIER_SELECT).then(() => resolve()),
+            ),
+          null,
+          true,
+        );
       });
     });
   },
   [Tutorial.Egg_Gacha]: () => {
     return new Promise<void>(resolve => {
-      globalScene.ui.showText(i18next.t("tutorial:eggGacha"), null, () => globalScene.ui.showText("", null, () => resolve()), null, true);
+      globalScene.ui.showText(
+        i18next.t("tutorial:eggGacha"),
+        null,
+        () => globalScene.ui.showText("", null, () => resolve()),
+        null,
+        true,
+      );
     });
   },
 };
@@ -119,7 +172,7 @@ async function showTutorialOverlay(handler: UiHandler) {
       ease: "Sine.easeOut",
       onComplete: () => {
         return true;
-      }
+      },
     });
   } else {
     return true;
@@ -140,10 +193,9 @@ async function hideTutorialOverlay(handler: UiHandler) {
       ease: "Sine.easeOut",
       onComplete: () => {
         return true;
-      }
+      },
     });
   } else {
     return true;
   }
 }
-
diff --git a/src/ui-inputs.ts b/src/ui-inputs.ts
index e6a0ed7a69c..0c13cdb9512 100644
--- a/src/ui-inputs.ts
+++ b/src/ui-inputs.ts
@@ -1,5 +1,5 @@
 import type Phaser from "phaser";
-import { Mode } from "./ui/ui";
+import { UiMode } from "#enums/ui-mode";
 import type { InputsController } from "./inputs-controller";
 import type MessageUiHandler from "./ui/message-ui-handler";
 import StarterSelectUiHandler from "./ui/starter-select-ui-handler";
@@ -45,23 +45,31 @@ export class UiInputs {
   }
 
   listenInputs(): void {
-    this.events.on("input_down", (event) => {
-      this.detectInputMethod(event);
+    this.events.on(
+      "input_down",
+      event => {
+        this.detectInputMethod(event);
 
-      const actions = this.getActionsKeyDown();
-      if (!actions.hasOwnProperty(event.button)) {
-        return;
-      }
-      actions[event.button]();
-    }, this);
+        const actions = this.getActionsKeyDown();
+        if (!actions.hasOwnProperty(event.button)) {
+          return;
+        }
+        actions[event.button]();
+      },
+      this,
+    );
 
-    this.events.on("input_up", (event) => {
-      const actions = this.getActionsKeyUp();
-      if (!actions.hasOwnProperty(event.button)) {
-        return;
-      }
-      actions[event.button]();
-    }, this);
+    this.events.on(
+      "input_up",
+      event => {
+        const actions = this.getActionsKeyUp();
+        if (!actions.hasOwnProperty(event.button)) {
+          return;
+        }
+        actions[event.button]();
+      },
+      this,
+    );
   }
 
   doVibration(inputSuccess: boolean, vibrationLength: number): void {
@@ -72,46 +80,46 @@ export class UiInputs {
 
   getActionsKeyDown(): ActionKeys {
     const actions: ActionKeys = {
-      [Button.UP]:              () => this.buttonDirection(Button.UP),
-      [Button.DOWN]:            () => this.buttonDirection(Button.DOWN),
-      [Button.LEFT]:            () => this.buttonDirection(Button.LEFT),
-      [Button.RIGHT]:           () => this.buttonDirection(Button.RIGHT),
-      [Button.SUBMIT]:          () => this.buttonTouch(),
-      [Button.ACTION]:          () => this.buttonAb(Button.ACTION),
-      [Button.CANCEL]:          () => this.buttonAb(Button.CANCEL),
-      [Button.MENU]:            () => this.buttonMenu(),
-      [Button.STATS]:           () => this.buttonGoToFilter(Button.STATS),
-      [Button.CYCLE_SHINY]:     () => this.buttonCycleOption(Button.CYCLE_SHINY),
-      [Button.CYCLE_FORM]:      () => this.buttonCycleOption(Button.CYCLE_FORM),
-      [Button.CYCLE_GENDER]:    () => this.buttonCycleOption(Button.CYCLE_GENDER),
-      [Button.CYCLE_ABILITY]:   () => this.buttonCycleOption(Button.CYCLE_ABILITY),
-      [Button.CYCLE_NATURE]:    () => this.buttonCycleOption(Button.CYCLE_NATURE),
-      [Button.V]:               () => this.buttonCycleOption(Button.V),
-      [Button.SPEED_UP]:        () => this.buttonSpeedChange(),
-      [Button.SLOW_DOWN]:       () => this.buttonSpeedChange(false),
+      [Button.UP]: () => this.buttonDirection(Button.UP),
+      [Button.DOWN]: () => this.buttonDirection(Button.DOWN),
+      [Button.LEFT]: () => this.buttonDirection(Button.LEFT),
+      [Button.RIGHT]: () => this.buttonDirection(Button.RIGHT),
+      [Button.SUBMIT]: () => this.buttonTouch(),
+      [Button.ACTION]: () => this.buttonAb(Button.ACTION),
+      [Button.CANCEL]: () => this.buttonAb(Button.CANCEL),
+      [Button.MENU]: () => this.buttonMenu(),
+      [Button.STATS]: () => this.buttonGoToFilter(Button.STATS),
+      [Button.CYCLE_SHINY]: () => this.buttonCycleOption(Button.CYCLE_SHINY),
+      [Button.CYCLE_FORM]: () => this.buttonCycleOption(Button.CYCLE_FORM),
+      [Button.CYCLE_GENDER]: () => this.buttonCycleOption(Button.CYCLE_GENDER),
+      [Button.CYCLE_ABILITY]: () => this.buttonCycleOption(Button.CYCLE_ABILITY),
+      [Button.CYCLE_NATURE]: () => this.buttonCycleOption(Button.CYCLE_NATURE),
+      [Button.CYCLE_TERA]: () => this.buttonCycleOption(Button.CYCLE_TERA),
+      [Button.SPEED_UP]: () => this.buttonSpeedChange(),
+      [Button.SLOW_DOWN]: () => this.buttonSpeedChange(false),
     };
     return actions;
   }
 
   getActionsKeyUp(): ActionKeys {
     const actions: ActionKeys = {
-      [Button.UP]:              () => undefined,
-      [Button.DOWN]:            () => undefined,
-      [Button.LEFT]:            () => undefined,
-      [Button.RIGHT]:           () => undefined,
-      [Button.SUBMIT]:          () => undefined,
-      [Button.ACTION]:          () => undefined,
-      [Button.CANCEL]:          () => undefined,
-      [Button.MENU]:            () => undefined,
-      [Button.STATS]:           () => this.buttonStats(false),
-      [Button.CYCLE_SHINY]:     () => undefined,
-      [Button.CYCLE_FORM]:      () => undefined,
-      [Button.CYCLE_GENDER]:    () => undefined,
-      [Button.CYCLE_ABILITY]:   () => undefined,
-      [Button.CYCLE_NATURE]:    () => undefined,
-      [Button.V]:               () => this.buttonInfo(false),
-      [Button.SPEED_UP]:        () => undefined,
-      [Button.SLOW_DOWN]:       () => undefined,
+      [Button.UP]: () => undefined,
+      [Button.DOWN]: () => undefined,
+      [Button.LEFT]: () => undefined,
+      [Button.RIGHT]: () => undefined,
+      [Button.SUBMIT]: () => undefined,
+      [Button.ACTION]: () => undefined,
+      [Button.CANCEL]: () => undefined,
+      [Button.MENU]: () => undefined,
+      [Button.STATS]: () => this.buttonStats(false),
+      [Button.CYCLE_SHINY]: () => undefined,
+      [Button.CYCLE_FORM]: () => undefined,
+      [Button.CYCLE_GENDER]: () => undefined,
+      [Button.CYCLE_ABILITY]: () => undefined,
+      [Button.CYCLE_NATURE]: () => undefined,
+      [Button.CYCLE_TERA]: () => this.buttonInfo(false),
+      [Button.SPEED_UP]: () => undefined,
+      [Button.SLOW_DOWN]: () => undefined,
     };
     return actions;
   }
@@ -130,7 +138,7 @@ export class UiInputs {
     globalScene.ui.processInput(Button.SUBMIT) || globalScene.ui.processInput(Button.ACTION);
   }
 
-  buttonStats(pressed: boolean = true): void {
+  buttonStats(pressed = true): void {
     // allow access to Button.STATS as a toggle for other elements
     for (const t of globalScene.getInfoToggles(true)) {
       t.toggleInfo(pressed);
@@ -142,7 +150,7 @@ export class UiInputs {
   }
 
   buttonGoToFilter(button: Button): void {
-    const whitelist = [ StarterSelectUiHandler, PokedexUiHandler, PokedexPageUiHandler ];
+    const whitelist = [StarterSelectUiHandler, PokedexUiHandler, PokedexPageUiHandler];
     const uiHandler = globalScene.ui?.getHandler();
     if (whitelist.some(handler => uiHandler instanceof handler)) {
       globalScene.ui.processInput(button);
@@ -151,8 +159,8 @@ export class UiInputs {
     }
   }
 
-  buttonInfo(pressed: boolean = true): void {
-    if (globalScene.showMovesetFlyout ) {
+  buttonInfo(pressed = true): void {
+    if (globalScene.showMovesetFlyout) {
       for (const p of globalScene.getField().filter(p => p?.isActive(true))) {
         p.toggleFlyout(pressed);
       }
@@ -168,22 +176,24 @@ export class UiInputs {
       return;
     }
     switch (globalScene.ui?.getMode()) {
-      case Mode.MESSAGE:
+      case UiMode.MESSAGE: {
         const messageHandler = globalScene.ui.getHandler<MessageUiHandler>();
         if (!messageHandler.pendingPrompt || messageHandler.isTextAnimationInProgress()) {
           return;
         }
-      case Mode.TITLE:
-      case Mode.COMMAND:
-      case Mode.MODIFIER_SELECT:
-      case Mode.MYSTERY_ENCOUNTER:
-        globalScene.ui.setOverlayMode(Mode.MENU);
+        // biome-ignore lint/suspicious/noFallthroughSwitchClause: falls through to show menu overlay
+      }
+      case UiMode.TITLE:
+      case UiMode.COMMAND:
+      case UiMode.MODIFIER_SELECT:
+      case UiMode.MYSTERY_ENCOUNTER:
+        globalScene.ui.setOverlayMode(UiMode.MENU);
         break;
-      case Mode.STARTER_SELECT:
-      case Mode.POKEDEX_PAGE:
+      case UiMode.STARTER_SELECT:
+      case UiMode.POKEDEX_PAGE:
         this.buttonTouch();
         break;
-      case Mode.MENU:
+      case UiMode.MENU:
         globalScene.ui.revertMode();
         globalScene.playSound("ui/select");
         break;
@@ -193,11 +203,21 @@ export class UiInputs {
   }
 
   buttonCycleOption(button: Button): void {
-    const whitelist = [ StarterSelectUiHandler, PokedexUiHandler, PokedexPageUiHandler, SettingsUiHandler, RunInfoUiHandler, SettingsDisplayUiHandler, SettingsAudioUiHandler, SettingsGamepadUiHandler, SettingsKeyboardUiHandler ];
+    const whitelist = [
+      StarterSelectUiHandler,
+      PokedexUiHandler,
+      PokedexPageUiHandler,
+      SettingsUiHandler,
+      RunInfoUiHandler,
+      SettingsDisplayUiHandler,
+      SettingsAudioUiHandler,
+      SettingsGamepadUiHandler,
+      SettingsKeyboardUiHandler,
+    ];
     const uiHandler = globalScene.ui?.getHandler();
     if (whitelist.some(handler => uiHandler instanceof handler)) {
       globalScene.ui.processInput(button);
-    } else if (button === Button.V) {
+    } else if (button === Button.CYCLE_TERA) {
       this.buttonInfo(true);
     }
   }
@@ -205,16 +225,24 @@ export class UiInputs {
   buttonSpeedChange(up = true): void {
     const settingGameSpeed = settingIndex(SettingKeys.Game_Speed);
     if (up && globalScene.gameSpeed < 5) {
-      globalScene.gameData.saveSetting(SettingKeys.Game_Speed, Setting[settingGameSpeed].options.findIndex((item) => item.label === `${globalScene.gameSpeed}x`) + 1);
-      if (globalScene.ui?.getMode() === Mode.SETTINGS) {
+      globalScene.gameData.saveSetting(
+        SettingKeys.Game_Speed,
+        Setting[settingGameSpeed].options.findIndex(item => item.label === `${globalScene.gameSpeed}x`) + 1,
+      );
+      if (globalScene.ui?.getMode() === UiMode.SETTINGS) {
         (globalScene.ui.getHandler() as SettingsUiHandler).show([]);
       }
     } else if (!up && globalScene.gameSpeed > 1) {
-      globalScene.gameData.saveSetting(SettingKeys.Game_Speed, Math.max(Setting[settingGameSpeed].options.findIndex((item) => item.label === `${globalScene.gameSpeed}x`) - 1, 0));
-      if (globalScene.ui?.getMode() === Mode.SETTINGS) {
+      globalScene.gameData.saveSetting(
+        SettingKeys.Game_Speed,
+        Math.max(
+          Setting[settingGameSpeed].options.findIndex(item => item.label === `${globalScene.gameSpeed}x`) - 1,
+          0,
+        ),
+      );
+      if (globalScene.ui?.getMode() === UiMode.SETTINGS) {
         (globalScene.ui.getHandler() as SettingsUiHandler).show([]);
       }
     }
   }
-
 }
diff --git a/src/ui/ability-bar.ts b/src/ui/ability-bar.ts
index 8335f7b517c..5481791de64 100644
--- a/src/ui/ability-bar.ts
+++ b/src/ui/ability-bar.ts
@@ -1,101 +1,114 @@
-import { getPokemonNameWithAffix } from "#app/messages";
 import { globalScene } from "#app/global-scene";
-import type Pokemon from "../field/pokemon";
 import { TextStyle, addTextObject } from "./text";
 import i18next from "i18next";
 
-const hiddenX = -118;
-const shownX = 0;
+const barWidth = 118;
+const screenLeft = 0;
 const baseY = -116;
 
 export default class AbilityBar extends Phaser.GameObjects.Container {
-  private bg: Phaser.GameObjects.Image;
+  private abilityBars: Phaser.GameObjects.Image[];
   private abilityBarText: Phaser.GameObjects.Text;
-
-  private tween: Phaser.Tweens.Tween | null;
-  private autoHideTimer: NodeJS.Timeout | null;
-
-  public shown: boolean;
+  private player: boolean;
+  private screenRight: number; // hold screenRight in case size changes between show and hide
+  private shown: boolean;
 
   constructor() {
-    super(globalScene, hiddenX, baseY);
+    super(globalScene, barWidth, baseY);
+    this.abilityBars = [];
+    this.player = true;
+    this.shown = false;
   }
 
   setup(): void {
-    this.bg = globalScene.add.image(0, 0, "ability_bar_left");
-    this.bg.setOrigin(0, 0);
+    for (const key of ["ability_bar_right", "ability_bar_left"]) {
+      const bar = globalScene.add.image(0, 0, key);
+      bar.setOrigin(0, 0);
+      bar.setVisible(false);
+      this.add(bar);
+      this.abilityBars.push(bar);
+    }
 
-    this.add(this.bg);
-
-    this.abilityBarText = addTextObject(15, 3, "", TextStyle.MESSAGE, { fontSize: "72px" });
+    this.abilityBarText = addTextObject(15, 3, "", TextStyle.MESSAGE, {
+      fontSize: "72px",
+    });
     this.abilityBarText.setOrigin(0, 0);
     this.abilityBarText.setWordWrapWidth(600, true);
     this.add(this.abilityBarText);
+    this.bringToTop(this.abilityBarText);
 
     this.setVisible(false);
-    this.shown = false;
+    this.setX(-barWidth); // start hidden (right edge of bar at x=0)
   }
 
-  showAbility(pokemon: Pokemon, passive: boolean = false): void {
-    this.abilityBarText.setText(`${i18next.t("fightUiHandler:abilityFlyInText", { pokemonName: getPokemonNameWithAffix(pokemon), passive: passive ? i18next.t("fightUiHandler:passive") : "", abilityName: !passive ?  pokemon.getAbility().name : pokemon.getPassiveAbility().name })}`);
+  public override setVisible(value: boolean): this {
+    this.abilityBars[+this.player].setVisible(value);
+    this.shown = value;
+    return this;
+  }
 
-    if (this.shown) {
-      return;
+  public async startTween(config: any, text?: string): Promise<void> {
+    this.setVisible(true);
+    if (text) {
+      this.abilityBarText.setText(text);
     }
+    return new Promise(resolve => {
+      globalScene.tweens.add({
+        ...config,
+        onComplete: () => {
+          if (config.onComplete) {
+            config.onComplete();
+          }
+          resolve();
+        },
+      });
+    });
+  }
 
+  public async showAbility(pokemonName: string, abilityName: string, passive = false, player = true): Promise<void> {
+    const text = `${i18next.t("fightUiHandler:abilityFlyInText", { pokemonName: pokemonName, passive: passive ? i18next.t("fightUiHandler:passive") : "", abilityName: abilityName })}`;
+    this.screenRight = globalScene.scaledCanvas.width;
+    if (player !== this.player) {
+      // Move the bar if it has changed from the player to enemy side (or vice versa)
+      this.setX(player ? -barWidth : this.screenRight);
+      this.player = player;
+    }
     globalScene.fieldUI.bringToTop(this);
 
+    let y = baseY;
+    if (this.player) {
+      y += globalScene.currentBattle.double ? 14 : 0;
+    } else {
+      y -= globalScene.currentBattle.double ? 28 : 14;
+    }
 
-    this.y = baseY + (globalScene.currentBattle.double ? 14 : 0);
-    this.tween = globalScene.tweens.add({
-      targets: this,
-      x: shownX,
-      duration: 500,
-      ease: "Sine.easeOut",
-      onComplete: () => {
-        this.tween = null;
-        this.resetAutoHideTimer();
-      }
-    });
+    this.setY(y);
 
-    this.setVisible(true);
-    this.shown = true;
+    return this.startTween(
+      {
+        targets: this,
+        x: this.player ? screenLeft : this.screenRight - barWidth,
+        duration: 500,
+        ease: "Sine.easeOut",
+        hold: 1000,
+      },
+      text,
+    );
   }
 
-  hide(): void {
-    if (!this.shown) {
-      return;
-    }
-
-    if (this.autoHideTimer) {
-      clearInterval(this.autoHideTimer);
-    }
-
-    if (this.tween) {
-      this.tween.stop();
-    }
-
-    this.tween = globalScene.tweens.add({
+  public async hide(): Promise<void> {
+    return this.startTween({
       targets: this,
-      x: -91,
-      duration: 500,
+      x: this.player ? -barWidth : this.screenRight,
+      duration: 200,
       ease: "Sine.easeIn",
       onComplete: () => {
-        this.tween = null;
         this.setVisible(false);
-      }
+      },
     });
-
-    this.shown = false;
   }
 
-  resetAutoHideTimer(): void {
-    if (this.autoHideTimer) {
-      clearInterval(this.autoHideTimer);
-    }
-    this.autoHideTimer = setTimeout(() => {
-      this.hide();
-      this.autoHideTimer = null;
-    }, 2500);
+  public isVisible(): boolean {
+    return this.shown;
   }
 }
diff --git a/src/ui/abstact-option-select-ui-handler.ts b/src/ui/abstact-option-select-ui-handler.ts
index 1840792e667..07609648a4e 100644
--- a/src/ui/abstact-option-select-ui-handler.ts
+++ b/src/ui/abstact-option-select-ui-handler.ts
@@ -1,12 +1,12 @@
 import { globalScene } from "#app/global-scene";
 import { TextStyle, addBBCodeTextObject, getTextColor, getTextStyleOptions } from "./text";
-import { Mode } from "./ui";
+import { UiMode } from "#enums/ui-mode";
 import UiHandler from "./ui-handler";
 import { addWindow } from "./ui-theme";
-import * as Utils from "../utils";
+import { rgbHexToRgba, fixedInt } from "#app/utils/common";
 import { argbFromRgba } from "@material/material-color-utilities";
 import { Button } from "#enums/buttons";
-import BBCodeText from "phaser3-rex-plugins/plugins/bbcodetext";
+import BBCodeText from "phaser3-rex-plugins/plugins/gameobjects/tagtext/bbcodetext/BBCodeText";
 
 export interface OptionSelectConfig {
   xOffset?: number;
@@ -35,6 +35,7 @@ const scrollDownLabel = "↓";
 
 export default abstract class AbstractOptionSelectUiHandler extends UiHandler {
   protected optionSelectContainer: Phaser.GameObjects.Container;
+  protected optionSelectTextContainer: Phaser.GameObjects.Container;
   protected optionSelectBg: Phaser.GameObjects.NineSlice;
   protected optionSelectText: BBCodeText;
   protected optionSelectIcons: Phaser.GameObjects.Sprite[];
@@ -43,19 +44,19 @@ export default abstract class AbstractOptionSelectUiHandler extends UiHandler {
 
   protected blockInput: boolean;
 
-  protected scrollCursor: number = 0;
-  protected fullCursor: number = 0;
+  protected scrollCursor = 0;
+  protected fullCursor = 0;
 
-  protected scale: number = 0.1666666667;
+  protected scale = 0.1666666667;
 
   private cursorObj: Phaser.GameObjects.Image | null;
 
   protected unskippedIndices: number[] = [];
 
   protected defaultTextStyle: TextStyle = TextStyle.WINDOW;
+  protected textContent: string;
 
-
-  constructor(mode: Mode | null) {
+  constructor(mode: UiMode | null) {
     super(mode);
   }
 
@@ -68,8 +69,8 @@ export default abstract class AbstractOptionSelectUiHandler extends UiHandler {
   setup() {
     const ui = this.getUi();
 
-    this.optionSelectContainer = globalScene.add.container((globalScene.game.canvas.width / 6) - 1, -48);
-    this.optionSelectContainer.setName(`option-select-${this.mode ? Mode[this.mode] : "UNKNOWN"}`);
+    this.optionSelectContainer = globalScene.add.container(globalScene.game.canvas.width / 6 - 1, -48);
+    this.optionSelectContainer.setName(`option-select-${this.mode ? UiMode[this.mode] : "UNKNOWN"}`);
     this.optionSelectContainer.setVisible(false);
     ui.add(this.optionSelectContainer);
 
@@ -78,6 +79,9 @@ export default abstract class AbstractOptionSelectUiHandler extends UiHandler {
     this.optionSelectBg.setOrigin(1, 1);
     this.optionSelectContainer.add(this.optionSelectBg);
 
+    this.optionSelectTextContainer = globalScene.add.container(0, 0);
+    this.optionSelectContainer.add(this.optionSelectTextContainer);
+
     this.optionSelectIcons = [];
 
     this.scale = getTextStyleOptions(TextStyle.WINDOW, globalScene.uiTheme).scale;
@@ -109,33 +113,50 @@ export default abstract class AbstractOptionSelectUiHandler extends UiHandler {
       this.optionSelectIcons.splice(0, this.optionSelectIcons.length);
     }
 
-    const optionsWithScroll = (this.config?.options && this.config?.options.length > (this.config?.maxOptions!)) ? this.getOptionsWithScroll() : options;
+    const optionsWithScroll =
+      this.config?.options && this.config?.options.length > this.config?.maxOptions!
+        ? this.getOptionsWithScroll()
+        : options;
 
     // Setting the initial text to establish the width of the select object. We consider all options, even ones that are not displayed,
     // Except in the case of autocomplete, where we don't want to set up a text element with potentially hundreds of lines.
-    const optionsForWidth = globalScene.ui.getMode() === Mode.AUTO_COMPLETE ? optionsWithScroll : options;
+    const optionsForWidth = globalScene.ui.getMode() === UiMode.AUTO_COMPLETE ? optionsWithScroll : options;
     this.optionSelectText = addBBCodeTextObject(
-      0, 0, optionsForWidth.map(o => o.item
-        ? `[shadow=${getTextColor(o.style ?? this.defaultTextStyle, true, globalScene.uiTheme)}][color=${getTextColor(o.style ?? TextStyle.WINDOW, false, globalScene.uiTheme)}]    ${o.label}[/color][/shadow]`
-        : `[shadow=${getTextColor(o.style ?? this.defaultTextStyle, true, globalScene.uiTheme)}][color=${getTextColor(o.style ?? TextStyle.WINDOW, false, globalScene.uiTheme)}]${o.label}[/color][/shadow]`
-      ).join("\n"),
-      TextStyle.WINDOW, { maxLines: options.length, lineSpacing: 12 }
+      0,
+      0,
+      optionsForWidth
+        .map(o =>
+          o.item
+            ? `[shadow=${getTextColor(o.style ?? this.defaultTextStyle, true, globalScene.uiTheme)}][color=${getTextColor(o.style ?? TextStyle.WINDOW, false, globalScene.uiTheme)}]    ${o.label}[/color][/shadow]`
+            : `[shadow=${getTextColor(o.style ?? this.defaultTextStyle, true, globalScene.uiTheme)}][color=${getTextColor(o.style ?? TextStyle.WINDOW, false, globalScene.uiTheme)}]${o.label}[/color][/shadow]`,
+        )
+        .join("\n"),
+      TextStyle.WINDOW,
+      { maxLines: options.length, lineSpacing: 12 },
     );
     this.optionSelectText.setOrigin(0, 0);
     this.optionSelectText.setName("text-option-select");
-    this.optionSelectContainer.add(this.optionSelectText);
-    this.optionSelectContainer.setPosition((globalScene.game.canvas.width / 6) - 1 - (this.config?.xOffset || 0), -48 + (this.config?.yOffset || 0));
+    this.optionSelectTextContainer.add(this.optionSelectText);
+    this.optionSelectContainer.setPosition(
+      globalScene.game.canvas.width / 6 - 1 - (this.config?.xOffset || 0),
+      -48 + (this.config?.yOffset || 0),
+    );
     this.optionSelectBg.width = Math.max(this.optionSelectText.displayWidth + 24, this.getWindowWidth());
     this.optionSelectBg.height = this.getWindowHeight();
-    this.optionSelectText.setPosition(this.optionSelectBg.x - this.optionSelectBg.width + 12 + 24 * this.scale, this.optionSelectBg.y - this.optionSelectBg.height + 2 + 42 * this.scale);
+    this.optionSelectTextContainer.setPosition(
+      this.optionSelectBg.x - this.optionSelectBg.width + 12 + 24 * this.scale,
+      this.optionSelectBg.y - this.optionSelectBg.height + 2 + 42 * this.scale,
+    );
 
     // Now that the container and background widths are established, we can set up the proper text restricted to visible options
-    this.optionSelectText.setText(optionsWithScroll.map(o => o.item
-      ? `[shadow=${getTextColor(o.style ?? this.defaultTextStyle, true, globalScene.uiTheme)}][color=${getTextColor(o.style ?? TextStyle.WINDOW, false, globalScene.uiTheme)}]    ${o.label}[/color][/shadow]`
-      : `[shadow=${getTextColor(o.style ?? this.defaultTextStyle, true, globalScene.uiTheme)}][color=${getTextColor(o.style ?? TextStyle.WINDOW, false, globalScene.uiTheme)}]${o.label}[/color][/shadow]`
-    ).join("\n")
-
-    );
+    this.textContent = optionsWithScroll
+      .map(o =>
+        o.item
+          ? `[shadow=${getTextColor(o.style ?? this.defaultTextStyle, true, globalScene.uiTheme)}][color=${getTextColor(o.style ?? TextStyle.WINDOW, false, globalScene.uiTheme)}]    ${o.label}[/color][/shadow]`
+          : `[shadow=${getTextColor(o.style ?? this.defaultTextStyle, true, globalScene.uiTheme)}][color=${getTextColor(o.style ?? TextStyle.WINDOW, false, globalScene.uiTheme)}]${o.label}[/color][/shadow]`,
+      )
+      .join("\n");
+    this.optionSelectText.setText(this.textContent);
 
     options.forEach((option: OptionSelectItem, i: number) => {
       if (option.item) {
@@ -143,7 +164,7 @@ export default abstract class AbstractOptionSelectUiHandler extends UiHandler {
         itemIcon.setScale(3 * this.scale);
         this.optionSelectIcons.push(itemIcon);
 
-        this.optionSelectContainer.add(itemIcon);
+        this.optionSelectTextContainer.add(itemIcon);
 
         itemIcon.setPositionRelative(this.optionSelectText, 36 * this.scale, 7 + i * (114 * this.scale - 3));
 
@@ -152,13 +173,13 @@ export default abstract class AbstractOptionSelectUiHandler extends UiHandler {
           itemOverlayIcon.setScale(3 * this.scale);
           this.optionSelectIcons.push(itemOverlayIcon);
 
-          this.optionSelectContainer.add(itemOverlayIcon);
+          this.optionSelectTextContainer.add(itemOverlayIcon);
 
           itemOverlayIcon.setPositionRelative(this.optionSelectText, 36 * this.scale, 7 + i * (114 * this.scale - 3));
 
           if (option.itemArgs) {
-            itemIcon.setTint(argbFromRgba(Utils.rgbHexToRgba(option.itemArgs[0])));
-            itemOverlayIcon.setTint(argbFromRgba(Utils.rgbHexToRgba(option.itemArgs[1])));
+            itemIcon.setTint(argbFromRgba(rgbHexToRgba(option.itemArgs[0])));
+            itemOverlayIcon.setTint(argbFromRgba(rgbHexToRgba(option.itemArgs[1])));
           }
         }
       }
@@ -184,9 +205,9 @@ export default abstract class AbstractOptionSelectUiHandler extends UiHandler {
 
     if (this.config.delay) {
       this.blockInput = true;
-      this.optionSelectText.setAlpha(0.5);
+      this.optionSelectTextContainer.setAlpha(0.5);
       this.cursorObj?.setAlpha(0.8);
-      globalScene.time.delayedCall(Utils.fixedInt(this.config.delay), () => this.unblockInput());
+      globalScene.time.delayedCall(fixedInt(this.config.delay), () => this.unblockInput());
     }
 
     if (this.config?.supportHover) {
@@ -229,7 +250,7 @@ export default abstract class AbstractOptionSelectUiHandler extends UiHandler {
       } else {
         ui.playError();
       }
-    } else if (button === Button.SUBMIT && ui.getMode() === Mode.AUTO_COMPLETE) {
+    } else if (button === Button.SUBMIT && ui.getMode() === UiMode.AUTO_COMPLETE) {
       // this is here to differentiate between a Button.SUBMIT vs Button.ACTION within the autocomplete handler
       // this is here because Button.ACTION is picked up as z on the keyboard, meaning if you're typing and hit z, it'll select the option you've chosen
       success = true;
@@ -278,7 +299,7 @@ export default abstract class AbstractOptionSelectUiHandler extends UiHandler {
     }
 
     this.blockInput = false;
-    this.optionSelectText.setAlpha(1);
+    this.optionSelectTextContainer.setAlpha(1);
     this.cursorObj?.setAlpha(1);
   }
 
@@ -295,8 +316,12 @@ export default abstract class AbstractOptionSelectUiHandler extends UiHandler {
 
     const optionsScrollTotal = options.length;
     const optionStartIndex = this.scrollCursor;
-    const optionEndIndex = Math.min(optionsScrollTotal, optionStartIndex +
-      (!optionStartIndex || this.scrollCursor + (this.config.maxOptions - 1) >= optionsScrollTotal ? this.config.maxOptions - 1 : this.config.maxOptions - 2)
+    const optionEndIndex = Math.min(
+      optionsScrollTotal,
+      optionStartIndex +
+        (!optionStartIndex || this.scrollCursor + (this.config.maxOptions - 1) >= optionsScrollTotal
+          ? this.config.maxOptions - 1
+          : this.config.maxOptions - 2),
     );
 
     if (this.config?.maxOptions && options.length > this.config.maxOptions) {
@@ -306,14 +331,14 @@ export default abstract class AbstractOptionSelectUiHandler extends UiHandler {
         options.unshift({
           label: scrollUpLabel,
           handler: () => true,
-          style: this.defaultTextStyle
+          style: this.defaultTextStyle,
         });
       }
       if (optionEndIndex < optionsScrollTotal) {
         options.push({
           label: scrollDownLabel,
           handler: () => true,
-          style: this.defaultTextStyle
+          style: this.defaultTextStyle,
         });
       }
     }
@@ -332,13 +357,12 @@ export default abstract class AbstractOptionSelectUiHandler extends UiHandler {
     const changed = this.fullCursor !== fullCursor;
 
     if (changed && this.config?.maxOptions && this.config.options.length > this.config.maxOptions) {
-
       // If the fullCursor is the last possible value, we go to the bottom
       if (fullCursor === this.unskippedIndices.length - 1) {
         this.fullCursor = fullCursor;
         this.cursor = this.config.maxOptions - (this.config.options.length - this.unskippedIndices[fullCursor]);
         this.scrollCursor = this.config.options.length - this.config.maxOptions + 1;
-      // If the fullCursor is the first possible value, we go to the top
+        // If the fullCursor is the first possible value, we go to the top
       } else if (fullCursor === 0) {
         this.fullCursor = fullCursor;
         this.cursor = this.unskippedIndices[fullCursor];
@@ -385,7 +409,11 @@ export default abstract class AbstractOptionSelectUiHandler extends UiHandler {
     }
 
     this.cursorObj.setScale(this.scale * 6);
-    this.cursorObj.setPositionRelative(this.optionSelectBg, 12, 102 * this.scale + this.cursor * (114 * this.scale - 3));
+    this.cursorObj.setPositionRelative(
+      this.optionSelectBg,
+      12,
+      102 * this.scale + this.cursor * (114 * this.scale - 3),
+    );
 
     return changed;
   }
diff --git a/src/ui/achv-bar.ts b/src/ui/achv-bar.ts
index 9196399f40f..1e068157afa 100644
--- a/src/ui/achv-bar.ts
+++ b/src/ui/achv-bar.ts
@@ -28,7 +28,18 @@ export default class AchvBar extends Phaser.GameObjects.Container {
     this.defaultWidth = 200;
     this.defaultHeight = 40;
 
-    this.bg = globalScene.add.nineslice(0, 0, "achv_bar", undefined, this.defaultWidth, this.defaultHeight, 41, 6, 16, 4);
+    this.bg = globalScene.add.nineslice(
+      0,
+      0,
+      "achv_bar",
+      undefined,
+      this.defaultWidth,
+      this.defaultHeight,
+      41,
+      6,
+      16,
+      4,
+    );
     this.bg.setOrigin(0, 0);
 
     this.add(this.bg);
@@ -37,15 +48,21 @@ export default class AchvBar extends Phaser.GameObjects.Container {
     this.icon.setOrigin(0, 0);
     this.add(this.icon);
 
-    this.titleText = addTextObject(40, 3, "", TextStyle.MESSAGE, { fontSize: "72px" });
+    this.titleText = addTextObject(40, 3, "", TextStyle.MESSAGE, {
+      fontSize: "72px",
+    });
     this.titleText.setOrigin(0, 0);
     this.add(this.titleText);
 
-    this.scoreText = addTextObject(150, 3, "", TextStyle.MESSAGE, { fontSize: "72px" });
+    this.scoreText = addTextObject(150, 3, "", TextStyle.MESSAGE, {
+      fontSize: "72px",
+    });
     this.scoreText.setOrigin(1, 0);
     this.add(this.scoreText);
 
-    this.descriptionText = addTextObject(43, 16, "", TextStyle.WINDOW_ALT, { fontSize: "72px" });
+    this.descriptionText = addTextObject(43, 16, "", TextStyle.WINDOW_ALT, {
+      fontSize: "72px",
+    });
     this.descriptionText.setOrigin(0, 0);
     this.add(this.descriptionText);
 
@@ -80,23 +97,29 @@ export default class AchvBar extends Phaser.GameObjects.Container {
     }
 
     // Take the width of the default interface or the title if longest
-    this.bg.width = Math.max(this.defaultWidth, this.icon.displayWidth + this.titleText.displayWidth + this.scoreText.displayWidth + 16);
+    this.bg.width = Math.max(
+      this.defaultWidth,
+      this.icon.displayWidth + this.titleText.displayWidth + this.scoreText.displayWidth + 16,
+    );
 
     this.scoreText.x = this.bg.width - 2;
     this.descriptionText.width = this.bg.width - this.icon.displayWidth - 16;
     this.descriptionText.setWordWrapWidth(this.descriptionText.width * 6);
 
     // Take the height of the default interface or the description if longest
-    this.bg.height = Math.max(this.defaultHeight, this.titleText.displayHeight + this.descriptionText.displayHeight + 8);
-    this.icon.y = (this.bg.height / 2) - (this.icon.height / 2);
+    this.bg.height = Math.max(
+      this.defaultHeight,
+      this.titleText.displayHeight + this.descriptionText.displayHeight + 8,
+    );
+    this.icon.y = this.bg.height / 2 - this.icon.height / 2;
 
     globalScene.playSound("se/achv");
 
     globalScene.tweens.add({
       targets: this,
-      x: (globalScene.game.canvas.width / 6) - (this.bg.width / 2),
+      x: globalScene.game.canvas.width / 6 - this.bg.width / 2,
       duration: 500,
-      ease: "Sine.easeOut"
+      ease: "Sine.easeOut",
     });
 
     globalScene.time.delayedCall(10000, () => this.hide(this.playerGender));
@@ -105,14 +128,14 @@ export default class AchvBar extends Phaser.GameObjects.Container {
     this.shown = true;
   }
 
-  protected hide(playerGender: PlayerGender): void {
+  protected hide(_playerGender: PlayerGender): void {
     if (!this.shown) {
       return;
     }
 
     globalScene.tweens.add({
       targets: this,
-      x: (globalScene.game.canvas.width / 6),
+      x: globalScene.game.canvas.width / 6,
       duration: 500,
       ease: "Sine.easeIn",
       onComplete: () => {
@@ -122,7 +145,7 @@ export default class AchvBar extends Phaser.GameObjects.Container {
           const shifted = this.queue.shift();
           shifted && this.showAchv(shifted);
         }
-      }
+      },
     });
   }
 }
diff --git a/src/ui/achvs-ui-handler.ts b/src/ui/achvs-ui-handler.ts
index 74a121c231b..d0c8b716c7a 100644
--- a/src/ui/achvs-ui-handler.ts
+++ b/src/ui/achvs-ui-handler.ts
@@ -6,7 +6,7 @@ import type { Voucher } from "#app/system/voucher";
 import { getVoucherTypeIcon, getVoucherTypeName, vouchers } from "#app/system/voucher";
 import MessageUiHandler from "#app/ui/message-ui-handler";
 import { addTextObject, TextStyle } from "#app/ui/text";
-import type { Mode } from "#app/ui/ui";
+import type { UiMode } from "#enums/ui-mode";
 import { addWindow } from "#app/ui/ui-theme";
 import { ScrollBar } from "#app/ui/scroll-bar";
 import { PlayerGender } from "#enums/player-gender";
@@ -14,17 +14,17 @@ import { globalScene } from "#app/global-scene";
 
 enum Page {
   ACHIEVEMENTS,
-  VOUCHERS
+  VOUCHERS,
 }
 
 interface LanguageSetting {
-  TextSize: string,
+  TextSize: string;
 }
 
 const languageSettings: { [key: string]: LanguageSetting } = {
-  "de":{
-    TextSize: "80px"
-  }
+  de: {
+    TextSize: "80px",
+  },
 };
 
 export default class AchvsUiHandler extends MessageUiHandler {
@@ -59,7 +59,7 @@ export default class AchvsUiHandler extends MessageUiHandler {
   private cursorObj: Phaser.GameObjects.NineSlice | null;
   private currentPage: Page;
 
-  constructor(mode: Mode | null = null) {
+  constructor(mode: UiMode | null = null) {
     super(mode);
 
     this.achvsTotal = Object.keys(achvs).length;
@@ -72,9 +72,12 @@ export default class AchvsUiHandler extends MessageUiHandler {
 
     this.mainContainer = globalScene.add.container(1, -(globalScene.game.canvas.height / 6) + 1);
 
-    this.mainContainer.setInteractive(new Phaser.Geom.Rectangle(0, 0, globalScene.game.canvas.width / 6, globalScene.game.canvas.height / 6), Phaser.Geom.Rectangle.Contains);
+    this.mainContainer.setInteractive(
+      new Phaser.Geom.Rectangle(0, 0, globalScene.game.canvas.width / 6, globalScene.game.canvas.height / 6),
+      Phaser.Geom.Rectangle.Contains,
+    );
 
-    this.headerBg = addWindow(0, 0, (globalScene.game.canvas.width / 6) - 2, 24);
+    this.headerBg = addWindow(0, 0, globalScene.game.canvas.width / 6 - 2, 24);
     this.headerBg.setOrigin(0, 0);
 
     this.headerText = addTextObject(0, 0, "", TextStyle.SETTINGS_LABEL);
@@ -83,7 +86,9 @@ export default class AchvsUiHandler extends MessageUiHandler {
     this.headerActionButton = new Phaser.GameObjects.Sprite(globalScene, 0, 0, "keyboard", "ACTION.png");
     this.headerActionButton.setOrigin(0, 0);
     this.headerActionButton.setPositionRelative(this.headerBg, 236, 6);
-    this.headerActionText = addTextObject(0, 0, "", TextStyle.WINDOW, { fontSize:"60px" });
+    this.headerActionText = addTextObject(0, 0, "", TextStyle.WINDOW, {
+      fontSize: "60px",
+    });
     this.headerActionText.setOrigin(0, 0);
     this.headerActionText.setPositionRelative(this.headerBg, 264, 8);
 
@@ -91,14 +96,27 @@ export default class AchvsUiHandler extends MessageUiHandler {
     const genderIndex = globalScene.gameData.gender ?? PlayerGender.MALE;
     const genderStr = PlayerGender[genderIndex].toLowerCase();
 
-    this.achvsName = i18next.t("achv:Achievements.name", { context: genderStr });
+    this.achvsName = i18next.t("achv:Achievements.name", {
+      context: genderStr,
+    });
     this.vouchersName = i18next.t("voucher:vouchers");
 
-    this.iconsBg = addWindow(0, this.headerBg.height, (globalScene.game.canvas.width / 6) - 2, (globalScene.game.canvas.height / 6) - this.headerBg.height - 68);
+    this.iconsBg = addWindow(
+      0,
+      this.headerBg.height,
+      globalScene.game.canvas.width / 6 - 2,
+      globalScene.game.canvas.height / 6 - this.headerBg.height - 68,
+    );
     this.iconsBg.setOrigin(0, 0);
 
     const yOffset = 6;
-    this.scrollBar = new ScrollBar(this.iconsBg.width - 9, this.iconsBg.y + yOffset, 4, this.iconsBg.height - yOffset * 2, this.ROWS);
+    this.scrollBar = new ScrollBar(
+      this.iconsBg.width - 9,
+      this.iconsBg.y + yOffset,
+      4,
+      this.iconsBg.height - yOffset * 2,
+      this.ROWS,
+    );
 
     this.iconsContainer = globalScene.add.container(5, this.headerBg.height + 8);
 
@@ -144,10 +162,12 @@ export default class AchvsUiHandler extends MessageUiHandler {
     this.unlockText.setOrigin(0.5, 0.5);
     this.unlockText.setPositionRelative(unlockBg, unlockBg.width / 2, unlockBg.height / 2);
 
-    const descriptionBg = addWindow(0, titleBg.y + titleBg.height, (globalScene.game.canvas.width / 6) - 2, 42);
+    const descriptionBg = addWindow(0, titleBg.y + titleBg.height, globalScene.game.canvas.width / 6 - 2, 42);
     descriptionBg.setOrigin(0, 0);
 
-    const descriptionText = addTextObject(0, 0, "", TextStyle.WINDOW, { maxLines: 2 });
+    const descriptionText = addTextObject(0, 0, "", TextStyle.WINDOW, {
+      maxLines: 2,
+    });
     descriptionText.setWordWrapWidth(1870);
     descriptionText.setOrigin(0, 0);
     descriptionText.setPositionRelative(descriptionBg, 8, 4);
@@ -200,7 +220,9 @@ export default class AchvsUiHandler extends MessageUiHandler {
     const genderIndex = globalScene.gameData.gender ?? PlayerGender.MALE;
     const genderStr = PlayerGender[genderIndex].toLowerCase();
 
-    achv.name = i18next.t(`achv:${achv.localizationKey}.name`, { context: genderStr });
+    achv.name = i18next.t(`achv:${achv.localizationKey}.name`, {
+      context: genderStr,
+    });
     achv.description = getAchievementDescription(achv.localizationKey);
     const achvUnlocks = globalScene.gameData.achvUnlocks;
     const unlocked = achvUnlocks.hasOwnProperty(achv.id);
@@ -208,7 +230,9 @@ export default class AchvsUiHandler extends MessageUiHandler {
     this.titleText.setText(unlocked ? achv.name : "???");
     this.showText(!hidden ? achv.description : "");
     this.scoreText.setText(`${achv.score}pt`);
-    this.unlockText.setText(unlocked ? new Date(achvUnlocks[achv.id]).toLocaleDateString() : i18next.t("achv:Locked.name"));
+    this.unlockText.setText(
+      unlocked ? new Date(achvUnlocks[achv.id]).toLocaleDateString() : i18next.t("achv:Locked.name"),
+    );
   }
 
   protected showVoucher(voucher: Voucher) {
@@ -217,7 +241,9 @@ export default class AchvsUiHandler extends MessageUiHandler {
 
     this.titleText.setText(getVoucherTypeName(voucher.voucherType));
     this.showText(voucher.description);
-    this.unlockText.setText(unlocked ? new Date(voucherUnlocks[voucher.id]).toLocaleDateString() : i18next.t("voucher:locked"));
+    this.unlockText.setText(
+      unlocked ? new Date(voucherUnlocks[voucher.id]).toLocaleDateString() : i18next.t("voucher:locked"),
+    );
   }
 
   processInput(button: Button): boolean {
@@ -245,14 +271,14 @@ export default class AchvsUiHandler extends MessageUiHandler {
       globalScene.ui.revertMode();
     } else {
       const rowIndex = Math.floor(this.cursor / this.COLS);
-      const itemOffset = (this.scrollCursor * this.COLS);
+      const itemOffset = this.scrollCursor * this.COLS;
       switch (button) {
         case Button.UP:
           if (this.cursor < this.COLS) {
             if (this.scrollCursor) {
               success = this.setScrollCursor(this.scrollCursor - 1);
             } else {
-            // Wrap around to the last row
+              // Wrap around to the last row
               success = this.setScrollCursor(Math.ceil(this.currentTotal / this.COLS) - this.ROWS);
               let newCursorIndex = this.cursor + (this.ROWS - 1) * this.COLS;
               if (newCursorIndex > this.currentTotal - this.scrollCursor * this.COLS - 1) {
@@ -268,10 +294,10 @@ export default class AchvsUiHandler extends MessageUiHandler {
           const canMoveDown = itemOffset + 1 < this.currentTotal;
           if (rowIndex >= this.ROWS - 1) {
             if (this.scrollCursor < Math.ceil(this.currentTotal / this.COLS) - this.ROWS && canMoveDown) {
-            // scroll down one row
+              // scroll down one row
               success = this.setScrollCursor(this.scrollCursor + 1);
             } else {
-            // wrap back to the first row
+              // wrap back to the first row
               success = this.setScrollCursor(0) && this.setCursor(this.cursor % this.COLS);
             }
           } else if (canMoveDown) {
@@ -286,8 +312,8 @@ export default class AchvsUiHandler extends MessageUiHandler {
           }
           break;
         case Button.RIGHT:
-          if ((this.cursor + 1) % this.COLS === 0 || (this.cursor + itemOffset) === (this.currentTotal - 1)) {
-            success = this.setCursor(this.cursor - this.cursor % this.COLS);
+          if ((this.cursor + 1) % this.COLS === 0 || this.cursor + itemOffset === this.currentTotal - 1) {
+            success = this.setCursor(this.cursor - (this.cursor % this.COLS));
           } else {
             success = this.setCursor(this.cursor + 1);
           }
@@ -372,7 +398,6 @@ export default class AchvsUiHandler extends MessageUiHandler {
     return true;
   }
 
-
   /**
    * updateAchvIcons(): void
    * Determines what data is to be displayed on the UI and updates it accordingly based on the current value of this.scrollCursor
diff --git a/src/ui/admin-ui-handler.ts b/src/ui/admin-ui-handler.ts
index e31acda6fa2..67ae3118863 100644
--- a/src/ui/admin-ui-handler.ts
+++ b/src/ui/admin-ui-handler.ts
@@ -1,18 +1,17 @@
 import { Button } from "#app/enums/buttons";
 import { pokerogueApi } from "#app/plugins/api/pokerogue-api";
-import { formatText } from "#app/utils";
+import { formatText } from "#app/utils/common";
 import type { InputFieldConfig } from "./form-modal-ui-handler";
 import { FormModalUiHandler } from "./form-modal-ui-handler";
 import type { ModalConfig } from "./modal-ui-handler";
 import { TextStyle } from "./text";
-import { Mode } from "./ui";
+import { UiMode } from "#enums/ui-mode";
 import { globalScene } from "#app/global-scene";
 
 type AdminUiHandlerService = "discord" | "google";
 type AdminUiHandlerServiceMode = "Link" | "Unlink";
 
 export default class AdminUiHandler extends FormModalUiHandler {
-
   private adminMode: AdminMode;
   private adminResult: AdminSearchInfo;
   private config: ModalConfig;
@@ -23,16 +22,15 @@ export default class AdminUiHandler extends FormModalUiHandler {
   private readonly ERR_REQUIRED_FIELD = (field: string) => {
     if (field === "username") {
       return `${formatText(field)} is required`;
-    } else {
-      return `${formatText(field)} Id is required`;
     }
+    return `${formatText(field)} Id is required`;
   };
   // returns a string saying whether a username has been successfully linked/unlinked to discord/google
   private readonly SUCCESS_SERVICE_MODE = (service: string, mode: string) => {
     return `Username and ${service} successfully ${mode.toLowerCase()}ed`;
   };
 
-  constructor(mode: Mode | null = null) {
+  constructor(mode: UiMode | null = null) {
     super(mode);
   }
 
@@ -45,19 +43,19 @@ export default class AdminUiHandler extends FormModalUiHandler {
   }
 
   override getMargin(): [number, number, number, number] {
-    return [ 0, 0, 0, 0 ];
+    return [0, 0, 0, 0];
   }
 
   override getButtonLabels(): string[] {
     switch (this.adminMode) {
       case AdminMode.LINK:
-        return [ "Link Account", "Cancel" ];
+        return ["Link Account", "Cancel"];
       case AdminMode.SEARCH:
-        return [ "Find account", "Cancel" ];
+        return ["Find account", "Cancel"];
       case AdminMode.ADMIN:
-        return [ "Back to search", "Cancel" ];
+        return ["Back to search", "Cancel"];
       default:
-        return [ "Activate ADMIN", "Cancel" ];
+        return ["Activate ADMIN", "Cancel"];
     }
   }
 
@@ -65,20 +63,32 @@ export default class AdminUiHandler extends FormModalUiHandler {
     const inputFieldConfigs: InputFieldConfig[] = [];
     switch (this.adminMode) {
       case AdminMode.LINK:
-        inputFieldConfigs.push( { label: "Username" });
-        inputFieldConfigs.push( { label: "Discord ID" });
+        inputFieldConfigs.push({ label: "Username" });
+        inputFieldConfigs.push({ label: "Discord ID" });
         break;
       case AdminMode.SEARCH:
-        inputFieldConfigs.push( { label: "Username" });
+        inputFieldConfigs.push({ label: "Username" });
         break;
       case AdminMode.ADMIN:
-        const adminResult = this.adminResult ?? { username: "", discordId: "", googleId: "", lastLoggedIn: "", registered: "" };
+        const adminResult = this.adminResult ?? {
+          username: "",
+          discordId: "",
+          googleId: "",
+          lastLoggedIn: "",
+          registered: "",
+        };
         // Discord and Google ID fields that are not empty get locked, other fields are all locked
-        inputFieldConfigs.push( { label: "Username", isReadOnly: true });
-        inputFieldConfigs.push( { label: "Discord ID", isReadOnly: adminResult.discordId !== "" });
-        inputFieldConfigs.push( { label: "Google ID", isReadOnly: adminResult.googleId !== "" });
-        inputFieldConfigs.push( { label: "Last played", isReadOnly: true });
-        inputFieldConfigs.push( { label: "Registered", isReadOnly: true });
+        inputFieldConfigs.push({ label: "Username", isReadOnly: true });
+        inputFieldConfigs.push({
+          label: "Discord ID",
+          isReadOnly: adminResult.discordId !== "",
+        });
+        inputFieldConfigs.push({
+          label: "Google ID",
+          isReadOnly: adminResult.googleId !== "",
+        });
+        inputFieldConfigs.push({ label: "Last played", isReadOnly: true });
+        inputFieldConfigs.push({ label: "Registered", isReadOnly: true });
         break;
     }
     return inputFieldConfigs;
@@ -96,7 +106,13 @@ export default class AdminUiHandler extends FormModalUiHandler {
   show(args: any[]): boolean {
     this.config = args[0] as ModalConfig; // config
     this.adminMode = args[1] as AdminMode; // admin mode
-    this.adminResult = args[2] ?? { username: "", discordId: "", googleId: "", lastLoggedIn: "", registered: "" }; // admin result, if any
+    this.adminResult = args[2] ?? {
+      username: "",
+      discordId: "",
+      googleId: "",
+      lastLoggedIn: "",
+      registered: "",
+    }; // admin result, if any
     const isMessageError = args[3]; // is the message shown a success or error
 
     const fields = this.getInputFieldConfigs();
@@ -122,23 +138,22 @@ export default class AdminUiHandler extends FormModalUiHandler {
     if (super.show(args)) {
       this.populateFields(this.adminMode, this.adminResult);
       const originalSubmitAction = this.submitAction;
-      this.submitAction = (_) => {
+      this.submitAction = _ => {
         this.submitAction = originalSubmitAction;
         const adminSearchResult: AdminSearchInfo = this.convertInputsToAdmin(); // this converts the input texts into a single object for use later
         const validFields = this.areFieldsValid(this.adminMode);
         if (validFields.error) {
-          globalScene.ui.setMode(Mode.LOADING, { buttonActions: []}); // this is here to force a loading screen to allow the admin tool to reopen again if there's an error
+          globalScene.ui.setMode(UiMode.LOADING, { buttonActions: [] }); // this is here to force a loading screen to allow the admin tool to reopen again if there's an error
           return this.showMessage(validFields.errorMessage ?? "", adminSearchResult, true);
         }
-        globalScene.ui.setMode(Mode.LOADING, { buttonActions: []});
+        globalScene.ui.setMode(UiMode.LOADING, { buttonActions: [] });
         if (this.adminMode === AdminMode.LINK) {
           this.adminLinkUnlink(adminSearchResult, "discord", "Link") // calls server to link discord
             .then(response => {
               if (response.error) {
                 return this.showMessage(response.errorType, adminSearchResult, true); // error or some kind
-              } else {
-                return this.showMessage(this.SUCCESS_SERVICE_MODE("discord", "link"), adminSearchResult, false); // success
               }
+              return this.showMessage(this.SUCCESS_SERVICE_MODE("discord", "link"), adminSearchResult, false); // success
             });
         } else if (this.adminMode === AdminMode.SEARCH) {
           this.adminSearch(adminSearchResult) // admin search for username
@@ -158,7 +173,13 @@ export default class AdminUiHandler extends FormModalUiHandler {
   }
 
   showMessage(message: string, adminResult: AdminSearchInfo, isError: boolean) {
-    globalScene.ui.setMode(Mode.ADMIN, Object.assign(this.config, { errorMessage: message?.trim() }), this.adminMode, adminResult, isError);
+    globalScene.ui.setMode(
+      UiMode.ADMIN,
+      Object.assign(this.config, { errorMessage: message?.trim() }),
+      this.adminMode,
+      adminResult,
+      isError,
+    );
     if (isError) {
       globalScene.ui.playError();
     } else {
@@ -184,9 +205,14 @@ export default class AdminUiHandler extends FormModalUiHandler {
       case AdminMode.ADMIN:
         Object.keys(adminResult).forEach((aR, i) => {
           this.inputs[i].setText(adminResult[aR]);
-          if (aR === "discordId" || aR === "googleId") { // this is here to add the icons for linking/unlinking of google/discord IDs
+          if (aR === "discordId" || aR === "googleId") {
+            // this is here to add the icons for linking/unlinking of google/discord IDs
             const nineSlice = this.inputContainers[i].list.find(iC => iC.type === "NineSlice");
-            const img = globalScene.add.image(this.inputContainers[i].x + nineSlice!.width + this.buttonGap, this.inputContainers[i].y + (Math.floor(nineSlice!.height / 2)), adminResult[aR] === "" ? "link_icon" : "unlink_icon");
+            const img = globalScene.add.image(
+              this.inputContainers[i].x + nineSlice!.width + this.buttonGap,
+              this.inputContainers[i].y + Math.floor(nineSlice!.height / 2),
+              adminResult[aR] === "" ? "link_icon" : "unlink_icon",
+            );
             img.setName(`adminBtn_${aR}`);
             img.setOrigin(0.5, 0.5);
             img.setInteractive();
@@ -195,24 +221,30 @@ export default class AdminUiHandler extends FormModalUiHandler {
               const mode = adminResult[aR] === "" ? "Link" : "Unlink"; // this figures out if we're linking or unlinking a service
               const validFields = this.areFieldsValid(this.adminMode, service);
               if (validFields.error) {
-                globalScene.ui.setMode(Mode.LOADING, { buttonActions: []}); // this is here to force a loading screen to allow the admin tool to reopen again if there's an error
+                globalScene.ui.setMode(UiMode.LOADING, { buttonActions: [] }); // this is here to force a loading screen to allow the admin tool to reopen again if there's an error
                 return this.showMessage(validFields.errorMessage ?? "", adminResult, true);
               }
-              this.adminLinkUnlink(this.convertInputsToAdmin(), service as AdminUiHandlerService, mode).then(response => { // attempts to link/unlink depending on the service
-                if (response.error) {
-                  globalScene.ui.setMode(Mode.LOADING, { buttonActions: []});
-                  return this.showMessage(response.errorType, adminResult, true); // fail
-                } else { // success, reload panel with new results
-                  globalScene.ui.setMode(Mode.LOADING, { buttonActions: []});
-                  this.adminSearch(adminResult)
-                    .then(response => {
-                      if (response.error) {
-                        return this.showMessage(response.errorType, adminResult, true);
-                      }
-                      return this.showMessage(this.SUCCESS_SERVICE_MODE(service, mode), response.adminSearchResult ?? adminResult, false);
-                    });
-                }
-              });
+              this.adminLinkUnlink(this.convertInputsToAdmin(), service as AdminUiHandlerService, mode).then(
+                response => {
+                  // attempts to link/unlink depending on the service
+                  if (response.error) {
+                    globalScene.ui.setMode(UiMode.LOADING, { buttonActions: [] });
+                    return this.showMessage(response.errorType, adminResult, true); // fail
+                  }
+                  // success, reload panel with new results
+                  globalScene.ui.setMode(UiMode.LOADING, { buttonActions: [] });
+                  this.adminSearch(adminResult).then(response => {
+                    if (response.error) {
+                      return this.showMessage(response.errorType, adminResult, true);
+                    }
+                    return this.showMessage(
+                      this.SUCCESS_SERVICE_MODE(service, mode),
+                      response.adminSearchResult ?? adminResult,
+                      false,
+                    );
+                  });
+                },
+              );
             });
             this.addInteractionHoverEffect(img);
             this.modalContainer.add(img);
@@ -222,47 +254,52 @@ export default class AdminUiHandler extends FormModalUiHandler {
     }
   }
 
-  private areFieldsValid(adminMode: AdminMode, service?: string): { error: boolean; errorMessage?: string; } {
+  private areFieldsValid(adminMode: AdminMode, service?: string): { error: boolean; errorMessage?: string } {
     switch (adminMode) {
       case AdminMode.LINK:
-        if (!this.inputs[0].text) { // username missing from link panel
+        if (!this.inputs[0].text) {
+          // username missing from link panel
           return {
             error: true,
-            errorMessage: this.ERR_REQUIRED_FIELD("username")
+            errorMessage: this.ERR_REQUIRED_FIELD("username"),
           };
         }
-        if (!this.inputs[1].text) { // discordId missing from linking panel
+        if (!this.inputs[1].text) {
+          // discordId missing from linking panel
           return {
             error: true,
-            errorMessage: this.ERR_REQUIRED_FIELD("discord")
+            errorMessage: this.ERR_REQUIRED_FIELD("discord"),
           };
         }
         break;
       case AdminMode.SEARCH:
-        if (!this.inputs[0].text) { // username missing from search panel
+        if (!this.inputs[0].text) {
+          // username missing from search panel
           return {
             error: true,
-            errorMessage: this.ERR_REQUIRED_FIELD("username")
+            errorMessage: this.ERR_REQUIRED_FIELD("username"),
           };
         }
         break;
       case AdminMode.ADMIN:
-        if (!this.inputs[1].text && service === "discord") { // discordId missing from admin panel
+        if (!this.inputs[1].text && service === "discord") {
+          // discordId missing from admin panel
           return {
             error: true,
-            errorMessage: this.ERR_REQUIRED_FIELD(service)
+            errorMessage: this.ERR_REQUIRED_FIELD(service),
           };
         }
-        if (!this.inputs[2].text && service === "google") { // googleId missing from admin panel
+        if (!this.inputs[2].text && service === "google") {
+          // googleId missing from admin panel
           return {
             error: true,
-            errorMessage: this.ERR_REQUIRED_FIELD(service)
+            errorMessage: this.ERR_REQUIRED_FIELD(service),
           };
         }
         break;
     }
     return {
-      error: false
+      error: false,
     };
   }
 
@@ -272,25 +309,32 @@ export default class AdminUiHandler extends FormModalUiHandler {
       discordId: this.inputs[1]?.node ? this.inputs[1]?.text : "",
       googleId: this.inputs[2]?.node ? this.inputs[2]?.text : "",
       lastLoggedIn: this.inputs[3]?.node ? this.inputs[3]?.text : "",
-      registered: this.inputs[4]?.node ? this.inputs[4]?.text : ""
+      registered: this.inputs[4]?.node ? this.inputs[4]?.text : "",
     };
   }
 
   private async adminSearch(adminSearchResult: AdminSearchInfo) {
     try {
-      const [ adminInfo, errorType ] = await pokerogueApi.admin.searchAccount({ username: adminSearchResult.username });
-      if (errorType || !adminInfo) { // error - if adminInfo.status === this.httpUserNotFoundErrorCode that means the username can't be found in the db
+      const [adminInfo, errorType] = await pokerogueApi.admin.searchAccount({
+        username: adminSearchResult.username,
+      });
+      if (errorType || !adminInfo) {
+        // error - if adminInfo.status === this.httpUserNotFoundErrorCode that means the username can't be found in the db
         return { adminSearchResult: adminSearchResult, error: true, errorType };
-      } else { // success
-        return { adminSearchResult: adminInfo, error: false };
       }
+      // success
+      return { adminSearchResult: adminInfo, error: false };
     } catch (err) {
       console.error(err);
       return { error: true, errorType: err };
     }
   }
 
-  private async adminLinkUnlink(adminSearchResult: AdminSearchInfo, service: AdminUiHandlerService, mode: AdminUiHandlerServiceMode) {
+  private async adminLinkUnlink(
+    adminSearchResult: AdminSearchInfo,
+    service: AdminUiHandlerService,
+    mode: AdminUiHandlerServiceMode,
+  ) {
     try {
       let errorType: string | null = null;
 
@@ -329,10 +373,9 @@ export default class AdminUiHandler extends FormModalUiHandler {
       if (errorType) {
         // error - if response.status === this.httpUserNotFoundErrorCode that means the username can't be found in the db
         return { adminSearchResult: adminSearchResult, error: true, errorType };
-      } else {
-        // success!
-        return { adminSearchResult: adminSearchResult, error: false };
       }
+      // success!
+      return { adminSearchResult: adminSearchResult, error: false };
     } catch (err) {
       console.error(err);
       return { error: true, errorType: err };
@@ -341,19 +384,24 @@ export default class AdminUiHandler extends FormModalUiHandler {
 
   private updateAdminPanelInfo(adminSearchResult: AdminSearchInfo, mode?: AdminMode) {
     mode = mode ?? AdminMode.ADMIN;
-    globalScene.ui.setMode(Mode.ADMIN, {
-      buttonActions: [
-        // we double revert here and below to go back 2 layers of menus
-        () => {
-          globalScene.ui.revertMode();
-          globalScene.ui.revertMode();
-        },
-        () => {
-          globalScene.ui.revertMode();
-          globalScene.ui.revertMode();
-        }
-      ]
-    }, mode, adminSearchResult);
+    globalScene.ui.setMode(
+      UiMode.ADMIN,
+      {
+        buttonActions: [
+          // we double revert here and below to go back 2 layers of menus
+          () => {
+            globalScene.ui.revertMode();
+            globalScene.ui.revertMode();
+          },
+          () => {
+            globalScene.ui.revertMode();
+            globalScene.ui.revertMode();
+          },
+        ],
+      },
+      mode,
+      adminSearchResult,
+    );
   }
 
   clear(): void {
@@ -361,7 +409,7 @@ export default class AdminUiHandler extends FormModalUiHandler {
 
     // this is used to remove the existing fields on the admin panel so they can be updated
 
-    const itemsToRemove: string[] = [ "formLabel", "adminBtn" ]; // this is the start of the names for each element we want to remove
+    const itemsToRemove: string[] = ["formLabel", "adminBtn"]; // this is the start of the names for each element we want to remove
     const removeArray: any[] = [];
     const mC = this.modalContainer.list;
     for (let i = mC.length - 1; i >= 0; i--) {
@@ -370,7 +418,11 @@ export default class AdminUiHandler extends FormModalUiHandler {
        * It then also checks for any containers that are within this.modalContainer, and checks if any of its child elements are of type rexInputText
        * and if either of these conditions are met, the element is destroyed.
        */
-      if (itemsToRemove.some(iTR => mC[i].name.includes(iTR)) || (mC[i].type === "Container" && (mC[i] as Phaser.GameObjects.Container).list.find(m => m.type === "rexInputText"))) {
+      if (
+        itemsToRemove.some(iTR => mC[i].name.includes(iTR)) ||
+        (mC[i].type === "Container" &&
+          (mC[i] as Phaser.GameObjects.Container).list.find(m => m.type === "rexInputText"))
+      ) {
         removeArray.push(mC[i]);
       }
     }
@@ -384,7 +436,7 @@ export default class AdminUiHandler extends FormModalUiHandler {
 export enum AdminMode {
   LINK,
   SEARCH,
-  ADMIN
+  ADMIN,
 }
 
 export function getAdminModeName(adminMode: AdminMode): string {
diff --git a/src/ui/arena-flyout.ts b/src/ui/arena-flyout.ts
index 7e9b24d1d97..ab3bd13b47a 100644
--- a/src/ui/arena-flyout.ts
+++ b/src/ui/arena-flyout.ts
@@ -5,12 +5,18 @@ import { WeatherType } from "#enums/weather-type";
 import { TerrainType } from "#app/data/terrain";
 import { addWindow, WindowVariant } from "./ui-theme";
 import type { ArenaEvent } from "#app/events/arena";
-import { ArenaEventType, TagAddedEvent, TagRemovedEvent, TerrainChangedEvent, WeatherChangedEvent } from "#app/events/arena";
+import {
+  ArenaEventType,
+  TagAddedEvent,
+  TagRemovedEvent,
+  TerrainChangedEvent,
+  WeatherChangedEvent,
+} from "#app/events/arena";
 import type { TurnEndEvent } from "../events/battle-scene";
 import { BattleSceneEventType } from "../events/battle-scene";
 import { ArenaTagType } from "#enums/arena-tag-type";
 import TimeOfDayWidget from "./time-of-day-widget";
-import * as Utils from "../utils";
+import { toCamelCaseString, formatText, fixedInt } from "#app/utils/common";
 import type { ParseKeys } from "i18next";
 import i18next from "i18next";
 
@@ -27,7 +33,7 @@ interface ArenaEffectInfo {
   /** The enum string representation of the effect */
   name: string;
   /** {@linkcode ArenaEffectType} type of effect */
-  effecType: ArenaEffectType,
+  effecType: ArenaEffectType;
 
   /** The maximum duration set by the effect */
   maxDuration: number;
@@ -41,10 +47,10 @@ export function getFieldEffectText(arenaTagType: string): string {
   if (!arenaTagType || arenaTagType === ArenaTagType.NONE) {
     return arenaTagType;
   }
-  const effectName = Utils.toCamelCaseString(arenaTagType);
+  const effectName = toCamelCaseString(arenaTagType);
   const i18nKey = `arenaFlyout:${effectName}` as ParseKeys;
   const resultName = i18next.t(i18nKey);
-  return (!resultName || resultName === i18nKey) ? Utils.formatText(arenaTagType) : resultName;
+  return !resultName || resultName === i18nKey ? formatText(arenaTagType) : resultName;
 }
 
 export class ArenaFlyout extends Phaser.GameObjects.Container {
@@ -93,8 +99,8 @@ export class ArenaFlyout extends Phaser.GameObjects.Container {
   private readonly fieldEffectInfo: ArenaEffectInfo[] = [];
 
   // Stores callbacks in a variable so they can be unsubscribed from when destroyed
-  private readonly onNewArenaEvent =  (event: Event) => this.onNewArena(event);
-  private readonly onTurnEndEvent =   (event: Event) => this.onTurnEnd(event);
+  private readonly onNewArenaEvent = (event: Event) => this.onNewArena(event);
+  private readonly onTurnEndEvent = (event: Event) => this.onTurnEnd(event);
 
   private readonly onFieldEffectChangedEvent = (event: Event) => this.onFieldEffectChanged(event);
 
@@ -116,19 +122,34 @@ export class ArenaFlyout extends Phaser.GameObjects.Container {
     this.flyoutWindow = addWindow(0, 0, this.flyoutWidth, this.flyoutHeight, false, false, 0, 0, WindowVariant.THIN);
     this.flyoutContainer.add(this.flyoutWindow);
 
-    this.flyoutWindowHeader = addWindow(this.flyoutWidth / 2, 0, this.flyoutWidth / 2, 14, false, false, 0, 0, WindowVariant.XTHIN);
+    this.flyoutWindowHeader = addWindow(
+      this.flyoutWidth / 2,
+      0,
+      this.flyoutWidth / 2,
+      14,
+      false,
+      false,
+      0,
+      0,
+      WindowVariant.XTHIN,
+    );
     this.flyoutWindowHeader.setOrigin();
 
     this.flyoutContainer.add(this.flyoutWindowHeader);
 
-    this.flyoutTextHeader = addTextObject(this.flyoutWidth / 2, 0, i18next.t("arenaFlyout:activeBattleEffects"), TextStyle.BATTLE_INFO);
+    this.flyoutTextHeader = addTextObject(
+      this.flyoutWidth / 2,
+      0,
+      i18next.t("arenaFlyout:activeBattleEffects"),
+      TextStyle.BATTLE_INFO,
+    );
     this.flyoutTextHeader.setFontSize(54);
     this.flyoutTextHeader.setAlign("center");
     this.flyoutTextHeader.setOrigin();
 
     this.flyoutContainer.add(this.flyoutTextHeader);
 
-    this.timeOfDayWidget = new TimeOfDayWidget((this.flyoutWidth / 2) + (this.flyoutWindowHeader.displayWidth / 2));
+    this.timeOfDayWidget = new TimeOfDayWidget(this.flyoutWidth / 2 + this.flyoutWindowHeader.displayWidth / 2);
     this.flyoutContainer.add(this.timeOfDayWidget);
 
     this.flyoutTextHeaderPlayer = addTextObject(6, 5, i18next.t("arenaFlyout:player"), TextStyle.SUMMARY_BLUE);
@@ -138,14 +159,24 @@ export class ArenaFlyout extends Phaser.GameObjects.Container {
 
     this.flyoutContainer.add(this.flyoutTextHeaderPlayer);
 
-    this.flyoutTextHeaderField = addTextObject(this.flyoutWidth / 2, 5, i18next.t("arenaFlyout:neutral"), TextStyle.SUMMARY_GREEN);
+    this.flyoutTextHeaderField = addTextObject(
+      this.flyoutWidth / 2,
+      5,
+      i18next.t("arenaFlyout:neutral"),
+      TextStyle.SUMMARY_GREEN,
+    );
     this.flyoutTextHeaderField.setFontSize(54);
     this.flyoutTextHeaderField.setAlign("center");
     this.flyoutTextHeaderField.setOrigin(0.5, 0);
 
     this.flyoutContainer.add(this.flyoutTextHeaderField);
 
-    this.flyoutTextHeaderEnemy = addTextObject(this.flyoutWidth - 6, 5, i18next.t("arenaFlyout:enemy"), TextStyle.SUMMARY_RED);
+    this.flyoutTextHeaderEnemy = addTextObject(
+      this.flyoutWidth - 6,
+      5,
+      i18next.t("arenaFlyout:enemy"),
+      TextStyle.SUMMARY_RED,
+    );
     this.flyoutTextHeaderEnemy.setFontSize(54);
     this.flyoutTextHeaderEnemy.setAlign("right");
     this.flyoutTextHeaderEnemy.setOrigin(1, 0);
@@ -181,20 +212,19 @@ export class ArenaFlyout extends Phaser.GameObjects.Container {
 
     // Subscribes to required events available on game start
     globalScene.eventTarget.addEventListener(BattleSceneEventType.NEW_ARENA, this.onNewArenaEvent);
-    globalScene.eventTarget.addEventListener(BattleSceneEventType.TURN_END,  this.onTurnEndEvent);
+    globalScene.eventTarget.addEventListener(BattleSceneEventType.TURN_END, this.onTurnEndEvent);
   }
 
-  private onNewArena(event: Event) {
+  private onNewArena(_event: Event) {
     this.fieldEffectInfo.length = 0;
 
     // Subscribes to required events available on battle start
     globalScene.arena.eventTarget.addEventListener(ArenaEventType.WEATHER_CHANGED, this.onFieldEffectChangedEvent);
     globalScene.arena.eventTarget.addEventListener(ArenaEventType.TERRAIN_CHANGED, this.onFieldEffectChangedEvent);
-    globalScene.arena.eventTarget.addEventListener(ArenaEventType.TAG_ADDED,       this.onFieldEffectChangedEvent);
-    globalScene.arena.eventTarget.addEventListener(ArenaEventType.TAG_REMOVED,     this.onFieldEffectChangedEvent);
+    globalScene.arena.eventTarget.addEventListener(ArenaEventType.TAG_ADDED, this.onFieldEffectChangedEvent);
+    globalScene.arena.eventTarget.addEventListener(ArenaEventType.TAG_REMOVED, this.onFieldEffectChangedEvent);
   }
 
-
   /** Clears out the current string stored in all arena effect texts */
   private clearText() {
     this.flyoutTextPlayer.text = "";
@@ -252,7 +282,7 @@ export class ArenaFlyout extends Phaser.GameObjects.Container {
 
     let foundIndex: number;
     switch (arenaEffectChangedEvent.constructor) {
-      case TagAddedEvent:
+      case TagAddedEvent: {
         const tagAddedEvent = arenaEffectChangedEvent as TagAddedEvent;
         const isArenaTrapTag = globalScene.arena.getTag(tagAddedEvent.arenaTagType) instanceof ArenaTrapTag;
         let arenaEffectType: ArenaEffectType;
@@ -265,15 +295,20 @@ export class ArenaFlyout extends Phaser.GameObjects.Container {
           arenaEffectType = ArenaEffectType.ENEMY;
         }
 
-        const existingTrapTagIndex = isArenaTrapTag ? this.fieldEffectInfo.findIndex(e => tagAddedEvent.arenaTagType === e.tagType && arenaEffectType === e.effecType) : -1;
-        let name: string =  getFieldEffectText(ArenaTagType[tagAddedEvent.arenaTagType]);
+        const existingTrapTagIndex = isArenaTrapTag
+          ? this.fieldEffectInfo.findIndex(
+              e => tagAddedEvent.arenaTagType === e.tagType && arenaEffectType === e.effecType,
+            )
+          : -1;
+        let name: string = getFieldEffectText(ArenaTagType[tagAddedEvent.arenaTagType]);
 
         if (isArenaTrapTag) {
           if (existingTrapTagIndex !== -1) {
             const layers = tagAddedEvent.arenaTagMaxLayers > 1 ? ` (${tagAddedEvent.arenaTagLayers})` : "";
             this.fieldEffectInfo[existingTrapTagIndex].name = `${name}${layers}`;
             break;
-          } else if (tagAddedEvent.arenaTagMaxLayers > 1) {
+          }
+          if (tagAddedEvent.arenaTagMaxLayers > 1) {
             name = `${name} (${tagAddedEvent.arenaTagLayers})`;
           }
         }
@@ -283,40 +318,45 @@ export class ArenaFlyout extends Phaser.GameObjects.Container {
           effecType: arenaEffectType,
           maxDuration: tagAddedEvent.duration,
           duration: tagAddedEvent.duration,
-          tagType: tagAddedEvent.arenaTagType
+          tagType: tagAddedEvent.arenaTagType,
         });
         break;
-      case TagRemovedEvent:
+      }
+      case TagRemovedEvent: {
         const tagRemovedEvent = arenaEffectChangedEvent as TagRemovedEvent;
         foundIndex = this.fieldEffectInfo.findIndex(info => info.tagType === tagRemovedEvent.arenaTagType);
 
-        if (foundIndex !== -1) { // If the tag was being tracked, remove it
+        if (foundIndex !== -1) {
+          // If the tag was being tracked, remove it
           this.fieldEffectInfo.splice(foundIndex, 1);
         }
         break;
+      }
 
       case WeatherChangedEvent:
-      case TerrainChangedEvent:
+      case TerrainChangedEvent: {
         const fieldEffectChangedEvent = arenaEffectChangedEvent as WeatherChangedEvent | TerrainChangedEvent;
 
         // Stores the old Weather/Terrain name in case it's in the array already
-        const oldName =
-        getFieldEffectText(fieldEffectChangedEvent instanceof WeatherChangedEvent
-          ? WeatherType[fieldEffectChangedEvent.oldWeatherType]
-          : TerrainType[fieldEffectChangedEvent.oldTerrainType]);
+        const oldName = getFieldEffectText(
+          fieldEffectChangedEvent instanceof WeatherChangedEvent
+            ? WeatherType[fieldEffectChangedEvent.oldWeatherType]
+            : TerrainType[fieldEffectChangedEvent.oldTerrainType],
+        );
         // Stores the new Weather/Terrain info
         const newInfo = {
-          name:
-          getFieldEffectText(fieldEffectChangedEvent instanceof WeatherChangedEvent
-            ? WeatherType[fieldEffectChangedEvent.newWeatherType]
-            : TerrainType[fieldEffectChangedEvent.newTerrainType]),
-          effecType: fieldEffectChangedEvent instanceof WeatherChangedEvent
-            ? ArenaEffectType.WEATHER
-            : ArenaEffectType.TERRAIN,
+          name: getFieldEffectText(
+            fieldEffectChangedEvent instanceof WeatherChangedEvent
+              ? WeatherType[fieldEffectChangedEvent.newWeatherType]
+              : TerrainType[fieldEffectChangedEvent.newTerrainType],
+          ),
+          effecType:
+            fieldEffectChangedEvent instanceof WeatherChangedEvent ? ArenaEffectType.WEATHER : ArenaEffectType.TERRAIN,
           maxDuration: fieldEffectChangedEvent.duration,
-          duration: fieldEffectChangedEvent.duration };
+          duration: fieldEffectChangedEvent.duration,
+        };
 
-        foundIndex = this.fieldEffectInfo.findIndex(info => [ newInfo.name, oldName ].includes(info.name));
+        foundIndex = this.fieldEffectInfo.findIndex(info => [newInfo.name, oldName].includes(info.name));
         if (foundIndex === -1) {
           if (newInfo.name !== undefined) {
             this.fieldEffectInfo.push(newInfo); // Adds the info to the array if it doesn't already exist and is defined
@@ -327,6 +367,7 @@ export class ArenaFlyout extends Phaser.GameObjects.Container {
           this.fieldEffectInfo[foundIndex] = newInfo; // Otherwise, replace the old info
         }
         break;
+      }
     }
 
     this.updateFieldText();
@@ -353,7 +394,8 @@ export class ArenaFlyout extends Phaser.GameObjects.Container {
       }
 
       --info.duration;
-      if (info.duration <= 0) { // Removes the item if the duration has expired
+      if (info.duration <= 0) {
+        // Removes the item if the duration has expired
         this.fieldEffectInfo.splice(this.fieldEffectInfo.indexOf(info), 1);
       }
     }
@@ -369,21 +411,21 @@ export class ArenaFlyout extends Phaser.GameObjects.Container {
     globalScene.tweens.add({
       targets: this.flyoutParent,
       x: visible ? this.anchorX : this.anchorX - this.translationX,
-      duration: Utils.fixedInt(125),
+      duration: fixedInt(125),
       ease: "Sine.easeInOut",
       alpha: visible ? 1 : 0,
-      onComplete: () => this.timeOfDayWidget.parentVisible = visible,
+      onComplete: () => (this.timeOfDayWidget.parentVisible = visible),
     });
   }
 
   public destroy(fromScene?: boolean): void {
     globalScene.eventTarget.removeEventListener(BattleSceneEventType.NEW_ARENA, this.onNewArenaEvent);
-    globalScene.eventTarget.removeEventListener(BattleSceneEventType.TURN_END,  this.onTurnEndEvent);
+    globalScene.eventTarget.removeEventListener(BattleSceneEventType.TURN_END, this.onTurnEndEvent);
 
     globalScene.arena.eventTarget.removeEventListener(ArenaEventType.WEATHER_CHANGED, this.onFieldEffectChangedEvent);
     globalScene.arena.eventTarget.removeEventListener(ArenaEventType.TERRAIN_CHANGED, this.onFieldEffectChangedEvent);
-    globalScene.arena.eventTarget.removeEventListener(ArenaEventType.TAG_ADDED,       this.onFieldEffectChangedEvent);
-    globalScene.arena.eventTarget.removeEventListener(ArenaEventType.TAG_REMOVED,     this.onFieldEffectChangedEvent);
+    globalScene.arena.eventTarget.removeEventListener(ArenaEventType.TAG_ADDED, this.onFieldEffectChangedEvent);
+    globalScene.arena.eventTarget.removeEventListener(ArenaEventType.TAG_REMOVED, this.onFieldEffectChangedEvent);
 
     super.destroy(fromScene);
   }
diff --git a/src/ui/autocomplete-ui-handler.ts b/src/ui/autocomplete-ui-handler.ts
index 23abdb85772..ba1802c8582 100644
--- a/src/ui/autocomplete-ui-handler.ts
+++ b/src/ui/autocomplete-ui-handler.ts
@@ -1,10 +1,10 @@
 import { Button } from "#enums/buttons";
 import AbstractOptionSelectUiHandler from "./abstact-option-select-ui-handler";
-import { Mode } from "./ui";
+import { UiMode } from "#enums/ui-mode";
 
 export default class AutoCompleteUiHandler extends AbstractOptionSelectUiHandler {
   modalContainer: Phaser.GameObjects.Container;
-  constructor(mode: Mode = Mode.OPTION_SELECT) {
+  constructor(mode: UiMode = UiMode.OPTION_SELECT) {
     super(mode);
   }
 
@@ -27,8 +27,15 @@ export default class AutoCompleteUiHandler extends AbstractOptionSelectUiHandler
   protected setupOptions() {
     super.setupOptions();
     if (this.modalContainer) {
-      this.optionSelectContainer.setSize(this.optionSelectContainer.height, Math.max(this.optionSelectText.displayWidth + 24, this.getWindowWidth()));
-      this.optionSelectContainer.setPositionRelative(this.modalContainer, this.optionSelectBg.width, this.optionSelectBg.height + 50);
+      this.optionSelectContainer.setSize(
+        this.optionSelectContainer.height,
+        Math.max(this.optionSelectText.displayWidth + 24, this.getWindowWidth()),
+      );
+      this.optionSelectContainer.setPositionRelative(
+        this.modalContainer,
+        this.optionSelectBg.width,
+        this.optionSelectBg.height + 50,
+      );
     }
   }
 
diff --git a/src/ui/awaitable-ui-handler.ts b/src/ui/awaitable-ui-handler.ts
index cc970358cb2..3c577fd4411 100644
--- a/src/ui/awaitable-ui-handler.ts
+++ b/src/ui/awaitable-ui-handler.ts
@@ -1,4 +1,4 @@
-import type { Mode } from "./ui";
+import type { UiMode } from "#enums/ui-mode";
 import UiHandler from "./ui-handler";
 import { Button } from "#enums/buttons";
 import { globalScene } from "#app/global-scene";
@@ -6,10 +6,10 @@ import { globalScene } from "#app/global-scene";
 export default abstract class AwaitableUiHandler extends UiHandler {
   protected awaitingActionInput: boolean;
   protected onActionInput: Function | null;
-  public tutorialActive: boolean = false;
+  public tutorialActive = false;
   public tutorialOverlay: Phaser.GameObjects.Rectangle;
 
-  constructor(mode: Mode | null = null) {
+  constructor(mode: UiMode | null = null) {
     super(mode);
   }
 
@@ -32,7 +32,14 @@ export default abstract class AwaitableUiHandler extends UiHandler {
    */
   initTutorialOverlay(container: Phaser.GameObjects.Container) {
     if (!this.tutorialOverlay) {
-      this.tutorialOverlay = new Phaser.GameObjects.Rectangle(globalScene, -1, -1, globalScene.scaledCanvas.width, globalScene.scaledCanvas.height, 0x070707);
+      this.tutorialOverlay = new Phaser.GameObjects.Rectangle(
+        globalScene,
+        -1,
+        -1,
+        globalScene.scaledCanvas.width,
+        globalScene.scaledCanvas.height,
+        0x070707,
+      );
       this.tutorialOverlay.setName("tutorial-overlay");
       this.tutorialOverlay.setOrigin(0, 0);
       this.tutorialOverlay.setAlpha(0);
diff --git a/src/ui/ball-ui-handler.ts b/src/ui/ball-ui-handler.ts
index a402d11ef1d..eb7c208662a 100644
--- a/src/ui/ball-ui-handler.ts
+++ b/src/ui/ball-ui-handler.ts
@@ -1,12 +1,13 @@
 import { getPokeballName } from "../data/pokeball";
 import { addTextObject, getTextStyleOptions, TextStyle } from "./text";
 import { Command } from "./command-ui-handler";
-import { Mode } from "./ui";
+import { UiMode } from "#enums/ui-mode";
 import UiHandler from "./ui-handler";
 import { addWindow } from "./ui-theme";
 import { Button } from "#enums/buttons";
 import type { CommandPhase } from "#app/phases/command-phase";
 import { globalScene } from "#app/global-scene";
+import i18next from "i18next";
 
 export default class BallUiHandler extends UiHandler {
   private pokeballSelectContainer: Phaser.GameObjects.Container;
@@ -15,10 +16,10 @@ export default class BallUiHandler extends UiHandler {
 
   private cursorObj: Phaser.GameObjects.Image | null;
 
-  private scale: number = 0.1666666667;
+  private scale = 0.1666666667;
 
   constructor() {
-    super(Mode.BALL);
+    super(UiMode.BALL);
   }
 
   setup() {
@@ -31,10 +32,13 @@ export default class BallUiHandler extends UiHandler {
     for (let pb = 0; pb < Object.keys(globalScene.pokeballCounts).length; pb++) {
       optionsTextContent += `${getPokeballName(pb)}\n`;
     }
-    optionsTextContent += "Cancel";
+    optionsTextContent += i18next.t("pokeball:cancel");
     const optionsText = addTextObject(0, 0, optionsTextContent, TextStyle.WINDOW, { align: "right", maxLines: 6 });
     const optionsTextWidth = optionsText.displayWidth;
-    this.pokeballSelectContainer = globalScene.add.container((globalScene.game.canvas.width / 6) - 51 - Math.max(64, optionsTextWidth), -49);
+    this.pokeballSelectContainer = globalScene.add.container(
+      globalScene.game.canvas.width / 6 - 51 - Math.max(64, optionsTextWidth),
+      -49,
+    );
     this.pokeballSelectContainer.setVisible(false);
     ui.add(this.pokeballSelectContainer);
 
@@ -46,7 +50,9 @@ export default class BallUiHandler extends UiHandler {
     optionsText.setPositionRelative(this.pokeballSelectBg, 42, 9);
     optionsText.setLineSpacing(this.scale * 72);
 
-    this.countsText = addTextObject(0, 0, "", TextStyle.WINDOW, { maxLines: 5 });
+    this.countsText = addTextObject(0, 0, "", TextStyle.WINDOW, {
+      maxLines: 5,
+    });
     this.countsText.setPositionRelative(this.pokeballSelectBg, 18, 9);
     this.countsText.setLineSpacing(this.scale * 72);
     this.pokeballSelectContainer.add(this.countsText);
@@ -77,15 +83,15 @@ export default class BallUiHandler extends UiHandler {
       if (button === Button.ACTION && this.cursor < pokeballTypeCount) {
         if (globalScene.pokeballCounts[this.cursor]) {
           if (commandPhase.handleCommand(Command.BALL, this.cursor)) {
-            globalScene.ui.setMode(Mode.COMMAND, commandPhase.getFieldIndex());
-            globalScene.ui.setMode(Mode.MESSAGE);
+            globalScene.ui.setMode(UiMode.COMMAND, commandPhase.getFieldIndex());
+            globalScene.ui.setMode(UiMode.MESSAGE);
             success = true;
           }
         } else {
           ui.playError();
         }
       } else {
-        ui.setMode(Mode.COMMAND, commandPhase.getFieldIndex());
+        ui.setMode(UiMode.COMMAND, commandPhase.getFieldIndex());
         success = true;
       }
     } else {
@@ -107,7 +113,11 @@ export default class BallUiHandler extends UiHandler {
   }
 
   updateCounts() {
-    this.countsText.setText(Object.values(globalScene.pokeballCounts).map(c => `x${c}`).join("\n"));
+    this.countsText.setText(
+      Object.values(globalScene.pokeballCounts)
+        .map(c => `x${c}`)
+        .join("\n"),
+    );
   }
 
   setCursor(cursor: number): boolean {
diff --git a/src/ui/base-stats-overlay.ts b/src/ui/base-stats-overlay.ts
index f2e94fa24a4..0541ae766e5 100644
--- a/src/ui/base-stats-overlay.ts
+++ b/src/ui/base-stats-overlay.ts
@@ -1,26 +1,25 @@
 import type { InfoToggle } from "../battle-scene";
 import { TextStyle, addTextObject } from "./text";
 import { addWindow } from "./ui-theme";
-import * as Utils from "../utils";
+import { fixedInt } from "#app/utils/common";
 import i18next from "i18next";
 import { globalScene } from "#app/global-scene";
 
 interface BaseStatsOverlaySettings {
-    scale?:number; // scale the box? A scale of 0.5 is recommended
-    x?: number;
-    y?: number;
-    /** Default is always half the screen, regardless of scale */
-    width?: number;
+  scale?: number; // scale the box? A scale of 0.5 is recommended
+  x?: number;
+  y?: number;
+  /** Default is always half the screen, regardless of scale */
+  width?: number;
 }
 
 const HEIGHT = 120;
 const BORDER = 8;
 const GLOBAL_SCALE = 6;
-const shortStats = [ "HP", "ATK", "DEF", "SPATK", "SPDEF", "SPD" ];
+const shortStats = ["HP", "ATK", "DEF", "SPATK", "SPDEF", "SPD"];
 
 export class BaseStatsOverlay extends Phaser.GameObjects.Container implements InfoToggle {
-
-  public active: boolean = false;
+  public active = false;
 
   private statsLabels: Phaser.GameObjects.Text[] = [];
   private statsRectangles: Phaser.GameObjects.Rectangle[] = [];
@@ -67,8 +66,7 @@ export class BaseStatsOverlay extends Phaser.GameObjects.Container implements In
   }
 
   // show this component with infos for the specific move
-  show(values: number[], total: number):boolean {
-
+  show(values: number[], total: number): boolean {
     for (let i = 0; i < 6; i++) {
       this.statsLabels[i].setText(i18next.t(`pokemonInfo:Stat.${shortStats[i]}shortened`) + ": " + `${values[i]}`);
       // This accounts for base stats up to 200, might not be enough.
@@ -79,7 +77,6 @@ export class BaseStatsOverlay extends Phaser.GameObjects.Container implements In
 
     this.statsTotalLabel.setText(i18next.t("pokedexUiHandler:baseTotal") + ": " + `${total}`);
 
-
     this.setVisible(true);
     this.active = true;
     return true;
@@ -96,9 +93,9 @@ export class BaseStatsOverlay extends Phaser.GameObjects.Container implements In
     }
     globalScene.tweens.add({
       targets: this.statsLabels,
-      duration: Utils.fixedInt(125),
+      duration: fixedInt(125),
       ease: "Sine.easeInOut",
-      alpha: visible ? 1 : 0
+      alpha: visible ? 1 : 0,
     });
     if (!visible) {
       this.setVisible(false);
@@ -110,12 +107,12 @@ export class BaseStatsOverlay extends Phaser.GameObjects.Container implements In
   }
 
   // width of this element
-  static getWidth(scale:number):number {
+  static getWidth(_scale: number): number {
     return globalScene.game.canvas.width / GLOBAL_SCALE / 2;
   }
 
   // height of this element
-  static getHeight(scale:number, onSide?: boolean):number {
+  static getHeight(scale: number, _onSide?: boolean): number {
     return HEIGHT * scale;
   }
 }
diff --git a/src/ui/battle-flyout.ts b/src/ui/battle-flyout.ts
index c716705452c..e590bebcf5a 100644
--- a/src/ui/battle-flyout.ts
+++ b/src/ui/battle-flyout.ts
@@ -1,8 +1,8 @@
 import type { default as Pokemon } from "../field/pokemon";
 import { addTextObject, TextStyle } from "./text";
-import * as Utils from "../utils";
+import { fixedInt } from "#app/utils/common";
 import { globalScene } from "#app/global-scene";
-import type Move from "#app/data/move";
+import type Move from "#app/data/moves/move";
 import type { BerryUsedEvent, MoveUsedEvent } from "../events/battle-scene";
 import { BattleSceneEventType } from "../events/battle-scene";
 import { BerryType } from "#enums/berry-type";
@@ -13,12 +13,12 @@ import { getPokemonNameWithAffix } from "#app/messages";
 /** Container for info about a {@linkcode Move} */
 interface MoveInfo {
   /** The {@linkcode Move} itself */
-  move: Move,
+  move: Move;
 
   /** The maximum PP of the {@linkcode Move} */
-  maxPp: number,
+  maxPp: number;
   /** The amount of PP used by the {@linkcode Move} */
-  ppUsed: number,
+  ppUsed: number;
 }
 
 /** A Flyout Menu attached to each {@linkcode BattleInfo} object on the field UI */
@@ -55,7 +55,7 @@ export default class BattleFlyout extends Phaser.GameObjects.Container {
   private moveInfo: MoveInfo[] = new Array();
 
   /** Current state of the flyout's visibility */
-  public flyoutVisible: boolean = false;
+  public flyoutVisible = false;
 
   // Stores callbacks in a variable so they can be unsubscribed from when destroyed
   private readonly onMoveUsedEvent = (event: Event) => this.onMoveUsed(event);
@@ -68,7 +68,7 @@ export default class BattleFlyout extends Phaser.GameObjects.Container {
     this.player = player;
 
     this.translationX = this.player ? -this.flyoutWidth : this.flyoutWidth;
-    this.anchorX = (this.player ? -130 : -40);
+    this.anchorX = this.player ? -130 : -40;
     this.anchorY = -2.5 + (this.player ? -18.5 : -13);
 
     this.flyoutParent = globalScene.add.container(this.anchorX - this.translationX, this.anchorY);
@@ -87,8 +87,11 @@ export default class BattleFlyout extends Phaser.GameObjects.Container {
     // Loops through and sets the position of each text object according to the width and height of the flyout
     for (let i = 0; i < 4; i++) {
       this.flyoutText[i] = addTextObject(
-        (this.flyoutWidth / 4) + (this.flyoutWidth / 2) * (i % 2),
-        (this.flyoutHeight / 4) + (this.flyoutHeight / 2) * (i < 2 ? 0 : 1), "???", TextStyle.BATTLE_INFO);
+        this.flyoutWidth / 4 + (this.flyoutWidth / 2) * (i % 2),
+        this.flyoutHeight / 4 + (this.flyoutHeight / 2) * (i < 2 ? 0 : 1),
+        "???",
+        TextStyle.BATTLE_INFO,
+      );
       this.flyoutText[i].setFontSize(45);
       this.flyoutText[i].setLineSpacing(-10);
       this.flyoutText[i].setAlign("center");
@@ -98,9 +101,25 @@ export default class BattleFlyout extends Phaser.GameObjects.Container {
     this.flyoutContainer.add(this.flyoutText);
 
     this.flyoutContainer.add(
-      new Phaser.GameObjects.Rectangle(globalScene, this.flyoutWidth / 2, 0, 1, this.flyoutHeight + (globalScene.uiTheme === UiTheme.LEGACY ? 1 : 0), 0x212121).setOrigin(0.5, 0));
+      new Phaser.GameObjects.Rectangle(
+        globalScene,
+        this.flyoutWidth / 2,
+        0,
+        1,
+        this.flyoutHeight + (globalScene.uiTheme === UiTheme.LEGACY ? 1 : 0),
+        0x212121,
+      ).setOrigin(0.5, 0),
+    );
     this.flyoutContainer.add(
-      new Phaser.GameObjects.Rectangle(globalScene, 0, this.flyoutHeight / 2, this.flyoutWidth + 6, 1, 0x212121).setOrigin(0, 0.5));
+      new Phaser.GameObjects.Rectangle(
+        globalScene,
+        0,
+        this.flyoutHeight / 2,
+        this.flyoutWidth + 6,
+        1,
+        0x212121,
+      ).setOrigin(0, 0.5),
+    );
   }
 
   /**
@@ -135,9 +154,8 @@ export default class BattleFlyout extends Phaser.GameObjects.Container {
   /** Updates all of the {@linkcode MoveInfo} objects in the moveInfo array */
   private onMoveUsed(event: Event) {
     const moveUsedEvent = event as MoveUsedEvent;
-    if (!moveUsedEvent
-      || moveUsedEvent.pokemonId !== this.pokemon?.id
-      || moveUsedEvent.move.id === Moves.STRUGGLE) { // Ignore Struggle
+    if (!moveUsedEvent || moveUsedEvent.pokemonId !== this.pokemon?.id || moveUsedEvent.move.id === Moves.STRUGGLE) {
+      // Ignore Struggle
       return;
     }
 
@@ -145,7 +163,11 @@ export default class BattleFlyout extends Phaser.GameObjects.Container {
     if (foundInfo) {
       foundInfo.ppUsed = moveUsedEvent.ppUsed;
     } else {
-      this.moveInfo.push({ move: moveUsedEvent.move, maxPp: moveUsedEvent.move.pp, ppUsed: moveUsedEvent.ppUsed });
+      this.moveInfo.push({
+        move: moveUsedEvent.move,
+        maxPp: moveUsedEvent.move.pp,
+        ppUsed: moveUsedEvent.ppUsed,
+      });
     }
 
     this.setText();
@@ -153,14 +175,18 @@ export default class BattleFlyout extends Phaser.GameObjects.Container {
 
   private onBerryUsed(event: Event) {
     const berryUsedEvent = event as BerryUsedEvent;
-    if (!berryUsedEvent
-      || berryUsedEvent.berryModifier.pokemonId !== this.pokemon?.id
-      || berryUsedEvent.berryModifier.berryType !== BerryType.LEPPA) { // We only care about Leppa berries
+    if (
+      !berryUsedEvent ||
+      berryUsedEvent.berryModifier.pokemonId !== this.pokemon?.id ||
+      berryUsedEvent.berryModifier.berryType !== BerryType.LEPPA
+    ) {
+      // We only care about Leppa berries
       return;
     }
 
     const foundInfo = this.moveInfo.find(info => info.ppUsed === info.maxPp);
-    if (!foundInfo) { // This will only happen on a de-sync of PP tracking
+    if (!foundInfo) {
+      // This will only happen on a de-sync of PP tracking
       return;
     }
     foundInfo.ppUsed = Math.max(foundInfo.ppUsed - 10, 0);
@@ -175,7 +201,7 @@ export default class BattleFlyout extends Phaser.GameObjects.Container {
     globalScene.tweens.add({
       targets: this.flyoutParent,
       x: visible ? this.anchorX : this.anchorX - this.translationX,
-      duration: Utils.fixedInt(125),
+      duration: fixedInt(125),
       ease: "Sine.easeInOut",
       alpha: visible ? 1 : 0,
     });
diff --git a/src/ui/battle-info.ts b/src/ui/battle-info.ts
index fa8767f5eb0..2822e8364ec 100644
--- a/src/ui/battle-info.ts
+++ b/src/ui/battle-info.ts
@@ -1,13 +1,13 @@
 import type { EnemyPokemon, default as Pokemon } from "../field/pokemon";
 import { getLevelTotalExp, getLevelRelExp } from "../data/exp";
-import * as Utils from "../utils";
+import { getLocalizedSpriteKey, fixedInt } from "#app/utils/common";
 import { addTextObject, TextStyle } from "./text";
 import { getGenderSymbol, getGenderColor, Gender } from "../data/gender";
 import { StatusEffect } from "#enums/status-effect";
 import { globalScene } from "#app/global-scene";
 import { getTypeRgb } from "#app/data/type";
-import { Type } from "#enums/type";
-import { getVariantTint } from "#app/data/variant";
+import { PokemonType } from "#enums/pokemon-type";
+import { getVariantTint } from "#app/sprites/variant";
 import { Stat } from "#enums/stat";
 import BattleFlyout from "./battle-flyout";
 import { WindowVariant, addWindow } from "./ui-theme";
@@ -25,7 +25,7 @@ export default class BattleInfo extends Phaser.GameObjects.Container {
   private bossSegments: number;
   private offset: boolean;
   private lastName: string | null;
-  private lastTeraType: Type;
+  private lastTeraType: PokemonType;
   private lastStatus: StatusEffect;
   private lastHp: number;
   private lastMaxHp: number;
@@ -73,8 +73,8 @@ export default class BattleInfo extends Phaser.GameObjects.Container {
   public flyoutMenu?: BattleFlyout;
 
   private statOrder: Stat[];
-  private readonly statOrderPlayer = [ Stat.ATK, Stat.DEF, Stat.SPATK, Stat.SPDEF, Stat.ACC, Stat.EVA, Stat.SPD ];
-  private readonly statOrderEnemy = [ Stat.HP, Stat.ATK, Stat.DEF, Stat.SPATK, Stat.SPDEF, Stat.ACC, Stat.EVA, Stat.SPD ];
+  private readonly statOrderPlayer = [Stat.ATK, Stat.DEF, Stat.SPATK, Stat.SPDEF, Stat.ACC, Stat.EVA, Stat.SPD];
+  private readonly statOrderEnemy = [Stat.HP, Stat.ATK, Stat.DEF, Stat.SPATK, Stat.SPDEF, Stat.ACC, Stat.EVA, Stat.SPD];
 
   constructor(x: number, y: number, player: boolean) {
     super(globalScene, x, y);
@@ -84,7 +84,7 @@ export default class BattleInfo extends Phaser.GameObjects.Container {
     this.boss = false;
     this.offset = false;
     this.lastName = null;
-    this.lastTeraType = Type.UNKNOWN;
+    this.lastTeraType = PokemonType.UNKNOWN;
     this.lastStatus = StatusEffect.NONE;
     this.lastHp = -1;
     this.lastMaxHp = -1;
@@ -163,7 +163,7 @@ export default class BattleInfo extends Phaser.GameObjects.Container {
     this.splicedIcon.setInteractive(new Phaser.Geom.Rectangle(0, 0, 12, 15), Phaser.Geom.Rectangle.Contains);
     this.add(this.splicedIcon);
 
-    this.statusIndicator = globalScene.add.sprite(0, 0, Utils.getLocalizedSpriteKey("statuses"));
+    this.statusIndicator = globalScene.add.sprite(0, 0, getLocalizedSpriteKey("statuses"));
     this.statusIndicator.setName("icon_status");
     this.statusIndicator.setVisible(false);
     this.statusIndicator.setOrigin(0, 0);
@@ -200,7 +200,7 @@ export default class BattleInfo extends Phaser.GameObjects.Container {
 
       const expMaskRect = globalScene.make.graphics({});
       expMaskRect.setScale(6);
-      expMaskRect.fillStyle(0xFFFFFF);
+      expMaskRect.fillStyle(0xffffff);
       expMaskRect.beginPath();
       expMaskRect.fillRect(127, 126, 85, 2);
 
@@ -239,7 +239,10 @@ export default class BattleInfo extends Phaser.GameObjects.Container {
       // we do a check for i > statOverflow to see when the stat labels go onto the next column
       // For enemies, we have HP (i=0) by itself then a new column, so we check for i > 0
       // For players, we don't have HP, so we start with i = 0 and i = 1 for our first column, and so need to check for i > 1
-      const statX = i > statOverflow ? this.statNumbers[Math.max(i - 2, 0)].x + this.statNumbers[Math.max(i - 2, 0)].width + paddingX : startingX; // we have the Math.max(i - 2, 0) in there so for i===1 to not return a negative number; since this is now based on anything >0 instead of >1, we need to allow for i-2 < 0
+      const statX =
+        i > statOverflow
+          ? this.statNumbers[Math.max(i - 2, 0)].x + this.statNumbers[Math.max(i - 2, 0)].width + paddingX
+          : startingX; // we have the Math.max(i - 2, 0) in there so for i===1 to not return a negative number; since this is now based on anything >0 instead of >1, we need to allow for i-2 < 0
 
       const baseY = -this.statsBox.height / 2 + 4; // this is the baseline for the y-axis
       let statY: number; // this will be the y-axis placement for the labels
@@ -255,7 +258,12 @@ export default class BattleInfo extends Phaser.GameObjects.Container {
       statLabels.push(statLabel);
       this.statValuesContainer.add(statLabel);
 
-      const statNumber = globalScene.add.sprite(statX + statLabel.width, statY, "pbinfo_stat_numbers", this.statOrder[i] !== Stat.HP ? "3" : "empty");
+      const statNumber = globalScene.add.sprite(
+        statX + statLabel.width,
+        statY,
+        "pbinfo_stat_numbers",
+        this.statOrder[i] !== Stat.HP ? "3" : "empty",
+      );
       statNumber.setName("icon_stat_number_" + i.toString());
       statNumber.setOrigin(0, 0);
       this.statNumbers.push(statNumber);
@@ -265,7 +273,6 @@ export default class BattleInfo extends Phaser.GameObjects.Container {
         statLabel.setVisible(false);
         statNumber.setVisible(false);
       }
-
     });
 
     if (!this.player) {
@@ -275,17 +282,29 @@ export default class BattleInfo extends Phaser.GameObjects.Container {
       this.moveBelow<Phaser.GameObjects.GameObject>(this.flyoutMenu, this.box);
     }
 
-    this.type1Icon = globalScene.add.sprite(player ? -139 : -15, player ? -17 : -15.5, `pbinfo_${player ? "player" : "enemy"}_type1`);
+    this.type1Icon = globalScene.add.sprite(
+      player ? -139 : -15,
+      player ? -17 : -15.5,
+      `pbinfo_${player ? "player" : "enemy"}_type1`,
+    );
     this.type1Icon.setName("icon_type_1");
     this.type1Icon.setOrigin(0, 0);
     this.add(this.type1Icon);
 
-    this.type2Icon = globalScene.add.sprite(player ? -139 : -15, player ? -1 : -2.5, `pbinfo_${player ? "player" : "enemy"}_type2`);
+    this.type2Icon = globalScene.add.sprite(
+      player ? -139 : -15,
+      player ? -1 : -2.5,
+      `pbinfo_${player ? "player" : "enemy"}_type2`,
+    );
     this.type2Icon.setName("icon_type_2");
     this.type2Icon.setOrigin(0, 0);
     this.add(this.type2Icon);
 
-    this.type3Icon = globalScene.add.sprite(player ? -154 : 0, player ? -17 : -15.5, `pbinfo_${player ? "player" : "enemy"}_type`);
+    this.type3Icon = globalScene.add.sprite(
+      player ? -154 : 0,
+      player ? -17 : -15.5,
+      `pbinfo_${player ? "player" : "enemy"}_type`,
+    );
     this.type3Icon.setName("icon_type_3");
     this.type3Icon.setOrigin(0, 0);
     this.add(this.type3Icon);
@@ -324,35 +343,63 @@ export default class BattleInfo extends Phaser.GameObjects.Container {
     this.lastTeraType = pokemon.getTeraType();
 
     this.teraIcon.setPositionRelative(this.nameText, nameTextWidth + this.genderText.displayWidth + 1, 2);
-    this.teraIcon.setVisible(this.lastTeraType !== Type.UNKNOWN);
+    this.teraIcon.setVisible(pokemon.isTerastallized);
     this.teraIcon.on("pointerover", () => {
-      if (this.lastTeraType !== Type.UNKNOWN) {
-        globalScene.ui.showTooltip("", i18next.t("fightUiHandler:teraHover", { type: i18next.t(`pokemonInfo:Type.${Type[this.lastTeraType]}`) }));
+      if (pokemon.isTerastallized) {
+        globalScene.ui.showTooltip(
+          "",
+          i18next.t("fightUiHandler:teraHover", {
+            type: i18next.t(`pokemonInfo:Type.${PokemonType[this.lastTeraType]}`),
+          }),
+        );
       }
     });
     this.teraIcon.on("pointerout", () => globalScene.ui.hideTooltip());
 
-    const isFusion = pokemon.isFusion();
+    const isFusion = pokemon.isFusion(true);
 
-    this.splicedIcon.setPositionRelative(this.nameText, nameTextWidth + this.genderText.displayWidth + 1 + (this.teraIcon.visible ? this.teraIcon.displayWidth + 1 : 0), 2.5);
+    this.splicedIcon.setPositionRelative(
+      this.nameText,
+      nameTextWidth + this.genderText.displayWidth + 1 + (this.teraIcon.visible ? this.teraIcon.displayWidth + 1 : 0),
+      2.5,
+    );
     this.splicedIcon.setVisible(isFusion);
     if (this.splicedIcon.visible) {
-      this.splicedIcon.on("pointerover", () => globalScene.ui.showTooltip("", `${pokemon.species.getName(pokemon.formIndex)}/${pokemon.fusionSpecies?.getName(pokemon.fusionFormIndex)}`));
+      this.splicedIcon.on("pointerover", () =>
+        globalScene.ui.showTooltip(
+          "",
+          `${pokemon.species.getName(pokemon.formIndex)}/${pokemon.fusionSpecies?.getName(pokemon.fusionFormIndex)}`,
+        ),
+      );
       this.splicedIcon.on("pointerout", () => globalScene.ui.hideTooltip());
     }
 
     const doubleShiny = isFusion && pokemon.shiny && pokemon.fusionShiny;
-    const baseVariant = !doubleShiny ? pokemon.getVariant() : pokemon.variant;
+    const baseVariant = !doubleShiny ? pokemon.getVariant(true) : pokemon.variant;
 
-    this.shinyIcon.setPositionRelative(this.nameText, nameTextWidth + this.genderText.displayWidth + 1 + (this.teraIcon.visible ? this.teraIcon.displayWidth + 1 : 0) + (this.splicedIcon.visible ? this.splicedIcon.displayWidth + 1 : 0), 2.5);
+    this.shinyIcon.setPositionRelative(
+      this.nameText,
+      nameTextWidth +
+        this.genderText.displayWidth +
+        1 +
+        (this.teraIcon.visible ? this.teraIcon.displayWidth + 1 : 0) +
+        (this.splicedIcon.visible ? this.splicedIcon.displayWidth + 1 : 0),
+      2.5,
+    );
     this.shinyIcon.setTexture(`shiny_star${doubleShiny ? "_1" : ""}`);
     this.shinyIcon.setVisible(pokemon.isShiny());
     this.shinyIcon.setTint(getVariantTint(baseVariant));
     if (this.shinyIcon.visible) {
-      const shinyDescriptor = doubleShiny || baseVariant ?
-        `${baseVariant === 2 ? i18next.t("common:epicShiny") : baseVariant === 1 ? i18next.t("common:rareShiny") : i18next.t("common:commonShiny")}${doubleShiny ? `/${pokemon.fusionVariant === 2 ? i18next.t("common:epicShiny") : pokemon.fusionVariant === 1 ? i18next.t("common:rareShiny") : i18next.t("common:commonShiny")}` : ""}`
-        : "";
-      this.shinyIcon.on("pointerover", () => globalScene.ui.showTooltip("", `${i18next.t("common:shinyOnHover")}${shinyDescriptor ? ` (${shinyDescriptor})` : ""}`));
+      const shinyDescriptor =
+        doubleShiny || baseVariant
+          ? `${baseVariant === 2 ? i18next.t("common:epicShiny") : baseVariant === 1 ? i18next.t("common:rareShiny") : i18next.t("common:commonShiny")}${doubleShiny ? `/${pokemon.fusionVariant === 2 ? i18next.t("common:epicShiny") : pokemon.fusionVariant === 1 ? i18next.t("common:rareShiny") : i18next.t("common:commonShiny")}` : ""}`
+          : "";
+      this.shinyIcon.on("pointerover", () =>
+        globalScene.ui.showTooltip(
+          "",
+          `${i18next.t("common:shinyOnHover")}${shinyDescriptor ? ` (${shinyDescriptor})` : ""}`,
+        ),
+      );
       this.shinyIcon.on("pointerout", () => globalScene.ui.hideTooltip());
     }
 
@@ -364,7 +411,14 @@ export default class BattleInfo extends Phaser.GameObjects.Container {
 
     if (!this.player) {
       if (this.nameText.visible) {
-        this.nameText.on("pointerover", () => globalScene.ui.showTooltip("", i18next.t("battleInfo:generation", { generation: i18next.t(`starterSelectUiHandler:gen${pokemon.species.generation}`) })));
+        this.nameText.on("pointerover", () =>
+          globalScene.ui.showTooltip(
+            "",
+            i18next.t("battleInfo:generation", {
+              generation: i18next.t(`starterSelectUiHandler:gen${pokemon.species.generation}`),
+            }),
+          ),
+        );
         this.nameText.on("pointerout", () => globalScene.ui.hideTooltip());
       }
 
@@ -372,13 +426,16 @@ export default class BattleInfo extends Phaser.GameObjects.Container {
       this.ownedIcon.setVisible(!!dexEntry.caughtAttr);
       const opponentPokemonDexAttr = pokemon.getDexAttr();
       if (globalScene.gameMode.isClassic) {
-        if (globalScene.gameData.starterData[pokemon.species.getRootSpeciesId()].classicWinCount > 0 && globalScene.gameData.starterData[pokemon.species.getRootSpeciesId(true)].classicWinCount > 0) {
+        if (
+          globalScene.gameData.starterData[pokemon.species.getRootSpeciesId()].classicWinCount > 0 &&
+          globalScene.gameData.starterData[pokemon.species.getRootSpeciesId(true)].classicWinCount > 0
+        ) {
           this.championRibbon.setVisible(true);
         }
       }
 
       // Check if Player owns all genders and forms of the Pokemon
-      const missingDexAttrs = ((dexEntry.caughtAttr & opponentPokemonDexAttr) < opponentPokemonDexAttr);
+      const missingDexAttrs = (dexEntry.caughtAttr & opponentPokemonDexAttr) < opponentPokemonDexAttr;
 
       const ownedAbilityAttrs = globalScene.gameData.starterData[pokemon.species.getRootSpeciesId()].abilityAttr;
 
@@ -408,16 +465,16 @@ export default class BattleInfo extends Phaser.GameObjects.Container {
 
     this.shinyIcon.setVisible(pokemon.isShiny());
 
-    const types = pokemon.getTypes(true);
+    const types = pokemon.getTypes(true, false, undefined, true);
     this.type1Icon.setTexture(`pbinfo_${this.player ? "player" : "enemy"}_type${types.length > 1 ? "1" : ""}`);
-    this.type1Icon.setFrame(Type[types[0]].toLowerCase());
+    this.type1Icon.setFrame(PokemonType[types[0]].toLowerCase());
     this.type2Icon.setVisible(types.length > 1);
     this.type3Icon.setVisible(types.length > 2);
     if (types.length > 1) {
-      this.type2Icon.setFrame(Type[types[1]].toLowerCase());
+      this.type2Icon.setFrame(PokemonType[types[1]].toLowerCase());
     }
     if (types.length > 2) {
-      this.type3Icon.setFrame(Type[types[2]].toLowerCase());
+      this.type3Icon.setFrame(PokemonType[types[2]].toLowerCase());
     }
 
     if (this.player) {
@@ -453,10 +510,18 @@ export default class BattleInfo extends Phaser.GameObjects.Container {
       this.baseY = this.y;
     }
 
-    const offsetElements = [ this.nameText, this.genderText, this.teraIcon, this.splicedIcon, this.shinyIcon, this.statusIndicator, this.levelContainer ];
-    offsetElements.forEach(el => el.y += 1.5 * (mini ? -1 : 1));
+    const offsetElements = [
+      this.nameText,
+      this.genderText,
+      this.teraIcon,
+      this.splicedIcon,
+      this.shinyIcon,
+      this.statusIndicator,
+      this.levelContainer,
+    ];
+    offsetElements.forEach(el => (el.y += 1.5 * (mini ? -1 : 1)));
 
-    [ this.type1Icon, this.type2Icon, this.type3Icon ].forEach(el => {
+    [this.type1Icon, this.type2Icon, this.type3Icon].forEach(el => {
       el.x += 4 * (mini ? 1 : -1);
       el.y += -8 * (mini ? 1 : -1);
     });
@@ -464,16 +529,16 @@ export default class BattleInfo extends Phaser.GameObjects.Container {
     this.statValuesContainer.x += 2 * (mini ? 1 : -1);
     this.statValuesContainer.y += -7 * (mini ? 1 : -1);
 
-    const toggledElements = [ this.hpNumbersContainer, this.expBar ];
+    const toggledElements = [this.hpNumbersContainer, this.expBar];
     toggledElements.forEach(el => el.setVisible(!mini));
   }
 
   toggleStats(visible: boolean): void {
     globalScene.tweens.add({
       targets: this.statsContainer,
-      duration: Utils.fixedInt(125),
+      duration: fixedInt(125),
       ease: "Sine.easeInOut",
-      alpha: visible ? 1 : 0
+      alpha: visible ? 1 : 0,
     });
   }
 
@@ -483,9 +548,20 @@ export default class BattleInfo extends Phaser.GameObjects.Container {
     if (boss !== this.boss) {
       this.boss = boss;
 
-      [ this.nameText, this.genderText, this.teraIcon, this.splicedIcon, this.shinyIcon, this.ownedIcon, this.championRibbon, this.statusIndicator, this.levelContainer, this.statValuesContainer ].map(e => e.x += 48 * (boss ? -1 : 1));
+      [
+        this.nameText,
+        this.genderText,
+        this.teraIcon,
+        this.splicedIcon,
+        this.shinyIcon,
+        this.ownedIcon,
+        this.championRibbon,
+        this.statusIndicator,
+        this.statValuesContainer,
+      ].map(e => (e.x += 48 * (boss ? -1 : 1)));
       this.hpBar.x += 38 * (boss ? -1 : 1);
       this.hpBar.y += 2 * (this.boss ? -1 : 1);
+      this.levelContainer.x += 2 * (boss ? -1 : 1);
       this.hpBar.setTexture(`overlay_hp${boss ? "_boss" : ""}`);
       this.box.setTexture(this.getTextureName());
       this.statsBox.setTexture(`${this.getTextureName()}_stats`);
@@ -504,8 +580,14 @@ export default class BattleInfo extends Phaser.GameObjects.Container {
       const uiTheme = globalScene.uiTheme;
       const maxHp = pokemon.getMaxHp();
       for (let s = 1; s < this.bossSegments; s++) {
-        const dividerX = (Math.round((maxHp / this.bossSegments) * s) /  maxHp) * this.hpBar.width;
-        const divider = globalScene.add.rectangle(0, 0, 1, this.hpBar.height - (uiTheme ? 0 : 1), pokemon.bossSegmentIndex >= s ? 0xFFFFFF : 0x404040);
+        const dividerX = (Math.round((maxHp / this.bossSegments) * s) / maxHp) * this.hpBar.width;
+        const divider = globalScene.add.rectangle(
+          0,
+          0,
+          1,
+          this.hpBar.height - (uiTheme ? 0 : 1),
+          pokemon.bossSegmentIndex >= s ? 0xffffff : 0x404040,
+        );
         divider.setOrigin(0.5, 0);
         divider.setName("hpBar_divider_" + s.toString());
         this.add(divider);
@@ -535,6 +617,11 @@ export default class BattleInfo extends Phaser.GameObjects.Container {
         return resolve();
       }
 
+      const gender = pokemon.summonData.illusion?.gender ?? pokemon.gender;
+
+      this.genderText.setText(getGenderSymbol(gender));
+      this.genderText.setColor(getGenderColor(gender));
+
       const nameUpdated = this.lastName !== pokemon.getNameToRender();
 
       if (nameUpdated) {
@@ -542,22 +629,47 @@ export default class BattleInfo extends Phaser.GameObjects.Container {
         this.genderText.setPositionRelative(this.nameText, this.nameText.displayWidth, 0);
       }
 
-      const teraType = pokemon.getTeraType();
+      const teraType = pokemon.isTerastallized ? pokemon.getTeraType() : PokemonType.UNKNOWN;
       const teraTypeUpdated = this.lastTeraType !== teraType;
 
       if (teraTypeUpdated) {
-        this.teraIcon.setVisible(teraType !== Type.UNKNOWN);
-        this.teraIcon.setPositionRelative(this.nameText, this.nameText.displayWidth + this.genderText.displayWidth + 1, 2);
+        this.teraIcon.setVisible(teraType !== PokemonType.UNKNOWN);
+        this.teraIcon.setPositionRelative(
+          this.nameText,
+          this.nameText.displayWidth + this.genderText.displayWidth + 1,
+          2,
+        );
         this.teraIcon.setTintFill(Phaser.Display.Color.GetColor(...getTypeRgb(teraType)));
         this.lastTeraType = teraType;
       }
 
-      if (nameUpdated || teraTypeUpdated) {
-        this.splicedIcon.setVisible(!!pokemon.fusionSpecies);
+      const isFusion = pokemon.isFusion(true);
 
-        this.teraIcon.setPositionRelative(this.nameText, this.nameText.displayWidth + this.genderText.displayWidth + 1, 2);
-        this.splicedIcon.setPositionRelative(this.nameText, this.nameText.displayWidth + this.genderText.displayWidth + 1 + (this.teraIcon.visible ? this.teraIcon.displayWidth + 1 : 0), 1.5);
-        this.shinyIcon.setPositionRelative(this.nameText, this.nameText.displayWidth + this.genderText.displayWidth + 1 + (this.teraIcon.visible ? this.teraIcon.displayWidth + 1 : 0) + (this.splicedIcon.visible ? this.splicedIcon.displayWidth + 1 : 0), 2.5);
+      if (nameUpdated || teraTypeUpdated) {
+        this.splicedIcon.setVisible(isFusion);
+
+        this.teraIcon.setPositionRelative(
+          this.nameText,
+          this.nameText.displayWidth + this.genderText.displayWidth + 1,
+          2,
+        );
+        this.splicedIcon.setPositionRelative(
+          this.nameText,
+          this.nameText.displayWidth +
+            this.genderText.displayWidth +
+            1 +
+            (this.teraIcon.visible ? this.teraIcon.displayWidth + 1 : 0),
+          1.5,
+        );
+        this.shinyIcon.setPositionRelative(
+          this.nameText,
+          this.nameText.displayWidth +
+            this.genderText.displayWidth +
+            1 +
+            (this.teraIcon.visible ? this.teraIcon.displayWidth + 1 : 0) +
+            (this.splicedIcon.visible ? this.splicedIcon.displayWidth + 1 : 0),
+          2.5,
+        );
       }
 
       if (this.lastStatus !== (pokemon.status?.effect || StatusEffect.NONE)) {
@@ -573,16 +685,16 @@ export default class BattleInfo extends Phaser.GameObjects.Container {
         this.statusIndicator.setVisible(!!this.lastStatus);
       }
 
-      const types = pokemon.getTypes(true);
+      const types = pokemon.getTypes(true, false, undefined, true);
       this.type1Icon.setTexture(`pbinfo_${this.player ? "player" : "enemy"}_type${types.length > 1 ? "1" : ""}`);
-      this.type1Icon.setFrame(Type[types[0]].toLowerCase());
+      this.type1Icon.setFrame(PokemonType[types[0]].toLowerCase());
       this.type2Icon.setVisible(types.length > 1);
       this.type3Icon.setVisible(types.length > 2);
       if (types.length > 1) {
-        this.type2Icon.setFrame(Type[types[1]].toLowerCase());
+        this.type2Icon.setFrame(PokemonType[types[1]].toLowerCase());
       }
       if (types.length > 2) {
-        this.type3Icon.setFrame(Type[types[2]].toLowerCase());
+        this.type3Icon.setFrame(PokemonType[types[2]].toLowerCase());
       }
 
       const updateHpFrame = () => {
@@ -594,7 +706,7 @@ export default class BattleInfo extends Phaser.GameObjects.Container {
       };
 
       const updatePokemonHp = () => {
-        let duration = !instant ? Phaser.Math.Clamp(Math.abs((this.lastHp) - pokemon.hp) * 5, 250, 5000) : 0;
+        let duration = !instant ? Phaser.Math.Clamp(Math.abs(this.lastHp - pokemon.hp) * 5, 250, 5000) : 0;
         const speed = globalScene.hpBarSpeed;
         if (speed) {
           duration = speed >= 3 ? 0 : duration / Math.pow(2, speed);
@@ -615,8 +727,14 @@ export default class BattleInfo extends Phaser.GameObjects.Container {
           },
           onComplete: () => {
             updateHpFrame();
+            // If, after tweening, the hp is different from the original (due to rounding), force the hp number display
+            // to update to the correct value.
+            if (this.player && this.lastHp !== pokemon.hp) {
+              this.setHpNumbers(pokemon.hp, pokemon.getMaxHp());
+              this.lastHp = pokemon.hp;
+            }
             resolve();
-          }
+          },
         });
         if (!this.player) {
           this.lastHp = pokemon.hp;
@@ -627,9 +745,14 @@ export default class BattleInfo extends Phaser.GameObjects.Container {
       if (this.player) {
         const isLevelCapped = pokemon.level >= globalScene.getMaxExpLevel();
 
-        if ((this.lastExp !== pokemon.exp || this.lastLevel !== pokemon.level)) {
+        if (this.lastExp !== pokemon.exp || this.lastLevel !== pokemon.level) {
           const originalResolve = resolve;
-          const durationMultipler = Math.max(Phaser.Tweens.Builders.GetEaseFunction("Cubic.easeIn")(1 - (Math.min(pokemon.level - this.lastLevel, 10) / 10)), 0.1);
+          const durationMultipler = Math.max(
+            Phaser.Tweens.Builders.GetEaseFunction("Cubic.easeIn")(
+              1 - Math.min(pokemon.level - this.lastLevel, 10) / 10,
+            ),
+            0.1,
+          );
           resolve = () => this.updatePokemonExp(pokemon, false, durationMultipler).then(() => originalResolve());
         } else if (isLevelCapped !== this.lastLevelCapped) {
           this.setLevel(pokemon.level);
@@ -640,7 +763,8 @@ export default class BattleInfo extends Phaser.GameObjects.Container {
 
       if (this.lastHp !== pokemon.hp || this.lastMaxHp !== pokemon.getMaxHp()) {
         return updatePokemonHp();
-      } else if (!this.player && this.lastLevel !== pokemon.level) {
+      }
+      if (!this.player && this.lastLevel !== pokemon.level) {
         this.setLevel(pokemon.level);
         this.lastLevel = pokemon.level;
       }
@@ -653,7 +777,17 @@ export default class BattleInfo extends Phaser.GameObjects.Container {
         this.lastStats = statsStr;
       }
 
-      this.shinyIcon.setVisible(pokemon.isShiny());
+      this.shinyIcon.setVisible(pokemon.isShiny(true));
+
+      const doubleShiny = isFusion && pokemon.shiny && pokemon.fusionShiny;
+      const baseVariant = !doubleShiny ? pokemon.getVariant(true) : pokemon.variant;
+      this.shinyIcon.setTint(getVariantTint(baseVariant));
+
+      this.fusionShinyIcon.setVisible(doubleShiny);
+      if (isFusion) {
+        this.fusionShinyIcon.setTint(getVariantTint(pokemon.fusionVariant));
+      }
+      this.fusionShinyIcon.setPosition(this.shinyIcon.x, this.shinyIcon.y);
 
       resolve();
     });
@@ -666,7 +800,15 @@ export default class BattleInfo extends Phaser.GameObjects.Container {
     const nameSizeTest = addTextObject(0, 0, displayName, TextStyle.BATTLE_INFO);
     nameTextWidth = nameSizeTest.displayWidth;
 
-    while (nameTextWidth > (this.player || !this.boss ? 60 : 98) - ((pokemon.gender !== Gender.GENDERLESS ? 6 : 0) + (pokemon.fusionSpecies ? 8 : 0) + (pokemon.isShiny() ? 8 : 0) + (Math.min(pokemon.level.toString().length, 3) - 3) * 8)) {
+    const gender = pokemon.summonData.illusion?.gender ?? pokemon.gender;
+    while (
+      nameTextWidth >
+      (this.player || !this.boss ? 60 : 98) -
+        ((gender !== Gender.GENDERLESS ? 6 : 0) +
+          (pokemon.fusionSpecies ? 8 : 0) +
+          (pokemon.isShiny() ? 8 : 0) +
+          (Math.min(pokemon.level.toString().length, 3) - 3) * 8)
+    ) {
       displayName = `${displayName.slice(0, displayName.endsWith(".") ? -2 : -1).trimEnd()}.`;
       nameSizeTest.setText(displayName);
       nameTextWidth = nameSizeTest.displayWidth;
@@ -678,11 +820,14 @@ export default class BattleInfo extends Phaser.GameObjects.Container {
     this.lastName = pokemon.getNameToRender();
 
     if (this.nameText.visible) {
-      this.nameText.setInteractive(new Phaser.Geom.Rectangle(0, 0, this.nameText.width, this.nameText.height), Phaser.Geom.Rectangle.Contains);
+      this.nameText.setInteractive(
+        new Phaser.Geom.Rectangle(0, 0, this.nameText.width, this.nameText.height),
+        Phaser.Geom.Rectangle.Contains,
+      );
     }
   }
 
-  updatePokemonExp(pokemon: Pokemon, instant?: boolean, levelDurationMultiplier: number = 1): Promise<void> {
+  updatePokemonExp(pokemon: Pokemon, instant?: boolean, levelDurationMultiplier = 1): Promise<void> {
     return new Promise(resolve => {
       const levelUp = this.lastLevel < pokemon.level;
       const relLevelExp = getLevelRelExp(this.lastLevel + 1, pokemon.species.growthRate);
@@ -696,8 +841,16 @@ export default class BattleInfo extends Phaser.GameObjects.Container {
         }
         instant = true;
       }
-      const durationMultiplier = Phaser.Tweens.Builders.GetEaseFunction("Sine.easeIn")(1 - (Math.max(this.lastLevel - 100, 0) / 150));
-      let duration = this.visible && !instant ? (((levelExp - this.lastLevelExp) / relLevelExp) * BattleInfo.EXP_GAINS_DURATION_BASE) * durationMultiplier * levelDurationMultiplier : 0;
+      const durationMultiplier = Phaser.Tweens.Builders.GetEaseFunction("Sine.easeIn")(
+        1 - Math.max(this.lastLevel - 100, 0) / 150,
+      );
+      let duration =
+        this.visible && !instant
+          ? ((levelExp - this.lastLevelExp) / relLevelExp) *
+            BattleInfo.EXP_GAINS_DURATION_BASE *
+            durationMultiplier *
+            levelDurationMultiplier
+          : 0;
       const speed = globalScene.expGainsSpeed;
       if (speed && speed >= ExpGainsSpeed.DEFAULT) {
         duration = speed >= ExpGainsSpeed.SKIP ? ExpGainsSpeed.DEFAULT : duration / Math.pow(2, speed);
@@ -734,7 +887,7 @@ export default class BattleInfo extends Phaser.GameObjects.Container {
             return;
           }
           resolve();
-        }
+        },
       });
     });
   }
@@ -744,7 +897,9 @@ export default class BattleInfo extends Phaser.GameObjects.Container {
     this.levelNumbersContainer.removeAll(true);
     const levelStr = level.toString();
     for (let i = 0; i < levelStr.length; i++) {
-      this.levelNumbersContainer.add(globalScene.add.image(i * 8, 0, `numbers${isCapped && this.player ? "_red" : ""}`, levelStr[i]));
+      this.levelNumbersContainer.add(
+        globalScene.add.image(i * 8, 0, `numbers${isCapped && this.player ? "_red" : ""}`, levelStr[i]),
+      );
     }
     this.levelContainer.setX((this.player ? -41 : -50) - 8 * Math.max(levelStr.length - 3, 0));
   }
@@ -827,5 +982,5 @@ export class EnemyBattleInfo extends BattleInfo {
     super(140, -141, false);
   }
 
-  setMini(mini: boolean): void { } // Always mini
+  setMini(_mini: boolean): void {} // Always mini
 }
diff --git a/src/ui/battle-message-ui-handler.ts b/src/ui/battle-message-ui-handler.ts
index 93de69240c3..d1102bbe53e 100644
--- a/src/ui/battle-message-ui-handler.ts
+++ b/src/ui/battle-message-ui-handler.ts
@@ -1,12 +1,11 @@
 import { globalScene } from "#app/global-scene";
 import { addBBCodeTextObject, addTextObject, getTextColor, TextStyle } from "./text";
-import { Mode } from "./ui";
+import { UiMode } from "#enums/ui-mode";
 import MessageUiHandler from "./message-ui-handler";
 import { addWindow } from "./ui-theme";
 import type BBCodeText from "phaser3-rex-plugins/plugins/bbcodetext";
 import { Button } from "#enums/buttons";
 import i18next from "i18next";
-import type { Stat } from "#app/enums/stat";
 import { PERMANENT_STATS, getStatKey } from "#app/enums/stat";
 
 export default class BattleMessageUiHandler extends MessageUiHandler {
@@ -24,7 +23,7 @@ export default class BattleMessageUiHandler extends MessageUiHandler {
   public readonly wordWrapWidth: number = 1780;
 
   constructor() {
-    super(Mode.MESSAGE);
+    super(UiMode.MESSAGE);
   }
 
   setup(): void {
@@ -56,7 +55,7 @@ export default class BattleMessageUiHandler extends MessageUiHandler {
     moveDetailsWindow.setName("move-details-window");
     moveDetailsWindow.setOrigin(0, 1);
 
-    this.movesWindowContainer.add([ movesWindow, moveDetailsWindow ]);
+    this.movesWindowContainer.add([movesWindow, moveDetailsWindow]);
     ui.add(this.movesWindowContainer);
 
     const messageContainer = globalScene.add.container(12, -39);
@@ -65,8 +64,8 @@ export default class BattleMessageUiHandler extends MessageUiHandler {
     const message = addTextObject(0, 0, "", TextStyle.MESSAGE, {
       maxLines: 2,
       wordWrap: {
-        width: this.wordWrapWidth
-      }
+        width: this.wordWrapWidth,
+      },
     });
     messageContainer.add(message);
 
@@ -78,7 +77,9 @@ export default class BattleMessageUiHandler extends MessageUiHandler {
     this.nameBox = globalScene.add.nineslice(0, 0, "namebox", globalScene.windowType, 72, 16, 8, 8, 5, 5);
     this.nameBox.setOrigin(0, 0);
 
-    this.nameText = addTextObject(8, 0, "Rival", TextStyle.MESSAGE, { maxLines: 1 });
+    this.nameText = addTextObject(8, 0, "Rival", TextStyle.MESSAGE, {
+      maxLines: 1,
+    });
 
     this.nameBoxContainer.add(this.nameBox);
     this.nameBoxContainer.add(this.nameText);
@@ -92,7 +93,9 @@ export default class BattleMessageUiHandler extends MessageUiHandler {
 
     this.levelUpStatsContainer = levelUpStatsContainer;
 
-    const levelUpStatsLabelsContent = addTextObject((globalScene.game.canvas.width / 6) - 73, -94, "", TextStyle.WINDOW, { maxLines: 6 });
+    const levelUpStatsLabelsContent = addTextObject(globalScene.game.canvas.width / 6 - 73, -94, "", TextStyle.WINDOW, {
+      maxLines: 6,
+    });
     levelUpStatsLabelsContent.setLineSpacing(i18next.resolvedLanguage === "ja" ? 25 : 5);
     let levelUpStatsLabelText = "";
 
@@ -102,19 +105,36 @@ export default class BattleMessageUiHandler extends MessageUiHandler {
     levelUpStatsLabelsContent.text = levelUpStatsLabelText;
     levelUpStatsLabelsContent.x -= levelUpStatsLabelsContent.displayWidth;
 
-    const levelUpStatsBg = addWindow((globalScene.game.canvas.width / 6), -100, 80 + levelUpStatsLabelsContent.displayWidth, 100);
+    const levelUpStatsBg = addWindow(
+      globalScene.game.canvas.width / 6,
+      -100,
+      80 + levelUpStatsLabelsContent.displayWidth,
+      100,
+    );
     levelUpStatsBg.setOrigin(1, 0);
     levelUpStatsContainer.add(levelUpStatsBg);
 
     levelUpStatsContainer.add(levelUpStatsLabelsContent);
 
-    const levelUpStatsIncrContent = addTextObject((globalScene.game.canvas.width / 6) - 50, -94, "+\n+\n+\n+\n+\n+", TextStyle.WINDOW, { maxLines: 6 });
+    const levelUpStatsIncrContent = addTextObject(
+      globalScene.game.canvas.width / 6 - 50,
+      -94,
+      "+\n+\n+\n+\n+\n+",
+      TextStyle.WINDOW,
+      { maxLines: 6 },
+    );
     levelUpStatsIncrContent.setLineSpacing(i18next.resolvedLanguage === "ja" ? 25 : 5);
     levelUpStatsContainer.add(levelUpStatsIncrContent);
 
     this.levelUpStatsIncrContent = levelUpStatsIncrContent;
 
-    const levelUpStatsValuesContent = addBBCodeTextObject((globalScene.game.canvas.width / 6) - 7, -94, "", TextStyle.WINDOW, { maxLines: 6, lineSpacing: 5 });
+    const levelUpStatsValuesContent = addBBCodeTextObject(
+      globalScene.game.canvas.width / 6 - 7,
+      -94,
+      "",
+      TextStyle.WINDOW,
+      { maxLines: 6, lineSpacing: 5 },
+    );
     levelUpStatsValuesContent.setLineSpacing(i18next.resolvedLanguage === "ja" ? 25 : 5);
     levelUpStatsValuesContent.setOrigin(1, 0);
     levelUpStatsValuesContent.setAlign("right");
@@ -154,12 +174,27 @@ export default class BattleMessageUiHandler extends MessageUiHandler {
     super.clear();
   }
 
-  showText(text: string, delay?: number | null, callback?: Function | null, callbackDelay?: number | null, prompt?: boolean | null, promptDelay?: number | null) {
+  showText(
+    text: string,
+    delay?: number | null,
+    callback?: Function | null,
+    callbackDelay?: number | null,
+    prompt?: boolean | null,
+    promptDelay?: number | null,
+  ) {
     this.hideNameText();
     super.showText(text, delay, callback, callbackDelay, prompt, promptDelay);
   }
 
-  showDialogue(text: string, name?: string, delay?: number | null, callback?: Function, callbackDelay?: number, prompt?: boolean, promptDelay?: number) {
+  showDialogue(
+    text: string,
+    name?: string,
+    delay?: number | null,
+    callback?: Function,
+    callbackDelay?: number,
+    prompt?: boolean,
+    promptDelay?: number,
+  ) {
     if (name) {
       this.showNameText(name);
     }
@@ -183,21 +218,19 @@ export default class BattleMessageUiHandler extends MessageUiHandler {
       this.onActionInput = () => {
         if (!showTotals) {
           return this.promptLevelUpStats(partyMemberIndex, [], true).then(() => resolve());
-        } else {
-          this.levelUpStatsContainer.setVisible(false);
-          resolve();
         }
+        this.levelUpStatsContainer.setVisible(false);
+        resolve();
       };
     });
   }
 
-  promptIvs(pokemonId: number, ivs: number[], shownIvsCount: number): Promise<void> {
+  promptIvs(pokemonId: number, ivs: number[]): Promise<void> {
     return new Promise(resolve => {
       globalScene.executeWithSeedOffset(() => {
         let levelUpStatsValuesText = "";
-        const shownStats = this.getTopIvs(ivs, shownIvsCount);
         for (const s of PERMANENT_STATS) {
-          levelUpStatsValuesText += `${shownStats.includes(s) ? this.getIvDescriptor(ivs[s], s, pokemonId) : "???"}\n`;
+          levelUpStatsValuesText += `${this.getIvDescriptor(ivs[s], s, pokemonId)}\n`;
         }
         this.levelUpStatsValuesContent.text = levelUpStatsValuesText;
         this.levelUpStatsIncrContent.setVisible(false);
@@ -211,21 +244,6 @@ export default class BattleMessageUiHandler extends MessageUiHandler {
     });
   }
 
-  getTopIvs(ivs: number[], shownIvsCount: number): Stat[] {
-    let shownStats: Stat[] = [];
-    if (shownIvsCount < 6) {
-      const statsPool = PERMANENT_STATS.slice();
-      // Sort the stats from highest to lowest iv
-      statsPool.sort((s1, s2) => ivs[s2] - ivs[s1]);
-      for (let i = 0; i < shownIvsCount; i++) {
-        shownStats.push(statsPool[i]);
-      }
-    } else {
-      shownStats = PERMANENT_STATS.slice();
-    }
-    return shownStats;
-  }
-
   getIvDescriptor(value: number, typeIv: number, pokemonId: number): string {
     const starterSpecies = globalScene.getPokemonById(pokemonId)!.species.getRootSpeciesId(); // we are using getRootSpeciesId() here because we want to check against the baby form, not the mid form if it exists
     const starterIvs: number[] = globalScene.gameData.dexData[starterSpecies].ivs;
diff --git a/src/ui/bgm-bar.ts b/src/ui/bgm-bar.ts
index 0cd3da71248..e331d82f6d9 100644
--- a/src/ui/bgm-bar.ts
+++ b/src/ui/bgm-bar.ts
@@ -1,6 +1,6 @@
 import { addTextObject, TextStyle } from "./text";
 import i18next from "i18next";
-import * as Utils from "#app/utils";
+import { formatText } from "#app/utils/common";
 import { globalScene } from "#app/global-scene";
 
 const hiddenX = -150;
@@ -24,7 +24,18 @@ export default class BgmBar extends Phaser.GameObjects.Container {
     this.defaultWidth = 230;
     this.defaultHeight = 100;
 
-    this.bg = globalScene.add.nineslice(-5, -5, "bgm_bar", undefined, this.defaultWidth, this.defaultHeight, 0, 0, 10, 10);
+    this.bg = globalScene.add.nineslice(
+      -5,
+      -5,
+      "bgm_bar",
+      undefined,
+      this.defaultWidth,
+      this.defaultHeight,
+      0,
+      0,
+      10,
+      10,
+    );
     this.bg.setOrigin(0, 0);
 
     this.add(this.bg);
@@ -40,8 +51,8 @@ export default class BgmBar extends Phaser.GameObjects.Container {
   }
 
   /*
-    * Set the BGM Name to the BGM bar.
-    * @param {string} bgmName The name of the BGM to set.
+   * Set the BGM Name to the BGM bar.
+   * @param {string} bgmName The name of the BGM to set.
    */
   setBgmToBgmBar(bgmName: string): void {
     this.musicText.setText(`${i18next.t("bgmName:music")}${this.getRealBgmName(bgmName)}`);
@@ -83,11 +94,13 @@ export default class BgmBar extends Phaser.GameObjects.Container {
       ease: "Sine.easeInOut",
       onComplete: () => {
         this.setVisible(true);
-      }
+      },
     });
   }
 
   getRealBgmName(bgmName: string): string {
-    return i18next.t([ `bgmName:${bgmName}`, "bgmName:missing_entries" ], { name: Utils.formatText(bgmName) });
+    return i18next.t([`bgmName:${bgmName}`, "bgmName:missing_entries"], {
+      name: formatText(bgmName),
+    });
   }
 }
diff --git a/src/ui/candy-bar.ts b/src/ui/candy-bar.ts
index d58fd040a7c..f7a01b83093 100644
--- a/src/ui/candy-bar.ts
+++ b/src/ui/candy-bar.ts
@@ -1,8 +1,8 @@
-import { starterColors } from "#app/battle-scene";
+import { starterColors } from "#app/global-vars/starter-colors";
 import { globalScene } from "#app/global-scene";
 import { TextStyle, addTextObject } from "./text";
 import { argbFromRgba } from "@material/material-color-utilities";
-import * as Utils from "../utils";
+import { rgbHexToRgba } from "#app/utils/common";
 import type { Species } from "#enums/species";
 
 export default class CandyBar extends Phaser.GameObjects.Container {
@@ -18,7 +18,7 @@ export default class CandyBar extends Phaser.GameObjects.Container {
   public shown: boolean;
 
   constructor() {
-    super(globalScene, (globalScene.game.canvas.width / 6), -((globalScene.game.canvas.height) / 6) + 15);
+    super(globalScene, globalScene.game.canvas.width / 6, -(globalScene.game.canvas.height / 6) + 15);
   }
 
   setup(): void {
@@ -52,17 +52,20 @@ export default class CandyBar extends Phaser.GameObjects.Container {
       if (this.shown) {
         if (this.speciesId === starterSpeciesId) {
           return resolve();
-        } else {
-          return this.hide().then(() => this.showStarterSpeciesCandy(starterSpeciesId, count)).then(() => resolve());
         }
+        return this.hide()
+          .then(() => this.showStarterSpeciesCandy(starterSpeciesId, count))
+          .then(() => resolve());
       }
 
       const colorScheme = starterColors[starterSpeciesId];
 
-      this.candyIcon.setTint(argbFromRgba(Utils.rgbHexToRgba(colorScheme[0])));
-      this.candyOverlayIcon.setTint(argbFromRgba(Utils.rgbHexToRgba(colorScheme[1])));
+      this.candyIcon.setTint(argbFromRgba(rgbHexToRgba(colorScheme[0])));
+      this.candyOverlayIcon.setTint(argbFromRgba(rgbHexToRgba(colorScheme[1])));
 
-      this.countText.setText(`${globalScene.gameData.starterData[starterSpeciesId].candyCount + count} (+${count.toString()})`);
+      this.countText.setText(
+        `${globalScene.gameData.starterData[starterSpeciesId].candyCount + count} (+${count.toString()})`,
+      );
 
       this.bg.width = this.countText.displayWidth + 28;
 
@@ -76,14 +79,14 @@ export default class CandyBar extends Phaser.GameObjects.Container {
 
       this.tween = globalScene.tweens.add({
         targets: this,
-        x: (globalScene.game.canvas.width / 6) - (this.bg.width - 5),
+        x: globalScene.game.canvas.width / 6 - (this.bg.width - 5),
         duration: 500,
         ease: "Sine.easeOut",
         onComplete: () => {
           this.tween = null;
           this.resetAutoHideTimer();
           resolve();
-        }
+        },
       });
 
       this.setVisible(true);
@@ -107,7 +110,7 @@ export default class CandyBar extends Phaser.GameObjects.Container {
 
       this.tween = globalScene.tweens.add({
         targets: this,
-        x: (globalScene.game.canvas.width / 6),
+        x: globalScene.game.canvas.width / 6,
         duration: 500,
         ease: "Sine.easeIn",
         onComplete: () => {
@@ -115,7 +118,7 @@ export default class CandyBar extends Phaser.GameObjects.Container {
           this.shown = false;
           this.setVisible(false);
           resolve();
-        }
+        },
       });
     });
   }
diff --git a/src/ui/challenges-select-ui-handler.ts b/src/ui/challenges-select-ui-handler.ts
index 31ee91388fc..d1df16a457b 100644
--- a/src/ui/challenges-select-ui-handler.ts
+++ b/src/ui/challenges-select-ui-handler.ts
@@ -1,11 +1,11 @@
 import { TextStyle, addTextObject } from "./text";
-import type { Mode } from "./ui";
+import type { UiMode } from "#enums/ui-mode";
 import UiHandler from "./ui-handler";
 import { addWindow } from "./ui-theme";
 import { Button } from "#enums/buttons";
 import i18next from "i18next";
 import type { Challenge } from "#app/data/challenge";
-import * as Utils from "../utils";
+import { getLocalizedSpriteKey } from "#app/utils/common";
 import { Challenges } from "#app/enums/challenges";
 import BBCodeText from "phaser3-rex-plugins/plugins/bbcodetext";
 import { Color, ShadowColor } from "#app/enums/color";
@@ -28,7 +28,12 @@ export default class GameChallengesUiHandler extends UiHandler {
 
   private descriptionText: BBCodeText;
 
-  private challengeLabels: Array<{ label: Phaser.GameObjects.Text, value: Phaser.GameObjects.Text, leftArrow: Phaser.GameObjects.Image, rightArrow: Phaser.GameObjects.Image }>;
+  private challengeLabels: Array<{
+    label: Phaser.GameObjects.Text;
+    value: Phaser.GameObjects.Text;
+    leftArrow: Phaser.GameObjects.Image;
+    rightArrow: Phaser.GameObjects.Image;
+  }>;
   private monoTypeValue: Phaser.GameObjects.Sprite;
 
   private cursorObj: Phaser.GameObjects.NineSlice | null;
@@ -45,7 +50,7 @@ export default class GameChallengesUiHandler extends UiHandler {
   private readonly leftArrowGap: number = 90; // distance from the label to the left arrow
   private readonly arrowSpacing: number = 3; // distance between the arrows and the value area
 
-  constructor(mode: Mode | null = null) {
+  constructor(mode: UiMode | null = null) {
     super(mode);
   }
 
@@ -57,15 +62,25 @@ export default class GameChallengesUiHandler extends UiHandler {
     this.challengesContainer = globalScene.add.container(1, -(globalScene.game.canvas.height / 6) + 1);
     this.challengesContainer.setName("challenges");
 
-    this.challengesContainer.setInteractive(new Phaser.Geom.Rectangle(0, 0, globalScene.game.canvas.width / 6, globalScene.game.canvas.height / 6), Phaser.Geom.Rectangle.Contains);
+    this.challengesContainer.setInteractive(
+      new Phaser.Geom.Rectangle(0, 0, globalScene.game.canvas.width / 6, globalScene.game.canvas.height / 6),
+      Phaser.Geom.Rectangle.Contains,
+    );
 
-    const bgOverlay = globalScene.add.rectangle(-1, -1, globalScene.scaledCanvas.width, globalScene.scaledCanvas.height, 0x424242, 0.8);
+    const bgOverlay = globalScene.add.rectangle(
+      -1,
+      -1,
+      globalScene.scaledCanvas.width,
+      globalScene.scaledCanvas.height,
+      0x424242,
+      0.8,
+    );
     bgOverlay.setName("rect-challenge-overlay");
     bgOverlay.setOrigin(0, 0);
     this.challengesContainer.add(bgOverlay);
 
     // TODO: Change this back to /9 when adding in difficulty
-    const headerBg = addWindow(0, 0, (globalScene.game.canvas.width / 6), 24);
+    const headerBg = addWindow(0, 0, globalScene.game.canvas.width / 6, 24);
     headerBg.setName("window-header-bg");
     headerBg.setOrigin(0, 0);
 
@@ -75,11 +90,21 @@ export default class GameChallengesUiHandler extends UiHandler {
     headerText.setPositionRelative(headerBg, 8, 4);
 
     this.optionsWidth = globalScene.scaledCanvas.width * 0.6;
-    this.optionsBg = addWindow(0, headerBg.height, this.optionsWidth, globalScene.scaledCanvas.height - headerBg.height - 2);
+    this.optionsBg = addWindow(
+      0,
+      headerBg.height,
+      this.optionsWidth,
+      globalScene.scaledCanvas.height - headerBg.height - 2,
+    );
     this.optionsBg.setName("window-options-bg");
     this.optionsBg.setOrigin(0, 0);
 
-    const descriptionBg = addWindow(0, headerBg.height, globalScene.scaledCanvas.width - this.optionsWidth, globalScene.scaledCanvas.height - headerBg.height - 26);
+    const descriptionBg = addWindow(
+      0,
+      headerBg.height,
+      globalScene.scaledCanvas.width - this.optionsWidth,
+      globalScene.scaledCanvas.height - headerBg.height - 26,
+    );
     descriptionBg.setName("window-desc-bg");
     descriptionBg.setOrigin(0, 0);
     descriptionBg.setPositionRelative(this.optionsBg, this.optionsBg.width, 0);
@@ -89,12 +114,12 @@ export default class GameChallengesUiHandler extends UiHandler {
       fontSize: 84,
       color: Color.ORANGE,
       padding: {
-        bottom: 6
+        bottom: 6,
       },
       wrap: {
         mode: "word",
         width: (descriptionBg.width - 12) * 6,
-      }
+      },
     });
     this.descriptionText.setName("text-desc");
     globalScene.add.existing(this.descriptionText);
@@ -112,7 +137,18 @@ export default class GameChallengesUiHandler extends UiHandler {
     this.startText.setOrigin(0, 0);
     this.startText.setPositionRelative(this.startBg, (this.startBg.width - this.startText.displayWidth) / 2, 4);
 
-    this.startCursor = globalScene.add.nineslice(0, 0, "summary_moves_cursor", undefined, descriptionBg.width - 8, 16, 1, 1, 1, 1);
+    this.startCursor = globalScene.add.nineslice(
+      0,
+      0,
+      "summary_moves_cursor",
+      undefined,
+      descriptionBg.width - 8,
+      16,
+      1,
+      1,
+      1,
+      1,
+    );
     this.startCursor.setName("9s-start-cursor");
     this.startCursor.setOrigin(0, 0);
     this.startCursor.setPositionRelative(this.startBg, 4, 3);
@@ -153,11 +189,11 @@ export default class GameChallengesUiHandler extends UiHandler {
         label: label,
         value: value,
         leftArrow: leftArrow,
-        rightArrow: rightArrow
+        rightArrow: rightArrow,
       };
     }
 
-    this.monoTypeValue = globalScene.add.sprite(8, 98, Utils.getLocalizedSpriteKey("types"));
+    this.monoTypeValue = globalScene.add.sprite(8, 98, getLocalizedSpriteKey("types"));
     this.monoTypeValue.setName("challenge-value-monotype-sprite");
     this.monoTypeValue.setScale(0.86);
     this.monoTypeValue.setVisible(false);
@@ -208,7 +244,8 @@ export default class GameChallengesUiHandler extends UiHandler {
 
         const tempText = addTextObject(0, 0, "", TextStyle.SETTINGS_LABEL); // this is added here to get the widest text object for this language, which will be used for the arrow placement
 
-        for (let j = 0; j <= globalScene.gameMode.challenges[i].maxValue; j++) { // this goes through each challenge's value to find out what the max width will be
+        for (let j = 0; j <= globalScene.gameMode.challenges[i].maxValue; j++) {
+          // this goes through each challenge's value to find out what the max width will be
           if (globalScene.gameMode.challenges[i].id !== Challenges.SINGLE_TYPE) {
             tempText.setText(globalScene.gameMode.challenges[i].getValue(j));
             if (tempText.displayWidth > this.widestTextBox) {
@@ -234,17 +271,28 @@ export default class GameChallengesUiHandler extends UiHandler {
       challengeLabel.label.setText(challenge.getName());
       challengeLabel.leftArrow.setPositionRelative(challengeLabel.label, this.leftArrowGap, 4.5);
       challengeLabel.leftArrow.setVisible(challenge.value !== 0);
-      challengeLabel.rightArrow.setPositionRelative(challengeLabel.leftArrow, Math.max(this.monoTypeValue.width, this.widestTextBox) + challengeLabel.leftArrow.displayWidth + 2 * this.arrowSpacing, 0);
+      challengeLabel.rightArrow.setPositionRelative(
+        challengeLabel.leftArrow,
+        Math.max(this.monoTypeValue.width, this.widestTextBox) +
+          challengeLabel.leftArrow.displayWidth +
+          2 * this.arrowSpacing,
+        0,
+      );
       challengeLabel.rightArrow.setVisible(challenge.value !== challenge.maxValue);
 
       // this check looks to make sure that the arrows and value textbox don't take up too much space that they'll clip the right edge of the options background
-      if (challengeLabel.rightArrow.x + challengeLabel.rightArrow.width + this.optionsBg.rightWidth + this.arrowSpacing > this.optionsWidth) {
+      if (
+        challengeLabel.rightArrow.x + challengeLabel.rightArrow.width + this.optionsBg.rightWidth + this.arrowSpacing >
+        this.optionsWidth
+      ) {
         // if we go out of bounds of the box, set the x position as far right as we can without going past the box, with this.arrowSpacing to allow a small gap between the arrow and border
         challengeLabel.rightArrow.setX(this.optionsWidth - this.arrowSpacing - this.optionsBg.rightWidth);
       }
 
       // this line of code gets the center point between the left and right arrows from their left side (Arrow.x gives middle point), taking into account the width of the arrows
-      const xLocation = Math.round((challengeLabel.leftArrow.x + challengeLabel.rightArrow.x + challengeLabel.leftArrow.displayWidth) / 2);
+      const xLocation = Math.round(
+        (challengeLabel.leftArrow.x + challengeLabel.rightArrow.x + challengeLabel.leftArrow.displayWidth) / 2,
+      );
       if (challenge.id === Challenges.SINGLE_TYPE) {
         this.monoTypeValue.setX(xLocation);
         this.monoTypeValue.setY(challengeLabel.label.y + 8);
@@ -266,12 +314,10 @@ export default class GameChallengesUiHandler extends UiHandler {
     // This checks if a challenge has been selected by the user and updates the text/its opacity accordingly.
     this.hasSelectedChallenge = globalScene.gameMode.challenges.some(c => c.value !== 0);
     if (this.hasSelectedChallenge) {
-
       this.startText.setText(i18next.t("common:start"));
       this.startText.setAlpha(1);
       this.startText.setPositionRelative(this.startBg, (this.startBg.width - this.startText.displayWidth) / 2, 4);
     } else {
-
       this.startText.setText(i18next.t("challenges:noneSelected"));
       this.startText.setAlpha(0.5);
       this.startText.setPositionRelative(this.startBg, (this.startBg.width - this.startText.displayWidth) / 2, 4);
@@ -362,14 +408,16 @@ export default class GameChallengesUiHandler extends UiHandler {
           case Button.UP:
             if (this.cursor === 0) {
               if (this.scrollCursor === 0) {
-              // When at the top of the menu and pressing UP, move to the bottommost item.
-                if (globalScene.gameMode.challenges.length > rowsToDisplay) { // If there are more than 9 challenges, scroll to the bottom
-                // First, set the cursor to the last visible element, preparing for the scroll to the end.
+                // When at the top of the menu and pressing UP, move to the bottommost item.
+                if (globalScene.gameMode.challenges.length > rowsToDisplay) {
+                  // If there are more than 9 challenges, scroll to the bottom
+                  // First, set the cursor to the last visible element, preparing for the scroll to the end.
                   const successA = this.setCursor(rowsToDisplay - 1);
                   // Then, adjust the scroll to display the bottommost elements of the menu.
                   const successB = this.setScrollCursor(globalScene.gameMode.challenges.length - rowsToDisplay);
                   success = successA && successB; // success is just there to play the little validation sound effect
-                } else { // If there are 9 or less challenges, just move to the bottom one
+                } else {
+                  // If there are 9 or less challenges, just move to the bottom one
                   success = this.setCursor(globalScene.gameMode.challenges.length - 1);
                 }
               } else {
@@ -385,18 +433,21 @@ export default class GameChallengesUiHandler extends UiHandler {
           case Button.DOWN:
             if (this.cursor === rowsToDisplay - 1) {
               if (this.scrollCursor < globalScene.gameMode.challenges.length - rowsToDisplay) {
-              // When at the bottom and pressing DOWN, scroll if possible.
+                // When at the bottom and pressing DOWN, scroll if possible.
                 success = this.setScrollCursor(this.scrollCursor + 1);
               } else {
-              // When at the bottom of a scrolling menu and pressing DOWN, move to the topmost item.
-              // First, set the cursor to the first visible element, preparing for the scroll to the top.
+                // When at the bottom of a scrolling menu and pressing DOWN, move to the topmost item.
+                // First, set the cursor to the first visible element, preparing for the scroll to the top.
                 const successA = this.setCursor(0);
                 // Then, adjust the scroll to display the topmost elements of the menu.
                 const successB = this.setScrollCursor(0);
                 success = successA && successB; // success is just there to play the little validation sound effect
               }
-            } else if (globalScene.gameMode.challenges.length < rowsToDisplay && this.cursor === globalScene.gameMode.challenges.length - 1) {
-            // When at the bottom of a non-scrolling menu and pressing DOWN, move to the topmost item.
+            } else if (
+              globalScene.gameMode.challenges.length < rowsToDisplay &&
+              this.cursor === globalScene.gameMode.challenges.length - 1
+            ) {
+              // When at the bottom of a non-scrolling menu and pressing DOWN, move to the topmost item.
               success = this.setCursor(0);
             } else {
               success = this.setCursor(this.cursor + 1);
@@ -406,14 +457,14 @@ export default class GameChallengesUiHandler extends UiHandler {
             }
             break;
           case Button.LEFT:
-          // Moves the option cursor left, if possible.
+            // Moves the option cursor left, if possible.
             success = this.getActiveChallenge().decreaseValue();
             if (success) {
               this.updateText();
             }
             break;
           case Button.RIGHT:
-          // Moves the option cursor right, if possible.
+            // Moves the option cursor right, if possible.
             success = this.getActiveChallenge().increaseValue();
             if (success) {
               this.updateText();
@@ -434,7 +485,18 @@ export default class GameChallengesUiHandler extends UiHandler {
     let ret = super.setCursor(cursor);
 
     if (!this.cursorObj) {
-      this.cursorObj = globalScene.add.nineslice(0, 0, "summary_moves_cursor", undefined, this.optionsWidth - 8, 16, 1, 1, 1, 1);
+      this.cursorObj = globalScene.add.nineslice(
+        0,
+        0,
+        "summary_moves_cursor",
+        undefined,
+        this.optionsWidth - 8,
+        16,
+        1,
+        1,
+        1,
+        1,
+      );
       this.cursorObj.setOrigin(0, 0);
       this.valuesContainer.add(this.cursorObj);
     }
diff --git a/src/ui/char-sprite.ts b/src/ui/char-sprite.ts
index ccd97e2c8e4..a8451f4bb9c 100644
--- a/src/ui/char-sprite.ts
+++ b/src/ui/char-sprite.ts
@@ -1,5 +1,5 @@
 import { globalScene } from "#app/global-scene";
-import * as Utils from "../utils";
+import { MissingTextureKey } from "#app/utils/common";
 
 export default class CharSprite extends Phaser.GameObjects.Container {
   private sprite: Phaser.GameObjects.Sprite;
@@ -10,11 +10,11 @@ export default class CharSprite extends Phaser.GameObjects.Container {
   public shown: boolean;
 
   constructor() {
-    super(globalScene, (globalScene.game.canvas.width / 6) + 32, -42);
+    super(globalScene, globalScene.game.canvas.width / 6 + 32, -42);
   }
 
   setup(): void {
-    [ this.sprite, this.transitionSprite ] = new Array(2).fill(null).map(() => {
+    [this.sprite, this.transitionSprite] = new Array(2).fill(null).map(() => {
       const ret = globalScene.add.sprite(0, 0, "", "");
       ret.setOrigin(0.5, 1);
       this.add(ret);
@@ -49,15 +49,15 @@ export default class CharSprite extends Phaser.GameObjects.Container {
 
       globalScene.tweens.add({
         targets: this,
-        x: (globalScene.game.canvas.width / 6) - 102,
+        x: globalScene.game.canvas.width / 6 - 102,
         duration: 750,
         ease: "Cubic.easeOut",
         onComplete: () => {
           resolve();
-        }
+        },
       });
 
-      this.setVisible(globalScene.textures.get(key).key !== Utils.MissingTextureKey);
+      this.setVisible(globalScene.textures.get(key).key !== MissingTextureKey);
       this.shown = true;
 
       this.key = key;
@@ -81,7 +81,7 @@ export default class CharSprite extends Phaser.GameObjects.Container {
           this.sprite.setTexture(this.key, variant);
           this.transitionSprite.setVisible(false);
           resolve();
-        }
+        },
       });
       this.variant = variant;
     });
@@ -95,7 +95,7 @@ export default class CharSprite extends Phaser.GameObjects.Container {
 
       globalScene.tweens.add({
         targets: this,
-        x: (globalScene.game.canvas.width / 6) + 32,
+        x: globalScene.game.canvas.width / 6 + 32,
         duration: 750,
         ease: "Cubic.easeIn",
         onComplete: () => {
@@ -103,7 +103,7 @@ export default class CharSprite extends Phaser.GameObjects.Container {
             this.setVisible(false);
           }
           resolve();
-        }
+        },
       });
 
       this.shown = false;
diff --git a/src/ui/command-ui-handler.ts b/src/ui/command-ui-handler.ts
index de75f29ff6f..ff27e9c41c0 100644
--- a/src/ui/command-ui-handler.ts
+++ b/src/ui/command-ui-handler.ts
@@ -1,29 +1,36 @@
 import { addTextObject, TextStyle } from "./text";
 import PartyUiHandler, { PartyUiMode } from "./party-ui-handler";
-import { Mode } from "./ui";
+import { UiMode } from "#enums/ui-mode";
 import UiHandler from "./ui-handler";
 import i18next from "i18next";
 import { Button } from "#enums/buttons";
 import { getPokemonNameWithAffix } from "#app/messages";
 import { CommandPhase } from "#app/phases/command-phase";
 import { globalScene } from "#app/global-scene";
+import { TerastallizeAccessModifier } from "#app/modifier/modifier";
+import { PokemonType } from "#enums/pokemon-type";
+import { getTypeRgb } from "#app/data/type";
+import { Species } from "#enums/species";
 
 export enum Command {
   FIGHT = 0,
   BALL,
   POKEMON,
-  RUN
+  RUN,
+  TERA,
 }
 
 export default class CommandUiHandler extends UiHandler {
   private commandsContainer: Phaser.GameObjects.Container;
   private cursorObj: Phaser.GameObjects.Image | null;
 
-  protected fieldIndex: number = 0;
-  protected cursor2: number = 0;
+  private teraButton: Phaser.GameObjects.Sprite;
+
+  protected fieldIndex = 0;
+  protected cursor2 = 0;
 
   constructor() {
-    super(Mode.COMMAND);
+    super(UiMode.COMMAND);
   }
 
   setup() {
@@ -32,7 +39,7 @@ export default class CommandUiHandler extends UiHandler {
       i18next.t("commandUiHandler:fight"),
       i18next.t("commandUiHandler:ball"),
       i18next.t("commandUiHandler:pokemon"),
-      i18next.t("commandUiHandler:run")
+      i18next.t("commandUiHandler:run"),
     ];
 
     this.commandsContainer = globalScene.add.container(217, -38.7);
@@ -40,6 +47,18 @@ export default class CommandUiHandler extends UiHandler {
     this.commandsContainer.setVisible(false);
     ui.add(this.commandsContainer);
 
+    this.teraButton = globalScene.add.sprite(-32, 15, "button_tera");
+    this.teraButton.setName("terrastallize-button");
+    this.teraButton.setScale(1.3);
+    this.teraButton.setFrame("fire");
+    this.teraButton.setPipeline(globalScene.spritePipeline, {
+      tone: [0.0, 0.0, 0.0, 0.0],
+      ignoreTimeTint: true,
+      teraColor: getTypeRgb(PokemonType.FIRE),
+      isTerastallized: false,
+    });
+    this.commandsContainer.add(this.teraButton);
+
     for (let c = 0; c < commands.length; c++) {
       const commandText = addTextObject(c % 2 === 0 ? 0 : 55.8, c < 2 ? 0 : 16, commands[c], TextStyle.WINDOW);
       commandText.setName(commands[c]);
@@ -50,7 +69,7 @@ export default class CommandUiHandler extends UiHandler {
   show(args: any[]): boolean {
     super.show(args);
 
-    this.fieldIndex = args.length ? args[0] as number : 0;
+    this.fieldIndex = args.length ? (args[0] as number) : 0;
 
     this.commandsContainer.setVisible(true);
 
@@ -62,12 +81,28 @@ export default class CommandUiHandler extends UiHandler {
       commandPhase = globalScene.getStandbyPhase() as CommandPhase;
     }
 
+    if (this.canTera()) {
+      this.teraButton.setVisible(true);
+      this.teraButton.setFrame(PokemonType[globalScene.getField()[this.fieldIndex].getTeraType()].toLowerCase());
+    } else {
+      this.teraButton.setVisible(false);
+      if (this.getCursor() === Command.TERA) {
+        this.setCursor(Command.FIGHT);
+      }
+    }
+    this.toggleTeraButton();
+
     const messageHandler = this.getUi().getMessageHandler();
     messageHandler.bg.setVisible(true);
     messageHandler.commandWindow.setVisible(true);
     messageHandler.movesWindowContainer.setVisible(false);
-    messageHandler.message.setWordWrapWidth(1110);
-    messageHandler.showText(i18next.t("commandUiHandler:actionMessage", { pokemonName: getPokemonNameWithAffix(commandPhase.getPokemon()) }), 0);
+    messageHandler.message.setWordWrapWidth(this.canTera() ? 910 : 1110);
+    messageHandler.showText(
+      i18next.t("commandUiHandler:actionMessage", {
+        pokemonName: getPokemonNameWithAffix(commandPhase.getPokemon()),
+      }),
+      0,
+    );
     if (this.getCursor() === Command.POKEMON) {
       this.setCursor(Command.FIGHT);
     } else {
@@ -85,22 +120,27 @@ export default class CommandUiHandler extends UiHandler {
     const cursor = this.getCursor();
 
     if (button === Button.CANCEL || button === Button.ACTION) {
-
       if (button === Button.ACTION) {
         switch (cursor) {
-        // Fight
+          // Fight
           case Command.FIGHT:
-            ui.setMode(Mode.FIGHT, (globalScene.getCurrentPhase() as CommandPhase).getFieldIndex());
+            ui.setMode(UiMode.FIGHT, (globalScene.getCurrentPhase() as CommandPhase).getFieldIndex());
             success = true;
             break;
           // Ball
           case Command.BALL:
-            ui.setModeWithoutClear(Mode.BALL);
+            ui.setModeWithoutClear(UiMode.BALL);
             success = true;
             break;
           // Pokemon
           case Command.POKEMON:
-            ui.setMode(Mode.PARTY, PartyUiMode.SWITCH, (globalScene.getCurrentPhase() as CommandPhase).getPokemon().getFieldIndex(), null, PartyUiHandler.FilterNonFainted);
+            ui.setMode(
+              UiMode.PARTY,
+              PartyUiMode.SWITCH,
+              (globalScene.getCurrentPhase() as CommandPhase).getPokemon().getFieldIndex(),
+              null,
+              PartyUiHandler.FilterNonFainted,
+            );
             success = true;
             break;
           // Run
@@ -108,6 +148,10 @@ export default class CommandUiHandler extends UiHandler {
             (globalScene.getCurrentPhase() as CommandPhase).handleCommand(Command.RUN, 0);
             success = true;
             break;
+          case Command.TERA:
+            ui.setMode(UiMode.FIGHT, (globalScene.getCurrentPhase() as CommandPhase).getFieldIndex(), Command.TERA);
+            success = true;
+            break;
         }
       } else {
         (globalScene.getCurrentPhase() as CommandPhase).cancel();
@@ -115,23 +159,29 @@ export default class CommandUiHandler extends UiHandler {
     } else {
       switch (button) {
         case Button.UP:
-          if (cursor >= 2) {
+          if (cursor === Command.POKEMON || cursor === Command.RUN) {
             success = this.setCursor(cursor - 2);
           }
           break;
         case Button.DOWN:
-          if (cursor < 2) {
+          if (cursor === Command.FIGHT || cursor === Command.BALL) {
             success = this.setCursor(cursor + 2);
           }
           break;
         case Button.LEFT:
-          if (cursor % 2 === 1) {
+          if (cursor === Command.BALL || cursor === Command.RUN) {
             success = this.setCursor(cursor - 1);
+          } else if ((cursor === Command.FIGHT || cursor === Command.POKEMON) && this.canTera()) {
+            success = this.setCursor(Command.TERA);
+            this.toggleTeraButton();
           }
           break;
         case Button.RIGHT:
-          if (cursor % 2 === 0) {
+          if (cursor === Command.FIGHT || cursor === Command.POKEMON) {
             success = this.setCursor(cursor + 1);
+          } else if (cursor === Command.TERA) {
+            success = this.setCursor(Command.FIGHT);
+            this.toggleTeraButton();
           }
           break;
       }
@@ -144,6 +194,26 @@ export default class CommandUiHandler extends UiHandler {
     return success;
   }
 
+  canTera(): boolean {
+    const hasTeraMod = !!globalScene.getModifiers(TerastallizeAccessModifier).length;
+    const activePokemon = globalScene.getField()[this.fieldIndex];
+    const isBlockedForm =
+      activePokemon.isMega() || activePokemon.isMax() || activePokemon.hasSpecies(Species.NECROZMA, "ultra");
+    const currentTeras = globalScene.arena.playerTerasUsed;
+    const plannedTera =
+      globalScene.currentBattle.preTurnCommands[0]?.command === Command.TERA && this.fieldIndex > 0 ? 1 : 0;
+    return hasTeraMod && !isBlockedForm && currentTeras + plannedTera < 1;
+  }
+
+  toggleTeraButton() {
+    this.teraButton.setPipeline(globalScene.spritePipeline, {
+      tone: [0.0, 0.0, 0.0, 0.0],
+      ignoreTimeTint: true,
+      teraColor: getTypeRgb(globalScene.getField()[this.fieldIndex].getTeraType()),
+      isTerastallized: this.getCursor() === Command.TERA,
+    });
+  }
+
   getCursor(): number {
     return !this.fieldIndex ? this.cursor : this.cursor2;
   }
@@ -163,7 +233,12 @@ export default class CommandUiHandler extends UiHandler {
       this.commandsContainer.add(this.cursorObj);
     }
 
-    this.cursorObj.setPosition(-5 + (cursor % 2 === 1 ? 56 : 0), 8 + (cursor >= 2 ? 16 : 0));
+    if (cursor === Command.TERA) {
+      this.cursorObj.setVisible(false);
+    } else {
+      this.cursorObj.setPosition(-5 + (cursor % 2 === 1 ? 56 : 0), 8 + (cursor >= 2 ? 16 : 0));
+      this.cursorObj.setVisible(true);
+    }
 
     return changed;
   }
diff --git a/src/ui/confirm-ui-handler.ts b/src/ui/confirm-ui-handler.ts
index 3a3a5dfbfe7..7b5ca3d7e63 100644
--- a/src/ui/confirm-ui-handler.ts
+++ b/src/ui/confirm-ui-handler.ts
@@ -1,20 +1,18 @@
 import type { OptionSelectConfig } from "./abstact-option-select-ui-handler";
 import AbstractOptionSelectUiHandler from "./abstact-option-select-ui-handler";
-import { Mode } from "./ui";
+import { UiMode } from "#enums/ui-mode";
 import i18next from "i18next";
 import { Button } from "#enums/buttons";
 import { globalScene } from "#app/global-scene";
 
-
 export default class ConfirmUiHandler extends AbstractOptionSelectUiHandler {
-
   public static readonly windowWidth: number = 48;
 
   private switchCheck: boolean;
   private switchCheckCursor: number;
 
   constructor() {
-    super(Mode.CONFIRM);
+    super(UiMode.CONFIRM);
   }
 
   getWindowWidth(): number {
@@ -22,7 +20,14 @@ export default class ConfirmUiHandler extends AbstractOptionSelectUiHandler {
   }
 
   show(args: any[]): boolean {
-    if (args.length === 4 && args[0] instanceof Function && args[1] instanceof Function && args[2] instanceof Function && args[3] === "fullParty") {
+    if (
+      args.length === 5 &&
+      args[0] instanceof Function &&
+      args[1] instanceof Function &&
+      args[2] instanceof Function &&
+      args[3] instanceof Function &&
+      args[4] === "fullParty"
+    ) {
       const config: OptionSelectConfig = {
         options: [
           {
@@ -31,35 +36,45 @@ export default class ConfirmUiHandler extends AbstractOptionSelectUiHandler {
               args[0]();
               return true;
             },
-          }, {
-            label: i18next.t("menu:yes"),
+          },
+          {
+            label: i18next.t("partyUiHandler:POKEDEX"),
             handler: () => {
               args[1]();
               return true;
-            }
-          }, {
-            label: i18next.t("menu:no"),
+            },
+          },
+          {
+            label: i18next.t("menu:yes"),
             handler: () => {
               args[2]();
               return true;
-            }
-          }
+            },
+          },
+          {
+            label: i18next.t("menu:no"),
+            handler: () => {
+              args[3]();
+              return true;
+            },
+          },
         ],
-        delay: args.length >= 8 && args[7] !== null ? args[7] as number : 0
+        delay: args.length >= 9 && args[8] !== null ? (args[8] as number) : 0,
       };
 
-      super.show([ config ]);
+      super.show([config]);
 
-      this.switchCheck = args.length >= 5 && args[4] !== null && args[4] as boolean;
+      this.switchCheck = args.length >= 6 && args[5] !== null && (args[5] as boolean);
 
-      const xOffset = (args.length >= 6 && args[5] !== null ? args[5] as number : 0);
-      const yOffset = (args.length >= 7 && args[6] !== null ? args[6] as number : 0);
+      const xOffset = args.length >= 7 && args[6] !== null ? (args[6] as number) : 0;
+      const yOffset = args.length >= 8 && args[7] !== null ? (args[7] as number) : 0;
 
-      this.optionSelectContainer.setPosition((globalScene.game.canvas.width / 6) - 1 + xOffset, -48 + yOffset);
+      this.optionSelectContainer.setPosition(globalScene.game.canvas.width / 6 - 1 + xOffset, -48 + yOffset);
 
       this.setCursor(this.switchCheck ? this.switchCheckCursor : 0);
       return true;
-    } else if (args.length >= 2 && args[0] instanceof Function && args[1] instanceof Function) {
+    }
+    if (args.length >= 2 && args[0] instanceof Function && args[1] instanceof Function) {
       const config: OptionSelectConfig = {
         options: [
           {
@@ -67,28 +82,28 @@ export default class ConfirmUiHandler extends AbstractOptionSelectUiHandler {
             handler: () => {
               args[0]();
               return true;
-            }
+            },
           },
           {
             label: i18next.t("menu:no"),
             handler: () => {
               args[1]();
               return true;
-            }
-          }
+            },
+          },
         ],
-        delay: args.length >= 6 && args[5] !== null ? args[5] as number : 0,
-        noCancel: args.length >= 7 && args[6] !== null ? args[6] as boolean : false,
+        delay: args.length >= 6 && args[5] !== null ? (args[5] as number) : 0,
+        noCancel: args.length >= 7 && args[6] !== null ? (args[6] as boolean) : false,
       };
 
-      super.show([ config ]);
+      super.show([config]);
 
-      this.switchCheck = args.length >= 3 && args[2] !== null && args[2] as boolean;
+      this.switchCheck = args.length >= 3 && args[2] !== null && (args[2] as boolean);
 
-      const xOffset = (args.length >= 4 && args[3] !== null ? args[3] as number : 0);
-      const yOffset = (args.length >= 5 && args[4] !== null ? args[4] as number : 0);
+      const xOffset = args.length >= 4 && args[3] !== null ? (args[3] as number) : 0;
+      const yOffset = args.length >= 5 && args[4] !== null ? (args[4] as number) : 0;
 
-      this.optionSelectContainer.setPosition((globalScene.game.canvas.width / 6) - 1 + xOffset, -48 + yOffset);
+      this.optionSelectContainer.setPosition(globalScene.game.canvas.width / 6 - 1 + xOffset, -48 + yOffset);
 
       this.setCursor(this.switchCheck ? this.switchCheckCursor : 0);
 
diff --git a/src/ui/daily-run-scoreboard.ts b/src/ui/daily-run-scoreboard.ts
index d9131150262..076a782908b 100644
--- a/src/ui/daily-run-scoreboard.ts
+++ b/src/ui/daily-run-scoreboard.ts
@@ -1,21 +1,21 @@
 import i18next from "i18next";
 import { globalScene } from "#app/global-scene";
-import * as Utils from "../utils";
+import { getEnumKeys, executeIf } from "#app/utils/common";
 import { TextStyle, addTextObject } from "./text";
 import { WindowVariant, addWindow } from "./ui-theme";
 import { pokerogueApi } from "#app/plugins/api/pokerogue-api";
 
 export interface RankingEntry {
-  rank: number,
-  username: string,
-  score: number,
-  wave: number
+  rank: number;
+  username: string;
+  score: number;
+  wave: number;
 }
 
 // Don't forget to update translations when adding a new category
 export enum ScoreboardCategory {
   DAILY,
-  WEEKLY
+  WEEKLY,
 }
 
 export class DailyRunScoreboard extends Phaser.GameObjects.Container {
@@ -63,7 +63,13 @@ export class DailyRunScoreboard extends Phaser.GameObjects.Container {
     const titleWindow = addWindow(0, 0, 114, 18, false, false, undefined, undefined, WindowVariant.THIN);
     this.add(titleWindow);
 
-    this.titleLabel = addTextObject(titleWindow.displayWidth / 2, titleWindow.displayHeight / 2, i18next.t("menu:loading"), TextStyle.WINDOW, { fontSize: "64px" });
+    this.titleLabel = addTextObject(
+      titleWindow.displayWidth / 2,
+      titleWindow.displayHeight / 2,
+      i18next.t("menu:loading"),
+      TextStyle.WINDOW,
+      { fontSize: "64px" },
+    );
     this.titleLabel.setOrigin(0.5, 0.5);
     this.add(this.titleLabel);
 
@@ -83,7 +89,7 @@ export class DailyRunScoreboard extends Phaser.GameObjects.Container {
 
     this.prevCategoryButton.setInteractive(new Phaser.Geom.Rectangle(0, 0, 6, 10), Phaser.Geom.Rectangle.Contains);
     this.prevCategoryButton.on("pointerup", () => {
-      this.update(this.category ? this.category - 1 : Utils.getEnumKeys(ScoreboardCategory).length - 1);
+      this.update(this.category ? this.category - 1 : getEnumKeys(ScoreboardCategory).length - 1);
     });
 
     this.nextCategoryButton = globalScene.add.sprite(window.displayWidth - 4, 4, "cursor");
@@ -92,10 +98,14 @@ export class DailyRunScoreboard extends Phaser.GameObjects.Container {
 
     this.nextCategoryButton.setInteractive(new Phaser.Geom.Rectangle(0, 0, 6, 10), Phaser.Geom.Rectangle.Contains);
     this.nextCategoryButton.on("pointerup", () => {
-      this.update(this.category < Utils.getEnumKeys(ScoreboardCategory).length - 1 ? this.category + 1 : 0);
+      this.update(this.category < getEnumKeys(ScoreboardCategory).length - 1 ? this.category + 1 : 0);
     });
 
-    this.prevPageButton = globalScene.add.sprite(window.displayWidth / 2 - 16, titleWindow.displayHeight + window.displayHeight - 15, "cursor_reverse");
+    this.prevPageButton = globalScene.add.sprite(
+      window.displayWidth / 2 - 16,
+      titleWindow.displayHeight + window.displayHeight - 15,
+      "cursor_reverse",
+    );
     this.prevPageButton.setOrigin(0, 0);
     this.prevPageButton.setAlpha(0.5);
     this.add(this.prevPageButton);
@@ -107,11 +117,21 @@ export class DailyRunScoreboard extends Phaser.GameObjects.Container {
       }
     });
 
-    this.pageNumberLabel = addTextObject(window.displayWidth / 2, titleWindow.displayHeight + window.displayHeight - 16, "1", TextStyle.WINDOW, { fontSize: "64px" });
+    this.pageNumberLabel = addTextObject(
+      window.displayWidth / 2,
+      titleWindow.displayHeight + window.displayHeight - 16,
+      "1",
+      TextStyle.WINDOW,
+      { fontSize: "64px" },
+    );
     this.pageNumberLabel.setOrigin(0.5, 0);
     this.add(this.pageNumberLabel);
 
-    this.nextPageButton = globalScene.add.sprite(window.displayWidth / 2 + 16, titleWindow.displayHeight + window.displayHeight - 15, "cursor");
+    this.nextPageButton = globalScene.add.sprite(
+      window.displayWidth / 2 + 16,
+      titleWindow.displayHeight + window.displayHeight - 15,
+      "cursor",
+    );
     this.nextPageButton.setOrigin(1, 0);
     this.nextPageButton.setAlpha(0.5);
     this.add(this.nextPageButton);
@@ -133,18 +153,26 @@ export class DailyRunScoreboard extends Phaser.GameObjects.Container {
     const getEntry = (rank: string, username: string, score: string, wave: string) => {
       const entryContainer = globalScene.add.container(0, 0);
 
-      const rankLabel = addTextObject(0, 0, rank, TextStyle.WINDOW, { fontSize: "54px" });
+      const rankLabel = addTextObject(0, 0, rank, TextStyle.WINDOW, {
+        fontSize: "54px",
+      });
       entryContainer.add(rankLabel);
 
-      const usernameLabel = addTextObject(12, 0, username, TextStyle.WINDOW, { fontSize: "54px" });
+      const usernameLabel = addTextObject(12, 0, username, TextStyle.WINDOW, {
+        fontSize: "54px",
+      });
       entryContainer.add(usernameLabel);
 
-      const scoreLabel = addTextObject(84, 0, score, TextStyle.WINDOW, { fontSize: "54px" });
+      const scoreLabel = addTextObject(84, 0, score, TextStyle.WINDOW, {
+        fontSize: "54px",
+      });
       entryContainer.add(scoreLabel);
 
       switch (this.category) {
         case ScoreboardCategory.DAILY:
-          const waveLabel = addTextObject(68, 0, wave, TextStyle.WINDOW, { fontSize: "54px" });
+          const waveLabel = addTextObject(68, 0, wave, TextStyle.WINDOW, {
+            fontSize: "54px",
+          });
           entryContainer.add(waveLabel);
           break;
         case ScoreboardCategory.WEEKLY:
@@ -155,7 +183,14 @@ export class DailyRunScoreboard extends Phaser.GameObjects.Container {
       return entryContainer;
     };
 
-    this.rankingsContainer.add(getEntry(i18next.t("menu:positionIcon"), i18next.t("menu:usernameScoreboard"), i18next.t("menu:score"), i18next.t("menu:wave")));
+    this.rankingsContainer.add(
+      getEntry(
+        i18next.t("menu:positionIcon"),
+        i18next.t("menu:usernameScoreboard"),
+        i18next.t("menu:score"),
+        i18next.t("menu:wave"),
+      ),
+    );
 
     rankings.forEach((r: RankingEntry, i: number) => {
       const entryContainer = getEntry(r.rank.toString(), r.username, r.score.toString(), r.wave.toString());
@@ -175,7 +210,7 @@ export class DailyRunScoreboard extends Phaser.GameObjects.Container {
    *
    * @param {ScoreboardCategory} [category=this.category] - The category to fetch rankings for. Defaults to the current category.
    * @param {number} [page=this.page] - The page number to fetch. Defaults to the current page.
-  */
+   */
   update(category: ScoreboardCategory = this.category, page: number = this.page) {
     if (this.isUpdating) {
       return;
@@ -191,39 +226,49 @@ export class DailyRunScoreboard extends Phaser.GameObjects.Container {
       this.page = page = 1;
     }
 
-    Utils.executeIf(category !== this.category || this.pageCount === undefined,
-      () =>  pokerogueApi.daily.getRankingsPageCount({ category }).then(count => this.pageCount = count)
-    ).then(() => {
-      pokerogueApi.daily.getRankings({ category, page })
-        .then(rankings => {
-          this.page = page;
-          this.category = category;
-          this.titleLabel.setText(`${i18next.t(`menu:${ScoreboardCategory[category].toLowerCase()}Rankings`)}`);
-          this.pageNumberLabel.setText(page.toString());
-          if (rankings) {
-            this.loadingLabel.setVisible(false);
-            this.updateRankings(rankings);
-          } else {
-            this.loadingLabel.setText(i18next.t("menu:noRankings"));
-          }
-        }).finally(() => {
-          this.isUpdating = false;
-        });
-    }).catch(err => {
-      console.error("Failed to load daily rankings:\n", err);
-    });
+    executeIf(category !== this.category || this.pageCount === undefined, () =>
+      pokerogueApi.daily.getRankingsPageCount({ category }).then(count => (this.pageCount = count)),
+    )
+      .then(() => {
+        pokerogueApi.daily
+          .getRankings({ category, page })
+          .then(rankings => {
+            this.page = page;
+            this.category = category;
+            this.titleLabel.setText(`${i18next.t(`menu:${ScoreboardCategory[category].toLowerCase()}Rankings`)}`);
+            this.pageNumberLabel.setText(page.toString());
+            if (rankings) {
+              this.loadingLabel.setVisible(false);
+              this.updateRankings(rankings);
+            } else {
+              this.loadingLabel.setText(i18next.t("menu:noRankings"));
+            }
+          })
+          .finally(() => {
+            this.isUpdating = false;
+          });
+      })
+      .catch(err => {
+        console.error("Failed to load daily rankings:\n", err);
+      });
   }
 
   /**
    * Sets the state of the navigation buttons.
    * @param {boolean} [enabled=true] - Whether the buttons should be enabled or disabled.
    */
-  setButtonsState(enabled: boolean = true) {
+  setButtonsState(enabled = true) {
     const buttons = [
-      { button: this.prevPageButton, alphaValue: enabled ? (this.page > 1 ? 1 : 0.5) : 0.5 },
-      { button: this.nextPageButton, alphaValue: enabled ? (this.page < this.pageCount ? 1 : 0.5) : 0.5 },
+      {
+        button: this.prevPageButton,
+        alphaValue: enabled ? (this.page > 1 ? 1 : 0.5) : 0.5,
+      },
+      {
+        button: this.nextPageButton,
+        alphaValue: enabled ? (this.page < this.pageCount ? 1 : 0.5) : 0.5,
+      },
       { button: this.nextCategoryButton, alphaValue: enabled ? 1 : 0.5 },
-      { button: this.prevCategoryButton, alphaValue: enabled ? 1 : 0.5 }
+      { button: this.prevCategoryButton, alphaValue: enabled ? 1 : 0.5 },
     ];
 
     buttons.forEach(({ button, alphaValue }) => {
diff --git a/src/ui/dropdown.ts b/src/ui/dropdown.ts
index 718058c7f99..2cbd1f0dfa9 100644
--- a/src/ui/dropdown.ts
+++ b/src/ui/dropdown.ts
@@ -5,24 +5,24 @@ import { ScrollBar } from "#app/ui/scroll-bar";
 import i18next from "i18next";
 
 export enum DropDownState {
-    ON = 0,
-    OFF = 1,
-    EXCLUDE = 2,
-    UNLOCKABLE = 3,
-    ONE = 4,
-    TWO = 5
+  ON = 0,
+  OFF = 1,
+  EXCLUDE = 2,
+  UNLOCKABLE = 3,
+  ONE = 4,
+  TWO = 5,
 }
 
 export enum DropDownType {
-    SINGLE = 0,
-    MULTI = 1,
-    HYBRID = 2,
-    RADIAL = 3
+  SINGLE = 0,
+  MULTI = 1,
+  HYBRID = 2,
+  RADIAL = 3,
 }
 
 export enum SortDirection {
   ASC = -1,
-  DESC = 1
+  DESC = 1,
 }
 
 export enum SortCriteria {
@@ -32,7 +32,7 @@ export enum SortCriteria {
   IV = 3,
   NAME = 4,
   CAUGHT = 5,
-  HATCHED = 6
+  HATCHED = 6,
 }
 
 export class DropDownLabel {
@@ -47,7 +47,6 @@ export class DropDownLabel {
   }
 }
 
-
 export class DropDownOption extends Phaser.GameObjects.Container {
   public state: DropDownState = DropDownState.ON;
   public toggle: Phaser.GameObjects.Sprite;
@@ -70,7 +69,7 @@ export class DropDownOption extends Phaser.GameObjects.Container {
     if (Array.isArray(labels)) {
       this.labels = labels;
     } else {
-      this.labels = labels ? [ labels ] : [ new DropDownLabel("") ];
+      this.labels = labels ? [labels] : [new DropDownLabel("")];
     }
     this.currentLabelIndex = 0;
     const currentLabel = this.labels[this.currentLabelIndex];
@@ -105,7 +104,7 @@ export class DropDownOption extends Phaser.GameObjects.Container {
       this.toggle = globalScene.add.sprite(0, 0, "cursor");
       this.toggle.setScale(0.5);
       this.toggle.setOrigin(0, 0.5);
-      this.toggle.setRotation(Math.PI / 180 * -90);
+      this.toggle.setRotation((Math.PI / 180) * -90);
     } else {
       this.toggle = globalScene.add.sprite(0, 0, "candy");
       this.toggle.setScale(0.3);
@@ -279,35 +278,40 @@ export class DropDownOption extends Phaser.GameObjects.Container {
     this.text.setText(currentText);
     return w;
   }
-
 }
 
-
 export class DropDown extends Phaser.GameObjects.Container {
   public options: DropDownOption[];
   private window: Phaser.GameObjects.NineSlice;
   private cursorObj: Phaser.GameObjects.Image;
   public dropDownType: DropDownType = DropDownType.MULTI;
-  public cursor: number = 0;
-  private lastCursor: number = -1;
-  public defaultCursor: number = 0;
+  public cursor = 0;
+  private lastCursor = -1;
+  public defaultCursor = 0;
   private onChange: () => void;
   private lastDir: SortDirection = SortDirection.ASC;
   private defaultSettings: any[];
   private dropDownScrollBar: ScrollBar;
-  private totalOptions: number = 0;
-  private maxOptions: number = 0;
-  private shownOptions: number = 0;
-  private tooManyOptions: Boolean = false;
-  private firstShown: number = 0;
-  private optionHeight: number = 0;
-  private optionSpacing: number = 0;
-  private optionPaddingX: number = 4;
-  private optionPaddingY: number = 6;
-  private optionWidth: number = 100;
-  private cursorOffset: number = 0;
+  private totalOptions = 0;
+  private maxOptions = 0;
+  private shownOptions = 0;
+  private tooManyOptions = false;
+  private firstShown = 0;
+  private optionHeight = 0;
+  private optionSpacing = 0;
+  private optionPaddingX = 4;
+  private optionPaddingY = 6;
+  private optionWidth = 100;
+  private cursorOffset = 0;
 
-  constructor(x: number, y: number, options: DropDownOption[], onChange: () => void, type: DropDownType = DropDownType.MULTI, optionSpacing: number = 2) {
+  constructor(
+    x: number,
+    y: number,
+    options: DropDownOption[],
+    onChange: () => void,
+    type: DropDownType = DropDownType.MULTI,
+    optionSpacing = 2,
+  ) {
     const windowPadding = 5;
     const cursorOffset = 7;
 
@@ -331,7 +335,16 @@ export class DropDown extends Phaser.GameObjects.Container {
 
     // For MULTI and HYBRID filter, add an ALL option at the top
     if (this.dropDownType === DropDownType.MULTI || this.dropDownType === DropDownType.HYBRID) {
-      this.options.unshift(new DropDownOption("ALL", new DropDownLabel(i18next.t("filterBar:all"), undefined, this.checkForAllOn() ? DropDownState.ON : DropDownState.OFF)));
+      this.options.unshift(
+        new DropDownOption(
+          "ALL",
+          new DropDownLabel(
+            i18next.t("filterBar:all"),
+            undefined,
+            this.checkForAllOn() ? DropDownState.ON : DropDownState.OFF,
+          ),
+        ),
+      );
     }
 
     this.maxOptions = 19;
@@ -343,7 +356,6 @@ export class DropDown extends Phaser.GameObjects.Container {
 
     // Place ui elements in the correct spot
     options.forEach((option, index) => {
-
       const toggleVisibility = type !== DropDownType.SINGLE || option.state === DropDownState.ON;
       option.setupToggleIcon(type, toggleVisibility);
 
@@ -366,7 +378,17 @@ export class DropDown extends Phaser.GameObjects.Container {
       this.firstShown = 0;
     });
 
-    this.window = addWindow(0, 0, this.optionWidth, options[this.shownOptions - 1].y + this.optionHeight + this.optionPaddingY, false, false, undefined, undefined, WindowVariant.XTHIN);
+    this.window = addWindow(
+      0,
+      0,
+      this.optionWidth,
+      options[this.shownOptions - 1].y + this.optionHeight + this.optionPaddingY,
+      false,
+      false,
+      undefined,
+      undefined,
+      WindowVariant.XTHIN,
+    );
     this.add(this.window);
     this.add(options);
     this.add(this.cursorObj);
@@ -408,7 +430,6 @@ export class DropDown extends Phaser.GameObjects.Container {
   }
 
   setCursor(cursor: number): boolean {
-
     if (this.tooManyOptions) {
       this.setLabels(cursor);
     }
@@ -418,37 +439,35 @@ export class DropDown extends Phaser.GameObjects.Container {
       cursor = 0;
       this.cursorObj.setVisible(false);
       return false;
-    } else if (cursor >= this.options.length) {
+    }
+    if (cursor >= this.options.length) {
       cursor = this.options.length - 1;
       this.cursorObj.y = this.options[cursor].y + 3.5;
       this.cursorObj.setVisible(true);
       return false;
-    } else {
-      this.cursorObj.y = this.options[cursor].y + 3.5;
-      this.cursorObj.setVisible(true);
-      // If hydrid type, we need to update the filters when going up/down in the list
-      if (this.dropDownType === DropDownType.HYBRID) {
-        this.lastCursor = cursor;
-        this.onChange();
-      }
+    }
+    this.cursorObj.y = this.options[cursor].y + 3.5;
+    this.cursorObj.setVisible(true);
+    // If hydrid type, we need to update the filters when going up/down in the list
+    if (this.dropDownType === DropDownType.HYBRID) {
+      this.lastCursor = cursor;
+      this.onChange();
     }
     return true;
   }
 
   setLabels(cursor: number) {
-
-    if ((cursor === 0) && (this.lastCursor === this.totalOptions - 1)) {
+    if (cursor === 0 && this.lastCursor === this.totalOptions - 1) {
       this.firstShown = 0;
-    } else if ((cursor === this.totalOptions - 1) && (this.lastCursor === 0)) {
+    } else if (cursor === this.totalOptions - 1 && this.lastCursor === 0) {
       this.firstShown = this.totalOptions - this.shownOptions;
-    } else if ((cursor - this.firstShown >= this.shownOptions) && (cursor > this.lastCursor)) {
+    } else if (cursor - this.firstShown >= this.shownOptions && cursor > this.lastCursor) {
       this.firstShown += 1;
-    } else if ((cursor < this.firstShown) && (cursor < this.lastCursor)) {
+    } else if (cursor < this.firstShown && cursor < this.lastCursor) {
       this.firstShown -= 1;
     }
 
     this.options.forEach((option, index) => {
-
       option.y = (index - this.firstShown) * (this.optionHeight + this.optionSpacing) + this.optionPaddingY;
 
       const baseX = this.cursorOffset + this.optionPaddingX + 3;
@@ -460,7 +479,7 @@ export class DropDown extends Phaser.GameObjects.Container {
         option.setTogglePosition(baseX, baseY);
       }
 
-      if ((index < this.firstShown) || ( index >= this.firstShown + this.shownOptions)) {
+      if (index < this.firstShown || index >= this.firstShown + this.shownOptions) {
         option.visible = false;
       } else {
         option.visible = true;
@@ -494,7 +513,7 @@ export class DropDown extends Phaser.GameObjects.Container {
       }
     } else if (this.dropDownType === DropDownType.SINGLE) {
       if (option.state === DropDownState.OFF) {
-        this.options.forEach((option) => {
+        this.options.forEach(option => {
           option.setOptionState(DropDownState.OFF);
           option.setDirection(SortDirection.ASC);
           option.toggle.setVisible(false);
@@ -537,9 +556,12 @@ export class DropDown extends Phaser.GameObjects.Container {
    */
   getVals(): any[] {
     if (this.dropDownType === DropDownType.MULTI) {
-      return this.options.filter((option, i) => i > 0 && option.state === DropDownState.ON).map((option) => option.val);
-    } else if (this.dropDownType === DropDownType.HYBRID) {
-      const selected = this.options.filter((option, i) => i > 0 && option.state === DropDownState.ON).map((option) => option.val);
+      return this.options.filter((option, i) => i > 0 && option.state === DropDownState.ON).map(option => option.val);
+    }
+    if (this.dropDownType === DropDownType.HYBRID) {
+      const selected = this.options
+        .filter((option, i) => i > 0 && option.state === DropDownState.ON)
+        .map(option => option.val);
       if (selected.length > 0) {
         return selected;
       }
@@ -548,16 +570,18 @@ export class DropDown extends Phaser.GameObjects.Container {
         return this.options.filter((_, i) => i > 0).map(option => option.val);
       }
       // if nothing is selected and a single option is hovered, return that one
-      return [ this.options[this.cursor].val ];
-    } else if (this.dropDownType === DropDownType.RADIAL) {
-      return this.options.map((option) => {
+      return [this.options[this.cursor].val];
+    }
+    if (this.dropDownType === DropDownType.RADIAL) {
+      return this.options.map(option => {
         return { val: option.val, state: option.state };
       });
-    } else {
-      return this.options.filter(option => option.state === DropDownState.ON).map((option) => {
+    }
+    return this.options
+      .filter(option => option.state === DropDownState.ON)
+      .map(option => {
         return { val: option.val, dir: option.dir };
       });
-    }
   }
 
   /**
@@ -566,9 +590,14 @@ export class DropDown extends Phaser.GameObjects.Container {
    * - the settings dictionary is like this { val: any, state: DropDownState, cursor: boolean, dir: SortDirection }
    */
   private getSettings(): any[] {
-    const settings : any[] = [];
+    const settings: any[] = [];
     for (let i = 0; i < this.options.length; i++) {
-      settings.push({ val: this.options[i].val, state: this.options[i].state, cursor: (this.cursor === i), dir: this.options[i].dir });
+      settings.push({
+        val: this.options[i].val,
+        state: this.options[i].state,
+        cursor: this.cursor === i,
+        dir: this.options[i].dir,
+      });
     }
     return settings;
   }
@@ -581,22 +610,22 @@ export class DropDown extends Phaser.GameObjects.Container {
     const currentValues = this.getSettings();
 
     const compareValues = (keys: string[]): boolean => {
-      return currentValues.length === this.defaultSettings.length &&
-               currentValues.every((value, index) =>
-                 keys.every(key => value[key] === this.defaultSettings[index][key])
-               );
+      return (
+        currentValues.length === this.defaultSettings.length &&
+        currentValues.every((value, index) => keys.every(key => value[key] === this.defaultSettings[index][key]))
+      );
     };
 
     switch (this.dropDownType) {
       case DropDownType.MULTI:
       case DropDownType.RADIAL:
-        return compareValues([ "val", "state" ]);
+        return compareValues(["val", "state"]);
 
       case DropDownType.HYBRID:
-        return compareValues([ "val", "state", "cursor" ]);
+        return compareValues(["val", "state", "cursor"]);
 
       case DropDownType.SINGLE:
-        return compareValues([ "val", "state", "dir" ]);
+        return compareValues(["val", "state", "dir"]);
 
       default:
         return false;
@@ -629,6 +658,8 @@ export class DropDown extends Phaser.GameObjects.Container {
           }
         }
       }
+
+      this.onChange();
     }
   }
 
@@ -636,7 +667,7 @@ export class DropDown extends Phaser.GameObjects.Container {
    * Set all options to a specific state
    * @param state the DropDownState to assign to each option
    */
-  private setAllOptions(state: DropDownState) : void {
+  private setAllOptions(state: DropDownState): void {
     // For single type dropdown, setting all options is not relevant
     if (this.dropDownType === DropDownType.SINGLE) {
       return;
@@ -685,5 +716,4 @@ export class DropDown extends Phaser.GameObjects.Container {
       this.x = this.parentContainer.width - this.window.width;
     }
   }
-
 }
diff --git a/src/ui/egg-gacha-ui-handler.ts b/src/ui/egg-gacha-ui-handler.ts
index 3cd8a7e8dc9..1bb7124d935 100644
--- a/src/ui/egg-gacha-ui-handler.ts
+++ b/src/ui/egg-gacha-ui-handler.ts
@@ -1,7 +1,7 @@
-import { Mode } from "./ui";
+import { UiMode } from "#enums/ui-mode";
 import { TextStyle, addTextObject, getEggTierTextTint, getTextStyleOptions } from "./text";
 import MessageUiHandler from "./message-ui-handler";
-import * as Utils from "../utils";
+import { getEnumValues, getEnumKeys, fixedInt, randSeedShuffle } from "#app/utils/common";
 import type { IEggOptions } from "../data/egg";
 import { Egg, getLegendaryGachaSpeciesForTimestamp } from "../data/egg";
 import { VoucherType, getVoucherTypeIcon } from "../system/voucher";
@@ -38,10 +38,10 @@ export default class EggGachaUiHandler extends MessageUiHandler {
   private summaryFinished: boolean;
   private defaultText: string;
 
-  private scale: number = 0.1666666667;
+  private scale = 0.1666666667;
 
   constructor() {
-    super(Mode.EGG_GACHA);
+    super(UiMode.EGG_GACHA);
 
     this.gachaContainers = [];
     this.gachaKnobs = [];
@@ -68,22 +68,22 @@ export default class EggGachaUiHandler extends MessageUiHandler {
     this.eggGachaContainer.add(bg);
 
     const hatchFrameNames = globalScene.anims.generateFrameNames("gacha_hatch", { suffix: ".png", start: 1, end: 4 });
-    if (!(globalScene.anims.exists("open"))) {
+    if (!globalScene.anims.exists("open")) {
       globalScene.anims.create({
         key: "open",
         frames: hatchFrameNames,
-        frameRate: 12
+        frameRate: 12,
       });
     }
-    if (!(globalScene.anims.exists("close"))) {
+    if (!globalScene.anims.exists("close")) {
       globalScene.anims.create({
         key: "close",
         frames: hatchFrameNames.reverse(),
-        frameRate: 12
+        frameRate: 12,
       });
     }
 
-    Utils.getEnumValues(GachaType).forEach((gachaType, g) => {
+    getEnumValues(GachaType).forEach((gachaType, g) => {
       const gachaTypeKey = GachaType[gachaType].toString().toLowerCase();
       const gachaContainer = globalScene.add.container(180 * g, 18);
 
@@ -108,7 +108,7 @@ export default class EggGachaUiHandler extends MessageUiHandler {
       let pokemonIconX = -20;
       let pokemonIconY = 6;
 
-      if ([ "de", "es-ES", "fr", "ko", "pt-BR" ].includes(currentLanguage)) {
+      if (["de", "es-ES", "es-MX", "fr", "ko", "pt-BR"].includes(currentLanguage)) {
         gachaTextStyle = TextStyle.SMALLER_WINDOW_ALT;
         gachaX = 2;
         gachaY = 2;
@@ -116,7 +116,7 @@ export default class EggGachaUiHandler extends MessageUiHandler {
 
       let legendaryLabelX = gachaX;
       let legendaryLabelY = gachaY;
-      if ([ "de", "es-ES" ].includes(currentLanguage)) {
+      if (["de", "es-ES", "es-MX"].includes(currentLanguage)) {
         pokemonIconX = -25;
         pokemonIconY = 10;
         legendaryLabelX = -6;
@@ -129,11 +129,11 @@ export default class EggGachaUiHandler extends MessageUiHandler {
 
       switch (gachaType as GachaType) {
         case GachaType.LEGENDARY:
-          if ([ "de", "es-ES" ].includes(currentLanguage)) {
+          if (["de", "es-ES"].includes(currentLanguage)) {
             gachaUpLabel.setAlign("center");
             gachaUpLabel.setY(0);
           }
-          if ([ "pt-BR" ].includes(currentLanguage)) {
+          if (["pt-BR"].includes(currentLanguage)) {
             gachaUpLabel.setX(legendaryLabelX - 2);
           } else {
             gachaUpLabel.setX(legendaryLabelX);
@@ -141,7 +141,7 @@ export default class EggGachaUiHandler extends MessageUiHandler {
           gachaUpLabel.setY(legendaryLabelY);
 
           const pokemonIcon = globalScene.add.sprite(pokemonIconX, pokemonIconY, "pokemon_icons_0");
-          if ([ "pt-BR" ].includes(currentLanguage)) {
+          if (["pt-BR"].includes(currentLanguage)) {
             pokemonIcon.setX(pokemonIconX - 2);
           }
           pokemonIcon.setScale(0.5);
@@ -150,7 +150,7 @@ export default class EggGachaUiHandler extends MessageUiHandler {
           gachaInfoContainer.add(pokemonIcon);
           break;
         case GachaType.MOVE:
-          if ([ "de", "es-ES", "fr", "pt-BR" ].includes(currentLanguage)) {
+          if (["de", "es-ES", "fr", "pt-BR"].includes(currentLanguage)) {
             gachaUpLabel.setAlign("center");
             gachaUpLabel.setY(0);
           }
@@ -160,7 +160,7 @@ export default class EggGachaUiHandler extends MessageUiHandler {
           gachaUpLabel.setOrigin(0.5, 0);
           break;
         case GachaType.SHINY:
-          if ([ "de", "fr", "ko" ].includes(currentLanguage)) {
+          if (["de", "fr", "ko"].includes(currentLanguage)) {
             gachaUpLabel.setAlign("center");
             gachaUpLabel.setY(0);
           }
@@ -187,7 +187,9 @@ export default class EggGachaUiHandler extends MessageUiHandler {
       gachaGlass.setAlpha(0.5);
       gachaHatch.setAlpha(0.9);
 
-      gachaHatch.on("animationupdate", (_anim, frame) => gachaUnderlay.setFrame(frame.textureFrame === "4.png" ? "open_hatch" : "default"));
+      gachaHatch.on("animationupdate", (_anim, frame) =>
+        gachaUnderlay.setFrame(frame.textureFrame === "4.png" ? "open_hatch" : "default"),
+      );
 
       this.gachaContainers.push(gachaContainer);
       this.gachaKnobs.push(gachaKnob);
@@ -201,10 +203,9 @@ export default class EggGachaUiHandler extends MessageUiHandler {
 
     this.eggGachaOptionsContainer = globalScene.add.container();
 
-    this.eggGachaOptionsContainer = globalScene.add.container((globalScene.game.canvas.width / 6), 148);
+    this.eggGachaOptionsContainer = globalScene.add.container(globalScene.game.canvas.width / 6, 148);
     this.eggGachaContainer.add(this.eggGachaOptionsContainer);
 
-
     this.eggGachaOptionSelectBg = addWindow(0, 0, 96, 16 + 576 * this.scale);
     this.eggGachaOptionSelectBg.setOrigin(1, 1);
     this.eggGachaOptionsContainer.add(this.eggGachaOptionSelectBg);
@@ -212,31 +213,48 @@ export default class EggGachaUiHandler extends MessageUiHandler {
     const multiplierOne = "x1";
     const multiplierTen = "x10";
     const pullOptions = [
-      { multiplier: multiplierOne, description: `1 ${i18next.t("egg:pull")}`, icon: getVoucherTypeIcon(VoucherType.REGULAR) },
-      { multiplier: multiplierTen, description: `10 ${i18next.t("egg:pulls")}`, icon: getVoucherTypeIcon(VoucherType.REGULAR) },
-      { multiplier: multiplierOne, description: `5 ${i18next.t("egg:pulls")}`, icon: getVoucherTypeIcon(VoucherType.PLUS) },
-      { multiplier: multiplierOne, description: `10 ${i18next.t("egg:pulls")}`, icon: getVoucherTypeIcon(VoucherType.PREMIUM) },
-      { multiplier: multiplierOne, description: `25 ${i18next.t("egg:pulls")}`, icon: getVoucherTypeIcon(VoucherType.GOLDEN) }
+      {
+        multiplier: multiplierOne,
+        description: `1 ${i18next.t("egg:pull")}`,
+        icon: getVoucherTypeIcon(VoucherType.REGULAR),
+      },
+      {
+        multiplier: multiplierTen,
+        description: `10 ${i18next.t("egg:pulls")}`,
+        icon: getVoucherTypeIcon(VoucherType.REGULAR),
+      },
+      {
+        multiplier: multiplierOne,
+        description: `5 ${i18next.t("egg:pulls")}`,
+        icon: getVoucherTypeIcon(VoucherType.PLUS),
+      },
+      {
+        multiplier: multiplierOne,
+        description: `10 ${i18next.t("egg:pulls")}`,
+        icon: getVoucherTypeIcon(VoucherType.PREMIUM),
+      },
+      {
+        multiplier: multiplierOne,
+        description: `25 ${i18next.t("egg:pulls")}`,
+        icon: getVoucherTypeIcon(VoucherType.GOLDEN),
+      },
     ];
 
     const resolvedLanguage = i18next.resolvedLanguage ?? "en";
-    const pullOptionsText = pullOptions.map(option =>{
-      const desc = option.description.split(" ");
-      if (desc[0].length < 2) {
-        desc[0] += [ "zh", "ko" ].includes(resolvedLanguage.substring(0, 2)) ? " " : "  ";
-      }
-      if (option.multiplier === multiplierOne) {
-        desc[0] = " " + desc[0];
-      }
-      return `     ${option.multiplier.padEnd(5)}${desc.join(" ")}`;
-    }).join("\n");
+    const pullOptionsText = pullOptions
+      .map(option => {
+        const desc = option.description.split(" ");
+        if (desc[0].length < 2) {
+          desc[0] += ["zh", "ko"].includes(resolvedLanguage.substring(0, 2)) ? " " : "  ";
+        }
+        if (option.multiplier === multiplierOne) {
+          desc[0] = " " + desc[0];
+        }
+        return `     ${option.multiplier.padEnd(5)}${desc.join(" ")}`;
+      })
+      .join("\n");
 
-    const optionText = addTextObject(
-      0,
-      0,
-      `${pullOptionsText}\n${i18next.t("menu:cancel")}`,
-      TextStyle.WINDOW,
-    );
+    const optionText = addTextObject(0, 0, `${pullOptionsText}\n${i18next.t("menu:cancel")}`, TextStyle.WINDOW);
 
     optionText.setLineSpacing(28);
     optionText.setFontSize("80px");
@@ -254,8 +272,8 @@ export default class EggGachaUiHandler extends MessageUiHandler {
 
     this.eggGachaContainer.add(this.eggGachaOptionsContainer);
 
-    new Array(Utils.getEnumKeys(VoucherType).length).fill(null).map((_, i) => {
-      const container = globalScene.add.container((globalScene.game.canvas.width / 6) - 56 * i, 0);
+    new Array(getEnumKeys(VoucherType).length).fill(null).map((_, i) => {
+      const container = globalScene.add.container(globalScene.game.canvas.width / 6 - 56 * i, 0);
 
       const bg = addWindow(0, 0, 56, 22);
       bg.setOrigin(1, 0);
@@ -295,7 +313,9 @@ export default class EggGachaUiHandler extends MessageUiHandler {
 
     this.eggGachaMessageBox = gachaMessageBox;
 
-    const gachaMessageText = addTextObject(8, 8, "", TextStyle.WINDOW, { maxLines: 2 });
+    const gachaMessageText = addTextObject(8, 8, "", TextStyle.WINDOW, {
+      maxLines: 2,
+    });
     gachaMessageText.setOrigin(0, 0);
     gachaMessageBoxContainer.add(gachaMessageText);
 
@@ -335,10 +355,10 @@ export default class EggGachaUiHandler extends MessageUiHandler {
     if (this.transitioning && this.transitionCancelled) {
       delay = Math.ceil(delay / 5);
     }
-    return Utils.fixedInt(delay);
+    return fixedInt(delay);
   }
 
-  pull(pullCount: number = 0, count: number = 0, eggs?: Egg[]): void {
+  pull(pullCount = 0, count = 0, eggs?: Egg[]): void {
     if (Overrides.EGG_GACHA_PULL_COUNT_OVERRIDE && !count) {
       pullCount = Overrides.EGG_GACHA_PULL_COUNT_OVERRIDE;
     }
@@ -376,7 +396,7 @@ export default class EggGachaUiHandler extends MessageUiHandler {
                     targets: egg,
                     duration: this.getDelayValue(350),
                     scale: 0.75,
-                    ease: "Sine.easeIn"
+                    ease: "Sine.easeIn",
                   });
                   globalScene.tweens.add({
                     targets: egg,
@@ -396,12 +416,12 @@ export default class EggGachaUiHandler extends MessageUiHandler {
                           } else {
                             this.showSummary(eggs!);
                           }
-                        }
+                        },
                       });
-                    }
+                    },
                   });
                 });
-              }
+              },
             });
           });
         });
@@ -419,10 +439,10 @@ export default class EggGachaUiHandler extends MessageUiHandler {
               targets: this.gachaKnobs[this.gachaCursor],
               duration: this.getDelayValue(350),
               angle: 0,
-              ease: "Sine.easeInOut"
+              ease: "Sine.easeInOut",
             });
             globalScene.time.delayedCall(this.getDelayValue(350), doPullAnim);
-          }
+          },
         });
       } else {
         doPullAnim();
@@ -438,7 +458,10 @@ export default class EggGachaUiHandler extends MessageUiHandler {
     if (!eggs) {
       eggs = [];
       for (let i = 1; i <= pullCount; i++) {
-        const eggOptions: IEggOptions = { pulled: true, sourceType: this.gachaCursor };
+        const eggOptions: IEggOptions = {
+          pulled: true,
+          sourceType: this.gachaCursor,
+        };
 
         // Before creating the last egg, check if the guaranteed egg tier was already generated
         // if not, override the egg tier
@@ -453,10 +476,12 @@ export default class EggGachaUiHandler extends MessageUiHandler {
         eggs.push(egg);
       }
       // Shuffle the eggs in case the guaranteed one got added as last egg
-      eggs = Utils.randSeedShuffle<Egg>(eggs);
+      eggs = randSeedShuffle<Egg>(eggs);
 
-
-      (globalScene.currentBattle ? globalScene.gameData.saveAll(true, true, true) : globalScene.gameData.saveSystem()).then(success => {
+      (globalScene.currentBattle
+        ? globalScene.gameData.saveAll(true, true, true)
+        : globalScene.gameData.saveSystem()
+      ).then(success => {
         if (!success) {
           return globalScene.reset(true);
         }
@@ -507,8 +532,11 @@ export default class EggGachaUiHandler extends MessageUiHandler {
           const row = Math.floor(t / rowItems);
           const sliceWidth = this.eggGachaOverlay.displayWidth / (cols + 2);
           const sliceHeight = height / (rows + 2);
-          const yOffset = (sliceHeight / 2 * (row / Math.max(rows - 1, 1))) + sliceHeight / 4;
-          const ret = globalScene.add.container(sliceWidth * (col + 1) + (sliceWidth * 0.5), sliceHeight * (row + 1) + yOffset);
+          const yOffset = (sliceHeight / 2) * (row / Math.max(rows - 1, 1)) + sliceHeight / 4;
+          const ret = globalScene.add.container(
+            sliceWidth * (col + 1) + sliceWidth * 0.5,
+            sliceHeight * (row + 1) + yOffset,
+          );
           ret.setScale(0.0001);
 
           const eggSprite = globalScene.add.sprite(0, 0, "egg", `egg_${egg.getKey()}`);
@@ -538,18 +566,18 @@ export default class EggGachaUiHandler extends MessageUiHandler {
                   this.setTransitioning(false);
                   this.summaryFinished = true;
                 }
-              }
-            }));
-
+              },
+            }),
+          );
         });
-      }
+      },
     });
   }
 
   hideSummary() {
     this.setTransitioning(true);
     globalScene.tweens.add({
-      targets: [ this.eggGachaOverlay, this.eggGachaSummaryContainer ],
+      targets: [this.eggGachaOverlay, this.eggGachaSummaryContainer],
       alpha: 0,
       duration: this.getDelayValue(250),
       ease: "Cubic.easeIn",
@@ -560,7 +588,7 @@ export default class EggGachaUiHandler extends MessageUiHandler {
         this.setTransitioning(false);
         this.summaryFinished = false;
         this.eggGachaOptionsContainer.setVisible(true);
-      }
+      },
     });
   }
 
@@ -576,7 +604,10 @@ export default class EggGachaUiHandler extends MessageUiHandler {
   }
 
   consumeVouchers(voucherType: VoucherType, count: number): void {
-    globalScene.gameData.voucherCounts[voucherType] = Math.max(globalScene.gameData.voucherCounts[voucherType] - count, 0);
+    globalScene.gameData.voucherCounts[voucherType] = Math.max(
+      globalScene.gameData.voucherCounts[voucherType] - count,
+      0,
+    );
     this.updateVoucherCounts();
   }
 
@@ -586,7 +617,14 @@ export default class EggGachaUiHandler extends MessageUiHandler {
     });
   }
 
-  showText(text: string, delay?: number, callback?: Function, callbackDelay?: number, prompt?: boolean, promptDelay?: number): void {
+  showText(
+    text: string,
+    delay?: number,
+    callback?: Function,
+    callbackDelay?: number,
+    prompt?: boolean,
+    promptDelay?: number,
+  ): void {
     if (!text) {
       text = this.defaultText;
     }
@@ -605,7 +643,7 @@ export default class EggGachaUiHandler extends MessageUiHandler {
   }
 
   showError(text: string): void {
-    this.showText(text, undefined, () => this.showText(this.defaultText), Utils.fixedInt(1500));
+    this.showText(text, undefined, () => this.showText(this.defaultText), fixedInt(1500));
   }
 
   setTransitioning(transitioning: boolean): void {
@@ -630,7 +668,6 @@ export default class EggGachaUiHandler extends MessageUiHandler {
         return false;
       }
     } else {
-
       if (this.eggGachaSummaryContainer.visible) {
         if (this.summaryFinished && (button === Button.ACTION || button === Button.CANCEL)) {
           this.hideSummary();
@@ -641,7 +678,10 @@ export default class EggGachaUiHandler extends MessageUiHandler {
           case Button.ACTION:
             switch (this.cursor) {
               case 0:
-                if (!globalScene.gameData.voucherCounts[VoucherType.REGULAR] && !Overrides.EGG_FREE_GACHA_PULLS_OVERRIDE) {
+                if (
+                  !globalScene.gameData.voucherCounts[VoucherType.REGULAR] &&
+                  !Overrides.EGG_FREE_GACHA_PULLS_OVERRIDE
+                ) {
                   error = true;
                   this.showError(i18next.t("egg:notEnoughVouchers"));
                 } else if (globalScene.gameData.eggs.length < 99 || Overrides.UNLIMITED_EGG_COUNT_OVERRIDE) {
@@ -672,8 +712,14 @@ export default class EggGachaUiHandler extends MessageUiHandler {
                 break;
               case 1:
               case 3:
-                if ((this.cursor === 1 && globalScene.gameData.voucherCounts[VoucherType.REGULAR] < 10 && !Overrides.EGG_FREE_GACHA_PULLS_OVERRIDE)
-                  || (this.cursor === 3 && !globalScene.gameData.voucherCounts[VoucherType.PREMIUM] && !Overrides.EGG_FREE_GACHA_PULLS_OVERRIDE)) {
+                if (
+                  (this.cursor === 1 &&
+                    globalScene.gameData.voucherCounts[VoucherType.REGULAR] < 10 &&
+                    !Overrides.EGG_FREE_GACHA_PULLS_OVERRIDE) ||
+                  (this.cursor === 3 &&
+                    !globalScene.gameData.voucherCounts[VoucherType.PREMIUM] &&
+                    !Overrides.EGG_FREE_GACHA_PULLS_OVERRIDE)
+                ) {
                   error = true;
                   this.showError(i18next.t("egg:notEnoughVouchers"));
                 } else if (globalScene.gameData.eggs.length < 90 || Overrides.UNLIMITED_EGG_COUNT_OVERRIDE) {
@@ -694,7 +740,10 @@ export default class EggGachaUiHandler extends MessageUiHandler {
                 }
                 break;
               case 4:
-                if (!globalScene.gameData.voucherCounts[VoucherType.GOLDEN] && !Overrides.EGG_FREE_GACHA_PULLS_OVERRIDE) {
+                if (
+                  !globalScene.gameData.voucherCounts[VoucherType.GOLDEN] &&
+                  !Overrides.EGG_FREE_GACHA_PULLS_OVERRIDE
+                ) {
                   error = true;
                   this.showError(i18next.t("egg:notEnoughVouchers"));
                 } else if (globalScene.gameData.eggs.length < 75 || Overrides.UNLIMITED_EGG_COUNT_OVERRIDE) {
@@ -734,7 +783,7 @@ export default class EggGachaUiHandler extends MessageUiHandler {
             }
             break;
           case Button.RIGHT:
-            if (this.gachaCursor < Utils.getEnumKeys(GachaType).length - 1) {
+            if (this.gachaCursor < getEnumKeys(GachaType).length - 1) {
               success = this.setGachaCursor(this.gachaCursor + 1);
             }
             break;
@@ -780,7 +829,7 @@ export default class EggGachaUiHandler extends MessageUiHandler {
         duration: this.eggGachaContainer.visible ? 500 : 0,
         x: (_target, _key, _value, index) => 180 * (index - cursor),
         ease: "Cubic.easeInOut",
-        onComplete: () => this.setTransitioning(false)
+        onComplete: () => this.setTransitioning(false),
       });
     }
 
diff --git a/src/ui/egg-hatch-scene-handler.ts b/src/ui/egg-hatch-scene-handler.ts
index 791c488c91a..76e2c54f4b6 100644
--- a/src/ui/egg-hatch-scene-handler.ts
+++ b/src/ui/egg-hatch-scene-handler.ts
@@ -1,4 +1,4 @@
-import { Mode } from "./ui";
+import { UiMode } from "#enums/ui-mode";
 import UiHandler from "./ui-handler";
 import { Button } from "#enums/buttons";
 import { EggHatchPhase } from "#app/phases/egg-hatch-phase";
@@ -16,7 +16,7 @@ export default class EggHatchSceneHandler extends UiHandler {
   public readonly eventTarget: EventTarget = new EventTarget();
 
   constructor() {
-    super(Mode.EGG_HATCH_SCENE);
+    super(UiMode.EGG_HATCH_SCENE);
   }
 
   setup() {
@@ -24,11 +24,11 @@ export default class EggHatchSceneHandler extends UiHandler {
     globalScene.fieldUI.add(this.eggHatchContainer);
 
     const eggLightraysAnimFrames = globalScene.anims.generateFrameNames("egg_lightrays", { start: 0, end: 3 });
-    if (!(globalScene.anims.exists("egg_lightrays"))) {
+    if (!globalScene.anims.exists("egg_lightrays")) {
       globalScene.anims.create({
         key: "egg_lightrays",
         frames: eggLightraysAnimFrames,
-        frameRate: 32
+        frameRate: 32,
       });
     }
   }
diff --git a/src/ui/egg-list-ui-handler.ts b/src/ui/egg-list-ui-handler.ts
index 1b25d55d96d..9f41feea8ab 100644
--- a/src/ui/egg-list-ui-handler.ts
+++ b/src/ui/egg-list-ui-handler.ts
@@ -1,4 +1,4 @@
-import { Mode } from "#app/ui/ui";
+import { UiMode } from "#enums/ui-mode";
 import PokemonIconAnimHandler, { PokemonIconAnimMode } from "#app/ui/pokemon-icon-anim-handler";
 import { TextStyle, addTextObject } from "#app/ui/text";
 import MessageUiHandler from "#app/ui/message-ui-handler";
@@ -24,12 +24,12 @@ export default class EggListUiHandler extends MessageUiHandler {
   private eggListMessageBoxContainer: Phaser.GameObjects.Container;
 
   private cursorObj: Phaser.GameObjects.Image;
-  private scrollGridHandler : ScrollableGridUiHandler;
+  private scrollGridHandler: ScrollableGridUiHandler;
 
   private iconAnimHandler: PokemonIconAnimHandler;
 
   constructor() {
-    super(Mode.EGG_LIST);
+    super(UiMode.EGG_LIST);
   }
 
   setup() {
@@ -39,7 +39,13 @@ export default class EggListUiHandler extends MessageUiHandler {
     this.eggListContainer.setVisible(false);
     ui.add(this.eggListContainer);
 
-    const bgColor = globalScene.add.rectangle(0, 0, globalScene.game.canvas.width / 6, globalScene.game.canvas.height / 6, 0x006860);
+    const bgColor = globalScene.add.rectangle(
+      0,
+      0,
+      globalScene.game.canvas.width / 6,
+      globalScene.game.canvas.height / 6,
+      0x006860,
+    );
     bgColor.setOrigin(0, 0);
     this.eggListContainer.add(bgColor);
 
@@ -86,7 +92,7 @@ export default class EggListUiHandler extends MessageUiHandler {
     this.scrollGridHandler = new ScrollableGridUiHandler(this, this.ROWS, this.COLUMNS)
       .withScrollBar(scrollBar)
       .withUpdateGridCallBack(() => this.updateEggIcons())
-      .withUpdateSingleElementCallback((i:number) => this.setEggDetails(i));
+      .withUpdateSingleElementCallback((i: number) => this.setEggDetails(i));
 
     this.eggListMessageBoxContainer = globalScene.add.container(0, globalScene.game.canvas.height / 6);
     this.eggListMessageBoxContainer.setVisible(false);
@@ -170,8 +176,8 @@ export default class EggListUiHandler extends MessageUiHandler {
         weekday: "short",
         year: "numeric",
         month: "2-digit",
-        day: "numeric"
-      })
+        day: "numeric",
+      }),
     );
     this.eggHatchWavesText.setText(egg.getEggHatchWavesMessage());
     this.eggGachaInfoText.setText(egg.getEggTypeDescriptor());
diff --git a/src/ui/egg-summary-ui-handler.ts b/src/ui/egg-summary-ui-handler.ts
index 04b31ab9ca8..ddc536fe1ad 100644
--- a/src/ui/egg-summary-ui-handler.ts
+++ b/src/ui/egg-summary-ui-handler.ts
@@ -1,4 +1,4 @@
-import { Mode } from "./ui";
+import { UiMode } from "#enums/ui-mode";
 import PokemonIconAnimHandler, { PokemonIconAnimMode } from "./pokemon-icon-anim-handler";
 import MessageUiHandler from "./message-ui-handler";
 import { getEggTierForSpecies } from "../data/egg";
@@ -39,7 +39,7 @@ export default class EggSummaryUiHandler extends MessageUiHandler {
   private eggHatchBg: Phaser.GameObjects.Image;
   private eggHatchData: EggHatchData[];
 
-  private scrollGridHandler : ScrollableGridUiHandler;
+  private scrollGridHandler: ScrollableGridUiHandler;
   private cursorObj: Phaser.GameObjects.Image;
 
   /** used to add a delay before which it is not possible to exit the summary */
@@ -54,7 +54,7 @@ export default class EggSummaryUiHandler extends MessageUiHandler {
   public readonly eventTarget: EventTarget = new EventTarget();
 
   constructor() {
-    super(Mode.EGG_HATCH_SUMMARY);
+    super(UiMode.EGG_HATCH_SUMMARY);
   }
 
   setup() {
@@ -89,7 +89,13 @@ export default class EggSummaryUiHandler extends MessageUiHandler {
     this.infoContainer.setVisible(true);
     this.summaryContainer.add(this.infoContainer);
 
-    const scrollBar = new ScrollBar(iconContainerX + numCols * iconSize, iconContainerY + 3, 4, globalScene.game.canvas.height / 6 - 20, numRows);
+    const scrollBar = new ScrollBar(
+      iconContainerX + numCols * iconSize,
+      iconContainerY + 3,
+      4,
+      globalScene.game.canvas.height / 6 - 20,
+      numRows,
+    );
     this.summaryContainer.add(scrollBar);
 
     this.scrollGridHandler = new ScrollableGridUiHandler(this, numRows, numCols)
@@ -146,17 +152,17 @@ export default class EggSummaryUiHandler extends MessageUiHandler {
         const speciesB = b.pokemon.species;
         if (getEggTierForSpecies(speciesA) < getEggTierForSpecies(speciesB)) {
           return -1;
-        } else if (getEggTierForSpecies(speciesA) > getEggTierForSpecies(speciesB)) {
-          return 1;
-        } else {
-          if (speciesA.speciesId < speciesB.speciesId) {
-            return -1;
-          } else if (speciesA.speciesId > speciesB.speciesId) {
-            return 1;
-          } else {
-            return 0;
-          }
         }
+        if (getEggTierForSpecies(speciesA) > getEggTierForSpecies(speciesB)) {
+          return 1;
+        }
+        if (speciesA.speciesId < speciesB.speciesId) {
+          return -1;
+        }
+        if (speciesA.speciesId > speciesB.speciesId) {
+          return 1;
+        }
+        return 0;
       });
     }
 
@@ -174,9 +180,9 @@ export default class EggSummaryUiHandler extends MessageUiHandler {
 
     // Prevent exiting the egg summary for 2 seconds if the egg hatching
     // was skipped automatically and for 1 second otherwise
-    const exitBlockingDuration = (globalScene.eggSkipPreference === 2) ? 2000 : 1000;
+    const exitBlockingDuration = globalScene.eggSkipPreference === 2 ? 2000 : 1000;
     this.blockExit = true;
-    globalScene.time.delayedCall(exitBlockingDuration, () => this.blockExit = false);
+    globalScene.time.delayedCall(exitBlockingDuration, () => (this.blockExit = false));
 
     return true;
   }
@@ -245,7 +251,10 @@ export default class EggSummaryUiHandler extends MessageUiHandler {
     changed = super.setCursor(cursor);
 
     if (changed) {
-      this.cursorObj.setPosition(iconContainerX - 1 + iconSize * (cursor % numCols), iconContainerY + 1 + iconSize * Math.floor(cursor / numCols));
+      this.cursorObj.setPosition(
+        iconContainerX - 1 + iconSize * (cursor % numCols),
+        iconContainerY + 1 + iconSize * Math.floor(cursor / numCols),
+      );
 
       if (lastCursor > -1) {
         this.iconAnimHandler.addOrUpdate(this.pokemonContainers[lastCursor].icon, PokemonIconAnimMode.NONE);
@@ -257,5 +266,4 @@ export default class EggSummaryUiHandler extends MessageUiHandler {
 
     return changed;
   }
-
 }
diff --git a/src/ui/evolution-scene-handler.ts b/src/ui/evolution-scene-handler.ts
index b35aa8f6cc0..cea91ce4e2c 100644
--- a/src/ui/evolution-scene-handler.ts
+++ b/src/ui/evolution-scene-handler.ts
@@ -1,6 +1,6 @@
 import MessageUiHandler from "./message-ui-handler";
 import { TextStyle, addTextObject } from "./text";
-import { Mode } from "./ui";
+import { UiMode } from "#enums/ui-mode";
 import { Button } from "#enums/buttons";
 import { globalScene } from "#app/global-scene";
 
@@ -12,7 +12,7 @@ export default class EvolutionSceneHandler extends MessageUiHandler {
   public cancelled: boolean;
 
   constructor() {
-    super(Mode.EVOLUTION_SCENE);
+    super(UiMode.EVOLUTION_SCENE);
   }
 
   setup() {
@@ -38,8 +38,8 @@ export default class EvolutionSceneHandler extends MessageUiHandler {
     const message = addTextObject(0, 0, "", TextStyle.MESSAGE, {
       maxLines: 2,
       wordWrap: {
-        width: 1780
-      }
+        width: 1780,
+      },
     });
     this.messageContainer.add(message);
 
diff --git a/src/ui/fight-ui-handler.ts b/src/ui/fight-ui-handler.ts
index 72fb90066e7..5a0978a934d 100644
--- a/src/ui/fight-ui-handler.ts
+++ b/src/ui/fight-ui-handler.ts
@@ -2,19 +2,19 @@ import type { InfoToggle } from "#app/battle-scene";
 import { globalScene } from "#app/global-scene";
 import { addTextObject, TextStyle } from "./text";
 import { getTypeDamageMultiplierColor } from "#app/data/type";
-import { Type } from "#enums/type";
+import { PokemonType } from "#enums/pokemon-type";
 import { Command } from "./command-ui-handler";
-import { Mode } from "./ui";
+import { UiMode } from "#enums/ui-mode";
 import UiHandler from "./ui-handler";
-import * as Utils from "../utils";
-import { MoveCategory } from "#app/data/move";
+import { getLocalizedSpriteKey, fixedInt, padInt } from "#app/utils/common";
+import { MoveCategory } from "#enums/MoveCategory";
 import i18next from "i18next";
 import { Button } from "#enums/buttons";
 import type { PokemonMove } from "#app/field/pokemon";
 import type Pokemon from "#app/field/pokemon";
 import type { CommandPhase } from "#app/phases/command-phase";
 import MoveInfoOverlay from "./move-info-overlay";
-import { BattleType } from "#app/battle";
+import { BattleType } from "#enums/battle-type";
 
 export default class FightUiHandler extends UiHandler implements InfoToggle {
   public static readonly MOVES_CONTAINER_NAME = "moves";
@@ -30,13 +30,14 @@ export default class FightUiHandler extends UiHandler implements InfoToggle {
   private accuracyText: Phaser.GameObjects.Text;
   private cursorObj: Phaser.GameObjects.Image | null;
   private moveCategoryIcon: Phaser.GameObjects.Sprite;
-  private moveInfoOverlay : MoveInfoOverlay;
+  private moveInfoOverlay: MoveInfoOverlay;
 
-  protected fieldIndex: number = 0;
-  protected cursor2: number = 0;
+  protected fieldIndex = 0;
+  protected fromCommand: Command = Command.FIGHT;
+  protected cursor2 = 0;
 
   constructor() {
-    super(Mode.FIGHT);
+    super(UiMode.FIGHT);
   }
 
   setup() {
@@ -50,7 +51,12 @@ export default class FightUiHandler extends UiHandler implements InfoToggle {
     this.moveInfoContainer.setName("move-info");
     ui.add(this.moveInfoContainer);
 
-    this.typeIcon = globalScene.add.sprite(globalScene.scaledCanvas.width - 57, -36, Utils.getLocalizedSpriteKey("types"), "unknown");
+    this.typeIcon = globalScene.add.sprite(
+      globalScene.scaledCanvas.width - 57,
+      -36,
+      getLocalizedSpriteKey("types"),
+      "unknown",
+    );
     this.typeIcon.setVisible(false);
     this.moveInfoContainer.add(this.typeIcon);
 
@@ -100,9 +106,9 @@ export default class FightUiHandler extends UiHandler implements InfoToggle {
       right: true,
       x: 0,
       y: -MoveInfoOverlay.getHeight(overlayScale, true),
-      width: (globalScene.game.canvas.width / 6) + 4,
+      width: globalScene.game.canvas.width / 6 + 4,
       hideEffectBox: true,
-      hideBg: true
+      hideBg: true,
     });
     ui.add(this.moveInfoOverlay);
     // register the overlay to receive toggle events
@@ -113,14 +119,15 @@ export default class FightUiHandler extends UiHandler implements InfoToggle {
   show(args: any[]): boolean {
     super.show(args);
 
-    this.fieldIndex = args.length ? args[0] as number : 0;
+    this.fieldIndex = args.length ? (args[0] as number) : 0;
+    this.fromCommand = args.length > 1 ? (args[1] as Command) : Command.FIGHT;
 
     const messageHandler = this.getUi().getMessageHandler();
     messageHandler.bg.setVisible(false);
     messageHandler.commandWindow.setVisible(false);
     messageHandler.movesWindowContainer.setVisible(true);
     const pokemon = (globalScene.getCurrentPhase() as CommandPhase).getPokemon();
-    if (pokemon.battleSummonData.turnCount <= 1) {
+    if (pokemon.tempSummonData.turnCount <= 1) {
       this.setCursor(0);
     } else {
       this.setCursor(this.getCursor());
@@ -140,7 +147,7 @@ export default class FightUiHandler extends UiHandler implements InfoToggle {
 
     if (button === Button.CANCEL || button === Button.ACTION) {
       if (button === Button.ACTION) {
-        if ((globalScene.getCurrentPhase() as CommandPhase).handleCommand(Command.FIGHT, cursor, false)) {
+        if ((globalScene.getCurrentPhase() as CommandPhase).handleCommand(this.fromCommand, cursor, false)) {
           success = true;
         } else {
           ui.playError();
@@ -149,7 +156,7 @@ export default class FightUiHandler extends UiHandler implements InfoToggle {
         // Cannot back out of fight menu if skipToFightInput is enabled
         const { battleType, mysteryEncounter } = globalScene.currentBattle;
         if (battleType !== BattleType.MYSTERY_ENCOUNTER || !mysteryEncounter?.skipToFightInput) {
-          ui.setMode(Mode.COMMAND, this.fieldIndex);
+          ui.setMode(UiMode.COMMAND, this.fieldIndex);
           success = true;
         }
       }
@@ -191,10 +198,10 @@ export default class FightUiHandler extends UiHandler implements InfoToggle {
       this.cursorObj?.setVisible(false);
     }
     globalScene.tweens.add({
-      targets: [ this.movesContainer, this.cursorObj ],
-      duration: Utils.fixedInt(125),
+      targets: [this.movesContainer, this.cursorObj],
+      duration: fixedInt(125),
       ease: "Sine.easeInOut",
-      alpha: visible ? 0 : 1
+      alpha: visible ? 0 : 1,
     });
     if (!visible) {
       this.movesContainer.setVisible(true);
@@ -224,7 +231,9 @@ export default class FightUiHandler extends UiHandler implements InfoToggle {
     }
 
     if (!this.cursorObj) {
-      this.cursorObj = globalScene.add.image(0, 0, "cursor");
+      const isTera = this.fromCommand === Command.TERA;
+      this.cursorObj = globalScene.add.image(0, 0, isTera ? "cursor_tera" : "cursor");
+      this.cursorObj.setScale(isTera ? 0.7 : 1);
       ui.add(this.cursorObj);
     }
 
@@ -234,10 +243,10 @@ export default class FightUiHandler extends UiHandler implements InfoToggle {
     const hasMove = cursor < moveset.length;
 
     if (hasMove) {
-      const pokemonMove = moveset[cursor]!; // TODO: is the bang correct?
+      const pokemonMove = moveset[cursor];
       const moveType = pokemon.getMoveType(pokemonMove.getMove());
-      const textureKey = Utils.getLocalizedSpriteKey("types");
-      this.typeIcon.setTexture(textureKey, Type[moveType].toLowerCase()).setScale(0.8);
+      const textureKey = getLocalizedSpriteKey("types");
+      this.typeIcon.setTexture(textureKey, PokemonType[moveType].toLowerCase()).setScale(0.8);
 
       const moveCategory = pokemonMove.getMove().category;
       this.moveCategoryIcon.setTexture("categories", MoveCategory[moveCategory].toLowerCase()).setScale(1.0);
@@ -246,8 +255,8 @@ export default class FightUiHandler extends UiHandler implements InfoToggle {
       const maxPP = pokemonMove.getMovePp();
       const pp = maxPP - pokemonMove.ppUsed;
 
-      const ppLeftStr = Utils.padInt(pp, 2, "  ");
-      const ppMaxStr = Utils.padInt(maxPP, 2, "  ");
+      const ppLeftStr = padInt(pp, 2, "  ");
+      const ppMaxStr = padInt(maxPP, 2, "  ");
       this.ppText.setText(`${ppLeftStr}/${ppMaxStr}`);
       this.powerText.setText(`${power >= 0 ? power : "---"}`);
       this.accuracyText.setText(`${accuracy >= 0 ? accuracy : "---"}`);
@@ -269,7 +278,7 @@ export default class FightUiHandler extends UiHandler implements InfoToggle {
       this.ppText.setShadowColor(this.getTextColor(ppColorStyle, true));
       this.moveInfoOverlay.show(pokemonMove.getMove());
 
-      pokemon.getOpponents().forEach((opponent) => {
+      pokemon.getOpponents().forEach(opponent => {
         opponent.updateEffectiveness(this.getEffectivenessText(pokemon, opponent, pokemonMove));
       });
     }
@@ -293,7 +302,14 @@ export default class FightUiHandler extends UiHandler implements InfoToggle {
    * Returns undefined if it's a status move
    */
   private getEffectivenessText(pokemon: Pokemon, opponent: Pokemon, pokemonMove: PokemonMove): string | undefined {
-    const effectiveness = opponent.getMoveEffectiveness(pokemon, pokemonMove.getMove(), !opponent.battleData?.abilityRevealed);
+    const effectiveness = opponent.getMoveEffectiveness(
+      pokemon,
+      pokemonMove.getMove(),
+      !opponent.waveData.abilityRevealed,
+      undefined,
+      undefined,
+      true,
+    );
     if (effectiveness === undefined) {
       return undefined;
     }
@@ -336,9 +352,18 @@ export default class FightUiHandler extends UiHandler implements InfoToggle {
     }
 
     const moveColors = opponents
-      .map((opponent) => opponent.getMoveEffectiveness(pokemon, pokemonMove.getMove(), !opponent.battleData.abilityRevealed))
+      .map(opponent =>
+        opponent.getMoveEffectiveness(
+          pokemon,
+          pokemonMove.getMove(),
+          !opponent.waveData.abilityRevealed,
+          undefined,
+          undefined,
+          true,
+        ),
+      )
       .sort((a, b) => b - a)
-      .map((effectiveness) => getTypeDamageMultiplierColor(effectiveness ?? 0, "offense"));
+      .map(effectiveness => getTypeDamageMultiplierColor(effectiveness ?? 0, "offense"));
 
     return moveColors[0];
   }
@@ -365,7 +390,7 @@ export default class FightUiHandler extends UiHandler implements InfoToggle {
     this.movesContainer.removeAll(true);
 
     const opponents = (globalScene.getCurrentPhase() as CommandPhase).getPokemon().getOpponents();
-    opponents.forEach((opponent) => {
+    opponents.forEach(opponent => {
       opponent.updateEffectiveness(undefined);
     });
   }
diff --git a/src/ui/filter-bar.ts b/src/ui/filter-bar.ts
index 1eba81247d4..2aade130ed1 100644
--- a/src/ui/filter-bar.ts
+++ b/src/ui/filter-bar.ts
@@ -13,24 +13,32 @@ export enum DropDownColumn {
   CAUGHT,
   UNLOCKS,
   MISC,
-  SORT
+  SORT,
 }
 
 export class FilterBar extends Phaser.GameObjects.Container {
   private window: Phaser.GameObjects.NineSlice;
-  private labels:  Phaser.GameObjects.Text[] = [];
+  private labels: Phaser.GameObjects.Text[] = [];
   private dropDowns: DropDown[] = [];
   private columns: DropDownColumn[] = [];
   public cursorObj: Phaser.GameObjects.Image;
-  public numFilters: number = 0;
-  public openDropDown: boolean = false;
-  private lastCursor: number = -1;
+  public numFilters = 0;
+  public openDropDown = false;
+  private lastCursor = -1;
   private uiTheme: UiTheme;
   private leftPaddingX: number;
   private rightPaddingX: number;
   private cursorOffset: number;
 
-  constructor(x: number, y: number, width: number, height: number, leftPaddingX: number = 6, rightPaddingX: number = 6, cursorOffset: number = 8) {
+  constructor(
+    x: number,
+    y: number,
+    width: number,
+    height: number,
+    leftPaddingX = 6,
+    rightPaddingX = 6,
+    cursorOffset = 8,
+  ) {
     super(globalScene, x, y);
 
     this.width = width;
@@ -82,10 +90,19 @@ export class FilterBar extends Phaser.GameObjects.Container {
    * @param col the DropDownColumn used to register the filter to retrieve
    * @returns the associated DropDown if it exists, undefined otherwise
    */
-  getFilter(col: DropDownColumn) : DropDown {
+  getFilter(col: DropDownColumn): DropDown {
     return this.dropDowns[this.columns.indexOf(col)];
   }
 
+  /**
+   * Get the DropDownColumn associated to a given index
+   * @param index the index of the column to retrieve
+   * @returns the associated DropDownColumn if it exists, undefined otherwise
+   */
+  public getColumn(index: number): DropDownColumn {
+    return this.columns[index];
+  }
+
   /**
    * Highlight the labels of the FilterBar if the filters are different from their default values
    */
@@ -103,7 +120,6 @@ export class FilterBar extends Phaser.GameObjects.Container {
    * Position the filter dropdowns evenly across the width of the container
    */
   private calcFilterPositions(): void {
-
     let totalWidth = this.leftPaddingX + this.rightPaddingX + this.cursorOffset;
     this.labels.forEach(label => {
       totalWidth += label.displayWidth + this.cursorOffset;
@@ -129,7 +145,7 @@ export class FilterBar extends Phaser.GameObjects.Container {
     for (let i = 0; i < this.dropDowns.length; i++) {
       if (this.dropDowns[i].dropDownType === DropDownType.HYBRID) {
         this.dropDowns[i].autoSize();
-        this.dropDowns[i].x = - this.dropDowns[i].getWidth();
+        this.dropDowns[i].x = -this.dropDowns[i].getWidth();
         this.dropDowns[i].y = 0;
       }
     }
@@ -162,19 +178,19 @@ export class FilterBar extends Phaser.GameObjects.Container {
   }
 
   incDropDownCursor(): boolean {
-    if (this.dropDowns[this.lastCursor].cursor === this.dropDowns[this.lastCursor].options.length - 1) {// if at the bottom of the list, wrap around
+    if (this.dropDowns[this.lastCursor].cursor === this.dropDowns[this.lastCursor].options.length - 1) {
+      // if at the bottom of the list, wrap around
       return this.dropDowns[this.lastCursor].setCursor(0);
-    } else {
-      return this.dropDowns[this.lastCursor].setCursor(this.dropDowns[this.lastCursor].cursor + 1);
     }
+    return this.dropDowns[this.lastCursor].setCursor(this.dropDowns[this.lastCursor].cursor + 1);
   }
 
   decDropDownCursor(): boolean {
-    if (this.dropDowns[this.lastCursor].cursor === 0) {// if at the top of the list, wrap around
+    if (this.dropDowns[this.lastCursor].cursor === 0) {
+      // if at the top of the list, wrap around
       return this.dropDowns[this.lastCursor].setCursor(this.dropDowns[this.lastCursor].options.length - 1);
-    } else {
-      return this.dropDowns[this.lastCursor].setCursor(this.dropDowns[this.lastCursor].cursor - 1);
     }
+    return this.dropDowns[this.lastCursor].setCursor(this.dropDowns[this.lastCursor].cursor - 1);
   }
 
   toggleOptionState(): void {
@@ -185,6 +201,11 @@ export class FilterBar extends Phaser.GameObjects.Container {
     return this.getFilter(col).getVals();
   }
 
+  public resetSelection(col: DropDownColumn): void {
+    this.dropDowns[col].resetToDefault();
+    this.updateFilterLabels();
+  }
+
   setValsToDefault(): void {
     for (const dropDown of this.dropDowns) {
       dropDown.resetToDefault();
@@ -197,7 +218,6 @@ export class FilterBar extends Phaser.GameObjects.Container {
    * @returns the index of the closest filter
    */
   getNearestFilter(container: StarterContainer): number {
-
     const midx = container.x + container.icon.displayWidth / 2;
     let nearest = 0;
     let nearestDist = 1000;
@@ -211,5 +231,4 @@ export class FilterBar extends Phaser.GameObjects.Container {
 
     return nearest;
   }
-
 }
diff --git a/src/ui/filter-text.ts b/src/ui/filter-text.ts
index f961fc9b385..7e27a806478 100644
--- a/src/ui/filter-text.ts
+++ b/src/ui/filter-text.ts
@@ -5,10 +5,10 @@ import { addWindow, WindowVariant } from "./ui-theme";
 import i18next from "i18next";
 import type AwaitableUiHandler from "./awaitable-ui-handler";
 import type UI from "./ui";
-import { Mode } from "./ui";
+import { UiMode } from "#enums/ui-mode";
 import { globalScene } from "#app/global-scene";
 
-export enum FilterTextRow{
+export enum FilterTextRow {
   NAME,
   MOVE_1,
   MOVE_2,
@@ -18,13 +18,12 @@ export enum FilterTextRow{
 
 export class FilterText extends Phaser.GameObjects.Container {
   private window: Phaser.GameObjects.NineSlice;
-  private labels:  Phaser.GameObjects.Text[] = [];
-  private selections:  Phaser.GameObjects.Text[] = [];
-  private selectionStrings: string[] = [];
+  private labels: Phaser.GameObjects.Text[] = [];
+  private selections: Phaser.GameObjects.Text[] = [];
   private rows: FilterTextRow[] = [];
   public cursorObj: Phaser.GameObjects.Image;
-  public numFilters: number = 0;
-  private lastCursor: number = -1;
+  public numFilters = 0;
+  private lastCursor = -1;
   private uiTheme: UiTheme;
 
   private menuMessageBoxContainer: Phaser.GameObjects.Container;
@@ -35,9 +34,9 @@ export class FilterText extends Phaser.GameObjects.Container {
 
   private onChange: () => void;
 
-  public defaultText: string = "---";
+  public defaultText = "---";
 
-  constructor(x: number, y: number, width: number, height: number, onChange: () => void,) {
+  constructor(x: number, y: number, width: number, height: number, onChange: () => void) {
     super(globalScene, x, y);
 
     this.onChange = onChange;
@@ -59,7 +58,17 @@ export class FilterText extends Phaser.GameObjects.Container {
     this.menuMessageBoxContainer.setVisible(false);
 
     // Full-width window used for testing dialog messages in debug mode
-    this.dialogueMessageBox = addWindow(-this.textPadding, 0, globalScene.game.canvas.width / 6 + this.textPadding * 2, 49, false, false, 0, 0, WindowVariant.THIN);
+    this.dialogueMessageBox = addWindow(
+      -this.textPadding,
+      0,
+      globalScene.game.canvas.width / 6 + this.textPadding * 2,
+      49,
+      false,
+      false,
+      0,
+      0,
+      WindowVariant.THIN,
+    );
     this.dialogueMessageBox.setOrigin(0, 0);
     this.menuMessageBoxContainer.add(this.dialogueMessageBox);
 
@@ -69,7 +78,6 @@ export class FilterText extends Phaser.GameObjects.Container {
     this.menuMessageBoxContainer.add(menuMessageText);
 
     this.message = menuMessageText;
-
   }
 
   /**
@@ -80,7 +88,6 @@ export class FilterText extends Phaser.GameObjects.Container {
    * @returns true if successful, false if the provided column was already in use for another filter
    */
   addFilter(row: FilterTextRow, title: string): boolean {
-
     const paddingX = 6;
     const cursorOffset = 8;
     const extraSpaceX = 40;
@@ -95,12 +102,15 @@ export class FilterText extends Phaser.GameObjects.Container {
     this.labels.push(filterTypesLabel);
     this.add(filterTypesLabel);
 
-    const filterTypesSelection = addTextObject(paddingX + cursorOffset + extraSpaceX, 3, this.defaultText, TextStyle.TOOLTIP_CONTENT);
+    const filterTypesSelection = addTextObject(
+      paddingX + cursorOffset + extraSpaceX,
+      3,
+      this.defaultText,
+      TextStyle.TOOLTIP_CONTENT,
+    );
     this.selections.push(filterTypesSelection);
     this.add(filterTypesSelection);
 
-    this.selectionStrings.push("");
-
     this.calcFilterPositions();
     this.numFilters++;
 
@@ -109,7 +119,6 @@ export class FilterText extends Phaser.GameObjects.Container {
 
   resetSelection(index: number): void {
     this.selections[index].setText(this.defaultText);
-    this.selectionStrings[index] = "";
     this.onChange();
   }
 
@@ -120,7 +129,6 @@ export class FilterText extends Phaser.GameObjects.Container {
   }
 
   startSearch(index: number, ui: UI): void {
-
     ui.playSelect();
     const prefilledText = "";
     const buttonAction: any = {};
@@ -133,19 +141,18 @@ export class FilterText extends Phaser.GameObjects.Container {
         const handler = ui.getHandler() as AwaitableUiHandler;
         handler.tutorialActive = true;
         // Switch to the dialog test window
-        this.selections[index].setText(String(i18next.t(dialogueName)));
+        this.selections[index].setText(dialogueName === "" ? this.defaultText : String(i18next.t(dialogueName)));
         ui.revertMode();
         this.onChange();
       },
       () => {
         ui.revertMode();
         this.onChange;
-      }
+      },
     ];
-    ui.setOverlayMode(Mode.POKEDEX_SCAN, buttonAction, prefilledText, index);
+    ui.setOverlayMode(UiMode.POKEDEX_SCAN, buttonAction, prefilledText, index);
   }
 
-
   setCursor(cursor: number): void {
     const cursorOffset = 8;
 
@@ -193,13 +200,23 @@ export class FilterText extends Phaser.GameObjects.Container {
     return this.selections[row].getWrappedText()[0];
   }
 
+  /**
+   * Forcibly set the selection text for a specific filter row and then call the `onChange` function
+   *
+   * @param row - The filter row to set the text for
+   * @param value - The text to set for the filter row
+   */
+  setValue(row: FilterTextRow, value: string) {
+    this.selections[row].setText(value);
+    this.onChange();
+  }
+
   /**
    * Find the nearest filter to the provided container on the y-axis
    * @param container the StarterContainer to compare position against
    * @returns the index of the closest filter
    */
   getNearestFilter(container: StarterContainer): number {
-
     const midy = container.y + container.icon.displayHeight / 2;
     let nearest = 0;
     let nearestDist = 1000;
@@ -213,6 +230,4 @@ export class FilterText extends Phaser.GameObjects.Container {
 
     return nearest;
   }
-
-
 }
diff --git a/src/ui/form-modal-ui-handler.ts b/src/ui/form-modal-ui-handler.ts
index 86a1cc2238b..8c30b4e0bc4 100644
--- a/src/ui/form-modal-ui-handler.ts
+++ b/src/ui/form-modal-ui-handler.ts
@@ -1,10 +1,10 @@
 import type { ModalConfig } from "./modal-ui-handler";
 import { ModalUiHandler } from "./modal-ui-handler";
-import type { Mode } from "./ui";
+import type { UiMode } from "#enums/ui-mode";
 import { TextStyle, addTextInputObject, addTextObject } from "./text";
 import { WindowVariant, addWindow } from "./ui-theme";
 import type InputText from "phaser3-rex-plugins/plugins/inputtext";
-import * as Utils from "../utils";
+import { fixedInt } from "#app/utils/common";
 import { Button } from "#enums/buttons";
 import { globalScene } from "#app/global-scene";
 
@@ -21,7 +21,7 @@ export abstract class FormModalUiHandler extends ModalUiHandler {
   protected tween: Phaser.Tweens.Tween;
   protected formLabels: Phaser.GameObjects.Text[];
 
-  constructor(mode: Mode | null = null) {
+  constructor(mode: UiMode | null = null) {
     super(mode);
 
     this.editing = false;
@@ -38,7 +38,13 @@ export abstract class FormModalUiHandler extends ModalUiHandler {
   abstract getInputFieldConfigs(): InputFieldConfig[];
 
   getHeight(config?: ModalConfig): number {
-    return 20 * this.getInputFieldConfigs().length + (this.getModalTitle() ? 26 : 0) + ((config as FormModalConfig)?.errorMessage ? 12 : 0) + this.getButtonTopMargin() + 28;
+    return (
+      20 * this.getInputFieldConfigs().length +
+      (this.getModalTitle() ? 26 : 0) +
+      ((config as FormModalConfig)?.errorMessage ? 12 : 0) +
+      this.getButtonTopMargin() +
+      28
+    );
   }
 
   getReadableErrorMessage(error: string): string {
@@ -60,7 +66,12 @@ export abstract class FormModalUiHandler extends ModalUiHandler {
       this.updateFields(config, hasTitle);
     }
 
-    this.errorMessage = addTextObject(10, (hasTitle ? 31 : 5) + 20 * (config.length - 1) + 16 + this.getButtonTopMargin(), "", TextStyle.TOOLTIP_CONTENT);
+    this.errorMessage = addTextObject(
+      10,
+      (hasTitle ? 31 : 5) + 20 * (config.length - 1) + 16 + this.getButtonTopMargin(),
+      "",
+      TextStyle.TOOLTIP_CONTENT,
+    );
     this.errorMessage.setColor(this.getTextColor(TextStyle.SUMMARY_PINK));
     this.errorMessage.setShadowColor(this.getTextColor(TextStyle.SUMMARY_PINK, true));
     this.errorMessage.setVisible(false);
@@ -85,7 +96,11 @@ export abstract class FormModalUiHandler extends ModalUiHandler {
 
       const isPassword = config?.isPassword;
       const isReadOnly = config?.isReadOnly;
-      const input = addTextInputObject(4, -2, 440, 116, TextStyle.TOOLTIP_CONTENT, { type: isPassword ? "password" : "text", maxLength: isPassword ? 64 : 20, readOnly: isReadOnly });
+      const input = addTextInputObject(4, -2, 440, 116, TextStyle.TOOLTIP_CONTENT, {
+        type: isPassword ? "password" : "text",
+        maxLength: isPassword ? 64 : 20,
+        readOnly: isReadOnly,
+      });
       input.setOrigin(0, 0);
 
       inputContainer.add(inputBg);
@@ -104,14 +119,12 @@ export abstract class FormModalUiHandler extends ModalUiHandler {
 
       const config = args[0] as FormModalConfig;
 
-      this.submitAction = config.buttonActions.length
-        ? config.buttonActions[0]
-        : null;
+      this.submitAction = config.buttonActions.length ? config.buttonActions[0] : null;
 
       if (this.buttonBgs.length) {
         this.buttonBgs[0].off("pointerdown");
         this.buttonBgs[0].on("pointerdown", () => {
-          if (this.submitAction) {
+          if (this.submitAction && globalScene.tweens.getTweensOf(this.modalContainer).length === 0) {
             this.submitAction();
           }
         });
@@ -122,10 +135,10 @@ export abstract class FormModalUiHandler extends ModalUiHandler {
 
       this.tween = globalScene.tweens.add({
         targets: this.modalContainer,
-        duration: Utils.fixedInt(1000),
+        duration: fixedInt(1000),
         ease: "Sine.easeInOut",
         y: "-=24",
-        alpha: 1
+        alpha: 1,
       });
 
       return true;
@@ -171,7 +184,7 @@ export abstract class FormModalUiHandler extends ModalUiHandler {
 }
 
 export interface InputFieldConfig {
-  label: string,
-  isPassword?: boolean,
-  isReadOnly?: boolean
+  label: string;
+  isPassword?: boolean;
+  isReadOnly?: boolean;
 }
diff --git a/src/ui/game-stats-ui-handler.ts b/src/ui/game-stats-ui-handler.ts
index 09fd178e101..dc184a34866 100644
--- a/src/ui/game-stats-ui-handler.ts
+++ b/src/ui/game-stats-ui-handler.ts
@@ -1,9 +1,9 @@
 import Phaser from "phaser";
 import { TextStyle, addTextObject } from "#app/ui/text";
-import type { Mode } from "#app/ui/ui";
+import type { UiMode } from "#enums/ui-mode";
 import UiHandler from "#app/ui/ui-handler";
 import { addWindow } from "#app/ui/ui-theme";
-import * as Utils from "#app/utils";
+import { getPlayTimeString, formatFancyLargeNumber, toReadableString } from "#app/utils/common";
 import type { GameData } from "#app/system/game-data";
 import { DexAttr } from "#app/system/game-data";
 import { speciesStarterCosts } from "#app/data/balance/starters";
@@ -19,13 +19,13 @@ interface DisplayStat {
 }
 
 interface DisplayStats {
-  [key: string]: DisplayStat | string
+  [key: string]: DisplayStat | string;
 }
 
 const displayStats: DisplayStats = {
   playTime: {
     label_key: "playTime",
-    sourceFunc: gameData => Utils.getPlayTimeString(gameData.gameStats.playTime)
+    sourceFunc: gameData => getPlayTimeString(gameData.gameStats.playTime),
   },
   battles: {
     label_key: "totalBattles",
@@ -36,34 +36,34 @@ const displayStats: DisplayStats = {
     sourceFunc: gameData => {
       const starterCount = gameData.getStarterCount(d => !!d.caughtAttr);
       return `${starterCount} (${Math.floor((starterCount / Object.keys(speciesStarterCosts).length) * 1000) / 10}%)`;
-    }
+    },
   },
   shinyStartersUnlocked: {
     label_key: "shinyStarters",
     sourceFunc: gameData => {
       const starterCount = gameData.getStarterCount(d => !!(d.caughtAttr & DexAttr.SHINY));
       return `${starterCount} (${Math.floor((starterCount / Object.keys(speciesStarterCosts).length) * 1000) / 10}%)`;
-    }
+    },
   },
   dexSeen: {
     label_key: "speciesSeen",
     sourceFunc: gameData => {
       const seenCount = gameData.getSpeciesCount(d => !!d.seenAttr);
       return `${seenCount} (${Math.floor((seenCount / Object.keys(gameData.dexData).length) * 1000) / 10}%)`;
-    }
+    },
   },
   dexCaught: {
     label_key: "speciesCaught",
     sourceFunc: gameData => {
       const caughtCount = gameData.getSpeciesCount(d => !!d.caughtAttr);
       return `${caughtCount} (${Math.floor((caughtCount / Object.keys(gameData.dexData).length) * 1000) / 10}%)`;
-    }
+    },
   },
   ribbonsOwned: {
     label_key: "ribbonsOwned",
     sourceFunc: gameData => gameData.gameStats.ribbonsOwned.toString(),
   },
-  classicSessionsPlayed:{
+  classicSessionsPlayed: {
     label_key: "classicRuns",
     sourceFunc: gameData => gameData.gameStats.classicSessionsPlayed.toString(),
   },
@@ -82,16 +82,16 @@ const displayStats: DisplayStats = {
   endlessSessionsPlayed: {
     label_key: "endlessRuns",
     sourceFunc: gameData => gameData.gameStats.endlessSessionsPlayed.toString(),
-    hidden: true
+    hidden: true,
   },
   highestEndlessWave: {
     label_key: "highestWaveEndless",
     sourceFunc: gameData => gameData.gameStats.highestEndlessWave.toString(),
-    hidden: true
+    hidden: true,
   },
   highestMoney: {
     label_key: "highestMoney",
-    sourceFunc: gameData => Utils.formatFancyLargeNumber(gameData.gameStats.highestMoney),
+    sourceFunc: gameData => formatFancyLargeNumber(gameData.gameStats.highestMoney),
   },
   highestDamage: {
     label_key: "highestDamage",
@@ -120,67 +120,67 @@ const displayStats: DisplayStats = {
   subLegendaryPokemonSeen: {
     label_key: "subLegendsSeen",
     sourceFunc: gameData => gameData.gameStats.subLegendaryPokemonSeen.toString(),
-    hidden: true
+    hidden: true,
   },
   subLegendaryPokemonCaught: {
     label_key: "subLegendsCaught",
     sourceFunc: gameData => gameData.gameStats.subLegendaryPokemonCaught.toString(),
-    hidden: true
+    hidden: true,
   },
   subLegendaryPokemonHatched: {
     label_key: "subLegendsHatched",
     sourceFunc: gameData => gameData.gameStats.subLegendaryPokemonHatched.toString(),
-    hidden: true
+    hidden: true,
   },
   legendaryPokemonSeen: {
     label_key: "legendsSeen",
     sourceFunc: gameData => gameData.gameStats.legendaryPokemonSeen.toString(),
-    hidden: true
+    hidden: true,
   },
   legendaryPokemonCaught: {
     label_key: "legendsCaught",
     sourceFunc: gameData => gameData.gameStats.legendaryPokemonCaught.toString(),
-    hidden: true
+    hidden: true,
   },
   legendaryPokemonHatched: {
     label_key: "legendsHatched",
     sourceFunc: gameData => gameData.gameStats.legendaryPokemonHatched.toString(),
-    hidden: true
+    hidden: true,
   },
   mythicalPokemonSeen: {
     label_key: "mythicalsSeen",
     sourceFunc: gameData => gameData.gameStats.mythicalPokemonSeen.toString(),
-    hidden: true
+    hidden: true,
   },
   mythicalPokemonCaught: {
     label_key: "mythicalsCaught",
     sourceFunc: gameData => gameData.gameStats.mythicalPokemonCaught.toString(),
-    hidden: true
+    hidden: true,
   },
   mythicalPokemonHatched: {
     label_key: "mythicalsHatched",
     sourceFunc: gameData => gameData.gameStats.mythicalPokemonHatched.toString(),
-    hidden: true
+    hidden: true,
   },
   shinyPokemonSeen: {
     label_key: "shiniesSeen",
     sourceFunc: gameData => gameData.gameStats.shinyPokemonSeen.toString(),
-    hidden: true
+    hidden: true,
   },
   shinyPokemonCaught: {
     label_key: "shiniesCaught",
     sourceFunc: gameData => gameData.gameStats.shinyPokemonCaught.toString(),
-    hidden: true
+    hidden: true,
   },
   shinyPokemonHatched: {
     label_key: "shiniesHatched",
     sourceFunc: gameData => gameData.gameStats.shinyPokemonHatched.toString(),
-    hidden: true
+    hidden: true,
   },
   pokemonFused: {
     label_key: "pokemonFused",
     sourceFunc: gameData => gameData.gameStats.pokemonFused.toString(),
-    hidden: true
+    hidden: true,
   },
   trainersDefeated: {
     label_key: "trainersDefeated",
@@ -189,27 +189,27 @@ const displayStats: DisplayStats = {
   eggsPulled: {
     label_key: "eggsPulled",
     sourceFunc: gameData => gameData.gameStats.eggsPulled.toString(),
-    hidden: true
+    hidden: true,
   },
   rareEggsPulled: {
     label_key: "rareEggsPulled",
     sourceFunc: gameData => gameData.gameStats.rareEggsPulled.toString(),
-    hidden: true
+    hidden: true,
   },
   epicEggsPulled: {
     label_key: "epicEggsPulled",
     sourceFunc: gameData => gameData.gameStats.epicEggsPulled.toString(),
-    hidden: true
+    hidden: true,
   },
   legendaryEggsPulled: {
     label_key: "legendaryEggsPulled",
     sourceFunc: gameData => gameData.gameStats.legendaryEggsPulled.toString(),
-    hidden: true
+    hidden: true,
   },
   manaphyEggsPulled: {
     label_key: "manaphyEggsPulled",
     sourceFunc: gameData => gameData.gameStats.manaphyEggsPulled.toString(),
-    hidden: true
+    hidden: true,
   },
 };
 
@@ -223,7 +223,7 @@ export default class GameStatsUiHandler extends UiHandler {
   private arrowUp: Phaser.GameObjects.Sprite;
   private arrowDown: Phaser.GameObjects.Sprite;
 
-  constructor(mode: Mode | null = null) {
+  constructor(mode: UiMode | null = null) {
     super(mode);
 
     this.statLabels = [];
@@ -235,35 +235,50 @@ export default class GameStatsUiHandler extends UiHandler {
 
     this.gameStatsContainer = globalScene.add.container(1, -(globalScene.game.canvas.height / 6) + 1);
 
-    this.gameStatsContainer.setInteractive(new Phaser.Geom.Rectangle(0, 0, globalScene.game.canvas.width / 6, globalScene.game.canvas.height / 6), Phaser.Geom.Rectangle.Contains);
+    this.gameStatsContainer.setInteractive(
+      new Phaser.Geom.Rectangle(0, 0, globalScene.game.canvas.width / 6, globalScene.game.canvas.height / 6),
+      Phaser.Geom.Rectangle.Contains,
+    );
 
-    const headerBg = addWindow(0, 0, (globalScene.game.canvas.width / 6) - 2, 24);
+    const headerBg = addWindow(0, 0, globalScene.game.canvas.width / 6 - 2, 24);
     headerBg.setOrigin(0, 0);
 
     const headerText = addTextObject(0, 0, i18next.t("gameStatsUiHandler:stats"), TextStyle.SETTINGS_LABEL);
     headerText.setOrigin(0, 0);
     headerText.setPositionRelative(headerBg, 8, 4);
 
-    const statsBgWidth = ((globalScene.game.canvas.width / 6) - 2) / 2;
-    const [ statsBgLeft, statsBgRight ] = new Array(2).fill(null).map((_, i) => {
+    const statsBgWidth = (globalScene.game.canvas.width / 6 - 2) / 2;
+    const [statsBgLeft, statsBgRight] = new Array(2).fill(null).map((_, i) => {
       const width = statsBgWidth + 2;
-      const height = Math.floor((globalScene.game.canvas.height / 6) - headerBg.height - 2);
-      const statsBg = addWindow((statsBgWidth - 2) * i, headerBg.height, width, height, false, false, i > 0 ? -3 : 0, 1);
+      const height = Math.floor(globalScene.game.canvas.height / 6 - headerBg.height - 2);
+      const statsBg = addWindow(
+        (statsBgWidth - 2) * i,
+        headerBg.height,
+        width,
+        height,
+        false,
+        false,
+        i > 0 ? -3 : 0,
+        1,
+      );
       statsBg.setOrigin(0, 0);
       return statsBg;
     });
 
     this.statsContainer = globalScene.add.container(0, 0);
 
-
     new Array(18).fill(null).map((_, s) => {
-
-      const statLabel = addTextObject(8 + (s % 2 === 1 ? statsBgWidth : 0), 28 + Math.floor(s / 2) * 16, "", TextStyle.STATS_LABEL);
+      const statLabel = addTextObject(
+        8 + (s % 2 === 1 ? statsBgWidth : 0),
+        28 + Math.floor(s / 2) * 16,
+        "",
+        TextStyle.STATS_LABEL,
+      );
       statLabel.setOrigin(0, 0);
       this.statsContainer.add(statLabel);
       this.statLabels.push(statLabel);
 
-      const statValue = addTextObject((statsBgWidth * ((s % 2) + 1)) - 8, statLabel.y, "", TextStyle.STATS_VALUE);
+      const statValue = addTextObject(statsBgWidth * ((s % 2) + 1) - 8, statLabel.y, "", TextStyle.STATS_VALUE);
       statValue.setOrigin(1, 0);
       this.statsContainer.add(statValue);
       this.statValues.push(statValue);
@@ -277,7 +292,11 @@ export default class GameStatsUiHandler extends UiHandler {
 
     // arrows to show that we can scroll through the stats
     const isLegacyTheme = globalScene.uiTheme === UiTheme.LEGACY;
-    this.arrowDown = globalScene.add.sprite(statsBgWidth, globalScene.game.canvas.height / 6 - (isLegacyTheme ? 9 : 5), "prompt");
+    this.arrowDown = globalScene.add.sprite(
+      statsBgWidth,
+      globalScene.game.canvas.height / 6 - (isLegacyTheme ? 9 : 5),
+      "prompt",
+    );
     this.gameStatsContainer.add(this.arrowDown);
     this.arrowUp = globalScene.add.sprite(statsBgWidth, headerBg.height + (isLegacyTheme ? 7 : 3), "prompt");
     this.arrowUp.flipY = true;
@@ -320,7 +339,11 @@ export default class GameStatsUiHandler extends UiHandler {
     statKeys.forEach((key, s) => {
       const stat = displayStats[key] as DisplayStat;
       const value = stat.sourceFunc!(globalScene.gameData); // TODO: is this bang correct?
-      this.statLabels[s].setText(!stat.hidden || isNaN(parseInt(value)) || parseInt(value) ? i18next.t(`gameStatsUiHandler:${stat.label_key}`) : "???");
+      this.statLabels[s].setText(
+        !stat.hidden || Number.isNaN(Number.parseInt(value)) || Number.parseInt(value)
+          ? i18next.t(`gameStatsUiHandler:${stat.label_key}`)
+          : "???",
+      );
       this.statValues[s].setText(value);
     });
     if (statKeys.length < 18) {
@@ -403,16 +426,18 @@ export function initStatsKeys() {
       displayStats[key] = {
         label_key: label,
         sourceFunc: gameData => gameData.gameStats[key].toString(),
-        hidden: hidden
+        hidden: hidden,
       };
     } else if (displayStats[key] === null) {
       displayStats[key] = {
-        sourceFunc: gameData => gameData.gameStats[key].toString()
+        sourceFunc: gameData => gameData.gameStats[key].toString(),
       };
     }
     if (!(displayStats[key] as DisplayStat).label_key) {
       const splittableKey = key.replace(/([a-z]{2,})([A-Z]{1}(?:[^A-Z]|$))/g, "$1_$2");
-      (displayStats[key] as DisplayStat).label_key = Utils.toReadableString(`${splittableKey[0].toUpperCase()}${splittableKey.slice(1)}`);
+      (displayStats[key] as DisplayStat).label_key = toReadableString(
+        `${splittableKey[0].toUpperCase()}${splittableKey.slice(1)}`,
+      );
     }
   }
 }
diff --git a/src/ui/hatched-pokemon-container.ts b/src/ui/hatched-pokemon-container.ts
index f006002617a..9d1c13e19d5 100644
--- a/src/ui/hatched-pokemon-container.ts
+++ b/src/ui/hatched-pokemon-container.ts
@@ -1,6 +1,6 @@
 import type { EggHatchData } from "#app/data/egg-hatch-data";
 import { Gender } from "#app/data/gender";
-import { getVariantTint } from "#app/data/variant";
+import { getVariantTint } from "#app/sprites/variant";
 import { DexAttr } from "#app/system/game-data";
 import { globalScene } from "#app/global-scene";
 import type PokemonSpecies from "#app/data/pokemon-species";
@@ -91,8 +91,8 @@ export class HatchedPokemonContainer extends Phaser.GameObjects.Container {
     const caughtAttr = dexEntry.caughtAttr;
     const newShiny = BigInt(1 << (displayPokemon.shiny ? 1 : 0));
     const newVariant = BigInt(1 << (displayPokemon.variant + 4));
-    const newShinyOrVariant = ((newShiny & caughtAttr) === BigInt(0)) || ((newVariant & caughtAttr) === BigInt(0));
-    const newForm = (BigInt(1 << displayPokemon.formIndex) * DexAttr.DEFAULT_FORM & caughtAttr) === BigInt(0);
+    const newShinyOrVariant = (newShiny & caughtAttr) === BigInt(0) || (newVariant & caughtAttr) === BigInt(0);
+    const newForm = ((BigInt(1 << displayPokemon.formIndex) * DexAttr.DEFAULT_FORM) & caughtAttr) === BigInt(0);
 
     const female = displayPokemon.gender === Gender.FEMALE;
     const formIndex = displayPokemon.formIndex;
diff --git a/src/ui/loading-modal-ui-handler.ts b/src/ui/loading-modal-ui-handler.ts
index 7ee0949c71e..13dffe5614c 100644
--- a/src/ui/loading-modal-ui-handler.ts
+++ b/src/ui/loading-modal-ui-handler.ts
@@ -1,10 +1,10 @@
 import i18next from "i18next";
 import { ModalUiHandler } from "./modal-ui-handler";
 import { addTextObject, TextStyle } from "./text";
-import type { Mode } from "./ui";
+import type { UiMode } from "#enums/ui-mode";
 
 export default class LoadingModalUiHandler extends ModalUiHandler {
-  constructor(mode: Mode | null = null) {
+  constructor(mode: UiMode | null = null) {
     super(mode);
   }
 
@@ -21,11 +21,11 @@ export default class LoadingModalUiHandler extends ModalUiHandler {
   }
 
   getMargin(): [number, number, number, number] {
-    return [ 0, 0, 48, 0 ];
+    return [0, 0, 48, 0];
   }
 
   getButtonLabels(): string[] {
-    return [ ];
+    return [];
   }
 
   setup(): void {
diff --git a/src/ui/login-form-ui-handler.ts b/src/ui/login-form-ui-handler.ts
index 55909b63e58..714a9b39771 100644
--- a/src/ui/login-form-ui-handler.ts
+++ b/src/ui/login-form-ui-handler.ts
@@ -1,8 +1,8 @@
 import type { InputFieldConfig } from "./form-modal-ui-handler";
 import { FormModalUiHandler } from "./form-modal-ui-handler";
 import type { ModalConfig } from "./modal-ui-handler";
-import * as Utils from "../utils";
-import { Mode } from "./ui";
+import { fixedInt } from "#app/utils/common";
+import { UiMode } from "#enums/ui-mode";
 import i18next from "i18next";
 import { addTextObject, TextStyle } from "./text";
 import { addWindow } from "./ui-theme";
@@ -34,36 +34,23 @@ export default class LoginFormUiHandler extends FormModalUiHandler {
   private infoContainer: Phaser.GameObjects.Container;
   private externalPartyBg: Phaser.GameObjects.NineSlice;
   private externalPartyTitle: Phaser.GameObjects.Text;
-  constructor(mode: Mode | null = null) {
+  constructor(mode: UiMode | null = null) {
     super(mode);
   }
 
   setup(): void {
     super.setup();
+
     this.buildExternalPartyContainer();
-
-    this.infoContainer = globalScene.add.container(0, 0);
-
-    this.usernameInfoImage = this.buildInteractableImage("settings_icon", "username-info-icon", {
-      x: 20,
-      scale: 0.5
-    });
-
-    this.saveDownloadImage = this.buildInteractableImage("saving_icon", "save-download-icon", {
-      x: 0,
-      scale: 0.75
-    });
-
-    this.infoContainer.add(this.usernameInfoImage);
-    this.infoContainer.add(this.saveDownloadImage);
-    this.getUi().add(this.infoContainer);
-    this.infoContainer.setVisible(false);
-    this.infoContainer.disableInteractive();
+    this.buildInfoContainer();
   }
 
   private buildExternalPartyContainer() {
     this.externalPartyContainer = globalScene.add.container(0, 0);
-    this.externalPartyContainer.setInteractive(new Phaser.Geom.Rectangle(0, 0, globalScene.game.canvas.width / 12, globalScene.game.canvas.height / 12), Phaser.Geom.Rectangle.Contains);
+    this.externalPartyContainer.setInteractive(
+      new Phaser.Geom.Rectangle(0, 0, globalScene.game.canvas.width / 12, globalScene.game.canvas.height / 12),
+      Phaser.Geom.Rectangle.Contains,
+    );
     this.externalPartyTitle = addTextObject(0, 4, "", TextStyle.SETTINGS_LABEL);
     this.externalPartyTitle.setOrigin(0.5, 0);
     this.externalPartyBg = addWindow(0, 0, 0, 0);
@@ -81,6 +68,26 @@ export default class LoginFormUiHandler extends FormModalUiHandler {
     this.externalPartyContainer.setVisible(false);
   }
 
+  private buildInfoContainer() {
+    this.infoContainer = globalScene.add.container(0, 0);
+
+    this.usernameInfoImage = this.buildInteractableImage("settings_icon", "username-info-icon", {
+      x: 20,
+      scale: 0.5,
+    });
+
+    this.saveDownloadImage = this.buildInteractableImage("saving_icon", "save-download-icon", {
+      x: 0,
+      scale: 0.75,
+    });
+
+    this.infoContainer.add(this.usernameInfoImage);
+    this.infoContainer.add(this.saveDownloadImage);
+    this.getUi().add(this.infoContainer);
+    this.infoContainer.setVisible(false);
+    this.infoContainer.disableInteractive();
+  }
+
   override getModalTitle(_config?: ModalConfig): string {
     let key = "menu:login";
     if (import.meta.env.VITE_SERVER_URL === "https://apibeta.pokerogue.net") {
@@ -94,11 +101,11 @@ export default class LoginFormUiHandler extends FormModalUiHandler {
   }
 
   override getMargin(_config?: ModalConfig): [number, number, number, number] {
-    return [ 0, 0, 48, 0 ];
+    return [0, 0, 48, 0];
   }
 
   override getButtonLabels(_config?: ModalConfig): string[] {
-    return [ i18next.t("menu:login"), i18next.t("menu:register") ];
+    return [i18next.t("menu:login"), i18next.t("menu:register")];
   }
 
   override getReadableErrorMessage(error: string): string {
@@ -127,38 +134,42 @@ export default class LoginFormUiHandler extends FormModalUiHandler {
   override getInputFieldConfigs(): InputFieldConfig[] {
     const inputFieldConfigs: InputFieldConfig[] = [];
     inputFieldConfigs.push({ label: i18next.t("menu:username") });
-    inputFieldConfigs.push({ label: i18next.t("menu:password"), isPassword: true });
+    inputFieldConfigs.push({
+      label: i18next.t("menu:password"),
+      isPassword: true,
+    });
     return inputFieldConfigs;
   }
 
   override show(args: any[]): boolean {
     if (super.show(args)) {
-
       const config = args[0] as ModalConfig;
       this.processExternalProvider(config);
       const originalLoginAction = this.submitAction;
-      this.submitAction = (_) => {
-        // Prevent overlapping overrides on action modification
-        this.submitAction = originalLoginAction;
-        this.sanitizeInputs();
-        globalScene.ui.setMode(Mode.LOADING, { buttonActions: []});
-        const onFail = error => {
-          globalScene.ui.setMode(Mode.LOGIN_FORM, Object.assign(config, { errorMessage: error?.trim() }));
-          globalScene.ui.playError();
-        };
-        if (!this.inputs[0].text) {
-          return onFail(i18next.t("menu:emptyUsername"));
-        }
-
-        const [ usernameInput, passwordInput ] = this.inputs;
-
-        pokerogueApi.account.login({ username: usernameInput.text, password: passwordInput.text }).then(error => {
-          if (!error) {
-            originalLoginAction && originalLoginAction();
-          } else {
-            onFail(error);
+      this.submitAction = _ => {
+        if (globalScene.tweens.getTweensOf(this.modalContainer).length === 0) {
+          // Prevent overlapping overrides on action modification
+          this.submitAction = originalLoginAction;
+          this.sanitizeInputs();
+        globalScene.ui.setMode(UiMode.LOADING, { buttonActions: [] });
+          const onFail = error => {
+          globalScene.ui.setMode(UiMode.LOGIN_FORM, Object.assign(config, { errorMessage: error?.trim() }));
+            globalScene.ui.playError();
+          };
+          if (!this.inputs[0].text) {
+            return onFail(i18next.t("menu:emptyUsername"));
           }
-        });
+
+          const [usernameInput, passwordInput] = this.inputs;
+
+          pokerogueApi.account.login({ username: usernameInput.text, password: passwordInput.text }).then(error => {
+            if (!error && originalLoginAction) {
+              originalLoginAction();
+            } else {
+              onFail(error);
+            }
+          });
+        }
       };
 
       return true;
@@ -173,7 +184,9 @@ export default class LoginFormUiHandler extends FormModalUiHandler {
     this.infoContainer.setVisible(false);
     this.setMouseCursorStyle("default"); //reset cursor
 
-    [ this.discordImage, this.googleImage, this.usernameInfoImage, this.saveDownloadImage ].forEach((img) => img.off("pointerdown"));
+    [this.discordImage, this.googleImage, this.usernameInfoImage, this.saveDownloadImage].forEach(img =>
+      img.off("pointerdown"),
+    );
   }
 
   private processExternalProvider(config: ModalConfig): void {
@@ -208,36 +221,40 @@ export default class LoginFormUiHandler extends FormModalUiHandler {
     });
 
     const onFail = error => {
-      globalScene.ui.setMode(Mode.LOADING, { buttonActions: []});
-      globalScene.ui.setModeForceTransition(Mode.LOGIN_FORM, Object.assign(config, { errorMessage: error?.trim() }));
+      globalScene.ui.setMode(UiMode.LOADING, { buttonActions: [] });
+      globalScene.ui.setModeForceTransition(UiMode.LOGIN_FORM, Object.assign(config, { errorMessage: error?.trim() }));
       globalScene.ui.playError();
     };
 
     this.usernameInfoImage.on("pointerdown", () => {
-      const localStorageKeys = Object.keys(localStorage); // this gets the keys for localStorage
-      const keyToFind = "data_";
-      const dataKeys = localStorageKeys.filter(ls => ls.indexOf(keyToFind) >= 0);
-      if (dataKeys.length > 0 && dataKeys.length <= 2) {
-        const options: OptionSelectItem[] = [];
-        for (let i = 0; i < dataKeys.length; i++) {
-          options.push({
-            label: dataKeys[i].replace(keyToFind, ""),
-            handler: () => {
-              globalScene.ui.revertMode();
-              this.infoContainer.disableInteractive();
-              return true;
-            }
+      if (globalScene.tweens.getTweensOf(this.infoContainer).length === 0) {
+        const localStorageKeys = Object.keys(localStorage); // this gets the keys for localStorage
+        const keyToFind = "data_";
+        const dataKeys = localStorageKeys.filter(ls => ls.indexOf(keyToFind) >= 0);
+        if (dataKeys.length > 0 && dataKeys.length <= 2) {
+          const options: OptionSelectItem[] = [];
+          for (let i = 0; i < dataKeys.length; i++) {
+            options.push({
+              label: dataKeys[i].replace(keyToFind, ""),
+              handler: () => {
+                globalScene.ui.revertMode();
+                this.infoContainer.disableInteractive();
+                return true;
+              },
+            });
+          }
+        globalScene.ui.setOverlayMode(UiMode.OPTION_SELECT, {
+            options: options,
+            delay: 1000,
           });
-        }
-        globalScene.ui.setOverlayMode(Mode.OPTION_SELECT, {
-          options: options,
-          delay: 1000
-        });
-        this.infoContainer.setInteractive(new Phaser.Geom.Rectangle(0, 0, globalScene.game.canvas.width, globalScene.game.canvas.height), Phaser.Geom.Rectangle.Contains);
-      } else {
-        if (dataKeys.length > 2) {
-          return onFail(this.ERR_TOO_MANY_SAVES);
+          this.infoContainer.setInteractive(
+            new Phaser.Geom.Rectangle(0, 0, globalScene.game.canvas.width, globalScene.game.canvas.height),
+            Phaser.Geom.Rectangle.Contains,
+          );
         } else {
+          if (dataKeys.length > 2) {
+            return onFail(this.ERR_TOO_MANY_SAVES);
+          }
           return onFail(this.ERR_NO_SAVES);
         }
       }
@@ -274,29 +291,24 @@ export default class LoginFormUiHandler extends FormModalUiHandler {
     this.externalPartyContainer.setAlpha(0);
     globalScene.tweens.add({
       targets: this.externalPartyContainer,
-      duration: Utils.fixedInt(1000),
+      duration: fixedInt(1000),
       ease: "Sine.easeInOut",
       y: "-=24",
-      alpha: 1
+      alpha: 1,
     });
 
     this.infoContainer.setAlpha(0);
     globalScene.tweens.add({
       targets: this.infoContainer,
-      duration: Utils.fixedInt(1000),
+      duration: fixedInt(1000),
       ease: "Sine.easeInOut",
       y: "-=24",
-      alpha: 1
+      alpha: 1,
     });
   }
 
   private buildInteractableImage(texture: string, name: string, opts: BuildInteractableImageOpts = {}) {
-    const {
-      scale = 0.07,
-      x = 0,
-      y = 0,
-      origin = { x: 0, y: 0 }
-    } = opts;
+    const { scale = 0.07, x = 0, y = 0, origin = { x: 0, y: 0 } } = opts;
     const img = globalScene.add.image(x, y, texture);
     img.setName(name);
     img.setOrigin(origin.x, origin.y);
diff --git a/src/ui/menu-ui-handler.ts b/src/ui/menu-ui-handler.ts
index 3965eb38cc4..7f0cd4d6a78 100644
--- a/src/ui/menu-ui-handler.ts
+++ b/src/ui/menu-ui-handler.ts
@@ -1,8 +1,10 @@
-import { bypassLogin } from "#app/battle-scene";
+import { bypassLogin } from "#app/global-vars/bypass-login";
 import { globalScene } from "#app/global-scene";
 import { TextStyle, addTextObject, getTextStyleOptions } from "./text";
-import { Mode } from "./ui";
-import * as Utils from "../utils";
+import { UiMode } from "#enums/ui-mode";
+import { getEnumKeys, isLocal, fixedInt, sessionIdKey } from "#app/utils/common";
+import { isBeta } from "#app/utils/utility-vars";
+import { getCookie } from "#app/utils/cookies";
 import { addWindow, WindowVariant } from "./ui-theme";
 import MessageUiHandler from "./message-ui-handler";
 import type { OptionSelectConfig, OptionSelectItem } from "./abstact-option-select-ui-handler";
@@ -60,20 +62,23 @@ export default class MenuUiHandler extends MessageUiHandler {
   private menuMessageBox: Phaser.GameObjects.NineSlice;
   private dialogueMessageBox: Phaser.GameObjects.NineSlice;
 
-  protected scale: number = 0.1666666667;
+  protected scale = 0.1666666667;
 
   public bgmBar: BgmBar;
 
-  constructor(mode: Mode | null = null) {
+  constructor(mode: UiMode | null = null) {
     super(mode);
 
     this.excludedMenus = () => [
-      { condition: [ Mode.COMMAND, Mode.TITLE ].includes(mode ?? Mode.TITLE), options: [ MenuOptions.EGG_GACHA, MenuOptions.EGG_LIST ]},
-      { condition: bypassLogin, options: [ MenuOptions.LOG_OUT ]}
+      {
+        condition: [UiMode.COMMAND, UiMode.TITLE].includes(mode ?? UiMode.TITLE),
+        options: [MenuOptions.EGG_GACHA, MenuOptions.EGG_LIST],
+      },
+      { condition: bypassLogin, options: [MenuOptions.LOG_OUT] },
     ];
 
-    this.menuOptions = Utils.getEnumKeys(MenuOptions)
-      .map(m => parseInt(MenuOptions[m]) as MenuOptions)
+    this.menuOptions = getEnumKeys(MenuOptions)
+      .map(m => Number.parseInt(MenuOptions[m]) as MenuOptions)
       .filter(m => {
         return !this.excludedMenus().some(exclusion => exclusion.condition && exclusion.options.includes(m));
       });
@@ -83,7 +88,7 @@ export default class MenuUiHandler extends MessageUiHandler {
     const ui = this.getUi();
     // wiki url directs based on languges available on wiki
     const lang = i18next.resolvedLanguage?.substring(0, 2)!; // TODO: is this bang correct?
-    if ([ "de", "fr", "ko", "zh" ].includes(lang)) {
+    if (["de", "fr", "ko", "zh"].includes(lang)) {
       wikiUrl = `https://wiki.pokerogue.net/${lang}:start`;
     }
 
@@ -94,9 +99,20 @@ export default class MenuUiHandler extends MessageUiHandler {
 
     this.menuContainer = globalScene.add.container(1, -(globalScene.game.canvas.height / 6) + 1);
     this.menuContainer.setName("menu");
-    this.menuContainer.setInteractive(new Phaser.Geom.Rectangle(0, 0, globalScene.game.canvas.width / 6, globalScene.game.canvas.height / 6), Phaser.Geom.Rectangle.Contains);
+    this.menuContainer.setInteractive(
+      new Phaser.Geom.Rectangle(0, 0, globalScene.game.canvas.width / 6, globalScene.game.canvas.height / 6),
+      Phaser.Geom.Rectangle.Contains,
+    );
 
-    this.menuOverlay = new Phaser.GameObjects.Rectangle(globalScene, -1, -1, globalScene.scaledCanvas.width, globalScene.scaledCanvas.height, 0xffffff, 0.3);
+    this.menuOverlay = new Phaser.GameObjects.Rectangle(
+      globalScene,
+      -1,
+      -1,
+      globalScene.scaledCanvas.width,
+      globalScene.scaledCanvas.height,
+      0xffffff,
+      0.3,
+    );
     this.menuOverlay.setName("menu-overlay");
     this.menuOverlay.setOrigin(0, 0);
     this.menuContainer.add(this.menuOverlay);
@@ -104,32 +120,39 @@ export default class MenuUiHandler extends MessageUiHandler {
     this.menuContainer.add(this.bgmBar);
 
     this.menuContainer.setVisible(false);
-
   }
 
-
   render() {
     const ui = this.getUi();
     this.excludedMenus = () => [
-      { condition: globalScene.getCurrentPhase() instanceof SelectModifierPhase, options: [ MenuOptions.EGG_GACHA ]},
-      { condition: bypassLogin, options: [ MenuOptions.LOG_OUT ]}
+      {
+        condition: globalScene.getCurrentPhase() instanceof SelectModifierPhase,
+        options: [MenuOptions.EGG_GACHA],
+      },
+      { condition: bypassLogin, options: [MenuOptions.LOG_OUT] },
     ];
 
-    this.menuOptions = Utils.getEnumKeys(MenuOptions)
-      .map(m => parseInt(MenuOptions[m]) as MenuOptions)
+    this.menuOptions = getEnumKeys(MenuOptions)
+      .map(m => Number.parseInt(MenuOptions[m]) as MenuOptions)
       .filter(m => {
         return !this.excludedMenus().some(exclusion => exclusion.condition && exclusion.options.includes(m));
       });
 
-    this.optionSelectText = addTextObject(0, 0, this.menuOptions.map(o => `${i18next.t(`menuUiHandler:${MenuOptions[o]}`)}`).join("\n"), TextStyle.WINDOW, { maxLines: this.menuOptions.length });
+    this.optionSelectText = addTextObject(
+      0,
+      0,
+      this.menuOptions.map(o => `${i18next.t(`menuUiHandler:${MenuOptions[o]}`)}`).join("\n"),
+      TextStyle.WINDOW,
+      { maxLines: this.menuOptions.length },
+    );
     this.optionSelectText.setLineSpacing(12);
 
     this.scale = getTextStyleOptions(TextStyle.WINDOW, globalScene.uiTheme).scale;
     this.menuBg = addWindow(
-      (globalScene.game.canvas.width / 6) - (this.optionSelectText.displayWidth + 25),
+      globalScene.game.canvas.width / 6 - (this.optionSelectText.displayWidth + 25),
       0,
       this.optionSelectText.displayWidth + 19 + 24 * this.scale,
-      (globalScene.game.canvas.height / 6) - 2
+      globalScene.game.canvas.height / 6 - 2,
     );
     this.menuBg.setOrigin(0, 0);
 
@@ -151,7 +174,17 @@ export default class MenuUiHandler extends MessageUiHandler {
     this.menuMessageBoxContainer.add(this.menuMessageBox);
 
     // Full-width window used for testing dialog messages in debug mode
-    this.dialogueMessageBox = addWindow(-this.textPadding, 0, globalScene.game.canvas.width / 6 + this.textPadding * 2, 49, false, false, 0, 0, WindowVariant.THIN);
+    this.dialogueMessageBox = addWindow(
+      -this.textPadding,
+      0,
+      globalScene.game.canvas.width / 6 + this.textPadding * 2,
+      49,
+      false,
+      false,
+      0,
+      0,
+      WindowVariant.THIN,
+    );
     this.dialogueMessageBox.setOrigin(0, 0);
     this.menuMessageBoxContainer.add(this.dialogueMessageBox);
 
@@ -176,38 +209,49 @@ export default class MenuUiHandler extends MessageUiHandler {
       ui.revertMode();
       ui.showText(message, null, () => {
         const config: OptionSelectConfig = {
-          options: new Array(5).fill(null).map((_, i) => i).filter(slotFilter).map(i => {
-            return {
-              label: i18next.t("menuUiHandler:slot", { slotNumber: i + 1 }),
-              handler: () => {
-                callback(i);
-                ui.revertMode();
-                ui.showText("", 0);
-                return true;
-              }
-            };
-          }).concat([{
-            label: i18next.t("menuUiHandler:cancel"),
-            handler: () => {
-              ui.revertMode();
-              ui.showText("", 0);
-              return true;
-            }
-          }]),
-          xOffset: 98
+          options: new Array(5)
+            .fill(null)
+            .map((_, i) => i)
+            .filter(slotFilter)
+            .map(i => {
+              return {
+                label: i18next.t("menuUiHandler:slot", { slotNumber: i + 1 }),
+                handler: () => {
+                  callback(i);
+                  ui.revertMode();
+                  ui.showText("", 0);
+                  return true;
+                },
+              };
+            })
+            .concat([
+              {
+                label: i18next.t("menuUiHandler:cancel"),
+                handler: () => {
+                  ui.revertMode();
+                  ui.showText("", 0);
+                  return true;
+                },
+              },
+            ]),
+          xOffset: 98,
         };
-        ui.setOverlayMode(Mode.MENU_OPTION_SELECT, config);
+        ui.setOverlayMode(UiMode.MENU_OPTION_SELECT, config);
       });
     };
 
-    if (Utils.isLocal || Utils.isBeta) {
+    if (isLocal || isBeta) {
       manageDataOptions.push({
         label: i18next.t("menuUiHandler:importSession"),
         handler: () => {
-          confirmSlot(i18next.t("menuUiHandler:importSlotSelect"), () => true, slotId => globalScene.gameData.importData(GameDataType.SESSION, slotId));
+          confirmSlot(
+            i18next.t("menuUiHandler:importSlotSelect"),
+            () => true,
+            slotId => globalScene.gameData.importData(GameDataType.SESSION, slotId),
+          );
           return true;
         },
-        keepOpen: true
+        keepOpen: true,
       });
     }
     manageDataOptions.push({
@@ -222,14 +266,17 @@ export default class MenuUiHandler extends MessageUiHandler {
                 dataSlots.push(slotId);
               }
             });
-          })).then(() => {
-          confirmSlot(i18next.t("menuUiHandler:exportSlotSelect"),
+          }),
+        ).then(() => {
+          confirmSlot(
+            i18next.t("menuUiHandler:exportSlotSelect"),
             i => dataSlots.indexOf(i) > -1,
-            slotId => globalScene.gameData.tryExportData(GameDataType.SESSION, slotId));
+            slotId => globalScene.gameData.tryExportData(GameDataType.SESSION, slotId),
+          );
         });
         return true;
       },
-      keepOpen: true
+      keepOpen: true,
     });
     manageDataOptions.push({
       label: i18next.t("menuUiHandler:importRunHistory"),
@@ -237,7 +284,7 @@ export default class MenuUiHandler extends MessageUiHandler {
         globalScene.gameData.importData(GameDataType.RUN_HISTORY);
         return true;
       },
-      keepOpen: true
+      keepOpen: true,
     });
     manageDataOptions.push({
       label: i18next.t("menuUiHandler:exportRunHistory"),
@@ -245,9 +292,9 @@ export default class MenuUiHandler extends MessageUiHandler {
         globalScene.gameData.tryExportData(GameDataType.RUN_HISTORY);
         return true;
       },
-      keepOpen: true
+      keepOpen: true,
     });
-    if (Utils.isLocal || Utils.isBeta) {
+    if (isLocal || isBeta) {
       manageDataOptions.push({
         label: i18next.t("menuUiHandler:importData"),
         handler: () => {
@@ -255,33 +302,36 @@ export default class MenuUiHandler extends MessageUiHandler {
           globalScene.gameData.importData(GameDataType.SYSTEM);
           return true;
         },
-        keepOpen: true
+        keepOpen: true,
       });
     }
-    manageDataOptions.push({
-      label: i18next.t("menuUiHandler:exportData"),
-      handler: () => {
-        globalScene.gameData.tryExportData(GameDataType.SYSTEM);
-        return true;
+    manageDataOptions.push(
+      {
+        label: i18next.t("menuUiHandler:exportData"),
+        handler: () => {
+          globalScene.gameData.tryExportData(GameDataType.SYSTEM);
+          return true;
+        },
+        keepOpen: true,
       },
-      keepOpen: true
-    },
-    {
-      label: i18next.t("menuUiHandler:consentPreferences"),
-      handler: () => {
-        const consentLink = document.querySelector(".termly-display-preferences") as HTMLInputElement;
-        const clickEvent = new MouseEvent("click", {
-          view: window,
-          bubbles: true,
-          cancelable: true
-        });
-        consentLink.dispatchEvent(clickEvent);
-        consentLink.focus();
-        return true;
+      {
+        label: i18next.t("menuUiHandler:consentPreferences"),
+        handler: () => {
+          const consentLink = document.querySelector(".termly-display-preferences") as HTMLInputElement;
+          const clickEvent = new MouseEvent("click", {
+            view: window,
+            bubbles: true,
+            cancelable: true,
+          });
+          consentLink.dispatchEvent(clickEvent);
+          consentLink.focus();
+          return true;
+        },
+        keepOpen: true,
       },
-      keepOpen: true
-    });
-    if (Utils.isLocal || Utils.isBeta) { // this should make sure we don't have this option in live
+    );
+    if (isLocal || isBeta) {
+      // this should make sure we don't have this option in live
       manageDataOptions.push({
         label: "Test Dialogue",
         handler: () => {
@@ -299,7 +349,7 @@ export default class MenuUiHandler extends MessageUiHandler {
               const interpolatorOptions: any = {};
               const splitArr = dialogueName.split(" "); // this splits our inputted text into words to cycle through later
               const translatedString = splitArr[0]; // this is our outputted i18 string
-              const regex = RegExp("\\{\\{(\\w*)\\}\\}", "g"); // this is a regex expression to find all the text between {{ }} in the i18 output
+              const regex = /\{\{(\w*)\}\}/g; // this is a regex expression to find all the text between {{ }} in the i18 output
               const matches = i18next.t(translatedString).match(regex) ?? [];
               if (matches.length > 0) {
                 for (let match = 0; match < matches.length; match++) {
@@ -312,20 +362,27 @@ export default class MenuUiHandler extends MessageUiHandler {
               }
               // Switch to the dialog test window
               this.setDialogTestMode(true);
-              ui.showText(String(i18next.t(translatedString, interpolatorOptions)), null, () => globalScene.ui.showText("", 0, () => {
-                handler.tutorialActive = false;
-                // Go back to the default message window
-                this.setDialogTestMode(false);
-              }), null, true);
+              ui.showText(
+                String(i18next.t(translatedString, interpolatorOptions)),
+                null,
+                () =>
+                  globalScene.ui.showText("", 0, () => {
+                    handler.tutorialActive = false;
+                    // Go back to the default message window
+                    this.setDialogTestMode(false);
+                  }),
+                null,
+                true,
+              );
             },
             () => {
               ui.revertMode();
-            }
+            },
           ];
-          ui.setMode(Mode.TEST_DIALOGUE, buttonAction, prefilledText);
+          ui.setMode(UiMode.TEST_DIALOGUE, buttonAction, prefilledText);
           return true;
         },
-        keepOpen: true
+        keepOpen: true,
       });
     }
     manageDataOptions.push({
@@ -334,14 +391,14 @@ export default class MenuUiHandler extends MessageUiHandler {
         globalScene.ui.revertMode();
         return true;
       },
-      keepOpen: true
+      keepOpen: true,
     });
 
     //Thank you Vassiat
     this.manageDataConfig = {
       xOffset: 98,
       options: manageDataOptions,
-      maxOptions: 7
+      maxOptions: 7,
     };
 
     const communityOptions: OptionSelectItem[] = [
@@ -351,7 +408,7 @@ export default class MenuUiHandler extends MessageUiHandler {
           window.open(wikiUrl, "_blank")?.focus();
           return true;
         },
-        keepOpen: true
+        keepOpen: true,
       },
       {
         label: "Discord",
@@ -359,7 +416,7 @@ export default class MenuUiHandler extends MessageUiHandler {
           window.open(discordUrl, "_blank")?.focus();
           return true;
         },
-        keepOpen: true
+        keepOpen: true,
       },
       {
         label: "GitHub",
@@ -367,7 +424,7 @@ export default class MenuUiHandler extends MessageUiHandler {
           window.open(githubUrl, "_blank")?.focus();
           return true;
         },
-        keepOpen: true
+        keepOpen: true,
       },
       {
         label: "Reddit",
@@ -375,7 +432,7 @@ export default class MenuUiHandler extends MessageUiHandler {
           window.open(redditUrl, "_blank")?.focus();
           return true;
         },
-        keepOpen: true
+        keepOpen: true,
       },
       {
         label: i18next.t("menuUiHandler:donate"),
@@ -383,52 +440,58 @@ export default class MenuUiHandler extends MessageUiHandler {
           window.open(donateUrl, "_blank")?.focus();
           return true;
         },
-        keepOpen: true
-      }
+        keepOpen: true,
+      },
     ];
     if (!bypassLogin && loggedInUser?.hasAdminRole) {
       communityOptions.push({
         label: "Admin",
         handler: () => {
-
-          const skippedAdminModes: AdminMode[] = [ AdminMode.ADMIN ]; // this is here so that we can skip the menu populating enums that aren't meant for the menu, such as the AdminMode.ADMIN
+          const skippedAdminModes: AdminMode[] = [AdminMode.ADMIN]; // this is here so that we can skip the menu populating enums that aren't meant for the menu, such as the AdminMode.ADMIN
           const options: OptionSelectItem[] = [];
-          Object.values(AdminMode).filter((v) => !isNaN(Number(v)) && !skippedAdminModes.includes(v as AdminMode)).forEach((mode) => { // this gets all the enums in a way we can use
-            options.push({
-              label: getAdminModeName(mode as AdminMode),
-              handler: () => {
-                ui.playSelect();
-                ui.setOverlayMode(Mode.ADMIN, {
-                  buttonActions: [
-                  // we double revert here and below to go back 2 layers of menus
-                    () => {
-                      ui.revertMode();
-                      ui.revertMode();
+          Object.values(AdminMode)
+            .filter(v => !Number.isNaN(Number(v)) && !skippedAdminModes.includes(v as AdminMode))
+            .forEach(mode => {
+              // this gets all the enums in a way we can use
+              options.push({
+                label: getAdminModeName(mode as AdminMode),
+                handler: () => {
+                  ui.playSelect();
+                  ui.setOverlayMode(
+                    UiMode.ADMIN,
+                    {
+                      buttonActions: [
+                        // we double revert here and below to go back 2 layers of menus
+                        () => {
+                          ui.revertMode();
+                          ui.revertMode();
+                        },
+                        () => {
+                          ui.revertMode();
+                          ui.revertMode();
+                        },
+                      ],
                     },
-                    () => {
-                      ui.revertMode();
-                      ui.revertMode();
-                    }
-                  ]
-                }, mode); // mode is our AdminMode enum
-                return true;
-              }
+                    mode,
+                  ); // mode is our AdminMode enum
+                  return true;
+                },
+              });
             });
-          });
           options.push({
             label: "Cancel",
             handler: () => {
               ui.revertMode();
               return true;
-            }
+            },
           });
-          globalScene.ui.setOverlayMode(Mode.OPTION_SELECT, {
+          globalScene.ui.setOverlayMode(UiMode.OPTION_SELECT, {
             options: options,
-            delay: 0
+            delay: 0,
           });
           return true;
         },
-        keepOpen: true
+        keepOpen: true,
       });
     }
     communityOptions.push({
@@ -436,11 +499,11 @@ export default class MenuUiHandler extends MessageUiHandler {
       handler: () => {
         globalScene.ui.revertMode();
         return true;
-      }
+      },
     });
     this.communityConfig = {
       xOffset: 98,
-      options: communityOptions
+      options: communityOptions,
     };
     this.setCursor(0);
   }
@@ -449,8 +512,8 @@ export default class MenuUiHandler extends MessageUiHandler {
     this.render();
     super.show(args);
 
-    this.menuOptions = Utils.getEnumKeys(MenuOptions)
-      .map(m => parseInt(MenuOptions[m]) as MenuOptions)
+    this.menuOptions = getEnumKeys(MenuOptions)
+      .map(m => Number.parseInt(MenuOptions[m]) as MenuOptions)
       .filter(m => {
         return !this.excludedMenus().some(exclusion => exclusion.condition && exclusion.options.includes(m));
       });
@@ -471,7 +534,6 @@ export default class MenuUiHandler extends MessageUiHandler {
 
     this.bgmBar.toggleBgmBar(true);
 
-
     return true;
   }
 
@@ -497,94 +559,108 @@ export default class MenuUiHandler extends MessageUiHandler {
       this.showText("", 0);
       switch (adjustedCursor) {
         case MenuOptions.GAME_SETTINGS:
-          ui.setOverlayMode(Mode.SETTINGS);
+          ui.setOverlayMode(UiMode.SETTINGS);
           success = true;
           break;
         case MenuOptions.ACHIEVEMENTS:
-          ui.setOverlayMode(Mode.ACHIEVEMENTS);
+          ui.setOverlayMode(UiMode.ACHIEVEMENTS);
           success = true;
           break;
         case MenuOptions.STATS:
-          ui.setOverlayMode(Mode.GAME_STATS);
+          ui.setOverlayMode(UiMode.GAME_STATS);
           success = true;
           break;
         case MenuOptions.EGG_LIST:
           if (globalScene.gameData.eggs.length) {
             ui.revertMode();
-            ui.setOverlayMode(Mode.EGG_LIST);
+            ui.setOverlayMode(UiMode.EGG_LIST);
             success = true;
           } else {
-            ui.showText(i18next.t("menuUiHandler:noEggs"), null, () => ui.showText(""), Utils.fixedInt(1500));
+            ui.showText(i18next.t("menuUiHandler:noEggs"), null, () => ui.showText(""), fixedInt(1500));
             error = true;
           }
           break;
         case MenuOptions.EGG_GACHA:
           ui.revertMode();
-          ui.setOverlayMode(Mode.EGG_GACHA);
+          ui.setOverlayMode(UiMode.EGG_GACHA);
           success = true;
           break;
         case MenuOptions.POKEDEX:
           ui.revertMode();
-          ui.setOverlayMode(Mode.POKEDEX);
+          ui.setOverlayMode(UiMode.POKEDEX);
           success = true;
           break;
         case MenuOptions.MANAGE_DATA:
-          if (!bypassLogin && !this.manageDataConfig.options.some(o => o.label === i18next.t("menuUiHandler:linkDiscord") || o.label === i18next.t("menuUiHandler:unlinkDiscord"))) {
-            this.manageDataConfig.options.splice(this.manageDataConfig.options.length - 1, 0,
+          if (
+            !bypassLogin &&
+            !this.manageDataConfig.options.some(
+              o =>
+                o.label === i18next.t("menuUiHandler:linkDiscord") ||
+                o.label === i18next.t("menuUiHandler:unlinkDiscord"),
+            )
+          ) {
+            this.manageDataConfig.options.splice(
+              this.manageDataConfig.options.length - 1,
+              0,
               {
-                label: loggedInUser?.discordId === "" ? i18next.t("menuUiHandler:linkDiscord") : i18next.t("menuUiHandler:unlinkDiscord"),
+                label:
+                  loggedInUser?.discordId === ""
+                    ? i18next.t("menuUiHandler:linkDiscord")
+                    : i18next.t("menuUiHandler:unlinkDiscord"),
                 handler: () => {
                   if (loggedInUser?.discordId === "") {
-                    const token = Utils.getCookie(Utils.sessionIdKey);
+                    const token = getCookie(sessionIdKey);
                     const redirectUri = encodeURIComponent(`${import.meta.env.VITE_SERVER_URL}/auth/discord/callback`);
                     const discordId = import.meta.env.VITE_DISCORD_CLIENT_ID;
                     const discordUrl = `https://discord.com/api/oauth2/authorize?client_id=${discordId}&redirect_uri=${redirectUri}&response_type=code&scope=identify&state=${token}&prompt=none`;
                     window.open(discordUrl, "_self");
                     return true;
-                  } else {
-                    pokerogueApi.unlinkDiscord().then(_isSuccess => {
-                      updateUserInfo().then(() => globalScene.reset(true, true));
-                    });
-                    return true;
                   }
-                }
+                  pokerogueApi.unlinkDiscord().then(_isSuccess => {
+                    updateUserInfo().then(() => globalScene.reset(true, true));
+                  });
+                  return true;
+                },
               },
               {
-                label: loggedInUser?.googleId === "" ? i18next.t("menuUiHandler:linkGoogle") : i18next.t("menuUiHandler:unlinkGoogle"),
+                label:
+                  loggedInUser?.googleId === ""
+                    ? i18next.t("menuUiHandler:linkGoogle")
+                    : i18next.t("menuUiHandler:unlinkGoogle"),
                 handler: () => {
                   if (loggedInUser?.googleId === "") {
-                    const token = Utils.getCookie(Utils.sessionIdKey);
+                    const token = getCookie(sessionIdKey);
                     const redirectUri = encodeURIComponent(`${import.meta.env.VITE_SERVER_URL}/auth/google/callback`);
                     const googleId = import.meta.env.VITE_GOOGLE_CLIENT_ID;
                     const googleUrl = `https://accounts.google.com/o/oauth2/auth?client_id=${googleId}&response_type=code&redirect_uri=${redirectUri}&scope=openid&state=${token}`;
                     window.open(googleUrl, "_self");
                     return true;
-                  } else {
-                    pokerogueApi.unlinkGoogle().then(_isSuccess => {
-                      updateUserInfo().then(() => globalScene.reset(true, true));
-                    });
-                    return true;
                   }
-                }
-              });
+                  pokerogueApi.unlinkGoogle().then(_isSuccess => {
+                    updateUserInfo().then(() => globalScene.reset(true, true));
+                  });
+                  return true;
+                },
+              },
+            );
           }
-          ui.setOverlayMode(Mode.MENU_OPTION_SELECT, this.manageDataConfig);
+          ui.setOverlayMode(UiMode.MENU_OPTION_SELECT, this.manageDataConfig);
           success = true;
           break;
         case MenuOptions.COMMUNITY:
-          ui.setOverlayMode(Mode.MENU_OPTION_SELECT, this.communityConfig);
+          ui.setOverlayMode(UiMode.MENU_OPTION_SELECT, this.communityConfig);
           success = true;
           break;
         case MenuOptions.SAVE_AND_QUIT:
           if (globalScene.currentBattle) {
             success = true;
             const doSaveQuit = () => {
-              ui.setMode(Mode.LOADING, {
-                buttonActions: [], fadeOut: () =>
+              ui.setMode(UiMode.LOADING, {
+                buttonActions: [],
+                fadeOut: () =>
                   globalScene.gameData.saveAll(true, true, true, true).then(() => {
-
                     globalScene.reset(true);
-                  })
+                  }),
               });
             };
             if (globalScene.currentBattle.turn > 1) {
@@ -593,10 +669,16 @@ export default class MenuUiHandler extends MessageUiHandler {
                   this.showText("", 0);
                   return;
                 }
-                ui.setOverlayMode(Mode.CONFIRM, doSaveQuit, () => {
-                  ui.revertMode();
-                  this.showText("", 0);
-                }, false, -98);
+                ui.setOverlayMode(
+                  UiMode.CONFIRM,
+                  doSaveQuit,
+                  () => {
+                    ui.revertMode();
+                    this.showText("", 0);
+                  },
+                  false,
+                  -98,
+                );
               });
             } else {
               doSaveQuit();
@@ -608,10 +690,12 @@ export default class MenuUiHandler extends MessageUiHandler {
         case MenuOptions.LOG_OUT:
           success = true;
           const doLogout = () => {
-            ui.setMode(Mode.LOADING, {
-              buttonActions: [], fadeOut: () => pokerogueApi.account.logout().then(() => {
-                updateUserInfo().then(() => globalScene.reset(true, true));
-              })
+            ui.setMode(UiMode.LOADING, {
+              buttonActions: [],
+              fadeOut: () =>
+                pokerogueApi.account.logout().then(() => {
+                  updateUserInfo().then(() => globalScene.reset(true, true));
+                }),
             });
           };
           if (globalScene.currentBattle) {
@@ -620,10 +704,16 @@ export default class MenuUiHandler extends MessageUiHandler {
                 this.showText("", 0);
                 return;
               }
-              ui.setOverlayMode(Mode.CONFIRM, doLogout, () => {
-                ui.revertMode();
-                this.showText("", 0);
-              }, false, -98);
+              ui.setOverlayMode(
+                UiMode.CONFIRM,
+                doLogout,
+                () => {
+                  ui.revertMode();
+                  this.showText("", 0);
+                },
+                false,
+                -98,
+              );
             });
           } else {
             doLogout();
@@ -634,7 +724,7 @@ export default class MenuUiHandler extends MessageUiHandler {
       success = true;
       ui.revertMode().then(result => {
         if (!result) {
-          ui.setMode(Mode.MESSAGE);
+          ui.setMode(UiMode.MESSAGE);
         }
       });
     } else {
@@ -675,12 +765,21 @@ export default class MenuUiHandler extends MessageUiHandler {
     this.menuMessageBox.setVisible(!isDialogMode);
     this.dialogueMessageBox.setVisible(isDialogMode);
     // If we're testing dialog, we use the same word wrapping as the battle message handler
-    this.message.setWordWrapWidth(isDialogMode ? globalScene.ui.getMessageHandler().wordWrapWidth : this.defaultWordWrapWidth);
+    this.message.setWordWrapWidth(
+      isDialogMode ? globalScene.ui.getMessageHandler().wordWrapWidth : this.defaultWordWrapWidth,
+    );
     this.message.setX(isDialogMode ? this.textPadding + 1 : this.textPadding);
     this.message.setY(isDialogMode ? this.textPadding + 0.4 : this.textPadding);
   }
 
-  showText(text: string, delay?: number, callback?: Function, callbackDelay?: number, prompt?: boolean, promptDelay?: number): void {
+  showText(
+    text: string,
+    delay?: number,
+    callback?: Function,
+    callbackDelay?: number,
+    prompt?: boolean,
+    promptDelay?: number,
+  ): void {
     this.menuMessageBoxContainer.setVisible(!!text);
 
     super.showText(text, delay, callback, callbackDelay, prompt, promptDelay);
diff --git a/src/ui/message-ui-handler.ts b/src/ui/message-ui-handler.ts
index 18e1dfb1aff..efa53b63808 100644
--- a/src/ui/message-ui-handler.ts
+++ b/src/ui/message-ui-handler.ts
@@ -1,6 +1,6 @@
 import AwaitableUiHandler from "./awaitable-ui-handler";
-import type { Mode } from "./ui";
-import * as Utils from "../utils";
+import type { UiMode } from "#enums/ui-mode";
+import { getFrameMs } from "#app/utils/common";
 import { globalScene } from "#app/global-scene";
 
 export default abstract class MessageUiHandler extends AwaitableUiHandler {
@@ -11,7 +11,7 @@ export default abstract class MessageUiHandler extends AwaitableUiHandler {
   public message: Phaser.GameObjects.Text;
   public prompt: Phaser.GameObjects.Sprite;
 
-  constructor(mode: Mode | null = null) {
+  constructor(mode: UiMode | null = null) {
     super(mode);
 
     this.pendingPrompt = false;
@@ -34,15 +34,37 @@ export default abstract class MessageUiHandler extends AwaitableUiHandler {
     }
   }
 
-  showText(text: string, delay?: number | null, callback?: Function | null, callbackDelay?: number | null, prompt?: boolean | null, promptDelay?: number | null) {
+  showText(
+    text: string,
+    delay?: number | null,
+    callback?: Function | null,
+    callbackDelay?: number | null,
+    prompt?: boolean | null,
+    promptDelay?: number | null,
+  ) {
     this.showTextInternal(text, delay, callback, callbackDelay, prompt, promptDelay);
   }
 
-  showDialogue(text: string, name?: string, delay?: number | null, callback?: Function | null, callbackDelay?: number | null, prompt?: boolean | null, promptDelay?: number | null) {
+  showDialogue(
+    text: string,
+    _name?: string,
+    delay?: number | null,
+    callback?: Function | null,
+    callbackDelay?: number | null,
+    prompt?: boolean | null,
+    promptDelay?: number | null,
+  ) {
     this.showTextInternal(text, delay, callback, callbackDelay, prompt, promptDelay);
   }
 
-  private showTextInternal(text: string, delay?: number | null, callback?: Function | null, callbackDelay?: number | null, prompt?: boolean | null, promptDelay?: number | null) {
+  private showTextInternal(
+    text: string,
+    delay?: number | null,
+    callback?: Function | null,
+    callbackDelay?: number | null,
+    prompt?: boolean | null,
+    promptDelay?: number | null,
+  ) {
     if (delay === null || delay === undefined) {
       delay = 20;
     }
@@ -54,24 +76,33 @@ export default abstract class MessageUiHandler extends AwaitableUiHandler {
     const fadeMap = new Map<number, number>();
     const actionPattern = /@(c|d|s|f)\{(.*?)\}/;
     let actionMatch: RegExpExecArray | null;
+    const pokename: string[] = [];
+    const repname = ["#POKEMON1", "#POKEMON2"];
+    for (let p = 0; p < globalScene.getPlayerField().length; p++) {
+      pokename.push(globalScene.getPlayerField()[p].getNameToRender());
+      text = text.split(pokename[p]).join(repname[p]);
+    }
     while ((actionMatch = actionPattern.exec(text))) {
       switch (actionMatch[1]) {
         case "c":
           charVarMap.set(actionMatch.index, actionMatch[2]);
           break;
         case "d":
-          delayMap.set(actionMatch.index, parseInt(actionMatch[2]));
+          delayMap.set(actionMatch.index, Number.parseInt(actionMatch[2]));
           break;
         case "s":
           soundMap.set(actionMatch.index, actionMatch[2]);
           break;
         case "f":
-          fadeMap.set(actionMatch.index, parseInt(actionMatch[2]));
+          fadeMap.set(actionMatch.index, Number.parseInt(actionMatch[2]));
           break;
       }
       text = text.slice(0, actionMatch.index) + text.slice(actionMatch.index + actionMatch[2].length + 4);
     }
 
+    for (let p = 0; p < globalScene.getPlayerField().length; p++) {
+      text = text.split(repname[p]).join(pokename[p]);
+    }
     if (text) {
       // Predetermine overflow line breaks to avoid words breaking while displaying
       const textWords = text.split(" ");
@@ -122,7 +153,7 @@ export default abstract class MessageUiHandler extends AwaitableUiHandler {
       this.textTimer = globalScene.time.addEvent({
         delay: delay,
         callback: () => {
-          const charIndex = text.length - (this.textTimer?.repeatCount!); // TODO: is this bang correct?
+          const charIndex = text.length - this.textTimer?.repeatCount!; // TODO: is this bang correct?
           const charVar = charVarMap.get(charIndex);
           const charSound = soundMap.get(charIndex);
           const charDelay = delayMap.get(charIndex);
@@ -152,17 +183,17 @@ export default abstract class MessageUiHandler extends AwaitableUiHandler {
           if (charDelay) {
             this.textTimer!.paused = true; // TODO: is the bang correct?
             globalScene.tweens.addCounter({
-              duration: Utils.getFrameMs(charDelay),
+              duration: getFrameMs(charDelay),
               onComplete: () => {
                 this.textTimer!.paused = false; // TODO: is the bang correct?
                 advance();
-              }
+              },
             });
           } else if (charFade) {
             this.textTimer!.paused = true;
             globalScene.time.delayedCall(150, () => {
               globalScene.ui.fadeOut(750).then(() => {
-                const delay = Utils.getFrameMs(charFade);
+                const delay = getFrameMs(charFade);
                 globalScene.time.delayedCall(delay, () => {
                   globalScene.ui.fadeIn(500).then(() => {
                     this.textTimer!.paused = false;
@@ -175,7 +206,7 @@ export default abstract class MessageUiHandler extends AwaitableUiHandler {
             advance();
           }
         },
-        repeat: text.length
+        repeat: text.length,
       });
     } else {
       this.message.setText(text);
@@ -192,7 +223,9 @@ export default abstract class MessageUiHandler extends AwaitableUiHandler {
     const wrappedTextLines = this.message.runWordWrap(this.message.text).split(/\n/g);
     const textLinesCount = wrappedTextLines.length;
     const lastTextLine = wrappedTextLines[wrappedTextLines.length - 1];
-    const lastLineTest = globalScene.add.text(0, 0, lastTextLine, { font: "96px emerald" });
+    const lastLineTest = globalScene.add.text(0, 0, lastTextLine, {
+      font: "96px emerald",
+    });
     lastLineTest.setScale(this.message.scale);
     const lastLineWidth = lastLineTest.displayWidth;
     lastLineTest.destroy();
diff --git a/src/ui/modal-ui-handler.ts b/src/ui/modal-ui-handler.ts
index 909010e3566..56c1c2c3fcf 100644
--- a/src/ui/modal-ui-handler.ts
+++ b/src/ui/modal-ui-handler.ts
@@ -1,5 +1,5 @@
 import { TextStyle, addTextObject } from "./text";
-import type { Mode } from "./ui";
+import type { UiMode } from "#enums/ui-mode";
 import UiHandler from "./ui-handler";
 import { WindowVariant, addWindow } from "./ui-theme";
 import type { Button } from "#enums/buttons";
@@ -17,7 +17,7 @@ export abstract class ModalUiHandler extends UiHandler {
   protected buttonBgs: Phaser.GameObjects.NineSlice[];
   protected buttonLabels: Phaser.GameObjects.Text[];
 
-  constructor(mode: Mode | null = null) {
+  constructor(mode: UiMode | null = null) {
     super(mode);
 
     this.buttonContainers = [];
@@ -44,7 +44,10 @@ export abstract class ModalUiHandler extends UiHandler {
 
     this.modalContainer = globalScene.add.container(0, 0);
 
-    this.modalContainer.setInteractive(new Phaser.Geom.Rectangle(0, 0, globalScene.game.canvas.width / 6, globalScene.game.canvas.height / 6), Phaser.Geom.Rectangle.Contains);
+    this.modalContainer.setInteractive(
+      new Phaser.Geom.Rectangle(0, 0, globalScene.game.canvas.width / 6, globalScene.game.canvas.height / 6),
+      Phaser.Geom.Rectangle.Contains,
+    );
 
     this.modalBg = addWindow(0, 0, 0, 0);
 
@@ -73,7 +76,10 @@ export abstract class ModalUiHandler extends UiHandler {
 
     const buttonBg = addWindow(0, 0, buttonLabel.getBounds().width + 8, 16, false, false, 0, 0, WindowVariant.THIN);
     buttonBg.setOrigin(0.5, 0);
-    buttonBg.setInteractive(new Phaser.Geom.Rectangle(0, 0, buttonBg.width, buttonBg.height), Phaser.Geom.Rectangle.Contains);
+    buttonBg.setInteractive(
+      new Phaser.Geom.Rectangle(0, 0, buttonBg.width, buttonBg.height),
+      Phaser.Geom.Rectangle.Contains,
+    );
 
     const buttonContainer = globalScene.add.container(0, buttonTopMargin);
 
@@ -93,9 +99,15 @@ export abstract class ModalUiHandler extends UiHandler {
     if (args.length >= 1 && "buttonActions" in args[0]) {
       super.show(args);
       if (args[0].hasOwnProperty("fadeOut") && typeof args[0].fadeOut === "function") {
-        const [ marginTop, marginRight, marginBottom, marginLeft ] = this.getMargin();
+        const [marginTop, marginRight, marginBottom, marginLeft] = this.getMargin();
 
-        const overlay = globalScene.add.rectangle(( this.getWidth() + marginLeft + marginRight) / 2, (this.getHeight() + marginTop + marginBottom) / 2, globalScene.game.canvas.width / 6, globalScene.game.canvas.height / 6, 0);
+        const overlay = globalScene.add.rectangle(
+          (this.getWidth() + marginLeft + marginRight) / 2,
+          (this.getHeight() + marginTop + marginBottom) / 2,
+          globalScene.game.canvas.width / 6,
+          globalScene.game.canvas.height / 6,
+          0,
+        );
         overlay.setOrigin(0.5, 0.5);
         overlay.setName("rect-ui-overlay-modal");
         overlay.setAlpha(0);
@@ -108,7 +120,7 @@ export abstract class ModalUiHandler extends UiHandler {
           alpha: 1,
           duration: 250,
           ease: "Sine.easeOut",
-          onComplete: args[0].fadeOut
+          onComplete: args[0].fadeOut,
         });
       }
 
@@ -122,7 +134,11 @@ export abstract class ModalUiHandler extends UiHandler {
 
       for (let a = 0; a < this.buttonBgs.length; a++) {
         if (a < this.buttonBgs.length) {
-          this.buttonBgs[a].on("pointerdown", (_) => config.buttonActions[a]());
+          this.buttonBgs[a].on("pointerdown", _ => {
+            if (globalScene.tweens.getTweensOf(this.modalContainer).length === 0) {
+              config.buttonActions[a]();
+            }
+          });
         }
       }
 
@@ -133,10 +149,13 @@ export abstract class ModalUiHandler extends UiHandler {
   }
 
   updateContainer(config?: ModalConfig): void {
-    const [ marginTop, marginRight, marginBottom, marginLeft ] = this.getMargin(config);
+    const [marginTop, marginRight, marginBottom, marginLeft] = this.getMargin(config);
 
-    const [ width, height ] = [ this.getWidth(config), this.getHeight(config) ];
-    this.modalContainer.setPosition((((globalScene.game.canvas.width / 6) - (width + (marginRight - marginLeft))) / 2), (((-globalScene.game.canvas.height / 6) - (height + (marginBottom - marginTop))) / 2));
+    const [width, height] = [this.getWidth(config), this.getHeight(config)];
+    this.modalContainer.setPosition(
+      (globalScene.game.canvas.width / 6 - (width + (marginRight - marginLeft))) / 2,
+      (-globalScene.game.canvas.height / 6 - (height + (marginBottom - marginTop))) / 2,
+    );
 
     this.modalBg.setSize(width, height);
 
@@ -153,7 +172,7 @@ export abstract class ModalUiHandler extends UiHandler {
     }
   }
 
-  processInput(button: Button): boolean {
+  processInput(_button: Button): boolean {
     return false;
   }
 
@@ -168,7 +187,9 @@ export abstract class ModalUiHandler extends UiHandler {
    * Adds a hover effect to a game object which changes the cursor to a `pointer` and tints it slighly
    * @param gameObject the game object to add hover events/effects to
    */
-  protected addInteractionHoverEffect(gameObject: Phaser.GameObjects.Image | Phaser.GameObjects.NineSlice | Phaser.GameObjects.Sprite) {
+  protected addInteractionHoverEffect(
+    gameObject: Phaser.GameObjects.Image | Phaser.GameObjects.NineSlice | Phaser.GameObjects.Sprite,
+  ) {
     gameObject.on("pointerover", () => {
       this.setMouseCursorStyle("pointer");
       gameObject.setTint(0xbbbbbb);
diff --git a/src/ui/modifier-select-ui-handler.ts b/src/ui/modifier-select-ui-handler.ts
index a3508532631..9ba54491175 100644
--- a/src/ui/modifier-select-ui-handler.ts
+++ b/src/ui/modifier-select-ui-handler.ts
@@ -4,17 +4,16 @@ import { getPlayerShopModifierTypeOptionsForWave, TmModifierType } from "../modi
 import { getPokeballAtlasKey } from "#app/data/pokeball";
 import { addTextObject, getTextStyleOptions, getModifierTierTextTint, getTextColor, TextStyle } from "./text";
 import AwaitableUiHandler from "./awaitable-ui-handler";
-import { Mode } from "./ui";
+import { UiMode } from "#enums/ui-mode";
 import { LockModifierTiersModifier, PokemonHeldItemModifier, HealShopCostModifier } from "../modifier/modifier";
 import { handleTutorial, Tutorial } from "../tutorial";
 import { Button } from "#enums/buttons";
 import MoveInfoOverlay from "./move-info-overlay";
-import { allMoves } from "../data/move";
-import * as Utils from "./../utils";
+import { allMoves } from "../data/moves/move";
+import { formatMoney, NumberHolder } from "#app/utils/common";
 import Overrides from "#app/overrides";
 import i18next from "i18next";
 import { ShopCursorTarget } from "#app/enums/shop-cursor-target";
-import { IntegerHolder } from "./../utils";
 import Phaser from "phaser";
 import type { PokeballType } from "#enums/pokeball";
 
@@ -33,9 +32,9 @@ export default class ModifierSelectUiHandler extends AwaitableUiHandler {
   private rerollCostText: Phaser.GameObjects.Text;
   private lockRarityButtonText: Phaser.GameObjects.Text;
   private moveInfoOverlay: MoveInfoOverlay;
-  private moveInfoOverlayActive: boolean = false;
+  private moveInfoOverlayActive = false;
 
-  private rowCursor: number = 0;
+  private rowCursor = 0;
   private player: boolean;
   /**
    * If reroll cost is negative, it is assumed there are 0 items in the shop.
@@ -51,7 +50,7 @@ export default class ModifierSelectUiHandler extends AwaitableUiHandler {
   private cursorObj: Phaser.GameObjects.Image | null;
 
   constructor() {
-    super(Mode.CONFIRM);
+    super(UiMode.CONFIRM);
 
     this.options = [];
     this.shopOptionsRows = [];
@@ -73,7 +72,10 @@ export default class ModifierSelectUiHandler extends AwaitableUiHandler {
       this.checkButtonWidth = context.measureText(i18next.t("modifierSelectUiHandler:checkTeam")).width;
     }
 
-    this.transferButtonContainer = globalScene.add.container((globalScene.game.canvas.width - this.checkButtonWidth) / 6 - 21, OPTION_BUTTON_YPOSITION);
+    this.transferButtonContainer = globalScene.add.container(
+      (globalScene.game.canvas.width - this.checkButtonWidth) / 6 - 21,
+      OPTION_BUTTON_YPOSITION,
+    );
     this.transferButtonContainer.setName("transfer-btn");
     this.transferButtonContainer.setVisible(false);
     ui.add(this.transferButtonContainer);
@@ -83,7 +85,10 @@ export default class ModifierSelectUiHandler extends AwaitableUiHandler {
     transferButtonText.setOrigin(1, 0);
     this.transferButtonContainer.add(transferButtonText);
 
-    this.checkButtonContainer = globalScene.add.container((globalScene.game.canvas.width) / 6 - 1, OPTION_BUTTON_YPOSITION);
+    this.checkButtonContainer = globalScene.add.container(
+      globalScene.game.canvas.width / 6 - 1,
+      OPTION_BUTTON_YPOSITION,
+    );
     this.checkButtonContainer.setName("use-btn");
     this.checkButtonContainer.setVisible(false);
     ui.add(this.checkButtonContainer);
@@ -113,16 +118,29 @@ export default class ModifierSelectUiHandler extends AwaitableUiHandler {
     this.lockRarityButtonContainer.setVisible(false);
     ui.add(this.lockRarityButtonContainer);
 
-    this.lockRarityButtonText = addTextObject(-4, -2, i18next.t("modifierSelectUiHandler:lockRarities"), TextStyle.PARTY);
+    this.lockRarityButtonText = addTextObject(
+      -4,
+      -2,
+      i18next.t("modifierSelectUiHandler:lockRarities"),
+      TextStyle.PARTY,
+    );
     this.lockRarityButtonText.setOrigin(0, 0);
     this.lockRarityButtonContainer.add(this.lockRarityButtonText);
 
-    this.continueButtonContainer = globalScene.add.container((globalScene.game.canvas.width / 12), -(globalScene.game.canvas.height / 12));
+    this.continueButtonContainer = globalScene.add.container(
+      globalScene.game.canvas.width / 12,
+      -(globalScene.game.canvas.height / 12),
+    );
     this.continueButtonContainer.setVisible(false);
     ui.add(this.continueButtonContainer);
 
     // Create continue button
-    const continueButtonText = addTextObject(-24, 5, i18next.t("modifierSelectUiHandler:continueNextWaveButton"), TextStyle.MESSAGE);
+    const continueButtonText = addTextObject(
+      -24,
+      5,
+      i18next.t("modifierSelectUiHandler:continueNextWaveButton"),
+      TextStyle.MESSAGE,
+    );
     continueButtonText.setName("text-continue-btn");
     this.continueButtonContainer.add(continueButtonText);
 
@@ -135,7 +153,7 @@ export default class ModifierSelectUiHandler extends AwaitableUiHandler {
       right: true,
       x: 1,
       y: -MoveInfoOverlay.getHeight(overlayScale, true) - 1,
-      width: (globalScene.game.canvas.width / 6) - 2,
+      width: globalScene.game.canvas.width / 6 - 2,
     });
     ui.add(this.moveInfoOverlay);
     // register the overlay to receive toggle events
@@ -143,7 +161,6 @@ export default class ModifierSelectUiHandler extends AwaitableUiHandler {
   }
 
   show(args: any[]): boolean {
-
     globalScene.disableMenu = false;
 
     if (this.active) {
@@ -155,7 +172,7 @@ export default class ModifierSelectUiHandler extends AwaitableUiHandler {
       return false;
     }
 
-    if (args.length !== 4 || !(args[1] instanceof Array) || !(args[2] instanceof Function)) {
+    if (args.length !== 4 || !Array.isArray(args[1]) || !(args[2] instanceof Function)) {
       return false;
     }
 
@@ -165,7 +182,8 @@ export default class ModifierSelectUiHandler extends AwaitableUiHandler {
 
     this.player = args[0];
 
-    const partyHasHeldItem = this.player && !!globalScene.findModifiers(m => m instanceof PokemonHeldItemModifier && m.isTransferable).length;
+    const partyHasHeldItem =
+      this.player && !!globalScene.findModifiers(m => m instanceof PokemonHeldItemModifier && m.isTransferable).length;
     const canLockRarities = !!globalScene.findModifier(m => m instanceof LockModifierTiersModifier);
 
     this.transferButtonContainer.setVisible(false);
@@ -191,16 +209,21 @@ export default class ModifierSelectUiHandler extends AwaitableUiHandler {
 
     const typeOptions = args[1] as ModifierTypeOption[];
     const removeHealShop = globalScene.gameMode.hasNoShop;
-    const baseShopCost = new IntegerHolder(globalScene.getWaveMoneyAmount(1));
+    const baseShopCost = new NumberHolder(globalScene.getWaveMoneyAmount(1));
     globalScene.applyModifier(HealShopCostModifier, true, baseShopCost);
     const shopTypeOptions = !removeHealShop
       ? getPlayerShopModifierTypeOptionsForWave(globalScene.currentBattle.waveIndex, baseShopCost.value)
       : [];
-    const optionsYOffset = shopTypeOptions.length > SHOP_OPTIONS_ROW_LIMIT ? -SINGLE_SHOP_ROW_YOFFSET : -DOUBLE_SHOP_ROW_YOFFSET;
+    const optionsYOffset =
+      shopTypeOptions.length > SHOP_OPTIONS_ROW_LIMIT ? -SINGLE_SHOP_ROW_YOFFSET : -DOUBLE_SHOP_ROW_YOFFSET;
 
     for (let m = 0; m < typeOptions.length; m++) {
-      const sliceWidth = (globalScene.game.canvas.width / 6) / (typeOptions.length + 2);
-      const option = new ModifierOption(sliceWidth * (m + 1) + (sliceWidth * 0.5), -globalScene.game.canvas.height / 12 + optionsYOffset, typeOptions[m]);
+      const sliceWidth = globalScene.game.canvas.width / 6 / (typeOptions.length + 2);
+      const option = new ModifierOption(
+        sliceWidth * (m + 1) + sliceWidth * 0.5,
+        -globalScene.game.canvas.height / 12 + optionsYOffset,
+        typeOptions[m],
+      );
       option.setScale(0.5);
       globalScene.add.existing(option);
       this.modifierContainer.add(option);
@@ -215,9 +238,16 @@ export default class ModifierSelectUiHandler extends AwaitableUiHandler {
     for (let m = 0; m < shopTypeOptions.length; m++) {
       const row = m < SHOP_OPTIONS_ROW_LIMIT ? 0 : 1;
       const col = m < SHOP_OPTIONS_ROW_LIMIT ? m : m - SHOP_OPTIONS_ROW_LIMIT;
-      const rowOptions = shopTypeOptions.slice(row ? SHOP_OPTIONS_ROW_LIMIT : 0, row ? undefined : SHOP_OPTIONS_ROW_LIMIT);
-      const sliceWidth = (globalScene.game.canvas.width / 6) / (rowOptions.length + 2);
-      const option = new ModifierOption(sliceWidth * (col + 1) + (sliceWidth * 0.5), ((-globalScene.game.canvas.height / 12) - (globalScene.game.canvas.height / 32) - (42 - (28 * row - 1))), shopTypeOptions[m]);
+      const rowOptions = shopTypeOptions.slice(
+        row ? SHOP_OPTIONS_ROW_LIMIT : 0,
+        row ? undefined : SHOP_OPTIONS_ROW_LIMIT,
+      );
+      const sliceWidth = globalScene.game.canvas.width / 6 / (rowOptions.length + 2);
+      const option = new ModifierOption(
+        sliceWidth * (col + 1) + sliceWidth * 0.5,
+        -globalScene.game.canvas.height / 12 - globalScene.game.canvas.height / 32 - (42 - (28 * row - 1)),
+        shopTypeOptions[m],
+      );
       option.setScale(0.375);
       globalScene.add.existing(option);
       this.modifierContainer.add(option);
@@ -249,10 +279,13 @@ export default class ModifierSelectUiHandler extends AwaitableUiHandler {
         const index = Math.floor(value * typeOptions.length);
         if (index > i && index <= typeOptions.length) {
           const option = this.options[i];
-          option?.show(Math.floor((1 - value) * 1250) * 0.325 + 2000 * maxUpgradeCount, -(maxUpgradeCount - typeOptions[i].upgradeCount));
+          option?.show(
+            Math.floor((1 - value) * 1250) * 0.325 + 2000 * maxUpgradeCount,
+            -(maxUpgradeCount - typeOptions[i].upgradeCount),
+          );
           i++;
         }
-      }
+      },
     });
 
     globalScene.time.delayedCall(1000 + maxUpgradeCount * 2000, () => {
@@ -268,7 +301,7 @@ export default class ModifierSelectUiHandler extends AwaitableUiHandler {
         globalScene.tweens.add({
           targets: this.transferButtonContainer,
           alpha: 1,
-          duration: 250
+          duration: 250,
         });
       }
 
@@ -282,22 +315,22 @@ export default class ModifierSelectUiHandler extends AwaitableUiHandler {
       this.lockRarityButtonContainer.setVisible(canLockRarities);
 
       globalScene.tweens.add({
-        targets: [ this.checkButtonContainer, this.continueButtonContainer ],
+        targets: [this.checkButtonContainer, this.continueButtonContainer],
         alpha: 1,
-        duration: 250
+        duration: 250,
       });
 
       globalScene.tweens.add({
-        targets: [ this.rerollButtonContainer, this.lockRarityButtonContainer ],
+        targets: [this.rerollButtonContainer, this.lockRarityButtonContainer],
         alpha: this.rerollCost < 0 ? 0.5 : 1,
-        duration: 250
+        duration: 250,
       });
 
       const updateCursorTarget = () => {
         if (globalScene.shopCursorTarget === ShopCursorTarget.CHECK_TEAM) {
           this.setRowCursor(0);
           this.setCursor(2);
-        } else if ((globalScene.shopCursorTarget === ShopCursorTarget.SHOP) && globalScene.gameMode.hasNoShop) {
+        } else if (globalScene.shopCursorTarget === ShopCursorTarget.SHOP && globalScene.gameMode.hasNoShop) {
           this.setRowCursor(ShopCursorTarget.REWARDS);
           this.setCursor(0);
         } else {
@@ -308,7 +341,7 @@ export default class ModifierSelectUiHandler extends AwaitableUiHandler {
 
       updateCursorTarget();
 
-      handleTutorial(Tutorial.Select_Item).then((res) => {
+      handleTutorial(Tutorial.Select_Item).then(res => {
         if (res) {
           updateCursorTarget();
         }
@@ -469,7 +502,8 @@ export default class ModifierSelectUiHandler extends AwaitableUiHandler {
       this.modifierContainer.add(this.cursorObj);
     }
 
-    const options = (this.rowCursor === 1 ? this.options : this.shopOptionsRows[this.shopOptionsRows.length - (this.rowCursor - 1)]);
+    const options =
+      this.rowCursor === 1 ? this.options : this.shopOptionsRows[this.shopOptionsRows.length - (this.rowCursor - 1)];
 
     this.cursorObj.setScale(this.rowCursor === 1 ? 2 : this.rowCursor >= 2 ? 1.5 : 1);
 
@@ -479,18 +513,31 @@ export default class ModifierSelectUiHandler extends AwaitableUiHandler {
       if (this.rowCursor === 1 && options.length === 0) {
         // Continue button when no shop items
         this.cursorObj.setScale(1.25);
-        this.cursorObj.setPosition((globalScene.game.canvas.width / 18) + 23, (-globalScene.game.canvas.height / 12) - (this.shopOptionsRows.length > 1 ? SINGLE_SHOP_ROW_YOFFSET - 2 : DOUBLE_SHOP_ROW_YOFFSET - 2));
+        this.cursorObj.setPosition(
+          globalScene.game.canvas.width / 18 + 23,
+          -globalScene.game.canvas.height / 12 -
+            (this.shopOptionsRows.length > 1 ? SINGLE_SHOP_ROW_YOFFSET - 2 : DOUBLE_SHOP_ROW_YOFFSET - 2),
+        );
         ui.showText(i18next.t("modifierSelectUiHandler:continueNextWaveDescription"));
         return ret;
       }
 
-      const sliceWidth = (globalScene.game.canvas.width / 6) / (options.length + 2);
+      const sliceWidth = globalScene.game.canvas.width / 6 / (options.length + 2);
       if (this.rowCursor < 2) {
         // Cursor on free items
-        this.cursorObj.setPosition(sliceWidth * (cursor + 1) + (sliceWidth * 0.5) - 20, (-globalScene.game.canvas.height / 12) - (this.shopOptionsRows.length > 1 ? SINGLE_SHOP_ROW_YOFFSET - 2 : DOUBLE_SHOP_ROW_YOFFSET - 2));
+        this.cursorObj.setPosition(
+          sliceWidth * (cursor + 1) + sliceWidth * 0.5 - 20,
+          -globalScene.game.canvas.height / 12 -
+            (this.shopOptionsRows.length > 1 ? SINGLE_SHOP_ROW_YOFFSET - 2 : DOUBLE_SHOP_ROW_YOFFSET - 2),
+        );
       } else {
         // Cursor on paying items
-        this.cursorObj.setPosition(sliceWidth * (cursor + 1) + (sliceWidth * 0.5) - 16, (-globalScene.game.canvas.height / 12 - globalScene.game.canvas.height / 32) - (-14 + 28 * (this.rowCursor - (this.shopOptionsRows.length - 1))));
+        this.cursorObj.setPosition(
+          sliceWidth * (cursor + 1) + sliceWidth * 0.5 - 16,
+          -globalScene.game.canvas.height / 12 -
+            globalScene.game.canvas.height / 32 -
+            (-14 + 28 * (this.rowCursor - (this.shopOptionsRows.length - 1))),
+        );
       }
 
       const type = options[this.cursor].modifierTypeOption.type;
@@ -500,13 +547,22 @@ export default class ModifierSelectUiHandler extends AwaitableUiHandler {
         this.moveInfoOverlay.show(allMoves[type.moveId]);
       }
     } else if (cursor === 0) {
-      this.cursorObj.setPosition(6, this.lockRarityButtonContainer.visible ? OPTION_BUTTON_YPOSITION - 8 : OPTION_BUTTON_YPOSITION + 4);
+      this.cursorObj.setPosition(
+        6,
+        this.lockRarityButtonContainer.visible ? OPTION_BUTTON_YPOSITION - 8 : OPTION_BUTTON_YPOSITION + 4,
+      );
       ui.showText(i18next.t("modifierSelectUiHandler:rerollDesc"));
     } else if (cursor === 1) {
-      this.cursorObj.setPosition((globalScene.game.canvas.width - this.transferButtonWidth - this.checkButtonWidth) / 6 - 30, OPTION_BUTTON_YPOSITION + 4);
+      this.cursorObj.setPosition(
+        (globalScene.game.canvas.width - this.transferButtonWidth - this.checkButtonWidth) / 6 - 30,
+        OPTION_BUTTON_YPOSITION + 4,
+      );
       ui.showText(i18next.t("modifierSelectUiHandler:transferDesc"));
     } else if (cursor === 2) {
-      this.cursorObj.setPosition((globalScene.game.canvas.width - this.checkButtonWidth) / 6 - 10, OPTION_BUTTON_YPOSITION + 4);
+      this.cursorObj.setPosition(
+        (globalScene.game.canvas.width - this.checkButtonWidth) / 6 - 10,
+        OPTION_BUTTON_YPOSITION + 4,
+      );
       ui.showText(i18next.t("modifierSelectUiHandler:checkTeamDesc"));
     } else {
       this.cursorObj.setPosition(6, OPTION_BUTTON_YPOSITION + 4);
@@ -521,7 +577,9 @@ export default class ModifierSelectUiHandler extends AwaitableUiHandler {
 
     if (rowCursor !== lastRowCursor) {
       this.rowCursor = rowCursor;
-      let newCursor = Math.round(this.cursor / Math.max(this.getRowItems(lastRowCursor) - 1, 1) * (this.getRowItems(rowCursor) - 1));
+      let newCursor = Math.round(
+        (this.cursor / Math.max(this.getRowItems(lastRowCursor) - 1, 1)) * (this.getRowItems(rowCursor) - 1),
+      );
       if (rowCursor === 1 && this.options.length === 0) {
         // Handle empty shop
         newCursor = 0;
@@ -582,12 +640,11 @@ export default class ModifierSelectUiHandler extends AwaitableUiHandler {
     if (rerollDisabled) {
       this.rerollCostText.setVisible(false);
       return;
-    } else {
-      this.rerollCostText.setVisible(true);
     }
+    this.rerollCostText.setVisible(true);
     const canReroll = globalScene.money >= this.rerollCost;
 
-    const formattedMoney = Utils.formatMoney(globalScene.moneyFormat, this.rerollCost);
+    const formattedMoney = formatMoney(globalScene.moneyFormat, this.rerollCost);
 
     this.rerollCostText.setText(i18next.t("modifierSelectUiHandler:rerollCost", { formattedMoney }));
     this.rerollCostText.setColor(this.getTextColor(canReroll ? TextStyle.MONEY : TextStyle.PARTY_RED));
@@ -630,10 +687,16 @@ export default class ModifierSelectUiHandler extends AwaitableUiHandler {
       scale: 0.01,
       duration: 250,
       ease: "Cubic.easeIn",
-      onComplete: () => options.forEach(o => o.destroy())
+      onComplete: () => options.forEach(o => o.destroy()),
     });
 
-    [ this.rerollButtonContainer, this.checkButtonContainer, this.transferButtonContainer, this.lockRarityButtonContainer, this.continueButtonContainer ].forEach(container => {
+    [
+      this.rerollButtonContainer,
+      this.checkButtonContainer,
+      this.transferButtonContainer,
+      this.lockRarityButtonContainer,
+      this.continueButtonContainer,
+    ].forEach(container => {
       if (container.visible) {
         globalScene.tweens.add({
           targets: container,
@@ -646,7 +709,7 @@ export default class ModifierSelectUiHandler extends AwaitableUiHandler {
             } else {
               container.setAlpha(1);
             }
-          }
+          },
         });
       }
     });
@@ -716,11 +779,15 @@ class ModifierOption extends Phaser.GameObjects.Container {
     this.itemText = addTextObject(0, 35, this.modifierTypeOption.type?.name!, TextStyle.PARTY, { align: "center" }); // TODO: is this bang correct?
     this.itemText.setOrigin(0.5, 0);
     this.itemText.setAlpha(0);
-    this.itemText.setTint(this.modifierTypeOption.type?.tier ? getModifierTierTextTint(this.modifierTypeOption.type?.tier) : undefined);
+    this.itemText.setTint(
+      this.modifierTypeOption.type?.tier ? getModifierTierTextTint(this.modifierTypeOption.type?.tier) : undefined,
+    );
     this.add(this.itemText);
 
     if (this.modifierTypeOption.cost) {
-      this.itemCostText = addTextObject(0, 45, "", TextStyle.MONEY, { align: "center" });
+      this.itemCostText = addTextObject(0, 45, "", TextStyle.MONEY, {
+        align: "center",
+      });
 
       this.itemCostText.setOrigin(0.5, 0);
       this.itemCostText.setAlpha(0);
@@ -736,7 +803,7 @@ class ModifierOption extends Phaser.GameObjects.Container {
         targets: this.pb,
         y: 0,
         duration: 1250,
-        ease: "Bounce.Out"
+        ease: "Bounce.Out",
       });
 
       let lastValue = 1;
@@ -754,42 +821,52 @@ class ModifierOption extends Phaser.GameObjects.Container {
           }
           const value = t.getValue();
           if (!bounce && value > lastValue) {
-            globalScene.playSound("se/pb_bounce_1", { volume: 1 / ++bounceCount });
+            globalScene.playSound("se/pb_bounce_1", {
+              volume: 1 / ++bounceCount,
+            });
             bounce = true;
           } else if (bounce && value < lastValue) {
             bounce = false;
           }
           lastValue = value;
-        }
+        },
       });
 
       for (let u = 0; u < this.modifierTypeOption.upgradeCount; u++) {
         const upgradeIndex = u;
-        globalScene.time.delayedCall(remainingDuration - 2000 * (this.modifierTypeOption.upgradeCount - (upgradeIndex + 1 + upgradeCountOffset)), () => {
-          globalScene.playSound("se/upgrade", { rate: 1 + 0.25 * upgradeIndex });
-          this.pbTint.setPosition(this.pb.x, this.pb.y);
-          this.pbTint.setTintFill(0xFFFFFF);
-          this.pbTint.setAlpha(0);
-          this.pbTint.setVisible(true);
-          globalScene.tweens.add({
-            targets: this.pbTint,
-            alpha: 1,
-            duration: 1000,
-            ease: "Sine.easeIn",
-            onComplete: () => {
-              this.pb.setTexture("pb", this.getPbAtlasKey(-this.modifierTypeOption.upgradeCount + (upgradeIndex + 1)));
-              globalScene.tweens.add({
-                targets: this.pbTint,
-                alpha: 0,
-                duration: 750,
-                ease: "Sine.easeOut",
-                onComplete: () => {
-                  this.pbTint.setVisible(false);
-                }
-              });
-            }
-          });
-        });
+        globalScene.time.delayedCall(
+          remainingDuration - 2000 * (this.modifierTypeOption.upgradeCount - (upgradeIndex + 1 + upgradeCountOffset)),
+          () => {
+            globalScene.playSound("se/upgrade", {
+              rate: 1 + 0.25 * upgradeIndex,
+            });
+            this.pbTint.setPosition(this.pb.x, this.pb.y);
+            this.pbTint.setTintFill(0xffffff);
+            this.pbTint.setAlpha(0);
+            this.pbTint.setVisible(true);
+            globalScene.tweens.add({
+              targets: this.pbTint,
+              alpha: 1,
+              duration: 1000,
+              ease: "Sine.easeIn",
+              onComplete: () => {
+                this.pb.setTexture(
+                  "pb",
+                  this.getPbAtlasKey(-this.modifierTypeOption.upgradeCount + (upgradeIndex + 1)),
+                );
+                globalScene.tweens.add({
+                  targets: this.pbTint,
+                  alpha: 0,
+                  duration: 750,
+                  ease: "Sine.easeOut",
+                  onComplete: () => {
+                    this.pbTint.setVisible(false);
+                  },
+                });
+              },
+            });
+          },
+        );
       }
     }
 
@@ -808,7 +885,7 @@ class ModifierOption extends Phaser.GameObjects.Container {
           delay: 250,
           ease: "Sine.easeIn",
           alpha: 0,
-          onComplete: () => this.pb.destroy()
+          onComplete: () => this.pb.destroy(),
         });
       }
 
@@ -817,7 +894,7 @@ class ModifierOption extends Phaser.GameObjects.Container {
         duration: 500,
         ease: "Elastic.Out",
         scale: 2,
-        alpha: 1
+        alpha: 1,
       });
       if (!this.modifierTypeOption.cost) {
         globalScene.tweens.add({
@@ -825,7 +902,7 @@ class ModifierOption extends Phaser.GameObjects.Container {
           alpha: 0,
           duration: 500,
           ease: "Sine.easeIn",
-          onComplete: () => this.itemTint.destroy()
+          onComplete: () => this.itemTint.destroy(),
         });
       }
       globalScene.tweens.add({
@@ -833,7 +910,7 @@ class ModifierOption extends Phaser.GameObjects.Container {
         duration: 500,
         alpha: 1,
         y: 25,
-        ease: "Cubic.easeInOut"
+        ease: "Cubic.easeInOut",
       });
       if (this.itemCostText) {
         globalScene.tweens.add({
@@ -841,13 +918,13 @@ class ModifierOption extends Phaser.GameObjects.Container {
           duration: 500,
           alpha: 1,
           y: 35,
-          ease: "Cubic.easeInOut"
+          ease: "Cubic.easeInOut",
         });
       }
     });
   }
 
-  getPbAtlasKey(tierOffset: number = 0) {
+  getPbAtlasKey(tierOffset = 0) {
     return getPokeballAtlasKey((this.modifierTypeOption.type?.tier! + tierOffset) as number as PokeballType); // TODO: is this bang correct?
   }
 
@@ -855,7 +932,7 @@ class ModifierOption extends Phaser.GameObjects.Container {
     const cost = Overrides.WAIVE_ROLL_FEE_OVERRIDE ? 0 : this.modifierTypeOption.cost;
     const textStyle = cost <= globalScene.money ? TextStyle.MONEY : TextStyle.PARTY_RED;
 
-    const formattedMoney = Utils.formatMoney(globalScene.moneyFormat, cost);
+    const formattedMoney = formatMoney(globalScene.moneyFormat, cost);
 
     this.itemCostText.setText(i18next.t("modifierSelectUiHandler:itemCost", { formattedMoney }));
     this.itemCostText.setColor(getTextColor(textStyle, false, globalScene.uiTheme));
diff --git a/src/ui/move-info-overlay.ts b/src/ui/move-info-overlay.ts
index 5b3b30b14dd..2b230d609fd 100644
--- a/src/ui/move-info-overlay.ts
+++ b/src/ui/move-info-overlay.ts
@@ -2,26 +2,26 @@ import type { InfoToggle } from "#app/battle-scene";
 import { globalScene } from "#app/global-scene";
 import { TextStyle, addTextObject } from "./text";
 import { addWindow } from "./ui-theme";
-import * as Utils from "../utils";
-import type Move from "../data/move";
-import { MoveCategory } from "../data/move";
-import { Type } from "#enums/type";
+import { getLocalizedSpriteKey, fixedInt } from "#app/utils/common";
+import type Move from "../data/moves/move";
+import { MoveCategory } from "#enums/MoveCategory";
+import { PokemonType } from "#enums/pokemon-type";
 import i18next from "i18next";
 
 export interface MoveInfoOverlaySettings {
-    delayVisibility?: boolean; // if true, showing the overlay will only set it to active and populate the fields and the handler using this field has to manually call setVisible later.
-    scale?:number; // scale the box? A scale of 0.5 is recommended
-    top?: boolean; // should the effect box be on top?
-    right?: boolean; // should the effect box be on the right?
-    onSide?: boolean; // should the effect be on the side? ignores top argument if true
-    //location and width of the component; unaffected by scaling
-    x?: number;
-    y?: number;
-    /** Default is always half the screen, regardless of scale */
-    width?: number;
-    /** Determines whether to display the small secondary box */
-    hideEffectBox?: boolean;
-    hideBg?: boolean;
+  delayVisibility?: boolean; // if true, showing the overlay will only set it to active and populate the fields and the handler using this field has to manually call setVisible later.
+  scale?: number; // scale the box? A scale of 0.5 is recommended
+  top?: boolean; // should the effect box be on top?
+  right?: boolean; // should the effect box be on the right?
+  onSide?: boolean; // should the effect be on the side? ignores top argument if true
+  //location and width of the component; unaffected by scaling
+  x?: number;
+  y?: number;
+  /** Default is always half the screen, regardless of scale */
+  width?: number;
+  /** Determines whether to display the small secondary box */
+  hideEffectBox?: boolean;
+  hideBg?: boolean;
 }
 
 const EFF_HEIGHT = 48;
@@ -31,22 +31,22 @@ const BORDER = 8;
 const GLOBAL_SCALE = 6;
 
 export default class MoveInfoOverlay extends Phaser.GameObjects.Container implements InfoToggle {
-  public active: boolean = false;
+  public active = false;
 
   private move: Move;
 
   private desc: Phaser.GameObjects.Text;
-  private descScroll : Phaser.Tweens.Tween | null = null;
+  private descScroll: Phaser.Tweens.Tween | null = null;
 
   private val: Phaser.GameObjects.Container;
-  private pp:  Phaser.GameObjects.Text;
+  private pp: Phaser.GameObjects.Text;
   private pow: Phaser.GameObjects.Text;
   private acc: Phaser.GameObjects.Text;
   private typ: Phaser.GameObjects.Sprite;
   private cat: Phaser.GameObjects.Sprite;
   private descBg: Phaser.GameObjects.NineSlice;
 
-  private options : MoveInfoOverlaySettings;
+  private options: MoveInfoOverlaySettings;
 
   constructor(options?: MoveInfoOverlaySettings) {
     if (options?.onSide) {
@@ -59,18 +59,33 @@ export default class MoveInfoOverlay extends Phaser.GameObjects.Container implem
 
     // prepare the description box
     const width = (options?.width || MoveInfoOverlay.getWidth(scale)) / scale; // divide by scale as we always want this to be half a window wide
-    this.descBg = addWindow( (options?.onSide && !options?.right ? EFF_WIDTH : 0), options?.top ? EFF_HEIGHT : 0, width - (options?.onSide ? EFF_WIDTH : 0), DESC_HEIGHT);
+    this.descBg = addWindow(
+      options?.onSide && !options?.right ? EFF_WIDTH : 0,
+      options?.top ? EFF_HEIGHT : 0,
+      width - (options?.onSide ? EFF_WIDTH : 0),
+      DESC_HEIGHT,
+    );
     this.descBg.setOrigin(0, 0);
     this.add(this.descBg);
 
     // set up the description; wordWrap uses true pixels, unaffected by any scaling, while other values are affected
-    this.desc = addTextObject((options?.onSide && !options?.right ? EFF_WIDTH : 0) + BORDER, (options?.top ? EFF_HEIGHT : 0) + BORDER - 2, "", TextStyle.BATTLE_INFO, { wordWrap: { width: (width - (BORDER - 2) * 2 - (options?.onSide ? EFF_WIDTH : 0)) * GLOBAL_SCALE }});
+    this.desc = addTextObject(
+      (options?.onSide && !options?.right ? EFF_WIDTH : 0) + BORDER,
+      (options?.top ? EFF_HEIGHT : 0) + BORDER - 2,
+      "",
+      TextStyle.BATTLE_INFO,
+      {
+        wordWrap: {
+          width: (width - (BORDER - 2) * 2 - (options?.onSide ? EFF_WIDTH : 0)) * GLOBAL_SCALE,
+        },
+      },
+    );
     this.desc.setLineSpacing(i18next.resolvedLanguage === "ja" ? 25 : 5);
 
     // limit the text rendering, required for scrolling later on
     const maskPointOrigin = {
-      x: (options?.x || 0),
-      y: (options?.y || 0),
+      x: options?.x || 0,
+      y: options?.y || 0,
     };
     if (maskPointOrigin.x < 0) {
       maskPointOrigin.x += globalScene.game.canvas.width / GLOBAL_SCALE;
@@ -80,10 +95,13 @@ export default class MoveInfoOverlay extends Phaser.GameObjects.Container implem
     }
 
     const moveDescriptionTextMaskRect = globalScene.make.graphics();
-    moveDescriptionTextMaskRect.fillStyle(0xFF0000);
+    moveDescriptionTextMaskRect.fillStyle(0xff0000);
     moveDescriptionTextMaskRect.fillRect(
-      maskPointOrigin.x + ((options?.onSide && !options?.right ? EFF_WIDTH : 0) + BORDER) * scale, maskPointOrigin.y + ((options?.top ? EFF_HEIGHT : 0) + BORDER - 2) * scale,
-      width - ((options?.onSide ? EFF_WIDTH : 0) - BORDER * 2) * scale, (DESC_HEIGHT - (BORDER - 2) * 2) * scale);
+      maskPointOrigin.x + ((options?.onSide && !options?.right ? EFF_WIDTH : 0) + BORDER) * scale,
+      maskPointOrigin.y + ((options?.top ? EFF_HEIGHT : 0) + BORDER - 2) * scale,
+      width - ((options?.onSide ? EFF_WIDTH : 0) - BORDER * 2) * scale,
+      (DESC_HEIGHT - (BORDER - 2) * 2) * scale,
+    );
     moveDescriptionTextMaskRect.setScale(6);
     const moveDescriptionTextMask = this.createGeometryMask(moveDescriptionTextMaskRect);
 
@@ -91,14 +109,18 @@ export default class MoveInfoOverlay extends Phaser.GameObjects.Container implem
     this.desc.setMask(moveDescriptionTextMask);
 
     // prepare the effect box
-    this.val = new Phaser.GameObjects.Container(globalScene, options?.right ? width - EFF_WIDTH : 0,  options?.top || options?.onSide ? 0 : DESC_HEIGHT);
+    this.val = new Phaser.GameObjects.Container(
+      globalScene,
+      options?.right ? width - EFF_WIDTH : 0,
+      options?.top || options?.onSide ? 0 : DESC_HEIGHT,
+    );
     this.add(this.val);
 
     const valuesBg = addWindow(0, 0, EFF_WIDTH, EFF_HEIGHT);
     valuesBg.setOrigin(0, 0);
     this.val.add(valuesBg);
 
-    this.typ = globalScene.add.sprite(25, EFF_HEIGHT - 35, Utils.getLocalizedSpriteKey("types"), "unknown");
+    this.typ = globalScene.add.sprite(25, EFF_HEIGHT - 35, getLocalizedSpriteKey("types"), "unknown");
     this.typ.setScale(0.8);
     this.val.add(this.typ);
 
@@ -145,7 +167,7 @@ export default class MoveInfoOverlay extends Phaser.GameObjects.Container implem
   }
 
   // show this component with infos for the specific move
-  show(move : Move):boolean {
+  show(move: Move): boolean {
     if (!globalScene.enableMoveInfo) {
       return false; // move infos have been disabled // TODO:: is `false` correct? i used to be `undeefined`
     }
@@ -153,7 +175,7 @@ export default class MoveInfoOverlay extends Phaser.GameObjects.Container implem
     this.pow.setText(move.power >= 0 ? move.power.toString() : "---");
     this.acc.setText(move.accuracy >= 0 ? move.accuracy.toString() : "---");
     this.pp.setText(move.pp >= 0 ? move.pp.toString() : "---");
-    this.typ.setTexture(Utils.getLocalizedSpriteKey("types"), Type[move.type].toLowerCase());
+    this.typ.setTexture(getLocalizedSpriteKey("types"), PokemonType[move.type].toLowerCase());
     this.cat.setFrame(MoveCategory[move.category].toLowerCase());
 
     this.desc.setText(move?.effect || "");
@@ -166,16 +188,16 @@ export default class MoveInfoOverlay extends Phaser.GameObjects.Container implem
     }
 
     // determine if we need to add new scrolling effects
-    const moveDescriptionLineCount = Math.floor(this.desc.displayHeight * (96 / 72) / 14.83);
+    const moveDescriptionLineCount = Math.floor((this.desc.displayHeight * (96 / 72)) / 14.83);
     if (moveDescriptionLineCount > 3) {
       // generate scrolling effects
       this.descScroll = globalScene.tweens.add({
         targets: this.desc,
-        delay: Utils.fixedInt(2000),
+        delay: fixedInt(2000),
         loop: -1,
-        hold: Utils.fixedInt(2000),
-        duration: Utils.fixedInt((moveDescriptionLineCount - 3) * 2000),
-        y: `-=${14.83 * (72 / 96) * (moveDescriptionLineCount - 3)}`
+        hold: fixedInt(2000),
+        duration: fixedInt((moveDescriptionLineCount - 3) * 2000),
+        y: `-=${14.83 * (72 / 96) * (moveDescriptionLineCount - 3)}`,
       });
     }
 
@@ -197,9 +219,9 @@ export default class MoveInfoOverlay extends Phaser.GameObjects.Container implem
     }
     globalScene.tweens.add({
       targets: this.desc,
-      duration: Utils.fixedInt(125),
+      duration: fixedInt(125),
       ease: "Sine.easeInOut",
-      alpha: visible ? 1 : 0
+      alpha: visible ? 1 : 0,
     });
     if (!visible) {
       this.setVisible(false);
@@ -211,12 +233,12 @@ export default class MoveInfoOverlay extends Phaser.GameObjects.Container implem
   }
 
   // width of this element
-  static getWidth(scale:number):number {
+  static getWidth(_scale: number): number {
     return globalScene.game.canvas.width / GLOBAL_SCALE / 2;
   }
 
   // height of this element
-  static getHeight(scale:number, onSide?: boolean):number {
-    return (onSide ? Math.max(EFF_HEIGHT, DESC_HEIGHT) : (EFF_HEIGHT + DESC_HEIGHT)) * scale;
+  static getHeight(scale: number, onSide?: boolean): number {
+    return (onSide ? Math.max(EFF_HEIGHT, DESC_HEIGHT) : EFF_HEIGHT + DESC_HEIGHT) * scale;
   }
 }
diff --git a/src/ui/mystery-encounter-ui-handler.ts b/src/ui/mystery-encounter-ui-handler.ts
index 383f4ab73d3..0866ed8788e 100644
--- a/src/ui/mystery-encounter-ui-handler.ts
+++ b/src/ui/mystery-encounter-ui-handler.ts
@@ -1,13 +1,12 @@
 import { addBBCodeTextObject, getBBCodeFrag, TextStyle } from "./text";
-import { Mode } from "./ui";
+import { UiMode } from "#enums/ui-mode";
 import UiHandler from "./ui-handler";
 import { Button } from "#enums/buttons";
 import { addWindow, WindowVariant } from "./ui-theme";
 import type { MysteryEncounterPhase } from "../phases/mystery-encounter-phases";
 import { PartyUiMode } from "./party-ui-handler";
 import type MysteryEncounterOption from "#app/data/mystery-encounters/mystery-encounter-option";
-import * as Utils from "../utils";
-import { isNullOrUndefined } from "../utils";
+import { fixedInt, isNullOrUndefined } from "#app/utils/common";
 import { getPokeballAtlasKey } from "../data/pokeball";
 import type { OptionSelectSettings } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
 import { getEncounterText } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils";
@@ -36,19 +35,19 @@ export default class MysteryEncounterUiHandler extends UiHandler {
 
   private dexProgressWindow: Phaser.GameObjects.NineSlice;
   private dexProgressContainer: Phaser.GameObjects.Container;
-  private showDexProgress: boolean = false;
+  private showDexProgress = false;
 
   private overrideSettings?: OptionSelectSettings;
   private encounterOptions: MysteryEncounterOption[] = [];
   private optionsMeetsReqs: boolean[];
 
-  protected viewPartyIndex: number = 0;
-  protected viewPartyXPosition: number = 0;
+  protected viewPartyIndex = 0;
+  protected viewPartyXPosition = 0;
 
-  protected blockInput: boolean = true;
+  protected blockInput = true;
 
   constructor() {
-    super(Mode.MYSTERY_ENCOUNTER);
+    super(UiMode.MYSTERY_ENCOUNTER);
   }
 
   override setup() {
@@ -86,7 +85,7 @@ export default class MysteryEncounterUiHandler extends UiHandler {
     this.descriptionContainer.add(this.rarityBall);
 
     const dexProgressIndicator = globalScene.add.sprite(12, 10, "encounter_radar");
-    dexProgressIndicator.setScale(0.80);
+    dexProgressIndicator.setScale(0.8);
     this.dexProgressContainer.add(dexProgressIndicator);
     this.dexProgressContainer.setInteractive(new Phaser.Geom.Rectangle(0, 0, 24, 28), Phaser.Geom.Rectangle.Contains);
   }
@@ -94,9 +93,13 @@ export default class MysteryEncounterUiHandler extends UiHandler {
   override show(args: any[]): boolean {
     super.show(args);
 
-    this.overrideSettings = args[0] as OptionSelectSettings ?? {};
-    const showDescriptionContainer = isNullOrUndefined(this.overrideSettings?.hideDescription) ? true : !this.overrideSettings.hideDescription;
-    const slideInDescription = isNullOrUndefined(this.overrideSettings?.slideInDescription) ? true : this.overrideSettings.slideInDescription;
+    this.overrideSettings = (args[0] as OptionSelectSettings) ?? {};
+    const showDescriptionContainer = isNullOrUndefined(this.overrideSettings?.hideDescription)
+      ? true
+      : !this.overrideSettings.hideDescription;
+    const slideInDescription = isNullOrUndefined(this.overrideSettings?.slideInDescription)
+      ? true
+      : this.overrideSettings.slideInDescription;
     const startingCursorIndex = this.overrideSettings?.startingCursorIndex ?? 0;
 
     this.cursorContainer.setVisible(true);
@@ -136,16 +139,21 @@ export default class MysteryEncounterUiHandler extends UiHandler {
           success = true;
           const overrideSettings: OptionSelectSettings = {
             ...this.overrideSettings,
-            slideInDescription: false
+            slideInDescription: false,
           };
-          globalScene.ui.setMode(Mode.PARTY, PartyUiMode.CHECK, -1, () => {
-            globalScene.ui.setMode(Mode.MYSTERY_ENCOUNTER, overrideSettings);
+          globalScene.ui.setMode(UiMode.PARTY, PartyUiMode.CHECK, -1, () => {
+            globalScene.ui.setMode(UiMode.MYSTERY_ENCOUNTER, overrideSettings);
             setTimeout(() => {
               this.setCursor(this.viewPartyIndex);
               this.unblockInput();
             }, 300);
           });
-        } else if (this.blockInput || (!this.optionsMeetsReqs[cursor] && (selected.optionMode === MysteryEncounterOptionMode.DISABLED_OR_DEFAULT || selected.optionMode === MysteryEncounterOptionMode.DISABLED_OR_SPECIAL))) {
+        } else if (
+          this.blockInput ||
+          (!this.optionsMeetsReqs[cursor] &&
+            (selected.optionMode === MysteryEncounterOptionMode.DISABLED_OR_DEFAULT ||
+              selected.optionMode === MysteryEncounterOptionMode.DISABLED_OR_SPECIAL))
+        ) {
           success = false;
         } else {
           if ((globalScene.getCurrentPhase() as MysteryEncounterPhase).handleOptionSelect(selected, cursor)) {
@@ -159,6 +167,7 @@ export default class MysteryEncounterUiHandler extends UiHandler {
       }
     } else {
       switch (this.optionsContainer.getAll()?.length) {
+        // biome-ignore lint/suspicious/useDefaultSwitchClauseLast: Default shares logic with case 3 and it makes more sense for the statements to be ordered by the case value
         default:
         case 3:
           success = this.handleTwoOptionMoveInput(button);
@@ -293,7 +302,11 @@ export default class MysteryEncounterUiHandler extends UiHandler {
       this.blockInput = false;
       for (let i = 0; i < this.optionsContainer.length - 1; i++) {
         const optionMode = this.encounterOptions[i].optionMode;
-        if (!this.optionsMeetsReqs[i] && (optionMode === MysteryEncounterOptionMode.DISABLED_OR_DEFAULT || optionMode === MysteryEncounterOptionMode.DISABLED_OR_SPECIAL)) {
+        if (
+          !this.optionsMeetsReqs[i] &&
+          (optionMode === MysteryEncounterOptionMode.DISABLED_OR_DEFAULT ||
+            optionMode === MysteryEncounterOptionMode.DISABLED_OR_SPECIAL)
+        ) {
           continue;
         }
         (this.optionsContainer.getAt(i) as Phaser.GameObjects.Text).setAlpha(1);
@@ -321,26 +334,38 @@ export default class MysteryEncounterUiHandler extends UiHandler {
 
     if (cursor === this.viewPartyIndex) {
       this.cursorObj.setPosition(this.viewPartyXPosition, -17);
-    } else if (this.optionsContainer.getAll()?.length === 3) { // 2 Options
+    } else if (this.optionsContainer.getAll()?.length === 3) {
+      // 2 Options
       this.cursorObj.setPosition(-10.5 + (cursor % 2 === 1 ? 100 : 0), 15);
-    } else if (this.optionsContainer.getAll()?.length === 4) { // 3 Options
+    } else if (this.optionsContainer.getAll()?.length === 4) {
+      // 3 Options
       this.cursorObj.setPosition(-10.5 + (cursor % 2 === 1 ? 100 : 0), 7 + (cursor > 1 ? 16 : 0));
-    } else if (this.optionsContainer.getAll()?.length === 5) { // 4 Options
+    } else if (this.optionsContainer.getAll()?.length === 5) {
+      // 4 Options
       this.cursorObj.setPosition(-10.5 + (cursor % 2 === 1 ? 100 : 0), 7 + (cursor > 1 ? 16 : 0));
     }
 
     return changed;
   }
 
-  displayEncounterOptions(slideInDescription: boolean = true): void {
+  displayEncounterOptions(slideInDescription = true): void {
     this.getUi().clearText();
     const mysteryEncounter = globalScene.currentBattle.mysteryEncounter!;
     this.encounterOptions = this.overrideSettings?.overrideOptions ?? mysteryEncounter.options;
     this.optionsMeetsReqs = [];
 
-    const titleText: string | null = getEncounterText(mysteryEncounter.dialogue.encounterOptionsDialogue?.title, TextStyle.TOOLTIP_TITLE);
-    const descriptionText: string | null = getEncounterText(mysteryEncounter.dialogue.encounterOptionsDialogue?.description, TextStyle.TOOLTIP_CONTENT);
-    const queryText: string | null = getEncounterText(mysteryEncounter.dialogue.encounterOptionsDialogue?.query, TextStyle.TOOLTIP_CONTENT);
+    const titleText: string | null = getEncounterText(
+      mysteryEncounter.dialogue.encounterOptionsDialogue?.title,
+      TextStyle.TOOLTIP_TITLE,
+    );
+    const descriptionText: string | null = getEncounterText(
+      mysteryEncounter.dialogue.encounterOptionsDialogue?.description,
+      TextStyle.TOOLTIP_CONTENT,
+    );
+    const queryText: string | null = getEncounterText(
+      mysteryEncounter.dialogue.encounterOptionsDialogue?.query,
+      TextStyle.TOOLTIP_CONTENT,
+    );
 
     // Clear options container (except cursor)
     this.optionsContainer.removeAll(true);
@@ -351,23 +376,41 @@ export default class MysteryEncounterUiHandler extends UiHandler {
 
       let optionText: BBCodeText;
       switch (this.encounterOptions.length) {
+        // biome-ignore lint/suspicious/useDefaultSwitchClauseLast: default shares logic with case 2 and it makes more sense for the statements to be ordered by the case number
         default:
         case 2:
-          optionText = addBBCodeTextObject(i % 2 === 0 ? 0 : 100, 8, "-", TextStyle.WINDOW, { fontSize: "80px", lineSpacing: -8 });
+          optionText = addBBCodeTextObject(i % 2 === 0 ? 0 : 100, 8, "-", TextStyle.WINDOW, {
+            fontSize: "80px",
+            lineSpacing: -8,
+          });
           break;
         case 3:
-          optionText = addBBCodeTextObject(i % 2 === 0 ? 0 : 100, i < 2 ? 0 : 16, "-", TextStyle.WINDOW, { fontSize: "80px", lineSpacing: -8 });
+          optionText = addBBCodeTextObject(i % 2 === 0 ? 0 : 100, i < 2 ? 0 : 16, "-", TextStyle.WINDOW, {
+            fontSize: "80px",
+            lineSpacing: -8,
+          });
           break;
         case 4:
-          optionText = addBBCodeTextObject(i % 2 === 0 ? 0 : 100, i < 2 ? 0 : 16, "-", TextStyle.WINDOW, { fontSize: "80px", lineSpacing: -8 });
+          optionText = addBBCodeTextObject(i % 2 === 0 ? 0 : 100, i < 2 ? 0 : 16, "-", TextStyle.WINDOW, {
+            fontSize: "80px",
+            lineSpacing: -8,
+          });
           break;
       }
 
       this.optionsMeetsReqs.push(option.meetsRequirements());
       const optionDialogue = option.dialogue!;
-      const label = !this.optionsMeetsReqs[i] && optionDialogue.disabledButtonLabel ? optionDialogue.disabledButtonLabel : optionDialogue.buttonLabel;
+      const label =
+        !this.optionsMeetsReqs[i] && optionDialogue.disabledButtonLabel
+          ? optionDialogue.disabledButtonLabel
+          : optionDialogue.buttonLabel;
       let text: string | null;
-      if (option.hasRequirements() && this.optionsMeetsReqs[i] && (option.optionMode === MysteryEncounterOptionMode.DEFAULT_OR_SPECIAL || option.optionMode === MysteryEncounterOptionMode.DISABLED_OR_SPECIAL)) {
+      if (
+        option.hasRequirements() &&
+        this.optionsMeetsReqs[i] &&
+        (option.optionMode === MysteryEncounterOptionMode.DEFAULT_OR_SPECIAL ||
+          option.optionMode === MysteryEncounterOptionMode.DISABLED_OR_SPECIAL)
+      ) {
         // Options with special requirements that are met are automatically colored green
         text = getEncounterText(label, TextStyle.ME_OPTION_SPECIAL);
       } else {
@@ -378,7 +421,11 @@ export default class MysteryEncounterUiHandler extends UiHandler {
         optionText.setText(text);
       }
 
-      if (!this.optionsMeetsReqs[i] && (option.optionMode === MysteryEncounterOptionMode.DISABLED_OR_DEFAULT || option.optionMode === MysteryEncounterOptionMode.DISABLED_OR_SPECIAL)) {
+      if (
+        !this.optionsMeetsReqs[i] &&
+        (option.optionMode === MysteryEncounterOptionMode.DISABLED_OR_DEFAULT ||
+          option.optionMode === MysteryEncounterOptionMode.DISABLED_OR_SPECIAL)
+      ) {
         optionText.setAlpha(0.5);
       }
       if (this.blockInput) {
@@ -389,7 +436,7 @@ export default class MysteryEncounterUiHandler extends UiHandler {
       const nonScrollWidth = 90;
       const optionTextMaskRect = globalScene.make.graphics({});
       optionTextMaskRect.setScale(6);
-      optionTextMaskRect.fillStyle(0xFFFFFF);
+      optionTextMaskRect.fillStyle(0xffffff);
       optionTextMaskRect.beginPath();
       optionTextMaskRect.fillRect(optionText.x + 11, optionText.y + 140, nonScrollWidth, 18);
 
@@ -408,11 +455,11 @@ export default class MysteryEncounterUiHandler extends UiHandler {
       if (optionTextWidth > nonScrollWidth) {
         this.optionScrollTweens[i] = globalScene.tweens.add({
           targets: optionText,
-          delay: Utils.fixedInt(2000),
+          delay: fixedInt(2000),
           loop: -1,
-          hold: Utils.fixedInt(2000),
-          duration: Utils.fixedInt((optionTextWidth - nonScrollWidth) / 15 * 2000),
-          x: `-=${(optionTextWidth - nonScrollWidth)}`
+          hold: fixedInt(2000),
+          duration: fixedInt(((optionTextWidth - nonScrollWidth) / 15) * 2000),
+          x: `-=${optionTextWidth - nonScrollWidth}`,
         });
       }
 
@@ -420,30 +467,47 @@ export default class MysteryEncounterUiHandler extends UiHandler {
     }
 
     // View Party Button
-    const viewPartyText = addBBCodeTextObject((globalScene.game.canvas.width) / 6, -24, getBBCodeFrag(i18next.t("mysteryEncounterMessages:view_party_button"), TextStyle.PARTY), TextStyle.PARTY);
+    const viewPartyText = addBBCodeTextObject(
+      globalScene.game.canvas.width / 6,
+      -24,
+      getBBCodeFrag(i18next.t("mysteryEncounterMessages:view_party_button"), TextStyle.PARTY),
+      TextStyle.PARTY,
+    );
     this.optionsContainer.add(viewPartyText);
-    viewPartyText.x -= (viewPartyText.displayWidth + 16);
+    viewPartyText.x -= viewPartyText.displayWidth + 16;
     this.viewPartyXPosition = viewPartyText.x - 10;
 
     // Description Window
-    const titleTextObject = addBBCodeTextObject(0, 0, titleText ?? "", TextStyle.TOOLTIP_TITLE, { wordWrap: { width: 750 }, align: "center", lineSpacing: -8 });
+    const titleTextObject = addBBCodeTextObject(0, 0, titleText ?? "", TextStyle.TOOLTIP_TITLE, {
+      wordWrap: { width: 750 },
+      align: "center",
+      lineSpacing: -8,
+    });
     this.descriptionContainer.add(titleTextObject);
     titleTextObject.setPosition(72 - titleTextObject.displayWidth / 2, 5.5);
 
     // Rarity of encounter
-    const index = mysteryEncounter.encounterTier === MysteryEncounterTier.COMMON ? 0 :
-      mysteryEncounter.encounterTier === MysteryEncounterTier.GREAT ? 1 :
-        mysteryEncounter.encounterTier === MysteryEncounterTier.ULTRA ? 2 :
-          mysteryEncounter.encounterTier === MysteryEncounterTier.ROGUE ? 3 : 4;
+    const index =
+      mysteryEncounter.encounterTier === MysteryEncounterTier.COMMON
+        ? 0
+        : mysteryEncounter.encounterTier === MysteryEncounterTier.GREAT
+          ? 1
+          : mysteryEncounter.encounterTier === MysteryEncounterTier.ULTRA
+            ? 2
+            : mysteryEncounter.encounterTier === MysteryEncounterTier.ROGUE
+              ? 3
+              : 4;
     const ballType = getPokeballAtlasKey(index);
     this.rarityBall.setTexture("pb", ballType);
 
-    const descriptionTextObject = addBBCodeTextObject(6, 25, descriptionText ?? "", TextStyle.TOOLTIP_CONTENT, { wordWrap: { width: 830 }});
+    const descriptionTextObject = addBBCodeTextObject(6, 25, descriptionText ?? "", TextStyle.TOOLTIP_CONTENT, {
+      wordWrap: { width: 830 },
+    });
 
     // Sets up the mask that hides the description text to give an illusion of scrolling
     const descriptionTextMaskRect = globalScene.make.graphics({});
     descriptionTextMaskRect.setScale(6);
-    descriptionTextMaskRect.fillStyle(0xFFFFFF);
+    descriptionTextMaskRect.fillStyle(0xffffff);
     descriptionTextMaskRect.beginPath();
     descriptionTextMaskRect.fillRect(6, 53, 206, 57);
 
@@ -462,17 +526,19 @@ export default class MysteryEncounterUiHandler extends UiHandler {
     if (descriptionLineCount > 6) {
       this.descriptionScrollTween = globalScene.tweens.add({
         targets: descriptionTextObject,
-        delay: Utils.fixedInt(2000),
+        delay: fixedInt(2000),
         loop: -1,
-        hold: Utils.fixedInt(2000),
-        duration: Utils.fixedInt((descriptionLineCount - 6) * 2000),
-        y: `-=${10 * (descriptionLineCount - 6)}`
+        hold: fixedInt(2000),
+        duration: fixedInt((descriptionLineCount - 6) * 2000),
+        y: `-=${10 * (descriptionLineCount - 6)}`,
       });
     }
 
     this.descriptionContainer.add(descriptionTextObject);
 
-    const queryTextObject = addBBCodeTextObject(0, 0, queryText ?? "", TextStyle.TOOLTIP_CONTENT, { wordWrap: { width: 830 }});
+    const queryTextObject = addBBCodeTextObject(0, 0, queryText ?? "", TextStyle.TOOLTIP_CONTENT, {
+      wordWrap: { width: 830 },
+    });
     this.descriptionContainer.add(queryTextObject);
     queryTextObject.setPosition(75 - queryTextObject.displayWidth / 2, 90);
 
@@ -483,7 +549,7 @@ export default class MysteryEncounterUiHandler extends UiHandler {
         targets: this.descriptionContainer,
         x: "+=150",
         ease: "Sine.easeInOut",
-        duration: 1000
+        duration: 1000,
       });
     }
   }
@@ -510,7 +576,12 @@ export default class MysteryEncounterUiHandler extends UiHandler {
     let text: string | null;
     const cursorOption = this.encounterOptions[cursor];
     const optionDialogue = cursorOption.dialogue!;
-    if (!this.optionsMeetsReqs[cursor] && (cursorOption.optionMode === MysteryEncounterOptionMode.DISABLED_OR_DEFAULT || cursorOption.optionMode === MysteryEncounterOptionMode.DISABLED_OR_SPECIAL) && optionDialogue.disabledButtonTooltip) {
+    if (
+      !this.optionsMeetsReqs[cursor] &&
+      (cursorOption.optionMode === MysteryEncounterOptionMode.DISABLED_OR_DEFAULT ||
+        cursorOption.optionMode === MysteryEncounterOptionMode.DISABLED_OR_SPECIAL) &&
+      optionDialogue.disabledButtonTooltip
+    ) {
       text = getEncounterText(optionDialogue.disabledButtonTooltip, TextStyle.TOOLTIP_CONTENT);
     } else {
       text = getEncounterText(optionDialogue.buttonTooltip, TextStyle.TOOLTIP_CONTENT);
@@ -518,19 +589,36 @@ export default class MysteryEncounterUiHandler extends UiHandler {
 
     // Auto-color options green/blue for good/bad by looking for (+)/(-)
     if (text) {
-      const primaryStyleString = [ ...text.match(new RegExp(/\[color=[^\[]*\]\[shadow=[^\[]*\]/i))! ][0];
-      text = text.replace(/(\(\+\)[^\(\[]*)/gi, substring => "[/color][/shadow]" + getBBCodeFrag(substring, TextStyle.SUMMARY_GREEN) + "[/color][/shadow]" + primaryStyleString);
-      text = text.replace(/(\(\-\)[^\(\[]*)/gi, substring => "[/color][/shadow]" + getBBCodeFrag(substring, TextStyle.SUMMARY_BLUE) + "[/color][/shadow]" + primaryStyleString);
+      const primaryStyleString = [...text.match(new RegExp(/\[color=[^\[]*\]\[shadow=[^\[]*\]/i))!][0];
+      text = text.replace(
+        /(\(\+\)[^\(\[]*)/gi,
+        substring =>
+          "[/color][/shadow]" +
+          getBBCodeFrag(substring, TextStyle.SUMMARY_GREEN) +
+          "[/color][/shadow]" +
+          primaryStyleString,
+      );
+      text = text.replace(
+        /(\(\-\)[^\(\[]*)/gi,
+        substring =>
+          "[/color][/shadow]" +
+          getBBCodeFrag(substring, TextStyle.SUMMARY_BLUE) +
+          "[/color][/shadow]" +
+          primaryStyleString,
+      );
     }
 
     if (text) {
-      const tooltipTextObject = addBBCodeTextObject(6, 7, text, TextStyle.TOOLTIP_CONTENT, { wordWrap: { width: 600 }, fontSize: "72px" });
+      const tooltipTextObject = addBBCodeTextObject(6, 7, text, TextStyle.TOOLTIP_CONTENT, {
+        wordWrap: { width: 600 },
+        fontSize: "72px",
+      });
       this.tooltipContainer.add(tooltipTextObject);
 
       // Sets up the mask that hides the description text to give an illusion of scrolling
       const tooltipTextMaskRect = globalScene.make.graphics({});
       tooltipTextMaskRect.setScale(6);
-      tooltipTextMaskRect.fillStyle(0xFFFFFF);
+      tooltipTextMaskRect.fillStyle(0xffffff);
       tooltipTextMaskRect.beginPath();
       tooltipTextMaskRect.fillRect(this.tooltipContainer.x, this.tooltipContainer.y + 188.5, 150, 32);
 
@@ -548,11 +636,11 @@ export default class MysteryEncounterUiHandler extends UiHandler {
       if (tooltipLineCount > 3) {
         this.tooltipScrollTween = globalScene.tweens.add({
           targets: tooltipTextObject,
-          delay: Utils.fixedInt(1200),
+          delay: fixedInt(1200),
           loop: -1,
-          hold: Utils.fixedInt(1200),
-          duration: Utils.fixedInt((tooltipLineCount - 3) * 1200),
-          y: `-=${11.2 * (tooltipLineCount - 3)}`
+          hold: fixedInt(1200),
+          duration: fixedInt((tooltipLineCount - 3) * 1200),
+          y: `-=${11.2 * (tooltipLineCount - 3)}`,
         });
       }
     }
@@ -606,7 +694,7 @@ export default class MysteryEncounterUiHandler extends UiHandler {
           this.dexProgressContainer.on("pointerout", () => {
             globalScene.ui.hideTooltip();
           });
-        }
+        },
       });
     } else if (!show && this.showDexProgress) {
       this.showDexProgress = false;
@@ -619,7 +707,7 @@ export default class MysteryEncounterUiHandler extends UiHandler {
         onComplete: () => {
           this.dexProgressContainer.off("pointerover");
           this.dexProgressContainer.off("pointerout");
-        }
+        },
       });
     }
   }
diff --git a/src/ui/party-exp-bar.ts b/src/ui/party-exp-bar.ts
index 75970a5908b..7b7f5277ca1 100644
--- a/src/ui/party-exp-bar.ts
+++ b/src/ui/party-exp-bar.ts
@@ -1,6 +1,7 @@
 import { globalScene } from "#app/global-scene";
 import type Pokemon from "../field/pokemon";
 import { TextStyle, addTextObject } from "./text";
+import i18next from "i18next";
 
 export default class PartyExpBar extends Phaser.GameObjects.Container {
   private bg: Phaser.GameObjects.NineSlice;
@@ -12,7 +13,7 @@ export default class PartyExpBar extends Phaser.GameObjects.Container {
   public shown: boolean;
 
   constructor() {
-    super(globalScene, (globalScene.game.canvas.width / 6), -((globalScene.game.canvas.height) / 6) + 15);
+    super(globalScene, globalScene.game.canvas.width / 6, -(globalScene.game.canvas.height / 6) + 15);
   }
 
   setup(): void {
@@ -42,10 +43,12 @@ export default class PartyExpBar extends Phaser.GameObjects.Container {
 
       // if we want to only display the level in the small frame
       if (showOnlyLevelUp) {
-        if (newLevel > 200) { // if the level is greater than 200, we only display Lv. UP
-          this.expText.setText("Lv. UP");
-        } else { // otherwise we display Lv. Up and the new level
-          this.expText.setText(`Lv. UP: ${newLevel.toString()}`);
+        if (newLevel > 200) {
+          // if the level is greater than 200, we only display Lv. UP
+          this.expText.setText(i18next.t("battleScene:levelUp"));
+        } else {
+          // otherwise we display Lv. Up and the new level
+          this.expText.setText(i18next.t("battleScene:levelUpWithLevel", { level: newLevel }));
         }
       } else {
         // if we want to display the exp
@@ -62,13 +65,13 @@ export default class PartyExpBar extends Phaser.GameObjects.Container {
 
       this.tween = globalScene.tweens.add({
         targets: this,
-        x: (globalScene.game.canvas.width / 6) - (this.bg.width - 5),
+        x: globalScene.game.canvas.width / 6 - (this.bg.width - 5),
         duration: 500 / Math.pow(2, globalScene.expGainsSpeed),
         ease: "Sine.easeOut",
         onComplete: () => {
           this.tween = null;
           resolve();
-        }
+        },
       });
 
       this.setVisible(true);
@@ -88,7 +91,7 @@ export default class PartyExpBar extends Phaser.GameObjects.Container {
 
       this.tween = globalScene.tweens.add({
         targets: this,
-        x: (globalScene.game.canvas.width / 6),
+        x: globalScene.game.canvas.width / 6,
         duration: 500,
         ease: "Sine.easeIn",
         onComplete: () => {
@@ -97,7 +100,7 @@ export default class PartyExpBar extends Phaser.GameObjects.Container {
           this.setVisible(false);
           this.pokemonIcon?.destroy();
           resolve();
-        }
+        },
       });
     });
   }
diff --git a/src/ui/party-ui-handler.ts b/src/ui/party-ui-handler.ts
index 136f098df7e..6e947796d63 100644
--- a/src/ui/party-ui-handler.ts
+++ b/src/ui/party-ui-handler.ts
@@ -4,17 +4,21 @@ import { MoveResult } from "#app/field/pokemon";
 import { addBBCodeTextObject, addTextObject, getTextColor, TextStyle } from "#app/ui/text";
 import { Command } from "#app/ui/command-ui-handler";
 import MessageUiHandler from "#app/ui/message-ui-handler";
-import { Mode } from "#app/ui/ui";
-import * as Utils from "#app/utils";
-import { PokemonFormChangeItemModifier, PokemonHeldItemModifier, SwitchEffectTransferModifier } from "#app/modifier/modifier";
-import { allMoves, ForceSwitchOutAttr } from "#app/data/move";
+import { UiMode } from "#enums/ui-mode";
+import { BooleanHolder, toReadableString, randInt, getLocalizedSpriteKey } from "#app/utils/common";
+import {
+  PokemonFormChangeItemModifier,
+  PokemonHeldItemModifier,
+  SwitchEffectTransferModifier,
+} from "#app/modifier/modifier";
+import { allMoves, ForceSwitchOutAttr } from "#app/data/moves/move";
 import { Gender, getGenderColor, getGenderSymbol } from "#app/data/gender";
 import { StatusEffect } from "#enums/status-effect";
 import PokemonIconAnimHandler, { PokemonIconAnimMode } from "#app/ui/pokemon-icon-anim-handler";
 import { pokemonEvolutions } from "#app/data/balance/pokemon-evolutions";
 import { addWindow } from "#app/ui/ui-theme";
 import { SpeciesFormChangeItemTrigger, FormChangeItem } from "#app/data/pokemon-forms";
-import { getVariantTint } from "#app/data/variant";
+import { getVariantTint } from "#app/sprites/variant";
 import { Button } from "#enums/buttons";
 import { applyChallenges, ChallengeType } from "#app/data/challenge";
 import MoveInfoOverlay from "#app/ui/move-info-overlay";
@@ -97,7 +101,7 @@ export enum PartyUiMode {
    * Indicates that the party UI is open to select a party member for an arbitrary effect.
    * This is generally used in for Mystery Encounter or special effects that require the player to select a Pokemon
    */
-  SELECT
+  SELECT,
 }
 
 export enum PartyOption {
@@ -127,10 +131,18 @@ export enum PartyOption {
 }
 
 export type PartySelectCallback = (cursor: number, option: PartyOption) => void;
-export type PartyModifierTransferSelectCallback = (fromCursor: number, index: number, itemQuantity?: number, toCursor?: number) => void;
+export type PartyModifierTransferSelectCallback = (
+  fromCursor: number,
+  index: number,
+  itemQuantity?: number,
+  toCursor?: number,
+) => void;
 export type PartyModifierSpliceSelectCallback = (fromCursor: number, toCursor?: number) => void;
 export type PokemonSelectFilter = (pokemon: PlayerPokemon) => string | null;
-export type PokemonModifierTransferSelectFilter = (pokemon: PlayerPokemon, modifier: PokemonHeldItemModifier) => string | null;
+export type PokemonModifierTransferSelectFilter = (
+  pokemon: PlayerPokemon,
+  modifier: PokemonHeldItemModifier,
+) => string | null;
 export type PokemonMoveSelectFilter = (pokemonMove: PokemonMove) => string | null;
 
 export default class PartyUiHandler extends MessageUiHandler {
@@ -147,9 +159,9 @@ export default class PartyUiHandler extends MessageUiHandler {
 
   private optionsMode: boolean;
   private optionsScroll: boolean;
-  private optionsCursor: number = 0;
-  private optionsScrollCursor: number = 0;
-  private optionsScrollTotal: number = 0;
+  private optionsCursor = 0;
+  private optionsScrollCursor = 0;
+  private optionsScrollTotal = 0;
   /** This is only public for test/ui/transfer-item.test.ts */
   public optionsContainer: Phaser.GameObjects.Container;
   private optionsBg: Phaser.GameObjects.NineSlice;
@@ -166,7 +178,7 @@ export default class PartyUiHandler extends MessageUiHandler {
   /** Whether to transfer all items */
   private transferAll: boolean;
 
-  private lastCursor: number = 0;
+  private lastCursor = 0;
   private selectCallback: PartySelectCallback | PartyModifierTransferSelectCallback | null;
   private selectFilter: PokemonSelectFilter | PokemonModifierTransferSelectFilter;
   private moveSelectFilter: PokemonMoveSelectFilter;
@@ -181,14 +193,14 @@ export default class PartyUiHandler extends MessageUiHandler {
 
   public static FilterNonFainted = (pokemon: PlayerPokemon) => {
     if (pokemon.isFainted()) {
-      return i18next.t("partyUiHandler:noEnergy", { pokemonName: getPokemonNameWithAffix(pokemon) });
+      return i18next.t("partyUiHandler:noEnergy", { pokemonName: getPokemonNameWithAffix(pokemon, false) });
     }
     return null;
   };
 
   public static FilterFainted = (pokemon: PlayerPokemon) => {
     if (!pokemon.isFainted()) {
-      return i18next.t("partyUiHandler:hasEnergy", { pokemonName: getPokemonNameWithAffix(pokemon) });
+      return i18next.t("partyUiHandler:hasEnergy", { pokemonName: getPokemonNameWithAffix(pokemon, false) });
     }
     return null;
   };
@@ -199,10 +211,10 @@ export default class PartyUiHandler extends MessageUiHandler {
    * @returns
    */
   private FilterChallengeLegal = (pokemon: PlayerPokemon) => {
-    const challengeAllowed = new Utils.BooleanHolder(true);
-    applyChallenges(globalScene.gameMode, ChallengeType.POKEMON_IN_BATTLE, pokemon, challengeAllowed);
+    const challengeAllowed = new BooleanHolder(true);
+    applyChallenges(ChallengeType.POKEMON_IN_BATTLE, pokemon, challengeAllowed);
     if (!challengeAllowed.value) {
-      return i18next.t("partyUiHandler:cantBeUsed", { pokemonName: getPokemonNameWithAffix(pokemon) });
+      return i18next.t("partyUiHandler:cantBeUsed", { pokemonName: getPokemonNameWithAffix(pokemon, false) });
     }
     return null;
   };
@@ -210,19 +222,37 @@ export default class PartyUiHandler extends MessageUiHandler {
   private static FilterAllMoves = (_pokemonMove: PokemonMove) => null;
 
   public static FilterItemMaxStacks = (pokemon: PlayerPokemon, modifier: PokemonHeldItemModifier) => {
-    const matchingModifier = globalScene.findModifier(m => m instanceof PokemonHeldItemModifier && m.pokemonId === pokemon.id && m.matchType(modifier)) as PokemonHeldItemModifier;
+    const matchingModifier = globalScene.findModifier(
+      m => m instanceof PokemonHeldItemModifier && m.pokemonId === pokemon.id && m.matchType(modifier),
+    ) as PokemonHeldItemModifier;
     if (matchingModifier && matchingModifier.stackCount === matchingModifier.getMaxStackCount()) {
-      return i18next.t("partyUiHandler:tooManyItems", { pokemonName: getPokemonNameWithAffix(pokemon) });
+      return i18next.t("partyUiHandler:tooManyItems", { pokemonName: getPokemonNameWithAffix(pokemon, false) });
     }
     return null;
   };
 
   public static NoEffectMessage = i18next.t("partyUiHandler:anyEffect");
 
-  private localizedOptions = [ PartyOption.SEND_OUT, PartyOption.SUMMARY, PartyOption.POKEDEX, PartyOption.CANCEL, PartyOption.APPLY, PartyOption.RELEASE, PartyOption.TEACH, PartyOption.SPLICE, PartyOption.UNSPLICE, PartyOption.REVIVE, PartyOption.TRANSFER, PartyOption.UNPAUSE_EVOLUTION, PartyOption.PASS_BATON, PartyOption.RENAME, PartyOption.SELECT ];
+  private localizedOptions = [
+    PartyOption.SEND_OUT,
+    PartyOption.SUMMARY,
+    PartyOption.POKEDEX,
+    PartyOption.CANCEL,
+    PartyOption.APPLY,
+    PartyOption.RELEASE,
+    PartyOption.TEACH,
+    PartyOption.SPLICE,
+    PartyOption.UNSPLICE,
+    PartyOption.REVIVE,
+    PartyOption.TRANSFER,
+    PartyOption.UNPAUSE_EVOLUTION,
+    PartyOption.PASS_BATON,
+    PartyOption.RENAME,
+    PartyOption.SELECT,
+  ];
 
   constructor() {
-    super(Mode.PARTY);
+    super(UiMode.PARTY);
   }
 
   setup() {
@@ -271,7 +301,7 @@ export default class PartyUiHandler extends MessageUiHandler {
 
     this.partyCancelButton = partyCancelButton;
 
-    this.optionsContainer = globalScene.add.container((globalScene.game.canvas.width / 6) - 1, -1);
+    this.optionsContainer = globalScene.add.container(globalScene.game.canvas.width / 6 - 1, -1);
     partyContainer.add(this.optionsContainer);
 
     this.iconAnimHandler = new PokemonIconAnimHandler();
@@ -305,15 +335,15 @@ export default class PartyUiHandler extends MessageUiHandler {
 
     this.partyUiMode = args[0] as PartyUiMode;
 
-    this.fieldIndex = args.length > 1 ? args[1] as number : -1;
+    this.fieldIndex = args.length > 1 ? (args[1] as number) : -1;
 
     this.selectCallback = args.length > 2 && args[2] instanceof Function ? args[2] : undefined;
-    this.selectFilter = args.length > 3 && args[3] instanceof Function
-      ? args[3] as PokemonSelectFilter
-      : PartyUiHandler.FilterAll;
-    this.moveSelectFilter = args.length > 4 && args[4] instanceof Function
-      ? args[4] as PokemonMoveSelectFilter
-      : PartyUiHandler.FilterAllMoves;
+    this.selectFilter =
+      args.length > 3 && args[3] instanceof Function ? (args[3] as PokemonSelectFilter) : PartyUiHandler.FilterAll;
+    this.moveSelectFilter =
+      args.length > 4 && args[4] instanceof Function
+        ? (args[4] as PokemonMoveSelectFilter)
+        : PartyUiHandler.FilterAllMoves;
     this.tmMoveId = args.length > 5 && args[5] ? args[5] : Moves.NONE;
     this.showMovePp = args.length > 6 && args[6];
 
@@ -354,25 +384,42 @@ export default class PartyUiHandler extends MessageUiHandler {
           this.startTransfer();
 
           let ableToTransfer: string;
-          for (let p = 0; p < globalScene.getPlayerParty().length; p++) { // this for look goes through each of the party pokemon
+          for (let p = 0; p < globalScene.getPlayerParty().length; p++) {
+            // this for look goes through each of the party pokemon
             const newPokemon = globalScene.getPlayerParty()[p];
             // this next line gets all of the transferable items from pokemon [p]; it does this by getting all the held modifiers that are transferable and checking to see if they belong to pokemon [p]
             const getTransferrableItemsFromPokemon = (newPokemon: PlayerPokemon) =>
-              globalScene.findModifiers(m => m instanceof PokemonHeldItemModifier && (m as PokemonHeldItemModifier).isTransferable && (m as PokemonHeldItemModifier).pokemonId === newPokemon.id) as PokemonHeldItemModifier[];
+              globalScene.findModifiers(
+                m =>
+                  m instanceof PokemonHeldItemModifier &&
+                  (m as PokemonHeldItemModifier).isTransferable &&
+                  (m as PokemonHeldItemModifier).pokemonId === newPokemon.id,
+              ) as PokemonHeldItemModifier[];
             // this next bit checks to see if the the selected item from the original transfer pokemon exists on the new pokemon [p]; this returns undefined if the new pokemon doesn't have the item at all, otherwise it returns the pokemonHeldItemModifier for that item
-            const matchingModifier = globalScene.findModifier(m => m instanceof PokemonHeldItemModifier && m.pokemonId === newPokemon.id && m.matchType(getTransferrableItemsFromPokemon(pokemon)[this.transferOptionCursor])) as PokemonHeldItemModifier;
+            const matchingModifier = globalScene.findModifier(
+              m =>
+                m instanceof PokemonHeldItemModifier &&
+                m.pokemonId === newPokemon.id &&
+                m.matchType(getTransferrableItemsFromPokemon(pokemon)[this.transferOptionCursor]),
+            ) as PokemonHeldItemModifier;
             const partySlot = this.partySlots.filter(m => m.getPokemon() === newPokemon)[0]; // this gets pokemon [p] for us
-            if (p !== this.transferCursor) { // this skips adding the able/not able labels on the pokemon doing the transfer
-              if (matchingModifier) { // if matchingModifier exists then the item exists on the new pokemon
-                if (matchingModifier.getMaxStackCount() === matchingModifier.stackCount) { // checks to see if the stack of items is at max stack; if so, set the description label to "Not able"
+            if (p !== this.transferCursor) {
+              // this skips adding the able/not able labels on the pokemon doing the transfer
+              if (matchingModifier) {
+                // if matchingModifier exists then the item exists on the new pokemon
+                if (matchingModifier.getMaxStackCount() === matchingModifier.stackCount) {
+                  // checks to see if the stack of items is at max stack; if so, set the description label to "Not able"
                   ableToTransfer = i18next.t("partyUiHandler:notAble");
-                } else { // if the pokemon isn't at max stack, make the label "Able"
+                } else {
+                  // if the pokemon isn't at max stack, make the label "Able"
                   ableToTransfer = i18next.t("partyUiHandler:able");
                 }
-              } else { // if matchingModifier doesn't exist, that means the pokemon doesn't have any of the item, and we need to show "Able"
+              } else {
+                // if matchingModifier doesn't exist, that means the pokemon doesn't have any of the item, and we need to show "Able"
                 ableToTransfer = i18next.t("partyUiHandler:able");
               }
-            } else { // this else relates to the transfer pokemon. We set the text to be blank so there's no "Able"/"Not able" text
+            } else {
+              // this else relates to the transfer pokemon. We set the text to be blank so there's no "Able"/"Not able" text
               ableToTransfer = "";
             }
             partySlot.slotHpBar.setVisible(false);
@@ -385,7 +432,8 @@ export default class PartyUiHandler extends MessageUiHandler {
           this.clearOptions();
           ui.playSelect();
           return true;
-        } else if (this.partyUiMode === PartyUiMode.REMEMBER_MOVE_MODIFIER && option !== PartyOption.CANCEL) {
+        }
+        if (this.partyUiMode === PartyUiMode.REMEMBER_MOVE_MODIFIER && option !== PartyOption.CANCEL) {
           // clear overlay on cancel
           this.moveInfoOverlay.clear();
           const filterResult = (this.selectFilter as PokemonSelectFilter)(pokemon);
@@ -398,21 +446,39 @@ export default class PartyUiHandler extends MessageUiHandler {
           }
           ui.playSelect();
           return true;
-        } else if ((![ PartyOption.SUMMARY, PartyOption.POKEDEX, PartyOption.UNPAUSE_EVOLUTION, PartyOption.UNSPLICE, PartyOption.RELEASE, PartyOption.CANCEL, PartyOption.RENAME ].includes(option))
-          || (option === PartyOption.RELEASE && this.partyUiMode === PartyUiMode.RELEASE)) {
+        }
+        if (
+          ![
+            PartyOption.SUMMARY,
+            PartyOption.POKEDEX,
+            PartyOption.UNPAUSE_EVOLUTION,
+            PartyOption.UNSPLICE,
+            PartyOption.RELEASE,
+            PartyOption.CANCEL,
+            PartyOption.RENAME,
+          ].includes(option) ||
+          (option === PartyOption.RELEASE && this.partyUiMode === PartyUiMode.RELEASE)
+        ) {
           let filterResult: string | null;
           const getTransferrableItemsFromPokemon = (pokemon: PlayerPokemon) =>
-            globalScene.findModifiers(m => m instanceof PokemonHeldItemModifier && m.isTransferable && m.pokemonId === pokemon.id) as PokemonHeldItemModifier[];
+            globalScene.findModifiers(
+              m => m instanceof PokemonHeldItemModifier && m.isTransferable && m.pokemonId === pokemon.id,
+            ) as PokemonHeldItemModifier[];
           if (option !== PartyOption.TRANSFER && option !== PartyOption.SPLICE) {
             filterResult = (this.selectFilter as PokemonSelectFilter)(pokemon);
             if (filterResult === null && (option === PartyOption.SEND_OUT || option === PartyOption.PASS_BATON)) {
               filterResult = this.FilterChallengeLegal(pokemon);
             }
             if (filterResult === null && this.partyUiMode === PartyUiMode.MOVE_MODIFIER) {
-              filterResult = this.moveSelectFilter(pokemon.moveset[this.optionsCursor]!); // TODO: is this bang correct?
+              filterResult = this.moveSelectFilter(pokemon.moveset[this.optionsCursor]);
             }
           } else {
-            filterResult = (this.selectFilter as PokemonModifierTransferSelectFilter)(pokemon, getTransferrableItemsFromPokemon(globalScene.getPlayerParty()[this.transferCursor])[this.transferOptionCursor]);
+            filterResult = (this.selectFilter as PokemonModifierTransferSelectFilter)(
+              pokemon,
+              getTransferrableItemsFromPokemon(globalScene.getPlayerParty()[this.transferCursor])[
+                this.transferOptionCursor
+              ],
+            );
           }
           if (filterResult === null) {
             if (this.partyUiMode !== PartyUiMode.SPLICE) {
@@ -422,9 +488,24 @@ export default class PartyUiHandler extends MessageUiHandler {
               if (option === PartyOption.TRANSFER) {
                 if (this.transferCursor !== this.cursor) {
                   if (this.transferAll) {
-                    getTransferrableItemsFromPokemon(globalScene.getPlayerParty()[this.transferCursor]).forEach((_, i) => (this.selectCallback as PartyModifierTransferSelectCallback)(this.transferCursor, i, this.transferQuantitiesMax[i], this.cursor));
+                    getTransferrableItemsFromPokemon(globalScene.getPlayerParty()[this.transferCursor]).forEach(
+                      (_, i, array) => {
+                        const invertedIndex = array.length - 1 - i;
+                        (this.selectCallback as PartyModifierTransferSelectCallback)(
+                          this.transferCursor,
+                          invertedIndex,
+                          this.transferQuantitiesMax[invertedIndex],
+                          this.cursor,
+                        );
+                      },
+                    );
                   } else {
-                    (this.selectCallback as PartyModifierTransferSelectCallback)(this.transferCursor, this.transferOptionCursor, this.transferQuantities[this.transferOptionCursor], this.cursor);
+                    (this.selectCallback as PartyModifierTransferSelectCallback)(
+                      this.transferCursor,
+                      this.transferOptionCursor,
+                      this.transferQuantities[this.transferOptionCursor],
+                      this.cursor,
+                    );
                   }
                 }
                 this.clearTransfer();
@@ -444,7 +525,10 @@ export default class PartyUiHandler extends MessageUiHandler {
                 selectCallback(this.cursor, option);
               }
             } else {
-              if (option >= PartyOption.FORM_CHANGE_ITEM && globalScene.getCurrentPhase() instanceof SelectModifierPhase) {
+              if (
+                option >= PartyOption.FORM_CHANGE_ITEM &&
+                globalScene.getCurrentPhase() instanceof SelectModifierPhase
+              ) {
                 if (this.partyUiMode === PartyUiMode.CHECK) {
                   const formChangeItemModifiers = this.getFormChangeItemsModifiers(pokemon);
                   const modifier = formChangeItemModifiers[option - PartyOption.FORM_CHANGE_ITEM];
@@ -452,20 +536,27 @@ export default class PartyUiHandler extends MessageUiHandler {
                   globalScene.triggerPokemonFormChange(pokemon, SpeciesFormChangeItemTrigger, false, true);
                 }
               } else if (this.cursor) {
-                (globalScene.getCurrentPhase() as CommandPhase).handleCommand(Command.POKEMON, this.cursor, option === PartyOption.PASS_BATON);
+                (globalScene.getCurrentPhase() as CommandPhase).handleCommand(
+                  Command.POKEMON,
+                  this.cursor,
+                  option === PartyOption.PASS_BATON,
+                );
               }
             }
-            if (this.partyUiMode !== PartyUiMode.MODIFIER && this.partyUiMode !== PartyUiMode.TM_MODIFIER && this.partyUiMode !== PartyUiMode.MOVE_MODIFIER) {
+            if (
+              this.partyUiMode !== PartyUiMode.MODIFIER &&
+              this.partyUiMode !== PartyUiMode.TM_MODIFIER &&
+              this.partyUiMode !== PartyUiMode.MOVE_MODIFIER
+            ) {
               ui.playSelect();
             }
             return true;
-          } else {
-            this.clearOptions();
-            this.showText(filterResult as string, undefined, () => this.showText("", 0), undefined, true);
           }
+          this.clearOptions();
+          this.showText(filterResult as string, undefined, () => this.showText("", 0), undefined, true);
         } else if (option === PartyOption.SUMMARY) {
           ui.playSelect();
-          ui.setModeWithoutClear(Mode.SUMMARY, pokemon).then(() =>  this.clearOptions());
+          ui.setModeWithoutClear(UiMode.SUMMARY, pokemon).then(() => this.clearOptions());
           return true;
         } else if (option === PartyOption.POKEDEX) {
           ui.playSelect();
@@ -473,50 +564,89 @@ export default class PartyUiHandler extends MessageUiHandler {
             shiny: pokemon.shiny,
             variant: pokemon.variant,
             form: pokemon.formIndex,
-            female: pokemon.gender === Gender.FEMALE ? true : false
+            female: pokemon.gender === Gender.FEMALE,
           };
-          ui.setOverlayMode(Mode.POKEDEX_PAGE, pokemon.species, pokemon.formIndex, attributes).then(() =>  this.clearOptions());
+          ui.setOverlayMode(UiMode.POKEDEX_PAGE, pokemon.species, attributes).then(() => this.clearOptions());
           return true;
         } else if (option === PartyOption.UNPAUSE_EVOLUTION) {
           this.clearOptions();
           ui.playSelect();
           pokemon.pauseEvolutions = !pokemon.pauseEvolutions;
-          this.showText(i18next.t(pokemon.pauseEvolutions ? "partyUiHandler:pausedEvolutions" : "partyUiHandler:unpausedEvolutions", { pokemonName: getPokemonNameWithAffix(pokemon) }), undefined, () => this.showText("", 0), null, true);
+          this.showText(
+            i18next.t(
+              pokemon.pauseEvolutions ? "partyUiHandler:pausedEvolutions" : "partyUiHandler:unpausedEvolutions",
+              { pokemonName: getPokemonNameWithAffix(pokemon, false) },
+            ),
+            undefined,
+            () => this.showText("", 0),
+            null,
+            true,
+          );
         } else if (option === PartyOption.UNSPLICE) {
           this.clearOptions();
           ui.playSelect();
-          this.showText(i18next.t("partyUiHandler:unspliceConfirmation", { fusionName: pokemon.fusionSpecies?.name, pokemonName: pokemon.name }), null, () => {
-            ui.setModeWithoutClear(Mode.CONFIRM, () => {
-              const fusionName = pokemon.name;
-              pokemon.unfuse().then(() => {
-                this.clearPartySlots();
-                this.populatePartySlots();
-                ui.setMode(Mode.PARTY);
-                this.showText(i18next.t("partyUiHandler:wasReverted", { fusionName: fusionName, pokemonName: pokemon.name }), undefined, () => {
-                  ui.setMode(Mode.PARTY);
+          this.showText(
+            i18next.t("partyUiHandler:unspliceConfirmation", {
+              fusionName: pokemon.fusionSpecies?.name,
+              pokemonName: pokemon.getName(),
+            }),
+            null,
+            () => {
+              ui.setModeWithoutClear(
+                UiMode.CONFIRM,
+                () => {
+                  const fusionName = pokemon.getName();
+                  pokemon.unfuse().then(() => {
+                    this.clearPartySlots();
+                    this.populatePartySlots();
+                    ui.setMode(UiMode.PARTY);
+                    this.showText(
+                      i18next.t("partyUiHandler:wasReverted", {
+                        fusionName: fusionName,
+                        pokemonName: pokemon.getName(false),
+                      }),
+                      undefined,
+                      () => {
+                        ui.setMode(UiMode.PARTY);
+                        this.showText("", 0);
+                      },
+                      null,
+                      true,
+                    );
+                  });
+                },
+                () => {
+                  ui.setMode(UiMode.PARTY);
                   this.showText("", 0);
-                }, null, true);
-              });
-            }, () => {
-              ui.setMode(Mode.PARTY);
-              this.showText("", 0);
-            });
-          });
+                },
+              );
+            },
+          );
         } else if (option === PartyOption.RELEASE) {
           this.clearOptions();
           ui.playSelect();
           if (this.cursor >= globalScene.currentBattle.getBattlerCount() || !pokemon.isAllowedInBattle()) {
             this.blockInput = true;
-            this.showText(i18next.t("partyUiHandler:releaseConfirmation", { pokemonName: getPokemonNameWithAffix(pokemon) }), null, () => {
-              this.blockInput = false;
-              ui.setModeWithoutClear(Mode.CONFIRM, () => {
-                ui.setMode(Mode.PARTY);
-                this.doRelease(this.cursor);
-              }, () => {
-                ui.setMode(Mode.PARTY);
-                this.showText("", 0);
-              });
-            });
+            this.showText(
+              i18next.t("partyUiHandler:releaseConfirmation", {
+                pokemonName: getPokemonNameWithAffix(pokemon, false),
+              }),
+              null,
+              () => {
+                this.blockInput = false;
+                ui.setModeWithoutClear(
+                  UiMode.CONFIRM,
+                  () => {
+                    ui.setMode(UiMode.PARTY);
+                    this.doRelease(this.cursor);
+                  },
+                  () => {
+                    ui.setMode(UiMode.PARTY);
+                    this.showText("", 0);
+                  },
+                );
+              },
+            );
           } else {
             this.showText(i18next.t("partyUiHandler:releaseInBattle"), null, () => this.showText("", 0), null, true);
           }
@@ -524,21 +654,25 @@ export default class PartyUiHandler extends MessageUiHandler {
         } else if (option === PartyOption.RENAME) {
           this.clearOptions();
           ui.playSelect();
-          ui.setModeWithoutClear(Mode.RENAME_POKEMON, {
-            buttonActions: [
-              (nickname: string) => {
-                ui.playSelect();
-                pokemon.nickname = nickname;
-                pokemon.updateInfo();
-                this.clearPartySlots();
-                this.populatePartySlots();
-                ui.setMode(Mode.PARTY);
-              },
-              () => {
-                ui.setMode(Mode.PARTY);
-              }
-            ]
-          }, pokemon);
+          ui.setModeWithoutClear(
+            UiMode.RENAME_POKEMON,
+            {
+              buttonActions: [
+                (nickname: string) => {
+                  ui.playSelect();
+                  pokemon.nickname = nickname;
+                  pokemon.updateInfo();
+                  this.clearPartySlots();
+                  this.populatePartySlots();
+                  ui.setMode(UiMode.PARTY);
+                },
+                () => {
+                  ui.setMode(UiMode.PARTY);
+                },
+              ],
+            },
+            pokemon,
+          );
           return true;
         } else if (option === PartyOption.CANCEL) {
           return this.processInput(Button.CANCEL);
@@ -553,40 +687,54 @@ export default class PartyUiHandler extends MessageUiHandler {
       } else {
         switch (button) {
           case Button.LEFT:
-          /** Decrease quantity for the current item and update UI */
+            /** Decrease quantity for the current item and update UI */
             if (this.partyUiMode === PartyUiMode.MODIFIER_TRANSFER) {
-              this.transferQuantities[option] = this.transferQuantities[option] === 1 ? this.transferQuantitiesMax[option] : this.transferQuantities[option] - 1;
+              this.transferQuantities[option] =
+                this.transferQuantities[option] === 1
+                  ? this.transferQuantitiesMax[option]
+                  : this.transferQuantities[option] - 1;
               this.updateOptions();
-              success = this.setCursor(this.optionsCursor); /** Place again the cursor at the same position. Necessary, otherwise the cursor disappears */
+              success = this.setCursor(
+                this.optionsCursor,
+              ); /** Place again the cursor at the same position. Necessary, otherwise the cursor disappears */
             }
             break;
           case Button.RIGHT:
-          /** Increase quantity for the current item and update UI */
+            /** Increase quantity for the current item and update UI */
             if (this.partyUiMode === PartyUiMode.MODIFIER_TRANSFER) {
-              this.transferQuantities[option] = this.transferQuantities[option] === this.transferQuantitiesMax[option] ? 1 : this.transferQuantities[option] + 1;
+              this.transferQuantities[option] =
+                this.transferQuantities[option] === this.transferQuantitiesMax[option]
+                  ? 1
+                  : this.transferQuantities[option] + 1;
               this.updateOptions();
-              success = this.setCursor(this.optionsCursor); /** Place again the cursor at the same position. Necessary, otherwise the cursor disappears */
+              success = this.setCursor(
+                this.optionsCursor,
+              ); /** Place again the cursor at the same position. Necessary, otherwise the cursor disappears */
             }
             break;
           case Button.UP:
-          /** If currently selecting items to transfer, reset quantity selection */
+            /** If currently selecting items to transfer, reset quantity selection */
             if (this.partyUiMode === PartyUiMode.MODIFIER_TRANSFER) {
               if (option !== PartyOption.ALL) {
                 this.transferQuantities[option] = this.transferQuantitiesMax[option];
               }
               this.updateOptions();
             }
-            success = this.setCursor(this.optionsCursor ? this.optionsCursor - 1 : this.options.length - 1); /** Move cursor */
+            success = this.setCursor(
+              this.optionsCursor ? this.optionsCursor - 1 : this.options.length - 1,
+            ); /** Move cursor */
             break;
           case Button.DOWN:
-          /** If currently selecting items to transfer, reset quantity selection */
+            /** If currently selecting items to transfer, reset quantity selection */
             if (this.partyUiMode === PartyUiMode.MODIFIER_TRANSFER) {
               if (option !== PartyOption.ALL) {
                 this.transferQuantities[option] = this.transferQuantitiesMax[option];
               }
               this.updateOptions();
             }
-            success = this.setCursor(this.optionsCursor < this.options.length - 1 ? this.optionsCursor + 1 : 0); /** Move cursor */
+            success = this.setCursor(
+              this.optionsCursor < this.options.length - 1 ? this.optionsCursor + 1 : 0,
+            ); /** Move cursor */
             break;
         }
 
@@ -608,8 +756,12 @@ export default class PartyUiHandler extends MessageUiHandler {
         if (this.cursor < 6) {
           if (this.partyUiMode === PartyUiMode.MODIFIER_TRANSFER && !this.transferMode) {
             /** Initialize item quantities for the selected Pokemon */
-            const itemModifiers = globalScene.findModifiers(m => m instanceof PokemonHeldItemModifier
-              && m.isTransferable && m.pokemonId === globalScene.getPlayerParty()[this.cursor].id) as PokemonHeldItemModifier[];
+            const itemModifiers = globalScene.findModifiers(
+              m =>
+                m instanceof PokemonHeldItemModifier &&
+                m.isTransferable &&
+                m.pokemonId === globalScene.getPlayerParty()[this.cursor].id,
+            ) as PokemonHeldItemModifier[];
             this.transferQuantities = itemModifiers.map(item => item.getStackCount());
             this.transferQuantitiesMax = itemModifiers.map(item => item.getStackCount());
           }
@@ -621,8 +773,12 @@ export default class PartyUiHandler extends MessageUiHandler {
           return this.processInput(Button.CANCEL);
         }
         return true;
-      } else if (button === Button.CANCEL) {
-        if ((this.partyUiMode === PartyUiMode.MODIFIER_TRANSFER || this.partyUiMode === PartyUiMode.SPLICE) && this.transferMode) {
+      }
+      if (button === Button.CANCEL) {
+        if (
+          (this.partyUiMode === PartyUiMode.MODIFIER_TRANSFER || this.partyUiMode === PartyUiMode.SPLICE) &&
+          this.transferMode
+        ) {
           this.clearTransfer();
           ui.playSelect();
         } else if (this.partyUiMode !== PartyUiMode.FAINT_SWITCH && this.partyUiMode !== PartyUiMode.REVIVAL_BLESSING) {
@@ -632,7 +788,7 @@ export default class PartyUiHandler extends MessageUiHandler {
             selectCallback(6, PartyOption.CANCEL);
             ui.playSelect();
           } else {
-            ui.setMode(Mode.COMMAND, this.fieldIndex);
+            ui.setMode(UiMode.COMMAND, this.fieldIndex);
             ui.playSelect();
           }
         }
@@ -645,10 +801,10 @@ export default class PartyUiHandler extends MessageUiHandler {
 
       switch (button) {
         case Button.UP:
-          success = this.setCursor(this.cursor ? this.cursor < 6 ? this.cursor - 1 : slotCount - 1 : 6);
+          success = this.setCursor(this.cursor ? (this.cursor < 6 ? this.cursor - 1 : slotCount - 1) : 6);
           break;
         case Button.DOWN:
-          success = this.setCursor(this.cursor < 6 ? this.cursor < slotCount - 1 ? this.cursor + 1 : 6 : 0);
+          success = this.setCursor(this.cursor < 6 ? (this.cursor < slotCount - 1 ? this.cursor + 1 : 6) : 0);
           break;
         case Button.LEFT:
           if (this.cursor >= battlerCount && this.cursor <= 6) {
@@ -659,11 +815,13 @@ export default class PartyUiHandler extends MessageUiHandler {
           if (slotCount === battlerCount) {
             success = this.setCursor(6);
             break;
-          } else if (battlerCount >= 2 && slotCount > battlerCount && this.getCursor() === 0 && this.lastCursor === 1) {
+          }
+          if (battlerCount >= 2 && slotCount > battlerCount && this.getCursor() === 0 && this.lastCursor === 1) {
             success = this.setCursor(2);
             break;
-          } else if (slotCount > battlerCount && this.cursor < battlerCount) {
-            success = this.setCursor(this.lastCursor < 6 ? this.lastCursor ||  battlerCount : battlerCount);
+          }
+          if (slotCount > battlerCount && this.cursor < battlerCount) {
+            success = this.setCursor(this.lastCursor < 6 ? this.lastCursor || battlerCount : battlerCount);
             break;
           }
       }
@@ -689,7 +847,7 @@ export default class PartyUiHandler extends MessageUiHandler {
     }
 
     for (const p in party) {
-      const slotIndex = parseInt(p);
+      const slotIndex = Number.parseInt(p);
       const partySlot = new PartySlot(slotIndex, party[p], this.iconAnimHandler, this.partyUiMode, this.tmMoveId);
       globalScene.add.existing(partySlot);
       this.partySlotsContainer.add(partySlot);
@@ -711,7 +869,7 @@ export default class PartyUiHandler extends MessageUiHandler {
           this.optionsScrollCursor = cursor ? this.optionsScrollTotal - 8 : 0;
           this.updateOptions();
         } else {
-          const isDown = cursor &&  cursor > this.optionsCursor;
+          const isDown = cursor && cursor > this.optionsCursor;
           if (isDown) {
             if (this.options[cursor] === PartyOption.SCROLL_DOWN) {
               isScroll = true;
@@ -738,7 +896,10 @@ export default class PartyUiHandler extends MessageUiHandler {
         this.optionsCursorObj.setOrigin(0, 0);
         this.optionsContainer.add(this.optionsCursorObj);
       }
-      this.optionsCursorObj.setPosition(8 - this.optionsBg.displayWidth, -19 - (16 * ((this.options.length - 1) - this.optionsCursor)));
+      this.optionsCursorObj.setPosition(
+        8 - this.optionsBg.displayWidth,
+        -19 - 16 * (this.options.length - 1 - this.optionsCursor),
+      );
     } else {
       changed = this.cursor !== cursor;
       if (changed) {
@@ -760,7 +921,14 @@ export default class PartyUiHandler extends MessageUiHandler {
     return changed;
   }
 
-  showText(text: string, delay?: number | null, callback?: Function | null, callbackDelay?: number | null, prompt?: boolean | null, promptDelay?: number | null) {
+  showText(
+    text: string,
+    delay?: number | null,
+    callback?: Function | null,
+    callbackDelay?: number | null,
+    prompt?: boolean | null,
+    promptDelay?: number | null,
+  ) {
     if (text.length === 0) {
       text = defaultMessage;
     }
@@ -818,19 +986,20 @@ export default class PartyUiHandler extends MessageUiHandler {
   updateOptions(): void {
     const pokemon = globalScene.getPlayerParty()[this.cursor];
 
-    const learnableLevelMoves = this.partyUiMode === PartyUiMode.REMEMBER_MOVE_MODIFIER
-      ? pokemon.getLearnableLevelMoves()
-      : [];
+    const learnableLevelMoves =
+      this.partyUiMode === PartyUiMode.REMEMBER_MOVE_MODIFIER ? pokemon.getLearnableLevelMoves() : [];
 
     if (this.partyUiMode === PartyUiMode.REMEMBER_MOVE_MODIFIER && learnableLevelMoves?.length) {
       // show the move overlay with info for the first move
       this.moveInfoOverlay.show(allMoves[learnableLevelMoves[0]]);
     }
 
-    const itemModifiers = this.partyUiMode === PartyUiMode.MODIFIER_TRANSFER
-      ? globalScene.findModifiers(m => m instanceof PokemonHeldItemModifier
-        && m.isTransferable && m.pokemonId === pokemon.id) as PokemonHeldItemModifier[]
-      : [];
+    const itemModifiers =
+      this.partyUiMode === PartyUiMode.MODIFIER_TRANSFER
+        ? (globalScene.findModifiers(
+            m => m instanceof PokemonHeldItemModifier && m.isTransferable && m.pokemonId === pokemon.id,
+          ) as PokemonHeldItemModifier[])
+        : [];
 
     if (this.options.length) {
       this.options.splice(0, this.options.length);
@@ -840,27 +1009,40 @@ export default class PartyUiHandler extends MessageUiHandler {
 
     let formChangeItemModifiers: PokemonFormChangeItemModifier[] | undefined;
 
-    if (this.partyUiMode !== PartyUiMode.MOVE_MODIFIER && this.partyUiMode !== PartyUiMode.REMEMBER_MOVE_MODIFIER && (this.transferMode || this.partyUiMode !== PartyUiMode.MODIFIER_TRANSFER)) {
+    if (
+      this.partyUiMode !== PartyUiMode.MOVE_MODIFIER &&
+      this.partyUiMode !== PartyUiMode.REMEMBER_MOVE_MODIFIER &&
+      (this.transferMode || this.partyUiMode !== PartyUiMode.MODIFIER_TRANSFER)
+    ) {
       switch (this.partyUiMode) {
         case PartyUiMode.SWITCH:
         case PartyUiMode.FAINT_SWITCH:
         case PartyUiMode.POST_BATTLE_SWITCH:
           if (this.cursor >= globalScene.currentBattle.getBattlerCount()) {
             const allowBatonModifierSwitch =
-            this.partyUiMode !== PartyUiMode.FAINT_SWITCH
-              && globalScene.findModifier(m => m instanceof SwitchEffectTransferModifier
-              && (m as SwitchEffectTransferModifier).pokemonId === globalScene.getPlayerField()[this.fieldIndex].id);
+              this.partyUiMode !== PartyUiMode.FAINT_SWITCH &&
+              globalScene.findModifier(
+                m =>
+                  m instanceof SwitchEffectTransferModifier &&
+                  (m as SwitchEffectTransferModifier).pokemonId === globalScene.getPlayerField()[this.fieldIndex].id,
+              );
 
             const moveHistory = globalScene.getPlayerField()[this.fieldIndex].getMoveHistory();
-            const isBatonPassMove = this.partyUiMode === PartyUiMode.FAINT_SWITCH && moveHistory.length && allMoves[moveHistory[moveHistory.length - 1].move].getAttrs(ForceSwitchOutAttr)[0]?.isBatonPass() && moveHistory[moveHistory.length - 1].result === MoveResult.SUCCESS;
+            const isBatonPassMove =
+              this.partyUiMode === PartyUiMode.FAINT_SWITCH &&
+              moveHistory.length &&
+              allMoves[moveHistory[moveHistory.length - 1].move].getAttrs(ForceSwitchOutAttr)[0]?.isBatonPass() &&
+              moveHistory[moveHistory.length - 1].result === MoveResult.SUCCESS;
 
             // isBatonPassMove and allowBatonModifierSwitch shouldn't ever be true
             // at the same time, because they both explicitly check for a mutually
             // exclusive partyUiMode. But better safe than sorry.
-            this.options.push(isBatonPassMove && !allowBatonModifierSwitch ? PartyOption.PASS_BATON : PartyOption.SEND_OUT);
+            this.options.push(
+              isBatonPassMove && !allowBatonModifierSwitch ? PartyOption.PASS_BATON : PartyOption.SEND_OUT,
+            );
             if (allowBatonModifierSwitch && !isBatonPassMove) {
-            // the BATON modifier gives an extra switch option for
-            // pokemon-command switches, allowing buffs to be optionally passed
+              // the BATON modifier gives an extra switch option for
+              // pokemon-command switches, allowing buffs to be optionally passed
               this.options.push(PartyOption.PASS_BATON);
             }
           }
@@ -906,7 +1088,12 @@ export default class PartyUiHandler extends MessageUiHandler {
       this.options.push(PartyOption.POKEDEX);
       this.options.push(PartyOption.RENAME);
 
-      if ((pokemonEvolutions.hasOwnProperty(pokemon.species.speciesId) || (pokemon.isFusion() && pokemon.fusionSpecies && pokemonEvolutions.hasOwnProperty(pokemon.fusionSpecies.speciesId)))) {
+      if (
+        pokemonEvolutions.hasOwnProperty(pokemon.species.speciesId) ||
+        (pokemon.isFusion() &&
+          pokemon.fusionSpecies &&
+          pokemonEvolutions.hasOwnProperty(pokemon.fusionSpecies.speciesId))
+      ) {
         this.options.push(PartyOption.UNPAUSE_EVOLUTION);
       }
 
@@ -938,7 +1125,10 @@ export default class PartyUiHandler extends MessageUiHandler {
 
     this.optionsScrollTotal = this.options.length;
     let optionStartIndex = this.optionsScrollCursor;
-    let optionEndIndex = Math.min(this.optionsScrollTotal, optionStartIndex + (!optionStartIndex || this.optionsScrollCursor + 8 >= this.optionsScrollTotal ? 8 : 7));
+    let optionEndIndex = Math.min(
+      this.optionsScrollTotal,
+      optionStartIndex + (!optionStartIndex || this.optionsScrollCursor + 8 >= this.optionsScrollTotal ? 8 : 7),
+    );
 
     this.optionsScroll = this.optionsScrollTotal > 9;
 
@@ -974,13 +1164,17 @@ export default class PartyUiHandler extends MessageUiHandler {
         optionName = "↑";
       } else if (option === PartyOption.SCROLL_DOWN) {
         optionName = "↓";
-      } else if ((this.partyUiMode !== PartyUiMode.REMEMBER_MOVE_MODIFIER && (this.partyUiMode !== PartyUiMode.MODIFIER_TRANSFER || this.transferMode)) || option === PartyOption.CANCEL) {
+      } else if (
+        (this.partyUiMode !== PartyUiMode.REMEMBER_MOVE_MODIFIER &&
+          (this.partyUiMode !== PartyUiMode.MODIFIER_TRANSFER || this.transferMode)) ||
+        option === PartyOption.CANCEL
+      ) {
         switch (option) {
           case PartyOption.MOVE_1:
           case PartyOption.MOVE_2:
           case PartyOption.MOVE_3:
           case PartyOption.MOVE_4:
-            const move = pokemon.moveset[option - PartyOption.MOVE_1]!; // TODO: is the bang correct?
+            const move = pokemon.moveset[option - PartyOption.MOVE_1];
             if (this.showMovePp) {
               const maxPP = move.getMovePp();
               const currPP = maxPP - move.ppUsed;
@@ -999,7 +1193,7 @@ export default class PartyUiHandler extends MessageUiHandler {
               if (this.localizedOptions.includes(option)) {
                 optionName = i18next.t(`partyUiHandler:${PartyOption[option]}`);
               } else {
-                optionName = Utils.toReadableString(PartyOption[option]);
+                optionName = toReadableString(PartyOption[option]);
               }
             }
             break;
@@ -1007,7 +1201,10 @@ export default class PartyUiHandler extends MessageUiHandler {
       } else if (this.partyUiMode === PartyUiMode.REMEMBER_MOVE_MODIFIER) {
         const move = learnableLevelMoves[option];
         optionName = allMoves[move].name;
-        altText = !pokemon.getSpeciesForm().getLevelMoves().find(plm => plm[1] === move);
+        altText = !pokemon
+          .getSpeciesForm()
+          .getLevelMoves()
+          .find(plm => plm[1] === move);
       } else if (option === PartyOption.ALL) {
         optionName = i18next.t("partyUiHandler:ALL");
       } else {
@@ -1025,7 +1222,13 @@ export default class PartyUiHandler extends MessageUiHandler {
 
       /** For every item that has stack bigger than 1, display the current quantity selection */
       const itemModifier = itemModifiers[option];
-      if (this.partyUiMode === PartyUiMode.MODIFIER_TRANSFER && this.transferQuantitiesMax[option] > 1 && !this.transferMode && itemModifier !== undefined && itemModifier.type.name === optionName) {
+      if (
+        this.partyUiMode === PartyUiMode.MODIFIER_TRANSFER &&
+        this.transferQuantitiesMax[option] > 1 &&
+        !this.transferMode &&
+        itemModifier !== undefined &&
+        itemModifier.type.name === optionName
+      ) {
         let amountText = ` (${this.transferQuantities[option]})`;
 
         /** If the amount held is the maximum, display the count in red */
@@ -1073,68 +1276,103 @@ export default class PartyUiHandler extends MessageUiHandler {
   }
 
   doRelease(slotIndex: number): void {
-    this.showText(this.getReleaseMessage(getPokemonNameWithAffix(globalScene.getPlayerParty()[slotIndex])), null, () => {
-      this.clearPartySlots();
-      globalScene.removePartyMemberModifiers(slotIndex);
-      const releasedPokemon = globalScene.getPlayerParty().splice(slotIndex, 1)[0];
-      releasedPokemon.destroy();
-      this.populatePartySlots();
-      if (this.cursor >= globalScene.getPlayerParty().length) {
-        this.setCursor(this.cursor - 1);
-      }
-      if (this.partyUiMode === PartyUiMode.RELEASE) {
-        const selectCallback = this.selectCallback;
-        this.selectCallback = null;
-        selectCallback && selectCallback(this.cursor, PartyOption.RELEASE);
-      }
-      this.showText("", 0);
-    }, null, true);
+    this.showText(
+      this.getReleaseMessage(getPokemonNameWithAffix(globalScene.getPlayerParty()[slotIndex], false)),
+      null,
+      () => {
+        this.clearPartySlots();
+        globalScene.removePartyMemberModifiers(slotIndex);
+        const releasedPokemon = globalScene.getPlayerParty().splice(slotIndex, 1)[0];
+        releasedPokemon.destroy();
+        this.populatePartySlots();
+        if (this.cursor >= globalScene.getPlayerParty().length) {
+          this.setCursor(this.cursor - 1);
+        }
+        if (this.partyUiMode === PartyUiMode.RELEASE) {
+          const selectCallback = this.selectCallback;
+          this.selectCallback = null;
+          selectCallback?.(this.cursor, PartyOption.RELEASE);
+        }
+        this.showText("", 0);
+      },
+      null,
+      true,
+    );
   }
 
   getReleaseMessage(pokemonName: string): string {
-    const rand = Utils.randInt(128);
+    const rand = randInt(128);
     if (rand < 20) {
       return i18next.t("partyUiHandler:goodbye", { pokemonName: pokemonName });
-    } else if (rand < 40) {
-      return i18next.t("partyUiHandler:byebye", { pokemonName: pokemonName });
-    } else if (rand < 60) {
-      return i18next.t("partyUiHandler:farewell", { pokemonName: pokemonName });
-    } else if (rand < 80) {
-      return i18next.t("partyUiHandler:soLong", { pokemonName: pokemonName });
-    } else if (rand < 100) {
-      return i18next.t("partyUiHandler:thisIsWhereWePart", { pokemonName: pokemonName });
-    } else if (rand < 108) {
-      return i18next.t("partyUiHandler:illMissYou", { pokemonName: pokemonName });
-    } else if (rand < 116) {
-      return i18next.t("partyUiHandler:illNeverForgetYou", { pokemonName: pokemonName });
-    } else if (rand < 124) {
-      return i18next.t("partyUiHandler:untilWeMeetAgain", { pokemonName: pokemonName });
-    } else if (rand < 127) {
-      return i18next.t("partyUiHandler:sayonara", { pokemonName: pokemonName });
-    } else {
-      return i18next.t("partyUiHandler:smellYaLater", { pokemonName: pokemonName });
     }
+    if (rand < 40) {
+      return i18next.t("partyUiHandler:byebye", { pokemonName: pokemonName });
+    }
+    if (rand < 60) {
+      return i18next.t("partyUiHandler:farewell", { pokemonName: pokemonName });
+    }
+    if (rand < 80) {
+      return i18next.t("partyUiHandler:soLong", { pokemonName: pokemonName });
+    }
+    if (rand < 100) {
+      return i18next.t("partyUiHandler:thisIsWhereWePart", {
+        pokemonName: pokemonName,
+      });
+    }
+    if (rand < 108) {
+      return i18next.t("partyUiHandler:illMissYou", {
+        pokemonName: pokemonName,
+      });
+    }
+    if (rand < 116) {
+      return i18next.t("partyUiHandler:illNeverForgetYou", {
+        pokemonName: pokemonName,
+      });
+    }
+    if (rand < 124) {
+      return i18next.t("partyUiHandler:untilWeMeetAgain", {
+        pokemonName: pokemonName,
+      });
+    }
+    if (rand < 127) {
+      return i18next.t("partyUiHandler:sayonara", { pokemonName: pokemonName });
+    }
+    return i18next.t("partyUiHandler:smellYaLater", {
+      pokemonName: pokemonName,
+    });
   }
 
   getFormChangeItemsModifiers(pokemon: Pokemon) {
-    let formChangeItemModifiers = globalScene.findModifiers(m => m instanceof PokemonFormChangeItemModifier && m.pokemonId === pokemon.id) as PokemonFormChangeItemModifier[];
-    const ultraNecrozmaModifiers = formChangeItemModifiers.filter(m => m.active && m.formChangeItem === FormChangeItem.ULTRANECROZIUM_Z);
+    let formChangeItemModifiers = globalScene.findModifiers(
+      m => m instanceof PokemonFormChangeItemModifier && m.pokemonId === pokemon.id,
+    ) as PokemonFormChangeItemModifier[];
+    const ultraNecrozmaModifiers = formChangeItemModifiers.filter(
+      m => m.active && m.formChangeItem === FormChangeItem.ULTRANECROZIUM_Z,
+    );
     if (ultraNecrozmaModifiers.length > 0) {
       // ULTRANECROZIUM_Z is active and deactivating it should be the only option
       return ultraNecrozmaModifiers;
     }
     if (formChangeItemModifiers.find(m => m.active)) {
       // a form is currently active. the user has to disable the form or activate ULTRANECROZIUM_Z
-      formChangeItemModifiers = formChangeItemModifiers.filter(m => m.active || m.formChangeItem === FormChangeItem.ULTRANECROZIUM_Z);
+      formChangeItemModifiers = formChangeItemModifiers.filter(
+        m => m.active || m.formChangeItem === FormChangeItem.ULTRANECROZIUM_Z,
+      );
     } else if (pokemon.species.speciesId === Species.NECROZMA) {
       // no form is currently active. the user has to activate some form, except ULTRANECROZIUM_Z
-      formChangeItemModifiers = formChangeItemModifiers.filter(m => m.formChangeItem !== FormChangeItem.ULTRANECROZIUM_Z);
+      formChangeItemModifiers = formChangeItemModifiers.filter(
+        m => m.formChangeItem !== FormChangeItem.ULTRANECROZIUM_Z,
+      );
     }
     return formChangeItemModifiers;
   }
 
   getOptionsCursorWithScroll(): number {
-    return this.optionsCursor + this.optionsScrollCursor + (this.options && this.options[0] === PartyOption.SCROLL_UP ? -1 : 0);
+    return (
+      this.optionsCursor +
+      this.optionsScrollCursor +
+      (this.options && this.options[0] === PartyOption.SCROLL_UP ? -1 : 0)
+    );
   }
 
   clearOptions() {
@@ -1187,14 +1425,25 @@ class PartySlot extends Phaser.GameObjects.Container {
   public slotHpText: Phaser.GameObjects.Text;
   public slotDescriptionLabel: Phaser.GameObjects.Text; // this is used to show text instead of the HP bar i.e. for showing "Able"/"Not Able" for TMs when you try to learn them
 
-
   private pokemonIcon: Phaser.GameObjects.Container;
   private iconAnimHandler: PokemonIconAnimHandler;
 
-  constructor(slotIndex: number, pokemon: PlayerPokemon, iconAnimHandler: PokemonIconAnimHandler, partyUiMode: PartyUiMode, tmMoveId: Moves) {
-    super(globalScene, slotIndex >= globalScene.currentBattle.getBattlerCount() ? 230.5 : 64,
-      slotIndex >= globalScene.currentBattle.getBattlerCount() ? -184 + (globalScene.currentBattle.double ? -40 : 0)
-      + (28 + (globalScene.currentBattle.double ? 8 : 0)) * slotIndex : -124 + (globalScene.currentBattle.double ? -8 : 0) + slotIndex * 64);
+  constructor(
+    slotIndex: number,
+    pokemon: PlayerPokemon,
+    iconAnimHandler: PokemonIconAnimHandler,
+    partyUiMode: PartyUiMode,
+    tmMoveId: Moves,
+  ) {
+    super(
+      globalScene,
+      slotIndex >= globalScene.currentBattle.getBattlerCount() ? 230.5 : 64,
+      slotIndex >= globalScene.currentBattle.getBattlerCount()
+        ? -184 +
+            (globalScene.currentBattle.double ? -40 : 0) +
+            (28 + (globalScene.currentBattle.double ? 8 : 0)) * slotIndex
+        : -124 + (globalScene.currentBattle.double ? -8 : 0) + slotIndex * 64,
+    );
 
     this.slotIndex = slotIndex;
     this.pokemon = pokemon;
@@ -1208,6 +1457,9 @@ class PartySlot extends Phaser.GameObjects.Container {
   }
 
   setup(partyUiMode: PartyUiMode, tmMoveId: Moves) {
+    const currentLanguage = i18next.resolvedLanguage ?? "en";
+    const offsetJa = currentLanguage === "ja";
+
     const battlerCount = globalScene.currentBattle.getBattlerCount();
 
     const slotKey = `party_slot${this.slotIndex >= battlerCount ? "" : "_main"}`;
@@ -1217,7 +1469,11 @@ class PartySlot extends Phaser.GameObjects.Container {
 
     this.add(slotBg);
 
-    const slotPb = globalScene.add.sprite(this.slotIndex >= battlerCount ? -85.5 : -51, this.slotIndex >= battlerCount ? 0 : -20.5, "party_pb");
+    const slotPb = globalScene.add.sprite(
+      this.slotIndex >= battlerCount ? -85.5 : -51,
+      this.slotIndex >= battlerCount ? 0 : -20.5,
+      "party_pb",
+    );
     this.slotPb = slotPb;
 
     this.add(slotPb);
@@ -1231,13 +1487,13 @@ class PartySlot extends Phaser.GameObjects.Container {
     const slotInfoContainer = globalScene.add.container(0, 0);
     this.add(slotInfoContainer);
 
-    let displayName = this.pokemon.getNameToRender();
+    let displayName = this.pokemon.getNameToRender(false);
     let nameTextWidth: number;
 
     const nameSizeTest = addTextObject(0, 0, displayName, TextStyle.PARTY);
     nameTextWidth = nameSizeTest.displayWidth;
 
-    while (nameTextWidth > (this.slotIndex >= battlerCount ? 52 : (76 - (this.pokemon.fusionSpecies ? 8 : 0)))) {
+    while (nameTextWidth > (this.slotIndex >= battlerCount ? 52 : 76 - (this.pokemon.fusionSpecies ? 8 : 0))) {
       displayName = `${displayName.slice(0, displayName.endsWith(".") ? -2 : -1).trimEnd()}.`;
       nameSizeTest.setText(displayName);
       nameTextWidth = nameSizeTest.displayWidth;
@@ -1246,18 +1502,31 @@ class PartySlot extends Phaser.GameObjects.Container {
     nameSizeTest.destroy();
 
     this.slotName = addTextObject(0, 0, displayName, TextStyle.PARTY);
-    this.slotName.setPositionRelative(slotBg, this.slotIndex >= battlerCount ? 21 : 24, this.slotIndex >= battlerCount ? 2 : 10);
+    this.slotName.setPositionRelative(
+      slotBg,
+      this.slotIndex >= battlerCount ? 21 : 24,
+      (this.slotIndex >= battlerCount ? 2 : 10) + (offsetJa ? 2 : 0),
+    );
     this.slotName.setOrigin(0, 0);
 
     const slotLevelLabel = globalScene.add.image(0, 0, "party_slot_overlay_lv");
-    slotLevelLabel.setPositionRelative(this.slotName, 8, 12);
+    slotLevelLabel.setPositionRelative(
+      slotBg,
+      (this.slotIndex >= battlerCount ? 21 : 24) + 8,
+      (this.slotIndex >= battlerCount ? 2 : 10) + 12,
+    );
     slotLevelLabel.setOrigin(0, 0);
 
-    const slotLevelText = addTextObject(0, 0, this.pokemon.level.toString(), this.pokemon.level < globalScene.getMaxExpLevel() ? TextStyle.PARTY : TextStyle.PARTY_RED);
-    slotLevelText.setPositionRelative(slotLevelLabel, 9, 0);
+    const slotLevelText = addTextObject(
+      0,
+      0,
+      this.pokemon.level.toString(),
+      this.pokemon.level < globalScene.getMaxExpLevel() ? TextStyle.PARTY : TextStyle.PARTY_RED,
+    );
+    slotLevelText.setPositionRelative(slotLevelLabel, 9, offsetJa ? 1.5 : 0);
     slotLevelText.setOrigin(0, 0.25);
 
-    slotInfoContainer.add([ this.slotName, slotLevelLabel, slotLevelText ]);
+    slotInfoContainer.add([this.slotName, slotLevelLabel, slotLevelText]);
 
     const genderSymbol = getGenderSymbol(this.pokemon.getGender(true));
 
@@ -1289,7 +1558,7 @@ class PartySlot extends Phaser.GameObjects.Container {
     }
 
     if (this.pokemon.status) {
-      const statusIndicator = globalScene.add.sprite(0, 0, Utils.getLocalizedSpriteKey("statuses"));
+      const statusIndicator = globalScene.add.sprite(0, 0, getLocalizedSpriteKey("statuses"));
       statusIndicator.setFrame(StatusEffect[this.pokemon.status?.effect].toLowerCase());
       statusIndicator.setOrigin(0, 0);
       statusIndicator.setPositionRelative(slotLevelLabel, this.slotIndex >= battlerCount ? 43 : 55, 0);
@@ -1298,12 +1567,12 @@ class PartySlot extends Phaser.GameObjects.Container {
     }
 
     if (this.pokemon.isShiny()) {
-      const doubleShiny = this.pokemon.isFusion() && this.pokemon.shiny && this.pokemon.fusionShiny;
+      const doubleShiny = this.pokemon.isDoubleShiny(false);
 
       const shinyStar = globalScene.add.image(0, 0, `shiny_star_small${doubleShiny ? "_1" : ""}`);
       shinyStar.setOrigin(0, 0);
       shinyStar.setPositionRelative(this.slotName, -9, 3);
-      shinyStar.setTint(getVariantTint(!doubleShiny ? this.pokemon.getVariant() : this.pokemon.variant));
+      shinyStar.setTint(getVariantTint(this.pokemon.getBaseVariant(doubleShiny)));
 
       slotInfoContainer.add(shinyStar);
 
@@ -1311,36 +1580,55 @@ class PartySlot extends Phaser.GameObjects.Container {
         const fusionShinyStar = globalScene.add.image(0, 0, "shiny_star_small_2");
         fusionShinyStar.setOrigin(0, 0);
         fusionShinyStar.setPosition(shinyStar.x, shinyStar.y);
-        fusionShinyStar.setTint(getVariantTint(this.pokemon.fusionVariant));
+        fusionShinyStar.setTint(
+          getVariantTint(this.pokemon.summonData.illusion?.basePokemon.fusionVariant ?? this.pokemon.fusionVariant),
+        );
 
         slotInfoContainer.add(fusionShinyStar);
       }
     }
 
     this.slotHpBar = globalScene.add.image(0, 0, "party_slot_hp_bar");
-    this.slotHpBar.setPositionRelative(slotBg, this.slotIndex >= battlerCount ? 72 : 8, this.slotIndex >= battlerCount ? 6 : 31);
+    this.slotHpBar.setPositionRelative(
+      slotBg,
+      this.slotIndex >= battlerCount ? 72 : 8,
+      this.slotIndex >= battlerCount ? 6 : 31,
+    );
     this.slotHpBar.setOrigin(0, 0);
     this.slotHpBar.setVisible(false);
 
     const hpRatio = this.pokemon.getHpRatio();
 
-    this.slotHpOverlay = globalScene.add.sprite(0, 0, "party_slot_hp_overlay", hpRatio > 0.5 ? "high" : hpRatio > 0.25 ? "medium" : "low");
+    this.slotHpOverlay = globalScene.add.sprite(
+      0,
+      0,
+      "party_slot_hp_overlay",
+      hpRatio > 0.5 ? "high" : hpRatio > 0.25 ? "medium" : "low",
+    );
     this.slotHpOverlay.setPositionRelative(this.slotHpBar, 16, 2);
     this.slotHpOverlay.setOrigin(0, 0);
     this.slotHpOverlay.setScale(hpRatio, 1);
     this.slotHpOverlay.setVisible(false);
 
     this.slotHpText = addTextObject(0, 0, `${this.pokemon.hp}/${this.pokemon.getMaxHp()}`, TextStyle.PARTY);
-    this.slotHpText.setPositionRelative(this.slotHpBar, this.slotHpBar.width - 3, this.slotHpBar.height - 2);
+    this.slotHpText.setPositionRelative(
+      this.slotHpBar,
+      this.slotHpBar.width - 3,
+      this.slotHpBar.height - 2 + (offsetJa ? 2 : 0),
+    );
     this.slotHpText.setOrigin(1, 0);
     this.slotHpText.setVisible(false);
 
     this.slotDescriptionLabel = addTextObject(0, 0, "", TextStyle.MESSAGE);
-    this.slotDescriptionLabel.setPositionRelative(slotBg, this.slotIndex >= battlerCount ? 94 : 32, this.slotIndex >= battlerCount ? 16 : 46);
+    this.slotDescriptionLabel.setPositionRelative(
+      slotBg,
+      this.slotIndex >= battlerCount ? 94 : 32,
+      this.slotIndex >= battlerCount ? 16 : 46,
+    );
     this.slotDescriptionLabel.setOrigin(0, 1);
     this.slotDescriptionLabel.setVisible(false);
 
-    slotInfoContainer.add([ this.slotHpBar, this.slotHpOverlay, this.slotHpText, this.slotDescriptionLabel ]);
+    slotInfoContainer.add([this.slotHpBar, this.slotHpOverlay, this.slotHpText, this.slotDescriptionLabel]);
 
     if (partyUiMode !== PartyUiMode.TM_MODIFIER) {
       this.slotDescriptionLabel.setVisible(false);
@@ -1353,7 +1641,7 @@ class PartySlot extends Phaser.GameObjects.Container {
       this.slotHpText.setVisible(false);
       let slotTmText: string;
 
-      if (this.pokemon.getMoveset().filter(m => m?.moveId === tmMoveId).length > 0) {
+      if (this.pokemon.getMoveset().filter(m => m.moveId === tmMoveId).length > 0) {
         slotTmText = i18next.t("partyUiHandler:learned");
       } else if (this.pokemon.compatibleTms.indexOf(tmMoveId) === -1) {
         slotTmText = i18next.t("partyUiHandler:notAble");
@@ -1363,7 +1651,6 @@ class PartySlot extends Phaser.GameObjects.Container {
 
       this.slotDescriptionLabel.setText(slotTmText);
       this.slotDescriptionLabel.setVisible(true);
-
     }
   }
 
@@ -1402,8 +1689,10 @@ class PartySlot extends Phaser.GameObjects.Container {
 
   private updateSlotTexture(): void {
     const battlerCount = globalScene.currentBattle.getBattlerCount();
-    this.slotBg.setTexture(`party_slot${this.slotIndex >= battlerCount ? "" : "_main"}`,
-      `party_slot${this.slotIndex >= battlerCount ? "" : "_main"}${this.transfer ? "_swap" : this.pokemon.hp ? "" : "_fnt"}${this.selected ? "_sel" : ""}`);
+    this.slotBg.setTexture(
+      `party_slot${this.slotIndex >= battlerCount ? "" : "_main"}`,
+      `party_slot${this.slotIndex >= battlerCount ? "" : "_main"}${this.transfer ? "_swap" : this.pokemon.hp ? "" : "_fnt"}${this.selected ? "_sel" : ""}`,
+    );
   }
 }
 
diff --git a/src/ui/pokeball-tray.ts b/src/ui/pokeball-tray.ts
index 0c913d195a9..0bf47699cdb 100644
--- a/src/ui/pokeball-tray.ts
+++ b/src/ui/pokeball-tray.ts
@@ -10,17 +10,39 @@ export default class PokeballTray extends Phaser.GameObjects.Container {
   public shown: boolean;
 
   constructor(player: boolean) {
-    super(globalScene, player ? (globalScene.game.canvas.width / 6) : 0, player ? -72 : -144);
+    super(globalScene, player ? globalScene.game.canvas.width / 6 : 0, player ? -72 : -144);
     this.player = player;
   }
 
   setup(): void {
-    this.bg = globalScene.add.nineslice(0, 0, `pb_tray_overlay_${this.player ? "player" : "enemy"}`, undefined, 104, 4, 48, 8, 0, 0);
+    this.bg = globalScene.add.nineslice(
+      0,
+      0,
+      `pb_tray_overlay_${this.player ? "player" : "enemy"}`,
+      undefined,
+      104,
+      4,
+      48,
+      8,
+      0,
+      0,
+    );
     this.bg.setOrigin(this.player ? 1 : 0, 0);
 
     this.add(this.bg);
 
-    this.balls = new Array(6).fill(null).map((_, i) => globalScene.add.sprite((this.player ? -83 : 76) + (globalScene.game.canvas.width / 6) * (this.player ? -1 : 1) + 10 * i * (this.player ? 1 : -1), -8, "pb_tray_ball", "empty"));
+    this.balls = new Array(6)
+      .fill(null)
+      .map((_, i) =>
+        globalScene.add.sprite(
+          (this.player ? -83 : 76) +
+            (globalScene.game.canvas.width / 6) * (this.player ? -1 : 1) +
+            10 * i * (this.player ? 1 : -1),
+          -8,
+          "pb_tray_ball",
+          "empty",
+        ),
+      );
 
     for (const ball of this.balls) {
       ball.setOrigin(0, 0);
@@ -71,10 +93,10 @@ export default class PokeballTray extends Phaser.GameObjects.Container {
               x: `${this.player ? "-" : "+"}=104`,
               duration: b * 100,
               ease: "Sine.easeIn",
-              onComplete: () => globalScene.playSound(`se/${(b < party.length ? "pb_tray_ball" : "pb_tray_empty")}`)
+              onComplete: () => globalScene.playSound(`se/${b < party.length ? "pb_tray_ball" : "pb_tray_empty"}`),
             });
           });
-        }
+        },
       });
 
       this.setVisible(true);
@@ -96,7 +118,7 @@ export default class PokeballTray extends Phaser.GameObjects.Container {
           x: `${this.player ? "-" : "+"}=${globalScene.game.canvas.width / 6}`,
           duration: 250,
           delay: b * 100,
-          ease: "Sine.easeIn"
+          ease: "Sine.easeIn",
         });
       });
 
@@ -105,7 +127,7 @@ export default class PokeballTray extends Phaser.GameObjects.Container {
         width: 144,
         alpha: 0,
         duration: 500,
-        ease: "Sine.easeIn"
+        ease: "Sine.easeIn",
       });
 
       globalScene.time.delayedCall(850, () => {
diff --git a/src/ui/pokedex-info-overlay.ts b/src/ui/pokedex-info-overlay.ts
index fe0b47b57e0..2e889f6d2a9 100644
--- a/src/ui/pokedex-info-overlay.ts
+++ b/src/ui/pokedex-info-overlay.ts
@@ -1,21 +1,21 @@
 import type { InfoToggle } from "../battle-scene";
 import { TextStyle, addTextObject } from "./text";
 import { addWindow } from "./ui-theme";
-import * as Utils from "../utils";
+import { fixedInt } from "#app/utils/common";
 import i18next from "i18next";
 import { globalScene } from "#app/global-scene";
 
 export interface PokedexInfoOverlaySettings {
-    delayVisibility?: boolean; // if true, showing the overlay will only set it to active and populate the fields and the handler using this field has to manually call setVisible later.
-    scale?:number; // scale the box? A scale of 0.5 is recommended
-    //location and width of the component; unaffected by scaling
-    x?: number;
-    y?: number;
-    /** Default is always half the screen, regardless of scale */
-    width?: number;
-    /** Determines whether to display the small secondary box */
-    hideEffectBox?: boolean;
-    hideBg?: boolean;
+  delayVisibility?: boolean; // if true, showing the overlay will only set it to active and populate the fields and the handler using this field has to manually call setVisible later.
+  scale?: number; // scale the box? A scale of 0.5 is recommended
+  //location and width of the component; unaffected by scaling
+  x?: number;
+  y?: number;
+  /** Default is always half the screen, regardless of scale */
+  width?: number;
+  /** Determines whether to display the small secondary box */
+  hideEffectBox?: boolean;
+  hideBg?: boolean;
 }
 
 const DESC_HEIGHT = 48;
@@ -23,10 +23,10 @@ const BORDER = 8;
 const GLOBAL_SCALE = 6;
 
 export default class PokedexInfoOverlay extends Phaser.GameObjects.Container implements InfoToggle {
-  public active: boolean = false;
+  public active = false;
 
   private desc: Phaser.GameObjects.Text;
-  private descScroll : Phaser.Tweens.Tween | null = null;
+  private descScroll: Phaser.Tweens.Tween | null = null;
 
   private descBg: Phaser.GameObjects.NineSlice;
 
@@ -52,7 +52,9 @@ export default class PokedexInfoOverlay extends Phaser.GameObjects.Container imp
     this.add(this.descBg);
 
     // set up the description; wordWrap uses true pixels, unaffected by any scaling, while other values are affected
-    this.desc = addTextObject(BORDER, BORDER - 2, "", TextStyle.BATTLE_INFO, { wordWrap: { width: (this.width - (BORDER - 2) * 2) * GLOBAL_SCALE }});
+    this.desc = addTextObject(BORDER, BORDER - 2, "", TextStyle.BATTLE_INFO, {
+      wordWrap: { width: (this.width - (BORDER - 2) * 2) * GLOBAL_SCALE },
+    });
     this.desc.setLineSpacing(i18next.resolvedLanguage === "ja" ? 25 : 5);
 
     // limit the text rendering, required for scrolling later on
@@ -67,10 +69,13 @@ export default class PokedexInfoOverlay extends Phaser.GameObjects.Container imp
     }
 
     this.textMaskRect = globalScene.make.graphics();
-    this.textMaskRect.fillStyle(0xFF0000);
+    this.textMaskRect.fillStyle(0xff0000);
     this.textMaskRect.fillRect(
-      this.maskPointOriginX + BORDER * this.scale, this.maskPointOriginY + (BORDER - 2) * this.scale,
-      this.width - (BORDER * 2) * this.scale, (DESC_HEIGHT - (BORDER - 2) * 2) * this.scale);
+      this.maskPointOriginX + BORDER * this.scale,
+      this.maskPointOriginY + (BORDER - 2) * this.scale,
+      this.width - BORDER * 2 * this.scale,
+      (DESC_HEIGHT - (BORDER - 2) * 2) * this.scale,
+    );
     this.textMaskRect.setScale(6);
     const textMask = this.createGeometryMask(this.textMaskRect);
 
@@ -86,7 +91,7 @@ export default class PokedexInfoOverlay extends Phaser.GameObjects.Container imp
   }
 
   // show this component with infos for the specific move
-  show(text: string):boolean {
+  show(text: string): boolean {
     if (!globalScene.enableMoveInfo) {
       return false; // move infos have been disabled // TODO:: is `false` correct? i used to be `undeefined`
     }
@@ -101,16 +106,16 @@ export default class PokedexInfoOverlay extends Phaser.GameObjects.Container imp
     }
 
     // determine if we need to add new scrolling effects
-    const lineCount = Math.floor(this.desc.displayHeight * (96 / 72) / 14.83);
+    const lineCount = Math.floor((this.desc.displayHeight * (96 / 72)) / 14.83);
 
-    const newHeight = lineCount >= 3 ? 48 : (lineCount === 2 ? 36 : 24);
+    const newHeight = lineCount >= 3 ? 48 : lineCount === 2 ? 36 : 24;
     this.textMaskRect.clear();
-    this.textMaskRect.fillStyle(0xFF0000);
+    this.textMaskRect.fillStyle(0xff0000);
     this.textMaskRect.fillRect(
       this.maskPointOriginX + BORDER * this.scale,
       this.maskPointOriginY + (BORDER - 2) * this.scale + (48 - newHeight),
-      this.width - (BORDER * 2) * this.scale,
-      (newHeight - (BORDER - 2) * 2) * this.scale
+      this.width - BORDER * 2 * this.scale,
+      (newHeight - (BORDER - 2) * 2) * this.scale,
     );
     const updatedMask = this.createGeometryMask(this.textMaskRect);
     this.desc.setMask(updatedMask);
@@ -123,11 +128,11 @@ export default class PokedexInfoOverlay extends Phaser.GameObjects.Container imp
       // generate scrolling effects
       this.descScroll = globalScene.tweens.add({
         targets: this.desc,
-        delay: Utils.fixedInt(2000),
+        delay: fixedInt(2000),
         loop: -1,
-        hold: Utils.fixedInt(2000),
-        duration: Utils.fixedInt((lineCount - 3) * 2000),
-        y: `-=${14.83 * (72 / 96) * (lineCount - 3)}`
+        hold: fixedInt(2000),
+        duration: fixedInt((lineCount - 3) * 2000),
+        y: `-=${14.83 * (72 / 96) * (lineCount - 3)}`,
       });
     }
 
@@ -149,9 +154,9 @@ export default class PokedexInfoOverlay extends Phaser.GameObjects.Container imp
     }
     globalScene.tweens.add({
       targets: this.desc,
-      duration: Utils.fixedInt(125),
+      duration: fixedInt(125),
       ease: "Sine.easeInOut",
-      alpha: visible ? 1 : 0
+      alpha: visible ? 1 : 0,
     });
     if (!visible) {
       this.setVisible(false);
@@ -163,12 +168,12 @@ export default class PokedexInfoOverlay extends Phaser.GameObjects.Container imp
   }
 
   // width of this element
-  static getWidth(scale:number):number {
+  static getWidth(_scale: number): number {
     return globalScene.game.canvas.width / GLOBAL_SCALE / 2;
   }
 
   // height of this element
-  static getHeight(scale:number, onSide?: boolean):number {
+  static getHeight(scale: number, _onSide?: boolean): number {
     return DESC_HEIGHT * scale;
   }
 }
diff --git a/src/ui/pokedex-mon-container.ts b/src/ui/pokedex-mon-container.ts
index f3932aa90c8..da79320850d 100644
--- a/src/ui/pokedex-mon-container.ts
+++ b/src/ui/pokedex-mon-container.ts
@@ -1,7 +1,16 @@
+import type { Variant } from "#app/sprites/variant";
 import { globalScene } from "#app/global-scene";
+import { isNullOrUndefined } from "#app/utils/common";
 import type PokemonSpecies from "../data/pokemon-species";
 import { addTextObject, TextStyle } from "./text";
 
+interface SpeciesDetails {
+  shiny?: boolean;
+  formIndex?: number;
+  female?: boolean;
+  variant?: Variant;
+}
+
 export class PokedexMonContainer extends Phaser.GameObjects.Container {
   public species: PokemonSpecies;
   public icon: Phaser.GameObjects.Sprite;
@@ -19,15 +28,14 @@ export class PokedexMonContainer extends Phaser.GameObjects.Container {
   public tmMove2Icon: Phaser.GameObjects.Image;
   public passive1Icon: Phaser.GameObjects.Image;
   public passive2Icon: Phaser.GameObjects.Image;
-  public cost: number = 0;
+  public passive1OverlayIcon: Phaser.GameObjects.Image;
+  public passive2OverlayIcon: Phaser.GameObjects.Image;
+  public cost = 0;
 
-  constructor(species: PokemonSpecies) {
+  constructor(species: PokemonSpecies, options: SpeciesDetails = {}) {
     super(globalScene, 0, 0);
 
-    this.species = species;
-
-    const defaultDexAttr = globalScene.gameData.getSpeciesDefaultDexAttr(species, false, true);
-    const defaultProps = globalScene.gameData.getSpeciesDexAttrProps(species, defaultDexAttr);
+    this.setSpecies(species, options);
 
     // starter passive bg
     const starterPassiveBg = globalScene.add.image(2, 5, "passive_bg");
@@ -37,15 +45,6 @@ export class PokedexMonContainer extends Phaser.GameObjects.Container {
     this.add(starterPassiveBg);
     this.starterPassiveBgs = starterPassiveBg;
 
-    // icon
-    this.icon = globalScene.add.sprite(-2, 2, species.getIconAtlasKey(defaultProps.formIndex, defaultProps.shiny, defaultProps.variant));
-    this.icon.setScale(0.5);
-    this.icon.setOrigin(0, 0);
-    this.icon.setFrame(species.getIconId(defaultProps.female, defaultProps.formIndex, defaultProps.shiny, defaultProps.variant));
-    this.checkIconId(defaultProps.female, defaultProps.formIndex, defaultProps.shiny, defaultProps.variant);
-    this.icon.setTint(0);
-    this.add(this.icon);
-
     // shiny icons
     for (let i = 0; i < 3; i++) {
       const shinyIcon = globalScene.add.image(i * -3 + 12, 2, "shiny_star_small");
@@ -57,7 +56,9 @@ export class PokedexMonContainer extends Phaser.GameObjects.Container {
     this.add(this.shinyIcons);
 
     // value label
-    const label = addTextObject(1, 2, "0", TextStyle.WINDOW, { fontSize: "32px" });
+    const label = addTextObject(1, 2, "0", TextStyle.WINDOW, {
+      fontSize: "32px",
+    });
     label.setShadowOffset(2, 2);
     label.setOrigin(0, 0);
     label.setVisible(false);
@@ -136,8 +137,7 @@ export class PokedexMonContainer extends Phaser.GameObjects.Container {
     this.add(tmMove2Icon);
     this.tmMove2Icon = tmMove2Icon;
 
-
-    // move icons
+    // passive icons
     const passive1Icon = globalScene.add.image(3, 3, "candy");
     passive1Icon.setOrigin(0, 0);
     passive1Icon.setScale(0.25);
@@ -145,13 +145,68 @@ export class PokedexMonContainer extends Phaser.GameObjects.Container {
     this.add(passive1Icon);
     this.passive1Icon = passive1Icon;
 
-    // move icons
+    const passive1OverlayIcon = globalScene.add.image(12, 12, "candy_overlay");
+    passive1OverlayIcon.setOrigin(0, 0);
+    passive1OverlayIcon.setScale(0.25);
+    passive1OverlayIcon.setVisible(false);
+    this.add(passive1OverlayIcon);
+    this.passive1OverlayIcon = passive1OverlayIcon;
+
+    // passive icons
     const passive2Icon = globalScene.add.image(12, 3, "candy");
     passive2Icon.setOrigin(0, 0);
     passive2Icon.setScale(0.25);
     passive2Icon.setVisible(false);
     this.add(passive2Icon);
     this.passive2Icon = passive2Icon;
+
+    const passive2OverlayIcon = globalScene.add.image(12, 12, "candy_overlay");
+    passive2OverlayIcon.setOrigin(0, 0);
+    passive2OverlayIcon.setScale(0.25);
+    passive2OverlayIcon.setVisible(false);
+    this.add(passive2OverlayIcon);
+    this.passive2OverlayIcon = passive2OverlayIcon;
+  }
+
+  setSpecies(species: PokemonSpecies, options: SpeciesDetails = {}) {
+    this.species = species;
+
+    const { shiny, formIndex, female, variant } = options;
+
+    const defaultDexAttr = globalScene.gameData.getSpeciesDefaultDexAttr(species, false, true);
+    const defaultProps = globalScene.gameData.getSpeciesDexAttrProps(species, defaultDexAttr);
+
+    if (!isNullOrUndefined(formIndex)) {
+      defaultProps.formIndex = formIndex;
+    }
+    if (!isNullOrUndefined(shiny)) {
+      defaultProps.shiny = shiny;
+    }
+    if (!isNullOrUndefined(variant)) {
+      defaultProps.variant = variant;
+    }
+    if (!isNullOrUndefined(female)) {
+      defaultProps.female = female;
+    }
+
+    if (this.icon) {
+      this.remove(this.icon);
+      this.icon.destroy(); // Properly removes the sprite from memory
+    }
+
+    // icon
+    this.icon = globalScene.add.sprite(
+      -2,
+      2,
+      species.getIconAtlasKey(defaultProps.formIndex, defaultProps.shiny, defaultProps.variant),
+    );
+    this.icon.setScale(0.5);
+    this.icon.setOrigin(0, 0);
+    this.icon.setFrame(
+      species.getIconId(defaultProps.female, defaultProps.formIndex, defaultProps.shiny, defaultProps.variant),
+    );
+    this.checkIconId(defaultProps.female, defaultProps.formIndex, defaultProps.shiny, defaultProps.variant);
+    this.add(this.icon);
   }
 
   checkIconId(female, formIndex, shiny, variant) {
diff --git a/src/ui/pokedex-page-ui-handler.ts b/src/ui/pokedex-page-ui-handler.ts
index 7ab054ea71b..051d267259f 100644
--- a/src/ui/pokedex-page-ui-handler.ts
+++ b/src/ui/pokedex-page-ui-handler.ts
@@ -1,40 +1,37 @@
 import type { SpeciesFormEvolution } from "#app/data/balance/pokemon-evolutions";
 import { pokemonEvolutions, pokemonPrevolutions, pokemonStarters } from "#app/data/balance/pokemon-evolutions";
-import type { Variant } from "#app/data/variant";
-import { getVariantTint, getVariantIcon } from "#app/data/variant";
+import type { Variant } from "#app/sprites/variant";
+import { getVariantTint, getVariantIcon } from "#app/sprites/variant";
 import { argbFromRgba } from "@material/material-color-utilities";
 import i18next from "i18next";
-import { starterColors } from "#app/battle-scene";
-import { allAbilities } from "#app/data/ability";
+import { starterColors } from "#app/global-vars/starter-colors";
+import { allAbilities } from "#app/data/data-lists";
 import { speciesEggMoves } from "#app/data/balance/egg-moves";
 import { GrowthRate, getGrowthRateColor } from "#app/data/exp";
 import { Gender, getGenderColor, getGenderSymbol } from "#app/data/gender";
-import { allMoves } from "#app/data/move";
+import { allMoves } from "#app/data/moves/move";
 import { getNatureName } from "#app/data/nature";
 import type { SpeciesFormChange } from "#app/data/pokemon-forms";
 import { pokemonFormChanges } from "#app/data/pokemon-forms";
 import type { LevelMoves } from "#app/data/balance/pokemon-level-moves";
 import { pokemonFormLevelMoves, pokemonSpeciesLevelMoves } from "#app/data/balance/pokemon-level-moves";
-import type { PokemonForm } from "#app/data/pokemon-species";
 import type PokemonSpecies from "#app/data/pokemon-species";
-import { allSpecies, getPokemonSpeciesForm } from "#app/data/pokemon-species";
+import { allSpecies, getPokemonSpecies, getPokemonSpeciesForm, normalForm } from "#app/data/pokemon-species";
 import { getStarterValueFriendshipCap, speciesStarterCosts } from "#app/data/balance/starters";
 import { starterPassiveAbilities } from "#app/data/balance/passives";
-import { Type } from "#enums/type";
-import { GameModes } from "#app/game-mode";
-import type { DexEntry, StarterAttributes  } from "#app/system/game-data";
-import { AbilityAttr, DexAttr  } from "#app/system/game-data";
+import { PokemonType } from "#enums/pokemon-type";
+import type { DexEntry, StarterAttributes } from "#app/system/game-data";
+import { AbilityAttr, DexAttr } from "#app/system/game-data";
 import type { OptionSelectItem } from "#app/ui/abstact-option-select-ui-handler";
 import MessageUiHandler from "#app/ui/message-ui-handler";
 import { StatsContainer } from "#app/ui/stats-container";
-import { TextStyle, addTextObject, getTextStyleOptions } from "#app/ui/text";
-import { Mode } from "#app/ui/ui";
+import { TextStyle, addBBCodeTextObject, addTextObject, getTextColor, getTextStyleOptions } from "#app/ui/text";
+import { UiMode } from "#enums/ui-mode";
 import { addWindow } from "#app/ui/ui-theme";
 import { Egg } from "#app/data/egg";
 import Overrides from "#app/overrides";
 import { SettingKeyboard } from "#app/system/settings/settings-keyboard";
 import { Passive as PassiveAttr } from "#enums/passive";
-import * as Challenge from "#app/data/challenge";
 import MoveInfoOverlay from "#app/ui/move-info-overlay";
 import PokedexInfoOverlay from "#app/ui/pokedex-info-overlay";
 import { getEggTierForSpecies } from "#app/data/egg";
@@ -43,12 +40,21 @@ import type { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { Button } from "#enums/buttons";
 import { EggSourceType } from "#enums/egg-source-types";
-import { StarterContainer } from "#app/ui/starter-container";
-import { getPassiveCandyCount, getValueReductionCandyCounts, getSameSpeciesEggCandyCounts } from "#app/data/balance/starters";
-import { BooleanHolder, capitalizeString, getLocalizedSpriteKey, isNullOrUndefined, NumberHolder, padInt, rgbHexToRgba, toReadableString } from "#app/utils";
+import {
+  getPassiveCandyCount,
+  getValueReductionCandyCounts,
+  getSameSpeciesEggCandyCounts,
+} from "#app/data/balance/starters";
+import {
+  BooleanHolder,
+  getLocalizedSpriteKey,
+  isNullOrUndefined,
+  padInt,
+  rgbHexToRgba,
+  toReadableString,
+} from "#app/utils/common";
 import type { Nature } from "#enums/nature";
-import BgmBar from "./bgm-bar";
-import * as Utils from "../utils";
+import { getEnumKeys } from "#app/utils/common";
 import { speciesTmMoves } from "#app/data/balance/tms";
 import type { BiomeTierTod } from "#app/data/balance/biomes";
 import { BiomePoolTier, catchableSpecies } from "#app/data/balance/biomes";
@@ -57,62 +63,62 @@ import { TimeOfDay } from "#app/enums/time-of-day";
 import type { Abilities } from "#app/enums/abilities";
 import { BaseStatsOverlay } from "#app/ui/base-stats-overlay";
 import { globalScene } from "#app/global-scene";
-
+import type BBCodeText from "phaser3-rex-plugins/plugins/gameobjects/tagtext/bbcodetext/BBCodeText";
 
 interface LanguageSetting {
-  starterInfoTextSize: string,
-  instructionTextSize: string,
-  starterInfoXPos?: number,
-  starterInfoYOffset?: number
+  starterInfoTextSize: string;
+  instructionTextSize: string;
+  starterInfoXPos?: number;
+  starterInfoYOffset?: number;
 }
 
 const languageSettings: { [key: string]: LanguageSetting } = {
-  "en":{
+  en: {
     starterInfoTextSize: "56px",
     instructionTextSize: "38px",
   },
-  "de":{
+  de: {
     starterInfoTextSize: "48px",
     instructionTextSize: "35px",
     starterInfoXPos: 33,
   },
-  "es-ES":{
+  "es-ES": {
     starterInfoTextSize: "56px",
     instructionTextSize: "35px",
   },
-  "fr":{
+  fr: {
     starterInfoTextSize: "54px",
     instructionTextSize: "38px",
   },
-  "it":{
+  it: {
     starterInfoTextSize: "56px",
     instructionTextSize: "38px",
   },
-  "pt_BR":{
+  pt_BR: {
     starterInfoTextSize: "47px",
     instructionTextSize: "38px",
     starterInfoXPos: 33,
   },
-  "zh":{
+  zh: {
     starterInfoTextSize: "47px",
     instructionTextSize: "38px",
     starterInfoYOffset: 1,
     starterInfoXPos: 24,
   },
-  "pt":{
+  pt: {
     starterInfoTextSize: "48px",
     instructionTextSize: "42px",
     starterInfoXPos: 33,
   },
-  "ko":{
+  ko: {
     starterInfoTextSize: "52px",
     instructionTextSize: "38px",
   },
-  "ja":{
+  ja: {
     starterInfoTextSize: "51px",
     instructionTextSize: "38px",
   },
-  "ca-ES":{
+  "ca-ES": {
     starterInfoTextSize: "56px",
     instructionTextSize: "38px",
   },
@@ -124,11 +130,10 @@ const valueReductionMax = 2;
 const speciesContainerX = 109;
 
 interface SpeciesDetails {
-  shiny?: boolean,
-  formIndex?: number
-  female?: boolean,
-  variant?: number,
-  forSeen?: boolean, // default = false
+  shiny?: boolean;
+  formIndex?: number;
+  female?: boolean;
+  variant?: number;
 }
 
 enum MenuOptions {
@@ -140,15 +145,12 @@ enum MenuOptions {
   BIOMES,
   NATURES,
   TOGGLE_IVS,
-  EVOLUTIONS
+  EVOLUTIONS,
 }
 
-
 export default class PokedexPageUiHandler extends MessageUiHandler {
   private starterSelectContainer: Phaser.GameObjects.Container;
   private shinyOverlay: Phaser.GameObjects.Image;
-  private starterContainers: StarterContainer[] = [];
-  private filteredStarterContainers: StarterContainer[] = [];
   private pokemonNumberText: Phaser.GameObjects.Text;
   private pokemonSprite: Phaser.GameObjects.Sprite;
   private pokemonNameText: Phaser.GameObjects.Text;
@@ -168,9 +170,9 @@ export default class PokedexPageUiHandler extends MessageUiHandler {
   private pokemonCaughtHatchedContainer: Phaser.GameObjects.Container;
   private pokemonCaughtCountText: Phaser.GameObjects.Text;
   private pokemonFormText: Phaser.GameObjects.Text;
-  private pokemonHatchedIcon : Phaser.GameObjects.Sprite;
+  private pokemonHatchedIcon: Phaser.GameObjects.Sprite;
   private pokemonHatchedCountText: Phaser.GameObjects.Text;
-  private pokemonShinyIcon: Phaser.GameObjects.Sprite;
+  private pokemonShinyIcons: Phaser.GameObjects.Sprite[];
 
   private activeTooltip: "ABILITY" | "PASSIVE" | "CANDY" | undefined;
   private instructionsContainer: Phaser.GameObjects.Container;
@@ -199,6 +201,7 @@ export default class PokedexPageUiHandler extends MessageUiHandler {
 
   private allSpecies: PokemonSpecies[] = [];
   private species: PokemonSpecies;
+  private starterId: number;
   private formIndex: number;
   private speciesLoaded: Map<Species, boolean> = new Map<Species, boolean>();
   private levelMoves: LevelMoves;
@@ -237,22 +240,32 @@ export default class PokedexPageUiHandler extends MessageUiHandler {
   private starterAttributes: StarterAttributes;
   private savedStarterAttributes: StarterAttributes;
 
-  protected blockInput: boolean = false;
-  protected blockInputOverlay: boolean = false;
+  private previousSpecies: PokemonSpecies[];
+  private previousStarterAttributes: StarterAttributes[];
 
-  private showBackSprite: boolean = false;
+  protected blockInput = false;
+  protected blockInputOverlay = false;
+
+  private showBackSprite = false;
 
   // Menu
   private menuContainer: Phaser.GameObjects.Container;
   private menuBg: Phaser.GameObjects.NineSlice;
-  protected optionSelectText: Phaser.GameObjects.Text;
-  public bgmBar: BgmBar;
+  protected optionSelectText: BBCodeText;
   private menuOptions: MenuOptions[];
-  protected scale: number = 0.1666666667;
+  protected scale = 0.1666666667;
   private menuDescriptions: string[];
+  private isFormGender: boolean;
+  private filteredIndices: Species[] | null = null;
+
+  private availableVariants: number;
+  private unlockedVariants: boolean[];
+
+  private canUseCandies: boolean;
+  private exitCallback;
 
   constructor() {
-    super(Mode.POKEDEX_PAGE);
+    super(UiMode.POKEDEX_PAGE);
   }
 
   setup() {
@@ -265,7 +278,13 @@ export default class PokedexPageUiHandler extends MessageUiHandler {
     this.starterSelectContainer.setVisible(false);
     ui.add(this.starterSelectContainer);
 
-    const bgColor = globalScene.add.rectangle(0, 0, globalScene.game.canvas.width / 6, globalScene.game.canvas.height / 6, 0x006860);
+    const bgColor = globalScene.add.rectangle(
+      0,
+      0,
+      globalScene.game.canvas.width / 6,
+      globalScene.game.canvas.height / 6,
+      0x006860,
+    );
     bgColor.setOrigin(0, 0);
     this.starterSelectContainer.add(bgColor);
 
@@ -273,6 +292,13 @@ export default class PokedexPageUiHandler extends MessageUiHandler {
     starterSelectBg.setOrigin(0, 0);
     this.starterSelectContainer.add(starterSelectBg);
 
+    this.pokemonSprite = globalScene.add.sprite(53, 63, "pkmn__sub");
+    this.pokemonSprite.setPipeline(globalScene.spritePipeline, {
+      tone: [0.0, 0.0, 0.0, 0.0],
+      ignoreTimeTint: true,
+    });
+    this.starterSelectContainer.add(this.pokemonSprite);
+
     this.shinyOverlay = globalScene.add.image(6, 6, "summary_overlay_shiny");
     this.shinyOverlay.setOrigin(0, 0);
     this.shinyOverlay.setVisible(false);
@@ -286,7 +312,13 @@ export default class PokedexPageUiHandler extends MessageUiHandler {
     this.pokemonNameText.setOrigin(0, 0);
     this.starterSelectContainer.add(this.pokemonNameText);
 
-    this.pokemonGrowthRateLabelText = addTextObject(8, 106, i18next.t("pokedexUiHandler:growthRate"), TextStyle.SUMMARY_ALT, { fontSize: "36px" });
+    this.pokemonGrowthRateLabelText = addTextObject(
+      8,
+      106,
+      i18next.t("pokedexUiHandler:growthRate"),
+      TextStyle.SUMMARY_ALT,
+      { fontSize: "36px" },
+    );
     this.pokemonGrowthRateLabelText.setOrigin(0, 0);
     this.pokemonGrowthRateLabelText.setVisible(false);
     this.starterSelectContainer.add(this.pokemonGrowthRateLabelText);
@@ -299,7 +331,9 @@ export default class PokedexPageUiHandler extends MessageUiHandler {
     this.pokemonGenderText.setOrigin(0, 0);
     this.starterSelectContainer.add(this.pokemonGenderText);
 
-    this.pokemonUncaughtText = addTextObject(6, 127, i18next.t("pokedexUiHandler:uncaught"), TextStyle.WINDOW, { fontSize: "56px" });
+    this.pokemonUncaughtText = addTextObject(6, 127, i18next.t("pokedexUiHandler:uncaught"), TextStyle.WINDOW, {
+      fontSize: "56px",
+    });
     this.pokemonUncaughtText.setOrigin(0, 0);
     this.starterSelectContainer.add(this.pokemonUncaughtText);
 
@@ -312,18 +346,10 @@ export default class PokedexPageUiHandler extends MessageUiHandler {
 
       this.speciesLoaded.set(species.speciesId, false);
       this.allSpecies.push(species);
-
-      const starterContainer = new StarterContainer(species).setVisible(false);
-      this.starterContainers.push(starterContainer);
-      starterBoxContainer.add(starterContainer);
     }
 
     this.starterSelectContainer.add(starterBoxContainer);
 
-    this.pokemonSprite = globalScene.add.sprite(53, 63, "pkmn__sub");
-    this.pokemonSprite.setPipeline(globalScene.spritePipeline, { tone: [ 0.0, 0.0, 0.0, 0.0 ], ignoreTimeTint: true });
-    this.starterSelectContainer.add(this.pokemonSprite);
-
     this.type1Icon = globalScene.add.sprite(8, 98, getLocalizedSpriteKey("types"));
     this.type1Icon.setScale(0.5);
     this.type1Icon.setOrigin(0, 0);
@@ -334,11 +360,15 @@ export default class PokedexPageUiHandler extends MessageUiHandler {
     this.type2Icon.setOrigin(0, 0);
     this.starterSelectContainer.add(this.type2Icon);
 
-    this.pokemonLuckLabelText = addTextObject(8, 89, i18next.t("common:luckIndicator"), TextStyle.WINDOW_ALT, { fontSize: "56px" });
+    this.pokemonLuckLabelText = addTextObject(8, 89, i18next.t("common:luckIndicator"), TextStyle.WINDOW_ALT, {
+      fontSize: "56px",
+    });
     this.pokemonLuckLabelText.setOrigin(0, 0);
     this.starterSelectContainer.add(this.pokemonLuckLabelText);
 
-    this.pokemonLuckText = addTextObject(8 + this.pokemonLuckLabelText.displayWidth + 2, 89, "0", TextStyle.WINDOW, { fontSize: "56px" });
+    this.pokemonLuckText = addTextObject(8 + this.pokemonLuckLabelText.displayWidth + 2, 89, "0", TextStyle.WINDOW, {
+      fontSize: "56px",
+    });
     this.pokemonLuckText.setOrigin(0, 0);
     this.starterSelectContainer.add(this.pokemonLuckText);
 
@@ -359,7 +389,7 @@ export default class PokedexPageUiHandler extends MessageUiHandler {
     this.pokemonCandyDarknessOverlay.setScale(0.5);
     this.pokemonCandyDarknessOverlay.setOrigin(0, 0);
     this.pokemonCandyDarknessOverlay.setTint(0x000000);
-    this.pokemonCandyDarknessOverlay.setAlpha(0.50);
+    this.pokemonCandyDarknessOverlay.setAlpha(0.5);
     this.pokemonCandyContainer.add(this.pokemonCandyDarknessOverlay);
 
     this.pokemonCandyCountText = addTextObject(9.5, 0, "x0", TextStyle.WINDOW_ALT, { fontSize: "56px" });
@@ -369,7 +399,9 @@ export default class PokedexPageUiHandler extends MessageUiHandler {
     this.pokemonCandyContainer.setInteractive(new Phaser.Geom.Rectangle(0, 0, 30, 20), Phaser.Geom.Rectangle.Contains);
     this.starterSelectContainer.add(this.pokemonCandyContainer);
 
-    this.pokemonFormText = addTextObject(6, 42, "Form", TextStyle.WINDOW_ALT, { fontSize: "42px" });
+    this.pokemonFormText = addTextObject(6, 42, "Form", TextStyle.WINDOW_ALT, {
+      fontSize: "42px",
+    });
     this.pokemonFormText.setOrigin(0, 0);
     this.starterSelectContainer.add(this.pokemonFormText);
 
@@ -391,10 +423,16 @@ export default class PokedexPageUiHandler extends MessageUiHandler {
     this.pokemonHatchedIcon.setScale(0.8);
     this.pokemonCaughtHatchedContainer.add(this.pokemonHatchedIcon);
 
-    this.pokemonShinyIcon = globalScene.add.sprite(14, 76, "shiny_icons");
-    this.pokemonShinyIcon.setOrigin(0.15, 0.2);
-    this.pokemonShinyIcon.setScale(1);
-    this.pokemonCaughtHatchedContainer.add(this.pokemonShinyIcon);
+    this.pokemonShinyIcons = [];
+    for (let i = 0; i < 3; i++) {
+      const pokemonShinyIcon = globalScene.add.sprite(153 + i * 13, 160, "shiny_icons");
+      pokemonShinyIcon.setOrigin(0.15, 0.2);
+      pokemonShinyIcon.setScale(1);
+      pokemonShinyIcon.setFrame(getVariantIcon(i as Variant));
+      pokemonShinyIcon.setVisible(false);
+      this.pokemonCaughtHatchedContainer.add(pokemonShinyIcon);
+      this.pokemonShinyIcons.push(pokemonShinyIcon);
+    }
 
     this.pokemonHatchedCountText = addTextObject(24, 19, "0", TextStyle.SUMMARY_ALT);
     this.pokemonHatchedCountText.setOrigin(0, 0);
@@ -407,48 +445,110 @@ export default class PokedexPageUiHandler extends MessageUiHandler {
     this.instructionsContainer.setVisible(true);
     this.starterSelectContainer.add(this.instructionsContainer);
 
-    this.candyUpgradeIconElement = new Phaser.GameObjects.Sprite(globalScene, this.instructionRowX, this.instructionRowY, "keyboard", "C.png");
+    this.candyUpgradeIconElement = new Phaser.GameObjects.Sprite(
+      globalScene,
+      this.instructionRowX,
+      this.instructionRowY,
+      "keyboard",
+      "C.png",
+    );
     this.candyUpgradeIconElement.setName("sprite-candyUpgrade-icon-element");
     this.candyUpgradeIconElement.setScale(0.675);
     this.candyUpgradeIconElement.setOrigin(0.0, 0.0);
-    this.candyUpgradeLabel = addTextObject(this.instructionRowX + this.instructionRowTextOffset, this.instructionRowY, i18next.t("pokedexUiHandler:candyUpgrade"), TextStyle.PARTY, { fontSize: instructionTextSize });
+    this.candyUpgradeLabel = addTextObject(
+      this.instructionRowX + this.instructionRowTextOffset,
+      this.instructionRowY,
+      i18next.t("pokedexUiHandler:candyUpgrade"),
+      TextStyle.PARTY,
+      { fontSize: instructionTextSize },
+    );
     this.candyUpgradeLabel.setName("text-candyUpgrade-label");
 
     // instruction rows that will be pushed into the container dynamically based on need
     // creating new sprites since they will be added to the scene later
-    this.shinyIconElement = new Phaser.GameObjects.Sprite(globalScene, this.instructionRowX, this.instructionRowY, "keyboard", "R.png");
+    this.shinyIconElement = new Phaser.GameObjects.Sprite(
+      globalScene,
+      this.instructionRowX,
+      this.instructionRowY,
+      "keyboard",
+      "R.png",
+    );
     this.shinyIconElement.setName("sprite-shiny-icon-element");
     this.shinyIconElement.setScale(0.675);
     this.shinyIconElement.setOrigin(0.0, 0.0);
-    this.shinyLabel = addTextObject(this.instructionRowX + this.instructionRowTextOffset, this.instructionRowY, i18next.t("pokedexUiHandler:cycleShiny"), TextStyle.PARTY, { fontSize: instructionTextSize });
+    this.shinyLabel = addTextObject(
+      this.instructionRowX + this.instructionRowTextOffset,
+      this.instructionRowY,
+      i18next.t("pokedexUiHandler:cycleShiny"),
+      TextStyle.PARTY,
+      { fontSize: instructionTextSize },
+    );
     this.shinyLabel.setName("text-shiny-label");
 
-    this.formIconElement = new Phaser.GameObjects.Sprite(globalScene, this.instructionRowX, this.instructionRowY, "keyboard", "F.png");
+    this.formIconElement = new Phaser.GameObjects.Sprite(
+      globalScene,
+      this.instructionRowX,
+      this.instructionRowY,
+      "keyboard",
+      "F.png",
+    );
     this.formIconElement.setName("sprite-form-icon-element");
     this.formIconElement.setScale(0.675);
     this.formIconElement.setOrigin(0.0, 0.0);
-    this.formLabel = addTextObject(this.instructionRowX + this.instructionRowTextOffset, this.instructionRowY, i18next.t("pokedexUiHandler:cycleForm"), TextStyle.PARTY, { fontSize: instructionTextSize });
+    this.formLabel = addTextObject(
+      this.instructionRowX + this.instructionRowTextOffset,
+      this.instructionRowY,
+      i18next.t("pokedexUiHandler:cycleForm"),
+      TextStyle.PARTY,
+      { fontSize: instructionTextSize },
+    );
     this.formLabel.setName("text-form-label");
 
-    this.genderIconElement = new Phaser.GameObjects.Sprite(globalScene, this.instructionRowX, this.instructionRowY, "keyboard", "G.png");
+    this.genderIconElement = new Phaser.GameObjects.Sprite(
+      globalScene,
+      this.instructionRowX,
+      this.instructionRowY,
+      "keyboard",
+      "G.png",
+    );
     this.genderIconElement.setName("sprite-gender-icon-element");
     this.genderIconElement.setScale(0.675);
     this.genderIconElement.setOrigin(0.0, 0.0);
-    this.genderLabel = addTextObject(this.instructionRowX + this.instructionRowTextOffset, this.instructionRowY, i18next.t("pokedexUiHandler:cycleGender"), TextStyle.PARTY, { fontSize: instructionTextSize });
+    this.genderLabel = addTextObject(
+      this.instructionRowX + this.instructionRowTextOffset,
+      this.instructionRowY,
+      i18next.t("pokedexUiHandler:cycleGender"),
+      TextStyle.PARTY,
+      { fontSize: instructionTextSize },
+    );
     this.genderLabel.setName("text-gender-label");
 
-    this.variantIconElement = new Phaser.GameObjects.Sprite(globalScene, this.instructionRowX, this.instructionRowY, "keyboard", "V.png");
+    this.variantIconElement = new Phaser.GameObjects.Sprite(
+      globalScene,
+      this.instructionRowX,
+      this.instructionRowY,
+      "keyboard",
+      "V.png",
+    );
     this.variantIconElement.setName("sprite-variant-icon-element");
     this.variantIconElement.setScale(0.675);
     this.variantIconElement.setOrigin(0.0, 0.0);
-    this.variantLabel = addTextObject(this.instructionRowX + this.instructionRowTextOffset, this.instructionRowY, i18next.t("pokedexUiHandler:cycleVariant"), TextStyle.PARTY, { fontSize: instructionTextSize });
+    this.variantLabel = addTextObject(
+      this.instructionRowX + this.instructionRowTextOffset,
+      this.instructionRowY,
+      i18next.t("pokedexUiHandler:cycleVariant"),
+      TextStyle.PARTY,
+      { fontSize: instructionTextSize },
+    );
     this.variantLabel.setName("text-variant-label");
 
     this.showBackSpriteIconElement = new Phaser.GameObjects.Sprite(globalScene, 50, 7, "keyboard", "E.png");
     this.showBackSpriteIconElement.setName("show-backSprite-icon-element");
     this.showBackSpriteIconElement.setScale(0.675);
     this.showBackSpriteIconElement.setOrigin(0.0, 0.0);
-    this.showBackSpriteLabel = addTextObject(60, 7, i18next.t("pokedexUiHandler:showBackSprite"), TextStyle.PARTY, { fontSize: instructionTextSize });
+    this.showBackSpriteLabel = addTextObject(60, 7, i18next.t("pokedexUiHandler:showBackSprite"), TextStyle.PARTY, {
+      fontSize: instructionTextSize,
+    });
     this.showBackSpriteLabel.setName("show-backSprite-label");
     this.starterSelectContainer.add(this.showBackSpriteIconElement);
     this.starterSelectContainer.add(this.showBackSpriteLabel);
@@ -482,22 +582,25 @@ export default class PokedexPageUiHandler extends MessageUiHandler {
 
     this.starterSelectContainer.add(this.statsContainer);
 
-
     // Adding menu container
     this.menuContainer = globalScene.add.container(-130, 0);
     this.menuContainer.setName("menu");
-    this.menuContainer.setInteractive(new Phaser.Geom.Rectangle(0, 0, globalScene.game.canvas.width / 6, globalScene.game.canvas.height / 6), Phaser.Geom.Rectangle.Contains);
+    this.menuContainer.setInteractive(
+      new Phaser.Geom.Rectangle(0, 0, globalScene.game.canvas.width / 6, globalScene.game.canvas.height / 6),
+      Phaser.Geom.Rectangle.Contains,
+    );
 
-    this.bgmBar = new BgmBar();
-    this.bgmBar.setup();
-    ui.bgmBar = this.bgmBar;
-    this.menuContainer.add(this.bgmBar);
     this.menuContainer.setVisible(false);
 
-    this.menuOptions = Utils.getEnumKeys(MenuOptions).map(m => parseInt(MenuOptions[m]) as MenuOptions);
+    this.menuOptions = getEnumKeys(MenuOptions).map(m => Number.parseInt(MenuOptions[m]) as MenuOptions);
 
-    this.optionSelectText = addTextObject(0, 0, this.menuOptions.map(o => `${i18next.t(`pokedexUiHandler:${MenuOptions[o]}`)}`).join("\n"), TextStyle.WINDOW, { maxLines: this.menuOptions.length });
-    this.optionSelectText.setLineSpacing(12);
+    this.optionSelectText = addBBCodeTextObject(
+      0,
+      0,
+      this.menuOptions.map(o => `${i18next.t(`pokedexUiHandler:${MenuOptions[o]}`)}`).join("\n"),
+      TextStyle.WINDOW,
+      { maxLines: this.menuOptions.length, lineSpacing: 12 },
+    );
 
     this.menuDescriptions = [
       i18next.t("pokedexUiHandler:showBaseStats"),
@@ -508,19 +611,19 @@ export default class PokedexPageUiHandler extends MessageUiHandler {
       i18next.t("pokedexUiHandler:showBiomes"),
       i18next.t("pokedexUiHandler:showNatures"),
       i18next.t("pokedexUiHandler:toggleIVs"),
-      i18next.t("pokedexUiHandler:showEvolutions")
+      i18next.t("pokedexUiHandler:showEvolutions"),
     ];
 
     this.scale = getTextStyleOptions(TextStyle.WINDOW, globalScene.uiTheme).scale;
     this.menuBg = addWindow(
-      (globalScene.game.canvas.width / 6) - (this.optionSelectText.displayWidth + 25),
+      globalScene.game.canvas.width / 6 - 83,
       0,
       this.optionSelectText.displayWidth + 19 + 24 * this.scale,
-      (globalScene.game.canvas.height / 6) - 2
+      globalScene.game.canvas.height / 6 - 2,
     );
     this.menuBg.setOrigin(0, 0);
 
-    this.optionSelectText.setPositionRelative(this.menuBg, 10 + 24 * this.scale, 6);
+    this.optionSelectText.setPosition(this.menuBg.x + 10 + 24 * this.scale, this.menuBg.y + 6);
 
     this.menuContainer.add(this.menuBg);
 
@@ -530,9 +633,8 @@ export default class PokedexPageUiHandler extends MessageUiHandler {
 
     this.starterSelectContainer.add(this.menuContainer);
 
-
     // adding base stats
-    this.baseStatsOverlay = new BaseStatsOverlay({ x: 317, y: 0, width:133 });
+    this.baseStatsOverlay = new BaseStatsOverlay({ x: 317, y: 0, width: 133 });
     this.menuContainer.add(this.baseStatsOverlay);
     this.menuContainer.bringToTop(this.baseStatsOverlay);
 
@@ -556,18 +658,32 @@ export default class PokedexPageUiHandler extends MessageUiHandler {
     // Filter bar sits above everything, except the message box
     this.starterSelectContainer.bringToTop(this.starterSelectMessageBoxContainer);
 
-    this.updateInstructions();
+    this.previousSpecies = [];
+    this.previousStarterAttributes = [];
   }
 
   show(args: any[]): boolean {
+    // Allow the use of candies if we are in one of the whitelisted phases
+    this.canUseCandies = ["TitlePhase", "SelectStarterPhase", "CommandPhase"].includes(
+      globalScene.getCurrentPhase()?.constructor.name ?? "",
+    );
 
     if (args.length >= 1 && args[0] === "refresh") {
       return false;
-    } else {
-      this.species = args[0];
-      this.formIndex = args[1] ?? 0;
-      this.savedStarterAttributes = args[2] ?? { shiny:false, female:true, variant:0, form:0 };
-      this.starterSetup();
+    }
+    this.species = args[0];
+    this.savedStarterAttributes = args[1] ?? {
+      shiny: false,
+      female: true,
+      variant: 0,
+      form: 0,
+    };
+    this.formIndex = this.savedStarterAttributes.form ?? 0;
+    this.filteredIndices = args[2] ?? null;
+    this.starterSetup();
+
+    if (args[4] instanceof Function) {
+      this.exitCallback = args[4];
     }
 
     this.moveInfoOverlay.clear(); // clear this when removing a menu; the cancel button doesn't seem to trigger this automatically on controllers
@@ -580,7 +696,7 @@ export default class PokedexPageUiHandler extends MessageUiHandler {
 
     this.starterAttributes = this.initStarterPrefs();
 
-    this.menuOptions = Utils.getEnumKeys(MenuOptions).map(m => parseInt(MenuOptions[m]) as MenuOptions);
+    this.menuOptions = getEnumKeys(MenuOptions).map(m => Number.parseInt(MenuOptions[m]) as MenuOptions);
 
     this.menuContainer.setVisible(true);
 
@@ -588,58 +704,114 @@ export default class PokedexPageUiHandler extends MessageUiHandler {
     this.setSpecies();
     this.updateInstructions();
 
+    this.optionSelectText.setText(this.getMenuText());
+
     this.setCursor(0);
 
     return true;
+  }
 
+  getMenuText(): string {
+    const isSeen = this.isSeen();
+    const isStarterCaught = !!this.isCaught(this.getStarterSpecies(this.species));
+
+    return this.menuOptions
+      .map(o => {
+        const label = `${i18next.t(`pokedexUiHandler:${MenuOptions[o]}`)}`;
+        const isDark =
+          !isSeen ||
+          (!isStarterCaught && (o === MenuOptions.TOGGLE_IVS || o === MenuOptions.NATURES)) ||
+          (this.tmMoves.length < 1 && o === MenuOptions.TM_MOVES);
+        const color = getTextColor(
+          isDark ? TextStyle.SHADOW_TEXT : TextStyle.SETTINGS_VALUE,
+          false,
+          globalScene.uiTheme,
+        );
+        const shadow = getTextColor(
+          isDark ? TextStyle.SHADOW_TEXT : TextStyle.SETTINGS_VALUE,
+          true,
+          globalScene.uiTheme,
+        );
+        return `[shadow=${shadow}][color=${color}]${label}[/color][/shadow]`;
+      })
+      .join("\n");
   }
 
   starterSetup(): void {
-
     this.evolutions = [];
     this.prevolutions = [];
     this.battleForms = [];
 
     const species = this.species;
+
+    let formKey = this.species?.forms.length > 0 ? this.species.forms[this.formIndex].formKey : "";
+    this.isFormGender = formKey === "male" || formKey === "female";
+    if (
+      this.isFormGender &&
+      ((this.savedStarterAttributes.female === true && formKey === "male") ||
+        (this.savedStarterAttributes.female === false && formKey === "female"))
+    ) {
+      this.formIndex = (this.formIndex + 1) % 2;
+      formKey = this.species.forms[this.formIndex].formKey;
+    }
+
     const formIndex = this.formIndex ?? 0;
 
-    const allEvolutions = pokemonEvolutions.hasOwnProperty(species.speciesId) ? pokemonEvolutions[species.speciesId] : [];
+    this.starterId = this.getStarterSpeciesId(this.species.speciesId);
+
+    const allEvolutions = pokemonEvolutions.hasOwnProperty(species.speciesId)
+      ? pokemonEvolutions[species.speciesId]
+      : [];
 
     if (species.forms.length > 0) {
       const form = species.forms[formIndex];
 
       // If this form has a specific set of moves, we get them.
-      this.levelMoves = (formIndex > 0 && pokemonFormLevelMoves.hasOwnProperty(formIndex)) ? pokemonFormLevelMoves[species.speciesId][formIndex] : pokemonSpeciesLevelMoves[species.speciesId];
+      this.levelMoves =
+        formIndex > 0 &&
+        pokemonFormLevelMoves.hasOwnProperty(species.speciesId) &&
+        pokemonFormLevelMoves[species.speciesId].hasOwnProperty(formIndex)
+          ? pokemonFormLevelMoves[species.speciesId][formIndex]
+          : pokemonSpeciesLevelMoves[species.speciesId];
       this.ability1 = form.ability1;
-      this.ability2 = (form.ability2 === form.ability1) ? undefined : form.ability2;
-      this.abilityHidden = (form.abilityHidden === form.ability1) ? undefined : form.abilityHidden;
+      this.ability2 = form.ability2 === form.ability1 ? undefined : form.ability2;
+      this.abilityHidden = form.abilityHidden === form.ability1 ? undefined : form.abilityHidden;
 
-      this.evolutions = allEvolutions.filter(e => (e.preFormKey === form.formKey || e.preFormKey === null));
+      this.evolutions = allEvolutions.filter(e => e.preFormKey === form.formKey || e.preFormKey === null);
       this.baseStats = form.baseStats;
       this.baseTotal = form.baseTotal;
-
     } else {
       this.levelMoves = pokemonSpeciesLevelMoves[species.speciesId];
       this.ability1 = species.ability1;
-      this.ability2 = (species.ability2 === species.ability1) ? undefined : species.ability2;
-      this.abilityHidden = (species.abilityHidden === species.ability1) ? undefined : species.abilityHidden;
+      this.ability2 = species.ability2 === species.ability1 ? undefined : species.ability2;
+      this.abilityHidden = species.abilityHidden === species.ability1 ? undefined : species.abilityHidden;
 
       this.evolutions = allEvolutions;
       this.baseStats = species.baseStats;
       this.baseTotal = species.baseTotal;
     }
 
-    this.eggMoves = speciesEggMoves[this.getStarterSpeciesId(species.speciesId)] ?? [];
-    this.hasEggMoves = Array.from({ length: 4 }, (_, em) => (globalScene.gameData.starterData[this.getStarterSpeciesId(species.speciesId)].eggMoves & (1 << em)) !== 0);
+    this.eggMoves = speciesEggMoves[this.starterId] ?? [];
+    this.hasEggMoves = Array.from(
+      { length: 4 },
+      (_, em) => (globalScene.gameData.starterData[this.starterId].eggMoves & (1 << em)) !== 0,
+    );
 
-    const formKey = this.species?.forms.length > 0 ? this.species.forms[this.formIndex].formKey : "";
-    this.tmMoves = speciesTmMoves[species.speciesId]?.filter(m => Array.isArray(m) ? (m[0] === formKey ? true : false ) : true)
-      .map(m => Array.isArray(m) ? m[1] : m).sort((a, b) => allMoves[a].name > allMoves[b].name ? 1 : -1) ?? [];
+    this.tmMoves =
+      speciesTmMoves[species.speciesId]
+        ?.filter(m => (Array.isArray(m) ? m[0] === formKey : true))
+        .map(m => (Array.isArray(m) ? m[1] : m))
+        .sort((a, b) => (allMoves[a].name > allMoves[b].name ? 1 : -1)) ?? [];
 
-    const passives = starterPassiveAbilities[this.getStarterSpeciesId(species.speciesId)];
-    this.passive = (this.formIndex in passives) ? passives[formIndex] : passives[0];
+    const passiveId = starterPassiveAbilities.hasOwnProperty(species.speciesId)
+      ? species.speciesId
+      : starterPassiveAbilities.hasOwnProperty(this.starterId)
+        ? this.starterId
+        : pokemonPrevolutions[this.starterId];
+    const passives = starterPassiveAbilities[passiveId];
+    this.passive = this.formIndex in passives ? passives[formIndex] : passives[0];
 
-    const starterData = globalScene.gameData.starterData[this.getStarterSpeciesId(species.speciesId)];
+    const starterData = globalScene.gameData.starterData[this.starterId];
     const abilityAttr = starterData.abilityAttr;
     this.hasPassive = starterData.passiveAttr > 0;
 
@@ -647,48 +819,50 @@ export default class PokedexPageUiHandler extends MessageUiHandler {
     const hasAbility2 = abilityAttr & AbilityAttr.ABILITY_2;
     const hasHiddenAbility = abilityAttr & AbilityAttr.ABILITY_HIDDEN;
 
-    this.hasAbilities = [
-      hasAbility1,
-      hasAbility2,
-      hasHiddenAbility
-    ];
+    this.hasAbilities = [hasAbility1, hasAbility2, hasHiddenAbility];
 
     const allBiomes = catchableSpecies[species.speciesId] ?? [];
     this.preBiomes = this.sanitizeBiomes(
-      (catchableSpecies[this.getStarterSpeciesId(species.speciesId)] ?? [])
-        .filter(b => !allBiomes.some(bm => (b.biome === bm.biome && b.tier === bm.tier)) && !(b.biome === Biome.TOWN)),
-      this.getStarterSpeciesId(species.speciesId));
+      (catchableSpecies[this.starterId] ?? []).filter(
+        b => !allBiomes.some(bm => b.biome === bm.biome && b.tier === bm.tier) && !(b.biome === Biome.TOWN),
+      ),
+      this.starterId,
+    );
     this.biomes = this.sanitizeBiomes(allBiomes, species.speciesId);
 
-    const allFormChanges = pokemonFormChanges.hasOwnProperty(species.speciesId) ? pokemonFormChanges[species.speciesId] : [];
-    this.battleForms = allFormChanges.filter(f => (f.preFormKey === this.species.forms[this.formIndex].formKey));
+    const allFormChanges = pokemonFormChanges.hasOwnProperty(species.speciesId)
+      ? pokemonFormChanges[species.speciesId]
+      : [];
+    this.battleForms = allFormChanges.filter(f => f.preFormKey === this.species.forms[this.formIndex].formKey);
 
-    const preSpecies = pokemonPrevolutions.hasOwnProperty(this.species.speciesId) ? allSpecies.find(sp => sp.speciesId === pokemonPrevolutions[this.species.speciesId]) : null;
+    const preSpecies = pokemonPrevolutions.hasOwnProperty(this.species.speciesId)
+      ? allSpecies.find(sp => sp.speciesId === pokemonPrevolutions[this.species.speciesId])
+      : null;
     if (preSpecies) {
-      const preEvolutions = pokemonEvolutions.hasOwnProperty(preSpecies.speciesId) ? pokemonEvolutions[preSpecies.speciesId] : [];
+      const preEvolutions = pokemonEvolutions.hasOwnProperty(preSpecies.speciesId)
+        ? pokemonEvolutions[preSpecies.speciesId]
+        : [];
       this.prevolutions = preEvolutions.filter(
-        e => e.speciesId === species.speciesId && (
-          (
-            (e.evoFormKey === "" || e.evoFormKey === null) &&
-            (
-              // This takes care of Cosplay Pikachu (Pichu is not shown)
-              (preSpecies.forms.some(form => form.formKey === species.forms[formIndex]?.formKey)) ||
+        e =>
+          e.speciesId === species.speciesId &&
+          (((e.evoFormKey === "" || e.evoFormKey === null) &&
+            // This takes care of Cosplay Pikachu (Pichu is not shown)
+            (preSpecies.forms.some(form => form.formKey === species.forms[formIndex]?.formKey) ||
               // This takes care of Gholdengo
               (preSpecies.forms.length > 0 && species.forms.length === 0) ||
               // This takes care of everything else
-              (preSpecies.forms.length === 0 && (species.forms.length === 0 || species.forms[formIndex]?.formKey === ""))
-            )
-          )
-          // This takes care of Burmy, Shellos etc
-          || e.evoFormKey === species.forms[formIndex]?.formKey
-        )
+              (preSpecies.forms.length === 0 &&
+                (species.forms.length === 0 || species.forms[formIndex]?.formKey === "")))) ||
+            // This takes care of Burmy, Shellos etc
+            e.evoFormKey === species.forms[formIndex]?.formKey),
       );
     }
+
+    this.availableVariants = species.getFullUnlocksData() & DexAttr.VARIANT_3 ? 3 : 1;
   }
 
   // Function to ensure that forms appear in the appropriate biome and tod
   sanitizeBiomes(biomes: BiomeTierTod[], speciesId: number): BiomeTierTod[] {
-
     if (speciesId === Species.BURMY || speciesId === Species.WORMADAM) {
       return biomes.filter(b => {
         const formIndex = (() => {
@@ -703,8 +877,8 @@ export default class PokedexPageUiHandler extends MessageUiHandler {
         })();
         return this.formIndex === formIndex;
       });
-
-    } else if (speciesId === Species.ROTOM) {
+    }
+    if (speciesId === Species.ROTOM) {
       return biomes.filter(b => {
         const formIndex = (() => {
           switch (b.biome) {
@@ -724,8 +898,8 @@ export default class PokedexPageUiHandler extends MessageUiHandler {
         })();
         return this.formIndex === formIndex;
       });
-
-    } else if (speciesId === Species.LYCANROC) {
+    }
+    if (speciesId === Species.LYCANROC) {
       return biomes.filter(b => {
         const formIndex = (() => {
           switch (b.tod[0]) {
@@ -747,38 +921,57 @@ export default class PokedexPageUiHandler extends MessageUiHandler {
     return biomes;
   }
 
-  isCaught(otherSpeciesDexEntry?: DexEntry): bigint {
+  /**
+   * Return the caughtAttr of a given species, sanitized.
+   *
+   * @param otherSpecies The species to check; defaults to current species
+   * @returns caught DexAttr for the species
+   */
+  isCaught(otherSpecies?: PokemonSpecies): bigint {
+    const species = otherSpecies ? otherSpecies : this.species;
+
     if (globalScene.dexForDevs) {
-      return 255n;
+      species.getFullUnlocksData();
     }
 
-    const dexEntry = otherSpeciesDexEntry ? otherSpeciesDexEntry : this.speciesStarterDexEntry;
+    const dexEntry = globalScene.gameData.dexData[species.speciesId];
 
-    return dexEntry?.caughtAttr ?? 0n;
+    return (dexEntry?.caughtAttr ?? 0n) & species.getFullUnlocksData();
   }
+
   /**
    * Check whether a given form is caught for a given species.
    * All forms that can be reached through a form change during battle are considered caught and show up in the dex as such.
    *
    * @param otherSpecies The species to check; defaults to current species
    * @param otherFormIndex The form index of the form to check; defaults to current form
-   * @returns StarterAttributes for the species
+   * @returns `true` if the form is caught
    */
   isFormCaught(otherSpecies?: PokemonSpecies, otherFormIndex?: number | undefined): boolean {
-
     if (globalScene.dexForDevs) {
       return true;
     }
     const species = otherSpecies ? otherSpecies : this.species;
     const formIndex = otherFormIndex !== undefined ? otherFormIndex : this.formIndex;
-    const dexEntry = globalScene.gameData.dexData[species.speciesId];
+    const caughtAttr = this.isCaught(species);
+
+    if (caughtAttr && (!species.forms.length || species.forms.length === 1)) {
+      return true;
+    }
+
+    const isFormCaught = (caughtAttr & globalScene.gameData.getFormAttr(formIndex ?? 0)) > 0n;
 
-    const isFormCaught = dexEntry ?
-      (dexEntry.caughtAttr & globalScene.gameData.getFormAttr(formIndex ?? 0)) > 0n
-      : false;
     return isFormCaught;
   }
 
+  isSeen(): boolean {
+    if (this.speciesStarterDexEntry?.seenAttr) {
+      return true;
+    }
+    const starterCaughtAttr = this.isCaught(this.getStarterSpecies(this.species));
+    return !!starterCaughtAttr;
+  }
+
   /**
    * Get the starter attributes for the given PokemonSpecies, after sanitizing them.
    * If somehow a preference is set for a form, variant, gender, ability or nature
@@ -788,56 +981,74 @@ export default class PokedexPageUiHandler extends MessageUiHandler {
    * @returns StarterAttributes for the species
    */
   initStarterPrefs(): StarterAttributes {
-    const starterAttributes : StarterAttributes | null = this.species ? { ...this.savedStarterAttributes } : null;
-    const dexEntry = globalScene.gameData.dexData[this.species.speciesId];
-    const caughtAttr = this.isCaught(dexEntry);
+    const starterAttributes: StarterAttributes | null = this.species ? { ...this.savedStarterAttributes } : null;
+    const caughtAttr = this.isCaught();
 
     // no preferences or Pokemon wasn't caught, return empty attribute
-    if (!starterAttributes || !caughtAttr) {
+    if (!starterAttributes || !this.isSeen()) {
       return {};
     }
 
     const hasShiny = caughtAttr & DexAttr.SHINY;
     const hasNonShiny = caughtAttr & DexAttr.NON_SHINY;
-    if (starterAttributes.shiny && !hasShiny) {
+    if (!hasShiny || (starterAttributes.shiny === undefined && hasNonShiny)) {
       // shiny form wasn't unlocked, purging shiny and variant setting
       starterAttributes.shiny = false;
       starterAttributes.variant = 0;
-    } else if (starterAttributes.shiny === false && !hasNonShiny) {
-      // non shiny form wasn't unlocked, purging shiny setting
-      starterAttributes.shiny = false;
+    } else if (!hasNonShiny || (starterAttributes.shiny === undefined && hasShiny)) {
+      starterAttributes.shiny = true;
+      starterAttributes.variant = 0;
     }
 
-    if (starterAttributes.variant !== undefined) {
-      const unlockedVariants = [
-        hasShiny && caughtAttr & DexAttr.DEFAULT_VARIANT,
-        hasShiny && caughtAttr & DexAttr.VARIANT_2,
-        hasShiny && caughtAttr & DexAttr.VARIANT_3
-      ];
-      if (isNaN(starterAttributes.variant) || starterAttributes.variant < 0) {
-        starterAttributes.variant = 0;
-      } else if (!unlockedVariants[starterAttributes.variant]) {
-        let highestValidIndex = -1;
-        for (let i = 0; i <= starterAttributes.variant && i < unlockedVariants.length; i++) {
-          if (unlockedVariants[i] !== 0n) {
-            highestValidIndex = i;
-          }
+    this.unlockedVariants = [
+      !!(hasShiny && caughtAttr & DexAttr.DEFAULT_VARIANT),
+      !!(hasShiny && caughtAttr & DexAttr.VARIANT_2),
+      !!(hasShiny && caughtAttr & DexAttr.VARIANT_3),
+    ];
+    if (
+      starterAttributes.variant === undefined ||
+      Number.isNaN(starterAttributes.variant) ||
+      starterAttributes.variant < 0
+    ) {
+      starterAttributes.variant = 0;
+    } else if (!this.unlockedVariants[starterAttributes.variant]) {
+      let highestValidIndex = -1;
+      for (let i = 0; i <= starterAttributes.variant && i < this.unlockedVariants.length; i++) {
+        if (this.unlockedVariants[i]) {
+          highestValidIndex = i;
         }
-        // Set to the highest valid index found or default to 0
-        starterAttributes.variant = highestValidIndex !== -1 ? highestValidIndex : 0;
       }
+      // Set to the highest valid index found or default to 0
+      starterAttributes.variant = highestValidIndex !== -1 ? highestValidIndex : 0;
     }
 
     if (starterAttributes.female !== undefined) {
-      if ((starterAttributes.female && !(caughtAttr & DexAttr.FEMALE)) || (!starterAttributes.female && !(caughtAttr & DexAttr.MALE))) {
+      if (
+        (starterAttributes.female && !(caughtAttr & DexAttr.FEMALE)) ||
+        (!starterAttributes.female && !(caughtAttr & DexAttr.MALE))
+      ) {
         starterAttributes.female = !starterAttributes.female;
       }
+    } else {
+      if (caughtAttr & DexAttr.FEMALE) {
+        starterAttributes.female = true;
+      } else if (caughtAttr & DexAttr.MALE) {
+        starterAttributes.female = false;
+      }
     }
 
     return starterAttributes;
   }
 
-  showText(text: string, delay?: number, callback?: Function, callbackDelay?: number, prompt?: boolean, promptDelay?: number, moveToTop?: boolean) {
+  showText(
+    text: string,
+    delay?: number,
+    callback?: Function,
+    callbackDelay?: number,
+    prompt?: boolean,
+    promptDelay?: number,
+    moveToTop?: boolean,
+  ) {
     super.showText(text, delay, callback, callbackDelay, prompt, promptDelay);
 
     const singleLine = text?.indexOf("\n") === -1;
@@ -878,56 +1089,23 @@ export default class PokedexPageUiHandler extends MessageUiHandler {
    * @returns the id of the corresponding starter
    */
   getStarterSpeciesId(speciesId): number {
-    if (globalScene.gameData.starterData.hasOwnProperty(speciesId)) {
-      return speciesId;
-    } else {
-      return pokemonStarters[speciesId];
+    if (speciesId === Species.PIKACHU) {
+      if ([0, 1, 8].includes(this.formIndex)) {
+        return Species.PICHU;
+      }
+      return Species.PIKACHU;
     }
+    if (speciesStarterCosts.hasOwnProperty(speciesId)) {
+      return speciesId;
+    }
+    return pokemonStarters[speciesId];
   }
 
   getStarterSpecies(species): PokemonSpecies {
-    if (globalScene.gameData.starterData.hasOwnProperty(species.speciesId)) {
+    if (speciesStarterCosts.hasOwnProperty(species.speciesId)) {
       return species;
-    } else {
-      return allSpecies.find(sp => sp.speciesId === pokemonStarters[species.speciesId]) ?? species;
     }
-  }
-
-  /**
-   * Assign a form string to a given species and form
-   * @param formKey the form to format
-   * @param species the species to format
-   * @param speciesId whether the name of the species should be shown at the end
-   * @returns the formatted string
-   */
-  getFormString(formKey: string, species: PokemonSpecies, append: boolean = false): string {
-    let label: string;
-    const formText = capitalizeString(formKey, "-", false, false) ?? "";
-    const speciesName = capitalizeString(this.getStarterSpecies(species).name, "_", true, false) ?? "";
-    if (species.speciesId === Species.ARCEUS) {
-      label = i18next.t(`pokemonInfo:Type.${formText?.toUpperCase()}`);
-      return label;
-    }
-    label = formText ? i18next.t(`pokemonForm:${speciesName}${formText}`) : "";
-    if (label === `${speciesName}${formText}`) {
-      label = i18next.t(`battlePokemonForm:${formKey}`, { pokemonName:species.name });
-    } else {
-      // If the label is only the form, we can append the name of the pokemon
-      label += append ? ` ${species.name}` : "";
-    }
-    return label;
-  }
-
-  /**
-   * Find the name of the region for regional species
-   * @param species the species to check
-   * @returns a string with the region name
-   */
-  getRegionName(species: PokemonSpecies): string {
-    const name = species.name;
-    const label = Species[species.speciesId];
-    const suffix = label.includes("_") ? " (" + label.split("_")[0].toLowerCase() + ")" : "";
-    return name + suffix;
+    return allSpecies.find(sp => sp.speciesId === pokemonStarters[species.speciesId]) ?? species;
   }
 
   processInput(button: Button): boolean {
@@ -942,6 +1120,8 @@ export default class PokedexPageUiHandler extends MessageUiHandler {
 
     const isCaught = this.isCaught();
     const isFormCaught = this.isFormCaught();
+    const isSeen = this.isSeen();
+    const isStarterCaught = !!this.isCaught(this.getStarterSpecies(this.species));
 
     if (this.blockInputOverlay) {
       if (button === Button.CANCEL || button === Button.ACTION) {
@@ -949,7 +1129,8 @@ export default class PokedexPageUiHandler extends MessageUiHandler {
         this.baseStatsOverlay.clear();
         ui.showText("");
         return true;
-      } else if (button === Button.UP || button === Button.DOWN) {
+      }
+      if (button === Button.UP || button === Button.DOWN) {
         this.blockInputOverlay = false;
         this.baseStatsOverlay.clear();
         ui.showText("");
@@ -964,31 +1145,42 @@ export default class PokedexPageUiHandler extends MessageUiHandler {
       if (this.statsMode) {
         this.toggleStatsMode(false);
         success = true;
+      } else if (this.previousSpecies.length > 0) {
+        this.blockInput = true;
+        ui.setModeWithoutClear(UiMode.OPTION_SELECT).then(() => {
+          const species = this.previousSpecies.pop();
+          const starterAttributes = this.previousStarterAttributes.pop();
+          this.moveInfoOverlay.clear();
+          this.clearText();
+          ui.setModeForceTransition(UiMode.POKEDEX_PAGE, species, starterAttributes);
+          success = true;
+        });
+        this.blockInput = false;
       } else {
-        this.getUi().revertMode();
+        ui.revertMode().then(() => {
+          if (this.exitCallback instanceof Function) {
+            const exitCallback = this.exitCallback;
+            this.exitCallback = null;
+            exitCallback();
+          }
+        });
         success = true;
       }
     } else {
-
-      const starterData = globalScene.gameData.starterData[this.getStarterSpeciesId(this.species.speciesId)];
+      const starterData = globalScene.gameData.starterData[this.starterId];
       // prepare persistent starter data to store changes
       const starterAttributes = this.starterAttributes;
 
       if (button === Button.ACTION) {
-
         switch (this.cursor) {
-
           case MenuOptions.BASE_STATS:
-
-            if (!isCaught || !isFormCaught) {
+            if (!isSeen) {
               error = true;
             } else {
-
               this.blockInput = true;
 
-              ui.setMode(Mode.POKEDEX_PAGE, "refresh").then(() => {
+              ui.setMode(UiMode.POKEDEX_PAGE, "refresh").then(() => {
                 ui.showText(i18next.t("pokedexUiHandler:showBaseStats"), null, () => {
-
                   this.baseStatsOverlay.show(this.baseStats, this.baseTotal);
 
                   this.blockInput = false;
@@ -1002,45 +1194,54 @@ export default class PokedexPageUiHandler extends MessageUiHandler {
             break;
 
           case MenuOptions.LEVEL_MOVES:
-
-            if (!isCaught || !isFormCaught) {
+            if (!isSeen) {
               error = true;
             } else {
-
               this.blockInput = true;
 
-              ui.setMode(Mode.POKEDEX_PAGE, "refresh").then(() => {
+              ui.setMode(UiMode.POKEDEX_PAGE, "refresh").then(() => {
                 ui.showText(i18next.t("pokedexUiHandler:showLevelMoves"), null, () => {
-
                   this.moveInfoOverlay.show(allMoves[this.levelMoves[0][1]]);
 
-                  ui.setModeWithoutClear(Mode.OPTION_SELECT, {
-                    options: this.levelMoves.map(m => {
-                      const option: OptionSelectItem = {
-                        label: String(m[0]).padEnd(4, " ") + allMoves[m[1]].name,
+                  ui.setModeWithoutClear(UiMode.OPTION_SELECT, {
+                    options: this.levelMoves
+                      .map(m => {
+                        const levelNumber = m[0] > 0 ? String(m[0]) : "";
+                        const option: OptionSelectItem = {
+                          label: levelNumber.padEnd(4, " ") + allMoves[m[1]].name,
+                          handler: () => {
+                            return false;
+                          },
+                          onHover: () => {
+                            this.moveInfoOverlay.show(allMoves[m[1]]);
+                            if (m[0] === 0) {
+                              this.showText(i18next.t("pokedexUiHandler:onlyEvolutionMove"));
+                            } else if (m[0] === -1) {
+                              this.showText(i18next.t("pokedexUiHandler:onlyRecallMove"));
+                            } else if (m[0] <= 5) {
+                              this.showText(i18next.t("pokedexUiHandler:onStarterSelectMove"));
+                            } else {
+                              this.showText(i18next.t("pokedexUiHandler:byLevelUpMove"));
+                            }
+                          },
+                        };
+                        return option;
+                      })
+                      .concat({
+                        label: i18next.t("menu:cancel"),
                         handler: () => {
-                          return false;
+                          this.moveInfoOverlay.clear();
+                          this.clearText();
+                          ui.setMode(UiMode.POKEDEX_PAGE, "refresh");
+                          return true;
                         },
                         onHover: () => {
-                          this.moveInfoOverlay.show(allMoves[m[1]]);
+                          this.moveInfoOverlay.clear();
                         },
-                      };
-                      return option;
-                    }).concat({
-                      label: i18next.t("menu:cancel"),
-                      handler: () => {
-                        this.moveInfoOverlay.clear();
-                        this.clearText();
-                        ui.setMode(Mode.POKEDEX_PAGE, "refresh");
-                        return true;
-                      },
-                      onHover: () => {
-                        this.moveInfoOverlay.clear();
-                      },
-                    }),
+                      }),
                     supportHover: true,
                     maxOptions: 8,
-                    yOffset: 19
+                    yOffset: 19,
                   });
 
                   this.blockInput = false;
@@ -1051,16 +1252,12 @@ export default class PokedexPageUiHandler extends MessageUiHandler {
             break;
 
           case MenuOptions.EGG_MOVES:
-
-
-            if (!isCaught || !isFormCaught) {
+            if (!isSeen) {
               error = true;
             } else {
-
               this.blockInput = true;
 
-              ui.setMode(Mode.POKEDEX_PAGE, "refresh").then(() => {
-
+              ui.setMode(UiMode.POKEDEX_PAGE, "refresh").then(() => {
                 if (this.eggMoves.length === 0) {
                   ui.showText(i18next.t("pokedexUiHandler:noEggMoves"));
                   this.blockInput = false;
@@ -1068,51 +1265,50 @@ export default class PokedexPageUiHandler extends MessageUiHandler {
                 }
 
                 ui.showText(i18next.t("pokedexUiHandler:showEggMoves"), null, () => {
-
                   this.moveInfoOverlay.show(allMoves[this.eggMoves[0]]);
 
-                  ui.setModeWithoutClear(Mode.OPTION_SELECT, {
+                  ui.setModeWithoutClear(UiMode.OPTION_SELECT, {
                     options: [
                       {
                         label: i18next.t("pokedexUiHandler:common"),
                         skip: true,
                         style: TextStyle.MONEY_WINDOW,
                         handler: () => false, // Non-selectable, but handler is required
-                        onHover: () => this.moveInfoOverlay.clear() // No hover behavior for titles
+                        onHover: () => this.moveInfoOverlay.clear(), // No hover behavior for titles
                       },
                       ...this.eggMoves.slice(0, 3).map((m, i) => ({
                         label: allMoves[m].name,
                         style: this.hasEggMoves[i] ? TextStyle.SETTINGS_VALUE : TextStyle.SHADOW_TEXT,
                         handler: () => false,
-                        onHover: () => this.moveInfoOverlay.show(allMoves[m])
+                        onHover: () => this.moveInfoOverlay.show(allMoves[m]),
                       })),
                       {
                         label: i18next.t("pokedexUiHandler:rare"),
                         skip: true,
                         style: TextStyle.MONEY_WINDOW,
                         handler: () => false,
-                        onHover: () => this.moveInfoOverlay.clear()
+                        onHover: () => this.moveInfoOverlay.clear(),
                       },
                       {
                         label: allMoves[this.eggMoves[3]].name,
                         style: this.hasEggMoves[3] ? TextStyle.SETTINGS_VALUE : TextStyle.SHADOW_TEXT,
                         handler: () => false,
-                        onHover: () => this.moveInfoOverlay.show(allMoves[this.eggMoves[3]])
+                        onHover: () => this.moveInfoOverlay.show(allMoves[this.eggMoves[3]]),
                       },
                       {
                         label: i18next.t("menu:cancel"),
                         handler: () => {
                           this.moveInfoOverlay.clear();
                           this.clearText();
-                          ui.setMode(Mode.POKEDEX_PAGE, "refresh");
+                          ui.setMode(UiMode.POKEDEX_PAGE, "refresh");
                           return true;
                         },
-                        onHover: () => this.moveInfoOverlay.clear()
-                      }
+                        onHover: () => this.moveInfoOverlay.clear(),
+                      },
                     ],
                     supportHover: true,
                     maxOptions: 8,
-                    yOffset: 19
+                    yOffset: 19,
                   });
 
                   this.blockInput = false;
@@ -1123,44 +1319,47 @@ export default class PokedexPageUiHandler extends MessageUiHandler {
             break;
 
           case MenuOptions.TM_MOVES:
-
-            if (!isCaught || !isFormCaught) {
+            if (!isSeen) {
+              error = true;
+            } else if (this.tmMoves.length < 1) {
+              ui.showText(i18next.t("pokedexUiHandler:noTmMoves"));
               error = true;
             } else {
               this.blockInput = true;
 
-              ui.setMode(Mode.POKEDEX_PAGE, "refresh").then(() => {
+              ui.setMode(UiMode.POKEDEX_PAGE, "refresh").then(() => {
                 ui.showText(i18next.t("pokedexUiHandler:showTmMoves"), null, () => {
-
                   this.moveInfoOverlay.show(allMoves[this.tmMoves[0]]);
 
-                  ui.setModeWithoutClear(Mode.OPTION_SELECT, {
-                    options: this.tmMoves.map(m => {
-                      const option: OptionSelectItem = {
-                        label: allMoves[m].name,
+                  ui.setModeWithoutClear(UiMode.OPTION_SELECT, {
+                    options: this.tmMoves
+                      .map(m => {
+                        const option: OptionSelectItem = {
+                          label: allMoves[m].name,
+                          handler: () => {
+                            return false;
+                          },
+                          onHover: () => {
+                            this.moveInfoOverlay.show(allMoves[m]);
+                          },
+                        };
+                        return option;
+                      })
+                      .concat({
+                        label: i18next.t("menu:cancel"),
                         handler: () => {
-                          return false;
+                          this.moveInfoOverlay.clear();
+                          this.clearText();
+                          ui.setMode(UiMode.POKEDEX_PAGE, "refresh");
+                          return true;
                         },
                         onHover: () => {
-                          this.moveInfoOverlay.show(allMoves[m]);
+                          this.moveInfoOverlay.clear();
                         },
-                      };
-                      return option;
-                    }).concat({
-                      label: i18next.t("menu:cancel"),
-                      handler: () => {
-                        this.moveInfoOverlay.clear();
-                        this.clearText();
-                        ui.setMode(Mode.POKEDEX_PAGE, "refresh");
-                        return true;
-                      },
-                      onHover: () => {
-                        this.moveInfoOverlay.clear();
-                      },
-                    }),
+                      }),
                     supportHover: true,
                     maxOptions: 8,
-                    yOffset: 19
+                    yOffset: 19,
                   });
 
                   this.blockInput = false;
@@ -1171,17 +1370,13 @@ export default class PokedexPageUiHandler extends MessageUiHandler {
             break;
 
           case MenuOptions.ABILITIES:
-
-            if (!isCaught || !isFormCaught) {
+            if (!isSeen) {
               error = true;
             } else {
-
               this.blockInput = true;
 
-              ui.setMode(Mode.POKEDEX_PAGE, "refresh").then(() => {
-
+              ui.setMode(UiMode.POKEDEX_PAGE, "refresh").then(() => {
                 ui.showText(i18next.t("pokedexUiHandler:showAbilities"), null, () => {
-
                   this.infoOverlay.show(allAbilities[this.ability1].description);
 
                   const options: any[] = [];
@@ -1189,18 +1384,18 @@ export default class PokedexPageUiHandler extends MessageUiHandler {
                   if (this.ability1) {
                     options.push({
                       label: allAbilities[this.ability1].name,
-                      style: this.hasAbilities[0] > 0 ?  TextStyle.SETTINGS_VALUE : TextStyle.SHADOW_TEXT,
+                      style: this.hasAbilities[0] > 0 ? TextStyle.SETTINGS_VALUE : TextStyle.SHADOW_TEXT,
                       handler: () => false,
-                      onHover: () => this.infoOverlay.show(allAbilities[this.ability1].description)
+                      onHover: () => this.infoOverlay.show(allAbilities[this.ability1].description),
                     });
                   }
                   if (this.ability2) {
                     const ability = allAbilities[this.ability2];
                     options.push({
                       label: ability?.name,
-                      style: this.hasAbilities[1] > 0 ?  TextStyle.SETTINGS_VALUE : TextStyle.SHADOW_TEXT,
+                      style: this.hasAbilities[1] > 0 ? TextStyle.SETTINGS_VALUE : TextStyle.SHADOW_TEXT,
                       handler: () => false,
-                      onHover: () => this.infoOverlay.show(ability?.description)
+                      onHover: () => this.infoOverlay.show(ability?.description),
                     });
                   }
 
@@ -1210,14 +1405,14 @@ export default class PokedexPageUiHandler extends MessageUiHandler {
                       skip: true,
                       style: TextStyle.MONEY_WINDOW,
                       handler: () => false,
-                      onHover: () => this.infoOverlay.clear()
+                      onHover: () => this.infoOverlay.clear(),
                     });
                     const ability = allAbilities[this.abilityHidden];
                     options.push({
                       label: allAbilities[this.abilityHidden].name,
-                      style: this.hasAbilities[2] > 0 ?  TextStyle.SETTINGS_VALUE : TextStyle.SHADOW_TEXT,
+                      style: this.hasAbilities[2] > 0 ? TextStyle.SETTINGS_VALUE : TextStyle.SHADOW_TEXT,
                       handler: () => false,
-                      onHover: () => this.infoOverlay.show(ability?.description)
+                      onHover: () => this.infoOverlay.show(ability?.description),
                     });
                   }
 
@@ -1227,13 +1422,13 @@ export default class PokedexPageUiHandler extends MessageUiHandler {
                       skip: true,
                       style: TextStyle.MONEY_WINDOW,
                       handler: () => false,
-                      onHover: () => this.infoOverlay.clear()
+                      onHover: () => this.infoOverlay.clear(),
                     });
                     options.push({
                       label: allAbilities[this.passive].name,
-                      style: this.hasPassive ?  TextStyle.SETTINGS_VALUE : TextStyle.SHADOW_TEXT,
+                      style: this.hasPassive ? TextStyle.SETTINGS_VALUE : TextStyle.SHADOW_TEXT,
                       handler: () => false,
-                      onHover: () => this.infoOverlay.show(allAbilities[this.passive].description)
+                      onHover: () => this.infoOverlay.show(allAbilities[this.passive].description),
                     });
                   }
 
@@ -1242,17 +1437,17 @@ export default class PokedexPageUiHandler extends MessageUiHandler {
                     handler: () => {
                       this.infoOverlay.clear();
                       this.clearText();
-                      ui.setMode(Mode.POKEDEX_PAGE, "refresh");
+                      ui.setMode(UiMode.POKEDEX_PAGE, "refresh");
                       return true;
                     },
-                    onHover: () => this.infoOverlay.clear()
+                    onHover: () => this.infoOverlay.clear(),
                   });
 
-                  ui.setModeWithoutClear(Mode.OPTION_SELECT, {
+                  ui.setModeWithoutClear(UiMode.OPTION_SELECT, {
                     options: options,
                     supportHover: true,
                     maxOptions: 8,
-                    yOffset: 19
+                    yOffset: 19,
                   });
 
                   this.blockInput = false;
@@ -1263,16 +1458,13 @@ export default class PokedexPageUiHandler extends MessageUiHandler {
             break;
 
           case MenuOptions.BIOMES:
-
-            if (!(this.isCaught() || this.speciesStarterDexEntry?.seenAttr)) {
+            if (!isSeen) {
               error = true;
             } else {
               this.blockInput = true;
 
-              ui.setMode(Mode.POKEDEX_PAGE, "refresh").then(() => {
-
-                if ((!this.biomes || this.biomes?.length === 0) &&
-                    (!this.preBiomes || this.preBiomes?.length === 0)) {
+              ui.setMode(UiMode.POKEDEX_PAGE, "refresh").then(() => {
+                if ((!this.biomes || this.biomes?.length === 0) && (!this.preBiomes || this.preBiomes?.length === 0)) {
                   ui.showText(i18next.t("pokedexUiHandler:noBiomes"));
                   ui.playError();
                   this.blockInput = false;
@@ -1282,29 +1474,39 @@ export default class PokedexPageUiHandler extends MessageUiHandler {
                 const options: any[] = [];
 
                 ui.showText(i18next.t("pokedexUiHandler:showBiomes"), null, () => {
-
                   this.biomes.map(b => {
                     options.push({
-                      label: i18next.t(`biome:${Biome[b.biome].toUpperCase()}`) + " - " +
+                      label:
+                        i18next.t(`biome:${Biome[b.biome].toUpperCase()}`) +
+                        " - " +
                         i18next.t(`biome:${BiomePoolTier[b.tier].toUpperCase()}`) +
-                        ( b.tod.length === 1 && b.tod[0] === -1 ? "" : " (" + b.tod.map(tod => i18next.t(`biome:${TimeOfDay[tod].toUpperCase()}`)).join(", ") + ")"),
-                      handler: () => false
+                        (b.tod.length === 1 && b.tod[0] === -1
+                          ? ""
+                          : " (" +
+                            b.tod.map(tod => i18next.t(`biome:${TimeOfDay[tod].toUpperCase()}`)).join(", ") +
+                            ")"),
+                      handler: () => false,
                     });
                   });
 
-
                   if (this.preBiomes.length > 0) {
                     options.push({
                       label: i18next.t("pokedexUiHandler:preBiomes"),
                       skip: true,
-                      handler: () => false
+                      handler: () => false,
                     });
                     this.preBiomes.map(b => {
                       options.push({
-                        label: i18next.t(`biome:${Biome[b.biome].toUpperCase()}`) + " - " +
+                        label:
+                          i18next.t(`biome:${Biome[b.biome].toUpperCase()}`) +
+                          " - " +
                           i18next.t(`biome:${BiomePoolTier[b.tier].toUpperCase()}`) +
-                          ( b.tod.length === 1 && b.tod[0] === -1 ? "" : " (" + b.tod.map(tod => i18next.t(`biome:${TimeOfDay[tod].toUpperCase()}`)).join(", ") + ")"),
-                        handler: () => false
+                          (b.tod.length === 1 && b.tod[0] === -1
+                            ? ""
+                            : " (" +
+                              b.tod.map(tod => i18next.t(`biome:${TimeOfDay[tod].toUpperCase()}`)).join(", ") +
+                              ")"),
+                        handler: () => false,
                       });
                     });
                   }
@@ -1314,17 +1516,17 @@ export default class PokedexPageUiHandler extends MessageUiHandler {
                     handler: () => {
                       this.moveInfoOverlay.clear();
                       this.clearText();
-                      ui.setMode(Mode.POKEDEX_PAGE, "refresh");
+                      ui.setMode(UiMode.POKEDEX_PAGE, "refresh");
                       return true;
                     },
-                    onHover: () => this.moveInfoOverlay.clear()
+                    onHover: () => this.moveInfoOverlay.clear(),
                   });
 
-                  ui.setModeWithoutClear(Mode.OPTION_SELECT, {
+                  ui.setModeWithoutClear(UiMode.OPTION_SELECT, {
                     options: options,
                     supportHover: true,
                     maxOptions: 8,
-                    yOffset: 19
+                    yOffset: 19,
                   });
 
                   this.blockInput = false;
@@ -1335,20 +1537,19 @@ export default class PokedexPageUiHandler extends MessageUiHandler {
             break;
 
           case MenuOptions.EVOLUTIONS:
-
-            if (!isCaught || !isFormCaught) {
+            if (!isSeen) {
               error = true;
             } else {
-
               this.blockInput = true;
 
-              ui.setMode(Mode.POKEDEX_PAGE, "refresh").then(() => {
-
+              ui.setMode(UiMode.POKEDEX_PAGE, "refresh").then(() => {
                 const options: any[] = [];
 
-                if ((!this.prevolutions || this.prevolutions?.length === 0) &&
-                    (!this.evolutions || this.evolutions?.length === 0) &&
-                    (!this.battleForms || this.battleForms?.length === 0)) {
+                if (
+                  (!this.prevolutions || this.prevolutions?.length === 0) &&
+                  (!this.evolutions || this.evolutions?.length === 0) &&
+                  (!this.battleForms || this.battleForms?.length === 0)
+                ) {
                   ui.showText(i18next.t("pokedexUiHandler:noEvolutions"));
                   ui.playError();
                   this.blockInput = false;
@@ -1356,37 +1557,48 @@ export default class PokedexPageUiHandler extends MessageUiHandler {
                 }
 
                 ui.showText(i18next.t("pokedexUiHandler:showEvolutions"), null, () => {
-
                   if (this.prevolutions?.length > 0) {
                     options.push({
                       label: i18next.t("pokedexUiHandler:prevolutions"),
                       style: TextStyle.MONEY_WINDOW,
                       skip: true,
-                      handler: () => false
+                      handler: () => false,
                     });
                     this.prevolutions.map(pre => {
-                      const preSpecies = allSpecies.find(species => species.speciesId === pokemonPrevolutions[this.species.speciesId]);
+                      const preSpecies = allSpecies.find(
+                        species => species.speciesId === pokemonPrevolutions[this.species.speciesId],
+                      );
+                      const preFormIndex: number =
+                        preSpecies?.forms.find(f => f.formKey === pre.preFormKey)?.formIndex ?? 0;
 
                       const conditionText: string = pre.description;
 
                       options.push({
-                        label: pre.preFormKey ?
-                          this.getFormString(pre.preFormKey, preSpecies ?? this.species, true) :
-                          this.getRegionName(preSpecies ?? this.species),
+                        label: pre.preFormKey
+                          ? (preSpecies ?? this.species).getFormNameToDisplay(preFormIndex, true)
+                          : (preSpecies ?? this.species).getExpandedSpeciesName(),
                         handler: () => {
-                          const newSpecies = allSpecies.find(species => species.speciesId === pokemonPrevolutions[pre.speciesId]);
+                          this.previousSpecies.push(this.species);
+                          this.previousStarterAttributes.push({ ...this.savedStarterAttributes });
+                          const newSpecies = allSpecies.find(
+                            species => species.speciesId === pokemonPrevolutions[pre.speciesId],
+                          );
                           // Attempts to find the formIndex of the prevolved species
-                          const newFormKey = pre.preFormKey ? pre.preFormKey : (this.species.forms.length > 0 ? this.species.forms[this.formIndex].formKey : "");
+                          const newFormKey = pre.preFormKey
+                            ? pre.preFormKey
+                            : this.species.forms.length > 0
+                              ? this.species.forms[this.formIndex].formKey
+                              : "";
                           const matchingForm = newSpecies?.forms.find(form => form.formKey === newFormKey);
                           const newFormIndex = matchingForm ? matchingForm.formIndex : 0;
                           this.starterAttributes.form = newFormIndex;
                           this.savedStarterAttributes.form = newFormIndex;
                           this.moveInfoOverlay.clear();
                           this.clearText();
-                          ui.setMode(Mode.POKEDEX_PAGE, newSpecies, newFormIndex, this.savedStarterAttributes);
+                          ui.setMode(UiMode.POKEDEX_PAGE, newSpecies, this.savedStarterAttributes);
                           return true;
                         },
-                        onHover: () => this.showText(conditionText)
+                        onHover: () => this.showText(conditionText),
                       });
                     });
                   }
@@ -1396,14 +1608,17 @@ export default class PokedexPageUiHandler extends MessageUiHandler {
                       label: i18next.t("pokedexUiHandler:evolutions"),
                       style: TextStyle.MONEY_WINDOW,
                       skip: true,
-                      handler: () => false
+                      handler: () => false,
                     });
                     this.evolutions.map(evo => {
                       const evoSpecies = allSpecies.find(species => species.speciesId === evo.speciesId);
-                      const evoSpeciesStarterDexEntry = evoSpecies ? globalScene.gameData.dexData[evoSpecies.speciesId] : undefined;
-                      const isCaughtEvo = this.isCaught(evoSpeciesStarterDexEntry) ? true : false;
+                      const isCaughtEvo = !!this.isCaught(evoSpecies);
                       // Attempts to find the formIndex of the evolved species
-                      const newFormKey = evo.evoFormKey ? evo.evoFormKey : (this.species.forms.length > 0 ? this.species.forms[this.formIndex].formKey : "");
+                      const newFormKey = evo.evoFormKey
+                        ? evo.evoFormKey
+                        : this.species.forms.length > 0
+                          ? this.species.forms[this.formIndex].formKey
+                          : "";
                       const matchingForm = evoSpecies?.forms.find(form => form.formKey === newFormKey);
                       const newFormIndex = matchingForm ? matchingForm.formIndex : 0;
                       const isFormCaughtEvo = this.isFormCaught(evoSpecies, newFormIndex);
@@ -1411,19 +1626,21 @@ export default class PokedexPageUiHandler extends MessageUiHandler {
                       const conditionText: string = evo.description;
 
                       options.push({
-                        label: evo.evoFormKey ?
-                          this.getFormString(evo.evoFormKey, evoSpecies ?? this.species, true) :
-                          this.getRegionName(evoSpecies ?? this.species),
+                        label: evo.evoFormKey
+                          ? (evoSpecies ?? this.species).getFormNameToDisplay(newFormIndex, true)
+                          : (evoSpecies ?? this.species).getExpandedSpeciesName(),
                         style: isCaughtEvo && isFormCaughtEvo ? TextStyle.WINDOW : TextStyle.SHADOW_TEXT,
                         handler: () => {
+                          this.previousSpecies.push(this.species);
+                          this.previousStarterAttributes.push({ ...this.savedStarterAttributes });
                           this.starterAttributes.form = newFormIndex;
                           this.savedStarterAttributes.form = newFormIndex;
                           this.moveInfoOverlay.clear();
                           this.clearText();
-                          ui.setMode(Mode.POKEDEX_PAGE, evoSpecies, newFormIndex, this.savedStarterAttributes);
+                          ui.setMode(UiMode.POKEDEX_PAGE, evoSpecies, this.savedStarterAttributes);
                           return true;
                         },
-                        onHover: () => this.showText(conditionText)
+                        onHover: () => this.showText(conditionText),
                       });
                     });
                   }
@@ -1433,22 +1650,22 @@ export default class PokedexPageUiHandler extends MessageUiHandler {
                       label: i18next.t("pokedexUiHandler:forms"),
                       style: TextStyle.MONEY_WINDOW,
                       skip: true,
-                      handler: () => false
+                      handler: () => false,
                     });
                     this.battleForms.map(bf => {
+                      const matchingForm = this.species?.forms.find(form => form.formKey === bf.formKey);
+                      const newFormIndex = matchingForm ? matchingForm.formIndex : 0;
 
-                      let conditionText:string = "";
+                      let conditionText = "";
                       if (bf.trigger) {
                         conditionText = bf.trigger.description;
                       } else {
                         conditionText = "";
                       }
-                      let label: string = this.getFormString(bf.formKey, this.species);
+                      let label: string = this.species.getFormNameToDisplay(newFormIndex);
                       if (label === "") {
                         label = this.species.name;
                       }
-                      const matchingForm = this.species?.forms.find(form => form.formKey === bf.formKey);
-                      const newFormIndex = matchingForm ? matchingForm.formIndex : 0;
                       const isFormCaught = this.isFormCaught(this.species, newFormIndex);
 
                       if (conditionText) {
@@ -1456,16 +1673,23 @@ export default class PokedexPageUiHandler extends MessageUiHandler {
                           label: label,
                           style: isFormCaught ? TextStyle.WINDOW : TextStyle.SHADOW_TEXT,
                           handler: () => {
+                            this.previousSpecies.push(this.species);
+                            this.previousStarterAttributes.push({ ...this.savedStarterAttributes });
                             const newSpecies = this.species;
                             const newFormIndex = this.species.forms.find(f => f.formKey === bf.formKey)?.formIndex;
                             this.starterAttributes.form = newFormIndex;
                             this.savedStarterAttributes.form = newFormIndex;
                             this.moveInfoOverlay.clear();
                             this.clearText();
-                            ui.setMode(Mode.POKEDEX_PAGE, newSpecies, newFormIndex, this.savedStarterAttributes);
+                            ui.setMode(
+                              UiMode.POKEDEX_PAGE,
+                              newSpecies,
+                              this.savedStarterAttributes,
+                              this.filteredIndices,
+                            );
                             return true;
                           },
-                          onHover: () => this.showText(conditionText)
+                          onHover: () => this.showText(conditionText),
                         });
                       }
                     });
@@ -1476,17 +1700,17 @@ export default class PokedexPageUiHandler extends MessageUiHandler {
                     handler: () => {
                       this.moveInfoOverlay.clear();
                       this.clearText();
-                      ui.setMode(Mode.POKEDEX_PAGE, "refresh");
+                      ui.setMode(UiMode.POKEDEX_PAGE, "refresh");
                       return true;
                     },
-                    onHover: () => this.moveInfoOverlay.clear()
+                    onHover: () => this.moveInfoOverlay.clear(),
                   });
 
-                  ui.setModeWithoutClear(Mode.OPTION_SELECT, {
+                  ui.setModeWithoutClear(UiMode.OPTION_SELECT, {
                     options: options,
                     supportHover: true,
                     maxOptions: 8,
-                    yOffset: 19
+                    yOffset: 19,
                   });
 
                   this.blockInput = false;
@@ -1497,45 +1721,45 @@ export default class PokedexPageUiHandler extends MessageUiHandler {
             break;
 
           case MenuOptions.TOGGLE_IVS:
-
-            if (!isCaught || !isFormCaught) {
+            if (!isStarterCaught) {
               error = true;
             } else {
               this.toggleStatsMode();
-              ui.setMode(Mode.POKEDEX_PAGE, "refresh");
+              ui.setMode(UiMode.POKEDEX_PAGE, "refresh");
               success = true;
             }
             break;
 
           case MenuOptions.NATURES:
-
-            if (!isCaught || !isFormCaught) {
+            if (!isStarterCaught) {
               error = true;
             } else {
               this.blockInput = true;
-              ui.setMode(Mode.POKEDEX_PAGE, "refresh").then(() => {
+              ui.setMode(UiMode.POKEDEX_PAGE, "refresh").then(() => {
                 ui.showText(i18next.t("pokedexUiHandler:showNature"), null, () => {
                   const natures = globalScene.gameData.getNaturesForAttr(this.speciesStarterDexEntry?.natureAttr);
-                  ui.setModeWithoutClear(Mode.OPTION_SELECT, {
-                    options: natures.map((n: Nature, i: number) => {
-                      const option: OptionSelectItem = {
-                        label: getNatureName(n, true, true, true, globalScene.uiTheme),
+                  ui.setModeWithoutClear(UiMode.OPTION_SELECT, {
+                    options: natures
+                      .map((n: Nature, _i: number) => {
+                        const option: OptionSelectItem = {
+                          label: getNatureName(n, true, true, true, globalScene.uiTheme),
+                          handler: () => {
+                            return false;
+                          },
+                        };
+                        return option;
+                      })
+                      .concat({
+                        label: i18next.t("menu:cancel"),
                         handler: () => {
-                          return false;
-                        }
-                      };
-                      return option;
-                    }).concat({
-                      label: i18next.t("menu:cancel"),
-                      handler: () => {
-                        this.clearText();
-                        ui.setMode(Mode.POKEDEX_PAGE, "refresh");
-                        this.blockInput = false;
-                        return true;
-                      }
-                    }),
+                          this.clearText();
+                          ui.setMode(UiMode.POKEDEX_PAGE, "refresh");
+                          this.blockInput = false;
+                          return true;
+                        },
+                      }),
                     maxOptions: 8,
-                    yOffset: 19
+                    yOffset: 19,
                   });
                 });
               });
@@ -1543,26 +1767,26 @@ export default class PokedexPageUiHandler extends MessageUiHandler {
             }
             break;
         }
-
       } else {
-        const props = globalScene.gameData.getSpeciesDexAttrProps(this.species, this.getCurrentDexProps(this.species.speciesId));
+        const props = globalScene.gameData.getSpeciesDexAttrProps(
+          this.species,
+          this.getCurrentDexProps(this.species.speciesId),
+        );
         switch (button) {
           case Button.CYCLE_SHINY:
             if (this.canCycleShiny) {
-
               if (!starterAttributes.shiny) {
                 // Change to shiny, we need to get the proper default variant
-                const newVariant = starterAttributes.variant ? starterAttributes.variant as Variant : 0;
-                this.setSpeciesDetails(this.species, { shiny: true, variant: newVariant });
+                const newVariant = starterAttributes.variant ? (starterAttributes.variant as Variant) : 0;
+                this.setSpeciesDetails(this.species, {
+                  shiny: true,
+                  variant: newVariant,
+                });
 
                 globalScene.playSound("se/sparkle");
-                // Set the variant label to the shiny tint
-                const tint = getVariantTint(newVariant);
-                this.pokemonShinyIcon.setFrame(getVariantIcon(newVariant));
-                this.pokemonShinyIcon.setTint(tint);
-                this.pokemonShinyIcon.setVisible(true);
 
                 starterAttributes.shiny = true;
+                this.savedStarterAttributes.shiny = starterAttributes.shiny;
               } else {
                 let newVariant = props.variant;
                 do {
@@ -1584,20 +1808,19 @@ export default class PokedexPageUiHandler extends MessageUiHandler {
 
                 starterAttributes.variant = newVariant; // store the selected variant
                 this.savedStarterAttributes.variant = starterAttributes.variant;
-                if (newVariant > props.variant) {
-                  this.setSpeciesDetails(this.species, { variant: newVariant as Variant });
-                  // Cycle tint based on current sprite tint
-                  const tint = getVariantTint(newVariant as Variant);
-                  this.pokemonShinyIcon.setFrame(getVariantIcon(newVariant as Variant));
-                  this.pokemonShinyIcon.setTint(tint);
+                if (this.isCaught() & DexAttr.NON_SHINY && newVariant <= props.variant) {
+                  this.setSpeciesDetails(this.species, {
+                    shiny: false,
+                    variant: 0,
+                  });
                   success = true;
-                } else {
-                  this.setSpeciesDetails(this.species, { shiny: false, variant: 0 });
-                  this.pokemonShinyIcon.setVisible(false);
-                  success = true;
-
                   starterAttributes.shiny = false;
                   this.savedStarterAttributes.shiny = starterAttributes.shiny;
+                } else {
+                  this.setSpeciesDetails(this.species, {
+                    variant: newVariant as Variant,
+                  });
+                  success = true;
                 }
               }
             }
@@ -1608,15 +1831,26 @@ export default class PokedexPageUiHandler extends MessageUiHandler {
               let newFormIndex = this.formIndex;
               do {
                 newFormIndex = (newFormIndex + 1) % formCount;
-                if (this.species.forms[newFormIndex].isStarterSelectable || globalScene.dexForDevs) { // TODO: are those bangs correct?
+                if (this.species.forms[newFormIndex].isStarterSelectable || globalScene.dexForDevs) {
+                  // TODO: are those bangs correct?
                   break;
                 }
-              } while (newFormIndex !== props.formIndex);
+              } while (newFormIndex !== props.formIndex || this.species.forms[newFormIndex].isUnobtainable);
               starterAttributes.form = newFormIndex; // store the selected form
               this.savedStarterAttributes.form = starterAttributes.form;
               this.formIndex = newFormIndex;
+              // Some forms are tied to the gender and should change accordingly
+              let newFemale = props.female;
+              if (this.isFormGender) {
+                newFemale = !props.female;
+              }
+              starterAttributes.female = newFemale;
+              this.savedStarterAttributes.female = starterAttributes.female;
               this.starterSetup();
-              this.setSpeciesDetails(this.species, { formIndex: newFormIndex });
+              this.setSpeciesDetails(this.species, {
+                formIndex: newFormIndex,
+                female: newFemale,
+              });
               success = this.setCursor(this.cursor);
             }
             break;
@@ -1624,129 +1858,153 @@ export default class PokedexPageUiHandler extends MessageUiHandler {
             if (this.canCycleGender) {
               starterAttributes.female = !props.female;
               this.savedStarterAttributes.female = starterAttributes.female;
-              this.setSpeciesDetails(this.species, { female: !props.female });
+              let newFormIndex = this.formIndex;
+              // Some forms are tied to the gender and should change accordingly
+              if (this.isFormGender) {
+                newFormIndex = this.formIndex === 0 ? 1 : 0;
+              }
+              starterAttributes.form = newFormIndex; // store the selected form
+              this.savedStarterAttributes.form = starterAttributes.form;
+              this.formIndex = newFormIndex;
+              this.starterSetup();
+              this.setSpeciesDetails(this.species, {
+                female: !props.female,
+                formIndex: newFormIndex,
+              });
               success = true;
             }
             break;
           case Button.STATS:
-            if (!isCaught || !isFormCaught) {
+            if (!isCaught || !isFormCaught || !this.canUseCandies) {
               error = true;
             } else {
               const ui = this.getUi();
+              ui.showText("");
               const options: any[] = []; // TODO: add proper type
 
               const passiveAttr = starterData.passiveAttr;
               const candyCount = starterData.candyCount;
 
-              if (!pokemonPrevolutions.hasOwnProperty(this.species.speciesId)) {
-                if (!(passiveAttr & PassiveAttr.UNLOCKED)) {
-                  const passiveCost = getPassiveCandyCount(speciesStarterCosts[this.getStarterSpeciesId(this.species.speciesId)]);
-                  options.push({
-                    label: `x${passiveCost} ${i18next.t("pokedexUiHandler:unlockPassive")} (${allAbilities[this.passive].name})`,
-                    handler: () => {
-                      if (Overrides.FREE_CANDY_UPGRADE_OVERRIDE || candyCount >= passiveCost) {
-                        starterData.passiveAttr |= PassiveAttr.UNLOCKED | PassiveAttr.ENABLED;
-                        if (!Overrides.FREE_CANDY_UPGRADE_OVERRIDE) {
-                          starterData.candyCount -= passiveCost;
-                        }
-                        this.pokemonCandyCountText.setText(`x${starterData.candyCount}`);
-                        globalScene.gameData.saveSystem().then(success => {
-                          if (!success) {
-                            return globalScene.reset(true);
-                          }
-                        });
-                        ui.setMode(Mode.POKEDEX_PAGE, "refresh");
-                        this.setSpeciesDetails(this.species);
-                        globalScene.playSound("se/buy");
-
-                        return true;
-                      }
-                      return false;
-                    },
-                    item: "candy",
-                    itemArgs: starterColors[this.getStarterSpeciesId(this.species.speciesId)]
-                  });
-                }
-
-                // Reduce cost option
-                const valueReduction = starterData.valueReduction;
-                if (valueReduction < valueReductionMax) {
-                  const reductionCost = getValueReductionCandyCounts(speciesStarterCosts[this.getStarterSpeciesId(this.species.speciesId)])[valueReduction];
-                  options.push({
-                    label: `x${reductionCost} ${i18next.t("pokedexUiHandler:reduceCost")}`,
-                    handler: () => {
-                      if (Overrides.FREE_CANDY_UPGRADE_OVERRIDE || candyCount >= reductionCost) {
-                        starterData.valueReduction++;
-                        if (!Overrides.FREE_CANDY_UPGRADE_OVERRIDE) {
-                          starterData.candyCount -= reductionCost;
-                        }
-                        this.pokemonCandyCountText.setText(`x${starterData.candyCount}`);
-                        globalScene.gameData.saveSystem().then(success => {
-                          if (!success) {
-                            return globalScene.reset(true);
-                          }
-                        });
-                        ui.setMode(Mode.POKEDEX_PAGE, "refresh");
-                        globalScene.playSound("se/buy");
-
-                        return true;
-                      }
-                      return false;
-                    },
-                    item: "candy",
-                    itemArgs: starterColors[this.getStarterSpeciesId(this.species.speciesId)]
-                  });
-                }
-
-                // Same species egg menu option.
-                const sameSpeciesEggCost = getSameSpeciesEggCandyCounts(speciesStarterCosts[this.getStarterSpeciesId(this.species.speciesId)]);
+              if (!(passiveAttr & PassiveAttr.UNLOCKED)) {
+                const passiveCost = getPassiveCandyCount(speciesStarterCosts[this.starterId]);
                 options.push({
-                  label: `x${sameSpeciesEggCost} ${i18next.t("pokedexUiHandler:sameSpeciesEgg")}`,
+                  label: `x${passiveCost} ${i18next.t("pokedexUiHandler:unlockPassive")}`,
                   handler: () => {
-                    if (Overrides.FREE_CANDY_UPGRADE_OVERRIDE || candyCount >= sameSpeciesEggCost) {
-                      if (globalScene.gameData.eggs.length >= 99 && !Overrides.UNLIMITED_EGG_COUNT_OVERRIDE) {
-                        // Egg list full, show error message at the top of the screen and abort
-                        this.showText(i18next.t("egg:tooManyEggs"), undefined, () => this.showText("", 0, () => this.tutorialActive = false), 2000, false, undefined, true);
-                        return false;
-                      }
+                    if (Overrides.FREE_CANDY_UPGRADE_OVERRIDE || candyCount >= passiveCost) {
+                      starterData.passiveAttr |= PassiveAttr.UNLOCKED | PassiveAttr.ENABLED;
                       if (!Overrides.FREE_CANDY_UPGRADE_OVERRIDE) {
-                        starterData.candyCount -= sameSpeciesEggCost;
+                        starterData.candyCount -= passiveCost;
                       }
                       this.pokemonCandyCountText.setText(`x${starterData.candyCount}`);
-
-                      const egg = new Egg({ scene: globalScene, species: this.species.speciesId, sourceType: EggSourceType.SAME_SPECIES_EGG });
-                      egg.addEggToGameData();
-
                       globalScene.gameData.saveSystem().then(success => {
                         if (!success) {
                           return globalScene.reset(true);
                         }
                       });
-                      ui.setMode(Mode.POKEDEX_PAGE, "refresh");
+                      this.setSpeciesDetails(this.species);
+                      globalScene.playSound("se/buy");
+                      ui.setMode(UiMode.POKEDEX_PAGE, "refresh");
+
+                      return true;
+                    }
+                    return false;
+                  },
+                  style: this.isPassiveAvailable() ? TextStyle.WINDOW : TextStyle.SHADOW_TEXT,
+                  item: "candy",
+                  itemArgs: this.isPassiveAvailable() ? starterColors[this.starterId] : ["808080", "808080"],
+                });
+              }
+
+              // Reduce cost option
+              const valueReduction = starterData.valueReduction;
+              if (valueReduction < valueReductionMax) {
+                const reductionCost = getValueReductionCandyCounts(speciesStarterCosts[this.starterId])[valueReduction];
+                options.push({
+                  label: `x${reductionCost} ${i18next.t("pokedexUiHandler:reduceCost")}`,
+                  handler: () => {
+                    if (Overrides.FREE_CANDY_UPGRADE_OVERRIDE || candyCount >= reductionCost) {
+                      starterData.valueReduction++;
+                      if (!Overrides.FREE_CANDY_UPGRADE_OVERRIDE) {
+                        starterData.candyCount -= reductionCost;
+                      }
+                      this.pokemonCandyCountText.setText(`x${starterData.candyCount}`);
+                      globalScene.gameData.saveSystem().then(success => {
+                        if (!success) {
+                          return globalScene.reset(true);
+                        }
+                      });
+                      ui.setMode(UiMode.POKEDEX_PAGE, "refresh");
                       globalScene.playSound("se/buy");
 
                       return true;
                     }
                     return false;
                   },
+                  style: this.isValueReductionAvailable() ? TextStyle.WINDOW : TextStyle.SHADOW_TEXT,
                   item: "candy",
-                  itemArgs: starterColors[this.getStarterSpeciesId(this.species.speciesId)]
+                  itemArgs: this.isValueReductionAvailable() ? starterColors[this.starterId] : ["808080", "808080"],
                 });
-                options.push({
-                  label: i18next.t("menu:cancel"),
-                  handler: () => {
-                    ui.setMode(Mode.POKEDEX_PAGE, "refresh");
+              }
+
+              // Same species egg menu option.
+              const sameSpeciesEggCost = getSameSpeciesEggCandyCounts(speciesStarterCosts[this.starterId]);
+              options.push({
+                label: `x${sameSpeciesEggCost} ${i18next.t("pokedexUiHandler:sameSpeciesEgg")}`,
+                handler: () => {
+                  if (Overrides.FREE_CANDY_UPGRADE_OVERRIDE || candyCount >= sameSpeciesEggCost) {
+                    if (globalScene.gameData.eggs.length >= 99 && !Overrides.UNLIMITED_EGG_COUNT_OVERRIDE) {
+                      // Egg list full, show error message at the top of the screen and abort
+                      this.showText(
+                        i18next.t("egg:tooManyEggs"),
+                        undefined,
+                        () => this.showText("", 0, () => (this.tutorialActive = false)),
+                        2000,
+                        false,
+                        undefined,
+                        true,
+                      );
+                      return false;
+                    }
+                    if (!Overrides.FREE_CANDY_UPGRADE_OVERRIDE) {
+                      starterData.candyCount -= sameSpeciesEggCost;
+                    }
+                    this.pokemonCandyCountText.setText(`x${starterData.candyCount}`);
+
+                    const egg = new Egg({
+                      scene: globalScene,
+                      species: this.starterId,
+                      sourceType: EggSourceType.SAME_SPECIES_EGG,
+                    });
+                    egg.addEggToGameData();
+
+                    globalScene.gameData.saveSystem().then(success => {
+                      if (!success) {
+                        return globalScene.reset(true);
+                      }
+                    });
+                    ui.setMode(UiMode.POKEDEX_PAGE, "refresh");
+                    globalScene.playSound("se/buy");
+
                     return true;
                   }
-                });
-                ui.setModeWithoutClear(Mode.OPTION_SELECT, {
-                  options: options,
-                  yOffset: 47
-                });
-                success = true;
-              } else {
-                error = true;
-              }
+                  return false;
+                },
+                style: this.isSameSpeciesEggAvailable() ? TextStyle.WINDOW : TextStyle.SHADOW_TEXT,
+                item: "candy",
+                itemArgs: this.isSameSpeciesEggAvailable() ? starterColors[this.starterId] : ["808080", "808080"],
+              });
+              options.push({
+                label: i18next.t("menu:cancel"),
+                handler: () => {
+                  ui.setMode(UiMode.POKEDEX_PAGE, "refresh");
+                  return true;
+                },
+              });
+              ui.setModeWithoutClear(UiMode.OPTION_SELECT, {
+                options: options,
+                yOffset: 47,
+              });
+              success = true;
             }
             break;
           case Button.CYCLE_ABILITY:
@@ -1774,33 +2032,81 @@ export default class PokedexPageUiHandler extends MessageUiHandler {
             }
             break;
           case Button.LEFT:
+            if (this.filteredIndices && this.filteredIndices.length <= 1) {
+              ui.playError();
+              this.blockInput = false;
+              return true;
+            }
             this.blockInput = true;
-            ui.setModeWithoutClear(Mode.OPTION_SELECT).then(() => {
-              const index = allSpecies.findIndex(species => species.speciesId === this.species.speciesId);
-              const newIndex = index <= 0 ? allSpecies.length - 1 : index - 1;
-              const newSpecies = allSpecies[newIndex];
-              const matchingForm = newSpecies?.forms.find(form => form.formKey === this.species?.forms[this.formIndex]?.formKey);
+            ui.setModeWithoutClear(UiMode.OPTION_SELECT).then(() => {
+              // Always go back to first selection after scrolling around
+              if (this.previousSpecies.length === 0) {
+                this.previousSpecies.push(this.species);
+                this.previousStarterAttributes.push({ ...this.savedStarterAttributes });
+              }
+              let newSpecies: PokemonSpecies;
+              if (this.filteredIndices) {
+                const index = this.filteredIndices.findIndex(id => id === this.species.speciesId);
+                const newIndex = index <= 0 ? this.filteredIndices.length - 1 : index - 1;
+                newSpecies = getPokemonSpecies(this.filteredIndices[newIndex]);
+              } else {
+                const index = allSpecies.findIndex(species => species.speciesId === this.species.speciesId);
+                const newIndex = index <= 0 ? allSpecies.length - 1 : index - 1;
+                newSpecies = allSpecies[newIndex];
+              }
+              const matchingForm = newSpecies?.forms.find(
+                form => form.formKey === this.species?.forms[this.formIndex]?.formKey,
+              );
               const newFormIndex = matchingForm ? matchingForm.formIndex : 0;
               this.starterAttributes.form = newFormIndex;
               this.savedStarterAttributes.form = newFormIndex;
               this.moveInfoOverlay.clear();
               this.clearText();
-              ui.setModeForceTransition(Mode.POKEDEX_PAGE, newSpecies, newFormIndex, this.savedStarterAttributes);
+              ui.setModeForceTransition(
+                UiMode.POKEDEX_PAGE,
+                newSpecies,
+                this.savedStarterAttributes,
+                this.filteredIndices,
+              );
             });
             this.blockInput = false;
             break;
           case Button.RIGHT:
-            ui.setModeWithoutClear(Mode.OPTION_SELECT).then(() => {
-              const index = allSpecies.findIndex(species => species.speciesId === this.species.speciesId);
-              const newIndex = index >= allSpecies.length - 1 ? 0 : index + 1;
-              const newSpecies = allSpecies[newIndex];
-              const matchingForm = newSpecies?.forms.find(form => form.formKey === this.species?.forms[this.formIndex]?.formKey);
+            if (this.filteredIndices && this.filteredIndices.length <= 1) {
+              ui.playError();
+              this.blockInput = false;
+              return true;
+            }
+            ui.setModeWithoutClear(UiMode.OPTION_SELECT).then(() => {
+              // Always go back to first selection after scrolling around
+              if (this.previousSpecies.length === 0) {
+                this.previousSpecies.push(this.species);
+                this.previousStarterAttributes.push({ ...this.savedStarterAttributes });
+              }
+              let newSpecies: PokemonSpecies;
+              if (this.filteredIndices) {
+                const index = this.filteredIndices.findIndex(id => id === this.species.speciesId);
+                const newIndex = index >= this.filteredIndices.length - 1 ? 0 : index + 1;
+                newSpecies = getPokemonSpecies(this.filteredIndices[newIndex]);
+              } else {
+                const index = allSpecies.findIndex(species => species.speciesId === this.species.speciesId);
+                const newIndex = index >= allSpecies.length - 1 ? 0 : index + 1;
+                newSpecies = allSpecies[newIndex];
+              }
+              const matchingForm = newSpecies?.forms.find(
+                form => form.formKey === this.species?.forms[this.formIndex]?.formKey,
+              );
               const newFormIndex = matchingForm ? matchingForm.formIndex : 0;
               this.starterAttributes.form = newFormIndex;
               this.savedStarterAttributes.form = newFormIndex;
               this.moveInfoOverlay.clear();
               this.clearText();
-              ui.setModeForceTransition(Mode.POKEDEX_PAGE, newSpecies, newFormIndex, this.savedStarterAttributes);
+              ui.setModeForceTransition(
+                UiMode.POKEDEX_PAGE,
+                newSpecies,
+                this.savedStarterAttributes,
+                this.filteredIndices,
+              );
             });
             break;
         }
@@ -1817,6 +2123,7 @@ export default class PokedexPageUiHandler extends MessageUiHandler {
   }
 
   updateButtonIcon(iconSetting, gamepadType, iconElement, controlLabel): void {
+    // biome-ignore lint/suspicious/noImplicitAnyLet: TODO
     let iconPath;
     // touch controls cannot be rebound as is, and are just emulating a keyboard event.
     // Additionally, since keyboard controls can be rebound (and will be displayed when they are), we need to have special handling for the touch controls
@@ -1846,7 +2153,7 @@ export default class PokedexPageUiHandler extends MessageUiHandler {
     controlLabel.setPosition(this.instructionRowX + this.instructionRowTextOffset, this.instructionRowY);
     iconElement.setVisible(true);
     controlLabel.setVisible(true);
-    this.instructionsContainer.add([ iconElement, controlLabel ]);
+    this.instructionsContainer.add([iconElement, controlLabel]);
     this.instructionRowY += 8;
     if (this.instructionRowY >= 24) {
       this.instructionRowY = 8;
@@ -1862,9 +2169,13 @@ export default class PokedexPageUiHandler extends MessageUiHandler {
     this.hideInstructions();
     this.instructionsContainer.removeAll();
     this.filterInstructionsContainer.removeAll();
+
+    // biome-ignore lint/suspicious/noImplicitAnyLet: TODO
     let gamepadType;
     if (globalScene.inputMethod === "gamepad") {
-      gamepadType = globalScene.inputController.getConfig(globalScene.inputController.selectedDevice[Device.GAMEPAD]).padType;
+      gamepadType = globalScene.inputController.getConfig(
+        globalScene.inputController.selectedDevice[Device.GAMEPAD],
+      ).padType;
     } else {
       gamepadType = globalScene.inputMethod;
     }
@@ -1877,15 +2188,33 @@ export default class PokedexPageUiHandler extends MessageUiHandler {
 
     if (this.isCaught()) {
       if (isFormCaught) {
-        if (!pokemonPrevolutions.hasOwnProperty(this.species.speciesId)) {
-          this.updateButtonIcon(SettingKeyboard.Button_Stats, gamepadType, this.candyUpgradeIconElement, this.candyUpgradeLabel);
+        if (this.canUseCandies) {
+          this.updateButtonIcon(
+            SettingKeyboard.Button_Stats,
+            gamepadType,
+            this.candyUpgradeIconElement,
+            this.candyUpgradeLabel,
+          );
         }
         if (this.canCycleShiny) {
-          this.updateButtonIcon(SettingKeyboard.Button_Cycle_Shiny, gamepadType, this.shinyIconElement, this.shinyLabel);
+          this.updateButtonIcon(
+            SettingKeyboard.Button_Cycle_Shiny,
+            gamepadType,
+            this.shinyIconElement,
+            this.shinyLabel,
+          );
         }
         if (this.canCycleGender) {
-          this.updateButtonIcon(SettingKeyboard.Button_Cycle_Gender, gamepadType, this.genderIconElement, this.genderLabel);
+          this.updateButtonIcon(
+            SettingKeyboard.Button_Cycle_Gender,
+            gamepadType,
+            this.genderIconElement,
+            this.genderLabel,
+          );
         }
+      } else {
+        // Making space for "Uncaught" text
+        this.instructionRowY += 8;
       }
       if (this.canCycleForm) {
         this.updateButtonIcon(SettingKeyboard.Button_Cycle_Form, gamepadType, this.formIconElement, this.formLabel);
@@ -1893,23 +2222,6 @@ export default class PokedexPageUiHandler extends MessageUiHandler {
     }
   }
 
-  getValueLimit(): number {
-    const valueLimit = new NumberHolder(0);
-    switch (globalScene.gameMode.modeId) {
-      case GameModes.ENDLESS:
-      case GameModes.SPLICED_ENDLESS:
-        valueLimit.value = 15;
-        break;
-      default:
-        valueLimit.value = 10;
-    }
-
-    Challenge.applyChallenges(globalScene.gameMode, Challenge.ChallengeType.STARTER_POINTS, valueLimit);
-
-    return valueLimit.value;
-  }
-
-
   setCursor(cursor: number): boolean {
     const ret = super.setCursor(cursor);
 
@@ -1924,9 +2236,7 @@ export default class PokedexPageUiHandler extends MessageUiHandler {
 
     const ui = this.getUi();
 
-    const isFormCaught = this.isFormCaught();
-
-    if ((this.isCaught() && isFormCaught) || (this.speciesStarterDexEntry?.seenAttr && cursor === 5)) {
+    if ((this.isCaught() && this.isFormCaught()) || this.isSeen()) {
       ui.showText(this.menuDescriptions[cursor]);
     } else {
       ui.showText("");
@@ -1935,20 +2245,60 @@ export default class PokedexPageUiHandler extends MessageUiHandler {
     return ret;
   }
 
-  getFriendship(speciesId: number) {
-    let currentFriendship = globalScene.gameData.starterData[this.getStarterSpeciesId(speciesId)].friendship;
+  getFriendship(_speciesId: number) {
+    let currentFriendship = globalScene.gameData.starterData[this.starterId].friendship;
     if (!currentFriendship || currentFriendship === undefined) {
       currentFriendship = 0;
     }
 
-    const friendshipCap = getStarterValueFriendshipCap(speciesStarterCosts[this.getStarterSpeciesId(speciesId)]);
+    const friendshipCap = getStarterValueFriendshipCap(speciesStarterCosts[this.starterId]);
 
     return { currentFriendship, friendshipCap };
   }
 
+  /**
+   * Determines if a passive upgrade is available for the current species
+   * @returns true if the user has enough candies and a passive has not been unlocked already
+   */
+  isPassiveAvailable(): boolean {
+    // Get this species ID's starter data
+    const starterData = globalScene.gameData.starterData[this.starterId];
+
+    return (
+      starterData.candyCount >= getPassiveCandyCount(speciesStarterCosts[this.starterId]) &&
+      !(starterData.passiveAttr & PassiveAttr.UNLOCKED)
+    );
+  }
+
+  /**
+   * Determines if a value reduction upgrade is available for the current species
+   * @returns true if the user has enough candies and all value reductions have not been unlocked already
+   */
+  isValueReductionAvailable(): boolean {
+    // Get this species ID's starter data
+    const starterData = globalScene.gameData.starterData[this.starterId];
+
+    return (
+      starterData.candyCount >=
+        getValueReductionCandyCounts(speciesStarterCosts[this.starterId])[starterData.valueReduction] &&
+      starterData.valueReduction < valueReductionMax
+    );
+  }
+
+  /**
+   * Determines if an same species egg can be bought for the current species
+   * @returns true if the user has enough candies
+   */
+  isSameSpeciesEggAvailable(): boolean {
+    // Get this species ID's starter data
+    const starterData = globalScene.gameData.starterData[this.starterId];
+
+    return starterData.candyCount >= getSameSpeciesEggCandyCounts(speciesStarterCosts[this.starterId]);
+  }
+
   setSpecies() {
     const species = this.species;
-    const starterAttributes : StarterAttributes | null = species ? { ...this.starterAttributes } : null;
+    const starterAttributes: StarterAttributes | null = species ? { ...this.starterAttributes } : null;
 
     if (!species && globalScene.ui.getTooltip().visible) {
       globalScene.ui.hideTooltip();
@@ -1965,93 +2315,14 @@ export default class PokedexPageUiHandler extends MessageUiHandler {
       }
     }
 
-    if (species && (this.speciesStarterDexEntry?.seenAttr || this.isCaught())) {
+    if (species && (this.isSeen() || this.isCaught())) {
       this.pokemonNumberText.setText(padInt(species.speciesId, 4));
-      if (starterAttributes?.nickname) {
-        const name = decodeURIComponent(escape(atob(starterAttributes.nickname)));
-        this.pokemonNameText.setText(name);
-      } else {
-        this.pokemonNameText.setText(species.name);
-      }
 
       if (this.isCaught()) {
-        const colorScheme = starterColors[species.speciesId];
-
-        const luck = globalScene.gameData.getDexAttrLuck(this.isCaught());
-        this.pokemonLuckText.setVisible(!!luck);
-        this.pokemonLuckText.setText(luck.toString());
-        this.pokemonLuckText.setTint(getVariantTint(Math.min(luck - 1, 2) as Variant));
-        this.pokemonLuckLabelText.setVisible(this.pokemonLuckText.visible);
-
-        //Growth translate
-        let growthReadable = toReadableString(GrowthRate[species.growthRate]);
-        const growthAux = growthReadable.replace(" ", "_");
-        if (i18next.exists("growth:" + growthAux)) {
-          growthReadable = i18next.t("growth:" + growthAux as any);
-        }
-        this.pokemonGrowthRateText.setText(growthReadable);
-
-        this.pokemonGrowthRateText.setColor(getGrowthRateColor(species.growthRate));
-        this.pokemonGrowthRateText.setShadowColor(getGrowthRateColor(species.growthRate, true));
-        this.pokemonGrowthRateLabelText.setVisible(true);
-        this.pokemonUncaughtText.setVisible(false);
-        this.pokemonCaughtCountText.setText(`${this.speciesStarterDexEntry?.caughtCount}`);
-        if (species.speciesId === Species.MANAPHY || species.speciesId === Species.PHIONE) {
-          this.pokemonHatchedIcon.setFrame("manaphy");
-        } else {
-          this.pokemonHatchedIcon.setFrame(getEggTierForSpecies(species));
-        }
-        this.pokemonHatchedCountText.setText(`${this.speciesStarterDexEntry?.hatchedCount}`);
-
         const defaultDexAttr = this.getCurrentDexProps(species.speciesId);
-        const defaultProps = globalScene.gameData.getSpeciesDexAttrProps(species, defaultDexAttr);
-        const variant = defaultProps.variant;
-        const tint = getVariantTint(variant);
-        this.pokemonShinyIcon.setFrame(getVariantIcon(variant));
-        this.pokemonShinyIcon.setTint(tint);
-        this.pokemonShinyIcon.setVisible(defaultProps.shiny);
-        this.pokemonCaughtHatchedContainer.setVisible(true);
-        this.pokemonFormText.setVisible(true);
-
-        if (pokemonPrevolutions.hasOwnProperty(species.speciesId)) {
-          this.pokemonCaughtHatchedContainer.setY(16);
-          this.pokemonShinyIcon.setY(135);
-          this.pokemonShinyIcon.setFrame(getVariantIcon(variant));
-          [
-            this.pokemonCandyContainer,
-            this.pokemonHatchedIcon,
-            this.pokemonHatchedCountText
-          ].map(c => c.setVisible(false));
-          this.pokemonFormText.setY(25);
-        } else {
-          this.pokemonCaughtHatchedContainer.setY(25);
-          this.pokemonShinyIcon.setY(117);
-          this.pokemonCandyIcon.setTint(argbFromRgba(rgbHexToRgba(colorScheme[0])));
-          this.pokemonCandyOverlayIcon.setTint(argbFromRgba(rgbHexToRgba(colorScheme[1])));
-          this.pokemonCandyCountText.setText(`x${globalScene.gameData.starterData[this.getStarterSpeciesId(species.speciesId)].candyCount}`);
-          this.pokemonCandyContainer.setVisible(true);
-          this.pokemonFormText.setY(42);
-          this.pokemonHatchedIcon.setVisible(true);
-          this.pokemonHatchedCountText.setVisible(true);
-
-          const { currentFriendship, friendshipCap } = this.getFriendship(this.species.speciesId);
-          const candyCropY = 16 - (16 * (currentFriendship / friendshipCap));
-          this.pokemonCandyDarknessOverlay.setCrop(0, 0, 16, candyCropY);
-
-          this.pokemonCandyContainer.on("pointerover", () => {
-            globalScene.ui.showTooltip("", `${currentFriendship}/${friendshipCap}`, true);
-            this.activeTooltip = "CANDY";
-          });
-          this.pokemonCandyContainer.on("pointerout", () => {
-            globalScene.ui.hideTooltip();
-            this.activeTooltip = undefined;
-          });
-
-        }
-
         // Set default attributes if for some reason starterAttributes does not exist or attributes missing
         const props: StarterAttributes = globalScene.gameData.getSpeciesDexAttrProps(species, defaultDexAttr);
-        if (starterAttributes?.variant && !isNaN(starterAttributes.variant)) {
+        if (starterAttributes?.variant && !Number.isNaN(starterAttributes.variant)) {
           if (props.shiny) {
             props.variant = starterAttributes.variant as Variant;
           }
@@ -2065,12 +2336,6 @@ export default class PokedexPageUiHandler extends MessageUiHandler {
           female: props.female,
           variant: props.variant ?? 0,
         });
-
-        if (this.isFormCaught(this.species, props.form)) {
-          const speciesForm = getPokemonSpeciesForm(species.speciesId, props.form ?? 0);
-          this.setTypeIcons(speciesForm.type1, speciesForm.type2);
-          this.pokemonSprite.clearTint();
-        }
       } else {
         this.pokemonGrowthRateText.setText("");
         this.pokemonGrowthRateLabelText.setVisible(false);
@@ -2078,7 +2343,9 @@ export default class PokedexPageUiHandler extends MessageUiHandler {
         this.type2Icon.setVisible(true);
         this.pokemonLuckLabelText.setVisible(false);
         this.pokemonLuckText.setVisible(false);
-        this.pokemonShinyIcon.setVisible(false);
+        for (const icon of this.pokemonShinyIcons) {
+          icon.setVisible(false);
+        }
         this.pokemonUncaughtText.setVisible(true);
         this.pokemonCaughtHatchedContainer.setVisible(true);
         this.pokemonCandyContainer.setVisible(false);
@@ -2092,7 +2359,6 @@ export default class PokedexPageUiHandler extends MessageUiHandler {
           formIndex: props.formIndex,
           female: props.female,
           variant: props.variant,
-          forSeen: true
         });
         this.pokemonSprite.setTint(0x808080);
       }
@@ -2105,13 +2371,16 @@ export default class PokedexPageUiHandler extends MessageUiHandler {
       this.type2Icon.setVisible(false);
       this.pokemonLuckLabelText.setVisible(false);
       this.pokemonLuckText.setVisible(false);
-      this.pokemonShinyIcon.setVisible(false);
+      for (const icon of this.pokemonShinyIcons) {
+        icon.setVisible(false);
+      }
       this.pokemonUncaughtText.setVisible(!!species);
       this.pokemonCaughtHatchedContainer.setVisible(false);
       this.pokemonCandyContainer.setVisible(false);
       this.pokemonFormText.setVisible(false);
 
-      this.setSpeciesDetails(species!, { // TODO: is this bang correct?
+      this.setSpeciesDetails(species!, {
+        // TODO: is this bang correct?
         shiny: false,
         formIndex: 0,
         female: false,
@@ -2123,13 +2392,16 @@ export default class PokedexPageUiHandler extends MessageUiHandler {
 
   setSpeciesDetails(species: PokemonSpecies, options: SpeciesDetails = {}, forceUpdate?: boolean): void {
     let { shiny, formIndex, female, variant } = options;
-    const forSeen: boolean = options.forSeen ?? false;
     const oldProps = species ? this.starterAttributes : null;
 
     // We will only update the sprite if there is a change to form, shiny/variant
     // or gender for species with gender sprite differences
-    const shouldUpdateSprite = (species?.genderDiffs && !isNullOrUndefined(female))
-     || !isNullOrUndefined(formIndex) || !isNullOrUndefined(shiny) || !isNullOrUndefined(variant) || forceUpdate;
+    const shouldUpdateSprite =
+      (species?.genderDiffs && !isNullOrUndefined(female)) ||
+      !isNullOrUndefined(formIndex) ||
+      !isNullOrUndefined(shiny) ||
+      !isNullOrUndefined(variant) ||
+      forceUpdate;
 
     if (this.activeTooltip === "CANDY") {
       if (this.species && this.pokemonCandyContainer.visible) {
@@ -2172,9 +2444,7 @@ export default class PokedexPageUiHandler extends MessageUiHandler {
     }
 
     if (species) {
-      const dexEntry = globalScene.gameData.dexData[species.speciesId];
-
-      const caughtAttr = this.isCaught(dexEntry);
+      const caughtAttr = this.isCaught(species);
 
       if (!caughtAttr) {
         const props = this.starterAttributes;
@@ -2194,18 +2464,21 @@ export default class PokedexPageUiHandler extends MessageUiHandler {
       }
 
       const isFormCaught = this.isFormCaught();
+      const isFormSeen = this.isSeen();
 
       this.shinyOverlay.setVisible(shiny ?? false); // TODO: is false the correct default?
       this.pokemonNumberText.setColor(this.getTextColor(shiny ? TextStyle.SUMMARY_GOLD : TextStyle.SUMMARY, false));
-      this.pokemonNumberText.setShadowColor(this.getTextColor(shiny ? TextStyle.SUMMARY_GOLD : TextStyle.SUMMARY, true));
-
+      this.pokemonNumberText.setShadowColor(
+        this.getTextColor(shiny ? TextStyle.SUMMARY_GOLD : TextStyle.SUMMARY, true),
+      );
 
       const assetLoadCancelled = new BooleanHolder(false);
       this.assetLoadCancelled = assetLoadCancelled;
 
       if (shouldUpdateSprite) {
-        const back = this.showBackSprite ? true : false;
-        species.loadAssets(female!, formIndex, shiny, variant as Variant, true, back).then(() => { // TODO: is this bang correct?
+        const back = !!this.showBackSprite;
+        species.loadAssets(female!, formIndex, shiny, variant as Variant, true, back).then(() => {
+          // TODO: is this bang correct?
           if (assetLoadCancelled.value) {
             return;
           }
@@ -2214,32 +2487,32 @@ export default class PokedexPageUiHandler extends MessageUiHandler {
           this.pokemonSprite.play(species.getSpriteKey(female!, formIndex, shiny, variant, back)); // TODO: is this bang correct?
           this.pokemonSprite.setPipelineData("shiny", shiny);
           this.pokemonSprite.setPipelineData("variant", variant);
-          this.pokemonSprite.setPipelineData("spriteKey", species.getSpriteKey(female!, formIndex, shiny, variant, back)); // TODO: is this bang correct?
+          this.pokemonSprite.setPipelineData(
+            "spriteKey",
+            species.getSpriteKey(female!, formIndex, shiny, variant, back),
+          ); // TODO: is this bang correct?
           this.pokemonSprite.setVisible(!this.statsMode);
         });
       } else {
         this.pokemonSprite.setVisible(!this.statsMode);
       }
 
-      const currentFilteredContainer = this.filteredStarterContainers.find(p => p.species.speciesId === species.speciesId);
-      if (currentFilteredContainer) {
-        const starterSprite = currentFilteredContainer.icon as Phaser.GameObjects.Sprite;
-        starterSprite.setTexture(species.getIconAtlasKey(formIndex, shiny, variant), species.getIconId(female!, formIndex, shiny, variant));
-        currentFilteredContainer.checkIconId(female, formIndex, shiny, variant);
-      }
-
       const isNonShinyCaught = !!(caughtAttr & DexAttr.NON_SHINY);
       const isShinyCaught = !!(caughtAttr & DexAttr.SHINY);
 
-      this.canCycleShiny = isNonShinyCaught && isShinyCaught;
+      const caughtVariants = [DexAttr.DEFAULT_VARIANT, DexAttr.VARIANT_2, DexAttr.VARIANT_3].filter(
+        v => caughtAttr & v,
+      );
+      this.canCycleShiny = (isNonShinyCaught && isShinyCaught) || (isShinyCaught && caughtVariants.length > 1);
 
       const isMaleCaught = !!(caughtAttr & DexAttr.MALE);
       const isFemaleCaught = !!(caughtAttr & DexAttr.FEMALE);
       this.canCycleGender = isMaleCaught && isFemaleCaught;
 
       // If the dev option for the dex is selected, all forms can be cycled through
-      this.canCycleForm = globalScene.dexForDevs ? species.forms.length > 1 :
-        species.forms.filter(f => f.isStarterSelectable).filter(f => f).length > 1;
+      this.canCycleForm = globalScene.dexForDevs
+        ? species.forms.length > 1
+        : species.forms.filter(f => f.isStarterSelectable).filter(f => f).length > 1;
 
       if (caughtAttr && species.malePercent !== null) {
         const gender = !female ? Gender.MALE : Gender.FEMALE;
@@ -2250,27 +2523,150 @@ export default class PokedexPageUiHandler extends MessageUiHandler {
         this.pokemonGenderText.setText("");
       }
 
-      if (caughtAttr) {
-        if (isFormCaught) {
-          this.species.loadAssets(female!, formIndex, shiny, variant as Variant, true).then(() => {
-            const crier = (this.species.forms && this.species.forms.length > 0) ? this.species.forms[formIndex ?? this.formIndex] : this.species;
-            crier.cry();
-          });
+      // Setting the name
+      if (isFormCaught || isFormSeen) {
+        this.pokemonNameText.setText(species.name);
+      } else {
+        this.pokemonNameText.setText(species ? "???" : "");
+      }
 
-          this.pokemonSprite.clearTint();
+      // Setting tint of the sprite
+      if (isFormCaught) {
+        this.species.loadAssets(female!, formIndex, shiny, variant as Variant, true).then(() => {
+          const crier =
+            this.species.forms && this.species.forms.length > 0
+              ? this.species.forms[formIndex ?? this.formIndex]
+              : this.species;
+          crier.cry();
+        });
+        this.pokemonSprite.clearTint();
+      } else if (isFormSeen) {
+        this.pokemonSprite.setTint(0x808080);
+      } else {
+        this.pokemonSprite.setTint(0);
+      }
+
+      // Setting luck text and sparks
+      if (isFormCaught) {
+        const luck = globalScene.gameData.getDexAttrLuck(this.isCaught());
+        this.pokemonLuckText.setVisible(!!luck);
+        this.pokemonLuckText.setText(luck.toString());
+        this.pokemonLuckText.setTint(getVariantTint(Math.min(luck - 1, 2) as Variant));
+        this.pokemonLuckLabelText.setVisible(this.pokemonLuckText.visible);
+      } else {
+        this.pokemonLuckText.setVisible(false);
+        this.pokemonLuckLabelText.setVisible(false);
+      }
+
+      // Setting growth rate text
+      if (isFormCaught) {
+        let growthReadable = toReadableString(GrowthRate[species.growthRate]);
+        const growthAux = growthReadable.replace(" ", "_");
+        if (i18next.exists("growth:" + growthAux)) {
+          growthReadable = i18next.t(("growth:" + growthAux) as any);
+        }
+        this.pokemonGrowthRateText.setText(growthReadable);
+
+        this.pokemonGrowthRateText.setColor(getGrowthRateColor(species.growthRate));
+        this.pokemonGrowthRateText.setShadowColor(getGrowthRateColor(species.growthRate, true));
+        this.pokemonGrowthRateLabelText.setVisible(true);
+      } else {
+        this.pokemonGrowthRateText.setText("");
+        this.pokemonGrowthRateLabelText.setVisible(false);
+      }
+
+      // Caught and hatched
+      if (isFormCaught) {
+        const colorScheme = starterColors[this.starterId];
+
+        this.pokemonUncaughtText.setVisible(false);
+        this.pokemonCaughtCountText.setText(`${this.speciesStarterDexEntry?.caughtCount}`);
+        if (species.speciesId === Species.MANAPHY || species.speciesId === Species.PHIONE) {
+          this.pokemonHatchedIcon.setFrame("manaphy");
         } else {
-          this.pokemonSprite.setTint(0x000000);
+          this.pokemonHatchedIcon.setFrame(getEggTierForSpecies(species));
+        }
+        this.pokemonHatchedCountText.setText(`${this.speciesStarterDexEntry?.hatchedCount}`);
+
+        const defaultDexAttr = this.getCurrentDexProps(species.speciesId);
+        const defaultProps = globalScene.gameData.getSpeciesDexAttrProps(species, defaultDexAttr);
+
+        const variant = defaultProps.variant;
+        for (let v = 0; v < 3; v++) {
+          const icon = this.pokemonShinyIcons[v];
+          if (v < this.availableVariants) {
+            if (!this.unlockedVariants[v]) {
+              icon.setTint(0x000000);
+            } else if (shiny && v === variant) {
+              const tint = getVariantTint(v as Variant);
+              icon.setTint(tint);
+            } else {
+              icon.setTint(0x808080);
+            }
+            icon.setVisible(true);
+          } else {
+            icon.setVisible(false);
+          }
+        }
+
+        this.pokemonCaughtHatchedContainer.setVisible(true);
+        this.pokemonCaughtHatchedContainer.setY(25);
+        this.pokemonCandyIcon.setTint(argbFromRgba(rgbHexToRgba(colorScheme[0])));
+        this.pokemonCandyOverlayIcon.setTint(argbFromRgba(rgbHexToRgba(colorScheme[1])));
+        this.pokemonCandyCountText.setText(
+          `x${species.speciesId === Species.PIKACHU ? 0 : globalScene.gameData.starterData[this.starterId].candyCount}`,
+        );
+        this.pokemonCandyContainer.setVisible(true);
+
+        if (pokemonPrevolutions.hasOwnProperty(species.speciesId)) {
+          this.pokemonHatchedIcon.setVisible(false);
+          this.pokemonHatchedCountText.setVisible(false);
+          this.pokemonFormText.setY(36);
+        } else {
+          this.pokemonHatchedIcon.setVisible(true);
+          this.pokemonHatchedCountText.setVisible(true);
+          this.pokemonFormText.setY(42);
+
+          const { currentFriendship, friendshipCap } = this.getFriendship(this.species.speciesId);
+          const candyCropY = 16 - 16 * (currentFriendship / friendshipCap);
+          this.pokemonCandyDarknessOverlay.setCrop(0, 0, 16, candyCropY);
+
+          this.pokemonCandyContainer.on("pointerover", () => {
+            globalScene.ui.showTooltip("", `${currentFriendship}/${friendshipCap}`, true);
+            this.activeTooltip = "CANDY";
+          });
+          this.pokemonCandyContainer.on("pointerout", () => {
+            globalScene.ui.hideTooltip();
+            this.activeTooltip = undefined;
+          });
+        }
+      } else {
+        this.pokemonUncaughtText.setVisible(true);
+        this.pokemonCaughtHatchedContainer.setVisible(false);
+        this.pokemonCandyContainer.setVisible(false);
+        for (const icon of this.pokemonShinyIcons) {
+          icon.setVisible(false);
         }
       }
 
-      if (caughtAttr || forSeen) {
+      // Setting type icons and form text
+      if (isFormCaught || isFormSeen) {
         const speciesForm = getPokemonSpeciesForm(species.speciesId, formIndex!); // TODO: is the bang correct?
         this.setTypeIcons(speciesForm.type1, speciesForm.type2);
-        this.pokemonFormText.setText(this.getFormString((speciesForm as PokemonForm).formKey, species));
-
+        // TODO: change this once forms are refactored
+        if (normalForm.includes(species.speciesId) && !formIndex) {
+          this.pokemonFormText.setText("");
+        } else {
+          this.pokemonFormText.setText(species.getFormNameToDisplay(formIndex));
+        }
+        this.pokemonFormText.setVisible(true);
+        if (!isFormCaught) {
+          this.pokemonFormText.setY(18);
+        }
       } else {
         this.setTypeIcons(null, null);
         this.pokemonFormText.setText("");
+        this.pokemonFormText.setVisible(false);
       }
     } else {
       this.shinyOverlay.setVisible(false);
@@ -2283,22 +2679,21 @@ export default class PokedexPageUiHandler extends MessageUiHandler {
     this.updateInstructions();
   }
 
-  setTypeIcons(type1: Type | null, type2: Type | null): void {
+  setTypeIcons(type1: PokemonType | null, type2: PokemonType | null): void {
     if (type1 !== null) {
       this.type1Icon.setVisible(true);
-      this.type1Icon.setFrame(Type[type1].toLowerCase());
+      this.type1Icon.setFrame(PokemonType[type1].toLowerCase());
     } else {
       this.type1Icon.setVisible(false);
     }
     if (type2 !== null) {
       this.type2Icon.setVisible(true);
-      this.type2Icon.setFrame(Type[type2].toLowerCase());
+      this.type2Icon.setFrame(PokemonType[type2].toLowerCase());
     } else {
       this.type2Icon.setVisible(false);
     }
   }
 
-
   /**
    * Creates a temporary dex attr props that will be used to display the correct shiny, variant, and form based on this.starterAttributes
    *
@@ -2307,7 +2702,11 @@ export default class PokedexPageUiHandler extends MessageUiHandler {
    */
   getCurrentDexProps(speciesId: number): bigint {
     let props = 0n;
-    const caughtAttr = globalScene.gameData.dexData[speciesId].caughtAttr;
+    const species = allSpecies.find(sp => sp.speciesId === speciesId);
+    const caughtAttr =
+      globalScene.gameData.dexData[speciesId].caughtAttr &
+      globalScene.gameData.dexData[this.getStarterSpeciesId(speciesId)].caughtAttr &
+      (species?.getFullUnlocksData() ?? 0n);
 
     /*  this checks the gender of the pokemon; this works by checking a) that the starter preferences for the species exist, and if so, is it female. If so, it'll add DexAttr.FEMALE to our temp props
      *  It then checks b) if the caughtAttr for the pokemon is female and NOT male - this means that the ONLY gender we've gotten is female, and we need to add DexAttr.FEMALE to our temp props
@@ -2321,7 +2720,10 @@ export default class PokedexPageUiHandler extends MessageUiHandler {
     /* This part is very similar to above, but instead of for gender, it checks for shiny within starter preferences.
      * If they're not there, it enables shiny state by default if any shiny was caught
      */
-    if (this.starterAttributes?.shiny || ((caughtAttr & DexAttr.SHINY) > 0n && this.starterAttributes?.shiny !== false)) {
+    if (
+      this.starterAttributes?.shiny ||
+      ((caughtAttr & DexAttr.SHINY) > 0n && this.starterAttributes?.shiny !== false)
+    ) {
       props += DexAttr.SHINY;
       if (this.starterAttributes?.variant !== undefined) {
         props += BigInt(Math.pow(2, this.starterAttributes?.variant)) * DexAttr.DEFAULT_VARIANT;
@@ -2341,7 +2743,8 @@ export default class PokedexPageUiHandler extends MessageUiHandler {
       props += DexAttr.NON_SHINY;
       props += DexAttr.DEFAULT_VARIANT; // we add the default variant here because non shiny versions are listed as default variant
     }
-    if (this.starterAttributes?.form) { // this checks for the form of the pokemon
+    if (this.starterAttributes?.form) {
+      // this checks for the form of the pokemon
       props += BigInt(Math.pow(2, this.starterAttributes?.form)) * DexAttr.DEFAULT_FORM;
     } else {
       // Get the first unlocked form
@@ -2415,9 +2818,18 @@ export default class PokedexPageUiHandler extends MessageUiHandler {
     }
   }
 
-  checkIconId(icon: Phaser.GameObjects.Sprite, species: PokemonSpecies, female: boolean, formIndex: number, shiny: boolean, variant: number) {
+  checkIconId(
+    icon: Phaser.GameObjects.Sprite,
+    species: PokemonSpecies,
+    female: boolean,
+    formIndex: number,
+    shiny: boolean,
+    variant: number,
+  ) {
     if (icon.frame.name !== species.getIconId(female, formIndex, shiny, variant)) {
-      console.log(`${species.name}'s icon ${icon.frame.name} does not match getIconId with female: ${female}, formIndex: ${formIndex}, shiny: ${shiny}, variant: ${variant}`);
+      console.log(
+        `${species.name}'s icon ${icon.frame.name} does not match getIconId with female: ${female}, formIndex: ${formIndex}, shiny: ${shiny}, variant: ${variant}`,
+      );
       icon.setTexture(species.getIconAtlasKey(formIndex, false, variant));
       icon.setFrame(species.getIconId(female, formIndex, false, variant));
     }
diff --git a/src/ui/pokedex-scan-ui-handler.ts b/src/ui/pokedex-scan-ui-handler.ts
index 0fc7171842a..45092d461a3 100644
--- a/src/ui/pokedex-scan-ui-handler.ts
+++ b/src/ui/pokedex-scan-ui-handler.ts
@@ -3,16 +3,15 @@ import { FormModalUiHandler } from "./form-modal-ui-handler";
 import type { ModalConfig } from "./modal-ui-handler";
 import type { PlayerPokemon } from "#app/field/pokemon";
 import type { OptionSelectItem } from "./abstact-option-select-ui-handler";
-import { isNullOrUndefined } from "#app/utils";
-import { Mode } from "./ui";
+import { isNullOrUndefined } from "#app/utils/common";
+import { UiMode } from "#enums/ui-mode";
 import { FilterTextRow } from "./filter-text";
-import { allAbilities } from "#app/data/ability";
-import { allMoves } from "#app/data/move";
+import { allAbilities } from "#app/data/data-lists";
+import { allMoves } from "#app/data/moves/move";
 import { allSpecies } from "#app/data/pokemon-species";
 import i18next from "i18next";
 
 export default class PokedexScanUiHandler extends FormModalUiHandler {
-
   keys: string[];
   reducedKeys: string[];
   parallelKeys: string[];
@@ -21,10 +20,6 @@ export default class PokedexScanUiHandler extends FormModalUiHandler {
   abilityKeys: string[];
   row: number;
 
-  constructor(mode) {
-    super(mode);
-  }
-
   setup() {
     super.setup();
 
@@ -33,20 +28,20 @@ export default class PokedexScanUiHandler extends FormModalUiHandler {
     this.abilityKeys = allAbilities.map(a => a.name);
   }
 
-  getModalTitle(config?: ModalConfig): string {
+  getModalTitle(_config?: ModalConfig): string {
     return i18next.t("pokedexUiHandler:scanChooseOption");
   }
 
-  getWidth(config?: ModalConfig): number {
+  getWidth(_config?: ModalConfig): number {
     return 300;
   }
 
-  getMargin(config?: ModalConfig): [number, number, number, number] {
-    return [ 0, 0, 48, 0 ];
+  getMargin(_config?: ModalConfig): [number, number, number, number] {
+    return [0, 0, 48, 0];
   }
 
-  getButtonLabels(config?: ModalConfig): string[] {
-    return [ i18next.t("pokedexUiHandler:scanSelect"), i18next.t("pokedexUiHandler:scanCancel") ];
+  getButtonLabels(_config?: ModalConfig): string[] {
+    return [i18next.t("pokedexUiHandler:scanSelect"), i18next.t("pokedexUiHandler:scanCancel")];
   }
 
   getReadableErrorMessage(error: string): string {
@@ -67,7 +62,7 @@ export default class PokedexScanUiHandler extends FormModalUiHandler {
       case FilterTextRow.MOVE_2: {
         return [{ label: i18next.t("pokedexUiHandler:scanLabelMove") }];
       }
-      case FilterTextRow.ABILITY_1:{
+      case FilterTextRow.ABILITY_1: {
         return [{ label: i18next.t("pokedexUiHandler:scanLabelAbility") }];
       }
       case FilterTextRow.ABILITY_2: {
@@ -77,7 +72,6 @@ export default class PokedexScanUiHandler extends FormModalUiHandler {
         return [{ label: "" }];
       }
     }
-
   }
 
   reduceKeys(): void {
@@ -102,7 +96,6 @@ export default class PokedexScanUiHandler extends FormModalUiHandler {
     }
   }
 
-
   // args[2] is an index of FilterTextRow
   show(args: any[]): boolean {
     this.row = args[2];
@@ -115,8 +108,15 @@ export default class PokedexScanUiHandler extends FormModalUiHandler {
 
     this.reduceKeys();
 
+    setTimeout(() => {
+      input.setFocus(); // Focus after a short delay to avoid unwanted input
+    }, 50);
+
     input.on("keydown", (inputObject, evt: KeyboardEvent) => {
-      if ([ "escape", "space" ].some((v) => v === evt.key.toLowerCase() || v === evt.code.toLowerCase()) && ui.getMode() === Mode.AUTO_COMPLETE) {
+      if (
+        ["escape", "space"].some(v => v === evt.key.toLowerCase() || v === evt.code.toLowerCase()) &&
+        ui.getMode() === UiMode.AUTO_COMPLETE
+      ) {
         // Delete autocomplete list and recovery focus.
         inputObject.on("blur", () => inputObject.node.focus(), { once: true });
         ui.revertMode();
@@ -125,14 +125,16 @@ export default class PokedexScanUiHandler extends FormModalUiHandler {
 
     input.on("textchange", (inputObject, evt: InputEvent) => {
       // Delete autocomplete.
-      if (ui.getMode() === Mode.AUTO_COMPLETE) {
+      if (ui.getMode() === UiMode.AUTO_COMPLETE) {
         ui.revertMode();
       }
 
       let options: OptionSelectItem[] = [];
-      const filteredKeys = this.reducedKeys.filter((command) => command.toLowerCase().includes(inputObject.text.toLowerCase()));
+      const filteredKeys = this.reducedKeys.filter(command =>
+        command.toLowerCase().includes(inputObject.text.toLowerCase()),
+      );
       if (inputObject.text !== "" && filteredKeys.length > 0) {
-        options = filteredKeys.slice(0).map((value) => {
+        options = filteredKeys.slice(0).map(value => {
           return {
             label: value,
             handler: () => {
@@ -141,7 +143,7 @@ export default class PokedexScanUiHandler extends FormModalUiHandler {
               }
               ui.revertMode();
               return true;
-            }
+            },
           };
         });
       }
@@ -150,11 +152,10 @@ export default class PokedexScanUiHandler extends FormModalUiHandler {
         const modalOpts = {
           options: options,
           maxOptions: 5,
-          modalContainer: this.modalContainer
+          modalContainer: this.modalContainer,
         };
-        ui.setOverlayMode(Mode.AUTO_COMPLETE, modalOpts);
+        ui.setOverlayMode(UiMode.AUTO_COMPLETE, modalOpts);
       }
-
     });
 
     if (super.show(args)) {
@@ -166,10 +167,11 @@ export default class PokedexScanUiHandler extends FormModalUiHandler {
       } else {
         this.inputs[0].text = args[1];
       }
-      this.submitAction = (_) => {
-        if (ui.getMode() === Mode.POKEDEX_SCAN) {
+      this.submitAction = _ => {
+        if (ui.getMode() === UiMode.POKEDEX_SCAN) {
           this.sanitizeInputs();
-          const sanitizedName = btoa(unescape(encodeURIComponent(this.inputs[0].text)));
+          const outputName = this.reducedKeys.includes(this.inputs[0].text) ? this.inputs[0].text : "";
+          const sanitizedName = btoa(unescape(encodeURIComponent(outputName)));
           config.buttonActions[0](sanitizedName);
           return true;
         }
diff --git a/src/ui/pokedex-ui-handler.ts b/src/ui/pokedex-ui-handler.ts
index 410bb53906a..935c9adfeb8 100644
--- a/src/ui/pokedex-ui-handler.ts
+++ b/src/ui/pokedex-ui-handler.ts
@@ -1,25 +1,24 @@
-import type { Variant } from "#app/data/variant";
-import { getVariantTint, getVariantIcon } from "#app/data/variant";
+import type { Variant } from "#app/sprites/variant";
+import { getVariantTint, getVariantIcon } from "#app/sprites/variant";
 import { argbFromRgba } from "@material/material-color-utilities";
 import i18next from "i18next";
-import { starterColors } from "#app/battle-scene";
+import { starterColors } from "#app/global-vars/starter-colors";
 import { speciesEggMoves } from "#app/data/balance/egg-moves";
 import { pokemonFormLevelMoves, pokemonSpeciesLevelMoves } from "#app/data/balance/pokemon-level-moves";
 import type { PokemonForm } from "#app/data/pokemon-species";
 import type PokemonSpecies from "#app/data/pokemon-species";
-import { allSpecies, getPokemonSpeciesForm, getPokerusStarters } from "#app/data/pokemon-species";
+import { allSpecies, getPokemonSpeciesForm, getPokerusStarters, normalForm } from "#app/data/pokemon-species";
 import { getStarterValueFriendshipCap, speciesStarterCosts, POKERUS_STARTER_COUNT } from "#app/data/balance/starters";
 import { catchableSpecies } from "#app/data/balance/biomes";
-import { Type } from "#enums/type";
-import type { DexAttrProps, DexEntry, StarterMoveset, StarterAttributes, StarterPreferences } from "#app/system/game-data";
-import { AbilityAttr, DexAttr, StarterPrefs } from "#app/system/game-data";
+import { PokemonType } from "#enums/pokemon-type";
+import type { DexAttrProps, DexEntry, StarterAttributes, StarterPreferences } from "#app/system/game-data";
+import { AbilityAttr, DexAttr, loadStarterPreferences } from "#app/system/game-data";
 import MessageUiHandler from "#app/ui/message-ui-handler";
 import PokemonIconAnimHandler, { PokemonIconAnimMode } from "#app/ui/pokemon-icon-anim-handler";
 import { TextStyle, addTextObject } from "#app/ui/text";
-import { Mode } from "#app/ui/ui";
+import { UiMode } from "#enums/ui-mode";
 import { SettingKeyboard } from "#app/system/settings/settings-keyboard";
 import { Passive as PassiveAttr } from "#enums/passive";
-import type { Moves } from "#enums/moves";
 import type { Species } from "#enums/species";
 import { Button } from "#enums/buttons";
 import { DropDown, DropDownLabel, DropDownOption, DropDownState, DropDownType, SortCriteria } from "#app/ui/dropdown";
@@ -27,83 +26,83 @@ import { PokedexMonContainer } from "#app/ui/pokedex-mon-container";
 import { DropDownColumn, FilterBar } from "#app/ui/filter-bar";
 import { ScrollBar } from "#app/ui/scroll-bar";
 import { Abilities } from "#enums/abilities";
-import { getPassiveCandyCount, getValueReductionCandyCounts, getSameSpeciesEggCandyCounts } from "#app/data/balance/starters";
-import { BooleanHolder, fixedInt, getLocalizedSpriteKey, padInt, randIntRange, rgbHexToRgba } from "#app/utils";
+import {
+  getPassiveCandyCount,
+  getValueReductionCandyCounts,
+  getSameSpeciesEggCandyCounts,
+} from "#app/data/balance/starters";
+import { BooleanHolder, fixedInt, getLocalizedSpriteKey, padInt, randIntRange, rgbHexToRgba } from "#app/utils/common";
 import type { Nature } from "#enums/nature";
 import { addWindow } from "./ui-theme";
 import type { OptionSelectConfig } from "./abstact-option-select-ui-handler";
 import { FilterText, FilterTextRow } from "./filter-text";
-import { allAbilities } from "#app/data/ability";
-import type { PassiveAbilities } from "#app/data/balance/passives";
-import { starterPassiveAbilities } from "#app/data/balance/passives";
-import { allMoves } from "#app/data/move";
+import { allAbilities } from "#app/data/data-lists";
+import { allMoves } from "#app/data/moves/move";
 import { speciesTmMoves } from "#app/data/balance/tms";
 import { pokemonStarters } from "#app/data/balance/pokemon-evolutions";
 import { Biome } from "#enums/biome";
 import { globalScene } from "#app/global-scene";
 
-
 interface LanguageSetting {
-  starterInfoTextSize: string,
-  instructionTextSize: string,
-  starterInfoXPos?: number,
-  starterInfoYOffset?: number
+  starterInfoTextSize: string;
+  instructionTextSize: string;
+  starterInfoXPos?: number;
+  starterInfoYOffset?: number;
 }
 
 const languageSettings: { [key: string]: LanguageSetting } = {
-  "en":{
+  en: {
     starterInfoTextSize: "56px",
     instructionTextSize: "38px",
   },
-  "de":{
+  de: {
     starterInfoTextSize: "48px",
     instructionTextSize: "35px",
     starterInfoXPos: 33,
   },
-  "es-ES":{
+  "es-ES": {
     starterInfoTextSize: "56px",
     instructionTextSize: "35px",
   },
-  "fr":{
+  fr: {
     starterInfoTextSize: "54px",
     instructionTextSize: "38px",
   },
-  "it":{
+  it: {
     starterInfoTextSize: "56px",
     instructionTextSize: "38px",
   },
-  "pt_BR":{
+  pt_BR: {
     starterInfoTextSize: "47px",
     instructionTextSize: "38px",
     starterInfoXPos: 33,
   },
-  "zh":{
+  zh: {
     starterInfoTextSize: "47px",
     instructionTextSize: "38px",
     starterInfoYOffset: 1,
     starterInfoXPos: 24,
   },
-  "pt":{
+  pt: {
     starterInfoTextSize: "48px",
     instructionTextSize: "42px",
     starterInfoXPos: 33,
   },
-  "ko":{
+  ko: {
     starterInfoTextSize: "52px",
     instructionTextSize: "38px",
   },
-  "ja":{
+  ja: {
     starterInfoTextSize: "51px",
     instructionTextSize: "38px",
   },
-  "ca-ES":{
+  "ca-ES": {
     starterInfoTextSize: "56px",
     instructionTextSize: "38px",
   },
 };
 
-
-enum FilterTextOptions{
+enum FilterTextOptions {
   NAME,
   MOVE_1,
   MOVE_2,
@@ -111,6 +110,17 @@ enum FilterTextOptions{
   ABILITY_2,
 }
 
+interface ContainerData {
+  species: PokemonSpecies;
+  cost: number;
+  props: DexAttrProps;
+  eggMove1?: boolean;
+  eggMove2?: boolean;
+  tmMove1?: boolean;
+  tmMove2?: boolean;
+  passive1?: boolean;
+  passive2?: boolean;
+}
 
 const valueReductionMax = 2;
 
@@ -123,23 +133,22 @@ const speciesContainerX = 143;
  * @param index UI index to calculate the starter position of
  * @returns An interface with an x and y property
  */
-function calcStarterPosition(index: number, scrollCursor:number = 0): {x: number, y: number} {
+function calcStarterPosition(index: number): { x: number; y: number } {
   const yOffset = 13;
   const height = 17;
   const x = (index % 9) * 18;
-  const y = yOffset + (Math.floor(index / 9) - scrollCursor) * height;
+  const y = yOffset + Math.floor(index / 9) * height;
 
   return { x: x, y: y };
 }
 
 interface SpeciesDetails {
-  shiny?: boolean,
-  formIndex?: number
-  female?: boolean,
-  variant?: Variant,
-  abilityIndex?: number,
-  natureIndex?: number,
-  forSeen?: boolean, // default = false
+  shiny?: boolean;
+  formIndex?: number;
+  female?: boolean;
+  variant?: Variant;
+  abilityIndex?: number;
+  natureIndex?: number;
 }
 
 export default class PokedexUiHandler extends MessageUiHandler {
@@ -148,11 +157,11 @@ export default class PokedexUiHandler extends MessageUiHandler {
   private filterBarContainer: Phaser.GameObjects.Container;
   private filterBar: FilterBar;
   private pokemonContainers: PokedexMonContainer[] = [];
-  private filteredPokemonContainers: PokedexMonContainer[] = [];
-  private validPokemonContainers: PokedexMonContainer[] = [];
+  private filteredPokemonData: ContainerData[] = [];
   private pokemonNumberText: Phaser.GameObjects.Text;
   private pokemonSprite: Phaser.GameObjects.Sprite;
   private pokemonNameText: Phaser.GameObjects.Text;
+  private pokemonFormText: Phaser.GameObjects.Text;
   private type1Icon: Phaser.GameObjects.Sprite;
   private type2Icon: Phaser.GameObjects.Sprite;
 
@@ -160,16 +169,14 @@ export default class PokedexUiHandler extends MessageUiHandler {
   private starterSelectMessageBoxContainer: Phaser.GameObjects.Container;
 
   private filterMode: boolean;
-  private filterBarCursor: number = 0;
-  private starterMoveset: StarterMoveset | null;
+  private filterBarCursor = 0;
   private scrollCursor: number;
+  private oldCursor = -1;
 
-  private allSpecies: PokemonSpecies[] = [];
   private lastSpecies: PokemonSpecies;
   private speciesLoaded: Map<Species, boolean> = new Map<Species, boolean>();
   private pokerusSpecies: PokemonSpecies[] = [];
   private speciesStarterDexEntry: DexEntry | null;
-  private speciesStarterMoves: Moves[];
 
   private assetLoadCancelled: BooleanHolder | null;
   public cursorObj: Phaser.GameObjects.Image;
@@ -179,7 +186,7 @@ export default class PokedexUiHandler extends MessageUiHandler {
 
   private starterPreferences: StarterPreferences;
 
-  protected blockInput: boolean = false;
+  protected blockInput = false;
 
   // for text filters
   private readonly textPadding = 8;
@@ -191,23 +198,38 @@ export default class PokedexUiHandler extends MessageUiHandler {
   protected manageDataConfig: OptionSelectConfig;
   private filterTextOptions: FilterTextOptions[];
   protected optionSelectText: Phaser.GameObjects.Text;
-  protected scale: number = 0.1666666667;
+  protected scale = 0.1666666667;
   private menuBg: Phaser.GameObjects.NineSlice;
 
   private filterTextContainer: Phaser.GameObjects.Container;
   private filterText: FilterText;
   private filterTextMode: boolean;
-  private filterTextCursor: number = 0;
+  private filterTextCursor = 0;
 
-  private showDecorations: boolean = false;
+  private showDecorations = false;
   private goFilterIconElement1: Phaser.GameObjects.Sprite;
   private goFilterIconElement2: Phaser.GameObjects.Sprite;
   private goFilterLabel: Phaser.GameObjects.Text;
   private toggleDecorationsIconElement: Phaser.GameObjects.Sprite;
   private toggleDecorationsLabel: Phaser.GameObjects.Text;
 
+  private formTrayContainer: Phaser.GameObjects.Container;
+  private trayBg: Phaser.GameObjects.NineSlice;
+  private trayForms: PokemonForm[];
+  private trayContainers: PokedexMonContainer[] = [];
+  private trayNumIcons: number;
+  private trayRows: number;
+  private trayColumns: number;
+  private trayCursorObj: Phaser.GameObjects.Image;
+  private trayCursor = 0;
+  private showingTray = false;
+  private showFormTrayIconElement: Phaser.GameObjects.Sprite;
+  private showFormTrayLabel: Phaser.GameObjects.Text;
+  private canShowFormTray: boolean;
+  private filteredIndices: Species[];
+
   constructor() {
-    super(Mode.POKEDEX);
+    super(UiMode.POKEDEX);
   }
 
   setup() {
@@ -220,17 +242,26 @@ export default class PokedexUiHandler extends MessageUiHandler {
     this.starterSelectContainer.setVisible(false);
     ui.add(this.starterSelectContainer);
 
-    const bgColor = globalScene.add.rectangle(0, 0, globalScene.game.canvas.width / 6, globalScene.game.canvas.height / 6, 0x006860);
+    const bgColor = globalScene.add.rectangle(
+      0,
+      0,
+      globalScene.game.canvas.width / 6,
+      globalScene.game.canvas.height / 6,
+      0x006860,
+    );
     bgColor.setOrigin(0, 0);
     this.starterSelectContainer.add(bgColor);
 
     const pokemonContainerWindow = addWindow(speciesContainerX, filterBarHeight + 1, 175, 161);
-    const pokemonContainerBg = globalScene.add.image(speciesContainerX + 1, filterBarHeight + 2, "starter_container_bg");
+    const pokemonContainerBg = globalScene.add.image(
+      speciesContainerX + 1,
+      filterBarHeight + 2,
+      "starter_container_bg",
+    );
     pokemonContainerBg.setOrigin(0, 0);
     this.starterSelectContainer.add(pokemonContainerBg);
     this.starterSelectContainer.add(pokemonContainerWindow);
 
-
     // Create and initialise filter text fields
     this.filterTextContainer = globalScene.add.container(0, 0);
     this.filterText = new FilterText(1, filterBarHeight + 2, 140, 100, this.updateStarters);
@@ -244,7 +275,6 @@ export default class PokedexUiHandler extends MessageUiHandler {
     this.filterTextContainer.add(this.filterText);
     this.starterSelectContainer.add(this.filterTextContainer);
 
-
     // Create and initialise filter bar
     this.filterBarContainer = globalScene.add.container(0, 0);
     this.filterBar = new FilterBar(speciesContainerX, 1, 175, filterBarHeight, 2, 0, 6);
@@ -265,7 +295,7 @@ export default class PokedexUiHandler extends MessageUiHandler {
     this.filterBar.addFilter(DropDownColumn.GEN, i18next.t("filterBar:genFilter"), genDropDown);
 
     // type filter
-    const typeKeys = Object.keys(Type).filter(v => isNaN(Number(v)));
+    const typeKeys = Object.keys(PokemonType).filter(v => Number.isNaN(Number(v)));
     const typeOptions: DropDownOption[] = [];
     typeKeys.forEach((type, index) => {
       if (index === 0 || index === 19) {
@@ -274,17 +304,22 @@ export default class PokedexUiHandler extends MessageUiHandler {
       const typeSprite = globalScene.add.sprite(0, 0, getLocalizedSpriteKey("types"));
       typeSprite.setScale(0.5);
       typeSprite.setFrame(type.toLowerCase());
-      typeOptions.push(new DropDownOption( index, new DropDownLabel("", typeSprite)));
+      typeOptions.push(new DropDownOption(index, new DropDownLabel("", typeSprite)));
     });
-    this.filterBar.addFilter(DropDownColumn.TYPES, i18next.t("filterBar:typeFilter"), new DropDown(0, 0, typeOptions, this.updateStarters, DropDownType.HYBRID, 0.5));
+    this.filterBar.addFilter(
+      DropDownColumn.TYPES,
+      i18next.t("filterBar:typeFilter"),
+      new DropDown(0, 0, typeOptions, this.updateStarters, DropDownType.HYBRID, 0.5),
+    );
 
     // biome filter, making an entry in the dropdown for each biome
     const biomeOptions = Object.values(Biome)
-      .filter((value) => typeof value === "number") // Filter numeric values from the enum
-      .map((biomeValue, index) =>
-        new DropDownOption( index, new DropDownLabel(i18next.t(`biome:${Biome[biomeValue].toUpperCase()}`)))
+      .filter(value => typeof value === "number") // Filter numeric values from the enum
+      .map(
+        (biomeValue, index) =>
+          new DropDownOption(index, new DropDownLabel(i18next.t(`biome:${Biome[biomeValue].toUpperCase()}`))),
       );
-    biomeOptions.push(new DropDownOption( biomeOptions.length, new DropDownLabel(i18next.t("filterBar:uncatchable"))));
+    biomeOptions.push(new DropDownOption(biomeOptions.length, new DropDownLabel(i18next.t("filterBar:uncatchable"))));
     const biomeDropDown: DropDown = new DropDown(0, 0, biomeOptions, this.updateStarters, DropDownType.HYBRID);
     this.filterBar.addFilter(DropDownColumn.BIOME, i18next.t("filterBar:biomeFilter"), biomeDropDown);
 
@@ -310,10 +345,14 @@ export default class PokedexUiHandler extends MessageUiHandler {
       new DropDownOption("SHINY2", new DropDownLabel("", shiny2Sprite)),
       new DropDownOption("SHINY", new DropDownLabel("", shiny1Sprite)),
       new DropDownOption("NORMAL", new DropDownLabel(i18next.t("filterBar:normal"))),
-      new DropDownOption("UNCAUGHT", new DropDownLabel(i18next.t("filterBar:uncaught")))
+      new DropDownOption("UNCAUGHT", new DropDownLabel(i18next.t("filterBar:uncaught"))),
     ];
 
-    this.filterBar.addFilter(DropDownColumn.CAUGHT, i18next.t("filterBar:caughtFilter"), new DropDown(0, 0, caughtOptions, this.updateStarters, DropDownType.HYBRID));
+    this.filterBar.addFilter(
+      DropDownColumn.CAUGHT,
+      i18next.t("filterBar:caughtFilter"),
+      new DropDown(0, 0, caughtOptions, this.updateStarters, DropDownType.HYBRID),
+    );
 
     // unlocks filter
     const passiveLabels = [
@@ -326,6 +365,8 @@ export default class PokedexUiHandler extends MessageUiHandler {
     const costReductionLabels = [
       new DropDownLabel(i18next.t("filterBar:costReduction"), undefined, DropDownState.OFF),
       new DropDownLabel(i18next.t("filterBar:costReductionUnlocked"), undefined, DropDownState.ON),
+      new DropDownLabel(i18next.t("filterBar:costReductionUnlockedOne"), undefined, DropDownState.ONE),
+      new DropDownLabel(i18next.t("filterBar:costReductionUnlockedTwo"), undefined, DropDownState.TWO),
       new DropDownLabel(i18next.t("filterBar:costReductionUnlockable"), undefined, DropDownState.UNLOCKABLE),
       new DropDownLabel(i18next.t("filterBar:costReductionLocked"), undefined, DropDownState.EXCLUDE),
     ];
@@ -335,7 +376,11 @@ export default class PokedexUiHandler extends MessageUiHandler {
       new DropDownOption("COST_REDUCTION", costReductionLabels),
     ];
 
-    this.filterBar.addFilter(DropDownColumn.UNLOCKS, i18next.t("filterBar:unlocksFilter"), new DropDown(0, 0, unlocksOptions, this.updateStarters, DropDownType.RADIAL));
+    this.filterBar.addFilter(
+      DropDownColumn.UNLOCKS,
+      i18next.t("filterBar:unlocksFilter"),
+      new DropDown(0, 0, unlocksOptions, this.updateStarters, DropDownType.RADIAL),
+    );
 
     // misc filter
     const starters = [
@@ -374,19 +419,30 @@ export default class PokedexUiHandler extends MessageUiHandler {
       new DropDownOption("EGG", eggLabels),
       new DropDownOption("POKERUS", pokerusLabels),
     ];
-    this.filterBar.addFilter(DropDownColumn.MISC, i18next.t("filterBar:miscFilter"), new DropDown(0, 0, miscOptions, this.updateStarters, DropDownType.RADIAL));
+    this.filterBar.addFilter(
+      DropDownColumn.MISC,
+      i18next.t("filterBar:miscFilter"),
+      new DropDown(0, 0, miscOptions, this.updateStarters, DropDownType.RADIAL),
+    );
 
     // sort filter
     const sortOptions = [
-      new DropDownOption(SortCriteria.NUMBER, new DropDownLabel(i18next.t("filterBar:sortByNumber"), undefined, DropDownState.ON)),
+      new DropDownOption(
+        SortCriteria.NUMBER,
+        new DropDownLabel(i18next.t("filterBar:sortByNumber"), undefined, DropDownState.ON),
+      ),
       new DropDownOption(SortCriteria.COST, new DropDownLabel(i18next.t("filterBar:sortByCost"))),
       new DropDownOption(SortCriteria.CANDY, new DropDownLabel(i18next.t("filterBar:sortByCandies"))),
       new DropDownOption(SortCriteria.IV, new DropDownLabel(i18next.t("filterBar:sortByIVs"))),
       new DropDownOption(SortCriteria.NAME, new DropDownLabel(i18next.t("filterBar:sortByName"))),
       new DropDownOption(SortCriteria.CAUGHT, new DropDownLabel(i18next.t("filterBar:sortByNumCaught"))),
-      new DropDownOption(SortCriteria.HATCHED, new DropDownLabel(i18next.t("filterBar:sortByNumHatched")))
+      new DropDownOption(SortCriteria.HATCHED, new DropDownLabel(i18next.t("filterBar:sortByNumHatched"))),
     ];
-    this.filterBar.addFilter(DropDownColumn.SORT, i18next.t("filterBar:sortFilter"), new DropDown(0, 0, sortOptions, this.updateStarters, DropDownType.SINGLE));
+    this.filterBar.addFilter(
+      DropDownColumn.SORT,
+      i18next.t("filterBar:sortFilter"),
+      new DropDown(0, 0, sortOptions, this.updateStarters, DropDownType.SINGLE),
+    );
     this.filterBarContainer.add(this.filterBar);
 
     this.starterSelectContainer.add(this.filterBarContainer);
@@ -401,14 +457,20 @@ export default class PokedexUiHandler extends MessageUiHandler {
     this.iconAnimHandler = new PokemonIconAnimHandler();
     this.iconAnimHandler.setup();
 
-    this.pokemonNumberText = addTextObject(6, 140, "", TextStyle.SUMMARY);
+    this.pokemonNumberText = addTextObject(6, 141, "", TextStyle.SUMMARY);
     this.pokemonNumberText.setOrigin(0, 0);
     this.starterSelectContainer.add(this.pokemonNumberText);
 
-    this.pokemonNameText = addTextObject(6, 127, "", TextStyle.SUMMARY);
+    this.pokemonNameText = addTextObject(6, 128, "", TextStyle.SUMMARY);
     this.pokemonNameText.setOrigin(0, 0);
     this.starterSelectContainer.add(this.pokemonNameText);
 
+    this.pokemonFormText = addTextObject(6, 121, "", TextStyle.PARTY, {
+      fontSize: textSettings.instructionTextSize,
+    });
+    this.pokemonFormText.setOrigin(0, 0);
+    this.starterSelectContainer.add(this.pokemonFormText);
+
     const starterBoxContainer = globalScene.add.container(speciesContainerX + 6, 9); //115
 
     this.starterSelectScrollBar = new ScrollBar(161, 12, 5, pokemonContainerWindow.height - 6, 9);
@@ -425,23 +487,43 @@ export default class PokedexUiHandler extends MessageUiHandler {
 
     this.cursorObj = globalScene.add.image(0, 0, "select_cursor");
     this.cursorObj.setOrigin(0, 0);
-
     starterBoxContainer.add(this.cursorObj);
 
     for (const species of allSpecies) {
       this.speciesLoaded.set(species.speciesId, false);
-      this.allSpecies.push(species);
+    }
 
-      const pokemonContainer = new PokedexMonContainer(species).setVisible(false);
+    // Here code to declare 81 containers
+    for (let i = 0; i < 81; i++) {
+      const pokemonContainer = new PokedexMonContainer(allSpecies[i]).setVisible(false);
+      const pos = calcStarterPosition(i);
+      pokemonContainer.setPosition(pos.x, pos.y);
       this.iconAnimHandler.addOrUpdate(pokemonContainer.icon, PokemonIconAnimMode.NONE);
       this.pokemonContainers.push(pokemonContainer);
       starterBoxContainer.add(pokemonContainer);
     }
 
+    // Tray to display forms
+    this.formTrayContainer = globalScene.add.container(0, 0);
+
+    this.trayBg = addWindow(0, 0, 0, 0);
+    this.trayBg.setOrigin(0, 0);
+    this.formTrayContainer.add(this.trayBg);
+
+    this.trayCursorObj = globalScene.add.image(0, 0, "select_cursor");
+    this.trayCursorObj.setOrigin(0, 0);
+    this.formTrayContainer.add(this.trayCursorObj);
+    starterBoxContainer.add(this.formTrayContainer);
+    starterBoxContainer.bringToTop(this.formTrayContainer);
+    this.formTrayContainer.setVisible(false);
+
     this.starterSelectContainer.add(starterBoxContainer);
 
     this.pokemonSprite = globalScene.add.sprite(96, 143, "pkmn__sub");
-    this.pokemonSprite.setPipeline(globalScene.spritePipeline, { tone: [ 0.0, 0.0, 0.0, 0.0 ], ignoreTimeTint: true });
+    this.pokemonSprite.setPipeline(globalScene.spritePipeline, {
+      tone: [0.0, 0.0, 0.0, 0.0],
+      ignoreTimeTint: true,
+    });
     this.starterSelectContainer.add(this.pokemonSprite);
 
     this.type1Icon = globalScene.add.sprite(10, 158, getLocalizedSpriteKey("types"));
@@ -449,7 +531,7 @@ export default class PokedexUiHandler extends MessageUiHandler {
     this.type1Icon.setOrigin(0, 0);
     this.starterSelectContainer.add(this.type1Icon);
 
-    this.type2Icon = globalScene.add.sprite(10, 166, getLocalizedSpriteKey("types"));
+    this.type2Icon = globalScene.add.sprite(28, 158, getLocalizedSpriteKey("types"));
     this.type2Icon.setScale(0.5);
     this.type2Icon.setOrigin(0, 0);
     this.starterSelectContainer.add(this.type2Icon);
@@ -473,7 +555,9 @@ export default class PokedexUiHandler extends MessageUiHandler {
     this.goFilterIconElement2.setName("sprite-goFilter2-icon-element");
     this.goFilterIconElement2.setScale(0.675);
     this.goFilterIconElement2.setOrigin(0.0, 0.0);
-    this.goFilterLabel = addTextObject(30, 2, i18next.t("pokedexUiHandler:goFilters"), TextStyle.PARTY, { fontSize: instructionTextSize });
+    this.goFilterLabel = addTextObject(30, 2, i18next.t("pokedexUiHandler:goFilters"), TextStyle.PARTY, {
+      fontSize: instructionTextSize,
+    });
     this.goFilterLabel.setName("text-goFilter-label");
     this.starterSelectContainer.add(this.goFilterIconElement1);
     this.starterSelectContainer.add(this.goFilterIconElement2);
@@ -483,11 +567,30 @@ export default class PokedexUiHandler extends MessageUiHandler {
     this.toggleDecorationsIconElement.setName("sprite-toggleDecorations-icon-element");
     this.toggleDecorationsIconElement.setScale(0.675);
     this.toggleDecorationsIconElement.setOrigin(0.0, 0.0);
-    this.toggleDecorationsLabel = addTextObject(20, 10, i18next.t("pokedexUiHandler:toggleDecorations"), TextStyle.PARTY, { fontSize: instructionTextSize });
+    this.toggleDecorationsLabel = addTextObject(
+      20,
+      10,
+      i18next.t("pokedexUiHandler:toggleDecorations"),
+      TextStyle.PARTY,
+      { fontSize: instructionTextSize },
+    );
     this.toggleDecorationsLabel.setName("text-toggleDecorations-label");
     this.starterSelectContainer.add(this.toggleDecorationsIconElement);
     this.starterSelectContainer.add(this.toggleDecorationsLabel);
 
+    this.showFormTrayIconElement = new Phaser.GameObjects.Sprite(globalScene, 6, 168, "keyboard", "F.png");
+    this.showFormTrayIconElement.setName("sprite-showFormTray-icon-element");
+    this.showFormTrayIconElement.setScale(0.675);
+    this.showFormTrayIconElement.setOrigin(0.0, 0.0);
+    this.showFormTrayLabel = addTextObject(16, 168, i18next.t("pokedexUiHandler:showForms"), TextStyle.PARTY, {
+      fontSize: instructionTextSize,
+    });
+    this.showFormTrayLabel.setName("text-showFormTray-label");
+    this.showFormTrayIconElement.setVisible(false);
+    this.showFormTrayLabel.setVisible(false);
+    this.starterSelectContainer.add(this.showFormTrayIconElement);
+    this.starterSelectContainer.add(this.showFormTrayLabel);
+
     this.message = addTextObject(8, 8, "", TextStyle.WINDOW, { maxLines: 2 });
     this.message.setOrigin(0, 0);
     this.starterSelectMessageBoxContainer.add(this.message);
@@ -499,12 +602,13 @@ export default class PokedexUiHandler extends MessageUiHandler {
     this.starterSelectContainer.bringToTop(this.filterBarContainer);
     this.initTutorialOverlay(this.starterSelectContainer);
     this.starterSelectContainer.bringToTop(this.starterSelectMessageBoxContainer);
+    this.starterSelectContainer.bringToTop(this.pokemonNameText);
+    this.starterSelectContainer.bringToTop(this.pokemonFormText);
   }
 
   show(args: any[]): boolean {
-
     if (!this.starterPreferences) {
-      this.starterPreferences = StarterPrefs.load();
+      this.starterPreferences = loadStarterPreferences();
     }
 
     this.pokerusSpecies = getPokerusStarters();
@@ -520,19 +624,12 @@ export default class PokedexUiHandler extends MessageUiHandler {
 
     this.getUi().bringToTop(this.starterSelectContainer);
 
-    // Making caught pokemon visible icons, etc
-    this.allSpecies.forEach((species, s) => {
-      const icon = this.pokemonContainers[s].icon;
-      const dexEntry = globalScene.gameData.dexData[species.speciesId];
+    this.pokemonContainers.forEach(container => {
+      const icon = container.icon;
+      const species = container.species;
 
       this.starterPreferences[species.speciesId] = this.initStarterPrefs(species);
 
-      if (dexEntry.caughtAttr) {
-        icon.clearTint();
-      } else if (dexEntry.seenAttr) {
-        icon.setTint(0x808080);
-      }
-
       this.setUpgradeAnimation(icon, species);
     });
 
@@ -568,35 +665,40 @@ export default class PokedexUiHandler extends MessageUiHandler {
       return {};
     }
 
-    const caughtAttr = dexEntry.caughtAttr;
+    const caughtAttr = dexEntry.caughtAttr & species.getFullUnlocksData();
 
     const hasShiny = caughtAttr & DexAttr.SHINY;
     const hasNonShiny = caughtAttr & DexAttr.NON_SHINY;
     if (starterAttributes.shiny && !hasShiny) {
       // shiny form wasn't unlocked, purging shiny and variant setting
-      delete starterAttributes.shiny;
-      delete starterAttributes.variant;
+
+      starterAttributes.shiny = undefined;
+      starterAttributes.variant = undefined;
     } else if (starterAttributes.shiny === false && !hasNonShiny) {
       // non shiny form wasn't unlocked, purging shiny setting
-      delete starterAttributes.shiny;
+      starterAttributes.shiny = undefined;
     }
 
     if (starterAttributes.variant !== undefined) {
       const unlockedVariants = [
         hasShiny && caughtAttr & DexAttr.DEFAULT_VARIANT,
         hasShiny && caughtAttr & DexAttr.VARIANT_2,
-        hasShiny && caughtAttr & DexAttr.VARIANT_3
+        hasShiny && caughtAttr & DexAttr.VARIANT_3,
       ];
-      if (isNaN(starterAttributes.variant) || starterAttributes.variant < 0 || !unlockedVariants[starterAttributes.variant]) {
+      if (
+        Number.isNaN(starterAttributes.variant) ||
+        starterAttributes.variant < 0 ||
+        !unlockedVariants[starterAttributes.variant]
+      ) {
         // variant value is invalid or requested variant wasn't unlocked, purging setting
-        delete starterAttributes.variant;
+        starterAttributes.variant = undefined;
       }
     }
 
     if (starterAttributes.female !== undefined) {
       if (!(starterAttributes.female ? caughtAttr & DexAttr.FEMALE : caughtAttr & DexAttr.MALE)) {
         // requested gender wasn't unlocked, purging setting
-        delete starterAttributes.female;
+        starterAttributes.female = undefined;
       }
     }
 
@@ -611,25 +713,29 @@ export default class PokedexUiHandler extends MessageUiHandler {
       const unlockedAbilities = [
         hasAbility1,
         speciesHasSingleAbility ? hasAbility2 && !hasAbility1 : hasAbility2,
-        hasHiddenAbility
+        hasHiddenAbility,
       ];
       if (!unlockedAbilities[starterAttributes.ability]) {
         // requested ability wasn't unlocked, purging setting
-        delete starterAttributes.ability;
+        starterAttributes.ability = undefined;
       }
     }
 
     const selectedForm = starterAttributes.form;
-    if (selectedForm !== undefined && (!species.forms[selectedForm]?.isStarterSelectable || !(caughtAttr & globalScene.gameData.getFormAttr(selectedForm)))) {
+    if (
+      selectedForm !== undefined &&
+      (!species.forms[selectedForm]?.isStarterSelectable ||
+        !(caughtAttr & globalScene.gameData.getFormAttr(selectedForm)))
+    ) {
       // requested form wasn't unlocked/isn't a starter form, purging setting
-      delete starterAttributes.form;
+      starterAttributes.form = undefined;
     }
 
     if (starterAttributes.nature !== undefined) {
       const unlockedNatures = globalScene.gameData.getNaturesForAttr(dexEntry.natureAttr);
       if (unlockedNatures.indexOf(starterAttributes.nature as unknown as Nature) < 0) {
         // requested nature wasn't unlocked, purging setting
-        delete starterAttributes.nature;
+        starterAttributes.nature = undefined;
       }
     }
 
@@ -639,12 +745,20 @@ export default class PokedexUiHandler extends MessageUiHandler {
   /**
    * Set the selections for all filters to their default starting value
    */
-  resetFilters() : void {
+  resetFilters(): void {
     this.filterBar.setValsToDefault();
     this.filterText.setValsToDefault();
   }
 
-  showText(text: string, delay?: number, callback?: Function, callbackDelay?: number, prompt?: boolean, promptDelay?: number, moveToTop?: boolean) {
+  showText(
+    text: string,
+    delay?: number,
+    callback?: Function,
+    callbackDelay?: number,
+    prompt?: boolean,
+    promptDelay?: number,
+    moveToTop?: boolean,
+  ) {
     super.showText(text, delay, callback, callbackDelay, prompt, promptDelay);
 
     const singleLine = text?.indexOf("\n") === -1;
@@ -664,6 +778,15 @@ export default class PokedexUiHandler extends MessageUiHandler {
     this.starterSelectMessageBoxContainer.setVisible(!!text?.length);
   }
 
+  isSeen(species: PokemonSpecies, dexEntry: DexEntry): boolean {
+    if (dexEntry?.seenAttr) {
+      return true;
+    }
+
+    const starterDexEntry = globalScene.gameData.dexData[this.getStarterSpeciesId(species.speciesId)];
+    return !!starterDexEntry?.caughtAttr;
+  }
+
   /**
    * Determines if 'Icon' based upgrade notifications should be shown
    * @returns true if upgrade notifications are enabled and set to display an 'Icon'
@@ -682,9 +805,8 @@ export default class PokedexUiHandler extends MessageUiHandler {
   getStarterSpeciesId(speciesId): number {
     if (speciesStarterCosts.hasOwnProperty(speciesId)) {
       return speciesId;
-    } else {
-      return pokemonStarters[speciesId];
     }
+    return pokemonStarters[speciesId];
   }
 
   /**
@@ -696,8 +818,10 @@ export default class PokedexUiHandler extends MessageUiHandler {
     // Get this species ID's starter data
     const starterData = globalScene.gameData.starterData[this.getStarterSpeciesId(speciesId)];
 
-    return starterData.candyCount >= getPassiveCandyCount(speciesStarterCosts[this.getStarterSpeciesId(speciesId)])
-      && !(starterData.passiveAttr & PassiveAttr.UNLOCKED);
+    return (
+      starterData.candyCount >= getPassiveCandyCount(speciesStarterCosts[this.getStarterSpeciesId(speciesId)]) &&
+      !(starterData.passiveAttr & PassiveAttr.UNLOCKED)
+    );
   }
 
   /**
@@ -709,8 +833,12 @@ export default class PokedexUiHandler extends MessageUiHandler {
     // Get this species ID's starter data
     const starterData = globalScene.gameData.starterData[this.getStarterSpeciesId(speciesId)];
 
-    return starterData.candyCount >= getValueReductionCandyCounts(speciesStarterCosts[this.getStarterSpeciesId(speciesId)])[starterData.valueReduction]
-        && starterData.valueReduction < valueReductionMax;
+    return (
+      starterData.candyCount >=
+        getValueReductionCandyCounts(speciesStarterCosts[this.getStarterSpeciesId(speciesId)])[
+          starterData.valueReduction
+        ] && starterData.valueReduction < valueReductionMax
+    );
   }
 
   /**
@@ -722,7 +850,9 @@ export default class PokedexUiHandler extends MessageUiHandler {
     // Get this species ID's starter data
     const starterData = globalScene.gameData.starterData[this.getStarterSpeciesId(speciesId)];
 
-    return starterData.candyCount >= getSameSpeciesEggCandyCounts(speciesStarterCosts[this.getStarterSpeciesId(speciesId)]);
+    return (
+      starterData.candyCount >= getSameSpeciesEggCandyCounts(speciesStarterCosts[this.getStarterSpeciesId(speciesId)])
+    );
   }
 
   /**
@@ -731,7 +861,7 @@ export default class PokedexUiHandler extends MessageUiHandler {
    * @param species {@linkcode PokemonSpecies} of the icon used to check for upgrades
    * @param startPaused Should this animation be paused after it is added?
    */
-  setUpgradeAnimation(icon: Phaser.GameObjects.Sprite, species: PokemonSpecies, startPaused: boolean = false): void {
+  setUpgradeAnimation(icon: Phaser.GameObjects.Sprite, species: PokemonSpecies, startPaused = false): void {
     globalScene.tweens.killTweensOf(icon);
     // Skip animations if they are disabled
     if (globalScene.candyUpgradeDisplay === 0 || species.speciesId !== species.getRootSpeciesId(false)) {
@@ -743,6 +873,7 @@ export default class PokedexUiHandler extends MessageUiHandler {
     const tweenChain: Phaser.Types.Tweens.TweenChainBuilderConfig = {
       targets: icon,
       loop: -1,
+      paused: startPaused,
       // Make the initial bounce a little randomly delayed
       delay: randIntRange(0, 50) * 5,
       loopDelay: 1000,
@@ -752,30 +883,26 @@ export default class PokedexUiHandler extends MessageUiHandler {
           y: 2 - 5,
           duration: fixedInt(125),
           ease: "Cubic.easeOut",
-          yoyo: true
+          yoyo: true,
         },
         {
           targets: icon,
           y: 2 - 3,
           duration: fixedInt(150),
           ease: "Cubic.easeOut",
-          yoyo: true
-        }
-      ], };
+          yoyo: true,
+        },
+      ],
+    };
 
-    const isPassiveAvailable = this.isPassiveAvailable(species.speciesId);
-    const isValueReductionAvailable = this.isValueReductionAvailable(species.speciesId);
-    const isSameSpeciesEggAvailable = this.isSameSpeciesEggAvailable(species.speciesId);
-
-    // 'Passives Only' mode
-    if (globalScene.candyUpgradeNotification === 1) {
-      if (isPassiveAvailable) {
-        globalScene.tweens.chain(tweenChain).paused = startPaused;
-      }
-    // 'On' mode
-    } else if (globalScene.candyUpgradeNotification === 2) {
-      if (isPassiveAvailable || isValueReductionAvailable || isSameSpeciesEggAvailable) {
-        globalScene.tweens.chain(tweenChain).paused = startPaused;
+    if (
+      this.isPassiveAvailable(species.speciesId) ||
+      (globalScene.candyUpgradeNotification === 2 &&
+        (this.isValueReductionAvailable(species.speciesId) || this.isSameSpeciesEggAvailable(species.speciesId)))
+    ) {
+      const chain = globalScene.tweens.chain(tweenChain);
+      if (!startPaused) {
+        chain.play();
       }
     }
   }
@@ -787,7 +914,11 @@ export default class PokedexUiHandler extends MessageUiHandler {
     const species = starter.species;
     const slotVisible = !!species?.speciesId;
 
-    if (!species || globalScene.candyUpgradeNotification === 0 || species.speciesId !== species.getRootSpeciesId(false)) {
+    if (
+      !species ||
+      globalScene.candyUpgradeNotification === 0 ||
+      species.speciesId !== species.getRootSpeciesId(false)
+    ) {
       starter.candyUpgradeIcon.setVisible(false);
       starter.candyUpgradeOverlayIcon.setVisible(false);
       return;
@@ -805,7 +936,8 @@ export default class PokedexUiHandler extends MessageUiHandler {
       // 'On' mode
     } else if (globalScene.candyUpgradeNotification === 2) {
       starter.candyUpgradeIcon.setVisible(
-        slotVisible && ( isPassiveAvailable || isValueReductionAvailable || isSameSpeciesEggAvailable ));
+        slotVisible && (isPassiveAvailable || isValueReductionAvailable || isSameSpeciesEggAvailable),
+      );
       starter.candyUpgradeOverlayIcon.setVisible(slotVisible && starter.candyUpgradeIcon.visible);
     }
   }
@@ -815,7 +947,7 @@ export default class PokedexUiHandler extends MessageUiHandler {
    * @param pokemonContainer the container for the Pokemon to update
    */
   updateCandyUpgradeDisplay(pokemonContainer: PokedexMonContainer) {
-    if (this.isUpgradeIconEnabled() ) {
+    if (this.isUpgradeIconEnabled()) {
       this.setUpgradeIcon(pokemonContainer);
     }
     if (this.isUpgradeAnimationEnabled()) {
@@ -829,12 +961,11 @@ export default class PokedexUiHandler extends MessageUiHandler {
     }
 
     const maxColumns = 9;
-    const numberOfStarters = this.filteredPokemonContainers.length;
+    const numberOfStarters = this.filteredPokemonData.length;
     const numOfRows = Math.ceil(numberOfStarters / maxColumns);
-    const currentRow = Math.floor(this.cursor / maxColumns);
     const onScreenFirstIndex = this.scrollCursor * maxColumns; // this is first index on the screen
-
-    // TODO: use the above to let the cursor go to the correct position when switching back.
+    // TODO: check if in some places we need to use one or the other
+    const currentRow = Math.floor((onScreenFirstIndex + this.cursor) / maxColumns);
 
     const ui = this.getUi();
 
@@ -847,45 +978,53 @@ export default class PokedexUiHandler extends MessageUiHandler {
       if (this.filterMode && this.filterBar.openDropDown) {
         // CANCEL with a filter menu open > close it
         this.filterBar.toggleDropDown(this.filterBarCursor);
-
-        // if there are possible pokemon go the first one of the list
-        if (numberOfStarters > 0) {
-          this.setFilterMode(false);
-          this.scrollCursor = 0;
-          this.updateScroll();
-          this.setCursor(0);
-        }
         success = true;
-
-      } else if (this.filterTextMode && !(this.filterText.getValue(this.filterTextCursor) === this.filterText.defaultText)) {
+      } else if (this.filterMode && !this.filterBar.getFilter(this.filterBarCursor).hasDefaultValues()) {
+        this.filterBar.resetSelection(this.filterBarCursor);
+        this.updateStarters();
+        success = true;
+      } else if (
+        this.filterTextMode &&
+        !(this.filterText.getValue(this.filterTextCursor) === this.filterText.defaultText)
+      ) {
         this.filterText.resetSelection(this.filterTextCursor);
         success = true;
+      } else if (this.showingTray) {
+        success = this.closeFormTray();
       } else {
         this.tryExit();
         success = true;
       }
-    }  else if (button === Button.STATS) {
-      if (!this.filterMode) {
+    } else if (button === Button.STATS) {
+      if (!this.filterMode && !this.showingTray) {
         this.cursorObj.setVisible(false);
         this.setSpecies(null);
         this.filterText.cursorObj.setVisible(false);
         this.filterTextMode = false;
         this.filterBarCursor = 0;
         this.setFilterMode(true);
+      } else {
+        error = true;
       }
-    }  else if (button === Button.V) {
-      if (!this.filterTextMode) {
+    } else if (button === Button.CYCLE_TERA) {
+      if (!this.filterTextMode && !this.showingTray) {
         this.cursorObj.setVisible(false);
         this.setSpecies(null);
         this.filterBar.cursorObj.setVisible(false);
         this.filterMode = false;
         this.filterTextCursor = 0;
         this.setFilterTextMode(true);
+      } else {
+        error = true;
       }
     } else if (button === Button.CYCLE_SHINY) {
-      this.showDecorations = !this.showDecorations;
-      this.updateScroll();
-      success = true;
+      if (!this.showingTray) {
+        this.showDecorations = !this.showDecorations;
+        this.updateScroll();
+        success = true;
+      } else {
+        error = true;
+      }
     } else if (this.filterMode) {
       switch (button) {
         case Button.LEFT:
@@ -906,16 +1045,18 @@ export default class PokedexUiHandler extends MessageUiHandler {
           if (this.filterBar.openDropDown) {
             success = this.filterBar.decDropDownCursor();
           } else if (numberOfStarters > 0) {
-          // UP from filter bar to bottom of Pokemon list
+            // UP from filter bar to bottom of Pokemon list
             this.setFilterMode(false);
             this.scrollCursor = Math.max(0, numOfRows - 9);
             this.updateScroll();
             const proportion = this.filterBarCursor / Math.max(1, this.filterBar.numFilters - 1);
             const targetCol = Math.min(8, proportion < 0.5 ? Math.floor(proportion * 8) : Math.ceil(proportion * 8));
             if (numberOfStarters % 9 > targetCol) {
-              this.setCursor(numberOfStarters - (numberOfStarters) % 9 + targetCol);
+              this.setCursor(numberOfStarters - (numberOfStarters % 9) + targetCol - this.scrollCursor * 9);
             } else {
-              this.setCursor(Math.max(numberOfStarters - (numberOfStarters) % 9 + targetCol - 9, 0));
+              this.setCursor(
+                Math.max(numberOfStarters - (numberOfStarters % 9) + targetCol - 9 - this.scrollCursor * 9, 0),
+              );
             }
             success = true;
           }
@@ -924,13 +1065,13 @@ export default class PokedexUiHandler extends MessageUiHandler {
           if (this.filterBar.openDropDown) {
             success = this.filterBar.incDropDownCursor();
           } else if (numberOfStarters > 0) {
-          // DOWN from filter bar to top of Pokemon list
+            // DOWN from filter bar to top of Pokemon list
             this.setFilterMode(false);
             this.scrollCursor = 0;
             this.updateScroll();
             const proportion = this.filterBarCursor / Math.max(1, this.filterBar.numFilters - 1);
             const targetCol = Math.min(8, proportion < 0.5 ? Math.floor(proportion * 8) : Math.ceil(proportion * 8));
-            this.setCursor(Math.min(targetCol, numberOfStarters));
+            this.setCursor(Math.min(targetCol, numberOfStarters - 1));
             success = true;
           }
           break;
@@ -950,7 +1091,7 @@ export default class PokedexUiHandler extends MessageUiHandler {
           if (numberOfStarters > 0) {
             this.setFilterTextMode(false);
             const rowIndex = this.filterTextCursor;
-            this.setCursor(onScreenFirstIndex + (rowIndex < numOfRows - 1 ? (rowIndex + 1) * maxColumns - 1 : numberOfStarters - 1));
+            this.setCursor(rowIndex < numOfRows - 1 ? (rowIndex + 1) * maxColumns - 1 : numberOfStarters - 1);
             success = true;
           }
           break;
@@ -959,7 +1100,7 @@ export default class PokedexUiHandler extends MessageUiHandler {
           if (numberOfStarters > 0) {
             this.setFilterTextMode(false);
             const rowIndex = this.filterTextCursor;
-            this.setCursor(onScreenFirstIndex + (rowIndex < numOfRows ? rowIndex * maxColumns : (numOfRows - 1) * maxColumns));
+            this.setCursor(rowIndex < numOfRows ? rowIndex * maxColumns : (numOfRows - 1) * maxColumns);
             success = true;
           }
           break;
@@ -982,10 +1123,59 @@ export default class PokedexUiHandler extends MessageUiHandler {
           success = true;
           break;
       }
-    } else {
-
+    } else if (this.showingTray) {
       if (button === Button.ACTION) {
-        ui.setOverlayMode(Mode.POKEDEX_PAGE, this.lastSpecies, 0);
+        const formIndex = this.trayForms[this.trayCursor].formIndex;
+        ui.setOverlayMode(UiMode.POKEDEX_PAGE, this.lastSpecies, { form: formIndex }, this.filteredIndices);
+        success = true;
+      } else {
+        const numberOfForms = this.trayContainers.length;
+        const numOfRows = Math.ceil(numberOfForms / maxColumns);
+        const currentTrayRow = Math.floor(this.trayCursor / maxColumns);
+        switch (button) {
+          case Button.UP:
+            if (currentTrayRow > 0) {
+              success = this.setTrayCursor(this.trayCursor - 9);
+            } else {
+              const targetCol = this.trayCursor;
+              if (numberOfForms % 9 > targetCol) {
+                success = this.setTrayCursor(numberOfForms - (numberOfForms % 9) + targetCol);
+              } else {
+                success = this.setTrayCursor(Math.max(numberOfForms - (numberOfForms % 9) + targetCol - 9, 0));
+              }
+            }
+            break;
+          case Button.DOWN:
+            if (currentTrayRow < numOfRows - 1) {
+              success = this.setTrayCursor(this.trayCursor + 9);
+            } else {
+              success = this.setTrayCursor(this.trayCursor % 9);
+            }
+            break;
+          case Button.LEFT:
+            if (this.trayCursor % 9 !== 0) {
+              success = this.setTrayCursor(this.trayCursor - 1);
+            } else {
+              success = this.setTrayCursor(
+                currentTrayRow < numOfRows - 1 ? (currentTrayRow + 1) * maxColumns - 1 : numberOfForms - 1,
+              );
+            }
+            break;
+          case Button.RIGHT:
+            if (this.trayCursor % 9 < (currentTrayRow < numOfRows - 1 ? 8 : (numberOfForms - 1) % 9)) {
+              success = this.setTrayCursor(this.trayCursor + 1);
+            } else {
+              success = this.setTrayCursor(currentTrayRow * 9);
+            }
+            break;
+          case Button.CYCLE_FORM:
+            success = this.closeFormTray();
+            break;
+        }
+      }
+    } else {
+      if (button === Button.ACTION) {
+        ui.setOverlayMode(UiMode.POKEDEX_PAGE, this.lastSpecies, null, this.filteredIndices);
         success = true;
       } else {
         switch (button) {
@@ -994,29 +1184,35 @@ export default class PokedexUiHandler extends MessageUiHandler {
               if (this.scrollCursor > 0 && currentRow - this.scrollCursor === 0) {
                 this.scrollCursor--;
                 this.updateScroll();
+                success = this.setCursor(this.cursor);
+              } else {
+                success = this.setCursor(this.cursor - 9);
               }
-              success = this.setCursor(this.cursor - 9);
             } else {
-              this.filterBarCursor = this.filterBar.getNearestFilter(this.filteredPokemonContainers[this.cursor]);
+              this.filterBarCursor = this.filterBar.getNearestFilter(this.pokemonContainers[this.cursor]);
               this.setFilterMode(true);
               success = true;
             }
             break;
           case Button.DOWN:
-            if (currentRow < numOfRows - 1) { // not last row
-              if (currentRow - this.scrollCursor === 8) { // last row of visible pokemon
+            if (currentRow < numOfRows - 1 && this.cursor + 9 < this.filteredPokemonData.length) {
+              // not last row
+              if (currentRow - this.scrollCursor === 8) {
+                // last row of visible pokemon
                 this.scrollCursor++;
+                this.updateScroll();
+                success = this.setCursor(this.cursor);
+              } else {
+                success = this.setCursor(this.cursor + 9);
               }
-              success = this.setCursor(this.cursor + 9);
-              this.updateScroll();
             } else if (numOfRows > 1) {
-            // DOWN from last row of pokemon > Wrap around to first row
+              // DOWN from last row of pokemon > Wrap around to first row
               this.scrollCursor = 0;
               this.updateScroll();
               success = this.setCursor(this.cursor % 9);
             } else {
-            // DOWN from single row of pokemon > Go to filters
-              this.filterBarCursor = this.filterBar.getNearestFilter(this.filteredPokemonContainers[this.cursor]);
+              // DOWN from single row of pokemon > Go to filters
+              this.filterBarCursor = this.filterBar.getNearestFilter(this.pokemonContainers[this.cursor]);
               this.setFilterMode(true);
               success = true;
             }
@@ -1025,8 +1221,8 @@ export default class PokedexUiHandler extends MessageUiHandler {
             if (this.cursor % 9 !== 0) {
               success = this.setCursor(this.cursor - 1);
             } else {
-            // LEFT from filtered pokemon, on the left edge
-              this.filterTextCursor = this.filterText.getNearestFilter(this.filteredPokemonContainers[this.cursor]);
+              // LEFT from filtered pokemon, on the left edge
+              this.filterTextCursor = this.filterText.getNearestFilter(this.pokemonContainers[this.cursor]);
               this.setFilterTextMode(true);
               success = true;
             }
@@ -1036,12 +1232,19 @@ export default class PokedexUiHandler extends MessageUiHandler {
             if (this.cursor % 9 < (currentRow < numOfRows - 1 ? 8 : (numberOfStarters - 1) % 9)) {
               success = this.setCursor(this.cursor + 1);
             } else {
-            // RIGHT from filtered pokemon, on the right edge
-              this.filterTextCursor = this.filterText.getNearestFilter(this.filteredPokemonContainers[this.cursor]);
+              // RIGHT from filtered pokemon, on the right edge
+              this.filterTextCursor = this.filterText.getNearestFilter(this.pokemonContainers[this.cursor]);
               this.setFilterTextMode(true);
               success = true;
             }
             break;
+          case Button.CYCLE_FORM: {
+            const species = this.pokemonContainers[this.cursor].species;
+            if (this.canShowFormTray) {
+              success = this.openFormTray(species);
+            }
+            break;
+          }
         }
       }
     }
@@ -1056,6 +1259,7 @@ export default class PokedexUiHandler extends MessageUiHandler {
   }
 
   updateButtonIcon(iconSetting, gamepadType, iconElement, controlLabel): void {
+    // biome-ignore lint/suspicious/noImplicitAnyLet: TODO
     let iconPath;
     // touch controls cannot be rebound as is, and are just emulating a keyboard event.
     // Additionally, since keyboard controls can be rebound (and will be displayed when they are), we need to have special handling for the touch controls
@@ -1065,8 +1269,8 @@ export default class PokedexUiHandler extends MessageUiHandler {
         case SettingKeyboard.Button_Cycle_Shiny:
           iconPath = "R.png";
           break;
-        case SettingKeyboard.Button_Cycle_Variant:
-          iconPath = "V.png";
+        case SettingKeyboard.Button_Cycle_Form:
+          iconPath = "F.png";
           break;
         case SettingKeyboard.Button_Stats:
           iconPath = "C.png";
@@ -1083,6 +1287,7 @@ export default class PokedexUiHandler extends MessageUiHandler {
   }
 
   updateFilterButtonIcon(iconSetting, gamepadType, iconElement, controlLabel): void {
+    // biome-ignore lint/suspicious/noImplicitAnyLet: TODO
     let iconPath;
     // touch controls cannot be rebound as is, and are just emulating a keyboard event.
     // Additionally, since keyboard controls can be rebound (and will be displayed when they are), we need to have special handling for the touch controls
@@ -1102,73 +1307,71 @@ export default class PokedexUiHandler extends MessageUiHandler {
       shiny: false,
       female: props.female,
       variant: 0,
-      formIndex: 0,
+      formIndex: props.formIndex,
     };
     return sanitizedProps;
   }
 
   // Returns true if one of the forms has the requested move
   hasFormLevelMove(form: PokemonForm, selectedMove: string): boolean {
-    if (!pokemonFormLevelMoves.hasOwnProperty(form.speciesId) || !pokemonFormLevelMoves[form.speciesId].hasOwnProperty(form.formIndex)) {
+    if (
+      !pokemonFormLevelMoves.hasOwnProperty(form.speciesId) ||
+      !pokemonFormLevelMoves[form.speciesId].hasOwnProperty(form.formIndex)
+    ) {
       return false;
-    } else {
-      const levelMoves = pokemonFormLevelMoves[form.speciesId][form.formIndex].map(m => allMoves[m[1]].name);
-      return levelMoves.includes(selectedMove);
     }
+    const levelMoves = pokemonFormLevelMoves[form.speciesId][form.formIndex].map(m => allMoves[m[1]].name);
+    return levelMoves.includes(selectedMove);
   }
 
   updateStarters = () => {
     this.scrollCursor = 0;
-    this.filteredPokemonContainers = [];
-    this.validPokemonContainers = [];
+    this.filteredPokemonData = [];
 
     this.pokerusCursorObjs.forEach(cursor => cursor.setVisible(false));
 
     this.filterBar.updateFilterLabels();
     this.filterText.updateFilterLabels();
 
-    this.validPokemonContainers = this.pokemonContainers;
+    this.filteredPokemonData = [];
 
-    // this updates icons for previously saved pokemon
-    for (let i = 0; i < this.validPokemonContainers.length; i++) {
-      const currentFilteredContainer = this.validPokemonContainers[i];
-      const starterSprite = currentFilteredContainer.icon as Phaser.GameObjects.Sprite;
+    allSpecies.forEach(species => {
+      const starterId = this.getStarterSpeciesId(species.speciesId);
 
-      const currentDexAttr = this.getCurrentDexProps(currentFilteredContainer.species.speciesId);
-      const props = this.getSanitizedProps(globalScene.gameData.getSpeciesDexAttrProps(currentFilteredContainer.species, currentDexAttr));
+      const currentDexAttr = this.getCurrentDexProps(species.speciesId);
+      const props = this.getSanitizedProps(globalScene.gameData.getSpeciesDexAttrProps(species, currentDexAttr));
 
-      starterSprite.setTexture(currentFilteredContainer.species.getIconAtlasKey(props.formIndex, props.shiny, props.variant), currentFilteredContainer.species.getIconId(props.female!, props.formIndex, props.shiny, props.variant));
-      currentFilteredContainer.checkIconId(props.female, props.formIndex, props.shiny, props.variant);
-    }
-
-    // filter
-    this.validPokemonContainers.forEach(container => {
-      container.setVisible(false);
-
-      container.cost = globalScene.gameData.getSpeciesStarterValue(this.getStarterSpeciesId(container.species.speciesId));
+      const data: ContainerData = {
+        species: species,
+        cost: globalScene.gameData.getSpeciesStarterValue(starterId),
+        props: props,
+      };
 
       // First, ensure you have the caught attributes for the species else default to bigint 0
       // TODO: This might be removed depending on how accessible we want the pokedex function to be
-      const caughtAttr = globalScene.gameData.dexData[container.species.speciesId]?.caughtAttr || BigInt(0);
-      const starterData = globalScene.gameData.starterData[this.getStarterSpeciesId(container.species.speciesId)];
-      const isStarterProgressable = speciesEggMoves.hasOwnProperty(this.getStarterSpeciesId(container.species.speciesId));
+      const caughtAttr =
+        (globalScene.gameData.dexData[species.speciesId]?.caughtAttr || BigInt(0)) &
+        (globalScene.gameData.dexData[this.getStarterSpeciesId(species.speciesId)]?.caughtAttr || BigInt(0)) &
+        species.getFullUnlocksData();
+      const starterData = globalScene.gameData.starterData[starterId];
+      const isStarterProgressable = speciesEggMoves.hasOwnProperty(starterId);
 
       // Name filter
       const selectedName = this.filterText.getValue(FilterTextRow.NAME);
-      const fitsName = container.species.name === selectedName || selectedName === this.filterText.defaultText;
+      const fitsName = species.name === selectedName || selectedName === this.filterText.defaultText;
 
       // Move filter
       // TODO: There can be fringe cases where the two moves belong to mutually exclusive forms, these must be handled separately (Pikachu);
       // On the other hand, in some cases it is possible to switch between different forms and combine (Deoxys)
-      const levelMoves = pokemonSpeciesLevelMoves[container.species.speciesId].map(m => allMoves[m[1]].name);
+      const levelMoves = pokemonSpeciesLevelMoves[species.speciesId].map(m => allMoves[m[1]].name);
       // This always gets egg moves from the starter
-      const eggMoves = speciesEggMoves[this.getStarterSpeciesId(container.species.speciesId)]?.map(m => allMoves[m].name) ?? [];
-      const tmMoves = speciesTmMoves[this.getStarterSpeciesId(container.species.speciesId)]?.map(m => allMoves[Array.isArray(m) ? m[1] : m].name) ?? [];
+      const eggMoves = speciesEggMoves[starterId]?.map(m => allMoves[m].name) ?? [];
+      const tmMoves = speciesTmMoves[species.speciesId]?.map(m => allMoves[Array.isArray(m) ? m[1] : m].name) ?? [];
       const selectedMove1 = this.filterText.getValue(FilterTextRow.MOVE_1);
       const selectedMove2 = this.filterText.getValue(FilterTextRow.MOVE_2);
 
-      const fitsFormMove1 = container.species.forms.some(form => this.hasFormLevelMove(form, selectedMove1));
-      const fitsFormMove2 = container.species.forms.some(form => this.hasFormLevelMove(form, selectedMove2));
+      const fitsFormMove1 = species.forms.some(form => this.hasFormLevelMove(form, selectedMove1));
+      const fitsFormMove2 = species.forms.some(form => this.hasFormLevelMove(form, selectedMove2));
       const fitsLevelMove1 = levelMoves.includes(selectedMove1) || fitsFormMove1;
       const fitsEggMove1 = eggMoves.includes(selectedMove1);
       const fitsTmMove1 = tmMoves.includes(selectedMove1);
@@ -1179,70 +1382,98 @@ export default class PokedexUiHandler extends MessageUiHandler {
       const fitsMove2 = fitsLevelMove2 || fitsEggMove2 || fitsTmMove2 || selectedMove2 === this.filterText.defaultText;
       const fitsMoves = fitsMove1 && fitsMove2;
 
-      container.eggMove1Icon.setVisible(false);
-      container.tmMove1Icon.setVisible(false);
-      container.eggMove2Icon.setVisible(false);
-      container.tmMove2Icon.setVisible(false);
       if (fitsEggMove1 && !fitsLevelMove1) {
-        container.eggMove1Icon.setVisible(true);
+        const em1 = eggMoves.findIndex(name => name === selectedMove1);
+        if ((starterData.eggMoves & (1 << em1)) === 0) {
+          data.eggMove1 = false;
+        } else {
+          data.eggMove1 = true;
+        }
       } else if (fitsTmMove1 && !fitsLevelMove1) {
-        container.tmMove1Icon.setVisible(true);
+        data.tmMove1 = true;
       }
       if (fitsEggMove2 && !fitsLevelMove2) {
-        container.eggMove2Icon.setVisible(true);
+        const em2 = eggMoves.findIndex(name => name === selectedMove2);
+        if ((starterData.eggMoves & (1 << em2)) === 0) {
+          data.eggMove2 = false;
+        } else {
+          data.eggMove2 = true;
+        }
       } else if (fitsTmMove2 && !fitsLevelMove2) {
-        container.tmMove2Icon.setVisible(true);
+        data.tmMove2 = true;
       }
 
       // Ability filter
-      const abilities = [ container.species.ability1, container.species.ability2, container.species.abilityHidden ].map(a => allAbilities[a].name);
-      const passives = starterPassiveAbilities[this.getStarterSpeciesId(container.species.speciesId)] ?? {} as PassiveAbilities;
+      const abilities = [species.ability1, species.ability2, species.abilityHidden].map(a => allAbilities[a].name);
+      // get the passive ability for the species
+      const passives = [species.getPassiveAbility()];
+      for (const form of species.forms) {
+        passives.push(form.getPassiveAbility());
+      }
 
       const selectedAbility1 = this.filterText.getValue(FilterTextRow.ABILITY_1);
-      const fitsFormAbility = container.species.forms.some(form => allAbilities[form.ability1].name === selectedAbility1);
-      const fitsAbility1 = abilities.includes(selectedAbility1) || fitsFormAbility || selectedAbility1 === this.filterText.defaultText;
-      const fitsPassive1 = Object.values(passives).some(p => p.name === selectedAbility1);
+      const fitsFormAbility1 = species.forms.some(form =>
+        [form.ability1, form.ability2, form.abilityHidden].map(a => allAbilities[a].name).includes(selectedAbility1),
+      );
+      const fitsAbility1 =
+        abilities.includes(selectedAbility1) || fitsFormAbility1 || selectedAbility1 === this.filterText.defaultText;
+      const fitsPassive1 = Object.values(passives).some(p => allAbilities[p].name === selectedAbility1);
 
       const selectedAbility2 = this.filterText.getValue(FilterTextRow.ABILITY_2);
-      const fitsAbility2 = abilities.includes(selectedAbility2) || fitsFormAbility || selectedAbility2 === this.filterText.defaultText;
-      const fitsPassive2 = Object.values(passives).some(p => p.name === selectedAbility2);
+      const fitsFormAbility2 = species.forms.some(form =>
+        [form.ability1, form.ability2, form.abilityHidden].map(a => allAbilities[a].name).includes(selectedAbility2),
+      );
+      const fitsAbility2 =
+        abilities.includes(selectedAbility2) || fitsFormAbility2 || selectedAbility2 === this.filterText.defaultText;
+      const fitsPassive2 = Object.values(passives).some(p => allAbilities[p].name === selectedAbility2);
 
       // If both fields have been set to the same ability, show both ability and passive
-      const fitsAbilities = (fitsAbility1 && (fitsPassive2 || selectedAbility2 === this.filterText.defaultText)) ||
-                            (fitsAbility2 && (fitsPassive1 || selectedAbility1 === this.filterText.defaultText));
+      const fitsAbilities =
+        (fitsAbility1 && (fitsPassive2 || selectedAbility2 === this.filterText.defaultText)) ||
+        (fitsAbility2 && (fitsPassive1 || selectedAbility1 === this.filterText.defaultText));
 
-      container.passive1Icon.setVisible(false);
-      container.passive2Icon.setVisible(false);
-      if (fitsPassive1) {
-        container.passive1Icon.setVisible(true);
-      }
-      if (fitsPassive2) {
-        container.passive2Icon.setVisible(true);
+      if (fitsPassive1 || fitsPassive2) {
+        if (fitsPassive1) {
+          if (starterData.passiveAttr > 0) {
+            data.passive1 = true;
+          } else {
+            data.passive1 = false;
+          }
+        } else {
+          if (starterData.passiveAttr > 0) {
+            data.passive2 = true;
+          } else {
+            data.passive2 = false;
+          }
+        }
       }
 
       // Gen filter
-      const fitsGen =   this.filterBar.getVals(DropDownColumn.GEN).includes(container.species.generation);
+      const fitsGen = this.filterBar.getVals(DropDownColumn.GEN).includes(species.generation);
 
       // Type filter
-      const fitsType =  this.filterBar.getVals(DropDownColumn.TYPES).some(type => container.species.isOfType((type as number) - 1));
+      const fitsType = this.filterBar
+        .getVals(DropDownColumn.TYPES)
+        .some(type => species.isOfType((type as number) - 1));
 
       // Biome filter
       const indexToBiome = new Map(
         Object.values(Biome)
-          .map((value, index) => (typeof value === "string" ? [ index, value ] : undefined))
-          .filter((entry): entry is [number, string] => entry !== undefined)
+          .map((value, index) => (typeof value === "string" ? [index, value] : undefined))
+          .filter((entry): entry is [number, string] => entry !== undefined),
       );
       indexToBiome.set(35, "Uncatchable");
 
       // We get biomes for both the mon and its starters to ensure that evolutions get the correct filters.
       // TODO: We might also need to do it the other way around.
-      const biomes = catchableSpecies[container.species.speciesId].concat(catchableSpecies[this.getStarterSpeciesId(container.species.speciesId)]).map(b => Biome[b.biome]);
+      const biomes = catchableSpecies[species.speciesId].concat(catchableSpecies[starterId]).map(b => Biome[b.biome]);
       if (biomes.length === 0) {
         biomes.push("Uncatchable");
       }
-      const showNoBiome = (biomes.length === 0 && this.filterBar.getVals(DropDownColumn.BIOME).length === 36) ? true : false;
-      const fitsBiome = this.filterBar.getVals(DropDownColumn.BIOME).some(item => biomes.includes(indexToBiome.get(item) ?? "")) || showNoBiome;
-
+      const showNoBiome = !!(biomes.length === 0 && this.filterBar.getVals(DropDownColumn.BIOME).length === 36);
+      const fitsBiome =
+        this.filterBar.getVals(DropDownColumn.BIOME).some(item => biomes.includes(indexToBiome.get(item) ?? "")) ||
+        showNoBiome;
 
       // Caught / Shiny filter
       const isNonShinyCaught = !!(caughtAttr & DexAttr.NON_SHINY);
@@ -1254,28 +1485,35 @@ export default class PokedexUiHandler extends MessageUiHandler {
       const fitsCaught = this.filterBar.getVals(DropDownColumn.CAUGHT).some(caught => {
         if (caught === "SHINY3") {
           return isVariant3Caught;
-        } else if (caught === "SHINY2") {
+        }
+        if (caught === "SHINY2") {
           return isVariant2Caught && !isVariant3Caught;
-        } else if (caught === "SHINY") {
+        }
+        if (caught === "SHINY") {
           return isVariant1Caught && !isVariant2Caught && !isVariant3Caught;
-        } else if (caught === "NORMAL") {
+        }
+        if (caught === "NORMAL") {
           return isNonShinyCaught && !isVariant1Caught && !isVariant2Caught && !isVariant3Caught;
-        } else if (caught === "UNCAUGHT") {
+        }
+        if (caught === "UNCAUGHT") {
           return isUncaught;
         }
       });
 
       // Passive Filter
       const isPassiveUnlocked = starterData.passiveAttr > 0;
-      const isPassiveUnlockable = this.isPassiveAvailable(container.species.speciesId) && !isPassiveUnlocked;
+      const isPassiveUnlockable = this.isPassiveAvailable(species.speciesId) && !isPassiveUnlocked;
       const fitsPassive = this.filterBar.getVals(DropDownColumn.UNLOCKS).some(unlocks => {
         if (unlocks.val === "PASSIVE" && unlocks.state === DropDownState.ON) {
           return isPassiveUnlocked;
-        } else if (unlocks.val === "PASSIVE" && unlocks.state === DropDownState.EXCLUDE) {
+        }
+        if (unlocks.val === "PASSIVE" && unlocks.state === DropDownState.EXCLUDE) {
           return isStarterProgressable && !isPassiveUnlocked;
-        } else if (unlocks.val === "PASSIVE" && unlocks.state === DropDownState.UNLOCKABLE) {
+        }
+        if (unlocks.val === "PASSIVE" && unlocks.state === DropDownState.UNLOCKABLE) {
           return isPassiveUnlockable;
-        } else if (unlocks.val === "PASSIVE" && unlocks.state === DropDownState.OFF) {
+        }
+        if (unlocks.val === "PASSIVE" && unlocks.state === DropDownState.OFF) {
           return true;
         }
       });
@@ -1283,25 +1521,30 @@ export default class PokedexUiHandler extends MessageUiHandler {
       // Cost Reduction Filter
       const isCostReducedByOne = starterData.valueReduction === 1;
       const isCostReducedByTwo = starterData.valueReduction === 2;
-      const isCostReductionUnlockable = this.isValueReductionAvailable(container.species.speciesId);
+      const isCostReductionUnlockable = this.isValueReductionAvailable(species.speciesId);
       const fitsCostReduction = this.filterBar.getVals(DropDownColumn.UNLOCKS).some(unlocks => {
         if (unlocks.val === "COST_REDUCTION" && unlocks.state === DropDownState.ON) {
           return isCostReducedByOne || isCostReducedByTwo;
-        } else if (unlocks.val === "COST_REDUCTION" && unlocks.state === DropDownState.ONE) {
+        }
+        if (unlocks.val === "COST_REDUCTION" && unlocks.state === DropDownState.ONE) {
           return isCostReducedByOne;
-        } else if (unlocks.val === "COST_REDUCTION" && unlocks.state === DropDownState.TWO) {
+        }
+        if (unlocks.val === "COST_REDUCTION" && unlocks.state === DropDownState.TWO) {
           return isCostReducedByTwo;
-        } else if (unlocks.val === "COST_REDUCTION" && unlocks.state === DropDownState.EXCLUDE) {
+        }
+        if (unlocks.val === "COST_REDUCTION" && unlocks.state === DropDownState.EXCLUDE) {
           return isStarterProgressable && !(isCostReducedByOne || isCostReducedByTwo);
-        } else if (unlocks.val === "COST_REDUCTION" && unlocks.state === DropDownState.UNLOCKABLE) {
+        }
+        if (unlocks.val === "COST_REDUCTION" && unlocks.state === DropDownState.UNLOCKABLE) {
           return isCostReductionUnlockable;
-        } else if (unlocks.val === "COST_REDUCTION" && unlocks.state === DropDownState.OFF) {
+        }
+        if (unlocks.val === "COST_REDUCTION" && unlocks.state === DropDownState.OFF) {
           return true;
         }
       });
 
       // Starter Filter
-      const isStarter = this.getStarterSpeciesId(container.species.speciesId) === container.species.speciesId;
+      const isStarter = this.getStarterSpeciesId(species.speciesId) === species.speciesId;
       const fitsStarter = this.filterBar.getVals(DropDownColumn.MISC).some(misc => {
         if (misc.val === "STARTER" && misc.state === DropDownState.ON) {
           return isStarter;
@@ -1315,7 +1558,7 @@ export default class PokedexUiHandler extends MessageUiHandler {
       });
 
       // Favorite Filter
-      const isFavorite = this.starterPreferences[container.species.speciesId]?.favorite ?? false;
+      const isFavorite = this.starterPreferences[species.speciesId]?.favorite ?? false;
       const fitsFavorite = this.filterBar.getVals(DropDownColumn.MISC).some(misc => {
         if (misc.val === "FAVORITE" && misc.state === DropDownState.ON) {
           return isFavorite;
@@ -1335,34 +1578,41 @@ export default class PokedexUiHandler extends MessageUiHandler {
       const fitsWin = this.filterBar.getVals(DropDownColumn.MISC).some(misc => {
         if (misc.val === "WIN" && misc.state === DropDownState.ON) {
           return hasWon;
-        } else if (misc.val === "WIN" && misc.state === DropDownState.EXCLUDE) {
+        }
+        if (misc.val === "WIN" && misc.state === DropDownState.EXCLUDE) {
           return hasNotWon || isUndefined;
-        } else if (misc.val === "WIN" && misc.state === DropDownState.OFF) {
+        }
+        if (misc.val === "WIN" && misc.state === DropDownState.OFF) {
           return true;
         }
       });
 
       // HA Filter
-      const speciesHasHiddenAbility = container.species.abilityHidden !== container.species.ability1 && container.species.abilityHidden !== Abilities.NONE;
+      const speciesHasHiddenAbility =
+        species.abilityHidden !== species.ability1 && species.abilityHidden !== Abilities.NONE;
       const hasHA = starterData.abilityAttr & AbilityAttr.ABILITY_HIDDEN;
       const fitsHA = this.filterBar.getVals(DropDownColumn.MISC).some(misc => {
         if (misc.val === "HIDDEN_ABILITY" && misc.state === DropDownState.ON) {
           return hasHA;
-        } else if (misc.val === "HIDDEN_ABILITY" && misc.state === DropDownState.EXCLUDE) {
+        }
+        if (misc.val === "HIDDEN_ABILITY" && misc.state === DropDownState.EXCLUDE) {
           return speciesHasHiddenAbility && !hasHA;
-        } else if (misc.val === "HIDDEN_ABILITY" && misc.state === DropDownState.OFF) {
+        }
+        if (misc.val === "HIDDEN_ABILITY" && misc.state === DropDownState.OFF) {
           return true;
         }
       });
 
       // Egg Purchasable Filter
-      const isEggPurchasable = this.isSameSpeciesEggAvailable(container.species.speciesId);
+      const isEggPurchasable = this.isSameSpeciesEggAvailable(species.speciesId);
       const fitsEgg = this.filterBar.getVals(DropDownColumn.MISC).some(misc => {
         if (misc.val === "EGG" && misc.state === DropDownState.ON) {
           return isEggPurchasable;
-        } else if (misc.val === "EGG" && misc.state === DropDownState.EXCLUDE) {
+        }
+        if (misc.val === "EGG" && misc.state === DropDownState.EXCLUDE) {
           return isStarterProgressable && !isEggPurchasable;
-        } else if (misc.val === "EGG" && misc.state === DropDownState.OFF) {
+        }
+        if (misc.val === "EGG" && misc.state === DropDownState.OFF) {
           return true;
         }
       });
@@ -1370,113 +1620,205 @@ export default class PokedexUiHandler extends MessageUiHandler {
       // Pokerus Filter
       const fitsPokerus = this.filterBar.getVals(DropDownColumn.MISC).some(misc => {
         if (misc.val === "POKERUS" && misc.state === DropDownState.ON) {
-          return this.pokerusSpecies.includes(container.species);
-        } else if (misc.val === "POKERUS" && misc.state === DropDownState.EXCLUDE) {
-          return !this.pokerusSpecies.includes(container.species);
-        } else if (misc.val === "POKERUS" && misc.state === DropDownState.OFF) {
+          return this.pokerusSpecies.includes(species);
+        }
+        if (misc.val === "POKERUS" && misc.state === DropDownState.EXCLUDE) {
+          return !this.pokerusSpecies.includes(species);
+        }
+        if (misc.val === "POKERUS" && misc.state === DropDownState.OFF) {
           return true;
         }
       });
 
-      if (fitsName && fitsAbilities && fitsMoves && fitsGen && fitsBiome && fitsType && fitsCaught && fitsPassive && fitsCostReduction && fitsStarter && fitsFavorite && fitsWin && fitsHA && fitsEgg && fitsPokerus) {
-        this.filteredPokemonContainers.push(container);
+      if (
+        fitsName &&
+        fitsAbilities &&
+        fitsMoves &&
+        fitsGen &&
+        fitsBiome &&
+        fitsType &&
+        fitsCaught &&
+        fitsPassive &&
+        fitsCostReduction &&
+        fitsStarter &&
+        fitsFavorite &&
+        fitsWin &&
+        fitsHA &&
+        fitsEgg &&
+        fitsPokerus
+      ) {
+        this.filteredPokemonData.push(data);
       }
     });
 
-    this.starterSelectScrollBar.setTotalRows(Math.max(Math.ceil(this.filteredPokemonContainers.length / 9), 1));
+    this.starterSelectScrollBar.setTotalRows(Math.max(Math.ceil(this.filteredPokemonData.length / 9), 1));
     this.starterSelectScrollBar.setScrollCursor(0);
 
     // sort
     const sort = this.filterBar.getVals(DropDownColumn.SORT)[0];
-    this.filteredPokemonContainers.sort((a, b) => {
+    this.filteredPokemonData.sort((a, b) => {
       switch (sort.val) {
-        default:
-          break;
         case SortCriteria.NUMBER:
           return (a.species.speciesId - b.species.speciesId) * -sort.dir;
         case SortCriteria.COST:
           return (a.cost - b.cost) * -sort.dir;
-        case SortCriteria.CANDY:
-          const candyCountA = globalScene.gameData.starterData[a.species.speciesId].candyCount;
-          const candyCountB = globalScene.gameData.starterData[b.species.speciesId].candyCount;
+        case SortCriteria.CANDY: {
+          const candyCountA =
+            globalScene.gameData.starterData[this.getStarterSpeciesId(a.species.speciesId)].candyCount;
+          const candyCountB =
+            globalScene.gameData.starterData[this.getStarterSpeciesId(b.species.speciesId)].candyCount;
           return (candyCountA - candyCountB) * -sort.dir;
-        case SortCriteria.IV:
-          const avgIVsA = globalScene.gameData.dexData[a.species.speciesId].ivs.reduce((a, b) => a + b, 0) / globalScene.gameData.dexData[a.species.speciesId].ivs.length;
-          const avgIVsB = globalScene.gameData.dexData[b.species.speciesId].ivs.reduce((a, b) => a + b, 0) / globalScene.gameData.dexData[b.species.speciesId].ivs.length;
+        }
+        case SortCriteria.IV: {
+          const avgIVsA =
+            globalScene.gameData.dexData[a.species.speciesId].ivs.reduce((a, b) => a + b, 0) /
+            globalScene.gameData.dexData[a.species.speciesId].ivs.length;
+          const avgIVsB =
+            globalScene.gameData.dexData[b.species.speciesId].ivs.reduce((a, b) => a + b, 0) /
+            globalScene.gameData.dexData[b.species.speciesId].ivs.length;
           return (avgIVsA - avgIVsB) * -sort.dir;
+        }
         case SortCriteria.NAME:
           return a.species.name.localeCompare(b.species.name) * -sort.dir;
         case SortCriteria.CAUGHT:
-          return (globalScene.gameData.dexData[a.species.speciesId].caughtCount - globalScene.gameData.dexData[b.species.speciesId].caughtCount) * -sort.dir;
+          return (
+            (globalScene.gameData.dexData[a.species.speciesId].caughtCount -
+              globalScene.gameData.dexData[b.species.speciesId].caughtCount) *
+            -sort.dir
+          );
         case SortCriteria.HATCHED:
-          return (globalScene.gameData.dexData[this.getStarterSpeciesId(a.species.speciesId)].hatchedCount - globalScene.gameData.dexData[this.getStarterSpeciesId(b.species.speciesId)].hatchedCount) * -sort.dir;
+          return (
+            (globalScene.gameData.dexData[this.getStarterSpeciesId(a.species.speciesId)].hatchedCount -
+              globalScene.gameData.dexData[this.getStarterSpeciesId(b.species.speciesId)].hatchedCount) *
+            -sort.dir
+          );
+        default:
+          break;
       }
       return 0;
     });
 
+    this.filteredIndices = this.filteredPokemonData.map(c => c.species.speciesId);
+
     this.updateScroll();
   };
 
   updateScroll = () => {
     const maxColumns = 9;
-    const maxRows = 9;
     const onScreenFirstIndex = this.scrollCursor * maxColumns;
-    const onScreenLastIndex = Math.min(this.filteredPokemonContainers.length - 1, onScreenFirstIndex + maxRows * maxColumns - 1);
 
     this.starterSelectScrollBar.setScrollCursor(this.scrollCursor);
 
     this.pokerusCursorObjs.forEach(cursorObj => cursorObj.setVisible(false));
 
     let pokerusCursorIndex = 0;
-    this.filteredPokemonContainers.forEach((container, i) => {
-      const pos = calcStarterPosition(i, this.scrollCursor);
-      container.setPosition(pos.x, pos.y);
-      if (i < onScreenFirstIndex || i > onScreenLastIndex) {
+    this.pokemonContainers.forEach((container, i) => {
+      const i_data = i + onScreenFirstIndex;
+
+      if (i_data >= this.filteredPokemonData.length) {
         container.setVisible(false);
-        return;
       } else {
         container.setVisible(true);
 
-        if (this.showDecorations) {
+        const data = this.filteredPokemonData[i_data];
+        const props = data.props;
 
-          if (this.pokerusSpecies.includes(container.species)) {
-            this.pokerusCursorObjs[pokerusCursorIndex].setPosition(pos.x - 1, pos.y + 1);
+        container.setSpecies(data.species, props);
+
+        const starterSprite = container.icon as Phaser.GameObjects.Sprite;
+        starterSprite.setTexture(
+          data.species.getIconAtlasKey(props.formIndex, props.shiny, props.variant),
+          container.species.getIconId(props.female!, props.formIndex, props.shiny, props.variant),
+        );
+        container.checkIconId(props.female, props.formIndex, props.shiny, props.variant);
+
+        const speciesId = data.species.speciesId;
+        const dexEntry = globalScene.gameData.dexData[speciesId];
+        const caughtAttr =
+          dexEntry.caughtAttr &
+          globalScene.gameData.dexData[this.getStarterSpeciesId(speciesId)].caughtAttr &
+          data.species.getFullUnlocksData();
+
+        if (caughtAttr & data.species.getFullUnlocksData() || globalScene.dexForDevs) {
+          container.icon.clearTint();
+        } else if (this.isSeen(data.species, dexEntry)) {
+          container.icon.setTint(0x808080);
+        } else {
+          container.icon.setTint(0);
+        }
+
+        const pairs: [boolean | undefined, Phaser.GameObjects.Image][] = [
+          [data.eggMove1, container.eggMove1Icon],
+          [data.eggMove2, container.eggMove2Icon],
+          [data.tmMove1, container.tmMove1Icon],
+          [data.tmMove2, container.tmMove2Icon],
+          [data.passive1, container.passive1Icon],
+          [data.passive2, container.passive2Icon],
+        ];
+
+        pairs.forEach(([unlocked, icon]) => {
+          if (unlocked) {
+            icon.setVisible(true);
+            icon.clearTint();
+          } else if (unlocked === false) {
+            icon.setVisible(true);
+            icon.setTint(0x808080);
+          } else {
+            icon.setVisible(false);
+          }
+        });
+
+        if (this.showDecorations) {
+          if (this.pokerusSpecies.includes(data.species)) {
+            this.pokerusCursorObjs[pokerusCursorIndex].setPosition(container.x - 1, container.y + 1);
             this.pokerusCursorObjs[pokerusCursorIndex].setVisible(true);
             pokerusCursorIndex++;
           }
 
-          const speciesId = container.species.speciesId;
           this.updateStarterValueLabel(container);
 
           container.label.setVisible(true);
-          const speciesVariants = speciesId && globalScene.gameData.dexData[speciesId].caughtAttr & DexAttr.SHINY
-            ? [ DexAttr.DEFAULT_VARIANT, DexAttr.VARIANT_2, DexAttr.VARIANT_3 ].filter(v => !!(globalScene.gameData.dexData[speciesId].caughtAttr & v))
-            : [];
+          const speciesVariants =
+            speciesId && caughtAttr & DexAttr.SHINY
+              ? [DexAttr.DEFAULT_VARIANT, DexAttr.VARIANT_2, DexAttr.VARIANT_3].filter(v => !!(caughtAttr & v))
+              : [];
           for (let v = 0; v < 3; v++) {
             const hasVariant = speciesVariants.length > v;
             container.shinyIcons[v].setVisible(hasVariant);
             if (hasVariant) {
-              container.shinyIcons[v].setTint(getVariantTint(speciesVariants[v] === DexAttr.DEFAULT_VARIANT ? 0 : speciesVariants[v] === DexAttr.VARIANT_2 ? 1 : 2));
+              container.shinyIcons[v].setTint(
+                getVariantTint(
+                  speciesVariants[v] === DexAttr.DEFAULT_VARIANT ? 0 : speciesVariants[v] === DexAttr.VARIANT_2 ? 1 : 2,
+                ),
+              );
             }
           }
 
-          container.starterPassiveBgs.setVisible(!!globalScene.gameData.starterData[this.getStarterSpeciesId(speciesId)].passiveAttr);
-          container.hiddenAbilityIcon.setVisible(!!globalScene.gameData.dexData[speciesId].caughtAttr && !!(globalScene.gameData.starterData[this.getStarterSpeciesId(speciesId)].abilityAttr & 4));
-          container.classicWinIcon.setVisible(globalScene.gameData.starterData[this.getStarterSpeciesId(speciesId)].classicWinCount > 0);
+          container.starterPassiveBgs.setVisible(
+            !!globalScene.gameData.starterData[this.getStarterSpeciesId(speciesId)].passiveAttr,
+          );
+          container.hiddenAbilityIcon.setVisible(
+            !!caughtAttr && !!(globalScene.gameData.starterData[this.getStarterSpeciesId(speciesId)].abilityAttr & 4),
+          );
+          container.classicWinIcon.setVisible(
+            globalScene.gameData.starterData[this.getStarterSpeciesId(speciesId)].classicWinCount > 0,
+          );
           container.favoriteIcon.setVisible(this.starterPreferences[speciesId]?.favorite ?? false);
 
           // 'Candy Icon' mode
           if (globalScene.candyUpgradeDisplay === 0) {
-
             if (!starterColors[this.getStarterSpeciesId(speciesId)]) {
               // Default to white if no colors are found
-              starterColors[this.getStarterSpeciesId(speciesId)] = [ "ffffff", "ffffff" ];
+              starterColors[this.getStarterSpeciesId(speciesId)] = ["ffffff", "ffffff"];
             }
 
             // Set the candy colors
-            container.candyUpgradeIcon.setTint(argbFromRgba(rgbHexToRgba(starterColors[this.getStarterSpeciesId(speciesId)][0])));
-            container.candyUpgradeOverlayIcon.setTint(argbFromRgba(rgbHexToRgba(starterColors[this.getStarterSpeciesId(speciesId)][1])));
-
+            container.candyUpgradeIcon.setTint(
+              argbFromRgba(rgbHexToRgba(starterColors[this.getStarterSpeciesId(speciesId)][0])),
+            );
+            container.candyUpgradeOverlayIcon.setTint(
+              argbFromRgba(rgbHexToRgba(starterColors[this.getStarterSpeciesId(speciesId)][1])),
+            );
           } else if (globalScene.candyUpgradeDisplay === 1) {
             container.candyUpgradeIcon.setVisible(false);
             container.candyUpgradeOverlayIcon.setVisible(false);
@@ -1500,6 +1842,7 @@ export default class PokedexUiHandler extends MessageUiHandler {
 
   setCursor(cursor: number): boolean {
     let changed = false;
+    this.oldCursor = this.cursor;
 
     if (this.filterMode) {
       changed = this.filterBarCursor !== cursor;
@@ -1510,16 +1853,17 @@ export default class PokedexUiHandler extends MessageUiHandler {
       this.filterTextCursor = cursor;
       this.filterText.setCursor(cursor);
     } else {
-      cursor = Math.max(Math.min(this.filteredPokemonContainers.length - 1, cursor), 0);
+      cursor = Math.max(Math.min(this.pokemonContainers.length - 1, cursor), 0);
       changed = super.setCursor(cursor);
 
-      const pos = calcStarterPosition(cursor, this.scrollCursor);
+      const pos = calcStarterPosition(cursor);
       this.cursorObj.setPosition(pos.x - 1, pos.y + 1);
 
-      const species = this.filteredPokemonContainers[cursor]?.species;
+      const species = this.pokemonContainers[cursor]?.species;
 
       if (species) {
         this.setSpecies(species);
+        return true;
       }
     }
 
@@ -1530,6 +1874,8 @@ export default class PokedexUiHandler extends MessageUiHandler {
     this.cursorObj.setVisible(!filterMode);
     this.filterBar.cursorObj.setVisible(filterMode);
     this.pokemonSprite.setVisible(false);
+    this.showFormTrayIconElement.setVisible(false);
+    this.showFormTrayLabel.setVisible(false);
 
     if (filterMode !== this.filterMode) {
       this.filterMode = filterMode;
@@ -1546,6 +1892,8 @@ export default class PokedexUiHandler extends MessageUiHandler {
     this.cursorObj.setVisible(!filterTextMode);
     this.filterText.cursorObj.setVisible(filterTextMode);
     this.pokemonSprite.setVisible(false);
+    this.showFormTrayIconElement.setVisible(false);
+    this.showFormTrayLabel.setVisible(false);
 
     if (filterTextMode !== this.filterTextMode) {
       this.filterTextMode = filterTextMode;
@@ -1558,6 +1906,103 @@ export default class PokedexUiHandler extends MessageUiHandler {
     return false;
   }
 
+  openFormTray(species: PokemonSpecies): boolean {
+    this.trayForms = species.forms.filter(f => !f.isUnobtainable);
+
+    this.trayNumIcons = this.trayForms.length;
+    this.trayRows = Math.floor(this.trayNumIcons / 9) + (this.trayNumIcons % 9 === 0 ? 0 : 1);
+    this.trayColumns = Math.min(this.trayNumIcons, 9);
+
+    const maxColumns = 9;
+    const boxCursor = this.cursor;
+    const boxCursorY = Math.floor(boxCursor / maxColumns);
+    const boxCursorX = boxCursor - boxCursorY * 9;
+    const spaceBelow = 9 - 1 - boxCursorY;
+    const spaceRight = 9 - boxCursorX;
+    const boxPos = calcStarterPosition(this.cursor);
+    const goUp = this.trayRows <= spaceBelow - 1 ? 0 : 1;
+    const goLeft = this.trayColumns <= spaceRight ? 0 : 1;
+
+    this.trayBg.setSize(13 + this.trayColumns * 17, 8 + this.trayRows * 18);
+    this.formTrayContainer.setX((goLeft ? boxPos.x - 18 * (this.trayColumns - spaceRight) : boxPos.x) - 3);
+    this.formTrayContainer.setY(goUp ? boxPos.y - this.trayBg.height : boxPos.y + 17);
+
+    const dexEntry = globalScene.gameData.dexData[species.speciesId];
+    const dexAttr = this.getCurrentDexProps(species.speciesId);
+    const props = this.getSanitizedProps(globalScene.gameData.getSpeciesDexAttrProps(this.lastSpecies, dexAttr));
+
+    this.trayContainers = [];
+    const isFormSeen = this.isSeen(species, dexEntry);
+    this.trayForms.map((f, index) => {
+      const isFormCaught = dexEntry
+        ? (dexEntry.caughtAttr & species.getFullUnlocksData() & globalScene.gameData.getFormAttr(f.formIndex ?? 0)) > 0n
+        : false;
+      const formContainer = new PokedexMonContainer(species, {
+        formIndex: f.formIndex,
+        female: props.female,
+        shiny: props.shiny,
+        variant: props.variant,
+      });
+      this.iconAnimHandler.addOrUpdate(formContainer.icon, PokemonIconAnimMode.NONE);
+      // Setting tint, for all saves some caught forms may only show up as seen
+      if (isFormCaught || globalScene.dexForDevs) {
+        formContainer.icon.clearTint();
+      } else if (isFormSeen) {
+        formContainer.icon.setTint(0x808080);
+      } else {
+        formContainer.icon.setTint(0);
+      }
+      formContainer.setPosition(5 + (index % 9) * 18, 4 + Math.floor(index / 9) * 17);
+      this.formTrayContainer.add(formContainer);
+      this.trayContainers.push(formContainer);
+    });
+
+    this.showingTray = true;
+
+    this.setTrayCursor(0);
+
+    this.formTrayContainer.setVisible(true);
+
+    this.showFormTrayIconElement.setVisible(false);
+    this.showFormTrayLabel.setVisible(false);
+
+    return true;
+  }
+
+  closeFormTray(): boolean {
+    this.trayContainers.forEach(obj => {
+      this.formTrayContainer.remove(obj, true); // Removes from container and destroys it
+    });
+
+    this.trayContainers = [];
+    this.formTrayContainer.setVisible(false);
+    this.showingTray = false;
+
+    this.setSpeciesDetails(this.lastSpecies);
+    return true;
+  }
+
+  setTrayCursor(cursor: number): boolean {
+    if (!this.showingTray) {
+      return false;
+    }
+
+    cursor = Phaser.Math.Clamp(this.trayContainers.length - 1, cursor, 0);
+    const changed = this.trayCursor !== cursor;
+    if (changed) {
+      this.trayCursor = cursor;
+    }
+
+    this.trayCursorObj.setPosition(5 + (cursor % 9) * 18, 4 + Math.floor(cursor / 9) * 17);
+
+    const species = this.lastSpecies;
+    const formIndex = this.trayForms[cursor].formIndex;
+
+    this.setSpeciesDetails(species, { formIndex: formIndex });
+
+    return changed;
+  }
+
   getFriendship(speciesId: number) {
     let currentFriendship = globalScene.gameData.starterData[this.getStarterSpeciesId(speciesId)].friendship;
     if (!currentFriendship || currentFriendship === undefined) {
@@ -1569,8 +2014,33 @@ export default class PokedexUiHandler extends MessageUiHandler {
     return { currentFriendship, friendshipCap };
   }
 
-  setSpecies(species: PokemonSpecies | null) {
+  startIconAnimation(cursor: number) {
+    const container = this.pokemonContainers[cursor];
+    const icon = container.icon;
+    if (this.isUpgradeAnimationEnabled()) {
+      globalScene.tweens.getTweensOf(icon).forEach(tween => tween.pause());
+      // Reset the position of the icon
+      icon.x = -2;
+      icon.y = 2;
+    }
+    // Initiates the small up and down idle animation
+    this.iconAnimHandler.addOrUpdate(icon, PokemonIconAnimMode.PASSIVE);
+  }
 
+  stopIconAnimation(cursor: number) {
+    const container = this.pokemonContainers[cursor];
+    if (container) {
+      const lastSpeciesIcon = container.icon;
+      const dexAttr = this.getCurrentDexProps(container.species.speciesId);
+      const props = this.getSanitizedProps(globalScene.gameData.getSpeciesDexAttrProps(container.species, dexAttr));
+      this.checkIconId(lastSpeciesIcon, container.species, props.female, props.formIndex, props.shiny, props.variant);
+      this.iconAnimHandler.addOrUpdate(lastSpeciesIcon, PokemonIconAnimMode.NONE);
+      // Resume the animation for the previously selected species
+      globalScene.tweens.getTweensOf(lastSpeciesIcon).forEach(tween => tween.play());
+    }
+  }
+
+  setSpecies(species: PokemonSpecies | null) {
     this.speciesStarterDexEntry = species ? globalScene.gameData.dexData[species.speciesId] : null;
 
     if (!species && globalScene.ui.getTooltip().visible) {
@@ -1578,41 +2048,23 @@ export default class PokedexUiHandler extends MessageUiHandler {
     }
 
     if (this.lastSpecies) {
-      const dexAttr = this.getCurrentDexProps(this.lastSpecies.speciesId);
-      const props = this.getSanitizedProps(globalScene.gameData.getSpeciesDexAttrProps(this.lastSpecies, dexAttr));
-      const speciesIndex = this.allSpecies.indexOf(this.lastSpecies);
-      const lastSpeciesIcon = this.pokemonContainers[speciesIndex].icon;
-      this.checkIconId(lastSpeciesIcon, this.lastSpecies, props.female, props.formIndex, props.shiny, props.variant);
-      this.iconAnimHandler.addOrUpdate(lastSpeciesIcon, PokemonIconAnimMode.NONE);
-
-      // Resume the animation for the previously selected species
-      const icon = this.pokemonContainers[speciesIndex].icon;
-      globalScene.tweens.getTweensOf(icon).forEach(tween => tween.resume());
+      this.stopIconAnimation(this.oldCursor);
     }
 
-    this.lastSpecies = species!; // TODO: is this bang correct?
-
-    if (species && (this.speciesStarterDexEntry?.seenAttr || this.speciesStarterDexEntry?.caughtAttr)) {
+    if (species) {
+      this.lastSpecies = species;
+    }
 
+    if (
+      species &&
+      (this.speciesStarterDexEntry?.seenAttr || this.speciesStarterDexEntry?.caughtAttr || globalScene.dexForDevs)
+    ) {
       this.pokemonNumberText.setText(i18next.t("pokedexUiHandler:pokemonNumber") + padInt(species.speciesId, 4));
 
       this.pokemonNameText.setText(species.name);
 
-      if (this.speciesStarterDexEntry?.caughtAttr) {
-
-        // Pause the animation when the species is selected
-        const speciesIndex = this.allSpecies.indexOf(species);
-        const icon = this.pokemonContainers[speciesIndex].icon;
-
-        if (this.isUpgradeAnimationEnabled()) {
-          globalScene.tweens.getTweensOf(icon).forEach(tween => tween.pause());
-          // Reset the position of the icon
-          icon.x = -2;
-          icon.y = 2;
-        }
-
-        // Initiates the small up and down idle animation
-        this.iconAnimHandler.addOrUpdate(icon, PokemonIconAnimMode.PASSIVE);
+      if (this.speciesStarterDexEntry?.caughtAttr || globalScene.dexForDevs) {
+        this.startIconAnimation(this.cursor);
 
         const speciesForm = getPokemonSpeciesForm(species.speciesId, 0);
         this.setTypeIcons(speciesForm.type1, speciesForm.type2);
@@ -1627,14 +2079,15 @@ export default class PokedexUiHandler extends MessageUiHandler {
         this.type1Icon.setVisible(true);
         this.type2Icon.setVisible(true);
 
-        this.setSpeciesDetails(species, {
-          forSeen: true
-        });
+        this.setSpeciesDetails(species);
         this.pokemonSprite.setTint(0x808080);
       }
     } else {
-      this.pokemonNumberText.setText(species ? i18next.t("pokedexUiHandler:pokemonNumber") + padInt(species.speciesId, 4) : "");
+      this.pokemonNumberText.setText(
+        species ? i18next.t("pokedexUiHandler:pokemonNumber") + padInt(species.speciesId, 4) : "",
+      );
       this.pokemonNameText.setText(species ? "???" : "");
+      this.pokemonFormText.setText("");
       this.type1Icon.setVisible(false);
       this.type2Icon.setVisible(false);
       if (species) {
@@ -1646,7 +2099,6 @@ export default class PokedexUiHandler extends MessageUiHandler {
 
   setSpeciesDetails(species: PokemonSpecies, options: SpeciesDetails = {}): void {
     let { shiny, formIndex, female, variant } = options;
-    const forSeen: boolean = options.forSeen ?? false;
 
     // We will only update the sprite if there is a change to form, shiny/variant
     // or gender for species with gender sprite differences
@@ -1667,35 +2119,41 @@ export default class PokedexUiHandler extends MessageUiHandler {
       this.assetLoadCancelled = null;
     }
 
-    this.starterMoveset = null;
-    this.speciesStarterMoves = [];
-
     if (species) {
       const dexEntry = globalScene.gameData.dexData[species.speciesId];
+      const caughtAttr =
+        dexEntry.caughtAttr &
+        globalScene.gameData.dexData[this.getStarterSpeciesId(species.speciesId)].caughtAttr &
+        species.getFullUnlocksData();
 
-      if (!dexEntry.caughtAttr) {
-        const props = this.getSanitizedProps(globalScene.gameData.getSpeciesDexAttrProps(species, this.getCurrentDexProps(species.speciesId)));
+      if (caughtAttr) {
+        const props = this.getSanitizedProps(
+          globalScene.gameData.getSpeciesDexAttrProps(species, this.getCurrentDexProps(species.speciesId)),
+        );
 
-        if (shiny === undefined || shiny !== props.shiny) {
+        if (shiny === undefined) {
           shiny = props.shiny;
         }
-        if (formIndex === undefined || formIndex !== props.formIndex) {
+        if (formIndex === undefined) {
           formIndex = props.formIndex;
         }
-        if (female === undefined || female !== props.female) {
+        if (female === undefined) {
           female = props.female;
         }
-        if (variant === undefined || variant !== props.variant) {
+        if (variant === undefined) {
           variant = props.variant;
         }
       }
 
+      const isFormCaught = dexEntry ? (caughtAttr & globalScene.gameData.getFormAttr(formIndex ?? 0)) > 0n : false;
+      const isFormSeen = this.isSeen(species, dexEntry);
+
       const assetLoadCancelled = new BooleanHolder(false);
       this.assetLoadCancelled = assetLoadCancelled;
 
       if (shouldUpdateSprite) {
-
-        species.loadAssets(female!, formIndex, shiny, variant, true).then(() => { // TODO: is this bang correct?
+        species.loadAssets(female!, formIndex, shiny, variant, true).then(() => {
+          // TODO: is this bang correct?
           if (assetLoadCancelled.value) {
             return;
           }
@@ -1711,33 +2169,58 @@ export default class PokedexUiHandler extends MessageUiHandler {
         this.pokemonSprite.setVisible(!(this.filterMode || this.filterTextMode));
       }
 
-      if (dexEntry.caughtAttr || forSeen) {
+      if (isFormCaught || globalScene.dexForDevs) {
+        this.pokemonSprite.clearTint();
+      } else if (isFormSeen) {
+        this.pokemonSprite.setTint(0x808080);
+      } else {
+        this.pokemonSprite.setTint(0);
+      }
 
-        const speciesForm = getPokemonSpeciesForm(species.speciesId, 0); // TODO: always selecting the first form
+      if (isFormCaught || isFormSeen || globalScene.dexForDevs) {
+        // TODO: change this once forms are refactored
+        if (normalForm.includes(species.speciesId) && !formIndex) {
+          this.pokemonFormText.setText("");
+        } else {
+          this.pokemonFormText.setText(species.getFormNameToDisplay(formIndex, false));
+        }
+      } else {
+        this.pokemonFormText.setText("");
+      }
 
+      if (isFormCaught || isFormSeen || globalScene.dexForDevs) {
+        const speciesForm = getPokemonSpeciesForm(species.speciesId, formIndex ?? 0); // TODO: always selecting the first form
         this.setTypeIcons(speciesForm.type1, speciesForm.type2);
       } else {
         this.setTypeIcons(null, null);
       }
+
+      if (species?.forms?.filter(f => !f.isUnobtainable).length > 1) {
+        if (!this.showingTray) {
+          this.showFormTrayIconElement.setVisible(true);
+          this.showFormTrayLabel.setVisible(true);
+        }
+        this.canShowFormTray = true;
+      } else {
+        this.showFormTrayIconElement.setVisible(false);
+        this.showFormTrayLabel.setVisible(false);
+        this.canShowFormTray = false;
+      }
     } else {
       this.setTypeIcons(null, null);
     }
-
-    if (!this.starterMoveset) {
-      this.starterMoveset = this.speciesStarterMoves.slice(0, 4) as StarterMoveset;
-    }
   }
 
-  setTypeIcons(type1: Type | null, type2: Type | null): void {
+  setTypeIcons(type1: PokemonType | null, type2: PokemonType | null): void {
     if (type1 !== null) {
       this.type1Icon.setVisible(true);
-      this.type1Icon.setFrame(Type[type1].toLowerCase());
+      this.type1Icon.setFrame(PokemonType[type1].toLowerCase());
     } else {
       this.type1Icon.setVisible(false);
     }
     if (type2 !== null) {
       this.type2Icon.setVisible(true);
-      this.type2Icon.setFrame(Type[type2].toLowerCase());
+      this.type2Icon.setFrame(PokemonType[type2].toLowerCase());
     } else {
       this.type2Icon.setVisible(false);
     }
@@ -1777,24 +2260,29 @@ export default class PokedexUiHandler extends MessageUiHandler {
     const ui = this.getUi();
 
     const cancel = () => {
-      ui.setMode(Mode.POKEDEX, "refresh");
+      ui.setMode(UiMode.POKEDEX, "refresh");
       this.clearText();
       this.blockInput = false;
     };
     ui.showText(i18next.t("pokedexUiHandler:confirmExit"), null, () => {
-      ui.setModeWithoutClear(Mode.CONFIRM, () => {
-        ui.setMode(Mode.POKEDEX, "refresh");
-        globalScene.clearPhaseQueue();
-        this.clearText();
-        this.clear();
-        ui.revertMode();
-      }, cancel, null, null, 19);
+      ui.setModeWithoutClear(
+        UiMode.CONFIRM,
+        () => {
+          ui.setMode(UiMode.POKEDEX, "refresh");
+          this.clearText();
+          this.clear();
+          ui.revertMode();
+        },
+        cancel,
+        null,
+        null,
+        19,
+      );
     });
 
     return true;
   }
 
-
   /**
    * Creates a temporary dex attr props that will be used to
    * display the correct shiny, variant, and form based on the StarterPreferences
@@ -1804,13 +2292,20 @@ export default class PokedexUiHandler extends MessageUiHandler {
    */
   getCurrentDexProps(speciesId: number): bigint {
     let props = 0n;
-    const caughtAttr = globalScene.gameData.dexData[speciesId].caughtAttr;
+    const species = allSpecies.find(sp => sp.speciesId === speciesId);
+    const caughtAttr =
+      globalScene.gameData.dexData[speciesId].caughtAttr &
+      globalScene.gameData.dexData[this.getStarterSpeciesId(speciesId)].caughtAttr &
+      (species?.getFullUnlocksData() ?? 0n);
 
     /*  this checks the gender of the pokemon; this works by checking a) that the starter preferences for the species exist, and if so, is it female. If so, it'll add DexAttr.FEMALE to our temp props
      *  It then checks b) if the caughtAttr for the pokemon is female and NOT male - this means that the ONLY gender we've gotten is female, and we need to add DexAttr.FEMALE to our temp props
      *  If neither of these pass, we add DexAttr.MALE to our temp props
      */
-    if (this.starterPreferences[speciesId]?.female || ((caughtAttr & DexAttr.FEMALE) > 0n && (caughtAttr & DexAttr.MALE) === 0n)) {
+    if (
+      this.starterPreferences[speciesId]?.female ||
+      ((caughtAttr & DexAttr.FEMALE) > 0n && (caughtAttr & DexAttr.MALE) === 0n)
+    ) {
       props += DexAttr.FEMALE;
     } else {
       props += DexAttr.MALE;
@@ -1818,7 +2313,10 @@ export default class PokedexUiHandler extends MessageUiHandler {
     /* This part is very similar to above, but instead of for gender, it checks for shiny within starter preferences.
      * If they're not there, it enables shiny state by default if any shiny was caught
      */
-    if (this.starterPreferences[speciesId]?.shiny || ((caughtAttr & DexAttr.SHINY) > 0n && this.starterPreferences[speciesId]?.shiny !== false)) {
+    if (
+      this.starterPreferences[speciesId]?.shiny ||
+      ((caughtAttr & DexAttr.SHINY) > 0n && this.starterPreferences[speciesId]?.shiny !== false)
+    ) {
       props += DexAttr.SHINY;
       if (this.starterPreferences[speciesId]?.variant !== undefined) {
         props += BigInt(Math.pow(2, this.starterPreferences[speciesId]?.variant)) * DexAttr.DEFAULT_VARIANT;
@@ -1838,7 +2336,8 @@ export default class PokedexUiHandler extends MessageUiHandler {
       props += DexAttr.NON_SHINY;
       props += DexAttr.DEFAULT_VARIANT; // we add the default variant here because non shiny versions are listed as default variant
     }
-    if (this.starterPreferences[speciesId]?.form) { // this checks for the form of the pokemon
+    if (this.starterPreferences[speciesId]?.form) {
+      // this checks for the form of the pokemon
       props += BigInt(Math.pow(2, this.starterPreferences[speciesId]?.form)) * DexAttr.DEFAULT_FORM;
     } else {
       // Get the first unlocked form
@@ -1850,6 +2349,7 @@ export default class PokedexUiHandler extends MessageUiHandler {
 
   override destroy(): void {
     this.pokemonContainers = [];
+    this.filteredPokemonData = [];
   }
 
   clearText() {
@@ -1861,15 +2361,25 @@ export default class PokedexUiHandler extends MessageUiHandler {
     super.clear();
 
     this.cursor = -1;
+    this.oldCursor = -1;
     globalScene.ui.hideTooltip();
 
     this.starterSelectContainer.setVisible(false);
     this.blockInput = false;
   }
 
-  checkIconId(icon: Phaser.GameObjects.Sprite, species: PokemonSpecies, female: boolean, formIndex: number, shiny: boolean, variant: number) {
+  checkIconId(
+    icon: Phaser.GameObjects.Sprite,
+    species: PokemonSpecies,
+    female: boolean,
+    formIndex: number,
+    shiny: boolean,
+    variant: number,
+  ) {
     if (icon.frame.name !== species.getIconId(female, formIndex, shiny, variant)) {
-      console.log(`${species.name}'s icon ${icon.frame.name} does not match getIconId with female: ${female}, formIndex: ${formIndex}, shiny: ${shiny}, variant: ${variant}`);
+      console.log(
+        `${species.name}'s icon ${icon.frame.name} does not match getIconId with female: ${female}, formIndex: ${formIndex}, shiny: ${shiny}, variant: ${variant}`,
+      );
       icon.setTexture(species.getIconAtlasKey(formIndex, false, variant));
       icon.setFrame(species.getIconId(female, formIndex, false, variant));
     }
diff --git a/src/ui/pokemon-hatch-info-container.ts b/src/ui/pokemon-hatch-info-container.ts
index a9b8e260b34..f3095cb48bf 100644
--- a/src/ui/pokemon-hatch-info-container.ts
+++ b/src/ui/pokemon-hatch-info-container.ts
@@ -1,13 +1,13 @@
 import PokemonInfoContainer from "#app/ui/pokemon-info-container";
 import { Gender } from "#app/data/gender";
-import { Type } from "#enums/type";
-import * as Utils from "#app/utils";
+import { PokemonType } from "#enums/pokemon-type";
+import { rgbHexToRgba, padInt } from "#app/utils/common";
 import { TextStyle, addTextObject } from "#app/ui/text";
 import { speciesEggMoves } from "#app/data/balance/egg-moves";
-import { allMoves } from "#app/data/move";
+import { allMoves } from "#app/data/moves/move";
 import { Species } from "#enums/species";
 import { getEggTierForSpecies } from "#app/data/egg";
-import { starterColors } from "#app/battle-scene";
+import { starterColors } from "#app/global-vars/starter-colors";
 import { globalScene } from "#app/global-scene";
 import { argbFromRgba } from "@material/material-color-utilities";
 import type { EggHatchData } from "#app/data/egg-hatch-data";
@@ -26,16 +26,15 @@ export default class PokemonHatchInfoContainer extends PokemonInfoContainer {
   private pokemonEggMoveContainers: Phaser.GameObjects.Container[];
   private pokemonEggMoveBgs: Phaser.GameObjects.NineSlice[];
   private pokemonEggMoveLabels: Phaser.GameObjects.Text[];
-  private pokemonHatchedIcon : Phaser.GameObjects.Sprite;
+  private pokemonHatchedIcon: Phaser.GameObjects.Sprite;
   private pokemonListContainer: Phaser.GameObjects.Container;
   private pokemonCandyIcon: Phaser.GameObjects.Sprite;
   private pokemonCandyOverlayIcon: Phaser.GameObjects.Sprite;
   private pokemonCandyCountText: Phaser.GameObjects.Text;
 
-  constructor(listContainer : Phaser.GameObjects.Container, x: number = 115, y: number = 9,) {
+  constructor(listContainer: Phaser.GameObjects.Container, x = 115, y = 9) {
     super(x, y);
     this.pokemonListContainer = listContainer;
-
   }
   setup(): void {
     super.setup();
@@ -43,7 +42,10 @@ export default class PokemonHatchInfoContainer extends PokemonInfoContainer {
 
     this.currentPokemonSprite = globalScene.add.sprite(54, 80, "pkmn__sub");
     this.currentPokemonSprite.setScale(0.8);
-    this.currentPokemonSprite.setPipeline(globalScene.spritePipeline, { tone: [ 0.0, 0.0, 0.0, 0.0 ], ignoreTimeTint: true });
+    this.currentPokemonSprite.setPipeline(globalScene.spritePipeline, {
+      tone: [0.0, 0.0, 0.0, 0.0],
+      ignoreTimeTint: true,
+    });
     this.pokemonListContainer.add(this.currentPokemonSprite);
 
     // setup name and number
@@ -51,7 +53,9 @@ export default class PokemonHatchInfoContainer extends PokemonInfoContainer {
     this.pokemonNumberText.setOrigin(0, 0);
     this.pokemonListContainer.add(this.pokemonNumberText);
 
-    this.pokemonNameText = addTextObject(7, 107.5, "", TextStyle.SUMMARY, { fontSize: 74 });
+    this.pokemonNameText = addTextObject(7, 107.5, "", TextStyle.SUMMARY, {
+      fontSize: 74,
+    });
     this.pokemonNameText.setOrigin(0, 0);
     this.pokemonListContainer.add(this.pokemonNameText);
 
@@ -105,7 +109,6 @@ export default class PokemonHatchInfoContainer extends PokemonInfoContainer {
     }
 
     super.add(this.pokemonEggMoveContainers);
-
   }
 
   /**
@@ -127,7 +130,6 @@ export default class PokemonHatchInfoContainer extends PokemonInfoContainer {
     const variant = pokemon.variant;
     this.currentPokemonSprite.setVisible(false);
     species.loadAssets(female, formIndex, shiny, variant, true).then(() => {
-
       getPokemonSpeciesForm(species.speciesId, pokemon.formIndex).cry();
       this.currentPokemonSprite.play(species.getSpriteKey(female, formIndex, shiny, variant));
       this.currentPokemonSprite.setPipelineData("shiny", shiny);
@@ -152,14 +154,14 @@ export default class PokemonHatchInfoContainer extends PokemonInfoContainer {
     super.show(pokemon, false, 1, hatchInfo.getDex(), hatchInfo.getStarterEntry(), true);
     const colorScheme = starterColors[species.speciesId];
 
-    this.pokemonCandyIcon.setTint(argbFromRgba(Utils.rgbHexToRgba(colorScheme[0])));
+    this.pokemonCandyIcon.setTint(argbFromRgba(rgbHexToRgba(colorScheme[0])));
     this.pokemonCandyIcon.setVisible(true);
-    this.pokemonCandyOverlayIcon.setTint(argbFromRgba(Utils.rgbHexToRgba(colorScheme[1])));
+    this.pokemonCandyOverlayIcon.setTint(argbFromRgba(rgbHexToRgba(colorScheme[1])));
     this.pokemonCandyOverlayIcon.setVisible(true);
     this.pokemonCandyCountText.setText(`x${globalScene.gameData.starterData[species.speciesId].candyCount}`);
     this.pokemonCandyCountText.setVisible(true);
 
-    this.pokemonNumberText.setText(Utils.padInt(species.speciesId, 4));
+    this.pokemonNumberText.setText(padInt(species.speciesId, 4));
     this.pokemonNameText.setText(species.name);
 
     const hasEggMoves = species && speciesEggMoves.hasOwnProperty(species.speciesId);
@@ -167,7 +169,9 @@ export default class PokemonHatchInfoContainer extends PokemonInfoContainer {
     for (let em = 0; em < 4; em++) {
       const eggMove = hasEggMoves ? allMoves[speciesEggMoves[species.speciesId][em]] : null;
       const eggMoveUnlocked = eggMove && globalScene.gameData.starterData[species.speciesId].eggMoves & Math.pow(2, em);
-      this.pokemonEggMoveBgs[em].setFrame(Type[eggMove ? eggMove.type : Type.UNKNOWN].toString().toLowerCase());
+      this.pokemonEggMoveBgs[em].setFrame(
+        PokemonType[eggMove ? eggMove.type : PokemonType.UNKNOWN].toString().toLowerCase(),
+      );
 
       this.pokemonEggMoveLabels[em].setText(eggMove && eggMoveUnlocked ? eggMove.name : "???");
       if (!(eggMove && hatchInfo.starterDataEntryBeforeUpdate.eggMoves & Math.pow(2, em)) && eggMoveUnlocked) {
@@ -183,7 +187,5 @@ export default class PokemonHatchInfoContainer extends PokemonInfoContainer {
     } else {
       this.pokemonHatchedIcon.setFrame(getEggTierForSpecies(species));
     }
-
   }
-
 }
diff --git a/src/ui/pokemon-icon-anim-handler.ts b/src/ui/pokemon-icon-anim-handler.ts
index 010d23315f2..253ccbe3623 100644
--- a/src/ui/pokemon-icon-anim-handler.ts
+++ b/src/ui/pokemon-icon-anim-handler.ts
@@ -1,10 +1,10 @@
 import { globalScene } from "#app/global-scene";
-import * as Utils from "../utils";
+import { fixedInt } from "#app/utils/common";
 
 export enum PokemonIconAnimMode {
   NONE,
   PASSIVE,
-  ACTIVE
+  ACTIVE,
 }
 
 type PokemonIcon = Phaser.GameObjects.Container | Phaser.GameObjects.Sprite;
@@ -27,13 +27,13 @@ export default class PokemonIconAnimHandler {
       }
     };
     globalScene.tweens.addCounter({
-      duration: Utils.fixedInt(200),
+      duration: fixedInt(200),
       from: 0,
       to: 1,
       yoyo: true,
       repeat: -1,
       onRepeat: onAlternate,
-      onYoyo: onAlternate
+      onYoyo: onAlternate,
     });
   }
 
@@ -50,16 +50,14 @@ export default class PokemonIconAnimHandler {
 
   addOrUpdate(icons: PokemonIcon | PokemonIcon[], mode: PokemonIconAnimMode): void {
     if (!Array.isArray(icons)) {
-      icons = [ icons ];
+      icons = [icons];
     }
     for (const i of icons) {
       if (this.icons.has(i) && this.icons.get(i) === mode) {
         continue;
       }
       if (this.toggled) {
-        const lastYDelta = this.icons.has(i)
-          ? this.icons.get(i)!
-          : 0;
+        const lastYDelta = this.icons.has(i) ? this.icons.get(i)! : 0;
         const yDelta = this.getModeYDelta(mode);
         i.y += yDelta + lastYDelta;
       }
@@ -69,7 +67,7 @@ export default class PokemonIconAnimHandler {
 
   remove(icons: PokemonIcon | PokemonIcon[]): void {
     if (!Array.isArray(icons)) {
-      icons = [ icons ];
+      icons = [icons];
     }
     for (const i of icons) {
       if (this.toggled) {
diff --git a/src/ui/pokemon-info-container.ts b/src/ui/pokemon-info-container.ts
index 554cea39731..18b5d2384ef 100644
--- a/src/ui/pokemon-info-container.ts
+++ b/src/ui/pokemon-info-container.ts
@@ -1,19 +1,18 @@
-import { getVariantTint } from "#app/data/variant";
+import { getVariantTint } from "#app/sprites/variant";
 import type BBCodeText from "phaser3-rex-plugins/plugins/bbcodetext";
 import { globalScene } from "#app/global-scene";
 import { Gender, getGenderColor, getGenderSymbol } from "../data/gender";
 import { getNatureName } from "../data/nature";
-import { Type } from "#enums/type";
+import { PokemonType } from "#enums/pokemon-type";
 import type Pokemon from "../field/pokemon";
 import i18next from "i18next";
 import type { DexEntry, StarterDataEntry } from "../system/game-data";
 import { DexAttr } from "../system/game-data";
-import * as Utils from "../utils";
+import { fixedInt } from "#app/utils/common";
 import ConfirmUiHandler from "./confirm-ui-handler";
 import { StatsContainer } from "./stats-container";
 import { TextStyle, addBBCodeTextObject, addTextObject, getTextColor } from "./text";
 import { addWindow } from "./ui-theme";
-import { Species } from "#enums/species";
 
 interface LanguageSetting {
   infoContainerTextSize: string;
@@ -22,7 +21,7 @@ interface LanguageSetting {
 }
 
 const languageSettings: { [key: string]: LanguageSetting } = {
-  "pt": {
+  pt: {
     infoContainerTextSize: "60px",
     infoContainerLabelXPos: -15,
     infoContainerTextXPos: -12,
@@ -58,7 +57,7 @@ export default class PokemonInfoContainer extends Phaser.GameObjects.Container {
 
   public shown: boolean;
 
-  constructor(x: number = 372, y: number = 66) {
+  constructor(x = 372, y = 66) {
     super(globalScene, x, y);
     this.initialX = x;
   }
@@ -86,7 +85,13 @@ export default class PokemonInfoContainer extends Phaser.GameObjects.Container {
     movesBg.setName("window-moves-bg");
     this.pokemonMovesContainer.add(movesBg);
 
-    const movesLabel = addTextObject(-movesBg.width / 2, 6, i18next.t("pokemonInfoContainer:moveset"), TextStyle.WINDOW, { fontSize: "64px" });
+    const movesLabel = addTextObject(
+      -movesBg.width / 2,
+      6,
+      i18next.t("pokemonInfoContainer:moveset"),
+      TextStyle.WINDOW,
+      { fontSize: "64px" },
+    );
     movesLabel.setOrigin(0.5, 0);
     movesLabel.setName("text-moves");
     this.pokemonMovesContainer.add(movesLabel);
@@ -128,44 +133,74 @@ export default class PokemonInfoContainer extends Phaser.GameObjects.Container {
     // The font size should be set by language
     const infoContainerTextSize = textSettings?.infoContainerTextSize || "64px";
 
-    this.pokemonFormLabelText = addTextObject(infoContainerLabelXPos, 19, i18next.t("pokemonInfoContainer:form"), TextStyle.WINDOW, { fontSize: infoContainerTextSize });
+    this.pokemonFormLabelText = addTextObject(
+      infoContainerLabelXPos,
+      19,
+      i18next.t("pokemonInfoContainer:form"),
+      TextStyle.WINDOW,
+      { fontSize: infoContainerTextSize },
+    );
     this.pokemonFormLabelText.setOrigin(1, 0);
     this.pokemonFormLabelText.setVisible(false);
     this.add(this.pokemonFormLabelText);
 
-    this.pokemonFormText = addTextObject(infoContainerTextXPos, 19, "", TextStyle.WINDOW, { fontSize: infoContainerTextSize });
+    this.pokemonFormText = addTextObject(infoContainerTextXPos, 19, "", TextStyle.WINDOW, {
+      fontSize: infoContainerTextSize,
+    });
     this.pokemonFormText.setOrigin(0, 0);
     this.pokemonFormText.setVisible(false);
     this.add(this.pokemonFormText);
 
-    this.pokemonGenderText = addTextObject(-42, -61, "", TextStyle.WINDOW, { fontSize: infoContainerTextSize });
+    this.pokemonGenderText = addTextObject(-42, -61, "", TextStyle.WINDOW, {
+      fontSize: infoContainerTextSize,
+    });
     this.pokemonGenderText.setOrigin(0, 0);
     this.pokemonGenderText.setVisible(false);
     this.pokemonGenderText.setName("text-pkmn-gender");
     this.add(this.pokemonGenderText);
 
-    this.pokemonGenderNewText = addTextObject(-36, -61, "", TextStyle.WINDOW, { fontSize: "64px" });
+    this.pokemonGenderNewText = addTextObject(-36, -61, "", TextStyle.WINDOW, {
+      fontSize: "64px",
+    });
     this.pokemonGenderNewText.setOrigin(0, 0);
     this.pokemonGenderNewText.setVisible(false);
     this.pokemonGenderNewText.setName("text-pkmn-new-gender");
     this.add(this.pokemonGenderNewText);
 
-    this.pokemonAbilityLabelText = addTextObject(infoContainerLabelXPos, 29, i18next.t("pokemonInfoContainer:ability"), TextStyle.WINDOW, { fontSize: infoContainerTextSize });
+    this.pokemonAbilityLabelText = addTextObject(
+      infoContainerLabelXPos,
+      29,
+      i18next.t("pokemonInfoContainer:ability"),
+      TextStyle.WINDOW,
+      { fontSize: infoContainerTextSize },
+    );
     this.pokemonAbilityLabelText.setOrigin(1, 0);
     this.pokemonAbilityLabelText.setName("text-pkmn-ability-label");
     this.add(this.pokemonAbilityLabelText);
 
-    this.pokemonAbilityText = addTextObject(infoContainerTextXPos, 29, "", TextStyle.WINDOW, { fontSize: infoContainerTextSize });
+    this.pokemonAbilityText = addTextObject(infoContainerTextXPos, 29, "", TextStyle.WINDOW, {
+      fontSize: infoContainerTextSize,
+    });
     this.pokemonAbilityText.setOrigin(0, 0);
     this.pokemonAbilityText.setName("text-pkmn-ability");
     this.add(this.pokemonAbilityText);
 
-    this.pokemonNatureLabelText = addTextObject(infoContainerLabelXPos, 39, i18next.t("pokemonInfoContainer:nature"), TextStyle.WINDOW, { fontSize: infoContainerTextSize });
+    this.pokemonNatureLabelText = addTextObject(
+      infoContainerLabelXPos,
+      39,
+      i18next.t("pokemonInfoContainer:nature"),
+      TextStyle.WINDOW,
+      { fontSize: infoContainerTextSize },
+    );
     this.pokemonNatureLabelText.setOrigin(1, 0);
     this.pokemonNatureLabelText.setName("text-pkmn-nature-label");
     this.add(this.pokemonNatureLabelText);
 
-    this.pokemonNatureText = addBBCodeTextObject(infoContainerTextXPos, 39, "", TextStyle.WINDOW, { fontSize: infoContainerTextSize, lineSpacing: 3, maxLines: 2 });
+    this.pokemonNatureText = addBBCodeTextObject(infoContainerTextXPos, 39, "", TextStyle.WINDOW, {
+      fontSize: infoContainerTextSize,
+      lineSpacing: 3,
+      maxLines: 2,
+    });
     this.pokemonNatureText.setOrigin(0, 0);
     this.pokemonNatureText.setName("text-pkmn-nature");
     this.add(this.pokemonNatureText);
@@ -177,13 +212,23 @@ export default class PokemonInfoContainer extends Phaser.GameObjects.Container {
     this.pokemonShinyIcon.setName("img-pkmn-shiny-icon");
     this.add(this.pokemonShinyIcon);
 
-    this.pokemonShinyNewIcon = addTextObject(this.pokemonShinyIcon.x + 12, this.pokemonShinyIcon.y, "", TextStyle.WINDOW, { fontSize: infoContainerTextSize });
+    this.pokemonShinyNewIcon = addTextObject(
+      this.pokemonShinyIcon.x + 12,
+      this.pokemonShinyIcon.y,
+      "",
+      TextStyle.WINDOW,
+      { fontSize: infoContainerTextSize },
+    );
     this.pokemonShinyNewIcon.setOrigin(0, 0);
     this.pokemonShinyNewIcon.setName("text-pkmn-shiny-new-icon");
     this.add(this.pokemonShinyNewIcon);
     this.pokemonShinyNewIcon.setVisible(false);
 
-    this.pokemonFusionShinyIcon = globalScene.add.image(this.pokemonShinyIcon.x, this.pokemonShinyIcon.y, "shiny_star_2");
+    this.pokemonFusionShinyIcon = globalScene.add.image(
+      this.pokemonShinyIcon.x,
+      this.pokemonShinyIcon.y,
+      "shiny_star_2",
+    );
     this.pokemonFusionShinyIcon.setOrigin(0, 0);
     this.pokemonFusionShinyIcon.setScale(0.75);
     this.pokemonFusionShinyIcon.setName("img-pkmn-fusion-shiny-icon");
@@ -192,7 +237,14 @@ export default class PokemonInfoContainer extends Phaser.GameObjects.Container {
     this.setVisible(false);
   }
 
-  show(pokemon: Pokemon, showMoves: boolean = false, speedMultiplier: number = 1, dexEntry?: DexEntry, starterEntry?: StarterDataEntry, eggInfo = false): Promise<void> {
+  show(
+    pokemon: Pokemon,
+    showMoves = false,
+    speedMultiplier = 1,
+    dexEntry?: DexEntry,
+    starterEntry?: StarterDataEntry,
+    eggInfo = false,
+  ): Promise<void> {
     return new Promise<void>(resolve => {
       if (!dexEntry) {
         dexEntry = globalScene.gameData.dexData[pokemon.species.speciesId];
@@ -218,23 +270,7 @@ export default class PokemonInfoContainer extends Phaser.GameObjects.Container {
         this.pokemonGenderText.setVisible(false);
       }
 
-      const formKey = (pokemon.species?.forms?.[pokemon.formIndex!]?.formKey);
-      const formText = Utils.capitalizeString(formKey, "-", false, false) || "";
-      const speciesName = Utils.capitalizeString(Species[pokemon.species.speciesId], "_", true, false);
-
-      let formName = "";
-      if (pokemon.species.speciesId === Species.ARCEUS) {
-        formName = i18next.t(`pokemonInfo:Type.${formText?.toUpperCase()}`);
-      } else {
-        const i18key = `pokemonForm:${speciesName}${formText}`;
-        if (i18next.exists(i18key)) {
-          formName = i18next.t(i18key);
-        } else {
-          const rootSpeciesName = Utils.capitalizeString(Species[pokemon.species.getRootSpeciesId()], "_", true, false);
-          const i18RootKey = `pokemonForm:${rootSpeciesName}${formText}`;
-          formName = i18next.exists(i18RootKey) ? i18next.t(i18RootKey) : formText;
-        }
-      }
+      const formName = pokemon.species.getFormNameToDisplay(pokemon.formIndex);
 
       if (formName) {
         this.pokemonFormLabelText.setVisible(true);
@@ -249,9 +285,16 @@ export default class PokemonInfoContainer extends Phaser.GameObjects.Container {
           this.pokemonFormLabelText.setShadowColor(getTextColor(TextStyle.WINDOW, true, globalScene.uiTheme));
         }
 
-        this.pokemonFormText.setText(formName.length > this.numCharsBeforeCutoff ? formName.substring(0, this.numCharsBeforeCutoff - 3) + "..." : formName);
+        this.pokemonFormText.setText(
+          formName.length > this.numCharsBeforeCutoff
+            ? `${formName.substring(0, this.numCharsBeforeCutoff - 3)}...`
+            : formName,
+        );
         if (formName.length > this.numCharsBeforeCutoff) {
-          this.pokemonFormText.setInteractive(new Phaser.Geom.Rectangle(0, 0, this.pokemonFormText.width, this.pokemonFormText.height), Phaser.Geom.Rectangle.Contains);
+          this.pokemonFormText.setInteractive(
+            new Phaser.Geom.Rectangle(0, 0, this.pokemonFormText.width, this.pokemonFormText.height),
+            Phaser.Geom.Rectangle.Contains,
+          );
           this.pokemonFormText.on("pointerover", () => globalScene.ui.showTooltip("", formName, true));
           this.pokemonFormText.on("pointerout", () => globalScene.ui.hideTooltip());
         } else {
@@ -300,10 +343,17 @@ export default class PokemonInfoContainer extends Phaser.GameObjects.Container {
       this.pokemonShinyIcon.setVisible(pokemon.isShiny());
       this.pokemonShinyIcon.setTint(getVariantTint(baseVariant));
       if (this.pokemonShinyIcon.visible) {
-        const shinyDescriptor = doubleShiny || baseVariant ?
-          `${baseVariant === 2 ? i18next.t("common:epicShiny") : baseVariant === 1 ? i18next.t("common:rareShiny") : i18next.t("common:commonShiny")}${doubleShiny ? `/${pokemon.fusionVariant === 2 ? i18next.t("common:epicShiny") : pokemon.fusionVariant === 1 ? i18next.t("common:rareShiny") : i18next.t("common:commonShiny")}` : ""}`
-          : "";
-        this.pokemonShinyIcon.on("pointerover", () => globalScene.ui.showTooltip("", `${i18next.t("common:shinyOnHover")}${shinyDescriptor ? ` (${shinyDescriptor})` : ""}`, true));
+        const shinyDescriptor =
+          doubleShiny || baseVariant
+            ? `${baseVariant === 2 ? i18next.t("common:epicShiny") : baseVariant === 1 ? i18next.t("common:rareShiny") : i18next.t("common:commonShiny")}${doubleShiny ? `/${pokemon.fusionVariant === 2 ? i18next.t("common:epicShiny") : pokemon.fusionVariant === 1 ? i18next.t("common:rareShiny") : i18next.t("common:commonShiny")}` : ""}`
+            : "";
+        this.pokemonShinyIcon.on("pointerover", () =>
+          globalScene.ui.showTooltip(
+            "",
+            `${i18next.t("common:shinyOnHover")}${shinyDescriptor ? ` (${shinyDescriptor})` : ""}`,
+            true,
+          ),
+        );
         this.pokemonShinyIcon.on("pointerout", () => globalScene.ui.hideTooltip());
 
         const newShiny = BigInt(1 << (pokemon.shiny ? 1 : 0));
@@ -312,9 +362,10 @@ export default class PokemonInfoContainer extends Phaser.GameObjects.Container {
         this.pokemonShinyNewIcon.setText("(+)");
         this.pokemonShinyNewIcon.setColor(getTextColor(TextStyle.SUMMARY_BLUE, false, globalScene.uiTheme));
         this.pokemonShinyNewIcon.setShadowColor(getTextColor(TextStyle.SUMMARY_BLUE, true, globalScene.uiTheme));
-        const newShinyOrVariant = ((newShiny & caughtAttr) === BigInt(0)) || ((newVariant & caughtAttr) === BigInt(0));
+        const newShinyOrVariant = (newShiny & caughtAttr) === BigInt(0) || (newVariant & caughtAttr) === BigInt(0);
         this.pokemonShinyNewIcon.setVisible(!!newShinyOrVariant);
-      } else if ((caughtAttr & DexAttr.NON_SHINY) === BigInt(0) && ((caughtAttr & DexAttr.SHINY) === DexAttr.SHINY)) { //If the player has *only* caught any shiny variant of this species, not a non-shiny
+      } else if ((caughtAttr & DexAttr.NON_SHINY) === BigInt(0) && (caughtAttr & DexAttr.SHINY) === DexAttr.SHINY) {
+        //If the player has *only* caught any shiny variant of this species, not a non-shiny
         this.pokemonShinyNewIcon.setVisible(true);
         this.pokemonShinyNewIcon.setText("(+)");
         this.pokemonShinyNewIcon.setColor(getTextColor(TextStyle.SUMMARY_BLUE, false, globalScene.uiTheme));
@@ -330,36 +381,41 @@ export default class PokemonInfoContainer extends Phaser.GameObjects.Container {
       }
 
       const starterSpeciesId = pokemon.species.getRootSpeciesId();
-      const originalIvs: number[] | null = eggInfo ? (dexEntry.caughtAttr ? dexEntry.ivs : null) : (globalScene.gameData.dexData[starterSpeciesId].caughtAttr
-        ? globalScene.gameData.dexData[starterSpeciesId].ivs : null);
+      const originalIvs: number[] | null = eggInfo
+        ? dexEntry.caughtAttr
+          ? dexEntry.ivs
+          : null
+        : globalScene.gameData.dexData[starterSpeciesId].caughtAttr
+          ? globalScene.gameData.dexData[starterSpeciesId].ivs
+          : null;
 
       this.statsContainer.updateIvs(pokemon.ivs, originalIvs!); // TODO: is this bang correct?
       if (!eggInfo) {
         globalScene.tweens.add({
           targets: this,
-          duration: Utils.fixedInt(Math.floor(750 / speedMultiplier)),
+          duration: fixedInt(Math.floor(750 / speedMultiplier)),
           ease: "Cubic.easeInOut",
           x: this.initialX - this.infoWindowWidth,
           onComplete: () => {
             resolve();
-          }
+          },
         });
 
         if (showMoves) {
           globalScene.tweens.add({
-            delay: Utils.fixedInt(Math.floor(325 / speedMultiplier)),
+            delay: fixedInt(Math.floor(325 / speedMultiplier)),
             targets: this.pokemonMovesContainer,
-            duration: Utils.fixedInt(Math.floor(325 / speedMultiplier)),
+            duration: fixedInt(Math.floor(325 / speedMultiplier)),
             ease: "Cubic.easeInOut",
             x: this.movesContainerInitialX - 57,
-            onComplete: () => resolve()
+            onComplete: () => resolve(),
           });
         }
       }
 
       for (let m = 0; m < 4; m++) {
         const move = m < pokemon.moveset.length && pokemon.moveset[m] ? pokemon.moveset[m]!.getMove() : null;
-        this.pokemonMoveBgs[m].setFrame(Type[move ? move.type : Type.UNKNOWN].toString().toLowerCase());
+        this.pokemonMoveBgs[m].setFrame(PokemonType[move ? move.type : PokemonType.UNKNOWN].toString().toLowerCase());
         this.pokemonMoveLabels[m].setText(move ? move.name : "-");
         this.pokemonMovesContainers[m].setVisible(!!move);
       }
@@ -400,22 +456,24 @@ export default class PokemonInfoContainer extends Phaser.GameObjects.Container {
     this.pokemonMovesContainer.setVisible(false);
   }
 
-  makeRoomForConfirmUi(speedMultiplier: number = 1, fromCatch: boolean = false): Promise<void> {
-    const xPosition = fromCatch ? this.initialX - this.infoWindowWidth - 65 : this.initialX - this.infoWindowWidth - ConfirmUiHandler.windowWidth;
+  makeRoomForConfirmUi(speedMultiplier = 1, fromCatch = false): Promise<void> {
+    const xPosition = fromCatch
+      ? this.initialX - this.infoWindowWidth - 67
+      : this.initialX - this.infoWindowWidth - ConfirmUiHandler.windowWidth;
     return new Promise<void>(resolve => {
       globalScene.tweens.add({
         targets: this,
-        duration: Utils.fixedInt(Math.floor(150 / speedMultiplier)),
+        duration: fixedInt(Math.floor(150 / speedMultiplier)),
         ease: "Cubic.easeInOut",
         x: xPosition,
         onComplete: () => {
           resolve();
-        }
+        },
       });
     });
   }
 
-  hide(speedMultiplier: number = 1): Promise<void> {
+  hide(speedMultiplier = 1): Promise<void> {
     return new Promise(resolve => {
       if (!this.shown) {
         globalScene.showEnemyModifierBar();
@@ -424,14 +482,14 @@ export default class PokemonInfoContainer extends Phaser.GameObjects.Container {
 
       globalScene.tweens.add({
         targets: this.pokemonMovesContainer,
-        duration: Utils.fixedInt(Math.floor(750 / speedMultiplier)),
+        duration: fixedInt(Math.floor(750 / speedMultiplier)),
         ease: "Cubic.easeInOut",
-        x: this.movesContainerInitialX
+        x: this.movesContainerInitialX,
       });
 
       globalScene.tweens.add({
         targets: this,
-        duration: Utils.fixedInt(Math.floor(750 / speedMultiplier)),
+        duration: fixedInt(Math.floor(750 / speedMultiplier)),
         ease: "Cubic.easeInOut",
         x: this.initialX,
         onComplete: () => {
@@ -441,7 +499,7 @@ export default class PokemonInfoContainer extends Phaser.GameObjects.Container {
           globalScene.ui.hideTooltip();
           globalScene.showEnemyModifierBar();
           resolve();
-        }
+        },
       });
 
       this.shown = false;
diff --git a/src/ui/registration-form-ui-handler.ts b/src/ui/registration-form-ui-handler.ts
index 3b229a47c38..a60a53a8e7a 100644
--- a/src/ui/registration-form-ui-handler.ts
+++ b/src/ui/registration-form-ui-handler.ts
@@ -1,45 +1,44 @@
 import type { InputFieldConfig } from "./form-modal-ui-handler";
 import { FormModalUiHandler } from "./form-modal-ui-handler";
 import type { ModalConfig } from "./modal-ui-handler";
-import { Mode } from "./ui";
+import { UiMode } from "#enums/ui-mode";
 import { TextStyle, addTextObject } from "./text";
 import i18next from "i18next";
 import { pokerogueApi } from "#app/plugins/api/pokerogue-api";
 import { globalScene } from "#app/global-scene";
 
-
 interface LanguageSetting {
-  inputFieldFontSize?: string,
-  warningMessageFontSize?: string,
-  errorMessageFontSize?: string,
+  inputFieldFontSize?: string;
+  warningMessageFontSize?: string;
+  errorMessageFontSize?: string;
 }
 
 const languageSettings: { [key: string]: LanguageSetting } = {
   "es-ES": {
     inputFieldFontSize: "50px",
     errorMessageFontSize: "40px",
-  }
+  },
 };
 
 export default class RegistrationFormUiHandler extends FormModalUiHandler {
-  getModalTitle(config?: ModalConfig): string {
+  getModalTitle(_config?: ModalConfig): string {
     return i18next.t("menu:register");
   }
 
-  getWidth(config?: ModalConfig): number {
+  getWidth(_config?: ModalConfig): number {
     return 160;
   }
 
-  getMargin(config?: ModalConfig): [number, number, number, number] {
-    return [ 0, 0, 48, 0 ];
+  getMargin(_config?: ModalConfig): [number, number, number, number] {
+    return [0, 0, 48, 0];
   }
 
   getButtonTopMargin(): number {
     return 8;
   }
 
-  getButtonLabels(config?: ModalConfig): string[] {
-    return [ i18next.t("menu:register"), i18next.t("menu:backToLogin") ];
+  getButtonLabels(_config?: ModalConfig): string[] {
+    return [i18next.t("menu:register"), i18next.t("menu:backToLogin")];
   }
 
   getReadableErrorMessage(error: string): string {
@@ -62,8 +61,14 @@ export default class RegistrationFormUiHandler extends FormModalUiHandler {
   override getInputFieldConfigs(): InputFieldConfig[] {
     const inputFieldConfigs: InputFieldConfig[] = [];
     inputFieldConfigs.push({ label: i18next.t("menu:username") });
-    inputFieldConfigs.push({ label: i18next.t("menu:password"), isPassword: true });
-    inputFieldConfigs.push({ label: i18next.t("menu:confirmPassword"), isPassword: true });
+    inputFieldConfigs.push({
+      label: i18next.t("menu:password"),
+      isPassword: true,
+    });
+    inputFieldConfigs.push({
+      label: i18next.t("menu:confirmPassword"),
+      isPassword: true,
+    });
     return inputFieldConfigs;
   }
 
@@ -80,7 +85,9 @@ export default class RegistrationFormUiHandler extends FormModalUiHandler {
     });
 
     const warningMessageFontSize = languageSettings[i18next.resolvedLanguage!]?.warningMessageFontSize ?? "42px";
-    const label = addTextObject(10, 87, i18next.t("menu:registrationAgeWarning"), TextStyle.TOOLTIP_CONTENT, { fontSize: warningMessageFontSize });
+    const label = addTextObject(10, 87, i18next.t("menu:registrationAgeWarning"), TextStyle.TOOLTIP_CONTENT, {
+      fontSize: warningMessageFontSize,
+    });
 
     this.modalContainer.add(label);
   }
@@ -90,44 +97,54 @@ export default class RegistrationFormUiHandler extends FormModalUiHandler {
       const config = args[0] as ModalConfig;
 
       const originalRegistrationAction = this.submitAction;
-      this.submitAction = (_) => {
-        // Prevent overlapping overrides on action modification
-        this.submitAction = originalRegistrationAction;
-        this.sanitizeInputs();
-        globalScene.ui.setMode(Mode.LOADING, { buttonActions: []});
-        const onFail = error => {
-          globalScene.ui.setMode(Mode.REGISTRATION_FORM, Object.assign(config, { errorMessage: error?.trim() }));
-          globalScene.ui.playError();
-          const errorMessageFontSize = languageSettings[i18next.resolvedLanguage!]?.errorMessageFontSize;
-          if (errorMessageFontSize) {
-            this.errorMessage.setFontSize(errorMessageFontSize);
-          }
-        };
-        if (!this.inputs[0].text) {
-          return onFail(i18next.t("menu:emptyUsername"));
-        }
-        if (!this.inputs[1].text) {
-          return onFail(this.getReadableErrorMessage("invalid password"));
-        }
-        if (this.inputs[1].text !== this.inputs[2].text) {
-          return onFail(i18next.t("menu:passwordNotMatchingConfirmPassword"));
-        }
-        const [ usernameInput, passwordInput ] = this.inputs;
-        pokerogueApi.account.register({ username: usernameInput.text, password: passwordInput.text })
-          .then(registerError => {
-            if (!registerError) {
-              pokerogueApi.account.login({ username: usernameInput.text, password: passwordInput.text })
-                .then(loginError => {
-                  if (!loginError) {
-                    originalRegistrationAction && originalRegistrationAction();
-                  } else {
-                    onFail(loginError);
-                  }
-                });
-            } else {
-              onFail(registerError);
+      this.submitAction = _ => {
+        if (globalScene.tweens.getTweensOf(this.modalContainer).length === 0) {
+          // Prevent overlapping overrides on action modification
+          this.submitAction = originalRegistrationAction;
+          this.sanitizeInputs();
+          globalScene.ui.setMode(UiMode.LOADING, { buttonActions: [] });
+          const onFail = error => {
+            globalScene.ui.setMode(UiMode.REGISTRATION_FORM, Object.assign(config, { errorMessage: error?.trim() }));
+            globalScene.ui.playError();
+            const errorMessageFontSize = languageSettings[i18next.resolvedLanguage!]?.errorMessageFontSize;
+            if (errorMessageFontSize) {
+              this.errorMessage.setFontSize(errorMessageFontSize);
             }
-          });
+          };
+          if (!this.inputs[0].text) {
+            return onFail(i18next.t("menu:emptyUsername"));
+          }
+          if (!this.inputs[1].text) {
+            return onFail(this.getReadableErrorMessage("invalid password"));
+          }
+          if (this.inputs[1].text !== this.inputs[2].text) {
+            return onFail(i18next.t("menu:passwordNotMatchingConfirmPassword"));
+          }
+          const [usernameInput, passwordInput] = this.inputs;
+          pokerogueApi.account
+            .register({
+              username: usernameInput.text,
+              password: passwordInput.text,
+            })
+            .then(registerError => {
+              if (!registerError) {
+                pokerogueApi.account
+                  .login({
+                    username: usernameInput.text,
+                    password: passwordInput.text,
+                  })
+                  .then(loginError => {
+                    if (!loginError) {
+                      originalRegistrationAction?.();
+                    } else {
+                      onFail(loginError);
+                    }
+                  });
+              } else {
+                onFail(registerError);
+              }
+            });
+        }
       };
 
       return true;
diff --git a/src/ui/rename-form-ui-handler.ts b/src/ui/rename-form-ui-handler.ts
index 3004530063e..7083f83865b 100644
--- a/src/ui/rename-form-ui-handler.ts
+++ b/src/ui/rename-form-ui-handler.ts
@@ -5,20 +5,20 @@ import i18next from "i18next";
 import type { PlayerPokemon } from "#app/field/pokemon";
 
 export default class RenameFormUiHandler extends FormModalUiHandler {
-  getModalTitle(config?: ModalConfig): string {
+  getModalTitle(_config?: ModalConfig): string {
     return i18next.t("menu:renamePokemon");
   }
 
-  getWidth(config?: ModalConfig): number {
+  getWidth(_config?: ModalConfig): number {
     return 160;
   }
 
-  getMargin(config?: ModalConfig): [number, number, number, number] {
-    return [ 0, 0, 48, 0 ];
+  getMargin(_config?: ModalConfig): [number, number, number, number] {
+    return [0, 0, 48, 0];
   }
 
-  getButtonLabels(config?: ModalConfig): string[] {
-    return [ i18next.t("menu:rename"), i18next.t("menu:cancel") ];
+  getButtonLabels(_config?: ModalConfig): string[] {
+    return [i18next.t("menu:rename"), i18next.t("menu:cancel")];
   }
 
   getReadableErrorMessage(error: string): string {
@@ -38,11 +38,11 @@ export default class RenameFormUiHandler extends FormModalUiHandler {
     if (super.show(args)) {
       const config = args[0] as ModalConfig;
       if (args[1] && typeof (args[1] as PlayerPokemon).getNameToRender === "function") {
-        this.inputs[0].text = (args[1] as PlayerPokemon).getNameToRender();
+        this.inputs[0].text = (args[1] as PlayerPokemon).getNameToRender(false);
       } else {
         this.inputs[0].text = args[1];
       }
-      this.submitAction = (_) => {
+      this.submitAction = _ => {
         this.sanitizeInputs();
         const sanitizedName = btoa(unescape(encodeURIComponent(this.inputs[0].text)));
         config.buttonActions[0](sanitizedName);
diff --git a/src/ui/run-history-ui-handler.ts b/src/ui/run-history-ui-handler.ts
index 2a498f77b8d..92c5a2fde07 100644
--- a/src/ui/run-history-ui-handler.ts
+++ b/src/ui/run-history-ui-handler.ts
@@ -1,14 +1,14 @@
 import { globalScene } from "#app/global-scene";
 import { GameModes } from "../game-mode";
 import { TextStyle, addTextObject } from "./text";
-import { Mode } from "./ui";
+import { UiMode } from "#enums/ui-mode";
 import { addWindow } from "./ui-theme";
-import * as Utils from "../utils";
+import { fixedInt, formatLargeNumber } from "#app/utils/common";
 import type PokemonData from "../system/pokemon-data";
 import MessageUiHandler from "./message-ui-handler";
 import i18next from "i18next";
 import { Button } from "../enums/buttons";
-import { BattleType } from "../battle";
+import { BattleType } from "#enums/battle-type";
 import type { RunEntry } from "../system/game-data";
 import { PlayerGender } from "#enums/player-gender";
 import { TrainerVariant } from "../field/trainer";
@@ -25,7 +25,6 @@ export const RUN_HISTORY_LIMIT: number = 25;
  * The only valid input buttons are Button.ACTION and Button.CANCEL.
  */
 export default class RunHistoryUiHandler extends MessageUiHandler {
-
   private readonly maxRows = 3;
 
   private runSelectContainer: Phaser.GameObjects.Container;
@@ -34,14 +33,14 @@ export default class RunHistoryUiHandler extends MessageUiHandler {
 
   private runSelectCallback: RunSelectCallback | null;
 
-  private scrollCursor: number = 0;
+  private scrollCursor = 0;
 
   private cursorObj: Phaser.GameObjects.NineSlice | null;
 
   private runContainerInitialY: number;
 
   constructor() {
-    super(Mode.RUN_HISTORY);
+    super(UiMode.RUN_HISTORY);
   }
 
   override setup() {
@@ -51,7 +50,13 @@ export default class RunHistoryUiHandler extends MessageUiHandler {
     this.runSelectContainer.setVisible(false);
     ui.add(this.runSelectContainer);
 
-    const loadSessionBg = globalScene.add.rectangle(0, 0, globalScene.game.canvas.width / 6, -globalScene.game.canvas.height / 6, 0x006860);
+    const loadSessionBg = globalScene.add.rectangle(
+      0,
+      0,
+      globalScene.game.canvas.width / 6,
+      -globalScene.game.canvas.height / 6,
+      0x006860,
+    );
     loadSessionBg.setOrigin(0, 0);
     this.runSelectContainer.add(loadSessionBg);
 
@@ -101,21 +106,20 @@ export default class RunHistoryUiHandler extends MessageUiHandler {
     let success = false;
     const error = false;
 
-    if ([ Button.ACTION, Button.CANCEL ].includes(button)) {
+    if ([Button.ACTION, Button.CANCEL].includes(button)) {
       if (button === Button.ACTION) {
         const cursor = this.cursor + this.scrollCursor;
         if (this.runs[cursor]) {
-          globalScene.ui.setOverlayMode(Mode.RUN_INFO, this.runs[cursor].entryData, RunDisplayMode.RUN_HISTORY, true);
+          globalScene.ui.setOverlayMode(UiMode.RUN_INFO, this.runs[cursor].entryData, RunDisplayMode.RUN_HISTORY, true);
         } else {
           return false;
         }
         success = true;
         return success;
-      } else {
-        this.runSelectCallback = null;
-        success = true;
-        globalScene.ui.revertMode();
       }
+      this.runSelectCallback = null;
+      success = true;
+      globalScene.ui.revertMode();
     } else if (this.runs.length > 0) {
       switch (button) {
         case Button.UP:
@@ -124,7 +128,7 @@ export default class RunHistoryUiHandler extends MessageUiHandler {
           } else if (this.scrollCursor) {
             success = this.setScrollCursor(this.scrollCursor - 1);
           } else if (this.runs.length > 1) {
-          // wrap around to the bottom
+            // wrap around to the bottom
             success = this.setCursor(Math.min(this.runs.length - 1, this.maxRows - 1));
             success = this.setScrollCursor(Math.max(0, this.runs.length - this.maxRows)) || success;
           }
@@ -135,7 +139,7 @@ export default class RunHistoryUiHandler extends MessageUiHandler {
           } else if (this.scrollCursor < this.runs.length - this.maxRows) {
             success = this.setScrollCursor(this.scrollCursor + 1);
           } else if (this.runs.length > 1) {
-          // wrap around to the top
+            // wrap around to the top
             success = this.setCursor(0);
             success = this.setScrollCursor(0) || success;
           }
@@ -186,7 +190,9 @@ export default class RunHistoryUiHandler extends MessageUiHandler {
     const emptyWindow = addWindow(0, 0, 304, 165);
     this.runsContainer.add(emptyWindow);
     const emptyWindowCoordinates = emptyWindow.getCenter();
-    const emptyText = addTextObject(0, 0, i18next.t("saveSlotSelectUiHandler:empty"), TextStyle.WINDOW, { fontSize: "128px" });
+    const emptyText = addTextObject(0, 0, i18next.t("saveSlotSelectUiHandler:empty"), TextStyle.WINDOW, {
+      fontSize: "128px",
+    });
     emptyText.setPosition(emptyWindowCoordinates.x - 18, emptyWindowCoordinates.y - 15);
     this.runsContainer.add(emptyText);
   }
@@ -212,8 +218,8 @@ export default class RunHistoryUiHandler extends MessageUiHandler {
       globalScene.tweens.add({
         targets: this.runsContainer,
         y: this.runContainerInitialY - 56 * scrollCursor,
-        duration: Utils.fixedInt(325),
-        ease: "Sine.easeInOut"
+        duration: fixedInt(325),
+        ease: "Sine.easeInOut",
       });
     }
     return changed;
@@ -261,7 +267,6 @@ class RunEntryContainer extends Phaser.GameObjects.Container {
     this.entryData = entryData;
 
     this.setup(this.entryData);
-
   }
 
   /**
@@ -275,7 +280,6 @@ class RunEntryContainer extends Phaser.GameObjects.Container {
    * The player's party and their levels at the time of the last wave of the run are also displayed.
    */
   private setup(run: RunEntry) {
-
     const victory = run.isVictory;
     const data = globalScene.gameData.parseSessionData(JSON.stringify(run.entry));
 
@@ -286,22 +290,34 @@ class RunEntryContainer extends Phaser.GameObjects.Container {
     if (victory) {
       const gameOutcomeLabel = addTextObject(8, 5, `${i18next.t("runHistory:victory")}`, TextStyle.WINDOW);
       this.add(gameOutcomeLabel);
-    } else { // Run Result: Defeats
+    } else {
+      // Run Result: Defeats
       const genderIndex = globalScene.gameData.gender ?? PlayerGender.UNSET;
       const genderStr = PlayerGender[genderIndex].toLowerCase();
       // Defeats from wild Pokemon battles will show the Pokemon responsible by the text of the run result.
       if (data.battleType === BattleType.WILD || (data.battleType === BattleType.MYSTERY_ENCOUNTER && !data.trainer)) {
         const enemyContainer = globalScene.add.container(8, 5);
-        const gameOutcomeLabel = addTextObject(0, 0, `${i18next.t("runHistory:defeatedWild", { context: genderStr })}`, TextStyle.WINDOW);
+        const gameOutcomeLabel = addTextObject(
+          0,
+          0,
+          `${i18next.t("runHistory:defeatedWild", { context: genderStr })}`,
+          TextStyle.WINDOW,
+        );
         enemyContainer.add(gameOutcomeLabel);
         data.enemyParty.forEach((enemyData, e) => {
-          const enemyIconContainer = globalScene.add.container(65 + (e * 25), -8);
+          const enemyIconContainer = globalScene.add.container(65 + e * 25, -8);
           enemyIconContainer.setScale(0.75);
           enemyData.boss = false;
           enemyData["player"] = true;
           const enemy = enemyData.toPokemon();
           const enemyIcon = globalScene.addPokemonIcon(enemy, 0, 0, 0, 0);
-          const enemyLevel = addTextObject(32, 20, `${i18next.t("saveSlotSelectUiHandler:lv")}${Utils.formatLargeNumber(enemy.level, 1000)}`, TextStyle.PARTY, { fontSize: "54px", color: "#f8f8f8" });
+          const enemyLevel = addTextObject(
+            32,
+            20,
+            `${i18next.t("saveSlotSelectUiHandler:lv")}${formatLargeNumber(enemy.level, 1000)}`,
+            TextStyle.PARTY,
+            { fontSize: "54px", color: "#f8f8f8" },
+          );
           enemyLevel.setShadow(0, 0, undefined);
           enemyLevel.setStroke("#424242", 14);
           enemyLevel.setOrigin(1, 0);
@@ -311,16 +327,30 @@ class RunEntryContainer extends Phaser.GameObjects.Container {
           enemy.destroy();
         });
         this.add(enemyContainer);
-      } else if (data.battleType === BattleType.TRAINER || (data.battleType === BattleType.MYSTERY_ENCOUNTER && data.trainer)) { // Defeats from Trainers show the trainer's title and name
+      } else if (
+        data.battleType === BattleType.TRAINER ||
+        (data.battleType === BattleType.MYSTERY_ENCOUNTER && data.trainer)
+      ) {
+        // Defeats from Trainers show the trainer's title and name
         const tObj = data.trainer.toTrainer();
         // Because of the interesting mechanics behind rival names, the rival name and title have to be retrieved differently
         const RIVAL_TRAINER_ID_THRESHOLD = 375;
         if (data.trainer.trainerType >= RIVAL_TRAINER_ID_THRESHOLD) {
-          const rivalName = (tObj.variant === TrainerVariant.FEMALE) ? "trainerNames:rival_female" : "trainerNames:rival";
-          const gameOutcomeLabel = addTextObject(8, 5, `${i18next.t("runHistory:defeatedRival", { context: genderStr })} ${i18next.t(rivalName)}`, TextStyle.WINDOW);
+          const rivalName = tObj.variant === TrainerVariant.FEMALE ? "trainerNames:rival_female" : "trainerNames:rival";
+          const gameOutcomeLabel = addTextObject(
+            8,
+            5,
+            `${i18next.t("runHistory:defeatedRival", { context: genderStr })} ${i18next.t(rivalName)}`,
+            TextStyle.WINDOW,
+          );
           this.add(gameOutcomeLabel);
         } else {
-          const gameOutcomeLabel = addTextObject(8, 5, `${i18next.t("runHistory:defeatedTrainer", { context: genderStr })}${tObj.getName(0, true)}`, TextStyle.WINDOW);
+          const gameOutcomeLabel = addTextObject(
+            8,
+            5,
+            `${i18next.t("runHistory:defeatedTrainer", { context: genderStr })}${tObj.getName(0, true)}`,
+            TextStyle.WINDOW,
+          );
           this.add(gameOutcomeLabel);
         }
       }
@@ -375,7 +405,13 @@ class RunEntryContainer extends Phaser.GameObjects.Container {
       const pokemon = p.toPokemon();
       const icon = globalScene.addPokemonIcon(pokemon, 0, 0, 0, 0);
 
-      const text = addTextObject(32, 20, `${i18next.t("saveSlotSelectUiHandler:lv")}${Utils.formatLargeNumber(pokemon.level, 1000)}`, TextStyle.PARTY, { fontSize: "54px", color: "#f8f8f8" });
+      const text = addTextObject(
+        32,
+        20,
+        `${i18next.t("saveSlotSelectUiHandler:lv")}${formatLargeNumber(pokemon.level, 1000)}`,
+        TextStyle.PARTY,
+        { fontSize: "54px", color: "#f8f8f8" },
+      );
       text.setShadow(0, 0, undefined);
       text.setStroke("#424242", 14);
       text.setOrigin(1, 0);
diff --git a/src/ui/run-info-ui-handler.ts b/src/ui/run-info-ui-handler.ts
index 02bcba17a73..8487533f465 100644
--- a/src/ui/run-info-ui-handler.ts
+++ b/src/ui/run-info-ui-handler.ts
@@ -2,24 +2,25 @@ import { GameModes } from "../game-mode";
 import UiHandler from "./ui-handler";
 import type { SessionSaveData } from "../system/game-data";
 import { TextStyle, addTextObject, addBBCodeTextObject, getTextColor } from "./text";
-import { Mode } from "./ui";
+import { UiMode } from "#enums/ui-mode";
 import { addWindow } from "./ui-theme";
 import { getPokeballAtlasKey } from "#app/data/pokeball";
-import * as Utils from "../utils";
+import { formatLargeNumber, getPlayTimeString, formatMoney, formatFancyLargeNumber } from "#app/utils/common";
 import type PokemonData from "../system/pokemon-data";
 import i18next from "i18next";
 import { Button } from "../enums/buttons";
-import { BattleType } from "../battle";
+import { BattleType } from "#enums/battle-type";
 import { TrainerVariant } from "../field/trainer";
 import { Challenges } from "#enums/challenges";
 import { getLuckString, getLuckTextTint } from "../modifier/modifier-type";
 import RoundRectangle from "phaser3-rex-plugins/plugins/roundrectangle";
 import { getTypeRgb } from "#app/data/type";
-import { Type } from "#enums/type";
+import { PokemonType } from "#enums/pokemon-type";
 import { TypeColor, TypeShadow } from "#app/enums/color";
 import { getNatureStatMultiplier, getNatureName } from "../data/nature";
-import { getVariantTint } from "#app/data/variant";
-import * as Modifier from "../modifier/modifier";
+import { getVariantTint } from "#app/sprites/variant";
+// biome-ignore lint/style/noNamespaceImport: See `src/system/game-data.ts`
+import * as Modifier from "#app/modifier/modifier";
 import type { Species } from "#enums/species";
 import { PlayerGender } from "#enums/player-gender";
 import { SettingKeyboard } from "#app/system/settings/settings-keyboard";
@@ -35,12 +36,12 @@ import { globalScene } from "#app/global-scene";
 enum RunInfoUiMode {
   MAIN,
   HALL_OF_FAME,
-  ENDING_ART
+  ENDING_ART,
 }
 
 export enum RunDisplayMode {
   RUN_HISTORY,
-  SESSION_PREVIEW
+  SESSION_PREVIEW,
 }
 
 /**
@@ -64,20 +65,20 @@ export default class RunInfoUiHandler extends UiHandler {
   private hallofFameContainer: Phaser.GameObjects.Container;
   private endCardContainer: Phaser.GameObjects.Container;
 
-  private partyVisibility: Boolean;
+  private partyVisibility: boolean;
   private modifiersModule: any;
 
   constructor() {
-    super(Mode.RUN_INFO);
+    super(UiMode.RUN_INFO);
   }
 
   override async setup() {
- 		this.runContainer = globalScene.add.container(1, -(globalScene.game.canvas.height / 6) + 1);
+    this.runContainer = globalScene.add.container(1, -(globalScene.game.canvas.height / 6) + 1);
     // The import of the modifiersModule is loaded here to sidestep async/await issues.
     this.modifiersModule = Modifier;
     this.runContainer.setVisible(false);
     globalScene.loadImage("encounter_exclaim", "mystery-encounters");
- 	}
+  }
 
   /**
    * This takes a run's RunEntry and uses the information provided to display essential information about the player's run.
@@ -90,10 +91,16 @@ export default class RunInfoUiHandler extends UiHandler {
    * Party Container:
    * this.isVictory === true --> Hall of Fame Container:
    */
- 	override show(args: any[]): boolean {
- 		super.show(args);
+  override show(args: any[]): boolean {
+    super.show(args);
 
-    const gameStatsBg = globalScene.add.rectangle(0, 0, globalScene.game.canvas.width, globalScene.game.canvas.height, 0x006860);
+    const gameStatsBg = globalScene.add.rectangle(
+      0,
+      0,
+      globalScene.game.canvas.width,
+      globalScene.game.canvas.height,
+      0x006860,
+    );
     gameStatsBg.setOrigin(0, 0);
     this.runContainer.add(gameStatsBg);
 
@@ -112,7 +119,7 @@ export default class RunInfoUiHandler extends UiHandler {
     // Creates Header and adds to this.runContainer
     this.addHeader();
 
-    this.statsBgWidth = ((globalScene.game.canvas.width / 6) - 2) / 3;
+    this.statsBgWidth = (globalScene.game.canvas.width / 6 - 2) / 3;
 
     // Creates Run Result Container
     this.runResultContainer = globalScene.add.container(0, 24);
@@ -131,14 +138,17 @@ export default class RunInfoUiHandler extends UiHandler {
     const runInfoWindow = addWindow(0, 0, this.statsBgWidth - 11, 90);
     const runInfoWindowCoords = runInfoWindow.getBottomRight();
     this.runInfoContainer.add(runInfoWindow);
- 		this.parseRunInfo(runInfoWindowCoords.x, runInfoWindowCoords.y);
+    this.parseRunInfo(runInfoWindowCoords.x, runInfoWindowCoords.y);
 
     // Creates Player Party Container
     this.partyContainer = globalScene.add.container(this.statsBgWidth - 10, 23);
     this.parsePartyInfo();
     this.showParty(true);
 
-    this.runContainer.setInteractive(new Phaser.Geom.Rectangle(0, 0, globalScene.game.canvas.width / 6, globalScene.game.canvas.height / 6), Phaser.Geom.Rectangle.Contains);
+    this.runContainer.setInteractive(
+      new Phaser.Geom.Rectangle(0, 0, globalScene.game.canvas.width / 6, globalScene.game.canvas.height / 6),
+      Phaser.Geom.Rectangle.Contains,
+    );
     this.getUi().bringToTop(this.runContainer);
     this.runContainer.setVisible(true);
 
@@ -155,7 +165,7 @@ export default class RunInfoUiHandler extends UiHandler {
     this.getUi().hideTooltip();
 
     return true;
- 	}
+  }
 
   /**
    * Creates and adds the header background, title text, and important buttons to RunInfoUiHandler
@@ -163,22 +173,33 @@ export default class RunInfoUiHandler extends UiHandler {
    * It does not check if the run has any PokemonHeldItemModifiers though.
    */
   private addHeader() {
-    const headerBg = addWindow(0, 0, (globalScene.game.canvas.width / 6) - 2, 24);
+    const headerBg = addWindow(0, 0, globalScene.game.canvas.width / 6 - 2, 24);
     headerBg.setOrigin(0, 0);
     this.runContainer.add(headerBg);
     if (this.runInfo.modifiers.length !== 0) {
       const headerBgCoords = headerBg.getTopRight();
       const abilityButtonContainer = globalScene.add.container(0, 0);
-      const abilityButtonText = addTextObject(8, 0, i18next.t("runHistory:viewHeldItems"), TextStyle.WINDOW, { fontSize:"34px" });
+      const abilityButtonText = addTextObject(8, 0, i18next.t("runHistory:viewHeldItems"), TextStyle.WINDOW, {
+        fontSize: "34px",
+      });
       const gamepadType = this.getUi().getGamepadType();
       let abilityButtonElement: Phaser.GameObjects.Sprite;
       if (gamepadType === "touch") {
         abilityButtonElement = new Phaser.GameObjects.Sprite(globalScene, 0, 2, "keyboard", "E.png");
       } else {
-        abilityButtonElement = new Phaser.GameObjects.Sprite(globalScene, 0, 2, gamepadType, globalScene.inputController?.getIconForLatestInputRecorded(SettingKeyboard.Button_Cycle_Ability));
+        abilityButtonElement = new Phaser.GameObjects.Sprite(
+          globalScene,
+          0,
+          2,
+          gamepadType,
+          globalScene.inputController?.getIconForLatestInputRecorded(SettingKeyboard.Button_Cycle_Ability),
+        );
       }
-      abilityButtonContainer.add([ abilityButtonText, abilityButtonElement ]);
-      abilityButtonContainer.setPosition(headerBgCoords.x - abilityButtonText.displayWidth - abilityButtonElement.displayWidth - 8, 10);
+      abilityButtonContainer.add([abilityButtonText, abilityButtonElement]);
+      abilityButtonContainer.setPosition(
+        headerBgCoords.x - abilityButtonText.displayWidth - abilityButtonElement.displayWidth - 8,
+        10,
+      );
       this.runContainer.add(abilityButtonContainer);
     }
     const headerText = addTextObject(0, 0, i18next.t("runHistory:runInfo"), TextStyle.SETTINGS_LABEL);
@@ -199,13 +220,25 @@ export default class RunInfoUiHandler extends UiHandler {
     const genderIndex = globalScene.gameData.gender ?? PlayerGender.UNSET;
     const genderStr = PlayerGender[genderIndex];
     const runResultTextStyle = this.isVictory ? TextStyle.PERFECT_IV : TextStyle.SUMMARY_RED;
-    const runResultTitle = this.isVictory ? i18next.t("runHistory:victory") : i18next.t("runHistory:defeated", { context: genderStr });
-    const runResultText = addTextObject(6, 5, `${runResultTitle} - ${i18next.t("saveSlotSelectUiHandler:wave")} ${this.runInfo.waveIndex}`, runResultTextStyle, { fontSize : "65px", lineSpacing: 0.1 });
+    const runResultTitle = this.isVictory
+      ? i18next.t("runHistory:victory")
+      : i18next.t("runHistory:defeated", { context: genderStr });
+    const runResultText = addTextObject(
+      6,
+      5,
+      `${runResultTitle} - ${i18next.t("saveSlotSelectUiHandler:wave")} ${this.runInfo.waveIndex}`,
+      runResultTextStyle,
+      { fontSize: "65px", lineSpacing: 0.1 },
+    );
 
     if (this.isVictory) {
       const hallofFameInstructionContainer = globalScene.add.container(0, 0);
-      const shinyButtonText = addTextObject(8, 0, i18next.t("runHistory:viewHallOfFame"), TextStyle.WINDOW, { fontSize:"65px" });
-      const formButtonText = addTextObject(8, 12, i18next.t("runHistory:viewEndingSplash"), TextStyle.WINDOW, { fontSize:"65px" });
+      const shinyButtonText = addTextObject(8, 0, i18next.t("runHistory:viewHallOfFame"), TextStyle.WINDOW, {
+        fontSize: "65px",
+      });
+      const formButtonText = addTextObject(8, 12, i18next.t("runHistory:viewEndingSplash"), TextStyle.WINDOW, {
+        fontSize: "65px",
+      });
       const gamepadType = this.getUi().getGamepadType();
       let shinyButtonElement: Phaser.GameObjects.Sprite;
       let formButtonElement: Phaser.GameObjects.Sprite;
@@ -213,12 +246,24 @@ export default class RunInfoUiHandler extends UiHandler {
         shinyButtonElement = new Phaser.GameObjects.Sprite(globalScene, 0, 4, "keyboard", "R.png");
         formButtonElement = new Phaser.GameObjects.Sprite(globalScene, 0, 16, "keyboard", "F.png");
       } else {
-        shinyButtonElement = new Phaser.GameObjects.Sprite(globalScene, 0, 4, gamepadType, globalScene.inputController?.getIconForLatestInputRecorded(SettingKeyboard.Button_Cycle_Shiny));
-        formButtonElement = new Phaser.GameObjects.Sprite(globalScene, 0, 16, gamepadType, globalScene.inputController?.getIconForLatestInputRecorded(SettingKeyboard.Button_Cycle_Form));
+        shinyButtonElement = new Phaser.GameObjects.Sprite(
+          globalScene,
+          0,
+          4,
+          gamepadType,
+          globalScene.inputController?.getIconForLatestInputRecorded(SettingKeyboard.Button_Cycle_Shiny),
+        );
+        formButtonElement = new Phaser.GameObjects.Sprite(
+          globalScene,
+          0,
+          16,
+          gamepadType,
+          globalScene.inputController?.getIconForLatestInputRecorded(SettingKeyboard.Button_Cycle_Form),
+        );
       }
-      hallofFameInstructionContainer.add([ shinyButtonText, shinyButtonElement ]);
+      hallofFameInstructionContainer.add([shinyButtonText, shinyButtonElement]);
 
-      hallofFameInstructionContainer.add([ formButtonText, formButtonElement ]);
+      hallofFameInstructionContainer.add([formButtonText, formButtonElement]);
 
       hallofFameInstructionContainer.setPosition(12, 25);
       this.runResultContainer.add(hallofFameInstructionContainer);
@@ -229,18 +274,24 @@ export default class RunInfoUiHandler extends UiHandler {
     if (!this.isVictory) {
       const enemyContainer = globalScene.add.container(0, 0);
       // Wild - Single and Doubles
-      if (this.runInfo.battleType === BattleType.WILD || (this.runInfo.battleType === BattleType.MYSTERY_ENCOUNTER && !this.runInfo.trainer)) {
+      if (
+        this.runInfo.battleType === BattleType.WILD ||
+        (this.runInfo.battleType === BattleType.MYSTERY_ENCOUNTER && !this.runInfo.trainer)
+      ) {
         switch (this.runInfo.enemyParty.length) {
           case 1:
-          // Wild - Singles
+            // Wild - Singles
             this.parseWildSingleDefeat(enemyContainer);
             break;
           case 2:
-          //Wild - Doubles
+            //Wild - Doubles
             this.parseWildDoubleDefeat(enemyContainer);
             break;
         }
-      } else if (this.runInfo.battleType === BattleType.TRAINER || (this.runInfo.battleType === BattleType.MYSTERY_ENCOUNTER && this.runInfo.trainer)) {
+      } else if (
+        this.runInfo.battleType === BattleType.TRAINER ||
+        (this.runInfo.battleType === BattleType.MYSTERY_ENCOUNTER && this.runInfo.trainer)
+      ) {
         this.parseTrainerDefeat(enemyContainer);
       }
       this.runResultContainer.add(enemyContainer);
@@ -270,20 +321,30 @@ export default class RunInfoUiHandler extends UiHandler {
         const pokeball = globalScene.add.sprite(0, 0, "pb");
         pokeball.setFrame(getPokeballAtlasKey(p.pokeball));
         pokeball.setScale(0.5);
-        pokeball.setPosition(58 + ((i % row_limit) * 8), (i <= 2) ? 18 : 25);
+        pokeball.setPosition(58 + (i % row_limit) * 8, i <= 2 ? 18 : 25);
         enemyContainer.add(pokeball);
       });
       const trainerObj = this.runInfo.trainer.toTrainer();
       const RIVAL_TRAINER_ID_THRESHOLD = 375;
       let trainerName = "";
       if (this.runInfo.trainer.trainerType >= RIVAL_TRAINER_ID_THRESHOLD) {
-        trainerName = (trainerObj.variant === TrainerVariant.FEMALE) ? i18next.t("trainerNames:rival_female") : i18next.t("trainerNames:rival");
+        trainerName =
+          trainerObj.variant === TrainerVariant.FEMALE
+            ? i18next.t("trainerNames:rival_female")
+            : i18next.t("trainerNames:rival");
       } else {
         trainerName = trainerObj.getName(0, true);
       }
-      const boxString = i18next.t(trainerObj.variant !== TrainerVariant.DOUBLE ? "battle:trainerAppeared" : "battle:trainerAppearedDouble", { trainerName: trainerName }).replace(/\n/g, " ");
+      const boxString = i18next
+        .t(trainerObj.variant !== TrainerVariant.DOUBLE ? "battle:trainerAppeared" : "battle:trainerAppearedDouble", {
+          trainerName: trainerName,
+        })
+        .replace(/\n/g, " ");
       const descContainer = globalScene.add.container(0, 0);
-      const textBox = addTextObject(0, 0, boxString, TextStyle.WINDOW, { fontSize : "35px", wordWrap: { width: 200 }});
+      const textBox = addTextObject(0, 0, boxString, TextStyle.WINDOW, {
+        fontSize: "35px",
+        wordWrap: { width: 200 },
+      });
       descContainer.add(textBox);
       descContainer.setPosition(55, 32);
       this.runResultContainer.add(descContainer);
@@ -294,25 +355,43 @@ export default class RunInfoUiHandler extends UiHandler {
       const subSprite = globalScene.add.sprite(56, -106, "pkmn__sub");
       subSprite.setScale(0.65);
       subSprite.setPosition(34, 46);
-      const mysteryEncounterTitle = i18next.t(globalScene.getMysteryEncounter(this.runInfo.mysteryEncounterType as MysteryEncounterType, true).localizationKey + ":title");
+      const mysteryEncounterTitle = i18next.t(
+        globalScene.getMysteryEncounter(this.runInfo.mysteryEncounterType as MysteryEncounterType, true)
+          .localizationKey + ":title",
+      );
       const descContainer = globalScene.add.container(0, 0);
-      const textBox = addTextObject(0, 0, mysteryEncounterTitle, TextStyle.WINDOW, { fontSize : "45px", wordWrap: { width: 160 }});
+      const textBox = addTextObject(0, 0, mysteryEncounterTitle, TextStyle.WINDOW, {
+        fontSize: "45px",
+        wordWrap: { width: 160 },
+      });
       descContainer.add(textBox);
       descContainer.setPosition(47, 37);
-      this.runResultContainer.add([ encounterExclaim, subSprite, descContainer ]);
+      this.runResultContainer.add([encounterExclaim, subSprite, descContainer]);
     }
 
     const runResultWindow = this.runResultContainer.getByName("Run_Result_Window") as Phaser.GameObjects.Image;
     const windowCenterX = runResultWindow.getTopCenter().x;
     const windowBottomY = runResultWindow.getBottomCenter().y;
 
-    const runStatusText = addTextObject(windowCenterX, 5, `${i18next.t("saveSlotSelectUiHandler:wave")} ${this.runInfo.waveIndex}`, TextStyle.WINDOW, { fontSize : "60px", lineSpacing: 0.1 });
+    const runStatusText = addTextObject(
+      windowCenterX,
+      5,
+      `${i18next.t("saveSlotSelectUiHandler:wave")} ${this.runInfo.waveIndex}`,
+      TextStyle.WINDOW,
+      { fontSize: "60px", lineSpacing: 0.1 },
+    );
     runStatusText.setOrigin(0.5, 0);
 
-    const currentBiomeText = addTextObject(windowCenterX, windowBottomY - 5, `${getBiomeName(this.runInfo.arena.biome)}`, TextStyle.WINDOW, { fontSize: "60px" });
+    const currentBiomeText = addTextObject(
+      windowCenterX,
+      windowBottomY - 5,
+      `${getBiomeName(this.runInfo.arena.biome)}`,
+      TextStyle.WINDOW,
+      { fontSize: "60px" },
+    );
     currentBiomeText.setOrigin(0.5, 1);
 
-    this.runResultContainer.add([ runStatusText, currentBiomeText ]);
+    this.runResultContainer.add([runStatusText, currentBiomeText]);
     this.runContainer.add(this.runResultContainer);
   }
 
@@ -330,7 +409,13 @@ export default class RunInfoUiHandler extends UiHandler {
     const enemy = enemyData.toPokemon();
     const enemyIcon = globalScene.addPokemonIcon(enemy, 0, 0, 0, 0);
     const enemyLevelStyle = bossStatus ? TextStyle.PARTY_RED : TextStyle.PARTY;
-    const enemyLevel = addTextObject(36, 26, `${i18next.t("saveSlotSelectUiHandler:lv")}${Utils.formatLargeNumber(enemy.level, 1000)}`, enemyLevelStyle, { fontSize: "44px", color: "#f8f8f8" });
+    const enemyLevel = addTextObject(
+      36,
+      26,
+      `${i18next.t("saveSlotSelectUiHandler:lv")}${formatLargeNumber(enemy.level, 1000)}`,
+      enemyLevelStyle,
+      { fontSize: "44px", color: "#f8f8f8" },
+    );
     enemyLevel.setShadow(0, 0, undefined);
     enemyLevel.setStroke("#424242", 14);
     enemyLevel.setOrigin(1, 0);
@@ -354,7 +439,13 @@ export default class RunInfoUiHandler extends UiHandler {
       enemyData["player"] = true;
       const enemy = enemyData.toPokemon();
       const enemyIcon = globalScene.addPokemonIcon(enemy, 0, 0, 0, 0);
-      const enemyLevel = addTextObject(36, 26, `${i18next.t("saveSlotSelectUiHandler:lv")}${Utils.formatLargeNumber(enemy.level, 1000)}`, bossStatus ? TextStyle.PARTY_RED : TextStyle.PARTY, { fontSize: "44px", color: "#f8f8f8" });
+      const enemyLevel = addTextObject(
+        36,
+        26,
+        `${i18next.t("saveSlotSelectUiHandler:lv")}${formatLargeNumber(enemy.level, 1000)}`,
+        bossStatus ? TextStyle.PARTY_RED : TextStyle.PARTY,
+        { fontSize: "44px", color: "#f8f8f8" },
+      );
       enemyLevel.setShadow(0, 0, undefined);
       enemyLevel.setStroke("#424242", 14);
       enemyLevel.setOrigin(1, 0);
@@ -386,8 +477,8 @@ export default class RunInfoUiHandler extends UiHandler {
         const tObjPartnerSprite = globalScene.add.sprite(5, -3, tObjPartnerSpriteKey);
         // Double Trainers have smaller sprites than Single Trainers
         if (this.runDisplayMode === RunDisplayMode.RUN_HISTORY) {
-          tObjPartnerSprite.setScale(0.20);
-          tObjSprite.setScale(0.20);
+          tObjPartnerSprite.setScale(0.2);
+          tObjSprite.setScale(0.2);
           doubleContainer.add(tObjSprite);
           doubleContainer.add(tObjPartnerSprite);
           doubleContainer.setPosition(12, 38);
@@ -395,13 +486,13 @@ export default class RunInfoUiHandler extends UiHandler {
           tObjSprite.setScale(0.55);
           tObjSprite.setPosition(-9, -3);
           tObjPartnerSprite.setScale(0.55);
-          doubleContainer.add([ tObjSprite, tObjPartnerSprite ]);
+          doubleContainer.add([tObjSprite, tObjPartnerSprite]);
           doubleContainer.setPosition(28, 34);
         }
         enemyContainer.add(doubleContainer);
       } else {
-        const scale = (this.runDisplayMode === RunDisplayMode.RUN_HISTORY) ? 0.35 : 0.55;
-        const position = (this.runDisplayMode === RunDisplayMode.RUN_HISTORY) ? [ 12, 28 ] : [ 30, 32 ];
+        const scale = this.runDisplayMode === RunDisplayMode.RUN_HISTORY ? 0.35 : 0.55;
+        const position = this.runDisplayMode === RunDisplayMode.RUN_HISTORY ? [12, 28] : [30, 32];
         tObjSprite.setScale(scale, scale);
         tObjSprite.setPosition(position[0], position[1]);
         enemyContainer.add(tObjSprite);
@@ -420,17 +511,6 @@ export default class RunInfoUiHandler extends UiHandler {
   private parseTrainerDefeat(enemyContainer: Phaser.GameObjects.Container) {
     // Loads and adds trainer sprites to the UI
     this.showTrainerSprites(enemyContainer);
-    // Determining which Terastallize Modifier belongs to which Pokemon
-    // Creates a dictionary {PokemonId: TeraShardType}
-    const teraPokemon = {};
-    this.runInfo.enemyModifiers.forEach((m) => {
-      const modifier = m.toModifier(this.modifiersModule[m.className]);
-      if (modifier instanceof Modifier.TerastallizeModifier) {
-        const teraDetails = modifier?.getArgs();
-        const pkmnId = teraDetails[0];
-        teraPokemon[pkmnId] = teraDetails[1];
-      }
-    });
 
     // Creates the Pokemon icons + level information and adds it to enemyContainer
     // 2 Rows x 3 Columns
@@ -444,20 +524,14 @@ export default class RunInfoUiHandler extends UiHandler {
       enemyData["player"] = true;
       const enemy = enemyData.toPokemon();
       const enemyIcon = globalScene.addPokemonIcon(enemy, 0, 0, 0, 0);
-      // Applying Terastallizing Type tint to Pokemon icon
-      // If the Pokemon is a fusion, it has two sprites and so, the tint has to be applied to each icon separately
-      const enemySprite1 = enemyIcon.list[0] as Phaser.GameObjects.Sprite;
-      const enemySprite2 = (enemyIcon.list.length > 1) ? enemyIcon.list[1] as Phaser.GameObjects.Sprite : undefined;
-      if (teraPokemon[enemyData.id]) {
-        const teraTint = getTypeRgb(teraPokemon[enemyData.id]);
-        const teraColor = new Phaser.Display.Color(teraTint[0], teraTint[1], teraTint[2]);
-        enemySprite1.setTint(teraColor.color);
-        if (enemySprite2) {
-          enemySprite2.setTint(teraColor.color);
-        }
-      }
-      enemyIcon.setPosition(39 * (e % 3) + 5, (35 * pokemonRowHeight));
-      const enemyLevel = addTextObject(43 * (e % 3), (27 * (pokemonRowHeight + 1)), `${i18next.t("saveSlotSelectUiHandler:lv")}${Utils.formatLargeNumber(enemy.level, 1000)}`, isBoss ? TextStyle.PARTY_RED : TextStyle.PARTY, { fontSize: "54px" });
+      enemyIcon.setPosition(39 * (e % 3) + 5, 35 * pokemonRowHeight);
+      const enemyLevel = addTextObject(
+        43 * (e % 3),
+        27 * (pokemonRowHeight + 1),
+        `${i18next.t("saveSlotSelectUiHandler:lv")}${formatLargeNumber(enemy.level, 1000)}`,
+        isBoss ? TextStyle.PARTY_RED : TextStyle.PARTY,
+        { fontSize: "54px" },
+      );
       enemyLevel.setShadow(0, 0, undefined);
       enemyLevel.setStroke("#424242", 14);
       enemyLevel.setOrigin(0, 0);
@@ -480,7 +554,10 @@ export default class RunInfoUiHandler extends UiHandler {
   private async parseRunInfo(windowX: number, windowY: number) {
     // Parsing and displaying the mode.
     // In the future, parsing Challenges + Challenge Rules may have to be reworked as PokeRogue adds additional challenges and users can stack these challenges in various ways.
-    const modeText = addBBCodeTextObject(7, 0, "", TextStyle.WINDOW, { fontSize : "50px", lineSpacing:3 });
+    const modeText = addBBCodeTextObject(7, 0, "", TextStyle.WINDOW, {
+      fontSize: "50px",
+      lineSpacing: 3,
+    });
     modeText.setPosition(7, 5);
     modeText.appendText(i18next.t("runHistory:mode") + ": ", false);
     switch (this.runInfo.gameMode) {
@@ -514,7 +591,10 @@ export default class RunInfoUiHandler extends UiHandler {
     }
 
     // If the player achieves a personal best in Endless, the mode text will be tinted similarly to SSS luck to celebrate their achievement.
-    if ((this.runInfo.gameMode === GameModes.ENDLESS || this.runInfo.gameMode === GameModes.SPLICED_ENDLESS) && this.runInfo.waveIndex === globalScene.gameData.gameStats.highestEndlessWave) {
+    if (
+      (this.runInfo.gameMode === GameModes.ENDLESS || this.runInfo.gameMode === GameModes.SPLICED_ENDLESS) &&
+      this.runInfo.waveIndex === globalScene.gameData.gameStats.highestEndlessWave
+    ) {
       modeText.appendText(` [${i18next.t("runHistory:personalBest")}]`);
       modeText.setTint(0xffef5c, 0x47ff69, 0x6b6bff, 0xff6969);
     }
@@ -522,22 +602,35 @@ export default class RunInfoUiHandler extends UiHandler {
     // Duration + Money
     const runInfoTextContainer = globalScene.add.container(0, 0);
     // Japanese is set to a greater line spacing of 35px in addBBCodeTextObject() if lineSpacing < 12.
-    const lineSpacing = (i18next.resolvedLanguage === "ja") ? 12 : 3;
-    const runInfoText = addBBCodeTextObject(7, 0, "", TextStyle.WINDOW, { fontSize: "50px", lineSpacing: lineSpacing });
-    const runTime = Utils.getPlayTimeString(this.runInfo.playTime);
+    const lineSpacing = i18next.resolvedLanguage === "ja" ? 12 : 3;
+    const runInfoText = addBBCodeTextObject(7, 0, "", TextStyle.WINDOW, {
+      fontSize: "50px",
+      lineSpacing: lineSpacing,
+    });
+    const runTime = getPlayTimeString(this.runInfo.playTime);
     runInfoText.appendText(`${i18next.t("runHistory:runLength")}: ${runTime}`, false);
-    const runMoney = Utils.formatMoney(globalScene.moneyFormat, this.runInfo.money);
+    const runMoney = formatMoney(globalScene.moneyFormat, this.runInfo.money);
     const moneyTextColor = getTextColor(TextStyle.MONEY_WINDOW, false, globalScene.uiTheme);
-    runInfoText.appendText(`[color=${moneyTextColor}]${i18next.t("battleScene:moneyOwned", { formattedMoney : runMoney })}[/color]`);
+    runInfoText.appendText(
+      `[color=${moneyTextColor}]${i18next.t("battleScene:moneyOwned", { formattedMoney: runMoney })}[/color]`,
+    );
     runInfoText.setPosition(7, 70);
     runInfoTextContainer.add(runInfoText);
     // Luck
     // Uses the parameters windowX and windowY to dynamically position the luck value neatly into the bottom right corner
-    const luckText = addBBCodeTextObject(0, 0, "", TextStyle.WINDOW, { fontSize: "55px" });
-    const luckValue = Phaser.Math.Clamp(this.runInfo.party.map(p => p.toPokemon().getLuck()).reduce((total: number, value: number) => total += value, 0), 0, 14);
+    const luckText = addBBCodeTextObject(0, 0, "", TextStyle.WINDOW, {
+      fontSize: "55px",
+    });
+    const luckValue = Phaser.Math.Clamp(
+      this.runInfo.party
+        .map(p => p.toPokemon().getLuck())
+        .reduce((total: number, value: number) => (total += value), 0),
+      0,
+      14,
+    );
     let luckInfo = i18next.t("runHistory:luck") + ": " + getLuckString(luckValue);
     if (luckValue < 14) {
-      luckInfo = "[color=#" + (getLuckTextTint(luckValue)).toString(16) + "]" + luckInfo + "[/color]";
+      luckInfo = "[color=#" + getLuckTextTint(luckValue).toString(16) + "]" + luckInfo + "[/color]";
     } else {
       luckText.setTint(0xffef5c, 0x47ff69, 0x6b6bff, 0xff6969);
     }
@@ -550,7 +643,10 @@ export default class RunInfoUiHandler extends UiHandler {
     if (this.runInfo.modifiers.length) {
       let visibleModifierIndex = 0;
 
-      const modifierIconsContainer = globalScene.add.container(8, (this.runInfo.gameMode === GameModes.CHALLENGE) ? 20 : 15);
+      const modifierIconsContainer = globalScene.add.container(
+        8,
+        this.runInfo.gameMode === GameModes.CHALLENGE ? 20 : 15,
+      );
       modifierIconsContainer.setScale(0.45);
       for (const m of this.runInfo.modifiers) {
         const modifier = m.toModifier(this.modifiersModule[m.className]);
@@ -560,7 +656,7 @@ export default class RunInfoUiHandler extends UiHandler {
         const icon = modifier?.getIcon(false);
         if (icon) {
           const rowHeightModifier = Math.floor(visibleModifierIndex / 7);
-          icon.setPosition(24 * (visibleModifierIndex % 7), 20 + (35 * rowHeightModifier));
+          icon.setPosition(24 * (visibleModifierIndex % 7), 20 + 35 * rowHeightModifier);
           modifierIconsContainer.add(icon);
         }
 
@@ -592,17 +688,21 @@ export default class RunInfoUiHandler extends UiHandler {
             rules.push(i18next.t(`runHistory:challengeMonoGen${this.runInfo.challenges[i].value}`));
             break;
           case Challenges.SINGLE_TYPE:
-            const typeRule = Type[this.runInfo.challenges[i].value - 1];
+            const typeRule = PokemonType[this.runInfo.challenges[i].value - 1];
             const typeTextColor = `[color=${TypeColor[typeRule]}]`;
             const typeShadowColor = `[shadow=${TypeShadow[typeRule]}]`;
-            const typeText = typeTextColor + typeShadowColor + i18next.t(`pokemonInfo:Type.${typeRule}`)! + "[/color]" + "[/shadow]";
+            const typeText =
+              typeTextColor + typeShadowColor + i18next.t(`pokemonInfo:Type.${typeRule}`)! + "[/color]" + "[/shadow]";
             rules.push(typeText);
             break;
           case Challenges.INVERSE_BATTLE:
             rules.push(i18next.t("challenges:inverseBattle.shortName"));
             break;
           default:
-            const localisationKey = Challenges[this.runInfo.challenges[i].id].split("_").map((f, i) => i ? `${f[0]}${f.slice(1).toLowerCase()}` : f.toLowerCase()).join("");
+            const localisationKey = Challenges[this.runInfo.challenges[i].id]
+              .split("_")
+              .map((f, i) => (i ? `${f[0]}${f.slice(1).toLowerCase()}` : f.toLowerCase()))
+              .join("");
             rules.push(i18next.t(`challenges:${localisationKey}.name`));
             break;
         }
@@ -616,22 +716,22 @@ export default class RunInfoUiHandler extends UiHandler {
    * Default Information: Icon, Level, Nature, Ability, Passive, Shiny Status, Fusion Status, Stats, and Moves.
    * B-Side Information: Icon + Held Items (Can be displayed to the user through pressing the abilityButton)
    */
- 	private parsePartyInfo(): void {
+  private parsePartyInfo(): void {
     const party = this.runInfo.party;
     const currentLanguage = i18next.resolvedLanguage ?? "en";
- 		const windowHeight = ((globalScene.game.canvas.height / 6) - 23) / 6;
+    const windowHeight = (globalScene.game.canvas.height / 6 - 23) / 6;
 
- 		party.forEach((p: PokemonData, i: number) => {
-      const pokemonInfoWindow = new RoundRectangle(globalScene, 0, 14, (this.statsBgWidth * 2) + 10, windowHeight - 2, 3);
+    party.forEach((p: PokemonData, i: number) => {
+      const pokemonInfoWindow = new RoundRectangle(globalScene, 0, 14, this.statsBgWidth * 2 + 10, windowHeight - 2, 3);
 
- 			const pokemon = p.toPokemon();
- 			const pokemonInfoContainer = globalScene.add.container(this.statsBgWidth + 5, (windowHeight - 0.5) * i);
+      const pokemon = p.toPokemon();
+      const pokemonInfoContainer = globalScene.add.container(this.statsBgWidth + 5, (windowHeight - 0.5) * i);
 
- 			const types = pokemon.getTypes();
- 			const type1 = getTypeRgb(types[0]);
- 			const type1Color = new Phaser.Display.Color(type1[0], type1[1], type1[2]);
+      const types = pokemon.getTypes();
+      const type1 = getTypeRgb(types[0]);
+      const type1Color = new Phaser.Display.Color(type1[0], type1[1], type1[2]);
 
- 			const bgColor = type1Color.clone().darken(45);
+      const bgColor = type1Color.clone().darken(45);
       pokemonInfoWindow.setFillStyle(bgColor.color);
 
       const iconContainer = globalScene.add.container(0, 0);
@@ -640,7 +740,9 @@ export default class RunInfoUiHandler extends UiHandler {
       icon.setPosition(-99, 1);
       const type2 = types[1] ? getTypeRgb(types[1]) : undefined;
       const type2Color = type2 ? new Phaser.Display.Color(type2[0], type2[1], type2[2]) : undefined;
-      type2Color ? pokemonInfoWindow.setStrokeStyle(1, type2Color.color, 0.95) : pokemonInfoWindow.setStrokeStyle(1, type1Color.color, 0.95);
+      type2Color
+        ? pokemonInfoWindow.setStrokeStyle(1, type2Color.color, 0.95)
+        : pokemonInfoWindow.setStrokeStyle(1, type1Color.color, 0.95);
 
       this.getUi().bringToTop(icon);
 
@@ -653,7 +755,7 @@ export default class RunInfoUiHandler extends UiHandler {
       const pName = pokemon.getNameToRender();
       //With the exception of Korean/Traditional Chinese/Simplified Chinese, the code shortens the terms for ability and passive to their first letter.
       //These languages are exempted because they are already short enough.
-      const exemptedLanguages = [ "ko", "zh_CN", "zh_TW" ];
+      const exemptedLanguages = ["ko", "zh_CN", "zh_TW"];
       let passiveLabel = i18next.t("starterSelectUiHandler:passive") ?? "-";
       let abilityLabel = i18next.t("starterSelectUiHandler:ability") ?? "-";
       if (!exemptedLanguages.includes(currentLanguage)) {
@@ -663,9 +765,14 @@ export default class RunInfoUiHandler extends UiHandler {
       const pPassiveInfo = pokemon.passive ? passiveLabel + ": " + pokemon.getPassiveAbility().name : "";
       const pAbilityInfo = abilityLabel + ": " + pokemon.getAbility().name;
       // Japanese is set to a greater line spacing of 35px in addBBCodeTextObject() if lineSpacing < 12.
-      const lineSpacing = (i18next.resolvedLanguage === "ja") ? 12 : 3;
-      const pokeInfoText = addBBCodeTextObject(0, 0, pName, TextStyle.SUMMARY, { fontSize: textContainerFontSize, lineSpacing: lineSpacing });
-      pokeInfoText.appendText(`${i18next.t("saveSlotSelectUiHandler:lv")}${Utils.formatFancyLargeNumber(pokemon.level, 1)} - ${pNatureName}`);
+      const lineSpacing = i18next.resolvedLanguage === "ja" ? 12 : 3;
+      const pokeInfoText = addBBCodeTextObject(0, 0, pName, TextStyle.SUMMARY, {
+        fontSize: textContainerFontSize,
+        lineSpacing: lineSpacing,
+      });
+      pokeInfoText.appendText(
+        `${i18next.t("saveSlotSelectUiHandler:lv")}${formatFancyLargeNumber(pokemon.level, 1)} - ${pNatureName}`,
+      );
       pokeInfoText.appendText(pAbilityInfo);
       pokeInfoText.appendText(pPassiveInfo);
       pokeInfoTextContainer.add(pokeInfoText);
@@ -673,27 +780,36 @@ export default class RunInfoUiHandler extends UiHandler {
       // Pokemon Stats
       // Colored Arrows (Red/Blue) are placed by stats that are boosted from natures
       const pokeStatTextContainer = globalScene.add.container(-35, 6);
-      const pStats : string[] = [];
-      pokemon.stats.forEach((element) => pStats.push(Utils.formatFancyLargeNumber(element, 1)));
+      const pStats: string[] = [];
+      pokemon.stats.forEach(element => pStats.push(formatFancyLargeNumber(element, 1)));
       for (let i = 0; i < pStats.length; i++) {
         const isMult = getNatureStatMultiplier(pNature, i);
-        pStats[i] = (isMult < 1) ? pStats[i] + "[color=#40c8f8]↓[/color]" : pStats[i];
-        pStats[i] = (isMult > 1) ? pStats[i] + "[color=#f89890]↑[/color]" : pStats[i];
+        pStats[i] = isMult < 1 ? pStats[i] + "[color=#40c8f8]↓[/color]" : pStats[i];
+        pStats[i] = isMult > 1 ? pStats[i] + "[color=#f89890]↑[/color]" : pStats[i];
       }
       const hp = i18next.t("pokemonInfo:Stat.HPshortened") + ": " + pStats[0];
       const atk = i18next.t("pokemonInfo:Stat.ATKshortened") + ": " + pStats[1];
       const def = i18next.t("pokemonInfo:Stat.DEFshortened") + ": " + pStats[2];
       const spatk = i18next.t("pokemonInfo:Stat.SPATKshortened") + ": " + pStats[3];
       const spdef = i18next.t("pokemonInfo:Stat.SPDEFshortened") + ": " + pStats[4];
-      const speedLabel = (currentLanguage === "es-ES" || currentLanguage === "pt_BR") ? i18next.t("runHistory:SPDshortened") : i18next.t("pokemonInfo:Stat.SPDshortened");
+      const speedLabel =
+        currentLanguage === "es-ES" || currentLanguage === "pt_BR"
+          ? i18next.t("runHistory:SPDshortened")
+          : i18next.t("pokemonInfo:Stat.SPDshortened");
       const speed = speedLabel + ": " + pStats[5];
       // Column 1: HP Atk Def
-      const pokeStatText1 = addBBCodeTextObject(-5, 0, hp, TextStyle.SUMMARY, { fontSize: textContainerFontSize, lineSpacing: lineSpacing });
+      const pokeStatText1 = addBBCodeTextObject(-5, 0, hp, TextStyle.SUMMARY, {
+        fontSize: textContainerFontSize,
+        lineSpacing: lineSpacing,
+      });
       pokeStatText1.appendText(atk);
       pokeStatText1.appendText(def);
       pokeStatTextContainer.add(pokeStatText1);
       // Column 2: SpAtk SpDef Speed
-      const pokeStatText2 = addBBCodeTextObject(25, 0, spatk, TextStyle.SUMMARY, { fontSize: textContainerFontSize, lineSpacing: lineSpacing });
+      const pokeStatText2 = addBBCodeTextObject(25, 0, spatk, TextStyle.SUMMARY, {
+        fontSize: textContainerFontSize,
+        lineSpacing: lineSpacing,
+      });
       pokeStatText2.appendText(spdef);
       pokeStatText2.appendText(speed);
       pokeStatTextContainer.add(pokeStatText2);
@@ -704,7 +820,9 @@ export default class RunInfoUiHandler extends UiHandler {
         const splicedIcon = globalScene.add.image(0, 0, "icon_spliced");
         splicedIcon.setScale(0.35);
         splicedIcon.setOrigin(0, 0);
-        pokemon.isShiny() ? splicedIcon.setPositionRelative(pokeInfoTextContainer, 35, 0) : splicedIcon.setPositionRelative(pokeInfoTextContainer, 28, 0);
+        pokemon.isShiny()
+          ? splicedIcon.setPositionRelative(pokeInfoTextContainer, 35, 0)
+          : splicedIcon.setPositionRelative(pokeInfoTextContainer, 28, 0);
         marksContainer.add(splicedIcon);
         this.getUi().bringToTop(splicedIcon);
       }
@@ -732,32 +850,38 @@ export default class RunInfoUiHandler extends UiHandler {
       // Need to check if dynamically typed moves
       const pokemonMoveset = pokemon.getMoveset();
       const movesetContainer = globalScene.add.container(70, -29);
-      const pokemonMoveBgs : Phaser.GameObjects.NineSlice[] = [];
-      const pokemonMoveLabels : Phaser.GameObjects.Text[] = [];
-      const movePos = [[ -6.5, 35.5 ], [ 37, 35.5 ], [ -6.5, 43.5 ], [ 37, 43.5 ]];
+      const pokemonMoveBgs: Phaser.GameObjects.NineSlice[] = [];
+      const pokemonMoveLabels: Phaser.GameObjects.Text[] = [];
+      const movePos = [
+        [-6.5, 35.5],
+        [37, 35.5],
+        [-6.5, 43.5],
+        [37, 43.5],
+      ];
       for (let m = 0; m < pokemonMoveset?.length; m++) {
-      	const moveContainer = globalScene.add.container(movePos[m][0], movePos[m][1]);
+        const moveContainer = globalScene.add.container(movePos[m][0], movePos[m][1]);
         moveContainer.setScale(0.5);
-      	const moveBg = globalScene.add.nineslice(0, 0, "type_bgs", "unknown", 85, 15, 2, 2, 2, 2);
-      	moveBg.setOrigin(1, 0);
-      	const moveLabel = addTextObject(-moveBg.width / 2, 2, "-", TextStyle.PARTY);
-      	moveLabel.setOrigin(0.5, 0);
-      	moveLabel.setName("text-move-label");
-      	pokemonMoveBgs.push(moveBg);
-      	pokemonMoveLabels.push(moveLabel);
-      	moveContainer.add(moveBg);
-      	moveContainer.add(moveLabel);
-      	movesetContainer.add(moveContainer);
-      	const move = pokemonMoveset[m]?.getMove();
-        pokemonMoveBgs[m].setFrame(Type[move ? move.type : Type.UNKNOWN].toString().toLowerCase());
+        const moveBg = globalScene.add.nineslice(0, 0, "type_bgs", "unknown", 85, 15, 2, 2, 2, 2);
+        moveBg.setOrigin(1, 0);
+        const moveLabel = addTextObject(-moveBg.width / 2, 2, "-", TextStyle.PARTY);
+        moveLabel.setOrigin(0.5, 0);
+        moveLabel.setName("text-move-label");
+        pokemonMoveBgs.push(moveBg);
+        pokemonMoveLabels.push(moveLabel);
+        moveContainer.add(moveBg);
+        moveContainer.add(moveLabel);
+        movesetContainer.add(moveContainer);
+        const move = pokemonMoveset[m]?.getMove();
+        pokemonMoveBgs[m].setFrame(PokemonType[move ? move.type : PokemonType.UNKNOWN].toString().toLowerCase());
         pokemonMoveLabels[m].setText(move ? move.name : "-");
-    	}
+      }
 
       // Pokemon Held Items - not displayed by default
       // Endless/Endless Spliced have a different scale because Pokemon tend to accumulate more items in these runs.
-      const heldItemsScale = (this.runInfo.gameMode === GameModes.SPLICED_ENDLESS || this.runInfo.gameMode === GameModes.ENDLESS) ? 0.25 : 0.5;
+      const heldItemsScale =
+        this.runInfo.gameMode === GameModes.SPLICED_ENDLESS || this.runInfo.gameMode === GameModes.ENDLESS ? 0.25 : 0.5;
       const heldItemsContainer = globalScene.add.container(-82, 2);
-      const heldItemsList : Modifier.PokemonHeldItemModifier[] = [];
+      const heldItemsList: Modifier.PokemonHeldItemModifier[] = [];
       if (this.runInfo.modifiers.length) {
         for (const m of this.runInfo.modifiers) {
           const modifier = m.toModifier(this.modifiersModule[m.className]);
@@ -769,14 +893,17 @@ export default class RunInfoUiHandler extends UiHandler {
         if (heldItemsList.length > 0) {
           (heldItemsList as Modifier.PokemonHeldItemModifier[]).sort(Modifier.modifierSortFunc);
           let row = 0;
-          for (const [ index, item ] of heldItemsList.entries()) {
-            if ( index > 36 ) {
+          for (const [index, item] of heldItemsList.entries()) {
+            if (index > 36) {
               const overflowIcon = addTextObject(182, 4, "+", TextStyle.WINDOW);
               heldItemsContainer.add(overflowIcon);
               break;
             }
             const itemIcon = item?.getIcon(true);
-            if (item?.stackCount < item?.getMaxHeldItemCount(pokemon) && itemIcon.list[1] instanceof Phaser.GameObjects.BitmapText) {
+            if (
+              item?.stackCount < item?.getMaxHeldItemCount(pokemon) &&
+              itemIcon.list[1] instanceof Phaser.GameObjects.BitmapText
+            ) {
               itemIcon.list[1].clearTint();
             }
             itemIcon.setScale(heldItemsScale);
@@ -807,9 +934,9 @@ export default class RunInfoUiHandler extends UiHandler {
       pokemonInfoContainer.setName("PkmnInfo");
       this.partyContainer.add(pokemonInfoContainer);
       pokemon.destroy();
- 		});
+    });
     this.runContainer.add(this.partyContainer);
- 	}
+  }
 
   /**
    * Changes what is displayed of the Pokemon's held items
@@ -839,7 +966,13 @@ export default class RunInfoUiHandler extends UiHandler {
     const endCard = globalScene.add.image(0, 0, `end_${isFemale ? "f" : "m"}`);
     endCard.setOrigin(0);
     endCard.setScale(0.5);
-    const text = addTextObject(globalScene.game.canvas.width / 12, (globalScene.game.canvas.height / 6) - 16, i18next.t("battle:congratulations"), TextStyle.SUMMARY, { fontSize: "128px" });
+    const text = addTextObject(
+      globalScene.game.canvas.width / 12,
+      globalScene.game.canvas.height / 6 - 16,
+      i18next.t("battle:congratulations"),
+      TextStyle.SUMMARY,
+      { fontSize: "128px" },
+    );
     text.setOrigin(0.5);
     this.endCardContainer.add(endCard);
     this.endCardContainer.add(text);
@@ -870,8 +1003,13 @@ export default class RunInfoUiHandler extends UiHandler {
     this.hallofFameContainer.add(endCard);
     this.hallofFameContainer.add(hallofFameBg);
 
-    const hallofFameText = addTextObject(0, 0, i18next.t("runHistory:hallofFameText", { context: genderStr }), TextStyle.WINDOW);
-    hallofFameText.setPosition(endCardCoords.x - (hallofFameText.displayWidth / 2), 164);
+    const hallofFameText = addTextObject(
+      0,
+      0,
+      i18next.t("runHistory:hallofFameText", { context: genderStr }),
+      TextStyle.WINDOW,
+    );
+    hallofFameText.setPosition(endCardCoords.x - hallofFameText.displayWidth / 2, 164);
     this.hallofFameContainer.add(hallofFameText);
     this.runInfo.party.forEach((p, i) => {
       const pkmn = p.toPokemon();
@@ -881,8 +1019,11 @@ export default class RunInfoUiHandler extends UiHandler {
       const formIndex = pkmn.formIndex;
       const variant = pkmn.variant;
       const species = pkmn.getSpeciesForm();
-      const pokemonSprite: Phaser.GameObjects.Sprite = globalScene.add.sprite(60 + 40 * i, 40 + row  * 80, "pkmn__sub");
-      pokemonSprite.setPipeline(globalScene.spritePipeline, { tone: [ 0.0, 0.0, 0.0, 0.0 ], ignoreTimeTint: true });
+      const pokemonSprite: Phaser.GameObjects.Sprite = globalScene.add.sprite(60 + 40 * i, 40 + row * 80, "pkmn__sub");
+      pokemonSprite.setPipeline(globalScene.spritePipeline, {
+        tone: [0.0, 0.0, 0.0, 0.0],
+        ignoreTimeTint: true,
+      });
       this.hallofFameContainer.add(pokemonSprite);
       const speciesLoaded: Map<Species, boolean> = new Map<Species, boolean>();
       speciesLoaded.set(id, false);
@@ -897,7 +1038,7 @@ export default class RunInfoUiHandler extends UiHandler {
         pokemonSprite.setVisible(true);
       });
       if (pkmn.isFusion()) {
-        const fusionIcon = globalScene.add.sprite(80 + 40 * i, 50 + row  * 80, pkmn.getFusionIconAtlasKey());
+        const fusionIcon = globalScene.add.sprite(80 + 40 * i, 50 + row * 80, pkmn.getFusionIconAtlasKey());
         fusionIcon.setName("sprite-fusion-icon");
         fusionIcon.setOrigin(0.5, 0);
         fusionIcon.setFrame(pkmn.getFusionIconId(true));
@@ -912,10 +1053,10 @@ export default class RunInfoUiHandler extends UiHandler {
   /**
    * Takes input from the user to perform a desired action.
    * @param button - Button object to be processed
-   * Button.CANCEL - removes all containers related to RunInfo and returns the user to Run History
+   * Button.CANCEL, Button.LEFT - removes all containers related to RunInfo and returns the user to Run History
    * Button.CYCLE_FORM, Button.CYCLE_SHINY, Button.CYCLE_ABILITY - runs the function buttonCycleOption()
    */
- 	override processInput(button: Button): boolean {
+  override processInput(button: Button): boolean {
     const ui = this.getUi();
 
     let success = false;
@@ -923,6 +1064,7 @@ export default class RunInfoUiHandler extends UiHandler {
 
     switch (button) {
       case Button.CANCEL:
+      case Button.LEFT:
         success = true;
         if (this.pageMode === RunInfoUiMode.MAIN) {
           this.runInfoContainer.removeAll(true);
@@ -1008,4 +1150,3 @@ export default class RunInfoUiHandler extends UiHandler {
     }
   }
 }
-
diff --git a/src/ui/save-slot-select-ui-handler.ts b/src/ui/save-slot-select-ui-handler.ts
index e746c9302d0..7b4d46203c9 100644
--- a/src/ui/save-slot-select-ui-handler.ts
+++ b/src/ui/save-slot-select-ui-handler.ts
@@ -2,13 +2,14 @@ import i18next from "i18next";
 import { globalScene } from "#app/global-scene";
 import { Button } from "#enums/buttons";
 import { GameMode } from "../game-mode";
-import * as Modifier from "../modifier/modifier";
+// biome-ignore lint/style/noNamespaceImport: See `src/system/game-data.ts`
+import * as Modifier from "#app/modifier/modifier";
 import type { SessionSaveData } from "../system/game-data";
 import type PokemonData from "../system/pokemon-data";
-import * as Utils from "../utils";
+import { isNullOrUndefined, fixedInt, getPlayTimeString, formatLargeNumber } from "#app/utils/common";
 import MessageUiHandler from "./message-ui-handler";
 import { TextStyle, addTextObject } from "./text";
-import { Mode } from "./ui";
+import { UiMode } from "#enums/ui-mode";
 import { addWindow } from "./ui-theme";
 import { RunDisplayMode } from "#app/ui/run-info-ui-handler";
 
@@ -17,13 +18,12 @@ const SLOTS_ON_SCREEN = 3;
 
 export enum SaveSlotUiMode {
   LOAD,
-  SAVE
+  SAVE,
 }
 
 export type SaveSlotSelectCallback = (cursor: number) => void;
 
 export default class SaveSlotSelectUiHandler extends MessageUiHandler {
-
   private saveSlotSelectContainer: Phaser.GameObjects.Container;
   private sessionSlotsContainer: Phaser.GameObjects.Container;
   private saveSlotSelectMessageBox: Phaser.GameObjects.NineSlice;
@@ -33,14 +33,14 @@ export default class SaveSlotSelectUiHandler extends MessageUiHandler {
   private uiMode: SaveSlotUiMode;
   private saveSlotSelectCallback: SaveSlotSelectCallback | null;
 
-  private scrollCursor: number = 0;
+  private scrollCursor = 0;
 
   private cursorObj: Phaser.GameObjects.Container | null;
 
   private sessionSlotsContainerInitialY: number;
 
   constructor() {
-    super(Mode.SAVE_SLOT);
+    super(UiMode.SAVE_SLOT);
   }
 
   setup() {
@@ -50,7 +50,13 @@ export default class SaveSlotSelectUiHandler extends MessageUiHandler {
     this.saveSlotSelectContainer.setVisible(false);
     ui.add(this.saveSlotSelectContainer);
 
-    const loadSessionBg = globalScene.add.rectangle(0, 0, globalScene.game.canvas.width / 6, -globalScene.game.canvas.height / 6, 0x006860);
+    const loadSessionBg = globalScene.add.rectangle(
+      0,
+      0,
+      globalScene.game.canvas.width / 6,
+      -globalScene.game.canvas.height / 6,
+      0x006860,
+    );
     loadSessionBg.setOrigin(0, 0);
     this.saveSlotSelectContainer.add(loadSessionBg);
 
@@ -75,7 +81,7 @@ export default class SaveSlotSelectUiHandler extends MessageUiHandler {
   }
 
   show(args: any[]): boolean {
-    if ((args.length < 2 || !(args[1] instanceof Function))) {
+    if (args.length < 2 || !(args[1] instanceof Function)) {
       return false;
     }
 
@@ -108,31 +114,39 @@ export default class SaveSlotSelectUiHandler extends MessageUiHandler {
           switch (this.uiMode) {
             case SaveSlotUiMode.LOAD:
               this.saveSlotSelectCallback = null;
-              originalCallback && originalCallback(cursor);
+              originalCallback?.(cursor);
               break;
-            case SaveSlotUiMode.SAVE:
+            case SaveSlotUiMode.SAVE: {
               const saveAndCallback = () => {
                 const originalCallback = this.saveSlotSelectCallback;
                 this.saveSlotSelectCallback = null;
                 ui.revertMode();
                 ui.showText("", 0);
-                ui.setMode(Mode.MESSAGE);
-                originalCallback && originalCallback(cursor);
+                ui.setMode(UiMode.MESSAGE);
+                originalCallback?.(cursor);
               };
               if (this.sessionSlots[cursor].hasData) {
                 ui.showText(i18next.t("saveSlotSelectUiHandler:overwriteData"), null, () => {
-                  ui.setOverlayMode(Mode.CONFIRM, () => {
-                    globalScene.gameData.deleteSession(cursor).then(response => {
-                      if (response === false) {
-                        globalScene.reset(true);
-                      } else {
-                        saveAndCallback();
-                      }
-                    });
-                  }, () => {
-                    ui.revertMode();
-                    ui.showText("", 0);
-                  }, false, 0, 19, import.meta.env.DEV ? 300 : 2000);
+                  ui.setOverlayMode(
+                    UiMode.CONFIRM,
+                    () => {
+                      globalScene.gameData.deleteSession(cursor).then(response => {
+                        if (response === false) {
+                          globalScene.reset(true);
+                        } else {
+                          saveAndCallback();
+                        }
+                      });
+                    },
+                    () => {
+                      ui.revertMode();
+                      ui.showText("", 0);
+                    },
+                    false,
+                    0,
+                    19,
+                    import.meta.env.DEV ? 300 : 2000,
+                  );
                 });
               } else if (this.sessionSlots[cursor].hasData === false) {
                 saveAndCallback();
@@ -140,12 +154,13 @@ export default class SaveSlotSelectUiHandler extends MessageUiHandler {
                 return false;
               }
               break;
+            }
           }
           success = true;
         }
       } else {
         this.saveSlotSelectCallback = null;
-        originalCallback && originalCallback(-1);
+        originalCallback?.(-1);
         success = true;
       }
     } else {
@@ -153,11 +168,11 @@ export default class SaveSlotSelectUiHandler extends MessageUiHandler {
       switch (button) {
         case Button.UP:
           if (this.cursor) {
-          // Check to prevent cursor from accessing a negative index
-            success = (this.cursor === 0) ? this.setCursor(this.cursor) : this.setCursor(this.cursor - 1, cursorPosition);
+            // Check to prevent cursor from accessing a negative index
+            success = this.cursor === 0 ? this.setCursor(this.cursor) : this.setCursor(this.cursor - 1, cursorPosition);
           } else if (this.scrollCursor) {
             success = this.setScrollCursor(this.scrollCursor - 1, cursorPosition);
-          } else if ((this.cursor === 0) && (this.scrollCursor === 0)) {
+          } else if (this.cursor === 0 && this.scrollCursor === 0) {
             this.setScrollCursor(SESSION_SLOTS_COUNT - SLOTS_ON_SCREEN);
             // Revert to avoid an extra session slot sticking out
             this.revertSessionSlot(SESSION_SLOTS_COUNT - SLOTS_ON_SCREEN);
@@ -166,11 +181,14 @@ export default class SaveSlotSelectUiHandler extends MessageUiHandler {
           }
           break;
         case Button.DOWN:
-          if (this.cursor < (SLOTS_ON_SCREEN - 1)) {
+          if (this.cursor < SLOTS_ON_SCREEN - 1) {
             success = this.setCursor(this.cursor + 1, cursorPosition);
           } else if (this.scrollCursor < SESSION_SLOTS_COUNT - SLOTS_ON_SCREEN) {
             success = this.setScrollCursor(this.scrollCursor + 1, cursorPosition);
-          } else if ((this.cursor === SLOTS_ON_SCREEN - 1) && (this.scrollCursor === SESSION_SLOTS_COUNT - SLOTS_ON_SCREEN)) {
+          } else if (
+            this.cursor === SLOTS_ON_SCREEN - 1 &&
+            this.scrollCursor === SESSION_SLOTS_COUNT - SLOTS_ON_SCREEN
+          ) {
             this.setScrollCursor(0);
             this.revertSessionSlot(SLOTS_ON_SCREEN - 1);
             this.setCursor(0);
@@ -179,7 +197,11 @@ export default class SaveSlotSelectUiHandler extends MessageUiHandler {
           break;
         case Button.RIGHT:
           if (this.sessionSlots[cursorPosition].hasData && this.sessionSlots[cursorPosition].saveData) {
-            globalScene.ui.setOverlayMode(Mode.RUN_INFO, this.sessionSlots[cursorPosition].saveData, RunDisplayMode.SESSION_PREVIEW);
+            globalScene.ui.setOverlayMode(
+              UiMode.RUN_INFO,
+              this.sessionSlots[cursorPosition].saveData,
+              RunDisplayMode.SESSION_PREVIEW,
+            );
             success = true;
           }
       }
@@ -200,17 +222,24 @@ export default class SaveSlotSelectUiHandler extends MessageUiHandler {
       globalScene.add.existing(sessionSlot);
       this.sessionSlotsContainer.add(sessionSlot);
       this.sessionSlots.push(sessionSlot);
-      sessionSlot.load().then((success) => {
+      sessionSlot.load().then(success => {
         // If the cursor was moved to this slot while the session was loading
         // call setCursor again to shift the slot position and show the arrow for save preview
-        if (success && (this.cursor + this.scrollCursor) === s) {
+        if (success && this.cursor + this.scrollCursor === s) {
           this.setCursor(s);
         }
       });
     }
   }
 
-  showText(text: string, delay?: number, callback?: Function, callbackDelay?: number, prompt?: boolean, promptDelay?: number) {
+  showText(
+    text: string,
+    delay?: number,
+    callback?: Function,
+    callbackDelay?: number,
+    prompt?: boolean,
+    promptDelay?: number,
+  ) {
     super.showText(text, delay, callback, callbackDelay, prompt, promptDelay);
 
     if (text?.indexOf("\n") === -1) {
@@ -235,11 +264,22 @@ export default class SaveSlotSelectUiHandler extends MessageUiHandler {
 
     if (!this.cursorObj) {
       this.cursorObj = globalScene.add.container(0, 0);
-      const cursorBox = globalScene.add.nineslice(0, 0, "select_cursor_highlight_thick", undefined, 296, 44, 6, 6, 6, 6);
+      const cursorBox = globalScene.add.nineslice(
+        0,
+        0,
+        "select_cursor_highlight_thick",
+        undefined,
+        296,
+        44,
+        6,
+        6,
+        6,
+        6,
+      );
       const rightArrow = globalScene.add.image(0, 0, "cursor");
       rightArrow.setPosition(160, 0);
       rightArrow.setName("rightArrow");
-      this.cursorObj.add([ cursorBox, rightArrow ]);
+      this.cursorObj.add([cursorBox, rightArrow]);
       this.sessionSlotsContainer.add(this.cursorObj);
     }
     const cursorPosition = cursor + this.scrollCursor;
@@ -257,7 +297,7 @@ export default class SaveSlotSelectUiHandler extends MessageUiHandler {
       }
       this.setArrowVisibility(hasData);
     }
-    if (!Utils.isNullOrUndefined(prevSlotIndex)) {
+    if (!isNullOrUndefined(prevSlotIndex)) {
       this.revertSessionSlot(prevSlotIndex);
     }
 
@@ -300,8 +340,8 @@ export default class SaveSlotSelectUiHandler extends MessageUiHandler {
       globalScene.tweens.add({
         targets: this.sessionSlotsContainer,
         y: this.sessionSlotsContainerInitialY - 56 * scrollCursor,
-        duration: Utils.fixedInt(325),
-        ease: "Sine.easeInOut"
+        duration: fixedInt(325),
+        ease: "Sine.easeInOut",
       });
     }
 
@@ -357,13 +397,18 @@ class SessionSlot extends Phaser.GameObjects.Container {
   async setupWithData(data: SessionSaveData) {
     this.remove(this.loadingLabel, true);
 
-    const gameModeLabel = addTextObject(8, 5, `${GameMode.getModeName(data.gameMode) || i18next.t("gameMode:unkown")} - ${i18next.t("saveSlotSelectUiHandler:wave")} ${data.waveIndex}`, TextStyle.WINDOW);
+    const gameModeLabel = addTextObject(
+      8,
+      5,
+      `${GameMode.getModeName(data.gameMode) || i18next.t("gameMode:unkown")} - ${i18next.t("saveSlotSelectUiHandler:wave")} ${data.waveIndex}`,
+      TextStyle.WINDOW,
+    );
     this.add(gameModeLabel);
 
     const timestampLabel = addTextObject(8, 19, new Date(data.timestamp).toLocaleString(), TextStyle.WINDOW);
     this.add(timestampLabel);
 
-    const playTimeLabel = addTextObject(8, 33, Utils.getPlayTimeString(data.playTime), TextStyle.WINDOW);
+    const playTimeLabel = addTextObject(8, 33, getPlayTimeString(data.playTime), TextStyle.WINDOW);
     this.add(playTimeLabel);
 
     const pokemonIconsContainer = globalScene.add.container(144, 4);
@@ -374,7 +419,13 @@ class SessionSlot extends Phaser.GameObjects.Container {
       const pokemon = p.toPokemon();
       const icon = globalScene.addPokemonIcon(pokemon, 0, 0, 0, 0);
 
-      const text = addTextObject(32, 20, `${i18next.t("saveSlotSelectUiHandler:lv")}${Utils.formatLargeNumber(pokemon.level, 1000)}`, TextStyle.PARTY, { fontSize: "54px", color: "#f8f8f8" });
+      const text = addTextObject(
+        32,
+        20,
+        `${i18next.t("saveSlotSelectUiHandler:lv")}${formatLargeNumber(pokemon.level, 1000)}`,
+        TextStyle.PARTY,
+        { fontSize: "54px", color: "#f8f8f8" },
+      );
       text.setShadow(0, 0, undefined);
       text.setStroke("#424242", 14);
       text.setOrigin(1, 0);
diff --git a/src/ui/saving-icon-handler.ts b/src/ui/saving-icon-handler.ts
index ca7b1fb1aa8..3b7db549a4a 100644
--- a/src/ui/saving-icon-handler.ts
+++ b/src/ui/saving-icon-handler.ts
@@ -1,5 +1,5 @@
 import { globalScene } from "#app/global-scene";
-import * as Utils from "../utils";
+import { fixedInt } from "#app/utils/common";
 
 export default class SavingIconHandler extends Phaser.GameObjects.Container {
   private icon: Phaser.GameObjects.Sprite;
@@ -36,16 +36,16 @@ export default class SavingIconHandler extends Phaser.GameObjects.Container {
     globalScene.tweens.add({
       targets: this,
       alpha: 1,
-      duration: Utils.fixedInt(250),
+      duration: fixedInt(250),
       ease: "Sine.easeInOut",
       onComplete: () => {
-        globalScene.time.delayedCall(Utils.fixedInt(500), () => {
+        globalScene.time.delayedCall(fixedInt(500), () => {
           this.animActive = false;
           if (!this.shown) {
             this.hide();
           }
         });
-      }
+      },
     });
 
     this.setVisible(true);
@@ -64,7 +64,7 @@ export default class SavingIconHandler extends Phaser.GameObjects.Container {
     globalScene.tweens.add({
       targets: this,
       alpha: 0,
-      duration: Utils.fixedInt(250),
+      duration: fixedInt(250),
       ease: "Sine.easeInOut",
       onComplete: () => {
         this.animActive = false;
@@ -72,7 +72,7 @@ export default class SavingIconHandler extends Phaser.GameObjects.Container {
         if (this.shown) {
           this.show();
         }
-      }
+      },
     });
 
     this.shown = false;
diff --git a/src/ui/scroll-bar.ts b/src/ui/scroll-bar.ts
index eb74bfddfde..404553025e3 100644
--- a/src/ui/scroll-bar.ts
+++ b/src/ui/scroll-bar.ts
@@ -29,7 +29,18 @@ export class ScrollBar extends Phaser.GameObjects.Container {
     const borderSize = 2;
     width = Math.max(width, 4);
 
-    this.bg = globalScene.add.nineslice(0, 0, "scroll_bar", undefined, width, height, borderSize, borderSize, borderSize, borderSize);
+    this.bg = globalScene.add.nineslice(
+      0,
+      0,
+      "scroll_bar",
+      undefined,
+      width,
+      height,
+      borderSize,
+      borderSize,
+      borderSize,
+      borderSize,
+    );
     this.bg.setOrigin(0, 0);
     this.add(this.bg);
 
@@ -60,14 +71,16 @@ export class ScrollBar extends Phaser.GameObjects.Container {
    */
   setTotalRows(rows: number): void {
     this.totalRows = rows;
-    this.handleBody.height = (this.bg.displayHeight - 1 - this.handleBottom.displayHeight) * this.maxRows / this.totalRows;
+    this.handleBody.height =
+      ((this.bg.displayHeight - 1 - this.handleBottom.displayHeight) * this.maxRows) / this.totalRows;
     this.updateHandlePosition();
 
     this.setVisible(this.totalRows > this.maxRows);
   }
 
   private updateHandlePosition(): void {
-    this.handleBody.y = 1 + (this.bg.displayHeight - 1 - this.handleBottom.displayHeight) / this.totalRows * this.currentRow;
+    this.handleBody.y =
+      1 + ((this.bg.displayHeight - 1 - this.handleBottom.displayHeight) / this.totalRows) * this.currentRow;
     this.handleBottom.y = this.handleBody.y + this.handleBody.displayHeight;
   }
 }
diff --git a/src/ui/scrollable-grid-handler.ts b/src/ui/scrollable-grid-handler.ts
index 04851ec002f..54f07d69fb7 100644
--- a/src/ui/scrollable-grid-handler.ts
+++ b/src/ui/scrollable-grid-handler.ts
@@ -111,7 +111,7 @@ export default class ScrollableGridUiHandler {
         } else if (this.scrollCursor > 0) {
           success = this.setScrollCursor(this.scrollCursor - 1);
         } else {
-        // wrap around to the last row
+          // wrap around to the last row
           let newCursor = this.cursor + (onScreenRows - 1) * this.COLUMNS;
           if (newCursor > lastVisibleIndex) {
             newCursor -= this.COLUMNS;
@@ -121,13 +121,13 @@ export default class ScrollableGridUiHandler {
         break;
       case Button.DOWN:
         if (currentRowIndex < onScreenRows - 1) {
-        // Go down one row
+          // Go down one row
           success = this.setCursor(Math.min(this.cursor + this.COLUMNS, this.totalElements - itemOffset - 1));
         } else if (this.scrollCursor < maxScrollCursor) {
-        // Scroll down one row
+          // Scroll down one row
           success = this.setScrollCursor(this.scrollCursor + 1);
         } else {
-        // Wrap around to the top row
+          // Wrap around to the top row
           success = this.setScrollCursor(0, this.cursor % this.COLUMNS);
         }
         break;
@@ -192,5 +192,4 @@ export default class ScrollableGridUiHandler {
 
     return scrollChanged || cursorChanged;
   }
-
 }
diff --git a/src/ui/session-reload-modal-ui-handler.ts b/src/ui/session-reload-modal-ui-handler.ts
index 640268f0480..f866783afe8 100644
--- a/src/ui/session-reload-modal-ui-handler.ts
+++ b/src/ui/session-reload-modal-ui-handler.ts
@@ -1,10 +1,10 @@
 import type { ModalConfig } from "./modal-ui-handler";
 import { ModalUiHandler } from "./modal-ui-handler";
 import { addTextObject, TextStyle } from "./text";
-import type { Mode } from "./ui";
+import type { UiMode } from "#enums/ui-mode";
 
 export default class SessionReloadModalUiHandler extends ModalUiHandler {
-  constructor(mode: Mode | null = null) {
+  constructor(mode: UiMode | null = null) {
     super(mode);
   }
 
@@ -21,27 +21,33 @@ export default class SessionReloadModalUiHandler extends ModalUiHandler {
   }
 
   getMargin(): [number, number, number, number] {
-    return [ 0, 0, 48, 0 ];
+    return [0, 0, 48, 0];
   }
 
   getButtonLabels(): string[] {
-    return [ ];
+    return [];
   }
 
   setup(): void {
     super.setup();
 
-    const label = addTextObject(this.getWidth() / 2, this.getHeight() / 2, "Your session is out of date.\nYour data will be reloaded…", TextStyle.WINDOW, { fontSize: "48px", align: "center" });
+    const label = addTextObject(
+      this.getWidth() / 2,
+      this.getHeight() / 2,
+      "Your session is out of date.\nYour data will be reloaded…",
+      TextStyle.WINDOW,
+      { fontSize: "48px", align: "center" },
+    );
     label.setOrigin(0.5, 0.5);
 
     this.modalContainer.add(label);
   }
 
-  show(args: any[]): boolean {
+  show(_args: any[]): boolean {
     const config: ModalConfig = {
-      buttonActions: []
+      buttonActions: [],
     };
 
-    return super.show([ config ]);
+    return super.show([config]);
   }
 }
diff --git a/src/ui/settings/abstract-binding-ui-handler.ts b/src/ui/settings/abstract-binding-ui-handler.ts
index e8c3e20c38f..a4707418b7c 100644
--- a/src/ui/settings/abstract-binding-ui-handler.ts
+++ b/src/ui/settings/abstract-binding-ui-handler.ts
@@ -1,5 +1,5 @@
 import UiHandler from "../ui-handler";
-import type { Mode } from "../ui";
+import type { UiMode } from "#enums/ui-mode";
 import { addWindow } from "../ui-theme";
 import { addTextObject, TextStyle } from "../text";
 import { Button } from "#enums/buttons";
@@ -29,7 +29,7 @@ export default abstract class AbstractBindingUiHandler extends UiHandler {
   protected actionLabel: Phaser.GameObjects.Text;
   protected cancelLabel: Phaser.GameObjects.Text;
 
-  protected listening: boolean = false;
+  protected listening = false;
   protected buttonPressed: number | null = null;
 
   // Icons for displaying current and new button assignments.
@@ -40,24 +40,24 @@ export default abstract class AbstractBindingUiHandler extends UiHandler {
   protected cancelFn: CancelFn | null;
   abstract swapAction(): boolean;
 
-  protected timeLeftAutoClose: number = 5;
+  protected timeLeftAutoClose = 5;
   protected countdownTimer;
 
   // The specific setting being modified.
   protected target;
 
   /**
-     * Constructor for the AbstractBindingUiHandler.
-     *
-     * @param mode - The UI mode.
-     */
-  constructor(mode: Mode | null = null) {
+   * Constructor for the AbstractBindingUiHandler.
+   *
+   * @param mode - The UI mode.
+   */
+  constructor(mode: UiMode | null = null) {
     super(mode);
   }
 
   /**
-     * Setup UI elements.
-     */
+   * Setup UI elements.
+   */
   setup() {
     const ui = this.getUi();
     this.optionSelectContainer = globalScene.add.container(0, 0);
@@ -71,11 +71,21 @@ export default abstract class AbstractBindingUiHandler extends UiHandler {
     ui.add(this.actionsContainer);
 
     // Setup backgrounds and text objects for UI.
-    this.titleBg = addWindow((globalScene.game.canvas.width / 6) - this.getWindowWidth(), -(globalScene.game.canvas.height / 6) + 28 + 21, this.getWindowWidth(), 24);
+    this.titleBg = addWindow(
+      globalScene.game.canvas.width / 6 - this.getWindowWidth(),
+      -(globalScene.game.canvas.height / 6) + 28 + 21,
+      this.getWindowWidth(),
+      24,
+    );
     this.titleBg.setOrigin(0.5);
     this.optionSelectContainer.add(this.titleBg);
 
-    this.actionBg = addWindow((globalScene.game.canvas.width / 6) - this.getWindowWidth(), -(globalScene.game.canvas.height / 6) + this.getWindowHeight() + 28 + 21 + 21, this.getWindowWidth(), 24);
+    this.actionBg = addWindow(
+      globalScene.game.canvas.width / 6 - this.getWindowWidth(),
+      -(globalScene.game.canvas.height / 6) + this.getWindowHeight() + 28 + 21 + 21,
+      this.getWindowWidth(),
+      24,
+    );
     this.actionBg.setOrigin(0.5);
     this.actionsContainer.add(this.actionBg);
 
@@ -87,10 +97,15 @@ export default abstract class AbstractBindingUiHandler extends UiHandler {
 
     this.timerText = addTextObject(0, 0, "(5)", TextStyle.WINDOW);
     this.timerText.setOrigin(0, 0);
-    this.timerText.setPositionRelative(this.unlockText, (this.unlockText.width / 6) + 5, 0);
+    this.timerText.setPositionRelative(this.unlockText, this.unlockText.width / 6 + 5, 0);
     this.optionSelectContainer.add(this.timerText);
 
-    this.optionSelectBg = addWindow((globalScene.game.canvas.width / 6) - this.getWindowWidth(), -(globalScene.game.canvas.height / 6) + this.getWindowHeight() + 28, this.getWindowWidth(), this.getWindowHeight());
+    this.optionSelectBg = addWindow(
+      globalScene.game.canvas.width / 6 - this.getWindowWidth(),
+      -(globalScene.game.canvas.height / 6) + this.getWindowHeight() + 28,
+      this.getWindowWidth(),
+      this.getWindowHeight(),
+    );
     this.optionSelectBg.setOrigin(0.5);
     this.optionSelectContainer.add(this.optionSelectBg);
 
@@ -108,17 +123,17 @@ export default abstract class AbstractBindingUiHandler extends UiHandler {
       if (this.timeLeftAutoClose >= 0) {
         this.manageAutoCloseTimer();
       } else {
-        this.cancelFn && this.cancelFn();
+        this.cancelFn?.();
       }
     }, 1000);
   }
 
   /**
-     * Show the UI with the provided arguments.
-     *
-     * @param args - Arguments to be passed to the show method.
-     * @returns `true` if successful.
-     */
+   * Show the UI with the provided arguments.
+   *
+   * @param args - Arguments to be passed to the show method.
+   * @returns `true` if successful.
+   */
   show(args: any[]): boolean {
     super.show(args);
     this.buttonPressed = null;
@@ -139,29 +154,29 @@ export default abstract class AbstractBindingUiHandler extends UiHandler {
   }
 
   /**
-     * Get the width of the window.
-     *
-     * @returns The window width.
-     */
+   * Get the width of the window.
+   *
+   * @returns The window width.
+   */
   getWindowWidth(): number {
     return 160;
   }
 
   /**
-     * Get the height of the window.
-     *
-     * @returns The window height.
-     */
+   * Get the height of the window.
+   *
+   * @returns The window height.
+   */
   getWindowHeight(): number {
     return 64;
   }
 
   /**
-     * Process the input for the given button.
-     *
-     * @param button - The button to process.
-     * @returns `true` if the input was processed successfully.
-     */
+   * Process the input for the given button.
+   *
+   * @param button - The button to process.
+   * @returns `true` if the input was processed successfully.
+   */
   processInput(button: Button): boolean {
     if (this.buttonPressed === null) {
       return false; // TODO: is false correct as default? (previously was `undefined`)
@@ -170,19 +185,19 @@ export default abstract class AbstractBindingUiHandler extends UiHandler {
     let success = false;
     switch (button) {
       case Button.LEFT:
-      case Button.RIGHT:
-      // Toggle between action and cancel options.
-        const cursor = this.cursor ? 0 : 1;
-        success = this.setCursor(cursor);
+      case Button.RIGHT: {
+        // Toggle between action and cancel options.
+        success = this.setCursor(this.cursor ? 0 : 1);
         break;
+      }
       case Button.ACTION:
-      // Process actions based on current cursor position.
+        // Process actions based on current cursor position.
         if (this.cursor === 0) {
-          this.cancelFn && this.cancelFn();
+          this.cancelFn?.();
         } else {
           success = this.swapAction();
           NavigationManager.getInstance().updateIcons();
-          this.cancelFn && this.cancelFn(success);
+          this.cancelFn?.(success);
         }
         break;
     }
@@ -198,11 +213,11 @@ export default abstract class AbstractBindingUiHandler extends UiHandler {
   }
 
   /**
-     * Set the cursor to the specified position.
-     *
-     * @param cursor - The cursor position to set.
-     * @returns `true` if the cursor was set successfully.
-     */
+   * Set the cursor to the specified position.
+   *
+   * @param cursor - The cursor position to set.
+   * @returns `true` if the cursor was set successfully.
+   */
   setCursor(cursor: number): boolean {
     this.cursor = cursor;
     if (cursor === 1) {
@@ -220,8 +235,8 @@ export default abstract class AbstractBindingUiHandler extends UiHandler {
   }
 
   /**
-     * Clear the UI elements and state.
-     */
+   * Clear the UI elements and state.
+   */
   clear() {
     super.clear();
     clearTimeout(this.countdownTimer);
@@ -237,12 +252,12 @@ export default abstract class AbstractBindingUiHandler extends UiHandler {
   }
 
   /**
-     * Handle input down events.
-     *
-     * @param buttonIcon - The icon of the button that was pressed.
-     * @param assignedButtonIcon - The icon of the button that is assigned.
-     * @param type - The type of button press.
-     */
+   * Handle input down events.
+   *
+   * @param buttonIcon - The icon of the button that was pressed.
+   * @param assignedButtonIcon - The icon of the button that is assigned.
+   * @param type - The type of button press.
+   */
   onInputDown(buttonIcon: string, assignedButtonIcon: string | null, type: string): void {
     clearTimeout(this.countdownTimer);
     this.timerText.setText("");
diff --git a/src/ui/settings/abstract-control-settings-ui-handler.ts b/src/ui/settings/abstract-control-settings-ui-handler.ts
index 59af1abba2a..495a0f68540 100644
--- a/src/ui/settings/abstract-control-settings-ui-handler.ts
+++ b/src/ui/settings/abstract-control-settings-ui-handler.ts
@@ -1,5 +1,5 @@
 import UiHandler from "#app/ui/ui-handler";
-import type { Mode } from "#app/ui/ui";
+import type { UiMode } from "#enums/ui-mode";
 import type { InterfaceConfig } from "#app/inputs-controller";
 import { addWindow } from "#app/ui/ui-theme";
 import { addTextObject, TextStyle } from "#app/ui/text";
@@ -12,17 +12,17 @@ import i18next from "i18next";
 import { globalScene } from "#app/global-scene";
 
 export interface InputsIcons {
-    [key: string]: Phaser.GameObjects.Sprite;
+  [key: string]: Phaser.GameObjects.Sprite;
 }
 
 export interface LayoutConfig {
-    optionsContainer: Phaser.GameObjects.Container;
-    inputsIcons: InputsIcons;
-    settingLabels: Phaser.GameObjects.Text[];
-    optionValueLabels: Phaser.GameObjects.Text[][];
-    optionCursors: number[];
-    keys: string[];
-    bindingSettings: Array<String>;
+  optionsContainer: Phaser.GameObjects.Container;
+  inputsIcons: InputsIcons;
+  settingLabels: Phaser.GameObjects.Text[];
+  optionValueLabels: Phaser.GameObjects.Text[][];
+  optionCursors: number[];
+  keys: string[];
+  bindingSettings: Array<string>;
 }
 /**
  * Abstract class for handling UI elements related to control settings.
@@ -49,10 +49,10 @@ export default abstract class AbstractControlSettingsUiHandler extends UiHandler
   protected inputsIcons: InputsIcons;
   protected navigationIcons: InputsIcons;
   // list all the setting keys used in the selected layout (because dualshock has more buttons than xbox)
-  protected keys: Array<String>;
+  protected keys: Array<string>;
 
   // Store the specific settings related to key bindings for the current gamepad configuration.
-  protected bindingSettings: Array<String>;
+  protected bindingSettings: Array<string>;
 
   protected setting;
   protected settingBlacklisted;
@@ -74,21 +74,23 @@ export default abstract class AbstractControlSettingsUiHandler extends UiHandler
    *
    * @param mode - The UI mode.
    */
-  constructor(mode: Mode | null = null) {
+  constructor(mode: UiMode | null = null) {
     super(mode);
     this.rowsToDisplay = 8;
   }
 
   getLocalStorageSetting(): object {
     // Retrieve the settings from local storage or use an empty object if none exist.
-    const settings: object = localStorage.hasOwnProperty(this.localStoragePropertyName) ? JSON.parse(localStorage.getItem(this.localStoragePropertyName)!) : {}; // TODO: is this bang correct?
+    const settings: object = localStorage.hasOwnProperty(this.localStoragePropertyName)
+      ? JSON.parse(localStorage.getItem(this.localStoragePropertyName)!)
+      : {}; // TODO: is this bang correct?
     return settings;
   }
 
   private camelize(string: string): string {
-    return string.replace(/(?:^\w|[A-Z]|\b\w)/g, function(word, index) {
-      return index === 0 ? word.toLowerCase() : word.toUpperCase();
-    }).replace(/\s+/g, "");
+    return string
+      .replace(/(?:^\w|[A-Z]|\b\w)/g, (word, index) => (index === 0 ? word.toLowerCase() : word.toUpperCase()))
+      .replace(/\s+/g, "");
   }
 
   /**
@@ -101,15 +103,27 @@ export default abstract class AbstractControlSettingsUiHandler extends UiHandler
     this.settingsContainer = globalScene.add.container(1, -(globalScene.game.canvas.height / 6) + 1);
     this.settingsContainer.setName(`settings-${this.titleSelected}`);
 
-    this.settingsContainer.setInteractive(new Phaser.Geom.Rectangle(0, 0, globalScene.game.canvas.width / 6, globalScene.game.canvas.height / 6), Phaser.Geom.Rectangle.Contains);
+    this.settingsContainer.setInteractive(
+      new Phaser.Geom.Rectangle(0, 0, globalScene.game.canvas.width / 6, globalScene.game.canvas.height / 6),
+      Phaser.Geom.Rectangle.Contains,
+    );
 
     this.navigationContainer = new NavigationMenu(0, 0);
 
-    this.optionsBg = addWindow(0, this.navigationContainer.height, (globalScene.game.canvas.width / 6) - 2, (globalScene.game.canvas.height / 6) - 16 - this.navigationContainer.height - 2);
+    this.optionsBg = addWindow(
+      0,
+      this.navigationContainer.height,
+      globalScene.game.canvas.width / 6 - 2,
+      globalScene.game.canvas.height / 6 - 16 - this.navigationContainer.height - 2,
+    );
     this.optionsBg.setOrigin(0, 0);
 
-
-    this.actionsBg = addWindow(0, (globalScene.game.canvas.height / 6) - this.navigationContainer.height, (globalScene.game.canvas.width / 6) - 2, 22);
+    this.actionsBg = addWindow(
+      0,
+      globalScene.game.canvas.height / 6 - this.navigationContainer.height,
+      globalScene.game.canvas.width / 6 - 2,
+      22,
+    );
     this.actionsBg.setOrigin(0, 0);
 
     const iconAction = globalScene.add.sprite(0, 0, "keyboard");
@@ -171,13 +185,21 @@ export default abstract class AbstractControlSettingsUiHandler extends UiHandler
       const inputsIcons: InputsIcons = {};
 
       // Fetch common setting keys such as 'Controller' and 'Gamepad Support' from gamepad settings.
-      const commonSettingKeys = Object.keys(this.setting).slice(0, this.commonSettingsCount).map(key => this.setting[key]);
+      const commonSettingKeys = Object.keys(this.setting)
+        .slice(0, this.commonSettingsCount)
+        .map(key => this.setting[key]);
       // Combine common and specific bindings into a single array.
-      const specificBindingKeys = [ ...commonSettingKeys, ...Object.keys(config.settings) ];
+      const specificBindingKeys = [...commonSettingKeys, ...Object.keys(config.settings)];
       // Fetch default values for these settings and prepare to highlight selected options.
-      const optionCursors = Object.values(Object.keys(this.settingDeviceDefaults).filter(s => specificBindingKeys.includes(s)).map(k => this.settingDeviceDefaults[k]));
+      const optionCursors = Object.values(
+        Object.keys(this.settingDeviceDefaults)
+          .filter(s => specificBindingKeys.includes(s))
+          .map(k => this.settingDeviceDefaults[k]),
+      );
       // Filter out settings that are not relevant to the current gamepad configuration.
-      const settingFiltered = Object.keys(this.setting).filter(_key => specificBindingKeys.includes(this.setting[_key]));
+      const settingFiltered = Object.keys(this.setting).filter(_key =>
+        specificBindingKeys.includes(this.setting[_key]),
+      );
       // Loop through the filtered settings to manage display and options.
 
       settingFiltered.forEach((setting, s) => {
@@ -202,7 +224,7 @@ export default abstract class AbstractControlSettingsUiHandler extends UiHandler
         const valueLabels: Phaser.GameObjects.GameObject[] = [];
 
         // Process each option for the current setting.
-        for (const [ o, option ] of this.settingDeviceOptions[this.setting[setting]].entries()) {
+        for (const [o, option] of this.settingDeviceOptions[this.setting[setting]].entries()) {
           // Check if the current setting is for binding keys.
           if (bindingSettings.includes(this.setting[setting])) {
             // Create a label for non-null options, typically indicating actionable options like 'change'.
@@ -222,7 +244,12 @@ export default abstract class AbstractControlSettingsUiHandler extends UiHandler
             continue;
           }
           // For regular settings like 'Gamepad support', create a label and determine if it is selected.
-          const valueLabel = addTextObject(0, 0, option, this.settingDeviceDefaults[this.setting[setting]] === o ? TextStyle.SETTINGS_SELECTED : TextStyle.WINDOW);
+          const valueLabel = addTextObject(
+            0,
+            0,
+            option,
+            this.settingDeviceDefaults[this.setting[setting]] === o ? TextStyle.SETTINGS_SELECTED : TextStyle.WINDOW,
+          );
           valueLabel.setOrigin(0, 0);
 
           optionsContainer.add(valueLabel);
@@ -235,14 +262,16 @@ export default abstract class AbstractControlSettingsUiHandler extends UiHandler
 
         // Calculate the total width of all option labels within a specific setting
         // This is achieved by summing the width of each option label
-        const totalWidth = optionValueLabels[s].map((o) => (o as Phaser.GameObjects.Text).width).reduce((total, width) => total += width, 0);
+        const totalWidth = optionValueLabels[s]
+          .map(o => (o as Phaser.GameObjects.Text).width)
+          .reduce((total, width) => (total += width), 0);
 
         // Define the minimum width for a label, ensuring it's at least 78 pixels wide or the width of the setting label plus some padding
         const labelWidth = Math.max(130, settingLabels[s].displayWidth + 8);
 
         // Calculate the total available space for placing option labels next to their setting label
         // We reserve space for the setting label and then distribute the remaining space evenly
-        const totalSpace = (297 - labelWidth) - totalWidth / 6;
+        const totalSpace = 297 - labelWidth - totalWidth / 6;
         // Calculate the spacing between options based on the available space divided by the number of gaps between labels
         const optionSpacing = Math.floor(totalSpace / (optionValueLabels[s].length - 1));
 
@@ -272,7 +301,13 @@ export default abstract class AbstractControlSettingsUiHandler extends UiHandler
     }
 
     // Add vertical scrollbar
-    this.scrollBar = new ScrollBar(this.optionsBg.width - 9, this.optionsBg.y + 5, 4, this.optionsBg.height - 11, this.rowsToDisplay);
+    this.scrollBar = new ScrollBar(
+      this.optionsBg.width - 9,
+      this.optionsBg.y + 5,
+      4,
+      this.optionsBg.height - 11,
+      this.rowsToDisplay,
+    );
     this.settingsContainer.add(this.scrollBar);
 
     // Add the settings container to the UI.
@@ -296,7 +331,7 @@ export default abstract class AbstractControlSettingsUiHandler extends UiHandler
    */
   updateBindings(): void {
     // Hide the options container for all layouts to reset the UI visibility.
-    Object.keys(this.layout).forEach((key) => this.layout[key].optionsContainer.setVisible(false));
+    Object.keys(this.layout).forEach(key => this.layout[key].optionsContainer.setVisible(false));
     // Fetch the active gamepad configuration from the input controller.
     const activeConfig = this.getActiveConfig();
 
@@ -310,7 +345,10 @@ export default abstract class AbstractControlSettingsUiHandler extends UiHandler
 
     // Update the cursor for each key based on the stored settings or default cursors.
     this.keys.forEach((key, index) => {
-      this.setOptionCursor(index, settings.hasOwnProperty(key as string) ? settings[key as string] : this.optionCursors[index]);
+      this.setOptionCursor(
+        index,
+        settings.hasOwnProperty(key as string) ? settings[key as string] : this.optionCursors[index],
+      );
     });
 
     // If the active configuration has no custom bindings set, exit the function early.
@@ -338,8 +376,8 @@ export default abstract class AbstractControlSettingsUiHandler extends UiHandler
 
   updateNavigationDisplay() {
     const specialIcons = {
-      "BUTTON_HOME": "HOME.png",
-      "BUTTON_DELETE": "DEL.png",
+      BUTTON_HOME: "HOME.png",
+      BUTTON_DELETE: "DEL.png",
     };
     for (const settingName of Object.keys(this.navigationIcons)) {
       if (Object.keys(specialIcons).includes(settingName)) {
@@ -462,15 +500,17 @@ export default abstract class AbstractControlSettingsUiHandler extends UiHandler
           if (!this.optionValueLabels) {
             return false;
           }
-          if (cursor) { // If not at the top, move the cursor up.
+          if (cursor) {
+            // If not at the top, move the cursor up.
             if (this.cursor) {
               success = this.setCursor(this.cursor - 1);
-            } else {// If at the top of the visible items, scroll up.
+            } else {
+              // If at the top of the visible items, scroll up.
               success = this.setScrollCursor(this.scrollCursor - 1);
             }
           } else {
-          // When at the top of the menu and pressing UP, move to the bottommost item.
-          // First, set the cursor to the last visible element, preparing for the scroll to the end.
+            // When at the top of the menu and pressing UP, move to the bottommost item.
+            // First, set the cursor to the last visible element, preparing for the scroll to the end.
             const successA = this.setCursor(this.rowsToDisplay - 1);
             // Then, adjust the scroll to display the bottommost elements of the menu.
             const successB = this.setScrollCursor(this.optionValueLabels.length - this.rowsToDisplay);
@@ -488,8 +528,8 @@ export default abstract class AbstractControlSettingsUiHandler extends UiHandler
               success = this.setScrollCursor(this.scrollCursor + 1);
             }
           } else {
-          // When at the bottom of the menu and pressing DOWN, move to the topmost item.
-          // First, set the cursor to the first visible element, resetting the scroll to the top.
+            // When at the bottom of the menu and pressing DOWN, move to the topmost item.
+            // First, set the cursor to the first visible element, resetting the scroll to the top.
             const successA = this.setCursor(0);
             // Then, reset the scroll to start from the first element of the menu.
             const successB = this.setScrollCursor(0);
@@ -555,7 +595,7 @@ export default abstract class AbstractControlSettingsUiHandler extends UiHandler
 
     // Check if the cursor object exists, if not, create it.
     if (!this.cursorObj) {
-      const cursorWidth = (globalScene.game.canvas.width / 6) - (this.scrollBar.visible ? 16 : 10);
+      const cursorWidth = globalScene.game.canvas.width / 6 - (this.scrollBar.visible ? 16 : 10);
       this.cursorObj = globalScene.add.nineslice(0, 0, "summary_moves_cursor", undefined, cursorWidth, 16, 1, 1, 1, 1);
       this.cursorObj.setOrigin(0, 0); // Set the origin to the top-left corner.
       this.optionsContainer.add(this.cursorObj); // Add the cursor to the options container.
@@ -681,5 +721,4 @@ export default abstract class AbstractControlSettingsUiHandler extends UiHandler
     // Set the cursor object reference to null to fully dereference it.
     this.cursorObj = null;
   }
-
 }
diff --git a/src/ui/settings/abstract-settings-ui-handler.ts b/src/ui/settings/abstract-settings-ui-handler.ts
index 7300b6d3266..27ca95c25ac 100644
--- a/src/ui/settings/abstract-settings-ui-handler.ts
+++ b/src/ui/settings/abstract-settings-ui-handler.ts
@@ -1,5 +1,5 @@
 import { TextStyle, addTextObject } from "#app/ui/text";
-import { Mode } from "#app/ui/ui";
+import { UiMode } from "#enums/ui-mode";
 import MessageUiHandler from "#app/ui/message-ui-handler";
 import { addWindow } from "#app/ui/ui-theme";
 import { ScrollBar } from "#app/ui/scroll-bar";
@@ -11,7 +11,6 @@ import { Setting, SettingKeys } from "#app/system/settings/settings";
 import i18next from "i18next";
 import { globalScene } from "#app/global-scene";
 
-
 /**
  * Abstract class for handling UI elements related to settings.
  */
@@ -43,7 +42,7 @@ export default class AbstractSettingsUiHandler extends MessageUiHandler {
   protected settings: Array<Setting>;
   protected localStorageKey: string;
 
-  constructor(type: SettingType, mode: Mode | null = null) {
+  constructor(type: SettingType, mode: UiMode | null = null) {
     super(mode);
     this.settings = Setting.filter(s => s.type === type && !s?.isHidden?.());
     this.reloadRequired = false;
@@ -58,17 +57,30 @@ export default class AbstractSettingsUiHandler extends MessageUiHandler {
 
     this.settingsContainer = globalScene.add.container(1, -(globalScene.game.canvas.height / 6) + 1);
     this.settingsContainer.setName(`settings-${this.title}`);
-    this.settingsContainer.setInteractive(new Phaser.Geom.Rectangle(0, 0, globalScene.game.canvas.width / 6, globalScene.game.canvas.height / 6 - 20), Phaser.Geom.Rectangle.Contains);
+    this.settingsContainer.setInteractive(
+      new Phaser.Geom.Rectangle(0, 0, globalScene.game.canvas.width / 6, globalScene.game.canvas.height / 6 - 20),
+      Phaser.Geom.Rectangle.Contains,
+    );
 
     this.navigationIcons = {};
 
     this.navigationContainer = new NavigationMenu(0, 0);
 
-    this.optionsBg = addWindow(0, this.navigationContainer.height, (globalScene.game.canvas.width / 6) - 2, (globalScene.game.canvas.height / 6) - 16 - this.navigationContainer.height - 2);
+    this.optionsBg = addWindow(
+      0,
+      this.navigationContainer.height,
+      globalScene.game.canvas.width / 6 - 2,
+      globalScene.game.canvas.height / 6 - 16 - this.navigationContainer.height - 2,
+    );
     this.optionsBg.setName("window-options-bg");
     this.optionsBg.setOrigin(0, 0);
 
-    const actionsBg = addWindow(0, (globalScene.game.canvas.height / 6) - this.navigationContainer.height, (globalScene.game.canvas.width / 6) - 2, 22);
+    const actionsBg = addWindow(
+      0,
+      globalScene.game.canvas.height / 6 - this.navigationContainer.height,
+      globalScene.game.canvas.width / 6 - 2,
+      22,
+    );
     actionsBg.setOrigin(0, 0);
 
     const iconAction = globalScene.add.sprite(0, 0, "keyboard");
@@ -96,44 +108,56 @@ export default class AbstractSettingsUiHandler extends MessageUiHandler {
 
     this.reloadSettings = this.settings.filter(s => s?.requireReload);
 
-    this.settings
-      .forEach((setting, s) => {
-        let settingName = setting.label;
-        if (setting?.requireReload) {
-          settingName += ` (${i18next.t("settings:requireReload")})`;
-        }
+    this.settings.forEach((setting, s) => {
+      let settingName = setting.label;
+      if (setting?.requireReload) {
+        settingName += ` (${i18next.t("settings:requireReload")})`;
+      }
 
-        this.settingLabels[s] = addTextObject(8, 28 + s * 16, settingName, TextStyle.SETTINGS_LABEL);
-        this.settingLabels[s].setOrigin(0, 0);
+      this.settingLabels[s] = addTextObject(8, 28 + s * 16, settingName, TextStyle.SETTINGS_LABEL);
+      this.settingLabels[s].setOrigin(0, 0);
 
-        this.optionsContainer.add(this.settingLabels[s]);
-        this.optionValueLabels.push(setting.options.map((option, o) => {
-          const valueLabel = addTextObject(0, 0, option.label, setting.default === o ? TextStyle.SETTINGS_SELECTED : TextStyle.SETTINGS_VALUE);
+      this.optionsContainer.add(this.settingLabels[s]);
+      this.optionValueLabels.push(
+        setting.options.map((option, o) => {
+          const valueLabel = addTextObject(
+            0,
+            0,
+            option.label,
+            setting.default === o ? TextStyle.SETTINGS_SELECTED : TextStyle.SETTINGS_VALUE,
+          );
           valueLabel.setOrigin(0, 0);
 
           this.optionsContainer.add(valueLabel);
 
           return valueLabel;
-        }));
+        }),
+      );
 
-        const totalWidth = this.optionValueLabels[s].map(o => o.width).reduce((total, width) => total += width, 0);
+      const totalWidth = this.optionValueLabels[s].map(o => o.width).reduce((total, width) => (total += width), 0);
 
-        const labelWidth =  Math.max(78, this.settingLabels[s].displayWidth + 8);
+      const labelWidth = Math.max(78, this.settingLabels[s].displayWidth + 8);
 
-        const totalSpace = (297 - labelWidth) - totalWidth / 6;
-        const optionSpacing = Math.floor(totalSpace / (this.optionValueLabels[s].length - 1));
+      const totalSpace = 297 - labelWidth - totalWidth / 6;
+      const optionSpacing = Math.floor(totalSpace / (this.optionValueLabels[s].length - 1));
 
-        let xOffset = 0;
+      let xOffset = 0;
 
-        for (const value of this.optionValueLabels[s]) {
-          value.setPositionRelative(this.settingLabels[s], labelWidth + xOffset, 0);
-          xOffset += value.width / 6 + optionSpacing;
-        }
-      });
+      for (const value of this.optionValueLabels[s]) {
+        value.setPositionRelative(this.settingLabels[s], labelWidth + xOffset, 0);
+        xOffset += value.width / 6 + optionSpacing;
+      }
+    });
 
     this.optionCursors = this.settings.map(setting => setting.default);
 
-    this.scrollBar = new ScrollBar(this.optionsBg.width - 9, this.optionsBg.y + 5, 4, this.optionsBg.height - 11, this.rowsToDisplay);
+    this.scrollBar = new ScrollBar(
+      this.optionsBg.width - 9,
+      this.optionsBg.y + 5,
+      4,
+      this.optionsBg.height - 11,
+      this.rowsToDisplay,
+    );
     this.scrollBar.setTotalRows(this.settings.length);
 
     // Two-lines message box
@@ -145,7 +169,9 @@ export default class AbstractSettingsUiHandler extends MessageUiHandler {
     settingsMessageBox.setOrigin(0, 1);
     this.messageBoxContainer.add(settingsMessageBox);
 
-    const messageText = addTextObject(8, -40, "", TextStyle.WINDOW, { maxLines: 2 });
+    const messageText = addTextObject(8, -40, "", TextStyle.WINDOW, {
+      maxLines: 2,
+    });
     messageText.setWordWrapWidth(globalScene.game.canvas.width - 60);
     messageText.setName("settings-message");
     messageText.setOrigin(0, 0);
@@ -200,14 +226,18 @@ export default class AbstractSettingsUiHandler extends MessageUiHandler {
    *
    * @param args - Arguments to be passed to the show method.
    * @returns `true` if successful.
-     */
+   */
   show(args: any[]): boolean {
     super.show(args);
     this.updateBindings();
 
-    const settings: object = localStorage.hasOwnProperty(this.localStorageKey) ? JSON.parse(localStorage.getItem(this.localStorageKey)!) : {}; // TODO: is this bang correct?
+    const settings: object = localStorage.hasOwnProperty(this.localStorageKey)
+      ? JSON.parse(localStorage.getItem(this.localStorageKey)!)
+      : {}; // TODO: is this bang correct?
 
-    this.settings.forEach((setting, s) => this.setOptionCursor(s, settings.hasOwnProperty(setting.key) ? settings[setting.key] : this.settings[s].default));
+    this.settings.forEach((setting, s) =>
+      this.setOptionCursor(s, settings.hasOwnProperty(setting.key) ? settings[setting.key] : this.settings[s].default),
+    );
 
     this.settingsContainer.setVisible(true);
     this.setCursor(0);
@@ -251,8 +281,8 @@ export default class AbstractSettingsUiHandler extends MessageUiHandler {
               success = this.setScrollCursor(this.scrollCursor - 1);
             }
           } else {
-          // When at the top of the menu and pressing UP, move to the bottommost item.
-          // First, set the cursor to the last visible element, preparing for the scroll to the end.
+            // When at the top of the menu and pressing UP, move to the bottommost item.
+            // First, set the cursor to the last visible element, preparing for the scroll to the end.
             const successA = this.setCursor(this.rowsToDisplay - 1);
             // Then, adjust the scroll to display the bottommost elements of the menu.
             const successB = this.setScrollCursor(this.optionValueLabels.length - this.rowsToDisplay);
@@ -261,14 +291,15 @@ export default class AbstractSettingsUiHandler extends MessageUiHandler {
           break;
         case Button.DOWN:
           if (cursor < this.optionValueLabels.length - 1) {
-            if (this.cursor < this.rowsToDisplay - 1) {// if the visual cursor is in the frame of 0 to 8
+            if (this.cursor < this.rowsToDisplay - 1) {
+              // if the visual cursor is in the frame of 0 to 8
               success = this.setCursor(this.cursor + 1);
             } else if (this.scrollCursor < this.optionValueLabels.length - this.rowsToDisplay) {
               success = this.setScrollCursor(this.scrollCursor + 1);
             }
           } else {
-          // When at the bottom of the menu and pressing DOWN, move to the topmost item.
-          // First, set the cursor to the first visible element, resetting the scroll to the top.
+            // When at the bottom of the menu and pressing DOWN, move to the topmost item.
+            // First, set the cursor to the first visible element, resetting the scroll to the top.
             const successA = this.setCursor(0);
             // Then, reset the scroll to start from the first element of the menu.
             const successB = this.setScrollCursor(0);
@@ -276,12 +307,13 @@ export default class AbstractSettingsUiHandler extends MessageUiHandler {
           }
           break;
         case Button.LEFT:
-          if (this.optionCursors[cursor]) {// Moves the option cursor left, if possible.
+          if (this.optionCursors[cursor]) {
+            // Moves the option cursor left, if possible.
             success = this.setOptionCursor(cursor, this.optionCursors[cursor] - 1, true);
           }
           break;
         case Button.RIGHT:
-        // Moves the option cursor right, if possible.
+          // Moves the option cursor right, if possible.
           if (this.optionCursors[cursor] < this.optionValueLabels[cursor].length - 1) {
             success = this.setOptionCursor(cursor, this.optionCursors[cursor] + 1, true);
           }
@@ -331,7 +363,7 @@ export default class AbstractSettingsUiHandler extends MessageUiHandler {
     const ret = super.setCursor(cursor);
 
     if (!this.cursorObj) {
-      const cursorWidth = (globalScene.game.canvas.width / 6) - (this.scrollBar.visible ? 16 : 10);
+      const cursorWidth = globalScene.game.canvas.width / 6 - (this.scrollBar.visible ? 16 : 10);
       this.cursorObj = globalScene.add.nineslice(0, 0, "summary_moves_cursor", undefined, cursorWidth, 16, 1, 1, 1, 1);
       this.cursorObj.setOrigin(0, 0);
       this.optionsContainer.add(this.cursorObj);
@@ -390,9 +422,10 @@ export default class AbstractSettingsUiHandler extends MessageUiHandler {
           this.setOptionCursor(settingIndex, lastCursor, false);
         };
 
-        const confirmationMessage = setting.options[cursor].confirmationMessage ?? i18next.t("settings:defaultConfirmMessage");
+        const confirmationMessage =
+          setting.options[cursor].confirmationMessage ?? i18next.t("settings:defaultConfirmMessage");
         globalScene.ui.showText(confirmationMessage, null, () => {
-          globalScene.ui.setOverlayMode(Mode.CONFIRM, confirmUpdateSetting, cancelUpdateSetting, null, null, 1, 750);
+          globalScene.ui.setOverlayMode(UiMode.CONFIRM, confirmUpdateSetting, cancelUpdateSetting, null, null, 1, 750);
         });
       } else {
         saveSetting();
@@ -463,7 +496,14 @@ export default class AbstractSettingsUiHandler extends MessageUiHandler {
     this.cursorObj = null;
   }
 
-  override showText(text: string, delay?: number, callback?: Function, callbackDelay?: number, prompt?: boolean, promptDelay?: number) {
+  override showText(
+    text: string,
+    delay?: number,
+    callback?: Function,
+    callbackDelay?: number,
+    prompt?: boolean,
+    promptDelay?: number,
+  ) {
     this.messageBoxContainer.setVisible(!!text?.length);
     super.showText(text, delay, callback, callbackDelay, prompt, promptDelay);
   }
diff --git a/src/ui/settings/gamepad-binding-ui-handler.ts b/src/ui/settings/gamepad-binding-ui-handler.ts
index b69c2f34e06..0f226ddcafa 100644
--- a/src/ui/settings/gamepad-binding-ui-handler.ts
+++ b/src/ui/settings/gamepad-binding-ui-handler.ts
@@ -1,14 +1,12 @@
 import AbstractBindingUiHandler from "./abstract-binding-ui-handler";
-import type { Mode } from "../ui";
+import type { UiMode } from "#enums/ui-mode";
 import { Device } from "#enums/devices";
 import { getIconWithSettingName, getKeyWithKeycode } from "#app/configs/inputs/configHandler";
 import { addTextObject, TextStyle } from "#app/ui/text";
 import { globalScene } from "#app/global-scene";
 
-
 export default class GamepadBindingUiHandler extends AbstractBindingUiHandler {
-
-  constructor(mode: Mode | null = null) {
+  constructor(mode: UiMode | null = null) {
     super(mode);
     globalScene.input.gamepad?.on("down", this.gamepadButtonDown, this);
   }
@@ -23,7 +21,11 @@ export default class GamepadBindingUiHandler extends AbstractBindingUiHandler {
 
     this.swapText = addTextObject(0, 0, "will swap with", TextStyle.WINDOW);
     this.swapText.setOrigin(0.5);
-    this.swapText.setPositionRelative(this.optionSelectBg, this.optionSelectBg.width / 2 - 2, this.optionSelectBg.height / 2 - 2);
+    this.swapText.setPositionRelative(
+      this.optionSelectBg,
+      this.optionSelectBg.width / 2 - 2,
+      this.optionSelectBg.height / 2 - 2,
+    );
     this.swapText.setVisible(false);
 
     this.targetButtonIcon = globalScene.add.sprite(0, 0, "xbox");
@@ -45,10 +47,15 @@ export default class GamepadBindingUiHandler extends AbstractBindingUiHandler {
     return globalScene.inputController?.selectedDevice[Device.GAMEPAD];
   }
 
-  gamepadButtonDown(pad: Phaser.Input.Gamepad.Gamepad, button: Phaser.Input.Gamepad.Button, value: number): void {
-    const blacklist = [ 12, 13, 14, 15 ]; // d-pad buttons are blacklisted.
+  gamepadButtonDown(pad: Phaser.Input.Gamepad.Gamepad, button: Phaser.Input.Gamepad.Button, _value: number): void {
+    const blacklist = [12, 13, 14, 15]; // d-pad buttons are blacklisted.
     // Check conditions before processing the button press.
-    if (!this.listening || pad.id.toLowerCase() !== this.getSelectedDevice() || blacklist.includes(button.index) || this.buttonPressed !== null) {
+    if (
+      !this.listening ||
+      pad.id.toLowerCase() !== this.getSelectedDevice() ||
+      blacklist.includes(button.index) ||
+      this.buttonPressed !== null
+    ) {
       return;
     }
     const activeConfig = globalScene.inputController.getActiveConfig(Device.GAMEPAD);
@@ -73,8 +80,8 @@ export default class GamepadBindingUiHandler extends AbstractBindingUiHandler {
   }
 
   /**
-     * Clear the UI elements and state.
-     */
+   * Clear the UI elements and state.
+   */
   clear() {
     super.clear();
     this.targetButtonIcon.setVisible(false);
diff --git a/src/ui/settings/keyboard-binding-ui-handler.ts b/src/ui/settings/keyboard-binding-ui-handler.ts
index ddc60a15631..c05a31ca91e 100644
--- a/src/ui/settings/keyboard-binding-ui-handler.ts
+++ b/src/ui/settings/keyboard-binding-ui-handler.ts
@@ -1,14 +1,12 @@
 import AbstractBindingUiHandler from "./abstract-binding-ui-handler";
-import type { Mode } from "../ui";
+import type { UiMode } from "#enums/ui-mode";
 import { getKeyWithKeycode } from "#app/configs/inputs/configHandler";
 import { Device } from "#enums/devices";
 import { addTextObject, TextStyle } from "#app/ui/text";
 import { globalScene } from "#app/global-scene";
 
-
 export default class KeyboardBindingUiHandler extends AbstractBindingUiHandler {
-
-  constructor(mode: Mode | null = null) {
+  constructor(mode: UiMode | null = null) {
     super(mode);
     // Listen to gamepad button down events to initiate binding.
     globalScene.input.keyboard?.on("keydown", this.onKeyDown, this);
@@ -70,5 +68,4 @@ export default class KeyboardBindingUiHandler extends AbstractBindingUiHandler {
     }
     return false;
   }
-
 }
diff --git a/src/ui/settings/move-touch-controls-handler.ts b/src/ui/settings/move-touch-controls-handler.ts
index 6128f5954e8..44377c8c2ab 100644
--- a/src/ui/settings/move-touch-controls-handler.ts
+++ b/src/ui/settings/move-touch-controls-handler.ts
@@ -1,31 +1,30 @@
 import { globalScene } from "#app/global-scene";
 import type TouchControl from "#app/touch-controls";
 import type UI from "#app/ui/ui";
+import i18next from "i18next";
 
 export const TOUCH_CONTROL_POSITIONS_LANDSCAPE = "touchControlPositionsLandscape";
 export const TOUCH_CONTROL_POSITIONS_PORTRAIT = "touchControlPositionsPortrait";
 
-
-type ControlPosition = { id: string, x: number, y: number };
+type ControlPosition = { id: string; x: number; y: number };
 
 type ConfigurationEventListeners = {
-  "touchstart": EventListener[]
-  "touchmove": EventListener[]
-  "touchend": EventListener[]
+  touchstart: EventListener[];
+  touchmove: EventListener[];
+  touchend: EventListener[];
 };
 
 type ToolbarRefs = {
-  toolbar: HTMLDivElement,
-  saveButton: HTMLDivElement
-  resetButton: HTMLDivElement
-  cancelButton: HTMLDivElement
+  toolbar: HTMLDivElement;
+  saveButton: HTMLDivElement;
+  resetButton: HTMLDivElement;
+  cancelButton: HTMLDivElement;
 };
 
 /**
  * Handles the dragging of touch controls around the screen.
  */
 export default class MoveTouchControlsHandler {
-
   /** The element that is currently being dragged */
   private draggingElement: HTMLElement | null = null;
 
@@ -40,9 +39,9 @@ export default class MoveTouchControlsHandler {
    * These are used to remove the event listeners when the configuration mode is disabled.
    */
   private configurationEventListeners: ConfigurationEventListeners = {
-    "touchstart": [],
-    "touchmove": [],
-    "touchend": []
+    touchstart: [],
+    touchmove: [],
+    touchend: [],
   };
 
   private overlay: Phaser.GameObjects.Container;
@@ -54,7 +53,7 @@ export default class MoveTouchControlsHandler {
     this.touchControls = touchControls;
     this.inConfigurationMode = false;
     this.setPositions(this.getSavedPositionsOfCurrentOrientation() ?? []);
-    window.addEventListener("resize", (event) => {
+    window.addEventListener("resize", _event => {
       const screenSize = this.getScreenSize();
       if (screenSize.width > screenSize.height !== this.isLandscapeMode) {
         this.changeOrientation(screenSize.width > screenSize.height);
@@ -71,7 +70,9 @@ export default class MoveTouchControlsHandler {
     if (this.inConfigurationMode) {
       const orientation = document.querySelector("#touchControls #orientation");
       if (orientation) {
-        orientation.textContent = this.isLandscapeMode ? "Landscape" : "Portrait";
+        orientation.textContent = this.isLandscapeMode
+          ? i18next.t("settings:landscape")
+          : i18next.t("settings:portrait");
       }
     }
     const positions = this.getSavedPositionsOfCurrentOrientation() ?? [];
@@ -90,19 +91,22 @@ export default class MoveTouchControlsHandler {
     const toolbar = document.createElement("div");
     toolbar.id = "configToolbar";
     toolbar.innerHTML = `
-      <div class="column">
-        <div class="button-row">
-          <div id="resetButton" class="button">Reset</div>
-          <div id="saveButton" class="button">Save & close</div>
-          <div id="cancelButton" class="button">Cancel</div>
-        </div>
-        <div class="info-row">
-          <div class="orientation-label"> 
-            Orientation: <span id="orientation">${this.isLandscapeMode ? "Landscape" : "Portrait"}</span>
-          </div>
+    <div class="column">
+      <div class="button-row">
+        <div id="resetButton" class="button">${i18next.t("settings:touchReset")}</div>
+        <div id="saveButton" class="button">${i18next.t("settings:touchSaveClose")}</div>
+        <div id="cancelButton" class="button">${i18next.t("settings:touchCancel")}</div>
+      </div>
+      <div class="info-row">
+        <div class="orientation-label"> 
+          ${i18next.t("settings:orientation")}
+          <span id="orientation">
+            ${this.isLandscapeMode ? i18next.t("settings:landscape") : i18next.t("settings:portrait")}
+          </span>
         </div>
       </div>
-    `;
+    </div>
+  `;
     return toolbar;
   }
 
@@ -146,7 +150,7 @@ export default class MoveTouchControlsHandler {
       toolbar,
       saveButton: toolbar.querySelector("#saveButton")!,
       resetButton: toolbar.querySelector("#resetButton")!,
-      cancelButton: toolbar.querySelector("#cancelButton")!
+      cancelButton: toolbar.querySelector("#cancelButton")!,
     };
   }
 
@@ -178,7 +182,9 @@ export default class MoveTouchControlsHandler {
     }
     const rect = this.draggingElement.getBoundingClientRect();
     // Map the touch position to the center of the dragged element.
-    const xOffset = this.isLeft(this.draggingElement) ? touch.clientX - rect.width / 2 : window.innerWidth - touch.clientX - rect.width / 2;
+    const xOffset = this.isLeft(this.draggingElement)
+      ? touch.clientX - rect.width / 2
+      : window.innerWidth - touch.clientX - rect.width / 2;
     const yOffset = window.innerHeight - touch.clientY - rect.height / 2;
     this.setPosition(this.draggingElement, xOffset, yOffset);
   };
@@ -200,8 +206,8 @@ export default class MoveTouchControlsHandler {
       .map((controlGroup: HTMLElement) => {
         return {
           id: controlGroup.id,
-          x: parseFloat(this.isLeft(controlGroup) ? controlGroup.style.left : controlGroup.style.right),
-          y: parseFloat(controlGroup.style.bottom),
+          x: Number.parseFloat(this.isLeft(controlGroup) ? controlGroup.style.left : controlGroup.style.right),
+          y: Number.parseFloat(controlGroup.style.bottom),
         };
       });
   }
@@ -287,7 +293,7 @@ export default class MoveTouchControlsHandler {
    * @returns All control groups of the touch controls.
    */
   private getControlGroupElements(): HTMLDivElement[] {
-    return [ ...document.querySelectorAll("#touchControls .control-group") ] as HTMLDivElement[];
+    return [...document.querySelectorAll("#touchControls .control-group")] as HTMLDivElement[];
   }
 
   /**
@@ -297,21 +303,21 @@ export default class MoveTouchControlsHandler {
    */
   private createConfigurationEventListeners(controlGroups: HTMLDivElement[]): ConfigurationEventListeners {
     return {
-      "touchstart": controlGroups.map((element: HTMLDivElement) => {
+      touchstart: controlGroups.map((element: HTMLDivElement) => {
         const startDrag = () => this.startDrag(element);
         element.addEventListener("touchstart", startDrag, { passive: true });
         return startDrag;
       }),
-      "touchmove": controlGroups.map(() => {
-        const drag = (event) => this.drag(event.touches[0]);
+      touchmove: controlGroups.map(() => {
+        const drag = event => this.drag(event.touches[0]);
         window.addEventListener("touchmove", drag, { passive: true });
         return drag;
       }),
-      "touchend": controlGroups.map(() => {
+      touchend: controlGroups.map(() => {
         const stopDrag = () => this.stopDrag();
         window.addEventListener("touchend", stopDrag, { passive: true });
         return stopDrag;
-      })
+      }),
     };
   }
 
@@ -322,7 +328,15 @@ export default class MoveTouchControlsHandler {
    */
   private createOverlay(ui: UI) {
     const container = new Phaser.GameObjects.Container(globalScene, 0, 0);
-    const overlay = new Phaser.GameObjects.Rectangle(globalScene, 0, 0, globalScene.game.canvas.width, globalScene.game.canvas.height, 0x000000, 0.5);
+    const overlay = new Phaser.GameObjects.Rectangle(
+      globalScene,
+      0,
+      0,
+      globalScene.game.canvas.width,
+      globalScene.game.canvas.height,
+      0x000000,
+      0.5,
+    );
     overlay.setInteractive();
     container.add(overlay);
     ui.add(container);
@@ -333,9 +347,9 @@ export default class MoveTouchControlsHandler {
   }
 
   /**
-  * Allows the user to configure the touch controls by dragging buttons around the screen.
-  * @param ui The UI of the game.
-  */
+   * Allows the user to configure the touch controls by dragging buttons around the screen.
+   * @param ui The UI of the game.
+   */
   public enableConfigurationMode(ui: UI) {
     if (this.inConfigurationMode) {
       return;
@@ -360,9 +374,11 @@ export default class MoveTouchControlsHandler {
 
     // Remove event listeners
     const { touchstart, touchmove, touchend } = this.configurationEventListeners;
-    this.getControlGroupElements().forEach((element, index) => element.removeEventListener("touchstart", touchstart[index]));
-    touchmove.forEach((listener) => window.removeEventListener("touchmove", listener));
-    touchend.forEach((listener) => window.removeEventListener("touchend", listener));
+    this.getControlGroupElements().forEach((element, index) =>
+      element.removeEventListener("touchstart", touchstart[index]),
+    );
+    touchmove.forEach(listener => window.removeEventListener("touchmove", listener));
+    touchend.forEach(listener => window.removeEventListener("touchend", listener));
 
     // Remove configuration toolbar
     const toolbar = document.querySelector("#touchControls #configToolbar");
@@ -373,5 +389,4 @@ export default class MoveTouchControlsHandler {
     document.querySelector("#touchControls")?.classList.remove("config-mode");
     this.touchControls.enable();
   }
-
 }
diff --git a/src/ui/settings/navigationMenu.ts b/src/ui/settings/navigationMenu.ts
index 5fa53b7c270..ad3d4ccf0b5 100644
--- a/src/ui/settings/navigationMenu.ts
+++ b/src/ui/settings/navigationMenu.ts
@@ -1,5 +1,5 @@
 import { globalScene } from "#app/global-scene";
-import { Mode } from "#app/ui/ui";
+import { UiMode } from "#enums/ui-mode";
 import type { InputsIcons } from "#app/ui/settings/abstract-control-settings-ui-handler";
 import { addTextObject, setTextStyle, TextStyle } from "#app/ui/text";
 import { addWindow } from "#app/ui/ui-theme";
@@ -14,8 +14,8 @@ const RIGHT = "RIGHT";
  */
 export class NavigationManager {
   private static instance: NavigationManager;
-  public modes: Mode[];
-  public selectedMode: Mode = Mode.SETTINGS;
+  public modes: UiMode[];
+  public selectedMode: UiMode = UiMode.SETTINGS;
   public navigationMenus: NavigationMenu[] = new Array<NavigationMenu>();
   public labels: string[];
 
@@ -27,17 +27,23 @@ export class NavigationManager {
    */
   constructor() {
     this.modes = [
-      Mode.SETTINGS,
-      Mode.SETTINGS_DISPLAY,
-      Mode.SETTINGS_AUDIO,
-      Mode.SETTINGS_GAMEPAD,
-      Mode.SETTINGS_KEYBOARD,
+      UiMode.SETTINGS,
+      UiMode.SETTINGS_DISPLAY,
+      UiMode.SETTINGS_AUDIO,
+      UiMode.SETTINGS_GAMEPAD,
+      UiMode.SETTINGS_KEYBOARD,
+    ];
+    this.labels = [
+      i18next.t("settings:general"),
+      i18next.t("settings:display"),
+      i18next.t("settings:audio"),
+      i18next.t("settings:gamepad"),
+      i18next.t("settings:keyboard"),
     ];
-    this.labels = [ i18next.t("settings:general"), i18next.t("settings:display"), i18next.t("settings:audio"), i18next.t("settings:gamepad"), i18next.t("settings:keyboard") ];
   }
 
   public reset() {
-    this.selectedMode = Mode.SETTINGS;
+    this.selectedMode = UiMode.SETTINGS;
     this.updateNavigationMenus();
   }
 
@@ -95,7 +101,6 @@ export class NavigationManager {
   public clearNavigationMenus() {
     this.navigationMenus.length = 0;
   }
-
 }
 
 export default class NavigationMenu extends Phaser.GameObjects.Container {
@@ -118,7 +123,7 @@ export default class NavigationMenu extends Phaser.GameObjects.Container {
    */
   setup() {
     const navigationManager = NavigationManager.getInstance();
-    const headerBg = addWindow(0, 0, (globalScene.game.canvas.width / 6) - 2, 24);
+    const headerBg = addWindow(0, 0, globalScene.game.canvas.width / 6 - 2, 24);
     headerBg.setOrigin(0, 0);
     this.add(headerBg);
     this.width = headerBg.width;
@@ -161,7 +166,7 @@ export default class NavigationMenu extends Phaser.GameObjects.Container {
     const navigationManager = NavigationManager.getInstance();
     const posSelected = navigationManager.modes.indexOf(navigationManager.selectedMode);
 
-    for (const [ index, title ] of this.headerTitles.entries()) {
+    for (const [index, title] of this.headerTitles.entries()) {
       setTextStyle(title, index === posSelected ? TextStyle.SETTINGS_SELECTED : TextStyle.SETTINGS_LABEL);
     }
   }
@@ -171,8 +176,8 @@ export default class NavigationMenu extends Phaser.GameObjects.Container {
    */
   updateIcons() {
     const specialIcons = {
-      "BUTTON_HOME": "HOME.png",
-      "BUTTON_DELETE": "DEL.png",
+      BUTTON_HOME: "HOME.png",
+      BUTTON_DELETE: "DEL.png",
     };
     for (const settingName of Object.keys(this.navigationIcons)) {
       if (Object.keys(specialIcons).includes(settingName)) {
diff --git a/src/ui/settings/option-select-ui-handler.ts b/src/ui/settings/option-select-ui-handler.ts
index b3d1735dc19..af9760814ac 100644
--- a/src/ui/settings/option-select-ui-handler.ts
+++ b/src/ui/settings/option-select-ui-handler.ts
@@ -1,8 +1,8 @@
 import AbstractOptionSelectUiHandler from "../abstact-option-select-ui-handler";
-import { Mode } from "../ui";
+import { UiMode } from "#enums/ui-mode";
 
 export default class OptionSelectUiHandler extends AbstractOptionSelectUiHandler {
-  constructor(mode: Mode = Mode.OPTION_SELECT) {
+  constructor(mode: UiMode = UiMode.OPTION_SELECT) {
     super(mode);
   }
 
diff --git a/src/ui/settings/settings-audio-ui-handler.ts b/src/ui/settings/settings-audio-ui-handler.ts
index 3b591eab4b9..019d66d7428 100644
--- a/src/ui/settings/settings-audio-ui-handler.ts
+++ b/src/ui/settings/settings-audio-ui-handler.ts
@@ -1,7 +1,7 @@
-import type { Mode } from "../ui";
+import type { UiMode } from "#enums/ui-mode";
 import AbstractSettingsUiHandler from "./abstract-settings-ui-handler";
 import { SettingType } from "#app/system/settings/settings";
-"#app/inputs-controller";
+("#app/inputs-controller");
 
 export default class SettingsAudioUiHandler extends AbstractSettingsUiHandler {
   /**
@@ -9,7 +9,7 @@ export default class SettingsAudioUiHandler extends AbstractSettingsUiHandler {
    *
    * @param mode - The UI mode, optional.
    */
-  constructor(mode: Mode | null = null) {
+  constructor(mode: UiMode | null = null) {
     super(SettingType.AUDIO, mode);
     this.title = "Audio";
     this.localStorageKey = "settings";
diff --git a/src/ui/settings/settings-display-ui-handler.ts b/src/ui/settings/settings-display-ui-handler.ts
index 98fc16e2f96..4878bae72cb 100644
--- a/src/ui/settings/settings-display-ui-handler.ts
+++ b/src/ui/settings/settings-display-ui-handler.ts
@@ -1,7 +1,7 @@
-import type { Mode } from "../ui";
+import type { UiMode } from "#enums/ui-mode";
 import AbstractSettingsUiHandler from "./abstract-settings-ui-handler";
 import { SettingKeys, SettingType } from "#app/system/settings/settings";
-"#app/inputs-controller";
+("#app/inputs-controller");
 
 export default class SettingsDisplayUiHandler extends AbstractSettingsUiHandler {
   /**
@@ -9,7 +9,7 @@ export default class SettingsDisplayUiHandler extends AbstractSettingsUiHandler
    *
    * @param mode - The UI mode, optional.
    */
-  constructor(mode: Mode | null = null) {
+  constructor(mode: UiMode | null = null) {
     super(SettingType.DISPLAY, mode);
     this.title = "Display";
 
@@ -33,6 +33,12 @@ export default class SettingsDisplayUiHandler extends AbstractSettingsUiHandler
             label: "Español (ES)",
           };
           break;
+        case "es-MX":
+          this.settings[languageIndex].options[0] = {
+            value: "Español (LATAM)",
+            label: "Español (LATAM)",
+          };
+          break;
         case "it":
           this.settings[languageIndex].options[0] = {
             value: "Italiano",
diff --git a/src/ui/settings/settings-gamepad-ui-handler.ts b/src/ui/settings/settings-gamepad-ui-handler.ts
index 3d23b7e99bb..7d269deab14 100644
--- a/src/ui/settings/settings-gamepad-ui-handler.ts
+++ b/src/ui/settings/settings-gamepad-ui-handler.ts
@@ -1,11 +1,11 @@
 import { addTextObject, TextStyle } from "../text";
-import type { Mode } from "../ui";
+import type { UiMode } from "#enums/ui-mode";
 import {
   setSettingGamepad,
   SettingGamepad,
   settingGamepadBlackList,
   settingGamepadDefaults,
-  settingGamepadOptions
+  settingGamepadOptions,
 } from "../../system/settings/settings-gamepad";
 import pad_xbox360 from "#app/configs/inputs/pad_xbox360";
 import pad_dualshock from "#app/configs/inputs/pad_dualshock";
@@ -13,7 +13,7 @@ import pad_unlicensedSNES from "#app/configs/inputs/pad_unlicensedSNES";
 import type { InterfaceConfig } from "#app/inputs-controller";
 import AbstractControlSettingsUiHandler from "#app/ui/settings/abstract-control-settings-ui-handler";
 import { Device } from "#enums/devices";
-import { truncateString } from "#app/utils";
+import { truncateString } from "#app/utils/common";
 import i18next from "i18next";
 import { globalScene } from "#app/global-scene";
 
@@ -24,19 +24,18 @@ import { globalScene } from "#app/global-scene";
  */
 
 export default class SettingsGamepadUiHandler extends AbstractControlSettingsUiHandler {
-
   /**
-     * Creates an instance of SettingsGamepadUiHandler.
-     *
-     * @param mode - The UI mode, optional.
-     */
-  constructor(mode: Mode | null = null) {
+   * Creates an instance of SettingsGamepadUiHandler.
+   *
+   * @param mode - The UI mode, optional.
+   */
+  constructor(mode: UiMode | null = null) {
     super(mode);
     this.titleSelected = "Gamepad";
     this.setting = SettingGamepad;
     this.settingDeviceDefaults = settingGamepadDefaults;
     this.settingDeviceOptions = settingGamepadOptions;
-    this.configs = [ pad_xbox360, pad_dualshock, pad_unlicensedSNES ];
+    this.configs = [pad_xbox360, pad_dualshock, pad_unlicensedSNES];
     this.commonSettingsCount = 2;
     this.localStoragePropertyName = "settingsGamepad";
     this.settingBlacklisted = settingGamepadBlackList;
@@ -46,8 +45,8 @@ export default class SettingsGamepadUiHandler extends AbstractControlSettingsUiH
   setSetting = setSettingGamepad;
 
   /**
-     * Setup UI elements.
-     */
+   * Setup UI elements.
+   */
   setup() {
     super.setup();
     // If no gamepads are detected, set up a default UI prompt in the settings container.
@@ -65,11 +64,11 @@ export default class SettingsGamepadUiHandler extends AbstractControlSettingsUiH
   }
 
   /**
-     * Set the layout for the active configuration.
-     *
-     * @param activeConfig - The active gamepad configuration.
-     * @returns `true` if the layout was successfully applied, otherwise `false`.
-     */
+   * Set the layout for the active configuration.
+   *
+   * @param activeConfig - The active gamepad configuration.
+   * @returns `true` if the layout was successfully applied, otherwise `false`.
+   */
   setLayout(activeConfig: InterfaceConfig): boolean {
     // Check if there is no active configuration (e.g., no gamepad connected).
     if (!activeConfig) {
@@ -85,15 +84,15 @@ export default class SettingsGamepadUiHandler extends AbstractControlSettingsUiH
   }
 
   /**
-     * Update the display of the chosen gamepad.
-     */
+   * Update the display of the chosen gamepad.
+   */
   updateChosenGamepadDisplay(): void {
     // Update any bindings that might have changed since the last update.
     this.updateBindings();
     this.resetScroll();
 
     // Iterate over the keys in the settingDevice enumeration.
-    for (const [ index, key ] of Object.keys(this.setting).entries()) {
+    for (const [index, key] of Object.keys(this.setting).entries()) {
       const setting = this.setting[key]; // Get the actual setting value using the key.
 
       // Check if the current setting corresponds to the controller setting.
@@ -106,21 +105,29 @@ export default class SettingsGamepadUiHandler extends AbstractControlSettingsUiH
 
           // Update the text of the first option label under the current setting to the name of the chosen gamepad,
           // truncating the name to 30 characters if necessary.
-          this.layout[_key].optionValueLabels[index][0].setText(truncateString(globalScene.inputController.selectedDevice[Device.GAMEPAD], 20));
+          this.layout[_key].optionValueLabels[index][0].setText(
+            truncateString(globalScene.inputController.selectedDevice[Device.GAMEPAD], 20),
+          );
         }
       }
     }
   }
 
   /**
-     * Save the setting to local storage.
-     *
-     * @param settingName - The setting to save.
-     * @param cursor - The cursor position to save.
-     */
+   * Save the setting to local storage.
+   *
+   * @param settingName - The setting to save.
+   * @param cursor - The cursor position to save.
+   */
   saveSettingToLocalStorage(settingName, cursor): void {
     if (this.setting[settingName] !== this.setting.Controller) {
-      globalScene.gameData.saveControlSetting(this.device, this.localStoragePropertyName, settingName, this.settingDeviceDefaults, cursor);
+      globalScene.gameData.saveControlSetting(
+        this.device,
+        this.localStoragePropertyName,
+        settingName,
+        this.settingDeviceDefaults,
+        cursor,
+      );
     }
   }
 }
diff --git a/src/ui/settings/settings-keyboard-ui-handler.ts b/src/ui/settings/settings-keyboard-ui-handler.ts
index ad9f23cc0d9..c334ee8f1fc 100644
--- a/src/ui/settings/settings-keyboard-ui-handler.ts
+++ b/src/ui/settings/settings-keyboard-ui-handler.ts
@@ -1,13 +1,13 @@
-import { Mode } from "../ui";
+import { UiMode } from "#enums/ui-mode";
 import cfg_keyboard_qwerty from "#app/configs/inputs/cfg_keyboard_qwerty";
 import {
   setSettingKeyboard,
   SettingKeyboard,
   settingKeyboardBlackList,
   settingKeyboardDefaults,
-  settingKeyboardOptions
+  settingKeyboardOptions,
 } from "#app/system/settings/settings-keyboard";
-import { reverseValueToKeySetting, truncateString } from "#app/utils";
+import { reverseValueToKeySetting, truncateString } from "#app/utils/common";
 import AbstractControlSettingsUiHandler from "#app/ui/settings/abstract-control-settings-ui-handler";
 import type { InterfaceConfig } from "#app/inputs-controller";
 import { addTextObject, TextStyle } from "#app/ui/text";
@@ -24,17 +24,17 @@ import { globalScene } from "#app/global-scene";
  */
 export default class SettingsKeyboardUiHandler extends AbstractControlSettingsUiHandler {
   /**
-     * Creates an instance of SettingsKeyboardUiHandler.
-     *
-     * @param mode - The UI mode, optional.
-     */
-  constructor(mode: Mode | null = null) {
+   * Creates an instance of SettingsKeyboardUiHandler.
+   *
+   * @param mode - The UI mode, optional.
+   */
+  constructor(mode: UiMode | null = null) {
     super(mode);
     this.titleSelected = "Keyboard";
     this.setting = SettingKeyboard;
     this.settingDeviceDefaults = settingKeyboardDefaults;
     this.settingDeviceOptions = settingKeyboardOptions;
-    this.configs = [ cfg_keyboard_qwerty ];
+    this.configs = [cfg_keyboard_qwerty];
     this.commonSettingsCount = 0;
     this.textureOverride = "keyboard";
     this.localStoragePropertyName = "settingsKeyboard";
@@ -43,15 +43,15 @@ export default class SettingsKeyboardUiHandler extends AbstractControlSettingsUi
 
     const deleteEvent = globalScene.input.keyboard?.addKey(Phaser.Input.Keyboard.KeyCodes.DELETE);
     const restoreDefaultEvent = globalScene.input.keyboard?.addKey(Phaser.Input.Keyboard.KeyCodes.HOME);
-    deleteEvent && deleteEvent.on("up", this.onDeleteDown, this);
-    restoreDefaultEvent && restoreDefaultEvent.on("up", this.onHomeDown, this);
+    deleteEvent?.on("up", this.onDeleteDown, this);
+    restoreDefaultEvent?.on("up", this.onHomeDown, this);
   }
 
   setSetting = setSettingKeyboard;
 
   /**
-     * Setup UI elements.
-     */
+   * Setup UI elements.
+   */
   setup() {
     super.setup();
     // If no gamepads are detected, set up a default UI prompt in the settings container.
@@ -75,17 +75,16 @@ export default class SettingsKeyboardUiHandler extends AbstractControlSettingsUi
     this.settingsContainer.add(iconDelete);
     this.settingsContainer.add(deleteText);
 
-
     // Map the 'noKeyboard' layout options for easy access.
     this.layout["noKeyboard"].optionsContainer = optionsContainer;
     this.layout["noKeyboard"].label = label;
   }
 
   /**
-     * Handle the home key press event.
-     */
+   * Handle the home key press event.
+   */
   onHomeDown(): void {
-    if (![ Mode.SETTINGS_KEYBOARD, Mode.SETTINGS_GAMEPAD ].includes(globalScene.ui.getMode())) {
+    if (![UiMode.SETTINGS_KEYBOARD, UiMode.SETTINGS_GAMEPAD].includes(globalScene.ui.getMode())) {
       return;
     }
     globalScene.gameData.resetMappingToFactory();
@@ -93,10 +92,10 @@ export default class SettingsKeyboardUiHandler extends AbstractControlSettingsUi
   }
 
   /**
-     * Handle the delete key press event.
-     */
+   * Handle the delete key press event.
+   */
   onDeleteDown(): void {
-    if (globalScene.ui.getMode() !== Mode.SETTINGS_KEYBOARD) {
+    if (globalScene.ui.getMode() !== UiMode.SETTINGS_KEYBOARD) {
       return;
     }
     const cursor = this.cursor + this.scrollCursor; // Calculate the absolute cursor position.
@@ -113,11 +112,11 @@ export default class SettingsKeyboardUiHandler extends AbstractControlSettingsUi
   }
 
   /**
-     * Set the layout for the active configuration.
-     *
-     * @param activeConfig - The active keyboard configuration.
-     * @returns `true` if the layout was successfully applied, otherwise `false`.
-     */
+   * Set the layout for the active configuration.
+   *
+   * @param activeConfig - The active keyboard configuration.
+   * @returns `true` if the layout was successfully applied, otherwise `false`.
+   */
   setLayout(activeConfig: InterfaceConfig): boolean {
     // Check if there is no active configuration (e.g., no gamepad connected).
     if (!activeConfig) {
@@ -133,14 +132,14 @@ export default class SettingsKeyboardUiHandler extends AbstractControlSettingsUi
   }
 
   /**
-     * Update the display of the chosen keyboard layout.
-     */
+   * Update the display of the chosen keyboard layout.
+   */
   updateChosenKeyboardDisplay(): void {
     // Update any bindings that might have changed since the last update.
     this.updateBindings();
 
     // Iterate over the keys in the settingDevice enumeration.
-    for (const [ index, key ] of Object.keys(this.setting).entries()) {
+    for (const [index, key] of Object.keys(this.setting).entries()) {
       const setting = this.setting[key]; // Get the actual setting value using the key.
 
       // Check if the current setting corresponds to the layout setting.
@@ -152,31 +151,38 @@ export default class SettingsKeyboardUiHandler extends AbstractControlSettingsUi
           } // Skip updating the no gamepad layout.
           // Update the text of the first option label under the current setting to the name of the chosen gamepad,
           // truncating the name to 30 characters if necessary.
-          this.layout[_key].optionValueLabels[index][0].setText(truncateString(globalScene.inputController.selectedDevice[Device.KEYBOARD], 22));
+          this.layout[_key].optionValueLabels[index][0].setText(
+            truncateString(globalScene.inputController.selectedDevice[Device.KEYBOARD], 22),
+          );
         }
       }
     }
-
   }
 
   /**
-     * Save the custom keyboard mapping to local storage.
-     *
-     * @param config - The configuration to save.
-     */
+   * Save the custom keyboard mapping to local storage.
+   *
+   * @param config - The configuration to save.
+   */
   saveCustomKeyboardMappingToLocalStorage(config): void {
     globalScene.gameData.saveMappingConfigs(globalScene.inputController?.selectedDevice[Device.KEYBOARD], config);
   }
 
   /**
-     * Save the setting to local storage.
-     *
-     * @param settingName - The name of the setting to save.
-     * @param cursor - The cursor position to save.
-     */
+   * Save the setting to local storage.
+   *
+   * @param settingName - The name of the setting to save.
+   * @param cursor - The cursor position to save.
+   */
   saveSettingToLocalStorage(settingName, cursor): void {
     if (this.setting[settingName] !== this.setting.Default_Layout) {
-      globalScene.gameData.saveControlSetting(this.device, this.localStoragePropertyName, settingName, this.settingDeviceDefaults, cursor);
+      globalScene.gameData.saveControlSetting(
+        this.device,
+        this.localStoragePropertyName,
+        settingName,
+        this.settingDeviceDefaults,
+        cursor,
+      );
     }
   }
 }
diff --git a/src/ui/settings/settings-ui-handler.ts b/src/ui/settings/settings-ui-handler.ts
index 22ea76d798b..8d61044ff91 100644
--- a/src/ui/settings/settings-ui-handler.ts
+++ b/src/ui/settings/settings-ui-handler.ts
@@ -1,5 +1,5 @@
 import { SettingType } from "../../system/settings/settings";
-import type { Mode } from "../ui";
+import type { UiMode } from "#enums/ui-mode";
 import AbstractSettingsUiHandler from "./abstract-settings-ui-handler";
 
 export default class SettingsUiHandler extends AbstractSettingsUiHandler {
@@ -8,7 +8,7 @@ export default class SettingsUiHandler extends AbstractSettingsUiHandler {
    *
    * @param mode - The UI mode, optional.
    */
-  constructor(mode: Mode | null = null) {
+  constructor(mode: UiMode | null = null) {
     super(SettingType.GENERAL, mode);
     this.title = "General";
     this.localStorageKey = "settings";
diff --git a/src/ui/settings/shiny_icons.json b/src/ui/settings/shiny_icons.json
index d6465cf2c3a..f40c606ca47 100644
--- a/src/ui/settings/shiny_icons.json
+++ b/src/ui/settings/shiny_icons.json
@@ -1,41 +1,41 @@
 {
-	"textures": [
-		{
-			"image": "shiny_icons.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 45,
-				"h": 14
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 45,
-						"h": 14
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 15,
-						"h": 14
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 15,
-						"h": 14
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:a3275c7504a9b35b288265e191b1d14c:420725f3fb73c2cac0ab3bbc0a46f2e1:3a8b8ca0f0e4be067dd46c07b78ee013$"
-	}
+  "textures": [
+    {
+      "image": "shiny_icons.png",
+      "format": "RGBA8888",
+      "size": {
+        "w": 45,
+        "h": 14
+      },
+      "scale": 1,
+      "frames": [
+        {
+          "filename": "0",
+          "rotated": false,
+          "trimmed": false,
+          "sourceSize": {
+            "w": 45,
+            "h": 14
+          },
+          "spriteSourceSize": {
+            "x": 0,
+            "y": 0,
+            "w": 15,
+            "h": 14
+          },
+          "frame": {
+            "x": 0,
+            "y": 0,
+            "w": 15,
+            "h": 14
+          }
+        }
+      ]
+    }
+  ],
+  "meta": {
+    "app": "https://www.codeandweb.com/texturepacker",
+    "version": "3.0",
+    "smartupdate": "$TexturePacker:SmartUpdate:a3275c7504a9b35b288265e191b1d14c:420725f3fb73c2cac0ab3bbc0a46f2e1:3a8b8ca0f0e4be067dd46c07b78ee013$"
+  }
 }
diff --git a/src/ui/starter-container.ts b/src/ui/starter-container.ts
index 792ce97e103..71e40844f38 100644
--- a/src/ui/starter-container.ts
+++ b/src/ui/starter-container.ts
@@ -13,7 +13,7 @@ export class StarterContainer extends Phaser.GameObjects.Container {
   public classicWinIcon: Phaser.GameObjects.Image;
   public candyUpgradeIcon: Phaser.GameObjects.Image;
   public candyUpgradeOverlayIcon: Phaser.GameObjects.Image;
-  public cost: number = 0;
+  public cost = 0;
 
   constructor(species: PokemonSpecies) {
     super(globalScene, 0, 0);
@@ -32,10 +32,16 @@ export class StarterContainer extends Phaser.GameObjects.Container {
     this.starterPassiveBgs = starterPassiveBg;
 
     // icon
-    this.icon = globalScene.add.sprite(-2, 2, species.getIconAtlasKey(defaultProps.formIndex, defaultProps.shiny, defaultProps.variant));
+    this.icon = globalScene.add.sprite(
+      -2,
+      2,
+      species.getIconAtlasKey(defaultProps.formIndex, defaultProps.shiny, defaultProps.variant),
+    );
     this.icon.setScale(0.5);
     this.icon.setOrigin(0, 0);
-    this.icon.setFrame(species.getIconId(defaultProps.female, defaultProps.formIndex, defaultProps.shiny, defaultProps.variant));
+    this.icon.setFrame(
+      species.getIconId(defaultProps.female, defaultProps.formIndex, defaultProps.shiny, defaultProps.variant),
+    );
     this.checkIconId(defaultProps.female, defaultProps.formIndex, defaultProps.shiny, defaultProps.variant);
     this.icon.setTint(0);
     this.add(this.icon);
@@ -51,7 +57,9 @@ export class StarterContainer extends Phaser.GameObjects.Container {
     this.add(this.shinyIcons);
 
     // value label
-    const label = addTextObject(1, 2, "0", TextStyle.WINDOW, { fontSize: "32px" });
+    const label = addTextObject(1, 2, "0", TextStyle.WINDOW, {
+      fontSize: "32px",
+    });
     label.setShadowOffset(2, 2);
     label.setOrigin(0, 0);
     label.setVisible(false);
diff --git a/src/ui/starter-select-ui-handler.ts b/src/ui/starter-select-ui-handler.ts
index 20ca2cc88da..f24a3ff9265 100644
--- a/src/ui/starter-select-ui-handler.ts
+++ b/src/ui/starter-select-ui-handler.ts
@@ -1,18 +1,19 @@
 import type { CandyUpgradeNotificationChangedEvent } from "#app/events/battle-scene";
 import { BattleSceneEventType } from "#app/events/battle-scene";
 import { pokemonPrevolutions } from "#app/data/balance/pokemon-evolutions";
-import type { Variant } from "#app/data/variant";
-import { getVariantTint, getVariantIcon } from "#app/data/variant";
+import type { Variant } from "#app/sprites/variant";
+import { getVariantTint, getVariantIcon } from "#app/sprites/variant";
 import { argbFromRgba } from "@material/material-color-utilities";
 import i18next from "i18next";
 import type BBCodeText from "phaser3-rex-plugins/plugins/bbcodetext";
-import { starterColors } from "#app/battle-scene";
+import { starterColors } from "#app/global-vars/starter-colors";
 import { globalScene } from "#app/global-scene";
-import { allAbilities } from "#app/data/ability";
+import type { Ability } from "#app/data/abilities/ability-class";
+import { allAbilities } from "#app/data/data-lists";
 import { speciesEggMoves } from "#app/data/balance/egg-moves";
 import { GrowthRate, getGrowthRateColor } from "#app/data/exp";
 import { Gender, getGenderColor, getGenderSymbol } from "#app/data/gender";
-import { allMoves } from "#app/data/move";
+import { allMoves } from "#app/data/moves/move";
 import { getNatureName } from "#app/data/nature";
 import { pokemonFormChanges } from "#app/data/pokemon-forms";
 import type { LevelMoves } from "#app/data/balance/pokemon-level-moves";
@@ -20,23 +21,29 @@ import { pokemonFormLevelMoves, pokemonSpeciesLevelMoves } from "#app/data/balan
 import type PokemonSpecies from "#app/data/pokemon-species";
 import { allSpecies, getPokemonSpeciesForm, getPokerusStarters } from "#app/data/pokemon-species";
 import { getStarterValueFriendshipCap, speciesStarterCosts, POKERUS_STARTER_COUNT } from "#app/data/balance/starters";
-import { Type } from "#enums/type";
+import { PokemonType } from "#enums/pokemon-type";
 import { GameModes } from "#app/game-mode";
-import type { DexAttrProps, DexEntry, StarterMoveset, StarterAttributes, StarterPreferences } from "#app/system/game-data";
-import { AbilityAttr, DexAttr, StarterPrefs } from "#app/system/game-data";
+import type {
+  DexAttrProps,
+  DexEntry,
+  StarterMoveset,
+  StarterAttributes,
+  StarterPreferences,
+} from "#app/system/game-data";
+import { AbilityAttr, DexAttr, loadStarterPreferences, saveStarterPreferences } from "#app/system/game-data";
 import { Tutorial, handleTutorial } from "#app/tutorial";
 import type { OptionSelectItem } from "#app/ui/abstact-option-select-ui-handler";
 import MessageUiHandler from "#app/ui/message-ui-handler";
 import PokemonIconAnimHandler, { PokemonIconAnimMode } from "#app/ui/pokemon-icon-anim-handler";
 import { StatsContainer } from "#app/ui/stats-container";
 import { TextStyle, addBBCodeTextObject, addTextObject } from "#app/ui/text";
-import { Mode } from "#app/ui/ui";
+import { UiMode } from "#enums/ui-mode";
 import { addWindow } from "#app/ui/ui-theme";
 import { Egg } from "#app/data/egg";
 import Overrides from "#app/overrides";
 import { SettingKeyboard } from "#app/system/settings/settings-keyboard";
 import { Passive as PassiveAttr } from "#enums/passive";
-import * as Challenge from "#app/data/challenge";
+import { applyChallenges, ChallengeType } from "#app/data/challenge";
 import MoveInfoOverlay from "#app/ui/move-info-overlay";
 import { getEggTierForSpecies } from "#app/data/egg";
 import { Device } from "#enums/devices";
@@ -52,81 +59,107 @@ import { SelectChallengePhase } from "#app/phases/select-challenge-phase";
 import { EncounterPhase } from "#app/phases/encounter-phase";
 import { TitlePhase } from "#app/phases/title-phase";
 import { Abilities } from "#enums/abilities";
-import { getPassiveCandyCount, getValueReductionCandyCounts, getSameSpeciesEggCandyCounts } from "#app/data/balance/starters";
-import { BooleanHolder, capitalizeString, fixedInt, getLocalizedSpriteKey, isNullOrUndefined, NumberHolder, padInt, randIntRange, rgbHexToRgba, toReadableString } from "#app/utils";
+import {
+  getPassiveCandyCount,
+  getValueReductionCandyCounts,
+  getSameSpeciesEggCandyCounts,
+} from "#app/data/balance/starters";
+import {
+  BooleanHolder,
+  fixedInt,
+  getLocalizedSpriteKey,
+  isNullOrUndefined,
+  NumberHolder,
+  padInt,
+  randIntRange,
+  rgbHexToRgba,
+  toReadableString,
+} from "#app/utils/common";
 import type { Nature } from "#enums/nature";
 import { PLAYER_PARTY_MAX_SIZE } from "#app/constants";
+import { achvs } from "#app/system/achv";
+import type { GameObjects } from "phaser";
+import { checkStarterValidForChallenge } from "#app/data/challenge";
 
 export type StarterSelectCallback = (starters: Starter[]) => void;
 
 export interface Starter {
   species: PokemonSpecies;
   dexAttr: bigint;
-  abilityIndex: number,
+  abilityIndex: number;
   passive: boolean;
   nature: Nature;
   moveset?: StarterMoveset;
   pokerus: boolean;
   nickname?: string;
+  teraType?: PokemonType;
 }
 
 interface LanguageSetting {
-  starterInfoTextSize: string,
-  instructionTextSize: string,
-  starterInfoXPos?: number,
-  starterInfoYOffset?: number
+  starterInfoTextSize: string;
+  instructionTextSize: string;
+  starterInfoXPos?: number;
+  starterInfoYOffset?: number;
 }
 
 const languageSettings: { [key: string]: LanguageSetting } = {
-  "en":{
+  en: {
     starterInfoTextSize: "56px",
     instructionTextSize: "38px",
   },
-  "de":{
+  de: {
     starterInfoTextSize: "48px",
     instructionTextSize: "35px",
     starterInfoXPos: 33,
   },
-  "es-ES":{
-    starterInfoTextSize: "56px",
+  "es-ES": {
+    starterInfoTextSize: "52px",
     instructionTextSize: "35px",
   },
-  "fr":{
+  "es-MX": {
+    starterInfoTextSize: "52px",
+    instructionTextSize: "35px",
+  },
+  fr: {
     starterInfoTextSize: "54px",
     instructionTextSize: "38px",
   },
-  "it":{
+  it: {
     starterInfoTextSize: "56px",
     instructionTextSize: "38px",
   },
-  "pt_BR":{
+  pt_BR: {
     starterInfoTextSize: "47px",
     instructionTextSize: "38px",
     starterInfoXPos: 33,
   },
-  "zh":{
+  zh: {
     starterInfoTextSize: "47px",
     instructionTextSize: "38px",
     starterInfoYOffset: 1,
     starterInfoXPos: 24,
   },
-  "pt":{
+  pt: {
     starterInfoTextSize: "48px",
     instructionTextSize: "42px",
     starterInfoXPos: 33,
   },
-  "ko":{
+  ko: {
+    starterInfoTextSize: "60px",
+    instructionTextSize: "38px",
+    starterInfoYOffset: -0.5,
+    starterInfoXPos: 30,
+  },
+  ja: {
+    starterInfoTextSize: "62px",
+    instructionTextSize: "38px",
+    starterInfoYOffset: 0.5,
+    starterInfoXPos: 33,
+  },
+  "ca-ES": {
     starterInfoTextSize: "52px",
     instructionTextSize: "38px",
   },
-  "ja":{
-    starterInfoTextSize: "51px",
-    instructionTextSize: "38px",
-  },
-  "ca-ES":{
-    starterInfoTextSize: "56px",
-    instructionTextSize: "38px",
-  },
 };
 
 const valueReductionMax = 2;
@@ -145,7 +178,7 @@ const randomSelectionWindowHeight = 20;
  * @param index UI index to calculate the starter position of
  * @returns An interface with an x and y property
  */
-function calcStarterPosition(index: number, scrollCursor:number = 0): {x: number, y: number} {
+function calcStarterPosition(index: number, scrollCursor = 0): { x: number; y: number } {
   const yOffset = 13;
   const height = 17;
   const x = (index % 9) * 18;
@@ -171,7 +204,7 @@ function calcStarterIconY(index: number) {
  * @param teamSize how many Pokemon are in the team (0-6)
  * @returns index of the closest Pokemon in the team container
  */
-function findClosestStarterIndex(y: number, teamSize: number = 6): number {
+function findClosestStarterIndex(y: number, teamSize = 6): number {
   let smallestDistance = teamWindowHeight;
   let closestStarterIndex = 0;
   for (let i = 0; i < teamSize; i++) {
@@ -205,13 +238,14 @@ function findClosestStarterRow(index: number, numberOfRows: number) {
 }
 
 interface SpeciesDetails {
-  shiny?: boolean,
-  formIndex?: number
-  female?: boolean,
-  variant?: Variant,
-  abilityIndex?: number,
-  natureIndex?: number,
-  forSeen?: boolean, // default = false
+  shiny?: boolean;
+  formIndex?: number;
+  female?: boolean;
+  variant?: Variant;
+  abilityIndex?: number;
+  natureIndex?: number;
+  forSeen?: boolean; // default = false
+  teraType?: PokemonType;
 }
 
 export default class StarterSelectUiHandler extends MessageUiHandler {
@@ -257,11 +291,12 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
   private pokemonCaughtHatchedContainer: Phaser.GameObjects.Container;
   private pokemonCaughtCountText: Phaser.GameObjects.Text;
   private pokemonFormText: Phaser.GameObjects.Text;
-  private pokemonHatchedIcon : Phaser.GameObjects.Sprite;
+  private pokemonHatchedIcon: Phaser.GameObjects.Sprite;
   private pokemonHatchedCountText: Phaser.GameObjects.Text;
   private pokemonShinyIcon: Phaser.GameObjects.Sprite;
   private pokemonPassiveDisabledIcon: Phaser.GameObjects.Sprite;
   private pokemonPassiveLockedIcon: Phaser.GameObjects.Sprite;
+  private teraIcon: Phaser.GameObjects.Sprite;
 
   private activeTooltip: "ABILITY" | "PASSIVE" | "CANDY" | undefined;
   private instructionsContainer: Phaser.GameObjects.Container;
@@ -271,28 +306,31 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
   private abilityIconElement: Phaser.GameObjects.Sprite;
   private genderIconElement: Phaser.GameObjects.Sprite;
   private natureIconElement: Phaser.GameObjects.Sprite;
+  private teraIconElement: Phaser.GameObjects.Sprite;
   private goFilterIconElement: Phaser.GameObjects.Sprite;
   private shinyLabel: Phaser.GameObjects.Text;
   private formLabel: Phaser.GameObjects.Text;
   private genderLabel: Phaser.GameObjects.Text;
   private abilityLabel: Phaser.GameObjects.Text;
   private natureLabel: Phaser.GameObjects.Text;
+  private teraLabel: Phaser.GameObjects.Text;
   private goFilterLabel: Phaser.GameObjects.Text;
 
   private starterSelectMessageBox: Phaser.GameObjects.NineSlice;
   private starterSelectMessageBoxContainer: Phaser.GameObjects.Container;
   private statsContainer: StatsContainer;
-  private moveInfoOverlay : MoveInfoOverlay;
+  private moveInfoOverlay: MoveInfoOverlay;
 
   private statsMode: boolean;
-  private starterIconsCursorXOffset: number = -3;
-  private starterIconsCursorYOffset: number = 1;
+  private starterIconsCursorXOffset = -3;
+  private starterIconsCursorYOffset = 1;
   private starterIconsCursorIndex: number;
   private filterMode: boolean;
-  private dexAttrCursor: bigint = 0n;
-  private abilityCursor: number = -1;
-  private natureCursor: number = -1;
-  private filterBarCursor: number = 0;
+  private dexAttrCursor = 0n;
+  private abilityCursor = -1;
+  private natureCursor = -1;
+  private teraCursor: PokemonType = PokemonType.UNKNOWN;
+  private filterBarCursor = 0;
   private starterMoveset: StarterMoveset | null;
   private scrollCursor: number;
 
@@ -304,6 +342,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
   private starterAttr: bigint[] = [];
   private starterAbilityIndexes: number[] = [];
   private starterNatures: Nature[] = [];
+  private starterTeras: PokemonType[] = [];
   private starterMovesets: StarterMoveset[] = [];
   private speciesStarterDexEntry: DexEntry | null;
   private speciesStarterMoves: Moves[];
@@ -312,6 +351,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
   private canCycleGender: boolean;
   private canCycleAbility: boolean;
   private canCycleNature: boolean;
+  private canCycleTera: boolean;
 
   private assetLoadCancelled: BooleanHolder | null;
   public cursorObj: Phaser.GameObjects.Image;
@@ -336,10 +376,10 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
 
   private starterPreferences: StarterPreferences;
 
-  protected blockInput: boolean = false;
+  protected blockInput = false;
 
   constructor() {
-    super(Mode.STARTER_SELECT);
+    super(UiMode.STARTER_SELECT);
   }
 
   setup() {
@@ -352,7 +392,13 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
     this.starterSelectContainer.setVisible(false);
     ui.add(this.starterSelectContainer);
 
-    const bgColor = globalScene.add.rectangle(0, 0, globalScene.game.canvas.width / 6, globalScene.game.canvas.height / 6, 0x006860);
+    const bgColor = globalScene.add.rectangle(
+      0,
+      0,
+      globalScene.game.canvas.width / 6,
+      globalScene.game.canvas.height / 6,
+      0x006860,
+    );
     bgColor.setOrigin(0, 0);
     this.starterSelectContainer.add(bgColor);
 
@@ -366,13 +412,27 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
     this.starterSelectContainer.add(this.shinyOverlay);
 
     const starterContainerWindow = addWindow(speciesContainerX, filterBarHeight + 1, 175, 161);
-    const starterContainerBg = globalScene.add.image(speciesContainerX + 1, filterBarHeight + 2, "starter_container_bg");
+    const starterContainerBg = globalScene.add.image(
+      speciesContainerX + 1,
+      filterBarHeight + 2,
+      "starter_container_bg",
+    );
     starterContainerBg.setOrigin(0, 0);
     this.starterSelectContainer.add(starterContainerBg);
 
-    this.starterSelectContainer.add(addWindow(teamWindowX, teamWindowY - randomSelectionWindowHeight, teamWindowWidth, randomSelectionWindowHeight, true));
-    this.starterSelectContainer.add(addWindow(teamWindowX, teamWindowY, teamWindowWidth, teamWindowHeight ));
-    this.starterSelectContainer.add(addWindow(teamWindowX, teamWindowY + teamWindowHeight, teamWindowWidth, teamWindowWidth, true));
+    this.starterSelectContainer.add(
+      addWindow(
+        teamWindowX,
+        teamWindowY - randomSelectionWindowHeight,
+        teamWindowWidth,
+        randomSelectionWindowHeight,
+        true,
+      ),
+    );
+    this.starterSelectContainer.add(addWindow(teamWindowX, teamWindowY, teamWindowWidth, teamWindowHeight));
+    this.starterSelectContainer.add(
+      addWindow(teamWindowX, teamWindowY + teamWindowHeight, teamWindowWidth, teamWindowWidth, true),
+    );
     this.starterSelectContainer.add(starterContainerWindow);
 
     // Create and initialise filter bar
@@ -395,7 +455,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
     this.filterBar.addFilter(DropDownColumn.GEN, i18next.t("filterBar:genFilter"), genDropDown);
 
     // type filter
-    const typeKeys = Object.keys(Type).filter(v => isNaN(Number(v)));
+    const typeKeys = Object.keys(PokemonType).filter(v => Number.isNaN(Number(v)));
     const typeOptions: DropDownOption[] = [];
     typeKeys.forEach((type, index) => {
       if (index === 0 || index === 19) {
@@ -406,7 +466,11 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
       typeSprite.setFrame(type.toLowerCase());
       typeOptions.push(new DropDownOption(index, new DropDownLabel("", typeSprite)));
     });
-    this.filterBar.addFilter(DropDownColumn.TYPES, i18next.t("filterBar:typeFilter"), new DropDown(0, 0, typeOptions, this.updateStarters, DropDownType.HYBRID, 0.5));
+    this.filterBar.addFilter(
+      DropDownColumn.TYPES,
+      i18next.t("filterBar:typeFilter"),
+      new DropDown(0, 0, typeOptions, this.updateStarters, DropDownType.HYBRID, 0.5),
+    );
 
     // caught filter
     const shiny1Sprite = globalScene.add.sprite(0, 0, "shiny_icons");
@@ -430,10 +494,14 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
       new DropDownOption("SHINY2", new DropDownLabel("", shiny2Sprite)),
       new DropDownOption("SHINY", new DropDownLabel("", shiny1Sprite)),
       new DropDownOption("NORMAL", new DropDownLabel(i18next.t("filterBar:normal"))),
-      new DropDownOption("UNCAUGHT", new DropDownLabel(i18next.t("filterBar:uncaught")))
+      new DropDownOption("UNCAUGHT", new DropDownLabel(i18next.t("filterBar:uncaught"))),
     ];
 
-    this.filterBar.addFilter(DropDownColumn.CAUGHT, i18next.t("filterBar:caughtFilter"), new DropDown(0, 0, caughtOptions, this.updateStarters, DropDownType.HYBRID));
+    this.filterBar.addFilter(
+      DropDownColumn.CAUGHT,
+      i18next.t("filterBar:caughtFilter"),
+      new DropDown(0, 0, caughtOptions, this.updateStarters, DropDownType.HYBRID),
+    );
 
     // unlocks filter
     const passiveLabels = [
@@ -457,7 +525,11 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
       new DropDownOption("COST_REDUCTION", costReductionLabels),
     ];
 
-    this.filterBar.addFilter(DropDownColumn.UNLOCKS, i18next.t("filterBar:unlocksFilter"), new DropDown(0, 0, unlocksOptions, this.updateStarters, DropDownType.RADIAL));
+    this.filterBar.addFilter(
+      DropDownColumn.UNLOCKS,
+      i18next.t("filterBar:unlocksFilter"),
+      new DropDown(0, 0, unlocksOptions, this.updateStarters, DropDownType.RADIAL),
+    );
 
     // misc filter
     const favoriteLabels = [
@@ -490,19 +562,30 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
       new DropDownOption("EGG", eggLabels),
       new DropDownOption("POKERUS", pokerusLabels),
     ];
-    this.filterBar.addFilter(DropDownColumn.MISC, i18next.t("filterBar:miscFilter"), new DropDown(0, 0, miscOptions, this.updateStarters, DropDownType.RADIAL));
+    this.filterBar.addFilter(
+      DropDownColumn.MISC,
+      i18next.t("filterBar:miscFilter"),
+      new DropDown(0, 0, miscOptions, this.updateStarters, DropDownType.RADIAL),
+    );
 
     // sort filter
     const sortOptions = [
-      new DropDownOption(SortCriteria.NUMBER, new DropDownLabel(i18next.t("filterBar:sortByNumber"), undefined, DropDownState.ON)),
+      new DropDownOption(
+        SortCriteria.NUMBER,
+        new DropDownLabel(i18next.t("filterBar:sortByNumber"), undefined, DropDownState.ON),
+      ),
       new DropDownOption(SortCriteria.COST, new DropDownLabel(i18next.t("filterBar:sortByCost"))),
       new DropDownOption(SortCriteria.CANDY, new DropDownLabel(i18next.t("filterBar:sortByCandies"))),
       new DropDownOption(SortCriteria.IV, new DropDownLabel(i18next.t("filterBar:sortByIVs"))),
       new DropDownOption(SortCriteria.NAME, new DropDownLabel(i18next.t("filterBar:sortByName"))),
       new DropDownOption(SortCriteria.CAUGHT, new DropDownLabel(i18next.t("filterBar:sortByNumCaught"))),
-      new DropDownOption(SortCriteria.HATCHED, new DropDownLabel(i18next.t("filterBar:sortByNumHatched")))
+      new DropDownOption(SortCriteria.HATCHED, new DropDownLabel(i18next.t("filterBar:sortByNumHatched"))),
     ];
-    this.filterBar.addFilter(DropDownColumn.SORT, i18next.t("filterBar:sortFilter"), new DropDown(0, 0, sortOptions, this.updateStarters, DropDownType.SINGLE));
+    this.filterBar.addFilter(
+      DropDownColumn.SORT,
+      i18next.t("filterBar:sortFilter"),
+      new DropDown(0, 0, sortOptions, this.updateStarters, DropDownType.SINGLE),
+    );
     this.filterBarContainer.add(this.filterBar);
 
     this.starterSelectContainer.add(this.filterBarContainer);
@@ -517,6 +600,13 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
     this.iconAnimHandler = new PokemonIconAnimHandler();
     this.iconAnimHandler.setup();
 
+    this.pokemonSprite = globalScene.add.sprite(53, 63, "pkmn__sub");
+    this.pokemonSprite.setPipeline(globalScene.spritePipeline, {
+      tone: [0.0, 0.0, 0.0, 0.0],
+      ignoreTimeTint: true,
+    });
+    this.starterSelectContainer.add(this.pokemonSprite);
+
     this.pokemonNumberText = addTextObject(17, 1, "0000", TextStyle.SUMMARY);
     this.pokemonNumberText.setOrigin(0, 0);
     this.starterSelectContainer.add(this.pokemonNumberText);
@@ -525,7 +615,13 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
     this.pokemonNameText.setOrigin(0, 0);
     this.starterSelectContainer.add(this.pokemonNameText);
 
-    this.pokemonGrowthRateLabelText = addTextObject(8, 106, i18next.t("starterSelectUiHandler:growthRate"), TextStyle.SUMMARY_ALT, { fontSize: "36px" });
+    this.pokemonGrowthRateLabelText = addTextObject(
+      8,
+      106,
+      i18next.t("starterSelectUiHandler:growthRate"),
+      TextStyle.SUMMARY_ALT,
+      { fontSize: "36px" },
+    );
     this.pokemonGrowthRateLabelText.setOrigin(0, 0);
     this.pokemonGrowthRateLabelText.setVisible(false);
     this.starterSelectContainer.add(this.pokemonGrowthRateLabelText);
@@ -538,11 +634,16 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
     this.pokemonGenderText.setOrigin(0, 0);
     this.starterSelectContainer.add(this.pokemonGenderText);
 
-    this.pokemonUncaughtText = addTextObject(6, 127, i18next.t("starterSelectUiHandler:uncaught"), TextStyle.SUMMARY_ALT, { fontSize: "56px" });
+    this.pokemonUncaughtText = addTextObject(
+      6,
+      127,
+      i18next.t("starterSelectUiHandler:uncaught"),
+      TextStyle.SUMMARY_ALT,
+      { fontSize: "56px" },
+    );
     this.pokemonUncaughtText.setOrigin(0, 0);
     this.starterSelectContainer.add(this.pokemonUncaughtText);
 
-
     // The position should be set per language
     const starterInfoXPos = textSettings?.starterInfoXPos || 31;
     const starterInfoYOffset = textSettings?.starterInfoYOffset || 0;
@@ -550,24 +651,40 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
     // The font size should be set per language
     const starterInfoTextSize = textSettings?.starterInfoTextSize || 56;
 
-    this.pokemonAbilityLabelText = addTextObject(6, 127 + starterInfoYOffset, i18next.t("starterSelectUiHandler:ability"), TextStyle.SUMMARY_ALT, { fontSize: starterInfoTextSize });
+    this.pokemonAbilityLabelText = addTextObject(
+      6,
+      127 + starterInfoYOffset,
+      i18next.t("starterSelectUiHandler:ability"),
+      TextStyle.SUMMARY_ALT,
+      { fontSize: starterInfoTextSize },
+    );
     this.pokemonAbilityLabelText.setOrigin(0, 0);
     this.pokemonAbilityLabelText.setVisible(false);
 
     this.starterSelectContainer.add(this.pokemonAbilityLabelText);
 
-    this.pokemonAbilityText = addTextObject(starterInfoXPos, 127 + starterInfoYOffset, "", TextStyle.SUMMARY_ALT, { fontSize: starterInfoTextSize });
+    this.pokemonAbilityText = addTextObject(starterInfoXPos, 127 + starterInfoYOffset, "", TextStyle.SUMMARY_ALT, {
+      fontSize: starterInfoTextSize,
+    });
     this.pokemonAbilityText.setOrigin(0, 0);
     this.pokemonAbilityText.setInteractive(new Phaser.Geom.Rectangle(0, 0, 250, 55), Phaser.Geom.Rectangle.Contains);
 
     this.starterSelectContainer.add(this.pokemonAbilityText);
 
-    this.pokemonPassiveLabelText = addTextObject(6, 136 + starterInfoYOffset, i18next.t("starterSelectUiHandler:passive"), TextStyle.SUMMARY_ALT, { fontSize: starterInfoTextSize });
+    this.pokemonPassiveLabelText = addTextObject(
+      6,
+      136 + starterInfoYOffset,
+      i18next.t("starterSelectUiHandler:passive"),
+      TextStyle.SUMMARY_ALT,
+      { fontSize: starterInfoTextSize },
+    );
     this.pokemonPassiveLabelText.setOrigin(0, 0);
     this.pokemonPassiveLabelText.setVisible(false);
     this.starterSelectContainer.add(this.pokemonPassiveLabelText);
 
-    this.pokemonPassiveText = addTextObject(starterInfoXPos, 136 + starterInfoYOffset, "", TextStyle.SUMMARY_ALT, { fontSize: starterInfoTextSize });
+    this.pokemonPassiveText = addTextObject(starterInfoXPos, 136 + starterInfoYOffset, "", TextStyle.SUMMARY_ALT, {
+      fontSize: starterInfoTextSize,
+    });
     this.pokemonPassiveText.setOrigin(0, 0);
     this.pokemonPassiveText.setInteractive(new Phaser.Geom.Rectangle(0, 0, 250, 55), Phaser.Geom.Rectangle.Contains);
     this.starterSelectContainer.add(this.pokemonPassiveText);
@@ -584,12 +701,20 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
     this.pokemonPassiveLockedIcon.setVisible(false);
     this.starterSelectContainer.add(this.pokemonPassiveLockedIcon);
 
-    this.pokemonNatureLabelText = addTextObject(6, 145 + starterInfoYOffset, i18next.t("starterSelectUiHandler:nature"), TextStyle.SUMMARY_ALT, { fontSize: starterInfoTextSize });
+    this.pokemonNatureLabelText = addTextObject(
+      6,
+      145 + starterInfoYOffset,
+      i18next.t("starterSelectUiHandler:nature"),
+      TextStyle.SUMMARY_ALT,
+      { fontSize: starterInfoTextSize },
+    );
     this.pokemonNatureLabelText.setOrigin(0, 0);
     this.pokemonNatureLabelText.setVisible(false);
     this.starterSelectContainer.add(this.pokemonNatureLabelText);
 
-    this.pokemonNatureText = addBBCodeTextObject(starterInfoXPos, 145 + starterInfoYOffset, "", TextStyle.SUMMARY_ALT, { fontSize: starterInfoTextSize });
+    this.pokemonNatureText = addBBCodeTextObject(starterInfoXPos, 145 + starterInfoYOffset, "", TextStyle.SUMMARY_ALT, {
+      fontSize: starterInfoTextSize,
+    });
     this.pokemonNatureText.setOrigin(0, 0);
     this.starterSelectContainer.add(this.pokemonNatureText);
 
@@ -609,16 +734,43 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
     startLabel.setOrigin(0.5, 0);
     this.starterSelectContainer.add(startLabel);
 
-    this.startCursorObj = globalScene.add.nineslice(teamWindowX + 4, 160, "select_cursor", undefined, 26, 15, 6, 6, 6, 6);
+    this.startCursorObj = globalScene.add.nineslice(
+      teamWindowX + 4,
+      160,
+      "select_cursor",
+      undefined,
+      26,
+      15,
+      6,
+      6,
+      6,
+      6,
+    );
     this.startCursorObj.setVisible(false);
     this.startCursorObj.setOrigin(0, 0);
     this.starterSelectContainer.add(this.startCursorObj);
 
-    const randomSelectLabel = addTextObject(teamWindowX + 17, 23, i18next.t("starterSelectUiHandler:randomize"), TextStyle.TOOLTIP_CONTENT);
+    const randomSelectLabel = addTextObject(
+      teamWindowX + 17,
+      23,
+      i18next.t("starterSelectUiHandler:randomize"),
+      TextStyle.TOOLTIP_CONTENT,
+    );
     randomSelectLabel.setOrigin(0.5, 0);
     this.starterSelectContainer.add(randomSelectLabel);
 
-    this.randomCursorObj = globalScene.add.nineslice(teamWindowX + 4, 21, "select_cursor", undefined, 26, 15, 6, 6, 6, 6);
+    this.randomCursorObj = globalScene.add.nineslice(
+      teamWindowX + 4,
+      21,
+      "select_cursor",
+      undefined,
+      26,
+      15,
+      6,
+      6,
+      6,
+      6,
+    );
     this.randomCursorObj.setVisible(false);
     this.randomCursorObj.setOrigin(0, 0);
     this.starterSelectContainer.add(this.randomCursorObj);
@@ -684,10 +836,6 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
       return icon;
     });
 
-    this.pokemonSprite = globalScene.add.sprite(53, 63, "pkmn__sub");
-    this.pokemonSprite.setPipeline(globalScene.spritePipeline, { tone: [ 0.0, 0.0, 0.0, 0.0 ], ignoreTimeTint: true });
-    this.starterSelectContainer.add(this.pokemonSprite);
-
     this.type1Icon = globalScene.add.sprite(8, 98, getLocalizedSpriteKey("types"));
     this.type1Icon.setScale(0.5);
     this.type1Icon.setOrigin(0, 0);
@@ -698,11 +846,15 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
     this.type2Icon.setOrigin(0, 0);
     this.starterSelectContainer.add(this.type2Icon);
 
-    this.pokemonLuckLabelText = addTextObject(8, 89, i18next.t("common:luckIndicator"), TextStyle.WINDOW_ALT, { fontSize: "56px" });
+    this.pokemonLuckLabelText = addTextObject(8, 89, i18next.t("common:luckIndicator"), TextStyle.WINDOW_ALT, {
+      fontSize: "56px",
+    });
     this.pokemonLuckLabelText.setOrigin(0, 0);
     this.starterSelectContainer.add(this.pokemonLuckLabelText);
 
-    this.pokemonLuckText = addTextObject(8 + this.pokemonLuckLabelText.displayWidth + 2, 89, "0", TextStyle.WINDOW, { fontSize: "56px" });
+    this.pokemonLuckText = addTextObject(8 + this.pokemonLuckLabelText.displayWidth + 2, 89, "0", TextStyle.WINDOW, {
+      fontSize: "56px",
+    });
     this.pokemonLuckText.setOrigin(0, 0);
     this.starterSelectContainer.add(this.pokemonLuckText);
 
@@ -723,7 +875,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
     this.pokemonCandyDarknessOverlay.setScale(0.5);
     this.pokemonCandyDarknessOverlay.setOrigin(0, 0);
     this.pokemonCandyDarknessOverlay.setTint(0x000000);
-    this.pokemonCandyDarknessOverlay.setAlpha(0.50);
+    this.pokemonCandyDarknessOverlay.setAlpha(0.5);
     this.pokemonCandyContainer.add(this.pokemonCandyDarknessOverlay);
 
     this.pokemonCandyCountText = addTextObject(9.5, 0, "x0", TextStyle.WINDOW_ALT, { fontSize: "56px" });
@@ -733,7 +885,9 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
     this.pokemonCandyContainer.setInteractive(new Phaser.Geom.Rectangle(0, 0, 30, 20), Phaser.Geom.Rectangle.Contains);
     this.starterSelectContainer.add(this.pokemonCandyContainer);
 
-    this.pokemonFormText = addTextObject(6, 42, "Form", TextStyle.WINDOW_ALT, { fontSize: "42px" });
+    this.pokemonFormText = addTextObject(6, 42, "Form", TextStyle.WINDOW_ALT, {
+      fontSize: "42px",
+    });
     this.pokemonFormText.setOrigin(0, 0);
     this.starterSelectContainer.add(this.pokemonFormText);
 
@@ -786,7 +940,12 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
       this.pokemonMovesContainer.add(moveContainer);
     }
 
-    this.pokemonAdditionalMoveCountLabel = addTextObject(-this.pokemonMoveBgs[0].width / 2, 56, "(+0)", TextStyle.PARTY);
+    this.pokemonAdditionalMoveCountLabel = addTextObject(
+      -this.pokemonMoveBgs[0].width / 2,
+      56,
+      "(+0)",
+      TextStyle.PARTY,
+    );
     this.pokemonAdditionalMoveCountLabel.setOrigin(0.5, 0);
 
     this.pokemonMovesContainer.add(this.pokemonAdditionalMoveCountLabel);
@@ -823,6 +982,11 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
 
     this.starterSelectContainer.add(this.pokemonEggMovesContainer);
 
+    this.teraIcon = globalScene.add.sprite(85, 63, "button_tera");
+    this.teraIcon.setName("terrastallize-icon");
+    this.teraIcon.setFrame("fire");
+    this.starterSelectContainer.add(this.teraIcon);
+
     // The font size should be set per language
     const instructionTextSize = textSettings.instructionTextSize;
 
@@ -832,46 +996,137 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
 
     // instruction rows that will be pushed into the container dynamically based on need
     // creating new sprites since they will be added to the scene later
-    this.shinyIconElement = new Phaser.GameObjects.Sprite(globalScene, this.instructionRowX, this.instructionRowY, "keyboard", "R.png");
+    this.shinyIconElement = new Phaser.GameObjects.Sprite(
+      globalScene,
+      this.instructionRowX,
+      this.instructionRowY,
+      "keyboard",
+      "R.png",
+    );
     this.shinyIconElement.setName("sprite-shiny-icon-element");
     this.shinyIconElement.setScale(0.675);
     this.shinyIconElement.setOrigin(0.0, 0.0);
-    this.shinyLabel = addTextObject(this.instructionRowX + this.instructionRowTextOffset, this.instructionRowY, i18next.t("starterSelectUiHandler:cycleShiny"), TextStyle.PARTY, { fontSize: instructionTextSize });
+    this.shinyLabel = addTextObject(
+      this.instructionRowX + this.instructionRowTextOffset,
+      this.instructionRowY,
+      i18next.t("starterSelectUiHandler:cycleShiny"),
+      TextStyle.PARTY,
+      { fontSize: instructionTextSize },
+    );
     this.shinyLabel.setName("text-shiny-label");
 
-    this.formIconElement = new Phaser.GameObjects.Sprite(globalScene, this.instructionRowX, this.instructionRowY, "keyboard", "F.png");
+    this.formIconElement = new Phaser.GameObjects.Sprite(
+      globalScene,
+      this.instructionRowX,
+      this.instructionRowY,
+      "keyboard",
+      "F.png",
+    );
     this.formIconElement.setName("sprite-form-icon-element");
     this.formIconElement.setScale(0.675);
     this.formIconElement.setOrigin(0.0, 0.0);
-    this.formLabel = addTextObject(this.instructionRowX + this.instructionRowTextOffset, this.instructionRowY, i18next.t("starterSelectUiHandler:cycleForm"), TextStyle.PARTY, { fontSize: instructionTextSize });
+    this.formLabel = addTextObject(
+      this.instructionRowX + this.instructionRowTextOffset,
+      this.instructionRowY,
+      i18next.t("starterSelectUiHandler:cycleForm"),
+      TextStyle.PARTY,
+      { fontSize: instructionTextSize },
+    );
     this.formLabel.setName("text-form-label");
 
-    this.genderIconElement = new Phaser.GameObjects.Sprite(globalScene, this.instructionRowX, this.instructionRowY, "keyboard", "G.png");
+    this.genderIconElement = new Phaser.GameObjects.Sprite(
+      globalScene,
+      this.instructionRowX,
+      this.instructionRowY,
+      "keyboard",
+      "G.png",
+    );
     this.genderIconElement.setName("sprite-gender-icon-element");
     this.genderIconElement.setScale(0.675);
     this.genderIconElement.setOrigin(0.0, 0.0);
-    this.genderLabel = addTextObject(this.instructionRowX + this.instructionRowTextOffset, this.instructionRowY, i18next.t("starterSelectUiHandler:cycleGender"), TextStyle.PARTY, { fontSize: instructionTextSize });
+    this.genderLabel = addTextObject(
+      this.instructionRowX + this.instructionRowTextOffset,
+      this.instructionRowY,
+      i18next.t("starterSelectUiHandler:cycleGender"),
+      TextStyle.PARTY,
+      { fontSize: instructionTextSize },
+    );
     this.genderLabel.setName("text-gender-label");
 
-    this.abilityIconElement = new Phaser.GameObjects.Sprite(globalScene, this.instructionRowX, this.instructionRowY, "keyboard", "E.png");
+    this.abilityIconElement = new Phaser.GameObjects.Sprite(
+      globalScene,
+      this.instructionRowX,
+      this.instructionRowY,
+      "keyboard",
+      "E.png",
+    );
     this.abilityIconElement.setName("sprite-ability-icon-element");
     this.abilityIconElement.setScale(0.675);
     this.abilityIconElement.setOrigin(0.0, 0.0);
-    this.abilityLabel = addTextObject(this.instructionRowX + this.instructionRowTextOffset, this.instructionRowY, i18next.t("starterSelectUiHandler:cycleAbility"), TextStyle.PARTY, { fontSize: instructionTextSize });
+    this.abilityLabel = addTextObject(
+      this.instructionRowX + this.instructionRowTextOffset,
+      this.instructionRowY,
+      i18next.t("starterSelectUiHandler:cycleAbility"),
+      TextStyle.PARTY,
+      { fontSize: instructionTextSize },
+    );
     this.abilityLabel.setName("text-ability-label");
 
-    this.natureIconElement = new Phaser.GameObjects.Sprite(globalScene, this.instructionRowX, this.instructionRowY, "keyboard", "N.png");
+    this.natureIconElement = new Phaser.GameObjects.Sprite(
+      globalScene,
+      this.instructionRowX,
+      this.instructionRowY,
+      "keyboard",
+      "N.png",
+    );
     this.natureIconElement.setName("sprite-nature-icon-element");
     this.natureIconElement.setScale(0.675);
     this.natureIconElement.setOrigin(0.0, 0.0);
-    this.natureLabel = addTextObject(this.instructionRowX + this.instructionRowTextOffset, this.instructionRowY, i18next.t("starterSelectUiHandler:cycleNature"), TextStyle.PARTY, { fontSize: instructionTextSize });
+    this.natureLabel = addTextObject(
+      this.instructionRowX + this.instructionRowTextOffset,
+      this.instructionRowY,
+      i18next.t("starterSelectUiHandler:cycleNature"),
+      TextStyle.PARTY,
+      { fontSize: instructionTextSize },
+    );
     this.natureLabel.setName("text-nature-label");
 
-    this.goFilterIconElement = new Phaser.GameObjects.Sprite(globalScene, this.filterInstructionRowX, this.filterInstructionRowY, "keyboard", "C.png");
+    this.teraIconElement = new Phaser.GameObjects.Sprite(
+      globalScene,
+      this.instructionRowX,
+      this.instructionRowY,
+      "keyboard",
+      "V.png",
+    );
+    this.teraIconElement.setName("sprite-tera-icon-element");
+    this.teraIconElement.setScale(0.675);
+    this.teraIconElement.setOrigin(0.0, 0.0);
+    this.teraLabel = addTextObject(
+      this.instructionRowX + this.instructionRowTextOffset,
+      this.instructionRowY,
+      i18next.t("starterSelectUiHandler:cycleTera"),
+      TextStyle.PARTY,
+      { fontSize: instructionTextSize },
+    );
+    this.teraLabel.setName("text-tera-label");
+
+    this.goFilterIconElement = new Phaser.GameObjects.Sprite(
+      globalScene,
+      this.filterInstructionRowX,
+      this.filterInstructionRowY,
+      "keyboard",
+      "C.png",
+    );
     this.goFilterIconElement.setName("sprite-goFilter-icon-element");
     this.goFilterIconElement.setScale(0.675);
     this.goFilterIconElement.setOrigin(0.0, 0.0);
-    this.goFilterLabel = addTextObject(this.filterInstructionRowX + this.instructionRowTextOffset, this.filterInstructionRowY, i18next.t("starterSelectUiHandler:goFilter"), TextStyle.PARTY, { fontSize: instructionTextSize });
+    this.goFilterLabel = addTextObject(
+      this.filterInstructionRowX + this.instructionRowTextOffset,
+      this.filterInstructionRowY,
+      i18next.t("starterSelectUiHandler:goFilter"),
+      TextStyle.PARTY,
+      { fontSize: instructionTextSize },
+    );
     this.goFilterLabel.setName("text-goFilter-label");
 
     this.hideInstructions();
@@ -918,7 +1173,9 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
     this.initTutorialOverlay(this.starterSelectContainer);
     this.starterSelectContainer.bringToTop(this.starterSelectMessageBoxContainer);
 
-    globalScene.eventTarget.addEventListener(BattleSceneEventType.CANDY_UPGRADE_NOTIFICATION_CHANGED, (e) => this.onCandyUpgradeDisplayChanged(e));
+    globalScene.eventTarget.addEventListener(BattleSceneEventType.CANDY_UPGRADE_NOTIFICATION_CHANGED, e =>
+      this.onCandyUpgradeDisplayChanged(e),
+    );
 
     this.updateInstructions();
   }
@@ -926,7 +1183,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
   show(args: any[]): boolean {
     if (!this.starterPreferences) {
       // starterPreferences haven't been loaded yet
-      this.starterPreferences = StarterPrefs.load();
+      this.starterPreferences = loadStarterPreferences();
     }
     this.moveInfoOverlay.clear(); // clear this when removing a menu; the cancel button doesn't seem to trigger this automatically on controllers
     this.pokerusSpecies = getPokerusStarters();
@@ -993,29 +1250,33 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
     const hasNonShiny = caughtAttr & DexAttr.NON_SHINY;
     if (starterAttributes.shiny && !hasShiny) {
       // shiny form wasn't unlocked, purging shiny and variant setting
-      delete starterAttributes.shiny;
-      delete starterAttributes.variant;
+      starterAttributes.shiny = undefined;
+      starterAttributes.variant = undefined;
     } else if (starterAttributes.shiny === false && !hasNonShiny) {
       // non shiny form wasn't unlocked, purging shiny setting
-      delete starterAttributes.shiny;
+      starterAttributes.shiny = undefined;
     }
 
     if (starterAttributes.variant !== undefined) {
       const unlockedVariants = [
         hasShiny && caughtAttr & DexAttr.DEFAULT_VARIANT,
         hasShiny && caughtAttr & DexAttr.VARIANT_2,
-        hasShiny && caughtAttr & DexAttr.VARIANT_3
+        hasShiny && caughtAttr & DexAttr.VARIANT_3,
       ];
-      if (isNaN(starterAttributes.variant) || starterAttributes.variant < 0 || !unlockedVariants[starterAttributes.variant]) {
+      if (
+        Number.isNaN(starterAttributes.variant) ||
+        starterAttributes.variant < 0 ||
+        !unlockedVariants[starterAttributes.variant]
+      ) {
         // variant value is invalid or requested variant wasn't unlocked, purging setting
-        delete starterAttributes.variant;
+        starterAttributes.variant = undefined;
       }
     }
 
     if (starterAttributes.female !== undefined) {
       if (!(starterAttributes.female ? caughtAttr & DexAttr.FEMALE : caughtAttr & DexAttr.MALE)) {
         // requested gender wasn't unlocked, purging setting
-        delete starterAttributes.female;
+        starterAttributes.female = undefined;
       }
     }
 
@@ -1030,25 +1291,29 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
       const unlockedAbilities = [
         hasAbility1,
         speciesHasSingleAbility ? hasAbility2 && !hasAbility1 : hasAbility2,
-        hasHiddenAbility
+        hasHiddenAbility,
       ];
       if (!unlockedAbilities[starterAttributes.ability]) {
         // requested ability wasn't unlocked, purging setting
-        delete starterAttributes.ability;
+        starterAttributes.ability = undefined;
       }
     }
 
     const selectedForm = starterAttributes.form;
-    if (selectedForm !== undefined && (!species.forms[selectedForm]?.isStarterSelectable || !(caughtAttr & globalScene.gameData.getFormAttr(selectedForm)))) {
+    if (
+      selectedForm !== undefined &&
+      (!species.forms[selectedForm]?.isStarterSelectable ||
+        !(caughtAttr & globalScene.gameData.getFormAttr(selectedForm)))
+    ) {
       // requested form wasn't unlocked/isn't a starter form, purging setting
-      delete starterAttributes.form;
+      starterAttributes.form = undefined;
     }
 
     if (starterAttributes.nature !== undefined) {
       const unlockedNatures = globalScene.gameData.getNaturesForAttr(dexEntry.natureAttr);
       if (unlockedNatures.indexOf(starterAttributes.nature as unknown as Nature) < 0) {
         // requested nature wasn't unlocked, purging setting
-        delete starterAttributes.nature;
+        starterAttributes.nature = undefined;
       }
     }
 
@@ -1058,10 +1323,18 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
   /**
    * Set the selections for all filters to their default starting value
    */
-  resetFilters() : void {
+  public resetFilters(): void {
+    this.filterBar.setValsToDefault();
+    this.resetCaughtDropdown();
+  }
+
+  /**
+   * Set default value for the caught dropdown, which only shows caught mons
+   */
+  public resetCaughtDropdown(): void {
     const caughtDropDown: DropDown = this.filterBar.getFilter(DropDownColumn.CAUGHT);
 
-    this.filterBar.setValsToDefault();
+    caughtDropDown.resetToDefault();
 
     // initial setting, in caught filter, select the options excluding the uncaught option
     for (let i = 0; i < caughtDropDown.options.length; i++) {
@@ -1072,7 +1345,15 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
     }
   }
 
-  showText(text: string, delay?: number, callback?: Function, callbackDelay?: number, prompt?: boolean, promptDelay?: number, moveToTop?: boolean) {
+  showText(
+    text: string,
+    delay?: number,
+    callback?: Function,
+    callbackDelay?: number,
+    prompt?: boolean,
+    promptDelay?: number,
+    moveToTop?: boolean,
+  ) {
     super.showText(text, delay, callback, callbackDelay, prompt, promptDelay);
 
     const singleLine = text?.indexOf("\n") === -1;
@@ -1116,8 +1397,10 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
     // Get this species ID's starter data
     const starterData = globalScene.gameData.starterData[speciesId];
 
-    return starterData.candyCount >= getPassiveCandyCount(speciesStarterCosts[speciesId])
-      && !(starterData.passiveAttr & PassiveAttr.UNLOCKED);
+    return (
+      starterData.candyCount >= getPassiveCandyCount(speciesStarterCosts[speciesId]) &&
+      !(starterData.passiveAttr & PassiveAttr.UNLOCKED)
+    );
   }
 
   /**
@@ -1129,8 +1412,11 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
     // Get this species ID's starter data
     const starterData = globalScene.gameData.starterData[speciesId];
 
-    return starterData.candyCount >= getValueReductionCandyCounts(speciesStarterCosts[speciesId])[starterData.valueReduction]
-        && starterData.valueReduction < valueReductionMax;
+    return (
+      starterData.candyCount >=
+        getValueReductionCandyCounts(speciesStarterCosts[speciesId])[starterData.valueReduction] &&
+      starterData.valueReduction < valueReductionMax
+    );
   }
 
   /**
@@ -1151,7 +1437,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
    * @param species {@linkcode PokemonSpecies} of the icon used to check for upgrades
    * @param startPaused Should this animation be paused after it is added?
    */
-  setUpgradeAnimation(icon: Phaser.GameObjects.Sprite, species: PokemonSpecies, startPaused: boolean = false): void {
+  setUpgradeAnimation(icon: Phaser.GameObjects.Sprite, species: PokemonSpecies, startPaused = false): void {
     globalScene.tweens.killTweensOf(icon);
     // Skip animations if they are disabled
     if (globalScene.candyUpgradeDisplay === 0 || species.speciesId !== species.getRootSpeciesId(false)) {
@@ -1162,6 +1448,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
 
     const tweenChain: Phaser.Types.Tweens.TweenChainBuilderConfig = {
       targets: icon,
+      paused: startPaused,
       loop: -1,
       // Make the initial bounce a little randomly delayed
       delay: randIntRange(0, 50) * 5,
@@ -1169,33 +1456,29 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
       tweens: [
         {
           targets: icon,
-          y: 2 - 5,
+          y: "-=5",
           duration: fixedInt(125),
           ease: "Cubic.easeOut",
-          yoyo: true
+          yoyo: true,
         },
         {
           targets: icon,
-          y: 2 - 3,
+          y: "-=3",
           duration: fixedInt(150),
           ease: "Cubic.easeOut",
-          yoyo: true
-        }
-      ], };
+          yoyo: true,
+        },
+      ],
+    };
 
-    const isPassiveAvailable = this.isPassiveAvailable(species.speciesId);
-    const isValueReductionAvailable = this.isValueReductionAvailable(species.speciesId);
-    const isSameSpeciesEggAvailable = this.isSameSpeciesEggAvailable(species.speciesId);
-
-    // 'Passives Only' mode
-    if (globalScene.candyUpgradeNotification === 1) {
-      if (isPassiveAvailable) {
-        globalScene.tweens.chain(tweenChain).paused = startPaused;
-      }
-    // 'On' mode
-    } else if (globalScene.candyUpgradeNotification === 2) {
-      if (isPassiveAvailable || isValueReductionAvailable || isSameSpeciesEggAvailable) {
-        globalScene.tweens.chain(tweenChain).paused = startPaused;
+    if (
+      this.isPassiveAvailable(species.speciesId) ||
+      (globalScene.candyUpgradeNotification === 2 &&
+        (this.isValueReductionAvailable(species.speciesId) || this.isSameSpeciesEggAvailable(species.speciesId)))
+    ) {
+      const chain = globalScene.tweens.chain(tweenChain);
+      if (!startPaused) {
+        chain.play();
       }
     }
   }
@@ -1207,7 +1490,11 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
     const species = starter.species;
     const slotVisible = !!species?.speciesId;
 
-    if (!species || globalScene.candyUpgradeNotification === 0 || species.speciesId !== species.getRootSpeciesId(false)) {
+    if (
+      !species ||
+      globalScene.candyUpgradeNotification === 0 ||
+      species.speciesId !== species.getRootSpeciesId(false)
+    ) {
       starter.candyUpgradeIcon.setVisible(false);
       starter.candyUpgradeOverlayIcon.setVisible(false);
       return;
@@ -1225,7 +1512,8 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
       // 'On' mode
     } else if (globalScene.candyUpgradeNotification === 2) {
       starter.candyUpgradeIcon.setVisible(
-        slotVisible && ( isPassiveAvailable || isValueReductionAvailable || isSameSpeciesEggAvailable ));
+        slotVisible && (isPassiveAvailable || isValueReductionAvailable || isSameSpeciesEggAvailable),
+      );
       starter.candyUpgradeOverlayIcon.setVisible(slotVisible && starter.candyUpgradeIcon.visible);
     }
   }
@@ -1235,7 +1523,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
    * @param starterContainer the container for the Pokemon to update
    */
   updateCandyUpgradeDisplay(starterContainer: StarterContainer) {
-    if (this.isUpgradeIconEnabled() ) {
+    if (this.isUpgradeIconEnabled()) {
       this.setUpgradeIcon(starterContainer);
     }
     if (this.isUpgradeAnimationEnabled()) {
@@ -1255,7 +1543,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
 
     // Loop through all visible candy icons when set to 'Icon' mode
     if (globalScene.candyUpgradeDisplay === 0) {
-      this.filteredStarterContainers.forEach((starter) => {
+      this.filteredStarterContainers.forEach(starter => {
         this.setUpgradeIcon(starter);
       });
 
@@ -1281,7 +1569,10 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
     const numOfRows = Math.ceil(numberOfStarters / maxColumns);
     const currentRow = Math.floor(this.cursor / maxColumns);
     const onScreenFirstIndex = this.scrollCursor * maxColumns; // this is first starter index on the screen
-    const onScreenLastIndex = Math.min(this.filteredStarterContainers.length - 1, onScreenFirstIndex + maxRows * maxColumns - 1); // this is the last starter index on the screen
+    const onScreenLastIndex = Math.min(
+      this.filteredStarterContainers.length - 1,
+      onScreenFirstIndex + maxRows * maxColumns - 1,
+    ); // this is the last starter index on the screen
     const onScreenNumberOfStarters = onScreenLastIndex - onScreenFirstIndex + 1;
     const onScreenNumberOfRows = Math.ceil(onScreenNumberOfStarters / maxColumns);
     const onScreenCurrentRow = Math.floor((this.cursor - onScreenFirstIndex) / maxColumns);
@@ -1301,16 +1592,18 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
       if (this.filterMode && this.filterBar.openDropDown) {
         // CANCEL with a filter menu open > close it
         this.filterBar.toggleDropDown(this.filterBarCursor);
-
-        // if there are possible starters go the first one of the list
-        if (numberOfStarters > 0) {
-          this.setFilterMode(false);
-          this.scrollCursor = 0;
-          this.updateScroll();
-          this.setCursor(0);
-        }
         success = true;
-
+      } else if (
+        this.filterMode &&
+        !this.filterBar.getFilter(this.filterBar.getColumn(this.filterBarCursor)).hasDefaultValues()
+      ) {
+        if (this.filterBar.getColumn(this.filterBarCursor) === DropDownColumn.CAUGHT) {
+          this.resetCaughtDropdown();
+        } else {
+          this.filterBar.resetSelection(this.filterBarCursor);
+        }
+        this.updateStarters();
+        success = true;
       } else if (this.statsMode) {
         this.toggleStatsMode(false);
         success = true;
@@ -1332,7 +1625,8 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
         this.setFilterMode(true);
         this.filterBar.toggleDropDown(this.filterBarCursor);
       }
-    } else if (this.startCursorObj.visible) { // this checks to see if the start button is selected
+    } else if (this.startCursorObj.visible) {
+      // this checks to see if the start button is selected
       switch (button) {
         case Button.ACTION:
           if (this.tryStart(true)) {
@@ -1342,7 +1636,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
           }
           break;
         case Button.UP:
-        // UP from start button: go to pokemon in team if any, otherwise filter
+          // UP from start button: go to pokemon in team if any, otherwise filter
           this.startCursorObj.setVisible(false);
           if (this.starterSpecies.length > 0) {
             this.starterIconsCursorIndex = this.starterSpecies.length - 1;
@@ -1355,7 +1649,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
           success = true;
           break;
         case Button.DOWN:
-        // DOWN from start button: Go to filters
+          // DOWN from start button: Go to filters
           this.startCursorObj.setVisible(false);
           this.filterBarCursor = Math.max(1, this.filterBar.numFilters - 1);
           this.setFilterMode(true);
@@ -1397,8 +1691,8 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
         case Button.UP:
           if (this.filterBar.openDropDown) {
             success = this.filterBar.decDropDownCursor();
-          } else if (this.filterBarCursor === this.filterBar.numFilters - 1 ) {
-          // UP from the last filter, move to start button
+          } else if (this.filterBarCursor === this.filterBar.numFilters - 1) {
+            // UP from the last filter, move to start button
             this.setFilterMode(false);
             this.cursorObj.setVisible(false);
             if (this.starterSpecies.length > 0) {
@@ -1415,9 +1709,9 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
             const proportion = (this.filterBarCursor + 0.5) / this.filterBar.numFilters;
             const targetCol = Math.min(8, Math.floor(proportion * 11));
             if (numberOfStarters % 9 > targetCol) {
-              this.setCursor(numberOfStarters - (numberOfStarters) % 9 + targetCol);
+              this.setCursor(numberOfStarters - (numberOfStarters % 9) + targetCol);
             } else {
-              this.setCursor(Math.max(numberOfStarters - (numberOfStarters) % 9 + targetCol - 9, 0));
+              this.setCursor(Math.max(numberOfStarters - (numberOfStarters % 9) + targetCol - 9, 0));
             }
             success = true;
           }
@@ -1426,13 +1720,13 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
           if (this.filterBar.openDropDown) {
             success = this.filterBar.incDropDownCursor();
           } else if (this.filterBarCursor === this.filterBar.numFilters - 1) {
-          // DOWN from the last filter, move to random selection label
+            // DOWN from the last filter, move to random selection label
             this.setFilterMode(false);
             this.cursorObj.setVisible(false);
             this.randomCursorObj.setVisible(true);
             success = true;
           } else if (numberOfStarters > 0) {
-          // DOWN from filter bar to top of Pokemon list
+            // DOWN from filter bar to top of Pokemon list
             this.setFilterMode(false);
             this.scrollCursor = 0;
             this.updateScroll();
@@ -1458,30 +1752,26 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
             error = true;
             break;
           }
-          const currentPartyValue = this.starterSpecies.map(s => s.generation).reduce((total: number, _gen: number, i: number ) => total + globalScene.gameData.getSpeciesStarterValue(this.starterSpecies[i].speciesId), 0);
+          const currentPartyValue = this.starterSpecies
+            .map(s => s.generation)
+            .reduce(
+              (total: number, _gen: number, i: number) =>
+                total + globalScene.gameData.getSpeciesStarterValue(this.starterSpecies[i].speciesId),
+              0,
+            );
           // Filter valid starters
           const validStarters = this.filteredStarterContainers.filter(starter => {
             const species = starter.species;
-            const [ isDupe ] = this.isInParty(species);
+            const [isDupe] = this.isInParty(species);
             const starterCost = globalScene.gameData.getSpeciesStarterValue(species.speciesId);
-            const isValidForChallenge = new BooleanHolder(true);
-            Challenge.applyChallenges(
-              globalScene.gameMode,
-              Challenge.ChallengeType.STARTER_CHOICE,
+            const isValidForChallenge = checkStarterValidForChallenge(
               species,
-              isValidForChallenge,
-              globalScene.gameData.getSpeciesDexAttrProps(
-                species,
-                this.getCurrentDexProps(species.speciesId)
-              ),
-              this.isPartyValid()
+              globalScene.gameData.getSpeciesDexAttrProps(species, this.getCurrentDexProps(species.speciesId)),
+              this.isPartyValid(),
             );
             const isCaught = globalScene.gameData.dexData[species.speciesId].caughtAttr;
             return (
-              !isDupe &&
-              isValidForChallenge.value &&
-              currentPartyValue + starterCost <= this.getValueLimit() &&
-              isCaught
+              !isDupe && isValidForChallenge && currentPartyValue + starterCost <= this.getValueLimit() && isCaught
             );
           });
           if (validStarters.length === 0) {
@@ -1497,18 +1787,17 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
           const props = globalScene.gameData.getSpeciesDexAttrProps(randomSpecies, dexAttr);
           const abilityIndex = this.abilityCursor;
           const nature = this.natureCursor as unknown as Nature;
+          const teraType = this.teraCursor;
           const moveset = this.starterMoveset?.slice(0) as StarterMoveset;
           const starterCost = globalScene.gameData.getSpeciesStarterValue(randomSpecies.speciesId);
           const speciesForm = getPokemonSpeciesForm(randomSpecies.speciesId, props.formIndex);
           // Load assets and add to party
-          speciesForm
-            .loadAssets(props.female, props.formIndex, props.shiny, props.variant, true)
-            .then(() => {
-              if (this.tryUpdateValue(starterCost, true)) {
-                this.addToParty(randomSpecies, dexAttr, abilityIndex, nature, moveset, true);
-                ui.playSelect();
-              }
-            });
+          speciesForm.loadAssets(props.female, props.formIndex, props.shiny, props.variant, true).then(() => {
+            if (this.tryUpdateValue(starterCost, true)) {
+              this.addToParty(randomSpecies, dexAttr, abilityIndex, nature, moveset, teraType, true);
+              ui.playSelect();
+            }
+          });
           break;
         case Button.UP:
           this.randomCursorObj.setVisible(false);
@@ -1545,7 +1834,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
           break;
       }
     } else {
-      let starterContainer;
+      let starterContainer: StarterContainer;
       const starterData = globalScene.gameData.starterData[this.lastSpecies.speciesId];
       // prepare persistent starter data to store changes
       let starterAttributes = this.starterPreferences[this.lastSpecies.speciesId];
@@ -1555,139 +1844,183 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
         starterContainer = this.filteredStarterContainers[this.cursor];
       } else {
         // if species is in filtered starters, get the starter container from the filtered starters, it can be undefined if the species is not in the filtered starters
-        starterContainer = this.filteredStarterContainers[this.filteredStarterContainers.findIndex(container => container.species === this.lastSpecies)];
+        starterContainer =
+          this.filteredStarterContainers[
+            this.filteredStarterContainers.findIndex(container => container.species === this.lastSpecies)
+          ];
       }
 
       if (button === Button.ACTION) {
         if (!this.speciesStarterDexEntry?.caughtAttr) {
           error = true;
-        } else if (this.starterSpecies.length <= 6) { // checks to see if the party has 6 or fewer pokemon
+        } else if (this.starterSpecies.length <= 6) {
+          // checks to see if the party has 6 or fewer pokemon
           const ui = this.getUi();
           let options: any[] = []; // TODO: add proper type
 
-          const [ isDupe, removeIndex ]: [boolean, number] = this.isInParty(this.lastSpecies); // checks to see if the pokemon is a duplicate; if it is, returns the index that will be removed
+          const [isDupe, removeIndex]: [boolean, number] = this.isInParty(this.lastSpecies);
 
           const isPartyValid = this.isPartyValid();
-          const isValidForChallenge = new BooleanHolder(true);
+          const isValidForChallenge = checkStarterValidForChallenge(
+            this.lastSpecies,
+            globalScene.gameData.getSpeciesDexAttrProps(
+              this.lastSpecies,
+              this.getCurrentDexProps(this.lastSpecies.speciesId),
+            ),
+            isPartyValid,
+          );
 
-          Challenge.applyChallenges(globalScene.gameMode, Challenge.ChallengeType.STARTER_CHOICE, this.lastSpecies, isValidForChallenge, globalScene.gameData.getSpeciesDexAttrProps(this.lastSpecies, this.getCurrentDexProps(this.lastSpecies.speciesId)), isPartyValid);
-
-          const currentPartyValue = this.starterSpecies.map(s => s.generation).reduce((total: number, _gen: number, i: number) => total += globalScene.gameData.getSpeciesStarterValue(this.starterSpecies[i].speciesId), 0);
+          const currentPartyValue = this.starterSpecies
+            .map(s => s.generation)
+            .reduce(
+              (total: number, _gen: number, i: number) =>
+                (total += globalScene.gameData.getSpeciesStarterValue(this.starterSpecies[i].speciesId)),
+              0,
+            );
           const newCost = globalScene.gameData.getSpeciesStarterValue(this.lastSpecies.speciesId);
-          if (!isDupe && isValidForChallenge.value && currentPartyValue + newCost <= this.getValueLimit() && this.starterSpecies.length < PLAYER_PARTY_MAX_SIZE) { // this checks to make sure the pokemon doesn't exist in your party, it's valid for the challenge and that it won't go over the cost limit; if it meets all these criteria it will add it to your party
+          if (
+            !isDupe &&
+            isValidForChallenge &&
+            currentPartyValue + newCost <= this.getValueLimit() &&
+            this.starterSpecies.length < PLAYER_PARTY_MAX_SIZE
+          ) {
             options = [
               {
                 label: i18next.t("starterSelectUiHandler:addToParty"),
                 handler: () => {
-                  ui.setMode(Mode.STARTER_SELECT);
-                  const isOverValueLimit = this.tryUpdateValue(globalScene.gameData.getSpeciesStarterValue(this.lastSpecies.speciesId), true);
-                  if (!isDupe && isValidForChallenge.value && isOverValueLimit) {
+                  ui.setMode(UiMode.STARTER_SELECT);
+                  const isOverValueLimit = this.tryUpdateValue(
+                    globalScene.gameData.getSpeciesStarterValue(this.lastSpecies.speciesId),
+                    true,
+                  );
+                  if (!isDupe && isValidForChallenge && isOverValueLimit) {
                     const cursorObj = this.starterCursorObjs[this.starterSpecies.length];
                     cursorObj.setVisible(true);
                     cursorObj.setPosition(this.cursorObj.x, this.cursorObj.y);
-                    this.addToParty(this.lastSpecies, this.dexAttrCursor, this.abilityCursor, this.natureCursor as unknown as Nature, this.starterMoveset?.slice(0) as StarterMoveset);
+                    this.addToParty(
+                      this.lastSpecies,
+                      this.dexAttrCursor,
+                      this.abilityCursor,
+                      this.natureCursor as unknown as Nature,
+                      this.starterMoveset?.slice(0) as StarterMoveset,
+                      this.teraCursor,
+                    );
                     ui.playSelect();
                   } else {
                     ui.playError(); // this should be redundant as there is now a trigger for when a pokemon can't be added to party
                   }
                   return true;
                 },
-                overrideSound: true
-              }];
-          } else if (isDupe) { // if it already exists in your party, it will give you the option to remove from your party
-            options = [{
-              label: i18next.t("starterSelectUiHandler:removeFromParty"),
-              handler: () => {
-                this.popStarter(removeIndex);
-                ui.setMode(Mode.STARTER_SELECT);
-                return true;
-              }
-            }];
+                overrideSound: true,
+              },
+            ];
+          } else if (isDupe) {
+            // if it already exists in your party, it will give you the option to remove from your party
+            options = [
+              {
+                label: i18next.t("starterSelectUiHandler:removeFromParty"),
+                handler: () => {
+                  this.popStarter(removeIndex);
+                  ui.setMode(UiMode.STARTER_SELECT);
+                  return true;
+                },
+              },
+            ];
           }
 
-          options.push( // this shows the IVs for the pokemon
+          options.push(
+            // this shows the IVs for the pokemon
             {
               label: i18next.t("starterSelectUiHandler:toggleIVs"),
               handler: () => {
                 this.toggleStatsMode();
-                ui.setMode(Mode.STARTER_SELECT);
+                ui.setMode(UiMode.STARTER_SELECT);
                 return true;
-              }
-            });
-          if (this.speciesStarterMoves.length > 1) { // this lets you change the pokemon moves
+              },
+            },
+          );
+          if (this.speciesStarterMoves.length > 1) {
+            // this lets you change the pokemon moves
             const showSwapOptions = (moveset: StarterMoveset) => {
-
               this.blockInput = true;
 
-              ui.setMode(Mode.STARTER_SELECT).then(() => {
+              ui.setMode(UiMode.STARTER_SELECT).then(() => {
                 ui.showText(i18next.t("starterSelectUiHandler:selectMoveSwapOut"), null, () => {
                   this.moveInfoOverlay.show(allMoves[moveset[0]]);
 
-                  ui.setModeWithoutClear(Mode.OPTION_SELECT, {
-                    options: moveset.map((m: Moves, i: number) => {
-                      const option: OptionSelectItem = {
-                        label: allMoves[m].name,
-                        handler: () => {
-                          this.blockInput = true;
-                          ui.setMode(Mode.STARTER_SELECT).then(() => {
-                            ui.showText(`${i18next.t("starterSelectUiHandler:selectMoveSwapWith")} ${allMoves[m].name}.`, null, () => {
-                              const possibleMoves = this.speciesStarterMoves.filter((sm: Moves) => sm !== m);
-                              this.moveInfoOverlay.show(allMoves[possibleMoves[0]]);
+                  ui.setModeWithoutClear(UiMode.OPTION_SELECT, {
+                    options: moveset
+                      .map((m: Moves, i: number) => {
+                        const option: OptionSelectItem = {
+                          label: allMoves[m].name,
+                          handler: () => {
+                            this.blockInput = true;
+                            ui.setMode(UiMode.STARTER_SELECT).then(() => {
+                              ui.showText(
+                                `${i18next.t("starterSelectUiHandler:selectMoveSwapWith")} ${allMoves[m].name}.`,
+                                null,
+                                () => {
+                                  const possibleMoves = this.speciesStarterMoves.filter((sm: Moves) => sm !== m);
+                                  this.moveInfoOverlay.show(allMoves[possibleMoves[0]]);
 
-                              ui.setModeWithoutClear(Mode.OPTION_SELECT, {
-                                options: possibleMoves.map(sm => {
-                                  // make an option for each available starter move
-                                  const option = {
-                                    label: allMoves[sm].name,
-                                    handler: () => {
-                                      this.switchMoveHandler(i, sm, m);
-                                      showSwapOptions(this.starterMoveset!); // TODO: is this bang correct?
-                                      return true;
-                                    },
-                                    onHover: () => {
-                                      this.moveInfoOverlay.show(allMoves[sm]);
-                                    },
-                                  };
-                                  return option;
-                                }).concat({
-                                  label: i18next.t("menu:cancel"),
-                                  handler: () => {
-                                    showSwapOptions(this.starterMoveset!); // TODO: is this bang correct?
-                                    return true;
-                                  },
-                                  onHover: () => {
-                                    this.moveInfoOverlay.clear();
-                                  },
-                                }),
-                                supportHover: true,
-                                maxOptions: 8,
-                                yOffset: 19
-                              });
-                              this.blockInput = false;
+                                  ui.setModeWithoutClear(UiMode.OPTION_SELECT, {
+                                    options: possibleMoves
+                                      .map(sm => {
+                                        // make an option for each available starter move
+                                        const option = {
+                                          label: allMoves[sm].name,
+                                          handler: () => {
+                                            this.switchMoveHandler(i, sm, m);
+                                            showSwapOptions(this.starterMoveset!); // TODO: is this bang correct?
+                                            return true;
+                                          },
+                                          onHover: () => {
+                                            this.moveInfoOverlay.show(allMoves[sm]);
+                                          },
+                                        };
+                                        return option;
+                                      })
+                                      .concat({
+                                        label: i18next.t("menu:cancel"),
+                                        handler: () => {
+                                          showSwapOptions(this.starterMoveset!); // TODO: is this bang correct?
+                                          return true;
+                                        },
+                                        onHover: () => {
+                                          this.moveInfoOverlay.clear();
+                                        },
+                                      }),
+                                    supportHover: true,
+                                    maxOptions: 8,
+                                    yOffset: 19,
+                                  });
+                                  this.blockInput = false;
+                                },
+                              );
                             });
-                          });
+                            return true;
+                          },
+                          onHover: () => {
+                            this.moveInfoOverlay.show(allMoves[m]);
+                          },
+                        };
+                        return option;
+                      })
+                      .concat({
+                        label: i18next.t("menu:cancel"),
+                        handler: () => {
+                          this.moveInfoOverlay.clear();
+                          this.clearText();
+                          ui.setMode(UiMode.STARTER_SELECT);
                           return true;
                         },
                         onHover: () => {
-                          this.moveInfoOverlay.show(allMoves[m]);
+                          this.moveInfoOverlay.clear();
                         },
-                      };
-                      return option;
-                    }).concat({
-                      label: i18next.t("menu:cancel"),
-                      handler: () => {
-                        this.moveInfoOverlay.clear();
-                        this.clearText();
-                        ui.setMode(Mode.STARTER_SELECT);
-                        return true;
-                      },
-                      onHover: () => {
-                        this.moveInfoOverlay.clear();
-                      },
-                    }),
+                      }),
                     supportHover: true,
                     maxOptions: 8,
-                    yOffset: 19
+                    yOffset: 19,
                   });
                   this.blockInput = false;
                 });
@@ -1698,48 +2031,51 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
               handler: () => {
                 showSwapOptions(this.starterMoveset!); // TODO: is this bang correct?
                 return true;
-              }
+              },
             });
           }
           if (this.canCycleNature) {
             // if we could cycle natures, enable the improved nature menu
             const showNatureOptions = () => {
-
               this.blockInput = true;
 
-              ui.setMode(Mode.STARTER_SELECT).then(() => {
+              ui.setMode(UiMode.STARTER_SELECT).then(() => {
                 ui.showText(i18next.t("starterSelectUiHandler:selectNature"), null, () => {
                   const natures = globalScene.gameData.getNaturesForAttr(this.speciesStarterDexEntry?.natureAttr);
-                  ui.setModeWithoutClear(Mode.OPTION_SELECT, {
-                    options: natures.map((n: Nature, _i: number) => {
-                      const option: OptionSelectItem = {
-                        label: getNatureName(n, true, true, true, globalScene.uiTheme),
+                  ui.setModeWithoutClear(UiMode.OPTION_SELECT, {
+                    options: natures
+                      .map((n: Nature, _i: number) => {
+                        const option: OptionSelectItem = {
+                          label: getNatureName(n, true, true, true, globalScene.uiTheme),
+                          handler: () => {
+                            // update default nature in starter save data
+                            if (!starterAttributes) {
+                              starterAttributes = this.starterPreferences[this.lastSpecies.speciesId] = {};
+                            }
+                            starterAttributes.nature = n;
+                            this.clearText();
+                            ui.setMode(UiMode.STARTER_SELECT);
+                            // set nature for starter
+                            this.setSpeciesDetails(this.lastSpecies, {
+                              natureIndex: n,
+                            });
+                            this.blockInput = false;
+                            return true;
+                          },
+                        };
+                        return option;
+                      })
+                      .concat({
+                        label: i18next.t("menu:cancel"),
                         handler: () => {
-                          // update default nature in starter save data
-                          if (!starterAttributes) {
-                            starterAttributes = this.starterPreferences[this.lastSpecies.speciesId] = {};
-                          }
-                          starterAttributes.nature = n;
                           this.clearText();
-                          ui.setMode(Mode.STARTER_SELECT);
-                          // set nature for starter
-                          this.setSpeciesDetails(this.lastSpecies, { natureIndex: n });
+                          ui.setMode(UiMode.STARTER_SELECT);
                           this.blockInput = false;
                           return true;
-                        }
-                      };
-                      return option;
-                    }).concat({
-                      label: i18next.t("menu:cancel"),
-                      handler: () => {
-                        this.clearText();
-                        ui.setMode(Mode.STARTER_SELECT);
-                        this.blockInput = false;
-                        return true;
-                      }
-                    }),
+                        },
+                      }),
                     maxOptions: 8,
-                    yOffset: 19
+                    yOffset: 19,
                   });
                 });
               });
@@ -1749,31 +2085,32 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
               handler: () => {
                 showNatureOptions();
                 return true;
-              }
+              },
             });
           }
 
           const passiveAttr = starterData.passiveAttr;
-          if (passiveAttr & PassiveAttr.UNLOCKED) { // this is for enabling and disabling the passive
+          if (passiveAttr & PassiveAttr.UNLOCKED) {
+            // this is for enabling and disabling the passive
             if (!(passiveAttr & PassiveAttr.ENABLED)) {
               options.push({
                 label: i18next.t("starterSelectUiHandler:enablePassive"),
                 handler: () => {
                   starterData.passiveAttr |= PassiveAttr.ENABLED;
-                  ui.setMode(Mode.STARTER_SELECT);
+                  ui.setMode(UiMode.STARTER_SELECT);
                   this.setSpeciesDetails(this.lastSpecies);
                   return true;
-                }
+                },
               });
             } else {
               options.push({
                 label: i18next.t("starterSelectUiHandler:disablePassive"),
                 handler: () => {
                   starterData.passiveAttr ^= PassiveAttr.ENABLED;
-                  ui.setMode(Mode.STARTER_SELECT);
+                  ui.setMode(UiMode.STARTER_SELECT);
                   this.setSpeciesDetails(this.lastSpecies);
                   return true;
-                }
+                },
               });
             }
           }
@@ -1788,9 +2125,9 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
                 if (starterContainer) {
                   starterContainer.favoriteIcon.setVisible(starterAttributes.favorite);
                 }
-                ui.setMode(Mode.STARTER_SELECT);
+                ui.setMode(UiMode.STARTER_SELECT);
                 return true;
-              }
+              },
             });
           } else {
             options.push({
@@ -1801,9 +2138,9 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
                 if (starterContainer) {
                   starterContainer.favoriteIcon.setVisible(starterAttributes.favorite);
                 }
-                ui.setMode(Mode.STARTER_SELECT);
+                ui.setMode(UiMode.STARTER_SELECT);
                 return true;
-              }
+              },
             });
           }
           options.push({
@@ -1812,26 +2149,30 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
               ui.playSelect();
               let nickname = starterAttributes.nickname ? String(starterAttributes.nickname) : "";
               nickname = decodeURIComponent(escape(atob(nickname)));
-              ui.setModeWithoutClear(Mode.RENAME_POKEMON, {
-                buttonActions: [
-                  (sanitizedName: string) => {
-                    ui.playSelect();
-                    starterAttributes.nickname = sanitizedName;
-                    const name = decodeURIComponent(escape(atob(starterAttributes.nickname)));
-                    if (name.length > 0) {
-                      this.pokemonNameText.setText(name);
-                    } else {
-                      this.pokemonNameText.setText(this.lastSpecies.name);
-                    }
-                    ui.setMode(Mode.STARTER_SELECT);
-                  },
-                  () => {
-                    ui.setMode(Mode.STARTER_SELECT);
-                  }
-                ]
-              }, nickname);
+              ui.setModeWithoutClear(
+                UiMode.RENAME_POKEMON,
+                {
+                  buttonActions: [
+                    (sanitizedName: string) => {
+                      ui.playSelect();
+                      starterAttributes.nickname = sanitizedName;
+                      const name = decodeURIComponent(escape(atob(starterAttributes.nickname)));
+                      if (name.length > 0) {
+                        this.pokemonNameText.setText(name);
+                      } else {
+                        this.pokemonNameText.setText(this.lastSpecies.name);
+                      }
+                      ui.setMode(UiMode.STARTER_SELECT);
+                    },
+                    () => {
+                      ui.setMode(UiMode.STARTER_SELECT);
+                    },
+                  ],
+                },
+                nickname,
+              );
               return true;
-            }
+            },
           });
 
           // Purchases with Candy
@@ -1843,7 +2184,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
             if (!(passiveAttr & PassiveAttr.UNLOCKED)) {
               const passiveCost = getPassiveCandyCount(speciesStarterCosts[this.lastSpecies.speciesId]);
               options.push({
-                label: `x${passiveCost} ${i18next.t("starterSelectUiHandler:unlockPassive")} (${allAbilities[this.lastSpecies.getPassiveAbility()].name})`,
+                label: `x${passiveCost} ${i18next.t("starterSelectUiHandler:unlockPassive")}`,
                 handler: () => {
                   if (Overrides.FREE_CANDY_UPGRADE_OVERRIDE || candyCount >= passiveCost) {
                     starterData.passiveAttr |= PassiveAttr.UNLOCKED | PassiveAttr.ENABLED;
@@ -1856,28 +2197,32 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
                         return globalScene.reset(true);
                       }
                     });
-                    ui.setMode(Mode.STARTER_SELECT);
+                    ui.setMode(UiMode.STARTER_SELECT);
                     this.setSpeciesDetails(this.lastSpecies);
                     globalScene.playSound("se/buy");
 
                     // update the passive background and icon/animation for available upgrade
                     if (starterContainer) {
                       this.updateCandyUpgradeDisplay(starterContainer);
-                      starterContainer.starterPassiveBgs.setVisible(!!globalScene.gameData.starterData[this.lastSpecies.speciesId].passiveAttr);
+                      starterContainer.starterPassiveBgs.setVisible(
+                        !!globalScene.gameData.starterData[this.lastSpecies.speciesId].passiveAttr,
+                      );
                     }
                     return true;
                   }
                   return false;
                 },
                 item: "candy",
-                itemArgs: starterColors[this.lastSpecies.speciesId]
+                itemArgs: starterColors[this.lastSpecies.speciesId],
               });
             }
 
             // Reduce cost option
             const valueReduction = starterData.valueReduction;
             if (valueReduction < valueReductionMax) {
-              const reductionCost = getValueReductionCandyCounts(speciesStarterCosts[this.lastSpecies.speciesId])[valueReduction];
+              const reductionCost = getValueReductionCandyCounts(speciesStarterCosts[this.lastSpecies.speciesId])[
+                valueReduction
+              ];
               options.push({
                 label: `x${reductionCost} ${i18next.t("starterSelectUiHandler:reduceCost")}`,
                 handler: () => {
@@ -1893,7 +2238,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
                       }
                     });
                     this.tryUpdateValue(0);
-                    ui.setMode(Mode.STARTER_SELECT);
+                    ui.setMode(UiMode.STARTER_SELECT);
                     globalScene.playSound("se/buy");
 
                     // update the value label and icon/animation for available upgrade
@@ -1906,7 +2251,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
                   return false;
                 },
                 item: "candy",
-                itemArgs: starterColors[this.lastSpecies.speciesId]
+                itemArgs: starterColors[this.lastSpecies.speciesId],
               });
             }
 
@@ -1918,7 +2263,15 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
                 if (Overrides.FREE_CANDY_UPGRADE_OVERRIDE || candyCount >= sameSpeciesEggCost) {
                   if (globalScene.gameData.eggs.length >= 99 && !Overrides.UNLIMITED_EGG_COUNT_OVERRIDE) {
                     // Egg list full, show error message at the top of the screen and abort
-                    this.showText(i18next.t("egg:tooManyEggs"), undefined, () => this.showText("", 0, () => this.tutorialActive = false), 2000, false, undefined, true);
+                    this.showText(
+                      i18next.t("egg:tooManyEggs"),
+                      undefined,
+                      () => this.showText("", 0, () => (this.tutorialActive = false)),
+                      2000,
+                      false,
+                      undefined,
+                      true,
+                    );
                     return false;
                   }
                   if (!Overrides.FREE_CANDY_UPGRADE_OVERRIDE) {
@@ -1926,7 +2279,10 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
                   }
                   this.pokemonCandyCountText.setText(`x${starterData.candyCount}`);
 
-                  const egg = new Egg({ species: this.lastSpecies.speciesId, sourceType: EggSourceType.SAME_SPECIES_EGG });
+                  const egg = new Egg({
+                    species: this.lastSpecies.speciesId,
+                    sourceType: EggSourceType.SAME_SPECIES_EGG,
+                  });
                   egg.addEggToGameData();
 
                   globalScene.gameData.saveSystem().then(success => {
@@ -1934,7 +2290,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
                       return globalScene.reset(true);
                     }
                   });
-                  ui.setMode(Mode.STARTER_SELECT);
+                  ui.setMode(UiMode.STARTER_SELECT);
                   globalScene.playSound("se/buy");
 
                   // update the icon/animation for available upgrade
@@ -1947,67 +2303,78 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
                 return false;
               },
               item: "candy",
-              itemArgs: starterColors[this.lastSpecies.speciesId]
+              itemArgs: starterColors[this.lastSpecies.speciesId],
             });
             options.push({
               label: i18next.t("menu:cancel"),
               handler: () => {
-                ui.setMode(Mode.STARTER_SELECT);
+                ui.setMode(UiMode.STARTER_SELECT);
                 return true;
-              }
+              },
             });
-            ui.setModeWithoutClear(Mode.OPTION_SELECT, {
+            ui.setModeWithoutClear(UiMode.OPTION_SELECT, {
               options: options,
-              yOffset: 47
+              yOffset: 47,
             });
           };
-          if (!pokemonPrevolutions.hasOwnProperty(this.lastSpecies.speciesId)) {
-            options.push({
-              label: i18next.t("starterSelectUiHandler:useCandies"),
-              handler: () => {
-                ui.setMode(Mode.STARTER_SELECT).then(() => showUseCandies());
-                return true;
-              }
-            });
-          }
           options.push({
             label: i18next.t("menuUiHandler:POKEDEX"),
             handler: () => {
-              ui.setMode(Mode.STARTER_SELECT).then(() => {
+              ui.setMode(UiMode.STARTER_SELECT).then(() => {
                 const attributes = {
                   shiny: starterAttributes.shiny,
                   variant: starterAttributes.variant,
                   form: starterAttributes.form,
-                  female: starterAttributes.female
+                  female: starterAttributes.female,
                 };
-                ui.setOverlayMode(Mode.POKEDEX_PAGE, this.lastSpecies, starterAttributes.form, attributes);
-                return true;
+                ui.setOverlayMode(UiMode.POKEDEX_PAGE, this.lastSpecies, attributes);
               });
-            }
+              return true;
+            },
           });
+          if (!pokemonPrevolutions.hasOwnProperty(this.lastSpecies.speciesId)) {
+            options.push({
+              label: i18next.t("starterSelectUiHandler:useCandies"),
+              handler: () => {
+                ui.setMode(UiMode.STARTER_SELECT).then(() => showUseCandies());
+                return true;
+              },
+            });
+          }
           options.push({
             label: i18next.t("menu:cancel"),
             handler: () => {
-              ui.setMode(Mode.STARTER_SELECT);
+              ui.setMode(UiMode.STARTER_SELECT);
               return true;
-            }
+            },
           });
-          ui.setModeWithoutClear(Mode.OPTION_SELECT, {
+          ui.setModeWithoutClear(UiMode.OPTION_SELECT, {
             options: options,
-            yOffset: 47
+            yOffset: 47,
           });
           success = true;
         }
       } else {
-        const props = globalScene.gameData.getSpeciesDexAttrProps(this.lastSpecies, this.getCurrentDexProps(this.lastSpecies.speciesId));
+        const props = globalScene.gameData.getSpeciesDexAttrProps(
+          this.lastSpecies,
+          this.getCurrentDexProps(this.lastSpecies.speciesId),
+        );
         switch (button) {
           case Button.CYCLE_SHINY:
             if (this.canCycleShiny) {
               if (starterAttributes.shiny === false) {
                 // If not shiny, we change to shiny and get the proper default variant
-                const newProps = globalScene.gameData.getSpeciesDexAttrProps(this.lastSpecies, this.getCurrentDexProps(this.lastSpecies.speciesId));
-                const newVariant = starterAttributes.variant ? starterAttributes.variant as Variant : newProps.variant;
-                this.setSpeciesDetails(this.lastSpecies, { shiny: true, variant: newVariant });
+                const newProps = globalScene.gameData.getSpeciesDexAttrProps(
+                  this.lastSpecies,
+                  this.getCurrentDexProps(this.lastSpecies.speciesId),
+                );
+                const newVariant = starterAttributes.variant
+                  ? (starterAttributes.variant as Variant)
+                  : newProps.variant;
+                this.setSpeciesDetails(this.lastSpecies, {
+                  shiny: true,
+                  variant: newVariant,
+                });
 
                 globalScene.playSound("se/sparkle");
                 // Cycle tint based on current sprite tint
@@ -2023,34 +2390,42 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
                 do {
                   newVariant = (newVariant + 1) % 3;
                   if (newVariant === 0) {
-                    if (this.speciesStarterDexEntry!.caughtAttr & DexAttr.DEFAULT_VARIANT) { // TODO: is this bang correct?
+                    if (this.speciesStarterDexEntry!.caughtAttr & DexAttr.DEFAULT_VARIANT) {
+                      // TODO: is this bang correct?
                       break;
                     }
                   } else if (newVariant === 1) {
-                    if (this.speciesStarterDexEntry!.caughtAttr & DexAttr.VARIANT_2) { // TODO: is this bang correct?
+                    if (this.speciesStarterDexEntry!.caughtAttr & DexAttr.VARIANT_2) {
+                      // TODO: is this bang correct?
                       break;
                     }
                   } else {
-                    if (this.speciesStarterDexEntry!.caughtAttr & DexAttr.VARIANT_3) { // TODO: is this bang correct?
+                    if (this.speciesStarterDexEntry!.caughtAttr & DexAttr.VARIANT_3) {
+                      // TODO: is this bang correct?
                       break;
                     }
                   }
                 } while (newVariant !== props.variant);
                 starterAttributes.variant = newVariant; // store the selected variant
-                // If going to a higher variant, display that
-                if (newVariant > props.variant) {
-                  this.setSpeciesDetails(this.lastSpecies, { variant: newVariant as Variant });
+                if (this.speciesStarterDexEntry!.caughtAttr & DexAttr.NON_SHINY && newVariant <= props.variant) {
+                  // If we have run out of variants, go back to non shiny
+                  this.setSpeciesDetails(this.lastSpecies, {
+                    shiny: false,
+                    variant: 0,
+                  });
+                  this.pokemonShinyIcon.setVisible(false);
+                  success = true;
+                  starterAttributes.shiny = false;
+                } else {
+                  // If going to a higher variant, or only shiny forms are caught, go to next variant
+                  this.setSpeciesDetails(this.lastSpecies, {
+                    variant: newVariant as Variant,
+                  });
                   // Cycle tint based on current sprite tint
                   const tint = getVariantTint(newVariant as Variant);
                   this.pokemonShinyIcon.setFrame(getVariantIcon(newVariant as Variant));
                   this.pokemonShinyIcon.setTint(tint);
                   success = true;
-                // If we have run out of variants, go back to non shiny
-                } else {
-                  this.setSpeciesDetails(this.lastSpecies, { shiny: false, variant: 0 });
-                  this.pokemonShinyIcon.setVisible(false);
-                  success = true;
-                  starterAttributes.shiny = false;
                 }
               }
             }
@@ -2061,19 +2436,29 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
               let newFormIndex = props.formIndex;
               do {
                 newFormIndex = (newFormIndex + 1) % formCount;
-                if (this.lastSpecies.forms[newFormIndex].isStarterSelectable && this.speciesStarterDexEntry!.caughtAttr! & globalScene.gameData.getFormAttr(newFormIndex)) { // TODO: are those bangs correct?
+                if (
+                  this.lastSpecies.forms[newFormIndex].isStarterSelectable &&
+                  this.speciesStarterDexEntry!.caughtAttr! & globalScene.gameData.getFormAttr(newFormIndex)
+                ) {
+                  // TODO: are those bangs correct?
                   break;
                 }
               } while (newFormIndex !== props.formIndex);
               starterAttributes.form = newFormIndex; // store the selected form
-              this.setSpeciesDetails(this.lastSpecies, { formIndex: newFormIndex });
+              starterAttributes.tera = this.lastSpecies.forms[newFormIndex].type1;
+              this.setSpeciesDetails(this.lastSpecies, {
+                formIndex: newFormIndex,
+                teraType: starterAttributes.tera,
+              });
               success = true;
             }
             break;
           case Button.CYCLE_GENDER:
             if (this.canCycleGender) {
               starterAttributes.female = !props.female;
-              this.setSpeciesDetails(this.lastSpecies, { female: !props.female });
+              this.setSpeciesDetails(this.lastSpecies, {
+                female: !props.female,
+              });
               success = true;
             }
             break;
@@ -2090,7 +2475,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
                     break;
                   }
                 } else if (newAbilityIndex === 1) {
-                // If ability 1 and 2 are the same and ability 1 is unlocked, skip over ability 2
+                  // If ability 1 and 2 are the same and ability 1 is unlocked, skip over ability 2
                   if (this.lastSpecies.ability1 === this.lastSpecies.ability2 && hasAbility1) {
                     newAbilityIndex = (newAbilityIndex + 1) % abilityCount;
                   }
@@ -2110,7 +2495,9 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
                 globalScene.ui.editTooltip(`${newAbility.name}`, `${newAbility.description}`);
               }
 
-              this.setSpeciesDetails(this.lastSpecies, { abilityIndex: newAbilityIndex });
+              this.setSpeciesDetails(this.lastSpecies, {
+                abilityIndex: newAbilityIndex,
+              });
               success = true;
             }
             break;
@@ -2121,7 +2508,26 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
               const newNature = natures[natureIndex < natures.length - 1 ? natureIndex + 1 : 0];
               // store cycled nature as default
               starterAttributes.nature = newNature as unknown as number;
-              this.setSpeciesDetails(this.lastSpecies, { natureIndex: newNature });
+              this.setSpeciesDetails(this.lastSpecies, {
+                natureIndex: newNature,
+              });
+              success = true;
+            }
+            break;
+          case Button.CYCLE_TERA:
+            if (this.canCycleTera) {
+              const speciesForm = getPokemonSpeciesForm(this.lastSpecies.speciesId, starterAttributes.form ?? 0);
+              if (speciesForm.type1 === this.teraCursor && !isNullOrUndefined(speciesForm.type2)) {
+                starterAttributes.tera = speciesForm.type2!;
+                this.setSpeciesDetails(this.lastSpecies, {
+                  teraType: speciesForm.type2!,
+                });
+              } else {
+                starterAttributes.tera = speciesForm.type1;
+                this.setSpeciesDetails(this.lastSpecies, {
+                  teraType: speciesForm.type1,
+                });
+              }
               success = true;
             }
             break;
@@ -2140,7 +2546,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
               }
             } else {
               if (this.starterIconsCursorIndex === 0) {
-              // Up from first Pokemon in the team > go to Random selection
+                // Up from first Pokemon in the team > go to Random selection
                 this.starterIconsCursorObj.setVisible(false);
                 this.setSpecies(null);
                 this.randomCursorObj.setVisible(true);
@@ -2153,19 +2559,21 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
             break;
           case Button.DOWN:
             if (!this.starterIconsCursorObj.visible) {
-              if (currentRow < numOfRows - 1) { // not last row
-                if (currentRow - this.scrollCursor === 8) { // last row of visible starters
+              if (currentRow < numOfRows - 1) {
+                // not last row
+                if (currentRow - this.scrollCursor === 8) {
+                  // last row of visible starters
                   this.scrollCursor++;
                 }
                 success = this.setCursor(this.cursor + 9);
                 this.updateScroll();
               } else if (numOfRows > 1) {
-              // DOWN from last row of Pokemon > Wrap around to first row
+                // DOWN from last row of Pokemon > Wrap around to first row
                 this.scrollCursor = 0;
                 this.updateScroll();
                 success = this.setCursor(this.cursor % 9);
               } else {
-              // DOWN from single row of Pokemon > Go to filters
+                // DOWN from single row of Pokemon > Go to filters
                 this.filterBarCursor = this.filterBar.getNearestFilter(this.filteredStarterContainers[this.cursor]);
                 this.setFilterMode(true);
                 success = true;
@@ -2187,23 +2595,24 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
               if (this.cursor % 9 !== 0) {
                 success = this.setCursor(this.cursor - 1);
               } else {
-              // LEFT from filtered Pokemon, on the left edge
-                if ( onScreenCurrentRow === 0 ) {
+                // LEFT from filtered Pokemon, on the left edge
+                if (onScreenCurrentRow === 0) {
                   // from the first row of starters we go to the random selection
                   this.cursorObj.setVisible(false);
                   this.randomCursorObj.setVisible(true);
                 } else if (this.starterSpecies.length === 0) {
-                // no starter in team and not on first row > wrap around to the last column
+                  // no starter in team and not on first row > wrap around to the last column
                   success = this.setCursor(this.cursor + Math.min(8, numberOfStarters - this.cursor));
-
                 } else if (onScreenCurrentRow < 7) {
-                // at least one pokemon in team > for the first 7 rows, go to closest starter
+                  // at least one pokemon in team > for the first 7 rows, go to closest starter
                   this.cursorObj.setVisible(false);
-                  this.starterIconsCursorIndex = findClosestStarterIndex(this.cursorObj.y - 1, this.starterSpecies.length);
+                  this.starterIconsCursorIndex = findClosestStarterIndex(
+                    this.cursorObj.y - 1,
+                    this.starterSpecies.length,
+                  );
                   this.moveStarterIconsCursor(this.starterIconsCursorIndex);
-
                 } else {
-                // at least one pokemon in team > from the bottom 2 rows, go to start run button
+                  // at least one pokemon in team > from the bottom 2 rows, go to start run button
                   this.cursorObj.setVisible(false);
                   this.setSpecies(null);
                   this.startCursorObj.setVisible(true);
@@ -2211,40 +2620,41 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
                 success = true;
               }
             } else if (numberOfStarters > 0) {
-            // LEFT from team > Go to closest filtered Pokemon
+              // LEFT from team > Go to closest filtered Pokemon
               const closestRowIndex = findClosestStarterRow(this.starterIconsCursorIndex, onScreenNumberOfRows);
               this.starterIconsCursorObj.setVisible(false);
               this.cursorObj.setVisible(true);
               this.setCursor(Math.min(onScreenFirstIndex + closestRowIndex * 9 + 8, onScreenLastIndex));
               success = true;
             } else {
-            // LEFT from team and no Pokemon in filter > do nothing
+              // LEFT from team and no Pokemon in filter > do nothing
               success = false;
             }
             break;
           case Button.RIGHT:
             if (!this.starterIconsCursorObj.visible) {
-            // is not right edge
+              // is not right edge
               if (this.cursor % 9 < (currentRow < numOfRows - 1 ? 8 : (numberOfStarters - 1) % 9)) {
                 success = this.setCursor(this.cursor + 1);
               } else {
-              // RIGHT from filtered Pokemon, on the right edge
-                if ( onScreenCurrentRow === 0 ) {
+                // RIGHT from filtered Pokemon, on the right edge
+                if (onScreenCurrentRow === 0) {
                   // from the first row of starters we go to the random selection
                   this.cursorObj.setVisible(false);
                   this.randomCursorObj.setVisible(true);
                 } else if (this.starterSpecies.length === 0) {
-                // no selected starter in team > wrap around to the first column
+                  // no selected starter in team > wrap around to the first column
                   success = this.setCursor(this.cursor - Math.min(8, this.cursor % 9));
-
                 } else if (onScreenCurrentRow < 7) {
-                // at least one pokemon in team > for the first 7 rows, go to closest starter
+                  // at least one pokemon in team > for the first 7 rows, go to closest starter
                   this.cursorObj.setVisible(false);
-                  this.starterIconsCursorIndex = findClosestStarterIndex(this.cursorObj.y - 1, this.starterSpecies.length);
+                  this.starterIconsCursorIndex = findClosestStarterIndex(
+                    this.cursorObj.y - 1,
+                    this.starterSpecies.length,
+                  );
                   this.moveStarterIconsCursor(this.starterIconsCursorIndex);
-
                 } else {
-                // at least one pokemon in team > from the bottom 2 rows, go to start run button
+                  // at least one pokemon in team > from the bottom 2 rows, go to start run button
                   this.cursorObj.setVisible(false);
                   this.setSpecies(null);
                   this.startCursorObj.setVisible(true);
@@ -2252,14 +2662,16 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
                 success = true;
               }
             } else if (numberOfStarters > 0) {
-            // RIGHT from team > Go to closest filtered Pokemon
+              // RIGHT from team > Go to closest filtered Pokemon
               const closestRowIndex = findClosestStarterRow(this.starterIconsCursorIndex, onScreenNumberOfRows);
               this.starterIconsCursorObj.setVisible(false);
               this.cursorObj.setVisible(true);
-              this.setCursor(Math.min(onScreenFirstIndex + closestRowIndex * 9, onScreenLastIndex - (onScreenLastIndex % 9)));
+              this.setCursor(
+                Math.min(onScreenFirstIndex + closestRowIndex * 9, onScreenLastIndex - (onScreenLastIndex % 9)),
+              );
               success = true;
             } else {
-            // RIGHT from team and no Pokemon in filter > do nothing
+              // RIGHT from team and no Pokemon in filter > do nothing
               success = false;
             }
             break;
@@ -2286,21 +2698,41 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
         break;
       }
     }
-    return [ isDupe, removeIndex ];
+    return [isDupe, removeIndex];
   }
 
-  addToParty(species: PokemonSpecies, dexAttr: bigint, abilityIndex: number, nature: Nature, moveset: StarterMoveset, randomSelection: boolean = false) {
+  addToParty(
+    species: PokemonSpecies,
+    dexAttr: bigint,
+    abilityIndex: number,
+    nature: Nature,
+    moveset: StarterMoveset,
+    teraType: PokemonType,
+    randomSelection = false,
+  ) {
     const props = globalScene.gameData.getSpeciesDexAttrProps(species, dexAttr);
-    this.starterIcons[this.starterSpecies.length].setTexture(species.getIconAtlasKey(props.formIndex, props.shiny, props.variant));
-    this.starterIcons[this.starterSpecies.length].setFrame(species.getIconId(props.female, props.formIndex, props.shiny, props.variant));
-    this.checkIconId(this.starterIcons[this.starterSpecies.length], species, props.female, props.formIndex, props.shiny, props.variant);
+    this.starterIcons[this.starterSpecies.length].setTexture(
+      species.getIconAtlasKey(props.formIndex, props.shiny, props.variant),
+    );
+    this.starterIcons[this.starterSpecies.length].setFrame(
+      species.getIconId(props.female, props.formIndex, props.shiny, props.variant),
+    );
+    this.checkIconId(
+      this.starterIcons[this.starterSpecies.length],
+      species,
+      props.female,
+      props.formIndex,
+      props.shiny,
+      props.variant,
+    );
 
     this.starterSpecies.push(species);
     this.starterAttr.push(dexAttr);
     this.starterAbilityIndexes.push(abilityIndex);
     this.starterNatures.push(nature);
+    this.starterTeras.push(teraType);
     this.starterMovesets.push(moveset);
-    if (this.speciesLoaded.get(species.speciesId) || randomSelection ) {
+    if (this.speciesLoaded.get(species.speciesId) || randomSelection) {
       getPokemonSpeciesForm(species.speciesId, props.formIndex).cry();
     }
     this.updateInstructions();
@@ -2324,21 +2756,30 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
     // species has different forms
     if (pokemonFormLevelMoves.hasOwnProperty(speciesId)) {
       // starterMoveData doesn't have base form moves or is using the single form format
-      if (!globalScene.gameData.starterData[speciesId].moveset || Array.isArray(globalScene.gameData.starterData[speciesId].moveset)) {
-        globalScene.gameData.starterData[speciesId].moveset = { [props.formIndex]: this.starterMoveset?.slice(0) as StarterMoveset };
+      if (
+        !globalScene.gameData.starterData[speciesId].moveset ||
+        Array.isArray(globalScene.gameData.starterData[speciesId].moveset)
+      ) {
+        globalScene.gameData.starterData[speciesId].moveset = {
+          [props.formIndex]: this.starterMoveset?.slice(0) as StarterMoveset,
+        };
       }
       const starterMoveData = globalScene.gameData.starterData[speciesId].moveset;
 
       // starterMoveData doesn't have active form moves
       if (!starterMoveData.hasOwnProperty(props.formIndex)) {
-        globalScene.gameData.starterData[speciesId].moveset[props.formIndex] = this.starterMoveset?.slice(0) as StarterMoveset;
+        globalScene.gameData.starterData[speciesId].moveset[props.formIndex] = this.starterMoveset?.slice(
+          0,
+        ) as StarterMoveset;
       }
 
       // does the species' starter move data have its form's starter moves and has it been updated
       if (starterMoveData.hasOwnProperty(props.formIndex)) {
         // active form move hasn't been updated
         if (starterMoveData[props.formIndex][existingMoveIndex] !== newMove) {
-          globalScene.gameData.starterData[speciesId].moveset[props.formIndex] = this.starterMoveset?.slice(0) as StarterMoveset;
+          globalScene.gameData.starterData[speciesId].moveset[props.formIndex] = this.starterMoveset?.slice(
+            0,
+          ) as StarterMoveset;
         }
       }
     } else {
@@ -2357,8 +2798,14 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
     }
   }
 
-  updateButtonIcon(iconSetting, gamepadType, iconElement, controlLabel): void {
-    let iconPath;
+  updateButtonIcon(
+    iconSetting: SettingKeyboard,
+    gamepadType: string,
+    iconElement: GameObjects.Sprite,
+    controlLabel: GameObjects.Text,
+  ): void {
+    // biome-ignore lint/suspicious/noImplicitAnyLet: TODO
+    let iconPath: string;
     // touch controls cannot be rebound as is, and are just emulating a keyboard event.
     // Additionally, since keyboard controls can be rebound (and will be displayed when they are), we need to have special handling for the touch controls
     if (gamepadType === "touch") {
@@ -2379,6 +2826,9 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
         case SettingKeyboard.Button_Cycle_Nature:
           iconPath = "N.png";
           break;
+        case SettingKeyboard.Button_Cycle_Tera:
+          iconPath = "V.png";
+          break;
         case SettingKeyboard.Button_Stats:
           iconPath = "C.png";
           break;
@@ -2388,12 +2838,13 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
     } else {
       iconPath = globalScene.inputController?.getIconForLatestInputRecorded(iconSetting);
     }
+    // @ts-ignore: TODO can iconPath actually be undefined?
     iconElement.setTexture(gamepadType, iconPath);
     iconElement.setPosition(this.instructionRowX, this.instructionRowY);
     controlLabel.setPosition(this.instructionRowX + this.instructionRowTextOffset, this.instructionRowY);
     iconElement.setVisible(true);
     controlLabel.setVisible(true);
-    this.instructionsContainer.add([ iconElement, controlLabel ]);
+    this.instructionsContainer.add([iconElement, controlLabel]);
     this.instructionRowY += 8;
     if (this.instructionRowY >= 24) {
       this.instructionRowY = 0;
@@ -2401,8 +2852,13 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
     }
   }
 
-  updateFilterButtonIcon(iconSetting, gamepadType, iconElement, controlLabel): void {
-    let iconPath;
+  updateFilterButtonIcon(
+    iconSetting: SettingKeyboard,
+    gamepadType: string,
+    iconElement: GameObjects.Sprite,
+    controlLabel: GameObjects.Text,
+  ): void {
+    let iconPath: string;
     // touch controls cannot be rebound as is, and are just emulating a keyboard event.
     // Additionally, since keyboard controls can be rebound (and will be displayed when they are), we need to have special handling for the touch controls
     if (gamepadType === "touch") {
@@ -2416,7 +2872,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
     controlLabel.setPosition(this.filterInstructionRowX + this.instructionRowTextOffset, this.filterInstructionRowY);
     iconElement.setVisible(true);
     controlLabel.setVisible(true);
-    this.filterInstructionsContainer.add([ iconElement, controlLabel ]);
+    this.filterInstructionsContainer.add([iconElement, controlLabel]);
     this.filterInstructionRowY += 8;
     if (this.filterInstructionRowY >= 24) {
       this.filterInstructionRowY = 0;
@@ -2432,9 +2888,11 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
     this.hideInstructions();
     this.instructionsContainer.removeAll();
     this.filterInstructionsContainer.removeAll();
-    let gamepadType;
+    let gamepadType: string;
     if (globalScene.inputMethod === "gamepad") {
-      gamepadType = globalScene.inputController.getConfig(globalScene.inputController.selectedDevice[Device.GAMEPAD]).padType;
+      gamepadType = globalScene.inputController.getConfig(
+        globalScene.inputController.selectedDevice[Device.GAMEPAD],
+      ).padType;
     } else {
       gamepadType = globalScene.inputMethod;
     }
@@ -2451,21 +2909,43 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
         this.updateButtonIcon(SettingKeyboard.Button_Cycle_Form, gamepadType, this.formIconElement, this.formLabel);
       }
       if (this.canCycleGender) {
-        this.updateButtonIcon(SettingKeyboard.Button_Cycle_Gender, gamepadType, this.genderIconElement, this.genderLabel);
+        this.updateButtonIcon(
+          SettingKeyboard.Button_Cycle_Gender,
+          gamepadType,
+          this.genderIconElement,
+          this.genderLabel,
+        );
       }
       if (this.canCycleAbility) {
-        this.updateButtonIcon(SettingKeyboard.Button_Cycle_Ability, gamepadType, this.abilityIconElement, this.abilityLabel);
+        this.updateButtonIcon(
+          SettingKeyboard.Button_Cycle_Ability,
+          gamepadType,
+          this.abilityIconElement,
+          this.abilityLabel,
+        );
       }
       if (this.canCycleNature) {
-        this.updateButtonIcon(SettingKeyboard.Button_Cycle_Nature, gamepadType, this.natureIconElement, this.natureLabel);
+        this.updateButtonIcon(
+          SettingKeyboard.Button_Cycle_Nature,
+          gamepadType,
+          this.natureIconElement,
+          this.natureLabel,
+        );
+      }
+      if (this.canCycleTera) {
+        this.updateButtonIcon(SettingKeyboard.Button_Cycle_Tera, gamepadType, this.teraIconElement, this.teraLabel);
       }
     }
 
     // if filter mode is inactivated and gamepadType is not undefined, update the button icons
     if (!this.filterMode) {
-      this.updateFilterButtonIcon(SettingKeyboard.Button_Stats, gamepadType, this.goFilterIconElement, this.goFilterLabel);
+      this.updateFilterButtonIcon(
+        SettingKeyboard.Button_Stats,
+        gamepadType,
+        this.goFilterIconElement,
+        this.goFilterLabel,
+      );
     }
-
   }
 
   getValueLimit(): number {
@@ -2479,7 +2959,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
         valueLimit.value = 10;
     }
 
-    Challenge.applyChallenges(globalScene.gameMode, Challenge.ChallengeType.STARTER_POINTS, valueLimit);
+    applyChallenges(ChallengeType.STARTER_POINTS, valueLimit);
 
     return valueLimit.value;
   }
@@ -2502,17 +2982,29 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
         if (species.forms?.length > 0) {
           for (let i = 0; i < species.forms.length; i++) {
             /* Here we are making a fake form index dex props for challenges
-              * Since some pokemon rely on forms to be valid (i.e. blaze tauros for fire challenges), we make a fake form and dex props to use in the challenge
-              */
+             * Since some pokemon rely on forms to be valid (i.e. blaze tauros for fire challenges), we make a fake form and dex props to use in the challenge
+             */
+            if (!species.forms[i].isStarterSelectable) {
+              continue;
+            }
             const tempFormProps = BigInt(Math.pow(2, i)) * DexAttr.DEFAULT_FORM;
-            const isValidForChallenge = new BooleanHolder(true);
-            Challenge.applyChallenges(globalScene.gameMode, Challenge.ChallengeType.STARTER_CHOICE, container.species, isValidForChallenge, globalScene.gameData.getSpeciesDexAttrProps(species, tempFormProps), true);
-            allFormsValid = allFormsValid || isValidForChallenge.value;
+            const isValidForChallenge = checkStarterValidForChallenge(
+              container.species,
+              globalScene.gameData.getSpeciesDexAttrProps(species, tempFormProps),
+              true,
+            );
+            allFormsValid = allFormsValid || isValidForChallenge;
           }
         } else {
-          const isValidForChallenge = new BooleanHolder(true);
-          Challenge.applyChallenges(globalScene.gameMode, Challenge.ChallengeType.STARTER_CHOICE, container.species, isValidForChallenge, globalScene.gameData.getSpeciesDexAttrProps(species, globalScene.gameData.getSpeciesDefaultDexAttr(container.species, false, true)), true);
-          allFormsValid = isValidForChallenge.value;
+          const isValidForChallenge = checkStarterValidForChallenge(
+            container.species,
+            globalScene.gameData.getSpeciesDexAttrProps(
+              species,
+              globalScene.gameData.getSpeciesDefaultDexAttr(container.species, false, true),
+            ),
+            true,
+          );
+          allFormsValid = isValidForChallenge;
         }
         if (allFormsValid) {
           this.validStarterContainers.push(container);
@@ -2532,7 +3024,10 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
       const currentDexAttr = this.getCurrentDexProps(currentFilteredContainer.species.speciesId);
       const props = globalScene.gameData.getSpeciesDexAttrProps(currentFilteredContainer.species, currentDexAttr);
 
-      starterSprite.setTexture(currentFilteredContainer.species.getIconAtlasKey(props.formIndex, props.shiny, props.variant), currentFilteredContainer.species.getIconId(props.female!, props.formIndex, props.shiny, props.variant));
+      starterSprite.setTexture(
+        currentFilteredContainer.species.getIconAtlasKey(props.formIndex, props.shiny, props.variant),
+        currentFilteredContainer.species.getIconId(props.female!, props.formIndex, props.shiny, props.variant),
+      );
       currentFilteredContainer.checkIconId(props.female, props.formIndex, props.shiny, props.variant);
     }
 
@@ -2548,10 +3043,12 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
       const isStarterProgressable = speciesEggMoves.hasOwnProperty(container.species.speciesId);
 
       // Gen filter
-      const fitsGen =   this.filterBar.getVals(DropDownColumn.GEN).includes(container.species.generation);
+      const fitsGen = this.filterBar.getVals(DropDownColumn.GEN).includes(container.species.generation);
 
       // Type filter
-      const fitsType =  this.filterBar.getVals(DropDownColumn.TYPES).some(type => container.species.isOfType((type as number) - 1));
+      const fitsType = this.filterBar
+        .getVals(DropDownColumn.TYPES)
+        .some(type => container.species.isOfType((type as number) - 1));
 
       // Caught / Shiny filter
       const isNonShinyCaught = !!(caughtAttr & DexAttr.NON_SHINY);
@@ -2563,13 +3060,17 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
       const fitsCaught = this.filterBar.getVals(DropDownColumn.CAUGHT).some(caught => {
         if (caught === "SHINY3") {
           return isVariant3Caught;
-        } else if (caught === "SHINY2") {
+        }
+        if (caught === "SHINY2") {
           return isVariant2Caught && !isVariant3Caught;
-        } else if (caught === "SHINY") {
+        }
+        if (caught === "SHINY") {
           return isVariant1Caught && !isVariant2Caught && !isVariant3Caught;
-        } else if (caught === "NORMAL") {
+        }
+        if (caught === "NORMAL") {
           return isNonShinyCaught && !isVariant1Caught && !isVariant2Caught && !isVariant3Caught;
-        } else if (caught === "UNCAUGHT") {
+        }
+        if (caught === "UNCAUGHT") {
           return isUncaught;
         }
       });
@@ -2580,11 +3081,14 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
       const fitsPassive = this.filterBar.getVals(DropDownColumn.UNLOCKS).some(unlocks => {
         if (unlocks.val === "PASSIVE" && unlocks.state === DropDownState.ON) {
           return isPassiveUnlocked;
-        } else if (unlocks.val === "PASSIVE" && unlocks.state === DropDownState.EXCLUDE) {
+        }
+        if (unlocks.val === "PASSIVE" && unlocks.state === DropDownState.EXCLUDE) {
           return isStarterProgressable && !isPassiveUnlocked;
-        } else if (unlocks.val === "PASSIVE" && unlocks.state === DropDownState.UNLOCKABLE) {
+        }
+        if (unlocks.val === "PASSIVE" && unlocks.state === DropDownState.UNLOCKABLE) {
           return isPassiveUnlockable;
-        } else if (unlocks.val === "PASSIVE" && unlocks.state === DropDownState.OFF) {
+        }
+        if (unlocks.val === "PASSIVE" && unlocks.state === DropDownState.OFF) {
           return true;
         }
       });
@@ -2596,15 +3100,20 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
       const fitsCostReduction = this.filterBar.getVals(DropDownColumn.UNLOCKS).some(unlocks => {
         if (unlocks.val === "COST_REDUCTION" && unlocks.state === DropDownState.ON) {
           return isCostReducedByOne || isCostReducedByTwo;
-        } else if (unlocks.val === "COST_REDUCTION" && unlocks.state === DropDownState.ONE) {
+        }
+        if (unlocks.val === "COST_REDUCTION" && unlocks.state === DropDownState.ONE) {
           return isCostReducedByOne;
-        } else if (unlocks.val === "COST_REDUCTION" && unlocks.state === DropDownState.TWO) {
+        }
+        if (unlocks.val === "COST_REDUCTION" && unlocks.state === DropDownState.TWO) {
           return isCostReducedByTwo;
-        } else if (unlocks.val === "COST_REDUCTION" && unlocks.state === DropDownState.EXCLUDE) {
+        }
+        if (unlocks.val === "COST_REDUCTION" && unlocks.state === DropDownState.EXCLUDE) {
           return isStarterProgressable && !(isCostReducedByOne || isCostReducedByTwo);
-        } else if (unlocks.val === "COST_REDUCTION" && unlocks.state === DropDownState.UNLOCKABLE) {
+        }
+        if (unlocks.val === "COST_REDUCTION" && unlocks.state === DropDownState.UNLOCKABLE) {
           return isCostReductionUnlockable;
-        } else if (unlocks.val === "COST_REDUCTION" && unlocks.state === DropDownState.OFF) {
+        }
+        if (unlocks.val === "COST_REDUCTION" && unlocks.state === DropDownState.OFF) {
           return true;
         }
       });
@@ -2630,22 +3139,28 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
       const fitsWin = this.filterBar.getVals(DropDownColumn.MISC).some(misc => {
         if (misc.val === "WIN" && misc.state === DropDownState.ON) {
           return hasWon;
-        } else if (misc.val === "WIN" && misc.state === DropDownState.EXCLUDE) {
+        }
+        if (misc.val === "WIN" && misc.state === DropDownState.EXCLUDE) {
           return hasNotWon || isUndefined;
-        } else if (misc.val === "WIN" && misc.state === DropDownState.OFF) {
+        }
+        if (misc.val === "WIN" && misc.state === DropDownState.OFF) {
           return true;
         }
       });
 
       // HA Filter
-      const speciesHasHiddenAbility = container.species.abilityHidden !== container.species.ability1 && container.species.abilityHidden !== Abilities.NONE;
+      const speciesHasHiddenAbility =
+        container.species.abilityHidden !== container.species.ability1 &&
+        container.species.abilityHidden !== Abilities.NONE;
       const hasHA = starterData.abilityAttr & AbilityAttr.ABILITY_HIDDEN;
       const fitsHA = this.filterBar.getVals(DropDownColumn.MISC).some(misc => {
         if (misc.val === "HIDDEN_ABILITY" && misc.state === DropDownState.ON) {
           return hasHA;
-        } else if (misc.val === "HIDDEN_ABILITY" && misc.state === DropDownState.EXCLUDE) {
+        }
+        if (misc.val === "HIDDEN_ABILITY" && misc.state === DropDownState.EXCLUDE) {
           return speciesHasHiddenAbility && !hasHA;
-        } else if (misc.val === "HIDDEN_ABILITY" && misc.state === DropDownState.OFF) {
+        }
+        if (misc.val === "HIDDEN_ABILITY" && misc.state === DropDownState.OFF) {
           return true;
         }
       });
@@ -2655,9 +3170,11 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
       const fitsEgg = this.filterBar.getVals(DropDownColumn.MISC).some(misc => {
         if (misc.val === "EGG" && misc.state === DropDownState.ON) {
           return isEggPurchasable;
-        } else if (misc.val === "EGG" && misc.state === DropDownState.EXCLUDE) {
+        }
+        if (misc.val === "EGG" && misc.state === DropDownState.EXCLUDE) {
           return isStarterProgressable && !isEggPurchasable;
-        } else if (misc.val === "EGG" && misc.state === DropDownState.OFF) {
+        }
+        if (misc.val === "EGG" && misc.state === DropDownState.OFF) {
           return true;
         }
       });
@@ -2666,14 +3183,27 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
       const fitsPokerus = this.filterBar.getVals(DropDownColumn.MISC).some(misc => {
         if (misc.val === "POKERUS" && misc.state === DropDownState.ON) {
           return this.pokerusSpecies.includes(container.species);
-        } else if (misc.val === "POKERUS" && misc.state === DropDownState.EXCLUDE) {
+        }
+        if (misc.val === "POKERUS" && misc.state === DropDownState.EXCLUDE) {
           return !this.pokerusSpecies.includes(container.species);
-        } else if (misc.val === "POKERUS" && misc.state === DropDownState.OFF) {
+        }
+        if (misc.val === "POKERUS" && misc.state === DropDownState.OFF) {
           return true;
         }
       });
 
-      if (fitsGen && fitsType && fitsCaught && fitsPassive && fitsCostReduction && fitsFavorite && fitsWin && fitsHA && fitsEgg && fitsPokerus) {
+      if (
+        fitsGen &&
+        fitsType &&
+        fitsCaught &&
+        fitsPassive &&
+        fitsCostReduction &&
+        fitsFavorite &&
+        fitsWin &&
+        fitsHA &&
+        fitsEgg &&
+        fitsPokerus
+      ) {
         this.filteredStarterContainers.push(container);
       }
     });
@@ -2685,26 +3215,38 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
     const sort = this.filterBar.getVals(DropDownColumn.SORT)[0];
     this.filteredStarterContainers.sort((a, b) => {
       switch (sort.val) {
-        default:
-          break;
         case SortCriteria.NUMBER:
           return (a.species.speciesId - b.species.speciesId) * -sort.dir;
         case SortCriteria.COST:
           return (a.cost - b.cost) * -sort.dir;
-        case SortCriteria.CANDY:
+        case SortCriteria.CANDY: {
           const candyCountA = globalScene.gameData.starterData[a.species.speciesId].candyCount;
           const candyCountB = globalScene.gameData.starterData[b.species.speciesId].candyCount;
           return (candyCountA - candyCountB) * -sort.dir;
-        case SortCriteria.IV:
-          const avgIVsA = globalScene.gameData.dexData[a.species.speciesId].ivs.reduce((a, b) => a + b, 0) / globalScene.gameData.dexData[a.species.speciesId].ivs.length;
-          const avgIVsB = globalScene.gameData.dexData[b.species.speciesId].ivs.reduce((a, b) => a + b, 0) / globalScene.gameData.dexData[b.species.speciesId].ivs.length;
+        }
+        case SortCriteria.IV: {
+          const avgIVsA =
+            globalScene.gameData.dexData[a.species.speciesId].ivs.reduce((a, b) => a + b, 0) /
+            globalScene.gameData.dexData[a.species.speciesId].ivs.length;
+          const avgIVsB =
+            globalScene.gameData.dexData[b.species.speciesId].ivs.reduce((a, b) => a + b, 0) /
+            globalScene.gameData.dexData[b.species.speciesId].ivs.length;
           return (avgIVsA - avgIVsB) * -sort.dir;
+        }
         case SortCriteria.NAME:
           return a.species.name.localeCompare(b.species.name) * -sort.dir;
         case SortCriteria.CAUGHT:
-          return (globalScene.gameData.dexData[a.species.speciesId].caughtCount - globalScene.gameData.dexData[b.species.speciesId].caughtCount) * -sort.dir;
+          return (
+            (globalScene.gameData.dexData[a.species.speciesId].caughtCount -
+              globalScene.gameData.dexData[b.species.speciesId].caughtCount) *
+            -sort.dir
+          );
         case SortCriteria.HATCHED:
-          return (globalScene.gameData.dexData[a.species.speciesId].hatchedCount - globalScene.gameData.dexData[b.species.speciesId].hatchedCount) * -sort.dir;
+          return (
+            (globalScene.gameData.dexData[a.species.speciesId].hatchedCount -
+              globalScene.gameData.dexData[b.species.speciesId].hatchedCount) *
+            -sort.dir
+          );
       }
       return 0;
     });
@@ -2721,7 +3263,10 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
     const maxColumns = 9;
     const maxRows = 9;
     const onScreenFirstIndex = this.scrollCursor * maxColumns;
-    const onScreenLastIndex = Math.min(this.filteredStarterContainers.length - 1, onScreenFirstIndex + maxRows * maxColumns - 1);
+    const onScreenLastIndex = Math.min(
+      this.filteredStarterContainers.length - 1,
+      onScreenFirstIndex + maxRows * maxColumns - 1,
+    );
 
     this.starterSelectScrollBar.setScrollCursor(this.scrollCursor);
 
@@ -2743,57 +3288,65 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
           this.starterCursorObjs[this.starterSpecies.indexOf(container.species)].setVisible(false);
         }
         return;
-      } else {
-        container.setVisible(true);
+      }
+      container.setVisible(true);
 
-        if (this.pokerusSpecies.includes(container.species)) {
-          this.pokerusCursorObjs[pokerusCursorIndex].setPosition(pos.x - 1, pos.y + 1);
-          this.pokerusCursorObjs[pokerusCursorIndex].setVisible(true);
-          pokerusCursorIndex++;
-        }
+      if (this.pokerusSpecies.includes(container.species)) {
+        this.pokerusCursorObjs[pokerusCursorIndex].setPosition(pos.x - 1, pos.y + 1);
+        this.pokerusCursorObjs[pokerusCursorIndex].setVisible(true);
+        pokerusCursorIndex++;
+      }
 
-        if (this.starterSpecies.includes(container.species)) {
-          this.starterCursorObjs[this.starterSpecies.indexOf(container.species)].setPosition(pos.x - 1, pos.y + 1);
-          this.starterCursorObjs[this.starterSpecies.indexOf(container.species)].setVisible(true);
-        }
+      if (this.starterSpecies.includes(container.species)) {
+        this.starterCursorObjs[this.starterSpecies.indexOf(container.species)].setPosition(pos.x - 1, pos.y + 1);
+        this.starterCursorObjs[this.starterSpecies.indexOf(container.species)].setVisible(true);
+      }
 
-        const speciesId = container.species.speciesId;
-        this.updateStarterValueLabel(container);
+      const speciesId = container.species.speciesId;
+      this.updateStarterValueLabel(container);
 
-        container.label.setVisible(true);
-        const speciesVariants = speciesId && globalScene.gameData.dexData[speciesId].caughtAttr & DexAttr.SHINY
-          ? [ DexAttr.DEFAULT_VARIANT, DexAttr.VARIANT_2, DexAttr.VARIANT_3 ].filter(v => !!(globalScene.gameData.dexData[speciesId].caughtAttr & v))
+      container.label.setVisible(true);
+      const speciesVariants =
+        speciesId && globalScene.gameData.dexData[speciesId].caughtAttr & DexAttr.SHINY
+          ? [DexAttr.DEFAULT_VARIANT, DexAttr.VARIANT_2, DexAttr.VARIANT_3].filter(
+              v => !!(globalScene.gameData.dexData[speciesId].caughtAttr & v),
+            )
           : [];
-        for (let v = 0; v < 3; v++) {
-          const hasVariant = speciesVariants.length > v;
-          container.shinyIcons[v].setVisible(hasVariant);
-          if (hasVariant) {
-            container.shinyIcons[v].setTint(getVariantTint(speciesVariants[v] === DexAttr.DEFAULT_VARIANT ? 0 : speciesVariants[v] === DexAttr.VARIANT_2 ? 1 : 2));
-          }
+      for (let v = 0; v < 3; v++) {
+        const hasVariant = speciesVariants.length > v;
+        container.shinyIcons[v].setVisible(hasVariant);
+        if (hasVariant) {
+          container.shinyIcons[v].setTint(
+            getVariantTint(
+              speciesVariants[v] === DexAttr.DEFAULT_VARIANT ? 0 : speciesVariants[v] === DexAttr.VARIANT_2 ? 1 : 2,
+            ),
+          );
+        }
+      }
+
+      container.starterPassiveBgs.setVisible(!!globalScene.gameData.starterData[speciesId].passiveAttr);
+      container.hiddenAbilityIcon.setVisible(
+        !!globalScene.gameData.dexData[speciesId].caughtAttr &&
+          !!(globalScene.gameData.starterData[speciesId].abilityAttr & 4),
+      );
+      container.classicWinIcon.setVisible(globalScene.gameData.starterData[speciesId].classicWinCount > 0);
+      container.favoriteIcon.setVisible(this.starterPreferences[speciesId]?.favorite ?? false);
+
+      // 'Candy Icon' mode
+      if (globalScene.candyUpgradeDisplay === 0) {
+        if (!starterColors[speciesId]) {
+          // Default to white if no colors are found
+          starterColors[speciesId] = ["ffffff", "ffffff"];
         }
 
-        container.starterPassiveBgs.setVisible(!!globalScene.gameData.starterData[speciesId].passiveAttr);
-        container.hiddenAbilityIcon.setVisible(!!globalScene.gameData.dexData[speciesId].caughtAttr && !!(globalScene.gameData.starterData[speciesId].abilityAttr & 4));
-        container.classicWinIcon.setVisible(globalScene.gameData.starterData[speciesId].classicWinCount > 0);
-        container.favoriteIcon.setVisible(this.starterPreferences[speciesId]?.favorite ?? false);
+        // Set the candy colors
+        container.candyUpgradeIcon.setTint(argbFromRgba(rgbHexToRgba(starterColors[speciesId][0])));
+        container.candyUpgradeOverlayIcon.setTint(argbFromRgba(rgbHexToRgba(starterColors[speciesId][1])));
 
-        // 'Candy Icon' mode
-        if (globalScene.candyUpgradeDisplay === 0) {
-
-          if (!starterColors[speciesId]) {
-            // Default to white if no colors are found
-            starterColors[speciesId] = [ "ffffff", "ffffff" ];
-          }
-
-          // Set the candy colors
-          container.candyUpgradeIcon.setTint(argbFromRgba(rgbHexToRgba(starterColors[speciesId][0])));
-          container.candyUpgradeOverlayIcon.setTint(argbFromRgba(rgbHexToRgba(starterColors[speciesId][1])));
-
-          this.setUpgradeIcon(container);
-        } else if (globalScene.candyUpgradeDisplay === 1) {
-          container.candyUpgradeIcon.setVisible(false);
-          container.candyUpgradeOverlayIcon.setVisible(false);
-        }
+        this.setUpgradeIcon(container);
+      } else if (globalScene.candyUpgradeDisplay === 1) {
+        container.candyUpgradeIcon.setVisible(false);
+        container.candyUpgradeOverlayIcon.setVisible(false);
       }
     });
   };
@@ -2818,7 +3371,9 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
       if (species) {
         const defaultDexAttr = this.getCurrentDexProps(species.speciesId);
         const defaultProps = globalScene.gameData.getSpeciesDexAttrProps(species, defaultDexAttr);
-        const variant = this.starterPreferences[species.speciesId]?.variant ? this.starterPreferences[species.speciesId].variant as Variant : defaultProps.variant;
+        const variant = this.starterPreferences[species.speciesId]?.variant
+          ? (this.starterPreferences[species.speciesId].variant as Variant)
+          : defaultProps.variant;
         const tint = getVariantTint(variant);
         this.pokemonShinyIcon.setFrame(getVariantIcon(variant));
         this.pokemonShinyIcon.setTint(tint);
@@ -2876,6 +3431,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
     this.dexAttrCursor = species ? this.getCurrentDexProps(species.speciesId) : 0n;
     this.abilityCursor = species ? globalScene.gameData.getStarterSpeciesDefaultAbilityIndex(species) : 0;
     this.natureCursor = species ? globalScene.gameData.getSpeciesDefaultNature(species) : 0;
+    this.teraCursor = species ? species.type1 : PokemonType.UNKNOWN;
 
     if (!species && globalScene.ui.getTooltip().visible) {
       globalScene.ui.hideTooltip();
@@ -2884,16 +3440,22 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
     this.pokemonAbilityText.off("pointerover");
     this.pokemonPassiveText.off("pointerover");
 
-    const starterAttributes : StarterAttributes | null = species ? { ...this.starterPreferences[species.speciesId] } : null;
+    const starterAttributes: StarterAttributes | null = species
+      ? { ...this.starterPreferences[species.speciesId] }
+      : null;
 
     if (starterAttributes?.nature) {
       // load default nature from stater save data, if set
       this.natureCursor = starterAttributes.nature;
     }
-    if (starterAttributes?.ability && !isNaN(starterAttributes.ability)) {
+    if (starterAttributes?.ability && !Number.isNaN(starterAttributes.ability)) {
       // load default ability from stater save data, if set
       this.abilityCursor = starterAttributes.ability;
     }
+    if (starterAttributes?.tera) {
+      // load default tera from starter save data, if set
+      this.teraCursor = starterAttributes.tera;
+    }
 
     if (this.statsMode) {
       if (this.speciesStarterDexEntry?.caughtAttr) {
@@ -2916,7 +3478,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
 
       // Resume the animation for the previously selected species
       const icon = this.starterContainers[speciesIndex].icon;
-      globalScene.tweens.getTweensOf(icon).forEach(tween => tween.resume());
+      globalScene.tweens.getTweensOf(icon).forEach(tween => tween.play());
     }
 
     this.lastSpecies = species!; // TODO: is this bang correct?
@@ -2943,7 +3505,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
         let growthReadable = toReadableString(GrowthRate[species.growthRate]);
         const growthAux = growthReadable.replace(" ", "_");
         if (i18next.exists("growth:" + growthAux)) {
-          growthReadable = i18next.t("growth:" + growthAux as any);
+          growthReadable = i18next.t(("growth:" + growthAux) as any);
         }
         this.pokemonGrowthRateText.setText(growthReadable);
 
@@ -2976,11 +3538,9 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
           this.pokemonCaughtHatchedContainer.setY(16);
           this.pokemonShinyIcon.setY(135);
           this.pokemonShinyIcon.setFrame(getVariantIcon(variant));
-          [
-            this.pokemonCandyContainer,
-            this.pokemonHatchedIcon,
-            this.pokemonHatchedCountText
-          ].map(c => c.setVisible(false));
+          [this.pokemonCandyContainer, this.pokemonHatchedIcon, this.pokemonHatchedCountText].map(c =>
+            c.setVisible(false),
+          );
           this.pokemonFormText.setY(25);
         } else {
           this.pokemonCaughtHatchedContainer.setY(25);
@@ -2994,7 +3554,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
           this.pokemonHatchedCountText.setVisible(true);
 
           const { currentFriendship, friendshipCap } = this.getFriendship(this.lastSpecies.speciesId);
-          const candyCropY = 16 - (16 * (currentFriendship / friendshipCap));
+          const candyCropY = 16 - 16 * (currentFriendship / friendshipCap);
           this.pokemonCandyDarknessOverlay.setCrop(0, 0, 16, candyCropY);
 
           this.pokemonCandyContainer.on("pointerover", () => {
@@ -3005,10 +3565,8 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
             globalScene.ui.hideTooltip();
             this.activeTooltip = undefined;
           });
-
         }
 
-
         // Pause the animation when the species is selected
         const speciesIndex = this.allSpecies.indexOf(species);
         const icon = this.starterContainers[speciesIndex].icon;
@@ -3035,15 +3593,17 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
             female: props.female,
             variant: props.variant,
             abilityIndex: this.starterAbilityIndexes[starterIndex],
-            natureIndex: this.starterNatures[starterIndex]
+            natureIndex: this.starterNatures[starterIndex],
+            teraType: this.starterTeras[starterIndex],
           });
         } else {
           const defaultDexAttr = this.getCurrentDexProps(species.speciesId);
-          const defaultAbilityIndex = starterAttributes?.ability ?? globalScene.gameData.getStarterSpeciesDefaultAbilityIndex(species);
+          const defaultAbilityIndex =
+            starterAttributes?.ability ?? globalScene.gameData.getStarterSpeciesDefaultAbilityIndex(species);
           // load default nature from stater save data, if set
           const defaultNature = starterAttributes?.nature || globalScene.gameData.getSpeciesDefaultNature(species);
           props = globalScene.gameData.getSpeciesDexAttrProps(species, defaultDexAttr);
-          if (starterAttributes?.variant && !isNaN(starterAttributes.variant)) {
+          if (starterAttributes?.variant && !Number.isNaN(starterAttributes.variant)) {
             if (props.shiny) {
               props.variant = starterAttributes.variant as Variant;
             }
@@ -3057,7 +3617,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
             female: props.female,
             variant: props.variant,
             abilityIndex: defaultAbilityIndex,
-            natureIndex: defaultNature
+            natureIndex: defaultNature,
           });
         }
 
@@ -3083,6 +3643,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
         this.pokemonCaughtHatchedContainer.setVisible(false);
         this.pokemonCandyContainer.setVisible(false);
         this.pokemonFormText.setVisible(false);
+        this.teraIcon.setVisible(false);
 
         const defaultDexAttr = globalScene.gameData.getSpeciesDefaultDexAttr(species, true, true);
         const defaultAbilityIndex = globalScene.gameData.getStarterSpeciesDefaultAbilityIndex(species);
@@ -3096,7 +3657,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
           variant: props.variant,
           abilityIndex: defaultAbilityIndex,
           natureIndex: defaultNature,
-          forSeen: true
+          forSeen: true,
         });
         this.pokemonSprite.setTint(0x808080);
       }
@@ -3117,32 +3678,40 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
       this.pokemonCaughtHatchedContainer.setVisible(false);
       this.pokemonCandyContainer.setVisible(false);
       this.pokemonFormText.setVisible(false);
+      this.teraIcon.setVisible(false);
 
-      this.setSpeciesDetails(species!, { // TODO: is this bang correct?
+      this.setSpeciesDetails(species!, {
+        // TODO: is this bang correct?
         shiny: false,
         formIndex: 0,
         female: false,
         variant: 0,
         abilityIndex: 0,
-        natureIndex: 0
+        natureIndex: 0,
       });
       this.pokemonSprite.clearTint();
     }
   }
 
   setSpeciesDetails(species: PokemonSpecies, options: SpeciesDetails = {}): void {
-    let { shiny, formIndex, female, variant, abilityIndex, natureIndex } = options;
+    let { shiny, formIndex, female, variant, abilityIndex, natureIndex, teraType } = options;
     const forSeen: boolean = options.forSeen ?? false;
     const oldProps = species ? globalScene.gameData.getSpeciesDexAttrProps(species, this.dexAttrCursor) : null;
-    const oldAbilityIndex = this.abilityCursor > -1 ? this.abilityCursor : globalScene.gameData.getStarterSpeciesDefaultAbilityIndex(species);
-    const oldNatureIndex = this.natureCursor > -1 ? this.natureCursor : globalScene.gameData.getSpeciesDefaultNature(species);
+    const oldAbilityIndex =
+      this.abilityCursor > -1 ? this.abilityCursor : globalScene.gameData.getStarterSpeciesDefaultAbilityIndex(species);
+    const oldNatureIndex =
+      this.natureCursor > -1 ? this.natureCursor : globalScene.gameData.getSpeciesDefaultNature(species);
     this.dexAttrCursor = 0n;
     this.abilityCursor = -1;
     this.natureCursor = -1;
+    this.teraCursor = PokemonType.UNKNOWN;
     // We will only update the sprite if there is a change to form, shiny/variant
     // or gender for species with gender sprite differences
-    const shouldUpdateSprite = (species?.genderDiffs && !isNullOrUndefined(female))
-     || !isNullOrUndefined(formIndex) || !isNullOrUndefined(shiny) || !isNullOrUndefined(variant);
+    const shouldUpdateSprite =
+      (species?.genderDiffs && !isNullOrUndefined(female)) ||
+      !isNullOrUndefined(formIndex) ||
+      !isNullOrUndefined(shiny) ||
+      !isNullOrUndefined(variant);
 
     if (this.activeTooltip === "CANDY") {
       if (this.lastSpecies && this.pokemonCandyContainer.visible) {
@@ -3162,13 +3731,24 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
     }
 
     if (species) {
-      this.dexAttrCursor |= (shiny !== undefined ? !shiny : !(shiny = oldProps?.shiny)) ? DexAttr.NON_SHINY : DexAttr.SHINY;
-      this.dexAttrCursor |= (female !== undefined ? !female : !(female = oldProps?.female)) ? DexAttr.MALE : DexAttr.FEMALE;
-      this.dexAttrCursor |= (variant !== undefined ? !variant : !(variant = oldProps?.variant)) ? DexAttr.DEFAULT_VARIANT : variant === 1 ? DexAttr.VARIANT_2 : DexAttr.VARIANT_3;
-      this.dexAttrCursor |= globalScene.gameData.getFormAttr(formIndex !== undefined ? formIndex : (formIndex = oldProps!.formIndex)); // TODO: is this bang correct?
+      this.dexAttrCursor |= (shiny !== undefined ? !shiny : !(shiny = oldProps?.shiny))
+        ? DexAttr.NON_SHINY
+        : DexAttr.SHINY;
+      this.dexAttrCursor |= (female !== undefined ? !female : !(female = oldProps?.female))
+        ? DexAttr.MALE
+        : DexAttr.FEMALE;
+      this.dexAttrCursor |= (variant !== undefined ? !variant : !(variant = oldProps?.variant))
+        ? DexAttr.DEFAULT_VARIANT
+        : variant === 1
+          ? DexAttr.VARIANT_2
+          : DexAttr.VARIANT_3;
+      this.dexAttrCursor |= globalScene.gameData.getFormAttr(
+        formIndex !== undefined ? formIndex : (formIndex = oldProps!.formIndex),
+      ); // TODO: is this bang correct?
       this.abilityCursor = abilityIndex !== undefined ? abilityIndex : (abilityIndex = oldAbilityIndex);
       this.natureCursor = natureIndex !== undefined ? natureIndex : (natureIndex = oldNatureIndex);
-      const [ isInParty, partyIndex ]: [boolean, number] = this.isInParty(species); // we use this to firstly check if the pokemon is in the party, and if so, to get the party index in order to update the icon image
+      this.teraCursor = !isNullOrUndefined(teraType) ? teraType : (teraType = species.type1);
+      const [isInParty, partyIndex]: [boolean, number] = this.isInParty(species); // we use this to firstly check if the pokemon is in the party, and if so, to get the party index in order to update the icon image
       if (isInParty) {
         this.updatePartyIcon(species, partyIndex);
       }
@@ -3179,6 +3759,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
     this.pokemonPassiveText.setVisible(false);
     this.pokemonPassiveDisabledIcon.setVisible(false);
     this.pokemonPassiveLockedIcon.setVisible(false);
+    this.teraIcon.setVisible(false);
 
     if (this.assetLoadCancelled) {
       this.assetLoadCancelled.value = true;
@@ -3221,7 +3802,9 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
 
       this.shinyOverlay.setVisible(shiny ?? false); // TODO: is false the correct default?
       this.pokemonNumberText.setColor(this.getTextColor(shiny ? TextStyle.SUMMARY_GOLD : TextStyle.SUMMARY, false));
-      this.pokemonNumberText.setShadowColor(this.getTextColor(shiny ? TextStyle.SUMMARY_GOLD : TextStyle.SUMMARY, true));
+      this.pokemonNumberText.setShadowColor(
+        this.getTextColor(shiny ? TextStyle.SUMMARY_GOLD : TextStyle.SUMMARY, true),
+      );
 
       if (forSeen ? this.speciesStarterDexEntry?.seenAttr : this.speciesStarterDexEntry?.caughtAttr) {
         const starterIndex = this.starterSpecies.indexOf(species);
@@ -3230,13 +3813,15 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
           this.starterAttr[starterIndex] = this.dexAttrCursor;
           this.starterAbilityIndexes[starterIndex] = this.abilityCursor;
           this.starterNatures[starterIndex] = this.natureCursor;
+          this.starterTeras[starterIndex] = this.teraCursor;
         }
 
         const assetLoadCancelled = new BooleanHolder(false);
         this.assetLoadCancelled = assetLoadCancelled;
 
         if (shouldUpdateSprite) {
-          species.loadAssets(female!, formIndex, shiny, variant, true).then(() => { // TODO: is this bang correct?
+          species.loadAssets(female!, formIndex, shiny, variant, true).then(() => {
+            // TODO: is this bang correct?
             if (assetLoadCancelled.value) {
               return;
             }
@@ -3252,19 +3837,25 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
           this.pokemonSprite.setVisible(!this.statsMode);
         }
 
-        const isValidForChallenge = new BooleanHolder(true);
-        Challenge.applyChallenges(globalScene.gameMode, Challenge.ChallengeType.STARTER_CHOICE, species, isValidForChallenge, globalScene.gameData.getSpeciesDexAttrProps(species, this.dexAttrCursor), !!this.starterSpecies.length);
-        const currentFilteredContainer = this.filteredStarterContainers.find(p => p.species.speciesId === species.speciesId);
+        const currentFilteredContainer = this.filteredStarterContainers.find(
+          p => p.species.speciesId === species.speciesId,
+        );
         if (currentFilteredContainer) {
           const starterSprite = currentFilteredContainer.icon as Phaser.GameObjects.Sprite;
-          starterSprite.setTexture(species.getIconAtlasKey(formIndex, shiny, variant), species.getIconId(female!, formIndex, shiny, variant));
+          starterSprite.setTexture(
+            species.getIconAtlasKey(formIndex, shiny, variant),
+            species.getIconId(female!, formIndex, shiny, variant),
+          );
           currentFilteredContainer.checkIconId(female, formIndex, shiny, variant);
         }
 
         const isNonShinyCaught = !!(caughtAttr & DexAttr.NON_SHINY);
         const isShinyCaught = !!(caughtAttr & DexAttr.SHINY);
 
-        this.canCycleShiny = isNonShinyCaught && isShinyCaught;
+        const caughtVariants = [DexAttr.DEFAULT_VARIANT, DexAttr.VARIANT_2, DexAttr.VARIANT_3].filter(
+          v => caughtAttr & v,
+        );
+        this.canCycleShiny = (isNonShinyCaught && isShinyCaught) || (isShinyCaught && caughtVariants.length > 1);
 
         const isMaleCaught = !!(caughtAttr & DexAttr.MALE);
         const isFemaleCaught = !!(caughtAttr & DexAttr.FEMALE);
@@ -3283,12 +3874,18 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
           hasAbility2 = 0;
         }
 
-        this.canCycleAbility = [ hasAbility1, hasAbility2, hasHiddenAbility ].filter(a => a).length > 1;
+        this.canCycleAbility = [hasAbility1, hasAbility2, hasHiddenAbility].filter(a => a).length > 1;
 
-        this.canCycleForm = species.forms.filter(f => f.isStarterSelectable || !pokemonFormChanges[species.speciesId]?.find(fc => fc.formKey))
-          .map((_, f) => dexEntry.caughtAttr & globalScene.gameData.getFormAttr(f)).filter(f => f).length > 1;
+        this.canCycleForm =
+          species.forms
+            .filter(f => f.isStarterSelectable || !pokemonFormChanges[species.speciesId]?.find(fc => fc.formKey))
+            .map((_, f) => dexEntry.caughtAttr & globalScene.gameData.getFormAttr(f))
+            .filter(f => f).length > 1;
         this.canCycleNature = globalScene.gameData.getNaturesForAttr(dexEntry.natureAttr).length > 1;
-
+        this.canCycleTera =
+          !this.statsMode &&
+          globalScene.gameData.achvUnlocks.hasOwnProperty(achvs.TERASTALLIZE.id) &&
+          !isNullOrUndefined(getPokemonSpeciesForm(species.speciesId, formIndex ?? 0).type2);
       }
 
       if (dexEntry.caughtAttr && species.malePercent !== null) {
@@ -3301,12 +3898,19 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
       }
 
       if (dexEntry.caughtAttr) {
-        const ability = allAbilities[this.lastSpecies.getAbility(abilityIndex!)]; // TODO: is this bang correct?
+        let ability: Ability;
+        if (this.lastSpecies.forms?.length > 1) {
+          ability = allAbilities[this.lastSpecies.forms[formIndex ?? 0].getAbility(abilityIndex!)];
+        } else {
+          ability = allAbilities[this.lastSpecies.getAbility(abilityIndex!)]; // TODO: is this bang correct?
+        }
         this.pokemonAbilityText.setText(ability.name);
 
         const isHidden = abilityIndex === (this.lastSpecies.ability2 ? 2 : 1);
         this.pokemonAbilityText.setColor(this.getTextColor(!isHidden ? TextStyle.SUMMARY_ALT : TextStyle.SUMMARY_GOLD));
-        this.pokemonAbilityText.setShadowColor(this.getTextColor(!isHidden ? TextStyle.SUMMARY_ALT : TextStyle.SUMMARY_GOLD, true));
+        this.pokemonAbilityText.setShadowColor(
+          this.getTextColor(!isHidden ? TextStyle.SUMMARY_ALT : TextStyle.SUMMARY_GOLD, true),
+        );
 
         const passiveAttr = globalScene.gameData.starterData[species.speciesId].passiveAttr;
         const passiveAbility = allAbilities[this.lastSpecies.getPassiveAbility(formIndex)];
@@ -3359,22 +3963,27 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
 
           const iconPosition = {
             x: this.pokemonPassiveText.x + this.pokemonPassiveText.displayWidth + 1,
-            y: this.pokemonPassiveText.y + this.pokemonPassiveText.displayHeight / 2
+            y: this.pokemonPassiveText.y + this.pokemonPassiveText.displayHeight / 2,
           };
           this.pokemonPassiveDisabledIcon.setVisible(isUnlocked && !isEnabled);
           this.pokemonPassiveDisabledIcon.setPosition(iconPosition.x, iconPosition.y);
           this.pokemonPassiveLockedIcon.setVisible(!isUnlocked);
           this.pokemonPassiveLockedIcon.setPosition(iconPosition.x, iconPosition.y);
-
         } else if (this.activeTooltip === "PASSIVE") {
           // No passive and passive tooltip is active > hide it
           globalScene.ui.hideTooltip();
         }
 
-        this.pokemonNatureText.setText(getNatureName(natureIndex as unknown as Nature, true, true, false, globalScene.uiTheme));
+        this.pokemonNatureText.setText(
+          getNatureName(natureIndex as unknown as Nature, true, true, false, globalScene.uiTheme),
+        );
 
         let levelMoves: LevelMoves;
-        if (pokemonFormLevelMoves.hasOwnProperty(species.speciesId) && formIndex && pokemonFormLevelMoves[species.speciesId].hasOwnProperty(formIndex)) {
+        if (
+          pokemonFormLevelMoves.hasOwnProperty(species.speciesId) &&
+          formIndex &&
+          pokemonFormLevelMoves[species.speciesId].hasOwnProperty(formIndex)
+        ) {
           levelMoves = pokemonFormLevelMoves[species.speciesId][formIndex];
         } else {
           levelMoves = pokemonSpeciesLevelMoves[species.speciesId];
@@ -3394,35 +4003,45 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
             ? speciesMoveData
             : speciesMoveData[formIndex!] // TODO: is this bang correct?
           : null;
-        const availableStarterMoves = this.speciesStarterMoves.concat(speciesEggMoves.hasOwnProperty(species.speciesId) ? speciesEggMoves[species.speciesId].filter((_, em: number) => globalScene.gameData.starterData[species.speciesId].eggMoves & (1 << em)) : []);
-        this.starterMoveset = (moveData || (this.speciesStarterMoves.slice(0, 4) as StarterMoveset)).filter(m => availableStarterMoves.find(sm => sm === m)) as StarterMoveset;
+        const availableStarterMoves = this.speciesStarterMoves.concat(
+          speciesEggMoves.hasOwnProperty(species.speciesId)
+            ? speciesEggMoves[species.speciesId].filter(
+                (_: any, em: number) => globalScene.gameData.starterData[species.speciesId].eggMoves & (1 << em),
+              )
+            : [],
+        );
+        this.starterMoveset = (moveData || (this.speciesStarterMoves.slice(0, 4) as StarterMoveset)).filter(m =>
+          availableStarterMoves.find(sm => sm === m),
+        ) as StarterMoveset;
         // Consolidate move data if it contains an incompatible move
         if (this.starterMoveset.length < 4 && this.starterMoveset.length < availableStarterMoves.length) {
-          this.starterMoveset.push(...availableStarterMoves.filter(sm => this.starterMoveset?.indexOf(sm) === -1).slice(0, 4 - this.starterMoveset.length));
+          this.starterMoveset.push(
+            ...availableStarterMoves
+              .filter(sm => this.starterMoveset?.indexOf(sm) === -1)
+              .slice(0, 4 - this.starterMoveset.length),
+          );
         }
 
         // Remove duplicate moves
-        this.starterMoveset = this.starterMoveset.filter(
-          (move, i) => {
-            return this.starterMoveset?.indexOf(move) === i;
-          }) as StarterMoveset;
+        this.starterMoveset = this.starterMoveset.filter((move, i) => {
+          return this.starterMoveset?.indexOf(move) === i;
+        }) as StarterMoveset;
 
         const speciesForm = getPokemonSpeciesForm(species.speciesId, formIndex!); // TODO: is the bang correct?
-        const formText = capitalizeString(species?.forms[formIndex!]?.formKey, "-", false, false); // TODO: is the bang correct?
-
-        const speciesName = capitalizeString(Species[species.speciesId], "_", true, false);
-
-        if (species.speciesId === Species.ARCEUS) {
-          this.pokemonFormText.setText(i18next.t(`pokemonInfo:Type.${formText?.toUpperCase()}`));
-        } else {
-          this.pokemonFormText.setText(formText ? i18next.t(`pokemonForm:${speciesName}${formText}`) : "");
-        }
+        const formText = species.getFormNameToDisplay(formIndex);
+        this.pokemonFormText.setText(formText);
 
         this.setTypeIcons(speciesForm.type1, speciesForm.type2);
+
+        this.teraIcon.setFrame(PokemonType[this.teraCursor].toLowerCase());
+        this.teraIcon.setVisible(
+          !this.statsMode && globalScene.gameData.achvUnlocks.hasOwnProperty(achvs.TERASTALLIZE.id),
+        );
       } else {
         this.pokemonAbilityText.setText("");
         this.pokemonPassiveText.setText("");
         this.pokemonNatureText.setText("");
+        this.teraIcon.setVisible(false);
         this.setTypeIcons(null, null);
       }
     } else {
@@ -3433,6 +4052,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
       this.pokemonAbilityText.setText("");
       this.pokemonPassiveText.setText("");
       this.pokemonNatureText.setText("");
+      this.teraIcon.setVisible(false);
       this.setTypeIcons(null, null);
     }
 
@@ -3442,7 +4062,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
 
     for (let m = 0; m < 4; m++) {
       const move = m < this.starterMoveset.length ? allMoves[this.starterMoveset[m]] : null;
-      this.pokemonMoveBgs[m].setFrame(Type[move ? move.type : Type.UNKNOWN].toString().toLowerCase());
+      this.pokemonMoveBgs[m].setFrame(PokemonType[move ? move.type : PokemonType.UNKNOWN].toString().toLowerCase());
       this.pokemonMoveLabels[m].setText(move ? move.name : "-");
       this.pokemonMoveContainers[m].setVisible(!!move);
     }
@@ -3452,7 +4072,9 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
     for (let em = 0; em < 4; em++) {
       const eggMove = hasEggMoves ? allMoves[speciesEggMoves[species.speciesId][em]] : null;
       const eggMoveUnlocked = eggMove && globalScene.gameData.starterData[species.speciesId].eggMoves & (1 << em);
-      this.pokemonEggMoveBgs[em].setFrame(Type[eggMove ? eggMove.type : Type.UNKNOWN].toString().toLowerCase());
+      this.pokemonEggMoveBgs[em].setFrame(
+        PokemonType[eggMove ? eggMove.type : PokemonType.UNKNOWN].toString().toLowerCase(),
+      );
       this.pokemonEggMoveLabels[em].setText(eggMove && eggMoveUnlocked ? eggMove.name : "???");
     }
 
@@ -3466,16 +4088,16 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
     this.updateInstructions();
   }
 
-  setTypeIcons(type1: Type | null, type2: Type | null): void {
+  setTypeIcons(type1: PokemonType | null, type2: PokemonType | null): void {
     if (type1 !== null) {
       this.type1Icon.setVisible(true);
-      this.type1Icon.setFrame(Type[type1].toLowerCase());
+      this.type1Icon.setFrame(PokemonType[type1].toLowerCase());
     } else {
       this.type1Icon.setVisible(false);
     }
     if (type2 !== null) {
       this.type2Icon.setVisible(true);
-      this.type2Icon.setFrame(Type[type2].toLowerCase());
+      this.type2Icon.setFrame(PokemonType[type2].toLowerCase());
     } else {
       this.type2Icon.setVisible(false);
     }
@@ -3486,6 +4108,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
     this.starterAttr.splice(index, 1);
     this.starterAbilityIndexes.splice(index, 1);
     this.starterNatures.splice(index, 1);
+    this.starterTeras.splice(index, 1);
     this.starterMovesets.splice(index, 1);
 
     for (let s = 0; s < this.starterSpecies.length; s++) {
@@ -3564,7 +4187,13 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
   }
 
   tryUpdateValue(add?: number, addingToParty?: boolean): boolean {
-    const value = this.starterSpecies.map(s => s.generation).reduce((total: number, _gen: number, i: number) => total += globalScene.gameData.getSpeciesStarterValue(this.starterSpecies[i].speciesId), 0);
+    const value = this.starterSpecies
+      .map(s => s.generation)
+      .reduce(
+        (total: number, _gen: number, i: number) =>
+          (total += globalScene.gameData.getSpeciesStarterValue(this.starterSpecies[i].speciesId)),
+        0,
+      );
     const newValue = value + (add || 0);
     const valueLimit = this.getValueLimit();
     const overLimit = newValue > valueLimit;
@@ -3574,17 +4203,22 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
     }
     this.valueLimitLabel.setText(`${newValueStr}/${valueLimit}`);
     this.valueLimitLabel.setColor(this.getTextColor(!overLimit ? TextStyle.TOOLTIP_CONTENT : TextStyle.SUMMARY_PINK));
-    this.valueLimitLabel.setShadowColor(this.getTextColor(!overLimit ? TextStyle.TOOLTIP_CONTENT : TextStyle.SUMMARY_PINK, true));
+    this.valueLimitLabel.setShadowColor(
+      this.getTextColor(!overLimit ? TextStyle.TOOLTIP_CONTENT : TextStyle.SUMMARY_PINK, true),
+    );
     if (overLimit) {
       globalScene.time.delayedCall(fixedInt(500), () => this.tryUpdateValue());
       return false;
     }
-    let isPartyValid: boolean = this.isPartyValid(); // this checks to see if the party is valid
-    if (addingToParty) { // this does a check to see if the pokemon being added is valid; if so, it will update the isPartyValid boolean
-      const isNewPokemonValid = new BooleanHolder(true);
+    let isPartyValid: boolean = this.isPartyValid();
+    if (addingToParty) {
       const species = this.filteredStarterContainers[this.cursor].species;
-      Challenge.applyChallenges(globalScene.gameMode, Challenge.ChallengeType.STARTER_CHOICE, species, isNewPokemonValid, globalScene.gameData.getSpeciesDexAttrProps(species, this.getCurrentDexProps(species.speciesId)), false);
-      isPartyValid = isPartyValid || isNewPokemonValid.value;
+      const isNewPokemonValid = checkStarterValidForChallenge(
+        species,
+        globalScene.gameData.getSpeciesDexAttrProps(species, this.getCurrentDexProps(species.speciesId)),
+        false,
+      );
+      isPartyValid = isPartyValid || isNewPokemonValid;
     }
 
     /**
@@ -3608,20 +4242,26 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
        * If speciesStarterDexEntry?.caughtAttr is true, this species registered in stater.
        * we change to can AddParty value to true since the user has enough cost to choose this pokemon and this pokemon registered too.
        */
-      const isValidForChallenge = new BooleanHolder(true);
-      Challenge.applyChallenges(globalScene.gameMode, Challenge.ChallengeType.STARTER_CHOICE, this.allSpecies[s], isValidForChallenge, globalScene.gameData.getSpeciesDexAttrProps(this.allSpecies[s], this.getCurrentDexProps(this.allSpecies[s].speciesId)), isPartyValid);
+      const isValidForChallenge = checkStarterValidForChallenge(
+        this.allSpecies[s],
+        globalScene.gameData.getSpeciesDexAttrProps(
+          this.allSpecies[s],
+          this.getCurrentDexProps(this.allSpecies[s].speciesId),
+        ),
+        isPartyValid,
+      );
 
-      const canBeChosen = remainValue >= speciesStarterValue && isValidForChallenge.value;
+      const canBeChosen = remainValue >= speciesStarterValue && isValidForChallenge;
 
       const isPokemonInParty = this.isInParty(this.allSpecies[s])[0]; // this will get the valud of isDupe from isInParty. This will let us see if the pokemon in question is in our party already so we don't grey out the sprites if they're invalid
 
       /* This code does a check to tell whether or not a sprite should be lit up or greyed out. There are 3 ways a pokemon's sprite should be lit up:
-        * 1) If it's in your party, it's a valid pokemon (i.e. for challenge) and you have enough points to have it
-        * 2) If it's in your party, it's not valid (i.e. for challenges), and you have enough points to have it
-        * 3) If it's not in your party, but it's a valid pokemon and you have enough points for it
-        * Any other time, the sprite should be greyed out.
-        * For example, if it's in your party, valid, but costs too much, or if it's not in your party and not valid, regardless of cost
-      */
+       * 1) If it's in your party, it's a valid pokemon (i.e. for challenge) and you have enough points to have it
+       * 2) If it's in your party, it's not valid (i.e. for challenges), and you have enough points to have it
+       * 3) If it's not in your party, but it's a valid pokemon and you have enough points for it
+       * Any other time, the sprite should be greyed out.
+       * For example, if it's in your party, valid, but costs too much, or if it's not in your party and not valid, regardless of cost
+       */
       if (canBeChosen || (isPokemonInParty && remainValue >= speciesStarterValue)) {
         speciesSprite.setAlpha(1);
       } else {
@@ -3641,29 +4281,36 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
     const ui = this.getUi();
 
     const cancel = () => {
-      ui.setMode(Mode.STARTER_SELECT);
+      ui.setMode(UiMode.STARTER_SELECT);
       this.clearText();
       this.blockInput = false;
     };
     ui.showText(i18next.t("starterSelectUiHandler:confirmExit"), null, () => {
-      ui.setModeWithoutClear(Mode.CONFIRM, () => {
-        ui.setMode(Mode.STARTER_SELECT);
-        globalScene.clearPhaseQueue();
-        if (globalScene.gameMode.isChallenge) {
-          globalScene.pushPhase(new SelectChallengePhase());
-          globalScene.pushPhase(new EncounterPhase());
-        } else {
-          globalScene.pushPhase(new TitlePhase());
-        }
-        this.clearText();
-        globalScene.getCurrentPhase()?.end();
-      }, cancel, null, null, 19);
+      ui.setModeWithoutClear(
+        UiMode.CONFIRM,
+        () => {
+          ui.setMode(UiMode.STARTER_SELECT);
+          globalScene.clearPhaseQueue();
+          if (globalScene.gameMode.isChallenge) {
+            globalScene.pushPhase(new SelectChallengePhase());
+            globalScene.pushPhase(new EncounterPhase());
+          } else {
+            globalScene.pushPhase(new TitlePhase());
+          }
+          this.clearText();
+          globalScene.getCurrentPhase()?.end();
+        },
+        cancel,
+        null,
+        null,
+        19,
+      );
     });
 
     return true;
   }
 
-  tryStart(manualTrigger: boolean = false): boolean {
+  tryStart(manualTrigger = false): boolean {
     if (!this.starterSpecies.length) {
       return false;
     }
@@ -3671,7 +4318,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
     const ui = this.getUi();
 
     const cancel = () => {
-      ui.setMode(Mode.STARTER_SELECT);
+      ui.setMode(UiMode.STARTER_SELECT);
       if (!manualTrigger) {
         this.popStarter(this.starterSpecies.length - 1);
       }
@@ -3682,47 +4329,69 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
 
     if (canStart) {
       ui.showText(i18next.t("starterSelectUiHandler:confirmStartTeam"), null, () => {
-        ui.setModeWithoutClear(Mode.CONFIRM, () => {
-          const startRun = () => {
-            globalScene.money = globalScene.gameMode.getStartingMoney();
-            ui.setMode(Mode.STARTER_SELECT);
-            const thisObj = this;
-            const originalStarterSelectCallback = this.starterSelectCallback;
-            this.starterSelectCallback = null;
-            originalStarterSelectCallback && originalStarterSelectCallback(new Array(this.starterSpecies.length).fill(0).map(function (_, i) {
-              const starterSpecies = thisObj.starterSpecies[i];
-              return {
-                species: starterSpecies,
-                dexAttr: thisObj.starterAttr[i],
-                abilityIndex: thisObj.starterAbilityIndexes[i],
-                passive: !(globalScene.gameData.starterData[starterSpecies.speciesId].passiveAttr ^ (PassiveAttr.ENABLED | PassiveAttr.UNLOCKED)),
-                nature: thisObj.starterNatures[i] as Nature,
-                moveset: thisObj.starterMovesets[i],
-                pokerus: thisObj.pokerusSpecies.includes(starterSpecies),
-                nickname: thisObj.starterPreferences[starterSpecies.speciesId]?.nickname,
-              };
-            }));
-          };
-          startRun();
-        }, cancel, null, null, 19);
+        ui.setModeWithoutClear(
+          UiMode.CONFIRM,
+          () => {
+            const startRun = () => {
+              globalScene.money = globalScene.gameMode.getStartingMoney();
+              ui.setMode(UiMode.STARTER_SELECT);
+              const thisObj = this;
+              const originalStarterSelectCallback = this.starterSelectCallback;
+              this.starterSelectCallback = null;
+              originalStarterSelectCallback?.(
+                new Array(this.starterSpecies.length).fill(0).map((_, i) => {
+                  const starterSpecies = thisObj.starterSpecies[i];
+                  return {
+                    species: starterSpecies,
+                    dexAttr: thisObj.starterAttr[i],
+                    abilityIndex: thisObj.starterAbilityIndexes[i],
+                    passive: !(
+                      globalScene.gameData.starterData[starterSpecies.speciesId].passiveAttr ^
+                      (PassiveAttr.ENABLED | PassiveAttr.UNLOCKED)
+                    ),
+                    nature: thisObj.starterNatures[i] as Nature,
+                    teraType: thisObj.starterTeras[i] as PokemonType,
+                    moveset: thisObj.starterMovesets[i],
+                    pokerus: thisObj.pokerusSpecies.includes(starterSpecies),
+                    nickname: thisObj.starterPreferences[starterSpecies.speciesId]?.nickname,
+                  };
+                }),
+              );
+            };
+            startRun();
+          },
+          cancel,
+          null,
+          null,
+          19,
+        );
       });
     } else {
       this.tutorialActive = true;
-      this.showText(i18next.t("starterSelectUiHandler:invalidParty"), undefined, () => this.showText("", 0, () => this.tutorialActive = false), undefined, true);
+      this.showText(
+        i18next.t("starterSelectUiHandler:invalidParty"),
+        undefined,
+        () => this.showText("", 0, () => (this.tutorialActive = false)),
+        undefined,
+        true,
+      );
     }
     return true;
   }
 
   /* This block checks to see if your party is valid
    * It checks each pokemon against the challenge - noting that due to monotype challenges it needs to check the pokemon while ignoring their evolutions/form change items
-  */
+   */
   isPartyValid(): boolean {
     let canStart = false;
     for (let s = 0; s < this.starterSpecies.length; s++) {
-      const isValidForChallenge = new BooleanHolder(true);
       const species = this.starterSpecies[s];
-      Challenge.applyChallenges(globalScene.gameMode, Challenge.ChallengeType.STARTER_CHOICE, species, isValidForChallenge, globalScene.gameData.getSpeciesDexAttrProps(species, this.getCurrentDexProps(species.speciesId)), false);
-      canStart = canStart || isValidForChallenge.value;
+      const isValidForChallenge = checkStarterValidForChallenge(
+        species,
+        globalScene.gameData.getSpeciesDexAttrProps(species, this.getCurrentDexProps(species.speciesId)),
+        false,
+      );
+      canStart = canStart || isValidForChallenge;
     }
     return canStart;
   }
@@ -3742,7 +4411,10 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
      *  It then checks b) if the caughtAttr for the pokemon is female and NOT male - this means that the ONLY gender we've gotten is female, and we need to add DexAttr.FEMALE to our temp props
      *  If neither of these pass, we add DexAttr.MALE to our temp props
      */
-    if (this.starterPreferences[speciesId]?.female || ((caughtAttr & DexAttr.FEMALE) > 0n && (caughtAttr & DexAttr.MALE) === 0n)) {
+    if (
+      this.starterPreferences[speciesId]?.female ||
+      ((caughtAttr & DexAttr.FEMALE) > 0n && (caughtAttr & DexAttr.MALE) === 0n)
+    ) {
       props += DexAttr.FEMALE;
     } else {
       props += DexAttr.MALE;
@@ -3750,7 +4422,10 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
     /* This part is very similar to above, but instead of for gender, it checks for shiny within starter preferences.
      * If they're not there, it enables shiny state by default if any shiny was caught
      */
-    if (this.starterPreferences[speciesId]?.shiny || ((caughtAttr & DexAttr.SHINY) > 0n && this.starterPreferences[speciesId]?.shiny !== false)) {
+    if (
+      this.starterPreferences[speciesId]?.shiny ||
+      ((caughtAttr & DexAttr.SHINY) > 0n && this.starterPreferences[speciesId]?.shiny !== false)
+    ) {
       props += DexAttr.SHINY;
       if (this.starterPreferences[speciesId]?.variant !== undefined) {
         props += BigInt(Math.pow(2, this.starterPreferences[speciesId]?.variant)) * DexAttr.DEFAULT_VARIANT;
@@ -3770,7 +4445,8 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
       props += DexAttr.NON_SHINY;
       props += DexAttr.DEFAULT_VARIANT; // we add the default variant here because non shiny versions are listed as default variant
     }
-    if (this.starterPreferences[speciesId]?.form) { // this checks for the form of the pokemon
+    if (this.starterPreferences[speciesId]?.form) {
+      // this checks for the form of the pokemon
       props += BigInt(Math.pow(2, this.starterPreferences[speciesId]?.form)) * DexAttr.DEFAULT_FORM;
     } else {
       // Get the first unlocked form
@@ -3788,12 +4464,26 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
       this.showStats();
       this.statsMode = true;
       this.pokemonSprite.setVisible(false);
+      this.teraIcon.setVisible(false);
+      this.canCycleTera = false;
+      this.updateInstructions();
     } else {
       this.statsMode = false;
       this.statsContainer.setVisible(false);
       this.pokemonSprite.setVisible(!!this.speciesStarterDexEntry?.caughtAttr);
       //@ts-ignore
       this.statsContainer.updateIvs(null); // TODO: resolve ts-ignore. !?!?
+      this.teraIcon.setVisible(globalScene.gameData.achvUnlocks.hasOwnProperty(achvs.TERASTALLIZE.id));
+      const props = globalScene.gameData.getSpeciesDexAttrProps(
+        this.lastSpecies,
+        this.getCurrentDexProps(this.lastSpecies.speciesId),
+      );
+      const formIndex = props.formIndex;
+      this.canCycleTera =
+        !this.statsMode &&
+        globalScene.gameData.achvUnlocks.hasOwnProperty(achvs.TERASTALLIZE.id) &&
+        !isNullOrUndefined(getPokemonSpeciesForm(this.lastSpecies.speciesId, formIndex ?? 0).type2);
+      this.updateInstructions();
     }
   }
 
@@ -3823,6 +4513,8 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
     this.abilityLabel.setVisible(false);
     this.natureIconElement.setVisible(false);
     this.natureLabel.setVisible(false);
+    this.teraIconElement.setVisible(false);
+    this.teraLabel.setVisible(false);
     this.goFilterIconElement.setVisible(false);
     this.goFilterLabel.setVisible(false);
   }
@@ -3830,7 +4522,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
   clear(): void {
     super.clear();
 
-    StarterPrefs.save(this.starterPreferences);
+    saveStarterPreferences(this.starterPreferences);
     this.cursor = -1;
     this.hideInstructions();
     this.activeTooltip = undefined;
@@ -3848,11 +4540,29 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
     }
   }
 
-  checkIconId(icon: Phaser.GameObjects.Sprite, species: PokemonSpecies, female: boolean, formIndex: number, shiny: boolean, variant: number) {
+  checkIconId(
+    icon: Phaser.GameObjects.Sprite,
+    species: PokemonSpecies,
+    female: boolean,
+    formIndex: number,
+    shiny: boolean,
+    variant: number,
+  ) {
     if (icon.frame.name !== species.getIconId(female, formIndex, shiny, variant)) {
-      console.log(`${species.name}'s icon ${icon.frame.name} does not match getIconId with female: ${female}, formIndex: ${formIndex}, shiny: ${shiny}, variant: ${variant}`);
+      console.log(
+        `${species.name}'s icon ${icon.frame.name} does not match getIconId with female: ${female}, formIndex: ${formIndex}, shiny: ${shiny}, variant: ${variant}`,
+      );
       icon.setTexture(species.getIconAtlasKey(formIndex, false, variant));
       icon.setFrame(species.getIconId(female, formIndex, false, variant));
     }
   }
+
+  /**
+   * Clears this UI's starter preferences.
+   *
+   * Designed to be used for unit tests that utilize this UI.
+   */
+  clearStarterPreferences() {
+    this.starterPreferences = {};
+  }
 }
diff --git a/src/ui/stats-container.ts b/src/ui/stats-container.ts
index add7eeedbb8..8cc74e64e96 100644
--- a/src/ui/stats-container.ts
+++ b/src/ui/stats-container.ts
@@ -4,14 +4,20 @@ import { PERMANENT_STATS, getStatKey } from "#app/enums/stat";
 import i18next from "i18next";
 import { globalScene } from "#app/global-scene";
 
-
 const ivChartSize = 24;
-const ivChartStatCoordMultipliers = [[ 0, -1 ], [ 0.825, -0.5 ], [ 0.825, 0.5 ], [ -0.825, -0.5 ], [ -0.825, 0.5 ], [ 0, 1 ]];
+const ivChartStatCoordMultipliers = [
+  [0, -1],
+  [0.825, -0.5],
+  [0.825, 0.5],
+  [-0.825, -0.5],
+  [-0.825, 0.5],
+  [0, 1],
+];
 const speedLabelOffset = -3;
 const sideLabelOffset = 1;
-const ivLabelOffset = [ 0, sideLabelOffset, -sideLabelOffset, sideLabelOffset, -sideLabelOffset, speedLabelOffset ];
-const ivChartLabelyOffset = [ 0, 5, 0, 5, 0, 0 ]; // doing this so attack does not overlap with (+N)
-const ivChartStatIndexes = [ 0, 1, 2, 5, 4, 3 ]; // swap special attack and speed
+const ivLabelOffset = [0, sideLabelOffset, -sideLabelOffset, sideLabelOffset, -sideLabelOffset, speedLabelOffset];
+const ivChartLabelyOffset = [0, 5, 0, 5, 0, 0]; // doing this so attack does not overlap with (+N)
+const ivChartStatIndexes = [0, 1, 2, 5, 4, 3]; // swap special attack and speed
 
 const defaultIvChartData = new Array(12).fill(null).map(() => 0);
 
@@ -31,17 +37,33 @@ export class StatsContainer extends Phaser.GameObjects.Container {
 
   setup() {
     this.setName("stats");
-    const ivChartBgData = new Array(6).fill(null).map((_, i: number) => [ ivChartSize * ivChartStatCoordMultipliers[ivChartStatIndexes[i]][0], ivChartSize * ivChartStatCoordMultipliers[ivChartStatIndexes[i]][1] ] ).flat();
+    const ivChartBgData = new Array(6)
+      .fill(null)
+      .flatMap((_, i: number) => [
+        ivChartSize * ivChartStatCoordMultipliers[ivChartStatIndexes[i]][0],
+        ivChartSize * ivChartStatCoordMultipliers[ivChartStatIndexes[i]][1],
+      ]);
     const ivChartBg = globalScene.add.polygon(48, 44, ivChartBgData, 0xd8e0f0, 0.625);
     ivChartBg.setOrigin(0, 0);
 
-    const ivChartBorder = globalScene.add.polygon(ivChartBg.x, ivChartBg.y, ivChartBgData)
-      .setStrokeStyle(1, 0x484050);
+    const ivChartBorder = globalScene.add.polygon(ivChartBg.x, ivChartBg.y, ivChartBgData).setStrokeStyle(1, 0x484050);
     ivChartBorder.setOrigin(0, 0);
 
-    const ivChartBgLines = [[ 0, -1, 0, 1 ], [ -0.825, -0.5, 0.825, 0.5 ], [ 0.825, -0.5, -0.825, 0.5 ]].map(coords => {
-      const line = new Phaser.GameObjects.Line(globalScene, ivChartBg.x, ivChartBg.y, ivChartSize * coords[0], ivChartSize * coords[1], ivChartSize * coords[2], ivChartSize * coords[3], 0xffffff)
-        .setLineWidth(0.5);
+    const ivChartBgLines = [
+      [0, -1, 0, 1],
+      [-0.825, -0.5, 0.825, 0.5],
+      [0.825, -0.5, -0.825, 0.5],
+    ].map(coords => {
+      const line = new Phaser.GameObjects.Line(
+        globalScene,
+        ivChartBg.x,
+        ivChartBg.y,
+        ivChartSize * coords[0],
+        ivChartSize * coords[1],
+        ivChartSize * coords[2],
+        ivChartSize * coords[3],
+        0xffffff,
+      ).setLineWidth(0.5);
       line.setOrigin(0, 0);
       return line;
     });
@@ -58,17 +80,24 @@ export class StatsContainer extends Phaser.GameObjects.Container {
 
     for (const s of PERMANENT_STATS) {
       const statLabel = addTextObject(
-        ivChartBg.x + (ivChartSize) * ivChartStatCoordMultipliers[s][0] * 1.325 + (this.showDiff ? 0 : ivLabelOffset[s]),
-        ivChartBg.y + (ivChartSize) * ivChartStatCoordMultipliers[s][1] * 1.325 - 4 + (this.showDiff ? 0 : ivChartLabelyOffset[s]),
+        ivChartBg.x + ivChartSize * ivChartStatCoordMultipliers[s][0] * 1.325 + (this.showDiff ? 0 : ivLabelOffset[s]),
+        ivChartBg.y +
+          ivChartSize * ivChartStatCoordMultipliers[s][1] * 1.325 -
+          4 +
+          (this.showDiff ? 0 : ivChartLabelyOffset[s]),
         i18next.t(getStatKey(s)),
-        TextStyle.TOOLTIP_CONTENT
+        TextStyle.TOOLTIP_CONTENT,
       );
       statLabel.setOrigin(0.5);
 
-      this.ivStatValueTexts[s] = addBBCodeTextObject(statLabel.x - (this.showDiff ? 0 : ivLabelOffset[s]), statLabel.y + 8, "0", TextStyle.TOOLTIP_CONTENT);
+      this.ivStatValueTexts[s] = addBBCodeTextObject(
+        statLabel.x - (this.showDiff ? 0 : ivLabelOffset[s]),
+        statLabel.y + 8,
+        "0",
+        TextStyle.TOOLTIP_CONTENT,
+      );
       this.ivStatValueTexts[s].setOrigin(0.5);
 
-
       this.add(statLabel);
       this.add(this.ivStatValueTexts[s]);
     }
@@ -76,7 +105,12 @@ export class StatsContainer extends Phaser.GameObjects.Container {
 
   updateIvs(ivs: number[], originalIvs?: number[]): void {
     if (ivs) {
-      const ivChartData = new Array(6).fill(null).map((_, i) => [ (ivs[ivChartStatIndexes[i]] / 31) * ivChartSize * ivChartStatCoordMultipliers[ivChartStatIndexes[i]][0], (ivs[ivChartStatIndexes[i]] / 31) * ivChartSize * ivChartStatCoordMultipliers[ivChartStatIndexes[i]][1] ] ).flat();
+      const ivChartData = new Array(6)
+        .fill(null)
+        .flatMap((_, i) => [
+          (ivs[ivChartStatIndexes[i]] / 31) * ivChartSize * ivChartStatCoordMultipliers[ivChartStatIndexes[i]][0],
+          (ivs[ivChartStatIndexes[i]] / 31) * ivChartSize * ivChartStatCoordMultipliers[ivChartStatIndexes[i]][1],
+        ]);
       const lastIvChartData = this.statsIvsCache || defaultIvChartData;
       const perfectIVColor: string = getTextColor(TextStyle.SUMMARY_GOLD, false, globalScene.uiTheme);
       this.statsIvsCache = ivChartData.slice(0);
@@ -100,12 +134,12 @@ export class StatsContainer extends Phaser.GameObjects.Container {
         t.setText(`[shadow]${label}[/shadow]`);
       });
 
-      const newColor = ivs.every(iv => iv === 31) ? parseInt(perfectIVColor.substr(1), 16) : 0x98d8a0;
+      const newColor = ivs.every(iv => iv === 31) ? Number.parseInt(perfectIVColor.substr(1), 16) : 0x98d8a0;
       const oldColor = this.ivChart.fillColor;
-      const interpolateColor = oldColor !== newColor ? [
-        Phaser.Display.Color.IntegerToColor(oldColor),
-        Phaser.Display.Color.IntegerToColor(newColor)
-      ] : null;
+      const interpolateColor =
+        oldColor !== newColor
+          ? [Phaser.Display.Color.IntegerToColor(oldColor), Phaser.Display.Color.IntegerToColor(newColor)]
+          : null;
 
       globalScene.tweens.addCounter({
         from: 0,
@@ -114,16 +148,19 @@ export class StatsContainer extends Phaser.GameObjects.Container {
         ease: "Cubic.easeOut",
         onUpdate: (tween: Phaser.Tweens.Tween) => {
           const progress = tween.getValue();
-          const interpolatedData = ivChartData.map((v: number, i: number) => v * progress + (lastIvChartData[i] * (1 - progress)));
+          const interpolatedData = ivChartData.map(
+            (v: number, i: number) => v * progress + lastIvChartData[i] * (1 - progress),
+          );
           if (interpolateColor) {
             this.ivChart.setFillStyle(
               Phaser.Display.Color.ValueToColor(
-                Phaser.Display.Color.Interpolate.ColorWithColor(interpolateColor[0], interpolateColor[1], 1, progress)
+                Phaser.Display.Color.Interpolate.ColorWithColor(interpolateColor[0], interpolateColor[1], 1, progress),
               ).color,
-              0.75);
+              0.75,
+            );
           }
           this.ivChart.setTo(interpolatedData);
-        }
+        },
       });
     } else {
       this.statsIvsCache = defaultIvChartData;
diff --git a/src/ui/summary-ui-handler.ts b/src/ui/summary-ui-handler.ts
index 3305b3f7aa2..f93a1826b3e 100644
--- a/src/ui/summary-ui-handler.ts
+++ b/src/ui/summary-ui-handler.ts
@@ -1,16 +1,25 @@
-import { starterColors } from "#app/battle-scene";
+import { starterColors } from "#app/global-vars/starter-colors";
 import { globalScene } from "#app/global-scene";
-import { Mode } from "#app/ui/ui";
+import { UiMode } from "#enums/ui-mode";
 import UiHandler from "#app/ui/ui-handler";
-import * as Utils from "#app/utils";
+import {
+  getLocalizedSpriteKey,
+  rgbHexToRgba,
+  padInt,
+  getEnumValues,
+  fixedInt,
+  isNullOrUndefined,
+  toReadableString,
+  formatStat,
+} from "#app/utils/common";
 import type { PlayerPokemon, PokemonMove } from "#app/field/pokemon";
 import { getStarterValueFriendshipCap, speciesStarterCosts } from "#app/data/balance/starters";
 import { argbFromRgba } from "@material/material-color-utilities";
 import { getTypeRgb } from "#app/data/type";
-import { Type } from "#enums/type";
+import { PokemonType } from "#enums/pokemon-type";
 import { TextStyle, addBBCodeTextObject, addTextObject, getBBCodeFrag } from "#app/ui/text";
-import type Move from "#app/data/move";
-import { MoveCategory } from "#app/data/move";
+import type Move from "#app/data/moves/move";
+import { MoveCategory } from "#enums/MoveCategory";
 import { getPokeballAtlasKey } from "#app/data/pokeball";
 import { getGenderColor, getGenderSymbol } from "#app/data/gender";
 import { getLevelRelExp, getLevelTotalExp } from "#app/data/exp";
@@ -19,37 +28,38 @@ import { StatusEffect } from "#enums/status-effect";
 import { getBiomeName } from "#app/data/balance/biomes";
 import { getNatureName, getNatureStatMultiplier } from "#app/data/nature";
 import { loggedInUser } from "#app/account";
-import type { Variant } from "#app/data/variant";
-import { getVariantTint } from "#app/data/variant";
+import type { Variant } from "#app/sprites/variant";
+import { getVariantTint } from "#app/sprites/variant";
 import { Button } from "#enums/buttons";
-import type { Ability } from "#app/data/ability";
+import type { Ability } from "#app/data/abilities/ability-class";
 import i18next from "i18next";
 import { modifierSortFunc } from "#app/modifier/modifier";
 import { PlayerGender } from "#enums/player-gender";
 import { Stat, PERMANENT_STATS, getStatKey } from "#enums/stat";
 import { Nature } from "#enums/nature";
+import { achvs } from "#app/system/achv";
 
 enum Page {
   PROFILE,
   STATS,
-  MOVES
+  MOVES,
 }
 
 export enum SummaryUiMode {
   DEFAULT,
-  LEARN_MOVE
+  LEARN_MOVE,
 }
 
 /** Holds all objects related to an ability for each iteration */
 interface abilityContainer {
   /** An image displaying the summary label */
-  labelImage: Phaser.GameObjects.Image,
+  labelImage: Phaser.GameObjects.Image;
   /** The ability object */
-  ability: Ability | null,
+  ability: Ability | null;
   /** The text object displaying the name of the ability */
-  nameText: Phaser.GameObjects.Text | null,
+  nameText: Phaser.GameObjects.Text | null;
   /** The text object displaying the description of the ability */
-  descriptionText: Phaser.GameObjects.Text | null,
+  descriptionText: Phaser.GameObjects.Text | null;
 }
 
 export default class SummaryUiHandler extends UiHandler {
@@ -96,6 +106,9 @@ export default class SummaryUiHandler extends UiHandler {
   private friendshipText: Phaser.GameObjects.Text;
   private friendshipIcon: Phaser.GameObjects.Sprite;
   private friendshipOverlay: Phaser.GameObjects.Sprite;
+  private permStatsContainer: Phaser.GameObjects.Container;
+  private ivContainer: Phaser.GameObjects.Container;
+  private statsContainer: Phaser.GameObjects.Container;
 
   private descriptionScrollTween: Phaser.Tweens.Tween | null;
   private moveCursorBlinkTimer: Phaser.Time.TimerEvent | null;
@@ -115,7 +128,7 @@ export default class SummaryUiHandler extends UiHandler {
   private selectCallback: Function | null;
 
   constructor() {
-    super(Mode.SUMMARY);
+    super(UiMode.SUMMARY);
   }
 
   setup() {
@@ -129,7 +142,7 @@ export default class SummaryUiHandler extends UiHandler {
     summaryBg.setOrigin(0, 1);
     this.summaryContainer.add(summaryBg);
 
-    this.tabSprite = globalScene.add.sprite(134, (-summaryBg.displayHeight) + 16, "summary_tabs_1");
+    this.tabSprite = globalScene.add.sprite(134, -summaryBg.displayHeight + 16, "summary_tabs_1");
     this.tabSprite.setOrigin(1, 1);
     this.summaryContainer.add(this.tabSprite);
 
@@ -146,7 +159,12 @@ export default class SummaryUiHandler extends UiHandler {
     this.numberText.setOrigin(0, 1);
     this.summaryContainer.add(this.numberText);
 
-    this.pokemonSprite = globalScene.initPokemonSprite(globalScene.add.sprite(56, -106, "pkmn__sub"), undefined, false, true);
+    this.pokemonSprite = globalScene.initPokemonSprite(
+      globalScene.add.sprite(56, -106, "pkmn__sub"),
+      undefined,
+      false,
+      true,
+    );
     this.summaryContainer.add(this.pokemonSprite);
 
     this.nameText = addTextObject(6, -54, "", TextStyle.SUMMARY);
@@ -187,12 +205,14 @@ export default class SummaryUiHandler extends UiHandler {
 
     this.candyShadow = globalScene.add.sprite(13, -140, "candy");
     this.candyShadow.setTint(0x000000);
-    this.candyShadow.setAlpha(0.50);
+    this.candyShadow.setAlpha(0.5);
     this.candyShadow.setScale(0.8);
     this.candyShadow.setInteractive(new Phaser.Geom.Rectangle(0, 0, 30, 16), Phaser.Geom.Rectangle.Contains);
     this.summaryContainer.add(this.candyShadow);
 
-    this.candyCountText = addTextObject(20, -146, "x0", TextStyle.WINDOW_ALT, { fontSize: "76px" });
+    this.candyCountText = addTextObject(20, -146, "x0", TextStyle.WINDOW_ALT, {
+      fontSize: "76px",
+    });
     this.candyCountText.setOrigin(0, 0);
     this.summaryContainer.add(this.candyCountText);
 
@@ -206,12 +226,14 @@ export default class SummaryUiHandler extends UiHandler {
 
     this.friendshipShadow = globalScene.add.sprite(13, -60, "friendship");
     this.friendshipShadow.setTint(0x000000);
-    this.friendshipShadow.setAlpha(0.50);
+    this.friendshipShadow.setAlpha(0.5);
     this.friendshipShadow.setScale(0.8);
     this.friendshipShadow.setInteractive(new Phaser.Geom.Rectangle(0, 0, 50, 16), Phaser.Geom.Rectangle.Contains);
     this.summaryContainer.add(this.friendshipShadow);
 
-    this.friendshipText = addTextObject(20, -66, "x0", TextStyle.WINDOW_ALT, { fontSize: "76px" });
+    this.friendshipText = addTextObject(20, -66, "x0", TextStyle.WINDOW_ALT, {
+      fontSize: "76px",
+    });
     this.friendshipText.setOrigin(0, 0);
     this.summaryContainer.add(this.friendshipText);
 
@@ -222,7 +244,7 @@ export default class SummaryUiHandler extends UiHandler {
     this.summaryContainer.add(this.championRibbon);
     this.championRibbon.setVisible(false);
 
-    this.levelText = addTextObject(36, -17, "", TextStyle.SUMMARY_ALT);
+    this.levelText = addTextObject(24, -17, "", TextStyle.SUMMARY_ALT);
     this.levelText.setOrigin(0, 1);
     this.summaryContainer.add(this.levelText);
 
@@ -242,7 +264,7 @@ export default class SummaryUiHandler extends UiHandler {
 
     this.statusContainer.add(statusLabel);
 
-    this.status = globalScene.add.sprite(91, 4, Utils.getLocalizedSpriteKey("statuses"));
+    this.status = globalScene.add.sprite(91, 4, getLocalizedSpriteKey("statuses"));
     this.status.setOrigin(0.5, 0);
 
     this.statusContainer.add(this.status);
@@ -300,14 +322,14 @@ export default class SummaryUiHandler extends UiHandler {
     super.show(args);
 
     /* args[] information
-    * args[0] : the Pokemon displayed in the Summary-UI
-    * args[1] : the summaryUiMode (defaults to 0)
-    * args[2] : the start page (defaults to Page.PROFILE)
-    * args[3] : contains the function executed when the user exits out of Summary UI
-    * args[4] : optional boolean used to determine if the Pokemon is part of the player's party or not (defaults to true, necessary for PR #2921 to display all relevant information)
-    */
+     * args[0] : the Pokemon displayed in the Summary-UI
+     * args[1] : the summaryUiMode (defaults to 0)
+     * args[2] : the start page (defaults to Page.PROFILE)
+     * args[3] : contains the function executed when the user exits out of Summary UI
+     * args[4] : optional boolean used to determine if the Pokemon is part of the player's party or not (defaults to true, necessary for PR #2921 to display all relevant information)
+     */
     this.pokemon = args[0] as PlayerPokemon;
-    this.summaryUiMode = args.length > 1 ? args[1] as SummaryUiMode : SummaryUiMode.DEFAULT;
+    this.summaryUiMode = args.length > 1 ? (args[1] as SummaryUiMode) : SummaryUiMode.DEFAULT;
     this.playerParty = args[4] ?? true;
     globalScene.ui.bringToTop(this.summaryContainer);
 
@@ -317,13 +339,14 @@ export default class SummaryUiHandler extends UiHandler {
     this.shinyOverlay.setVisible(this.pokemon.isShiny());
 
     const colorScheme = starterColors[this.pokemon.species.getRootSpeciesId()];
-    this.candyIcon.setTint(argbFromRgba(Utils.rgbHexToRgba(colorScheme[0])));
-    this.candyOverlay.setTint(argbFromRgba(Utils.rgbHexToRgba(colorScheme[1])));
+    this.candyIcon.setTint(argbFromRgba(rgbHexToRgba(colorScheme[0])));
+    this.candyOverlay.setTint(argbFromRgba(rgbHexToRgba(colorScheme[1])));
 
-
-    this.numberText.setText(Utils.padInt(this.pokemon.species.speciesId, 4));
+    this.numberText.setText(padInt(this.pokemon.species.speciesId, 4));
     this.numberText.setColor(this.getTextColor(!this.pokemon.isShiny() ? TextStyle.SUMMARY : TextStyle.SUMMARY_GOLD));
-    this.numberText.setShadowColor(this.getTextColor(!this.pokemon.isShiny() ? TextStyle.SUMMARY : TextStyle.SUMMARY_GOLD, true));
+    this.numberText.setShadowColor(
+      this.getTextColor(!this.pokemon.isShiny() ? TextStyle.SUMMARY : TextStyle.SUMMARY_GOLD, true),
+    );
     const spriteKey = this.pokemon.getSpriteKey(true);
     try {
       this.pokemonSprite.play(spriteKey);
@@ -331,31 +354,47 @@ export default class SummaryUiHandler extends UiHandler {
       console.error(`Failed to play animation for ${spriteKey}`, err);
     }
     this.pokemonSprite.setPipelineData("teraColor", getTypeRgb(this.pokemon.getTeraType()));
+    this.pokemonSprite.setPipelineData("isTerastallized", this.pokemon.isTerastallized);
     this.pokemonSprite.setPipelineData("ignoreTimeTint", true);
     this.pokemonSprite.setPipelineData("spriteKey", this.pokemon.getSpriteKey());
-    this.pokemonSprite.setPipelineData("shiny", this.pokemon.shiny);
-    this.pokemonSprite.setPipelineData("variant", this.pokemon.variant);
-    [ "spriteColors", "fusionSpriteColors" ].map(k => {
+    this.pokemonSprite.setPipelineData(
+      "shiny",
+      this.pokemon.summonData.illusion?.basePokemon.shiny ?? this.pokemon.shiny,
+    );
+    this.pokemonSprite.setPipelineData(
+      "variant",
+      this.pokemon.summonData.illusion?.basePokemon.variant ?? this.pokemon.variant,
+    );
+    ["spriteColors", "fusionSpriteColors"].map(k => {
       delete this.pokemonSprite.pipelineData[`${k}Base`];
-      if (this.pokemon?.summonData?.speciesForm) {
+      if (this.pokemon?.summonData.speciesForm) {
         k += "Base";
       }
       this.pokemonSprite.pipelineData[k] = this.pokemon?.getSprite().pipelineData[k];
     });
     this.pokemon.cry();
 
-    this.nameText.setText(this.pokemon.getNameToRender());
+    this.nameText.setText(this.pokemon.getNameToRender(false));
 
     const isFusion = this.pokemon.isFusion();
 
     this.splicedIcon.setPositionRelative(this.nameText, this.nameText.displayWidth + 2, 3);
     this.splicedIcon.setVisible(isFusion);
     if (this.splicedIcon.visible) {
-      this.splicedIcon.on("pointerover", () => globalScene.ui.showTooltip("", `${this.pokemon?.species.getName(this.pokemon.formIndex)}/${this.pokemon?.fusionSpecies?.getName(this.pokemon?.fusionFormIndex)}`, true));
+      this.splicedIcon.on("pointerover", () =>
+        globalScene.ui.showTooltip(
+          "",
+          `${this.pokemon?.species.getName(this.pokemon.formIndex)}/${this.pokemon?.fusionSpecies?.getName(this.pokemon?.fusionFormIndex)}`,
+          true,
+        ),
+      );
       this.splicedIcon.on("pointerout", () => globalScene.ui.hideTooltip());
     }
 
-    if (globalScene.gameData.starterData[this.pokemon.species.getRootSpeciesId()].classicWinCount > 0 && globalScene.gameData.starterData[this.pokemon.species.getRootSpeciesId(true)].classicWinCount > 0) {
+    if (
+      globalScene.gameData.starterData[this.pokemon.species.getRootSpeciesId()].classicWinCount > 0 &&
+      globalScene.gameData.starterData[this.pokemon.species.getRootSpeciesId(true)].classicWinCount > 0
+    ) {
       this.championRibbon.setVisible(true);
     } else {
       this.championRibbon.setVisible(false);
@@ -367,62 +406,82 @@ export default class SummaryUiHandler extends UiHandler {
     }
 
     const friendshipCap = getStarterValueFriendshipCap(speciesStarterCosts[this.pokemon.species.getRootSpeciesId()]);
-    const candyCropY = 16 - (16 * (currentFriendship / friendshipCap));
+    const candyCropY = 16 - 16 * (currentFriendship / friendshipCap);
 
     if (this.candyShadow.visible) {
-      this.candyShadow.on("pointerover", () => globalScene.ui.showTooltip("", `${currentFriendship}/${friendshipCap}`, true));
+      this.candyShadow.on("pointerover", () =>
+        globalScene.ui.showTooltip("", `${currentFriendship}/${friendshipCap}`, true),
+      );
       this.candyShadow.on("pointerout", () => globalScene.ui.hideTooltip());
     }
 
-    this.candyCountText.setText(`x${globalScene.gameData.starterData[this.pokemon.species.getRootSpeciesId()].candyCount}`);
+    this.candyCountText.setText(
+      `x${globalScene.gameData.starterData[this.pokemon.species.getRootSpeciesId()].candyCount}`,
+    );
 
     this.candyShadow.setCrop(0, 0, 16, candyCropY);
 
     if (this.friendshipShadow.visible) {
-      this.friendshipShadow.on("pointerover", () => globalScene.ui.showTooltip("", `${i18next.t("pokemonSummary:friendship")}`, true));
+      this.friendshipShadow.on("pointerover", () =>
+        globalScene.ui.showTooltip("", `${i18next.t("pokemonSummary:friendship")}`, true),
+      );
       this.friendshipShadow.on("pointerout", () => globalScene.ui.hideTooltip());
     }
 
     this.friendshipText.setText(`${this.pokemon?.friendship || "0"} / 255`);
 
-    this.friendshipShadow.setCrop(0, 0, 16, 16 - (16 * ((this.pokemon?.friendship || 0) / 255)));
+    this.friendshipShadow.setCrop(0, 0, 16, 16 - 16 * ((this.pokemon?.friendship || 0) / 255));
 
-    const doubleShiny = isFusion && this.pokemon.shiny && this.pokemon.fusionShiny;
-    const baseVariant = !doubleShiny ? this.pokemon.getVariant() : this.pokemon.variant;
+    const doubleShiny = this.pokemon.isDoubleShiny(false);
+    const baseVariant = this.pokemon.getBaseVariant(doubleShiny);
 
-    this.shinyIcon.setPositionRelative(this.nameText, this.nameText.displayWidth + (this.splicedIcon.visible ? this.splicedIcon.displayWidth + 1 : 0) + 1, 3);
+    this.shinyIcon.setPositionRelative(
+      this.nameText,
+      this.nameText.displayWidth + (this.splicedIcon.visible ? this.splicedIcon.displayWidth + 1 : 0) + 1,
+      3,
+    );
     this.shinyIcon.setTexture(`shiny_star${doubleShiny ? "_1" : ""}`);
-    this.shinyIcon.setVisible(this.pokemon.isShiny());
+    this.shinyIcon.setVisible(this.pokemon.isShiny(false));
     this.shinyIcon.setTint(getVariantTint(baseVariant));
     if (this.shinyIcon.visible) {
-      const shinyDescriptor = doubleShiny || baseVariant ?
-        `${baseVariant === 2 ? i18next.t("common:epicShiny") : baseVariant === 1 ? i18next.t("common:rareShiny") : i18next.t("common:commonShiny")}${doubleShiny ? `/${this.pokemon.fusionVariant === 2 ? i18next.t("common:epicShiny") : this.pokemon.fusionVariant === 1 ? i18next.t("common:rareShiny") : i18next.t("common:commonShiny")}` : ""}`
-        : "";
-      this.shinyIcon.on("pointerover", () => globalScene.ui.showTooltip("", `${i18next.t("common:shinyOnHover")}${shinyDescriptor ? ` (${shinyDescriptor})` : ""}`, true));
+      const shinyDescriptor =
+        doubleShiny || baseVariant
+          ? `${baseVariant === 2 ? i18next.t("common:epicShiny") : baseVariant === 1 ? i18next.t("common:rareShiny") : i18next.t("common:commonShiny")}${doubleShiny ? `/${this.pokemon.fusionVariant === 2 ? i18next.t("common:epicShiny") : this.pokemon.fusionVariant === 1 ? i18next.t("common:rareShiny") : i18next.t("common:commonShiny")}` : ""}`
+          : "";
+      this.shinyIcon.on("pointerover", () =>
+        globalScene.ui.showTooltip(
+          "",
+          `${i18next.t("common:shinyOnHover")}${shinyDescriptor ? ` (${shinyDescriptor})` : ""}`,
+          true,
+        ),
+      );
       this.shinyIcon.on("pointerout", () => globalScene.ui.hideTooltip());
     }
 
     this.fusionShinyIcon.setPosition(this.shinyIcon.x, this.shinyIcon.y);
     this.fusionShinyIcon.setVisible(doubleShiny);
     if (isFusion) {
-      this.fusionShinyIcon.setTint(getVariantTint(this.pokemon.fusionVariant));
+      this.fusionShinyIcon.setTint(
+        getVariantTint(this.pokemon.summonData.illusion?.basePokemon.fusionVariant ?? this.pokemon.fusionVariant),
+      );
     }
 
     this.pokeball.setFrame(getPokeballAtlasKey(this.pokemon.pokeball));
-    this.levelText.setText(this.pokemon.level.toString());
+    this.levelText.setText(`${i18next.t("pokemonSummary:lv")}${this.pokemon.level.toString()}`);
     this.genderText.setText(getGenderSymbol(this.pokemon.getGender(true)));
     this.genderText.setColor(getGenderColor(this.pokemon.getGender(true)));
     this.genderText.setShadowColor(getGenderColor(this.pokemon.getGender(true), true));
 
     switch (this.summaryUiMode) {
-      case SummaryUiMode.DEFAULT:
-        const page = args.length < 2 ? Page.PROFILE : args[2] as Page;
+      case SummaryUiMode.DEFAULT: {
+        const page = args.length < 2 ? Page.PROFILE : (args[2] as Page);
         this.hideMoveEffect(true);
         this.setCursor(page);
         if (args.length > 3) {
           this.selectCallback = args[3];
         }
         break;
+      }
       case SummaryUiMode.LEARN_MOVE:
         this.newMove = args[2] as Move;
         this.moveSelectFunction = args[3] as Function;
@@ -451,7 +510,7 @@ export default class SummaryUiHandler extends UiHandler {
     }
 
     const ui = this.getUi();
-    const fromPartyMode = ui.handlers[Mode.PARTY].active;
+    const fromPartyMode = ui.handlers[UiMode.PARTY].active;
     let success = false;
     let error = false;
 
@@ -459,7 +518,7 @@ export default class SummaryUiHandler extends UiHandler {
       if (button === Button.ACTION) {
         if (this.pokemon && this.moveCursor < this.pokemon.moveset.length) {
           if (this.summaryUiMode === SummaryUiMode.LEARN_MOVE) {
-            this.moveSelectFunction && this.moveSelectFunction(this.moveCursor);
+            this.moveSelectFunction?.(this.moveCursor);
           } else {
             if (this.selectedMoveIndex === -1) {
               this.selectedMoveIndex = this.moveCursor;
@@ -470,7 +529,9 @@ export default class SummaryUiHandler extends UiHandler {
                 this.pokemon.moveset[this.selectedMoveIndex] = this.pokemon.moveset[this.moveCursor];
                 this.pokemon.moveset[this.moveCursor] = tempMove;
 
-                const selectedMoveRow = this.moveRowsContainer.getAt(this.selectedMoveIndex) as Phaser.GameObjects.Container;
+                const selectedMoveRow = this.moveRowsContainer.getAt(
+                  this.selectedMoveIndex,
+                ) as Phaser.GameObjects.Container;
                 const switchMoveRow = this.moveRowsContainer.getAt(this.moveCursor) as Phaser.GameObjects.Container;
 
                 this.moveRowsContainer.moveTo(selectedMoveRow, this.moveCursor);
@@ -512,11 +573,10 @@ export default class SummaryUiHandler extends UiHandler {
               this.destroyBlinkCursor();
               success = true;
               break;
-            } else {
-              this.hideMoveSelect();
-              success = true;
-              break;
             }
+            this.hideMoveSelect();
+            success = true;
+            break;
         }
       }
     } else {
@@ -534,6 +594,10 @@ export default class SummaryUiHandler extends UiHandler {
           this.passiveContainer.nameText?.setVisible(!this.passiveContainer.descriptionText?.visible);
           this.passiveContainer.descriptionText?.setVisible(!this.passiveContainer.descriptionText.visible);
           this.passiveContainer.labelImage.setVisible(!this.passiveContainer.labelImage.visible);
+        } else if (this.cursor === Page.STATS) {
+          //Show IVs
+          this.permStatsContainer.setVisible(!this.permStatsContainer.visible);
+          this.ivContainer.setVisible(!this.ivContainer.visible);
         }
       } else if (button === Button.CANCEL) {
         if (this.summaryUiMode === SummaryUiMode.LEARN_MOVE) {
@@ -546,20 +610,21 @@ export default class SummaryUiHandler extends UiHandler {
           }
 
           if (!fromPartyMode) {
-            ui.setMode(Mode.MESSAGE);
+            ui.setMode(UiMode.MESSAGE);
           } else {
-            ui.setMode(Mode.PARTY);
+            ui.setMode(UiMode.PARTY);
           }
         }
         success = true;
       } else {
-        const pages = Utils.getEnumValues(Page);
+        const pages = getEnumValues(Page);
         switch (button) {
           case Button.UP:
-          case Button.DOWN:
+          case Button.DOWN: {
             if (this.summaryUiMode === SummaryUiMode.LEARN_MOVE) {
               break;
-            } else if (!fromPartyMode) {
+            }
+            if (!fromPartyMode) {
               break;
             }
             const isDown = button === Button.DOWN;
@@ -568,9 +633,10 @@ export default class SummaryUiHandler extends UiHandler {
             if ((isDown && partyMemberIndex < party.length - 1) || (!isDown && partyMemberIndex)) {
               const page = this.cursor;
               this.clear();
-              this.show([ party[partyMemberIndex + (isDown ? 1 : -1)], this.summaryUiMode, page ]);
+              this.show([party[partyMemberIndex + (isDown ? 1 : -1)], this.summaryUiMode, page]);
             }
             break;
+          }
           case Button.LEFT:
             if (this.cursor) {
               success = this.setCursor(this.cursor - 1);
@@ -597,7 +663,7 @@ export default class SummaryUiHandler extends UiHandler {
     return success || error;
   }
 
-  setCursor(cursor: number, overrideChanged: boolean = false): boolean {
+  setCursor(cursor: number, overrideChanged = false): boolean {
     let changed: boolean = overrideChanged || this.moveCursor !== cursor;
 
     if (this.moveSelect) {
@@ -626,11 +692,11 @@ export default class SummaryUiHandler extends UiHandler {
       if (moveDescriptionLineCount > 3) {
         this.descriptionScrollTween = globalScene.tweens.add({
           targets: this.moveDescriptionText,
-          delay: Utils.fixedInt(2000),
+          delay: fixedInt(2000),
           loop: -1,
-          hold: Utils.fixedInt(2000),
-          duration: Utils.fixedInt((moveDescriptionLineCount - 3) * 2000),
-          y: `-=${14.83 * (moveDescriptionLineCount - 3)}`
+          hold: fixedInt(2000),
+          duration: fixedInt((moveDescriptionLineCount - 3) * 2000),
+          y: `-=${14.83 * (moveDescriptionLineCount - 3)}`,
         });
       }
 
@@ -648,16 +714,16 @@ export default class SummaryUiHandler extends UiHandler {
       this.moveCursorObj.setVisible(true);
       this.moveCursorBlinkTimer = globalScene.time.addEvent({
         loop: true,
-        delay: Utils.fixedInt(600),
+        delay: fixedInt(600),
         callback: () => {
           this.moveCursorObj?.setVisible(false);
-          globalScene.time.delayedCall(Utils.fixedInt(100), () => {
+          globalScene.time.delayedCall(fixedInt(100), () => {
             if (!this.moveCursorObj) {
               return;
             }
             this.moveCursorObj.setVisible(true);
           });
-        }
+        },
       });
       if (this.selectedMoveIndex > -1) {
         if (!this.selectedMoveCursorObj) {
@@ -704,7 +770,7 @@ export default class SummaryUiHandler extends UiHandler {
               }
               this.summaryPageTransitionContainer.setVisible(false);
               this.transitioning = false;
-            }
+            },
           });
           this.summaryPageTransitionContainer.setVisible(true);
         } else {
@@ -730,7 +796,7 @@ export default class SummaryUiHandler extends UiHandler {
       });
       pageContainer.removeBetween(1, undefined, true);
     }
-    const pageBg =  (pageContainer.getAt(0) as Phaser.GameObjects.Sprite);
+    const pageBg = pageContainer.getAt(0) as Phaser.GameObjects.Sprite;
     pageBg.setTexture(this.getPageKey(page));
 
     if (this.descriptionScrollTween) {
@@ -739,16 +805,26 @@ export default class SummaryUiHandler extends UiHandler {
     }
 
     switch (page) {
-      case Page.PROFILE:
+      case Page.PROFILE: {
         const profileContainer = globalScene.add.container(0, -pageBg.height);
         pageContainer.add(profileContainer);
 
         // TODO: should add field for original trainer name to Pokemon object, to support gift/traded Pokemon from MEs
-        const trainerText = addBBCodeTextObject(7, 12, `${i18next.t("pokemonSummary:ot")}/${getBBCodeFrag(loggedInUser?.username || i18next.t("pokemonSummary:unknown"), globalScene.gameData.gender === PlayerGender.FEMALE ? TextStyle.SUMMARY_PINK : TextStyle.SUMMARY_BLUE)}`, TextStyle.SUMMARY_ALT);
+        const trainerText = addBBCodeTextObject(
+          7,
+          12,
+          `${i18next.t("pokemonSummary:ot")}/${getBBCodeFrag(loggedInUser?.username || i18next.t("pokemonSummary:unknown"), globalScene.gameData.gender === PlayerGender.FEMALE ? TextStyle.SUMMARY_PINK : TextStyle.SUMMARY_BLUE)}`,
+          TextStyle.SUMMARY_ALT,
+        );
         trainerText.setOrigin(0, 0);
         profileContainer.add(trainerText);
 
-        const trainerIdText = addTextObject(174, 12, globalScene.gameData.trainerId.toString(), TextStyle.SUMMARY_ALT);
+        const trainerIdText = addTextObject(
+          141,
+          12,
+          `${i18next.t("pokemonSummary:idNo")}${globalScene.gameData.trainerId.toString()}`,
+          TextStyle.SUMMARY_ALT,
+        );
         trainerIdText.setOrigin(0, 0);
         profileContainer.add(trainerIdText);
 
@@ -756,10 +832,10 @@ export default class SummaryUiHandler extends UiHandler {
         typeLabel.setOrigin(0, 0);
         profileContainer.add(typeLabel);
 
-        const getTypeIcon = (index: number, type: Type, tera: boolean = false) => {
+        const getTypeIcon = (index: number, type: PokemonType, tera = false) => {
           const xCoord = typeLabel.width * typeLabel.scale + 9 + 34 * index;
           const typeIcon = !tera
-            ? globalScene.add.sprite(xCoord, 42, Utils.getLocalizedSpriteKey("types"), Type[type].toLowerCase())
+            ? globalScene.add.sprite(xCoord, 42, getLocalizedSpriteKey("types"), PokemonType[type].toLowerCase())
             : globalScene.add.sprite(xCoord, 42, "type_tera");
           if (tera) {
             typeIcon.setScale(0.5);
@@ -770,44 +846,62 @@ export default class SummaryUiHandler extends UiHandler {
           return typeIcon;
         };
 
-        const types = this.pokemon?.getTypes(false, false, true)!; // TODO: is this bang correct?
+        const types = this.pokemon?.getTypes(false, false, true, false)!; // TODO: is this bang correct?
         profileContainer.add(getTypeIcon(0, types[0]));
         if (types.length > 1) {
           profileContainer.add(getTypeIcon(1, types[1]));
         }
-        if (this.pokemon?.isTerastallized()) {
-          profileContainer.add(getTypeIcon(types.length, this.pokemon.getTeraType(), true));
-        }
 
         if (this.pokemon?.getLuck()) {
           const luckLabelText = addTextObject(141, 28, i18next.t("common:luckIndicator"), TextStyle.SUMMARY_ALT);
           luckLabelText.setOrigin(0, 0);
           profileContainer.add(luckLabelText);
 
-          const luckText = addTextObject(141 + luckLabelText.displayWidth + 2, 28, this.pokemon.getLuck().toString(), TextStyle.SUMMARY);
+          const luckText = addTextObject(
+            141 + luckLabelText.displayWidth + 2,
+            28,
+            this.pokemon.getLuck().toString(),
+            TextStyle.SUMMARY,
+          );
           luckText.setOrigin(0, 0);
-          luckText.setTint(getVariantTint((Math.min(this.pokemon.getLuck() - 1, 2)) as Variant));
+          luckText.setTint(getVariantTint(Math.min(this.pokemon.getLuck() - 1, 2) as Variant));
           profileContainer.add(luckText);
         }
 
+        if (
+          globalScene.gameData.achvUnlocks.hasOwnProperty(achvs.TERASTALLIZE.id) &&
+          !isNullOrUndefined(this.pokemon)
+        ) {
+          const teraIcon = globalScene.add.sprite(123, 26, "button_tera");
+          teraIcon.setName("terrastallize-icon");
+          teraIcon.setFrame(PokemonType[this.pokemon.getTeraType()].toLowerCase());
+          profileContainer.add(teraIcon);
+        }
+
         this.abilityContainer = {
           labelImage: globalScene.add.image(0, 0, "summary_profile_ability"),
           ability: this.pokemon?.getAbility(true)!, // TODO: is this bang correct?
           nameText: null,
-          descriptionText: null };
+          descriptionText: null,
+        };
 
-        const allAbilityInfo = [ this.abilityContainer ]; // Creates an array to iterate through
+        const allAbilityInfo = [this.abilityContainer]; // Creates an array to iterate through
         // Only add to the array and set up displaying a passive if it's unlocked
         if (this.pokemon?.hasPassive()) {
           this.passiveContainer = {
             labelImage: globalScene.add.image(0, 0, "summary_profile_passive"),
             ability: this.pokemon.getPassiveAbility(),
             nameText: null,
-            descriptionText: null };
+            descriptionText: null,
+          };
           allAbilityInfo.push(this.passiveContainer);
 
           // Sets up the pixel button prompt image
-          this.abilityPrompt = globalScene.add.image(0, 0, !globalScene.inputController?.gamepadSupport ? "summary_profile_prompt_z" : "summary_profile_prompt_a");
+          this.abilityPrompt = globalScene.add.image(
+            0,
+            0,
+            !globalScene.inputController?.gamepadSupport ? "summary_profile_prompt_z" : "summary_profile_prompt_a",
+          );
           this.abilityPrompt.setPosition(8, 43);
           this.abilityPrompt.setVisible(true);
           this.abilityPrompt.setOrigin(0, 0);
@@ -824,14 +918,16 @@ export default class SummaryUiHandler extends UiHandler {
           abilityInfo.nameText.setOrigin(0, 1);
           profileContainer.add(abilityInfo.nameText);
 
-          abilityInfo.descriptionText = addTextObject(7, 69, abilityInfo.ability?.description!, TextStyle.WINDOW_ALT, { wordWrap: { width: 1224 }}); // TODO: is this bang correct?
+          abilityInfo.descriptionText = addTextObject(7, 69, abilityInfo.ability?.description!, TextStyle.WINDOW_ALT, {
+            wordWrap: { width: 1224 },
+          }); // TODO: is this bang correct?
           abilityInfo.descriptionText.setOrigin(0, 0);
           profileContainer.add(abilityInfo.descriptionText);
 
           // Sets up the mask that hides the description text to give an illusion of scrolling
           const descriptionTextMaskRect = globalScene.make.graphics({});
           descriptionTextMaskRect.setScale(6);
-          descriptionTextMaskRect.fillStyle(0xFFFFFF);
+          descriptionTextMaskRect.fillStyle(0xffffff);
           descriptionTextMaskRect.beginPath();
           descriptionTextMaskRect.fillRect(110, 90.5, 206, 31);
 
@@ -846,11 +942,11 @@ export default class SummaryUiHandler extends UiHandler {
             abilityInfo.descriptionText.setY(69);
             this.descriptionScrollTween = globalScene.tweens.add({
               targets: abilityInfo.descriptionText,
-              delay: Utils.fixedInt(2000),
+              delay: fixedInt(2000),
               loop: -1,
-              hold: Utils.fixedInt(2000),
-              duration: Utils.fixedInt((abilityDescriptionLineCount - 2) * 2000),
-              y: `-=${14.83 * (abilityDescriptionLineCount - 2)}`
+              hold: fixedInt(2000),
+              duration: fixedInt((abilityDescriptionLineCount - 2) * 2000),
+              y: `-=${14.83 * (abilityDescriptionLineCount - 2)}`,
             });
           }
         });
@@ -860,25 +956,34 @@ export default class SummaryUiHandler extends UiHandler {
         this.passiveContainer?.descriptionText?.setVisible(false);
 
         const closeFragment = getBBCodeFrag("", TextStyle.WINDOW_ALT);
-        const rawNature = Utils.toReadableString(Nature[this.pokemon?.getNature()!]); // TODO: is this bang correct?
-        const nature = `${getBBCodeFrag(Utils.toReadableString(getNatureName(this.pokemon?.getNature()!)), TextStyle.SUMMARY_RED)}${closeFragment}`; // TODO: is this bang correct?
+        const rawNature = toReadableString(Nature[this.pokemon?.getNature()!]); // TODO: is this bang correct?
+        const nature = `${getBBCodeFrag(toReadableString(getNatureName(this.pokemon?.getNature()!)), TextStyle.SUMMARY_RED)}${closeFragment}`; // TODO: is this bang correct?
 
         const memoString = i18next.t("pokemonSummary:memoString", {
-          metFragment: i18next.t(`pokemonSummary:metFragment.${this.pokemon?.metBiome === -1 ? "apparently" : "normal"}`, {
-            biome: `${getBBCodeFrag(getBiomeName(this.pokemon?.metBiome!), TextStyle.SUMMARY_RED)}${closeFragment}`, // TODO: is this bang correct?
-            level: `${getBBCodeFrag(this.pokemon?.metLevel.toString()!, TextStyle.SUMMARY_RED)}${closeFragment}`, // TODO: is this bang correct?
-            wave: `${getBBCodeFrag((this.pokemon?.metWave ? this.pokemon.metWave.toString()! : i18next.t("pokemonSummary:unknownTrainer")), TextStyle.SUMMARY_RED)}${closeFragment}`,
-          }),
-          natureFragment: i18next.t(`pokemonSummary:natureFragment.${rawNature}`, { nature: nature })
+          metFragment: i18next.t(
+            `pokemonSummary:metFragment.${this.pokemon?.metBiome === -1 ? "apparently" : "normal"}`,
+            {
+              biome: `${getBBCodeFrag(getBiomeName(this.pokemon?.metBiome!), TextStyle.SUMMARY_RED)}${closeFragment}`, // TODO: is this bang correct?
+              level: `${getBBCodeFrag(this.pokemon?.metLevel.toString()!, TextStyle.SUMMARY_RED)}${closeFragment}`, // TODO: is this bang correct?
+              wave: `${getBBCodeFrag(this.pokemon?.metWave ? this.pokemon.metWave.toString()! : i18next.t("pokemonSummary:unknownTrainer"), TextStyle.SUMMARY_RED)}${closeFragment}`,
+            },
+          ),
+          natureFragment: i18next.t(`pokemonSummary:natureFragment.${rawNature}`, { nature: nature }),
         });
 
         const memoText = addBBCodeTextObject(7, 113, String(memoString), TextStyle.WINDOW_ALT);
         memoText.setOrigin(0, 0);
         profileContainer.add(memoText);
         break;
-      case Page.STATS:
-        const statsContainer = globalScene.add.container(0, -pageBg.height);
-        pageContainer.add(statsContainer);
+      }
+      case Page.STATS: {
+        this.statsContainer = globalScene.add.container(0, -pageBg.height);
+        pageContainer.add(this.statsContainer);
+        this.permStatsContainer = globalScene.add.container(27, 56);
+        this.statsContainer.add(this.permStatsContainer);
+        this.ivContainer = globalScene.add.container(27, 56);
+        this.statsContainer.add(this.ivContainer);
+        this.statsContainer.setVisible(true);
 
         PERMANENT_STATS.forEach((stat, s) => {
           const statName = i18next.t(getStatKey(stat));
@@ -887,28 +992,55 @@ export default class SummaryUiHandler extends UiHandler {
 
           const natureStatMultiplier = getNatureStatMultiplier(this.pokemon?.getNature()!, s); // TODO: is this bang correct?
 
-          const statLabel = addTextObject(27 + 115 * colIndex + (colIndex === 1 ?  5 : 0), 56 + 16 * rowIndex, statName, natureStatMultiplier === 1 ? TextStyle.SUMMARY : natureStatMultiplier > 1 ? TextStyle.SUMMARY_PINK : TextStyle.SUMMARY_BLUE);
+          const statLabel = addTextObject(
+            115 * colIndex + (colIndex === 1 ? 5 : 0),
+            16 * rowIndex,
+            statName,
+            natureStatMultiplier === 1
+              ? TextStyle.SUMMARY
+              : natureStatMultiplier > 1
+                ? TextStyle.SUMMARY_PINK
+                : TextStyle.SUMMARY_BLUE,
+          );
+          const ivLabel = addTextObject(
+            115 * colIndex + (colIndex === 1 ? 5 : 0),
+            16 * rowIndex,
+            statName,
+            this.pokemon?.ivs[stat] === 31 ? TextStyle.SUMMARY_GOLD : TextStyle.SUMMARY,
+          );
+
           statLabel.setOrigin(0.5, 0);
-          statsContainer.add(statLabel);
+          ivLabel.setOrigin(0.5, 0);
+          this.permStatsContainer.add(statLabel);
+          this.ivContainer.add(ivLabel);
 
-          const statValueText = stat !== Stat.HP
-            ? Utils.formatStat(this.pokemon?.getStat(stat)!) // TODO: is this bang correct?
-            : `${Utils.formatStat(this.pokemon?.hp!, true)}/${Utils.formatStat(this.pokemon?.getMaxHp()!, true)}`; // TODO: are those bangs correct?
+          const statValueText =
+            stat !== Stat.HP
+              ? formatStat(this.pokemon?.getStat(stat)!) // TODO: is this bang correct?
+              : `${formatStat(this.pokemon?.hp!, true)}/${formatStat(this.pokemon?.getMaxHp()!, true)}`; // TODO: are those bangs correct?
+          const ivText = `${this.pokemon?.ivs[stat]}/31`;
 
-          const statValue = addTextObject(120 + 88 * colIndex, 56 + 16 * rowIndex, statValueText, TextStyle.WINDOW_ALT);
+          const statValue = addTextObject(93 + 88 * colIndex, 16 * rowIndex, statValueText, TextStyle.WINDOW_ALT);
           statValue.setOrigin(1, 0);
-          statsContainer.add(statValue);
+          this.permStatsContainer.add(statValue);
+          const ivValue = addTextObject(93 + 88 * colIndex, 16 * rowIndex, ivText, TextStyle.WINDOW_ALT);
+          ivValue.setOrigin(1, 0);
+          this.ivContainer.add(ivValue);
         });
+        this.ivContainer.setVisible(false);
 
-        const itemModifiers = (globalScene.findModifiers(m => m instanceof PokemonHeldItemModifier
-          && m.pokemonId === this.pokemon?.id, this.playerParty) as PokemonHeldItemModifier[])
-          .sort(modifierSortFunc);
+        const itemModifiers = (
+          globalScene.findModifiers(
+            m => m instanceof PokemonHeldItemModifier && m.pokemonId === this.pokemon?.id,
+            this.playerParty,
+          ) as PokemonHeldItemModifier[]
+        ).sort(modifierSortFunc);
 
         itemModifiers.forEach((item, i) => {
           const icon = item.getIcon(true);
 
           icon.setPosition((i % 17) * 12 + 3, 14 * Math.floor(i / 17) + 15);
-          statsContainer.add(icon);
+          this.statsContainer.add(icon);
 
           icon.setInteractive(new Phaser.Geom.Rectangle(0, 0, 32, 32), Phaser.Geom.Rectangle.Contains);
           icon.on("pointerover", () => globalScene.ui.showTooltip(item.type.name, item.type.getDescription(), true));
@@ -924,38 +1056,47 @@ export default class SummaryUiHandler extends UiHandler {
 
         const expLabel = addTextObject(6, 112, i18next.t("pokemonSummary:expPoints"), TextStyle.SUMMARY);
         expLabel.setOrigin(0, 0);
-        statsContainer.add(expLabel);
+        this.statsContainer.add(expLabel);
 
         const nextLvExpLabel = addTextObject(6, 128, i18next.t("pokemonSummary:nextLv"), TextStyle.SUMMARY);
         nextLvExpLabel.setOrigin(0, 0);
-        statsContainer.add(nextLvExpLabel);
+        this.statsContainer.add(nextLvExpLabel);
 
         const expText = addTextObject(208, 112, pkmExp.toString(), TextStyle.WINDOW_ALT);
         expText.setOrigin(1, 0);
-        statsContainer.add(expText);
+        this.statsContainer.add(expText);
 
-        const nextLvExp = pkmLvl < globalScene.getMaxExpLevel()
-          ? getLevelTotalExp(pkmLvl + 1, pkmSpeciesGrowthRate) - pkmExp
-          : 0;
+        const nextLvExp =
+          pkmLvl < globalScene.getMaxExpLevel() ? getLevelTotalExp(pkmLvl + 1, pkmSpeciesGrowthRate) - pkmExp : 0;
         const nextLvExpText = addTextObject(208, 128, nextLvExp.toString(), TextStyle.WINDOW_ALT);
         nextLvExpText.setOrigin(1, 0);
-        statsContainer.add(nextLvExpText);
+        this.statsContainer.add(nextLvExpText);
 
         const expOverlay = globalScene.add.image(140, 145, "summary_stats_overlay_exp");
         expOverlay.setOrigin(0, 0);
-        statsContainer.add(expOverlay);
+        this.statsContainer.add(expOverlay);
 
         const expMaskRect = globalScene.make.graphics({});
         expMaskRect.setScale(6);
-        expMaskRect.fillStyle(0xFFFFFF);
+        expMaskRect.fillStyle(0xffffff);
         expMaskRect.beginPath();
         expMaskRect.fillRect(140 + pageContainer.x, 145 + pageContainer.y + 21, Math.floor(expRatio * 64), 3);
 
         const expMask = expMaskRect.createGeometryMask();
 
         expOverlay.setMask(expMask);
+        this.abilityPrompt = globalScene.add.image(
+          0,
+          0,
+          !globalScene.inputController?.gamepadSupport ? "summary_profile_prompt_z" : "summary_profile_prompt_a",
+        );
+        this.abilityPrompt.setPosition(8, 47);
+        this.abilityPrompt.setVisible(true);
+        this.abilityPrompt.setOrigin(0, 0);
+        this.statsContainer.add(this.abilityPrompt);
         break;
-      case Page.MOVES:
+      }
+      case Page.MOVES: {
         this.movesContainer = globalScene.add.container(5, -pageBg.height + 26);
         pageContainer.add(this.movesContainer);
 
@@ -967,8 +1108,14 @@ export default class SummaryUiHandler extends UiHandler {
         extraRowOverlay.setOrigin(0, 1);
         this.extraMoveRowContainer.add(extraRowOverlay);
 
-        const extraRowText = addTextObject(35, 0, this.summaryUiMode === SummaryUiMode.LEARN_MOVE && this.newMove ? this.newMove.name : i18next.t("pokemonSummary:cancel"),
-          this.summaryUiMode === SummaryUiMode.LEARN_MOVE ? TextStyle.SUMMARY_PINK : TextStyle.SUMMARY);
+        const extraRowText = addTextObject(
+          35,
+          0,
+          this.summaryUiMode === SummaryUiMode.LEARN_MOVE && this.newMove
+            ? this.newMove.name
+            : i18next.t("pokemonSummary:cancel"),
+          this.summaryUiMode === SummaryUiMode.LEARN_MOVE ? TextStyle.SUMMARY_PINK : TextStyle.SUMMARY,
+        );
         extraRowText.setOrigin(0, 1);
         this.extraMoveRowContainer.add(extraRowText);
 
@@ -976,9 +1123,9 @@ export default class SummaryUiHandler extends UiHandler {
           this.extraMoveRowContainer.setVisible(true);
 
           if (this.newMove && this.pokemon) {
-            const spriteKey = Utils.getLocalizedSpriteKey("types");
+            const spriteKey = getLocalizedSpriteKey("types");
             const moveType = this.pokemon.getMoveType(this.newMove);
-            const newMoveTypeIcon = globalScene.add.sprite(0, 0, spriteKey, Type[moveType].toLowerCase());
+            const newMoveTypeIcon = globalScene.add.sprite(0, 0, spriteKey, PokemonType[moveType].toLowerCase());
             newMoveTypeIcon.setOrigin(0, 1);
             this.extraMoveRowContainer.add(newMoveTypeIcon);
           }
@@ -986,7 +1133,7 @@ export default class SummaryUiHandler extends UiHandler {
           ppOverlay.setOrigin(0, 1);
           this.extraMoveRowContainer.add(ppOverlay);
 
-          const pp = Utils.padInt(this.newMove?.pp!, 2, "  "); // TODO: is this bang correct?
+          const pp = padInt(this.newMove?.pp!, 2, "  "); // TODO: is this bang correct?
           const ppText = addTextObject(173, 1, `${pp}/${pp}`, TextStyle.WINDOW);
           ppText.setOrigin(0, 1);
           this.extraMoveRowContainer.add(ppText);
@@ -996,14 +1143,15 @@ export default class SummaryUiHandler extends UiHandler {
         this.movesContainer.add(this.moveRowsContainer);
 
         for (let m = 0; m < 4; m++) {
-          const move: PokemonMove | null = this.pokemon && this.pokemon.moveset.length > m ? this.pokemon?.moveset[m] : null;
+          const move: PokemonMove | null =
+            this.pokemon && this.pokemon.moveset.length > m ? this.pokemon?.moveset[m] : null;
           const moveRowContainer = globalScene.add.container(0, 16 * m);
           this.moveRowsContainer.add(moveRowContainer);
 
           if (move && this.pokemon) {
-            const spriteKey = Utils.getLocalizedSpriteKey("types");
+            const spriteKey = getLocalizedSpriteKey("types");
             const moveType = this.pokemon.getMoveType(move.getMove());
-            const typeIcon = globalScene.add.sprite(0, 0, spriteKey, Type[moveType].toLowerCase());
+            const typeIcon = globalScene.add.sprite(0, 0, spriteKey, PokemonType[moveType].toLowerCase());
             typeIcon.setOrigin(0, 1);
             moveRowContainer.add(typeIcon);
           }
@@ -1022,18 +1170,18 @@ export default class SummaryUiHandler extends UiHandler {
           if (move) {
             const maxPP = move.getMovePp();
             const pp = maxPP - move.ppUsed;
-            ppText.setText(`${Utils.padInt(pp, 2, "  ")}/${Utils.padInt(maxPP, 2, "  ")}`);
+            ppText.setText(`${padInt(pp, 2, "  ")}/${padInt(maxPP, 2, "  ")}`);
           }
 
           moveRowContainer.add(ppText);
         }
 
-        this.moveDescriptionText = addTextObject(2, 84, "", TextStyle.WINDOW_ALT, { wordWrap: { width: 1212 }});
+        this.moveDescriptionText = addTextObject(2, 84, "", TextStyle.WINDOW_ALT, { wordWrap: { width: 1212 } });
         this.movesContainer.add(this.moveDescriptionText);
 
         const moveDescriptionTextMaskRect = globalScene.make.graphics({});
         moveDescriptionTextMaskRect.setScale(6);
-        moveDescriptionTextMaskRect.fillStyle(0xFFFFFF);
+        moveDescriptionTextMaskRect.fillStyle(0xffffff);
         moveDescriptionTextMaskRect.beginPath();
         moveDescriptionTextMaskRect.fillRect(112, 130, 202, 46);
 
@@ -1041,6 +1189,7 @@ export default class SummaryUiHandler extends UiHandler {
 
         this.moveDescriptionText.setMask(moveDescriptionTextMask);
         break;
+      }
     }
   }
 
@@ -1053,7 +1202,7 @@ export default class SummaryUiHandler extends UiHandler {
       targets: this.statusContainer,
       x: 0,
       duration: instant ? 0 : 250,
-      ease: "Sine.easeOut"
+      ease: "Sine.easeOut",
     });
   }
 
@@ -1066,7 +1215,7 @@ export default class SummaryUiHandler extends UiHandler {
       targets: this.statusContainer,
       x: -106,
       duration: instant ? 0 : 250,
-      ease: "Sine.easeIn"
+      ease: "Sine.easeIn",
     });
   }
 
@@ -1076,8 +1225,9 @@ export default class SummaryUiHandler extends UiHandler {
     }
 
     if (this.moveCursor < 4 && this.pokemon && this.moveCursor < this.pokemon.moveset.length) {
-      return this.pokemon.moveset[this.moveCursor]!.getMove(); // TODO: is this bang correct?
-    } else if (this.summaryUiMode === SummaryUiMode.LEARN_MOVE && this.moveCursor === 4) {
+      return this.pokemon.moveset[this.moveCursor].getMove();
+    }
+    if (this.summaryUiMode === SummaryUiMode.LEARN_MOVE && this.moveCursor === 4) {
       return this.newMove;
     }
     return null;
@@ -1093,7 +1243,7 @@ export default class SummaryUiHandler extends UiHandler {
 
   hideMoveSelect() {
     if (this.summaryUiMode === SummaryUiMode.LEARN_MOVE) {
-      this.moveSelectFunction && this.moveSelectFunction(4);
+      this.moveSelectFunction?.(4);
       return;
     }
 
@@ -1129,7 +1279,7 @@ export default class SummaryUiHandler extends UiHandler {
       targets: this.moveEffectContainer,
       x: 6,
       duration: instant ? 0 : 250,
-      ease: "Sine.easeOut"
+      ease: "Sine.easeOut",
     });
   }
 
@@ -1142,7 +1292,7 @@ export default class SummaryUiHandler extends UiHandler {
       targets: this.moveEffectContainer,
       x: 106,
       duration: instant ? 0 : 250,
-      ease: "Sine.easeIn"
+      ease: "Sine.easeIn",
     });
   }
 
diff --git a/src/ui/target-select-ui-handler.ts b/src/ui/target-select-ui-handler.ts
index 681c5ff40c0..5e14e5f7771 100644
--- a/src/ui/target-select-ui-handler.ts
+++ b/src/ui/target-select-ui-handler.ts
@@ -1,8 +1,8 @@
 import { BattlerIndex } from "../battle";
-import { Mode } from "./ui";
+import { UiMode } from "#enums/ui-mode";
 import UiHandler from "./ui-handler";
-import * as Utils from "../utils";
-import { getMoveTargets } from "../data/move";
+import { isNullOrUndefined, fixedInt } from "#app/utils/common";
+import { getMoveTargets } from "../data/moves/move";
 import { Button } from "#enums/buttons";
 import type { Moves } from "#enums/moves";
 import type Pokemon from "#app/field/pokemon";
@@ -19,7 +19,7 @@ export default class TargetSelectUiHandler extends UiHandler {
   private cursor0: number; // associated with BattlerIndex.PLAYER
   private cursor1: number; // associated with BattlerIndex.PLAYER_2
 
-  private isMultipleTargets: boolean = false;
+  private isMultipleTargets = false;
   private targets: BattlerIndex[];
   private targetsHighlighted: Pokemon[];
   private targetFlashTween: Phaser.Tweens.Tween | null;
@@ -27,12 +27,12 @@ export default class TargetSelectUiHandler extends UiHandler {
   private targetBattleInfoMoveTween: Phaser.Tweens.Tween[] = [];
 
   constructor() {
-    super(Mode.TARGET_SELECT);
+    super(UiMode.TARGET_SELECT);
 
     this.cursor = -1;
   }
 
-  setup(): void { }
+  setup(): void {}
 
   show(args: any[]): boolean {
     if (args.length < 3) {
@@ -70,8 +70,8 @@ export default class TargetSelectUiHandler extends UiHandler {
    * @param user the Pokemon using the move
    */
   resetCursor(cursorN: number, user: Pokemon): void {
-    if (!Utils.isNullOrUndefined(cursorN)) {
-      if ([ BattlerIndex.PLAYER, BattlerIndex.PLAYER_2 ].includes(cursorN) || user.battleSummonData.waveTurnCount === 1) {
+    if (!isNullOrUndefined(cursorN)) {
+      if ([BattlerIndex.PLAYER, BattlerIndex.PLAYER_2].includes(cursorN) || user.tempSummonData.waveTurnCount === 1) {
         // Reset cursor on the first turn of a fight or if an ally was targeted last turn
         cursorN = -1;
       }
@@ -85,15 +85,15 @@ export default class TargetSelectUiHandler extends UiHandler {
     let success = false;
 
     if (button === Button.ACTION || button === Button.CANCEL) {
-      const targetIndexes: BattlerIndex[] = this.isMultipleTargets ? this.targets : [ this.cursor ];
+      const targetIndexes: BattlerIndex[] = this.isMultipleTargets ? this.targets : [this.cursor];
       this.targetSelectCallback(button === Button.ACTION ? targetIndexes : []);
       success = true;
       if (this.fieldIndex === BattlerIndex.PLAYER) {
-        if (Utils.isNullOrUndefined(this.cursor0) || this.cursor0 !== this.cursor) {
+        if (isNullOrUndefined(this.cursor0) || this.cursor0 !== this.cursor) {
           this.cursor0 = this.cursor;
         }
       } else if (this.fieldIndex === BattlerIndex.PLAYER_2) {
-        if (Utils.isNullOrUndefined(this.cursor1) || this.cursor1 !== this.cursor) {
+        if (isNullOrUndefined(this.cursor1) || this.cursor1 !== this.cursor) {
           this.cursor1 = this.cursor;
         }
       }
@@ -135,14 +135,14 @@ export default class TargetSelectUiHandler extends UiHandler {
     const singleTarget = globalScene.getField()[cursor];
     const multipleTargets = this.targets.map(index => globalScene.getField()[index]);
 
-    this.targetsHighlighted = this.isMultipleTargets ? multipleTargets : [ singleTarget ];
+    this.targetsHighlighted = this.isMultipleTargets ? multipleTargets : [singleTarget];
 
     const ret = super.setCursor(cursor);
 
     if (this.targetFlashTween) {
       this.targetFlashTween.stop();
       for (const pokemon of multipleTargets) {
-        pokemon.setAlpha(!!pokemon.getTag(SubstituteTag) ? 0.5 : 1);
+        pokemon.setAlpha(pokemon.getTag(SubstituteTag) ? 0.5 : 1);
         this.highlightItems(pokemon.id, 1);
       }
     }
@@ -152,7 +152,7 @@ export default class TargetSelectUiHandler extends UiHandler {
       key: { start: 1, to: 0.25 },
       loop: -1,
       loopDelay: 150,
-      duration: Utils.fixedInt(450),
+      duration: fixedInt(450),
       ease: "Sine.easeInOut",
       yoyo: true,
       onUpdate: t => {
@@ -160,7 +160,7 @@ export default class TargetSelectUiHandler extends UiHandler {
           target.setAlpha(t.getValue());
           this.highlightItems(target.id, t.getValue());
         }
-      }
+      },
     });
 
     if (this.targetBattleInfoMoveTween.length >= 1) {
@@ -173,14 +173,16 @@ export default class TargetSelectUiHandler extends UiHandler {
     const targetsBattleInfo = this.targetsHighlighted.map(target => target.getBattleInfo());
 
     targetsBattleInfo.map(info => {
-      this.targetBattleInfoMoveTween.push(globalScene.tweens.add({
-        targets: [ info ],
-        y: { start: info.getBaseY(), to: info.getBaseY() + 1 },
-        loop: -1,
-        duration: Utils.fixedInt(250),
-        ease: "Linear",
-        yoyo: true
-      }));
+      this.targetBattleInfoMoveTween.push(
+        globalScene.tweens.add({
+          targets: [info],
+          y: { start: info.getBaseY(), to: info.getBaseY() + 1 },
+          loop: -1,
+          duration: fixedInt(250),
+          ease: "Linear",
+          yoyo: true,
+        }),
+      );
     });
     return ret;
   }
@@ -192,7 +194,7 @@ export default class TargetSelectUiHandler extends UiHandler {
     }
 
     for (const pokemon of this.targetsHighlighted) {
-      pokemon.setAlpha(!!pokemon.getTag(SubstituteTag) ? 0.5 : 1);
+      pokemon.setAlpha(pokemon.getTag(SubstituteTag) ? 0.5 : 1);
       this.highlightItems(pokemon.id, 1);
     }
 
@@ -205,7 +207,7 @@ export default class TargetSelectUiHandler extends UiHandler {
     }
   }
 
-  private highlightItems(targetId: number, val: number) : void {
+  private highlightItems(targetId: number, val: number): void {
     const targetItems = this.enemyModifiers.getAll("name", targetId.toString());
     for (const item of targetItems as Phaser.GameObjects.Container[]) {
       item.setAlpha(val);
diff --git a/src/ui/test-dialogue-ui-handler.ts b/src/ui/test-dialogue-ui-handler.ts
index c7693ec954d..9ecf1641e7b 100644
--- a/src/ui/test-dialogue-ui-handler.ts
+++ b/src/ui/test-dialogue-ui-handler.ts
@@ -4,11 +4,10 @@ import type { ModalConfig } from "./modal-ui-handler";
 import i18next from "i18next";
 import type { PlayerPokemon } from "#app/field/pokemon";
 import type { OptionSelectItem } from "./abstact-option-select-ui-handler";
-import { isNullOrUndefined } from "#app/utils";
-import { Mode } from "./ui";
+import { isNullOrUndefined } from "#app/utils/common";
+import { UiMode } from "#enums/ui-mode";
 
 export default class TestDialogueUiHandler extends FormModalUiHandler {
-
   keys: string[];
 
   constructor(mode) {
@@ -19,41 +18,50 @@ export default class TestDialogueUiHandler extends FormModalUiHandler {
     super.setup();
 
     const flattenKeys = (object?: any, topKey?: string, midleKey?: string[]): Array<any> => {
-      return Object.keys(object ?? {}).map((t, i) => {
-        const value = Object.values(object)[i];
+      return Object.keys(object ?? {})
+        .map((t, i) => {
+          const value = Object.values(object)[i];
 
-        if (typeof value === "object" && !isNullOrUndefined(value)) { // we check for not null or undefined here because if the language json file has a null key, the typeof will still be an object, but that object will be null, causing issues
-          // If the value is an object, execute the same process
-          // si el valor es un objeto ejecuta el mismo proceso
+          if (typeof value === "object" && !isNullOrUndefined(value)) {
+            // we check for not null or undefined here because if the language json file has a null key, the typeof will still be an object, but that object will be null, causing issues
+            // If the value is an object, execute the same process
+            // si el valor es un objeto ejecuta el mismo proceso
 
-          return flattenKeys(value, topKey ?? t, topKey ? midleKey ? [ ...midleKey, t ] : [ t ] : undefined).filter((t) => t.length > 0);
-        } else if (typeof value === "string" || isNullOrUndefined(value)) { // we check for null or undefined here as per above - the typeof is still an object but the value is null so we need to exit out of this and pass the null key
+            return flattenKeys(value, topKey ?? t, topKey ? (midleKey ? [...midleKey, t] : [t]) : undefined).filter(
+              t => t.length > 0,
+            );
+          }
+          if (typeof value === "string" || isNullOrUndefined(value)) {
+            // we check for null or undefined here as per above - the typeof is still an object but the value is null so we need to exit out of this and pass the null key
 
-          // Return in the format expected by i18next
-          return midleKey ? `${topKey}:${midleKey.map((m) => m).join(".")}.${t}` : `${topKey}:${t}`;
-        }
-      }).filter((t) => t);
+            // Return in the format expected by i18next
+            return midleKey ? `${topKey}:${midleKey.map(m => m).join(".")}.${t}` : `${topKey}:${t}`;
+          }
+        })
+        .filter(t => t);
     };
 
-    const keysInArrays = flattenKeys(i18next.getDataByLanguage(String(i18next.resolvedLanguage))).filter((t) => t.length > 0); // Array of arrays
-    const keys = keysInArrays.flat(Infinity).map(String); // One array of string
+    const keysInArrays = flattenKeys(i18next.getDataByLanguage(String(i18next.resolvedLanguage))).filter(
+      t => t.length > 0,
+    ); // Array of arrays
+    const keys = keysInArrays.flat(Number.POSITIVE_INFINITY).map(String); // One array of string
     this.keys = keys;
   }
 
-  getModalTitle(config?: ModalConfig): string {
+  getModalTitle(_config?: ModalConfig): string {
     return "Test Dialogue";
   }
 
-  getWidth(config?: ModalConfig): number {
+  getWidth(_config?: ModalConfig): number {
     return 300;
   }
 
-  getMargin(config?: ModalConfig): [number, number, number, number] {
-    return [ 0, 0, 48, 0 ];
+  getMargin(_config?: ModalConfig): [number, number, number, number] {
+    return [0, 0, 48, 0];
   }
 
-  getButtonLabels(config?: ModalConfig): string[] {
-    return [ "Check", "Cancel" ];
+  getButtonLabels(_config?: ModalConfig): string[] {
+    return ["Check", "Cancel"];
   }
 
   getReadableErrorMessage(error: string): string {
@@ -78,7 +86,10 @@ export default class TestDialogueUiHandler extends FormModalUiHandler {
     input.setMaxLength(255);
 
     input.on("keydown", (inputObject, evt: KeyboardEvent) => {
-      if ([ "escape", "space" ].some((v) => v === evt.key.toLowerCase() || v === evt.code.toLowerCase()) && ui.getMode() === Mode.AUTO_COMPLETE) {
+      if (
+        ["escape", "space"].some(v => v === evt.key.toLowerCase() || v === evt.code.toLowerCase()) &&
+        ui.getMode() === UiMode.AUTO_COMPLETE
+      ) {
         // Delete autocomplete list and recovery focus.
         inputObject.on("blur", () => inputObject.node.focus(), { once: true });
         ui.revertMode();
@@ -87,16 +98,18 @@ export default class TestDialogueUiHandler extends FormModalUiHandler {
 
     input.on("textchange", (inputObject, evt: InputEvent) => {
       // Delete autocomplete.
-      if (ui.getMode() === Mode.AUTO_COMPLETE) {
+      if (ui.getMode() === UiMode.AUTO_COMPLETE) {
         ui.revertMode();
       }
 
       let options: OptionSelectItem[] = [];
       const splitArr = inputObject.text.split(" ");
-      const filteredKeys = this.keys.filter((command) => command.toLowerCase().includes(splitArr[splitArr.length - 1].toLowerCase()));
+      const filteredKeys = this.keys.filter(command =>
+        command.toLowerCase().includes(splitArr[splitArr.length - 1].toLowerCase()),
+      );
       if (inputObject.text !== "" && filteredKeys.length > 0) {
         // if performance is required, you could reduce the number of total results by changing the slice below to not have all ~8000 inputs going
-        options = filteredKeys.slice(0).map((value) => {
+        options = filteredKeys.slice(0).map(value => {
           return {
             label: value,
             handler: () => {
@@ -109,7 +122,7 @@ export default class TestDialogueUiHandler extends FormModalUiHandler {
               }
               ui.revertMode();
               return true;
-            }
+            },
           };
         });
       }
@@ -118,14 +131,12 @@ export default class TestDialogueUiHandler extends FormModalUiHandler {
         const modalOpts = {
           options: options,
           maxOptions: 5,
-          modalContainer: this.modalContainer
+          modalContainer: this.modalContainer,
         };
-        ui.setOverlayMode(Mode.AUTO_COMPLETE, modalOpts);
+        ui.setOverlayMode(UiMode.AUTO_COMPLETE, modalOpts);
       }
-
     });
 
-
     if (super.show(args)) {
       const config = args[0] as ModalConfig;
       this.inputs[0].resize(1150, 116);
@@ -135,8 +146,8 @@ export default class TestDialogueUiHandler extends FormModalUiHandler {
       } else {
         this.inputs[0].text = args[1];
       }
-      this.submitAction = (_) => {
-        if (ui.getMode() === Mode.TEST_DIALOGUE) {
+      this.submitAction = _ => {
+        if (ui.getMode() === UiMode.TEST_DIALOGUE) {
           this.sanitizeInputs();
           const sanitizedName = btoa(unescape(encodeURIComponent(this.inputs[0].text)));
           config.buttonActions[0](sanitizedName);
diff --git a/src/ui/text.ts b/src/ui/text.ts
index 19b0eddb494..d3afdef666f 100644
--- a/src/ui/text.ts
+++ b/src/ui/text.ts
@@ -42,19 +42,29 @@ export enum TextStyle {
   PERFECT_IV,
   ME_OPTION_DEFAULT, // Default style for choices in ME
   ME_OPTION_SPECIAL, // Style for choices with special requirements in ME
-  SHADOW_TEXT // To obscure unavailable options
+  SHADOW_TEXT, // To obscure unavailable options
 }
 
 export interface TextStyleOptions {
-  scale: number,
-  styleOptions: Phaser.Types.GameObjects.Text.TextStyle | InputText.IConfig,
-  shadowColor: string,
-  shadowXpos: number,
-  shadowYpos: number
+  scale: number;
+  styleOptions: Phaser.Types.GameObjects.Text.TextStyle | InputText.IConfig;
+  shadowColor: string;
+  shadowXpos: number;
+  shadowYpos: number;
 }
 
-export function addTextObject(x: number, y: number, content: string, style: TextStyle, extraStyleOptions?: Phaser.Types.GameObjects.Text.TextStyle): Phaser.GameObjects.Text {
-  const { scale, styleOptions, shadowColor, shadowXpos, shadowYpos } = getTextStyleOptions(style, globalScene.uiTheme, extraStyleOptions);
+export function addTextObject(
+  x: number,
+  y: number,
+  content: string,
+  style: TextStyle,
+  extraStyleOptions?: Phaser.Types.GameObjects.Text.TextStyle,
+): Phaser.GameObjects.Text {
+  const { scale, styleOptions, shadowColor, shadowXpos, shadowYpos } = getTextStyleOptions(
+    style,
+    globalScene.uiTheme,
+    extraStyleOptions,
+  );
 
   const ret = globalScene.add.text(x, y, content, styleOptions);
   ret.setScale(scale);
@@ -70,8 +80,16 @@ export function addTextObject(x: number, y: number, content: string, style: Text
   return ret;
 }
 
-export function setTextStyle(obj: Phaser.GameObjects.Text, style: TextStyle, extraStyleOptions?: Phaser.Types.GameObjects.Text.TextStyle) {
-  const { scale, styleOptions, shadowColor, shadowXpos, shadowYpos } = getTextStyleOptions(style, globalScene.uiTheme, extraStyleOptions);
+export function setTextStyle(
+  obj: Phaser.GameObjects.Text,
+  style: TextStyle,
+  extraStyleOptions?: Phaser.Types.GameObjects.Text.TextStyle,
+) {
+  const { scale, styleOptions, shadowColor, shadowXpos, shadowYpos } = getTextStyleOptions(
+    style,
+    globalScene.uiTheme,
+    extraStyleOptions,
+  );
   obj.setScale(scale);
   obj.setShadow(shadowXpos, shadowYpos, shadowColor);
   if (!(styleOptions as Phaser.Types.GameObjects.Text.TextStyle).lineSpacing) {
@@ -83,8 +101,18 @@ export function setTextStyle(obj: Phaser.GameObjects.Text, style: TextStyle, ext
   }
 }
 
-export function addBBCodeTextObject(x: number, y: number, content: string, style: TextStyle, extraStyleOptions?: Phaser.Types.GameObjects.Text.TextStyle): BBCodeText {
-  const { scale, styleOptions, shadowColor, shadowXpos, shadowYpos } = getTextStyleOptions(style, globalScene.uiTheme, extraStyleOptions);
+export function addBBCodeTextObject(
+  x: number,
+  y: number,
+  content: string,
+  style: TextStyle,
+  extraStyleOptions?: Phaser.Types.GameObjects.Text.TextStyle,
+): BBCodeText {
+  const { scale, styleOptions, shadowColor, shadowXpos, shadowYpos } = getTextStyleOptions(
+    style,
+    globalScene.uiTheme,
+    extraStyleOptions,
+  );
 
   const ret = new BBCodeText(globalScene, x, y, content, styleOptions as BBCodeText.TextStyle);
   globalScene.add.existing(ret);
@@ -101,7 +129,14 @@ export function addBBCodeTextObject(x: number, y: number, content: string, style
   return ret;
 }
 
-export function addTextInputObject(x: number, y: number, width: number, height: number, style: TextStyle, extraStyleOptions?: InputText.IConfig): InputText {
+export function addTextInputObject(
+  x: number,
+  y: number,
+  width: number,
+  height: number,
+  style: TextStyle,
+  extraStyleOptions?: InputText.IConfig,
+): InputText {
   const { scale, styleOptions } = getTextStyleOptions(style, globalScene.uiTheme, extraStyleOptions);
 
   const ret = new InputText(globalScene, x, y, width, height, styleOptions as InputText.IConfig);
@@ -111,7 +146,11 @@ export function addTextInputObject(x: number, y: number, width: number, height:
   return ret;
 }
 
-export function getTextStyleOptions(style: TextStyle, uiTheme: UiTheme, extraStyleOptions?: Phaser.Types.GameObjects.Text.TextStyle): TextStyleOptions {
+export function getTextStyleOptions(
+  style: TextStyle,
+  uiTheme: UiTheme,
+  extraStyleOptions?: Phaser.Types.GameObjects.Text.TextStyle,
+): TextStyleOptions {
   const lang = i18next.resolvedLanguage;
   let shadowXpos = 4;
   let shadowYpos = 5;
@@ -123,13 +162,13 @@ export function getTextStyleOptions(style: TextStyle, uiTheme: UiTheme, extraSty
     fontSize: 96,
     color: getTextColor(style, false, uiTheme),
     padding: {
-      bottom: 6
-    }
+      bottom: 6,
+    },
   };
 
   if (i18next.resolvedLanguage === "ja") {
     scale = 0.1388888889;
-    styleOptions.padding = { top:2, bottom:4 };
+    styleOptions.padding = { top: 2, bottom: 4 };
   }
 
   switch (style) {
@@ -148,7 +187,7 @@ export function getTextStyleOptions(style: TextStyle, uiTheme: UiTheme, extraSty
       shadowXpos = 3;
       shadowYpos = 3;
       break;
-    case TextStyle.STATS_LABEL:
+    case TextStyle.STATS_LABEL: {
       let fontSizeLabel = "96px";
       switch (lang) {
         case "de":
@@ -160,9 +199,10 @@ export function getTextStyleOptions(style: TextStyle, uiTheme: UiTheme, extraSty
           fontSizeLabel = "96px";
           break;
       }
-      styleOptions.fontSize =  fontSizeLabel;
+      styleOptions.fontSize = fontSizeLabel;
       break;
-    case TextStyle.STATS_VALUE:
+    }
+    case TextStyle.STATS_VALUE: {
       shadowXpos = 3;
       shadowYpos = 3;
       let fontSizeValue = "96px";
@@ -174,8 +214,9 @@ export function getTextStyleOptions(style: TextStyle, uiTheme: UiTheme, extraSty
           fontSizeValue = "96px";
           break;
       }
-      styleOptions.fontSize =  fontSizeValue;
+      styleOptions.fontSize = fontSizeValue;
       break;
+    }
     case TextStyle.MESSAGE:
     case TextStyle.SETTINGS_LABEL:
     case TextStyle.SETTINGS_LOCKED:
@@ -220,7 +261,9 @@ export function getTextStyleOptions(style: TextStyle, uiTheme: UiTheme, extraSty
 
   if (extraStyleOptions) {
     if (extraStyleOptions.fontSize) {
-      const sizeRatio = parseInt(extraStyleOptions.fontSize.toString().slice(0, -2)) / parseInt(styleOptions.fontSize?.toString().slice(0, -2) ?? "1");
+      const sizeRatio =
+        Number.parseInt(extraStyleOptions.fontSize.toString().slice(0, -2)) /
+        Number.parseInt(styleOptions.fontSize?.toString().slice(0, -2) ?? "1");
       shadowXpos *= sizeRatio;
     }
     styleOptions = Object.assign(styleOptions, extraStyleOptions);
@@ -249,10 +292,15 @@ export function getBBCodeFrag(content: string, textStyle: TextStyle, uiTheme: Ui
  * @param forWindow set to `true` if the text is to be displayed in a window ({@linkcode BattleScene.addWindow})
  *  it will replace all instances of the default MONEY TextStyle by {@linkcode TextStyle.MONEY_WINDOW}
  */
-export function getTextWithColors(content: string, primaryStyle: TextStyle, uiTheme: UiTheme, forWindow?: boolean): string {
+export function getTextWithColors(
+  content: string,
+  primaryStyle: TextStyle,
+  uiTheme: UiTheme,
+  forWindow?: boolean,
+): string {
   // Apply primary styling before anything else
   let text = getBBCodeFrag(content, primaryStyle, uiTheme) + "[/color][/shadow]";
-  const primaryStyleString = [ ...text.match(new RegExp(/\[color=[^\[]*\]\[shadow=[^\[]*\]/i))! ][0];
+  const primaryStyleString = [...text.match(new RegExp(/\[color=[^\[]*\]\[shadow=[^\[]*\]/i))!][0];
 
   /* For money text displayed in game windows, we can't use the default {@linkcode TextStyle.MONEY}
    * or it will look wrong in legacy mode because of the different window background color
@@ -262,14 +310,20 @@ export function getTextWithColors(content: string, primaryStyle: TextStyle, uiTh
   }
 
   // Set custom colors
-  text = text.replace(/@\[([^{]*)\]{([^}]*)}/gi, (substring, textStyle: string, textToColor: string) => {
-    return "[/color][/shadow]" + getBBCodeFrag(textToColor, TextStyle[textStyle], uiTheme) + "[/color][/shadow]" + primaryStyleString;
+  text = text.replace(/@\[([^{]*)\]{([^}]*)}/gi, (_substring, textStyle: string, textToColor: string) => {
+    return (
+      "[/color][/shadow]" +
+      getBBCodeFrag(textToColor, TextStyle[textStyle], uiTheme) +
+      "[/color][/shadow]" +
+      primaryStyleString
+    );
   });
 
   // Remove extra style block at the end
   return text.replace(/\[color=[^\[]*\]\[shadow=[^\[]*\]\[\/color\]\[\/shadow\]/gi, "");
 }
 
+// biome-ignore lint/complexity/noExcessiveCognitiveComplexity: This is a giant switch which is the best option.
 export function getTextColor(textStyle: TextStyle, shadow?: boolean, uiTheme: UiTheme = UiTheme.DEFAULT): string {
   const isLegacyTheme = uiTheme === UiTheme.LEGACY;
   switch (textStyle) {
diff --git a/src/ui/time-of-day-widget.ts b/src/ui/time-of-day-widget.ts
index 2a33b475385..5f5116a2da0 100644
--- a/src/ui/time-of-day-widget.ts
+++ b/src/ui/time-of-day-widget.ts
@@ -1,4 +1,4 @@
-import * as Utils from "../utils";
+import { fixedInt } from "#app/utils/common";
 import { globalScene } from "#app/global-scene";
 import { BattleSceneEventType } from "../events/battle-scene";
 import { EaseType } from "#enums/ease-type";
@@ -6,7 +6,6 @@ import { TimeOfDay } from "#enums/time-of-day";
 
 /** A small self contained UI element that displays the time of day as an icon */
 export default class TimeOfDayWidget extends Phaser.GameObjects.Container {
-
   /** The {@linkcode Phaser.GameObjects.Sprite} that represents the foreground of the current time of day */
   private readonly timeOfDayIconFgs: Phaser.GameObjects.Sprite[] = new Array(2);
   /** The {@linkcode Phaser.GameObjects.Sprite} that represents the middle-ground of the current time of day */
@@ -19,9 +18,10 @@ export default class TimeOfDayWidget extends Phaser.GameObjects.Container {
 
   /** A map containing all timeOfDayIcon arrays with a matching string key for easier iteration */
   private timeOfDayIconPairs: Map<string, Phaser.GameObjects.Sprite[]> = new Map([
-    [ "bg", this.timeOfDayIconBgs ],
-    [ "mg", this.timeOfDayIconMgs ],
-    [ "fg", this.timeOfDayIconFgs ],]);
+    ["bg", this.timeOfDayIconBgs],
+    ["mg", this.timeOfDayIconMgs],
+    ["fg", this.timeOfDayIconFgs],
+  ]);
 
   /** The current time of day */
   private currentTime: TimeOfDay = TimeOfDay.ALL;
@@ -38,16 +38,15 @@ export default class TimeOfDayWidget extends Phaser.GameObjects.Container {
   }
   /** On set, resumes any paused tweens if true */
   public set parentVisible(visible: boolean) {
-    if (visible && !this._parentVisible) { // Only resume the tweens if parent is newly visible
-      this.timeOfDayIcons?.forEach(
-        icon => globalScene.tweens.getTweensOf(icon).forEach(
-          tween => tween.resume()));
+    if (visible && !this._parentVisible) {
+      // Only resume the tweens if parent is newly visible
+      this.timeOfDayIcons?.forEach(icon => globalScene.tweens.getTweensOf(icon).forEach(tween => tween.resume()));
     }
 
     this._parentVisible = visible;
   }
 
-  constructor(x: number = 0, y: number = 0) {
+  constructor(x = 0, y = 0) {
     super(globalScene, x, y);
 
     this.setVisible(globalScene.showTimeOfDayWidget);
@@ -56,14 +55,13 @@ export default class TimeOfDayWidget extends Phaser.GameObjects.Container {
     }
 
     // Initialize all sprites
-    this.timeOfDayIconPairs.forEach(
-      (icons, key) => {
-        for (let i = 0; i < icons.length; i++) {
-          icons[i] = globalScene.add.sprite(0, 0, "dawn_icon_" + key).setOrigin();
-        }
-      });
+    this.timeOfDayIconPairs.forEach((icons, key) => {
+      for (let i = 0; i < icons.length; i++) {
+        icons[i] = globalScene.add.sprite(0, 0, "dawn_icon_" + key).setOrigin();
+      }
+    });
     // Store a flat array of all icons for later
-    this.timeOfDayIcons = [ this.timeOfDayIconBgs, this.timeOfDayIconMgs, this.timeOfDayIconFgs ].flat();
+    this.timeOfDayIcons = [this.timeOfDayIconBgs, this.timeOfDayIconMgs, this.timeOfDayIconFgs].flat();
     this.add(this.timeOfDayIcons);
 
     globalScene.eventTarget.addEventListener(BattleSceneEventType.ENCOUNTER_PHASE, this.onEncounterPhaseEvent);
@@ -75,21 +73,21 @@ export default class TimeOfDayWidget extends Phaser.GameObjects.Container {
    */
   private getBackTween(): Phaser.Types.Tweens.TweenBuilderConfig[] {
     const rotate = {
-      targets: [ this.timeOfDayIconMgs[0], this.timeOfDayIconMgs[1] ],
+      targets: [this.timeOfDayIconMgs[0], this.timeOfDayIconMgs[1]],
       angle: "+=90",
-      duration: Utils.fixedInt(1500),
+      duration: fixedInt(1500),
       ease: "Back.easeOut",
       paused: !this.parentVisible,
     };
     const fade = {
-      targets: [ this.timeOfDayIconBgs[1], this.timeOfDayIconMgs[1], this.timeOfDayIconFgs[1] ],
+      targets: [this.timeOfDayIconBgs[1], this.timeOfDayIconMgs[1], this.timeOfDayIconFgs[1]],
       alpha: 0,
-      duration: Utils.fixedInt(500),
+      duration: fixedInt(500),
       ease: "Linear",
       paused: !this.parentVisible,
     };
 
-    return [ rotate, fade ];
+    return [rotate, fade];
   }
 
   /**
@@ -98,21 +96,21 @@ export default class TimeOfDayWidget extends Phaser.GameObjects.Container {
    */
   private getBounceTween(): Phaser.Types.Tweens.TweenBuilderConfig[] {
     const bounce = {
-      targets: [ this.timeOfDayIconMgs[0], this.timeOfDayIconMgs[1] ],
+      targets: [this.timeOfDayIconMgs[0], this.timeOfDayIconMgs[1]],
       angle: "+=90",
-      duration: Utils.fixedInt(2000),
+      duration: fixedInt(2000),
       ease: "Bounce.easeOut",
       paused: !this.parentVisible,
     };
     const fade = {
-      targets: [ this.timeOfDayIconBgs[1], this.timeOfDayIconMgs[1], this.timeOfDayIconFgs[1] ],
+      targets: [this.timeOfDayIconBgs[1], this.timeOfDayIconMgs[1], this.timeOfDayIconFgs[1]],
       alpha: 0,
-      duration: Utils.fixedInt(800),
+      duration: fixedInt(800),
       ease: "Linear",
       paused: !this.parentVisible,
     };
 
-    return [ bounce, fade ];
+    return [bounce, fade];
   }
 
   /** Resets all icons to the proper depth, texture, and alpha so they are ready to tween */
@@ -121,11 +119,10 @@ export default class TimeOfDayWidget extends Phaser.GameObjects.Container {
     this.moveBelow(this.timeOfDayIconMgs[0], this.timeOfDayIconBgs[1]);
     this.moveBelow(this.timeOfDayIconFgs[0], this.timeOfDayIconFgs[1]);
 
-    this.timeOfDayIconPairs.forEach(
-      (icons, key) => {
-        icons[0].setTexture(TimeOfDay[this.currentTime].toLowerCase() + "_icon_" + key);
-        icons[1].setTexture(TimeOfDay[this.previousTime].toLowerCase() + "_icon_" + key);
-      });
+    this.timeOfDayIconPairs.forEach((icons, key) => {
+      icons[0].setTexture(TimeOfDay[this.currentTime].toLowerCase() + "_icon_" + key);
+      icons[1].setTexture(TimeOfDay[this.previousTime].toLowerCase() + "_icon_" + key);
+    });
     this.timeOfDayIconMgs[0].setRotation(-90 * (3.14 / 180));
 
     this.timeOfDayIcons.forEach(icon => icon.setAlpha(1));
@@ -138,23 +135,23 @@ export default class TimeOfDayWidget extends Phaser.GameObjects.Container {
     this.resetIcons();
 
     // Tween based on the player setting
-    (globalScene.timeOfDayAnimation === EaseType.BACK ? this.getBackTween() : this.getBounceTween())
-      .forEach(tween => globalScene.tweens.add(tween));
+    (globalScene.timeOfDayAnimation === EaseType.BACK ? this.getBackTween() : this.getBounceTween()).forEach(tween =>
+      globalScene.tweens.add(tween),
+    );
 
     // Swaps all elements of the icon arrays by shifting the first element onto the end of the array
     // This ensures index[0] is always the new time of day icon and index[1] is always the current one
-    this.timeOfDayIconPairs.forEach(
-      icons => {
-        const shifted = icons.shift();
-        shifted && icons.push(shifted);
-      });
+    this.timeOfDayIconPairs.forEach(icons => {
+      const shifted = icons.shift();
+      shifted && icons.push(shifted);
+    });
   }
 
   /**
    * Grabs the current time of day from the arena and calls {@linkcode tweenTimeOfDayIcon}
-   * @param event {@linkcode Event} being sent
+   * @param _event {@linkcode Event} being sent
    */
-  private onEncounterPhase(event: Event) {
+  private onEncounterPhase(_event: Event) {
     const newTime = globalScene.arena.getTimeOfDay();
 
     if (this.currentTime === newTime) {
diff --git a/src/ui/title-ui-handler.ts b/src/ui/title-ui-handler.ts
index 0d69eae0efc..bed4d568481 100644
--- a/src/ui/title-ui-handler.ts
+++ b/src/ui/title-ui-handler.ts
@@ -1,6 +1,6 @@
 import OptionSelectUiHandler from "./settings/option-select-ui-handler";
-import { Mode } from "./ui";
-import * as Utils from "../utils";
+import { UiMode } from "#enums/ui-mode";
+import { fixedInt, randInt, randItem } from "#app/utils/common";
 import { TextStyle, addTextObject } from "./text";
 import { getSplashMessages } from "../data/splash-messages";
 import i18next from "i18next";
@@ -8,10 +8,14 @@ import { TimedEventDisplay } from "#app/timed-event-manager";
 import { version } from "../../package.json";
 import { pokerogueApi } from "#app/plugins/api/pokerogue-api";
 import { globalScene } from "#app/global-scene";
+import type { Species } from "#enums/species";
+import { getPokemonSpecies } from "#app/data/pokemon-species";
+import { PlayerGender } from "#enums/player-gender";
+import { timedEventManager } from "#app/global-event-manager";
 
 export default class TitleUiHandler extends OptionSelectUiHandler {
   /** If the stats can not be retrieved, use this fallback value */
-  private static readonly BATTLES_WON_FALLBACK: number = -99999999;
+  private static readonly BATTLES_WON_FALLBACK: number = -1;
 
   private titleContainer: Phaser.GameObjects.Container;
   private playerCountLabel: Phaser.GameObjects.Text;
@@ -22,7 +26,7 @@ export default class TitleUiHandler extends OptionSelectUiHandler {
 
   private titleStatsTimer: NodeJS.Timeout | null;
 
-  constructor(mode: Mode = Mode.TITLE) {
+  constructor(mode: UiMode = UiMode.TITLE) {
     super(mode);
   }
 
@@ -36,27 +40,30 @@ export default class TitleUiHandler extends OptionSelectUiHandler {
     this.titleContainer.setAlpha(0);
     ui.add(this.titleContainer);
 
-    const logo = globalScene.add.image((globalScene.game.canvas.width / 6) / 2, 8, "logo");
+    const logo = globalScene.add.image(globalScene.game.canvas.width / 6 / 2, 8, "logo");
     logo.setOrigin(0.5, 0);
     this.titleContainer.add(logo);
 
-    if (globalScene.eventManager.isEventActive()) {
-      this.eventDisplay = new TimedEventDisplay(0, 0, globalScene.eventManager.activeEvent());
+    if (timedEventManager.isEventActive()) {
+      this.eventDisplay = new TimedEventDisplay(0, 0, timedEventManager.activeEvent());
       this.eventDisplay.setup();
       this.titleContainer.add(this.eventDisplay);
     }
 
     this.playerCountLabel = addTextObject(
       // Actual y position will be determined after the title menu has been populated with options
-      (globalScene.game.canvas.width / 6) - 2, 0,
+      globalScene.game.canvas.width / 6 - 2,
+      0,
       `? ${i18next.t("menu:playersOnline")}`,
       TextStyle.MESSAGE,
-      { fontSize: "54px" }
+      { fontSize: "54px" },
     );
     this.playerCountLabel.setOrigin(1, 0);
     this.titleContainer.add(this.playerCountLabel);
 
-    this.splashMessageText = addTextObject(logo.x + 64, logo.y + logo.displayHeight - 8, "", TextStyle.MONEY, { fontSize: "54px" });
+    this.splashMessageText = addTextObject(logo.x + 64, logo.y + logo.displayHeight - 8, "", TextStyle.MONEY, {
+      fontSize: "54px",
+    });
     this.splashMessageText.setOrigin(0.5, 0.5);
     this.splashMessageText.setAngle(-20);
     this.titleContainer.add(this.splashMessageText);
@@ -65,20 +72,23 @@ export default class TitleUiHandler extends OptionSelectUiHandler {
 
     globalScene.tweens.add({
       targets: this.splashMessageText,
-      duration: Utils.fixedInt(350),
+      duration: fixedInt(350),
       scale: originalSplashMessageScale * 1.25,
       loop: -1,
       yoyo: true,
     });
 
-    this.appVersionText = addTextObject(logo.x - 60, logo.y + logo.displayHeight + 4, "", TextStyle.MONEY, { fontSize: "54px" });
+    this.appVersionText = addTextObject(logo.x - 60, logo.y + logo.displayHeight + 4, "", TextStyle.MONEY, {
+      fontSize: "54px",
+    });
     this.appVersionText.setOrigin(0.5, 0.5);
     this.appVersionText.setAngle(0);
     this.titleContainer.add(this.appVersionText);
   }
 
   updateTitleStats(): void {
-    pokerogueApi.getGameTitleStats()
+    pokerogueApi
+      .getGameTitleStats()
       .then(stats => {
         if (stats) {
           this.playerCountLabel.setText(`${stats.playerCount} ${i18next.t("menu:playersOnline")}`);
@@ -92,25 +102,55 @@ export default class TitleUiHandler extends OptionSelectUiHandler {
       });
   }
 
+  /** Used solely to display a random Pokémon name in a splash message. */
+  randomPokemon(): void {
+    const rand = randInt(1025, 1);
+    const pokemon = getPokemonSpecies(rand as Species);
+    if (
+      this.splashMessage === "splashMessages:underratedPokemon" ||
+      this.splashMessage === "splashMessages:dontTalkAboutThePokemonIncident" ||
+      this.splashMessage === "splashMessages:aWildPokemonAppeared" ||
+      this.splashMessage === "splashMessages:aprilFools.removedPokemon"
+    ) {
+      this.splashMessageText.setText(i18next.t(this.splashMessage, { pokemonName: pokemon.name }));
+    }
+  }
+
+  /** Used for a specific April Fools splash message. */
+  genderSplash(): void {
+    if (this.splashMessage === "splashMessages:aprilFools.helloKyleAmber") {
+      globalScene.gameData.gender === PlayerGender.MALE
+        ? this.splashMessageText.setText(i18next.t(this.splashMessage, { name: i18next.t("trainerNames:player_m") }))
+        : this.splashMessageText.setText(i18next.t(this.splashMessage, { name: i18next.t("trainerNames:player_f") }));
+    }
+  }
+
   show(args: any[]): boolean {
     const ret = super.show(args);
 
     if (ret) {
       // Moving player count to top of the menu
-      this.playerCountLabel.setY((globalScene.game.canvas.height / 6) - 13 - this.getWindowHeight());
+      this.playerCountLabel.setY(globalScene.game.canvas.height / 6 - 13 - this.getWindowHeight());
 
-      this.splashMessage = Utils.randItem(getSplashMessages());
-      this.splashMessageText.setText(i18next.t(this.splashMessage, { count: TitleUiHandler.BATTLES_WON_FALLBACK }));
+      this.splashMessage = randItem(getSplashMessages());
+      this.splashMessageText.setText(
+        i18next.t(this.splashMessage, {
+          count: TitleUiHandler.BATTLES_WON_FALLBACK,
+        }),
+      );
 
       this.appVersionText.setText("v" + version);
 
       const ui = this.getUi();
 
-      if (globalScene.eventManager.isEventActive()) {
+      if (timedEventManager.isEventActive()) {
         this.eventDisplay.setWidth(globalScene.scaledCanvas.width - this.optionSelectBg.width - this.optionSelectBg.x);
         this.eventDisplay.show();
       }
 
+      this.randomPokemon();
+      this.genderSplash();
+
       this.updateTitleStats();
 
       this.titleStatsTimer = setInterval(() => {
@@ -118,10 +158,10 @@ export default class TitleUiHandler extends OptionSelectUiHandler {
       }, 60000);
 
       globalScene.tweens.add({
-        targets: [ this.titleContainer, ui.getMessageHandler().bg ],
-        duration: Utils.fixedInt(325),
-        alpha: (target: any) => target === this.titleContainer ? 1 : 0,
-        ease: "Sine.easeInOut"
+        targets: [this.titleContainer, ui.getMessageHandler().bg],
+        duration: fixedInt(325),
+        alpha: (target: any) => (target === this.titleContainer ? 1 : 0),
+        ease: "Sine.easeInOut",
       });
     }
 
@@ -139,10 +179,10 @@ export default class TitleUiHandler extends OptionSelectUiHandler {
     this.titleStatsTimer = null;
 
     globalScene.tweens.add({
-      targets: [ this.titleContainer, ui.getMessageHandler().bg ],
-      duration: Utils.fixedInt(325),
-      alpha: (target: any) => target === this.titleContainer ? 0 : 1,
-      ease: "Sine.easeInOut"
+      targets: [this.titleContainer, ui.getMessageHandler().bg],
+      duration: fixedInt(325),
+      alpha: (target: any) => (target === this.titleContainer ? 0 : 1),
+      ease: "Sine.easeInOut",
     });
   }
 }
diff --git a/src/ui/ui-handler.ts b/src/ui/ui-handler.ts
index f001ab5bd6f..d3784c1225c 100644
--- a/src/ui/ui-handler.ts
+++ b/src/ui/ui-handler.ts
@@ -1,7 +1,7 @@
 import { globalScene } from "#app/global-scene";
 import type { TextStyle } from "./text";
 import { getTextColor } from "./text";
-import type { Mode } from "./ui";
+import type { UiMode } from "#enums/ui-mode";
 import type { Button } from "#enums/buttons";
 
 /**
@@ -9,13 +9,13 @@ import type { Button } from "#enums/buttons";
  */
 export default abstract class UiHandler {
   protected mode: number | null;
-  protected cursor: number = 0;
-  public active: boolean = false;
+  protected cursor = 0;
+  public active = false;
 
   /**
    * @param mode The mode of the UI element. These should be unique.
    */
-  constructor(mode: Mode | null = null) {
+  constructor(mode: UiMode | null = null) {
     this.mode = mode;
   }
 
@@ -33,7 +33,7 @@ export default abstract class UiHandler {
     return globalScene.ui;
   }
 
-  getTextColor(style: TextStyle, shadow: boolean = false): string {
+  getTextColor(style: TextStyle, shadow = false): string {
     return getTextColor(style, shadow, globalScene.uiTheme);
   }
 
diff --git a/src/ui/ui-theme.ts b/src/ui/ui-theme.ts
index 36e2e844a56..c3931aea23b 100644
--- a/src/ui/ui-theme.ts
+++ b/src/ui/ui-theme.ts
@@ -5,7 +5,7 @@ import { globalScene } from "#app/global-scene";
 export enum WindowVariant {
   NORMAL,
   THIN,
-  XTHIN
+  XTHIN,
 }
 
 export function getWindowVariantSuffix(windowVariant: WindowVariant): string {
@@ -21,29 +21,50 @@ export function getWindowVariantSuffix(windowVariant: WindowVariant): string {
 
 const windowTypeControlColors = {
   [UiTheme.DEFAULT]: {
-    0: [ "#6b5a73", "#DD5748", "#7E4955" ],
-    1: [ "#6b5a73", "#48DDAA", "#4D7574" ],
-    2: [ "#6b5a73", "#C5C5C5", "#766D7E" ],
-    3: [ "#6b5a73", "#EBC07C", "#836C66" ],
-    4: [ "#686868", "#E8E8E8", "#919191" ]
+    0: ["#6b5a73", "#DD5748", "#7E4955"],
+    1: ["#6b5a73", "#48DDAA", "#4D7574"],
+    2: ["#6b5a73", "#C5C5C5", "#766D7E"],
+    3: ["#6b5a73", "#EBC07C", "#836C66"],
+    4: ["#686868", "#E8E8E8", "#919191"],
   },
   [UiTheme.LEGACY]: {
-    0: [ "#706880", "#8888c8", "#484868" ],
-    1: [ "#d04028", "#e0a028", "#902008" ],
-    2: [ "#48b840", "#88d880", "#089040" ],
-    3: [ "#2068d0", "#80b0e0", "#104888" ],
-    4: [ "#706880", "#8888c8", "#484868" ]
-  }
+    0: ["#706880", "#8888c8", "#484868"],
+    1: ["#d04028", "#e0a028", "#902008"],
+    2: ["#48b840", "#88d880", "#089040"],
+    3: ["#2068d0", "#80b0e0", "#104888"],
+    4: ["#706880", "#8888c8", "#484868"],
+  },
 };
 
-export function addWindow(x: number, y: number, width: number, height: number, mergeMaskTop?: boolean, mergeMaskLeft?: boolean, maskOffsetX?: number, maskOffsetY?: number, windowVariant?: WindowVariant): Phaser.GameObjects.NineSlice {
+export function addWindow(
+  x: number,
+  y: number,
+  width: number,
+  height: number,
+  mergeMaskTop?: boolean,
+  mergeMaskLeft?: boolean,
+  maskOffsetX?: number,
+  maskOffsetY?: number,
+  windowVariant?: WindowVariant,
+): Phaser.GameObjects.NineSlice {
   if (windowVariant === undefined) {
     windowVariant = WindowVariant.NORMAL;
   }
 
   const borderSize = globalScene.uiTheme ? 6 : 8;
 
-  const window = globalScene.add.nineslice(x, y, `window_${globalScene.windowType}${getWindowVariantSuffix(windowVariant)}`, undefined, width, height, borderSize, borderSize, borderSize, borderSize);
+  const window = globalScene.add.nineslice(
+    x,
+    y,
+    `window_${globalScene.windowType}${getWindowVariantSuffix(windowVariant)}`,
+    undefined,
+    width,
+    height,
+    borderSize,
+    borderSize,
+    borderSize,
+    borderSize,
+  );
   window.setOrigin(0, 0);
 
   if (mergeMaskLeft || mergeMaskTop || maskOffsetX || maskOffsetY) {
@@ -55,11 +76,11 @@ export function addWindow(x: number, y: number, width: number, height: number, m
      */
     const maskRect = new Phaser.GameObjects.Rectangle(
       globalScene,
-      6 * (x  - (mergeMaskLeft ? 2 : 0) - (maskOffsetX || 0)),
+      6 * (x - (mergeMaskLeft ? 2 : 0) - (maskOffsetX || 0)),
       6 * (y + (mergeMaskTop ? 2 : 0) + (maskOffsetY || 0)),
       width - (mergeMaskLeft ? 2 : 0),
       height - (mergeMaskTop ? 2 : 0),
-      0xffffff
+      0xffffff,
     );
     maskRect.setOrigin(0);
     maskRect.setScale(6);
@@ -85,7 +106,14 @@ export function updateWindowType(windowTypeIndex: number): void {
       }
     } else if (object instanceof Phaser.GameObjects.NineSlice) {
       if (object.texture.key.startsWith("window_")) {
-        windowObjects.push([ object, object.texture.key.endsWith(getWindowVariantSuffix(WindowVariant.XTHIN)) ? WindowVariant.XTHIN : object.texture.key.endsWith(getWindowVariantSuffix(WindowVariant.THIN)) ? WindowVariant.THIN : WindowVariant.NORMAL ]);
+        windowObjects.push([
+          object,
+          object.texture.key.endsWith(getWindowVariantSuffix(WindowVariant.XTHIN))
+            ? WindowVariant.XTHIN
+            : object.texture.key.endsWith(getWindowVariantSuffix(WindowVariant.THIN))
+              ? WindowVariant.THIN
+              : WindowVariant.NORMAL,
+        ]);
       } else if (object.texture?.key === "namebox") {
         themedObjects.push(object);
       }
@@ -101,11 +129,13 @@ export function updateWindowType(windowTypeIndex: number): void {
   globalScene.windowType = windowTypeIndex;
 
   const rootStyle = document.documentElement.style;
-  [ "base", "light", "dark" ].map((k, i) => rootStyle.setProperty(`--color-${k}`, windowTypeControlColors[globalScene.uiTheme][windowTypeIndex - 1][i]));
+  ["base", "light", "dark"].map((k, i) =>
+    rootStyle.setProperty(`--color-${k}`, windowTypeControlColors[globalScene.uiTheme][windowTypeIndex - 1][i]),
+  );
 
   const windowKey = `window_${windowTypeIndex}`;
 
-  for (const [ window, variant ] of windowObjects) {
+  for (const [window, variant] of windowObjects) {
     window.setTexture(`${windowKey}${getWindowVariantSuffix(variant)}`);
   }
 
@@ -116,54 +146,91 @@ export function updateWindowType(windowTypeIndex: number): void {
 
 export function addUiThemeOverrides(): void {
   const originalAddImage = globalScene.add.image;
-  globalScene.add.image = function (x: number, y: number, texture: string | Phaser.Textures.Texture, frame?: string | number): Phaser.GameObjects.Image {
+  globalScene.add.image = function (
+    x: number,
+    y: number,
+    texture: string | Phaser.Textures.Texture,
+    frame?: string | number,
+  ): Phaser.GameObjects.Image {
     let legacy = false;
     if (typeof texture === "string" && globalScene.uiTheme && legacyCompatibleImages.includes(texture)) {
       legacy = true;
       texture += "_legacy";
     }
-    const ret: Phaser.GameObjects.Image = originalAddImage.apply(this, [ x, y, texture, frame ]);
+    const ret: Phaser.GameObjects.Image = originalAddImage.apply(this, [x, y, texture, frame]);
     if (legacy) {
       const originalSetTexture = ret.setTexture;
       ret.setTexture = function (key: string, frame?: string | number) {
         key += "_legacy";
-        return originalSetTexture.apply(this, [ key, frame ]);
+        return originalSetTexture.apply(this, [key, frame]);
       };
     }
     return ret;
   };
 
   const originalAddSprite = globalScene.add.sprite;
-  globalScene.add.sprite = function (x: number, y: number, texture: string | Phaser.Textures.Texture, frame?: string | number): Phaser.GameObjects.Sprite {
+  globalScene.add.sprite = function (
+    x: number,
+    y: number,
+    texture: string | Phaser.Textures.Texture,
+    frame?: string | number,
+  ): Phaser.GameObjects.Sprite {
     let legacy = false;
     if (typeof texture === "string" && globalScene.uiTheme && legacyCompatibleImages.includes(texture)) {
       legacy = true;
       texture += "_legacy";
     }
-    const ret: Phaser.GameObjects.Sprite = originalAddSprite.apply(this, [ x, y, texture, frame ]);
+    const ret: Phaser.GameObjects.Sprite = originalAddSprite.apply(this, [x, y, texture, frame]);
     if (legacy) {
       const originalSetTexture = ret.setTexture;
       ret.setTexture = function (key: string, frame?: string | number) {
         key += "_legacy";
-        return originalSetTexture.apply(this, [ key, frame ]);
+        return originalSetTexture.apply(this, [key, frame]);
       };
     }
     return ret;
   };
 
   const originalAddNineslice = globalScene.add.nineslice;
-  globalScene.add.nineslice = function (x: number, y: number, texture: string | Phaser.Textures.Texture, frame?: string | number, width?: number, height?: number, leftWidth?: number, rightWidth?: number, topHeight?: number, bottomHeight?: number): Phaser.GameObjects.NineSlice {
+  globalScene.add.nineslice = function (
+    x: number,
+    y: number,
+    texture: string | Phaser.Textures.Texture,
+    frame?: string | number,
+    width?: number,
+    height?: number,
+    leftWidth?: number,
+    rightWidth?: number,
+    topHeight?: number,
+    bottomHeight?: number,
+  ): Phaser.GameObjects.NineSlice {
     let legacy = false;
     if (typeof texture === "string" && globalScene.uiTheme && legacyCompatibleImages.includes(texture)) {
       legacy = true;
       texture += "_legacy";
     }
-    const ret: Phaser.GameObjects.NineSlice = originalAddNineslice.apply(this, [ x, y, texture, frame, width, height, leftWidth, rightWidth, topHeight, bottomHeight ]);
+    const ret: Phaser.GameObjects.NineSlice = originalAddNineslice.apply(this, [
+      x,
+      y,
+      texture,
+      frame,
+      width,
+      height,
+      leftWidth,
+      rightWidth,
+      topHeight,
+      bottomHeight,
+    ]);
     if (legacy) {
       const originalSetTexture = ret.setTexture;
-      ret.setTexture = function (key: string | Phaser.Textures.Texture, frame?: string | number, updateSize?: boolean, updateOrigin?: boolean) {
+      ret.setTexture = function (
+        key: string | Phaser.Textures.Texture,
+        frame?: string | number,
+        updateSize?: boolean,
+        updateOrigin?: boolean,
+      ) {
         key += "_legacy";
-        return originalSetTexture.apply(this, [ key, frame, updateSize, updateOrigin ]);
+        return originalSetTexture.apply(this, [key, frame, updateSize, updateOrigin]);
       };
     }
     return ret;
diff --git a/src/ui/ui.ts b/src/ui/ui.ts
index 7fbd10b4668..ad496df6382 100644
--- a/src/ui/ui.ts
+++ b/src/ui/ui.ts
@@ -28,7 +28,7 @@ import { addWindow } from "./ui-theme";
 import LoginFormUiHandler from "./login-form-ui-handler";
 import RegistrationFormUiHandler from "./registration-form-ui-handler";
 import LoadingModalUiHandler from "./loading-modal-ui-handler";
-import * as Utils from "../utils";
+import { executeIf } from "#app/utils/common";
 import GameStatsUiHandler from "./game-stats-ui-handler";
 import AwaitableUiHandler from "./awaitable-ui-handler";
 import SaveSlotSelectUiHandler from "./save-slot-select-ui-handler";
@@ -57,102 +57,55 @@ import MysteryEncounterUiHandler from "./mystery-encounter-ui-handler";
 import PokedexScanUiHandler from "./pokedex-scan-ui-handler";
 import PokedexPageUiHandler from "./pokedex-page-ui-handler";
 import { NavigationManager } from "./settings/navigationMenu";
-
-export enum Mode {
-  MESSAGE,
-  TITLE,
-  COMMAND,
-  FIGHT,
-  BALL,
-  TARGET_SELECT,
-  MODIFIER_SELECT,
-  SAVE_SLOT,
-  PARTY,
-  SUMMARY,
-  STARTER_SELECT,
-  EVOLUTION_SCENE,
-  EGG_HATCH_SCENE,
-  EGG_HATCH_SUMMARY,
-  CONFIRM,
-  OPTION_SELECT,
-  MENU,
-  MENU_OPTION_SELECT,
-  SETTINGS,
-  SETTINGS_DISPLAY,
-  SETTINGS_AUDIO,
-  SETTINGS_GAMEPAD,
-  GAMEPAD_BINDING,
-  SETTINGS_KEYBOARD,
-  KEYBOARD_BINDING,
-  ACHIEVEMENTS,
-  GAME_STATS,
-  EGG_LIST,
-  EGG_GACHA,
-  POKEDEX,
-  POKEDEX_SCAN,
-  POKEDEX_PAGE,
-  LOGIN_FORM,
-  REGISTRATION_FORM,
-  LOADING,
-  SESSION_RELOAD,
-  UNAVAILABLE,
-  CHALLENGE_SELECT,
-  RENAME_POKEMON,
-  RUN_HISTORY,
-  RUN_INFO,
-  TEST_DIALOGUE,
-  AUTO_COMPLETE,
-  ADMIN,
-  MYSTERY_ENCOUNTER
-}
+import { UiMode } from "#enums/ui-mode";
 
 const transitionModes = [
-  Mode.SAVE_SLOT,
-  Mode.PARTY,
-  Mode.SUMMARY,
-  Mode.STARTER_SELECT,
-  Mode.EVOLUTION_SCENE,
-  Mode.EGG_HATCH_SCENE,
-  Mode.EGG_LIST,
-  Mode.EGG_GACHA,
-  Mode.POKEDEX,
-  Mode.POKEDEX_PAGE,
-  Mode.CHALLENGE_SELECT,
-  Mode.RUN_HISTORY,
+  UiMode.SAVE_SLOT,
+  UiMode.PARTY,
+  UiMode.SUMMARY,
+  UiMode.STARTER_SELECT,
+  UiMode.EVOLUTION_SCENE,
+  UiMode.EGG_HATCH_SCENE,
+  UiMode.EGG_LIST,
+  UiMode.EGG_GACHA,
+  UiMode.POKEDEX,
+  UiMode.POKEDEX_PAGE,
+  UiMode.CHALLENGE_SELECT,
+  UiMode.RUN_HISTORY,
 ];
 
 const noTransitionModes = [
-  Mode.TITLE,
-  Mode.CONFIRM,
-  Mode.OPTION_SELECT,
-  Mode.MENU,
-  Mode.MENU_OPTION_SELECT,
-  Mode.GAMEPAD_BINDING,
-  Mode.KEYBOARD_BINDING,
-  Mode.SETTINGS,
-  Mode.SETTINGS_AUDIO,
-  Mode.SETTINGS_DISPLAY,
-  Mode.SETTINGS_GAMEPAD,
-  Mode.SETTINGS_KEYBOARD,
-  Mode.ACHIEVEMENTS,
-  Mode.GAME_STATS,
-  Mode.POKEDEX_SCAN,
-  Mode.LOGIN_FORM,
-  Mode.REGISTRATION_FORM,
-  Mode.LOADING,
-  Mode.SESSION_RELOAD,
-  Mode.UNAVAILABLE,
-  Mode.RENAME_POKEMON,
-  Mode.TEST_DIALOGUE,
-  Mode.AUTO_COMPLETE,
-  Mode.ADMIN,
-  Mode.MYSTERY_ENCOUNTER,
-  Mode.RUN_INFO
+  UiMode.TITLE,
+  UiMode.CONFIRM,
+  UiMode.OPTION_SELECT,
+  UiMode.MENU,
+  UiMode.MENU_OPTION_SELECT,
+  UiMode.GAMEPAD_BINDING,
+  UiMode.KEYBOARD_BINDING,
+  UiMode.SETTINGS,
+  UiMode.SETTINGS_AUDIO,
+  UiMode.SETTINGS_DISPLAY,
+  UiMode.SETTINGS_GAMEPAD,
+  UiMode.SETTINGS_KEYBOARD,
+  UiMode.ACHIEVEMENTS,
+  UiMode.GAME_STATS,
+  UiMode.POKEDEX_SCAN,
+  UiMode.LOGIN_FORM,
+  UiMode.REGISTRATION_FORM,
+  UiMode.LOADING,
+  UiMode.SESSION_RELOAD,
+  UiMode.UNAVAILABLE,
+  UiMode.RENAME_POKEMON,
+  UiMode.TEST_DIALOGUE,
+  UiMode.AUTO_COMPLETE,
+  UiMode.ADMIN,
+  UiMode.MYSTERY_ENCOUNTER,
+  UiMode.RUN_INFO,
 ];
 
 export default class UI extends Phaser.GameObjects.Container {
-  private mode: Mode;
-  private modeChain: Mode[];
+  private mode: UiMode;
+  private modeChain: UiMode[];
   public handlers: UiHandler[];
   private overlay: Phaser.GameObjects.Rectangle;
   public achvBar: AchvBar;
@@ -169,7 +122,7 @@ export default class UI extends Phaser.GameObjects.Container {
   constructor() {
     super(globalScene, 0, globalScene.game.canvas.height / 6);
 
-    this.mode = Mode.MESSAGE;
+    this.mode = UiMode.MESSAGE;
     this.modeChain = [];
     this.handlers = [
       new BattleMessageUiHandler(),
@@ -189,7 +142,7 @@ export default class UI extends Phaser.GameObjects.Container {
       new ConfirmUiHandler(),
       new OptionSelectUiHandler(),
       new MenuUiHandler(),
-      new OptionSelectUiHandler(Mode.MENU_OPTION_SELECT),
+      new OptionSelectUiHandler(UiMode.MENU_OPTION_SELECT),
       // settings
       new SettingsUiHandler(),
       new SettingsDisplayUiHandler(),
@@ -203,7 +156,7 @@ export default class UI extends Phaser.GameObjects.Container {
       new EggListUiHandler(),
       new EggGachaUiHandler(),
       new PokedexUiHandler(),
-      new PokedexScanUiHandler(Mode.TEST_DIALOGUE),
+      new PokedexScanUiHandler(UiMode.TEST_DIALOGUE),
       new PokedexPageUiHandler(),
       new LoginFormUiHandler(),
       new RegistrationFormUiHandler(),
@@ -214,7 +167,7 @@ export default class UI extends Phaser.GameObjects.Container {
       new RenameFormUiHandler(),
       new RunHistoryUiHandler(),
       new RunInfoUiHandler(),
-      new TestDialogueUiHandler(Mode.TEST_DIALOGUE),
+      new TestDialogueUiHandler(UiMode.TEST_DIALOGUE),
       new AutoCompleteUiHandler(),
       new AdminUiHandler(),
       new MysteryEncounterUiHandler(),
@@ -222,23 +175,29 @@ export default class UI extends Phaser.GameObjects.Container {
   }
 
   setup(): void {
-    this.setName(`ui-${Mode[this.mode]}`);
+    this.setName(`ui-${UiMode[this.mode]}`);
     for (const handler of this.handlers) {
       handler.setup();
     }
-    this.overlay = globalScene.add.rectangle(0, 0, globalScene.game.canvas.width / 6, globalScene.game.canvas.height / 6, 0);
+    this.overlay = globalScene.add.rectangle(
+      0,
+      0,
+      globalScene.game.canvas.width / 6,
+      globalScene.game.canvas.height / 6,
+      0,
+    );
     this.overlay.setName("rect-ui-overlay");
     this.overlay.setOrigin(0, 0);
     globalScene.uiContainer.add(this.overlay);
     this.overlay.setVisible(false);
     this.setupTooltip();
 
-    this.achvBar = new AchvBar;
+    this.achvBar = new AchvBar();
     this.achvBar.setup();
 
     globalScene.uiContainer.add(this.achvBar);
 
-    this.savingIcon = new SavingIconHandler;
+    this.savingIcon = new SavingIconHandler();
     this.savingIcon.setup();
 
     globalScene.uiContainer.add(this.savingIcon);
@@ -273,7 +232,7 @@ export default class UI extends Phaser.GameObjects.Container {
   }
 
   getMessageHandler(): BattleMessageUiHandler {
-    return this.handlers[Mode.MESSAGE] as BattleMessageUiHandler;
+    return this.handlers[UiMode.MESSAGE] as BattleMessageUiHandler;
   }
 
   processInfoButton(pressed: boolean) {
@@ -281,7 +240,7 @@ export default class UI extends Phaser.GameObjects.Container {
       return false;
     }
 
-    if ([ Mode.CONFIRM, Mode.COMMAND, Mode.FIGHT, Mode.MESSAGE, Mode.TARGET_SELECT ].includes(this.mode)) {
+    if ([UiMode.CONFIRM, UiMode.COMMAND, UiMode.FIGHT, UiMode.MESSAGE, UiMode.TARGET_SELECT].includes(this.mode)) {
       globalScene?.processInfoButton(pressed);
       return true;
     }
@@ -308,40 +267,65 @@ export default class UI extends Phaser.GameObjects.Container {
     return handler.processInput(button);
   }
 
-  showTextPromise(text: string, callbackDelay: number = 0, prompt: boolean = true, promptDelay?: number | null): Promise<void> {
+  showTextPromise(text: string, callbackDelay = 0, prompt = true, promptDelay?: number | null): Promise<void> {
     return new Promise<void>(resolve => {
       this.showText(text ?? "", null, () => resolve(), callbackDelay, prompt, promptDelay);
     });
   }
 
-  showText(text: string, delay?: number | null, callback?: Function | null, callbackDelay?: number | null, prompt?: boolean | null, promptDelay?: number | null): void {
+  showText(
+    text: string,
+    delay?: number | null,
+    callback?: Function | null,
+    callbackDelay?: number | null,
+    prompt?: boolean | null,
+    promptDelay?: number | null,
+  ): void {
+    const pokename: string[] = [];
+    const repname = ["#POKEMON1", "#POKEMON2"];
+    for (let p = 0; p < globalScene.getPlayerField().length; p++) {
+      pokename.push(globalScene.getPlayerField()[p].getNameToRender());
+      text = text.split(pokename[p]).join(repname[p]);
+    }
     if (prompt && text.indexOf("$") > -1) {
       const messagePages = text.split(/\$/g).map(m => m.trim());
+      // biome-ignore lint/complexity/useOptionalChain: optional chain would change this to be null instead of undefined.
       let showMessageAndCallback = () => callback && callback();
       for (let p = messagePages.length - 1; p >= 0; p--) {
         const originalFunc = showMessageAndCallback;
+        messagePages[p] = messagePages[p].split(repname[0]).join(pokename[0]);
+        messagePages[p] = messagePages[p].split(repname[1]).join(pokename[1]);
         showMessageAndCallback = () => this.showText(messagePages[p], null, originalFunc, null, true);
       }
       showMessageAndCallback();
     } else {
       const handler = this.getHandler();
+      for (let p = 0; p < globalScene.getPlayerField().length; p++) {
+        text = text.split(repname[p]).join(pokename[p]);
+      }
       if (handler instanceof MessageUiHandler) {
         (handler as MessageUiHandler).showText(text, delay, callback, callbackDelay, prompt, promptDelay);
       } else {
         this.getMessageHandler().showText(text, delay, callback, callbackDelay, prompt, promptDelay);
       }
-
     }
   }
 
-  showDialogue(keyOrText: string, name: string | undefined, delay: number | null = 0, callback: Function, callbackDelay?: number, promptDelay?: number): void {
+  showDialogue(
+    keyOrText: string,
+    name: string | undefined,
+    delay: number | null = 0,
+    callback: Function,
+    callbackDelay?: number,
+    promptDelay?: number,
+  ): void {
     // Get localized dialogue (if available)
     let hasi18n = false;
     let text = keyOrText;
     const genderIndex = globalScene.gameData.gender ?? PlayerGender.UNSET;
     const genderStr = PlayerGender[genderIndex].toLowerCase();
 
-    if (i18next.exists(keyOrText) ) {
+    if (i18next.exists(keyOrText)) {
       const i18nKey = keyOrText;
       hasi18n = true;
 
@@ -368,15 +352,31 @@ export default class UI extends Phaser.GameObjects.Container {
     } else {
       const handler = this.getHandler();
       if (handler instanceof MessageUiHandler) {
-        (handler as MessageUiHandler).showDialogue(text, name, delay, showMessageAndCallback, callbackDelay, true, promptDelay);
+        (handler as MessageUiHandler).showDialogue(
+          text,
+          name,
+          delay,
+          showMessageAndCallback,
+          callbackDelay,
+          true,
+          promptDelay,
+        );
       } else {
-        this.getMessageHandler().showDialogue(text, name, delay, showMessageAndCallback, callbackDelay, true, promptDelay);
+        this.getMessageHandler().showDialogue(
+          text,
+          name,
+          delay,
+          showMessageAndCallback,
+          callbackDelay,
+          true,
+          promptDelay,
+        );
       }
     }
   }
 
   shouldSkipDialogue(i18nKey: string): boolean {
-    if (i18next.exists(i18nKey) ) {
+    if (i18next.exists(i18nKey)) {
       if (globalScene.skipSeenDialogues && globalScene.gameData.getSeenDialogues()[i18nKey] === true) {
         return true;
       }
@@ -385,7 +385,11 @@ export default class UI extends Phaser.GameObjects.Container {
   }
 
   getTooltip(): { visible: boolean; title: string; content: string } {
-    return { visible: this.tooltipContainer.visible, title: this.tooltipTitle.text, content: this.tooltipContent.text };
+    return {
+      visible: this.tooltipContainer.visible,
+      title: this.tooltipTitle.text,
+      content: this.tooltipContent.text,
+    };
   }
 
   showTooltip(title: string, content: string, overlap?: boolean): void {
@@ -403,7 +407,10 @@ export default class UI extends Phaser.GameObjects.Container {
     const wrappedContent = this.tooltipContent.runWordWrap(content);
     this.tooltipContent.setText(wrappedContent);
     this.tooltipContent.y = title ? 16 : 4;
-    this.tooltipBg.width = Math.min(Math.max(this.tooltipTitle.displayWidth, this.tooltipContent.displayWidth) + 12, 838);
+    this.tooltipBg.width = Math.min(
+      Math.max(this.tooltipTitle.displayWidth, this.tooltipContent.displayWidth) + 12,
+      838,
+    );
     this.tooltipBg.height = (title ? 31 : 19) + 10.5 * (wrappedContent.split("\n").length - 1);
     this.tooltipTitle.x = this.tooltipBg.width / 2;
   }
@@ -485,7 +492,7 @@ export default class UI extends Phaser.GameObjects.Container {
         alpha: 1,
         duration: duration,
         ease: "Sine.easeOut",
-        onComplete: () => resolve()
+        onComplete: () => resolve(),
       });
     });
   }
@@ -503,13 +510,19 @@ export default class UI extends Phaser.GameObjects.Container {
         onComplete: () => {
           this.overlay.setVisible(false);
           resolve();
-        }
+        },
       });
       this.overlayActive = false;
     });
   }
 
-  private setModeInternal(mode: Mode, clear: boolean, forceTransition: boolean, chainMode: boolean, args: any[]): Promise<void> {
+  private setModeInternal(
+    mode: UiMode,
+    clear: boolean,
+    forceTransition: boolean,
+    chainMode: boolean,
+    args: any[],
+  ): Promise<void> {
     return new Promise(resolve => {
       if (this.mode === mode && !forceTransition) {
         resolve();
@@ -527,15 +540,19 @@ export default class UI extends Phaser.GameObjects.Container {
           this.mode = mode;
           const touchControls = document?.getElementById("touchControls");
           if (touchControls) {
-            touchControls.dataset.uiMode = Mode[mode];
+            touchControls.dataset.uiMode = UiMode[mode];
           }
           this.getHandler().show(args);
         }
         resolve();
       };
-      if (((!chainMode && ((transitionModes.indexOf(this.mode) > -1 || transitionModes.indexOf(mode) > -1)
-        && (noTransitionModes.indexOf(this.mode) === -1 && noTransitionModes.indexOf(mode) === -1)))
-        || (chainMode && noTransitionModes.indexOf(mode) === -1))) {
+      if (
+        (!chainMode &&
+          (transitionModes.indexOf(this.mode) > -1 || transitionModes.indexOf(mode) > -1) &&
+          noTransitionModes.indexOf(this.mode) === -1 &&
+          noTransitionModes.indexOf(mode) === -1) ||
+        (chainMode && noTransitionModes.indexOf(mode) === -1)
+      ) {
         this.fadeOut(250).then(() => {
           globalScene.time.delayedCall(100, () => {
             doSetMode();
@@ -548,23 +565,23 @@ export default class UI extends Phaser.GameObjects.Container {
     });
   }
 
-  getMode(): Mode {
+  getMode(): UiMode {
     return this.mode;
   }
 
-  setMode(mode: Mode, ...args: any[]): Promise<void> {
+  setMode(mode: UiMode, ...args: any[]): Promise<void> {
     return this.setModeInternal(mode, true, false, false, args);
   }
 
-  setModeForceTransition(mode: Mode, ...args: any[]): Promise<void> {
+  setModeForceTransition(mode: UiMode, ...args: any[]): Promise<void> {
     return this.setModeInternal(mode, true, true, false, args);
   }
 
-  setModeWithoutClear(mode: Mode, ...args: any[]): Promise<void> {
+  setModeWithoutClear(mode: UiMode, ...args: any[]): Promise<void> {
     return this.setModeInternal(mode, false, false, false, args);
   }
 
-  setOverlayMode(mode: Mode, ...args: any[]): Promise<void> {
+  setOverlayMode(mode: UiMode, ...args: any[]): Promise<void> {
     return this.setModeInternal(mode, false, false, true, args);
   }
 
@@ -575,7 +592,6 @@ export default class UI extends Phaser.GameObjects.Container {
 
   revertMode(): Promise<boolean> {
     return new Promise<boolean>(resolve => {
-
       if (!this?.modeChain?.length) {
         return resolve(false);
       }
@@ -588,7 +604,7 @@ export default class UI extends Phaser.GameObjects.Container {
         globalScene.updateGameInfo();
         const touchControls = document.getElementById("touchControls");
         if (touchControls) {
-          touchControls.dataset.uiMode = Mode[this.mode];
+          touchControls.dataset.uiMode = UiMode[this.mode];
         }
         resolve(true);
       };
@@ -611,11 +627,11 @@ export default class UI extends Phaser.GameObjects.Container {
       if (!this?.modeChain?.length) {
         return resolve();
       }
-      this.revertMode().then(success => Utils.executeIf(success, this.revertModes).then(() => resolve()));
+      this.revertMode().then(success => executeIf(success, this.revertModes).then(() => resolve()));
     });
   }
 
-  public getModeChain(): Mode[] {
+  public getModeChain(): UiMode[] {
     return this.modeChain;
   }
 
@@ -629,9 +645,8 @@ export default class UI extends Phaser.GameObjects.Container {
   public getGamepadType(): string {
     if (globalScene.inputMethod === "gamepad") {
       return globalScene.inputController.getConfig(globalScene.inputController.selectedDevice[Device.GAMEPAD]).padType;
-    } else {
-      return globalScene.inputMethod;
     }
+    return globalScene.inputMethod;
   }
 
   /**
diff --git a/src/ui/unavailable-modal-ui-handler.ts b/src/ui/unavailable-modal-ui-handler.ts
index 36f1a191b77..5bed55ec24a 100644
--- a/src/ui/unavailable-modal-ui-handler.ts
+++ b/src/ui/unavailable-modal-ui-handler.ts
@@ -1,9 +1,10 @@
 import type { ModalConfig } from "./modal-ui-handler";
 import { ModalUiHandler } from "./modal-ui-handler";
 import { addTextObject, TextStyle } from "./text";
-import type { Mode } from "./ui";
+import type { UiMode } from "#enums/ui-mode";
 import { updateUserInfo } from "#app/account";
-import * as Utils from "#app/utils";
+import { sessionIdKey } from "#app/utils/common";
+import { removeCookie } from "#app/utils/cookies";
 import i18next from "i18next";
 import { globalScene } from "#app/global-scene";
 
@@ -17,7 +18,7 @@ export default class UnavailableModalUiHandler extends ModalUiHandler {
 
   private readonly randVarianceTime = 1000 * 10;
 
-  constructor(mode: Mode | null = null) {
+  constructor(mode: UiMode | null = null) {
     super(mode);
     this.reconnectDuration = this.minTime;
   }
@@ -35,17 +36,23 @@ export default class UnavailableModalUiHandler extends ModalUiHandler {
   }
 
   getMargin(): [number, number, number, number] {
-    return [ 0, 0, 48, 0 ];
+    return [0, 0, 48, 0];
   }
 
   getButtonLabels(): string[] {
-    return [ ];
+    return [];
   }
 
   setup(): void {
     super.setup();
 
-    const label = addTextObject(this.getWidth() / 2, this.getHeight() / 2, i18next.t("menu:errorServerDown"), TextStyle.WINDOW, { fontSize: "48px", align: "center" });
+    const label = addTextObject(
+      this.getWidth() / 2,
+      this.getHeight() / 2,
+      i18next.t("menu:errorServerDown"),
+      TextStyle.WINDOW,
+      { fontSize: "48px", align: "center" },
+    );
     label.setOrigin(0.5, 0.5);
 
     this.modalContainer.add(label);
@@ -53,21 +60,21 @@ export default class UnavailableModalUiHandler extends ModalUiHandler {
 
   tryReconnect(): void {
     updateUserInfo().then(response => {
-      if (response[0] || [ 200, 400 ].includes(response[1])) {
+      if (response[0] || [200, 400].includes(response[1])) {
         this.reconnectTimer = null;
         this.reconnectDuration = this.minTime;
         globalScene.playSound("se/pb_bounce_1");
         this.reconnectCallback();
       } else if (response[1] === 401) {
-        Utils.removeCookie(Utils.sessionIdKey);
+        removeCookie(sessionIdKey);
         globalScene.reset(true, true);
       } else {
         this.reconnectDuration = Math.min(this.reconnectDuration * 2, this.maxTime); // Set a max delay so it isn't infinite
-        this.reconnectTimer =
-          setTimeout(
-            () => this.tryReconnect(),
-            // Adds a random factor to avoid pendulum effect during long total breakdown
-            this.reconnectDuration + (Math.random() * this.randVarianceTime));
+        this.reconnectTimer = setTimeout(
+          () => this.tryReconnect(),
+          // Adds a random factor to avoid pendulum effect during long total breakdown
+          this.reconnectDuration + Math.random() * this.randVarianceTime,
+        );
       }
     });
   }
@@ -75,14 +82,14 @@ export default class UnavailableModalUiHandler extends ModalUiHandler {
   show(args: any[]): boolean {
     if (args.length >= 1 && args[0] instanceof Function) {
       const config: ModalConfig = {
-        buttonActions: []
+        buttonActions: [],
       };
 
       this.reconnectCallback = args[0];
       this.reconnectDuration = this.minTime;
       this.reconnectTimer = setTimeout(() => this.tryReconnect(), this.reconnectDuration);
 
-      return super.show([ config ]);
+      return super.show([config]);
     }
 
     return false;
diff --git a/src/utils.ts b/src/utils/common.ts
similarity index 69%
rename from src/utils.ts
rename to src/utils/common.ts
index a906ee76391..b9111578e2f 100644
--- a/src/utils.ts
+++ b/src/utils/common.ts
@@ -8,10 +8,14 @@ export type nil = null | undefined;
 export const MissingTextureKey = "__MISSING";
 
 export function toReadableString(str: string): string {
-  return str.replace(/\_/g, " ").split(" ").map(s => `${s.slice(0, 1)}${s.slice(1).toLowerCase()}`).join(" ");
+  return str
+    .replace(/\_/g, " ")
+    .split(" ")
+    .map(s => `${s.slice(0, 1)}${s.slice(1).toLowerCase()}`)
+    .join(" ");
 }
 
-export function randomString(length: number, seeded: boolean = false) {
+export function randomString(length: number, seeded = false) {
   const characters = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
   let result = "";
 
@@ -39,7 +43,7 @@ export function shiftCharCodes(str: string, shiftCount: number) {
   return newStr;
 }
 
-export function randGauss(stdev: number, mean: number = 0): number {
+export function randGauss(stdev: number, mean = 0): number {
   if (!stdev) {
     return 0;
   }
@@ -49,7 +53,7 @@ export function randGauss(stdev: number, mean: number = 0): number {
   return z * stdev + mean;
 }
 
-export function randSeedGauss(stdev: number, mean: number = 0): number {
+export function randSeedGauss(stdev: number, mean = 0): number {
   if (!stdev) {
     return 0;
   }
@@ -71,11 +75,11 @@ export function padInt(value: number, length: number, padWith?: string): string
 }
 
 /**
-* Returns a random integer between min and min + range
-* @param range The amount of possible numbers
-* @param min The starting number
-*/
-export function randInt(range: number, min: number = 0): number {
+ * Returns a random integer between min and min + range
+ * @param range The amount of possible numbers
+ * @param min The starting number
+ */
+export function randInt(range: number, min = 0): number {
   if (range === 1) {
     return min;
   }
@@ -88,38 +92,42 @@ export function randInt(range: number, min: number = 0): number {
  * @param min The minimum integer to pick, default `0`
  * @returns A random integer between {@linkcode min} and ({@linkcode min} + {@linkcode range} - 1)
  */
-export function randSeedInt(range: number, min: number = 0): number {
+export function randSeedInt(range: number, min = 0): number {
   if (range <= 1) {
     return min;
   }
-  return Phaser.Math.RND.integerInRange(min, (range - 1) + min);
+  return Phaser.Math.RND.integerInRange(min, range - 1 + min);
 }
 
 /**
-* Returns a random integer between min and max (non-inclusive)
-* @param min The lowest number
-* @param max The highest number
-*/
+ * Generates a random number using the global seed
+ * @param min The minimum integer to generate
+ * @param max The maximum integer to generate
+ * @returns a random integer between {@linkcode min} and {@linkcode max} inclusive
+ */
+export function randSeedIntRange(min: number, max: number): number {
+  return randSeedInt(max - min + 1, min);
+}
+
+/**
+ * Returns a random integer between min and max (non-inclusive)
+ * @param min The lowest number
+ * @param max The highest number
+ */
 export function randIntRange(min: number, max: number): number {
   return randInt(max - min, min);
 }
 
 export function randItem<T>(items: T[]): T {
-  return items.length === 1
-    ? items[0]
-    : items[randInt(items.length)];
+  return items.length === 1 ? items[0] : items[randInt(items.length)];
 }
 
 export function randSeedItem<T>(items: T[]): T {
-  return items.length === 1
-    ? items[0]
-    : Phaser.Math.RND.pick(items);
+  return items.length === 1 ? items[0] : Phaser.Math.RND.pick(items);
 }
 
 export function randSeedWeightedItem<T>(items: T[]): T {
-  return items.length === 1
-    ? items[0]
-    : Phaser.Math.RND.weightedPick(items);
+  return items.length === 1 ? items[0] : Phaser.Math.RND.weightedPick(items);
 }
 
 /**
@@ -134,7 +142,7 @@ export function randSeedShuffle<T>(items: T[]): T[] {
   const newArray = items.slice(0);
   for (let i = items.length - 1; i > 0; i--) {
     const j = Phaser.Math.RND.integerInRange(0, i);
-    [ newArray[i], newArray[j] ] = [ newArray[j], newArray[i] ];
+    [newArray[i], newArray[j]] = [newArray[j], newArray[i]];
   }
   return newArray;
 }
@@ -145,15 +153,15 @@ export function getFrameMs(frameCount: number): number {
 
 export function getCurrentTime(): number {
   const date = new Date();
-  return (((date.getHours() * 60 + date.getMinutes()) / 1440) + 0.675) % 1;
+  return ((date.getHours() * 60 + date.getMinutes()) / 1440 + 0.675) % 1;
 }
 
 const secondsInHour = 3600;
 
 export function getPlayTimeString(totalSeconds: number): string {
   const days = `${Math.floor(totalSeconds / (secondsInHour * 24))}`;
-  const hours = `${Math.floor(totalSeconds % (secondsInHour * 24) / secondsInHour)}`;
-  const minutes = `${Math.floor(totalSeconds % secondsInHour / 60)}`;
+  const hours = `${Math.floor((totalSeconds % (secondsInHour * 24)) / secondsInHour)}`;
+  const minutes = `${Math.floor((totalSeconds % secondsInHour) / 60)}`;
   const seconds = `${Math.floor(totalSeconds % 60)}`;
 
   return `${days.padStart(2, "0")}:${hours.padStart(2, "0")}:${minutes.padStart(2, "0")}:${seconds.padStart(2, "0")}`;
@@ -167,12 +175,12 @@ export function getPlayTimeString(totalSeconds: number): string {
  */
 export function getIvsFromId(id: number): number[] {
   return [
-    (id & 0x3E000000) >>> 25,
-    (id & 0x01F00000) >>> 20,
-    (id & 0x000F8000) >>> 15,
-    (id & 0x00007C00) >>> 10,
-    (id & 0x000003E0) >>> 5,
-    (id & 0x0000001F)
+    (id & 0x3e000000) >>> 25,
+    (id & 0x01f00000) >>> 20,
+    (id & 0x000f8000) >>> 15,
+    (id & 0x00007c00) >>> 10,
+    (id & 0x000003e0) >>> 5,
+    id & 0x0000001f,
   ];
 }
 
@@ -210,9 +218,9 @@ export function formatLargeNumber(count: number, threshold: number): string {
 }
 
 // Abbreviations from 10^0 to 10^33
-const AbbreviationsLargeNumber: string[] = [ "", "K", "M", "B", "t", "q", "Q", "s", "S", "o", "n", "d" ];
+const AbbreviationsLargeNumber: string[] = ["", "K", "M", "B", "t", "q", "Q", "s", "S", "o", "n", "d"];
 
-export function formatFancyLargeNumber(number: number, rounded: number = 3): string {
+export function formatFancyLargeNumber(number: number, rounded = 3): string {
   let exponent: number;
 
   if (number < 1000) {
@@ -236,16 +244,20 @@ export function formatMoney(format: MoneyFormat, amount: number) {
   return amount.toLocaleString();
 }
 
-export function formatStat(stat: number, forHp: boolean = false): string {
+export function formatStat(stat: number, forHp = false): string {
   return formatLargeNumber(stat, forHp ? 100000 : 1000000);
 }
 
 export function getEnumKeys(enumType: any): string[] {
-  return Object.values(enumType).filter(v => isNaN(parseInt(v!.toString()))).map(v => v!.toString());
+  return Object.values(enumType)
+    .filter(v => Number.isNaN(Number.parseInt(v!.toString())))
+    .map(v => v!.toString());
 }
 
 export function getEnumValues(enumType: any): number[] {
-  return Object.values(enumType).filter(v => !isNaN(parseInt(v!.toString()))).map(v => parseInt(v!.toString()));
+  return Object.values(enumType)
+    .filter(v => !Number.isNaN(Number.parseInt(v!.toString())))
+    .map(v => Number.parseInt(v!.toString()));
 }
 
 export function executeIf<T>(condition: boolean, promiseFunc: () => Promise<T>): Promise<T | null> {
@@ -254,15 +266,16 @@ export function executeIf<T>(condition: boolean, promiseFunc: () => Promise<T>):
 
 export const sessionIdKey = "pokerogue_sessionId";
 // Check if the current hostname is 'localhost' or an IP address, and ensure a port is specified
-export const isLocal = (
-  (window.location.hostname === "localhost" ||
-   /^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$/.test(window.location.hostname)) &&
-  window.location.port !== "") || window.location.hostname === "";
+export const isLocal =
+  ((window.location.hostname === "localhost" || /^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$/.test(window.location.hostname)) &&
+    window.location.port !== "") ||
+  window.location.hostname === "";
 
 /**
  * @deprecated Refer to [pokerogue-api.ts](./plugins/api/pokerogue-api.ts) instead
  */
-export const localServerUrl = import.meta.env.VITE_SERVER_URL ?? `http://${window.location.hostname}:${window.location.port + 1}`;
+export const localServerUrl =
+  import.meta.env.VITE_SERVER_URL ?? `http://${window.location.hostname}:${window.location.port + 1}`;
 
 /**
  * Set the server URL based on whether it's local or not
@@ -273,43 +286,6 @@ export const apiUrl = localServerUrl ?? "https://api.pokerogue.net";
 // used to disable api calls when isLocal is true and a server is not found
 export let isLocalServerConnected = true;
 
-export const isBeta = import.meta.env.MODE === "beta"; // this checks to see if the env mode is development. Technically this gives the same value for beta AND for dev envs
-
-export function setCookie(cName: string, cValue: string): void {
-  const expiration = new Date();
-  expiration.setTime(new Date().getTime() + 3600000 * 24 * 30 * 3/*7*/);
-  document.cookie = `${cName}=${cValue};Secure;SameSite=Strict;Domain=${window.location.hostname};Path=/;Expires=${expiration.toUTCString()}`;
-}
-
-export function removeCookie(cName: string): void {
-  if (isBeta) {
-    document.cookie = `${cName}=;Secure;SameSite=Strict;Domain=pokerogue.net;Path=/;Max-Age=-1`; // we need to remove the cookie from the main domain as well
-  }
-
-  document.cookie = `${cName}=;Secure;SameSite=Strict;Domain=${window.location.hostname};Path=/;Max-Age=-1`;
-  document.cookie = `${cName}=;Secure;SameSite=Strict;Path=/;Max-Age=-1`; // legacy cookie without domain, for older cookies to prevent a login loop
-}
-
-export function getCookie(cName: string): string {
-  // check if there are multiple cookies with the same name and delete them
-  if (document.cookie.split(";").filter(c => c.includes(cName)).length > 1) {
-    removeCookie(cName);
-    return "";
-  }
-  const name = `${cName}=`;
-  const ca = document.cookie.split(";");
-  for (let i = 0; i < ca.length; i++) {
-    let c = ca[i];
-    while (c.charAt(0) === " ") {
-      c = c.substring(1);
-    }
-    if (c.indexOf(name) === 0) {
-      return c.substring(name.length, c.length);
-    }
-  }
-  return "";
-}
-
 /**
  * When locally running the game, "pings" the local server
  * with a GET request to verify if a server is running,
@@ -324,7 +300,7 @@ export async function localPing() {
 }
 
 /** Alias for the constructor of a class */
-export type Constructor<T> = new(...args: unknown[]) => T;
+export type Constructor<T> = new (...args: unknown[]) => T;
 
 export class BooleanHolder {
   public value: boolean;
@@ -342,13 +318,6 @@ export class NumberHolder {
   }
 }
 
-/** @deprecated Use {@linkcode NumberHolder} */
-export class IntegerHolder extends NumberHolder {
-  constructor(value: number) {
-    super(value);
-  }
-}
-
 export class FixedInt {
   public readonly value: number;
 
@@ -379,14 +348,18 @@ export function toCamelCaseString(unformattedText: string): string {
   if (!unformattedText) {
     return "";
   }
-  return unformattedText.split(/[_ ]/).filter(f => f).map((f, i) => i ? `${f[0].toUpperCase()}${f.slice(1).toLowerCase()}` : f.toLowerCase()).join("");
+  return unformattedText
+    .split(/[_ ]/)
+    .filter(f => f)
+    .map((f, i) => (i ? `${f[0].toUpperCase()}${f.slice(1).toLowerCase()}` : f.toLowerCase()))
+    .join("");
 }
 
 export function rgbToHsv(r: number, g: number, b: number) {
   const v = Math.max(r, g, b);
   const c = v - Math.min(r, g, b);
-  const h = c && ((v === r) ? (g - b) / c : ((v === g) ? 2 + (b - r) / c : 4 + (r - g) / c));
-  return [ 60 * (h < 0 ? h + 6 : h), v && c / v, v ];
+  const h = c && (v === r ? (g - b) / c : v === g ? 2 + (b - r) / c : 4 + (r - g) / c);
+  return [60 * (h < 0 ? h + 6 : h), v && c / v, v];
 }
 
 /**
@@ -395,23 +368,26 @@ export function rgbToHsv(r: number, g: number, b: number) {
  * @param {Array} rgb2 Second RGB color in array
  */
 export function deltaRgb(rgb1: number[], rgb2: number[]): number {
-  const [ r1, g1, b1 ] = rgb1;
-  const [ r2, g2, b2 ] = rgb2;
+  const [r1, g1, b1] = rgb1;
+  const [r2, g2, b2] = rgb2;
   const drp2 = Math.pow(r1 - r2, 2);
   const dgp2 = Math.pow(g1 - g2, 2);
   const dbp2 = Math.pow(b1 - b2, 2);
   const t = (r1 + r2) / 2;
 
-  return Math.ceil(Math.sqrt(2 * drp2 + 4 * dgp2 + 3 * dbp2 + t * (drp2 - dbp2) / 256));
+  return Math.ceil(Math.sqrt(2 * drp2 + 4 * dgp2 + 3 * dbp2 + (t * (drp2 - dbp2)) / 256));
 }
 
+// Extract out the rgb values from a hex string
+const hexRegex = /^([\da-f]{2})([\da-f]{2})([\da-f]{2})$/i;
+
 export function rgbHexToRgba(hex: string) {
-  const color = hex.match(/^([\da-f]{2})([\da-f]{2})([\da-f]{2})$/i) ?? [ "000000", "00", "00", "00" ];
+  const color = hex.match(hexRegex) ?? ["000000", "00", "00", "00"];
   return {
-    r: parseInt(color[1], 16),
-    g: parseInt(color[2], 16),
-    b: parseInt(color[3], 16),
-    a: 255
+    r: Number.parseInt(color[1], 16),
+    g: Number.parseInt(color[2], 16),
+    b: Number.parseInt(color[3], 16),
+    a: 255,
   };
 }
 
@@ -434,7 +410,9 @@ export function hslToHex(h: number, s: number, l: number): string {
   const f = (n: number) => {
     const k = (n + h / 30) % 12;
     const rgb = l - a * Math.max(-1, Math.min(k - 3, 9 - k, 1));
-    return Math.round(rgb * 255).toString(16).padStart(2, "0");
+    return Math.round(rgb * 255)
+      .toString(16)
+      .padStart(2, "0");
   };
   return `#${f(0)}${f(8)}${f(4)}`;
 }
@@ -445,7 +423,7 @@ export function hslToHex(h: number, s: number, l: number): string {
  * If the lang is not in the function, it usually means that lang is going to use the default english version
  *
  * English itself counts as not available
-*/
+ */
 export function hasAllLocalizedSprites(lang?: string): boolean {
   // IMPORTANT - ONLY ADD YOUR LANG HERE IF YOU'VE ALREADY ADDED ALL THE NECESSARY IMAGES
   if (!lang) {
@@ -454,6 +432,7 @@ export function hasAllLocalizedSprites(lang?: string): boolean {
 
   switch (lang) {
     case "es-ES":
+    case "es-MX":
     case "fr":
     case "de":
     case "it":
@@ -462,6 +441,7 @@ export function hasAllLocalizedSprites(lang?: string): boolean {
     case "pt-BR":
     case "ko":
     case "ja":
+    case "ca-ES":
       return true;
     default:
       return false;
@@ -473,12 +453,13 @@ export function hasAllLocalizedSprites(lang?: string): boolean {
  * @param container container with game objects inside it
  */
 export function printContainerList(container: Phaser.GameObjects.Container): void {
-  console.log(container.list.map(go => {
-    return { type: go.type, name: go.name };
-  }));
+  console.log(
+    container.list.map(go => {
+      return { type: go.type, name: go.name };
+    }),
+  );
 }
 
-
 /**
  * Truncate a string to a specified maximum length and add an ellipsis if it exceeds that length.
  *
@@ -486,7 +467,7 @@ export function printContainerList(container: Phaser.GameObjects.Container): voi
  * @param maxLength - The maximum length of the truncated string, defaults to 10.
  * @returns The truncated string with an ellipsis if it was longer than maxLength.
  */
-export function truncateString(str: String, maxLength: number = 10) {
+export function truncateString(str: string, maxLength = 10) {
   // Check if the string length exceeds the maximum length
   if (str.length > maxLength) {
     // Truncate the string and add an ellipsis
@@ -496,42 +477,29 @@ export function truncateString(str: String, maxLength: number = 10) {
   return str;
 }
 
-/**
- * Perform a deep copy of an object.
- *
- * @param values - The object to be deep copied.
- * @returns A new object that is a deep copy of the input.
- */
-export function deepCopy(values: object): object {
-  // Convert the object to a JSON string and parse it back to an object to perform a deep copy
-  return JSON.parse(JSON.stringify(values));
-}
-
 /**
  * Convert a space-separated string into a capitalized and underscored string.
- *
  * @param input - The string to be converted.
  * @returns The converted string with words capitalized and separated by underscores.
  */
-export function reverseValueToKeySetting(input) {
+export function reverseValueToKeySetting(input: string) {
   // Split the input string into an array of words
   const words = input.split(" ");
   // Capitalize the first letter of each word and convert the rest to lowercase
-  const capitalizedWords = words.map(word => word.charAt(0).toUpperCase() + word.slice(1).toLowerCase());
+  const capitalizedWords = words.map((word: string) => word.charAt(0).toUpperCase() + word.slice(1).toLowerCase());
   // Join the capitalized words with underscores and return the result
   return capitalizedWords.join("_");
 }
 
 /**
  * Capitalize a string.
- *
  * @param str - The string to be capitalized.
  * @param sep - The separator between the words of the string.
  * @param lowerFirstChar - Whether the first character of the string should be lowercase or not.
  * @param returnWithSpaces - Whether the returned string should have spaces between the words or not.
  * @returns The capitalized string.
  */
-export function capitalizeString(str: string, sep: string, lowerFirstChar: boolean = true, returnWithSpaces: boolean = false) {
+export function capitalizeString(str: string, sep: string, lowerFirstChar = true, returnWithSpaces = false) {
   if (str) {
     const splitedStr = str.toLowerCase().split(sep);
 
@@ -544,8 +512,8 @@ export function capitalizeString(str: string, sep: string, lowerFirstChar: boole
   return null;
 }
 
-export function isNullOrUndefined(object: any): object is undefined | null {
-  return null === object || undefined === object;
+export function isNullOrUndefined(object: any): object is null | undefined {
+  return object === null || object === undefined;
 }
 
 /**
@@ -565,7 +533,7 @@ export function capitalizeFirstLetter(str: string) {
  * @param minValue - The minimum integer value to return. Defaults to 1.
  * @returns The converted value as an integer.
  */
-export function toDmgValue(value: number, minValue: number = 1) {
+export function toDmgValue(value: number, minValue = 1) {
   return Math.max(Math.floor(value), minValue);
 }
 
@@ -579,14 +547,14 @@ export function getLocalizedSpriteKey(baseKey: string) {
 }
 
 /**
- * Check if a number is **inclusive** between two numbers
- * @param num the number to check
- * @param min the minimum value (included)
- * @param max the maximum value (included)
- * @returns `true` if number is **inclusive** between min and max
+ * Check if a number is **inclusively** between two numbers
+ * @param num - the number to check
+ * @param min - the minimum value (inclusive)
+ * @param max - the maximum value (inclusive)
+ * @returns Whether num is no less than min and no greater than max
  */
 export function isBetween(num: number, min: number, max: number): boolean {
-  return num >= min && num <= max;
+  return min <= num && num <= max;
 }
 
 /**
diff --git a/src/utils/cookies.ts b/src/utils/cookies.ts
new file mode 100644
index 00000000000..5ed793c0451
--- /dev/null
+++ b/src/utils/cookies.ts
@@ -0,0 +1,36 @@
+import { isBeta } from "./utility-vars";
+
+export function setCookie(cName: string, cValue: string): void {
+  const expiration = new Date();
+  expiration.setTime(new Date().getTime() + 3600000 * 24 * 30 * 3 /*7*/);
+  document.cookie = `${cName}=${cValue};Secure;SameSite=Strict;Domain=${window.location.hostname};Path=/;Expires=${expiration.toUTCString()}`;
+}
+
+export function removeCookie(cName: string): void {
+  if (isBeta) {
+    document.cookie = `${cName}=;Secure;SameSite=Strict;Domain=pokerogue.net;Path=/;Max-Age=-1`; // we need to remove the cookie from the main domain as well
+  }
+
+  document.cookie = `${cName}=;Secure;SameSite=Strict;Domain=${window.location.hostname};Path=/;Max-Age=-1`;
+  document.cookie = `${cName}=;Secure;SameSite=Strict;Path=/;Max-Age=-1`; // legacy cookie without domain, for older cookies to prevent a login loop
+}
+
+export function getCookie(cName: string): string {
+  // check if there are multiple cookies with the same name and delete them
+  if (document.cookie.split(";").filter(c => c.includes(cName)).length > 1) {
+    removeCookie(cName);
+    return "";
+  }
+  const name = `${cName}=`;
+  const ca = document.cookie.split(";");
+  for (let i = 0; i < ca.length; i++) {
+    let c = ca[i];
+    while (c.charAt(0) === " ") {
+      c = c.substring(1);
+    }
+    if (c.indexOf(name) === 0) {
+      return c.substring(name.length, c.length);
+    }
+  }
+  return "";
+}
diff --git a/src/utils/data.ts b/src/utils/data.ts
new file mode 100644
index 00000000000..33623dc5e40
--- /dev/null
+++ b/src/utils/data.ts
@@ -0,0 +1,40 @@
+/**
+ * Perform a deep copy of an object.
+ * @param values - The object to be deep copied.
+ * @returns A new object that is a deep copy of the input.
+ */
+export function deepCopy(values: object): object {
+  // Convert the object to a JSON string and parse it back to an object to perform a deep copy
+  return JSON.parse(JSON.stringify(values));
+}
+
+/**
+ * Deeply merge two JSON objects' common properties together.
+ * This copies all values from `source` that match properties inside `dest`,
+ * checking recursively for non-null nested objects.
+
+ * If a property in `source` does not exist in `dest` or its `typeof` evaluates differently, it is skipped.
+ * If it is a non-array object, its properties are recursed into and checked in turn.
+ * All other values are copied verbatim.
+ * @param dest - The object to merge values into
+ * @param source - The object to source merged values from
+ * @remarks Do not use for regular objects; this is specifically made for JSON copying.
+ */
+export function deepMergeSpriteData(dest: object, source: object) {
+  for (const key of Object.keys(source)) {
+    if (
+      !(key in dest) ||
+      typeof source[key] !== typeof dest[key] ||
+      Array.isArray(source[key]) !== Array.isArray(dest[key])
+    ) {
+      continue;
+    }
+
+    // Pure objects get recursed into; everything else gets overwritten
+    if (typeof source[key] !== "object" || source[key] === null || Array.isArray(source[key])) {
+      dest[key] = source[key];
+    } else {
+      deepMergeSpriteData(dest[key], source[key]);
+    }
+  }
+}
diff --git a/src/utils/utility-vars.ts b/src/utils/utility-vars.ts
new file mode 100644
index 00000000000..081f70164c8
--- /dev/null
+++ b/src/utils/utility-vars.ts
@@ -0,0 +1 @@
+export const isBeta = import.meta.env.MODE === "beta"; // this checks to see if the env mode is development. Technically this gives the same value for beta AND for dev envs
diff --git a/src/test/abilities/ability_duplication.test.ts b/test/abilities/ability_duplication.test.ts
similarity index 80%
rename from src/test/abilities/ability_duplication.test.ts
rename to test/abilities/ability_duplication.test.ts
index f9122b3259c..de429045bb8 100644
--- a/src/test/abilities/ability_duplication.test.ts
+++ b/test/abilities/ability_duplication.test.ts
@@ -2,7 +2,7 @@ import { Stat } from "#app/enums/stat";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, it, expect } from "vitest";
 
@@ -23,8 +23,8 @@ describe("Ability Duplication", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     game.override
-      .moveset([ Moves.SPLASH ])
-      .battleType("single")
+      .moveset([Moves.SPLASH])
+      .battleStyle("single")
       .ability(Abilities.HUGE_POWER)
       .enemyAbility(Abilities.BALL_FETCH)
       .enemyMoveset(Moves.SPLASH);
@@ -33,9 +33,9 @@ describe("Ability Duplication", () => {
   it("huge power should only be applied once if both normal and passive", async () => {
     game.override.passiveAbility(Abilities.HUGE_POWER);
 
-    await game.classicMode.startBattle([ Species.MAGIKARP ]);
+    await game.classicMode.startBattle([Species.MAGIKARP]);
 
-    const [ magikarp ] = game.scene.getPlayerField();
+    const [magikarp] = game.scene.getPlayerField();
     const magikarpAttack = magikarp.getEffectiveStat(Stat.ATK);
 
     magikarp.summonData.abilitySuppressed = true;
@@ -46,9 +46,9 @@ describe("Ability Duplication", () => {
   it("huge power should stack with pure power", async () => {
     game.override.passiveAbility(Abilities.PURE_POWER);
 
-    await game.classicMode.startBattle([ Species.MAGIKARP ]);
+    await game.classicMode.startBattle([Species.MAGIKARP]);
 
-    const [ magikarp ] = game.scene.getPlayerField();
+    const [magikarp] = game.scene.getPlayerField();
     const magikarpAttack = magikarp.getEffectiveStat(Stat.ATK);
 
     magikarp.summonData.abilitySuppressed = true;
diff --git a/src/test/abilities/ability_timing.test.ts b/test/abilities/ability_timing.test.ts
similarity index 72%
rename from src/test/abilities/ability_timing.test.ts
rename to test/abilities/ability_timing.test.ts
index e3264c2c1a8..6128a3e6196 100644
--- a/src/test/abilities/ability_timing.test.ts
+++ b/test/abilities/ability_timing.test.ts
@@ -2,14 +2,13 @@ import { BattleStyle } from "#app/enums/battle-style";
 import { CommandPhase } from "#app/phases/command-phase";
 import { TurnInitPhase } from "#app/phases/turn-init-phase";
 import i18next from "#app/plugins/i18n";
-import { Mode } from "#app/ui/ui";
+import { UiMode } from "#enums/ui-mode";
 import { Abilities } from "#enums/abilities";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
-
 describe("Ability Timing", () => {
   let phaserGame: Phaser.Game;
   let game: GameManager;
@@ -28,7 +27,7 @@ describe("Ability Timing", () => {
     game = new GameManager(phaserGame);
 
     game.override
-      .battleType("single")
+      .battleStyle("single")
       .enemySpecies(Species.MAGIKARP)
       .enemyAbility(Abilities.INTIMIDATE)
       .ability(Abilities.BALL_FETCH);
@@ -37,12 +36,17 @@ describe("Ability Timing", () => {
 
   it("should trigger after switch check", async () => {
     game.settings.battleStyle = BattleStyle.SWITCH;
-    await game.classicMode.runToSummon([ Species.EEVEE, Species.FEEBAS ]);
+    await game.classicMode.runToSummon([Species.EEVEE, Species.FEEBAS]);
 
-    game.onNextPrompt("CheckSwitchPhase", Mode.CONFIRM, () => {
-      game.setMode(Mode.MESSAGE);
-      game.endPhase();
-    }, () => game.isCurrentPhase(CommandPhase) || game.isCurrentPhase(TurnInitPhase));
+    game.onNextPrompt(
+      "CheckSwitchPhase",
+      UiMode.CONFIRM,
+      () => {
+        game.setMode(UiMode.MESSAGE);
+        game.endPhase();
+      },
+      () => game.isCurrentPhase(CommandPhase) || game.isCurrentPhase(TurnInitPhase),
+    );
 
     await game.phaseInterceptor.to("MessagePhase");
     expect(i18next.t).toHaveBeenCalledWith("battle:statFell", expect.objectContaining({ count: 1 }));
diff --git a/src/test/abilities/analytic.test.ts b/test/abilities/analytic.test.ts
similarity index 69%
rename from src/test/abilities/analytic.test.ts
rename to test/abilities/analytic.test.ts
index 12777c545f0..108c712da00 100644
--- a/src/test/abilities/analytic.test.ts
+++ b/test/abilities/analytic.test.ts
@@ -1,9 +1,9 @@
 import { BattlerIndex } from "#app/battle";
-import { isBetween, toDmgValue } from "#app/utils";
+import { isBetween, toDmgValue } from "#app/utils/common";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
@@ -24,9 +24,9 @@ describe("Abilities - Analytic", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     game.override
-      .moveset([ Moves.SPLASH, Moves.TACKLE ])
+      .moveset([Moves.SPLASH, Moves.TACKLE])
       .ability(Abilities.ANALYTIC)
-      .battleType("single")
+      .battleStyle("single")
       .disableCrits()
       .startingLevel(200)
       .enemyLevel(200)
@@ -36,45 +36,45 @@ describe("Abilities - Analytic", () => {
   });
 
   it("should increase damage if the user moves last", async () => {
-    await game.classicMode.startBattle([ Species.ARCEUS ]);
+    await game.classicMode.startBattle([Species.ARCEUS]);
 
     const enemy = game.scene.getEnemyPokemon()!;
 
     game.move.select(Moves.TACKLE);
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
     await game.toNextTurn();
     const damage1 = enemy.getInverseHp();
     enemy.hp = enemy.getMaxHp();
 
     game.move.select(Moves.TACKLE);
-    await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
     await game.phaseInterceptor.to("BerryPhase");
     expect(isBetween(enemy.getInverseHp(), toDmgValue(damage1 * 1.3) - 3, toDmgValue(damage1 * 1.3) + 3)).toBe(true);
   });
 
   it("should increase damage only if the user moves last in doubles", async () => {
-    game.override.battleType("double");
-    await game.classicMode.startBattle([ Species.GENGAR, Species.SHUCKLE ]);
+    game.override.battleStyle("double");
+    await game.classicMode.startBattle([Species.GENGAR, Species.SHUCKLE]);
 
-    const [ enemy, ] = game.scene.getEnemyField();
+    const [enemy] = game.scene.getEnemyField();
 
     game.move.select(Moves.TACKLE, 0, BattlerIndex.ENEMY);
     game.move.select(Moves.SPLASH, 1);
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2 ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2]);
     await game.toNextTurn();
     const damage1 = enemy.getInverseHp();
     enemy.hp = enemy.getMaxHp();
 
     game.move.select(Moves.TACKLE, 0, BattlerIndex.ENEMY);
     game.move.select(Moves.SPLASH, 1);
-    await game.setTurnOrder([ BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2, BattlerIndex.PLAYER ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2, BattlerIndex.PLAYER]);
     await game.toNextTurn();
     expect(isBetween(enemy.getInverseHp(), toDmgValue(damage1 * 1.3) - 3, toDmgValue(damage1 * 1.3) + 3)).toBe(true);
     enemy.hp = enemy.getMaxHp();
 
     game.move.select(Moves.TACKLE, 0, BattlerIndex.ENEMY);
     game.move.select(Moves.SPLASH, 1);
-    await game.setTurnOrder([ BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.PLAYER, BattlerIndex.ENEMY_2 ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.PLAYER, BattlerIndex.ENEMY_2]);
     await game.phaseInterceptor.to("BerryPhase");
     expect(enemy.getInverseHp()).toBe(damage1);
   });
diff --git a/src/test/abilities/arena_trap.test.ts b/test/abilities/arena_trap.test.ts
similarity index 81%
rename from src/test/abilities/arena_trap.test.ts
rename to test/abilities/arena_trap.test.ts
index 12b9673080d..f37b8a2859f 100644
--- a/src/test/abilities/arena_trap.test.ts
+++ b/test/abilities/arena_trap.test.ts
@@ -1,8 +1,8 @@
-import { allAbilities } from "#app/data/ability";
+import { allAbilities } from "#app/data/data-lists";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, it, expect, vi } from "vitest";
 
@@ -32,7 +32,7 @@ describe("Abilities - Arena Trap", () => {
 
   // TODO: Enable test when Issue #935 is addressed
   it.todo("should not allow grounded Pokémon to flee", async () => {
-    game.override.battleType("single");
+    game.override.battleStyle("single");
 
     await game.classicMode.startBattle();
 
@@ -46,11 +46,7 @@ describe("Abilities - Arena Trap", () => {
   });
 
   it("should guarantee double battle with any one LURE", async () => {
-    game.override
-      .startingModifier([
-        { name: "LURE" },
-      ])
-      .startingWave(2);
+    game.override.startingModifier([{ name: "LURE" }]).startingWave(2);
 
     await game.classicMode.startBattle();
 
@@ -65,14 +61,14 @@ describe("Abilities - Arena Trap", () => {
    */
   it("should lift if pokemon with this ability leaves the field", async () => {
     game.override
-      .battleType("double")
+      .battleStyle("double")
       .enemyMoveset(Moves.SPLASH)
-      .moveset([ Moves.ROAR, Moves.SPLASH ])
+      .moveset([Moves.ROAR, Moves.SPLASH])
       .ability(Abilities.BALL_FETCH);
-    await game.classicMode.startBattle([ Species.MAGIKARP, Species.SUDOWOODO, Species.LUNATONE ]);
+    await game.classicMode.startBattle([Species.MAGIKARP, Species.SUDOWOODO, Species.LUNATONE]);
 
-    const [ enemy1, enemy2 ] = game.scene.getEnemyField();
-    const [ player1, player2 ] = game.scene.getPlayerField();
+    const [enemy1, enemy2] = game.scene.getEnemyField();
+    const [player1, player2] = game.scene.getPlayerField();
 
     vi.spyOn(enemy1, "getAbility").mockReturnValue(allAbilities[Abilities.ARENA_TRAP]);
 
diff --git a/src/test/abilities/aroma_veil.test.ts b/test/abilities/aroma_veil.test.ts
similarity index 84%
rename from src/test/abilities/aroma_veil.test.ts
rename to test/abilities/aroma_veil.test.ts
index 4ba4d16504b..38683bcb1e3 100644
--- a/src/test/abilities/aroma_veil.test.ts
+++ b/test/abilities/aroma_veil.test.ts
@@ -1,7 +1,7 @@
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { Abilities } from "#enums/abilities";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 import { BattlerTagType } from "#enums/battler-tag-type";
@@ -25,16 +25,16 @@ describe("Moves - Aroma Veil", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     game.override
-      .battleType("double")
+      .battleStyle("double")
       .enemyAbility(Abilities.BALL_FETCH)
-      .enemyMoveset([ Moves.HEAL_BLOCK, Moves.IMPRISON, Moves.SPLASH ])
+      .enemyMoveset([Moves.HEAL_BLOCK, Moves.IMPRISON, Moves.SPLASH])
       .enemySpecies(Species.SHUCKLE)
       .ability(Abilities.AROMA_VEIL)
-      .moveset([ Moves.GROWL ]);
+      .moveset([Moves.GROWL]);
   });
 
   it("Aroma Veil protects the Pokemon's side against most Move Restriction Battler Tags", async () => {
-    await game.classicMode.startBattle([ Species.REGIELEKI, Species.BULBASAUR ]);
+    await game.classicMode.startBattle([Species.REGIELEKI, Species.BULBASAUR]);
 
     const party = game.scene.getPlayerParty()! as PlayerPokemon[];
 
@@ -48,7 +48,7 @@ describe("Moves - Aroma Veil", () => {
   });
 
   it("Aroma Veil does not protect against Imprison", async () => {
-    await game.classicMode.startBattle([ Species.REGIELEKI, Species.BULBASAUR ]);
+    await game.classicMode.startBattle([Species.REGIELEKI, Species.BULBASAUR]);
 
     const party = game.scene.getPlayerParty()! as PlayerPokemon[];
 
diff --git a/src/test/abilities/aura_break.test.ts b/test/abilities/aura_break.test.ts
similarity index 81%
rename from src/test/abilities/aura_break.test.ts
rename to test/abilities/aura_break.test.ts
index 137688d1f22..523a2773c99 100644
--- a/src/test/abilities/aura_break.test.ts
+++ b/test/abilities/aura_break.test.ts
@@ -1,8 +1,8 @@
-import { allMoves } from "#app/data/move";
+import { allMoves } from "#app/data/moves/move";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
@@ -10,7 +10,7 @@ describe("Abilities - Aura Break", () => {
   let phaserGame: Phaser.Game;
   let game: GameManager;
 
-  const auraBreakMultiplier = 9 / 16 * 4 / 3;
+  const auraBreakMultiplier = ((9 / 16) * 4) / 3;
 
   beforeAll(() => {
     phaserGame = new Phaser.Game({
@@ -24,8 +24,8 @@ describe("Abilities - Aura Break", () => {
 
   beforeEach(() => {
     game = new GameManager(phaserGame);
-    game.override.battleType("single");
-    game.override.moveset([ Moves.MOONBLAST, Moves.DARK_PULSE, Moves.MOONBLAST, Moves.DARK_PULSE ]);
+    game.override.battleStyle("single");
+    game.override.moveset([Moves.MOONBLAST, Moves.DARK_PULSE, Moves.MOONBLAST, Moves.DARK_PULSE]);
     game.override.enemyMoveset(Moves.SPLASH);
     game.override.enemyAbility(Abilities.AURA_BREAK);
     game.override.enemySpecies(Species.SHUCKLE);
@@ -38,7 +38,7 @@ describe("Abilities - Aura Break", () => {
     game.override.ability(Abilities.FAIRY_AURA);
     vi.spyOn(moveToCheck, "calculateBattlePower");
 
-    await game.classicMode.startBattle([ Species.PIKACHU ]);
+    await game.classicMode.startBattle([Species.PIKACHU]);
     game.move.select(Moves.MOONBLAST);
     await game.phaseInterceptor.to("MoveEffectPhase");
 
@@ -52,7 +52,7 @@ describe("Abilities - Aura Break", () => {
     game.override.ability(Abilities.DARK_AURA);
     vi.spyOn(moveToCheck, "calculateBattlePower");
 
-    await game.classicMode.startBattle([ Species.PIKACHU ]);
+    await game.classicMode.startBattle([Species.PIKACHU]);
     game.move.select(Moves.DARK_PULSE);
     await game.phaseInterceptor.to("MoveEffectPhase");
 
@@ -66,7 +66,7 @@ describe("Abilities - Aura Break", () => {
     game.override.ability(Abilities.BALL_FETCH);
     vi.spyOn(moveToCheck, "calculateBattlePower");
 
-    await game.classicMode.startBattle([ Species.PIKACHU ]);
+    await game.classicMode.startBattle([Species.PIKACHU]);
     game.move.select(Moves.MOONBLAST);
     await game.phaseInterceptor.to("MoveEffectPhase");
 
diff --git a/src/test/abilities/battery.test.ts b/test/abilities/battery.test.ts
similarity index 83%
rename from src/test/abilities/battery.test.ts
rename to test/abilities/battery.test.ts
index 8abeca287f7..6a1f77f4b27 100644
--- a/src/test/abilities/battery.test.ts
+++ b/test/abilities/battery.test.ts
@@ -1,10 +1,10 @@
-import { allMoves } from "#app/data/move";
+import { allMoves } from "#app/data/moves/move";
 import { Abilities } from "#app/enums/abilities";
 import { MoveEffectPhase } from "#app/phases/move-effect-phase";
 import { TurnEndPhase } from "#app/phases/turn-end-phase";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
@@ -26,10 +26,10 @@ describe("Abilities - Battery", () => {
 
   beforeEach(() => {
     game = new GameManager(phaserGame);
-    game.override.battleType("double");
+    game.override.battleStyle("double");
     game.override.enemySpecies(Species.SHUCKLE);
     game.override.enemyAbility(Abilities.BALL_FETCH);
-    game.override.moveset([ Moves.TACKLE, Moves.BREAKING_SWIPE, Moves.SPLASH, Moves.DAZZLING_GLEAM ]);
+    game.override.moveset([Moves.TACKLE, Moves.BREAKING_SWIPE, Moves.SPLASH, Moves.DAZZLING_GLEAM]);
     game.override.enemyMoveset(Moves.SPLASH);
   });
 
@@ -39,7 +39,7 @@ describe("Abilities - Battery", () => {
 
     vi.spyOn(moveToCheck, "calculateBattlePower");
 
-    await game.startBattle([ Species.PIKACHU, Species.CHARJABUG ]);
+    await game.startBattle([Species.PIKACHU, Species.CHARJABUG]);
 
     game.move.select(Moves.DAZZLING_GLEAM);
     game.move.select(Moves.SPLASH, 1);
@@ -54,7 +54,7 @@ describe("Abilities - Battery", () => {
 
     vi.spyOn(moveToCheck, "calculateBattlePower");
 
-    await game.startBattle([ Species.PIKACHU, Species.CHARJABUG ]);
+    await game.startBattle([Species.PIKACHU, Species.CHARJABUG]);
 
     game.move.select(Moves.BREAKING_SWIPE);
     game.move.select(Moves.SPLASH, 1);
@@ -69,7 +69,7 @@ describe("Abilities - Battery", () => {
 
     vi.spyOn(moveToCheck, "calculateBattlePower");
 
-    await game.startBattle([ Species.CHARJABUG, Species.PIKACHU ]);
+    await game.startBattle([Species.CHARJABUG, Species.PIKACHU]);
 
     game.move.select(Moves.DAZZLING_GLEAM);
     game.move.select(Moves.SPLASH, 1);
diff --git a/src/test/abilities/battle_bond.test.ts b/test/abilities/battle_bond.test.ts
similarity index 86%
rename from src/test/abilities/battle_bond.test.ts
rename to test/abilities/battle_bond.test.ts
index db7ed01e7d9..d599b3212f9 100644
--- a/src/test/abilities/battle_bond.test.ts
+++ b/test/abilities/battle_bond.test.ts
@@ -1,13 +1,13 @@
-import { allMoves, MultiHitAttr, MultiHitType } from "#app/data/move";
+import { allMoves, MultiHitAttr } from "#app/data/moves/move";
+import { MultiHitType } from "#enums/MultiHitType";
 import { Status } from "#app/data/status-effect";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { StatusEffect } from "#enums/status-effect";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
-
 describe("Abilities - BATTLE BOND", () => {
   let phaserGame: Phaser.Game;
   let game: GameManager;
@@ -27,11 +27,12 @@ describe("Abilities - BATTLE BOND", () => {
 
   beforeEach(() => {
     game = new GameManager(phaserGame);
-    game.override.battleType("single")
+    game.override
+      .battleStyle("single")
       .startingWave(4) // Leads to arena reset on Wave 5 trainer battle
       .ability(Abilities.BATTLE_BOND)
-      .starterForms({ [Species.GRENINJA]: ashForm, })
-      .moveset([ Moves.SPLASH, Moves.WATER_SHURIKEN ])
+      .starterForms({ [Species.GRENINJA]: ashForm })
+      .moveset([Moves.SPLASH, Moves.WATER_SHURIKEN])
       .enemySpecies(Species.BULBASAUR)
       .enemyMoveset(Moves.SPLASH)
       .startingLevel(100) // Avoid levelling up
@@ -39,7 +40,7 @@ describe("Abilities - BATTLE BOND", () => {
   });
 
   it("check if fainted pokemon switches to base form on arena reset", async () => {
-    await game.classicMode.startBattle([ Species.MAGIKARP, Species.GRENINJA ]);
+    await game.classicMode.startBattle([Species.MAGIKARP, Species.GRENINJA]);
 
     const greninja = game.scene.getPlayerParty()[1];
     expect(greninja.formIndex).toBe(ashForm);
@@ -58,7 +59,7 @@ describe("Abilities - BATTLE BOND", () => {
   });
 
   it("should not keep buffing Water Shuriken after Greninja switches to base form", async () => {
-    await game.classicMode.startBattle([ Species.GRENINJA ]);
+    await game.classicMode.startBattle([Species.GRENINJA]);
 
     const waterShuriken = allMoves[Moves.WATER_SHURIKEN];
     vi.spyOn(waterShuriken, "calculateBattlePower");
diff --git a/src/test/abilities/beast_boost.test.ts b/test/abilities/beast_boost.test.ts
similarity index 71%
rename from src/test/abilities/beast_boost.test.ts
rename to test/abilities/beast_boost.test.ts
index de31b979e32..a6b6ec0aacf 100644
--- a/src/test/abilities/beast_boost.test.ts
+++ b/test/abilities/beast_boost.test.ts
@@ -3,7 +3,7 @@ import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { Stat } from "#enums/stat";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
@@ -24,21 +24,21 @@ describe("Abilities - Beast Boost", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     game.override
-      .battleType("single")
+      .battleStyle("single")
       .enemySpecies(Species.BULBASAUR)
       .enemyAbility(Abilities.BEAST_BOOST)
       .ability(Abilities.BEAST_BOOST)
       .startingLevel(2000)
-      .moveset([ Moves.FLAMETHROWER ])
+      .moveset([Moves.FLAMETHROWER])
       .enemyMoveset(Moves.SPLASH);
   });
 
-  it("should prefer highest stat to boost its corresponding stat stage by 1 when winning a battle", async() => {
-    await game.classicMode.startBattle([ Species.SLOWBRO ]);
+  it("should prefer highest stat to boost its corresponding stat stage by 1 when winning a battle", async () => {
+    await game.classicMode.startBattle([Species.SLOWBRO]);
 
     const playerPokemon = game.scene.getPlayerPokemon()!;
     // Set the pokemon's highest stat to DEF, so it should be picked by Beast Boost
-    vi.spyOn(playerPokemon, "stats", "get").mockReturnValue([ 10000, 100, 1000, 200, 100, 100 ]);
+    vi.spyOn(playerPokemon, "stats", "get").mockReturnValue([10000, 100, 1000, 200, 100, 100]);
     console.log(playerPokemon.stats);
 
     expect(playerPokemon.getStatStage(Stat.DEF)).toBe(0);
@@ -49,33 +49,33 @@ describe("Abilities - Beast Boost", () => {
     expect(playerPokemon.getStatStage(Stat.DEF)).toBe(1);
   }, 20000);
 
-  it("should use in-battle overriden stats when determining the stat stage to raise by 1", async() => {
-    game.override.enemyMoveset([ Moves.GUARD_SPLIT ]);
+  it("should use in-battle overriden stats when determining the stat stage to raise by 1", async () => {
+    game.override.enemyMoveset([Moves.GUARD_SPLIT]);
 
-    await game.classicMode.startBattle([ Species.SLOWBRO ]);
+    await game.classicMode.startBattle([Species.SLOWBRO]);
 
     const playerPokemon = game.scene.getPlayerPokemon()!;
     // If the opponent uses Guard Split, the pokemon's second highest stat (SPATK) should be chosen
-    vi.spyOn(playerPokemon, "stats", "get").mockReturnValue([ 10000, 100, 201, 200, 100, 100 ]);
+    vi.spyOn(playerPokemon, "stats", "get").mockReturnValue([10000, 100, 201, 200, 100, 100]);
 
     expect(playerPokemon.getStatStage(Stat.SPATK)).toBe(0);
 
     game.move.select(Moves.FLAMETHROWER);
 
-    await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
     await game.phaseInterceptor.to("VictoryPhase");
 
     expect(playerPokemon.getStatStage(Stat.SPATK)).toBe(1);
   }, 20000);
 
-  it("should have order preference in case of stat ties", async() => {
+  it("should have order preference in case of stat ties", async () => {
     // Order preference follows the order of EFFECTIVE_STAT
-    await game.classicMode.startBattle([ Species.SLOWBRO ]);
+    await game.classicMode.startBattle([Species.SLOWBRO]);
 
     const playerPokemon = game.scene.getPlayerPokemon()!;
 
     // Set up tie between SPATK, SPDEF, and SPD, where SPATK should win
-    vi.spyOn(playerPokemon, "stats", "get").mockReturnValue([ 10000, 1, 1, 100, 100, 100 ]);
+    vi.spyOn(playerPokemon, "stats", "get").mockReturnValue([10000, 1, 1, 100, 100, 100]);
 
     expect(playerPokemon.getStatStage(Stat.SPATK)).toBe(0);
 
diff --git a/src/test/abilities/commander.test.ts b/test/abilities/commander.test.ts
similarity index 78%
rename from src/test/abilities/commander.test.ts
rename to test/abilities/commander.test.ts
index 70568639b61..0e6cb1b9208 100644
--- a/src/test/abilities/commander.test.ts
+++ b/test/abilities/commander.test.ts
@@ -9,7 +9,7 @@ import { MoveResult } from "#app/field/pokemon";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
@@ -32,9 +32,9 @@ describe("Abilities - Commander", () => {
     game.override
       .startingLevel(100)
       .enemyLevel(100)
-      .moveset([ Moves.LIQUIDATION, Moves.MEMENTO, Moves.SPLASH, Moves.FLIP_TURN ])
+      .moveset([Moves.LIQUIDATION, Moves.MEMENTO, Moves.SPLASH, Moves.FLIP_TURN])
       .ability(Abilities.COMMANDER)
-      .battleType("double")
+      .battleStyle("double")
       .disableCrits()
       .enemySpecies(Species.SNORLAX)
       .enemyAbility(Abilities.BALL_FETCH)
@@ -44,15 +44,15 @@ describe("Abilities - Commander", () => {
   });
 
   it("causes the source to jump into Dondozo's mouth, granting a stat boost and hiding the source", async () => {
-    await game.classicMode.startBattle([ Species.TATSUGIRI, Species.DONDOZO ]);
+    await game.classicMode.startBattle([Species.TATSUGIRI, Species.DONDOZO]);
 
-    const [ tatsugiri, dondozo ] = game.scene.getPlayerField();
+    const [tatsugiri, dondozo] = game.scene.getPlayerField();
 
-    const affectedStats: EffectiveStat[] = [ Stat.ATK, Stat.DEF, Stat.SPATK, Stat.SPDEF, Stat.SPD ];
+    const affectedStats: EffectiveStat[] = [Stat.ATK, Stat.DEF, Stat.SPATK, Stat.SPDEF, Stat.SPD];
 
     expect(game.scene.triggerPokemonBattleAnim).toHaveBeenLastCalledWith(tatsugiri, PokemonAnimType.COMMANDER_APPLY);
     expect(dondozo.getTag(BattlerTagType.COMMANDED)).toBeDefined();
-    affectedStats.forEach((stat) => expect(dondozo.getStatStage(stat)).toBe(2));
+    affectedStats.forEach(stat => expect(dondozo.getStatStage(stat)).toBe(2));
 
     game.move.select(Moves.SPLASH, 1);
 
@@ -70,7 +70,7 @@ describe("Abilities - Commander", () => {
   it("should activate when a Dondozo switches in and cancel the source's move", async () => {
     game.override.enemyMoveset(Moves.SPLASH);
 
-    await game.classicMode.startBattle([ Species.TATSUGIRI, Species.MAGIKARP, Species.DONDOZO ]);
+    await game.classicMode.startBattle([Species.TATSUGIRI, Species.MAGIKARP, Species.DONDOZO]);
 
     const tatsugiri = game.scene.getPlayerField()[0];
 
@@ -89,9 +89,9 @@ describe("Abilities - Commander", () => {
   });
 
   it("source should reenter the field when Dondozo faints", async () => {
-    await game.classicMode.startBattle([ Species.TATSUGIRI, Species.DONDOZO ]);
+    await game.classicMode.startBattle([Species.TATSUGIRI, Species.DONDOZO]);
 
-    const [ tatsugiri, dondozo ] = game.scene.getPlayerField();
+    const [tatsugiri, dondozo] = game.scene.getPlayerField();
 
     expect(game.scene.triggerPokemonBattleAnim).toHaveBeenLastCalledWith(tatsugiri, PokemonAnimType.COMMANDER_APPLY);
     expect(dondozo.getTag(BattlerTagType.COMMANDED)).toBeDefined();
@@ -103,7 +103,7 @@ describe("Abilities - Commander", () => {
     await game.forceEnemyMove(Moves.TACKLE, BattlerIndex.PLAYER);
     await game.forceEnemyMove(Moves.TACKLE, BattlerIndex.PLAYER);
 
-    await game.setTurnOrder([ BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2, BattlerIndex.PLAYER ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2, BattlerIndex.PLAYER]);
 
     await game.phaseInterceptor.to("FaintPhase", false);
     expect(dondozo.getTag(BattlerTagType.COMMANDED)).toBeUndefined();
@@ -114,13 +114,11 @@ describe("Abilities - Commander", () => {
   });
 
   it("source should still take damage from Poison while hidden", async () => {
-    game.override
-      .statusEffect(StatusEffect.POISON)
-      .enemyMoveset(Moves.SPLASH);
+    game.override.statusEffect(StatusEffect.POISON).enemyMoveset(Moves.SPLASH);
 
-    await game.classicMode.startBattle([ Species.TATSUGIRI, Species.DONDOZO ]);
+    await game.classicMode.startBattle([Species.TATSUGIRI, Species.DONDOZO]);
 
-    const [ tatsugiri, dondozo ] = game.scene.getPlayerField();
+    const [tatsugiri, dondozo] = game.scene.getPlayerField();
 
     expect(game.scene.triggerPokemonBattleAnim).toHaveBeenLastCalledWith(tatsugiri, PokemonAnimType.COMMANDER_APPLY);
     expect(dondozo.getTag(BattlerTagType.COMMANDED)).toBeDefined();
@@ -136,9 +134,9 @@ describe("Abilities - Commander", () => {
   it("source should still take damage from Salt Cure while hidden", async () => {
     game.override.enemyMoveset(Moves.SPLASH);
 
-    await game.classicMode.startBattle([ Species.TATSUGIRI, Species.DONDOZO ]);
+    await game.classicMode.startBattle([Species.TATSUGIRI, Species.DONDOZO]);
 
-    const [ tatsugiri, dondozo ] = game.scene.getPlayerField();
+    const [tatsugiri, dondozo] = game.scene.getPlayerField();
 
     expect(game.scene.triggerPokemonBattleAnim).toHaveBeenLastCalledWith(tatsugiri, PokemonAnimType.COMMANDER_APPLY);
     expect(dondozo.getTag(BattlerTagType.COMMANDED)).toBeDefined();
@@ -154,13 +152,11 @@ describe("Abilities - Commander", () => {
   });
 
   it("source should still take damage from Sandstorm while hidden", async () => {
-    game.override
-      .weather(WeatherType.SANDSTORM)
-      .enemyMoveset(Moves.SPLASH);
+    game.override.weather(WeatherType.SANDSTORM).enemyMoveset(Moves.SPLASH);
 
-    await game.classicMode.startBattle([ Species.TATSUGIRI, Species.DONDOZO ]);
+    await game.classicMode.startBattle([Species.TATSUGIRI, Species.DONDOZO]);
 
-    const [ tatsugiri, dondozo ] = game.scene.getPlayerField();
+    const [tatsugiri, dondozo] = game.scene.getPlayerField();
 
     expect(game.scene.triggerPokemonBattleAnim).toHaveBeenLastCalledWith(tatsugiri, PokemonAnimType.COMMANDER_APPLY);
     expect(dondozo.getTag(BattlerTagType.COMMANDED)).toBeDefined();
@@ -174,11 +170,11 @@ describe("Abilities - Commander", () => {
   });
 
   it("should make Dondozo immune to being forced out", async () => {
-    game.override.enemyMoveset([ Moves.SPLASH, Moves.WHIRLWIND ]);
+    game.override.enemyMoveset([Moves.SPLASH, Moves.WHIRLWIND]);
 
-    await game.classicMode.startBattle([ Species.TATSUGIRI, Species.DONDOZO ]);
+    await game.classicMode.startBattle([Species.TATSUGIRI, Species.DONDOZO]);
 
-    const [ tatsugiri, dondozo ] = game.scene.getPlayerField();
+    const [tatsugiri, dondozo] = game.scene.getPlayerField();
 
     expect(game.scene.triggerPokemonBattleAnim).toHaveBeenLastCalledWith(tatsugiri, PokemonAnimType.COMMANDER_APPLY);
     expect(dondozo.getTag(BattlerTagType.COMMANDED)).toBeDefined();
@@ -196,11 +192,9 @@ describe("Abilities - Commander", () => {
   });
 
   it("should interrupt the source's semi-invulnerability", async () => {
-    game.override
-      .moveset([ Moves.SPLASH, Moves.DIVE ])
-      .enemyMoveset(Moves.SPLASH);
+    game.override.moveset([Moves.SPLASH, Moves.DIVE]).enemyMoveset(Moves.SPLASH);
 
-    await game.classicMode.startBattle([ Species.TATSUGIRI, Species.MAGIKARP, Species.DONDOZO ]);
+    await game.classicMode.startBattle([Species.TATSUGIRI, Species.MAGIKARP, Species.DONDOZO]);
 
     const tatsugiri = game.scene.getPlayerField()[0];
 
diff --git a/src/test/abilities/competitive.test.ts b/test/abilities/competitive.test.ts
similarity index 86%
rename from src/test/abilities/competitive.test.ts
rename to test/abilities/competitive.test.ts
index ecb276a1b8d..1e0b5fcf40e 100644
--- a/src/test/abilities/competitive.test.ts
+++ b/test/abilities/competitive.test.ts
@@ -3,7 +3,7 @@ import { TurnInitPhase } from "#app/phases/turn-init-phase";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
@@ -24,16 +24,17 @@ describe("Abilities - Competitive", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
 
-    game.override.battleType("single")
+    game.override
+      .battleStyle("single")
       .enemySpecies(Species.BEEDRILL)
       .enemyMoveset(Moves.TICKLE)
       .startingLevel(1)
-      .moveset([ Moves.SPLASH, Moves.CLOSE_COMBAT ])
+      .moveset([Moves.SPLASH, Moves.CLOSE_COMBAT])
       .ability(Abilities.COMPETITIVE);
   });
 
   it("lower atk and def by 1 via tickle, then increase spatk by 4 via competitive", async () => {
-    await game.classicMode.startBattle([ Species.FLYGON ]);
+    await game.classicMode.startBattle([Species.FLYGON]);
 
     const playerPokemon = game.scene.getPlayerPokemon()!;
     game.move.select(Moves.SPLASH);
@@ -46,7 +47,7 @@ describe("Abilities - Competitive", () => {
 
   it("lowering your own stats should not trigger competitive", async () => {
     game.override.enemyMoveset(Moves.SPLASH);
-    await game.classicMode.startBattle([ Species.FLYGON ]);
+    await game.classicMode.startBattle([Species.FLYGON]);
 
     const playerPokemon = game.scene.getPlayerPokemon()!;
     game.move.select(Moves.CLOSE_COMBAT);
@@ -59,7 +60,7 @@ describe("Abilities - Competitive", () => {
 
   it("white herb should remove only the negative effects", async () => {
     game.override.startingHeldItems([{ name: "WHITE_HERB" }]);
-    await game.classicMode.startBattle([ Species.FLYGON ]);
+    await game.classicMode.startBattle([Species.FLYGON]);
 
     const playerPokemon = game.scene.getPlayerPokemon()!;
     game.move.select(Moves.SPLASH);
diff --git a/src/test/abilities/contrary.test.ts b/test/abilities/contrary.test.ts
similarity index 75%
rename from src/test/abilities/contrary.test.ts
rename to test/abilities/contrary.test.ts
index c838a5a098e..929d620c232 100644
--- a/src/test/abilities/contrary.test.ts
+++ b/test/abilities/contrary.test.ts
@@ -2,7 +2,7 @@ import { Moves } from "#app/enums/moves";
 import { Abilities } from "#enums/abilities";
 import { Species } from "#enums/species";
 import { Stat } from "#enums/stat";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
@@ -23,17 +23,15 @@ describe("Abilities - Contrary", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     game.override
-      .battleType("single")
+      .battleStyle("single")
       .enemySpecies(Species.BULBASAUR)
       .enemyAbility(Abilities.CONTRARY)
       .ability(Abilities.INTIMIDATE)
       .enemyMoveset(Moves.SPLASH);
   });
 
-  it("should invert stat changes when applied", async() => {
-    await game.classicMode.startBattle([
-      Species.SLOWBRO
-    ]);
+  it("should invert stat changes when applied", async () => {
+    await game.classicMode.startBattle([Species.SLOWBRO]);
 
     const enemyPokemon = game.scene.getEnemyPokemon()!;
 
@@ -42,10 +40,8 @@ describe("Abilities - Contrary", () => {
 
   describe("With Clear Body", () => {
     it("should apply positive effects", async () => {
-      game.override
-        .enemyPassiveAbility(Abilities.CLEAR_BODY)
-        .moveset([ Moves.TAIL_WHIP ]);
-      await game.classicMode.startBattle([ Species.SLOWBRO ]);
+      game.override.enemyPassiveAbility(Abilities.CLEAR_BODY).moveset([Moves.TAIL_WHIP]);
+      await game.classicMode.startBattle([Species.SLOWBRO]);
 
       const enemyPokemon = game.scene.getEnemyPokemon()!;
 
@@ -60,9 +56,9 @@ describe("Abilities - Contrary", () => {
     it("should block negative effects", async () => {
       game.override
         .enemyPassiveAbility(Abilities.CLEAR_BODY)
-        .enemyMoveset([ Moves.HOWL, Moves.HOWL, Moves.HOWL, Moves.HOWL ])
-        .moveset([ Moves.SPLASH ]);
-      await game.classicMode.startBattle([ Species.SLOWBRO ]);
+        .enemyMoveset([Moves.HOWL, Moves.HOWL, Moves.HOWL, Moves.HOWL])
+        .moveset([Moves.SPLASH]);
+      await game.classicMode.startBattle([Species.SLOWBRO]);
 
       const enemyPokemon = game.scene.getEnemyPokemon()!;
 
diff --git a/src/test/abilities/corrosion.test.ts b/test/abilities/corrosion.test.ts
similarity index 88%
rename from src/test/abilities/corrosion.test.ts
rename to test/abilities/corrosion.test.ts
index e607e85defb..c72aef9f0a3 100644
--- a/src/test/abilities/corrosion.test.ts
+++ b/test/abilities/corrosion.test.ts
@@ -1,7 +1,7 @@
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
@@ -22,8 +22,8 @@ describe("Abilities - Corrosion", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     game.override
-      .moveset([ Moves.SPLASH ])
-      .battleType("single")
+      .moveset([Moves.SPLASH])
+      .battleStyle("single")
       .disableCrits()
       .enemySpecies(Species.GRIMER)
       .enemyAbility(Abilities.CORROSION)
@@ -32,7 +32,7 @@ describe("Abilities - Corrosion", () => {
 
   it("If a Poison- or Steel-type Pokémon with this Ability poisons a target with Synchronize, Synchronize does not gain the ability to poison Poison- or Steel-type Pokémon.", async () => {
     game.override.ability(Abilities.SYNCHRONIZE);
-    await game.classicMode.startBattle([ Species.FEEBAS ]);
+    await game.classicMode.startBattle([Species.FEEBAS]);
 
     const playerPokemon = game.scene.getPlayerPokemon();
     const enemyPokemon = game.scene.getEnemyPokemon();
diff --git a/test/abilities/costar.test.ts b/test/abilities/costar.test.ts
new file mode 100644
index 00000000000..7b1e362689d
--- /dev/null
+++ b/test/abilities/costar.test.ts
@@ -0,0 +1,77 @@
+import { Stat } from "#enums/stat";
+import { Abilities } from "#app/enums/abilities";
+import { Moves } from "#app/enums/moves";
+import { Species } from "#app/enums/species";
+import { CommandPhase } from "#app/phases/command-phase";
+import { MessagePhase } from "#app/phases/message-phase";
+import GameManager from "#test/testUtils/gameManager";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest";
+
+describe("Abilities - COSTAR", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+    game.override.battleStyle("double");
+    game.override.ability(Abilities.COSTAR);
+    game.override.moveset([Moves.SPLASH, Moves.NASTY_PLOT]);
+    game.override.enemyMoveset(Moves.SPLASH);
+  });
+
+  test("ability copies positive stat stages", async () => {
+    game.override.enemyAbility(Abilities.BALL_FETCH);
+
+    await game.startBattle([Species.MAGIKARP, Species.MAGIKARP, Species.FLAMIGO]);
+
+    let [leftPokemon, rightPokemon] = game.scene.getPlayerField();
+
+    game.move.select(Moves.NASTY_PLOT);
+    await game.phaseInterceptor.to(CommandPhase);
+    game.move.select(Moves.SPLASH, 1);
+    await game.toNextTurn();
+
+    expect(leftPokemon.getStatStage(Stat.SPATK)).toBe(2);
+    expect(rightPokemon.getStatStage(Stat.SPATK)).toBe(0);
+
+    game.move.select(Moves.SPLASH);
+    await game.phaseInterceptor.to(CommandPhase);
+    game.doSwitchPokemon(2);
+    await game.phaseInterceptor.to(MessagePhase);
+
+    [leftPokemon, rightPokemon] = game.scene.getPlayerField();
+    expect(leftPokemon.getStatStage(Stat.SPATK)).toBe(2);
+    expect(rightPokemon.getStatStage(Stat.SPATK)).toBe(2);
+  });
+
+  test("ability copies negative stat stages", async () => {
+    game.override.enemyAbility(Abilities.INTIMIDATE);
+
+    await game.startBattle([Species.MAGIKARP, Species.MAGIKARP, Species.FLAMIGO]);
+
+    let [leftPokemon, rightPokemon] = game.scene.getPlayerField();
+
+    expect(leftPokemon.getStatStage(Stat.ATK)).toBe(-2);
+    expect(leftPokemon.getStatStage(Stat.ATK)).toBe(-2);
+
+    game.move.select(Moves.SPLASH);
+    await game.phaseInterceptor.to(CommandPhase);
+    game.doSwitchPokemon(2);
+    await game.phaseInterceptor.to(MessagePhase);
+
+    [leftPokemon, rightPokemon] = game.scene.getPlayerField();
+    expect(leftPokemon.getStatStage(Stat.ATK)).toBe(-2);
+    expect(rightPokemon.getStatStage(Stat.ATK)).toBe(-2);
+  });
+});
diff --git a/test/abilities/cud_chew.test.ts b/test/abilities/cud_chew.test.ts
new file mode 100644
index 00000000000..2f65ac5fd97
--- /dev/null
+++ b/test/abilities/cud_chew.test.ts
@@ -0,0 +1,322 @@
+import { RepeatBerryNextTurnAbAttr } from "#app/data/abilities/ability";
+import Pokemon from "#app/field/pokemon";
+import { globalScene } from "#app/global-scene";
+import { getPokemonNameWithAffix } from "#app/messages";
+import { Abilities } from "#enums/abilities";
+import { BerryType } from "#enums/berry-type";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import { Stat } from "#enums/stat";
+import GameManager from "#test/testUtils/gameManager";
+import i18next from "i18next";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
+
+describe("Abilities - Cud Chew", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+    game.override
+      .moveset([Moves.BUG_BITE, Moves.SPLASH, Moves.HYPER_VOICE, Moves.STUFF_CHEEKS])
+      .startingHeldItems([{ name: "BERRY", type: BerryType.SITRUS, count: 1 }])
+      .ability(Abilities.CUD_CHEW)
+      .battleStyle("single")
+      .disableCrits()
+      .enemySpecies(Species.MAGIKARP)
+      .enemyAbility(Abilities.BALL_FETCH)
+      .enemyMoveset(Moves.SPLASH);
+  });
+
+  describe("tracks berries eaten", () => {
+    it("stores inside summonData at end of turn", async () => {
+      await game.classicMode.startBattle([Species.FARIGIRAF]);
+
+      const farigiraf = game.scene.getPlayerPokemon()!;
+      farigiraf.hp = 1; // needed to allow sitrus procs
+
+      game.move.select(Moves.SPLASH);
+      await game.phaseInterceptor.to("BerryPhase");
+
+      // berries tracked in turnData; not moved to battleData yet
+      expect(farigiraf.summonData.berriesEatenLast).toEqual([]);
+      expect(farigiraf.turnData.berriesEaten).toEqual([BerryType.SITRUS]);
+
+      await game.phaseInterceptor.to("TurnEndPhase");
+
+      // berries stored in battleData; not yet cleared from turnData
+      expect(farigiraf.summonData.berriesEatenLast).toEqual([BerryType.SITRUS]);
+      expect(farigiraf.turnData.berriesEaten).toEqual([BerryType.SITRUS]);
+
+      await game.toNextTurn();
+
+      // turnData cleared on turn start
+      expect(farigiraf.summonData.berriesEatenLast).toEqual([BerryType.SITRUS]);
+      expect(farigiraf.turnData.berriesEaten).toEqual([]);
+    });
+
+    it("shows ability popup for eating berry, even if berry is useless", async () => {
+      const abDisplaySpy = vi.spyOn(globalScene, "queueAbilityDisplay");
+      game.override.enemyMoveset([Moves.SPLASH, Moves.HEAL_PULSE]);
+      await game.classicMode.startBattle([Species.FARIGIRAF]);
+
+      const farigiraf = game.scene.getPlayerPokemon()!;
+      // Dip below half to eat berry
+      farigiraf.hp = farigiraf.getMaxHp() / 2 - 1;
+
+      game.move.select(Moves.SPLASH);
+      await game.forceEnemyMove(Moves.SPLASH);
+      await game.phaseInterceptor.to("TurnEndPhase");
+
+      // doesn't trigger since cud chew hasn't eaten berry yet
+      expect(farigiraf.summonData.berriesEatenLast).toContain(BerryType.SITRUS);
+      expect(abDisplaySpy).not.toHaveBeenCalledWith(farigiraf);
+      await game.toNextTurn();
+
+      // get heal pulsed back to full before the cud chew proc
+      game.move.select(Moves.SPLASH);
+      await game.forceEnemyMove(Moves.HEAL_PULSE);
+      await game.phaseInterceptor.to("TurnEndPhase");
+
+      // globalScene.queueAbilityDisplay should be called twice:
+      // once to show cud chew text before regurgitating berries,
+      // once to hide ability text after finishing.
+      expect(abDisplaySpy).toBeCalledTimes(2);
+      expect(abDisplaySpy.mock.calls[0][0]).toBe(farigiraf);
+      expect(abDisplaySpy.mock.calls[0][2]).toBe(true);
+      expect(abDisplaySpy.mock.calls[1][0]).toBe(farigiraf);
+      expect(abDisplaySpy.mock.calls[1][2]).toBe(false);
+
+      // should display messgae
+      expect(game.textInterceptor.getLatestMessage()).toBe(
+        i18next.t("battle:hpIsFull", {
+          pokemonName: getPokemonNameWithAffix(farigiraf),
+        }),
+      );
+
+      // not called again at turn end
+      expect(abDisplaySpy).toBeCalledTimes(2);
+    });
+
+    it("can store multiple berries across 2 turns with teatime", async () => {
+      // always eat first berry for stuff cheeks & company
+      vi.spyOn(Pokemon.prototype, "randBattleSeedInt").mockReturnValue(0);
+      game.override
+        .startingHeldItems([
+          { name: "BERRY", type: BerryType.PETAYA, count: 3 },
+          { name: "BERRY", type: BerryType.LIECHI, count: 3 },
+        ])
+        .enemyMoveset(Moves.TEATIME);
+      await game.classicMode.startBattle([Species.FARIGIRAF]);
+
+      const farigiraf = game.scene.getPlayerPokemon()!;
+      farigiraf.hp = 1; // needed to allow berry procs
+
+      game.move.select(Moves.STUFF_CHEEKS);
+      await game.toNextTurn();
+
+      // Ate 2 petayas from moves + 1 of each at turn end; all 4 get tallied on turn end
+      expect(farigiraf.summonData.berriesEatenLast).toEqual([
+        BerryType.PETAYA,
+        BerryType.PETAYA,
+        BerryType.PETAYA,
+        BerryType.LIECHI,
+      ]);
+      expect(farigiraf.turnData.berriesEaten).toEqual([]);
+
+      game.move.select(Moves.SPLASH);
+      await game.toNextTurn();
+
+      // previous berries eaten and deleted from summon data as remaining eaten berries move to replace them
+      expect(farigiraf.summonData.berriesEatenLast).toEqual([BerryType.LIECHI, BerryType.LIECHI]);
+      expect(farigiraf.turnData.berriesEaten).toEqual([]);
+      expect(farigiraf.getStatStage(Stat.SPATK)).toBe(6); // 3+0+3
+      expect(farigiraf.getStatStage(Stat.ATK)).toBe(4); // 1+2+1
+    });
+
+    it("should reset both arrays on switch", async () => {
+      await game.classicMode.startBattle([Species.FARIGIRAF, Species.GIRAFARIG]);
+
+      const farigiraf = game.scene.getPlayerPokemon()!;
+      farigiraf.hp = 1;
+
+      // eat berry turn 1, switch out turn 2
+      game.move.select(Moves.SPLASH);
+      await game.toNextTurn();
+
+      const turn1Hp = farigiraf.hp;
+      game.doSwitchPokemon(1);
+      await game.toNextTurn();
+
+      // summonData got cleared due to switch, turnData got cleared due to turn end
+      expect(farigiraf.summonData.berriesEatenLast).toEqual([]);
+      expect(farigiraf.turnData.berriesEaten).toEqual([]);
+      expect(farigiraf.hp).toEqual(turn1Hp);
+
+      game.doSwitchPokemon(1);
+      await game.toNextTurn();
+
+      // TurnData gets cleared while switching in
+      expect(farigiraf.summonData.berriesEatenLast).toEqual([]);
+      expect(farigiraf.turnData.berriesEaten).toEqual([]);
+      expect(farigiraf.hp).toEqual(turn1Hp);
+    });
+
+    it("clears array if disabled", async () => {
+      game.override.enemyAbility(Abilities.NEUTRALIZING_GAS);
+      await game.classicMode.startBattle([Species.FARIGIRAF]);
+
+      const farigiraf = game.scene.getPlayerPokemon()!;
+      farigiraf.hp = 1;
+
+      game.move.select(Moves.SPLASH);
+      await game.phaseInterceptor.to("BerryPhase");
+
+      expect(farigiraf.summonData.berriesEatenLast).toEqual([]);
+      expect(farigiraf.turnData.berriesEaten).toEqual([BerryType.SITRUS]);
+
+      await game.toNextTurn();
+
+      // both arrays empty since neut gas disabled both the mid-turn and post-turn effects
+      expect(farigiraf.summonData.berriesEatenLast).toEqual([]);
+      expect(farigiraf.turnData.berriesEaten).toEqual([]);
+    });
+  });
+
+  describe("regurgiates berries", () => {
+    it("re-triggers effects on eater without pushing to array", async () => {
+      const apply = vi.spyOn(RepeatBerryNextTurnAbAttr.prototype, "apply");
+      await game.classicMode.startBattle([Species.FARIGIRAF]);
+
+      const farigiraf = game.scene.getPlayerPokemon()!;
+      farigiraf.hp = 1;
+
+      game.move.select(Moves.SPLASH);
+      await game.toNextTurn();
+
+      // ate 1 sitrus the turn prior, spitball pending
+      expect(farigiraf.summonData.berriesEatenLast).toEqual([BerryType.SITRUS]);
+      expect(farigiraf.turnData.berriesEaten).toEqual([]);
+      expect(apply.mock.lastCall).toBeUndefined();
+
+      const turn1Hp = farigiraf.hp;
+
+      game.move.select(Moves.SPLASH);
+      await game.phaseInterceptor.to("TurnEndPhase");
+
+      // healed back up to half without adding any more to array
+      expect(farigiraf.hp).toBeGreaterThan(turn1Hp);
+      expect(farigiraf.summonData.berriesEatenLast).toEqual([]);
+      expect(farigiraf.turnData.berriesEaten).toEqual([]);
+    });
+
+    it("bypasses unnerve", async () => {
+      game.override.enemyAbility(Abilities.UNNERVE);
+      await game.classicMode.startBattle([Species.FARIGIRAF]);
+
+      const farigiraf = game.scene.getPlayerPokemon()!;
+      farigiraf.hp = 1;
+
+      game.move.select(Moves.SPLASH);
+      await game.toNextTurn();
+      game.move.select(Moves.SPLASH);
+      await game.phaseInterceptor.to("TurnEndPhase");
+
+      // Turn end proc set the berriesEatenLast array back to being empty
+      expect(farigiraf.summonData.berriesEatenLast).toEqual([]);
+      expect(farigiraf.turnData.berriesEaten).toEqual([]);
+      expect(farigiraf.hp).toBeGreaterThanOrEqual(farigiraf.hp / 2);
+    });
+
+    it("doesn't trigger on non-eating removal", async () => {
+      game.override.enemyMoveset(Moves.INCINERATE);
+      await game.classicMode.startBattle([Species.FARIGIRAF]);
+
+      const farigiraf = game.scene.getPlayerPokemon()!;
+      farigiraf.hp = farigiraf.getMaxHp() / 4;
+
+      game.move.select(Moves.SPLASH);
+      await game.toNextTurn();
+
+      // no berries eaten due to getting cooked
+      expect(farigiraf.summonData.berriesEatenLast).toEqual([]);
+      expect(farigiraf.turnData.berriesEaten).toEqual([]);
+      expect(farigiraf.hp).toBeLessThan(farigiraf.getMaxHp() / 4);
+    });
+
+    it("works with pluck", async () => {
+      game.override
+        .enemySpecies(Species.BLAZIKEN)
+        .enemyHeldItems([{ name: "BERRY", type: BerryType.PETAYA, count: 1 }])
+        .startingHeldItems([]);
+      await game.classicMode.startBattle([Species.FARIGIRAF]);
+
+      const farigiraf = game.scene.getPlayerPokemon()!;
+
+      game.move.select(Moves.BUG_BITE);
+      await game.toNextTurn();
+
+      game.move.select(Moves.SPLASH);
+      await game.toNextTurn();
+
+      // berry effect triggered twice - once for bug bite, once for cud chew
+      expect(farigiraf.getStatStage(Stat.SPATK)).toBe(2);
+    });
+
+    it("works with Ripen", async () => {
+      game.override.passiveAbility(Abilities.RIPEN);
+      await game.classicMode.startBattle([Species.FARIGIRAF]);
+
+      const farigiraf = game.scene.getPlayerPokemon()!;
+      farigiraf.hp = 1;
+
+      game.move.select(Moves.SPLASH);
+      await game.toNextTurn();
+      game.move.select(Moves.SPLASH);
+      await game.toNextTurn();
+
+      // Rounding errors only ever cost a maximum of 4 hp
+      expect(farigiraf.getInverseHp()).toBeLessThanOrEqual(3);
+    });
+
+    it("is preserved on reload/wave clear", async () => {
+      game.override.enemyLevel(1);
+      await game.classicMode.startBattle([Species.FARIGIRAF]);
+
+      const farigiraf = game.scene.getPlayerPokemon()!;
+      farigiraf.hp = 1;
+
+      game.move.select(Moves.HYPER_VOICE);
+      await game.toNextWave();
+
+      // berry went yummy yummy in big fat giraffe tummy
+      expect(farigiraf.summonData.berriesEatenLast).toEqual([BerryType.SITRUS]);
+      expect(farigiraf.hp).toBeGreaterThan(1);
+
+      // reload and the berry should still be there
+      await game.reload.reloadSession();
+
+      const farigirafReloaded = game.scene.getPlayerPokemon()!;
+      expect(farigirafReloaded.summonData.berriesEatenLast).toEqual([BerryType.SITRUS]);
+
+      const wave1Hp = farigirafReloaded.hp;
+
+      // blow up next wave and we should proc the repeat eating
+      game.move.select(Moves.HYPER_VOICE);
+      await game.toNextWave();
+
+      expect(farigirafReloaded.hp).toBeGreaterThan(wave1Hp);
+    });
+  });
+});
diff --git a/src/test/abilities/dancer.test.ts b/test/abilities/dancer.test.ts
similarity index 63%
rename from src/test/abilities/dancer.test.ts
rename to test/abilities/dancer.test.ts
index 3a480316c96..cdd1e3221e9 100644
--- a/src/test/abilities/dancer.test.ts
+++ b/test/abilities/dancer.test.ts
@@ -3,7 +3,7 @@ import type { MovePhase } from "#app/phases/move-phase";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
@@ -23,39 +23,40 @@ describe("Abilities - Dancer", () => {
 
   beforeEach(() => {
     game = new GameManager(phaserGame);
-    game.override.battleType("double");
+    game.override.battleStyle("double");
   });
 
   // Reference Link: https://bulbapedia.bulbagarden.net/wiki/Dancer_(Ability)
 
   it("triggers when dance moves are used, doesn't consume extra PP", async () => {
-    game.override
-      .enemyAbility(Abilities.DANCER)
-      .enemySpecies(Species.MAGIKARP)
-      .enemyMoveset(Moves.VICTORY_DANCE);
-    await game.classicMode.startBattle([ Species.ORICORIO, Species.FEEBAS ]);
+    game.override.enemyAbility(Abilities.DANCER).enemySpecies(Species.MAGIKARP).enemyMoveset(Moves.VICTORY_DANCE);
+    await game.classicMode.startBattle([Species.ORICORIO, Species.FEEBAS]);
 
-    const [ oricorio, feebas ] = game.scene.getPlayerField();
-    game.move.changeMoveset(oricorio, [ Moves.SWORDS_DANCE, Moves.VICTORY_DANCE, Moves.SPLASH ]);
-    game.move.changeMoveset(feebas, [ Moves.SWORDS_DANCE, Moves.SPLASH ]);
+    const [oricorio, feebas] = game.scene.getPlayerField();
+    game.move.changeMoveset(oricorio, [Moves.SWORDS_DANCE, Moves.VICTORY_DANCE, Moves.SPLASH]);
+    game.move.changeMoveset(feebas, [Moves.SWORDS_DANCE, Moves.SPLASH]);
 
     game.move.select(Moves.SPLASH);
     game.move.select(Moves.SWORDS_DANCE, 1);
-    await game.setTurnOrder([ BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.PLAYER, BattlerIndex.ENEMY_2 ]);
-    await game.phaseInterceptor.to("MovePhase");
-    // immediately copies ally move
-    await game.phaseInterceptor.to("MovePhase", false);
+    await game.setTurnOrder([BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.PLAYER, BattlerIndex.ENEMY_2]);
+    await game.phaseInterceptor.to("MovePhase"); // feebas uses swords dance
+    await game.phaseInterceptor.to("MovePhase", false); // oricorio copies swords dance
+
     let currentPhase = game.scene.getCurrentPhase() as MovePhase;
     expect(currentPhase.pokemon).toBe(oricorio);
     expect(currentPhase.move.moveId).toBe(Moves.SWORDS_DANCE);
-    await game.phaseInterceptor.to("MoveEndPhase");
-    await game.phaseInterceptor.to("MovePhase");
-    // immediately copies enemy move
-    await game.phaseInterceptor.to("MovePhase", false);
+
+    await game.phaseInterceptor.to("MoveEndPhase"); // end oricorio's move
+    await game.phaseInterceptor.to("MovePhase"); // magikarp 1 copies swords dance
+    await game.phaseInterceptor.to("MovePhase"); // magikarp 2 copies swords dance
+    await game.phaseInterceptor.to("MovePhase"); // magikarp (left) uses victory dance
+    await game.phaseInterceptor.to("MovePhase", false); // oricorio copies magikarp's victory dance
+
     currentPhase = game.scene.getCurrentPhase() as MovePhase;
     expect(currentPhase.pokemon).toBe(oricorio);
     expect(currentPhase.move.moveId).toBe(Moves.VICTORY_DANCE);
-    await game.phaseInterceptor.to("BerryPhase");
+
+    await game.phaseInterceptor.to("BerryPhase"); // finish the turn
 
     // doesn't use PP if copied move is also in moveset
     expect(oricorio.moveset[0]?.ppUsed).toBe(0);
@@ -65,20 +66,20 @@ describe("Abilities - Dancer", () => {
   // TODO: Enable after Dancer rework to not push to move history
   it.todo("should not count as the last move used for mirror move/instruct", async () => {
     game.override
-      .moveset([ Moves.FIERY_DANCE, Moves.REVELATION_DANCE ])
-      .enemyMoveset([ Moves.INSTRUCT, Moves.MIRROR_MOVE, Moves.SPLASH ])
+      .moveset([Moves.FIERY_DANCE, Moves.REVELATION_DANCE])
+      .enemyMoveset([Moves.INSTRUCT, Moves.MIRROR_MOVE, Moves.SPLASH])
       .enemySpecies(Species.SHUCKLE)
       .enemyLevel(10);
-    await game.classicMode.startBattle([ Species.ORICORIO, Species.FEEBAS ]);
+    await game.classicMode.startBattle([Species.ORICORIO, Species.FEEBAS]);
 
-    const [ oricorio ] = game.scene.getPlayerField();
-    const [ , shuckle2 ] = game.scene.getEnemyField();
+    const [oricorio] = game.scene.getPlayerField();
+    const [, shuckle2] = game.scene.getEnemyField();
 
     game.move.select(Moves.REVELATION_DANCE, BattlerIndex.PLAYER, BattlerIndex.ENEMY_2);
     game.move.select(Moves.FIERY_DANCE, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY_2);
     await game.forceEnemyMove(Moves.INSTRUCT, BattlerIndex.PLAYER);
     await game.forceEnemyMove(Moves.MIRROR_MOVE, BattlerIndex.PLAYER);
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY_2, BattlerIndex.ENEMY ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY_2, BattlerIndex.ENEMY]);
     await game.phaseInterceptor.to("MovePhase"); // Oricorio rev dance
     await game.phaseInterceptor.to("MovePhase"); // Feebas fiery dance
     await game.phaseInterceptor.to("MovePhase"); // Oricorio fiery dance (from dancer)
@@ -97,6 +98,5 @@ describe("Abilities - Dancer", () => {
     currentPhase = game.scene.getCurrentPhase() as MovePhase;
     expect(currentPhase.pokemon).toBe(oricorio);
     expect(currentPhase.move.moveId).toBe(Moves.REVELATION_DANCE);
-
   });
 });
diff --git a/src/test/abilities/defiant.test.ts b/test/abilities/defiant.test.ts
similarity index 86%
rename from src/test/abilities/defiant.test.ts
rename to test/abilities/defiant.test.ts
index aa8d250dad7..d06aef4d785 100644
--- a/src/test/abilities/defiant.test.ts
+++ b/test/abilities/defiant.test.ts
@@ -3,7 +3,7 @@ import { TurnInitPhase } from "#app/phases/turn-init-phase";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
@@ -24,16 +24,17 @@ describe("Abilities - Defiant", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
 
-    game.override.battleType("single")
+    game.override
+      .battleStyle("single")
       .enemySpecies(Species.BEEDRILL)
       .enemyMoveset(Moves.TICKLE)
       .startingLevel(1)
-      .moveset([ Moves.SPLASH, Moves.CLOSE_COMBAT ])
+      .moveset([Moves.SPLASH, Moves.CLOSE_COMBAT])
       .ability(Abilities.DEFIANT);
   });
 
   it("lower atk and def by 1 via tickle, then increase atk by 4 via defiant", async () => {
-    await game.classicMode.startBattle([ Species.FLYGON ]);
+    await game.classicMode.startBattle([Species.FLYGON]);
 
     const playerPokemon = game.scene.getPlayerPokemon()!;
     game.move.select(Moves.SPLASH);
@@ -45,7 +46,7 @@ describe("Abilities - Defiant", () => {
 
   it("lowering your own stats should not trigger defiant", async () => {
     game.override.enemyMoveset(Moves.SPLASH);
-    await game.classicMode.startBattle([ Species.FLYGON ]);
+    await game.classicMode.startBattle([Species.FLYGON]);
 
     const playerPokemon = game.scene.getPlayerPokemon()!;
     game.move.select(Moves.CLOSE_COMBAT);
@@ -58,7 +59,7 @@ describe("Abilities - Defiant", () => {
 
   it("white herb should remove only the negative effects", async () => {
     game.override.startingHeldItems([{ name: "WHITE_HERB" }]);
-    await game.classicMode.startBattle([ Species.FLYGON ]);
+    await game.classicMode.startBattle([Species.FLYGON]);
 
     const playerPokemon = game.scene.getPlayerPokemon()!;
     game.move.select(Moves.SPLASH);
diff --git a/src/test/abilities/desolate-land.test.ts b/test/abilities/desolate-land.test.ts
similarity index 70%
rename from src/test/abilities/desolate-land.test.ts
rename to test/abilities/desolate-land.test.ts
index 75576d7a8f6..697bd0a4c48 100644
--- a/src/test/abilities/desolate-land.test.ts
+++ b/test/abilities/desolate-land.test.ts
@@ -1,9 +1,11 @@
 import { PokeballType } from "#app/enums/pokeball";
 import { WeatherType } from "#app/enums/weather-type";
+import type { CommandPhase } from "#app/phases/command-phase";
+import { Command } from "#app/ui/command-ui-handler";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, it, expect, vi } from "vitest";
 
@@ -36,14 +38,12 @@ describe("Abilities - Desolate Land", () => {
    * is forcefully moved out of the field from moves such as Roar {@linkcode Moves.ROAR}
    */
   it("should lift only when all pokemon with this ability leave the field", async () => {
-    game.override
-      .battleType("double")
-      .enemyMoveset([ Moves.SPLASH, Moves.ROAR ]);
-    await game.classicMode.startBattle([ Species.MAGCARGO, Species.MAGCARGO, Species.MAGIKARP, Species.MAGIKARP ]);
+    game.override.battleStyle("double").enemyMoveset([Moves.SPLASH, Moves.ROAR]);
+    await game.classicMode.startBattle([Species.MAGCARGO, Species.MAGCARGO, Species.MAGIKARP, Species.MAGIKARP]);
 
     expect(game.scene.arena.weather?.weatherType).toBe(WeatherType.HARSH_SUN);
 
-    vi.spyOn(game.scene, "randBattleSeedInt").mockImplementation((range, min: number = 0) => {
+    vi.spyOn(game.scene, "randBattleSeedInt").mockImplementation((_range, min = 0) => {
       return min;
     });
 
@@ -59,7 +59,7 @@ describe("Abilities - Desolate Land", () => {
 
     await game.toNextTurn();
 
-    vi.spyOn(game.scene, "randBattleSeedInt").mockImplementation((range, min: number = 0) => {
+    vi.spyOn(game.scene, "randBattleSeedInt").mockImplementation((_range, min = 0) => {
       return min + 1;
     });
 
@@ -76,15 +76,15 @@ describe("Abilities - Desolate Land", () => {
 
   it("should lift when enemy faints", async () => {
     game.override
-      .battleType("single")
-      .moveset([ Moves.SHEER_COLD ])
+      .battleStyle("single")
+      .moveset([Moves.SHEER_COLD])
       .ability(Abilities.NO_GUARD)
       .startingLevel(100)
       .enemyLevel(1)
-      .enemyMoveset([ Moves.SPLASH ])
+      .enemyMoveset([Moves.SPLASH])
       .enemySpecies(Species.MAGCARGO)
       .enemyHasPassiveAbility(true);
-    await game.classicMode.startBattle([ Species.MAGIKARP ]);
+    await game.classicMode.startBattle([Species.MAGIKARP]);
 
     expect(game.scene.arena.weather?.weatherType).toBe(WeatherType.HARSH_SUN);
 
@@ -96,11 +96,8 @@ describe("Abilities - Desolate Land", () => {
   });
 
   it("should lift when pokemon returns upon switching from double to single battle", async () => {
-    game.override
-      .battleType("even-doubles")
-      .enemyMoveset([ Moves.SPLASH, Moves.MEMENTO ])
-      .startingWave(12);
-    await game.classicMode.startBattle([ Species.MAGIKARP, Species.MAGCARGO ]);
+    game.override.battleStyle("even-doubles").enemyMoveset([Moves.SPLASH, Moves.MEMENTO]).startingWave(12);
+    await game.classicMode.startBattle([Species.MAGIKARP, Species.MAGCARGO]);
 
     expect(game.scene.arena.weather?.weatherType).toBe(WeatherType.HARSH_SUN);
 
@@ -120,11 +117,11 @@ describe("Abilities - Desolate Land", () => {
 
   it("should lift when enemy is captured", async () => {
     game.override
-      .battleType("single")
-      .enemyMoveset([ Moves.SPLASH ])
+      .battleStyle("single")
+      .enemyMoveset([Moves.SPLASH])
       .enemySpecies(Species.MAGCARGO)
       .enemyHasPassiveAbility(true);
-    await game.classicMode.startBattle([ Species.MAGIKARP ]);
+    await game.classicMode.startBattle([Species.MAGIKARP]);
 
     expect(game.scene.arena.weather?.weatherType).toBe(WeatherType.HARSH_SUN);
 
@@ -136,4 +133,18 @@ describe("Abilities - Desolate Land", () => {
 
     expect(game.scene.arena.weather?.weatherType).not.toBe(WeatherType.HARSH_SUN);
   });
+
+  it("should lift after fleeing from a wild pokemon", async () => {
+    game.override.enemyAbility(Abilities.DESOLATE_LAND).ability(Abilities.BALL_FETCH);
+    await game.classicMode.startBattle([Species.MAGIKARP]);
+    expect(game.scene.arena.weather?.weatherType).toBe(WeatherType.HARSH_SUN);
+
+    vi.spyOn(game.scene.getPlayerPokemon()!, "randBattleSeedInt").mockReturnValue(0);
+
+    const commandPhase = game.scene.getCurrentPhase() as CommandPhase;
+    commandPhase.handleCommand(Command.RUN, 0);
+    await game.phaseInterceptor.to("BerryPhase");
+
+    expect(game.scene.arena.weather?.weatherType).not.toBe(WeatherType.HARSH_SUN);
+  });
 });
diff --git a/src/test/abilities/disguise.test.ts b/test/abilities/disguise.test.ts
similarity index 87%
rename from src/test/abilities/disguise.test.ts
rename to test/abilities/disguise.test.ts
index 07a84bd7a5a..0e62b8ad448 100644
--- a/src/test/abilities/disguise.test.ts
+++ b/test/abilities/disguise.test.ts
@@ -1,14 +1,13 @@
 import { BattlerIndex } from "#app/battle";
-import { toDmgValue } from "#app/utils";
+import { toDmgValue } from "#app/utils/common";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { Stat } from "#enums/stat";
 import { StatusEffect } from "#enums/status-effect";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
-
 describe("Abilities - Disguise", () => {
   let phaserGame: Phaser.Game;
   let game: GameManager;
@@ -28,11 +27,11 @@ describe("Abilities - Disguise", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     game.override
-      .battleType("single")
+      .battleStyle("single")
       .enemySpecies(Species.MIMIKYU)
       .enemyMoveset(Moves.SPLASH)
       .starterSpecies(Species.REGIELEKI)
-      .moveset([ Moves.SHADOW_SNEAK, Moves.VACUUM_WAVE, Moves.TOXIC_THREAD, Moves.SPLASH ]);
+      .moveset([Moves.SHADOW_SNEAK, Moves.VACUUM_WAVE, Moves.TOXIC_THREAD, Moves.SPLASH]);
   });
 
   it("takes no damage from attacking move and transforms to Busted form, takes 1/8 max HP damage from the disguise breaking", async () => {
@@ -67,7 +66,7 @@ describe("Abilities - Disguise", () => {
   });
 
   it("takes no damage from the first hit of a multihit move and transforms to Busted form, then takes damage from the second hit", async () => {
-    game.override.moveset([ Moves.SURGING_STRIKES ]);
+    game.override.moveset([Moves.SURGING_STRIKES]);
     game.override.enemyLevel(5);
     await game.classicMode.startBattle();
 
@@ -107,10 +106,10 @@ describe("Abilities - Disguise", () => {
   });
 
   it("persists form change when switched out", async () => {
-    game.override.enemyMoveset([ Moves.SHADOW_SNEAK ]);
+    game.override.enemyMoveset([Moves.SHADOW_SNEAK]);
     game.override.starterSpecies(0);
 
-    await game.classicMode.startBattle([ Species.MIMIKYU, Species.FURRET ]);
+    await game.classicMode.startBattle([Species.MIMIKYU, Species.FURRET]);
 
     const mimikyu = game.scene.getPlayerPokemon()!;
     const maxHp = mimikyu.getMaxHp();
@@ -134,9 +133,9 @@ describe("Abilities - Disguise", () => {
   it("persists form change when wave changes with no arena reset", async () => {
     game.override.starterSpecies(0);
     game.override.starterForms({
-      [Species.MIMIKYU]: bustedForm
+      [Species.MIMIKYU]: bustedForm,
     });
-    await game.classicMode.startBattle([ Species.FURRET, Species.MIMIKYU ]);
+    await game.classicMode.startBattle([Species.FURRET, Species.MIMIKYU]);
 
     const mimikyu = game.scene.getPlayerParty()[1]!;
     expect(mimikyu.formIndex).toBe(bustedForm);
@@ -152,7 +151,7 @@ describe("Abilities - Disguise", () => {
     game.override.startingWave(4);
     game.override.starterSpecies(Species.MIMIKYU);
     game.override.starterForms({
-      [Species.MIMIKYU]: bustedForm
+      [Species.MIMIKYU]: bustedForm,
     });
 
     await game.classicMode.startBattle();
@@ -172,10 +171,10 @@ describe("Abilities - Disguise", () => {
     game.override.startingWave(10);
     game.override.starterSpecies(0);
     game.override.starterForms({
-      [Species.MIMIKYU]: bustedForm
+      [Species.MIMIKYU]: bustedForm,
     });
 
-    await game.classicMode.startBattle([ Species.MIMIKYU, Species.FURRET ]);
+    await game.classicMode.startBattle([Species.MIMIKYU, Species.FURRET]);
 
     const mimikyu1 = game.scene.getPlayerPokemon()!;
 
@@ -187,13 +186,13 @@ describe("Abilities - Disguise", () => {
     await game.toNextTurn();
     game.move.select(Moves.SPLASH);
     await game.doKillOpponents();
-    await game.phaseInterceptor.to("PartyHealPhase");
+    await game.phaseInterceptor.to("QuietFormChangePhase");
 
     expect(mimikyu1.formIndex).toBe(disguisedForm);
   });
 
   it("doesn't faint twice when fainting due to Disguise break damage, nor prevent faint from Disguise break damage if using Endure", async () => {
-    game.override.enemyMoveset([ Moves.ENDURE ]);
+    game.override.enemyMoveset([Moves.ENDURE]);
     await game.classicMode.startBattle();
 
     const mimikyu = game.scene.getEnemyPokemon()!;
@@ -208,7 +207,7 @@ describe("Abilities - Disguise", () => {
 
   it("activates when Aerilate circumvents immunity to the move's base type", async () => {
     game.override.ability(Abilities.AERILATE);
-    game.override.moveset([ Moves.TACKLE ]);
+    game.override.moveset([Moves.TACKLE]);
 
     await game.classicMode.startBattle();
 
@@ -225,13 +224,11 @@ describe("Abilities - Disguise", () => {
   });
 
   it("doesn't trigger if user is behind a substitute", async () => {
-    game.override
-      .enemyMoveset(Moves.SUBSTITUTE)
-      .moveset(Moves.POWER_TRIP);
+    game.override.enemyMoveset(Moves.SUBSTITUTE).moveset(Moves.POWER_TRIP);
     await game.classicMode.startBattle();
 
     game.move.select(Moves.POWER_TRIP);
-    await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
     await game.toNextTurn();
 
     expect(game.scene.getEnemyPokemon()!.formIndex).toBe(disguisedForm);
diff --git a/src/test/abilities/dry_skin.test.ts b/test/abilities/dry_skin.test.ts
similarity index 92%
rename from src/test/abilities/dry_skin.test.ts
rename to test/abilities/dry_skin.test.ts
index 314564df15c..398d09393ab 100644
--- a/src/test/abilities/dry_skin.test.ts
+++ b/test/abilities/dry_skin.test.ts
@@ -1,7 +1,7 @@
 import { Species } from "#app/enums/species";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
@@ -22,13 +22,13 @@ describe("Abilities - Dry Skin", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     game.override
-      .battleType("single")
+      .battleStyle("single")
       .disableCrits()
       .enemyAbility(Abilities.DRY_SKIN)
       .enemyMoveset(Moves.SPLASH)
       .enemySpecies(Species.CHARMANDER)
       .ability(Abilities.BALL_FETCH)
-      .moveset([ Moves.SUNNY_DAY, Moves.RAIN_DANCE, Moves.SPLASH, Moves.WATER_GUN ])
+      .moveset([Moves.SUNNY_DAY, Moves.RAIN_DANCE, Moves.SPLASH, Moves.WATER_GUN])
       .starterSpecies(Species.CHANDELURE);
   });
 
@@ -69,7 +69,7 @@ describe("Abilities - Dry Skin", () => {
   });
 
   it("opposing fire attacks do 25% more damage", async () => {
-    game.override.moveset([ Moves.FLAMETHROWER ]);
+    game.override.moveset([Moves.FLAMETHROWER]);
     await game.classicMode.startBattle();
 
     const enemy = game.scene.getEnemyPokemon()!;
@@ -105,7 +105,7 @@ describe("Abilities - Dry Skin", () => {
   });
 
   it("opposing water attacks do not heal if they were protected from", async () => {
-    game.override.enemyMoveset([ Moves.PROTECT ]);
+    game.override.enemyMoveset([Moves.PROTECT]);
 
     await game.classicMode.startBattle();
 
@@ -119,7 +119,7 @@ describe("Abilities - Dry Skin", () => {
   });
 
   it("multi-strike water attacks only heal once", async () => {
-    game.override.moveset([ Moves.WATER_GUN, Moves.WATER_SHURIKEN ]);
+    game.override.moveset([Moves.WATER_GUN, Moves.WATER_SHURIKEN]);
 
     await game.classicMode.startBattle();
 
diff --git a/src/test/abilities/early_bird.test.ts b/test/abilities/early_bird.test.ts
similarity index 88%
rename from src/test/abilities/early_bird.test.ts
rename to test/abilities/early_bird.test.ts
index a69290fa1e4..0f298ba479d 100644
--- a/src/test/abilities/early_bird.test.ts
+++ b/test/abilities/early_bird.test.ts
@@ -4,7 +4,7 @@ import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { StatusEffect } from "#enums/status-effect";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
@@ -25,9 +25,9 @@ describe("Abilities - Early Bird", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     game.override
-      .moveset([ Moves.REST, Moves.BELLY_DRUM, Moves.SPLASH ])
+      .moveset([Moves.REST, Moves.BELLY_DRUM, Moves.SPLASH])
       .ability(Abilities.EARLY_BIRD)
-      .battleType("single")
+      .battleStyle("single")
       .disableCrits()
       .enemySpecies(Species.MAGIKARP)
       .enemyAbility(Abilities.BALL_FETCH)
@@ -35,7 +35,7 @@ describe("Abilities - Early Bird", () => {
   });
 
   it("reduces Rest's sleep time to 1 turn", async () => {
-    await game.classicMode.startBattle([ Species.FEEBAS ]);
+    await game.classicMode.startBattle([Species.FEEBAS]);
 
     const player = game.scene.getPlayerPokemon()!;
 
@@ -60,7 +60,7 @@ describe("Abilities - Early Bird", () => {
   });
 
   it("reduces 3-turn sleep to 1 turn", async () => {
-    await game.classicMode.startBattle([ Species.FEEBAS ]);
+    await game.classicMode.startBattle([Species.FEEBAS]);
 
     const player = game.scene.getPlayerPokemon()!;
     player.status = new Status(StatusEffect.SLEEP, 0, 4);
@@ -79,7 +79,7 @@ describe("Abilities - Early Bird", () => {
   });
 
   it("reduces 1-turn sleep to 0 turns", async () => {
-    await game.classicMode.startBattle([ Species.FEEBAS ]);
+    await game.classicMode.startBattle([Species.FEEBAS]);
 
     const player = game.scene.getPlayerPokemon()!;
     player.status = new Status(StatusEffect.SLEEP, 0, 2);
diff --git a/src/test/abilities/flash_fire.test.ts b/test/abilities/flash_fire.test.ts
similarity index 78%
rename from src/test/abilities/flash_fire.test.ts
rename to test/abilities/flash_fire.test.ts
index 0ca55227ea4..8d94d21adf8 100644
--- a/src/test/abilities/flash_fire.test.ts
+++ b/test/abilities/flash_fire.test.ts
@@ -6,7 +6,7 @@ import { TurnEndPhase } from "#app/phases/turn-end-phase";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { StatusEffect } from "#enums/status-effect";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
@@ -27,7 +27,7 @@ describe("Abilities - Flash Fire", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     game.override
-      .battleType("single")
+      .battleStyle("single")
       .ability(Abilities.FLASH_FIRE)
       .enemyAbility(Abilities.BALL_FETCH)
       .startingLevel(20)
@@ -35,10 +35,9 @@ describe("Abilities - Flash Fire", () => {
       .disableCrits();
   });
 
-
   it("immune to Fire-type moves", async () => {
-    game.override.enemyMoveset([ Moves.EMBER ]).moveset(Moves.SPLASH);
-    await game.classicMode.startBattle([ Species.BLISSEY ]);
+    game.override.enemyMoveset([Moves.EMBER]).moveset(Moves.SPLASH);
+    await game.classicMode.startBattle([Species.BLISSEY]);
 
     const blissey = game.scene.getPlayerPokemon()!;
 
@@ -48,8 +47,8 @@ describe("Abilities - Flash Fire", () => {
   }, 20000);
 
   it("not activate if the Pokémon is protected from the Fire-type move", async () => {
-    game.override.enemyMoveset([ Moves.EMBER ]).moveset([ Moves.PROTECT ]);
-    await game.classicMode.startBattle([ Species.BLISSEY ]);
+    game.override.enemyMoveset([Moves.EMBER]).moveset([Moves.PROTECT]);
+    await game.classicMode.startBattle([Species.BLISSEY]);
 
     const blissey = game.scene.getPlayerPokemon()!;
 
@@ -59,8 +58,8 @@ describe("Abilities - Flash Fire", () => {
   }, 20000);
 
   it("activated by Will-O-Wisp", async () => {
-    game.override.enemyMoveset([ Moves.WILL_O_WISP ]).moveset(Moves.SPLASH);
-    await game.classicMode.startBattle([ Species.BLISSEY ]);
+    game.override.enemyMoveset([Moves.WILL_O_WISP]).moveset(Moves.SPLASH);
+    await game.classicMode.startBattle([Species.BLISSEY]);
 
     const blissey = game.scene.getPlayerPokemon()!;
 
@@ -74,9 +73,9 @@ describe("Abilities - Flash Fire", () => {
   }, 20000);
 
   it("activated after being frozen", async () => {
-    game.override.enemyMoveset([ Moves.EMBER ]).moveset(Moves.SPLASH);
+    game.override.enemyMoveset([Moves.EMBER]).moveset(Moves.SPLASH);
     game.override.statusEffect(StatusEffect.FREEZE);
-    await game.classicMode.startBattle([ Species.BLISSEY ]);
+    await game.classicMode.startBattle([Species.BLISSEY]);
 
     const blissey = game.scene.getPlayerPokemon()!;
 
@@ -87,12 +86,12 @@ describe("Abilities - Flash Fire", () => {
   }, 20000);
 
   it("not passing with baton pass", async () => {
-    game.override.enemyMoveset([ Moves.EMBER ]).moveset([ Moves.BATON_PASS ]);
-    await game.classicMode.startBattle([ Species.BLISSEY, Species.CHANSEY ]);
+    game.override.enemyMoveset([Moves.EMBER]).moveset([Moves.BATON_PASS]);
+    await game.classicMode.startBattle([Species.BLISSEY, Species.CHANSEY]);
 
     // ensure use baton pass after enemy moved
     game.move.select(Moves.BATON_PASS);
-    await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
 
     game.doSelectPartyPokemon(1);
 
@@ -103,16 +102,16 @@ describe("Abilities - Flash Fire", () => {
   }, 20000);
 
   it("boosts Fire-type move when the ability is activated", async () => {
-    game.override.enemyMoveset([ Moves.FIRE_PLEDGE ]).moveset([ Moves.EMBER, Moves.SPLASH ]);
+    game.override.enemyMoveset([Moves.FIRE_PLEDGE]).moveset([Moves.EMBER, Moves.SPLASH]);
     game.override.enemyAbility(Abilities.FLASH_FIRE).ability(Abilities.NONE);
-    await game.classicMode.startBattle([ Species.BLISSEY ]);
+    await game.classicMode.startBattle([Species.BLISSEY]);
     const blissey = game.scene.getPlayerPokemon()!;
     const initialHP = 1000;
     blissey.hp = initialHP;
 
     // first turn
     game.move.select(Moves.EMBER);
-    await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
     await game.phaseInterceptor.to(TurnEndPhase);
     const originalDmg = initialHP - blissey.hp;
 
@@ -131,7 +130,7 @@ describe("Abilities - Flash Fire", () => {
     game.override.moveset(Moves.FIRE_PLEDGE).enemyMoveset(Moves.EMBER);
     game.override.enemyAbility(Abilities.NONE).ability(Abilities.FLASH_FIRE);
     game.override.enemySpecies(Species.BLISSEY);
-    await game.classicMode.startBattle([ Species.RATTATA ]);
+    await game.classicMode.startBattle([Species.RATTATA]);
 
     const blissey = game.scene.getEnemyPokemon()!;
     const initialHP = 1000;
@@ -139,7 +138,7 @@ describe("Abilities - Flash Fire", () => {
 
     // first turn
     game.move.select(Moves.FIRE_PLEDGE);
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
     await game.phaseInterceptor.to("MoveEffectPhase");
     await game.move.forceMiss();
     await game.phaseInterceptor.to(TurnEndPhase);
diff --git a/test/abilities/flower_gift.test.ts b/test/abilities/flower_gift.test.ts
new file mode 100644
index 00000000000..f2b32dc4c80
--- /dev/null
+++ b/test/abilities/flower_gift.test.ts
@@ -0,0 +1,221 @@
+import { BattlerIndex } from "#app/battle";
+import { allAbilities } from "#app/data/data-lists";
+import { Abilities } from "#app/enums/abilities";
+import { Stat } from "#app/enums/stat";
+import { WeatherType } from "#app/enums/weather-type";
+import { TurnEndPhase } from "#app/phases/turn-end-phase";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import GameManager from "#test/testUtils/gameManager";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
+
+describe("Abilities - Flower Gift", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+  const OVERCAST_FORM = 0;
+  const SUNSHINE_FORM = 1;
+
+  /**
+   * Tests reverting to normal form when Cloud Nine/Air Lock is active on the field
+   * @param {GameManager} game The game manager instance
+   * @param {Abilities} ability The ability that is active on the field
+   */
+  const testRevertFormAgainstAbility = async (game: GameManager, ability: Abilities) => {
+    game.override.starterForms({ [Species.CASTFORM]: SUNSHINE_FORM }).enemyAbility(ability);
+    await game.classicMode.startBattle([Species.CASTFORM]);
+
+    game.move.select(Moves.SPLASH);
+
+    expect(game.scene.getPlayerPokemon()?.formIndex).toBe(OVERCAST_FORM);
+  };
+
+  /**
+   * Tests damage dealt by a move used against a target before and after Flower Gift is activated.
+   * @param game The game manager instance
+   * @param move The move that should be used
+   * @param allyAttacker True if the ally is attacking the enemy, false if the enemy is attacking the ally
+   * @param ability The ability that the ally pokemon should have
+   * @param enemyAbility The ability that the enemy pokemon should have
+   *
+   * @returns Two numbers, the first being the damage done to the target without flower gift active, the second being the damage done with flower gift active
+   */
+  const testDamageDealt = async (
+    game: GameManager,
+    move: Moves,
+    allyAttacker: boolean,
+    allyAbility = Abilities.BALL_FETCH,
+    enemyAbility = Abilities.BALL_FETCH,
+  ): Promise<[number, number]> => {
+    game.override.battleStyle("double");
+    game.override.moveset([Moves.SPLASH, Moves.SUNNY_DAY, move, Moves.HEAL_PULSE]);
+    game.override.enemyMoveset([Moves.SPLASH, Moves.HEAL_PULSE]);
+    const target_index = allyAttacker ? BattlerIndex.ENEMY : BattlerIndex.PLAYER_2;
+    const attacker_index = allyAttacker ? BattlerIndex.PLAYER_2 : BattlerIndex.ENEMY;
+    const ally_move = allyAttacker ? move : Moves.SPLASH;
+    const enemy_move = allyAttacker ? Moves.SPLASH : move;
+    const ally_target = allyAttacker ? BattlerIndex.ENEMY : null;
+
+    await game.classicMode.startBattle([Species.CHERRIM, Species.MAGIKARP]);
+    const target = allyAttacker ? game.scene.getEnemyField()[0] : game.scene.getPlayerField()[1];
+    const initialHp = target.getMaxHp();
+
+    // Override the ability for the target and attacker only
+    vi.spyOn(game.scene.getPlayerField()[1], "getAbility").mockReturnValue(allAbilities[allyAbility]);
+    vi.spyOn(game.scene.getEnemyField()[0], "getAbility").mockReturnValue(allAbilities[enemyAbility]);
+
+    // turn 1
+    game.move.select(Moves.SUNNY_DAY, 0);
+    game.move.select(ally_move, 1, ally_target);
+    await game.forceEnemyMove(enemy_move, BattlerIndex.PLAYER_2);
+    await game.forceEnemyMove(Moves.SPLASH);
+    // Ensure sunny day is used last.
+    await game.setTurnOrder([attacker_index, target_index, BattlerIndex.ENEMY_2, BattlerIndex.PLAYER]);
+    await game.phaseInterceptor.to(TurnEndPhase);
+    const damageWithoutGift = initialHp - target.hp;
+
+    target.hp = initialHp;
+
+    // turn 2. Make target use recover to reset hp calculation.
+    game.move.select(Moves.SPLASH, 0, target_index);
+    game.move.select(ally_move, 1, ally_target);
+    await game.forceEnemyMove(enemy_move, BattlerIndex.PLAYER_2);
+    await game.forceEnemyMove(Moves.SPLASH);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY_2, target_index, attacker_index]);
+    await game.phaseInterceptor.to(TurnEndPhase);
+    const damageWithGift = initialHp - target.hp;
+
+    return [damageWithoutGift, damageWithGift];
+  };
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+    game.override
+      .moveset([Moves.SPLASH, Moves.SUNSTEEL_STRIKE, Moves.SUNNY_DAY, Moves.MUD_SLAP])
+      .enemySpecies(Species.MAGIKARP)
+      .enemyMoveset(Moves.SPLASH)
+      .enemyAbility(Abilities.BALL_FETCH)
+      .enemyLevel(100)
+      .startingLevel(100);
+  });
+
+  it("increases the ATK and SPDEF stat stages of the Pokémon with this Ability and its allies by 1.5× during Harsh Sunlight", async () => {
+    game.override.battleStyle("double");
+    await game.classicMode.startBattle([Species.CHERRIM, Species.MAGIKARP]);
+
+    const [cherrim, magikarp] = game.scene.getPlayerField();
+    const cherrimAtkStat = cherrim.getEffectiveStat(Stat.ATK);
+    const cherrimSpDefStat = cherrim.getEffectiveStat(Stat.SPDEF);
+
+    const magikarpAtkStat = magikarp.getEffectiveStat(Stat.ATK);
+    const magikarpSpDefStat = magikarp.getEffectiveStat(Stat.SPDEF);
+
+    game.move.select(Moves.SUNNY_DAY, 0);
+    game.move.select(Moves.SPLASH, 1);
+
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2]);
+    await game.phaseInterceptor.to("TurnEndPhase");
+
+    expect(cherrim.formIndex).toBe(SUNSHINE_FORM);
+    expect(cherrim.getEffectiveStat(Stat.ATK)).toBe(Math.floor(cherrimAtkStat * 1.5));
+    expect(cherrim.getEffectiveStat(Stat.SPDEF)).toBe(Math.floor(cherrimSpDefStat * 1.5));
+    expect(magikarp.getEffectiveStat(Stat.ATK)).toBe(Math.floor(magikarpAtkStat * 1.5));
+    expect(magikarp.getEffectiveStat(Stat.SPDEF)).toBe(Math.floor(magikarpSpDefStat * 1.5));
+  });
+
+  it("should not increase the damage of an ally using an ability ignoring move", async () => {
+    const [damageWithGift, damageWithoutGift] = await testDamageDealt(game, Moves.SUNSTEEL_STRIKE, true);
+    expect(damageWithGift).toBe(damageWithoutGift);
+  });
+
+  it("should not increase the damage of a mold breaker ally", async () => {
+    const [damageWithGift, damageWithoutGift] = await testDamageDealt(game, Moves.TACKLE, true, Abilities.MOLD_BREAKER);
+    expect(damageWithGift).toBe(damageWithoutGift);
+  });
+
+  it("should decrease the damage an ally takes from a special attack", async () => {
+    const [damageWithoutGift, damageWithGift] = await testDamageDealt(game, Moves.MUD_SLAP, false);
+    expect(damageWithGift).toBeLessThan(damageWithoutGift);
+  });
+
+  it("should not decrease the damage an ally takes from a mold breaker enemy using a special attack", async () => {
+    const [damageWithoutGift, damageWithGift] = await testDamageDealt(
+      game,
+      Moves.MUD_SLAP,
+      false,
+      Abilities.BALL_FETCH,
+      Abilities.MOLD_BREAKER,
+    );
+    expect(damageWithGift).toBe(damageWithoutGift);
+  });
+
+  it("changes the Pokemon's form during Harsh Sunlight", async () => {
+    game.override.weather(WeatherType.HARSH_SUN);
+    await game.classicMode.startBattle([Species.CHERRIM]);
+
+    const cherrim = game.scene.getPlayerPokemon()!;
+    expect(cherrim.formIndex).toBe(SUNSHINE_FORM);
+
+    game.move.select(Moves.SPLASH);
+  });
+
+  it("reverts to Overcast Form if a Pokémon on the field has Air Lock", async () => {
+    await testRevertFormAgainstAbility(game, Abilities.AIR_LOCK);
+  });
+
+  it("reverts to Overcast Form if a Pokémon on the field has Cloud Nine", async () => {
+    await testRevertFormAgainstAbility(game, Abilities.CLOUD_NINE);
+  });
+
+  it("reverts to Overcast Form when the Flower Gift is suppressed, changes form under Harsh Sunlight/Sunny when it regains it", async () => {
+    game.override.enemyMoveset([Moves.GASTRO_ACID]).weather(WeatherType.HARSH_SUN);
+
+    await game.classicMode.startBattle([Species.CHERRIM, Species.MAGIKARP]);
+
+    const cherrim = game.scene.getPlayerPokemon()!;
+
+    expect(cherrim.formIndex).toBe(SUNSHINE_FORM);
+
+    game.move.select(Moves.SPLASH);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
+    await game.phaseInterceptor.to("TurnEndPhase");
+
+    expect(cherrim.summonData.abilitySuppressed).toBe(true);
+    expect(cherrim.formIndex).toBe(OVERCAST_FORM);
+
+    await game.toNextTurn();
+
+    game.doSwitchPokemon(1);
+    await game.toNextTurn();
+
+    game.doSwitchPokemon(1);
+    await game.phaseInterceptor.to("MovePhase");
+
+    expect(cherrim.summonData.abilitySuppressed).toBe(false);
+    expect(cherrim.formIndex).toBe(SUNSHINE_FORM);
+  });
+
+  it("should be in Overcast Form after the user is switched out", async () => {
+    game.override.weather(WeatherType.SUNNY);
+
+    await game.classicMode.startBattle([Species.CASTFORM, Species.MAGIKARP]);
+    const cherrim = game.scene.getPlayerPokemon()!;
+
+    expect(cherrim.formIndex).toBe(SUNSHINE_FORM);
+
+    game.doSwitchPokemon(1);
+    await game.toNextTurn();
+
+    expect(cherrim.formIndex).toBe(OVERCAST_FORM);
+  });
+});
diff --git a/test/abilities/flower_veil.test.ts b/test/abilities/flower_veil.test.ts
new file mode 100644
index 00000000000..1fd7dbb3ed7
--- /dev/null
+++ b/test/abilities/flower_veil.test.ts
@@ -0,0 +1,166 @@
+import { BattlerIndex } from "#app/battle";
+import { Abilities } from "#enums/abilities";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import { Stat } from "#enums/stat";
+import { StatusEffect } from "#enums/status-effect";
+import GameManager from "#test/testUtils/gameManager";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
+import { allMoves } from "#app/data/moves/move";
+import { BattlerTagType } from "#enums/battler-tag-type";
+import { allAbilities } from "#app/data/data-lists";
+
+describe("Abilities - Flower Veil", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+    game.override
+      .moveset([Moves.SPLASH])
+      .enemySpecies(Species.BULBASAUR)
+      .ability(Abilities.FLOWER_VEIL)
+      .battleStyle("single")
+      .disableCrits()
+      .enemySpecies(Species.MAGIKARP)
+      .enemyAbility(Abilities.BALL_FETCH)
+      .enemyMoveset(Moves.SPLASH);
+  });
+
+  /***********************************************
+   * Tests for proper handling of status effects *
+   ***********************************************/
+  it("should not prevent any source of self-inflicted status conditions", async () => {
+    game.override
+      .enemyMoveset([Moves.TACKLE, Moves.SPLASH])
+      .moveset([Moves.REST, Moves.SPLASH])
+      .startingHeldItems([{ name: "FLAME_ORB" }]);
+    await game.classicMode.startBattle([Species.BULBASAUR]);
+    const user = game.scene.getPlayerPokemon()!;
+    game.move.select(Moves.REST);
+    await game.forceEnemyMove(Moves.TACKLE);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
+    await game.toNextTurn();
+    expect(user.status?.effect).toBe(StatusEffect.SLEEP);
+
+    // remove sleep status so we can get burn from the orb
+    user.resetStatus();
+    game.move.select(Moves.SPLASH);
+    await game.forceEnemyMove(Moves.SPLASH);
+    await game.toNextTurn();
+    expect(user.status?.effect).toBe(StatusEffect.BURN);
+  });
+
+  it("should prevent drowsiness from yawn for a grass user and its grass allies", async () => {
+    game.override.enemyMoveset([Moves.YAWN]).moveset([Moves.SPLASH]).battleStyle("double");
+    await game.classicMode.startBattle([Species.BULBASAUR, Species.BULBASAUR]);
+
+    // Clear the ability of the ally to isolate the test
+    const ally = game.scene.getPlayerField()[1]!;
+    vi.spyOn(ally, "getAbility").mockReturnValue(allAbilities[Abilities.BALL_FETCH]);
+    game.move.select(Moves.SPLASH);
+    game.move.select(Moves.SPLASH);
+    await game.forceEnemyMove(Moves.YAWN, BattlerIndex.PLAYER);
+    await game.forceEnemyMove(Moves.YAWN, BattlerIndex.PLAYER_2);
+
+    await game.phaseInterceptor.to("BerryPhase");
+    const user = game.scene.getPlayerPokemon()!;
+    expect(user.getTag(BattlerTagType.DROWSY)).toBeFalsy();
+    expect(ally.getTag(BattlerTagType.DROWSY)).toBeFalsy();
+  });
+
+  it("should prevent status conditions from moves like Thunder Wave for a grass user and its grass allies", async () => {
+    game.override.enemyMoveset([Moves.THUNDER_WAVE]).moveset([Moves.SPLASH]).battleStyle("double");
+    vi.spyOn(allMoves[Moves.THUNDER_WAVE], "accuracy", "get").mockReturnValue(100);
+    await game.classicMode.startBattle([Species.BULBASAUR]);
+
+    game.move.select(Moves.SPLASH);
+    await game.forceEnemyMove(Moves.THUNDER_WAVE);
+    await game.toNextTurn();
+    expect(game.scene.getPlayerPokemon()!.status).toBeUndefined();
+    vi.spyOn(allMoves[Moves.THUNDER_WAVE], "accuracy", "get").mockClear();
+  });
+
+  it("should not prevent status conditions for a non-grass user and its non-grass allies", async () => {
+    game.override.enemyMoveset([Moves.THUNDER_WAVE]).moveset([Moves.SPLASH]).battleStyle("double");
+    await game.classicMode.startBattle([Species.MAGIKARP, Species.MAGIKARP]);
+    const [user, ally] = game.scene.getPlayerField();
+    vi.spyOn(allMoves[Moves.THUNDER_WAVE], "accuracy", "get").mockReturnValue(100);
+    // Clear the ally ability to isolate the test
+    vi.spyOn(ally, "getAbility").mockReturnValue(allAbilities[Abilities.BALL_FETCH]);
+    game.move.select(Moves.SPLASH);
+    game.move.select(Moves.SPLASH);
+    await game.forceEnemyMove(Moves.THUNDER_WAVE, BattlerIndex.PLAYER);
+    await game.forceEnemyMove(Moves.THUNDER_WAVE, BattlerIndex.PLAYER_2);
+    await game.phaseInterceptor.to("BerryPhase");
+    expect(user.status?.effect).toBe(StatusEffect.PARALYSIS);
+    expect(ally.status?.effect).toBe(StatusEffect.PARALYSIS);
+  });
+
+  /*******************************************
+   * Tests for proper handling of stat drops *
+   *******************************************/
+
+  it("should prevent the status drops from enemies for the a grass user and its grass allies", async () => {
+    game.override.enemyMoveset([Moves.GROWL]).moveset([Moves.SPLASH]).battleStyle("double");
+    await game.classicMode.startBattle([Species.BULBASAUR, Species.BULBASAUR]);
+    const [user, ally] = game.scene.getPlayerField();
+    // Clear the ally ability to isolate the test
+    vi.spyOn(ally, "getAbility").mockReturnValue(allAbilities[Abilities.BALL_FETCH]);
+    game.move.select(Moves.SPLASH);
+    game.move.select(Moves.SPLASH);
+    await game.phaseInterceptor.to("BerryPhase");
+    expect(user.getStatStage(Stat.ATK)).toBe(0);
+    expect(ally.getStatStage(Stat.ATK)).toBe(0);
+  });
+
+  it("should not prevent status drops for a non-grass user and its non-grass allies", async () => {
+    game.override.enemyMoveset([Moves.GROWL]).moveset([Moves.SPLASH]).battleStyle("double");
+    await game.classicMode.startBattle([Species.MAGIKARP, Species.MAGIKARP]);
+    const [user, ally] = game.scene.getPlayerField();
+    // Clear the ally ability to isolate the test
+    vi.spyOn(ally, "getAbility").mockReturnValue(allAbilities[Abilities.BALL_FETCH]);
+    game.move.select(Moves.SPLASH);
+    game.move.select(Moves.SPLASH);
+    await game.phaseInterceptor.to("BerryPhase");
+    expect(user.getStatStage(Stat.ATK)).toBe(-2);
+    expect(ally.getStatStage(Stat.ATK)).toBe(-2);
+  });
+
+  it("should not prevent self-inflicted stat drops from moves like Close Combat for a user or its allies", async () => {
+    game.override.moveset([Moves.CLOSE_COMBAT]).battleStyle("double");
+    await game.classicMode.startBattle([Species.BULBASAUR, Species.BULBASAUR]);
+    const [user, ally] = game.scene.getPlayerField();
+    // Clear the ally ability to isolate the test
+    vi.spyOn(ally, "getAbility").mockReturnValue(allAbilities[Abilities.BALL_FETCH]);
+
+    game.move.select(Moves.CLOSE_COMBAT, 0, BattlerIndex.ENEMY);
+    game.move.select(Moves.CLOSE_COMBAT, 1, BattlerIndex.ENEMY_2);
+    await game.phaseInterceptor.to("BerryPhase");
+    expect(user.getStatStage(Stat.DEF)).toBe(-1);
+    expect(user.getStatStage(Stat.SPDEF)).toBe(-1);
+    expect(ally.getStatStage(Stat.DEF)).toBe(-1);
+    expect(ally.getStatStage(Stat.SPDEF)).toBe(-1);
+  });
+
+  it("should prevent the drops while retaining the boosts from spicy extract", async () => {
+    game.override.enemyMoveset([Moves.SPICY_EXTRACT]).moveset([Moves.SPLASH]);
+    await game.classicMode.startBattle([Species.BULBASAUR]);
+    const user = game.scene.getPlayerPokemon()!;
+    game.move.select(Moves.SPLASH);
+    await game.phaseInterceptor.to("BerryPhase");
+    expect(user.getStatStage(Stat.ATK)).toBe(2);
+    expect(user.getStatStage(Stat.DEF)).toBe(0);
+  });
+});
diff --git a/test/abilities/forecast.test.ts b/test/abilities/forecast.test.ts
new file mode 100644
index 00000000000..03b5d993a54
--- /dev/null
+++ b/test/abilities/forecast.test.ts
@@ -0,0 +1,280 @@
+import { BattlerIndex } from "#app/battle";
+import { allAbilities } from "#app/data/data-lists";
+import { Abilities } from "#app/enums/abilities";
+import { WeatherType } from "#app/enums/weather-type";
+import { DamageAnimPhase } from "#app/phases/damage-anim-phase";
+import { MovePhase } from "#app/phases/move-phase";
+import { PostSummonPhase } from "#app/phases/post-summon-phase";
+import { QuietFormChangePhase } from "#app/phases/quiet-form-change-phase";
+import { TurnEndPhase } from "#app/phases/turn-end-phase";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import GameManager from "#test/testUtils/gameManager";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
+
+describe("Abilities - Forecast", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+  const NORMAL_FORM = 0;
+  const SUNNY_FORM = 1;
+  const RAINY_FORM = 2;
+  const SNOWY_FORM = 3;
+
+  /**
+   * Tests form changes based on weather changes
+   * @param {GameManager} game The game manager instance
+   * @param {WeatherType} weather The active weather to set
+   * @param form The expected form based on the active weather
+   * @param initialForm The initial form pre form change
+   */
+  const testWeatherFormChange = async (game: GameManager, weather: WeatherType, form: number, initialForm?: number) => {
+    game.override.weather(weather).starterForms({ [Species.CASTFORM]: initialForm });
+    await game.startBattle([Species.CASTFORM]);
+
+    game.move.select(Moves.SPLASH);
+
+    expect(game.scene.getPlayerPokemon()?.formIndex).toBe(form);
+  };
+
+  /**
+   * Tests reverting to normal form when Cloud Nine/Air Lock is active on the field
+   * @param {GameManager} game The game manager instance
+   * @param {Abilities} ability The ability that is active on the field
+   */
+  const testRevertFormAgainstAbility = async (game: GameManager, ability: Abilities) => {
+    game.override.starterForms({ [Species.CASTFORM]: SUNNY_FORM }).enemyAbility(ability);
+    await game.startBattle([Species.CASTFORM]);
+
+    game.move.select(Moves.SPLASH);
+
+    expect(game.scene.getPlayerPokemon()?.formIndex).toBe(NORMAL_FORM);
+  };
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+    game.override
+      .moveset([Moves.SPLASH, Moves.RAIN_DANCE, Moves.SUNNY_DAY, Moves.TACKLE])
+      .enemySpecies(Species.MAGIKARP)
+      .enemyMoveset(Moves.SPLASH)
+      .enemyAbility(Abilities.BALL_FETCH);
+  });
+
+  it(
+    "changes form based on weather",
+    async () => {
+      game.override
+        .moveset([Moves.RAIN_DANCE, Moves.SUNNY_DAY, Moves.SNOWSCAPE, Moves.SPLASH])
+        .battleStyle("double")
+        .starterForms({
+          [Species.KYOGRE]: 1,
+          [Species.GROUDON]: 1,
+          [Species.RAYQUAZA]: 1,
+        });
+      await game.startBattle([
+        Species.CASTFORM,
+        Species.FEEBAS,
+        Species.KYOGRE,
+        Species.GROUDON,
+        Species.RAYQUAZA,
+        Species.ALTARIA,
+      ]);
+
+      vi.spyOn(game.scene.getPlayerParty()[5], "getAbility").mockReturnValue(allAbilities[Abilities.CLOUD_NINE]);
+
+      const castform = game.scene.getPlayerField()[0];
+      expect(castform.formIndex).toBe(NORMAL_FORM);
+
+      game.move.select(Moves.RAIN_DANCE);
+      game.move.select(Moves.SPLASH, 1);
+      await game.phaseInterceptor.to("MovePhase");
+      await game.toNextTurn();
+
+      expect(castform.formIndex).toBe(RAINY_FORM);
+
+      game.move.select(Moves.SUNNY_DAY);
+      game.move.select(Moves.SPLASH, 1);
+      await game.phaseInterceptor.to("MovePhase");
+      await game.toNextTurn();
+
+      expect(castform.formIndex).toBe(SUNNY_FORM);
+
+      game.move.select(Moves.SNOWSCAPE);
+      game.move.select(Moves.SPLASH, 1);
+      await game.phaseInterceptor.to("MovePhase");
+      await game.toNextTurn();
+
+      expect(castform.formIndex).toBe(SNOWY_FORM);
+
+      game.override.moveset([Moves.HAIL, Moves.SANDSTORM, Moves.SNOWSCAPE, Moves.SPLASH]);
+
+      game.move.select(Moves.SANDSTORM);
+      game.move.select(Moves.SPLASH, 1);
+      await game.phaseInterceptor.to("MovePhase");
+      await game.toNextTurn();
+
+      expect(castform.formIndex).toBe(NORMAL_FORM);
+
+      game.move.select(Moves.HAIL);
+      game.move.select(Moves.SPLASH, 1);
+      await game.phaseInterceptor.to("MovePhase");
+      await game.toNextTurn();
+
+      expect(castform.formIndex).toBe(SNOWY_FORM);
+
+      game.move.select(Moves.SPLASH);
+      game.doSwitchPokemon(2); // Feebas now 2, Kyogre 1
+      await game.phaseInterceptor.to("MovePhase");
+      await game.toNextTurn();
+
+      expect(castform.formIndex).toBe(RAINY_FORM);
+
+      game.move.select(Moves.SPLASH);
+      game.doSwitchPokemon(3); // Kyogre now 3, Groudon 1
+      await game.phaseInterceptor.to("MovePhase");
+      await game.toNextTurn();
+
+      expect(castform.formIndex).toBe(SUNNY_FORM);
+
+      game.move.select(Moves.SPLASH);
+      game.doSwitchPokemon(4); // Groudon now 4, Rayquaza 1
+      await game.phaseInterceptor.to("MovePhase");
+      await game.toNextTurn();
+
+      expect(castform.formIndex).toBe(NORMAL_FORM);
+
+      game.move.select(Moves.SPLASH);
+      game.doSwitchPokemon(2); // Rayquaza now 2, Feebas 1
+      await game.phaseInterceptor.to("MovePhase");
+      await game.toNextTurn();
+
+      expect(castform.formIndex).toBe(NORMAL_FORM);
+
+      game.move.select(Moves.SNOWSCAPE);
+      game.move.select(Moves.SPLASH, 1);
+      await game.phaseInterceptor.to("MovePhase");
+      await game.toNextTurn();
+
+      expect(castform.formIndex).toBe(SNOWY_FORM);
+
+      game.move.select(Moves.SPLASH);
+      game.doSwitchPokemon(5); // Feebas now 5, Altaria 1
+      await game.phaseInterceptor.to("MovePhase");
+      await game.toNextTurn();
+
+      expect(castform.formIndex).toBe(NORMAL_FORM);
+
+      game.move.select(Moves.SPLASH);
+      game.doSwitchPokemon(5); // Altaria now 5, Feebas 1
+      await game.phaseInterceptor.to("MovePhase");
+      await game.toNextTurn();
+
+      expect(castform.formIndex).toBe(SNOWY_FORM);
+
+      game.scene.arena.trySetWeather(WeatherType.FOG);
+      game.move.select(Moves.SPLASH);
+      game.move.select(Moves.SPLASH, 1);
+      await game.phaseInterceptor.to("TurnStartPhase");
+
+      expect(castform.formIndex).toBe(NORMAL_FORM);
+    },
+    30 * 1000,
+  );
+
+  it("reverts to Normal Form during Clear weather", async () => {
+    await testWeatherFormChange(game, WeatherType.NONE, NORMAL_FORM, SUNNY_FORM);
+  });
+
+  it("reverts to Normal Form if a Pokémon on the field has Air Lock", async () => {
+    await testRevertFormAgainstAbility(game, Abilities.AIR_LOCK);
+  });
+
+  it("has no effect on Pokémon other than Castform", async () => {
+    game.override.enemyAbility(Abilities.FORECAST).enemySpecies(Species.SHUCKLE);
+    await game.startBattle([Species.CASTFORM]);
+
+    game.move.select(Moves.RAIN_DANCE);
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    expect(game.scene.getPlayerPokemon()?.formIndex).toBe(RAINY_FORM);
+    expect(game.scene.getEnemyPokemon()?.formIndex).not.toBe(RAINY_FORM);
+  });
+
+  it("reverts to Normal Form when Forecast is suppressed, changes form to match the weather when it regains it", async () => {
+    game.override.enemyMoveset([Moves.GASTRO_ACID]).weather(WeatherType.RAIN);
+    await game.startBattle([Species.CASTFORM, Species.PIKACHU]);
+    const castform = game.scene.getPlayerPokemon()!;
+
+    expect(castform.formIndex).toBe(RAINY_FORM);
+
+    // First turn - Forecast is suppressed
+    game.move.select(Moves.SPLASH);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
+    await game.move.forceHit();
+
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    expect(castform.summonData.abilitySuppressed).toBe(true);
+    expect(castform.formIndex).toBe(NORMAL_FORM);
+
+    await game.toNextTurn();
+
+    // Second turn - switch out Castform, regains Forecast
+    game.doSwitchPokemon(1);
+    await game.toNextTurn();
+
+    // Third turn - switch in Castform
+    game.doSwitchPokemon(1);
+    await game.phaseInterceptor.to(MovePhase);
+
+    expect(castform.summonData.abilitySuppressed).toBe(false);
+    expect(castform.formIndex).toBe(RAINY_FORM);
+  });
+
+  it("does not change Castform's form until after Stealth Rock deals damage", async () => {
+    game.override.weather(WeatherType.RAIN).enemyMoveset([Moves.STEALTH_ROCK]);
+    await game.startBattle([Species.PIKACHU, Species.CASTFORM]);
+
+    // First turn - set up stealth rock
+    game.move.select(Moves.SPLASH);
+    await game.toNextTurn();
+
+    // Second turn - switch in Castform, regains Forecast
+    game.doSwitchPokemon(1);
+    await game.phaseInterceptor.to(PostSummonPhase);
+
+    const castform = game.scene.getPlayerPokemon()!;
+
+    // Damage phase should come first
+    await game.phaseInterceptor.to(DamageAnimPhase);
+    expect(castform.hp).toBeLessThan(castform.getMaxHp());
+
+    // Then change form
+    await game.phaseInterceptor.to(QuietFormChangePhase);
+    expect(castform.formIndex).toBe(RAINY_FORM);
+  });
+
+  it("should be in Normal Form after the user is switched out", async () => {
+    game.override.weather(WeatherType.RAIN);
+
+    await game.startBattle([Species.CASTFORM, Species.MAGIKARP]);
+    const castform = game.scene.getPlayerPokemon()!;
+
+    expect(castform.formIndex).toBe(RAINY_FORM);
+
+    game.doSwitchPokemon(1);
+    await game.toNextTurn();
+
+    expect(castform.formIndex).toBe(NORMAL_FORM);
+  });
+});
diff --git a/src/test/abilities/friend_guard.test.ts b/test/abilities/friend_guard.test.ts
similarity index 76%
rename from src/test/abilities/friend_guard.test.ts
rename to test/abilities/friend_guard.test.ts
index 4ce64468c43..43a378c47a2 100644
--- a/src/test/abilities/friend_guard.test.ts
+++ b/test/abilities/friend_guard.test.ts
@@ -1,12 +1,13 @@
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { Abilities } from "#enums/abilities";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 import { BattlerIndex } from "#app/battle";
-import { allAbilities } from "#app/data/ability";
-import { allMoves, MoveCategory } from "#app/data/move";
+import { allAbilities } from "#app/data/data-lists";
+import { allMoves } from "#app/data/moves/move";
+import { MoveCategory } from "#enums/MoveCategory";
 
 describe("Moves - Friend Guard", () => {
   let phaserGame: Phaser.Game;
@@ -25,17 +26,17 @@ describe("Moves - Friend Guard", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     game.override
-      .battleType("double")
+      .battleStyle("double")
       .enemyAbility(Abilities.BALL_FETCH)
-      .enemyMoveset([ Moves.TACKLE, Moves.SPLASH, Moves.DRAGON_RAGE ])
+      .enemyMoveset([Moves.TACKLE, Moves.SPLASH, Moves.DRAGON_RAGE])
       .enemySpecies(Species.SHUCKLE)
-      .moveset([ Moves.SPLASH ])
+      .moveset([Moves.SPLASH])
       .startingLevel(100);
   });
 
   it("should reduce damage that other allied Pokémon receive from attacks (from any Pokémon) by 25%", async () => {
-    await game.classicMode.startBattle([ Species.BULBASAUR, Species.CHARMANDER ]);
-    const [ player1, player2 ] = game.scene.getPlayerField();
+    await game.classicMode.startBattle([Species.BULBASAUR, Species.CHARMANDER]);
+    const [player1, player2] = game.scene.getPlayerField();
     const spy = vi.spyOn(player1, "getAttackDamage");
 
     const enemy1 = game.scene.getEnemyField()[0];
@@ -49,7 +50,11 @@ describe("Moves - Friend Guard", () => {
     // Get the last return value from `getAttackDamage`
     const turn1Damage = spy.mock.results[spy.mock.results.length - 1].value.damage;
     // Making sure the test is controlled; turn 1 damage is equal to base damage (after rounding)
-    expect(turn1Damage).toBe(Math.floor(player1.getBaseDamage(enemy1, allMoves[Moves.TACKLE], MoveCategory.PHYSICAL)));
+    expect(turn1Damage).toBe(
+      Math.floor(
+        player1.getBaseDamage({ source: enemy1, move: allMoves[Moves.TACKLE], moveCategory: MoveCategory.PHYSICAL }),
+      ),
+    );
 
     vi.spyOn(player2, "getAbility").mockReturnValue(allAbilities[Abilities.FRIEND_GUARD]);
 
@@ -62,13 +67,18 @@ describe("Moves - Friend Guard", () => {
     // Get the last return value from `getAttackDamage`
     const turn2Damage = spy.mock.results[spy.mock.results.length - 1].value.damage;
     // With the ally's Friend Guard, damage should have been reduced from base damage by 25%
-    expect(turn2Damage).toBe(Math.floor(player1.getBaseDamage(enemy1, allMoves[Moves.TACKLE], MoveCategory.PHYSICAL) * 0.75));
+    expect(turn2Damage).toBe(
+      Math.floor(
+        player1.getBaseDamage({ source: enemy1, move: allMoves[Moves.TACKLE], moveCategory: MoveCategory.PHYSICAL }) *
+          0.75,
+      ),
+    );
   });
 
   it("should NOT reduce damage to pokemon with friend guard", async () => {
-    await game.classicMode.startBattle([ Species.BULBASAUR, Species.CHARMANDER ]);
+    await game.classicMode.startBattle([Species.BULBASAUR, Species.CHARMANDER]);
 
-    const player2  = game.scene.getPlayerField()[1];
+    const player2 = game.scene.getPlayerField()[1];
     const spy = vi.spyOn(player2, "getAttackDamage");
 
     game.move.select(Moves.SPLASH);
@@ -92,9 +102,9 @@ describe("Moves - Friend Guard", () => {
   });
 
   it("should NOT reduce damage from fixed damage attacks", async () => {
-    await game.classicMode.startBattle([ Species.BULBASAUR, Species.CHARMANDER ]);
+    await game.classicMode.startBattle([Species.BULBASAUR, Species.CHARMANDER]);
 
-    const [ player1, player2 ] = game.scene.getPlayerField();
+    const [player1, player2] = game.scene.getPlayerField();
     const spy = vi.spyOn(player1, "getAttackDamage");
 
     game.move.select(Moves.SPLASH);
diff --git a/src/test/abilities/good_as_gold.test.ts b/test/abilities/good_as_gold.test.ts
similarity index 71%
rename from src/test/abilities/good_as_gold.test.ts
rename to test/abilities/good_as_gold.test.ts
index ecda1a0e031..09bdaafb11f 100644
--- a/src/test/abilities/good_as_gold.test.ts
+++ b/test/abilities/good_as_gold.test.ts
@@ -1,5 +1,5 @@
 import { BattlerIndex } from "#app/battle";
-import { allAbilities } from "#app/data/ability";
+import { allAbilities } from "#app/data/data-lists";
 import { ArenaTagSide } from "#app/data/arena-tag";
 import { ArenaTagType } from "#app/enums/arena-tag-type";
 import { BattlerTagType } from "#app/enums/battler-tag-type";
@@ -9,7 +9,7 @@ import { WeatherType } from "#app/enums/weather-type";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
@@ -30,9 +30,9 @@ describe("Abilities - Good As Gold", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     game.override
-      .moveset([ Moves.SPLASH ])
+      .moveset([Moves.SPLASH])
       .ability(Abilities.GOOD_AS_GOLD)
-      .battleType("single")
+      .battleStyle("single")
       .disableCrits()
       .enemySpecies(Species.MAGIKARP)
       .enemyAbility(Abilities.BALL_FETCH)
@@ -40,8 +40,8 @@ describe("Abilities - Good As Gold", () => {
   });
 
   it("should block normal status moves", async () => {
-    game.override.enemyMoveset( [ Moves.GROWL ] );
-    await game.classicMode.startBattle([ Species.MAGIKARP ]);
+    game.override.enemyMoveset([Moves.GROWL]);
+    await game.classicMode.startBattle([Species.MAGIKARP]);
 
     const player = game.scene.getPlayerPokemon()!;
 
@@ -49,13 +49,13 @@ describe("Abilities - Good As Gold", () => {
 
     await game.phaseInterceptor.to("BerryPhase");
 
-    expect(player.battleData.abilitiesApplied[0]).toBe(Abilities.GOOD_AS_GOLD);
+    expect(player.waveData.abilitiesApplied).toContain(Abilities.GOOD_AS_GOLD);
     expect(player.getStatStage(Stat.ATK)).toBe(0);
   });
 
   it("should block memento and prevent the user from fainting", async () => {
-    game.override.enemyMoveset( [ Moves.MEMENTO ] );
-    await game.classicMode.startBattle([ Species.MAGIKARP ]);
+    game.override.enemyMoveset([Moves.MEMENTO]);
+    await game.classicMode.startBattle([Species.MAGIKARP]);
     game.move.select(Moves.MEMENTO);
     await game.phaseInterceptor.to("BerryPhase");
     expect(game.scene.getPlayerPokemon()!.isFainted()).toBe(false);
@@ -63,11 +63,11 @@ describe("Abilities - Good As Gold", () => {
   });
 
   it("should not block any status moves that target the field, one side, or all pokemon", async () => {
-    game.override.battleType("double");
-    game.override.enemyMoveset( [ Moves.STEALTH_ROCK, Moves.HAZE ] );
-    game.override.moveset([ Moves.SWORDS_DANCE, Moves.SAFEGUARD ]);
-    await game.classicMode.startBattle([ Species.MAGIKARP, Species.FEEBAS ]);
-    const [ good_as_gold, ball_fetch ] = game.scene.getPlayerField();
+    game.override.battleStyle("double");
+    game.override.enemyMoveset([Moves.STEALTH_ROCK, Moves.HAZE]);
+    game.override.moveset([Moves.SWORDS_DANCE, Moves.SAFEGUARD]);
+    await game.classicMode.startBattle([Species.MAGIKARP, Species.FEEBAS]);
+    const [good_as_gold, ball_fetch] = game.scene.getPlayerField();
 
     // Force second pokemon to have ball fetch to isolate to a single mon.
     vi.spyOn(ball_fetch, "getAbility").mockReturnValue(allAbilities[Abilities.BALL_FETCH]);
@@ -76,7 +76,7 @@ describe("Abilities - Good As Gold", () => {
     game.move.select(Moves.SAFEGUARD, 1);
     await game.forceEnemyMove(Moves.STEALTH_ROCK);
     await game.forceEnemyMove(Moves.HAZE);
-    await game.setTurnOrder( [ BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2 ] );
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2]);
     await game.phaseInterceptor.to("BerryPhase");
     expect(good_as_gold.getAbility().id).toBe(Abilities.GOOD_AS_GOLD);
     expect(good_as_gold.getStatStage(Stat.ATK)).toBe(0);
@@ -85,9 +85,9 @@ describe("Abilities - Good As Gold", () => {
   });
 
   it("should not block field targeted effects in singles", async () => {
-    game.override.battleType("single");
-    game.override.enemyMoveset( [ Moves.SPIKES ] );
-    await game.classicMode.startBattle([ Species.MAGIKARP ]);
+    game.override.battleStyle("single");
+    game.override.enemyMoveset([Moves.SPIKES]);
+    await game.classicMode.startBattle([Species.MAGIKARP]);
 
     game.move.select(Moves.SPLASH, 0);
     await game.phaseInterceptor.to("BerryPhase");
@@ -96,9 +96,9 @@ describe("Abilities - Good As Gold", () => {
   });
 
   it("should block the ally's helping hand", async () => {
-    game.override.battleType("double");
-    game.override.moveset([ Moves.HELPING_HAND, Moves.TACKLE ]);
-    await game.classicMode.startBattle([ Species.MAGIKARP, Species.FEEBAS ]);
+    game.override.battleStyle("double");
+    game.override.moveset([Moves.HELPING_HAND, Moves.TACKLE]);
+    await game.classicMode.startBattle([Species.MAGIKARP, Species.FEEBAS]);
 
     game.move.select(Moves.HELPING_HAND, 0);
     game.move.select(Moves.TACKLE, 1);
@@ -108,11 +108,11 @@ describe("Abilities - Good As Gold", () => {
   });
 
   it("should block the ally's heal bell, but only if the good as gold user is on the field", async () => {
-    game.override.battleType("double");
-    game.override.moveset([ Moves.HEAL_BELL, Moves.SPLASH ]);
+    game.override.battleStyle("double");
+    game.override.moveset([Moves.HEAL_BELL, Moves.SPLASH]);
     game.override.statusEffect(StatusEffect.BURN);
-    await game.classicMode.startBattle([ Species.MAGIKARP, Species.FEEBAS, Species.ABRA ]);
-    const [ good_as_gold, ball_fetch ] = game.scene.getPlayerField();
+    await game.classicMode.startBattle([Species.MAGIKARP, Species.FEEBAS, Species.ABRA]);
+    const [good_as_gold, ball_fetch] = game.scene.getPlayerField();
 
     // Force second pokemon to have ball fetch to isolate to a single mon.
     vi.spyOn(ball_fetch, "getAbility").mockReturnValue(allAbilities[Abilities.BALL_FETCH]);
@@ -130,10 +130,10 @@ describe("Abilities - Good As Gold", () => {
   });
 
   it("should not block field targeted effects like rain dance", async () => {
-    game.override.battleType("single");
-    game.override.enemyMoveset( [ Moves.RAIN_DANCE ] );
+    game.override.battleStyle("single");
+    game.override.enemyMoveset([Moves.RAIN_DANCE]);
     game.override.weather(WeatherType.NONE);
-    await game.classicMode.startBattle([ Species.MAGIKARP ]);
+    await game.classicMode.startBattle([Species.MAGIKARP]);
 
     game.move.select(Moves.SPLASH, 0);
     await game.phaseInterceptor.to("BerryPhase");
diff --git a/src/test/abilities/gorilla_tactics.test.ts b/test/abilities/gorilla_tactics.test.ts
similarity index 82%
rename from src/test/abilities/gorilla_tactics.test.ts
rename to test/abilities/gorilla_tactics.test.ts
index 8aee365eb8f..edaf1669809 100644
--- a/src/test/abilities/gorilla_tactics.test.ts
+++ b/test/abilities/gorilla_tactics.test.ts
@@ -3,7 +3,7 @@ import { Moves } from "#app/enums/moves";
 import { Species } from "#app/enums/species";
 import { Stat } from "#app/enums/stat";
 import { Abilities } from "#enums/abilities";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
@@ -23,17 +23,17 @@ describe("Abilities - Gorilla Tactics", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     game.override
-      .battleType("single")
+      .battleStyle("single")
       .enemyAbility(Abilities.BALL_FETCH)
-      .enemyMoveset([ Moves.SPLASH, Moves.DISABLE ])
+      .enemyMoveset([Moves.SPLASH, Moves.DISABLE])
       .enemySpecies(Species.MAGIKARP)
       .enemyLevel(30)
-      .moveset([ Moves.SPLASH, Moves.TACKLE, Moves.GROWL ])
+      .moveset([Moves.SPLASH, Moves.TACKLE, Moves.GROWL])
       .ability(Abilities.GORILLA_TACTICS);
   });
 
   it("boosts the Pokémon's Attack by 50%, but limits the Pokémon to using only one move", async () => {
-    await game.classicMode.startBattle([ Species.GALAR_DARMANITAN ]);
+    await game.classicMode.startBattle([Species.GALAR_DARMANITAN]);
 
     const darmanitan = game.scene.getPlayerPokemon()!;
     const initialAtkStat = darmanitan.getStat(Stat.ATK);
@@ -50,7 +50,7 @@ describe("Abilities - Gorilla Tactics", () => {
   });
 
   it("should struggle if the only usable move is disabled", async () => {
-    await game.classicMode.startBattle([ Species.GALAR_DARMANITAN ]);
+    await game.classicMode.startBattle([Species.GALAR_DARMANITAN]);
 
     const darmanitan = game.scene.getPlayerPokemon()!;
     const enemy = game.scene.getEnemyPokemon()!;
@@ -64,7 +64,7 @@ describe("Abilities - Gorilla Tactics", () => {
 
     game.move.select(Moves.GROWL);
     await game.forceEnemyMove(Moves.DISABLE);
-    await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
 
     await game.phaseInterceptor.to("TurnEndPhase");
     expect(enemy.getStatStage(Stat.ATK)).toBe(-1); // Only the effect of the first Growl should be applied
@@ -73,7 +73,7 @@ describe("Abilities - Gorilla Tactics", () => {
     await game.toNextTurn();
 
     game.move.select(Moves.TACKLE);
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
 
     await game.phaseInterceptor.to("MoveEndPhase");
     expect(darmanitan.hp).toBeLessThan(darmanitan.getMaxHp());
diff --git a/src/test/abilities/gulp_missile.test.ts b/test/abilities/gulp_missile.test.ts
similarity index 83%
rename from src/test/abilities/gulp_missile.test.ts
rename to test/abilities/gulp_missile.test.ts
index bbb103c63e6..4db2ae4190d 100644
--- a/src/test/abilities/gulp_missile.test.ts
+++ b/test/abilities/gulp_missile.test.ts
@@ -6,7 +6,7 @@ import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { Stat } from "#enums/stat";
 import { StatusEffect } from "#enums/status-effect";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
@@ -25,7 +25,7 @@ describe("Abilities - Gulp Missile", () => {
    * @returns The effect damage of Gulp Missile
    */
   const getEffectDamage = (pokemon: Pokemon): number => {
-    return Math.max(1, Math.floor(pokemon.getMaxHp() * 1 / 4));
+    return Math.max(1, Math.floor((pokemon.getMaxHp() * 1) / 4));
   };
 
   beforeAll(() => {
@@ -42,8 +42,8 @@ describe("Abilities - Gulp Missile", () => {
     game = new GameManager(phaserGame);
     game.override
       .disableCrits()
-      .battleType("single")
-      .moveset([ Moves.SURF, Moves.DIVE, Moves.SPLASH, Moves.SUBSTITUTE ])
+      .battleStyle("single")
+      .moveset([Moves.SURF, Moves.DIVE, Moves.SPLASH, Moves.SUBSTITUTE])
       .enemySpecies(Species.SNORLAX)
       .enemyAbility(Abilities.BALL_FETCH)
       .enemyMoveset(Moves.SPLASH)
@@ -51,7 +51,7 @@ describe("Abilities - Gulp Missile", () => {
   });
 
   it("changes to Gulping Form if HP is over half when Surf or Dive is used", async () => {
-    await game.classicMode.startBattle([ Species.CRAMORANT ]);
+    await game.classicMode.startBattle([Species.CRAMORANT]);
     const cramorant = game.scene.getPlayerPokemon()!;
 
     game.move.select(Moves.DIVE);
@@ -59,17 +59,17 @@ describe("Abilities - Gulp Missile", () => {
     game.move.select(Moves.DIVE);
     await game.phaseInterceptor.to("MoveEndPhase");
 
-    expect(cramorant.getHpRatio()).toBeGreaterThanOrEqual(.5);
+    expect(cramorant.getHpRatio()).toBeGreaterThanOrEqual(0.5);
     expect(cramorant.getTag(BattlerTagType.GULP_MISSILE_ARROKUDA)).toBeDefined();
     expect(cramorant.formIndex).toBe(GULPING_FORM);
   });
 
   it("changes to Gorging Form if HP is under half when Surf or Dive is used", async () => {
-    await game.classicMode.startBattle([ Species.CRAMORANT ]);
+    await game.classicMode.startBattle([Species.CRAMORANT]);
     const cramorant = game.scene.getPlayerPokemon()!;
 
-    vi.spyOn(cramorant, "getHpRatio").mockReturnValue(.49);
-    expect(cramorant.getHpRatio()).toBe(.49);
+    vi.spyOn(cramorant, "getHpRatio").mockReturnValue(0.49);
+    expect(cramorant.getHpRatio()).toBe(0.49);
 
     game.move.select(Moves.SURF);
     await game.phaseInterceptor.to("MoveEndPhase");
@@ -79,7 +79,7 @@ describe("Abilities - Gulp Missile", () => {
   });
 
   it("changes to base form when switched out after Surf or Dive is used", async () => {
-    await game.classicMode.startBattle([ Species.CRAMORANT, Species.MAGIKARP ]);
+    await game.classicMode.startBattle([Species.CRAMORANT, Species.MAGIKARP]);
     const cramorant = game.scene.getPlayerPokemon()!;
 
     game.move.select(Moves.SURF);
@@ -94,7 +94,7 @@ describe("Abilities - Gulp Missile", () => {
   });
 
   it("changes form during Dive's charge turn", async () => {
-    await game.classicMode.startBattle([ Species.CRAMORANT ]);
+    await game.classicMode.startBattle([Species.CRAMORANT]);
     const cramorant = game.scene.getPlayerPokemon()!;
 
     game.move.select(Moves.DIVE);
@@ -106,7 +106,7 @@ describe("Abilities - Gulp Missile", () => {
 
   it("deals 1/4 of the attacker's maximum HP when hit by a damaging attack", async () => {
     game.override.enemyMoveset(Moves.TACKLE);
-    await game.classicMode.startBattle([ Species.CRAMORANT ]);
+    await game.classicMode.startBattle([Species.CRAMORANT]);
 
     const enemy = game.scene.getEnemyPokemon()!;
     vi.spyOn(enemy, "damageAndUpdate");
@@ -119,10 +119,10 @@ describe("Abilities - Gulp Missile", () => {
 
   it("does not have any effect when hit by non-damaging attack", async () => {
     game.override.enemyMoveset(Moves.TAIL_WHIP);
-    await game.classicMode.startBattle([ Species.CRAMORANT ]);
+    await game.classicMode.startBattle([Species.CRAMORANT]);
 
     const cramorant = game.scene.getPlayerPokemon()!;
-    vi.spyOn(cramorant, "getHpRatio").mockReturnValue(.55);
+    vi.spyOn(cramorant, "getHpRatio").mockReturnValue(0.55);
 
     game.move.select(Moves.SURF);
     await game.phaseInterceptor.to("MoveEndPhase");
@@ -138,13 +138,13 @@ describe("Abilities - Gulp Missile", () => {
 
   it("lowers attacker's DEF stat stage by 1 when hit in Gulping form", async () => {
     game.override.enemyMoveset(Moves.TACKLE);
-    await game.classicMode.startBattle([ Species.CRAMORANT ]);
+    await game.classicMode.startBattle([Species.CRAMORANT]);
 
     const cramorant = game.scene.getPlayerPokemon()!;
     const enemy = game.scene.getEnemyPokemon()!;
 
     vi.spyOn(enemy, "damageAndUpdate");
-    vi.spyOn(cramorant, "getHpRatio").mockReturnValue(.55);
+    vi.spyOn(cramorant, "getHpRatio").mockReturnValue(0.55);
 
     game.move.select(Moves.SURF);
     await game.phaseInterceptor.to("MoveEndPhase");
@@ -162,13 +162,13 @@ describe("Abilities - Gulp Missile", () => {
 
   it("paralyzes the enemy when hit in Gorging form", async () => {
     game.override.enemyMoveset(Moves.TACKLE);
-    await game.classicMode.startBattle([ Species.CRAMORANT ]);
+    await game.classicMode.startBattle([Species.CRAMORANT]);
 
     const cramorant = game.scene.getPlayerPokemon()!;
     const enemy = game.scene.getEnemyPokemon()!;
 
     vi.spyOn(enemy, "damageAndUpdate");
-    vi.spyOn(cramorant, "getHpRatio").mockReturnValue(.45);
+    vi.spyOn(cramorant, "getHpRatio").mockReturnValue(0.45);
 
     game.move.select(Moves.SURF);
     await game.phaseInterceptor.to("MoveEndPhase");
@@ -186,7 +186,7 @@ describe("Abilities - Gulp Missile", () => {
 
   it("does not activate the ability when underwater", async () => {
     game.override.enemyMoveset(Moves.SURF);
-    await game.classicMode.startBattle([ Species.CRAMORANT ]);
+    await game.classicMode.startBattle([Species.CRAMORANT]);
 
     const cramorant = game.scene.getPlayerPokemon()!;
 
@@ -199,12 +199,12 @@ describe("Abilities - Gulp Missile", () => {
 
   it("prevents effect damage but inflicts secondary effect on attacker with Magic Guard", async () => {
     game.override.enemyMoveset(Moves.TACKLE).enemyAbility(Abilities.MAGIC_GUARD);
-    await game.classicMode.startBattle([ Species.CRAMORANT ]);
+    await game.classicMode.startBattle([Species.CRAMORANT]);
 
     const cramorant = game.scene.getPlayerPokemon()!;
     const enemy = game.scene.getEnemyPokemon()!;
 
-    vi.spyOn(cramorant, "getHpRatio").mockReturnValue(.55);
+    vi.spyOn(cramorant, "getHpRatio").mockReturnValue(0.55);
 
     game.move.select(Moves.SURF);
     await game.phaseInterceptor.to("MoveEndPhase");
@@ -223,7 +223,7 @@ describe("Abilities - Gulp Missile", () => {
 
   it("activates on faint", async () => {
     game.override.enemyMoveset(Moves.THUNDERBOLT);
-    await game.classicMode.startBattle([ Species.CRAMORANT ]);
+    await game.classicMode.startBattle([Species.CRAMORANT]);
 
     const cramorant = game.scene.getPlayerPokemon()!;
 
@@ -237,10 +237,8 @@ describe("Abilities - Gulp Missile", () => {
   });
 
   it("doesn't trigger if user is behind a substitute", async () => {
-    game.override
-      .enemyAbility(Abilities.STURDY)
-      .enemyMoveset([ Moves.SPLASH, Moves.POWER_TRIP ]);
-    await game.classicMode.startBattle([ Species.CRAMORANT ]);
+    game.override.enemyAbility(Abilities.STURDY).enemyMoveset([Moves.SPLASH, Moves.POWER_TRIP]);
+    await game.classicMode.startBattle([Species.CRAMORANT]);
 
     game.move.select(Moves.SURF);
     await game.forceEnemyMove(Moves.SPLASH);
@@ -250,7 +248,7 @@ describe("Abilities - Gulp Missile", () => {
 
     game.move.select(Moves.SUBSTITUTE);
     await game.forceEnemyMove(Moves.POWER_TRIP);
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
     await game.toNextTurn();
 
     expect(game.scene.getPlayerPokemon()!.formIndex).toBe(GULPING_FORM);
@@ -258,10 +256,10 @@ describe("Abilities - Gulp Missile", () => {
 
   it("cannot be suppressed", async () => {
     game.override.enemyMoveset(Moves.GASTRO_ACID);
-    await game.classicMode.startBattle([ Species.CRAMORANT ]);
+    await game.classicMode.startBattle([Species.CRAMORANT]);
 
     const cramorant = game.scene.getPlayerPokemon()!;
-    vi.spyOn(cramorant, "getHpRatio").mockReturnValue(.55);
+    vi.spyOn(cramorant, "getHpRatio").mockReturnValue(0.55);
 
     game.move.select(Moves.SURF);
     await game.phaseInterceptor.to("MoveEndPhase");
@@ -278,10 +276,10 @@ describe("Abilities - Gulp Missile", () => {
 
   it("cannot be swapped with another ability", async () => {
     game.override.enemyMoveset(Moves.SKILL_SWAP);
-    await game.classicMode.startBattle([ Species.CRAMORANT ]);
+    await game.classicMode.startBattle([Species.CRAMORANT]);
 
     const cramorant = game.scene.getPlayerPokemon()!;
-    vi.spyOn(cramorant, "getHpRatio").mockReturnValue(.55);
+    vi.spyOn(cramorant, "getHpRatio").mockReturnValue(0.55);
 
     game.move.select(Moves.SURF);
     await game.phaseInterceptor.to("MoveEndPhase");
@@ -299,7 +297,7 @@ describe("Abilities - Gulp Missile", () => {
   it("cannot be copied", async () => {
     game.override.enemyAbility(Abilities.TRACE);
 
-    await game.classicMode.startBattle([ Species.CRAMORANT ]);
+    await game.classicMode.startBattle([Species.CRAMORANT]);
     game.move.select(Moves.SPLASH);
     await game.phaseInterceptor.to("TurnStartPhase");
 
diff --git a/test/abilities/harvest.test.ts b/test/abilities/harvest.test.ts
new file mode 100644
index 00000000000..23c0ed9088c
--- /dev/null
+++ b/test/abilities/harvest.test.ts
@@ -0,0 +1,346 @@
+import { BattlerIndex } from "#app/battle";
+import { PostTurnRestoreBerryAbAttr } from "#app/data/abilities/ability";
+import type Pokemon from "#app/field/pokemon";
+import { BerryModifier, PreserveBerryModifier } from "#app/modifier/modifier";
+import type { ModifierOverride } from "#app/modifier/modifier-type";
+import type { BooleanHolder } from "#app/utils/common";
+import { Abilities } from "#enums/abilities";
+import { BerryType } from "#enums/berry-type";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import { Stat } from "#enums/stat";
+import { WeatherType } from "#enums/weather-type";
+import GameManager from "#test/testUtils/gameManager";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
+
+describe("Abilities - Harvest", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  const getPlayerBerries = () =>
+    game.scene.getModifiers(BerryModifier, true).filter(b => b.pokemonId === game.scene.getPlayerPokemon()?.id);
+
+  /** Check whether the player's Modifiers contains the specified berries and nothing else. */
+  function expectBerriesContaining(...berries: ModifierOverride[]): void {
+    const actualBerries: ModifierOverride[] = getPlayerBerries().map(
+      // only grab berry type and quantity since that's literally all we care about
+      b => ({ name: "BERRY", type: b.berryType, count: b.getStackCount() }),
+    );
+    expect(actualBerries).toEqual(berries);
+  }
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+    game.override
+      .moveset([Moves.SPLASH, Moves.NATURAL_GIFT, Moves.FALSE_SWIPE, Moves.GASTRO_ACID])
+      .ability(Abilities.HARVEST)
+      .startingLevel(100)
+      .battleStyle("single")
+      .disableCrits()
+      .statusActivation(false) // Since we're using nuzzle to proc both enigma and sitrus berries
+      .weather(WeatherType.SUNNY) // guaranteed recovery
+      .enemyLevel(1)
+      .enemySpecies(Species.MAGIKARP)
+      .enemyAbility(Abilities.BALL_FETCH)
+      .enemyMoveset([Moves.SPLASH, Moves.NUZZLE, Moves.KNOCK_OFF, Moves.INCINERATE]);
+  });
+
+  it("replenishes eaten berries", async () => {
+    game.override.startingHeldItems([{ name: "BERRY", type: BerryType.LUM, count: 1 }]);
+    await game.classicMode.startBattle([Species.FEEBAS]);
+
+    game.move.select(Moves.SPLASH);
+    await game.forceEnemyMove(Moves.NUZZLE);
+    await game.phaseInterceptor.to("BerryPhase");
+    expect(getPlayerBerries()).toHaveLength(0);
+    expect(game.scene.getPlayerPokemon()?.battleData.berriesEaten).toHaveLength(1);
+    await game.phaseInterceptor.to("TurnEndPhase");
+
+    expectBerriesContaining({ name: "BERRY", type: BerryType.LUM, count: 1 });
+    expect(game.scene.getPlayerPokemon()?.battleData.berriesEaten).toEqual([]);
+  });
+
+  it("tracks berries eaten while disabled/not present", async () => {
+    // Note: this also checks for harvest not being present as neutralizing gas works by making
+    // the game consider all other pokemon to *not* have their respective abilities.
+    game.override
+      .startingHeldItems([
+        { name: "BERRY", type: BerryType.ENIGMA, count: 2 },
+        { name: "BERRY", type: BerryType.LUM, count: 2 },
+      ])
+      .enemyAbility(Abilities.NEUTRALIZING_GAS);
+    await game.classicMode.startBattle([Species.MILOTIC]);
+
+    const milotic = game.scene.getPlayerPokemon()!;
+    expect(milotic).toBeDefined();
+
+    // Chug a few berries without harvest (should get tracked)
+    game.move.select(Moves.SPLASH);
+    await game.forceEnemyMove(Moves.NUZZLE);
+    await game.toNextTurn();
+
+    expect(milotic.battleData.berriesEaten).toEqual(expect.arrayContaining([BerryType.ENIGMA, BerryType.LUM]));
+    expect(getPlayerBerries()).toHaveLength(2);
+
+    // Give ourselves harvest and disable enemy neut gas,
+    // but force our roll to fail so we don't accidentally recover anything
+    vi.spyOn(PostTurnRestoreBerryAbAttr.prototype, "canApplyPostTurn").mockReturnValueOnce(false);
+    game.override.ability(Abilities.HARVEST);
+    game.move.select(Moves.GASTRO_ACID);
+    await game.forceEnemyMove(Moves.NUZZLE);
+
+    await game.toNextTurn();
+
+    expect(milotic.battleData.berriesEaten).toEqual(
+      expect.arrayContaining([BerryType.ENIGMA, BerryType.LUM, BerryType.ENIGMA, BerryType.LUM]),
+    );
+    expect(getPlayerBerries()).toHaveLength(0);
+
+    // proc a high roll and we _should_ get a berry back!
+    game.move.select(Moves.SPLASH);
+    await game.forceEnemyMove(Moves.SPLASH);
+    await game.toNextTurn();
+
+    expect(milotic.battleData.berriesEaten).toHaveLength(3);
+    expect(getPlayerBerries()).toHaveLength(1);
+  });
+
+  it("remembers berries eaten array across waves", async () => {
+    game.override
+      .startingHeldItems([{ name: "BERRY", type: BerryType.PETAYA, count: 2 }])
+      .ability(Abilities.BALL_FETCH); // don't actually need harvest for this test
+    await game.classicMode.startBattle([Species.REGIELEKI]);
+
+    const regieleki = game.scene.getPlayerPokemon()!;
+    regieleki.hp = 1;
+
+    game.move.select(Moves.SPLASH);
+    await game.forceEnemyMove(Moves.SPLASH);
+    await game.doKillOpponents();
+    await game.phaseInterceptor.to("TurnEndPhase");
+
+    // ate 1 berry without recovering (no harvest)
+    expect(regieleki.battleData.berriesEaten).toEqual([BerryType.PETAYA]);
+    expectBerriesContaining({ name: "BERRY", count: 1, type: BerryType.PETAYA });
+    expect(regieleki.getStatStage(Stat.SPATK)).toBe(1);
+
+    await game.toNextWave();
+
+    expect(regieleki.battleData.berriesEaten).toEqual([BerryType.PETAYA]);
+    expectBerriesContaining({ name: "BERRY", count: 1, type: BerryType.PETAYA });
+    expect(regieleki.getStatStage(Stat.SPATK)).toBe(1);
+  });
+
+  it("keeps harvested berries across reloads", async () => {
+    game.override
+      .startingHeldItems([{ name: "BERRY", type: BerryType.PETAYA, count: 1 }])
+      .moveset([Moves.SPLASH, Moves.EARTHQUAKE])
+      .enemyMoveset([Moves.SUPER_FANG, Moves.HEAL_PULSE])
+      .enemyAbility(Abilities.COMPOUND_EYES);
+    await game.classicMode.startBattle([Species.REGIELEKI]);
+
+    const regieleki = game.scene.getPlayerPokemon()!;
+    regieleki.hp = regieleki.getMaxHp() / 4 + 1;
+
+    game.move.select(Moves.SPLASH);
+    await game.forceEnemyMove(Moves.SUPER_FANG);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
+    await game.toNextTurn();
+
+    // ate 1 berry and recovered it
+    expect(regieleki.battleData.berriesEaten).toEqual([]);
+    expect(getPlayerBerries()).toEqual([expect.objectContaining({ berryType: BerryType.PETAYA, stackCount: 1 })]);
+    expect(game.scene.getPlayerPokemon()?.getStatStage(Stat.SPATK)).toBe(1);
+
+    // heal up so harvest doesn't proc and kill enemy
+    game.move.select(Moves.EARTHQUAKE);
+    await game.forceEnemyMove(Moves.HEAL_PULSE);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
+    await game.toNextWave();
+
+    expectBerriesContaining({ name: "BERRY", count: 1, type: BerryType.PETAYA });
+    expect(game.scene.getPlayerPokemon()?.getStatStage(Stat.SPATK)).toBe(1);
+
+    await game.reload.reloadSession();
+
+    expect(regieleki.battleData.berriesEaten).toEqual([]);
+    expectBerriesContaining({ name: "BERRY", count: 1, type: BerryType.PETAYA });
+    expect(game.scene.getPlayerPokemon()?.getStatStage(Stat.SPATK)).toBe(1);
+  });
+
+  it("cannot restore capped berries", async () => {
+    const initBerries: ModifierOverride[] = [
+      { name: "BERRY", type: BerryType.LUM, count: 2 },
+      { name: "BERRY", type: BerryType.STARF, count: 2 },
+    ];
+    game.override.startingHeldItems(initBerries);
+    await game.classicMode.startBattle([Species.FEEBAS]);
+
+    const feebas = game.scene.getPlayerPokemon()!;
+    feebas.battleData.berriesEaten = [BerryType.LUM, BerryType.STARF];
+
+    game.move.select(Moves.SPLASH);
+    await game.forceEnemyMove(Moves.SPLASH);
+    await game.phaseInterceptor.to("BerryPhase");
+
+    // Force RNG roll to hit the first berry we find that matches.
+    // This does nothing on a success (since there'd only be a starf left to grab),
+    // but ensures we don't accidentally let any false positives through.
+    vi.spyOn(Phaser.Math.RND, "integerInRange").mockReturnValue(0);
+    await game.phaseInterceptor.to("TurnEndPhase");
+
+    // recovered a starf
+    expectBerriesContaining(
+      { name: "BERRY", type: BerryType.LUM, count: 2 },
+      { name: "BERRY", type: BerryType.STARF, count: 3 },
+    );
+  });
+
+  it("does nothing if all berries are capped", async () => {
+    const initBerries: ModifierOverride[] = [
+      { name: "BERRY", type: BerryType.LUM, count: 2 },
+      { name: "BERRY", type: BerryType.STARF, count: 3 },
+    ];
+    game.override.startingHeldItems(initBerries);
+    await game.classicMode.startBattle([Species.FEEBAS]);
+
+    const player = game.scene.getPlayerPokemon()!;
+    player.battleData.berriesEaten = [BerryType.LUM, BerryType.STARF];
+
+    game.move.select(Moves.SPLASH);
+    await game.forceEnemyMove(Moves.SPLASH);
+    await game.phaseInterceptor.to("TurnEndPhase");
+
+    expectBerriesContaining(...initBerries);
+  });
+
+  describe("move/ability interactions", () => {
+    it("cannot restore incinerated berries", async () => {
+      game.override.startingHeldItems([{ name: "BERRY", type: BerryType.STARF, count: 3 }]);
+      await game.classicMode.startBattle([Species.FEEBAS]);
+
+      game.move.select(Moves.SPLASH);
+      await game.forceEnemyMove(Moves.INCINERATE);
+      await game.phaseInterceptor.to("TurnEndPhase");
+
+      expect(game.scene.getPlayerPokemon()?.battleData.berriesEaten).toEqual([]);
+    });
+
+    it("cannot restore knocked off berries", async () => {
+      game.override.startingHeldItems([{ name: "BERRY", type: BerryType.STARF, count: 3 }]);
+      await game.classicMode.startBattle([Species.FEEBAS]);
+
+      game.move.select(Moves.SPLASH);
+      await game.forceEnemyMove(Moves.KNOCK_OFF);
+      await game.phaseInterceptor.to("TurnEndPhase");
+
+      expect(game.scene.getPlayerPokemon()?.battleData.berriesEaten).toEqual([]);
+    });
+
+    it("can restore berries eaten by Teatime", async () => {
+      const initBerries: ModifierOverride[] = [{ name: "BERRY", type: BerryType.STARF, count: 1 }];
+      game.override.startingHeldItems(initBerries).enemyMoveset(Moves.TEATIME);
+      await game.classicMode.startBattle([Species.FEEBAS]);
+
+      // nom nom the berr berr yay yay
+      game.move.select(Moves.SPLASH);
+      await game.phaseInterceptor.to("TurnEndPhase");
+
+      expect(game.scene.getPlayerPokemon()?.battleData.berriesEaten).toEqual([]);
+      expectBerriesContaining(...initBerries);
+    });
+
+    it("cannot restore Plucked berries for either side", async () => {
+      const initBerries: ModifierOverride[] = [{ name: "BERRY", type: BerryType.PETAYA, count: 1 }];
+      game.override.startingHeldItems(initBerries).enemyAbility(Abilities.HARVEST).enemyMoveset(Moves.PLUCK);
+      await game.classicMode.startBattle([Species.FEEBAS]);
+
+      // gobble gobble gobble
+      game.move.select(Moves.SPLASH);
+      await game.phaseInterceptor.to("BerryPhase");
+
+      // pluck triggers harvest for neither side
+      expect(game.scene.getPlayerPokemon()?.battleData.berriesEaten).toEqual([]);
+      expect(game.scene.getEnemyPokemon()?.battleData.berriesEaten).toEqual([]);
+      expect(getPlayerBerries()).toEqual([]);
+    });
+
+    it("cannot restore berries preserved via Berry Pouch", async () => {
+      // mock berry pouch to have a 100% success rate
+      vi.spyOn(PreserveBerryModifier.prototype, "apply").mockImplementation(
+        (_pokemon: Pokemon, doPreserve: BooleanHolder): boolean => {
+          doPreserve.value = false;
+          return true;
+        },
+      );
+
+      const initBerries: ModifierOverride[] = [{ name: "BERRY", type: BerryType.PETAYA, count: 1 }];
+      game.override.startingHeldItems(initBerries).startingModifier([{ name: "BERRY_POUCH", count: 1 }]);
+      await game.classicMode.startBattle([Species.FEEBAS]);
+
+      game.move.select(Moves.SPLASH);
+      await game.phaseInterceptor.to("TurnEndPhase", false);
+
+      // won't trigger harvest since we didn't lose the berry (it just doesn't ever add it to the array)
+      expect(game.scene.getPlayerPokemon()?.battleData.berriesEaten).toEqual([]);
+      expectBerriesContaining(...initBerries);
+    });
+
+    it("can restore stolen berries", async () => {
+      const initBerries: ModifierOverride[] = [{ name: "BERRY", type: BerryType.SITRUS, count: 1 }];
+      game.override.enemyHeldItems(initBerries).passiveAbility(Abilities.MAGICIAN).hasPassiveAbility(true);
+      await game.classicMode.startBattle([Species.MEOWSCARADA]);
+
+      // pre damage
+      const player = game.scene.getPlayerPokemon()!;
+      player.hp = 1;
+
+      // steal a sitrus and immediately consume it
+      game.move.select(Moves.FALSE_SWIPE);
+      await game.forceEnemyMove(Moves.SPLASH);
+      await game.phaseInterceptor.to("BerryPhase");
+      expect(player.battleData.berriesEaten).toEqual([BerryType.SITRUS]);
+
+      await game.phaseInterceptor.to("TurnEndPhase");
+
+      expect(player.battleData.berriesEaten).toEqual([]);
+      expectBerriesContaining(...initBerries);
+    });
+
+    // TODO: Enable once fling actually works...???
+    it.todo("can restore berries flung at user", async () => {
+      game.override.enemyHeldItems([{ name: "BERRY", type: BerryType.STARF, count: 1 }]).enemyMoveset(Moves.FLING);
+      await game.classicMode.startBattle([Species.FEEBAS]);
+
+      game.move.select(Moves.SPLASH);
+      await game.phaseInterceptor.to("TurnEndPhase");
+
+      expect(game.scene.getPlayerPokemon()?.battleData.berriesEaten).toBe([]);
+      expect(getPlayerBerries()).toEqual([]);
+    });
+
+    // TODO: Enable once Nat Gift gets implemented...???
+    it.todo("can restore berries consumed via Natural Gift", async () => {
+      const initBerries: ModifierOverride[] = [{ name: "BERRY", type: BerryType.STARF, count: 1 }];
+      game.override.startingHeldItems(initBerries);
+      await game.classicMode.startBattle([Species.FEEBAS]);
+
+      game.move.select(Moves.NATURAL_GIFT);
+      await game.phaseInterceptor.to("TurnEndPhase");
+
+      expect(game.scene.getPlayerPokemon()?.battleData.berriesEaten).toHaveLength(0);
+      expectBerriesContaining(...initBerries);
+    });
+  });
+});
diff --git a/test/abilities/healer.test.ts b/test/abilities/healer.test.ts
new file mode 100644
index 00000000000..d292ad0f625
--- /dev/null
+++ b/test/abilities/healer.test.ts
@@ -0,0 +1,97 @@
+import { Abilities } from "#enums/abilities";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import { StatusEffect } from "#enums/status-effect";
+import GameManager from "#test/testUtils/gameManager";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, it, vi, type MockInstance } from "vitest";
+import { isNullOrUndefined } from "#app/utils/common";
+import { PostTurnResetStatusAbAttr } from "#app/data/abilities/ability";
+import { allAbilities } from "#app/data/data-lists";
+import type Pokemon from "#app/field/pokemon";
+
+describe("Abilities - Healer", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+  let healerAttrSpy: MockInstance;
+  let healerAttr: PostTurnResetStatusAbAttr;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+    healerAttrSpy.mockRestore();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+    game.override
+      .moveset([Moves.SPLASH])
+      .ability(Abilities.BALL_FETCH)
+      .battleStyle("double")
+      .disableCrits()
+      .enemySpecies(Species.MAGIKARP)
+      .enemyAbility(Abilities.BALL_FETCH)
+      .enemyMoveset(Moves.SPLASH);
+
+    healerAttr = allAbilities[Abilities.HEALER].getAttrs(PostTurnResetStatusAbAttr)[0];
+    healerAttrSpy = vi
+      .spyOn(healerAttr, "getCondition")
+      .mockReturnValue((pokemon: Pokemon) => !isNullOrUndefined(pokemon.getAlly()));
+  });
+
+  it("should not queue a message phase for healing if the ally has fainted", async () => {
+    game.override.moveset([Moves.SPLASH, Moves.LUNAR_DANCE]);
+    await game.classicMode.startBattle([Species.MAGIKARP, Species.MAGIKARP]);
+    const user = game.scene.getPlayerPokemon()!;
+    // Only want one magikarp to have the ability.
+    vi.spyOn(user, "getAbility").mockReturnValue(allAbilities[Abilities.HEALER]);
+    game.move.select(Moves.SPLASH);
+    // faint the ally
+    game.move.select(Moves.LUNAR_DANCE, 1);
+    const abSpy = vi.spyOn(healerAttr, "canApplyPostTurn");
+    await game.phaseInterceptor.to("TurnEndPhase");
+
+    // It's not enough to just test that the ally still has its status.
+    // We need to ensure that the ability failed to meet its condition
+    expect(abSpy).toHaveReturnedWith(false);
+
+    // Explicitly restore the mock to ensure pollution doesn't happen
+    abSpy.mockRestore();
+  });
+
+  it("should heal the status of an ally if the ally has a status", async () => {
+    await game.classicMode.startBattle([Species.MAGIKARP, Species.MAGIKARP]);
+    const [user, ally] = game.scene.getPlayerField();
+    // Only want one magikarp to have the ability.
+    vi.spyOn(user, "getAbility").mockReturnValue(allAbilities[Abilities.HEALER]);
+    expect(ally.trySetStatus(StatusEffect.BURN)).toBe(true);
+    game.move.select(Moves.SPLASH);
+    game.move.select(Moves.SPLASH, 1);
+
+    await game.phaseInterceptor.to("TurnEndPhase");
+    await game.toNextTurn();
+
+    expect(ally.status?.effect, "status effect was not healed").toBeFalsy();
+  });
+
+  // TODO: Healer is currently checked before the
+  it.todo("should heal a burn before its end of turn damage", async () => {
+    await game.classicMode.startBattle([Species.MAGIKARP, Species.MAGIKARP]);
+    const [user, ally] = game.scene.getPlayerField();
+    // Only want one magikarp to have the ability.
+    vi.spyOn(user, "getAbility").mockReturnValue(allAbilities[Abilities.HEALER]);
+    expect(ally.trySetStatus(StatusEffect.BURN)).toBe(true);
+    game.move.select(Moves.SPLASH);
+    game.move.select(Moves.SPLASH, 1);
+    await game.phaseInterceptor.to("TurnEndPhase");
+    await game.toNextTurn();
+
+    expect(ally.status?.effect, "status effect was not healed").toBeFalsy();
+    expect(ally.hp).toBe(ally.getMaxHp());
+  });
+});
diff --git a/src/test/abilities/heatproof.test.ts b/test/abilities/heatproof.test.ts
similarity index 81%
rename from src/test/abilities/heatproof.test.ts
rename to test/abilities/heatproof.test.ts
index bf4e99ce467..016237bb02f 100644
--- a/src/test/abilities/heatproof.test.ts
+++ b/test/abilities/heatproof.test.ts
@@ -1,10 +1,10 @@
 import { Species } from "#app/enums/species";
 import { StatusEffect } from "#app/enums/status-effect";
 import { TurnEndPhase } from "#app/phases/turn-end-phase";
-import { toDmgValue } from "#app/utils";
+import { toDmgValue } from "#app/utils/common";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
@@ -25,7 +25,7 @@ describe("Abilities - Heatproof", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     game.override
-      .battleType("single")
+      .battleStyle("single")
       .disableCrits()
       .enemySpecies(Species.CHARMANDER)
       .enemyAbility(Abilities.HEATPROOF)
@@ -33,7 +33,7 @@ describe("Abilities - Heatproof", () => {
       .enemyLevel(100)
       .starterSpecies(Species.CHANDELURE)
       .ability(Abilities.BALL_FETCH)
-      .moveset([ Moves.FLAMETHROWER, Moves.SPLASH ])
+      .moveset([Moves.FLAMETHROWER, Moves.SPLASH])
       .startingLevel(100);
   });
 
@@ -55,14 +55,12 @@ describe("Abilities - Heatproof", () => {
     await game.phaseInterceptor.to(TurnEndPhase);
     const regularDamage = initialHP - enemy.hp;
 
-    expect(heatproofDamage).toBeLessThanOrEqual((regularDamage / 2) + 1);
-    expect(heatproofDamage).toBeGreaterThanOrEqual((regularDamage / 2) - 1);
+    expect(heatproofDamage).toBeLessThanOrEqual(regularDamage / 2 + 1);
+    expect(heatproofDamage).toBeGreaterThanOrEqual(regularDamage / 2 - 1);
   });
 
   it("reduces Burn damage by half", async () => {
-    game.override
-      .enemyStatusEffect(StatusEffect.BURN)
-      .enemySpecies(Species.ABRA);
+    game.override.enemyStatusEffect(StatusEffect.BURN).enemySpecies(Species.ABRA);
     await game.startBattle();
 
     const enemy = game.scene.getEnemyPokemon()!;
diff --git a/src/test/abilities/honey_gather.test.ts b/test/abilities/honey_gather.test.ts
similarity index 86%
rename from src/test/abilities/honey_gather.test.ts
rename to test/abilities/honey_gather.test.ts
index fc9d6cdd150..a74a40c9c1e 100644
--- a/src/test/abilities/honey_gather.test.ts
+++ b/test/abilities/honey_gather.test.ts
@@ -3,7 +3,7 @@ import { Command } from "#app/ui/command-ui-handler";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
@@ -24,11 +24,11 @@ describe("Abilities - Honey Gather", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     game.override
-      .moveset([ Moves.SPLASH, Moves.ROAR, Moves.THUNDERBOLT ])
+      .moveset([Moves.SPLASH, Moves.ROAR, Moves.THUNDERBOLT])
       .startingLevel(100)
       .ability(Abilities.HONEY_GATHER)
       .passiveAbility(Abilities.RUN_AWAY)
-      .battleType("single")
+      .battleStyle("single")
       .disableCrits()
       .enemySpecies(Species.MAGIKARP)
       .enemyAbility(Abilities.BALL_FETCH)
@@ -36,7 +36,7 @@ describe("Abilities - Honey Gather", () => {
   });
 
   it("should give money when winning a battle", async () => {
-    await game.classicMode.startBattle([ Species.MILOTIC ]);
+    await game.classicMode.startBattle([Species.MILOTIC]);
     game.scene.money = 1000;
 
     game.move.select(Moves.THUNDERBOLT);
@@ -46,7 +46,7 @@ describe("Abilities - Honey Gather", () => {
   });
 
   it("should not give money when the enemy pokemon flees", async () => {
-    await game.classicMode.startBattle([ Species.MILOTIC ]);
+    await game.classicMode.startBattle([Species.MILOTIC]);
     game.scene.money = 1000;
 
     game.move.select(Moves.ROAR);
@@ -57,7 +57,7 @@ describe("Abilities - Honey Gather", () => {
   });
 
   it("should not give money when the player flees", async () => {
-    await game.classicMode.startBattle([ Species.MILOTIC ]);
+    await game.classicMode.startBattle([Species.MILOTIC]);
     game.scene.money = 1000;
 
     // something weird is going on with the test framework, so this is required to prevent a crash
diff --git a/src/test/abilities/hustle.test.ts b/test/abilities/hustle.test.ts
similarity index 86%
rename from src/test/abilities/hustle.test.ts
rename to test/abilities/hustle.test.ts
index 08a441315fb..bf2889eab63 100644
--- a/src/test/abilities/hustle.test.ts
+++ b/test/abilities/hustle.test.ts
@@ -1,9 +1,9 @@
-import { allMoves } from "#app/data/move";
+import { allMoves } from "#app/data/moves/move";
 import { Abilities } from "#app/enums/abilities";
 import { Stat } from "#app/enums/stat";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
@@ -25,16 +25,16 @@ describe("Abilities - Hustle", () => {
     game = new GameManager(phaserGame);
     game.override
       .ability(Abilities.HUSTLE)
-      .moveset([ Moves.TACKLE, Moves.GIGA_DRAIN, Moves.FISSURE ])
+      .moveset([Moves.TACKLE, Moves.GIGA_DRAIN, Moves.FISSURE])
       .disableCrits()
-      .battleType("single")
+      .battleStyle("single")
       .enemyMoveset(Moves.SPLASH)
       .enemySpecies(Species.SHUCKLE)
       .enemyAbility(Abilities.BALL_FETCH);
   });
 
   it("increases the user's Attack stat by 50%", async () => {
-    await game.classicMode.startBattle([ Species.PIKACHU ]);
+    await game.classicMode.startBattle([Species.PIKACHU]);
     const pikachu = game.scene.getPlayerPokemon()!;
     const atk = pikachu.stats[Stat.ATK];
 
@@ -48,7 +48,7 @@ describe("Abilities - Hustle", () => {
   });
 
   it("lowers the accuracy of the user's physical moves by 20%", async () => {
-    await game.classicMode.startBattle([ Species.PIKACHU ]);
+    await game.classicMode.startBattle([Species.PIKACHU]);
     const pikachu = game.scene.getPlayerPokemon()!;
 
     vi.spyOn(pikachu, "getAccuracyMultiplier");
@@ -60,7 +60,7 @@ describe("Abilities - Hustle", () => {
   });
 
   it("does not affect non-physical moves", async () => {
-    await game.classicMode.startBattle([ Species.PIKACHU ]);
+    await game.classicMode.startBattle([Species.PIKACHU]);
     const pikachu = game.scene.getPlayerPokemon()!;
     const spatk = pikachu.stats[Stat.SPATK];
 
@@ -78,7 +78,7 @@ describe("Abilities - Hustle", () => {
     game.override.startingLevel(100);
     game.override.enemyLevel(30);
 
-    await game.classicMode.startBattle([ Species.PIKACHU ]);
+    await game.classicMode.startBattle([Species.PIKACHU]);
     const pikachu = game.scene.getPlayerPokemon()!;
     const enemyPokemon = game.scene.getEnemyPokemon()!;
 
diff --git a/src/test/abilities/hyper_cutter.test.ts b/test/abilities/hyper_cutter.test.ts
similarity index 78%
rename from src/test/abilities/hyper_cutter.test.ts
rename to test/abilities/hyper_cutter.test.ts
index e51fef6bd49..99a9db28025 100644
--- a/src/test/abilities/hyper_cutter.test.ts
+++ b/test/abilities/hyper_cutter.test.ts
@@ -2,7 +2,7 @@ import { Stat } from "#enums/stat";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
@@ -23,8 +23,8 @@ describe("Abilities - Hyper Cutter", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     game.override
-      .battleType("single")
-      .moveset([ Moves.SAND_ATTACK, Moves.NOBLE_ROAR, Moves.DEFOG, Moves.OCTOLOCK ])
+      .battleStyle("single")
+      .moveset([Moves.SAND_ATTACK, Moves.NOBLE_ROAR, Moves.DEFOG, Moves.OCTOLOCK])
       .ability(Abilities.BALL_FETCH)
       .enemySpecies(Species.SHUCKLE)
       .enemyAbility(Abilities.HYPER_CUTTER)
@@ -46,11 +46,13 @@ describe("Abilities - Hyper Cutter", () => {
     await game.toNextTurn();
     game.move.select(Moves.SAND_ATTACK);
     await game.toNextTurn();
-    game.override.moveset([ Moves.STRING_SHOT ]);
+    game.override.moveset([Moves.STRING_SHOT]);
     game.move.select(Moves.STRING_SHOT);
     await game.toNextTurn();
 
     expect(enemy.getStatStage(Stat.ATK)).toEqual(0);
-    [ Stat.ACC, Stat.DEF, Stat.EVA, Stat.SPATK, Stat.SPDEF, Stat.SPD ].forEach((stat: number) => expect(enemy.getStatStage(stat)).toBeLessThan(0));
+    [Stat.ACC, Stat.DEF, Stat.EVA, Stat.SPATK, Stat.SPDEF, Stat.SPD].forEach((stat: number) =>
+      expect(enemy.getStatStage(stat)).toBeLessThan(0),
+    );
   });
 });
diff --git a/src/test/abilities/ice_face.test.ts b/test/abilities/ice_face.test.ts
similarity index 81%
rename from src/test/abilities/ice_face.test.ts
rename to test/abilities/ice_face.test.ts
index e31bee1c721..38269c29af1 100644
--- a/src/test/abilities/ice_face.test.ts
+++ b/test/abilities/ice_face.test.ts
@@ -8,7 +8,7 @@ import { Abilities } from "#enums/abilities";
 import { BattlerTagType } from "#enums/battler-tag-type";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
@@ -30,14 +30,14 @@ describe("Abilities - Ice Face", () => {
 
   beforeEach(() => {
     game = new GameManager(phaserGame);
-    game.override.battleType("single");
+    game.override.battleStyle("single");
     game.override.enemySpecies(Species.EISCUE);
     game.override.enemyAbility(Abilities.ICE_FACE);
-    game.override.moveset([ Moves.TACKLE, Moves.ICE_BEAM, Moves.TOXIC_THREAD, Moves.HAIL ]);
+    game.override.moveset([Moves.TACKLE, Moves.ICE_BEAM, Moves.TOXIC_THREAD, Moves.HAIL]);
   });
 
   it("takes no damage from physical move and transforms to Noice", async () => {
-    await game.classicMode.startBattle([ Species.HITMONLEE ]);
+    await game.classicMode.startBattle([Species.HITMONLEE]);
 
     game.move.select(Moves.TACKLE);
 
@@ -51,9 +51,9 @@ describe("Abilities - Ice Face", () => {
   });
 
   it("takes no damage from the first hit of multihit physical move and transforms to Noice", async () => {
-    game.override.moveset([ Moves.SURGING_STRIKES ]);
+    game.override.moveset([Moves.SURGING_STRIKES]);
     game.override.enemyLevel(1);
-    await game.classicMode.startBattle([ Species.HITMONLEE ]);
+    await game.classicMode.startBattle([Species.HITMONLEE]);
 
     game.move.select(Moves.SURGING_STRIKES);
 
@@ -79,7 +79,7 @@ describe("Abilities - Ice Face", () => {
   });
 
   it("takes damage from special moves", async () => {
-    await game.classicMode.startBattle([ Species.MAGIKARP ]);
+    await game.classicMode.startBattle([Species.MAGIKARP]);
 
     game.move.select(Moves.ICE_BEAM);
 
@@ -93,7 +93,7 @@ describe("Abilities - Ice Face", () => {
   });
 
   it("takes effects from status moves", async () => {
-    await game.classicMode.startBattle([ Species.MAGIKARP ]);
+    await game.classicMode.startBattle([Species.MAGIKARP]);
 
     game.move.select(Moves.TOXIC_THREAD);
 
@@ -106,10 +106,10 @@ describe("Abilities - Ice Face", () => {
   });
 
   it("transforms to Ice Face when Hail or Snow starts", async () => {
-    game.override.moveset([ Moves.QUICK_ATTACK ]);
-    game.override.enemyMoveset([ Moves.HAIL, Moves.HAIL, Moves.HAIL, Moves.HAIL ]);
+    game.override.moveset([Moves.QUICK_ATTACK]);
+    game.override.enemyMoveset([Moves.HAIL, Moves.HAIL, Moves.HAIL, Moves.HAIL]);
 
-    await game.classicMode.startBattle([ Species.MAGIKARP ]);
+    await game.classicMode.startBattle([Species.MAGIKARP]);
 
     game.move.select(Moves.QUICK_ATTACK);
 
@@ -128,10 +128,10 @@ describe("Abilities - Ice Face", () => {
   });
 
   it("transforms to Ice Face when summoned on arena with active Snow or Hail", async () => {
-    game.override.enemyMoveset([ Moves.TACKLE, Moves.TACKLE, Moves.TACKLE, Moves.TACKLE ]);
-    game.override.moveset([ Moves.SNOWSCAPE ]);
+    game.override.enemyMoveset([Moves.TACKLE, Moves.TACKLE, Moves.TACKLE, Moves.TACKLE]);
+    game.override.moveset([Moves.SNOWSCAPE]);
 
-    await game.classicMode.startBattle([ Species.EISCUE, Species.NINJASK ]);
+    await game.classicMode.startBattle([Species.EISCUE, Species.NINJASK]);
 
     game.move.select(Moves.SNOWSCAPE);
 
@@ -156,9 +156,9 @@ describe("Abilities - Ice Face", () => {
 
   it("will not revert to its Ice Face if there is already Hail when it changes into Noice", async () => {
     game.override.enemySpecies(Species.SHUCKLE);
-    game.override.enemyMoveset([ Moves.TACKLE, Moves.TACKLE, Moves.TACKLE, Moves.TACKLE ]);
+    game.override.enemyMoveset([Moves.TACKLE, Moves.TACKLE, Moves.TACKLE, Moves.TACKLE]);
 
-    await game.classicMode.startBattle([ Species.EISCUE ]);
+    await game.classicMode.startBattle([Species.EISCUE]);
 
     game.move.select(Moves.HAIL);
     const eiscue = game.scene.getPlayerPokemon()!;
@@ -175,9 +175,9 @@ describe("Abilities - Ice Face", () => {
   });
 
   it("persists form change when switched out", async () => {
-    game.override.enemyMoveset([ Moves.QUICK_ATTACK, Moves.QUICK_ATTACK, Moves.QUICK_ATTACK, Moves.QUICK_ATTACK ]);
+    game.override.enemyMoveset([Moves.QUICK_ATTACK, Moves.QUICK_ATTACK, Moves.QUICK_ATTACK, Moves.QUICK_ATTACK]);
 
-    await game.classicMode.startBattle([ Species.EISCUE, Species.MAGIKARP ]);
+    await game.classicMode.startBattle([Species.EISCUE, Species.MAGIKARP]);
 
     game.move.select(Moves.ICE_BEAM);
 
@@ -206,7 +206,7 @@ describe("Abilities - Ice Face", () => {
       [Species.EISCUE]: noiceForm,
     });
 
-    await game.classicMode.startBattle([ Species.EISCUE ]);
+    await game.classicMode.startBattle([Species.EISCUE]);
 
     const eiscue = game.scene.getPlayerPokemon()!;
 
@@ -224,22 +224,20 @@ describe("Abilities - Ice Face", () => {
   });
 
   it("doesn't trigger if user is behind a substitute", async () => {
-    game.override
-      .enemyMoveset(Moves.SUBSTITUTE)
-      .moveset(Moves.POWER_TRIP);
+    game.override.enemyMoveset(Moves.SUBSTITUTE).moveset(Moves.POWER_TRIP);
     await game.classicMode.startBattle();
 
     game.move.select(Moves.POWER_TRIP);
-    await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
     await game.toNextTurn();
 
     expect(game.scene.getEnemyPokemon()!.formIndex).toBe(icefaceForm);
   });
 
   it("cannot be suppressed", async () => {
-    game.override.moveset([ Moves.GASTRO_ACID ]);
+    game.override.moveset([Moves.GASTRO_ACID]);
 
-    await game.classicMode.startBattle([ Species.MAGIKARP ]);
+    await game.classicMode.startBattle([Species.MAGIKARP]);
 
     game.move.select(Moves.GASTRO_ACID);
 
@@ -253,9 +251,9 @@ describe("Abilities - Ice Face", () => {
   });
 
   it("cannot be swapped with another ability", async () => {
-    game.override.moveset([ Moves.SKILL_SWAP ]);
+    game.override.moveset([Moves.SKILL_SWAP]);
 
-    await game.classicMode.startBattle([ Species.MAGIKARP ]);
+    await game.classicMode.startBattle([Species.MAGIKARP]);
 
     game.move.select(Moves.SKILL_SWAP);
 
@@ -271,7 +269,7 @@ describe("Abilities - Ice Face", () => {
   it("cannot be copied", async () => {
     game.override.ability(Abilities.TRACE);
 
-    await game.classicMode.startBattle([ Species.MAGIKARP ]);
+    await game.classicMode.startBattle([Species.MAGIKARP]);
 
     game.move.select(Moves.SIMPLE_BEAM);
 
diff --git a/src/test/abilities/illuminate.test.ts b/test/abilities/illuminate.test.ts
similarity index 86%
rename from src/test/abilities/illuminate.test.ts
rename to test/abilities/illuminate.test.ts
index 4f7d3d83b51..ba26ed3b7af 100644
--- a/src/test/abilities/illuminate.test.ts
+++ b/test/abilities/illuminate.test.ts
@@ -1,7 +1,7 @@
 import { Stat } from "#app/enums/stat";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, it, expect } from "vitest";
 
@@ -29,7 +29,7 @@ describe("Abilities - Illuminate", () => {
   });
 
   it("should prevent ACC stat stage from being lowered", async () => {
-    game.override.battleType("single");
+    game.override.battleStyle("single");
 
     await game.classicMode.startBattle();
 
@@ -45,11 +45,7 @@ describe("Abilities - Illuminate", () => {
   });
 
   it("should guarantee double battle with any one LURE", async () => {
-    game.override
-      .startingModifier([
-        { name: "LURE" },
-      ])
-      .startingWave(2);
+    game.override.startingModifier([{ name: "LURE" }]).startingWave(2);
 
     await game.classicMode.startBattle();
 
diff --git a/test/abilities/illusion.test.ts b/test/abilities/illusion.test.ts
new file mode 100644
index 00000000000..8aae433b6c0
--- /dev/null
+++ b/test/abilities/illusion.test.ts
@@ -0,0 +1,171 @@
+import { Gender } from "#app/data/gender";
+import { PokeballType } from "#app/enums/pokeball";
+import { Abilities } from "#enums/abilities";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import GameManager from "#test/testUtils/gameManager";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
+
+describe("Abilities - Illusion", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+    game.override
+      .battleStyle("single")
+      .enemySpecies(Species.ZORUA)
+      .enemyAbility(Abilities.ILLUSION)
+      .enemyMoveset(Moves.TACKLE)
+      .enemyHeldItems([{ name: "WIDE_LENS", count: 3 }])
+      .moveset([Moves.WORRY_SEED, Moves.SOAK, Moves.TACKLE])
+      .startingHeldItems([{ name: "WIDE_LENS", count: 3 }]);
+  });
+
+  it("creates illusion at the start", async () => {
+    await game.classicMode.startBattle([Species.ZOROARK, Species.FEEBAS]);
+    const zoroark = game.scene.getPlayerPokemon()!;
+    const zorua = game.scene.getEnemyPokemon()!;
+
+    expect(!!zoroark.summonData.illusion).equals(true);
+    expect(!!zorua.summonData.illusion).equals(true);
+  });
+
+  it("break after receiving damaging move", async () => {
+    await game.classicMode.startBattle([Species.FEEBAS]);
+    game.move.select(Moves.TACKLE);
+
+    await game.phaseInterceptor.to("TurnEndPhase");
+
+    const zorua = game.scene.getEnemyPokemon()!;
+
+    expect(!!zorua.summonData.illusion).equals(false);
+    expect(zorua.name).equals("Zorua");
+  });
+
+  it("break after getting ability changed", async () => {
+    await game.classicMode.startBattle([Species.FEEBAS]);
+    game.move.select(Moves.WORRY_SEED);
+
+    await game.phaseInterceptor.to("TurnEndPhase");
+
+    const zorua = game.scene.getEnemyPokemon()!;
+
+    expect(!!zorua.summonData.illusion).equals(false);
+  });
+
+  it("breaks with neutralizing gas", async () => {
+    game.override.enemyAbility(Abilities.NEUTRALIZING_GAS);
+    await game.classicMode.startBattle([Species.KOFFING]);
+
+    const zorua = game.scene.getEnemyPokemon()!;
+
+    expect(!!zorua.summonData.illusion).equals(false);
+  });
+
+  it("does not activate if neutralizing gas is active", async () => {
+    game.override
+      .enemyAbility(Abilities.NEUTRALIZING_GAS)
+      .ability(Abilities.ILLUSION)
+      .moveset(Moves.SPLASH)
+      .enemyMoveset(Moves.SPLASH);
+    await game.classicMode.startBattle([Species.MAGIKARP, Species.FEEBAS, Species.MAGIKARP]);
+
+    game.doSwitchPokemon(1);
+    await game.toNextTurn();
+
+    expect(game.scene.getPlayerPokemon()!.summonData.illusion).toBeFalsy();
+  });
+
+  it("causes enemy AI to consider the illusion's type instead of the actual type when considering move effectiveness", async () => {
+    game.override.enemyMoveset([Moves.FLAMETHROWER, Moves.PSYCHIC, Moves.TACKLE]);
+    await game.classicMode.startBattle([Species.ZOROARK, Species.FEEBAS]);
+
+    const enemy = game.scene.getEnemyPokemon()!;
+    const zoroark = game.scene.getPlayerPokemon()!;
+
+    const flameThrower = enemy.getMoveset()[0]!.getMove();
+    const psychic = enemy.getMoveset()[1]!.getMove();
+    const flameThrowerEffectiveness = zoroark.getAttackTypeEffectiveness(
+      flameThrower.type,
+      enemy,
+      undefined,
+      undefined,
+      flameThrower,
+      true,
+    );
+    const psychicEffectiveness = zoroark.getAttackTypeEffectiveness(
+      psychic.type,
+      enemy,
+      undefined,
+      undefined,
+      psychic,
+      true,
+    );
+    expect(psychicEffectiveness).above(flameThrowerEffectiveness);
+  });
+
+  it("does not break from indirect damage", async () => {
+    game.override.enemySpecies(Species.GIGALITH);
+    game.override.enemyAbility(Abilities.SAND_STREAM);
+    game.override.enemyMoveset(Moves.WILL_O_WISP);
+    game.override.moveset([Moves.FLARE_BLITZ]);
+
+    await game.classicMode.startBattle([Species.ZOROARK, Species.AZUMARILL]);
+
+    game.move.select(Moves.FLARE_BLITZ);
+
+    await game.phaseInterceptor.to("TurnEndPhase");
+
+    const zoroark = game.scene.getPlayerPokemon()!;
+
+    expect(!!zoroark.summonData.illusion).equals(true);
+  });
+
+  it("copies the the name, nickname, gender, shininess, and pokeball from the illusion source", async () => {
+    game.override.enemyMoveset(Moves.SPLASH);
+    await game.classicMode.startBattle([Species.ABRA, Species.ZOROARK, Species.AXEW]);
+    const axew = game.scene.getPlayerParty().at(2)!;
+    axew.shiny = true;
+    axew.nickname = btoa(unescape(encodeURIComponent("axew nickname")));
+    axew.gender = Gender.FEMALE;
+    axew.pokeball = PokeballType.GREAT_BALL;
+
+    game.doSwitchPokemon(1);
+
+    await game.phaseInterceptor.to("TurnEndPhase");
+
+    const zoroark = game.scene.getPlayerPokemon()!;
+
+    expect(zoroark.name).equals("Axew");
+    expect(zoroark.getNameToRender()).equals("axew nickname");
+    expect(zoroark.getGender(false, true)).equals(Gender.FEMALE);
+    expect(zoroark.isShiny(true)).equals(true);
+    expect(zoroark.getPokeball(true)).equals(PokeballType.GREAT_BALL);
+  });
+
+  it("breaks when suppressed", async () => {
+    game.override.moveset(Moves.GASTRO_ACID);
+    await game.classicMode.startBattle([Species.MAGIKARP]);
+    const zorua = game.scene.getEnemyPokemon()!;
+
+    expect(!!zorua.summonData?.illusion).toBe(true);
+
+    game.move.select(Moves.GASTRO_ACID);
+    await game.phaseInterceptor.to("BerryPhase");
+
+    expect(zorua.isFullHp()).toBe(true);
+    expect(!!zorua.summonData?.illusion).toBe(false);
+  });
+});
diff --git a/test/abilities/immunity.test.ts b/test/abilities/immunity.test.ts
new file mode 100644
index 00000000000..dd9026cac50
--- /dev/null
+++ b/test/abilities/immunity.test.ts
@@ -0,0 +1,51 @@
+import { Abilities } from "#enums/abilities";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import { StatusEffect } from "#enums/status-effect";
+import GameManager from "#test/testUtils/gameManager";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
+
+describe("Abilities - Immunity", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+    game.override
+      .moveset([Moves.SPLASH])
+      .ability(Abilities.BALL_FETCH)
+      .battleStyle("single")
+      .disableCrits()
+      .enemySpecies(Species.MAGIKARP)
+      .enemyAbility(Abilities.BALL_FETCH)
+      .enemyMoveset(Moves.SPLASH);
+  });
+
+  it("should remove poison when gained", async () => {
+    game.override
+      .ability(Abilities.IMMUNITY)
+      .enemyAbility(Abilities.BALL_FETCH)
+      .moveset(Moves.SKILL_SWAP)
+      .enemyMoveset(Moves.SPLASH);
+    await game.classicMode.startBattle([Species.FEEBAS]);
+    const enemy = game.scene.getEnemyPokemon();
+    enemy?.trySetStatus(StatusEffect.POISON);
+    expect(enemy?.status?.effect).toBe(StatusEffect.POISON);
+
+    game.move.select(Moves.SKILL_SWAP);
+    await game.phaseInterceptor.to("BerryPhase");
+
+    expect(enemy?.status).toBeNull();
+  });
+});
diff --git a/src/test/abilities/imposter.test.ts b/test/abilities/imposter.test.ts
similarity index 56%
rename from src/test/abilities/imposter.test.ts
rename to test/abilities/imposter.test.ts
index 3445b3b322c..b5e902f442f 100644
--- a/src/test/abilities/imposter.test.ts
+++ b/test/abilities/imposter.test.ts
@@ -1,6 +1,6 @@
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 import Phaser from "phaser";
-import GameManager from "#app/test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import { Species } from "#enums/species";
 import { TurnEndPhase } from "#app/phases/turn-end-phase";
 import { Moves } from "#enums/moves";
@@ -25,7 +25,7 @@ describe("Abilities - Imposter", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     game.override
-      .battleType("single")
+      .battleStyle("single")
       .enemySpecies(Species.MEW)
       .enemyLevel(200)
       .enemyAbility(Abilities.BEAST_BOOST)
@@ -36,7 +36,7 @@ describe("Abilities - Imposter", () => {
   });
 
   it("should copy species, ability, gender, all stats except HP, all stat stages, moveset, and types of target", async () => {
-    await game.classicMode.startBattle([ Species.DITTO ]);
+    await game.classicMode.startBattle([Species.DITTO]);
 
     game.move.select(Moves.SPLASH);
     await game.phaseInterceptor.to(TurnEndPhase);
@@ -75,9 +75,9 @@ describe("Abilities - Imposter", () => {
   });
 
   it("should copy in-battle overridden stats", async () => {
-    game.override.enemyMoveset([ Moves.POWER_SPLIT ]);
+    game.override.enemyMoveset([Moves.POWER_SPLIT]);
 
-    await game.classicMode.startBattle([ Species.DITTO ]);
+    await game.classicMode.startBattle([Species.DITTO]);
 
     const player = game.scene.getPlayerPokemon()!;
     const enemy = game.scene.getEnemyPokemon()!;
@@ -96,9 +96,9 @@ describe("Abilities - Imposter", () => {
   });
 
   it("should set each move's pp to a maximum of 5", async () => {
-    game.override.enemyMoveset([ Moves.SWORDS_DANCE, Moves.GROWL, Moves.SKETCH, Moves.RECOVER ]);
+    game.override.enemyMoveset([Moves.SWORDS_DANCE, Moves.GROWL, Moves.SKETCH, Moves.RECOVER]);
 
-    await game.classicMode.startBattle([ Species.DITTO ]);
+    await game.classicMode.startBattle([Species.DITTO]);
     const player = game.scene.getPlayerPokemon()!;
 
     game.move.select(Moves.TACKLE);
@@ -116,4 +116,74 @@ describe("Abilities - Imposter", () => {
       }
     });
   });
+
+  it("should activate its ability if it copies one that activates on summon", async () => {
+    game.override.enemyAbility(Abilities.INTIMIDATE);
+
+    await game.classicMode.startBattle([Species.DITTO]);
+
+    game.move.select(Moves.TACKLE);
+    await game.phaseInterceptor.to("MoveEndPhase");
+
+    expect(game.scene.getEnemyPokemon()?.getStatStage(Stat.ATK)).toBe(-1);
+  });
+
+  it("should persist transformed attributes across reloads", async () => {
+    game.override.moveset([Moves.ABSORB]);
+
+    await game.classicMode.startBattle([Species.DITTO]);
+
+    const player = game.scene.getPlayerPokemon()!;
+    const enemy = game.scene.getEnemyPokemon()!;
+
+    game.move.select(Moves.SPLASH);
+    await game.doKillOpponents();
+    await game.toNextWave();
+
+    expect(game.scene.getCurrentPhase()?.constructor.name).toBe("CommandPhase");
+    expect(game.scene.currentBattle.waveIndex).toBe(2);
+
+    await game.reload.reloadSession();
+
+    const playerReloaded = game.scene.getPlayerPokemon()!;
+    const playerMoveset = player.getMoveset();
+
+    expect(playerReloaded.getSpeciesForm().speciesId).toBe(enemy.getSpeciesForm().speciesId);
+    expect(playerReloaded.getAbility()).toBe(enemy.getAbility());
+    expect(playerReloaded.getGender()).toBe(enemy.getGender());
+
+    expect(playerReloaded.getStat(Stat.HP, false)).not.toBe(enemy.getStat(Stat.HP));
+    for (const s of EFFECTIVE_STATS) {
+      expect(playerReloaded.getStat(s, false)).toBe(enemy.getStat(s, false));
+    }
+
+    expect(playerMoveset.length).toEqual(1);
+    expect(playerMoveset[0]?.moveId).toEqual(Moves.SPLASH);
+  });
+
+  it("should stay transformed with the correct form after reload", async () => {
+    game.override.moveset([Moves.ABSORB]);
+    game.override.enemySpecies(Species.UNOWN);
+    await game.classicMode.startBattle([Species.DITTO]);
+
+    const enemy = game.scene.getEnemyPokemon()!;
+
+    // change form
+    enemy.species.forms[5];
+    enemy.species.formIndex = 5;
+
+    game.move.select(Moves.SPLASH);
+    await game.doKillOpponents();
+    await game.toNextWave();
+
+    expect(game.scene.getCurrentPhase()?.constructor.name).toBe("CommandPhase");
+    expect(game.scene.currentBattle.waveIndex).toBe(2);
+
+    await game.reload.reloadSession();
+
+    const playerReloaded = game.scene.getPlayerPokemon()!;
+
+    expect(playerReloaded.getSpeciesForm().speciesId).toBe(enemy.getSpeciesForm().speciesId);
+    expect(playerReloaded.getSpeciesForm().formIndex).toBe(enemy.getSpeciesForm().formIndex);
+  });
 });
diff --git a/src/test/abilities/infiltrator.test.ts b/test/abilities/infiltrator.test.ts
similarity index 68%
rename from src/test/abilities/infiltrator.test.ts
rename to test/abilities/infiltrator.test.ts
index 8ea72b55b0c..1a9f802dd9c 100644
--- a/src/test/abilities/infiltrator.test.ts
+++ b/test/abilities/infiltrator.test.ts
@@ -1,5 +1,5 @@
 import { ArenaTagSide } from "#app/data/arena-tag";
-import { allMoves } from "#app/data/move";
+import { allMoves } from "#app/data/moves/move";
 import { ArenaTagType } from "#enums/arena-tag-type";
 import { BattlerTagType } from "#enums/battler-tag-type";
 import { Stat } from "#enums/stat";
@@ -7,7 +7,7 @@ import { StatusEffect } from "#enums/status-effect";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
@@ -28,9 +28,9 @@ describe("Abilities - Infiltrator", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     game.override
-      .moveset([ Moves.TACKLE, Moves.WATER_GUN, Moves.SPORE, Moves.BABY_DOLL_EYES ])
+      .moveset([Moves.TACKLE, Moves.WATER_GUN, Moves.SPORE, Moves.BABY_DOLL_EYES])
       .ability(Abilities.INFILTRATOR)
-      .battleType("single")
+      .battleStyle("single")
       .disableCrits()
       .enemySpecies(Species.SNORLAX)
       .enemyAbility(Abilities.BALL_FETCH)
@@ -40,27 +40,39 @@ describe("Abilities - Infiltrator", () => {
   });
 
   it.each([
-    { effectName: "Light Screen", tagType: ArenaTagType.LIGHT_SCREEN, move: Moves.WATER_GUN },
-    { effectName: "Reflect", tagType: ArenaTagType.REFLECT, move: Moves.TACKLE },
-    { effectName: "Aurora Veil", tagType: ArenaTagType.AURORA_VEIL, move: Moves.TACKLE }
+    {
+      effectName: "Light Screen",
+      tagType: ArenaTagType.LIGHT_SCREEN,
+      move: Moves.WATER_GUN,
+    },
+    {
+      effectName: "Reflect",
+      tagType: ArenaTagType.REFLECT,
+      move: Moves.TACKLE,
+    },
+    {
+      effectName: "Aurora Veil",
+      tagType: ArenaTagType.AURORA_VEIL,
+      move: Moves.TACKLE,
+    },
   ])("should bypass the target's $effectName", async ({ tagType, move }) => {
-    await game.classicMode.startBattle([ Species.MAGIKARP ]);
+    await game.classicMode.startBattle([Species.MAGIKARP]);
 
     const player = game.scene.getPlayerPokemon()!;
     const enemy = game.scene.getEnemyPokemon()!;
 
-    const preScreenDmg = enemy.getAttackDamage(player, allMoves[move]).damage;
+    const preScreenDmg = enemy.getAttackDamage({ source: player, move: allMoves[move] }).damage;
 
     game.scene.arena.addTag(tagType, 1, Moves.NONE, enemy.id, ArenaTagSide.ENEMY, true);
 
-    const postScreenDmg = enemy.getAttackDamage(player, allMoves[move]).damage;
+    const postScreenDmg = enemy.getAttackDamage({ source: player, move: allMoves[move] }).damage;
 
     expect(postScreenDmg).toBe(preScreenDmg);
-    expect(player.battleData.abilitiesApplied[0]).toBe(Abilities.INFILTRATOR);
+    expect(player.waveData.abilitiesApplied).toContain(Abilities.INFILTRATOR);
   });
 
   it("should bypass the target's Safeguard", async () => {
-    await game.classicMode.startBattle([ Species.MAGIKARP ]);
+    await game.classicMode.startBattle([Species.MAGIKARP]);
 
     const player = game.scene.getPlayerPokemon()!;
     const enemy = game.scene.getEnemyPokemon()!;
@@ -71,12 +83,12 @@ describe("Abilities - Infiltrator", () => {
 
     await game.phaseInterceptor.to("BerryPhase", false);
     expect(enemy.status?.effect).toBe(StatusEffect.SLEEP);
-    expect(player.battleData.abilitiesApplied[0]).toBe(Abilities.INFILTRATOR);
+    expect(player.waveData.abilitiesApplied).toContain(Abilities.INFILTRATOR);
   });
 
   // TODO: fix this interaction to pass this test
   it.todo("should bypass the target's Mist", async () => {
-    await game.classicMode.startBattle([ Species.MAGIKARP ]);
+    await game.classicMode.startBattle([Species.MAGIKARP]);
 
     const player = game.scene.getPlayerPokemon()!;
     const enemy = game.scene.getEnemyPokemon()!;
@@ -87,11 +99,11 @@ describe("Abilities - Infiltrator", () => {
 
     await game.phaseInterceptor.to("MoveEndPhase");
     expect(enemy.getStatStage(Stat.ATK)).toBe(-1);
-    expect(player.battleData.abilitiesApplied[0]).toBe(Abilities.INFILTRATOR);
+    expect(player.waveData.abilitiesApplied).toContain(Abilities.INFILTRATOR);
   });
 
   it("should bypass the target's Substitute", async () => {
-    await game.classicMode.startBattle([ Species.MAGIKARP ]);
+    await game.classicMode.startBattle([Species.MAGIKARP]);
 
     const player = game.scene.getPlayerPokemon()!;
     const enemy = game.scene.getEnemyPokemon()!;
@@ -102,6 +114,6 @@ describe("Abilities - Infiltrator", () => {
 
     await game.phaseInterceptor.to("MoveEndPhase");
     expect(enemy.getStatStage(Stat.ATK)).toBe(-1);
-    expect(player.battleData.abilitiesApplied[0]).toBe(Abilities.INFILTRATOR);
+    expect(player.waveData.abilitiesApplied).toContain(Abilities.INFILTRATOR);
   });
 });
diff --git a/test/abilities/insomnia.test.ts b/test/abilities/insomnia.test.ts
new file mode 100644
index 00000000000..49765a641b0
--- /dev/null
+++ b/test/abilities/insomnia.test.ts
@@ -0,0 +1,51 @@
+import { Abilities } from "#enums/abilities";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import { StatusEffect } from "#enums/status-effect";
+import GameManager from "#test/testUtils/gameManager";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
+
+describe("Abilities - Insomnia", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+    game.override
+      .moveset([Moves.SPLASH])
+      .ability(Abilities.BALL_FETCH)
+      .battleStyle("single")
+      .disableCrits()
+      .enemySpecies(Species.MAGIKARP)
+      .enemyAbility(Abilities.BALL_FETCH)
+      .enemyMoveset(Moves.SPLASH);
+  });
+
+  it("should remove sleep when gained", async () => {
+    game.override
+      .ability(Abilities.INSOMNIA)
+      .enemyAbility(Abilities.BALL_FETCH)
+      .moveset(Moves.SKILL_SWAP)
+      .enemyMoveset(Moves.SPLASH);
+    await game.classicMode.startBattle([Species.FEEBAS]);
+    const enemy = game.scene.getEnemyPokemon();
+    enemy?.trySetStatus(StatusEffect.SLEEP);
+    expect(enemy?.status?.effect).toBe(StatusEffect.SLEEP);
+
+    game.move.select(Moves.SKILL_SWAP);
+    await game.phaseInterceptor.to("BerryPhase");
+
+    expect(enemy?.status).toBeNull();
+  });
+});
diff --git a/src/test/abilities/intimidate.test.ts b/test/abilities/intimidate.test.ts
similarity index 81%
rename from src/test/abilities/intimidate.test.ts
rename to test/abilities/intimidate.test.ts
index d5a37d06593..8db39270dcf 100644
--- a/src/test/abilities/intimidate.test.ts
+++ b/test/abilities/intimidate.test.ts
@@ -1,9 +1,9 @@
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 import Phaser from "phaser";
-import GameManager from "#test/utils/gameManager";
-import { Mode } from "#app/ui/ui";
+import GameManager from "#test/testUtils/gameManager";
+import { UiMode } from "#enums/ui-mode";
 import { Stat } from "#enums/stat";
-import { getMovePosition } from "#test/utils/gameManagerUtils";
+import { getMovePosition } from "#test/testUtils/gameManagerUtils";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
@@ -24,7 +24,8 @@ describe("Abilities - Intimidate", () => {
 
   beforeEach(() => {
     game = new GameManager(phaserGame);
-    game.override.battleType("single")
+    game.override
+      .battleStyle("single")
       .enemySpecies(Species.RATTATA)
       .enemyAbility(Abilities.INTIMIDATE)
       .enemyPassiveAbility(Abilities.HYDRATION)
@@ -34,15 +35,15 @@ describe("Abilities - Intimidate", () => {
   });
 
   it("should lower ATK stat stage by 1 of enemy Pokemon on entry and player switch", async () => {
-    await game.classicMode.runToSummon([ Species.MIGHTYENA, Species.POOCHYENA ]);
+    await game.classicMode.runToSummon([Species.MIGHTYENA, Species.POOCHYENA]);
     game.onNextPrompt(
       "CheckSwitchPhase",
-      Mode.CONFIRM,
+      UiMode.CONFIRM,
       () => {
-        game.setMode(Mode.MESSAGE);
+        game.setMode(UiMode.MESSAGE);
         game.endPhase();
       },
-      () => game.isCurrentPhase("CommandPhase") || game.isCurrentPhase("TurnInitPhase")
+      () => game.isCurrentPhase("CommandPhase") || game.isCurrentPhase("TurnInitPhase"),
     );
     await game.phaseInterceptor.to("CommandPhase", false);
 
@@ -64,17 +65,16 @@ describe("Abilities - Intimidate", () => {
   }, 20000);
 
   it("should lower ATK stat stage by 1 for every enemy Pokemon in a double battle on entry", async () => {
-    game.override.battleType("double")
-      .startingWave(3);
-    await game.classicMode.runToSummon([ Species.MIGHTYENA, Species.POOCHYENA ]);
+    game.override.battleStyle("double").startingWave(3);
+    await game.classicMode.runToSummon([Species.MIGHTYENA, Species.POOCHYENA]);
     game.onNextPrompt(
       "CheckSwitchPhase",
-      Mode.CONFIRM,
+      UiMode.CONFIRM,
       () => {
-        game.setMode(Mode.MESSAGE);
+        game.setMode(UiMode.MESSAGE);
         game.endPhase();
       },
-      () => game.isCurrentPhase("CommandPhase") || game.isCurrentPhase("TurnInitPhase")
+      () => game.isCurrentPhase("CommandPhase") || game.isCurrentPhase("TurnInitPhase"),
     );
     await game.phaseInterceptor.to("CommandPhase", false);
 
@@ -89,8 +89,8 @@ describe("Abilities - Intimidate", () => {
 
   it("should not activate again if there is no switch or new entry", async () => {
     game.override.startingWave(2);
-    game.override.moveset([ Moves.SPLASH ]);
-    await game.classicMode.startBattle([ Species.MIGHTYENA, Species.POOCHYENA ]);
+    game.override.moveset([Moves.SPLASH]);
+    await game.classicMode.startBattle([Species.MIGHTYENA, Species.POOCHYENA]);
 
     const playerPokemon = game.scene.getPlayerPokemon()!;
     const enemyPokemon = game.scene.getEnemyPokemon()!;
@@ -106,10 +106,8 @@ describe("Abilities - Intimidate", () => {
   }, 20000);
 
   it("should lower ATK stat stage by 1 for every switch", async () => {
-    game.override.moveset([ Moves.SPLASH ])
-      .enemyMoveset([ Moves.VOLT_SWITCH ])
-      .startingWave(5);
-    await game.classicMode.startBattle([ Species.MIGHTYENA, Species.POOCHYENA ]);
+    game.override.moveset([Moves.SPLASH]).enemyMoveset([Moves.VOLT_SWITCH]).startingWave(5);
+    await game.classicMode.startBattle([Species.MIGHTYENA, Species.POOCHYENA]);
 
     const playerPokemon = game.scene.getPlayerPokemon()!;
     let enemyPokemon = game.scene.getEnemyPokemon()!;
diff --git a/src/test/abilities/intrepid_sword.test.ts b/test/abilities/intrepid_sword.test.ts
similarity index 82%
rename from src/test/abilities/intrepid_sword.test.ts
rename to test/abilities/intrepid_sword.test.ts
index 7bf0654276c..b30ae4a9bd0 100644
--- a/src/test/abilities/intrepid_sword.test.ts
+++ b/test/abilities/intrepid_sword.test.ts
@@ -1,12 +1,11 @@
 import { Stat } from "#enums/stat";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import { CommandPhase } from "#app/phases/command-phase";
 import { Abilities } from "#enums/abilities";
 import { Species } from "#enums/species";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
-
 describe("Abilities - Intrepid Sword", () => {
   let phaserGame: Phaser.Game;
   let game: GameManager;
@@ -23,16 +22,14 @@ describe("Abilities - Intrepid Sword", () => {
 
   beforeEach(() => {
     game = new GameManager(phaserGame);
-    game.override.battleType("single");
+    game.override.battleStyle("single");
     game.override.enemySpecies(Species.ZACIAN);
     game.override.enemyAbility(Abilities.INTREPID_SWORD);
     game.override.ability(Abilities.INTREPID_SWORD);
   });
 
-  it("should raise ATK stat stage by 1 on entry", async() => {
-    await game.classicMode.runToSummon([
-      Species.ZACIAN,
-    ]);
+  it("should raise ATK stat stage by 1 on entry", async () => {
+    await game.classicMode.runToSummon([Species.ZACIAN]);
 
     const playerPokemon = game.scene.getPlayerPokemon()!;
     const enemyPokemon = game.scene.getEnemyPokemon()!;
diff --git a/test/abilities/libero.test.ts b/test/abilities/libero.test.ts
new file mode 100644
index 00000000000..4adb828180e
--- /dev/null
+++ b/test/abilities/libero.test.ts
@@ -0,0 +1,301 @@
+import { allMoves } from "#app/data/moves/move";
+import { PokemonType } from "#enums/pokemon-type";
+import { Weather } from "#app/data/weather";
+import type { PlayerPokemon } from "#app/field/pokemon";
+import { TurnEndPhase } from "#app/phases/turn-end-phase";
+import { Abilities } from "#enums/abilities";
+import { BattlerTagType } from "#enums/battler-tag-type";
+import { Biome } from "#enums/biome";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import { WeatherType } from "#enums/weather-type";
+import GameManager from "#test/testUtils/gameManager";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest";
+
+describe("Abilities - Libero", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+    game.override.battleStyle("single");
+    game.override.ability(Abilities.LIBERO);
+    game.override.startingLevel(100);
+    game.override.enemySpecies(Species.RATTATA);
+    game.override.enemyMoveset([Moves.ENDURE, Moves.ENDURE, Moves.ENDURE, Moves.ENDURE]);
+  });
+
+  test("ability applies and changes a pokemon's type", async () => {
+    game.override.moveset([Moves.SPLASH]);
+
+    await game.startBattle([Species.MAGIKARP]);
+
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+    expect(leadPokemon).not.toBe(undefined);
+
+    game.move.select(Moves.SPLASH);
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    testPokemonTypeMatchesDefaultMoveType(leadPokemon, Moves.SPLASH);
+  });
+
+  // Test for Gen9+ functionality, we are using previous funcionality
+  test.skip("ability applies only once per switch in", async () => {
+    game.override.moveset([Moves.SPLASH, Moves.AGILITY]);
+
+    await game.startBattle([Species.MAGIKARP, Species.BULBASAUR]);
+
+    let leadPokemon = game.scene.getPlayerPokemon()!;
+    expect(leadPokemon).not.toBe(undefined);
+
+    game.move.select(Moves.SPLASH);
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    testPokemonTypeMatchesDefaultMoveType(leadPokemon, Moves.SPLASH);
+
+    game.move.select(Moves.AGILITY);
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    expect(leadPokemon.waveData.abilitiesApplied).toContain(Abilities.LIBERO);
+    const leadPokemonType = PokemonType[leadPokemon.getTypes()[0]];
+    const moveType = PokemonType[allMoves[Moves.AGILITY].type];
+    expect(leadPokemonType).not.toBe(moveType);
+
+    await game.toNextTurn();
+    game.doSwitchPokemon(1);
+    await game.toNextTurn();
+    game.doSwitchPokemon(1);
+    await game.toNextTurn();
+
+    leadPokemon = game.scene.getPlayerPokemon()!;
+    expect(leadPokemon).not.toBe(undefined);
+
+    game.move.select(Moves.SPLASH);
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    testPokemonTypeMatchesDefaultMoveType(leadPokemon, Moves.SPLASH);
+  });
+
+  test("ability applies correctly even if the pokemon's move has a variable type", async () => {
+    game.override.moveset([Moves.WEATHER_BALL]);
+
+    await game.startBattle([Species.MAGIKARP]);
+
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+    expect(leadPokemon).not.toBe(undefined);
+
+    game.scene.arena.weather = new Weather(WeatherType.SUNNY);
+    game.move.select(Moves.WEATHER_BALL);
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    expect(leadPokemon.waveData.abilitiesApplied).toContain(Abilities.LIBERO);
+    expect(leadPokemon.getTypes()).toHaveLength(1);
+    const leadPokemonType = PokemonType[leadPokemon.getTypes()[0]],
+      moveType = PokemonType[PokemonType.FIRE];
+    expect(leadPokemonType).toBe(moveType);
+  });
+
+  test("ability applies correctly even if the type has changed by another ability", async () => {
+    game.override.moveset([Moves.TACKLE]);
+    game.override.passiveAbility(Abilities.REFRIGERATE);
+
+    await game.startBattle([Species.MAGIKARP]);
+
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+    expect(leadPokemon).not.toBe(undefined);
+
+    game.move.select(Moves.TACKLE);
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    expect(leadPokemon.waveData.abilitiesApplied).toContain(Abilities.LIBERO);
+    expect(leadPokemon.getTypes()).toHaveLength(1);
+    const leadPokemonType = PokemonType[leadPokemon.getTypes()[0]],
+      moveType = PokemonType[PokemonType.ICE];
+    expect(leadPokemonType).toBe(moveType);
+  });
+
+  test("ability applies correctly even if the pokemon's move calls another move", async () => {
+    game.override.moveset([Moves.NATURE_POWER]);
+
+    await game.startBattle([Species.MAGIKARP]);
+
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+    expect(leadPokemon).not.toBe(undefined);
+
+    game.scene.arena.biomeType = Biome.MOUNTAIN;
+    game.move.select(Moves.NATURE_POWER);
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    testPokemonTypeMatchesDefaultMoveType(leadPokemon, Moves.AIR_SLASH);
+  });
+
+  test("ability applies correctly even if the pokemon's move is delayed / charging", async () => {
+    game.override.moveset([Moves.DIG]);
+
+    await game.startBattle([Species.MAGIKARP]);
+
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+    expect(leadPokemon).not.toBe(undefined);
+
+    game.move.select(Moves.DIG);
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    testPokemonTypeMatchesDefaultMoveType(leadPokemon, Moves.DIG);
+  });
+
+  test("ability applies correctly even if the pokemon's move misses", async () => {
+    game.override.moveset([Moves.TACKLE]);
+    game.override.enemyMoveset(Moves.SPLASH);
+
+    await game.startBattle([Species.MAGIKARP]);
+
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+    expect(leadPokemon).not.toBe(undefined);
+
+    game.move.select(Moves.TACKLE);
+    await game.move.forceMiss();
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    const enemyPokemon = game.scene.getEnemyPokemon()!;
+    expect(enemyPokemon.isFullHp()).toBe(true);
+    testPokemonTypeMatchesDefaultMoveType(leadPokemon, Moves.TACKLE);
+  });
+
+  test("ability applies correctly even if the pokemon's move is protected against", async () => {
+    game.override.moveset([Moves.TACKLE]);
+    game.override.enemyMoveset([Moves.PROTECT, Moves.PROTECT, Moves.PROTECT, Moves.PROTECT]);
+
+    await game.startBattle([Species.MAGIKARP]);
+
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+    expect(leadPokemon).not.toBe(undefined);
+
+    game.move.select(Moves.TACKLE);
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    testPokemonTypeMatchesDefaultMoveType(leadPokemon, Moves.TACKLE);
+  });
+
+  test("ability applies correctly even if the pokemon's move fails because of type immunity", async () => {
+    game.override.moveset([Moves.TACKLE]);
+    game.override.enemySpecies(Species.GASTLY);
+
+    await game.startBattle([Species.MAGIKARP]);
+
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+    expect(leadPokemon).not.toBe(undefined);
+
+    game.move.select(Moves.TACKLE);
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    testPokemonTypeMatchesDefaultMoveType(leadPokemon, Moves.TACKLE);
+  });
+
+  test("ability is not applied if pokemon's type is the same as the move's type", async () => {
+    game.override.moveset([Moves.SPLASH]);
+
+    await game.startBattle([Species.MAGIKARP]);
+
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+    expect(leadPokemon).not.toBe(undefined);
+
+    leadPokemon.summonData.types = [allMoves[Moves.SPLASH].type];
+    game.move.select(Moves.SPLASH);
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    expect(leadPokemon.waveData.abilitiesApplied).not.toContain(Abilities.LIBERO);
+  });
+
+  test("ability is not applied if pokemon is terastallized", async () => {
+    game.override.moveset([Moves.SPLASH]);
+
+    await game.startBattle([Species.MAGIKARP]);
+
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+    expect(leadPokemon).not.toBe(undefined);
+
+    leadPokemon.isTerastallized = true;
+
+    game.move.select(Moves.SPLASH);
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    expect(leadPokemon.waveData.abilitiesApplied).not.toContain(Abilities.LIBERO);
+  });
+
+  test("ability is not applied if pokemon uses struggle", async () => {
+    game.override.moveset([Moves.STRUGGLE]);
+
+    await game.startBattle([Species.MAGIKARP]);
+
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+    expect(leadPokemon).not.toBe(undefined);
+
+    game.move.select(Moves.STRUGGLE);
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    expect(leadPokemon.waveData.abilitiesApplied).not.toContain(Abilities.LIBERO);
+  });
+
+  test("ability is not applied if the pokemon's move fails", async () => {
+    game.override.moveset([Moves.BURN_UP]);
+
+    await game.startBattle([Species.MAGIKARP]);
+
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+    expect(leadPokemon).not.toBe(undefined);
+
+    game.move.select(Moves.BURN_UP);
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    expect(leadPokemon.waveData.abilitiesApplied).not.toContain(Abilities.LIBERO);
+  });
+
+  test("ability applies correctly even if the pokemon's Trick-or-Treat fails", async () => {
+    game.override.moveset([Moves.TRICK_OR_TREAT]);
+    game.override.enemySpecies(Species.GASTLY);
+
+    await game.startBattle([Species.MAGIKARP]);
+
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+    expect(leadPokemon).not.toBe(undefined);
+
+    game.move.select(Moves.TRICK_OR_TREAT);
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    testPokemonTypeMatchesDefaultMoveType(leadPokemon, Moves.TRICK_OR_TREAT);
+  });
+
+  test("ability applies correctly and the pokemon curses itself", async () => {
+    game.override.moveset([Moves.CURSE]);
+
+    await game.startBattle([Species.MAGIKARP]);
+
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+    expect(leadPokemon).not.toBe(undefined);
+
+    game.move.select(Moves.CURSE);
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    testPokemonTypeMatchesDefaultMoveType(leadPokemon, Moves.CURSE);
+    expect(leadPokemon.getTag(BattlerTagType.CURSED)).not.toBe(undefined);
+  });
+});
+
+function testPokemonTypeMatchesDefaultMoveType(pokemon: PlayerPokemon, move: Moves) {
+  expect(pokemon.waveData.abilitiesApplied).toContain(Abilities.LIBERO);
+  expect(pokemon.getTypes()).toHaveLength(1);
+  const pokemonType = PokemonType[pokemon.getTypes()[0]],
+    moveType = PokemonType[allMoves[move].type];
+  expect(pokemonType).toBe(moveType);
+}
diff --git a/test/abilities/lightningrod.test.ts b/test/abilities/lightningrod.test.ts
new file mode 100644
index 00000000000..21a03baf12b
--- /dev/null
+++ b/test/abilities/lightningrod.test.ts
@@ -0,0 +1,114 @@
+import { BattlerIndex } from "#app/battle";
+import { Abilities } from "#enums/abilities";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import { Stat } from "#enums/stat";
+import GameManager from "#test/testUtils/gameManager";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
+
+describe("Abilities - Lightningrod", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+    game.override
+      .moveset([Moves.SPLASH, Moves.SHOCK_WAVE])
+      .ability(Abilities.BALL_FETCH)
+      .battleStyle("double")
+      .disableCrits()
+      .enemySpecies(Species.MAGIKARP)
+      .enemyAbility(Abilities.BALL_FETCH)
+      .enemyMoveset(Moves.SPLASH);
+  });
+
+  it("should redirect electric type moves", async () => {
+    await game.classicMode.startBattle([Species.FEEBAS, Species.MAGIKARP]);
+
+    const enemy1 = game.scene.getEnemyField()[0];
+    const enemy2 = game.scene.getEnemyField()[1];
+
+    enemy2.summonData.ability = Abilities.LIGHTNING_ROD;
+
+    game.move.select(Moves.SHOCK_WAVE, BattlerIndex.PLAYER, BattlerIndex.ENEMY);
+    game.move.select(Moves.SPLASH, BattlerIndex.PLAYER_2);
+    await game.phaseInterceptor.to("BerryPhase");
+
+    expect(enemy1.isFullHp()).toBe(true);
+  });
+
+  it("should not redirect non-electric type moves", async () => {
+    game.override.moveset([Moves.SPLASH, Moves.AERIAL_ACE]);
+    await game.classicMode.startBattle([Species.FEEBAS, Species.MAGIKARP]);
+
+    const enemy1 = game.scene.getEnemyField()[0];
+    const enemy2 = game.scene.getEnemyField()[1];
+
+    enemy2.summonData.ability = Abilities.LIGHTNING_ROD;
+
+    game.move.select(Moves.AERIAL_ACE, BattlerIndex.PLAYER, BattlerIndex.ENEMY);
+    game.move.select(Moves.SPLASH, BattlerIndex.PLAYER_2);
+    await game.phaseInterceptor.to("BerryPhase");
+
+    expect(enemy1.isFullHp()).toBe(false);
+  });
+
+  it("should boost the user's spatk without damaging", async () => {
+    await game.classicMode.startBattle([Species.FEEBAS, Species.MAGIKARP]);
+
+    const enemy2 = game.scene.getEnemyField()[1];
+
+    enemy2.summonData.ability = Abilities.LIGHTNING_ROD;
+
+    game.move.select(Moves.SHOCK_WAVE, BattlerIndex.PLAYER, BattlerIndex.ENEMY);
+    game.move.select(Moves.SPLASH, BattlerIndex.PLAYER_2);
+    await game.phaseInterceptor.to("BerryPhase");
+
+    expect(enemy2.isFullHp()).toBe(true);
+    expect(enemy2.getStatStage(Stat.SPATK)).toBe(1);
+  });
+
+  it("should not redirect moves changed from electric type via ability", async () => {
+    game.override.ability(Abilities.NORMALIZE);
+    await game.classicMode.startBattle([Species.FEEBAS, Species.MAGIKARP]);
+
+    const enemy1 = game.scene.getEnemyField()[0];
+    const enemy2 = game.scene.getEnemyField()[1];
+
+    enemy2.summonData.ability = Abilities.LIGHTNING_ROD;
+
+    game.move.select(Moves.SHOCK_WAVE, BattlerIndex.PLAYER, BattlerIndex.ENEMY);
+    game.move.select(Moves.SPLASH, BattlerIndex.PLAYER_2);
+    await game.phaseInterceptor.to("BerryPhase");
+
+    expect(enemy1.isFullHp()).toBe(false);
+  });
+
+  it("should redirect moves changed to electric type via ability", async () => {
+    game.override.ability(Abilities.GALVANIZE).moveset(Moves.TACKLE);
+    await game.classicMode.startBattle([Species.FEEBAS, Species.MAGIKARP]);
+
+    const enemy1 = game.scene.getEnemyField()[0];
+    const enemy2 = game.scene.getEnemyField()[1];
+
+    enemy2.summonData.ability = Abilities.LIGHTNING_ROD;
+
+    game.move.select(Moves.TACKLE, BattlerIndex.PLAYER, BattlerIndex.ENEMY);
+    game.move.select(Moves.SPLASH, BattlerIndex.PLAYER_2);
+    await game.phaseInterceptor.to("BerryPhase");
+
+    expect(enemy1.isFullHp()).toBe(true);
+    expect(enemy2.getStatStage(Stat.SPATK)).toBe(1);
+  });
+});
diff --git a/test/abilities/limber.test.ts b/test/abilities/limber.test.ts
new file mode 100644
index 00000000000..4cdaa86f44c
--- /dev/null
+++ b/test/abilities/limber.test.ts
@@ -0,0 +1,51 @@
+import { Abilities } from "#enums/abilities";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import { StatusEffect } from "#enums/status-effect";
+import GameManager from "#test/testUtils/gameManager";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
+
+describe("Abilities - Limber", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+    game.override
+      .moveset([Moves.SPLASH])
+      .ability(Abilities.BALL_FETCH)
+      .battleStyle("single")
+      .disableCrits()
+      .enemySpecies(Species.MAGIKARP)
+      .enemyAbility(Abilities.BALL_FETCH)
+      .enemyMoveset(Moves.SPLASH);
+  });
+
+  it("should remove paralysis when gained", async () => {
+    game.override
+      .ability(Abilities.LIMBER)
+      .enemyAbility(Abilities.BALL_FETCH)
+      .moveset(Moves.SKILL_SWAP)
+      .enemyMoveset(Moves.SPLASH);
+    await game.classicMode.startBattle([Species.FEEBAS]);
+    const enemy = game.scene.getEnemyPokemon();
+    enemy?.trySetStatus(StatusEffect.PARALYSIS);
+    expect(enemy?.status?.effect).toBe(StatusEffect.PARALYSIS);
+
+    game.move.select(Moves.SKILL_SWAP);
+    await game.phaseInterceptor.to("BerryPhase");
+
+    expect(enemy?.status).toBeNull();
+  });
+});
diff --git a/test/abilities/magic_bounce.test.ts b/test/abilities/magic_bounce.test.ts
new file mode 100644
index 00000000000..11131640a0f
--- /dev/null
+++ b/test/abilities/magic_bounce.test.ts
@@ -0,0 +1,362 @@
+import { BattlerIndex } from "#app/battle";
+import { allAbilities } from "#app/data/data-lists";
+import { ArenaTagSide } from "#app/data/arena-tag";
+import { allMoves } from "#app/data/moves/move";
+import { ArenaTagType } from "#app/enums/arena-tag-type";
+import { BattlerTagType } from "#app/enums/battler-tag-type";
+import { Stat } from "#app/enums/stat";
+import { StatusEffect } from "#app/enums/status-effect";
+import { Abilities } from "#enums/abilities";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import GameManager from "#test/testUtils/gameManager";
+import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
+
+describe("Abilities - Magic Bounce", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+    game.override
+      .ability(Abilities.BALL_FETCH)
+      .battleStyle("single")
+      .moveset([Moves.GROWL, Moves.SPLASH])
+      .disableCrits()
+      .enemySpecies(Species.MAGIKARP)
+      .enemyAbility(Abilities.MAGIC_BOUNCE)
+      .enemyMoveset(Moves.SPLASH);
+  });
+
+  it("should reflect basic status moves", async () => {
+    await game.classicMode.startBattle([Species.MAGIKARP]);
+
+    game.move.select(Moves.GROWL);
+    await game.phaseInterceptor.to("BerryPhase");
+    expect(game.scene.getPlayerPokemon()!.getStatStage(Stat.ATK)).toBe(-1);
+  });
+
+  it("should not bounce moves while the target is in the semi-invulnerable state", async () => {
+    await game.classicMode.startBattle([Species.MAGIKARP]);
+    game.override.moveset([Moves.GROWL]);
+    game.override.enemyMoveset([Moves.FLY]);
+
+    game.move.select(Moves.GROWL);
+    await game.forceEnemyMove(Moves.FLY);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
+    await game.phaseInterceptor.to("BerryPhase");
+
+    expect(game.scene.getPlayerPokemon()!.getStatStage(Stat.ATK)).toBe(0);
+  });
+
+  it("should individually bounce back multi-target moves", async () => {
+    game.override.battleStyle("double");
+    game.override.moveset([Moves.GROWL, Moves.SPLASH]);
+    await game.classicMode.startBattle([Species.MAGIKARP, Species.MAGIKARP]);
+
+    game.move.select(Moves.GROWL, 0);
+    game.move.select(Moves.SPLASH, 1);
+    await game.phaseInterceptor.to("BerryPhase");
+
+    const user = game.scene.getPlayerField()[0];
+    expect(user.getStatStage(Stat.ATK)).toBe(-2);
+  });
+
+  it("should still bounce back a move that would otherwise fail", async () => {
+    await game.classicMode.startBattle([Species.MAGIKARP]);
+    game.scene.getEnemyPokemon()?.setStatStage(Stat.ATK, -6);
+    game.override.moveset([Moves.GROWL]);
+
+    game.move.select(Moves.GROWL);
+    await game.phaseInterceptor.to("BerryPhase");
+
+    expect(game.scene.getPlayerPokemon()!.getStatStage(Stat.ATK)).toBe(-1);
+  });
+
+  it("should not bounce back a move that was just bounced", async () => {
+    game.override.ability(Abilities.MAGIC_BOUNCE);
+    await game.classicMode.startBattle([Species.MAGIKARP]);
+
+    game.move.select(Moves.GROWL);
+    await game.phaseInterceptor.to("BerryPhase");
+
+    expect(game.scene.getPlayerPokemon()!.getStatStage(Stat.ATK)).toBe(-1);
+  });
+
+  it("should receive the stat change after reflecting a move back to a mirror armor user", async () => {
+    game.override.ability(Abilities.MIRROR_ARMOR);
+    await game.classicMode.startBattle([Species.MAGIKARP]);
+
+    game.move.select(Moves.GROWL);
+    await game.phaseInterceptor.to("BerryPhase");
+
+    expect(game.scene.getEnemyPokemon()!.getStatStage(Stat.ATK)).toBe(-1);
+  });
+
+  it("should not bounce back a move from a mold breaker user", async () => {
+    game.override.ability(Abilities.MOLD_BREAKER);
+    await game.classicMode.startBattle([Species.MAGIKARP]);
+
+    game.move.select(Moves.GROWL);
+    await game.phaseInterceptor.to("BerryPhase");
+
+    expect(game.scene.getEnemyPokemon()!.getStatStage(Stat.ATK)).toBe(-1);
+  });
+
+  it("should bounce back a spread status move against both pokemon", async () => {
+    game.override.battleStyle("double");
+    game.override.moveset([Moves.GROWL, Moves.SPLASH]);
+    game.override.enemyMoveset([Moves.SPLASH]);
+    await game.classicMode.startBattle([Species.MAGIKARP, Species.MAGIKARP]);
+
+    game.move.select(Moves.GROWL, 0);
+    game.move.select(Moves.SPLASH, 1);
+
+    await game.phaseInterceptor.to("BerryPhase");
+    expect(game.scene.getPlayerField().every(p => p.getStatStage(Stat.ATK) === -2)).toBeTruthy();
+  });
+
+  it("should only bounce spikes back once in doubles when both targets have magic bounce", async () => {
+    game.override.battleStyle("double");
+    await game.classicMode.startBattle([Species.MAGIKARP]);
+    game.override.moveset([Moves.SPIKES]);
+
+    game.move.select(Moves.SPIKES);
+    await game.phaseInterceptor.to("BerryPhase");
+
+    expect(game.scene.arena.getTagOnSide(ArenaTagType.SPIKES, ArenaTagSide.PLAYER)!["layers"]).toBe(1);
+    expect(game.scene.arena.getTagOnSide(ArenaTagType.SPIKES, ArenaTagSide.ENEMY)).toBeUndefined();
+  });
+
+  it("should bounce spikes even when the target is protected", async () => {
+    game.override.moveset([Moves.SPIKES]);
+    game.override.enemyMoveset([Moves.PROTECT]);
+    await game.classicMode.startBattle([Species.MAGIKARP]);
+
+    game.move.select(Moves.SPIKES);
+    await game.phaseInterceptor.to("BerryPhase");
+    expect(game.scene.arena.getTagOnSide(ArenaTagType.SPIKES, ArenaTagSide.PLAYER)!["layers"]).toBe(1);
+  });
+
+  it("should not bounce spikes when the target is in the semi-invulnerable state", async () => {
+    game.override.moveset([Moves.SPIKES]);
+    game.override.enemyMoveset([Moves.FLY]);
+    await game.classicMode.startBattle([Species.MAGIKARP]);
+
+    game.move.select(Moves.SPIKES);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
+    await game.phaseInterceptor.to("BerryPhase");
+    expect(game.scene.arena.getTagOnSide(ArenaTagType.SPIKES, ArenaTagSide.ENEMY)!["layers"]).toBe(1);
+  });
+
+  it("should not bounce back curse", async () => {
+    game.override.starterSpecies(Species.GASTLY);
+    await game.classicMode.startBattle([Species.GASTLY]);
+    game.override.moveset([Moves.CURSE]);
+
+    game.move.select(Moves.CURSE);
+    await game.phaseInterceptor.to("BerryPhase");
+
+    expect(game.scene.getEnemyPokemon()!.getTag(BattlerTagType.CURSED)).toBeDefined();
+  });
+
+  it("should not cause encore to be interrupted after bouncing", async () => {
+    game.override.moveset([Moves.SPLASH, Moves.GROWL, Moves.ENCORE]);
+    game.override.enemyMoveset([Moves.TACKLE, Moves.GROWL]);
+    // game.override.ability(Abilities.MOLD_BREAKER);
+    await game.classicMode.startBattle([Species.MAGIKARP]);
+    const playerPokemon = game.scene.getPlayerPokemon()!;
+    const enemyPokemon = game.scene.getEnemyPokemon()!;
+
+    // Give the player MOLD_BREAKER for this turn to bypass Magic Bounce.
+    vi.spyOn(playerPokemon, "getAbility").mockReturnValue(allAbilities[Abilities.MOLD_BREAKER]);
+
+    // turn 1
+    game.move.select(Moves.ENCORE);
+    await game.forceEnemyMove(Moves.TACKLE);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
+    await game.toNextTurn();
+    expect(enemyPokemon.getTag(BattlerTagType.ENCORE)!["moveId"]).toBe(Moves.TACKLE);
+
+    // turn 2
+    vi.spyOn(playerPokemon, "getAbility").mockRestore();
+    game.move.select(Moves.GROWL);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
+    await game.phaseInterceptor.to("BerryPhase");
+    expect(enemyPokemon.getTag(BattlerTagType.ENCORE)!["moveId"]).toBe(Moves.TACKLE);
+    expect(enemyPokemon.getLastXMoves()[0].move).toBe(Moves.TACKLE);
+  });
+
+  // TODO: encore is failing if the last move was virtual.
+  it.todo("should not cause the bounced move to count for encore", async () => {
+    game.override.moveset([Moves.SPLASH, Moves.GROWL, Moves.ENCORE]);
+    game.override.enemyMoveset([Moves.GROWL, Moves.TACKLE]);
+    game.override.enemyAbility(Abilities.MAGIC_BOUNCE);
+
+    await game.classicMode.startBattle([Species.MAGIKARP]);
+    const playerPokemon = game.scene.getPlayerPokemon()!;
+    const enemyPokemon = game.scene.getEnemyPokemon()!;
+
+    // turn 1
+    game.move.select(Moves.GROWL);
+    await game.forceEnemyMove(Moves.TACKLE);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
+    await game.toNextTurn();
+
+    // Give the player MOLD_BREAKER for this turn to bypass Magic Bounce.
+    vi.spyOn(playerPokemon, "getAbility").mockReturnValue(allAbilities[Abilities.MOLD_BREAKER]);
+
+    // turn 2
+    game.move.select(Moves.ENCORE);
+    await game.forceEnemyMove(Moves.TACKLE);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
+    await game.phaseInterceptor.to("BerryPhase");
+    expect(enemyPokemon.getTag(BattlerTagType.ENCORE)!["moveId"]).toBe(Moves.TACKLE);
+    expect(enemyPokemon.getLastXMoves()[0].move).toBe(Moves.TACKLE);
+  });
+
+  // TODO: stomping tantrum should consider moves that were bounced.
+  it.todo("should cause stomping tantrum to double in power when the last move was bounced", async () => {
+    game.override.battleStyle("single");
+    await game.classicMode.startBattle([Species.MAGIKARP]);
+    game.override.moveset([Moves.STOMPING_TANTRUM, Moves.CHARM]);
+
+    const stomping_tantrum = allMoves[Moves.STOMPING_TANTRUM];
+    vi.spyOn(stomping_tantrum, "calculateBattlePower");
+
+    game.move.select(Moves.CHARM);
+    await game.toNextTurn();
+
+    game.move.select(Moves.STOMPING_TANTRUM);
+    await game.phaseInterceptor.to("BerryPhase");
+    expect(stomping_tantrum.calculateBattlePower).toHaveReturnedWith(150);
+  });
+
+  // TODO: stomping tantrum should consider moves that were bounced.
+  it.todo(
+    "should properly cause the enemy's stomping tantrum to be doubled in power after bouncing and failing",
+    async () => {
+      game.override.enemyMoveset([Moves.STOMPING_TANTRUM, Moves.SPLASH, Moves.CHARM]);
+      await game.classicMode.startBattle([Species.BULBASAUR]);
+
+      const stomping_tantrum = allMoves[Moves.STOMPING_TANTRUM];
+      const enemy = game.scene.getEnemyPokemon()!;
+      vi.spyOn(stomping_tantrum, "calculateBattlePower");
+
+      game.move.select(Moves.SPORE);
+      await game.forceEnemyMove(Moves.CHARM);
+      await game.phaseInterceptor.to("TurnEndPhase");
+      expect(enemy.getLastXMoves(1)[0].result).toBe("success");
+
+      await game.phaseInterceptor.to("BerryPhase");
+      expect(stomping_tantrum.calculateBattlePower).toHaveReturnedWith(75);
+
+      await game.toNextTurn();
+      game.move.select(Moves.GROWL);
+      await game.phaseInterceptor.to("BerryPhase");
+      expect(stomping_tantrum.calculateBattlePower).toHaveReturnedWith(75);
+    },
+  );
+
+  it("should respect immunities when bouncing a move", async () => {
+    vi.spyOn(allMoves[Moves.THUNDER_WAVE], "accuracy", "get").mockReturnValue(100);
+    game.override.moveset([Moves.THUNDER_WAVE, Moves.GROWL]);
+    game.override.ability(Abilities.SOUNDPROOF);
+    await game.classicMode.startBattle([Species.PHANPY]);
+
+    // Turn 1 - thunder wave immunity test
+    game.move.select(Moves.THUNDER_WAVE);
+    await game.phaseInterceptor.to("BerryPhase");
+    expect(game.scene.getPlayerPokemon()!.status).toBeUndefined();
+
+    // Turn 2 - soundproof immunity test
+    game.move.select(Moves.GROWL);
+    await game.phaseInterceptor.to("BerryPhase");
+    expect(game.scene.getPlayerPokemon()!.getStatStage(Stat.ATK)).toBe(0);
+  });
+
+  it("should bounce back a move before the accuracy check", async () => {
+    game.override.moveset([Moves.SPORE]);
+    await game.classicMode.startBattle([Species.MAGIKARP]);
+
+    const attacker = game.scene.getPlayerPokemon()!;
+
+    vi.spyOn(attacker, "getAccuracyMultiplier").mockReturnValue(0.0);
+    game.move.select(Moves.SPORE);
+    await game.phaseInterceptor.to("BerryPhase");
+    expect(game.scene.getPlayerPokemon()!.status?.effect).toBe(StatusEffect.SLEEP);
+  });
+
+  it("should take the accuracy of the magic bounce user into account", async () => {
+    game.override.moveset([Moves.SPORE]);
+    await game.classicMode.startBattle([Species.MAGIKARP]);
+    const opponent = game.scene.getEnemyPokemon()!;
+
+    vi.spyOn(opponent, "getAccuracyMultiplier").mockReturnValue(0);
+    game.move.select(Moves.SPORE);
+    await game.phaseInterceptor.to("BerryPhase");
+    expect(game.scene.getPlayerPokemon()!.status).toBeUndefined();
+  });
+
+  it("should always apply the leftmost available target's magic bounce when bouncing moves like sticky webs in doubles", async () => {
+    game.override.battleStyle("double");
+    game.override.moveset([Moves.STICKY_WEB, Moves.SPLASH, Moves.TRICK_ROOM]);
+
+    await game.classicMode.startBattle([Species.MAGIKARP, Species.MAGIKARP]);
+    const [enemy_1, enemy_2] = game.scene.getEnemyField();
+    // set speed just incase logic erroneously checks for speed order
+    enemy_1.setStat(Stat.SPD, enemy_2.getStat(Stat.SPD) + 1);
+
+    // turn 1
+    game.move.select(Moves.STICKY_WEB, 0);
+    game.move.select(Moves.TRICK_ROOM, 1);
+    await game.phaseInterceptor.to("TurnEndPhase");
+
+    expect(
+      game.scene.arena
+        .getTagOnSide(ArenaTagType.STICKY_WEB, ArenaTagSide.PLAYER)
+        ?.getSourcePokemon()
+        ?.getBattlerIndex(),
+    ).toBe(BattlerIndex.ENEMY);
+    game.scene.arena.removeTagOnSide(ArenaTagType.STICKY_WEB, ArenaTagSide.PLAYER, true);
+
+    // turn 2
+    game.move.select(Moves.STICKY_WEB, 0);
+    game.move.select(Moves.TRICK_ROOM, 1);
+    await game.phaseInterceptor.to("BerryPhase");
+    expect(
+      game.scene.arena
+        .getTagOnSide(ArenaTagType.STICKY_WEB, ArenaTagSide.PLAYER)
+        ?.getSourcePokemon()
+        ?.getBattlerIndex(),
+    ).toBe(BattlerIndex.ENEMY);
+  });
+
+  it("should not bounce back status moves that hit through semi-invulnerable states", async () => {
+    game.override.moveset([Moves.TOXIC, Moves.CHARM]);
+    await game.classicMode.startBattle([Species.BULBASAUR]);
+    game.move.select(Moves.TOXIC);
+    await game.forceEnemyMove(Moves.FLY);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
+    await game.phaseInterceptor.to("BerryPhase");
+    expect(game.scene.getEnemyPokemon()!.status?.effect).toBe(StatusEffect.TOXIC);
+    expect(game.scene.getPlayerPokemon()!.status).toBeUndefined();
+
+    game.override.ability(Abilities.NO_GUARD);
+    game.move.select(Moves.CHARM);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
+    await game.phaseInterceptor.to("BerryPhase");
+    expect(game.scene.getEnemyPokemon()!.getStatStage(Stat.ATK)).toBe(-2);
+    expect(game.scene.getPlayerPokemon()!.getStatStage(Stat.ATK)).toBe(0);
+  });
+});
diff --git a/test/abilities/magic_guard.test.ts b/test/abilities/magic_guard.test.ts
new file mode 100644
index 00000000000..96a9f4dab74
--- /dev/null
+++ b/test/abilities/magic_guard.test.ts
@@ -0,0 +1,439 @@
+import { ArenaTagSide, getArenaTag } from "#app/data/arena-tag";
+import { getStatusEffectCatchRateMultiplier } from "#app/data/status-effect";
+import { TurnEndPhase } from "#app/phases/turn-end-phase";
+import { Abilities } from "#enums/abilities";
+import { ArenaTagType } from "#enums/arena-tag-type";
+import { BattlerTagType } from "#enums/battler-tag-type";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import { StatusEffect } from "#enums/status-effect";
+import { WeatherType } from "#enums/weather-type";
+import GameManager from "#test/testUtils/gameManager";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
+
+describe("Abilities - Magic Guard", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+
+    /** Player Pokemon overrides */
+    game.override.ability(Abilities.MAGIC_GUARD);
+    game.override.moveset([Moves.SPLASH]);
+    game.override.startingLevel(100);
+
+    /** Enemy Pokemon overrides */
+    game.override.enemySpecies(Species.SNORLAX);
+    game.override.enemyAbility(Abilities.INSOMNIA);
+    game.override.enemyMoveset(Moves.SPLASH);
+    game.override.enemyLevel(100);
+  });
+
+  //Bulbapedia Reference: https://bulbapedia.bulbagarden.net/wiki/Magic_Guard_(Ability)
+
+  it("ability should prevent damage caused by weather", async () => {
+    game.override.weather(WeatherType.SANDSTORM);
+
+    await game.startBattle([Species.MAGIKARP]);
+
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+
+    const enemyPokemon = game.scene.getEnemyPokemon()!;
+    expect(enemyPokemon).toBeDefined();
+
+    game.move.select(Moves.SPLASH);
+
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    /**
+     * Expect:
+     * - The player Pokemon (with Magic Guard) has not taken damage from weather
+     * - The enemy Pokemon (without Magic Guard) has taken damage from weather
+     */
+    expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp());
+    expect(enemyPokemon.hp).toBeLessThan(enemyPokemon.getMaxHp());
+  });
+
+  it("ability should prevent damage caused by status effects but other non-damage effects still apply", async () => {
+    //Toxic keeps track of the turn counters -> important that Magic Guard keeps track of post-Toxic turns
+    game.override.statusEffect(StatusEffect.POISON);
+
+    await game.startBattle([Species.MAGIKARP]);
+
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+
+    game.move.select(Moves.SPLASH);
+
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    /**
+     * Expect:
+     * - The player Pokemon (with Magic Guard) has not taken damage from poison
+     * - The Pokemon's CatchRateMultiplier should be 1.5
+     */
+    expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp());
+    expect(getStatusEffectCatchRateMultiplier(leadPokemon.status!.effect)).toBe(1.5);
+  });
+
+  it("ability effect should not persist when the ability is replaced", async () => {
+    game.override.enemyMoveset([Moves.WORRY_SEED, Moves.WORRY_SEED, Moves.WORRY_SEED, Moves.WORRY_SEED]);
+    game.override.statusEffect(StatusEffect.POISON);
+
+    await game.startBattle([Species.MAGIKARP]);
+
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+
+    game.move.select(Moves.SPLASH);
+
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    /**
+     * Expect:
+     * - The player Pokemon (that just lost its Magic Guard ability) has taken damage from poison
+     */
+    expect(leadPokemon.hp).toBeLessThan(leadPokemon.getMaxHp());
+  });
+
+  it("Magic Guard prevents damage caused by burn but other non-damaging effects are still applied", async () => {
+    game.override.enemyStatusEffect(StatusEffect.BURN);
+    game.override.enemyAbility(Abilities.MAGIC_GUARD);
+
+    await game.startBattle([Species.MAGIKARP]);
+
+    game.move.select(Moves.SPLASH);
+
+    const enemyPokemon = game.scene.getEnemyPokemon()!;
+
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    /**
+     * Expect:
+     * - The enemy Pokemon (with Magic Guard) has not taken damage from burn
+     * - The enemy Pokemon's physical attack damage is halved (TBD)
+     * - The enemy Pokemon's hypothetical CatchRateMultiplier should be 1.5
+     */
+    expect(enemyPokemon.hp).toBe(enemyPokemon.getMaxHp());
+    expect(getStatusEffectCatchRateMultiplier(enemyPokemon.status!.effect)).toBe(1.5);
+  });
+
+  it("Magic Guard prevents damage caused by toxic but other non-damaging effects are still applied", async () => {
+    game.override.enemyStatusEffect(StatusEffect.TOXIC);
+    game.override.enemyAbility(Abilities.MAGIC_GUARD);
+
+    await game.startBattle([Species.MAGIKARP]);
+
+    game.move.select(Moves.SPLASH);
+
+    const enemyPokemon = game.scene.getEnemyPokemon()!;
+
+    const toxicStartCounter = enemyPokemon.status!.toxicTurnCount;
+    //should be 0
+
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    /**
+     * Expect:
+     * - The enemy Pokemon (with Magic Guard) has not taken damage from toxic
+     * - The enemy Pokemon's status effect duration should be incremented
+     * - The enemy Pokemon's hypothetical CatchRateMultiplier should be 1.5
+     */
+    expect(enemyPokemon.hp).toBe(enemyPokemon.getMaxHp());
+    expect(enemyPokemon.status!.toxicTurnCount).toBeGreaterThan(toxicStartCounter);
+    expect(getStatusEffectCatchRateMultiplier(enemyPokemon.status!.effect)).toBe(1.5);
+  });
+
+  it("Magic Guard prevents damage caused by entry hazards", async () => {
+    //Adds and applies Spikes to both sides of the arena
+    const newTag = getArenaTag(ArenaTagType.SPIKES, 5, Moves.SPIKES, 0, 0, ArenaTagSide.BOTH)!;
+    game.scene.arena.tags.push(newTag);
+
+    await game.startBattle([Species.MAGIKARP]);
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+
+    game.move.select(Moves.SPLASH);
+
+    const enemyPokemon = game.scene.getEnemyPokemon()!;
+
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    /**
+     * Expect:
+     * - The player Pokemon (with Magic Guard) has not taken damage from spikes
+     * - The enemy Pokemon (without Magic Guard) has taken damage from spikes
+     */
+    expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp());
+    expect(enemyPokemon.hp).toBeLessThan(enemyPokemon.getMaxHp());
+  });
+
+  it("Magic Guard does not prevent poison from Toxic Spikes", async () => {
+    //Adds and applies Spikes to both sides of the arena
+    const playerTag = getArenaTag(ArenaTagType.TOXIC_SPIKES, 5, Moves.TOXIC_SPIKES, 0, 0, ArenaTagSide.PLAYER)!;
+    const enemyTag = getArenaTag(ArenaTagType.TOXIC_SPIKES, 5, Moves.TOXIC_SPIKES, 0, 0, ArenaTagSide.ENEMY)!;
+    game.scene.arena.tags.push(playerTag);
+    game.scene.arena.tags.push(enemyTag);
+
+    await game.startBattle([Species.MAGIKARP]);
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+
+    game.move.select(Moves.SPLASH);
+
+    const enemyPokemon = game.scene.getEnemyPokemon()!;
+
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    /**
+     * Expect:
+     * - Both Pokemon gain the poison status effect
+     * - The player Pokemon (with Magic Guard) has not taken damage from poison
+     * - The enemy Pokemon (without Magic Guard) has taken damage from poison
+     */
+    expect(leadPokemon.status!.effect).toBe(StatusEffect.POISON);
+    expect(enemyPokemon.status!.effect).toBe(StatusEffect.POISON);
+    expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp());
+    expect(enemyPokemon.hp).toBeLessThan(enemyPokemon.getMaxHp());
+  });
+
+  it("Magic Guard prevents against damage from volatile status effects", async () => {
+    await game.startBattle([Species.DUSKULL]);
+    game.override.moveset([Moves.CURSE]);
+    game.override.enemyAbility(Abilities.MAGIC_GUARD);
+
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+
+    game.move.select(Moves.CURSE);
+
+    const enemyPokemon = game.scene.getEnemyPokemon()!;
+
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    /**
+     * Expect:
+     * - The player Pokemon (with Magic Guard) has cut its HP to inflict curse
+     * - The enemy Pokemon (with Magic Guard) is cursed
+     * - The enemy Pokemon (with Magic Guard) does not lose HP from being cursed
+     */
+    expect(leadPokemon.hp).toBeLessThan(leadPokemon.getMaxHp());
+    expect(enemyPokemon.getTag(BattlerTagType.CURSED)).not.toBe(undefined);
+    expect(enemyPokemon.hp).toBe(enemyPokemon.getMaxHp());
+  });
+
+  it("Magic Guard prevents crash damage", async () => {
+    game.override.moveset([Moves.HIGH_JUMP_KICK]);
+    await game.startBattle([Species.MAGIKARP]);
+
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+
+    game.move.select(Moves.HIGH_JUMP_KICK);
+    await game.move.forceMiss();
+
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    /**
+     * Expect:
+     * - The player Pokemon (with Magic Guard) misses High Jump Kick but does not lose HP as a result
+     */
+    expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp());
+  });
+
+  it("Magic Guard prevents damage from recoil", async () => {
+    game.override.moveset([Moves.TAKE_DOWN]);
+    await game.startBattle([Species.MAGIKARP]);
+
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+
+    game.move.select(Moves.TAKE_DOWN);
+
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    /**
+     * Expect:
+     * - The player Pokemon (with Magic Guard) uses a recoil move but does not lose HP from recoil
+     */
+    expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp());
+  });
+
+  it("Magic Guard does not prevent damage from Struggle's recoil", async () => {
+    game.override.moveset([Moves.STRUGGLE]);
+    await game.startBattle([Species.MAGIKARP]);
+
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+
+    game.move.select(Moves.STRUGGLE);
+
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    /**
+     * Expect:
+     * - The player Pokemon (with Magic Guard) uses Struggle but does lose HP from Struggle's recoil
+     */
+    expect(leadPokemon.hp).toBeLessThan(leadPokemon.getMaxHp());
+  });
+
+  //This tests different move attributes than the recoil tests above
+  it("Magic Guard prevents self-damage from attacking moves", async () => {
+    game.override.moveset([Moves.STEEL_BEAM]);
+    await game.startBattle([Species.MAGIKARP]);
+
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+
+    game.move.select(Moves.STEEL_BEAM);
+
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    /**
+     * Expect:
+     * - The player Pokemon (with Magic Guard) uses a move with an HP cost but does not lose HP from using it
+     */
+    expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp());
+  });
+
+  /*
+  it("Magic Guard does not prevent self-damage from confusion", async () => {
+    await game.startBattle([Species.MAGIKARP]);
+
+    game.move.select(Moves.CHARM);
+
+    await game.phaseInterceptor.to(TurnEndPhase);
+  });
+*/
+
+  it("Magic Guard does not prevent self-damage from non-attacking moves", async () => {
+    game.override.moveset([Moves.BELLY_DRUM]);
+    await game.startBattle([Species.MAGIKARP]);
+
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+
+    game.move.select(Moves.BELLY_DRUM);
+
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    /**
+     * Expect:
+     * - The player Pokemon (with Magic Guard) uses a non-attacking move with an HP cost and thus loses HP from using it
+     */
+    expect(leadPokemon.hp).toBeLessThan(leadPokemon.getMaxHp());
+  });
+
+  it("Magic Guard prevents damage from abilities with PostTurnHurtIfSleepingAbAttr", async () => {
+    //Tests the ability Bad Dreams
+    game.override.statusEffect(StatusEffect.SLEEP);
+    //enemy pokemon is given Spore just in case player pokemon somehow awakens during test
+    game.override.enemyMoveset([Moves.SPORE, Moves.SPORE, Moves.SPORE, Moves.SPORE]);
+    game.override.enemyAbility(Abilities.BAD_DREAMS);
+
+    await game.startBattle([Species.MAGIKARP]);
+
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+
+    game.move.select(Moves.SPLASH);
+
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    /**
+     * Expect:
+     * - The player Pokemon (with Magic Guard) should not lose HP due to this ability attribute
+     * - The player Pokemon is asleep
+     */
+    expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp());
+    expect(leadPokemon.status!.effect).toBe(StatusEffect.SLEEP);
+  });
+
+  it("Magic Guard prevents damage from abilities with PostFaintContactDamageAbAttr", async () => {
+    //Tests the abilities Innards Out/Aftermath
+    game.override.moveset([Moves.TACKLE]);
+    game.override.enemyAbility(Abilities.AFTERMATH);
+
+    await game.startBattle([Species.MAGIKARP]);
+
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+
+    const enemyPokemon = game.scene.getEnemyPokemon()!;
+    enemyPokemon.hp = 1;
+
+    game.move.select(Moves.TACKLE);
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    /**
+     * Expect:
+     * - The player Pokemon (with Magic Guard) should not lose HP due to this ability attribute
+     * - The enemy Pokemon has fainted
+     */
+    expect(enemyPokemon.hp).toBe(0);
+    expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp());
+  });
+
+  it("Magic Guard prevents damage from abilities with PostDefendContactDamageAbAttr", async () => {
+    //Tests the abilities Iron Barbs/Rough Skin
+    game.override.moveset([Moves.TACKLE]);
+    game.override.enemyAbility(Abilities.IRON_BARBS);
+
+    await game.startBattle([Species.MAGIKARP]);
+
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+
+    const enemyPokemon = game.scene.getEnemyPokemon()!;
+
+    game.move.select(Moves.TACKLE);
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    /**
+     * Expect:
+     * - The player Pokemon (with Magic Guard) should not lose HP due to this ability attribute
+     * - The player Pokemon's move should have connected
+     */
+    expect(enemyPokemon.hp).toBeLessThan(enemyPokemon.getMaxHp());
+    expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp());
+  });
+
+  it("Magic Guard prevents damage from abilities with ReverseDrainAbAttr", async () => {
+    //Tests the ability Liquid Ooze
+    game.override.moveset([Moves.ABSORB]);
+    game.override.enemyAbility(Abilities.LIQUID_OOZE);
+
+    await game.startBattle([Species.MAGIKARP]);
+
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+
+    const enemyPokemon = game.scene.getEnemyPokemon()!;
+
+    game.move.select(Moves.ABSORB);
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    /**
+     * Expect:
+     * - The player Pokemon (with Magic Guard) should not lose HP due to this ability attribute
+     * - The player Pokemon's move should have connected
+     */
+    expect(enemyPokemon.hp).toBeLessThan(enemyPokemon.getMaxHp());
+    expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp());
+  });
+
+  it("Magic Guard prevents HP loss from abilities with PostWeatherLapseDamageAbAttr", async () => {
+    //Tests the abilities Solar Power/Dry Skin
+    game.override.passiveAbility(Abilities.SOLAR_POWER);
+    game.override.weather(WeatherType.SUNNY);
+
+    await game.startBattle([Species.MAGIKARP]);
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+    game.move.select(Moves.SPLASH);
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    /**
+     * Expect:
+     * - The player Pokemon (with Magic Guard) should not lose HP due to this ability attribute
+     */
+    expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp());
+  });
+});
diff --git a/test/abilities/magma_armor.test.ts b/test/abilities/magma_armor.test.ts
new file mode 100644
index 00000000000..c5af522ca6f
--- /dev/null
+++ b/test/abilities/magma_armor.test.ts
@@ -0,0 +1,51 @@
+import { Abilities } from "#enums/abilities";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import { StatusEffect } from "#enums/status-effect";
+import GameManager from "#test/testUtils/gameManager";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
+
+describe("Abilities - Magma Armor", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+    game.override
+      .moveset([Moves.SPLASH])
+      .ability(Abilities.BALL_FETCH)
+      .battleStyle("single")
+      .disableCrits()
+      .enemySpecies(Species.MAGIKARP)
+      .enemyAbility(Abilities.BALL_FETCH)
+      .enemyMoveset(Moves.SPLASH);
+  });
+
+  it("should remove freeze when gained", async () => {
+    game.override
+      .ability(Abilities.MAGMA_ARMOR)
+      .enemyAbility(Abilities.BALL_FETCH)
+      .moveset(Moves.SKILL_SWAP)
+      .enemyMoveset(Moves.SPLASH);
+    await game.classicMode.startBattle([Species.FEEBAS]);
+    const enemy = game.scene.getEnemyPokemon();
+    enemy?.trySetStatus(StatusEffect.FREEZE);
+    expect(enemy?.status?.effect).toBe(StatusEffect.FREEZE);
+
+    game.move.select(Moves.SKILL_SWAP);
+    await game.phaseInterceptor.to("BerryPhase");
+
+    expect(enemy?.status).toBeNull();
+  });
+});
diff --git a/src/test/abilities/mimicry.test.ts b/test/abilities/mimicry.test.ts
similarity index 66%
rename from src/test/abilities/mimicry.test.ts
rename to test/abilities/mimicry.test.ts
index 29aa1d649d3..598f5790aa8 100644
--- a/src/test/abilities/mimicry.test.ts
+++ b/test/abilities/mimicry.test.ts
@@ -1,8 +1,8 @@
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import { Type } from "#enums/type";
-import GameManager from "#test/utils/gameManager";
+import { PokemonType } from "#enums/pokemon-type";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
@@ -23,9 +23,9 @@ describe("Abilities - Mimicry", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     game.override
-      .moveset([ Moves.SPLASH ])
+      .moveset([Moves.SPLASH])
       .ability(Abilities.MIMICRY)
-      .battleType("single")
+      .battleStyle("single")
       .disableCrits()
       .enemySpecies(Species.MAGIKARP)
       .enemyMoveset(Moves.SPLASH);
@@ -33,31 +33,31 @@ describe("Abilities - Mimicry", () => {
 
   it("Mimicry activates after the Pokémon with Mimicry is switched in while terrain is present, or whenever there is a change in terrain", async () => {
     game.override.enemyAbility(Abilities.MISTY_SURGE);
-    await game.classicMode.startBattle([ Species.FEEBAS, Species.ABRA ]);
+    await game.classicMode.startBattle([Species.FEEBAS, Species.ABRA]);
 
-    const [ playerPokemon1, playerPokemon2 ] = game.scene.getPlayerParty();
+    const [playerPokemon1, playerPokemon2] = game.scene.getPlayerParty();
     game.move.select(Moves.SPLASH);
     await game.toNextTurn();
-    expect(playerPokemon1.getTypes().includes(Type.FAIRY)).toBe(true);
+    expect(playerPokemon1.getTypes().includes(PokemonType.FAIRY)).toBe(true);
 
     game.doSwitchPokemon(1);
     await game.toNextTurn();
 
-    expect(playerPokemon2.getTypes().includes(Type.FAIRY)).toBe(true);
+    expect(playerPokemon2.getTypes().includes(PokemonType.FAIRY)).toBe(true);
   });
 
   it("Pokemon should revert back to its original, root type once terrain ends", async () => {
     game.override
-      .moveset([ Moves.SPLASH, Moves.TRANSFORM ])
+      .moveset([Moves.SPLASH, Moves.TRANSFORM])
       .enemyAbility(Abilities.MIMICRY)
-      .enemyMoveset([ Moves.SPLASH, Moves.PSYCHIC_TERRAIN ]);
-    await game.classicMode.startBattle([ Species.REGIELEKI ]);
+      .enemyMoveset([Moves.SPLASH, Moves.PSYCHIC_TERRAIN]);
+    await game.classicMode.startBattle([Species.REGIELEKI]);
 
     const playerPokemon = game.scene.getPlayerPokemon();
     game.move.select(Moves.TRANSFORM);
     await game.forceEnemyMove(Moves.PSYCHIC_TERRAIN);
     await game.toNextTurn();
-    expect(playerPokemon?.getTypes().includes(Type.PSYCHIC)).toBe(true);
+    expect(playerPokemon?.getTypes().includes(PokemonType.PSYCHIC)).toBe(true);
 
     if (game.scene.arena.terrain) {
       game.scene.arena.terrain.turnsLeft = 1;
@@ -66,26 +66,25 @@ describe("Abilities - Mimicry", () => {
     game.move.select(Moves.SPLASH);
     await game.forceEnemyMove(Moves.SPLASH);
     await game.toNextTurn();
-    expect(playerPokemon?.getTypes().includes(Type.ELECTRIC)).toBe(true);
+    expect(playerPokemon?.getTypes().includes(PokemonType.ELECTRIC)).toBe(true);
   });
 
   it("If the Pokemon is under the effect of a type-adding move and an equivalent terrain activates, the move's effect disappears", async () => {
-    game.override
-      .enemyMoveset([ Moves.FORESTS_CURSE, Moves.GRASSY_TERRAIN ]);
-    await game.classicMode.startBattle([ Species.FEEBAS ]);
+    game.override.enemyMoveset([Moves.FORESTS_CURSE, Moves.GRASSY_TERRAIN]);
+    await game.classicMode.startBattle([Species.FEEBAS]);
 
     const playerPokemon = game.scene.getPlayerPokemon();
     game.move.select(Moves.SPLASH);
     await game.forceEnemyMove(Moves.FORESTS_CURSE);
     await game.toNextTurn();
 
-    expect(playerPokemon?.summonData.addedType).toBe(Type.GRASS);
+    expect(playerPokemon?.summonData.addedType).toBe(PokemonType.GRASS);
 
     game.move.select(Moves.SPLASH);
     await game.forceEnemyMove(Moves.GRASSY_TERRAIN);
     await game.phaseInterceptor.to("TurnEndPhase");
 
     expect(playerPokemon?.summonData.addedType).toBeNull();
-    expect(playerPokemon?.getTypes().includes(Type.GRASS)).toBe(true);
+    expect(playerPokemon?.getTypes().includes(PokemonType.GRASS)).toBe(true);
   });
 });
diff --git a/test/abilities/mirror_armor.test.ts b/test/abilities/mirror_armor.test.ts
new file mode 100644
index 00000000000..bd61f39ba75
--- /dev/null
+++ b/test/abilities/mirror_armor.test.ts
@@ -0,0 +1,315 @@
+import { Stat } from "#enums/stat";
+import { Abilities } from "#enums/abilities";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import GameManager from "#test/testUtils/gameManager";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
+import { BattlerIndex } from "#app/battle";
+
+// TODO: When Magic Bounce is implemented, make a test for its interaction with mirror guard, use screech
+
+describe("Ability - Mirror Armor", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+
+    game.override
+      .battleStyle("single")
+      .enemySpecies(Species.RATTATA)
+      .enemyMoveset([Moves.SPLASH, Moves.STICKY_WEB, Moves.TICKLE, Moves.OCTOLOCK])
+      .enemyAbility(Abilities.BALL_FETCH)
+      .startingLevel(2000)
+      .moveset([Moves.SPLASH, Moves.STICKY_WEB, Moves.TICKLE, Moves.OCTOLOCK])
+      .ability(Abilities.BALL_FETCH);
+  });
+
+  it("Player side + single battle Intimidate - opponent loses stats", async () => {
+    game.override.ability(Abilities.MIRROR_ARMOR);
+    game.override.enemyAbility(Abilities.INTIMIDATE);
+    await game.classicMode.startBattle([Species.BULBASAUR]);
+
+    const enemyPokemon = game.scene.getEnemyPokemon()!;
+    const userPokemon = game.scene.getPlayerPokemon()!;
+
+    // Enemy has intimidate, enemy should lose -1 atk
+    game.move.select(Moves.SPLASH);
+    await game.forceEnemyMove(Moves.SPLASH, BattlerIndex.PLAYER);
+    await game.toNextTurn();
+
+    expect(enemyPokemon.getStatStage(Stat.ATK)).toBe(-1);
+    expect(userPokemon.getStatStage(Stat.ATK)).toBe(0);
+  });
+
+  it("Enemy side + single battle Intimidate - player loses stats", async () => {
+    game.override.enemyAbility(Abilities.MIRROR_ARMOR);
+    game.override.ability(Abilities.INTIMIDATE);
+    await game.classicMode.startBattle([Species.BULBASAUR]);
+
+    const enemyPokemon = game.scene.getEnemyPokemon()!;
+    const userPokemon = game.scene.getPlayerPokemon()!;
+
+    // Enemy has intimidate, enemy should lose -1 atk
+    game.move.select(Moves.SPLASH);
+    await game.forceEnemyMove(Moves.SPLASH, BattlerIndex.PLAYER);
+    await game.toNextTurn();
+
+    expect(userPokemon.getStatStage(Stat.ATK)).toBe(-1);
+    expect(enemyPokemon.getStatStage(Stat.ATK)).toBe(0);
+  });
+
+  it("Player side + double battle Intimidate - opponents each lose -2 atk", async () => {
+    game.override.battleStyle("double");
+    game.override.ability(Abilities.MIRROR_ARMOR);
+    game.override.enemyAbility(Abilities.INTIMIDATE);
+    await game.classicMode.startBattle([Species.BULBASAUR, Species.CHARMANDER]);
+
+    const [enemy1, enemy2] = game.scene.getEnemyField();
+    const [player1, player2] = game.scene.getPlayerField();
+
+    // Enemy has intimidate, enemy should lose -2 atk each
+    game.move.select(Moves.SPLASH);
+    game.move.select(Moves.SPLASH, 1);
+    await game.forceEnemyMove(Moves.SPLASH, BattlerIndex.PLAYER);
+    await game.forceEnemyMove(Moves.SPLASH, BattlerIndex.PLAYER_2);
+    await game.toNextTurn();
+
+    expect(enemy1.getStatStage(Stat.ATK)).toBe(-2);
+    expect(enemy2.getStatStage(Stat.ATK)).toBe(-2);
+    expect(player1.getStatStage(Stat.ATK)).toBe(0);
+    expect(player2.getStatStage(Stat.ATK)).toBe(0);
+  });
+
+  it("Enemy side + double battle Intimidate - players each lose -2 atk", async () => {
+    game.override.battleStyle("double");
+    game.override.enemyAbility(Abilities.MIRROR_ARMOR);
+    game.override.ability(Abilities.INTIMIDATE);
+    await game.classicMode.startBattle([Species.BULBASAUR, Species.CHARMANDER]);
+
+    const [enemy1, enemy2] = game.scene.getEnemyField();
+    const [player1, player2] = game.scene.getPlayerField();
+
+    // Enemy has intimidate, enemy should lose -1 atk
+    game.move.select(Moves.SPLASH);
+    game.move.select(Moves.SPLASH, 1);
+    await game.forceEnemyMove(Moves.SPLASH, BattlerIndex.PLAYER);
+    await game.forceEnemyMove(Moves.SPLASH, BattlerIndex.PLAYER_2);
+    await game.toNextTurn();
+
+    expect(enemy1.getStatStage(Stat.ATK)).toBe(0);
+    expect(enemy2.getStatStage(Stat.ATK)).toBe(0);
+    expect(player1.getStatStage(Stat.ATK)).toBe(-2);
+    expect(player2.getStatStage(Stat.ATK)).toBe(-2);
+  });
+
+  it("Player side + single battle Intimidate + Tickle - opponent loses stats", async () => {
+    game.override.ability(Abilities.MIRROR_ARMOR);
+    game.override.enemyAbility(Abilities.INTIMIDATE);
+    await game.classicMode.startBattle([Species.BULBASAUR]);
+
+    const enemyPokemon = game.scene.getEnemyPokemon()!;
+    const userPokemon = game.scene.getPlayerPokemon()!;
+
+    // Enemy has intimidate and uses tickle, enemy receives -2 atk and -1 defense
+    game.move.select(Moves.SPLASH);
+    await game.forceEnemyMove(Moves.TICKLE, BattlerIndex.PLAYER);
+    await game.toNextTurn();
+
+    expect(enemyPokemon.getStatStage(Stat.DEF)).toBe(-1);
+    expect(enemyPokemon.getStatStage(Stat.ATK)).toBe(-2);
+    expect(userPokemon.getStatStage(Stat.ATK)).toBe(0);
+    expect(userPokemon.getStatStage(Stat.DEF)).toBe(0);
+  });
+
+  it("Player side + double battle Intimidate + Tickle - opponents each lose -3 atk, -1 def", async () => {
+    game.override.battleStyle("double");
+    game.override.ability(Abilities.MIRROR_ARMOR);
+    game.override.enemyAbility(Abilities.INTIMIDATE);
+    await game.classicMode.startBattle([Species.BULBASAUR, Species.CHARMANDER]);
+
+    const [enemy1, enemy2] = game.scene.getEnemyField();
+    const [player1, player2] = game.scene.getPlayerField();
+
+    game.move.select(Moves.SPLASH);
+    game.move.select(Moves.SPLASH, 1);
+    await game.forceEnemyMove(Moves.TICKLE, BattlerIndex.PLAYER);
+    await game.forceEnemyMove(Moves.TICKLE, BattlerIndex.PLAYER_2);
+    await game.toNextTurn();
+
+    expect(player1.getStatStage(Stat.ATK)).toBe(0);
+    expect(player1.getStatStage(Stat.DEF)).toBe(0);
+    expect(player2.getStatStage(Stat.ATK)).toBe(0);
+    expect(player2.getStatStage(Stat.DEF)).toBe(0);
+    expect(enemy1.getStatStage(Stat.ATK)).toBe(-3);
+    expect(enemy1.getStatStage(Stat.DEF)).toBe(-1);
+    expect(enemy2.getStatStage(Stat.ATK)).toBe(-3);
+    expect(enemy2.getStatStage(Stat.DEF)).toBe(-1);
+  });
+
+  it("Enemy side + single battle Intimidate + Tickle - player loses stats", async () => {
+    game.override.enemyAbility(Abilities.MIRROR_ARMOR);
+    game.override.ability(Abilities.INTIMIDATE);
+    await game.classicMode.startBattle([Species.BULBASAUR]);
+
+    const enemyPokemon = game.scene.getEnemyPokemon()!;
+    const userPokemon = game.scene.getPlayerPokemon()!;
+
+    // Enemy has intimidate and uses tickle, enemy receives -2 atk and -1 defense
+    game.move.select(Moves.TICKLE);
+    await game.forceEnemyMove(Moves.SPLASH, BattlerIndex.PLAYER);
+    await game.toNextTurn();
+
+    expect(userPokemon.getStatStage(Stat.DEF)).toBe(-1);
+    expect(userPokemon.getStatStage(Stat.ATK)).toBe(-2);
+    expect(enemyPokemon.getStatStage(Stat.ATK)).toBe(0);
+    expect(enemyPokemon.getStatStage(Stat.DEF)).toBe(0);
+  });
+
+  it("Player side + single battle Intimidate + oppoenent has white smoke - no one loses stats", async () => {
+    game.override.enemyAbility(Abilities.WHITE_SMOKE);
+    game.override.ability(Abilities.MIRROR_ARMOR);
+    await game.classicMode.startBattle([Species.BULBASAUR]);
+
+    const enemyPokemon = game.scene.getEnemyPokemon()!;
+    const userPokemon = game.scene.getPlayerPokemon()!;
+
+    // Enemy has intimidate and uses tickle, enemy has white smoke, no one loses stats
+    game.move.select(Moves.SPLASH);
+    await game.forceEnemyMove(Moves.TICKLE, BattlerIndex.PLAYER);
+    await game.toNextTurn();
+
+    expect(enemyPokemon.getStatStage(Stat.DEF)).toBe(0);
+    expect(enemyPokemon.getStatStage(Stat.ATK)).toBe(0);
+    expect(userPokemon.getStatStage(Stat.ATK)).toBe(0);
+    expect(userPokemon.getStatStage(Stat.DEF)).toBe(0);
+  });
+
+  it("Enemy side + single battle Intimidate + player has white smoke - no one loses stats", async () => {
+    game.override.ability(Abilities.WHITE_SMOKE);
+    game.override.enemyAbility(Abilities.MIRROR_ARMOR);
+    await game.classicMode.startBattle([Species.BULBASAUR]);
+
+    const enemyPokemon = game.scene.getEnemyPokemon()!;
+    const userPokemon = game.scene.getPlayerPokemon()!;
+
+    // Enemy has intimidate and uses tickle, enemy has white smoke, no one loses stats
+    game.move.select(Moves.TICKLE);
+    await game.forceEnemyMove(Moves.SPLASH, BattlerIndex.PLAYER);
+    await game.toNextTurn();
+
+    expect(enemyPokemon.getStatStage(Stat.DEF)).toBe(0);
+    expect(enemyPokemon.getStatStage(Stat.ATK)).toBe(0);
+    expect(userPokemon.getStatStage(Stat.ATK)).toBe(0);
+    expect(userPokemon.getStatStage(Stat.DEF)).toBe(0);
+  });
+
+  it("Player side + single battle + opponent uses octolock - does not interact with mirror armor, player loses stats", async () => {
+    game.override.ability(Abilities.MIRROR_ARMOR);
+    await game.classicMode.startBattle([Species.BULBASAUR]);
+
+    const enemyPokemon = game.scene.getEnemyPokemon()!;
+    const userPokemon = game.scene.getPlayerPokemon()!;
+
+    // Enemy uses octolock, player loses stats at end of turn
+    game.move.select(Moves.SPLASH);
+    await game.forceEnemyMove(Moves.OCTOLOCK, BattlerIndex.PLAYER);
+    await game.toNextTurn();
+
+    expect(enemyPokemon.getStatStage(Stat.DEF)).toBe(0);
+    expect(enemyPokemon.getStatStage(Stat.SPDEF)).toBe(0);
+    expect(userPokemon.getStatStage(Stat.DEF)).toBe(-1);
+    expect(userPokemon.getStatStage(Stat.SPDEF)).toBe(-1);
+  });
+
+  it("Enemy side + single battle + player uses octolock - does not interact with mirror armor, opponent loses stats", async () => {
+    game.override.enemyAbility(Abilities.MIRROR_ARMOR);
+    await game.classicMode.startBattle([Species.BULBASAUR]);
+
+    const enemyPokemon = game.scene.getEnemyPokemon()!;
+    const userPokemon = game.scene.getPlayerPokemon()!;
+
+    // Player uses octolock, enemy loses stats at end of turn
+    game.move.select(Moves.OCTOLOCK);
+    await game.forceEnemyMove(Moves.SPLASH, BattlerIndex.PLAYER);
+    await game.toNextTurn();
+
+    expect(userPokemon.getStatStage(Stat.DEF)).toBe(0);
+    expect(userPokemon.getStatStage(Stat.SPDEF)).toBe(0);
+    expect(enemyPokemon.getStatStage(Stat.DEF)).toBe(-1);
+    expect(enemyPokemon.getStatStage(Stat.SPDEF)).toBe(-1);
+  });
+
+  it("Both sides have mirror armor - does not loop, player loses attack", async () => {
+    game.override.enemyAbility(Abilities.MIRROR_ARMOR);
+    game.override.ability(Abilities.MIRROR_ARMOR);
+    game.override.ability(Abilities.INTIMIDATE);
+    await game.classicMode.startBattle([Species.BULBASAUR]);
+
+    const enemyPokemon = game.scene.getEnemyPokemon()!;
+    const userPokemon = game.scene.getPlayerPokemon()!;
+
+    game.move.select(Moves.SPLASH);
+    await game.forceEnemyMove(Moves.SPLASH, BattlerIndex.PLAYER);
+    await game.toNextTurn();
+
+    expect(userPokemon.getStatStage(Stat.ATK)).toBe(-1);
+    expect(enemyPokemon.getStatStage(Stat.ATK)).toBe(0);
+  });
+
+  it("Single battle + sticky web applied player side - player switches out and enemy should lose -1 speed", async () => {
+    game.override.ability(Abilities.MIRROR_ARMOR);
+    await game.classicMode.startBattle([Species.BULBASAUR, Species.CHARMANDER, Species.SQUIRTLE]);
+
+    const enemyPokemon = game.scene.getEnemyPokemon()!;
+    const userPokemon = game.scene.getPlayerPokemon()!;
+
+    game.move.select(Moves.SPLASH);
+    await game.forceEnemyMove(Moves.STICKY_WEB, BattlerIndex.PLAYER);
+    await game.toNextTurn();
+
+    game.doSwitchPokemon(1);
+    await game.forceEnemyMove(Moves.SPLASH, BattlerIndex.PLAYER);
+    await game.toNextTurn();
+
+    expect(userPokemon.getStatStage(Stat.SPD)).toBe(0);
+    expect(enemyPokemon.getStatStage(Stat.SPD)).toBe(-1);
+  });
+
+  it("Double battle + sticky web applied player side - player switches out and enemy 1 should lose -1 speed", async () => {
+    game.override.battleStyle("double");
+    game.override.ability(Abilities.MIRROR_ARMOR);
+    await game.classicMode.startBattle([Species.BULBASAUR, Species.CHARMANDER, Species.SQUIRTLE]);
+
+    const [enemy1, enemy2] = game.scene.getEnemyField();
+    const [player1, player2] = game.scene.getPlayerField();
+
+    game.move.select(Moves.SPLASH);
+    game.move.select(Moves.SPLASH, 1);
+    await game.forceEnemyMove(Moves.STICKY_WEB, BattlerIndex.PLAYER);
+    await game.forceEnemyMove(Moves.SPLASH, BattlerIndex.PLAYER_2);
+    await game.toNextTurn();
+
+    game.doSwitchPokemon(2);
+    game.move.select(Moves.SPLASH, 1);
+    await game.forceEnemyMove(Moves.SPLASH, BattlerIndex.PLAYER);
+    await game.forceEnemyMove(Moves.SPLASH, BattlerIndex.PLAYER_2);
+    await game.toNextTurn();
+
+    expect(enemy1.getStatStage(Stat.SPD)).toBe(-1);
+    expect(enemy2.getStatStage(Stat.SPD)).toBe(0);
+    expect(player1.getStatStage(Stat.SPD)).toBe(0);
+    expect(player2.getStatStage(Stat.SPD)).toBe(0);
+  });
+});
diff --git a/test/abilities/mold_breaker.test.ts b/test/abilities/mold_breaker.test.ts
new file mode 100644
index 00000000000..ba33909364f
--- /dev/null
+++ b/test/abilities/mold_breaker.test.ts
@@ -0,0 +1,52 @@
+import { BattlerIndex } from "#app/battle";
+import { globalScene } from "#app/global-scene";
+import { Abilities } from "#enums/abilities";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import GameManager from "#test/testUtils/gameManager";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
+
+describe("Abilities - Mold Breaker", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+    game.override
+      .moveset([Moves.SPLASH])
+      .ability(Abilities.MOLD_BREAKER)
+      .battleStyle("single")
+      .disableCrits()
+      .enemySpecies(Species.MAGIKARP)
+      .enemyAbility(Abilities.BALL_FETCH)
+      .enemyMoveset(Moves.SPLASH);
+  });
+
+  it("should turn off the ignore abilities arena variable after the user's move", async () => {
+    game.override
+      .enemyMoveset(Moves.SPLASH)
+      .ability(Abilities.MOLD_BREAKER)
+      .moveset([Moves.ERUPTION])
+      .startingLevel(100)
+      .enemyLevel(2);
+    await game.classicMode.startBattle([Species.MAGIKARP]);
+    const enemy = game.scene.getEnemyPokemon()!;
+
+    expect(enemy.isFainted()).toBe(false);
+    game.move.select(Moves.SPLASH);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
+    await game.phaseInterceptor.to("MoveEndPhase", true);
+    expect(globalScene.arena.ignoreAbilities).toBe(false);
+  });
+});
diff --git a/test/abilities/moody.test.ts b/test/abilities/moody.test.ts
new file mode 100644
index 00000000000..9b658820391
--- /dev/null
+++ b/test/abilities/moody.test.ts
@@ -0,0 +1,87 @@
+import { BATTLE_STATS, EFFECTIVE_STATS } from "#enums/stat";
+import { Abilities } from "#enums/abilities";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import GameManager from "#test/testUtils/gameManager";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
+
+describe("Abilities - Moody", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+
+    game.override
+      .battleStyle("single")
+      .enemySpecies(Species.RATTATA)
+      .enemyAbility(Abilities.BALL_FETCH)
+      .ability(Abilities.MOODY)
+      .enemyMoveset(Moves.SPLASH)
+      .moveset(Moves.SPLASH);
+  });
+
+  it("should increase one stat stage by 2 and decrease a different stat stage by 1", async () => {
+    await game.classicMode.startBattle();
+
+    const playerPokemon = game.scene.getPlayerPokemon()!;
+    game.move.select(Moves.SPLASH);
+    await game.toNextTurn();
+
+    // Find the increased and decreased stats, make sure they are different.
+    const changedStats = EFFECTIVE_STATS.filter(
+      s => playerPokemon.getStatStage(s) === 2 || playerPokemon.getStatStage(s) === -1,
+    );
+
+    expect(changedStats).toBeTruthy();
+    expect(changedStats.length).toBe(2);
+    expect(changedStats[0] !== changedStats[1]).toBeTruthy();
+  });
+
+  it("should only increase one stat stage by 2 if all stat stages are at -6", async () => {
+    await game.classicMode.startBattle();
+
+    const playerPokemon = game.scene.getPlayerPokemon()!;
+
+    // Set all stat stages to -6
+    vi.spyOn(playerPokemon.summonData, "statStages", "get").mockReturnValue(new Array(BATTLE_STATS.length).fill(-6));
+
+    game.move.select(Moves.SPLASH);
+    await game.toNextTurn();
+
+    // Should increase one stat stage by 2 (from -6, meaning it will be -4)
+    const increasedStat = EFFECTIVE_STATS.filter(s => playerPokemon.getStatStage(s) === -4);
+
+    expect(increasedStat).toBeTruthy();
+    expect(increasedStat.length).toBe(1);
+  });
+
+  it("should only decrease one stat stage by 1 stage if all stat stages are at 6", async () => {
+    await game.classicMode.startBattle();
+
+    const playerPokemon = game.scene.getPlayerPokemon()!;
+
+    // Set all stat stages to 6
+    vi.spyOn(playerPokemon.summonData, "statStages", "get").mockReturnValue(new Array(BATTLE_STATS.length).fill(6));
+
+    game.move.select(Moves.SPLASH);
+    await game.toNextTurn();
+
+    // Should decrease one stat stage by 1 (from 6, meaning it will be 5)
+    const decreasedStat = EFFECTIVE_STATS.filter(s => playerPokemon.getStatStage(s) === 5);
+
+    expect(decreasedStat).toBeTruthy();
+    expect(decreasedStat.length).toBe(1);
+  });
+});
diff --git a/src/test/abilities/moxie.test.ts b/test/abilities/moxie.test.ts
similarity index 65%
rename from src/test/abilities/moxie.test.ts
rename to test/abilities/moxie.test.ts
index 5f337fedabb..bccdeda2b93 100644
--- a/src/test/abilities/moxie.test.ts
+++ b/test/abilities/moxie.test.ts
@@ -1,5 +1,5 @@
 import { Stat } from "#enums/stat";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
@@ -27,21 +27,18 @@ describe("Abilities - Moxie", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     const moveToUse = Moves.AERIAL_ACE;
-    game.override.battleType("single");
+    game.override.battleStyle("single");
     game.override.enemySpecies(Species.RATTATA);
     game.override.enemyAbility(Abilities.MOXIE);
     game.override.ability(Abilities.MOXIE);
     game.override.startingLevel(2000);
-    game.override.moveset([ moveToUse ]);
+    game.override.moveset([moveToUse]);
     game.override.enemyMoveset(Moves.SPLASH);
   });
 
-  it("should raise ATK stat stage by 1 when winning a battle", async() => {
+  it("should raise ATK stat stage by 1 when winning a battle", async () => {
     const moveToUse = Moves.AERIAL_ACE;
-    await game.startBattle([
-      Species.MIGHTYENA,
-      Species.MIGHTYENA,
-    ]);
+    await game.startBattle([Species.MIGHTYENA, Species.MIGHTYENA]);
 
     const playerPokemon = game.scene.getPlayerPokemon()!;
 
@@ -54,25 +51,26 @@ describe("Abilities - Moxie", () => {
   }, 20000);
 
   // TODO: Activate this test when MOXIE is corrected to work on faint and not on battle victory
-  it.todo("should raise ATK stat stage by 1 when defeating an ally Pokemon", async() => {
-    game.override.battleType("double");
-    const moveToUse = Moves.AERIAL_ACE;
-    await game.startBattle([
-      Species.MIGHTYENA,
-      Species.MIGHTYENA,
-    ]);
+  it.todo(
+    "should raise ATK stat stage by 1 when defeating an ally Pokemon",
+    async () => {
+      game.override.battleStyle("double");
+      const moveToUse = Moves.AERIAL_ACE;
+      await game.startBattle([Species.MIGHTYENA, Species.MIGHTYENA]);
 
-    const [ firstPokemon, secondPokemon ] = game.scene.getPlayerField();
+      const [firstPokemon, secondPokemon] = game.scene.getPlayerField();
 
-    expect(firstPokemon.getStatStage(Stat.ATK)).toBe(0);
+      expect(firstPokemon.getStatStage(Stat.ATK)).toBe(0);
 
-    secondPokemon.hp = 1;
+      secondPokemon.hp = 1;
 
-    game.move.select(moveToUse);
-    game.selectTarget(BattlerIndex.PLAYER_2);
+      game.move.select(moveToUse);
+      game.selectTarget(BattlerIndex.PLAYER_2);
 
-    await game.phaseInterceptor.to(TurnEndPhase);
+      await game.phaseInterceptor.to(TurnEndPhase);
 
-    expect(firstPokemon.getStatStage(Stat.ATK)).toBe(1);
-  }, 20000);
+      expect(firstPokemon.getStatStage(Stat.ATK)).toBe(1);
+    },
+    20000,
+  );
 });
diff --git a/test/abilities/mummy.test.ts b/test/abilities/mummy.test.ts
new file mode 100644
index 00000000000..c53b0b33598
--- /dev/null
+++ b/test/abilities/mummy.test.ts
@@ -0,0 +1,52 @@
+import { Abilities } from "#enums/abilities";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import GameManager from "#test/testUtils/gameManager";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
+
+describe("Abilities - Mummy", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+    game.override
+      .moveset([Moves.SPLASH])
+      .ability(Abilities.MUMMY)
+      .battleStyle("single")
+      .disableCrits()
+      .enemySpecies(Species.MAGIKARP)
+      .enemyAbility(Abilities.BALL_FETCH)
+      .enemyMoveset(Moves.TACKLE);
+  });
+
+  it("should set the enemy's ability to mummy when hit by a contact move", async () => {
+    await game.classicMode.startBattle([Species.FEEBAS]);
+
+    game.move.select(Moves.SPLASH);
+    await game.phaseInterceptor.to("BerryPhase");
+
+    expect(game.scene.getEnemyPokemon()?.getAbility().id).toBe(Abilities.MUMMY);
+  });
+
+  it("should not change the enemy's ability hit by a non-contact move", async () => {
+    game.override.enemyMoveset(Moves.EARTHQUAKE);
+    await game.classicMode.startBattle([Species.FEEBAS]);
+
+    game.move.select(Moves.SPLASH);
+    await game.phaseInterceptor.to("BerryPhase");
+
+    expect(game.scene.getEnemyPokemon()?.getAbility().id).toBe(Abilities.BALL_FETCH);
+  });
+});
diff --git a/src/test/abilities/mycelium_might.test.ts b/test/abilities/mycelium_might.test.ts
similarity index 81%
rename from src/test/abilities/mycelium_might.test.ts
rename to test/abilities/mycelium_might.test.ts
index 0c8e7b5a703..4a5700045fa 100644
--- a/src/test/abilities/mycelium_might.test.ts
+++ b/test/abilities/mycelium_might.test.ts
@@ -1,6 +1,6 @@
 import { TurnEndPhase } from "#app/phases/turn-end-phase";
 import { TurnStartPhase } from "#app/phases/turn-start-phase";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import { Abilities } from "#enums/abilities";
 import { Stat } from "#enums/stat";
 import { Moves } from "#enums/moves";
@@ -24,13 +24,13 @@ describe("Abilities - Mycelium Might", () => {
 
   beforeEach(() => {
     game = new GameManager(phaserGame);
-    game.override.battleType("single");
+    game.override.battleStyle("single");
     game.override.disableCrits();
     game.override.enemySpecies(Species.SHUCKLE);
     game.override.enemyAbility(Abilities.CLEAR_BODY);
-    game.override.enemyMoveset([ Moves.QUICK_ATTACK, Moves.QUICK_ATTACK, Moves.QUICK_ATTACK, Moves.QUICK_ATTACK ]);
+    game.override.enemyMoveset([Moves.QUICK_ATTACK, Moves.QUICK_ATTACK, Moves.QUICK_ATTACK, Moves.QUICK_ATTACK]);
     game.override.ability(Abilities.MYCELIUM_MIGHT);
-    game.override.moveset([ Moves.QUICK_ATTACK, Moves.BABY_DOLL_EYES ]);
+    game.override.moveset([Moves.QUICK_ATTACK, Moves.BABY_DOLL_EYES]);
   });
 
   /**
@@ -41,7 +41,7 @@ describe("Abilities - Mycelium Might", () => {
    **/
 
   it("will move last in its priority bracket and ignore protective abilities", async () => {
-    await game.startBattle([ Species.REGIELEKI ]);
+    await game.startBattle([Species.REGIELEKI]);
 
     const enemyPokemon = game.scene.getEnemyPokemon();
     const playerIndex = game.scene.getPlayerPokemon()?.getBattlerIndex();
@@ -55,8 +55,8 @@ describe("Abilities - Mycelium Might", () => {
     const commandOrder = phase.getCommandOrder();
     // The opponent Pokemon (without Mycelium Might) goes first despite having lower speed than the player Pokemon.
     // The player Pokemon (with Mycelium Might) goes last despite having higher speed than the opponent.
-    expect(speedOrder).toEqual([ playerIndex, enemyIndex ]);
-    expect(commandOrder).toEqual([ enemyIndex, playerIndex ]);
+    expect(speedOrder).toEqual([playerIndex, enemyIndex]);
+    expect(commandOrder).toEqual([enemyIndex, playerIndex]);
     await game.phaseInterceptor.to(TurnEndPhase);
 
     // Despite the opponent's ability (Clear Body), its ATK stat stage is still reduced.
@@ -64,8 +64,8 @@ describe("Abilities - Mycelium Might", () => {
   }, 20000);
 
   it("will still go first if a status move that is in a higher priority bracket than the opponent's move is used", async () => {
-    game.override.enemyMoveset([ Moves.TACKLE, Moves.TACKLE, Moves.TACKLE, Moves.TACKLE ]);
-    await game.startBattle([ Species.REGIELEKI ]);
+    game.override.enemyMoveset([Moves.TACKLE, Moves.TACKLE, Moves.TACKLE, Moves.TACKLE]);
+    await game.startBattle([Species.REGIELEKI]);
 
     const enemyPokemon = game.scene.getEnemyPokemon();
     const playerIndex = game.scene.getPlayerPokemon()?.getBattlerIndex();
@@ -79,15 +79,15 @@ describe("Abilities - Mycelium Might", () => {
     const commandOrder = phase.getCommandOrder();
     // The player Pokemon (with M.M.) goes first because its move is still within a higher priority bracket than its opponent.
     // The enemy Pokemon goes second because its move is in a lower priority bracket.
-    expect(speedOrder).toEqual([ playerIndex, enemyIndex ]);
-    expect(commandOrder).toEqual([ playerIndex, enemyIndex ]);
+    expect(speedOrder).toEqual([playerIndex, enemyIndex]);
+    expect(commandOrder).toEqual([playerIndex, enemyIndex]);
     await game.phaseInterceptor.to(TurnEndPhase);
     // Despite the opponent's ability (Clear Body), its ATK stat stage is still reduced.
     expect(enemyPokemon?.getStatStage(Stat.ATK)).toBe(-1);
   }, 20000);
 
   it("will not affect non-status moves", async () => {
-    await game.startBattle([ Species.REGIELEKI ]);
+    await game.startBattle([Species.REGIELEKI]);
 
     const playerIndex = game.scene.getPlayerPokemon()!.getBattlerIndex();
     const enemyIndex = game.scene.getEnemyPokemon()!.getBattlerIndex();
@@ -101,7 +101,7 @@ describe("Abilities - Mycelium Might", () => {
     // The player Pokemon (with M.M.) goes first because it has a higher speed and did not use a status move.
     // The enemy Pokemon (without M.M.) goes second because its speed is lower.
     // This means that the commandOrder should be identical to the speedOrder
-    expect(speedOrder).toEqual([ playerIndex, enemyIndex ]);
-    expect(commandOrder).toEqual([ playerIndex, enemyIndex ]);
+    expect(speedOrder).toEqual([playerIndex, enemyIndex]);
+    expect(commandOrder).toEqual([playerIndex, enemyIndex]);
   }, 20000);
 });
diff --git a/test/abilities/neutralizing_gas.test.ts b/test/abilities/neutralizing_gas.test.ts
new file mode 100644
index 00000000000..979583b7d97
--- /dev/null
+++ b/test/abilities/neutralizing_gas.test.ts
@@ -0,0 +1,193 @@
+import { BattlerIndex } from "#app/battle";
+import type { CommandPhase } from "#app/phases/command-phase";
+import { Command } from "#app/ui/command-ui-handler";
+import { PostSummonWeatherChangeAbAttr } from "#app/data/abilities/ability";
+import { Abilities } from "#enums/abilities";
+import { ArenaTagType } from "#enums/arena-tag-type";
+import { Moves } from "#enums/moves";
+import { PokeballType } from "#enums/pokeball";
+import { Species } from "#enums/species";
+import { Stat } from "#enums/stat";
+import GameManager from "#test/testUtils/gameManager";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
+
+describe("Abilities - Neutralizing Gas", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+    game.override
+      .moveset([Moves.SPLASH])
+      .ability(Abilities.NEUTRALIZING_GAS)
+      .battleStyle("single")
+      .disableCrits()
+      .enemySpecies(Species.MAGIKARP)
+      .enemyAbility(Abilities.BALL_FETCH)
+      .enemyMoveset(Moves.SPLASH);
+  });
+
+  it("should prevent other abilities from activating", async () => {
+    game.override.enemyAbility(Abilities.INTIMIDATE);
+    await game.classicMode.startBattle([Species.FEEBAS]);
+
+    game.move.select(Moves.SPLASH);
+    await game.phaseInterceptor.to("TurnEndPhase");
+
+    // Intimidate is suppressed, so the attack stat should not be lowered
+    expect(game.scene.getPlayerPokemon()?.getStatStage(Stat.ATK)).toBe(0);
+  });
+
+  it("should allow the user's passive to activate", async () => {
+    game.override.passiveAbility(Abilities.INTREPID_SWORD);
+    await game.classicMode.startBattle([Species.FEEBAS]);
+
+    game.move.select(Moves.SPLASH);
+    await game.phaseInterceptor.to("TurnEndPhase");
+
+    expect(game.scene.getPlayerPokemon()?.getStatStage(Stat.ATK)).toBe(1);
+  });
+
+  it.todo("should activate before other abilities", async () => {
+    game.override.enemySpecies(Species.ACCELGOR).enemyLevel(100).enemyAbility(Abilities.INTIMIDATE);
+
+    await game.classicMode.startBattle([Species.FEEBAS]);
+
+    game.move.select(Moves.SPLASH);
+    await game.phaseInterceptor.to("TurnEndPhase");
+
+    // Intimidate is suppressed even when the user's speed is lower
+    expect(game.scene.getPlayerPokemon()?.getStatStage(Stat.ATK)).toBe(0);
+  });
+
+  it("should activate other abilities when removed", async () => {
+    game.override
+      .enemyAbility(Abilities.INTREPID_SWORD)
+      .enemyPassiveAbility(Abilities.DAUNTLESS_SHIELD)
+      .enemyMoveset(Moves.ENTRAINMENT);
+
+    await game.classicMode.startBattle([Species.FEEBAS]);
+
+    const enemyPokemon = game.scene.getEnemyPokemon();
+    expect(enemyPokemon?.getStatStage(Stat.ATK)).toBe(0);
+    expect(enemyPokemon?.getStatStage(Stat.DEF)).toBe(0);
+
+    game.move.select(Moves.SPLASH);
+    await game.phaseInterceptor.to("BerryPhase");
+    // Enemy removes user's ability, so both abilities are activated
+    expect(enemyPokemon?.getStatStage(Stat.ATK)).toBe(1);
+    expect(enemyPokemon?.getStatStage(Stat.DEF)).toBe(1);
+  });
+
+  it("should not activate the user's other ability when removed", async () => {
+    game.override.passiveAbility(Abilities.INTIMIDATE).enemyMoveset(Moves.ENTRAINMENT);
+
+    await game.classicMode.startBattle([Species.FEEBAS]);
+    // Neutralising gas user's passive is still active
+    const enemyPokemon = game.scene.getEnemyPokemon();
+    expect(enemyPokemon?.getStatStage(Stat.ATK)).toBe(-1);
+
+    game.move.select(Moves.SPLASH);
+    await game.phaseInterceptor.to("BerryPhase");
+    // Intimidate did not reactivate after neutralizing gas was removed
+    expect(enemyPokemon?.getStatStage(Stat.ATK)).toBe(-1);
+  });
+
+  it("should only deactivate when all setters are off the field", async () => {
+    game.override.enemyMoveset([Moves.ENTRAINMENT, Moves.SPLASH]).battleStyle("double");
+
+    await game.classicMode.startBattle([Species.ACCELGOR, Species.ACCELGOR]);
+    game.move.select(Moves.SPLASH, 0);
+    game.move.select(Moves.SPLASH, 1);
+    await game.forceEnemyMove(Moves.ENTRAINMENT, BattlerIndex.PLAYER);
+    await game.forceEnemyMove(Moves.SPLASH);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2]);
+    await game.phaseInterceptor.to("BerryPhase");
+    expect(game.scene.arena.getTag(ArenaTagType.NEUTRALIZING_GAS)).toBeDefined(); // Now one neut gas user is left
+
+    game.move.select(Moves.SPLASH, 0);
+    game.move.select(Moves.SPLASH, 1);
+    await game.forceEnemyMove(Moves.ENTRAINMENT, BattlerIndex.PLAYER_2);
+    await game.forceEnemyMove(Moves.SPLASH);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2]);
+    await game.phaseInterceptor.to("BerryPhase");
+    expect(game.scene.arena.getTag(ArenaTagType.NEUTRALIZING_GAS)).toBeUndefined(); // No neut gas users are left
+  });
+
+  it("should deactivate when suppressed by gastro acid", async () => {
+    game.override.enemyMoveset(Moves.GASTRO_ACID);
+
+    await game.classicMode.startBattle([Species.FEEBAS]);
+
+    game.move.select(Moves.SPLASH);
+    await game.phaseInterceptor.to("BerryPhase");
+
+    expect(game.scene.arena.getTag(ArenaTagType.NEUTRALIZING_GAS)).toBeUndefined();
+  });
+
+  it("should deactivate when the pokemon faints", async () => {
+    game.override.ability(Abilities.BALL_FETCH).enemyAbility(Abilities.NEUTRALIZING_GAS);
+
+    await game.classicMode.startBattle([Species.FEEBAS]);
+    game.move.select(Moves.SPLASH);
+    expect(game.scene.arena.getTag(ArenaTagType.NEUTRALIZING_GAS)).toBeDefined();
+    await game.doKillOpponents();
+
+    expect(game.scene.arena.getTag(ArenaTagType.NEUTRALIZING_GAS)).toBeUndefined();
+  });
+
+  it("should deactivate upon catching a wild pokemon", async () => {
+    game.override.battleStyle("single").enemyAbility(Abilities.NEUTRALIZING_GAS).ability(Abilities.BALL_FETCH);
+    await game.classicMode.startBattle([Species.MAGIKARP]);
+    expect(game.scene.arena.getTag(ArenaTagType.NEUTRALIZING_GAS)).toBeDefined();
+
+    game.scene.pokeballCounts[PokeballType.MASTER_BALL] = 1;
+    game.doThrowPokeball(PokeballType.MASTER_BALL);
+    await game.phaseInterceptor.to("TurnEndPhase");
+
+    expect(game.scene.arena.getTag(ArenaTagType.NEUTRALIZING_GAS)).toBeUndefined();
+  });
+
+  it("should deactivate after fleeing from a wild pokemon", async () => {
+    game.override.enemyAbility(Abilities.NEUTRALIZING_GAS).ability(Abilities.BALL_FETCH);
+    await game.classicMode.startBattle([Species.MAGIKARP]);
+    expect(game.scene.arena.getTag(ArenaTagType.NEUTRALIZING_GAS)).toBeDefined();
+
+    vi.spyOn(game.scene.getPlayerPokemon()!, "randBattleSeedInt").mockReturnValue(0);
+
+    const commandPhase = game.scene.getCurrentPhase() as CommandPhase;
+    commandPhase.handleCommand(Command.RUN, 0);
+    await game.phaseInterceptor.to("BerryPhase");
+
+    expect(game.scene.arena.getTag(ArenaTagType.NEUTRALIZING_GAS)).toBeUndefined();
+  });
+
+  it("should not activate abilities of pokemon no longer on the field", async () => {
+    game.override.battleStyle("single").ability(Abilities.NEUTRALIZING_GAS).enemyAbility(Abilities.DELTA_STREAM);
+    await game.classicMode.startBattle([Species.MAGIKARP]);
+
+    const enemy = game.scene.getEnemyPokemon()!;
+    const weatherChangeAttr = enemy.getAbilityAttrs(PostSummonWeatherChangeAbAttr, false)[0];
+    vi.spyOn(weatherChangeAttr, "applyPostSummon");
+
+    expect(game.scene.arena.getTag(ArenaTagType.NEUTRALIZING_GAS)).toBeDefined();
+
+    game.move.select(Moves.SPLASH);
+    await game.killPokemon(enemy);
+    await game.killPokemon(game.scene.getPlayerPokemon()!);
+
+    expect(game.scene.arena.getTag(ArenaTagType.NEUTRALIZING_GAS)).toBeUndefined();
+    expect(weatherChangeAttr.applyPostSummon).not.toHaveBeenCalled();
+  });
+});
diff --git a/src/test/abilities/no_guard.test.ts b/test/abilities/no_guard.test.ts
similarity index 75%
rename from src/test/abilities/no_guard.test.ts
rename to test/abilities/no_guard.test.ts
index b0b454dd560..a09e16388ee 100644
--- a/src/test/abilities/no_guard.test.ts
+++ b/test/abilities/no_guard.test.ts
@@ -4,7 +4,8 @@ import { MoveEndPhase } from "#app/phases/move-end-phase";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import { HitCheckResult } from "#enums/hit-check-result";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, it, expect, vi } from "vitest";
 
@@ -28,20 +29,19 @@ describe("Abilities - No Guard", () => {
       .moveset(Moves.ZAP_CANNON)
       .ability(Abilities.NO_GUARD)
       .enemyLevel(200)
+      .enemySpecies(Species.SNORLAX)
       .enemyAbility(Abilities.BALL_FETCH)
       .enemyMoveset(Moves.SPLASH);
   });
 
   it("should make moves always hit regardless of move accuracy", async () => {
-    game.override.battleType("single");
+    game.override.battleStyle("single");
 
-    await game.classicMode.startBattle([
-      Species.REGIELEKI
-    ]);
+    await game.classicMode.startBattle([Species.REGIELEKI]);
 
     game.move.select(Moves.ZAP_CANNON);
 
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
 
     await game.phaseInterceptor.to(MoveEffectPhase, false);
 
@@ -50,15 +50,11 @@ describe("Abilities - No Guard", () => {
 
     await game.phaseInterceptor.to(MoveEndPhase);
 
-    expect(moveEffectPhase.hitCheck).toHaveReturnedWith(true);
+    expect(moveEffectPhase.hitCheck).toHaveReturnedWith([HitCheckResult.HIT, 1]);
   });
 
   it("should guarantee double battle with any one LURE", async () => {
-    game.override
-      .startingModifier([
-        { name: "LURE" },
-      ])
-      .startingWave(2);
+    game.override.startingModifier([{ name: "LURE" }]).startingWave(2);
 
     await game.classicMode.startBattle();
 
diff --git a/test/abilities/normal-move-type-change.test.ts b/test/abilities/normal-move-type-change.test.ts
new file mode 100644
index 00000000000..50c8e04af1f
--- /dev/null
+++ b/test/abilities/normal-move-type-change.test.ts
@@ -0,0 +1,190 @@
+import { BattlerIndex } from "#app/battle";
+import { allMoves } from "#app/data/moves/move";
+import { PokemonType } from "#enums/pokemon-type";
+import { Abilities } from "#app/enums/abilities";
+import { Moves } from "#app/enums/moves";
+import { Species } from "#app/enums/species";
+import GameManager from "#test/testUtils/gameManager";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
+import { TYPE_BOOST_ITEM_BOOST_PERCENT } from "#app/constants";
+import { allAbilities } from "#app/data/data-lists";
+import { MoveTypeChangeAbAttr } from "#app/data/abilities/ability";
+import { toDmgValue } from "#app/utils/common";
+
+/**
+ * Tests for abilities that change the type of normal moves to
+ * a different type and boost their power
+ *
+ * Includes
+ * - Aerialate
+ * - Galvanize
+ * - Pixilate
+ * - Refrigerate
+ */
+
+describe.each([
+  { ab: Abilities.GALVANIZE, ab_name: "Galvanize", ty: PokemonType.ELECTRIC, tyName: "electric" },
+  { ab: Abilities.PIXILATE, ab_name: "Pixilate", ty: PokemonType.FAIRY, tyName: "fairy" },
+  { ab: Abilities.REFRIGERATE, ab_name: "Refrigerate", ty: PokemonType.ICE, tyName: "ice" },
+  { ab: Abilities.AERILATE, ab_name: "Aerilate", ty: PokemonType.FLYING, tyName: "flying" },
+])("Abilities - $ab_name", ({ ab, ty, tyName }) => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+
+    game.override
+      .battleStyle("single")
+      .startingLevel(100)
+      .starterSpecies(Species.MAGIKARP)
+      .ability(ab)
+      .moveset([Moves.TACKLE, Moves.REVELATION_DANCE, Moves.FURY_SWIPES])
+      .enemySpecies(Species.DUSCLOPS)
+      .enemyAbility(Abilities.BALL_FETCH)
+      .enemyMoveset(Moves.SPLASH)
+      .enemyLevel(100);
+  });
+
+  it(`should change Normal-type attacks to ${tyName} type and boost their power`, async () => {
+    await game.classicMode.startBattle();
+
+    const playerPokemon = game.scene.getPlayerPokemon()!;
+    const typeSpy = vi.spyOn(playerPokemon, "getMoveType");
+
+    const enemyPokemon = game.scene.getEnemyPokemon()!;
+    const enemySpy = vi.spyOn(enemyPokemon, "getMoveEffectiveness");
+    const powerSpy = vi.spyOn(allMoves[Moves.TACKLE], "calculateBattlePower");
+
+    game.move.select(Moves.TACKLE);
+
+    await game.phaseInterceptor.to("BerryPhase", false);
+
+    expect(typeSpy).toHaveLastReturnedWith(ty);
+    expect(enemySpy).toHaveReturnedWith(1);
+    expect(powerSpy).toHaveReturnedWith(48);
+    expect(enemyPokemon.hp).toBeLessThan(enemyPokemon.getMaxHp());
+  });
+
+  // Galvanize specifically would like to check for volt absorb's activation
+  if (ab === Abilities.GALVANIZE) {
+    it("should cause Normal-type attacks to activate Volt Absorb", async () => {
+      game.override.enemyAbility(Abilities.VOLT_ABSORB);
+
+      await game.classicMode.startBattle();
+
+      const playerPokemon = game.scene.getPlayerPokemon()!;
+      const tySpy = vi.spyOn(playerPokemon, "getMoveType");
+
+      const enemyPokemon = game.scene.getEnemyPokemon()!;
+      const enemyEffectivenessSpy = vi.spyOn(enemyPokemon, "getMoveEffectiveness");
+
+      enemyPokemon.hp = Math.floor(enemyPokemon.getMaxHp() * 0.8);
+
+      game.move.select(Moves.TACKLE);
+
+      await game.phaseInterceptor.to("BerryPhase", false);
+
+      expect(tySpy).toHaveLastReturnedWith(PokemonType.ELECTRIC);
+      expect(enemyEffectivenessSpy).toHaveReturnedWith(0);
+      expect(enemyPokemon.hp).toBe(enemyPokemon.getMaxHp());
+    });
+  }
+
+  it.each([
+    { moveName: "Revelation Dance", move: Moves.REVELATION_DANCE, expected_ty: PokemonType.WATER },
+    { moveName: "Judgement", move: Moves.JUDGMENT, expected_ty: PokemonType.NORMAL },
+    { moveName: "Terrain Pulse", move: Moves.TERRAIN_PULSE, expected_ty: PokemonType.NORMAL },
+    { moveName: "Weather Ball", move: Moves.WEATHER_BALL, expected_ty: PokemonType.NORMAL },
+    { moveName: "Multi Attack", move: Moves.MULTI_ATTACK, expected_ty: PokemonType.NORMAL },
+    { moveName: "Techno Blast", move: Moves.TECHNO_BLAST, expected_ty: PokemonType.NORMAL },
+  ])("should not change the type of $moveName", async ({ move, expected_ty: expectedTy }) => {
+    game.override
+      .enemySpecies(Species.MAGIKARP)
+      .enemyAbility(Abilities.BALL_FETCH)
+      .moveset([move])
+      .starterSpecies(Species.MAGIKARP);
+
+    await game.classicMode.startBattle([Species.MAGIKARP]);
+
+    const playerPokemon = game.scene.getPlayerPokemon()!;
+    const tySpy = vi.spyOn(playerPokemon, "getMoveType");
+
+    game.move.select(move);
+    await game.phaseInterceptor.to("BerryPhase", false);
+
+    expect(tySpy).toHaveLastReturnedWith(expectedTy);
+  });
+
+  it("should affect all hits of a Normal-type multi-hit move", async () => {
+    await game.classicMode.startBattle();
+
+    const playerPokemon = game.scene.getPlayerPokemon()!;
+    const tySpy = vi.spyOn(playerPokemon, "getMoveType");
+
+    const enemyPokemon = game.scene.getEnemyPokemon()!;
+
+    game.move.select(Moves.FURY_SWIPES);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
+    await game.move.forceHit();
+
+    await game.phaseInterceptor.to("MoveEffectPhase");
+    expect(playerPokemon.turnData.hitCount).toBeGreaterThan(1);
+    expect(enemyPokemon.hp).toBeLessThan(enemyPokemon.getMaxHp());
+
+    while (playerPokemon.turnData.hitsLeft > 0) {
+      const enemyStartingHp = enemyPokemon.hp;
+      await game.phaseInterceptor.to("MoveEffectPhase");
+
+      expect(tySpy).toHaveLastReturnedWith(ty);
+      expect(enemyPokemon.hp).toBeLessThan(enemyStartingHp);
+    }
+  });
+
+  it("should not be affected by silk scarf after changing the move's type", async () => {
+    game.override.startingHeldItems([{ name: "ATTACK_TYPE_BOOSTER", count: 1, type: PokemonType.NORMAL }]);
+    await game.classicMode.startBattle();
+
+    const testMoveInstance = allMoves[Moves.TACKLE];
+
+    // get the power boost from the ability so we can compare it to the item
+    // @ts-expect-error power multiplier is private
+    const boost = allAbilities[ab]?.getAttrs(MoveTypeChangeAbAttr)[0]?.powerMultiplier;
+    expect(boost, "power boost should be defined").toBeDefined();
+
+    const powerSpy = vi.spyOn(testMoveInstance, "calculateBattlePower");
+    const typeSpy = vi.spyOn(game.scene.getPlayerPokemon()!, "getMoveType");
+    game.move.select(Moves.TACKLE);
+    await game.phaseInterceptor.to("BerryPhase", false);
+    expect(typeSpy, "type was not changed").toHaveLastReturnedWith(ty);
+    expect(powerSpy).toHaveLastReturnedWith(toDmgValue(testMoveInstance.power * boost));
+  });
+
+  it("should be affected by the type boosting item after changing the move's type", async () => {
+    game.override.startingHeldItems([{ name: "ATTACK_TYPE_BOOSTER", count: 1, type: ty }]);
+    await game.classicMode.startBattle();
+
+    // get the power boost from the ability so we can compare it to the item
+    // @ts-expect-error power multiplier is private
+    const boost = allAbilities[ab]?.getAttrs(MoveTypeChangeAbAttr)[0]?.powerMultiplier;
+    expect(boost, "power boost should be defined").toBeDefined();
+
+    const tackle = allMoves[Moves.TACKLE];
+
+    const spy = vi.spyOn(tackle, "calculateBattlePower");
+    game.move.select(Moves.TACKLE);
+    await game.phaseInterceptor.to("BerryPhase", false);
+    expect(spy).toHaveLastReturnedWith(toDmgValue(tackle.power * boost * (1 + TYPE_BOOST_ITEM_BOOST_PERCENT / 100)));
+  });
+});
diff --git a/test/abilities/normalize.test.ts b/test/abilities/normalize.test.ts
new file mode 100644
index 00000000000..3256f0188d1
--- /dev/null
+++ b/test/abilities/normalize.test.ts
@@ -0,0 +1,92 @@
+import { TYPE_BOOST_ITEM_BOOST_PERCENT } from "#app/constants";
+import { allMoves } from "#app/data/moves/move";
+import { toDmgValue } from "#app/utils/common";
+import { Abilities } from "#enums/abilities";
+import { Moves } from "#enums/moves";
+import { PokemonType } from "#enums/pokemon-type";
+import { Species } from "#enums/species";
+import GameManager from "#test/testUtils/gameManager";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
+
+describe("Abilities - Normalize", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+    game.override
+      .moveset([Moves.TACKLE])
+      .ability(Abilities.NORMALIZE)
+      .battleStyle("single")
+      .disableCrits()
+      .enemySpecies(Species.MAGIKARP)
+      .enemyAbility(Abilities.BALL_FETCH)
+      .enemyMoveset(Moves.SPLASH);
+  });
+
+  it("should boost the power of normal type moves by 20%", async () => {
+    await game.classicMode.startBattle([Species.MAGIKARP]);
+    const powerSpy = vi.spyOn(allMoves[Moves.TACKLE], "calculateBattlePower");
+
+    game.move.select(Moves.TACKLE);
+    await game.phaseInterceptor.to("BerryPhase");
+    expect(powerSpy).toHaveLastReturnedWith(toDmgValue(allMoves[Moves.TACKLE].power * 1.2));
+  });
+
+  it("should not apply the old type boost item after changing a move's type", async () => {
+    game.override.startingHeldItems([{ name: "ATTACK_TYPE_BOOSTER", count: 1, type: PokemonType.GRASS }]);
+    game.override.moveset([Moves.LEAFAGE]);
+
+    const powerSpy = vi.spyOn(allMoves[Moves.LEAFAGE], "calculateBattlePower");
+    await game.classicMode.startBattle([Species.MAGIKARP]);
+    game.move.select(Moves.LEAFAGE);
+    await game.phaseInterceptor.to("BerryPhase");
+
+    // It should return with 1.2 (that is, only the power boost from the ability)
+    expect(powerSpy).toHaveLastReturnedWith(toDmgValue(allMoves[Moves.LEAFAGE].power * 1.2));
+  });
+
+  it("should apply silk scarf's power boost after changing a move's type", async () => {
+    game.override.startingHeldItems([{ name: "ATTACK_TYPE_BOOSTER", count: 1, type: PokemonType.NORMAL }]);
+    game.override.moveset([Moves.LEAFAGE]);
+
+    const powerSpy = vi.spyOn(allMoves[Moves.LEAFAGE], "calculateBattlePower");
+    await game.classicMode.startBattle([Species.MAGIKARP]);
+    game.move.select(Moves.LEAFAGE);
+    await game.phaseInterceptor.to("BerryPhase");
+
+    // 1.2 from normalize boost, second 1.2 from
+    expect(powerSpy).toHaveLastReturnedWith(
+      toDmgValue(allMoves[Moves.LEAFAGE].power * 1.2 * (1 + TYPE_BOOST_ITEM_BOOST_PERCENT / 100)),
+    );
+  });
+
+  it.each([
+    { moveName: "Revelation Dance", move: Moves.REVELATION_DANCE },
+    { moveName: "Judgement", move: Moves.JUDGMENT, expected_ty: PokemonType.NORMAL },
+    { moveName: "Terrain Pulse", move: Moves.TERRAIN_PULSE },
+    { moveName: "Weather Ball", move: Moves.WEATHER_BALL },
+    { moveName: "Multi Attack", move: Moves.MULTI_ATTACK },
+    { moveName: "Techno Blast", move: Moves.TECHNO_BLAST },
+    { moveName: "Hidden Power", move: Moves.HIDDEN_POWER },
+  ])("should not boost the power of $moveName", async ({ move }) => {
+    game.override.moveset([move]);
+    await game.classicMode.startBattle([Species.MAGIKARP]);
+    const powerSpy = vi.spyOn(allMoves[move], "calculateBattlePower");
+
+    game.move.select(move);
+    await game.phaseInterceptor.to("BerryPhase");
+    expect(powerSpy).toHaveLastReturnedWith(allMoves[move].power);
+  });
+});
diff --git a/test/abilities/oblivious.test.ts b/test/abilities/oblivious.test.ts
new file mode 100644
index 00000000000..a86899ec9c6
--- /dev/null
+++ b/test/abilities/oblivious.test.ts
@@ -0,0 +1,69 @@
+import { Abilities } from "#enums/abilities";
+import { BattlerTagType } from "#enums/battler-tag-type";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import GameManager from "#test/testUtils/gameManager";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
+
+describe("Abilities - Oblivious", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+    game.override
+      .moveset([Moves.SPLASH])
+      .ability(Abilities.BALL_FETCH)
+      .battleStyle("single")
+      .disableCrits()
+      .enemySpecies(Species.MAGIKARP)
+      .enemyAbility(Abilities.BALL_FETCH)
+      .enemyMoveset(Moves.SPLASH);
+  });
+
+  it("should remove taunt when gained", async () => {
+    game.override
+      .ability(Abilities.OBLIVIOUS)
+      .enemyAbility(Abilities.BALL_FETCH)
+      .moveset(Moves.SKILL_SWAP)
+      .enemyMoveset(Moves.SPLASH);
+    await game.classicMode.startBattle([Species.FEEBAS]);
+    const enemy = game.scene.getEnemyPokemon();
+    enemy?.addTag(BattlerTagType.TAUNT);
+    expect(enemy?.getTag(BattlerTagType.TAUNT)).toBeTruthy();
+
+    game.move.select(Moves.SKILL_SWAP);
+    await game.phaseInterceptor.to("BerryPhase");
+
+    expect(enemy?.getTag(BattlerTagType.TAUNT)).toBeFalsy();
+  });
+
+  it("should remove infatuation when gained", async () => {
+    game.override
+      .ability(Abilities.OBLIVIOUS)
+      .enemyAbility(Abilities.BALL_FETCH)
+      .moveset(Moves.SKILL_SWAP)
+      .enemyMoveset(Moves.SPLASH);
+    await game.classicMode.startBattle([Species.FEEBAS]);
+    const enemy = game.scene.getEnemyPokemon();
+    vi.spyOn(enemy!, "isOppositeGender").mockReturnValue(true);
+    enemy?.addTag(BattlerTagType.INFATUATED, 5, Moves.JUDGMENT, game.scene.getPlayerPokemon()?.id); // sourceID needs to be defined
+    expect(enemy?.getTag(BattlerTagType.INFATUATED)).toBeTruthy();
+
+    game.move.select(Moves.SKILL_SWAP);
+    await game.phaseInterceptor.to("BerryPhase");
+
+    expect(enemy?.getTag(BattlerTagType.INFATUATED)).toBeFalsy();
+  });
+});
diff --git a/test/abilities/own_tempo.test.ts b/test/abilities/own_tempo.test.ts
new file mode 100644
index 00000000000..b2f2c2f3030
--- /dev/null
+++ b/test/abilities/own_tempo.test.ts
@@ -0,0 +1,51 @@
+import { Abilities } from "#enums/abilities";
+import { BattlerTagType } from "#enums/battler-tag-type";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import GameManager from "#test/testUtils/gameManager";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
+
+describe("Abilities - Own Tempo", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+    game.override
+      .moveset([Moves.SPLASH])
+      .ability(Abilities.BALL_FETCH)
+      .battleStyle("single")
+      .disableCrits()
+      .enemySpecies(Species.MAGIKARP)
+      .enemyAbility(Abilities.BALL_FETCH)
+      .enemyMoveset(Moves.SPLASH);
+  });
+
+  it("should remove confusion when gained", async () => {
+    game.override
+      .ability(Abilities.OWN_TEMPO)
+      .enemyAbility(Abilities.BALL_FETCH)
+      .moveset(Moves.SKILL_SWAP)
+      .enemyMoveset(Moves.SPLASH);
+    await game.classicMode.startBattle([Species.FEEBAS]);
+    const enemy = game.scene.getEnemyPokemon();
+    enemy?.addTag(BattlerTagType.CONFUSED);
+    expect(enemy?.getTag(BattlerTagType.CONFUSED)).toBeTruthy();
+
+    game.move.select(Moves.SKILL_SWAP);
+    await game.phaseInterceptor.to("BerryPhase");
+
+    expect(enemy?.getTag(BattlerTagType.CONFUSED)).toBeFalsy();
+  });
+});
diff --git a/test/abilities/parental_bond.test.ts b/test/abilities/parental_bond.test.ts
new file mode 100644
index 00000000000..a75fea82830
--- /dev/null
+++ b/test/abilities/parental_bond.test.ts
@@ -0,0 +1,429 @@
+import { PokemonType } from "#enums/pokemon-type";
+import { BattlerTagType } from "#enums/battler-tag-type";
+import { toDmgValue } from "#app/utils/common";
+import { Abilities } from "#enums/abilities";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import { Stat } from "#enums/stat";
+import { StatusEffect } from "#enums/status-effect";
+import GameManager from "#test/testUtils/gameManager";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
+
+describe("Abilities - Parental Bond", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+    game.override.battleStyle("single");
+    game.override.disableCrits();
+    game.override.ability(Abilities.PARENTAL_BOND);
+    game.override.enemySpecies(Species.SNORLAX);
+    game.override.enemyAbility(Abilities.FUR_COAT);
+    game.override.enemyMoveset(Moves.SPLASH);
+    game.override.startingLevel(100);
+    game.override.enemyLevel(100);
+  });
+
+  it("should add second strike to attack move", async () => {
+    game.override.moveset([Moves.TACKLE]);
+
+    await game.classicMode.startBattle([Species.MAGIKARP]);
+
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+    const enemyPokemon = game.scene.getEnemyPokemon()!;
+
+    let enemyStartingHp = enemyPokemon.hp;
+
+    game.move.select(Moves.TACKLE);
+
+    await game.phaseInterceptor.to("DamageAnimPhase");
+    const firstStrikeDamage = enemyStartingHp - enemyPokemon.hp;
+    enemyStartingHp = enemyPokemon.hp;
+
+    await game.phaseInterceptor.to("BerryPhase", false);
+
+    const secondStrikeDamage = enemyStartingHp - enemyPokemon.hp;
+
+    expect(leadPokemon.turnData.hitCount).toBe(2);
+    expect(secondStrikeDamage).toBe(toDmgValue(0.25 * firstStrikeDamage));
+  });
+
+  it("should apply secondary effects to both strikes", async () => {
+    game.override.moveset([Moves.POWER_UP_PUNCH]);
+    game.override.enemySpecies(Species.AMOONGUSS);
+
+    await game.classicMode.startBattle([Species.MAGIKARP]);
+
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+
+    game.move.select(Moves.POWER_UP_PUNCH);
+
+    await game.phaseInterceptor.to("BerryPhase", false);
+
+    expect(leadPokemon.turnData.hitCount).toBe(2);
+    expect(leadPokemon.getStatStage(Stat.ATK)).toBe(2);
+  });
+
+  it("should not apply to Status moves", async () => {
+    game.override.moveset([Moves.BABY_DOLL_EYES]);
+
+    await game.classicMode.startBattle([Species.MAGIKARP]);
+
+    const enemyPokemon = game.scene.getEnemyPokemon()!;
+
+    game.move.select(Moves.BABY_DOLL_EYES);
+
+    await game.phaseInterceptor.to("BerryPhase", false);
+
+    expect(enemyPokemon.getStatStage(Stat.ATK)).toBe(-1);
+  });
+
+  it("should not apply to multi-hit moves", async () => {
+    game.override.moveset([Moves.DOUBLE_HIT]);
+
+    await game.classicMode.startBattle([Species.MAGIKARP]);
+
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+
+    game.move.select(Moves.DOUBLE_HIT);
+    await game.move.forceHit();
+
+    await game.phaseInterceptor.to("BerryPhase", false);
+
+    expect(leadPokemon.turnData.hitCount).toBe(2);
+  });
+
+  it("should not apply to self-sacrifice moves", async () => {
+    game.override.moveset([Moves.SELF_DESTRUCT]);
+
+    await game.classicMode.startBattle([Species.MAGIKARP]);
+
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+
+    game.move.select(Moves.SELF_DESTRUCT);
+
+    await game.phaseInterceptor.to("DamageAnimPhase", false);
+
+    expect(leadPokemon.turnData.hitCount).toBe(1);
+  });
+
+  it("should not apply to Rollout", async () => {
+    game.override.moveset([Moves.ROLLOUT]);
+
+    await game.classicMode.startBattle([Species.MAGIKARP]);
+
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+
+    game.move.select(Moves.ROLLOUT);
+    await game.move.forceHit();
+
+    await game.phaseInterceptor.to("DamageAnimPhase", false);
+
+    expect(leadPokemon.turnData.hitCount).toBe(1);
+  });
+
+  it("should not apply multiplier to fixed-damage moves", async () => {
+    game.override.moveset([Moves.DRAGON_RAGE]);
+
+    await game.classicMode.startBattle([Species.MAGIKARP]);
+
+    const enemyPokemon = game.scene.getEnemyPokemon()!;
+
+    game.move.select(Moves.DRAGON_RAGE);
+    await game.phaseInterceptor.to("BerryPhase", false);
+
+    expect(enemyPokemon.hp).toBe(enemyPokemon.getMaxHp() - 80);
+  });
+
+  it("should not apply multiplier to counter moves", async () => {
+    game.override.moveset([Moves.COUNTER]);
+    game.override.enemyMoveset([Moves.TACKLE]);
+
+    await game.classicMode.startBattle([Species.SHUCKLE]);
+
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+    const enemyPokemon = game.scene.getEnemyPokemon()!;
+
+    game.move.select(Moves.COUNTER);
+    await game.phaseInterceptor.to("DamageAnimPhase");
+
+    const playerDamage = leadPokemon.getMaxHp() - leadPokemon.hp;
+
+    await game.phaseInterceptor.to("BerryPhase", false);
+
+    expect(enemyPokemon.hp).toBe(enemyPokemon.getMaxHp() - 4 * playerDamage);
+  });
+
+  it("should not apply to multi-target moves", async () => {
+    game.override.battleStyle("double");
+    game.override.moveset([Moves.EARTHQUAKE]);
+    game.override.passiveAbility(Abilities.LEVITATE);
+
+    await game.classicMode.startBattle([Species.MAGIKARP, Species.FEEBAS]);
+
+    const playerPokemon = game.scene.getPlayerField();
+
+    game.move.select(Moves.EARTHQUAKE);
+    game.move.select(Moves.EARTHQUAKE, 1);
+
+    await game.phaseInterceptor.to("BerryPhase", false);
+
+    playerPokemon.forEach(p => expect(p.turnData.hitCount).toBe(1));
+  });
+
+  it("should apply to multi-target moves when hitting only one target", async () => {
+    game.override.moveset([Moves.EARTHQUAKE]);
+
+    await game.classicMode.startBattle([Species.MAGIKARP]);
+
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+
+    game.move.select(Moves.EARTHQUAKE);
+    await game.phaseInterceptor.to("DamageAnimPhase", false);
+
+    expect(leadPokemon.turnData.hitCount).toBe(2);
+  });
+
+  it("should only trigger post-target move effects once", async () => {
+    game.override.moveset([Moves.MIND_BLOWN]);
+
+    await game.classicMode.startBattle([Species.MAGIKARP]);
+
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+
+    game.move.select(Moves.MIND_BLOWN);
+
+    await game.phaseInterceptor.to("DamageAnimPhase", false);
+
+    expect(leadPokemon.turnData.hitCount).toBe(2);
+
+    // This test will time out if the user faints
+    await game.phaseInterceptor.to("BerryPhase", false);
+
+    expect(leadPokemon.hp).toBe(Math.ceil(leadPokemon.getMaxHp() / 2));
+  });
+
+  it("Burn Up only removes type after the second strike", async () => {
+    game.override.moveset([Moves.BURN_UP]);
+
+    await game.classicMode.startBattle([Species.CHARIZARD]);
+
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+    const enemyPokemon = game.scene.getEnemyPokemon()!;
+
+    game.move.select(Moves.BURN_UP);
+
+    await game.phaseInterceptor.to("MoveEffectPhase");
+
+    expect(leadPokemon.turnData.hitCount).toBe(2);
+    expect(enemyPokemon.hp).toBeGreaterThan(0);
+    expect(leadPokemon.isOfType(PokemonType.FIRE)).toBe(true);
+
+    await game.phaseInterceptor.to("BerryPhase", false);
+
+    expect(leadPokemon.isOfType(PokemonType.FIRE)).toBe(false);
+  });
+
+  it("Moves boosted by this ability and Multi-Lens should strike 3 times", async () => {
+    game.override.moveset([Moves.TACKLE]);
+    game.override.startingHeldItems([{ name: "MULTI_LENS", count: 1 }]);
+
+    await game.classicMode.startBattle([Species.MAGIKARP]);
+
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+
+    game.move.select(Moves.TACKLE);
+
+    await game.phaseInterceptor.to("DamageAnimPhase");
+
+    expect(leadPokemon.turnData.hitCount).toBe(3);
+  });
+
+  it("Seismic Toss boosted by this ability and Multi-Lens should strike 3 times", async () => {
+    game.override.moveset([Moves.SEISMIC_TOSS]);
+    game.override.startingHeldItems([{ name: "MULTI_LENS", count: 1 }]);
+
+    await game.classicMode.startBattle([Species.MAGIKARP]);
+
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+    const enemyPokemon = game.scene.getEnemyPokemon()!;
+
+    const enemyStartingHp = enemyPokemon.hp;
+
+    game.move.select(Moves.SEISMIC_TOSS);
+    await game.move.forceHit();
+
+    await game.phaseInterceptor.to("DamageAnimPhase");
+
+    expect(leadPokemon.turnData.hitCount).toBe(3);
+
+    await game.phaseInterceptor.to("MoveEndPhase", false);
+
+    expect(enemyPokemon.hp).toBe(enemyStartingHp - 200);
+  });
+
+  it("Hyper Beam boosted by this ability should strike twice, then recharge", async () => {
+    game.override.moveset([Moves.HYPER_BEAM]);
+
+    await game.classicMode.startBattle([Species.MAGIKARP]);
+
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+
+    game.move.select(Moves.HYPER_BEAM);
+    await game.move.forceHit();
+
+    await game.phaseInterceptor.to("DamageAnimPhase");
+
+    expect(leadPokemon.turnData.hitCount).toBe(2);
+    expect(leadPokemon.getTag(BattlerTagType.RECHARGING)).toBeUndefined();
+
+    await game.phaseInterceptor.to("TurnEndPhase");
+
+    expect(leadPokemon.getTag(BattlerTagType.RECHARGING)).toBeDefined();
+  });
+
+  it("Anchor Shot boosted by this ability should only trap the target after the second hit", async () => {
+    game.override.moveset([Moves.ANCHOR_SHOT]);
+
+    await game.classicMode.startBattle([Species.MAGIKARP]);
+
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+    const enemyPokemon = game.scene.getEnemyPokemon()!;
+
+    game.move.select(Moves.ANCHOR_SHOT);
+    await game.move.forceHit();
+
+    await game.phaseInterceptor.to("DamageAnimPhase");
+
+    expect(leadPokemon.turnData.hitCount).toBe(2);
+    expect(enemyPokemon.getTag(BattlerTagType.TRAPPED)).toBeUndefined();
+
+    await game.phaseInterceptor.to("MoveEndPhase");
+    expect(enemyPokemon.getTag(BattlerTagType.TRAPPED)).toBeDefined();
+
+    await game.phaseInterceptor.to("TurnEndPhase");
+
+    expect(enemyPokemon.getTag(BattlerTagType.TRAPPED)).toBeDefined();
+  });
+
+  it("Smack Down boosted by this ability should only ground the target after the second hit", async () => {
+    game.override.moveset([Moves.SMACK_DOWN]);
+
+    await game.classicMode.startBattle([Species.MAGIKARP]);
+
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+    const enemyPokemon = game.scene.getEnemyPokemon()!;
+
+    game.move.select(Moves.SMACK_DOWN);
+    await game.move.forceHit();
+
+    await game.phaseInterceptor.to("DamageAnimPhase");
+
+    expect(leadPokemon.turnData.hitCount).toBe(2);
+    expect(enemyPokemon.getTag(BattlerTagType.IGNORE_FLYING)).toBeUndefined();
+
+    await game.phaseInterceptor.to("TurnEndPhase");
+
+    expect(enemyPokemon.getTag(BattlerTagType.IGNORE_FLYING)).toBeDefined();
+  });
+
+  it("U-turn boosted by this ability should strike twice before forcing a switch", async () => {
+    game.override.moveset([Moves.U_TURN]);
+
+    await game.classicMode.startBattle([Species.MAGIKARP, Species.BLASTOISE]);
+
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+
+    game.move.select(Moves.U_TURN);
+    await game.move.forceHit();
+
+    await game.phaseInterceptor.to("MoveEffectPhase");
+    expect(leadPokemon.turnData.hitCount).toBe(2);
+
+    // This will cause this test to time out if the switch was forced on the first hit.
+    await game.phaseInterceptor.to("MoveEffectPhase", false);
+  });
+
+  it("Wake-Up Slap boosted by this ability should only wake up the target after the second hit", async () => {
+    game.override.moveset([Moves.WAKE_UP_SLAP]).enemyStatusEffect(StatusEffect.SLEEP);
+
+    await game.classicMode.startBattle([Species.MAGIKARP]);
+
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+    const enemyPokemon = game.scene.getEnemyPokemon()!;
+
+    game.move.select(Moves.WAKE_UP_SLAP);
+    await game.move.forceHit();
+
+    await game.phaseInterceptor.to("DamageAnimPhase");
+
+    expect(leadPokemon.turnData.hitCount).toBe(2);
+    expect(enemyPokemon.status?.effect).toBe(StatusEffect.SLEEP);
+
+    await game.phaseInterceptor.to("BerryPhase", false);
+
+    expect(enemyPokemon.status?.effect).toBeUndefined();
+  });
+
+  it("should not cause user to hit into King's Shield more than once", async () => {
+    game.override.moveset([Moves.TACKLE]);
+    game.override.enemyMoveset([Moves.KINGS_SHIELD]);
+
+    await game.classicMode.startBattle([Species.MAGIKARP]);
+
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+
+    game.move.select(Moves.TACKLE);
+
+    await game.phaseInterceptor.to("BerryPhase", false);
+
+    expect(leadPokemon.getStatStage(Stat.ATK)).toBe(-1);
+  });
+
+  it("should not cause user to hit into Storm Drain more than once", async () => {
+    game.override.moveset([Moves.WATER_GUN]);
+    game.override.enemyAbility(Abilities.STORM_DRAIN);
+
+    await game.classicMode.startBattle([Species.MAGIKARP]);
+
+    const enemyPokemon = game.scene.getEnemyPokemon()!;
+
+    game.move.select(Moves.WATER_GUN);
+
+    await game.phaseInterceptor.to("BerryPhase", false);
+
+    expect(enemyPokemon.getStatStage(Stat.SPATK)).toBe(1);
+  });
+
+  it("should not allow Future Sight to hit infinitely many times if the user switches out", async () => {
+    game.override.enemyLevel(1000).moveset(Moves.FUTURE_SIGHT);
+    await game.classicMode.startBattle([Species.BULBASAUR, Species.CHARMANDER, Species.SQUIRTLE]);
+
+    const enemyPokemon = game.scene.getEnemyPokemon()!;
+    vi.spyOn(enemyPokemon, "damageAndUpdate");
+
+    game.move.select(Moves.FUTURE_SIGHT);
+    await game.toNextTurn();
+
+    game.doSwitchPokemon(1);
+    await game.toNextTurn();
+
+    game.doSwitchPokemon(2);
+    await game.toNextTurn();
+
+    // TODO: Update hit count to 1 once Future Sight is fixed to not activate abilities if user is off the field
+    expect(enemyPokemon.damageAndUpdate).toHaveBeenCalledTimes(2);
+  });
+});
diff --git a/src/test/abilities/pastel_veil.test.ts b/test/abilities/pastel_veil.test.ts
similarity index 88%
rename from src/test/abilities/pastel_veil.test.ts
rename to test/abilities/pastel_veil.test.ts
index dd8360493a1..4ae9763c4a6 100644
--- a/src/test/abilities/pastel_veil.test.ts
+++ b/test/abilities/pastel_veil.test.ts
@@ -5,7 +5,7 @@ import { TurnEndPhase } from "#app/phases/turn-end-phase";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { StatusEffect } from "#enums/status-effect";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
@@ -26,15 +26,15 @@ describe("Abilities - Pastel Veil", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     game.override
-      .battleType("double")
-      .moveset([ Moves.TOXIC_THREAD, Moves.SPLASH ])
+      .battleStyle("double")
+      .moveset([Moves.TOXIC_THREAD, Moves.SPLASH])
       .enemyAbility(Abilities.BALL_FETCH)
       .enemySpecies(Species.SUNKERN)
       .enemyMoveset(Moves.SPLASH);
   });
 
   it("prevents the user and its allies from being afflicted by poison", async () => {
-    await game.startBattle([ Species.MAGIKARP, Species.GALAR_PONYTA ]);
+    await game.startBattle([Species.MAGIKARP, Species.GALAR_PONYTA]);
     const ponyta = game.scene.getPlayerField()[1];
     const magikarp = game.scene.getPlayerField()[0];
     ponyta.abilityIndex = 1;
@@ -50,7 +50,7 @@ describe("Abilities - Pastel Veil", () => {
   });
 
   it("it heals the poisoned status condition of allies if user is sent out into battle", async () => {
-    await game.startBattle([ Species.MAGIKARP, Species.FEEBAS, Species.GALAR_PONYTA ]);
+    await game.startBattle([Species.MAGIKARP, Species.FEEBAS, Species.GALAR_PONYTA]);
     const ponyta = game.scene.getPlayerParty()[2];
     const magikarp = game.scene.getPlayerField()[0];
     ponyta.abilityIndex = 1;
diff --git a/test/abilities/perish_body.test.ts b/test/abilities/perish_body.test.ts
new file mode 100644
index 00000000000..27e76cb52ad
--- /dev/null
+++ b/test/abilities/perish_body.test.ts
@@ -0,0 +1,112 @@
+import { Abilities } from "#enums/abilities";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import GameManager from "#test/testUtils/gameManager";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
+
+describe("Abilities - Perish Song", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+    game.override.battleStyle("single");
+    game.override.disableCrits();
+
+    game.override.enemySpecies(Species.MAGIKARP);
+    game.override.enemyAbility(Abilities.BALL_FETCH);
+
+    game.override.starterSpecies(Species.CURSOLA);
+    game.override.ability(Abilities.PERISH_BODY);
+    game.override.moveset([Moves.SPLASH]);
+  });
+
+  it("should trigger when hit with damaging move", async () => {
+    game.override.enemyMoveset([Moves.AQUA_JET]);
+    await game.classicMode.startBattle();
+    const cursola = game.scene.getPlayerPokemon();
+    const magikarp = game.scene.getEnemyPokemon();
+
+    game.move.select(Moves.SPLASH);
+    await game.toNextTurn();
+
+    expect(cursola?.summonData.tags[0].turnCount).toBe(3);
+    expect(magikarp?.summonData.tags[0].turnCount).toBe(3);
+  });
+
+  it("should trigger even when fainting", async () => {
+    game.override.enemyMoveset([Moves.AQUA_JET]).enemyLevel(100).startingLevel(1);
+    await game.classicMode.startBattle([Species.CURSOLA, Species.FEEBAS]);
+    const magikarp = game.scene.getEnemyPokemon();
+
+    game.move.select(Moves.SPLASH);
+    game.doSelectPartyPokemon(1);
+    await game.toNextTurn();
+
+    expect(magikarp?.summonData.tags[0].turnCount).toBe(3);
+  });
+
+  it("should not activate if attacker already has perish song", async () => {
+    game.override.enemyMoveset([Moves.PERISH_SONG, Moves.AQUA_JET, Moves.SPLASH]);
+    await game.classicMode.startBattle([Species.FEEBAS, Species.CURSOLA]);
+    const feebas = game.scene.getPlayerPokemon();
+    const magikarp = game.scene.getEnemyPokemon();
+
+    game.move.select(Moves.SPLASH);
+    await game.forceEnemyMove(Moves.PERISH_SONG);
+    await game.toNextTurn();
+
+    expect(feebas?.summonData.tags[0].turnCount).toBe(3);
+    expect(magikarp?.summonData.tags[0].turnCount).toBe(3);
+
+    game.doSwitchPokemon(1);
+    await game.forceEnemyMove(Moves.SPLASH);
+    await game.toNextTurn();
+
+    const cursola = game.scene.getPlayerPokemon();
+    expect(cursola?.summonData.tags.length).toBe(0);
+    expect(magikarp?.summonData.tags[0].turnCount).toBe(2);
+
+    game.move.select(Moves.SPLASH);
+    await game.forceEnemyMove(Moves.AQUA_JET);
+    await game.toNextTurn();
+
+    expect(cursola?.summonData.tags.length).toBe(0);
+    expect(magikarp?.summonData.tags[0].turnCount).toBe(1);
+  });
+
+  it("should activate if cursola already has perish song, but not reset its counter", async () => {
+    game.override.enemyMoveset([Moves.PERISH_SONG, Moves.AQUA_JET, Moves.SPLASH]);
+    game.override.moveset([Moves.WHIRLWIND, Moves.SPLASH]);
+    game.override.startingWave(5);
+    await game.classicMode.startBattle([Species.CURSOLA]);
+    const cursola = game.scene.getPlayerPokemon();
+
+    game.move.select(Moves.WHIRLWIND);
+    await game.forceEnemyMove(Moves.PERISH_SONG);
+    await game.toNextTurn();
+
+    const magikarp = game.scene.getEnemyPokemon();
+    expect(cursola?.summonData.tags[0].turnCount).toBe(3);
+    expect(magikarp?.summonData.tags.length).toBe(0);
+
+    game.move.select(Moves.SPLASH);
+    await game.forceEnemyMove(Moves.AQUA_JET);
+    await game.toNextTurn();
+
+    expect(cursola?.summonData.tags[0].turnCount).toBe(2);
+    expect(magikarp?.summonData.tags.length).toBe(1);
+    expect(magikarp?.summonData.tags[0].turnCount).toBe(3);
+  });
+});
diff --git a/test/abilities/power_construct.test.ts b/test/abilities/power_construct.test.ts
new file mode 100644
index 00000000000..0ff90a2c0df
--- /dev/null
+++ b/test/abilities/power_construct.test.ts
@@ -0,0 +1,87 @@
+import { Status } from "#app/data/status-effect";
+import { QuietFormChangePhase } from "#app/phases/quiet-form-change-phase";
+import { TurnEndPhase } from "#app/phases/turn-end-phase";
+import { Abilities } from "#enums/abilities";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import { StatusEffect } from "#enums/status-effect";
+import GameManager from "#test/testUtils/gameManager";
+import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest";
+
+describe("Abilities - POWER CONSTRUCT", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+    const moveToUse = Moves.SPLASH;
+    game.override.battleStyle("single");
+    game.override.ability(Abilities.POWER_CONSTRUCT);
+    game.override.moveset([moveToUse]);
+    game.override.enemyMoveset([Moves.TACKLE, Moves.TACKLE, Moves.TACKLE, Moves.TACKLE]);
+  });
+
+  test("check if fainted 50% Power Construct Pokemon switches to base form on arena reset", async () => {
+    const baseForm = 2,
+      completeForm = 4;
+    game.override.startingWave(4);
+    game.override.starterForms({
+      [Species.ZYGARDE]: completeForm,
+    });
+
+    await game.classicMode.startBattle([Species.MAGIKARP, Species.ZYGARDE]);
+
+    const zygarde = game.scene.getPlayerParty().find(p => p.species.speciesId === Species.ZYGARDE);
+    expect(zygarde).not.toBe(undefined);
+    expect(zygarde!.formIndex).toBe(completeForm);
+
+    zygarde!.hp = 0;
+    zygarde!.status = new Status(StatusEffect.FAINT);
+    expect(zygarde!.isFainted()).toBe(true);
+
+    game.move.select(Moves.SPLASH);
+    await game.doKillOpponents();
+    await game.phaseInterceptor.to(TurnEndPhase);
+    game.doSelectModifier();
+    await game.phaseInterceptor.to(QuietFormChangePhase);
+
+    expect(zygarde!.formIndex).toBe(baseForm);
+  });
+
+  test("check if fainted 10% Power Construct Pokemon switches to base form on arena reset", async () => {
+    const baseForm = 3,
+      completeForm = 5;
+    game.override.startingWave(4);
+    game.override.starterForms({
+      [Species.ZYGARDE]: completeForm,
+    });
+
+    await game.classicMode.startBattle([Species.MAGIKARP, Species.ZYGARDE]);
+
+    const zygarde = game.scene.getPlayerParty().find(p => p.species.speciesId === Species.ZYGARDE);
+    expect(zygarde).not.toBe(undefined);
+    expect(zygarde!.formIndex).toBe(completeForm);
+
+    zygarde!.hp = 0;
+    zygarde!.status = new Status(StatusEffect.FAINT);
+    expect(zygarde!.isFainted()).toBe(true);
+
+    game.move.select(Moves.SPLASH);
+    await game.doKillOpponents();
+    await game.phaseInterceptor.to(TurnEndPhase);
+    game.doSelectModifier();
+    await game.phaseInterceptor.to(QuietFormChangePhase);
+
+    expect(zygarde!.formIndex).toBe(baseForm);
+  });
+});
diff --git a/src/test/abilities/power_spot.test.ts b/test/abilities/power_spot.test.ts
similarity index 83%
rename from src/test/abilities/power_spot.test.ts
rename to test/abilities/power_spot.test.ts
index a566c2277c3..3e4f79d7445 100644
--- a/src/test/abilities/power_spot.test.ts
+++ b/test/abilities/power_spot.test.ts
@@ -1,10 +1,10 @@
-import { allMoves } from "#app/data/move";
+import { allMoves } from "#app/data/moves/move";
 import { Abilities } from "#app/enums/abilities";
 import { MoveEffectPhase } from "#app/phases/move-effect-phase";
 import { TurnEndPhase } from "#app/phases/turn-end-phase";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
@@ -26,8 +26,8 @@ describe("Abilities - Power Spot", () => {
 
   beforeEach(() => {
     game = new GameManager(phaserGame);
-    game.override.battleType("double");
-    game.override.moveset([ Moves.TACKLE, Moves.BREAKING_SWIPE, Moves.SPLASH, Moves.DAZZLING_GLEAM ]);
+    game.override.battleStyle("double");
+    game.override.moveset([Moves.TACKLE, Moves.BREAKING_SWIPE, Moves.SPLASH, Moves.DAZZLING_GLEAM]);
     game.override.enemyMoveset(Moves.SPLASH);
     game.override.enemySpecies(Species.SHUCKLE);
     game.override.enemyAbility(Abilities.BALL_FETCH);
@@ -39,7 +39,7 @@ describe("Abilities - Power Spot", () => {
 
     vi.spyOn(moveToCheck, "calculateBattlePower");
 
-    await game.startBattle([ Species.REGIELEKI, Species.STONJOURNER ]);
+    await game.startBattle([Species.REGIELEKI, Species.STONJOURNER]);
     game.move.select(Moves.DAZZLING_GLEAM);
     game.move.select(Moves.SPLASH, 1);
     await game.phaseInterceptor.to(MoveEffectPhase);
@@ -53,7 +53,7 @@ describe("Abilities - Power Spot", () => {
 
     vi.spyOn(moveToCheck, "calculateBattlePower");
 
-    await game.startBattle([ Species.REGIELEKI, Species.STONJOURNER ]);
+    await game.startBattle([Species.REGIELEKI, Species.STONJOURNER]);
     game.move.select(Moves.BREAKING_SWIPE);
     game.move.select(Moves.SPLASH, 1);
     await game.phaseInterceptor.to(MoveEffectPhase);
@@ -67,7 +67,7 @@ describe("Abilities - Power Spot", () => {
 
     vi.spyOn(moveToCheck, "calculateBattlePower");
 
-    await game.startBattle([ Species.STONJOURNER, Species.REGIELEKI ]);
+    await game.startBattle([Species.STONJOURNER, Species.REGIELEKI]);
     game.move.select(Moves.BREAKING_SWIPE);
     game.move.select(Moves.SPLASH, 1);
     await game.phaseInterceptor.to(TurnEndPhase);
diff --git a/test/abilities/protean.test.ts b/test/abilities/protean.test.ts
new file mode 100644
index 00000000000..8f7633e1327
--- /dev/null
+++ b/test/abilities/protean.test.ts
@@ -0,0 +1,301 @@
+import { allMoves } from "#app/data/moves/move";
+import { PokemonType } from "#enums/pokemon-type";
+import { Weather } from "#app/data/weather";
+import type { PlayerPokemon } from "#app/field/pokemon";
+import { TurnEndPhase } from "#app/phases/turn-end-phase";
+import { Abilities } from "#enums/abilities";
+import { BattlerTagType } from "#enums/battler-tag-type";
+import { Biome } from "#enums/biome";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import { WeatherType } from "#enums/weather-type";
+import GameManager from "#test/testUtils/gameManager";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest";
+
+describe("Abilities - Protean", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+    game.override.battleStyle("single");
+    game.override.ability(Abilities.PROTEAN);
+    game.override.startingLevel(100);
+    game.override.enemySpecies(Species.RATTATA);
+    game.override.enemyMoveset([Moves.ENDURE, Moves.ENDURE, Moves.ENDURE, Moves.ENDURE]);
+  });
+
+  test("ability applies and changes a pokemon's type", async () => {
+    game.override.moveset([Moves.SPLASH]);
+
+    await game.startBattle([Species.MAGIKARP]);
+
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+    expect(leadPokemon).not.toBe(undefined);
+
+    game.move.select(Moves.SPLASH);
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    testPokemonTypeMatchesDefaultMoveType(leadPokemon, Moves.SPLASH);
+  });
+
+  // Test for Gen9+ functionality, we are using previous funcionality
+  test.skip("ability applies only once per switch in", async () => {
+    game.override.moveset([Moves.SPLASH, Moves.AGILITY]);
+
+    await game.startBattle([Species.MAGIKARP, Species.BULBASAUR]);
+
+    let leadPokemon = game.scene.getPlayerPokemon()!;
+    expect(leadPokemon).not.toBe(undefined);
+
+    game.move.select(Moves.SPLASH);
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    testPokemonTypeMatchesDefaultMoveType(leadPokemon, Moves.SPLASH);
+
+    game.move.select(Moves.AGILITY);
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    expect(leadPokemon.waveData.abilitiesApplied).toContain(Abilities.PROTEAN);
+    const leadPokemonType = PokemonType[leadPokemon.getTypes()[0]];
+    const moveType = PokemonType[allMoves[Moves.AGILITY].type];
+    expect(leadPokemonType).not.toBe(moveType);
+
+    await game.toNextTurn();
+    game.doSwitchPokemon(1);
+    await game.toNextTurn();
+    game.doSwitchPokemon(1);
+    await game.toNextTurn();
+
+    leadPokemon = game.scene.getPlayerPokemon()!;
+    expect(leadPokemon).not.toBe(undefined);
+
+    game.move.select(Moves.SPLASH);
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    testPokemonTypeMatchesDefaultMoveType(leadPokemon, Moves.SPLASH);
+  });
+
+  test("ability applies correctly even if the pokemon's move has a variable type", async () => {
+    game.override.moveset([Moves.WEATHER_BALL]);
+
+    await game.startBattle([Species.MAGIKARP]);
+
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+    expect(leadPokemon).not.toBe(undefined);
+
+    game.scene.arena.weather = new Weather(WeatherType.SUNNY);
+    game.move.select(Moves.WEATHER_BALL);
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    expect(leadPokemon.waveData.abilitiesApplied).toContain(Abilities.PROTEAN);
+    expect(leadPokemon.getTypes()).toHaveLength(1);
+    const leadPokemonType = PokemonType[leadPokemon.getTypes()[0]],
+      moveType = PokemonType[PokemonType.FIRE];
+    expect(leadPokemonType).toBe(moveType);
+  });
+
+  test("ability applies correctly even if the type has changed by another ability", async () => {
+    game.override.moveset([Moves.TACKLE]);
+    game.override.passiveAbility(Abilities.REFRIGERATE);
+
+    await game.startBattle([Species.MAGIKARP]);
+
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+    expect(leadPokemon).not.toBe(undefined);
+
+    game.move.select(Moves.TACKLE);
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    expect(leadPokemon.waveData.abilitiesApplied).toContain(Abilities.PROTEAN);
+    expect(leadPokemon.getTypes()).toHaveLength(1);
+    const leadPokemonType = PokemonType[leadPokemon.getTypes()[0]],
+      moveType = PokemonType[PokemonType.ICE];
+    expect(leadPokemonType).toBe(moveType);
+  });
+
+  test("ability applies correctly even if the pokemon's move calls another move", async () => {
+    game.override.moveset([Moves.NATURE_POWER]);
+
+    await game.startBattle([Species.MAGIKARP]);
+
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+    expect(leadPokemon).not.toBe(undefined);
+
+    game.scene.arena.biomeType = Biome.MOUNTAIN;
+    game.move.select(Moves.NATURE_POWER);
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    testPokemonTypeMatchesDefaultMoveType(leadPokemon, Moves.AIR_SLASH);
+  });
+
+  test("ability applies correctly even if the pokemon's move is delayed / charging", async () => {
+    game.override.moveset([Moves.DIG]);
+
+    await game.startBattle([Species.MAGIKARP]);
+
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+    expect(leadPokemon).not.toBe(undefined);
+
+    game.move.select(Moves.DIG);
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    testPokemonTypeMatchesDefaultMoveType(leadPokemon, Moves.DIG);
+  });
+
+  test("ability applies correctly even if the pokemon's move misses", async () => {
+    game.override.moveset([Moves.TACKLE]);
+    game.override.enemyMoveset(Moves.SPLASH);
+
+    await game.startBattle([Species.MAGIKARP]);
+
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+    expect(leadPokemon).not.toBe(undefined);
+
+    game.move.select(Moves.TACKLE);
+    await game.move.forceMiss();
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    const enemyPokemon = game.scene.getEnemyPokemon()!;
+    expect(enemyPokemon.isFullHp()).toBe(true);
+    testPokemonTypeMatchesDefaultMoveType(leadPokemon, Moves.TACKLE);
+  });
+
+  test("ability applies correctly even if the pokemon's move is protected against", async () => {
+    game.override.moveset([Moves.TACKLE]);
+    game.override.enemyMoveset([Moves.PROTECT, Moves.PROTECT, Moves.PROTECT, Moves.PROTECT]);
+
+    await game.startBattle([Species.MAGIKARP]);
+
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+    expect(leadPokemon).not.toBe(undefined);
+
+    game.move.select(Moves.TACKLE);
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    testPokemonTypeMatchesDefaultMoveType(leadPokemon, Moves.TACKLE);
+  });
+
+  test("ability applies correctly even if the pokemon's move fails because of type immunity", async () => {
+    game.override.moveset([Moves.TACKLE]);
+    game.override.enemySpecies(Species.GASTLY);
+
+    await game.startBattle([Species.MAGIKARP]);
+
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+    expect(leadPokemon).not.toBe(undefined);
+
+    game.move.select(Moves.TACKLE);
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    testPokemonTypeMatchesDefaultMoveType(leadPokemon, Moves.TACKLE);
+  });
+
+  test("ability is not applied if pokemon's type is the same as the move's type", async () => {
+    game.override.moveset([Moves.SPLASH]);
+
+    await game.startBattle([Species.MAGIKARP]);
+
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+    expect(leadPokemon).not.toBe(undefined);
+
+    leadPokemon.summonData.types = [allMoves[Moves.SPLASH].type];
+    game.move.select(Moves.SPLASH);
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    expect(leadPokemon.waveData.abilitiesApplied).not.toContain(Abilities.PROTEAN);
+  });
+
+  test("ability is not applied if pokemon is terastallized", async () => {
+    game.override.moveset([Moves.SPLASH]);
+
+    await game.startBattle([Species.MAGIKARP]);
+
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+    expect(leadPokemon).not.toBe(undefined);
+
+    leadPokemon.isTerastallized = true;
+
+    game.move.select(Moves.SPLASH);
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    expect(leadPokemon.waveData.abilitiesApplied).not.toContain(Abilities.PROTEAN);
+  });
+
+  test("ability is not applied if pokemon uses struggle", async () => {
+    game.override.moveset([Moves.STRUGGLE]);
+
+    await game.startBattle([Species.MAGIKARP]);
+
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+    expect(leadPokemon).not.toBe(undefined);
+
+    game.move.select(Moves.STRUGGLE);
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    expect(leadPokemon.waveData.abilitiesApplied).not.toContain(Abilities.PROTEAN);
+  });
+
+  test("ability is not applied if the pokemon's move fails", async () => {
+    game.override.moveset([Moves.BURN_UP]);
+
+    await game.startBattle([Species.MAGIKARP]);
+
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+    expect(leadPokemon).not.toBe(undefined);
+
+    game.move.select(Moves.BURN_UP);
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    expect(leadPokemon.waveData.abilitiesApplied).not.toContain(Abilities.PROTEAN);
+  });
+
+  test("ability applies correctly even if the pokemon's Trick-or-Treat fails", async () => {
+    game.override.moveset([Moves.TRICK_OR_TREAT]);
+    game.override.enemySpecies(Species.GASTLY);
+
+    await game.startBattle([Species.MAGIKARP]);
+
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+    expect(leadPokemon).not.toBe(undefined);
+
+    game.move.select(Moves.TRICK_OR_TREAT);
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    testPokemonTypeMatchesDefaultMoveType(leadPokemon, Moves.TRICK_OR_TREAT);
+  });
+
+  test("ability applies correctly and the pokemon curses itself", async () => {
+    game.override.moveset([Moves.CURSE]);
+
+    await game.startBattle([Species.MAGIKARP]);
+
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+    expect(leadPokemon).not.toBe(undefined);
+
+    game.move.select(Moves.CURSE);
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    testPokemonTypeMatchesDefaultMoveType(leadPokemon, Moves.CURSE);
+    expect(leadPokemon.getTag(BattlerTagType.CURSED)).not.toBe(undefined);
+  });
+});
+
+function testPokemonTypeMatchesDefaultMoveType(pokemon: PlayerPokemon, move: Moves) {
+  expect(pokemon.waveData.abilitiesApplied).toContain(Abilities.PROTEAN);
+  expect(pokemon.getTypes()).toHaveLength(1);
+  const pokemonType = PokemonType[pokemon.getTypes()[0]],
+    moveType = PokemonType[allMoves[move].type];
+  expect(pokemonType).toBe(moveType);
+}
diff --git a/test/abilities/protosynthesis.test.ts b/test/abilities/protosynthesis.test.ts
new file mode 100644
index 00000000000..e312ebd572c
--- /dev/null
+++ b/test/abilities/protosynthesis.test.ts
@@ -0,0 +1,107 @@
+import { Abilities } from "#enums/abilities";
+import { Moves } from "#enums/moves";
+import { Nature } from "#enums/nature";
+import { Species } from "#enums/species";
+import { Stat } from "#enums/stat";
+import GameManager from "#test/testUtils/gameManager";
+import Phaser from "phaser";
+import { BattlerIndex } from "#app/battle";
+import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
+
+describe("Abilities - Protosynthesis", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+    game.override
+      .moveset([Moves.SPLASH, Moves.TACKLE])
+      .ability(Abilities.PROTOSYNTHESIS)
+      .battleStyle("single")
+      .disableCrits()
+      .enemySpecies(Species.MAGIKARP)
+      .enemyAbility(Abilities.BALL_FETCH)
+      .enemyMoveset(Moves.SPLASH);
+  });
+
+  it("should not consider temporary items when determining which stat to boost", async () => {
+    // Mew has uniform base stats
+    game.override
+      .startingModifier([{ name: "TEMP_STAT_STAGE_BOOSTER", type: Stat.DEF }])
+      .enemyMoveset(Moves.SUNNY_DAY)
+      .startingLevel(100)
+      .enemyLevel(100);
+    await game.classicMode.startBattle([Species.MEW]);
+    const mew = game.scene.getPlayerPokemon()!;
+    // Nature of starting mon is randomized. We need to fix it to a neutral nature for the automated test.
+    mew.setNature(Nature.HARDY);
+    const enemy = game.scene.getEnemyPokemon()!;
+    const def_before_boost = mew.getEffectiveStat(
+      Stat.DEF,
+      undefined,
+      undefined,
+      false,
+      undefined,
+      undefined,
+      false,
+      false,
+      true,
+    );
+    const atk_before_boost = mew.getEffectiveStat(
+      Stat.ATK,
+      undefined,
+      undefined,
+      false,
+      undefined,
+      undefined,
+      false,
+      false,
+      true,
+    );
+    const initialHp = enemy.hp;
+    game.move.select(Moves.TACKLE);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
+    await game.toNextTurn();
+    const unboosted_dmg = initialHp - enemy.hp;
+    enemy.hp = initialHp;
+    const def_after_boost = mew.getEffectiveStat(
+      Stat.DEF,
+      undefined,
+      undefined,
+      false,
+      undefined,
+      undefined,
+      false,
+      false,
+      true,
+    );
+    const atk_after_boost = mew.getEffectiveStat(
+      Stat.ATK,
+      undefined,
+      undefined,
+      false,
+      undefined,
+      undefined,
+      false,
+      false,
+      true,
+    );
+    game.move.select(Moves.TACKLE);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
+    await game.toNextTurn();
+    const boosted_dmg = initialHp - enemy.hp;
+    expect(boosted_dmg).toBeGreaterThan(unboosted_dmg);
+    expect(def_after_boost).toEqual(def_before_boost);
+    expect(atk_after_boost).toBeGreaterThan(atk_before_boost);
+  });
+});
diff --git a/src/test/abilities/quick_draw.test.ts b/test/abilities/quick_draw.test.ts
similarity index 61%
rename from src/test/abilities/quick_draw.test.ts
rename to test/abilities/quick_draw.test.ts
index 4979152f4d6..79a29b0ce77 100644
--- a/src/test/abilities/quick_draw.test.ts
+++ b/test/abilities/quick_draw.test.ts
@@ -1,9 +1,10 @@
-import { allAbilities, BypassSpeedChanceAbAttr } from "#app/data/ability";
+import { BypassSpeedChanceAbAttr } from "#app/data/abilities/ability";
+import { allAbilities } from "#app/data/data-lists";
 import { FaintPhase } from "#app/phases/faint-phase";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, test, vi } from "vitest";
 
@@ -23,18 +24,20 @@ describe("Abilities - Quick Draw", () => {
 
   beforeEach(() => {
     game = new GameManager(phaserGame);
-    game.override.battleType("single");
+    game.override.battleStyle("single");
 
     game.override.starterSpecies(Species.MAGIKARP);
     game.override.ability(Abilities.QUICK_DRAW);
-    game.override.moveset([ Moves.TACKLE, Moves.TAIL_WHIP ]);
+    game.override.moveset([Moves.TACKLE, Moves.TAIL_WHIP]);
 
     game.override.enemyLevel(100);
     game.override.enemySpecies(Species.MAGIKARP);
     game.override.enemyAbility(Abilities.BALL_FETCH);
-    game.override.enemyMoveset([ Moves.TACKLE ]);
+    game.override.enemyMoveset([Moves.TACKLE]);
 
-    vi.spyOn(allAbilities[Abilities.QUICK_DRAW].getAttrs(BypassSpeedChanceAbAttr)[0], "chance", "get").mockReturnValue(100);
+    vi.spyOn(allAbilities[Abilities.QUICK_DRAW].getAttrs(BypassSpeedChanceAbAttr)[0], "chance", "get").mockReturnValue(
+      100,
+    );
   });
 
   test("makes pokemon going first in its priority bracket", async () => {
@@ -51,31 +54,34 @@ describe("Abilities - Quick Draw", () => {
 
     expect(pokemon.isFainted()).toBe(false);
     expect(enemy.isFainted()).toBe(true);
-    expect(pokemon.battleData.abilitiesApplied).contain(Abilities.QUICK_DRAW);
+    expect(pokemon.waveData.abilitiesApplied).contain(Abilities.QUICK_DRAW);
   }, 20000);
 
-  test("does not triggered by non damage moves", {
-    retry: 5
-  }, async () => {
-    await game.startBattle();
+  test(
+    "does not triggered by non damage moves",
+    {
+      retry: 5,
+    },
+    async () => {
+      await game.startBattle();
 
-    const pokemon = game.scene.getPlayerPokemon()!;
-    const enemy = game.scene.getEnemyPokemon()!;
+      const pokemon = game.scene.getPlayerPokemon()!;
+      const enemy = game.scene.getEnemyPokemon()!;
 
-    pokemon.hp = 1;
-    enemy.hp = 1;
+      pokemon.hp = 1;
+      enemy.hp = 1;
 
-    game.move.select(Moves.TAIL_WHIP);
-    await game.phaseInterceptor.to(FaintPhase, false);
+      game.move.select(Moves.TAIL_WHIP);
+      await game.phaseInterceptor.to(FaintPhase, false);
 
-    expect(pokemon.isFainted()).toBe(true);
-    expect(enemy.isFainted()).toBe(false);
-    expect(pokemon.battleData.abilitiesApplied).not.contain(Abilities.QUICK_DRAW);
-  }
+      expect(pokemon.isFainted()).toBe(true);
+      expect(enemy.isFainted()).toBe(false);
+      expect(pokemon.waveData.abilitiesApplied).not.contain(Abilities.QUICK_DRAW);
+    },
   );
 
   test("does not increase priority", async () => {
-    game.override.enemyMoveset([ Moves.EXTREME_SPEED ]);
+    game.override.enemyMoveset([Moves.EXTREME_SPEED]);
 
     await game.startBattle();
 
@@ -90,6 +96,6 @@ describe("Abilities - Quick Draw", () => {
 
     expect(pokemon.isFainted()).toBe(true);
     expect(enemy.isFainted()).toBe(false);
-    expect(pokemon.battleData.abilitiesApplied).contain(Abilities.QUICK_DRAW);
+    expect(pokemon.waveData.abilitiesApplied).contain(Abilities.QUICK_DRAW);
   }, 20000);
 });
diff --git a/src/test/abilities/sand_spit.test.ts b/test/abilities/sand_spit.test.ts
similarity index 64%
rename from src/test/abilities/sand_spit.test.ts
rename to test/abilities/sand_spit.test.ts
index 1c21cff3c14..2b655f92466 100644
--- a/src/test/abilities/sand_spit.test.ts
+++ b/test/abilities/sand_spit.test.ts
@@ -2,11 +2,10 @@ import { WeatherType } from "#app/enums/weather-type";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
-
 describe("Abilities - Sand Spit", () => {
   let phaserGame: Phaser.Game;
   let game: GameManager;
@@ -23,7 +22,7 @@ describe("Abilities - Sand Spit", () => {
 
   beforeEach(() => {
     game = new GameManager(phaserGame);
-    game.override.battleType("single");
+    game.override.battleStyle("single");
     game.override.disableCrits();
 
     game.override.enemySpecies(Species.MAGIKARP);
@@ -31,12 +30,12 @@ describe("Abilities - Sand Spit", () => {
 
     game.override.starterSpecies(Species.SILICOBRA);
     game.override.ability(Abilities.SAND_SPIT);
-    game.override.moveset([ Moves.SPLASH, Moves.COIL ]);
+    game.override.moveset([Moves.SPLASH, Moves.COIL]);
   });
 
   it("should trigger when hit with damaging move", async () => {
-    game.override.enemyMoveset([ Moves.TACKLE ]);
-    await game.startBattle();
+    game.override.enemyMoveset([Moves.TACKLE]);
+    await game.classicMode.startBattle();
 
     game.move.select(Moves.SPLASH);
     await game.toNextTurn();
@@ -44,9 +43,20 @@ describe("Abilities - Sand Spit", () => {
     expect(game.scene.arena.weather?.weatherType).toBe(WeatherType.SANDSTORM);
   }, 20000);
 
+  it("should trigger even when fainting", async () => {
+    game.override.enemyMoveset([Moves.TACKLE]).enemyLevel(100).startingLevel(1);
+    await game.classicMode.startBattle([Species.SILICOBRA, Species.MAGIKARP]);
+
+    game.move.select(Moves.SPLASH);
+    game.doSelectPartyPokemon(1);
+    await game.toNextTurn();
+
+    expect(game.scene.arena.weather?.weatherType).toBe(WeatherType.SANDSTORM);
+  });
+
   it("should not trigger when targetted with status moves", async () => {
-    game.override.enemyMoveset([ Moves.GROWL ]);
-    await game.startBattle();
+    game.override.enemyMoveset([Moves.GROWL]);
+    await game.classicMode.startBattle();
 
     game.move.select(Moves.COIL);
     await game.toNextTurn();
diff --git a/test/abilities/sand_veil.test.ts b/test/abilities/sand_veil.test.ts
new file mode 100644
index 00000000000..b82c79c681b
--- /dev/null
+++ b/test/abilities/sand_veil.test.ts
@@ -0,0 +1,74 @@
+import { StatMultiplierAbAttr } from "#app/data/abilities/ability";
+import { allAbilities } from "#app/data/data-lists";
+import { CommandPhase } from "#app/phases/command-phase";
+import { MoveEffectPhase } from "#app/phases/move-effect-phase";
+import { MoveEndPhase } from "#app/phases/move-end-phase";
+import { Abilities } from "#enums/abilities";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import { Stat } from "#enums/stat";
+import { WeatherType } from "#enums/weather-type";
+import GameManager from "#test/testUtils/gameManager";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, test, vi } from "vitest";
+
+describe("Abilities - Sand Veil", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+    game.override.moveset([Moves.SPLASH]);
+    game.override.enemySpecies(Species.MEOWSCARADA);
+    game.override.enemyAbility(Abilities.INSOMNIA);
+    game.override.enemyMoveset([Moves.TWISTER, Moves.TWISTER, Moves.TWISTER, Moves.TWISTER]);
+    game.override.startingLevel(100);
+    game.override.enemyLevel(100);
+    game.override.weather(WeatherType.SANDSTORM).battleStyle("double");
+  });
+
+  test("ability should increase the evasiveness of the source", async () => {
+    await game.startBattle([Species.SNORLAX, Species.BLISSEY]);
+
+    const leadPokemon = game.scene.getPlayerField();
+
+    vi.spyOn(leadPokemon[0], "getAbility").mockReturnValue(allAbilities[Abilities.SAND_VEIL]);
+
+    const sandVeilAttr = allAbilities[Abilities.SAND_VEIL].getAttrs(StatMultiplierAbAttr)[0];
+    vi.spyOn(sandVeilAttr, "applyStatStage").mockImplementation(
+      (_pokemon, _passive, _simulated, stat, statValue, _args) => {
+        if (stat === Stat.EVA && game.scene.arena.weather?.weatherType === WeatherType.SANDSTORM) {
+          statValue.value *= -1; // will make all attacks miss
+          return true;
+        }
+        return false;
+      },
+    );
+
+    expect(leadPokemon[0].hasAbility(Abilities.SAND_VEIL)).toBe(true);
+    expect(leadPokemon[1].hasAbility(Abilities.SAND_VEIL)).toBe(false);
+
+    game.move.select(Moves.SPLASH);
+
+    await game.phaseInterceptor.to(CommandPhase);
+
+    game.move.select(Moves.SPLASH, 1);
+
+    await game.phaseInterceptor.to(MoveEffectPhase, false);
+
+    await game.phaseInterceptor.to(MoveEndPhase, false);
+
+    expect(leadPokemon[0].isFullHp()).toBe(true);
+    expect(leadPokemon[1].hp).toBeLessThan(leadPokemon[1].getMaxHp());
+  });
+});
diff --git a/src/test/abilities/sap_sipper.test.ts b/test/abilities/sap_sipper.test.ts
similarity index 86%
rename from src/test/abilities/sap_sipper.test.ts
rename to test/abilities/sap_sipper.test.ts
index dc254a54b54..2157177b84c 100644
--- a/src/test/abilities/sap_sipper.test.ts
+++ b/test/abilities/sap_sipper.test.ts
@@ -6,10 +6,10 @@ import { Abilities } from "#enums/abilities";
 import { BattlerTagType } from "#enums/battler-tag-type";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
-import { allMoves, RandomMoveAttr } from "#app/data/move";
+import { allMoves, RandomMoveAttr } from "#app/data/moves/move";
 
 // See also: TypeImmunityAbAttr
 describe("Abilities - Sap Sipper", () => {
@@ -28,7 +28,8 @@ describe("Abilities - Sap Sipper", () => {
 
   beforeEach(() => {
     game = new GameManager(phaserGame);
-    game.override.battleType("single")
+    game.override
+      .battleStyle("single")
       .disableCrits()
       .ability(Abilities.SAP_SIPPER)
       .enemySpecies(Species.RATTATA)
@@ -36,12 +37,12 @@ describe("Abilities - Sap Sipper", () => {
       .enemyMoveset(Moves.SPLASH);
   });
 
-  it("raises ATK stat stage by 1 and block effects when activated against a grass attack", async() => {
+  it("raises ATK stat stage by 1 and block effects when activated against a grass attack", async () => {
     const moveToUse = Moves.LEAFAGE;
 
     game.override.moveset(moveToUse);
 
-    await game.classicMode.startBattle([ Species.BULBASAUR ]);
+    await game.classicMode.startBattle([Species.BULBASAUR]);
 
     const enemyPokemon = game.scene.getEnemyPokemon()!;
     const initialEnemyHp = enemyPokemon.hp;
@@ -54,12 +55,12 @@ describe("Abilities - Sap Sipper", () => {
     expect(enemyPokemon.getStatStage(Stat.ATK)).toBe(1);
   });
 
-  it("raises ATK stat stage by 1 and block effects when activated against a grass status move", async() => {
+  it("raises ATK stat stage by 1 and block effects when activated against a grass status move", async () => {
     const moveToUse = Moves.SPORE;
 
     game.override.moveset(moveToUse);
 
-    await game.classicMode.startBattle([ Species.BULBASAUR ]);
+    await game.classicMode.startBattle([Species.BULBASAUR]);
 
     const enemyPokemon = game.scene.getEnemyPokemon()!;
 
@@ -76,7 +77,7 @@ describe("Abilities - Sap Sipper", () => {
 
     game.override.moveset(moveToUse);
 
-    await game.classicMode.startBattle([ Species.BULBASAUR ]);
+    await game.classicMode.startBattle([Species.BULBASAUR]);
 
     game.move.select(moveToUse);
 
@@ -92,7 +93,7 @@ describe("Abilities - Sap Sipper", () => {
 
     game.override.moveset(moveToUse);
 
-    await game.classicMode.startBattle([ Species.BULBASAUR ]);
+    await game.classicMode.startBattle([Species.BULBASAUR]);
 
     const enemyPokemon = game.scene.getEnemyPokemon()!;
     const initialEnemyHp = enemyPokemon.hp;
@@ -110,7 +111,7 @@ describe("Abilities - Sap Sipper", () => {
 
     game.override.moveset(moveToUse);
 
-    await game.classicMode.startBattle([ Species.BULBASAUR ]);
+    await game.classicMode.startBattle([Species.BULBASAUR]);
 
     const playerPokemon = game.scene.getPlayerPokemon()!;
 
@@ -134,7 +135,7 @@ describe("Abilities - Sap Sipper", () => {
 
     game.override.moveset(moveToUse);
 
-    await game.classicMode.startBattle([ Species.BULBASAUR ]);
+    await game.classicMode.startBattle([Species.BULBASAUR]);
 
     const enemyPokemon = game.scene.getEnemyPokemon()!;
     const initialEnemyHp = enemyPokemon.hp;
@@ -150,7 +151,7 @@ describe("Abilities - Sap Sipper", () => {
   it("still activates regardless of accuracy check", async () => {
     game.override.moveset(Moves.LEAF_BLADE);
 
-    await game.classicMode.startBattle([ Species.BULBASAUR ]);
+    await game.classicMode.startBattle([Species.BULBASAUR]);
 
     const enemyPokemon = game.scene.getEnemyPokemon()!;
 
diff --git a/test/abilities/schooling.test.ts b/test/abilities/schooling.test.ts
new file mode 100644
index 00000000000..803b4d2062a
--- /dev/null
+++ b/test/abilities/schooling.test.ts
@@ -0,0 +1,60 @@
+import { Status } from "#app/data/status-effect";
+import { QuietFormChangePhase } from "#app/phases/quiet-form-change-phase";
+import { TurnEndPhase } from "#app/phases/turn-end-phase";
+import { Abilities } from "#enums/abilities";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import { StatusEffect } from "#enums/status-effect";
+import GameManager from "#test/testUtils/gameManager";
+import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest";
+
+describe("Abilities - SCHOOLING", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+    const moveToUse = Moves.SPLASH;
+    game.override.battleStyle("single");
+    game.override.ability(Abilities.SCHOOLING);
+    game.override.moveset([moveToUse]);
+    game.override.enemyMoveset([Moves.TACKLE, Moves.TACKLE, Moves.TACKLE, Moves.TACKLE]);
+  });
+
+  test("check if fainted pokemon switches to base form on arena reset", async () => {
+    const soloForm = 0,
+      schoolForm = 1;
+    game.override.startingWave(4);
+    game.override.starterForms({
+      [Species.WISHIWASHI]: schoolForm,
+    });
+
+    await game.startBattle([Species.MAGIKARP, Species.WISHIWASHI]);
+
+    const wishiwashi = game.scene.getPlayerParty().find(p => p.species.speciesId === Species.WISHIWASHI)!;
+    expect(wishiwashi).not.toBe(undefined);
+    expect(wishiwashi.formIndex).toBe(schoolForm);
+
+    wishiwashi.hp = 0;
+    wishiwashi.status = new Status(StatusEffect.FAINT);
+    expect(wishiwashi.isFainted()).toBe(true);
+
+    game.move.select(Moves.SPLASH);
+    await game.doKillOpponents();
+    await game.phaseInterceptor.to(TurnEndPhase);
+    game.doSelectModifier();
+    await game.phaseInterceptor.to(QuietFormChangePhase);
+
+    expect(wishiwashi.formIndex).toBe(soloForm);
+  });
+});
diff --git a/src/test/abilities/screen_cleaner.test.ts b/test/abilities/screen_cleaner.test.ts
similarity index 75%
rename from src/test/abilities/screen_cleaner.test.ts
rename to test/abilities/screen_cleaner.test.ts
index c036aa90a77..840291f6420 100644
--- a/src/test/abilities/screen_cleaner.test.ts
+++ b/test/abilities/screen_cleaner.test.ts
@@ -4,7 +4,7 @@ import { TurnEndPhase } from "#app/phases/turn-end-phase";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
@@ -24,16 +24,16 @@ describe("Abilities - Screen Cleaner", () => {
 
   beforeEach(() => {
     game = new GameManager(phaserGame);
-    game.override.battleType("single");
+    game.override.battleStyle("single");
     game.override.ability(Abilities.SCREEN_CLEANER);
     game.override.enemySpecies(Species.SHUCKLE);
   });
 
   it("removes Aurora Veil", async () => {
-    game.override.moveset([ Moves.HAIL ]);
-    game.override.enemyMoveset([ Moves.AURORA_VEIL, Moves.AURORA_VEIL, Moves.AURORA_VEIL, Moves.AURORA_VEIL ]);
+    game.override.moveset([Moves.HAIL]);
+    game.override.enemyMoveset([Moves.AURORA_VEIL, Moves.AURORA_VEIL, Moves.AURORA_VEIL, Moves.AURORA_VEIL]);
 
-    await game.startBattle([ Species.MAGIKARP, Species.MAGIKARP ]);
+    await game.startBattle([Species.MAGIKARP, Species.MAGIKARP]);
 
     game.move.select(Moves.HAIL);
     await game.phaseInterceptor.to(TurnEndPhase);
@@ -48,9 +48,9 @@ describe("Abilities - Screen Cleaner", () => {
   });
 
   it("removes Light Screen", async () => {
-    game.override.enemyMoveset([ Moves.LIGHT_SCREEN, Moves.LIGHT_SCREEN, Moves.LIGHT_SCREEN, Moves.LIGHT_SCREEN ]);
+    game.override.enemyMoveset([Moves.LIGHT_SCREEN, Moves.LIGHT_SCREEN, Moves.LIGHT_SCREEN, Moves.LIGHT_SCREEN]);
 
-    await game.startBattle([ Species.MAGIKARP, Species.MAGIKARP ]);
+    await game.startBattle([Species.MAGIKARP, Species.MAGIKARP]);
 
     game.move.select(Moves.SPLASH);
     await game.phaseInterceptor.to(TurnEndPhase);
@@ -65,9 +65,9 @@ describe("Abilities - Screen Cleaner", () => {
   });
 
   it("removes Reflect", async () => {
-    game.override.enemyMoveset([ Moves.REFLECT, Moves.REFLECT, Moves.REFLECT, Moves.REFLECT ]);
+    game.override.enemyMoveset([Moves.REFLECT, Moves.REFLECT, Moves.REFLECT, Moves.REFLECT]);
 
-    await game.startBattle([ Species.MAGIKARP, Species.MAGIKARP ]);
+    await game.startBattle([Species.MAGIKARP, Species.MAGIKARP]);
 
     game.move.select(Moves.SPLASH);
     await game.phaseInterceptor.to(TurnEndPhase);
diff --git a/test/abilities/seed_sower.test.ts b/test/abilities/seed_sower.test.ts
new file mode 100644
index 00000000000..d8edbe59857
--- /dev/null
+++ b/test/abilities/seed_sower.test.ts
@@ -0,0 +1,66 @@
+import { TerrainType } from "#app/data/terrain";
+import { Abilities } from "#enums/abilities";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import GameManager from "#test/testUtils/gameManager";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
+
+describe("Abilities - Seed Sower", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+    game.override.battleStyle("single");
+    game.override.disableCrits();
+
+    game.override.enemySpecies(Species.MAGIKARP);
+    game.override.enemyAbility(Abilities.BALL_FETCH);
+
+    game.override.starterSpecies(Species.ARBOLIVA);
+    game.override.ability(Abilities.SEED_SOWER);
+    game.override.moveset([Moves.SPLASH]);
+  });
+
+  it("should trigger when hit with damaging move", async () => {
+    game.override.enemyMoveset([Moves.TACKLE]);
+    await game.classicMode.startBattle();
+
+    game.move.select(Moves.SPLASH);
+    await game.toNextTurn();
+
+    expect(game.scene.arena.terrain?.terrainType).toBe(TerrainType.GRASSY);
+  });
+
+  it("should trigger even when fainting", async () => {
+    game.override.enemyMoveset([Moves.TACKLE]).enemyLevel(100).startingLevel(1);
+    await game.classicMode.startBattle([Species.ARBOLIVA, Species.MAGIKARP]);
+
+    game.move.select(Moves.SPLASH);
+    game.doSelectPartyPokemon(1);
+    await game.toNextTurn();
+
+    expect(game.scene.arena.terrain?.terrainType).toBe(TerrainType.GRASSY);
+  });
+
+  it("should not trigger when targetted with status moves", async () => {
+    game.override.enemyMoveset([Moves.GROWL]);
+    await game.classicMode.startBattle();
+
+    game.move.select(Moves.SPLASH);
+    await game.toNextTurn();
+
+    expect(game.scene.arena.terrain?.terrainType).not.toBe(TerrainType.GRASSY);
+  });
+});
diff --git a/src/test/abilities/serene_grace.test.ts b/test/abilities/serene_grace.test.ts
similarity index 76%
rename from src/test/abilities/serene_grace.test.ts
rename to test/abilities/serene_grace.test.ts
index 6f9b2195a9c..2547971a4b8 100644
--- a/src/test/abilities/serene_grace.test.ts
+++ b/test/abilities/serene_grace.test.ts
@@ -2,11 +2,11 @@ import { BattlerIndex } from "#app/battle";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
-import { allMoves } from "#app/data/move";
+import { allMoves } from "#app/data/moves/move";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
-import { FlinchAttr } from "#app/data/move";
+import { FlinchAttr } from "#app/data/moves/move";
 
 describe("Abilities - Serene Grace", () => {
   let phaserGame: Phaser.Game;
@@ -26,24 +26,24 @@ describe("Abilities - Serene Grace", () => {
     game = new GameManager(phaserGame);
     game.override
       .disableCrits()
-      .battleType("single")
+      .battleStyle("single")
       .ability(Abilities.SERENE_GRACE)
-      .moveset([ Moves.AIR_SLASH ])
+      .moveset([Moves.AIR_SLASH])
       .enemySpecies(Species.ALOLA_GEODUDE)
       .enemyLevel(10)
       .enemyAbility(Abilities.BALL_FETCH)
-      .enemyMoveset([ Moves.SPLASH ]);
+      .enemyMoveset([Moves.SPLASH]);
   });
 
   it("Serene Grace should double the secondary effect chance of a move", async () => {
-    await game.classicMode.startBattle([ Species.SHUCKLE ]);
+    await game.classicMode.startBattle([Species.SHUCKLE]);
 
     const airSlashMove = allMoves[Moves.AIR_SLASH];
     const airSlashFlinchAttr = airSlashMove.getAttrs(FlinchAttr)[0];
     vi.spyOn(airSlashFlinchAttr, "getMoveChance");
 
     game.move.select(Moves.AIR_SLASH);
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
     await game.move.forceHit();
     await game.phaseInterceptor.to("BerryPhase");
 
diff --git a/src/test/abilities/sheer_force.test.ts b/test/abilities/sheer_force.test.ts
similarity index 75%
rename from src/test/abilities/sheer_force.test.ts
rename to test/abilities/sheer_force.test.ts
index a0ddf5bb9c6..ce3232a1869 100644
--- a/src/test/abilities/sheer_force.test.ts
+++ b/test/abilities/sheer_force.test.ts
@@ -1,13 +1,13 @@
 import { BattlerIndex } from "#app/battle";
-import { Type } from "#app/enums/type";
+import { PokemonType } from "#enums/pokemon-type";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { Stat } from "#enums/stat";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
-import { allMoves, FlinchAttr } from "#app/data/move";
+import { allMoves, FlinchAttr } from "#app/data/moves/move";
 
 describe("Abilities - Sheer Force", () => {
   let phaserGame: Phaser.Game;
@@ -26,19 +26,19 @@ describe("Abilities - Sheer Force", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     game.override
-      .battleType("single")
+      .battleStyle("single")
       .ability(Abilities.SHEER_FORCE)
       .enemySpecies(Species.ONIX)
       .enemyAbility(Abilities.BALL_FETCH)
-      .enemyMoveset([ Moves.SPLASH ])
+      .enemyMoveset([Moves.SPLASH])
       .disableCrits();
   });
 
-  const SHEER_FORCE_MULT = 5461 / 4096;
+  const SHEER_FORCE_MULT = 1.3;
 
   it("Sheer Force should boost the power of the move but disable secondary effects", async () => {
-    game.override.moveset([ Moves.AIR_SLASH ]);
-    await game.classicMode.startBattle([ Species.SHUCKLE ]);
+    game.override.moveset([Moves.AIR_SLASH]);
+    await game.classicMode.startBattle([Species.SHUCKLE]);
 
     const airSlashMove = allMoves[Moves.AIR_SLASH];
     vi.spyOn(airSlashMove, "calculateBattlePower");
@@ -47,7 +47,7 @@ describe("Abilities - Sheer Force", () => {
 
     game.move.select(Moves.AIR_SLASH);
 
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
     await game.move.forceHit();
     await game.phaseInterceptor.to("BerryPhase", false);
 
@@ -56,15 +56,15 @@ describe("Abilities - Sheer Force", () => {
   });
 
   it("Sheer Force does not affect the base damage or secondary effects of binding moves", async () => {
-    game.override.moveset([ Moves.BIND ]);
-    await game.classicMode.startBattle([ Species.SHUCKLE ]);
+    game.override.moveset([Moves.BIND]);
+    await game.classicMode.startBattle([Species.SHUCKLE]);
 
     const bindMove = allMoves[Moves.BIND];
     vi.spyOn(bindMove, "calculateBattlePower");
 
     game.move.select(Moves.BIND);
 
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
     await game.move.forceHit();
     await game.phaseInterceptor.to("BerryPhase", false);
 
@@ -72,14 +72,14 @@ describe("Abilities - Sheer Force", () => {
   }, 20000);
 
   it("Sheer Force does not boost the base damage of moves with no secondary effect", async () => {
-    game.override.moveset([ Moves.TACKLE ]);
-    await game.classicMode.startBattle([ Species.PIDGEOT ]);
+    game.override.moveset([Moves.TACKLE]);
+    await game.classicMode.startBattle([Species.PIDGEOT]);
 
     const tackleMove = allMoves[Moves.TACKLE];
     vi.spyOn(tackleMove, "calculateBattlePower");
 
     game.move.select(Moves.TACKLE);
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
     await game.move.forceHit();
     await game.phaseInterceptor.to("BerryPhase", false);
 
@@ -88,12 +88,12 @@ describe("Abilities - Sheer Force", () => {
 
   it("Sheer Force can disable the on-hit activation of specific abilities", async () => {
     game.override
-      .moveset([ Moves.HEADBUTT ])
+      .moveset([Moves.HEADBUTT])
       .enemySpecies(Species.SQUIRTLE)
       .enemyLevel(10)
       .enemyAbility(Abilities.COLOR_CHANGE);
 
-    await game.classicMode.startBattle([ Species.PIDGEOT ]);
+    await game.classicMode.startBattle([Species.PIDGEOT]);
     const enemyPokemon = game.scene.getEnemyPokemon();
     const headbuttMove = allMoves[Moves.HEADBUTT];
     vi.spyOn(headbuttMove, "calculateBattlePower");
@@ -102,25 +102,24 @@ describe("Abilities - Sheer Force", () => {
 
     game.move.select(Moves.HEADBUTT);
 
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
     await game.move.forceHit();
     await game.phaseInterceptor.to("BerryPhase", false);
 
-    expect(enemyPokemon?.getTypes()[0]).toBe(Type.WATER);
+    expect(enemyPokemon?.getTypes()[0]).toBe(PokemonType.WATER);
     expect(headbuttMove.calculateBattlePower).toHaveLastReturnedWith(headbuttMove.power * SHEER_FORCE_MULT);
     expect(headbuttFlinchAttr.getMoveChance).toHaveLastReturnedWith(0);
   });
 
   it("Two Pokemon with abilities disabled by Sheer Force hitting each other should not cause a crash", async () => {
     const moveToUse = Moves.CRUNCH;
-    game.override.enemyAbility(Abilities.COLOR_CHANGE)
+    game.override
+      .enemyAbility(Abilities.COLOR_CHANGE)
       .ability(Abilities.COLOR_CHANGE)
       .moveset(moveToUse)
       .enemyMoveset(moveToUse);
 
-    await game.classicMode.startBattle([
-      Species.PIDGEOT
-    ]);
+    await game.classicMode.startBattle([Species.PIDGEOT]);
 
     const pidgeot = game.scene.getPlayerParty()[0];
     const onix = game.scene.getEnemyParty()[0];
@@ -132,7 +131,7 @@ describe("Abilities - Sheer Force", () => {
     await game.toNextTurn();
 
     // Check that both Pokemon's Color Change activated
-    const expectedTypes = [ allMoves[moveToUse].type ];
+    const expectedTypes = [allMoves[moveToUse].type];
     expect(pidgeot.getTypes()).toStrictEqual(expectedTypes);
     expect(onix.getTypes()).toStrictEqual(expectedTypes);
   });
@@ -140,10 +139,10 @@ describe("Abilities - Sheer Force", () => {
   it("Sheer Force should disable Meloetta's transformation from Relic Song", async () => {
     game.override
       .ability(Abilities.SHEER_FORCE)
-      .moveset([ Moves.RELIC_SONG ])
-      .enemyMoveset([ Moves.SPLASH ])
+      .moveset([Moves.RELIC_SONG])
+      .enemyMoveset([Moves.SPLASH])
       .enemyLevel(100);
-    await game.classicMode.startBattle([ Species.MELOETTA ]);
+    await game.classicMode.startBattle([Species.MELOETTA]);
 
     const playerPokemon = game.scene.getPlayerPokemon();
     const formKeyStart = playerPokemon?.getFormKey();
diff --git a/src/test/abilities/shield_dust.test.ts b/test/abilities/shield_dust.test.ts
similarity index 63%
rename from src/test/abilities/shield_dust.test.ts
rename to test/abilities/shield_dust.test.ts
index 9f1e6aeb11d..4ab58e8c2a6 100644
--- a/src/test/abilities/shield_dust.test.ts
+++ b/test/abilities/shield_dust.test.ts
@@ -1,16 +1,20 @@
 import { BattlerIndex } from "#app/battle";
-import { applyAbAttrs, applyPreDefendAbAttrs, IgnoreMoveEffectsAbAttr, MoveEffectChanceMultiplierAbAttr } from "#app/data/ability";
+import {
+  applyAbAttrs,
+  applyPreDefendAbAttrs,
+  IgnoreMoveEffectsAbAttr,
+  MoveEffectChanceMultiplierAbAttr,
+} from "#app/data/abilities/ability";
 import { MoveEffectPhase } from "#app/phases/move-effect-phase";
-import { NumberHolder } from "#app/utils";
+import { NumberHolder } from "#app/utils/common";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { Stat } from "#enums/stat";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
-
 describe("Abilities - Shield Dust", () => {
   let phaserGame: Phaser.Game;
   let game: GameManager;
@@ -27,7 +31,7 @@ describe("Abilities - Shield Dust", () => {
 
   beforeEach(() => {
     game = new GameManager(phaserGame);
-    game.override.battleType("single");
+    game.override.battleStyle("single");
     game.override.enemySpecies(Species.ONIX);
     game.override.enemyAbility(Abilities.SHIELD_DUST);
     game.override.startingLevel(100);
@@ -36,28 +40,43 @@ describe("Abilities - Shield Dust", () => {
   });
 
   it("Shield Dust", async () => {
-    await game.classicMode.startBattle([ Species.PIDGEOT ]);
-
+    await game.classicMode.startBattle([Species.PIDGEOT]);
 
     game.scene.getEnemyPokemon()!.stats[Stat.SPDEF] = 10000;
     expect(game.scene.getPlayerPokemon()!.formIndex).toBe(0);
 
     game.move.select(Moves.AIR_SLASH);
 
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
     await game.phaseInterceptor.to(MoveEffectPhase, false);
 
     // Shield Dust negates secondary effect
     const phase = game.scene.getCurrentPhase() as MoveEffectPhase;
-    const move = phase.move.getMove();
+    const move = phase.move;
     expect(move.id).toBe(Moves.AIR_SLASH);
 
     const chance = new NumberHolder(move.chance);
-    applyAbAttrs(MoveEffectChanceMultiplierAbAttr, phase.getUserPokemon()!, null, false, chance, move, phase.getFirstTarget(), false);
-    applyPreDefendAbAttrs(IgnoreMoveEffectsAbAttr, phase.getFirstTarget()!, phase.getUserPokemon()!, null, null, false, chance);
+    await applyAbAttrs(
+      MoveEffectChanceMultiplierAbAttr,
+      phase.getUserPokemon()!,
+      null,
+      false,
+      chance,
+      move,
+      phase.getFirstTarget(),
+      false,
+    );
+    await applyPreDefendAbAttrs(
+      IgnoreMoveEffectsAbAttr,
+      phase.getFirstTarget()!,
+      phase.getUserPokemon()!,
+      null,
+      null,
+      false,
+      chance,
+    );
     expect(chance.value).toBe(0);
-
-  }, 20000);
+  });
 
   //TODO King's Rock Interaction Unit Test
 });
diff --git a/test/abilities/shields_down.test.ts b/test/abilities/shields_down.test.ts
new file mode 100644
index 00000000000..2f9d2fb1f97
--- /dev/null
+++ b/test/abilities/shields_down.test.ts
@@ -0,0 +1,185 @@
+import { Status } from "#app/data/status-effect";
+import { BattlerTagType } from "#app/enums/battler-tag-type";
+import { QuietFormChangePhase } from "#app/phases/quiet-form-change-phase";
+import { TurnEndPhase } from "#app/phases/turn-end-phase";
+import { Abilities } from "#enums/abilities";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import { StatusEffect } from "#enums/status-effect";
+import GameManager from "#test/testUtils/gameManager";
+import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest";
+
+describe("Abilities - SHIELDS DOWN", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+    const moveToUse = Moves.SPLASH;
+    game.override.battleStyle("single");
+    game.override.ability(Abilities.SHIELDS_DOWN);
+    game.override.moveset([moveToUse]);
+    game.override.enemyMoveset([Moves.TACKLE]);
+  });
+
+  test("check if fainted pokemon switched to base form on arena reset", async () => {
+    const meteorForm = 0,
+      coreForm = 7;
+    game.override.startingWave(4);
+    game.override.starterForms({
+      [Species.MINIOR]: coreForm,
+    });
+
+    await game.classicMode.startBattle([Species.MAGIKARP, Species.MINIOR]);
+
+    const minior = game.scene.getPlayerParty().find(p => p.species.speciesId === Species.MINIOR)!;
+    expect(minior).not.toBe(undefined);
+    expect(minior.formIndex).toBe(coreForm);
+
+    minior.hp = 0;
+    minior.status = new Status(StatusEffect.FAINT);
+    expect(minior.isFainted()).toBe(true);
+
+    game.move.select(Moves.SPLASH);
+    await game.doKillOpponents();
+    await game.phaseInterceptor.to(TurnEndPhase);
+    game.doSelectModifier();
+    await game.phaseInterceptor.to(QuietFormChangePhase);
+
+    expect(minior.formIndex).toBe(meteorForm);
+  });
+
+  test("should ignore non-volatile status moves", async () => {
+    game.override.enemyMoveset([Moves.SPORE]);
+
+    await game.classicMode.startBattle([Species.MINIOR]);
+    game.move.select(Moves.SPLASH);
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    expect(game.scene.getPlayerPokemon()!.status).toBe(undefined);
+  });
+
+  test("should still ignore non-volatile status moves used by a pokemon with mold breaker", async () => {
+    game.override.enemyAbility(Abilities.MOLD_BREAKER);
+    game.override.enemyMoveset([Moves.SPORE]);
+
+    await game.classicMode.startBattle([Species.MINIOR]);
+
+    game.move.select(Moves.SPLASH);
+    await game.forceEnemyMove(Moves.SPORE);
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    expect(game.scene.getPlayerPokemon()!.status).toBe(undefined);
+  });
+
+  test("should ignore non-volatile secondary status effects", async () => {
+    game.override.enemyMoveset([Moves.NUZZLE]);
+
+    await game.classicMode.startBattle([Species.MINIOR]);
+
+    game.move.select(Moves.SPLASH);
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    expect(game.scene.getPlayerPokemon()!.status).toBe(undefined);
+  });
+
+  test("should ignore status moves even through mold breaker", async () => {
+    game.override.enemyMoveset([Moves.SPORE]);
+    game.override.enemyAbility(Abilities.MOLD_BREAKER);
+
+    await game.classicMode.startBattle([Species.MINIOR]);
+
+    game.move.select(Moves.SPLASH);
+
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    expect(game.scene.getPlayerPokemon()!.status).toBe(undefined);
+  });
+
+  // toxic spikes currently does not poison flying types when gravity is in effect
+  test.todo("should become poisoned by toxic spikes when grounded", async () => {
+    game.override.enemyMoveset([Moves.GRAVITY, Moves.TOXIC_SPIKES, Moves.SPLASH]);
+    game.override.moveset([Moves.GRAVITY, Moves.SPLASH]);
+
+    await game.classicMode.startBattle([Species.MAGIKARP, Species.MINIOR]);
+
+    // turn 1
+    game.move.select(Moves.GRAVITY);
+    await game.forceEnemyMove(Moves.TOXIC_SPIKES);
+    await game.toNextTurn();
+
+    // turn 2
+    game.doSwitchPokemon(1);
+    await game.forceEnemyMove(Moves.SPLASH);
+    await game.toNextTurn();
+
+    expect(game.scene.getPlayerPokemon()!.species.speciesId).toBe(Species.MINIOR);
+    expect(game.scene.getPlayerPokemon()!.species.formIndex).toBe(0);
+    expect(game.scene.getPlayerPokemon()!.status?.effect).toBe(StatusEffect.POISON);
+  });
+
+  test("should ignore yawn", async () => {
+    game.override.enemyMoveset([Moves.YAWN]);
+
+    await game.classicMode.startBattle([Species.MAGIKARP, Species.MINIOR]);
+
+    game.move.select(Moves.SPLASH);
+    await game.forceEnemyMove(Moves.YAWN);
+
+    await game.phaseInterceptor.to(TurnEndPhase);
+    expect(game.scene.getPlayerPokemon()!.findTag(tag => tag.tagType === BattlerTagType.DROWSY)).toBe(undefined);
+  });
+
+  test("should not ignore volatile status effects", async () => {
+    game.override.enemyMoveset([Moves.CONFUSE_RAY]);
+
+    await game.classicMode.startBattle([Species.MINIOR]);
+
+    game.move.select(Moves.SPLASH);
+    await game.forceEnemyMove(Moves.CONFUSE_RAY);
+
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    expect(game.scene.getPlayerPokemon()!.findTag(tag => tag.tagType === BattlerTagType.CONFUSED)).not.toBe(undefined);
+  });
+
+  // the `NoTransformAbilityAbAttr` attribute is not checked anywhere, so this test cannot pass.
+  test.todo("ditto should not be immune to status after transforming", async () => {
+    game.override.enemySpecies(Species.DITTO);
+    game.override.enemyAbility(Abilities.IMPOSTER);
+    game.override.moveset([Moves.SPLASH, Moves.SPORE]);
+
+    await game.classicMode.startBattle([Species.MINIOR]);
+
+    game.move.select(Moves.SPORE);
+    await game.forceEnemyMove(Moves.SPLASH);
+
+    await game.phaseInterceptor.to(TurnEndPhase);
+    expect(game.scene.getEnemyPokemon()!.status?.effect).toBe(StatusEffect.SLEEP);
+  });
+
+  test("should not prevent minior from receiving the fainted status effect in trainer battles", async () => {
+    game.override.enemyMoveset([Moves.TACKLE]);
+    game.override.moveset([Moves.THUNDERBOLT]);
+    game.override.startingLevel(100);
+    game.override.startingWave(5);
+    game.override.enemySpecies(Species.MINIOR);
+    await game.classicMode.startBattle([Species.REGIELEKI]);
+    const minior = game.scene.getEnemyPokemon()!;
+
+    game.move.select(Moves.THUNDERBOLT);
+    await game.toNextTurn();
+    expect(minior.isFainted()).toBe(true);
+    expect(minior.status?.effect).toBe(StatusEffect.FAINT);
+  });
+});
diff --git a/src/test/abilities/simple.test.ts b/test/abilities/simple.test.ts
similarity index 81%
rename from src/test/abilities/simple.test.ts
rename to test/abilities/simple.test.ts
index e5ca474d7c3..1f084b1bf4c 100644
--- a/src/test/abilities/simple.test.ts
+++ b/test/abilities/simple.test.ts
@@ -2,7 +2,7 @@ import { Moves } from "#app/enums/moves";
 import { Abilities } from "#enums/abilities";
 import { Species } from "#enums/species";
 import { Stat } from "#enums/stat";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
@@ -23,17 +23,15 @@ describe("Abilities - Simple", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     game.override
-      .battleType("single")
+      .battleStyle("single")
       .enemySpecies(Species.BULBASAUR)
       .enemyAbility(Abilities.SIMPLE)
       .ability(Abilities.INTIMIDATE)
       .enemyMoveset(Moves.SPLASH);
   });
 
-  it("should double stat changes when applied", async() => {
-    await game.startBattle([
-      Species.SLOWBRO
-    ]);
+  it("should double stat changes when applied", async () => {
+    await game.startBattle([Species.SLOWBRO]);
 
     const enemyPokemon = game.scene.getEnemyPokemon()!;
 
diff --git a/test/abilities/speed_boost.test.ts b/test/abilities/speed_boost.test.ts
new file mode 100644
index 00000000000..45ee54ffb07
--- /dev/null
+++ b/test/abilities/speed_boost.test.ts
@@ -0,0 +1,115 @@
+import { Stat } from "#enums/stat";
+import { Abilities } from "#enums/abilities";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import GameManager from "#test/testUtils/gameManager";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
+import type { CommandPhase } from "#app/phases/command-phase";
+import { Command } from "#app/ui/command-ui-handler";
+import { AttemptRunPhase } from "#app/phases/attempt-run-phase";
+
+describe("Abilities - Speed Boost", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+
+    game.override
+      .battleStyle("single")
+      .enemySpecies(Species.SHUCKLE)
+      .enemyAbility(Abilities.BALL_FETCH)
+      .enemyLevel(100)
+      .ability(Abilities.SPEED_BOOST)
+      .enemyMoveset(Moves.SPLASH)
+      .moveset([Moves.SPLASH, Moves.U_TURN]);
+  });
+
+  it("should increase speed by 1 stage at end of turn", async () => {
+    await game.classicMode.startBattle();
+
+    const playerPokemon = game.scene.getPlayerPokemon()!;
+    game.move.select(Moves.SPLASH);
+    await game.toNextTurn();
+
+    expect(playerPokemon.getStatStage(Stat.SPD)).toBe(1);
+  });
+
+  it("should not trigger this turn if pokemon was switched into combat via attack, but the turn after", async () => {
+    await game.classicMode.startBattle([Species.SHUCKLE, Species.NINJASK]);
+
+    game.move.select(Moves.U_TURN);
+    game.doSelectPartyPokemon(1);
+    await game.toNextTurn();
+    const playerPokemon = game.scene.getPlayerPokemon()!;
+    expect(playerPokemon.getStatStage(Stat.SPD)).toBe(0);
+
+    game.move.select(Moves.SPLASH);
+    await game.toNextTurn();
+    expect(playerPokemon.getStatStage(Stat.SPD)).toBe(1);
+  });
+
+  it("checking back to back swtiches", async () => {
+    await game.classicMode.startBattle([Species.SHUCKLE, Species.NINJASK]);
+
+    const [shuckle, ninjask] = game.scene.getPlayerParty();
+
+    game.move.select(Moves.U_TURN);
+    game.doSelectPartyPokemon(1);
+    await game.toNextTurn();
+    expect(game.scene.getPlayerPokemon()!).toBe(ninjask);
+    expect(ninjask.getStatStage(Stat.SPD)).toBe(0);
+
+    game.move.select(Moves.U_TURN);
+    game.doSelectPartyPokemon(1);
+    await game.toNextTurn();
+    expect(game.scene.getPlayerPokemon()!).toBe(shuckle);
+    expect(shuckle.getStatStage(Stat.SPD)).toBe(0);
+
+    game.move.select(Moves.SPLASH);
+    await game.toNextTurn();
+    expect(shuckle.getStatStage(Stat.SPD)).toBe(1);
+  });
+
+  it("should not trigger this turn if pokemon was switched into combat via normal switch, but the turn after", async () => {
+    await game.classicMode.startBattle([Species.SHUCKLE, Species.NINJASK]);
+
+    game.doSwitchPokemon(1);
+    await game.toNextTurn();
+    const playerPokemon = game.scene.getPlayerPokemon()!;
+    expect(playerPokemon.getStatStage(Stat.SPD)).toBe(0);
+
+    game.move.select(Moves.SPLASH);
+    await game.toNextTurn();
+    expect(playerPokemon.getStatStage(Stat.SPD)).toBe(1);
+  });
+
+  it("should not trigger if pokemon fails to escape", async () => {
+    await game.classicMode.startBattle([Species.SHUCKLE]);
+
+    const commandPhase = game.scene.getCurrentPhase() as CommandPhase;
+    commandPhase.handleCommand(Command.RUN, 0);
+    const runPhase = game.scene.getCurrentPhase() as AttemptRunPhase;
+    runPhase.forceFailEscape = true;
+    await game.phaseInterceptor.to(AttemptRunPhase);
+    await game.toNextTurn();
+
+    const playerPokemon = game.scene.getPlayerPokemon()!;
+    expect(playerPokemon.getStatStage(Stat.SPD)).toBe(0);
+
+    game.move.select(Moves.SPLASH);
+    await game.toNextTurn();
+    expect(playerPokemon.getStatStage(Stat.SPD)).toBe(1);
+  });
+});
diff --git a/src/test/abilities/stakeout.test.ts b/test/abilities/stakeout.test.ts
similarity index 72%
rename from src/test/abilities/stakeout.test.ts
rename to test/abilities/stakeout.test.ts
index 885169b284e..8a2231bba0b 100644
--- a/src/test/abilities/stakeout.test.ts
+++ b/test/abilities/stakeout.test.ts
@@ -1,9 +1,9 @@
 import { BattlerIndex } from "#app/battle";
-import { isBetween } from "#app/utils";
+import { isBetween } from "#app/utils/common";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
@@ -24,22 +24,22 @@ describe("Abilities - Stakeout", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     game.override
-      .moveset([ Moves.SPLASH, Moves.SURF ])
+      .moveset([Moves.SPLASH, Moves.SURF])
       .ability(Abilities.STAKEOUT)
-      .battleType("single")
+      .battleStyle("single")
       .disableCrits()
       .startingLevel(100)
       .enemyLevel(100)
       .enemySpecies(Species.SNORLAX)
       .enemyAbility(Abilities.BALL_FETCH)
-      .enemyMoveset([ Moves.SPLASH, Moves.FLIP_TURN ])
+      .enemyMoveset([Moves.SPLASH, Moves.FLIP_TURN])
       .startingWave(5);
   });
 
   it("should do double damage to a pokemon that switched out", async () => {
-    await game.classicMode.startBattle([ Species.MILOTIC ]);
+    await game.classicMode.startBattle([Species.MILOTIC]);
 
-    const [ enemy1, ] = game.scene.getEnemyParty();
+    const [enemy1] = game.scene.getEnemyParty();
 
     game.move.select(Moves.SURF);
     await game.forceEnemyMove(Moves.SPLASH);
@@ -56,13 +56,13 @@ describe("Abilities - Stakeout", () => {
     await game.toNextTurn();
 
     expect(enemy1.isFainted()).toBe(false);
-    expect(isBetween(enemy1.getInverseHp(), (damage1 * 2) - 5, (damage1 * 2) + 5)).toBe(true);
+    expect(isBetween(enemy1.getInverseHp(), damage1 * 2 - 5, damage1 * 2 + 5)).toBe(true);
   });
 
   it("should do double damage to a pokemon that switched out via U-Turn/etc", async () => {
-    await game.classicMode.startBattle([ Species.MILOTIC ]);
+    await game.classicMode.startBattle([Species.MILOTIC]);
 
-    const [ enemy1, ] = game.scene.getEnemyParty();
+    const [enemy1] = game.scene.getEnemyParty();
 
     game.move.select(Moves.SURF);
     await game.forceEnemyMove(Moves.SPLASH);
@@ -76,10 +76,10 @@ describe("Abilities - Stakeout", () => {
 
     game.move.select(Moves.SURF);
     await game.forceEnemyMove(Moves.FLIP_TURN);
-    await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
     await game.toNextTurn();
 
     expect(enemy1.isFainted()).toBe(false);
-    expect(isBetween(enemy1.getInverseHp(), (damage1 * 2) - 5, (damage1 * 2) + 5)).toBe(true);
+    expect(isBetween(enemy1.getInverseHp(), damage1 * 2 - 5, damage1 * 2 + 5)).toBe(true);
   });
 });
diff --git a/src/test/abilities/stall.test.ts b/test/abilities/stall.test.ts
similarity index 79%
rename from src/test/abilities/stall.test.ts
rename to test/abilities/stall.test.ts
index b51c56dbe1f..68b3fdedcd8 100644
--- a/src/test/abilities/stall.test.ts
+++ b/test/abilities/stall.test.ts
@@ -1,7 +1,7 @@
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 import { TurnStartPhase } from "#app/phases/turn-start-phase";
@@ -22,12 +22,12 @@ describe("Abilities - Stall", () => {
 
   beforeEach(() => {
     game = new GameManager(phaserGame);
-    game.override.battleType("single");
+    game.override.battleStyle("single");
     game.override.disableCrits();
     game.override.enemySpecies(Species.REGIELEKI);
     game.override.enemyAbility(Abilities.STALL);
-    game.override.enemyMoveset([ Moves.QUICK_ATTACK, Moves.QUICK_ATTACK, Moves.QUICK_ATTACK, Moves.QUICK_ATTACK ]);
-    game.override.moveset([ Moves.QUICK_ATTACK, Moves.TACKLE ]);
+    game.override.enemyMoveset([Moves.QUICK_ATTACK, Moves.QUICK_ATTACK, Moves.QUICK_ATTACK, Moves.QUICK_ATTACK]);
+    game.override.moveset([Moves.QUICK_ATTACK, Moves.TACKLE]);
   });
 
   /**
@@ -37,7 +37,7 @@ describe("Abilities - Stall", () => {
    **/
 
   it("Pokemon with Stall should move last in its priority bracket regardless of speed", async () => {
-    await game.startBattle([ Species.SHUCKLE ]);
+    await game.startBattle([Species.SHUCKLE]);
 
     const playerIndex = game.scene.getPlayerPokemon()!.getBattlerIndex();
     const enemyIndex = game.scene.getEnemyPokemon()!.getBattlerIndex();
@@ -50,12 +50,12 @@ describe("Abilities - Stall", () => {
     const commandOrder = phase.getCommandOrder();
     // The player Pokemon (without Stall) goes first despite having lower speed than the opponent.
     // The opponent Pokemon (with Stall) goes last despite having higher speed than the player Pokemon.
-    expect(speedOrder).toEqual([ enemyIndex, playerIndex ]);
-    expect(commandOrder).toEqual([ playerIndex, enemyIndex ]);
+    expect(speedOrder).toEqual([enemyIndex, playerIndex]);
+    expect(commandOrder).toEqual([playerIndex, enemyIndex]);
   }, 20000);
 
   it("Pokemon with Stall will go first if a move that is in a higher priority bracket than the opponent's move is used", async () => {
-    await game.startBattle([ Species.SHUCKLE ]);
+    await game.startBattle([Species.SHUCKLE]);
 
     const playerIndex = game.scene.getPlayerPokemon()!.getBattlerIndex();
     const enemyIndex = game.scene.getEnemyPokemon()!.getBattlerIndex();
@@ -68,13 +68,13 @@ describe("Abilities - Stall", () => {
     const commandOrder = phase.getCommandOrder();
     // The opponent Pokemon (with Stall) goes first because its move is still within a higher priority bracket than its opponent.
     // The player Pokemon goes second because its move is in a lower priority bracket.
-    expect(speedOrder).toEqual([ enemyIndex, playerIndex ]);
-    expect(commandOrder).toEqual([ enemyIndex, playerIndex ]);
+    expect(speedOrder).toEqual([enemyIndex, playerIndex]);
+    expect(commandOrder).toEqual([enemyIndex, playerIndex]);
   }, 20000);
 
   it("If both Pokemon have stall and use the same move, speed is used to determine who goes first.", async () => {
     game.override.ability(Abilities.STALL);
-    await game.startBattle([ Species.SHUCKLE ]);
+    await game.startBattle([Species.SHUCKLE]);
 
     const playerIndex = game.scene.getPlayerPokemon()!.getBattlerIndex();
     const enemyIndex = game.scene.getEnemyPokemon()!.getBattlerIndex();
@@ -88,7 +88,7 @@ describe("Abilities - Stall", () => {
 
     // The opponent Pokemon (with Stall) goes first because it has a higher speed.
     // The player Pokemon (with Stall) goes second because its speed is lower.
-    expect(speedOrder).toEqual([ enemyIndex, playerIndex ]);
-    expect(commandOrder).toEqual([ enemyIndex, playerIndex ]);
+    expect(speedOrder).toEqual([enemyIndex, playerIndex]);
+    expect(commandOrder).toEqual([enemyIndex, playerIndex]);
   }, 20000);
 });
diff --git a/src/test/abilities/steely_spirit.test.ts b/test/abilities/steely_spirit.test.ts
similarity index 81%
rename from src/test/abilities/steely_spirit.test.ts
rename to test/abilities/steely_spirit.test.ts
index 61e76989060..be759724c3a 100644
--- a/src/test/abilities/steely_spirit.test.ts
+++ b/test/abilities/steely_spirit.test.ts
@@ -1,9 +1,9 @@
-import { allAbilities } from "#app/data/ability";
-import { allMoves } from "#app/data/move";
+import { allAbilities } from "#app/data/data-lists";
+import { allMoves } from "#app/data/moves/move";
 import { Abilities } from "#app/enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
@@ -12,7 +12,8 @@ describe("Abilities - Steely Spirit", () => {
   let game: GameManager;
   const steelySpiritMultiplier = 1.5;
   const moveToCheck = Moves.IRON_HEAD;
-  const ironHeadPower = allMoves[moveToCheck].power;
+
+  let ironHeadPower: number;
 
   beforeAll(() => {
     phaserGame = new Phaser.Game({
@@ -25,17 +26,18 @@ describe("Abilities - Steely Spirit", () => {
   });
 
   beforeEach(() => {
+    ironHeadPower = allMoves[moveToCheck].power;
     game = new GameManager(phaserGame);
-    game.override.battleType("double");
+    game.override.battleStyle("double");
     game.override.enemySpecies(Species.SHUCKLE);
     game.override.enemyAbility(Abilities.BALL_FETCH);
-    game.override.moveset([ Moves.IRON_HEAD, Moves.SPLASH ]);
+    game.override.moveset([Moves.IRON_HEAD, Moves.SPLASH]);
     game.override.enemyMoveset(Moves.SPLASH);
     vi.spyOn(allMoves[moveToCheck], "calculateBattlePower");
   });
 
   it("increases Steel-type moves' power used by the user and its allies by 50%", async () => {
-    await game.classicMode.startBattle([ Species.PIKACHU, Species.SHUCKLE ]);
+    await game.classicMode.startBattle([Species.PIKACHU, Species.SHUCKLE]);
     const boostSource = game.scene.getPlayerField()[1];
     const enemyToCheck = game.scene.getEnemyPokemon()!;
 
@@ -51,7 +53,7 @@ describe("Abilities - Steely Spirit", () => {
   });
 
   it("stacks if multiple users with this ability are on the field.", async () => {
-    await game.classicMode.startBattle([ Species.PIKACHU, Species.PIKACHU ]);
+    await game.classicMode.startBattle([Species.PIKACHU, Species.PIKACHU]);
     const enemyToCheck = game.scene.getEnemyPokemon()!;
 
     game.scene.getPlayerField().forEach(p => {
@@ -64,11 +66,13 @@ describe("Abilities - Steely Spirit", () => {
     game.move.select(moveToCheck, 1, enemyToCheck.getBattlerIndex());
     await game.phaseInterceptor.to("MoveEffectPhase");
 
-    expect(allMoves[moveToCheck].calculateBattlePower).toHaveReturnedWith(ironHeadPower * Math.pow(steelySpiritMultiplier, 2));
+    expect(allMoves[moveToCheck].calculateBattlePower).toHaveReturnedWith(
+      ironHeadPower * Math.pow(steelySpiritMultiplier, 2),
+    );
   });
 
   it("does not take effect when suppressed", async () => {
-    await game.classicMode.startBattle([ Species.PIKACHU, Species.SHUCKLE ]);
+    await game.classicMode.startBattle([Species.PIKACHU, Species.SHUCKLE]);
     const boostSource = game.scene.getPlayerField()[1];
     const enemyToCheck = game.scene.getEnemyPokemon()!;
 
@@ -88,14 +92,12 @@ describe("Abilities - Steely Spirit", () => {
   });
 
   it("affects variable-type moves if their resolved type is Steel", async () => {
-    game.override
-      .ability(Abilities.STEELY_SPIRIT)
-      .moveset([ Moves.REVELATION_DANCE ]);
+    game.override.ability(Abilities.STEELY_SPIRIT).moveset([Moves.REVELATION_DANCE]);
 
     const revelationDance = allMoves[Moves.REVELATION_DANCE];
     vi.spyOn(revelationDance, "calculateBattlePower");
 
-    await game.classicMode.startBattle([ Species.KLINKLANG ]);
+    await game.classicMode.startBattle([Species.KLINKLANG]);
 
     game.move.select(Moves.REVELATION_DANCE);
 
diff --git a/test/abilities/storm_drain.test.ts b/test/abilities/storm_drain.test.ts
new file mode 100644
index 00000000000..0cbad796ad8
--- /dev/null
+++ b/test/abilities/storm_drain.test.ts
@@ -0,0 +1,114 @@
+import { BattlerIndex } from "#app/battle";
+import { Abilities } from "#enums/abilities";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import { Stat } from "#enums/stat";
+import GameManager from "#test/testUtils/gameManager";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
+
+describe("Abilities - Storm Drain", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+    game.override
+      .moveset([Moves.SPLASH, Moves.WATER_GUN])
+      .ability(Abilities.BALL_FETCH)
+      .battleStyle("double")
+      .disableCrits()
+      .enemySpecies(Species.MAGIKARP)
+      .enemyAbility(Abilities.BALL_FETCH)
+      .enemyMoveset(Moves.SPLASH);
+  });
+
+  it("should redirect water type moves", async () => {
+    await game.classicMode.startBattle([Species.FEEBAS, Species.MAGIKARP]);
+
+    const enemy1 = game.scene.getEnemyField()[0];
+    const enemy2 = game.scene.getEnemyField()[1];
+
+    enemy2.summonData.ability = Abilities.STORM_DRAIN;
+
+    game.move.select(Moves.WATER_GUN, BattlerIndex.PLAYER, BattlerIndex.ENEMY);
+    game.move.select(Moves.SPLASH, BattlerIndex.PLAYER_2);
+    await game.phaseInterceptor.to("BerryPhase");
+
+    expect(enemy1.isFullHp()).toBe(true);
+  });
+
+  it("should not redirect non-water type moves", async () => {
+    game.override.moveset([Moves.SPLASH, Moves.AERIAL_ACE]);
+    await game.classicMode.startBattle([Species.FEEBAS, Species.MAGIKARP]);
+
+    const enemy1 = game.scene.getEnemyField()[0];
+    const enemy2 = game.scene.getEnemyField()[1];
+
+    enemy2.summonData.ability = Abilities.STORM_DRAIN;
+
+    game.move.select(Moves.AERIAL_ACE, BattlerIndex.PLAYER, BattlerIndex.ENEMY);
+    game.move.select(Moves.SPLASH, BattlerIndex.PLAYER_2);
+    await game.phaseInterceptor.to("BerryPhase");
+
+    expect(enemy1.isFullHp()).toBe(false);
+  });
+
+  it("should boost the user's spatk without damaging", async () => {
+    await game.classicMode.startBattle([Species.FEEBAS, Species.MAGIKARP]);
+
+    const enemy2 = game.scene.getEnemyField()[1];
+
+    enemy2.summonData.ability = Abilities.STORM_DRAIN;
+
+    game.move.select(Moves.WATER_GUN, BattlerIndex.PLAYER, BattlerIndex.ENEMY);
+    game.move.select(Moves.SPLASH, BattlerIndex.PLAYER_2);
+    await game.phaseInterceptor.to("BerryPhase");
+
+    expect(enemy2.isFullHp()).toBe(true);
+    expect(enemy2.getStatStage(Stat.SPATK)).toBe(1);
+  });
+
+  it("should not redirect moves changed from water type via ability", async () => {
+    game.override.ability(Abilities.NORMALIZE);
+    await game.classicMode.startBattle([Species.FEEBAS, Species.MAGIKARP]);
+
+    const enemy1 = game.scene.getEnemyField()[0];
+    const enemy2 = game.scene.getEnemyField()[1];
+
+    enemy2.summonData.ability = Abilities.STORM_DRAIN;
+
+    game.move.select(Moves.WATER_GUN, BattlerIndex.PLAYER, BattlerIndex.ENEMY);
+    game.move.select(Moves.SPLASH, BattlerIndex.PLAYER_2);
+    await game.phaseInterceptor.to("BerryPhase");
+
+    expect(enemy1.isFullHp()).toBe(false);
+  });
+
+  it("should redirect moves changed to water type via ability", async () => {
+    game.override.ability(Abilities.LIQUID_VOICE).moveset(Moves.PSYCHIC_NOISE);
+    await game.classicMode.startBattle([Species.FEEBAS, Species.MAGIKARP]);
+
+    const enemy1 = game.scene.getEnemyField()[0];
+    const enemy2 = game.scene.getEnemyField()[1];
+
+    enemy2.summonData.ability = Abilities.STORM_DRAIN;
+
+    game.move.select(Moves.PSYCHIC_NOISE, BattlerIndex.PLAYER, BattlerIndex.ENEMY);
+    game.move.select(Moves.SPLASH, BattlerIndex.PLAYER_2);
+    await game.phaseInterceptor.to("BerryPhase");
+
+    expect(enemy1.isFullHp()).toBe(true);
+    expect(enemy2.getStatStage(Stat.SPATK)).toBe(1);
+  });
+});
diff --git a/test/abilities/sturdy.test.ts b/test/abilities/sturdy.test.ts
new file mode 100644
index 00000000000..bda8c6d1e35
--- /dev/null
+++ b/test/abilities/sturdy.test.ts
@@ -0,0 +1,78 @@
+import type { EnemyPokemon } from "#app/field/pokemon";
+import { DamageAnimPhase } from "#app/phases/damage-anim-phase";
+import { MoveEndPhase } from "#app/phases/move-end-phase";
+import { Abilities } from "#enums/abilities";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import GameManager from "#test/testUtils/gameManager";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest";
+
+describe("Abilities - Sturdy", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+    game.override.battleStyle("single");
+
+    game.override.starterSpecies(Species.LUCARIO);
+    game.override.startingLevel(100);
+    game.override.moveset([Moves.CLOSE_COMBAT, Moves.FISSURE]);
+
+    game.override.enemySpecies(Species.ARON);
+    game.override.enemyLevel(5);
+    game.override.enemyAbility(Abilities.STURDY);
+  });
+
+  test("Sturdy activates when user is at full HP", async () => {
+    await game.startBattle();
+    game.move.select(Moves.CLOSE_COMBAT);
+    await game.phaseInterceptor.to(MoveEndPhase);
+    expect(game.scene.getEnemyParty()[0].hp).toBe(1);
+  });
+
+  test("Sturdy doesn't activate when user is not at full HP", async () => {
+    await game.startBattle();
+
+    const enemyPokemon: EnemyPokemon = game.scene.getEnemyParty()[0];
+    enemyPokemon.hp = enemyPokemon.getMaxHp() - 1;
+
+    game.move.select(Moves.CLOSE_COMBAT);
+    await game.phaseInterceptor.to(DamageAnimPhase);
+
+    expect(enemyPokemon.hp).toBe(0);
+    expect(enemyPokemon.isFainted()).toBe(true);
+  });
+
+  test("Sturdy pokemon should be immune to OHKO moves", async () => {
+    await game.startBattle();
+    game.move.select(Moves.FISSURE);
+    await game.phaseInterceptor.to(MoveEndPhase);
+
+    const enemyPokemon: EnemyPokemon = game.scene.getEnemyParty()[0];
+    expect(enemyPokemon.isFullHp()).toBe(true);
+  });
+
+  test("Sturdy is ignored by pokemon with `Abilities.MOLD_BREAKER`", async () => {
+    game.override.ability(Abilities.MOLD_BREAKER);
+
+    await game.startBattle();
+    game.move.select(Moves.CLOSE_COMBAT);
+    await game.phaseInterceptor.to(DamageAnimPhase);
+
+    const enemyPokemon: EnemyPokemon = game.scene.getEnemyParty()[0];
+    expect(enemyPokemon.hp).toBe(0);
+    expect(enemyPokemon.isFainted()).toBe(true);
+  });
+});
diff --git a/test/abilities/super_luck.test.ts b/test/abilities/super_luck.test.ts
new file mode 100644
index 00000000000..fbcbd02bdd2
--- /dev/null
+++ b/test/abilities/super_luck.test.ts
@@ -0,0 +1,42 @@
+import { Abilities } from "#enums/abilities";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import GameManager from "#test/testUtils/gameManager";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
+
+describe("Abilities - Super Luck", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+    game.override
+      .moveset([Moves.TACKLE])
+      .ability(Abilities.SUPER_LUCK)
+      .battleStyle("single")
+      .enemySpecies(Species.MAGIKARP)
+      .enemyAbility(Abilities.BALL_FETCH)
+      .enemyMoveset(Moves.SPLASH);
+  });
+
+  it("should increase the crit stage of a user by 1", async () => {
+    await game.classicMode.startBattle([Species.MAGIKARP]);
+    const enemy = game.scene.getEnemyPokemon()!;
+    const fn = vi.spyOn(enemy, "getCritStage");
+    game.move.select(Moves.TACKLE);
+    await game.phaseInterceptor.to("BerryPhase");
+    expect(fn).toHaveReturnedWith(1);
+    fn.mockRestore();
+  });
+});
diff --git a/test/abilities/supreme_overlord.test.ts b/test/abilities/supreme_overlord.test.ts
new file mode 100644
index 00000000000..8af0a0ac37c
--- /dev/null
+++ b/test/abilities/supreme_overlord.test.ts
@@ -0,0 +1,169 @@
+import { Moves } from "#app/enums/moves";
+import type Move from "#app/data/moves/move";
+import { Abilities } from "#enums/abilities";
+import { Species } from "#enums/species";
+import { BattlerIndex } from "#app/battle";
+import { MoveEffectPhase } from "#app/phases/move-effect-phase";
+import GameManager from "#test/testUtils/gameManager";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
+import { allMoves } from "#app/data/moves/move";
+
+describe("Abilities - Supreme Overlord", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  let move: Move;
+  let basePower: number;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    move = allMoves[Moves.TACKLE];
+    basePower = move.power;
+    game = new GameManager(phaserGame);
+    game.override
+      .battleStyle("single")
+      .enemySpecies(Species.MAGIKARP)
+      .enemyLevel(100)
+      .startingLevel(1)
+      .enemyAbility(Abilities.BALL_FETCH)
+      .ability(Abilities.SUPREME_OVERLORD)
+      .enemyMoveset([Moves.SPLASH])
+      .moveset([Moves.TACKLE, Moves.EXPLOSION, Moves.LUNAR_DANCE]);
+
+    vi.spyOn(move, "calculateBattlePower");
+  });
+
+  it("should increase Power by 20% if 2 Pokemon are fainted in the party", async () => {
+    await game.startBattle([Species.BULBASAUR, Species.CHARMANDER, Species.SQUIRTLE]);
+
+    game.move.select(Moves.EXPLOSION);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
+    game.doSelectPartyPokemon(1);
+    await game.toNextTurn();
+
+    game.move.select(Moves.EXPLOSION);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
+    game.doSelectPartyPokemon(2);
+    await game.toNextTurn();
+
+    game.move.select(Moves.TACKLE);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
+    await game.phaseInterceptor.to(MoveEffectPhase);
+
+    expect(move.calculateBattlePower).toHaveReturnedWith(basePower * 1.2);
+  });
+
+  it("should increase Power by 30% if an ally fainted twice and another one once", async () => {
+    await game.classicMode.startBattle([Species.BULBASAUR, Species.CHARMANDER, Species.SQUIRTLE]);
+
+    /**
+     * Bulbasur faints once
+     */
+    game.move.select(Moves.EXPLOSION);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
+    game.doSelectPartyPokemon(1);
+    await game.toNextTurn();
+
+    /**
+     * Charmander faints once
+     */
+    game.doRevivePokemon(1);
+    game.move.select(Moves.EXPLOSION);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
+    game.doSelectPartyPokemon(1);
+    await game.toNextTurn();
+
+    /**
+     * Bulbasur faints twice
+     */
+    game.move.select(Moves.EXPLOSION);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
+    game.doSelectPartyPokemon(2);
+    await game.toNextTurn();
+
+    game.move.select(Moves.TACKLE);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
+    await game.phaseInterceptor.to(MoveEffectPhase);
+
+    expect(move.calculateBattlePower).toHaveReturnedWith(basePower * 1.3);
+  });
+
+  it("should maintain its power during next battle if it is within the same arena encounter", async () => {
+    game.override.enemySpecies(Species.MAGIKARP).startingWave(1).enemyLevel(1).startingLevel(100);
+
+    await game.classicMode.startBattle([Species.BULBASAUR, Species.CHARMANDER, Species.SQUIRTLE]);
+
+    /**
+     * The first Pokemon faints and another Pokemon in the party is selected.
+     */
+    game.move.select(Moves.LUNAR_DANCE);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
+    game.doSelectPartyPokemon(1);
+    await game.toNextTurn();
+
+    /**
+     * Enemy Pokemon faints and new wave is entered.
+     */
+    game.move.select(Moves.TACKLE);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
+    await game.toNextWave();
+
+    game.move.select(Moves.TACKLE);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
+    await game.phaseInterceptor.to("TurnEndPhase");
+
+    expect(move.calculateBattlePower).toHaveLastReturnedWith(basePower * 1.1);
+  });
+
+  it("should reset playerFaints count if we enter new trainer battle", async () => {
+    game.override.enemySpecies(Species.MAGIKARP).startingWave(4).enemyLevel(1).startingLevel(100);
+
+    await game.classicMode.startBattle([Species.BULBASAUR, Species.CHARMANDER, Species.SQUIRTLE]);
+
+    game.move.select(Moves.LUNAR_DANCE);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
+    game.doSelectPartyPokemon(1);
+    await game.toNextTurn();
+
+    game.move.select(Moves.TACKLE);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
+    await game.toNextWave();
+
+    game.move.select(Moves.TACKLE);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
+    await game.phaseInterceptor.to("BerryPhase", false);
+
+    expect(move.calculateBattlePower).toHaveLastReturnedWith(basePower);
+  });
+
+  it("should reset playerFaints count if we enter new biome", async () => {
+    game.override.enemySpecies(Species.MAGIKARP).startingWave(10).enemyLevel(1).startingLevel(100);
+
+    await game.classicMode.startBattle([Species.BULBASAUR, Species.CHARMANDER, Species.SQUIRTLE]);
+
+    game.move.select(Moves.LUNAR_DANCE);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
+    game.doSelectPartyPokemon(1);
+    await game.toNextTurn();
+
+    game.move.select(Moves.TACKLE);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
+    await game.toNextWave();
+
+    game.move.select(Moves.TACKLE);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
+    await game.phaseInterceptor.to("BerryPhase", false);
+
+    expect(move.calculateBattlePower).toHaveLastReturnedWith(basePower);
+  });
+});
diff --git a/src/test/abilities/sweet_veil.test.ts b/test/abilities/sweet_veil.test.ts
similarity index 80%
rename from src/test/abilities/sweet_veil.test.ts
rename to test/abilities/sweet_veil.test.ts
index ef66cb1c68a..e609aa6e7d2 100644
--- a/src/test/abilities/sweet_veil.test.ts
+++ b/test/abilities/sweet_veil.test.ts
@@ -5,7 +5,7 @@ import { CommandPhase } from "#app/phases/command-phase";
 import { TurnEndPhase } from "#app/phases/turn-end-phase";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
@@ -25,15 +25,15 @@ describe("Abilities - Sweet Veil", () => {
 
   beforeEach(() => {
     game = new GameManager(phaserGame);
-    game.override.battleType("double");
-    game.override.moveset([ Moves.SPLASH, Moves.REST, Moves.YAWN ]);
+    game.override.battleStyle("double");
+    game.override.moveset([Moves.SPLASH, Moves.REST, Moves.YAWN]);
     game.override.enemySpecies(Species.MAGIKARP);
     game.override.enemyAbility(Abilities.BALL_FETCH);
-    game.override.enemyMoveset([ Moves.POWDER, Moves.POWDER, Moves.POWDER, Moves.POWDER ]);
+    game.override.enemyMoveset([Moves.POWDER, Moves.POWDER, Moves.POWDER, Moves.POWDER]);
   });
 
   it("prevents the user and its allies from falling asleep", async () => {
-    await game.startBattle([ Species.SWIRLIX, Species.MAGIKARP ]);
+    await game.startBattle([Species.SWIRLIX, Species.MAGIKARP]);
 
     game.move.select(Moves.SPLASH);
     game.move.select(Moves.SPLASH, 1);
@@ -45,7 +45,7 @@ describe("Abilities - Sweet Veil", () => {
 
   it("causes Rest to fail when used by the user or its allies", async () => {
     game.override.enemyMoveset(Moves.SPLASH);
-    await game.startBattle([ Species.SWIRLIX, Species.MAGIKARP ]);
+    await game.startBattle([Species.SWIRLIX, Species.MAGIKARP]);
 
     game.move.select(Moves.SPLASH);
     game.move.select(Moves.REST, 1);
@@ -56,8 +56,8 @@ describe("Abilities - Sweet Veil", () => {
   });
 
   it("causes Yawn to fail if used on the user or its allies", async () => {
-    game.override.enemyMoveset([ Moves.YAWN, Moves.YAWN, Moves.YAWN, Moves.YAWN ]);
-    await game.startBattle([ Species.SWIRLIX, Species.MAGIKARP ]);
+    game.override.enemyMoveset([Moves.YAWN, Moves.YAWN, Moves.YAWN, Moves.YAWN]);
+    await game.startBattle([Species.SWIRLIX, Species.MAGIKARP]);
 
     game.move.select(Moves.SPLASH);
     game.move.select(Moves.SPLASH, 1);
@@ -73,7 +73,7 @@ describe("Abilities - Sweet Veil", () => {
     game.override.startingLevel(5);
     game.override.enemyMoveset(Moves.SPLASH);
 
-    await game.startBattle([ Species.SHUCKLE, Species.SHUCKLE, Species.SWIRLIX ]);
+    await game.startBattle([Species.SHUCKLE, Species.SHUCKLE, Species.SWIRLIX]);
 
     game.move.select(Moves.SPLASH);
     game.move.select(Moves.YAWN, 1, BattlerIndex.PLAYER);
diff --git a/src/test/abilities/synchronize.test.ts b/test/abilities/synchronize.test.ts
similarity index 87%
rename from src/test/abilities/synchronize.test.ts
rename to test/abilities/synchronize.test.ts
index 2ae80ae9c7a..783201d7a5b 100644
--- a/src/test/abilities/synchronize.test.ts
+++ b/test/abilities/synchronize.test.ts
@@ -2,7 +2,7 @@ import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { StatusEffect } from "#enums/status-effect";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
@@ -24,16 +24,16 @@ describe("Abilities - Synchronize", () => {
     game = new GameManager(phaserGame);
 
     game.override
-      .battleType("single")
+      .battleStyle("single")
       .startingLevel(100)
       .enemySpecies(Species.MAGIKARP)
       .enemyAbility(Abilities.SYNCHRONIZE)
-      .moveset([ Moves.SPLASH, Moves.THUNDER_WAVE, Moves.SPORE, Moves.PSYCHO_SHIFT ])
+      .moveset([Moves.SPLASH, Moves.THUNDER_WAVE, Moves.SPORE, Moves.PSYCHO_SHIFT])
       .ability(Abilities.NO_GUARD);
   });
 
   it("does not trigger when no status is applied by opponent Pokemon", async () => {
-    await game.classicMode.startBattle([ Species.FEEBAS ]);
+    await game.classicMode.startBattle([Species.FEEBAS]);
 
     game.move.select(Moves.SPLASH);
     await game.phaseInterceptor.to("BerryPhase");
@@ -43,7 +43,7 @@ describe("Abilities - Synchronize", () => {
   });
 
   it("sets the status of the source pokemon to Paralysis when paralyzed by it", async () => {
-    await game.classicMode.startBattle([ Species.FEEBAS ]);
+    await game.classicMode.startBattle([Species.FEEBAS]);
 
     game.move.select(Moves.THUNDER_WAVE);
     await game.phaseInterceptor.to("BerryPhase");
@@ -71,7 +71,7 @@ describe("Abilities - Synchronize", () => {
       .enemyAbility(Abilities.BALL_FETCH)
       .enemyMoveset(Array(4).fill(Moves.TOXIC_SPIKES));
 
-    await game.classicMode.startBattle([ Species.FEEBAS, Species.MILOTIC ]);
+    await game.classicMode.startBattle([Species.FEEBAS, Species.MILOTIC]);
 
     game.move.select(Moves.SPLASH);
     await game.toNextTurn();
@@ -85,7 +85,7 @@ describe("Abilities - Synchronize", () => {
   });
 
   it("shows ability even if it fails to set the status of the opponent Pokemon", async () => {
-    await game.classicMode.startBattle([ Species.PIKACHU ]);
+    await game.classicMode.startBattle([Species.PIKACHU]);
 
     game.move.select(Moves.THUNDER_WAVE);
     await game.phaseInterceptor.to("BerryPhase");
diff --git a/test/abilities/tera_shell.test.ts b/test/abilities/tera_shell.test.ts
new file mode 100644
index 00000000000..fdbcb14947d
--- /dev/null
+++ b/test/abilities/tera_shell.test.ts
@@ -0,0 +1,119 @@
+import { BattlerIndex } from "#app/battle";
+import { Abilities } from "#app/enums/abilities";
+import { Moves } from "#app/enums/moves";
+import { Species } from "#app/enums/species";
+import GameManager from "#test/testUtils/gameManager";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
+
+describe("Abilities - Tera Shell", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+    game.override
+      .battleStyle("single")
+      .ability(Abilities.TERA_SHELL)
+      .moveset([Moves.SPLASH])
+      .enemySpecies(Species.SNORLAX)
+      .enemyAbility(Abilities.INSOMNIA)
+      .enemyMoveset([Moves.MACH_PUNCH])
+      .startingLevel(100)
+      .enemyLevel(100);
+  });
+
+  it("should change the effectiveness of non-resisted attacks when the source is at full HP", async () => {
+    await game.classicMode.startBattle([Species.SNORLAX]);
+
+    const playerPokemon = game.scene.getPlayerPokemon()!;
+    vi.spyOn(playerPokemon, "getMoveEffectiveness");
+
+    game.move.select(Moves.SPLASH);
+
+    await game.phaseInterceptor.to("MoveEndPhase");
+    expect(playerPokemon.getMoveEffectiveness).toHaveLastReturnedWith(0.5);
+
+    await game.toNextTurn();
+
+    game.move.select(Moves.SPLASH);
+
+    await game.phaseInterceptor.to("MoveEndPhase");
+    expect(playerPokemon.getMoveEffectiveness).toHaveLastReturnedWith(2);
+  });
+
+  it("should not override type immunities", async () => {
+    game.override.enemyMoveset([Moves.SHADOW_SNEAK]);
+
+    await game.classicMode.startBattle([Species.SNORLAX]);
+
+    const playerPokemon = game.scene.getPlayerPokemon()!;
+    vi.spyOn(playerPokemon, "getMoveEffectiveness");
+
+    game.move.select(Moves.SPLASH);
+
+    await game.phaseInterceptor.to("MoveEndPhase");
+    expect(playerPokemon.getMoveEffectiveness).toHaveLastReturnedWith(0);
+  });
+
+  it("should not override type multipliers less than 0.5x", async () => {
+    game.override.enemyMoveset([Moves.QUICK_ATTACK]);
+
+    await game.classicMode.startBattle([Species.AGGRON]);
+
+    const playerPokemon = game.scene.getPlayerPokemon()!;
+    vi.spyOn(playerPokemon, "getMoveEffectiveness");
+
+    game.move.select(Moves.SPLASH);
+
+    await game.phaseInterceptor.to("MoveEndPhase");
+    expect(playerPokemon.getMoveEffectiveness).toHaveLastReturnedWith(0.25);
+  });
+
+  it("should not affect the effectiveness of fixed-damage moves", async () => {
+    game.override.enemyMoveset([Moves.DRAGON_RAGE]);
+
+    await game.classicMode.startBattle([Species.CHARIZARD]);
+
+    const playerPokemon = game.scene.getPlayerPokemon()!;
+    const spy = vi.spyOn(playerPokemon, "getMoveEffectiveness");
+
+    game.move.select(Moves.SPLASH);
+
+    await game.phaseInterceptor.to("BerryPhase", false);
+    expect(spy).toHaveLastReturnedWith(1);
+    expect(playerPokemon.hp).toBe(playerPokemon.getMaxHp() - 40);
+
+    spy.mockRestore();
+  });
+
+  it("should change the effectiveness of all strikes of a multi-strike move", async () => {
+    game.override.enemyMoveset([Moves.DOUBLE_HIT]);
+
+    await game.classicMode.startBattle([Species.SNORLAX]);
+
+    const playerPokemon = game.scene.getPlayerPokemon()!;
+    const spy = vi.spyOn(playerPokemon, "getMoveEffectiveness");
+
+    game.move.select(Moves.SPLASH);
+
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
+    await game.move.forceHit();
+    for (let i = 0; i < 2; i++) {
+      await game.phaseInterceptor.to("MoveEffectPhase");
+      expect(spy).toHaveLastReturnedWith(0.5);
+    }
+    expect(spy).toHaveReturnedTimes(2);
+    spy.mockRestore();
+  });
+});
diff --git a/test/abilities/thermal_exchange.test.ts b/test/abilities/thermal_exchange.test.ts
new file mode 100644
index 00000000000..c33b296d5ae
--- /dev/null
+++ b/test/abilities/thermal_exchange.test.ts
@@ -0,0 +1,51 @@
+import { Abilities } from "#enums/abilities";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import { StatusEffect } from "#enums/status-effect";
+import GameManager from "#test/testUtils/gameManager";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
+
+describe("Abilities - Thermal Exchange", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+    game.override
+      .moveset([Moves.SPLASH])
+      .ability(Abilities.BALL_FETCH)
+      .battleStyle("single")
+      .disableCrits()
+      .enemySpecies(Species.MAGIKARP)
+      .enemyAbility(Abilities.BALL_FETCH)
+      .enemyMoveset(Moves.SPLASH);
+  });
+
+  it("should remove burn when gained", async () => {
+    game.override
+      .ability(Abilities.THERMAL_EXCHANGE)
+      .enemyAbility(Abilities.BALL_FETCH)
+      .moveset(Moves.SKILL_SWAP)
+      .enemyMoveset(Moves.SPLASH);
+    await game.classicMode.startBattle([Species.FEEBAS]);
+    const enemy = game.scene.getEnemyPokemon();
+    enemy?.trySetStatus(StatusEffect.BURN);
+    expect(enemy?.status?.effect).toBe(StatusEffect.BURN);
+
+    game.move.select(Moves.SKILL_SWAP);
+    await game.phaseInterceptor.to("BerryPhase");
+
+    expect(enemy?.status).toBeNull();
+  });
+});
diff --git a/test/abilities/trace.test.ts b/test/abilities/trace.test.ts
new file mode 100644
index 00000000000..7ec8d62ab51
--- /dev/null
+++ b/test/abilities/trace.test.ts
@@ -0,0 +1,53 @@
+import { Stat } from "#app/enums/stat";
+import { Abilities } from "#enums/abilities";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import GameManager from "#test/testUtils/gameManager";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
+
+describe("Abilities - Trace", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+    game.override
+      .moveset([Moves.SPLASH])
+      .ability(Abilities.TRACE)
+      .battleStyle("single")
+      .disableCrits()
+      .enemySpecies(Species.MAGIKARP)
+      .enemyAbility(Abilities.BALL_FETCH)
+      .enemyMoveset(Moves.SPLASH);
+  });
+
+  it("should copy the opponent's ability", async () => {
+    await game.classicMode.startBattle([Species.FEEBAS]);
+
+    game.move.select(Moves.SPLASH);
+    await game.phaseInterceptor.to("BerryPhase");
+
+    expect(game.scene.getPlayerPokemon()?.getAbility().id).toBe(Abilities.BALL_FETCH);
+  });
+
+  it("should activate a copied post-summon ability", async () => {
+    game.override.enemyAbility(Abilities.INTIMIDATE);
+    await game.classicMode.startBattle([Species.FEEBAS]);
+
+    game.move.select(Moves.SPLASH);
+    await game.phaseInterceptor.to("BerryPhase");
+
+    expect(game.scene.getEnemyPokemon()?.getStatStage(Stat.ATK)).toBe(-1);
+  });
+});
diff --git a/src/test/abilities/unburden.test.ts b/test/abilities/unburden.test.ts
similarity index 81%
rename from src/test/abilities/unburden.test.ts
rename to test/abilities/unburden.test.ts
index a652f55d591..2af889d1da4 100644
--- a/src/test/abilities/unburden.test.ts
+++ b/test/abilities/unburden.test.ts
@@ -1,6 +1,6 @@
 import { BattlerIndex } from "#app/battle";
-import { PostItemLostAbAttr } from "#app/data/ability";
-import { allMoves, StealHeldItemChanceAttr } from "#app/data/move";
+import { PostItemLostAbAttr } from "#app/data/abilities/ability";
+import { allMoves, StealHeldItemChanceAttr } from "#app/data/moves/move";
 import type Pokemon from "#app/field/pokemon";
 import type { ContactHeldItemTransferChanceModifier } from "#app/modifier/modifier";
 import { Abilities } from "#enums/abilities";
@@ -9,11 +9,10 @@ import { BerryType } from "#enums/berry-type";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { Stat } from "#enums/stat";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
-
 describe("Abilities - Unburden", () => {
   let phaserGame: Phaser.Game;
   let game: GameManager;
@@ -25,9 +24,8 @@ describe("Abilities - Unburden", () => {
     const stackCounts = pokemon.getHeldItems().map(m => m.getStackCount());
     if (stackCounts.length) {
       return stackCounts.reduce((a, b) => a + b);
-    } else {
-      return 0;
     }
+    return 0;
   }
 
   beforeAll(() => {
@@ -43,10 +41,10 @@ describe("Abilities - Unburden", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     game.override
-      .battleType("single")
+      .battleStyle("single")
       .startingLevel(1)
       .ability(Abilities.UNBURDEN)
-      .moveset([ Moves.SPLASH, Moves.KNOCK_OFF, Moves.PLUCK, Moves.FALSE_SWIPE ])
+      .moveset([Moves.SPLASH, Moves.KNOCK_OFF, Moves.PLUCK, Moves.FALSE_SWIPE])
       .startingHeldItems([
         { name: "BERRY", count: 1, type: BerryType.SITRUS },
         { name: "BERRY", count: 2, type: BerryType.APICOT },
@@ -62,12 +60,12 @@ describe("Abilities - Unburden", () => {
         { name: "BERRY", type: BerryType.LUM, count: 1 },
       ]);
     // For the various tests that use Thief, give it a 100% steal rate
-    vi.spyOn(allMoves[Moves.THIEF], "attrs", "get").mockReturnValue([ new StealHeldItemChanceAttr(1.0) ]);
+    vi.spyOn(allMoves[Moves.THIEF], "attrs", "get").mockReturnValue([new StealHeldItemChanceAttr(1.0)]);
   });
 
   it("should activate when a berry is eaten", async () => {
     game.override.enemyMoveset(Moves.FALSE_SWIPE);
-    await game.classicMode.startBattle([ Species.TREECKO ]);
+    await game.classicMode.startBattle([Species.TREECKO]);
 
     const playerPokemon = game.scene.getPlayerPokemon()!;
     const playerHeldItems = getHeldItemCount(playerPokemon);
@@ -82,9 +80,8 @@ describe("Abilities - Unburden", () => {
   });
 
   it("should activate when a berry is eaten, even if Berry Pouch preserves the berry", async () => {
-    game.override.enemyMoveset(Moves.FALSE_SWIPE)
-      .startingModifier([{ name: "BERRY_POUCH", count: 5850 }]);
-    await game.classicMode.startBattle([ Species.TREECKO ]);
+    game.override.enemyMoveset(Moves.FALSE_SWIPE).startingModifier([{ name: "BERRY_POUCH", count: 5850 }]);
+    await game.classicMode.startBattle([Species.TREECKO]);
 
     const playerPokemon = game.scene.getPlayerPokemon()!;
     const playerHeldItems = getHeldItemCount(playerPokemon);
@@ -99,7 +96,7 @@ describe("Abilities - Unburden", () => {
   });
 
   it("should activate for the target, and not the stealer, when a berry is stolen", async () => {
-    await game.classicMode.startBattle([ Species.TREECKO ]);
+    await game.classicMode.startBattle([Species.TREECKO]);
 
     const playerPokemon = game.scene.getPlayerPokemon()!;
     const initialPlayerSpeed = playerPokemon.getStat(Stat.SPD);
@@ -117,7 +114,7 @@ describe("Abilities - Unburden", () => {
   });
 
   it("should activate when an item is knocked off", async () => {
-    await game.classicMode.startBattle([ Species.TREECKO ]);
+    await game.classicMode.startBattle([Species.TREECKO]);
 
     const enemyPokemon = game.scene.getEnemyPokemon()!;
     const enemyHeldItemCt = getHeldItemCount(enemyPokemon);
@@ -132,10 +129,8 @@ describe("Abilities - Unburden", () => {
   });
 
   it("should activate when an item is stolen via attacking ability", async () => {
-    game.override
-      .ability(Abilities.MAGICIAN)
-      .startingHeldItems([]); // Remove player's full stacks of held items so it can steal opponent's held items
-    await game.classicMode.startBattle([ Species.TREECKO ]);
+    game.override.ability(Abilities.MAGICIAN).startingHeldItems([]); // Remove player's full stacks of held items so it can steal opponent's held items
+    await game.classicMode.startBattle([Species.TREECKO]);
 
     const enemyPokemon = game.scene.getEnemyPokemon()!;
     const enemyHeldItemCt = getHeldItemCount(enemyPokemon);
@@ -150,10 +145,8 @@ describe("Abilities - Unburden", () => {
   });
 
   it("should activate when an item is stolen via defending ability", async () => {
-    game.override
-      .enemyAbility(Abilities.PICKPOCKET)
-      .enemyHeldItems([]); // Remove opponent's full stacks of held items so it can steal player's held items
-    await game.classicMode.startBattle([ Species.TREECKO ]);
+    game.override.enemyAbility(Abilities.PICKPOCKET).enemyHeldItems([]); // Remove opponent's full stacks of held items so it can steal player's held items
+    await game.classicMode.startBattle([Species.TREECKO]);
 
     const playerPokemon = game.scene.getPlayerPokemon()!;
     const playerHeldItems = getHeldItemCount(playerPokemon);
@@ -168,9 +161,8 @@ describe("Abilities - Unburden", () => {
   });
 
   it("should activate when an item is stolen via move", async () => {
-    game.override.moveset(Moves.THIEF)
-      .startingHeldItems([]); // Remove player's full stacks of held items so it can steal opponent's held items
-    await game.classicMode.startBattle([ Species.TREECKO ]);
+    game.override.moveset(Moves.THIEF).startingHeldItems([]); // Remove player's full stacks of held items so it can steal opponent's held items
+    await game.classicMode.startBattle([Species.TREECKO]);
 
     const enemyPokemon = game.scene.getEnemyPokemon()!;
     const enemyHeldItemCt = getHeldItemCount(enemyPokemon);
@@ -185,11 +177,8 @@ describe("Abilities - Unburden", () => {
   });
 
   it("should activate when an item is stolen via grip claw", async () => {
-    game.override
-      .startingHeldItems([
-        { name: "GRIP_CLAW", count: 1 },
-      ]);
-    await game.classicMode.startBattle([ Species.TREECKO ]);
+    game.override.startingHeldItems([{ name: "GRIP_CLAW", count: 1 }]);
+    await game.classicMode.startBattle([Species.TREECKO]);
 
     const playerPokemon = game.scene.getPlayerPokemon()!;
     const gripClaw = playerPokemon.getHeldItems()[0] as ContactHeldItemTransferChanceModifier;
@@ -208,9 +197,8 @@ describe("Abilities - Unburden", () => {
   });
 
   it("should not activate when a neutralizing ability is present", async () => {
-    game.override.enemyAbility(Abilities.NEUTRALIZING_GAS)
-      .enemyMoveset(Moves.FALSE_SWIPE);
-    await game.classicMode.startBattle([ Species.TREECKO ]);
+    game.override.enemyAbility(Abilities.NEUTRALIZING_GAS).enemyMoveset(Moves.FALSE_SWIPE);
+    await game.classicMode.startBattle([Species.TREECKO]);
 
     const playerPokemon = game.scene.getPlayerPokemon()!;
     const playerHeldItems = getHeldItemCount(playerPokemon);
@@ -227,7 +215,7 @@ describe("Abilities - Unburden", () => {
 
   it("should activate when a move that consumes a berry is used", async () => {
     game.override.moveset(Moves.STUFF_CHEEKS);
-    await game.classicMode.startBattle([ Species.TREECKO ]);
+    await game.classicMode.startBattle([Species.TREECKO]);
 
     const playerPokemon = game.scene.getPlayerPokemon()!;
     const playerHeldItemCt = getHeldItemCount(playerPokemon);
@@ -243,13 +231,10 @@ describe("Abilities - Unburden", () => {
   });
 
   it("should deactivate temporarily when a neutralizing gas user is on the field", async () => {
-    game.override
-      .battleType("double")
-      .ability(Abilities.NONE); // Disable ability override so that we can properly set abilities below
-    await game.classicMode.startBattle([ Species.TREECKO, Species.MEOWTH, Species.WEEZING ]);
+    game.override.battleStyle("double").ability(Abilities.NONE); // Disable ability override so that we can properly set abilities below
+    await game.classicMode.startBattle([Species.TREECKO, Species.MEOWTH, Species.WEEZING]);
 
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    const [ treecko, _meowth, weezing ] = game.scene.getPlayerParty();
+    const [treecko, _meowth, weezing] = game.scene.getPlayerParty();
     treecko.abilityIndex = 2; // Treecko has Unburden
     weezing.abilityIndex = 1; // Weezing has Neutralizing Gas
     const playerHeldItems = getHeldItemCount(treecko);
@@ -285,11 +270,10 @@ describe("Abilities - Unburden", () => {
   });
 
   it("should not activate when passing a baton to a teammate switching in", async () => {
-    game.override.startingHeldItems([{ name: "BATON" }])
-      .moveset(Moves.BATON_PASS);
-    await game.classicMode.startBattle([ Species.TREECKO, Species.PURRLOIN ]);
+    game.override.startingHeldItems([{ name: "BATON" }]).moveset(Moves.BATON_PASS);
+    await game.classicMode.startBattle([Species.TREECKO, Species.PURRLOIN]);
 
-    const [ treecko, purrloin ] = game.scene.getPlayerParty();
+    const [treecko, purrloin] = game.scene.getPlayerParty();
     const initialTreeckoSpeed = treecko.getStat(Stat.SPD);
     const initialPurrloinSpeed = purrloin.getStat(Stat.SPD);
     const unburdenAttr = treecko.getAbilityAttrs(PostItemLostAbAttr)[0];
@@ -308,8 +292,8 @@ describe("Abilities - Unburden", () => {
   });
 
   it("should not speed up a Pokemon after it loses the ability Unburden", async () => {
-    game.override.enemyMoveset([ Moves.FALSE_SWIPE, Moves.WORRY_SEED ]);
-    await game.classicMode.startBattle([ Species.PURRLOIN ]);
+    game.override.enemyMoveset([Moves.FALSE_SWIPE, Moves.WORRY_SEED]);
+    await game.classicMode.startBattle([Species.PURRLOIN]);
 
     const playerPokemon = game.scene.getPlayerPokemon()!;
     const playerHeldItems = getHeldItemCount(playerPokemon);
@@ -333,9 +317,8 @@ describe("Abilities - Unburden", () => {
   });
 
   it("should activate when a reviver seed is used", async () => {
-    game.override.startingHeldItems([{ name: "REVIVER_SEED" }])
-      .enemyMoveset([ Moves.WING_ATTACK ]);
-    await game.classicMode.startBattle([ Species.TREECKO ]);
+    game.override.startingHeldItems([{ name: "REVIVER_SEED" }]).enemyMoveset([Moves.WING_ATTACK]);
+    await game.classicMode.startBattle([Species.TREECKO]);
 
     const playerPokemon = game.scene.getPlayerPokemon()!;
     const playerHeldItems = getHeldItemCount(playerPokemon);
@@ -351,8 +334,8 @@ describe("Abilities - Unburden", () => {
 
   // test for `.bypassFaint()` - singles
   it("shouldn't persist when revived normally if activated while fainting", async () => {
-    game.override.enemyMoveset([ Moves.SPLASH, Moves.THIEF ]);
-    await game.classicMode.startBattle([ Species.TREECKO, Species.FEEBAS ]);
+    game.override.enemyMoveset([Moves.SPLASH, Moves.THIEF]);
+    await game.classicMode.startBattle([Species.TREECKO, Species.FEEBAS]);
 
     const treecko = game.scene.getPlayerPokemon()!;
     const treeckoInitialHeldItems = getHeldItemCount(treecko);
@@ -376,11 +359,11 @@ describe("Abilities - Unburden", () => {
   // test for `.bypassFaint()` - doubles
   it("shouldn't persist when revived by revival blessing if activated while fainting", async () => {
     game.override
-      .battleType("double")
-      .enemyMoveset([ Moves.SPLASH, Moves.THIEF ])
-      .moveset([ Moves.SPLASH, Moves.REVIVAL_BLESSING ])
+      .battleStyle("double")
+      .enemyMoveset([Moves.SPLASH, Moves.THIEF])
+      .moveset([Moves.SPLASH, Moves.REVIVAL_BLESSING])
       .startingHeldItems([{ name: "WIDE_LENS" }]);
-    await game.classicMode.startBattle([ Species.TREECKO, Species.FEEBAS, Species.MILOTIC ]);
+    await game.classicMode.startBattle([Species.TREECKO, Species.FEEBAS, Species.MILOTIC]);
 
     const treecko = game.scene.getPlayerField()[0];
     const treeckoInitialHeldItems = getHeldItemCount(treecko);
@@ -390,8 +373,8 @@ describe("Abilities - Unburden", () => {
     game.move.select(Moves.REVIVAL_BLESSING, 1);
     await game.forceEnemyMove(Moves.THIEF, BattlerIndex.PLAYER);
     await game.forceEnemyMove(Moves.SPLASH);
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2, BattlerIndex.PLAYER_2 ]);
-    game.doSelectPartyPokemon(0, "MoveEffectPhase");
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2, BattlerIndex.PLAYER_2]);
+    game.doSelectPartyPokemon(0, "RevivalBlessingPhase");
     await game.toNextTurn();
 
     expect(game.scene.getPlayerField()[0]).toBe(treecko);
diff --git a/test/abilities/unseen_fist.test.ts b/test/abilities/unseen_fist.test.ts
new file mode 100644
index 00000000000..6c14e82fc39
--- /dev/null
+++ b/test/abilities/unseen_fist.test.ts
@@ -0,0 +1,97 @@
+import { TurnEndPhase } from "#app/phases/turn-end-phase";
+import { Abilities } from "#enums/abilities";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import GameManager from "#test/testUtils/gameManager";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
+import { BattlerTagType } from "#app/enums/battler-tag-type";
+import { BerryPhase } from "#app/phases/berry-phase";
+
+describe("Abilities - Unseen Fist", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+    game.override.battleStyle("single");
+    game.override.starterSpecies(Species.URSHIFU);
+    game.override.enemySpecies(Species.SNORLAX);
+    game.override.enemyMoveset([Moves.PROTECT, Moves.PROTECT, Moves.PROTECT, Moves.PROTECT]);
+    game.override.startingLevel(100);
+    game.override.enemyLevel(100);
+  });
+
+  it("should cause a contact move to ignore Protect", async () =>
+    await testUnseenFistHitResult(game, Moves.QUICK_ATTACK, Moves.PROTECT, true));
+
+  it("should not cause a non-contact move to ignore Protect", async () =>
+    await testUnseenFistHitResult(game, Moves.ABSORB, Moves.PROTECT, false));
+
+  it("should not apply if the source has Long Reach", async () => {
+    game.override.passiveAbility(Abilities.LONG_REACH);
+    await testUnseenFistHitResult(game, Moves.QUICK_ATTACK, Moves.PROTECT, false);
+  });
+
+  it("should cause a contact move to ignore Wide Guard", async () =>
+    await testUnseenFistHitResult(game, Moves.BREAKING_SWIPE, Moves.WIDE_GUARD, true));
+
+  it("should not cause a non-contact move to ignore Wide Guard", async () =>
+    await testUnseenFistHitResult(game, Moves.BULLDOZE, Moves.WIDE_GUARD, false));
+
+  it("should cause a contact move to ignore Protect, but not Substitute", async () => {
+    game.override.enemyLevel(1);
+    game.override.moveset([Moves.TACKLE]);
+
+    await game.classicMode.startBattle();
+
+    const enemyPokemon = game.scene.getEnemyPokemon()!;
+    enemyPokemon.addTag(BattlerTagType.SUBSTITUTE, 0, Moves.NONE, enemyPokemon.id);
+
+    game.move.select(Moves.TACKLE);
+
+    await game.phaseInterceptor.to(BerryPhase, false);
+
+    expect(enemyPokemon.getTag(BattlerTagType.SUBSTITUTE)).toBeUndefined();
+    expect(enemyPokemon.hp).toBe(enemyPokemon.getMaxHp());
+  });
+});
+
+async function testUnseenFistHitResult(
+  game: GameManager,
+  attackMove: Moves,
+  protectMove: Moves,
+  shouldSucceed = true,
+): Promise<void> {
+  game.override.moveset([attackMove]);
+  game.override.enemyMoveset([protectMove, protectMove, protectMove, protectMove]);
+
+  await game.classicMode.startBattle();
+
+  const leadPokemon = game.scene.getPlayerPokemon()!;
+  expect(leadPokemon).not.toBe(undefined);
+
+  const enemyPokemon = game.scene.getEnemyPokemon()!;
+  expect(enemyPokemon).not.toBe(undefined);
+
+  const enemyStartingHp = enemyPokemon.hp;
+
+  game.move.select(attackMove);
+  await game.phaseInterceptor.to(TurnEndPhase, false);
+
+  if (shouldSucceed) {
+    expect(enemyPokemon.hp).toBeLessThan(enemyStartingHp);
+  } else {
+    expect(enemyPokemon.hp).toBe(enemyStartingHp);
+  }
+}
diff --git a/test/abilities/victory_star.test.ts b/test/abilities/victory_star.test.ts
new file mode 100644
index 00000000000..f3c0b5ad6b7
--- /dev/null
+++ b/test/abilities/victory_star.test.ts
@@ -0,0 +1,60 @@
+import { BattlerIndex } from "#app/battle";
+import { TurnEndPhase } from "#app/phases/turn-end-phase";
+import { Abilities } from "#enums/abilities";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import GameManager from "#test/testUtils/gameManager";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
+
+describe("Abilities - Victory Star", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+    game.override
+      .moveset([Moves.TACKLE, Moves.SPLASH])
+      .battleStyle("double")
+      .disableCrits()
+      .enemySpecies(Species.MAGIKARP)
+      .enemyAbility(Abilities.BALL_FETCH)
+      .enemyMoveset(Moves.SPLASH);
+  });
+
+  it("should increase the accuracy of its user", async () => {
+    await game.classicMode.startBattle([Species.VICTINI, Species.MAGIKARP]);
+
+    const user = game.scene.getPlayerField()[0];
+
+    vi.spyOn(user, "getAccuracyMultiplier");
+    game.move.select(Moves.TACKLE, 0, BattlerIndex.ENEMY);
+    game.move.select(Moves.SPLASH, 1);
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    expect(user.getAccuracyMultiplier).toHaveReturnedWith(1.1);
+  });
+
+  it("should increase the accuracy of its user's ally", async () => {
+    await game.classicMode.startBattle([Species.MAGIKARP, Species.VICTINI]);
+
+    const ally = game.scene.getPlayerField()[0];
+    vi.spyOn(ally, "getAccuracyMultiplier");
+
+    game.move.select(Moves.TACKLE, 0, BattlerIndex.ENEMY);
+    game.move.select(Moves.SPLASH, 1);
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    expect(ally.getAccuracyMultiplier).toHaveReturnedWith(1.1);
+  });
+});
diff --git a/test/abilities/vital_spirit.test.ts b/test/abilities/vital_spirit.test.ts
new file mode 100644
index 00000000000..bb274310cc0
--- /dev/null
+++ b/test/abilities/vital_spirit.test.ts
@@ -0,0 +1,51 @@
+import { Abilities } from "#enums/abilities";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import { StatusEffect } from "#enums/status-effect";
+import GameManager from "#test/testUtils/gameManager";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
+
+describe("Abilities - Vital Spirit", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+    game.override
+      .moveset([Moves.SPLASH])
+      .ability(Abilities.BALL_FETCH)
+      .battleStyle("single")
+      .disableCrits()
+      .enemySpecies(Species.MAGIKARP)
+      .enemyAbility(Abilities.BALL_FETCH)
+      .enemyMoveset(Moves.SPLASH);
+  });
+
+  it("should remove sleep when gained", async () => {
+    game.override
+      .ability(Abilities.INSOMNIA)
+      .enemyAbility(Abilities.BALL_FETCH)
+      .moveset(Moves.SKILL_SWAP)
+      .enemyMoveset(Moves.SPLASH);
+    await game.classicMode.startBattle([Species.FEEBAS]);
+    const enemy = game.scene.getEnemyPokemon();
+    enemy?.trySetStatus(StatusEffect.SLEEP);
+    expect(enemy?.status?.effect).toBe(StatusEffect.SLEEP);
+
+    game.move.select(Moves.SKILL_SWAP);
+    await game.phaseInterceptor.to("BerryPhase");
+
+    expect(enemy?.status).toBeNull();
+  });
+});
diff --git a/src/test/abilities/volt_absorb.test.ts b/test/abilities/volt_absorb.test.ts
similarity index 88%
rename from src/test/abilities/volt_absorb.test.ts
rename to test/abilities/volt_absorb.test.ts
index 4fee7653b99..920c822eb90 100644
--- a/src/test/abilities/volt_absorb.test.ts
+++ b/test/abilities/volt_absorb.test.ts
@@ -4,7 +4,7 @@ import { Abilities } from "#enums/abilities";
 import { BattlerTagType } from "#enums/battler-tag-type";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 import { BattlerIndex } from "#app/battle";
@@ -26,7 +26,7 @@ describe("Abilities - Volt Absorb", () => {
 
   beforeEach(() => {
     game = new GameManager(phaserGame);
-    game.override.battleType("single");
+    game.override.battleStyle("single");
     game.override.disableCrits();
   });
 
@@ -34,9 +34,9 @@ describe("Abilities - Volt Absorb", () => {
     const moveToUse = Moves.CHARGE;
     const ability = Abilities.VOLT_ABSORB;
 
-    game.override.moveset([ moveToUse ]);
+    game.override.moveset([moveToUse]);
     game.override.ability(ability);
-    game.override.enemyMoveset([ Moves.SPLASH, Moves.NONE, Moves.NONE, Moves.NONE ]);
+    game.override.enemyMoveset([Moves.SPLASH, Moves.NONE, Moves.NONE, Moves.NONE]);
     game.override.enemySpecies(Species.DUSKULL);
     game.override.enemyAbility(Abilities.BALL_FETCH);
 
@@ -65,7 +65,7 @@ describe("Abilities - Volt Absorb", () => {
 
     game.move.select(Moves.THUNDERBOLT);
     enemyPokemon.hp = enemyPokemon.hp - 1;
-    await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
     await game.phaseInterceptor.to("MoveEffectPhase");
 
     await game.move.forceMiss();
@@ -85,7 +85,7 @@ describe("Abilities - Volt Absorb", () => {
 
     game.move.select(Moves.THUNDERBOLT);
     enemyPokemon.hp = enemyPokemon.hp - 1;
-    await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
 
     await game.phaseInterceptor.to("BerryPhase", false);
     expect(enemyPokemon.hp).toBeLessThan(enemyPokemon.getMaxHp());
diff --git a/test/abilities/wandering_spirit.test.ts b/test/abilities/wandering_spirit.test.ts
new file mode 100644
index 00000000000..639241aecc8
--- /dev/null
+++ b/test/abilities/wandering_spirit.test.ts
@@ -0,0 +1,65 @@
+import { Stat } from "#app/enums/stat";
+import { Abilities } from "#enums/abilities";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import GameManager from "#test/testUtils/gameManager";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
+
+describe("Abilities - Wandering Spirit", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+    game.override
+      .moveset([Moves.SPLASH])
+      .ability(Abilities.WANDERING_SPIRIT)
+      .battleStyle("single")
+      .disableCrits()
+      .enemySpecies(Species.MAGIKARP)
+      .enemyAbility(Abilities.BALL_FETCH)
+      .enemyMoveset(Moves.TACKLE);
+  });
+
+  it("should exchange abilities when hit with a contact move", async () => {
+    await game.classicMode.startBattle([Species.FEEBAS]);
+
+    game.move.select(Moves.SPLASH);
+    await game.phaseInterceptor.to("BerryPhase");
+
+    expect(game.scene.getPlayerPokemon()?.getAbility().id).toBe(Abilities.BALL_FETCH);
+    expect(game.scene.getEnemyPokemon()?.getAbility().id).toBe(Abilities.WANDERING_SPIRIT);
+  });
+
+  it("should not exchange abilities when hit with a non-contact move", async () => {
+    game.override.enemyMoveset(Moves.EARTHQUAKE);
+    await game.classicMode.startBattle([Species.FEEBAS]);
+
+    game.move.select(Moves.SPLASH);
+    await game.phaseInterceptor.to("BerryPhase");
+
+    expect(game.scene.getPlayerPokemon()?.getAbility().id).toBe(Abilities.WANDERING_SPIRIT);
+    expect(game.scene.getEnemyPokemon()?.getAbility().id).toBe(Abilities.BALL_FETCH);
+  });
+
+  it("should activate post-summon abilities", async () => {
+    game.override.enemyAbility(Abilities.INTIMIDATE);
+    await game.classicMode.startBattle([Species.FEEBAS]);
+
+    game.move.select(Moves.SPLASH);
+    await game.phaseInterceptor.to("BerryPhase");
+
+    expect(game.scene.getEnemyPokemon()?.getStatStage(Stat.ATK)).toBe(-1);
+  });
+});
diff --git a/test/abilities/water_bubble.test.ts b/test/abilities/water_bubble.test.ts
new file mode 100644
index 00000000000..c1e2acbd468
--- /dev/null
+++ b/test/abilities/water_bubble.test.ts
@@ -0,0 +1,51 @@
+import { Abilities } from "#enums/abilities";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import { StatusEffect } from "#enums/status-effect";
+import GameManager from "#test/testUtils/gameManager";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
+
+describe("Abilities - Water Bubble", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+    game.override
+      .moveset([Moves.SPLASH])
+      .ability(Abilities.BALL_FETCH)
+      .battleStyle("single")
+      .disableCrits()
+      .enemySpecies(Species.MAGIKARP)
+      .enemyAbility(Abilities.BALL_FETCH)
+      .enemyMoveset(Moves.SPLASH);
+  });
+
+  it("should remove burn when gained", async () => {
+    game.override
+      .ability(Abilities.THERMAL_EXCHANGE)
+      .enemyAbility(Abilities.BALL_FETCH)
+      .moveset(Moves.SKILL_SWAP)
+      .enemyMoveset(Moves.SPLASH);
+    await game.classicMode.startBattle([Species.FEEBAS]);
+    const enemy = game.scene.getEnemyPokemon();
+    enemy?.trySetStatus(StatusEffect.BURN);
+    expect(enemy?.status?.effect).toBe(StatusEffect.BURN);
+
+    game.move.select(Moves.SKILL_SWAP);
+    await game.phaseInterceptor.to("BerryPhase");
+
+    expect(enemy?.status).toBeNull();
+  });
+});
diff --git a/test/abilities/water_veil.test.ts b/test/abilities/water_veil.test.ts
new file mode 100644
index 00000000000..8e187ad8e58
--- /dev/null
+++ b/test/abilities/water_veil.test.ts
@@ -0,0 +1,51 @@
+import { Abilities } from "#enums/abilities";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import { StatusEffect } from "#enums/status-effect";
+import GameManager from "#test/testUtils/gameManager";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
+
+describe("Abilities - Water Veil", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+    game.override
+      .moveset([Moves.SPLASH])
+      .ability(Abilities.BALL_FETCH)
+      .battleStyle("single")
+      .disableCrits()
+      .enemySpecies(Species.MAGIKARP)
+      .enemyAbility(Abilities.BALL_FETCH)
+      .enemyMoveset(Moves.SPLASH);
+  });
+
+  it("should remove burn when gained", async () => {
+    game.override
+      .ability(Abilities.THERMAL_EXCHANGE)
+      .enemyAbility(Abilities.BALL_FETCH)
+      .moveset(Moves.SKILL_SWAP)
+      .enemyMoveset(Moves.SPLASH);
+    await game.classicMode.startBattle([Species.FEEBAS]);
+    const enemy = game.scene.getEnemyPokemon();
+    enemy?.trySetStatus(StatusEffect.BURN);
+    expect(enemy?.status?.effect).toBe(StatusEffect.BURN);
+
+    game.move.select(Moves.SKILL_SWAP);
+    await game.phaseInterceptor.to("BerryPhase");
+
+    expect(enemy?.status).toBeNull();
+  });
+});
diff --git a/src/test/abilities/wimp_out.test.ts b/test/abilities/wimp_out.test.ts
similarity index 62%
rename from src/test/abilities/wimp_out.test.ts
rename to test/abilities/wimp_out.test.ts
index bff68b54c75..f558efdb103 100644
--- a/src/test/abilities/wimp_out.test.ts
+++ b/test/abilities/wimp_out.test.ts
@@ -1,7 +1,8 @@
 import { BattlerIndex } from "#app/battle";
 import { ArenaTagSide } from "#app/data/arena-tag";
-import { allMoves } from "#app/data/move";
-import GameManager from "#app/test/utils/gameManager";
+import { allMoves } from "#app/data/moves/move";
+import GameManager from "#test/testUtils/gameManager";
+import { toDmgValue } from "#app/utils/common";
 import { Abilities } from "#enums/abilities";
 import { ArenaTagType } from "#enums/arena-tag-type";
 import { BattlerTagType } from "#enums/battler-tag-type";
@@ -30,19 +31,19 @@ describe("Abilities - Wimp Out", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     game.override
-      .battleType("single")
+      .battleStyle("single")
       .ability(Abilities.WIMP_OUT)
       .enemySpecies(Species.NINJASK)
       .enemyPassiveAbility(Abilities.NO_GUARD)
       .startingLevel(90)
       .enemyLevel(70)
-      .moveset([ Moves.SPLASH, Moves.FALSE_SWIPE, Moves.ENDURE ])
+      .moveset([Moves.SPLASH, Moves.FALSE_SWIPE, Moves.ENDURE])
       .enemyMoveset(Moves.FALSE_SWIPE)
       .disableCrits();
   });
 
   function confirmSwitch(): void {
-    const [ pokemon1, pokemon2 ] = game.scene.getPlayerParty();
+    const [pokemon1, pokemon2] = game.scene.getPlayerParty();
 
     expect(game.phaseInterceptor.log).toContain("SwitchSummonPhase");
 
@@ -54,7 +55,7 @@ describe("Abilities - Wimp Out", () => {
   }
 
   function confirmNoSwitch(): void {
-    const [ pokemon1, pokemon2 ] = game.scene.getPlayerParty();
+    const [pokemon1, pokemon2] = game.scene.getPlayerParty();
 
     expect(game.phaseInterceptor.log).not.toContain("SwitchSummonPhase");
 
@@ -66,14 +67,8 @@ describe("Abilities - Wimp Out", () => {
   }
 
   it("triggers regenerator passive single time when switching out with wimp out", async () => {
-    game.override
-      .passiveAbility(Abilities.REGENERATOR)
-      .startingLevel(5)
-      .enemyLevel(100);
-    await game.classicMode.startBattle([
-      Species.WIMPOD,
-      Species.TYRUNT
-    ]);
+    game.override.passiveAbility(Abilities.REGENERATOR).startingLevel(5).enemyLevel(100);
+    await game.classicMode.startBattle([Species.WIMPOD, Species.TYRUNT]);
 
     const wimpod = game.scene.getPlayerPokemon()!;
 
@@ -87,10 +82,7 @@ describe("Abilities - Wimp Out", () => {
 
   it("It makes wild pokemon flee if triggered", async () => {
     game.override.enemyAbility(Abilities.WIMP_OUT);
-    await game.classicMode.startBattle([
-      Species.GOLISOPOD,
-      Species.TYRUNT
-    ]);
+    await game.classicMode.startBattle([Species.GOLISOPOD, Species.TYRUNT]);
 
     const enemyPokemon = game.scene.getEnemyPokemon()!;
     enemyPokemon.hp *= 0.52;
@@ -104,10 +96,7 @@ describe("Abilities - Wimp Out", () => {
   });
 
   it("Does not trigger when HP already below half", async () => {
-    await game.classicMode.startBattle([
-      Species.WIMPOD,
-      Species.TYRUNT
-    ]);
+    await game.classicMode.startBattle([Species.WIMPOD, Species.TYRUNT]);
     const wimpod = game.scene.getPlayerPokemon()!;
     wimpod.hp = 5;
 
@@ -119,14 +108,8 @@ describe("Abilities - Wimp Out", () => {
   });
 
   it("Trapping moves do not prevent Wimp Out from activating.", async () => {
-    game.override
-      .enemyMoveset([ Moves.SPIRIT_SHACKLE ])
-      .startingLevel(53)
-      .enemyLevel(45);
-    await game.classicMode.startBattle([
-      Species.WIMPOD,
-      Species.TYRUNT
-    ]);
+    game.override.enemyMoveset([Moves.SPIRIT_SHACKLE]).startingLevel(53).enemyLevel(45);
+    await game.classicMode.startBattle([Species.WIMPOD, Species.TYRUNT]);
 
     game.move.select(Moves.SPLASH);
     game.doSelectPartyPokemon(1);
@@ -140,13 +123,8 @@ describe("Abilities - Wimp Out", () => {
   });
 
   it("If this Ability activates due to being hit by U-turn or Volt Switch, the user of that move will not be switched out.", async () => {
-    game.override
-      .startingLevel(95)
-      .enemyMoveset([ Moves.U_TURN ]);
-    await game.classicMode.startBattle([
-      Species.WIMPOD,
-      Species.TYRUNT
-    ]);
+    game.override.startingLevel(95).enemyMoveset([Moves.U_TURN]);
+    await game.classicMode.startBattle([Species.WIMPOD, Species.TYRUNT]);
 
     game.move.select(Moves.SPLASH);
     game.doSelectPartyPokemon(1);
@@ -159,14 +137,8 @@ describe("Abilities - Wimp Out", () => {
   });
 
   it("If this Ability does not activate due to being hit by U-turn or Volt Switch, the user of that move will be switched out.", async () => {
-    game.override
-      .startingLevel(190)
-      .startingWave(8)
-      .enemyMoveset([ Moves.U_TURN ]);
-    await game.classicMode.startBattle([
-      Species.GOLISOPOD,
-      Species.TYRUNT
-    ]);
+    game.override.startingLevel(190).startingWave(8).enemyMoveset([Moves.U_TURN]);
+    await game.classicMode.startBattle([Species.GOLISOPOD, Species.TYRUNT]);
     const RIVAL_NINJASK1 = game.scene.getEnemyPokemon()?.id;
     game.move.select(Moves.SPLASH);
     await game.phaseInterceptor.to("BerryPhase", false);
@@ -174,13 +146,8 @@ describe("Abilities - Wimp Out", () => {
   });
 
   it("Dragon Tail and Circle Throw switch out Pokémon before the Ability activates.", async () => {
-    game.override
-      .startingLevel(69)
-      .enemyMoveset([ Moves.DRAGON_TAIL ]);
-    await game.classicMode.startBattle([
-      Species.WIMPOD,
-      Species.TYRUNT
-    ]);
+    game.override.startingLevel(69).enemyMoveset([Moves.DRAGON_TAIL]);
+    await game.classicMode.startBattle([Species.WIMPOD, Species.TYRUNT]);
 
     const wimpod = game.scene.getPlayerPokemon()!;
 
@@ -188,7 +155,7 @@ describe("Abilities - Wimp Out", () => {
     game.doSelectPartyPokemon(1);
     await game.phaseInterceptor.to("SwitchSummonPhase", false);
 
-    expect(wimpod.summonData.abilitiesApplied).not.toContain(Abilities.WIMP_OUT);
+    expect(wimpod.waveData.abilitiesApplied).not.toContain(Abilities.WIMP_OUT);
 
     await game.phaseInterceptor.to("TurnEndPhase");
 
@@ -196,13 +163,8 @@ describe("Abilities - Wimp Out", () => {
   });
 
   it("triggers when recoil damage is taken", async () => {
-    game.override
-      .moveset([ Moves.HEAD_SMASH ])
-      .enemyMoveset([ Moves.SPLASH ]);
-    await game.classicMode.startBattle([
-      Species.WIMPOD,
-      Species.TYRUNT
-    ]);
+    game.override.moveset([Moves.HEAD_SMASH]).enemyMoveset([Moves.SPLASH]);
+    await game.classicMode.startBattle([Species.WIMPOD, Species.TYRUNT]);
 
     game.move.select(Moves.HEAD_SMASH);
     game.doSelectPartyPokemon(1);
@@ -212,13 +174,8 @@ describe("Abilities - Wimp Out", () => {
   });
 
   it("It does not activate when the Pokémon cuts its own HP", async () => {
-    game.override
-      .moveset([ Moves.SUBSTITUTE ])
-      .enemyMoveset([ Moves.SPLASH ]);
-    await game.classicMode.startBattle([
-      Species.WIMPOD,
-      Species.TYRUNT
-    ]);
+    game.override.moveset([Moves.SUBSTITUTE]).enemyMoveset([Moves.SPLASH]);
+    await game.classicMode.startBattle([Species.WIMPOD, Species.TYRUNT]);
 
     const wimpod = game.scene.getPlayerPokemon()!;
     wimpod.hp *= 0.52;
@@ -230,13 +187,8 @@ describe("Abilities - Wimp Out", () => {
   });
 
   it("Does not trigger when neutralized", async () => {
-    game.override
-      .enemyAbility(Abilities.NEUTRALIZING_GAS)
-      .startingLevel(5);
-    await game.classicMode.startBattle([
-      Species.WIMPOD,
-      Species.TYRUNT
-    ]);
+    game.override.enemyAbility(Abilities.NEUTRALIZING_GAS).startingLevel(5);
+    await game.classicMode.startBattle([Species.WIMPOD, Species.TYRUNT]);
 
     game.move.select(Moves.SPLASH);
     await game.phaseInterceptor.to("TurnEndPhase");
@@ -244,38 +196,36 @@ describe("Abilities - Wimp Out", () => {
     confirmNoSwitch();
   });
 
-  it("If it falls below half and recovers back above half from a Shell Bell, Wimp Out will activate even after the Shell Bell recovery", async () => {
-    game.override
-      .moveset([ Moves.DOUBLE_EDGE ])
-      .enemyMoveset([ Moves.SPLASH ])
-      .startingHeldItems([
-        { name: "SHELL_BELL", count: 3 },
-        { name: "HEALING_CHARM", count: 5 },
-      ]);
-    await game.classicMode.startBattle([
-      Species.WIMPOD,
-      Species.TYRUNT
-    ]);
+  // TODO: Enable when this behavior is fixed (currently Shell Bell won't activate if Wimp Out activates because
+  // the pokemon is removed from the field before the Shell Bell modifier is applied, so it can't see the
+  // damage dealt and doesn't heal the pokemon)
+  it.todo(
+    "If it falls below half and recovers back above half from a Shell Bell, Wimp Out will activate even after the Shell Bell recovery",
+    async () => {
+      game.override
+        .moveset([Moves.DOUBLE_EDGE])
+        .enemyMoveset([Moves.SPLASH])
+        .startingHeldItems([{ name: "SHELL_BELL", count: 4 }]);
+      await game.classicMode.startBattle([Species.WIMPOD, Species.TYRUNT]);
 
-    game.scene.getPlayerPokemon()!.hp *= 0.75;
+      const wimpod = game.scene.getPlayerPokemon()!;
 
-    game.move.select(Moves.DOUBLE_EDGE);
-    game.doSelectPartyPokemon(1);
-    await game.phaseInterceptor.to("TurnEndPhase");
+      wimpod.damageAndUpdate(toDmgValue(wimpod.getMaxHp() * 0.4));
 
-    expect(game.scene.getPlayerParty()[1].getHpRatio()).toBeGreaterThan(0.5);
-    expect(game.phaseInterceptor.log).toContain("SwitchSummonPhase");
-    expect(game.scene.getPlayerPokemon()!.species.speciesId).toBe(Species.TYRUNT);
-  });
+      game.move.select(Moves.DOUBLE_EDGE);
+      game.doSelectPartyPokemon(1);
+      await game.phaseInterceptor.to("TurnEndPhase");
+
+      expect(game.scene.getPlayerParty()[1]).toBe(wimpod);
+      expect(wimpod.hp).toBeGreaterThan(toDmgValue(wimpod.getMaxHp() / 2));
+      expect(game.phaseInterceptor.log).toContain("SwitchSummonPhase");
+      expect(game.scene.getPlayerPokemon()!.species.speciesId).toBe(Species.TYRUNT);
+    },
+  );
 
   it("Wimp Out will activate due to weather damage", async () => {
-    game.override
-      .weather(WeatherType.HAIL)
-      .enemyMoveset([ Moves.SPLASH ]);
-    await game.classicMode.startBattle([
-      Species.WIMPOD,
-      Species.TYRUNT
-    ]);
+    game.override.weather(WeatherType.HAIL).enemyMoveset([Moves.SPLASH]);
+    await game.classicMode.startBattle([Species.WIMPOD, Species.TYRUNT]);
 
     game.scene.getPlayerPokemon()!.hp *= 0.51;
 
@@ -287,14 +237,8 @@ describe("Abilities - Wimp Out", () => {
   });
 
   it("Does not trigger when enemy has sheer force", async () => {
-    game.override
-      .enemyAbility(Abilities.SHEER_FORCE)
-      .enemyMoveset(Moves.SLUDGE_BOMB)
-      .startingLevel(95);
-    await game.classicMode.startBattle([
-      Species.WIMPOD,
-      Species.TYRUNT
-    ]);
+    game.override.enemyAbility(Abilities.SHEER_FORCE).enemyMoveset(Moves.SLUDGE_BOMB).startingLevel(95);
+    await game.classicMode.startBattle([Species.WIMPOD, Species.TYRUNT]);
 
     game.scene.getPlayerPokemon()!.hp *= 0.51;
 
@@ -305,13 +249,8 @@ describe("Abilities - Wimp Out", () => {
   });
 
   it("Wimp Out will activate due to post turn status damage", async () => {
-    game.override
-      .statusEffect(StatusEffect.POISON)
-      .enemyMoveset([ Moves.SPLASH ]);
-    await game.classicMode.startBattle([
-      Species.WIMPOD,
-      Species.TYRUNT
-    ]);
+    game.override.statusEffect(StatusEffect.POISON).enemyMoveset([Moves.SPLASH]);
+    await game.classicMode.startBattle([Species.WIMPOD, Species.TYRUNT]);
 
     game.scene.getPlayerPokemon()!.hp *= 0.51;
 
@@ -323,13 +262,8 @@ describe("Abilities - Wimp Out", () => {
   });
 
   it("Wimp Out will activate due to bad dreams", async () => {
-    game.override
-      .statusEffect(StatusEffect.SLEEP)
-      .enemyAbility(Abilities.BAD_DREAMS);
-    await game.classicMode.startBattle([
-      Species.WIMPOD,
-      Species.TYRUNT
-    ]);
+    game.override.statusEffect(StatusEffect.SLEEP).enemyAbility(Abilities.BAD_DREAMS);
+    await game.classicMode.startBattle([Species.WIMPOD, Species.TYRUNT]);
 
     game.scene.getPlayerPokemon()!.hp *= 0.52;
 
@@ -341,12 +275,8 @@ describe("Abilities - Wimp Out", () => {
   });
 
   it("Wimp Out will activate due to leech seed", async () => {
-    game.override
-      .enemyMoveset([ Moves.LEECH_SEED ]);
-    await game.classicMode.startBattle([
-      Species.WIMPOD,
-      Species.TYRUNT
-    ]);
+    game.override.enemyMoveset([Moves.LEECH_SEED]);
+    await game.classicMode.startBattle([Species.WIMPOD, Species.TYRUNT]);
     game.scene.getPlayerPokemon()!.hp *= 0.52;
 
     game.move.select(Moves.SPLASH);
@@ -357,13 +287,8 @@ describe("Abilities - Wimp Out", () => {
   });
 
   it("Wimp Out will activate due to curse damage", async () => {
-    game.override
-      .enemySpecies(Species.DUSKNOIR)
-      .enemyMoveset([ Moves.CURSE ]);
-    await game.classicMode.startBattle([
-      Species.WIMPOD,
-      Species.TYRUNT
-    ]);
+    game.override.enemySpecies(Species.DUSKNOIR).enemyMoveset([Moves.CURSE]);
+    await game.classicMode.startBattle([Species.WIMPOD, Species.TYRUNT]);
     game.scene.getPlayerPokemon()!.hp *= 0.52;
 
     game.move.select(Moves.SPLASH);
@@ -374,15 +299,9 @@ describe("Abilities - Wimp Out", () => {
   });
 
   it("Wimp Out will activate due to salt cure damage", async () => {
-    game.override
-      .enemySpecies(Species.NACLI)
-      .enemyMoveset([ Moves.SALT_CURE ])
-      .enemyLevel(1);
-    await game.classicMode.startBattle([
-      Species.WIMPOD,
-      Species.TYRUNT
-    ]);
-    game.scene.getPlayerPokemon()!.hp *= 0.70;
+    game.override.enemySpecies(Species.NACLI).enemyMoveset([Moves.SALT_CURE]).enemyLevel(1);
+    await game.classicMode.startBattle([Species.WIMPOD, Species.TYRUNT]);
+    game.scene.getPlayerPokemon()!.hp *= 0.7;
 
     game.move.select(Moves.SPLASH);
     game.doSelectPartyPokemon(1);
@@ -392,14 +311,8 @@ describe("Abilities - Wimp Out", () => {
   });
 
   it("Wimp Out will activate due to damaging trap damage", async () => {
-    game.override
-      .enemySpecies(Species.MAGIKARP)
-      .enemyMoveset([ Moves.WHIRLPOOL ])
-      .enemyLevel(1);
-    await game.classicMode.startBattle([
-      Species.WIMPOD,
-      Species.TYRUNT
-    ]);
+    game.override.enemySpecies(Species.MAGIKARP).enemyMoveset([Moves.WHIRLPOOL]).enemyLevel(1);
+    await game.classicMode.startBattle([Species.WIMPOD, Species.TYRUNT]);
     game.scene.getPlayerPokemon()!.hp *= 0.55;
 
     game.move.select(Moves.SPLASH);
@@ -414,13 +327,10 @@ describe("Abilities - Wimp Out", () => {
     game.scene.arena.addTag(ArenaTagType.SPIKES, 1, Moves.SPIKES, 0, ArenaTagSide.ENEMY);
     game.override
       .passiveAbility(Abilities.MAGIC_GUARD)
-      .enemyMoveset([ Moves.LEECH_SEED ])
+      .enemyMoveset([Moves.LEECH_SEED])
       .weather(WeatherType.HAIL)
       .statusEffect(StatusEffect.POISON);
-    await game.classicMode.startBattle([
-      Species.WIMPOD,
-      Species.TYRUNT
-    ]);
+    await game.classicMode.startBattle([Species.WIMPOD, Species.TYRUNT]);
     game.scene.getPlayerPokemon()!.hp *= 0.51;
 
     game.move.select(Moves.SPLASH);
@@ -432,15 +342,8 @@ describe("Abilities - Wimp Out", () => {
   });
 
   it("Wimp Out activating should not cancel a double battle", async () => {
-    game.override
-      .battleType("double")
-      .enemyAbility(Abilities.WIMP_OUT)
-      .enemyMoveset([ Moves.SPLASH ])
-      .enemyLevel(1);
-    await game.classicMode.startBattle([
-      Species.WIMPOD,
-      Species.TYRUNT
-    ]);
+    game.override.battleStyle("double").enemyAbility(Abilities.WIMP_OUT).enemyMoveset([Moves.SPLASH]).enemyLevel(1);
+    await game.classicMode.startBattle([Species.WIMPOD, Species.TYRUNT]);
     const enemyLeadPokemon = game.scene.getEnemyParty()[0];
     const enemySecPokemon = game.scene.getEnemyParty()[1];
 
@@ -460,15 +363,12 @@ describe("Abilities - Wimp Out", () => {
 
   it("Wimp Out will activate due to aftermath", async () => {
     game.override
-      .moveset([ Moves.THUNDER_PUNCH ])
+      .moveset([Moves.THUNDER_PUNCH])
       .enemySpecies(Species.MAGIKARP)
       .enemyAbility(Abilities.AFTERMATH)
-      .enemyMoveset([ Moves.SPLASH ])
+      .enemyMoveset([Moves.SPLASH])
       .enemyLevel(1);
-    await game.classicMode.startBattle([
-      Species.WIMPOD,
-      Species.TYRUNT
-    ]);
+    await game.classicMode.startBattle([Species.WIMPOD, Species.TYRUNT]);
     game.scene.getPlayerPokemon()!.hp *= 0.51;
 
     game.move.select(Moves.THUNDER_PUNCH);
@@ -481,26 +381,16 @@ describe("Abilities - Wimp Out", () => {
   it("Activates due to entry hazards", async () => {
     game.scene.arena.addTag(ArenaTagType.STEALTH_ROCK, 1, Moves.STEALTH_ROCK, 0, ArenaTagSide.ENEMY);
     game.scene.arena.addTag(ArenaTagType.SPIKES, 1, Moves.SPIKES, 0, ArenaTagSide.ENEMY);
-    game.override
-      .enemySpecies(Species.CENTISKORCH)
-      .enemyAbility(Abilities.WIMP_OUT)
-      .startingWave(4);
-    await game.classicMode.startBattle([
-      Species.TYRUNT
-    ]);
+    game.override.enemySpecies(Species.CENTISKORCH).enemyAbility(Abilities.WIMP_OUT).startingWave(4);
+    await game.classicMode.startBattle([Species.TYRUNT]);
 
     expect(game.phaseInterceptor.log).not.toContain("MovePhase");
     expect(game.phaseInterceptor.log).toContain("BattleEndPhase");
   });
 
   it("Wimp Out will activate due to Nightmare", async () => {
-    game.override
-      .enemyMoveset([ Moves.NIGHTMARE ])
-      .statusEffect(StatusEffect.SLEEP);
-    await game.classicMode.startBattle([
-      Species.WIMPOD,
-      Species.TYRUNT
-    ]);
+    game.override.enemyMoveset([Moves.NIGHTMARE]).statusEffect(StatusEffect.SLEEP);
+    await game.classicMode.startBattle([Species.WIMPOD, Species.TYRUNT]);
     game.scene.getPlayerPokemon()!.hp *= 0.65;
 
     game.move.select(Moves.SPLASH);
@@ -511,13 +401,8 @@ describe("Abilities - Wimp Out", () => {
   });
 
   it("triggers status on the wimp out user before a new pokemon is switched in", async () => {
-    game.override
-      .enemyMoveset(Moves.SLUDGE_BOMB)
-      .startingLevel(80);
-    await game.classicMode.startBattle([
-      Species.WIMPOD,
-      Species.TYRUNT
-    ]);
+    game.override.enemyMoveset(Moves.SLUDGE_BOMB).startingLevel(80);
+    await game.classicMode.startBattle([Species.WIMPOD, Species.TYRUNT]);
     vi.spyOn(allMoves[Moves.SLUDGE_BOMB], "chance", "get").mockReturnValue(100);
 
     game.move.select(Moves.SPLASH);
@@ -529,13 +414,8 @@ describe("Abilities - Wimp Out", () => {
   });
 
   it("triggers after last hit of multi hit move", async () => {
-    game.override
-      .enemyMoveset(Moves.BULLET_SEED)
-      .enemyAbility(Abilities.SKILL_LINK);
-    await game.classicMode.startBattle([
-      Species.WIMPOD,
-      Species.TYRUNT
-    ]);
+    game.override.enemyMoveset(Moves.BULLET_SEED).enemyAbility(Abilities.SKILL_LINK);
+    await game.classicMode.startBattle([Species.WIMPOD, Species.TYRUNT]);
 
     game.scene.getPlayerPokemon()!.hp *= 0.51;
 
@@ -550,13 +430,8 @@ describe("Abilities - Wimp Out", () => {
   });
 
   it("triggers after last hit of multi hit move (multi lens)", async () => {
-    game.override
-      .enemyMoveset(Moves.TACKLE)
-      .enemyHeldItems([{ name: "MULTI_LENS", count: 1 }]);
-    await game.classicMode.startBattle([
-      Species.WIMPOD,
-      Species.TYRUNT
-    ]);
+    game.override.enemyMoveset(Moves.TACKLE).enemyHeldItems([{ name: "MULTI_LENS", count: 1 }]);
+    await game.classicMode.startBattle([Species.WIMPOD, Species.TYRUNT]);
 
     game.scene.getPlayerPokemon()!.hp *= 0.51;
 
@@ -570,13 +445,8 @@ describe("Abilities - Wimp Out", () => {
     confirmSwitch();
   });
   it("triggers after last hit of Parental Bond", async () => {
-    game.override
-      .enemyMoveset(Moves.TACKLE)
-      .enemyAbility(Abilities.PARENTAL_BOND);
-    await game.classicMode.startBattle([
-      Species.WIMPOD,
-      Species.TYRUNT
-    ]);
+    game.override.enemyMoveset(Moves.TACKLE).enemyAbility(Abilities.PARENTAL_BOND);
+    await game.classicMode.startBattle([Species.WIMPOD, Species.TYRUNT]);
 
     game.scene.getPlayerPokemon()!.hp *= 0.51;
 
@@ -591,34 +461,30 @@ describe("Abilities - Wimp Out", () => {
   });
 
   // TODO: This interaction is not implemented yet
-  it.todo("Wimp Out will not activate if the Pokémon's HP falls below half due to hurting itself in confusion", async () => {
-    game.override
-      .moveset([ Moves.SWORDS_DANCE ])
-      .enemyMoveset([ Moves.SWAGGER ]);
-    await game.classicMode.startBattle([
-      Species.WIMPOD,
-      Species.TYRUNT
-    ]);
-    const playerPokemon = game.scene.getPlayerPokemon()!;
-    playerPokemon.hp *= 0.51;
-    playerPokemon.setStatStage(Stat.ATK, 6);
-    playerPokemon.addTag(BattlerTagType.CONFUSED);
+  it.todo(
+    "Wimp Out will not activate if the Pokémon's HP falls below half due to hurting itself in confusion",
+    async () => {
+      game.override.moveset([Moves.SWORDS_DANCE]).enemyMoveset([Moves.SWAGGER]);
+      await game.classicMode.startBattle([Species.WIMPOD, Species.TYRUNT]);
+      const playerPokemon = game.scene.getPlayerPokemon()!;
+      playerPokemon.hp *= 0.51;
+      playerPokemon.setStatStage(Stat.ATK, 6);
+      playerPokemon.addTag(BattlerTagType.CONFUSED);
 
-    // TODO: add helper function to force confusion self-hits
+      // TODO: add helper function to force confusion self-hits
 
-    while (playerPokemon.getHpRatio() > 0.49) {
-      game.move.select(Moves.SWORDS_DANCE);
-      await game.phaseInterceptor.to("TurnEndPhase");
-    }
+      while (playerPokemon.getHpRatio() > 0.49) {
+        game.move.select(Moves.SWORDS_DANCE);
+        await game.phaseInterceptor.to("TurnEndPhase");
+      }
 
-    confirmNoSwitch();
-  });
+      confirmNoSwitch();
+    },
+  );
 
   it("should not activate on wave X0 bosses", async () => {
-    game.override.enemyAbility(Abilities.WIMP_OUT)
-      .startingLevel(5850)
-      .startingWave(10);
-    await game.classicMode.startBattle([ Species.GOLISOPOD ]);
+    game.override.enemyAbility(Abilities.WIMP_OUT).startingLevel(5850).startingWave(10);
+    await game.classicMode.startBattle([Species.GOLISOPOD]);
 
     const enemyPokemon = game.scene.getEnemyPokemon()!;
 
@@ -632,26 +498,24 @@ describe("Abilities - Wimp Out", () => {
     const hasFled = enemyPokemon.switchOutStatus;
     expect(isVisible && !hasFled).toBe(true);
   });
+
   it("wimp out will not skip battles when triggered in a double battle", async () => {
     const wave = 2;
     game.override
       .enemyMoveset(Moves.SPLASH)
       .enemySpecies(Species.WIMPOD)
       .enemyAbility(Abilities.WIMP_OUT)
-      .moveset([ Moves.MATCHA_GOTCHA, Moves.FALSE_SWIPE ])
+      .moveset([Moves.MATCHA_GOTCHA, Moves.FALSE_SWIPE])
       .startingLevel(50)
       .enemyLevel(1)
-      .battleType("double")
+      .battleStyle("double")
       .startingWave(wave);
-    await game.classicMode.startBattle([
-      Species.RAICHU,
-      Species.PIKACHU
-    ]);
-    const [ wimpod0, wimpod1 ] = game.scene.getEnemyField();
+    await game.classicMode.startBattle([Species.RAICHU, Species.PIKACHU]);
+    const [wimpod0, wimpod1] = game.scene.getEnemyField();
 
     game.move.select(Moves.FALSE_SWIPE, 0, BattlerIndex.ENEMY);
     game.move.select(Moves.MATCHA_GOTCHA, 1);
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2 ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2]);
     await game.phaseInterceptor.to("TurnEndPhase");
 
     expect(wimpod0.hp).toBeGreaterThan(0);
@@ -662,4 +526,28 @@ describe("Abilities - Wimp Out", () => {
     await game.toNextWave();
     expect(game.scene.currentBattle.waveIndex).toBe(wave + 1);
   });
+
+  it("wimp out should not skip battles when triggering the same turn as another enemy faints", async () => {
+    const wave = 2;
+    game.override
+      .enemySpecies(Species.WIMPOD)
+      .enemyAbility(Abilities.WIMP_OUT)
+      .startingLevel(50)
+      .enemyLevel(1)
+      .enemyMoveset([Moves.SPLASH, Moves.ENDURE])
+      .battleStyle("double")
+      .moveset([Moves.DRAGON_ENERGY, Moves.SPLASH])
+      .startingWave(wave);
+
+    await game.classicMode.startBattle([Species.REGIDRAGO, Species.MAGIKARP]);
+
+    // turn 1
+    game.move.select(Moves.DRAGON_ENERGY, 0);
+    game.move.select(Moves.SPLASH, 1);
+    await game.forceEnemyMove(Moves.SPLASH);
+    await game.forceEnemyMove(Moves.ENDURE);
+
+    await game.phaseInterceptor.to("SelectModifierPhase");
+    expect(game.scene.currentBattle.waveIndex).toBe(wave + 1);
+  });
 });
diff --git a/src/test/abilities/wind_power.test.ts b/test/abilities/wind_power.test.ts
similarity index 87%
rename from src/test/abilities/wind_power.test.ts
rename to test/abilities/wind_power.test.ts
index 538b65f898b..66c72d454ab 100644
--- a/src/test/abilities/wind_power.test.ts
+++ b/test/abilities/wind_power.test.ts
@@ -3,7 +3,7 @@ import { TurnEndPhase } from "#app/phases/turn-end-phase";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
@@ -23,15 +23,15 @@ describe("Abilities - Wind Power", () => {
 
   beforeEach(() => {
     game = new GameManager(phaserGame);
-    game.override.battleType("single");
+    game.override.battleStyle("single");
     game.override.enemySpecies(Species.SHIFTRY);
     game.override.enemyAbility(Abilities.WIND_POWER);
-    game.override.moveset([ Moves.TAILWIND, Moves.SPLASH, Moves.PETAL_BLIZZARD, Moves.SANDSTORM ]);
+    game.override.moveset([Moves.TAILWIND, Moves.SPLASH, Moves.PETAL_BLIZZARD, Moves.SANDSTORM]);
     game.override.enemyMoveset(Moves.SPLASH);
   });
 
   it("it becomes charged when hit by wind moves", async () => {
-    await game.startBattle([ Species.MAGIKARP ]);
+    await game.startBattle([Species.MAGIKARP]);
     const shiftry = game.scene.getEnemyPokemon()!;
 
     expect(shiftry.getTag(BattlerTagType.CHARGED)).toBeUndefined();
@@ -46,7 +46,7 @@ describe("Abilities - Wind Power", () => {
     game.override.ability(Abilities.WIND_POWER);
     game.override.enemySpecies(Species.MAGIKARP);
 
-    await game.startBattle([ Species.SHIFTRY ]);
+    await game.startBattle([Species.SHIFTRY]);
     const shiftry = game.scene.getPlayerPokemon()!;
 
     expect(shiftry.getTag(BattlerTagType.CHARGED)).toBeUndefined();
@@ -61,7 +61,7 @@ describe("Abilities - Wind Power", () => {
     game.override.enemySpecies(Species.MAGIKARP);
     game.override.ability(Abilities.WIND_POWER);
 
-    await game.startBattle([ Species.SHIFTRY ]);
+    await game.startBattle([Species.SHIFTRY]);
     const magikarp = game.scene.getEnemyPokemon()!;
     const shiftry = game.scene.getPlayerPokemon()!;
 
@@ -79,7 +79,7 @@ describe("Abilities - Wind Power", () => {
   it("does not interact with Sandstorm", async () => {
     game.override.enemySpecies(Species.MAGIKARP);
 
-    await game.startBattle([ Species.SHIFTRY ]);
+    await game.startBattle([Species.SHIFTRY]);
     const shiftry = game.scene.getPlayerPokemon()!;
 
     expect(shiftry.getTag(BattlerTagType.CHARGED)).toBeUndefined();
diff --git a/src/test/abilities/wind_rider.test.ts b/test/abilities/wind_rider.test.ts
similarity index 79%
rename from src/test/abilities/wind_rider.test.ts
rename to test/abilities/wind_rider.test.ts
index cd7094fb0a9..f8301aa03fc 100644
--- a/src/test/abilities/wind_rider.test.ts
+++ b/test/abilities/wind_rider.test.ts
@@ -1,5 +1,5 @@
 import { Stat } from "#enums/stat";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
@@ -23,15 +23,15 @@ describe("Abilities - Wind Rider", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     game.override
-      .battleType("single")
+      .battleStyle("single")
       .enemySpecies(Species.SHIFTRY)
       .enemyAbility(Abilities.WIND_RIDER)
-      .moveset([ Moves.TAILWIND, Moves.SPLASH, Moves.PETAL_BLIZZARD, Moves.SANDSTORM ])
+      .moveset([Moves.TAILWIND, Moves.SPLASH, Moves.PETAL_BLIZZARD, Moves.SANDSTORM])
       .enemyMoveset(Moves.SPLASH);
   });
 
   it("takes no damage from wind moves and its ATK stat stage is raised by 1 when hit by one", async () => {
-    await game.classicMode.startBattle([ Species.MAGIKARP ]);
+    await game.classicMode.startBattle([Species.MAGIKARP]);
     const shiftry = game.scene.getEnemyPokemon()!;
 
     expect(shiftry.getStatStage(Stat.ATK)).toBe(0);
@@ -45,11 +45,9 @@ describe("Abilities - Wind Rider", () => {
   });
 
   it("ATK stat stage is raised by 1 when Tailwind is present on its side", async () => {
-    game.override
-      .enemySpecies(Species.MAGIKARP)
-      .ability(Abilities.WIND_RIDER);
+    game.override.enemySpecies(Species.MAGIKARP).ability(Abilities.WIND_RIDER);
 
-    await game.classicMode.startBattle([ Species.SHIFTRY ]);
+    await game.classicMode.startBattle([Species.SHIFTRY]);
     const shiftry = game.scene.getPlayerPokemon()!;
 
     expect(shiftry.getStatStage(Stat.ATK)).toBe(0);
@@ -62,11 +60,9 @@ describe("Abilities - Wind Rider", () => {
   });
 
   it("does not raise ATK stat stage when Tailwind is present on opposing side", async () => {
-    game.override
-      .enemySpecies(Species.MAGIKARP)
-      .ability(Abilities.WIND_RIDER);
+    game.override.enemySpecies(Species.MAGIKARP).ability(Abilities.WIND_RIDER);
 
-    await game.classicMode.startBattle([ Species.SHIFTRY ]);
+    await game.classicMode.startBattle([Species.SHIFTRY]);
     const magikarp = game.scene.getEnemyPokemon()!;
     const shiftry = game.scene.getPlayerPokemon()!;
 
@@ -82,11 +78,9 @@ describe("Abilities - Wind Rider", () => {
   });
 
   it("does not raise ATK stat stage when Tailwind is present on opposing side", async () => {
-    game.override
-      .enemySpecies(Species.MAGIKARP)
-      .ability(Abilities.WIND_RIDER);
+    game.override.enemySpecies(Species.MAGIKARP).ability(Abilities.WIND_RIDER);
 
-    await game.classicMode.startBattle([ Species.SHIFTRY ]);
+    await game.classicMode.startBattle([Species.SHIFTRY]);
     const magikarp = game.scene.getEnemyPokemon()!;
     const shiftry = game.scene.getPlayerPokemon()!;
 
@@ -104,7 +98,7 @@ describe("Abilities - Wind Rider", () => {
   it("does not interact with Sandstorm", async () => {
     game.override.enemySpecies(Species.MAGIKARP);
 
-    await game.classicMode.startBattle([ Species.SHIFTRY ]);
+    await game.classicMode.startBattle([Species.SHIFTRY]);
     const shiftry = game.scene.getPlayerPokemon()!;
 
     expect(shiftry.getStatStage(Stat.ATK)).toBe(0);
diff --git a/src/test/abilities/wonder_skin.test.ts b/test/abilities/wonder_skin.test.ts
similarity index 72%
rename from src/test/abilities/wonder_skin.test.ts
rename to test/abilities/wonder_skin.test.ts
index 6b25701e36a..d039ba1e6a7 100644
--- a/src/test/abilities/wonder_skin.test.ts
+++ b/test/abilities/wonder_skin.test.ts
@@ -1,10 +1,9 @@
-import { allAbilities } from "#app/data/ability";
-import { allMoves } from "#app/data/move";
+import { allMoves } from "#app/data/moves/move";
 import { MoveEffectPhase } from "#app/phases/move-effect-phase";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
@@ -24,8 +23,8 @@ describe("Abilities - Wonder Skin", () => {
 
   beforeEach(() => {
     game = new GameManager(phaserGame);
-    game.override.battleType("single");
-    game.override.moveset([ Moves.TACKLE, Moves.CHARM ]);
+    game.override.battleStyle("single");
+    game.override.moveset([Moves.TACKLE, Moves.CHARM]);
     game.override.ability(Abilities.BALL_FETCH);
     game.override.enemySpecies(Species.SHUCKLE);
     game.override.enemyAbility(Abilities.WONDER_SKIN);
@@ -37,7 +36,7 @@ describe("Abilities - Wonder Skin", () => {
 
     vi.spyOn(moveToCheck, "calculateBattleAccuracy");
 
-    await game.startBattle([ Species.PIKACHU ]);
+    await game.startBattle([Species.PIKACHU]);
     game.move.select(Moves.CHARM);
     await game.phaseInterceptor.to(MoveEffectPhase);
 
@@ -49,23 +48,28 @@ describe("Abilities - Wonder Skin", () => {
 
     vi.spyOn(moveToCheck, "calculateBattleAccuracy");
 
-    await game.startBattle([ Species.PIKACHU ]);
+    await game.startBattle([Species.PIKACHU]);
     game.move.select(Moves.TACKLE);
     await game.phaseInterceptor.to(MoveEffectPhase);
 
     expect(moveToCheck.calculateBattleAccuracy).toHaveReturnedWith(100);
   });
 
-  const bypassAbilities = [ Abilities.MOLD_BREAKER, Abilities.TERAVOLT, Abilities.TURBOBLAZE ];
+  const bypassAbilities = [
+    [Abilities.MOLD_BREAKER, "Mold Breaker"],
+    [Abilities.TERAVOLT, "Teravolt"],
+    [Abilities.TURBOBLAZE, "Turboblaze"],
+  ];
 
   bypassAbilities.forEach(ability => {
-    it(`does not affect pokemon with ${allAbilities[ability].name}`, async () => {
+    it(`does not affect pokemon with ${ability[1]}`, async () => {
       const moveToCheck = allMoves[Moves.CHARM];
 
-      game.override.ability(ability);
+      // @ts-ignore ts doesn't know that ability[0] is an ability and not a string...
+      game.override.ability(ability[0]);
       vi.spyOn(moveToCheck, "calculateBattleAccuracy");
 
-      await game.startBattle([ Species.PIKACHU ]);
+      await game.classicMode.startBattle([Species.PIKACHU]);
       game.move.select(Moves.CHARM);
       await game.phaseInterceptor.to(MoveEffectPhase);
 
diff --git a/src/test/abilities/zen_mode.test.ts b/test/abilities/zen_mode.test.ts
similarity index 85%
rename from src/test/abilities/zen_mode.test.ts
rename to test/abilities/zen_mode.test.ts
index e0cc457c4d5..1eb27a8f6c7 100644
--- a/src/test/abilities/zen_mode.test.ts
+++ b/test/abilities/zen_mode.test.ts
@@ -3,11 +3,10 @@ import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { StatusEffect } from "#enums/status-effect";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
-
 describe("Abilities - ZEN MODE", () => {
   let phaserGame: Phaser.Game;
   let game: GameManager;
@@ -27,7 +26,7 @@ describe("Abilities - ZEN MODE", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     game.override
-      .battleType("single")
+      .battleStyle("single")
       .disableCrits()
       .enemySpecies(Species.MAGIKARP)
       .enemyAbility(Abilities.BALL_FETCH)
@@ -38,7 +37,7 @@ describe("Abilities - ZEN MODE", () => {
   });
 
   it("shouldn't change form when taking damage if not dropping below 50% HP", async () => {
-    await game.classicMode.startBattle([ Species.DARMANITAN ]);
+    await game.classicMode.startBattle([Species.DARMANITAN]);
     const darmanitan = game.scene.getPlayerPokemon()!;
     expect(darmanitan.formIndex).toBe(baseForm);
 
@@ -51,10 +50,10 @@ describe("Abilities - ZEN MODE", () => {
   });
 
   it("should change form when falling below 50% HP", async () => {
-    await game.classicMode.startBattle([ Species.DARMANITAN ]);
+    await game.classicMode.startBattle([Species.DARMANITAN]);
 
     const darmanitan = game.scene.getPlayerPokemon()!;
-    darmanitan.hp = (darmanitan.getMaxHp() / 2) + 1;
+    darmanitan.hp = darmanitan.getMaxHp() / 2 + 1;
     expect(darmanitan.formIndex).toBe(baseForm);
 
     game.move.select(Moves.SPLASH);
@@ -65,9 +64,9 @@ describe("Abilities - ZEN MODE", () => {
   });
 
   it("should stay zen mode when fainted", async () => {
-    await game.classicMode.startBattle([ Species.DARMANITAN, Species.CHARIZARD ]);
+    await game.classicMode.startBattle([Species.DARMANITAN, Species.CHARIZARD]);
     const darmanitan = game.scene.getPlayerPokemon()!;
-    darmanitan.hp = (darmanitan.getMaxHp() / 2) + 1;
+    darmanitan.hp = darmanitan.getMaxHp() / 2 + 1;
     expect(darmanitan.formIndex).toBe(baseForm);
 
     game.move.select(Moves.SPLASH);
@@ -91,7 +90,7 @@ describe("Abilities - ZEN MODE", () => {
       [Species.DARMANITAN]: zenForm,
     });
 
-    await game.classicMode.startBattle([ Species.MAGIKARP, Species.DARMANITAN ]);
+    await game.classicMode.startBattle([Species.MAGIKARP, Species.DARMANITAN]);
 
     const darmanitan = game.scene.getPlayerParty()[1];
     darmanitan.hp = 1;
diff --git a/src/test/abilities/zero_to_hero.test.ts b/test/abilities/zero_to_hero.test.ts
similarity index 89%
rename from src/test/abilities/zero_to_hero.test.ts
rename to test/abilities/zero_to_hero.test.ts
index 5702f73e6c4..2cdc516dc6b 100644
--- a/src/test/abilities/zero_to_hero.test.ts
+++ b/test/abilities/zero_to_hero.test.ts
@@ -5,10 +5,9 @@ import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { StatusEffect } from "#enums/status-effect";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
-
 describe("Abilities - ZERO TO HERO", () => {
   let phaserGame: Phaser.Game;
   let game: GameManager;
@@ -28,7 +27,7 @@ describe("Abilities - ZERO TO HERO", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     game.override
-      .battleType("single")
+      .battleStyle("single")
       .moveset(Moves.SPLASH)
       .enemyMoveset(Moves.SPLASH)
       .enemyAbility(Abilities.BALL_FETCH);
@@ -40,7 +39,7 @@ describe("Abilities - ZERO TO HERO", () => {
       [Species.PALAFIN]: heroForm,
     });
 
-    await game.startBattle([ Species.FEEBAS, Species.PALAFIN, Species.PALAFIN ]);
+    await game.startBattle([Species.FEEBAS, Species.PALAFIN, Species.PALAFIN]);
 
     const palafin1 = game.scene.getPlayerParty()[1];
     const palafin2 = game.scene.getPlayerParty()[2];
@@ -62,7 +61,7 @@ describe("Abilities - ZERO TO HERO", () => {
   });
 
   it("should swap to Hero form when switching out during a battle", async () => {
-    await game.startBattle([ Species.PALAFIN, Species.FEEBAS ]);
+    await game.startBattle([Species.PALAFIN, Species.FEEBAS]);
 
     const palafin = game.scene.getPlayerPokemon()!;
     expect(palafin.formIndex).toBe(baseForm);
@@ -73,7 +72,7 @@ describe("Abilities - ZERO TO HERO", () => {
   });
 
   it("should not swap to Hero form if switching due to faint", async () => {
-    await game.startBattle([ Species.PALAFIN, Species.FEEBAS ]);
+    await game.startBattle([Species.PALAFIN, Species.FEEBAS]);
 
     const palafin = game.scene.getPlayerPokemon()!;
     expect(palafin.formIndex).toBe(baseForm);
@@ -90,7 +89,7 @@ describe("Abilities - ZERO TO HERO", () => {
       [Species.PALAFIN]: heroForm,
     });
 
-    await game.startBattle([ Species.PALAFIN, Species.FEEBAS ]);
+    await game.startBattle([Species.PALAFIN, Species.FEEBAS]);
 
     const palafin = game.scene.getPlayerPokemon()!;
     expect(palafin.formIndex).toBe(heroForm);
diff --git a/src/test/account.test.ts b/test/account.test.ts
similarity index 74%
rename from src/test/account.test.ts
rename to test/account.test.ts
index 0f49014c377..77368b0b64c 100644
--- a/src/test/account.test.ts
+++ b/test/account.test.ts
@@ -1,7 +1,7 @@
-import * as battleScene from "#app/battle-scene";
+import * as bypassLogin from "#app/global-vars/bypass-login";
 import { pokerogueApi } from "#app/plugins/api/pokerogue-api";
 import { describe, expect, it, vi } from "vitest";
-import { initLoggedInUser, loggedInUser, updateUserInfo } from "../account";
+import { initLoggedInUser, loggedInUser, updateUserInfo } from "#app/account";
 
 describe("account", () => {
   describe("initLoggedInUser", () => {
@@ -15,9 +15,9 @@ describe("account", () => {
 
   describe("updateUserInfo", () => {
     it("should set loggedInUser! to Guest if bypassLogin is true", async () => {
-      vi.spyOn(battleScene, "bypassLogin", "get").mockReturnValue(true);
+      vi.spyOn(bypassLogin, "bypassLogin", "get").mockReturnValue(true);
 
-      const [ success, status ] = await updateUserInfo();
+      const [success, status] = await updateUserInfo();
 
       expect(success).toBe(true);
       expect(status).toBe(200);
@@ -26,7 +26,7 @@ describe("account", () => {
     });
 
     it("should fetch user info from the API if bypassLogin is false", async () => {
-      vi.spyOn(battleScene, "bypassLogin", "get").mockReturnValue(false);
+      vi.spyOn(bypassLogin, "bypassLogin", "get").mockReturnValue(false);
       vi.spyOn(pokerogueApi.account, "getInfo").mockResolvedValue([
         {
           username: "test",
@@ -38,7 +38,7 @@ describe("account", () => {
         200,
       ]);
 
-      const [ success, status ] = await updateUserInfo();
+      const [success, status] = await updateUserInfo();
 
       expect(success).toBe(true);
       expect(status).toBe(200);
@@ -47,20 +47,20 @@ describe("account", () => {
     });
 
     it("should handle resolved API errors", async () => {
-      vi.spyOn(battleScene, "bypassLogin", "get").mockReturnValue(false);
-      vi.spyOn(pokerogueApi.account, "getInfo").mockResolvedValue([ null, 401 ]);
+      vi.spyOn(bypassLogin, "bypassLogin", "get").mockReturnValue(false);
+      vi.spyOn(pokerogueApi.account, "getInfo").mockResolvedValue([null, 401]);
 
-      const [ success, status ] = await updateUserInfo();
+      const [success, status] = await updateUserInfo();
 
       expect(success).toBe(false);
       expect(status).toBe(401);
     });
 
     it("should handle 500 API errors", async () => {
-      vi.spyOn(battleScene, "bypassLogin", "get").mockReturnValue(false);
-      vi.spyOn(pokerogueApi.account, "getInfo").mockResolvedValue([ null, 500 ]);
+      vi.spyOn(bypassLogin, "bypassLogin", "get").mockReturnValue(false);
+      vi.spyOn(pokerogueApi.account, "getInfo").mockResolvedValue([null, 500]);
 
-      const [ success, status ] = await updateUserInfo();
+      const [success, status] = await updateUserInfo();
 
       expect(success).toBe(false);
       expect(status).toBe(500);
diff --git a/src/test/achievements/achievement.test.ts b/test/achievements/achievement.test.ts
similarity index 85%
rename from src/test/achievements/achievement.test.ts
rename to test/achievements/achievement.test.ts
index b515c6bafa8..0b49c4d23ab 100644
--- a/src/test/achievements/achievement.test.ts
+++ b/test/achievements/achievement.test.ts
@@ -1,19 +1,28 @@
 import { TurnHeldItemTransferModifier } from "#app/modifier/modifier";
-import { Achv, AchvTier, DamageAchv, HealAchv, LevelAchv, ModifierAchv, MoneyAchv, RibbonAchv, achvs } from "#app/system/achv";
-import { IntegerHolder, NumberHolder } from "#app/utils";
-import GameManager from "#test/utils/gameManager";
+import {
+  Achv,
+  AchvTier,
+  DamageAchv,
+  HealAchv,
+  LevelAchv,
+  ModifierAchv,
+  MoneyAchv,
+  RibbonAchv,
+  achvs,
+} from "#app/system/achv";
+import { NumberHolder } from "#app/utils/common";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
-import BattleScene from "../../battle-scene";
+import type BattleScene from "#app/battle-scene";
 
 describe("check some Achievement related stuff", () => {
-  it ("should check Achievement creation", () => {
+  it("should check Achievement creation", () => {
     const ach = new MoneyAchv("", "Achievement", 1000, null!, 100);
     expect(ach.name).toBe("Achievement");
   });
 });
 
-
 describe("Achv", () => {
   let achv: Achv;
 
@@ -61,13 +70,32 @@ describe("Achv", () => {
     const conditionFunc = vi.fn((args: any[]) => args[0] === 10);
     const achv = new Achv("", "Test Achievement", "Test Description", "test_icon", 10, conditionFunc);
 
-    expect(achv.validate([ 5 ])).toBe(false);
-    expect(achv.validate([ 10 ])).toBe(true);
+    expect(achv.validate([5])).toBe(false);
+    expect(achv.validate([10])).toBe(true);
     expect(conditionFunc).toHaveBeenCalledTimes(2);
   });
 });
 
 describe("MoneyAchv", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+  let scene: BattleScene;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+    scene = game.scene;
+  });
+
   it("should create an instance of MoneyAchv", () => {
     const moneyAchv = new MoneyAchv("", "Test Money Achievement", 10000, "money_icon", 10);
     expect(moneyAchv).toBeInstanceOf(MoneyAchv);
@@ -76,7 +104,6 @@ describe("MoneyAchv", () => {
 
   it("should validate the achievement based on the money amount", () => {
     const moneyAchv = new MoneyAchv("", "Test Money Achievement", 10000, "money_icon", 10);
-    const scene = new BattleScene();
     scene.money = 5000;
 
     expect(moneyAchv.validate([])).toBe(false);
@@ -140,10 +167,10 @@ describe("DamageAchv", () => {
     const damageAchv = new DamageAchv("", "Test Damage Achievement", 250, "damage_icon", 10);
     const numberHolder = new NumberHolder(200);
 
-    expect(damageAchv.validate([ numberHolder ])).toBe(false);
+    expect(damageAchv.validate([numberHolder])).toBe(false);
 
     numberHolder.value = 300;
-    expect(damageAchv.validate([ numberHolder ])).toBe(true);
+    expect(damageAchv.validate([numberHolder])).toBe(true);
   });
 });
 
@@ -158,10 +185,10 @@ describe("HealAchv", () => {
     const healAchv = new HealAchv("", "Test Heal Achievement", 250, "heal_icon", 10);
     const numberHolder = new NumberHolder(200);
 
-    expect(healAchv.validate([ numberHolder ])).toBe(false);
+    expect(healAchv.validate([numberHolder])).toBe(false);
 
     numberHolder.value = 300;
-    expect(healAchv.validate([ numberHolder ])).toBe(true);
+    expect(healAchv.validate([numberHolder])).toBe(true);
   });
 });
 
@@ -174,27 +201,41 @@ describe("LevelAchv", () => {
 
   it("should validate the achievement based on the level", () => {
     const levelAchv = new LevelAchv("", "Test Level Achievement", 100, "level_icon", 10);
-    const integerHolder = new IntegerHolder(50);
+    const integerHolder = new NumberHolder(50);
 
-    expect(levelAchv.validate([ integerHolder ])).toBe(false);
+    expect(levelAchv.validate([integerHolder])).toBe(false);
 
     integerHolder.value = 150;
-    expect(levelAchv.validate([ integerHolder ])).toBe(true);
+    expect(levelAchv.validate([integerHolder])).toBe(true);
   });
 });
 
 describe("ModifierAchv", () => {
   it("should create an instance of ModifierAchv", () => {
-    const modifierAchv = new ModifierAchv("", "Test Modifier Achievement", "Test Description", "modifier_icon", 10, () => true);
+    const modifierAchv = new ModifierAchv(
+      "",
+      "Test Modifier Achievement",
+      "Test Description",
+      "modifier_icon",
+      10,
+      () => true,
+    );
     expect(modifierAchv).toBeInstanceOf(ModifierAchv);
     expect(modifierAchv instanceof Achv).toBe(true);
   });
 
   it("should validate the achievement based on the modifier function", () => {
-    const modifierAchv = new ModifierAchv("", "Test Modifier Achievement", "Test Description", "modifier_icon", 10, () => true);
+    const modifierAchv = new ModifierAchv(
+      "",
+      "Test Modifier Achievement",
+      "Test Description",
+      "modifier_icon",
+      10,
+      () => true,
+    );
     const modifier = new TurnHeldItemTransferModifier(null!, 3, 1);
 
-    expect(modifierAchv.validate([ modifier ])).toBe(true);
+    expect(modifierAchv.validate([modifier])).toBe(true);
   });
 });
 
@@ -243,7 +284,6 @@ describe("achvs", () => {
   });
 
   it("should initialize the achievements with IDs and parent IDs", () => {
-
     expect(achvs._10K_MONEY.id).toBe("_10K_MONEY");
     expect(achvs._10K_MONEY.hasParent).toBe(undefined);
     expect(achvs._100K_MONEY.id).toBe("_100K_MONEY");
diff --git a/src/test/arena/arena_gravity.test.ts b/test/arena/arena_gravity.test.ts
similarity index 82%
rename from src/test/arena/arena_gravity.test.ts
rename to test/arena/arena_gravity.test.ts
index 13e9c23a35c..0ce5ac0ea4c 100644
--- a/src/test/arena/arena_gravity.test.ts
+++ b/test/arena/arena_gravity.test.ts
@@ -1,11 +1,11 @@
 import { BattlerIndex } from "#app/battle";
-import { allMoves } from "#app/data/move";
+import { allMoves } from "#app/data/moves/move";
 import { Abilities } from "#enums/abilities";
 import { ArenaTagType } from "#enums/arena-tag-type";
 import { BattlerTagType } from "#enums/battler-tag-type";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
@@ -26,8 +26,8 @@ describe("Arena - Gravity", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     game.override
-      .battleType("single")
-      .moveset([ Moves.TACKLE, Moves.GRAVITY, Moves.FISSURE ])
+      .battleStyle("single")
+      .moveset([Moves.TACKLE, Moves.GRAVITY, Moves.FISSURE])
       .ability(Abilities.UNNERVE)
       .enemyAbility(Abilities.BALL_FETCH)
       .enemySpecies(Species.SHUCKLE)
@@ -43,7 +43,7 @@ describe("Arena - Gravity", () => {
     vi.spyOn(moveToCheck, "calculateBattleAccuracy");
 
     // Setup Gravity on first turn
-    await game.classicMode.startBattle([ Species.PIKACHU ]);
+    await game.classicMode.startBattle([Species.PIKACHU]);
     game.move.select(Moves.GRAVITY);
     await game.phaseInterceptor.to("TurnEndPhase");
 
@@ -64,7 +64,7 @@ describe("Arena - Gravity", () => {
     vi.spyOn(moveToCheck, "calculateBattleAccuracy");
 
     // Setup Gravity on first turn
-    await game.classicMode.startBattle([ Species.PIKACHU ]);
+    await game.classicMode.startBattle([Species.PIKACHU]);
     game.move.select(Moves.GRAVITY);
     await game.phaseInterceptor.to("TurnEndPhase");
 
@@ -80,11 +80,9 @@ describe("Arena - Gravity", () => {
 
   describe("Against flying types", () => {
     it("can be hit by ground-type moves now", async () => {
-      game.override
-        .enemySpecies(Species.PIDGEOT)
-        .moveset([ Moves.GRAVITY, Moves.EARTHQUAKE ]);
+      game.override.enemySpecies(Species.PIDGEOT).moveset([Moves.GRAVITY, Moves.EARTHQUAKE]);
 
-      await game.classicMode.startBattle([ Species.PIKACHU ]);
+      await game.classicMode.startBattle([Species.PIKACHU]);
 
       const pidgeot = game.scene.getEnemyPokemon()!;
       vi.spyOn(pidgeot, "getAttackTypeEffectiveness");
@@ -111,11 +109,9 @@ describe("Arena - Gravity", () => {
     });
 
     it("keeps super-effective moves super-effective after using gravity", async () => {
-      game.override
-        .enemySpecies(Species.PIDGEOT)
-        .moveset([ Moves.GRAVITY, Moves.THUNDERBOLT ]);
+      game.override.enemySpecies(Species.PIDGEOT).moveset([Moves.GRAVITY, Moves.THUNDERBOLT]);
 
-      await game.classicMode.startBattle([ Species.PIKACHU ]);
+      await game.classicMode.startBattle([Species.PIKACHU]);
 
       const pidgeot = game.scene.getEnemyPokemon()!;
       vi.spyOn(pidgeot, "getAttackTypeEffectiveness");
@@ -136,12 +132,9 @@ describe("Arena - Gravity", () => {
   });
 
   it("cancels Fly if its user is semi-invulnerable", async () => {
-    game.override
-      .enemySpecies(Species.SNORLAX)
-      .enemyMoveset(Moves.FLY)
-      .moveset([ Moves.GRAVITY, Moves.SPLASH ]);
+    game.override.enemySpecies(Species.SNORLAX).enemyMoveset(Moves.FLY).moveset([Moves.GRAVITY, Moves.SPLASH]);
 
-    await game.classicMode.startBattle([ Species.CHARIZARD ]);
+    await game.classicMode.startBattle([Species.CHARIZARD]);
 
     const charizard = game.scene.getPlayerPokemon()!;
     const snorlax = game.scene.getEnemyPokemon()!;
@@ -152,7 +145,7 @@ describe("Arena - Gravity", () => {
     expect(snorlax.getTag(BattlerTagType.FLYING)).toBeDefined();
 
     game.move.select(Moves.GRAVITY);
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
 
     await game.phaseInterceptor.to("MoveEffectPhase");
     expect(snorlax.getTag(BattlerTagType.INTERRUPTED)).toBeDefined();
diff --git a/src/test/arena/grassy_terrain.test.ts b/test/arena/grassy_terrain.test.ts
similarity index 84%
rename from src/test/arena/grassy_terrain.test.ts
rename to test/arena/grassy_terrain.test.ts
index ead4467925b..f8ca07bd65e 100644
--- a/src/test/arena/grassy_terrain.test.ts
+++ b/test/arena/grassy_terrain.test.ts
@@ -1,8 +1,8 @@
-import { allMoves } from "#app/data/move";
+import { allMoves } from "#app/data/moves/move";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
@@ -22,18 +22,18 @@ describe("Arena - Grassy Terrain", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     game.override
-      .battleType("single")
+      .battleStyle("single")
       .disableCrits()
       .enemyLevel(1)
       .enemySpecies(Species.SHUCKLE)
       .enemyAbility(Abilities.STURDY)
       .enemyMoveset(Moves.FLY)
-      .moveset([ Moves.GRASSY_TERRAIN, Moves.EARTHQUAKE ])
+      .moveset([Moves.GRASSY_TERRAIN, Moves.EARTHQUAKE])
       .ability(Abilities.NO_GUARD);
   });
 
   it("halves the damage of Earthquake", async () => {
-    await game.classicMode.startBattle([ Species.TAUROS ]);
+    await game.classicMode.startBattle([Species.TAUROS]);
 
     const eq = allMoves[Moves.EARTHQUAKE];
     vi.spyOn(eq, "calculateBattlePower");
@@ -53,7 +53,7 @@ describe("Arena - Grassy Terrain", () => {
   });
 
   it("Does not halve the damage of Earthquake if opponent is not grounded", async () => {
-    await game.classicMode.startBattle([ Species.NINJASK ]);
+    await game.classicMode.startBattle([Species.NINJASK]);
 
     const eq = allMoves[Moves.EARTHQUAKE];
     vi.spyOn(eq, "calculateBattlePower");
diff --git a/src/test/arena/weather_fog.test.ts b/test/arena/weather_fog.test.ts
similarity index 78%
rename from src/test/arena/weather_fog.test.ts
rename to test/arena/weather_fog.test.ts
index 8c1fcb1e3a4..b1edf75704b 100644
--- a/src/test/arena/weather_fog.test.ts
+++ b/test/arena/weather_fog.test.ts
@@ -1,10 +1,10 @@
-import { allMoves } from "#app/data/move";
+import { allMoves } from "#app/data/moves/move";
 import { Abilities } from "#app/enums/abilities";
 import { MoveEffectPhase } from "#app/phases/move-effect-phase";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { WeatherType } from "#enums/weather-type";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
@@ -24,14 +24,12 @@ describe("Weather - Fog", () => {
 
   beforeEach(() => {
     game = new GameManager(phaserGame);
-    game.override
-      .weather(WeatherType.FOG)
-      .battleType("single");
-    game.override.moveset([ Moves.TACKLE ]);
+    game.override.weather(WeatherType.FOG).battleStyle("single");
+    game.override.moveset([Moves.TACKLE]);
     game.override.ability(Abilities.BALL_FETCH);
     game.override.enemyAbility(Abilities.BALL_FETCH);
     game.override.enemySpecies(Species.MAGIKARP);
-    game.override.enemyMoveset([ Moves.SPLASH ]);
+    game.override.enemyMoveset([Moves.SPLASH]);
   });
 
   it("move accuracy is multiplied by 90%", async () => {
@@ -39,7 +37,7 @@ describe("Weather - Fog", () => {
 
     vi.spyOn(moveToCheck, "calculateBattleAccuracy");
 
-    await game.startBattle([ Species.MAGIKARP ]);
+    await game.startBattle([Species.MAGIKARP]);
     game.move.select(Moves.TACKLE);
     await game.phaseInterceptor.to(MoveEffectPhase);
 
diff --git a/src/test/arena/weather_hail.test.ts b/test/arena/weather_hail.test.ts
similarity index 81%
rename from src/test/arena/weather_hail.test.ts
rename to test/arena/weather_hail.test.ts
index 0b267550d75..2fa4f71d8ca 100644
--- a/src/test/arena/weather_hail.test.ts
+++ b/test/arena/weather_hail.test.ts
@@ -2,7 +2,7 @@ import { BattlerIndex } from "#app/battle";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { WeatherType } from "#enums/weather-type";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
@@ -24,17 +24,17 @@ describe("Weather - Hail", () => {
     game = new GameManager(phaserGame);
     game.override
       .weather(WeatherType.HAIL)
-      .battleType("single")
+      .battleStyle("single")
       .moveset(Moves.SPLASH)
       .enemyMoveset(Moves.SPLASH)
       .enemySpecies(Species.MAGIKARP);
   });
 
   it("inflicts damage equal to 1/16 of Pokemon's max HP at turn end", async () => {
-    await game.classicMode.startBattle([ Species.MAGIKARP ]);
+    await game.classicMode.startBattle([Species.MAGIKARP]);
 
     game.move.select(Moves.SPLASH);
-    await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
 
     await game.phaseInterceptor.to("TurnEndPhase");
 
@@ -44,11 +44,11 @@ describe("Weather - Hail", () => {
   });
 
   it("does not inflict damage to a Pokemon that is underwater (Dive) or underground (Dig)", async () => {
-    game.override.moveset([ Moves.DIG ]);
-    await game.classicMode.startBattle([ Species.MAGIKARP ]);
+    game.override.moveset([Moves.DIG]);
+    await game.classicMode.startBattle([Species.MAGIKARP]);
 
     game.move.select(Moves.DIG);
-    await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
 
     await game.phaseInterceptor.to("TurnEndPhase");
 
@@ -60,7 +60,7 @@ describe("Weather - Hail", () => {
   });
 
   it("does not inflict damage to Ice type Pokemon", async () => {
-    await game.classicMode.startBattle([ Species.CLOYSTER ]);
+    await game.classicMode.startBattle([Species.CLOYSTER]);
 
     game.move.select(Moves.SPLASH);
 
diff --git a/src/test/arena/weather_sandstorm.test.ts b/test/arena/weather_sandstorm.test.ts
similarity index 86%
rename from src/test/arena/weather_sandstorm.test.ts
rename to test/arena/weather_sandstorm.test.ts
index 17ccfdee94b..e7620f6cf30 100644
--- a/src/test/arena/weather_sandstorm.test.ts
+++ b/test/arena/weather_sandstorm.test.ts
@@ -3,7 +3,7 @@ import { Stat } from "#app/enums/stat";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { WeatherType } from "#enums/weather-type";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
@@ -25,14 +25,14 @@ describe("Weather - Sandstorm", () => {
     game = new GameManager(phaserGame);
     game.override
       .weather(WeatherType.SANDSTORM)
-      .battleType("single")
+      .battleStyle("single")
       .moveset(Moves.SPLASH)
       .enemyMoveset(Moves.SPLASH)
       .enemySpecies(Species.MAGIKARP);
   });
 
   it("inflicts damage equal to 1/16 of Pokemon's max HP at turn end", async () => {
-    await game.classicMode.startBattle([ Species.MAGIKARP ]);
+    await game.classicMode.startBattle([Species.MAGIKARP]);
 
     game.move.select(Moves.SPLASH);
 
@@ -44,8 +44,8 @@ describe("Weather - Sandstorm", () => {
   });
 
   it("does not inflict damage to a Pokemon that is underwater (Dive) or underground (Dig)", async () => {
-    game.override.moveset([ Moves.DIVE ]);
-    await game.classicMode.startBattle([ Species.MAGIKARP ]);
+    game.override.moveset([Moves.DIVE]);
+    await game.classicMode.startBattle([Species.MAGIKARP]);
 
     game.move.select(Moves.DIVE);
 
@@ -60,12 +60,12 @@ describe("Weather - Sandstorm", () => {
 
   it("does not inflict damage to Rock, Ground and Steel type Pokemon", async () => {
     game.override
-      .battleType("double")
+      .battleStyle("double")
       .enemySpecies(Species.SANDSHREW)
       .ability(Abilities.BALL_FETCH)
       .enemyAbility(Abilities.BALL_FETCH);
 
-    await game.classicMode.startBattle([ Species.ROCKRUFF, Species.KLINK ]);
+    await game.classicMode.startBattle([Species.ROCKRUFF, Species.KLINK]);
 
     game.move.select(Moves.SPLASH, 0);
     game.move.select(Moves.SPLASH, 1);
@@ -78,7 +78,7 @@ describe("Weather - Sandstorm", () => {
   });
 
   it("increases Rock type Pokemon Sp.Def by 50%", async () => {
-    await game.classicMode.startBattle([ Species.ROCKRUFF ]);
+    await game.classicMode.startBattle([Species.ROCKRUFF]);
 
     const playerPokemon = game.scene.getPlayerPokemon()!;
     const playerSpdef = playerPokemon.getStat(Stat.SPDEF);
diff --git a/src/test/arena/weather_strong_winds.test.ts b/test/arena/weather_strong_winds.test.ts
similarity index 84%
rename from src/test/arena/weather_strong_winds.test.ts
rename to test/arena/weather_strong_winds.test.ts
index 557de93d644..9fcdb18c872 100644
--- a/src/test/arena/weather_strong_winds.test.ts
+++ b/test/arena/weather_strong_winds.test.ts
@@ -1,10 +1,10 @@
-import { allMoves } from "#app/data/move";
+import { allMoves } from "#app/data/moves/move";
 import { StatusEffect } from "#app/enums/status-effect";
 import { TurnStartPhase } from "#app/phases/turn-start-phase";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
@@ -24,17 +24,17 @@ describe("Weather - Strong Winds", () => {
 
   beforeEach(() => {
     game = new GameManager(phaserGame);
-    game.override.battleType("single");
+    game.override.battleStyle("single");
     game.override.startingLevel(10);
     game.override.enemySpecies(Species.TAILLOW);
     game.override.enemyAbility(Abilities.DELTA_STREAM);
-    game.override.moveset([ Moves.THUNDERBOLT, Moves.ICE_BEAM, Moves.ROCK_SLIDE ]);
+    game.override.moveset([Moves.THUNDERBOLT, Moves.ICE_BEAM, Moves.ROCK_SLIDE]);
   });
 
   it("electric type move is not very effective on Rayquaza", async () => {
     game.override.enemySpecies(Species.RAYQUAZA);
 
-    await game.classicMode.startBattle([ Species.PIKACHU ]);
+    await game.classicMode.startBattle([Species.PIKACHU]);
     const pikachu = game.scene.getPlayerPokemon()!;
     const enemy = game.scene.getEnemyPokemon()!;
 
@@ -45,7 +45,7 @@ describe("Weather - Strong Winds", () => {
   });
 
   it("electric type move is neutral for flying type pokemon", async () => {
-    await game.classicMode.startBattle([ Species.PIKACHU ]);
+    await game.classicMode.startBattle([Species.PIKACHU]);
     const pikachu = game.scene.getPlayerPokemon()!;
     const enemy = game.scene.getEnemyPokemon()!;
 
@@ -56,7 +56,7 @@ describe("Weather - Strong Winds", () => {
   });
 
   it("ice type move is neutral for flying type pokemon", async () => {
-    await game.classicMode.startBattle([ Species.PIKACHU ]);
+    await game.classicMode.startBattle([Species.PIKACHU]);
     const pikachu = game.scene.getPlayerPokemon()!;
     const enemy = game.scene.getEnemyPokemon()!;
 
@@ -67,7 +67,7 @@ describe("Weather - Strong Winds", () => {
   });
 
   it("rock type move is neutral for flying type pokemon", async () => {
-    await game.classicMode.startBattle([ Species.PIKACHU ]);
+    await game.classicMode.startBattle([Species.PIKACHU]);
     const pikachu = game.scene.getPlayerPokemon()!;
     const enemy = game.scene.getEnemyPokemon()!;
 
@@ -80,7 +80,7 @@ describe("Weather - Strong Winds", () => {
   it("weather goes away when last trainer pokemon dies to indirect damage", async () => {
     game.override.enemyStatusEffect(StatusEffect.POISON);
 
-    await game.classicMode.startBattle([ Species.MAGIKARP ]);
+    await game.classicMode.startBattle([Species.MAGIKARP]);
 
     const enemy = game.scene.getEnemyPokemon()!;
     enemy.hp = 1;
diff --git a/src/test/battle-scene.test.ts b/test/battle-scene.test.ts
similarity index 93%
rename from src/test/battle-scene.test.ts
rename to test/battle-scene.test.ts
index 4da75cea197..44f1364441b 100644
--- a/src/test/battle-scene.test.ts
+++ b/test/battle-scene.test.ts
@@ -1,6 +1,6 @@
 import { LoadingScene } from "#app/loading-scene";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
-import GameManager from "./utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 
 describe("BattleScene", () => {
   let phaserGame: Phaser.Game;
diff --git a/test/battle/ability_swap.test.ts b/test/battle/ability_swap.test.ts
new file mode 100644
index 00000000000..c9f91df3a48
--- /dev/null
+++ b/test/battle/ability_swap.test.ts
@@ -0,0 +1,78 @@
+import { allAbilities } from "#app/data/data-lists";
+import { Stat } from "#app/enums/stat";
+import { Abilities } from "#enums/abilities";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import GameManager from "#test/testUtils/gameManager";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
+
+describe("Test Ability Swapping", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+    game.override
+      .moveset([Moves.SPLASH])
+      .ability(Abilities.BALL_FETCH)
+      .battleStyle("single")
+      .disableCrits()
+      .enemySpecies(Species.MAGIKARP)
+      .enemyAbility(Abilities.BALL_FETCH)
+      .enemyMoveset(Moves.SPLASH);
+  });
+
+  it("should activate post-summon abilities", async () => {
+    await game.classicMode.startBattle([Species.FEEBAS]);
+
+    game.move.select(Moves.SPLASH);
+    game.scene.getPlayerPokemon()?.setTempAbility(allAbilities[Abilities.INTIMIDATE]);
+    await game.phaseInterceptor.to("BerryPhase");
+
+    expect(game.scene.getEnemyPokemon()?.getStatStage(Stat.ATK)).toBe(-1);
+  });
+
+  it("should remove primal weather when the setter's ability is removed", async () => {
+    game.override.ability(Abilities.DESOLATE_LAND);
+    await game.classicMode.startBattle([Species.FEEBAS]);
+
+    game.move.select(Moves.SPLASH);
+    game.scene.getPlayerPokemon()?.setTempAbility(allAbilities[Abilities.BALL_FETCH]);
+    await game.phaseInterceptor.to("BerryPhase");
+
+    expect(game.scene.arena.weather?.weatherType).toBeUndefined();
+  });
+
+  it("should not activate passive abilities", async () => {
+    game.override.passiveAbility(Abilities.INTREPID_SWORD);
+    await game.classicMode.startBattle([Species.FEEBAS]);
+
+    game.move.select(Moves.SPLASH);
+    game.scene.getPlayerPokemon()?.setTempAbility(allAbilities[Abilities.BALL_FETCH]);
+    await game.phaseInterceptor.to("BerryPhase");
+
+    expect(game.scene.getPlayerPokemon()?.getStatStage(Stat.ATK)).toBe(1); // would be 2 if passive activated again
+  });
+
+  // Pickup and Honey Gather are special cases as they're the only abilities to be Unsuppressable but not Unswappable
+  it("should be able to swap pickup", async () => {
+    game.override.ability(Abilities.PICKUP).enemyAbility(Abilities.INTIMIDATE).moveset(Moves.ROLE_PLAY);
+    await game.classicMode.startBattle([Species.FEEBAS]);
+
+    game.move.select(Moves.ROLE_PLAY);
+    await game.phaseInterceptor.to("BerryPhase");
+
+    expect(game.scene.getEnemyPokemon()?.getStatStage(Stat.ATK)).toBe(-1);
+  });
+});
diff --git a/src/test/battle/battle-order.test.ts b/test/battle/battle-order.test.ts
similarity index 71%
rename from src/test/battle/battle-order.test.ts
rename to test/battle/battle-order.test.ts
index d4e9950dec9..43fa1e59c14 100644
--- a/src/test/battle/battle-order.test.ts
+++ b/test/battle/battle-order.test.ts
@@ -4,7 +4,7 @@ import { TurnStartPhase } from "#app/phases/turn-start-phase";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
@@ -24,22 +24,20 @@ describe("Battle order", () => {
 
   beforeEach(() => {
     game = new GameManager(phaserGame);
-    game.override.battleType("single");
+    game.override.battleStyle("single");
     game.override.enemySpecies(Species.MEWTWO);
     game.override.enemyAbility(Abilities.INSOMNIA);
     game.override.ability(Abilities.INSOMNIA);
-    game.override.moveset([ Moves.TACKLE ]);
+    game.override.moveset([Moves.TACKLE]);
   });
 
   it("opponent faster than player 50 vs 150", async () => {
-    await game.startBattle([
-      Species.BULBASAUR,
-    ]);
+    await game.startBattle([Species.BULBASAUR]);
 
     const playerPokemon = game.scene.getPlayerPokemon()!;
     const enemyPokemon = game.scene.getEnemyPokemon()!;
-    vi.spyOn(playerPokemon, "stats", "get").mockReturnValue([ 20, 20, 20, 20, 20, 50 ]); // set playerPokemon's speed to 50
-    vi.spyOn(enemyPokemon, "stats", "get").mockReturnValue([ 20, 20, 20, 20, 20, 150 ]); // set enemyPokemon's speed to 150
+    vi.spyOn(playerPokemon, "stats", "get").mockReturnValue([20, 20, 20, 20, 20, 50]); // set playerPokemon's speed to 50
+    vi.spyOn(enemyPokemon, "stats", "get").mockReturnValue([20, 20, 20, 20, 20, 150]); // set enemyPokemon's speed to 150
 
     game.move.select(Moves.TACKLE);
     await game.phaseInterceptor.run(EnemyCommandPhase);
@@ -53,14 +51,12 @@ describe("Battle order", () => {
   }, 20000);
 
   it("Player faster than opponent 150 vs 50", async () => {
-    await game.startBattle([
-      Species.BULBASAUR,
-    ]);
+    await game.startBattle([Species.BULBASAUR]);
 
     const playerPokemon = game.scene.getPlayerPokemon()!;
     const enemyPokemon = game.scene.getEnemyPokemon()!;
-    vi.spyOn(playerPokemon, "stats", "get").mockReturnValue([ 20, 20, 20, 20, 20, 150 ]); // set playerPokemon's speed to 150
-    vi.spyOn(enemyPokemon, "stats", "get").mockReturnValue([ 20, 20, 20, 20, 20, 50 ]); // set enemyPokemon's speed to 50
+    vi.spyOn(playerPokemon, "stats", "get").mockReturnValue([20, 20, 20, 20, 20, 150]); // set playerPokemon's speed to 150
+    vi.spyOn(enemyPokemon, "stats", "get").mockReturnValue([20, 20, 20, 20, 20, 50]); // set enemyPokemon's speed to 50
 
     game.move.select(Moves.TACKLE);
     await game.phaseInterceptor.run(EnemyCommandPhase);
@@ -74,17 +70,14 @@ describe("Battle order", () => {
   }, 20000);
 
   it("double - both opponents faster than player 50/50 vs 150/150", async () => {
-    game.override.battleType("double");
-    await game.startBattle([
-      Species.BULBASAUR,
-      Species.BLASTOISE,
-    ]);
+    game.override.battleStyle("double");
+    await game.startBattle([Species.BULBASAUR, Species.BLASTOISE]);
 
     const playerPokemon = game.scene.getPlayerField();
     const enemyPokemon = game.scene.getEnemyField();
 
-    playerPokemon.forEach(p => vi.spyOn(p, "stats", "get").mockReturnValue([ 20, 20, 20, 20, 20, 50 ])); // set both playerPokemons' speed to 50
-    enemyPokemon.forEach(p => vi.spyOn(p, "stats", "get").mockReturnValue([ 20, 20, 20, 20, 20, 150 ])); // set both enemyPokemons' speed to 150
+    playerPokemon.forEach(p => vi.spyOn(p, "stats", "get").mockReturnValue([20, 20, 20, 20, 20, 50])); // set both playerPokemons' speed to 50
+    enemyPokemon.forEach(p => vi.spyOn(p, "stats", "get").mockReturnValue([20, 20, 20, 20, 20, 150])); // set both enemyPokemons' speed to 150
     const playerIndices = playerPokemon.map(p => p?.getBattlerIndex());
     const enemyIndices = enemyPokemon.map(p => p?.getBattlerIndex());
 
@@ -101,17 +94,14 @@ describe("Battle order", () => {
   }, 20000);
 
   it("double - speed tie except 1 - 100/100 vs 100/150", async () => {
-    game.override.battleType("double");
-    await game.startBattle([
-      Species.BULBASAUR,
-      Species.BLASTOISE,
-    ]);
+    game.override.battleStyle("double");
+    await game.startBattle([Species.BULBASAUR, Species.BLASTOISE]);
 
     const playerPokemon = game.scene.getPlayerField();
     const enemyPokemon = game.scene.getEnemyField();
-    playerPokemon.forEach(p => vi.spyOn(p, "stats", "get").mockReturnValue([ 20, 20, 20, 20, 20, 100 ])); //set both playerPokemons' speed to 100
-    vi.spyOn(enemyPokemon[0], "stats", "get").mockReturnValue([ 20, 20, 20, 20, 20, 100 ]); // set enemyPokemon's speed to 100
-    vi.spyOn(enemyPokemon[1], "stats", "get").mockReturnValue([ 20, 20, 20, 20, 20, 150 ]); // set enemyPokemon's speed to 150
+    playerPokemon.forEach(p => vi.spyOn(p, "stats", "get").mockReturnValue([20, 20, 20, 20, 20, 100])); //set both playerPokemons' speed to 100
+    vi.spyOn(enemyPokemon[0], "stats", "get").mockReturnValue([20, 20, 20, 20, 20, 100]); // set enemyPokemon's speed to 100
+    vi.spyOn(enemyPokemon[1], "stats", "get").mockReturnValue([20, 20, 20, 20, 20, 150]); // set enemyPokemon's speed to 150
     const playerIndices = playerPokemon.map(p => p?.getBattlerIndex());
     const enemyIndices = enemyPokemon.map(p => p?.getBattlerIndex());
 
@@ -128,18 +118,15 @@ describe("Battle order", () => {
   }, 20000);
 
   it("double - speed tie 100/150 vs 100/150", async () => {
-    game.override.battleType("double");
-    await game.startBattle([
-      Species.BULBASAUR,
-      Species.BLASTOISE,
-    ]);
+    game.override.battleStyle("double");
+    await game.startBattle([Species.BULBASAUR, Species.BLASTOISE]);
 
     const playerPokemon = game.scene.getPlayerField();
     const enemyPokemon = game.scene.getEnemyField();
-    vi.spyOn(playerPokemon[0], "stats", "get").mockReturnValue([ 20, 20, 20, 20, 20, 100 ]); // set one playerPokemon's speed to 100
-    vi.spyOn(playerPokemon[1], "stats", "get").mockReturnValue([ 20, 20, 20, 20, 20, 150 ]); // set other playerPokemon's speed to 150
-    vi.spyOn(enemyPokemon[0], "stats", "get").mockReturnValue([ 20, 20, 20, 20, 20, 100 ]); // set one enemyPokemon's speed to 100
-    vi.spyOn(enemyPokemon[1], "stats", "get").mockReturnValue([ 20, 20, 20, 20, 20, 150 ]); // set other enemyPokemon's speed to 150
+    vi.spyOn(playerPokemon[0], "stats", "get").mockReturnValue([20, 20, 20, 20, 20, 100]); // set one playerPokemon's speed to 100
+    vi.spyOn(playerPokemon[1], "stats", "get").mockReturnValue([20, 20, 20, 20, 20, 150]); // set other playerPokemon's speed to 150
+    vi.spyOn(enemyPokemon[0], "stats", "get").mockReturnValue([20, 20, 20, 20, 20, 100]); // set one enemyPokemon's speed to 100
+    vi.spyOn(enemyPokemon[1], "stats", "get").mockReturnValue([20, 20, 20, 20, 20, 150]); // set other enemyPokemon's speed to 150
     const playerIndices = playerPokemon.map(p => p?.getBattlerIndex());
     const enemyIndices = enemyPokemon.map(p => p?.getBattlerIndex());
 
diff --git a/src/test/battle/battle.test.ts b/test/battle/battle.test.ts
similarity index 73%
rename from src/test/battle/battle.test.ts
rename to test/battle/battle.test.ts
index bd84cb2fd3b..e980984580e 100644
--- a/src/test/battle/battle.test.ts
+++ b/test/battle/battle.test.ts
@@ -16,9 +16,9 @@ import { SwitchPhase } from "#app/phases/switch-phase";
 import { TitlePhase } from "#app/phases/title-phase";
 import { TurnInitPhase } from "#app/phases/turn-init-phase";
 import { VictoryPhase } from "#app/phases/victory-phase";
-import GameManager from "#app/test/utils/gameManager";
-import { generateStarter } from "#app/test/utils/gameManagerUtils";
-import { Mode } from "#app/ui/ui";
+import GameManager from "#test/testUtils/gameManager";
+import { generateStarter } from "#test/testUtils/gameManagerUtils";
+import { UiMode } from "#enums/ui-mode";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { PlayerGender } from "#enums/player-gender";
@@ -49,7 +49,7 @@ describe("Test Battle Phase", () => {
   it("test phase interceptor with prompt", async () => {
     await game.phaseInterceptor.run(LoginPhase);
 
-    game.onNextPrompt("SelectGenderPhase", Mode.OPTION_SELECT, () => {
+    game.onNextPrompt("SelectGenderPhase", UiMode.OPTION_SELECT, () => {
       game.scene.gameData.gender = PlayerGender.MALE;
       game.endPhase();
     });
@@ -57,38 +57,36 @@ describe("Test Battle Phase", () => {
     await game.phaseInterceptor.run(SelectGenderPhase);
 
     await game.phaseInterceptor.run(TitlePhase);
-    await game.waitMode(Mode.TITLE);
+    await game.waitMode(UiMode.TITLE);
 
-
-    expect(game.scene.ui?.getMode()).toBe(Mode.TITLE);
+    expect(game.scene.ui?.getMode()).toBe(UiMode.TITLE);
     expect(game.scene.gameData.gender).toBe(PlayerGender.MALE);
   }, 20000);
 
   it("test phase interceptor with prompt with preparation for a future prompt", async () => {
     await game.phaseInterceptor.run(LoginPhase);
 
-    game.onNextPrompt("SelectGenderPhase", Mode.OPTION_SELECT, () => {
+    game.onNextPrompt("SelectGenderPhase", UiMode.OPTION_SELECT, () => {
       game.scene.gameData.gender = PlayerGender.MALE;
       game.endPhase();
     });
 
-    game.onNextPrompt("CheckSwitchPhase", Mode.CONFIRM, () => {
-      game.setMode(Mode.MESSAGE);
+    game.onNextPrompt("CheckSwitchPhase", UiMode.CONFIRM, () => {
+      game.setMode(UiMode.MESSAGE);
       game.endPhase();
     });
     await game.phaseInterceptor.run(SelectGenderPhase);
 
     await game.phaseInterceptor.run(TitlePhase);
-    await game.waitMode(Mode.TITLE);
+    await game.waitMode(UiMode.TITLE);
 
-
-    expect(game.scene.ui?.getMode()).toBe(Mode.TITLE);
+    expect(game.scene.ui?.getMode()).toBe(UiMode.TITLE);
     expect(game.scene.gameData.gender).toBe(PlayerGender.MALE);
   }, 20000);
 
   it("newGame one-liner", async () => {
     await game.startBattle();
-    expect(game.scene.ui?.getMode()).toBe(Mode.COMMAND);
+    expect(game.scene.ui?.getMode()).toBe(UiMode.COMMAND);
     expect(game.scene.getCurrentPhase()!.constructor.name).toBe(CommandPhase.name);
   }, 20000);
 
@@ -96,12 +94,10 @@ describe("Test Battle Phase", () => {
     game.override.starterSpecies(Species.MEWTWO);
     game.override.enemySpecies(Species.RATTATA);
     game.override.startingLevel(2000);
-    game.override
-      .startingWave(3)
-      .battleType("single");
-    game.override.moveset([ Moves.TACKLE ]);
+    game.override.startingWave(3).battleStyle("single");
+    game.override.moveset([Moves.TACKLE]);
     game.override.enemyAbility(Abilities.HYDRATION);
-    game.override.enemyMoveset([ Moves.TACKLE, Moves.TACKLE, Moves.TACKLE, Moves.TACKLE ]);
+    game.override.enemyMoveset([Moves.TACKLE, Moves.TACKLE, Moves.TACKLE, Moves.TACKLE]);
     await game.startBattle();
     game.move.select(Moves.TACKLE);
     await game.phaseInterceptor.runFrom(EnemyCommandPhase).to(SelectModifierPhase, false);
@@ -112,18 +108,18 @@ describe("Test Battle Phase", () => {
     game.override.enemySpecies(Species.RATTATA);
     game.override.startingLevel(5);
     game.override.startingWave(3);
-    game.override.moveset([ Moves.TACKLE ]);
+    game.override.moveset([Moves.TACKLE]);
     game.override.enemyAbility(Abilities.HYDRATION);
-    game.override.enemyMoveset([ Moves.TAIL_WHIP, Moves.TAIL_WHIP, Moves.TAIL_WHIP, Moves.TAIL_WHIP ]);
-    game.override.battleType("single");
+    game.override.enemyMoveset([Moves.TAIL_WHIP, Moves.TAIL_WHIP, Moves.TAIL_WHIP, Moves.TAIL_WHIP]);
+    game.override.battleStyle("single");
     await game.startBattle();
     game.move.select(Moves.TACKLE);
     await game.phaseInterceptor.runFrom(EnemyCommandPhase).to(TurnInitPhase, false);
   }, 20000);
 
   it("load 100% data file", async () => {
-    await game.importData("src/test/utils/saves/everything.prsv");
-    const caughtCount = Object.keys(game.scene.gameData.dexData).filter((key) => {
+    await game.importData("./test/testUtils/saves/everything.prsv");
+    const caughtCount = Object.keys(game.scene.gameData.dexData).filter(key => {
       const species = game.scene.gameData.dexData[key];
       return species.caughtAttr !== 0n;
     }).length;
@@ -131,11 +127,7 @@ describe("Test Battle Phase", () => {
   }, 20000);
 
   it("start battle with selected team", async () => {
-    await game.startBattle([
-      Species.CHARIZARD,
-      Species.CHANSEY,
-      Species.MEW
-    ]);
+    await game.startBattle([Species.CHARIZARD, Species.CHANSEY, Species.MEW]);
     expect(game.scene.getPlayerParty()[0].species.speciesId).toBe(Species.CHARIZARD);
     expect(game.scene.getPlayerParty()[1].species.speciesId).toBe(Species.CHANSEY);
     expect(game.scene.getPlayerParty()[2].species.speciesId).toBe(Species.MEW);
@@ -150,7 +142,7 @@ describe("Test Battle Phase", () => {
 
   it("wrong phase", async () => {
     await game.phaseInterceptor.run(LoginPhase);
-    await game.phaseInterceptor.run(LoginPhase).catch((e) => {
+    await game.phaseInterceptor.run(LoginPhase).catch(e => {
       expect(e).toBe("Wrong phase: this is SelectGenderPhase and not LoginPhase");
     });
   }, 20000);
@@ -162,30 +154,45 @@ describe("Test Battle Phase", () => {
 
   it("good run", async () => {
     await game.phaseInterceptor.run(LoginPhase);
-    game.onNextPrompt("SelectGenderPhase", Mode.OPTION_SELECT, () => {
-      game.scene.gameData.gender = PlayerGender.MALE;
-      game.endPhase();
-    }, () => game.isCurrentPhase(TitlePhase));
+    game.onNextPrompt(
+      "SelectGenderPhase",
+      UiMode.OPTION_SELECT,
+      () => {
+        game.scene.gameData.gender = PlayerGender.MALE;
+        game.endPhase();
+      },
+      () => game.isCurrentPhase(TitlePhase),
+    );
     await game.phaseInterceptor.run(SelectGenderPhase, () => game.isCurrentPhase(TitlePhase));
     await game.phaseInterceptor.run(TitlePhase);
   }, 20000);
 
   it("good run from select gender to title", async () => {
     await game.phaseInterceptor.run(LoginPhase);
-    game.onNextPrompt("SelectGenderPhase", Mode.OPTION_SELECT, () => {
-      game.scene.gameData.gender = PlayerGender.MALE;
-      game.endPhase();
-    }, () => game.isCurrentPhase(TitlePhase));
+    game.onNextPrompt(
+      "SelectGenderPhase",
+      UiMode.OPTION_SELECT,
+      () => {
+        game.scene.gameData.gender = PlayerGender.MALE;
+        game.endPhase();
+      },
+      () => game.isCurrentPhase(TitlePhase),
+    );
     await game.phaseInterceptor.runFrom(SelectGenderPhase).to(TitlePhase);
   }, 20000);
 
   it("good run to SummonPhase phase", async () => {
     await game.phaseInterceptor.run(LoginPhase);
-    game.onNextPrompt("SelectGenderPhase", Mode.OPTION_SELECT, () => {
-      game.scene.gameData.gender = PlayerGender.MALE;
-      game.endPhase();
-    }, () => game.isCurrentPhase(TitlePhase));
-    game.onNextPrompt("TitlePhase", Mode.TITLE, () => {
+    game.onNextPrompt(
+      "SelectGenderPhase",
+      UiMode.OPTION_SELECT,
+      () => {
+        game.scene.gameData.gender = PlayerGender.MALE;
+        game.endPhase();
+      },
+      () => game.isCurrentPhase(TitlePhase),
+    );
+    game.onNextPrompt("TitlePhase", UiMode.TITLE, () => {
       game.scene.gameMode = getGameMode(GameModes.CLASSIC);
       const starters = generateStarter(game.scene);
       const selectStarterPhase = new SelectStarterPhase();
@@ -196,75 +203,59 @@ describe("Test Battle Phase", () => {
   }, 20000);
 
   it("2vs1", async () => {
-    game.override.battleType("single");
+    game.override.battleStyle("single");
     game.override.enemySpecies(Species.MIGHTYENA);
     game.override.enemyAbility(Abilities.HYDRATION);
     game.override.ability(Abilities.HYDRATION);
-    await game.startBattle([
-      Species.BLASTOISE,
-      Species.CHARIZARD,
-    ]);
-    expect(game.scene.ui?.getMode()).toBe(Mode.COMMAND);
+    await game.startBattle([Species.BLASTOISE, Species.CHARIZARD]);
+    expect(game.scene.ui?.getMode()).toBe(UiMode.COMMAND);
     expect(game.scene.getCurrentPhase()!.constructor.name).toBe(CommandPhase.name);
   }, 20000);
 
   it("1vs1", async () => {
-    game.override.battleType("single");
+    game.override.battleStyle("single");
     game.override.enemySpecies(Species.MIGHTYENA);
     game.override.enemyAbility(Abilities.HYDRATION);
     game.override.ability(Abilities.HYDRATION);
-    await game.startBattle([
-      Species.BLASTOISE,
-    ]);
-    expect(game.scene.ui?.getMode()).toBe(Mode.COMMAND);
+    await game.startBattle([Species.BLASTOISE]);
+    expect(game.scene.ui?.getMode()).toBe(UiMode.COMMAND);
     expect(game.scene.getCurrentPhase()!.constructor.name).toBe(CommandPhase.name);
   }, 20000);
 
   it("2vs2", async () => {
-    game.override.battleType("double");
+    game.override.battleStyle("double");
     game.override.enemySpecies(Species.MIGHTYENA);
     game.override.enemyAbility(Abilities.HYDRATION);
     game.override.ability(Abilities.HYDRATION);
     game.override.startingWave(3);
-    await game.startBattle([
-      Species.BLASTOISE,
-      Species.CHARIZARD,
-    ]);
-    expect(game.scene.ui?.getMode()).toBe(Mode.COMMAND);
+    await game.startBattle([Species.BLASTOISE, Species.CHARIZARD]);
+    expect(game.scene.ui?.getMode()).toBe(UiMode.COMMAND);
     expect(game.scene.getCurrentPhase()!.constructor.name).toBe(CommandPhase.name);
   }, 20000);
 
   it("4vs2", async () => {
-    game.override.battleType("double");
+    game.override.battleStyle("double");
     game.override.enemySpecies(Species.MIGHTYENA);
     game.override.enemyAbility(Abilities.HYDRATION);
     game.override.ability(Abilities.HYDRATION);
     game.override.startingWave(3);
-    await game.startBattle([
-      Species.BLASTOISE,
-      Species.CHARIZARD,
-      Species.DARKRAI,
-      Species.GABITE,
-    ]);
-    expect(game.scene.ui?.getMode()).toBe(Mode.COMMAND);
+    await game.startBattle([Species.BLASTOISE, Species.CHARIZARD, Species.DARKRAI, Species.GABITE]);
+    expect(game.scene.ui?.getMode()).toBe(UiMode.COMMAND);
     expect(game.scene.getCurrentPhase()!.constructor.name).toBe(CommandPhase.name);
   }, 20000);
 
   it("kill opponent pokemon", async () => {
     const moveToUse = Moves.SPLASH;
-    game.override.battleType("single");
+    game.override.battleStyle("single");
     game.override.starterSpecies(Species.MEWTWO);
     game.override.enemySpecies(Species.RATTATA);
     game.override.enemyAbility(Abilities.HYDRATION);
     game.override.ability(Abilities.ZEN_MODE);
     game.override.startingLevel(2000);
     game.override.startingWave(3);
-    game.override.moveset([ moveToUse ]);
-    game.override.enemyMoveset([ Moves.TACKLE, Moves.TACKLE, Moves.TACKLE, Moves.TACKLE ]);
-    await game.startBattle([
-      Species.DARMANITAN,
-      Species.CHARIZARD,
-    ]);
+    game.override.moveset([moveToUse]);
+    game.override.enemyMoveset([Moves.TACKLE, Moves.TACKLE, Moves.TACKLE, Moves.TACKLE]);
+    await game.startBattle([Species.DARMANITAN, Species.CHARIZARD]);
 
     game.move.select(moveToUse);
     await game.phaseInterceptor.to(DamageAnimPhase, false);
@@ -275,15 +266,15 @@ describe("Test Battle Phase", () => {
 
   it("to next turn", async () => {
     const moveToUse = Moves.SPLASH;
-    game.override.battleType("single");
+    game.override.battleStyle("single");
     game.override.starterSpecies(Species.MEWTWO);
     game.override.enemySpecies(Species.RATTATA);
     game.override.enemyAbility(Abilities.HYDRATION);
     game.override.ability(Abilities.ZEN_MODE);
     game.override.startingLevel(2000);
     game.override.startingWave(3);
-    game.override.moveset([ moveToUse ]);
-    game.override.enemyMoveset([ Moves.TACKLE, Moves.TACKLE, Moves.TACKLE, Moves.TACKLE ]);
+    game.override.moveset([moveToUse]);
+    game.override.enemyMoveset([Moves.TACKLE, Moves.TACKLE, Moves.TACKLE, Moves.TACKLE]);
     await game.startBattle();
     const turn = game.scene.currentBattle.turn;
     game.move.select(moveToUse);
@@ -294,7 +285,7 @@ describe("Test Battle Phase", () => {
   it("does not set new weather if staying in same biome", async () => {
     const moveToUse = Moves.SPLASH;
     game.override
-      .battleType("single")
+      .battleStyle("single")
       .starterSpecies(Species.MEWTWO)
       .enemySpecies(Species.RATTATA)
       .enemyAbility(Abilities.HYDRATION)
@@ -302,8 +293,8 @@ describe("Test Battle Phase", () => {
       .startingLevel(2000)
       .startingWave(3)
       .startingBiome(Biome.LAKE)
-      .moveset([ moveToUse ]);
-    game.override.enemyMoveset([ Moves.TACKLE, Moves.TACKLE, Moves.TACKLE, Moves.TACKLE ]);
+      .moveset([moveToUse]);
+    game.override.enemyMoveset([Moves.TACKLE, Moves.TACKLE, Moves.TACKLE, Moves.TACKLE]);
     await game.classicMode.startBattle();
     const waveIndex = game.scene.currentBattle.waveIndex;
     game.move.select(moveToUse);
@@ -318,12 +309,12 @@ describe("Test Battle Phase", () => {
   it("does not force switch if active pokemon faints at same time as enemy mon and is revived in post-battle", async () => {
     const moveToUse = Moves.TAKE_DOWN;
     game.override
-      .battleType("single")
+      .battleStyle("single")
       .starterSpecies(Species.SAWK)
       .enemySpecies(Species.RATTATA)
       .startingWave(1)
       .startingLevel(100)
-      .moveset([ moveToUse ])
+      .moveset([moveToUse])
       .enemyMoveset(Moves.SPLASH)
       .startingHeldItems([{ name: "TEMP_STAT_STAGE_BOOSTER", type: Stat.ACC }]);
 
@@ -335,10 +326,14 @@ describe("Test Battle Phase", () => {
     game.doRevivePokemon(0); // pretend max revive was picked
     game.doSelectModifier();
 
-    game.onNextPrompt("SwitchPhase", Mode.PARTY, () => {
-      expect.fail("Switch was forced");
-    }, () => game.isCurrentPhase(NextEncounterPhase));
+    game.onNextPrompt(
+      "SwitchPhase",
+      UiMode.PARTY,
+      () => {
+        expect.fail("Switch was forced");
+      },
+      () => game.isCurrentPhase(NextEncounterPhase),
+    );
     await game.phaseInterceptor.to(SwitchPhase);
   }, 20000);
 });
-
diff --git a/src/test/battle/damage_calculation.test.ts b/test/battle/damage_calculation.test.ts
similarity index 55%
rename from src/test/battle/damage_calculation.test.ts
rename to test/battle/damage_calculation.test.ts
index e6aca828156..26772cbc4f0 100644
--- a/src/test/battle/damage_calculation.test.ts
+++ b/test/battle/damage_calculation.test.ts
@@ -1,9 +1,11 @@
-import { allMoves } from "#app/data/move";
+import { allMoves } from "#app/data/moves/move";
+import type { EnemyPersistentModifier } from "#app/modifier/modifier";
+import { modifierTypes } from "#app/modifier/modifier-type";
 import { Abilities } from "#enums/abilities";
 import { ArenaTagType } from "#enums/arena-tag-type";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
@@ -24,18 +26,18 @@ describe("Battle Mechanics - Damage Calculation", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     game.override
-      .battleType("single")
+      .battleStyle("single")
       .enemySpecies(Species.SNORLAX)
       .enemyAbility(Abilities.BALL_FETCH)
       .enemyMoveset(Moves.SPLASH)
       .startingLevel(100)
       .enemyLevel(100)
       .disableCrits()
-      .moveset([ Moves.TACKLE, Moves.DRAGON_RAGE, Moves.FISSURE, Moves.JUMP_KICK ]);
+      .moveset([Moves.TACKLE, Moves.DRAGON_RAGE, Moves.FISSURE, Moves.JUMP_KICK]);
   });
 
   it("Tackle deals expected base damage", async () => {
-    await game.classicMode.startBattle([ Species.CHARIZARD ]);
+    await game.classicMode.startBattle([Species.CHARIZARD]);
 
     const playerPokemon = game.scene.getPlayerPokemon()!;
     vi.spyOn(playerPokemon, "getEffectiveStat").mockReturnValue(80);
@@ -45,15 +47,15 @@ describe("Battle Mechanics - Damage Calculation", () => {
 
     // expected base damage = [(2*level/5 + 2) * power * playerATK / enemyDEF / 50] + 2
     //                      = 31.8666...
-    expect(enemyPokemon.getAttackDamage(playerPokemon, allMoves[Moves.TACKLE]).damage).toBeCloseTo(31);
+    expect(enemyPokemon.getAttackDamage({ source: playerPokemon, move: allMoves[Moves.TACKLE] }).damage).toBeCloseTo(
+      31,
+    );
   });
 
   it("Attacks deal 1 damage at minimum", async () => {
-    game.override
-      .startingLevel(1)
-      .enemySpecies(Species.AGGRON);
+    game.override.startingLevel(1).enemySpecies(Species.AGGRON);
 
-    await game.classicMode.startBattle([ Species.MAGIKARP ]);
+    await game.classicMode.startBattle([Species.MAGIKARP]);
 
     const aggron = game.scene.getEnemyPokemon()!;
 
@@ -65,38 +67,50 @@ describe("Battle Mechanics - Damage Calculation", () => {
     expect(aggron.hp).toBe(aggron.getMaxHp() - 1);
   });
 
-  it("Fixed-damage moves ignore damage multipliers", async () => {
-    game.override
-      .enemySpecies(Species.DRAGONITE)
-      .enemyAbility(Abilities.MULTISCALE);
+  it("Attacks deal 1 damage at minimum even with many tokens", async () => {
+    game.override.startingLevel(1).enemySpecies(Species.AGGRON).enemyAbility(Abilities.STURDY).enemyLevel(10000);
 
-    await game.classicMode.startBattle([ Species.MAGIKARP ]);
+    await game.classicMode.startBattle([Species.SHUCKLE]);
+
+    const dmg_redux_modifier = modifierTypes.ENEMY_DAMAGE_REDUCTION().newModifier() as EnemyPersistentModifier;
+    dmg_redux_modifier.stackCount = 1000;
+    await game.scene.addEnemyModifier(modifierTypes.ENEMY_DAMAGE_REDUCTION().newModifier() as EnemyPersistentModifier);
+
+    const aggron = game.scene.getEnemyPokemon()!;
+
+    game.move.select(Moves.TACKLE);
+
+    await game.phaseInterceptor.to("BerryPhase", false);
+
+    expect(aggron.hp).toBe(aggron.getMaxHp() - 1);
+  });
+
+  it("Fixed-damage moves ignore damage multipliers", async () => {
+    game.override.enemySpecies(Species.DRAGONITE).enemyAbility(Abilities.MULTISCALE);
+
+    await game.classicMode.startBattle([Species.MAGIKARP]);
 
     const magikarp = game.scene.getPlayerPokemon()!;
     const dragonite = game.scene.getEnemyPokemon()!;
 
-    expect(dragonite.getAttackDamage(magikarp, allMoves[Moves.DRAGON_RAGE]).damage).toBe(40);
+    expect(dragonite.getAttackDamage({ source: magikarp, move: allMoves[Moves.DRAGON_RAGE] }).damage).toBe(40);
   });
 
   it("One-hit KO moves ignore damage multipliers", async () => {
-    game.override
-      .enemySpecies(Species.AGGRON)
-      .enemyAbility(Abilities.MULTISCALE);
+    game.override.enemySpecies(Species.AGGRON).enemyAbility(Abilities.MULTISCALE);
 
-    await game.classicMode.startBattle([ Species.MAGIKARP ]);
+    await game.classicMode.startBattle([Species.MAGIKARP]);
 
     const magikarp = game.scene.getPlayerPokemon()!;
     const aggron = game.scene.getEnemyPokemon()!;
 
-    expect(aggron.getAttackDamage(magikarp, allMoves[Moves.FISSURE]).damage).toBe(aggron.hp);
+    expect(aggron.getAttackDamage({ source: magikarp, move: allMoves[Moves.FISSURE] }).damage).toBe(aggron.hp);
   });
 
   it("When the user fails to use Jump Kick with Wonder Guard ability, the damage should be 1.", async () => {
-    game.override
-      .enemySpecies(Species.GASTLY)
-      .ability(Abilities.WONDER_GUARD);
+    game.override.enemySpecies(Species.GASTLY).ability(Abilities.WONDER_GUARD);
 
-    await game.classicMode.startBattle([ Species.SHEDINJA ]);
+    await game.classicMode.startBattle([Species.SHEDINJA]);
 
     const shedinja = game.scene.getPlayerPokemon()!;
 
@@ -107,15 +121,11 @@ describe("Battle Mechanics - Damage Calculation", () => {
     expect(shedinja.hp).toBe(shedinja.getMaxHp() - 1);
   });
 
-
   it("Charizard with odd HP survives Stealth Rock damage twice", async () => {
     game.scene.arena.addTag(ArenaTagType.STEALTH_ROCK, 1, Moves.STEALTH_ROCK, 0);
-    game.override
-      .seed("Charizard Stealth Rock test")
-      .enemySpecies(Species.CHARIZARD)
-      .enemyAbility(Abilities.BLAZE);
+    game.override.seed("Charizard Stealth Rock test").enemySpecies(Species.CHARIZARD).enemyAbility(Abilities.BLAZE);
 
-    await game.classicMode.startBattle([ Species.PIKACHU ]);
+    await game.classicMode.startBattle([Species.PIKACHU]);
 
     const charizard = game.scene.getEnemyPokemon()!;
 
diff --git a/src/test/battle/double_battle.test.ts b/test/battle/double_battle.test.ts
similarity index 89%
rename from src/test/battle/double_battle.test.ts
rename to test/battle/double_battle.test.ts
index b48f2a96a5b..a30d55aac3d 100644
--- a/src/test/battle/double_battle.test.ts
+++ b/test/battle/double_battle.test.ts
@@ -6,7 +6,7 @@ import { TurnInitPhase } from "#app/phases/turn-init-phase";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { StatusEffect } from "#enums/status-effect";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
@@ -33,12 +33,8 @@ describe("Double Battles", () => {
   // double-battle player's pokemon both fainted in same round, then revive one, and next double battle summons two player's pokemon successfully.
   // (There were bugs that either only summon one when can summon two, player stuck in switchPhase etc)
   it("3v2 edge case: player summons 2 pokemon on the next battle after being fainted and revived", async () => {
-    game.override.battleType("double").enemyMoveset(Moves.SPLASH).moveset(Moves.SPLASH);
-    await game.startBattle([
-      Species.BULBASAUR,
-      Species.CHARIZARD,
-      Species.SQUIRTLE,
-    ]);
+    game.override.battleStyle("double").enemyMoveset(Moves.SPLASH).moveset(Moves.SPLASH);
+    await game.startBattle([Species.BULBASAUR, Species.CHARIZARD, Species.SQUIRTLE]);
 
     game.move.select(Moves.SPLASH);
     game.move.select(Moves.SPLASH, 1);
@@ -70,13 +66,14 @@ describe("Double Battles", () => {
       return rngSweepProgress * (max - min) + min;
     });
 
-    game.override.enemyMoveset(Moves.SPLASH)
+    game.override
+      .enemyMoveset(Moves.SPLASH)
       .moveset(Moves.SPLASH)
       .enemyAbility(Abilities.BALL_FETCH)
       .ability(Abilities.BALL_FETCH);
 
     // Play through endless, waves 1 to 9, counting number of double battles from waves 2 to 9
-    await game.classicMode.startBattle([ Species.BULBASAUR ]);
+    await game.classicMode.startBattle([Species.BULBASAUR]);
     game.scene.gameMode = getGameMode(GameModes.ENDLESS);
 
     for (let i = 0; i < DOUBLE_CHANCE; i++) {
diff --git a/src/test/battle/inverse_battle.test.ts b/test/battle/inverse_battle.test.ts
similarity index 68%
rename from src/test/battle/inverse_battle.test.ts
rename to test/battle/inverse_battle.test.ts
index 0bda678bbd3..799442bb603 100644
--- a/src/test/battle/inverse_battle.test.ts
+++ b/test/battle/inverse_battle.test.ts
@@ -1,16 +1,15 @@
 import { BattlerIndex } from "#app/battle";
-import { Type } from "#enums/type";
+import { PokemonType } from "#enums/pokemon-type";
 import { Abilities } from "#enums/abilities";
 import { ArenaTagType } from "#enums/arena-tag-type";
 import { Challenges } from "#enums/challenges";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { StatusEffect } from "#enums/status-effect";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
-
 describe("Inverse Battle", () => {
   let phaserGame: Phaser.Game;
   let game: GameManager;
@@ -31,7 +30,7 @@ describe("Inverse Battle", () => {
     game.challengeMode.addChallenge(Challenges.INVERSE_BATTLE, 1, 1);
 
     game.override
-      .battleType("single")
+      .battleStyle("single")
       .starterSpecies(Species.FEEBAS)
       .ability(Abilities.BALL_FETCH)
       .enemySpecies(Species.MAGIKARP)
@@ -40,10 +39,7 @@ describe("Inverse Battle", () => {
   });
 
   it("Immune types are 2x effective - Thunderbolt against Ground Type", async () => {
-    game.override
-      .moveset([ Moves.THUNDERBOLT ])
-      .enemySpecies(Species.SANDSHREW);
-
+    game.override.moveset([Moves.THUNDERBOLT]).enemySpecies(Species.SANDSHREW);
 
     await game.challengeMode.startBattle();
 
@@ -51,16 +47,14 @@ describe("Inverse Battle", () => {
     vi.spyOn(enemy, "getMoveEffectiveness");
 
     game.move.select(Moves.THUNDERBOLT);
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
     await game.phaseInterceptor.to("MoveEffectPhase");
 
     expect(enemy.getMoveEffectiveness).toHaveLastReturnedWith(2);
   });
 
   it("2x effective types are 0.5x effective - Thunderbolt against Flying Type", async () => {
-    game.override
-      .moveset([ Moves.THUNDERBOLT ])
-      .enemySpecies(Species.PIDGEY);
+    game.override.moveset([Moves.THUNDERBOLT]).enemySpecies(Species.PIDGEY);
 
     await game.challengeMode.startBattle();
 
@@ -68,16 +62,14 @@ describe("Inverse Battle", () => {
     vi.spyOn(enemy, "getMoveEffectiveness");
 
     game.move.select(Moves.THUNDERBOLT);
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
     await game.phaseInterceptor.to("MoveEffectPhase");
 
     expect(enemy.getMoveEffectiveness).toHaveLastReturnedWith(0.5);
   });
 
   it("0.5x effective types are 2x effective - Thunderbolt against Electric Type", async () => {
-    game.override
-      .moveset([ Moves.THUNDERBOLT ])
-      .enemySpecies(Species.CHIKORITA);
+    game.override.moveset([Moves.THUNDERBOLT]).enemySpecies(Species.CHIKORITA);
 
     await game.challengeMode.startBattle();
 
@@ -85,7 +77,7 @@ describe("Inverse Battle", () => {
     vi.spyOn(enemy, "getMoveEffectiveness");
 
     game.move.select(Moves.THUNDERBOLT);
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
     await game.phaseInterceptor.to("MoveEffectPhase");
 
     expect(enemy.getMoveEffectiveness).toHaveLastReturnedWith(2);
@@ -93,9 +85,7 @@ describe("Inverse Battle", () => {
 
   it("Stealth Rock follows the inverse matchups - Stealth Rock against Charizard deals 1/32 of max HP", async () => {
     game.scene.arena.addTag(ArenaTagType.STEALTH_ROCK, 1, Moves.STEALTH_ROCK, 0);
-    game.override
-      .enemySpecies(Species.CHARIZARD)
-      .enemyLevel(100);
+    game.override.enemySpecies(Species.CHARIZARD).enemyLevel(100);
 
     await game.challengeMode.startBattle();
 
@@ -107,14 +97,17 @@ describe("Inverse Battle", () => {
     const currentHp = charizard.hp;
     const expectedHP = maxHp - damage_prediction;
 
-    console.log("Charizard's max HP: " + maxHp, "Damage: " + damage_prediction, "Current HP: " + currentHp, "Expected HP: " + expectedHP);
-    expect(currentHp).toBeGreaterThan(maxHp * 31 / 32 - 1);
+    console.log(
+      "Charizard's max HP: " + maxHp,
+      "Damage: " + damage_prediction,
+      "Current HP: " + currentHp,
+      "Expected HP: " + expectedHP,
+    );
+    expect(currentHp).toBeGreaterThan((maxHp * 31) / 32 - 1);
   });
 
   it("Freeze Dry is 2x effective against Water Type like other Ice type Move - Freeze Dry against Squirtle", async () => {
-    game.override
-      .moveset([ Moves.FREEZE_DRY ])
-      .enemySpecies(Species.SQUIRTLE);
+    game.override.moveset([Moves.FREEZE_DRY]).enemySpecies(Species.SQUIRTLE);
 
     await game.challengeMode.startBattle();
 
@@ -122,39 +115,35 @@ describe("Inverse Battle", () => {
     vi.spyOn(enemy, "getMoveEffectiveness");
 
     game.move.select(Moves.FREEZE_DRY);
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
     await game.phaseInterceptor.to("MoveEffectPhase");
 
     expect(enemy.getMoveEffectiveness).toHaveLastReturnedWith(2);
   });
 
   it("Water Absorb should heal against water moves - Water Absorb against Water gun", async () => {
-    game.override
-      .moveset([ Moves.WATER_GUN ])
-      .enemyAbility(Abilities.WATER_ABSORB);
+    game.override.moveset([Moves.WATER_GUN]).enemyAbility(Abilities.WATER_ABSORB);
 
     await game.challengeMode.startBattle();
 
     const enemy = game.scene.getEnemyPokemon()!;
     enemy.hp = enemy.getMaxHp() - 1;
     game.move.select(Moves.WATER_GUN);
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
     await game.phaseInterceptor.to("MoveEndPhase");
 
     expect(enemy.hp).toBe(enemy.getMaxHp());
   });
 
   it("Fire type does not get burned - Will-O-Wisp against Charmander", async () => {
-    game.override
-      .moveset([ Moves.WILL_O_WISP ])
-      .enemySpecies(Species.CHARMANDER);
+    game.override.moveset([Moves.WILL_O_WISP]).enemySpecies(Species.CHARMANDER);
 
     await game.challengeMode.startBattle();
 
     const enemy = game.scene.getEnemyPokemon()!;
 
     game.move.select(Moves.WILL_O_WISP);
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
     await game.move.forceHit();
     await game.phaseInterceptor.to("MoveEndPhase");
 
@@ -162,72 +151,61 @@ describe("Inverse Battle", () => {
   });
 
   it("Electric type does not get paralyzed - Nuzzle against Pikachu", async () => {
-    game.override
-      .moveset([ Moves.NUZZLE ])
-      .enemySpecies(Species.PIKACHU)
-      .enemyLevel(50);
+    game.override.moveset([Moves.NUZZLE]).enemySpecies(Species.PIKACHU).enemyLevel(50);
 
     await game.challengeMode.startBattle();
 
     const enemy = game.scene.getEnemyPokemon()!;
 
     game.move.select(Moves.NUZZLE);
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
     await game.phaseInterceptor.to("MoveEndPhase");
 
     expect(enemy.status?.effect).not.toBe(StatusEffect.PARALYSIS);
   });
 
   it("Ground type is not immune to Thunder Wave - Thunder Wave against Sandshrew", async () => {
-    game.override
-      .moveset([ Moves.THUNDER_WAVE ])
-      .enemySpecies(Species.SANDSHREW);
+    game.override.moveset([Moves.THUNDER_WAVE]).enemySpecies(Species.SANDSHREW);
 
     await game.challengeMode.startBattle();
 
     const enemy = game.scene.getEnemyPokemon()!;
 
     game.move.select(Moves.THUNDER_WAVE);
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
     await game.move.forceHit();
     await game.phaseInterceptor.to("MoveEndPhase");
 
     expect(enemy.status?.effect).toBe(StatusEffect.PARALYSIS);
   });
 
-
-  it("Anticipation should trigger on 2x effective moves - Anticipation against Thunderbolt", async () => {
-    game.override
-      .moveset([ Moves.THUNDERBOLT ])
-      .enemySpecies(Species.SANDSHREW)
-      .enemyAbility(Abilities.ANTICIPATION);
+  it("Anticipation should trigger on 2x effective moves", async () => {
+    game.override.moveset([Moves.THUNDERBOLT]).enemySpecies(Species.SANDSHREW).enemyAbility(Abilities.ANTICIPATION);
 
     await game.challengeMode.startBattle();
 
-    expect(game.scene.getEnemyPokemon()?.summonData.abilitiesApplied[0]).toBe(Abilities.ANTICIPATION);
+    expect(game.scene.getEnemyPokemon()?.waveData.abilitiesApplied).toContain(Abilities.ANTICIPATION);
   });
 
   it("Conversion 2 should change the type to the resistive type - Conversion 2 against Dragonite", async () => {
     game.override
-      .moveset([ Moves.CONVERSION_2 ])
-      .enemyMoveset([ Moves.DRAGON_CLAW, Moves.DRAGON_CLAW, Moves.DRAGON_CLAW, Moves.DRAGON_CLAW ]);
+      .moveset([Moves.CONVERSION_2])
+      .enemyMoveset([Moves.DRAGON_CLAW, Moves.DRAGON_CLAW, Moves.DRAGON_CLAW, Moves.DRAGON_CLAW]);
 
     await game.challengeMode.startBattle();
 
     const player = game.scene.getPlayerPokemon()!;
 
     game.move.select(Moves.CONVERSION_2);
-    await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
 
     await game.phaseInterceptor.to("TurnEndPhase");
 
-    expect(player.getTypes()[0]).toBe(Type.DRAGON);
+    expect(player.getTypes()[0]).toBe(PokemonType.DRAGON);
   });
 
   it("Flying Press should be 0.25x effective against Grass + Dark Type - Flying Press against Meowscarada", async () => {
-    game.override
-      .moveset([ Moves.FLYING_PRESS ])
-      .enemySpecies(Species.MEOWSCARADA);
+    game.override.moveset([Moves.FLYING_PRESS]).enemySpecies(Species.MEOWSCARADA);
 
     await game.challengeMode.startBattle();
 
@@ -235,17 +213,14 @@ describe("Inverse Battle", () => {
     vi.spyOn(enemy, "getMoveEffectiveness");
 
     game.move.select(Moves.FLYING_PRESS);
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
     await game.phaseInterceptor.to("MoveEffectPhase");
 
     expect(enemy.getMoveEffectiveness).toHaveLastReturnedWith(0.25);
   });
 
   it("Scrappy ability has no effect - Tackle against Ghost Type still 2x effective with Scrappy", async () => {
-    game.override
-      .moveset([ Moves.TACKLE ])
-      .ability(Abilities.SCRAPPY)
-      .enemySpecies(Species.GASTLY);
+    game.override.moveset([Moves.TACKLE]).ability(Abilities.SCRAPPY).enemySpecies(Species.GASTLY);
 
     await game.challengeMode.startBattle();
 
@@ -253,16 +228,14 @@ describe("Inverse Battle", () => {
     vi.spyOn(enemy, "getMoveEffectiveness");
 
     game.move.select(Moves.TACKLE);
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
     await game.phaseInterceptor.to("MoveEffectPhase");
 
     expect(enemy.getMoveEffectiveness).toHaveLastReturnedWith(2);
   });
 
   it("FORESIGHT has no effect - Tackle against Ghost Type still 2x effective with Foresight", async () => {
-    game.override
-      .moveset([ Moves.FORESIGHT, Moves.TACKLE ])
-      .enemySpecies(Species.GASTLY);
+    game.override.moveset([Moves.FORESIGHT, Moves.TACKLE]).enemySpecies(Species.GASTLY);
 
     await game.challengeMode.startBattle();
 
@@ -270,11 +243,11 @@ describe("Inverse Battle", () => {
     vi.spyOn(enemy, "getMoveEffectiveness");
 
     game.move.select(Moves.FORESIGHT);
-    await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
     await game.phaseInterceptor.to("TurnEndPhase");
 
     game.move.select(Moves.TACKLE);
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
     await game.phaseInterceptor.to("MoveEffectPhase");
 
     expect(enemy.getMoveEffectiveness).toHaveLastReturnedWith(2);
diff --git a/test/battle/special_battle.test.ts b/test/battle/special_battle.test.ts
new file mode 100644
index 00000000000..163f23e488d
--- /dev/null
+++ b/test/battle/special_battle.test.ts
@@ -0,0 +1,96 @@
+import { CommandPhase } from "#app/phases/command-phase";
+import { UiMode } from "#enums/ui-mode";
+import { Abilities } from "#enums/abilities";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import GameManager from "#test/testUtils/gameManager";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
+
+describe("Test Battle Phase", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+    game.override.enemySpecies(Species.RATTATA);
+    game.override.startingLevel(2000);
+    game.override.moveset([Moves.TACKLE]);
+    game.override.enemyAbility(Abilities.HYDRATION);
+    game.override.ability(Abilities.HYDRATION);
+    game.override.enemyMoveset([Moves.TACKLE, Moves.TACKLE, Moves.TACKLE, Moves.TACKLE]);
+  });
+
+  it("startBattle 2vs1 boss", async () => {
+    game.override.battleStyle("single").startingWave(10);
+    await game.startBattle([Species.BLASTOISE, Species.CHARIZARD]);
+    expect(game.scene.ui?.getMode()).toBe(UiMode.COMMAND);
+    expect(game.scene.getCurrentPhase()!.constructor.name).toBe(CommandPhase.name);
+  }, 20000);
+
+  it("startBattle 2vs2 boss", async () => {
+    game.override.battleStyle("double").startingWave(10);
+    await game.startBattle([Species.BLASTOISE, Species.CHARIZARD]);
+    expect(game.scene.ui?.getMode()).toBe(UiMode.COMMAND);
+    expect(game.scene.getCurrentPhase()!.constructor.name).toBe(CommandPhase.name);
+  }, 20000);
+
+  it("startBattle 2vs2 trainer", async () => {
+    game.override.battleStyle("double").startingWave(5);
+    await game.startBattle([Species.BLASTOISE, Species.CHARIZARD]);
+    expect(game.scene.ui?.getMode()).toBe(UiMode.COMMAND);
+    expect(game.scene.getCurrentPhase()!.constructor.name).toBe(CommandPhase.name);
+  }, 20000);
+
+  it("startBattle 2vs1 trainer", async () => {
+    game.override.battleStyle("single").startingWave(5);
+    await game.startBattle([Species.BLASTOISE, Species.CHARIZARD]);
+    expect(game.scene.ui?.getMode()).toBe(UiMode.COMMAND);
+    expect(game.scene.getCurrentPhase()!.constructor.name).toBe(CommandPhase.name);
+  }, 20000);
+
+  it("startBattle 2vs1 rival", async () => {
+    game.override.battleStyle("single").startingWave(8);
+    await game.startBattle([Species.BLASTOISE, Species.CHARIZARD]);
+    expect(game.scene.ui?.getMode()).toBe(UiMode.COMMAND);
+    expect(game.scene.getCurrentPhase()!.constructor.name).toBe(CommandPhase.name);
+  }, 20000);
+
+  it("startBattle 2vs2 rival", async () => {
+    game.override.battleStyle("double").startingWave(8);
+    await game.startBattle([Species.BLASTOISE, Species.CHARIZARD]);
+    expect(game.scene.ui?.getMode()).toBe(UiMode.COMMAND);
+    expect(game.scene.getCurrentPhase()!.constructor.name).toBe(CommandPhase.name);
+  }, 20000);
+
+  it("startBattle 1vs1 trainer", async () => {
+    game.override.battleStyle("single").startingWave(5);
+    await game.startBattle([Species.BLASTOISE]);
+    expect(game.scene.ui?.getMode()).toBe(UiMode.COMMAND);
+    expect(game.scene.getCurrentPhase()!.constructor.name).toBe(CommandPhase.name);
+  }, 20000);
+
+  it("startBattle 2vs2 trainer", async () => {
+    game.override.battleStyle("double").startingWave(5);
+    await game.startBattle([Species.BLASTOISE, Species.CHARIZARD]);
+    expect(game.scene.ui?.getMode()).toBe(UiMode.COMMAND);
+    expect(game.scene.getCurrentPhase()!.constructor.name).toBe(CommandPhase.name);
+  }, 20000);
+
+  it("startBattle 4vs2 trainer", async () => {
+    game.override.battleStyle("double").startingWave(5);
+    await game.startBattle([Species.BLASTOISE, Species.CHARIZARD, Species.DARKRAI, Species.GABITE]);
+    expect(game.scene.ui?.getMode()).toBe(UiMode.COMMAND);
+    expect(game.scene.getCurrentPhase()!.constructor.name).toBe(CommandPhase.name);
+  }, 20000);
+});
diff --git a/src/test/battlerTags/octolock.test.ts b/test/battlerTags/octolock.test.ts
similarity index 90%
rename from src/test/battlerTags/octolock.test.ts
rename to test/battlerTags/octolock.test.ts
index 4bf0257af8f..6189bd7febe 100644
--- a/src/test/battlerTags/octolock.test.ts
+++ b/test/battlerTags/octolock.test.ts
@@ -3,7 +3,7 @@ import type Pokemon from "#app/field/pokemon";
 import { BattlerTagLapseType, OctolockTag, TrappedTag } from "#app/data/battler-tags";
 import { StatStageChangePhase } from "#app/phases/stat-stage-change-phase";
 import { Stat } from "#enums/stat";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 
 describe("BattlerTag - OctolockTag", () => {
   describe("lapse behavior", () => {
@@ -31,7 +31,7 @@ describe("BattlerTag - OctolockTag", () => {
       vi.spyOn(game.scene, "unshiftPhase").mockImplementation(phase => {
         expect(phase).toBeInstanceOf(StatStageChangePhase);
         expect((phase as StatStageChangePhase)["stages"]).toEqual(-1);
-        expect((phase as StatStageChangePhase)["stats"]).toEqual([ Stat.DEF, Stat.SPDEF ]);
+        expect((phase as StatStageChangePhase)["stats"]).toEqual([Stat.DEF, Stat.SPDEF]);
       });
 
       subject.lapse(mockPokemon, BattlerTagLapseType.TURN_END);
@@ -40,7 +40,7 @@ describe("BattlerTag - OctolockTag", () => {
     });
   });
 
-  it ("traps its target (extends TrappedTag)", async () => {
+  it("traps its target (extends TrappedTag)", async () => {
     expect(new OctolockTag(1)).toBeInstanceOf(TrappedTag);
   });
 });
diff --git a/src/test/battlerTags/stockpiling.test.ts b/test/battlerTags/stockpiling.test.ts
similarity index 90%
rename from src/test/battlerTags/stockpiling.test.ts
rename to test/battlerTags/stockpiling.test.ts
index 13a4227853d..20fade13d92 100644
--- a/src/test/battlerTags/stockpiling.test.ts
+++ b/test/battlerTags/stockpiling.test.ts
@@ -4,7 +4,7 @@ import { PokemonSummonData } from "#app/field/pokemon";
 import * as messages from "#app/messages";
 import { StatStageChangePhase } from "#app/phases/stat-stage-change-phase";
 import { Stat } from "#enums/stat";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
 beforeEach(() => {
@@ -39,9 +39,9 @@ describe("BattlerTag - StockpilingTag", () => {
       vi.spyOn(game.scene, "unshiftPhase").mockImplementation(phase => {
         expect(phase).toBeInstanceOf(StatStageChangePhase);
         expect((phase as StatStageChangePhase)["stages"]).toEqual(1);
-        expect((phase as StatStageChangePhase)["stats"]).toEqual(expect.arrayContaining([ Stat.DEF, Stat.SPDEF ]));
+        expect((phase as StatStageChangePhase)["stats"]).toEqual(expect.arrayContaining([Stat.DEF, Stat.SPDEF]));
 
-        (phase as StatStageChangePhase)["onChange"]!(mockPokemon, [ Stat.DEF, Stat.SPDEF ], [ 1, 1 ]);
+        (phase as StatStageChangePhase)["onChange"]!(mockPokemon, [Stat.DEF, Stat.SPDEF], [1, 1]);
       });
 
       subject.onAdd(mockPokemon);
@@ -65,9 +65,9 @@ describe("BattlerTag - StockpilingTag", () => {
       vi.spyOn(game.scene, "unshiftPhase").mockImplementation(phase => {
         expect(phase).toBeInstanceOf(StatStageChangePhase);
         expect((phase as StatStageChangePhase)["stages"]).toEqual(1);
-        expect((phase as StatStageChangePhase)["stats"]).toEqual(expect.arrayContaining([ Stat.DEF, Stat.SPDEF ]));
+        expect((phase as StatStageChangePhase)["stats"]).toEqual(expect.arrayContaining([Stat.DEF, Stat.SPDEF]));
 
-        (phase as StatStageChangePhase)["onChange"]!(mockPokemon, [ Stat.DEF, Stat.SPDEF ], [ 1, 1 ]);
+        (phase as StatStageChangePhase)["onChange"]!(mockPokemon, [Stat.DEF, Stat.SPDEF], [1, 1]);
       });
 
       subject.onAdd(mockPokemon);
@@ -89,9 +89,9 @@ describe("BattlerTag - StockpilingTag", () => {
       vi.spyOn(game.scene, "unshiftPhase").mockImplementation(phase => {
         expect(phase).toBeInstanceOf(StatStageChangePhase);
         expect((phase as StatStageChangePhase)["stages"]).toEqual(1);
-        expect((phase as StatStageChangePhase)["stats"]).toEqual(expect.arrayContaining([ Stat.DEF, Stat.SPDEF ]));
+        expect((phase as StatStageChangePhase)["stats"]).toEqual(expect.arrayContaining([Stat.DEF, Stat.SPDEF]));
 
-        (phase as StatStageChangePhase)["onChange"]!(mockPokemon, [ Stat.DEF, Stat.SPDEF ], [ 1, 1 ]);
+        (phase as StatStageChangePhase)["onChange"]!(mockPokemon, [Stat.DEF, Stat.SPDEF], [1, 1]);
       });
 
       subject.onOverlap(mockPokemon);
@@ -117,10 +117,10 @@ describe("BattlerTag - StockpilingTag", () => {
       vi.spyOn(game.scene, "unshiftPhase").mockImplementationOnce(phase => {
         expect(phase).toBeInstanceOf(StatStageChangePhase);
         expect((phase as StatStageChangePhase)["stages"]).toEqual(1);
-        expect((phase as StatStageChangePhase)["stats"]).toEqual(expect.arrayContaining([ Stat.DEF, Stat.SPDEF ]));
+        expect((phase as StatStageChangePhase)["stats"]).toEqual(expect.arrayContaining([Stat.DEF, Stat.SPDEF]));
 
         // def doesn't change
-        (phase as StatStageChangePhase)["onChange"]!(mockPokemon, [ Stat.SPDEF ], [ 1 ]);
+        (phase as StatStageChangePhase)["onChange"]!(mockPokemon, [Stat.SPDEF], [1]);
       });
 
       subject.onAdd(mockPokemon);
@@ -129,10 +129,10 @@ describe("BattlerTag - StockpilingTag", () => {
       vi.spyOn(game.scene, "unshiftPhase").mockImplementationOnce(phase => {
         expect(phase).toBeInstanceOf(StatStageChangePhase);
         expect((phase as StatStageChangePhase)["stages"]).toEqual(1);
-        expect((phase as StatStageChangePhase)["stats"]).toEqual(expect.arrayContaining([ Stat.DEF, Stat.SPDEF ]));
+        expect((phase as StatStageChangePhase)["stats"]).toEqual(expect.arrayContaining([Stat.DEF, Stat.SPDEF]));
 
         // def doesn't change
-        (phase as StatStageChangePhase)["onChange"]!(mockPokemon, [ Stat.SPDEF ], [ 1 ]);
+        (phase as StatStageChangePhase)["onChange"]!(mockPokemon, [Stat.SPDEF], [1]);
       });
 
       subject.onOverlap(mockPokemon);
@@ -141,7 +141,7 @@ describe("BattlerTag - StockpilingTag", () => {
       vi.spyOn(game.scene, "unshiftPhase").mockImplementationOnce(phase => {
         expect(phase).toBeInstanceOf(StatStageChangePhase);
         expect((phase as StatStageChangePhase)["stages"]).toEqual(1);
-        expect((phase as StatStageChangePhase)["stats"]).toEqual(expect.arrayContaining([ Stat.DEF, Stat.SPDEF ]));
+        expect((phase as StatStageChangePhase)["stats"]).toEqual(expect.arrayContaining([Stat.DEF, Stat.SPDEF]));
 
         // neither stat changes, stack count should still increase
       });
@@ -156,13 +156,16 @@ describe("BattlerTag - StockpilingTag", () => {
       // fourth stack should not be applied
       subject.onOverlap(mockPokemon);
       expect(subject.stockpiledCount).toBe(3);
-      expect(subject.statChangeCounts).toMatchObject({ [Stat.DEF]: 0, [Stat.SPDEF]: 2 });
+      expect(subject.statChangeCounts).toMatchObject({
+        [Stat.DEF]: 0,
+        [Stat.SPDEF]: 2,
+      });
 
       // removing tag should reverse stat changes
       vi.spyOn(game.scene, "unshiftPhase").mockImplementationOnce(phase => {
         expect(phase).toBeInstanceOf(StatStageChangePhase);
         expect((phase as StatStageChangePhase)["stages"]).toEqual(-2);
-        expect((phase as StatStageChangePhase)["stats"]).toEqual(expect.arrayContaining([ Stat.SPDEF ]));
+        expect((phase as StatStageChangePhase)["stats"]).toEqual(expect.arrayContaining([Stat.SPDEF]));
       });
 
       subject.onRemove(mockPokemon);
diff --git a/test/battlerTags/substitute.test.ts b/test/battlerTags/substitute.test.ts
new file mode 100644
index 00000000000..c2a99299716
--- /dev/null
+++ b/test/battlerTags/substitute.test.ts
@@ -0,0 +1,223 @@
+import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
+import type { PokemonTurnData, TurnMove } from "#app/field/pokemon";
+import type Pokemon from "#app/field/pokemon";
+import { MoveResult } from "#app/field/pokemon";
+import type BattleScene from "#app/battle-scene";
+import { BattlerTagLapseType, BindTag, SubstituteTag } from "#app/data/battler-tags";
+import { Moves } from "#app/enums/moves";
+import { PokemonAnimType } from "#app/enums/pokemon-anim-type";
+import * as messages from "#app/messages";
+import { allMoves } from "#app/data/moves/move";
+import type { MoveEffectPhase } from "#app/phases/move-effect-phase";
+import GameManager from "#test/testUtils/gameManager";
+
+describe("BattlerTag - SubstituteTag", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+  });
+
+  let mockPokemon: Pokemon;
+
+  describe("onAdd behavior", () => {
+    beforeEach(() => {
+      mockPokemon = {
+        scene: game.scene,
+        hp: 101,
+        id: 0,
+        getMaxHp: vi.fn().mockReturnValue(101) as Pokemon["getMaxHp"],
+        findAndRemoveTags: vi.fn().mockImplementation(tagFilter => {
+          // simulate a Trapped tag set by another Pokemon, then expect the filter to catch it.
+          const trapTag = new BindTag(5, 0);
+          expect(tagFilter(trapTag)).toBeTruthy();
+        }) as Pokemon["findAndRemoveTags"],
+      } as unknown as Pokemon;
+
+      vi.spyOn(messages, "getPokemonNameWithAffix").mockReturnValue("");
+      vi.spyOn(mockPokemon.scene as BattleScene, "getPokemonById").mockImplementation(pokemonId =>
+        mockPokemon.id === pokemonId ? mockPokemon : null,
+      );
+    });
+
+    it("sets the tag's HP to 1/4 of the source's max HP (rounded down)", async () => {
+      const subject = new SubstituteTag(Moves.SUBSTITUTE, mockPokemon.id);
+
+      vi.spyOn(mockPokemon.scene as BattleScene, "triggerPokemonBattleAnim").mockReturnValue(true);
+      vi.spyOn(mockPokemon.scene as BattleScene, "queueMessage").mockReturnValue();
+
+      subject.onAdd(mockPokemon);
+
+      expect(subject.hp).toBe(25);
+    });
+
+    it("triggers on-add effects that bring the source out of focus", async () => {
+      const subject = new SubstituteTag(Moves.SUBSTITUTE, mockPokemon.id);
+
+      vi.spyOn(mockPokemon.scene as BattleScene, "triggerPokemonBattleAnim").mockImplementation(
+        (_pokemon, battleAnimType, _fieldAssets?, _delayed?) => {
+          expect(battleAnimType).toBe(PokemonAnimType.SUBSTITUTE_ADD);
+          return true;
+        },
+      );
+
+      vi.spyOn(mockPokemon.scene as BattleScene, "queueMessage").mockReturnValue();
+
+      subject.onAdd(mockPokemon);
+
+      expect(subject.sourceInFocus).toBeFalsy();
+      expect((mockPokemon.scene as BattleScene).triggerPokemonBattleAnim).toHaveBeenCalledTimes(1);
+      expect((mockPokemon.scene as BattleScene).queueMessage).toHaveBeenCalledTimes(1);
+    });
+
+    it("removes effects that trap the source", async () => {
+      const subject = new SubstituteTag(Moves.SUBSTITUTE, mockPokemon.id);
+
+      vi.spyOn(mockPokemon.scene as BattleScene, "queueMessage").mockReturnValue();
+
+      subject.onAdd(mockPokemon);
+      expect(mockPokemon.findAndRemoveTags).toHaveBeenCalledTimes(1);
+    });
+  });
+
+  describe("onRemove behavior", () => {
+    beforeEach(() => {
+      mockPokemon = {
+        scene: game.scene,
+        hp: 101,
+        id: 0,
+        isFainted: vi.fn().mockReturnValue(false) as Pokemon["isFainted"],
+      } as unknown as Pokemon;
+
+      vi.spyOn(messages, "getPokemonNameWithAffix").mockReturnValue("");
+    });
+
+    it("triggers on-remove animation and message", async () => {
+      const subject = new SubstituteTag(Moves.SUBSTITUTE, mockPokemon.id);
+      subject.sourceInFocus = false;
+
+      vi.spyOn(mockPokemon.scene as BattleScene, "triggerPokemonBattleAnim").mockImplementation(
+        (_pokemon, battleAnimType, _fieldAssets?, _delayed?) => {
+          expect(battleAnimType).toBe(PokemonAnimType.SUBSTITUTE_REMOVE);
+          return true;
+        },
+      );
+
+      vi.spyOn(mockPokemon.scene as BattleScene, "queueMessage").mockReturnValue();
+
+      subject.onRemove(mockPokemon);
+
+      expect((mockPokemon.scene as BattleScene).triggerPokemonBattleAnim).toHaveBeenCalledTimes(1);
+      expect((mockPokemon.scene as BattleScene).queueMessage).toHaveBeenCalledTimes(1);
+    });
+  });
+
+  describe("lapse behavior", () => {
+    beforeEach(() => {
+      mockPokemon = {
+        scene: game.scene,
+        hp: 101,
+        id: 0,
+        turnData: { acted: true } as PokemonTurnData,
+        getLastXMoves: vi
+          .fn()
+          .mockReturnValue([
+            { move: Moves.TACKLE, result: MoveResult.SUCCESS } as TurnMove,
+          ]) as Pokemon["getLastXMoves"],
+      } as unknown as Pokemon;
+
+      vi.spyOn(messages, "getPokemonNameWithAffix").mockReturnValue("");
+    });
+
+    it("PRE_MOVE lapse triggers pre-move animation", async () => {
+      const subject = new SubstituteTag(Moves.SUBSTITUTE, mockPokemon.id);
+
+      vi.spyOn(mockPokemon.scene as BattleScene, "triggerPokemonBattleAnim").mockImplementation(
+        (_pokemon, battleAnimType, _fieldAssets?, _delayed?) => {
+          expect(battleAnimType).toBe(PokemonAnimType.SUBSTITUTE_PRE_MOVE);
+          return true;
+        },
+      );
+
+      vi.spyOn(mockPokemon.scene as BattleScene, "queueMessage").mockReturnValue();
+
+      expect(subject.lapse(mockPokemon, BattlerTagLapseType.PRE_MOVE)).toBeTruthy();
+
+      expect(subject.sourceInFocus).toBeTruthy();
+      expect((mockPokemon.scene as BattleScene).triggerPokemonBattleAnim).toHaveBeenCalledTimes(1);
+      expect((mockPokemon.scene as BattleScene).queueMessage).not.toHaveBeenCalled();
+    });
+
+    it("AFTER_MOVE lapse triggers post-move animation", async () => {
+      const subject = new SubstituteTag(Moves.SUBSTITUTE, mockPokemon.id);
+
+      vi.spyOn(mockPokemon.scene as BattleScene, "triggerPokemonBattleAnim").mockImplementation(
+        (_pokemon, battleAnimType, _fieldAssets?, _delayed?) => {
+          expect(battleAnimType).toBe(PokemonAnimType.SUBSTITUTE_POST_MOVE);
+          return true;
+        },
+      );
+
+      vi.spyOn(mockPokemon.scene as BattleScene, "queueMessage").mockReturnValue();
+
+      expect(subject.lapse(mockPokemon, BattlerTagLapseType.AFTER_MOVE)).toBeTruthy();
+
+      expect(subject.sourceInFocus).toBeFalsy();
+      expect((mockPokemon.scene as BattleScene).triggerPokemonBattleAnim).toHaveBeenCalledTimes(1);
+      expect((mockPokemon.scene as BattleScene).queueMessage).not.toHaveBeenCalled();
+    });
+
+    // TODO: Figure out how to mock a MoveEffectPhase correctly for this test
+    it.todo("HIT lapse triggers on-hit message", async () => {
+      const subject = new SubstituteTag(Moves.SUBSTITUTE, mockPokemon.id);
+
+      vi.spyOn(mockPokemon.scene as BattleScene, "triggerPokemonBattleAnim").mockReturnValue(true);
+      vi.spyOn(mockPokemon.scene as BattleScene, "queueMessage").mockReturnValue();
+
+      const moveEffectPhase = {
+        move: allMoves[Moves.TACKLE],
+        getUserPokemon: vi.fn().mockReturnValue(undefined) as MoveEffectPhase["getUserPokemon"],
+      } as MoveEffectPhase;
+
+      vi.spyOn(mockPokemon.scene as BattleScene, "getCurrentPhase").mockReturnValue(moveEffectPhase);
+      vi.spyOn(allMoves[Moves.TACKLE], "hitsSubstitute").mockReturnValue(true);
+
+      expect(subject.lapse(mockPokemon, BattlerTagLapseType.HIT)).toBeTruthy();
+
+      expect((mockPokemon.scene as BattleScene).triggerPokemonBattleAnim).not.toHaveBeenCalled();
+      expect((mockPokemon.scene as BattleScene).queueMessage).toHaveBeenCalledTimes(1);
+    });
+
+    it("CUSTOM lapse flags the tag for removal", async () => {
+      const subject = new SubstituteTag(Moves.SUBSTITUTE, mockPokemon.id);
+
+      vi.spyOn(mockPokemon.scene as BattleScene, "triggerPokemonBattleAnim").mockReturnValue(true);
+      vi.spyOn(mockPokemon.scene as BattleScene, "queueMessage").mockReturnValue();
+
+      expect(subject.lapse(mockPokemon, BattlerTagLapseType.CUSTOM)).toBeFalsy();
+    });
+
+    it("Unsupported lapse type does nothing", async () => {
+      const subject = new SubstituteTag(Moves.SUBSTITUTE, mockPokemon.id);
+
+      vi.spyOn(mockPokemon.scene as BattleScene, "triggerPokemonBattleAnim").mockReturnValue(true);
+      vi.spyOn(mockPokemon.scene as BattleScene, "queueMessage").mockReturnValue();
+
+      expect(subject.lapse(mockPokemon, BattlerTagLapseType.TURN_END)).toBeTruthy();
+
+      expect((mockPokemon.scene as BattleScene).triggerPokemonBattleAnim).not.toHaveBeenCalled();
+      expect((mockPokemon.scene as BattleScene).queueMessage).not.toHaveBeenCalled();
+    });
+  });
+});
diff --git a/src/test/boss-pokemon.test.ts b/test/boss-pokemon.test.ts
similarity index 90%
rename from src/test/boss-pokemon.test.ts
rename to test/boss-pokemon.test.ts
index 389b42a2963..ef95ae9bcc2 100644
--- a/src/test/boss-pokemon.test.ts
+++ b/test/boss-pokemon.test.ts
@@ -1,12 +1,12 @@
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
-import GameManager from "./utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import { Species } from "#app/enums/species";
 import { getPokemonSpecies } from "#app/data/pokemon-species";
 import { Abilities } from "#app/enums/abilities";
 import { Moves } from "#app/enums/moves";
 import { EFFECTIVE_STATS } from "#app/enums/stat";
 import type { EnemyPokemon } from "#app/field/pokemon";
-import { toDmgValue } from "#app/utils";
+import { toDmgValue } from "#app/utils/common";
 
 describe("Boss Pokemon / Shields", () => {
   let phaserGame: Phaser.Game;
@@ -26,14 +26,14 @@ describe("Boss Pokemon / Shields", () => {
     game = new GameManager(phaserGame);
 
     game.override
-      .battleType("single")
+      .battleStyle("single")
       .disableTrainerWaves()
       .disableCrits()
       .enemySpecies(Species.RATTATA)
       .enemyMoveset(Moves.SPLASH)
       .enemyHeldItems([])
       .startingLevel(1000)
-      .moveset([ Moves.FALSE_SWIPE, Moves.SUPER_FANG, Moves.SPLASH, Moves.PSYCHIC ])
+      .moveset([Moves.FALSE_SWIPE, Moves.SUPER_FANG, Moves.SPLASH, Moves.PSYCHIC])
       .ability(Abilities.NO_GUARD);
   });
 
@@ -63,11 +63,9 @@ describe("Boss Pokemon / Shields", () => {
   });
 
   it("should reduce the number of shields if we are in a double battle", async () => {
-    game.override
-      .battleType("double")
-      .startingWave(150); // Floor 150 > 2 shields / 3 health segments
+    game.override.battleStyle("double").startingWave(150); // Floor 150 > 2 shields / 3 health segments
 
-    await game.classicMode.startBattle([ Species.MEWTWO ]);
+    await game.classicMode.startBattle([Species.MEWTWO]);
 
     const boss1: EnemyPokemon = game.scene.getEnemyParty()[0]!;
     const boss2: EnemyPokemon = game.scene.getEnemyParty()[1]!;
@@ -80,7 +78,7 @@ describe("Boss Pokemon / Shields", () => {
   it("shields should stop overflow damage and give stat stage boosts when broken", async () => {
     game.override.startingWave(150); // Floor 150 > 2 shields / 3 health segments
 
-    await game.classicMode.startBattle([ Species.MEWTWO ]);
+    await game.classicMode.startBattle([Species.MEWTWO]);
 
     const enemyPokemon = game.scene.getEnemyPokemon()!;
     const segmentHp = enemyPokemon.getMaxHp() / enemyPokemon.bossSegments;
@@ -104,15 +102,12 @@ describe("Boss Pokemon / Shields", () => {
     expect(enemyPokemon.hp).toBe(enemyPokemon.getMaxHp() - toDmgValue(2 * segmentHp));
     // Breaking the last shield gives a +2 boost to ATK, DEF, SP ATK, SP DEF or SPD
     expect(getTotalStatStageBoosts(enemyPokemon)).toBe(3);
-
   });
 
   it("breaking multiple shields at once requires extra damage", async () => {
-    game.override
-      .battleType("double")
-      .enemyHealthSegments(5);
+    game.override.battleStyle("double").enemyHealthSegments(5);
 
-    await game.classicMode.startBattle([ Species.MEWTWO ]);
+    await game.classicMode.startBattle([Species.MEWTWO]);
 
     // In this test we want to break through 3 shields at once
     const brokenShields = 3;
@@ -140,17 +135,14 @@ describe("Boss Pokemon / Shields", () => {
     boss2.damageAndUpdate(Math.ceil(requiredDamageBoss2));
     expect(boss2.bossSegmentIndex).toBe(0);
     expect(boss2.hp).toBe(boss2.getMaxHp() - toDmgValue(boss2SegmentHp * 4));
-
   });
 
   it("the number of stat stage boosts is consistent when several shields are broken at once", async () => {
     const shieldsToBreak = 4;
 
-    game.override
-      .battleType("double")
-      .enemyHealthSegments(shieldsToBreak + 1);
+    game.override.battleStyle("double").enemyHealthSegments(shieldsToBreak + 1);
 
-    await game.classicMode.startBattle([ Species.MEWTWO ]);
+    await game.classicMode.startBattle([Species.MEWTWO]);
 
     const boss1: EnemyPokemon = game.scene.getEnemyParty()[0]!;
     const boss1SegmentHp = boss1.getMaxHp() / boss1.bossSegments;
@@ -160,7 +152,6 @@ describe("Boss Pokemon / Shields", () => {
     expect(boss1.bossSegmentIndex).toBe(shieldsToBreak);
     expect(getTotalStatStageBoosts(boss1)).toBe(0);
 
-
     let totalStatStages = 0;
 
     // Break the shields one by one
@@ -193,15 +184,12 @@ describe("Boss Pokemon / Shields", () => {
     game.move.select(Moves.SPLASH);
     await game.toNextTurn();
     expect(getTotalStatStageBoosts(boss2)).toBe(totalStatStages);
-
   });
 
   it("the boss enduring does not proc an extra stat boost", async () => {
-    game.override
-      .enemyHealthSegments(2)
-      .enemyAbility(Abilities.STURDY);
+    game.override.enemyHealthSegments(2).enemyAbility(Abilities.STURDY);
 
-    await game.classicMode.startBattle([ Species.MEWTWO ]);
+    await game.classicMode.startBattle([Species.MEWTWO]);
 
     const enemyPokemon = game.scene.getEnemyPokemon()!;
     expect(enemyPokemon.isBoss()).toBe(true);
@@ -215,7 +203,6 @@ describe("Boss Pokemon / Shields", () => {
     expect(enemyPokemon.bossSegmentIndex).toBe(0);
     expect(enemyPokemon.hp).toBe(1);
     expect(getTotalStatStageBoosts(enemyPokemon)).toBe(1);
-
   });
 
   /**
@@ -231,4 +218,3 @@ describe("Boss Pokemon / Shields", () => {
     return boosts;
   }
 });
-
diff --git a/src/test/daily_mode.test.ts b/test/daily_mode.test.ts
similarity index 78%
rename from src/test/daily_mode.test.ts
rename to test/daily_mode.test.ts
index 3e70cc2d8a7..a7f5784087a 100644
--- a/src/test/daily_mode.test.ts
+++ b/test/daily_mode.test.ts
@@ -4,9 +4,9 @@ import { MapModifier } from "#app/modifier/modifier";
 import { pokerogueApi } from "#app/plugins/api/pokerogue-api";
 import ModifierSelectUiHandler from "#app/ui/modifier-select-ui-handler";
 import { Species } from "#enums/species";
-import { Mode } from "#app/ui/ui";
+import { UiMode } from "#enums/ui-mode";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
-import GameManager from "#app/test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 
 //const TIMEOUT = 20 * 1000;
 
@@ -34,7 +34,7 @@ describe("Daily Mode", () => {
 
     const party = game.scene.getPlayerParty();
     expect(party).toHaveLength(3);
-    party.forEach((pkm) => {
+    party.forEach(pkm => {
       expect(pkm.level).toBe(20);
       expect(pkm.moveset.length).toBeGreaterThan(0);
     });
@@ -57,14 +57,12 @@ describe("Shop modifications", async () => {
     game.override
       .startingWave(9)
       .startingBiome(Biome.ICE_CAVE)
-      .battleType("single")
+      .battleStyle("single")
       .startingLevel(100) // Avoid levelling up
       .disableTrainerWaves()
-      .moveset([ Moves.SPLASH ])
+      .moveset([Moves.SPLASH])
       .enemyMoveset(Moves.SPLASH);
-    game.modifiers
-      .addCheck("EVIOLITE")
-      .addCheck("MINI_BLACK_HOLE");
+    game.modifiers.addCheck("EVIOLITE").addCheck("MINI_BLACK_HOLE");
     vi.spyOn(pokerogueApi.daily, "getSeed").mockResolvedValue("test-seed");
   });
 
@@ -74,15 +72,13 @@ describe("Shop modifications", async () => {
   });
 
   it("should not have Eviolite and Mini Black Hole available in Classic if not unlocked", async () => {
-    await game.classicMode.startBattle([ Species.BULBASAUR ]);
+    await game.classicMode.startBattle([Species.BULBASAUR]);
     game.move.select(Moves.SPLASH);
     await game.doKillOpponents();
     await game.phaseInterceptor.to("BattleEndPhase");
-    game.onNextPrompt("SelectModifierPhase", Mode.MODIFIER_SELECT, () => {
+    game.onNextPrompt("SelectModifierPhase", UiMode.MODIFIER_SELECT, () => {
       expect(game.scene.ui.getHandler()).toBeInstanceOf(ModifierSelectUiHandler);
-      game.modifiers
-        .testCheck("EVIOLITE", false)
-        .testCheck("MINI_BLACK_HOLE", false);
+      game.modifiers.testCheck("EVIOLITE", false).testCheck("MINI_BLACK_HOLE", false);
     });
   });
 
@@ -91,11 +87,9 @@ describe("Shop modifications", async () => {
     game.move.select(Moves.SPLASH);
     await game.doKillOpponents();
     await game.phaseInterceptor.to("BattleEndPhase");
-    game.onNextPrompt("SelectModifierPhase", Mode.MODIFIER_SELECT, () => {
+    game.onNextPrompt("SelectModifierPhase", UiMode.MODIFIER_SELECT, () => {
       expect(game.scene.ui.getHandler()).toBeInstanceOf(ModifierSelectUiHandler);
-      game.modifiers
-        .testCheck("EVIOLITE", true)
-        .testCheck("MINI_BLACK_HOLE", true);
+      game.modifiers.testCheck("EVIOLITE", true).testCheck("MINI_BLACK_HOLE", true);
     });
   });
 });
diff --git a/src/test/data/splash_messages.test.ts b/test/data/splash_messages.test.ts
similarity index 57%
rename from src/test/data/splash_messages.test.ts
rename to test/data/splash_messages.test.ts
index b9ed5b9d365..773b2715825 100644
--- a/src/test/data/splash_messages.test.ts
+++ b/test/data/splash_messages.test.ts
@@ -7,10 +7,10 @@ describe("Data - Splash Messages", () => {
     expect(getSplashMessages().length).toBeGreaterThanOrEqual(15);
   });
 
-  // make sure to adjust this test if the weight it changed!
-  it("should add contain 10 `battlesWon` splash messages", () => {
-    const battlesWonMessages = getSplashMessages().filter((message) => message === "splashMessages:battlesWon");
-    expect(battlesWonMessages).toHaveLength(10);
+  // Make sure to adjust this test if the weight is changed!
+  it("should add contain 15 `battlesWon` splash messages", () => {
+    const battlesWonMessages = getSplashMessages().filter(message => message === "splashMessages:battlesWon");
+    expect(battlesWonMessages).toHaveLength(15);
   });
 
   describe("Seasonal", () => {
@@ -22,16 +22,24 @@ describe("Data - Splash Messages", () => {
       vi.useRealTimers(); // reset system time
     });
 
-    it("should contain halloween messages from Sep 15 to Oct 31", () => {
-      testSeason(new Date("2024-09-15"), new Date("2024-10-31"), "halloween");
+    it("should contain new years messages from Jan 1 to Jan 15", () => {
+      testSeason(new Date("2025-01-01"), new Date("2025-01-15"), "newYears");
     });
 
-    it("should contain xmas messages from Dec 1 to Dec 26", () => {
-      testSeason(new Date("2024-12-01"), new Date("2024-12-26"), "xmas");
+    it("should contain valentines messages from Feb 7 to Feb 21", () => {
+      testSeason(new Date("2025-02-07"), new Date("2025-02-21"), "valentines");
     });
 
-    it("should contain new years messages frm Jan 1 to Jan 31", () => {
-      testSeason(new Date("2024-01-01"), new Date("2024-01-31"), "newYears");
+    it("should contain april fools messages from April 1 to April 3", () => {
+      testSeason(new Date("2025-04-01"), new Date("2025-04-03"), "aprilFools");
+    });
+
+    it("should contain halloween messages from Oct 15 to Oct 31", () => {
+      testSeason(new Date("2025-10-15"), new Date("2025-10-31"), "halloween");
+    });
+
+    it("should contain winter holiday messages from Dec 1 to Dec 31", () => {
+      testSeason(new Date("2025-12-01"), new Date("2025-12-31"), "winterHoliday");
     });
   });
 });
@@ -51,8 +59,8 @@ function testSeason(startDate: Date, endDate: Date, prefix: string) {
   const afterDate = new Date(endDate);
   afterDate.setDate(endDate.getDate() + 1);
 
-  const dates: Date[] = [ beforeDate, startDate, endDate, afterDate ];
-  const [ before, start, end, after ] = dates.map((date) => {
+  const dates: Date[] = [beforeDate, startDate, endDate, afterDate];
+  const [before, start, end, after] = dates.map(date => {
     vi.setSystemTime(date);
     console.log("System time set to", date);
     const count = getSplashMessages().filter(filterFn).length;
diff --git a/src/test/data/status_effect.test.ts b/test/data/status_effect.test.ts
similarity index 95%
rename from src/test/data/status_effect.test.ts
rename to test/data/status_effect.test.ts
index 7948549b8e8..111136bf0a2 100644
--- a/src/test/data/status_effect.test.ts
+++ b/test/data/status_effect.test.ts
@@ -11,19 +11,14 @@ import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { StatusEffect } from "#enums/status-effect";
-import GameManager from "#test/utils/gameManager";
-import { mockI18next } from "#test/utils/testUtils";
-import i18next from "i18next";
+import GameManager from "#test/testUtils/gameManager";
+import { mockI18next } from "#test/testUtils/testUtils";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
 const pokemonName = "PKM";
 const sourceText = "SOURCE";
 
 describe("Status Effect Messages", () => {
-  beforeAll(() => {
-    i18next.init();
-  });
-
   describe("NONE", () => {
     const statusEffect = StatusEffect.NONE;
 
@@ -31,7 +26,6 @@ describe("Status Effect Messages", () => {
       mockI18next();
 
       const text = getStatusEffectObtainText(statusEffect, pokemonName);
-      console.log("text:", text);
       expect(text).toBe("");
 
       const emptySourceText = getStatusEffectObtainText(statusEffect, pokemonName, "");
@@ -328,13 +322,13 @@ describe("Status Effects", () => {
         .enemySpecies(Species.MAGIKARP)
         .enemyMoveset(Moves.SPLASH)
         .enemyAbility(Abilities.BALL_FETCH)
-        .moveset([ Moves.QUICK_ATTACK ])
+        .moveset([Moves.QUICK_ATTACK])
         .ability(Abilities.BALL_FETCH)
         .statusEffect(StatusEffect.PARALYSIS);
     });
 
     it("causes the pokemon's move to fail when activated", async () => {
-      await game.classicMode.startBattle([ Species.FEEBAS ]);
+      await game.classicMode.startBattle([Species.FEEBAS]);
 
       game.move.select(Moves.QUICK_ATTACK);
       await game.move.forceStatusActivation(true);
@@ -362,9 +356,9 @@ describe("Status Effects", () => {
     beforeEach(() => {
       game = new GameManager(phaserGame);
       game.override
-        .moveset([ Moves.SPLASH ])
+        .moveset([Moves.SPLASH])
         .ability(Abilities.BALL_FETCH)
-        .battleType("single")
+        .battleStyle("single")
         .disableCrits()
         .enemySpecies(Species.MAGIKARP)
         .enemyAbility(Abilities.BALL_FETCH)
@@ -372,7 +366,7 @@ describe("Status Effects", () => {
     });
 
     it("should last the appropriate number of turns", async () => {
-      await game.classicMode.startBattle([ Species.FEEBAS ]);
+      await game.classicMode.startBattle([Species.FEEBAS]);
 
       const player = game.scene.getPlayerPokemon()!;
       player.status = new Status(StatusEffect.SLEEP, 0, 4);
@@ -418,9 +412,9 @@ describe("Status Effects", () => {
     beforeEach(() => {
       game = new GameManager(phaserGame);
       game.override
-        .moveset([ Moves.SPLASH ])
+        .moveset([Moves.SPLASH])
         .ability(Abilities.BALL_FETCH)
-        .battleType("single")
+        .battleStyle("single")
         .disableCrits()
         .enemySpecies(Species.MAGIKARP)
         .enemyAbility(Abilities.BALL_FETCH)
@@ -429,7 +423,7 @@ describe("Status Effects", () => {
     });
 
     it("should not inflict a 0 HP mon with a status", async () => {
-      await game.classicMode.startBattle([ Species.FEEBAS, Species.MILOTIC ]);
+      await game.classicMode.startBattle([Species.FEEBAS, Species.MILOTIC]);
 
       const player = game.scene.getPlayerPokemon()!;
       player.hp = 0;
diff --git a/src/test/eggs/egg.test.ts b/test/eggs/egg.test.ts
similarity index 74%
rename from src/test/eggs/egg.test.ts
rename to test/eggs/egg.test.ts
index d7ed07dd151..0110aa5fdaf 100644
--- a/src/test/eggs/egg.test.ts
+++ b/test/eggs/egg.test.ts
@@ -5,9 +5,9 @@ import { EggSourceType } from "#app/enums/egg-source-types";
 import { EggTier } from "#app/enums/egg-type";
 import { VariantTier } from "#app/enums/variant-tier";
 import EggData from "#app/system/egg-data";
-import * as Utils from "#app/utils";
+import * as Utils from "#app/utils/common";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
@@ -29,7 +29,7 @@ describe("Egg Generation Tests", () => {
   });
 
   beforeEach(async () => {
-    await game.importData("src/test/utils/saves/everything.prsv");
+    await game.importData("./test/testUtils/saves/everything.prsv");
   });
 
   it("should return Kyogre for the 10th of June", () => {
@@ -55,7 +55,12 @@ describe("Egg Generation Tests", () => {
     let gachaSpeciesCount = 0;
 
     for (let i = 0; i < EGG_HATCH_COUNT; i++) {
-      const result = new Egg({ scene, timestamp, sourceType: EggSourceType.GACHA_LEGENDARY, tier: EggTier.LEGENDARY }).generatePlayerPokemon().species.speciesId;
+      const result = new Egg({
+        scene,
+        timestamp,
+        sourceType: EggSourceType.GACHA_LEGENDARY,
+        tier: EggTier.LEGENDARY,
+      }).generatePlayerPokemon().species.speciesId;
       if (result === expectedSpecies) {
         gachaSpeciesCount++;
       }
@@ -74,7 +79,10 @@ describe("Egg Generation Tests", () => {
     const scene = game.scene;
     const expectedSpecies = Species.ARCEUS;
 
-    const result = new Egg({ scene, species: expectedSpecies }).generatePlayerPokemon().species.speciesId;
+    const result = new Egg({
+      scene,
+      species: expectedSpecies,
+    }).generatePlayerPokemon().species.speciesId;
 
     expect(result).toBe(expectedSpecies);
   });
@@ -122,7 +130,11 @@ describe("Egg Generation Tests", () => {
     const scene = game.scene;
     const expectedResult = true;
 
-    const result = new Egg({ scene, tier: EggTier.COMMON, id: 204 }).isManaphyEgg();
+    const result = new Egg({
+      scene,
+      tier: EggTier.COMMON,
+      id: 204,
+    }).isManaphyEgg();
 
     expect(result).toBe(expectedResult);
   });
@@ -138,7 +150,13 @@ describe("Egg Generation Tests", () => {
     const scene = game.scene;
     const expectedResult = true;
 
-    const result = new Egg({ scene, isShiny: expectedResult, species: Species.BULBASAUR }).generatePlayerPokemon().isShiny();
+    const result = new Egg({
+      scene,
+      isShiny: expectedResult,
+      species: Species.BULBASAUR,
+    })
+      .generatePlayerPokemon()
+      .isShiny();
 
     expect(result).toBe(expectedResult);
   });
@@ -146,7 +164,12 @@ describe("Egg Generation Tests", () => {
     const scene = game.scene;
     const expectedVariantTier = VariantTier.STANDARD;
 
-    const result = new Egg({ scene, isShiny: true, variantTier: expectedVariantTier, species: Species.BULBASAUR }).generatePlayerPokemon().variant;
+    const result = new Egg({
+      scene,
+      isShiny: true,
+      variantTier: expectedVariantTier,
+      species: Species.BULBASAUR,
+    }).generatePlayerPokemon().variant;
 
     expect(result).toBe(expectedVariantTier);
   });
@@ -154,7 +177,12 @@ describe("Egg Generation Tests", () => {
     const scene = game.scene;
     const expectedVariantTier = VariantTier.RARE;
 
-    const result = new Egg({ scene, isShiny: true, variantTier: expectedVariantTier, species: Species.BULBASAUR }).generatePlayerPokemon().variant;
+    const result = new Egg({
+      scene,
+      isShiny: true,
+      variantTier: expectedVariantTier,
+      species: Species.BULBASAUR,
+    }).generatePlayerPokemon().variant;
 
     expect(result).toBe(expectedVariantTier);
   });
@@ -162,7 +190,12 @@ describe("Egg Generation Tests", () => {
     const scene = game.scene;
     const expectedVariantTier = VariantTier.EPIC;
 
-    const result = new Egg({ scene, isShiny: true, variantTier: expectedVariantTier, species: Species.BULBASAUR }).generatePlayerPokemon().variant;
+    const result = new Egg({
+      scene,
+      isShiny: true,
+      variantTier: expectedVariantTier,
+      species: Species.BULBASAUR,
+    }).generatePlayerPokemon().variant;
 
     expect(result).toBe(expectedVariantTier);
   });
@@ -185,7 +218,11 @@ describe("Egg Generation Tests", () => {
   it("should return a hatched pokemon with a hidden ability", () => {
     const scene = game.scene;
 
-    const playerPokemon = new Egg({ scene, overrideHiddenAbility: true, species: Species.BULBASAUR }).generatePlayerPokemon();
+    const playerPokemon = new Egg({
+      scene,
+      overrideHiddenAbility: true,
+      species: Species.BULBASAUR,
+    }).generatePlayerPokemon();
     const expectedAbilityIndex = playerPokemon.species.ability2 ? 2 : 1;
 
     const result = playerPokemon.abilityIndex;
@@ -206,7 +243,11 @@ describe("Egg Generation Tests", () => {
     const scene = game.scene;
     const expectedEggTier = EggTier.COMMON;
 
-    const result = new Egg({ scene, tier: EggTier.LEGENDARY, species: Species.BULBASAUR }).tier;
+    const result = new Egg({
+      scene,
+      tier: EggTier.LEGENDARY,
+      species: Species.BULBASAUR,
+    }).tier;
 
     expect(result).toBe(expectedEggTier);
   });
@@ -214,7 +255,11 @@ describe("Egg Generation Tests", () => {
     const scene = game.scene;
     const expectedHatchWaves = 10;
 
-    const result = new Egg({ scene, tier: EggTier.LEGENDARY, species: Species.BULBASAUR }).hatchWaves;
+    const result = new Egg({
+      scene,
+      tier: EggTier.LEGENDARY,
+      species: Species.BULBASAUR,
+    }).hatchWaves;
 
     expect(result).toBe(expectedHatchWaves);
   });
@@ -243,9 +288,14 @@ describe("Egg Generation Tests", () => {
   });
   it("should increase egg pity", () => {
     const scene = game.scene;
-    const startPityValues = [ ...scene.gameData.eggPity ];
+    const startPityValues = [...scene.gameData.eggPity];
 
-    new Egg({ scene, sourceType: EggSourceType.GACHA_MOVE, pulled: true, tier: EggTier.COMMON });
+    new Egg({
+      scene,
+      sourceType: EggSourceType.GACHA_MOVE,
+      pulled: true,
+      tier: EggTier.COMMON,
+    });
 
     expect(scene.gameData.eggPity[EggTier.RARE]).toBe(startPityValues[EggTier.RARE] + 1);
     expect(scene.gameData.eggPity[EggTier.EPIC]).toBe(startPityValues[EggTier.EPIC] + 1);
@@ -253,9 +303,14 @@ describe("Egg Generation Tests", () => {
   });
   it("should increase legendary egg pity by two", () => {
     const scene = game.scene;
-    const startPityValues = [ ...scene.gameData.eggPity ];
+    const startPityValues = [...scene.gameData.eggPity];
 
-    new Egg({ scene, sourceType: EggSourceType.GACHA_LEGENDARY, pulled: true, tier: EggTier.COMMON });
+    new Egg({
+      scene,
+      sourceType: EggSourceType.GACHA_LEGENDARY,
+      pulled: true,
+      tier: EggTier.COMMON,
+    });
 
     expect(scene.gameData.eggPity[EggTier.RARE]).toBe(startPityValues[EggTier.RARE] + 1);
     expect(scene.gameData.eggPity[EggTier.EPIC]).toBe(startPityValues[EggTier.EPIC] + 1);
@@ -266,7 +321,12 @@ describe("Egg Generation Tests", () => {
     const startingManaphyEggCount = scene.gameData.gameStats.manaphyEggsPulled;
 
     for (let i = 0; i < 200; i++) {
-      new Egg({ scene, sourceType: EggSourceType.GACHA_MOVE, pulled: true, species: Species.BULBASAUR });
+      new Egg({
+        scene,
+        sourceType: EggSourceType.GACHA_MOVE,
+        pulled: true,
+        species: Species.BULBASAUR,
+      });
     }
 
     expect(scene.gameData.gameStats.manaphyEggsPulled).toBe(startingManaphyEggCount);
@@ -275,7 +335,13 @@ describe("Egg Generation Tests", () => {
     const scene = game.scene;
     const startingManaphyEggCount = scene.gameData.gameStats.manaphyEggsPulled;
 
-    new Egg({ scene, sourceType: EggSourceType.GACHA_MOVE, pulled: true, id: 204, tier: EggTier.COMMON });
+    new Egg({
+      scene,
+      sourceType: EggSourceType.GACHA_MOVE,
+      pulled: true,
+      id: 204,
+      tier: EggTier.COMMON,
+    });
 
     expect(scene.gameData.gameStats.manaphyEggsPulled).toBe(startingManaphyEggCount + 1);
   });
@@ -283,7 +349,12 @@ describe("Egg Generation Tests", () => {
     const scene = game.scene;
     const startingRareEggsPulled = scene.gameData.gameStats.rareEggsPulled;
 
-    new Egg({ scene, sourceType: EggSourceType.GACHA_MOVE, pulled: true, tier: EggTier.RARE });
+    new Egg({
+      scene,
+      sourceType: EggSourceType.GACHA_MOVE,
+      pulled: true,
+      tier: EggTier.RARE,
+    });
 
     expect(scene.gameData.gameStats.rareEggsPulled).toBe(startingRareEggsPulled + 1);
   });
@@ -291,7 +362,12 @@ describe("Egg Generation Tests", () => {
     const scene = game.scene;
     const startingEpicEggsPulled = scene.gameData.gameStats.epicEggsPulled;
 
-    new Egg({ scene, sourceType: EggSourceType.GACHA_MOVE, pulled: true, tier: EggTier.EPIC });
+    new Egg({
+      scene,
+      sourceType: EggSourceType.GACHA_MOVE,
+      pulled: true,
+      tier: EggTier.EPIC,
+    });
 
     expect(scene.gameData.gameStats.epicEggsPulled).toBe(startingEpicEggsPulled + 1);
   });
@@ -299,7 +375,12 @@ describe("Egg Generation Tests", () => {
     const scene = game.scene;
     const startingLegendaryEggsPulled = scene.gameData.gameStats.legendaryEggsPulled;
 
-    new Egg({ scene, sourceType: EggSourceType.GACHA_MOVE, pulled: true, tier: EggTier.LEGENDARY });
+    new Egg({
+      scene,
+      sourceType: EggSourceType.GACHA_MOVE,
+      pulled: true,
+      tier: EggTier.LEGENDARY,
+    });
 
     expect(scene.gameData.gameStats.legendaryEggsPulled).toBe(startingLegendaryEggsPulled + 1);
   });
@@ -310,8 +391,16 @@ describe("Egg Generation Tests", () => {
     const expectedTier1 = EggTier.LEGENDARY;
     const expectedTier2 = EggTier.EPIC;
 
-    const result1 = new Egg({ scene, sourceType: EggSourceType.GACHA_LEGENDARY, pulled: true }).tier;
-    const result2 = new Egg({ scene, sourceType: EggSourceType.GACHA_MOVE, pulled: true }).tier;
+    const result1 = new Egg({
+      scene,
+      sourceType: EggSourceType.GACHA_LEGENDARY,
+      pulled: true,
+    }).tier;
+    const result2 = new Egg({
+      scene,
+      sourceType: EggSourceType.GACHA_MOVE,
+      pulled: true,
+    }).tier;
 
     expect(result1).toBe(expectedTier1);
     expect(result2).toBe(expectedTier2);
@@ -319,7 +408,12 @@ describe("Egg Generation Tests", () => {
 
   it("should generate an epic shiny from pokemon with a different form", () => {
     const scene = game.scene;
-    const egg = new Egg({ scene, isShiny: true, variantTier: VariantTier.EPIC, species: Species.MIRAIDON });
+    const egg = new Egg({
+      scene,
+      isShiny: true,
+      variantTier: VariantTier.EPIC,
+      species: Species.MIRAIDON,
+    });
 
     expect(egg.variantTier).toBe(VariantTier.EPIC);
   });
@@ -329,7 +423,11 @@ describe("Egg Generation Tests", () => {
     scene.setSeed("ABCDEFGHIJKLMNOPQRSTUVWXYZ");
     scene.resetSeed();
 
-    const firstEgg = new Egg({ scene, sourceType: EggSourceType.GACHA_SHINY, tier: EggTier.COMMON });
+    const firstEgg = new Egg({
+      scene,
+      sourceType: EggSourceType.GACHA_SHINY,
+      tier: EggTier.COMMON,
+    });
     const firstHatch = firstEgg.generatePlayerPokemon();
     let diffEggMove = false;
     let diffSpecies = false;
@@ -340,12 +438,16 @@ describe("Egg Generation Tests", () => {
       scene.setSeed("ABCDEFGHIJKLMNOPQRSTUVWXYZ");
       scene.resetSeed(); // Make sure that eggs are unpredictable even if using same seed
 
-      const newEgg = new Egg({ scene, sourceType: EggSourceType.GACHA_SHINY, tier: EggTier.COMMON });
+      const newEgg = new Egg({
+        scene,
+        sourceType: EggSourceType.GACHA_SHINY,
+        tier: EggTier.COMMON,
+      });
       const newHatch = newEgg.generatePlayerPokemon();
-      diffEggMove = diffEggMove || (newEgg.eggMoveIndex !== firstEgg.eggMoveIndex);
-      diffSpecies = diffSpecies || (newHatch.species.speciesId !== firstHatch.species.speciesId);
-      diffShiny = diffShiny || (newHatch.shiny !== firstHatch.shiny);
-      diffAbility = diffAbility || (newHatch.abilityIndex !== firstHatch.abilityIndex);
+      diffEggMove = diffEggMove || newEgg.eggMoveIndex !== firstEgg.eggMoveIndex;
+      diffSpecies = diffSpecies || newHatch.species.speciesId !== firstHatch.species.speciesId;
+      diffShiny = diffShiny || newHatch.shiny !== firstHatch.shiny;
+      diffAbility = diffAbility || newHatch.abilityIndex !== firstHatch.abilityIndex;
     }
 
     expect(diffEggMove).toBe(true);
@@ -371,10 +473,10 @@ describe("Egg Generation Tests", () => {
 
       const newEgg = new Egg({ scene, species: Species.BULBASAUR });
       const newHatch = newEgg.generatePlayerPokemon();
-      diffEggMove = diffEggMove || (newEgg.eggMoveIndex !== firstEgg.eggMoveIndex);
-      diffSpecies = diffSpecies || (newHatch.species.speciesId !== firstHatch.species.speciesId);
-      diffShiny = diffShiny || (newHatch.shiny !== firstHatch.shiny);
-      diffAbility = diffAbility || (newHatch.abilityIndex !== firstHatch.abilityIndex);
+      diffEggMove = diffEggMove || newEgg.eggMoveIndex !== firstEgg.eggMoveIndex;
+      diffSpecies = diffSpecies || newHatch.species.speciesId !== firstHatch.species.speciesId;
+      diffShiny = diffShiny || newHatch.shiny !== firstHatch.shiny;
+      diffAbility = diffAbility || newHatch.abilityIndex !== firstHatch.abilityIndex;
     }
 
     expect(diffEggMove).toBe(true);
diff --git a/src/test/eggs/manaphy-egg.test.ts b/test/eggs/manaphy-egg.test.ts
similarity index 78%
rename from src/test/eggs/manaphy-egg.test.ts
rename to test/eggs/manaphy-egg.test.ts
index 5bb5b790201..1e7f67a7bb5 100644
--- a/src/test/eggs/manaphy-egg.test.ts
+++ b/test/eggs/manaphy-egg.test.ts
@@ -2,7 +2,7 @@ import { Egg } from "#app/data/egg";
 import { EggSourceType } from "#app/enums/egg-source-types";
 import { EggTier } from "#app/enums/egg-type";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
@@ -10,7 +10,7 @@ describe("Manaphy Eggs", () => {
   let phaserGame: Phaser.Game;
   let game: GameManager;
   const EGG_HATCH_COUNT: number = 48;
-  let rngSweepProgress: number = 0;
+  let rngSweepProgress = 0;
 
   beforeAll(() => {
     phaserGame = new Phaser.Game({
@@ -25,7 +25,7 @@ describe("Manaphy Eggs", () => {
   });
 
   beforeEach(async () => {
-    await game.importData("src/test/utils/saves/everything.prsv");
+    await game.importData("./test/testUtils/saves/everything.prsv");
 
     /**
      * In our tests, we will perform an "RNG sweep" by letting rngSweepProgress
@@ -47,7 +47,12 @@ describe("Manaphy Eggs", () => {
     for (let i = 0; i < EGG_HATCH_COUNT; i++) {
       rngSweepProgress = (2 * i + 1) / (2 * EGG_HATCH_COUNT);
 
-      const newEgg = new Egg({ scene, tier: EggTier.COMMON, sourceType: EggSourceType.GACHA_SHINY, id: 204 });
+      const newEgg = new Egg({
+        scene,
+        tier: EggTier.COMMON,
+        sourceType: EggSourceType.GACHA_SHINY,
+        id: 204,
+      });
       const newHatch = newEgg.generatePlayerPokemon();
       if (newHatch.species.speciesId === Species.MANAPHY) {
         manaphyCount++;
@@ -60,8 +65,8 @@ describe("Manaphy Eggs", () => {
     }
 
     expect(manaphyCount + phioneCount).toBe(EGG_HATCH_COUNT);
-    expect(manaphyCount).toBe(1 / 8 * EGG_HATCH_COUNT);
-    expect(rareEggMoveCount).toBe(1 / 12 * EGG_HATCH_COUNT);
+    expect(manaphyCount).toBe((1 / 8) * EGG_HATCH_COUNT);
+    expect(rareEggMoveCount).toBe((1 / 12) * EGG_HATCH_COUNT);
   });
 
   it("should have correct Manaphy rates and Rare Egg Move rates, from Phione species eggs", () => {
@@ -73,7 +78,11 @@ describe("Manaphy Eggs", () => {
     for (let i = 0; i < EGG_HATCH_COUNT; i++) {
       rngSweepProgress = (2 * i + 1) / (2 * EGG_HATCH_COUNT);
 
-      const newEgg = new Egg({ scene, species: Species.PHIONE, sourceType: EggSourceType.SAME_SPECIES_EGG });
+      const newEgg = new Egg({
+        scene,
+        species: Species.PHIONE,
+        sourceType: EggSourceType.SAME_SPECIES_EGG,
+      });
       const newHatch = newEgg.generatePlayerPokemon();
       if (newHatch.species.speciesId === Species.MANAPHY) {
         manaphyCount++;
@@ -86,8 +95,8 @@ describe("Manaphy Eggs", () => {
     }
 
     expect(manaphyCount + phioneCount).toBe(EGG_HATCH_COUNT);
-    expect(manaphyCount).toBe(1 / 8 * EGG_HATCH_COUNT);
-    expect(rareEggMoveCount).toBe(1 / 6 * EGG_HATCH_COUNT);
+    expect(manaphyCount).toBe((1 / 8) * EGG_HATCH_COUNT);
+    expect(rareEggMoveCount).toBe((1 / 6) * EGG_HATCH_COUNT);
   });
 
   it("should have correct Manaphy rates and Rare Egg Move rates, from Manaphy species eggs", () => {
@@ -99,7 +108,11 @@ describe("Manaphy Eggs", () => {
     for (let i = 0; i < EGG_HATCH_COUNT; i++) {
       rngSweepProgress = (2 * i + 1) / (2 * EGG_HATCH_COUNT);
 
-      const newEgg = new Egg({ scene, species: Species.MANAPHY, sourceType: EggSourceType.SAME_SPECIES_EGG });
+      const newEgg = new Egg({
+        scene,
+        species: Species.MANAPHY,
+        sourceType: EggSourceType.SAME_SPECIES_EGG,
+      });
       const newHatch = newEgg.generatePlayerPokemon();
       if (newHatch.species.speciesId === Species.MANAPHY) {
         manaphyCount++;
@@ -113,6 +126,6 @@ describe("Manaphy Eggs", () => {
 
     expect(phioneCount).toBe(0);
     expect(manaphyCount).toBe(EGG_HATCH_COUNT);
-    expect(rareEggMoveCount).toBe(1 / 6 * EGG_HATCH_COUNT);
+    expect(rareEggMoveCount).toBe((1 / 6) * EGG_HATCH_COUNT);
   });
 });
diff --git a/src/test/endless_boss.test.ts b/test/endless_boss.test.ts
similarity index 84%
rename from src/test/endless_boss.test.ts
rename to test/endless_boss.test.ts
index c9f3afc3936..4be1e379215 100644
--- a/src/test/endless_boss.test.ts
+++ b/test/endless_boss.test.ts
@@ -2,11 +2,11 @@ import { Biome } from "#app/enums/biome";
 import { Species } from "#app/enums/species";
 import { GameModes } from "#app/game-mode";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
-import GameManager from "./utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 
 const EndlessBossWave = {
   Minor: 250,
-  Major: 1000
+  Major: 1000,
 };
 
 describe("Endless Boss", () => {
@@ -21,9 +21,7 @@ describe("Endless Boss", () => {
 
   beforeEach(() => {
     game = new GameManager(phaserGame);
-    game.override
-      .startingBiome(Biome.END)
-      .disableCrits();
+    game.override.startingBiome(Biome.END).disableCrits();
   });
 
   afterEach(() => {
@@ -32,7 +30,7 @@ describe("Endless Boss", () => {
 
   it(`should spawn a minor boss every ${EndlessBossWave.Minor} waves in END biome in Endless`, async () => {
     game.override.startingWave(EndlessBossWave.Minor);
-    await game.runToFinalBossEncounter([ Species.BIDOOF ], GameModes.ENDLESS);
+    await game.runToFinalBossEncounter([Species.BIDOOF], GameModes.ENDLESS);
 
     expect(game.scene.currentBattle.waveIndex).toBe(EndlessBossWave.Minor);
     expect(game.scene.arena.biomeType).toBe(Biome.END);
@@ -44,7 +42,7 @@ describe("Endless Boss", () => {
 
   it(`should spawn a major boss every ${EndlessBossWave.Major} waves in END biome in Endless`, async () => {
     game.override.startingWave(EndlessBossWave.Major);
-    await game.runToFinalBossEncounter([ Species.BIDOOF ], GameModes.ENDLESS);
+    await game.runToFinalBossEncounter([Species.BIDOOF], GameModes.ENDLESS);
 
     expect(game.scene.currentBattle.waveIndex).toBe(EndlessBossWave.Major);
     expect(game.scene.arena.biomeType).toBe(Biome.END);
@@ -56,7 +54,7 @@ describe("Endless Boss", () => {
 
   it(`should spawn a minor boss every ${EndlessBossWave.Minor} waves in END biome in Spliced Endless`, async () => {
     game.override.startingWave(EndlessBossWave.Minor);
-    await game.runToFinalBossEncounter([ Species.BIDOOF ], GameModes.SPLICED_ENDLESS);
+    await game.runToFinalBossEncounter([Species.BIDOOF], GameModes.SPLICED_ENDLESS);
 
     expect(game.scene.currentBattle.waveIndex).toBe(EndlessBossWave.Minor);
     expect(game.scene.arena.biomeType).toBe(Biome.END);
@@ -68,7 +66,7 @@ describe("Endless Boss", () => {
 
   it(`should spawn a major boss every ${EndlessBossWave.Major} waves in END biome in Spliced Endless`, async () => {
     game.override.startingWave(EndlessBossWave.Major);
-    await game.runToFinalBossEncounter([ Species.BIDOOF ], GameModes.SPLICED_ENDLESS);
+    await game.runToFinalBossEncounter([Species.BIDOOF], GameModes.SPLICED_ENDLESS);
 
     expect(game.scene.currentBattle.waveIndex).toBe(EndlessBossWave.Major);
     expect(game.scene.arena.biomeType).toBe(Biome.END);
@@ -80,7 +78,7 @@ describe("Endless Boss", () => {
 
   it(`should NOT spawn major or minor boss outside wave ${EndlessBossWave.Minor}s in END biome`, async () => {
     game.override.startingWave(EndlessBossWave.Minor - 1);
-    await game.runToFinalBossEncounter([ Species.BIDOOF ], GameModes.ENDLESS);
+    await game.runToFinalBossEncounter([Species.BIDOOF], GameModes.ENDLESS);
 
     expect(game.scene.currentBattle.waveIndex).not.toBe(EndlessBossWave.Minor);
     expect(game.scene.getEnemyPokemon()!.species.speciesId).not.toBe(Species.ETERNATUS);
diff --git a/test/enemy_command.test.ts b/test/enemy_command.test.ts
new file mode 100644
index 00000000000..ae1f2918798
--- /dev/null
+++ b/test/enemy_command.test.ts
@@ -0,0 +1,102 @@
+import type BattleScene from "#app/battle-scene";
+import { allMoves } from "#app/data/moves/move";
+import { MoveCategory } from "#enums/MoveCategory";
+import { Abilities } from "#app/enums/abilities";
+import { Moves } from "#app/enums/moves";
+import { Species } from "#app/enums/species";
+import type { EnemyPokemon } from "#app/field/pokemon";
+import { AiType } from "#app/field/pokemon";
+import { randSeedInt } from "#app/utils/common";
+import GameManager from "#test/testUtils/gameManager";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
+
+let globalScene: BattleScene;
+const NUM_TRIALS = 300;
+
+type MoveChoiceSet = { [key: number]: number };
+
+function getEnemyMoveChoices(pokemon: EnemyPokemon, moveChoices: MoveChoiceSet): void {
+  // Use an unseeded random number generator in place of the mocked-out randBattleSeedInt
+  vi.spyOn(globalScene, "randBattleSeedInt").mockImplementation((range, min?) => {
+    return randSeedInt(range, min);
+  });
+  for (let i = 0; i < NUM_TRIALS; i++) {
+    const queuedMove = pokemon.getNextMove();
+    moveChoices[queuedMove.move]++;
+  }
+
+  for (const [moveId, count] of Object.entries(moveChoices)) {
+    console.log(`Move: ${allMoves[moveId].name}   Count: ${count} (${(count / NUM_TRIALS) * 100}%)`);
+  }
+}
+
+describe("Enemy Commands - Move Selection", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+    globalScene = game.scene;
+
+    game.override.ability(Abilities.BALL_FETCH).enemyAbility(Abilities.BALL_FETCH);
+  });
+
+  it("should never use Status moves if an attack can KO", async () => {
+    game.override
+      .enemySpecies(Species.ETERNATUS)
+      .enemyMoveset([Moves.ETERNABEAM, Moves.SLUDGE_BOMB, Moves.DRAGON_DANCE, Moves.COSMIC_POWER])
+      .startingLevel(1)
+      .enemyLevel(100);
+
+    await game.classicMode.startBattle([Species.MAGIKARP]);
+
+    const enemyPokemon = game.scene.getEnemyPokemon()!;
+    enemyPokemon.aiType = AiType.SMART_RANDOM;
+
+    const moveChoices: MoveChoiceSet = {};
+    const enemyMoveset = enemyPokemon.getMoveset();
+    enemyMoveset.forEach(mv => (moveChoices[mv!.moveId] = 0));
+    getEnemyMoveChoices(enemyPokemon, moveChoices);
+
+    enemyMoveset.forEach(mv => {
+      if (mv?.getMove().category === MoveCategory.STATUS) {
+        expect(moveChoices[mv.moveId]).toBe(0);
+      }
+    });
+  });
+
+  it("should not select Last Resort if it would fail, even if the move KOs otherwise", async () => {
+    game.override
+      .enemySpecies(Species.KANGASKHAN)
+      .enemyMoveset([Moves.LAST_RESORT, Moves.GIGA_IMPACT, Moves.SPLASH, Moves.SWORDS_DANCE])
+      .startingLevel(1)
+      .enemyLevel(100);
+
+    await game.classicMode.startBattle([Species.MAGIKARP]);
+
+    const enemyPokemon = game.scene.getEnemyPokemon()!;
+    enemyPokemon.aiType = AiType.SMART_RANDOM;
+
+    const moveChoices: MoveChoiceSet = {};
+    const enemyMoveset = enemyPokemon.getMoveset();
+    enemyMoveset.forEach(mv => (moveChoices[mv!.moveId] = 0));
+    getEnemyMoveChoices(enemyPokemon, moveChoices);
+
+    enemyMoveset.forEach(mv => {
+      if (mv?.getMove().category === MoveCategory.STATUS || mv?.moveId === Moves.LAST_RESORT) {
+        expect(moveChoices[mv.moveId]).toBe(0);
+      }
+    });
+  });
+});
diff --git a/src/test/escape-calculations.test.ts b/test/escape-calculations.test.ts
similarity index 84%
rename from src/test/escape-calculations.test.ts
rename to test/escape-calculations.test.ts
index 419a6b4c19a..56333432cee 100644
--- a/src/test/escape-calculations.test.ts
+++ b/test/escape-calculations.test.ts
@@ -1,10 +1,10 @@
 import { AttemptRunPhase } from "#app/phases/attempt-run-phase";
 import type { CommandPhase } from "#app/phases/command-phase";
 import { Command } from "#app/ui/command-ui-handler";
-import * as Utils from "#app/utils";
+import { NumberHolder } from "#app/utils/common";
 import { Abilities } from "#enums/abilities";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
@@ -25,30 +25,34 @@ describe("Escape chance calculations", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     game.override
-      .battleType("single")
+      .battleStyle("single")
       .enemySpecies(Species.BULBASAUR)
       .enemyAbility(Abilities.INSOMNIA)
       .ability(Abilities.INSOMNIA);
   });
 
   it("single non-boss opponent", async () => {
-    await game.classicMode.startBattle([ Species.BULBASAUR ]);
+    await game.classicMode.startBattle([Species.BULBASAUR]);
 
     const playerPokemon = game.scene.getPlayerField();
     const enemyField = game.scene.getEnemyField();
     const enemySpeed = 100;
     // set enemyPokemon's speed to 100
-    vi.spyOn(enemyField[0], "stats", "get").mockReturnValue([ 20, 20, 20, 20, 20, enemySpeed ]);
+    vi.spyOn(enemyField[0], "stats", "get").mockReturnValue([20, 20, 20, 20, 20, enemySpeed]);
 
     const commandPhase = game.scene.getCurrentPhase() as CommandPhase;
     commandPhase.handleCommand(Command.RUN, 0);
 
     await game.phaseInterceptor.to(AttemptRunPhase, false);
     const phase = game.scene.getCurrentPhase() as AttemptRunPhase;
-    const escapePercentage = new Utils.NumberHolder(0);
+    const escapePercentage = new NumberHolder(0);
 
     // this sets up an object for multiple attempts. The pokemonSpeedRatio is your speed divided by the enemy speed, the escapeAttempts are the number of escape attempts and the expectedEscapeChance is the chance it should be escaping
-    const escapeChances: { pokemonSpeedRatio: number, escapeAttempts: number, expectedEscapeChance: number }[] = [
+    const escapeChances: {
+      pokemonSpeedRatio: number;
+      escapeAttempts: number;
+      expectedEscapeChance: number;
+    }[] = [
       { pokemonSpeedRatio: 0.01, escapeAttempts: 0, expectedEscapeChance: 5 },
       { pokemonSpeedRatio: 0.1, escapeAttempts: 0, expectedEscapeChance: 7 },
       { pokemonSpeedRatio: 0.25, escapeAttempts: 0, expectedEscapeChance: 11 },
@@ -79,15 +83,22 @@ describe("Escape chance calculations", () => {
       // sets the number of escape attempts to the required amount
       game.scene.currentBattle.escapeAttempts = escapeChances[i].escapeAttempts;
       // set playerPokemon's speed to a multiple of the enemySpeed
-      vi.spyOn(playerPokemon[0], "stats", "get").mockReturnValue([ 20, 20, 20, 20, 20, escapeChances[i].pokemonSpeedRatio * enemySpeed ]);
+      vi.spyOn(playerPokemon[0], "stats", "get").mockReturnValue([
+        20,
+        20,
+        20,
+        20,
+        20,
+        escapeChances[i].pokemonSpeedRatio * enemySpeed,
+      ]);
       phase.attemptRunAway(playerPokemon, enemyField, escapePercentage);
       expect(escapePercentage.value).toBe(escapeChances[i].expectedEscapeChance);
     }
   }, 20000);
 
   it("double non-boss opponent", async () => {
-    game.override.battleType("double");
-    await game.classicMode.startBattle([ Species.BULBASAUR, Species.ABOMASNOW ]);
+    game.override.battleStyle("double");
+    await game.classicMode.startBattle([Species.BULBASAUR, Species.ABOMASNOW]);
 
     const playerPokemon = game.scene.getPlayerField();
     const enemyField = game.scene.getEnemyField();
@@ -98,19 +109,23 @@ describe("Escape chance calculations", () => {
     // this is used to find the ratio of the player's first pokemon
     const playerASpeedPercentage = 0.4;
     // set enemyAPokemon's speed to 70
-    vi.spyOn(enemyField[0], "stats", "get").mockReturnValue([ 20, 20, 20, 20, 20, enemyASpeed ]);
+    vi.spyOn(enemyField[0], "stats", "get").mockReturnValue([20, 20, 20, 20, 20, enemyASpeed]);
     // set enemyBPokemon's speed to 30
-    vi.spyOn(enemyField[1], "stats", "get").mockReturnValue([ 20, 20, 20, 20, 20, enemyBSpeed ]);
+    vi.spyOn(enemyField[1], "stats", "get").mockReturnValue([20, 20, 20, 20, 20, enemyBSpeed]);
 
     const commandPhase = game.scene.getCurrentPhase() as CommandPhase;
     commandPhase.handleCommand(Command.RUN, 0);
 
     await game.phaseInterceptor.to(AttemptRunPhase, false);
     const phase = game.scene.getCurrentPhase() as AttemptRunPhase;
-    const escapePercentage = new Utils.NumberHolder(0);
+    const escapePercentage = new NumberHolder(0);
 
     // this sets up an object for multiple attempts. The pokemonSpeedRatio is your speed divided by the enemy speed, the escapeAttempts are the number of escape attempts and the expectedEscapeChance is the chance it should be escaping
-    const escapeChances: { pokemonSpeedRatio: number, escapeAttempts: number, expectedEscapeChance: number }[] = [
+    const escapeChances: {
+      pokemonSpeedRatio: number;
+      escapeAttempts: number;
+      expectedEscapeChance: number;
+    }[] = [
       { pokemonSpeedRatio: 0.3, escapeAttempts: 0, expectedEscapeChance: 12 },
       { pokemonSpeedRatio: 0.7, escapeAttempts: 0, expectedEscapeChance: 21 },
       { pokemonSpeedRatio: 1.5, escapeAttempts: 0, expectedEscapeChance: 39 },
@@ -134,43 +149,62 @@ describe("Escape chance calculations", () => {
       { pokemonSpeedRatio: 2.4, escapeAttempts: 9, expectedEscapeChance: 95 },
       { pokemonSpeedRatio: 1.8, escapeAttempts: 7, expectedEscapeChance: 95 },
       { pokemonSpeedRatio: 2, escapeAttempts: 10, expectedEscapeChance: 95 },
-
     ];
 
     for (let i = 0; i < escapeChances.length; i++) {
       // sets the number of escape attempts to the required amount
       game.scene.currentBattle.escapeAttempts = escapeChances[i].escapeAttempts;
       // set the first playerPokemon's speed to a multiple of the enemySpeed
-      vi.spyOn(playerPokemon[0], "stats", "get").mockReturnValue([ 20, 20, 20, 20, 20, Math.floor(escapeChances[i].pokemonSpeedRatio * totalEnemySpeed * playerASpeedPercentage) ]);
+      vi.spyOn(playerPokemon[0], "stats", "get").mockReturnValue([
+        20,
+        20,
+        20,
+        20,
+        20,
+        Math.floor(escapeChances[i].pokemonSpeedRatio * totalEnemySpeed * playerASpeedPercentage),
+      ]);
       // set the second playerPokemon's speed to the remaining value of speed
-      vi.spyOn(playerPokemon[1], "stats", "get").mockReturnValue([ 20, 20, 20, 20, 20, escapeChances[i].pokemonSpeedRatio * totalEnemySpeed - playerPokemon[0].stats[5] ]);
+      vi.spyOn(playerPokemon[1], "stats", "get").mockReturnValue([
+        20,
+        20,
+        20,
+        20,
+        20,
+        escapeChances[i].pokemonSpeedRatio * totalEnemySpeed - playerPokemon[0].stats[5],
+      ]);
       phase.attemptRunAway(playerPokemon, enemyField, escapePercentage);
       // checks to make sure the escape values are the same
       expect(escapePercentage.value).toBe(escapeChances[i].expectedEscapeChance);
       // checks to make sure the sum of the player's speed for all pokemon is equal to the appropriate ratio of the total enemy speed
-      expect(playerPokemon[0].stats[5] + playerPokemon[1].stats[5]).toBe(escapeChances[i].pokemonSpeedRatio * totalEnemySpeed);
+      expect(playerPokemon[0].stats[5] + playerPokemon[1].stats[5]).toBe(
+        escapeChances[i].pokemonSpeedRatio * totalEnemySpeed,
+      );
     }
   }, 20000);
 
   it("single boss opponent", async () => {
     game.override.startingWave(10);
-    await game.classicMode.startBattle([ Species.BULBASAUR ]);
+    await game.classicMode.startBattle([Species.BULBASAUR]);
 
     const playerPokemon = game.scene.getPlayerField()!;
     const enemyField = game.scene.getEnemyField()!;
     const enemySpeed = 100;
     // set enemyPokemon's speed to 100
-    vi.spyOn(enemyField[0], "stats", "get").mockReturnValue([ 20, 20, 20, 20, 20, enemySpeed ]);
+    vi.spyOn(enemyField[0], "stats", "get").mockReturnValue([20, 20, 20, 20, 20, enemySpeed]);
 
     const commandPhase = game.scene.getCurrentPhase() as CommandPhase;
     commandPhase.handleCommand(Command.RUN, 0);
 
     await game.phaseInterceptor.to(AttemptRunPhase, false);
     const phase = game.scene.getCurrentPhase() as AttemptRunPhase;
-    const escapePercentage = new Utils.NumberHolder(0);
+    const escapePercentage = new NumberHolder(0);
 
     // this sets up an object for multiple attempts. The pokemonSpeedRatio is your speed divided by the enemy speed, the escapeAttempts are the number of escape attempts and the expectedEscapeChance is the chance it should be escaping
-    const escapeChances: { pokemonSpeedRatio: number, escapeAttempts: number, expectedEscapeChance: number }[] = [
+    const escapeChances: {
+      pokemonSpeedRatio: number;
+      escapeAttempts: number;
+      expectedEscapeChance: number;
+    }[] = [
       { pokemonSpeedRatio: 0.01, escapeAttempts: 0, expectedEscapeChance: 5 },
       { pokemonSpeedRatio: 0.1, escapeAttempts: 0, expectedEscapeChance: 5 },
       { pokemonSpeedRatio: 0.25, escapeAttempts: 0, expectedEscapeChance: 6 },
@@ -208,23 +242,29 @@ describe("Escape chance calculations", () => {
       { pokemonSpeedRatio: 6, escapeAttempts: 0, expectedEscapeChance: 25 },
       { pokemonSpeedRatio: 5.9, escapeAttempts: 2, expectedEscapeChance: 25 },
       { pokemonSpeedRatio: 6.1, escapeAttempts: 3, expectedEscapeChance: 25 },
-
     ];
 
     for (let i = 0; i < escapeChances.length; i++) {
       // sets the number of escape attempts to the required amount
       game.scene.currentBattle.escapeAttempts = escapeChances[i].escapeAttempts;
       // set playerPokemon's speed to a multiple of the enemySpeed
-      vi.spyOn(playerPokemon[0], "stats", "get").mockReturnValue([ 20, 20, 20, 20, 20, escapeChances[i].pokemonSpeedRatio * enemySpeed ]);
+      vi.spyOn(playerPokemon[0], "stats", "get").mockReturnValue([
+        20,
+        20,
+        20,
+        20,
+        20,
+        escapeChances[i].pokemonSpeedRatio * enemySpeed,
+      ]);
       phase.attemptRunAway(playerPokemon, enemyField, escapePercentage);
       expect(escapePercentage.value).toBe(escapeChances[i].expectedEscapeChance);
     }
   }, 20000);
 
   it("double boss opponent", async () => {
-    game.override.battleType("double");
+    game.override.battleStyle("double");
     game.override.startingWave(10);
-    await game.classicMode.startBattle([ Species.BULBASAUR, Species.ABOMASNOW ]);
+    await game.classicMode.startBattle([Species.BULBASAUR, Species.ABOMASNOW]);
 
     const playerPokemon = game.scene.getPlayerField();
     const enemyField = game.scene.getEnemyField();
@@ -235,19 +275,23 @@ describe("Escape chance calculations", () => {
     // this is used to find the ratio of the player's first pokemon
     const playerASpeedPercentage = 0.8;
     // set enemyAPokemon's speed to 70
-    vi.spyOn(enemyField[0], "stats", "get").mockReturnValue([ 20, 20, 20, 20, 20, enemyASpeed ]);
+    vi.spyOn(enemyField[0], "stats", "get").mockReturnValue([20, 20, 20, 20, 20, enemyASpeed]);
     // set enemyBPokemon's speed to 30
-    vi.spyOn(enemyField[1], "stats", "get").mockReturnValue([ 20, 20, 20, 20, 20, enemyBSpeed ]);
+    vi.spyOn(enemyField[1], "stats", "get").mockReturnValue([20, 20, 20, 20, 20, enemyBSpeed]);
 
     const commandPhase = game.scene.getCurrentPhase() as CommandPhase;
     commandPhase.handleCommand(Command.RUN, 0);
 
     await game.phaseInterceptor.to(AttemptRunPhase, false);
     const phase = game.scene.getCurrentPhase() as AttemptRunPhase;
-    const escapePercentage = new Utils.NumberHolder(0);
+    const escapePercentage = new NumberHolder(0);
 
     // this sets up an object for multiple attempts. The pokemonSpeedRatio is your speed divided by the enemy speed, the escapeAttempts are the number of escape attempts and the expectedEscapeChance is the chance it should be escaping
-    const escapeChances: { pokemonSpeedRatio: number, escapeAttempts: number, expectedEscapeChance: number }[] = [
+    const escapeChances: {
+      pokemonSpeedRatio: number;
+      escapeAttempts: number;
+      expectedEscapeChance: number;
+    }[] = [
       { pokemonSpeedRatio: 0.3, escapeAttempts: 0, expectedEscapeChance: 6 },
       { pokemonSpeedRatio: 0.7, escapeAttempts: 0, expectedEscapeChance: 7 },
       { pokemonSpeedRatio: 1.5, escapeAttempts: 0, expectedEscapeChance: 10 },
@@ -283,21 +327,36 @@ describe("Escape chance calculations", () => {
       { pokemonSpeedRatio: 6.5, escapeAttempts: 1, expectedEscapeChance: 25 },
       { pokemonSpeedRatio: 12, escapeAttempts: 4, expectedEscapeChance: 25 },
       { pokemonSpeedRatio: 5.2, escapeAttempts: 2, expectedEscapeChance: 25 },
-
     ];
 
     for (let i = 0; i < escapeChances.length; i++) {
       // sets the number of escape attempts to the required amount
       game.scene.currentBattle.escapeAttempts = escapeChances[i].escapeAttempts;
       // set the first playerPokemon's speed to a multiple of the enemySpeed
-      vi.spyOn(playerPokemon[0], "stats", "get").mockReturnValue([ 20, 20, 20, 20, 20, Math.floor(escapeChances[i].pokemonSpeedRatio * totalEnemySpeed * playerASpeedPercentage) ]);
+      vi.spyOn(playerPokemon[0], "stats", "get").mockReturnValue([
+        20,
+        20,
+        20,
+        20,
+        20,
+        Math.floor(escapeChances[i].pokemonSpeedRatio * totalEnemySpeed * playerASpeedPercentage),
+      ]);
       // set the second playerPokemon's speed to the remaining value of speed
-      vi.spyOn(playerPokemon[1], "stats", "get").mockReturnValue([ 20, 20, 20, 20, 20, escapeChances[i].pokemonSpeedRatio * totalEnemySpeed - playerPokemon[0].stats[5] ]);
+      vi.spyOn(playerPokemon[1], "stats", "get").mockReturnValue([
+        20,
+        20,
+        20,
+        20,
+        20,
+        escapeChances[i].pokemonSpeedRatio * totalEnemySpeed - playerPokemon[0].stats[5],
+      ]);
       phase.attemptRunAway(playerPokemon, enemyField, escapePercentage);
       // checks to make sure the escape values are the same
       expect(escapePercentage.value).toBe(escapeChances[i].expectedEscapeChance);
       // checks to make sure the sum of the player's speed for all pokemon is equal to the appropriate ratio of the total enemy speed
-      expect(playerPokemon[0].stats[5] + playerPokemon[1].stats[5]).toBe(escapeChances[i].pokemonSpeedRatio * totalEnemySpeed);
+      expect(playerPokemon[0].stats[5] + playerPokemon[1].stats[5]).toBe(
+        escapeChances[i].pokemonSpeedRatio * totalEnemySpeed,
+      );
     }
   }, 20000);
 });
diff --git a/src/test/evolution.test.ts b/test/evolution.test.ts
similarity index 79%
rename from src/test/evolution.test.ts
rename to test/evolution.test.ts
index d198049801c..4f91cd99382 100644
--- a/src/test/evolution.test.ts
+++ b/test/evolution.test.ts
@@ -1,9 +1,13 @@
-import { pokemonEvolutions, SpeciesFormEvolution, SpeciesWildEvolutionDelay } from "#app/data/balance/pokemon-evolutions";
+import {
+  pokemonEvolutions,
+  SpeciesFormEvolution,
+  SpeciesWildEvolutionDelay,
+} from "#app/data/balance/pokemon-evolutions";
 import { Abilities } from "#app/enums/abilities";
 import { Moves } from "#app/enums/moves";
 import { Species } from "#app/enums/species";
-import * as Utils from "#app/utils";
-import GameManager from "#test/utils/gameManager";
+import * as Utils from "#app/utils/common";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
@@ -24,7 +28,7 @@ describe("Evolution", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
 
-    game.override.battleType("single");
+    game.override.battleStyle("single");
 
     game.override.enemySpecies(Species.MAGIKARP);
     game.override.enemyAbility(Abilities.BALL_FETCH);
@@ -33,54 +37,54 @@ describe("Evolution", () => {
   });
 
   it("should keep hidden ability after evolving", async () => {
-    await game.classicMode.runToSummon([ Species.EEVEE, Species.TRAPINCH ]);
+    await game.classicMode.runToSummon([Species.EEVEE, Species.TRAPINCH]);
 
     const eevee = game.scene.getPlayerParty()[0];
     const trapinch = game.scene.getPlayerParty()[1];
     eevee.abilityIndex = 2;
     trapinch.abilityIndex = 2;
 
-    eevee.evolve(pokemonEvolutions[Species.EEVEE][6], eevee.getSpeciesForm());
+    await eevee.evolve(pokemonEvolutions[Species.EEVEE][6], eevee.getSpeciesForm());
     expect(eevee.abilityIndex).toBe(2);
 
-    trapinch.evolve(pokemonEvolutions[Species.TRAPINCH][0], trapinch.getSpeciesForm());
+    await trapinch.evolve(pokemonEvolutions[Species.TRAPINCH][0], trapinch.getSpeciesForm());
     expect(trapinch.abilityIndex).toBe(1);
   });
 
   it("should keep same ability slot after evolving", async () => {
-    await game.classicMode.runToSummon([ Species.BULBASAUR, Species.CHARMANDER ]);
+    await game.classicMode.runToSummon([Species.BULBASAUR, Species.CHARMANDER]);
 
     const bulbasaur = game.scene.getPlayerParty()[0];
     const charmander = game.scene.getPlayerParty()[1];
     bulbasaur.abilityIndex = 0;
     charmander.abilityIndex = 1;
 
-    bulbasaur.evolve(pokemonEvolutions[Species.BULBASAUR][0], bulbasaur.getSpeciesForm());
+    await bulbasaur.evolve(pokemonEvolutions[Species.BULBASAUR][0], bulbasaur.getSpeciesForm());
     expect(bulbasaur.abilityIndex).toBe(0);
 
-    charmander.evolve(pokemonEvolutions[Species.CHARMANDER][0], charmander.getSpeciesForm());
+    await charmander.evolve(pokemonEvolutions[Species.CHARMANDER][0], charmander.getSpeciesForm());
     expect(charmander.abilityIndex).toBe(1);
   });
 
   it("should handle illegal abilityIndex values", async () => {
-    await game.classicMode.runToSummon([ Species.SQUIRTLE ]);
+    await game.classicMode.runToSummon([Species.SQUIRTLE]);
 
     const squirtle = game.scene.getPlayerPokemon()!;
     squirtle.abilityIndex = 5;
 
-    squirtle.evolve(pokemonEvolutions[Species.SQUIRTLE][0], squirtle.getSpeciesForm());
+    await squirtle.evolve(pokemonEvolutions[Species.SQUIRTLE][0], squirtle.getSpeciesForm());
     expect(squirtle.abilityIndex).toBe(0);
   });
 
   it("should handle nincada's unique evolution", async () => {
-    await game.classicMode.runToSummon([ Species.NINCADA ]);
+    await game.classicMode.runToSummon([Species.NINCADA]);
 
     const nincada = game.scene.getPlayerPokemon()!;
     nincada.abilityIndex = 2;
     nincada.metBiome = -1;
     nincada.gender = 1;
 
-    nincada.evolve(pokemonEvolutions[Species.NINCADA][0], nincada.getSpeciesForm());
+    await nincada.evolve(pokemonEvolutions[Species.NINCADA][0], nincada.getSpeciesForm());
     const ninjask = game.scene.getPlayerParty()[0];
     const shedinja = game.scene.getPlayerParty()[1];
     expect(ninjask.abilityIndex).toBe(2);
@@ -98,14 +102,15 @@ describe("Evolution", () => {
   });
 
   it("should increase both HP and max HP when evolving", async () => {
-    game.override.moveset([ Moves.SURF ])
+    game.override
+      .moveset([Moves.SURF])
       .enemySpecies(Species.GOLEM)
       .enemyMoveset(Moves.SPLASH)
       .startingWave(21)
       .startingLevel(16)
       .enemyLevel(50);
 
-    await game.startBattle([ Species.TOTODILE ]);
+    await game.startBattle([Species.TOTODILE]);
 
     const totodile = game.scene.getPlayerPokemon()!;
     const hpBefore = totodile.hp;
@@ -125,14 +130,15 @@ describe("Evolution", () => {
   });
 
   it("should not fully heal HP when evolving", async () => {
-    game.override.moveset([ Moves.SURF ])
+    game.override
+      .moveset([Moves.SURF])
       .enemySpecies(Species.GOLEM)
       .enemyMoveset(Moves.SPLASH)
       .startingWave(21)
       .startingLevel(13)
       .enemyLevel(30);
 
-    await game.startBattle([ Species.CYNDAQUIL ]);
+    await game.startBattle([Species.CYNDAQUIL]);
 
     const cyndaquil = game.scene.getPlayerPokemon()!;
     cyndaquil.hp = Math.floor(cyndaquil.getMaxHp() / 2);
@@ -165,7 +171,7 @@ describe("Evolution", () => {
      * If the value is 0, it's a 3 family maushold, whereas if the value is
      * 1, 2 or 3, it's a 4 family maushold
      */
-    await game.startBattle([ Species.TANDEMAUS ]); // starts us off with a tandemaus
+    await game.startBattle([Species.TANDEMAUS]); // starts us off with a tandemaus
     const playerPokemon = game.scene.getPlayerPokemon()!;
     playerPokemon.level = 25; // tandemaus evolves at level 25
     vi.spyOn(Utils, "randSeedInt").mockReturnValue(0); // setting the random generator to be 0 to force a three family maushold
diff --git a/src/test/field/pokemon.test.ts b/test/field/pokemon.test.ts
similarity index 54%
rename from src/test/field/pokemon.test.ts
rename to test/field/pokemon.test.ts
index 0a1ddac9e90..f763ab2c401 100644
--- a/src/test/field/pokemon.test.ts
+++ b/test/field/pokemon.test.ts
@@ -1,10 +1,10 @@
 import { Species } from "#app/enums/species";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
-import GameManager from "../utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import { PokeballType } from "#enums/pokeball";
 import type BattleScene from "#app/battle-scene";
 import { Moves } from "#app/enums/moves";
-import { Type } from "#app/enums/type";
+import { PokemonType } from "#enums/pokemon-type";
 import { CustomPokemonData } from "#app/data/custom-pokemon-data";
 
 describe("Spec - Pokemon", () => {
@@ -26,7 +26,7 @@ describe("Spec - Pokemon", () => {
   });
 
   it("should not crash when trying to set status of undefined", async () => {
-    await game.classicMode.runToSummon([ Species.ABRA ]);
+    await game.classicMode.runToSummon([Species.ABRA]);
 
     const pkm = game.scene.getPlayerPokemon()!;
     expect(pkm).toBeDefined();
@@ -39,7 +39,7 @@ describe("Spec - Pokemon", () => {
 
     beforeEach(async () => {
       game.override.enemySpecies(Species.ZUBAT);
-      await game.classicMode.runToSummon([ Species.ABRA, Species.ABRA, Species.ABRA, Species.ABRA, Species.ABRA ]); // 5 Abra, only 1 slot left
+      await game.classicMode.runToSummon([Species.ABRA, Species.ABRA, Species.ABRA, Species.ABRA, Species.ABRA]); // 5 Abra, only 1 slot left
       scene = game.scene;
     });
 
@@ -49,7 +49,7 @@ describe("Spec - Pokemon", () => {
 
       const party = scene.getPlayerParty();
       expect(party).toHaveLength(6);
-      party.forEach((pkm, index) =>{
+      party.forEach((pkm, index) => {
         expect(pkm.species.speciesId).toBe(index === 5 ? Species.ZUBAT : Species.ABRA);
       });
     });
@@ -61,7 +61,7 @@ describe("Spec - Pokemon", () => {
 
       const party = scene.getPlayerParty();
       expect(party).toHaveLength(6);
-      party.forEach((pkm, index) =>{
+      party.forEach((pkm, index) => {
         expect(pkm.species.speciesId).toBe(index === slotIndex ? Species.ZUBAT : Species.ABRA);
       });
     });
@@ -70,7 +70,7 @@ describe("Spec - Pokemon", () => {
   it("should not share tms between different forms", async () => {
     game.override.starterForms({ [Species.ROTOM]: 4 });
 
-    await game.classicMode.startBattle([ Species.ROTOM ]);
+    await game.classicMode.startBattle([Species.ROTOM]);
 
     const fanRotom = game.scene.getPlayerPokemon()!;
 
@@ -94,39 +94,39 @@ describe("Spec - Pokemon", () => {
       const pokemon = scene.getPlayerParty()[0];
 
       let types = pokemon.getTypes();
-      expect(types[0]).toBe(Type.PSYCHIC);
-      expect(types[1]).toBe(Type.FIRE);
+      expect(types[0]).toBe(PokemonType.PSYCHIC);
+      expect(types[1]).toBe(PokemonType.FIRE);
 
-      pokemon.customPokemonData.types = [ Type.UNKNOWN, Type.NORMAL ];
+      pokemon.customPokemonData.types = [PokemonType.UNKNOWN, PokemonType.NORMAL];
       types = pokemon.getTypes();
-      expect(types[0]).toBe(Type.PSYCHIC);
-      expect(types[1]).toBe(Type.FIRE);
+      expect(types[0]).toBe(PokemonType.PSYCHIC);
+      expect(types[1]).toBe(PokemonType.FIRE);
 
-      pokemon.customPokemonData.types = [ Type.NORMAL, Type.UNKNOWN ];
+      pokemon.customPokemonData.types = [PokemonType.NORMAL, PokemonType.UNKNOWN];
       types = pokemon.getTypes();
-      expect(types[0]).toBe(Type.NORMAL);
-      expect(types[1]).toBe(Type.FIRE);
+      expect(types[0]).toBe(PokemonType.NORMAL);
+      expect(types[1]).toBe(PokemonType.FIRE);
 
       if (!pokemon.fusionCustomPokemonData) {
         pokemon.fusionCustomPokemonData = new CustomPokemonData();
       }
       pokemon.customPokemonData.types = [];
 
-      pokemon.fusionCustomPokemonData.types = [ Type.UNKNOWN, Type.NORMAL ];
+      pokemon.fusionCustomPokemonData.types = [PokemonType.UNKNOWN, PokemonType.NORMAL];
       types = pokemon.getTypes();
-      expect(types[0]).toBe(Type.PSYCHIC);
-      expect(types[1]).toBe(Type.NORMAL);
+      expect(types[0]).toBe(PokemonType.PSYCHIC);
+      expect(types[1]).toBe(PokemonType.NORMAL);
 
-      pokemon.fusionCustomPokemonData.types = [ Type.NORMAL, Type.UNKNOWN ];
+      pokemon.fusionCustomPokemonData.types = [PokemonType.NORMAL, PokemonType.UNKNOWN];
       types = pokemon.getTypes();
-      expect(types[0]).toBe(Type.PSYCHIC);
-      expect(types[1]).toBe(Type.NORMAL);
+      expect(types[0]).toBe(PokemonType.PSYCHIC);
+      expect(types[1]).toBe(PokemonType.NORMAL);
 
-      pokemon.customPokemonData.types = [ Type.NORMAL, Type.UNKNOWN ];
-      pokemon.fusionCustomPokemonData.types = [ Type.UNKNOWN, Type.NORMAL ];
+      pokemon.customPokemonData.types = [PokemonType.NORMAL, PokemonType.UNKNOWN];
+      pokemon.fusionCustomPokemonData.types = [PokemonType.UNKNOWN, PokemonType.NORMAL];
       types = pokemon.getTypes();
-      expect(types[0]).toBe(Type.NORMAL);
-      expect(types[1]).toBe(Type.FIRE);
+      expect(types[0]).toBe(PokemonType.NORMAL);
+      expect(types[1]).toBe(PokemonType.FIRE);
     });
 
     it("Fusing two mons with same single type", async () => {
@@ -135,7 +135,7 @@ describe("Spec - Pokemon", () => {
       const pokemon = scene.getPlayerParty()[0];
 
       const types = pokemon.getTypes();
-      expect(types[0]).toBe(Type.PSYCHIC);
+      expect(types[0]).toBe(PokemonType.PSYCHIC);
       expect(types.length).toBe(1);
     });
 
@@ -146,8 +146,19 @@ describe("Spec - Pokemon", () => {
       const pokemon = scene.getPlayerParty()[0];
 
       const types = pokemon.getTypes();
-      expect(types[0]).toBe(Type.FIRE);
-      expect(types[1]).toBe(Type.DARK);
+      expect(types[0]).toBe(PokemonType.FIRE);
+      expect(types[1]).toBe(PokemonType.DARK);
+    });
+
+    it("Fusing mons with two and one types", async () => {
+      game.override.starterSpecies(Species.NUMEL);
+      game.override.starterFusionSpecies(Species.CHARMANDER);
+      await game.classicMode.startBattle();
+      const pokemon = scene.getPlayerParty()[0];
+
+      const types = pokemon.getTypes();
+      expect(types[0]).toBe(PokemonType.FIRE);
+      expect(types[1]).toBe(PokemonType.GROUND);
     });
 
     it("Fusing two mons with two types", async () => {
@@ -157,20 +168,20 @@ describe("Spec - Pokemon", () => {
       const pokemon = scene.getPlayerParty()[0];
 
       let types = pokemon.getTypes();
-      expect(types[0]).toBe(Type.PSYCHIC);
-      expect(types[1]).toBe(Type.FIRE);
+      expect(types[0]).toBe(PokemonType.PSYCHIC);
+      expect(types[1]).toBe(PokemonType.FIRE);
 
       // Natu Psychic/Grass
-      pokemon.customPokemonData.types = [ Type.UNKNOWN, Type.GRASS ];
+      pokemon.customPokemonData.types = [PokemonType.UNKNOWN, PokemonType.GRASS];
       types = pokemon.getTypes();
-      expect(types[0]).toBe(Type.PSYCHIC);
-      expect(types[1]).toBe(Type.FIRE);
+      expect(types[0]).toBe(PokemonType.PSYCHIC);
+      expect(types[1]).toBe(PokemonType.FIRE);
 
       // Natu Grass/Flying
-      pokemon.customPokemonData.types = [ Type.GRASS, Type.UNKNOWN ];
+      pokemon.customPokemonData.types = [PokemonType.GRASS, PokemonType.UNKNOWN];
       types = pokemon.getTypes();
-      expect(types[0]).toBe(Type.GRASS);
-      expect(types[1]).toBe(Type.FIRE);
+      expect(types[0]).toBe(PokemonType.GRASS);
+      expect(types[1]).toBe(PokemonType.FIRE);
 
       if (!pokemon.fusionCustomPokemonData) {
         pokemon.fusionCustomPokemonData = new CustomPokemonData();
@@ -178,24 +189,39 @@ describe("Spec - Pokemon", () => {
       pokemon.customPokemonData.types = [];
 
       // Houndour Dark/Grass
-      pokemon.fusionCustomPokemonData.types = [ Type.UNKNOWN, Type.GRASS ];
+      pokemon.fusionCustomPokemonData.types = [PokemonType.UNKNOWN, PokemonType.GRASS];
       types = pokemon.getTypes();
-      expect(types[0]).toBe(Type.PSYCHIC);
-      expect(types[1]).toBe(Type.GRASS);
+      expect(types[0]).toBe(PokemonType.PSYCHIC);
+      expect(types[1]).toBe(PokemonType.GRASS);
 
       // Houndour Grass/Fire
-      pokemon.fusionCustomPokemonData.types = [ Type.GRASS, Type.UNKNOWN ];
+      pokemon.fusionCustomPokemonData.types = [PokemonType.GRASS, PokemonType.UNKNOWN];
       types = pokemon.getTypes();
-      expect(types[0]).toBe(Type.PSYCHIC);
-      expect(types[1]).toBe(Type.FIRE);
+      expect(types[0]).toBe(PokemonType.PSYCHIC);
+      expect(types[1]).toBe(PokemonType.FIRE);
 
       // Natu Grass/Flying
       // Houndour Dark/Grass
-      pokemon.customPokemonData.types = [ Type.GRASS, Type.UNKNOWN ];
-      pokemon.fusionCustomPokemonData.types = [ Type.UNKNOWN, Type.GRASS ];
+      pokemon.customPokemonData.types = [PokemonType.GRASS, PokemonType.UNKNOWN];
+      pokemon.fusionCustomPokemonData.types = [PokemonType.UNKNOWN, PokemonType.GRASS];
       types = pokemon.getTypes();
-      expect(types[0]).toBe(Type.GRASS);
-      expect(types[1]).toBe(Type.DARK);
+      expect(types[0]).toBe(PokemonType.GRASS);
+      expect(types[1]).toBe(PokemonType.DARK);
     });
   });
+
+  it.each([5, 25, 55, 95, 145, 195])(
+    "should set minimum IVs for enemy trainer pokemon based on wave (%i)",
+    async wave => {
+      game.override.startingWave(wave);
+      await game.classicMode.startBattle([Species.FEEBAS]);
+      const { waveIndex } = game.scene.currentBattle;
+
+      for (const pokemon of game.scene.getEnemyParty()) {
+        for (const index in pokemon.ivs) {
+          expect(pokemon.ivs[index]).toBeGreaterThanOrEqual(Math.floor(waveIndex / 10));
+        }
+      }
+    },
+  );
 });
diff --git a/src/test/final_boss.test.ts b/test/final_boss.test.ts
similarity index 89%
rename from src/test/final_boss.test.ts
rename to test/final_boss.test.ts
index 5540d9511e4..1b0cdce60a0 100644
--- a/src/test/final_boss.test.ts
+++ b/test/final_boss.test.ts
@@ -5,7 +5,7 @@ import { Biome } from "#enums/biome";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { StatusEffect } from "#enums/status-effect";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
 const FinalWave = {
@@ -29,7 +29,7 @@ describe("Final Boss", () => {
       .startingBiome(Biome.END)
       .disableCrits()
       .enemyMoveset(Moves.SPLASH)
-      .moveset([ Moves.SPLASH, Moves.WILL_O_WISP, Moves.DRAGON_PULSE ])
+      .moveset([Moves.SPLASH, Moves.WILL_O_WISP, Moves.DRAGON_PULSE])
       .startingLevel(10000);
   });
 
@@ -38,7 +38,7 @@ describe("Final Boss", () => {
   });
 
   it("should spawn Eternatus on wave 200 in END biome", async () => {
-    await game.runToFinalBossEncounter([ Species.BIDOOF ], GameModes.CLASSIC);
+    await game.runToFinalBossEncounter([Species.BIDOOF], GameModes.CLASSIC);
 
     expect(game.scene.currentBattle.waveIndex).toBe(FinalWave.Classic);
     expect(game.scene.arena.biomeType).toBe(Biome.END);
@@ -47,7 +47,7 @@ describe("Final Boss", () => {
 
   it("should NOT spawn Eternatus before wave 200 in END biome", async () => {
     game.override.startingWave(FinalWave.Classic - 1);
-    await game.runToFinalBossEncounter([ Species.BIDOOF ], GameModes.CLASSIC);
+    await game.runToFinalBossEncounter([Species.BIDOOF], GameModes.CLASSIC);
 
     expect(game.scene.currentBattle.waveIndex).not.toBe(FinalWave.Classic);
     expect(game.scene.arena.biomeType).toBe(Biome.END);
@@ -56,7 +56,7 @@ describe("Final Boss", () => {
 
   it("should NOT spawn Eternatus outside of END biome", async () => {
     game.override.startingBiome(Biome.FOREST);
-    await game.runToFinalBossEncounter([ Species.BIDOOF ], GameModes.CLASSIC);
+    await game.runToFinalBossEncounter([Species.BIDOOF], GameModes.CLASSIC);
 
     expect(game.scene.currentBattle.waveIndex).toBe(FinalWave.Classic);
     expect(game.scene.arena.biomeType).not.toBe(Biome.END);
@@ -64,7 +64,7 @@ describe("Final Boss", () => {
   });
 
   it("should not have passive enabled on Eternatus", async () => {
-    await game.runToFinalBossEncounter([ Species.BIDOOF ], GameModes.CLASSIC);
+    await game.runToFinalBossEncounter([Species.BIDOOF], GameModes.CLASSIC);
 
     const eternatus = game.scene.getEnemyPokemon()!;
     expect(eternatus.species.speciesId).toBe(Species.ETERNATUS);
@@ -72,7 +72,7 @@ describe("Final Boss", () => {
   });
 
   it("should change form on direct hit down to last boss fragment", async () => {
-    await game.runToFinalBossEncounter([ Species.KYUREM ], GameModes.CLASSIC);
+    await game.runToFinalBossEncounter([Species.KYUREM], GameModes.CLASSIC);
     await game.phaseInterceptor.to("CommandPhase");
 
     // Eternatus phase 1
@@ -101,7 +101,7 @@ describe("Final Boss", () => {
   it("should change form on status damage down to last boss fragment", async () => {
     game.override.ability(Abilities.NO_GUARD);
 
-    await game.runToFinalBossEncounter([ Species.BIDOOF ], GameModes.CLASSIC);
+    await game.runToFinalBossEncounter([Species.BIDOOF], GameModes.CLASSIC);
     await game.phaseInterceptor.to("CommandPhase");
 
     // Eternatus phase 1
@@ -140,5 +140,4 @@ describe("Final Boss", () => {
     expect(miniBlackHole).toBeDefined();
     expect(miniBlackHole?.stackCount).toBe(1);
   });
-
 });
diff --git a/src/test/fontFace.setup.ts b/test/fontFace.setup.ts
similarity index 100%
rename from src/test/fontFace.setup.ts
rename to test/fontFace.setup.ts
diff --git a/src/test/game-mode.test.ts b/test/game-mode.test.ts
similarity index 92%
rename from src/test/game-mode.test.ts
rename to test/game-mode.test.ts
index 2c8184a30ef..0483d18e492 100644
--- a/src/test/game-mode.test.ts
+++ b/test/game-mode.test.ts
@@ -1,8 +1,8 @@
 import type { GameMode } from "#app/game-mode";
 import { GameModes, getGameMode } from "#app/game-mode";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
-import * as Utils from "../utils";
-import GameManager from "./utils/gameManager";
+import * as Utils from "#app/utils/common";
+import GameManager from "#test/testUtils/gameManager";
 
 describe("game-mode", () => {
   let phaserGame: Phaser.Game;
@@ -28,9 +28,7 @@ describe("game-mode", () => {
     it("does NOT spawn trainers within 3 waves of fixed battle", () => {
       const { arena } = game.scene;
       /** set wave 16 to be a fixed trainer fight meaning wave 13-19 don't allow trainer spawns */
-      vi.spyOn(classicGameMode, "isFixedBattle").mockImplementation(
-        (n: number) => (n === 16 ? true : false)
-      );
+      vi.spyOn(classicGameMode, "isFixedBattle").mockImplementation((n: number) => n === 16);
       vi.spyOn(arena, "getTrainerChance").mockReturnValue(1);
       vi.spyOn(Utils, "randSeedInt").mockReturnValue(0);
       expect(classicGameMode.isWaveTrainer(11, arena)).toBeFalsy();
diff --git a/src/test/imports.test.ts b/test/imports.test.ts
similarity index 99%
rename from src/test/imports.test.ts
rename to test/imports.test.ts
index 305eccdc465..128308dbd14 100644
--- a/src/test/imports.test.ts
+++ b/test/imports.test.ts
@@ -32,4 +32,3 @@ describe("tests to debug the import, with trace", () => {
     expect(module.Species).toBeDefined();
   });
 });
-
diff --git a/src/test/inputs/inputs.test.ts b/test/inputs/inputs.test.ts
similarity index 83%
rename from src/test/inputs/inputs.test.ts
rename to test/inputs/inputs.test.ts
index 6306c1b9da6..1f566672f00 100644
--- a/src/test/inputs/inputs.test.ts
+++ b/test/inputs/inputs.test.ts
@@ -1,11 +1,10 @@
 import cfg_keyboard_qwerty from "#app/configs/inputs/cfg_keyboard_qwerty";
 import pad_xbox360 from "#app/configs/inputs/pad_xbox360";
-import GameManager from "#test/utils/gameManager";
-import InputsHandler from "#test/utils/inputsHandler";
+import GameManager from "#test/testUtils/gameManager";
+import InputsHandler from "#test/testUtils/inputsHandler";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
-
 describe("Inputs", () => {
   let phaserGame: Phaser.Game;
   let game: GameManager;
@@ -52,39 +51,38 @@ describe("Inputs", () => {
     expect(game.inputsHandler.log.length).toBe(5);
   });
 
-  it("keyboard - test input holding for 200ms - 1 input", async() => {
+  it("keyboard - test input holding for 200ms - 1 input", async () => {
     await game.inputsHandler.pressKeyboardKey(cfg_keyboard_qwerty.deviceMapping.KEY_ARROW_UP, 200);
     expect(game.inputsHandler.log.length).toBe(1);
   });
 
-  it("keyboard - test input holding for 300ms - 2 input", async() => {
+  it("keyboard - test input holding for 300ms - 2 input", async () => {
     await game.inputsHandler.pressKeyboardKey(cfg_keyboard_qwerty.deviceMapping.KEY_ARROW_UP, 300);
     expect(game.inputsHandler.log.length).toBe(2);
   });
 
-  it("keyboard - test input holding for 1000ms - 4 input", async() => {
+  it("keyboard - test input holding for 1000ms - 4 input", async () => {
     await game.inputsHandler.pressKeyboardKey(cfg_keyboard_qwerty.deviceMapping.KEY_ARROW_UP, 1050);
     expect(game.inputsHandler.log.length).toBe(5);
   });
 
-  it("gamepad - test input holding for 1ms - 1 input", async() => {
+  it("gamepad - test input holding for 1ms - 1 input", async () => {
     await game.inputsHandler.pressGamepadButton(pad_xbox360.deviceMapping.RC_S, 1);
     expect(game.inputsHandler.log.length).toBe(1);
   });
 
-  it("gamepad - test input holding for 200ms - 1 input", async() => {
+  it("gamepad - test input holding for 200ms - 1 input", async () => {
     await game.inputsHandler.pressGamepadButton(pad_xbox360.deviceMapping.RC_S, 200);
     expect(game.inputsHandler.log.length).toBe(1);
   });
 
-  it("gamepad - test input holding for 300ms - 2 input", async() => {
+  it("gamepad - test input holding for 300ms - 2 input", async () => {
     await game.inputsHandler.pressGamepadButton(pad_xbox360.deviceMapping.RC_S, 300);
     expect(game.inputsHandler.log.length).toBe(2);
   });
 
-  it("gamepad - test input holding for 1000ms - 4 input", async() => {
+  it("gamepad - test input holding for 1000ms - 4 input", async () => {
     await game.inputsHandler.pressGamepadButton(pad_xbox360.deviceMapping.RC_S, 1050);
     expect(game.inputsHandler.log.length).toBe(5);
   });
 });
-
diff --git a/src/test/internals.test.ts b/test/internals.test.ts
similarity index 87%
rename from src/test/internals.test.ts
rename to test/internals.test.ts
index ce2cd55dbc6..558b363caf0 100644
--- a/src/test/internals.test.ts
+++ b/test/internals.test.ts
@@ -1,6 +1,6 @@
 import { Abilities } from "#app/enums/abilities";
 import { Species } from "#app/enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
@@ -23,7 +23,7 @@ describe("Internals", () => {
   });
 
   it("should provide Eevee with 3 defined abilities", async () => {
-    await game.classicMode.runToSummon([ Species.EEVEE ]);
+    await game.classicMode.runToSummon([Species.EEVEE]);
     const eevee = game.scene.getPlayerPokemon()!;
 
     expect(eevee.getSpeciesForm().getAbilityCount()).toBe(3);
@@ -34,7 +34,7 @@ describe("Internals", () => {
   });
 
   it("should set Eeeve abilityIndex between 0-2", async () => {
-    await game.classicMode.runToSummon([ Species.EEVEE ]);
+    await game.classicMode.runToSummon([Species.EEVEE]);
     const eevee = game.scene.getPlayerPokemon()!;
 
     expect(eevee.abilityIndex).toBeGreaterThanOrEqual(0);
diff --git a/src/test/items/dire_hit.test.ts b/test/items/dire_hit.test.ts
similarity index 76%
rename from src/test/items/dire_hit.test.ts
rename to test/items/dire_hit.test.ts
index 3c82ebd3a47..6e20bc723e5 100644
--- a/src/test/items/dire_hit.test.ts
+++ b/test/items/dire_hit.test.ts
@@ -1,12 +1,12 @@
 import { TurnEndPhase } from "#app/phases/turn-end-phase";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phase from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 import { BattleEndPhase } from "#app/phases/battle-end-phase";
 import { TempCritBoosterModifier } from "#app/modifier/modifier";
-import { Mode } from "#app/ui/ui";
+import { UiMode } from "#enums/ui-mode";
 import type ModifierSelectUiHandler from "#app/ui/modifier-select-ui-handler";
 import { Button } from "#app/enums/buttons";
 import { CommandPhase } from "#app/phases/command-phase";
@@ -34,17 +34,13 @@ describe("Items - Dire Hit", () => {
     game.override
       .enemySpecies(Species.MAGIKARP)
       .enemyMoveset(Moves.SPLASH)
-      .moveset([ Moves.POUND ])
+      .moveset([Moves.POUND])
       .startingHeldItems([{ name: "DIRE_HIT" }])
-      .battleType("single")
-      .disableCrits();
-
+      .battleStyle("single");
   }, 20000);
 
   it("should raise CRIT stage by 1", async () => {
-    await game.startBattle([
-      Species.GASTLY
-    ]);
+    await game.startBattle([Species.GASTLY]);
 
     const enemyPokemon = game.scene.getEnemyPokemon()!;
 
@@ -57,12 +53,10 @@ describe("Items - Dire Hit", () => {
     expect(enemyPokemon.getCritStage).toHaveReturnedWith(1);
   }, 20000);
 
-  it("should renew how many battles are left of existing DIRE_HIT when picking up new DIRE_HIT", async() => {
+  it("should renew how many battles are left of existing DIRE_HIT when picking up new DIRE_HIT", async () => {
     game.override.itemRewards([{ name: "DIRE_HIT" }]);
 
-    await game.startBattle([
-      Species.PIKACHU
-    ]);
+    await game.startBattle([Species.PIKACHU]);
 
     game.move.select(Moves.SPLASH);
 
@@ -74,13 +68,19 @@ describe("Items - Dire Hit", () => {
     expect(modifier.getBattleCount()).toBe(4);
 
     // Forced DIRE_HIT to spawn in the first slot with override
-    game.onNextPrompt("SelectModifierPhase", Mode.MODIFIER_SELECT, () => {
-      const handler = game.scene.ui.getHandler() as ModifierSelectUiHandler;
-      // Traverse to first modifier slot
-      handler.setCursor(0);
-      handler.setRowCursor(ShopCursorTarget.REWARDS);
-      handler.processInput(Button.ACTION);
-    }, () => game.isCurrentPhase(CommandPhase) || game.isCurrentPhase(NewBattlePhase), true);
+    game.onNextPrompt(
+      "SelectModifierPhase",
+      UiMode.MODIFIER_SELECT,
+      () => {
+        const handler = game.scene.ui.getHandler() as ModifierSelectUiHandler;
+        // Traverse to first modifier slot
+        handler.setCursor(0);
+        handler.setRowCursor(ShopCursorTarget.REWARDS);
+        handler.processInput(Button.ACTION);
+      },
+      () => game.isCurrentPhase(CommandPhase) || game.isCurrentPhase(NewBattlePhase),
+      true,
+    );
 
     await game.phaseInterceptor.to(TurnInitPhase);
 
diff --git a/src/test/items/double_battle_chance_booster.test.ts b/test/items/double_battle_chance_booster.test.ts
similarity index 67%
rename from src/test/items/double_battle_chance_booster.test.ts
rename to test/items/double_battle_chance_booster.test.ts
index cccd8d4765e..68a29ef823e 100644
--- a/src/test/items/double_battle_chance_booster.test.ts
+++ b/test/items/double_battle_chance_booster.test.ts
@@ -1,11 +1,11 @@
 import { Moves } from "#app/enums/moves";
 import { Species } from "#app/enums/species";
 import { DoubleBattleChanceBoosterModifier } from "#app/modifier/modifier";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 import { ShopCursorTarget } from "#app/enums/shop-cursor-target";
-import { Mode } from "#app/ui/ui";
+import { UiMode } from "#enums/ui-mode";
 import type ModifierSelectUiHandler from "#app/ui/modifier-select-ui-handler";
 import { Button } from "#app/enums/buttons";
 
@@ -27,12 +27,7 @@ describe("Items - Double Battle Chance Boosters", () => {
   });
 
   it("should guarantee double battle with 2 unique tiers", async () => {
-    game.override
-      .startingModifier([
-        { name: "LURE" },
-        { name: "SUPER_LURE" }
-      ])
-      .startingWave(2);
+    game.override.startingModifier([{ name: "LURE" }, { name: "SUPER_LURE" }]).startingWave(2);
 
     await game.classicMode.startBattle();
 
@@ -40,13 +35,7 @@ describe("Items - Double Battle Chance Boosters", () => {
   });
 
   it("should guarantee double boss battle with 3 unique tiers", async () => {
-    game.override
-      .startingModifier([
-        { name: "LURE" },
-        { name: "SUPER_LURE" },
-        { name: "MAX_LURE" }
-      ])
-      .startingWave(10);
+    game.override.startingModifier([{ name: "LURE" }, { name: "SUPER_LURE" }, { name: "MAX_LURE" }]).startingWave(10);
 
     await game.classicMode.startBattle();
 
@@ -57,16 +46,14 @@ describe("Items - Double Battle Chance Boosters", () => {
     expect(enemyField[1].isBoss()).toBe(true);
   });
 
-  it("should renew how many battles are left of existing booster when picking up new booster of same tier", async() => {
+  it("should renew how many battles are left of existing booster when picking up new booster of same tier", async () => {
     game.override
       .startingModifier([{ name: "LURE" }])
       .itemRewards([{ name: "LURE" }])
       .moveset(Moves.SPLASH)
       .startingLevel(200);
 
-    await game.classicMode.startBattle([
-      Species.PIKACHU
-    ]);
+    await game.classicMode.startBattle([Species.PIKACHU]);
 
     game.move.select(Moves.SPLASH);
 
@@ -74,17 +61,25 @@ describe("Items - Double Battle Chance Boosters", () => {
 
     await game.phaseInterceptor.to("BattleEndPhase");
 
-    const modifier = game.scene.findModifier(m => m instanceof DoubleBattleChanceBoosterModifier) as DoubleBattleChanceBoosterModifier;
+    const modifier = game.scene.findModifier(
+      m => m instanceof DoubleBattleChanceBoosterModifier,
+    ) as DoubleBattleChanceBoosterModifier;
     expect(modifier.getBattleCount()).toBe(9);
 
     // Forced LURE to spawn in the first slot with override
-    game.onNextPrompt("SelectModifierPhase", Mode.MODIFIER_SELECT, () => {
-      const handler = game.scene.ui.getHandler() as ModifierSelectUiHandler;
-      // Traverse to first modifier slot
-      handler.setCursor(0);
-      handler.setRowCursor(ShopCursorTarget.REWARDS);
-      handler.processInput(Button.ACTION);
-    }, () => game.isCurrentPhase("CommandPhase") || game.isCurrentPhase("NewBattlePhase"), true);
+    game.onNextPrompt(
+      "SelectModifierPhase",
+      UiMode.MODIFIER_SELECT,
+      () => {
+        const handler = game.scene.ui.getHandler() as ModifierSelectUiHandler;
+        // Traverse to first modifier slot
+        handler.setCursor(0);
+        handler.setRowCursor(ShopCursorTarget.REWARDS);
+        handler.processInput(Button.ACTION);
+      },
+      () => game.isCurrentPhase("CommandPhase") || game.isCurrentPhase("NewBattlePhase"),
+      true,
+    );
 
     await game.phaseInterceptor.to("TurnInitPhase");
 
diff --git a/src/test/items/eviolite.test.ts b/test/items/eviolite.test.ts
similarity index 85%
rename from src/test/items/eviolite.test.ts
rename to test/items/eviolite.test.ts
index a97c287da29..fafc0f4a10c 100644
--- a/src/test/items/eviolite.test.ts
+++ b/test/items/eviolite.test.ts
@@ -1,8 +1,8 @@
 import { StatBoosterModifier } from "#app/modifier/modifier";
-import { NumberHolder, randItem } from "#app/utils";
+import { NumberHolder, randItem } from "#app/utils/common";
 import { Species } from "#enums/species";
 import { Stat } from "#enums/stat";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phase from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
@@ -22,13 +22,11 @@ describe("Items - Eviolite", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
 
-    game.override
-      .battleType("single")
-      .startingHeldItems([{ name: "EVIOLITE" }]);
+    game.override.battleStyle("single").startingHeldItems([{ name: "EVIOLITE" }]);
   });
 
-  it("should provide 50% boost to DEF and SPDEF for unevolved, unfused pokemon", async() => {
-    await game.classicMode.startBattle([ Species.PICHU ]);
+  it("should provide 50% boost to DEF and SPDEF for unevolved, unfused pokemon", async () => {
+    await game.classicMode.startBattle([Species.PICHU]);
 
     const partyMember = game.scene.getPlayerPokemon()!;
 
@@ -48,8 +46,8 @@ describe("Items - Eviolite", () => {
     expect(partyMember.getEffectiveStat(Stat.SPDEF)).toBe(Math.floor(spDefStat * 1.5));
   });
 
-  it("should not provide a boost for fully evolved, unfused pokemon", async() => {
-    await game.classicMode.startBattle([ Species.RAICHU ]);
+  it("should not provide a boost for fully evolved, unfused pokemon", async () => {
+    await game.classicMode.startBattle([Species.RAICHU]);
 
     const partyMember = game.scene.getPlayerPokemon()!;
 
@@ -67,13 +65,12 @@ describe("Items - Eviolite", () => {
 
     expect(partyMember.getEffectiveStat(Stat.DEF)).toBe(defStat);
     expect(partyMember.getEffectiveStat(Stat.SPDEF)).toBe(spDefStat);
-
   });
 
-  it("should provide 50% boost to DEF and SPDEF for completely unevolved, fused pokemon", async() => {
-    await game.classicMode.startBattle([ Species.PICHU, Species.CLEFFA ]);
+  it("should provide 50% boost to DEF and SPDEF for completely unevolved, fused pokemon", async () => {
+    await game.classicMode.startBattle([Species.PICHU, Species.CLEFFA]);
 
-    const [ partyMember, ally ] = game.scene.getPlayerParty();
+    const [partyMember, ally] = game.scene.getPlayerParty();
 
     // Fuse party members (taken from PlayerPokemon.fuse(...) function)
     partyMember.fusionSpecies = ally.species;
@@ -100,10 +97,10 @@ describe("Items - Eviolite", () => {
     expect(partyMember.getEffectiveStat(Stat.SPDEF)).toBe(Math.floor(spDefStat * 1.5));
   });
 
-  it("should provide 25% boost to DEF and SPDEF for partially unevolved (base), fused pokemon", async() => {
-    await game.classicMode.startBattle([ Species.PICHU, Species.CLEFABLE ]);
+  it("should provide 25% boost to DEF and SPDEF for partially unevolved (base), fused pokemon", async () => {
+    await game.classicMode.startBattle([Species.PICHU, Species.CLEFABLE]);
 
-    const [ partyMember, ally ] = game.scene.getPlayerParty();
+    const [partyMember, ally] = game.scene.getPlayerParty();
 
     // Fuse party members (taken from PlayerPokemon.fuse(...) function)
     partyMember.fusionSpecies = ally.species;
@@ -130,10 +127,10 @@ describe("Items - Eviolite", () => {
     expect(partyMember.getEffectiveStat(Stat.SPDEF)).toBe(Math.floor(spDefStat * 1.25));
   });
 
-  it("should provide 25% boost to DEF and SPDEF for partially unevolved (fusion), fused pokemon", async() => {
-    await game.classicMode.startBattle([ Species.RAICHU, Species.CLEFFA ]);
+  it("should provide 25% boost to DEF and SPDEF for partially unevolved (fusion), fused pokemon", async () => {
+    await game.classicMode.startBattle([Species.RAICHU, Species.CLEFFA]);
 
-    const [ partyMember, ally ] = game.scene.getPlayerParty();
+    const [partyMember, ally] = game.scene.getPlayerParty();
 
     // Fuse party members (taken from PlayerPokemon.fuse(...) function)
     partyMember.fusionSpecies = ally.species;
@@ -160,10 +157,10 @@ describe("Items - Eviolite", () => {
     expect(partyMember.getEffectiveStat(Stat.SPDEF)).toBe(Math.floor(spDefStat * 1.25));
   });
 
-  it("should not provide a boost for fully evolved, fused pokemon", async() => {
-    await game.classicMode.startBattle([ Species.RAICHU, Species.CLEFABLE ]);
+  it("should not provide a boost for fully evolved, fused pokemon", async () => {
+    await game.classicMode.startBattle([Species.RAICHU, Species.CLEFABLE]);
 
-    const [ partyMember, ally ] = game.scene.getPlayerParty();
+    const [partyMember, ally] = game.scene.getPlayerParty();
 
     // Fuse party members (taken from PlayerPokemon.fuse(...) function)
     partyMember.fusionSpecies = ally.species;
@@ -190,17 +187,17 @@ describe("Items - Eviolite", () => {
     expect(partyMember.getEffectiveStat(Stat.SPDEF)).toBe(spDefStat);
   });
 
-  it("should not provide a boost for Gigantamax Pokémon", async() => {
+  it("should not provide a boost for Gigantamax Pokémon", async () => {
     game.override.starterForms({
       [Species.PIKACHU]: 8,
       [Species.EEVEE]: 2,
       [Species.DURALUDON]: 1,
-      [Species.MEOWTH]: 1
+      [Species.MEOWTH]: 1,
     });
 
-    const gMaxablePokemon = [ Species.PIKACHU, Species.EEVEE, Species.DURALUDON, Species.MEOWTH ];
+    const gMaxablePokemon = [Species.PIKACHU, Species.EEVEE, Species.DURALUDON, Species.MEOWTH];
 
-    await game.classicMode.startBattle([ randItem(gMaxablePokemon) ]);
+    await game.classicMode.startBattle([randItem(gMaxablePokemon)]);
 
     const partyMember = game.scene.getPlayerPokemon()!;
 
diff --git a/src/test/items/exp_booster.test.ts b/test/items/exp_booster.test.ts
similarity index 79%
rename from src/test/items/exp_booster.test.ts
rename to test/items/exp_booster.test.ts
index 7441dcaeb73..ec7528c3b23 100644
--- a/src/test/items/exp_booster.test.ts
+++ b/test/items/exp_booster.test.ts
@@ -1,7 +1,7 @@
 import { Abilities } from "#app/enums/abilities";
 import { PokemonExpBoosterModifier } from "#app/modifier/modifier";
-import * as Utils from "#app/utils";
-import GameManager from "#test/utils/gameManager";
+import { NumberHolder } from "#app/utils/common";
+import GameManager from "#test/testUtils/gameManager";
 import Phase from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
@@ -24,16 +24,16 @@ describe("EXP Modifier Items", () => {
 
     game.override.enemyAbility(Abilities.BALL_FETCH);
     game.override.ability(Abilities.BALL_FETCH);
-    game.override.battleType("single");
+    game.override.battleStyle("single");
   });
 
-  it("EXP booster items stack multiplicatively", async() => {
+  it("EXP booster items stack multiplicatively", async () => {
     game.override.startingHeldItems([{ name: "LUCKY_EGG", count: 3 }, { name: "GOLDEN_EGG" }]);
     await game.startBattle();
 
     const partyMember = game.scene.getPlayerPokemon()!;
     partyMember.exp = 100;
-    const expHolder = new Utils.NumberHolder(partyMember.exp);
+    const expHolder = new NumberHolder(partyMember.exp);
     game.scene.applyModifiers(PokemonExpBoosterModifier, true, partyMember, expHolder);
     expect(expHolder.value).toBe(440);
   }, 20000);
diff --git a/src/test/items/grip_claw.test.ts b/test/items/grip_claw.test.ts
similarity index 73%
rename from src/test/items/grip_claw.test.ts
rename to test/items/grip_claw.test.ts
index e0cbeb95b6f..2396a7ca072 100644
--- a/src/test/items/grip_claw.test.ts
+++ b/test/items/grip_claw.test.ts
@@ -5,7 +5,7 @@ import { Abilities } from "#enums/abilities";
 import { BerryType } from "#enums/berry-type";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phase from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
@@ -27,11 +27,9 @@ describe("Items - Grip Claw", () => {
     game = new GameManager(phaserGame);
 
     game.override
-      .battleType("double")
-      .moveset([ Moves.TACKLE, Moves.SPLASH, Moves.ATTRACT ])
-      .startingHeldItems([
-        { name: "GRIP_CLAW", count: 1 },
-      ])
+      .battleStyle("double")
+      .moveset([Moves.TACKLE, Moves.SPLASH, Moves.ATTRACT])
+      .startingHeldItems([{ name: "GRIP_CLAW", count: 1 }])
       .enemySpecies(Species.SNORLAX)
       .enemyAbility(Abilities.UNNERVE)
       .ability(Abilities.UNNERVE)
@@ -41,13 +39,12 @@ describe("Items - Grip Claw", () => {
         { name: "BERRY", type: BerryType.LUM, count: 2 },
       ])
       .enemyLevel(100);
-
   });
 
   it("should steal items on contact and only from the attack target", async () => {
-    await game.classicMode.startBattle([ Species.FEEBAS, Species.MILOTIC ]);
+    await game.classicMode.startBattle([Species.FEEBAS, Species.MILOTIC]);
 
-    const [ playerPokemon, ] = game.scene.getPlayerField();
+    const [playerPokemon] = game.scene.getPlayerField();
 
     const gripClaw = playerPokemon.getHeldItems()[0] as ContactHeldItemTransferChanceModifier;
     vi.spyOn(gripClaw, "chance", "get").mockReturnValue(100);
@@ -74,9 +71,9 @@ describe("Items - Grip Claw", () => {
   });
 
   it("should not steal items when using a targetted, non attack move", async () => {
-    await game.classicMode.startBattle([ Species.FEEBAS, Species.MILOTIC ]);
+    await game.classicMode.startBattle([Species.FEEBAS, Species.MILOTIC]);
 
-    const [ playerPokemon, ] = game.scene.getPlayerField();
+    const [playerPokemon] = game.scene.getPlayerField();
 
     const gripClaw = playerPokemon.getHeldItems()[0] as ContactHeldItemTransferChanceModifier;
     vi.spyOn(gripClaw, "chance", "get").mockReturnValue(100);
@@ -101,6 +98,31 @@ describe("Items - Grip Claw", () => {
     expect(enemy1HeldItemCountsAfter).toBe(enemy1HeldItemCount);
     expect(enemy2HeldItemCountsAfter).toBe(enemy2HeldItemCount);
   });
+
+  it("should not allow Pollen Puff to steal items when healing ally", async () => {
+    game.override
+      .battleStyle("double")
+      .moveset([Moves.POLLEN_PUFF, Moves.ENDURE])
+      .startingHeldItems([
+        { name: "GRIP_CLAW", count: 1 },
+        { name: "BERRY", type: BerryType.LUM, count: 1 },
+      ]);
+    await game.classicMode.startBattle([Species.BULBASAUR, Species.OMANYTE]);
+
+    const [leftPokemon, rightPokemon] = game.scene.getPlayerField();
+
+    const gripClaw = leftPokemon.getHeldItems()[0] as ContactHeldItemTransferChanceModifier;
+    vi.spyOn(gripClaw, "chance", "get").mockReturnValue(100);
+
+    const heldItemCountBefore = getHeldItemCount(rightPokemon);
+
+    game.move.select(Moves.POLLEN_PUFF, 0, BattlerIndex.PLAYER_2);
+    game.move.select(Moves.ENDURE, 1);
+
+    await game.toNextTurn();
+
+    expect(getHeldItemCount(rightPokemon)).toBe(heldItemCountBefore);
+  });
 });
 
 /*
@@ -109,4 +131,3 @@ describe("Items - Grip Claw", () => {
 function getHeldItemCount(pokemon: Pokemon) {
   return pokemon.getHeldItems().reduce((currentTotal, item) => currentTotal + item.getStackCount(), 0);
 }
-
diff --git a/src/test/items/leek.test.ts b/test/items/leek.test.ts
similarity index 78%
rename from src/test/items/leek.test.ts
rename to test/items/leek.test.ts
index 901b353b3d3..9bde2c86339 100644
--- a/src/test/items/leek.test.ts
+++ b/test/items/leek.test.ts
@@ -1,8 +1,8 @@
 import { TurnEndPhase } from "#app/phases/turn-end-phase";
-import * as Utils from "#app/utils";
+import { randInt } from "#app/utils/common";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phase from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
@@ -25,17 +25,14 @@ describe("Items - Leek", () => {
 
     game.override
       .enemySpecies(Species.MAGIKARP)
-      .enemyMoveset([ Moves.SPLASH, Moves.SPLASH, Moves.SPLASH, Moves.SPLASH ])
+      .enemyMoveset([Moves.SPLASH, Moves.SPLASH, Moves.SPLASH, Moves.SPLASH])
       .startingHeldItems([{ name: "LEEK" }])
-      .moveset([ Moves.TACKLE ])
-      .disableCrits()
-      .battleType("single");
+      .moveset([Moves.TACKLE])
+      .battleStyle("single");
   });
 
   it("should raise CRIT stage by 2 when held by FARFETCHD", async () => {
-    await game.startBattle([
-      Species.FARFETCHD
-    ]);
+    await game.startBattle([Species.FARFETCHD]);
 
     const enemyMember = game.scene.getEnemyPokemon()!;
 
@@ -49,9 +46,7 @@ describe("Items - Leek", () => {
   }, 20000);
 
   it("should raise CRIT stage by 2 when held by GALAR_FARFETCHD", async () => {
-    await game.startBattle([
-      Species.GALAR_FARFETCHD
-    ]);
+    await game.startBattle([Species.GALAR_FARFETCHD]);
 
     const enemyMember = game.scene.getEnemyPokemon()!;
 
@@ -65,9 +60,7 @@ describe("Items - Leek", () => {
   }, 20000);
 
   it("should raise CRIT stage by 2 when held by SIRFETCHD", async () => {
-    await game.startBattle([
-      Species.SIRFETCHD
-    ]);
+    await game.startBattle([Species.SIRFETCHD]);
 
     const enemyMember = game.scene.getEnemyPokemon()!;
 
@@ -82,14 +75,11 @@ describe("Items - Leek", () => {
 
   it("should raise CRIT stage by 2 when held by FARFETCHD line fused with Pokemon", async () => {
     // Randomly choose from the Farfetch'd line
-    const species = [ Species.FARFETCHD, Species.GALAR_FARFETCHD, Species.SIRFETCHD ];
+    const species = [Species.FARFETCHD, Species.GALAR_FARFETCHD, Species.SIRFETCHD];
 
-    await game.startBattle([
-      species[Utils.randInt(species.length)],
-      Species.PIKACHU,
-    ]);
+    await game.startBattle([species[randInt(species.length)], Species.PIKACHU]);
 
-    const [ partyMember, ally ] = game.scene.getPlayerParty();
+    const [partyMember, ally] = game.scene.getPlayerParty();
 
     // Fuse party members (taken from PlayerPokemon.fuse(...) function)
     partyMember.fusionSpecies = ally.species;
@@ -113,14 +103,11 @@ describe("Items - Leek", () => {
 
   it("should raise CRIT stage by 2 when held by Pokemon fused with FARFETCHD line", async () => {
     // Randomly choose from the Farfetch'd line
-    const species = [ Species.FARFETCHD, Species.GALAR_FARFETCHD, Species.SIRFETCHD ];
+    const species = [Species.FARFETCHD, Species.GALAR_FARFETCHD, Species.SIRFETCHD];
 
-    await game.startBattle([
-      Species.PIKACHU,
-      species[Utils.randInt(species.length)]
-    ]);
+    await game.startBattle([Species.PIKACHU, species[randInt(species.length)]]);
 
-    const [ partyMember, ally ] = game.scene.getPlayerParty();
+    const [partyMember, ally] = game.scene.getPlayerParty();
 
     // Fuse party members (taken from PlayerPokemon.fuse(...) function)
     partyMember.fusionSpecies = ally.species;
@@ -131,7 +118,6 @@ describe("Items - Leek", () => {
     partyMember.fusionGender = ally.gender;
     partyMember.fusionLuck = ally.luck;
 
-
     const enemyMember = game.scene.getEnemyPokemon()!;
 
     vi.spyOn(enemyMember, "getCritStage");
@@ -144,9 +130,7 @@ describe("Items - Leek", () => {
   }, 20000);
 
   it("should not raise CRIT stage when held by a Pokemon outside of FARFETCHD line", async () => {
-    await game.startBattle([
-      Species.PIKACHU
-    ]);
+    await game.startBattle([Species.PIKACHU]);
 
     const enemyMember = game.scene.getEnemyPokemon()!;
 
diff --git a/src/test/items/leftovers.test.ts b/test/items/leftovers.test.ts
similarity index 85%
rename from src/test/items/leftovers.test.ts
rename to test/items/leftovers.test.ts
index 672151d97cb..19739703f19 100644
--- a/src/test/items/leftovers.test.ts
+++ b/test/items/leftovers.test.ts
@@ -3,11 +3,10 @@ import { TurnEndPhase } from "#app/phases/turn-end-phase";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
-
 describe("Items - Leftovers", () => {
   let phaserGame: Phaser.Game;
   let game: GameManager;
@@ -24,18 +23,18 @@ describe("Items - Leftovers", () => {
 
   beforeEach(() => {
     game = new GameManager(phaserGame);
-    game.override.battleType("single");
+    game.override.battleStyle("single");
     game.override.startingLevel(2000);
     game.override.ability(Abilities.UNNERVE);
-    game.override.moveset([ Moves.SPLASH ]);
+    game.override.moveset([Moves.SPLASH]);
     game.override.enemySpecies(Species.SHUCKLE);
     game.override.enemyAbility(Abilities.UNNERVE);
-    game.override.enemyMoveset([ Moves.TACKLE, Moves.TACKLE, Moves.TACKLE, Moves.TACKLE ]);
+    game.override.enemyMoveset([Moves.TACKLE, Moves.TACKLE, Moves.TACKLE, Moves.TACKLE]);
     game.override.startingHeldItems([{ name: "LEFTOVERS", count: 1 }]);
   });
 
   it("leftovers works", async () => {
-    await game.startBattle([ Species.ARCANINE ]);
+    await game.startBattle([Species.ARCANINE]);
 
     // Make sure leftovers are there
     expect(game.scene.modifiers[0].type.id).toBe("LEFTOVERS");
diff --git a/src/test/items/light_ball.test.ts b/test/items/light_ball.test.ts
similarity index 70%
rename from src/test/items/light_ball.test.ts
rename to test/items/light_ball.test.ts
index 987a5ab8b0c..91195d0b1e5 100644
--- a/src/test/items/light_ball.test.ts
+++ b/test/items/light_ball.test.ts
@@ -2,9 +2,9 @@ import { Stat } from "#enums/stat";
 import { SpeciesStatBoosterModifier } from "#app/modifier/modifier";
 import { modifierTypes } from "#app/modifier/modifier-type";
 import i18next from "#app/plugins/i18n";
-import * as Utils from "#app/utils";
+import { NumberHolder } from "#app/utils/common";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phase from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
@@ -25,48 +25,64 @@ describe("Items - Light Ball", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
 
-    game.override.battleType("single");
+    game.override.battleStyle("single");
   });
 
-  it("LIGHT_BALL activates in battle correctly", async() => {
+  it("LIGHT_BALL activates in battle correctly", async () => {
     game.override.startingHeldItems([{ name: "SPECIES_STAT_BOOSTER", type: "LIGHT_BALL" }]);
     const consoleSpy = vi.spyOn(console, "log");
-    await game.startBattle([
-      Species.PIKACHU
-    ]);
+    await game.classicMode.startBattle([Species.PIKACHU]);
 
     const partyMember = game.scene.getPlayerParty()[0];
 
     // Checking console log to make sure Light Ball is applied when getEffectiveStat (with the appropriate stat) is called
     partyMember.getEffectiveStat(Stat.DEF);
-    expect(consoleSpy).not.toHaveBeenLastCalledWith("Applied", i18next.t("modifierType:SpeciesBoosterItem.LIGHT_BALL.name"), "");
+    expect(consoleSpy).not.toHaveBeenLastCalledWith(
+      "Applied",
+      i18next.t("modifierType:SpeciesBoosterItem.LIGHT_BALL.name"),
+      "",
+    );
 
     // Printing dummy console messages along the way so subsequent checks don't pass because of the first
     console.log("");
 
     partyMember.getEffectiveStat(Stat.SPDEF);
-    expect(consoleSpy).not.toHaveBeenLastCalledWith("Applied", i18next.t("modifierType:SpeciesBoosterItem.LIGHT_BALL.name"), "");
+    expect(consoleSpy).not.toHaveBeenLastCalledWith(
+      "Applied",
+      i18next.t("modifierType:SpeciesBoosterItem.LIGHT_BALL.name"),
+      "",
+    );
 
     console.log("");
 
     partyMember.getEffectiveStat(Stat.ATK);
-    expect(consoleSpy).toHaveBeenLastCalledWith("Applied", i18next.t("modifierType:SpeciesBoosterItem.LIGHT_BALL.name"), "");
+    expect(consoleSpy).toHaveBeenLastCalledWith(
+      "Applied",
+      i18next.t("modifierType:SpeciesBoosterItem.LIGHT_BALL.name"),
+      "",
+    );
 
     console.log("");
 
     partyMember.getEffectiveStat(Stat.SPATK);
-    expect(consoleSpy).toHaveBeenLastCalledWith("Applied", i18next.t("modifierType:SpeciesBoosterItem.LIGHT_BALL.name"), "");
+    expect(consoleSpy).toHaveBeenLastCalledWith(
+      "Applied",
+      i18next.t("modifierType:SpeciesBoosterItem.LIGHT_BALL.name"),
+      "",
+    );
 
     console.log("");
 
     partyMember.getEffectiveStat(Stat.SPD);
-    expect(consoleSpy).not.toHaveBeenLastCalledWith("Applied", i18next.t("modifierType:SpeciesBoosterItem.LIGHT_BALL.name"), "");
+    expect(consoleSpy).not.toHaveBeenLastCalledWith(
+      "Applied",
+      i18next.t("modifierType:SpeciesBoosterItem.LIGHT_BALL.name"),
+      "",
+    );
   });
 
-  it("LIGHT_BALL held by PIKACHU", async() => {
-    await game.startBattle([
-      Species.PIKACHU
-    ]);
+  it("LIGHT_BALL held by PIKACHU", async () => {
+    await game.classicMode.startBattle([Species.PIKACHU]);
 
     const partyMember = game.scene.getPlayerParty()[0];
 
@@ -74,16 +90,19 @@ describe("Items - Light Ball", () => {
     const spAtkStat = partyMember.getStat(Stat.SPATK);
 
     // Making sure modifier is not applied without holding item
-    const atkValue = new Utils.NumberHolder(atkStat);
+    const atkValue = new NumberHolder(atkStat);
     game.scene.applyModifiers(SpeciesStatBoosterModifier, true, partyMember, Stat.DEF, atkValue);
-    const spAtkValue = new Utils.NumberHolder(spAtkStat);
+    const spAtkValue = new NumberHolder(spAtkStat);
     game.scene.applyModifiers(SpeciesStatBoosterModifier, true, partyMember, Stat.SPDEF, spAtkValue);
 
     expect(atkValue.value / atkStat).toBe(1);
     expect(spAtkValue.value / spAtkStat).toBe(1);
 
     // Giving Eviolite to party member and testing if it applies
-    game.scene.addModifier(modifierTypes.SPECIES_STAT_BOOSTER().generateType([], [ "LIGHT_BALL" ])!.newModifier(partyMember), true);
+    await game.scene.addModifier(
+      modifierTypes.SPECIES_STAT_BOOSTER().generateType([], ["LIGHT_BALL"])!.newModifier(partyMember),
+      true,
+    );
     game.scene.applyModifiers(SpeciesStatBoosterModifier, true, partyMember, Stat.ATK, atkValue);
     game.scene.applyModifiers(SpeciesStatBoosterModifier, true, partyMember, Stat.SPATK, spAtkValue);
 
@@ -91,11 +110,8 @@ describe("Items - Light Ball", () => {
     expect(spAtkValue.value / spAtkStat).toBe(2);
   }, 20000);
 
-  it("LIGHT_BALL held by fused PIKACHU (base)", async() => {
-    await game.startBattle([
-      Species.PIKACHU,
-      Species.MAROWAK
-    ]);
+  it("LIGHT_BALL held by fused PIKACHU (base)", async () => {
+    await game.classicMode.startBattle([Species.PIKACHU, Species.MAROWAK]);
 
     const partyMember = game.scene.getPlayerParty()[0];
     const ally = game.scene.getPlayerParty()[1];
@@ -113,16 +129,19 @@ describe("Items - Light Ball", () => {
     const spAtkStat = partyMember.getStat(Stat.SPATK);
 
     // Making sure modifier is not applied without holding item
-    const atkValue = new Utils.NumberHolder(atkStat);
+    const atkValue = new NumberHolder(atkStat);
     game.scene.applyModifiers(SpeciesStatBoosterModifier, true, partyMember, Stat.DEF, atkValue);
-    const spAtkValue = new Utils.NumberHolder(spAtkStat);
+    const spAtkValue = new NumberHolder(spAtkStat);
     game.scene.applyModifiers(SpeciesStatBoosterModifier, true, partyMember, Stat.SPDEF, spAtkValue);
 
     expect(atkValue.value / atkStat).toBe(1);
     expect(spAtkValue.value / spAtkStat).toBe(1);
 
     // Giving Eviolite to party member and testing if it applies
-    game.scene.addModifier(modifierTypes.SPECIES_STAT_BOOSTER().generateType([], [ "LIGHT_BALL" ])!.newModifier(partyMember), true);
+    await game.scene.addModifier(
+      modifierTypes.SPECIES_STAT_BOOSTER().generateType([], ["LIGHT_BALL"])!.newModifier(partyMember),
+      true,
+    );
     game.scene.applyModifiers(SpeciesStatBoosterModifier, true, partyMember, Stat.ATK, atkValue);
     game.scene.applyModifiers(SpeciesStatBoosterModifier, true, partyMember, Stat.SPATK, spAtkValue);
 
@@ -130,11 +149,8 @@ describe("Items - Light Ball", () => {
     expect(spAtkValue.value / spAtkStat).toBe(2);
   }, 20000);
 
-  it("LIGHT_BALL held by fused PIKACHU (part)", async() => {
-    await game.startBattle([
-      Species.MAROWAK,
-      Species.PIKACHU
-    ]);
+  it("LIGHT_BALL held by fused PIKACHU (part)", async () => {
+    await game.startBattle([Species.MAROWAK, Species.PIKACHU]);
 
     const partyMember = game.scene.getPlayerParty()[0];
     const ally = game.scene.getPlayerParty()[1];
@@ -152,16 +168,19 @@ describe("Items - Light Ball", () => {
     const spAtkStat = partyMember.getStat(Stat.SPATK);
 
     // Making sure modifier is not applied without holding item
-    const atkValue = new Utils.NumberHolder(atkStat);
+    const atkValue = new NumberHolder(atkStat);
     game.scene.applyModifiers(SpeciesStatBoosterModifier, true, partyMember, Stat.DEF, atkValue);
-    const spAtkValue = new Utils.NumberHolder(spAtkStat);
+    const spAtkValue = new NumberHolder(spAtkStat);
     game.scene.applyModifiers(SpeciesStatBoosterModifier, true, partyMember, Stat.SPDEF, spAtkValue);
 
     expect(atkValue.value / atkStat).toBe(1);
     expect(spAtkValue.value / spAtkStat).toBe(1);
 
     // Giving Eviolite to party member and testing if it applies
-    game.scene.addModifier(modifierTypes.SPECIES_STAT_BOOSTER().generateType([], [ "LIGHT_BALL" ])!.newModifier(partyMember), true);
+    await game.scene.addModifier(
+      modifierTypes.SPECIES_STAT_BOOSTER().generateType([], ["LIGHT_BALL"])!.newModifier(partyMember),
+      true,
+    );
     game.scene.applyModifiers(SpeciesStatBoosterModifier, true, partyMember, Stat.ATK, atkValue);
     game.scene.applyModifiers(SpeciesStatBoosterModifier, true, partyMember, Stat.SPATK, spAtkValue);
 
@@ -169,10 +188,8 @@ describe("Items - Light Ball", () => {
     expect(spAtkValue.value / spAtkStat).toBe(2);
   }, 20000);
 
-  it("LIGHT_BALL not held by PIKACHU", async() => {
-    await game.startBattle([
-      Species.MAROWAK
-    ]);
+  it("LIGHT_BALL not held by PIKACHU", async () => {
+    await game.startBattle([Species.MAROWAK]);
 
     const partyMember = game.scene.getPlayerParty()[0];
 
@@ -180,16 +197,19 @@ describe("Items - Light Ball", () => {
     const spAtkStat = partyMember.getStat(Stat.SPATK);
 
     // Making sure modifier is not applied without holding item
-    const atkValue = new Utils.NumberHolder(atkStat);
+    const atkValue = new NumberHolder(atkStat);
     game.scene.applyModifiers(SpeciesStatBoosterModifier, true, partyMember, Stat.DEF, atkValue);
-    const spAtkValue = new Utils.NumberHolder(spAtkStat);
+    const spAtkValue = new NumberHolder(spAtkStat);
     game.scene.applyModifiers(SpeciesStatBoosterModifier, true, partyMember, Stat.SPDEF, spAtkValue);
 
     expect(atkValue.value / atkStat).toBe(1);
     expect(spAtkValue.value / spAtkStat).toBe(1);
 
     // Giving Eviolite to party member and testing if it applies
-    game.scene.addModifier(modifierTypes.SPECIES_STAT_BOOSTER().generateType([], [ "LIGHT_BALL" ])!.newModifier(partyMember), true);
+    await game.scene.addModifier(
+      modifierTypes.SPECIES_STAT_BOOSTER().generateType([], ["LIGHT_BALL"])!.newModifier(partyMember),
+      true,
+    );
     game.scene.applyModifiers(SpeciesStatBoosterModifier, true, partyMember, Stat.ATK, atkValue);
     game.scene.applyModifiers(SpeciesStatBoosterModifier, true, partyMember, Stat.SPATK, spAtkValue);
 
diff --git a/src/test/items/lock_capsule.test.ts b/test/items/lock_capsule.test.ts
similarity index 72%
rename from src/test/items/lock_capsule.test.ts
rename to test/items/lock_capsule.test.ts
index 2d95cea5847..19829578d87 100644
--- a/src/test/items/lock_capsule.test.ts
+++ b/test/items/lock_capsule.test.ts
@@ -2,8 +2,8 @@ import { Abilities } from "#app/enums/abilities";
 import { Moves } from "#app/enums/moves";
 import { ModifierTier } from "#app/modifier/modifier-tier";
 import { SelectModifierPhase } from "#app/phases/select-modifier-phase";
-import { Mode } from "#app/ui/ui";
-import GameManager from "#test/utils/gameManager";
+import { UiMode } from "#enums/ui-mode";
+import GameManager from "#test/testUtils/gameManager";
 import Phase from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
@@ -25,18 +25,23 @@ describe("Items - Lock Capsule", () => {
     game = new GameManager(phaserGame);
 
     game.override
-      .battleType("single")
+      .battleStyle("single")
       .startingLevel(200)
-      .moveset([ Moves.SURF ])
+      .moveset([Moves.SURF])
       .enemyAbility(Abilities.BALL_FETCH)
       .startingModifier([{ name: "LOCK_CAPSULE" }]);
   });
 
   it("doesn't set the cost of common tier items to 0", async () => {
     await game.classicMode.startBattle();
-    game.scene.overridePhase(new SelectModifierPhase(0, undefined, { guaranteedModifierTiers: [ ModifierTier.COMMON, ModifierTier.COMMON, ModifierTier.COMMON ], fillRemaining: false }));
+    game.scene.overridePhase(
+      new SelectModifierPhase(0, undefined, {
+        guaranteedModifierTiers: [ModifierTier.COMMON, ModifierTier.COMMON, ModifierTier.COMMON],
+        fillRemaining: false,
+      }),
+    );
 
-    game.onNextPrompt("SelectModifierPhase", Mode.MODIFIER_SELECT, () => {
+    game.onNextPrompt("SelectModifierPhase", UiMode.MODIFIER_SELECT, () => {
       const selectModifierPhase = game.scene.getCurrentPhase() as SelectModifierPhase;
       const rerollCost = selectModifierPhase.getRerollCost(true);
       expect(rerollCost).toBe(150);
diff --git a/src/test/items/metal_powder.test.ts b/test/items/metal_powder.test.ts
similarity index 66%
rename from src/test/items/metal_powder.test.ts
rename to test/items/metal_powder.test.ts
index 42ef9c1bb16..6be7655ec70 100644
--- a/src/test/items/metal_powder.test.ts
+++ b/test/items/metal_powder.test.ts
@@ -2,9 +2,9 @@ import { Stat } from "#enums/stat";
 import { SpeciesStatBoosterModifier } from "#app/modifier/modifier";
 import { modifierTypes } from "#app/modifier/modifier-type";
 import i18next from "#app/plugins/i18n";
-import * as Utils from "#app/utils";
+import { NumberHolder } from "#app/utils/common";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phase from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
@@ -25,71 +25,87 @@ describe("Items - Metal Powder", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
 
-    game.override.battleType("single");
+    game.override.battleStyle("single");
   });
 
-  it("METAL_POWDER activates in battle correctly", async() => {
+  it("METAL_POWDER activates in battle correctly", async () => {
     game.override.startingHeldItems([{ name: "SPECIES_STAT_BOOSTER", type: "METAL_POWDER" }]);
     const consoleSpy = vi.spyOn(console, "log");
-    await game.startBattle([
-      Species.DITTO
-    ]);
+    await game.classicMode.startBattle([Species.DITTO]);
 
     const partyMember = game.scene.getPlayerParty()[0];
 
     // Checking console log to make sure Metal Powder is applied when getEffectiveStat (with the appropriate stat) is called
     partyMember.getEffectiveStat(Stat.DEF);
-    expect(consoleSpy).toHaveBeenLastCalledWith("Applied", i18next.t("modifierType:SpeciesBoosterItem.METAL_POWDER.name"), "");
+    expect(consoleSpy).toHaveBeenLastCalledWith(
+      "Applied",
+      i18next.t("modifierType:SpeciesBoosterItem.METAL_POWDER.name"),
+      "",
+    );
 
     // Printing dummy console messages along the way so subsequent checks don't pass because of the first
     console.log("");
 
     partyMember.getEffectiveStat(Stat.SPDEF);
-    expect(consoleSpy).not.toHaveBeenLastCalledWith("Applied", i18next.t("modifierType:SpeciesBoosterItem.METAL_POWDER.name"), "");
+    expect(consoleSpy).not.toHaveBeenLastCalledWith(
+      "Applied",
+      i18next.t("modifierType:SpeciesBoosterItem.METAL_POWDER.name"),
+      "",
+    );
 
     console.log("");
 
     partyMember.getEffectiveStat(Stat.ATK);
-    expect(consoleSpy).not.toHaveBeenLastCalledWith("Applied", i18next.t("modifierType:SpeciesBoosterItem.METAL_POWDER.name"), "");
+    expect(consoleSpy).not.toHaveBeenLastCalledWith(
+      "Applied",
+      i18next.t("modifierType:SpeciesBoosterItem.METAL_POWDER.name"),
+      "",
+    );
 
     console.log("");
 
     partyMember.getEffectiveStat(Stat.SPATK);
-    expect(consoleSpy).not.toHaveBeenLastCalledWith("Applied", i18next.t("modifierType:SpeciesBoosterItem.METAL_POWDER.name"), "");
+    expect(consoleSpy).not.toHaveBeenLastCalledWith(
+      "Applied",
+      i18next.t("modifierType:SpeciesBoosterItem.METAL_POWDER.name"),
+      "",
+    );
 
     console.log("");
 
     partyMember.getEffectiveStat(Stat.SPD);
-    expect(consoleSpy).not.toHaveBeenLastCalledWith("Applied", i18next.t("modifierType:SpeciesBoosterItem.METAL_POWDER.name"), "");
+    expect(consoleSpy).not.toHaveBeenLastCalledWith(
+      "Applied",
+      i18next.t("modifierType:SpeciesBoosterItem.METAL_POWDER.name"),
+      "",
+    );
   });
 
-  it("METAL_POWDER held by DITTO", async() => {
-    await game.startBattle([
-      Species.DITTO
-    ]);
+  it("METAL_POWDER held by DITTO", async () => {
+    await game.startBattle([Species.DITTO]);
 
     const partyMember = game.scene.getPlayerParty()[0];
 
     const defStat = partyMember.getStat(Stat.DEF);
 
     // Making sure modifier is not applied without holding item
-    const defValue = new Utils.NumberHolder(defStat);
+    const defValue = new NumberHolder(defStat);
     game.scene.applyModifiers(SpeciesStatBoosterModifier, true, partyMember, Stat.DEF, defValue);
 
     expect(defValue.value / defStat).toBe(1);
 
     // Giving Eviolite to party member and testing if it applies
-    game.scene.addModifier(modifierTypes.SPECIES_STAT_BOOSTER().generateType([], [ "METAL_POWDER" ])!.newModifier(partyMember), true);
+    await game.scene.addModifier(
+      modifierTypes.SPECIES_STAT_BOOSTER().generateType([], ["METAL_POWDER"])!.newModifier(partyMember),
+      true,
+    );
     game.scene.applyModifiers(SpeciesStatBoosterModifier, true, partyMember, Stat.DEF, defValue);
 
     expect(defValue.value / defStat).toBe(2);
   }, 20000);
 
-  it("METAL_POWDER held by fused DITTO (base)", async() => {
-    await game.startBattle([
-      Species.DITTO,
-      Species.MAROWAK
-    ]);
+  it("METAL_POWDER held by fused DITTO (base)", async () => {
+    await game.startBattle([Species.DITTO, Species.MAROWAK]);
 
     const partyMember = game.scene.getPlayerParty()[0];
     const ally = game.scene.getPlayerParty()[1];
@@ -106,23 +122,23 @@ describe("Items - Metal Powder", () => {
     const defStat = partyMember.getStat(Stat.DEF);
 
     // Making sure modifier is not applied without holding item
-    const defValue = new Utils.NumberHolder(defStat);
+    const defValue = new NumberHolder(defStat);
     game.scene.applyModifiers(SpeciesStatBoosterModifier, true, partyMember, Stat.DEF, defValue);
 
     expect(defValue.value / defStat).toBe(1);
 
     // Giving Eviolite to party member and testing if it applies
-    game.scene.addModifier(modifierTypes.SPECIES_STAT_BOOSTER().generateType([], [ "METAL_POWDER" ])!.newModifier(partyMember), true);
+    await game.scene.addModifier(
+      modifierTypes.SPECIES_STAT_BOOSTER().generateType([], ["METAL_POWDER"])!.newModifier(partyMember),
+      true,
+    );
     game.scene.applyModifiers(SpeciesStatBoosterModifier, true, partyMember, Stat.DEF, defValue);
 
     expect(defValue.value / defStat).toBe(2);
   }, 20000);
 
-  it("METAL_POWDER held by fused DITTO (part)", async() => {
-    await game.startBattle([
-      Species.MAROWAK,
-      Species.DITTO
-    ]);
+  it("METAL_POWDER held by fused DITTO (part)", async () => {
+    await game.startBattle([Species.MAROWAK, Species.DITTO]);
 
     const partyMember = game.scene.getPlayerParty()[0];
     const ally = game.scene.getPlayerParty()[1];
@@ -139,35 +155,39 @@ describe("Items - Metal Powder", () => {
     const defStat = partyMember.getStat(Stat.DEF);
 
     // Making sure modifier is not applied without holding item
-    const defValue = new Utils.NumberHolder(defStat);
+    const defValue = new NumberHolder(defStat);
     game.scene.applyModifiers(SpeciesStatBoosterModifier, true, partyMember, Stat.DEF, defValue);
 
     expect(defValue.value / defStat).toBe(1);
 
     // Giving Eviolite to party member and testing if it applies
-    game.scene.addModifier(modifierTypes.SPECIES_STAT_BOOSTER().generateType([], [ "METAL_POWDER" ])!.newModifier(partyMember), true);
+    await game.scene.addModifier(
+      modifierTypes.SPECIES_STAT_BOOSTER().generateType([], ["METAL_POWDER"])!.newModifier(partyMember),
+      true,
+    );
     game.scene.applyModifiers(SpeciesStatBoosterModifier, true, partyMember, Stat.DEF, defValue);
 
     expect(defValue.value / defStat).toBe(2);
   }, 20000);
 
-  it("METAL_POWDER not held by DITTO", async() => {
-    await game.startBattle([
-      Species.MAROWAK
-    ]);
+  it("METAL_POWDER not held by DITTO", async () => {
+    await game.startBattle([Species.MAROWAK]);
 
     const partyMember = game.scene.getPlayerParty()[0];
 
     const defStat = partyMember.getStat(Stat.DEF);
 
     // Making sure modifier is not applied without holding item
-    const defValue = new Utils.NumberHolder(defStat);
+    const defValue = new NumberHolder(defStat);
     game.scene.applyModifiers(SpeciesStatBoosterModifier, true, partyMember, Stat.DEF, defValue);
 
     expect(defValue.value / defStat).toBe(1);
 
     // Giving Eviolite to party member and testing if it applies
-    game.scene.addModifier(modifierTypes.SPECIES_STAT_BOOSTER().generateType([], [ "METAL_POWDER" ])!.newModifier(partyMember), true);
+    await game.scene.addModifier(
+      modifierTypes.SPECIES_STAT_BOOSTER().generateType([], ["METAL_POWDER"])!.newModifier(partyMember),
+      true,
+    );
     game.scene.applyModifiers(SpeciesStatBoosterModifier, true, partyMember, Stat.DEF, defValue);
 
     expect(defValue.value / defStat).toBe(1);
diff --git a/src/test/items/multi_lens.test.ts b/test/items/multi_lens.test.ts
similarity index 68%
rename from src/test/items/multi_lens.test.ts
rename to test/items/multi_lens.test.ts
index bd586878fce..ff6154b8283 100644
--- a/src/test/items/multi_lens.test.ts
+++ b/test/items/multi_lens.test.ts
@@ -3,7 +3,7 @@ import { Stat } from "#enums/stat";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
@@ -24,10 +24,10 @@ describe("Items - Multi Lens", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     game.override
-      .moveset([ Moves.TACKLE, Moves.TRAILBLAZE, Moves.TACHYON_CUTTER, Moves.FUTURE_SIGHT ])
+      .moveset([Moves.TACKLE, Moves.TRAILBLAZE, Moves.TACHYON_CUTTER, Moves.FUTURE_SIGHT])
       .ability(Abilities.BALL_FETCH)
       .startingHeldItems([{ name: "MULTI_LENS" }])
-      .battleType("single")
+      .battleStyle("single")
       .disableCrits()
       .enemySpecies(Species.SNORLAX)
       .enemyAbility(Abilities.BALL_FETCH)
@@ -38,19 +38,20 @@ describe("Items - Multi Lens", () => {
 
   it.each([
     { stackCount: 1, firstHitDamage: 0.75 },
-    { stackCount: 2, firstHitDamage: 0.50 }
-  ])("$stackCount count: should deal {$firstHitDamage}x damage on the first hit, then hit $stackCount times for 0.25x",
+    { stackCount: 2, firstHitDamage: 0.5 },
+  ])(
+    "$stackCount count: should deal {$firstHitDamage}x damage on the first hit, then hit $stackCount times for 0.25x",
     async ({ stackCount, firstHitDamage }) => {
       game.override.startingHeldItems([{ name: "MULTI_LENS", count: stackCount }]);
 
-      await game.classicMode.startBattle([ Species.MAGIKARP ]);
+      await game.classicMode.startBattle([Species.MAGIKARP]);
 
       const enemyPokemon = game.scene.getEnemyPokemon()!;
       const spy = vi.spyOn(enemyPokemon, "getAttackDamage");
       vi.spyOn(enemyPokemon, "getBaseDamage").mockReturnValue(100);
 
       game.move.select(Moves.TACKLE);
-      await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]);
+      await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
 
       await game.phaseInterceptor.to("MoveEndPhase");
       const damageResults = spy.mock.results.map(result => result.value?.damage);
@@ -58,24 +59,25 @@ describe("Items - Multi Lens", () => {
       expect(damageResults).toHaveLength(1 + stackCount);
       expect(damageResults[0]).toBe(firstHitDamage * 100);
       damageResults.slice(1).forEach(dmg => expect(dmg).toBe(25));
-    });
+    },
+  );
 
   it("should stack additively with Parental Bond", async () => {
     game.override.ability(Abilities.PARENTAL_BOND);
 
-    await game.classicMode.startBattle([ Species.MAGIKARP ]);
+    await game.classicMode.startBattle([Species.MAGIKARP]);
 
     const playerPokemon = game.scene.getPlayerPokemon()!;
 
     game.move.select(Moves.TACKLE);
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
 
     await game.phaseInterceptor.to("MoveEndPhase");
     expect(playerPokemon.turnData.hitCount).toBe(3);
   });
 
   it("should apply secondary effects on each hit", async () => {
-    await game.classicMode.startBattle([ Species.MAGIKARP ]);
+    await game.classicMode.startBattle([Species.MAGIKARP]);
 
     const playerPokemon = game.scene.getPlayerPokemon()!;
 
@@ -86,7 +88,7 @@ describe("Items - Multi Lens", () => {
   });
 
   it("should not enhance multi-hit moves", async () => {
-    await game.classicMode.startBattle([ Species.MAGIKARP ]);
+    await game.classicMode.startBattle([Species.MAGIKARP]);
 
     const playerPokemon = game.scene.getPlayerPokemon()!;
 
@@ -97,18 +99,16 @@ describe("Items - Multi Lens", () => {
   });
 
   it("should enhance multi-target moves", async () => {
-    game.override
-      .battleType("double")
-      .moveset([ Moves.SWIFT, Moves.SPLASH ]);
+    game.override.battleStyle("double").moveset([Moves.SWIFT, Moves.SPLASH]);
 
-    await game.classicMode.startBattle([ Species.MAGIKARP, Species.FEEBAS ]);
+    await game.classicMode.startBattle([Species.MAGIKARP, Species.FEEBAS]);
 
-    const [ magikarp, ] = game.scene.getPlayerField();
+    const [magikarp] = game.scene.getPlayerField();
 
     game.move.select(Moves.SWIFT, 0);
     game.move.select(Moves.SPLASH, 1);
 
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2 ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2]);
 
     await game.phaseInterceptor.to("MoveEndPhase");
 
@@ -116,17 +116,16 @@ describe("Items - Multi Lens", () => {
   });
 
   it("should enhance fixed-damage moves while also applying damage reduction", async () => {
-    game.override.startingHeldItems([{ name: "MULTI_LENS", count: 1 }])
-      .moveset(Moves.SEISMIC_TOSS);
+    game.override.startingHeldItems([{ name: "MULTI_LENS", count: 1 }]).moveset(Moves.SEISMIC_TOSS);
 
-    await game.classicMode.startBattle([ Species.MAGIKARP ]);
+    await game.classicMode.startBattle([Species.MAGIKARP]);
 
     const playerPokemon = game.scene.getPlayerPokemon()!;
     const enemyPokemon = game.scene.getEnemyPokemon()!;
     const spy = vi.spyOn(enemyPokemon, "getAttackDamage");
 
     game.move.select(Moves.SEISMIC_TOSS);
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
 
     await game.phaseInterceptor.to("MoveEndPhase");
     const damageResults = spy.mock.results.map(result => result.value?.damage);
@@ -137,42 +136,45 @@ describe("Items - Multi Lens", () => {
   });
 
   it("should result in correct damage for hp% attacks with 1 lens", async () => {
-    game.override.startingHeldItems([{ name: "MULTI_LENS", count: 1 }])
+    game.override
+      .startingHeldItems([{ name: "MULTI_LENS", count: 1 }])
       .moveset(Moves.SUPER_FANG)
       .ability(Abilities.COMPOUND_EYES)
       .enemyLevel(1000)
       .enemySpecies(Species.BLISSEY); // allows for unrealistically high levels of accuracy
 
-    await game.classicMode.startBattle([ Species.MAGIKARP ]);
+    await game.classicMode.startBattle([Species.MAGIKARP]);
 
     const enemyPokemon = game.scene.getEnemyPokemon()!;
 
     game.move.select(Moves.SUPER_FANG);
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
     await game.phaseInterceptor.to("MoveEndPhase");
     expect(enemyPokemon.getHpRatio()).toBeCloseTo(0.5, 5);
   });
 
   it("should result in correct damage for hp% attacks with 2 lenses", async () => {
-    game.override.startingHeldItems([{ name: "MULTI_LENS", count: 2 }])
+    game.override
+      .startingHeldItems([{ name: "MULTI_LENS", count: 2 }])
       .moveset(Moves.SUPER_FANG)
       .ability(Abilities.COMPOUND_EYES)
       .enemyMoveset(Moves.SPLASH)
       .enemyLevel(1000)
       .enemySpecies(Species.BLISSEY); // allows for unrealistically high levels of accuracy
 
-    await game.classicMode.startBattle([ Species.MAGIKARP ]);
+    await game.classicMode.startBattle([Species.MAGIKARP]);
 
     const enemyPokemon = game.scene.getEnemyPokemon()!;
 
     game.move.select(Moves.SUPER_FANG);
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
     await game.phaseInterceptor.to("MoveEndPhase");
     expect(enemyPokemon.getHpRatio()).toBeCloseTo(0.5, 5);
   });
 
   it("should result in correct damage for hp% attacks with 2 lenses + Parental Bond", async () => {
-    game.override.startingHeldItems([{ name: "MULTI_LENS", count: 2 }])
+    game.override
+      .startingHeldItems([{ name: "MULTI_LENS", count: 2 }])
       .moveset(Moves.SUPER_FANG)
       .ability(Abilities.PARENTAL_BOND)
       .passiveAbility(Abilities.COMPOUND_EYES)
@@ -180,19 +182,19 @@ describe("Items - Multi Lens", () => {
       .enemyLevel(1000)
       .enemySpecies(Species.BLISSEY); // allows for unrealistically high levels of accuracy
 
-    await game.classicMode.startBattle([ Species.MAGIKARP ]);
+    await game.classicMode.startBattle([Species.MAGIKARP]);
 
     const enemyPokemon = game.scene.getEnemyPokemon()!;
 
     game.move.select(Moves.SUPER_FANG);
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
     await game.phaseInterceptor.to("MoveEndPhase");
     expect(enemyPokemon.getHpRatio()).toBeCloseTo(0.25, 5);
   });
 
   it("should not allow Future Sight to hit infinitely many times if the user switches out", async () => {
     game.override.enemyLevel(1000);
-    await game.classicMode.startBattle([ Species.BULBASAUR, Species.CHARMANDER, Species.SQUIRTLE ]);
+    await game.classicMode.startBattle([Species.BULBASAUR, Species.CHARMANDER, Species.SQUIRTLE]);
 
     const enemyPokemon = game.scene.getEnemyPokemon()!;
     vi.spyOn(enemyPokemon, "damageAndUpdate");
@@ -209,4 +211,21 @@ describe("Items - Multi Lens", () => {
     // TODO: Update hit count to 1 once Future Sight is fixed to not activate held items if user is off the field
     expect(enemyPokemon.damageAndUpdate).toHaveBeenCalledTimes(2);
   });
+
+  it("should not allow Pollen Puff to heal ally more than once", async () => {
+    game.override.battleStyle("double").moveset([Moves.POLLEN_PUFF, Moves.ENDURE]);
+    await game.classicMode.startBattle([Species.BULBASAUR, Species.OMANYTE]);
+
+    const [, rightPokemon] = game.scene.getPlayerField();
+
+    rightPokemon.damageAndUpdate(rightPokemon.hp - 1);
+
+    game.move.select(Moves.POLLEN_PUFF, 0, BattlerIndex.PLAYER_2);
+    game.move.select(Moves.ENDURE, 1);
+
+    await game.toNextTurn();
+
+    // Pollen Puff heals with a ratio of 0.5, as long as Pollen Puff triggers only once the pokemon will always be <= (0.5 * Max HP) + 1
+    expect(rightPokemon.hp).toBeLessThanOrEqual(0.5 * rightPokemon.getMaxHp() + 1);
+  });
 });
diff --git a/test/items/mystical_rock.test.ts b/test/items/mystical_rock.test.ts
new file mode 100644
index 00000000000..59119ce8611
--- /dev/null
+++ b/test/items/mystical_rock.test.ts
@@ -0,0 +1,60 @@
+import { globalScene } from "#app/global-scene";
+import { Moves } from "#enums/moves";
+import { Abilities } from "#enums/abilities";
+import { Species } from "#enums/species";
+import GameManager from "#test/testUtils/gameManager";
+import Phase from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
+
+describe("Items - Mystical Rock", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phase.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+
+    game.override
+      .enemySpecies(Species.SHUCKLE)
+      .enemyMoveset(Moves.SPLASH)
+      .enemyAbility(Abilities.BALL_FETCH)
+      .moveset([Moves.SUNNY_DAY, Moves.GRASSY_TERRAIN])
+      .startingHeldItems([{ name: "MYSTICAL_ROCK", count: 2 }])
+      .battleStyle("single");
+  });
+
+  it("should increase weather duration by +2 turns per stack", async () => {
+    await game.classicMode.startBattle([Species.GASTLY]);
+
+    game.move.select(Moves.SUNNY_DAY);
+
+    await game.phaseInterceptor.to("MoveEndPhase");
+
+    const weather = globalScene.arena.weather;
+
+    expect(weather).toBeDefined();
+    expect(weather!.turnsLeft).to.equal(9);
+  });
+
+  it("should increase terrain duration by +2 turns per stack", async () => {
+    await game.classicMode.startBattle([Species.GASTLY]);
+
+    game.move.select(Moves.GRASSY_TERRAIN);
+
+    await game.phaseInterceptor.to("MoveEndPhase");
+
+    const terrain = globalScene.arena.terrain;
+
+    expect(terrain).toBeDefined();
+    expect(terrain!.turnsLeft).to.equal(9);
+  });
+});
diff --git a/src/test/items/quick_powder.test.ts b/test/items/quick_powder.test.ts
similarity index 65%
rename from src/test/items/quick_powder.test.ts
rename to test/items/quick_powder.test.ts
index d30111cbd6a..d77f981f04d 100644
--- a/src/test/items/quick_powder.test.ts
+++ b/test/items/quick_powder.test.ts
@@ -2,9 +2,9 @@ import { Stat } from "#enums/stat";
 import { SpeciesStatBoosterModifier } from "#app/modifier/modifier";
 import { modifierTypes } from "#app/modifier/modifier-type";
 import i18next from "#app/plugins/i18n";
-import * as Utils from "#app/utils";
+import { NumberHolder } from "#app/utils/common";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phase from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
@@ -25,71 +25,87 @@ describe("Items - Quick Powder", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
 
-    game.override.battleType("single");
+    game.override.battleStyle("single");
   });
 
-  it("QUICK_POWDER activates in battle correctly", async() => {
+  it("QUICK_POWDER activates in battle correctly", async () => {
     game.override.startingHeldItems([{ name: "SPECIES_STAT_BOOSTER", type: "QUICK_POWDER" }]);
     const consoleSpy = vi.spyOn(console, "log");
-    await game.startBattle([
-      Species.DITTO
-    ]);
+    await game.classicMode.startBattle([Species.DITTO]);
 
     const partyMember = game.scene.getPlayerParty()[0];
 
     // Checking console log to make sure Quick Powder is applied when getEffectiveStat (with the appropriate stat) is called
     partyMember.getEffectiveStat(Stat.DEF);
-    expect(consoleSpy).not.toHaveBeenLastCalledWith("Applied", i18next.t("modifierType:SpeciesBoosterItem.QUICK_POWDER.name"), "");
+    expect(consoleSpy).not.toHaveBeenLastCalledWith(
+      "Applied",
+      i18next.t("modifierType:SpeciesBoosterItem.QUICK_POWDER.name"),
+      "",
+    );
 
     // Printing dummy console messages along the way so subsequent checks don't pass because of the first
     console.log("");
 
     partyMember.getEffectiveStat(Stat.SPDEF);
-    expect(consoleSpy).not.toHaveBeenLastCalledWith("Applied", i18next.t("modifierType:SpeciesBoosterItem.QUICK_POWDER.name"), "");
+    expect(consoleSpy).not.toHaveBeenLastCalledWith(
+      "Applied",
+      i18next.t("modifierType:SpeciesBoosterItem.QUICK_POWDER.name"),
+      "",
+    );
 
     console.log("");
 
     partyMember.getEffectiveStat(Stat.ATK);
-    expect(consoleSpy).not.toHaveBeenLastCalledWith("Applied", i18next.t("modifierType:SpeciesBoosterItem.QUICK_POWDER.name"), "");
+    expect(consoleSpy).not.toHaveBeenLastCalledWith(
+      "Applied",
+      i18next.t("modifierType:SpeciesBoosterItem.QUICK_POWDER.name"),
+      "",
+    );
 
     console.log("");
 
     partyMember.getEffectiveStat(Stat.SPATK);
-    expect(consoleSpy).not.toHaveBeenLastCalledWith("Applied", i18next.t("modifierType:SpeciesBoosterItem.QUICK_POWDER.name"), "");
+    expect(consoleSpy).not.toHaveBeenLastCalledWith(
+      "Applied",
+      i18next.t("modifierType:SpeciesBoosterItem.QUICK_POWDER.name"),
+      "",
+    );
 
     console.log("");
 
     partyMember.getEffectiveStat(Stat.SPD);
-    expect(consoleSpy).toHaveBeenLastCalledWith("Applied", i18next.t("modifierType:SpeciesBoosterItem.QUICK_POWDER.name"), "");
+    expect(consoleSpy).toHaveBeenLastCalledWith(
+      "Applied",
+      i18next.t("modifierType:SpeciesBoosterItem.QUICK_POWDER.name"),
+      "",
+    );
   });
 
-  it("QUICK_POWDER held by DITTO", async() => {
-    await game.startBattle([
-      Species.DITTO
-    ]);
+  it("QUICK_POWDER held by DITTO", async () => {
+    await game.classicMode.startBattle([Species.DITTO]);
 
     const partyMember = game.scene.getPlayerParty()[0];
 
     const spdStat = partyMember.getStat(Stat.SPD);
 
     // Making sure modifier is not applied without holding item
-    const spdValue = new Utils.NumberHolder(spdStat);
+    const spdValue = new NumberHolder(spdStat);
     game.scene.applyModifiers(SpeciesStatBoosterModifier, true, partyMember, Stat.SPD, spdValue);
 
     expect(spdValue.value / spdStat).toBe(1);
 
     // Giving Eviolite to party member and testing if it applies
-    game.scene.addModifier(modifierTypes.SPECIES_STAT_BOOSTER().generateType([], [ "QUICK_POWDER" ])!.newModifier(partyMember), true);
+    await game.scene.addModifier(
+      modifierTypes.SPECIES_STAT_BOOSTER().generateType([], ["QUICK_POWDER"])!.newModifier(partyMember),
+      true,
+    );
     game.scene.applyModifiers(SpeciesStatBoosterModifier, true, partyMember, Stat.SPD, spdValue);
 
     expect(spdValue.value / spdStat).toBe(2);
-  }, 20000);
+  });
 
-  it("QUICK_POWDER held by fused DITTO (base)", async() => {
-    await game.startBattle([
-      Species.DITTO,
-      Species.MAROWAK
-    ]);
+  it("QUICK_POWDER held by fused DITTO (base)", async () => {
+    await game.classicMode.startBattle([Species.DITTO, Species.MAROWAK]);
 
     const partyMember = game.scene.getPlayerParty()[0];
     const ally = game.scene.getPlayerParty()[1];
@@ -106,23 +122,23 @@ describe("Items - Quick Powder", () => {
     const spdStat = partyMember.getStat(Stat.SPD);
 
     // Making sure modifier is not applied without holding item
-    const spdValue = new Utils.NumberHolder(spdStat);
+    const spdValue = new NumberHolder(spdStat);
     game.scene.applyModifiers(SpeciesStatBoosterModifier, true, partyMember, Stat.SPD, spdValue);
 
     expect(spdValue.value / spdStat).toBe(1);
 
     // Giving Eviolite to party member and testing if it applies
-    game.scene.addModifier(modifierTypes.SPECIES_STAT_BOOSTER().generateType([], [ "QUICK_POWDER" ])!.newModifier(partyMember), true);
+    await game.scene.addModifier(
+      modifierTypes.SPECIES_STAT_BOOSTER().generateType([], ["QUICK_POWDER"])!.newModifier(partyMember),
+      true,
+    );
     game.scene.applyModifiers(SpeciesStatBoosterModifier, true, partyMember, Stat.SPD, spdValue);
 
     expect(spdValue.value / spdStat).toBe(2);
-  }, 20000);
+  });
 
-  it("QUICK_POWDER held by fused DITTO (part)", async() => {
-    await game.startBattle([
-      Species.MAROWAK,
-      Species.DITTO
-    ]);
+  it("QUICK_POWDER held by fused DITTO (part)", async () => {
+    await game.classicMode.startBattle([Species.MAROWAK, Species.DITTO]);
 
     const partyMember = game.scene.getPlayerParty()[0];
     const ally = game.scene.getPlayerParty()[1];
@@ -139,37 +155,41 @@ describe("Items - Quick Powder", () => {
     const spdStat = partyMember.getStat(Stat.SPD);
 
     // Making sure modifier is not applied without holding item
-    const spdValue = new Utils.NumberHolder(spdStat);
+    const spdValue = new NumberHolder(spdStat);
     game.scene.applyModifiers(SpeciesStatBoosterModifier, true, partyMember, Stat.SPD, spdValue);
 
     expect(spdValue.value / spdStat).toBe(1);
 
     // Giving Eviolite to party member and testing if it applies
-    game.scene.addModifier(modifierTypes.SPECIES_STAT_BOOSTER().generateType([], [ "QUICK_POWDER" ])!.newModifier(partyMember), true);
+    await game.scene.addModifier(
+      modifierTypes.SPECIES_STAT_BOOSTER().generateType([], ["QUICK_POWDER"])!.newModifier(partyMember),
+      true,
+    );
     game.scene.applyModifiers(SpeciesStatBoosterModifier, true, partyMember, Stat.SPD, spdValue);
 
     expect(spdValue.value / spdStat).toBe(2);
-  }, 20000);
+  });
 
-  it("QUICK_POWDER not held by DITTO", async() => {
-    await game.startBattle([
-      Species.MAROWAK
-    ]);
+  it("QUICK_POWDER not held by DITTO", async () => {
+    await game.classicMode.startBattle([Species.MAROWAK]);
 
     const partyMember = game.scene.getPlayerParty()[0];
 
     const spdStat = partyMember.getStat(Stat.SPD);
 
     // Making sure modifier is not applied without holding item
-    const spdValue = new Utils.NumberHolder(spdStat);
+    const spdValue = new NumberHolder(spdStat);
     game.scene.applyModifiers(SpeciesStatBoosterModifier, true, partyMember, Stat.SPD, spdValue);
 
     expect(spdValue.value / spdStat).toBe(1);
 
     // Giving Eviolite to party member and testing if it applies
-    game.scene.addModifier(modifierTypes.SPECIES_STAT_BOOSTER().generateType([], [ "QUICK_POWDER" ])!.newModifier(partyMember), true);
+    await game.scene.addModifier(
+      modifierTypes.SPECIES_STAT_BOOSTER().generateType([], ["QUICK_POWDER"])!.newModifier(partyMember),
+      true,
+    );
     game.scene.applyModifiers(SpeciesStatBoosterModifier, true, partyMember, Stat.SPD, spdValue);
 
     expect(spdValue.value / spdStat).toBe(1);
-  }, 20000);
+  });
 });
diff --git a/test/items/reviver_seed.test.ts b/test/items/reviver_seed.test.ts
new file mode 100644
index 00000000000..3c67481a904
--- /dev/null
+++ b/test/items/reviver_seed.test.ts
@@ -0,0 +1,153 @@
+import { BattlerIndex } from "#app/battle";
+import { allMoves } from "#app/data/moves/move";
+import { BattlerTagType } from "#app/enums/battler-tag-type";
+import type { PokemonInstantReviveModifier } from "#app/modifier/modifier";
+import { Abilities } from "#enums/abilities";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import GameManager from "#test/testUtils/gameManager";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
+
+describe("Items - Reviver Seed", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+    game.override
+      .moveset([Moves.SPLASH, Moves.TACKLE, Moves.ENDURE])
+      .ability(Abilities.BALL_FETCH)
+      .battleStyle("single")
+      .disableCrits()
+      .enemySpecies(Species.MAGIKARP)
+      .enemyAbility(Abilities.BALL_FETCH)
+      .startingHeldItems([{ name: "REVIVER_SEED" }])
+      .enemyHeldItems([{ name: "REVIVER_SEED" }])
+      .enemyMoveset(Moves.SPLASH);
+    vi.spyOn(allMoves[Moves.SHEER_COLD], "accuracy", "get").mockReturnValue(100);
+    vi.spyOn(allMoves[Moves.LEECH_SEED], "accuracy", "get").mockReturnValue(100);
+    vi.spyOn(allMoves[Moves.WHIRLPOOL], "accuracy", "get").mockReturnValue(100);
+    vi.spyOn(allMoves[Moves.WILL_O_WISP], "accuracy", "get").mockReturnValue(100);
+  });
+
+  it.each([
+    { moveType: "Special Move", move: Moves.WATER_GUN },
+    { moveType: "Physical Move", move: Moves.TACKLE },
+    { moveType: "Fixed Damage Move", move: Moves.SEISMIC_TOSS },
+    { moveType: "Final Gambit", move: Moves.FINAL_GAMBIT },
+    { moveType: "Counter", move: Moves.COUNTER },
+    { moveType: "OHKO", move: Moves.SHEER_COLD },
+  ])("should activate the holder's reviver seed from a $moveType", async ({ move }) => {
+    game.override.enemyLevel(100).startingLevel(1).enemyMoveset(move);
+    await game.classicMode.startBattle([Species.MAGIKARP, Species.FEEBAS]);
+    const player = game.scene.getPlayerPokemon()!;
+    player.damageAndUpdate(player.hp - 1);
+
+    const reviverSeed = player.getHeldItems()[0] as PokemonInstantReviveModifier;
+    vi.spyOn(reviverSeed, "apply");
+
+    game.move.select(Moves.TACKLE);
+    await game.phaseInterceptor.to("BerryPhase");
+
+    expect(player.isFainted()).toBeFalsy();
+  });
+
+  it("should activate the holder's reviver seed from confusion self-hit", async () => {
+    game.override.enemyLevel(1).startingLevel(100).enemyMoveset(Moves.SPLASH);
+    await game.classicMode.startBattle([Species.MAGIKARP, Species.FEEBAS]);
+    const player = game.scene.getPlayerPokemon()!;
+    player.damageAndUpdate(player.hp - 1);
+    player.addTag(BattlerTagType.CONFUSED, 3);
+
+    const reviverSeed = player.getHeldItems()[0] as PokemonInstantReviveModifier;
+    vi.spyOn(reviverSeed, "apply");
+
+    vi.spyOn(player, "randBattleSeedInt").mockReturnValue(0); // Force confusion self-hit
+    game.move.select(Moves.TACKLE);
+    await game.phaseInterceptor.to("BerryPhase");
+
+    expect(player.isFainted()).toBeFalsy();
+  });
+
+  // Damaging opponents tests
+  it.each([
+    { moveType: "Damaging Move Chip Damage", move: Moves.SALT_CURE },
+    { moveType: "Chip Damage", move: Moves.LEECH_SEED },
+    { moveType: "Trapping Chip Damage", move: Moves.WHIRLPOOL },
+    { moveType: "Status Effect Damage", move: Moves.WILL_O_WISP },
+    { moveType: "Weather", move: Moves.SANDSTORM },
+  ])("should not activate the holder's reviver seed from $moveType", async ({ move }) => {
+    game.override
+      .enemyLevel(1)
+      .startingLevel(100)
+      .enemySpecies(Species.MAGIKARP)
+      .moveset(move)
+      .enemyMoveset(Moves.ENDURE);
+    await game.classicMode.startBattle([Species.MAGIKARP, Species.FEEBAS]);
+    const enemy = game.scene.getEnemyPokemon()!;
+    enemy.damageAndUpdate(enemy.hp - 1);
+
+    game.move.select(move);
+    await game.phaseInterceptor.to("TurnEndPhase");
+
+    expect(enemy.isFainted()).toBeTruthy();
+  });
+
+  // Self-damage tests
+  it.each([
+    { moveType: "Recoil", move: Moves.DOUBLE_EDGE },
+    { moveType: "Self-KO", move: Moves.EXPLOSION },
+    { moveType: "Self-Deduction", move: Moves.CURSE },
+    { moveType: "Liquid Ooze", move: Moves.GIGA_DRAIN },
+  ])("should not activate the holder's reviver seed from $moveType", async ({ move }) => {
+    game.override
+      .enemyLevel(100)
+      .startingLevel(1)
+      .enemySpecies(Species.MAGIKARP)
+      .moveset(move)
+      .enemyAbility(Abilities.LIQUID_OOZE)
+      .enemyMoveset(Moves.SPLASH);
+    await game.classicMode.startBattle([Species.GASTLY, Species.FEEBAS]);
+    const player = game.scene.getPlayerPokemon()!;
+    player.damageAndUpdate(player.hp - 1);
+
+    const playerSeed = player.getHeldItems()[0] as PokemonInstantReviveModifier;
+    vi.spyOn(playerSeed, "apply");
+
+    game.move.select(move);
+    await game.phaseInterceptor.to("TurnEndPhase");
+
+    expect(player.isFainted()).toBeTruthy();
+  });
+
+  it("should not activate the holder's reviver seed from Destiny Bond fainting", async () => {
+    game.override
+      .enemyLevel(100)
+      .startingLevel(1)
+      .enemySpecies(Species.MAGIKARP)
+      .moveset(Moves.DESTINY_BOND)
+      .startingHeldItems([]) // reset held items to nothing so user doesn't revive and not trigger Destiny Bond
+      .enemyMoveset(Moves.TACKLE);
+    await game.classicMode.startBattle([Species.MAGIKARP, Species.FEEBAS]);
+    const player = game.scene.getPlayerPokemon()!;
+    player.damageAndUpdate(player.hp - 1);
+    const enemy = game.scene.getEnemyPokemon()!;
+
+    game.move.select(Moves.DESTINY_BOND);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
+    await game.phaseInterceptor.to("TurnEndPhase");
+
+    expect(enemy.isFainted()).toBeTruthy();
+  });
+});
diff --git a/src/test/items/scope_lens.test.ts b/test/items/scope_lens.test.ts
similarity index 84%
rename from src/test/items/scope_lens.test.ts
rename to test/items/scope_lens.test.ts
index e39517ceae9..f67966ea3c9 100644
--- a/src/test/items/scope_lens.test.ts
+++ b/test/items/scope_lens.test.ts
@@ -1,7 +1,7 @@
 import { TurnEndPhase } from "#app/phases/turn-end-phase";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phase from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
@@ -25,17 +25,13 @@ describe("Items - Scope Lens", () => {
     game.override
       .enemySpecies(Species.MAGIKARP)
       .enemyMoveset(Moves.SPLASH)
-      .moveset([ Moves.POUND ])
+      .moveset([Moves.POUND])
       .startingHeldItems([{ name: "SCOPE_LENS" }])
-      .battleType("single")
-      .disableCrits();
-
+      .battleStyle("single");
   }, 20000);
 
   it("should raise CRIT stage by 1", async () => {
-    await game.startBattle([
-      Species.GASTLY
-    ]);
+    await game.startBattle([Species.GASTLY]);
 
     const enemyPokemon = game.scene.getEnemyPokemon()!;
 
diff --git a/src/test/items/temp_stat_stage_booster.test.ts b/test/items/temp_stat_stage_booster.test.ts
similarity index 71%
rename from src/test/items/temp_stat_stage_booster.test.ts
rename to test/items/temp_stat_stage_booster.test.ts
index 3e496d1bbf8..a3cfc3256bb 100644
--- a/src/test/items/temp_stat_stage_booster.test.ts
+++ b/test/items/temp_stat_stage_booster.test.ts
@@ -1,5 +1,5 @@
 import { BATTLE_STATS, Stat } from "#enums/stat";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import { Species } from "#enums/species";
 import Phase from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
@@ -7,12 +7,11 @@ import { Moves } from "#app/enums/moves";
 import { TurnEndPhase } from "#app/phases/turn-end-phase";
 import { Abilities } from "#app/enums/abilities";
 import { TempStatStageBoosterModifier } from "#app/modifier/modifier";
-import { Mode } from "#app/ui/ui";
+import { UiMode } from "#enums/ui-mode";
 import { Button } from "#app/enums/buttons";
 import type ModifierSelectUiHandler from "#app/ui/modifier-select-ui-handler";
 import { ShopCursorTarget } from "#app/enums/shop-cursor-target";
 
-
 describe("Items - Temporary Stat Stage Boosters", () => {
   let phaserGame: Phaser.Game;
   let game: GameManager;
@@ -31,18 +30,16 @@ describe("Items - Temporary Stat Stage Boosters", () => {
     game = new GameManager(phaserGame);
 
     game.override
-      .battleType("single")
+      .battleStyle("single")
       .enemySpecies(Species.SHUCKLE)
       .enemyMoveset(Moves.SPLASH)
       .enemyAbility(Abilities.BALL_FETCH)
-      .moveset([ Moves.TACKLE, Moves.SPLASH, Moves.HONE_CLAWS, Moves.BELLY_DRUM ])
+      .moveset([Moves.TACKLE, Moves.SPLASH, Moves.HONE_CLAWS, Moves.BELLY_DRUM])
       .startingModifier([{ name: "TEMP_STAT_STAGE_BOOSTER", type: Stat.ATK }]);
   });
 
-  it("should provide a x1.3 stat stage multiplier", async() => {
-    await game.classicMode.startBattle([
-      Species.PIKACHU
-    ]);
+  it("should provide a x1.3 stat stage multiplier", async () => {
+    await game.classicMode.startBattle([Species.PIKACHU]);
 
     const partyMember = game.scene.getPlayerPokemon()!;
 
@@ -55,14 +52,10 @@ describe("Items - Temporary Stat Stage Boosters", () => {
     expect(partyMember.getStatStageMultiplier).toHaveReturnedWith(1.3);
   }, 20000);
 
-  it("should increase existing ACC stat stage by 1 for X_ACCURACY only", async() => {
-    game.override
-      .startingModifier([{ name: "TEMP_STAT_STAGE_BOOSTER", type: Stat.ACC }])
-      .ability(Abilities.SIMPLE);
+  it("should increase existing ACC stat stage by 1 for X_ACCURACY only", async () => {
+    game.override.startingModifier([{ name: "TEMP_STAT_STAGE_BOOSTER", type: Stat.ACC }]).ability(Abilities.SIMPLE);
 
-    await game.classicMode.startBattle([
-      Species.PIKACHU
-    ]);
+    await game.classicMode.startBattle([Species.PIKACHU]);
 
     const partyMember = game.scene.getPlayerPokemon()!;
 
@@ -81,11 +74,8 @@ describe("Items - Temporary Stat Stage Boosters", () => {
     expect(partyMember.getAccuracyMultiplier).toHaveReturnedWith(2);
   }, 20000);
 
-
-  it("should increase existing stat stage multiplier by 3/10 for the rest of the boosters", async() => {
-    await game.classicMode.startBattle([
-      Species.PIKACHU
-    ]);
+  it("should increase existing stat stage multiplier by 3/10 for the rest of the boosters", async () => {
+    await game.classicMode.startBattle([Species.PIKACHU]);
 
     const partyMember = game.scene.getPlayerPokemon()!;
 
@@ -104,13 +94,14 @@ describe("Items - Temporary Stat Stage Boosters", () => {
     expect(partyMember.getStatStageMultiplier).toHaveReturnedWith(1.8);
   }, 20000);
 
-  it("should not increase past maximum stat stage multiplier", async() => {
-    game.override.startingModifier([{ name: "TEMP_STAT_STAGE_BOOSTER", type: Stat.ACC }, { name: "TEMP_STAT_STAGE_BOOSTER", type: Stat.ATK }]);
-
-    await game.classicMode.startBattle([
-      Species.PIKACHU
+  it("should not increase past maximum stat stage multiplier", async () => {
+    game.override.startingModifier([
+      { name: "TEMP_STAT_STAGE_BOOSTER", type: Stat.ACC },
+      { name: "TEMP_STAT_STAGE_BOOSTER", type: Stat.ATK },
     ]);
 
+    await game.classicMode.startBattle([Species.PIKACHU]);
+
     const partyMember = game.scene.getPlayerPokemon()!;
 
     vi.spyOn(partyMember, "getStatStageMultiplier");
@@ -127,14 +118,10 @@ describe("Items - Temporary Stat Stage Boosters", () => {
     expect(partyMember.getStatStageMultiplier).toHaveReturnedWith(4);
   }, 20000);
 
-  it("should renew how many battles are left of existing booster when picking up new booster of same type", async() => {
-    game.override
-      .startingLevel(200)
-      .itemRewards([{ name: "TEMP_STAT_STAGE_BOOSTER", type: Stat.ATK }]);
+  it("should renew how many battles are left of existing booster when picking up new booster of same type", async () => {
+    game.override.startingLevel(200).itemRewards([{ name: "TEMP_STAT_STAGE_BOOSTER", type: Stat.ATK }]);
 
-    await game.classicMode.startBattle([
-      Species.PIKACHU
-    ]);
+    await game.classicMode.startBattle([Species.PIKACHU]);
 
     game.move.select(Moves.SPLASH);
 
@@ -142,17 +129,25 @@ describe("Items - Temporary Stat Stage Boosters", () => {
 
     await game.phaseInterceptor.to("BattleEndPhase");
 
-    const modifier = game.scene.findModifier(m => m instanceof TempStatStageBoosterModifier) as TempStatStageBoosterModifier;
+    const modifier = game.scene.findModifier(
+      m => m instanceof TempStatStageBoosterModifier,
+    ) as TempStatStageBoosterModifier;
     expect(modifier.getBattleCount()).toBe(4);
 
     // Forced X_ATTACK to spawn in the first slot with override
-    game.onNextPrompt("SelectModifierPhase", Mode.MODIFIER_SELECT, () => {
-      const handler = game.scene.ui.getHandler() as ModifierSelectUiHandler;
-      // Traverse to first modifier slot
-      handler.setCursor(0);
-      handler.setRowCursor(ShopCursorTarget.REWARDS);
-      handler.processInput(Button.ACTION);
-    }, () => game.isCurrentPhase("CommandPhase") || game.isCurrentPhase("NewBattlePhase"), true);
+    game.onNextPrompt(
+      "SelectModifierPhase",
+      UiMode.MODIFIER_SELECT,
+      () => {
+        const handler = game.scene.ui.getHandler() as ModifierSelectUiHandler;
+        // Traverse to first modifier slot
+        handler.setCursor(0);
+        handler.setRowCursor(ShopCursorTarget.REWARDS);
+        handler.processInput(Button.ACTION);
+      },
+      () => game.isCurrentPhase("CommandPhase") || game.isCurrentPhase("NewBattlePhase"),
+      true,
+    );
 
     await game.phaseInterceptor.to("TurnInitPhase");
 
diff --git a/src/test/items/thick_club.test.ts b/test/items/thick_club.test.ts
similarity index 62%
rename from src/test/items/thick_club.test.ts
rename to test/items/thick_club.test.ts
index 08b19250ea7..2a63a60a0e6 100644
--- a/src/test/items/thick_club.test.ts
+++ b/test/items/thick_club.test.ts
@@ -2,9 +2,9 @@ import { Stat } from "#enums/stat";
 import { SpeciesStatBoosterModifier } from "#app/modifier/modifier";
 import { modifierTypes } from "#app/modifier/modifier-type";
 import i18next from "#app/plugins/i18n";
-import * as Utils from "#app/utils";
+import { NumberHolder, randInt } from "#app/utils/common";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phase from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
@@ -25,119 +25,137 @@ describe("Items - Thick Club", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
 
-    game.override.battleType("single");
+    game.override.battleStyle("single");
   });
 
-  it("THICK_CLUB activates in battle correctly", async() => {
+  it("THICK_CLUB activates in battle correctly", async () => {
     game.override.startingHeldItems([{ name: "SPECIES_STAT_BOOSTER", type: "THICK_CLUB" }]);
     const consoleSpy = vi.spyOn(console, "log");
-    await game.startBattle([
-      Species.CUBONE
-    ]);
+    await game.classicMode.startBattle([Species.CUBONE]);
 
     const partyMember = game.scene.getPlayerParty()[0];
 
     // Checking console log to make sure Thick Club is applied when getEffectiveStat (with the appropriate stat) is called
     partyMember.getEffectiveStat(Stat.DEF);
-    expect(consoleSpy).not.toHaveBeenLastCalledWith("Applied", i18next.t("modifierType:SpeciesBoosterItem.THICK_CLUB.name"), "");
+    expect(consoleSpy).not.toHaveBeenLastCalledWith(
+      "Applied",
+      i18next.t("modifierType:SpeciesBoosterItem.THICK_CLUB.name"),
+      "",
+    );
 
     // Printing dummy console messages along the way so subsequent checks don't pass because of the first
     console.log("");
 
     partyMember.getEffectiveStat(Stat.SPDEF);
-    expect(consoleSpy).not.toHaveBeenLastCalledWith("Applied", i18next.t("modifierType:SpeciesBoosterItem.THICK_CLUB.name"), "");
+    expect(consoleSpy).not.toHaveBeenLastCalledWith(
+      "Applied",
+      i18next.t("modifierType:SpeciesBoosterItem.THICK_CLUB.name"),
+      "",
+    );
 
     console.log("");
 
     partyMember.getEffectiveStat(Stat.ATK);
-    expect(consoleSpy).toHaveBeenLastCalledWith("Applied", i18next.t("modifierType:SpeciesBoosterItem.THICK_CLUB.name"), "");
+    expect(consoleSpy).toHaveBeenLastCalledWith(
+      "Applied",
+      i18next.t("modifierType:SpeciesBoosterItem.THICK_CLUB.name"),
+      "",
+    );
 
     console.log("");
 
     partyMember.getEffectiveStat(Stat.SPATK);
-    expect(consoleSpy).not.toHaveBeenLastCalledWith("Applied", i18next.t("modifierType:SpeciesBoosterItem.THICK_CLUB.name"), "");
+    expect(consoleSpy).not.toHaveBeenLastCalledWith(
+      "Applied",
+      i18next.t("modifierType:SpeciesBoosterItem.THICK_CLUB.name"),
+      "",
+    );
 
     console.log("");
 
     partyMember.getEffectiveStat(Stat.SPD);
-    expect(consoleSpy).not.toHaveBeenLastCalledWith("Applied", i18next.t("modifierType:SpeciesBoosterItem.THICK_CLUB.name"), "");
+    expect(consoleSpy).not.toHaveBeenLastCalledWith(
+      "Applied",
+      i18next.t("modifierType:SpeciesBoosterItem.THICK_CLUB.name"),
+      "",
+    );
   });
 
-  it("THICK_CLUB held by CUBONE", async() => {
-    await game.startBattle([
-      Species.CUBONE
-    ]);
+  it("THICK_CLUB held by CUBONE", async () => {
+    await game.classicMode.startBattle([Species.CUBONE]);
 
     const partyMember = game.scene.getPlayerParty()[0];
 
     const atkStat = partyMember.getStat(Stat.ATK);
 
     // Making sure modifier is not applied without holding item
-    const atkValue = new Utils.NumberHolder(atkStat);
+    const atkValue = new NumberHolder(atkStat);
     game.scene.applyModifiers(SpeciesStatBoosterModifier, true, partyMember, Stat.ATK, atkValue);
 
     expect(atkValue.value / atkStat).toBe(1);
 
     // Giving Eviolite to party member and testing if it applies
-    game.scene.addModifier(modifierTypes.SPECIES_STAT_BOOSTER().generateType([], [ "THICK_CLUB" ])!.newModifier(partyMember), true);
+    await game.scene.addModifier(
+      modifierTypes.SPECIES_STAT_BOOSTER().generateType([], ["THICK_CLUB"])!.newModifier(partyMember),
+      true,
+    );
     game.scene.applyModifiers(SpeciesStatBoosterModifier, true, partyMember, Stat.ATK, atkValue);
 
     expect(atkValue.value / atkStat).toBe(2);
-  }, 20000);
+  });
 
-  it("THICK_CLUB held by MAROWAK", async() => {
-    await game.startBattle([
-      Species.MAROWAK
-    ]);
+  it("THICK_CLUB held by MAROWAK", async () => {
+    await game.classicMode.startBattle([Species.MAROWAK]);
 
     const partyMember = game.scene.getPlayerParty()[0];
 
     const atkStat = partyMember.getStat(Stat.ATK);
 
     // Making sure modifier is not applied without holding item
-    const atkValue = new Utils.NumberHolder(atkStat);
+    const atkValue = new NumberHolder(atkStat);
     game.scene.applyModifiers(SpeciesStatBoosterModifier, true, partyMember, Stat.ATK, atkValue);
 
     expect(atkValue.value / atkStat).toBe(1);
 
     // Giving Eviolite to party member and testing if it applies
-    game.scene.addModifier(modifierTypes.SPECIES_STAT_BOOSTER().generateType([], [ "THICK_CLUB" ])!.newModifier(partyMember), true);
+    await game.scene.addModifier(
+      modifierTypes.SPECIES_STAT_BOOSTER().generateType([], ["THICK_CLUB"])!.newModifier(partyMember),
+      true,
+    );
     game.scene.applyModifiers(SpeciesStatBoosterModifier, true, partyMember, Stat.ATK, atkValue);
 
     expect(atkValue.value / atkStat).toBe(2);
-  }, 20000);
+  });
 
-  it("THICK_CLUB held by ALOLA_MAROWAK", async() => {
-    await game.startBattle([
-      Species.ALOLA_MAROWAK
-    ]);
+  it("THICK_CLUB held by ALOLA_MAROWAK", async () => {
+    await game.classicMode.startBattle([Species.ALOLA_MAROWAK]);
 
     const partyMember = game.scene.getPlayerParty()[0];
 
     const atkStat = partyMember.getStat(Stat.ATK);
 
     // Making sure modifier is not applied without holding item
-    const atkValue = new Utils.NumberHolder(atkStat);
+    const atkValue = new NumberHolder(atkStat);
     game.scene.applyModifiers(SpeciesStatBoosterModifier, true, partyMember, Stat.ATK, atkValue);
 
     expect(atkValue.value / atkStat).toBe(1);
 
     // Giving Eviolite to party member and testing if it applies
-    game.scene.addModifier(modifierTypes.SPECIES_STAT_BOOSTER().generateType([], [ "THICK_CLUB" ])!.newModifier(partyMember), true);
+    await game.scene.addModifier(
+      modifierTypes.SPECIES_STAT_BOOSTER().generateType([], ["THICK_CLUB"])!.newModifier(partyMember),
+      true,
+    );
     game.scene.applyModifiers(SpeciesStatBoosterModifier, true, partyMember, Stat.ATK, atkValue);
 
     expect(atkValue.value / atkStat).toBe(2);
-  }, 20000);
+  });
 
-  it("THICK_CLUB held by fused CUBONE line (base)", async() => {
+  it("THICK_CLUB held by fused CUBONE line (base)", async () => {
     // Randomly choose from the Cubone line
-    const species = [ Species.CUBONE, Species.MAROWAK, Species.ALOLA_MAROWAK ];
-    const randSpecies = Utils.randInt(species.length);
+    const species = [Species.CUBONE, Species.MAROWAK, Species.ALOLA_MAROWAK];
+    const randSpecies = randInt(species.length);
 
-    await game.startBattle([
-      species[randSpecies],
-      Species.PIKACHU
-    ]);
+    await game.classicMode.startBattle([species[randSpecies], Species.PIKACHU]);
 
     const partyMember = game.scene.getPlayerParty()[0];
     const ally = game.scene.getPlayerParty()[1];
@@ -154,27 +172,27 @@ describe("Items - Thick Club", () => {
     const atkStat = partyMember.getStat(Stat.ATK);
 
     // Making sure modifier is not applied without holding item
-    const atkValue = new Utils.NumberHolder(atkStat);
+    const atkValue = new NumberHolder(atkStat);
     game.scene.applyModifiers(SpeciesStatBoosterModifier, true, partyMember, Stat.ATK, atkValue);
 
     expect(atkValue.value / atkStat).toBe(1);
 
     // Giving Eviolite to party member and testing if it applies
-    game.scene.addModifier(modifierTypes.SPECIES_STAT_BOOSTER().generateType([], [ "THICK_CLUB" ])!.newModifier(partyMember), true);
+    await game.scene.addModifier(
+      modifierTypes.SPECIES_STAT_BOOSTER().generateType([], ["THICK_CLUB"])!.newModifier(partyMember),
+      true,
+    );
     game.scene.applyModifiers(SpeciesStatBoosterModifier, true, partyMember, Stat.ATK, atkValue);
 
     expect(atkValue.value / atkStat).toBe(2);
-  }, 20000);
+  });
 
-  it("THICK_CLUB held by fused CUBONE line (part)", async() => {
+  it("THICK_CLUB held by fused CUBONE line (part)", async () => {
     // Randomly choose from the Cubone line
-    const species = [ Species.CUBONE, Species.MAROWAK, Species.ALOLA_MAROWAK ];
-    const randSpecies = Utils.randInt(species.length);
+    const species = [Species.CUBONE, Species.MAROWAK, Species.ALOLA_MAROWAK];
+    const randSpecies = randInt(species.length);
 
-    await game.startBattle([
-      Species.PIKACHU,
-      species[randSpecies]
-    ]);
+    await game.classicMode.startBattle([Species.PIKACHU, species[randSpecies]]);
 
     const partyMember = game.scene.getPlayerParty()[0];
     const ally = game.scene.getPlayerParty()[1];
@@ -191,37 +209,41 @@ describe("Items - Thick Club", () => {
     const atkStat = partyMember.getStat(Stat.ATK);
 
     // Making sure modifier is not applied without holding item
-    const atkValue = new Utils.NumberHolder(atkStat);
+    const atkValue = new NumberHolder(atkStat);
     game.scene.applyModifiers(SpeciesStatBoosterModifier, true, partyMember, Stat.ATK, atkValue);
 
     expect(atkValue.value / atkStat).toBe(1);
 
     // Giving Eviolite to party member and testing if it applies
-    game.scene.addModifier(modifierTypes.SPECIES_STAT_BOOSTER().generateType([], [ "THICK_CLUB" ])!.newModifier(partyMember), true);
+    await game.scene.addModifier(
+      modifierTypes.SPECIES_STAT_BOOSTER().generateType([], ["THICK_CLUB"])!.newModifier(partyMember),
+      true,
+    );
     game.scene.applyModifiers(SpeciesStatBoosterModifier, true, partyMember, Stat.ATK, atkValue);
 
     expect(atkValue.value / atkStat).toBe(2);
-  }, 20000);
+  });
 
-  it("THICK_CLUB not held by CUBONE", async() => {
-    await game.startBattle([
-      Species.PIKACHU
-    ]);
+  it("THICK_CLUB not held by CUBONE", async () => {
+    await game.classicMode.startBattle([Species.PIKACHU]);
 
     const partyMember = game.scene.getPlayerParty()[0];
 
     const atkStat = partyMember.getStat(Stat.ATK);
 
     // Making sure modifier is not applied without holding item
-    const atkValue = new Utils.NumberHolder(atkStat);
+    const atkValue = new NumberHolder(atkStat);
     game.scene.applyModifiers(SpeciesStatBoosterModifier, true, partyMember, Stat.ATK, atkValue);
 
     expect(atkValue.value / atkStat).toBe(1);
 
     // Giving Eviolite to party member and testing if it applies
-    game.scene.addModifier(modifierTypes.SPECIES_STAT_BOOSTER().generateType([], [ "THICK_CLUB" ])!.newModifier(partyMember), true);
+    await game.scene.addModifier(
+      modifierTypes.SPECIES_STAT_BOOSTER().generateType([], ["THICK_CLUB"])!.newModifier(partyMember),
+      true,
+    );
     game.scene.applyModifiers(SpeciesStatBoosterModifier, true, partyMember, Stat.ATK, atkValue);
 
     expect(atkValue.value / atkStat).toBe(1);
-  }, 20000);
+  });
 });
diff --git a/src/test/items/toxic_orb.test.ts b/test/items/toxic_orb.test.ts
similarity index 86%
rename from src/test/items/toxic_orb.test.ts
rename to test/items/toxic_orb.test.ts
index 6918d7f34f0..d02679e17c1 100644
--- a/src/test/items/toxic_orb.test.ts
+++ b/test/items/toxic_orb.test.ts
@@ -3,7 +3,7 @@ import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { StatusEffect } from "#enums/status-effect";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
@@ -24,21 +24,23 @@ describe("Items - Toxic orb", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     game.override
-      .battleType("single")
+      .battleStyle("single")
       .enemySpecies(Species.MAGIKARP)
       .ability(Abilities.BALL_FETCH)
       .enemyAbility(Abilities.BALL_FETCH)
       .moveset(Moves.SPLASH)
       .enemyMoveset(Moves.SPLASH)
-      .startingHeldItems([{
-        name: "TOXIC_ORB",
-      }]);
+      .startingHeldItems([
+        {
+          name: "TOXIC_ORB",
+        },
+      ]);
 
     vi.spyOn(i18next, "t");
   });
 
   it("should badly poison the holder", async () => {
-    await game.classicMode.startBattle([ Species.FEEBAS ]);
+    await game.classicMode.startBattle([Species.FEEBAS]);
 
     const player = game.scene.getPlayerPokemon()!;
     expect(player.getHeldItems()[0].type.id).toBe("TOXIC_ORB");
diff --git a/src/test/misc.test.ts b/test/misc.test.ts
similarity index 75%
rename from src/test/misc.test.ts
rename to test/misc.test.ts
index ae91a5014d9..12ed165d9d9 100644
--- a/src/test/misc.test.ts
+++ b/test/misc.test.ts
@@ -1,6 +1,6 @@
 // import { apiFetch } from "#app/utils";
-import GameManager from "#test/utils/gameManager";
-import { waitUntil } from "#test/utils/gameManagerUtils";
+import GameManager from "#test/testUtils/gameManager";
+import { waitUntil } from "#test/testUtils/gameManagerUtils";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
@@ -24,14 +24,16 @@ describe("Test misc", () => {
 
   it("test fetch mock async", async () => {
     const spy = vi.fn();
-    await fetch("https://localhost:8080/account/info").then(response => {
-      expect(response.status).toBe(200);
-      expect(response.ok).toBe(true);
-      return response.json();
-    }).then(data => {
-      spy(); // Call the spy function
-      expect(data).toEqual({ "username": "greenlamp", "lastSessionSlot": 0 });
-    });
+    await fetch("https://localhost:8080/account/info")
+      .then(response => {
+        expect(response.status).toBe(200);
+        expect(response.ok).toBe(true);
+        return response.json();
+      })
+      .then(data => {
+        spy(); // Call the spy function
+        expect(data).toEqual({ username: "greenlamp", lastSessionSlot: 0 });
+      });
     expect(spy).toHaveBeenCalled();
   });
 
@@ -54,7 +56,7 @@ describe("Test misc", () => {
 
     expect(response.ok).toBe(true);
     expect(response.status).toBe(200);
-    expect(data).toEqual({ "username": "greenlamp", "lastSessionSlot": 0 });
+    expect(data).toEqual({ username: "greenlamp", lastSessionSlot: 0 });
   });
 
   it("test apifetch mock sync", async () => {
@@ -64,7 +66,7 @@ describe("Test misc", () => {
 
   it("testing wait phase queue", async () => {
     const fakeScene = {
-      phaseQueue: [ 1, 2, 3 ] // Initially not empty
+      phaseQueue: [1, 2, 3], // Initially not empty
     };
     setTimeout(() => {
       fakeScene.phaseQueue = [];
diff --git a/src/test/moves/after_you.test.ts b/test/moves/after_you.test.ts
similarity index 86%
rename from src/test/moves/after_you.test.ts
rename to test/moves/after_you.test.ts
index 99f383194aa..3fa7c9ceb0a 100644
--- a/src/test/moves/after_you.test.ts
+++ b/test/moves/after_you.test.ts
@@ -4,11 +4,10 @@ import { MoveResult } from "#app/field/pokemon";
 import { MovePhase } from "#app/phases/move-phase";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
-
 describe("Moves - After You", () => {
   let phaserGame: Phaser.Game;
   let game: GameManager;
@@ -26,17 +25,17 @@ describe("Moves - After You", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     game.override
-      .battleType("double")
+      .battleStyle("double")
       .enemyLevel(5)
       .enemySpecies(Species.PIKACHU)
       .enemyAbility(Abilities.BALL_FETCH)
       .enemyMoveset(Moves.SPLASH)
       .ability(Abilities.BALL_FETCH)
-      .moveset([ Moves.AFTER_YOU, Moves.SPLASH ]);
+      .moveset([Moves.AFTER_YOU, Moves.SPLASH]);
   });
 
   it("makes the target move immediately after the user", async () => {
-    await game.classicMode.startBattle([ Species.REGIELEKI, Species.SHUCKLE ]);
+    await game.classicMode.startBattle([Species.REGIELEKI, Species.SHUCKLE]);
 
     game.move.select(Moves.AFTER_YOU, 0, BattlerIndex.PLAYER_2);
     game.move.select(Moves.SPLASH, 1);
@@ -50,7 +49,7 @@ describe("Moves - After You", () => {
 
   it("fails if target already moved", async () => {
     game.override.enemySpecies(Species.SHUCKLE);
-    await game.classicMode.startBattle([ Species.REGIELEKI, Species.PIKACHU ]);
+    await game.classicMode.startBattle([Species.REGIELEKI, Species.PIKACHU]);
 
     game.move.select(Moves.SPLASH);
     game.move.select(Moves.AFTER_YOU, 1, BattlerIndex.PLAYER);
diff --git a/src/test/moves/alluring_voice.test.ts b/test/moves/alluring_voice.test.ts
similarity index 85%
rename from src/test/moves/alluring_voice.test.ts
rename to test/moves/alluring_voice.test.ts
index 2980f102735..240e008f311 100644
--- a/src/test/moves/alluring_voice.test.ts
+++ b/test/moves/alluring_voice.test.ts
@@ -4,11 +4,10 @@ import { BattlerTagType } from "#app/enums/battler-tag-type";
 import { BerryPhase } from "#app/phases/berry-phase";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
-
 describe("Moves - Alluring Voice", () => {
   let phaserGame: Phaser.Game;
   let game: GameManager;
@@ -26,17 +25,16 @@ describe("Moves - Alluring Voice", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     game.override
-      .battleType("single")
+      .battleStyle("single")
       .disableCrits()
       .enemySpecies(Species.MAGIKARP)
       .enemyAbility(Abilities.ICE_SCALES)
-      .enemyMoveset([ Moves.HOWL ])
+      .enemyMoveset([Moves.HOWL])
       .startingLevel(10)
       .enemyLevel(10)
       .starterSpecies(Species.FEEBAS)
       .ability(Abilities.BALL_FETCH)
-      .moveset([ Moves.ALLURING_VOICE ]);
-
+      .moveset([Moves.ALLURING_VOICE]);
   });
 
   it("should confuse the opponent if their stat stages were raised", async () => {
@@ -45,7 +43,7 @@ describe("Moves - Alluring Voice", () => {
     const enemy = game.scene.getEnemyPokemon()!;
 
     game.move.select(Moves.ALLURING_VOICE);
-    await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
     await game.phaseInterceptor.to(BerryPhase);
 
     expect(enemy.getTag(BattlerTagType.CONFUSED)?.tagType).toBe("CONFUSED");
diff --git a/src/test/moves/aromatherapy.test.ts b/test/moves/aromatherapy.test.ts
similarity index 83%
rename from src/test/moves/aromatherapy.test.ts
rename to test/moves/aromatherapy.test.ts
index 874dadc0a1f..c361f4e8bbd 100644
--- a/src/test/moves/aromatherapy.test.ts
+++ b/test/moves/aromatherapy.test.ts
@@ -3,7 +3,7 @@ import { CommandPhase } from "#app/phases/command-phase";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, it, expect, vi } from "vitest";
 
@@ -24,16 +24,16 @@ describe("Moves - Aromatherapy", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     game.override
-      .moveset([ Moves.AROMATHERAPY, Moves.SPLASH ])
+      .moveset([Moves.AROMATHERAPY, Moves.SPLASH])
       .statusEffect(StatusEffect.BURN)
-      .battleType("double")
+      .battleStyle("double")
       .enemyAbility(Abilities.BALL_FETCH)
       .enemyMoveset(Moves.SPLASH);
   });
 
   it("should cure status effect of the user, its ally, and all party pokemon", async () => {
-    await game.classicMode.startBattle([ Species.RATTATA, Species.RATTATA, Species.RATTATA ]);
-    const [ leftPlayer, rightPlayer, partyPokemon ] = game.scene.getPlayerParty();
+    await game.classicMode.startBattle([Species.RATTATA, Species.RATTATA, Species.RATTATA]);
+    const [leftPlayer, rightPlayer, partyPokemon] = game.scene.getPlayerParty();
 
     vi.spyOn(leftPlayer, "resetStatus");
     vi.spyOn(rightPlayer, "resetStatus");
@@ -55,8 +55,8 @@ describe("Moves - Aromatherapy", () => {
 
   it("should not cure status effect of the target/target's allies", async () => {
     game.override.enemyStatusEffect(StatusEffect.BURN);
-    await game.classicMode.startBattle([ Species.RATTATA, Species.RATTATA ]);
-    const [ leftOpp, rightOpp ] = game.scene.getEnemyField();
+    await game.classicMode.startBattle([Species.RATTATA, Species.RATTATA]);
+    const [leftOpp, rightOpp] = game.scene.getEnemyField();
 
     vi.spyOn(leftOpp, "resetStatus");
     vi.spyOn(rightOpp, "resetStatus");
@@ -78,8 +78,8 @@ describe("Moves - Aromatherapy", () => {
 
   it("should not cure status effect of allies ON FIELD with Sap Sipper, should still cure allies in party", async () => {
     game.override.ability(Abilities.SAP_SIPPER);
-    await game.classicMode.startBattle([ Species.RATTATA, Species.RATTATA, Species.RATTATA ]);
-    const [ leftPlayer, rightPlayer, partyPokemon ] = game.scene.getPlayerParty();
+    await game.classicMode.startBattle([Species.RATTATA, Species.RATTATA, Species.RATTATA]);
+    const [leftPlayer, rightPlayer, partyPokemon] = game.scene.getPlayerParty();
 
     vi.spyOn(leftPlayer, "resetStatus");
     vi.spyOn(rightPlayer, "resetStatus");
diff --git a/src/test/moves/assist.test.ts b/test/moves/assist.test.ts
similarity index 64%
rename from src/test/moves/assist.test.ts
rename to test/moves/assist.test.ts
index 81633d9a277..d0385399811 100644
--- a/src/test/moves/assist.test.ts
+++ b/test/moves/assist.test.ts
@@ -5,7 +5,7 @@ import { CommandPhase } from "#app/phases/command-phase";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
@@ -29,7 +29,7 @@ describe("Moves - Assist", () => {
     // because the normal moveset override doesn't allow for accurate testing of moveset changes
     game.override
       .ability(Abilities.BALL_FETCH)
-      .battleType("double")
+      .battleStyle("double")
       .disableCrits()
       .enemySpecies(Species.MAGIKARP)
       .enemyLevel(100)
@@ -39,16 +39,16 @@ describe("Moves - Assist", () => {
 
   it("should only use an ally's moves", async () => {
     game.override.enemyMoveset(Moves.SWORDS_DANCE);
-    await game.classicMode.startBattle([ Species.FEEBAS, Species.SHUCKLE ]);
+    await game.classicMode.startBattle([Species.FEEBAS, Species.SHUCKLE]);
 
-    const [ feebas, shuckle ] = game.scene.getPlayerField();
+    const [feebas, shuckle] = game.scene.getPlayerField();
     // These are all moves Assist cannot call; Sketch will be used to test that it can call other moves properly
-    game.move.changeMoveset(feebas, [ Moves.ASSIST, Moves.SKETCH, Moves.PROTECT, Moves.DRAGON_TAIL ]);
-    game.move.changeMoveset(shuckle, [ Moves.ASSIST, Moves.SKETCH, Moves.PROTECT, Moves.DRAGON_TAIL ]);
+    game.move.changeMoveset(feebas, [Moves.ASSIST, Moves.SKETCH, Moves.PROTECT, Moves.DRAGON_TAIL]);
+    game.move.changeMoveset(shuckle, [Moves.ASSIST, Moves.SKETCH, Moves.PROTECT, Moves.DRAGON_TAIL]);
 
     game.move.select(Moves.ASSIST, 0);
     game.move.select(Moves.SKETCH, 1);
-    await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.ENEMY_2, BattlerIndex.PLAYER_2, BattlerIndex.PLAYER ]);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.ENEMY_2, BattlerIndex.PLAYER_2, BattlerIndex.PLAYER]);
     // Player_2 uses Sketch, copies Swords Dance, Player_1 uses Assist, uses Player_2's Sketched Swords Dance
     await game.toNextTurn();
 
@@ -56,10 +56,10 @@ describe("Moves - Assist", () => {
   });
 
   it("should fail if there are no allies", async () => {
-    await game.classicMode.startBattle([ Species.FEEBAS ]);
+    await game.classicMode.startBattle([Species.FEEBAS]);
 
     const feebas = game.scene.getPlayerPokemon()!;
-    game.move.changeMoveset(feebas, [ Moves.ASSIST, Moves.SKETCH, Moves.PROTECT, Moves.DRAGON_TAIL ]);
+    game.move.changeMoveset(feebas, [Moves.ASSIST, Moves.SKETCH, Moves.PROTECT, Moves.DRAGON_TAIL]);
 
     game.move.select(Moves.ASSIST, 0);
     await game.toNextTurn();
@@ -68,15 +68,15 @@ describe("Moves - Assist", () => {
 
   it("should fail if ally has no usable moves and user has usable moves", async () => {
     game.override.enemyMoveset(Moves.SWORDS_DANCE);
-    await game.classicMode.startBattle([ Species.FEEBAS, Species.SHUCKLE ]);
+    await game.classicMode.startBattle([Species.FEEBAS, Species.SHUCKLE]);
 
-    const [ feebas, shuckle ] = game.scene.getPlayerField();
-    game.move.changeMoveset(feebas, [ Moves.ASSIST, Moves.SKETCH, Moves.PROTECT, Moves.DRAGON_TAIL ]);
-    game.move.changeMoveset(shuckle, [ Moves.ASSIST, Moves.SKETCH, Moves.PROTECT, Moves.DRAGON_TAIL ]);
+    const [feebas, shuckle] = game.scene.getPlayerField();
+    game.move.changeMoveset(feebas, [Moves.ASSIST, Moves.SKETCH, Moves.PROTECT, Moves.DRAGON_TAIL]);
+    game.move.changeMoveset(shuckle, [Moves.ASSIST, Moves.SKETCH, Moves.PROTECT, Moves.DRAGON_TAIL]);
 
     game.move.select(Moves.SKETCH, 0);
     game.move.select(Moves.PROTECT, 1);
-    await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.ENEMY_2, BattlerIndex.PLAYER, BattlerIndex.PLAYER_2 ]);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.ENEMY_2, BattlerIndex.PLAYER, BattlerIndex.PLAYER_2]);
     // Player uses Sketch to copy Swords Dance, Player_2 stalls a turn. Player will attempt Assist and should have no usable moves
     await game.toNextTurn();
     game.move.select(Moves.ASSIST, 0);
@@ -88,12 +88,12 @@ describe("Moves - Assist", () => {
   });
 
   it("should apply secondary effects of a move", async () => {
-    game.override.moveset([ Moves.ASSIST, Moves.WOOD_HAMMER, Moves.WOOD_HAMMER, Moves.WOOD_HAMMER ]);
-    await game.classicMode.startBattle([ Species.FEEBAS, Species.SHUCKLE ]);
+    game.override.moveset([Moves.ASSIST, Moves.WOOD_HAMMER, Moves.WOOD_HAMMER, Moves.WOOD_HAMMER]);
+    await game.classicMode.startBattle([Species.FEEBAS, Species.SHUCKLE]);
 
-    const [ feebas, shuckle ] = game.scene.getPlayerField();
-    game.move.changeMoveset(feebas, [ Moves.ASSIST, Moves.SKETCH, Moves.PROTECT, Moves.DRAGON_TAIL ]);
-    game.move.changeMoveset(shuckle, [ Moves.ASSIST, Moves.SKETCH, Moves.PROTECT, Moves.DRAGON_TAIL ]);
+    const [feebas, shuckle] = game.scene.getPlayerField();
+    game.move.changeMoveset(feebas, [Moves.ASSIST, Moves.SKETCH, Moves.PROTECT, Moves.DRAGON_TAIL]);
+    game.move.changeMoveset(shuckle, [Moves.ASSIST, Moves.SKETCH, Moves.PROTECT, Moves.DRAGON_TAIL]);
 
     game.move.select(Moves.ASSIST, 0);
     await game.phaseInterceptor.to(CommandPhase);
diff --git a/src/test/moves/astonish.test.ts b/test/moves/astonish.test.ts
similarity index 50%
rename from src/test/moves/astonish.test.ts
rename to test/moves/astonish.test.ts
index d94e50fc9f9..1713df1de15 100644
--- a/src/test/moves/astonish.test.ts
+++ b/test/moves/astonish.test.ts
@@ -1,4 +1,4 @@
-import { allMoves } from "#app/data/move";
+import { allMoves } from "#app/data/moves/move";
 import { BattlerTagType } from "#app/enums/battler-tag-type";
 import { BerryPhase } from "#app/phases/berry-phase";
 import { CommandPhase } from "#app/phases/command-phase";
@@ -7,11 +7,10 @@ import { TurnEndPhase } from "#app/phases/turn-end-phase";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, test, vi } from "vitest";
 
-
 describe("Moves - Astonish", () => {
   let phaserGame: Phaser.Game;
   let game: GameManager;
@@ -28,44 +27,41 @@ describe("Moves - Astonish", () => {
 
   beforeEach(() => {
     game = new GameManager(phaserGame);
-    game.override.battleType("single");
-    game.override.moveset([ Moves.ASTONISH, Moves.SPLASH ]);
+    game.override.battleStyle("single");
+    game.override.moveset([Moves.ASTONISH, Moves.SPLASH]);
     game.override.enemySpecies(Species.BLASTOISE);
     game.override.enemyAbility(Abilities.INSOMNIA);
-    game.override.enemyMoveset([ Moves.TACKLE, Moves.TACKLE, Moves.TACKLE, Moves.TACKLE ]);
+    game.override.enemyMoveset([Moves.TACKLE, Moves.TACKLE, Moves.TACKLE, Moves.TACKLE]);
     game.override.startingLevel(100);
     game.override.enemyLevel(100);
 
     vi.spyOn(allMoves[Moves.ASTONISH], "chance", "get").mockReturnValue(100);
   });
 
-  test(
-    "move effect should cancel the target's move on the turn it applies",
-    async () => {
-      await game.startBattle([ Species.MEOWSCARADA ]);
+  test("move effect should cancel the target's move on the turn it applies", async () => {
+    await game.startBattle([Species.MEOWSCARADA]);
 
-      const leadPokemon = game.scene.getPlayerPokemon()!;
+    const leadPokemon = game.scene.getPlayerPokemon()!;
 
-      const enemyPokemon = game.scene.getEnemyPokemon()!;
+    const enemyPokemon = game.scene.getEnemyPokemon()!;
 
-      game.move.select(Moves.ASTONISH);
+    game.move.select(Moves.ASTONISH);
 
-      await game.phaseInterceptor.to(MoveEndPhase, false);
+    await game.phaseInterceptor.to(MoveEndPhase, false);
 
-      expect(enemyPokemon.getTag(BattlerTagType.FLINCHED)).toBeDefined();
+    expect(enemyPokemon.getTag(BattlerTagType.FLINCHED)).toBeDefined();
 
-      await game.phaseInterceptor.to(TurnEndPhase);
+    await game.phaseInterceptor.to(TurnEndPhase);
 
-      expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp());
-      expect(enemyPokemon.getTag(BattlerTagType.FLINCHED)).toBeUndefined();
+    expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp());
+    expect(enemyPokemon.getTag(BattlerTagType.FLINCHED)).toBeUndefined();
 
-      await game.phaseInterceptor.to(CommandPhase, false);
+    await game.phaseInterceptor.to(CommandPhase, false);
 
-      game.move.select(Moves.SPLASH);
+    game.move.select(Moves.SPLASH);
 
-      await game.phaseInterceptor.to(BerryPhase, false);
+    await game.phaseInterceptor.to(BerryPhase, false);
 
-      expect(leadPokemon.hp).toBeLessThan(leadPokemon.getMaxHp());
-    }
-  );
+    expect(leadPokemon.hp).toBeLessThan(leadPokemon.getMaxHp());
+  });
 });
diff --git a/src/test/moves/aurora_veil.test.ts b/test/moves/aurora_veil.test.ts
similarity index 53%
rename from src/test/moves/aurora_veil.test.ts
rename to test/moves/aurora_veil.test.ts
index 721f682f778..e9ab66d4203 100644
--- a/src/test/moves/aurora_veil.test.ts
+++ b/test/moves/aurora_veil.test.ts
@@ -1,18 +1,18 @@
 import type BattleScene from "#app/battle-scene";
 import { ArenaTagSide } from "#app/data/arena-tag";
-import type Move from "#app/data/move";
-import { allMoves } from "#app/data/move";
+import type Move from "#app/data/moves/move";
+import { allMoves, CritOnlyAttr } from "#app/data/moves/move";
 import { ArenaTagType } from "#app/enums/arena-tag-type";
 import type Pokemon from "#app/field/pokemon";
 import { TurnEndPhase } from "#app/phases/turn-end-phase";
-import { NumberHolder } from "#app/utils";
+import { NumberHolder } from "#app/utils/common";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { WeatherType } from "#enums/weather-type";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
-import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
+import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
 let globalScene: BattleScene;
 
@@ -35,70 +35,119 @@ describe("Moves - Aurora Veil", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     globalScene = game.scene;
-    game.override.battleType("single");
+    game.override.battleStyle("single");
     game.override.ability(Abilities.NONE);
-    game.override.moveset([ Moves.ABSORB, Moves.ROCK_SLIDE, Moves.TACKLE ]);
+    game.override.moveset([Moves.ABSORB, Moves.ROCK_SLIDE, Moves.TACKLE]);
     game.override.enemyLevel(100);
     game.override.enemySpecies(Species.MAGIKARP);
-    game.override.enemyMoveset([ Moves.AURORA_VEIL, Moves.AURORA_VEIL, Moves.AURORA_VEIL, Moves.AURORA_VEIL ]);
+    game.override.enemyMoveset([Moves.AURORA_VEIL, Moves.AURORA_VEIL, Moves.AURORA_VEIL, Moves.AURORA_VEIL]);
     game.override.disableCrits();
     game.override.weather(WeatherType.HAIL);
   });
 
   it("reduces damage of physical attacks by half in a single battle", async () => {
     const moveToUse = Moves.TACKLE;
-    await game.startBattle([ Species.SHUCKLE ]);
+    await game.classicMode.startBattle([Species.SHUCKLE]);
 
     game.move.select(moveToUse);
 
     await game.phaseInterceptor.to(TurnEndPhase);
-    const mockedDmg = getMockedMoveDamage(game.scene.getEnemyPokemon()!, game.scene.getPlayerPokemon()!, allMoves[moveToUse]);
+    const mockedDmg = getMockedMoveDamage(
+      game.scene.getEnemyPokemon()!,
+      game.scene.getPlayerPokemon()!,
+      allMoves[moveToUse],
+    );
 
     expect(mockedDmg).toBe(allMoves[moveToUse].power * singleBattleMultiplier);
   });
 
   it("reduces damage of physical attacks by a third in a double battle", async () => {
-    game.override.battleType("double");
+    game.override.battleStyle("double");
 
     const moveToUse = Moves.ROCK_SLIDE;
-    await game.startBattle([ Species.SHUCKLE, Species.SHUCKLE ]);
+    await game.classicMode.startBattle([Species.SHUCKLE, Species.SHUCKLE]);
 
     game.move.select(moveToUse);
     game.move.select(moveToUse, 1);
 
     await game.phaseInterceptor.to(TurnEndPhase);
-    const mockedDmg = getMockedMoveDamage(game.scene.getEnemyPokemon()!, game.scene.getPlayerPokemon()!, allMoves[moveToUse]);
+    const mockedDmg = getMockedMoveDamage(
+      game.scene.getEnemyPokemon()!,
+      game.scene.getPlayerPokemon()!,
+      allMoves[moveToUse],
+    );
 
     expect(mockedDmg).toBe(allMoves[moveToUse].power * doubleBattleMultiplier);
   });
 
   it("reduces damage of special attacks by half in a single battle", async () => {
     const moveToUse = Moves.ABSORB;
-    await game.startBattle([ Species.SHUCKLE ]);
+    await game.classicMode.startBattle([Species.SHUCKLE]);
 
     game.move.select(moveToUse);
 
     await game.phaseInterceptor.to(TurnEndPhase);
 
-    const mockedDmg = getMockedMoveDamage(game.scene.getEnemyPokemon()!, game.scene.getPlayerPokemon()!, allMoves[moveToUse]);
+    const mockedDmg = getMockedMoveDamage(
+      game.scene.getEnemyPokemon()!,
+      game.scene.getPlayerPokemon()!,
+      allMoves[moveToUse],
+    );
 
     expect(mockedDmg).toBe(allMoves[moveToUse].power * singleBattleMultiplier);
   });
 
   it("reduces damage of special attacks by a third in a double battle", async () => {
-    game.override.battleType("double");
+    game.override.battleStyle("double");
 
     const moveToUse = Moves.DAZZLING_GLEAM;
-    await game.startBattle([ Species.SHUCKLE, Species.SHUCKLE ]);
+    await game.classicMode.startBattle([Species.SHUCKLE, Species.SHUCKLE]);
 
     game.move.select(moveToUse);
     game.move.select(moveToUse, 1);
 
     await game.phaseInterceptor.to(TurnEndPhase);
-    const mockedDmg = getMockedMoveDamage(game.scene.getEnemyPokemon()!, game.scene.getPlayerPokemon()!, allMoves[moveToUse]);
+    const mockedDmg = getMockedMoveDamage(
+      game.scene.getEnemyPokemon()!,
+      game.scene.getPlayerPokemon()!,
+      allMoves[moveToUse],
+    );
 
     expect(mockedDmg).toBe(allMoves[moveToUse].power * doubleBattleMultiplier);
   });
+
+  it("does not affect physical critical hits", async () => {
+    game.override.moveset([Moves.WICKED_BLOW]);
+    const moveToUse = Moves.WICKED_BLOW;
+    await game.classicMode.startBattle([Species.SHUCKLE]);
+
+    game.move.select(moveToUse);
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    const mockedDmg = getMockedMoveDamage(
+      game.scene.getEnemyPokemon()!,
+      game.scene.getPlayerPokemon()!,
+      allMoves[moveToUse],
+    );
+    expect(mockedDmg).toBe(allMoves[moveToUse].power);
+  });
+
+  it("does not affect critical hits", async () => {
+    game.override.moveset([Moves.FROST_BREATH]);
+    const moveToUse = Moves.FROST_BREATH;
+    vi.spyOn(allMoves[Moves.FROST_BREATH], "accuracy", "get").mockReturnValue(100);
+    await game.classicMode.startBattle([Species.SHUCKLE]);
+
+    game.move.select(moveToUse);
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    const mockedDmg = getMockedMoveDamage(
+      game.scene.getEnemyPokemon()!,
+      game.scene.getPlayerPokemon()!,
+      allMoves[moveToUse],
+    );
+    expect(mockedDmg).toBe(allMoves[moveToUse].power);
+  });
 });
 
 /**
@@ -115,7 +164,16 @@ const getMockedMoveDamage = (defender: Pokemon, attacker: Pokemon, move: Move) =
   const side = defender.isPlayer() ? ArenaTagSide.PLAYER : ArenaTagSide.ENEMY;
 
   if (globalScene.arena.getTagOnSide(ArenaTagType.AURORA_VEIL, side)) {
-    globalScene.arena.applyTagsForSide(ArenaTagType.AURORA_VEIL, side, false, attacker, move.category, multiplierHolder);
+    if (move.getAttrs(CritOnlyAttr).length === 0) {
+      globalScene.arena.applyTagsForSide(
+        ArenaTagType.AURORA_VEIL,
+        side,
+        false,
+        attacker,
+        move.category,
+        multiplierHolder,
+      );
+    }
   }
 
   return move.power * multiplierHolder.value;
diff --git a/test/moves/autotomize.test.ts b/test/moves/autotomize.test.ts
new file mode 100644
index 00000000000..08e55f242bc
--- /dev/null
+++ b/test/moves/autotomize.test.ts
@@ -0,0 +1,109 @@
+import { Abilities } from "#enums/abilities";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import GameManager from "#test/testUtils/gameManager";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, it, expect } from "vitest";
+
+describe("Moves - Autotomize", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+  const TIMEOUT = 20 * 1000;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+    game.override
+      .moveset([Moves.AUTOTOMIZE, Moves.KINGS_SHIELD, Moves.FALSE_SWIPE])
+      .battleStyle("single")
+      .enemyAbility(Abilities.BALL_FETCH)
+      .enemyMoveset(Moves.SPLASH);
+  });
+
+  it(
+    "Autotomize should reduce weight",
+    async () => {
+      const baseDracozoltWeight = 190;
+      const oneAutotomizeDracozoltWeight = 90;
+      const twoAutotomizeDracozoltWeight = 0.1;
+      const threeAutotomizeDracozoltWeight = 0.1;
+
+      await game.classicMode.startBattle([Species.DRACOZOLT]);
+      const playerPokemon = game.scene.getPlayerPokemon()!;
+      expect(playerPokemon.getWeight()).toBe(baseDracozoltWeight);
+      game.move.select(Moves.AUTOTOMIZE);
+      await game.toNextTurn();
+      expect(playerPokemon.getWeight()).toBe(oneAutotomizeDracozoltWeight);
+
+      game.move.select(Moves.AUTOTOMIZE);
+      await game.toNextTurn();
+      expect(playerPokemon.getWeight()).toBe(twoAutotomizeDracozoltWeight);
+
+      game.move.select(Moves.AUTOTOMIZE);
+      await game.toNextTurn();
+      expect(playerPokemon.getWeight()).toBe(threeAutotomizeDracozoltWeight);
+    },
+    TIMEOUT,
+  );
+
+  it(
+    "Changing forms should revert weight",
+    async () => {
+      const baseAegislashWeight = 53;
+      const autotomizeAegislashWeight = 0.1;
+
+      await game.classicMode.startBattle([Species.AEGISLASH]);
+      const playerPokemon = game.scene.getPlayerPokemon()!;
+
+      expect(playerPokemon.getWeight()).toBe(baseAegislashWeight);
+
+      game.move.select(Moves.AUTOTOMIZE);
+      await game.toNextTurn();
+      expect(playerPokemon.getWeight()).toBe(autotomizeAegislashWeight);
+
+      // Transform to sword form
+      game.move.select(Moves.FALSE_SWIPE);
+      await game.toNextTurn();
+      expect(playerPokemon.getWeight()).toBe(baseAegislashWeight);
+
+      game.move.select(Moves.AUTOTOMIZE);
+      await game.toNextTurn();
+      expect(playerPokemon.getWeight()).toBe(autotomizeAegislashWeight);
+
+      // Transform to shield form
+      game.move.select(Moves.KINGS_SHIELD);
+      await game.toNextTurn();
+      expect(playerPokemon.getWeight()).toBe(baseAegislashWeight);
+
+      game.move.select(Moves.AUTOTOMIZE);
+      await game.toNextTurn();
+      expect(playerPokemon.getWeight()).toBe(autotomizeAegislashWeight);
+    },
+    TIMEOUT,
+  );
+
+  it(
+    "Autotomize should interact with light metal correctly",
+    async () => {
+      const baseLightGroudonWeight = 475;
+      const autotomizeLightGroudonWeight = 425;
+      game.override.ability(Abilities.LIGHT_METAL);
+      await game.classicMode.startBattle([Species.GROUDON]);
+      const playerPokemon = game.scene.getPlayerPokemon()!;
+      expect(playerPokemon.getWeight()).toBe(baseLightGroudonWeight);
+      game.move.select(Moves.AUTOTOMIZE);
+      await game.toNextTurn();
+      expect(playerPokemon.getWeight()).toBe(autotomizeLightGroudonWeight);
+    },
+    TIMEOUT,
+  );
+});
diff --git a/src/test/moves/baddy_bad.test.ts b/test/moves/baddy_bad.test.ts
similarity index 85%
rename from src/test/moves/baddy_bad.test.ts
rename to test/moves/baddy_bad.test.ts
index 1be25704393..ed6c9239eea 100644
--- a/src/test/moves/baddy_bad.test.ts
+++ b/test/moves/baddy_bad.test.ts
@@ -1,7 +1,7 @@
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
@@ -21,8 +21,8 @@ describe("Moves - Baddy Bad", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     game.override
-      .moveset([ Moves.SPLASH ])
-      .battleType("single")
+      .moveset([Moves.SPLASH])
+      .battleStyle("single")
       .enemySpecies(Species.MAGIKARP)
       .enemyAbility(Abilities.BALL_FETCH)
       .enemyMoveset(Moves.SPLASH)
@@ -31,7 +31,7 @@ describe("Moves - Baddy Bad", () => {
 
   it("should not activate Reflect if the move fails due to Protect", async () => {
     game.override.enemyMoveset(Moves.PROTECT);
-    await game.classicMode.startBattle([ Species.FEEBAS ]);
+    await game.classicMode.startBattle([Species.FEEBAS]);
 
     game.move.select(Moves.BADDY_BAD);
     await game.phaseInterceptor.to("BerryPhase");
diff --git a/test/moves/baneful_bunker.test.ts b/test/moves/baneful_bunker.test.ts
new file mode 100644
index 00000000000..4d0d7237c00
--- /dev/null
+++ b/test/moves/baneful_bunker.test.ts
@@ -0,0 +1,82 @@
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest";
+import GameManager from "#test/testUtils/gameManager";
+import { Species } from "#enums/species";
+import { Abilities } from "#enums/abilities";
+import { Moves } from "#enums/moves";
+import { BattlerIndex } from "#app/battle";
+import { StatusEffect } from "#app/enums/status-effect";
+
+describe("Moves - Baneful Bunker", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+
+    game.override.battleStyle("single");
+
+    game.override.moveset(Moves.SLASH);
+
+    game.override.enemySpecies(Species.SNORLAX);
+    game.override.enemyAbility(Abilities.INSOMNIA);
+    game.override.enemyMoveset(Moves.BANEFUL_BUNKER);
+
+    game.override.startingLevel(100);
+    game.override.enemyLevel(100);
+  });
+  test("should protect the user and poison attackers that make contact", async () => {
+    await game.classicMode.startBattle([Species.CHARIZARD]);
+
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+    const enemyPokemon = game.scene.getEnemyPokemon()!;
+
+    game.move.select(Moves.SLASH);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
+    await game.phaseInterceptor.to("BerryPhase", false);
+    expect(enemyPokemon.hp).toBe(enemyPokemon.getMaxHp());
+    expect(leadPokemon.status?.effect === StatusEffect.POISON).toBeTruthy();
+  });
+  test("should protect the user and poison attackers that make contact, regardless of accuracy checks", async () => {
+    await game.classicMode.startBattle([Species.CHARIZARD]);
+
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+    const enemyPokemon = game.scene.getEnemyPokemon()!;
+
+    game.move.select(Moves.SLASH);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
+    await game.phaseInterceptor.to("MoveEffectPhase");
+
+    await game.move.forceMiss();
+    await game.phaseInterceptor.to("BerryPhase", false);
+    expect(enemyPokemon.hp).toBe(enemyPokemon.getMaxHp());
+    expect(leadPokemon.status?.effect === StatusEffect.POISON).toBeTruthy();
+  });
+
+  test("should not poison attackers that don't make contact", async () => {
+    game.override.moveset(Moves.FLASH_CANNON);
+    await game.classicMode.startBattle([Species.CHARIZARD]);
+
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+    const enemyPokemon = game.scene.getEnemyPokemon()!;
+
+    game.move.select(Moves.FLASH_CANNON);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
+    await game.phaseInterceptor.to("MoveEffectPhase");
+
+    await game.move.forceMiss();
+    await game.phaseInterceptor.to("BerryPhase", false);
+    expect(enemyPokemon.hp).toBe(enemyPokemon.getMaxHp());
+    expect(leadPokemon.status?.effect === StatusEffect.POISON).toBeFalsy();
+  });
+});
diff --git a/src/test/moves/baton_pass.test.ts b/test/moves/baton_pass.test.ts
similarity index 72%
rename from src/test/moves/baton_pass.test.ts
rename to test/moves/baton_pass.test.ts
index 52e4c3ec016..143ed285023 100644
--- a/src/test/moves/baton_pass.test.ts
+++ b/test/moves/baton_pass.test.ts
@@ -1,5 +1,5 @@
 import { BattlerIndex } from "#app/battle";
-import GameManager from "#app/test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import { Abilities } from "#enums/abilities";
 import { BattlerTagType } from "#enums/battler-tag-type";
 import { Moves } from "#enums/moves";
@@ -25,10 +25,10 @@ describe("Moves - Baton Pass", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     game.override
-      .battleType("single")
+      .battleStyle("single")
       .enemySpecies(Species.MAGIKARP)
       .enemyAbility(Abilities.BALL_FETCH)
-      .moveset([ Moves.BATON_PASS, Moves.NASTY_PLOT, Moves.SPLASH ])
+      .moveset([Moves.BATON_PASS, Moves.NASTY_PLOT, Moves.SPLASH])
       .ability(Abilities.BALL_FETCH)
       .enemyMoveset(Moves.SPLASH)
       .disableCrits();
@@ -36,7 +36,7 @@ describe("Moves - Baton Pass", () => {
 
   it("transfers all stat stages when player uses it", async () => {
     // arrange
-    await game.classicMode.startBattle([ Species.RAICHU, Species.SHUCKLE ]);
+    await game.classicMode.startBattle([Species.RAICHU, Species.SHUCKLE]);
 
     // round 1 - buff
     game.move.select(Moves.NASTY_PLOT);
@@ -59,10 +59,8 @@ describe("Moves - Baton Pass", () => {
 
   it("passes stat stage buffs when AI uses it", async () => {
     // arrange
-    game.override
-      .startingWave(5)
-      .enemyMoveset(new Array(4).fill([ Moves.NASTY_PLOT ]));
-    await game.classicMode.startBattle([ Species.RAICHU, Species.SHUCKLE ]);
+    game.override.startingWave(5).enemyMoveset(new Array(4).fill([Moves.NASTY_PLOT]));
+    await game.classicMode.startBattle([Species.RAICHU, Species.SHUCKLE]);
 
     // round 1 - ai buffs
     game.move.select(Moves.SPLASH);
@@ -70,7 +68,7 @@ describe("Moves - Baton Pass", () => {
 
     // round 2 - baton pass
     game.scene.getEnemyPokemon()!.hp = 100;
-    game.override.enemyMoveset([ Moves.BATON_PASS ]);
+    game.override.enemyMoveset([Moves.BATON_PASS]);
     // Force moveset to update mid-battle
     // TODO: replace with enemy ai control function when it's added
     game.scene.getEnemyParty()[0].getMoveset();
@@ -87,35 +85,35 @@ describe("Moves - Baton Pass", () => {
       "MoveEffectPhase",
       "SwitchSummonPhase",
       "SummonPhase",
-      "PostSummonPhase"
+      "PostSummonPhase",
     ]);
   }, 20000);
 
   it("doesn't transfer effects that aren't transferrable", async () => {
-    game.override.enemyMoveset([ Moves.SALT_CURE ]);
-    await game.classicMode.startBattle([ Species.PIKACHU, Species.FEEBAS ]);
+    game.override.enemyMoveset([Moves.SALT_CURE]);
+    await game.classicMode.startBattle([Species.PIKACHU, Species.FEEBAS]);
 
-    const [ player1, player2 ] = game.scene.getPlayerParty();
+    const [player1, player2] = game.scene.getPlayerParty();
 
     game.move.select(Moves.BATON_PASS);
-    await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
     await game.phaseInterceptor.to("MoveEndPhase");
-    expect(player1.findTag((t) => t.tagType === BattlerTagType.SALT_CURED)).toBeTruthy();
+    expect(player1.findTag(t => t.tagType === BattlerTagType.SALT_CURED)).toBeTruthy();
     game.doSelectPartyPokemon(1);
     await game.toNextTurn();
 
-    expect(player2.findTag((t) => t.tagType === BattlerTagType.SALT_CURED)).toBeUndefined();
+    expect(player2.findTag(t => t.tagType === BattlerTagType.SALT_CURED)).toBeUndefined();
   }, 20000);
 
   it("doesn't allow binding effects from the user to persist", async () => {
-    game.override.moveset([ Moves.FIRE_SPIN, Moves.BATON_PASS ]);
+    game.override.moveset([Moves.FIRE_SPIN, Moves.BATON_PASS]);
 
-    await game.classicMode.startBattle([ Species.MAGIKARP, Species.FEEBAS ]);
+    await game.classicMode.startBattle([Species.MAGIKARP, Species.FEEBAS]);
 
     const enemy = game.scene.getEnemyPokemon()!;
 
     game.move.select(Moves.FIRE_SPIN);
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
     await game.move.forceHit();
 
     await game.toNextTurn();
@@ -123,7 +121,7 @@ describe("Moves - Baton Pass", () => {
     expect(enemy.getTag(BattlerTagType.FIRE_SPIN)).toBeDefined();
 
     game.move.select(Moves.BATON_PASS);
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
 
     game.doSelectPartyPokemon(1);
     await game.toNextTurn();
diff --git a/test/moves/beak_blast.test.ts b/test/moves/beak_blast.test.ts
new file mode 100644
index 00000000000..45841cecd52
--- /dev/null
+++ b/test/moves/beak_blast.test.ts
@@ -0,0 +1,140 @@
+import { BattlerTagType } from "#app/enums/battler-tag-type";
+import { StatusEffect } from "#app/enums/status-effect";
+import { BerryPhase } from "#app/phases/berry-phase";
+import { MovePhase } from "#app/phases/move-phase";
+import { TurnEndPhase } from "#app/phases/turn-end-phase";
+import { Abilities } from "#enums/abilities";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import GameManager from "#test/testUtils/gameManager";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
+
+describe("Moves - Beak Blast", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+    game.override
+      .battleStyle("single")
+      .ability(Abilities.UNNERVE)
+      .moveset([Moves.BEAK_BLAST])
+      .enemySpecies(Species.SNORLAX)
+      .enemyAbility(Abilities.INSOMNIA)
+      .enemyMoveset([Moves.TACKLE])
+      .startingLevel(100)
+      .enemyLevel(100);
+  });
+
+  it("should add a charge effect that burns attackers on contact", async () => {
+    await game.classicMode.startBattle([Species.BLASTOISE]);
+
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+    const enemyPokemon = game.scene.getEnemyPokemon()!;
+
+    game.move.select(Moves.BEAK_BLAST);
+
+    await game.phaseInterceptor.to(MovePhase, false);
+    expect(leadPokemon.getTag(BattlerTagType.BEAK_BLAST_CHARGING)).toBeDefined();
+
+    await game.phaseInterceptor.to(BerryPhase, false);
+    expect(enemyPokemon.status?.effect).toBe(StatusEffect.BURN);
+  });
+
+  it("should still charge and burn opponents if the user is sleeping", async () => {
+    game.override.statusEffect(StatusEffect.SLEEP);
+
+    await game.classicMode.startBattle([Species.BLASTOISE]);
+
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+    const enemyPokemon = game.scene.getEnemyPokemon()!;
+
+    game.move.select(Moves.BEAK_BLAST);
+
+    await game.phaseInterceptor.to(MovePhase, false);
+    expect(leadPokemon.getTag(BattlerTagType.BEAK_BLAST_CHARGING)).toBeDefined();
+
+    await game.phaseInterceptor.to(BerryPhase, false);
+    expect(enemyPokemon.status?.effect).toBe(StatusEffect.BURN);
+  });
+
+  it("should not burn attackers that don't make contact", async () => {
+    game.override.enemyMoveset([Moves.WATER_GUN]);
+
+    await game.classicMode.startBattle([Species.BLASTOISE]);
+
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+    const enemyPokemon = game.scene.getEnemyPokemon()!;
+
+    game.move.select(Moves.BEAK_BLAST);
+
+    await game.phaseInterceptor.to(MovePhase, false);
+    expect(leadPokemon.getTag(BattlerTagType.BEAK_BLAST_CHARGING)).toBeDefined();
+
+    await game.phaseInterceptor.to(BerryPhase, false);
+    expect(enemyPokemon.status?.effect).not.toBe(StatusEffect.BURN);
+  });
+
+  it("should only hit twice with Multi-Lens", async () => {
+    game.override.startingHeldItems([{ name: "MULTI_LENS", count: 1 }]);
+
+    await game.classicMode.startBattle([Species.BLASTOISE]);
+
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+
+    game.move.select(Moves.BEAK_BLAST);
+
+    await game.phaseInterceptor.to(BerryPhase, false);
+    expect(leadPokemon.turnData.hitCount).toBe(2);
+  });
+
+  it("should be blocked by Protect", async () => {
+    game.override.enemyMoveset([Moves.PROTECT]);
+
+    await game.classicMode.startBattle([Species.BLASTOISE]);
+
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+    const enemyPokemon = game.scene.getEnemyPokemon()!;
+
+    game.move.select(Moves.BEAK_BLAST);
+
+    await game.phaseInterceptor.to(MovePhase, false);
+    expect(leadPokemon.getTag(BattlerTagType.BEAK_BLAST_CHARGING)).toBeDefined();
+
+    await game.phaseInterceptor.to(TurnEndPhase);
+    expect(enemyPokemon.hp).toBe(enemyPokemon.getMaxHp());
+    expect(leadPokemon.getTag(BattlerTagType.BEAK_BLAST_CHARGING)).toBeUndefined();
+  });
+
+  it("should still burn the enemy if the user is knocked out", async () => {
+    game.override.ability(Abilities.BALL_FETCH);
+    await game.classicMode.startBattle([Species.MAGIKARP, Species.MAGIKARP]);
+    const enemyPokemon = game.scene.getEnemyPokemon()!;
+    const user = game.scene.getPlayerPokemon()!;
+    user.hp = 1;
+    game.move.select(Moves.BEAK_BLAST);
+    await game.phaseInterceptor.to("BerryPhase", false);
+    expect(enemyPokemon.status?.effect).toBe(StatusEffect.BURN);
+  });
+
+  it("should not burn a long reach enemy that hits the user with a contact move", async () => {
+    game.override.enemyAbility(Abilities.LONG_REACH);
+    game.override.enemyMoveset([Moves.FALSE_SWIPE]).enemyLevel(100);
+    await game.classicMode.startBattle([Species.MAGIKARP]);
+    game.move.select(Moves.BEAK_BLAST);
+    await game.phaseInterceptor.to("BerryPhase", false);
+    const enemyPokemon = game.scene.getEnemyPokemon()!;
+    expect(enemyPokemon.status?.effect).not.toBe(StatusEffect.BURN);
+  });
+});
diff --git a/test/moves/beat_up.test.ts b/test/moves/beat_up.test.ts
new file mode 100644
index 00000000000..ad6cad40d32
--- /dev/null
+++ b/test/moves/beat_up.test.ts
@@ -0,0 +1,85 @@
+import { Abilities } from "#app/enums/abilities";
+import { Moves } from "#app/enums/moves";
+import { Species } from "#app/enums/species";
+import { StatusEffect } from "#app/enums/status-effect";
+import { MoveEffectPhase } from "#app/phases/move-effect-phase";
+import GameManager from "#test/testUtils/gameManager";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
+
+describe("Moves - Beat Up", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+    game.override.battleStyle("single");
+
+    game.override.enemySpecies(Species.SNORLAX);
+    game.override.enemyLevel(100);
+    game.override.enemyMoveset([Moves.SPLASH]);
+    game.override.enemyAbility(Abilities.INSOMNIA);
+
+    game.override.startingLevel(100);
+    game.override.moveset([Moves.BEAT_UP]);
+  });
+
+  it("should hit once for each healthy player Pokemon", async () => {
+    await game.startBattle([
+      Species.MAGIKARP,
+      Species.BULBASAUR,
+      Species.CHARMANDER,
+      Species.SQUIRTLE,
+      Species.PIKACHU,
+      Species.EEVEE,
+    ]);
+
+    const playerPokemon = game.scene.getPlayerPokemon()!;
+    const enemyPokemon = game.scene.getEnemyPokemon()!;
+    let enemyStartingHp = enemyPokemon.hp;
+
+    game.move.select(Moves.BEAT_UP);
+
+    await game.phaseInterceptor.to(MoveEffectPhase);
+
+    expect(playerPokemon.turnData.hitCount).toBe(6);
+    expect(enemyPokemon.hp).toBeLessThan(enemyStartingHp);
+
+    while (playerPokemon.turnData.hitsLeft > 0) {
+      enemyStartingHp = enemyPokemon.hp;
+      await game.phaseInterceptor.to(MoveEffectPhase);
+      expect(enemyPokemon.hp).toBeLessThan(enemyStartingHp);
+    }
+  });
+
+  it("should not count player Pokemon with status effects towards hit count", async () => {
+    await game.startBattle([
+      Species.MAGIKARP,
+      Species.BULBASAUR,
+      Species.CHARMANDER,
+      Species.SQUIRTLE,
+      Species.PIKACHU,
+      Species.EEVEE,
+    ]);
+
+    const playerPokemon = game.scene.getPlayerPokemon()!;
+
+    game.scene.getPlayerParty()[1].trySetStatus(StatusEffect.BURN);
+
+    game.move.select(Moves.BEAT_UP);
+
+    await game.phaseInterceptor.to(MoveEffectPhase);
+
+    expect(playerPokemon.turnData.hitCount).toBe(5);
+  });
+});
diff --git a/test/moves/belly_drum.test.ts b/test/moves/belly_drum.test.ts
new file mode 100644
index 00000000000..8ee1026bf20
--- /dev/null
+++ b/test/moves/belly_drum.test.ts
@@ -0,0 +1,102 @@
+import { TurnEndPhase } from "#app/phases/turn-end-phase";
+import { toDmgValue } from "#app/utils/common";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import { Stat } from "#enums/stat";
+import GameManager from "#test/testUtils/gameManager";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest";
+import { Abilities } from "#app/enums/abilities";
+
+// RATIO : HP Cost of Move
+const RATIO = 2;
+// PREDAMAGE : Amount of extra HP lost
+const PREDAMAGE = 15;
+
+describe("Moves - BELLY DRUM", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+    game.override
+      .starterSpecies(Species.MAGIKARP)
+      .enemySpecies(Species.SNORLAX)
+      .startingLevel(100)
+      .enemyLevel(100)
+      .moveset([Moves.BELLY_DRUM])
+      .enemyMoveset(Moves.SPLASH)
+      .enemyAbility(Abilities.BALL_FETCH);
+  });
+
+  // Bulbapedia Reference: https://bulbapedia.bulbagarden.net/wiki/Belly_Drum_(move)
+
+  test("raises the user's ATK stat stage to its max, at the cost of 1/2 of its maximum HP", async () => {
+    await game.startBattle([Species.MAGIKARP]);
+
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+    const hpLost = toDmgValue(leadPokemon.getMaxHp() / RATIO);
+
+    game.move.select(Moves.BELLY_DRUM);
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp() - hpLost);
+    expect(leadPokemon.getStatStage(Stat.ATK)).toBe(6);
+  });
+
+  test("will still take effect if an uninvolved stat stage is at max", async () => {
+    await game.startBattle([Species.MAGIKARP]);
+
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+    const hpLost = toDmgValue(leadPokemon.getMaxHp() / RATIO);
+
+    // Here - Stat.ATK -> -3 and Stat.SPATK -> 6
+    leadPokemon.setStatStage(Stat.ATK, -3);
+    leadPokemon.setStatStage(Stat.SPATK, 6);
+
+    game.move.select(Moves.BELLY_DRUM);
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp() - hpLost);
+    expect(leadPokemon.getStatStage(Stat.ATK)).toBe(6);
+    expect(leadPokemon.getStatStage(Stat.SPATK)).toBe(6);
+  });
+
+  test("fails if the pokemon's ATK stat stage is at its maximum", async () => {
+    await game.startBattle([Species.MAGIKARP]);
+
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+
+    leadPokemon.setStatStage(Stat.ATK, 6);
+
+    game.move.select(Moves.BELLY_DRUM);
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp());
+    expect(leadPokemon.getStatStage(Stat.ATK)).toBe(6);
+  });
+
+  test("fails if the user's health is less than 1/2", async () => {
+    await game.startBattle([Species.MAGIKARP]);
+
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+    const hpLost = toDmgValue(leadPokemon.getMaxHp() / RATIO);
+    leadPokemon.hp = hpLost - PREDAMAGE;
+
+    game.move.select(Moves.BELLY_DRUM);
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    expect(leadPokemon.hp).toBe(hpLost - PREDAMAGE);
+    expect(leadPokemon.getStatStage(Stat.ATK)).toBe(0);
+  });
+});
diff --git a/src/test/moves/burning_jealousy.test.ts b/test/moves/burning_jealousy.test.ts
similarity index 74%
rename from src/test/moves/burning_jealousy.test.ts
rename to test/moves/burning_jealousy.test.ts
index abe2c09bb72..ea02bf5f4f5 100644
--- a/src/test/moves/burning_jealousy.test.ts
+++ b/test/moves/burning_jealousy.test.ts
@@ -1,14 +1,13 @@
 import { BattlerIndex } from "#app/battle";
-import { allMoves } from "#app/data/move";
+import { allMoves } from "#app/data/moves/move";
 import { Abilities } from "#app/enums/abilities";
 import { StatusEffect } from "#app/enums/status-effect";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
-
 describe("Moves - Burning Jealousy", () => {
   let phaserGame: Phaser.Game;
   let game: GameManager;
@@ -26,17 +25,16 @@ describe("Moves - Burning Jealousy", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     game.override
-      .battleType("single")
+      .battleStyle("single")
       .disableCrits()
       .enemySpecies(Species.MAGIKARP)
       .enemyAbility(Abilities.ICE_SCALES)
-      .enemyMoveset([ Moves.HOWL ])
+      .enemyMoveset([Moves.HOWL])
       .startingLevel(10)
       .enemyLevel(10)
       .starterSpecies(Species.FEEBAS)
       .ability(Abilities.BALL_FETCH)
-      .moveset([ Moves.BURNING_JEALOUSY, Moves.GROWL ]);
-
+      .moveset([Moves.BURNING_JEALOUSY, Moves.GROWL]);
   });
 
   it("should burn the opponent if their stat stages were raised", async () => {
@@ -45,33 +43,28 @@ describe("Moves - Burning Jealousy", () => {
     const enemy = game.scene.getEnemyPokemon()!;
 
     game.move.select(Moves.BURNING_JEALOUSY);
-    await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
     await game.phaseInterceptor.to("BerryPhase");
 
     expect(enemy.status?.effect).toBe(StatusEffect.BURN);
   });
 
   it("should still burn the opponent if their stat stages were both raised and lowered in the same turn", async () => {
-    game.override
-      .starterSpecies(0)
-      .battleType("double");
-    await game.classicMode.startBattle([ Species.FEEBAS, Species.ABRA ]);
+    game.override.starterSpecies(0).battleStyle("double");
+    await game.classicMode.startBattle([Species.FEEBAS, Species.ABRA]);
 
     const enemy = game.scene.getEnemyPokemon()!;
 
     game.move.select(Moves.BURNING_JEALOUSY);
     game.move.select(Moves.GROWL, 1);
-    await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER_2, BattlerIndex.PLAYER, BattlerIndex.ENEMY_2 ]);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER_2, BattlerIndex.PLAYER, BattlerIndex.ENEMY_2]);
     await game.phaseInterceptor.to("BerryPhase");
 
     expect(enemy.status?.effect).toBe(StatusEffect.BURN);
   });
 
   it("should ignore stat stages raised by IMPOSTER", async () => {
-    game.override
-      .enemySpecies(Species.DITTO)
-      .enemyAbility(Abilities.IMPOSTER)
-      .enemyMoveset(Moves.SPLASH);
+    game.override.enemySpecies(Species.DITTO).enemyAbility(Abilities.IMPOSTER).enemyMoveset(Moves.SPLASH);
     await game.classicMode.startBattle();
 
     const enemy = game.scene.getEnemyPokemon()!;
@@ -88,15 +81,15 @@ describe("Moves - Burning Jealousy", () => {
   });
 
   it("should be boosted by Sheer Force even if opponent didn't raise stat stages", async () => {
-    game.override
-      .ability(Abilities.SHEER_FORCE)
-      .enemyMoveset(Moves.SPLASH);
+    game.override.ability(Abilities.SHEER_FORCE).enemyMoveset(Moves.SPLASH);
     vi.spyOn(allMoves[Moves.BURNING_JEALOUSY], "calculateBattlePower");
     await game.classicMode.startBattle();
 
     game.move.select(Moves.BURNING_JEALOUSY);
     await game.phaseInterceptor.to("BerryPhase");
 
-    expect(allMoves[Moves.BURNING_JEALOUSY].calculateBattlePower).toHaveReturnedWith(allMoves[Moves.BURNING_JEALOUSY].power * 5461 / 4096);
+    expect(allMoves[Moves.BURNING_JEALOUSY].calculateBattlePower).toHaveReturnedWith(
+      allMoves[Moves.BURNING_JEALOUSY].power * 1.3,
+    );
   });
 });
diff --git a/src/test/moves/camouflage.test.ts b/test/moves/camouflage.test.ts
similarity index 77%
rename from src/test/moves/camouflage.test.ts
rename to test/moves/camouflage.test.ts
index 5773afffcc3..38cdef80fc1 100644
--- a/src/test/moves/camouflage.test.ts
+++ b/test/moves/camouflage.test.ts
@@ -2,9 +2,9 @@ import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { TerrainType } from "#app/data/terrain";
-import { Type } from "#enums/type";
+import { PokemonType } from "#enums/pokemon-type";
 import { BattlerIndex } from "#app/battle";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
@@ -25,9 +25,9 @@ describe("Moves - Camouflage", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     game.override
-      .moveset([ Moves.CAMOUFLAGE ])
+      .moveset([Moves.CAMOUFLAGE])
       .ability(Abilities.BALL_FETCH)
-      .battleType("single")
+      .battleStyle("single")
       .disableCrits()
       .enemySpecies(Species.REGIELEKI)
       .enemyAbility(Abilities.BALL_FETCH)
@@ -35,15 +35,15 @@ describe("Moves - Camouflage", () => {
   });
 
   it("Camouflage should look at terrain first when selecting a type to change into", async () => {
-    await game.classicMode.startBattle([ Species.SHUCKLE ]);
+    await game.classicMode.startBattle([Species.SHUCKLE]);
 
     const playerPokemon = game.scene.getPlayerPokemon()!;
 
     game.move.select(Moves.CAMOUFLAGE);
-    await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
     await game.phaseInterceptor.to("BerryPhase");
     expect(game.scene.arena.getTerrainType()).toBe(TerrainType.PSYCHIC);
     const pokemonType = playerPokemon.getTypes()[0];
-    expect(pokemonType).toBe(Type.PSYCHIC);
+    expect(pokemonType).toBe(PokemonType.PSYCHIC);
   });
 });
diff --git a/test/moves/ceaseless_edge.test.ts b/test/moves/ceaseless_edge.test.ts
new file mode 100644
index 00000000000..72e552bef6f
--- /dev/null
+++ b/test/moves/ceaseless_edge.test.ts
@@ -0,0 +1,107 @@
+import { ArenaTagSide, ArenaTrapTag } from "#app/data/arena-tag";
+import { allMoves } from "#app/data/moves/move";
+import { Abilities } from "#app/enums/abilities";
+import { ArenaTagType } from "#app/enums/arena-tag-type";
+import { MoveEffectPhase } from "#app/phases/move-effect-phase";
+import { TurnEndPhase } from "#app/phases/turn-end-phase";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import GameManager from "#test/testUtils/gameManager";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, test, vi } from "vitest";
+
+describe("Moves - Ceaseless Edge", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+    game.override.battleStyle("single");
+    game.override.enemySpecies(Species.RATTATA);
+    game.override.enemyAbility(Abilities.RUN_AWAY);
+    game.override.enemyPassiveAbility(Abilities.RUN_AWAY);
+    game.override.startingLevel(100);
+    game.override.enemyLevel(100);
+    game.override.moveset([Moves.CEASELESS_EDGE, Moves.SPLASH, Moves.ROAR]);
+    game.override.enemyMoveset(Moves.SPLASH);
+    vi.spyOn(allMoves[Moves.CEASELESS_EDGE], "accuracy", "get").mockReturnValue(100);
+  });
+
+  test("move should hit and apply spikes", async () => {
+    await game.classicMode.startBattle([Species.ILLUMISE]);
+
+    const enemyPokemon = game.scene.getEnemyPokemon()!;
+
+    const enemyStartingHp = enemyPokemon.hp;
+
+    game.move.select(Moves.CEASELESS_EDGE);
+
+    await game.phaseInterceptor.to(MoveEffectPhase, false);
+    // Spikes should not have any layers before move effect is applied
+    const tagBefore = game.scene.arena.getTagOnSide(ArenaTagType.SPIKES, ArenaTagSide.ENEMY) as ArenaTrapTag;
+    expect(tagBefore instanceof ArenaTrapTag).toBeFalsy();
+
+    await game.phaseInterceptor.to(TurnEndPhase);
+    const tagAfter = game.scene.arena.getTagOnSide(ArenaTagType.SPIKES, ArenaTagSide.ENEMY) as ArenaTrapTag;
+    expect(tagAfter instanceof ArenaTrapTag).toBeTruthy();
+    expect(tagAfter.layers).toBe(1);
+    expect(enemyPokemon.hp).toBeLessThan(enemyStartingHp);
+  });
+
+  test("move should hit twice with multi lens and apply two layers of spikes", async () => {
+    game.override.startingHeldItems([{ name: "MULTI_LENS" }]);
+    await game.classicMode.startBattle([Species.ILLUMISE]);
+
+    const enemyPokemon = game.scene.getEnemyPokemon()!;
+
+    const enemyStartingHp = enemyPokemon.hp;
+
+    game.move.select(Moves.CEASELESS_EDGE);
+
+    await game.phaseInterceptor.to(MoveEffectPhase, false);
+    // Spikes should not have any layers before move effect is applied
+    const tagBefore = game.scene.arena.getTagOnSide(ArenaTagType.SPIKES, ArenaTagSide.ENEMY) as ArenaTrapTag;
+    expect(tagBefore instanceof ArenaTrapTag).toBeFalsy();
+
+    await game.phaseInterceptor.to(TurnEndPhase);
+    const tagAfter = game.scene.arena.getTagOnSide(ArenaTagType.SPIKES, ArenaTagSide.ENEMY) as ArenaTrapTag;
+    expect(tagAfter instanceof ArenaTrapTag).toBeTruthy();
+    expect(tagAfter.layers).toBe(2);
+    expect(enemyPokemon.hp).toBeLessThan(enemyStartingHp);
+  });
+
+  test("trainer - move should hit twice, apply two layers of spikes, force switch opponent - opponent takes damage", async () => {
+    game.override.startingHeldItems([{ name: "MULTI_LENS" }]);
+    game.override.startingWave(25);
+
+    await game.classicMode.startBattle([Species.ILLUMISE]);
+
+    game.move.select(Moves.CEASELESS_EDGE);
+    await game.phaseInterceptor.to(MoveEffectPhase, false);
+    // Spikes should not have any layers before move effect is applied
+    const tagBefore = game.scene.arena.getTagOnSide(ArenaTagType.SPIKES, ArenaTagSide.ENEMY) as ArenaTrapTag;
+    expect(tagBefore instanceof ArenaTrapTag).toBeFalsy();
+
+    await game.toNextTurn();
+    const tagAfter = game.scene.arena.getTagOnSide(ArenaTagType.SPIKES, ArenaTagSide.ENEMY) as ArenaTrapTag;
+    expect(tagAfter instanceof ArenaTrapTag).toBeTruthy();
+    expect(tagAfter.layers).toBe(2);
+
+    const hpBeforeSpikes = game.scene.currentBattle.enemyParty[1].hp;
+    // Check HP of pokemon that WILL BE switched in (index 1)
+    game.forceEnemyToSwitch();
+    game.move.select(Moves.SPLASH);
+    await game.phaseInterceptor.to(TurnEndPhase, false);
+    expect(game.scene.currentBattle.enemyParty[0].hp).toBeLessThan(hpBeforeSpikes);
+  });
+});
diff --git a/src/test/moves/chilly_reception.test.ts b/test/moves/chilly_reception.test.ts
similarity index 82%
rename from src/test/moves/chilly_reception.test.ts
rename to test/moves/chilly_reception.test.ts
index 664ca242b20..56da5dd400c 100644
--- a/src/test/moves/chilly_reception.test.ts
+++ b/test/moves/chilly_reception.test.ts
@@ -2,7 +2,7 @@ import { Abilities } from "#app/enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { WeatherType } from "#enums/weather-type";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 //import { TurnInitPhase } from "#app/phases/turn-init-phase";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
@@ -23,16 +23,16 @@ describe("Moves - Chilly Reception", () => {
 
   beforeEach(() => {
     game = new GameManager(phaserGame);
-    game.override.battleType("single")
-      .moveset([ Moves.CHILLY_RECEPTION, Moves.SNOWSCAPE ])
+    game.override
+      .battleStyle("single")
+      .moveset([Moves.CHILLY_RECEPTION, Moves.SNOWSCAPE])
       .enemyMoveset(Array(4).fill(Moves.SPLASH))
-      .enemyAbility(Abilities.NONE)
-      .ability(Abilities.NONE);
-
+      .enemyAbility(Abilities.BALL_FETCH)
+      .ability(Abilities.BALL_FETCH);
   });
 
   it("should still change the weather if user can't switch out", async () => {
-    await game.classicMode.startBattle([ Species.SLOWKING ]);
+    await game.classicMode.startBattle([Species.SLOWKING]);
 
     game.move.select(Moves.CHILLY_RECEPTION);
 
@@ -41,7 +41,7 @@ describe("Moves - Chilly Reception", () => {
   });
 
   it("should switch out even if it's snowing", async () => {
-    await game.classicMode.startBattle([ Species.SLOWKING, Species.MEOWTH ]);
+    await game.classicMode.startBattle([Species.SLOWKING, Species.MEOWTH]);
     // first turn set up snow with snowscape, try chilly reception on second turn
     game.move.select(Moves.SNOWSCAPE);
     await game.phaseInterceptor.to("BerryPhase", false);
@@ -57,8 +57,7 @@ describe("Moves - Chilly Reception", () => {
   });
 
   it("happy case - switch out and weather changes", async () => {
-
-    await game.classicMode.startBattle([ Species.SLOWKING, Species.MEOWTH ]);
+    await game.classicMode.startBattle([Species.SLOWKING, Species.MEOWTH]);
 
     game.move.select(Moves.CHILLY_RECEPTION);
     game.doSelectPartyPokemon(1);
@@ -70,12 +69,12 @@ describe("Moves - Chilly Reception", () => {
 
   // enemy uses another move and weather doesn't change
   it("check case - enemy not selecting chilly reception doesn't change weather ", async () => {
-    game.override.battleType("single")
-      .enemyMoveset([ Moves.CHILLY_RECEPTION, Moves.TACKLE ])
-      .enemyAbility(Abilities.NONE)
+    game.override
+      .battleStyle("single")
+      .enemyMoveset([Moves.CHILLY_RECEPTION, Moves.TACKLE])
       .moveset(Array(4).fill(Moves.SPLASH));
 
-    await game.classicMode.startBattle([ Species.SLOWKING, Species.MEOWTH ]);
+    await game.classicMode.startBattle([Species.SLOWKING, Species.MEOWTH]);
 
     game.move.select(Moves.SPLASH);
     await game.forceEnemyMove(Moves.TACKLE);
@@ -85,14 +84,14 @@ describe("Moves - Chilly Reception", () => {
   });
 
   it("enemy trainer - expected behavior ", async () => {
-    game.override.battleType("single")
+    game.override
+      .battleStyle("single")
       .startingWave(8)
       .enemyMoveset(Array(4).fill(Moves.CHILLY_RECEPTION))
-      .enemyAbility(Abilities.NONE)
       .enemySpecies(Species.MAGIKARP)
-      .moveset([ Moves.SPLASH, Moves.THUNDERBOLT ]);
+      .moveset([Moves.SPLASH, Moves.THUNDERBOLT]);
 
-    await game.classicMode.startBattle([ Species.JOLTEON ]);
+    await game.classicMode.startBattle([Species.JOLTEON]);
     const RIVAL_MAGIKARP1 = game.scene.getEnemyPokemon()?.id;
 
     game.move.select(Moves.SPLASH);
@@ -119,6 +118,5 @@ describe("Moves - Chilly Reception", () => {
     game.move.select(Moves.SPLASH);
     await game.phaseInterceptor.to("BerryPhase", false);
     expect(game.scene.arena.weather?.weatherType).toBe(WeatherType.SNOW);
-
   });
 });
diff --git a/src/test/moves/chloroblast.test.ts b/test/moves/chloroblast.test.ts
similarity index 85%
rename from src/test/moves/chloroblast.test.ts
rename to test/moves/chloroblast.test.ts
index 5e55bf46958..175227bbd5e 100644
--- a/src/test/moves/chloroblast.test.ts
+++ b/test/moves/chloroblast.test.ts
@@ -1,7 +1,7 @@
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
@@ -22,9 +22,9 @@ describe("Moves - Chloroblast", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     game.override
-      .moveset([ Moves.CHLOROBLAST ])
+      .moveset([Moves.CHLOROBLAST])
       .ability(Abilities.BALL_FETCH)
-      .battleType("single")
+      .battleStyle("single")
       .disableCrits()
       .enemySpecies(Species.MAGIKARP)
       .enemyAbility(Abilities.BALL_FETCH)
@@ -32,7 +32,7 @@ describe("Moves - Chloroblast", () => {
   });
 
   it("should not deal recoil damage if the opponent uses protect", async () => {
-    await game.classicMode.startBattle([ Species.FEEBAS ]);
+    await game.classicMode.startBattle([Species.FEEBAS]);
 
     game.move.select(Moves.CHLOROBLAST);
     await game.phaseInterceptor.to("BerryPhase");
diff --git a/test/moves/clangorous_soul.test.ts b/test/moves/clangorous_soul.test.ts
new file mode 100644
index 00000000000..56f19a0e088
--- /dev/null
+++ b/test/moves/clangorous_soul.test.ts
@@ -0,0 +1,119 @@
+import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
+import Phaser from "phaser";
+import GameManager from "#test/testUtils/gameManager";
+import { TurnEndPhase } from "#app/phases/turn-end-phase";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import { Stat } from "#enums/stat";
+
+/** HP Cost of Move */
+const RATIO = 3;
+/** Amount of extra HP lost */
+const PREDAMAGE = 15;
+
+describe("Moves - Clangorous Soul", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+    game.override.starterSpecies(Species.MAGIKARP);
+    game.override.enemySpecies(Species.SNORLAX);
+    game.override.startingLevel(100);
+    game.override.enemyLevel(100);
+    game.override.moveset([Moves.CLANGOROUS_SOUL]);
+    game.override.enemyMoveset(Moves.SPLASH);
+  });
+
+  //Bulbapedia Reference: https://bulbapedia.bulbagarden.net/wiki/Clangorous_Soul_(move)
+
+  it("raises the user's ATK, DEF, SPATK, SPDEF, and SPD stat stages by 1 each at the cost of 1/3 of its maximum HP", async () => {
+    await game.startBattle([Species.MAGIKARP]);
+
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+    const hpLost = Math.floor(leadPokemon.getMaxHp() / RATIO);
+
+    game.move.select(Moves.CLANGOROUS_SOUL);
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp() - hpLost);
+    expect(leadPokemon.getStatStage(Stat.ATK)).toBe(1);
+    expect(leadPokemon.getStatStage(Stat.DEF)).toBe(1);
+    expect(leadPokemon.getStatStage(Stat.SPATK)).toBe(1);
+    expect(leadPokemon.getStatStage(Stat.SPDEF)).toBe(1);
+    expect(leadPokemon.getStatStage(Stat.SPD)).toBe(1);
+  });
+
+  it("will still take effect if one or more of the involved stat stages are not at max", async () => {
+    await game.startBattle([Species.MAGIKARP]);
+
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+    const hpLost = Math.floor(leadPokemon.getMaxHp() / RATIO);
+
+    //Here - Stat.SPD -> 0 and Stat.SPDEF -> 4
+    leadPokemon.setStatStage(Stat.ATK, 6);
+    leadPokemon.setStatStage(Stat.DEF, 6);
+    leadPokemon.setStatStage(Stat.SPATK, 6);
+    leadPokemon.setStatStage(Stat.SPDEF, 4);
+
+    game.move.select(Moves.CLANGOROUS_SOUL);
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp() - hpLost);
+    expect(leadPokemon.getStatStage(Stat.ATK)).toBe(6);
+    expect(leadPokemon.getStatStage(Stat.DEF)).toBe(6);
+    expect(leadPokemon.getStatStage(Stat.SPATK)).toBe(6);
+    expect(leadPokemon.getStatStage(Stat.SPDEF)).toBe(5);
+    expect(leadPokemon.getStatStage(Stat.SPD)).toBe(1);
+  });
+
+  it("fails if all stat stages involved are at max", async () => {
+    await game.startBattle([Species.MAGIKARP]);
+
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+
+    leadPokemon.setStatStage(Stat.ATK, 6);
+    leadPokemon.setStatStage(Stat.DEF, 6);
+    leadPokemon.setStatStage(Stat.SPATK, 6);
+    leadPokemon.setStatStage(Stat.SPDEF, 6);
+    leadPokemon.setStatStage(Stat.SPD, 6);
+
+    game.move.select(Moves.CLANGOROUS_SOUL);
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp());
+    expect(leadPokemon.getStatStage(Stat.ATK)).toBe(6);
+    expect(leadPokemon.getStatStage(Stat.DEF)).toBe(6);
+    expect(leadPokemon.getStatStage(Stat.SPATK)).toBe(6);
+    expect(leadPokemon.getStatStage(Stat.SPDEF)).toBe(6);
+    expect(leadPokemon.getStatStage(Stat.SPD)).toBe(6);
+  });
+
+  it("fails if the user's health is less than 1/3", async () => {
+    await game.startBattle([Species.MAGIKARP]);
+
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+    const hpLost = Math.floor(leadPokemon.getMaxHp() / RATIO);
+    leadPokemon.hp = hpLost - PREDAMAGE;
+
+    game.move.select(Moves.CLANGOROUS_SOUL);
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    expect(leadPokemon.hp).toBe(hpLost - PREDAMAGE);
+    expect(leadPokemon.getStatStage(Stat.ATK)).toBe(0);
+    expect(leadPokemon.getStatStage(Stat.DEF)).toBe(0);
+    expect(leadPokemon.getStatStage(Stat.SPATK)).toBe(0);
+    expect(leadPokemon.getStatStage(Stat.SPDEF)).toBe(0);
+    expect(leadPokemon.getStatStage(Stat.SPD)).toBe(0);
+  });
+});
diff --git a/src/test/moves/copycat.test.ts b/test/moves/copycat.test.ts
similarity index 80%
rename from src/test/moves/copycat.test.ts
rename to test/moves/copycat.test.ts
index d9e64289481..2e6e8098835 100644
--- a/src/test/moves/copycat.test.ts
+++ b/test/moves/copycat.test.ts
@@ -1,11 +1,11 @@
 import { BattlerIndex } from "#app/battle";
-import { allMoves, RandomMoveAttr } from "#app/data/move";
+import { allMoves, RandomMoveAttr } from "#app/data/moves/move";
 import { Stat } from "#app/enums/stat";
 import { MoveResult } from "#app/field/pokemon";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
@@ -13,7 +13,7 @@ describe("Moves - Copycat", () => {
   let phaserGame: Phaser.Game;
   let game: GameManager;
 
-  const randomMoveAttr = allMoves[Moves.METRONOME].getAttrs(RandomMoveAttr)[0];
+  let randomMoveAttr: RandomMoveAttr;
 
   beforeAll(() => {
     phaserGame = new Phaser.Game({
@@ -26,11 +26,12 @@ describe("Moves - Copycat", () => {
   });
 
   beforeEach(() => {
+    randomMoveAttr = allMoves[Moves.METRONOME].getAttrs(RandomMoveAttr)[0];
     game = new GameManager(phaserGame);
     game.override
-      .moveset([ Moves.COPYCAT, Moves.SPIKY_SHIELD, Moves.SWORDS_DANCE, Moves.SPLASH ])
+      .moveset([Moves.COPYCAT, Moves.SPIKY_SHIELD, Moves.SWORDS_DANCE, Moves.SPLASH])
       .ability(Abilities.BALL_FETCH)
-      .battleType("single")
+      .battleStyle("single")
       .disableCrits()
       .starterSpecies(Species.FEEBAS)
       .enemySpecies(Species.MAGIKARP)
@@ -65,14 +66,12 @@ describe("Moves - Copycat", () => {
   });
 
   it("should copy the called move when the last move successfully calls another", async () => {
-    game.override
-      .moveset([ Moves.SPLASH, Moves.METRONOME ])
-      .enemyMoveset(Moves.COPYCAT);
+    game.override.moveset([Moves.SPLASH, Moves.METRONOME]).enemyMoveset(Moves.COPYCAT);
     await game.classicMode.startBattle();
     vi.spyOn(randomMoveAttr, "getMoveOverride").mockReturnValue(Moves.SWORDS_DANCE);
 
     game.move.select(Moves.METRONOME);
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]); // Player moves first, so enemy can copy Swords Dance
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); // Player moves first, so enemy can copy Swords Dance
     await game.toNextTurn();
 
     expect(game.scene.getEnemyPokemon()!.getStatStage(Stat.ATK)).toBe(2);
@@ -83,7 +82,7 @@ describe("Moves - Copycat", () => {
     await game.classicMode.startBattle();
 
     game.move.select(Moves.COPYCAT);
-    await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
     await game.toNextTurn();
 
     expect(game.scene.getEnemyPokemon()!.getStatStage(Stat.SPDEF)).toBe(-2);
diff --git a/test/moves/crafty_shield.test.ts b/test/moves/crafty_shield.test.ts
new file mode 100644
index 00000000000..c61e6d3848a
--- /dev/null
+++ b/test/moves/crafty_shield.test.ts
@@ -0,0 +1,110 @@
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest";
+import GameManager from "#test/testUtils/gameManager";
+import { Species } from "#enums/species";
+import { Abilities } from "#enums/abilities";
+import { Moves } from "#enums/moves";
+import { Stat } from "#enums/stat";
+import { BattlerTagType } from "#app/enums/battler-tag-type";
+import { BerryPhase } from "#app/phases/berry-phase";
+import { CommandPhase } from "#app/phases/command-phase";
+
+describe("Moves - Crafty Shield", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+
+    game.override.battleStyle("double");
+
+    game.override.moveset([Moves.CRAFTY_SHIELD, Moves.SPLASH, Moves.SWORDS_DANCE]);
+
+    game.override.enemySpecies(Species.SNORLAX);
+    game.override.enemyMoveset([Moves.GROWL]);
+    game.override.enemyAbility(Abilities.INSOMNIA);
+
+    game.override.startingLevel(100);
+    game.override.enemyLevel(100);
+  });
+
+  test("should protect the user and allies from status moves", async () => {
+    await game.startBattle([Species.CHARIZARD, Species.BLASTOISE]);
+
+    const leadPokemon = game.scene.getPlayerField();
+
+    game.move.select(Moves.CRAFTY_SHIELD);
+
+    await game.phaseInterceptor.to(CommandPhase);
+
+    game.move.select(Moves.SPLASH, 1);
+
+    await game.phaseInterceptor.to(BerryPhase, false);
+
+    leadPokemon.forEach(p => expect(p.getStatStage(Stat.ATK)).toBe(0));
+  });
+
+  test("should not protect the user and allies from attack moves", async () => {
+    game.override.enemyMoveset([Moves.TACKLE]);
+
+    await game.startBattle([Species.CHARIZARD, Species.BLASTOISE]);
+
+    const leadPokemon = game.scene.getPlayerField();
+
+    game.move.select(Moves.CRAFTY_SHIELD);
+
+    await game.phaseInterceptor.to(CommandPhase);
+
+    game.move.select(Moves.SPLASH, 1);
+
+    await game.phaseInterceptor.to(BerryPhase, false);
+
+    expect(leadPokemon.some(p => p.hp < p.getMaxHp())).toBeTruthy();
+  });
+
+  test("should protect the user and allies from moves that ignore other protection", async () => {
+    game.override.enemySpecies(Species.DUSCLOPS);
+    game.override.enemyMoveset([Moves.CURSE]);
+
+    await game.startBattle([Species.CHARIZARD, Species.BLASTOISE]);
+
+    const leadPokemon = game.scene.getPlayerField();
+
+    game.move.select(Moves.CRAFTY_SHIELD);
+
+    await game.phaseInterceptor.to(CommandPhase);
+
+    game.move.select(Moves.SPLASH, 1);
+
+    await game.phaseInterceptor.to(BerryPhase, false);
+
+    leadPokemon.forEach(p => expect(p.getTag(BattlerTagType.CURSED)).toBeUndefined());
+  });
+
+  test("should not block allies' self-targeted moves", async () => {
+    await game.startBattle([Species.CHARIZARD, Species.BLASTOISE]);
+
+    const leadPokemon = game.scene.getPlayerField();
+
+    game.move.select(Moves.CRAFTY_SHIELD);
+
+    await game.phaseInterceptor.to(CommandPhase);
+
+    game.move.select(Moves.SWORDS_DANCE, 1);
+
+    await game.phaseInterceptor.to(BerryPhase, false);
+
+    expect(leadPokemon[0].getStatStage(Stat.ATK)).toBe(0);
+    expect(leadPokemon[1].getStatStage(Stat.ATK)).toBe(2);
+  });
+});
diff --git a/src/test/moves/defog.test.ts b/test/moves/defog.test.ts
similarity index 83%
rename from src/test/moves/defog.test.ts
rename to test/moves/defog.test.ts
index c83cdc192bf..58631150b6f 100644
--- a/src/test/moves/defog.test.ts
+++ b/test/moves/defog.test.ts
@@ -2,7 +2,7 @@ import { Stat } from "#enums/stat";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
@@ -23,17 +23,17 @@ describe("Moves - Defog", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     game.override
-      .moveset([ Moves.MIST, Moves.SAFEGUARD, Moves.SPLASH ])
+      .moveset([Moves.MIST, Moves.SAFEGUARD, Moves.SPLASH])
       .ability(Abilities.BALL_FETCH)
-      .battleType("single")
+      .battleStyle("single")
       .disableCrits()
       .enemySpecies(Species.SHUCKLE)
       .enemyAbility(Abilities.BALL_FETCH)
-      .enemyMoveset([ Moves.DEFOG, Moves.GROWL ]);
+      .enemyMoveset([Moves.DEFOG, Moves.GROWL]);
   });
 
   it("should not allow Safeguard to be active", async () => {
-    await game.classicMode.startBattle([ Species.REGIELEKI ]);
+    await game.classicMode.startBattle([Species.REGIELEKI]);
 
     const playerPokemon = game.scene.getPlayerField();
     const enemyPokemon = game.scene.getEnemyField();
@@ -44,13 +44,11 @@ describe("Moves - Defog", () => {
 
     expect(playerPokemon[0].isSafeguarded(enemyPokemon[0])).toBe(false);
 
-
     expect(true).toBe(true);
   });
 
-
   it("should not allow Mist to be active", async () => {
-    await game.classicMode.startBattle([ Species.REGIELEKI ]);
+    await game.classicMode.startBattle([Species.REGIELEKI]);
 
     const playerPokemon = game.scene.getPlayerField();
 
diff --git a/src/test/moves/destiny_bond.test.ts b/test/moves/destiny_bond.test.ts
similarity index 86%
rename from src/test/moves/destiny_bond.test.ts
rename to test/moves/destiny_bond.test.ts
index e668aee2191..6e6446f464f 100644
--- a/src/test/moves/destiny_bond.test.ts
+++ b/test/moves/destiny_bond.test.ts
@@ -1,25 +1,24 @@
 import type { ArenaTrapTag } from "#app/data/arena-tag";
 import { ArenaTagSide } from "#app/data/arena-tag";
-import { allMoves } from "#app/data/move";
+import { allMoves } from "#app/data/moves/move";
 import { Abilities } from "#enums/abilities";
 import { ArenaTagType } from "#enums/arena-tag-type";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 import { BattlerIndex } from "#app/battle";
 import { StatusEffect } from "#enums/status-effect";
 import { PokemonInstantReviveModifier } from "#app/modifier/modifier";
 
-
 describe("Moves - Destiny Bond", () => {
   let phaserGame: Phaser.Game;
   let game: GameManager;
 
-  const defaultParty = [ Species.BULBASAUR, Species.SQUIRTLE ];
-  const enemyFirst = [ BattlerIndex.ENEMY, BattlerIndex.PLAYER ];
-  const playerFirst = [ BattlerIndex.PLAYER, BattlerIndex.ENEMY ];
+  const defaultParty = [Species.BULBASAUR, Species.SQUIRTLE];
+  const enemyFirst = [BattlerIndex.ENEMY, BattlerIndex.PLAYER];
+  const playerFirst = [BattlerIndex.PLAYER, BattlerIndex.ENEMY];
 
   beforeAll(() => {
     phaserGame = new Phaser.Game({
@@ -33,7 +32,8 @@ describe("Moves - Destiny Bond", () => {
 
   beforeEach(() => {
     game = new GameManager(phaserGame);
-    game.override.battleType("single")
+    game.override
+      .battleStyle("single")
       .ability(Abilities.UNNERVE) // Pre-emptively prevent flakiness from opponent berries
       .enemySpecies(Species.RATTATA)
       .enemyAbility(Abilities.RUN_AWAY)
@@ -62,7 +62,7 @@ describe("Moves - Destiny Bond", () => {
   it("should KO the opponent on the next turn", async () => {
     const moveToUse = Moves.TACKLE;
 
-    game.override.moveset([ Moves.SPLASH, moveToUse ]);
+    game.override.moveset([Moves.SPLASH, moveToUse]);
     await game.classicMode.startBattle(defaultParty);
 
     const enemyPokemon = game.scene.getEnemyPokemon();
@@ -88,7 +88,7 @@ describe("Moves - Destiny Bond", () => {
   it("should fail if used twice in a row", async () => {
     const moveToUse = Moves.TACKLE;
 
-    game.override.moveset([ Moves.SPLASH, moveToUse ]);
+    game.override.moveset([Moves.SPLASH, moveToUse]);
     await game.classicMode.startBattle(defaultParty);
 
     const enemyPokemon = game.scene.getEnemyPokemon();
@@ -115,8 +115,7 @@ describe("Moves - Destiny Bond", () => {
     // Opponent will be reduced to 1 HP by False Swipe, then faint to Sandstorm
     const moveToUse = Moves.FALSE_SWIPE;
 
-    game.override.moveset(moveToUse)
-      .ability(Abilities.SAND_STREAM);
+    game.override.moveset(moveToUse).ability(Abilities.SAND_STREAM);
     await game.classicMode.startBattle(defaultParty);
 
     const enemyPokemon = game.scene.getEnemyPokemon();
@@ -133,7 +132,7 @@ describe("Moves - Destiny Bond", () => {
   it("should not KO the opponent if the user had another turn", async () => {
     const moveToUse = Moves.TACKLE;
 
-    game.override.moveset([ Moves.SPORE, moveToUse ]);
+    game.override.moveset([Moves.SPORE, moveToUse]);
     await game.classicMode.startBattle(defaultParty);
 
     const enemyPokemon = game.scene.getEnemyPokemon();
@@ -158,9 +157,8 @@ describe("Moves - Destiny Bond", () => {
   });
 
   it("should not KO an ally", async () => {
-    game.override.moveset([ Moves.DESTINY_BOND, Moves.CRUNCH ])
-      .battleType("double");
-    await game.classicMode.startBattle([ Species.SHEDINJA, Species.BULBASAUR, Species.SQUIRTLE ]);
+    game.override.moveset([Moves.DESTINY_BOND, Moves.CRUNCH]).battleStyle("double");
+    await game.classicMode.startBattle([Species.SHEDINJA, Species.BULBASAUR, Species.SQUIRTLE]);
 
     const enemyPokemon0 = game.scene.getEnemyField()[0];
     const enemyPokemon1 = game.scene.getEnemyField()[1];
@@ -170,7 +168,7 @@ describe("Moves - Destiny Bond", () => {
     // Shedinja uses Destiny Bond, then ally Bulbasaur KO's Shedinja with Crunch
     game.move.select(Moves.DESTINY_BOND, 0);
     game.move.select(Moves.CRUNCH, 1, BattlerIndex.PLAYER);
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2 ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2]);
     await game.phaseInterceptor.to("BerryPhase");
 
     expect(enemyPokemon0?.isFainted()).toBe(false);
@@ -203,8 +201,7 @@ describe("Moves - Destiny Bond", () => {
   });
 
   it("should not cause a crash if the user is KO'd by Pledge moves", async () => {
-    game.override.moveset([ Moves.GRASS_PLEDGE, Moves.WATER_PLEDGE ])
-      .battleType("double");
+    game.override.moveset([Moves.GRASS_PLEDGE, Moves.WATER_PLEDGE]).battleStyle("double");
     await game.classicMode.startBattle(defaultParty);
 
     const enemyPokemon0 = game.scene.getEnemyField()[0];
@@ -214,7 +211,7 @@ describe("Moves - Destiny Bond", () => {
 
     game.move.select(Moves.GRASS_PLEDGE, 0, BattlerIndex.ENEMY);
     game.move.select(Moves.WATER_PLEDGE, 1, BattlerIndex.ENEMY);
-    await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.ENEMY_2, BattlerIndex.PLAYER, BattlerIndex.PLAYER_2 ]);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.ENEMY_2, BattlerIndex.PLAYER, BattlerIndex.PLAYER_2]);
     await game.phaseInterceptor.to("BerryPhase");
 
     expect(enemyPokemon0?.isFainted()).toBe(true);
@@ -235,8 +232,7 @@ describe("Moves - Destiny Bond", () => {
   it("should not allow the opponent to revive via Reviver Seed", async () => {
     const moveToUse = Moves.TACKLE;
 
-    game.override.moveset(moveToUse)
-      .startingHeldItems([{ name: "REVIVER_SEED" }]);
+    game.override.moveset(moveToUse).startingHeldItems([{ name: "REVIVER_SEED" }]);
     await game.classicMode.startBattle(defaultParty);
 
     const enemyPokemon = game.scene.getEnemyPokemon();
@@ -250,7 +246,9 @@ describe("Moves - Destiny Bond", () => {
     expect(playerPokemon?.isFainted()).toBe(true);
 
     // Check that the Tackle user's Reviver Seed did not activate
-    const revSeeds = game.scene.getModifiers(PokemonInstantReviveModifier).filter(m => m.pokemonId === playerPokemon?.id);
+    const revSeeds = game.scene
+      .getModifiers(PokemonInstantReviveModifier)
+      .filter(m => m.pokemonId === playerPokemon?.id);
     expect(revSeeds.length).toBe(1);
   });
 });
diff --git a/src/test/moves/diamond_storm.test.ts b/test/moves/diamond_storm.test.ts
similarity index 81%
rename from src/test/moves/diamond_storm.test.ts
rename to test/moves/diamond_storm.test.ts
index 6e5be2a790d..9ba62bbc52d 100644
--- a/src/test/moves/diamond_storm.test.ts
+++ b/test/moves/diamond_storm.test.ts
@@ -1,9 +1,9 @@
-import { allMoves } from "#app/data/move";
+import { allMoves } from "#app/data/moves/move";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { Stat } from "#enums/stat";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
@@ -24,19 +24,19 @@ describe("Moves - Diamond Storm", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     game.override
-      .moveset([ Moves.DIAMOND_STORM ])
-      .battleType("single")
+      .moveset([Moves.DIAMOND_STORM])
+      .battleStyle("single")
       .enemySpecies(Species.MAGIKARP)
       .enemyAbility(Abilities.BALL_FETCH)
       .enemyMoveset(Moves.SPLASH);
   });
 
   it("should only increase defense once even if hitting 2 pokemon", async () => {
-    game.override.battleType("double");
+    game.override.battleStyle("double");
     const diamondStorm = allMoves[Moves.DIAMOND_STORM];
     vi.spyOn(diamondStorm, "chance", "get").mockReturnValue(100);
     vi.spyOn(diamondStorm, "accuracy", "get").mockReturnValue(100);
-    await game.classicMode.startBattle([ Species.FEEBAS ]);
+    await game.classicMode.startBattle([Species.FEEBAS]);
 
     game.move.select(Moves.DIAMOND_STORM);
     await game.phaseInterceptor.to("BerryPhase");
diff --git a/src/test/moves/dig.test.ts b/test/moves/dig.test.ts
similarity index 81%
rename from src/test/moves/dig.test.ts
rename to test/moves/dig.test.ts
index 4c6b5d3b75d..80d51a5c2d5 100644
--- a/src/test/moves/dig.test.ts
+++ b/test/moves/dig.test.ts
@@ -1,5 +1,5 @@
 import { BattlerIndex } from "#app/battle";
-import { allMoves } from "#app/data/move";
+import { allMoves } from "#app/data/moves/move";
 import { Abilities } from "#enums/abilities";
 import { BattlerTagType } from "#enums/battler-tag-type";
 import { Moves } from "#enums/moves";
@@ -7,7 +7,7 @@ import { Species } from "#enums/species";
 import { StatusEffect } from "#enums/status-effect";
 import { MoveResult } from "#app/field/pokemon";
 import { describe, beforeAll, afterEach, beforeEach, it, expect } from "vitest";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 
 describe("Moves - Dig", () => {
   let phaserGame: Phaser.Game;
@@ -27,7 +27,7 @@ describe("Moves - Dig", () => {
     game = new GameManager(phaserGame);
     game.override
       .moveset(Moves.DIG)
-      .battleType("single")
+      .battleStyle("single")
       .startingLevel(100)
       .enemySpecies(Species.SNORLAX)
       .enemyLevel(100)
@@ -36,7 +36,7 @@ describe("Moves - Dig", () => {
   });
 
   it("should make the user semi-invulnerable, then attack over 2 turns", async () => {
-    await game.classicMode.startBattle([ Species.MAGIKARP ]);
+    await game.classicMode.startBattle([Species.MAGIKARP]);
 
     const playerPokemon = game.scene.getPlayerPokemon()!;
     const enemyPokemon = game.scene.getEnemyPokemon()!;
@@ -62,7 +62,7 @@ describe("Moves - Dig", () => {
   it("should not allow the user to evade attacks from Pokemon with No Guard", async () => {
     game.override.enemyAbility(Abilities.NO_GUARD);
 
-    await game.classicMode.startBattle([ Species.MAGIKARP ]);
+    await game.classicMode.startBattle([Species.MAGIKARP]);
 
     const playerPokemon = game.scene.getPlayerPokemon()!;
     const enemyPokemon = game.scene.getEnemyPokemon()!;
@@ -75,11 +75,9 @@ describe("Moves - Dig", () => {
   });
 
   it("should not expend PP when the attack phase is cancelled", async () => {
-    game.override
-      .enemyAbility(Abilities.NO_GUARD)
-      .enemyMoveset(Moves.SPORE);
+    game.override.enemyAbility(Abilities.NO_GUARD).enemyMoveset(Moves.SPORE);
 
-    await game.classicMode.startBattle([ Species.MAGIKARP ]);
+    await game.classicMode.startBattle([Species.MAGIKARP]);
 
     const playerPokemon = game.scene.getPlayerPokemon()!;
 
@@ -94,19 +92,25 @@ describe("Moves - Dig", () => {
   });
 
   it("should cause the user to take double damage from Earthquake", async () => {
-    await game.classicMode.startBattle([ Species.DONDOZO ]);
+    await game.classicMode.startBattle([Species.DONDOZO]);
 
     const playerPokemon = game.scene.getPlayerPokemon()!;
     const enemyPokemon = game.scene.getEnemyPokemon()!;
 
-    const preDigEarthquakeDmg = playerPokemon.getAttackDamage(enemyPokemon, allMoves[Moves.EARTHQUAKE]).damage;
+    const preDigEarthquakeDmg = playerPokemon.getAttackDamage({
+      source: enemyPokemon,
+      move: allMoves[Moves.EARTHQUAKE],
+    }).damage;
 
     game.move.select(Moves.DIG);
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
 
     await game.phaseInterceptor.to("MoveEffectPhase");
 
-    const postDigEarthquakeDmg = playerPokemon.getAttackDamage(enemyPokemon, allMoves[Moves.EARTHQUAKE]).damage;
+    const postDigEarthquakeDmg = playerPokemon.getAttackDamage({
+      source: enemyPokemon,
+      move: allMoves[Moves.EARTHQUAKE],
+    }).damage;
     // these hopefully get avoid rounding errors :shrug:
     expect(postDigEarthquakeDmg).toBeGreaterThanOrEqual(2 * preDigEarthquakeDmg);
     expect(postDigEarthquakeDmg).toBeLessThan(2 * (preDigEarthquakeDmg + 1));
diff --git a/src/test/moves/disable.test.ts b/test/moves/disable.test.ts
similarity index 59%
rename from src/test/moves/disable.test.ts
rename to test/moves/disable.test.ts
index 3748598fa90..d21716145a4 100644
--- a/src/test/moves/disable.test.ts
+++ b/test/moves/disable.test.ts
@@ -3,7 +3,7 @@ import { MoveResult } from "#app/field/pokemon";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
 describe("Moves - Disable", () => {
@@ -12,7 +12,7 @@ describe("Moves - Disable", () => {
 
   beforeAll(() => {
     phaserGame = new Phaser.Game({
-      type: Phaser.HEADLESS
+      type: Phaser.HEADLESS,
     });
   });
 
@@ -23,10 +23,10 @@ describe("Moves - Disable", () => {
   beforeEach(async () => {
     game = new GameManager(phaserGame);
     game.override
-      .battleType("single")
+      .battleStyle("single")
       .ability(Abilities.BALL_FETCH)
       .enemyAbility(Abilities.BALL_FETCH)
-      .moveset([ Moves.DISABLE, Moves.SPLASH ])
+      .moveset([Moves.DISABLE, Moves.SPLASH])
       .enemyMoveset(Moves.SPLASH)
       .starterSpecies(Species.PIKACHU)
       .enemySpecies(Species.SHUCKLE);
@@ -38,34 +38,37 @@ describe("Moves - Disable", () => {
     const enemyMon = game.scene.getEnemyPokemon()!;
 
     game.move.select(Moves.DISABLE);
-    await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
     await game.toNextTurn();
 
     expect(enemyMon.getMoveHistory()).toHaveLength(1);
     expect(enemyMon.isMoveRestricted(Moves.SPLASH)).toBe(true);
   });
 
-  it("fails if enemy has no move history", async() => {
+  it("fails if enemy has no move history", async () => {
     await game.classicMode.startBattle();
 
     const playerMon = game.scene.getPlayerPokemon()!;
     const enemyMon = game.scene.getEnemyPokemon()!;
 
     game.move.select(Moves.DISABLE);
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
     await game.toNextTurn();
 
-    expect(playerMon.getMoveHistory()[0]).toMatchObject({ move: Moves.DISABLE, result: MoveResult.FAIL });
+    expect(playerMon.getMoveHistory()[0]).toMatchObject({
+      move: Moves.DISABLE,
+      result: MoveResult.FAIL,
+    });
     expect(enemyMon.isMoveRestricted(Moves.SPLASH)).toBe(false);
   }, 20000);
 
-  it("causes STRUGGLE if all usable moves are disabled", async() => {
+  it("causes STRUGGLE if all usable moves are disabled", async () => {
     await game.classicMode.startBattle();
 
     const enemyMon = game.scene.getEnemyPokemon()!;
 
     game.move.select(Moves.DISABLE);
-    await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
     await game.toNextTurn();
 
     game.move.select(Moves.SPLASH);
@@ -77,15 +80,15 @@ describe("Moves - Disable", () => {
     expect(enemyHistory[1].move).toBe(Moves.STRUGGLE);
   }, 20000);
 
-  it("cannot disable STRUGGLE", async() => {
-    game.override.enemyMoveset([ Moves.STRUGGLE ]);
+  it("cannot disable STRUGGLE", async () => {
+    game.override.enemyMoveset([Moves.STRUGGLE]);
     await game.classicMode.startBattle();
 
     const playerMon = game.scene.getPlayerPokemon()!;
     const enemyMon = game.scene.getEnemyPokemon()!;
 
     game.move.select(Moves.DISABLE);
-    await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
     await game.toNextTurn();
 
     expect(playerMon.getLastXMoves()[0].result).toBe(MoveResult.FAIL);
@@ -93,7 +96,7 @@ describe("Moves - Disable", () => {
     expect(enemyMon.isMoveRestricted(Moves.STRUGGLE)).toBe(false);
   }, 20000);
 
-  it("interrupts target's move when target moves after", async() => {
+  it("interrupts target's move when target moves after", async () => {
     await game.classicMode.startBattle();
 
     const enemyMon = game.scene.getEnemyPokemon()!;
@@ -103,26 +106,49 @@ describe("Moves - Disable", () => {
 
     // Both mons just used Splash last turn; now have player use Disable.
     game.move.select(Moves.DISABLE);
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
     await game.toNextTurn();
 
     const enemyHistory = enemyMon.getMoveHistory();
     expect(enemyHistory).toHaveLength(2);
-    expect(enemyHistory[0]).toMatchObject({ move: Moves.SPLASH, result: MoveResult.SUCCESS });
+    expect(enemyHistory[0]).toMatchObject({
+      move: Moves.SPLASH,
+      result: MoveResult.SUCCESS,
+    });
     expect(enemyHistory[1].result).toBe(MoveResult.FAIL);
   }, 20000);
 
-  it("disables NATURE POWER, not the move invoked by it", async() => {
-    game.override.enemyMoveset([ Moves.NATURE_POWER ]);
+  it("disables NATURE POWER, not the move invoked by it", async () => {
+    game.override.enemyMoveset([Moves.NATURE_POWER]);
     await game.classicMode.startBattle();
 
     const enemyMon = game.scene.getEnemyPokemon()!;
 
     game.move.select(Moves.DISABLE);
-    await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
     await game.toNextTurn();
 
     expect(enemyMon.isMoveRestricted(Moves.NATURE_POWER)).toBe(true);
-    expect(enemyMon.isMoveRestricted(enemyMon.getLastXMoves(2)[1].move)).toBe(false);
+    expect(enemyMon.isMoveRestricted(enemyMon.getLastXMoves(2)[0].move)).toBe(false);
+  }, 20000);
+
+  it("disables most recent move", async () => {
+    game.override.enemyMoveset([Moves.SPLASH, Moves.TACKLE]);
+    await game.classicMode.startBattle();
+
+    const enemyMon = game.scene.getEnemyPokemon()!;
+
+    game.move.select(Moves.SPLASH);
+    await game.forceEnemyMove(Moves.SPLASH, BattlerIndex.PLAYER);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
+    await game.toNextTurn();
+
+    game.move.select(Moves.DISABLE);
+    await game.forceEnemyMove(Moves.TACKLE, BattlerIndex.PLAYER);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
+    await game.toNextTurn();
+
+    expect(enemyMon.isMoveRestricted(Moves.TACKLE)).toBe(true);
+    expect(enemyMon.isMoveRestricted(Moves.SPLASH)).toBe(false);
   }, 20000);
 });
diff --git a/src/test/moves/dive.test.ts b/test/moves/dive.test.ts
similarity index 85%
rename from src/test/moves/dive.test.ts
rename to test/moves/dive.test.ts
index b60416d7740..95c3349c8a6 100644
--- a/src/test/moves/dive.test.ts
+++ b/test/moves/dive.test.ts
@@ -4,7 +4,7 @@ import { MoveResult } from "#app/field/pokemon";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, it, expect } from "vitest";
 import { WeatherType } from "#enums/weather-type";
@@ -27,7 +27,7 @@ describe("Moves - Dive", () => {
     game = new GameManager(phaserGame);
     game.override
       .moveset(Moves.DIVE)
-      .battleType("single")
+      .battleStyle("single")
       .startingLevel(100)
       .enemySpecies(Species.SNORLAX)
       .enemyLevel(100)
@@ -36,7 +36,7 @@ describe("Moves - Dive", () => {
   });
 
   it("should make the user semi-invulnerable, then attack over 2 turns", async () => {
-    await game.classicMode.startBattle([ Species.MAGIKARP ]);
+    await game.classicMode.startBattle([Species.MAGIKARP]);
 
     const playerPokemon = game.scene.getPlayerPokemon()!;
     const enemyPokemon = game.scene.getEnemyPokemon()!;
@@ -62,7 +62,7 @@ describe("Moves - Dive", () => {
   it("should not allow the user to evade attacks from Pokemon with No Guard", async () => {
     game.override.enemyAbility(Abilities.NO_GUARD);
 
-    await game.classicMode.startBattle([ Species.MAGIKARP ]);
+    await game.classicMode.startBattle([Species.MAGIKARP]);
 
     const playerPokemon = game.scene.getPlayerPokemon()!;
     const enemyPokemon = game.scene.getEnemyPokemon()!;
@@ -75,11 +75,9 @@ describe("Moves - Dive", () => {
   });
 
   it("should not expend PP when the attack phase is cancelled", async () => {
-    game.override
-      .enemyAbility(Abilities.NO_GUARD)
-      .enemyMoveset(Moves.SPORE);
+    game.override.enemyAbility(Abilities.NO_GUARD).enemyMoveset(Moves.SPORE);
 
-    await game.classicMode.startBattle([ Species.MAGIKARP ]);
+    await game.classicMode.startBattle([Species.MAGIKARP]);
 
     const playerPokemon = game.scene.getPlayerPokemon()!;
 
@@ -94,11 +92,9 @@ describe("Moves - Dive", () => {
   });
 
   it("should trigger on-contact post-defend ability effects", async () => {
-    game.override
-      .enemyAbility(Abilities.ROUGH_SKIN)
-      .enemyMoveset(Moves.SPLASH);
+    game.override.enemyAbility(Abilities.ROUGH_SKIN).enemyMoveset(Moves.SPLASH);
 
-    await game.classicMode.startBattle([ Species.MAGIKARP ]);
+    await game.classicMode.startBattle([Species.MAGIKARP]);
 
     const playerPokemon = game.scene.getPlayerPokemon()!;
     const enemyPokemon = game.scene.getEnemyPokemon()!;
@@ -109,13 +105,13 @@ describe("Moves - Dive", () => {
 
     await game.phaseInterceptor.to("MoveEndPhase");
     expect(playerPokemon.hp).toBeLessThan(playerPokemon.getMaxHp());
-    expect(enemyPokemon.battleData.abilitiesApplied[0]).toBe(Abilities.ROUGH_SKIN);
+    expect(enemyPokemon.waveData.abilitiesApplied).toContain(Abilities.ROUGH_SKIN);
   });
 
   it("should cancel attack after Harsh Sunlight is set", async () => {
     game.override.enemyMoveset(Moves.SPLASH);
 
-    await game.classicMode.startBattle([ Species.MAGIKARP ]);
+    await game.classicMode.startBattle([Species.MAGIKARP]);
 
     const playerPokemon = game.scene.getPlayerPokemon()!;
     const enemyPokemon = game.scene.getEnemyPokemon()!;
@@ -124,7 +120,7 @@ describe("Moves - Dive", () => {
 
     await game.phaseInterceptor.to("TurnEndPhase");
     await game.phaseInterceptor.to("TurnStartPhase", false);
-    game.scene.arena.trySetWeather(WeatherType.HARSH_SUN, false);
+    game.scene.arena.trySetWeather(WeatherType.HARSH_SUN);
 
     await game.phaseInterceptor.to("MoveEndPhase");
     expect(playerPokemon.getLastXMoves(1)[0].result).toBe(MoveResult.FAIL);
diff --git a/test/moves/doodle.test.ts b/test/moves/doodle.test.ts
new file mode 100644
index 00000000000..25dc0ddaede
--- /dev/null
+++ b/test/moves/doodle.test.ts
@@ -0,0 +1,69 @@
+import { BattlerIndex } from "#app/battle";
+import { Stat } from "#app/enums/stat";
+import { Abilities } from "#enums/abilities";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import GameManager from "#test/testUtils/gameManager";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
+
+describe("Moves - Doodle", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+    game.override
+      .moveset([Moves.SPLASH, Moves.DOODLE])
+      .ability(Abilities.ADAPTABILITY)
+      .battleStyle("single")
+      .disableCrits()
+      .enemySpecies(Species.MAGIKARP)
+      .enemyAbility(Abilities.BALL_FETCH)
+      .enemyMoveset(Moves.SPLASH);
+  });
+
+  it("should copy the opponent's ability in singles", async () => {
+    await game.classicMode.startBattle([Species.FEEBAS]);
+
+    game.move.select(Moves.DOODLE);
+    await game.phaseInterceptor.to("BerryPhase");
+
+    expect(game.scene.getPlayerPokemon()?.getAbility().id).toBe(Abilities.BALL_FETCH);
+  });
+
+  it("should copy the opponent's ability to itself and its ally in doubles", async () => {
+    game.override.battleStyle("double");
+    await game.classicMode.startBattle([Species.FEEBAS, Species.MAGIKARP]);
+
+    game.move.select(Moves.DOODLE, 0, BattlerIndex.ENEMY);
+    game.move.select(Moves.SPLASH, 1);
+    await game.phaseInterceptor.to("BerryPhase");
+
+    expect(game.scene.getPlayerField()[0].getAbility().id).toBe(Abilities.BALL_FETCH);
+    expect(game.scene.getPlayerField()[1].getAbility().id).toBe(Abilities.BALL_FETCH);
+  });
+
+  it("should activate post-summon abilities", async () => {
+    game.override.battleStyle("double").enemyAbility(Abilities.INTIMIDATE);
+
+    await game.classicMode.startBattle([Species.FEEBAS, Species.MAGIKARP]);
+
+    game.move.select(Moves.DOODLE, 0, BattlerIndex.ENEMY);
+    game.move.select(Moves.SPLASH, 1);
+    await game.phaseInterceptor.to("BerryPhase");
+
+    // Enemies should have been intimidated twice
+    expect(game.scene.getEnemyPokemon()?.getStatStage(Stat.ATK)).toBe(-2);
+  });
+});
diff --git a/src/test/moves/double_team.test.ts b/test/moves/double_team.test.ts
similarity index 78%
rename from src/test/moves/double_team.test.ts
rename to test/moves/double_team.test.ts
index 62848553e06..8eac6be11f4 100644
--- a/src/test/moves/double_team.test.ts
+++ b/test/moves/double_team.test.ts
@@ -3,7 +3,7 @@ import { Abilities } from "#app/enums/abilities";
 import { TurnEndPhase } from "#app/phases/turn-end-phase";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
@@ -23,17 +23,17 @@ describe("Moves - Double Team", () => {
 
   beforeEach(() => {
     game = new GameManager(phaserGame);
-    game.override.battleType("single");
-    game.override.moveset([ Moves.DOUBLE_TEAM ]);
+    game.override.battleStyle("single");
+    game.override.moveset([Moves.DOUBLE_TEAM]);
     game.override.disableCrits();
     game.override.ability(Abilities.BALL_FETCH);
     game.override.enemySpecies(Species.SHUCKLE);
     game.override.enemyAbility(Abilities.BALL_FETCH);
-    game.override.enemyMoveset([ Moves.TACKLE, Moves.TACKLE, Moves.TACKLE, Moves.TACKLE ]);
+    game.override.enemyMoveset([Moves.TACKLE, Moves.TACKLE, Moves.TACKLE, Moves.TACKLE]);
   });
 
   it("raises the user's EVA stat stage by 1", async () => {
-    await game.startBattle([ Species.MAGIKARP ]);
+    await game.startBattle([Species.MAGIKARP]);
 
     const ally = game.scene.getPlayerPokemon()!;
     const enemy = game.scene.getEnemyPokemon()!;
@@ -46,6 +46,6 @@ describe("Moves - Double Team", () => {
     await game.toNextTurn();
 
     expect(ally.getStatStage(Stat.EVA)).toBe(1);
-    expect(enemy.getAccuracyMultiplier).toHaveReturnedWith(.75);
+    expect(enemy.getAccuracyMultiplier).toHaveReturnedWith(0.75);
   });
 });
diff --git a/src/test/moves/dragon_cheer.test.ts b/test/moves/dragon_cheer.test.ts
similarity index 70%
rename from src/test/moves/dragon_cheer.test.ts
rename to test/moves/dragon_cheer.test.ts
index 750f09214ca..dcf7f13eb65 100644
--- a/src/test/moves/dragon_cheer.test.ts
+++ b/test/moves/dragon_cheer.test.ts
@@ -1,9 +1,9 @@
 import { BattlerIndex } from "#app/battle";
-import { Type } from "#enums/type";
+import { PokemonType } from "#enums/pokemon-type";
 import { Moves } from "#app/enums/moves";
 import { Species } from "#app/enums/species";
 import { Abilities } from "#enums/abilities";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
@@ -23,15 +23,15 @@ describe("Moves - Dragon Cheer", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     game.override
-      .battleType("double")
+      .battleStyle("double")
       .enemyAbility(Abilities.BALL_FETCH)
       .enemyMoveset(Moves.SPLASH)
       .enemyLevel(20)
-      .moveset([ Moves.DRAGON_CHEER, Moves.TACKLE, Moves.SPLASH ]);
+      .moveset([Moves.DRAGON_CHEER, Moves.TACKLE, Moves.SPLASH]);
   });
 
   it("increases the user's allies' critical hit ratio by one stage", async () => {
-    await game.classicMode.startBattle([ Species.DRAGONAIR, Species.MAGIKARP ]);
+    await game.classicMode.startBattle([Species.DRAGONAIR, Species.MAGIKARP]);
 
     const enemy = game.scene.getEnemyField()[0];
 
@@ -40,7 +40,7 @@ describe("Moves - Dragon Cheer", () => {
     game.move.select(Moves.DRAGON_CHEER, 0);
     game.move.select(Moves.TACKLE, 1, BattlerIndex.ENEMY);
 
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2 ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2]);
 
     // After Tackle
     await game.phaseInterceptor.to("TurnEndPhase");
@@ -48,7 +48,7 @@ describe("Moves - Dragon Cheer", () => {
   });
 
   it("increases the user's Dragon-type allies' critical hit ratio by two stages", async () => {
-    await game.classicMode.startBattle([ Species.MAGIKARP, Species.DRAGONAIR ]);
+    await game.classicMode.startBattle([Species.MAGIKARP, Species.DRAGONAIR]);
 
     const enemy = game.scene.getEnemyField()[0];
 
@@ -57,7 +57,7 @@ describe("Moves - Dragon Cheer", () => {
     game.move.select(Moves.DRAGON_CHEER, 0);
     game.move.select(Moves.TACKLE, 1, BattlerIndex.ENEMY);
 
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2 ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2]);
 
     // After Tackle
     await game.phaseInterceptor.to("TurnEndPhase");
@@ -65,7 +65,7 @@ describe("Moves - Dragon Cheer", () => {
   });
 
   it("applies the effect based on the allies' type upon use of the move, and do not change if the allies' type changes later in battle", async () => {
-    await game.classicMode.startBattle([ Species.DRAGONAIR, Species.MAGIKARP ]);
+    await game.classicMode.startBattle([Species.DRAGONAIR, Species.MAGIKARP]);
 
     const magikarp = game.scene.getPlayerField()[1];
     const enemy = game.scene.getEnemyField()[0];
@@ -75,7 +75,7 @@ describe("Moves - Dragon Cheer", () => {
     game.move.select(Moves.DRAGON_CHEER, 0);
     game.move.select(Moves.TACKLE, 1, BattlerIndex.ENEMY);
 
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2 ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2]);
 
     // After Tackle
     await game.phaseInterceptor.to("TurnEndPhase");
@@ -84,13 +84,13 @@ describe("Moves - Dragon Cheer", () => {
     await game.toNextTurn();
 
     // Change Magikarp's type to Dragon
-    vi.spyOn(magikarp, "getTypes").mockReturnValue([ Type.DRAGON ]);
-    expect(magikarp.getTypes()).toEqual([ Type.DRAGON ]);
+    vi.spyOn(magikarp, "getTypes").mockReturnValue([PokemonType.DRAGON]);
+    expect(magikarp.getTypes()).toEqual([PokemonType.DRAGON]);
 
     game.move.select(Moves.SPLASH, 0);
     game.move.select(Moves.TACKLE, 1, BattlerIndex.ENEMY);
 
-    await game.setTurnOrder([ BattlerIndex.PLAYER_2, BattlerIndex.PLAYER, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2 ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER_2, BattlerIndex.PLAYER, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2]);
 
     await game.phaseInterceptor.to("MoveEndPhase");
     expect(enemy.getCritStage).toHaveReturnedWith(1); // getCritStage is called on defender
diff --git a/src/test/moves/dragon_rage.test.ts b/test/moves/dragon_rage.test.ts
similarity index 85%
rename from src/test/moves/dragon_rage.test.ts
rename to test/moves/dragon_rage.test.ts
index a2350960546..188c1511f37 100644
--- a/src/test/moves/dragon_rage.test.ts
+++ b/test/moves/dragon_rage.test.ts
@@ -1,12 +1,12 @@
 import { Stat } from "#enums/stat";
-import { Type } from "#enums/type";
+import { PokemonType } from "#enums/pokemon-type";
 import { Species } from "#app/enums/species";
 import type { EnemyPokemon, PlayerPokemon } from "#app/field/pokemon";
 import { TurnEndPhase } from "#app/phases/turn-end-phase";
 import { Abilities } from "#enums/abilities";
 import { BattlerTagType } from "#enums/battler-tag-type";
 import { Moves } from "#enums/moves";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
@@ -31,10 +31,10 @@ describe("Moves - Dragon Rage", () => {
   beforeEach(async () => {
     game = new GameManager(phaserGame);
 
-    game.override.battleType("single");
+    game.override.battleStyle("single");
 
     game.override.starterSpecies(Species.SNORLAX);
-    game.override.moveset([ Moves.DRAGON_RAGE ]);
+    game.override.moveset([Moves.DRAGON_RAGE]);
     game.override.ability(Abilities.BALL_FETCH);
     game.override.passiveAbility(Abilities.BALL_FETCH);
     game.override.startingLevel(100);
@@ -45,19 +45,15 @@ describe("Moves - Dragon Rage", () => {
     game.override.enemyPassiveAbility(Abilities.BALL_FETCH);
     game.override.enemyLevel(100);
 
-    await game.startBattle();
+    await game.classicMode.startBattle();
 
     partyPokemon = game.scene.getPlayerParty()[0];
     enemyPokemon = game.scene.getEnemyPokemon()!;
-
-    // remove berries
-    game.scene.removePartyMemberModifiers(0);
-    game.scene.clearEnemyHeldItemModifiers();
   });
 
   it("ignores weaknesses", async () => {
     game.override.disableCrits();
-    vi.spyOn(enemyPokemon, "getTypes").mockReturnValue([ Type.DRAGON ]);
+    vi.spyOn(enemyPokemon, "getTypes").mockReturnValue([PokemonType.DRAGON]);
 
     game.move.select(Moves.DRAGON_RAGE);
     await game.phaseInterceptor.to(TurnEndPhase);
@@ -67,7 +63,7 @@ describe("Moves - Dragon Rage", () => {
 
   it("ignores resistances", async () => {
     game.override.disableCrits();
-    vi.spyOn(enemyPokemon, "getTypes").mockReturnValue([ Type.STEEL ]);
+    vi.spyOn(enemyPokemon, "getTypes").mockReturnValue([PokemonType.STEEL]);
 
     game.move.select(Moves.DRAGON_RAGE);
     await game.phaseInterceptor.to(TurnEndPhase);
@@ -87,7 +83,7 @@ describe("Moves - Dragon Rage", () => {
 
   it("ignores stab", async () => {
     game.override.disableCrits();
-    vi.spyOn(partyPokemon, "getTypes").mockReturnValue([ Type.DRAGON ]);
+    vi.spyOn(partyPokemon, "getTypes").mockReturnValue([PokemonType.DRAGON]);
 
     game.move.select(Moves.DRAGON_RAGE);
     await game.phaseInterceptor.to(TurnEndPhase);
diff --git a/src/test/moves/dragon_tail.test.ts b/test/moves/dragon_tail.test.ts
similarity index 78%
rename from src/test/moves/dragon_tail.test.ts
rename to test/moves/dragon_tail.test.ts
index 96db67279d3..31e5560d4e0 100644
--- a/src/test/moves/dragon_tail.test.ts
+++ b/test/moves/dragon_tail.test.ts
@@ -1,13 +1,13 @@
 import { BattlerIndex } from "#app/battle";
-import { allMoves } from "#app/data/move";
+import { allMoves } from "#app/data/moves/move";
 import { Status } from "#app/data/status-effect";
 import { Challenges } from "#enums/challenges";
 import { StatusEffect } from "#enums/status-effect";
-import { Type } from "#enums/type";
+import { PokemonType } from "#enums/pokemon-type";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
@@ -27,8 +27,9 @@ describe("Moves - Dragon Tail", () => {
 
   beforeEach(() => {
     game = new GameManager(phaserGame);
-    game.override.battleType("single")
-      .moveset([ Moves.DRAGON_TAIL, Moves.SPLASH, Moves.FLAMETHROWER ])
+    game.override
+      .battleStyle("single")
+      .moveset([Moves.DRAGON_TAIL, Moves.SPLASH, Moves.FLAMETHROWER])
       .enemySpecies(Species.WAILORD)
       .enemyMoveset(Moves.SPLASH)
       .startingLevel(5)
@@ -38,7 +39,7 @@ describe("Moves - Dragon Tail", () => {
   });
 
   it("should cause opponent to flee, and not crash", async () => {
-    await game.classicMode.startBattle([ Species.DRATINI ]);
+    await game.classicMode.startBattle([Species.DRATINI]);
 
     const enemyPokemon = game.scene.getEnemyPokemon()!;
 
@@ -56,7 +57,7 @@ describe("Moves - Dragon Tail", () => {
 
   it("should cause opponent to flee, display ability, and not crash", async () => {
     game.override.enemyAbility(Abilities.ROUGH_SKIN);
-    await game.classicMode.startBattle([ Species.DRATINI ]);
+    await game.classicMode.startBattle([Species.DRATINI]);
 
     const leadPokemon = game.scene.getPlayerPokemon()!;
     const enemyPokemon = game.scene.getEnemyPokemon()!;
@@ -72,10 +73,8 @@ describe("Moves - Dragon Tail", () => {
   });
 
   it("should proceed without crashing in a double battle", async () => {
-    game.override
-      .battleType("double").enemyMoveset(Moves.SPLASH)
-      .enemyAbility(Abilities.ROUGH_SKIN);
-    await game.classicMode.startBattle([ Species.DRATINI, Species.DRATINI, Species.WAILORD, Species.WAILORD ]);
+    game.override.battleStyle("double").enemyMoveset(Moves.SPLASH).enemyAbility(Abilities.ROUGH_SKIN);
+    await game.classicMode.startBattle([Species.DRATINI, Species.DRATINI, Species.WAILORD, Species.WAILORD]);
 
     const leadPokemon = game.scene.getPlayerParty()[0]!;
 
@@ -103,11 +102,8 @@ describe("Moves - Dragon Tail", () => {
   });
 
   it("should redirect targets upon opponent flee", async () => {
-    game.override
-      .battleType("double")
-      .enemyMoveset(Moves.SPLASH)
-      .enemyAbility(Abilities.ROUGH_SKIN);
-    await game.classicMode.startBattle([ Species.DRATINI, Species.DRATINI, Species.WAILORD, Species.WAILORD ]);
+    game.override.battleStyle("double").enemyMoveset(Moves.SPLASH).enemyAbility(Abilities.ROUGH_SKIN);
+    await game.classicMode.startBattle([Species.DRATINI, Species.DRATINI, Species.WAILORD, Species.WAILORD]);
 
     const leadPokemon = game.scene.getPlayerParty()[0]!;
     const secPokemon = game.scene.getPlayerParty()[1]!;
@@ -134,7 +130,7 @@ describe("Moves - Dragon Tail", () => {
 
   it("doesn't switch out if the target has suction cups", async () => {
     game.override.enemyAbility(Abilities.SUCTION_CUPS);
-    await game.classicMode.startBattle([ Species.REGIELEKI ]);
+    await game.classicMode.startBattle([Species.REGIELEKI]);
 
     const enemy = game.scene.getEnemyPokemon()!;
 
@@ -145,9 +141,8 @@ describe("Moves - Dragon Tail", () => {
   });
 
   it("should force a switch upon fainting an opponent normally", async () => {
-    game.override.startingWave(5)
-      .startingLevel(1000); // To make sure Dragon Tail KO's the opponent
-    await game.classicMode.startBattle([ Species.DRATINI ]);
+    game.override.startingWave(5).startingLevel(1000); // To make sure Dragon Tail KO's the opponent
+    await game.classicMode.startBattle([Species.DRATINI]);
 
     game.move.select(Moves.DRAGON_TAIL);
 
@@ -165,10 +160,11 @@ describe("Moves - Dragon Tail", () => {
   });
 
   it("should not cause a softlock when activating an opponent trainer's reviver seed", async () => {
-    game.override.startingWave(5)
+    game.override
+      .startingWave(5)
       .enemyHeldItems([{ name: "REVIVER_SEED" }])
       .startingLevel(1000); // To make sure Dragon Tail KO's the opponent
-    await game.classicMode.startBattle([ Species.DRATINI ]);
+    await game.classicMode.startBattle([Species.DRATINI]);
 
     game.move.select(Moves.DRAGON_TAIL);
 
@@ -182,10 +178,11 @@ describe("Moves - Dragon Tail", () => {
   });
 
   it("should not cause a softlock when activating a player's reviver seed", async () => {
-    game.override.startingHeldItems([{ name: "REVIVER_SEED" }])
+    game.override
+      .startingHeldItems([{ name: "REVIVER_SEED" }])
       .enemyMoveset(Moves.DRAGON_TAIL)
       .enemyLevel(1000); // To make sure Dragon Tail KO's the player
-    await game.classicMode.startBattle([ Species.DRATINI, Species.BULBASAUR ]);
+    await game.classicMode.startBattle([Species.DRATINI, Species.BULBASAUR]);
 
     game.move.select(Moves.SPLASH);
 
@@ -199,15 +196,13 @@ describe("Moves - Dragon Tail", () => {
   });
 
   it("should force switches randomly", async () => {
-    game.override.enemyMoveset(Moves.DRAGON_TAIL)
-      .startingLevel(100)
-      .enemyLevel(1);
-    await game.classicMode.startBattle([ Species.BULBASAUR, Species.CHARMANDER, Species.SQUIRTLE ]);
+    game.override.enemyMoveset(Moves.DRAGON_TAIL).startingLevel(100).enemyLevel(1);
+    await game.classicMode.startBattle([Species.BULBASAUR, Species.CHARMANDER, Species.SQUIRTLE]);
 
-    const [ bulbasaur, charmander, squirtle ] = game.scene.getPlayerParty();
+    const [bulbasaur, charmander, squirtle] = game.scene.getPlayerParty();
 
     // Turn 1: Mock an RNG call that calls for switching to 1st backup Pokemon (Charmander)
-    vi.spyOn(game.scene, "randBattleSeedInt").mockImplementation((range, min: number = 0) => {
+    vi.spyOn(game.scene, "randBattleSeedInt").mockImplementation((_range, min = 0) => {
       return min;
     });
     game.move.select(Moves.SPLASH);
@@ -220,7 +215,7 @@ describe("Moves - Dragon Tail", () => {
     expect(bulbasaur.getInverseHp()).toBeGreaterThan(0);
 
     // Turn 2: Mock an RNG call that calls for switching to 2nd backup Pokemon (Squirtle)
-    vi.spyOn(game.scene, "randBattleSeedInt").mockImplementation((range, min: number = 0) => {
+    vi.spyOn(game.scene, "randBattleSeedInt").mockImplementation((_range, min = 0) => {
       return min + 1;
     });
     game.move.select(Moves.SPLASH);
@@ -233,17 +228,15 @@ describe("Moves - Dragon Tail", () => {
   });
 
   it("should not force a switch to a challenge-ineligible Pokemon", async () => {
-    game.override.enemyMoveset(Moves.DRAGON_TAIL)
-      .startingLevel(100)
-      .enemyLevel(1);
+    game.override.enemyMoveset(Moves.DRAGON_TAIL).startingLevel(100).enemyLevel(1);
     // Mono-Water challenge, Eevee is ineligible
-    game.challengeMode.addChallenge(Challenges.SINGLE_TYPE, Type.WATER + 1, 0);
-    await game.challengeMode.startBattle([ Species.LAPRAS, Species.EEVEE, Species.TOXAPEX, Species.PRIMARINA ]);
+    game.challengeMode.addChallenge(Challenges.SINGLE_TYPE, PokemonType.WATER + 1, 0);
+    await game.challengeMode.startBattle([Species.LAPRAS, Species.EEVEE, Species.TOXAPEX, Species.PRIMARINA]);
 
-    const [ lapras, eevee, toxapex, primarina ] = game.scene.getPlayerParty();
+    const [lapras, eevee, toxapex, primarina] = game.scene.getPlayerParty();
 
     // Turn 1: Mock an RNG call that would normally call for switching to Eevee, but it is ineligible
-    vi.spyOn(game.scene, "randBattleSeedInt").mockImplementation((range, min: number = 0) => {
+    vi.spyOn(game.scene, "randBattleSeedInt").mockImplementation((_range, min = 0) => {
       return min;
     });
     game.move.select(Moves.SPLASH);
@@ -257,12 +250,10 @@ describe("Moves - Dragon Tail", () => {
   });
 
   it("should not force a switch to a fainted Pokemon", async () => {
-    game.override.enemyMoveset([ Moves.SPLASH, Moves.DRAGON_TAIL ])
-      .startingLevel(100)
-      .enemyLevel(1);
-    await game.classicMode.startBattle([ Species.LAPRAS, Species.EEVEE, Species.TOXAPEX, Species.PRIMARINA ]);
+    game.override.enemyMoveset([Moves.SPLASH, Moves.DRAGON_TAIL]).startingLevel(100).enemyLevel(1);
+    await game.classicMode.startBattle([Species.LAPRAS, Species.EEVEE, Species.TOXAPEX, Species.PRIMARINA]);
 
-    const [ lapras, eevee, toxapex, primarina ] = game.scene.getPlayerParty();
+    const [lapras, eevee, toxapex, primarina] = game.scene.getPlayerParty();
 
     // Turn 1: Eevee faints
     eevee.hp = 0;
@@ -273,7 +264,7 @@ describe("Moves - Dragon Tail", () => {
     await game.toNextTurn();
 
     // Turn 2: Mock an RNG call that would normally call for switching to Eevee, but it is fainted
-    vi.spyOn(game.scene, "randBattleSeedInt").mockImplementation((range, min: number = 0) => {
+    vi.spyOn(game.scene, "randBattleSeedInt").mockImplementation((_range, min = 0) => {
       return min;
     });
     game.move.select(Moves.SPLASH);
@@ -288,12 +279,10 @@ describe("Moves - Dragon Tail", () => {
   });
 
   it("should not force a switch if there are no available Pokemon to switch into", async () => {
-    game.override.enemyMoveset([ Moves.SPLASH, Moves.DRAGON_TAIL ])
-      .startingLevel(100)
-      .enemyLevel(1);
-    await game.classicMode.startBattle([ Species.LAPRAS, Species.EEVEE ]);
+    game.override.enemyMoveset([Moves.SPLASH, Moves.DRAGON_TAIL]).startingLevel(100).enemyLevel(1);
+    await game.classicMode.startBattle([Species.LAPRAS, Species.EEVEE]);
 
-    const [ lapras, eevee ] = game.scene.getPlayerParty();
+    const [lapras, eevee] = game.scene.getPlayerParty();
 
     // Turn 1: Eevee faints
     eevee.hp = 0;
@@ -304,7 +293,7 @@ describe("Moves - Dragon Tail", () => {
     await game.toNextTurn();
 
     // Turn 2: Mock an RNG call that would normally call for switching to Eevee, but it is fainted
-    vi.spyOn(game.scene, "randBattleSeedInt").mockImplementation((range, min: number = 0) => {
+    vi.spyOn(game.scene, "randBattleSeedInt").mockImplementation((_range, min = 0) => {
       return min;
     });
     game.move.select(Moves.SPLASH);
diff --git a/src/test/moves/dynamax_cannon.test.ts b/test/moves/dynamax_cannon.test.ts
similarity index 79%
rename from src/test/moves/dynamax_cannon.test.ts
rename to test/moves/dynamax_cannon.test.ts
index 033d8960bad..84def8a821f 100644
--- a/src/test/moves/dynamax_cannon.test.ts
+++ b/test/moves/dynamax_cannon.test.ts
@@ -1,10 +1,11 @@
 import { BattlerIndex } from "#app/battle";
-import { allMoves } from "#app/data/move";
+import { allMoves } from "#app/data/moves/move";
 import { DamageAnimPhase } from "#app/phases/damage-anim-phase";
 import { MoveEffectPhase } from "#app/phases/move-effect-phase";
 import { Moves } from "#enums/moves";
+import type Move from "#app/data/moves/move";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
@@ -12,7 +13,7 @@ describe("Moves - Dynamax Cannon", () => {
   let phaserGame: Phaser.Game;
   let game: GameManager;
 
-  const dynamaxCannon = allMoves[Moves.DYNAMAX_CANNON];
+  let dynamaxCannon: Move;
 
   beforeAll(() => {
     phaserGame = new Phaser.Game({
@@ -25,61 +26,56 @@ describe("Moves - Dynamax Cannon", () => {
   });
 
   beforeEach(() => {
+    dynamaxCannon = allMoves[Moves.DYNAMAX_CANNON];
     game = new GameManager(phaserGame);
 
-    game.override.moveset([ dynamaxCannon.id ]);
+    game.override.moveset([dynamaxCannon.id]);
     game.override.startingLevel(200);
 
     // Note that, for Waves 1-10, the level cap is 10
     game.override.startingWave(1);
-    game.override.battleType("single");
+    game.override.battleStyle("single");
     game.override.disableCrits();
 
     game.override.enemySpecies(Species.MAGIKARP);
-    game.override.enemyMoveset([ Moves.SPLASH, Moves.SPLASH, Moves.SPLASH, Moves.SPLASH ]);
+    game.override.enemyMoveset([Moves.SPLASH, Moves.SPLASH, Moves.SPLASH, Moves.SPLASH]);
 
     vi.spyOn(dynamaxCannon, "calculateBattlePower");
   });
 
   it("should return 100 power against an enemy below level cap", async () => {
     game.override.enemyLevel(1);
-    await game.startBattle([
-      Species.ETERNATUS,
-    ]);
+    await game.startBattle([Species.ETERNATUS]);
 
     game.move.select(dynamaxCannon.id);
 
     await game.phaseInterceptor.to(MoveEffectPhase, false);
-    expect((game.scene.getCurrentPhase() as MoveEffectPhase).move.moveId).toBe(dynamaxCannon.id);
+    expect((game.scene.getCurrentPhase() as MoveEffectPhase).move.id).toBe(dynamaxCannon.id);
     await game.phaseInterceptor.to(DamageAnimPhase, false);
     expect(dynamaxCannon.calculateBattlePower).toHaveLastReturnedWith(100);
   }, 20000);
 
   it("should return 100 power against an enemy at level cap", async () => {
     game.override.enemyLevel(10);
-    await game.startBattle([
-      Species.ETERNATUS,
-    ]);
+    await game.startBattle([Species.ETERNATUS]);
 
     game.move.select(dynamaxCannon.id);
 
     await game.phaseInterceptor.to(MoveEffectPhase, false);
-    expect((game.scene.getCurrentPhase() as MoveEffectPhase).move.moveId).toBe(dynamaxCannon.id);
+    expect((game.scene.getCurrentPhase() as MoveEffectPhase).move.id).toBe(dynamaxCannon.id);
     await game.phaseInterceptor.to(DamageAnimPhase, false);
     expect(dynamaxCannon.calculateBattlePower).toHaveLastReturnedWith(100);
   }, 20000);
 
   it("should return 120 power against an enemy 1% above level cap", async () => {
     game.override.enemyLevel(101);
-    await game.startBattle([
-      Species.ETERNATUS,
-    ]);
+    await game.startBattle([Species.ETERNATUS]);
 
     game.move.select(dynamaxCannon.id);
 
     await game.phaseInterceptor.to(MoveEffectPhase, false);
     const phase = game.scene.getCurrentPhase() as MoveEffectPhase;
-    expect(phase.move.moveId).toBe(dynamaxCannon.id);
+    expect(phase.move.id).toBe(dynamaxCannon.id);
     // Force level cap to be 100
     vi.spyOn(game.scene, "getMaxExpLevel").mockReturnValue(100);
     await game.phaseInterceptor.to(DamageAnimPhase, false);
@@ -88,15 +84,13 @@ describe("Moves - Dynamax Cannon", () => {
 
   it("should return 140 power against an enemy 2% above level capp", async () => {
     game.override.enemyLevel(102);
-    await game.startBattle([
-      Species.ETERNATUS,
-    ]);
+    await game.startBattle([Species.ETERNATUS]);
 
     game.move.select(dynamaxCannon.id);
 
     await game.phaseInterceptor.to(MoveEffectPhase, false);
     const phase = game.scene.getCurrentPhase() as MoveEffectPhase;
-    expect(phase.move.moveId).toBe(dynamaxCannon.id);
+    expect(phase.move.id).toBe(dynamaxCannon.id);
     // Force level cap to be 100
     vi.spyOn(game.scene, "getMaxExpLevel").mockReturnValue(100);
     await game.phaseInterceptor.to(DamageAnimPhase, false);
@@ -105,15 +99,13 @@ describe("Moves - Dynamax Cannon", () => {
 
   it("should return 160 power against an enemy 3% above level cap", async () => {
     game.override.enemyLevel(103);
-    await game.startBattle([
-      Species.ETERNATUS,
-    ]);
+    await game.startBattle([Species.ETERNATUS]);
 
     game.move.select(dynamaxCannon.id);
 
     await game.phaseInterceptor.to(MoveEffectPhase, false);
     const phase = game.scene.getCurrentPhase() as MoveEffectPhase;
-    expect(phase.move.moveId).toBe(dynamaxCannon.id);
+    expect(phase.move.id).toBe(dynamaxCannon.id);
     // Force level cap to be 100
     vi.spyOn(game.scene, "getMaxExpLevel").mockReturnValue(100);
     await game.phaseInterceptor.to(DamageAnimPhase, false);
@@ -122,15 +114,13 @@ describe("Moves - Dynamax Cannon", () => {
 
   it("should return 180 power against an enemy 4% above level cap", async () => {
     game.override.enemyLevel(104);
-    await game.startBattle([
-      Species.ETERNATUS,
-    ]);
+    await game.startBattle([Species.ETERNATUS]);
 
     game.move.select(dynamaxCannon.id);
 
     await game.phaseInterceptor.to(MoveEffectPhase, false);
     const phase = game.scene.getCurrentPhase() as MoveEffectPhase;
-    expect(phase.move.moveId).toBe(dynamaxCannon.id);
+    expect(phase.move.id).toBe(dynamaxCannon.id);
     // Force level cap to be 100
     vi.spyOn(game.scene, "getMaxExpLevel").mockReturnValue(100);
     await game.phaseInterceptor.to(DamageAnimPhase, false);
@@ -139,15 +129,13 @@ describe("Moves - Dynamax Cannon", () => {
 
   it("should return 200 power against an enemy 5% above level cap", async () => {
     game.override.enemyLevel(105);
-    await game.startBattle([
-      Species.ETERNATUS,
-    ]);
+    await game.startBattle([Species.ETERNATUS]);
 
     game.move.select(dynamaxCannon.id);
 
     await game.phaseInterceptor.to(MoveEffectPhase, false);
     const phase = game.scene.getCurrentPhase() as MoveEffectPhase;
-    expect(phase.move.moveId).toBe(dynamaxCannon.id);
+    expect(phase.move.id).toBe(dynamaxCannon.id);
     // Force level cap to be 100
     vi.spyOn(game.scene, "getMaxExpLevel").mockReturnValue(100);
     await game.phaseInterceptor.to(DamageAnimPhase, false);
@@ -156,15 +144,13 @@ describe("Moves - Dynamax Cannon", () => {
 
   it("should return 200 power against an enemy way above level cap", async () => {
     game.override.enemyLevel(999);
-    await game.startBattle([
-      Species.ETERNATUS,
-    ]);
+    await game.startBattle([Species.ETERNATUS]);
 
     game.move.select(dynamaxCannon.id);
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
 
     await game.phaseInterceptor.to(MoveEffectPhase, false);
-    expect((game.scene.getCurrentPhase() as MoveEffectPhase).move.moveId).toBe(dynamaxCannon.id);
+    expect((game.scene.getCurrentPhase() as MoveEffectPhase).move.id).toBe(dynamaxCannon.id);
     await game.phaseInterceptor.to(DamageAnimPhase, false);
     expect(dynamaxCannon.calculateBattlePower).toHaveLastReturnedWith(200);
   }, 20000);
diff --git a/test/moves/effectiveness.test.ts b/test/moves/effectiveness.test.ts
new file mode 100644
index 00000000000..fb03f1c10a0
--- /dev/null
+++ b/test/moves/effectiveness.test.ts
@@ -0,0 +1,100 @@
+import { allMoves } from "#app/data/moves/move";
+import { getPokemonSpecies } from "#app/data/pokemon-species";
+import { TrainerSlot } from "#enums/trainer-slot";
+import { PokemonType } from "#enums/pokemon-type";
+import { Abilities } from "#app/enums/abilities";
+import { Moves } from "#app/enums/moves";
+import { Species } from "#app/enums/species";
+import * as Messages from "#app/messages";
+import GameManager from "#test/testUtils/gameManager";
+import Phaser from "phaser";
+import { afterEach, beforeAll, describe, expect, it, vi } from "vitest";
+
+function testMoveEffectiveness(
+  game: GameManager,
+  move: Moves,
+  targetSpecies: Species,
+  expected: number,
+  targetAbility: Abilities = Abilities.BALL_FETCH,
+  teraType?: PokemonType,
+): void {
+  // Suppress getPokemonNameWithAffix because it calls on a null battle spec
+  vi.spyOn(Messages, "getPokemonNameWithAffix").mockReturnValue("");
+  game.override.enemyAbility(targetAbility);
+
+  const user = game.scene.addPlayerPokemon(getPokemonSpecies(Species.SNORLAX), 5);
+  const target = game.scene.addEnemyPokemon(getPokemonSpecies(targetSpecies), 5, TrainerSlot.NONE);
+
+  if (teraType !== undefined) {
+    target.teraType = teraType;
+    target.isTerastallized = true;
+  }
+
+  expect(target.getMoveEffectiveness(user, allMoves[move])).toBe(expected);
+  user.destroy();
+  target.destroy();
+}
+
+describe("Moves - Type Effectiveness", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+    game = new GameManager(phaserGame);
+
+    game.override.ability(Abilities.BALL_FETCH);
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  it("Normal-type attacks are neutrally effective against Normal-type Pokemon", () =>
+    testMoveEffectiveness(game, Moves.TACKLE, Species.SNORLAX, 1));
+
+  it("Normal-type attacks are not very effective against Steel-type Pokemon", () =>
+    testMoveEffectiveness(game, Moves.TACKLE, Species.REGISTEEL, 0.5));
+
+  it("Normal-type attacks are doubly resisted by Steel/Rock-type Pokemon", () =>
+    testMoveEffectiveness(game, Moves.TACKLE, Species.AGGRON, 0.25));
+
+  it("Normal-type attacks have no effect on Ghost-type Pokemon", () =>
+    testMoveEffectiveness(game, Moves.TACKLE, Species.DUSCLOPS, 0));
+
+  it("Normal-type status moves are not affected by type matchups", () =>
+    testMoveEffectiveness(game, Moves.GROWL, Species.DUSCLOPS, 1));
+
+  it("Electric-type attacks are super-effective against Water-type Pokemon", () =>
+    testMoveEffectiveness(game, Moves.THUNDERBOLT, Species.BLASTOISE, 2));
+
+  it("Ghost-type attacks have no effect on Normal-type Pokemon", () =>
+    testMoveEffectiveness(game, Moves.SHADOW_BALL, Species.URSALUNA, 0));
+
+  it("Electric-type attacks are doubly super-effective against Water/Flying-type Pokemon", () =>
+    testMoveEffectiveness(game, Moves.THUNDERBOLT, Species.GYARADOS, 4));
+
+  it("Electric-type attacks are negated by Volt Absorb", () =>
+    testMoveEffectiveness(game, Moves.THUNDERBOLT, Species.GYARADOS, 0, Abilities.VOLT_ABSORB));
+
+  it("Electric-type attacks are super-effective against Tera-Water Pokemon", () =>
+    testMoveEffectiveness(game, Moves.THUNDERBOLT, Species.EXCADRILL, 2, Abilities.BALL_FETCH, PokemonType.WATER));
+
+  it("Powder moves have no effect on Grass-type Pokemon", () =>
+    testMoveEffectiveness(game, Moves.SLEEP_POWDER, Species.AMOONGUSS, 0));
+
+  it("Powder moves have no effect on Tera-Grass Pokemon", () =>
+    testMoveEffectiveness(game, Moves.SLEEP_POWDER, Species.SNORLAX, 0, Abilities.BALL_FETCH, PokemonType.GRASS));
+
+  it("Prankster-boosted status moves have no effect on Dark-type Pokemon", () => {
+    game.override.ability(Abilities.PRANKSTER);
+    testMoveEffectiveness(game, Moves.BABY_DOLL_EYES, Species.MIGHTYENA, 0);
+  });
+
+  it("Prankster-boosted status moves have no effect on Tera-Dark Pokemon", () => {
+    game.override.ability(Abilities.PRANKSTER);
+    testMoveEffectiveness(game, Moves.BABY_DOLL_EYES, Species.SNORLAX, 0, Abilities.BALL_FETCH, PokemonType.DARK);
+  });
+});
diff --git a/src/test/moves/electrify.test.ts b/test/moves/electrify.test.ts
similarity index 74%
rename from src/test/moves/electrify.test.ts
rename to test/moves/electrify.test.ts
index 8015dd0a74d..25529e0b552 100644
--- a/src/test/moves/electrify.test.ts
+++ b/test/moves/electrify.test.ts
@@ -1,9 +1,9 @@
 import { BattlerIndex } from "#app/battle";
-import { Type } from "#enums/type";
+import { PokemonType } from "#enums/pokemon-type";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, it, expect, vi } from "vitest";
 
@@ -25,7 +25,7 @@ describe("Moves - Electrify", () => {
     game = new GameManager(phaserGame);
     game.override
       .moveset(Moves.ELECTRIFY)
-      .battleType("single")
+      .battleStyle("single")
       .startingLevel(100)
       .enemySpecies(Species.SNORLAX)
       .enemyAbility(Abilities.BALL_FETCH)
@@ -34,7 +34,7 @@ describe("Moves - Electrify", () => {
   });
 
   it("should convert attacks to Electric type", async () => {
-    await game.classicMode.startBattle([ Species.EXCADRILL ]);
+    await game.classicMode.startBattle([Species.EXCADRILL]);
 
     const playerPokemon = game.scene.getPlayerPokemon()!;
     const enemyPokemon = game.scene.getEnemyPokemon()!;
@@ -42,17 +42,17 @@ describe("Moves - Electrify", () => {
 
     game.move.select(Moves.ELECTRIFY);
 
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
 
     await game.phaseInterceptor.to("BerryPhase", false);
-    expect(enemyPokemon.getMoveType).toHaveLastReturnedWith(Type.ELECTRIC);
+    expect(enemyPokemon.getMoveType).toHaveLastReturnedWith(PokemonType.ELECTRIC);
     expect(playerPokemon.hp).toBe(playerPokemon.getMaxHp());
   });
 
   it("should override type changes from abilities", async () => {
     game.override.enemyAbility(Abilities.PIXILATE);
 
-    await game.classicMode.startBattle([ Species.EXCADRILL ]);
+    await game.classicMode.startBattle([Species.EXCADRILL]);
 
     const playerPokemon = game.scene.getPlayerPokemon()!;
     const enemyPokemon = game.scene.getPlayerPokemon()!;
@@ -60,10 +60,10 @@ describe("Moves - Electrify", () => {
 
     game.move.select(Moves.ELECTRIFY);
 
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
 
     await game.phaseInterceptor.to("BerryPhase", false);
-    expect(enemyPokemon.getMoveType).toHaveLastReturnedWith(Type.ELECTRIC);
+    expect(enemyPokemon.getMoveType).toHaveLastReturnedWith(PokemonType.ELECTRIC);
     expect(playerPokemon.hp).toBe(playerPokemon.getMaxHp());
   });
 });
diff --git a/src/test/moves/electro_shot.test.ts b/test/moves/electro_shot.test.ts
similarity index 88%
rename from src/test/moves/electro_shot.test.ts
rename to test/moves/electro_shot.test.ts
index 283154b3408..0122bf04281 100644
--- a/src/test/moves/electro_shot.test.ts
+++ b/test/moves/electro_shot.test.ts
@@ -5,7 +5,7 @@ import { MoveResult } from "#app/field/pokemon";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, it, expect } from "vitest";
 
@@ -27,7 +27,7 @@ describe("Moves - Electro Shot", () => {
     game = new GameManager(phaserGame);
     game.override
       .moveset(Moves.ELECTRO_SHOT)
-      .battleType("single")
+      .battleStyle("single")
       .startingLevel(100)
       .enemySpecies(Species.SNORLAX)
       .enemyLevel(100)
@@ -36,7 +36,7 @@ describe("Moves - Electro Shot", () => {
   });
 
   it("should increase the user's Sp. Atk on the first turn, then attack on the second turn", async () => {
-    await game.classicMode.startBattle([ Species.MAGIKARP ]);
+    await game.classicMode.startBattle([Species.MAGIKARP]);
 
     const playerPokemon = game.scene.getPlayerPokemon()!;
     const enemyPokemon = game.scene.getEnemyPokemon()!;
@@ -62,11 +62,11 @@ describe("Moves - Electro Shot", () => {
 
   it.each([
     { weatherType: WeatherType.RAIN, name: "Rain" },
-    { weatherType: WeatherType.HEAVY_RAIN, name: "Heavy Rain" }
+    { weatherType: WeatherType.HEAVY_RAIN, name: "Heavy Rain" },
   ])("should fully resolve in one turn if $name is active", async ({ weatherType }) => {
     game.override.weather(weatherType);
 
-    await game.classicMode.startBattle([ Species.MAGIKARP ]);
+    await game.classicMode.startBattle([Species.MAGIKARP]);
 
     const playerPokemon = game.scene.getPlayerPokemon()!;
     const enemyPokemon = game.scene.getEnemyPokemon()!;
@@ -87,11 +87,9 @@ describe("Moves - Electro Shot", () => {
   });
 
   it("should only increase Sp. Atk once with Multi-Lens", async () => {
-    game.override
-      .weather(WeatherType.RAIN)
-      .startingHeldItems([{ name: "MULTI_LENS", count: 1 }]);
+    game.override.weather(WeatherType.RAIN).startingHeldItems([{ name: "MULTI_LENS", count: 1 }]);
 
-    await game.classicMode.startBattle([ Species.MAGIKARP ]);
+    await game.classicMode.startBattle([Species.MAGIKARP]);
 
     const playerPokemon = game.scene.getPlayerPokemon()!;
 
diff --git a/src/test/moves/encore.test.ts b/test/moves/encore.test.ts
similarity index 82%
rename from src/test/moves/encore.test.ts
rename to test/moves/encore.test.ts
index 7d8dc9658bf..519e7860c04 100644
--- a/src/test/moves/encore.test.ts
+++ b/test/moves/encore.test.ts
@@ -4,7 +4,7 @@ import { MoveResult } from "#app/field/pokemon";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
@@ -25,19 +25,19 @@ describe("Moves - Encore", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     game.override
-      .moveset([ Moves.SPLASH, Moves.ENCORE ])
+      .moveset([Moves.SPLASH, Moves.ENCORE])
       .ability(Abilities.BALL_FETCH)
-      .battleType("single")
+      .battleStyle("single")
       .disableCrits()
       .enemySpecies(Species.MAGIKARP)
       .enemyAbility(Abilities.BALL_FETCH)
-      .enemyMoveset([ Moves.SPLASH, Moves.TACKLE ])
+      .enemyMoveset([Moves.SPLASH, Moves.TACKLE])
       .startingLevel(100)
       .enemyLevel(100);
   });
 
   it("should prevent the target from using any move except the last used move", async () => {
-    await game.classicMode.startBattle([ Species.SNORLAX ]);
+    await game.classicMode.startBattle([Species.SNORLAX]);
 
     const enemyPokemon = game.scene.getEnemyPokemon()!;
 
@@ -61,26 +61,24 @@ describe("Moves - Encore", () => {
       { moveId: Moves.MIMIC, name: "Mimic", delay: true },
       { moveId: Moves.SKETCH, name: "Sketch", delay: true },
       { moveId: Moves.ENCORE, name: "Encore", delay: false },
-      { moveId: Moves.STRUGGLE, name: "Struggle", delay: false }
+      { moveId: Moves.STRUGGLE, name: "Struggle", delay: false },
     ])("$name", async ({ moveId, delay }) => {
       game.override.enemyMoveset(moveId);
 
-      await game.classicMode.startBattle([ Species.SNORLAX ]);
+      await game.classicMode.startBattle([Species.SNORLAX]);
 
       const playerPokemon = game.scene.getPlayerPokemon()!;
       const enemyPokemon = game.scene.getEnemyPokemon()!;
 
       if (delay) {
         game.move.select(Moves.SPLASH);
-        await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]);
+        await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
         await game.toNextTurn();
       }
 
       game.move.select(Moves.ENCORE);
 
-      const turnOrder = delay
-        ? [ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]
-        : [ BattlerIndex.ENEMY, BattlerIndex.PLAYER ];
+      const turnOrder = delay ? [BattlerIndex.PLAYER, BattlerIndex.ENEMY] : [BattlerIndex.ENEMY, BattlerIndex.PLAYER];
       await game.setTurnOrder(turnOrder);
 
       await game.phaseInterceptor.to("BerryPhase", false);
@@ -90,9 +88,9 @@ describe("Moves - Encore", () => {
   });
 
   it("Pokemon under both Encore and Torment should alternate between Struggle and restricted move", async () => {
-    const turnOrder = [ BattlerIndex.ENEMY, BattlerIndex.PLAYER ];
-    game.override.moveset([ Moves.ENCORE, Moves.TORMENT, Moves.SPLASH ]);
-    await game.classicMode.startBattle([ Species.FEEBAS ]);
+    const turnOrder = [BattlerIndex.ENEMY, BattlerIndex.PLAYER];
+    game.override.moveset([Moves.ENCORE, Moves.TORMENT, Moves.SPLASH]);
+    await game.classicMode.startBattle([Species.FEEBAS]);
 
     const enemyPokemon = game.scene.getEnemyPokemon();
     game.move.select(Moves.ENCORE);
diff --git a/test/moves/endure.test.ts b/test/moves/endure.test.ts
new file mode 100644
index 00000000000..190a689f46e
--- /dev/null
+++ b/test/moves/endure.test.ts
@@ -0,0 +1,86 @@
+import { Abilities } from "#enums/abilities";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import GameManager from "#test/testUtils/gameManager";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
+
+describe("Moves - Endure", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+    game.override
+      .moveset([Moves.THUNDER, Moves.BULLET_SEED, Moves.TOXIC, Moves.SHEER_COLD])
+      .ability(Abilities.SKILL_LINK)
+      .startingLevel(100)
+      .battleStyle("single")
+      .disableCrits()
+      .enemySpecies(Species.MAGIKARP)
+      .enemyAbility(Abilities.NO_GUARD)
+      .enemyMoveset(Moves.ENDURE);
+  });
+
+  it("should let the pokemon survive with 1 HP", async () => {
+    await game.classicMode.startBattle([Species.ARCEUS]);
+
+    game.move.select(Moves.THUNDER);
+    await game.phaseInterceptor.to("BerryPhase");
+
+    expect(game.scene.getEnemyPokemon()!.hp).toBe(1);
+  });
+
+  it("should let the pokemon survive with 1 HP when hit with a multihit move", async () => {
+    await game.classicMode.startBattle([Species.ARCEUS]);
+
+    game.move.select(Moves.BULLET_SEED);
+    await game.phaseInterceptor.to("BerryPhase");
+
+    expect(game.scene.getEnemyPokemon()!.hp).toBe(1);
+  });
+
+  it("should let the pokemon survive against OHKO moves", async () => {
+    await game.classicMode.startBattle([Species.MAGIKARP]);
+    const enemy = game.scene.getEnemyPokemon()!;
+
+    game.move.select(Moves.SHEER_COLD);
+    await game.phaseInterceptor.to("TurnEndPhase");
+
+    expect(enemy.isFainted()).toBeFalsy();
+  });
+
+  // comprehensive indirect damage test copied from Reviver Seed test
+  it.each([
+    { moveType: "Damaging Move Chip Damage", move: Moves.SALT_CURE },
+    { moveType: "Chip Damage", move: Moves.LEECH_SEED },
+    { moveType: "Trapping Chip Damage", move: Moves.WHIRLPOOL },
+    { moveType: "Status Effect Damage", move: Moves.TOXIC },
+    { moveType: "Weather", move: Moves.SANDSTORM },
+  ])("should not prevent fainting from $moveType", async ({ move }) => {
+    game.override
+      .enemyLevel(1)
+      .startingLevel(100)
+      .enemySpecies(Species.MAGIKARP)
+      .moveset(move)
+      .enemyMoveset(Moves.ENDURE);
+    await game.classicMode.startBattle([Species.MAGIKARP, Species.FEEBAS]);
+    const enemy = game.scene.getEnemyPokemon()!;
+    enemy.damageAndUpdate(enemy.hp - 1);
+
+    game.move.select(move);
+    await game.phaseInterceptor.to("TurnEndPhase");
+
+    expect(enemy.isFainted()).toBeTruthy();
+  });
+});
diff --git a/test/moves/entrainment.test.ts b/test/moves/entrainment.test.ts
new file mode 100644
index 00000000000..31a8ffcab85
--- /dev/null
+++ b/test/moves/entrainment.test.ts
@@ -0,0 +1,53 @@
+import { Stat } from "#app/enums/stat";
+import { Abilities } from "#enums/abilities";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import GameManager from "#test/testUtils/gameManager";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
+
+describe("Moves - Entrainment", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+    game.override
+      .moveset([Moves.SPLASH, Moves.ENTRAINMENT])
+      .ability(Abilities.ADAPTABILITY)
+      .battleStyle("single")
+      .disableCrits()
+      .enemySpecies(Species.MAGIKARP)
+      .enemyAbility(Abilities.BALL_FETCH)
+      .enemyMoveset(Moves.SPLASH);
+  });
+
+  it("gives its ability to the target", async () => {
+    await game.classicMode.startBattle([Species.FEEBAS]);
+
+    game.move.select(Moves.ENTRAINMENT);
+    await game.phaseInterceptor.to("BerryPhase");
+
+    expect(game.scene.getEnemyPokemon()?.getAbility().id).toBe(Abilities.ADAPTABILITY);
+  });
+
+  it("should activate post-summon abilities", async () => {
+    game.override.ability(Abilities.INTIMIDATE);
+    await game.classicMode.startBattle([Species.FEEBAS]);
+
+    game.move.select(Moves.ENTRAINMENT);
+    await game.phaseInterceptor.to("BerryPhase");
+
+    expect(game.scene.getPlayerPokemon()?.getStatStage(Stat.ATK)).toBe(-1);
+  });
+});
diff --git a/src/test/moves/fairy_lock.test.ts b/test/moves/fairy_lock.test.ts
similarity index 88%
rename from src/test/moves/fairy_lock.test.ts
rename to test/moves/fairy_lock.test.ts
index ceb298ed0fe..e967221bcae 100644
--- a/src/test/moves/fairy_lock.test.ts
+++ b/test/moves/fairy_lock.test.ts
@@ -3,7 +3,7 @@ import { ArenaTagType } from "#app/enums/arena-tag-type";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
@@ -24,17 +24,17 @@ describe("Moves - Fairy Lock", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     game.override
-      .moveset([ Moves.FAIRY_LOCK, Moves.SPLASH ])
+      .moveset([Moves.FAIRY_LOCK, Moves.SPLASH])
       .ability(Abilities.BALL_FETCH)
-      .battleType("double")
+      .battleStyle("double")
       .disableCrits()
       .enemySpecies(Species.MAGIKARP)
       .enemyAbility(Abilities.BALL_FETCH)
-      .enemyMoveset([ Moves.SPLASH, Moves.U_TURN ]);
+      .enemyMoveset([Moves.SPLASH, Moves.U_TURN]);
   });
 
   it("Applies Fairy Lock tag for two turns", async () => {
-    await game.classicMode.startBattle([ Species.KLEFKI, Species.TYRUNT ]);
+    await game.classicMode.startBattle([Species.KLEFKI, Species.TYRUNT]);
     const playerPokemon = game.scene.getPlayerField();
     const enemyField = game.scene.getEnemyField();
 
@@ -66,7 +66,7 @@ describe("Moves - Fairy Lock", () => {
   });
 
   it("Ghost types can escape Fairy Lock", async () => {
-    await game.classicMode.startBattle([ Species.DUSKNOIR, Species.GENGAR, Species.TYRUNT ]);
+    await game.classicMode.startBattle([Species.DUSKNOIR, Species.GENGAR, Species.TYRUNT]);
 
     game.move.select(Moves.FAIRY_LOCK);
     game.move.select(Moves.SPLASH, 1);
@@ -93,8 +93,8 @@ describe("Moves - Fairy Lock", () => {
   });
 
   it("Phasing moves will still switch out", async () => {
-    game.override.enemyMoveset([ Moves.SPLASH, Moves.WHIRLWIND ]);
-    await game.classicMode.startBattle([ Species.KLEFKI, Species.TYRUNT, Species.ZYGARDE ]);
+    game.override.enemyMoveset([Moves.SPLASH, Moves.WHIRLWIND]);
+    await game.classicMode.startBattle([Species.KLEFKI, Species.TYRUNT, Species.ZYGARDE]);
 
     game.move.select(Moves.FAIRY_LOCK);
     game.move.select(Moves.SPLASH, 1);
@@ -120,8 +120,8 @@ describe("Moves - Fairy Lock", () => {
   });
 
   it("If a Pokemon faints and is replaced the replacement is also trapped", async () => {
-    game.override.moveset([ Moves.FAIRY_LOCK, Moves.SPLASH, Moves.MEMENTO ]);
-    await game.classicMode.startBattle([ Species.KLEFKI, Species.GUZZLORD, Species.TYRUNT, Species.ZYGARDE ]);
+    game.override.moveset([Moves.FAIRY_LOCK, Moves.SPLASH, Moves.MEMENTO]);
+    await game.classicMode.startBattle([Species.KLEFKI, Species.GUZZLORD, Species.TYRUNT, Species.ZYGARDE]);
 
     game.move.select(Moves.FAIRY_LOCK);
     game.move.select(Moves.MEMENTO, 1);
diff --git a/test/moves/fake_out.test.ts b/test/moves/fake_out.test.ts
new file mode 100644
index 00000000000..404473c8fa0
--- /dev/null
+++ b/test/moves/fake_out.test.ts
@@ -0,0 +1,106 @@
+import GameManager from "#test/testUtils/gameManager";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
+
+describe("Moves - Fake Out", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+    game.override
+      .battleStyle("single")
+      .enemySpecies(Species.CORVIKNIGHT)
+      .moveset([Moves.FAKE_OUT, Moves.SPLASH])
+      .enemyMoveset(Moves.SPLASH)
+      .enemyLevel(10)
+      .startingLevel(1) // prevent LevelUpPhase from happening
+      .disableCrits();
+  });
+
+  it("should only work the first turn a pokemon is sent out in a battle", async () => {
+    await game.classicMode.startBattle([Species.FEEBAS]);
+
+    const corv = game.scene.getEnemyPokemon()!;
+
+    game.move.select(Moves.FAKE_OUT);
+    await game.toNextTurn();
+
+    expect(corv.hp).toBeLessThan(corv.getMaxHp());
+    const postTurnOneHp = corv.hp;
+
+    game.move.select(Moves.FAKE_OUT);
+    await game.toNextTurn();
+
+    expect(corv.hp).toBe(postTurnOneHp);
+  });
+
+  // This is a PokeRogue buff to Fake Out
+  it("should succeed at the start of each new wave, even if user wasn't recalled", async () => {
+    await game.classicMode.startBattle([Species.FEEBAS]);
+
+    // set hp to 1 for easy knockout
+    game.scene.getEnemyPokemon()!.hp = 1;
+    game.move.select(Moves.FAKE_OUT);
+    await game.toNextWave();
+
+    game.move.select(Moves.FAKE_OUT);
+    await game.toNextTurn();
+
+    const corv = game.scene.getEnemyPokemon()!;
+    expect(corv).toBeDefined();
+    expect(corv?.hp).toBeLessThan(corv?.getMaxHp());
+  });
+
+  // This is a PokeRogue buff to Fake Out
+  it("should succeed at the start of each new wave, even if user wasn't recalled", async () => {
+    await game.classicMode.startBattle([Species.FEEBAS]);
+
+    // set hp to 1 for easy knockout
+    game.scene.getEnemyPokemon()!.hp = 1;
+    game.move.select(Moves.FAKE_OUT);
+    await game.toNextWave();
+
+    game.move.select(Moves.FAKE_OUT);
+    await game.toNextTurn();
+
+    const corv = game.scene.getEnemyPokemon()!;
+    expect(corv).toBeDefined();
+    expect(corv.hp).toBeLessThan(corv.getMaxHp());
+  });
+
+  it("should succeed if recalled and sent back out", async () => {
+    await game.classicMode.startBattle([Species.FEEBAS, Species.MAGIKARP]);
+
+    game.move.select(Moves.FAKE_OUT);
+    await game.toNextTurn();
+
+    const corv = game.scene.getEnemyPokemon()!;
+
+    expect(corv.hp).toBeLessThan(corv.getMaxHp());
+    corv.hp = corv.getMaxHp();
+
+    game.doSwitchPokemon(1);
+    await game.toNextTurn();
+
+    game.doSwitchPokemon(1);
+    await game.toNextTurn();
+
+    game.move.select(Moves.FAKE_OUT);
+    await game.toNextTurn();
+
+    expect(corv.hp).toBeLessThan(corv.getMaxHp());
+  });
+});
diff --git a/test/moves/false_swipe.test.ts b/test/moves/false_swipe.test.ts
new file mode 100644
index 00000000000..d6743477cae
--- /dev/null
+++ b/test/moves/false_swipe.test.ts
@@ -0,0 +1,53 @@
+import { MoveResult } from "#app/field/pokemon";
+import { Abilities } from "#enums/abilities";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import GameManager from "#test/testUtils/gameManager";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
+
+describe("Moves - False Swipe", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+    game.override
+      .moveset([Moves.FALSE_SWIPE])
+      .ability(Abilities.BALL_FETCH)
+      .startingLevel(1000)
+      .battleStyle("single")
+      .disableCrits()
+      .enemySpecies(Species.MAGIKARP)
+      .enemyAbility(Abilities.BALL_FETCH)
+      .enemyMoveset(Moves.SPLASH);
+  });
+
+  it("should reduce the target to 1 HP", async () => {
+    await game.classicMode.startBattle([Species.MILOTIC]);
+
+    const player = game.scene.getPlayerPokemon()!;
+    const enemy = game.scene.getEnemyPokemon()!;
+
+    game.move.select(Moves.FALSE_SWIPE);
+    await game.toNextTurn();
+    game.move.select(Moves.FALSE_SWIPE);
+    await game.phaseInterceptor.to("BerryPhase");
+
+    expect(enemy.hp).toBe(1);
+    const falseSwipeHistory = player
+      .getMoveHistory()
+      .every(turnMove => turnMove.move === Moves.FALSE_SWIPE && turnMove.result === MoveResult.SUCCESS);
+    expect(falseSwipeHistory).toBe(true);
+  });
+});
diff --git a/src/test/moves/fell_stinger.test.ts b/test/moves/fell_stinger.test.ts
similarity index 79%
rename from src/test/moves/fell_stinger.test.ts
rename to test/moves/fell_stinger.test.ts
index a901ddced44..11731d8a06f 100644
--- a/src/test/moves/fell_stinger.test.ts
+++ b/test/moves/fell_stinger.test.ts
@@ -1,14 +1,13 @@
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
-import GameManager from "../utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import { Species } from "#enums/species";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Stat } from "#enums/stat";
 import { StatusEffect } from "#app/enums/status-effect";
 import { WeatherType } from "#app/enums/weather-type";
-import { allMoves } from "#app/data/move";
-
+import { allMoves } from "#app/data/moves/move";
 
 describe("Moves - Fell Stinger", () => {
   let phaserGame: Phaser.Game;
@@ -27,13 +26,9 @@ describe("Moves - Fell Stinger", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
 
-    game.override.battleType("single")
-      .moveset([
-        Moves.FELL_STINGER,
-        Moves.SALT_CURE,
-        Moves.BIND,
-        Moves.LEECH_SEED
-      ])
+    game.override
+      .battleStyle("single")
+      .moveset([Moves.FELL_STINGER, Moves.SALT_CURE, Moves.BIND, Moves.LEECH_SEED])
       .startingLevel(50)
       .disableCrits()
       .enemyAbility(Abilities.STURDY)
@@ -43,9 +38,9 @@ describe("Moves - Fell Stinger", () => {
   });
 
   it("should not grant stat boost if opponent gets KO'd by recoil", async () => {
-    game.override.enemyMoveset([ Moves.DOUBLE_EDGE ]);
+    game.override.enemyMoveset([Moves.DOUBLE_EDGE]);
 
-    await game.classicMode.startBattle([ Species.LEAVANNY ]);
+    await game.classicMode.startBattle([Species.LEAVANNY]);
     const leadPokemon = game.scene.getPlayerPokemon()!;
     game.move.select(Moves.FELL_STINGER);
 
@@ -55,11 +50,9 @@ describe("Moves - Fell Stinger", () => {
   });
 
   it("should not grant stat boost if enemy is KO'd by status effect", async () => {
-    game.override
-      .enemyMoveset(Moves.SPLASH)
-      .enemyStatusEffect(StatusEffect.BURN);
+    game.override.enemyMoveset(Moves.SPLASH).enemyStatusEffect(StatusEffect.BURN);
 
-    await game.classicMode.startBattle([ Species.LEAVANNY ]);
+    await game.classicMode.startBattle([Species.LEAVANNY]);
     const leadPokemon = game.scene.getPlayerPokemon()!;
     game.move.select(Moves.FELL_STINGER);
 
@@ -71,7 +64,7 @@ describe("Moves - Fell Stinger", () => {
   it("should not grant stat boost if enemy is KO'd by damaging weather", async () => {
     game.override.weather(WeatherType.HAIL);
 
-    await game.classicMode.startBattle([ Species.LEAVANNY ]);
+    await game.classicMode.startBattle([Species.LEAVANNY]);
     const leadPokemon = game.scene.getPlayerPokemon()!;
 
     game.move.select(Moves.FELL_STINGER);
@@ -82,12 +75,9 @@ describe("Moves - Fell Stinger", () => {
   });
 
   it("should not grant stat boost if enemy is KO'd by Dry Skin + Harsh Sunlight", async () => {
-    game.override
-      .enemyPassiveAbility(Abilities.STURDY)
-      .enemyAbility(Abilities.DRY_SKIN)
-      .weather(WeatherType.HARSH_SUN);
+    game.override.enemyPassiveAbility(Abilities.STURDY).enemyAbility(Abilities.DRY_SKIN).weather(WeatherType.HARSH_SUN);
 
-    await game.challengeMode.startBattle([ Species.LEAVANNY ]);
+    await game.challengeMode.startBattle([Species.LEAVANNY]);
     const leadPokemon = game.scene.getPlayerPokemon()!;
 
     game.move.select(Moves.FELL_STINGER);
@@ -98,11 +88,9 @@ describe("Moves - Fell Stinger", () => {
   });
 
   it("should not grant stat boost if enemy is saved by Reviver Seed", async () => {
-    game.override
-      .enemyAbility(Abilities.BALL_FETCH)
-      .enemyHeldItems([{ name: "REVIVER_SEED" }]);
+    game.override.enemyAbility(Abilities.BALL_FETCH).enemyHeldItems([{ name: "REVIVER_SEED" }]);
 
-    await game.classicMode.startBattle([ Species.LEAVANNY ]);
+    await game.classicMode.startBattle([Species.LEAVANNY]);
     const leadPokemon = game.scene.getPlayerPokemon()!;
     game.move.select(Moves.FELL_STINGER);
 
@@ -111,14 +99,13 @@ describe("Moves - Fell Stinger", () => {
   });
 
   it("should not grant stat boost if enemy is KO'd by Salt Cure", async () => {
-    game.override.battleType("double")
-      .startingLevel(5);
+    game.override.battleStyle("double").startingLevel(5);
     const saltCure = allMoves[Moves.SALT_CURE];
     const fellStinger = allMoves[Moves.FELL_STINGER];
     vi.spyOn(saltCure, "accuracy", "get").mockReturnValue(100);
     vi.spyOn(fellStinger, "power", "get").mockReturnValue(50000);
 
-    await game.classicMode.startBattle([ Species.LEAVANNY ]);
+    await game.classicMode.startBattle([Species.LEAVANNY]);
     const leadPokemon = game.scene.getPlayerPokemon()!;
     const leftEnemy = game.scene.getEnemyField()[0]!;
 
@@ -137,12 +124,11 @@ describe("Moves - Fell Stinger", () => {
   });
 
   it("should not grant stat boost if enemy dies to Bind or a similar effect", async () => {
-    game.override.battleType("double")
-      .startingLevel(5);
+    game.override.battleStyle("double").startingLevel(5);
     vi.spyOn(allMoves[Moves.BIND], "accuracy", "get").mockReturnValue(100);
     vi.spyOn(allMoves[Moves.FELL_STINGER], "power", "get").mockReturnValue(50000);
 
-    await game.classicMode.startBattle([ Species.LEAVANNY ]);
+    await game.classicMode.startBattle([Species.LEAVANNY]);
     const leadPokemon = game.scene.getPlayerPokemon()!;
     const leftEnemy = game.scene.getEnemyField()[0]!;
 
@@ -161,12 +147,11 @@ describe("Moves - Fell Stinger", () => {
   });
 
   it("should not grant stat boost if enemy dies to Leech Seed", async () => {
-    game.override.battleType("double")
-      .startingLevel(5);
+    game.override.battleStyle("double").startingLevel(5);
     vi.spyOn(allMoves[Moves.LEECH_SEED], "accuracy", "get").mockReturnValue(100);
     vi.spyOn(allMoves[Moves.FELL_STINGER], "power", "get").mockReturnValue(50000);
 
-    await game.classicMode.startBattle([ Species.LEAVANNY ]);
+    await game.classicMode.startBattle([Species.LEAVANNY]);
     const leadPokemon = game.scene.getPlayerPokemon()!;
     const leftEnemy = game.scene.getEnemyField()[0]!;
 
@@ -187,7 +172,7 @@ describe("Moves - Fell Stinger", () => {
   it("should grant stat boost if enemy dies directly to hit", async () => {
     game.override.enemyAbility(Abilities.KLUTZ);
 
-    await game.classicMode.startBattle([ Species.LEAVANNY ]);
+    await game.classicMode.startBattle([Species.LEAVANNY]);
     const leadPokemon = game.scene.getPlayerPokemon();
     game.move.select(Moves.FELL_STINGER);
 
diff --git a/test/moves/fillet_away.test.ts b/test/moves/fillet_away.test.ts
new file mode 100644
index 00000000000..477cdf76fc7
--- /dev/null
+++ b/test/moves/fillet_away.test.ts
@@ -0,0 +1,108 @@
+import { TurnEndPhase } from "#app/phases/turn-end-phase";
+import { toDmgValue } from "#app/utils/common";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import { Stat } from "#enums/stat";
+import GameManager from "#test/testUtils/gameManager";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest";
+
+/** HP Cost of Move */
+const RATIO = 2;
+/** Amount of extra HP lost */
+const PREDAMAGE = 15;
+
+describe("Moves - FILLET AWAY", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+    game.override.starterSpecies(Species.MAGIKARP);
+    game.override.enemySpecies(Species.SNORLAX);
+    game.override.startingLevel(100);
+    game.override.enemyLevel(100);
+    game.override.moveset([Moves.FILLET_AWAY]);
+    game.override.enemyMoveset(Moves.SPLASH);
+  });
+
+  //Bulbapedia Reference: https://bulbapedia.bulbagarden.net/wiki/fillet_away_(move)
+
+  test("raises the user's ATK, SPATK, and SPD stat stages by 2 each, at the cost of 1/2 of its maximum HP", async () => {
+    await game.startBattle([Species.MAGIKARP]);
+
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+    const hpLost = toDmgValue(leadPokemon.getMaxHp() / RATIO);
+
+    game.move.select(Moves.FILLET_AWAY);
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp() - hpLost);
+    expect(leadPokemon.getStatStage(Stat.ATK)).toBe(2);
+    expect(leadPokemon.getStatStage(Stat.SPATK)).toBe(2);
+    expect(leadPokemon.getStatStage(Stat.SPD)).toBe(2);
+  });
+
+  test("still takes effect if one or more of the involved stat stages are not at max", async () => {
+    await game.startBattle([Species.MAGIKARP]);
+
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+    const hpLost = toDmgValue(leadPokemon.getMaxHp() / RATIO);
+
+    //Here - Stat.SPD -> 0 and Stat.SPATK -> 3
+    leadPokemon.setStatStage(Stat.ATK, 6);
+    leadPokemon.setStatStage(Stat.SPATK, 3);
+
+    game.move.select(Moves.FILLET_AWAY);
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp() - hpLost);
+    expect(leadPokemon.getStatStage(Stat.ATK)).toBe(6);
+    expect(leadPokemon.getStatStage(Stat.SPATK)).toBe(5);
+    expect(leadPokemon.getStatStage(Stat.SPD)).toBe(2);
+  });
+
+  test("fails if all stat stages involved are at max", async () => {
+    await game.startBattle([Species.MAGIKARP]);
+
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+
+    leadPokemon.setStatStage(Stat.ATK, 6);
+    leadPokemon.setStatStage(Stat.SPATK, 6);
+    leadPokemon.setStatStage(Stat.SPD, 6);
+
+    game.move.select(Moves.FILLET_AWAY);
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp());
+    expect(leadPokemon.getStatStage(Stat.ATK)).toBe(6);
+    expect(leadPokemon.getStatStage(Stat.SPATK)).toBe(6);
+    expect(leadPokemon.getStatStage(Stat.SPD)).toBe(6);
+  });
+
+  test("fails if the user's health is less than 1/2", async () => {
+    await game.startBattle([Species.MAGIKARP]);
+
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+    const hpLost = toDmgValue(leadPokemon.getMaxHp() / RATIO);
+    leadPokemon.hp = hpLost - PREDAMAGE;
+
+    game.move.select(Moves.FILLET_AWAY);
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    expect(leadPokemon.hp).toBe(hpLost - PREDAMAGE);
+    expect(leadPokemon.getStatStage(Stat.ATK)).toBe(0);
+    expect(leadPokemon.getStatStage(Stat.SPATK)).toBe(0);
+    expect(leadPokemon.getStatStage(Stat.SPD)).toBe(0);
+  });
+});
diff --git a/src/test/moves/fissure.test.ts b/test/moves/fissure.test.ts
similarity index 89%
rename from src/test/moves/fissure.test.ts
rename to test/moves/fissure.test.ts
index 0975a87b2b1..be6be079cf0 100644
--- a/src/test/moves/fissure.test.ts
+++ b/test/moves/fissure.test.ts
@@ -5,7 +5,7 @@ import { DamageAnimPhase } from "#app/phases/damage-anim-phase";
 import { TurnEndPhase } from "#app/phases/turn-end-phase";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
@@ -28,11 +28,11 @@ describe("Moves - Fissure", () => {
   beforeEach(async () => {
     game = new GameManager(phaserGame);
 
-    game.override.battleType("single");
+    game.override.battleStyle("single");
     game.override.disableCrits();
 
     game.override.starterSpecies(Species.SNORLAX);
-    game.override.moveset([ Moves.FISSURE ]);
+    game.override.moveset([Moves.FISSURE]);
     game.override.passiveAbility(Abilities.BALL_FETCH);
     game.override.startingLevel(100);
 
@@ -41,14 +41,10 @@ describe("Moves - Fissure", () => {
     game.override.enemyPassiveAbility(Abilities.BALL_FETCH);
     game.override.enemyLevel(100);
 
-    await game.startBattle();
+    await game.classicMode.startBattle();
 
     partyPokemon = game.scene.getPlayerParty()[0];
     enemyPokemon = game.scene.getEnemyPokemon()!;
-
-    // remove berries
-    game.scene.removePartyMemberModifiers(0);
-    game.scene.clearEnemyHeldItemModifiers();
   });
 
   it("ignores damage modification from abilities, for example FUR_COAT", async () => {
diff --git a/src/test/moves/flame_burst.test.ts b/test/moves/flame_burst.test.ts
similarity index 75%
rename from src/test/moves/flame_burst.test.ts
rename to test/moves/flame_burst.test.ts
index 9dea930d7e8..fb92537a238 100644
--- a/src/test/moves/flame_burst.test.ts
+++ b/test/moves/flame_burst.test.ts
@@ -1,10 +1,10 @@
-import { allAbilities } from "#app/data/ability";
+import { allAbilities } from "#app/data/data-lists";
 import { Abilities } from "#app/enums/abilities";
 import type Pokemon from "#app/field/pokemon";
 import { TurnEndPhase } from "#app/phases/turn-end-phase";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
@@ -20,7 +20,7 @@ describe("Moves - Flame Burst", () => {
    * @returns Effect damage of Flame Burst
    */
   const getEffectDamage = (pokemon: Pokemon): number => {
-    return Math.max(1, Math.floor(pokemon.getMaxHp() * 1 / 16));
+    return Math.max(1, Math.floor((pokemon.getMaxHp() * 1) / 16));
   };
 
   beforeAll(() => {
@@ -35,19 +35,19 @@ describe("Moves - Flame Burst", () => {
 
   beforeEach(() => {
     game = new GameManager(phaserGame);
-    game.override.battleType("double");
-    game.override.moveset([ Moves.FLAME_BURST, Moves.SPLASH ]);
+    game.override.battleStyle("double");
+    game.override.moveset([Moves.FLAME_BURST, Moves.SPLASH]);
     game.override.disableCrits();
     game.override.ability(Abilities.UNNERVE);
     game.override.startingWave(4);
     game.override.enemySpecies(Species.SHUCKLE);
     game.override.enemyAbility(Abilities.BALL_FETCH);
-    game.override.enemyMoveset([ Moves.SPLASH ]);
+    game.override.enemyMoveset([Moves.SPLASH]);
   });
 
   it("inflicts damage to the target's ally equal to 1/16 of its max HP", async () => {
-    await game.startBattle([ Species.PIKACHU, Species.PIKACHU ]);
-    const [ leftEnemy, rightEnemy ] = game.scene.getEnemyField();
+    await game.startBattle([Species.PIKACHU, Species.PIKACHU]);
+    const [leftEnemy, rightEnemy] = game.scene.getEnemyField();
 
     game.move.select(Moves.FLAME_BURST, 0, leftEnemy.getBattlerIndex());
     game.move.select(Moves.SPLASH, 1);
@@ -60,8 +60,8 @@ describe("Moves - Flame Burst", () => {
   it("does not inflict damage to the target's ally if the target was not affected by Flame Burst", async () => {
     game.override.enemyAbility(Abilities.FLASH_FIRE);
 
-    await game.startBattle([ Species.PIKACHU, Species.PIKACHU ]);
-    const [ leftEnemy, rightEnemy ] = game.scene.getEnemyField();
+    await game.startBattle([Species.PIKACHU, Species.PIKACHU]);
+    const [leftEnemy, rightEnemy] = game.scene.getEnemyField();
 
     game.move.select(Moves.FLAME_BURST, 0, leftEnemy.getBattlerIndex());
     game.move.select(Moves.SPLASH, 1);
@@ -72,8 +72,8 @@ describe("Moves - Flame Burst", () => {
   });
 
   it("does not interact with the target ally's abilities", async () => {
-    await game.startBattle([ Species.PIKACHU, Species.PIKACHU ]);
-    const [ leftEnemy, rightEnemy ] = game.scene.getEnemyField();
+    await game.startBattle([Species.PIKACHU, Species.PIKACHU]);
+    const [leftEnemy, rightEnemy] = game.scene.getEnemyField();
 
     vi.spyOn(rightEnemy, "getAbility").mockReturnValue(allAbilities[Abilities.FLASH_FIRE]);
 
@@ -86,8 +86,8 @@ describe("Moves - Flame Burst", () => {
   });
 
   it("effect damage is prevented by Magic Guard", async () => {
-    await game.startBattle([ Species.PIKACHU, Species.PIKACHU ]);
-    const [ leftEnemy, rightEnemy ] = game.scene.getEnemyField();
+    await game.startBattle([Species.PIKACHU, Species.PIKACHU]);
+    const [leftEnemy, rightEnemy] = game.scene.getEnemyField();
 
     vi.spyOn(rightEnemy, "getAbility").mockReturnValue(allAbilities[Abilities.MAGIC_GUARD]);
 
@@ -99,7 +99,11 @@ describe("Moves - Flame Burst", () => {
     expect(rightEnemy.hp).toBe(rightEnemy.getMaxHp());
   });
 
-  it("is not affected by protection moves and Endure", async () => {
-    // TODO: update this test when it's possible to select move for each enemy
-  }, { skip: true });
+  it(
+    "is not affected by protection moves and Endure",
+    async () => {
+      // TODO: update this test when it's possible to select move for each enemy
+    },
+    { skip: true },
+  );
 });
diff --git a/src/test/moves/flower_shield.test.ts b/test/moves/flower_shield.test.ts
similarity index 86%
rename from src/test/moves/flower_shield.test.ts
rename to test/moves/flower_shield.test.ts
index 4c03df5212b..4840c6f018f 100644
--- a/src/test/moves/flower_shield.test.ts
+++ b/test/moves/flower_shield.test.ts
@@ -1,12 +1,12 @@
 import { Stat } from "#enums/stat";
 import { SemiInvulnerableTag } from "#app/data/battler-tags";
-import { Type } from "#enums/type";
+import { PokemonType } from "#enums/pokemon-type";
 import { Biome } from "#app/enums/biome";
 import { TurnEndPhase } from "#app/phases/turn-end-phase";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
@@ -28,15 +28,15 @@ describe("Moves - Flower Shield", () => {
     game = new GameManager(phaserGame);
     game.override.ability(Abilities.NONE);
     game.override.enemyAbility(Abilities.NONE);
-    game.override.battleType("single");
-    game.override.moveset([ Moves.FLOWER_SHIELD, Moves.SPLASH ]);
+    game.override.battleStyle("single");
+    game.override.moveset([Moves.FLOWER_SHIELD, Moves.SPLASH]);
     game.override.enemyMoveset(Moves.SPLASH);
   });
 
   it("raises DEF stat stage by 1 for all Grass-type Pokemon on the field by one stage - single battle", async () => {
     game.override.enemySpecies(Species.CHERRIM);
 
-    await game.startBattle([ Species.MAGIKARP ]);
+    await game.startBattle([Species.MAGIKARP]);
     const cherrim = game.scene.getEnemyPokemon()!;
     const magikarp = game.scene.getPlayerPokemon()!;
 
@@ -51,12 +51,12 @@ describe("Moves - Flower Shield", () => {
   });
 
   it("raises DEF stat stage by 1 for all Grass-type Pokemon on the field by one stage - double battle", async () => {
-    game.override.enemySpecies(Species.MAGIKARP).startingBiome(Biome.GRASS).battleType("double");
+    game.override.enemySpecies(Species.MAGIKARP).startingBiome(Biome.GRASS).battleStyle("double");
 
-    await game.startBattle([ Species.CHERRIM, Species.MAGIKARP ]);
+    await game.startBattle([Species.CHERRIM, Species.MAGIKARP]);
     const field = game.scene.getField(true);
 
-    const grassPokemons = field.filter(p => p.getTypes().includes(Type.GRASS));
+    const grassPokemons = field.filter(p => p.getTypes().includes(PokemonType.GRASS));
     const nonGrassPokemons = field.filter(pokemon => !grassPokemons.includes(pokemon));
 
     grassPokemons.forEach(p => expect(p.getStatStage(Stat.DEF)).toBe(0));
@@ -72,13 +72,13 @@ describe("Moves - Flower Shield", () => {
 
   /**
    * See semi-vulnerable state tags. {@linkcode SemiInvulnerableTag}
-  */
+   */
   it("does not raise DEF stat stage for a Pokemon in semi-vulnerable state", async () => {
     game.override.enemySpecies(Species.PARAS);
-    game.override.enemyMoveset([ Moves.DIG, Moves.DIG, Moves.DIG, Moves.DIG ]);
+    game.override.enemyMoveset([Moves.DIG, Moves.DIG, Moves.DIG, Moves.DIG]);
     game.override.enemyLevel(50);
 
-    await game.startBattle([ Species.CHERRIM ]);
+    await game.startBattle([Species.CHERRIM]);
     const paras = game.scene.getEnemyPokemon()!;
     const cherrim = game.scene.getPlayerPokemon()!;
 
@@ -97,7 +97,7 @@ describe("Moves - Flower Shield", () => {
   it("does nothing if there are no Grass-type Pokemon on the field", async () => {
     game.override.enemySpecies(Species.MAGIKARP);
 
-    await game.startBattle([ Species.MAGIKARP ]);
+    await game.startBattle([Species.MAGIKARP]);
     const enemy = game.scene.getEnemyPokemon()!;
     const ally = game.scene.getPlayerPokemon()!;
 
diff --git a/src/test/moves/fly.test.ts b/test/moves/fly.test.ts
similarity index 86%
rename from src/test/moves/fly.test.ts
rename to test/moves/fly.test.ts
index 6ae758fe3dc..f200e976704 100644
--- a/src/test/moves/fly.test.ts
+++ b/test/moves/fly.test.ts
@@ -4,11 +4,11 @@ import { MoveResult } from "#app/field/pokemon";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, it, expect, vi } from "vitest";
 import { BattlerIndex } from "#app/battle";
-import { allMoves } from "#app/data/move";
+import { allMoves } from "#app/data/moves/move";
 
 describe("Moves - Fly", () => {
   let phaserGame: Phaser.Game;
@@ -28,7 +28,7 @@ describe("Moves - Fly", () => {
     game = new GameManager(phaserGame);
     game.override
       .moveset(Moves.FLY)
-      .battleType("single")
+      .battleStyle("single")
       .startingLevel(100)
       .enemySpecies(Species.SNORLAX)
       .enemyLevel(100)
@@ -39,7 +39,7 @@ describe("Moves - Fly", () => {
   });
 
   it("should make the user semi-invulnerable, then attack over 2 turns", async () => {
-    await game.classicMode.startBattle([ Species.MAGIKARP ]);
+    await game.classicMode.startBattle([Species.MAGIKARP]);
 
     const playerPokemon = game.scene.getPlayerPokemon()!;
     const enemyPokemon = game.scene.getEnemyPokemon()!;
@@ -65,7 +65,7 @@ describe("Moves - Fly", () => {
   it("should not allow the user to evade attacks from Pokemon with No Guard", async () => {
     game.override.enemyAbility(Abilities.NO_GUARD);
 
-    await game.classicMode.startBattle([ Species.MAGIKARP ]);
+    await game.classicMode.startBattle([Species.MAGIKARP]);
 
     const playerPokemon = game.scene.getPlayerPokemon()!;
     const enemyPokemon = game.scene.getEnemyPokemon()!;
@@ -78,11 +78,9 @@ describe("Moves - Fly", () => {
   });
 
   it("should not expend PP when the attack phase is cancelled", async () => {
-    game.override
-      .enemyAbility(Abilities.NO_GUARD)
-      .enemyMoveset(Moves.SPORE);
+    game.override.enemyAbility(Abilities.NO_GUARD).enemyMoveset(Moves.SPORE);
 
-    await game.classicMode.startBattle([ Species.MAGIKARP ]);
+    await game.classicMode.startBattle([Species.MAGIKARP]);
 
     const playerPokemon = game.scene.getPlayerPokemon()!;
 
@@ -97,9 +95,9 @@ describe("Moves - Fly", () => {
   });
 
   it("should be cancelled when another Pokemon uses Gravity", async () => {
-    game.override.enemyMoveset([ Moves.SPLASH, Moves.GRAVITY ]);
+    game.override.enemyMoveset([Moves.SPLASH, Moves.GRAVITY]);
 
-    await game.classicMode.startBattle([ Species.MAGIKARP ]);
+    await game.classicMode.startBattle([Species.MAGIKARP]);
 
     const playerPokemon = game.scene.getPlayerPokemon()!;
     const enemyPokemon = game.scene.getEnemyPokemon()!;
@@ -110,7 +108,7 @@ describe("Moves - Fly", () => {
 
     await game.toNextTurn();
     await game.forceEnemyMove(Moves.GRAVITY);
-    await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
 
     await game.phaseInterceptor.to("TurnEndPhase");
     expect(playerPokemon.getLastXMoves(1)[0].result).toBe(MoveResult.FAIL);
diff --git a/test/moves/focus_punch.test.ts b/test/moves/focus_punch.test.ts
new file mode 100644
index 00000000000..e05eb008af7
--- /dev/null
+++ b/test/moves/focus_punch.test.ts
@@ -0,0 +1,132 @@
+import { BerryPhase } from "#app/phases/berry-phase";
+import { MessagePhase } from "#app/phases/message-phase";
+import { MoveHeaderPhase } from "#app/phases/move-header-phase";
+import { SwitchSummonPhase } from "#app/phases/switch-summon-phase";
+import { TurnStartPhase } from "#app/phases/turn-start-phase";
+import { Abilities } from "#enums/abilities";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import GameManager from "#test/testUtils/gameManager";
+import i18next from "i18next";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
+
+describe("Moves - Focus Punch", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+    game.override
+      .battleStyle("single")
+      .ability(Abilities.UNNERVE)
+      .moveset([Moves.FOCUS_PUNCH])
+      .enemySpecies(Species.GROUDON)
+      .enemyAbility(Abilities.INSOMNIA)
+      .enemyMoveset(Moves.SPLASH)
+      .startingLevel(100)
+      .enemyLevel(100);
+  });
+
+  it("should deal damage at the end of turn if uninterrupted", async () => {
+    await game.classicMode.startBattle([Species.CHARIZARD]);
+
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+    const enemyPokemon = game.scene.getEnemyPokemon()!;
+
+    const enemyStartingHp = enemyPokemon.hp;
+
+    game.move.select(Moves.FOCUS_PUNCH);
+
+    await game.phaseInterceptor.to(MessagePhase);
+
+    expect(enemyPokemon.hp).toBe(enemyStartingHp);
+    expect(leadPokemon.getMoveHistory().length).toBe(0);
+
+    await game.phaseInterceptor.to(BerryPhase, false);
+
+    expect(enemyPokemon.hp).toBeLessThan(enemyStartingHp);
+    expect(leadPokemon.getMoveHistory().length).toBe(1);
+    expect(leadPokemon.turnData.totalDamageDealt).toBe(enemyStartingHp - enemyPokemon.hp);
+  });
+
+  it("should fail if the user is hit", async () => {
+    game.override.enemyMoveset([Moves.TACKLE]);
+
+    await game.classicMode.startBattle([Species.CHARIZARD]);
+
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+    const enemyPokemon = game.scene.getEnemyPokemon()!;
+
+    const enemyStartingHp = enemyPokemon.hp;
+
+    game.move.select(Moves.FOCUS_PUNCH);
+
+    await game.phaseInterceptor.to(MessagePhase);
+
+    expect(enemyPokemon.hp).toBe(enemyStartingHp);
+    expect(leadPokemon.getMoveHistory().length).toBe(0);
+
+    await game.phaseInterceptor.to(BerryPhase, false);
+
+    expect(enemyPokemon.hp).toBe(enemyStartingHp);
+    expect(leadPokemon.getMoveHistory().length).toBe(1);
+    expect(leadPokemon.turnData.totalDamageDealt).toBe(0);
+  });
+
+  it("should be cancelled if the user falls asleep mid-turn", async () => {
+    game.override.enemyMoveset([Moves.SPORE]);
+
+    await game.classicMode.startBattle([Species.CHARIZARD]);
+
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+    const enemyPokemon = game.scene.getEnemyPokemon()!;
+
+    game.move.select(Moves.FOCUS_PUNCH);
+
+    await game.phaseInterceptor.to(MessagePhase); // Header message
+
+    expect(leadPokemon.getMoveHistory().length).toBe(0);
+
+    await game.phaseInterceptor.to(BerryPhase, false);
+
+    expect(leadPokemon.getMoveHistory().length).toBe(1);
+    expect(enemyPokemon.hp).toBe(enemyPokemon.getMaxHp());
+  });
+
+  it("should not queue its pre-move message before an enemy switches", async () => {
+    /** Guarantee a Trainer battle with multiple enemy Pokemon */
+    game.override.startingWave(25);
+
+    await game.classicMode.startBattle([Species.CHARIZARD]);
+
+    game.forceEnemyToSwitch();
+    game.move.select(Moves.FOCUS_PUNCH);
+
+    await game.phaseInterceptor.to(TurnStartPhase);
+
+    expect(game.scene.getCurrentPhase() instanceof SwitchSummonPhase).toBeTruthy();
+    expect(game.scene.phaseQueue.find(phase => phase instanceof MoveHeaderPhase)).toBeDefined();
+  });
+  it("should replace the 'but it failed' text when the user gets hit", async () => {
+    game.override.enemyMoveset([Moves.TACKLE]);
+    await game.classicMode.startBattle([Species.CHARIZARD]);
+
+    game.move.select(Moves.FOCUS_PUNCH);
+    await game.phaseInterceptor.to("MoveEndPhase", true);
+    await game.phaseInterceptor.to("MessagePhase", false);
+    const consoleSpy = vi.spyOn(console, "log");
+    await game.phaseInterceptor.to("MoveEndPhase", true);
+    expect(consoleSpy).nthCalledWith(1, i18next.t("moveTriggers:lostFocus", { pokemonName: "Charizard" }));
+  });
+});
diff --git a/test/moves/follow_me.test.ts b/test/moves/follow_me.test.ts
new file mode 100644
index 00000000000..68c4f111bb1
--- /dev/null
+++ b/test/moves/follow_me.test.ts
@@ -0,0 +1,116 @@
+import { Stat } from "#enums/stat";
+import { BattlerIndex } from "#app/battle";
+import { Abilities } from "#app/enums/abilities";
+import { TurnEndPhase } from "#app/phases/turn-end-phase";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import GameManager from "#test/testUtils/gameManager";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest";
+
+describe("Moves - Follow Me", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+    game.override.battleStyle("double");
+    game.override.starterSpecies(Species.AMOONGUSS);
+    game.override.ability(Abilities.BALL_FETCH);
+    game.override.enemySpecies(Species.SNORLAX);
+    game.override.startingLevel(100);
+    game.override.enemyLevel(100);
+    game.override.moveset([Moves.FOLLOW_ME, Moves.RAGE_POWDER, Moves.SPOTLIGHT, Moves.QUICK_ATTACK]);
+    game.override.enemyMoveset([Moves.TACKLE, Moves.FOLLOW_ME, Moves.SPLASH]);
+  });
+
+  test("move should redirect enemy attacks to the user", async () => {
+    await game.classicMode.startBattle([Species.AMOONGUSS, Species.CHARIZARD]);
+
+    const playerPokemon = game.scene.getPlayerField();
+
+    game.move.select(Moves.FOLLOW_ME);
+    game.move.select(Moves.QUICK_ATTACK, 1, BattlerIndex.ENEMY);
+
+    // Force both enemies to target the player Pokemon that did not use Follow Me
+    await game.forceEnemyMove(Moves.TACKLE, BattlerIndex.PLAYER_2);
+    await game.forceEnemyMove(Moves.TACKLE, BattlerIndex.PLAYER_2);
+
+    await game.phaseInterceptor.to(TurnEndPhase, false);
+
+    expect(playerPokemon[0].hp).toBeLessThan(playerPokemon[0].getMaxHp());
+    expect(playerPokemon[1].hp).toBe(playerPokemon[1].getMaxHp());
+  });
+
+  test("move should redirect enemy attacks to the first ally that uses it", async () => {
+    await game.classicMode.startBattle([Species.AMOONGUSS, Species.CHARIZARD]);
+
+    const playerPokemon = game.scene.getPlayerField();
+
+    game.move.select(Moves.FOLLOW_ME);
+    game.move.select(Moves.FOLLOW_ME, 1);
+
+    // Each player is targeted by an enemy
+    await game.forceEnemyMove(Moves.TACKLE, BattlerIndex.PLAYER);
+    await game.forceEnemyMove(Moves.TACKLE, BattlerIndex.PLAYER_2);
+
+    await game.phaseInterceptor.to(TurnEndPhase, false);
+
+    playerPokemon.sort((a, b) => a.getEffectiveStat(Stat.SPD) - b.getEffectiveStat(Stat.SPD));
+
+    expect(playerPokemon[1].hp).toBeLessThan(playerPokemon[1].getMaxHp());
+    expect(playerPokemon[0].hp).toBe(playerPokemon[0].getMaxHp());
+  });
+
+  test("move effect should be bypassed by Stalwart", async () => {
+    game.override.ability(Abilities.STALWART);
+    game.override.moveset([Moves.QUICK_ATTACK]);
+
+    await game.classicMode.startBattle([Species.AMOONGUSS, Species.CHARIZARD]);
+
+    const enemyPokemon = game.scene.getEnemyField();
+
+    game.move.select(Moves.QUICK_ATTACK, 0, BattlerIndex.ENEMY);
+    game.move.select(Moves.QUICK_ATTACK, 1, BattlerIndex.ENEMY_2);
+
+    // Target doesn't need to be specified if the move is self-targeted
+    await game.forceEnemyMove(Moves.FOLLOW_ME);
+    await game.forceEnemyMove(Moves.SPLASH);
+
+    await game.phaseInterceptor.to(TurnEndPhase, false);
+
+    // If redirection was bypassed, both enemies should be damaged
+    expect(enemyPokemon[0].hp).toBeLessThan(enemyPokemon[0].getMaxHp());
+    expect(enemyPokemon[1].hp).toBeLessThan(enemyPokemon[1].getMaxHp());
+  });
+
+  test("move effect should be bypassed by Snipe Shot", async () => {
+    game.override.moveset([Moves.SNIPE_SHOT]);
+
+    await game.classicMode.startBattle([Species.AMOONGUSS, Species.CHARIZARD]);
+
+    const enemyPokemon = game.scene.getEnemyField();
+
+    game.move.select(Moves.SNIPE_SHOT, 0, BattlerIndex.ENEMY);
+    game.move.select(Moves.SNIPE_SHOT, 1, BattlerIndex.ENEMY_2);
+
+    await game.forceEnemyMove(Moves.FOLLOW_ME);
+    await game.forceEnemyMove(Moves.SPLASH);
+
+    await game.phaseInterceptor.to(TurnEndPhase, false);
+
+    // If redirection was bypassed, both enemies should be damaged
+    expect(enemyPokemon[0].hp).toBeLessThan(enemyPokemon[0].getMaxHp());
+    expect(enemyPokemon[1].hp).toBeLessThan(enemyPokemon[1].getMaxHp());
+  });
+});
diff --git a/src/test/moves/foresight.test.ts b/test/moves/foresight.test.ts
similarity index 91%
rename from src/test/moves/foresight.test.ts
rename to test/moves/foresight.test.ts
index 1195cd0b71b..d33a00bf136 100644
--- a/src/test/moves/foresight.test.ts
+++ b/test/moves/foresight.test.ts
@@ -1,7 +1,7 @@
 import { Moves } from "#app/enums/moves";
 import { Species } from "#app/enums/species";
 import { MoveEffectPhase } from "#app/phases/move-effect-phase";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
@@ -27,7 +27,7 @@ describe("Moves - Foresight", () => {
       .enemyMoveset(Moves.SPLASH)
       .enemyLevel(5)
       .starterSpecies(Species.MAGIKARP)
-      .moveset([ Moves.FORESIGHT, Moves.QUICK_ATTACK, Moves.MACH_PUNCH ]);
+      .moveset([Moves.FORESIGHT, Moves.QUICK_ATTACK, Moves.MACH_PUNCH]);
   });
 
   it("should allow Normal and Fighting moves to hit Ghost types", async () => {
@@ -54,7 +54,7 @@ describe("Moves - Foresight", () => {
   });
 
   it("should ignore target's evasiveness boosts", async () => {
-    game.override.enemyMoveset([ Moves.MINIMIZE ]);
+    game.override.enemyMoveset([Moves.MINIMIZE]);
     await game.startBattle();
 
     const pokemon = game.scene.getPlayerPokemon()!;
diff --git a/src/test/moves/forests_curse.test.ts b/test/moves/forests_curse.test.ts
similarity index 73%
rename from src/test/moves/forests_curse.test.ts
rename to test/moves/forests_curse.test.ts
index 010b00599a5..f363fdbd19d 100644
--- a/src/test/moves/forests_curse.test.ts
+++ b/test/moves/forests_curse.test.ts
@@ -1,8 +1,8 @@
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import { Type } from "#enums/type";
-import GameManager from "#test/utils/gameManager";
+import { PokemonType } from "#enums/pokemon-type";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
@@ -23,9 +23,9 @@ describe("Moves - Forest's Curse", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     game.override
-      .moveset([ Moves.FORESTS_CURSE, Moves.TRICK_OR_TREAT ])
+      .moveset([Moves.FORESTS_CURSE, Moves.TRICK_OR_TREAT])
       .ability(Abilities.BALL_FETCH)
-      .battleType("single")
+      .battleStyle("single")
       .disableCrits()
       .enemySpecies(Species.MAGIKARP)
       .enemyAbility(Abilities.BALL_FETCH)
@@ -33,15 +33,15 @@ describe("Moves - Forest's Curse", () => {
   });
 
   it("will replace the added type from Trick Or Treat", async () => {
-    await game.classicMode.startBattle([ Species.FEEBAS ]);
+    await game.classicMode.startBattle([Species.FEEBAS]);
 
     const enemyPokemon = game.scene.getEnemyPokemon();
     game.move.select(Moves.TRICK_OR_TREAT);
     await game.phaseInterceptor.to("TurnEndPhase");
-    expect(enemyPokemon!.summonData.addedType).toBe(Type.GHOST);
+    expect(enemyPokemon!.summonData.addedType).toBe(PokemonType.GHOST);
 
     game.move.select(Moves.FORESTS_CURSE);
     await game.phaseInterceptor.to("TurnEndPhase");
-    expect(enemyPokemon?.summonData.addedType).toBe(Type.GRASS);
+    expect(enemyPokemon?.summonData.addedType).toBe(PokemonType.GRASS);
   });
 });
diff --git a/src/test/moves/freeze_dry.test.ts b/test/moves/freeze_dry.test.ts
similarity index 75%
rename from src/test/moves/freeze_dry.test.ts
rename to test/moves/freeze_dry.test.ts
index 9206a103a35..62168afb960 100644
--- a/src/test/moves/freeze_dry.test.ts
+++ b/test/moves/freeze_dry.test.ts
@@ -2,9 +2,9 @@ import { BattlerIndex } from "#app/battle";
 import { Abilities } from "#app/enums/abilities";
 import { Moves } from "#app/enums/moves";
 import { Species } from "#app/enums/species";
-import { Type } from "#enums/type";
+import { PokemonType } from "#enums/pokemon-type";
 import { Challenges } from "#enums/challenges";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
@@ -24,13 +24,13 @@ describe("Moves - Freeze-Dry", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     game.override
-      .battleType("single")
+      .battleStyle("single")
       .enemySpecies(Species.MAGIKARP)
       .enemyAbility(Abilities.BALL_FETCH)
       .enemyMoveset(Moves.SPLASH)
       .starterSpecies(Species.FEEBAS)
       .ability(Abilities.BALL_FETCH)
-      .moveset([ Moves.FREEZE_DRY, Moves.FORESTS_CURSE, Moves.SOAK ]);
+      .moveset([Moves.FREEZE_DRY, Moves.FORESTS_CURSE, Moves.SOAK]);
   });
 
   it("should deal 2x damage to pure water types", async () => {
@@ -40,7 +40,7 @@ describe("Moves - Freeze-Dry", () => {
     vi.spyOn(enemy, "getMoveEffectiveness");
 
     game.move.select(Moves.FREEZE_DRY);
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
     await game.phaseInterceptor.to("MoveEffectPhase");
 
     expect(enemy.getMoveEffectiveness).toHaveReturnedWith(2);
@@ -54,7 +54,7 @@ describe("Moves - Freeze-Dry", () => {
     vi.spyOn(enemy, "getMoveEffectiveness");
 
     game.move.select(Moves.FREEZE_DRY);
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
     await game.phaseInterceptor.to("MoveEffectPhase");
 
     expect(enemy.getMoveEffectiveness).toHaveReturnedWith(4);
@@ -68,7 +68,7 @@ describe("Moves - Freeze-Dry", () => {
     vi.spyOn(enemy, "getMoveEffectiveness");
 
     game.move.select(Moves.FREEZE_DRY);
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
     await game.phaseInterceptor.to("MoveEffectPhase");
 
     expect(enemy.getMoveEffectiveness).toHaveReturnedWith(1);
@@ -82,14 +82,14 @@ describe("Moves - Freeze-Dry", () => {
       .enemySpecies(Species.SHEDINJA)
       .enemyMoveset(Moves.SPLASH)
       .starterSpecies(Species.MAGIKARP)
-      .moveset([ Moves.SOAK, Moves.FREEZE_DRY ]);
+      .moveset([Moves.SOAK, Moves.FREEZE_DRY]);
     await game.classicMode.startBattle();
 
     const enemy = game.scene.getEnemyPokemon()!;
     vi.spyOn(enemy, "getMoveEffectiveness");
 
     game.move.select(Moves.SOAK);
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
     await game.toNextTurn();
 
     game.move.select(Moves.FREEZE_DRY);
@@ -110,45 +110,46 @@ describe("Moves - Freeze-Dry", () => {
     await game.toNextTurn();
 
     game.move.select(Moves.FREEZE_DRY);
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
     await game.phaseInterceptor.to("MoveEffectPhase");
 
     expect(enemy.getMoveEffectiveness).toHaveReturnedWith(8);
   });
 
   it("should deal 2x damage to steel type terastallized into water", async () => {
-    game.override.enemySpecies(Species.SKARMORY)
-      .enemyHeldItems([{ name: "TERA_SHARD", type: Type.WATER }]);
+    game.override.enemySpecies(Species.SKARMORY);
     await game.classicMode.startBattle();
 
     const enemy = game.scene.getEnemyPokemon()!;
+    enemy.teraType = PokemonType.WATER;
+    enemy.isTerastallized = true;
     vi.spyOn(enemy, "getMoveEffectiveness");
 
     game.move.select(Moves.FREEZE_DRY);
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
     await game.phaseInterceptor.to("MoveEffectPhase");
 
     expect(enemy.getMoveEffectiveness).toHaveReturnedWith(2);
   });
 
   it("should deal 0.5x damage to water type terastallized into fire", async () => {
-    game.override.enemySpecies(Species.PELIPPER)
-      .enemyHeldItems([{ name: "TERA_SHARD", type: Type.FIRE }]);
+    game.override.enemySpecies(Species.PELIPPER);
     await game.classicMode.startBattle();
 
     const enemy = game.scene.getEnemyPokemon()!;
+    enemy.teraType = PokemonType.FIRE;
+    enemy.isTerastallized = true;
     vi.spyOn(enemy, "getMoveEffectiveness");
 
     game.move.select(Moves.FREEZE_DRY);
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
     await game.phaseInterceptor.to("MoveEffectPhase");
 
     expect(enemy.getMoveEffectiveness).toHaveReturnedWith(0.5);
   });
 
   it("should deal 0.5x damage to water type Terapagos with Tera Shell", async () => {
-    game.override.enemySpecies(Species.TERAPAGOS)
-      .enemyAbility(Abilities.TERA_SHELL);
+    game.override.enemySpecies(Species.TERAPAGOS).enemyAbility(Abilities.TERA_SHELL);
     await game.classicMode.startBattle();
 
     const enemy = game.scene.getEnemyPokemon()!;
@@ -158,7 +159,7 @@ describe("Moves - Freeze-Dry", () => {
     await game.toNextTurn();
 
     game.move.select(Moves.FREEZE_DRY);
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
     await game.phaseInterceptor.to("MoveEffectPhase");
 
     expect(enemy.getMoveEffectiveness).toHaveReturnedWith(0.5);
@@ -172,130 +173,114 @@ describe("Moves - Freeze-Dry", () => {
     vi.spyOn(enemy, "getMoveEffectiveness");
 
     game.move.select(Moves.FREEZE_DRY);
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
     await game.phaseInterceptor.to("MoveEffectPhase");
 
     expect(enemy.getMoveEffectiveness).toHaveReturnedWith(2);
   });
 
   it("should deal 0.25x damage to rock/steel type under Normalize", async () => {
-    game.override
-      .ability(Abilities.NORMALIZE)
-      .enemySpecies(Species.SHIELDON);
+    game.override.ability(Abilities.NORMALIZE).enemySpecies(Species.SHIELDON);
     await game.classicMode.startBattle();
 
     const enemy = game.scene.getEnemyPokemon()!;
     vi.spyOn(enemy, "getMoveEffectiveness");
 
     game.move.select(Moves.FREEZE_DRY);
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
     await game.phaseInterceptor.to("MoveEffectPhase");
 
     expect(enemy.getMoveEffectiveness).toHaveReturnedWith(0.25);
   });
 
   it("should deal 0x damage to water/ghost type under Normalize", async () => {
-    game.override
-      .ability(Abilities.NORMALIZE)
-      .enemySpecies(Species.JELLICENT);
+    game.override.ability(Abilities.NORMALIZE).enemySpecies(Species.JELLICENT);
     await game.classicMode.startBattle();
 
     const enemy = game.scene.getEnemyPokemon()!;
     vi.spyOn(enemy, "getMoveEffectiveness");
 
     game.move.select(Moves.FREEZE_DRY);
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
     await game.phaseInterceptor.to("BerryPhase");
 
     expect(enemy.getMoveEffectiveness).toHaveReturnedWith(0);
   });
 
   it("should deal 2x damage to water type under Electrify", async () => {
-    game.override.enemyMoveset([ Moves.ELECTRIFY ]);
+    game.override.enemyMoveset([Moves.ELECTRIFY]);
     await game.classicMode.startBattle();
 
     const enemy = game.scene.getEnemyPokemon()!;
     vi.spyOn(enemy, "getMoveEffectiveness");
 
     game.move.select(Moves.FREEZE_DRY);
-    await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
     await game.phaseInterceptor.to("BerryPhase");
 
     expect(enemy.getMoveEffectiveness).toHaveReturnedWith(2);
   });
 
   it("should deal 4x damage to water/flying type under Electrify", async () => {
-    game.override
-      .enemyMoveset([ Moves.ELECTRIFY ])
-      .enemySpecies(Species.GYARADOS);
+    game.override.enemyMoveset([Moves.ELECTRIFY]).enemySpecies(Species.GYARADOS);
     await game.classicMode.startBattle();
 
     const enemy = game.scene.getEnemyPokemon()!;
     vi.spyOn(enemy, "getMoveEffectiveness");
 
     game.move.select(Moves.FREEZE_DRY);
-    await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
     await game.phaseInterceptor.to("BerryPhase");
 
     expect(enemy.getMoveEffectiveness).toHaveReturnedWith(4);
   });
 
   it("should deal 0x damage to water/ground type under Electrify", async () => {
-    game.override
-      .enemyMoveset([ Moves.ELECTRIFY ])
-      .enemySpecies(Species.BARBOACH);
+    game.override.enemyMoveset([Moves.ELECTRIFY]).enemySpecies(Species.BARBOACH);
     await game.classicMode.startBattle();
 
     const enemy = game.scene.getEnemyPokemon()!;
     vi.spyOn(enemy, "getMoveEffectiveness");
 
     game.move.select(Moves.FREEZE_DRY);
-    await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
     await game.phaseInterceptor.to("BerryPhase");
 
     expect(enemy.getMoveEffectiveness).toHaveReturnedWith(0);
   });
 
   it("should deal 0.25x damage to Grass/Dragon type under Electrify", async () => {
-    game.override
-      .enemyMoveset([ Moves.ELECTRIFY ])
-      .enemySpecies(Species.FLAPPLE);
+    game.override.enemyMoveset([Moves.ELECTRIFY]).enemySpecies(Species.FLAPPLE);
     await game.classicMode.startBattle();
 
     const enemy = game.scene.getEnemyPokemon()!;
     vi.spyOn(enemy, "getMoveEffectiveness");
 
     game.move.select(Moves.FREEZE_DRY);
-    await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
     await game.phaseInterceptor.to("BerryPhase");
 
     expect(enemy.getMoveEffectiveness).toHaveReturnedWith(0.25);
   });
 
   it("should deal 2x damage to Water type during inverse battle", async () => {
-    game.override
-      .moveset([ Moves.FREEZE_DRY ])
-      .enemySpecies(Species.MAGIKARP);
+    game.override.moveset([Moves.FREEZE_DRY]).enemySpecies(Species.MAGIKARP);
     game.challengeMode.addChallenge(Challenges.INVERSE_BATTLE, 1, 1);
 
-
     await game.challengeMode.startBattle();
 
     const enemy = game.scene.getEnemyPokemon()!;
     vi.spyOn(enemy, "getMoveEffectiveness");
 
     game.move.select(Moves.FREEZE_DRY);
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
     await game.phaseInterceptor.to("MoveEffectPhase");
 
     expect(enemy.getMoveEffectiveness).toHaveLastReturnedWith(2);
   });
 
   it("should deal 2x damage to Water type during inverse battle under Normalize", async () => {
-    game.override
-      .moveset([ Moves.FREEZE_DRY ])
-      .ability(Abilities.NORMALIZE)
-      .enemySpecies(Species.MAGIKARP);
+    game.override.moveset([Moves.FREEZE_DRY]).ability(Abilities.NORMALIZE).enemySpecies(Species.MAGIKARP);
     game.challengeMode.addChallenge(Challenges.INVERSE_BATTLE, 1, 1);
 
     await game.challengeMode.startBattle();
@@ -304,17 +289,14 @@ describe("Moves - Freeze-Dry", () => {
     vi.spyOn(enemy, "getMoveEffectiveness");
 
     game.move.select(Moves.FREEZE_DRY);
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
     await game.phaseInterceptor.to("MoveEffectPhase");
 
     expect(enemy.getMoveEffectiveness).toHaveLastReturnedWith(2);
   });
 
   it("should deal 2x damage to Water type during inverse battle under Electrify", async () => {
-    game.override
-      .moveset([ Moves.FREEZE_DRY ])
-      .enemySpecies(Species.MAGIKARP)
-      .enemyMoveset([ Moves.ELECTRIFY ]);
+    game.override.moveset([Moves.FREEZE_DRY]).enemySpecies(Species.MAGIKARP).enemyMoveset([Moves.ELECTRIFY]);
     game.challengeMode.addChallenge(Challenges.INVERSE_BATTLE, 1, 1);
 
     await game.challengeMode.startBattle();
@@ -323,16 +305,14 @@ describe("Moves - Freeze-Dry", () => {
     vi.spyOn(enemy, "getMoveEffectiveness");
 
     game.move.select(Moves.FREEZE_DRY);
-    await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
     await game.phaseInterceptor.to("MoveEffectPhase");
 
     expect(enemy.getMoveEffectiveness).toHaveLastReturnedWith(2);
   });
 
   it("should deal 1x damage to water/flying type during inverse battle under Electrify", async () => {
-    game.override
-      .enemyMoveset([ Moves.ELECTRIFY ])
-      .enemySpecies(Species.GYARADOS);
+    game.override.enemyMoveset([Moves.ELECTRIFY]).enemySpecies(Species.GYARADOS);
 
     game.challengeMode.addChallenge(Challenges.INVERSE_BATTLE, 1, 1);
 
@@ -342,7 +322,7 @@ describe("Moves - Freeze-Dry", () => {
     vi.spyOn(enemy, "getMoveEffectiveness");
 
     game.move.select(Moves.FREEZE_DRY);
-    await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
     await game.phaseInterceptor.to("BerryPhase");
 
     expect(enemy.getMoveEffectiveness).toHaveReturnedWith(1);
diff --git a/test/moves/freezy_frost.test.ts b/test/moves/freezy_frost.test.ts
new file mode 100644
index 00000000000..4eb3114a5ba
--- /dev/null
+++ b/test/moves/freezy_frost.test.ts
@@ -0,0 +1,99 @@
+import { Stat } from "#enums/stat";
+import { Abilities } from "#enums/abilities";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import GameManager from "#test/testUtils/gameManager";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
+import { allMoves } from "#app/data/moves/move";
+import { CommandPhase } from "#app/phases/command-phase";
+
+describe("Moves - Freezy Frost", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({ type: Phaser.HEADLESS });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+
+    game.override
+      .battleStyle("single")
+      .enemySpecies(Species.RATTATA)
+      .enemyLevel(100)
+      .enemyMoveset([Moves.HOWL, Moves.HOWL, Moves.HOWL, Moves.HOWL])
+      .enemyAbility(Abilities.BALL_FETCH)
+      .startingLevel(100)
+      .moveset([Moves.FREEZY_FROST, Moves.HOWL, Moves.SPLASH])
+      .ability(Abilities.BALL_FETCH);
+
+    vi.spyOn(allMoves[Moves.FREEZY_FROST], "accuracy", "get").mockReturnValue(100);
+  });
+
+  it("should clear stat changes of user and opponent", async () => {
+    await game.classicMode.startBattle([Species.SHUCKLE]);
+    const user = game.scene.getPlayerPokemon()!;
+    const enemy = game.scene.getEnemyPokemon()!;
+
+    game.move.select(Moves.HOWL);
+    await game.toNextTurn();
+
+    expect(user.getStatStage(Stat.ATK)).toBe(1);
+    expect(enemy.getStatStage(Stat.ATK)).toBe(1);
+
+    game.move.select(Moves.FREEZY_FROST);
+    await game.toNextTurn();
+
+    expect(user.getStatStage(Stat.ATK)).toBe(0);
+    expect(enemy.getStatStage(Stat.ATK)).toBe(0);
+  });
+
+  it("should clear all stat changes even when enemy uses the move", async () => {
+    game.override.enemyMoveset([Moves.FREEZY_FROST, Moves.FREEZY_FROST, Moves.FREEZY_FROST, Moves.FREEZY_FROST]);
+    await game.classicMode.startBattle([Species.SHUCKLE]); // Shuckle for slower Howl on first turn so Freezy Frost doesn't affect it.
+    const user = game.scene.getPlayerPokemon()!;
+
+    game.move.select(Moves.HOWL);
+    await game.toNextTurn();
+
+    const userAtkBefore = user.getStatStage(Stat.ATK);
+    expect(userAtkBefore).toBe(1);
+
+    game.move.select(Moves.SPLASH);
+    await game.toNextTurn();
+    expect(user.getStatStage(Stat.ATK)).toBe(0);
+  });
+
+  it("should clear all stat changes in double battle", async () => {
+    game.override.battleStyle("double");
+    await game.classicMode.startBattle([Species.SHUCKLE, Species.RATTATA]);
+    const [leftPlayer, rightPlayer] = game.scene.getPlayerField();
+    const [leftOpp, rightOpp] = game.scene.getEnemyField();
+
+    game.move.select(Moves.HOWL, 0);
+    await game.phaseInterceptor.to(CommandPhase);
+    game.move.select(Moves.SPLASH, 1);
+    await game.toNextTurn();
+
+    expect(leftPlayer.getStatStage(Stat.ATK)).toBe(1);
+    expect(rightPlayer.getStatStage(Stat.ATK)).toBe(1);
+    expect(leftOpp.getStatStage(Stat.ATK)).toBe(2); // Both enemies use Howl
+    expect(rightOpp.getStatStage(Stat.ATK)).toBe(2);
+
+    game.move.select(Moves.FREEZY_FROST, 0, leftOpp.getBattlerIndex());
+    await game.phaseInterceptor.to(CommandPhase);
+    game.move.select(Moves.SPLASH, 1);
+    await game.toNextTurn();
+
+    expect(leftPlayer.getStatStage(Stat.ATK)).toBe(0);
+    expect(rightPlayer.getStatStage(Stat.ATK)).toBe(0);
+    expect(leftOpp.getStatStage(Stat.ATK)).toBe(0);
+    expect(rightOpp.getStatStage(Stat.ATK)).toBe(0);
+  });
+});
diff --git a/src/test/moves/fusion_bolt.test.ts b/test/moves/fusion_bolt.test.ts
similarity index 79%
rename from src/test/moves/fusion_bolt.test.ts
rename to test/moves/fusion_bolt.test.ts
index 4e35b939abf..33498a857a9 100644
--- a/src/test/moves/fusion_bolt.test.ts
+++ b/test/moves/fusion_bolt.test.ts
@@ -1,7 +1,7 @@
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
@@ -23,22 +23,20 @@ describe("Moves - Fusion Bolt", () => {
 
   beforeEach(() => {
     game = new GameManager(phaserGame);
-    game.override.moveset([ fusionBolt ]);
+    game.override.moveset([fusionBolt]);
     game.override.startingLevel(1);
 
     game.override.enemySpecies(Species.RESHIRAM);
     game.override.enemyAbility(Abilities.ROUGH_SKIN);
-    game.override.enemyMoveset([ Moves.SPLASH, Moves.SPLASH, Moves.SPLASH, Moves.SPLASH ]);
+    game.override.enemyMoveset([Moves.SPLASH, Moves.SPLASH, Moves.SPLASH, Moves.SPLASH]);
 
-    game.override.battleType("single");
+    game.override.battleStyle("single");
     game.override.startingWave(97);
     game.override.disableCrits();
   });
 
   it("should not make contact", async () => {
-    await game.startBattle([
-      Species.ZEKROM,
-    ]);
+    await game.startBattle([Species.ZEKROM]);
 
     const partyMember = game.scene.getPlayerPokemon()!;
     const initialHp = partyMember.hp;
diff --git a/src/test/moves/fusion_flare.test.ts b/test/moves/fusion_flare.test.ts
similarity index 83%
rename from src/test/moves/fusion_flare.test.ts
rename to test/moves/fusion_flare.test.ts
index 75641c04d02..61bb126a75a 100644
--- a/src/test/moves/fusion_flare.test.ts
+++ b/test/moves/fusion_flare.test.ts
@@ -2,7 +2,7 @@ import { TurnStartPhase } from "#app/phases/turn-start-phase";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { StatusEffect } from "#enums/status-effect";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
@@ -24,21 +24,19 @@ describe("Moves - Fusion Flare", () => {
 
   beforeEach(() => {
     game = new GameManager(phaserGame);
-    game.override.moveset([ fusionFlare ]);
+    game.override.moveset([fusionFlare]);
     game.override.startingLevel(1);
 
     game.override.enemySpecies(Species.RATTATA);
-    game.override.enemyMoveset([ Moves.REST, Moves.REST, Moves.REST, Moves.REST ]);
+    game.override.enemyMoveset([Moves.REST, Moves.REST, Moves.REST, Moves.REST]);
 
-    game.override.battleType("single");
+    game.override.battleStyle("single");
     game.override.startingWave(97);
     game.override.disableCrits();
   });
 
   it("should thaw freeze status condition", async () => {
-    await game.startBattle([
-      Species.RESHIRAM,
-    ]);
+    await game.startBattle([Species.RESHIRAM]);
 
     const partyMember = game.scene.getPlayerPokemon()!;
 
diff --git a/src/test/moves/fusion_flare_bolt.test.ts b/test/moves/fusion_flare_bolt.test.ts
similarity index 73%
rename from src/test/moves/fusion_flare_bolt.test.ts
rename to test/moves/fusion_flare_bolt.test.ts
index dbd4479dff8..ce6bb62d1d0 100644
--- a/src/test/moves/fusion_flare_bolt.test.ts
+++ b/test/moves/fusion_flare_bolt.test.ts
@@ -1,13 +1,14 @@
 import { Stat } from "#enums/stat";
 import { BattlerIndex } from "#app/battle";
-import { allMoves } from "#app/data/move";
+import { allMoves } from "#app/data/moves/move";
+import type Move from "#app/data/moves/move";
 import { DamageAnimPhase } from "#app/phases/damage-anim-phase";
 import { MoveEffectPhase } from "#app/phases/move-effect-phase";
 import { MoveEndPhase } from "#app/phases/move-end-phase";
 import { MovePhase } from "#app/phases/move-phase";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
@@ -15,8 +16,8 @@ describe("Moves - Fusion Flare and Fusion Bolt", () => {
   let phaserGame: Phaser.Game;
   let game: GameManager;
 
-  const fusionFlare = allMoves[Moves.FUSION_FLARE];
-  const fusionBolt = allMoves[Moves.FUSION_BOLT];
+  let fusionFlare: Move;
+  let fusionBolt: Move;
 
   beforeAll(() => {
     phaserGame = new Phaser.Game({
@@ -29,14 +30,16 @@ describe("Moves - Fusion Flare and Fusion Bolt", () => {
   });
 
   beforeEach(() => {
+    fusionFlare = allMoves[Moves.FUSION_FLARE];
+    fusionBolt = allMoves[Moves.FUSION_BOLT];
     game = new GameManager(phaserGame);
-    game.override.moveset([ fusionFlare.id, fusionBolt.id ]);
+    game.override.moveset([fusionFlare.id, fusionBolt.id]);
     game.override.startingLevel(1);
 
     game.override.enemySpecies(Species.RESHIRAM);
-    game.override.enemyMoveset([ Moves.REST, Moves.REST, Moves.REST, Moves.REST ]);
+    game.override.enemyMoveset([Moves.REST, Moves.REST, Moves.REST, Moves.REST]);
 
-    game.override.battleType("double");
+    game.override.battleStyle("double");
     game.override.startingWave(97);
     game.override.disableCrits();
 
@@ -45,65 +48,56 @@ describe("Moves - Fusion Flare and Fusion Bolt", () => {
   });
 
   it("FUSION_FLARE should double power of subsequent FUSION_BOLT", async () => {
-    await game.startBattle([
-      Species.ZEKROM,
-      Species.ZEKROM
-    ]);
+    await game.classicMode.startBattle([Species.ZEKROM, Species.ZEKROM]);
 
     game.move.select(fusionFlare.id, 0, BattlerIndex.ENEMY);
     game.move.select(fusionBolt.id, 1, BattlerIndex.ENEMY);
 
     // Force user party to act before enemy party
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2 ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2]);
 
     await game.phaseInterceptor.to(MoveEffectPhase, false);
-    expect((game.scene.getCurrentPhase() as MoveEffectPhase).move.moveId).toBe(fusionFlare.id);
+    expect((game.scene.getCurrentPhase() as MoveEffectPhase).move.id).toBe(fusionFlare.id);
     await game.phaseInterceptor.to(DamageAnimPhase, false);
     expect(fusionFlare.calculateBattlePower).toHaveLastReturnedWith(100);
 
     await game.phaseInterceptor.to(MoveEffectPhase, false);
-    expect((game.scene.getCurrentPhase() as MoveEffectPhase).move.moveId).toBe(fusionBolt.id);
+    expect((game.scene.getCurrentPhase() as MoveEffectPhase).move.id).toBe(fusionBolt.id);
     await game.phaseInterceptor.to(DamageAnimPhase, false);
     expect(fusionBolt.calculateBattlePower).toHaveLastReturnedWith(200);
   }, 20000);
 
   it("FUSION_BOLT should double power of subsequent FUSION_FLARE", async () => {
-    await game.startBattle([
-      Species.ZEKROM,
-      Species.ZEKROM
-    ]);
+    await game.classicMode.startBattle([Species.ZEKROM, Species.ZEKROM]);
 
     game.move.select(fusionBolt.id, 0, BattlerIndex.ENEMY);
     game.move.select(fusionFlare.id, 1, BattlerIndex.ENEMY);
 
     // Force user party to act before enemy party
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2 ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2]);
 
     await game.phaseInterceptor.to(MoveEffectPhase, false);
-    expect((game.scene.getCurrentPhase() as MoveEffectPhase).move.moveId).toBe(fusionBolt.id);
+    expect((game.scene.getCurrentPhase() as MoveEffectPhase).move.id).toBe(fusionBolt.id);
     await game.phaseInterceptor.to(DamageAnimPhase, false);
     expect(fusionBolt.calculateBattlePower).toHaveLastReturnedWith(100);
 
     await game.phaseInterceptor.to(MoveEffectPhase, false);
-    expect((game.scene.getCurrentPhase() as MoveEffectPhase).move.moveId).toBe(fusionFlare.id);
+    expect((game.scene.getCurrentPhase() as MoveEffectPhase).move.id).toBe(fusionFlare.id);
     await game.phaseInterceptor.to(DamageAnimPhase, false);
     expect(fusionFlare.calculateBattlePower).toHaveLastReturnedWith(200);
   }, 20000);
 
   it("FUSION_FLARE should double power of subsequent FUSION_BOLT if a move failed in between", async () => {
-    await game.startBattle([
-      Species.ZEKROM,
-      Species.ZEKROM
-    ]);
+    await game.classicMode.startBattle([Species.ZEKROM, Species.ZEKROM]);
 
     game.move.select(fusionFlare.id, 0, BattlerIndex.PLAYER);
     game.move.select(fusionBolt.id, 1, BattlerIndex.PLAYER);
 
     // Force first enemy to act (and fail) in between party
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY_2, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY_2, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY]);
 
     await game.phaseInterceptor.to(MoveEffectPhase, false);
-    expect((game.scene.getCurrentPhase() as MoveEffectPhase).move.moveId).toBe(fusionFlare.id);
+    expect((game.scene.getCurrentPhase() as MoveEffectPhase).move.id).toBe(fusionFlare.id);
     await game.phaseInterceptor.to(DamageAnimPhase, false);
     expect(fusionFlare.calculateBattlePower).toHaveLastReturnedWith(100);
 
@@ -113,26 +107,23 @@ describe("Moves - Fusion Flare and Fusion Bolt", () => {
     await game.phaseInterceptor.runFrom(MovePhase).to(MoveEndPhase);
 
     await game.phaseInterceptor.to(MoveEffectPhase, false);
-    expect((game.scene.getCurrentPhase() as MoveEffectPhase).move.moveId).toBe(fusionBolt.id);
+    expect((game.scene.getCurrentPhase() as MoveEffectPhase).move.id).toBe(fusionBolt.id);
     await game.phaseInterceptor.to(DamageAnimPhase, false);
     expect(fusionBolt.calculateBattlePower).toHaveLastReturnedWith(200);
   }, 20000);
 
   it("FUSION_FLARE should not double power of subsequent FUSION_BOLT if a move succeeded in between", async () => {
-    game.override.enemyMoveset([ Moves.SPLASH, Moves.SPLASH, Moves.SPLASH, Moves.SPLASH ]);
-    await game.startBattle([
-      Species.ZEKROM,
-      Species.ZEKROM
-    ]);
+    game.override.enemyMoveset([Moves.SPLASH, Moves.SPLASH, Moves.SPLASH, Moves.SPLASH]);
+    await game.classicMode.startBattle([Species.ZEKROM, Species.ZEKROM]);
 
     game.move.select(fusionFlare.id, 0, BattlerIndex.ENEMY);
     game.move.select(fusionBolt.id, 1, BattlerIndex.ENEMY);
 
     // Force first enemy to act in between party
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY_2, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY_2, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY]);
 
     await game.phaseInterceptor.to(MoveEffectPhase, false);
-    expect((game.scene.getCurrentPhase() as MoveEffectPhase).move.moveId).toBe(fusionFlare.id);
+    expect((game.scene.getCurrentPhase() as MoveEffectPhase).move.id).toBe(fusionFlare.id);
     await game.phaseInterceptor.to(DamageAnimPhase, false);
     expect(fusionFlare.calculateBattlePower).toHaveLastReturnedWith(100);
 
@@ -141,40 +132,34 @@ describe("Moves - Fusion Flare and Fusion Bolt", () => {
     await game.phaseInterceptor.runFrom(MovePhase).to(MoveEndPhase);
 
     await game.phaseInterceptor.to(MoveEffectPhase, false);
-    expect((game.scene.getCurrentPhase() as MoveEffectPhase).move.moveId).toBe(fusionBolt.id);
+    expect((game.scene.getCurrentPhase() as MoveEffectPhase).move.id).toBe(fusionBolt.id);
     await game.phaseInterceptor.to(DamageAnimPhase, false);
     expect(fusionBolt.calculateBattlePower).toHaveLastReturnedWith(100);
   }, 20000);
 
   it("FUSION_FLARE should double power of subsequent FUSION_BOLT if moves are aimed at allies", async () => {
-    await game.startBattle([
-      Species.ZEKROM,
-      Species.RESHIRAM
-    ]);
+    await game.startBattle([Species.ZEKROM, Species.RESHIRAM]);
 
     game.move.select(fusionBolt.id, 0, BattlerIndex.PLAYER_2);
     game.move.select(fusionFlare.id, 1, BattlerIndex.PLAYER);
 
     // Force user party to act before enemy party
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2 ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2]);
 
     await game.phaseInterceptor.to(MoveEffectPhase, false);
-    expect((game.scene.getCurrentPhase() as MoveEffectPhase).move.moveId).toBe(fusionBolt.id);
+    expect((game.scene.getCurrentPhase() as MoveEffectPhase).move.id).toBe(fusionBolt.id);
     await game.phaseInterceptor.to(DamageAnimPhase, false);
     expect(fusionBolt.calculateBattlePower).toHaveLastReturnedWith(100);
 
     await game.phaseInterceptor.to(MoveEffectPhase, false);
-    expect((game.scene.getCurrentPhase() as MoveEffectPhase).move.moveId).toBe(fusionFlare.id);
+    expect((game.scene.getCurrentPhase() as MoveEffectPhase).move.id).toBe(fusionFlare.id);
     await game.phaseInterceptor.to(DamageAnimPhase, false);
     expect(fusionFlare.calculateBattlePower).toHaveLastReturnedWith(200);
   }, 20000);
 
   it("FUSION_FLARE and FUSION_BOLT alternating throughout turn should double power of subsequent moves", async () => {
-    game.override.enemyMoveset([ fusionFlare.id, fusionFlare.id, fusionFlare.id, fusionFlare.id ]);
-    await game.startBattle([
-      Species.ZEKROM,
-      Species.ZEKROM
-    ]);
+    game.override.enemyMoveset([fusionFlare.id, fusionFlare.id, fusionFlare.id, fusionFlare.id]);
+    await game.classicMode.startBattle([Species.ZEKROM, Species.ZEKROM]);
 
     const party = game.scene.getPlayerParty();
     const enemyParty = game.scene.getEnemyParty();
@@ -185,19 +170,17 @@ describe("Moves - Fusion Flare and Fusion Bolt", () => {
 
     // Mock stats by replacing entries in copy with desired values for specific stats
     const stats = {
-      enemy: [
-        [ ...enemyParty[0].stats ],
-        [ ...enemyParty[1].stats ],
-      ],
-      player: [
-        [ ...party[0].stats ],
-        [ ...party[1].stats ],
-      ]
+      enemy: [[...enemyParty[0].stats], [...enemyParty[1].stats]],
+      player: [[...party[0].stats], [...party[1].stats]],
     };
 
     // Ensure survival by reducing enemy Sp. Atk and boosting party Sp. Def
-    vi.spyOn(enemyParty[0], "stats", "get").mockReturnValue(stats.enemy[0].map((val, i) => (i === Stat.SPATK ? 1 : val)));
-    vi.spyOn(enemyParty[1], "stats", "get").mockReturnValue(stats.enemy[1].map((val, i) => (i === Stat.SPATK ? 1 : val)));
+    vi.spyOn(enemyParty[0], "stats", "get").mockReturnValue(
+      stats.enemy[0].map((val, i) => (i === Stat.SPATK ? 1 : val)),
+    );
+    vi.spyOn(enemyParty[1], "stats", "get").mockReturnValue(
+      stats.enemy[1].map((val, i) => (i === Stat.SPATK ? 1 : val)),
+    );
     vi.spyOn(party[1], "stats", "get").mockReturnValue(stats.player[0].map((val, i) => (i === Stat.SPDEF ? 250 : val)));
     vi.spyOn(party[1], "stats", "get").mockReturnValue(stats.player[1].map((val, i) => (i === Stat.SPDEF ? 250 : val)));
 
@@ -205,35 +188,32 @@ describe("Moves - Fusion Flare and Fusion Bolt", () => {
     game.move.select(fusionBolt.id, 1, BattlerIndex.ENEMY);
 
     // Force first enemy to act in between party
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY_2, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY_2, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY]);
 
     await game.phaseInterceptor.to(MoveEffectPhase, false);
-    expect((game.scene.getCurrentPhase() as MoveEffectPhase).move.moveId).toBe(fusionBolt.id);
+    expect((game.scene.getCurrentPhase() as MoveEffectPhase).move.id).toBe(fusionBolt.id);
     await game.phaseInterceptor.to(DamageAnimPhase, false);
     expect(fusionBolt.calculateBattlePower).toHaveLastReturnedWith(100);
 
     await game.phaseInterceptor.to(MoveEffectPhase, false);
-    expect((game.scene.getCurrentPhase() as MoveEffectPhase).move.moveId).toBe(fusionFlare.id);
+    expect((game.scene.getCurrentPhase() as MoveEffectPhase).move.id).toBe(fusionFlare.id);
     await game.phaseInterceptor.to(DamageAnimPhase, false);
     expect(fusionFlare.calculateBattlePower).toHaveLastReturnedWith(200);
 
     await game.phaseInterceptor.to(MoveEffectPhase, false);
-    expect((game.scene.getCurrentPhase() as MoveEffectPhase).move.moveId).toBe(fusionBolt.id);
+    expect((game.scene.getCurrentPhase() as MoveEffectPhase).move.id).toBe(fusionBolt.id);
     await game.phaseInterceptor.to(DamageAnimPhase, false);
     expect(fusionBolt.calculateBattlePower).toHaveLastReturnedWith(200);
 
     await game.phaseInterceptor.to(MoveEffectPhase, false);
-    expect((game.scene.getCurrentPhase() as MoveEffectPhase).move.moveId).toBe(fusionFlare.id);
+    expect((game.scene.getCurrentPhase() as MoveEffectPhase).move.id).toBe(fusionFlare.id);
     await game.phaseInterceptor.to(DamageAnimPhase, false);
     expect(fusionFlare.calculateBattlePower).toHaveLastReturnedWith(200);
   }, 20000);
 
   it("FUSION_FLARE and FUSION_BOLT alternating throughout turn should double power of subsequent moves if moves are aimed at allies", async () => {
-    game.override.enemyMoveset([ fusionFlare.id, fusionFlare.id, fusionFlare.id, fusionFlare.id ]);
-    await game.startBattle([
-      Species.ZEKROM,
-      Species.ZEKROM
-    ]);
+    game.override.enemyMoveset([fusionFlare.id, fusionFlare.id, fusionFlare.id, fusionFlare.id]);
+    await game.classicMode.startBattle([Species.ZEKROM, Species.ZEKROM]);
 
     const party = game.scene.getPlayerParty();
     const enemyParty = game.scene.getEnemyParty();
@@ -244,19 +224,17 @@ describe("Moves - Fusion Flare and Fusion Bolt", () => {
 
     // Mock stats by replacing entries in copy with desired values for specific stats
     const stats = {
-      enemy: [
-        [ ...enemyParty[0].stats ],
-        [ ...enemyParty[1].stats ],
-      ],
-      player: [
-        [ ...party[0].stats ],
-        [ ...party[1].stats ],
-      ]
+      enemy: [[...enemyParty[0].stats], [...enemyParty[1].stats]],
+      player: [[...party[0].stats], [...party[1].stats]],
     };
 
     // Ensure survival by reducing enemy Sp. Atk and boosting party Sp. Def
-    vi.spyOn(enemyParty[0], "stats", "get").mockReturnValue(stats.enemy[0].map((val, i) => (i === Stat.SPATK ? 1 : val)));
-    vi.spyOn(enemyParty[1], "stats", "get").mockReturnValue(stats.enemy[1].map((val, i) => (i === Stat.SPATK ? 1 : val)));
+    vi.spyOn(enemyParty[0], "stats", "get").mockReturnValue(
+      stats.enemy[0].map((val, i) => (i === Stat.SPATK ? 1 : val)),
+    );
+    vi.spyOn(enemyParty[1], "stats", "get").mockReturnValue(
+      stats.enemy[1].map((val, i) => (i === Stat.SPATK ? 1 : val)),
+    );
     vi.spyOn(party[1], "stats", "get").mockReturnValue(stats.player[0].map((val, i) => (i === Stat.SPDEF ? 250 : val)));
     vi.spyOn(party[1], "stats", "get").mockReturnValue(stats.player[1].map((val, i) => (i === Stat.SPDEF ? 250 : val)));
 
@@ -264,25 +242,25 @@ describe("Moves - Fusion Flare and Fusion Bolt", () => {
     game.move.select(fusionBolt.id, 1, BattlerIndex.PLAYER);
 
     // Force first enemy to act in between party
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY_2, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY_2, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY]);
 
     await game.phaseInterceptor.to(MoveEffectPhase, false);
-    expect((game.scene.getCurrentPhase() as MoveEffectPhase).move.moveId).toBe(fusionBolt.id);
+    expect((game.scene.getCurrentPhase() as MoveEffectPhase).move.id).toBe(fusionBolt.id);
     await game.phaseInterceptor.to(DamageAnimPhase, false);
     expect(fusionBolt.calculateBattlePower).toHaveLastReturnedWith(100);
 
     await game.phaseInterceptor.to(MoveEffectPhase, false);
-    expect((game.scene.getCurrentPhase() as MoveEffectPhase).move.moveId).toBe(fusionFlare.id);
+    expect((game.scene.getCurrentPhase() as MoveEffectPhase).move.id).toBe(fusionFlare.id);
     await game.phaseInterceptor.to(DamageAnimPhase, false);
     expect(fusionFlare.calculateBattlePower).toHaveLastReturnedWith(200);
 
     await game.phaseInterceptor.to(MoveEffectPhase, false);
-    expect((game.scene.getCurrentPhase() as MoveEffectPhase).move.moveId).toBe(fusionBolt.id);
+    expect((game.scene.getCurrentPhase() as MoveEffectPhase).move.id).toBe(fusionBolt.id);
     await game.phaseInterceptor.to(DamageAnimPhase, false);
     expect(fusionBolt.calculateBattlePower).toHaveLastReturnedWith(200);
 
     await game.phaseInterceptor.to(MoveEffectPhase, false);
-    expect((game.scene.getCurrentPhase() as MoveEffectPhase).move.moveId).toBe(fusionFlare.id);
+    expect((game.scene.getCurrentPhase() as MoveEffectPhase).move.id).toBe(fusionFlare.id);
     await game.phaseInterceptor.to(DamageAnimPhase, false);
     expect(fusionFlare.calculateBattlePower).toHaveLastReturnedWith(200);
   }, 20000);
diff --git a/src/test/moves/future_sight.test.ts b/test/moves/future_sight.test.ts
similarity index 83%
rename from src/test/moves/future_sight.test.ts
rename to test/moves/future_sight.test.ts
index d0110a87202..48be2451195 100644
--- a/src/test/moves/future_sight.test.ts
+++ b/test/moves/future_sight.test.ts
@@ -1,7 +1,7 @@
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
@@ -23,15 +23,15 @@ describe("Moves - Future Sight", () => {
     game = new GameManager(phaserGame);
     game.override
       .startingLevel(50)
-      .moveset([ Moves.FUTURE_SIGHT, Moves.SPLASH ])
-      .battleType("single")
+      .moveset([Moves.FUTURE_SIGHT, Moves.SPLASH])
+      .battleStyle("single")
       .enemySpecies(Species.MAGIKARP)
       .enemyAbility(Abilities.STURDY)
       .enemyMoveset(Moves.SPLASH);
   });
 
   it("hits 2 turns after use, ignores user switch out", async () => {
-    await game.classicMode.startBattle([ Species.FEEBAS, Species.MILOTIC ]);
+    await game.classicMode.startBattle([Species.FEEBAS, Species.MILOTIC]);
 
     game.move.select(Moves.FUTURE_SIGHT);
     await game.toNextTurn();
diff --git a/src/test/moves/gastro_acid.test.ts b/test/moves/gastro_acid.test.ts
similarity index 88%
rename from src/test/moves/gastro_acid.test.ts
rename to test/moves/gastro_acid.test.ts
index ec9246c855c..8247d29c0a0 100644
--- a/src/test/moves/gastro_acid.test.ts
+++ b/test/moves/gastro_acid.test.ts
@@ -3,10 +3,9 @@ import { Abilities } from "#app/enums/abilities";
 import { Moves } from "#app/enums/moves";
 import { Species } from "#app/enums/species";
 import { MoveResult } from "#app/field/pokemon";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
-
 describe("Moves - Gastro Acid", () => {
   let phaserGame: Phaser.Game;
   let game: GameManager;
@@ -23,11 +22,11 @@ describe("Moves - Gastro Acid", () => {
 
   beforeEach(() => {
     game = new GameManager(phaserGame);
-    game.override.battleType("double");
+    game.override.battleStyle("double");
     game.override.startingLevel(1);
     game.override.enemyLevel(100);
     game.override.ability(Abilities.NONE);
-    game.override.moveset([ Moves.GASTRO_ACID, Moves.WATER_GUN, Moves.SPLASH, Moves.CORE_ENFORCER ]);
+    game.override.moveset([Moves.GASTRO_ACID, Moves.WATER_GUN, Moves.SPLASH, Moves.CORE_ENFORCER]);
     game.override.enemySpecies(Species.BIDOOF);
     game.override.enemyMoveset(Moves.SPLASH);
     game.override.enemyAbility(Abilities.WATER_ABSORB);
@@ -62,13 +61,13 @@ describe("Moves - Gastro Acid", () => {
   });
 
   it("fails if used on an enemy with an already-suppressed ability", async () => {
-    game.override.battleType("single");
+    game.override.battleStyle("single");
 
     await game.startBattle();
 
     game.move.select(Moves.CORE_ENFORCER);
     // Force player to be slower to enable Core Enforcer to proc its suppression effect
-    await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
 
     await game.phaseInterceptor.to("TurnInitPhase");
 
diff --git a/src/test/moves/geomancy.test.ts b/test/moves/geomancy.test.ts
similarity index 70%
rename from src/test/moves/geomancy.test.ts
rename to test/moves/geomancy.test.ts
index 9ff3a1e7a7d..51659f01b12 100644
--- a/src/test/moves/geomancy.test.ts
+++ b/test/moves/geomancy.test.ts
@@ -4,7 +4,7 @@ import { MoveResult } from "#app/field/pokemon";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, it, expect } from "vitest";
 
@@ -26,7 +26,7 @@ describe("Moves - Geomancy", () => {
     game = new GameManager(phaserGame);
     game.override
       .moveset(Moves.GEOMANCY)
-      .battleType("single")
+      .battleStyle("single")
       .startingLevel(100)
       .enemySpecies(Species.SNORLAX)
       .enemyLevel(100)
@@ -35,31 +35,31 @@ describe("Moves - Geomancy", () => {
   });
 
   it("should boost the user's stats on the second turn of use", async () => {
-    await game.classicMode.startBattle([ Species.MAGIKARP ]);
+    await game.classicMode.startBattle([Species.MAGIKARP]);
 
     const player = game.scene.getPlayerPokemon()!;
-    const affectedStats: EffectiveStat[] = [ Stat.SPATK, Stat.SPDEF, Stat.SPD ];
+    const affectedStats: EffectiveStat[] = [Stat.SPATK, Stat.SPDEF, Stat.SPD];
 
     game.move.select(Moves.GEOMANCY);
 
     await game.phaseInterceptor.to("TurnEndPhase");
-    affectedStats.forEach((stat) => expect(player.getStatStage(stat)).toBe(0));
+    affectedStats.forEach(stat => expect(player.getStatStage(stat)).toBe(0));
     expect(player.getLastXMoves(1)[0].result).toBe(MoveResult.OTHER);
 
     await game.phaseInterceptor.to("TurnEndPhase");
-    affectedStats.forEach((stat) => expect(player.getStatStage(stat)).toBe(2));
+    affectedStats.forEach(stat => expect(player.getStatStage(stat)).toBe(2));
     expect(player.getMoveHistory()).toHaveLength(2);
     expect(player.getLastXMoves(1)[0].result).toBe(MoveResult.SUCCESS);
 
-    const playerGeomancy = player.getMoveset().find((mv) => mv && mv.moveId === Moves.GEOMANCY);
+    const playerGeomancy = player.getMoveset().find(mv => mv && mv.moveId === Moves.GEOMANCY);
     expect(playerGeomancy?.ppUsed).toBe(1);
   });
 
   it("should execute over 2 turns between waves", async () => {
-    await game.classicMode.startBattle([ Species.MAGIKARP ]);
+    await game.classicMode.startBattle([Species.MAGIKARP]);
 
     const player = game.scene.getPlayerPokemon()!;
-    const affectedStats: EffectiveStat[] = [ Stat.SPATK, Stat.SPDEF, Stat.SPD ];
+    const affectedStats: EffectiveStat[] = [Stat.SPATK, Stat.SPDEF, Stat.SPD];
 
     game.move.select(Moves.GEOMANCY);
 
@@ -69,11 +69,11 @@ describe("Moves - Geomancy", () => {
     await game.toNextWave();
 
     await game.phaseInterceptor.to("TurnEndPhase");
-    affectedStats.forEach((stat) => expect(player.getStatStage(stat)).toBe(2));
+    affectedStats.forEach(stat => expect(player.getStatStage(stat)).toBe(2));
     expect(player.getMoveHistory()).toHaveLength(2);
     expect(player.getLastXMoves(1)[0].result).toBe(MoveResult.SUCCESS);
 
-    const playerGeomancy = player.getMoveset().find((mv) => mv && mv.moveId === Moves.GEOMANCY);
+    const playerGeomancy = player.getMoveset().find(mv => mv && mv.moveId === Moves.GEOMANCY);
     expect(playerGeomancy?.ppUsed).toBe(1);
   });
 });
diff --git a/src/test/moves/gigaton_hammer.test.ts b/test/moves/gigaton_hammer.test.ts
similarity index 82%
rename from src/test/moves/gigaton_hammer.test.ts
rename to test/moves/gigaton_hammer.test.ts
index f54700fe660..6275e5d2dcb 100644
--- a/src/test/moves/gigaton_hammer.test.ts
+++ b/test/moves/gigaton_hammer.test.ts
@@ -1,5 +1,5 @@
 import { BattlerIndex } from "#app/battle";
-import GameManager from "#app/test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import Phaser from "phaser";
@@ -22,23 +22,23 @@ describe("Moves - Gigaton Hammer", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     game.override
-      .battleType("single")
+      .battleStyle("single")
       .enemySpecies(Species.MAGIKARP)
       .starterSpecies(Species.FEEBAS)
-      .moveset([ Moves.GIGATON_HAMMER ])
+      .moveset([Moves.GIGATON_HAMMER])
       .startingLevel(10)
       .enemyLevel(100)
       .enemyMoveset(Moves.SPLASH)
       .disableCrits();
   });
 
-  it("can't be used two turns in a row", async() => {
+  it("can't be used two turns in a row", async () => {
     await game.classicMode.startBattle();
 
     const enemy1 = game.scene.getEnemyPokemon()!;
 
     game.move.select(Moves.GIGATON_HAMMER);
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
     await game.phaseInterceptor.to("MoveEndPhase");
 
     expect(enemy1.hp).toBeLessThan(enemy1.getMaxHp());
@@ -54,14 +54,14 @@ describe("Moves - Gigaton Hammer", () => {
     expect(enemy2.hp).toBe(enemy2.getMaxHp());
   }, 20000);
 
-  it("can be used again if recalled and sent back out", async() => {
+  it("can be used again if recalled and sent back out", async () => {
     game.override.startingWave(4);
     await game.classicMode.startBattle();
 
     const enemy1 = game.scene.getEnemyPokemon()!;
 
     game.move.select(Moves.GIGATON_HAMMER);
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
     await game.phaseInterceptor.to("MoveEndPhase");
 
     expect(enemy1.hp).toBeLessThan(enemy1.getMaxHp());
diff --git a/src/test/moves/glaive_rush.test.ts b/test/moves/glaive_rush.test.ts
similarity index 82%
rename from src/test/moves/glaive_rush.test.ts
rename to test/moves/glaive_rush.test.ts
index 9cfbfdd8727..3c2bcea7884 100644
--- a/src/test/moves/glaive_rush.test.ts
+++ b/test/moves/glaive_rush.test.ts
@@ -1,12 +1,11 @@
-import { allMoves } from "#app/data/move";
+import { allMoves } from "#app/data/moves/move";
 import { Abilities } from "#app/enums/abilities";
 import { Moves } from "#app/enums/moves";
 import { Species } from "#app/enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
-
 describe("Moves - Glaive Rush", () => {
   let phaserGame: Phaser.Game;
   let game: GameManager;
@@ -24,14 +23,14 @@ describe("Moves - Glaive Rush", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     game.override
-      .battleType("single")
+      .battleStyle("single")
       .disableCrits()
       .enemySpecies(Species.MAGIKARP)
       .enemyAbility(Abilities.BALL_FETCH)
-      .enemyMoveset([ Moves.GLAIVE_RUSH ])
+      .enemyMoveset([Moves.GLAIVE_RUSH])
       .starterSpecies(Species.KLINK)
       .ability(Abilities.BALL_FETCH)
-      .moveset([ Moves.SHADOW_SNEAK, Moves.AVALANCHE, Moves.SPLASH, Moves.GLAIVE_RUSH ]);
+      .moveset([Moves.SHADOW_SNEAK, Moves.AVALANCHE, Moves.SPLASH, Moves.GLAIVE_RUSH]);
   });
 
   it("takes double damage from attacks", async () => {
@@ -46,8 +45,7 @@ describe("Moves - Glaive Rush", () => {
     await game.phaseInterceptor.to("TurnEndPhase");
     game.move.select(Moves.SHADOW_SNEAK);
     await game.phaseInterceptor.to("DamageAnimPhase");
-    expect(enemy.hp).toBeLessThanOrEqual(1001 - (damageDealt * 3));
-
+    expect(enemy.hp).toBeLessThanOrEqual(1001 - damageDealt * 3);
   });
 
   it("always gets hit by attacks", async () => {
@@ -60,13 +58,10 @@ describe("Moves - Glaive Rush", () => {
     game.move.select(Moves.AVALANCHE);
     await game.phaseInterceptor.to("TurnEndPhase");
     expect(enemy.hp).toBeLessThan(1000);
-
   });
 
   it("interacts properly with multi-lens", async () => {
-    game.override
-      .startingHeldItems([{ name: "MULTI_LENS", count: 2 }])
-      .enemyMoveset([ Moves.AVALANCHE ]);
+    game.override.startingHeldItems([{ name: "MULTI_LENS", count: 2 }]).enemyMoveset([Moves.AVALANCHE]);
     await game.classicMode.startBattle();
 
     const player = game.scene.getPlayerPokemon()!;
@@ -83,11 +78,10 @@ describe("Moves - Glaive Rush", () => {
     game.move.select(Moves.SPLASH);
     await game.phaseInterceptor.to("TurnEndPhase");
     expect(player.hp).toBe(1000);
-
   });
 
   it("secondary effects only last until next move", async () => {
-    game.override.enemyMoveset([ Moves.SHADOW_SNEAK ]);
+    game.override.enemyMoveset([Moves.SHADOW_SNEAK]);
     await game.classicMode.startBattle();
 
     const player = game.scene.getPlayerPokemon()!;
@@ -109,14 +103,11 @@ describe("Moves - Glaive Rush", () => {
     game.move.select(Moves.SPLASH);
     await game.phaseInterceptor.to("TurnEndPhase");
     expect(player.hp).toBe(damagedHp);
-
   });
 
   it("secondary effects are removed upon switching", async () => {
-    game.override
-      .enemyMoveset([ Moves.SHADOW_SNEAK ])
-      .starterSpecies(0);
-    await game.classicMode.startBattle([ Species.KLINK, Species.FEEBAS ]);
+    game.override.enemyMoveset([Moves.SHADOW_SNEAK]).starterSpecies(0);
+    await game.classicMode.startBattle([Species.KLINK, Species.FEEBAS]);
 
     const player = game.scene.getPlayerPokemon()!;
     const enemy = game.scene.getEnemyPokemon()!;
@@ -133,11 +124,10 @@ describe("Moves - Glaive Rush", () => {
     game.doSwitchPokemon(1);
     await game.phaseInterceptor.to("TurnEndPhase");
     expect(player.hp).toBe(player.getMaxHp());
-
   });
 
   it("secondary effects don't activate if move fails", async () => {
-    game.override.moveset([ Moves.SHADOW_SNEAK, Moves.PROTECT, Moves.SPLASH, Moves.GLAIVE_RUSH ]);
+    game.override.moveset([Moves.SHADOW_SNEAK, Moves.PROTECT, Moves.SPLASH, Moves.GLAIVE_RUSH]);
     await game.classicMode.startBattle();
 
     const player = game.scene.getPlayerPokemon()!;
@@ -151,7 +141,7 @@ describe("Moves - Glaive Rush", () => {
 
     game.move.select(Moves.SHADOW_SNEAK);
     await game.phaseInterceptor.to("TurnEndPhase");
-    game.override.enemyMoveset([ Moves.SPLASH ]);
+    game.override.enemyMoveset([Moves.SPLASH]);
     const damagedHP1 = 1000 - enemy.hp;
     enemy.hp = 1000;
 
@@ -159,6 +149,6 @@ describe("Moves - Glaive Rush", () => {
     await game.phaseInterceptor.to("TurnEndPhase");
     const damagedHP2 = 1000 - enemy.hp;
 
-    expect(damagedHP2).toBeGreaterThanOrEqual((damagedHP1 * 2) - 1);
+    expect(damagedHP2).toBeGreaterThanOrEqual(damagedHP1 * 2 - 1);
   });
 });
diff --git a/src/test/moves/growth.test.ts b/test/moves/growth.test.ts
similarity index 82%
rename from src/test/moves/growth.test.ts
rename to test/moves/growth.test.ts
index a66e4ec6719..37cd84638ba 100644
--- a/src/test/moves/growth.test.ts
+++ b/test/moves/growth.test.ts
@@ -1,5 +1,5 @@
 import { Stat } from "#enums/stat";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
@@ -24,17 +24,15 @@ describe("Moves - Growth", () => {
 
   beforeEach(() => {
     game = new GameManager(phaserGame);
-    game.override.battleType("single");
+    game.override.battleStyle("single");
     game.override.enemyAbility(Abilities.MOXIE);
     game.override.ability(Abilities.INSOMNIA);
-    game.override.moveset([ Moves.GROWTH ]);
+    game.override.moveset([Moves.GROWTH]);
     game.override.enemyMoveset(Moves.SPLASH);
   });
 
-  it("should raise SPATK stat stage by 1", async() => {
-    await game.startBattle([
-      Species.MIGHTYENA
-    ]);
+  it("should raise SPATK stat stage by 1", async () => {
+    await game.startBattle([Species.MIGHTYENA]);
 
     const playerPokemon = game.scene.getPlayerPokemon()!;
 
diff --git a/src/test/moves/grudge.test.ts b/test/moves/grudge.test.ts
similarity index 69%
rename from src/test/moves/grudge.test.ts
rename to test/moves/grudge.test.ts
index 340808929ab..ecde5351d6d 100644
--- a/src/test/moves/grudge.test.ts
+++ b/test/moves/grudge.test.ts
@@ -2,7 +2,7 @@ import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { BattlerIndex } from "#app/battle";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
@@ -23,44 +23,44 @@ describe("Moves - Grudge", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     game.override
-      .moveset([ Moves.EMBER, Moves.SPLASH ])
+      .moveset([Moves.EMBER, Moves.SPLASH])
       .ability(Abilities.BALL_FETCH)
-      .battleType("single")
+      .battleStyle("single")
       .disableCrits()
       .enemySpecies(Species.SHEDINJA)
       .enemyAbility(Abilities.WONDER_GUARD)
-      .enemyMoveset([ Moves.GRUDGE, Moves.SPLASH ]);
+      .enemyMoveset([Moves.GRUDGE, Moves.SPLASH]);
   });
 
   it("should reduce the PP of the Pokemon's move to 0 when the user has fainted", async () => {
-    await game.classicMode.startBattle([ Species.FEEBAS ]);
+    await game.classicMode.startBattle([Species.FEEBAS]);
 
     const playerPokemon = game.scene.getPlayerPokemon();
     game.move.select(Moves.EMBER);
     await game.forceEnemyMove(Moves.GRUDGE);
-    await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
     await game.phaseInterceptor.to("BerryPhase");
 
-    const playerMove = playerPokemon?.getMoveset().find(m => m?.moveId === Moves.EMBER);
+    const playerMove = playerPokemon?.getMoveset().find(m => m.moveId === Moves.EMBER);
 
     expect(playerMove?.getPpRatio()).toBe(0);
   });
 
   it("should remain in effect until the user's next move", async () => {
-    await game.classicMode.startBattle([ Species.FEEBAS ]);
+    await game.classicMode.startBattle([Species.FEEBAS]);
 
     const playerPokemon = game.scene.getPlayerPokemon();
     game.move.select(Moves.SPLASH);
     await game.forceEnemyMove(Moves.GRUDGE);
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
     await game.toNextTurn();
 
     game.move.select(Moves.EMBER);
     await game.forceEnemyMove(Moves.SPLASH);
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
     await game.phaseInterceptor.to("BerryPhase");
 
-    const playerMove = playerPokemon?.getMoveset().find(m => m?.moveId === Moves.EMBER);
+    const playerMove = playerPokemon?.getMoveset().find(m => m.moveId === Moves.EMBER);
 
     expect(playerMove?.getPpRatio()).toBe(0);
   });
@@ -68,23 +68,23 @@ describe("Moves - Grudge", () => {
   it("should not reduce the opponent's PP if the user dies to weather/indirect damage", async () => {
     // Opponent will be reduced to 1 HP by False Swipe, then faint to Sandstorm
     game.override
-      .moveset([ Moves.FALSE_SWIPE ])
+      .moveset([Moves.FALSE_SWIPE])
       .startingLevel(100)
       .ability(Abilities.SAND_STREAM)
       .enemySpecies(Species.RATTATA);
-    await game.classicMode.startBattle([ Species.GEODUDE ]);
+    await game.classicMode.startBattle([Species.GEODUDE]);
 
     const enemyPokemon = game.scene.getEnemyPokemon();
     const playerPokemon = game.scene.getPlayerPokemon();
 
     game.move.select(Moves.FALSE_SWIPE);
     await game.forceEnemyMove(Moves.GRUDGE);
-    await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
     await game.phaseInterceptor.to("BerryPhase");
 
     expect(enemyPokemon?.isFainted()).toBe(true);
 
-    const playerMove = playerPokemon?.getMoveset().find(m => m?.moveId === Moves.FALSE_SWIPE);
+    const playerMove = playerPokemon?.getMoveset().find(m => m.moveId === Moves.FALSE_SWIPE);
     expect(playerMove?.getPpRatio()).toBeGreaterThan(0);
   });
 });
diff --git a/src/test/moves/guard_split.test.ts b/test/moves/guard_split.test.ts
similarity index 89%
rename from src/test/moves/guard_split.test.ts
rename to test/moves/guard_split.test.ts
index 519f347b920..d182e94b203 100644
--- a/src/test/moves/guard_split.test.ts
+++ b/test/moves/guard_split.test.ts
@@ -1,6 +1,6 @@
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 import Phaser from "phaser";
-import GameManager from "#app/test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import { Species } from "#enums/species";
 import { TurnEndPhase } from "#app/phases/turn-end-phase";
 import { Moves } from "#enums/moves";
@@ -24,19 +24,17 @@ describe("Moves - Guard Split", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     game.override
-      .battleType("single")
+      .battleStyle("single")
       .enemyAbility(Abilities.NONE)
       .enemySpecies(Species.MEW)
       .enemyLevel(200)
-      .moveset([ Moves.GUARD_SPLIT ])
+      .moveset([Moves.GUARD_SPLIT])
       .ability(Abilities.NONE);
   });
 
   it("should average the user's DEF and SPDEF stats with those of the target", async () => {
     game.override.enemyMoveset(Moves.SPLASH);
-    await game.startBattle([
-      Species.INDEEDEE
-    ]);
+    await game.startBattle([Species.INDEEDEE]);
 
     const player = game.scene.getPlayerPokemon()!;
     const enemy = game.scene.getEnemyPokemon()!;
@@ -55,10 +53,8 @@ describe("Moves - Guard Split", () => {
   }, 20000);
 
   it("should be idempotent", async () => {
-    game.override.enemyMoveset([ Moves.GUARD_SPLIT ]);
-    await game.startBattle([
-      Species.INDEEDEE
-    ]);
+    game.override.enemyMoveset([Moves.GUARD_SPLIT]);
+    await game.startBattle([Species.INDEEDEE]);
 
     const player = game.scene.getPlayerPokemon()!;
     const enemy = game.scene.getEnemyPokemon()!;
diff --git a/src/test/moves/guard_swap.test.ts b/test/moves/guard_swap.test.ts
similarity index 90%
rename from src/test/moves/guard_swap.test.ts
rename to test/moves/guard_swap.test.ts
index 99769b32899..2076f92ccb1 100644
--- a/src/test/moves/guard_swap.test.ts
+++ b/test/moves/guard_swap.test.ts
@@ -1,6 +1,6 @@
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 import Phaser from "phaser";
-import GameManager from "#app/test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import { Species } from "#enums/species";
 import { TurnEndPhase } from "#app/phases/turn-end-phase";
 import { Moves } from "#enums/moves";
@@ -24,19 +24,17 @@ describe("Moves - Guard Swap", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     game.override
-      .battleType("single")
+      .battleStyle("single")
       .enemyAbility(Abilities.BALL_FETCH)
       .enemyMoveset(Moves.SPLASH)
       .enemySpecies(Species.INDEEDEE)
       .enemyLevel(200)
-      .moveset([ Moves.GUARD_SWAP ])
+      .moveset([Moves.GUARD_SWAP])
       .ability(Abilities.NONE);
   });
 
   it("should swap the user's DEF and SPDEF stat stages with the target's", async () => {
-    await game.classicMode.startBattle([
-      Species.INDEEDEE
-    ]);
+    await game.classicMode.startBattle([Species.INDEEDEE]);
 
     const player = game.scene.getPlayerPokemon()!;
     const enemy = game.scene.getEnemyPokemon()!;
diff --git a/src/test/moves/hard_press.test.ts b/test/moves/hard_press.test.ts
similarity index 78%
rename from src/test/moves/hard_press.test.ts
rename to test/moves/hard_press.test.ts
index 0fa4181491c..8fe768cb8e4 100644
--- a/src/test/moves/hard_press.test.ts
+++ b/test/moves/hard_press.test.ts
@@ -1,17 +1,18 @@
-import { allMoves } from "#app/data/move";
+import { allMoves } from "#app/data/moves/move";
 import { MoveEffectPhase } from "#app/phases/move-effect-phase";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
+import type Move from "#app/data/moves/move";
 
 describe("Moves - Hard Press", () => {
   let phaserGame: Phaser.Game;
   let game: GameManager;
 
-  const moveToCheck = allMoves[Moves.HARD_PRESS];
+  let moveToCheck: Move;
 
   beforeAll(() => {
     phaserGame = new Phaser.Game({
@@ -24,18 +25,19 @@ describe("Moves - Hard Press", () => {
   });
 
   beforeEach(() => {
+    moveToCheck = allMoves[Moves.HARD_PRESS];
     game = new GameManager(phaserGame);
-    game.override.battleType("single");
+    game.override.battleStyle("single");
     game.override.ability(Abilities.BALL_FETCH);
     game.override.enemySpecies(Species.MUNCHLAX);
     game.override.enemyAbility(Abilities.BALL_FETCH);
     game.override.enemyMoveset(Moves.SPLASH);
-    game.override.moveset([ Moves.HARD_PRESS ]);
+    game.override.moveset([Moves.HARD_PRESS]);
     vi.spyOn(moveToCheck, "calculateBattlePower");
   });
 
   it("should return 100 power if target HP ratio is at 100%", async () => {
-    await game.startBattle([ Species.PIKACHU ]);
+    await game.startBattle([Species.PIKACHU]);
 
     game.move.select(Moves.HARD_PRESS);
     await game.phaseInterceptor.to(MoveEffectPhase);
@@ -44,8 +46,8 @@ describe("Moves - Hard Press", () => {
   });
 
   it("should return 50 power if target HP ratio is at 50%", async () => {
-    await game.startBattle([ Species.PIKACHU ]);
-    const targetHpRatio = .5;
+    await game.startBattle([Species.PIKACHU]);
+    const targetHpRatio = 0.5;
     const enemy = game.scene.getEnemyPokemon()!;
 
     vi.spyOn(enemy, "getHpRatio").mockReturnValue(targetHpRatio);
@@ -57,8 +59,8 @@ describe("Moves - Hard Press", () => {
   });
 
   it("should return 1 power if target HP ratio is at 1%", async () => {
-    await game.startBattle([ Species.PIKACHU ]);
-    const targetHpRatio = .01;
+    await game.startBattle([Species.PIKACHU]);
+    const targetHpRatio = 0.01;
     const enemy = game.scene.getEnemyPokemon()!;
 
     vi.spyOn(enemy, "getHpRatio").mockReturnValue(targetHpRatio);
@@ -70,8 +72,8 @@ describe("Moves - Hard Press", () => {
   });
 
   it("should return 1 power if target HP ratio is less than 1%", async () => {
-    await game.startBattle([ Species.PIKACHU ]);
-    const targetHpRatio = .005;
+    await game.startBattle([Species.PIKACHU]);
+    const targetHpRatio = 0.005;
     const enemy = game.scene.getEnemyPokemon()!;
 
     vi.spyOn(enemy, "getHpRatio").mockReturnValue(targetHpRatio);
diff --git a/src/test/moves/haze.test.ts b/test/moves/haze.test.ts
similarity index 88%
rename from src/test/moves/haze.test.ts
rename to test/moves/haze.test.ts
index 30aab8bd98c..4ddb6d1c7c5 100644
--- a/src/test/moves/haze.test.ts
+++ b/test/moves/haze.test.ts
@@ -1,5 +1,5 @@
 import { Stat } from "#enums/stat";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
@@ -23,7 +23,7 @@ describe("Moves - Haze", () => {
     beforeEach(() => {
       game = new GameManager(phaserGame);
 
-      game.override.battleType("single");
+      game.override.battleStyle("single");
 
       game.override.enemySpecies(Species.RATTATA);
       game.override.enemyLevel(100);
@@ -31,12 +31,12 @@ describe("Moves - Haze", () => {
       game.override.enemyAbility(Abilities.NONE);
 
       game.override.startingLevel(100);
-      game.override.moveset([ Moves.HAZE, Moves.SWORDS_DANCE, Moves.CHARM, Moves.SPLASH ]);
+      game.override.moveset([Moves.HAZE, Moves.SWORDS_DANCE, Moves.CHARM, Moves.SPLASH]);
       game.override.ability(Abilities.NONE);
     });
 
     it("should reset all stat changes of all Pokemon on field", async () => {
-      await game.startBattle([ Species.RATTATA ]);
+      await game.startBattle([Species.RATTATA]);
       const user = game.scene.getPlayerPokemon()!;
       const enemy = game.scene.getEnemyPokemon()!;
 
diff --git a/src/test/moves/heal_bell.test.ts b/test/moves/heal_bell.test.ts
similarity index 83%
rename from src/test/moves/heal_bell.test.ts
rename to test/moves/heal_bell.test.ts
index b180588d3a3..8ffb602c24f 100644
--- a/src/test/moves/heal_bell.test.ts
+++ b/test/moves/heal_bell.test.ts
@@ -3,7 +3,7 @@ import { CommandPhase } from "#app/phases/command-phase";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, it, expect, vi } from "vitest";
 
@@ -24,16 +24,16 @@ describe("Moves - Heal Bell", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     game.override
-      .moveset([ Moves.HEAL_BELL, Moves.SPLASH ])
+      .moveset([Moves.HEAL_BELL, Moves.SPLASH])
       .statusEffect(StatusEffect.BURN)
-      .battleType("double")
+      .battleStyle("double")
       .enemyAbility(Abilities.BALL_FETCH)
       .enemyMoveset(Moves.SPLASH);
   });
 
   it("should cure status effect of the user, its ally, and all party pokemon", async () => {
-    await game.classicMode.startBattle([ Species.RATTATA, Species.RATTATA, Species.RATTATA ]);
-    const [ leftPlayer, rightPlayer, partyPokemon ] = game.scene.getPlayerParty();
+    await game.classicMode.startBattle([Species.RATTATA, Species.RATTATA, Species.RATTATA]);
+    const [leftPlayer, rightPlayer, partyPokemon] = game.scene.getPlayerParty();
 
     vi.spyOn(leftPlayer, "resetStatus");
     vi.spyOn(rightPlayer, "resetStatus");
@@ -55,8 +55,8 @@ describe("Moves - Heal Bell", () => {
 
   it("should not cure status effect of the target/target's allies", async () => {
     game.override.enemyStatusEffect(StatusEffect.BURN);
-    await game.classicMode.startBattle([ Species.RATTATA, Species.RATTATA ]);
-    const [ leftOpp, rightOpp ] = game.scene.getEnemyField();
+    await game.classicMode.startBattle([Species.RATTATA, Species.RATTATA]);
+    const [leftOpp, rightOpp] = game.scene.getEnemyField();
 
     vi.spyOn(leftOpp, "resetStatus");
     vi.spyOn(rightOpp, "resetStatus");
@@ -78,8 +78,8 @@ describe("Moves - Heal Bell", () => {
 
   it("should not cure status effect of allies ON FIELD with Soundproof, should still cure allies in party", async () => {
     game.override.ability(Abilities.SOUNDPROOF);
-    await game.classicMode.startBattle([ Species.RATTATA, Species.RATTATA, Species.RATTATA ]);
-    const [ leftPlayer, rightPlayer, partyPokemon ] = game.scene.getPlayerParty();
+    await game.classicMode.startBattle([Species.RATTATA, Species.RATTATA, Species.RATTATA]);
+    const [leftPlayer, rightPlayer, partyPokemon] = game.scene.getPlayerParty();
 
     vi.spyOn(leftPlayer, "resetStatus");
     vi.spyOn(rightPlayer, "resetStatus");
diff --git a/src/test/moves/heal_block.test.ts b/test/moves/heal_block.test.ts
similarity index 74%
rename from src/test/moves/heal_block.test.ts
rename to test/moves/heal_block.test.ts
index 25f2076ff3e..4ef67214a91 100644
--- a/src/test/moves/heal_block.test.ts
+++ b/test/moves/heal_block.test.ts
@@ -1,6 +1,6 @@
 import { BattlerIndex } from "#app/battle";
 import { ArenaTagSide } from "#app/data/arena-tag";
-import GameManager from "#app/test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import { Abilities } from "#enums/abilities";
 import { ArenaTagType } from "#enums/arena-tag-type";
 import { BattlerTagType } from "#enums/battler-tag-type";
@@ -28,7 +28,7 @@ describe("Moves - Heal Block", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     game.override
-      .moveset([ Moves.ABSORB, Moves.WISH, Moves.SPLASH, Moves.AQUA_RING ])
+      .moveset([Moves.ABSORB, Moves.WISH, Moves.SPLASH, Moves.AQUA_RING])
       .enemyMoveset(Moves.HEAL_BLOCK)
       .ability(Abilities.NO_GUARD)
       .enemyAbility(Abilities.BALL_FETCH)
@@ -36,9 +36,8 @@ describe("Moves - Heal Block", () => {
       .disableCrits();
   });
 
-  it("shouldn't stop damage from HP-drain attacks, just HP restoration", async() => {
-
-    await game.classicMode.startBattle([ Species.CHARIZARD ]);
+  it("shouldn't stop damage from HP-drain attacks, just HP restoration", async () => {
+    await game.classicMode.startBattle([Species.CHARIZARD]);
 
     const player = game.scene.getPlayerPokemon()!;
     const enemy = game.scene.getEnemyPokemon()!;
@@ -46,31 +45,31 @@ describe("Moves - Heal Block", () => {
     player.damageAndUpdate(enemy.getMaxHp() - 1);
 
     game.move.select(Moves.ABSORB);
-    await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
     await game.phaseInterceptor.to("TurnEndPhase");
 
     expect(player.hp).toBe(1);
     expect(enemy.hp).toBeLessThan(enemy.getMaxHp());
   });
 
-  it("shouldn't stop Liquid Ooze from dealing damage", async() => {
+  it("shouldn't stop Liquid Ooze from dealing damage", async () => {
     game.override.enemyAbility(Abilities.LIQUID_OOZE);
 
-    await game.classicMode.startBattle([ Species.CHARIZARD ]);
+    await game.classicMode.startBattle([Species.CHARIZARD]);
 
     const player = game.scene.getPlayerPokemon()!;
     const enemy = game.scene.getEnemyPokemon()!;
 
     game.move.select(Moves.ABSORB);
-    await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
     await game.phaseInterceptor.to("TurnEndPhase");
 
     expect(player.isFullHp()).toBe(false);
     expect(enemy.isFullHp()).toBe(false);
   });
 
-  it("should stop delayed heals, such as from Wish", async() => {
-    await game.classicMode.startBattle([ Species.CHARIZARD ]);
+  it("should stop delayed heals, such as from Wish", async () => {
+    await game.classicMode.startBattle([Species.CHARIZARD]);
 
     const player = game.scene.getPlayerPokemon()!;
 
@@ -88,10 +87,10 @@ describe("Moves - Heal Block", () => {
     expect(player.hp).toBe(1);
   });
 
-  it("should prevent Grassy Terrain from restoring HP", async() => {
+  it("should prevent Grassy Terrain from restoring HP", async () => {
     game.override.enemyAbility(Abilities.GRASSY_SURGE);
 
-    await game.classicMode.startBattle([ Species.CHARIZARD ]);
+    await game.classicMode.startBattle([Species.CHARIZARD]);
 
     const player = game.scene.getPlayerPokemon()!;
 
@@ -103,8 +102,8 @@ describe("Moves - Heal Block", () => {
     expect(player.hp).toBe(1);
   });
 
-  it("should prevent healing from heal-over-time moves", async() => {
-    await game.classicMode.startBattle([ Species.CHARIZARD ]);
+  it("should prevent healing from heal-over-time moves", async () => {
+    await game.classicMode.startBattle([Species.CHARIZARD]);
 
     const player = game.scene.getPlayerPokemon()!;
 
@@ -117,12 +116,10 @@ describe("Moves - Heal Block", () => {
     expect(player.hp).toBe(1);
   });
 
-  it("should prevent abilities from restoring HP", async() => {
-    game.override
-      .weather(WeatherType.RAIN)
-      .ability(Abilities.RAIN_DISH);
+  it("should prevent abilities from restoring HP", async () => {
+    game.override.weather(WeatherType.RAIN).ability(Abilities.RAIN_DISH);
 
-    await game.classicMode.startBattle([ Species.CHARIZARD ]);
+    await game.classicMode.startBattle([Species.CHARIZARD]);
 
     const player = game.scene.getPlayerPokemon()!;
 
@@ -134,10 +131,10 @@ describe("Moves - Heal Block", () => {
     expect(player.hp).toBe(1);
   });
 
-  it("should stop healing from items", async() => {
+  it("should stop healing from items", async () => {
     game.override.startingHeldItems([{ name: "LEFTOVERS" }]);
 
-    await game.classicMode.startBattle([ Species.CHARIZARD ]);
+    await game.classicMode.startBattle([Species.CHARIZARD]);
 
     const player = game.scene.getPlayerPokemon()!;
     player.damageAndUpdate(player.getMaxHp() - 1);
diff --git a/src/test/moves/heart_swap.test.ts b/test/moves/heart_swap.test.ts
similarity index 89%
rename from src/test/moves/heart_swap.test.ts
rename to test/moves/heart_swap.test.ts
index a128549c459..009db731951 100644
--- a/src/test/moves/heart_swap.test.ts
+++ b/test/moves/heart_swap.test.ts
@@ -1,6 +1,6 @@
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 import Phaser from "phaser";
-import GameManager from "#app/test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import { Species } from "#enums/species";
 import { TurnEndPhase } from "#app/phases/turn-end-phase";
 import { Moves } from "#enums/moves";
@@ -24,19 +24,17 @@ describe("Moves - Heart Swap", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     game.override
-      .battleType("single")
+      .battleStyle("single")
       .enemyAbility(Abilities.BALL_FETCH)
       .enemyMoveset(Moves.SPLASH)
       .enemySpecies(Species.INDEEDEE)
       .enemyLevel(200)
-      .moveset([ Moves.HEART_SWAP ])
+      .moveset([Moves.HEART_SWAP])
       .ability(Abilities.NONE);
   });
 
   it("should swap all of the user's stat stages with the target's", async () => {
-    await game.classicMode.startBattle([
-      Species.MANAPHY
-    ]);
+    await game.classicMode.startBattle([Species.MANAPHY]);
 
     const player = game.scene.getPlayerPokemon()!;
     const enemy = game.scene.getEnemyPokemon()!;
diff --git a/test/moves/hyper_beam.test.ts b/test/moves/hyper_beam.test.ts
new file mode 100644
index 00000000000..5b370f49e4c
--- /dev/null
+++ b/test/moves/hyper_beam.test.ts
@@ -0,0 +1,67 @@
+import { allMoves } from "#app/data/moves/move";
+import { Abilities } from "#app/enums/abilities";
+import { BattlerTagType } from "#app/enums/battler-tag-type";
+import { Moves } from "#app/enums/moves";
+import { Species } from "#app/enums/species";
+import { BerryPhase } from "#app/phases/berry-phase";
+import { TurnEndPhase } from "#app/phases/turn-end-phase";
+import GameManager from "#test/testUtils/gameManager";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
+
+describe("Moves - Hyper Beam", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+
+    game.override.battleStyle("single");
+    game.override.ability(Abilities.BALL_FETCH);
+    game.override.enemySpecies(Species.SNORLAX);
+    game.override.enemyAbility(Abilities.BALL_FETCH);
+    game.override.enemyMoveset([Moves.SPLASH]);
+    game.override.enemyLevel(100);
+
+    game.override.moveset([Moves.HYPER_BEAM, Moves.TACKLE]);
+    vi.spyOn(allMoves[Moves.HYPER_BEAM], "accuracy", "get").mockReturnValue(100);
+  });
+
+  it("should force the user to recharge on the next turn (and only that turn)", async () => {
+    await game.startBattle([Species.MAGIKARP]);
+
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+    const enemyPokemon = game.scene.getEnemyPokemon()!;
+
+    game.move.select(Moves.HYPER_BEAM);
+
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    expect(enemyPokemon.hp).toBeLessThan(enemyPokemon.getMaxHp());
+    expect(leadPokemon.getTag(BattlerTagType.RECHARGING)).toBeDefined();
+
+    const enemyPostAttackHp = enemyPokemon.hp;
+
+    /** Game should progress without a new command from the player */
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    expect(enemyPokemon.hp).toBe(enemyPostAttackHp);
+    expect(leadPokemon.getTag(BattlerTagType.RECHARGING)).toBeUndefined();
+
+    game.move.select(Moves.TACKLE);
+
+    await game.phaseInterceptor.to(BerryPhase, false);
+
+    expect(enemyPokemon.hp).toBeLessThan(enemyPostAttackHp);
+  });
+});
diff --git a/src/test/moves/imprison.test.ts b/test/moves/imprison.test.ts
similarity index 85%
rename from src/test/moves/imprison.test.ts
rename to test/moves/imprison.test.ts
index f10e20dab63..cefbaa52cad 100644
--- a/src/test/moves/imprison.test.ts
+++ b/test/moves/imprison.test.ts
@@ -1,7 +1,7 @@
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { Abilities } from "#enums/abilities";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 import { BattlerTagType } from "#enums/battler-tag-type";
@@ -23,15 +23,15 @@ describe("Moves - Imprison", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     game.override
-      .battleType("single")
+      .battleStyle("single")
       .enemyAbility(Abilities.BALL_FETCH)
-      .enemyMoveset([ Moves.IMPRISON, Moves.SPLASH, Moves.GROWL ])
+      .enemyMoveset([Moves.IMPRISON, Moves.SPLASH, Moves.GROWL])
       .enemySpecies(Species.SHUCKLE)
-      .moveset([ Moves.TRANSFORM, Moves.SPLASH ]);
+      .moveset([Moves.TRANSFORM, Moves.SPLASH]);
   });
 
   it("Pokemon under Imprison cannot use shared moves", async () => {
-    await game.classicMode.startBattle([ Species.REGIELEKI ]);
+    await game.classicMode.startBattle([Species.REGIELEKI]);
 
     const playerPokemon = game.scene.getPlayerPokemon()!;
 
@@ -39,7 +39,10 @@ describe("Moves - Imprison", () => {
     await game.forceEnemyMove(Moves.IMPRISON);
     await game.toNextTurn();
     const playerMoveset = playerPokemon.getMoveset().map(x => x?.moveId);
-    const enemyMoveset = game.scene.getEnemyPokemon()!.getMoveset().map(x => x?.moveId);
+    const enemyMoveset = game.scene
+      .getEnemyPokemon()!
+      .getMoveset()
+      .map(x => x?.moveId);
     expect(enemyMoveset.includes(playerMoveset[0])).toBeTruthy();
     const imprisonArenaTag = game.scene.arena.getTag(ArenaTagType.IMPRISON);
     const imprisonBattlerTag = playerPokemon.getTag(BattlerTagType.IMPRISON);
@@ -55,7 +58,7 @@ describe("Moves - Imprison", () => {
   });
 
   it("Imprison applies to Pokemon switched into Battle", async () => {
-    await game.classicMode.startBattle([ Species.REGIELEKI, Species.BULBASAUR ]);
+    await game.classicMode.startBattle([Species.REGIELEKI, Species.BULBASAUR]);
 
     const playerPokemon1 = game.scene.getPlayerPokemon()!;
 
@@ -78,8 +81,8 @@ describe("Moves - Imprison", () => {
   });
 
   it("The effects of Imprison only end when the source is no longer active", async () => {
-    game.override.moveset([ Moves.SPLASH, Moves.IMPRISON ]);
-    await game.classicMode.startBattle([ Species.REGIELEKI, Species.BULBASAUR ]);
+    game.override.moveset([Moves.SPLASH, Moves.IMPRISON]);
+    await game.classicMode.startBattle([Species.REGIELEKI, Species.BULBASAUR]);
 
     const playerPokemon = game.scene.getPlayerPokemon()!;
     const enemyPokemon = game.scene.getEnemyPokemon()!;
diff --git a/src/test/moves/instruct.test.ts b/test/moves/instruct.test.ts
similarity index 65%
rename from src/test/moves/instruct.test.ts
rename to test/moves/instruct.test.ts
index b26f9c9669f..dd25db4ec90 100644
--- a/src/test/moves/instruct.test.ts
+++ b/test/moves/instruct.test.ts
@@ -5,7 +5,7 @@ import type { MovePhase } from "#app/phases/move-phase";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
@@ -32,7 +32,7 @@ describe("Moves - Instruct", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     game.override
-      .battleType("single")
+      .battleStyle("single")
       .enemySpecies(Species.SHUCKLE)
       .enemyAbility(Abilities.NO_GUARD)
       .enemyLevel(100)
@@ -41,17 +41,15 @@ describe("Moves - Instruct", () => {
   });
 
   it("should repeat target's last used move", async () => {
-    game.override
-      .moveset(Moves.INSTRUCT)
-      .enemyLevel(1000); // ensures shuckle no die
-    await game.classicMode.startBattle([ Species.AMOONGUSS ]);
+    game.override.moveset(Moves.INSTRUCT).enemyLevel(1000); // ensures shuckle no die
+    await game.classicMode.startBattle([Species.AMOONGUSS]);
 
     const enemy = game.scene.getEnemyPokemon()!;
     game.move.changeMoveset(enemy, Moves.SONIC_BOOM);
 
     game.move.select(Moves.INSTRUCT);
     await game.forceEnemyMove(Moves.SONIC_BOOM);
-    await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
 
     await game.phaseInterceptor.to("MovePhase"); // enemy attacks us
     await game.phaseInterceptor.to("MovePhase", false); // instruct
@@ -70,20 +68,20 @@ describe("Moves - Instruct", () => {
   });
 
   it("should repeat enemy's move through substitute", async () => {
-    game.override.moveset([ Moves.INSTRUCT, Moves.SPLASH ]);
-    await game.classicMode.startBattle([ Species.AMOONGUSS ]);
+    game.override.moveset([Moves.INSTRUCT, Moves.SPLASH]);
+    await game.classicMode.startBattle([Species.AMOONGUSS]);
 
     const enemy = game.scene.getEnemyPokemon()!;
-    game.move.changeMoveset(enemy, [ Moves.SONIC_BOOM, Moves.SUBSTITUTE ]);
+    game.move.changeMoveset(enemy, [Moves.SONIC_BOOM, Moves.SUBSTITUTE]);
 
     game.move.select(Moves.SPLASH);
     await game.forceEnemyMove(Moves.SUBSTITUTE);
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
     await game.toNextTurn();
 
     game.move.select(Moves.INSTRUCT);
     await game.forceEnemyMove(Moves.SONIC_BOOM);
-    await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
     await game.phaseInterceptor.to("TurnEndPhase", false);
 
     instructSuccess(game.scene.getEnemyPokemon()!, Moves.SONIC_BOOM);
@@ -91,18 +89,16 @@ describe("Moves - Instruct", () => {
   });
 
   it("should repeat ally's attack on enemy", async () => {
-    game.override
-      .battleType("double")
-      .enemyMoveset(Moves.SPLASH);
-    await game.classicMode.startBattle([ Species.AMOONGUSS, Species.SHUCKLE ]);
+    game.override.battleStyle("double").enemyMoveset(Moves.SPLASH);
+    await game.classicMode.startBattle([Species.AMOONGUSS, Species.SHUCKLE]);
 
-    const [ amoonguss, shuckle ] = game.scene.getPlayerField();
-    game.move.changeMoveset(amoonguss, [ Moves.INSTRUCT, Moves.SONIC_BOOM ]);
-    game.move.changeMoveset(shuckle, [ Moves.INSTRUCT, Moves.SONIC_BOOM ]);
+    const [amoonguss, shuckle] = game.scene.getPlayerField();
+    game.move.changeMoveset(amoonguss, [Moves.INSTRUCT, Moves.SONIC_BOOM]);
+    game.move.changeMoveset(shuckle, [Moves.INSTRUCT, Moves.SONIC_BOOM]);
 
     game.move.select(Moves.INSTRUCT, BattlerIndex.PLAYER, BattlerIndex.PLAYER_2);
     game.move.select(Moves.SONIC_BOOM, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY);
-    await game.setTurnOrder([ BattlerIndex.PLAYER_2, BattlerIndex.PLAYER, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2 ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER_2, BattlerIndex.PLAYER, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2]);
     await game.phaseInterceptor.to("TurnEndPhase", false);
 
     instructSuccess(shuckle, Moves.SONIC_BOOM);
@@ -111,16 +107,14 @@ describe("Moves - Instruct", () => {
 
   // TODO: Enable test case once gigaton hammer (and blood moon) are reworked
   it.todo("should repeat enemy's Gigaton Hammer", async () => {
-    game.override
-      .moveset(Moves.INSTRUCT)
-      .enemyLevel(5);
-    await game.classicMode.startBattle([ Species.AMOONGUSS ]);
+    game.override.moveset(Moves.INSTRUCT).enemyLevel(5);
+    await game.classicMode.startBattle([Species.AMOONGUSS]);
 
     const enemy = game.scene.getEnemyPokemon()!;
-    game.move.changeMoveset(enemy, [ Moves.GIGATON_HAMMER, Moves.BLOOD_MOON ]);
+    game.move.changeMoveset(enemy, [Moves.GIGATON_HAMMER, Moves.BLOOD_MOON]);
 
     game.move.select(Moves.INSTRUCT);
-    await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
     await game.phaseInterceptor.to("BerryPhase");
 
     instructSuccess(enemy, Moves.GIGATON_HAMMER);
@@ -128,18 +122,15 @@ describe("Moves - Instruct", () => {
   });
 
   it("should add moves to move queue for copycat", async () => {
-    game.override
-      .battleType("double")
-      .moveset(Moves.INSTRUCT)
-      .enemyLevel(5);
-    await game.classicMode.startBattle([ Species.AMOONGUSS ]);
+    game.override.battleStyle("double").moveset(Moves.INSTRUCT).enemyLevel(5);
+    await game.classicMode.startBattle([Species.AMOONGUSS]);
 
-    const [ enemy1, enemy2 ] = game.scene.getEnemyField()!;
+    const [enemy1, enemy2] = game.scene.getEnemyField()!;
     game.move.changeMoveset(enemy1, Moves.WATER_GUN);
     game.move.changeMoveset(enemy2, Moves.COPYCAT);
 
     game.move.select(Moves.INSTRUCT, BattlerIndex.PLAYER, BattlerIndex.ENEMY);
-    await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER, BattlerIndex.ENEMY_2 ]);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER, BattlerIndex.ENEMY_2]);
     await game.phaseInterceptor.to("BerryPhase");
 
     instructSuccess(enemy1, Moves.WATER_GUN);
@@ -148,17 +139,15 @@ describe("Moves - Instruct", () => {
   });
 
   it("should respect enemy's status condition", async () => {
-    game.override
-      .moveset([ Moves.INSTRUCT, Moves.THUNDER_WAVE ])
-      .enemyMoveset(Moves.SONIC_BOOM);
-    await game.classicMode.startBattle([ Species.AMOONGUSS ]);
+    game.override.moveset([Moves.INSTRUCT, Moves.THUNDER_WAVE]).enemyMoveset(Moves.SONIC_BOOM);
+    await game.classicMode.startBattle([Species.AMOONGUSS]);
 
     game.move.select(Moves.THUNDER_WAVE);
-    await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
     await game.toNextTurn();
 
     game.move.select(Moves.INSTRUCT);
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
     await game.phaseInterceptor.to("MovePhase");
     // force enemy's instructed move to bork and then immediately thaw out
     await game.move.forceStatusActivation(true);
@@ -166,15 +155,13 @@ describe("Moves - Instruct", () => {
     await game.phaseInterceptor.to("TurnEndPhase", false);
 
     const moveHistory = game.scene.getEnemyPokemon()?.getLastXMoves(-1)!;
-    expect(moveHistory.map(m => m.move)).toEqual([ Moves.SONIC_BOOM, Moves.NONE, Moves.SONIC_BOOM ]);
+    expect(moveHistory.map(m => m.move)).toEqual([Moves.SONIC_BOOM, Moves.NONE, Moves.SONIC_BOOM]);
     expect(game.scene.getPlayerPokemon()?.getInverseHp()).toBe(40);
   });
 
   it("should not repeat enemy's out of pp move", async () => {
-    game.override
-      .moveset(Moves.INSTRUCT)
-      .enemySpecies(Species.UNOWN);
-    await game.classicMode.startBattle([ Species.AMOONGUSS ]);
+    game.override.moveset(Moves.INSTRUCT).enemySpecies(Species.UNOWN);
+    await game.classicMode.startBattle([Species.AMOONGUSS]);
 
     const enemyPokemon = game.scene.getEnemyPokemon()!;
     game.move.changeMoveset(enemyPokemon, Moves.HIDDEN_POWER);
@@ -183,7 +170,7 @@ describe("Moves - Instruct", () => {
 
     game.move.select(Moves.INSTRUCT);
     await game.forceEnemyMove(Moves.HIDDEN_POWER);
-    await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
     await game.phaseInterceptor.to("TurnEndPhase", false);
 
     const playerMoves = game.scene.getPlayerPokemon()!.getLastXMoves(-1)!;
@@ -192,20 +179,16 @@ describe("Moves - Instruct", () => {
   });
 
   it("should redirect attacking moves if enemy faints", async () => {
-    game.override
-      .battleType("double")
-      .enemyMoveset(Moves.SPLASH)
-      .enemySpecies(Species.MAGIKARP)
-      .enemyLevel(1);
-    await game.classicMode.startBattle([ Species.HISUI_ELECTRODE, Species.KOMMO_O ]);
+    game.override.battleStyle("double").enemyMoveset(Moves.SPLASH).enemySpecies(Species.MAGIKARP).enemyLevel(1);
+    await game.classicMode.startBattle([Species.HISUI_ELECTRODE, Species.KOMMO_O]);
 
-    const [ electrode, kommo_o ] = game.scene.getPlayerField()!;
+    const [electrode, kommo_o] = game.scene.getPlayerField()!;
     game.move.changeMoveset(electrode, Moves.CHLOROBLAST);
     game.move.changeMoveset(kommo_o, Moves.INSTRUCT);
 
     game.move.select(Moves.CHLOROBLAST, BattlerIndex.PLAYER, BattlerIndex.ENEMY);
     game.move.select(Moves.INSTRUCT, BattlerIndex.PLAYER_2, BattlerIndex.PLAYER);
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2 ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2]);
     await game.phaseInterceptor.to("BerryPhase");
 
     // Chloroblast always deals 50% max HP% recoil UNLESS you whiff
@@ -213,19 +196,15 @@ describe("Moves - Instruct", () => {
     // so all we have to do is check whether electrode fainted or not.
     // Naturally, both karps should also be dead as well.
     expect(electrode.isFainted()).toBe(true);
-    const [ karp1, karp2 ] = game.scene.getEnemyField()!;
+    const [karp1, karp2] = game.scene.getEnemyField()!;
     expect(karp1.isFainted()).toBe(true);
     expect(karp2.isFainted()).toBe(true);
-  }),
-
+  });
   it("should allow for dancer copying of instructed dance move", async () => {
-    game.override
-      .battleType("double")
-      .enemyMoveset([ Moves.INSTRUCT, Moves.SPLASH ])
-      .enemyLevel(1000);
-    await game.classicMode.startBattle([ Species.ORICORIO, Species.VOLCARONA ]);
+    game.override.battleStyle("double").enemyMoveset([Moves.INSTRUCT, Moves.SPLASH]).enemyLevel(1000);
+    await game.classicMode.startBattle([Species.ORICORIO, Species.VOLCARONA]);
 
-    const [ oricorio, volcarona ] = game.scene.getPlayerField();
+    const [oricorio, volcarona] = game.scene.getPlayerField();
     game.move.changeMoveset(oricorio, Moves.SPLASH);
     game.move.changeMoveset(volcarona, Moves.FIERY_DANCE);
 
@@ -233,7 +212,7 @@ describe("Moves - Instruct", () => {
     game.move.select(Moves.FIERY_DANCE, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY);
     await game.forceEnemyMove(Moves.INSTRUCT, BattlerIndex.PLAYER_2);
     await game.forceEnemyMove(Moves.SPLASH);
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2 ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2]);
     await game.phaseInterceptor.to("BerryPhase");
 
     // fiery dance triggered dancer successfully for a total of 4 hits
@@ -243,15 +222,19 @@ describe("Moves - Instruct", () => {
   });
 
   it("should not repeat move when switching out", async () => {
-    game.override
-      .enemyMoveset(Moves.INSTRUCT)
-      .enemySpecies(Species.UNOWN);
-    await game.classicMode.startBattle([ Species.AMOONGUSS, Species.TOXICROAK ]);
+    game.override.enemyMoveset(Moves.INSTRUCT).enemySpecies(Species.UNOWN);
+    await game.classicMode.startBattle([Species.AMOONGUSS, Species.TOXICROAK]);
 
     const amoonguss = game.scene.getPlayerPokemon()!;
     game.move.changeMoveset(amoonguss, Moves.SEED_BOMB);
 
-    amoonguss.battleSummonData.moveHistory = [{ move: Moves.SEED_BOMB, targets: [ BattlerIndex.ENEMY ], result: MoveResult.SUCCESS }];
+    amoonguss.summonData.moveHistory = [
+      {
+        move: Moves.SEED_BOMB,
+        targets: [BattlerIndex.ENEMY],
+        result: MoveResult.SUCCESS,
+      },
+    ];
 
     game.doSwitchPokemon(1);
     await game.phaseInterceptor.to("TurnEndPhase", false);
@@ -261,49 +244,50 @@ describe("Moves - Instruct", () => {
   });
 
   it("should fail if no move has yet been used by target", async () => {
-    game.override
-      .moveset(Moves.INSTRUCT)
-      .enemyMoveset(Moves.SPLASH);
-    await game.classicMode.startBattle([ Species.AMOONGUSS ]);
+    game.override.moveset(Moves.INSTRUCT).enemyMoveset(Moves.SPLASH);
+    await game.classicMode.startBattle([Species.AMOONGUSS]);
 
     game.move.select(Moves.INSTRUCT);
     await game.forceEnemyMove(Moves.SPLASH);
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
     await game.phaseInterceptor.to("TurnEndPhase", false);
 
     expect(game.scene.getPlayerPokemon()!.getLastXMoves()[0].result).toBe(MoveResult.FAIL);
   });
 
   it("should attempt to call enemy's disabled move, but move use itself should fail", async () => {
-    game.override
-      .moveset([ Moves.INSTRUCT, Moves.DISABLE ])
-      .battleType("double");
-    await game.classicMode.startBattle([ Species.AMOONGUSS, Species.DROWZEE ]);
+    game.override.moveset([Moves.INSTRUCT, Moves.DISABLE]).battleStyle("double");
+    await game.classicMode.startBattle([Species.AMOONGUSS, Species.DROWZEE]);
 
-    const [ enemy1, enemy2 ] = game.scene.getEnemyField();
+    const [enemy1, enemy2] = game.scene.getEnemyField();
     game.move.changeMoveset(enemy1, Moves.SONIC_BOOM);
     game.move.changeMoveset(enemy2, Moves.SPLASH);
 
     game.move.select(Moves.INSTRUCT, BattlerIndex.PLAYER, BattlerIndex.ENEMY);
     game.move.select(Moves.DISABLE, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY);
     await game.forceEnemyMove(Moves.SONIC_BOOM, BattlerIndex.PLAYER);
-    await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER_2, BattlerIndex.PLAYER, BattlerIndex.ENEMY_2 ]);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER_2, BattlerIndex.PLAYER, BattlerIndex.ENEMY_2]);
     await game.phaseInterceptor.to("TurnEndPhase", false);
 
     expect(game.scene.getPlayerField()[0].getLastXMoves()[0].result).toBe(MoveResult.SUCCESS);
     const enemyMove = game.scene.getEnemyField()[0]!.getLastXMoves()[0];
     expect(enemyMove.result).toBe(MoveResult.FAIL);
-    expect(game.scene.getEnemyField()[0].getMoveset().find(m => m?.moveId === Moves.SONIC_BOOM)?.ppUsed).toBe(1);
+    expect(
+      game.scene
+        .getEnemyField()[0]
+        .getMoveset()
+        .find(m => m?.moveId === Moves.SONIC_BOOM)?.ppUsed,
+    ).toBe(1);
   });
 
   it("should not repeat enemy's move through protect", async () => {
-    game.override.moveset([ Moves.INSTRUCT ]);
-    await game.classicMode.startBattle([ Species.AMOONGUSS ]);
+    game.override.moveset([Moves.INSTRUCT]);
+    await game.classicMode.startBattle([Species.AMOONGUSS]);
 
     const enemy = game.scene.getEnemyPokemon()!;
     game.move.changeMoveset(enemy, Moves.PROTECT);
     game.move.select(Moves.INSTRUCT);
-    await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
     await game.phaseInterceptor.to("TurnEndPhase", false);
 
     expect(enemy.getLastXMoves(-1)[0].move).toBe(Moves.PROTECT);
@@ -312,62 +296,68 @@ describe("Moves - Instruct", () => {
   });
 
   it("should not repeat enemy's charging move", async () => {
-    game.override
-      .moveset([ Moves.INSTRUCT ])
-      .enemyMoveset([ Moves.SONIC_BOOM, Moves.HYPER_BEAM ]);
-    await game.classicMode.startBattle([ Species.SHUCKLE ]);
+    game.override.moveset([Moves.INSTRUCT]).enemyMoveset([Moves.SONIC_BOOM, Moves.HYPER_BEAM]);
+    await game.classicMode.startBattle([Species.SHUCKLE]);
 
     const player = game.scene.getPlayerPokemon()!;
     const enemy = game.scene.getEnemyPokemon()!;
-    enemy.battleSummonData.moveHistory = [{ move: Moves.SONIC_BOOM, targets: [ BattlerIndex.PLAYER ], result: MoveResult.SUCCESS, virtual: false }];
+    enemy.summonData.moveHistory = [
+      {
+        move: Moves.SONIC_BOOM,
+        targets: [BattlerIndex.PLAYER],
+        result: MoveResult.SUCCESS,
+        virtual: false,
+      },
+    ];
 
     game.move.select(Moves.INSTRUCT);
     await game.forceEnemyMove(Moves.HYPER_BEAM);
-    await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
     await game.toNextTurn();
 
     // instruct fails at copying last move due to charging turn (rather than instructing sonic boom)
     expect(player.getLastXMoves()[0].result).toBe(MoveResult.FAIL);
 
     game.move.select(Moves.INSTRUCT);
-    await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
     await game.phaseInterceptor.to("TurnEndPhase", false);
 
     expect(player.getLastXMoves()[0].result).toBe(MoveResult.FAIL);
   });
 
   it("should not repeat move since forgotten by target", async () => {
-    game.override
-      .enemyLevel(5)
-      .xpMultiplier(0)
-      .enemySpecies(Species.WURMPLE)
-      .enemyMoveset(Moves.INSTRUCT);
-    await game.classicMode.startBattle([ Species.REGIELEKI ]);
+    game.override.enemyLevel(5).xpMultiplier(0).enemySpecies(Species.WURMPLE).enemyMoveset(Moves.INSTRUCT);
+    await game.classicMode.startBattle([Species.REGIELEKI]);
 
     const regieleki = game.scene.getPlayerPokemon()!;
     // fill out moveset with random moves
-    game.move.changeMoveset(regieleki, [ Moves.ELECTRO_DRIFT, Moves.SPLASH, Moves.ICE_BEAM, Moves.ANCIENT_POWER ]);
+    game.move.changeMoveset(regieleki, [Moves.ELECTRO_DRIFT, Moves.SPLASH, Moves.ICE_BEAM, Moves.ANCIENT_POWER]);
 
     game.move.select(Moves.ELECTRO_DRIFT);
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
     await game.phaseInterceptor.to("FaintPhase");
     await game.move.learnMove(Moves.ELECTROWEB);
     await game.toNextWave();
 
     game.move.select(Moves.SPLASH);
-    await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
     await game.phaseInterceptor.to("TurnEndPhase", false);
     expect(game.scene.getEnemyField()[0].getLastXMoves()[0].result).toBe(MoveResult.FAIL);
   });
 
   it("should disregard priority of instructed move on use", async () => {
-    game.override
-      .enemyMoveset([ Moves.SPLASH, Moves.WHIRLWIND ])
-      .moveset(Moves.INSTRUCT);
-    await game.classicMode.startBattle([ Species.LUCARIO, Species.BANETTE ]);
+    game.override.enemyMoveset([Moves.SPLASH, Moves.WHIRLWIND]).moveset(Moves.INSTRUCT);
+    await game.classicMode.startBattle([Species.LUCARIO, Species.BANETTE]);
 
     const enemyPokemon = game.scene.getEnemyPokemon()!;
-    enemyPokemon.battleSummonData.moveHistory = [{ move: Moves.WHIRLWIND, targets: [ BattlerIndex.PLAYER ], result: MoveResult.SUCCESS, virtual: false }];
+    enemyPokemon.summonData.moveHistory = [
+      {
+        move: Moves.WHIRLWIND,
+        targets: [BattlerIndex.PLAYER],
+        result: MoveResult.SUCCESS,
+        virtual: false,
+      },
+    ];
 
     game.move.select(Moves.INSTRUCT);
     await game.forceEnemyMove(Moves.SPLASH);
@@ -381,11 +371,11 @@ describe("Moves - Instruct", () => {
   });
 
   it("should respect moves' original priority for psychic terrain", async () => {
-    game.override.
-      battleType("double")
-      .moveset([ Moves.QUICK_ATTACK, Moves.SPLASH, Moves.INSTRUCT ])
-      .enemyMoveset([ Moves.SPLASH, Moves.PSYCHIC_TERRAIN ]);
-    await game.classicMode.startBattle([ Species.BANETTE, Species.KLEFKI ]);
+    game.override
+      .battleStyle("double")
+      .moveset([Moves.QUICK_ATTACK, Moves.SPLASH, Moves.INSTRUCT])
+      .enemyMoveset([Moves.SPLASH, Moves.PSYCHIC_TERRAIN]);
+    await game.classicMode.startBattle([Species.BANETTE, Species.KLEFKI]);
 
     game.move.select(Moves.QUICK_ATTACK, BattlerIndex.PLAYER, BattlerIndex.ENEMY); // succeeds due to terrain no
     game.move.select(Moves.SPLASH, BattlerIndex.PLAYER_2);
@@ -395,7 +385,7 @@ describe("Moves - Instruct", () => {
 
     game.move.select(Moves.SPLASH, BattlerIndex.PLAYER);
     game.move.select(Moves.INSTRUCT, BattlerIndex.PLAYER_2, BattlerIndex.PLAYER);
-    await game.setTurnOrder([ BattlerIndex.PLAYER_2, BattlerIndex.PLAYER, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2 ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER_2, BattlerIndex.PLAYER, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2]);
     await game.phaseInterceptor.to("TurnEndPhase", false);
 
     // quick attack failed when instructed
@@ -405,14 +395,12 @@ describe("Moves - Instruct", () => {
   });
 
   it("should still work w/ prankster in psychic terrain", async () => {
-    game.override.
-      battleType("double")
-      .enemyMoveset([ Moves.SPLASH, Moves.PSYCHIC_TERRAIN ]);
-    await game.classicMode.startBattle([ Species.BANETTE, Species.KLEFKI ]);
+    game.override.battleStyle("double").enemyMoveset([Moves.SPLASH, Moves.PSYCHIC_TERRAIN]);
+    await game.classicMode.startBattle([Species.BANETTE, Species.KLEFKI]);
 
-    const [ banette, klefki ] = game.scene.getPlayerField()!;
-    game.move.changeMoveset(banette, [ Moves.VINE_WHIP, Moves.SPLASH ]);
-    game.move.changeMoveset(klefki, [ Moves.INSTRUCT, Moves.SPLASH ]);
+    const [banette, klefki] = game.scene.getPlayerField()!;
+    game.move.changeMoveset(banette, [Moves.VINE_WHIP, Moves.SPLASH]);
+    game.move.changeMoveset(klefki, [Moves.INSTRUCT, Moves.SPLASH]);
 
     game.move.select(Moves.VINE_WHIP, BattlerIndex.PLAYER, BattlerIndex.ENEMY);
     game.move.select(Moves.SPLASH, BattlerIndex.PLAYER_2);
@@ -422,74 +410,78 @@ describe("Moves - Instruct", () => {
 
     game.move.select(Moves.SPLASH, BattlerIndex.PLAYER);
     game.move.select(Moves.INSTRUCT, BattlerIndex.PLAYER_2, BattlerIndex.PLAYER); // copies vine whip
-    await game.setTurnOrder([ BattlerIndex.PLAYER_2, BattlerIndex.PLAYER, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2 ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER_2, BattlerIndex.PLAYER, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2]);
     await game.phaseInterceptor.to("TurnEndPhase", false);
     expect(banette.getLastXMoves(-1)[1].move).toBe(Moves.VINE_WHIP);
     expect(banette.getLastXMoves(-1)[2].move).toBe(Moves.VINE_WHIP);
-    expect(banette.getMoveset().find(m => m?.moveId === Moves.VINE_WHIP )?.ppUsed).toBe(2);
+    expect(banette.getMoveset().find(m => m?.moveId === Moves.VINE_WHIP)?.ppUsed).toBe(2);
   });
 
   it("should cause spread moves to correctly hit targets in doubles after singles", async () => {
     game.override
-      .battleType("even-doubles")
-      .moveset([ Moves.BREAKING_SWIPE, Moves.INSTRUCT, Moves.SPLASH ])
+      .battleStyle("even-doubles")
+      .moveset([Moves.BREAKING_SWIPE, Moves.INSTRUCT, Moves.SPLASH])
       .enemyMoveset(Moves.SONIC_BOOM)
       .enemySpecies(Species.AXEW)
       .startingLevel(500);
-    await game.classicMode.startBattle([ Species.KORAIDON, Species.KLEFKI ]);
+    await game.classicMode.startBattle([Species.KORAIDON, Species.KLEFKI]);
 
     const koraidon = game.scene.getPlayerField()[0]!;
 
     game.move.select(Moves.BREAKING_SWIPE);
     await game.phaseInterceptor.to("TurnEndPhase", false);
     expect(koraidon.getInverseHp()).toBe(0);
-    expect(koraidon.getLastXMoves(-1)[0].targets).toEqual([ BattlerIndex.ENEMY ]);
+    expect(koraidon.getLastXMoves(-1)[0].targets).toEqual([BattlerIndex.ENEMY]);
     await game.toNextWave();
 
     game.move.select(Moves.SPLASH, BattlerIndex.PLAYER);
     game.move.select(Moves.INSTRUCT, BattlerIndex.PLAYER_2, BattlerIndex.PLAYER);
-    await game.setTurnOrder([ BattlerIndex.PLAYER_2, BattlerIndex.PLAYER, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2 ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER_2, BattlerIndex.PLAYER, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2]);
     await game.phaseInterceptor.to("TurnEndPhase", false);
     // did not take damage since enemies died beforehand;
     // last move used hit both enemies
     expect(koraidon.getInverseHp()).toBe(0);
-    expect(koraidon.getLastXMoves(-1)[1].targets?.sort()).toEqual([ BattlerIndex.ENEMY, BattlerIndex.ENEMY_2 ]);
+    expect(koraidon.getLastXMoves(-1)[1].targets?.sort()).toEqual([BattlerIndex.ENEMY, BattlerIndex.ENEMY_2]);
   });
 
   it("should cause AoE moves to correctly hit everyone in doubles after singles", async () => {
     game.override
-      .battleType("even-doubles")
-      .moveset([ Moves.BRUTAL_SWING, Moves.INSTRUCT, Moves.SPLASH ])
+      .battleStyle("even-doubles")
+      .moveset([Moves.BRUTAL_SWING, Moves.INSTRUCT, Moves.SPLASH])
       .enemySpecies(Species.AXEW)
       .enemyMoveset(Moves.SONIC_BOOM)
       .startingLevel(500);
-    await game.classicMode.startBattle([ Species.KORAIDON, Species.KLEFKI ]);
+    await game.classicMode.startBattle([Species.KORAIDON, Species.KLEFKI]);
 
     const koraidon = game.scene.getPlayerField()[0]!;
 
     game.move.select(Moves.BRUTAL_SWING);
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
     await game.phaseInterceptor.to("TurnEndPhase", false);
     expect(koraidon.getInverseHp()).toBe(0);
-    expect(koraidon.getLastXMoves(-1)[0].targets).toEqual([ BattlerIndex.ENEMY ]);
+    expect(koraidon.getLastXMoves(-1)[0].targets).toEqual([BattlerIndex.ENEMY]);
     await game.toNextWave();
 
     game.move.select(Moves.SPLASH, BattlerIndex.PLAYER);
     game.move.select(Moves.INSTRUCT, BattlerIndex.PLAYER_2, BattlerIndex.PLAYER);
-    await game.setTurnOrder([ BattlerIndex.PLAYER_2, BattlerIndex.PLAYER, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2 ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER_2, BattlerIndex.PLAYER, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2]);
     await game.phaseInterceptor.to("TurnEndPhase", false);
     // did not take damage since enemies died beforehand;
     // last move used hit everything around it
     expect(koraidon.getInverseHp()).toBe(0);
-    expect(koraidon.getLastXMoves(-1)[1].targets?.sort()).toEqual([ BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2 ]);
+    expect(koraidon.getLastXMoves(-1)[1].targets?.sort()).toEqual([
+      BattlerIndex.PLAYER_2,
+      BattlerIndex.ENEMY,
+      BattlerIndex.ENEMY_2,
+    ]);
   });
 
   it("should cause multi-hit moves to hit the appropriate number of times in singles", async () => {
     game.override
       .enemyAbility(Abilities.SKILL_LINK)
-      .moveset([ Moves.SPLASH, Moves.INSTRUCT ])
+      .moveset([Moves.SPLASH, Moves.INSTRUCT])
       .enemyMoveset(Moves.BULLET_SEED);
-    await game.classicMode.startBattle([ Species.BULBASAUR ]);
+    await game.classicMode.startBattle([Species.BULBASAUR]);
 
     const bulbasaur = game.scene.getPlayerPokemon()!;
 
@@ -497,14 +489,14 @@ describe("Moves - Instruct", () => {
     await game.toNextTurn();
 
     game.move.select(Moves.INSTRUCT);
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
     await game.phaseInterceptor.to("BerryPhase");
 
     expect(bulbasaur.turnData.attacksReceived.length).toBe(10);
 
     await game.toNextTurn();
     game.move.select(Moves.INSTRUCT);
-    await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
     await game.phaseInterceptor.to("BerryPhase");
 
     expect(bulbasaur.turnData.attacksReceived.length).toBe(10);
@@ -512,14 +504,14 @@ describe("Moves - Instruct", () => {
 
   it("should cause multi-hit moves to hit the appropriate number of times in doubles", async () => {
     game.override
-      .battleType("double")
+      .battleStyle("double")
       .enemyAbility(Abilities.SKILL_LINK)
-      .moveset([ Moves.SPLASH, Moves.INSTRUCT ])
-      .enemyMoveset([ Moves.BULLET_SEED, Moves.SPLASH ])
+      .moveset([Moves.SPLASH, Moves.INSTRUCT])
+      .enemyMoveset([Moves.BULLET_SEED, Moves.SPLASH])
       .enemyLevel(5);
-    await game.classicMode.startBattle([ Species.BULBASAUR, Species.IVYSAUR ]);
+    await game.classicMode.startBattle([Species.BULBASAUR, Species.IVYSAUR]);
 
-    const [ , ivysaur ] = game.scene.getPlayerField();
+    const [, ivysaur] = game.scene.getPlayerField();
 
     game.move.select(Moves.SPLASH, BattlerIndex.PLAYER);
     game.move.select(Moves.SPLASH, BattlerIndex.PLAYER_2);
@@ -531,7 +523,7 @@ describe("Moves - Instruct", () => {
     game.move.select(Moves.INSTRUCT, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY);
     await game.forceEnemyMove(Moves.BULLET_SEED, BattlerIndex.PLAYER_2);
     await game.forceEnemyMove(Moves.SPLASH);
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2 ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2]);
     await game.phaseInterceptor.to("BerryPhase");
 
     expect(ivysaur.turnData.attacksReceived.length).toBe(15);
@@ -541,7 +533,7 @@ describe("Moves - Instruct", () => {
     game.move.select(Moves.INSTRUCT, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY);
     await game.forceEnemyMove(Moves.BULLET_SEED, BattlerIndex.PLAYER_2);
     await game.forceEnemyMove(Moves.SPLASH);
-    await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.ENEMY_2, BattlerIndex.PLAYER, BattlerIndex.PLAYER_2 ]);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.ENEMY_2, BattlerIndex.PLAYER, BattlerIndex.PLAYER_2]);
     await game.phaseInterceptor.to("BerryPhase");
 
     expect(ivysaur.turnData.attacksReceived.length).toBe(15);
diff --git a/test/moves/jaw_lock.test.ts b/test/moves/jaw_lock.test.ts
new file mode 100644
index 00000000000..71896dc3b62
--- /dev/null
+++ b/test/moves/jaw_lock.test.ts
@@ -0,0 +1,153 @@
+import { BattlerIndex } from "#app/battle";
+import { Abilities } from "#app/enums/abilities";
+import { BattlerTagType } from "#app/enums/battler-tag-type";
+import { BerryPhase } from "#app/phases/berry-phase";
+import { FaintPhase } from "#app/phases/faint-phase";
+import { MoveEffectPhase } from "#app/phases/move-effect-phase";
+import { TurnEndPhase } from "#app/phases/turn-end-phase";
+import GameManager from "#test/testUtils/gameManager";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
+
+describe("Moves - Jaw Lock", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+
+    game.override
+      .battleStyle("single")
+      .enemySpecies(Species.SNORLAX)
+      .enemyAbility(Abilities.INSOMNIA)
+      .enemyMoveset(Moves.SPLASH)
+      .moveset([Moves.JAW_LOCK, Moves.SPLASH])
+      .startingLevel(100)
+      .enemyLevel(100)
+      .disableCrits();
+  });
+
+  it("should trap the move's user and target", async () => {
+    await game.startBattle([Species.BULBASAUR]);
+
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+    const enemyPokemon = game.scene.getEnemyPokemon()!;
+
+    game.move.select(Moves.JAW_LOCK);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
+
+    await game.phaseInterceptor.to(MoveEffectPhase, false);
+
+    expect(leadPokemon.getTag(BattlerTagType.TRAPPED)).toBeUndefined();
+    expect(enemyPokemon.getTag(BattlerTagType.TRAPPED)).toBeUndefined();
+
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    expect(leadPokemon.getTag(BattlerTagType.TRAPPED)).toBeDefined();
+    expect(enemyPokemon.getTag(BattlerTagType.TRAPPED)).toBeDefined();
+  });
+
+  it("should not trap either pokemon if the target faints", async () => {
+    game.override.enemyLevel(1);
+    await game.startBattle([Species.BULBASAUR]);
+
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+    const enemyPokemon = game.scene.getEnemyPokemon()!;
+
+    game.move.select(Moves.JAW_LOCK);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
+
+    await game.phaseInterceptor.to(MoveEffectPhase, false);
+
+    expect(leadPokemon.getTag(BattlerTagType.TRAPPED)).toBeUndefined();
+    expect(enemyPokemon.getTag(BattlerTagType.TRAPPED)).toBeUndefined();
+
+    await game.phaseInterceptor.to(MoveEffectPhase);
+
+    expect(leadPokemon.getTag(BattlerTagType.TRAPPED)).toBeUndefined();
+    expect(enemyPokemon.getTag(BattlerTagType.TRAPPED)).toBeUndefined();
+
+    await game.phaseInterceptor.to(FaintPhase);
+
+    expect(leadPokemon.getTag(BattlerTagType.TRAPPED)).toBeUndefined();
+    expect(enemyPokemon.getTag(BattlerTagType.TRAPPED)).toBeUndefined();
+  });
+
+  it("should only trap the user until the target faints", async () => {
+    await game.startBattle([Species.BULBASAUR]);
+
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+    const enemyPokemon = game.scene.getEnemyPokemon()!;
+
+    game.move.select(Moves.JAW_LOCK);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
+
+    await game.phaseInterceptor.to(MoveEffectPhase);
+
+    expect(leadPokemon.getTag(BattlerTagType.TRAPPED)).toBeDefined();
+    expect(enemyPokemon.getTag(BattlerTagType.TRAPPED)).toBeDefined();
+
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    await game.doKillOpponents();
+
+    expect(leadPokemon.getTag(BattlerTagType.TRAPPED)).toBeUndefined();
+  });
+
+  it("should not trap other targets after the first target is trapped", async () => {
+    game.override.battleStyle("double");
+
+    await game.startBattle([Species.CHARMANDER, Species.BULBASAUR]);
+
+    const playerPokemon = game.scene.getPlayerField();
+    const enemyPokemon = game.scene.getEnemyField();
+
+    game.move.select(Moves.JAW_LOCK, 0, BattlerIndex.ENEMY);
+    game.move.select(Moves.SPLASH, 1);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2]);
+
+    await game.phaseInterceptor.to(MoveEffectPhase);
+
+    expect(playerPokemon[0].getTag(BattlerTagType.TRAPPED)).toBeDefined();
+    expect(enemyPokemon[0].getTag(BattlerTagType.TRAPPED)).toBeDefined();
+
+    await game.toNextTurn();
+
+    game.move.select(Moves.JAW_LOCK, 0, BattlerIndex.ENEMY_2);
+    game.move.select(Moves.SPLASH, 1);
+
+    await game.phaseInterceptor.to(MoveEffectPhase);
+
+    expect(enemyPokemon[1].getTag(BattlerTagType.TRAPPED)).toBeUndefined();
+    expect(playerPokemon[0].getTag(BattlerTagType.TRAPPED)).toBeDefined();
+    expect(playerPokemon[0].getTag(BattlerTagType.TRAPPED)?.sourceId).toBe(enemyPokemon[0].id);
+  });
+
+  it("should not trap either pokemon if the target is protected", async () => {
+    game.override.enemyMoveset([Moves.PROTECT]);
+
+    await game.startBattle([Species.BULBASAUR]);
+
+    const playerPokemon = game.scene.getPlayerPokemon()!;
+    const enemyPokemon = game.scene.getEnemyPokemon()!;
+
+    game.move.select(Moves.JAW_LOCK);
+
+    await game.phaseInterceptor.to(BerryPhase, false);
+
+    expect(playerPokemon.getTag(BattlerTagType.TRAPPED)).toBeUndefined();
+    expect(enemyPokemon.getTag(BattlerTagType.TRAPPED)).toBeUndefined();
+  });
+});
diff --git a/src/test/moves/lash_out.test.ts b/test/moves/lash_out.test.ts
similarity index 81%
rename from src/test/moves/lash_out.test.ts
rename to test/moves/lash_out.test.ts
index 014c0ae8fe5..c80a8ce348a 100644
--- a/src/test/moves/lash_out.test.ts
+++ b/test/moves/lash_out.test.ts
@@ -1,13 +1,12 @@
 import { BattlerIndex } from "#app/battle";
-import { allMoves } from "#app/data/move";
+import { allMoves } from "#app/data/moves/move";
 import { Abilities } from "#app/enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
-
 describe("Moves - Lash Out", () => {
   let phaserGame: Phaser.Game;
   let game: GameManager;
@@ -25,17 +24,16 @@ describe("Moves - Lash Out", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     game.override
-      .battleType("single")
+      .battleStyle("single")
       .disableCrits()
       .enemySpecies(Species.MAGIKARP)
       .enemyAbility(Abilities.FUR_COAT)
-      .enemyMoveset([ Moves.GROWL ])
+      .enemyMoveset([Moves.GROWL])
       .startingLevel(10)
       .enemyLevel(10)
       .starterSpecies(Species.FEEBAS)
       .ability(Abilities.BALL_FETCH)
-      .moveset([ Moves.LASH_OUT ]);
-
+      .moveset([Moves.LASH_OUT]);
   });
 
   it("should deal double damage if the user's stat stages were lowered this turn", async () => {
@@ -43,7 +41,7 @@ describe("Moves - Lash Out", () => {
     await game.classicMode.startBattle();
 
     game.move.select(Moves.LASH_OUT);
-    await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
     await game.phaseInterceptor.to("BerryPhase");
 
     expect(allMoves[Moves.LASH_OUT].calculateBattlePower).toHaveReturnedWith(150);
diff --git a/test/moves/last-resort.test.ts b/test/moves/last-resort.test.ts
new file mode 100644
index 00000000000..a7b462f3ca4
--- /dev/null
+++ b/test/moves/last-resort.test.ts
@@ -0,0 +1,166 @@
+import { BattlerIndex } from "#app/battle";
+import { MoveResult } from "#app/field/pokemon";
+import { Abilities } from "#enums/abilities";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import GameManager from "#test/testUtils/gameManager";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
+
+describe("Moves - Last Resort", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  function expectLastResortFail() {
+    expect(game.scene.getPlayerPokemon()?.getLastXMoves()[0]).toEqual(
+      expect.objectContaining({
+        move: Moves.LAST_RESORT,
+        result: MoveResult.FAIL,
+      }),
+    );
+  }
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+    game.override
+      .ability(Abilities.BALL_FETCH)
+      .battleStyle("single")
+      .disableCrits()
+      .enemySpecies(Species.MAGIKARP)
+      .enemyAbility(Abilities.BALL_FETCH)
+      .enemyMoveset(Moves.SPLASH);
+  });
+
+  it("should fail unless all other moves (excluding itself) has been used at least once", async () => {
+    game.override.moveset([Moves.LAST_RESORT, Moves.SPLASH, Moves.GROWL, Moves.GROWTH]);
+    await game.classicMode.startBattle([Species.BLISSEY]);
+
+    const blissey = game.scene.getPlayerPokemon()!;
+    expect(blissey).toBeDefined();
+
+    // Last resort by itself
+    game.move.select(Moves.LAST_RESORT);
+    await game.phaseInterceptor.to("TurnEndPhase");
+    expectLastResortFail();
+
+    // Splash (1/3)
+    blissey.pushMoveHistory({ move: Moves.SPLASH, targets: [BattlerIndex.PLAYER] });
+    game.move.select(Moves.LAST_RESORT);
+    await game.phaseInterceptor.to("TurnEndPhase");
+    expectLastResortFail();
+
+    // Growl (2/3)
+    blissey.pushMoveHistory({ move: Moves.GROWL, targets: [BattlerIndex.ENEMY] });
+    game.move.select(Moves.LAST_RESORT);
+    await game.phaseInterceptor.to("TurnEndPhase");
+    expectLastResortFail(); // Were last resort itself counted, it would error here
+
+    // Growth (3/3)
+    blissey.pushMoveHistory({ move: Moves.GROWTH, targets: [BattlerIndex.PLAYER] });
+    game.move.select(Moves.LAST_RESORT);
+    await game.phaseInterceptor.to("TurnEndPhase");
+    expect(game.scene.getPlayerPokemon()?.getLastXMoves()[0]).toEqual(
+      expect.objectContaining({
+        move: Moves.LAST_RESORT,
+        result: MoveResult.SUCCESS,
+      }),
+    );
+  });
+
+  it("should disregard virtually invoked moves", async () => {
+    game.override
+      .moveset([Moves.LAST_RESORT, Moves.SWORDS_DANCE, Moves.ABSORB, Moves.MIRROR_MOVE])
+      .enemyMoveset([Moves.SWORDS_DANCE, Moves.ABSORB])
+      .ability(Abilities.DANCER)
+      .enemySpecies(Species.ABOMASNOW); // magikarp has 50% chance to be okho'd on absorb crit
+    await game.classicMode.startBattle([Species.BLISSEY]);
+
+    // use mirror move normally to trigger absorb virtually
+    game.move.select(Moves.MIRROR_MOVE);
+    await game.forceEnemyMove(Moves.ABSORB);
+    await game.toNextTurn();
+
+    game.move.select(Moves.LAST_RESORT);
+    await game.forceEnemyMove(Moves.SWORDS_DANCE); // goes first to proc dancer ahead of time
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
+    await game.phaseInterceptor.to("TurnEndPhase");
+    expectLastResortFail();
+  });
+
+  it("should fail if no other moves in moveset", async () => {
+    game.override.moveset(Moves.LAST_RESORT);
+    await game.classicMode.startBattle([Species.BLISSEY]);
+
+    game.move.select(Moves.LAST_RESORT);
+    await game.phaseInterceptor.to("TurnEndPhase");
+
+    expectLastResortFail();
+  });
+
+  it("should work if invoked virtually when all other moves have been used", async () => {
+    game.override.moveset([Moves.LAST_RESORT, Moves.SLEEP_TALK]).ability(Abilities.COMATOSE);
+    await game.classicMode.startBattle([Species.KOMALA]);
+
+    game.move.select(Moves.SLEEP_TALK);
+    await game.phaseInterceptor.to("TurnEndPhase");
+
+    expect(game.scene.getPlayerPokemon()?.getLastXMoves(-1)).toEqual([
+      expect.objectContaining({
+        move: Moves.LAST_RESORT,
+        result: MoveResult.SUCCESS,
+        virtual: true,
+      }),
+      expect.objectContaining({
+        move: Moves.SLEEP_TALK,
+        result: MoveResult.SUCCESS,
+      }),
+    ]);
+  });
+
+  it("should preserve usability status on reload", async () => {
+    game.override.moveset([Moves.LAST_RESORT, Moves.SPLASH]).ability(Abilities.COMATOSE);
+    await game.classicMode.startBattle([Species.BLISSEY]);
+
+    game.move.select(Moves.SPLASH);
+    await game.doKillOpponents();
+    await game.toNextWave();
+
+    const oldMoveHistory = game.scene.getPlayerPokemon()?.summonData.moveHistory;
+    await game.reload.reloadSession();
+
+    const newMoveHistory = game.scene.getPlayerPokemon()?.summonData.moveHistory;
+    expect(oldMoveHistory).toEqual(newMoveHistory);
+
+    // use last resort and it should kill the karp just fine
+    game.move.select(Moves.LAST_RESORT);
+    game.scene.getEnemyPokemon()!.hp = 1;
+    await game.phaseInterceptor.to("TurnEndPhase");
+
+    expect(game.isVictory()).toBe(true);
+  });
+
+  it("should fail if used while not in moveset", async () => {
+    game.override.moveset(Moves.MIRROR_MOVE).enemyMoveset([Moves.ABSORB, Moves.LAST_RESORT]);
+    await game.classicMode.startBattle([Species.BLISSEY]);
+
+    // ensure enemy last resort succeeds
+    game.move.select(Moves.MIRROR_MOVE);
+    await game.forceEnemyMove(Moves.ABSORB);
+    await game.phaseInterceptor.to("TurnEndPhase");
+    game.move.select(Moves.MIRROR_MOVE);
+    await game.forceEnemyMove(Moves.LAST_RESORT);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
+    await game.phaseInterceptor.to("TurnEndPhase");
+
+    expectLastResortFail();
+  });
+});
diff --git a/test/moves/last_respects.test.ts b/test/moves/last_respects.test.ts
new file mode 100644
index 00000000000..a69ecb2e989
--- /dev/null
+++ b/test/moves/last_respects.test.ts
@@ -0,0 +1,214 @@
+import { Moves } from "#enums/moves";
+import { BattlerIndex } from "#app/battle";
+import { Species } from "#enums/species";
+import { Abilities } from "#enums/abilities";
+import GameManager from "#test/testUtils/gameManager";
+import { allMoves } from "#app/data/moves/move";
+import type Move from "#app/data/moves/move";
+import { MoveEffectPhase } from "#app/phases/move-effect-phase";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
+
+describe("Moves - Last Respects", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  let move: Move;
+  let basePower: number;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+    move = allMoves[Moves.LAST_RESPECTS];
+    basePower = move.power;
+    game.override
+      .battleStyle("single")
+      .disableCrits()
+      .moveset([Moves.LAST_RESPECTS, Moves.EXPLOSION, Moves.LUNAR_DANCE])
+      .ability(Abilities.BALL_FETCH)
+      .enemyAbility(Abilities.BALL_FETCH)
+      .enemySpecies(Species.MAGIKARP)
+      .enemyMoveset(Moves.SPLASH)
+      .startingLevel(1)
+      .enemyLevel(100);
+
+    vi.spyOn(move, "calculateBattlePower");
+  });
+
+  it("should have 150 power if 2 allies faint before using move", async () => {
+    await game.classicMode.startBattle([Species.BULBASAUR, Species.CHARMANDER, Species.SQUIRTLE]);
+
+    /**
+     * Bulbasur faints once
+     */
+    game.move.select(Moves.EXPLOSION);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
+    game.doSelectPartyPokemon(1);
+    await game.toNextTurn();
+
+    /**
+     * Charmander faints once
+     */
+    game.move.select(Moves.EXPLOSION);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
+    game.doSelectPartyPokemon(2);
+    await game.toNextTurn();
+
+    game.move.select(Moves.LAST_RESPECTS);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
+    await game.phaseInterceptor.to(MoveEffectPhase);
+
+    expect(move.calculateBattlePower).toHaveReturnedWith(basePower + 2 * 50);
+  });
+
+  it("should have 200 power if an ally fainted twice and another one once", async () => {
+    await game.classicMode.startBattle([Species.BULBASAUR, Species.CHARMANDER, Species.SQUIRTLE]);
+
+    /**
+     * Bulbasur faints once
+     */
+    game.move.select(Moves.EXPLOSION);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
+    game.doSelectPartyPokemon(1);
+    await game.toNextTurn();
+
+    /**
+     * Charmander faints once
+     */
+    game.doRevivePokemon(1);
+    game.move.select(Moves.EXPLOSION);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
+    game.doSelectPartyPokemon(1);
+    await game.toNextTurn();
+
+    /**
+     * Bulbasur faints twice
+     */
+    game.move.select(Moves.EXPLOSION);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
+    game.doSelectPartyPokemon(2);
+    await game.toNextTurn();
+
+    game.move.select(Moves.LAST_RESPECTS);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
+    await game.phaseInterceptor.to(MoveEffectPhase);
+
+    expect(move.calculateBattlePower).toHaveReturnedWith(basePower + 3 * 50);
+  });
+
+  it("should maintain its power for the player during the next battle if it is within the same arena encounter", async () => {
+    game.override
+      .enemySpecies(Species.MAGIKARP)
+      .startingWave(1)
+      .enemyLevel(1)
+      .startingLevel(100)
+      .enemyMoveset(Moves.SPLASH);
+
+    await game.classicMode.startBattle([Species.BULBASAUR, Species.CHARMANDER, Species.SQUIRTLE]);
+
+    /**
+     * The first Pokemon faints and another Pokemon in the party is selected.
+     */
+    game.move.select(Moves.LUNAR_DANCE);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
+    game.doSelectPartyPokemon(1);
+    await game.toNextTurn();
+
+    /**
+     * Enemy Pokemon faints and new wave is entered.
+     */
+    game.move.select(Moves.LAST_RESPECTS);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
+    await game.toNextWave();
+    expect(game.scene.arena.playerFaints).toBe(1);
+
+    game.move.select(Moves.LAST_RESPECTS);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
+    await game.phaseInterceptor.to("MoveEndPhase");
+    expect(move.calculateBattlePower).toHaveLastReturnedWith(basePower + 1 * 50);
+  });
+
+  it("should reset enemyFaints count on progressing to the next wave.", async () => {
+    game.override
+      .enemySpecies(Species.MAGIKARP)
+      .startingWave(1)
+      .enemyLevel(1)
+      .startingLevel(100)
+      .enemyMoveset(Moves.LAST_RESPECTS)
+      .moveset([Moves.LUNAR_DANCE, Moves.LAST_RESPECTS, Moves.SPLASH]);
+
+    await game.classicMode.startBattle([Species.BULBASAUR, Species.CHARMANDER, Species.SQUIRTLE]);
+
+    /**
+     * The first Pokemon faints and another Pokemon in the party is selected.
+     */
+    game.move.select(Moves.LUNAR_DANCE);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
+    game.doSelectPartyPokemon(1);
+    await game.toNextTurn();
+
+    /**
+     * Enemy Pokemon faints and new wave is entered.
+     */
+    game.move.select(Moves.LAST_RESPECTS);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
+    await game.toNextWave();
+    expect(game.scene.currentBattle.enemyFaints).toBe(0);
+
+    game.move.select(Moves.LAST_RESPECTS);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
+    await game.phaseInterceptor.to("MoveEndPhase");
+    expect(move.calculateBattlePower).toHaveLastReturnedWith(basePower);
+  });
+
+  it("should reset playerFaints count if we enter new trainer battle", async () => {
+    game.override.enemySpecies(Species.MAGIKARP).startingWave(4).enemyLevel(1).startingLevel(100);
+
+    await game.classicMode.startBattle([Species.BULBASAUR, Species.CHARMANDER, Species.SQUIRTLE]);
+
+    game.move.select(Moves.LUNAR_DANCE);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
+    game.doSelectPartyPokemon(1);
+    await game.toNextTurn();
+
+    game.move.select(Moves.LAST_RESPECTS);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
+    await game.toNextWave();
+
+    game.move.select(Moves.LAST_RESPECTS);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
+    await game.phaseInterceptor.to("BerryPhase", false);
+
+    expect(move.calculateBattlePower).toHaveLastReturnedWith(basePower);
+  });
+
+  it("should reset playerFaints count if we enter new biome", async () => {
+    game.override.enemySpecies(Species.MAGIKARP).startingWave(10).enemyLevel(1).startingLevel(100);
+
+    await game.classicMode.startBattle([Species.BULBASAUR, Species.CHARMANDER, Species.SQUIRTLE]);
+
+    game.move.select(Moves.LUNAR_DANCE);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
+    game.doSelectPartyPokemon(1);
+    await game.toNextTurn();
+
+    game.move.select(Moves.LAST_RESPECTS);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
+    await game.toNextWave();
+
+    game.move.select(Moves.LAST_RESPECTS);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
+    await game.phaseInterceptor.to("BerryPhase", false);
+
+    expect(move.calculateBattlePower).toHaveLastReturnedWith(basePower);
+  });
+});
diff --git a/src/test/moves/light_screen.test.ts b/test/moves/light_screen.test.ts
similarity index 56%
rename from src/test/moves/light_screen.test.ts
rename to test/moves/light_screen.test.ts
index 424f43e155c..cea26f29542 100644
--- a/src/test/moves/light_screen.test.ts
+++ b/test/moves/light_screen.test.ts
@@ -1,17 +1,17 @@
 import type BattleScene from "#app/battle-scene";
 import { ArenaTagSide } from "#app/data/arena-tag";
-import type Move from "#app/data/move";
-import { allMoves } from "#app/data/move";
+import type Move from "#app/data/moves/move";
+import { allMoves, CritOnlyAttr } from "#app/data/moves/move";
 import { Abilities } from "#app/enums/abilities";
 import { ArenaTagType } from "#app/enums/arena-tag-type";
 import type Pokemon from "#app/field/pokemon";
 import { TurnEndPhase } from "#app/phases/turn-end-phase";
-import { NumberHolder } from "#app/utils";
+import { NumberHolder } from "#app/utils/common";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
-import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
+import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
 let globalScene: BattleScene;
 
@@ -34,54 +34,83 @@ describe("Moves - Light Screen", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     globalScene = game.scene;
-    game.override.battleType("single");
+    game.override.battleStyle("single");
     game.override.ability(Abilities.NONE);
-    game.override.moveset([ Moves.ABSORB, Moves.DAZZLING_GLEAM, Moves.TACKLE ]);
+    game.override.moveset([Moves.ABSORB, Moves.DAZZLING_GLEAM, Moves.TACKLE]);
     game.override.enemyLevel(100);
     game.override.enemySpecies(Species.MAGIKARP);
-    game.override.enemyMoveset([ Moves.LIGHT_SCREEN, Moves.LIGHT_SCREEN, Moves.LIGHT_SCREEN, Moves.LIGHT_SCREEN ]);
+    game.override.enemyMoveset([Moves.LIGHT_SCREEN, Moves.LIGHT_SCREEN, Moves.LIGHT_SCREEN, Moves.LIGHT_SCREEN]);
     game.override.disableCrits();
   });
 
   it("reduces damage of special attacks by half in a single battle", async () => {
     const moveToUse = Moves.ABSORB;
-    await game.startBattle([ Species.SHUCKLE ]);
+    await game.classicMode.startBattle([Species.SHUCKLE]);
 
     game.move.select(moveToUse);
 
     await game.phaseInterceptor.to(TurnEndPhase);
 
-    const mockedDmg = getMockedMoveDamage(game.scene.getEnemyPokemon()!, game.scene.getPlayerPokemon()!, allMoves[moveToUse]);
+    const mockedDmg = getMockedMoveDamage(
+      game.scene.getEnemyPokemon()!,
+      game.scene.getPlayerPokemon()!,
+      allMoves[moveToUse],
+    );
 
     expect(mockedDmg).toBe(allMoves[moveToUse].power * singleBattleMultiplier);
   });
 
   it("reduces damage of special attacks by a third in a double battle", async () => {
-    game.override.battleType("double");
+    game.override.battleStyle("double");
 
     const moveToUse = Moves.DAZZLING_GLEAM;
-    await game.startBattle([ Species.SHUCKLE, Species.SHUCKLE ]);
+    await game.classicMode.startBattle([Species.SHUCKLE, Species.SHUCKLE]);
 
     game.move.select(moveToUse);
     game.move.select(moveToUse, 1);
 
     await game.phaseInterceptor.to(TurnEndPhase);
-    const mockedDmg = getMockedMoveDamage(game.scene.getEnemyPokemon()!, game.scene.getPlayerPokemon()!, allMoves[moveToUse]);
+    const mockedDmg = getMockedMoveDamage(
+      game.scene.getEnemyPokemon()!,
+      game.scene.getPlayerPokemon()!,
+      allMoves[moveToUse],
+    );
 
     expect(mockedDmg).toBe(allMoves[moveToUse].power * doubleBattleMultiplier);
   });
 
   it("does not affect physical attacks", async () => {
     const moveToUse = Moves.TACKLE;
-    await game.startBattle([ Species.SHUCKLE ]);
+    await game.classicMode.startBattle([Species.SHUCKLE]);
 
     game.move.select(moveToUse);
 
     await game.phaseInterceptor.to(TurnEndPhase);
-    const mockedDmg = getMockedMoveDamage(game.scene.getEnemyPokemon()!, game.scene.getPlayerPokemon()!, allMoves[moveToUse]);
+    const mockedDmg = getMockedMoveDamage(
+      game.scene.getEnemyPokemon()!,
+      game.scene.getPlayerPokemon()!,
+      allMoves[moveToUse],
+    );
 
     expect(mockedDmg).toBe(allMoves[moveToUse].power);
   });
+
+  it("does not affect critical hits", async () => {
+    game.override.moveset([Moves.FROST_BREATH]);
+    const moveToUse = Moves.FROST_BREATH;
+    vi.spyOn(allMoves[Moves.FROST_BREATH], "accuracy", "get").mockReturnValue(100);
+    await game.classicMode.startBattle([Species.SHUCKLE]);
+
+    game.move.select(moveToUse);
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    const mockedDmg = getMockedMoveDamage(
+      game.scene.getEnemyPokemon()!,
+      game.scene.getPlayerPokemon()!,
+      allMoves[moveToUse],
+    );
+    expect(mockedDmg).toBe(allMoves[moveToUse].power);
+  });
 });
 
 /**
@@ -98,7 +127,16 @@ const getMockedMoveDamage = (defender: Pokemon, attacker: Pokemon, move: Move) =
   const side = defender.isPlayer() ? ArenaTagSide.PLAYER : ArenaTagSide.ENEMY;
 
   if (globalScene.arena.getTagOnSide(ArenaTagType.LIGHT_SCREEN, side)) {
-    globalScene.arena.applyTagsForSide(ArenaTagType.LIGHT_SCREEN, side, false, attacker, move.category, multiplierHolder);
+    if (move.getAttrs(CritOnlyAttr).length === 0) {
+      globalScene.arena.applyTagsForSide(
+        ArenaTagType.LIGHT_SCREEN,
+        side,
+        false,
+        attacker,
+        move.category,
+        multiplierHolder,
+      );
+    }
   }
 
   return move.power * multiplierHolder.value;
diff --git a/test/moves/lucky_chant.test.ts b/test/moves/lucky_chant.test.ts
new file mode 100644
index 00000000000..e2a28a7bbe3
--- /dev/null
+++ b/test/moves/lucky_chant.test.ts
@@ -0,0 +1,102 @@
+import { Abilities } from "#app/enums/abilities";
+import { BattlerTagType } from "#app/enums/battler-tag-type";
+import { Moves } from "#app/enums/moves";
+import { Species } from "#app/enums/species";
+import { BerryPhase } from "#app/phases/berry-phase";
+import { TurnEndPhase } from "#app/phases/turn-end-phase";
+import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
+import GameManager from "#test/testUtils/gameManager";
+
+describe("Moves - Lucky Chant", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+
+    game.override
+      .battleStyle("single")
+      .moveset([Moves.LUCKY_CHANT, Moves.SPLASH, Moves.FOLLOW_ME])
+      .enemySpecies(Species.SNORLAX)
+      .enemyAbility(Abilities.INSOMNIA)
+      .enemyMoveset([Moves.FLOWER_TRICK])
+      .startingLevel(100)
+      .enemyLevel(100);
+  });
+
+  it("should prevent critical hits from moves", async () => {
+    await game.startBattle([Species.CHARIZARD]);
+
+    const playerPokemon = game.scene.getPlayerPokemon()!;
+
+    game.move.select(Moves.SPLASH);
+
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    const firstTurnDamage = playerPokemon.getMaxHp() - playerPokemon.hp;
+
+    game.move.select(Moves.LUCKY_CHANT);
+
+    await game.phaseInterceptor.to(BerryPhase, false);
+
+    const secondTurnDamage = playerPokemon.getMaxHp() - playerPokemon.hp - firstTurnDamage;
+    expect(secondTurnDamage).toBeLessThan(firstTurnDamage);
+  });
+
+  it("should prevent critical hits against the user's ally", async () => {
+    game.override.battleStyle("double");
+
+    await game.startBattle([Species.CHARIZARD, Species.BLASTOISE]);
+
+    const playerPokemon = game.scene.getPlayerField();
+
+    game.move.select(Moves.FOLLOW_ME);
+    game.move.select(Moves.SPLASH, 1);
+
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    const firstTurnDamage = playerPokemon[0].getMaxHp() - playerPokemon[0].hp;
+
+    game.move.select(Moves.FOLLOW_ME);
+    game.move.select(Moves.LUCKY_CHANT, 1);
+
+    await game.phaseInterceptor.to(BerryPhase, false);
+
+    const secondTurnDamage = playerPokemon[0].getMaxHp() - playerPokemon[0].hp - firstTurnDamage;
+    expect(secondTurnDamage).toBeLessThan(firstTurnDamage);
+  });
+
+  it("should prevent critical hits from field effects", async () => {
+    game.override.enemyMoveset([Moves.TACKLE]);
+
+    await game.startBattle([Species.CHARIZARD]);
+
+    const playerPokemon = game.scene.getPlayerPokemon()!;
+    const enemyPokemon = game.scene.getEnemyPokemon()!;
+
+    enemyPokemon.addTag(BattlerTagType.ALWAYS_CRIT, 2, Moves.NONE, 0);
+
+    game.move.select(Moves.SPLASH);
+
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    const firstTurnDamage = playerPokemon.getMaxHp() - playerPokemon.hp;
+
+    game.move.select(Moves.LUCKY_CHANT);
+
+    await game.phaseInterceptor.to(BerryPhase, false);
+
+    const secondTurnDamage = playerPokemon.getMaxHp() - playerPokemon.hp - firstTurnDamage;
+    expect(secondTurnDamage).toBeLessThan(firstTurnDamage);
+  });
+});
diff --git a/src/test/moves/lunar_blessing.test.ts b/test/moves/lunar_blessing.test.ts
similarity index 84%
rename from src/test/moves/lunar_blessing.test.ts
rename to test/moves/lunar_blessing.test.ts
index 52c41a30e11..ee35107fccd 100644
--- a/src/test/moves/lunar_blessing.test.ts
+++ b/test/moves/lunar_blessing.test.ts
@@ -3,7 +3,7 @@ import { CommandPhase } from "#app/phases/command-phase";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
@@ -22,19 +22,19 @@ describe("Moves - Lunar Blessing", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
 
-    game.override.battleType("double");
+    game.override.battleStyle("double");
 
     game.override.enemySpecies(Species.SHUCKLE);
     game.override.enemyMoveset(Moves.SPLASH);
     game.override.enemyAbility(Abilities.BALL_FETCH);
 
-    game.override.moveset([ Moves.LUNAR_BLESSING, Moves.SPLASH ]);
+    game.override.moveset([Moves.LUNAR_BLESSING, Moves.SPLASH]);
     game.override.ability(Abilities.BALL_FETCH);
   });
 
   it("should restore 25% HP of the user and its ally", async () => {
-    await game.startBattle([ Species.RATTATA, Species.RATTATA ]);
-    const [ leftPlayer, rightPlayer ] = game.scene.getPlayerField();
+    await game.startBattle([Species.RATTATA, Species.RATTATA]);
+    const [leftPlayer, rightPlayer] = game.scene.getPlayerField();
 
     vi.spyOn(leftPlayer, "getMaxHp").mockReturnValue(100);
     vi.spyOn(rightPlayer, "getMaxHp").mockReturnValue(100);
@@ -47,7 +47,6 @@ describe("Moves - Lunar Blessing", () => {
     vi.spyOn(leftPlayer, "heal");
     vi.spyOn(rightPlayer, "heal");
 
-
     game.move.select(Moves.LUNAR_BLESSING, 0);
     await game.phaseInterceptor.to(CommandPhase);
     game.move.select(Moves.SPLASH, 1);
@@ -62,8 +61,8 @@ describe("Moves - Lunar Blessing", () => {
 
   it("should cure status effect of the user and its ally", async () => {
     game.override.statusEffect(StatusEffect.BURN);
-    await game.startBattle([ Species.RATTATA, Species.RATTATA ]);
-    const [ leftPlayer, rightPlayer ] = game.scene.getPlayerField();
+    await game.startBattle([Species.RATTATA, Species.RATTATA]);
+    const [leftPlayer, rightPlayer] = game.scene.getPlayerField();
 
     vi.spyOn(leftPlayer, "resetStatus");
     vi.spyOn(rightPlayer, "resetStatus");
diff --git a/src/test/moves/lunar_dance.test.ts b/test/moves/lunar_dance.test.ts
similarity index 83%
rename from src/test/moves/lunar_dance.test.ts
rename to test/moves/lunar_dance.test.ts
index 603247298ac..30abe765291 100644
--- a/src/test/moves/lunar_dance.test.ts
+++ b/test/moves/lunar_dance.test.ts
@@ -3,7 +3,7 @@ import { CommandPhase } from "#app/phases/command-phase";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, it, expect } from "vitest";
 
@@ -25,18 +25,18 @@ describe("Moves - Lunar Dance", () => {
     game = new GameManager(phaserGame);
     game.override
       .statusEffect(StatusEffect.BURN)
-      .battleType("double")
+      .battleStyle("double")
       .enemyAbility(Abilities.BALL_FETCH)
       .enemyMoveset(Moves.SPLASH);
   });
 
   it("should full restore HP, PP and status of switched in pokemon, then fail second use because no remaining backup pokemon in party", async () => {
-    await game.classicMode.startBattle([ Species.BULBASAUR, Species.ODDISH, Species.RATTATA ]);
+    await game.classicMode.startBattle([Species.BULBASAUR, Species.ODDISH, Species.RATTATA]);
 
-    const [ bulbasaur, oddish, rattata ] = game.scene.getPlayerParty();
-    game.move.changeMoveset(bulbasaur, [ Moves.LUNAR_DANCE, Moves.SPLASH ]);
-    game.move.changeMoveset(oddish, [ Moves.LUNAR_DANCE, Moves.SPLASH ]);
-    game.move.changeMoveset(rattata, [ Moves.LUNAR_DANCE, Moves.SPLASH ]);
+    const [bulbasaur, oddish, rattata] = game.scene.getPlayerParty();
+    game.move.changeMoveset(bulbasaur, [Moves.LUNAR_DANCE, Moves.SPLASH]);
+    game.move.changeMoveset(oddish, [Moves.LUNAR_DANCE, Moves.SPLASH]);
+    game.move.changeMoveset(rattata, [Moves.LUNAR_DANCE, Moves.SPLASH]);
 
     game.move.select(Moves.SPLASH, 0);
     game.move.select(Moves.SPLASH, 1);
diff --git a/test/moves/magic_coat.test.ts b/test/moves/magic_coat.test.ts
new file mode 100644
index 00000000000..23deef97318
--- /dev/null
+++ b/test/moves/magic_coat.test.ts
@@ -0,0 +1,289 @@
+import { BattlerIndex } from "#app/battle";
+import { ArenaTagSide } from "#app/data/arena-tag";
+import { allMoves } from "#app/data/moves/move";
+import { ArenaTagType } from "#app/enums/arena-tag-type";
+import { BattlerTagType } from "#app/enums/battler-tag-type";
+import { Stat } from "#app/enums/stat";
+import { StatusEffect } from "#app/enums/status-effect";
+import { MoveResult } from "#app/field/pokemon";
+import { Abilities } from "#enums/abilities";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import GameManager from "#test/testUtils/gameManager";
+import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
+
+describe("Moves - Magic Coat", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+    game.override
+      .ability(Abilities.BALL_FETCH)
+      .battleStyle("single")
+      .disableCrits()
+      .enemySpecies(Species.MAGIKARP)
+      .enemyAbility(Abilities.BALL_FETCH)
+      .enemyMoveset(Moves.MAGIC_COAT);
+  });
+
+  it("should fail if the user goes last in the turn", async () => {
+    game.override.moveset([Moves.PROTECT]);
+    await game.classicMode.startBattle([Species.MAGIKARP]);
+
+    game.move.select(Moves.PROTECT);
+    await game.phaseInterceptor.to("BerryPhase");
+    expect(game.scene.getEnemyPokemon()!.getLastXMoves()[0].result).toBe(MoveResult.FAIL);
+  });
+
+  it("should fail if called again in the same turn due to moves like instruct", async () => {
+    game.override.moveset([Moves.INSTRUCT]);
+    await game.classicMode.startBattle([Species.MAGIKARP]);
+
+    game.move.select(Moves.INSTRUCT);
+    await game.phaseInterceptor.to("BerryPhase");
+    expect(game.scene.getEnemyPokemon()!.getLastXMoves()[0].result).toBe(MoveResult.FAIL);
+  });
+
+  it("should not reflect moves used on the next turn", async () => {
+    game.override.moveset([Moves.GROWL, Moves.SPLASH]);
+    game.override.enemyMoveset([Moves.MAGIC_COAT, Moves.SPLASH]);
+    await game.classicMode.startBattle([Species.MAGIKARP]);
+
+    // turn 1
+    game.move.select(Moves.SPLASH);
+    await game.forceEnemyMove(Moves.MAGIC_COAT);
+    await game.toNextTurn();
+
+    // turn 2
+    game.move.select(Moves.GROWL);
+    await game.forceEnemyMove(Moves.SPLASH);
+    await game.phaseInterceptor.to("BerryPhase");
+    expect(game.scene.getEnemyPokemon()!.getStatStage(Stat.ATK)).toBe(-1);
+  });
+
+  it("should reflect basic status moves", async () => {
+    game.override.moveset([Moves.GROWL]);
+    await game.classicMode.startBattle([Species.MAGIKARP]);
+
+    game.move.select(Moves.GROWL);
+    await game.phaseInterceptor.to("BerryPhase");
+    expect(game.scene.getPlayerPokemon()!.getStatStage(Stat.ATK)).toBe(-1);
+  });
+
+  it("should individually bounce back multi-target moves when used by both targets in doubles", async () => {
+    game.override.battleStyle("double");
+    game.override.moveset([Moves.GROWL, Moves.SPLASH]);
+    await game.classicMode.startBattle([Species.MAGIKARP, Species.MAGIKARP]);
+
+    game.move.select(Moves.GROWL, 0);
+    game.move.select(Moves.SPLASH, 1);
+    await game.phaseInterceptor.to("BerryPhase");
+
+    const user = game.scene.getPlayerField()[0];
+    expect(user.getStatStage(Stat.ATK)).toBe(-2);
+  });
+
+  it("should bounce back a spread status move against both pokemon", async () => {
+    game.override.battleStyle("double");
+    game.override.moveset([Moves.GROWL, Moves.SPLASH]);
+    game.override.enemyMoveset([Moves.SPLASH, Moves.MAGIC_COAT]);
+    await game.classicMode.startBattle([Species.MAGIKARP, Species.MAGIKARP]);
+
+    game.move.select(Moves.GROWL, 0);
+    game.move.select(Moves.SPLASH, 1);
+    await game.forceEnemyMove(Moves.SPLASH);
+    await game.forceEnemyMove(Moves.MAGIC_COAT);
+
+    await game.phaseInterceptor.to("BerryPhase");
+    expect(game.scene.getPlayerField().every(p => p.getStatStage(Stat.ATK) === -1)).toBeTruthy();
+  });
+
+  it("should still bounce back a move that would otherwise fail", async () => {
+    await game.classicMode.startBattle([Species.MAGIKARP]);
+    game.scene.getEnemyPokemon()?.setStatStage(Stat.ATK, -6);
+    game.override.moveset([Moves.GROWL]);
+
+    game.move.select(Moves.GROWL);
+    await game.phaseInterceptor.to("BerryPhase");
+
+    expect(game.scene.getPlayerPokemon()!.getStatStage(Stat.ATK)).toBe(-1);
+  });
+
+  it("should not bounce back a move that was just bounced", async () => {
+    game.override.battleStyle("double");
+    game.override.ability(Abilities.MAGIC_BOUNCE);
+    game.override.moveset([Moves.GROWL, Moves.MAGIC_COAT]);
+    game.override.enemyMoveset([Moves.SPLASH, Moves.MAGIC_COAT]);
+    await game.classicMode.startBattle([Species.MAGIKARP, Species.MAGIKARP]);
+
+    game.move.select(Moves.MAGIC_COAT, 0);
+    game.move.select(Moves.GROWL, 1);
+    await game.forceEnemyMove(Moves.MAGIC_COAT);
+    await game.forceEnemyMove(Moves.SPLASH);
+    await game.phaseInterceptor.to("BerryPhase");
+
+    expect(game.scene.getEnemyField()[0].getStatStage(Stat.ATK)).toBe(0);
+  });
+
+  // todo while Mirror Armor is not implemented
+  it.todo("should receive the stat change after reflecting a move back to a mirror armor user", async () => {
+    await game.classicMode.startBattle([Species.MAGIKARP]);
+
+    game.move.select(Moves.GROWL);
+    await game.phaseInterceptor.to("BerryPhase");
+
+    expect(game.scene.getEnemyPokemon()!.getStatStage(Stat.ATK)).toBe(-1);
+  });
+
+  it("should still bounce back a move from a mold breaker user", async () => {
+    game.override.ability(Abilities.MOLD_BREAKER);
+    game.override.moveset([Moves.GROWL]);
+    await game.classicMode.startBattle([Species.MAGIKARP]);
+
+    game.move.select(Moves.GROWL);
+    await game.phaseInterceptor.to("BerryPhase");
+
+    expect(game.scene.getEnemyPokemon()!.getStatStage(Stat.ATK)).toBe(0);
+    expect(game.scene.getPlayerPokemon()!.getStatStage(Stat.ATK)).toBe(-1);
+  });
+
+  it("should only bounce spikes back once when both targets use magic coat in doubles", async () => {
+    game.override.battleStyle("double");
+    await game.classicMode.startBattle([Species.MAGIKARP]);
+    game.override.moveset([Moves.SPIKES]);
+
+    game.move.select(Moves.SPIKES);
+    await game.phaseInterceptor.to("BerryPhase");
+
+    expect(game.scene.arena.getTagOnSide(ArenaTagType.SPIKES, ArenaTagSide.PLAYER)!["layers"]).toBe(1);
+    expect(game.scene.arena.getTagOnSide(ArenaTagType.SPIKES, ArenaTagSide.ENEMY)).toBeUndefined();
+  });
+
+  it("should not bounce back curse", async () => {
+    game.override.starterSpecies(Species.GASTLY);
+    await game.classicMode.startBattle([Species.GASTLY]);
+    game.override.moveset([Moves.CURSE]);
+
+    game.move.select(Moves.CURSE);
+    await game.phaseInterceptor.to("BerryPhase");
+
+    expect(game.scene.getEnemyPokemon()!.getTag(BattlerTagType.CURSED)).toBeDefined();
+  });
+
+  // TODO: encore is failing if the last move was virtual.
+  it.todo("should not cause the bounced move to count for encore", async () => {
+    game.override.moveset([Moves.GROWL, Moves.ENCORE]);
+    game.override.enemyMoveset([Moves.MAGIC_COAT, Moves.TACKLE]);
+    game.override.enemyAbility(Abilities.MAGIC_BOUNCE);
+
+    await game.classicMode.startBattle([Species.MAGIKARP]);
+    const enemyPokemon = game.scene.getEnemyPokemon()!;
+
+    // turn 1
+    game.move.select(Moves.GROWL);
+    await game.forceEnemyMove(Moves.MAGIC_COAT);
+    await game.toNextTurn();
+
+    // turn 2
+    game.move.select(Moves.ENCORE);
+    await game.forceEnemyMove(Moves.TACKLE);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
+    await game.phaseInterceptor.to("BerryPhase");
+    expect(enemyPokemon.getTag(BattlerTagType.ENCORE)!["moveId"]).toBe(Moves.TACKLE);
+    expect(enemyPokemon.getLastXMoves()[0].move).toBe(Moves.TACKLE);
+  });
+
+  // TODO: stomping tantrum should consider moves that were bounced.
+  it.todo("should cause stomping tantrum to double in power when the last move was bounced", async () => {
+    game.override.battleStyle("single");
+    await game.classicMode.startBattle([Species.MAGIKARP]);
+    game.override.moveset([Moves.STOMPING_TANTRUM, Moves.CHARM]);
+
+    const stomping_tantrum = allMoves[Moves.STOMPING_TANTRUM];
+    vi.spyOn(stomping_tantrum, "calculateBattlePower");
+
+    game.move.select(Moves.CHARM);
+    await game.toNextTurn();
+
+    game.move.select(Moves.STOMPING_TANTRUM);
+    await game.phaseInterceptor.to("BerryPhase");
+    expect(stomping_tantrum.calculateBattlePower).toHaveReturnedWith(150);
+  });
+
+  // TODO: stomping tantrum should consider moves that were bounced.
+  it.todo(
+    "should properly cause the enemy's stomping tantrum to be doubled in power after bouncing and failing",
+    async () => {
+      game.override.enemyMoveset([Moves.STOMPING_TANTRUM, Moves.SPLASH, Moves.CHARM]);
+      await game.classicMode.startBattle([Species.BULBASAUR]);
+
+      const stomping_tantrum = allMoves[Moves.STOMPING_TANTRUM];
+      const enemy = game.scene.getEnemyPokemon()!;
+      vi.spyOn(stomping_tantrum, "calculateBattlePower");
+
+      game.move.select(Moves.SPORE);
+      await game.forceEnemyMove(Moves.CHARM);
+      await game.phaseInterceptor.to("TurnEndPhase");
+      expect(enemy.getLastXMoves(1)[0].result).toBe("success");
+
+      await game.phaseInterceptor.to("BerryPhase");
+      expect(stomping_tantrum.calculateBattlePower).toHaveReturnedWith(75);
+
+      await game.toNextTurn();
+      game.move.select(Moves.GROWL);
+      await game.phaseInterceptor.to("BerryPhase");
+      expect(stomping_tantrum.calculateBattlePower).toHaveReturnedWith(75);
+    },
+  );
+
+  it("should respect immunities when bouncing a move", async () => {
+    vi.spyOn(allMoves[Moves.THUNDER_WAVE], "accuracy", "get").mockReturnValue(100);
+    game.override.moveset([Moves.THUNDER_WAVE, Moves.GROWL]);
+    game.override.ability(Abilities.SOUNDPROOF);
+    await game.classicMode.startBattle([Species.PHANPY]);
+
+    // Turn 1 - thunder wave immunity test
+    game.move.select(Moves.THUNDER_WAVE);
+    await game.phaseInterceptor.to("BerryPhase");
+    expect(game.scene.getPlayerPokemon()!.status).toBeUndefined();
+
+    // Turn 2 - soundproof immunity test
+    game.move.select(Moves.GROWL);
+    await game.phaseInterceptor.to("BerryPhase");
+    expect(game.scene.getPlayerPokemon()!.getStatStage(Stat.ATK)).toBe(0);
+  });
+
+  it("should bounce back a move before the accuracy check", async () => {
+    game.override.moveset([Moves.SPORE]);
+    await game.classicMode.startBattle([Species.MAGIKARP]);
+
+    const attacker = game.scene.getPlayerPokemon()!;
+
+    vi.spyOn(attacker, "getAccuracyMultiplier").mockReturnValue(0.0);
+    game.move.select(Moves.SPORE);
+    await game.phaseInterceptor.to("BerryPhase");
+    expect(game.scene.getPlayerPokemon()!.status?.effect).toBe(StatusEffect.SLEEP);
+  });
+
+  it("should take the accuracy of the magic bounce user into account", async () => {
+    game.override.moveset([Moves.SPORE]);
+    await game.classicMode.startBattle([Species.MAGIKARP]);
+    const opponent = game.scene.getEnemyPokemon()!;
+
+    vi.spyOn(opponent, "getAccuracyMultiplier").mockReturnValue(0);
+    game.move.select(Moves.SPORE);
+    await game.phaseInterceptor.to("BerryPhase");
+    expect(game.scene.getPlayerPokemon()!.status).toBeUndefined();
+  });
+});
diff --git a/src/test/moves/magnet_rise.test.ts b/test/moves/magnet_rise.test.ts
similarity index 85%
rename from src/test/moves/magnet_rise.test.ts
rename to test/moves/magnet_rise.test.ts
index b26bbf42ed0..62ad0c88091 100644
--- a/src/test/moves/magnet_rise.test.ts
+++ b/test/moves/magnet_rise.test.ts
@@ -2,7 +2,7 @@ import { CommandPhase } from "#app/phases/command-phase";
 import { TurnEndPhase } from "#app/phases/turn-end-phase";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
@@ -23,13 +23,13 @@ describe("Moves - Magnet Rise", () => {
 
   beforeEach(() => {
     game = new GameManager(phaserGame);
-    game.override.battleType("single");
+    game.override.battleStyle("single");
     game.override.starterSpecies(Species.MAGNEZONE);
     game.override.enemySpecies(Species.RATTATA);
-    game.override.enemyMoveset([ Moves.DRILL_RUN, Moves.DRILL_RUN, Moves.DRILL_RUN, Moves.DRILL_RUN ]);
+    game.override.enemyMoveset([Moves.DRILL_RUN, Moves.DRILL_RUN, Moves.DRILL_RUN, Moves.DRILL_RUN]);
     game.override.disableCrits();
     game.override.enemyLevel(1);
-    game.override.moveset([ moveToUse, Moves.SPLASH, Moves.GRAVITY, Moves.BATON_PASS ]);
+    game.override.moveset([moveToUse, Moves.SPLASH, Moves.GRAVITY, Moves.BATON_PASS]);
   });
 
   it("MAGNET RISE", async () => {
diff --git a/src/test/moves/make_it_rain.test.ts b/test/moves/make_it_rain.test.ts
similarity index 85%
rename from src/test/moves/make_it_rain.test.ts
rename to test/moves/make_it_rain.test.ts
index 08021227e9c..4d94537bcec 100644
--- a/src/test/moves/make_it_rain.test.ts
+++ b/test/moves/make_it_rain.test.ts
@@ -2,13 +2,12 @@ import { Stat } from "#enums/stat";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 import { MoveEndPhase } from "#app/phases/move-end-phase";
 import { StatStageChangePhase } from "#app/phases/stat-stage-change-phase";
 
-
 describe("Moves - Make It Rain", () => {
   let phaserGame: Phaser.Game;
   let game: GameManager;
@@ -25,8 +24,8 @@ describe("Moves - Make It Rain", () => {
 
   beforeEach(() => {
     game = new GameManager(phaserGame);
-    game.override.battleType("double");
-    game.override.moveset([ Moves.MAKE_IT_RAIN, Moves.SPLASH ]);
+    game.override.battleStyle("double");
+    game.override.moveset([Moves.MAKE_IT_RAIN, Moves.SPLASH]);
     game.override.enemySpecies(Species.SNORLAX);
     game.override.enemyAbility(Abilities.INSOMNIA);
     game.override.enemyMoveset(Moves.SPLASH);
@@ -35,7 +34,7 @@ describe("Moves - Make It Rain", () => {
   });
 
   it("should only lower SPATK stat stage by 1 once in a double battle", async () => {
-    await game.startBattle([ Species.CHARIZARD, Species.BLASTOISE ]);
+    await game.startBattle([Species.CHARIZARD, Species.BLASTOISE]);
 
     const playerPokemon = game.scene.getPlayerPokemon()!;
 
@@ -49,9 +48,9 @@ describe("Moves - Make It Rain", () => {
 
   it("should apply effects even if the target faints", async () => {
     game.override.enemyLevel(1); // ensures the enemy will faint
-    game.override.battleType("single");
+    game.override.battleStyle("single");
 
-    await game.startBattle([ Species.CHARIZARD ]);
+    await game.startBattle([Species.CHARIZARD]);
 
     const playerPokemon = game.scene.getPlayerPokemon()!;
     const enemyPokemon = game.scene.getEnemyPokemon()!;
@@ -67,7 +66,7 @@ describe("Moves - Make It Rain", () => {
   it("should reduce Sp. Atk. once after KOing two enemies", async () => {
     game.override.enemyLevel(1); // ensures the enemy will faint
 
-    await game.startBattle([ Species.CHARIZARD, Species.BLASTOISE ]);
+    await game.startBattle([Species.CHARIZARD, Species.BLASTOISE]);
 
     const playerPokemon = game.scene.getPlayerPokemon()!;
     const enemyPokemon = game.scene.getEnemyField();
@@ -82,7 +81,7 @@ describe("Moves - Make It Rain", () => {
   });
 
   it("should lower SPATK stat stage by 1 if it only hits the second target", async () => {
-    await game.startBattle([ Species.CHARIZARD, Species.BLASTOISE ]);
+    await game.startBattle([Species.CHARIZARD, Species.BLASTOISE]);
 
     const playerPokemon = game.scene.getPlayerPokemon()!;
 
diff --git a/test/moves/mat_block.test.ts b/test/moves/mat_block.test.ts
new file mode 100644
index 00000000000..9ed0f497af9
--- /dev/null
+++ b/test/moves/mat_block.test.ts
@@ -0,0 +1,97 @@
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest";
+import GameManager from "#test/testUtils/gameManager";
+import { Species } from "#enums/species";
+import { Abilities } from "#enums/abilities";
+import { Moves } from "#enums/moves";
+import { Stat } from "#enums/stat";
+import { BerryPhase } from "#app/phases/berry-phase";
+import { CommandPhase } from "#app/phases/command-phase";
+import { TurnEndPhase } from "#app/phases/turn-end-phase";
+
+describe("Moves - Mat Block", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+
+    game.override.battleStyle("double");
+
+    game.override.moveset([Moves.MAT_BLOCK, Moves.SPLASH]);
+
+    game.override.enemySpecies(Species.SNORLAX);
+    game.override.enemyMoveset([Moves.TACKLE]);
+    game.override.enemyAbility(Abilities.INSOMNIA);
+
+    game.override.startingLevel(100);
+    game.override.enemyLevel(100);
+  });
+
+  test("should protect the user and allies from attack moves", async () => {
+    await game.startBattle([Species.CHARIZARD, Species.BLASTOISE]);
+
+    const leadPokemon = game.scene.getPlayerField();
+
+    game.move.select(Moves.MAT_BLOCK);
+
+    await game.phaseInterceptor.to(CommandPhase);
+
+    game.move.select(Moves.SPLASH, 1);
+
+    await game.phaseInterceptor.to(BerryPhase, false);
+
+    leadPokemon.forEach(p => expect(p.hp).toBe(p.getMaxHp()));
+  });
+
+  test("should not protect the user and allies from status moves", async () => {
+    game.override.enemyMoveset([Moves.GROWL]);
+
+    await game.startBattle([Species.CHARIZARD, Species.BLASTOISE]);
+
+    const leadPokemon = game.scene.getPlayerField();
+
+    game.move.select(Moves.MAT_BLOCK);
+
+    await game.phaseInterceptor.to(CommandPhase);
+
+    game.move.select(Moves.SPLASH, 1);
+
+    await game.phaseInterceptor.to(BerryPhase, false);
+
+    leadPokemon.forEach(p => expect(p.getStatStage(Stat.ATK)).toBe(-2));
+  });
+
+  test("should fail when used after the first turn", async () => {
+    await game.startBattle([Species.BLASTOISE, Species.CHARIZARD]);
+
+    const leadPokemon = game.scene.getPlayerField();
+
+    game.move.select(Moves.SPLASH);
+    await game.phaseInterceptor.to(CommandPhase);
+    game.move.select(Moves.SPLASH, 1);
+
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    const leadStartingHp = leadPokemon.map(p => p.hp);
+
+    await game.phaseInterceptor.to(CommandPhase, false);
+    game.move.select(Moves.MAT_BLOCK);
+    await game.phaseInterceptor.to(CommandPhase);
+    game.move.select(Moves.MAT_BLOCK, 1);
+
+    await game.phaseInterceptor.to(BerryPhase, false);
+
+    expect(leadPokemon.some((p, i) => p.hp < leadStartingHp[i])).toBeTruthy();
+  });
+});
diff --git a/src/test/moves/metal_burst.test.ts b/test/moves/metal_burst.test.ts
similarity index 76%
rename from src/test/moves/metal_burst.test.ts
rename to test/moves/metal_burst.test.ts
index 3b32dd322a3..7fa5434dc58 100644
--- a/src/test/moves/metal_burst.test.ts
+++ b/test/moves/metal_burst.test.ts
@@ -3,7 +3,7 @@ import { MoveResult } from "#app/field/pokemon";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
@@ -24,10 +24,10 @@ describe("Moves - Metal Burst", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     game.override
-      .moveset([ Moves.METAL_BURST, Moves.FISSURE, Moves.PRECIPICE_BLADES ])
+      .moveset([Moves.METAL_BURST, Moves.FISSURE, Moves.PRECIPICE_BLADES])
       .ability(Abilities.PURE_POWER)
       .startingLevel(10)
-      .battleType("double")
+      .battleStyle("double")
       .disableCrits()
       .enemySpecies(Species.PICHU)
       .enemyAbility(Abilities.BALL_FETCH)
@@ -35,9 +35,9 @@ describe("Moves - Metal Burst", () => {
   });
 
   it("should redirect target if intended target faints", async () => {
-    await game.classicMode.startBattle([ Species.FEEBAS, Species.FEEBAS ]);
+    await game.classicMode.startBattle([Species.FEEBAS, Species.FEEBAS]);
 
-    const [ , enemy2 ] = game.scene.getEnemyField();
+    const [, enemy2] = game.scene.getEnemyField();
 
     game.move.select(Moves.METAL_BURST);
     game.move.select(Moves.FISSURE, 1, BattlerIndex.ENEMY);
@@ -45,7 +45,7 @@ describe("Moves - Metal Burst", () => {
     await game.forceEnemyMove(Moves.TACKLE, BattlerIndex.PLAYER);
     await game.forceEnemyMove(Moves.TACKLE, BattlerIndex.PLAYER_2);
 
-    await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER_2, BattlerIndex.PLAYER, BattlerIndex.ENEMY_2 ]);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER_2, BattlerIndex.PLAYER, BattlerIndex.ENEMY_2]);
 
     await game.phaseInterceptor.to("MoveEndPhase");
     await game.move.forceHit();
@@ -56,9 +56,9 @@ describe("Moves - Metal Burst", () => {
   });
 
   it("should not crash if both opponents faint before the move is used", async () => {
-    await game.classicMode.startBattle([ Species.FEEBAS, Species.ARCEUS ]);
+    await game.classicMode.startBattle([Species.FEEBAS, Species.ARCEUS]);
 
-    const [ enemy1, enemy2 ] = game.scene.getEnemyField();
+    const [enemy1, enemy2] = game.scene.getEnemyField();
 
     game.move.select(Moves.METAL_BURST);
     game.move.select(Moves.PRECIPICE_BLADES, 1);
@@ -66,7 +66,7 @@ describe("Moves - Metal Burst", () => {
     await game.forceEnemyMove(Moves.TACKLE, BattlerIndex.PLAYER);
     await game.forceEnemyMove(Moves.TACKLE, BattlerIndex.PLAYER_2);
 
-    await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER_2, BattlerIndex.PLAYER, BattlerIndex.ENEMY_2 ]);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER_2, BattlerIndex.PLAYER, BattlerIndex.ENEMY_2]);
 
     await game.phaseInterceptor.to("MoveEndPhase");
     await game.move.forceHit();
diff --git a/src/test/moves/metronome.test.ts b/test/moves/metronome.test.ts
similarity index 86%
rename from src/test/moves/metronome.test.ts
rename to test/moves/metronome.test.ts
index 946dc92de0f..bf177fb1a93 100644
--- a/src/test/moves/metronome.test.ts
+++ b/test/moves/metronome.test.ts
@@ -1,11 +1,11 @@
 import { RechargingTag, SemiInvulnerableTag } from "#app/data/battler-tags";
-import { allMoves, RandomMoveAttr } from "#app/data/move";
+import { allMoves, RandomMoveAttr } from "#app/data/moves/move";
 import { Abilities } from "#app/enums/abilities";
 import { Stat } from "#app/enums/stat";
 import { CommandPhase } from "#app/phases/command-phase";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, it, expect, vi } from "vitest";
 
@@ -13,7 +13,7 @@ describe("Moves - Metronome", () => {
   let phaserGame: Phaser.Game;
   let game: GameManager;
 
-  const randomMoveAttr = allMoves[Moves.METRONOME].getAttrs(RandomMoveAttr)[0];
+  let randomMoveAttr: RandomMoveAttr;
 
   beforeAll(() => {
     phaserGame = new Phaser.Game({
@@ -26,10 +26,11 @@ describe("Moves - Metronome", () => {
   });
 
   beforeEach(() => {
+    randomMoveAttr = allMoves[Moves.METRONOME].getAttrs(RandomMoveAttr)[0];
     game = new GameManager(phaserGame);
     game.override
-      .moveset([ Moves.METRONOME, Moves.SPLASH ])
-      .battleType("single")
+      .moveset([Moves.METRONOME, Moves.SPLASH])
+      .battleStyle("single")
       .startingLevel(100)
       .starterSpecies(Species.REGIELEKI)
       .enemyLevel(100)
@@ -78,10 +79,10 @@ describe("Moves - Metronome", () => {
   });
 
   it("should only target ally for Aromatic Mist", async () => {
-    game.override.battleType("double");
-    await game.classicMode.startBattle([ Species.REGIELEKI, Species.RATTATA ]);
-    const [ leftPlayer, rightPlayer ] = game.scene.getPlayerField();
-    const [ leftOpp, rightOpp ] = game.scene.getEnemyField();
+    game.override.battleStyle("double");
+    await game.classicMode.startBattle([Species.REGIELEKI, Species.RATTATA]);
+    const [leftPlayer, rightPlayer] = game.scene.getPlayerField();
+    const [leftOpp, rightOpp] = game.scene.getEnemyField();
     vi.spyOn(randomMoveAttr, "getMoveOverride").mockReturnValue(Moves.AROMATIC_MIST);
 
     game.move.select(Moves.METRONOME, 0);
diff --git a/src/test/moves/miracle_eye.test.ts b/test/moves/miracle_eye.test.ts
similarity index 87%
rename from src/test/moves/miracle_eye.test.ts
rename to test/moves/miracle_eye.test.ts
index 70f487de942..2dbfb962540 100644
--- a/src/test/moves/miracle_eye.test.ts
+++ b/test/moves/miracle_eye.test.ts
@@ -2,7 +2,7 @@ import { BattlerIndex } from "#app/battle";
 import { Moves } from "#app/enums/moves";
 import { Species } from "#app/enums/species";
 import { MoveEffectPhase } from "#app/phases/move-effect-phase";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
@@ -28,7 +28,7 @@ describe("Moves - Miracle Eye", () => {
       .enemyMoveset(Moves.SPLASH)
       .enemyLevel(5)
       .starterSpecies(Species.MAGIKARP)
-      .moveset([ Moves.MIRACLE_EYE, Moves.CONFUSION ]);
+      .moveset([Moves.MIRACLE_EYE, Moves.CONFUSION]);
   });
 
   it("should allow Psychic moves to hit Dark types", async () => {
@@ -43,7 +43,7 @@ describe("Moves - Miracle Eye", () => {
     game.move.select(Moves.MIRACLE_EYE);
     await game.toNextTurn();
     game.move.select(Moves.CONFUSION);
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
     await game.phaseInterceptor.to(MoveEffectPhase);
 
     expect(enemy.hp).toBeLessThan(enemy.getMaxHp());
diff --git a/src/test/moves/mirror_move.test.ts b/test/moves/mirror_move.test.ts
similarity index 72%
rename from src/test/moves/mirror_move.test.ts
rename to test/moves/mirror_move.test.ts
index e55c55038ae..438c594d839 100644
--- a/src/test/moves/mirror_move.test.ts
+++ b/test/moves/mirror_move.test.ts
@@ -4,7 +4,7 @@ import { MoveResult } from "#app/field/pokemon";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
@@ -25,9 +25,9 @@ describe("Moves - Mirror Move", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     game.override
-      .moveset([ Moves.MIRROR_MOVE, Moves.SPLASH ])
+      .moveset([Moves.MIRROR_MOVE, Moves.SPLASH])
       .ability(Abilities.BALL_FETCH)
-      .battleType("single")
+      .battleStyle("single")
       .disableCrits()
       .enemySpecies(Species.MAGIKARP)
       .enemyAbility(Abilities.BALL_FETCH)
@@ -35,16 +35,14 @@ describe("Moves - Mirror Move", () => {
   });
 
   it("should use the last move that the target used on the user", async () => {
-    game.override
-      .battleType("double")
-      .enemyMoveset([ Moves.TACKLE, Moves.GROWL ]);
-    await game.classicMode.startBattle([ Species.FEEBAS, Species.MAGIKARP ]);
+    game.override.battleStyle("double").enemyMoveset([Moves.TACKLE, Moves.GROWL]);
+    await game.classicMode.startBattle([Species.FEEBAS, Species.MAGIKARP]);
 
     game.move.select(Moves.MIRROR_MOVE, 0, BattlerIndex.ENEMY); // target's last move is Tackle, enemy should receive damage from Mirror Move copying Tackle
     game.move.select(Moves.SPLASH, 1);
     await game.forceEnemyMove(Moves.TACKLE, BattlerIndex.PLAYER_2);
     await game.forceEnemyMove(Moves.GROWL, BattlerIndex.PLAYER_2);
-    await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.ENEMY_2, BattlerIndex.PLAYER_2, BattlerIndex.PLAYER ]);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.ENEMY_2, BattlerIndex.PLAYER_2, BattlerIndex.PLAYER]);
     await game.toNextTurn();
 
     expect(game.scene.getEnemyField()[0].isFullHp()).toBeFalsy();
@@ -52,10 +50,10 @@ describe("Moves - Mirror Move", () => {
 
   it("should apply secondary effects of a move", async () => {
     game.override.enemyMoveset(Moves.ACID_SPRAY);
-    await game.classicMode.startBattle([ Species.FEEBAS ]);
+    await game.classicMode.startBattle([Species.FEEBAS]);
 
     game.move.select(Moves.MIRROR_MOVE);
-    await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
     await game.toNextTurn();
 
     expect(game.scene.getEnemyPokemon()!.getStatStage(Stat.SPDEF)).toBe(-2);
@@ -63,20 +61,20 @@ describe("Moves - Mirror Move", () => {
 
   it("should be able to copy status moves", async () => {
     game.override.enemyMoveset(Moves.GROWL);
-    await game.classicMode.startBattle([ Species.FEEBAS ]);
+    await game.classicMode.startBattle([Species.FEEBAS]);
 
     game.move.select(Moves.MIRROR_MOVE);
-    await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
     await game.toNextTurn();
 
     expect(game.scene.getEnemyPokemon()!.getStatStage(Stat.ATK)).toBe(-1);
   });
 
   it("should fail if the target has not used any moves", async () => {
-    await game.classicMode.startBattle([ Species.FEEBAS ]);
+    await game.classicMode.startBattle([Species.FEEBAS]);
 
     game.move.select(Moves.MIRROR_MOVE);
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
     await game.toNextTurn();
 
     expect(game.scene.getPlayerPokemon()!.getLastXMoves()[0].result).toBe(MoveResult.FAIL);
diff --git a/src/test/moves/mist.test.ts b/test/moves/mist.test.ts
similarity index 85%
rename from src/test/moves/mist.test.ts
rename to test/moves/mist.test.ts
index cd338f79412..70cdf5b55a0 100644
--- a/src/test/moves/mist.test.ts
+++ b/test/moves/mist.test.ts
@@ -2,7 +2,7 @@ import { Stat } from "#enums/stat";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
@@ -23,9 +23,9 @@ describe("Moves - Mist", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     game.override
-      .moveset([ Moves.MIST, Moves.SPLASH ])
+      .moveset([Moves.MIST, Moves.SPLASH])
       .ability(Abilities.BALL_FETCH)
-      .battleType("double")
+      .battleStyle("double")
       .disableCrits()
       .enemySpecies(Species.SNORLAX)
       .enemyAbility(Abilities.BALL_FETCH)
@@ -33,7 +33,7 @@ describe("Moves - Mist", () => {
   });
 
   it("should prevent the user's side from having stats lowered", async () => {
-    await game.classicMode.startBattle([ Species.MAGIKARP, Species.FEEBAS ]);
+    await game.classicMode.startBattle([Species.MAGIKARP, Species.FEEBAS]);
 
     const playerPokemon = game.scene.getPlayerField();
 
diff --git a/src/test/moves/moongeist_beam.test.ts b/test/moves/moongeist_beam.test.ts
similarity index 79%
rename from src/test/moves/moongeist_beam.test.ts
rename to test/moves/moongeist_beam.test.ts
index 216eee482fb..82a2567377b 100644
--- a/src/test/moves/moongeist_beam.test.ts
+++ b/test/moves/moongeist_beam.test.ts
@@ -1,8 +1,8 @@
-import { allMoves, RandomMoveAttr } from "#app/data/move";
+import { allMoves, RandomMoveAttr } from "#app/data/moves/move";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
@@ -23,10 +23,10 @@ describe("Moves - Moongeist Beam", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     game.override
-      .moveset([ Moves.MOONGEIST_BEAM, Moves.METRONOME ])
+      .moveset([Moves.MOONGEIST_BEAM, Moves.METRONOME])
       .ability(Abilities.BALL_FETCH)
       .startingLevel(200)
-      .battleType("single")
+      .battleStyle("single")
       .disableCrits()
       .enemySpecies(Species.MAGIKARP)
       .enemyAbility(Abilities.STURDY)
@@ -35,7 +35,7 @@ describe("Moves - Moongeist Beam", () => {
 
   // Also covers Photon Geyser and Sunsteel Strike
   it("should ignore enemy abilities", async () => {
-    await game.classicMode.startBattle([ Species.MILOTIC ]);
+    await game.classicMode.startBattle([Species.MILOTIC]);
 
     const enemy = game.scene.getEnemyPokemon()!;
 
@@ -47,8 +47,10 @@ describe("Moves - Moongeist Beam", () => {
 
   // Also covers Photon Geyser and Sunsteel Strike
   it("should not ignore enemy abilities when called by another move, such as metronome", async () => {
-    await game.classicMode.startBattle([ Species.MILOTIC ]);
-    vi.spyOn(allMoves[Moves.METRONOME].getAttrs(RandomMoveAttr)[0], "getMoveOverride").mockReturnValue(Moves.MOONGEIST_BEAM);
+    await game.classicMode.startBattle([Species.MILOTIC]);
+    vi.spyOn(allMoves[Moves.METRONOME].getAttrs(RandomMoveAttr)[0], "getMoveOverride").mockReturnValue(
+      Moves.MOONGEIST_BEAM,
+    );
 
     game.move.select(Moves.METRONOME);
     await game.phaseInterceptor.to("BerryPhase");
diff --git a/src/test/moves/multi_target.test.ts b/test/moves/multi_target.test.ts
similarity index 71%
rename from src/test/moves/multi_target.test.ts
rename to test/moves/multi_target.test.ts
index 965876d3445..ad47d540a14 100644
--- a/src/test/moves/multi_target.test.ts
+++ b/test/moves/multi_target.test.ts
@@ -1,13 +1,12 @@
 import { BattlerIndex } from "#app/battle";
 import { Abilities } from "#app/enums/abilities";
 import { Species } from "#app/enums/species";
-import * as Utils from "#app/utils";
+import { toDmgValue } from "#app/utils/common";
 import { Moves } from "#enums/moves";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
-
 describe("Multi-target damage reduction", () => {
   let phaserGame: Phaser.Game;
   let game: GameManager;
@@ -26,24 +25,24 @@ describe("Multi-target damage reduction", () => {
     game = new GameManager(phaserGame);
     game.override
       .disableCrits()
-      .battleType("double")
+      .battleStyle("double")
       .enemyLevel(100)
       .startingLevel(100)
       .enemySpecies(Species.POLIWAG)
       .enemyMoveset(Moves.SPLASH)
       .enemyAbility(Abilities.BALL_FETCH)
-      .moveset([ Moves.TACKLE, Moves.DAZZLING_GLEAM, Moves.EARTHQUAKE, Moves.SPLASH ])
+      .moveset([Moves.TACKLE, Moves.DAZZLING_GLEAM, Moves.EARTHQUAKE, Moves.SPLASH])
       .ability(Abilities.BALL_FETCH);
   });
 
   it("should reduce d.gleam damage when multiple enemies but not tackle", async () => {
-    await game.startBattle([ Species.MAGIKARP, Species.FEEBAS ]);
+    await game.startBattle([Species.MAGIKARP, Species.FEEBAS]);
 
-    const [ enemy1, enemy2 ] = game.scene.getEnemyField();
+    const [enemy1, enemy2] = game.scene.getEnemyField();
 
     game.move.select(Moves.DAZZLING_GLEAM);
     game.move.select(Moves.TACKLE, 1, BattlerIndex.ENEMY);
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2 ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2]);
     await game.phaseInterceptor.to("MoveEndPhase");
 
     const gleam1 = enemy1.getMaxHp() - enemy1.hp;
@@ -59,7 +58,7 @@ describe("Multi-target damage reduction", () => {
 
     game.move.select(Moves.DAZZLING_GLEAM);
     game.move.select(Moves.TACKLE, 1, BattlerIndex.ENEMY);
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY]);
 
     await game.phaseInterceptor.to("MoveEndPhase");
 
@@ -72,19 +71,19 @@ describe("Multi-target damage reduction", () => {
     // Single target moves don't get reduced
     expect(tackle1).toBe(tackle2);
     // Moves that target all enemies get reduced if there's more than one enemy
-    expect(gleam1).toBeLessThanOrEqual(Utils.toDmgValue(gleam2 * 0.75) + 1);
-    expect(gleam1).toBeGreaterThanOrEqual(Utils.toDmgValue(gleam2 * 0.75) - 1);
+    expect(gleam1).toBeLessThanOrEqual(toDmgValue(gleam2 * 0.75) + 1);
+    expect(gleam1).toBeGreaterThanOrEqual(toDmgValue(gleam2 * 0.75) - 1);
   });
 
   it("should reduce earthquake when more than one pokemon other than user is not fainted", async () => {
-    await game.startBattle([ Species.MAGIKARP, Species.FEEBAS ]);
+    await game.startBattle([Species.MAGIKARP, Species.FEEBAS]);
 
     const player2 = game.scene.getPlayerParty()[1];
-    const [ enemy1, enemy2 ] = game.scene.getEnemyField();
+    const [enemy1, enemy2] = game.scene.getEnemyField();
 
     game.move.select(Moves.EARTHQUAKE);
     game.move.select(Moves.SPLASH, 1);
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2 ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2]);
 
     await game.phaseInterceptor.to("MoveEndPhase");
 
@@ -99,7 +98,7 @@ describe("Multi-target damage reduction", () => {
 
     game.move.select(Moves.EARTHQUAKE);
     game.move.select(Moves.SPLASH, 1);
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY]);
 
     await game.phaseInterceptor.to("MoveEndPhase");
 
@@ -117,13 +116,13 @@ describe("Multi-target damage reduction", () => {
     await game.toNextTurn();
 
     game.move.select(Moves.EARTHQUAKE);
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
 
     await game.phaseInterceptor.to("MoveEndPhase");
 
     const damageEnemy1Turn3 = enemy1.getMaxHp() - enemy1.hp;
     // Turn 3: 1 target, should be no damage reduction
-    expect(damageEnemy1Turn1).toBeLessThanOrEqual(Utils.toDmgValue(damageEnemy1Turn3 * 0.75) + 1);
-    expect(damageEnemy1Turn1).toBeGreaterThanOrEqual(Utils.toDmgValue(damageEnemy1Turn3 * 0.75) - 1);
+    expect(damageEnemy1Turn1).toBeLessThanOrEqual(toDmgValue(damageEnemy1Turn3 * 0.75) + 1);
+    expect(damageEnemy1Turn1).toBeGreaterThanOrEqual(toDmgValue(damageEnemy1Turn3 * 0.75) - 1);
   });
 });
diff --git a/src/test/moves/natural_gift.test.ts b/test/moves/natural_gift.test.ts
similarity index 60%
rename from src/test/moves/natural_gift.test.ts
rename to test/moves/natural_gift.test.ts
index e1f03280aa5..2bfa381d0b4 100644
--- a/src/test/moves/natural_gift.test.ts
+++ b/test/moves/natural_gift.test.ts
@@ -5,9 +5,10 @@ import { Abilities } from "#enums/abilities";
 import { MoveResult } from "#app/field/pokemon";
 import type Pokemon from "#app/field/pokemon";
 import { BerryType } from "#enums/berry-type";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
+import { NaturalGiftBerrySelector } from "#app/data/moves/move";
 
 describe("Moves - Natural Gift", () => {
   let phaserGame: Phaser.Game;
@@ -20,9 +21,8 @@ describe("Moves - Natural Gift", () => {
     const stackCounts = pokemon.getHeldItems().map(m => m.getStackCount());
     if (stackCounts.length) {
       return stackCounts.reduce((a, b) => a + b);
-    } else {
-      return 0;
     }
+    return 0;
   }
 
   beforeAll(() => {
@@ -38,7 +38,7 @@ describe("Moves - Natural Gift", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     game.override
-      .battleType("single")
+      .battleStyle("single")
       .disableCrits()
       .moveset(Moves.NATURAL_GIFT)
       .ability(Abilities.BALL_FETCH)
@@ -55,44 +55,38 @@ describe("Moves - Natural Gift", () => {
    */
   it("should deal double damage to Fighting type if Sitrus Berry is consumed", async () => {
     game.override
-      .startingHeldItems([
-        { name: "BERRY", type: BerryType.SITRUS, count: 3 },
-      ])
+      .startingHeldItems([{ name: "BERRY", type: BerryType.SITRUS, count: 3 }])
       .enemySpecies(Species.MACHAMP);
 
-    await game.classicMode.startBattle([ Species.BULBASAUR ]);
+    await game.classicMode.startBattle([Species.BULBASAUR]);
     const player = game.scene.getPlayerPokemon()!;
     const enemy = game.scene.getEnemyPokemon()!;
 
-    vi.spyOn(enemy, "getMoveEffectiveness");
+    const effectivenessSpy = vi.spyOn(enemy, "getMoveEffectiveness");
 
     game.move.select(Moves.NATURAL_GIFT);
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
     await game.toNextTurn();
 
     expect(getHeldItemCount(player)).toBe(2);
-    expect(enemy.getMoveEffectiveness).toHaveReturnedWith(2);
+    expect(effectivenessSpy).toHaveReturnedWith(2);
   });
 
   it("should deal half damage to Steel type if Sitrus Berry is consumed", async () => {
-    game.override
-      .startingHeldItems([
-        { name: "BERRY", type: BerryType.SITRUS, count: 3 },
-      ])
-      .enemySpecies(Species.KLINK);
+    game.override.startingHeldItems([{ name: "BERRY", type: BerryType.SITRUS, count: 3 }]).enemySpecies(Species.KLINK);
 
-    await game.classicMode.startBattle([ Species.BULBASAUR ]);
+    await game.classicMode.startBattle([Species.BULBASAUR]);
     const player = game.scene.getPlayerPokemon()!;
     const enemy = game.scene.getEnemyPokemon()!;
 
-    vi.spyOn(enemy, "getMoveEffectiveness");
+    const effectivenessSpy = vi.spyOn(enemy, "getMoveEffectiveness");
 
     game.move.select(Moves.NATURAL_GIFT);
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
     await game.toNextTurn();
 
     expect(getHeldItemCount(player)).toBe(2);
-    expect(enemy.getMoveEffectiveness).toHaveReturnedWith(0.5);
+    expect(effectivenessSpy).toHaveReturnedWith(0.5);
   });
 
   /**
@@ -101,38 +95,32 @@ describe("Moves - Natural Gift", () => {
    */
   it("should not override Electrify (deal double damage against Water pkm with Ganlon Berry)", async () => {
     game.override
-      .startingHeldItems([
-        { name: "BERRY", type: BerryType.GANLON, count: 3 },
-      ])
+      .startingHeldItems([{ name: "BERRY", type: BerryType.GANLON, count: 3 }])
       .enemyMoveset(Moves.ELECTRIFY)
       .enemySpecies(Species.MAGIKARP);
 
-    await game.classicMode.startBattle([ Species.BULBASAUR ]);
+    await game.classicMode.startBattle([Species.BULBASAUR]);
     const player = game.scene.getPlayerPokemon()!;
     const enemy = game.scene.getEnemyPokemon()!;
 
-    vi.spyOn(enemy, "getMoveEffectiveness");
+    const effectivenessSpy = vi.spyOn(enemy, "getMoveEffectiveness");
 
     game.move.select(Moves.NATURAL_GIFT);
-    await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
     await game.toNextTurn();
 
     expect(getHeldItemCount(player)).toBe(2);
-    expect(enemy.getMoveEffectiveness).toHaveReturnedWith(2);
+    expect(effectivenessSpy).toHaveReturnedWith(2);
   });
 
   it("should fail if no berries are held", async () => {
-    game.override
-      .startingHeldItems([]);
+    game.override.startingHeldItems([]);
 
-    await game.classicMode.startBattle([ Species.BULBASAUR ]);
+    await game.classicMode.startBattle([Species.BULBASAUR]);
     const player = game.scene.getPlayerPokemon()!;
-    const enemy = game.scene.getEnemyPokemon()!;
-
-    vi.spyOn(enemy, "getMoveEffectiveness");
 
     game.move.select(Moves.NATURAL_GIFT);
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
     await game.toNextTurn();
 
     expect(player.getLastXMoves(1)[0].result).toBe(MoveResult.FAIL);
@@ -140,20 +128,38 @@ describe("Moves - Natural Gift", () => {
 
   it("should not be affected by Normalize", async () => {
     game.override
-      .startingHeldItems([
-        { name: "BERRY", type: BerryType.SITRUS, count: 3 },
-      ])
+      .startingHeldItems([{ name: "BERRY", type: BerryType.SITRUS, count: 3 }])
       .ability(Abilities.NORMALIZE)
       .enemySpecies(Species.MACHAMP);
 
-    await game.classicMode.startBattle([ Species.BULBASAUR ]);
+    await game.classicMode.startBattle([Species.BULBASAUR]);
     const player = game.scene.getPlayerPokemon()!;
+    expect(getHeldItemCount(player)).toBe(3);
     const enemy = game.scene.getEnemyPokemon()!;
 
-    vi.spyOn(enemy, "getMoveEffectiveness");
+    const effectivenessSpy = vi.spyOn(enemy, "getMoveEffectiveness");
 
     game.move.select(Moves.NATURAL_GIFT);
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
+    await game.toNextTurn();
+
+    expect(getHeldItemCount(player)).toBe(2);
+    expect(effectivenessSpy).toHaveReturnedWith(2);
+  });
+
+  it("should clear BerryType once successfully used", async () => {
+ game.override
+      .startingHeldItems([{ name: "BERRY", type: BerryType.SITRUS, count: 3 }])
+      .ability(Abilities.NORMALIZE)
+      .enemySpecies(Species.MACHAMP);
+
+    await game.classicMode.startBattle([Species.BULBASAUR]);
+    const player = game.scene.getPlayerPokemon()!;
+    expect(getHeldItemCount(player)).toBe(3);
+    const enemy = game.scene.getEnemyPokemon()!;
+
+    game.move.select(Moves.NATURAL_GIFT);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
     await game.toNextTurn();
 
     expect(getHeldItemCount(player)).toBe(2);
diff --git a/src/test/moves/nightmare.test.ts b/test/moves/nightmare.test.ts
similarity index 86%
rename from src/test/moves/nightmare.test.ts
rename to test/moves/nightmare.test.ts
index 850b0793b1e..044856ae33d 100644
--- a/src/test/moves/nightmare.test.ts
+++ b/test/moves/nightmare.test.ts
@@ -2,7 +2,7 @@ import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { StatusEffect } from "#enums/status-effect";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
@@ -23,17 +23,18 @@ describe("Moves - Nightmare", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
 
-    game.override.battleType("single")
+    game.override
+      .battleStyle("single")
       .enemySpecies(Species.RATTATA)
       .enemyMoveset(Moves.SPLASH)
       .enemyAbility(Abilities.BALL_FETCH)
       .enemyStatusEffect(StatusEffect.SLEEP)
       .startingLevel(5)
-      .moveset([ Moves.NIGHTMARE, Moves.SPLASH ]);
+      .moveset([Moves.NIGHTMARE, Moves.SPLASH]);
   });
 
   it("lowers enemy hp by 1/4 each turn while asleep", async () => {
-    await game.classicMode.startBattle([ Species.HYPNO ]);
+    await game.classicMode.startBattle([Species.HYPNO]);
 
     const enemyPokemon = game.scene.getEnemyPokemon()!;
     const enemyMaxHP = enemyPokemon.hp;
diff --git a/src/test/moves/obstruct.test.ts b/test/moves/obstruct.test.ts
similarity index 95%
rename from src/test/moves/obstruct.test.ts
rename to test/moves/obstruct.test.ts
index 1649c199e32..f35a5964bcb 100644
--- a/src/test/moves/obstruct.test.ts
+++ b/test/moves/obstruct.test.ts
@@ -2,7 +2,7 @@ import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { Stat } from "#enums/stat";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
@@ -22,12 +22,12 @@ describe("Moves - Obstruct", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     game.override
-      .battleType("single")
+      .battleStyle("single")
       .enemySpecies(Species.MAGIKARP)
       .enemyMoveset(Moves.TACKLE)
       .enemyAbility(Abilities.BALL_FETCH)
       .ability(Abilities.BALL_FETCH)
-      .moveset([ Moves.OBSTRUCT ])
+      .moveset([Moves.OBSTRUCT])
       .starterSpecies(Species.FEEBAS);
   });
 
@@ -57,8 +57,7 @@ describe("Moves - Obstruct", () => {
     await game.phaseInterceptor.to("TurnEndPhase");
     expect(player.isFullHp()).toBe(true);
     expect(enemy.getStatStage(Stat.DEF)).toBe(-2);
-  }
-  );
+  });
 
   it("protects from non-contact damaging moves and doesn't lower the opponent's defense by 2 stages", async () => {
     game.override.enemyMoveset(Moves.WATER_GUN);
diff --git a/src/test/moves/octolock.test.ts b/test/moves/octolock.test.ts
similarity index 89%
rename from src/test/moves/octolock.test.ts
rename to test/moves/octolock.test.ts
index 6ca96eeb464..fb57d0bfad5 100644
--- a/src/test/moves/octolock.test.ts
+++ b/test/moves/octolock.test.ts
@@ -3,7 +3,7 @@ import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { Stat } from "#enums/stat";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
@@ -25,17 +25,17 @@ describe("Moves - Octolock", () => {
     game = new GameManager(phaserGame);
 
     game.override
-      .battleType("single")
+      .battleStyle("single")
       .enemySpecies(Species.MAGIKARP)
       .enemyMoveset(Moves.SPLASH)
       .enemyAbility(Abilities.BALL_FETCH)
       .startingLevel(2000)
-      .moveset([ Moves.OCTOLOCK, Moves.SPLASH, Moves.TRICK_OR_TREAT ])
+      .moveset([Moves.OCTOLOCK, Moves.SPLASH, Moves.TRICK_OR_TREAT])
       .ability(Abilities.BALL_FETCH);
   });
 
   it("lowers DEF and SPDEF stat stages of the target Pokemon by 1 each turn", async () => {
-    await game.classicMode.startBattle([ Species.GRAPPLOCT ]);
+    await game.classicMode.startBattle([Species.GRAPPLOCT]);
 
     const enemyPokemon = game.scene.getEnemyPokemon()!;
 
@@ -56,7 +56,7 @@ describe("Moves - Octolock", () => {
 
   it("if target pokemon has BIG_PECKS, should only lower SPDEF stat stage by 1", async () => {
     game.override.enemyAbility(Abilities.BIG_PECKS);
-    await game.classicMode.startBattle([ Species.GRAPPLOCT ]);
+    await game.classicMode.startBattle([Species.GRAPPLOCT]);
 
     const enemyPokemon = game.scene.getEnemyPokemon()!;
 
@@ -70,7 +70,7 @@ describe("Moves - Octolock", () => {
 
   it("if target pokemon has WHITE_SMOKE, should not reduce any stat stages", async () => {
     game.override.enemyAbility(Abilities.WHITE_SMOKE);
-    await game.classicMode.startBattle([ Species.GRAPPLOCT ]);
+    await game.classicMode.startBattle([Species.GRAPPLOCT]);
 
     const enemyPokemon = game.scene.getEnemyPokemon()!;
 
@@ -84,7 +84,7 @@ describe("Moves - Octolock", () => {
 
   it("if target pokemon has CLEAR_BODY, should not reduce any stat stages", async () => {
     game.override.enemyAbility(Abilities.CLEAR_BODY);
-    await game.classicMode.startBattle([ Species.GRAPPLOCT ]);
+    await game.classicMode.startBattle([Species.GRAPPLOCT]);
 
     const enemyPokemon = game.scene.getEnemyPokemon()!;
 
@@ -97,7 +97,7 @@ describe("Moves - Octolock", () => {
   });
 
   it("traps the target pokemon", async () => {
-    await game.classicMode.startBattle([ Species.GRAPPLOCT ]);
+    await game.classicMode.startBattle([Species.GRAPPLOCT]);
 
     const enemyPokemon = game.scene.getEnemyPokemon()!;
 
@@ -113,7 +113,7 @@ describe("Moves - Octolock", () => {
 
   it("does not work on ghost type pokemon", async () => {
     game.override.enemyMoveset(Moves.OCTOLOCK);
-    await game.classicMode.startBattle([ Species.GASTLY ]);
+    await game.classicMode.startBattle([Species.GASTLY]);
 
     const playerPokemon = game.scene.getPlayerPokemon()!;
 
@@ -130,7 +130,7 @@ describe("Moves - Octolock", () => {
   });
 
   it("does not work on pokemon with added ghost type via Trick-or-Treat", async () => {
-    await game.classicMode.startBattle([ Species.FEEBAS ]);
+    await game.classicMode.startBattle([Species.FEEBAS]);
 
     const enemy = game.scene.getEnemyPokemon()!;
 
diff --git a/src/test/moves/order_up.test.ts b/test/moves/order_up.test.ts
similarity index 58%
rename from src/test/moves/order_up.test.ts
rename to test/moves/order_up.test.ts
index a9281b121b2..b5df5bfba41 100644
--- a/src/test/moves/order_up.test.ts
+++ b/test/moves/order_up.test.ts
@@ -6,7 +6,7 @@ import { Stat } from "#enums/stat";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
@@ -29,7 +29,7 @@ describe("Moves - Order Up", () => {
     game.override
       .moveset(Moves.ORDER_UP)
       .ability(Abilities.COMMANDER)
-      .battleType("double")
+      .battleStyle("double")
       .disableCrits()
       .enemySpecies(Species.SNORLAX)
       .enemyAbility(Abilities.BALL_FETCH)
@@ -43,34 +43,35 @@ describe("Moves - Order Up", () => {
   it.each([
     { formIndex: 0, formName: "Curly", stat: Stat.ATK, statName: "Attack" },
     { formIndex: 1, formName: "Droopy", stat: Stat.DEF, statName: "Defense" },
-    { formIndex: 2, formName: "Stretchy", stat: Stat.SPD, statName: "Speed" }
-  ])("should raise the user's $statName when the user is commanded by a $formName Tatsugiri", async ({ formIndex, stat }) => {
-    game.override.starterForms({ [Species.TATSUGIRI]: formIndex });
+    { formIndex: 2, formName: "Stretchy", stat: Stat.SPD, statName: "Speed" },
+  ])(
+    "should raise the user's $statName when the user is commanded by a $formName Tatsugiri",
+    async ({ formIndex, stat }) => {
+      game.override.starterForms({ [Species.TATSUGIRI]: formIndex });
 
-    await game.classicMode.startBattle([ Species.TATSUGIRI, Species.DONDOZO ]);
+      await game.classicMode.startBattle([Species.TATSUGIRI, Species.DONDOZO]);
 
-    const [ tatsugiri, dondozo ] = game.scene.getPlayerField();
+      const [tatsugiri, dondozo] = game.scene.getPlayerField();
 
-    expect(game.scene.triggerPokemonBattleAnim).toHaveBeenLastCalledWith(tatsugiri, PokemonAnimType.COMMANDER_APPLY);
-    expect(dondozo.getTag(BattlerTagType.COMMANDED)).toBeDefined();
+      expect(game.scene.triggerPokemonBattleAnim).toHaveBeenLastCalledWith(tatsugiri, PokemonAnimType.COMMANDER_APPLY);
+      expect(dondozo.getTag(BattlerTagType.COMMANDED)).toBeDefined();
 
-    game.move.select(Moves.ORDER_UP, 1, BattlerIndex.ENEMY);
-    expect(game.scene.currentBattle.turnCommands[0]?.skip).toBeTruthy();
+      game.move.select(Moves.ORDER_UP, 1, BattlerIndex.ENEMY);
+      expect(game.scene.currentBattle.turnCommands[0]?.skip).toBeTruthy();
 
-    await game.phaseInterceptor.to("BerryPhase", false);
+      await game.phaseInterceptor.to("BerryPhase", false);
 
-    const affectedStats: EffectiveStat[] = [ Stat.ATK, Stat.DEF, Stat.SPATK, Stat.SPDEF, Stat.SPD ];
-    affectedStats.forEach(st => expect(dondozo.getStatStage(st)).toBe(st === stat ? 3 : 2));
-  });
+      const affectedStats: EffectiveStat[] = [Stat.ATK, Stat.DEF, Stat.SPATK, Stat.SPDEF, Stat.SPD];
+      affectedStats.forEach(st => expect(dondozo.getStatStage(st)).toBe(st === stat ? 3 : 2));
+    },
+  );
 
   it("should be boosted by Sheer Force while still applying a stat boost", async () => {
-    game.override
-      .passiveAbility(Abilities.SHEER_FORCE)
-      .starterForms({ [Species.TATSUGIRI]: 0 });
+    game.override.passiveAbility(Abilities.SHEER_FORCE).starterForms({ [Species.TATSUGIRI]: 0 });
 
-    await game.classicMode.startBattle([ Species.TATSUGIRI, Species.DONDOZO ]);
+    await game.classicMode.startBattle([Species.TATSUGIRI, Species.DONDOZO]);
 
-    const [ tatsugiri, dondozo ] = game.scene.getPlayerField();
+    const [tatsugiri, dondozo] = game.scene.getPlayerField();
 
     expect(game.scene.triggerPokemonBattleAnim).toHaveBeenLastCalledWith(tatsugiri, PokemonAnimType.COMMANDER_APPLY);
     expect(dondozo.getTag(BattlerTagType.COMMANDED)).toBeDefined();
@@ -80,7 +81,7 @@ describe("Moves - Order Up", () => {
 
     await game.phaseInterceptor.to("BerryPhase", false);
 
-    expect(dondozo.battleData.abilitiesApplied.includes(Abilities.SHEER_FORCE)).toBeTruthy();
+    expect(dondozo.waveData.abilitiesApplied.has(Abilities.SHEER_FORCE)).toBeTruthy();
     expect(dondozo.getStatStage(Stat.ATK)).toBe(3);
   });
 });
diff --git a/src/test/moves/parting_shot.test.ts b/test/moves/parting_shot.test.ts
similarity index 66%
rename from src/test/moves/parting_shot.test.ts
rename to test/moves/parting_shot.test.ts
index 30ad3660a32..a65c1a5b3a5 100644
--- a/src/test/moves/parting_shot.test.ts
+++ b/test/moves/parting_shot.test.ts
@@ -3,14 +3,13 @@ import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, test } from "vitest";
-import GameManager from "../utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import { Stat } from "#enums/stat";
 import { BerryPhase } from "#app/phases/berry-phase";
 import { FaintPhase } from "#app/phases/faint-phase";
 import { MessagePhase } from "#app/phases/message-phase";
 import { TurnInitPhase } from "#app/phases/turn-init-phase";
 
-
 describe("Moves - Parting Shot", () => {
   let phaserGame: Phaser.Game;
   let game: GameManager;
@@ -27,59 +26,49 @@ describe("Moves - Parting Shot", () => {
 
   beforeEach(() => {
     game = new GameManager(phaserGame);
-    game.override.battleType("single");
-    game.override.moveset([ Moves.PARTING_SHOT, Moves.SPLASH ]);
+    game.override.battleStyle("single");
+    game.override.moveset([Moves.PARTING_SHOT, Moves.SPLASH]);
     game.override.enemyMoveset(Moves.SPLASH);
     game.override.startingLevel(5);
     game.override.enemyLevel(5);
-
   });
 
-  test(
-    "Parting Shot when buffed by prankster should fail against dark types",
-    async () => {
-      game.override
-        .enemySpecies(Species.POOCHYENA)
-        .ability(Abilities.PRANKSTER);
-      await game.startBattle([ Species.MURKROW, Species.MEOWTH ]);
+  test("Parting Shot when buffed by prankster should fail against dark types", async () => {
+    game.override.enemySpecies(Species.POOCHYENA).ability(Abilities.PRANKSTER);
+    await game.startBattle([Species.MURKROW, Species.MEOWTH]);
 
-      const enemyPokemon = game.scene.getEnemyPokemon()!;
-      expect(enemyPokemon).toBeDefined();
+    const enemyPokemon = game.scene.getEnemyPokemon()!;
+    expect(enemyPokemon).toBeDefined();
 
-      game.move.select(Moves.PARTING_SHOT);
+    game.move.select(Moves.PARTING_SHOT);
 
-      await game.phaseInterceptor.to(BerryPhase, false);
-      expect(enemyPokemon.getStatStage(Stat.ATK)).toBe(0);
-      expect(enemyPokemon.getStatStage(Stat.SPATK)).toBe(0);
-      expect(game.scene.getPlayerField()[0].species.speciesId).toBe(Species.MURKROW);
-    }
-  );
+    await game.phaseInterceptor.to(BerryPhase, false);
+    expect(enemyPokemon.getStatStage(Stat.ATK)).toBe(0);
+    expect(enemyPokemon.getStatStage(Stat.SPATK)).toBe(0);
+    expect(game.scene.getPlayerField()[0].species.speciesId).toBe(Species.MURKROW);
+  });
 
-  test(
-    "Parting shot should fail against good as gold ability",
-    async () => {
-      game.override
-        .enemySpecies(Species.GHOLDENGO)
-        .enemyAbility(Abilities.GOOD_AS_GOLD);
-      await game.startBattle([ Species.MURKROW, Species.MEOWTH ]);
+  test("Parting shot should fail against good as gold ability", async () => {
+    game.override.enemySpecies(Species.GHOLDENGO).enemyAbility(Abilities.GOOD_AS_GOLD);
+    await game.startBattle([Species.MURKROW, Species.MEOWTH]);
 
-      const enemyPokemon = game.scene.getEnemyPokemon()!;
-      expect(enemyPokemon).toBeDefined();
+    const enemyPokemon = game.scene.getEnemyPokemon()!;
+    expect(enemyPokemon).toBeDefined();
 
-      game.move.select(Moves.PARTING_SHOT);
+    game.move.select(Moves.PARTING_SHOT);
 
-      await game.phaseInterceptor.to(BerryPhase, false);
-      expect(enemyPokemon.getStatStage(Stat.ATK)).toBe(0);
-      expect(enemyPokemon.getStatStage(Stat.SPATK)).toBe(0);
-      expect(game.scene.getPlayerField()[0].species.speciesId).toBe(Species.MURKROW);
-    }
-  );
+    await game.phaseInterceptor.to(BerryPhase, false);
+    expect(enemyPokemon.getStatStage(Stat.ATK)).toBe(0);
+    expect(enemyPokemon.getStatStage(Stat.SPATK)).toBe(0);
+    expect(game.scene.getPlayerField()[0].species.speciesId).toBe(Species.MURKROW);
+  });
 
-  it.todo( // TODO: fix this bug to pass the test!
+  it.todo(
+    // TODO: fix this bug to pass the test!
     "Parting shot should fail if target is -6/-6 de-buffed",
     async () => {
-      game.override.moveset([ Moves.PARTING_SHOT, Moves.MEMENTO, Moves.SPLASH ]);
-      await game.startBattle([ Species.MEOWTH, Species.MEOWTH, Species.MEOWTH, Species.MURKROW, Species.ABRA ]);
+      game.override.moveset([Moves.PARTING_SHOT, Moves.MEMENTO, Moves.SPLASH]);
+      await game.startBattle([Species.MEOWTH, Species.MEOWTH, Species.MEOWTH, Species.MURKROW, Species.ABRA]);
 
       // use Memento 3 times to debuff enemy
       game.move.select(Moves.MEMENTO);
@@ -114,17 +103,15 @@ describe("Moves - Parting Shot", () => {
       expect(enemyPokemon.getStatStage(Stat.ATK)).toBe(-6);
       expect(enemyPokemon.getStatStage(Stat.SPATK)).toBe(-6);
       expect(game.scene.getPlayerField()[0].species.speciesId).toBe(Species.MURKROW);
-    }
+    },
   );
 
-  it.todo( // TODO: fix this bug to pass the test!
+  it.todo(
+    // TODO: fix this bug to pass the test!
     "Parting shot shouldn't allow switch out when mist is active",
     async () => {
-      game.override
-        .enemySpecies(Species.ALTARIA)
-        .enemyAbility(Abilities.NONE)
-        .enemyMoveset([ Moves.MIST ]);
-      await game.startBattle([ Species.SNORLAX, Species.MEOWTH ]);
+      game.override.enemySpecies(Species.ALTARIA).enemyAbility(Abilities.NONE).enemyMoveset([Moves.MIST]);
+      await game.startBattle([Species.SNORLAX, Species.MEOWTH]);
 
       const enemyPokemon = game.scene.getEnemyPokemon()!;
       expect(enemyPokemon).toBeDefined();
@@ -135,16 +122,15 @@ describe("Moves - Parting Shot", () => {
       expect(enemyPokemon.getStatStage(Stat.ATK)).toBe(0);
       expect(enemyPokemon.getStatStage(Stat.SPATK)).toBe(0);
       expect(game.scene.getPlayerField()[0].species.speciesId).toBe(Species.MURKROW);
-    }
+    },
   );
 
-  it.todo( // TODO: fix this bug to pass the test!
+  it.todo(
+    // TODO: fix this bug to pass the test!
     "Parting shot shouldn't allow switch out against clear body ability",
     async () => {
-      game.override
-        .enemySpecies(Species.TENTACOOL)
-        .enemyAbility(Abilities.CLEAR_BODY);
-      await game.startBattle([ Species.SNORLAX, Species.MEOWTH ]);
+      game.override.enemySpecies(Species.TENTACOOL).enemyAbility(Abilities.CLEAR_BODY);
+      await game.startBattle([Species.SNORLAX, Species.MEOWTH]);
 
       const enemyPokemon = game.scene.getEnemyPokemon()!;
       expect(enemyPokemon).toBeDefined();
@@ -155,13 +141,14 @@ describe("Moves - Parting Shot", () => {
       expect(enemyPokemon.getStatStage(Stat.ATK)).toBe(0);
       expect(enemyPokemon.getStatStage(Stat.SPATK)).toBe(0);
       expect(game.scene.getPlayerField()[0].species.speciesId).toBe(Species.MURKROW);
-    }
+    },
   );
 
-  it.todo( // TODO: fix this bug to pass the test!
+  it.todo(
+    // TODO: fix this bug to pass the test!
     "Parting shot should de-buff and not fail if no party available to switch - party size 1",
     async () => {
-      await game.startBattle([ Species.MURKROW ]);
+      await game.startBattle([Species.MURKROW]);
 
       const enemyPokemon = game.scene.getEnemyPokemon()!;
       expect(enemyPokemon).toBeDefined();
@@ -172,13 +159,14 @@ describe("Moves - Parting Shot", () => {
       expect(enemyPokemon.getStatStage(Stat.ATK)).toBe(-1);
       expect(enemyPokemon.getStatStage(Stat.SPATK)).toBe(-1);
       expect(game.scene.getPlayerField()[0].species.speciesId).toBe(Species.MURKROW);
-    }
+    },
   );
 
-  it.todo( // TODO: fix this bug to pass the test!
+  it.todo(
+    // TODO: fix this bug to pass the test!
     "Parting shot regularly not fail if no party available to switch - party fainted",
     async () => {
-      await game.startBattle([ Species.MURKROW, Species.MEOWTH ]);
+      await game.startBattle([Species.MURKROW, Species.MEOWTH]);
       game.move.select(Moves.SPLASH);
 
       // intentionally kill party pokemon, switch to second slot (now 1 party mon is fainted)
@@ -195,6 +183,6 @@ describe("Moves - Parting Shot", () => {
       expect(enemyPokemon.getStatStage(Stat.ATK)).toBe(0);
       expect(enemyPokemon.getStatStage(Stat.SPATK)).toBe(0);
       expect(game.scene.getPlayerField()[0].species.speciesId).toBe(Species.MEOWTH);
-    }
+    },
   );
 });
diff --git a/src/test/moves/plasma_fists.test.ts b/test/moves/plasma_fists.test.ts
similarity index 67%
rename from src/test/moves/plasma_fists.test.ts
rename to test/moves/plasma_fists.test.ts
index 4075c1ab988..b6a5ceaed68 100644
--- a/src/test/moves/plasma_fists.test.ts
+++ b/test/moves/plasma_fists.test.ts
@@ -1,9 +1,9 @@
 import { BattlerIndex } from "#app/battle";
-import { Type } from "#enums/type";
+import { PokemonType } from "#enums/pokemon-type";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, it, expect, vi } from "vitest";
 
@@ -24,8 +24,8 @@ describe("Moves - Plasma Fists", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     game.override
-      .moveset([ Moves.PLASMA_FISTS, Moves.TACKLE ])
-      .battleType("double")
+      .moveset([Moves.PLASMA_FISTS, Moves.TACKLE])
+      .battleStyle("double")
       .startingLevel(100)
       .enemySpecies(Species.DUSCLOPS)
       .enemyAbility(Abilities.BALL_FETCH)
@@ -34,7 +34,7 @@ describe("Moves - Plasma Fists", () => {
   });
 
   it("should convert all subsequent Normal-type attacks to Electric-type", async () => {
-    await game.classicMode.startBattle([ Species.DUSCLOPS, Species.BLASTOISE ]);
+    await game.classicMode.startBattle([Species.DUSCLOPS, Species.BLASTOISE]);
 
     const field = game.scene.getField(true);
     field.forEach(p => vi.spyOn(p, "getMoveType"));
@@ -45,22 +45,20 @@ describe("Moves - Plasma Fists", () => {
     await game.forceEnemyMove(Moves.TACKLE, BattlerIndex.PLAYER);
     await game.forceEnemyMove(Moves.TACKLE, BattlerIndex.PLAYER_2);
 
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2 ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2]);
 
     await game.phaseInterceptor.to("BerryPhase", false);
 
     field.forEach(p => {
-      expect(p.getMoveType).toHaveLastReturnedWith(Type.ELECTRIC);
+      expect(p.getMoveType).toHaveLastReturnedWith(PokemonType.ELECTRIC);
       expect(p.hp).toBeLessThan(p.getMaxHp());
     });
   });
 
   it("should not affect Normal-type attacks boosted by Pixilate", async () => {
-    game.override
-      .battleType("single")
-      .enemyAbility(Abilities.PIXILATE);
+    game.override.battleStyle("single").enemyAbility(Abilities.PIXILATE);
 
-    await game.classicMode.startBattle([ Species.ONIX ]);
+    await game.classicMode.startBattle([Species.ONIX]);
 
     const playerPokemon = game.scene.getPlayerPokemon()!;
     const enemyPokemon = game.scene.getEnemyPokemon()!;
@@ -68,20 +66,17 @@ describe("Moves - Plasma Fists", () => {
 
     game.move.select(Moves.PLASMA_FISTS);
 
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
     await game.phaseInterceptor.to("BerryPhase", false);
 
-    expect(enemyPokemon.getMoveType).toHaveLastReturnedWith(Type.FAIRY);
+    expect(enemyPokemon.getMoveType).toHaveLastReturnedWith(PokemonType.FAIRY);
     expect(playerPokemon.hp).toBeLessThan(playerPokemon.getMaxHp());
   });
 
   it("should affect moves that become Normal type due to Normalize", async () => {
-    game.override
-      .battleType("single")
-      .enemyAbility(Abilities.NORMALIZE)
-      .enemyMoveset(Moves.WATER_GUN);
+    game.override.battleStyle("single").enemyAbility(Abilities.NORMALIZE).enemyMoveset(Moves.WATER_GUN);
 
-    await game.classicMode.startBattle([ Species.DUSCLOPS ]);
+    await game.classicMode.startBattle([Species.DUSCLOPS]);
 
     const playerPokemon = game.scene.getPlayerPokemon()!;
     const enemyPokemon = game.scene.getEnemyPokemon()!;
@@ -89,10 +84,10 @@ describe("Moves - Plasma Fists", () => {
 
     game.move.select(Moves.PLASMA_FISTS);
 
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
     await game.phaseInterceptor.to("BerryPhase", false);
 
-    expect(enemyPokemon.getMoveType).toHaveLastReturnedWith(Type.ELECTRIC);
+    expect(enemyPokemon.getMoveType).toHaveLastReturnedWith(PokemonType.ELECTRIC);
     expect(playerPokemon.hp).toBeLessThan(playerPokemon.getMaxHp());
   });
 });
diff --git a/test/moves/pledge_moves.test.ts b/test/moves/pledge_moves.test.ts
new file mode 100644
index 00000000000..2bfd408e5fb
--- /dev/null
+++ b/test/moves/pledge_moves.test.ts
@@ -0,0 +1,301 @@
+import { BattlerIndex } from "#app/battle";
+import { allAbilities } from "#app/data/data-lists";
+import { ArenaTagSide } from "#app/data/arena-tag";
+import { allMoves, FlinchAttr } from "#app/data/moves/move";
+import { PokemonType } from "#enums/pokemon-type";
+import { ArenaTagType } from "#enums/arena-tag-type";
+import { Stat } from "#enums/stat";
+import { toDmgValue } from "#app/utils/common";
+import { Abilities } from "#enums/abilities";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import GameManager from "#test/testUtils/gameManager";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, it, expect, vi } from "vitest";
+
+describe("Moves - Pledge Moves", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+    game.override
+      .battleStyle("double")
+      .startingLevel(100)
+      .moveset([Moves.FIRE_PLEDGE, Moves.GRASS_PLEDGE, Moves.WATER_PLEDGE, Moves.SPLASH])
+      .enemySpecies(Species.SNORLAX)
+      .enemyLevel(100)
+      .enemyAbility(Abilities.BALL_FETCH)
+      .enemyMoveset(Moves.SPLASH);
+  });
+
+  it("Fire Pledge - should be an 80-power Fire-type attack outside of combination", async () => {
+    await game.classicMode.startBattle([Species.BLASTOISE, Species.CHARIZARD]);
+
+    const firePledge = allMoves[Moves.FIRE_PLEDGE];
+    vi.spyOn(firePledge, "calculateBattlePower");
+
+    const playerPokemon = game.scene.getPlayerField();
+    vi.spyOn(playerPokemon[0], "getMoveType");
+
+    game.move.select(Moves.FIRE_PLEDGE, 0, BattlerIndex.ENEMY);
+    game.move.select(Moves.SPLASH, 1);
+
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2]);
+    await game.phaseInterceptor.to("MoveEndPhase", false);
+
+    expect(firePledge.calculateBattlePower).toHaveLastReturnedWith(80);
+    expect(playerPokemon[0].getMoveType).toHaveLastReturnedWith(PokemonType.FIRE);
+  });
+
+  it("Fire Pledge - should not combine with an ally using Fire Pledge", async () => {
+    await game.classicMode.startBattle([Species.BLASTOISE, Species.CHARIZARD]);
+
+    const firePledge = allMoves[Moves.FIRE_PLEDGE];
+    vi.spyOn(firePledge, "calculateBattlePower");
+
+    const playerPokemon = game.scene.getPlayerField();
+    playerPokemon.forEach(p => vi.spyOn(p, "getMoveType"));
+
+    const enemyPokemon = game.scene.getEnemyField();
+
+    game.move.select(Moves.FIRE_PLEDGE, 0, BattlerIndex.ENEMY);
+    game.move.select(Moves.FIRE_PLEDGE, 0, BattlerIndex.ENEMY_2);
+
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2]);
+
+    await game.phaseInterceptor.to("MoveEndPhase");
+    expect(firePledge.calculateBattlePower).toHaveLastReturnedWith(80);
+    expect(playerPokemon[0].getMoveType).toHaveLastReturnedWith(PokemonType.FIRE);
+
+    await game.phaseInterceptor.to("BerryPhase", false);
+    expect(firePledge.calculateBattlePower).toHaveLastReturnedWith(80);
+    expect(playerPokemon[1].getMoveType).toHaveLastReturnedWith(PokemonType.FIRE);
+
+    enemyPokemon.forEach(p => expect(p.hp).toBeLessThan(p.getMaxHp()));
+  });
+
+  it("Fire Pledge - should not combine with an enemy's Pledge move", async () => {
+    game.override.battleStyle("single").enemyMoveset(Moves.GRASS_PLEDGE);
+
+    await game.classicMode.startBattle([Species.CHARIZARD]);
+
+    const playerPokemon = game.scene.getPlayerPokemon()!;
+    const enemyPokemon = game.scene.getEnemyPokemon()!;
+
+    game.move.select(Moves.FIRE_PLEDGE);
+
+    await game.toNextTurn();
+
+    // Neither Pokemon should defer their move's effects as they would
+    // if they combined moves, so both should be damaged.
+    expect(playerPokemon.hp).toBeLessThan(playerPokemon.getMaxHp());
+    expect(enemyPokemon.hp).toBeLessThan(enemyPokemon.getMaxHp());
+    expect(game.scene.arena.getTag(ArenaTagType.FIRE_GRASS_PLEDGE)).toBeUndefined();
+  });
+
+  it("Grass Pledge - should combine with Fire Pledge to form a 150-power Fire-type attack that creates a 'sea of fire'", async () => {
+    await game.classicMode.startBattle([Species.CHARIZARD, Species.BLASTOISE]);
+
+    const grassPledge = allMoves[Moves.GRASS_PLEDGE];
+    vi.spyOn(grassPledge, "calculateBattlePower");
+
+    const playerPokemon = game.scene.getPlayerField();
+    const enemyPokemon = game.scene.getEnemyField();
+
+    vi.spyOn(playerPokemon[1], "getMoveType");
+    const baseDmgMock = vi.spyOn(enemyPokemon[0], "getBaseDamage");
+
+    game.move.select(Moves.FIRE_PLEDGE, 0, BattlerIndex.ENEMY_2);
+    game.move.select(Moves.GRASS_PLEDGE, 1, BattlerIndex.ENEMY);
+
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2]);
+    // advance to the end of PLAYER_2's move this turn
+    for (let i = 0; i < 2; i++) {
+      await game.phaseInterceptor.to("MoveEndPhase");
+    }
+    expect(playerPokemon[1].getMoveType).toHaveLastReturnedWith(PokemonType.FIRE);
+    expect(grassPledge.calculateBattlePower).toHaveLastReturnedWith(150);
+
+    const baseDmg = baseDmgMock.mock.results[baseDmgMock.mock.results.length - 1].value;
+    expect(enemyPokemon[0].getMaxHp() - enemyPokemon[0].hp).toBe(toDmgValue(baseDmg * 1.5));
+    expect(enemyPokemon[1].hp).toBe(enemyPokemon[1].getMaxHp()); // PLAYER should not have attacked
+    expect(game.scene.arena.getTagOnSide(ArenaTagType.FIRE_GRASS_PLEDGE, ArenaTagSide.ENEMY)).toBeDefined();
+
+    const enemyStartingHp = enemyPokemon.map(p => p.hp);
+    await game.toNextTurn();
+    enemyPokemon.forEach((p, i) => expect(enemyStartingHp[i] - p.hp).toBe(toDmgValue(p.getMaxHp() / 8)));
+  });
+
+  it("Fire Pledge - should combine with Water Pledge to form a 150-power Water-type attack that creates a 'rainbow'", async () => {
+    game.override.moveset([Moves.FIRE_PLEDGE, Moves.WATER_PLEDGE, Moves.FIERY_DANCE, Moves.SPLASH]);
+
+    await game.classicMode.startBattle([Species.BLASTOISE, Species.VENUSAUR]);
+
+    const firePledge = allMoves[Moves.FIRE_PLEDGE];
+    vi.spyOn(firePledge, "calculateBattlePower");
+
+    const playerPokemon = game.scene.getPlayerField();
+    const enemyPokemon = game.scene.getEnemyField();
+
+    vi.spyOn(playerPokemon[1], "getMoveType");
+
+    game.move.select(Moves.WATER_PLEDGE, 0, BattlerIndex.ENEMY_2);
+    game.move.select(Moves.FIRE_PLEDGE, 1, BattlerIndex.ENEMY);
+
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2]);
+    // advance to the end of PLAYER_2's move this turn
+    for (let i = 0; i < 2; i++) {
+      await game.phaseInterceptor.to("MoveEndPhase");
+    }
+    expect(playerPokemon[1].getMoveType).toHaveLastReturnedWith(PokemonType.WATER);
+    expect(firePledge.calculateBattlePower).toHaveLastReturnedWith(150);
+    expect(enemyPokemon[1].hp).toBe(enemyPokemon[1].getMaxHp()); // PLAYER should not have attacked
+    expect(game.scene.arena.getTagOnSide(ArenaTagType.WATER_FIRE_PLEDGE, ArenaTagSide.PLAYER)).toBeDefined();
+
+    await game.toNextTurn();
+
+    game.move.select(Moves.FIERY_DANCE, 0, BattlerIndex.ENEMY_2);
+    game.move.select(Moves.SPLASH, 1);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2]);
+    await game.phaseInterceptor.to("MoveEndPhase");
+
+    // Rainbow effect should increase Fiery Dance's chance of raising Sp. Atk to 100%
+    expect(playerPokemon[0].getStatStage(Stat.SPATK)).toBe(1);
+  });
+
+  it("Water Pledge - should combine with Grass Pledge to form a 150-power Grass-type attack that creates a 'swamp'", async () => {
+    await game.classicMode.startBattle([Species.BLASTOISE, Species.CHARIZARD]);
+
+    const waterPledge = allMoves[Moves.WATER_PLEDGE];
+    vi.spyOn(waterPledge, "calculateBattlePower");
+
+    const playerPokemon = game.scene.getPlayerField();
+    const enemyPokemon = game.scene.getEnemyField();
+    const enemyStartingSpd = enemyPokemon.map(p => p.getEffectiveStat(Stat.SPD));
+
+    vi.spyOn(playerPokemon[1], "getMoveType");
+
+    game.move.select(Moves.GRASS_PLEDGE, 0, BattlerIndex.ENEMY_2);
+    game.move.select(Moves.WATER_PLEDGE, 1, BattlerIndex.ENEMY);
+
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2]);
+    // advance to the end of PLAYER_2's move this turn
+    for (let i = 0; i < 2; i++) {
+      await game.phaseInterceptor.to("MoveEndPhase");
+    }
+
+    expect(playerPokemon[1].getMoveType).toHaveLastReturnedWith(PokemonType.GRASS);
+    expect(waterPledge.calculateBattlePower).toHaveLastReturnedWith(150);
+    expect(enemyPokemon[1].hp).toBe(enemyPokemon[1].getMaxHp());
+
+    expect(game.scene.arena.getTagOnSide(ArenaTagType.GRASS_WATER_PLEDGE, ArenaTagSide.ENEMY)).toBeDefined();
+    enemyPokemon.forEach((p, i) => expect(p.getEffectiveStat(Stat.SPD)).toBe(Math.floor(enemyStartingSpd[i] / 4)));
+  });
+
+  it("Pledge Moves - should alter turn order when used in combination", async () => {
+    await game.classicMode.startBattle([Species.CHARIZARD, Species.BLASTOISE]);
+
+    const enemyPokemon = game.scene.getEnemyField();
+
+    game.move.select(Moves.WATER_PLEDGE, 0, BattlerIndex.ENEMY);
+    game.move.select(Moves.FIRE_PLEDGE, 1, BattlerIndex.ENEMY_2);
+
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2, BattlerIndex.PLAYER_2]);
+    // PLAYER_2 should act with a combined move immediately after PLAYER as the second move in the turn
+    for (let i = 0; i < 2; i++) {
+      await game.phaseInterceptor.to("MoveEndPhase");
+    }
+    expect(enemyPokemon[0].hp).toBe(enemyPokemon[0].getMaxHp());
+    expect(enemyPokemon[1].hp).toBeLessThan(enemyPokemon[1].getMaxHp());
+  });
+
+  it("Pledge Moves - 'rainbow' effect should not stack with Serene Grace when applied to flinching moves", async () => {
+    game.override
+      .ability(Abilities.SERENE_GRACE)
+      .moveset([Moves.FIRE_PLEDGE, Moves.WATER_PLEDGE, Moves.IRON_HEAD, Moves.SPLASH]);
+
+    await game.classicMode.startBattle([Species.BLASTOISE, Species.CHARIZARD]);
+
+    const ironHeadFlinchAttr = allMoves[Moves.IRON_HEAD].getAttrs(FlinchAttr)[0];
+    vi.spyOn(ironHeadFlinchAttr, "getMoveChance");
+
+    game.move.select(Moves.WATER_PLEDGE, 0, BattlerIndex.ENEMY);
+    game.move.select(Moves.FIRE_PLEDGE, 1, BattlerIndex.ENEMY_2);
+
+    await game.phaseInterceptor.to("TurnEndPhase");
+
+    expect(game.scene.arena.getTagOnSide(ArenaTagType.WATER_FIRE_PLEDGE, ArenaTagSide.PLAYER)).toBeDefined();
+
+    game.move.select(Moves.IRON_HEAD, 0, BattlerIndex.ENEMY);
+    game.move.select(Moves.SPLASH, 1);
+
+    await game.phaseInterceptor.to("BerryPhase", false);
+
+    expect(ironHeadFlinchAttr.getMoveChance).toHaveLastReturnedWith(60);
+  });
+
+  it("Pledge Moves - should have no effect when the second ally's move is cancelled", async () => {
+    game.override.enemyMoveset([Moves.SPLASH, Moves.SPORE]);
+
+    await game.classicMode.startBattle([Species.BLASTOISE, Species.CHARIZARD]);
+
+    const enemyPokemon = game.scene.getEnemyField();
+
+    game.move.select(Moves.FIRE_PLEDGE, 0, BattlerIndex.ENEMY);
+    game.move.select(Moves.GRASS_PLEDGE, 1, BattlerIndex.ENEMY_2);
+
+    await game.forceEnemyMove(Moves.SPORE, BattlerIndex.PLAYER_2);
+    await game.forceEnemyMove(Moves.SPLASH);
+
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY_2]);
+
+    await game.phaseInterceptor.to("BerryPhase", false);
+
+    enemyPokemon.forEach(p => expect(p.hp).toBe(p.getMaxHp()));
+  });
+
+  it("Pledge Moves - should ignore redirection from another Pokemon's Storm Drain", async () => {
+    await game.classicMode.startBattle([Species.BLASTOISE, Species.CHARIZARD]);
+
+    const enemyPokemon = game.scene.getEnemyField();
+    vi.spyOn(enemyPokemon[1], "getAbility").mockReturnValue(allAbilities[Abilities.STORM_DRAIN]);
+
+    game.move.select(Moves.WATER_PLEDGE, 0, BattlerIndex.ENEMY);
+    game.move.select(Moves.SPLASH, 1);
+
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2]);
+
+    await game.phaseInterceptor.to("MoveEndPhase", false);
+
+    expect(enemyPokemon[0].hp).toBeLessThan(enemyPokemon[0].getMaxHp());
+    expect(enemyPokemon[1].getStatStage(Stat.SPATK)).toBe(0);
+  });
+
+  it("Pledge Moves - should not ignore redirection from another Pokemon's Follow Me", async () => {
+    game.override.enemyMoveset([Moves.FOLLOW_ME, Moves.SPLASH]);
+    await game.classicMode.startBattle([Species.BLASTOISE, Species.CHARIZARD]);
+
+    game.move.select(Moves.WATER_PLEDGE, 0, BattlerIndex.ENEMY);
+    game.move.select(Moves.SPLASH, 1);
+
+    await game.forceEnemyMove(Moves.SPLASH);
+    await game.forceEnemyMove(Moves.FOLLOW_ME);
+
+    await game.phaseInterceptor.to("BerryPhase", false);
+
+    const enemyPokemon = game.scene.getEnemyField();
+    expect(enemyPokemon[0].hp).toBe(enemyPokemon[0].getMaxHp());
+    expect(enemyPokemon[1].hp).toBeLessThan(enemyPokemon[1].getMaxHp());
+  });
+});
diff --git a/test/moves/pollen_puff.test.ts b/test/moves/pollen_puff.test.ts
new file mode 100644
index 00000000000..31d5950b47d
--- /dev/null
+++ b/test/moves/pollen_puff.test.ts
@@ -0,0 +1,64 @@
+import { BattlerIndex } from "#app/battle";
+import { Abilities } from "#enums/abilities";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import GameManager from "#test/testUtils/gameManager";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
+
+describe("Moves - Pollen Puff", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+    game.override
+      .moveset([Moves.POLLEN_PUFF])
+      .ability(Abilities.BALL_FETCH)
+      .battleStyle("single")
+      .disableCrits()
+      .enemySpecies(Species.MAGIKARP)
+      .enemyAbility(Abilities.BALL_FETCH)
+      .enemyMoveset(Moves.SPLASH);
+  });
+
+  it("should not heal more than once when the user has a source of multi-hit", async () => {
+    game.override.battleStyle("double").moveset([Moves.POLLEN_PUFF, Moves.ENDURE]).ability(Abilities.PARENTAL_BOND);
+    await game.classicMode.startBattle([Species.BULBASAUR, Species.OMANYTE]);
+
+    const [_, rightPokemon] = game.scene.getPlayerField();
+
+    rightPokemon.damageAndUpdate(rightPokemon.hp - 1);
+
+    game.move.select(Moves.POLLEN_PUFF, 0, BattlerIndex.PLAYER_2);
+    game.move.select(Moves.ENDURE, 1);
+
+    await game.phaseInterceptor.to("BerryPhase");
+
+    // Pollen Puff heals with a ratio of 0.5, as long as Pollen Puff triggers only once the pokemon will always be <= (0.5 * Max HP) + 1
+    expect(rightPokemon.hp).toBeLessThanOrEqual(0.5 * rightPokemon.getMaxHp() + 1);
+  });
+
+  it("should damage an enemy multiple times when the user has a source of multi-hit", async () => {
+    game.override.moveset([Moves.POLLEN_PUFF]).ability(Abilities.PARENTAL_BOND).enemyLevel(100);
+    await game.classicMode.startBattle([Species.MAGIKARP]);
+
+    const target = game.scene.getEnemyPokemon()!;
+
+    game.move.select(Moves.POLLEN_PUFF);
+
+    await game.phaseInterceptor.to("BerryPhase");
+
+    expect(target.battleData.hitCount).toBe(2);
+  });
+});
diff --git a/test/moves/powder.test.ts b/test/moves/powder.test.ts
new file mode 100644
index 00000000000..457beb60f91
--- /dev/null
+++ b/test/moves/powder.test.ts
@@ -0,0 +1,279 @@
+import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
+import Phaser from "phaser";
+import GameManager from "#test/testUtils/gameManager";
+import { Abilities } from "#enums/abilities";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import { BerryPhase } from "#app/phases/berry-phase";
+import { MoveResult, PokemonMove } from "#app/field/pokemon";
+import { PokemonType } from "#enums/pokemon-type";
+import { MoveEffectPhase } from "#app/phases/move-effect-phase";
+import { StatusEffect } from "#enums/status-effect";
+import { BattlerIndex } from "#app/battle";
+
+describe("Moves - Powder", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+    game.override.battleStyle("single");
+
+    game.override
+      .enemySpecies(Species.SNORLAX)
+      .enemyLevel(100)
+      .enemyMoveset(Moves.EMBER)
+      .enemyAbility(Abilities.INSOMNIA)
+      .startingLevel(100)
+      .moveset([Moves.POWDER, Moves.SPLASH, Moves.FIERY_DANCE, Moves.ROAR]);
+  });
+
+  it("should cancel the target's Fire-type move, damage the target, and still consume the target's PP", async () => {
+    // Cannot use enemy moveset override for this test, since it interferes with checking PP
+    game.override.enemyMoveset([]);
+    await game.classicMode.startBattle([Species.CHARIZARD]);
+
+    const enemyPokemon = game.scene.getEnemyPokemon()!;
+    enemyPokemon.moveset = [new PokemonMove(Moves.EMBER)];
+
+    game.move.select(Moves.POWDER);
+
+    await game.phaseInterceptor.to(BerryPhase, false);
+    expect(enemyPokemon.getLastXMoves()[0].result).toBe(MoveResult.FAIL);
+    expect(enemyPokemon.hp).toBe(Math.ceil((3 * enemyPokemon.getMaxHp()) / 4));
+    expect(enemyPokemon.moveset[0]!.ppUsed).toBe(1);
+
+    await game.toNextTurn();
+
+    game.move.select(Moves.SPLASH);
+
+    await game.phaseInterceptor.to(BerryPhase, false);
+    expect(enemyPokemon.getLastXMoves()[0].result).toBe(MoveResult.SUCCESS);
+    expect(enemyPokemon.hp).toBe(Math.ceil((3 * enemyPokemon.getMaxHp()) / 4));
+    expect(enemyPokemon.moveset[0]!.ppUsed).toBe(2);
+  });
+
+  it("should have no effect against Grass-type Pokemon", async () => {
+    game.override.enemySpecies(Species.AMOONGUSS);
+
+    await game.classicMode.startBattle([Species.CHARIZARD]);
+
+    const enemyPokemon = game.scene.getEnemyPokemon()!;
+
+    game.move.select(Moves.POWDER);
+
+    await game.phaseInterceptor.to(BerryPhase, false);
+    expect(enemyPokemon.getLastXMoves()[0].result).toBe(MoveResult.SUCCESS);
+    expect(enemyPokemon.hp).toBe(enemyPokemon.getMaxHp());
+  });
+
+  it("should have no effect against Pokemon with Overcoat", async () => {
+    game.override.enemyAbility(Abilities.OVERCOAT);
+
+    await game.classicMode.startBattle([Species.CHARIZARD]);
+
+    const enemyPokemon = game.scene.getEnemyPokemon()!;
+
+    game.move.select(Moves.POWDER);
+
+    await game.phaseInterceptor.to(BerryPhase, false);
+    expect(enemyPokemon.getLastXMoves()[0].result).toBe(MoveResult.SUCCESS);
+    expect(enemyPokemon.hp).toBe(enemyPokemon.getMaxHp());
+  });
+
+  it("should not damage the target if the target has Magic Guard", async () => {
+    game.override.enemyAbility(Abilities.MAGIC_GUARD);
+
+    await game.classicMode.startBattle([Species.CHARIZARD]);
+
+    const enemyPokemon = game.scene.getEnemyPokemon()!;
+
+    game.move.select(Moves.POWDER);
+
+    await game.phaseInterceptor.to(BerryPhase, false);
+    expect(enemyPokemon.getLastXMoves()[0].result).toBe(MoveResult.FAIL);
+    expect(enemyPokemon.hp).toBe(enemyPokemon.getMaxHp());
+  });
+
+  it("should not damage the target if Primordial Sea is active", async () => {
+    game.override.enemyAbility(Abilities.PRIMORDIAL_SEA);
+
+    await game.classicMode.startBattle([Species.CHARIZARD]);
+
+    const enemyPokemon = game.scene.getEnemyPokemon()!;
+
+    game.move.select(Moves.POWDER);
+
+    await game.phaseInterceptor.to(BerryPhase, false);
+    expect(enemyPokemon.getLastXMoves()[0].result).toBe(MoveResult.FAIL);
+    expect(enemyPokemon.hp).toBe(enemyPokemon.getMaxHp());
+  });
+
+  it("should not prevent the target from thawing out with Flame Wheel", async () => {
+    game.override.enemyMoveset(Array(4).fill(Moves.FLAME_WHEEL)).enemyStatusEffect(StatusEffect.FREEZE);
+
+    await game.classicMode.startBattle([Species.CHARIZARD]);
+
+    const enemyPokemon = game.scene.getEnemyPokemon()!;
+
+    game.move.select(Moves.POWDER);
+
+    await game.phaseInterceptor.to(BerryPhase, false);
+    expect(enemyPokemon.status?.effect).not.toBe(StatusEffect.FREEZE);
+    expect(enemyPokemon.getLastXMoves()[0].result).toBe(MoveResult.FAIL);
+    expect(enemyPokemon.hp).toBe(Math.ceil((3 * enemyPokemon.getMaxHp()) / 4));
+  });
+
+  it("should not allow a target with Protean to change to Fire type", async () => {
+    game.override.enemyAbility(Abilities.PROTEAN);
+
+    await game.classicMode.startBattle([Species.CHARIZARD]);
+
+    const enemyPokemon = game.scene.getEnemyPokemon()!;
+
+    game.move.select(Moves.POWDER);
+
+    await game.phaseInterceptor.to(BerryPhase, false);
+    expect(enemyPokemon.getLastXMoves()[0].result).toBe(MoveResult.FAIL);
+    expect(enemyPokemon.hp).toBeLessThan(enemyPokemon.getMaxHp());
+    expect(enemyPokemon.summonData.types).not.toBe(PokemonType.FIRE);
+  });
+
+  it("should cancel Fire-type moves generated by the target's Dancer ability", async () => {
+    game.override.battleStyle("double").enemySpecies(Species.BLASTOISE).enemyAbility(Abilities.DANCER);
+
+    await game.classicMode.startBattle([Species.CHARIZARD, Species.CHARIZARD]);
+
+    const playerPokemon = game.scene.getPlayerPokemon()!;
+    const enemyPokemon = game.scene.getEnemyPokemon()!;
+
+    // Turn 1: Roar away 1 opponent
+    game.move.select(Moves.ROAR, 0, BattlerIndex.ENEMY_2);
+    game.move.select(Moves.SPLASH, 1);
+    await game.toNextTurn();
+    await game.toNextTurn(); // Requires game.toNextTurn() twice due to double battle
+
+    // Turn 2: Enemy should activate Powder twice: From using Ember, and from copying Fiery Dance via Dancer
+    playerPokemon.hp = playerPokemon.getMaxHp();
+    game.move.select(Moves.FIERY_DANCE, 0, BattlerIndex.ENEMY);
+    game.move.select(Moves.POWDER, 1, BattlerIndex.ENEMY);
+
+    await game.phaseInterceptor.to(MoveEffectPhase);
+    const enemyStartingHp = enemyPokemon.hp;
+
+    await game.phaseInterceptor.to(BerryPhase, false);
+
+    // player should not take damage
+    expect(enemyPokemon.getLastXMoves()[0].result).toBe(MoveResult.FAIL);
+    expect(playerPokemon.hp).toBe(playerPokemon.getMaxHp());
+    // enemy should have taken damage from player's Fiery Dance + 2 Powder procs
+    expect(enemyPokemon.hp).toBe(
+      enemyStartingHp - playerPokemon.turnData.totalDamageDealt - 2 * Math.floor(enemyPokemon.getMaxHp() / 4),
+    );
+  });
+
+  it("should cancel Fiery Dance, then prevent it from triggering Dancer", async () => {
+    game.override.ability(Abilities.DANCER).enemyMoveset(Moves.FIERY_DANCE);
+
+    await game.classicMode.startBattle([Species.CHARIZARD]);
+
+    const playerPokemon = game.scene.getPlayerPokemon()!;
+    const enemyPokemon = game.scene.getEnemyPokemon()!;
+
+    game.move.select(Moves.POWDER);
+
+    await game.phaseInterceptor.to(BerryPhase, false);
+    expect(enemyPokemon.getLastXMoves()[0].result).toBe(MoveResult.FAIL);
+    expect(enemyPokemon.hp).toBe(Math.ceil((3 * enemyPokemon.getMaxHp()) / 4));
+    expect(playerPokemon.getLastXMoves()[0].move).toBe(Moves.POWDER);
+  });
+
+  it("should cancel Revelation Dance if it becomes a Fire-type move", async () => {
+    game.override.enemySpecies(Species.CHARIZARD).enemyMoveset(Array(4).fill(Moves.REVELATION_DANCE));
+
+    await game.classicMode.startBattle([Species.CHARIZARD]);
+
+    const enemyPokemon = game.scene.getEnemyPokemon()!;
+
+    game.move.select(Moves.POWDER);
+
+    await game.phaseInterceptor.to(BerryPhase, false);
+    expect(enemyPokemon.getLastXMoves()[0].result).toBe(MoveResult.FAIL);
+    expect(enemyPokemon.hp).toBe(Math.ceil((3 * enemyPokemon.getMaxHp()) / 4));
+  });
+
+  it("should cancel Shell Trap and damage the target, even if the move would fail", async () => {
+    game.override.enemyMoveset(Array(4).fill(Moves.SHELL_TRAP));
+
+    await game.classicMode.startBattle([Species.CHARIZARD]);
+
+    const enemyPokemon = game.scene.getEnemyPokemon()!;
+
+    game.move.select(Moves.POWDER);
+
+    await game.phaseInterceptor.to(BerryPhase, false);
+    expect(enemyPokemon.getLastXMoves()[0].result).toBe(MoveResult.FAIL);
+    expect(enemyPokemon.hp).toBe(Math.ceil((3 * enemyPokemon.getMaxHp()) / 4));
+  });
+
+  it("should cancel Grass Pledge if used after ally's Fire Pledge", async () => {
+    game.override.enemyMoveset([Moves.FIRE_PLEDGE, Moves.GRASS_PLEDGE]).battleStyle("double");
+
+    await game.classicMode.startBattle([Species.CHARIZARD, Species.CHARIZARD]);
+    const enemyPokemon = game.scene.getEnemyPokemon()!;
+
+    game.move.select(Moves.POWDER, 0, BattlerIndex.ENEMY);
+    game.move.select(Moves.SPLASH, 1);
+    await game.forceEnemyMove(Moves.GRASS_PLEDGE, BattlerIndex.PLAYER);
+    await game.forceEnemyMove(Moves.FIRE_PLEDGE, BattlerIndex.PLAYER);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY_2, BattlerIndex.ENEMY]);
+
+    await game.phaseInterceptor.to(BerryPhase, false);
+    expect(enemyPokemon.getLastXMoves()[0].result).toBe(MoveResult.FAIL);
+    expect(enemyPokemon.hp).toBe(Math.ceil((3 * enemyPokemon.getMaxHp()) / 4));
+  });
+
+  it("should cancel Fire Pledge if used before ally's Water Pledge", async () => {
+    game.override.enemyMoveset([Moves.FIRE_PLEDGE, Moves.WATER_PLEDGE]).battleStyle("double");
+
+    await game.classicMode.startBattle([Species.CHARIZARD, Species.CHARIZARD]);
+    const enemyPokemon = game.scene.getEnemyPokemon()!;
+
+    game.move.select(Moves.POWDER, 0, BattlerIndex.ENEMY);
+    game.move.select(Moves.SPLASH, 1);
+    await game.forceEnemyMove(Moves.FIRE_PLEDGE, BattlerIndex.PLAYER);
+    await game.forceEnemyMove(Moves.WATER_PLEDGE, BattlerIndex.PLAYER);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2]);
+
+    await game.phaseInterceptor.to(BerryPhase, false);
+    expect(enemyPokemon.getLastXMoves()[0].result).toBe(MoveResult.FAIL);
+    expect(enemyPokemon.hp).toBe(Math.ceil((3 * enemyPokemon.getMaxHp()) / 4));
+  });
+
+  it("should NOT cancel Fire Pledge if used after ally's Water Pledge", async () => {
+    game.override.enemyMoveset([Moves.FIRE_PLEDGE, Moves.WATER_PLEDGE]).battleStyle("double");
+
+    await game.classicMode.startBattle([Species.CHARIZARD, Species.CHARIZARD]);
+    const enemyPokemon = game.scene.getEnemyPokemon()!;
+
+    game.move.select(Moves.POWDER, 0, BattlerIndex.ENEMY);
+    game.move.select(Moves.SPLASH, 1);
+    await game.forceEnemyMove(Moves.FIRE_PLEDGE, BattlerIndex.PLAYER);
+    await game.forceEnemyMove(Moves.WATER_PLEDGE, BattlerIndex.PLAYER);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY_2, BattlerIndex.ENEMY]);
+
+    await game.phaseInterceptor.to(BerryPhase, false);
+    expect(enemyPokemon.getLastXMoves()[0].result).toBe(MoveResult.SUCCESS);
+    expect(enemyPokemon.hp).toBe(enemyPokemon.getMaxHp());
+  });
+});
diff --git a/src/test/moves/power_shift.test.ts b/test/moves/power_shift.test.ts
similarity index 89%
rename from src/test/moves/power_shift.test.ts
rename to test/moves/power_shift.test.ts
index e389f77bedf..0fee044f5ad 100644
--- a/src/test/moves/power_shift.test.ts
+++ b/test/moves/power_shift.test.ts
@@ -2,7 +2,7 @@ import { Moves } from "#app/enums/moves";
 import { Species } from "#app/enums/species";
 import { Stat } from "#app/enums/stat";
 import { Abilities } from "#enums/abilities";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
@@ -22,15 +22,15 @@ describe("Moves - Power Shift", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     game.override
-      .moveset([ Moves.POWER_SHIFT, Moves.BULK_UP ])
-      .battleType("single")
+      .moveset([Moves.POWER_SHIFT, Moves.BULK_UP])
+      .battleStyle("single")
       .ability(Abilities.BALL_FETCH)
       .enemyAbility(Abilities.BALL_FETCH)
       .enemyMoveset(Moves.SPLASH);
   });
 
   it("switches the user's raw Attack stat with its raw Defense stat", async () => {
-    await game.classicMode.startBattle([ Species.MAGIKARP ]);
+    await game.classicMode.startBattle([Species.MAGIKARP]);
 
     const playerPokemon = game.scene.getPlayerPokemon()!;
 
diff --git a/src/test/moves/power_split.test.ts b/test/moves/power_split.test.ts
similarity index 89%
rename from src/test/moves/power_split.test.ts
rename to test/moves/power_split.test.ts
index 914fa86e491..f15275fce9e 100644
--- a/src/test/moves/power_split.test.ts
+++ b/test/moves/power_split.test.ts
@@ -1,6 +1,6 @@
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 import Phaser from "phaser";
-import GameManager from "#app/test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import { Species } from "#enums/species";
 import { TurnEndPhase } from "#app/phases/turn-end-phase";
 import { Moves } from "#enums/moves";
@@ -24,19 +24,17 @@ describe("Moves - Power Split", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     game.override
-      .battleType("single")
+      .battleStyle("single")
       .enemyAbility(Abilities.NONE)
       .enemySpecies(Species.MEW)
       .enemyLevel(200)
-      .moveset([ Moves.POWER_SPLIT ])
+      .moveset([Moves.POWER_SPLIT])
       .ability(Abilities.NONE);
   });
 
   it("should average the user's ATK and SPATK stats with those of the target", async () => {
     game.override.enemyMoveset(Moves.SPLASH);
-    await game.startBattle([
-      Species.INDEEDEE
-    ]);
+    await game.startBattle([Species.INDEEDEE]);
 
     const player = game.scene.getPlayerPokemon()!;
     const enemy = game.scene.getEnemyPokemon()!;
@@ -55,10 +53,8 @@ describe("Moves - Power Split", () => {
   }, 20000);
 
   it("should be idempotent", async () => {
-    game.override.enemyMoveset([ Moves.POWER_SPLIT ]);
-    await game.startBattle([
-      Species.INDEEDEE
-    ]);
+    game.override.enemyMoveset([Moves.POWER_SPLIT]);
+    await game.startBattle([Species.INDEEDEE]);
 
     const player = game.scene.getPlayerPokemon()!;
     const enemy = game.scene.getEnemyPokemon()!;
diff --git a/src/test/moves/power_swap.test.ts b/test/moves/power_swap.test.ts
similarity index 90%
rename from src/test/moves/power_swap.test.ts
rename to test/moves/power_swap.test.ts
index e9a4b569c92..5f6aa022a51 100644
--- a/src/test/moves/power_swap.test.ts
+++ b/test/moves/power_swap.test.ts
@@ -1,6 +1,6 @@
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 import Phaser from "phaser";
-import GameManager from "#app/test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import { Species } from "#enums/species";
 import { TurnEndPhase } from "#app/phases/turn-end-phase";
 import { Moves } from "#enums/moves";
@@ -24,19 +24,17 @@ describe("Moves - Power Swap", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     game.override
-      .battleType("single")
+      .battleStyle("single")
       .enemyAbility(Abilities.BALL_FETCH)
       .enemyMoveset(Moves.SPLASH)
       .enemySpecies(Species.INDEEDEE)
       .enemyLevel(200)
-      .moveset([ Moves.POWER_SWAP ])
+      .moveset([Moves.POWER_SWAP])
       .ability(Abilities.NONE);
   });
 
   it("should swap the user's ATK and SPATK stat stages with the target's", async () => {
-    await game.classicMode.startBattle([
-      Species.INDEEDEE
-    ]);
+    await game.classicMode.startBattle([Species.INDEEDEE]);
 
     const player = game.scene.getPlayerPokemon()!;
     const enemy = game.scene.getEnemyPokemon()!;
diff --git a/src/test/moves/power_trick.test.ts b/test/moves/power_trick.test.ts
similarity index 85%
rename from src/test/moves/power_trick.test.ts
rename to test/moves/power_trick.test.ts
index a064a43dec4..181eeca81bc 100644
--- a/src/test/moves/power_trick.test.ts
+++ b/test/moves/power_trick.test.ts
@@ -1,6 +1,6 @@
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 import Phaser from "phaser";
-import GameManager from "#app/test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import { Moves } from "#enums/moves";
 import { Stat } from "#enums/stat";
 import { Species } from "#enums/species";
@@ -25,17 +25,17 @@ describe("Moves - Power Trick", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     game.override
-      .battleType("single")
+      .battleStyle("single")
       .enemyAbility(Abilities.BALL_FETCH)
       .enemyMoveset(Moves.SPLASH)
       .enemySpecies(Species.MEW)
       .enemyLevel(200)
-      .moveset([ Moves.POWER_TRICK ])
+      .moveset([Moves.POWER_TRICK])
       .ability(Abilities.BALL_FETCH);
   });
 
   it("swaps the user's ATK and DEF stats", async () => {
-    await game.classicMode.startBattle([ Species.SHUCKLE ]);
+    await game.classicMode.startBattle([Species.SHUCKLE]);
 
     const player = game.scene.getPlayerPokemon()!;
     const baseATK = player.getStat(Stat.ATK, false);
@@ -51,7 +51,7 @@ describe("Moves - Power Trick", () => {
   });
 
   it("resets initial ATK and DEF stat swap when used consecutively", async () => {
-    await game.classicMode.startBattle([ Species.SHUCKLE ]);
+    await game.classicMode.startBattle([Species.SHUCKLE]);
 
     const player = game.scene.getPlayerPokemon()!;
     const baseATK = player.getStat(Stat.ATK, false);
@@ -71,8 +71,8 @@ describe("Moves - Power Trick", () => {
   });
 
   it("should pass effect when using BATON_PASS", async () => {
-    await game.classicMode.startBattle([ Species.SHUCKLE, Species.SHUCKLE ]);
-    await game.override.moveset([ Moves.POWER_TRICK, Moves.BATON_PASS ]);
+    await game.classicMode.startBattle([Species.SHUCKLE, Species.SHUCKLE]);
+    await game.override.moveset([Moves.POWER_TRICK, Moves.BATON_PASS]);
 
     const player = game.scene.getPlayerPokemon()!;
     player.addTag(BattlerTagType.POWER_TRICK);
@@ -92,8 +92,8 @@ describe("Moves - Power Trick", () => {
   });
 
   it("should remove effect after using Transform", async () => {
-    await game.classicMode.startBattle([ Species.SHUCKLE, Species.SHUCKLE ]);
-    await game.override.moveset([ Moves.POWER_TRICK, Moves.TRANSFORM ]);
+    await game.classicMode.startBattle([Species.SHUCKLE, Species.SHUCKLE]);
+    await game.override.moveset([Moves.POWER_TRICK, Moves.TRANSFORM]);
 
     const player = game.scene.getPlayerPokemon()!;
     player.addTag(BattlerTagType.POWER_TRICK);
diff --git a/test/moves/protect.test.ts b/test/moves/protect.test.ts
new file mode 100644
index 00000000000..183430f8654
--- /dev/null
+++ b/test/moves/protect.test.ts
@@ -0,0 +1,117 @@
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, test, vi } from "vitest";
+import GameManager from "#test/testUtils/gameManager";
+import { Species } from "#enums/species";
+import { Abilities } from "#enums/abilities";
+import { Moves } from "#enums/moves";
+import { Stat } from "#enums/stat";
+import { allMoves } from "#app/data/moves/move";
+import { ArenaTagSide, ArenaTrapTag } from "#app/data/arena-tag";
+import { BattlerIndex } from "#app/battle";
+import { MoveResult } from "#app/field/pokemon";
+
+describe("Moves - Protect", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+
+    game.override.battleStyle("single");
+
+    game.override.moveset([Moves.PROTECT]);
+    game.override.enemySpecies(Species.SNORLAX);
+
+    game.override.enemyAbility(Abilities.INSOMNIA);
+    game.override.enemyMoveset([Moves.TACKLE]);
+
+    game.override.startingLevel(100);
+    game.override.enemyLevel(100);
+  });
+
+  test("should protect the user from attacks", async () => {
+    await game.classicMode.startBattle([Species.CHARIZARD]);
+
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+
+    game.move.select(Moves.PROTECT);
+
+    await game.phaseInterceptor.to("BerryPhase", false);
+
+    expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp());
+  });
+
+  test("should prevent secondary effects from the opponent's attack", async () => {
+    game.override.enemyMoveset([Moves.CEASELESS_EDGE]);
+    vi.spyOn(allMoves[Moves.CEASELESS_EDGE], "accuracy", "get").mockReturnValue(100);
+
+    await game.classicMode.startBattle([Species.CHARIZARD]);
+
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+
+    game.move.select(Moves.PROTECT);
+
+    await game.phaseInterceptor.to("BerryPhase", false);
+
+    expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp());
+    expect(game.scene.arena.getTagOnSide(ArenaTrapTag, ArenaTagSide.ENEMY)).toBeUndefined();
+  });
+
+  test("should protect the user from status moves", async () => {
+    game.override.enemyMoveset([Moves.CHARM]);
+
+    await game.classicMode.startBattle([Species.CHARIZARD]);
+
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+
+    game.move.select(Moves.PROTECT);
+
+    await game.phaseInterceptor.to("BerryPhase", false);
+
+    expect(leadPokemon.getStatStage(Stat.ATK)).toBe(0);
+  });
+
+  test("should stop subsequent hits of a multi-hit move", async () => {
+    game.override.enemyMoveset([Moves.TACHYON_CUTTER]);
+
+    await game.classicMode.startBattle([Species.CHARIZARD]);
+
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+    const enemyPokemon = game.scene.getEnemyPokemon()!;
+
+    game.move.select(Moves.PROTECT);
+
+    await game.phaseInterceptor.to("BerryPhase", false);
+
+    expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp());
+    expect(enemyPokemon.turnData.hitCount).toBe(1);
+  });
+
+  test("should fail if the user is the last to move in the turn", async () => {
+    game.override.enemyMoveset([Moves.PROTECT]);
+
+    await game.classicMode.startBattle([Species.CHARIZARD]);
+
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+    const enemyPokemon = game.scene.getEnemyPokemon()!;
+
+    game.move.select(Moves.PROTECT);
+
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
+
+    await game.phaseInterceptor.to("BerryPhase", false);
+
+    expect(enemyPokemon.getLastXMoves()[0].result).toBe(MoveResult.SUCCESS);
+    expect(leadPokemon.getLastXMoves()[0].result).toBe(MoveResult.FAIL);
+  });
+});
diff --git a/src/test/moves/psycho_shift.test.ts b/test/moves/psycho_shift.test.ts
similarity index 88%
rename from src/test/moves/psycho_shift.test.ts
rename to test/moves/psycho_shift.test.ts
index 448a8c99ef0..678742906c7 100644
--- a/src/test/moves/psycho_shift.test.ts
+++ b/test/moves/psycho_shift.test.ts
@@ -2,7 +2,7 @@ import { StatusEffect } from "#app/enums/status-effect";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
@@ -23,10 +23,10 @@ describe("Moves - Psycho Shift", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     game.override
-      .moveset([ Moves.PSYCHO_SHIFT ])
+      .moveset([Moves.PSYCHO_SHIFT])
       .ability(Abilities.BALL_FETCH)
       .statusEffect(StatusEffect.POISON)
-      .battleType("single")
+      .battleStyle("single")
       .disableCrits()
       .enemySpecies(Species.MAGIKARP)
       .enemyLevel(20)
@@ -35,7 +35,7 @@ describe("Moves - Psycho Shift", () => {
   });
 
   it("If Psycho Shift is used on a Pokémon with Synchronize, the user of Psycho Shift will already be afflicted with a status condition when Synchronize activates", async () => {
-    await game.classicMode.startBattle([ Species.FEEBAS ]);
+    await game.classicMode.startBattle([Species.FEEBAS]);
 
     const playerPokemon = game.scene.getPlayerPokemon();
     const enemyPokemon = game.scene.getEnemyPokemon();
diff --git a/test/moves/purify.test.ts b/test/moves/purify.test.ts
new file mode 100644
index 00000000000..191539d8cec
--- /dev/null
+++ b/test/moves/purify.test.ts
@@ -0,0 +1,70 @@
+import { BattlerIndex } from "#app/battle";
+import { Status } from "#app/data/status-effect";
+import type { EnemyPokemon, PlayerPokemon } from "#app/field/pokemon";
+import { MoveEndPhase } from "#app/phases/move-end-phase";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import { StatusEffect } from "#enums/status-effect";
+import GameManager from "#test/testUtils/gameManager";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest";
+
+describe("Moves - Purify", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+    game.override.battleStyle("single");
+
+    game.override.starterSpecies(Species.PYUKUMUKU);
+    game.override.startingLevel(10);
+    game.override.moveset([Moves.PURIFY, Moves.SIZZLY_SLIDE]);
+
+    game.override.enemySpecies(Species.MAGIKARP);
+    game.override.enemyLevel(10);
+    game.override.enemyMoveset([Moves.SPLASH, Moves.NONE, Moves.NONE, Moves.NONE]);
+  });
+
+  test("Purify heals opponent status effect and restores user hp", async () => {
+    await game.startBattle();
+
+    const enemyPokemon: EnemyPokemon = game.scene.getEnemyPokemon()!;
+    const playerPokemon: PlayerPokemon = game.scene.getPlayerPokemon()!;
+
+    playerPokemon.hp = playerPokemon.getMaxHp() - 1;
+    enemyPokemon.status = new Status(StatusEffect.BURN);
+
+    game.move.select(Moves.PURIFY);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
+    await game.phaseInterceptor.to(MoveEndPhase);
+
+    expect(enemyPokemon.status).toBeNull();
+    expect(playerPokemon.isFullHp()).toBe(true);
+  });
+
+  test("Purify does not heal if opponent doesnt have any status effect", async () => {
+    await game.startBattle();
+
+    const playerPokemon: PlayerPokemon = game.scene.getPlayerPokemon()!;
+
+    playerPokemon.hp = playerPokemon.getMaxHp() - 1;
+    const playerInitialHp = playerPokemon.hp;
+
+    game.move.select(Moves.PURIFY);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
+    await game.phaseInterceptor.to(MoveEndPhase);
+
+    expect(playerPokemon.hp).toBe(playerInitialHp);
+  });
+});
diff --git a/test/moves/quash.test.ts b/test/moves/quash.test.ts
new file mode 100644
index 00000000000..5bf8271320b
--- /dev/null
+++ b/test/moves/quash.test.ts
@@ -0,0 +1,97 @@
+import { Species } from "#enums/species";
+import { Moves } from "#enums/moves";
+import { Abilities } from "#app/enums/abilities";
+import { BattlerIndex } from "#app/battle";
+import { WeatherType } from "#enums/weather-type";
+import { MoveResult } from "#app/field/pokemon";
+import GameManager from "#test/testUtils/gameManager";
+import Phaser from "phaser";
+import { describe, beforeAll, afterEach, beforeEach, it, expect } from "vitest";
+
+describe("Moves - Quash", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+    game.override
+      .battleStyle("double")
+      .enemyLevel(1)
+      .enemySpecies(Species.SLOWPOKE)
+      .enemyAbility(Abilities.BALL_FETCH)
+      .enemyMoveset([Moves.RAIN_DANCE, Moves.SPLASH])
+      .ability(Abilities.BALL_FETCH)
+      .moveset([Moves.QUASH, Moves.SUNNY_DAY, Moves.RAIN_DANCE, Moves.SPLASH]);
+  });
+
+  it("makes the target move last in a turn, ignoring priority", async () => {
+    await game.classicMode.startBattle([Species.ACCELGOR, Species.RATTATA]);
+
+    game.move.select(Moves.QUASH, 0, BattlerIndex.PLAYER_2);
+    game.move.select(Moves.SUNNY_DAY, 1);
+    await game.forceEnemyMove(Moves.SPLASH);
+    await game.forceEnemyMove(Moves.RAIN_DANCE);
+
+    await game.phaseInterceptor.to("TurnEndPhase", false);
+    // will be sunny if player_2 moved last because of quash, rainy otherwise
+    expect(game.scene.arena.weather?.weatherType).toBe(WeatherType.SUNNY);
+  });
+
+  it("fails if the target has already moved", async () => {
+    await game.classicMode.startBattle([Species.ACCELGOR, Species.RATTATA]);
+    game.move.select(Moves.SPLASH, 0);
+    game.move.select(Moves.QUASH, 1, BattlerIndex.PLAYER);
+
+    await game.phaseInterceptor.to("MoveEndPhase");
+    await game.phaseInterceptor.to("MoveEndPhase");
+
+    expect(game.scene.getPlayerField()[1].getLastXMoves(1)[0].result).toBe(MoveResult.FAIL);
+  });
+
+  it("makes multiple quashed targets move in speed order at the end of the turn", async () => {
+    game.override.enemySpecies(Species.NINJASK).enemyLevel(100);
+
+    await game.classicMode.startBattle([Species.ACCELGOR, Species.RATTATA]);
+
+    // both users are quashed - rattata is slower so sun should be up at end of turn
+    game.move.select(Moves.RAIN_DANCE, 0);
+    game.move.select(Moves.SUNNY_DAY, 1);
+
+    await game.forceEnemyMove(Moves.QUASH, BattlerIndex.PLAYER);
+    await game.forceEnemyMove(Moves.QUASH, BattlerIndex.PLAYER_2);
+
+    await game.phaseInterceptor.to("TurnEndPhase", false);
+    expect(game.scene.arena.weather?.weatherType).toBe(WeatherType.SUNNY);
+  });
+
+  it("respects trick room", async () => {
+    game.override.enemyMoveset([Moves.RAIN_DANCE, Moves.SPLASH, Moves.TRICK_ROOM]);
+
+    await game.classicMode.startBattle([Species.ACCELGOR, Species.RATTATA]);
+    game.move.select(Moves.SPLASH, 0);
+    game.move.select(Moves.SPLASH, 1);
+
+    await game.forceEnemyMove(Moves.TRICK_ROOM);
+    await game.forceEnemyMove(Moves.SPLASH);
+    await game.phaseInterceptor.to("TurnInitPhase");
+    // both users are quashed - accelgor should move last w/ TR so rain should be up at end of turn
+    game.move.select(Moves.RAIN_DANCE, 0);
+    game.move.select(Moves.SUNNY_DAY, 1);
+
+    await game.forceEnemyMove(Moves.QUASH, BattlerIndex.PLAYER);
+    await game.forceEnemyMove(Moves.QUASH, BattlerIndex.PLAYER_2);
+
+    await game.phaseInterceptor.to("TurnEndPhase", false);
+    expect(game.scene.arena.weather?.weatherType).toBe(WeatherType.RAIN);
+  });
+});
diff --git a/test/moves/quick_guard.test.ts b/test/moves/quick_guard.test.ts
new file mode 100644
index 00000000000..d9970ce64fa
--- /dev/null
+++ b/test/moves/quick_guard.test.ts
@@ -0,0 +1,104 @@
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest";
+import GameManager from "#test/testUtils/gameManager";
+import { Species } from "#enums/species";
+import { Abilities } from "#enums/abilities";
+import { Moves } from "#enums/moves";
+import { Stat } from "#enums/stat";
+import { BattlerIndex } from "#app/battle";
+import { MoveResult } from "#app/field/pokemon";
+
+describe("Moves - Quick Guard", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+
+    game.override.battleStyle("double");
+
+    game.override.moveset([Moves.QUICK_GUARD, Moves.SPLASH, Moves.FOLLOW_ME]);
+
+    game.override.enemySpecies(Species.SNORLAX);
+    game.override.enemyMoveset([Moves.QUICK_ATTACK]);
+    game.override.enemyAbility(Abilities.INSOMNIA);
+
+    game.override.startingLevel(100);
+    game.override.enemyLevel(100);
+  });
+
+  test("should protect the user and allies from priority moves", async () => {
+    await game.classicMode.startBattle([Species.CHARIZARD, Species.BLASTOISE]);
+
+    const playerPokemon = game.scene.getPlayerField();
+
+    game.move.select(Moves.QUICK_GUARD);
+    game.move.select(Moves.SPLASH, 1);
+
+    await game.phaseInterceptor.to("BerryPhase", false);
+
+    playerPokemon.forEach(p => expect(p.hp).toBe(p.getMaxHp()));
+  });
+
+  test("should protect the user and allies from Prankster-boosted moves", async () => {
+    game.override.enemyAbility(Abilities.PRANKSTER);
+    game.override.enemyMoveset([Moves.GROWL]);
+
+    await game.classicMode.startBattle([Species.CHARIZARD, Species.BLASTOISE]);
+
+    const playerPokemon = game.scene.getPlayerField();
+
+    game.move.select(Moves.QUICK_GUARD);
+    game.move.select(Moves.SPLASH, 1);
+
+    await game.phaseInterceptor.to("BerryPhase", false);
+
+    playerPokemon.forEach(p => expect(p.getStatStage(Stat.ATK)).toBe(0));
+  });
+
+  test("should stop subsequent hits of a multi-hit priority move", async () => {
+    game.override.enemyMoveset([Moves.WATER_SHURIKEN]);
+
+    await game.classicMode.startBattle([Species.CHARIZARD, Species.BLASTOISE]);
+
+    const playerPokemon = game.scene.getPlayerField();
+    const enemyPokemon = game.scene.getEnemyField();
+
+    game.move.select(Moves.QUICK_GUARD);
+    game.move.select(Moves.FOLLOW_ME, 1);
+
+    await game.phaseInterceptor.to("BerryPhase", false);
+
+    playerPokemon.forEach(p => expect(p.hp).toBe(p.getMaxHp()));
+    enemyPokemon.forEach(p => expect(p.turnData.hitCount).toBe(1));
+  });
+
+  test("should fail if the user is the last to move in the turn", async () => {
+    game.override.battleStyle("single");
+    game.override.enemyMoveset([Moves.QUICK_GUARD]);
+
+    await game.classicMode.startBattle([Species.CHARIZARD]);
+
+    const playerPokemon = game.scene.getPlayerPokemon()!;
+    const enemyPokemon = game.scene.getEnemyPokemon()!;
+
+    game.move.select(Moves.QUICK_GUARD);
+
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
+
+    await game.phaseInterceptor.to("BerryPhase", false);
+
+    expect(enemyPokemon.getLastXMoves()[0].result).toBe(MoveResult.SUCCESS);
+    expect(playerPokemon.getLastXMoves()[0].result).toBe(MoveResult.FAIL);
+  });
+});
diff --git a/test/moves/rage_fist.test.ts b/test/moves/rage_fist.test.ts
new file mode 100644
index 00000000000..f215c5955c6
--- /dev/null
+++ b/test/moves/rage_fist.test.ts
@@ -0,0 +1,202 @@
+import { BattlerIndex } from "#app/battle";
+import { Abilities } from "#enums/abilities";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import { allMoves } from "#app/data/moves/move";
+import type Move from "#app/data/moves/move";
+import GameManager from "#test/testUtils/gameManager";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
+import { BattleType } from "#enums/battle-type";
+
+describe("Moves - Rage Fist", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+  let move: Move;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    move = allMoves[Moves.RAGE_FIST];
+    game = new GameManager(phaserGame);
+    game.override
+      .battleStyle("single")
+      .moveset([Moves.RAGE_FIST, Moves.SPLASH, Moves.SUBSTITUTE, Moves.TIDY_UP])
+      .startingLevel(100)
+      .enemyLevel(1)
+      .enemySpecies(Species.MAGIKARP)
+      .enemyAbility(Abilities.BALL_FETCH)
+      .enemyMoveset(Moves.DOUBLE_KICK);
+
+    vi.spyOn(move, "calculateBattlePower");
+  });
+
+  it("should gain power per hit taken", async () => {
+    await game.classicMode.startBattle([Species.FEEBAS]);
+
+    game.move.select(Moves.RAGE_FIST);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
+    await game.phaseInterceptor.to("TurnEndPhase");
+
+    expect(move.calculateBattlePower).toHaveLastReturnedWith(150);
+  });
+
+  it("caps at 6 hits taken", async () => {
+    await game.classicMode.startBattle([Species.FEEBAS]);
+
+    // spam splash against magikarp hitting us 2 times per turn
+    game.move.select(Moves.SPLASH);
+    await game.toNextTurn();
+    game.move.select(Moves.SPLASH);
+    await game.toNextTurn();
+    game.move.select(Moves.SPLASH);
+    await game.toNextTurn();
+
+    game.move.select(Moves.RAGE_FIST);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
+    await game.phaseInterceptor.to("TurnEndPhase");
+
+    // hit 8 times, but nothing else
+    expect(game.scene.getPlayerPokemon()?.battleData.hitCount).toBe(8);
+    expect(move.calculateBattlePower).toHaveLastReturnedWith(350);
+  });
+
+  it("should not count substitute hits or confusion damage", async () => {
+    game.override.enemySpecies(Species.SHUCKLE).enemyMoveset([Moves.CONFUSE_RAY, Moves.DOUBLE_KICK]);
+
+    await game.classicMode.startBattle([Species.REGIROCK]);
+
+    game.move.select(Moves.SUBSTITUTE);
+    await game.forceEnemyMove(Moves.DOUBLE_KICK);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
+    await game.toNextTurn();
+
+    // no increase due to substitute
+    expect(game.scene.getPlayerPokemon()?.battleData.hitCount).toBe(0);
+
+    // remove substitute and get confused
+    game.move.select(Moves.TIDY_UP);
+    await game.forceEnemyMove(Moves.CONFUSE_RAY);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
+    await game.toNextTurn();
+
+    game.move.select(Moves.RAGE_FIST);
+    await game.forceEnemyMove(Moves.CONFUSE_RAY);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
+    await game.move.forceConfusionActivation(true);
+    await game.toNextTurn();
+
+    // didn't go up from hitting ourself
+    expect(game.scene.getPlayerPokemon()?.battleData.hitCount).toBe(0);
+  });
+
+  it("should maintain hits recieved between wild waves", async () => {
+    await game.classicMode.startBattle([Species.FEEBAS]);
+
+    game.move.select(Moves.RAGE_FIST);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
+    await game.toNextWave();
+
+    expect(game.scene.getPlayerPokemon()?.battleData.hitCount).toBe(2);
+
+    game.move.select(Moves.RAGE_FIST);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
+    await game.phaseInterceptor.to("TurnEndPhase");
+
+    expect(game.scene.getPlayerPokemon()?.battleData.hitCount).toBe(4);
+    expect(move.calculateBattlePower).toHaveLastReturnedWith(250);
+  });
+
+  it("should reset hits recieved before trainer battles", async () => {
+    await game.classicMode.startBattle([Species.IRON_HANDS]);
+
+    const ironHands = game.scene.getPlayerPokemon()!;
+    expect(ironHands).toBeDefined();
+
+    // beat up a magikarp
+    game.move.select(Moves.RAGE_FIST);
+    await game.forceEnemyMove(Moves.DOUBLE_KICK);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
+    await game.phaseInterceptor.to("TurnEndPhase");
+
+    expect(game.isVictory()).toBe(true);
+    expect(ironHands.battleData.hitCount).toBe(2);
+    expect(move.calculateBattlePower).toHaveLastReturnedWith(150);
+
+    game.override.battleType(BattleType.TRAINER);
+    await game.toNextWave();
+
+    expect(ironHands.battleData.hitCount).toBe(0);
+  });
+
+  it("should reset hits recieved before new biome", async () => {
+    game.override.enemySpecies(Species.MAGIKARP).startingWave(10);
+
+    await game.classicMode.startBattle([Species.MAGIKARP]);
+
+    game.move.select(Moves.RAGE_FIST);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
+    await game.toNextTurn();
+
+    game.move.select(Moves.RAGE_FIST);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
+    await game.phaseInterceptor.to("BerryPhase", false);
+
+    expect(move.calculateBattlePower).toHaveLastReturnedWith(150);
+  });
+
+  it("should not reset if switched out or on reload", async () => {
+    game.override.enemyMoveset(Moves.TACKLE);
+
+    const getPartyHitCount = () =>
+      game.scene
+        .getPlayerParty()
+        .filter(p => !!p)
+        .map(m => m.battleData.hitCount);
+
+    await game.classicMode.startBattle([Species.CHARIZARD, Species.BLASTOISE]);
+
+    // Charizard hit
+    game.move.select(Moves.SPLASH);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
+    await game.toNextTurn();
+    expect(getPartyHitCount()).toEqual([1, 0]);
+
+    // blastoise switched in & hit
+    game.doSwitchPokemon(1);
+    await game.toNextTurn();
+    expect(getPartyHitCount()).toEqual([1, 1]);
+
+    // charizard switched in & hit
+    game.doSwitchPokemon(1);
+    await game.toNextTurn();
+    expect(getPartyHitCount()).toEqual([2, 1]);
+
+    // Charizard rage fist
+    game.move.select(Moves.RAGE_FIST);
+    await game.phaseInterceptor.to("MoveEndPhase");
+
+    const charizard = game.scene.getPlayerPokemon()!;
+    expect(charizard).toBeDefined();
+    expect(charizard.species.speciesId).toBe(Species.CHARIZARD);
+    expect(move.calculateBattlePower).toHaveLastReturnedWith(150);
+
+    // go to new wave, reload game and beat up another poor sap
+    await game.toNextWave();
+
+    await game.reload.reloadSession();
+
+    // outsped and oneshot means power rmains same as prior
+    game.move.select(Moves.RAGE_FIST);
+    await game.phaseInterceptor.to("MoveEndPhase");
+    expect(move.calculateBattlePower).toHaveLastReturnedWith(150);
+  });
+});
diff --git a/test/moves/rage_powder.test.ts b/test/moves/rage_powder.test.ts
new file mode 100644
index 00000000000..284b558f842
--- /dev/null
+++ b/test/moves/rage_powder.test.ts
@@ -0,0 +1,73 @@
+import { BattlerIndex } from "#app/battle";
+import { Abilities } from "#enums/abilities";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import GameManager from "#test/testUtils/gameManager";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest";
+
+describe("Moves - Rage Powder", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+    game.override.battleStyle("double");
+    game.override.enemySpecies(Species.SNORLAX);
+    game.override.startingLevel(100);
+    game.override.enemyLevel(100);
+    game.override.moveset([Moves.FOLLOW_ME, Moves.RAGE_POWDER, Moves.SPOTLIGHT, Moves.QUICK_ATTACK]);
+    game.override.enemyMoveset([Moves.RAGE_POWDER, Moves.TACKLE, Moves.SPLASH]);
+  });
+
+  test("move effect should be bypassed by Grass type", async () => {
+    await game.classicMode.startBattle([Species.AMOONGUSS, Species.VENUSAUR]);
+
+    const enemyPokemon = game.scene.getEnemyField();
+
+    game.move.select(Moves.QUICK_ATTACK, 0, BattlerIndex.ENEMY);
+    game.move.select(Moves.QUICK_ATTACK, 1, BattlerIndex.ENEMY_2);
+
+    await game.forceEnemyMove(Moves.RAGE_POWDER);
+    await game.forceEnemyMove(Moves.SPLASH);
+
+    await game.phaseInterceptor.to("BerryPhase", false);
+
+    // If redirection was bypassed, both enemies should be damaged
+    expect(enemyPokemon[0].hp).toBeLessThan(enemyPokemon[0].getMaxHp());
+    expect(enemyPokemon[1].hp).toBeLessThan(enemyPokemon[0].getMaxHp());
+  });
+
+  test("move effect should be bypassed by Overcoat", async () => {
+    game.override.ability(Abilities.OVERCOAT);
+
+    // Test with two non-Grass type player Pokemon
+    await game.classicMode.startBattle([Species.BLASTOISE, Species.CHARIZARD]);
+
+    const enemyPokemon = game.scene.getEnemyField();
+
+    const enemyStartingHp = enemyPokemon.map(p => p.hp);
+
+    game.move.select(Moves.QUICK_ATTACK, 0, BattlerIndex.ENEMY);
+    game.move.select(Moves.QUICK_ATTACK, 1, BattlerIndex.ENEMY_2);
+
+    await game.forceEnemyMove(Moves.RAGE_POWDER);
+    await game.forceEnemyMove(Moves.SPLASH);
+
+    await game.phaseInterceptor.to("BerryPhase", false);
+
+    // If redirection was bypassed, both enemies should be damaged
+    expect(enemyPokemon[0].hp).toBeLessThan(enemyStartingHp[0]);
+    expect(enemyPokemon[1].hp).toBeLessThan(enemyStartingHp[1]);
+  });
+});
diff --git a/src/test/moves/reflect.test.ts b/test/moves/reflect.test.ts
similarity index 54%
rename from src/test/moves/reflect.test.ts
rename to test/moves/reflect.test.ts
index aa9f2095c89..b8338cea8cf 100644
--- a/src/test/moves/reflect.test.ts
+++ b/test/moves/reflect.test.ts
@@ -1,15 +1,15 @@
 import type BattleScene from "#app/battle-scene";
 import { ArenaTagSide } from "#app/data/arena-tag";
-import type Move from "#app/data/move";
-import { allMoves } from "#app/data/move";
+import type Move from "#app/data/moves/move";
+import { allMoves, CritOnlyAttr } from "#app/data/moves/move";
 import { Abilities } from "#app/enums/abilities";
 import { ArenaTagType } from "#app/enums/arena-tag-type";
 import type Pokemon from "#app/field/pokemon";
 import { TurnEndPhase } from "#app/phases/turn-end-phase";
-import { NumberHolder } from "#app/utils";
+import { NumberHolder } from "#app/utils/common";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
@@ -34,54 +34,99 @@ describe("Moves - Reflect", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     globalScene = game.scene;
-    game.override.battleType("single");
+    game.override.battleStyle("single");
     game.override.ability(Abilities.NONE);
-    game.override.moveset([ Moves.ABSORB, Moves.ROCK_SLIDE, Moves.TACKLE ]);
+    game.override.moveset([Moves.ABSORB, Moves.ROCK_SLIDE, Moves.TACKLE]);
     game.override.enemyLevel(100);
     game.override.enemySpecies(Species.MAGIKARP);
-    game.override.enemyMoveset([ Moves.REFLECT, Moves.REFLECT, Moves.REFLECT, Moves.REFLECT ]);
+    game.override.enemyMoveset([Moves.REFLECT, Moves.REFLECT, Moves.REFLECT, Moves.REFLECT]);
     game.override.disableCrits();
   });
 
   it("reduces damage of physical attacks by half in a single battle", async () => {
     const moveToUse = Moves.TACKLE;
-    await game.startBattle([ Species.SHUCKLE ]);
+    await game.classicMode.startBattle([Species.SHUCKLE]);
 
     game.move.select(moveToUse);
 
     await game.phaseInterceptor.to(TurnEndPhase);
-    const mockedDmg = getMockedMoveDamage(game.scene.getEnemyPokemon()!, game.scene.getPlayerPokemon()!, allMoves[moveToUse]);
+    const mockedDmg = getMockedMoveDamage(
+      game.scene.getEnemyPokemon()!,
+      game.scene.getPlayerPokemon()!,
+      allMoves[moveToUse],
+    );
 
     expect(mockedDmg).toBe(allMoves[moveToUse].power * singleBattleMultiplier);
   });
 
   it("reduces damage of physical attacks by a third in a double battle", async () => {
-    game.override.battleType("double");
+    game.override.battleStyle("double");
 
     const moveToUse = Moves.ROCK_SLIDE;
-    await game.startBattle([ Species.SHUCKLE, Species.SHUCKLE ]);
+    await game.classicMode.startBattle([Species.SHUCKLE, Species.SHUCKLE]);
 
     game.move.select(moveToUse);
     game.move.select(moveToUse, 1);
 
     await game.phaseInterceptor.to(TurnEndPhase);
-    const mockedDmg = getMockedMoveDamage(game.scene.getEnemyPokemon()!, game.scene.getPlayerPokemon()!, allMoves[moveToUse]);
+    const mockedDmg = getMockedMoveDamage(
+      game.scene.getEnemyPokemon()!,
+      game.scene.getPlayerPokemon()!,
+      allMoves[moveToUse],
+    );
 
     expect(mockedDmg).toBe(allMoves[moveToUse].power * doubleBattleMultiplier);
   });
 
   it("does not affect special attacks", async () => {
     const moveToUse = Moves.ABSORB;
-    await game.startBattle([ Species.SHUCKLE ]);
+    await game.classicMode.startBattle([Species.SHUCKLE]);
 
     game.move.select(moveToUse);
 
     await game.phaseInterceptor.to(TurnEndPhase);
 
-    const mockedDmg = getMockedMoveDamage(game.scene.getEnemyPokemon()!, game.scene.getPlayerPokemon()!, allMoves[moveToUse]);
+    const mockedDmg = getMockedMoveDamage(
+      game.scene.getEnemyPokemon()!,
+      game.scene.getPlayerPokemon()!,
+      allMoves[moveToUse],
+    );
 
     expect(mockedDmg).toBe(allMoves[moveToUse].power);
   });
+
+  it("does not affect critical hits", async () => {
+    game.override.moveset([Moves.WICKED_BLOW]);
+    const moveToUse = Moves.WICKED_BLOW;
+    await game.classicMode.startBattle([Species.SHUCKLE]);
+
+    game.move.select(moveToUse);
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    const mockedDmg = getMockedMoveDamage(
+      game.scene.getEnemyPokemon()!,
+      game.scene.getPlayerPokemon()!,
+      allMoves[moveToUse],
+    );
+
+    expect(mockedDmg).toBe(allMoves[moveToUse].power);
+  });
+
+  it("does not affect critical hits", async () => {
+    game.override.moveset([Moves.WICKED_BLOW]);
+    const moveToUse = Moves.WICKED_BLOW;
+    await game.classicMode.startBattle([Species.SHUCKLE]);
+
+    game.move.select(moveToUse);
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    const mockedDmg = getMockedMoveDamage(
+      game.scene.getEnemyPokemon()!,
+      game.scene.getPlayerPokemon()!,
+      allMoves[moveToUse],
+    );
+    expect(mockedDmg).toBe(allMoves[moveToUse].power);
+  });
 });
 
 /**
@@ -98,7 +143,9 @@ const getMockedMoveDamage = (defender: Pokemon, attacker: Pokemon, move: Move) =
   const side = defender.isPlayer() ? ArenaTagSide.PLAYER : ArenaTagSide.ENEMY;
 
   if (globalScene.arena.getTagOnSide(ArenaTagType.REFLECT, side)) {
-    globalScene.arena.applyTagsForSide(ArenaTagType.REFLECT, side, false, attacker, move.category, multiplierHolder);
+    if (move.getAttrs(CritOnlyAttr).length === 0) {
+      globalScene.arena.applyTagsForSide(ArenaTagType.REFLECT, side, false, attacker, move.category, multiplierHolder);
+    }
   }
 
   return move.power * multiplierHolder.value;
diff --git a/src/test/moves/reflect_type.test.ts b/test/moves/reflect_type.test.ts
similarity index 64%
rename from src/test/moves/reflect_type.test.ts
rename to test/moves/reflect_type.test.ts
index 50e0fc2fbe6..efd58bfeadf 100644
--- a/src/test/moves/reflect_type.test.ts
+++ b/test/moves/reflect_type.test.ts
@@ -1,8 +1,8 @@
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import { Type } from "#enums/type";
-import GameManager from "#test/utils/gameManager";
+import { PokemonType } from "#enums/pokemon-type";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
@@ -22,20 +22,16 @@ describe("Moves - Reflect Type", () => {
 
   beforeEach(() => {
     game = new GameManager(phaserGame);
-    game.override
-      .ability(Abilities.BALL_FETCH)
-      .battleType("single")
-      .disableCrits()
-      .enemyAbility(Abilities.BALL_FETCH);
+    game.override.ability(Abilities.BALL_FETCH).battleStyle("single").disableCrits().enemyAbility(Abilities.BALL_FETCH);
   });
 
   it("will make the user Normal/Grass if targetting a typeless Pokemon affected by Forest's Curse", async () => {
     game.override
-      .moveset([ Moves.FORESTS_CURSE, Moves.REFLECT_TYPE ])
+      .moveset([Moves.FORESTS_CURSE, Moves.REFLECT_TYPE])
       .startingLevel(60)
       .enemySpecies(Species.CHARMANDER)
-      .enemyMoveset([ Moves.BURN_UP, Moves.SPLASH ]);
-    await game.classicMode.startBattle([ Species.FEEBAS ]);
+      .enemyMoveset([Moves.BURN_UP, Moves.SPLASH]);
+    await game.classicMode.startBattle([Species.FEEBAS]);
 
     const playerPokemon = game.scene.getPlayerPokemon();
     const enemyPokemon = game.scene.getEnemyPokemon();
@@ -47,13 +43,13 @@ describe("Moves - Reflect Type", () => {
     game.move.select(Moves.FORESTS_CURSE);
     await game.forceEnemyMove(Moves.SPLASH);
     await game.toNextTurn();
-    expect(enemyPokemon?.getTypes().includes(Type.UNKNOWN)).toBe(true);
-    expect(enemyPokemon?.getTypes().includes(Type.GRASS)).toBe(true);
+    expect(enemyPokemon?.getTypes().includes(PokemonType.UNKNOWN)).toBe(true);
+    expect(enemyPokemon?.getTypes().includes(PokemonType.GRASS)).toBe(true);
 
     game.move.select(Moves.REFLECT_TYPE);
     await game.forceEnemyMove(Moves.SPLASH);
     await game.phaseInterceptor.to("TurnEndPhase");
-    expect(playerPokemon?.getTypes()[0]).toBe(Type.NORMAL);
-    expect(playerPokemon?.getTypes().includes(Type.GRASS)).toBe(true);
+    expect(playerPokemon?.getTypes()[0]).toBe(PokemonType.NORMAL);
+    expect(playerPokemon?.getTypes().includes(PokemonType.GRASS)).toBe(true);
   });
 });
diff --git a/src/test/moves/relic_song.test.ts b/test/moves/relic_song.test.ts
similarity index 77%
rename from src/test/moves/relic_song.test.ts
rename to test/moves/relic_song.test.ts
index c09514850eb..86195e81a24 100644
--- a/src/test/moves/relic_song.test.ts
+++ b/test/moves/relic_song.test.ts
@@ -1,9 +1,9 @@
-import { Type } from "#enums/type";
+import { PokemonType } from "#enums/pokemon-type";
 import { Challenges } from "#app/enums/challenges";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
@@ -23,8 +23,8 @@ describe("Moves - Relic Song", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     game.override
-      .moveset([ Moves.RELIC_SONG, Moves.SPLASH ])
-      .battleType("single")
+      .moveset([Moves.RELIC_SONG, Moves.SPLASH])
+      .battleStyle("single")
       .enemyAbility(Abilities.BALL_FETCH)
       .enemyMoveset(Moves.SPLASH)
       .enemySpecies(Species.MAGIKARP)
@@ -32,7 +32,7 @@ describe("Moves - Relic Song", () => {
   });
 
   it("swaps Meloetta's form between Aria and Pirouette", async () => {
-    await game.classicMode.startBattle([ Species.MELOETTA ]);
+    await game.classicMode.startBattle([Species.MELOETTA]);
 
     const meloetta = game.scene.getPlayerPokemon()!;
 
@@ -48,8 +48,8 @@ describe("Moves - Relic Song", () => {
   });
 
   it("doesn't swap Meloetta's form during a mono-type challenge", async () => {
-    game.challengeMode.addChallenge(Challenges.SINGLE_TYPE, Type.PSYCHIC + 1, 0);
-    await game.challengeMode.startBattle([ Species.MELOETTA ]);
+    game.challengeMode.addChallenge(Challenges.SINGLE_TYPE, PokemonType.PSYCHIC + 1, 0);
+    await game.challengeMode.startBattle([Species.MELOETTA]);
 
     const meloetta = game.scene.getPlayerPokemon()!;
 
@@ -63,10 +63,8 @@ describe("Moves - Relic Song", () => {
   });
 
   it("doesn't swap Meloetta's form during biome change (arena reset)", async () => {
-    game.override
-      .starterForms({ [Species.MELOETTA]: 1 })
-      .startingWave(10);
-    await game.classicMode.startBattle([ Species.MELOETTA ]);
+    game.override.starterForms({ [Species.MELOETTA]: 1 }).startingWave(10);
+    await game.classicMode.startBattle([Species.MELOETTA]);
 
     const meloetta = game.scene.getPlayerPokemon()!;
 
diff --git a/src/test/moves/retaliate.test.ts b/test/moves/retaliate.test.ts
similarity index 72%
rename from src/test/moves/retaliate.test.ts
rename to test/moves/retaliate.test.ts
index e00b9da6010..9ad7cd7853b 100644
--- a/src/test/moves/retaliate.test.ts
+++ b/test/moves/retaliate.test.ts
@@ -1,15 +1,16 @@
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 import Phaser from "phaser";
-import GameManager from "#app/test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import { Species } from "#enums/species";
 import { Moves } from "#enums/moves";
-import { allMoves } from "#app/data/move";
+import { allMoves } from "#app/data/moves/move";
+import type Move from "#app/data/moves/move";
 
 describe("Moves - Retaliate", () => {
   let phaserGame: Phaser.Game;
   let game: GameManager;
 
-  const retaliate = allMoves[Moves.RETALIATE];
+  let retaliate: Move;
 
   beforeAll(() => {
     phaserGame = new Phaser.Game({
@@ -22,20 +23,21 @@ describe("Moves - Retaliate", () => {
   });
 
   beforeEach(() => {
+    retaliate = allMoves[Moves.RETALIATE];
     game = new GameManager(phaserGame);
     game.override
-      .battleType("single")
+      .battleStyle("single")
       .enemySpecies(Species.SNORLAX)
-      .enemyMoveset([ Moves.RETALIATE, Moves.RETALIATE, Moves.RETALIATE, Moves.RETALIATE ])
+      .enemyMoveset([Moves.RETALIATE, Moves.RETALIATE, Moves.RETALIATE, Moves.RETALIATE])
       .enemyLevel(100)
-      .moveset([ Moves.RETALIATE, Moves.SPLASH ])
+      .moveset([Moves.RETALIATE, Moves.SPLASH])
       .startingLevel(80)
       .disableCrits();
   });
 
   it("increases power if ally died previous turn", async () => {
     vi.spyOn(retaliate, "calculateBattlePower");
-    await game.startBattle([ Species.ABRA, Species.COBALION ]);
+    await game.startBattle([Species.ABRA, Species.COBALION]);
     game.move.select(Moves.RETALIATE);
     await game.phaseInterceptor.to("TurnEndPhase");
     expect(retaliate.calculateBattlePower).toHaveLastReturnedWith(70);
diff --git a/test/moves/revival_blessing.test.ts b/test/moves/revival_blessing.test.ts
new file mode 100644
index 00000000000..b36cd43eb83
--- /dev/null
+++ b/test/moves/revival_blessing.test.ts
@@ -0,0 +1,134 @@
+import { BattlerIndex } from "#app/battle";
+import { MoveResult } from "#app/field/pokemon";
+import { toDmgValue } from "#app/utils/common";
+import { Abilities } from "#enums/abilities";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import GameManager from "#test/testUtils/gameManager";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
+
+describe("Moves - Revival Blessing", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+    game.override
+      .moveset([Moves.SPLASH, Moves.REVIVAL_BLESSING, Moves.MEMENTO])
+      .ability(Abilities.BALL_FETCH)
+      .battleStyle("single")
+      .disableCrits()
+      .enemySpecies(Species.MAGIKARP)
+      .enemyAbility(Abilities.BALL_FETCH)
+      .enemyMoveset(Moves.SPLASH);
+  });
+
+  it("should revive a selected fainted Pokemon when used by the player", async () => {
+    await game.classicMode.startBattle([Species.FEEBAS, Species.MAGIKARP]);
+
+    game.move.select(Moves.MEMENTO);
+    game.doSelectPartyPokemon(1, "SwitchPhase");
+    await game.toNextTurn();
+
+    const player = game.scene.getPlayerPokemon()!;
+
+    expect(player.species.speciesId).toBe(Species.MAGIKARP);
+    game.move.select(Moves.REVIVAL_BLESSING);
+
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
+    game.doSelectPartyPokemon(1, "RevivalBlessingPhase");
+
+    await game.phaseInterceptor.to("MoveEndPhase", false);
+
+    const revivedPokemon = game.scene.getPlayerParty()[1];
+    expect(revivedPokemon.status?.effect).toBeFalsy();
+    expect(revivedPokemon.hp).toBe(Math.floor(revivedPokemon.getMaxHp() / 2));
+  });
+
+  it("should revive a random fainted enemy when used by an enemy Trainer", async () => {
+    game.override.enemyMoveset(Moves.REVIVAL_BLESSING).startingWave(8);
+
+    await game.classicMode.startBattle([Species.MAGIKARP]);
+
+    game.move.select(Moves.SPLASH);
+    await game.doKillOpponents();
+
+    await game.toNextTurn();
+    game.move.select(Moves.SPLASH);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
+
+    await game.phaseInterceptor.to("MoveEndPhase", false);
+
+    const revivedPokemon = game.scene.getEnemyParty()[1];
+    expect(revivedPokemon.status?.effect).toBeFalsy();
+    expect(revivedPokemon.hp).toBe(Math.floor(revivedPokemon.getMaxHp() / 2));
+  });
+
+  it("should fail when there are no fainted Pokemon to target", async () => {
+    await game.classicMode.startBattle([Species.FEEBAS, Species.MAGIKARP]);
+
+    game.move.select(Moves.REVIVAL_BLESSING);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
+    await game.phaseInterceptor.to("MoveEndPhase", false);
+
+    const player = game.scene.getPlayerPokemon()!;
+    expect(player.getLastXMoves()[0].result).toBe(MoveResult.FAIL);
+  });
+
+  it("should revive a player pokemon and immediately send it back out if used in the same turn it fainted in doubles", async () => {
+    game.override
+      .battleStyle("double")
+      .enemyMoveset([Moves.SPLASH, Moves.FISSURE])
+      .enemyAbility(Abilities.NO_GUARD)
+      .enemyLevel(100);
+    await game.classicMode.startBattle([Species.FEEBAS, Species.MILOTIC, Species.GYARADOS]);
+
+    const feebas = game.scene.getPlayerField()[0];
+
+    game.move.select(Moves.SPLASH);
+    game.move.select(Moves.REVIVAL_BLESSING, 1);
+    await game.forceEnemyMove(Moves.FISSURE, BattlerIndex.PLAYER);
+    await game.forceEnemyMove(Moves.SPLASH);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2, BattlerIndex.PLAYER_2]);
+
+    await game.phaseInterceptor.to("MoveEndPhase");
+    await game.phaseInterceptor.to("MoveEndPhase");
+
+    expect(feebas.isFainted()).toBe(true);
+
+    game.doSelectPartyPokemon(0, "RevivalBlessingPhase");
+    await game.toNextTurn();
+
+    expect(feebas.isFainted()).toBe(false);
+    expect(feebas.hp).toBe(toDmgValue(0.5 * feebas.getMaxHp()));
+    expect(game.scene.getPlayerField()[0]).toBe(feebas);
+  });
+
+  it("should not summon multiple pokemon to the same slot when reviving the enemy ally in doubles", async () => {
+    game.override.battleStyle("double").enemyMoveset([Moves.REVIVAL_BLESSING]).moveset([Moves.SPLASH]).startingWave(25); // 2nd rival battle - must have 3+ pokemon
+    await game.classicMode.startBattle([Species.ARCEUS, Species.GIRATINA]);
+
+    const enemyFainting = game.scene.getEnemyField()[0];
+
+    game.move.select(Moves.SPLASH, 0);
+    game.move.select(Moves.SPLASH, 1);
+    await game.killPokemon(enemyFainting);
+
+    await game.phaseInterceptor.to("BerryPhase");
+    await game.toNextTurn();
+    // If there are incorrectly two switch phases into this slot, the fainted pokemon will end up in slot 3
+    // Make sure it's still in slot 1
+    expect(game.scene.getEnemyParty()[0]).toBe(enemyFainting);
+  });
+});
diff --git a/test/moves/role_play.test.ts b/test/moves/role_play.test.ts
new file mode 100644
index 00000000000..d4893212003
--- /dev/null
+++ b/test/moves/role_play.test.ts
@@ -0,0 +1,53 @@
+import { Stat } from "#app/enums/stat";
+import { Abilities } from "#enums/abilities";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import GameManager from "#test/testUtils/gameManager";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
+
+describe("Moves - Role Play", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+    game.override
+      .moveset([Moves.SPLASH, Moves.ROLE_PLAY])
+      .ability(Abilities.ADAPTABILITY)
+      .battleStyle("single")
+      .disableCrits()
+      .enemySpecies(Species.MAGIKARP)
+      .enemyAbility(Abilities.BALL_FETCH)
+      .enemyMoveset(Moves.SPLASH);
+  });
+
+  it("should set the user's ability to the target's ability", async () => {
+    await game.classicMode.startBattle([Species.FEEBAS]);
+
+    game.move.select(Moves.ROLE_PLAY);
+    await game.phaseInterceptor.to("BerryPhase");
+
+    expect(game.scene.getPlayerPokemon()?.getAbility().id).toBe(Abilities.BALL_FETCH);
+  });
+
+  it("should activate post-summon abilities", async () => {
+    game.override.enemyAbility(Abilities.INTIMIDATE);
+    await game.classicMode.startBattle([Species.FEEBAS]);
+
+    game.move.select(Moves.ROLE_PLAY);
+    await game.phaseInterceptor.to("BerryPhase");
+
+    expect(game.scene.getEnemyPokemon()?.getStatStage(Stat.ATK)).toBe(-1);
+  });
+});
diff --git a/src/test/moves/rollout.test.ts b/test/moves/rollout.test.ts
similarity index 82%
rename from src/test/moves/rollout.test.ts
rename to test/moves/rollout.test.ts
index 199f4e1dcf2..b477fd8274f 100644
--- a/src/test/moves/rollout.test.ts
+++ b/test/moves/rollout.test.ts
@@ -1,9 +1,9 @@
-import { allMoves } from "#app/data/move";
+import { allMoves } from "#app/data/moves/move";
 import { CommandPhase } from "#app/phases/command-phase";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
@@ -24,7 +24,7 @@ describe("Moves - Rollout", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     game.override.disableCrits();
-    game.override.battleType("single");
+    game.override.battleStyle("single");
     game.override.starterSpecies(Species.RATTATA);
     game.override.ability(Abilities.BALL_FETCH);
     game.override.enemySpecies(Species.BIDOOF);
@@ -35,7 +35,7 @@ describe("Moves - Rollout", () => {
   });
 
   it("should double it's dmg on sequential uses but reset after 5", async () => {
-    game.override.moveset([ Moves.ROLLOUT ]);
+    game.override.moveset([Moves.ROLLOUT]);
     vi.spyOn(allMoves[Moves.ROLLOUT], "accuracy", "get").mockReturnValue(100); //always hit
 
     const variance = 5;
@@ -45,10 +45,10 @@ describe("Moves - Rollout", () => {
     await game.startBattle();
 
     const playerPkm = game.scene.getPlayerParty()[0];
-    vi.spyOn(playerPkm, "stats", "get").mockReturnValue([ 500000, 1, 1, 1, 1, 1 ]); // HP, ATK, DEF, SPATK, SPDEF, SPD
+    vi.spyOn(playerPkm, "stats", "get").mockReturnValue([500000, 1, 1, 1, 1, 1]); // HP, ATK, DEF, SPATK, SPDEF, SPD
 
     const enemyPkm = game.scene.getEnemyParty()[0];
-    vi.spyOn(enemyPkm, "stats", "get").mockReturnValue([ 500000, 1, 1, 1, 1, 1 ]); // HP, ATK, DEF, SPATK, SPDEF, SPD
+    vi.spyOn(enemyPkm, "stats", "get").mockReturnValue([500000, 1, 1, 1, 1, 1]); // HP, ATK, DEF, SPATK, SPDEF, SPD
     vi.spyOn(enemyPkm, "getHeldItems").mockReturnValue([]); //no berries
 
     enemyPkm.hp = enemyPkm.getMaxHp();
@@ -62,7 +62,7 @@ describe("Moves - Rollout", () => {
       previousHp = enemyPkm.hp;
     }
 
-    const [ turn1Dmg, turn2Dmg, turn3Dmg, turn4Dmg, turn5Dmg, turn6Dmg ] = dmgHistory;
+    const [turn1Dmg, turn2Dmg, turn3Dmg, turn4Dmg, turn5Dmg, turn6Dmg] = dmgHistory;
 
     expect(turn2Dmg).toBeGreaterThanOrEqual(turn1Dmg * 2 - variance);
     expect(turn2Dmg).toBeLessThanOrEqual(turn1Dmg * 2 + variance);
diff --git a/test/moves/roost.test.ts b/test/moves/roost.test.ts
new file mode 100644
index 00000000000..e55c76ca220
--- /dev/null
+++ b/test/moves/roost.test.ts
@@ -0,0 +1,244 @@
+import { BattlerIndex } from "#app/battle";
+import { PokemonType } from "#enums/pokemon-type";
+import { BattlerTagType } from "#app/enums/battler-tag-type";
+import { Moves } from "#app/enums/moves";
+import { Species } from "#app/enums/species";
+import { MoveEffectPhase } from "#app/phases/move-effect-phase";
+import { TurnEndPhase } from "#app/phases/turn-end-phase";
+import GameManager from "#test/testUtils/gameManager";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest";
+
+describe("Moves - Roost", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+    game.override.battleStyle("single");
+    game.override.enemySpecies(Species.RELICANTH);
+    game.override.startingLevel(100);
+    game.override.enemyLevel(100);
+    game.override.enemyMoveset(Moves.EARTHQUAKE);
+    game.override.moveset([Moves.ROOST, Moves.BURN_UP, Moves.DOUBLE_SHOCK]);
+  });
+
+  /**
+   * Roost's behavior should be defined as:
+   * The pokemon loses its flying type for a turn. If the pokemon was ungroundd solely due to being a flying type, it will be grounded until end of turn.
+   * 1. Pure Flying type pokemon -> become normal type until end of turn
+   * 2. Dual Flying/X type pokemon -> become type X until end of turn
+   * 3. Pokemon that use burn up into roost (ex. Moltres) -> become flying due to burn up, then typeless until end of turn after using roost
+   * 4. If a pokemon is afflicted with Forest's Curse or Trick or treat, dual type pokemon will become 3 type pokemon after the flying type is regained
+   *    Pure flying types become (Grass or Ghost) and then back to flying/ (Grass or Ghost),
+   *    and pokemon post Burn up become ()
+   * 5. If a pokemon is also ungrounded due to other reasons (such as levitate), it will stay ungrounded post roost, despite not being flying type.
+   * 6. Non flying types using roost (such as dunsparce) are already grounded, so this move will only heal and have no other effects.
+   */
+
+  test("Non flying type uses roost -> no type change, took damage", async () => {
+    await game.classicMode.startBattle([Species.DUNSPARCE]);
+    const playerPokemon = game.scene.getPlayerPokemon()!;
+    const playerPokemonStartingHP = playerPokemon.hp;
+    game.move.select(Moves.ROOST);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
+    await game.phaseInterceptor.to(MoveEffectPhase);
+
+    // Should only be normal type, and NOT flying type
+    let playerPokemonTypes = playerPokemon.getTypes();
+    expect(playerPokemonTypes[0] === PokemonType.NORMAL).toBeTruthy();
+    expect(playerPokemonTypes.length === 1).toBeTruthy();
+    expect(playerPokemon.isGrounded()).toBeTruthy();
+
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    // Lose HP, still normal type
+    playerPokemonTypes = playerPokemon.getTypes();
+    expect(playerPokemon.hp).toBeLessThan(playerPokemonStartingHP);
+    expect(playerPokemonTypes[0] === PokemonType.NORMAL).toBeTruthy();
+    expect(playerPokemonTypes.length === 1).toBeTruthy();
+    expect(playerPokemon.isGrounded()).toBeTruthy();
+  });
+
+  test("Pure flying type -> becomes normal after roost and takes damage from ground moves -> regains flying", async () => {
+    await game.classicMode.startBattle([Species.TORNADUS]);
+    const playerPokemon = game.scene.getPlayerPokemon()!;
+    const playerPokemonStartingHP = playerPokemon.hp;
+    game.move.select(Moves.ROOST);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
+    await game.phaseInterceptor.to(MoveEffectPhase);
+
+    // Should only be normal type, and NOT flying type
+    let playerPokemonTypes = playerPokemon.getTypes();
+    expect(playerPokemonTypes[0] === PokemonType.NORMAL).toBeTruthy();
+    expect(playerPokemonTypes[0] === PokemonType.FLYING).toBeFalsy();
+    expect(playerPokemon.isGrounded()).toBeTruthy();
+
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    // Should have lost HP and is now back to being pure flying
+    playerPokemonTypes = playerPokemon.getTypes();
+    expect(playerPokemon.hp).toBeLessThan(playerPokemonStartingHP);
+    expect(playerPokemonTypes[0] === PokemonType.NORMAL).toBeFalsy();
+    expect(playerPokemonTypes[0] === PokemonType.FLYING).toBeTruthy();
+    expect(playerPokemon.isGrounded()).toBeFalsy();
+  });
+
+  test("Dual X/flying type -> becomes type X after roost and takes damage from ground moves -> regains flying", async () => {
+    await game.classicMode.startBattle([Species.HAWLUCHA]);
+    const playerPokemon = game.scene.getPlayerPokemon()!;
+    const playerPokemonStartingHP = playerPokemon.hp;
+    game.move.select(Moves.ROOST);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
+    await game.phaseInterceptor.to(MoveEffectPhase);
+
+    // Should only be pure fighting type and grounded
+    let playerPokemonTypes = playerPokemon.getTypes();
+    expect(playerPokemonTypes[0] === PokemonType.FIGHTING).toBeTruthy();
+    expect(playerPokemonTypes.length === 1).toBeTruthy();
+    expect(playerPokemon.isGrounded()).toBeTruthy();
+
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    // Should have lost HP and is now back to being fighting/flying
+    playerPokemonTypes = playerPokemon.getTypes();
+    expect(playerPokemon.hp).toBeLessThan(playerPokemonStartingHP);
+    expect(playerPokemonTypes[0] === PokemonType.FIGHTING).toBeTruthy();
+    expect(playerPokemonTypes[1] === PokemonType.FLYING).toBeTruthy();
+    expect(playerPokemon.isGrounded()).toBeFalsy();
+  });
+
+  test("Pokemon with levitate after using roost should lose flying type but still be unaffected by ground moves", async () => {
+    game.override.starterForms({ [Species.ROTOM]: 4 });
+    await game.classicMode.startBattle([Species.ROTOM]);
+    const playerPokemon = game.scene.getPlayerPokemon()!;
+    const playerPokemonStartingHP = playerPokemon.hp;
+    game.move.select(Moves.ROOST);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
+    await game.phaseInterceptor.to(MoveEffectPhase);
+
+    // Should only be pure eletric type and grounded
+    let playerPokemonTypes = playerPokemon.getTypes();
+    expect(playerPokemonTypes[0] === PokemonType.ELECTRIC).toBeTruthy();
+    expect(playerPokemonTypes.length === 1).toBeTruthy();
+    expect(playerPokemon.isGrounded()).toBeFalsy();
+
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    // Should have lost HP and is now back to being electric/flying
+    playerPokemonTypes = playerPokemon.getTypes();
+    expect(playerPokemon.hp).toBe(playerPokemonStartingHP);
+    expect(playerPokemonTypes[0] === PokemonType.ELECTRIC).toBeTruthy();
+    expect(playerPokemonTypes[1] === PokemonType.FLYING).toBeTruthy();
+    expect(playerPokemon.isGrounded()).toBeFalsy();
+  });
+
+  test("A fire/flying type that uses burn up, then roost should be typeless until end of turn", async () => {
+    await game.classicMode.startBattle([Species.MOLTRES]);
+    const playerPokemon = game.scene.getPlayerPokemon()!;
+    const playerPokemonStartingHP = playerPokemon.hp;
+    game.move.select(Moves.BURN_UP);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
+    await game.phaseInterceptor.to(MoveEffectPhase);
+
+    // Should only be pure flying type after burn up
+    let playerPokemonTypes = playerPokemon.getTypes();
+    expect(playerPokemonTypes[0] === PokemonType.FLYING).toBeTruthy();
+    expect(playerPokemonTypes.length === 1).toBeTruthy();
+
+    await game.phaseInterceptor.to(TurnEndPhase);
+    game.move.select(Moves.ROOST);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
+    await game.phaseInterceptor.to(MoveEffectPhase);
+
+    // Should only be typeless type after roost and is grounded
+    playerPokemonTypes = playerPokemon.getTypes();
+    expect(playerPokemon.getTag(BattlerTagType.ROOSTED)).toBeDefined();
+    expect(playerPokemonTypes[0] === PokemonType.UNKNOWN).toBeTruthy();
+    expect(playerPokemonTypes.length === 1).toBeTruthy();
+    expect(playerPokemon.isGrounded()).toBeTruthy();
+
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    // Should go back to being pure flying and have taken damage from earthquake, and is ungrounded again
+    playerPokemonTypes = playerPokemon.getTypes();
+    expect(playerPokemon.hp).toBeLessThan(playerPokemonStartingHP);
+    expect(playerPokemonTypes[0] === PokemonType.FLYING).toBeTruthy();
+    expect(playerPokemonTypes.length === 1).toBeTruthy();
+    expect(playerPokemon.isGrounded()).toBeFalsy();
+  });
+
+  test("An electric/flying type that uses double shock, then roost should be typeless until end of turn", async () => {
+    game.override.enemySpecies(Species.ZEKROM);
+    await game.classicMode.startBattle([Species.ZAPDOS]);
+    const playerPokemon = game.scene.getPlayerPokemon()!;
+    const playerPokemonStartingHP = playerPokemon.hp;
+    game.move.select(Moves.DOUBLE_SHOCK);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
+    await game.phaseInterceptor.to(MoveEffectPhase);
+
+    // Should only be pure flying type after burn up
+    let playerPokemonTypes = playerPokemon.getTypes();
+    expect(playerPokemonTypes[0] === PokemonType.FLYING).toBeTruthy();
+    expect(playerPokemonTypes.length === 1).toBeTruthy();
+
+    await game.phaseInterceptor.to(TurnEndPhase);
+    game.move.select(Moves.ROOST);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
+    await game.phaseInterceptor.to(MoveEffectPhase);
+
+    // Should only be typeless type after roost and is grounded
+    playerPokemonTypes = playerPokemon.getTypes();
+    expect(playerPokemon.getTag(BattlerTagType.ROOSTED)).toBeDefined();
+    expect(playerPokemonTypes[0] === PokemonType.UNKNOWN).toBeTruthy();
+    expect(playerPokemonTypes.length === 1).toBeTruthy();
+    expect(playerPokemon.isGrounded()).toBeTruthy();
+
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    // Should go back to being pure flying and have taken damage from earthquake, and is ungrounded again
+    playerPokemonTypes = playerPokemon.getTypes();
+    expect(playerPokemon.hp).toBeLessThan(playerPokemonStartingHP);
+    expect(playerPokemonTypes[0] === PokemonType.FLYING).toBeTruthy();
+    expect(playerPokemonTypes.length === 1).toBeTruthy();
+    expect(playerPokemon.isGrounded()).toBeFalsy();
+  });
+
+  test("Dual Type Pokemon afflicted with Forests Curse/Trick or Treat and post roost will become dual type and then become 3 type at end of turn", async () => {
+    game.override.enemyMoveset([
+      Moves.TRICK_OR_TREAT,
+      Moves.TRICK_OR_TREAT,
+      Moves.TRICK_OR_TREAT,
+      Moves.TRICK_OR_TREAT,
+    ]);
+    await game.classicMode.startBattle([Species.MOLTRES]);
+    const playerPokemon = game.scene.getPlayerPokemon()!;
+    game.move.select(Moves.ROOST);
+    await game.phaseInterceptor.to(MoveEffectPhase);
+
+    let playerPokemonTypes = playerPokemon.getTypes();
+    expect(playerPokemonTypes[0] === PokemonType.FIRE).toBeTruthy();
+    expect(playerPokemonTypes.length === 1).toBeTruthy();
+    expect(playerPokemon.isGrounded()).toBeTruthy();
+
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    // Should be fire/flying/ghost
+    playerPokemonTypes = playerPokemon.getTypes();
+    expect(playerPokemonTypes.filter(type => type === PokemonType.FLYING)).toHaveLength(1);
+    expect(playerPokemonTypes.filter(type => type === PokemonType.FIRE)).toHaveLength(1);
+    expect(playerPokemonTypes.filter(type => type === PokemonType.GHOST)).toHaveLength(1);
+    expect(playerPokemonTypes.length === 3).toBeTruthy();
+    expect(playerPokemon.isGrounded()).toBeFalsy();
+  });
+});
diff --git a/src/test/moves/round.test.ts b/test/moves/round.test.ts
similarity index 73%
rename from src/test/moves/round.test.ts
rename to test/moves/round.test.ts
index 1d7c91bcbd4..a58efb730f8 100644
--- a/src/test/moves/round.test.ts
+++ b/test/moves/round.test.ts
@@ -1,10 +1,10 @@
 import { BattlerIndex } from "#app/battle";
-import { allMoves } from "#app/data/move";
+import { allMoves } from "#app/data/moves/move";
 import type { MoveEffectPhase } from "#app/phases/move-effect-phase";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
@@ -25,19 +25,19 @@ describe("Moves - Round", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     game.override
-      .moveset([ Moves.SPLASH, Moves.ROUND ])
+      .moveset([Moves.SPLASH, Moves.ROUND])
       .ability(Abilities.BALL_FETCH)
-      .battleType("double")
+      .battleStyle("double")
       .disableCrits()
       .enemySpecies(Species.MAGIKARP)
       .enemyAbility(Abilities.BALL_FETCH)
-      .enemyMoveset([ Moves.SPLASH, Moves.ROUND ])
+      .enemyMoveset([Moves.SPLASH, Moves.ROUND])
       .startingLevel(100)
       .enemyLevel(100);
   });
 
   it("should cue other instances of Round together in Speed order", async () => {
-    await game.classicMode.startBattle([ Species.MAGIKARP, Species.FEEBAS ]);
+    await game.classicMode.startBattle([Species.MAGIKARP, Species.FEEBAS]);
 
     const round = allMoves[Moves.ROUND];
     const spy = vi.spyOn(round, "calculateBattlePower");
@@ -48,7 +48,7 @@ describe("Moves - Round", () => {
     await game.forceEnemyMove(Moves.ROUND, BattlerIndex.PLAYER);
     await game.forceEnemyMove(Moves.SPLASH);
 
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY_2, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY_2, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY]);
 
     const actualTurnOrder: BattlerIndex[] = [];
 
@@ -58,8 +58,13 @@ describe("Moves - Round", () => {
       await game.phaseInterceptor.to("MoveEndPhase");
     }
 
-    expect(actualTurnOrder).toEqual([ BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2 ]);
+    expect(actualTurnOrder).toEqual([
+      BattlerIndex.PLAYER,
+      BattlerIndex.PLAYER_2,
+      BattlerIndex.ENEMY,
+      BattlerIndex.ENEMY_2,
+    ]);
     const powerResults = spy.mock.results.map(result => result.value);
-    expect(powerResults).toEqual( [ 60, 120, 120 ]);
+    expect(powerResults).toEqual([60, 120, 120]);
   });
 });
diff --git a/src/test/moves/safeguard.test.ts b/test/moves/safeguard.test.ts
similarity index 75%
rename from src/test/moves/safeguard.test.ts
rename to test/moves/safeguard.test.ts
index 6505162fd04..7804b63f5c5 100644
--- a/src/test/moves/safeguard.test.ts
+++ b/test/moves/safeguard.test.ts
@@ -1,14 +1,14 @@
 import { BattlerIndex } from "#app/battle";
-import { allAbilities, PostDefendContactApplyStatusEffectAbAttr } from "#app/data/ability";
+import { PostDefendContactApplyStatusEffectAbAttr } from "#app/data/abilities/ability";
+import { allAbilities } from "#app/data/data-lists";
 import { Abilities } from "#app/enums/abilities";
 import { StatusEffect } from "#app/enums/status-effect";
-import GameManager from "#app/test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
-
 describe("Moves - Safeguard", () => {
   let phaserGame: Phaser.Game;
   let game: GameManager;
@@ -26,13 +26,13 @@ describe("Moves - Safeguard", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     game.override
-      .battleType("single")
+      .battleStyle("single")
       .enemySpecies(Species.DRATINI)
-      .enemyMoveset([ Moves.SAFEGUARD ])
+      .enemyMoveset([Moves.SAFEGUARD])
       .enemyAbility(Abilities.BALL_FETCH)
       .enemyLevel(5)
       .starterSpecies(Species.DRATINI)
-      .moveset([ Moves.NUZZLE, Moves.SPORE, Moves.YAWN, Moves.SPLASH ])
+      .moveset([Moves.NUZZLE, Moves.SPORE, Moves.YAWN, Moves.SPLASH])
       .ability(Abilities.UNNERVE); // Stop wild Pokemon from potentially eating Lum Berry
   });
 
@@ -41,7 +41,7 @@ describe("Moves - Safeguard", () => {
     const enemy = game.scene.getEnemyPokemon()!;
 
     game.move.select(Moves.NUZZLE);
-    await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
     await game.toNextTurn();
 
     expect(enemy.status).toBeUndefined();
@@ -52,33 +52,33 @@ describe("Moves - Safeguard", () => {
     const enemyPokemon = game.scene.getEnemyPokemon()!;
 
     game.move.select(Moves.SPORE);
-    await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
     await game.toNextTurn();
 
     expect(enemyPokemon.status).toBeUndefined();
   });
 
   it("protects from confusion", async () => {
-    game.override.moveset([ Moves.CONFUSE_RAY ]);
+    game.override.moveset([Moves.CONFUSE_RAY]);
     await game.classicMode.startBattle();
     const enemyPokemon = game.scene.getEnemyPokemon()!;
 
     game.move.select(Moves.CONFUSE_RAY);
-    await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
     await game.toNextTurn();
 
     expect(enemyPokemon.summonData.tags).toEqual([]);
   });
 
   it("protects ally from status", async () => {
-    game.override.battleType("double");
+    game.override.battleStyle("double");
 
     await game.classicMode.startBattle();
 
     game.move.select(Moves.SPORE, 0, BattlerIndex.ENEMY_2);
     game.move.select(Moves.NUZZLE, 1, BattlerIndex.ENEMY_2);
 
-    await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY_2 ]);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY_2]);
 
     await game.phaseInterceptor.to("BerryPhase");
 
@@ -93,7 +93,7 @@ describe("Moves - Safeguard", () => {
     const enemyPokemon = game.scene.getEnemyPokemon()!;
 
     game.move.select(Moves.YAWN);
-    await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
     await game.toNextTurn();
 
     expect(enemyPokemon.summonData.tags).toEqual([]);
@@ -104,7 +104,7 @@ describe("Moves - Safeguard", () => {
     const enemyPokemon = game.scene.getEnemyPokemon()!;
 
     game.move.select(Moves.YAWN);
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
     await game.toNextTurn();
 
     game.move.select(Moves.SPLASH);
@@ -119,13 +119,13 @@ describe("Moves - Safeguard", () => {
     const enemyPokemon = game.scene.getEnemyPokemon()!;
 
     game.move.select(Moves.SPLASH);
-    await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
     await game.toNextTurn();
     enemyPokemon.damageAndUpdate(1);
 
     expect(enemyPokemon.status?.effect).toEqual(StatusEffect.BURN);
 
-    game.override.enemyMoveset([ Moves.REST ]);
+    game.override.enemyMoveset([Moves.REST]);
     // Force the moveset to update mid-battle
     // TODO: Remove after enemy AI rework is in
     enemyPokemon.getMoveset();
@@ -138,14 +138,18 @@ describe("Moves - Safeguard", () => {
 
   it("protects from ability-inflicted status", async () => {
     game.override.ability(Abilities.STATIC);
-    vi.spyOn(allAbilities[Abilities.STATIC].getAttrs(PostDefendContactApplyStatusEffectAbAttr)[0], "chance", "get").mockReturnValue(100);
+    vi.spyOn(
+      allAbilities[Abilities.STATIC].getAttrs(PostDefendContactApplyStatusEffectAbAttr)[0],
+      "chance",
+      "get",
+    ).mockReturnValue(100);
     await game.classicMode.startBattle();
     const enemyPokemon = game.scene.getEnemyPokemon()!;
 
     game.move.select(Moves.SPLASH);
-    await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
     await game.toNextTurn();
-    game.override.enemyMoveset([ Moves.TACKLE ]);
+    game.override.enemyMoveset([Moves.TACKLE]);
     game.move.select(Moves.SPLASH);
     await game.toNextTurn();
 
diff --git a/src/test/moves/scale_shot.test.ts b/test/moves/scale_shot.test.ts
similarity index 87%
rename from src/test/moves/scale_shot.test.ts
rename to test/moves/scale_shot.test.ts
index cbaa6611f3e..4731ccf9574 100644
--- a/src/test/moves/scale_shot.test.ts
+++ b/test/moves/scale_shot.test.ts
@@ -1,5 +1,5 @@
 import { BattlerIndex } from "#app/battle";
-import { allMoves } from "#app/data/move";
+import { allMoves } from "#app/data/moves/move";
 import { DamageAnimPhase } from "#app/phases/damage-anim-phase";
 import { MoveEffectPhase } from "#app/phases/move-effect-phase";
 import { MoveEndPhase } from "#app/phases/move-end-phase";
@@ -8,7 +8,7 @@ import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { Stat } from "#enums/stat";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, it, expect, vi } from "vitest";
 
@@ -29,8 +29,8 @@ describe("Moves - Scale Shot", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     game.override
-      .moveset([ Moves.SCALE_SHOT ])
-      .battleType("single")
+      .moveset([Moves.SCALE_SHOT])
+      .battleStyle("single")
       .disableCrits()
       .ability(Abilities.NO_GUARD)
       .passiveAbility(Abilities.SKILL_LINK)
@@ -41,11 +41,11 @@ describe("Moves - Scale Shot", () => {
   it("applies stat changes after last hit", async () => {
     game.override.enemySpecies(Species.FORRETRESS);
 
-    await game.classicMode.startBattle([ Species.MINCCINO ]);
+    await game.classicMode.startBattle([Species.MINCCINO]);
     const minccino = game.scene.getPlayerPokemon()!;
     game.move.select(Moves.SCALE_SHOT);
 
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
 
     await game.phaseInterceptor.to(MoveEffectPhase);
     await game.phaseInterceptor.to(DamageAnimPhase);
@@ -69,7 +69,7 @@ describe("Moves - Scale Shot", () => {
 
     vi.spyOn(moveToCheck, "calculateBattlePower");
 
-    await game.classicMode.startBattle([ Species.MINCCINO ]);
+    await game.classicMode.startBattle([Species.MINCCINO]);
     const minccino = game.scene.getPlayerPokemon()!;
 
     game.move.select(Moves.SCALE_SHOT);
diff --git a/src/test/moves/secret_power.test.ts b/test/moves/secret_power.test.ts
similarity index 50%
rename from src/test/moves/secret_power.test.ts
rename to test/moves/secret_power.test.ts
index 09fe5faa50b..cbc0cded28b 100644
--- a/src/test/moves/secret_power.test.ts
+++ b/test/moves/secret_power.test.ts
@@ -2,16 +2,17 @@ import { Abilities } from "#enums/abilities";
 import { Biome } from "#enums/biome";
 import { Moves } from "#enums/moves";
 import { Stat } from "#enums/stat";
-import { allMoves } from "#app/data/move";
+import { allMoves } from "#app/data/moves/move";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 import { StatusEffect } from "#enums/status-effect";
 import { BattlerIndex } from "#app/battle";
 import { ArenaTagType } from "#enums/arena-tag-type";
 import { ArenaTagSide } from "#app/data/arena-tag";
-import { allAbilities, MoveEffectChanceMultiplierAbAttr } from "#app/data/ability";
+import { MoveEffectChanceMultiplierAbAttr } from "#app/data/abilities/ability";
+import { allAbilities } from "#app/data/data-lists";
 
 describe("Moves - Secret Power", () => {
   let phaserGame: Phaser.Game;
@@ -30,9 +31,9 @@ describe("Moves - Secret Power", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     game.override
-      .moveset([ Moves.SECRET_POWER ])
+      .moveset([Moves.SECRET_POWER])
       .ability(Abilities.BALL_FETCH)
-      .battleType("single")
+      .battleStyle("single")
       .disableCrits()
       .enemySpecies(Species.MAGIKARP)
       .enemyLevel(60)
@@ -40,13 +41,11 @@ describe("Moves - Secret Power", () => {
   });
 
   it("Secret Power checks for an active terrain first then looks at the biome for its secondary effect", async () => {
-    game.override
-      .startingBiome(Biome.VOLCANO)
-      .enemyMoveset([ Moves.SPLASH, Moves.MISTY_TERRAIN ]);
+    game.override.startingBiome(Biome.VOLCANO).enemyMoveset([Moves.SPLASH, Moves.MISTY_TERRAIN]);
     vi.spyOn(allMoves[Moves.SECRET_POWER], "chance", "get").mockReturnValue(100);
-    await game.classicMode.startBattle([ Species.FEEBAS ]);
+    await game.classicMode.startBattle([Species.FEEBAS]);
 
-    const enemyPokemon  = game.scene.getEnemyPokemon()!;
+    const enemyPokemon = game.scene.getEnemyPokemon()!;
 
     // No Terrain + Biome.VOLCANO --> Burn
     game.move.select(Moves.SECRET_POWER);
@@ -61,38 +60,36 @@ describe("Moves - Secret Power", () => {
     expect(enemyPokemon.getStatStage(Stat.SPATK)).toBe(-1);
   });
 
-  it("Secret Power's effect chance is doubled by Serene Grace, but not by the 'rainbow' effect from Fire/Water Pledge",
-    async () => {
-      game.override
-        .moveset([ Moves.FIRE_PLEDGE, Moves.WATER_PLEDGE, Moves.SECRET_POWER, Moves.SPLASH ])
-        .ability(Abilities.SERENE_GRACE)
-        .enemyMoveset([ Moves.SPLASH ])
-        .battleType("double");
-      await game.classicMode.startBattle([ Species.BLASTOISE, Species.CHARIZARD ]);
+  it("Secret Power's effect chance is doubled by Serene Grace, but not by the 'rainbow' effect from Fire/Water Pledge", async () => {
+    game.override
+      .moveset([Moves.FIRE_PLEDGE, Moves.WATER_PLEDGE, Moves.SECRET_POWER, Moves.SPLASH])
+      .ability(Abilities.SERENE_GRACE)
+      .enemyMoveset([Moves.SPLASH])
+      .battleStyle("double");
+    await game.classicMode.startBattle([Species.BLASTOISE, Species.CHARIZARD]);
 
-      const sereneGraceAttr = allAbilities[Abilities.SERENE_GRACE].getAttrs(MoveEffectChanceMultiplierAbAttr)[0];
-      vi.spyOn(sereneGraceAttr, "apply");
+    const sereneGraceAttr = allAbilities[Abilities.SERENE_GRACE].getAttrs(MoveEffectChanceMultiplierAbAttr)[0];
+    vi.spyOn(sereneGraceAttr, "canApply");
 
-      game.move.select(Moves.WATER_PLEDGE, 0, BattlerIndex.ENEMY);
-      game.move.select(Moves.FIRE_PLEDGE, 1, BattlerIndex.ENEMY_2);
+    game.move.select(Moves.WATER_PLEDGE, 0, BattlerIndex.ENEMY);
+    game.move.select(Moves.FIRE_PLEDGE, 1, BattlerIndex.ENEMY_2);
 
-      await game.phaseInterceptor.to("TurnEndPhase");
+    await game.phaseInterceptor.to("TurnEndPhase");
 
-      let rainbowEffect = game.scene.arena.getTagOnSide(ArenaTagType.WATER_FIRE_PLEDGE, ArenaTagSide.PLAYER);
-      expect(rainbowEffect).toBeDefined();
+    let rainbowEffect = game.scene.arena.getTagOnSide(ArenaTagType.WATER_FIRE_PLEDGE, ArenaTagSide.PLAYER);
+    expect(rainbowEffect).toBeDefined();
 
-      rainbowEffect = rainbowEffect!;
-      vi.spyOn(rainbowEffect, "apply");
+    rainbowEffect = rainbowEffect!;
+    vi.spyOn(rainbowEffect, "apply");
 
-      game.move.select(Moves.SECRET_POWER, 0, BattlerIndex.ENEMY);
-      game.move.select(Moves.SPLASH, 1);
+    game.move.select(Moves.SECRET_POWER, 0, BattlerIndex.ENEMY);
+    game.move.select(Moves.SPLASH, 1);
 
-      await game.phaseInterceptor.to("BerryPhase", false);
+    await game.phaseInterceptor.to("BerryPhase", false);
 
-      expect(sereneGraceAttr.apply).toHaveBeenCalledOnce();
-      expect(sereneGraceAttr.apply).toHaveLastReturnedWith(true);
+    expect(sereneGraceAttr.canApply).toHaveBeenCalledOnce();
+    expect(sereneGraceAttr.canApply).toHaveLastReturnedWith(true);
 
-      expect(rainbowEffect.apply).toHaveBeenCalledTimes(0);
-    }
-  );
+    expect(rainbowEffect.apply).toHaveBeenCalledTimes(0);
+  });
 });
diff --git a/src/test/moves/shed_tail.test.ts b/test/moves/shed_tail.test.ts
similarity index 74%
rename from src/test/moves/shed_tail.test.ts
rename to test/moves/shed_tail.test.ts
index 33a7d81e460..845399f6c27 100644
--- a/src/test/moves/shed_tail.test.ts
+++ b/test/moves/shed_tail.test.ts
@@ -3,7 +3,7 @@ import { MoveResult } from "#app/field/pokemon";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, it, expect } from "vitest";
 
@@ -24,15 +24,15 @@ describe("Moves - Shed Tail", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     game.override
-      .moveset([ Moves.SHED_TAIL ])
-      .battleType("single")
+      .moveset([Moves.SHED_TAIL])
+      .battleStyle("single")
       .enemySpecies(Species.SNORLAX)
       .enemyAbility(Abilities.BALL_FETCH)
       .enemyMoveset(Moves.SPLASH);
   });
 
   it("transfers a Substitute doll to the switched in Pokemon", async () => {
-    await game.classicMode.startBattle([ Species.MAGIKARP, Species.FEEBAS ]);
+    await game.classicMode.startBattle([Species.MAGIKARP, Species.FEEBAS]);
 
     const magikarp = game.scene.getPlayerPokemon()!;
 
@@ -46,17 +46,14 @@ describe("Moves - Shed Tail", () => {
 
     expect(feebas).not.toBe(magikarp);
     expect(feebas.hp).toBe(feebas.getMaxHp());
-    // Note: Shed Tail's HP cost is currently not accurate to mainline, as it
-    // should cost ceil(maxHP / 2) instead of max(floor(maxHp / 2), 1). The current
-    // implementation is consistent with Substitute's HP cost logic, but that's not
-    // the case in mainline for some reason :regiDespair:.
-    expect(magikarp.hp).toBe(Math.ceil(magikarp.getMaxHp() / 2));
+    // Note: Altered the test to be consistent with the correct HP cost :yipeevee_static:
+    expect(magikarp.hp).toBe(Math.floor(magikarp.getMaxHp() / 2));
     expect(substituteTag).toBeDefined();
     expect(substituteTag?.hp).toBe(Math.floor(magikarp.getMaxHp() / 4));
   });
 
   it("should fail if no ally is available to switch in", async () => {
-    await game.classicMode.startBattle([ Species.MAGIKARP ]);
+    await game.classicMode.startBattle([Species.MAGIKARP]);
 
     const magikarp = game.scene.getPlayerPokemon()!;
     expect(game.scene.getPlayerParty().length).toBe(1);
diff --git a/src/test/moves/shell_side_arm.test.ts b/test/moves/shell_side_arm.test.ts
similarity index 72%
rename from src/test/moves/shell_side_arm.test.ts
rename to test/moves/shell_side_arm.test.ts
index 41cbefb186b..e43bf6db037 100644
--- a/src/test/moves/shell_side_arm.test.ts
+++ b/test/moves/shell_side_arm.test.ts
@@ -1,17 +1,18 @@
 import { BattlerIndex } from "#app/battle";
-import { allMoves, ShellSideArmCategoryAttr } from "#app/data/move";
+import { allMoves, ShellSideArmCategoryAttr } from "#app/data/moves/move";
+import type Move from "#app/data/moves/move";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
 describe("Moves - Shell Side Arm", () => {
   let phaserGame: Phaser.Game;
   let game: GameManager;
-  const shellSideArm = allMoves[Moves.SHELL_SIDE_ARM];
-  const shellSideArmAttr = shellSideArm.getAttrs(ShellSideArmCategoryAttr)[0];
+  let shellSideArm: Move;
+  let shellSideArmAttr: ShellSideArmCategoryAttr;
 
   beforeAll(() => {
     phaserGame = new Phaser.Game({
@@ -24,10 +25,12 @@ describe("Moves - Shell Side Arm", () => {
   });
 
   beforeEach(() => {
+    shellSideArm = allMoves[Moves.SHELL_SIDE_ARM];
+    shellSideArmAttr = shellSideArm.getAttrs(ShellSideArmCategoryAttr)[0];
     game = new GameManager(phaserGame);
     game.override
-      .moveset([ Moves.SHELL_SIDE_ARM, Moves.SPLASH ])
-      .battleType("single")
+      .moveset([Moves.SHELL_SIDE_ARM, Moves.SPLASH])
+      .battleStyle("single")
       .startingLevel(100)
       .enemyLevel(100)
       .enemyAbility(Abilities.BALL_FETCH)
@@ -37,7 +40,7 @@ describe("Moves - Shell Side Arm", () => {
   it("becomes a physical attack if forecasted to deal more damage as physical", async () => {
     game.override.enemySpecies(Species.SNORLAX);
 
-    await game.classicMode.startBattle([ Species.RAMPARDOS ]);
+    await game.classicMode.startBattle([Species.RAMPARDOS]);
 
     vi.spyOn(shellSideArmAttr, "apply");
 
@@ -50,7 +53,7 @@ describe("Moves - Shell Side Arm", () => {
   it("remains a special attack if forecasted to deal more damage as special", async () => {
     game.override.enemySpecies(Species.SLOWBRO);
 
-    await game.classicMode.startBattle([ Species.XURKITREE ]);
+    await game.classicMode.startBattle([Species.XURKITREE]);
 
     vi.spyOn(shellSideArmAttr, "apply");
 
@@ -61,11 +64,9 @@ describe("Moves - Shell Side Arm", () => {
   });
 
   it("respects stat stage changes when forecasting base damage", async () => {
-    game.override
-      .enemySpecies(Species.SNORLAX)
-      .enemyMoveset(Moves.COTTON_GUARD);
+    game.override.enemySpecies(Species.SNORLAX).enemyMoveset(Moves.COTTON_GUARD);
 
-    await game.classicMode.startBattle([ Species.MANAPHY ]);
+    await game.classicMode.startBattle([Species.MANAPHY]);
 
     vi.spyOn(shellSideArmAttr, "apply");
 
@@ -73,7 +74,7 @@ describe("Moves - Shell Side Arm", () => {
     await game.toNextTurn();
 
     game.move.select(Moves.SHELL_SIDE_ARM);
-    await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
     await game.phaseInterceptor.to("BerryPhase", false);
 
     expect(shellSideArmAttr.apply).toHaveLastReturnedWith(false);
diff --git a/test/moves/shell_trap.test.ts b/test/moves/shell_trap.test.ts
new file mode 100644
index 00000000000..f6501c2cd9e
--- /dev/null
+++ b/test/moves/shell_trap.test.ts
@@ -0,0 +1,146 @@
+import { BattlerIndex } from "#app/battle";
+import { allMoves } from "#app/data/moves/move";
+import { Moves } from "#app/enums/moves";
+import { Species } from "#app/enums/species";
+import { MoveResult } from "#app/field/pokemon";
+import { BerryPhase } from "#app/phases/berry-phase";
+import { MoveEndPhase } from "#app/phases/move-end-phase";
+import { MovePhase } from "#app/phases/move-phase";
+import GameManager from "#test/testUtils/gameManager";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
+
+describe("Moves - Shell Trap", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+    game.override
+      .battleStyle("double")
+      .moveset([Moves.SHELL_TRAP, Moves.SPLASH, Moves.BULLDOZE])
+      .enemySpecies(Species.SNORLAX)
+      .enemyMoveset([Moves.RAZOR_LEAF])
+      .startingLevel(100)
+      .enemyLevel(100);
+
+    vi.spyOn(allMoves[Moves.RAZOR_LEAF], "accuracy", "get").mockReturnValue(100);
+  });
+
+  it("should activate after the user is hit by a physical attack", async () => {
+    await game.startBattle([Species.CHARIZARD, Species.TURTONATOR]);
+
+    const playerPokemon = game.scene.getPlayerField();
+    const enemyPokemon = game.scene.getEnemyField();
+
+    game.move.select(Moves.SPLASH);
+    game.move.select(Moves.SHELL_TRAP, 1);
+
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.ENEMY_2, BattlerIndex.PLAYER, BattlerIndex.PLAYER_2]);
+
+    await game.phaseInterceptor.to(MoveEndPhase);
+
+    const movePhase = game.scene.getCurrentPhase();
+    expect(movePhase instanceof MovePhase).toBeTruthy();
+    expect((movePhase as MovePhase).pokemon).toBe(playerPokemon[1]);
+
+    await game.phaseInterceptor.to(MoveEndPhase);
+    enemyPokemon.forEach(p => expect(p.hp).toBeLessThan(p.getMaxHp()));
+  });
+
+  it("should fail if the user is only hit by special attacks", async () => {
+    game.override.enemyMoveset([Moves.SWIFT]);
+
+    await game.startBattle([Species.CHARIZARD, Species.TURTONATOR]);
+
+    const playerPokemon = game.scene.getPlayerField();
+    const enemyPokemon = game.scene.getEnemyField();
+
+    game.move.select(Moves.SPLASH);
+    game.move.select(Moves.SHELL_TRAP, 1);
+
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.ENEMY_2, BattlerIndex.PLAYER, BattlerIndex.PLAYER_2]);
+
+    await game.phaseInterceptor.to(MoveEndPhase);
+
+    const movePhase = game.scene.getCurrentPhase();
+    expect(movePhase instanceof MovePhase).toBeTruthy();
+    expect((movePhase as MovePhase).pokemon).not.toBe(playerPokemon[1]);
+
+    await game.phaseInterceptor.to(BerryPhase, false);
+    enemyPokemon.forEach(p => expect(p.hp).toBe(p.getMaxHp()));
+  });
+
+  it("should fail if the user isn't hit with any attack", async () => {
+    game.override.enemyMoveset(Moves.SPLASH);
+
+    await game.startBattle([Species.CHARIZARD, Species.TURTONATOR]);
+
+    const playerPokemon = game.scene.getPlayerField();
+    const enemyPokemon = game.scene.getEnemyField();
+
+    game.move.select(Moves.SPLASH);
+    game.move.select(Moves.SHELL_TRAP, 1);
+
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.ENEMY_2, BattlerIndex.PLAYER, BattlerIndex.PLAYER_2]);
+
+    await game.phaseInterceptor.to(MoveEndPhase);
+
+    const movePhase = game.scene.getCurrentPhase();
+    expect(movePhase instanceof MovePhase).toBeTruthy();
+    expect((movePhase as MovePhase).pokemon).not.toBe(playerPokemon[1]);
+
+    await game.phaseInterceptor.to(BerryPhase, false);
+    enemyPokemon.forEach(p => expect(p.hp).toBe(p.getMaxHp()));
+  });
+
+  it("should not activate from an ally's attack", async () => {
+    game.override.enemyMoveset(Moves.SPLASH);
+
+    await game.startBattle([Species.BLASTOISE, Species.CHARIZARD]);
+
+    const playerPokemon = game.scene.getPlayerField();
+    const enemyPokemon = game.scene.getEnemyField();
+
+    game.move.select(Moves.SHELL_TRAP);
+    game.move.select(Moves.BULLDOZE, 1);
+
+    await game.phaseInterceptor.to(MoveEndPhase);
+
+    const movePhase = game.scene.getCurrentPhase();
+    expect(movePhase instanceof MovePhase).toBeTruthy();
+    expect((movePhase as MovePhase).pokemon).not.toBe(playerPokemon[1]);
+
+    const enemyStartingHp = enemyPokemon.map(p => p.hp);
+
+    await game.phaseInterceptor.to(BerryPhase, false);
+    enemyPokemon.forEach((p, i) => expect(p.hp).toBe(enemyStartingHp[i]));
+  });
+
+  it("should not activate from a subsequent physical attack", async () => {
+    game.override.battleStyle("single");
+    vi.spyOn(allMoves[Moves.RAZOR_LEAF], "priority", "get").mockReturnValue(-4);
+
+    await game.startBattle([Species.CHARIZARD]);
+
+    const playerPokemon = game.scene.getPlayerPokemon()!;
+    const enemyPokemon = game.scene.getEnemyPokemon()!;
+
+    game.move.select(Moves.SHELL_TRAP);
+
+    await game.phaseInterceptor.to(BerryPhase, false);
+
+    expect(playerPokemon.getLastXMoves()[0].result).toBe(MoveResult.FAIL);
+    expect(enemyPokemon.hp).toBe(enemyPokemon.getMaxHp());
+  });
+});
diff --git a/test/moves/simple_beam.test.ts b/test/moves/simple_beam.test.ts
new file mode 100644
index 00000000000..225fda28083
--- /dev/null
+++ b/test/moves/simple_beam.test.ts
@@ -0,0 +1,42 @@
+import { Abilities } from "#enums/abilities";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import GameManager from "#test/testUtils/gameManager";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
+
+describe("Moves - Simple Beam", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+    game.override
+      .moveset([Moves.SPLASH, Moves.SIMPLE_BEAM])
+      .ability(Abilities.BALL_FETCH)
+      .battleStyle("single")
+      .disableCrits()
+      .enemySpecies(Species.MAGIKARP)
+      .enemyAbility(Abilities.BALL_FETCH)
+      .enemyMoveset(Moves.SPLASH);
+  });
+
+  it("sets the target's ability to simple", async () => {
+    await game.classicMode.startBattle([Species.FEEBAS]);
+
+    game.move.select(Moves.SIMPLE_BEAM);
+    await game.phaseInterceptor.to("BerryPhase");
+
+    expect(game.scene.getEnemyPokemon()?.getAbility().id).toBe(Abilities.SIMPLE);
+  });
+});
diff --git a/src/test/moves/sketch.test.ts b/test/moves/sketch.test.ts
similarity index 80%
rename from src/test/moves/sketch.test.ts
rename to test/moves/sketch.test.ts
index f531f44ef0c..c9755189a71 100644
--- a/src/test/moves/sketch.test.ts
+++ b/test/moves/sketch.test.ts
@@ -2,12 +2,12 @@ import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { MoveResult, PokemonMove } from "#app/field/pokemon";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 import { StatusEffect } from "#app/enums/status-effect";
 import { BattlerIndex } from "#app/battle";
-import { allMoves, RandomMoveAttr } from "#app/data/move";
+import { allMoves, RandomMoveAttr } from "#app/data/moves/move";
 
 describe("Moves - Sketch", () => {
   let phaserGame: Phaser.Game;
@@ -27,7 +27,7 @@ describe("Moves - Sketch", () => {
     game = new GameManager(phaserGame);
     game.override
       .ability(Abilities.BALL_FETCH)
-      .battleType("single")
+      .battleStyle("single")
       .disableCrits()
       .enemySpecies(Species.SHUCKLE)
       .enemyAbility(Abilities.BALL_FETCH)
@@ -35,10 +35,10 @@ describe("Moves - Sketch", () => {
   });
 
   it("Sketch should not fail even if a previous Sketch failed to retrieve a valid move and ran out of PP", async () => {
-    await game.classicMode.startBattle([ Species.REGIELEKI ]);
+    await game.classicMode.startBattle([Species.REGIELEKI]);
     const playerPokemon = game.scene.getPlayerPokemon()!;
     // can't use normal moveset override because we need to check moveset changes
-    playerPokemon.moveset = [ new PokemonMove(Moves.SKETCH), new PokemonMove(Moves.SKETCH) ];
+    playerPokemon.moveset = [new PokemonMove(Moves.SKETCH), new PokemonMove(Moves.SKETCH)];
 
     game.move.select(Moves.SKETCH);
     await game.phaseInterceptor.to("TurnEndPhase");
@@ -57,20 +57,20 @@ describe("Moves - Sketch", () => {
 
   it("Sketch should retrieve the most recent valid move from its target history", async () => {
     game.override.enemyStatusEffect(StatusEffect.PARALYSIS);
-    await game.classicMode.startBattle([ Species.REGIELEKI ]);
+    await game.classicMode.startBattle([Species.REGIELEKI]);
     const playerPokemon = game.scene.getPlayerPokemon()!;
     const enemyPokemon = game.scene.getEnemyPokemon()!;
-    playerPokemon.moveset = [ new PokemonMove(Moves.SKETCH), new PokemonMove(Moves.GROWL) ];
+    playerPokemon.moveset = [new PokemonMove(Moves.SKETCH), new PokemonMove(Moves.GROWL)];
 
     game.move.select(Moves.GROWL);
-    await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
     await game.move.forceStatusActivation(false);
     await game.phaseInterceptor.to("TurnEndPhase");
     expect(enemyPokemon.getLastXMoves()[0].result).toBe(MoveResult.SUCCESS);
 
     await game.toNextTurn();
     game.move.select(Moves.SKETCH);
-    await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
     await game.move.forceStatusActivation(true);
     await game.phaseInterceptor.to("TurnEndPhase");
     expect(playerPokemon.getLastXMoves()[0].result).toBe(MoveResult.SUCCESS);
@@ -82,14 +82,14 @@ describe("Moves - Sketch", () => {
     const randomMoveAttr = allMoves[Moves.METRONOME].findAttr(attr => attr instanceof RandomMoveAttr) as RandomMoveAttr;
     vi.spyOn(randomMoveAttr, "getMoveOverride").mockReturnValue(Moves.FALSE_SWIPE);
 
-    game.override.enemyMoveset([ Moves.METRONOME ]);
-    await game.classicMode.startBattle([ Species.REGIELEKI ]);
+    game.override.enemyMoveset([Moves.METRONOME]);
+    await game.classicMode.startBattle([Species.REGIELEKI]);
     const playerPokemon = game.scene.getPlayerPokemon()!;
-    playerPokemon.moveset = [ new PokemonMove(Moves.SKETCH) ];
+    playerPokemon.moveset = [new PokemonMove(Moves.SKETCH)];
 
     // Opponent uses Metronome -> False Swipe, then player uses Sketch, which should sketch Metronome
     game.move.select(Moves.SKETCH);
-    await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
     await game.phaseInterceptor.to("TurnEndPhase");
     expect(playerPokemon.getLastXMoves()[0].result).toBe(MoveResult.SUCCESS);
     expect(playerPokemon.moveset[0]?.moveId).toBe(Moves.METRONOME);
diff --git a/test/moves/skill_swap.test.ts b/test/moves/skill_swap.test.ts
new file mode 100644
index 00000000000..562e4bb56ed
--- /dev/null
+++ b/test/moves/skill_swap.test.ts
@@ -0,0 +1,56 @@
+import { Stat } from "#app/enums/stat";
+import { Abilities } from "#enums/abilities";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import GameManager from "#test/testUtils/gameManager";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
+
+describe("Moves - Skill Swap", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+    game.override
+      .moveset([Moves.SPLASH, Moves.SKILL_SWAP])
+      .ability(Abilities.BALL_FETCH)
+      .battleStyle("single")
+      .disableCrits()
+      .enemySpecies(Species.MAGIKARP)
+      .enemyAbility(Abilities.BALL_FETCH)
+      .enemyMoveset(Moves.SPLASH);
+  });
+
+  it("should swap the two abilities", async () => {
+    game.override.ability(Abilities.ADAPTABILITY);
+    await game.classicMode.startBattle([Species.FEEBAS]);
+
+    game.move.select(Moves.SKILL_SWAP);
+    await game.phaseInterceptor.to("BerryPhase");
+
+    expect(game.scene.getPlayerPokemon()?.getAbility().id).toBe(Abilities.BALL_FETCH);
+    expect(game.scene.getEnemyPokemon()?.getAbility().id).toBe(Abilities.ADAPTABILITY);
+  });
+
+  it("should activate post-summon abilities", async () => {
+    game.override.ability(Abilities.INTIMIDATE);
+    await game.classicMode.startBattle([Species.FEEBAS]);
+
+    game.move.select(Moves.SKILL_SWAP);
+    await game.phaseInterceptor.to("BerryPhase");
+
+    // player atk should be -1 after opponent gains intimidate and it activates
+    expect(game.scene.getPlayerPokemon()?.getStatStage(Stat.ATK)).toBe(-1);
+  });
+});
diff --git a/src/test/moves/sleep_talk.test.ts b/test/moves/sleep_talk.test.ts
similarity index 73%
rename from src/test/moves/sleep_talk.test.ts
rename to test/moves/sleep_talk.test.ts
index 9ad2d23f903..cbe3b6d7d3a 100644
--- a/src/test/moves/sleep_talk.test.ts
+++ b/test/moves/sleep_talk.test.ts
@@ -4,7 +4,7 @@ import { MoveResult } from "#app/field/pokemon";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
@@ -25,10 +25,10 @@ describe("Moves - Sleep Talk", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     game.override
-      .moveset([ Moves.SPLASH, Moves.SLEEP_TALK ])
+      .moveset([Moves.SPLASH, Moves.SLEEP_TALK])
       .statusEffect(StatusEffect.SLEEP)
       .ability(Abilities.BALL_FETCH)
-      .battleType("single")
+      .battleStyle("single")
       .disableCrits()
       .enemySpecies(Species.MAGIKARP)
       .enemyAbility(Abilities.BALL_FETCH)
@@ -38,7 +38,7 @@ describe("Moves - Sleep Talk", () => {
 
   it("should fail when the user is not asleep", async () => {
     game.override.statusEffect(StatusEffect.NONE);
-    await game.classicMode.startBattle([ Species.FEEBAS ]);
+    await game.classicMode.startBattle([Species.FEEBAS]);
 
     game.move.select(Moves.SLEEP_TALK);
     await game.toNextTurn();
@@ -46,8 +46,8 @@ describe("Moves - Sleep Talk", () => {
   });
 
   it("should fail if the user has no valid moves", async () => {
-    game.override.moveset([ Moves.SLEEP_TALK, Moves.DIG, Moves.METRONOME, Moves.SOLAR_BEAM ]);
-    await game.classicMode.startBattle([ Species.FEEBAS ]);
+    game.override.moveset([Moves.SLEEP_TALK, Moves.DIG, Moves.METRONOME, Moves.SOLAR_BEAM]);
+    await game.classicMode.startBattle([Species.FEEBAS]);
 
     game.move.select(Moves.SLEEP_TALK);
     await game.toNextTurn();
@@ -55,8 +55,8 @@ describe("Moves - Sleep Talk", () => {
   });
 
   it("should call a random valid move if the user is asleep", async () => {
-    game.override.moveset([ Moves.SLEEP_TALK, Moves.DIG, Moves.FLY, Moves.SWORDS_DANCE ]); // Dig and Fly are invalid moves, Swords Dance should always be called
-    await game.classicMode.startBattle([ Species.FEEBAS ]);
+    game.override.moveset([Moves.SLEEP_TALK, Moves.DIG, Moves.FLY, Moves.SWORDS_DANCE]); // Dig and Fly are invalid moves, Swords Dance should always be called
+    await game.classicMode.startBattle([Species.FEEBAS]);
 
     game.move.select(Moves.SLEEP_TALK);
     await game.toNextTurn();
@@ -64,7 +64,7 @@ describe("Moves - Sleep Talk", () => {
   });
 
   it("should apply secondary effects of a move", async () => {
-    game.override.moveset([ Moves.SLEEP_TALK, Moves.DIG, Moves.FLY, Moves.WOOD_HAMMER ]); // Dig and Fly are invalid moves, Wood Hammer should always be called
+    game.override.moveset([Moves.SLEEP_TALK, Moves.DIG, Moves.FLY, Moves.WOOD_HAMMER]); // Dig and Fly are invalid moves, Wood Hammer should always be called
     await game.classicMode.startBattle();
 
     game.move.select(Moves.SLEEP_TALK);
diff --git a/src/test/moves/solar_beam.test.ts b/test/moves/solar_beam.test.ts
similarity index 88%
rename from src/test/moves/solar_beam.test.ts
rename to test/moves/solar_beam.test.ts
index ebec338932a..49605a70c66 100644
--- a/src/test/moves/solar_beam.test.ts
+++ b/test/moves/solar_beam.test.ts
@@ -1,11 +1,11 @@
-import { allMoves } from "#app/data/move";
+import { allMoves } from "#app/data/moves/move";
 import { BattlerTagType } from "#enums/battler-tag-type";
 import { WeatherType } from "#enums/weather-type";
 import { MoveResult } from "#app/field/pokemon";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, it, expect, vi } from "vitest";
 
@@ -27,7 +27,7 @@ describe("Moves - Solar Beam", () => {
     game = new GameManager(phaserGame);
     game.override
       .moveset(Moves.SOLAR_BEAM)
-      .battleType("single")
+      .battleStyle("single")
       .startingLevel(100)
       .enemySpecies(Species.SNORLAX)
       .enemyLevel(100)
@@ -36,7 +36,7 @@ describe("Moves - Solar Beam", () => {
   });
 
   it("should deal damage in two turns if no weather is active", async () => {
-    await game.classicMode.startBattle([ Species.MAGIKARP ]);
+    await game.classicMode.startBattle([Species.MAGIKARP]);
 
     const playerPokemon = game.scene.getPlayerPokemon()!;
     const enemyPokemon = game.scene.getEnemyPokemon()!;
@@ -60,11 +60,11 @@ describe("Moves - Solar Beam", () => {
 
   it.each([
     { weatherType: WeatherType.SUNNY, name: "Sun" },
-    { weatherType: WeatherType.HARSH_SUN, name: "Harsh Sun" }
+    { weatherType: WeatherType.HARSH_SUN, name: "Harsh Sun" },
   ])("should deal damage in one turn if $name is active", async ({ weatherType }) => {
     game.override.weather(weatherType);
 
-    await game.classicMode.startBattle([ Species.MAGIKARP ]);
+    await game.classicMode.startBattle([Species.MAGIKARP]);
 
     const playerPokemon = game.scene.getPlayerPokemon()!;
     const enemyPokemon = game.scene.getEnemyPokemon()!;
@@ -83,11 +83,11 @@ describe("Moves - Solar Beam", () => {
 
   it.each([
     { weatherType: WeatherType.RAIN, name: "Rain" },
-    { weatherType: WeatherType.HEAVY_RAIN, name: "Heavy Rain" }
+    { weatherType: WeatherType.HEAVY_RAIN, name: "Heavy Rain" },
   ])("should have its power halved in $name", async ({ weatherType }) => {
     game.override.weather(weatherType);
 
-    await game.classicMode.startBattle([ Species.MAGIKARP ]);
+    await game.classicMode.startBattle([Species.MAGIKARP]);
 
     const solarBeam = allMoves[Moves.SOLAR_BEAM];
 
diff --git a/src/test/moves/sparkly_swirl.test.ts b/test/moves/sparkly_swirl.test.ts
similarity index 79%
rename from src/test/moves/sparkly_swirl.test.ts
rename to test/moves/sparkly_swirl.test.ts
index a83f1c3a437..b9df302933c 100644
--- a/src/test/moves/sparkly_swirl.test.ts
+++ b/test/moves/sparkly_swirl.test.ts
@@ -1,10 +1,10 @@
-import { allMoves } from "#app/data/move";
+import { allMoves } from "#app/data/moves/move";
 import { StatusEffect } from "#app/enums/status-effect";
 import { CommandPhase } from "#app/phases/command-phase";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
@@ -27,18 +27,16 @@ describe("Moves - Sparkly Swirl", () => {
       .enemyLevel(100)
       .enemyMoveset(Moves.SPLASH)
       .enemyAbility(Abilities.BALL_FETCH)
-      .moveset([ Moves.SPARKLY_SWIRL, Moves.SPLASH ])
+      .moveset([Moves.SPARKLY_SWIRL, Moves.SPLASH])
       .ability(Abilities.BALL_FETCH);
 
     vi.spyOn(allMoves[Moves.SPARKLY_SWIRL], "accuracy", "get").mockReturnValue(100);
   });
 
   it("should cure status effect of the user, its ally, and all party pokemon", async () => {
-    game.override
-      .battleType("double")
-      .statusEffect(StatusEffect.BURN);
-    await game.classicMode.startBattle([ Species.RATTATA, Species.RATTATA, Species.RATTATA ]);
-    const [ leftPlayer, rightPlayer, partyPokemon ] = game.scene.getPlayerParty();
+    game.override.battleStyle("double").statusEffect(StatusEffect.BURN);
+    await game.classicMode.startBattle([Species.RATTATA, Species.RATTATA, Species.RATTATA]);
+    const [leftPlayer, rightPlayer, partyPokemon] = game.scene.getPlayerParty();
     const leftOpp = game.scene.getEnemyPokemon()!;
 
     vi.spyOn(leftPlayer, "resetStatus");
@@ -60,11 +58,9 @@ describe("Moves - Sparkly Swirl", () => {
   });
 
   it("should not cure status effect of the target/target's allies", async () => {
-    game.override
-      .battleType("double")
-      .enemyStatusEffect(StatusEffect.BURN);
-    await game.classicMode.startBattle([ Species.RATTATA, Species.RATTATA ]);
-    const [ leftOpp, rightOpp ] = game.scene.getEnemyField();
+    game.override.battleStyle("double").enemyStatusEffect(StatusEffect.BURN);
+    await game.classicMode.startBattle([Species.RATTATA, Species.RATTATA]);
+    const [leftOpp, rightOpp] = game.scene.getEnemyField();
 
     vi.spyOn(leftOpp, "resetStatus");
     vi.spyOn(rightOpp, "resetStatus");
diff --git a/test/moves/spectral_thief.test.ts b/test/moves/spectral_thief.test.ts
new file mode 100644
index 00000000000..2654ab1ad8d
--- /dev/null
+++ b/test/moves/spectral_thief.test.ts
@@ -0,0 +1,214 @@
+import { Abilities } from "#enums/abilities";
+import { BattlerIndex } from "#app/battle";
+import { Stat } from "#enums/stat";
+import { allMoves } from "#app/data/moves/move";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import { TurnEndPhase } from "#app/phases/turn-end-phase";
+import GameManager from "#test/testUtils/gameManager";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
+
+describe("Moves - Spectral Thief", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({ type: Phaser.HEADLESS });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+    game.override
+      .enemySpecies(Species.SHUCKLE)
+      .enemyLevel(100)
+      .enemyMoveset(Moves.SPLASH)
+      .enemyAbility(Abilities.BALL_FETCH)
+      .moveset([Moves.SPECTRAL_THIEF, Moves.SPLASH])
+      .ability(Abilities.BALL_FETCH).disableCrits;
+  });
+
+  it("should steal max possible positive stat changes and ignore negative ones.", async () => {
+    await game.classicMode.startBattle();
+
+    const player = game.scene.getPlayerPokemon()!;
+    const enemy = game.scene.getEnemyPokemon()!;
+
+    enemy.setStatStage(Stat.ATK, 6);
+    enemy.setStatStage(Stat.DEF, -6);
+    enemy.setStatStage(Stat.SPATK, 6);
+    enemy.setStatStage(Stat.SPDEF, -6);
+    enemy.setStatStage(Stat.SPD, 3);
+
+    player.setStatStage(Stat.ATK, 4);
+    player.setStatStage(Stat.DEF, 1);
+    player.setStatStage(Stat.SPATK, 0);
+    player.setStatStage(Stat.SPDEF, 0);
+    player.setStatStage(Stat.SPD, -2);
+
+    game.move.select(Moves.SPECTRAL_THIEF);
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    /**
+     * enemy has +6 ATK and player +4 => player only steals +2
+     * enemy has -6 DEF and player 1 => player should not steal
+     * enemy has +6 SPATK and player 0 => player only steals +6
+     * enemy has -6 SPDEF and player 0 => player should not steal
+     * enemy has +3 SPD and player -2 => player only steals +3
+     */
+    expect(player.getStatStages()).toEqual([6, 1, 6, 0, 1, 0, 0]);
+    expect(enemy.getStatStages()).toEqual([4, -6, 0, -6, 0, 0, 0]);
+  });
+
+  it("should steal stat stages before dmg calculation", async () => {
+    game.override.enemySpecies(Species.MAGIKARP).enemyLevel(50);
+    await game.classicMode.startBattle();
+
+    const player = game.scene.getPlayerPokemon()!;
+    const enemy = game.scene.getEnemyPokemon()!;
+    const moveToCheck = allMoves[Moves.SPECTRAL_THIEF];
+    const dmgBefore = enemy.getAttackDamage({ source: player, move: moveToCheck }).damage;
+
+    enemy.setStatStage(Stat.ATK, 6);
+
+    player.setStatStage(Stat.ATK, 0);
+
+    game.move.select(Moves.SPECTRAL_THIEF);
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    expect(dmgBefore).toBeLessThan(enemy.getAttackDamage({ source: player, move: moveToCheck }).damage);
+  });
+
+  it("should steal stat stages as a negative value with Contrary.", async () => {
+    game.override.ability(Abilities.CONTRARY);
+    await game.classicMode.startBattle();
+
+    const player = game.scene.getPlayerPokemon()!;
+    const enemy = game.scene.getEnemyPokemon()!;
+
+    enemy.setStatStage(Stat.ATK, 6);
+
+    player.setStatStage(Stat.ATK, 0);
+
+    game.move.select(Moves.SPECTRAL_THIEF);
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    expect(player.getStatStage(Stat.ATK)).toEqual(-6);
+    expect(enemy.getStatStage(Stat.ATK)).toEqual(0);
+  });
+
+  it("should steal double the stat stages with Simple.", async () => {
+    game.override.ability(Abilities.SIMPLE);
+    await game.classicMode.startBattle();
+
+    const player = game.scene.getPlayerPokemon()!;
+    const enemy = game.scene.getEnemyPokemon()!;
+
+    enemy.setStatStage(Stat.ATK, 3);
+
+    player.setStatStage(Stat.ATK, 0);
+
+    game.move.select(Moves.SPECTRAL_THIEF);
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    expect(player.getStatStage(Stat.ATK)).toEqual(6);
+    expect(enemy.getStatStage(Stat.ATK)).toEqual(0);
+  });
+
+  it("should steal the stat stages through Clear Body.", async () => {
+    game.override.enemyAbility(Abilities.CLEAR_BODY);
+    await game.classicMode.startBattle();
+
+    const player = game.scene.getPlayerPokemon()!;
+    const enemy = game.scene.getEnemyPokemon()!;
+
+    enemy.setStatStage(Stat.ATK, 3);
+
+    player.setStatStage(Stat.ATK, 0);
+
+    game.move.select(Moves.SPECTRAL_THIEF);
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    expect(player.getStatStage(Stat.ATK)).toEqual(3);
+    expect(enemy.getStatStage(Stat.ATK)).toEqual(0);
+  });
+
+  it("should steal the stat stages through White Smoke.", async () => {
+    game.override.enemyAbility(Abilities.WHITE_SMOKE);
+    await game.classicMode.startBattle();
+
+    const player = game.scene.getPlayerPokemon()!;
+    const enemy = game.scene.getEnemyPokemon()!;
+
+    enemy.setStatStage(Stat.ATK, 3);
+
+    player.setStatStage(Stat.ATK, 0);
+
+    game.move.select(Moves.SPECTRAL_THIEF);
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    expect(player.getStatStage(Stat.ATK)).toEqual(3);
+    expect(enemy.getStatStage(Stat.ATK)).toEqual(0);
+  });
+
+  it("should steal the stat stages through Hyper Cutter.", async () => {
+    game.override.enemyAbility(Abilities.HYPER_CUTTER);
+    await game.classicMode.startBattle();
+
+    const player = game.scene.getPlayerPokemon()!;
+    const enemy = game.scene.getEnemyPokemon()!;
+
+    enemy.setStatStage(Stat.ATK, 3);
+
+    player.setStatStage(Stat.ATK, 0);
+
+    game.move.select(Moves.SPECTRAL_THIEF);
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    expect(player.getStatStage(Stat.ATK)).toEqual(3);
+    expect(enemy.getStatStage(Stat.ATK)).toEqual(0);
+  });
+
+  it("should bypass Substitute.", async () => {
+    game.override.enemyMoveset(Moves.SUBSTITUTE);
+    await game.classicMode.startBattle();
+
+    const player = game.scene.getPlayerPokemon()!;
+    const enemy = game.scene.getEnemyPokemon()!;
+
+    enemy.setStatStage(Stat.ATK, 3);
+
+    player.setStatStage(Stat.ATK, 0);
+
+    game.move.select(Moves.SPECTRAL_THIEF);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    expect(player.getStatStage(Stat.ATK)).toEqual(3);
+    expect(enemy.getStatStage(Stat.ATK)).toEqual(0);
+    expect(enemy.hp).toBeLessThan(enemy.getMaxHp() - 1);
+  });
+
+  it("should get blocked by protect.", async () => {
+    game.override.enemyMoveset(Moves.PROTECT);
+    await game.classicMode.startBattle();
+
+    const player = game.scene.getPlayerPokemon()!;
+    const enemy = game.scene.getEnemyPokemon()!;
+
+    enemy.setStatStage(Stat.ATK, 3);
+
+    player.setStatStage(Stat.ATK, 0);
+
+    game.move.select(Moves.SPECTRAL_THIEF);
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    expect(player.getStatStage(Stat.ATK)).toEqual(0);
+    expect(enemy.getStatStage(Stat.ATK)).toEqual(3);
+    expect(enemy.hp).toBe(enemy.getMaxHp());
+  });
+});
diff --git a/src/test/moves/speed_swap.test.ts b/test/moves/speed_swap.test.ts
similarity index 88%
rename from src/test/moves/speed_swap.test.ts
rename to test/moves/speed_swap.test.ts
index 179f1212394..2b010885e34 100644
--- a/src/test/moves/speed_swap.test.ts
+++ b/test/moves/speed_swap.test.ts
@@ -1,6 +1,6 @@
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 import Phaser from "phaser";
-import GameManager from "#app/test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import { Species } from "#enums/species";
 import { TurnEndPhase } from "#app/phases/turn-end-phase";
 import { Moves } from "#enums/moves";
@@ -24,19 +24,17 @@ describe("Moves - Speed Swap", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     game.override
-      .battleType("single")
+      .battleStyle("single")
       .enemyAbility(Abilities.NONE)
       .enemyMoveset(Moves.SPLASH)
       .enemySpecies(Species.MEW)
       .enemyLevel(200)
-      .moveset([ Moves.SPEED_SWAP ])
+      .moveset([Moves.SPEED_SWAP])
       .ability(Abilities.NONE);
   });
 
   it("should swap the user's SPD and the target's SPD stats", async () => {
-    await game.startBattle([
-      Species.INDEEDEE
-    ]);
+    await game.startBattle([Species.INDEEDEE]);
 
     const player = game.scene.getPlayerPokemon()!;
     const enemy = game.scene.getEnemyPokemon()!;
diff --git a/src/test/moves/spikes.test.ts b/test/moves/spikes.test.ts
similarity index 67%
rename from src/test/moves/spikes.test.ts
rename to test/moves/spikes.test.ts
index 35e89c8caf7..3dfa398d7d6 100644
--- a/src/test/moves/spikes.test.ts
+++ b/test/moves/spikes.test.ts
@@ -1,10 +1,10 @@
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
-
+import { ArenaTagSide, ArenaTrapTag } from "#app/data/arena-tag";
 
 describe("Moves - Spikes", () => {
   let phaserGame: Phaser.Game;
@@ -23,16 +23,16 @@ describe("Moves - Spikes", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     game.override
-      .battleType("single")
+      .battleStyle("single")
       .enemySpecies(Species.MAGIKARP)
       .enemyAbility(Abilities.BALL_FETCH)
       .ability(Abilities.BALL_FETCH)
       .enemyMoveset(Moves.SPLASH)
-      .moveset([ Moves.SPIKES, Moves.SPLASH, Moves.ROAR ]);
+      .moveset([Moves.SPIKES, Moves.SPLASH, Moves.ROAR]);
   });
 
   it("should not damage the team that set them", async () => {
-    await game.startBattle([ Species.MIGHTYENA, Species.POOCHYENA ]);
+    await game.startBattle([Species.MIGHTYENA, Species.POOCHYENA]);
 
     game.move.select(Moves.SPIKES);
     await game.toNextTurn();
@@ -52,7 +52,7 @@ describe("Moves - Spikes", () => {
 
   it("should damage opposing pokemon that are forced to switch in", async () => {
     game.override.startingWave(5);
-    await game.startBattle([ Species.MIGHTYENA, Species.POOCHYENA ]);
+    await game.startBattle([Species.MIGHTYENA, Species.POOCHYENA]);
 
     game.move.select(Moves.SPIKES);
     await game.toNextTurn();
@@ -66,7 +66,7 @@ describe("Moves - Spikes", () => {
 
   it("should damage opposing pokemon that choose to switch in", async () => {
     game.override.startingWave(5);
-    await game.startBattle([ Species.MIGHTYENA, Species.POOCHYENA ]);
+    await game.startBattle([Species.MIGHTYENA, Species.POOCHYENA]);
 
     game.move.select(Moves.SPIKES);
     await game.toNextTurn();
@@ -79,4 +79,16 @@ describe("Moves - Spikes", () => {
     expect(enemy.hp).toBeLessThan(enemy.getMaxHp());
   }, 20000);
 
+  it("should work when all targets fainted", async () => {
+    game.override.enemySpecies(Species.DIGLETT);
+    game.override.battleStyle("double");
+    game.override.startingLevel(50);
+    await game.classicMode.startBattle([Species.RAYQUAZA, Species.ROWLET]);
+
+    game.move.select(Moves.EARTHQUAKE);
+    game.move.select(Moves.SPIKES, 1);
+    await game.phaseInterceptor.to("TurnEndPhase");
+
+    expect(game.scene.arena.getTagOnSide(ArenaTrapTag, ArenaTagSide.ENEMY)).toBeDefined();
+  }, 20000);
 });
diff --git a/src/test/moves/spit_up.test.ts b/test/moves/spit_up.test.ts
similarity index 85%
rename from src/test/moves/spit_up.test.ts
rename to test/moves/spit_up.test.ts
index 7f9dfaad38b..c034117bc64 100644
--- a/src/test/moves/spit_up.test.ts
+++ b/test/moves/spit_up.test.ts
@@ -1,12 +1,13 @@
 import { Stat } from "#enums/stat";
 import { StockpilingTag } from "#app/data/battler-tags";
-import { allMoves } from "#app/data/move";
+import { allMoves } from "#app/data/moves/move";
 import { BattlerTagType } from "#app/enums/battler-tag-type";
 import type { TurnMove } from "#app/field/pokemon";
 import { MoveResult } from "#app/field/pokemon";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
+import type Move from "#app/data/moves/move";
 import { Species } from "#enums/species";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
@@ -17,7 +18,7 @@ describe("Moves - Spit Up", () => {
   let phaserGame: Phaser.Game;
   let game: GameManager;
 
-  const spitUp = allMoves[Moves.SPIT_UP];
+  let spitUp: Move;
 
   beforeAll(() => {
     phaserGame = new Phaser.Game({ type: Phaser.HEADLESS });
@@ -28,9 +29,10 @@ describe("Moves - Spit Up", () => {
   });
 
   beforeEach(() => {
+    spitUp = allMoves[Moves.SPIT_UP];
     game = new GameManager(phaserGame);
 
-    game.override.battleType("single");
+    game.override.battleStyle("single");
 
     game.override.enemySpecies(Species.RATTATA);
     game.override.enemyMoveset(Moves.SPLASH);
@@ -48,7 +50,7 @@ describe("Moves - Spit Up", () => {
       const stacksToSetup = 1;
       const expectedPower = 100;
 
-      await game.startBattle([ Species.ABOMASNOW ]);
+      await game.startBattle([Species.ABOMASNOW]);
 
       const pokemon = game.scene.getPlayerPokemon()!;
       pokemon.addTag(BattlerTagType.STOCKPILING);
@@ -70,7 +72,7 @@ describe("Moves - Spit Up", () => {
       const stacksToSetup = 2;
       const expectedPower = 200;
 
-      await game.startBattle([ Species.ABOMASNOW ]);
+      await game.startBattle([Species.ABOMASNOW]);
 
       const pokemon = game.scene.getPlayerPokemon()!;
       pokemon.addTag(BattlerTagType.STOCKPILING);
@@ -93,7 +95,7 @@ describe("Moves - Spit Up", () => {
       const stacksToSetup = 3;
       const expectedPower = 300;
 
-      await game.startBattle([ Species.ABOMASNOW ]);
+      await game.startBattle([Species.ABOMASNOW]);
 
       const pokemon = game.scene.getPlayerPokemon()!;
       pokemon.addTag(BattlerTagType.STOCKPILING);
@@ -115,7 +117,7 @@ describe("Moves - Spit Up", () => {
   });
 
   it("fails without stacks", async () => {
-    await game.startBattle([ Species.ABOMASNOW ]);
+    await game.startBattle([Species.ABOMASNOW]);
 
     const pokemon = game.scene.getPlayerPokemon()!;
 
@@ -125,14 +127,18 @@ describe("Moves - Spit Up", () => {
     game.move.select(Moves.SPIT_UP);
     await game.phaseInterceptor.to(TurnInitPhase);
 
-    expect(pokemon.getMoveHistory().at(-1)).toMatchObject<TurnMove>({ move: Moves.SPIT_UP, result: MoveResult.FAIL, targets: [ game.scene.getEnemyPokemon()!.getBattlerIndex() ]});
+    expect(pokemon.getMoveHistory().at(-1)).toMatchObject<TurnMove>({
+      move: Moves.SPIT_UP,
+      result: MoveResult.FAIL,
+      targets: [game.scene.getEnemyPokemon()!.getBattlerIndex()],
+    });
 
     expect(spitUp.calculateBattlePower).not.toHaveBeenCalled();
   });
 
   describe("restores stat boosts granted by stacks", () => {
     it("decreases stats based on stored values (both boosts equal)", async () => {
-      await game.startBattle([ Species.ABOMASNOW ]);
+      await game.startBattle([Species.ABOMASNOW]);
 
       const pokemon = game.scene.getPlayerPokemon()!;
       pokemon.addTag(BattlerTagType.STOCKPILING);
@@ -148,7 +154,11 @@ describe("Moves - Spit Up", () => {
 
       await game.phaseInterceptor.to(TurnInitPhase);
 
-      expect(pokemon.getMoveHistory().at(-1)).toMatchObject<TurnMove>({ move: Moves.SPIT_UP, result: MoveResult.SUCCESS, targets: [ game.scene.getEnemyPokemon()!.getBattlerIndex() ]});
+      expect(pokemon.getMoveHistory().at(-1)).toMatchObject<TurnMove>({
+        move: Moves.SPIT_UP,
+        result: MoveResult.SUCCESS,
+        targets: [game.scene.getEnemyPokemon()!.getBattlerIndex()],
+      });
 
       expect(spitUp.calculateBattlePower).toHaveBeenCalledOnce();
 
@@ -159,7 +169,7 @@ describe("Moves - Spit Up", () => {
     });
 
     it("decreases stats based on stored values (different boosts)", async () => {
-      await game.startBattle([ Species.ABOMASNOW ]);
+      await game.startBattle([Species.ABOMASNOW]);
 
       const pokemon = game.scene.getPlayerPokemon()!;
       pokemon.addTag(BattlerTagType.STOCKPILING);
@@ -176,7 +186,11 @@ describe("Moves - Spit Up", () => {
       game.move.select(Moves.SPIT_UP);
       await game.phaseInterceptor.to(TurnInitPhase);
 
-      expect(pokemon.getMoveHistory().at(-1)).toMatchObject<TurnMove>({ move: Moves.SPIT_UP, result: MoveResult.SUCCESS, targets: [ game.scene.getEnemyPokemon()!.getBattlerIndex() ]});
+      expect(pokemon.getMoveHistory().at(-1)).toMatchObject<TurnMove>({
+        move: Moves.SPIT_UP,
+        result: MoveResult.SUCCESS,
+        targets: [game.scene.getEnemyPokemon()!.getBattlerIndex()],
+      });
 
       expect(spitUp.calculateBattlePower).toHaveBeenCalledOnce();
 
diff --git a/test/moves/spotlight.test.ts b/test/moves/spotlight.test.ts
new file mode 100644
index 00000000000..2c4f652e408
--- /dev/null
+++ b/test/moves/spotlight.test.ts
@@ -0,0 +1,67 @@
+import { BattlerIndex } from "#app/battle";
+import { TurnEndPhase } from "#app/phases/turn-end-phase";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import GameManager from "#test/testUtils/gameManager";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest";
+
+describe("Moves - Spotlight", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+    game.override.battleStyle("double");
+    game.override.starterSpecies(Species.AMOONGUSS);
+    game.override.enemySpecies(Species.SNORLAX);
+    game.override.startingLevel(100);
+    game.override.enemyLevel(100);
+    game.override.moveset([Moves.FOLLOW_ME, Moves.RAGE_POWDER, Moves.SPOTLIGHT, Moves.QUICK_ATTACK]);
+    game.override.enemyMoveset([Moves.FOLLOW_ME, Moves.SPLASH]);
+  });
+
+  test("move should redirect attacks to the target", async () => {
+    await game.classicMode.startBattle([Species.AMOONGUSS, Species.CHARIZARD]);
+
+    const enemyPokemon = game.scene.getEnemyField();
+
+    game.move.select(Moves.SPOTLIGHT, 0, BattlerIndex.ENEMY);
+    game.move.select(Moves.QUICK_ATTACK, 1, BattlerIndex.ENEMY_2);
+
+    await game.forceEnemyMove(Moves.SPLASH);
+    await game.forceEnemyMove(Moves.SPLASH);
+
+    await game.phaseInterceptor.to(TurnEndPhase, false);
+
+    expect(enemyPokemon[0].hp).toBeLessThan(enemyPokemon[0].getMaxHp());
+    expect(enemyPokemon[1].hp).toBe(enemyPokemon[1].getMaxHp());
+  });
+
+  test("move should cause other redirection moves to fail", async () => {
+    await game.classicMode.startBattle([Species.AMOONGUSS, Species.CHARIZARD]);
+
+    const enemyPokemon = game.scene.getEnemyField();
+
+    game.move.select(Moves.SPOTLIGHT, 0, BattlerIndex.ENEMY);
+    game.move.select(Moves.QUICK_ATTACK, 1, BattlerIndex.ENEMY_2);
+
+    await game.forceEnemyMove(Moves.SPLASH);
+    await game.forceEnemyMove(Moves.FOLLOW_ME);
+
+    await game.phaseInterceptor.to("BerryPhase", false);
+
+    expect(enemyPokemon[0].hp).toBeLessThan(enemyPokemon[0].getMaxHp());
+    expect(enemyPokemon[1].hp).toBe(enemyPokemon[1].getMaxHp());
+  });
+});
diff --git a/src/test/moves/steamroller.test.ts b/test/moves/steamroller.test.ts
similarity index 78%
rename from src/test/moves/steamroller.test.ts
rename to test/moves/steamroller.test.ts
index f641c58c2d1..b32b4551c81 100644
--- a/src/test/moves/steamroller.test.ts
+++ b/test/moves/steamroller.test.ts
@@ -1,11 +1,11 @@
 import { BattlerIndex } from "#app/battle";
-import { allMoves } from "#app/data/move";
+import { allMoves } from "#app/data/moves/move";
 import { BattlerTagType } from "#app/enums/battler-tag-type";
 import type { DamageCalculationResult } from "#app/field/pokemon";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
@@ -25,12 +25,12 @@ describe("Moves - Steamroller", () => {
 
   beforeEach(() => {
     game = new GameManager(phaserGame);
-    game.override.moveset([ Moves.STEAMROLLER ]).battleType("single").enemyAbility(Abilities.BALL_FETCH);
+    game.override.moveset([Moves.STEAMROLLER]).battleStyle("single").enemyAbility(Abilities.BALL_FETCH);
   });
 
   it("should always hit a minimzed target with double damage", async () => {
     game.override.enemySpecies(Species.DITTO).enemyMoveset(Moves.MINIMIZE);
-    await game.classicMode.startBattle([ Species.IRON_BOULDER ]);
+    await game.classicMode.startBattle([Species.IRON_BOULDER]);
 
     const ditto = game.scene.getEnemyPokemon()!;
     vi.spyOn(ditto, "getAttackDamage");
@@ -41,15 +41,15 @@ describe("Moves - Steamroller", () => {
     vi.spyOn(ironBoulder, "getAccuracyMultiplier");
     // Turn 1
     game.move.select(Moves.STEAMROLLER);
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
     await game.toNextTurn();
     // Turn 2
     game.move.select(Moves.STEAMROLLER);
     await game.toNextTurn();
 
-    const [ dmgCalcTurn1, dmgCalcTurn2 ]: DamageCalculationResult[] = vi
+    const [dmgCalcTurn1, dmgCalcTurn2]: DamageCalculationResult[] = vi
       .mocked(ditto.getAttackDamage)
-      .mock.results.map((r) => r.value);
+      .mock.results.map(r => r.value);
 
     expect(dmgCalcTurn2.damage).toBeGreaterThanOrEqual(dmgCalcTurn1.damage * 2);
     expect(ditto.getTag(BattlerTagType.MINIMIZED)).toBeDefined();
diff --git a/src/test/moves/stockpile.test.ts b/test/moves/stockpile.test.ts
similarity index 87%
rename from src/test/moves/stockpile.test.ts
rename to test/moves/stockpile.test.ts
index f83459cd09d..4b8f51c32b2 100644
--- a/src/test/moves/stockpile.test.ts
+++ b/test/moves/stockpile.test.ts
@@ -7,7 +7,7 @@ import { TurnInitPhase } from "#app/phases/turn-init-phase";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
@@ -27,19 +27,19 @@ describe("Moves - Stockpile", () => {
     beforeEach(() => {
       game = new GameManager(phaserGame);
 
-      game.override.battleType("single");
+      game.override.battleStyle("single");
 
       game.override.enemySpecies(Species.RATTATA);
       game.override.enemyMoveset(Moves.SPLASH);
       game.override.enemyAbility(Abilities.NONE);
 
       game.override.startingLevel(2000);
-      game.override.moveset([ Moves.STOCKPILE, Moves.SPLASH ]);
+      game.override.moveset([Moves.STOCKPILE, Moves.SPLASH]);
       game.override.ability(Abilities.NONE);
     });
 
     it("gains a stockpile stack and raises user's DEF and SPDEF stat stages by 1 on each use, fails at max stacks (3)", async () => {
-      await game.startBattle([ Species.ABOMASNOW ]);
+      await game.startBattle([Species.ABOMASNOW]);
 
       const user = game.scene.getPlayerPokemon()!;
 
@@ -61,24 +61,29 @@ describe("Moves - Stockpile", () => {
 
         const stockpilingTag = user.getTag(StockpilingTag)!;
 
-        if (i < 3) { // first three uses should behave normally
+        if (i < 3) {
+          // first three uses should behave normally
           expect(user.getStatStage(Stat.DEF)).toBe(i + 1);
           expect(user.getStatStage(Stat.SPDEF)).toBe(i + 1);
           expect(stockpilingTag).toBeDefined();
           expect(stockpilingTag.stockpiledCount).toBe(i + 1);
-
-        } else { // fourth should have failed
+        } else {
+          // fourth should have failed
           expect(user.getStatStage(Stat.DEF)).toBe(3);
           expect(user.getStatStage(Stat.SPDEF)).toBe(3);
           expect(stockpilingTag).toBeDefined();
           expect(stockpilingTag.stockpiledCount).toBe(3);
-          expect(user.getMoveHistory().at(-1)).toMatchObject<TurnMove>({ result: MoveResult.FAIL, move: Moves.STOCKPILE, targets: [ user.getBattlerIndex() ]});
+          expect(user.getMoveHistory().at(-1)).toMatchObject<TurnMove>({
+            result: MoveResult.FAIL,
+            move: Moves.STOCKPILE,
+            targets: [user.getBattlerIndex()],
+          });
         }
       }
     });
 
     it("gains a stockpile stack even if user's DEF and SPDEF stat stages are at +6", async () => {
-      await game.startBattle([ Species.ABOMASNOW ]);
+      await game.startBattle([Species.ABOMASNOW]);
 
       const user = game.scene.getPlayerPokemon()!;
 
diff --git a/test/moves/struggle.test.ts b/test/moves/struggle.test.ts
new file mode 100644
index 00000000000..61c6cd23e10
--- /dev/null
+++ b/test/moves/struggle.test.ts
@@ -0,0 +1,65 @@
+import { Abilities } from "#enums/abilities";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import GameManager from "#test/testUtils/gameManager";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
+
+describe("Moves - Struggle", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+    game.override
+      .moveset([Moves.SPLASH])
+      .ability(Abilities.BALL_FETCH)
+      .battleStyle("single")
+      .disableCrits()
+      .enemySpecies(Species.MAGIKARP)
+      .enemyAbility(Abilities.BALL_FETCH)
+      .enemyMoveset(Moves.SPLASH);
+  });
+
+  it("should not have its power boosted by adaptability or stab", async () => {
+    game.override.moveset([Moves.STRUGGLE]).ability(Abilities.ADAPTABILITY);
+    await game.classicMode.startBattle([Species.RATTATA]);
+
+    const enemy = game.scene.getEnemyPokemon()!;
+    game.move.select(Moves.STRUGGLE);
+
+    const stabSpy = vi.spyOn(enemy, "calculateStabMultiplier");
+
+    await game.phaseInterceptor.to("BerryPhase");
+
+    expect(stabSpy).toHaveReturnedWith(1);
+
+    stabSpy.mockRestore();
+  });
+
+  it("should ignore type effectiveness", async () => {
+    game.override.moveset([Moves.STRUGGLE]);
+    await game.classicMode.startBattle([Species.GASTLY]);
+
+    const enemy = game.scene.getEnemyPokemon()!;
+    game.move.select(Moves.STRUGGLE);
+
+    const moveEffectivenessSpy = vi.spyOn(enemy, "getMoveEffectiveness");
+
+    await game.phaseInterceptor.to("BerryPhase");
+
+    expect(moveEffectivenessSpy).toHaveReturnedWith(1);
+
+    moveEffectivenessSpy.mockRestore();
+  });
+});
diff --git a/test/moves/substitute.test.ts b/test/moves/substitute.test.ts
new file mode 100644
index 00000000000..7f4a2e69f9e
--- /dev/null
+++ b/test/moves/substitute.test.ts
@@ -0,0 +1,521 @@
+import { BattlerIndex } from "#app/battle";
+import { ArenaTagSide } from "#app/data/arena-tag";
+import { SubstituteTag, TrappedTag } from "#app/data/battler-tags";
+import { allMoves, StealHeldItemChanceAttr } from "#app/data/moves/move";
+import { MoveResult } from "#app/field/pokemon";
+import type { CommandPhase } from "#app/phases/command-phase";
+import GameManager from "#test/testUtils/gameManager";
+import { Command } from "#app/ui/command-ui-handler";
+import { UiMode } from "#enums/ui-mode";
+import { Abilities } from "#enums/abilities";
+import { ArenaTagType } from "#enums/arena-tag-type";
+import { BattlerTagType } from "#enums/battler-tag-type";
+import { BerryType } from "#enums/berry-type";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import { Stat } from "#enums/stat";
+import { StatusEffect } from "#enums/status-effect";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
+
+describe("Moves - Substitute", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+
+    game.override
+      .battleStyle("single")
+      .moveset([Moves.SUBSTITUTE, Moves.SWORDS_DANCE, Moves.TACKLE, Moves.SPLASH])
+      .enemySpecies(Species.SNORLAX)
+      .enemyAbility(Abilities.INSOMNIA)
+      .enemyMoveset(Moves.SPLASH)
+      .startingLevel(100)
+      .enemyLevel(100);
+  });
+
+  it("should cause the user to take damage", async () => {
+    await game.classicMode.startBattle([Species.MAGIKARP]);
+
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+
+    game.move.select(Moves.SUBSTITUTE);
+
+    await game.phaseInterceptor.to("MoveEndPhase", false);
+
+    expect(leadPokemon.hp).toBe(Math.ceil((leadPokemon.getMaxHp() * 3) / 4));
+  });
+
+  it("should redirect enemy attack damage to the Substitute doll", async () => {
+    game.override.enemyMoveset(Moves.TACKLE);
+
+    await game.classicMode.startBattle([Species.SKARMORY]);
+
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+
+    game.move.select(Moves.SUBSTITUTE);
+
+    await game.phaseInterceptor.to("MoveEndPhase", false);
+
+    expect(leadPokemon.hp).toBe(Math.ceil((leadPokemon.getMaxHp() * 3) / 4));
+    expect(leadPokemon.getTag(BattlerTagType.SUBSTITUTE)).toBeDefined();
+    const postSubHp = leadPokemon.hp;
+
+    await game.phaseInterceptor.to("BerryPhase", false);
+
+    expect(leadPokemon.hp).toBe(postSubHp);
+    expect(leadPokemon.getTag(BattlerTagType.SUBSTITUTE)).toBeDefined();
+  });
+
+  it("should fade after redirecting more damage than its remaining HP", async () => {
+    // Giga Impact OHKOs Magikarp if substitute isn't up
+    game.override.enemyMoveset(Moves.GIGA_IMPACT);
+    vi.spyOn(allMoves[Moves.GIGA_IMPACT], "accuracy", "get").mockReturnValue(100);
+
+    await game.classicMode.startBattle([Species.MAGIKARP]);
+
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+
+    game.move.select(Moves.SUBSTITUTE);
+
+    await game.phaseInterceptor.to("MoveEndPhase", false);
+
+    expect(leadPokemon.hp).toBe(Math.ceil((leadPokemon.getMaxHp() * 3) / 4));
+    expect(leadPokemon.getTag(BattlerTagType.SUBSTITUTE)).toBeDefined();
+    const postSubHp = leadPokemon.hp;
+
+    await game.phaseInterceptor.to("BerryPhase", false);
+
+    expect(leadPokemon.hp).toBe(postSubHp);
+    expect(leadPokemon.getTag(BattlerTagType.SUBSTITUTE)).toBeUndefined();
+  });
+
+  it("should block stat changes from status moves", async () => {
+    game.override.enemyMoveset(Moves.CHARM);
+
+    await game.classicMode.startBattle([Species.MAGIKARP]);
+
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+
+    game.move.select(Moves.SUBSTITUTE);
+
+    await game.phaseInterceptor.to("BerryPhase", false);
+
+    expect(leadPokemon.getStatStage(Stat.ATK)).toBe(0);
+    expect(leadPokemon.getTag(BattlerTagType.SUBSTITUTE)).toBeDefined();
+  });
+
+  it("should be bypassed by sound-based moves", async () => {
+    game.override.enemyMoveset(Moves.ECHOED_VOICE);
+
+    await game.classicMode.startBattle([Species.BLASTOISE]);
+
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+
+    game.move.select(Moves.SUBSTITUTE);
+
+    await game.phaseInterceptor.to("MoveEndPhase");
+
+    expect(leadPokemon.getTag(BattlerTagType.SUBSTITUTE)).toBeDefined();
+    const postSubHp = leadPokemon.hp;
+
+    await game.phaseInterceptor.to("BerryPhase", false);
+
+    expect(leadPokemon.getTag(BattlerTagType.SUBSTITUTE)).toBeDefined();
+    expect(leadPokemon.hp).toBeLessThan(postSubHp);
+  });
+
+  it("should be bypassed by attackers with Infiltrator", async () => {
+    game.override.enemyMoveset(Moves.TACKLE);
+    game.override.enemyAbility(Abilities.INFILTRATOR);
+
+    await game.classicMode.startBattle([Species.BLASTOISE]);
+
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+
+    game.move.select(Moves.SUBSTITUTE);
+
+    await game.phaseInterceptor.to("MoveEndPhase");
+
+    expect(leadPokemon.getTag(BattlerTagType.SUBSTITUTE)).toBeDefined();
+    const postSubHp = leadPokemon.hp;
+
+    await game.phaseInterceptor.to("BerryPhase", false);
+
+    expect(leadPokemon.getTag(BattlerTagType.SUBSTITUTE)).toBeDefined();
+    expect(leadPokemon.hp).toBeLessThan(postSubHp);
+  });
+
+  it("shouldn't block the user's own status moves", async () => {
+    await game.classicMode.startBattle([Species.BLASTOISE]);
+
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+
+    game.move.select(Moves.SUBSTITUTE);
+
+    await game.phaseInterceptor.to("MoveEndPhase");
+    await game.toNextTurn();
+
+    game.move.select(Moves.SWORDS_DANCE);
+
+    await game.phaseInterceptor.to("MoveEndPhase", false);
+
+    expect(leadPokemon.getStatStage(Stat.ATK)).toBe(2);
+  });
+
+  it("shouldn't block moves that target the user's side of the field", async () => {
+    game.override.moveset(Moves.LIGHT_SCREEN);
+
+    await game.classicMode.startBattle([Species.BLASTOISE]);
+
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+    vi.spyOn(leadPokemon, "getMoveEffectiveness");
+
+    leadPokemon.addTag(BattlerTagType.SUBSTITUTE, 0, Moves.NONE, leadPokemon.id);
+
+    game.move.select(Moves.LIGHT_SCREEN);
+
+    await game.toNextTurn();
+
+    expect(leadPokemon.getMoveEffectiveness).not.toHaveReturnedWith(0);
+    expect(game.scene.arena.getTagOnSide(ArenaTagType.LIGHT_SCREEN, ArenaTagSide.PLAYER)).toBeDefined();
+  });
+
+  it("shouldn't block the opponent from setting hazards", async () => {
+    game.override.enemyMoveset(Moves.STEALTH_ROCK);
+
+    await game.classicMode.startBattle([Species.BLASTOISE]);
+
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+    vi.spyOn(leadPokemon, "getMoveEffectiveness");
+
+    game.move.select(Moves.SUBSTITUTE);
+
+    await game.toNextTurn();
+
+    expect(leadPokemon.getMoveEffectiveness).not.toHaveReturnedWith(0);
+    expect(game.scene.arena.getTagOnSide(ArenaTagType.STEALTH_ROCK, ArenaTagSide.PLAYER)).toBeDefined();
+  });
+
+  it("shouldn't block moves that target both sides of the field", async () => {
+    game.override.moveset(Moves.TRICK_ROOM).enemyMoveset(Moves.GRAVITY);
+
+    await game.classicMode.startBattle([Species.BLASTOISE]);
+
+    const pokemon = game.scene.getField(true);
+    pokemon.forEach(p => {
+      vi.spyOn(p, "getMoveEffectiveness");
+      p.addTag(BattlerTagType.SUBSTITUTE, 0, Moves.NONE, p.id);
+    });
+
+    game.move.select(Moves.TRICK_ROOM);
+
+    await game.toNextTurn();
+
+    pokemon.forEach(p => expect(p.getMoveEffectiveness).not.toHaveReturnedWith(0));
+    expect(game.scene.arena.getTag(ArenaTagType.TRICK_ROOM)).toBeDefined();
+    expect(game.scene.arena.getTag(ArenaTagType.GRAVITY)).toBeDefined();
+  });
+
+  it("should protect the user from flinching", async () => {
+    game.override.enemyMoveset(Moves.FAKE_OUT);
+    game.override.startingLevel(1); // Ensures the Substitute will break
+
+    await game.classicMode.startBattle([Species.BLASTOISE]);
+
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+    const enemyPokemon = game.scene.getEnemyPokemon()!;
+
+    leadPokemon.addTag(BattlerTagType.SUBSTITUTE, 0, Moves.NONE, leadPokemon.id);
+
+    game.move.select(Moves.TACKLE);
+
+    await game.phaseInterceptor.to("BerryPhase", false);
+
+    expect(enemyPokemon.hp).toBeLessThan(enemyPokemon.getMaxHp());
+  });
+
+  it("should protect the user from being trapped", async () => {
+    vi.spyOn(allMoves[Moves.SAND_TOMB], "accuracy", "get").mockReturnValue(100);
+    game.override.enemyMoveset(Moves.SAND_TOMB);
+
+    await game.classicMode.startBattle([Species.BLASTOISE]);
+
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+
+    leadPokemon.addTag(BattlerTagType.SUBSTITUTE, 0, Moves.NONE, leadPokemon.id);
+
+    game.move.select(Moves.SPLASH);
+
+    await game.phaseInterceptor.to("BerryPhase", false);
+
+    expect(leadPokemon.getTag(TrappedTag)).toBeUndefined();
+  });
+
+  it("should prevent the user's stats from being lowered", async () => {
+    vi.spyOn(allMoves[Moves.LIQUIDATION], "chance", "get").mockReturnValue(100);
+    game.override.enemyMoveset(Moves.LIQUIDATION);
+
+    await game.classicMode.startBattle([Species.BLASTOISE]);
+
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+
+    leadPokemon.addTag(BattlerTagType.SUBSTITUTE, 0, Moves.NONE, leadPokemon.id);
+
+    game.move.select(Moves.SPLASH);
+
+    await game.phaseInterceptor.to("BerryPhase", false);
+
+    expect(leadPokemon.getStatStage(Stat.DEF)).toBe(0);
+  });
+
+  it("should protect the user from being afflicted with status effects", async () => {
+    game.override.enemyMoveset(Moves.NUZZLE);
+
+    await game.classicMode.startBattle([Species.BLASTOISE]);
+
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+
+    leadPokemon.addTag(BattlerTagType.SUBSTITUTE, 0, Moves.NONE, leadPokemon.id);
+
+    game.move.select(Moves.SPLASH);
+
+    await game.phaseInterceptor.to("BerryPhase", false);
+
+    expect(leadPokemon.status?.effect).not.toBe(StatusEffect.PARALYSIS);
+  });
+
+  it("should prevent the user's items from being stolen", async () => {
+    game.override.enemyMoveset(Moves.THIEF);
+    vi.spyOn(allMoves[Moves.THIEF], "attrs", "get").mockReturnValue([new StealHeldItemChanceAttr(1.0)]); // give Thief 100% steal rate
+    game.override.startingHeldItems([{ name: "BERRY", type: BerryType.SITRUS }]);
+
+    await game.classicMode.startBattle([Species.BLASTOISE]);
+
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+
+    leadPokemon.addTag(BattlerTagType.SUBSTITUTE, 0, Moves.NONE, leadPokemon.id);
+
+    game.move.select(Moves.SPLASH);
+
+    await game.phaseInterceptor.to("BerryPhase", false);
+
+    expect(leadPokemon.getHeldItems().length).toBe(1);
+  });
+
+  it("should prevent the user's items from being removed", async () => {
+    game.override.moveset([Moves.KNOCK_OFF]);
+    game.override.enemyHeldItems([{ name: "BERRY", type: BerryType.SITRUS }]);
+
+    await game.classicMode.startBattle([Species.BLASTOISE]);
+
+    const enemyPokemon = game.scene.getEnemyPokemon()!;
+
+    enemyPokemon.addTag(BattlerTagType.SUBSTITUTE, 0, Moves.NONE, enemyPokemon.id);
+    const enemyNumItems = enemyPokemon.getHeldItems().length;
+
+    game.move.select(Moves.KNOCK_OFF);
+
+    await game.phaseInterceptor.to("MoveEndPhase", false);
+
+    expect(enemyPokemon.getHeldItems().length).toBe(enemyNumItems);
+  });
+
+  it("move effect should prevent the user's berries from being stolen and eaten", async () => {
+    game.override.enemyMoveset(Moves.BUG_BITE);
+    game.override.startingHeldItems([{ name: "BERRY", type: BerryType.SITRUS }]);
+
+    await game.classicMode.startBattle([Species.BLASTOISE]);
+
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+    const enemyPokemon = game.scene.getEnemyPokemon()!;
+
+    leadPokemon.addTag(BattlerTagType.SUBSTITUTE, 0, Moves.NONE, leadPokemon.id);
+
+    game.move.select(Moves.TACKLE);
+
+    await game.phaseInterceptor.to("MoveEndPhase", false);
+    const enemyPostAttackHp = enemyPokemon.hp;
+
+    await game.phaseInterceptor.to("BerryPhase", false);
+
+    expect(leadPokemon.getHeldItems().length).toBe(1);
+    expect(enemyPokemon.hp).toBe(enemyPostAttackHp);
+  });
+
+  it("should prevent the user's stats from being reset by Clear Smog", async () => {
+    game.override.enemyMoveset(Moves.CLEAR_SMOG);
+
+    await game.classicMode.startBattle([Species.BLASTOISE]);
+
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+
+    leadPokemon.addTag(BattlerTagType.SUBSTITUTE, 0, Moves.NONE, leadPokemon.id);
+
+    game.move.select(Moves.SWORDS_DANCE);
+
+    await game.phaseInterceptor.to("BerryPhase", false);
+
+    expect(leadPokemon.getStatStage(Stat.ATK)).toBe(2);
+  });
+
+  it("should prevent the user from becoming confused", async () => {
+    game.override.enemyMoveset(Moves.MAGICAL_TORQUE);
+    vi.spyOn(allMoves[Moves.MAGICAL_TORQUE], "chance", "get").mockReturnValue(100);
+
+    await game.classicMode.startBattle([Species.BLASTOISE]);
+
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+
+    leadPokemon.addTag(BattlerTagType.SUBSTITUTE, 0, Moves.NONE, leadPokemon.id);
+
+    game.move.select(Moves.SWORDS_DANCE);
+
+    await game.phaseInterceptor.to("BerryPhase", false);
+
+    expect(leadPokemon.getTag(BattlerTagType.CONFUSED)).toBeUndefined();
+    expect(leadPokemon.getStatStage(Stat.ATK)).toBe(2);
+  });
+
+  it("should transfer to the switched in Pokemon when the source uses Baton Pass", async () => {
+    game.override.moveset([Moves.SUBSTITUTE, Moves.BATON_PASS]);
+
+    await game.classicMode.startBattle([Species.BLASTOISE, Species.CHARIZARD]);
+
+    const leadPokemon = game.scene.getPlayerPokemon()!;
+
+    leadPokemon.addTag(BattlerTagType.SUBSTITUTE, 0, Moves.NONE, leadPokemon.id);
+
+    // Simulate a Baton switch for the player this turn
+    game.onNextPrompt("CommandPhase", UiMode.COMMAND, () => {
+      (game.scene.getCurrentPhase() as CommandPhase).handleCommand(Command.POKEMON, 1, true);
+    });
+
+    await game.phaseInterceptor.to("MovePhase", false);
+
+    const switchedPokemon = game.scene.getPlayerPokemon()!;
+    const subTag = switchedPokemon.getTag(SubstituteTag)!;
+    expect(subTag).toBeDefined();
+    expect(subTag.hp).toBe(Math.floor((leadPokemon.getMaxHp() * 1) / 4));
+  });
+
+  it("should prevent the source's Rough Skin from activating when hit", async () => {
+    game.override.enemyMoveset(Moves.TACKLE);
+    game.override.ability(Abilities.ROUGH_SKIN);
+
+    await game.classicMode.startBattle([Species.BLASTOISE]);
+
+    const enemyPokemon = game.scene.getEnemyPokemon()!;
+
+    game.move.select(Moves.SUBSTITUTE);
+
+    await game.phaseInterceptor.to("BerryPhase", false);
+
+    expect(enemyPokemon.hp).toBe(enemyPokemon.getMaxHp());
+  });
+
+  it("should prevent the source's Focus Punch from failing when hit", async () => {
+    game.override.enemyMoveset(Moves.TACKLE);
+    game.override.moveset([Moves.FOCUS_PUNCH]);
+
+    // Make Focus Punch 40 power to avoid a KO
+    vi.spyOn(allMoves[Moves.FOCUS_PUNCH], "calculateBattlePower").mockReturnValue(40);
+
+    await game.classicMode.startBattle([Species.BLASTOISE]);
+
+    const playerPokemon = game.scene.getPlayerPokemon()!;
+    const enemyPokemon = game.scene.getEnemyPokemon()!;
+
+    playerPokemon.addTag(BattlerTagType.SUBSTITUTE, 0, Moves.NONE, playerPokemon.id);
+
+    game.move.select(Moves.FOCUS_PUNCH);
+
+    await game.phaseInterceptor.to("BerryPhase", false);
+
+    expect(playerPokemon.getLastXMoves()[0].result).toBe(MoveResult.SUCCESS);
+    expect(enemyPokemon.hp).toBeLessThan(enemyPokemon.getMaxHp());
+  });
+
+  it("should not allow Shell Trap to activate when attacked", async () => {
+    game.override.enemyMoveset(Moves.TACKLE);
+    game.override.moveset([Moves.SHELL_TRAP]);
+
+    await game.classicMode.startBattle([Species.BLASTOISE]);
+
+    const playerPokemon = game.scene.getPlayerPokemon()!;
+
+    playerPokemon.addTag(BattlerTagType.SUBSTITUTE, 0, Moves.NONE, playerPokemon.id);
+
+    game.move.select(Moves.SHELL_TRAP);
+
+    await game.phaseInterceptor.to("BerryPhase", false);
+
+    expect(playerPokemon.getLastXMoves()[0].result).toBe(MoveResult.FAIL);
+  });
+
+  it("should not allow Beak Blast to burn opponents when hit", async () => {
+    game.override.enemyMoveset(Moves.TACKLE);
+    game.override.moveset([Moves.BEAK_BLAST]);
+
+    await game.classicMode.startBattle([Species.BLASTOISE]);
+
+    const playerPokemon = game.scene.getPlayerPokemon()!;
+    const enemyPokemon = game.scene.getEnemyPokemon()!;
+
+    playerPokemon.addTag(BattlerTagType.SUBSTITUTE, 0, Moves.NONE, playerPokemon.id);
+
+    game.move.select(Moves.BEAK_BLAST);
+
+    await game.phaseInterceptor.to("MoveEndPhase");
+
+    expect(enemyPokemon.status?.effect).not.toBe(StatusEffect.BURN);
+  });
+
+  it("should cause incoming attacks to not activate Counter", async () => {
+    game.override.enemyMoveset(Moves.TACKLE);
+    game.override.moveset([Moves.COUNTER]);
+
+    await game.classicMode.startBattle([Species.BLASTOISE]);
+
+    const playerPokemon = game.scene.getPlayerPokemon()!;
+    const enemyPokemon = game.scene.getEnemyPokemon()!;
+
+    playerPokemon.addTag(BattlerTagType.SUBSTITUTE, 0, Moves.NONE, playerPokemon.id);
+
+    game.move.select(Moves.COUNTER);
+
+    await game.phaseInterceptor.to("BerryPhase", false);
+
+    expect(playerPokemon.getLastXMoves()[0].result).toBe(MoveResult.FAIL);
+    expect(enemyPokemon.hp).toBe(enemyPokemon.getMaxHp());
+  });
+
+  it("should prevent Sappy Seed from applying its Leech Seed effect to the user", async () => {
+    game.override.enemyMoveset(Moves.SAPPY_SEED);
+
+    await game.classicMode.startBattle([Species.CHARIZARD]);
+
+    const playerPokemon = game.scene.getPlayerPokemon()!;
+
+    playerPokemon.addTag(BattlerTagType.SUBSTITUTE, 0, Moves.NONE, playerPokemon.id);
+
+    game.move.select(Moves.SPLASH);
+
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); // enemy uses Sappy Seed first
+    await game.move.forceHit(); // forces Sappy Seed to hit
+    await game.phaseInterceptor.to("MoveEndPhase");
+
+    expect(playerPokemon.getTag(BattlerTagType.SEEDED)).toBeUndefined();
+  });
+});
diff --git a/src/test/moves/swallow.test.ts b/test/moves/swallow.test.ts
similarity index 87%
rename from src/test/moves/swallow.test.ts
rename to test/moves/swallow.test.ts
index b2435ba77b3..d548522068b 100644
--- a/src/test/moves/swallow.test.ts
+++ b/test/moves/swallow.test.ts
@@ -8,7 +8,7 @@ import { TurnInitPhase } from "#app/phases/turn-init-phase";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
@@ -27,14 +27,14 @@ describe("Moves - Swallow", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
 
-    game.override.battleType("single");
+    game.override.battleStyle("single");
 
     game.override.enemySpecies(Species.RATTATA);
     game.override.enemyMoveset(Moves.SPLASH);
     game.override.enemyAbility(Abilities.NONE);
     game.override.enemyLevel(2000);
 
-    game.override.moveset([ Moves.SWALLOW, Moves.SWALLOW, Moves.SWALLOW, Moves.SWALLOW ]);
+    game.override.moveset([Moves.SWALLOW, Moves.SWALLOW, Moves.SWALLOW, Moves.SWALLOW]);
     game.override.ability(Abilities.NONE);
   });
 
@@ -43,7 +43,7 @@ describe("Moves - Swallow", () => {
       const stacksToSetup = 1;
       const expectedHeal = 25;
 
-      await game.startBattle([ Species.ABOMASNOW ]);
+      await game.startBattle([Species.ABOMASNOW]);
 
       const pokemon = game.scene.getPlayerPokemon()!;
       vi.spyOn(pokemon, "getMaxHp").mockReturnValue(100);
@@ -70,7 +70,7 @@ describe("Moves - Swallow", () => {
       const stacksToSetup = 2;
       const expectedHeal = 50;
 
-      await game.startBattle([ Species.ABOMASNOW ]);
+      await game.startBattle([Species.ABOMASNOW]);
 
       const pokemon = game.scene.getPlayerPokemon()!;
       vi.spyOn(pokemon, "getMaxHp").mockReturnValue(100);
@@ -98,7 +98,7 @@ describe("Moves - Swallow", () => {
       const stacksToSetup = 3;
       const expectedHeal = 100;
 
-      await game.startBattle([ Species.ABOMASNOW ]);
+      await game.startBattle([Species.ABOMASNOW]);
 
       const pokemon = game.scene.getPlayerPokemon()!;
       vi.spyOn(pokemon, "getMaxHp").mockReturnValue(100);
@@ -125,7 +125,7 @@ describe("Moves - Swallow", () => {
   });
 
   it("fails without stacks", async () => {
-    await game.startBattle([ Species.ABOMASNOW ]);
+    await game.startBattle([Species.ABOMASNOW]);
 
     const pokemon = game.scene.getPlayerPokemon()!;
 
@@ -135,12 +135,16 @@ describe("Moves - Swallow", () => {
     game.move.select(Moves.SWALLOW);
     await game.phaseInterceptor.to(TurnInitPhase);
 
-    expect(pokemon.getMoveHistory().at(-1)).toMatchObject<TurnMove>({ move: Moves.SWALLOW, result: MoveResult.FAIL, targets: [ pokemon.getBattlerIndex() ]});
+    expect(pokemon.getMoveHistory().at(-1)).toMatchObject<TurnMove>({
+      move: Moves.SWALLOW,
+      result: MoveResult.FAIL,
+      targets: [pokemon.getBattlerIndex()],
+    });
   });
 
   describe("restores stat stage boosts granted by stacks", () => {
     it("decreases stats based on stored values (both boosts equal)", async () => {
-      await game.startBattle([ Species.ABOMASNOW ]);
+      await game.startBattle([Species.ABOMASNOW]);
 
       const pokemon = game.scene.getPlayerPokemon()!;
       pokemon.addTag(BattlerTagType.STOCKPILING);
@@ -156,7 +160,11 @@ describe("Moves - Swallow", () => {
 
       await game.phaseInterceptor.to(TurnInitPhase);
 
-      expect(pokemon.getMoveHistory().at(-1)).toMatchObject<TurnMove>({ move: Moves.SWALLOW, result: MoveResult.SUCCESS, targets: [ pokemon.getBattlerIndex() ]});
+      expect(pokemon.getMoveHistory().at(-1)).toMatchObject<TurnMove>({
+        move: Moves.SWALLOW,
+        result: MoveResult.SUCCESS,
+        targets: [pokemon.getBattlerIndex()],
+      });
 
       expect(pokemon.getStatStage(Stat.DEF)).toBe(0);
       expect(pokemon.getStatStage(Stat.SPDEF)).toBe(0);
@@ -165,7 +173,7 @@ describe("Moves - Swallow", () => {
     });
 
     it("lower stat stages based on stored values (different boosts)", async () => {
-      await game.startBattle([ Species.ABOMASNOW ]);
+      await game.startBattle([Species.ABOMASNOW]);
 
       const pokemon = game.scene.getPlayerPokemon()!;
       pokemon.addTag(BattlerTagType.STOCKPILING);
@@ -183,7 +191,11 @@ describe("Moves - Swallow", () => {
 
       await game.phaseInterceptor.to(TurnInitPhase);
 
-      expect(pokemon.getMoveHistory().at(-1)).toMatchObject<TurnMove>({ move: Moves.SWALLOW, result: MoveResult.SUCCESS, targets: [ pokemon.getBattlerIndex() ]});
+      expect(pokemon.getMoveHistory().at(-1)).toMatchObject<TurnMove>({
+        move: Moves.SWALLOW,
+        result: MoveResult.SUCCESS,
+        targets: [pokemon.getBattlerIndex()],
+      });
 
       expect(pokemon.getStatStage(Stat.DEF)).toBe(1);
       expect(pokemon.getStatStage(Stat.SPDEF)).toBe(-2);
diff --git a/test/moves/synchronoise.test.ts b/test/moves/synchronoise.test.ts
new file mode 100644
index 00000000000..0f59bce26b4
--- /dev/null
+++ b/test/moves/synchronoise.test.ts
@@ -0,0 +1,47 @@
+import { Abilities } from "#enums/abilities";
+import { Moves } from "#enums/moves";
+import { PokemonType } from "#enums/pokemon-type";
+import { Species } from "#enums/species";
+import GameManager from "#test/testUtils/gameManager";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
+
+describe("Moves - Synchronoise", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+    game.override
+      .moveset([Moves.SYNCHRONOISE])
+      .ability(Abilities.BALL_FETCH)
+      .battleStyle("single")
+      .disableCrits()
+      .enemySpecies(Species.MAGIKARP)
+      .enemyAbility(Abilities.BALL_FETCH)
+      .enemyMoveset(Moves.SPLASH);
+  });
+
+  it("should consider the user's tera type if it is terastallized", async () => {
+    await game.classicMode.startBattle([Species.BIDOOF]);
+    const playerPokemon = game.scene.getPlayerPokemon()!;
+    const enemyPokemon = game.scene.getEnemyPokemon()!;
+
+    // force the player to be terastallized
+    playerPokemon.teraType = PokemonType.WATER;
+    playerPokemon.isTerastallized = true;
+    game.move.select(Moves.SYNCHRONOISE);
+    await game.phaseInterceptor.to("BerryPhase");
+    expect(enemyPokemon.hp).toBeLessThan(enemyPokemon.getMaxHp());
+  });
+});
diff --git a/test/moves/syrup_bomb.test.ts b/test/moves/syrup_bomb.test.ts
new file mode 100644
index 00000000000..8e9134497d0
--- /dev/null
+++ b/test/moves/syrup_bomb.test.ts
@@ -0,0 +1,92 @@
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import { Abilities } from "#enums/abilities";
+import { BattlerTagType } from "#enums/battler-tag-type";
+import { Stat } from "#enums/stat";
+import GameManager from "#test/testUtils/gameManager";
+import Phaser from "phaser";
+import { BattlerIndex } from "#app/battle";
+import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
+
+describe("Moves - SYRUP BOMB", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+    game.override
+      .battleStyle("single")
+      .enemySpecies(Species.SNORLAX)
+      .enemyAbility(Abilities.BALL_FETCH)
+      .ability(Abilities.BALL_FETCH)
+      .startingLevel(30)
+      .enemyLevel(100)
+      .moveset([Moves.SYRUP_BOMB, Moves.SPLASH])
+      .enemyMoveset(Moves.SPLASH);
+  });
+
+  //Bulbapedia Reference: https://bulbapedia.bulbagarden.net/wiki/syrup_bomb_(move)
+
+  it("decreases the target Pokemon's speed stat once per turn for 3 turns", async () => {
+    await game.classicMode.startBattle([Species.MAGIKARP]);
+
+    const targetPokemon = game.scene.getEnemyPokemon()!;
+    expect(targetPokemon.getStatStage(Stat.SPD)).toBe(0);
+
+    game.move.select(Moves.SYRUP_BOMB);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
+    await game.move.forceHit();
+    await game.toNextTurn();
+    expect(targetPokemon.getTag(BattlerTagType.SYRUP_BOMB)).toBeDefined();
+    expect(targetPokemon.getStatStage(Stat.SPD)).toBe(-1);
+
+    game.move.select(Moves.SPLASH);
+    await game.toNextTurn();
+    expect(targetPokemon.getTag(BattlerTagType.SYRUP_BOMB)).toBeDefined();
+    expect(targetPokemon.getStatStage(Stat.SPD)).toBe(-2);
+
+    game.move.select(Moves.SPLASH);
+    await game.toNextTurn();
+    expect(targetPokemon.getTag(BattlerTagType.SYRUP_BOMB)).toBeUndefined();
+    expect(targetPokemon.getStatStage(Stat.SPD)).toBe(-3);
+  });
+
+  it("does not affect Pokemon with the ability Bulletproof", async () => {
+    game.override.enemyAbility(Abilities.BULLETPROOF);
+    await game.classicMode.startBattle([Species.MAGIKARP]);
+
+    const targetPokemon = game.scene.getEnemyPokemon()!;
+
+    game.move.select(Moves.SYRUP_BOMB);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
+    await game.move.forceHit();
+    await game.toNextTurn();
+    expect(targetPokemon.isFullHp()).toBe(true);
+    expect(targetPokemon.getTag(BattlerTagType.SYRUP_BOMB)).toBeUndefined();
+    expect(targetPokemon.getStatStage(Stat.SPD)).toBe(0);
+  });
+
+  it("stops lowering the target's speed if the user leaves the field", async () => {
+    await game.classicMode.startBattle([Species.FEEBAS, Species.MILOTIC]);
+
+    game.move.select(Moves.SYRUP_BOMB);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
+    await game.move.forceHit();
+    await game.toNextTurn();
+
+    game.doSwitchPokemon(1);
+    await game.toNextTurn();
+
+    expect(game.scene.getEnemyPokemon()!.getStatStage(Stat.SPD)).toBe(-1);
+  });
+});
diff --git a/src/test/moves/tackle.test.ts b/test/moves/tackle.test.ts
similarity index 84%
rename from src/test/moves/tackle.test.ts
rename to test/moves/tackle.test.ts
index ff50f027f87..162836cd181 100644
--- a/src/test/moves/tackle.test.ts
+++ b/test/moves/tackle.test.ts
@@ -3,11 +3,10 @@ import { EnemyCommandPhase } from "#app/phases/enemy-command-phase";
 import { TurnEndPhase } from "#app/phases/turn-end-phase";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
-
 describe("Moves - Tackle", () => {
   let phaserGame: Phaser.Game;
   let game: GameManager;
@@ -25,21 +24,19 @@ describe("Moves - Tackle", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     const moveToUse = Moves.TACKLE;
-    game.override.battleType("single");
+    game.override.battleStyle("single");
     game.override.enemySpecies(Species.MAGIKARP);
     game.override.startingLevel(1);
     game.override.startingWave(97);
-    game.override.moveset([ moveToUse ]);
-    game.override.enemyMoveset([ Moves.GROWTH, Moves.GROWTH, Moves.GROWTH, Moves.GROWTH ]);
+    game.override.moveset([moveToUse]);
+    game.override.enemyMoveset([Moves.GROWTH, Moves.GROWTH, Moves.GROWTH, Moves.GROWTH]);
     game.override.disableCrits();
   });
 
   it("TACKLE against ghost", async () => {
     const moveToUse = Moves.TACKLE;
     game.override.enemySpecies(Species.GENGAR);
-    await game.startBattle([
-      Species.MIGHTYENA,
-    ]);
+    await game.startBattle([Species.MIGHTYENA]);
     const hpOpponent = game.scene.currentBattle.enemyParty[0].hp;
     game.move.select(moveToUse);
     await game.phaseInterceptor.runFrom(EnemyCommandPhase).to(TurnEndPhase);
@@ -49,13 +46,10 @@ describe("Moves - Tackle", () => {
 
   it("TACKLE against not resistant", async () => {
     const moveToUse = Moves.TACKLE;
-    await game.startBattle([
-      Species.MIGHTYENA,
-    ]);
+    await game.startBattle([Species.MIGHTYENA]);
     game.scene.currentBattle.enemyParty[0].stats[Stat.DEF] = 50;
     game.scene.getPlayerParty()[0].stats[Stat.ATK] = 50;
 
-
     const hpOpponent = game.scene.currentBattle.enemyParty[0].hp;
 
     game.move.select(moveToUse);
diff --git a/src/test/moves/tail_whip.test.ts b/test/moves/tail_whip.test.ts
similarity index 83%
rename from src/test/moves/tail_whip.test.ts
rename to test/moves/tail_whip.test.ts
index 5c83feb8a4e..2d3ade2691d 100644
--- a/src/test/moves/tail_whip.test.ts
+++ b/test/moves/tail_whip.test.ts
@@ -1,5 +1,5 @@
 import { Stat } from "#enums/stat";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
@@ -8,7 +8,6 @@ import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 import { EnemyCommandPhase } from "#app/phases/enemy-command-phase";
 import { TurnInitPhase } from "#app/phases/turn-init-phase";
 
-
 describe("Moves - Tail whip", () => {
   let phaserGame: Phaser.Game;
   let game: GameManager;
@@ -26,21 +25,18 @@ describe("Moves - Tail whip", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     const moveToUse = Moves.TAIL_WHIP;
-    game.override.battleType("single");
+    game.override.battleStyle("single");
     game.override.enemySpecies(Species.RATTATA);
     game.override.enemyAbility(Abilities.INSOMNIA);
     game.override.ability(Abilities.INSOMNIA);
     game.override.startingLevel(2000);
-    game.override.moveset([ moveToUse ]);
+    game.override.moveset([moveToUse]);
     game.override.enemyMoveset(Moves.SPLASH);
   });
 
-  it("should lower DEF stat stage by 1", async() => {
+  it("should lower DEF stat stage by 1", async () => {
     const moveToUse = Moves.TAIL_WHIP;
-    await game.startBattle([
-      Species.MIGHTYENA,
-      Species.MIGHTYENA,
-    ]);
+    await game.startBattle([Species.MIGHTYENA, Species.MIGHTYENA]);
 
     const enemyPokemon = game.scene.getEnemyPokemon()!;
     expect(enemyPokemon.getStatStage(Stat.DEF)).toBe(0);
diff --git a/src/test/moves/tailwind.test.ts b/test/moves/tailwind.test.ts
similarity index 81%
rename from src/test/moves/tailwind.test.ts
rename to test/moves/tailwind.test.ts
index a26dde82824..40bae67b514 100644
--- a/src/test/moves/tailwind.test.ts
+++ b/test/moves/tailwind.test.ts
@@ -1,10 +1,10 @@
-import { Stat } from "#enums/stat";
 import { ArenaTagSide } from "#app/data/arena-tag";
 import { ArenaTagType } from "#app/enums/arena-tag-type";
-import { TurnEndPhase } from "#app/phases/turn-end-phase";
+import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import { Stat } from "#enums/stat";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
@@ -24,13 +24,16 @@ describe("Moves - Tailwind", () => {
 
   beforeEach(() => {
     game = new GameManager(phaserGame);
-    game.override.battleType("double");
-    game.override.moveset([ Moves.TAILWIND, Moves.SPLASH, Moves.PETAL_BLIZZARD, Moves.SANDSTORM ]);
-    game.override.enemyMoveset(Moves.SPLASH);
+    game.override
+      .battleStyle("double")
+      .moveset([Moves.TAILWIND, Moves.SPLASH])
+      .enemyMoveset(Moves.SPLASH)
+      .enemyAbility(Abilities.BALL_FETCH)
+      .ability(Abilities.BALL_FETCH);
   });
 
   it("doubles the Speed stat of the Pokemons on its side", async () => {
-    await game.startBattle([ Species.MAGIKARP, Species.MEOWTH ]);
+    await game.classicMode.startBattle([Species.MAGIKARP, Species.MEOWTH]);
     const magikarp = game.scene.getPlayerField()[0];
     const meowth = game.scene.getPlayerField()[1];
 
@@ -43,7 +46,7 @@ describe("Moves - Tailwind", () => {
     game.move.select(Moves.TAILWIND);
     game.move.select(Moves.SPLASH, 1);
 
-    await game.phaseInterceptor.to(TurnEndPhase);
+    await game.phaseInterceptor.to("TurnEndPhase");
 
     expect(magikarp.getEffectiveStat(Stat.SPD)).toBe(magikarpSpd * 2);
     expect(meowth.getEffectiveStat(Stat.SPD)).toBe(meowthSpd * 2);
@@ -51,9 +54,9 @@ describe("Moves - Tailwind", () => {
   });
 
   it("lasts for 4 turns", async () => {
-    game.override.battleType("single");
+    game.override.battleStyle("single");
 
-    await game.startBattle([ Species.MAGIKARP ]);
+    await game.classicMode.startBattle([Species.MAGIKARP]);
 
     game.move.select(Moves.TAILWIND);
     await game.toNextTurn();
@@ -74,9 +77,9 @@ describe("Moves - Tailwind", () => {
   });
 
   it("does not affect the opposing side", async () => {
-    game.override.battleType("single");
+    game.override.battleStyle("single");
 
-    await game.startBattle([ Species.MAGIKARP ]);
+    await game.classicMode.startBattle([Species.MAGIKARP]);
 
     const ally = game.scene.getPlayerPokemon()!;
     const enemy = game.scene.getEnemyPokemon()!;
@@ -84,7 +87,6 @@ describe("Moves - Tailwind", () => {
     const allySpd = ally.getStat(Stat.SPD);
     const enemySpd = enemy.getStat(Stat.SPD);
 
-
     expect(ally.getEffectiveStat(Stat.SPD)).equal(allySpd);
     expect(enemy.getEffectiveStat(Stat.SPD)).equal(enemySpd);
     expect(game.scene.arena.getTagOnSide(ArenaTagType.TAILWIND, ArenaTagSide.PLAYER)).toBeUndefined();
@@ -92,7 +94,7 @@ describe("Moves - Tailwind", () => {
 
     game.move.select(Moves.TAILWIND);
 
-    await game.phaseInterceptor.to(TurnEndPhase);
+    await game.phaseInterceptor.to("TurnEndPhase");
 
     expect(ally.getEffectiveStat(Stat.SPD)).toBe(allySpd * 2);
     expect(enemy.getEffectiveStat(Stat.SPD)).equal(enemySpd);
diff --git a/src/test/moves/tar_shot.test.ts b/test/moves/tar_shot.test.ts
similarity index 78%
rename from src/test/moves/tar_shot.test.ts
rename to test/moves/tar_shot.test.ts
index 5fb70abc19c..68f19e3ab51 100644
--- a/src/test/moves/tar_shot.test.ts
+++ b/test/moves/tar_shot.test.ts
@@ -1,10 +1,10 @@
 import { BattlerIndex } from "#app/battle";
-import { Type } from "#enums/type";
+import { PokemonType } from "#enums/pokemon-type";
 import { Moves } from "#app/enums/moves";
 import { Species } from "#app/enums/species";
 import { Stat } from "#app/enums/stat";
 import { Abilities } from "#enums/abilities";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
@@ -24,17 +24,17 @@ describe("Moves - Tar Shot", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     game.override
-      .battleType("single")
+      .battleStyle("single")
       .enemyAbility(Abilities.BALL_FETCH)
       .enemyMoveset(Moves.SPLASH)
       .enemySpecies(Species.TANGELA)
       .enemyLevel(1000)
-      .moveset([ Moves.TAR_SHOT, Moves.FIRE_PUNCH ])
+      .moveset([Moves.TAR_SHOT, Moves.FIRE_PUNCH])
       .disableCrits();
   });
 
   it("lowers the target's Speed stat by one stage and doubles the effectiveness of Fire-type moves used on the target", async () => {
-    await game.classicMode.startBattle([ Species.PIKACHU ]);
+    await game.classicMode.startBattle([Species.PIKACHU]);
 
     const enemy = game.scene.getEnemyPokemon()!;
 
@@ -48,14 +48,14 @@ describe("Moves - Tar Shot", () => {
     await game.toNextTurn();
 
     game.move.select(Moves.FIRE_PUNCH);
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
 
     await game.phaseInterceptor.to("MoveEndPhase");
     expect(enemy.getMoveEffectiveness).toHaveReturnedWith(4);
   });
 
   it("will not double the effectiveness of Fire-type moves used on a target that is already under the effect of Tar Shot (but may still lower its Speed)", async () => {
-    await game.classicMode.startBattle([ Species.PIKACHU ]);
+    await game.classicMode.startBattle([Species.PIKACHU]);
 
     const enemy = game.scene.getEnemyPokemon()!;
 
@@ -76,17 +76,19 @@ describe("Moves - Tar Shot", () => {
     await game.toNextTurn();
 
     game.move.select(Moves.FIRE_PUNCH);
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
 
     await game.phaseInterceptor.to("MoveEndPhase");
     expect(enemy.getMoveEffectiveness).toHaveReturnedWith(4);
   });
 
   it("does not double the effectiveness of Fire-type moves against a Pokémon that is Terastallized", async () => {
-    game.override.enemyHeldItems([{ name: "TERA_SHARD", type: Type.GRASS }]).enemySpecies(Species.SPRIGATITO);
-    await game.classicMode.startBattle([ Species.PIKACHU ]);
+    game.override.enemySpecies(Species.SPRIGATITO);
+    await game.classicMode.startBattle([Species.PIKACHU]);
 
     const enemy = game.scene.getEnemyPokemon()!;
+    enemy.teraType = PokemonType.GRASS;
+    enemy.isTerastallized = true;
 
     vi.spyOn(enemy, "getMoveEffectiveness");
 
@@ -98,7 +100,7 @@ describe("Moves - Tar Shot", () => {
     await game.toNextTurn();
 
     game.move.select(Moves.FIRE_PUNCH);
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
 
     await game.phaseInterceptor.to("MoveEndPhase");
     expect(enemy.getMoveEffectiveness).toHaveReturnedWith(2);
@@ -106,7 +108,7 @@ describe("Moves - Tar Shot", () => {
 
   it("doubles the effectiveness of Fire-type moves against a Pokémon that is already under the effects of Tar Shot before it Terastallized", async () => {
     game.override.enemySpecies(Species.SPRIGATITO);
-    await game.classicMode.startBattle([ Species.PIKACHU ]);
+    await game.classicMode.startBattle([Species.PIKACHU]);
 
     const enemy = game.scene.getEnemyPokemon()!;
 
@@ -119,10 +121,11 @@ describe("Moves - Tar Shot", () => {
 
     await game.toNextTurn();
 
-    game.override.enemyHeldItems([{ name: "TERA_SHARD", type: Type.GRASS }]);
+    enemy.teraType = PokemonType.GRASS;
+    enemy.isTerastallized = true;
 
     game.move.select(Moves.FIRE_PUNCH);
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
 
     await game.phaseInterceptor.to("MoveEndPhase");
     expect(enemy.getMoveEffectiveness).toHaveReturnedWith(4);
diff --git a/src/test/moves/taunt.test.ts b/test/moves/taunt.test.ts
similarity index 87%
rename from src/test/moves/taunt.test.ts
rename to test/moves/taunt.test.ts
index a425a048a2c..e0bb13c61fb 100644
--- a/src/test/moves/taunt.test.ts
+++ b/test/moves/taunt.test.ts
@@ -1,7 +1,7 @@
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { Abilities } from "#enums/abilities";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 import { MoveResult } from "#app/field/pokemon";
@@ -23,15 +23,15 @@ describe("Moves - Taunt", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     game.override
-      .battleType("single")
+      .battleStyle("single")
       .enemyAbility(Abilities.BALL_FETCH)
-      .enemyMoveset([ Moves.TAUNT, Moves.SPLASH ])
+      .enemyMoveset([Moves.TAUNT, Moves.SPLASH])
       .enemySpecies(Species.SHUCKLE)
-      .moveset([ Moves.GROWL ]);
+      .moveset([Moves.GROWL]);
   });
 
   it("Pokemon should not be able to use Status Moves", async () => {
-    await game.classicMode.startBattle([ Species.REGIELEKI ]);
+    await game.classicMode.startBattle([Species.REGIELEKI]);
 
     const playerPokemon = game.scene.getPlayerPokemon()!;
 
diff --git a/src/test/moves/telekinesis.test.ts b/test/moves/telekinesis.test.ts
similarity index 84%
rename from src/test/moves/telekinesis.test.ts
rename to test/moves/telekinesis.test.ts
index ba2bc40a189..d11cc0861f0 100644
--- a/src/test/moves/telekinesis.test.ts
+++ b/test/moves/telekinesis.test.ts
@@ -1,10 +1,10 @@
 import { BattlerTagType } from "#enums/battler-tag-type";
-import { allMoves } from "#app/data/move";
+import { allMoves } from "#app/data/moves/move";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { MoveResult } from "#app/field/pokemon";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, it, expect, vi } from "vitest";
 import { BattlerIndex } from "#app/battle";
@@ -26,16 +26,16 @@ describe("Moves - Telekinesis", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     game.override
-      .moveset([ Moves.TELEKINESIS, Moves.TACKLE, Moves.MUD_SHOT, Moves.SMACK_DOWN ])
-      .battleType("single")
+      .moveset([Moves.TELEKINESIS, Moves.TACKLE, Moves.MUD_SHOT, Moves.SMACK_DOWN])
+      .battleStyle("single")
       .enemySpecies(Species.SNORLAX)
       .enemyLevel(60)
       .enemyAbility(Abilities.BALL_FETCH)
-      .enemyMoveset([ Moves.SPLASH ]);
+      .enemyMoveset([Moves.SPLASH]);
   });
 
   it("Telekinesis makes the affected vulnerable to most attacking moves regardless of accuracy", async () => {
-    await game.classicMode.startBattle([ Species.MAGIKARP ]);
+    await game.classicMode.startBattle([Species.MAGIKARP]);
 
     const enemyOpponent = game.scene.getEnemyPokemon()!;
 
@@ -52,7 +52,7 @@ describe("Moves - Telekinesis", () => {
   });
 
   it("Telekinesis makes the affected airborne and immune to most Ground-moves", async () => {
-    await game.classicMode.startBattle([ Species.MAGIKARP ]);
+    await game.classicMode.startBattle([Species.MAGIKARP]);
 
     const enemyOpponent = game.scene.getEnemyPokemon()!;
 
@@ -70,7 +70,7 @@ describe("Moves - Telekinesis", () => {
 
   it("Telekinesis can still affect Pokemon that have been transformed into invalid Pokemon", async () => {
     game.override.enemyMoveset(Moves.TRANSFORM);
-    await game.classicMode.startBattle([ Species.DIGLETT ]);
+    await game.classicMode.startBattle([Species.DIGLETT]);
 
     const enemyOpponent = game.scene.getEnemyPokemon()!;
 
@@ -82,7 +82,7 @@ describe("Moves - Telekinesis", () => {
   });
 
   it("Moves like Smack Down and 1000 Arrows remove all effects of Telekinesis from the target Pokemon", async () => {
-    await game.classicMode.startBattle([ Species.MAGIKARP ]);
+    await game.classicMode.startBattle([Species.MAGIKARP]);
 
     const enemyOpponent = game.scene.getEnemyPokemon()!;
 
@@ -99,8 +99,8 @@ describe("Moves - Telekinesis", () => {
   });
 
   it("Ingrain will remove the floating effect of Telekinesis, but not the 100% hit", async () => {
-    game.override.enemyMoveset([ Moves.SPLASH, Moves.INGRAIN ]);
-    await game.classicMode.startBattle([ Species.MAGIKARP ]);
+    game.override.enemyMoveset([Moves.SPLASH, Moves.INGRAIN]);
+    await game.classicMode.startBattle([Species.MAGIKARP]);
 
     const playerPokemon = game.scene.getPlayerPokemon()!;
     const enemyOpponent = game.scene.getEnemyPokemon()!;
@@ -124,14 +124,15 @@ describe("Moves - Telekinesis", () => {
   });
 
   it("should not be baton passed onto a mega gengar", async () => {
-    game.override.moveset([ Moves.BATON_PASS ])
-      .enemyMoveset([ Moves.TELEKINESIS ])
+    game.override
+      .moveset([Moves.BATON_PASS])
+      .enemyMoveset([Moves.TELEKINESIS])
       .starterForms({ [Species.GENGAR]: 1 });
 
-    await game.classicMode.startBattle([ Species.MAGIKARP, Species.GENGAR ]);
+    await game.classicMode.startBattle([Species.MAGIKARP, Species.GENGAR]);
     game.move.select(Moves.BATON_PASS);
     game.doSelectPartyPokemon(1);
-    await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
     await game.phaseInterceptor.to("BerryPhase");
     expect(game.scene.getPlayerPokemon()!.getTag(BattlerTagType.TELEKINESIS)).toBeUndefined();
   });
diff --git a/test/moves/tera_blast.test.ts b/test/moves/tera_blast.test.ts
new file mode 100644
index 00000000000..efdb75e8156
--- /dev/null
+++ b/test/moves/tera_blast.test.ts
@@ -0,0 +1,221 @@
+import { BattlerIndex } from "#app/battle";
+import { Stat } from "#enums/stat";
+import { allMoves, TeraMoveCategoryAttr } from "#app/data/moves/move";
+import type Move from "#app/data/moves/move";
+import { PokemonType } from "#enums/pokemon-type";
+import { Abilities } from "#app/enums/abilities";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import GameManager from "#test/testUtils/gameManager";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
+
+describe("Moves - Tera Blast", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  let moveToCheck: Move;
+  let teraBlastAttr: TeraMoveCategoryAttr;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+    moveToCheck = allMoves[Moves.TERA_BLAST];
+    teraBlastAttr = moveToCheck.getAttrs(TeraMoveCategoryAttr)[0];
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+
+    game.override
+      .battleStyle("single")
+      .disableCrits()
+      .starterSpecies(Species.FEEBAS)
+      .moveset([Moves.TERA_BLAST])
+      .ability(Abilities.BALL_FETCH)
+      .enemySpecies(Species.MAGIKARP)
+      .enemyMoveset(Moves.SPLASH)
+      .enemyAbility(Abilities.STURDY)
+      .enemyLevel(50);
+
+    vi.spyOn(moveToCheck, "calculateBattlePower");
+  });
+
+  it("changes type to match user's tera type", async () => {
+    game.override.enemySpecies(Species.FURRET);
+    await game.classicMode.startBattle();
+    const enemyPokemon = game.scene.getEnemyPokemon()!;
+    const spy = vi.spyOn(enemyPokemon, "getMoveEffectiveness");
+
+    const playerPokemon = game.scene.getPlayerPokemon()!;
+    playerPokemon.teraType = PokemonType.FIGHTING;
+    playerPokemon.isTerastallized = true;
+
+    game.move.select(Moves.TERA_BLAST);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
+    await game.phaseInterceptor.to("MoveEffectPhase");
+
+    expect(spy).toHaveReturnedWith(2);
+  }, 20000);
+
+  it("increases power if user is Stellar tera type", async () => {
+    await game.classicMode.startBattle();
+
+    const playerPokemon = game.scene.getPlayerPokemon()!;
+    playerPokemon.teraType = PokemonType.STELLAR;
+    playerPokemon.isTerastallized = true;
+
+    game.move.select(Moves.TERA_BLAST);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
+    await game.phaseInterceptor.to("MoveEffectPhase");
+
+    expect(moveToCheck.calculateBattlePower).toHaveReturnedWith(100);
+  });
+
+  it("is super effective against terastallized targets if user is Stellar tera type", async () => {
+    await game.classicMode.startBattle();
+
+    const playerPokemon = game.scene.getPlayerPokemon()!;
+    playerPokemon.teraType = PokemonType.STELLAR;
+    playerPokemon.isTerastallized = true;
+
+    const enemyPokemon = game.scene.getEnemyPokemon()!;
+    const spy = vi.spyOn(enemyPokemon, "getMoveEffectiveness");
+    enemyPokemon.isTerastallized = true;
+
+    game.move.select(Moves.TERA_BLAST);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
+    await game.phaseInterceptor.to("MoveEffectPhase");
+
+    expect(spy).toHaveReturnedWith(2);
+  });
+
+  it("uses the higher ATK for damage calculation", async () => {
+    await game.classicMode.startBattle();
+
+    const playerPokemon = game.scene.getPlayerPokemon()!;
+    playerPokemon.stats[Stat.ATK] = 100;
+    playerPokemon.stats[Stat.SPATK] = 1;
+    playerPokemon.isTerastallized = true;
+
+    vi.spyOn(teraBlastAttr, "apply");
+
+    game.move.select(Moves.TERA_BLAST);
+    await game.toNextTurn();
+    expect(teraBlastAttr.apply).toHaveLastReturnedWith(true);
+  });
+
+  it("uses the higher SPATK for damage calculation", async () => {
+    await game.classicMode.startBattle();
+
+    const playerPokemon = game.scene.getPlayerPokemon()!;
+    playerPokemon.stats[Stat.ATK] = 1;
+    playerPokemon.stats[Stat.SPATK] = 100;
+
+    vi.spyOn(teraBlastAttr, "apply");
+
+    game.move.select(Moves.TERA_BLAST);
+    await game.toNextTurn();
+    expect(teraBlastAttr.apply).toHaveLastReturnedWith(false);
+  });
+
+  it("should stay as a special move if ATK turns lower than SPATK mid-turn", async () => {
+    game.override.enemyMoveset([Moves.CHARM]);
+    await game.classicMode.startBattle();
+
+    const playerPokemon = game.scene.getPlayerPokemon()!;
+    playerPokemon.stats[Stat.ATK] = 51;
+    playerPokemon.stats[Stat.SPATK] = 50;
+
+    vi.spyOn(teraBlastAttr, "apply");
+
+    game.move.select(Moves.TERA_BLAST);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
+    await game.toNextTurn();
+    expect(teraBlastAttr.apply).toHaveLastReturnedWith(false);
+  });
+
+  it("does not change its move category from stat changes due to held items", async () => {
+    game.override
+      .startingHeldItems([{ name: "SPECIES_STAT_BOOSTER", type: "THICK_CLUB" }])
+      .starterSpecies(Species.CUBONE);
+    await game.classicMode.startBattle();
+
+    const playerPokemon = game.scene.getPlayerPokemon()!;
+
+    playerPokemon.stats[Stat.ATK] = 50;
+    playerPokemon.stats[Stat.SPATK] = 51;
+
+    vi.spyOn(teraBlastAttr, "apply");
+
+    game.move.select(Moves.TERA_BLAST);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
+    await game.toNextTurn();
+
+    expect(teraBlastAttr.apply).toHaveLastReturnedWith(false);
+  });
+
+  it("does not change its move category from stat changes due to abilities", async () => {
+    game.override.ability(Abilities.HUGE_POWER);
+    await game.classicMode.startBattle();
+
+    const playerPokemon = game.scene.getPlayerPokemon()!;
+    playerPokemon.stats[Stat.ATK] = 50;
+    playerPokemon.stats[Stat.SPATK] = 51;
+
+    vi.spyOn(teraBlastAttr, "apply");
+
+    game.move.select(Moves.TERA_BLAST);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
+    await game.toNextTurn();
+    expect(teraBlastAttr.apply).toHaveLastReturnedWith(false);
+  });
+
+  it("causes stat drops if user is Stellar tera type", async () => {
+    await game.classicMode.startBattle();
+
+    const playerPokemon = game.scene.getPlayerPokemon()!;
+    playerPokemon.teraType = PokemonType.STELLAR;
+    playerPokemon.isTerastallized = true;
+
+    game.move.select(Moves.TERA_BLAST);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
+    await game.phaseInterceptor.to("MoveEndPhase");
+
+    expect(playerPokemon.getStatStage(Stat.SPATK)).toBe(-1);
+    expect(playerPokemon.getStatStage(Stat.ATK)).toBe(-1);
+  });
+
+  it.each([
+    { ab: "galvanize", ty: "electric", ab_id: Abilities.GALVANIZE, ty_id: PokemonType.ELECTRIC },
+    { ab: "refrigerate", ty: "ice", ab_id: Abilities.REFRIGERATE, ty_id: PokemonType.ICE },
+    { ab: "pixilate", ty: "fairy", ab_id: Abilities.PIXILATE, ty_id: PokemonType.FAIRY },
+    { ab: "aerilate", ty: "flying", ab_id: Abilities.AERILATE, ty_id: PokemonType.FLYING },
+  ])("should be $ty type if the user has $ab", async ({ ab_id, ty_id }) => {
+    game.override.ability(ab_id).moveset([Moves.TERA_BLAST]).enemyAbility(Abilities.BALL_FETCH);
+    await game.classicMode.startBattle([Species.MAGIKARP]);
+    const playerPokemon = game.scene.getPlayerPokemon()!;
+    expect(playerPokemon.getMoveType(allMoves[Moves.TERA_BLAST])).toBe(ty_id);
+  });
+
+  it("should not be affected by normalize when the user is terastallized with tera normal", async () => {
+    game.override.moveset([Moves.TERA_BLAST]).ability(Abilities.NORMALIZE);
+    await game.classicMode.startBattle([Species.MAGIKARP]);
+    const playerPokemon = game.scene.getPlayerPokemon()!;
+    // override the tera state for the pokemon
+    playerPokemon.isTerastallized = true;
+    playerPokemon.teraType = PokemonType.NORMAL;
+
+    const move = allMoves[Moves.TERA_BLAST];
+    const powerSpy = vi.spyOn(move, "calculateBattlePower");
+
+    game.move.select(Moves.TERA_BLAST);
+    await game.phaseInterceptor.to("BerryPhase");
+    expect(powerSpy).toHaveLastReturnedWith(move.power);
+  });
+});
diff --git a/src/test/moves/tera_starstorm.test.ts b/test/moves/tera_starstorm.test.ts
similarity index 54%
rename from src/test/moves/tera_starstorm.test.ts
rename to test/moves/tera_starstorm.test.ts
index 22dd5b3c4d1..5ae0c575599 100644
--- a/src/test/moves/tera_starstorm.test.ts
+++ b/test/moves/tera_starstorm.test.ts
@@ -1,9 +1,9 @@
 import { BattlerIndex } from "#app/battle";
-import { Type } from "#enums/type";
+import { PokemonType } from "#enums/pokemon-type";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, it, expect, vi } from "vitest";
 
@@ -24,37 +24,39 @@ describe("Moves - Tera Starstorm", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     game.override
-      .moveset([ Moves.TERA_STARSTORM, Moves.SPLASH ])
-      .battleType("double")
+      .moveset([Moves.TERA_STARSTORM, Moves.SPLASH])
+      .battleStyle("double")
       .enemyAbility(Abilities.BALL_FETCH)
       .enemyMoveset(Moves.SPLASH)
       .enemyLevel(30)
-      .enemySpecies(Species.MAGIKARP)
-      .startingHeldItems([{ name: "TERA_SHARD", type: Type.FIRE }]);
+      .enemySpecies(Species.MAGIKARP);
   });
 
   it("changes type to Stellar when used by Terapagos in its Stellar Form", async () => {
-    game.override.battleType("single");
-    await game.classicMode.startBattle([ Species.TERAPAGOS ]);
+    game.override.battleStyle("single");
+    await game.classicMode.startBattle([Species.TERAPAGOS]);
 
     const terapagos = game.scene.getPlayerPokemon()!;
+    terapagos.isTerastallized = true;
 
     vi.spyOn(terapagos, "getMoveType");
 
     game.move.select(Moves.TERA_STARSTORM);
     await game.phaseInterceptor.to("TurnEndPhase");
 
-    expect(terapagos.isTerastallized()).toBe(true);
-    expect(terapagos.getMoveType).toHaveReturnedWith(Type.STELLAR);
+    expect(terapagos.getMoveType).toHaveReturnedWith(PokemonType.STELLAR);
   });
 
   it("targets both opponents in a double battle when used by Terapagos in its Stellar Form", async () => {
-    await game.classicMode.startBattle([ Species.MAGIKARP, Species.TERAPAGOS ]);
+    await game.classicMode.startBattle([Species.MAGIKARP, Species.TERAPAGOS]);
+
+    const terapagos = game.scene.getPlayerParty()[1];
+    terapagos.isTerastallized = true;
 
     game.move.select(Moves.TERA_STARSTORM, 0, BattlerIndex.ENEMY);
     game.move.select(Moves.TERA_STARSTORM, 1);
 
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2 ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2]);
 
     const enemyField = game.scene.getEnemyField();
 
@@ -67,8 +69,42 @@ describe("Moves - Tera Starstorm", () => {
     expect(enemyField.every(pokemon => pokemon.isFullHp())).toBe(false);
   });
 
+  it("targets both opponents in a double battle when used by Terapagos immediately after terastallizing", async () => {
+    await game.classicMode.startBattle([Species.TERAPAGOS]);
+
+    const terapagos = game.scene.getPlayerParty()[0];
+    terapagos.isTerastallized = false;
+
+    game.move.selectWithTera(Moves.TERA_STARSTORM, 0);
+
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2]);
+
+    const enemyField = game.scene.getEnemyField();
+
+    // Terapagos in Stellar Form should hit both targets
+    await game.phaseInterceptor.to("MoveEndPhase");
+    expect(enemyField.some(pokemon => pokemon.isFullHp())).toBe(false);
+  });
+
+  it("targets only one opponent in a double battle when used by Terapagos without terastallizing", async () => {
+    await game.classicMode.startBattle([Species.TERAPAGOS]);
+
+    const terapagos = game.scene.getPlayerParty()[0];
+    terapagos.isTerastallized = false;
+
+    game.move.select(Moves.TERA_STARSTORM, 0, BattlerIndex.ENEMY);
+
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2]);
+
+    const enemyField = game.scene.getEnemyField();
+
+    // Terapagos in Stellar Form should hit both targets
+    await game.phaseInterceptor.to("MoveEndPhase");
+    expect(enemyField.some(pokemon => pokemon.isFullHp())).toBe(true);
+  });
+
   it("applies the effects when Terapagos in Stellar Form is fused with another Pokemon", async () => {
-    await game.classicMode.startBattle([ Species.TERAPAGOS, Species.CHARMANDER, Species.MAGIKARP ]);
+    await game.classicMode.startBattle([Species.TERAPAGOS, Species.CHARMANDER, Species.MAGIKARP]);
 
     const fusionedMon = game.scene.getPlayerParty()[0];
     const magikarp = game.scene.getPlayerParty()[2];
@@ -82,6 +118,8 @@ describe("Moves - Tera Starstorm", () => {
     fusionedMon.fusionGender = magikarp.gender;
     fusionedMon.fusionLuck = magikarp.luck;
 
+    fusionedMon.isTerastallized = true;
+
     vi.spyOn(fusionedMon, "getMoveType");
 
     game.move.select(Moves.TERA_STARSTORM, 0);
@@ -90,9 +128,8 @@ describe("Moves - Tera Starstorm", () => {
 
     // Fusion and terastallized
     expect(fusionedMon.isFusion()).toBe(true);
-    expect(fusionedMon.isTerastallized()).toBe(true);
     // Move effects should be applied
-    expect(fusionedMon.getMoveType).toHaveReturnedWith(Type.STELLAR);
+    expect(fusionedMon.getMoveType).toHaveReturnedWith(PokemonType.STELLAR);
     expect(game.scene.getEnemyField().every(pokemon => pokemon.isFullHp())).toBe(false);
   });
 });
diff --git a/test/moves/thousand_arrows.test.ts b/test/moves/thousand_arrows.test.ts
new file mode 100644
index 00000000000..7259fda8560
--- /dev/null
+++ b/test/moves/thousand_arrows.test.ts
@@ -0,0 +1,89 @@
+import { Abilities } from "#app/enums/abilities";
+import { BattlerTagType } from "#app/enums/battler-tag-type";
+import { BerryPhase } from "#app/phases/berry-phase";
+import { MoveEffectPhase } from "#app/phases/move-effect-phase";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import GameManager from "#test/testUtils/gameManager";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
+
+describe("Moves - Thousand Arrows", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+    game.override.battleStyle("single");
+    game.override.enemySpecies(Species.TOGETIC);
+    game.override.startingLevel(100);
+    game.override.enemyLevel(100);
+    game.override.moveset([Moves.THOUSAND_ARROWS]);
+    game.override.enemyMoveset([Moves.SPLASH, Moves.SPLASH, Moves.SPLASH, Moves.SPLASH]);
+  });
+
+  it("move should hit and ground Flying-type targets", async () => {
+    await game.startBattle([Species.ILLUMISE]);
+
+    const enemyPokemon = game.scene.getEnemyPokemon()!;
+
+    game.move.select(Moves.THOUSAND_ARROWS);
+
+    await game.phaseInterceptor.to(MoveEffectPhase, false);
+    // Enemy should not be grounded before move effect is applied
+    expect(enemyPokemon.getTag(BattlerTagType.IGNORE_FLYING)).toBeUndefined();
+
+    await game.phaseInterceptor.to(BerryPhase, false);
+
+    expect(enemyPokemon.getTag(BattlerTagType.IGNORE_FLYING)).toBeDefined();
+    expect(enemyPokemon.hp).toBeLessThan(enemyPokemon.getMaxHp());
+  });
+
+  it("move should hit and ground targets with Levitate", async () => {
+    game.override.enemySpecies(Species.SNORLAX);
+    game.override.enemyAbility(Abilities.LEVITATE);
+
+    await game.startBattle([Species.ILLUMISE]);
+
+    const enemyPokemon = game.scene.getEnemyPokemon()!;
+
+    game.move.select(Moves.THOUSAND_ARROWS);
+
+    await game.phaseInterceptor.to(MoveEffectPhase, false);
+    // Enemy should not be grounded before move effect is applied
+    expect(enemyPokemon.getTag(BattlerTagType.IGNORE_FLYING)).toBeUndefined();
+
+    await game.phaseInterceptor.to(BerryPhase, false);
+
+    expect(enemyPokemon.getTag(BattlerTagType.IGNORE_FLYING)).toBeDefined();
+    expect(enemyPokemon.hp).toBeLessThan(enemyPokemon.getMaxHp());
+  });
+
+  it("move should hit and ground targets under the effects of Magnet Rise", async () => {
+    game.override.enemySpecies(Species.SNORLAX);
+
+    await game.startBattle([Species.ILLUMISE]);
+
+    const enemyPokemon = game.scene.getEnemyPokemon()!;
+
+    enemyPokemon.addTag(BattlerTagType.FLOATING, undefined, Moves.MAGNET_RISE);
+
+    game.move.select(Moves.THOUSAND_ARROWS);
+
+    await game.phaseInterceptor.to(BerryPhase, false);
+
+    expect(enemyPokemon.getTag(BattlerTagType.FLOATING)).toBeUndefined();
+    expect(enemyPokemon.getTag(BattlerTagType.IGNORE_FLYING)).toBeDefined();
+    expect(enemyPokemon.hp).toBeLessThan(enemyPokemon.getMaxHp());
+  });
+});
diff --git a/src/test/moves/throat_chop.test.ts b/test/moves/throat_chop.test.ts
similarity index 83%
rename from src/test/moves/throat_chop.test.ts
rename to test/moves/throat_chop.test.ts
index 24293f8d086..aaae9c0f5bb 100644
--- a/src/test/moves/throat_chop.test.ts
+++ b/test/moves/throat_chop.test.ts
@@ -3,7 +3,7 @@ import { Moves } from "#app/enums/moves";
 import { Species } from "#app/enums/species";
 import { Stat } from "#app/enums/stat";
 import { Abilities } from "#enums/abilities";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, it, expect } from "vitest";
 
@@ -24,7 +24,7 @@ describe("Moves - Throat Chop", () => {
     game = new GameManager(phaserGame);
     game.override
       .moveset(Array(4).fill(Moves.GROWL))
-      .battleType("single")
+      .battleStyle("single")
       .ability(Abilities.BALL_FETCH)
       .enemyAbility(Abilities.BALL_FETCH)
       .enemyMoveset(Array(4).fill(Moves.THROAT_CHOP))
@@ -32,12 +32,12 @@ describe("Moves - Throat Chop", () => {
   });
 
   it("prevents the target from using sound-based moves for two turns", async () => {
-    await game.classicMode.startBattle([ Species.MAGIKARP ]);
+    await game.classicMode.startBattle([Species.MAGIKARP]);
 
     const enemy = game.scene.getEnemyPokemon()!;
 
     game.move.select(Moves.GROWL);
-    await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
 
     // First turn, move is interrupted
     await game.phaseInterceptor.to("TurnEndPhase");
@@ -47,7 +47,7 @@ describe("Moves - Throat Chop", () => {
     await game.toNextTurn();
 
     game.move.select(Moves.GROWL);
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
 
     await game.phaseInterceptor.to("MoveEndPhase");
     expect(enemy.isFullHp()).toBe(false);
diff --git a/src/test/moves/thunder_wave.test.ts b/test/moves/thunder_wave.test.ts
similarity index 96%
rename from src/test/moves/thunder_wave.test.ts
rename to test/moves/thunder_wave.test.ts
index 21e215a51f2..abfb5828d3b 100644
--- a/src/test/moves/thunder_wave.test.ts
+++ b/test/moves/thunder_wave.test.ts
@@ -3,11 +3,10 @@ import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { StatusEffect } from "#enums/status-effect";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
-
 describe("Moves - Thunder Wave", () => {
   let phaserGame: Phaser.Game;
   let game: GameManager;
@@ -25,9 +24,9 @@ describe("Moves - Thunder Wave", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     game.override
-      .battleType("single")
+      .battleStyle("single")
       .starterSpecies(Species.PIKACHU)
-      .moveset([ Moves.THUNDER_WAVE ])
+      .moveset([Moves.THUNDER_WAVE])
       .enemyMoveset(Moves.SPLASH);
   });
 
diff --git a/src/test/moves/tidy_up.test.ts b/test/moves/tidy_up.test.ts
similarity index 76%
rename from src/test/moves/tidy_up.test.ts
rename to test/moves/tidy_up.test.ts
index 255967b40ac..ba7a1e07959 100644
--- a/src/test/moves/tidy_up.test.ts
+++ b/test/moves/tidy_up.test.ts
@@ -5,12 +5,11 @@ import { TurnEndPhase } from "#app/phases/turn-end-phase";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 import { SubstituteTag } from "#app/data/battler-tags";
 
-
 describe("Moves - Tidy Up", () => {
   let phaserGame: Phaser.Game;
   let game: GameManager;
@@ -27,19 +26,19 @@ describe("Moves - Tidy Up", () => {
 
   beforeEach(() => {
     game = new GameManager(phaserGame);
-    game.override.battleType("single");
+    game.override.battleStyle("single");
     game.override.enemySpecies(Species.MAGIKARP);
     game.override.enemyAbility(Abilities.BALL_FETCH);
     game.override.enemyMoveset(Moves.SPLASH);
     game.override.starterSpecies(Species.FEEBAS);
     game.override.ability(Abilities.BALL_FETCH);
-    game.override.moveset([ Moves.TIDY_UP ]);
+    game.override.moveset([Moves.TIDY_UP]);
     game.override.startingLevel(50);
   });
 
   it("spikes are cleared", async () => {
-    game.override.moveset([ Moves.SPIKES, Moves.TIDY_UP ]);
-    game.override.enemyMoveset([ Moves.SPIKES, Moves.SPIKES, Moves.SPIKES, Moves.SPIKES ]);
+    game.override.moveset([Moves.SPIKES, Moves.TIDY_UP]);
+    game.override.enemyMoveset([Moves.SPIKES, Moves.SPIKES, Moves.SPIKES, Moves.SPIKES]);
     await game.classicMode.startBattle();
 
     game.move.select(Moves.SPIKES);
@@ -47,12 +46,11 @@ describe("Moves - Tidy Up", () => {
     game.move.select(Moves.TIDY_UP);
     await game.phaseInterceptor.to(MoveEndPhase);
     expect(game.scene.arena.getTag(ArenaTagType.SPIKES)).toBeUndefined();
-
   }, 20000);
 
   it("stealth rocks are cleared", async () => {
-    game.override.moveset([ Moves.STEALTH_ROCK, Moves.TIDY_UP ]);
-    game.override.enemyMoveset([ Moves.STEALTH_ROCK, Moves.STEALTH_ROCK, Moves.STEALTH_ROCK, Moves.STEALTH_ROCK ]);
+    game.override.moveset([Moves.STEALTH_ROCK, Moves.TIDY_UP]);
+    game.override.enemyMoveset([Moves.STEALTH_ROCK, Moves.STEALTH_ROCK, Moves.STEALTH_ROCK, Moves.STEALTH_ROCK]);
     await game.classicMode.startBattle();
 
     game.move.select(Moves.STEALTH_ROCK);
@@ -63,8 +61,8 @@ describe("Moves - Tidy Up", () => {
   }, 20000);
 
   it("toxic spikes are cleared", async () => {
-    game.override.moveset([ Moves.TOXIC_SPIKES, Moves.TIDY_UP ]);
-    game.override.enemyMoveset([ Moves.TOXIC_SPIKES, Moves.TOXIC_SPIKES, Moves.TOXIC_SPIKES, Moves.TOXIC_SPIKES ]);
+    game.override.moveset([Moves.TOXIC_SPIKES, Moves.TIDY_UP]);
+    game.override.enemyMoveset([Moves.TOXIC_SPIKES, Moves.TOXIC_SPIKES, Moves.TOXIC_SPIKES, Moves.TOXIC_SPIKES]);
     await game.classicMode.startBattle();
 
     game.move.select(Moves.TOXIC_SPIKES);
@@ -75,8 +73,8 @@ describe("Moves - Tidy Up", () => {
   }, 20000);
 
   it("sticky webs are cleared", async () => {
-    game.override.moveset([ Moves.STICKY_WEB, Moves.TIDY_UP ]);
-    game.override.enemyMoveset([ Moves.STICKY_WEB, Moves.STICKY_WEB, Moves.STICKY_WEB, Moves.STICKY_WEB ]);
+    game.override.moveset([Moves.STICKY_WEB, Moves.TIDY_UP]);
+    game.override.enemyMoveset([Moves.STICKY_WEB, Moves.STICKY_WEB, Moves.STICKY_WEB, Moves.STICKY_WEB]);
 
     await game.classicMode.startBattle();
 
@@ -88,8 +86,8 @@ describe("Moves - Tidy Up", () => {
   }, 20000);
 
   it("substitutes are cleared", async () => {
-    game.override.moveset([ Moves.SUBSTITUTE, Moves.TIDY_UP ]);
-    game.override.enemyMoveset([ Moves.SUBSTITUTE, Moves.SUBSTITUTE, Moves.SUBSTITUTE, Moves.SUBSTITUTE ]);
+    game.override.moveset([Moves.SUBSTITUTE, Moves.TIDY_UP]);
+    game.override.enemyMoveset([Moves.SUBSTITUTE, Moves.SUBSTITUTE, Moves.SUBSTITUTE, Moves.SUBSTITUTE]);
 
     await game.classicMode.startBattle();
 
@@ -98,7 +96,7 @@ describe("Moves - Tidy Up", () => {
     game.move.select(Moves.TIDY_UP);
     await game.phaseInterceptor.to(MoveEndPhase);
 
-    const pokemon = [ game.scene.getPlayerPokemon()!, game.scene.getEnemyPokemon()! ];
+    const pokemon = [game.scene.getPlayerPokemon()!, game.scene.getEnemyPokemon()!];
     pokemon.forEach(p => {
       expect(p).toBeDefined();
       expect(p!.getTag(SubstituteTag)).toBeUndefined();
diff --git a/src/test/moves/torment.test.ts b/test/moves/torment.test.ts
similarity index 89%
rename from src/test/moves/torment.test.ts
rename to test/moves/torment.test.ts
index b4c9a059db1..d06837d2806 100644
--- a/src/test/moves/torment.test.ts
+++ b/test/moves/torment.test.ts
@@ -1,7 +1,7 @@
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { Abilities } from "#enums/abilities";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 import { MoveResult } from "#app/field/pokemon";
@@ -24,17 +24,17 @@ describe("Moves - Torment", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     game.override
-      .battleType("single")
+      .battleStyle("single")
       .enemyAbility(Abilities.BALL_FETCH)
-      .enemyMoveset([ Moves.TORMENT, Moves.SPLASH ])
+      .enemyMoveset([Moves.TORMENT, Moves.SPLASH])
       .enemySpecies(Species.SHUCKLE)
       .enemyLevel(30)
-      .moveset([ Moves.TACKLE ])
+      .moveset([Moves.TACKLE])
       .ability(Abilities.BALL_FETCH);
   });
 
   it("Pokemon should not be able to use the same move consecutively", async () => {
-    await game.classicMode.startBattle([ Species.CHANSEY ]);
+    await game.classicMode.startBattle([Species.CHANSEY]);
 
     const playerPokemon = game.scene.getPlayerPokemon()!;
 
diff --git a/src/test/moves/toxic.test.ts b/test/moves/toxic.test.ts
similarity index 75%
rename from src/test/moves/toxic.test.ts
rename to test/moves/toxic.test.ts
index b146134ae51..f908d27ec7e 100644
--- a/src/test/moves/toxic.test.ts
+++ b/test/moves/toxic.test.ts
@@ -1,11 +1,11 @@
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 import { StatusEffect } from "#enums/status-effect";
 import { BattlerIndex } from "#app/battle";
-import { allMoves } from "#app/data/move";
+import { allMoves } from "#app/data/moves/move";
 
 describe("Moves - Toxic", () => {
   let phaserGame: Phaser.Game;
@@ -23,16 +23,12 @@ describe("Moves - Toxic", () => {
 
   beforeEach(() => {
     game = new GameManager(phaserGame);
-    game.override
-      .battleType("single")
-      .moveset(Moves.TOXIC)
-      .enemySpecies(Species.MAGIKARP)
-      .enemyMoveset(Moves.SPLASH);
+    game.override.battleStyle("single").moveset(Moves.TOXIC).enemySpecies(Species.MAGIKARP).enemyMoveset(Moves.SPLASH);
   });
 
   it("should be guaranteed to hit if user is Poison-type", async () => {
     vi.spyOn(allMoves[Moves.TOXIC], "accuracy", "get").mockReturnValue(0);
-    await game.classicMode.startBattle([ Species.TOXAPEX ]);
+    await game.classicMode.startBattle([Species.TOXAPEX]);
 
     game.move.select(Moves.TOXIC);
     await game.phaseInterceptor.to("BerryPhase", false);
@@ -42,7 +38,7 @@ describe("Moves - Toxic", () => {
 
   it("may miss if user is not Poison-type", async () => {
     vi.spyOn(allMoves[Moves.TOXIC], "accuracy", "get").mockReturnValue(0);
-    await game.classicMode.startBattle([ Species.UMBREON ]);
+    await game.classicMode.startBattle([Species.UMBREON]);
 
     game.move.select(Moves.TOXIC);
     await game.phaseInterceptor.to("BerryPhase", false);
@@ -53,10 +49,10 @@ describe("Moves - Toxic", () => {
   it("should hit semi-invulnerable targets if user is Poison-type", async () => {
     vi.spyOn(allMoves[Moves.TOXIC], "accuracy", "get").mockReturnValue(0);
     game.override.enemyMoveset(Moves.FLY);
-    await game.classicMode.startBattle([ Species.TOXAPEX ]);
+    await game.classicMode.startBattle([Species.TOXAPEX]);
 
     game.move.select(Moves.TOXIC);
-    await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
     await game.phaseInterceptor.to("BerryPhase", false);
 
     expect(game.scene.getEnemyPokemon()!.status?.effect).toBe(StatusEffect.TOXIC);
@@ -65,10 +61,10 @@ describe("Moves - Toxic", () => {
   it("should miss semi-invulnerable targets if user is not Poison-type", async () => {
     vi.spyOn(allMoves[Moves.TOXIC], "accuracy", "get").mockReturnValue(-1);
     game.override.enemyMoveset(Moves.FLY);
-    await game.classicMode.startBattle([ Species.UMBREON ]);
+    await game.classicMode.startBattle([Species.UMBREON]);
 
     game.move.select(Moves.TOXIC);
-    await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
     await game.phaseInterceptor.to("BerryPhase", false);
 
     expect(game.scene.getEnemyPokemon()!.status).toBeUndefined();
@@ -77,10 +73,10 @@ describe("Moves - Toxic", () => {
   it("moves other than Toxic should not hit semi-invulnerable targets even if user is Poison-type", async () => {
     game.override.moveset(Moves.SWIFT);
     game.override.enemyMoveset(Moves.FLY);
-    await game.classicMode.startBattle([ Species.TOXAPEX ]);
+    await game.classicMode.startBattle([Species.TOXAPEX]);
 
     game.move.select(Moves.SWIFT);
-    await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
     await game.phaseInterceptor.to("BerryPhase", false);
 
     const enemyPokemon = game.scene.getEnemyPokemon()!;
diff --git a/src/test/moves/toxic_spikes.test.ts b/test/moves/toxic_spikes.test.ts
similarity index 81%
rename from src/test/moves/toxic_spikes.test.ts
rename to test/moves/toxic_spikes.test.ts
index c2d1c5aaee8..b1fdc7f39c2 100644
--- a/src/test/moves/toxic_spikes.test.ts
+++ b/test/moves/toxic_spikes.test.ts
@@ -7,7 +7,7 @@ import { ArenaTagType } from "#enums/arena-tag-type";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { StatusEffect } from "#enums/status-effect";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
@@ -28,17 +28,17 @@ describe("Moves - Toxic Spikes", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     game.override
-      .battleType("single")
+      .battleStyle("single")
       .startingWave(5)
       .enemySpecies(Species.RATTATA)
       .enemyAbility(Abilities.BALL_FETCH)
       .ability(Abilities.BALL_FETCH)
       .enemyMoveset(Moves.SPLASH)
-      .moveset([ Moves.TOXIC_SPIKES, Moves.SPLASH, Moves.ROAR, Moves.COURT_CHANGE ]);
+      .moveset([Moves.TOXIC_SPIKES, Moves.SPLASH, Moves.ROAR, Moves.COURT_CHANGE]);
   });
 
   it("should not affect the opponent if they do not switch", async () => {
-    await game.classicMode.runToSummon([ Species.MIGHTYENA, Species.POOCHYENA ]);
+    await game.classicMode.runToSummon([Species.MIGHTYENA, Species.POOCHYENA]);
 
     const enemy = game.scene.getEnemyField()[0];
 
@@ -54,7 +54,7 @@ describe("Moves - Toxic Spikes", () => {
   });
 
   it("should poison the opponent if they switch into 1 layer", async () => {
-    await game.classicMode.runToSummon([ Species.MIGHTYENA ]);
+    await game.classicMode.runToSummon([Species.MIGHTYENA]);
 
     game.move.select(Moves.TOXIC_SPIKES);
     await game.phaseInterceptor.to("TurnEndPhase");
@@ -68,7 +68,7 @@ describe("Moves - Toxic Spikes", () => {
   });
 
   it("should badly poison the opponent if they switch into 2 layers", async () => {
-    await game.classicMode.runToSummon([ Species.MIGHTYENA ]);
+    await game.classicMode.runToSummon([Species.MIGHTYENA]);
 
     game.move.select(Moves.TOXIC_SPIKES);
     await game.phaseInterceptor.to("TurnEndPhase");
@@ -83,7 +83,7 @@ describe("Moves - Toxic Spikes", () => {
   });
 
   it("should be removed if a grounded poison pokemon switches in", async () => {
-    await game.classicMode.runToSummon([ Species.MUK, Species.PIDGEY ]);
+    await game.classicMode.runToSummon([Species.MUK, Species.PIDGEY]);
 
     const muk = game.scene.getPlayerPokemon()!;
 
@@ -106,12 +106,12 @@ describe("Moves - Toxic Spikes", () => {
   });
 
   it("shouldn't create multiple layers per use in doubles", async () => {
-    await game.classicMode.runToSummon([ Species.MIGHTYENA, Species.POOCHYENA ]);
+    await game.classicMode.runToSummon([Species.MIGHTYENA, Species.POOCHYENA]);
 
     game.move.select(Moves.TOXIC_SPIKES);
     await game.phaseInterceptor.to("TurnEndPhase");
 
-    const arenaTags = (game.scene.arena.getTagOnSide(ArenaTagType.TOXIC_SPIKES, ArenaTagSide.ENEMY) as ArenaTrapTag);
+    const arenaTags = game.scene.arena.getTagOnSide(ArenaTagType.TOXIC_SPIKES, ArenaTagSide.ENEMY) as ArenaTrapTag;
     expect(arenaTags.tagType).toBe(ArenaTagType.TOXIC_SPIKES);
     expect(arenaTags.layers).toBe(1);
   });
@@ -120,7 +120,7 @@ describe("Moves - Toxic Spikes", () => {
     game.override.startingWave(1);
     const gameData = new GameData();
 
-    await game.classicMode.runToSummon([ Species.MIGHTYENA ]);
+    await game.classicMode.runToSummon([Species.MIGHTYENA]);
 
     game.move.select(Moves.TOXIC_SPIKES);
     await game.phaseInterceptor.to("TurnEndPhase");
@@ -129,10 +129,12 @@ describe("Moves - Toxic Spikes", () => {
     await game.phaseInterceptor.to("BattleEndPhase");
     await game.toNextWave();
 
-    const sessionData : SessionSaveData = gameData["getSessionSaveData"]();
+    const sessionData: SessionSaveData = gameData.getSessionSaveData();
     localStorage.setItem("sessionTestData", encrypt(JSON.stringify(sessionData), true));
-    const recoveredData : SessionSaveData = gameData.parseSessionData(decrypt(localStorage.getItem("sessionTestData")!, true));
-    gameData.loadSession(0, recoveredData);
+    const recoveredData: SessionSaveData = gameData.parseSessionData(
+      decrypt(localStorage.getItem("sessionTestData")!, true),
+    );
+    await gameData.loadSession(0, recoveredData);
 
     expect(sessionData.arena.tags).toEqual(recoveredData.arena.tags);
     localStorage.removeItem("sessionTestData");
diff --git a/test/moves/transform.test.ts b/test/moves/transform.test.ts
new file mode 100644
index 00000000000..8bfe7df688b
--- /dev/null
+++ b/test/moves/transform.test.ts
@@ -0,0 +1,186 @@
+import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
+import Phaser from "phaser";
+import GameManager from "#test/testUtils/gameManager";
+import { Species } from "#enums/species";
+import { TurnEndPhase } from "#app/phases/turn-end-phase";
+import { Moves } from "#enums/moves";
+import { Stat, EFFECTIVE_STATS } from "#enums/stat";
+import { Abilities } from "#enums/abilities";
+import { BattlerIndex } from "#app/battle";
+
+// TODO: Add more tests once Transform is fully implemented
+describe("Moves - Transform", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+    game.override
+      .battleStyle("single")
+      .enemySpecies(Species.MEW)
+      .enemyLevel(200)
+      .enemyAbility(Abilities.BEAST_BOOST)
+      .enemyPassiveAbility(Abilities.BALL_FETCH)
+      .enemyMoveset(Moves.SPLASH)
+      .ability(Abilities.INTIMIDATE)
+      .moveset([Moves.TRANSFORM]);
+  });
+
+  it("should copy species, ability, gender, all stats except HP, all stat stages, moveset, and types of target", async () => {
+    await game.classicMode.startBattle([Species.DITTO]);
+
+    game.move.select(Moves.TRANSFORM);
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    const player = game.scene.getPlayerPokemon()!;
+    const enemy = game.scene.getEnemyPokemon()!;
+
+    expect(player.getSpeciesForm().speciesId).toBe(enemy.getSpeciesForm().speciesId);
+    expect(player.getAbility()).toBe(enemy.getAbility());
+    expect(player.getGender()).toBe(enemy.getGender());
+
+    // copies all stats except hp
+    expect(player.getStat(Stat.HP, false)).not.toBe(enemy.getStat(Stat.HP));
+    for (const s of EFFECTIVE_STATS) {
+      expect(player.getStat(s, false)).toBe(enemy.getStat(s, false));
+    }
+
+    expect(player.getStatStages()).toEqual(enemy.getStatStages());
+
+    // move IDs are equal
+    expect(player.getMoveset().map(m => m.moveId)).toEqual(enemy.getMoveset().map(m => m.moveId));
+
+    expect(player.getTypes()).toEqual(enemy.getTypes());
+  });
+
+  it("should copy in-battle overridden stats", async () => {
+    game.override.enemyMoveset([Moves.POWER_SPLIT]);
+
+    await game.classicMode.startBattle([Species.DITTO]);
+
+    const player = game.scene.getPlayerPokemon()!;
+    const enemy = game.scene.getEnemyPokemon()!;
+
+    const avgAtk = Math.floor((player.getStat(Stat.ATK, false) + enemy.getStat(Stat.ATK, false)) / 2);
+    const avgSpAtk = Math.floor((player.getStat(Stat.SPATK, false) + enemy.getStat(Stat.SPATK, false)) / 2);
+
+    game.move.select(Moves.TRANSFORM);
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    expect(player.getStat(Stat.ATK, false)).toBe(avgAtk);
+    expect(enemy.getStat(Stat.ATK, false)).toBe(avgAtk);
+
+    expect(player.getStat(Stat.SPATK, false)).toBe(avgSpAtk);
+    expect(enemy.getStat(Stat.SPATK, false)).toBe(avgSpAtk);
+  });
+
+  it("should set each move's pp to a maximum of 5", async () => {
+    game.override.enemyMoveset([Moves.SWORDS_DANCE, Moves.GROWL, Moves.SKETCH, Moves.RECOVER]);
+
+    await game.classicMode.startBattle([Species.DITTO]);
+    const player = game.scene.getPlayerPokemon()!;
+
+    game.move.select(Moves.TRANSFORM);
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    player.getMoveset().forEach(move => {
+      // Should set correct maximum PP without touching `ppUp`
+      if (move) {
+        if (move.moveId === Moves.SKETCH) {
+          expect(move.getMovePp()).toBe(1);
+        } else {
+          expect(move.getMovePp()).toBe(5);
+        }
+        expect(move.ppUp).toBe(0);
+      }
+    });
+  });
+
+  it("should activate its ability if it copies one that activates on summon", async () => {
+    game.override.enemyAbility(Abilities.INTIMIDATE).ability(Abilities.BALL_FETCH);
+
+    await game.classicMode.startBattle([Species.DITTO]);
+    game.move.select(Moves.TRANSFORM);
+
+    await game.phaseInterceptor.to("BerryPhase");
+
+    expect(game.scene.getEnemyPokemon()?.getStatStage(Stat.ATK)).toBe(-1);
+  });
+
+  it("should persist transformed attributes across reloads", async () => {
+    game.override.enemyMoveset([]).moveset([]);
+
+    await game.classicMode.startBattle([Species.DITTO]);
+
+    const player = game.scene.getPlayerPokemon()!;
+    const enemy = game.scene.getEnemyPokemon()!;
+
+    game.move.changeMoveset(player, Moves.TRANSFORM);
+    game.move.changeMoveset(enemy, Moves.MEMENTO);
+
+    game.move.select(Moves.TRANSFORM);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
+    await game.toNextWave();
+
+    expect(game.scene.getCurrentPhase()?.constructor.name).toBe("CommandPhase");
+    expect(game.scene.currentBattle.waveIndex).toBe(2);
+
+    await game.reload.reloadSession();
+
+    const playerReloaded = game.scene.getPlayerPokemon()!;
+    const playerMoveset = player.getMoveset();
+
+    expect(playerReloaded.getSpeciesForm().speciesId).toBe(enemy.getSpeciesForm().speciesId);
+    expect(playerReloaded.getAbility()).toBe(enemy.getAbility());
+    expect(playerReloaded.getGender()).toBe(enemy.getGender());
+
+    expect(playerReloaded.getStat(Stat.HP, false)).not.toBe(enemy.getStat(Stat.HP));
+    for (const s of EFFECTIVE_STATS) {
+      expect(playerReloaded.getStat(s, false)).toBe(enemy.getStat(s, false));
+    }
+
+    expect(playerMoveset.length).toEqual(1);
+    expect(playerMoveset[0]?.moveId).toEqual(Moves.MEMENTO);
+  });
+
+  it("should stay transformed with the correct form after reload", async () => {
+    game.override.enemyMoveset([]).moveset([]);
+    game.override.enemySpecies(Species.DARMANITAN);
+
+    await game.classicMode.startBattle([Species.DITTO]);
+
+    const player = game.scene.getPlayerPokemon()!;
+    const enemy = game.scene.getEnemyPokemon()!;
+
+    // change form
+    enemy.species.forms[1];
+    enemy.species.formIndex = 1;
+
+    game.move.changeMoveset(player, Moves.TRANSFORM);
+    game.move.changeMoveset(enemy, Moves.MEMENTO);
+
+    game.move.select(Moves.TRANSFORM);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
+    await game.toNextWave();
+
+    expect(game.scene.getCurrentPhase()?.constructor.name).toBe("CommandPhase");
+    expect(game.scene.currentBattle.waveIndex).toBe(2);
+
+    await game.reload.reloadSession();
+
+    const playerReloaded = game.scene.getPlayerPokemon()!;
+
+    expect(playerReloaded.getSpeciesForm().speciesId).toBe(enemy.getSpeciesForm().speciesId);
+    expect(playerReloaded.getSpeciesForm().formIndex).toBe(enemy.getSpeciesForm().formIndex);
+  });
+});
diff --git a/src/test/moves/trick_or_treat.test.ts b/test/moves/trick_or_treat.test.ts
similarity index 73%
rename from src/test/moves/trick_or_treat.test.ts
rename to test/moves/trick_or_treat.test.ts
index 5c85cac05e2..3b32e09f72d 100644
--- a/src/test/moves/trick_or_treat.test.ts
+++ b/test/moves/trick_or_treat.test.ts
@@ -1,8 +1,8 @@
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import { Type } from "#enums/type";
-import GameManager from "#test/utils/gameManager";
+import { PokemonType } from "#enums/pokemon-type";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
@@ -23,9 +23,9 @@ describe("Moves - Trick Or Treat", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     game.override
-      .moveset([ Moves.FORESTS_CURSE, Moves.TRICK_OR_TREAT ])
+      .moveset([Moves.FORESTS_CURSE, Moves.TRICK_OR_TREAT])
       .ability(Abilities.BALL_FETCH)
-      .battleType("single")
+      .battleStyle("single")
       .disableCrits()
       .enemySpecies(Species.MAGIKARP)
       .enemyAbility(Abilities.BALL_FETCH)
@@ -33,15 +33,15 @@ describe("Moves - Trick Or Treat", () => {
   });
 
   it("will replace added type from Forest's Curse", async () => {
-    await game.classicMode.startBattle([ Species.FEEBAS ]);
+    await game.classicMode.startBattle([Species.FEEBAS]);
 
     const enemyPokemon = game.scene.getEnemyPokemon();
     game.move.select(Moves.FORESTS_CURSE);
     await game.phaseInterceptor.to("TurnEndPhase");
-    expect(enemyPokemon!.summonData.addedType).toBe(Type.GRASS);
+    expect(enemyPokemon!.summonData.addedType).toBe(PokemonType.GRASS);
 
     game.move.select(Moves.TRICK_OR_TREAT);
     await game.phaseInterceptor.to("TurnEndPhase");
-    expect(enemyPokemon?.summonData.addedType).toBe(Type.GHOST);
+    expect(enemyPokemon?.summonData.addedType).toBe(PokemonType.GHOST);
   });
 });
diff --git a/src/test/moves/triple_arrows.test.ts b/test/moves/triple_arrows.test.ts
similarity index 72%
rename from src/test/moves/triple_arrows.test.ts
rename to test/moves/triple_arrows.test.ts
index 98ad29997df..58ce8a9c528 100644
--- a/src/test/moves/triple_arrows.test.ts
+++ b/test/moves/triple_arrows.test.ts
@@ -1,22 +1,26 @@
-import { allMoves, FlinchAttr, StatStageChangeAttr } from "#app/data/move";
+import { allMoves, FlinchAttr, StatStageChangeAttr } from "#app/data/moves/move";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
+import type Move from "#app/data/moves/move";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
 describe("Moves - Triple Arrows", () => {
   let phaserGame: Phaser.Game;
   let game: GameManager;
-  const tripleArrows = allMoves[Moves.TRIPLE_ARROWS];
-  const flinchAttr = tripleArrows.getAttrs(FlinchAttr)[0];
-  const defDropAttr = tripleArrows.getAttrs(StatStageChangeAttr)[0];
+  let tripleArrows: Move;
+  let flinchAttr: FlinchAttr;
+  let defDropAttr: StatStageChangeAttr;
 
   beforeAll(() => {
     phaserGame = new Phaser.Game({
       type: Phaser.HEADLESS,
     });
+    tripleArrows = allMoves[Moves.TRIPLE_ARROWS];
+    flinchAttr = tripleArrows.getAttrs(FlinchAttr)[0];
+    defDropAttr = tripleArrows.getAttrs(StatStageChangeAttr)[0];
   });
 
   afterEach(() => {
@@ -27,8 +31,8 @@ describe("Moves - Triple Arrows", () => {
     game = new GameManager(phaserGame);
     game.override
       .ability(Abilities.BALL_FETCH)
-      .moveset([ Moves.TRIPLE_ARROWS ])
-      .battleType("single")
+      .moveset([Moves.TRIPLE_ARROWS])
+      .battleStyle("single")
       .enemySpecies(Species.MAGIKARP)
       .enemyAbility(Abilities.STURDY)
       .enemyMoveset(Moves.SPLASH);
@@ -38,7 +42,7 @@ describe("Moves - Triple Arrows", () => {
   });
 
   it("has a 30% flinch chance and 50% defense drop chance", async () => {
-    await game.classicMode.startBattle([ Species.FEEBAS ]);
+    await game.classicMode.startBattle([Species.FEEBAS]);
 
     game.move.select(Moves.TRIPLE_ARROWS);
     await game.phaseInterceptor.to("BerryPhase");
@@ -49,7 +53,7 @@ describe("Moves - Triple Arrows", () => {
 
   it("is affected normally by Serene Grace", async () => {
     game.override.ability(Abilities.SERENE_GRACE);
-    await game.classicMode.startBattle([ Species.FEEBAS ]);
+    await game.classicMode.startBattle([Species.FEEBAS]);
 
     game.move.select(Moves.TRIPLE_ARROWS);
     await game.phaseInterceptor.to("BerryPhase");
diff --git a/src/test/moves/u_turn.test.ts b/test/moves/u_turn.test.ts
similarity index 77%
rename from src/test/moves/u_turn.test.ts
rename to test/moves/u_turn.test.ts
index c6e255e01b2..9dca29414a1 100644
--- a/src/test/moves/u_turn.test.ts
+++ b/test/moves/u_turn.test.ts
@@ -2,7 +2,7 @@ import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { StatusEffect } from "#enums/status-effect";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
@@ -23,11 +23,11 @@ describe("Moves - U-turn", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     game.override
-      .battleType("single")
+      .battleStyle("single")
       .enemySpecies(Species.GENGAR)
       .startingLevel(90)
       .startingWave(97)
-      .moveset([ Moves.U_TURN ])
+      .moveset([Moves.U_TURN])
       .enemyMoveset(Moves.SPLASH)
       .disableCrits();
   });
@@ -36,7 +36,7 @@ describe("Moves - U-turn", () => {
     // arrange
     const playerHp = 1;
     game.override.ability(Abilities.REGENERATOR);
-    await game.classicMode.startBattle([ Species.RAICHU, Species.SHUCKLE ]);
+    await game.classicMode.startBattle([Species.RAICHU, Species.SHUCKLE]);
     game.scene.getPlayerPokemon()!.hp = playerHp;
 
     // act
@@ -45,7 +45,9 @@ describe("Moves - U-turn", () => {
     await game.phaseInterceptor.to("TurnEndPhase");
 
     // assert
-    expect(game.scene.getPlayerParty()[1].hp).toEqual(Math.floor(game.scene.getPlayerParty()[1].getMaxHp() * 0.33 + playerHp));
+    expect(game.scene.getPlayerParty()[1].hp).toEqual(
+      Math.floor(game.scene.getPlayerParty()[1].getMaxHp() * 0.33 + playerHp),
+    );
     expect(game.phaseInterceptor.log).toContain("SwitchSummonPhase");
     expect(game.scene.getPlayerPokemon()!.species.speciesId).toBe(Species.SHUCKLE);
   }, 20000);
@@ -53,7 +55,7 @@ describe("Moves - U-turn", () => {
   it("triggers rough skin on the u-turn user before a new pokemon is switched in", async () => {
     // arrange
     game.override.enemyAbility(Abilities.ROUGH_SKIN);
-    await game.classicMode.startBattle([ Species.RAICHU, Species.SHUCKLE ]);
+    await game.classicMode.startBattle([Species.RAICHU, Species.SHUCKLE]);
 
     // act
     game.move.select(Moves.U_TURN);
@@ -63,7 +65,7 @@ describe("Moves - U-turn", () => {
     // assert
     const playerPkm = game.scene.getPlayerPokemon()!;
     expect(playerPkm.hp).not.toEqual(playerPkm.getMaxHp());
-    expect(game.scene.getEnemyPokemon()!.battleData.abilityRevealed).toBe(true); // proxy for asserting ability activated
+    expect(game.scene.getEnemyPokemon()!.waveData.abilityRevealed).toBe(true); // proxy for asserting ability activated
     expect(playerPkm.species.speciesId).toEqual(Species.RAICHU);
     expect(game.phaseInterceptor.log).not.toContain("SwitchSummonPhase");
   }, 20000);
@@ -71,8 +73,8 @@ describe("Moves - U-turn", () => {
   it("triggers contact abilities on the u-turn user (eg poison point) before a new pokemon is switched in", async () => {
     // arrange
     game.override.enemyAbility(Abilities.POISON_POINT);
-    await game.classicMode.startBattle([ Species.RAICHU, Species.SHUCKLE ]);
-    vi.spyOn(game.scene.getEnemyPokemon()!, "randSeedInt").mockReturnValue(0);
+    await game.classicMode.startBattle([Species.RAICHU, Species.SHUCKLE]);
+    vi.spyOn(game.scene.getEnemyPokemon()!, "randBattleSeedInt").mockReturnValue(0);
 
     // act
     game.move.select(Moves.U_TURN);
@@ -82,16 +84,13 @@ describe("Moves - U-turn", () => {
     const playerPkm = game.scene.getPlayerPokemon()!;
     expect(playerPkm.status?.effect).toEqual(StatusEffect.POISON);
     expect(playerPkm.species.speciesId).toEqual(Species.RAICHU);
-    expect(game.scene.getEnemyPokemon()!.battleData.abilityRevealed).toBe(true); // proxy for asserting ability activated
+    expect(game.scene.getEnemyPokemon()!.waveData.abilityRevealed).toBe(true); // proxy for asserting ability activated
     expect(game.phaseInterceptor.log).not.toContain("SwitchSummonPhase");
   }, 20000);
 
   it("still forces a switch if u-turn KO's the opponent", async () => {
     game.override.startingLevel(1000); // Ensure that U-Turn KO's the opponent
-    await game.classicMode.startBattle([
-      Species.RAICHU,
-      Species.SHUCKLE
-    ]);
+    await game.classicMode.startBattle([Species.RAICHU, Species.SHUCKLE]);
     const enemy = game.scene.getEnemyPokemon()!;
 
     // KO the opponent with U-Turn
diff --git a/src/test/moves/upper_hand.test.ts b/test/moves/upper_hand.test.ts
similarity index 80%
rename from src/test/moves/upper_hand.test.ts
rename to test/moves/upper_hand.test.ts
index f94197d3fbd..66359a94ccb 100644
--- a/src/test/moves/upper_hand.test.ts
+++ b/test/moves/upper_hand.test.ts
@@ -3,7 +3,7 @@ import { MoveResult } from "#app/field/pokemon";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
@@ -26,7 +26,7 @@ describe("Moves - Upper Hand", () => {
     game.override
       .moveset(Moves.UPPER_HAND)
       .ability(Abilities.BALL_FETCH)
-      .battleType("single")
+      .battleStyle("single")
       .disableCrits()
       .enemySpecies(Species.MAGIKARP)
       .enemyAbility(Abilities.BALL_FETCH)
@@ -36,7 +36,7 @@ describe("Moves - Upper Hand", () => {
   });
 
   it("should flinch the opponent before they use a priority attack", async () => {
-    await game.classicMode.startBattle([ Species.FEEBAS ]);
+    await game.classicMode.startBattle([Species.FEEBAS]);
 
     const feebas = game.scene.getPlayerPokemon()!;
     const magikarp = game.scene.getEnemyPokemon()!;
@@ -51,11 +51,11 @@ describe("Moves - Upper Hand", () => {
 
   it.each([
     { descriptor: "non-priority attack", move: Moves.TACKLE },
-    { descriptor: "status move", move: Moves.BABY_DOLL_EYES }
+    { descriptor: "status move", move: Moves.BABY_DOLL_EYES },
   ])("should fail when the opponent selects a $descriptor", async ({ move }) => {
     game.override.enemyMoveset(move);
 
-    await game.classicMode.startBattle([ Species.FEEBAS ]);
+    await game.classicMode.startBattle([Species.FEEBAS]);
 
     const feebas = game.scene.getPlayerPokemon()!;
 
@@ -66,11 +66,9 @@ describe("Moves - Upper Hand", () => {
   });
 
   it("should flinch the opponent before they use an attack boosted by Gale Wings", async () => {
-    game.override
-      .enemyAbility(Abilities.GALE_WINGS)
-      .enemyMoveset(Moves.GUST);
+    game.override.enemyAbility(Abilities.GALE_WINGS).enemyMoveset(Moves.GUST);
 
-    await game.classicMode.startBattle([ Species.FEEBAS ]);
+    await game.classicMode.startBattle([Species.FEEBAS]);
 
     const feebas = game.scene.getPlayerPokemon()!;
     const magikarp = game.scene.getEnemyPokemon()!;
@@ -84,17 +82,15 @@ describe("Moves - Upper Hand", () => {
   });
 
   it("should fail if the target has already moved", async () => {
-    game.override
-      .enemyMoveset(Moves.FAKE_OUT)
-      .enemyAbility(Abilities.SHEER_FORCE);
+    game.override.enemyMoveset(Moves.FAKE_OUT).enemyAbility(Abilities.SHEER_FORCE);
 
-    await game.classicMode.startBattle([ Species.FEEBAS ]);
+    await game.classicMode.startBattle([Species.FEEBAS]);
 
     const feebas = game.scene.getPlayerPokemon()!;
 
     game.move.select(Moves.UPPER_HAND);
 
-    await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
     await game.phaseInterceptor.to("BerryPhase");
 
     expect(feebas.getLastXMoves()[0].result).toBe(MoveResult.FAIL);
diff --git a/test/moves/whirlwind.test.ts b/test/moves/whirlwind.test.ts
new file mode 100644
index 00000000000..67ffb77612c
--- /dev/null
+++ b/test/moves/whirlwind.test.ts
@@ -0,0 +1,252 @@
+import { BattlerTagType } from "#enums/battler-tag-type";
+import { Challenges } from "#enums/challenges";
+import { PokemonType } from "#enums/pokemon-type";
+import { MoveResult } from "#app/field/pokemon";
+import { Abilities } from "#enums/abilities";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import GameManager from "#test/testUtils/gameManager";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
+import { Status } from "#app/data/status-effect";
+import { StatusEffect } from "#enums/status-effect";
+import { globalScene } from "#app/global-scene";
+import { BattlerIndex } from "#app/battle";
+import { BattleType } from "#enums/battle-type";
+import { TrainerType } from "#enums/trainer-type";
+
+describe("Moves - Whirlwind", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+    game.override
+      .battleStyle("single")
+      .moveset([Moves.SPLASH])
+      .enemyAbility(Abilities.BALL_FETCH)
+      .enemyMoveset([Moves.SPLASH, Moves.WHIRLWIND])
+      .enemySpecies(Species.PIDGEY);
+  });
+
+  it.each([
+    { move: Moves.FLY, name: "Fly" },
+    { move: Moves.BOUNCE, name: "Bounce" },
+    { move: Moves.SKY_DROP, name: "Sky Drop" },
+  ])("should not hit a flying target: $name (=$move)", async ({ move }) => {
+    game.override.moveset([move]);
+    // Must have a pokemon in the back so that the move misses instead of fails.
+    await game.classicMode.startBattle([Species.STARAPTOR, Species.MAGIKARP]);
+
+    const staraptor = game.scene.getPlayerPokemon()!;
+
+    game.move.select(move);
+    await game.forceEnemyMove(Moves.WHIRLWIND);
+
+    await game.phaseInterceptor.to("BerryPhase", false);
+
+    expect(staraptor.findTag(t => t.tagType === BattlerTagType.FLYING)).toBeDefined();
+    expect(game.scene.getEnemyPokemon()!.getLastXMoves(1)[0].result).toBe(MoveResult.MISS);
+  });
+
+  it("should force switches randomly", async () => {
+    await game.classicMode.startBattle([Species.BULBASAUR, Species.CHARMANDER, Species.SQUIRTLE]);
+
+    const [bulbasaur, charmander, squirtle] = game.scene.getPlayerParty();
+
+    // Turn 1: Mock an RNG call that calls for switching to 1st backup Pokemon (Charmander)
+    vi.spyOn(game.scene, "randBattleSeedInt").mockImplementation((_range, min = 0) => {
+      return min;
+    });
+    game.move.select(Moves.SPLASH);
+    await game.forceEnemyMove(Moves.WHIRLWIND);
+    await game.toNextTurn();
+
+    expect(bulbasaur.isOnField()).toBe(false);
+    expect(charmander.isOnField()).toBe(true);
+    expect(squirtle.isOnField()).toBe(false);
+
+    // Turn 2: Mock an RNG call that calls for switching to 2nd backup Pokemon (Squirtle)
+    vi.spyOn(game.scene, "randBattleSeedInt").mockImplementation((_range, min = 0) => {
+      return min + 1;
+    });
+    game.move.select(Moves.SPLASH);
+    await game.forceEnemyMove(Moves.WHIRLWIND);
+    await game.toNextTurn();
+
+    expect(bulbasaur.isOnField()).toBe(false);
+    expect(charmander.isOnField()).toBe(false);
+    expect(squirtle.isOnField()).toBe(true);
+  });
+
+  it("should not force a switch to a challenge-ineligible Pokemon", async () => {
+    // Mono-Water challenge, Eevee is ineligible
+    game.challengeMode.addChallenge(Challenges.SINGLE_TYPE, PokemonType.WATER + 1, 0);
+    await game.challengeMode.startBattle([Species.LAPRAS, Species.EEVEE, Species.TOXAPEX, Species.PRIMARINA]);
+
+    const [lapras, eevee, toxapex, primarina] = game.scene.getPlayerParty();
+
+    // Turn 1: Mock an RNG call that would normally call for switching to Eevee, but it is ineligible
+    vi.spyOn(game.scene, "randBattleSeedInt").mockImplementation((_range, min = 0) => {
+      return min;
+    });
+    game.move.select(Moves.SPLASH);
+    await game.forceEnemyMove(Moves.WHIRLWIND);
+    await game.toNextTurn();
+
+    expect(lapras.isOnField()).toBe(false);
+    expect(eevee.isOnField()).toBe(false);
+    expect(toxapex.isOnField()).toBe(true);
+    expect(primarina.isOnField()).toBe(false);
+  });
+
+  it("should not force a switch to a fainted Pokemon", async () => {
+    await game.classicMode.startBattle([Species.LAPRAS, Species.EEVEE, Species.TOXAPEX, Species.PRIMARINA]);
+
+    const [lapras, eevee, toxapex, primarina] = game.scene.getPlayerParty();
+
+    // Turn 1: Eevee faints
+    eevee.hp = 0;
+    eevee.status = new Status(StatusEffect.FAINT);
+    expect(eevee.isFainted()).toBe(true);
+    game.move.select(Moves.SPLASH);
+    await game.forceEnemyMove(Moves.SPLASH);
+    await game.toNextTurn();
+
+    // Turn 2: Mock an RNG call that would normally call for switching to Eevee, but it is fainted
+    vi.spyOn(game.scene, "randBattleSeedInt").mockImplementation((_range, min = 0) => {
+      return min;
+    });
+    game.move.select(Moves.SPLASH);
+    await game.forceEnemyMove(Moves.WHIRLWIND);
+    await game.toNextTurn();
+
+    expect(lapras.isOnField()).toBe(false);
+    expect(eevee.isOnField()).toBe(false);
+    expect(toxapex.isOnField()).toBe(true);
+    expect(primarina.isOnField()).toBe(false);
+  });
+
+  it("should not force a switch if there are no available Pokemon to switch into", async () => {
+    await game.classicMode.startBattle([Species.LAPRAS, Species.EEVEE]);
+
+    const [lapras, eevee] = game.scene.getPlayerParty();
+
+    // Turn 1: Eevee faints
+    eevee.hp = 0;
+    eevee.status = new Status(StatusEffect.FAINT);
+    expect(eevee.isFainted()).toBe(true);
+    game.move.select(Moves.SPLASH);
+    await game.forceEnemyMove(Moves.SPLASH);
+    await game.toNextTurn();
+
+    // Turn 2: Mock an RNG call that would normally call for switching to Eevee, but it is fainted
+    vi.spyOn(game.scene, "randBattleSeedInt").mockImplementation((_range, min = 0) => {
+      return min;
+    });
+    game.move.select(Moves.SPLASH);
+    await game.forceEnemyMove(Moves.WHIRLWIND);
+    await game.toNextTurn();
+
+    expect(lapras.isOnField()).toBe(true);
+    expect(eevee.isOnField()).toBe(false);
+  });
+
+  it("should fail when player uses Whirlwind against an opponent with only one available Pokémon", async () => {
+    // Set up the battle scenario with the player knowing Whirlwind
+    game.override.startingWave(5).enemySpecies(Species.PIDGEY).moveset([Moves.WHIRLWIND]);
+    await game.classicMode.startBattle();
+
+    const enemyParty = game.scene.getEnemyParty();
+
+    // Ensure the opponent has only one available Pokémon
+    if (enemyParty.length > 1) {
+      enemyParty.slice(1).forEach(p => {
+        p.hp = 0;
+        p.status = new Status(StatusEffect.FAINT);
+      });
+    }
+    const eligibleEnemy = enemyParty.filter(p => p.hp > 0 && p.isAllowedInBattle());
+    expect(eligibleEnemy.length).toBe(1);
+
+    // Spy on the queueMessage function
+    const queueSpy = vi.spyOn(globalScene, "queueMessage");
+
+    // Player uses Whirlwind; opponent uses Splash
+    game.move.select(Moves.WHIRLWIND);
+    await game.forceEnemyMove(Moves.SPLASH);
+    await game.toNextTurn();
+
+    // Verify that the failure message is displayed for Whirlwind
+    expect(queueSpy).toHaveBeenCalledWith(expect.stringContaining("But it failed"));
+    // Verify the opponent's Splash message
+    expect(queueSpy).toHaveBeenCalledWith(expect.stringContaining("But nothing happened!"));
+  });
+
+  it("should not pull in the other trainer's pokemon in a partner trainer battle", async () => {
+    game.override
+      .startingWave(2)
+      .battleType(BattleType.TRAINER)
+      .randomTrainer({
+        trainerType: TrainerType.BREEDER,
+        alwaysDouble: true,
+      })
+      .enemyMoveset([Moves.SPLASH, Moves.LUNAR_DANCE])
+      .moveset([Moves.WHIRLWIND, Moves.SPLASH]);
+    await game.classicMode.startBattle([Species.MAGIKARP, Species.TOTODILE]);
+
+    // expect the enemy to have at least 4 pokemon, necessary for this check to even work
+    expect(game.scene.getEnemyParty().length, "enemy must have exactly 4 pokemon").toBe(4);
+
+    const user = game.scene.getPlayerPokemon()!;
+
+    console.log(user.getMoveset(false));
+
+    game.move.select(Moves.SPLASH);
+    game.move.select(Moves.SPLASH);
+    await game.forceEnemyMove(Moves.MEMENTO);
+    await game.forceEnemyMove(Moves.SPLASH);
+    await game.toNextTurn();
+
+    // Get the enemy pokemon id so we can check if is the same after switch.
+    const enemy_id = game.scene.getEnemyPokemon()!.id;
+
+    // Hit the enemy that fainted with whirlwind.
+    game.move.select(Moves.WHIRLWIND, 0, BattlerIndex.ENEMY);
+    game.move.select(Moves.SPLASH, 1);
+
+    await game.forceEnemyMove(Moves.SPLASH);
+    await game.forceEnemyMove(Moves.SPLASH);
+
+    await game.toNextTurn();
+
+    // Expect the enemy pokemon to not have switched out.
+    expect(game.scene.getEnemyPokemon()!.id).toBe(enemy_id);
+  });
+
+  it("should force a wild pokemon to flee", async () => {
+    game.override
+      .battleType(BattleType.WILD)
+      .moveset([Moves.WHIRLWIND, Moves.SPLASH])
+      .enemyMoveset(Moves.SPLASH)
+      .ability(Abilities.BALL_FETCH);
+    await game.classicMode.startBattle([Species.MAGIKARP]);
+
+    const user = game.scene.getPlayerPokemon()!;
+
+    game.move.select(Moves.WHIRLWIND);
+    await game.phaseInterceptor.to("BerryPhase");
+
+    expect(user.getLastXMoves(1)[0].result).toBe(MoveResult.SUCCESS);
+  });
+});
diff --git a/test/moves/wide_guard.test.ts b/test/moves/wide_guard.test.ts
new file mode 100644
index 00000000000..85ebad806d7
--- /dev/null
+++ b/test/moves/wide_guard.test.ts
@@ -0,0 +1,111 @@
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest";
+import GameManager from "#test/testUtils/gameManager";
+import { Species } from "#enums/species";
+import { Abilities } from "#enums/abilities";
+import { Moves } from "#enums/moves";
+import { Stat } from "#enums/stat";
+import { BerryPhase } from "#app/phases/berry-phase";
+import { CommandPhase } from "#app/phases/command-phase";
+
+describe("Moves - Wide Guard", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+
+    game.override.battleStyle("double");
+
+    game.override.moveset([Moves.WIDE_GUARD, Moves.SPLASH, Moves.SURF]);
+
+    game.override.enemySpecies(Species.SNORLAX);
+    game.override.enemyMoveset([Moves.SWIFT]);
+    game.override.enemyAbility(Abilities.INSOMNIA);
+
+    game.override.startingLevel(100);
+    game.override.enemyLevel(100);
+  });
+
+  test("should protect the user and allies from multi-target attack moves", async () => {
+    await game.startBattle([Species.CHARIZARD, Species.BLASTOISE]);
+
+    const leadPokemon = game.scene.getPlayerField();
+
+    game.move.select(Moves.WIDE_GUARD);
+
+    await game.phaseInterceptor.to(CommandPhase);
+
+    game.move.select(Moves.SPLASH, 1);
+
+    await game.phaseInterceptor.to(BerryPhase, false);
+
+    leadPokemon.forEach(p => expect(p.hp).toBe(p.getMaxHp()));
+  });
+
+  test("should protect the user and allies from multi-target status moves", async () => {
+    game.override.enemyMoveset([Moves.GROWL]);
+
+    await game.startBattle([Species.CHARIZARD, Species.BLASTOISE]);
+
+    const leadPokemon = game.scene.getPlayerField();
+
+    game.move.select(Moves.WIDE_GUARD);
+
+    await game.phaseInterceptor.to(CommandPhase);
+
+    game.move.select(Moves.SPLASH, 1);
+
+    await game.phaseInterceptor.to(BerryPhase, false);
+
+    leadPokemon.forEach(p => expect(p.getStatStage(Stat.ATK)).toBe(0));
+  });
+
+  test("should not protect the user and allies from single-target moves", async () => {
+    game.override.enemyMoveset([Moves.TACKLE]);
+
+    await game.startBattle([Species.CHARIZARD, Species.BLASTOISE]);
+
+    const leadPokemon = game.scene.getPlayerField();
+
+    game.move.select(Moves.WIDE_GUARD);
+
+    await game.phaseInterceptor.to(CommandPhase);
+
+    game.move.select(Moves.SPLASH, 1);
+
+    await game.phaseInterceptor.to(BerryPhase, false);
+
+    expect(leadPokemon.some(p => p.hp < p.getMaxHp())).toBeTruthy();
+  });
+
+  test("should protect the user from its ally's multi-target move", async () => {
+    game.override.enemyMoveset([Moves.SPLASH]);
+
+    await game.startBattle([Species.CHARIZARD, Species.BLASTOISE]);
+
+    const leadPokemon = game.scene.getPlayerField();
+    const enemyPokemon = game.scene.getEnemyField();
+
+    game.move.select(Moves.WIDE_GUARD);
+
+    await game.phaseInterceptor.to(CommandPhase);
+
+    game.move.select(Moves.SURF, 1);
+
+    await game.phaseInterceptor.to(BerryPhase, false);
+
+    expect(leadPokemon[0].hp).toBe(leadPokemon[0].getMaxHp());
+    enemyPokemon.forEach(p => expect(p.hp).toBeLessThan(p.getMaxHp()));
+  });
+});
diff --git a/src/test/moves/will_o_wisp.test.ts b/test/moves/will_o_wisp.test.ts
similarity index 82%
rename from src/test/moves/will_o_wisp.test.ts
rename to test/moves/will_o_wisp.test.ts
index 39729d331ad..b4e4975896b 100644
--- a/src/test/moves/will_o_wisp.test.ts
+++ b/test/moves/will_o_wisp.test.ts
@@ -3,7 +3,7 @@ import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { StatusEffect } from "#enums/status-effect";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
@@ -24,9 +24,9 @@ describe("Moves - Will-O-Wisp", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     game.override
-      .moveset([ Moves.WILL_O_WISP, Moves.SPLASH ])
+      .moveset([Moves.WILL_O_WISP, Moves.SPLASH])
       .ability(Abilities.BALL_FETCH)
-      .battleType("single")
+      .battleStyle("single")
       .disableCrits()
       .enemySpecies(Species.MAGIKARP)
       .enemyAbility(Abilities.BALL_FETCH)
@@ -34,12 +34,12 @@ describe("Moves - Will-O-Wisp", () => {
   });
 
   it("should burn the opponent", async () => {
-    await game.classicMode.startBattle([ Species.FEEBAS ]);
+    await game.classicMode.startBattle([Species.FEEBAS]);
 
     const enemy = game.scene.getEnemyPokemon()!;
 
     game.move.select(Moves.WILL_O_WISP);
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
     await game.move.forceHit();
     await game.toNextTurn();
 
diff --git a/src/test/mystery-encounter/encounter-test-utils.ts b/test/mystery-encounter/encounter-test-utils.ts
similarity index 64%
rename from src/test/mystery-encounter/encounter-test-utils.ts
rename to test/mystery-encounter/encounter-test-utils.ts
index 69fa9b5465f..977f40bc90e 100644
--- a/src/test/mystery-encounter/encounter-test-utils.ts
+++ b/test/mystery-encounter/encounter-test-utils.ts
@@ -1,18 +1,24 @@
+// biome-ignore lint/style/noNamespaceImport: Necessary for mocks
 import * as EncounterPhaseUtils from "#app/data/mystery-encounters/utils/encounter-phase-utils";
 import { Status } from "#app/data/status-effect";
 import { CommandPhase } from "#app/phases/command-phase";
 import { MessagePhase } from "#app/phases/message-phase";
-import { MysteryEncounterBattlePhase, MysteryEncounterOptionSelectedPhase, MysteryEncounterPhase, MysteryEncounterRewardsPhase } from "#app/phases/mystery-encounter-phases";
+import {
+  MysteryEncounterBattlePhase,
+  MysteryEncounterOptionSelectedPhase,
+  MysteryEncounterPhase,
+  MysteryEncounterRewardsPhase,
+} from "#app/phases/mystery-encounter-phases";
 import { VictoryPhase } from "#app/phases/victory-phase";
 import type MessageUiHandler from "#app/ui/message-ui-handler";
 import type MysteryEncounterUiHandler from "#app/ui/mystery-encounter-ui-handler";
 import type PartyUiHandler from "#app/ui/party-ui-handler";
 import type OptionSelectUiHandler from "#app/ui/settings/option-select-ui-handler";
-import { Mode } from "#app/ui/ui";
-import { isNullOrUndefined } from "#app/utils";
+import { UiMode } from "#enums/ui-mode";
+import { isNullOrUndefined } from "#app/utils/common";
 import { Button } from "#enums/buttons";
 import { StatusEffect } from "#enums/status-effect";
-import type GameManager from "#test/utils/gameManager";
+import type GameManager from "#test/testUtils/gameManager";
 import { expect, vi } from "vitest";
 
 /**
@@ -22,34 +28,49 @@ import { expect, vi } from "vitest";
  * @param secondaryOptionSelect
  * @param isBattle If selecting option should lead to battle, set to `true`
  */
-export async function runMysteryEncounterToEnd(game: GameManager, optionNo: number, secondaryOptionSelect?: { pokemonNo: number, optionNo?: number }, isBattle: boolean = false) {
+export async function runMysteryEncounterToEnd(
+  game: GameManager,
+  optionNo: number,
+  secondaryOptionSelect?: { pokemonNo: number; optionNo?: number },
+  isBattle = false,
+) {
   vi.spyOn(EncounterPhaseUtils, "selectPokemonForOption");
   await runSelectMysteryEncounterOption(game, optionNo, secondaryOptionSelect);
 
   // run the selected options phase
-  game.onNextPrompt("MysteryEncounterOptionSelectedPhase", Mode.MESSAGE, () => {
-    const uiHandler = game.scene.ui.getHandler<MysteryEncounterUiHandler>();
-    uiHandler.processInput(Button.ACTION);
-  }, () => game.isCurrentPhase(MysteryEncounterBattlePhase) || game.isCurrentPhase(MysteryEncounterRewardsPhase));
+  game.onNextPrompt(
+    "MysteryEncounterOptionSelectedPhase",
+    UiMode.MESSAGE,
+    () => {
+      const uiHandler = game.scene.ui.getHandler<MysteryEncounterUiHandler>();
+      uiHandler.processInput(Button.ACTION);
+    },
+    () => game.isCurrentPhase(MysteryEncounterBattlePhase) || game.isCurrentPhase(MysteryEncounterRewardsPhase),
+  );
 
   if (isBattle) {
-    game.onNextPrompt("DamageAnimPhase", Mode.MESSAGE, () => {
-      game.setMode(Mode.MESSAGE);
-      game.endPhase();
-    }, () => game.isCurrentPhase(CommandPhase));
+    game.onNextPrompt(
+      "CheckSwitchPhase",
+      UiMode.CONFIRM,
+      () => {
+        game.setMode(UiMode.MESSAGE);
+        game.endPhase();
+      },
+      () => game.isCurrentPhase(CommandPhase),
+    );
 
-    game.onNextPrompt("CheckSwitchPhase", Mode.CONFIRM, () => {
-      game.setMode(Mode.MESSAGE);
-      game.endPhase();
-    }, () => game.isCurrentPhase(CommandPhase));
-
-    game.onNextPrompt("CheckSwitchPhase", Mode.MESSAGE, () => {
-      game.setMode(Mode.MESSAGE);
-      game.endPhase();
-    }, () => game.isCurrentPhase(CommandPhase));
+    game.onNextPrompt(
+      "CheckSwitchPhase",
+      UiMode.MESSAGE,
+      () => {
+        game.setMode(UiMode.MESSAGE);
+        game.endPhase();
+      },
+      () => game.isCurrentPhase(CommandPhase),
+    );
 
     // If a battle is started, fast forward to end of the battle
-    game.onNextPrompt("CommandPhase", Mode.COMMAND, () => {
+    game.onNextPrompt("CommandPhase", UiMode.COMMAND, () => {
       game.scene.clearPhaseQueue();
       game.scene.clearPhaseQueueSplice();
       game.scene.unshiftPhase(new VictoryPhase(0));
@@ -57,13 +78,13 @@ export async function runMysteryEncounterToEnd(game: GameManager, optionNo: numb
     });
 
     // Handle end of battle trainer messages
-    game.onNextPrompt("TrainerVictoryPhase", Mode.MESSAGE, () => {
+    game.onNextPrompt("TrainerVictoryPhase", UiMode.MESSAGE, () => {
       const uiHandler = game.scene.ui.getHandler<MessageUiHandler>();
       uiHandler.processInput(Button.ACTION);
     });
 
     // Handle egg hatch dialogue
-    game.onNextPrompt("EggLapsePhase", Mode.MESSAGE, () => {
+    game.onNextPrompt("EggLapsePhase", UiMode.MESSAGE, () => {
       const uiHandler = game.scene.ui.getHandler<MessageUiHandler>();
       uiHandler.processInput(Button.ACTION);
     });
@@ -74,22 +95,36 @@ export async function runMysteryEncounterToEnd(game: GameManager, optionNo: numb
   }
 }
 
-export async function runSelectMysteryEncounterOption(game: GameManager, optionNo: number, secondaryOptionSelect?: { pokemonNo: number, optionNo?: number }) {
+export async function runSelectMysteryEncounterOption(
+  game: GameManager,
+  optionNo: number,
+  secondaryOptionSelect?: { pokemonNo: number; optionNo?: number },
+) {
   // Handle any eventual queued messages (e.g. weather phase, etc.)
-  game.onNextPrompt("MessagePhase", Mode.MESSAGE, () => {
-    const uiHandler = game.scene.ui.getHandler<MessageUiHandler>();
-    uiHandler.processInput(Button.ACTION);
-  }, () => game.isCurrentPhase(MysteryEncounterOptionSelectedPhase));
+  game.onNextPrompt(
+    "MessagePhase",
+    UiMode.MESSAGE,
+    () => {
+      const uiHandler = game.scene.ui.getHandler<MessageUiHandler>();
+      uiHandler.processInput(Button.ACTION);
+    },
+    () => game.isCurrentPhase(MysteryEncounterOptionSelectedPhase),
+  );
 
   if (game.isCurrentPhase(MessagePhase)) {
     await game.phaseInterceptor.run(MessagePhase);
   }
 
   // dispose of intro messages
-  game.onNextPrompt("MysteryEncounterPhase", Mode.MESSAGE, () => {
-    const uiHandler = game.scene.ui.getHandler<MysteryEncounterUiHandler>();
-    uiHandler.processInput(Button.ACTION);
-  }, () => game.isCurrentPhase(MysteryEncounterOptionSelectedPhase));
+  game.onNextPrompt(
+    "MysteryEncounterPhase",
+    UiMode.MESSAGE,
+    () => {
+      const uiHandler = game.scene.ui.getHandler<MysteryEncounterUiHandler>();
+      uiHandler.processInput(Button.ACTION);
+    },
+    () => game.isCurrentPhase(MysteryEncounterOptionSelectedPhase),
+  );
 
   await game.phaseInterceptor.to(MysteryEncounterPhase, true);
 
@@ -98,10 +133,6 @@ export async function runSelectMysteryEncounterOption(game: GameManager, optionN
   uiHandler.unblockInput(); // input are blocked by 1s to prevent accidental input. Tests need to handle that
 
   switch (optionNo) {
-    default:
-    case 1:
-    // no movement needed. Default cursor position
-      break;
     case 2:
       uiHandler.processInput(Button.RIGHT);
       break;
@@ -112,6 +143,9 @@ export async function runSelectMysteryEncounterOption(game: GameManager, optionN
       uiHandler.processInput(Button.RIGHT);
       uiHandler.processInput(Button.DOWN);
       break;
+    default:
+      // no movement needed. Default cursor position
+      break;
   }
 
   if (!isNullOrUndefined(secondaryOptionSelect?.pokemonNo)) {
@@ -123,7 +157,7 @@ export async function runSelectMysteryEncounterOption(game: GameManager, optionN
 
 async function handleSecondaryOptionSelect(game: GameManager, pokemonNo: number, optionNo?: number) {
   // Handle secondary option selections
-  const partyUiHandler = game.scene.ui.handlers[Mode.PARTY] as PartyUiHandler;
+  const partyUiHandler = game.scene.ui.handlers[UiMode.PARTY] as PartyUiHandler;
   vi.spyOn(partyUiHandler, "show");
 
   const encounterUiHandler = game.scene.ui.getHandler<MysteryEncounterUiHandler>();
@@ -143,7 +177,7 @@ async function handleSecondaryOptionSelect(game: GameManager, pokemonNo: number,
   // If there is a second choice to make after selecting a Pokemon
   if (!isNullOrUndefined(optionNo)) {
     // Wait for Summary menu to close and second options to spawn
-    const secondOptionUiHandler = game.scene.ui.handlers[Mode.OPTION_SELECT] as OptionSelectUiHandler;
+    const secondOptionUiHandler = game.scene.ui.handlers[UiMode.OPTION_SELECT] as OptionSelectUiHandler;
     vi.spyOn(secondOptionUiHandler, "show");
     await vi.waitFor(() => expect(secondOptionUiHandler.show).toHaveBeenCalled());
 
@@ -162,7 +196,7 @@ async function handleSecondaryOptionSelect(game: GameManager, pokemonNo: number,
  * @param game
  * @param runRewardsPhase
  */
-export async function skipBattleRunMysteryEncounterRewardsPhase(game: GameManager, runRewardsPhase: boolean = true) {
+export async function skipBattleRunMysteryEncounterRewardsPhase(game: GameManager, runRewardsPhase = true) {
   game.scene.clearPhaseQueue();
   game.scene.clearPhaseQueueSplice();
   game.scene.getEnemyParty().forEach(p => {
@@ -172,6 +206,6 @@ export async function skipBattleRunMysteryEncounterRewardsPhase(game: GameManage
   });
   game.scene.pushPhase(new VictoryPhase(0));
   game.phaseInterceptor.superEndPhase();
-  game.setMode(Mode.MESSAGE);
+  game.setMode(UiMode.MESSAGE);
   await game.phaseInterceptor.to(MysteryEncounterRewardsPhase, runRewardsPhase);
 }
diff --git a/src/test/mystery-encounter/encounters/a-trainers-test-encounter.test.ts b/test/mystery-encounter/encounters/a-trainers-test-encounter.test.ts
similarity index 90%
rename from src/test/mystery-encounter/encounters/a-trainers-test-encounter.test.ts
rename to test/mystery-encounter/encounters/a-trainers-test-encounter.test.ts
index 5a01b8a7379..a4c043ad13f 100644
--- a/src/test/mystery-encounter/encounters/a-trainers-test-encounter.test.ts
+++ b/test/mystery-encounter/encounters/a-trainers-test-encounter.test.ts
@@ -3,14 +3,17 @@ import { HUMAN_TRANSITABLE_BIOMES } from "#app/data/mystery-encounters/mystery-e
 import { Biome } from "#app/enums/biome";
 import { MysteryEncounterType } from "#app/enums/mystery-encounter-type";
 import { Species } from "#app/enums/species";
-import GameManager from "#app/test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 import * as EncounterPhaseUtils from "#app/data/mystery-encounters/utils/encounter-phase-utils";
-import { runMysteryEncounterToEnd, skipBattleRunMysteryEncounterRewardsPhase } from "#test/mystery-encounter/encounter-test-utils";
+import {
+  runMysteryEncounterToEnd,
+  skipBattleRunMysteryEncounterRewardsPhase,
+} from "#test/mystery-encounter/encounter-test-utils";
 import type BattleScene from "#app/battle-scene";
 import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
 import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
-import { initSceneWithoutEncounterPhase } from "#test/utils/gameManagerUtils";
+import { initSceneWithoutEncounterPhase } from "#test/testUtils/gameManagerUtils";
 import { ATrainersTestEncounter } from "#app/data/mystery-encounters/encounters/a-trainers-test-encounter";
 import { EggTier } from "#enums/egg-type";
 import { CommandPhase } from "#app/phases/command-phase";
@@ -19,7 +22,7 @@ import { PartyHealPhase } from "#app/phases/party-heal-phase";
 import i18next from "i18next";
 
 const namespace = "mysteryEncounters/aTrainersTest";
-const defaultParty = [ Species.LAPRAS, Species.GENGAR, Species.ABRA ];
+const defaultParty = [Species.LAPRAS, Species.GENGAR, Species.ABRA];
 const defaultBiome = Biome.CAVE;
 const defaultWave = 45;
 
@@ -41,10 +44,10 @@ describe("A Trainer's Test - Mystery Encounter", () => {
     game.override.disableTrainerWaves();
 
     const biomeMap = new Map<Biome, MysteryEncounterType[]>([
-      [ Biome.VOLCANO, [ MysteryEncounterType.MYSTERIOUS_CHALLENGERS ]],
+      [Biome.VOLCANO, [MysteryEncounterType.MYSTERIOUS_CHALLENGERS]],
     ]);
     HUMAN_TRANSITABLE_BIOMES.forEach(biome => {
-      biomeMap.set(biome, [ MysteryEncounterType.A_TRAINERS_TEST ]);
+      biomeMap.set(biome, [MysteryEncounterType.A_TRAINERS_TEST]);
     });
     vi.spyOn(MysteryEncounters, "mysteryEncountersByBiome", "get").mockReturnValue(biomeMap);
   });
@@ -107,8 +110,15 @@ describe("A Trainer's Test - Mystery Encounter", () => {
       expect(scene.getCurrentPhase()?.constructor.name).toBe(CommandPhase.name);
       expect(enemyField.length).toBe(1);
       expect(scene.currentBattle.trainer).toBeDefined();
-      expect([ i18next.t("trainerNames:buck"), i18next.t("trainerNames:cheryl"), i18next.t("trainerNames:marley"), i18next.t("trainerNames:mira"), i18next.t("trainerNames:riley") ]
-        .map(name => name.toLowerCase()).includes(scene.currentBattle.trainer!.config.name)).toBeTruthy();
+      expect(
+        [
+          i18next.t("trainerNames:buck"),
+          i18next.t("trainerNames:cheryl"),
+          i18next.t("trainerNames:marley"),
+          i18next.t("trainerNames:mira"),
+          i18next.t("trainerNames:riley"),
+        ].map(name => name.toLowerCase()),
+      ).toContain(scene.currentBattle.trainer!.config.name.toLowerCase());
       expect(enemyField[0]).toBeDefined();
     });
 
@@ -138,7 +148,7 @@ describe("A Trainer's Test - Mystery Encounter", () => {
       vi.spyOn(scene, "playSoundWithoutBgm").mockImplementation(() => {
         return {
           totalDuration: 1,
-          destroy: () => null
+          destroy: () => null,
         } as any;
       });
     });
diff --git a/src/test/mystery-encounter/encounters/absolute-avarice-encounter.test.ts b/test/mystery-encounter/encounters/absolute-avarice-encounter.test.ts
similarity index 82%
rename from src/test/mystery-encounter/encounters/absolute-avarice-encounter.test.ts
rename to test/mystery-encounter/encounters/absolute-avarice-encounter.test.ts
index 797c062dafe..36a284880c1 100644
--- a/src/test/mystery-encounter/encounters/absolute-avarice-encounter.test.ts
+++ b/test/mystery-encounter/encounters/absolute-avarice-encounter.test.ts
@@ -1,10 +1,13 @@
 import { Biome } from "#app/enums/biome";
 import { MysteryEncounterType } from "#app/enums/mystery-encounter-type";
 import { Species } from "#app/enums/species";
-import GameManager from "#app/test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 import * as EncounterPhaseUtils from "#app/data/mystery-encounters/utils/encounter-phase-utils";
-import { runMysteryEncounterToEnd, skipBattleRunMysteryEncounterRewardsPhase } from "#test/mystery-encounter/encounter-test-utils";
+import {
+  runMysteryEncounterToEnd,
+  skipBattleRunMysteryEncounterRewardsPhase,
+} from "#test/mystery-encounter/encounter-test-utils";
 import type BattleScene from "#app/battle-scene";
 import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
 import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
@@ -19,8 +22,8 @@ import { SelectModifierPhase } from "#app/phases/select-modifier-phase";
 import i18next from "i18next";
 
 const namespace = "mysteryEncounters/absoluteAvarice";
-const defaultParty = [ Species.LAPRAS, Species.GENGAR, Species.ABRA ];
-const defaultBiome = Biome.PLAINS;
+const defaultParty = [Species.LAPRAS, Species.GENGAR, Species.ABRA];
+const defaultBiome = Biome.TALL_GRASS;
 const defaultWave = 45;
 
 describe("Absolute Avarice - Mystery Encounter", () => {
@@ -42,9 +45,9 @@ describe("Absolute Avarice - Mystery Encounter", () => {
 
     vi.spyOn(MysteryEncounters, "mysteryEncountersByBiome", "get").mockReturnValue(
       new Map<Biome, MysteryEncounterType[]>([
-        [ Biome.PLAINS, [ MysteryEncounterType.ABSOLUTE_AVARICE ]],
-        [ Biome.VOLCANO, [ MysteryEncounterType.MYSTERIOUS_CHALLENGERS ]],
-      ])
+        [Biome.TALL_GRASS, [MysteryEncounterType.ABSOLUTE_AVARICE]],
+        [Biome.VOLCANO, [MysteryEncounterType.MYSTERIOUS_CHALLENGERS]],
+      ]),
     );
   });
 
@@ -85,7 +88,11 @@ describe("Absolute Avarice - Mystery Encounter", () => {
 
   it("should spawn if player has enough berries", async () => {
     game.override.mysteryEncounterTier(MysteryEncounterTier.GREAT);
-    game.override.startingHeldItems([{ name: "BERRY", count: 2, type: BerryType.SITRUS }, { name: "BERRY", count: 3, type: BerryType.GANLON }]);
+    game.override.startingHeldItems([
+      { name: "BERRY", count: 2, type: BerryType.SITRUS },
+      { name: "BERRY", count: 3, type: BerryType.GANLON },
+      { name: "BERRY", count: 2, type: BerryType.APICOT },
+    ]);
 
     await game.runToMysteryEncounter();
 
@@ -93,7 +100,11 @@ describe("Absolute Avarice - Mystery Encounter", () => {
   });
 
   it("should remove all player's berries at the start of the encounter", async () => {
-    game.override.startingHeldItems([{ name: "BERRY", count: 2, type: BerryType.SITRUS }, { name: "BERRY", count: 3, type: BerryType.GANLON }]);
+    game.override.startingHeldItems([
+      { name: "BERRY", count: 2, type: BerryType.SITRUS },
+      { name: "BERRY", count: 3, type: BerryType.GANLON },
+      { name: "BERRY", count: 2, type: BerryType.APICOT },
+    ]);
 
     await game.runToMysteryEncounter(MysteryEncounterType.ABSOLUTE_AVARICE, defaultParty);
 
@@ -127,9 +138,9 @@ describe("Absolute Avarice - Mystery Encounter", () => {
       expect(scene.getCurrentPhase()?.constructor.name).toBe(CommandPhase.name);
       expect(enemyField.length).toBe(1);
       expect(enemyField[0].species.speciesId).toBe(Species.GREEDENT);
-      const moveset = enemyField[0].moveset.map(m => m?.moveId);
+      const moveset = enemyField[0].moveset.map(m => m.moveId);
       expect(moveset?.length).toBe(4);
-      expect(moveset).toEqual([ Moves.THRASH, Moves.BODY_PRESS, Moves.STUFF_CHEEKS, Moves.CRUNCH ]);
+      expect(moveset).toEqual([Moves.THRASH, Moves.CRUNCH, Moves.BODY_PRESS, Moves.SLACK_OFF]);
 
       const movePhases = phaseSpy.mock.calls.filter(p => p[0] instanceof MovePhase).map(p => p[0]);
       expect(movePhases.length).toBe(1);
@@ -145,9 +156,13 @@ describe("Absolute Avarice - Mystery Encounter", () => {
 
       for (const partyPokemon of scene.getPlayerParty()) {
         const pokemonId = partyPokemon.id;
-        const pokemonItems = scene.findModifiers(m => m instanceof PokemonHeldItemModifier
-          && (m as PokemonHeldItemModifier).pokemonId === pokemonId, true) as PokemonHeldItemModifier[];
-        const revSeed = pokemonItems.find(i => i.type.name === i18next.t("modifierType:ModifierType.REVIVER_SEED.name"));
+        const pokemonItems = scene.findModifiers(
+          m => m instanceof PokemonHeldItemModifier && (m as PokemonHeldItemModifier).pokemonId === pokemonId,
+          true,
+        ) as PokemonHeldItemModifier[];
+        const revSeed = pokemonItems.find(
+          i => i.type.name === i18next.t("modifierType:ModifierType.REVIVER_SEED.name"),
+        );
         expect(revSeed).toBeDefined;
         expect(revSeed?.stackCount).toBe(1);
       }
@@ -171,7 +186,11 @@ describe("Absolute Avarice - Mystery Encounter", () => {
     });
 
     it("Should return 3 (2/5ths floored) berries if 8 were stolen", { retry: 5 }, async () => {
-      game.override.startingHeldItems([{ name: "BERRY", count: 2, type: BerryType.SITRUS }, { name: "BERRY", count: 3, type: BerryType.GANLON }, { name: "BERRY", count: 3, type: BerryType.APICOT }]);
+      game.override.startingHeldItems([
+        { name: "BERRY", count: 2, type: BerryType.SITRUS },
+        { name: "BERRY", count: 3, type: BerryType.GANLON },
+        { name: "BERRY", count: 3, type: BerryType.APICOT },
+      ]);
 
       await game.runToMysteryEncounter(MysteryEncounterType.ABSOLUTE_AVARICE, defaultParty);
 
@@ -187,7 +206,11 @@ describe("Absolute Avarice - Mystery Encounter", () => {
     });
 
     it("Should return 2 (2/5ths floored) berries if 7 were stolen", { retry: 5 }, async () => {
-      game.override.startingHeldItems([{ name: "BERRY", count: 2, type: BerryType.SITRUS }, { name: "BERRY", count: 3, type: BerryType.GANLON }, { name: "BERRY", count: 2, type: BerryType.APICOT }]);
+      game.override.startingHeldItems([
+        { name: "BERRY", count: 2, type: BerryType.SITRUS },
+        { name: "BERRY", count: 3, type: BerryType.GANLON },
+        { name: "BERRY", count: 2, type: BerryType.APICOT },
+      ]);
 
       await game.runToMysteryEncounter(MysteryEncounterType.ABSOLUTE_AVARICE, defaultParty);
 
@@ -238,9 +261,9 @@ describe("Absolute Avarice - Mystery Encounter", () => {
       expect(partyCountBefore + 1).toBe(partyCountAfter);
       const greedent = scene.getPlayerParty()[scene.getPlayerParty().length - 1];
       expect(greedent.species.speciesId).toBe(Species.GREEDENT);
-      const moveset = greedent.moveset.map(m => m?.moveId);
+      const moveset = greedent.moveset.map(m => m.moveId);
       expect(moveset?.length).toBe(4);
-      expect(moveset).toEqual([ Moves.THRASH, Moves.BODY_PRESS, Moves.STUFF_CHEEKS, Moves.SLACK_OFF ]);
+      expect(moveset).toEqual([Moves.THRASH, Moves.BODY_PRESS, Moves.STUFF_CHEEKS, Moves.SLACK_OFF]);
     });
 
     it("should leave encounter without battle", async () => {
diff --git a/src/test/mystery-encounter/encounters/an-offer-you-cant-refuse-encounter.test.ts b/test/mystery-encounter/encounters/an-offer-you-cant-refuse-encounter.test.ts
similarity index 89%
rename from src/test/mystery-encounter/encounters/an-offer-you-cant-refuse-encounter.test.ts
rename to test/mystery-encounter/encounters/an-offer-you-cant-refuse-encounter.test.ts
index 9a6dae53901..3c7bda8febd 100644
--- a/src/test/mystery-encounter/encounters/an-offer-you-cant-refuse-encounter.test.ts
+++ b/test/mystery-encounter/encounters/an-offer-you-cant-refuse-encounter.test.ts
@@ -3,7 +3,7 @@ import { HUMAN_TRANSITABLE_BIOMES } from "#app/data/mystery-encounters/mystery-e
 import { Biome } from "#app/enums/biome";
 import { MysteryEncounterType } from "#app/enums/mystery-encounter-type";
 import { Species } from "#app/enums/species";
-import GameManager from "#app/test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 import * as EncounterPhaseUtils from "#app/data/mystery-encounters/utils/encounter-phase-utils";
 import { runMysteryEncounterToEnd } from "#test/mystery-encounter/encounter-test-utils";
@@ -12,7 +12,7 @@ import { PlayerPokemon, PokemonMove } from "#app/field/pokemon";
 import { AnOfferYouCantRefuseEncounter } from "#app/data/mystery-encounters/encounters/an-offer-you-cant-refuse-encounter";
 import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
 import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
-import { initSceneWithoutEncounterPhase } from "#test/utils/gameManagerUtils";
+import { initSceneWithoutEncounterPhase } from "#test/testUtils/gameManagerUtils";
 import { getPokemonSpecies } from "#app/data/pokemon-species";
 import { Moves } from "#enums/moves";
 import { ShinyRateBoosterModifier } from "#app/modifier/modifier";
@@ -22,7 +22,7 @@ import { Abilities } from "#enums/abilities";
 
 const namespace = "mysteryEncounters/anOfferYouCantRefuse";
 /** Gyarados for Indimidate */
-const defaultParty = [ Species.GYARADOS, Species.GENGAR, Species.ABRA ];
+const defaultParty = [Species.GYARADOS, Species.GENGAR, Species.ABRA];
 const defaultBiome = Biome.CAVE;
 const defaultWave = 45;
 
@@ -38,17 +38,18 @@ describe("An Offer You Can't Refuse - Mystery Encounter", () => {
   beforeEach(async () => {
     game = new GameManager(phaserGame);
     scene = game.scene;
-    game.override.mysteryEncounterChance(100)
+    game.override
+      .mysteryEncounterChance(100)
       .startingWave(defaultWave)
       .startingBiome(defaultBiome)
       .disableTrainerWaves()
       .ability(Abilities.INTIMIDATE); // Extortion ability
 
     const biomeMap = new Map<Biome, MysteryEncounterType[]>([
-      [ Biome.VOLCANO, [ MysteryEncounterType.MYSTERIOUS_CHALLENGERS ]],
+      [Biome.VOLCANO, [MysteryEncounterType.MYSTERIOUS_CHALLENGERS]],
     ]);
     HUMAN_TRANSITABLE_BIOMES.forEach(biome => {
-      biomeMap.set(biome, [ MysteryEncounterType.AN_OFFER_YOU_CANT_REFUSE ]);
+      biomeMap.set(biome, [MysteryEncounterType.AN_OFFER_YOU_CANT_REFUSE]);
     });
     vi.spyOn(MysteryEncounters, "mysteryEncountersByBiome", "get").mockReturnValue(biomeMap);
   });
@@ -67,10 +68,12 @@ describe("An Offer You Can't Refuse - Mystery Encounter", () => {
     expect(AnOfferYouCantRefuseEncounter.dialogue).toBeDefined();
     expect(AnOfferYouCantRefuseEncounter.dialogue.intro).toStrictEqual([
       { text: `${namespace}:intro` },
-      { speaker: `${namespace}:speaker`, text: `${namespace}:intro_dialogue` }
+      { speaker: `${namespace}:speaker`, text: `${namespace}:intro_dialogue` },
     ]);
     expect(AnOfferYouCantRefuseEncounter.dialogue.encounterOptionsDialogue?.title).toBe(`${namespace}:title`);
-    expect(AnOfferYouCantRefuseEncounter.dialogue.encounterOptionsDialogue?.description).toBe(`${namespace}:description`);
+    expect(AnOfferYouCantRefuseEncounter.dialogue.encounterOptionsDialogue?.description).toBe(
+      `${namespace}:description`,
+    );
     expect(AnOfferYouCantRefuseEncounter.dialogue.encounterOptionsDialogue?.query).toBe(`${namespace}:query`);
     expect(AnOfferYouCantRefuseEncounter.options.length).toBe(3);
   });
@@ -80,7 +83,9 @@ describe("An Offer You Can't Refuse - Mystery Encounter", () => {
     game.override.startingBiome(Biome.VOLCANO);
     await game.runToMysteryEncounter();
 
-    expect(scene.currentBattle?.mysteryEncounter?.encounterType).not.toBe(MysteryEncounterType.AN_OFFER_YOU_CANT_REFUSE);
+    expect(scene.currentBattle?.mysteryEncounter?.encounterType).not.toBe(
+      MysteryEncounterType.AN_OFFER_YOU_CANT_REFUSE,
+    );
   });
 
   it("should initialize fully ", async () => {
@@ -96,10 +101,14 @@ describe("An Offer You Can't Refuse - Mystery Encounter", () => {
 
     expect(AnOfferYouCantRefuseEncounter.dialogueTokens?.strongestPokemon).toBeDefined();
     expect(AnOfferYouCantRefuseEncounter.dialogueTokens?.price).toBeDefined();
-    expect(AnOfferYouCantRefuseEncounter.dialogueTokens?.option2PrimaryAbility).toBe(i18next.t("ability:intimidate.name"));
+    expect(AnOfferYouCantRefuseEncounter.dialogueTokens?.option2PrimaryAbility).toBe(
+      i18next.t("ability:intimidate.name"),
+    );
     expect(AnOfferYouCantRefuseEncounter.dialogueTokens?.moveOrAbility).toBe(i18next.t("ability:intimidate.name"));
     expect(AnOfferYouCantRefuseEncounter.misc.pokemon instanceof PlayerPokemon).toBeTruthy();
-    expect(AnOfferYouCantRefuseEncounter.misc?.price?.toString()).toBe(AnOfferYouCantRefuseEncounter.dialogueTokens?.price);
+    expect(AnOfferYouCantRefuseEncounter.misc?.price?.toString()).toBe(
+      AnOfferYouCantRefuseEncounter.dialogueTokens?.price,
+    );
     expect(onInitResult).toBe(true);
   });
 
@@ -187,27 +196,29 @@ describe("An Offer You Can't Refuse - Mystery Encounter", () => {
     it("should award EXP to a pokemon with an ability in EXTORTION_ABILITIES", async () => {
       await game.runToMysteryEncounter(MysteryEncounterType.AN_OFFER_YOU_CANT_REFUSE, defaultParty);
       const party = scene.getPlayerParty();
-      const gyarados = party.find((pkm) => pkm.species.speciesId === Species.GYARADOS)!;
+      const gyarados = party.find(pkm => pkm.species.speciesId === Species.GYARADOS)!;
       const expBefore = gyarados.exp;
 
       await runMysteryEncounterToEnd(game, 2);
       await game.phaseInterceptor.to(SelectModifierPhase, false);
 
-      expect(gyarados.exp).toBe(expBefore + Math.floor(getPokemonSpecies(Species.LIEPARD).baseExp * defaultWave / 5 + 1));
+      expect(gyarados.exp).toBe(
+        expBefore + Math.floor((getPokemonSpecies(Species.LIEPARD).baseExp * defaultWave) / 5 + 1),
+      );
     });
 
     it("should award EXP to a pokemon with a move in EXTORTION_MOVES", async () => {
       game.override.ability(Abilities.SYNCHRONIZE); // Not an extortion ability, so we can test extortion move
-      await game.runToMysteryEncounter(MysteryEncounterType.AN_OFFER_YOU_CANT_REFUSE, [ Species.ABRA ]);
+      await game.runToMysteryEncounter(MysteryEncounterType.AN_OFFER_YOU_CANT_REFUSE, [Species.ABRA]);
       const party = scene.getPlayerParty();
-      const abra = party.find((pkm) => pkm.species.speciesId === Species.ABRA)!;
-      abra.moveset = [ new PokemonMove(Moves.BEAT_UP) ];
+      const abra = party.find(pkm => pkm.species.speciesId === Species.ABRA)!;
+      abra.moveset = [new PokemonMove(Moves.BEAT_UP)];
       const expBefore = abra.exp;
 
       await runMysteryEncounterToEnd(game, 2);
       await game.phaseInterceptor.to(SelectModifierPhase, false);
 
-      expect(abra.exp).toBe(expBefore + Math.floor(getPokemonSpecies(Species.LIEPARD).baseExp * defaultWave / 5 + 1));
+      expect(abra.exp).toBe(expBefore + Math.floor((getPokemonSpecies(Species.LIEPARD).baseExp * defaultWave) / 5 + 1));
     });
 
     it("Should update the player's money properly", async () => {
diff --git a/src/test/mystery-encounter/encounters/berries-abound-encounter.test.ts b/test/mystery-encounter/encounters/berries-abound-encounter.test.ts
similarity index 90%
rename from src/test/mystery-encounter/encounters/berries-abound-encounter.test.ts
rename to test/mystery-encounter/encounters/berries-abound-encounter.test.ts
index f980b0cb20a..3f85b0b89d9 100644
--- a/src/test/mystery-encounter/encounters/berries-abound-encounter.test.ts
+++ b/test/mystery-encounter/encounters/berries-abound-encounter.test.ts
@@ -2,16 +2,19 @@ import * as MysteryEncounters from "#app/data/mystery-encounters/mystery-encount
 import { Biome } from "#app/enums/biome";
 import { MysteryEncounterType } from "#app/enums/mystery-encounter-type";
 import { Species } from "#app/enums/species";
-import GameManager from "#app/test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
-import { runMysteryEncounterToEnd, skipBattleRunMysteryEncounterRewardsPhase } from "#test/mystery-encounter/encounter-test-utils";
+import {
+  runMysteryEncounterToEnd,
+  skipBattleRunMysteryEncounterRewardsPhase,
+} from "#test/mystery-encounter/encounter-test-utils";
 import type BattleScene from "#app/battle-scene";
-import { Mode } from "#app/ui/ui";
+import { UiMode } from "#enums/ui-mode";
 import ModifierSelectUiHandler from "#app/ui/modifier-select-ui-handler";
 import { BerryModifier } from "#app/modifier/modifier";
 import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
 import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
-import { initSceneWithoutEncounterPhase } from "#test/utils/gameManagerUtils";
+import { initSceneWithoutEncounterPhase } from "#test/testUtils/gameManagerUtils";
 import { BerriesAboundEncounter } from "#app/data/mystery-encounters/encounters/berries-abound-encounter";
 import * as EncounterPhaseUtils from "#app/data/mystery-encounters/utils/encounter-phase-utils";
 import * as EncounterDialogueUtils from "#app/data/mystery-encounters/utils/encounter-dialogue-utils";
@@ -20,7 +23,7 @@ import { SelectModifierPhase } from "#app/phases/select-modifier-phase";
 import { Abilities } from "#enums/abilities";
 
 const namespace = "mysteryEncounters/berriesAbound";
-const defaultParty = [ Species.PYUKUMUKU, Species.MAGIKARP, Species.PIKACHU ];
+const defaultParty = [Species.PYUKUMUKU, Species.MAGIKARP, Species.PIKACHU];
 const defaultBiome = Biome.CAVE;
 const defaultWave = 45;
 
@@ -36,7 +39,8 @@ describe("Berries Abound - Mystery Encounter", () => {
   beforeEach(async () => {
     game = new GameManager(phaserGame);
     scene = game.scene;
-    game.override.mysteryEncounterChance(100)
+    game.override
+      .mysteryEncounterChance(100)
       .mysteryEncounterTier(MysteryEncounterTier.COMMON)
       .startingWave(defaultWave)
       .startingBiome(defaultBiome)
@@ -47,9 +51,7 @@ describe("Berries Abound - Mystery Encounter", () => {
       .enemyPassiveAbility(Abilities.BALL_FETCH);
 
     vi.spyOn(MysteryEncounters, "mysteryEncountersByBiome", "get").mockReturnValue(
-      new Map<Biome, MysteryEncounterType[]>([
-        [ Biome.CAVE, [ MysteryEncounterType.BERRIES_ABOUND ]],
-      ])
+      new Map<Biome, MysteryEncounterType[]>([[Biome.CAVE, [MysteryEncounterType.BERRIES_ABOUND]]]),
     );
   });
 
@@ -151,8 +153,10 @@ describe("Berries Abound - Mystery Encounter", () => {
       expect(scene.getCurrentPhase()?.constructor.name).toBe(SelectModifierPhase.name);
       await game.phaseInterceptor.run(SelectModifierPhase);
 
-      expect(scene.ui.getMode()).to.equal(Mode.MODIFIER_SELECT);
-      const modifierSelectHandler = scene.ui.handlers.find(h => h instanceof ModifierSelectUiHandler) as ModifierSelectUiHandler;
+      expect(scene.ui.getMode()).to.equal(UiMode.MODIFIER_SELECT);
+      const modifierSelectHandler = scene.ui.handlers.find(
+        h => h instanceof ModifierSelectUiHandler,
+      ) as ModifierSelectUiHandler;
       expect(modifierSelectHandler.options.length).toEqual(5);
       for (const option of modifierSelectHandler.options) {
         expect(option.modifierTypeOption.type.id).toContain("BERRY");
@@ -191,7 +195,7 @@ describe("Berries Abound - Mystery Encounter", () => {
       expect(enemyField[0].species.speciesId).toBe(speciesToSpawn);
 
       // Should be enraged
-      expect(enemyField[0].summonData.statStages).toEqual([ 0, 1, 0, 1, 1, 0, 0 ]);
+      expect(enemyField[0].summonData.statStages).toEqual([0, 1, 0, 1, 1, 0, 0]);
       expect(encounterTextSpy).toHaveBeenCalledWith(`${namespace}:option.2.selected_bad`);
     });
 
@@ -215,7 +219,7 @@ describe("Berries Abound - Mystery Encounter", () => {
       expect(enemyField[0].species.speciesId).toBe(speciesToSpawn);
 
       // Should be enraged
-      expect(enemyField[0].summonData.statStages).toEqual([ 1, 1, 1, 1, 1, 0, 0 ]);
+      expect(enemyField[0].summonData.statStages).toEqual([1, 1, 1, 1, 1, 0, 0]);
       expect(encounterTextSpy).toHaveBeenCalledWith(`${namespace}:option.2.selected_bad`);
     });
 
@@ -234,8 +238,10 @@ describe("Berries Abound - Mystery Encounter", () => {
       expect(scene.getCurrentPhase()?.constructor.name).toBe(SelectModifierPhase.name);
       await game.phaseInterceptor.run(SelectModifierPhase);
 
-      expect(scene.ui.getMode()).to.equal(Mode.MODIFIER_SELECT);
-      const modifierSelectHandler = scene.ui.handlers.find(h => h instanceof ModifierSelectUiHandler) as ModifierSelectUiHandler;
+      expect(scene.ui.getMode()).to.equal(UiMode.MODIFIER_SELECT);
+      const modifierSelectHandler = scene.ui.handlers.find(
+        h => h instanceof ModifierSelectUiHandler,
+      ) as ModifierSelectUiHandler;
       expect(modifierSelectHandler.options.length).toEqual(5);
       for (const option of modifierSelectHandler.options) {
         expect(option.modifierTypeOption.type.id).toContain("BERRY");
diff --git a/src/test/mystery-encounter/encounters/bug-type-superfan-encounter.test.ts b/test/mystery-encounter/encounters/bug-type-superfan-encounter.test.ts
similarity index 89%
rename from src/test/mystery-encounter/encounters/bug-type-superfan-encounter.test.ts
rename to test/mystery-encounter/encounters/bug-type-superfan-encounter.test.ts
index 1ff523909da..455a5d28194 100644
--- a/src/test/mystery-encounter/encounters/bug-type-superfan-encounter.test.ts
+++ b/test/mystery-encounter/encounters/bug-type-superfan-encounter.test.ts
@@ -2,16 +2,20 @@ import * as MysteryEncounters from "#app/data/mystery-encounters/mystery-encount
 import { Biome } from "#app/enums/biome";
 import { MysteryEncounterType } from "#app/enums/mystery-encounter-type";
 import { Species } from "#app/enums/species";
-import GameManager from "#app/test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
-import { runMysteryEncounterToEnd, runSelectMysteryEncounterOption, skipBattleRunMysteryEncounterRewardsPhase } from "#test/mystery-encounter/encounter-test-utils";
+import {
+  runMysteryEncounterToEnd,
+  runSelectMysteryEncounterOption,
+  skipBattleRunMysteryEncounterRewardsPhase,
+} from "#test/mystery-encounter/encounter-test-utils";
 import { Moves } from "#enums/moves";
 import type BattleScene from "#app/battle-scene";
 import { PokemonMove } from "#app/field/pokemon";
-import { Mode } from "#app/ui/ui";
+import { UiMode } from "#enums/ui-mode";
 import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
 import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
-import { initSceneWithoutEncounterPhase } from "#test/utils/gameManagerUtils";
+import { initSceneWithoutEncounterPhase } from "#test/testUtils/gameManagerUtils";
 import { TrainerType } from "#enums/trainer-type";
 import { MysteryEncounterPhase, MysteryEncounterRewardsPhase } from "#app/phases/mystery-encounter-phases";
 import { ContactHeldItemTransferChanceModifier } from "#app/modifier/modifier";
@@ -22,7 +26,7 @@ import { SelectModifierPhase } from "#app/phases/select-modifier-phase";
 import ModifierSelectUiHandler from "#app/ui/modifier-select-ui-handler";
 
 const namespace = "mysteryEncounters/bugTypeSuperfan";
-const defaultParty = [ Species.LAPRAS, Species.GENGAR, Species.WEEDLE ];
+const defaultParty = [Species.LAPRAS, Species.GENGAR, Species.WEEDLE];
 const defaultBiome = Biome.CAVE;
 const defaultWave = 24;
 
@@ -49,7 +53,7 @@ const POOL_1_POKEMON = [
   Species.CHARJABUG,
   Species.RIBOMBEE,
   Species.SPIDOPS,
-  Species.LOKIX
+  Species.LOKIX,
 ];
 
 const POOL_2_POKEMON = [
@@ -78,26 +82,26 @@ const POOL_2_POKEMON = [
   Species.KLEAVOR,
 ];
 
-const POOL_3_POKEMON: { species: Species, formIndex?: number }[] = [
+const POOL_3_POKEMON: { species: Species; formIndex?: number }[] = [
   {
     species: Species.PINSIR,
-    formIndex: 1
+    formIndex: 1,
   },
   {
     species: Species.SCIZOR,
-    formIndex: 1
+    formIndex: 1,
   },
   {
     species: Species.HERACROSS,
-    formIndex: 1
+    formIndex: 1,
   },
   {
     species: Species.ORBEETLE,
-    formIndex: 1
+    formIndex: 1,
   },
   {
     species: Species.CENTISKORCH,
-    formIndex: 1
+    formIndex: 1,
   },
   {
     species: Species.DURANT,
@@ -110,44 +114,38 @@ const POOL_3_POKEMON: { species: Species, formIndex?: number }[] = [
   },
 ];
 
-const POOL_4_POKEMON = [
-  Species.GENESECT,
-  Species.SLITHER_WING,
-  Species.BUZZWOLE,
-  Species.PHEROMOSA
-];
+const POOL_4_POKEMON = [Species.GENESECT, Species.SLITHER_WING, Species.BUZZWOLE, Species.PHEROMOSA];
 
 const PHYSICAL_TUTOR_MOVES = [
   Moves.MEGAHORN,
-  Moves.X_SCISSOR,
   Moves.ATTACK_ORDER,
-  Moves.PIN_MISSILE,
-  Moves.FIRST_IMPRESSION
+  Moves.BUG_BITE,
+  Moves.FIRST_IMPRESSION,
+  Moves.LUNGE
 ];
 
 const SPECIAL_TUTOR_MOVES = [
   Moves.SILVER_WIND,
-  Moves.BUG_BUZZ,
   Moves.SIGNAL_BEAM,
-  Moves.POLLEN_PUFF
+  Moves.BUG_BUZZ,
+  Moves.POLLEN_PUFF,
+  Moves.STRUGGLE_BUG
 ];
 
 const STATUS_TUTOR_MOVES = [
   Moves.STRING_SHOT,
-  Moves.STICKY_WEB,
-  Moves.SILK_TRAP,
+  Moves.DEFEND_ORDER,
   Moves.RAGE_POWDER,
-  Moves.HEAL_ORDER
+  Moves.STICKY_WEB,
+  Moves.SILK_TRAP
 ];
 
 const MISC_TUTOR_MOVES = [
-  Moves.BUG_BITE,
   Moves.LEECH_LIFE,
-  Moves.DEFEND_ORDER,
+  Moves.U_TURN,
+  Moves.HEAL_ORDER,
   Moves.QUIVER_DANCE,
-  Moves.TAIL_GLOW,
   Moves.INFESTATION,
-  Moves.U_TURN
 ];
 
 describe("Bug-Type Superfan - Mystery Encounter", () => {
@@ -168,9 +166,7 @@ describe("Bug-Type Superfan - Mystery Encounter", () => {
     game.override.disableTrainerWaves();
 
     vi.spyOn(MysteryEncounters, "mysteryEncountersByBiome", "get").mockReturnValue(
-      new Map<Biome, MysteryEncounterType[]>([
-        [ Biome.CAVE, [ MysteryEncounterType.BUG_TYPE_SUPERFAN ]],
-      ])
+      new Map<Biome, MysteryEncounterType[]>([[Biome.CAVE, [MysteryEncounterType.BUG_TYPE_SUPERFAN]]]),
     );
   });
 
@@ -378,7 +374,7 @@ describe("Bug-Type Superfan - Mystery Encounter", () => {
 
       expect(scene.getCurrentPhase()?.constructor.name).toBe(MysteryEncounterRewardsPhase.name);
       game.phaseInterceptor["prompts"] = []; // Clear out prompt handlers
-      game.onNextPrompt("MysteryEncounterRewardsPhase", Mode.OPTION_SELECT, () => {
+      game.onNextPrompt("MysteryEncounterRewardsPhase", UiMode.OPTION_SELECT, () => {
         game.phaseInterceptor.superEndPhase();
       });
       await game.phaseInterceptor.run(MysteryEncounterRewardsPhase);
@@ -400,12 +396,12 @@ describe("Bug-Type Superfan - Mystery Encounter", () => {
       expect(option.dialogue).toStrictEqual({
         buttonLabel: `${namespace}:option.2.label`,
         buttonTooltip: `${namespace}:option.2.tooltip`,
-        disabledButtonTooltip: `${namespace}:option.2.disabled_tooltip`
+        disabledButtonTooltip: `${namespace}:option.2.disabled_tooltip`,
       });
     });
 
     it("should NOT be selectable if the player doesn't have any Bug types", async () => {
-      await game.runToMysteryEncounter(MysteryEncounterType.BUG_TYPE_SUPERFAN, [ Species.ABRA ]);
+      await game.runToMysteryEncounter(MysteryEncounterType.BUG_TYPE_SUPERFAN, [Species.ABRA]);
       await game.phaseInterceptor.to(MysteryEncounterPhase, false);
 
       const encounterPhase = scene.getCurrentPhase();
@@ -430,22 +426,26 @@ describe("Bug-Type Superfan - Mystery Encounter", () => {
       expect(scene.getCurrentPhase()?.constructor.name).toBe(SelectModifierPhase.name);
       await game.phaseInterceptor.run(SelectModifierPhase);
 
-      expect(scene.ui.getMode()).to.equal(Mode.MODIFIER_SELECT);
-      const modifierSelectHandler = scene.ui.handlers.find(h => h instanceof ModifierSelectUiHandler) as ModifierSelectUiHandler;
+      expect(scene.ui.getMode()).to.equal(UiMode.MODIFIER_SELECT);
+      const modifierSelectHandler = scene.ui.handlers.find(
+        h => h instanceof ModifierSelectUiHandler,
+      ) as ModifierSelectUiHandler;
       expect(modifierSelectHandler.options.length).toEqual(2);
       expect(modifierSelectHandler.options[0].modifierTypeOption.type.id).toBe("SUPER_LURE");
       expect(modifierSelectHandler.options[1].modifierTypeOption.type.id).toBe("GREAT_BALL");
     });
 
     it("should proceed to rewards screen with 2-3 Bug Types reward options", async () => {
-      await game.runToMysteryEncounter(MysteryEncounterType.BUG_TYPE_SUPERFAN, [ Species.BUTTERFREE, Species.BEEDRILL ]);
+      await game.runToMysteryEncounter(MysteryEncounterType.BUG_TYPE_SUPERFAN, [Species.BUTTERFREE, Species.BEEDRILL]);
       await runMysteryEncounterToEnd(game, 2);
 
       expect(scene.getCurrentPhase()?.constructor.name).toBe(SelectModifierPhase.name);
       await game.phaseInterceptor.run(SelectModifierPhase);
 
-      expect(scene.ui.getMode()).to.equal(Mode.MODIFIER_SELECT);
-      const modifierSelectHandler = scene.ui.handlers.find(h => h instanceof ModifierSelectUiHandler) as ModifierSelectUiHandler;
+      expect(scene.ui.getMode()).to.equal(UiMode.MODIFIER_SELECT);
+      const modifierSelectHandler = scene.ui.handlers.find(
+        h => h instanceof ModifierSelectUiHandler,
+      ) as ModifierSelectUiHandler;
       expect(modifierSelectHandler.options.length).toEqual(3);
       expect(modifierSelectHandler.options[0].modifierTypeOption.type.id).toBe("QUICK_CLAW");
       expect(modifierSelectHandler.options[1].modifierTypeOption.type.id).toBe("MAX_LURE");
@@ -453,14 +453,21 @@ describe("Bug-Type Superfan - Mystery Encounter", () => {
     });
 
     it("should proceed to rewards screen with 4-5 Bug Types reward options", async () => {
-      await game.runToMysteryEncounter(MysteryEncounterType.BUG_TYPE_SUPERFAN, [ Species.BUTTERFREE, Species.BEEDRILL, Species.GALVANTULA, Species.VOLCARONA ]);
+      await game.runToMysteryEncounter(MysteryEncounterType.BUG_TYPE_SUPERFAN, [
+        Species.BUTTERFREE,
+        Species.BEEDRILL,
+        Species.GALVANTULA,
+        Species.VOLCARONA,
+      ]);
       await runMysteryEncounterToEnd(game, 2);
 
       expect(scene.getCurrentPhase()?.constructor.name).toBe(SelectModifierPhase.name);
       await game.phaseInterceptor.run(SelectModifierPhase);
 
-      expect(scene.ui.getMode()).to.equal(Mode.MODIFIER_SELECT);
-      const modifierSelectHandler = scene.ui.handlers.find(h => h instanceof ModifierSelectUiHandler) as ModifierSelectUiHandler;
+      expect(scene.ui.getMode()).to.equal(UiMode.MODIFIER_SELECT);
+      const modifierSelectHandler = scene.ui.handlers.find(
+        h => h instanceof ModifierSelectUiHandler,
+      ) as ModifierSelectUiHandler;
       expect(modifierSelectHandler.options.length).toEqual(3);
       expect(modifierSelectHandler.options[0].modifierTypeOption.type.id).toBe("GRIP_CLAW");
       expect(modifierSelectHandler.options[1].modifierTypeOption.type.id).toBe("MAX_LURE");
@@ -468,14 +475,23 @@ describe("Bug-Type Superfan - Mystery Encounter", () => {
     });
 
     it("should proceed to rewards screen with 6 Bug Types reward options (including form change item)", async () => {
-      await game.runToMysteryEncounter(MysteryEncounterType.BUG_TYPE_SUPERFAN, [ Species.BUTTERFREE, Species.BEEDRILL, Species.GALVANTULA, Species.VOLCARONA, Species.ANORITH, Species.GENESECT ]);
+      await game.runToMysteryEncounter(MysteryEncounterType.BUG_TYPE_SUPERFAN, [
+        Species.BUTTERFREE,
+        Species.BEEDRILL,
+        Species.GALVANTULA,
+        Species.VOLCARONA,
+        Species.ANORITH,
+        Species.GENESECT,
+      ]);
       await runMysteryEncounterToEnd(game, 2);
 
       expect(scene.getCurrentPhase()?.constructor.name).toBe(SelectModifierPhase.name);
       await game.phaseInterceptor.run(SelectModifierPhase);
 
-      expect(scene.ui.getMode()).to.equal(Mode.MODIFIER_SELECT);
-      const modifierSelectHandler = scene.ui.handlers.find(h => h instanceof ModifierSelectUiHandler) as ModifierSelectUiHandler;
+      expect(scene.ui.getMode()).to.equal(UiMode.MODIFIER_SELECT);
+      const modifierSelectHandler = scene.ui.handlers.find(
+        h => h instanceof ModifierSelectUiHandler,
+      ) as ModifierSelectUiHandler;
       expect(modifierSelectHandler.options.length).toEqual(4);
       expect(modifierSelectHandler.options[0].modifierTypeOption.type.id).toBe("MASTER_BALL");
       expect(modifierSelectHandler.options[1].modifierTypeOption.type.id).toBe("MEGA_BRACELET");
@@ -538,22 +554,26 @@ describe("Bug-Type Superfan - Mystery Encounter", () => {
 
     it("should remove the gifted item and proceed to rewards screen", async () => {
       game.override.startingHeldItems([{ name: "GRIP_CLAW", count: 1 }]);
-      await game.runToMysteryEncounter(MysteryEncounterType.BUG_TYPE_SUPERFAN, [ Species.BUTTERFREE ]);
+      await game.runToMysteryEncounter(MysteryEncounterType.BUG_TYPE_SUPERFAN, [Species.BUTTERFREE]);
 
-      const gripClawCountBefore = scene.findModifier(m => m instanceof ContactHeldItemTransferChanceModifier)?.stackCount ?? 0;
+      const gripClawCountBefore =
+        scene.findModifier(m => m instanceof ContactHeldItemTransferChanceModifier)?.stackCount ?? 0;
 
       await runMysteryEncounterToEnd(game, 3, { pokemonNo: 1, optionNo: 1 });
 
       expect(scene.getCurrentPhase()?.constructor.name).toBe(SelectModifierPhase.name);
       await game.phaseInterceptor.run(SelectModifierPhase);
 
-      expect(scene.ui.getMode()).to.equal(Mode.MODIFIER_SELECT);
-      const modifierSelectHandler = scene.ui.handlers.find(h => h instanceof ModifierSelectUiHandler) as ModifierSelectUiHandler;
+      expect(scene.ui.getMode()).to.equal(UiMode.MODIFIER_SELECT);
+      const modifierSelectHandler = scene.ui.handlers.find(
+        h => h instanceof ModifierSelectUiHandler,
+      ) as ModifierSelectUiHandler;
       expect(modifierSelectHandler.options.length).toEqual(2);
       expect(modifierSelectHandler.options[0].modifierTypeOption.type.id).toBe("MYSTERY_ENCOUNTER_GOLDEN_BUG_NET");
       expect(modifierSelectHandler.options[1].modifierTypeOption.type.id).toBe("REVIVER_SEED");
 
-      const gripClawCountAfter = scene.findModifier(m => m instanceof ContactHeldItemTransferChanceModifier)?.stackCount ?? 0;
+      const gripClawCountAfter =
+        scene.findModifier(m => m instanceof ContactHeldItemTransferChanceModifier)?.stackCount ?? 0;
       expect(gripClawCountBefore - 1).toBe(gripClawCountAfter);
     });
 
@@ -561,7 +581,7 @@ describe("Bug-Type Superfan - Mystery Encounter", () => {
       game.override.startingHeldItems([{ name: "GRIP_CLAW", count: 1 }]);
       const leaveEncounterWithoutBattleSpy = vi.spyOn(encounterPhaseUtils, "leaveEncounterWithoutBattle");
 
-      await game.runToMysteryEncounter(MysteryEncounterType.BUG_TYPE_SUPERFAN, [ Species.BUTTERFREE ]);
+      await game.runToMysteryEncounter(MysteryEncounterType.BUG_TYPE_SUPERFAN, [Species.BUTTERFREE]);
       await runMysteryEncounterToEnd(game, 3, { pokemonNo: 1, optionNo: 1 });
 
       expect(leaveEncounterWithoutBattleSpy).toBeCalled();
diff --git a/src/test/mystery-encounter/encounters/clowning-around-encounter.test.ts b/test/mystery-encounter/encounters/clowning-around-encounter.test.ts
similarity index 84%
rename from src/test/mystery-encounter/encounters/clowning-around-encounter.test.ts
rename to test/mystery-encounter/encounters/clowning-around-encounter.test.ts
index f105678e71f..afc4a83e9bf 100644
--- a/src/test/mystery-encounter/encounters/clowning-around-encounter.test.ts
+++ b/test/mystery-encounter/encounters/clowning-around-encounter.test.ts
@@ -2,21 +2,24 @@ import * as MysteryEncounters from "#app/data/mystery-encounters/mystery-encount
 import { Biome } from "#app/enums/biome";
 import { MysteryEncounterType } from "#app/enums/mystery-encounter-type";
 import { Species } from "#app/enums/species";
-import GameManager from "#app/test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 import { getPokemonSpecies } from "#app/data/pokemon-species";
 import * as BattleAnims from "#app/data/battle-anims";
 import * as EncounterPhaseUtils from "#app/data/mystery-encounters/utils/encounter-phase-utils";
 import { generateModifierType } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
-import { runMysteryEncounterToEnd, skipBattleRunMysteryEncounterRewardsPhase } from "#test/mystery-encounter/encounter-test-utils";
+import {
+  runMysteryEncounterToEnd,
+  skipBattleRunMysteryEncounterRewardsPhase,
+} from "#test/mystery-encounter/encounter-test-utils";
 import { Moves } from "#enums/moves";
 import type BattleScene from "#app/battle-scene";
 import type Pokemon from "#app/field/pokemon";
 import { PokemonMove } from "#app/field/pokemon";
-import { Mode } from "#app/ui/ui";
+import { UiMode } from "#enums/ui-mode";
 import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
 import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
-import { initSceneWithoutEncounterPhase } from "#test/utils/gameManagerUtils";
+import { initSceneWithoutEncounterPhase } from "#test/testUtils/gameManagerUtils";
 import { ModifierTier } from "#app/modifier/modifier-tier";
 import { ClowningAroundEncounter } from "#app/data/mystery-encounters/encounters/clowning-around-encounter";
 import { TrainerType } from "#enums/trainer-type";
@@ -29,14 +32,14 @@ import type { PokemonHeldItemModifierType } from "#app/modifier/modifier-type";
 import { modifierTypes } from "#app/modifier/modifier-type";
 import { BerryType } from "#enums/berry-type";
 import type { PokemonHeldItemModifier } from "#app/modifier/modifier";
-import { Type } from "#enums/type";
+import { PokemonType } from "#enums/pokemon-type";
 import { CommandPhase } from "#app/phases/command-phase";
 import { MovePhase } from "#app/phases/move-phase";
 import { SelectModifierPhase } from "#app/phases/select-modifier-phase";
 import { NewBattlePhase } from "#app/phases/new-battle-phase";
 
 const namespace = "mysteryEncounters/clowningAround";
-const defaultParty = [ Species.LAPRAS, Species.GENGAR, Species.ABRA ];
+const defaultParty = [Species.LAPRAS, Species.GENGAR, Species.ABRA];
 const defaultBiome = Biome.CAVE;
 const defaultWave = 45;
 
@@ -58,9 +61,7 @@ describe("Clowning Around - Mystery Encounter", () => {
     game.override.disableTrainerWaves();
 
     vi.spyOn(MysteryEncounters, "mysteryEncountersByBiome", "get").mockReturnValue(
-      new Map<Biome, MysteryEncounterType[]>([
-        [ Biome.CAVE, [ MysteryEncounterType.CLOWNING_AROUND ]],
-      ])
+      new Map<Biome, MysteryEncounterType[]>([[Biome.CAVE, [MysteryEncounterType.CLOWNING_AROUND]]]),
     );
   });
 
@@ -116,13 +117,13 @@ describe("Clowning Around - Mystery Encounter", () => {
     expect(config.pokemonConfigs?.[0]).toEqual({
       species: getPokemonSpecies(Species.MR_MIME),
       isBoss: true,
-      moveSet: [ Moves.TEETER_DANCE, Moves.ALLY_SWITCH, Moves.DAZZLING_GLEAM, Moves.PSYCHIC ]
+      moveSet: [Moves.TEETER_DANCE, Moves.ALLY_SWITCH, Moves.DAZZLING_GLEAM, Moves.PSYCHIC],
     });
     expect(config.pokemonConfigs?.[1]).toEqual({
       species: getPokemonSpecies(Species.BLACEPHALON),
       customPokemonData: expect.anything(),
       isBoss: true,
-      moveSet: [ Moves.TRICK, Moves.HYPNOSIS, Moves.SHADOW_BALL, Moves.MIND_BLOWN ]
+      moveSet: [Moves.TRICK, Moves.HYPNOSIS, Moves.SHADOW_BALL, Moves.MIND_BLOWN],
     });
     expect(config.pokemonConfigs?.[1].customPokemonData?.types.length).toBe(2);
     expect([
@@ -140,7 +141,7 @@ describe("Clowning Around - Mystery Encounter", () => {
       Abilities.MISTY_SURGE,
       Abilities.MAGICIAN,
       Abilities.SHEER_FORCE,
-      Abilities.PRANKSTER
+      Abilities.PRANKSTER,
     ]).toContain(config.pokemonConfigs?.[1].customPokemonData?.ability);
     expect(ClowningAroundEncounter.misc.ability).toBe(config.pokemonConfigs?.[1].customPokemonData?.ability);
     await vi.waitFor(() => expect(moveInitSpy).toHaveBeenCalled());
@@ -175,9 +176,19 @@ describe("Clowning Around - Mystery Encounter", () => {
       expect(scene.getCurrentPhase()?.constructor.name).toBe(CommandPhase.name);
       expect(enemyField.length).toBe(2);
       expect(enemyField[0].species.speciesId).toBe(Species.MR_MIME);
-      expect(enemyField[0].moveset).toEqual([ new PokemonMove(Moves.TEETER_DANCE), new PokemonMove(Moves.ALLY_SWITCH), new PokemonMove(Moves.DAZZLING_GLEAM), new PokemonMove(Moves.PSYCHIC) ]);
+      expect(enemyField[0].moveset).toEqual([
+        new PokemonMove(Moves.TEETER_DANCE),
+        new PokemonMove(Moves.ALLY_SWITCH),
+        new PokemonMove(Moves.DAZZLING_GLEAM),
+        new PokemonMove(Moves.PSYCHIC),
+      ]);
       expect(enemyField[1].species.speciesId).toBe(Species.BLACEPHALON);
-      expect(enemyField[1].moveset).toEqual([ new PokemonMove(Moves.TRICK), new PokemonMove(Moves.HYPNOSIS), new PokemonMove(Moves.SHADOW_BALL), new PokemonMove(Moves.MIND_BLOWN) ]);
+      expect(enemyField[1].moveset).toEqual([
+        new PokemonMove(Moves.TRICK),
+        new PokemonMove(Moves.HYPNOSIS),
+        new PokemonMove(Moves.SHADOW_BALL),
+        new PokemonMove(Moves.MIND_BLOWN),
+      ]);
 
       // Should have used moves pre-battle
       const movePhases = phaseSpy.mock.calls.filter(p => p[0] instanceof MovePhase).map(p => p[0]);
@@ -195,14 +206,14 @@ describe("Clowning Around - Mystery Encounter", () => {
       await game.phaseInterceptor.run(SelectModifierPhase);
       const abilityToTrain = scene.currentBattle.mysteryEncounter?.misc.ability;
 
-      game.onNextPrompt("PostMysteryEncounterPhase", Mode.MESSAGE, () => {
+      game.onNextPrompt("PostMysteryEncounterPhase", UiMode.MESSAGE, () => {
         game.scene.ui.getHandler().processInput(Button.ACTION);
       });
 
       // Run to ability train option selection
-      const optionSelectUiHandler = game.scene.ui.handlers[Mode.OPTION_SELECT] as OptionSelectUiHandler;
+      const optionSelectUiHandler = game.scene.ui.handlers[UiMode.OPTION_SELECT] as OptionSelectUiHandler;
       vi.spyOn(optionSelectUiHandler, "show");
-      const partyUiHandler = game.scene.ui.handlers[Mode.PARTY] as PartyUiHandler;
+      const partyUiHandler = game.scene.ui.handlers[UiMode.PARTY] as PartyUiHandler;
       vi.spyOn(partyUiHandler, "show");
       game.endPhase();
       await game.phaseInterceptor.to(PostMysteryEncounterPhase);
@@ -253,14 +264,14 @@ describe("Clowning Around - Mystery Encounter", () => {
       await game.runToMysteryEncounter(MysteryEncounterType.CLOWNING_AROUND, defaultParty);
 
       // Set some moves on party for attack type booster generation
-      scene.getPlayerParty()[0].moveset = [ new PokemonMove(Moves.TACKLE), new PokemonMove(Moves.THIEF) ];
+      scene.getPlayerParty()[0].moveset = [new PokemonMove(Moves.TACKLE), new PokemonMove(Moves.THIEF)];
 
       // 2 Sitrus Berries on lead
       scene.modifiers = [];
-      let itemType = generateModifierType(modifierTypes.BERRY, [ BerryType.SITRUS ]) as PokemonHeldItemModifierType;
+      let itemType = generateModifierType(modifierTypes.BERRY, [BerryType.SITRUS]) as PokemonHeldItemModifierType;
       await addItemToPokemon(scene, scene.getPlayerParty()[0], 2, itemType);
       // 2 Ganlon Berries on lead
-      itemType = generateModifierType(modifierTypes.BERRY, [ BerryType.GANLON ]) as PokemonHeldItemModifierType;
+      itemType = generateModifierType(modifierTypes.BERRY, [BerryType.GANLON]) as PokemonHeldItemModifierType;
       await addItemToPokemon(scene, scene.getPlayerParty()[0], 2, itemType);
       // 5 Golden Punch on lead (ultra)
       itemType = generateModifierType(modifierTypes.GOLDEN_PUNCH) as PokemonHeldItemModifierType;
@@ -338,9 +349,9 @@ describe("Clowning Around - Mystery Encounter", () => {
       await game.runToMysteryEncounter(MysteryEncounterType.CLOWNING_AROUND, defaultParty);
 
       // Same type moves on lead
-      scene.getPlayerParty()[0].moveset = [ new PokemonMove(Moves.ICE_BEAM), new PokemonMove(Moves.SURF) ];
+      scene.getPlayerParty()[0].moveset = [new PokemonMove(Moves.ICE_BEAM), new PokemonMove(Moves.SURF)];
       // Different type moves on second
-      scene.getPlayerParty()[1].moveset = [ new PokemonMove(Moves.GRASS_KNOT), new PokemonMove(Moves.ELECTRO_BALL) ];
+      scene.getPlayerParty()[1].moveset = [new PokemonMove(Moves.GRASS_KNOT), new PokemonMove(Moves.ELECTRO_BALL)];
       // No moves on third
       scene.getPlayerParty()[2].moveset = [];
       await runMysteryEncounterToEnd(game, 3);
@@ -350,15 +361,15 @@ describe("Clowning Around - Mystery Encounter", () => {
       const thirdTypesAfter = scene.getPlayerParty()[2].getTypes();
 
       expect(leadTypesAfter.length).toBe(2);
-      expect(leadTypesAfter[0]).toBe(Type.WATER);
-      expect([ Type.WATER, Type.ICE ].includes(leadTypesAfter[1])).toBeFalsy();
+      expect(leadTypesAfter[0]).toBe(PokemonType.WATER);
+      expect([PokemonType.WATER, PokemonType.ICE].includes(leadTypesAfter[1])).toBeFalsy();
       expect(secondaryTypesAfter.length).toBe(2);
-      expect(secondaryTypesAfter[0]).toBe(Type.GHOST);
-      expect([ Type.GHOST, Type.POISON ].includes(secondaryTypesAfter[1])).toBeFalsy();
-      expect([ Type.GRASS, Type.ELECTRIC ].includes(secondaryTypesAfter[1])).toBeTruthy();
+      expect(secondaryTypesAfter[0]).toBe(PokemonType.GHOST);
+      expect([PokemonType.GHOST, PokemonType.POISON].includes(secondaryTypesAfter[1])).toBeFalsy();
+      expect([PokemonType.GRASS, PokemonType.ELECTRIC].includes(secondaryTypesAfter[1])).toBeTruthy();
       expect(thirdTypesAfter.length).toBe(2);
-      expect(thirdTypesAfter[0]).toBe(Type.PSYCHIC);
-      expect(secondaryTypesAfter[1]).not.toBe(Type.PSYCHIC);
+      expect(thirdTypesAfter[0]).toBe(PokemonType.PSYCHIC);
+      expect(secondaryTypesAfter[1]).not.toBe(PokemonType.PSYCHIC);
     });
 
     it("should leave encounter without battle", async () => {
@@ -372,9 +383,14 @@ describe("Clowning Around - Mystery Encounter", () => {
   });
 });
 
-async function addItemToPokemon(scene: BattleScene, pokemon: Pokemon, stackCount: number, itemType: PokemonHeldItemModifierType) {
+async function addItemToPokemon(
+  scene: BattleScene,
+  pokemon: Pokemon,
+  stackCount: number,
+  itemType: PokemonHeldItemModifierType,
+) {
   const itemMod = itemType.newModifier(pokemon) as PokemonHeldItemModifier;
   itemMod.stackCount = stackCount;
-  await scene.addModifier(itemMod, true, false, false, true);
+  scene.addModifier(itemMod, true, false, false, true);
   await scene.updateModifiers(true);
 }
diff --git a/src/test/mystery-encounter/encounters/dancing-lessons-encounter.test.ts b/test/mystery-encounter/encounters/dancing-lessons-encounter.test.ts
similarity index 89%
rename from src/test/mystery-encounter/encounters/dancing-lessons-encounter.test.ts
rename to test/mystery-encounter/encounters/dancing-lessons-encounter.test.ts
index 795e6b6650b..873bed2f213 100644
--- a/src/test/mystery-encounter/encounters/dancing-lessons-encounter.test.ts
+++ b/test/mystery-encounter/encounters/dancing-lessons-encounter.test.ts
@@ -1,17 +1,21 @@
 import { Biome } from "#app/enums/biome";
 import { MysteryEncounterType } from "#app/enums/mystery-encounter-type";
 import { Species } from "#app/enums/species";
-import GameManager from "#app/test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 import * as EncounterPhaseUtils from "#app/data/mystery-encounters/utils/encounter-phase-utils";
-import { runMysteryEncounterToEnd, runSelectMysteryEncounterOption, skipBattleRunMysteryEncounterRewardsPhase } from "#test/mystery-encounter/encounter-test-utils";
+import {
+  runMysteryEncounterToEnd,
+  runSelectMysteryEncounterOption,
+  skipBattleRunMysteryEncounterRewardsPhase,
+} from "#test/mystery-encounter/encounter-test-utils";
 import type BattleScene from "#app/battle-scene";
 import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
 import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
 import * as MysteryEncounters from "#app/data/mystery-encounters/mystery-encounters";
 import { Moves } from "#enums/moves";
 import { DancingLessonsEncounter } from "#app/data/mystery-encounters/encounters/dancing-lessons-encounter";
-import { Mode } from "#app/ui/ui";
+import { UiMode } from "#enums/ui-mode";
 import ModifierSelectUiHandler from "#app/ui/modifier-select-ui-handler";
 import { PokemonMove } from "#app/field/pokemon";
 import { MysteryEncounterPhase } from "#app/phases/mystery-encounter-phases";
@@ -21,7 +25,7 @@ import { SelectModifierPhase } from "#app/phases/select-modifier-phase";
 import { LearnMovePhase } from "#app/phases/learn-move-phase";
 
 const namespace = "mysteryEncounters/dancingLessons";
-const defaultParty = [ Species.LAPRAS, Species.GENGAR, Species.ABRA ];
+const defaultParty = [Species.LAPRAS, Species.GENGAR, Species.ABRA];
 const defaultBiome = Biome.PLAINS;
 const defaultWave = 45;
 
@@ -44,9 +48,9 @@ describe("Dancing Lessons - Mystery Encounter", () => {
 
     vi.spyOn(MysteryEncounters, "mysteryEncountersByBiome", "get").mockReturnValue(
       new Map<Biome, MysteryEncounterType[]>([
-        [ Biome.PLAINS, [ MysteryEncounterType.DANCING_LESSONS ]],
-        [ Biome.SPACE, [ MysteryEncounterType.MYSTERIOUS_CHALLENGERS ]],
-      ])
+        [Biome.PLAINS, [MysteryEncounterType.DANCING_LESSONS]],
+        [Biome.SPACE, [MysteryEncounterType.MYSTERIOUS_CHALLENGERS]],
+      ]),
     );
   });
 
@@ -107,8 +111,8 @@ describe("Dancing Lessons - Mystery Encounter", () => {
       expect(scene.getCurrentPhase()?.constructor.name).toBe(CommandPhase.name);
       expect(enemyField.length).toBe(1);
       expect(enemyField[0].species.speciesId).toBe(Species.ORICORIO);
-      expect(enemyField[0].summonData.statStages).toEqual([ 1, 1, 1, 1, 0, 0, 0 ]);
-      const moveset = enemyField[0].moveset.map(m => m?.moveId);
+      expect(enemyField[0].summonData.statStages).toEqual([1, 1, 1, 1, 0, 0, 0]);
+      const moveset = enemyField[0].moveset.map(m => m.moveId);
       expect(moveset.some(m => m === Moves.REVELATION_DANCE)).toBeTruthy();
 
       const movePhases = phaseSpy.mock.calls.filter(p => p[0] instanceof MovePhase).map(p => p[0]);
@@ -123,15 +127,15 @@ describe("Dancing Lessons - Mystery Encounter", () => {
       partyLead.level = 1000;
       partyLead.calculateStats();
       await runMysteryEncounterToEnd(game, 1, undefined, true);
-      // For some reason updateModifiers breaks in this test and does not resolve promise
-      vi.spyOn(game.scene, "updateModifiers").mockImplementation(() => new Promise(resolve => resolve()));
       await skipBattleRunMysteryEncounterRewardsPhase(game);
       await game.phaseInterceptor.to(SelectModifierPhase, false);
       expect(scene.getCurrentPhase()?.constructor.name).toBe(SelectModifierPhase.name);
       await game.phaseInterceptor.run(SelectModifierPhase);
 
-      expect(scene.ui.getMode()).to.equal(Mode.MODIFIER_SELECT);
-      const modifierSelectHandler = scene.ui.handlers.find(h => h instanceof ModifierSelectUiHandler) as ModifierSelectUiHandler;
+      expect(scene.ui.getMode()).to.equal(UiMode.MODIFIER_SELECT);
+      const modifierSelectHandler = scene.ui.handlers.find(
+        h => h instanceof ModifierSelectUiHandler,
+      ) as ModifierSelectUiHandler;
       expect(modifierSelectHandler.options.length).toEqual(3); // Should fill remaining
       expect(modifierSelectHandler.options[0].modifierTypeOption.type.id).toContain("BATON");
     });
@@ -197,14 +201,14 @@ describe("Dancing Lessons - Mystery Encounter", () => {
     it("should add Oricorio to the party", async () => {
       await game.runToMysteryEncounter(MysteryEncounterType.DANCING_LESSONS, defaultParty);
       const partyCountBefore = scene.getPlayerParty().length;
-      scene.getPlayerParty()[0].moveset = [ new PokemonMove(Moves.DRAGON_DANCE) ];
+      scene.getPlayerParty()[0].moveset = [new PokemonMove(Moves.DRAGON_DANCE)];
       await runMysteryEncounterToEnd(game, 3, { pokemonNo: 1, optionNo: 1 });
       const partyCountAfter = scene.getPlayerParty().length;
 
       expect(partyCountBefore + 1).toBe(partyCountAfter);
       const oricorio = scene.getPlayerParty()[scene.getPlayerParty().length - 1];
       expect(oricorio.species.speciesId).toBe(Species.ORICORIO);
-      const moveset = oricorio.moveset.map(m => m?.moveId);
+      const moveset = oricorio.moveset.map(m => m.moveId);
       expect(moveset?.some(m => m === Moves.REVELATION_DANCE)).toBeTruthy();
       expect(moveset?.some(m => m === Moves.DRAGON_DANCE)).toBeTruthy();
     });
@@ -212,7 +216,7 @@ describe("Dancing Lessons - Mystery Encounter", () => {
     it("should NOT be selectable if the player doesn't have a Dance type move", async () => {
       await game.runToMysteryEncounter(MysteryEncounterType.DANCING_LESSONS, defaultParty);
       const partyCountBefore = scene.getPlayerParty().length;
-      scene.getPlayerParty().forEach(p => p.moveset = []);
+      scene.getPlayerParty().forEach(p => (p.moveset = []));
       await game.phaseInterceptor.to(MysteryEncounterPhase, false);
 
       const encounterPhase = scene.getCurrentPhase();
@@ -236,7 +240,7 @@ describe("Dancing Lessons - Mystery Encounter", () => {
       const leaveEncounterWithoutBattleSpy = vi.spyOn(EncounterPhaseUtils, "leaveEncounterWithoutBattle");
 
       await game.runToMysteryEncounter(MysteryEncounterType.DANCING_LESSONS, defaultParty);
-      scene.getPlayerParty()[0].moveset = [ new PokemonMove(Moves.DRAGON_DANCE) ];
+      scene.getPlayerParty()[0].moveset = [new PokemonMove(Moves.DRAGON_DANCE)];
       await runMysteryEncounterToEnd(game, 3, { pokemonNo: 1, optionNo: 1 });
 
       expect(leaveEncounterWithoutBattleSpy).toBeCalled();
diff --git a/src/test/mystery-encounter/encounters/delibirdy-encounter.test.ts b/test/mystery-encounter/encounters/delibirdy-encounter.test.ts
similarity index 91%
rename from src/test/mystery-encounter/encounters/delibirdy-encounter.test.ts
rename to test/mystery-encounter/encounters/delibirdy-encounter.test.ts
index f99aa24805e..94faf070a39 100644
--- a/src/test/mystery-encounter/encounters/delibirdy-encounter.test.ts
+++ b/test/mystery-encounter/encounters/delibirdy-encounter.test.ts
@@ -1,24 +1,36 @@
 import { Biome } from "#app/enums/biome";
 import { MysteryEncounterType } from "#app/enums/mystery-encounter-type";
 import { Species } from "#app/enums/species";
-import GameManager from "#app/test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 import * as EncounterPhaseUtils from "#app/data/mystery-encounters/utils/encounter-phase-utils";
-import { runMysteryEncounterToEnd, runSelectMysteryEncounterOption } from "#test/mystery-encounter/encounter-test-utils";
+import {
+  runMysteryEncounterToEnd,
+  runSelectMysteryEncounterOption,
+} from "#test/mystery-encounter/encounter-test-utils";
 import type BattleScene from "#app/battle-scene";
 import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
 import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
 import { DelibirdyEncounter } from "#app/data/mystery-encounters/encounters/delibirdy-encounter";
 import * as MysteryEncounters from "#app/data/mystery-encounters/mystery-encounters";
 import type { MoneyRequirement } from "#app/data/mystery-encounters/mystery-encounter-requirements";
-import { BerryModifier, HealingBoosterModifier, HitHealModifier, LevelIncrementBoosterModifier, MoneyMultiplierModifier, PokemonInstantReviveModifier, PokemonNatureWeightModifier, PreserveBerryModifier } from "#app/modifier/modifier";
+import {
+  BerryModifier,
+  HealingBoosterModifier,
+  HitHealModifier,
+  LevelIncrementBoosterModifier,
+  MoneyMultiplierModifier,
+  PokemonInstantReviveModifier,
+  PokemonNatureWeightModifier,
+  PreserveBerryModifier,
+} from "#app/modifier/modifier";
 import { MysteryEncounterPhase } from "#app/phases/mystery-encounter-phases";
 import { generateModifierType } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
 import { modifierTypes } from "#app/modifier/modifier-type";
 import { BerryType } from "#enums/berry-type";
 
 const namespace = "mysteryEncounters/delibirdy";
-const defaultParty = [ Species.LAPRAS, Species.GENGAR, Species.ABRA ];
+const defaultParty = [Species.LAPRAS, Species.GENGAR, Species.ABRA];
 const defaultBiome = Biome.CAVE;
 const defaultWave = 45;
 
@@ -40,9 +52,7 @@ describe("Delibird-y - Mystery Encounter", () => {
     game.override.disableTrainerWaves();
 
     vi.spyOn(MysteryEncounters, "mysteryEncountersByBiome", "get").mockReturnValue(
-      new Map<Biome, MysteryEncounterType[]>([
-        [ Biome.CAVE, [ MysteryEncounterType.DELIBIRDY ]],
-      ])
+      new Map<Biome, MysteryEncounterType[]>([[Biome.CAVE, [MysteryEncounterType.DELIBIRDY]]]),
     );
   });
 
@@ -98,7 +108,8 @@ describe("Delibird-y - Mystery Encounter", () => {
       await game.runToMysteryEncounter(MysteryEncounterType.DELIBIRDY, defaultParty);
       await runMysteryEncounterToEnd(game, 1);
 
-      const price = (scene.currentBattle.mysteryEncounter?.options[0].requirements[0] as MoneyRequirement).requiredMoney;
+      const price = (scene.currentBattle.mysteryEncounter?.options[0].requirements[0] as MoneyRequirement)
+        .requiredMoney;
 
       expect(updateMoneySpy).toHaveBeenCalledWith(-price, true, false);
       expect(scene.money).toBe(initialMoney - price);
@@ -123,7 +134,7 @@ describe("Delibird-y - Mystery Encounter", () => {
       scene.modifiers = [];
       const amuletCoin = generateModifierType(modifierTypes.AMULET_COIN)!.newModifier() as MoneyMultiplierModifier;
       amuletCoin.stackCount = 5;
-      await scene.addModifier(amuletCoin, true, false, false, true);
+      scene.addModifier(amuletCoin, true, false, false, true);
       await scene.updateModifiers(true);
 
       await runMysteryEncounterToEnd(game, 1);
@@ -190,10 +201,10 @@ describe("Delibird-y - Mystery Encounter", () => {
 
       // Set 2 Sitrus berries on party lead
       scene.modifiers = [];
-      const sitrus = generateModifierType(modifierTypes.BERRY, [ BerryType.SITRUS ])!;
+      const sitrus = generateModifierType(modifierTypes.BERRY, [BerryType.SITRUS])!;
       const sitrusMod = sitrus.newModifier(scene.getPlayerParty()[0]) as BerryModifier;
       sitrusMod.stackCount = 2;
-      await scene.addModifier(sitrusMod, true, false, false, true);
+      scene.addModifier(sitrusMod, true, false, false, true);
       await scene.updateModifiers(true);
 
       await runMysteryEncounterToEnd(game, 2, { pokemonNo: 1, optionNo: 1 });
@@ -214,7 +225,7 @@ describe("Delibird-y - Mystery Encounter", () => {
       const revSeed = generateModifierType(modifierTypes.REVIVER_SEED)!;
       const modifier = revSeed.newModifier(scene.getPlayerParty()[0]) as PokemonInstantReviveModifier;
       modifier.stackCount = 1;
-      await scene.addModifier(modifier, true, false, false, true);
+      scene.addModifier(modifier, true, false, false, true);
       await scene.updateModifiers(true);
 
       await runMysteryEncounterToEnd(game, 2, { pokemonNo: 1, optionNo: 1 });
@@ -234,13 +245,13 @@ describe("Delibird-y - Mystery Encounter", () => {
       scene.modifiers = [];
       const candyJar = generateModifierType(modifierTypes.CANDY_JAR)!.newModifier() as LevelIncrementBoosterModifier;
       candyJar.stackCount = 99;
-      await scene.addModifier(candyJar, true, false, false, true);
-      const sitrus = generateModifierType(modifierTypes.BERRY, [ BerryType.SITRUS ])!;
+      scene.addModifier(candyJar, true, false, false, true);
+      const sitrus = generateModifierType(modifierTypes.BERRY, [BerryType.SITRUS])!;
 
       // Sitrus berries on party
       const sitrusMod = sitrus.newModifier(scene.getPlayerParty()[0]) as BerryModifier;
       sitrusMod.stackCount = 2;
-      await scene.addModifier(sitrusMod, true, false, false, true);
+      scene.addModifier(sitrusMod, true, false, false, true);
       await scene.updateModifiers(true);
 
       await runMysteryEncounterToEnd(game, 2, { pokemonNo: 1, optionNo: 1 });
@@ -263,13 +274,13 @@ describe("Delibird-y - Mystery Encounter", () => {
       scene.modifiers = [];
       const healingCharm = generateModifierType(modifierTypes.BERRY_POUCH)!.newModifier() as PreserveBerryModifier;
       healingCharm.stackCount = 3;
-      await scene.addModifier(healingCharm, true, false, false, true);
+      scene.addModifier(healingCharm, true, false, false, true);
 
       // Set 1 Reviver Seed on party lead
       const revSeed = generateModifierType(modifierTypes.REVIVER_SEED)!;
       const modifier = revSeed.newModifier(scene.getPlayerParty()[0]) as PokemonInstantReviveModifier;
       modifier.stackCount = 1;
-      await scene.addModifier(modifier, true, false, false, true);
+      scene.addModifier(modifier, true, false, false, true);
       await scene.updateModifiers(true);
 
       await runMysteryEncounterToEnd(game, 2, { pokemonNo: 1, optionNo: 1 });
@@ -292,7 +303,7 @@ describe("Delibird-y - Mystery Encounter", () => {
       scene.modifiers = [];
       const soulDew = generateModifierType(modifierTypes.SOUL_DEW)!;
       const modifier = soulDew.newModifier(scene.getPlayerParty()[0]);
-      await scene.addModifier(modifier, true, false, false, true);
+      scene.addModifier(modifier, true, false, false, true);
       await scene.updateModifiers(true);
 
       await game.phaseInterceptor.to(MysteryEncounterPhase, false);
@@ -321,7 +332,7 @@ describe("Delibird-y - Mystery Encounter", () => {
       const revSeed = generateModifierType(modifierTypes.REVIVER_SEED)!;
       const modifier = revSeed.newModifier(scene.getPlayerParty()[0]) as PokemonInstantReviveModifier;
       modifier.stackCount = 1;
-      await scene.addModifier(modifier, true, false, false, true);
+      scene.addModifier(modifier, true, false, false, true);
       await scene.updateModifiers(true);
 
       await runMysteryEncounterToEnd(game, 2, { pokemonNo: 1, optionNo: 1 });
@@ -355,7 +366,7 @@ describe("Delibird-y - Mystery Encounter", () => {
       const soulDew = generateModifierType(modifierTypes.SOUL_DEW)!;
       const modifier = soulDew.newModifier(scene.getPlayerParty()[0]) as PokemonNatureWeightModifier;
       modifier.stackCount = 2;
-      await scene.addModifier(modifier, true, false, false, true);
+      scene.addModifier(modifier, true, false, false, true);
       await scene.updateModifiers(true);
 
       await runMysteryEncounterToEnd(game, 3, { pokemonNo: 1, optionNo: 1 });
@@ -376,7 +387,7 @@ describe("Delibird-y - Mystery Encounter", () => {
       const soulDew = generateModifierType(modifierTypes.SOUL_DEW)!;
       const modifier = soulDew.newModifier(scene.getPlayerParty()[0]) as PokemonNatureWeightModifier;
       modifier.stackCount = 1;
-      await scene.addModifier(modifier, true, false, false, true);
+      scene.addModifier(modifier, true, false, false, true);
       await scene.updateModifiers(true);
 
       await runMysteryEncounterToEnd(game, 3, { pokemonNo: 1, optionNo: 1 });
@@ -396,13 +407,13 @@ describe("Delibird-y - Mystery Encounter", () => {
       scene.modifiers = [];
       const healingCharm = generateModifierType(modifierTypes.HEALING_CHARM)!.newModifier() as HealingBoosterModifier;
       healingCharm.stackCount = 5;
-      await scene.addModifier(healingCharm, true, false, false, true);
+      scene.addModifier(healingCharm, true, false, false, true);
 
       // Set 1 Soul Dew on party lead
       const soulDew = generateModifierType(modifierTypes.SOUL_DEW)!;
       const modifier = soulDew.newModifier(scene.getPlayerParty()[0]) as PokemonNatureWeightModifier;
       modifier.stackCount = 1;
-      await scene.addModifier(modifier, true, false, false, true);
+      scene.addModifier(modifier, true, false, false, true);
       await scene.updateModifiers(true);
 
       await runMysteryEncounterToEnd(game, 3, { pokemonNo: 1, optionNo: 1 });
@@ -425,7 +436,7 @@ describe("Delibird-y - Mystery Encounter", () => {
       scene.modifiers = [];
       const revSeed = generateModifierType(modifierTypes.REVIVER_SEED)!;
       const modifier = revSeed.newModifier(scene.getPlayerParty()[0]);
-      await scene.addModifier(modifier, true, false, false, true);
+      scene.addModifier(modifier, true, false, false, true);
       await scene.updateModifiers(true);
 
       await game.phaseInterceptor.to(MysteryEncounterPhase, false);
@@ -455,7 +466,7 @@ describe("Delibird-y - Mystery Encounter", () => {
       const soulDew = generateModifierType(modifierTypes.SOUL_DEW)!;
       const modifier = soulDew.newModifier(scene.getPlayerParty()[0]) as PokemonNatureWeightModifier;
       modifier.stackCount = 1;
-      await scene.addModifier(modifier, true, false, false, true);
+      scene.addModifier(modifier, true, false, false, true);
       await scene.updateModifiers(true);
 
       await runMysteryEncounterToEnd(game, 3, { pokemonNo: 1, optionNo: 1 });
diff --git a/src/test/mystery-encounter/encounters/department-store-sale-encounter.test.ts b/test/mystery-encounter/encounters/department-store-sale-encounter.test.ts
similarity index 84%
rename from src/test/mystery-encounter/encounters/department-store-sale-encounter.test.ts
rename to test/mystery-encounter/encounters/department-store-sale-encounter.test.ts
index e30aaadbf85..2488d12dad1 100644
--- a/src/test/mystery-encounter/encounters/department-store-sale-encounter.test.ts
+++ b/test/mystery-encounter/encounters/department-store-sale-encounter.test.ts
@@ -2,12 +2,12 @@ import * as MysteryEncounters from "#app/data/mystery-encounters/mystery-encount
 import { Biome } from "#app/enums/biome";
 import { MysteryEncounterType } from "#app/enums/mystery-encounter-type";
 import { Species } from "#app/enums/species";
-import GameManager from "#app/test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 import * as EncounterPhaseUtils from "#app/data/mystery-encounters/utils/encounter-phase-utils";
 import { runMysteryEncounterToEnd } from "#test/mystery-encounter/encounter-test-utils";
 import type BattleScene from "#app/battle-scene";
-import { Mode } from "#app/ui/ui";
+import { UiMode } from "#enums/ui-mode";
 import ModifierSelectUiHandler from "#app/ui/modifier-select-ui-handler";
 import { DepartmentStoreSaleEncounter } from "#app/data/mystery-encounters/encounters/department-store-sale-encounter";
 import { CIVILIZATION_ENCOUNTER_BIOMES } from "#app/data/mystery-encounters/mystery-encounters";
@@ -16,7 +16,7 @@ import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
 import { SelectModifierPhase } from "#app/phases/select-modifier-phase";
 
 const namespace = "mysteryEncounters/departmentStoreSale";
-const defaultParty = [ Species.LAPRAS, Species.GENGAR, Species.ABRA ];
+const defaultParty = [Species.LAPRAS, Species.GENGAR, Species.ABRA];
 const defaultBiome = Biome.PLAINS;
 const defaultWave = 37;
 
@@ -38,10 +38,10 @@ describe("Department Store Sale - Mystery Encounter", () => {
     game.override.disableTrainerWaves();
 
     const biomeMap = new Map<Biome, MysteryEncounterType[]>([
-      [ Biome.VOLCANO, [ MysteryEncounterType.MYSTERIOUS_CHALLENGERS ]],
+      [Biome.VOLCANO, [MysteryEncounterType.MYSTERIOUS_CHALLENGERS]],
     ]);
     CIVILIZATION_ENCOUNTER_BIOMES.forEach(biome => {
-      biomeMap.set(biome, [ MysteryEncounterType.DEPARTMENT_STORE_SALE ]);
+      biomeMap.set(biome, [MysteryEncounterType.DEPARTMENT_STORE_SALE]);
     });
     vi.spyOn(MysteryEncounters, "mysteryEncountersByBiome", "get").mockReturnValue(biomeMap);
   });
@@ -63,10 +63,12 @@ describe("Department Store Sale - Mystery Encounter", () => {
       {
         speaker: `${namespace}:speaker`,
         text: `${namespace}:intro_dialogue`,
-      }
+      },
     ]);
     expect(DepartmentStoreSaleEncounter.dialogue.encounterOptionsDialogue?.title).toBe(`${namespace}:title`);
-    expect(DepartmentStoreSaleEncounter.dialogue.encounterOptionsDialogue?.description).toBe(`${namespace}:description`);
+    expect(DepartmentStoreSaleEncounter.dialogue.encounterOptionsDialogue?.description).toBe(
+      `${namespace}:description`,
+    );
     expect(DepartmentStoreSaleEncounter.dialogue.encounterOptionsDialogue?.query).toBe(`${namespace}:query`);
     expect(DepartmentStoreSaleEncounter.options.length).toBe(4);
   });
@@ -96,8 +98,10 @@ describe("Department Store Sale - Mystery Encounter", () => {
       expect(scene.getCurrentPhase()?.constructor.name).toBe(SelectModifierPhase.name);
       await game.phaseInterceptor.run(SelectModifierPhase);
 
-      expect(scene.ui.getMode()).to.equal(Mode.MODIFIER_SELECT);
-      const modifierSelectHandler = scene.ui.handlers.find(h => h instanceof ModifierSelectUiHandler) as ModifierSelectUiHandler;
+      expect(scene.ui.getMode()).to.equal(UiMode.MODIFIER_SELECT);
+      const modifierSelectHandler = scene.ui.handlers.find(
+        h => h instanceof ModifierSelectUiHandler,
+      ) as ModifierSelectUiHandler;
       expect(modifierSelectHandler.options.length).toEqual(5);
       for (const option of modifierSelectHandler.options) {
         expect(option.modifierTypeOption.type.id).toContain("TM_");
@@ -131,12 +135,16 @@ describe("Department Store Sale - Mystery Encounter", () => {
       expect(scene.getCurrentPhase()?.constructor.name).toBe(SelectModifierPhase.name);
       await game.phaseInterceptor.run(SelectModifierPhase);
 
-      expect(scene.ui.getMode()).to.equal(Mode.MODIFIER_SELECT);
-      const modifierSelectHandler = scene.ui.handlers.find(h => h instanceof ModifierSelectUiHandler) as ModifierSelectUiHandler;
+      expect(scene.ui.getMode()).to.equal(UiMode.MODIFIER_SELECT);
+      const modifierSelectHandler = scene.ui.handlers.find(
+        h => h instanceof ModifierSelectUiHandler,
+      ) as ModifierSelectUiHandler;
       expect(modifierSelectHandler.options.length).toEqual(3);
       for (const option of modifierSelectHandler.options) {
-        expect(option.modifierTypeOption.type.id.includes("PP_UP") ||
-          option.modifierTypeOption.type.id.includes("BASE_STAT_BOOSTER")).toBeTruthy();
+        expect(
+          option.modifierTypeOption.type.id.includes("PP_UP") ||
+            option.modifierTypeOption.type.id.includes("BASE_STAT_BOOSTER"),
+        ).toBeTruthy();
       }
     });
 
@@ -167,12 +175,16 @@ describe("Department Store Sale - Mystery Encounter", () => {
       expect(scene.getCurrentPhase()?.constructor.name).toBe(SelectModifierPhase.name);
       await game.phaseInterceptor.run(SelectModifierPhase);
 
-      expect(scene.ui.getMode()).to.equal(Mode.MODIFIER_SELECT);
-      const modifierSelectHandler = scene.ui.handlers.find(h => h instanceof ModifierSelectUiHandler) as ModifierSelectUiHandler;
+      expect(scene.ui.getMode()).to.equal(UiMode.MODIFIER_SELECT);
+      const modifierSelectHandler = scene.ui.handlers.find(
+        h => h instanceof ModifierSelectUiHandler,
+      ) as ModifierSelectUiHandler;
       expect(modifierSelectHandler.options.length).toEqual(5);
       for (const option of modifierSelectHandler.options) {
-        expect(option.modifierTypeOption.type.id.includes("DIRE_HIT") ||
-          option.modifierTypeOption.type.id.includes("TEMP_STAT_STAGE_BOOSTER")).toBeTruthy();
+        expect(
+          option.modifierTypeOption.type.id.includes("DIRE_HIT") ||
+            option.modifierTypeOption.type.id.includes("TEMP_STAT_STAGE_BOOSTER"),
+        ).toBeTruthy();
       }
     });
 
@@ -203,8 +215,10 @@ describe("Department Store Sale - Mystery Encounter", () => {
       expect(scene.getCurrentPhase()?.constructor.name).toBe(SelectModifierPhase.name);
       await game.phaseInterceptor.run(SelectModifierPhase);
 
-      expect(scene.ui.getMode()).to.equal(Mode.MODIFIER_SELECT);
-      const modifierSelectHandler = scene.ui.handlers.find(h => h instanceof ModifierSelectUiHandler) as ModifierSelectUiHandler;
+      expect(scene.ui.getMode()).to.equal(UiMode.MODIFIER_SELECT);
+      const modifierSelectHandler = scene.ui.handlers.find(
+        h => h instanceof ModifierSelectUiHandler,
+      ) as ModifierSelectUiHandler;
       expect(modifierSelectHandler.options.length).toEqual(4);
       for (const option of modifierSelectHandler.options) {
         expect(option.modifierTypeOption.type.id).toContain("BALL");
diff --git a/src/test/mystery-encounter/encounters/field-trip-encounter.test.ts b/test/mystery-encounter/encounters/field-trip-encounter.test.ts
similarity index 71%
rename from src/test/mystery-encounter/encounters/field-trip-encounter.test.ts
rename to test/mystery-encounter/encounters/field-trip-encounter.test.ts
index bc9be246e10..75a6fe77492 100644
--- a/src/test/mystery-encounter/encounters/field-trip-encounter.test.ts
+++ b/test/mystery-encounter/encounters/field-trip-encounter.test.ts
@@ -1,7 +1,7 @@
 import { Biome } from "#app/enums/biome";
 import { MysteryEncounterType } from "#app/enums/mystery-encounter-type";
 import { Species } from "#app/enums/species";
-import GameManager from "#app/test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 import * as EncounterPhaseUtils from "#app/data/mystery-encounters/utils/encounter-phase-utils";
 import { runMysteryEncounterToEnd } from "#test/mystery-encounter/encounter-test-utils";
@@ -12,12 +12,12 @@ import * as MysteryEncounters from "#app/data/mystery-encounters/mystery-encount
 import { FieldTripEncounter } from "#app/data/mystery-encounters/encounters/field-trip-encounter";
 import { Moves } from "#enums/moves";
 import { SelectModifierPhase } from "#app/phases/select-modifier-phase";
-import { Mode } from "#app/ui/ui";
+import { UiMode } from "#enums/ui-mode";
 import ModifierSelectUiHandler from "#app/ui/modifier-select-ui-handler";
 import i18next from "i18next";
 
 const namespace = "mysteryEncounters/fieldTrip";
-const defaultParty = [ Species.LAPRAS, Species.GENGAR, Species.ABRA ];
+const defaultParty = [Species.LAPRAS, Species.GENGAR, Species.ABRA];
 const defaultBiome = Biome.CAVE;
 const defaultWave = 45;
 
@@ -37,12 +37,10 @@ describe("Field Trip - Mystery Encounter", () => {
     game.override.startingWave(defaultWave);
     game.override.startingBiome(defaultBiome);
     game.override.disableTrainerWaves();
-    game.override.moveset([ Moves.TACKLE, Moves.UPROAR, Moves.SWORDS_DANCE ]);
+    game.override.moveset([Moves.TACKLE, Moves.UPROAR, Moves.SWORDS_DANCE]);
 
     vi.spyOn(MysteryEncounters, "mysteryEncountersByBiome", "get").mockReturnValue(
-      new Map<Biome, MysteryEncounterType[]>([
-        [ Biome.CAVE, [ MysteryEncounterType.FIELD_TRIP ]],
-      ])
+      new Map<Biome, MysteryEncounterType[]>([[Biome.CAVE, [MysteryEncounterType.FIELD_TRIP]]]),
     );
   });
 
@@ -60,12 +58,12 @@ describe("Field Trip - Mystery Encounter", () => {
     expect(FieldTripEncounter.dialogue).toBeDefined();
     expect(FieldTripEncounter.dialogue.intro).toStrictEqual([
       {
-        text: `${namespace}:intro`
+        text: `${namespace}:intro`,
       },
       {
         speaker: `${namespace}:speaker`,
-        text: `${namespace}:intro_dialogue`
-      }
+        text: `${namespace}:intro_dialogue`,
+      },
     ]);
     expect(FieldTripEncounter.dialogue.encounterOptionsDialogue?.title).toBe(`${namespace}:title`);
     expect(FieldTripEncounter.dialogue.encounterOptionsDialogue?.description).toBe(`${namespace}:description`);
@@ -90,8 +88,10 @@ describe("Field Trip - Mystery Encounter", () => {
       await runMysteryEncounterToEnd(game, 1, { pokemonNo: 1, optionNo: 2 });
       await game.phaseInterceptor.to(SelectModifierPhase);
 
-      expect(scene.ui.getMode()).to.equal(Mode.MODIFIER_SELECT);
-      const modifierSelectHandler = scene.ui.handlers.find(h => h instanceof ModifierSelectUiHandler) as ModifierSelectUiHandler;
+      expect(scene.ui.getMode()).to.equal(UiMode.MODIFIER_SELECT);
+      const modifierSelectHandler = scene.ui.handlers.find(
+        h => h instanceof ModifierSelectUiHandler,
+      ) as ModifierSelectUiHandler;
       expect(modifierSelectHandler.options.length).toEqual(0);
     });
 
@@ -100,14 +100,26 @@ describe("Field Trip - Mystery Encounter", () => {
       await runMysteryEncounterToEnd(game, 1, { pokemonNo: 1, optionNo: 1 });
       await game.phaseInterceptor.to(SelectModifierPhase);
 
-      expect(scene.ui.getMode()).to.equal(Mode.MODIFIER_SELECT);
-      const modifierSelectHandler = scene.ui.handlers.find(h => h instanceof ModifierSelectUiHandler) as ModifierSelectUiHandler;
+      expect(scene.ui.getMode()).to.equal(UiMode.MODIFIER_SELECT);
+      const modifierSelectHandler = scene.ui.handlers.find(
+        h => h instanceof ModifierSelectUiHandler,
+      ) as ModifierSelectUiHandler;
       expect(modifierSelectHandler.options.length).toEqual(5);
-      expect(modifierSelectHandler.options[0].modifierTypeOption.type.name).toBe(i18next.t("modifierType:TempStatStageBoosterItem.x_attack"));
-      expect(modifierSelectHandler.options[1].modifierTypeOption.type.name).toBe(i18next.t("modifierType:TempStatStageBoosterItem.x_defense"));
-      expect(modifierSelectHandler.options[2].modifierTypeOption.type.name).toBe(i18next.t("modifierType:TempStatStageBoosterItem.x_speed"));
-      expect(modifierSelectHandler.options[3].modifierTypeOption.type.name).toBe(i18next.t("modifierType:ModifierType.DIRE_HIT.name"));
-      expect(modifierSelectHandler.options[4].modifierTypeOption.type.name).toBe(i18next.t("modifierType:ModifierType.RARER_CANDY.name"));
+      expect(modifierSelectHandler.options[0].modifierTypeOption.type.name).toBe(
+        i18next.t("modifierType:TempStatStageBoosterItem.x_attack"),
+      );
+      expect(modifierSelectHandler.options[1].modifierTypeOption.type.name).toBe(
+        i18next.t("modifierType:TempStatStageBoosterItem.x_defense"),
+      );
+      expect(modifierSelectHandler.options[2].modifierTypeOption.type.name).toBe(
+        i18next.t("modifierType:TempStatStageBoosterItem.x_speed"),
+      );
+      expect(modifierSelectHandler.options[3].modifierTypeOption.type.name).toBe(
+        i18next.t("modifierType:ModifierType.DIRE_HIT.name"),
+      );
+      expect(modifierSelectHandler.options[4].modifierTypeOption.type.name).toBe(
+        i18next.t("modifierType:ModifierType.RARER_CANDY.name"),
+      );
     });
 
     it("should leave encounter without battle", async () => {
@@ -137,8 +149,10 @@ describe("Field Trip - Mystery Encounter", () => {
       await runMysteryEncounterToEnd(game, 2, { pokemonNo: 1, optionNo: 1 });
       await game.phaseInterceptor.to(SelectModifierPhase);
 
-      expect(scene.ui.getMode()).to.equal(Mode.MODIFIER_SELECT);
-      const modifierSelectHandler = scene.ui.handlers.find(h => h instanceof ModifierSelectUiHandler) as ModifierSelectUiHandler;
+      expect(scene.ui.getMode()).to.equal(UiMode.MODIFIER_SELECT);
+      const modifierSelectHandler = scene.ui.handlers.find(
+        h => h instanceof ModifierSelectUiHandler,
+      ) as ModifierSelectUiHandler;
       expect(modifierSelectHandler.options.length).toEqual(0);
     });
 
@@ -147,14 +161,26 @@ describe("Field Trip - Mystery Encounter", () => {
       await runMysteryEncounterToEnd(game, 2, { pokemonNo: 1, optionNo: 2 });
       await game.phaseInterceptor.to(SelectModifierPhase);
 
-      expect(scene.ui.getMode()).to.equal(Mode.MODIFIER_SELECT);
-      const modifierSelectHandler = scene.ui.handlers.find(h => h instanceof ModifierSelectUiHandler) as ModifierSelectUiHandler;
+      expect(scene.ui.getMode()).to.equal(UiMode.MODIFIER_SELECT);
+      const modifierSelectHandler = scene.ui.handlers.find(
+        h => h instanceof ModifierSelectUiHandler,
+      ) as ModifierSelectUiHandler;
       expect(modifierSelectHandler.options.length).toEqual(5);
-      expect(modifierSelectHandler.options[0].modifierTypeOption.type.name).toBe(i18next.t("modifierType:TempStatStageBoosterItem.x_sp_atk"));
-      expect(modifierSelectHandler.options[1].modifierTypeOption.type.name).toBe(i18next.t("modifierType:TempStatStageBoosterItem.x_sp_def"));
-      expect(modifierSelectHandler.options[2].modifierTypeOption.type.name).toBe(i18next.t("modifierType:TempStatStageBoosterItem.x_speed"));
-      expect(modifierSelectHandler.options[3].modifierTypeOption.type.name).toBe(i18next.t("modifierType:ModifierType.DIRE_HIT.name"));
-      expect(modifierSelectHandler.options[4].modifierTypeOption.type.name).toBe(i18next.t("modifierType:ModifierType.RARER_CANDY.name"));
+      expect(modifierSelectHandler.options[0].modifierTypeOption.type.name).toBe(
+        i18next.t("modifierType:TempStatStageBoosterItem.x_sp_atk"),
+      );
+      expect(modifierSelectHandler.options[1].modifierTypeOption.type.name).toBe(
+        i18next.t("modifierType:TempStatStageBoosterItem.x_sp_def"),
+      );
+      expect(modifierSelectHandler.options[2].modifierTypeOption.type.name).toBe(
+        i18next.t("modifierType:TempStatStageBoosterItem.x_speed"),
+      );
+      expect(modifierSelectHandler.options[3].modifierTypeOption.type.name).toBe(
+        i18next.t("modifierType:ModifierType.DIRE_HIT.name"),
+      );
+      expect(modifierSelectHandler.options[4].modifierTypeOption.type.name).toBe(
+        i18next.t("modifierType:ModifierType.RARER_CANDY.name"),
+      );
     });
 
     it("should leave encounter without battle", async () => {
@@ -184,8 +210,10 @@ describe("Field Trip - Mystery Encounter", () => {
       await runMysteryEncounterToEnd(game, 3, { pokemonNo: 1, optionNo: 1 });
       await game.phaseInterceptor.to(SelectModifierPhase);
 
-      expect(scene.ui.getMode()).to.equal(Mode.MODIFIER_SELECT);
-      const modifierSelectHandler = scene.ui.handlers.find(h => h instanceof ModifierSelectUiHandler) as ModifierSelectUiHandler;
+      expect(scene.ui.getMode()).to.equal(UiMode.MODIFIER_SELECT);
+      const modifierSelectHandler = scene.ui.handlers.find(
+        h => h instanceof ModifierSelectUiHandler,
+      ) as ModifierSelectUiHandler;
       expect(modifierSelectHandler.options.length).toEqual(0);
     });
 
@@ -195,15 +223,33 @@ describe("Field Trip - Mystery Encounter", () => {
       await runMysteryEncounterToEnd(game, 3, { pokemonNo: 1, optionNo: 3 });
       await game.phaseInterceptor.to(SelectModifierPhase);
 
-      expect(scene.ui.getMode()).to.equal(Mode.MODIFIER_SELECT);
-      const modifierSelectHandler = scene.ui.handlers.find(h => h instanceof ModifierSelectUiHandler) as ModifierSelectUiHandler;
+      expect(scene.ui.getMode()).to.equal(UiMode.MODIFIER_SELECT);
+      const modifierSelectHandler = scene.ui.handlers.find(
+        h => h instanceof ModifierSelectUiHandler,
+      ) as ModifierSelectUiHandler;
       expect(modifierSelectHandler.options.length).toEqual(5);
-      expect(modifierSelectHandler.options[0].modifierTypeOption.type.name).toBe(i18next.t("modifierType:TempStatStageBoosterItem.x_accuracy"));
-      expect(modifierSelectHandler.options[1].modifierTypeOption.type.name).toBe(i18next.t("modifierType:TempStatStageBoosterItem.x_speed"));
-      expect(modifierSelectHandler.options[2].modifierTypeOption.type.name).toBe(i18next.t("modifierType:ModifierType.AddPokeballModifierType.name", { modifierCount: 5, pokeballName: i18next.t("pokeball:greatBall") }));
-      expect(i18next.t).toHaveBeenCalledWith(("modifierType:ModifierType.AddPokeballModifierType.name"), expect.objectContaining({ modifierCount: 5 }));
-      expect(modifierSelectHandler.options[3].modifierTypeOption.type.name).toBe(i18next.t("modifierType:ModifierType.IV_SCANNER.name"));
-      expect(modifierSelectHandler.options[4].modifierTypeOption.type.name).toBe(i18next.t("modifierType:ModifierType.RARER_CANDY.name"));
+      expect(modifierSelectHandler.options[0].modifierTypeOption.type.name).toBe(
+        i18next.t("modifierType:TempStatStageBoosterItem.x_accuracy"),
+      );
+      expect(modifierSelectHandler.options[1].modifierTypeOption.type.name).toBe(
+        i18next.t("modifierType:TempStatStageBoosterItem.x_speed"),
+      );
+      expect(modifierSelectHandler.options[2].modifierTypeOption.type.name).toBe(
+        i18next.t("modifierType:ModifierType.AddPokeballModifierType.name", {
+          modifierCount: 5,
+          pokeballName: i18next.t("pokeball:greatBall"),
+        }),
+      );
+      expect(i18next.t).toHaveBeenCalledWith(
+        "modifierType:ModifierType.AddPokeballModifierType.name",
+        expect.objectContaining({ modifierCount: 5 }),
+      );
+      expect(modifierSelectHandler.options[3].modifierTypeOption.type.name).toBe(
+        i18next.t("modifierType:ModifierType.IV_SCANNER.name"),
+      );
+      expect(modifierSelectHandler.options[4].modifierTypeOption.type.name).toBe(
+        i18next.t("modifierType:ModifierType.RARER_CANDY.name"),
+      );
     });
 
     it("should leave encounter without battle", async () => {
diff --git a/src/test/mystery-encounter/encounters/fiery-fallout-encounter.test.ts b/test/mystery-encounter/encounters/fiery-fallout-encounter.test.ts
similarity index 83%
rename from src/test/mystery-encounter/encounters/fiery-fallout-encounter.test.ts
rename to test/mystery-encounter/encounters/fiery-fallout-encounter.test.ts
index 2f668dd7f50..3d311134d4e 100644
--- a/src/test/mystery-encounter/encounters/fiery-fallout-encounter.test.ts
+++ b/test/mystery-encounter/encounters/fiery-fallout-encounter.test.ts
@@ -2,23 +2,27 @@ import * as MysteryEncounters from "#app/data/mystery-encounters/mystery-encount
 import { Biome } from "#enums/biome";
 import { MysteryEncounterType } from "#enums/mystery-encounter-type";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 import { FieryFalloutEncounter } from "#app/data/mystery-encounters/encounters/fiery-fallout-encounter";
 import { Gender } from "#app/data/gender";
 import { getPokemonSpecies } from "#app/data/pokemon-species";
 import * as BattleAnims from "#app/data/battle-anims";
 import * as EncounterPhaseUtils from "#app/data/mystery-encounters/utils/encounter-phase-utils";
-import { runMysteryEncounterToEnd, runSelectMysteryEncounterOption, skipBattleRunMysteryEncounterRewardsPhase } from "#test/mystery-encounter/encounter-test-utils";
+import {
+  runMysteryEncounterToEnd,
+  runSelectMysteryEncounterOption,
+  skipBattleRunMysteryEncounterRewardsPhase,
+} from "#test/mystery-encounter/encounter-test-utils";
 import { Moves } from "#enums/moves";
 import type BattleScene from "#app/battle-scene";
 import { AttackTypeBoosterModifier, PokemonHeldItemModifier } from "#app/modifier/modifier";
-import { Type } from "#enums/type";
+import { PokemonType } from "#enums/pokemon-type";
 import { Status } from "#app/data/status-effect";
 import { MysteryEncounterPhase } from "#app/phases/mystery-encounter-phases";
 import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
 import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
-import { initSceneWithoutEncounterPhase } from "#test/utils/gameManagerUtils";
+import { initSceneWithoutEncounterPhase } from "#test/testUtils/gameManagerUtils";
 import { CommandPhase } from "#app/phases/command-phase";
 import { MovePhase } from "#app/phases/move-phase";
 import { SelectModifierPhase } from "#app/phases/select-modifier-phase";
@@ -29,7 +33,7 @@ import { StatusEffect } from "#enums/status-effect";
 
 const namespace = "mysteryEncounters/fieryFallout";
 /** Arcanine and Ninetails for 2 Fire types. Lapras, Gengar, Abra for burnable mon. */
-const defaultParty = [ Species.ARCANINE, Species.NINETALES, Species.LAPRAS, Species.GENGAR, Species.ABRA ];
+const defaultParty = [Species.ARCANINE, Species.NINETALES, Species.LAPRAS, Species.GENGAR, Species.ABRA];
 const defaultBiome = Biome.VOLCANO;
 const defaultWave = 56;
 
@@ -45,17 +49,18 @@ describe("Fiery Fallout - Mystery Encounter", () => {
   beforeEach(async () => {
     game = new GameManager(phaserGame);
     scene = game.scene;
-    game.override.mysteryEncounterChance(100)
+    game.override
+      .mysteryEncounterChance(100)
       .startingWave(defaultWave)
       .startingBiome(defaultBiome)
       .disableTrainerWaves()
-      .moveset([ Moves.PAYBACK, Moves.THUNDERBOLT ]); // Required for attack type booster item generation
+      .moveset([Moves.PAYBACK, Moves.THUNDERBOLT]); // Required for attack type booster item generation
 
     vi.spyOn(MysteryEncounters, "mysteryEncountersByBiome", "get").mockReturnValue(
       new Map<Biome, MysteryEncounterType[]>([
-        [ Biome.VOLCANO, [ MysteryEncounterType.FIERY_FALLOUT ]],
-        [ Biome.MOUNTAIN, [ MysteryEncounterType.MYSTERIOUS_CHALLENGERS ]],
-      ])
+        [Biome.VOLCANO, [MysteryEncounterType.FIERY_FALLOUT]],
+        [Biome.MOUNTAIN, [MysteryEncounterType.MYSTERIOUS_CHALLENGERS]],
+      ]),
     );
   });
 
@@ -114,20 +119,20 @@ describe("Fiery Fallout - Mystery Encounter", () => {
             species: getPokemonSpecies(Species.VOLCARONA),
             isBoss: false,
             gender: Gender.MALE,
-            tags: [ BattlerTagType.MYSTERY_ENCOUNTER_POST_SUMMON ],
-            mysteryEncounterBattleEffects: expect.any(Function)
+            tags: [BattlerTagType.MYSTERY_ENCOUNTER_POST_SUMMON],
+            mysteryEncounterBattleEffects: expect.any(Function),
           },
           {
             species: getPokemonSpecies(Species.VOLCARONA),
             isBoss: false,
             gender: Gender.FEMALE,
-            tags: [ BattlerTagType.MYSTERY_ENCOUNTER_POST_SUMMON ],
-            mysteryEncounterBattleEffects: expect.any(Function)
-          }
+            tags: [BattlerTagType.MYSTERY_ENCOUNTER_POST_SUMMON],
+            mysteryEncounterBattleEffects: expect.any(Function),
+          },
         ],
         doubleBattle: true,
-        disableSwitch: true
-      }
+        disableSwitch: true,
+      },
     ]);
     expect(weatherSpy).toHaveBeenCalledTimes(1);
     await vi.waitFor(() => expect(moveInitSpy).toHaveBeenCalled());
@@ -177,8 +182,10 @@ describe("Fiery Fallout - Mystery Encounter", () => {
       expect(scene.getCurrentPhase()?.constructor.name).toBe(SelectModifierPhase.name);
 
       const leadPokemonId = scene.getPlayerParty()?.[0].id;
-      const leadPokemonItems = scene.findModifiers(m => m instanceof PokemonHeldItemModifier
-        && (m as PokemonHeldItemModifier).pokemonId === leadPokemonId, true) as PokemonHeldItemModifier[];
+      const leadPokemonItems = scene.findModifiers(
+        m => m instanceof PokemonHeldItemModifier && (m as PokemonHeldItemModifier).pokemonId === leadPokemonId,
+        true,
+      ) as PokemonHeldItemModifier[];
       const item = leadPokemonItems.find(i => i instanceof AttackTypeBoosterModifier);
       expect(item).toBeDefined;
     });
@@ -204,22 +211,30 @@ describe("Fiery Fallout - Mystery Encounter", () => {
       await game.runToMysteryEncounter(MysteryEncounterType.FIERY_FALLOUT, defaultParty);
 
       const party = scene.getPlayerParty();
-      const lapras = party.find((pkm) => pkm.species.speciesId === Species.LAPRAS)!;
+      const lapras = party.find(pkm => pkm.species.speciesId === Species.LAPRAS)!;
       lapras.status = new Status(StatusEffect.POISON);
-      const abra = party.find((pkm) => pkm.species.speciesId === Species.ABRA)!;
+      const abra = party.find(pkm => pkm.species.speciesId === Species.ABRA)!;
       vi.spyOn(abra, "isAllowedInBattle").mockReturnValue(false);
 
       await runMysteryEncounterToEnd(game, 2);
 
-      const burnablePokemon = party.filter((pkm) => pkm.isAllowedInBattle() && !pkm.getTypes().includes(Type.FIRE));
-      const notBurnablePokemon = party.filter((pkm) => !pkm.isAllowedInBattle() || pkm.getTypes().includes(Type.FIRE));
+      const burnablePokemon = party.filter(
+        pkm => pkm.isAllowedInBattle() && !pkm.getTypes().includes(PokemonType.FIRE),
+      );
+      const notBurnablePokemon = party.filter(
+        pkm => !pkm.isAllowedInBattle() || pkm.getTypes().includes(PokemonType.FIRE),
+      );
       expect(scene.currentBattle.mysteryEncounter?.dialogueTokens["burnedPokemon"]).toBe(i18next.t("pokemon:gengar"));
-      burnablePokemon.forEach((pkm) => {
-        expect(pkm.hp, `${pkm.name} should have received 20% damage: ${pkm.hp} / ${pkm.getMaxHp()} HP`).toBe(pkm.getMaxHp() - Math.floor(pkm.getMaxHp() * 0.2));
+      burnablePokemon.forEach(pkm => {
+        expect(pkm.hp, `${pkm.name} should have received 20% damage: ${pkm.hp} / ${pkm.getMaxHp()} HP`).toBe(
+          pkm.getMaxHp() - Math.floor(pkm.getMaxHp() * 0.2),
+        );
       });
       expect(burnablePokemon.some(pkm => pkm.status?.effect === StatusEffect.BURN)).toBeTruthy();
       expect(burnablePokemon.some(pkm => pkm.customPokemonData.ability === Abilities.HEATPROOF));
-      notBurnablePokemon.forEach((pkm) => expect(pkm.hp, `${pkm.name} should be full hp: ${pkm.hp} / ${pkm.getMaxHp()} HP`).toBe(pkm.getMaxHp()));
+      notBurnablePokemon.forEach(pkm =>
+        expect(pkm.hp, `${pkm.name} should be full hp: ${pkm.hp} / ${pkm.getMaxHp()} HP`).toBe(pkm.getMaxHp()),
+      );
     });
 
     it("should leave encounter without battle", async () => {
@@ -270,12 +285,12 @@ describe("Fiery Fallout - Mystery Encounter", () => {
     });
 
     it("should be disabled if not enough FIRE types are in party", async () => {
-      await game.runToMysteryEncounter(MysteryEncounterType.FIERY_FALLOUT, [ Species.MAGIKARP ]);
+      await game.runToMysteryEncounter(MysteryEncounterType.FIERY_FALLOUT, [Species.MAGIKARP]);
       await game.phaseInterceptor.to(MysteryEncounterPhase, false);
 
       const encounterPhase = scene.getCurrentPhase();
       expect(encounterPhase?.constructor.name).toBe(MysteryEncounterPhase.name);
-      const continueEncounterSpy = vi.spyOn((encounterPhase as MysteryEncounterPhase), "continueEncounter");
+      const continueEncounterSpy = vi.spyOn(encounterPhase as MysteryEncounterPhase, "continueEncounter");
 
       await runSelectMysteryEncounterOption(game, 3);
 
diff --git a/src/test/mystery-encounter/encounters/fight-or-flight-encounter.test.ts b/test/mystery-encounter/encounters/fight-or-flight-encounter.test.ts
similarity index 88%
rename from src/test/mystery-encounter/encounters/fight-or-flight-encounter.test.ts
rename to test/mystery-encounter/encounters/fight-or-flight-encounter.test.ts
index 8c869812f39..d47266268ee 100644
--- a/src/test/mystery-encounter/encounters/fight-or-flight-encounter.test.ts
+++ b/test/mystery-encounter/encounters/fight-or-flight-encounter.test.ts
@@ -2,17 +2,21 @@ import * as MysteryEncounters from "#app/data/mystery-encounters/mystery-encount
 import { Biome } from "#app/enums/biome";
 import { MysteryEncounterType } from "#app/enums/mystery-encounter-type";
 import { Species } from "#app/enums/species";
-import GameManager from "#app/test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
-import { runMysteryEncounterToEnd, runSelectMysteryEncounterOption, skipBattleRunMysteryEncounterRewardsPhase } from "#test/mystery-encounter/encounter-test-utils";
+import {
+  runMysteryEncounterToEnd,
+  runSelectMysteryEncounterOption,
+  skipBattleRunMysteryEncounterRewardsPhase,
+} from "#test/mystery-encounter/encounter-test-utils";
 import { Moves } from "#enums/moves";
 import type BattleScene from "#app/battle-scene";
 import { PokemonMove } from "#app/field/pokemon";
-import { Mode } from "#app/ui/ui";
+import { UiMode } from "#enums/ui-mode";
 import ModifierSelectUiHandler from "#app/ui/modifier-select-ui-handler";
 import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
 import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
-import { initSceneWithoutEncounterPhase } from "#test/utils/gameManagerUtils";
+import { initSceneWithoutEncounterPhase } from "#test/testUtils/gameManagerUtils";
 import * as EncounterPhaseUtils from "#app/data/mystery-encounters/utils/encounter-phase-utils";
 import { FightOrFlightEncounter } from "#app/data/mystery-encounters/encounters/fight-or-flight-encounter";
 import { MysteryEncounterPhase } from "#app/phases/mystery-encounter-phases";
@@ -20,7 +24,7 @@ import { CommandPhase } from "#app/phases/command-phase";
 import { SelectModifierPhase } from "#app/phases/select-modifier-phase";
 
 const namespace = "mysteryEncounters/fightOrFlight";
-const defaultParty = [ Species.LAPRAS, Species.GENGAR, Species.ABRA ];
+const defaultParty = [Species.LAPRAS, Species.GENGAR, Species.ABRA];
 const defaultBiome = Biome.CAVE;
 const defaultWave = 45;
 
@@ -42,9 +46,7 @@ describe("Fight or Flight - Mystery Encounter", () => {
     game.override.disableTrainerWaves();
 
     vi.spyOn(MysteryEncounters, "mysteryEncountersByBiome", "get").mockReturnValue(
-      new Map<Biome, MysteryEncounterType[]>([
-        [ Biome.CAVE, [ MysteryEncounterType.FIGHT_OR_FLIGHT ]],
-      ])
+      new Map<Biome, MysteryEncounterType[]>([[Biome.CAVE, [MysteryEncounterType.FIGHT_OR_FLIGHT]]]),
     );
   });
 
@@ -124,9 +126,11 @@ describe("Fight or Flight - Mystery Encounter", () => {
       await game.phaseInterceptor.to(SelectModifierPhase, false);
       expect(scene.getCurrentPhase()?.constructor.name).toBe(SelectModifierPhase.name);
       await game.phaseInterceptor.run(SelectModifierPhase);
-      expect(scene.ui.getMode()).to.equal(Mode.MODIFIER_SELECT);
+      expect(scene.ui.getMode()).to.equal(UiMode.MODIFIER_SELECT);
 
-      const modifierSelectHandler = scene.ui.handlers.find(h => h instanceof ModifierSelectUiHandler) as ModifierSelectUiHandler;
+      const modifierSelectHandler = scene.ui.handlers.find(
+        h => h instanceof ModifierSelectUiHandler,
+      ) as ModifierSelectUiHandler;
       expect(modifierSelectHandler.options.length).toEqual(1);
       expect(item.type.name).toBe(modifierSelectHandler.options[0].modifierTypeOption.type.name);
     });
@@ -144,14 +148,14 @@ describe("Fight or Flight - Mystery Encounter", () => {
         selected: [
           {
             text: `${namespace}:option.2.selected`,
-          }
+          },
         ],
       });
     });
 
     it("should NOT be selectable if the player doesn't have a Stealing move", async () => {
       await game.runToMysteryEncounter(MysteryEncounterType.FIGHT_OR_FLIGHT, defaultParty);
-      scene.getPlayerParty().forEach(p => p.moveset = []);
+      scene.getPlayerParty().forEach(p => (p.moveset = []));
       await game.phaseInterceptor.to(MysteryEncounterPhase, false);
 
       const encounterPhase = scene.getCurrentPhase();
@@ -175,16 +179,18 @@ describe("Fight or Flight - Mystery Encounter", () => {
       await game.runToMysteryEncounter(MysteryEncounterType.FIGHT_OR_FLIGHT, defaultParty);
 
       // Mock moveset
-      scene.getPlayerParty()[0].moveset = [ new PokemonMove(Moves.KNOCK_OFF) ];
+      scene.getPlayerParty()[0].moveset = [new PokemonMove(Moves.KNOCK_OFF)];
       const item = game.scene.currentBattle.mysteryEncounter!.misc;
 
       await runMysteryEncounterToEnd(game, 2);
       await game.phaseInterceptor.to(SelectModifierPhase, false);
       expect(scene.getCurrentPhase()?.constructor.name).toBe(SelectModifierPhase.name);
       await game.phaseInterceptor.run(SelectModifierPhase);
-      expect(scene.ui.getMode()).to.equal(Mode.MODIFIER_SELECT);
+      expect(scene.ui.getMode()).to.equal(UiMode.MODIFIER_SELECT);
 
-      const modifierSelectHandler = scene.ui.handlers.find(h => h instanceof ModifierSelectUiHandler) as ModifierSelectUiHandler;
+      const modifierSelectHandler = scene.ui.handlers.find(
+        h => h instanceof ModifierSelectUiHandler,
+      ) as ModifierSelectUiHandler;
       expect(modifierSelectHandler.options.length).toEqual(1);
       expect(item.type.name).toBe(modifierSelectHandler.options[0].modifierTypeOption.type.name);
 
diff --git a/src/test/mystery-encounter/encounters/fun-and-games-encounter.test.ts b/test/mystery-encounter/encounters/fun-and-games-encounter.test.ts
similarity index 85%
rename from src/test/mystery-encounter/encounters/fun-and-games-encounter.test.ts
rename to test/mystery-encounter/encounters/fun-and-games-encounter.test.ts
index 44ddbb8f7ba..f8375c1aa78 100644
--- a/src/test/mystery-encounter/encounters/fun-and-games-encounter.test.ts
+++ b/test/mystery-encounter/encounters/fun-and-games-encounter.test.ts
@@ -3,14 +3,17 @@ import { HUMAN_TRANSITABLE_BIOMES } from "#app/data/mystery-encounters/mystery-e
 import { Biome } from "#app/enums/biome";
 import { MysteryEncounterType } from "#app/enums/mystery-encounter-type";
 import { Species } from "#app/enums/species";
-import GameManager from "#app/test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
-import { runMysteryEncounterToEnd, runSelectMysteryEncounterOption } from "#test/mystery-encounter/encounter-test-utils";
+import {
+  runMysteryEncounterToEnd,
+  runSelectMysteryEncounterOption,
+} from "#test/mystery-encounter/encounter-test-utils";
 import type BattleScene from "#app/battle-scene";
-import { Mode } from "#app/ui/ui";
+import { UiMode } from "#enums/ui-mode";
 import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
 import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
-import { initSceneWithoutEncounterPhase } from "#test/utils/gameManagerUtils";
+import { initSceneWithoutEncounterPhase } from "#test/testUtils/gameManagerUtils";
 import ModifierSelectUiHandler from "#app/ui/modifier-select-ui-handler";
 import MysteryEncounter from "#app/data/mystery-encounters/mystery-encounter";
 import { Nature } from "#enums/nature";
@@ -23,7 +26,7 @@ import { Command } from "#app/ui/command-ui-handler";
 import * as EncounterPhaseUtils from "#app/data/mystery-encounters/utils/encounter-phase-utils";
 
 const namespace = "mysteryEncounters/funAndGames";
-const defaultParty = [ Species.LAPRAS, Species.GENGAR, Species.ABRA ];
+const defaultParty = [Species.LAPRAS, Species.GENGAR, Species.ABRA];
 const defaultBiome = Biome.CAVE;
 const defaultWave = 45;
 
@@ -44,11 +47,9 @@ describe("Fun And Games! - Mystery Encounter", () => {
     game.override.startingBiome(defaultBiome);
     game.override.disableTrainerWaves();
 
-    const biomeMap = new Map<Biome, MysteryEncounterType[]>([
-      [ Biome.VOLCANO, [ MysteryEncounterType.FIGHT_OR_FLIGHT ]],
-    ]);
+    const biomeMap = new Map<Biome, MysteryEncounterType[]>([[Biome.VOLCANO, [MysteryEncounterType.FIGHT_OR_FLIGHT]]]);
     HUMAN_TRANSITABLE_BIOMES.forEach(biome => {
-      biomeMap.set(biome, [ MysteryEncounterType.FUN_AND_GAMES ]);
+      biomeMap.set(biome, [MysteryEncounterType.FUN_AND_GAMES]);
     });
     vi.spyOn(MysteryEncounters, "mysteryEncountersByBiome", "get").mockReturnValue(biomeMap);
   });
@@ -69,7 +70,7 @@ describe("Fun And Games! - Mystery Encounter", () => {
       {
         speaker: `${namespace}:speaker`,
         text: `${namespace}:intro_dialogue`,
-      }
+      },
     ]);
     expect(FunAndGamesEncounter.dialogue.encounterOptionsDialogue?.title).toBe(`${namespace}:title`);
     expect(FunAndGamesEncounter.dialogue.encounterOptionsDialogue?.description).toBe(`${namespace}:description`);
@@ -137,16 +138,16 @@ describe("Fun And Games! - Mystery Encounter", () => {
 
     it("should get 3 turns to attack the Wobbuffet for a reward", async () => {
       scene.money = 20000;
-      game.override.moveset([ Moves.TACKLE ]);
+      game.override.moveset([Moves.TACKLE]);
       await game.runToMysteryEncounter(MysteryEncounterType.FUN_AND_GAMES, defaultParty);
       await runMysteryEncounterToEnd(game, 1, { pokemonNo: 1 }, true);
 
       expect(scene.getCurrentPhase()?.constructor.name).toBe(CommandPhase.name);
       expect(scene.getEnemyPokemon()?.species.speciesId).toBe(Species.WOBBUFFET);
-      expect(scene.getEnemyPokemon()?.ivs).toEqual([ 0, 0, 0, 0, 0, 0 ]);
+      expect(scene.getEnemyPokemon()?.ivs).toEqual([0, 0, 0, 0, 0, 0]);
       expect(scene.getEnemyPokemon()?.nature).toBe(Nature.MILD);
 
-      game.onNextPrompt("MessagePhase", Mode.MESSAGE, () => {
+      game.onNextPrompt("MessagePhase", UiMode.MESSAGE, () => {
         game.endPhase();
       });
 
@@ -172,7 +173,7 @@ describe("Fun And Games! - Mystery Encounter", () => {
       await runMysteryEncounterToEnd(game, 1, { pokemonNo: 1 }, true);
 
       expect(scene.getCurrentPhase()?.constructor.name).toBe(CommandPhase.name);
-      game.onNextPrompt("MessagePhase", Mode.MESSAGE, () => {
+      game.onNextPrompt("MessagePhase", UiMode.MESSAGE, () => {
         game.endPhase();
       });
 
@@ -185,19 +186,21 @@ describe("Fun And Games! - Mystery Encounter", () => {
       expect(scene.getCurrentPhase()?.constructor.name).toBe(SelectModifierPhase.name);
       await game.phaseInterceptor.run(SelectModifierPhase);
 
-      expect(scene.ui.getMode()).to.equal(Mode.MODIFIER_SELECT);
-      const modifierSelectHandler = scene.ui.handlers.find(h => h instanceof ModifierSelectUiHandler) as ModifierSelectUiHandler;
+      expect(scene.ui.getMode()).to.equal(UiMode.MODIFIER_SELECT);
+      const modifierSelectHandler = scene.ui.handlers.find(
+        h => h instanceof ModifierSelectUiHandler,
+      ) as ModifierSelectUiHandler;
       expect(modifierSelectHandler.options.length).toEqual(0);
     });
 
     it("should have Wide Lens item in rewards if Wubboffet is at 15-33% HP remaining", async () => {
       scene.money = 20000;
-      game.override.moveset([ Moves.SPLASH ]);
+      game.override.moveset([Moves.SPLASH]);
       await game.runToMysteryEncounter(MysteryEncounterType.FUN_AND_GAMES, defaultParty);
       await runMysteryEncounterToEnd(game, 1, { pokemonNo: 1 }, true);
 
       expect(scene.getCurrentPhase()?.constructor.name).toBe(CommandPhase.name);
-      game.onNextPrompt("MessagePhase", Mode.MESSAGE, () => {
+      game.onNextPrompt("MessagePhase", UiMode.MESSAGE, () => {
         game.endPhase();
       });
 
@@ -212,20 +215,22 @@ describe("Fun And Games! - Mystery Encounter", () => {
       expect(scene.getCurrentPhase()?.constructor.name).toBe(SelectModifierPhase.name);
       await game.phaseInterceptor.run(SelectModifierPhase);
 
-      expect(scene.ui.getMode()).to.equal(Mode.MODIFIER_SELECT);
-      const modifierSelectHandler = scene.ui.handlers.find(h => h instanceof ModifierSelectUiHandler) as ModifierSelectUiHandler;
+      expect(scene.ui.getMode()).to.equal(UiMode.MODIFIER_SELECT);
+      const modifierSelectHandler = scene.ui.handlers.find(
+        h => h instanceof ModifierSelectUiHandler,
+      ) as ModifierSelectUiHandler;
       expect(modifierSelectHandler.options.length).toEqual(1);
       expect(modifierSelectHandler.options[0].modifierTypeOption.type.id).toEqual("WIDE_LENS");
     });
 
     it("should have Scope Lens item in rewards if Wubboffet is at 3-15% HP remaining", async () => {
       scene.money = 20000;
-      game.override.moveset([ Moves.SPLASH ]);
+      game.override.moveset([Moves.SPLASH]);
       await game.runToMysteryEncounter(MysteryEncounterType.FUN_AND_GAMES, defaultParty);
       await runMysteryEncounterToEnd(game, 1, { pokemonNo: 1 }, true);
 
       expect(scene.getCurrentPhase()?.constructor.name).toBe(CommandPhase.name);
-      game.onNextPrompt("MessagePhase", Mode.MESSAGE, () => {
+      game.onNextPrompt("MessagePhase", UiMode.MESSAGE, () => {
         game.endPhase();
       });
 
@@ -240,20 +245,22 @@ describe("Fun And Games! - Mystery Encounter", () => {
       expect(scene.getCurrentPhase()?.constructor.name).toBe(SelectModifierPhase.name);
       await game.phaseInterceptor.run(SelectModifierPhase);
 
-      expect(scene.ui.getMode()).to.equal(Mode.MODIFIER_SELECT);
-      const modifierSelectHandler = scene.ui.handlers.find(h => h instanceof ModifierSelectUiHandler) as ModifierSelectUiHandler;
+      expect(scene.ui.getMode()).to.equal(UiMode.MODIFIER_SELECT);
+      const modifierSelectHandler = scene.ui.handlers.find(
+        h => h instanceof ModifierSelectUiHandler,
+      ) as ModifierSelectUiHandler;
       expect(modifierSelectHandler.options.length).toEqual(1);
       expect(modifierSelectHandler.options[0].modifierTypeOption.type.id).toEqual("SCOPE_LENS");
     });
 
     it("should have Multi Lens item in rewards if Wubboffet is at <3% HP remaining", async () => {
       scene.money = 20000;
-      game.override.moveset([ Moves.SPLASH ]);
+      game.override.moveset([Moves.SPLASH]);
       await game.runToMysteryEncounter(MysteryEncounterType.FUN_AND_GAMES, defaultParty);
       await runMysteryEncounterToEnd(game, 1, { pokemonNo: 1 }, true);
 
       expect(scene.getCurrentPhase()?.constructor.name).toBe(CommandPhase.name);
-      game.onNextPrompt("MessagePhase", Mode.MESSAGE, () => {
+      game.onNextPrompt("MessagePhase", UiMode.MESSAGE, () => {
         game.endPhase();
       });
 
@@ -268,8 +275,10 @@ describe("Fun And Games! - Mystery Encounter", () => {
       expect(scene.getCurrentPhase()?.constructor.name).toBe(SelectModifierPhase.name);
       await game.phaseInterceptor.run(SelectModifierPhase);
 
-      expect(scene.ui.getMode()).to.equal(Mode.MODIFIER_SELECT);
-      const modifierSelectHandler = scene.ui.handlers.find(h => h instanceof ModifierSelectUiHandler) as ModifierSelectUiHandler;
+      expect(scene.ui.getMode()).to.equal(UiMode.MODIFIER_SELECT);
+      const modifierSelectHandler = scene.ui.handlers.find(
+        h => h instanceof ModifierSelectUiHandler,
+      ) as ModifierSelectUiHandler;
       expect(modifierSelectHandler.options.length).toEqual(1);
       expect(modifierSelectHandler.options[0].modifierTypeOption.type.id).toEqual("MULTI_LENS");
     });
diff --git a/src/test/mystery-encounter/encounters/global-trade-system-encounter.test.ts b/test/mystery-encounter/encounters/global-trade-system-encounter.test.ts
similarity index 93%
rename from src/test/mystery-encounter/encounters/global-trade-system-encounter.test.ts
rename to test/mystery-encounter/encounters/global-trade-system-encounter.test.ts
index fb5801c941a..576e99c4e18 100644
--- a/src/test/mystery-encounter/encounters/global-trade-system-encounter.test.ts
+++ b/test/mystery-encounter/encounters/global-trade-system-encounter.test.ts
@@ -1,7 +1,7 @@
 import { Biome } from "#app/enums/biome";
 import { MysteryEncounterType } from "#app/enums/mystery-encounter-type";
 import { Species } from "#app/enums/species";
-import GameManager from "#app/test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 import * as EncounterPhaseUtils from "#app/data/mystery-encounters/utils/encounter-phase-utils";
 import { runMysteryEncounterToEnd } from "#test/mystery-encounter/encounter-test-utils";
@@ -15,13 +15,13 @@ import { modifierTypes } from "#app/modifier/modifier-type";
 import { GlobalTradeSystemEncounter } from "#app/data/mystery-encounters/encounters/global-trade-system-encounter";
 import { CIVILIZATION_ENCOUNTER_BIOMES } from "#app/data/mystery-encounters/mystery-encounters";
 import { SelectModifierPhase } from "#app/phases/select-modifier-phase";
-import { Mode } from "#app/ui/ui";
+import { UiMode } from "#enums/ui-mode";
 import ModifierSelectUiHandler from "#app/ui/modifier-select-ui-handler";
 import { ModifierTier } from "#app/modifier/modifier-tier";
-import * as Utils from "#app/utils";
+import * as Utils from "#app/utils/common";
 
 const namespace = "mysteryEncounters/globalTradeSystem";
-const defaultParty = [ Species.LAPRAS, Species.GENGAR, Species.ABRA ];
+const defaultParty = [Species.LAPRAS, Species.GENGAR, Species.ABRA];
 const defaultBiome = Biome.CAVE;
 const defaultWave = 45;
 
@@ -43,10 +43,10 @@ describe("Global Trade System - Mystery Encounter", () => {
     game.override.disableTrainerWaves();
 
     const biomeMap = new Map<Biome, MysteryEncounterType[]>([
-      [ Biome.VOLCANO, [ MysteryEncounterType.MYSTERIOUS_CHALLENGERS ]],
+      [Biome.VOLCANO, [MysteryEncounterType.MYSTERIOUS_CHALLENGERS]],
     ]);
     CIVILIZATION_ENCOUNTER_BIOMES.forEach(biome => {
-      biomeMap.set(biome, [ MysteryEncounterType.GLOBAL_TRADE_SYSTEM ]);
+      biomeMap.set(biome, [MysteryEncounterType.GLOBAL_TRADE_SYSTEM]);
     });
     vi.spyOn(MysteryEncounters, "mysteryEncountersByBiome", "get").mockReturnValue(biomeMap);
   });
@@ -71,7 +71,7 @@ describe("Global Trade System - Mystery Encounter", () => {
   });
 
   it("should not loop infinitely when generating trade options for extreme BST non-legendaries", async () => {
-    const extremeBstTeam = [ Species.SLAKING, Species.WISHIWASHI, Species.SUNKERN ];
+    const extremeBstTeam = [Species.SLAKING, Species.WISHIWASHI, Species.SUNKERN];
     await game.runToMysteryEncounter(MysteryEncounterType.GLOBAL_TRADE_SYSTEM, extremeBstTeam);
 
     expect(GlobalTradeSystemEncounter.encounterType).toBe(MysteryEncounterType.GLOBAL_TRADE_SYSTEM);
@@ -160,7 +160,7 @@ describe("Global Trade System - Mystery Encounter", () => {
       expect(option.dialogue).toBeDefined();
       expect(option.dialogue).toStrictEqual({
         buttonLabel: `${namespace}:option.2.label`,
-        buttonTooltip: `${namespace}:option.2.tooltip`
+        buttonTooltip: `${namespace}:option.2.tooltip`,
       });
     });
 
@@ -224,15 +224,17 @@ describe("Global Trade System - Mystery Encounter", () => {
       const soulDew = generateModifierType(modifierTypes.SOUL_DEW)!;
       const modifier = soulDew.newModifier(scene.getPlayerParty()[0]) as PokemonNatureWeightModifier;
       modifier.stackCount = 2;
-      await scene.addModifier(modifier, true, false, false, true);
+      scene.addModifier(modifier, true, false, false, true);
       await scene.updateModifiers(true);
 
       await runMysteryEncounterToEnd(game, 3, { pokemonNo: 1, optionNo: 1 });
       expect(scene.getCurrentPhase()?.constructor.name).toBe(SelectModifierPhase.name);
       await game.phaseInterceptor.run(SelectModifierPhase);
 
-      expect(scene.ui.getMode()).to.equal(Mode.MODIFIER_SELECT);
-      const modifierSelectHandler = scene.ui.handlers.find(h => h instanceof ModifierSelectUiHandler) as ModifierSelectUiHandler;
+      expect(scene.ui.getMode()).to.equal(UiMode.MODIFIER_SELECT);
+      const modifierSelectHandler = scene.ui.handlers.find(
+        h => h instanceof ModifierSelectUiHandler,
+      ) as ModifierSelectUiHandler;
       expect(modifierSelectHandler.options.length).toEqual(1);
       expect(modifierSelectHandler.options[0].modifierTypeOption.type.tier).toBe(ModifierTier.MASTER);
       const soulDewAfter = scene.findModifier(m => m instanceof PokemonNatureWeightModifier);
@@ -249,7 +251,7 @@ describe("Global Trade System - Mystery Encounter", () => {
       const soulDew = generateModifierType(modifierTypes.SOUL_DEW)!;
       const modifier = soulDew.newModifier(scene.getPlayerParty()[0]) as PokemonNatureWeightModifier;
       modifier.stackCount = 1;
-      await scene.addModifier(modifier, true, false, false, true);
+      scene.addModifier(modifier, true, false, false, true);
       await scene.updateModifiers(true);
 
       await runMysteryEncounterToEnd(game, 3, { pokemonNo: 1, optionNo: 1 });
diff --git a/src/test/mystery-encounter/encounters/lost-at-sea-encounter.test.ts b/test/mystery-encounter/encounters/lost-at-sea-encounter.test.ts
similarity index 88%
rename from src/test/mystery-encounter/encounters/lost-at-sea-encounter.test.ts
rename to test/mystery-encounter/encounters/lost-at-sea-encounter.test.ts
index 17e324f29f0..f23bc8738f2 100644
--- a/src/test/mystery-encounter/encounters/lost-at-sea-encounter.test.ts
+++ b/test/mystery-encounter/encounters/lost-at-sea-encounter.test.ts
@@ -5,21 +5,20 @@ import { getPokemonSpecies } from "#app/data/pokemon-species";
 import { Biome } from "#app/enums/biome";
 import { MysteryEncounterType } from "#app/enums/mystery-encounter-type";
 import { Species } from "#app/enums/species";
-import GameManager from "#app/test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 import { runMysteryEncounterToEnd, runSelectMysteryEncounterOption } from "../encounter-test-utils";
 import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
 import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
-import { initSceneWithoutEncounterPhase } from "#test/utils/gameManagerUtils";
+import { initSceneWithoutEncounterPhase } from "#test/testUtils/gameManagerUtils";
 import type BattleScene from "#app/battle-scene";
 import { MysteryEncounterPhase } from "#app/phases/mystery-encounter-phases";
 import { PartyExpPhase } from "#app/phases/party-exp-phase";
 import i18next from "i18next";
 
-
 const namespace = "mysteryEncounters/lostAtSea";
 /** Blastoise for surf. Pidgeot for fly. Abra for none. */
-const defaultParty = [ Species.BLASTOISE, Species.PIDGEOT, Species.ABRA ];
+const defaultParty = [Species.BLASTOISE, Species.PIDGEOT, Species.ABRA];
 const defaultBiome = Biome.SEA;
 const defaultWave = 33;
 
@@ -42,9 +41,9 @@ describe("Lost at Sea - Mystery Encounter", () => {
 
     vi.spyOn(MysteryEncounters, "mysteryEncountersByBiome", "get").mockReturnValue(
       new Map<Biome, MysteryEncounterType[]>([
-        [ Biome.SEA, [ MysteryEncounterType.LOST_AT_SEA ]],
-        [ Biome.MOUNTAIN, [ MysteryEncounterType.MYSTERIOUS_CHALLENGERS ]],
-      ])
+        [Biome.SEA, [MysteryEncounterType.LOST_AT_SEA]],
+        [Biome.MOUNTAIN, [MysteryEncounterType.MYSTERIOUS_CHALLENGERS]],
+      ]),
     );
   });
 
@@ -115,13 +114,13 @@ describe("Lost at Sea - Mystery Encounter", () => {
 
       await game.runToMysteryEncounter(MysteryEncounterType.LOST_AT_SEA, defaultParty);
       const party = game.scene.getPlayerParty();
-      const blastoise = party.find((pkm) => pkm.species.speciesId === Species.BLASTOISE);
+      const blastoise = party.find(pkm => pkm.species.speciesId === Species.BLASTOISE);
       const expBefore = blastoise!.exp;
 
       await runMysteryEncounterToEnd(game, 1);
       await game.phaseInterceptor.to(PartyExpPhase);
 
-      expect(blastoise?.exp).toBe(expBefore + Math.floor(laprasSpecies.baseExp * defaultWave / 5 + 1));
+      expect(blastoise?.exp).toBe(expBefore + Math.floor((laprasSpecies.baseExp * defaultWave) / 5 + 1));
     });
 
     it("should leave encounter without battle", async () => {
@@ -135,7 +134,7 @@ describe("Lost at Sea - Mystery Encounter", () => {
     });
 
     it("should be disabled if no surfable PKM is in party", async () => {
-      await game.runToMysteryEncounter(MysteryEncounterType.LOST_AT_SEA, [ Species.ARCANINE ]);
+      await game.runToMysteryEncounter(MysteryEncounterType.LOST_AT_SEA, [Species.ARCANINE]);
       await game.phaseInterceptor.to(MysteryEncounterPhase, false);
 
       const encounterPhase = scene.getCurrentPhase();
@@ -180,13 +179,13 @@ describe("Lost at Sea - Mystery Encounter", () => {
 
       await game.runToMysteryEncounter(MysteryEncounterType.LOST_AT_SEA, defaultParty);
       const party = game.scene.getPlayerParty();
-      const pidgeot = party.find((pkm) => pkm.species.speciesId === Species.PIDGEOT);
+      const pidgeot = party.find(pkm => pkm.species.speciesId === Species.PIDGEOT);
       const expBefore = pidgeot!.exp;
 
       await runMysteryEncounterToEnd(game, 2);
       await game.phaseInterceptor.to(PartyExpPhase);
 
-      expect(pidgeot!.exp).toBe(expBefore + Math.floor(laprasBaseExp * defaultWave / 5 + 1));
+      expect(pidgeot!.exp).toBe(expBefore + Math.floor((laprasBaseExp * defaultWave) / 5 + 1));
     });
 
     it("should leave encounter without battle", async () => {
@@ -200,7 +199,7 @@ describe("Lost at Sea - Mystery Encounter", () => {
     });
 
     it("should be disabled if no flyable PKM is in party", async () => {
-      await game.runToMysteryEncounter(MysteryEncounterType.LOST_AT_SEA, [ Species.ARCANINE ]);
+      await game.runToMysteryEncounter(MysteryEncounterType.LOST_AT_SEA, [Species.ARCANINE]);
       await game.phaseInterceptor.to(MysteryEncounterPhase, false);
 
       const encounterPhase = scene.getCurrentPhase();
@@ -242,18 +241,22 @@ describe("Lost at Sea - Mystery Encounter", () => {
       await game.runToMysteryEncounter(MysteryEncounterType.LOST_AT_SEA, defaultParty);
 
       const party = game.scene.getPlayerParty();
-      const abra = party.find((pkm) => pkm.species.speciesId === Species.ABRA)!;
+      const abra = party.find(pkm => pkm.species.speciesId === Species.ABRA)!;
       vi.spyOn(abra, "isAllowedInBattle").mockReturnValue(false);
 
       await runMysteryEncounterToEnd(game, 3);
 
-      const allowedPkm = party.filter((pkm) => pkm.isAllowedInBattle());
-      const notAllowedPkm = party.filter((pkm) => !pkm.isAllowedInBattle());
-      allowedPkm.forEach((pkm) =>
-        expect(pkm.hp, `${pkm.name} should have receivd 25% damage: ${pkm.hp} / ${pkm.getMaxHp()} HP`).toBe(pkm.getMaxHp() - Math.floor(pkm.getMaxHp() * 0.25))
+      const allowedPkm = party.filter(pkm => pkm.isAllowedInBattle());
+      const notAllowedPkm = party.filter(pkm => !pkm.isAllowedInBattle());
+      allowedPkm.forEach(pkm =>
+        expect(pkm.hp, `${pkm.name} should have receivd 25% damage: ${pkm.hp} / ${pkm.getMaxHp()} HP`).toBe(
+          pkm.getMaxHp() - Math.floor(pkm.getMaxHp() * 0.25),
+        ),
       );
 
-      notAllowedPkm.forEach((pkm) => expect(pkm.hp, `${pkm.name} should be full hp: ${pkm.hp} / ${pkm.getMaxHp()} HP`).toBe(pkm.getMaxHp()));
+      notAllowedPkm.forEach(pkm =>
+        expect(pkm.hp, `${pkm.name} should be full hp: ${pkm.hp} / ${pkm.getMaxHp()} HP`).toBe(pkm.getMaxHp()),
+      );
     });
 
     it("should leave encounter without battle", async () => {
diff --git a/src/test/mystery-encounter/encounters/mysterious-challengers-encounter.test.ts b/test/mystery-encounter/encounters/mysterious-challengers-encounter.test.ts
similarity index 73%
rename from src/test/mystery-encounter/encounters/mysterious-challengers-encounter.test.ts
rename to test/mystery-encounter/encounters/mysterious-challengers-encounter.test.ts
index 7729fa40599..2c61d03b29d 100644
--- a/src/test/mystery-encounter/encounters/mysterious-challengers-encounter.test.ts
+++ b/test/mystery-encounter/encounters/mysterious-challengers-encounter.test.ts
@@ -3,17 +3,22 @@ import { HUMAN_TRANSITABLE_BIOMES } from "#app/data/mystery-encounters/mystery-e
 import { Biome } from "#app/enums/biome";
 import { MysteryEncounterType } from "#app/enums/mystery-encounter-type";
 import { Species } from "#app/enums/species";
-import GameManager from "#app/test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
-import { runMysteryEncounterToEnd, skipBattleRunMysteryEncounterRewardsPhase } from "#test/mystery-encounter/encounter-test-utils";
+import {
+  runMysteryEncounterToEnd,
+  skipBattleRunMysteryEncounterRewardsPhase,
+} from "#test/mystery-encounter/encounter-test-utils";
 import type BattleScene from "#app/battle-scene";
-import { Mode } from "#app/ui/ui";
+import { UiMode } from "#enums/ui-mode";
 import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
 import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
-import { initSceneWithoutEncounterPhase } from "#test/utils/gameManagerUtils";
+import { initSceneWithoutEncounterPhase } from "#test/testUtils/gameManagerUtils";
 import { ModifierTier } from "#app/modifier/modifier-tier";
 import { MysteriousChallengersEncounter } from "#app/data/mystery-encounters/encounters/mysterious-challengers-encounter";
-import { TrainerConfig, TrainerPartyCompoundTemplate, TrainerPartyTemplate } from "#app/data/trainer-config";
+import { TrainerConfig } from "#app/data/trainers/trainer-config";
+import { TrainerPartyCompoundTemplate } from "#app/data/trainers/TrainerPartyTemplate";
+import { TrainerPartyTemplate } from "#app/data/trainers/TrainerPartyTemplate";
 import { PartyMemberStrength } from "#enums/party-member-strength";
 import { MysteryEncounterMode } from "#enums/mystery-encounter-mode";
 import ModifierSelectUiHandler from "#app/ui/modifier-select-ui-handler";
@@ -22,7 +27,7 @@ import { CommandPhase } from "#app/phases/command-phase";
 import { SelectModifierPhase } from "#app/phases/select-modifier-phase";
 
 const namespace = "mysteryEncounters/mysteriousChallengers";
-const defaultParty = [ Species.LAPRAS, Species.GENGAR, Species.ABRA ];
+const defaultParty = [Species.LAPRAS, Species.GENGAR, Species.ABRA];
 const defaultBiome = Biome.CAVE;
 const defaultWave = 45;
 
@@ -43,11 +48,9 @@ describe("Mysterious Challengers - Mystery Encounter", () => {
     game.override.startingBiome(defaultBiome);
     game.override.disableTrainerWaves();
 
-    const biomeMap = new Map<Biome, MysteryEncounterType[]>([
-      [ Biome.VOLCANO, [ MysteryEncounterType.FIGHT_OR_FLIGHT ]],
-    ]);
+    const biomeMap = new Map<Biome, MysteryEncounterType[]>([[Biome.VOLCANO, [MysteryEncounterType.FIGHT_OR_FLIGHT]]]);
     HUMAN_TRANSITABLE_BIOMES.forEach(biome => {
-      biomeMap.set(biome, [ MysteryEncounterType.MYSTERIOUS_CHALLENGERS ]);
+      biomeMap.set(biome, [MysteryEncounterType.MYSTERIOUS_CHALLENGERS]);
     });
     vi.spyOn(MysteryEncounters, "mysteryEncountersByBiome", "get").mockReturnValue(biomeMap);
   });
@@ -66,7 +69,9 @@ describe("Mysterious Challengers - Mystery Encounter", () => {
     expect(MysteriousChallengersEncounter.dialogue).toBeDefined();
     expect(MysteriousChallengersEncounter.dialogue.intro).toStrictEqual([{ text: `${namespace}:intro` }]);
     expect(MysteriousChallengersEncounter.dialogue.encounterOptionsDialogue?.title).toBe(`${namespace}:title`);
-    expect(MysteriousChallengersEncounter.dialogue.encounterOptionsDialogue?.description).toBe(`${namespace}:description`);
+    expect(MysteriousChallengersEncounter.dialogue.encounterOptionsDialogue?.description).toBe(
+      `${namespace}:description`,
+    );
     expect(MysteriousChallengersEncounter.dialogue.encounterOptionsDialogue?.query).toBe(`${namespace}:query`);
     expect(MysteriousChallengersEncounter.options.length).toBe(3);
   });
@@ -108,16 +113,20 @@ describe("Mysterious Challengers - Mystery Encounter", () => {
         trainerConfig: expect.any(TrainerConfig),
         levelAdditiveModifier: 1.5,
         female: expect.any(Boolean),
-      }
+      },
     ]);
-    expect(encounter.enemyPartyConfigs[1].trainerConfig?.partyTemplates[0]).toEqual(new TrainerPartyCompoundTemplate(
-      new TrainerPartyTemplate(1, PartyMemberStrength.STRONGER, false, true),
-      new TrainerPartyTemplate(3, PartyMemberStrength.AVERAGE, false, true)
-    ));
-    expect(encounter.enemyPartyConfigs[2].trainerConfig?.partyTemplates[0]).toEqual(new TrainerPartyCompoundTemplate(
-      new TrainerPartyTemplate(2, PartyMemberStrength.AVERAGE),
-      new TrainerPartyTemplate(3, PartyMemberStrength.STRONG),
-      new TrainerPartyTemplate(1, PartyMemberStrength.STRONGER))
+    expect(encounter.enemyPartyConfigs[1].trainerConfig?.partyTemplates[0]).toEqual(
+      new TrainerPartyCompoundTemplate(
+        new TrainerPartyTemplate(1, PartyMemberStrength.STRONGER, false, true),
+        new TrainerPartyTemplate(3, PartyMemberStrength.AVERAGE, false, true),
+      ),
+    );
+    expect(encounter.enemyPartyConfigs[2].trainerConfig?.partyTemplates[0]).toEqual(
+      new TrainerPartyCompoundTemplate(
+        new TrainerPartyTemplate(2, PartyMemberStrength.AVERAGE),
+        new TrainerPartyTemplate(3, PartyMemberStrength.STRONG),
+        new TrainerPartyTemplate(1, PartyMemberStrength.STRONGER),
+      ),
     );
     expect(encounter.spriteConfigs).toBeDefined();
     expect(encounter.spriteConfigs.length).toBe(3);
@@ -157,8 +166,10 @@ describe("Mysterious Challengers - Mystery Encounter", () => {
       expect(scene.getCurrentPhase()?.constructor.name).toBe(SelectModifierPhase.name);
       await game.phaseInterceptor.run(SelectModifierPhase);
 
-      expect(scene.ui.getMode()).to.equal(Mode.MODIFIER_SELECT);
-      const modifierSelectHandler = scene.ui.handlers.find(h => h instanceof ModifierSelectUiHandler) as ModifierSelectUiHandler;
+      expect(scene.ui.getMode()).to.equal(UiMode.MODIFIER_SELECT);
+      const modifierSelectHandler = scene.ui.handlers.find(
+        h => h instanceof ModifierSelectUiHandler,
+      ) as ModifierSelectUiHandler;
       expect(modifierSelectHandler.options.length).toEqual(3);
       expect(modifierSelectHandler.options[0].modifierTypeOption.type.id).toContain("TM_COMMON");
       expect(modifierSelectHandler.options[1].modifierTypeOption.type.id).toContain("TM_GREAT");
@@ -199,13 +210,27 @@ describe("Mysterious Challengers - Mystery Encounter", () => {
       expect(scene.getCurrentPhase()?.constructor.name).toBe(SelectModifierPhase.name);
       await game.phaseInterceptor.run(SelectModifierPhase);
 
-      expect(scene.ui.getMode()).to.equal(Mode.MODIFIER_SELECT);
-      const modifierSelectHandler = scene.ui.handlers.find(h => h instanceof ModifierSelectUiHandler) as ModifierSelectUiHandler;
+      expect(scene.ui.getMode()).to.equal(UiMode.MODIFIER_SELECT);
+      const modifierSelectHandler = scene.ui.handlers.find(
+        h => h instanceof ModifierSelectUiHandler,
+      ) as ModifierSelectUiHandler;
       expect(modifierSelectHandler.options.length).toEqual(4);
-      expect(modifierSelectHandler.options[0].modifierTypeOption.type.tier - modifierSelectHandler.options[0].modifierTypeOption.upgradeCount).toBe(ModifierTier.ULTRA);
-      expect(modifierSelectHandler.options[1].modifierTypeOption.type.tier - modifierSelectHandler.options[1].modifierTypeOption.upgradeCount).toBe(ModifierTier.ULTRA);
-      expect(modifierSelectHandler.options[2].modifierTypeOption.type.tier - modifierSelectHandler.options[2].modifierTypeOption.upgradeCount).toBe(ModifierTier.GREAT);
-      expect(modifierSelectHandler.options[3].modifierTypeOption.type.tier - modifierSelectHandler.options[3].modifierTypeOption.upgradeCount).toBe(ModifierTier.GREAT);
+      expect(
+        modifierSelectHandler.options[0].modifierTypeOption.type.tier -
+          modifierSelectHandler.options[0].modifierTypeOption.upgradeCount,
+      ).toBe(ModifierTier.ULTRA);
+      expect(
+        modifierSelectHandler.options[1].modifierTypeOption.type.tier -
+          modifierSelectHandler.options[1].modifierTypeOption.upgradeCount,
+      ).toBe(ModifierTier.ULTRA);
+      expect(
+        modifierSelectHandler.options[2].modifierTypeOption.type.tier -
+          modifierSelectHandler.options[2].modifierTypeOption.upgradeCount,
+      ).toBe(ModifierTier.GREAT);
+      expect(
+        modifierSelectHandler.options[3].modifierTypeOption.type.tier -
+          modifierSelectHandler.options[3].modifierTypeOption.upgradeCount,
+      ).toBe(ModifierTier.GREAT);
     });
   });
 
@@ -242,13 +267,27 @@ describe("Mysterious Challengers - Mystery Encounter", () => {
       expect(scene.getCurrentPhase()?.constructor.name).toBe(SelectModifierPhase.name);
       await game.phaseInterceptor.run(SelectModifierPhase);
 
-      expect(scene.ui.getMode()).to.equal(Mode.MODIFIER_SELECT);
-      const modifierSelectHandler = scene.ui.handlers.find(h => h instanceof ModifierSelectUiHandler) as ModifierSelectUiHandler;
+      expect(scene.ui.getMode()).to.equal(UiMode.MODIFIER_SELECT);
+      const modifierSelectHandler = scene.ui.handlers.find(
+        h => h instanceof ModifierSelectUiHandler,
+      ) as ModifierSelectUiHandler;
       expect(modifierSelectHandler.options.length).toEqual(4);
-      expect(modifierSelectHandler.options[0].modifierTypeOption.type.tier - modifierSelectHandler.options[0].modifierTypeOption.upgradeCount).toBe(ModifierTier.ROGUE);
-      expect(modifierSelectHandler.options[1].modifierTypeOption.type.tier - modifierSelectHandler.options[1].modifierTypeOption.upgradeCount).toBe(ModifierTier.ROGUE);
-      expect(modifierSelectHandler.options[2].modifierTypeOption.type.tier - modifierSelectHandler.options[2].modifierTypeOption.upgradeCount).toBe(ModifierTier.ULTRA);
-      expect(modifierSelectHandler.options[3].modifierTypeOption.type.tier - modifierSelectHandler.options[3].modifierTypeOption.upgradeCount).toBe(ModifierTier.GREAT);
+      expect(
+        modifierSelectHandler.options[0].modifierTypeOption.type.tier -
+          modifierSelectHandler.options[0].modifierTypeOption.upgradeCount,
+      ).toBe(ModifierTier.ROGUE);
+      expect(
+        modifierSelectHandler.options[1].modifierTypeOption.type.tier -
+          modifierSelectHandler.options[1].modifierTypeOption.upgradeCount,
+      ).toBe(ModifierTier.ROGUE);
+      expect(
+        modifierSelectHandler.options[2].modifierTypeOption.type.tier -
+          modifierSelectHandler.options[2].modifierTypeOption.upgradeCount,
+      ).toBe(ModifierTier.ULTRA);
+      expect(
+        modifierSelectHandler.options[3].modifierTypeOption.type.tier -
+          modifierSelectHandler.options[3].modifierTypeOption.upgradeCount,
+      ).toBe(ModifierTier.GREAT);
     });
   });
 });
diff --git a/src/test/mystery-encounter/encounters/part-timer-encounter.test.ts b/test/mystery-encounter/encounters/part-timer-encounter.test.ts
similarity index 92%
rename from src/test/mystery-encounter/encounters/part-timer-encounter.test.ts
rename to test/mystery-encounter/encounters/part-timer-encounter.test.ts
index e8f2af0de5f..639a2e140ff 100644
--- a/src/test/mystery-encounter/encounters/part-timer-encounter.test.ts
+++ b/test/mystery-encounter/encounters/part-timer-encounter.test.ts
@@ -2,10 +2,13 @@ import * as MysteryEncounters from "#app/data/mystery-encounters/mystery-encount
 import { Biome } from "#app/enums/biome";
 import { MysteryEncounterType } from "#app/enums/mystery-encounter-type";
 import { Species } from "#app/enums/species";
-import GameManager from "#app/test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 import * as EncounterPhaseUtils from "#app/data/mystery-encounters/utils/encounter-phase-utils";
-import { runMysteryEncounterToEnd, runSelectMysteryEncounterOption } from "#test/mystery-encounter/encounter-test-utils";
+import {
+  runMysteryEncounterToEnd,
+  runSelectMysteryEncounterOption,
+} from "#test/mystery-encounter/encounter-test-utils";
 import type BattleScene from "#app/battle-scene";
 import { CIVILIZATION_ENCOUNTER_BIOMES } from "#app/data/mystery-encounters/mystery-encounters";
 import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
@@ -17,7 +20,7 @@ import { MysteryEncounterPhase } from "#app/phases/mystery-encounter-phases";
 
 const namespace = "mysteryEncounters/partTimer";
 // Pyukumuku for lowest speed, Regieleki for highest speed, Feebas for lowest "bulk", Melmetal for highest "bulk"
-const defaultParty = [ Species.PYUKUMUKU, Species.REGIELEKI, Species.FEEBAS, Species.MELMETAL ];
+const defaultParty = [Species.PYUKUMUKU, Species.REGIELEKI, Species.FEEBAS, Species.MELMETAL];
 const defaultBiome = Biome.PLAINS;
 const defaultWave = 37;
 
@@ -39,10 +42,10 @@ describe("Part-Timer - Mystery Encounter", () => {
     game.override.disableTrainerWaves();
 
     const biomeMap = new Map<Biome, MysteryEncounterType[]>([
-      [ Biome.VOLCANO, [ MysteryEncounterType.MYSTERIOUS_CHALLENGERS ]],
+      [Biome.VOLCANO, [MysteryEncounterType.MYSTERIOUS_CHALLENGERS]],
     ]);
     CIVILIZATION_ENCOUNTER_BIOMES.forEach(biome => {
-      biomeMap.set(biome, [ MysteryEncounterType.PART_TIMER ]);
+      biomeMap.set(biome, [MysteryEncounterType.PART_TIMER]);
     });
     vi.spyOn(MysteryEncounters, "mysteryEncountersByBiome", "get").mockReturnValue(biomeMap);
   });
@@ -64,7 +67,7 @@ describe("Part-Timer - Mystery Encounter", () => {
       {
         speaker: `${namespace}:speaker`,
         text: `${namespace}:intro_dialogue`,
-      }
+      },
     ]);
     expect(PartTimerEncounter.dialogue.encounterOptionsDialogue?.title).toBe(`${namespace}:title`);
     expect(PartTimerEncounter.dialogue.encounterOptionsDialogue?.description).toBe(`${namespace}:description`);
@@ -90,9 +93,9 @@ describe("Part-Timer - Mystery Encounter", () => {
         buttonTooltip: `${namespace}:option.1.tooltip`,
         selected: [
           {
-            text: `${namespace}:option.1.selected`
-          }
-        ]
+            text: `${namespace}:option.1.selected`,
+          },
+        ],
       });
     });
 
@@ -122,7 +125,7 @@ describe("Part-Timer - Mystery Encounter", () => {
       // Override party levels to 50 so stats can be fully reflective
       scene.getPlayerParty().forEach(p => {
         p.level = 50;
-        p.ivs = [ 20, 20, 20, 20, 20, 20 ];
+        p.ivs = [20, 20, 20, 20, 20, 20];
         p.calculateStats();
       });
       await runMysteryEncounterToEnd(game, 1, { pokemonNo: 2 });
@@ -155,9 +158,9 @@ describe("Part-Timer - Mystery Encounter", () => {
         buttonTooltip: `${namespace}:option.2.tooltip`,
         selected: [
           {
-            text: `${namespace}:option.2.selected`
-          }
-        ]
+            text: `${namespace}:option.2.selected`,
+          },
+        ],
       });
     });
 
@@ -187,7 +190,7 @@ describe("Part-Timer - Mystery Encounter", () => {
       // Override party levels to 50 so stats can be fully reflective
       scene.getPlayerParty().forEach(p => {
         p.level = 50;
-        p.ivs = [ 20, 20, 20, 20, 20, 20 ];
+        p.ivs = [20, 20, 20, 20, 20, 20];
         p.calculateStats();
       });
       await runMysteryEncounterToEnd(game, 2, { pokemonNo: 4 });
@@ -221,9 +224,9 @@ describe("Part-Timer - Mystery Encounter", () => {
         disabledButtonTooltip: `${namespace}:option.3.disabled_tooltip`,
         selected: [
           {
-            text: `${namespace}:option.3.selected`
-          }
-        ]
+            text: `${namespace}:option.3.selected`,
+          },
+        ],
       });
     });
 
@@ -232,7 +235,7 @@ describe("Part-Timer - Mystery Encounter", () => {
 
       await game.runToMysteryEncounter(MysteryEncounterType.PART_TIMER, defaultParty);
       // Mock movesets
-      scene.getPlayerParty().forEach(p => p.moveset = []);
+      scene.getPlayerParty().forEach(p => (p.moveset = []));
       await game.phaseInterceptor.to(MysteryEncounterPhase, false);
 
       const encounterPhase = scene.getCurrentPhase();
@@ -256,7 +259,7 @@ describe("Part-Timer - Mystery Encounter", () => {
 
       await game.runToMysteryEncounter(MysteryEncounterType.PART_TIMER, defaultParty);
       // Mock moveset
-      scene.getPlayerParty()[0].moveset = [ new PokemonMove(Moves.ATTRACT) ];
+      scene.getPlayerParty()[0].moveset = [new PokemonMove(Moves.ATTRACT)];
       await runMysteryEncounterToEnd(game, 3);
 
       expect(EncounterPhaseUtils.updatePlayerMoney).toHaveBeenCalledWith(scene.getWaveMoneyAmount(2.5), true, false);
diff --git a/src/test/mystery-encounter/encounters/safari-zone.test.ts b/test/mystery-encounter/encounters/safari-zone.test.ts
similarity index 89%
rename from src/test/mystery-encounter/encounters/safari-zone.test.ts
rename to test/mystery-encounter/encounters/safari-zone.test.ts
index a807805b81c..3506020aae4 100644
--- a/src/test/mystery-encounter/encounters/safari-zone.test.ts
+++ b/test/mystery-encounter/encounters/safari-zone.test.ts
@@ -2,21 +2,27 @@ import * as MysteryEncounters from "#app/data/mystery-encounters/mystery-encount
 import { Biome } from "#enums/biome";
 import { MysteryEncounterType } from "#enums/mystery-encounter-type";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
-import { runMysteryEncounterToEnd, runSelectMysteryEncounterOption } from "#test/mystery-encounter/encounter-test-utils";
+import {
+  runMysteryEncounterToEnd,
+  runSelectMysteryEncounterOption,
+} from "#test/mystery-encounter/encounter-test-utils";
 import type BattleScene from "#app/battle-scene";
 import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
 import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
-import { initSceneWithoutEncounterPhase } from "#test/utils/gameManagerUtils";
+import { initSceneWithoutEncounterPhase } from "#test/testUtils/gameManagerUtils";
 import MysteryEncounter from "#app/data/mystery-encounters/mystery-encounter";
 import { MysteryEncounterPhase } from "#app/phases/mystery-encounter-phases";
-import { getSafariSpeciesSpawn, SafariZoneEncounter } from "#app/data/mystery-encounters/encounters/safari-zone-encounter";
+import {
+  getSafariSpeciesSpawn,
+  SafariZoneEncounter,
+} from "#app/data/mystery-encounters/encounters/safari-zone-encounter";
 import * as EncounterPhaseUtils from "#app/data/mystery-encounters/utils/encounter-phase-utils";
 import { NON_LEGEND_PARADOX_POKEMON } from "#app/data/balance/special-species-groups";
 
 const namespace = "mysteryEncounters/safariZone";
-const defaultParty = [ Species.LAPRAS, Species.GENGAR, Species.ABRA ];
+const defaultParty = [Species.LAPRAS, Species.GENGAR, Species.ABRA];
 const defaultBiome = Biome.SWAMP;
 const defaultWave = 45;
 
@@ -38,10 +44,10 @@ describe("Safari Zone - Mystery Encounter", () => {
     game.override.disableTrainerWaves();
 
     const biomeMap = new Map<Biome, MysteryEncounterType[]>([
-      [ Biome.VOLCANO, [ MysteryEncounterType.FIGHT_OR_FLIGHT ]],
-      [ Biome.FOREST, [ MysteryEncounterType.SAFARI_ZONE ]],
-      [ Biome.SWAMP, [ MysteryEncounterType.SAFARI_ZONE ]],
-      [ Biome.JUNGLE, [ MysteryEncounterType.SAFARI_ZONE ]],
+      [Biome.VOLCANO, [MysteryEncounterType.FIGHT_OR_FLIGHT]],
+      [Biome.FOREST, [MysteryEncounterType.SAFARI_ZONE]],
+      [Biome.SWAMP, [MysteryEncounterType.SAFARI_ZONE]],
+      [Biome.JUNGLE, [MysteryEncounterType.SAFARI_ZONE]],
     ]);
     vi.spyOn(MysteryEncounters, "mysteryEncountersByBiome", "get").mockReturnValue(biomeMap);
   });
@@ -58,9 +64,7 @@ describe("Safari Zone - Mystery Encounter", () => {
     expect(SafariZoneEncounter.encounterType).toBe(MysteryEncounterType.SAFARI_ZONE);
     expect(SafariZoneEncounter.encounterTier).toBe(MysteryEncounterTier.GREAT);
     expect(SafariZoneEncounter.dialogue).toBeDefined();
-    expect(SafariZoneEncounter.dialogue.intro).toStrictEqual([
-      { text: `${namespace}:intro` },
-    ]);
+    expect(SafariZoneEncounter.dialogue.intro).toStrictEqual([{ text: `${namespace}:intro` }]);
     expect(SafariZoneEncounter.dialogue.encounterOptionsDialogue?.title).toBe(`${namespace}:title`);
     expect(SafariZoneEncounter.dialogue.encounterOptionsDialogue?.description).toBe(`${namespace}:description`);
     expect(SafariZoneEncounter.dialogue.encounterOptionsDialogue?.query).toBe(`${namespace}:query`);
diff --git a/src/test/mystery-encounter/encounters/teleporting-hijinks-encounter.test.ts b/test/mystery-encounter/encounters/teleporting-hijinks-encounter.test.ts
similarity index 86%
rename from src/test/mystery-encounter/encounters/teleporting-hijinks-encounter.test.ts
rename to test/mystery-encounter/encounters/teleporting-hijinks-encounter.test.ts
index a00cca5083c..4ff94c5a9bd 100644
--- a/src/test/mystery-encounter/encounters/teleporting-hijinks-encounter.test.ts
+++ b/test/mystery-encounter/encounters/teleporting-hijinks-encounter.test.ts
@@ -8,22 +8,26 @@ import { Species } from "#enums/species";
 import { CommandPhase } from "#app/phases/command-phase";
 import { MysteryEncounterPhase } from "#app/phases/mystery-encounter-phases";
 import { SelectModifierPhase } from "#app/phases/select-modifier-phase";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import ModifierSelectUiHandler from "#app/ui/modifier-select-ui-handler";
-import { Mode } from "#app/ui/ui";
+import { UiMode } from "#enums/ui-mode";
 import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
 import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
-import { runMysteryEncounterToEnd, runSelectMysteryEncounterOption, skipBattleRunMysteryEncounterRewardsPhase } from "#test/mystery-encounter/encounter-test-utils";
-import { initSceneWithoutEncounterPhase } from "#test/utils/gameManagerUtils";
+import {
+  runMysteryEncounterToEnd,
+  runSelectMysteryEncounterOption,
+  skipBattleRunMysteryEncounterRewardsPhase,
+} from "#test/mystery-encounter/encounter-test-utils";
+import { initSceneWithoutEncounterPhase } from "#test/testUtils/gameManagerUtils";
 import i18next from "i18next";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
 const namespace = "mysteryEncounters/teleportingHijinks";
-const defaultParty = [ Species.LAPRAS, Species.GENGAR, Species.ABRA ];
+const defaultParty = [Species.LAPRAS, Species.GENGAR, Species.ABRA];
 const defaultBiome = Biome.CAVE;
 const defaultWave = 45;
 
-const TRANSPORT_BIOMES = [ Biome.SPACE, Biome.ISLAND, Biome.LABORATORY, Biome.FAIRY_CAVE, Biome.WASTELAND, Biome.DOJO ];
+const TRANSPORT_BIOMES = [Biome.SPACE, Biome.ISLAND, Biome.LABORATORY, Biome.FAIRY_CAVE, Biome.WASTELAND, Biome.DOJO];
 
 describe("Teleporting Hijinks - Mystery Encounter", () => {
   let phaserGame: Phaser.Game;
@@ -47,9 +51,7 @@ describe("Teleporting Hijinks - Mystery Encounter", () => {
       .enemyPassiveAbility(Abilities.BALL_FETCH);
 
     vi.spyOn(MysteryEncounters, "mysteryEncountersByBiome", "get").mockReturnValue(
-      new Map<Biome, MysteryEncounterType[]>([
-        [ Biome.CAVE, [ MysteryEncounterType.TELEPORTING_HIJINKS ]],
-      ])
+      new Map<Biome, MysteryEncounterType[]>([[Biome.CAVE, [MysteryEncounterType.TELEPORTING_HIJINKS]]]),
     );
   });
 
@@ -181,7 +183,7 @@ describe("Teleporting Hijinks - Mystery Encounter", () => {
       await game.runToMysteryEncounter(MysteryEncounterType.TELEPORTING_HIJINKS, defaultParty);
       await runMysteryEncounterToEnd(game, 1, undefined, true);
       const enemyField = scene.getEnemyField();
-      expect(enemyField[0].summonData.statStages).toEqual([ 0, 1, 0, 1, 1, 0, 0 ]);
+      expect(enemyField[0].summonData.statStages).toEqual([0, 1, 0, 1, 1, 0, 0]);
       expect(enemyField[0].isBoss()).toBe(true);
     });
 
@@ -190,7 +192,7 @@ describe("Teleporting Hijinks - Mystery Encounter", () => {
       await game.runToMysteryEncounter(MysteryEncounterType.TELEPORTING_HIJINKS, defaultParty);
       await runMysteryEncounterToEnd(game, 1, undefined, true);
       const enemyField = scene.getEnemyField();
-      expect(enemyField[0].summonData.statStages).toEqual([ 1, 1, 1, 1, 1, 0, 0 ]);
+      expect(enemyField[0].summonData.statStages).toEqual([1, 1, 1, 1, 1, 0, 0]);
       expect(enemyField[0].isBoss()).toBe(true);
     });
   });
@@ -207,13 +209,13 @@ describe("Teleporting Hijinks - Mystery Encounter", () => {
         selected: [
           {
             text: `${namespace}:option.2.selected`,
-          }
+          },
         ],
       });
     });
 
     it("should NOT be selectable if the player doesn't the right type pokemon", async () => {
-      await game.runToMysteryEncounter(MysteryEncounterType.TELEPORTING_HIJINKS, [ Species.BLASTOISE ]);
+      await game.runToMysteryEncounter(MysteryEncounterType.TELEPORTING_HIJINKS, [Species.BLASTOISE]);
       await game.phaseInterceptor.to(MysteryEncounterPhase, false);
 
       const encounterPhase = scene.getCurrentPhase();
@@ -232,14 +234,14 @@ describe("Teleporting Hijinks - Mystery Encounter", () => {
     });
 
     it("should be selectable if the player has the right type pokemon", async () => {
-      await game.runToMysteryEncounter(MysteryEncounterType.TELEPORTING_HIJINKS, [ Species.METAGROSS ]);
+      await game.runToMysteryEncounter(MysteryEncounterType.TELEPORTING_HIJINKS, [Species.METAGROSS]);
       await runMysteryEncounterToEnd(game, 2, undefined, true);
 
       expect(scene.getCurrentPhase()?.constructor.name).toBe(CommandPhase.name);
     });
 
     it("should transport to a new area", async () => {
-      await game.runToMysteryEncounter(MysteryEncounterType.TELEPORTING_HIJINKS, [ Species.PIKACHU ]);
+      await game.runToMysteryEncounter(MysteryEncounterType.TELEPORTING_HIJINKS, [Species.PIKACHU]);
 
       const previousBiome = scene.arena.biomeType;
 
@@ -250,19 +252,19 @@ describe("Teleporting Hijinks - Mystery Encounter", () => {
     });
 
     it("should start a battle against an enraged boss below wave 50", async () => {
-      await game.runToMysteryEncounter(MysteryEncounterType.TELEPORTING_HIJINKS, [ Species.PIKACHU ]);
+      await game.runToMysteryEncounter(MysteryEncounterType.TELEPORTING_HIJINKS, [Species.PIKACHU]);
       await runMysteryEncounterToEnd(game, 2, undefined, true);
       const enemyField = scene.getEnemyField();
-      expect(enemyField[0].summonData.statStages).toEqual([ 0, 1, 0, 1, 1, 0, 0 ]);
+      expect(enemyField[0].summonData.statStages).toEqual([0, 1, 0, 1, 1, 0, 0]);
       expect(enemyField[0].isBoss()).toBe(true);
     });
 
     it("should start a battle against an extra enraged boss above wave 50", { retry: 5 }, async () => {
       game.override.startingWave(56);
-      await game.runToMysteryEncounter(MysteryEncounterType.TELEPORTING_HIJINKS, [ Species.PIKACHU ]);
+      await game.runToMysteryEncounter(MysteryEncounterType.TELEPORTING_HIJINKS, [Species.PIKACHU]);
       await runMysteryEncounterToEnd(game, 2, undefined, true);
       const enemyField = scene.getEnemyField();
-      expect(enemyField[0].summonData.statStages).toEqual([ 1, 1, 1, 1, 1, 0, 0 ]);
+      expect(enemyField[0].summonData.statStages).toEqual([1, 1, 1, 1, 1, 0, 0]);
       expect(enemyField[0].isBoss()).toBe(true);
     });
   });
@@ -287,7 +289,7 @@ describe("Teleporting Hijinks - Mystery Encounter", () => {
       await game.runToMysteryEncounter(MysteryEncounterType.TELEPORTING_HIJINKS, defaultParty);
       await runMysteryEncounterToEnd(game, 3, undefined, true);
       const enemyField = scene.getEnemyField();
-      expect(enemyField[0].summonData.statStages).toEqual([ 0, 0, 0, 0, 0, 0, 0 ]);
+      expect(enemyField[0].summonData.statStages).toEqual([0, 0, 0, 0, 0, 0, 0]);
       expect(enemyField[0].isBoss()).toBe(true);
     });
 
@@ -299,10 +301,20 @@ describe("Teleporting Hijinks - Mystery Encounter", () => {
       expect(scene.getCurrentPhase()?.constructor.name).toBe(SelectModifierPhase.name);
       await game.phaseInterceptor.run(SelectModifierPhase);
 
-      expect(scene.ui.getMode()).to.equal(Mode.MODIFIER_SELECT);
-      const modifierSelectHandler = scene.ui.handlers.find(h => h instanceof ModifierSelectUiHandler) as ModifierSelectUiHandler;
-      expect(modifierSelectHandler.options.some(opt => opt.modifierTypeOption.type.name === i18next.t("modifierType:AttackTypeBoosterItem.metal_coat"))).toBe(true);
-      expect(modifierSelectHandler.options.some(opt => opt.modifierTypeOption.type.name === i18next.t("modifierType:AttackTypeBoosterItem.magnet"))).toBe(true);
+      expect(scene.ui.getMode()).to.equal(UiMode.MODIFIER_SELECT);
+      const modifierSelectHandler = scene.ui.handlers.find(
+        h => h instanceof ModifierSelectUiHandler,
+      ) as ModifierSelectUiHandler;
+      expect(
+        modifierSelectHandler.options.some(
+          opt => opt.modifierTypeOption.type.name === i18next.t("modifierType:AttackTypeBoosterItem.metal_coat"),
+        ),
+      ).toBe(true);
+      expect(
+        modifierSelectHandler.options.some(
+          opt => opt.modifierTypeOption.type.name === i18next.t("modifierType:AttackTypeBoosterItem.magnet"),
+        ),
+      ).toBe(true);
     });
   });
 });
diff --git a/src/test/mystery-encounter/encounters/the-expert-breeder-encounter.test.ts b/test/mystery-encounter/encounters/the-expert-breeder-encounter.test.ts
similarity index 90%
rename from src/test/mystery-encounter/encounters/the-expert-breeder-encounter.test.ts
rename to test/mystery-encounter/encounters/the-expert-breeder-encounter.test.ts
index e6f8127b776..9160126ffc3 100644
--- a/src/test/mystery-encounter/encounters/the-expert-breeder-encounter.test.ts
+++ b/test/mystery-encounter/encounters/the-expert-breeder-encounter.test.ts
@@ -3,13 +3,16 @@ import { HUMAN_TRANSITABLE_BIOMES } from "#app/data/mystery-encounters/mystery-e
 import { Biome } from "#app/enums/biome";
 import { MysteryEncounterType } from "#app/enums/mystery-encounter-type";
 import { Species } from "#app/enums/species";
-import GameManager from "#app/test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
-import { runMysteryEncounterToEnd, skipBattleRunMysteryEncounterRewardsPhase } from "#test/mystery-encounter/encounter-test-utils";
+import {
+  runMysteryEncounterToEnd,
+  skipBattleRunMysteryEncounterRewardsPhase,
+} from "#test/mystery-encounter/encounter-test-utils";
 import type BattleScene from "#app/battle-scene";
 import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
 import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
-import { initSceneWithoutEncounterPhase } from "#test/utils/gameManagerUtils";
+import { initSceneWithoutEncounterPhase } from "#test/testUtils/gameManagerUtils";
 import { MysteryEncounterMode } from "#enums/mystery-encounter-mode";
 import MysteryEncounter from "#app/data/mystery-encounters/mystery-encounter";
 import { CommandPhase } from "#app/phases/command-phase";
@@ -21,7 +24,7 @@ import { PostMysteryEncounterPhase } from "#app/phases/mystery-encounter-phases"
 import { FRIENDSHIP_GAIN_FROM_BATTLE } from "#app/data/balance/starters";
 
 const namespace = "mysteryEncounters/theExpertPokemonBreeder";
-const defaultParty = [ Species.LAPRAS, Species.GENGAR, Species.ABRA ];
+const defaultParty = [Species.LAPRAS, Species.GENGAR, Species.ABRA];
 const defaultBiome = Biome.CAVE;
 const defaultWave = 45;
 
@@ -42,11 +45,9 @@ describe("The Expert Pokémon Breeder - Mystery Encounter", () => {
     game.override.startingBiome(defaultBiome);
     game.override.disableTrainerWaves();
 
-    const biomeMap = new Map<Biome, MysteryEncounterType[]>([
-      [ Biome.VOLCANO, [ MysteryEncounterType.FIGHT_OR_FLIGHT ]],
-    ]);
+    const biomeMap = new Map<Biome, MysteryEncounterType[]>([[Biome.VOLCANO, [MysteryEncounterType.FIGHT_OR_FLIGHT]]]);
     HUMAN_TRANSITABLE_BIOMES.forEach(biome => {
-      biomeMap.set(biome, [ MysteryEncounterType.THE_EXPERT_POKEMON_BREEDER ]);
+      biomeMap.set(biome, [MysteryEncounterType.THE_EXPERT_POKEMON_BREEDER]);
     });
     vi.spyOn(MysteryEncounters, "mysteryEncountersByBiome", "get").mockReturnValue(biomeMap);
   });
@@ -65,15 +66,17 @@ describe("The Expert Pokémon Breeder - Mystery Encounter", () => {
     expect(TheExpertPokemonBreederEncounter.dialogue).toBeDefined();
     expect(TheExpertPokemonBreederEncounter.dialogue.intro).toStrictEqual([
       {
-        text: `${namespace}:intro`
+        text: `${namespace}:intro`,
       },
       {
         speaker: "trainerNames:expert_pokemon_breeder",
-        text: `${namespace}:intro_dialogue`
+        text: `${namespace}:intro_dialogue`,
       },
     ]);
     expect(TheExpertPokemonBreederEncounter.dialogue.encounterOptionsDialogue?.title).toBe(`${namespace}:title`);
-    expect(TheExpertPokemonBreederEncounter.dialogue.encounterOptionsDialogue?.description).toBe(`${namespace}:description`);
+    expect(TheExpertPokemonBreederEncounter.dialogue.encounterOptionsDialogue?.description).toBe(
+      `${namespace}:description`,
+    );
     expect(TheExpertPokemonBreederEncounter.dialogue.encounterOptionsDialogue?.query).toBe(`${namespace}:query`);
     expect(TheExpertPokemonBreederEncounter.options.length).toBe(3);
   });
@@ -83,7 +86,9 @@ describe("The Expert Pokémon Breeder - Mystery Encounter", () => {
     game.override.startingBiome(Biome.VOLCANO);
     await game.runToMysteryEncounter();
 
-    expect(scene.currentBattle?.mysteryEncounter?.encounterType).not.toBe(MysteryEncounterType.THE_EXPERT_POKEMON_BREEDER);
+    expect(scene.currentBattle?.mysteryEncounter?.encounterType).not.toBe(
+      MysteryEncounterType.THE_EXPERT_POKEMON_BREEDER,
+    );
   });
 
   it("should initialize fully", async () => {
@@ -133,12 +138,15 @@ describe("The Expert Pokémon Breeder - Mystery Encounter", () => {
         const ace = scene.currentBattle?.enemyParty[0];
         if (ace) {
           // Pretend that loading assets takes an extra 500ms
-          vi.spyOn(ace, "loadAssets").mockImplementation(() => new Promise(resolve => {
-            setTimeout(() => {
-              successfullyLoaded = true;
-              resolve();
-            }, 500);
-          }));
+          vi.spyOn(ace, "loadAssets").mockImplementation(
+            () =>
+              new Promise(resolve => {
+                setTimeout(() => {
+                  successfullyLoaded = true;
+                  resolve();
+                }, 500);
+              }),
+          );
         }
 
         return scene.currentBattle?.enemyParty ?? [];
@@ -215,12 +223,15 @@ describe("The Expert Pokémon Breeder - Mystery Encounter", () => {
         const ace = scene.currentBattle?.enemyParty[0];
         if (ace) {
           // Pretend that loading assets takes an extra 500ms
-          vi.spyOn(ace, "loadAssets").mockImplementation(() => new Promise(resolve => {
-            setTimeout(() => {
-              successfullyLoaded = true;
-              resolve();
-            }, 500);
-          }));
+          vi.spyOn(ace, "loadAssets").mockImplementation(
+            () =>
+              new Promise(resolve => {
+                setTimeout(() => {
+                  successfullyLoaded = true;
+                  resolve();
+                }, 500);
+              }),
+          );
         }
 
         return scene.currentBattle?.enemyParty ?? [];
@@ -294,12 +305,15 @@ describe("The Expert Pokémon Breeder - Mystery Encounter", () => {
         const ace = scene.currentBattle?.enemyParty[0];
         if (ace) {
           // Pretend that loading assets takes an extra 500ms
-          vi.spyOn(ace, "loadAssets").mockImplementation(() => new Promise(resolve => {
-            setTimeout(() => {
-              successfullyLoaded = true;
-              resolve();
-            }, 500);
-          }));
+          vi.spyOn(ace, "loadAssets").mockImplementation(
+            () =>
+              new Promise(resolve => {
+                setTimeout(() => {
+                  successfullyLoaded = true;
+                  resolve();
+                }, 500);
+              }),
+          );
         }
 
         return scene.currentBattle?.enemyParty ?? [];
diff --git a/src/test/mystery-encounter/encounters/the-pokemon-salesman-encounter.test.ts b/test/mystery-encounter/encounters/the-pokemon-salesman-encounter.test.ts
similarity index 93%
rename from src/test/mystery-encounter/encounters/the-pokemon-salesman-encounter.test.ts
rename to test/mystery-encounter/encounters/the-pokemon-salesman-encounter.test.ts
index 4fd96f8d5bc..4adb8c6b076 100644
--- a/src/test/mystery-encounter/encounters/the-pokemon-salesman-encounter.test.ts
+++ b/test/mystery-encounter/encounters/the-pokemon-salesman-encounter.test.ts
@@ -2,22 +2,28 @@ import * as MysteryEncounters from "#app/data/mystery-encounters/mystery-encount
 import { Biome } from "#app/enums/biome";
 import { MysteryEncounterType } from "#app/enums/mystery-encounter-type";
 import { Species } from "#app/enums/species";
-import GameManager from "#app/test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 import * as EncounterPhaseUtils from "#app/data/mystery-encounters/utils/encounter-phase-utils";
-import { runMysteryEncounterToEnd, runSelectMysteryEncounterOption } from "#test/mystery-encounter/encounter-test-utils";
+import {
+  runMysteryEncounterToEnd,
+  runSelectMysteryEncounterOption,
+} from "#test/mystery-encounter/encounter-test-utils";
 import type BattleScene from "#app/battle-scene";
 import { PlayerPokemon } from "#app/field/pokemon";
 import { HUMAN_TRANSITABLE_BIOMES } from "#app/data/mystery-encounters/mystery-encounters";
-import { getSalesmanSpeciesOffer, ThePokemonSalesmanEncounter } from "#app/data/mystery-encounters/encounters/the-pokemon-salesman-encounter";
+import {
+  getSalesmanSpeciesOffer,
+  ThePokemonSalesmanEncounter,
+} from "#app/data/mystery-encounters/encounters/the-pokemon-salesman-encounter";
 import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
 import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
-import { initSceneWithoutEncounterPhase } from "#test/utils/gameManagerUtils";
+import { initSceneWithoutEncounterPhase } from "#test/testUtils/gameManagerUtils";
 import { MysteryEncounterPhase } from "#app/phases/mystery-encounter-phases";
 import { NON_LEGEND_PARADOX_POKEMON } from "#app/data/balance/special-species-groups";
 
 const namespace = "mysteryEncounters/thePokemonSalesman";
-const defaultParty = [ Species.LAPRAS, Species.GENGAR, Species.ABRA ];
+const defaultParty = [Species.LAPRAS, Species.GENGAR, Species.ABRA];
 const defaultBiome = Biome.CAVE;
 const defaultWave = 45;
 
@@ -39,10 +45,10 @@ describe("The Pokemon Salesman - Mystery Encounter", () => {
     game.override.disableTrainerWaves();
 
     const biomeMap = new Map<Biome, MysteryEncounterType[]>([
-      [ Biome.VOLCANO, [ MysteryEncounterType.MYSTERIOUS_CHALLENGERS ]],
+      [Biome.VOLCANO, [MysteryEncounterType.MYSTERIOUS_CHALLENGERS]],
     ]);
     HUMAN_TRANSITABLE_BIOMES.forEach(biome => {
-      biomeMap.set(biome, [ MysteryEncounterType.THE_POKEMON_SALESMAN ]);
+      biomeMap.set(biome, [MysteryEncounterType.THE_POKEMON_SALESMAN]);
     });
     vi.spyOn(MysteryEncounters, "mysteryEncountersByBiome", "get").mockReturnValue(biomeMap);
   });
@@ -63,7 +69,7 @@ describe("The Pokemon Salesman - Mystery Encounter", () => {
     expect(dialogue).toBeDefined();
     expect(dialogue.intro).toStrictEqual([
       { text: `${namespace}:intro` },
-      { speaker: `${namespace}:speaker`, text: `${namespace}:intro_dialogue` }
+      { speaker: `${namespace}:speaker`, text: `${namespace}:intro_dialogue` },
     ]);
     const { title, description, query } = dialogue.encounterOptionsDialogue!;
     expect(title).toBe(`${namespace}:title`);
diff --git a/src/test/mystery-encounter/encounters/the-strong-stuff-encounter.test.ts b/test/mystery-encounter/encounters/the-strong-stuff-encounter.test.ts
similarity index 85%
rename from src/test/mystery-encounter/encounters/the-strong-stuff-encounter.test.ts
rename to test/mystery-encounter/encounters/the-strong-stuff-encounter.test.ts
index 3c0e75a2195..e3440aee9e0 100644
--- a/src/test/mystery-encounter/encounters/the-strong-stuff-encounter.test.ts
+++ b/test/mystery-encounter/encounters/the-strong-stuff-encounter.test.ts
@@ -2,12 +2,15 @@ import * as MysteryEncounters from "#app/data/mystery-encounters/mystery-encount
 import { Biome } from "#enums/biome";
 import { MysteryEncounterType } from "#enums/mystery-encounter-type";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 import { getPokemonSpecies } from "#app/data/pokemon-species";
 import * as BattleAnims from "#app/data/battle-anims";
 import * as EncounterPhaseUtils from "#app/data/mystery-encounters/utils/encounter-phase-utils";
-import { runMysteryEncounterToEnd, skipBattleRunMysteryEncounterRewardsPhase } from "#test/mystery-encounter/encounter-test-utils";
+import {
+  runMysteryEncounterToEnd,
+  skipBattleRunMysteryEncounterRewardsPhase,
+} from "#test/mystery-encounter/encounter-test-utils";
 import { Moves } from "#enums/moves";
 import type BattleScene from "#app/battle-scene";
 import { TheStrongStuffEncounter } from "#app/data/mystery-encounters/encounters/the-strong-stuff-encounter";
@@ -15,12 +18,12 @@ import { Nature } from "#enums/nature";
 import { BerryType } from "#enums/berry-type";
 import { BattlerTagType } from "#enums/battler-tag-type";
 import { PokemonMove } from "#app/field/pokemon";
-import { Mode } from "#app/ui/ui";
+import { UiMode } from "#enums/ui-mode";
 import ModifierSelectUiHandler from "#app/ui/modifier-select-ui-handler";
 import { BerryModifier, PokemonBaseStatTotalModifier } from "#app/modifier/modifier";
 import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
 import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
-import { initSceneWithoutEncounterPhase } from "#test/utils/gameManagerUtils";
+import { initSceneWithoutEncounterPhase } from "#test/testUtils/gameManagerUtils";
 import { CustomPokemonData } from "#app/data/custom-pokemon-data";
 import { CommandPhase } from "#app/phases/command-phase";
 import { MovePhase } from "#app/phases/move-phase";
@@ -28,7 +31,7 @@ import { SelectModifierPhase } from "#app/phases/select-modifier-phase";
 import { Abilities } from "#enums/abilities";
 
 const namespace = "mysteryEncounters/theStrongStuff";
-const defaultParty = [ Species.LAPRAS, Species.GENGAR, Species.ABRA ];
+const defaultParty = [Species.LAPRAS, Species.GENGAR, Species.ABRA];
 const defaultBiome = Biome.CAVE;
 const defaultWave = 45;
 
@@ -54,9 +57,9 @@ describe("The Strong Stuff - Mystery Encounter", () => {
 
     vi.spyOn(MysteryEncounters, "mysteryEncountersByBiome", "get").mockReturnValue(
       new Map<Biome, MysteryEncounterType[]>([
-        [ Biome.CAVE, [ MysteryEncounterType.THE_STRONG_STUFF ]],
-        [ Biome.MOUNTAIN, [ MysteryEncounterType.MYSTERIOUS_CHALLENGERS ]],
-      ])
+        [Biome.CAVE, [MysteryEncounterType.THE_STRONG_STUFF]],
+        [Biome.MOUNTAIN, [MysteryEncounterType.MYSTERIOUS_CHALLENGERS]],
+      ]),
     );
   });
 
@@ -111,14 +114,14 @@ describe("The Strong Stuff - Mystery Encounter", () => {
             bossSegments: 5,
             shiny: false,
             customPokemonData: new CustomPokemonData({ spriteScale: 1.25 }),
-            nature: Nature.BOLD,
-            moveSet: [ Moves.INFESTATION, Moves.SALT_CURE, Moves.GASTRO_ACID, Moves.HEAL_ORDER ],
+            nature: Nature.HARDY,
+            moveSet: [Moves.INFESTATION, Moves.SALT_CURE, Moves.GASTRO_ACID, Moves.HEAL_ORDER],
             modifierConfigs: expect.any(Array),
-            tags: [ BattlerTagType.MYSTERY_ENCOUNTER_POST_SUMMON ],
-            mysteryEncounterBattleEffects: expect.any(Function)
-          }
+            tags: [BattlerTagType.MYSTERY_ENCOUNTER_POST_SUMMON],
+            mysteryEncounterBattleEffects: expect.any(Function),
+          },
         ],
-      }
+      },
     ]);
     await vi.waitFor(() => expect(moveInitSpy).toHaveBeenCalled());
     await vi.waitFor(() => expect(moveLoadSpy).toHaveBeenCalled());
@@ -195,15 +198,28 @@ describe("The Strong Stuff - Mystery Encounter", () => {
       expect(scene.getCurrentPhase()?.constructor.name).toBe(CommandPhase.name);
       expect(enemyField.length).toBe(1);
       expect(enemyField[0].species.speciesId).toBe(Species.SHUCKLE);
-      expect(enemyField[0].summonData.statStages).toEqual([ 0, 2, 0, 2, 0, 0, 0 ]);
+      expect(enemyField[0].summonData.statStages).toEqual([0, 1, 0, 1, 0, 0, 0]);
       const shuckleItems = enemyField[0].getHeldItems();
       expect(shuckleItems.length).toBe(5);
-      expect(shuckleItems.find(m => m instanceof BerryModifier && m.berryType === BerryType.SITRUS)?.stackCount).toBe(1);
-      expect(shuckleItems.find(m => m instanceof BerryModifier && m.berryType === BerryType.ENIGMA)?.stackCount).toBe(1);
-      expect(shuckleItems.find(m => m instanceof BerryModifier && m.berryType === BerryType.GANLON)?.stackCount).toBe(1);
-      expect(shuckleItems.find(m => m instanceof BerryModifier && m.berryType === BerryType.APICOT)?.stackCount).toBe(1);
+      expect(shuckleItems.find(m => m instanceof BerryModifier && m.berryType === BerryType.SITRUS)?.stackCount).toBe(
+        1,
+      );
+      expect(shuckleItems.find(m => m instanceof BerryModifier && m.berryType === BerryType.ENIGMA)?.stackCount).toBe(
+        1,
+      );
+      expect(shuckleItems.find(m => m instanceof BerryModifier && m.berryType === BerryType.GANLON)?.stackCount).toBe(
+        1,
+      );
+      expect(shuckleItems.find(m => m instanceof BerryModifier && m.berryType === BerryType.APICOT)?.stackCount).toBe(
+        1,
+      );
       expect(shuckleItems.find(m => m instanceof BerryModifier && m.berryType === BerryType.LUM)?.stackCount).toBe(2);
-      expect(enemyField[0].moveset).toEqual([ new PokemonMove(Moves.INFESTATION), new PokemonMove(Moves.SALT_CURE), new PokemonMove(Moves.GASTRO_ACID), new PokemonMove(Moves.HEAL_ORDER) ]);
+      expect(enemyField[0].moveset).toEqual([
+        new PokemonMove(Moves.INFESTATION),
+        new PokemonMove(Moves.SALT_CURE),
+        new PokemonMove(Moves.GASTRO_ACID),
+        new PokemonMove(Moves.HEAL_ORDER),
+      ]);
 
       // Should have used moves pre-battle
       const movePhases = phaseSpy.mock.calls.filter(p => p[0] instanceof MovePhase).map(p => p[0]);
@@ -220,8 +236,10 @@ describe("The Strong Stuff - Mystery Encounter", () => {
       expect(scene.getCurrentPhase()?.constructor.name).toBe(SelectModifierPhase.name);
       await game.phaseInterceptor.run(SelectModifierPhase);
 
-      expect(scene.ui.getMode()).to.equal(Mode.MODIFIER_SELECT);
-      const modifierSelectHandler = scene.ui.handlers.find(h => h instanceof ModifierSelectUiHandler) as ModifierSelectUiHandler;
+      expect(scene.ui.getMode()).to.equal(UiMode.MODIFIER_SELECT);
+      const modifierSelectHandler = scene.ui.handlers.find(
+        h => h instanceof ModifierSelectUiHandler,
+      ) as ModifierSelectUiHandler;
       expect(modifierSelectHandler.options.length).toEqual(3);
       expect(modifierSelectHandler.options[0].modifierTypeOption.type.id).toEqual("SOUL_DEW");
     });
diff --git a/src/test/mystery-encounter/encounters/the-winstrate-challenge-encounter.test.ts b/test/mystery-encounter/encounters/the-winstrate-challenge-encounter.test.ts
similarity index 81%
rename from src/test/mystery-encounter/encounters/the-winstrate-challenge-encounter.test.ts
rename to test/mystery-encounter/encounters/the-winstrate-challenge-encounter.test.ts
index e087bc5c180..4cb712ce779 100644
--- a/src/test/mystery-encounter/encounters/the-winstrate-challenge-encounter.test.ts
+++ b/test/mystery-encounter/encounters/the-winstrate-challenge-encounter.test.ts
@@ -3,14 +3,14 @@ import { HUMAN_TRANSITABLE_BIOMES } from "#app/data/mystery-encounters/mystery-e
 import { Biome } from "#enums/biome";
 import { MysteryEncounterType } from "#enums/mystery-encounter-type";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 import { runMysteryEncounterToEnd } from "#test/mystery-encounter/encounter-test-utils";
 import type BattleScene from "#app/battle-scene";
-import { Mode } from "#app/ui/ui";
+import { UiMode } from "#enums/ui-mode";
 import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
 import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
-import { initSceneWithoutEncounterPhase } from "#test/utils/gameManagerUtils";
+import { initSceneWithoutEncounterPhase } from "#test/testUtils/gameManagerUtils";
 import { MysteryEncounterMode } from "#enums/mystery-encounter-mode";
 import ModifierSelectUiHandler from "#app/ui/modifier-select-ui-handler";
 import MysteryEncounter from "#app/data/mystery-encounters/mystery-encounter";
@@ -28,7 +28,7 @@ import { VictoryPhase } from "#app/phases/victory-phase";
 import { StatusEffect } from "#enums/status-effect";
 
 const namespace = "mysteryEncounters/theWinstrateChallenge";
-const defaultParty = [ Species.LAPRAS, Species.GENGAR, Species.ABRA ];
+const defaultParty = [Species.LAPRAS, Species.GENGAR, Species.ABRA];
 const defaultBiome = Biome.CAVE;
 const defaultWave = 45;
 
@@ -49,11 +49,9 @@ describe("The Winstrate Challenge - Mystery Encounter", () => {
     game.override.startingBiome(defaultBiome);
     game.override.disableTrainerWaves();
 
-    const biomeMap = new Map<Biome, MysteryEncounterType[]>([
-      [ Biome.VOLCANO, [ MysteryEncounterType.FIGHT_OR_FLIGHT ]],
-    ]);
+    const biomeMap = new Map<Biome, MysteryEncounterType[]>([[Biome.VOLCANO, [MysteryEncounterType.FIGHT_OR_FLIGHT]]]);
     HUMAN_TRANSITABLE_BIOMES.forEach(biome => {
-      biomeMap.set(biome, [ MysteryEncounterType.THE_WINSTRATE_CHALLENGE ]);
+      biomeMap.set(biome, [MysteryEncounterType.THE_WINSTRATE_CHALLENGE]);
     });
     vi.spyOn(MysteryEncounters, "mysteryEncountersByBiome", "get").mockReturnValue(biomeMap);
   });
@@ -75,10 +73,12 @@ describe("The Winstrate Challenge - Mystery Encounter", () => {
       {
         speaker: `${namespace}:speaker`,
         text: `${namespace}:intro_dialogue`,
-      }
+      },
     ]);
     expect(TheWinstrateChallengeEncounter.dialogue.encounterOptionsDialogue?.title).toBe(`${namespace}:title`);
-    expect(TheWinstrateChallengeEncounter.dialogue.encounterOptionsDialogue?.description).toBe(`${namespace}:description`);
+    expect(TheWinstrateChallengeEncounter.dialogue.encounterOptionsDialogue?.description).toBe(
+      `${namespace}:description`,
+    );
     expect(TheWinstrateChallengeEncounter.dialogue.encounterOptionsDialogue?.query).toBe(`${namespace}:query`);
     expect(TheWinstrateChallengeEncounter.options.length).toBe(2);
   });
@@ -115,42 +115,42 @@ describe("The Winstrate Challenge - Mystery Encounter", () => {
             isBoss: false,
             abilityIndex: 0, // Soundproof
             nature: Nature.MODEST,
-            moveSet: [ Moves.THUNDERBOLT, Moves.GIGA_DRAIN, Moves.FOUL_PLAY, Moves.THUNDER_WAVE ],
-            modifierConfigs: expect.any(Array)
+            moveSet: [Moves.THUNDERBOLT, Moves.GIGA_DRAIN, Moves.FOUL_PLAY, Moves.THUNDER_WAVE],
+            modifierConfigs: expect.any(Array),
           },
           {
             species: getPokemonSpecies(Species.SWALOT),
             isBoss: false,
             abilityIndex: 2, // Gluttony
             nature: Nature.QUIET,
-            moveSet: [ Moves.SLUDGE_BOMB, Moves.GIGA_DRAIN, Moves.ICE_BEAM, Moves.EARTHQUAKE ],
-            modifierConfigs: expect.any(Array)
+            moveSet: [Moves.SLUDGE_BOMB, Moves.GIGA_DRAIN, Moves.ICE_BEAM, Moves.EARTHQUAKE],
+            modifierConfigs: expect.any(Array),
           },
           {
             species: getPokemonSpecies(Species.DODRIO),
             isBoss: false,
             abilityIndex: 2, // Tangled Feet
             nature: Nature.JOLLY,
-            moveSet: [ Moves.DRILL_PECK, Moves.QUICK_ATTACK, Moves.THRASH, Moves.KNOCK_OFF ],
-            modifierConfigs: expect.any(Array)
+            moveSet: [Moves.DRILL_PECK, Moves.QUICK_ATTACK, Moves.THRASH, Moves.KNOCK_OFF],
+            modifierConfigs: expect.any(Array),
           },
           {
             species: getPokemonSpecies(Species.ALAKAZAM),
             isBoss: false,
             formIndex: 1,
             nature: Nature.BOLD,
-            moveSet: [ Moves.PSYCHIC, Moves.SHADOW_BALL, Moves.FOCUS_BLAST, Moves.THUNDERBOLT ],
-            modifierConfigs: expect.any(Array)
+            moveSet: [Moves.PSYCHIC, Moves.SHADOW_BALL, Moves.FOCUS_BLAST, Moves.THUNDERBOLT],
+            modifierConfigs: expect.any(Array),
           },
           {
             species: getPokemonSpecies(Species.DARMANITAN),
             isBoss: false,
             abilityIndex: 0, // Sheer Force
             nature: Nature.IMPISH,
-            moveSet: [ Moves.EARTHQUAKE, Moves.U_TURN, Moves.FLARE_BLITZ, Moves.ROCK_SLIDE ],
-            modifierConfigs: expect.any(Array)
-          }
-        ]
+            moveSet: [Moves.EARTHQUAKE, Moves.U_TURN, Moves.FLARE_BLITZ, Moves.ROCK_SLIDE],
+            modifierConfigs: expect.any(Array),
+          },
+        ],
       },
       {
         trainerType: TrainerType.VICKY,
@@ -160,10 +160,10 @@ describe("The Winstrate Challenge - Mystery Encounter", () => {
             isBoss: false,
             formIndex: 1,
             nature: Nature.IMPISH,
-            moveSet: [ Moves.AXE_KICK, Moves.ICE_PUNCH, Moves.ZEN_HEADBUTT, Moves.BULLET_PUNCH ],
-            modifierConfigs: expect.any(Array)
-          }
-        ]
+            moveSet: [Moves.AXE_KICK, Moves.ICE_PUNCH, Moves.ZEN_HEADBUTT, Moves.BULLET_PUNCH],
+            modifierConfigs: expect.any(Array),
+          },
+        ],
       },
       {
         trainerType: TrainerType.VIVI,
@@ -173,26 +173,26 @@ describe("The Winstrate Challenge - Mystery Encounter", () => {
             isBoss: false,
             abilityIndex: 3, // Lightning Rod
             nature: Nature.ADAMANT,
-            moveSet: [ Moves.WATERFALL, Moves.MEGAHORN, Moves.KNOCK_OFF, Moves.REST ],
-            modifierConfigs: expect.any(Array)
+            moveSet: [Moves.WATERFALL, Moves.MEGAHORN, Moves.KNOCK_OFF, Moves.REST],
+            modifierConfigs: expect.any(Array),
           },
           {
             species: getPokemonSpecies(Species.BRELOOM),
             isBoss: false,
             abilityIndex: 1, // Poison Heal
             nature: Nature.JOLLY,
-            moveSet: [ Moves.SPORE, Moves.SWORDS_DANCE, Moves.SEED_BOMB, Moves.DRAIN_PUNCH ],
-            modifierConfigs: expect.any(Array)
+            moveSet: [Moves.SPORE, Moves.SWORDS_DANCE, Moves.SEED_BOMB, Moves.DRAIN_PUNCH],
+            modifierConfigs: expect.any(Array),
           },
           {
             species: getPokemonSpecies(Species.CAMERUPT),
             isBoss: false,
             formIndex: 1,
             nature: Nature.CALM,
-            moveSet: [ Moves.EARTH_POWER, Moves.FIRE_BLAST, Moves.YAWN, Moves.PROTECT ],
-            modifierConfigs: expect.any(Array)
-          }
-        ]
+            moveSet: [Moves.EARTH_POWER, Moves.FIRE_BLAST, Moves.YAWN, Moves.PROTECT],
+            modifierConfigs: expect.any(Array),
+          },
+        ],
       },
       {
         trainerType: TrainerType.VICTORIA,
@@ -202,18 +202,18 @@ describe("The Winstrate Challenge - Mystery Encounter", () => {
             isBoss: false,
             abilityIndex: 0, // Natural Cure
             nature: Nature.CALM,
-            moveSet: [ Moves.SYNTHESIS, Moves.SLUDGE_BOMB, Moves.GIGA_DRAIN, Moves.SLEEP_POWDER ],
-            modifierConfigs: expect.any(Array)
+            moveSet: [Moves.SYNTHESIS, Moves.SLUDGE_BOMB, Moves.GIGA_DRAIN, Moves.SLEEP_POWDER],
+            modifierConfigs: expect.any(Array),
           },
           {
             species: getPokemonSpecies(Species.GARDEVOIR),
             isBoss: false,
             formIndex: 1,
             nature: Nature.TIMID,
-            moveSet: [ Moves.PSYSHOCK, Moves.MOONBLAST, Moves.SHADOW_BALL, Moves.WILL_O_WISP ],
-            modifierConfigs: expect.any(Array)
-          }
-        ]
+            moveSet: [Moves.PSYSHOCK, Moves.MOONBLAST, Moves.SHADOW_BALL, Moves.WILL_O_WISP],
+            modifierConfigs: expect.any(Array),
+          },
+        ],
       },
       {
         trainerType: TrainerType.VICTOR,
@@ -223,19 +223,19 @@ describe("The Winstrate Challenge - Mystery Encounter", () => {
             isBoss: false,
             abilityIndex: 0, // Guts
             nature: Nature.ADAMANT,
-            moveSet: [ Moves.FACADE, Moves.BRAVE_BIRD, Moves.PROTECT, Moves.QUICK_ATTACK ],
-            modifierConfigs: expect.any(Array)
+            moveSet: [Moves.FACADE, Moves.BRAVE_BIRD, Moves.PROTECT, Moves.QUICK_ATTACK],
+            modifierConfigs: expect.any(Array),
           },
           {
             species: getPokemonSpecies(Species.OBSTAGOON),
             isBoss: false,
             abilityIndex: 1, // Guts
             nature: Nature.ADAMANT,
-            moveSet: [ Moves.FACADE, Moves.OBSTRUCT, Moves.NIGHT_SLASH, Moves.FIRE_PUNCH ],
-            modifierConfigs: expect.any(Array)
-          }
-        ]
-      }
+            moveSet: [Moves.FACADE, Moves.OBSTRUCT, Moves.NIGHT_SLASH, Moves.FIRE_PUNCH],
+            modifierConfigs: expect.any(Array),
+          },
+        ],
+      },
     ]);
     expect(encounter.spriteConfigs).toBeDefined();
     expect(encounter.spriteConfigs.length).toBe(5);
@@ -299,8 +299,10 @@ describe("The Winstrate Challenge - Mystery Encounter", () => {
       expect(scene.getCurrentPhase()?.constructor.name).toBe(SelectModifierPhase.name);
       await game.phaseInterceptor.run(SelectModifierPhase);
 
-      expect(scene.ui.getMode()).to.equal(Mode.MODIFIER_SELECT);
-      const modifierSelectHandler = scene.ui.handlers.find(h => h instanceof ModifierSelectUiHandler) as ModifierSelectUiHandler;
+      expect(scene.ui.getMode()).to.equal(UiMode.MODIFIER_SELECT);
+      const modifierSelectHandler = scene.ui.handlers.find(
+        h => h instanceof ModifierSelectUiHandler,
+      ) as ModifierSelectUiHandler;
       expect(modifierSelectHandler.options.length).toEqual(1);
       expect(modifierSelectHandler.options[0].modifierTypeOption.type.id).toBe("MYSTERY_ENCOUNTER_MACHO_BRACE");
     }, 15000);
@@ -339,8 +341,10 @@ describe("The Winstrate Challenge - Mystery Encounter", () => {
       expect(scene.getCurrentPhase()?.constructor.name).toBe(SelectModifierPhase.name);
       await game.phaseInterceptor.run(SelectModifierPhase);
 
-      expect(scene.ui.getMode()).to.equal(Mode.MODIFIER_SELECT);
-      const modifierSelectHandler = scene.ui.handlers.find(h => h instanceof ModifierSelectUiHandler) as ModifierSelectUiHandler;
+      expect(scene.ui.getMode()).to.equal(UiMode.MODIFIER_SELECT);
+      const modifierSelectHandler = scene.ui.handlers.find(
+        h => h instanceof ModifierSelectUiHandler,
+      ) as ModifierSelectUiHandler;
       expect(modifierSelectHandler.options.length).toEqual(1);
       expect(modifierSelectHandler.options[0].modifierTypeOption.type.id).toBe("RARER_CANDY");
     });
@@ -352,10 +356,10 @@ describe("The Winstrate Challenge - Mystery Encounter", () => {
  * @param game
  * @param isFinalBattle
  */
-async function skipBattleToNextBattle(game: GameManager, isFinalBattle: boolean = false) {
+async function skipBattleToNextBattle(game: GameManager, isFinalBattle = false) {
   game.scene.clearPhaseQueue();
   game.scene.clearPhaseQueueSplice();
-  const commandUiHandler = game.scene.ui.handlers[Mode.COMMAND];
+  const commandUiHandler = game.scene.ui.handlers[UiMode.COMMAND];
   commandUiHandler.clear();
   game.scene.getEnemyParty().forEach(p => {
     p.hp = 0;
diff --git a/src/test/mystery-encounter/encounters/trash-to-treasure-encounter.test.ts b/test/mystery-encounter/encounters/trash-to-treasure-encounter.test.ts
similarity index 62%
rename from src/test/mystery-encounter/encounters/trash-to-treasure-encounter.test.ts
rename to test/mystery-encounter/encounters/trash-to-treasure-encounter.test.ts
index 395e33e818a..2f910a9250f 100644
--- a/src/test/mystery-encounter/encounters/trash-to-treasure-encounter.test.ts
+++ b/test/mystery-encounter/encounters/trash-to-treasure-encounter.test.ts
@@ -1,30 +1,40 @@
+import type BattleScene from "#app/battle-scene";
+import * as BattleAnims from "#app/data/battle-anims";
+import { TrashToTreasureEncounter } from "#app/data/mystery-encounters/encounters/trash-to-treasure-encounter";
 import * as MysteryEncounters from "#app/data/mystery-encounters/mystery-encounters";
+import * as EncounterPhaseUtils from "#app/data/mystery-encounters/utils/encounter-phase-utils";
+import {
+  type EnemyPartyConfig,
+  type EnemyPokemonConfig,
+  generateModifierType,
+} from "#app/data/mystery-encounters/utils/encounter-phase-utils";
+import { getPokemonSpecies } from "#app/data/pokemon-species";
 import { Biome } from "#app/enums/biome";
 import { MysteryEncounterType } from "#app/enums/mystery-encounter-type";
 import { Species } from "#app/enums/species";
-import GameManager from "#app/test/utils/gameManager";
-import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
-import { getPokemonSpecies } from "#app/data/pokemon-species";
-import * as BattleAnims from "#app/data/battle-anims";
-import * as EncounterPhaseUtils from "#app/data/mystery-encounters/utils/encounter-phase-utils";
-import { runMysteryEncounterToEnd, skipBattleRunMysteryEncounterRewardsPhase } from "#test/mystery-encounter/encounter-test-utils";
-import { Moves } from "#enums/moves";
-import type BattleScene from "#app/battle-scene";
 import { PokemonMove } from "#app/field/pokemon";
-import { Mode } from "#app/ui/ui";
-import ModifierSelectUiHandler from "#app/ui/modifier-select-ui-handler";
-import { HitHealModifier, HealShopCostModifier, TurnHealModifier } from "#app/modifier/modifier";
-import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
-import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
-import { initSceneWithoutEncounterPhase } from "#test/utils/gameManagerUtils";
-import { TrashToTreasureEncounter } from "#app/data/mystery-encounters/encounters/trash-to-treasure-encounter";
+import { HealShopCostModifier, HitHealModifier, TurnHealModifier } from "#app/modifier/modifier";
 import { ModifierTier } from "#app/modifier/modifier-tier";
-import { SelectModifierPhase } from "#app/phases/select-modifier-phase";
+import { modifierTypes, type PokemonHeldItemModifierType } from "#app/modifier/modifier-type";
 import { CommandPhase } from "#app/phases/command-phase";
 import { MovePhase } from "#app/phases/move-phase";
+import { SelectModifierPhase } from "#app/phases/select-modifier-phase";
+import ModifierSelectUiHandler from "#app/ui/modifier-select-ui-handler";
+import { UiMode } from "#enums/ui-mode";
+import * as Utils from "#app/utils/common";
+import { Moves } from "#enums/moves";
+import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
+import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
+import {
+  runMysteryEncounterToEnd,
+  skipBattleRunMysteryEncounterRewardsPhase,
+} from "#test/mystery-encounter/encounter-test-utils";
+import GameManager from "#test/testUtils/gameManager";
+import { initSceneWithoutEncounterPhase } from "#test/testUtils/gameManagerUtils";
+import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
 const namespace = "mysteryEncounters/trashToTreasure";
-const defaultParty = [ Species.LAPRAS, Species.GENGAR, Species.ABRA ];
+const defaultParty = [Species.LAPRAS, Species.GENGAR, Species.ABRA];
 const defaultBiome = Biome.CAVE;
 const defaultWave = 45;
 
@@ -46,9 +56,7 @@ describe("Trash to Treasure - Mystery Encounter", () => {
     game.override.disableTrainerWaves();
 
     vi.spyOn(MysteryEncounters, "mysteryEncountersByBiome", "get").mockReturnValue(
-      new Map<Biome, MysteryEncounterType[]>([
-        [ Biome.CAVE, [ MysteryEncounterType.TRASH_TO_TREASURE ]],
-      ])
+      new Map<Biome, MysteryEncounterType[]>([[Biome.CAVE, [MysteryEncounterType.TRASH_TO_TREASURE]]]),
     );
   });
 
@@ -72,6 +80,7 @@ describe("Trash to Treasure - Mystery Encounter", () => {
   });
 
   it("should initialize fully", async () => {
+    vi.spyOn(Utils, "randSeedInt").mockImplementation((range, min = 0) => min + range - 1);
     initSceneWithoutEncounterPhase(scene, defaultParty);
     scene.currentBattle.mysteryEncounter = TrashToTreasureEncounter;
     const moveInitSpy = vi.spyOn(BattleAnims, "initMoveAnim");
@@ -84,22 +93,61 @@ describe("Trash to Treasure - Mystery Encounter", () => {
     TrashToTreasureEncounter.populateDialogueTokensFromRequirements();
     const onInitResult = onInit!();
 
-    expect(TrashToTreasureEncounter.enemyPartyConfigs).toEqual([
-      {
-        levelAdditiveModifier: 0.5,
-        disableSwitch: true,
-        pokemonConfigs: [
-          {
-            species: getPokemonSpecies(Species.GARBODOR),
-            isBoss: true,
-            shiny: false,
-            formIndex: 1,
-            bossSegmentModifier: 1,
-            moveSet: [ Moves.PAYBACK, Moves.GUNK_SHOT, Moves.STOMPING_TANTRUM, Moves.DRAIN_PUNCH ],
-          }
-        ],
-      }
-    ]);
+    const bossSpecies = getPokemonSpecies(Species.GARBODOR);
+    const pokemonConfig: EnemyPokemonConfig = {
+      species: bossSpecies,
+      isBoss: true,
+      shiny: false, // Shiny lock because of custom intro sprite
+      formIndex: 1, // Gmax
+      bossSegmentModifier: 1, // +1 Segment from normal
+      moveSet: [Moves.GUNK_SHOT, Moves.STOMPING_TANTRUM, Moves.HAMMER_ARM, Moves.PAYBACK],
+      modifierConfigs: [
+        {
+          modifier: generateModifierType(modifierTypes.BERRY) as PokemonHeldItemModifierType,
+        },
+        {
+          modifier: generateModifierType(modifierTypes.BERRY) as PokemonHeldItemModifierType,
+        },
+        {
+          modifier: generateModifierType(modifierTypes.BERRY) as PokemonHeldItemModifierType,
+        },
+        {
+          modifier: generateModifierType(modifierTypes.BERRY) as PokemonHeldItemModifierType,
+        },
+        {
+          modifier: generateModifierType(modifierTypes.BASE_STAT_BOOSTER) as PokemonHeldItemModifierType,
+        },
+        {
+          modifier: generateModifierType(modifierTypes.BASE_STAT_BOOSTER) as PokemonHeldItemModifierType,
+        },
+        {
+          modifier: generateModifierType(modifierTypes.TOXIC_ORB) as PokemonHeldItemModifierType,
+          stackCount: Utils.randSeedInt(2, 0),
+        },
+        {
+          modifier: generateModifierType(modifierTypes.SOOTHE_BELL) as PokemonHeldItemModifierType,
+          stackCount: Utils.randSeedInt(2, 1),
+        },
+        {
+          modifier: generateModifierType(modifierTypes.LUCKY_EGG) as PokemonHeldItemModifierType,
+          stackCount: Utils.randSeedInt(3, 1),
+        },
+        {
+          modifier: generateModifierType(modifierTypes.GOLDEN_EGG) as PokemonHeldItemModifierType,
+          stackCount: Utils.randSeedInt(2, 0),
+        },
+      ],
+    };
+    const config: EnemyPartyConfig = {
+      levelAdditiveModifier: 0.5,
+      pokemonConfigs: [pokemonConfig],
+      disableSwitch: true,
+    };
+    const enemyPartyConfigs = [config];
+
+    expect(JSON.stringify(TrashToTreasureEncounter.enemyPartyConfigs, undefined, 2)).toEqual(
+      JSON.stringify(enemyPartyConfigs, undefined, 2),
+    );
     await vi.waitFor(() => expect(moveInitSpy).toHaveBeenCalled());
     await vi.waitFor(() => expect(moveLoadSpy).toHaveBeenCalled());
     expect(onInitResult).toBe(true);
@@ -121,7 +169,7 @@ describe("Trash to Treasure - Mystery Encounter", () => {
       });
     });
 
-    it("should give 2 Leftovers, 2 Shell Bell, and Black Sludge", async () => {
+    it("should give 2 Leftovers, 1 Shell Bell, and Black Sludge", async () => {
       await game.runToMysteryEncounter(MysteryEncounterType.TRASH_TO_TREASURE, defaultParty);
       await runMysteryEncounterToEnd(game, 1);
       await game.phaseInterceptor.to(SelectModifierPhase, false);
@@ -133,7 +181,7 @@ describe("Trash to Treasure - Mystery Encounter", () => {
 
       const shellBell = scene.findModifier(m => m instanceof HitHealModifier) as HitHealModifier;
       expect(shellBell).toBeDefined();
-      expect(shellBell?.stackCount).toBe(2);
+      expect(shellBell?.stackCount).toBe(1);
 
       const blackSludge = scene.findModifier(m => m instanceof HealShopCostModifier) as HealShopCostModifier;
       expect(blackSludge).toBeDefined();
@@ -176,13 +224,18 @@ describe("Trash to Treasure - Mystery Encounter", () => {
       expect(scene.getCurrentPhase()?.constructor.name).toBe(CommandPhase.name);
       expect(enemyField.length).toBe(1);
       expect(enemyField[0].species.speciesId).toBe(Species.GARBODOR);
-      expect(enemyField[0].moveset).toEqual([ new PokemonMove(Moves.PAYBACK), new PokemonMove(Moves.GUNK_SHOT), new PokemonMove(Moves.STOMPING_TANTRUM), new PokemonMove(Moves.DRAIN_PUNCH) ]);
+      expect(enemyField[0].moveset).toEqual([
+        new PokemonMove(Moves.GUNK_SHOT),
+        new PokemonMove(Moves.STOMPING_TANTRUM),
+        new PokemonMove(Moves.HAMMER_ARM),
+        new PokemonMove(Moves.PAYBACK),
+      ]);
 
       // Should have used moves pre-battle
       const movePhases = phaseSpy.mock.calls.filter(p => p[0] instanceof MovePhase).map(p => p[0]);
       expect(movePhases.length).toBe(2);
       expect(movePhases.filter(p => (p as MovePhase).move.moveId === Moves.TOXIC).length).toBe(1);
-      expect(movePhases.filter(p => (p as MovePhase).move.moveId === Moves.AMNESIA).length).toBe(1);
+      expect(movePhases.filter(p => (p as MovePhase).move.moveId === Moves.STOCKPILE).length).toBe(1);
     });
 
     it("should have 2 Rogue, 1 Ultra, 1 Great in rewards", async () => {
@@ -193,13 +246,27 @@ describe("Trash to Treasure - Mystery Encounter", () => {
       expect(scene.getCurrentPhase()?.constructor.name).toBe(SelectModifierPhase.name);
       await game.phaseInterceptor.run(SelectModifierPhase);
 
-      expect(scene.ui.getMode()).to.equal(Mode.MODIFIER_SELECT);
-      const modifierSelectHandler = scene.ui.handlers.find(h => h instanceof ModifierSelectUiHandler) as ModifierSelectUiHandler;
+      expect(scene.ui.getMode()).to.equal(UiMode.MODIFIER_SELECT);
+      const modifierSelectHandler = scene.ui.handlers.find(
+        h => h instanceof ModifierSelectUiHandler,
+      ) as ModifierSelectUiHandler;
       expect(modifierSelectHandler.options.length).toEqual(4);
-      expect(modifierSelectHandler.options[0].modifierTypeOption.type.tier - modifierSelectHandler.options[0].modifierTypeOption.upgradeCount).toEqual(ModifierTier.ROGUE);
-      expect(modifierSelectHandler.options[1].modifierTypeOption.type.tier - modifierSelectHandler.options[1].modifierTypeOption.upgradeCount).toEqual(ModifierTier.ROGUE);
-      expect(modifierSelectHandler.options[2].modifierTypeOption.type.tier - modifierSelectHandler.options[2].modifierTypeOption.upgradeCount).toEqual(ModifierTier.ULTRA);
-      expect(modifierSelectHandler.options[3].modifierTypeOption.type.tier - modifierSelectHandler.options[3].modifierTypeOption.upgradeCount).toEqual(ModifierTier.GREAT);
+      expect(
+        modifierSelectHandler.options[0].modifierTypeOption.type.tier -
+          modifierSelectHandler.options[0].modifierTypeOption.upgradeCount,
+      ).toEqual(ModifierTier.ROGUE);
+      expect(
+        modifierSelectHandler.options[1].modifierTypeOption.type.tier -
+          modifierSelectHandler.options[1].modifierTypeOption.upgradeCount,
+      ).toEqual(ModifierTier.ROGUE);
+      expect(
+        modifierSelectHandler.options[2].modifierTypeOption.type.tier -
+          modifierSelectHandler.options[2].modifierTypeOption.upgradeCount,
+      ).toEqual(ModifierTier.ULTRA);
+      expect(
+        modifierSelectHandler.options[3].modifierTypeOption.type.tier -
+          modifierSelectHandler.options[3].modifierTypeOption.upgradeCount,
+      ).toEqual(ModifierTier.GREAT);
     });
   });
 });
diff --git a/src/test/mystery-encounter/encounters/uncommon-breed-encounter.test.ts b/test/mystery-encounter/encounters/uncommon-breed-encounter.test.ts
similarity index 91%
rename from src/test/mystery-encounter/encounters/uncommon-breed-encounter.test.ts
rename to test/mystery-encounter/encounters/uncommon-breed-encounter.test.ts
index 39904c030a3..452dfcf3784 100644
--- a/src/test/mystery-encounter/encounters/uncommon-breed-encounter.test.ts
+++ b/test/mystery-encounter/encounters/uncommon-breed-encounter.test.ts
@@ -2,15 +2,18 @@ import * as MysteryEncounters from "#app/data/mystery-encounters/mystery-encount
 import { Biome } from "#app/enums/biome";
 import { MysteryEncounterType } from "#app/enums/mystery-encounter-type";
 import { Species } from "#app/enums/species";
-import GameManager from "#app/test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
-import { runMysteryEncounterToEnd, runSelectMysteryEncounterOption } from "#test/mystery-encounter/encounter-test-utils";
+import {
+  runMysteryEncounterToEnd,
+  runSelectMysteryEncounterOption,
+} from "#test/mystery-encounter/encounter-test-utils";
 import { Moves } from "#enums/moves";
 import type BattleScene from "#app/battle-scene";
 import { PokemonMove } from "#app/field/pokemon";
 import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
 import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
-import { initSceneWithoutEncounterPhase } from "#test/utils/gameManagerUtils";
+import { initSceneWithoutEncounterPhase } from "#test/testUtils/gameManagerUtils";
 import * as EncounterPhaseUtils from "#app/data/mystery-encounters/utils/encounter-phase-utils";
 import { generateModifierType } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
 import { MysteryEncounterPhase } from "#app/phases/mystery-encounter-phases";
@@ -27,7 +30,7 @@ import { modifierTypes } from "#app/modifier/modifier-type";
 import { Abilities } from "#enums/abilities";
 
 const namespace = "mysteryEncounters/uncommonBreed";
-const defaultParty = [ Species.LAPRAS, Species.GENGAR, Species.ABRA ];
+const defaultParty = [Species.LAPRAS, Species.GENGAR, Species.ABRA];
 const defaultBiome = Biome.CAVE;
 const defaultWave = 45;
 
@@ -43,7 +46,8 @@ describe("Uncommon Breed - Mystery Encounter", () => {
   beforeEach(async () => {
     game = new GameManager(phaserGame);
     scene = game.scene;
-    game.override.mysteryEncounterChance(100)
+    game.override
+      .mysteryEncounterChance(100)
       .mysteryEncounterTier(MysteryEncounterTier.COMMON)
       .startingWave(defaultWave)
       .startingBiome(defaultBiome)
@@ -52,9 +56,7 @@ describe("Uncommon Breed - Mystery Encounter", () => {
       .enemyPassiveAbility(Abilities.BALL_FETCH);
 
     vi.spyOn(MysteryEncounters, "mysteryEncountersByBiome", "get").mockReturnValue(
-      new Map<Biome, MysteryEncounterType[]>([
-        [ Biome.CAVE, [ MysteryEncounterType.UNCOMMON_BREED ]],
-      ])
+      new Map<Biome, MysteryEncounterType[]>([[Biome.CAVE, [MysteryEncounterType.UNCOMMON_BREED]]]),
     );
   });
 
@@ -116,7 +118,7 @@ describe("Uncommon Breed - Mystery Encounter", () => {
       await game.runToMysteryEncounter(MysteryEncounterType.UNCOMMON_BREED, defaultParty);
 
       const config = game.scene.currentBattle.mysteryEncounter!.enemyPartyConfigs[0];
-      const speciesToSpawn = config.pokemonConfigs?.[0].species.speciesId;
+      const speciesToSpawn = config.pokemonConfigs?.[0].species.speciesId!;
 
       await runMysteryEncounterToEnd(game, 1, undefined, true);
 
@@ -126,7 +128,7 @@ describe("Uncommon Breed - Mystery Encounter", () => {
       expect(enemyField[0].species.speciesId).toBe(speciesToSpawn);
 
       const statStagePhases = unshiftPhaseSpy.mock.calls.filter(p => p[0] instanceof StatStageChangePhase)[0][0] as any;
-      expect(statStagePhases.stats).toEqual([ Stat.ATK, Stat.DEF, Stat.SPATK, Stat.SPDEF, Stat.SPD ]);
+      expect(statStagePhases.stats).toEqual([Stat.ATK, Stat.DEF, Stat.SPATK, Stat.SPDEF, Stat.SPD]);
 
       // Should have used its egg move pre-battle
       const movePhases = phaseSpy.mock.calls.filter(p => p[0] instanceof MovePhase).map(p => p[0]);
@@ -143,7 +145,7 @@ describe("Uncommon Breed - Mystery Encounter", () => {
       await game.runToMysteryEncounter(MysteryEncounterType.UNCOMMON_BREED, defaultParty);
 
       const config = game.scene.currentBattle.mysteryEncounter!.enemyPartyConfigs[0];
-      const speciesToSpawn = config.pokemonConfigs?.[0].species.speciesId;
+      const speciesToSpawn = config.pokemonConfigs?.[0].species.speciesId!;
 
       await runMysteryEncounterToEnd(game, 1, undefined, true);
 
@@ -153,7 +155,7 @@ describe("Uncommon Breed - Mystery Encounter", () => {
       expect(enemyField[0].species.speciesId).toBe(speciesToSpawn);
 
       const statStagePhases = unshiftPhaseSpy.mock.calls.filter(p => p[0] instanceof StatStageChangePhase)[0][0] as any;
-      expect(statStagePhases.stats).toEqual([ Stat.ATK, Stat.DEF, Stat.SPATK, Stat.SPDEF, Stat.SPD ]);
+      expect(statStagePhases.stats).toEqual([Stat.ATK, Stat.DEF, Stat.SPATK, Stat.SPDEF, Stat.SPD]);
 
       // Should have used its egg move pre-battle
       const movePhases = phaseSpy.mock.calls.filter(p => p[0] instanceof MovePhase).map(p => p[0]);
@@ -176,7 +178,7 @@ describe("Uncommon Breed - Mystery Encounter", () => {
         selected: [
           {
             text: `${namespace}:option.2.selected`,
-          }
+          },
         ],
       });
     });
@@ -213,14 +215,14 @@ describe("Uncommon Breed - Mystery Encounter", () => {
       await game.runToMysteryEncounter(MysteryEncounterType.UNCOMMON_BREED, defaultParty);
 
       // Berries on party lead
-      const sitrus = generateModifierType(modifierTypes.BERRY, [ BerryType.SITRUS ])!;
+      const sitrus = generateModifierType(modifierTypes.BERRY, [BerryType.SITRUS])!;
       const sitrusMod = sitrus.newModifier(scene.getPlayerParty()[0]) as BerryModifier;
       sitrusMod.stackCount = 2;
-      await scene.addModifier(sitrusMod, true, false, false, true);
-      const ganlon = generateModifierType(modifierTypes.BERRY, [ BerryType.GANLON ])!;
+      scene.addModifier(sitrusMod, true, false, false, true);
+      const ganlon = generateModifierType(modifierTypes.BERRY, [BerryType.GANLON])!;
       const ganlonMod = ganlon.newModifier(scene.getPlayerParty()[0]) as BerryModifier;
       ganlonMod.stackCount = 3;
-      await scene.addModifier(ganlonMod, true, false, false, true);
+      scene.addModifier(ganlonMod, true, false, false, true);
       await scene.updateModifiers(true);
 
       await runMysteryEncounterToEnd(game, 2);
@@ -241,14 +243,14 @@ describe("Uncommon Breed - Mystery Encounter", () => {
         selected: [
           {
             text: `${namespace}:option.3.selected`,
-          }
+          },
         ],
       });
     });
 
     it("should NOT be selectable if the player doesn't have an Attracting move", async () => {
       await game.runToMysteryEncounter(MysteryEncounterType.UNCOMMON_BREED, defaultParty);
-      scene.getPlayerParty().forEach(p => p.moveset = []);
+      scene.getPlayerParty().forEach(p => (p.moveset = []));
       await game.phaseInterceptor.to(MysteryEncounterPhase, false);
 
       const encounterPhase = scene.getCurrentPhase();
@@ -270,7 +272,7 @@ describe("Uncommon Breed - Mystery Encounter", () => {
       const leaveEncounterWithoutBattleSpy = vi.spyOn(EncounterPhaseUtils, "leaveEncounterWithoutBattle");
       await game.runToMysteryEncounter(MysteryEncounterType.UNCOMMON_BREED, defaultParty);
       // Mock moveset
-      scene.getPlayerParty()[0].moveset = [ new PokemonMove(Moves.CHARM) ];
+      scene.getPlayerParty()[0].moveset = [new PokemonMove(Moves.CHARM)];
       await runMysteryEncounterToEnd(game, 3);
 
       expect(leaveEncounterWithoutBattleSpy).toBeCalled();
diff --git a/src/test/mystery-encounter/encounters/weird-dream-encounter.test.ts b/test/mystery-encounter/encounters/weird-dream-encounter.test.ts
similarity index 81%
rename from src/test/mystery-encounter/encounters/weird-dream-encounter.test.ts
rename to test/mystery-encounter/encounters/weird-dream-encounter.test.ts
index 669a99b92cd..f51ab45e4d4 100644
--- a/src/test/mystery-encounter/encounters/weird-dream-encounter.test.ts
+++ b/test/mystery-encounter/encounters/weird-dream-encounter.test.ts
@@ -2,16 +2,19 @@ import * as MysteryEncounters from "#app/data/mystery-encounters/mystery-encount
 import { Biome } from "#app/enums/biome";
 import { MysteryEncounterType } from "#app/enums/mystery-encounter-type";
 import { Species } from "#app/enums/species";
-import GameManager from "#app/test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 import * as EncounterPhaseUtils from "#app/data/mystery-encounters/utils/encounter-phase-utils";
-import { runMysteryEncounterToEnd, skipBattleRunMysteryEncounterRewardsPhase } from "#test/mystery-encounter/encounter-test-utils";
+import {
+  runMysteryEncounterToEnd,
+  skipBattleRunMysteryEncounterRewardsPhase,
+} from "#test/mystery-encounter/encounter-test-utils";
 import type BattleScene from "#app/battle-scene";
-import { Mode } from "#app/ui/ui";
+import { UiMode } from "#enums/ui-mode";
 import ModifierSelectUiHandler from "#app/ui/modifier-select-ui-handler";
 import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
 import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
-import { initSceneWithoutEncounterPhase } from "#test/utils/gameManagerUtils";
+import { initSceneWithoutEncounterPhase } from "#test/testUtils/gameManagerUtils";
 import { WeirdDreamEncounter } from "#app/data/mystery-encounters/encounters/weird-dream-encounter";
 import * as EncounterTransformationSequence from "#app/data/mystery-encounters/utils/encounter-transformation-sequence";
 import { SelectModifierPhase } from "#app/phases/select-modifier-phase";
@@ -19,7 +22,7 @@ import { CommandPhase } from "#app/phases/command-phase";
 import { ModifierTier } from "#app/modifier/modifier-tier";
 
 const namespace = "mysteryEncounters/weirdDream";
-const defaultParty = [ Species.MAGBY, Species.HAUNTER, Species.ABRA ];
+const defaultParty = [Species.MAGBY, Species.HAUNTER, Species.ABRA];
 const defaultBiome = Biome.CAVE;
 const defaultWave = 45;
 
@@ -39,12 +42,12 @@ describe("Weird Dream - Mystery Encounter", () => {
     game.override.startingWave(defaultWave);
     game.override.startingBiome(defaultBiome);
     game.override.disableTrainerWaves();
-    vi.spyOn(EncounterTransformationSequence, "doPokemonTransformationSequence").mockImplementation(() => new Promise<void>(resolve => resolve()));
+    vi.spyOn(EncounterTransformationSequence, "doPokemonTransformationSequence").mockImplementation(
+      () => new Promise<void>(resolve => resolve()),
+    );
 
     vi.spyOn(MysteryEncounters, "mysteryEncountersByBiome", "get").mockReturnValue(
-      new Map<Biome, MysteryEncounterType[]>([
-        [ Biome.CAVE, [ MysteryEncounterType.WEIRD_DREAM ]],
-      ])
+      new Map<Biome, MysteryEncounterType[]>([[Biome.CAVE, [MysteryEncounterType.WEIRD_DREAM]]]),
     );
   });
 
@@ -62,7 +65,7 @@ describe("Weird Dream - Mystery Encounter", () => {
     expect(WeirdDreamEncounter.dialogue).toBeDefined();
     expect(WeirdDreamEncounter.dialogue.intro).toStrictEqual([
       {
-        text: `${namespace}:intro`
+        text: `${namespace}:intro`,
       },
       {
         speaker: `${namespace}:speaker`,
@@ -141,8 +144,10 @@ describe("Weird Dream - Mystery Encounter", () => {
       expect(scene.getCurrentPhase()?.constructor.name).toBe(SelectModifierPhase.name);
       await game.phaseInterceptor.run(SelectModifierPhase);
 
-      expect(scene.ui.getMode()).to.equal(Mode.MODIFIER_SELECT);
-      const modifierSelectHandler = scene.ui.handlers.find(h => h instanceof ModifierSelectUiHandler) as ModifierSelectUiHandler;
+      expect(scene.ui.getMode()).to.equal(UiMode.MODIFIER_SELECT);
+      const modifierSelectHandler = scene.ui.handlers.find(
+        h => h instanceof ModifierSelectUiHandler,
+      ) as ModifierSelectUiHandler;
       expect(modifierSelectHandler.options.length).toEqual(5);
       expect(modifierSelectHandler.options[0].modifierTypeOption.type.id).toEqual("MEMORY_MUSHROOM");
       expect(modifierSelectHandler.options[1].modifierTypeOption.type.id).toEqual("ROGUE_BALL");
@@ -195,15 +200,35 @@ describe("Weird Dream - Mystery Encounter", () => {
       expect(scene.getCurrentPhase()?.constructor.name).toBe(SelectModifierPhase.name);
       await game.phaseInterceptor.run(SelectModifierPhase);
 
-      expect(scene.ui.getMode()).to.equal(Mode.MODIFIER_SELECT);
-      const modifierSelectHandler = scene.ui.handlers.find(h => h instanceof ModifierSelectUiHandler) as ModifierSelectUiHandler;
+      expect(scene.ui.getMode()).to.equal(UiMode.MODIFIER_SELECT);
+      const modifierSelectHandler = scene.ui.handlers.find(
+        h => h instanceof ModifierSelectUiHandler,
+      ) as ModifierSelectUiHandler;
       expect(modifierSelectHandler.options.length).toEqual(6);
-      expect(modifierSelectHandler.options[0].modifierTypeOption.type.tier - modifierSelectHandler.options[0].modifierTypeOption.upgradeCount).toEqual(ModifierTier.ROGUE);
-      expect(modifierSelectHandler.options[1].modifierTypeOption.type.tier - modifierSelectHandler.options[1].modifierTypeOption.upgradeCount).toEqual(ModifierTier.ROGUE);
-      expect(modifierSelectHandler.options[2].modifierTypeOption.type.tier - modifierSelectHandler.options[2].modifierTypeOption.upgradeCount).toEqual(ModifierTier.ULTRA);
-      expect(modifierSelectHandler.options[3].modifierTypeOption.type.tier - modifierSelectHandler.options[3].modifierTypeOption.upgradeCount).toEqual(ModifierTier.ULTRA);
-      expect(modifierSelectHandler.options[4].modifierTypeOption.type.tier - modifierSelectHandler.options[4].modifierTypeOption.upgradeCount).toEqual(ModifierTier.GREAT);
-      expect(modifierSelectHandler.options[5].modifierTypeOption.type.tier - modifierSelectHandler.options[5].modifierTypeOption.upgradeCount).toEqual(ModifierTier.GREAT);
+      expect(
+        modifierSelectHandler.options[0].modifierTypeOption.type.tier -
+          modifierSelectHandler.options[0].modifierTypeOption.upgradeCount,
+      ).toEqual(ModifierTier.ROGUE);
+      expect(
+        modifierSelectHandler.options[1].modifierTypeOption.type.tier -
+          modifierSelectHandler.options[1].modifierTypeOption.upgradeCount,
+      ).toEqual(ModifierTier.ROGUE);
+      expect(
+        modifierSelectHandler.options[2].modifierTypeOption.type.tier -
+          modifierSelectHandler.options[2].modifierTypeOption.upgradeCount,
+      ).toEqual(ModifierTier.ULTRA);
+      expect(
+        modifierSelectHandler.options[3].modifierTypeOption.type.tier -
+          modifierSelectHandler.options[3].modifierTypeOption.upgradeCount,
+      ).toEqual(ModifierTier.ULTRA);
+      expect(
+        modifierSelectHandler.options[4].modifierTypeOption.type.tier -
+          modifierSelectHandler.options[4].modifierTypeOption.upgradeCount,
+      ).toEqual(ModifierTier.GREAT);
+      expect(
+        modifierSelectHandler.options[5].modifierTypeOption.type.tier -
+          modifierSelectHandler.options[5].modifierTypeOption.upgradeCount,
+      ).toEqual(ModifierTier.GREAT);
     });
   });
 
diff --git a/src/test/mystery-encounter/mystery-encounter-utils.test.ts b/test/mystery-encounter/mystery-encounter-utils.test.ts
similarity index 82%
rename from src/test/mystery-encounter/mystery-encounter-utils.test.ts
rename to test/mystery-encounter/mystery-encounter-utils.test.ts
index f0057fea7f0..1c4a2cf89bd 100644
--- a/src/test/mystery-encounter/mystery-encounter-utils.test.ts
+++ b/test/mystery-encounter/mystery-encounter-utils.test.ts
@@ -1,15 +1,26 @@
 import type BattleScene from "#app/battle-scene";
 import { speciesStarterCosts } from "#app/data/balance/starters";
 import MysteryEncounter from "#app/data/mystery-encounters/mystery-encounter";
-import { getEncounterText, queueEncounterMessage, showEncounterDialogue, showEncounterText } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils";
-import { getHighestLevelPlayerPokemon, getLowestLevelPlayerPokemon, getRandomPlayerPokemon, getRandomSpeciesByStarterCost, koPlayerPokemon } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils";
+import {
+  getEncounterText,
+  queueEncounterMessage,
+  showEncounterDialogue,
+  showEncounterText,
+} from "#app/data/mystery-encounters/utils/encounter-dialogue-utils";
+import {
+  getHighestLevelPlayerPokemon,
+  getLowestLevelPlayerPokemon,
+  getRandomPlayerPokemon,
+  getRandomSpeciesByStarterCost,
+  koPlayerPokemon,
+} from "#app/data/mystery-encounters/utils/encounter-pokemon-utils";
 import { getPokemonSpecies } from "#app/data/pokemon-species";
-import { Type } from "#enums/type";
+import { PokemonType } from "#enums/pokemon-type";
 import { MessagePhase } from "#app/phases/message-phase";
-import GameManager from "#app/test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import { Species } from "#enums/species";
 import { StatusEffect } from "#enums/status-effect";
-import { initSceneWithoutEncounterPhase } from "#test/utils/gameManagerUtils";
+import { initSceneWithoutEncounterPhase } from "#test/testUtils/gameManagerUtils";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
@@ -31,7 +42,7 @@ describe("Mystery Encounter Utils", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     scene = game.scene;
-    initSceneWithoutEncounterPhase(game.scene, [ Species.ARCEUS, Species.MANAPHY ]);
+    initSceneWithoutEncounterPhase(game.scene, [Species.ARCEUS, Species.MANAPHY]);
   });
 
   describe("getRandomPlayerPokemon", () => {
@@ -48,12 +59,12 @@ describe("Mystery Encounter Utils", () => {
       expect(result.species.speciesId).toBe(Species.ARCEUS);
     });
 
-    it("gets a fainted pokemon from player party if isAllowedInBattle is false", () => {
+    it("gets a fainted pokemon from player party if isAllowedInBattle is false", async () => {
       // Both pokemon fainted
       scene.getPlayerParty().forEach(p => {
         p.hp = 0;
         p.trySetStatus(StatusEffect.FAINT);
-        p.updateInfo();
+        void p.updateInfo();
       });
 
       // Seeds are calculated to return index 0 first, 1 second (if both pokemon are legal)
@@ -68,12 +79,12 @@ describe("Mystery Encounter Utils", () => {
       expect(result.species.speciesId).toBe(Species.ARCEUS);
     });
 
-    it("gets an unfainted legal pokemon from player party if isAllowed is true and isFainted is false", () => {
+    it("gets an unfainted legal pokemon from player party if isAllowed is true and isFainted is false", async () => {
       // Only faint 1st pokemon
       const party = scene.getPlayerParty();
       party[0].hp = 0;
       party[0].trySetStatus(StatusEffect.FAINT);
-      party[0].updateInfo();
+      await party[0].updateInfo();
 
       // Seeds are calculated to return index 0 first, 1 second (if both pokemon are legal)
       game.override.seed("random");
@@ -87,12 +98,12 @@ describe("Mystery Encounter Utils", () => {
       expect(result.species.speciesId).toBe(Species.MANAPHY);
     });
 
-    it("returns last unfainted pokemon if doNotReturnLastAbleMon is false", () => {
+    it("returns last unfainted pokemon if doNotReturnLastAbleMon is false", async () => {
       // Only faint 1st pokemon
       const party = scene.getPlayerParty();
       party[0].hp = 0;
       party[0].trySetStatus(StatusEffect.FAINT);
-      party[0].updateInfo();
+      await party[0].updateInfo();
 
       // Seeds are calculated to return index 0 first, 1 second (if both pokemon are legal)
       game.override.seed("random");
@@ -106,12 +117,12 @@ describe("Mystery Encounter Utils", () => {
       expect(result.species.speciesId).toBe(Species.MANAPHY);
     });
 
-    it("never returns last unfainted pokemon if doNotReturnLastAbleMon is true", () => {
+    it("never returns last unfainted pokemon if doNotReturnLastAbleMon is true", async () => {
       // Only faint 1st pokemon
       const party = scene.getPlayerParty();
       party[0].hp = 0;
       party[0].trySetStatus(StatusEffect.FAINT);
-      party[0].updateInfo();
+      await party[0].updateInfo();
 
       // Seeds are calculated to return index 0 first, 1 second (if both pokemon are legal)
       game.override.seed("random");
@@ -152,12 +163,12 @@ describe("Mystery Encounter Utils", () => {
       expect(result.species.speciesId).toBe(Species.ARCEUS);
     });
 
-    it("returns highest level unfainted if unfainted is true", () => {
+    it("returns highest level unfainted if unfainted is true", async () => {
       const party = scene.getPlayerParty();
       party[0].level = 100;
       party[0].hp = 0;
       party[0].trySetStatus(StatusEffect.FAINT);
-      party[0].updateInfo();
+      await party[0].updateInfo();
       party[1].level = 10;
 
       const result = getHighestLevelPlayerPokemon(true);
@@ -191,12 +202,12 @@ describe("Mystery Encounter Utils", () => {
       expect(result.species.speciesId).toBe(Species.ARCEUS);
     });
 
-    it("returns lowest level unfainted if unfainted is true", () => {
+    it("returns lowest level unfainted if unfainted is true", async () => {
       const party = scene.getPlayerParty();
       party[0].level = 10;
       party[0].hp = 0;
       party[0].trySetStatus(StatusEffect.FAINT);
-      party[0].updateInfo();
+      await party[0].updateInfo();
       party[1].level = 100;
 
       const result = getLowestLevelPlayerPokemon(true);
@@ -214,7 +225,7 @@ describe("Mystery Encounter Utils", () => {
     });
 
     it("gets species for a starter tier range", () => {
-      const result = getRandomSpeciesByStarterCost([ 5, 8 ]);
+      const result = getRandomSpeciesByStarterCost([5, 8]);
       const pokeSpecies = getPokemonSpecies(result);
 
       expect(pokeSpecies.speciesId).toBe(result);
@@ -223,15 +234,23 @@ describe("Mystery Encounter Utils", () => {
     });
 
     it("excludes species from search", () => {
-      // Only 9 tiers are: Koraidon, Miraidon, Arceus, Rayquaza, Kyogre, Groudon, Zacian
-      const result = getRandomSpeciesByStarterCost(9, [ Species.KORAIDON, Species.MIRAIDON, Species.ARCEUS, Species.RAYQUAZA, Species.KYOGRE, Species.GROUDON ]);
+      // Only 9 tiers are: Kyogre, Groudon, Rayquaza, Arceus, Zacian, Koraidon, Miraidon, Terapagos
+      const result = getRandomSpeciesByStarterCost(9, [
+        Species.KYOGRE,
+        Species.GROUDON,
+        Species.RAYQUAZA,
+        Species.ARCEUS,
+        Species.KORAIDON,
+        Species.MIRAIDON,
+        Species.TERAPAGOS,
+      ]);
       const pokeSpecies = getPokemonSpecies(result);
       expect(pokeSpecies.speciesId).toBe(Species.ZACIAN);
     });
 
     it("gets species of specified types", () => {
-      // Only 9 tiers are: Koraidon, Miraidon, Arceus, Rayquaza, Kyogre, Groudon, Zacian
-      const result = getRandomSpeciesByStarterCost(9, undefined, [ Type.GROUND ]);
+      // Only 9 tiers are: Kyogre, Groudon, Rayquaza, Arceus, Zacian, Koraidon, Miraidon, Terapagos
+      const result = getRandomSpeciesByStarterCost(9, undefined, [PokemonType.GROUND]);
       const pokeSpecies = getPokemonSpecies(result);
       expect(pokeSpecies.speciesId).toBe(Species.GROUDON);
     });
@@ -288,7 +307,14 @@ describe("Mystery Encounter Utils", () => {
       const spy = vi.spyOn(game.scene.ui, "showText");
 
       await showEncounterText("mysteryEncounter:unit_test_dialogue");
-      expect(spy).toHaveBeenCalledWith("mysteryEncounter:unit_test_dialogue", null, expect.any(Function), 0, true, null);
+      expect(spy).toHaveBeenCalledWith(
+        "mysteryEncounter:unit_test_dialogue",
+        null,
+        expect.any(Function),
+        0,
+        true,
+        null,
+      );
     });
   });
 
@@ -299,8 +325,13 @@ describe("Mystery Encounter Utils", () => {
       const spy = vi.spyOn(game.scene.ui, "showDialogue");
 
       await showEncounterDialogue("mysteryEncounter:unit_test_dialogue", "mysteryEncounter:unit_test_dialogue");
-      expect(spy).toHaveBeenCalledWith("mysteryEncounter:unit_test_dialogue", "mysteryEncounter:unit_test_dialogue", null, expect.any(Function), 0);
+      expect(spy).toHaveBeenCalledWith(
+        "mysteryEncounter:unit_test_dialogue",
+        "mysteryEncounter:unit_test_dialogue",
+        null,
+        expect.any(Function),
+        0,
+      );
     });
   });
 });
-
diff --git a/src/test/mystery-encounter/mystery-encounter.test.ts b/test/mystery-encounter/mystery-encounter.test.ts
similarity index 92%
rename from src/test/mystery-encounter/mystery-encounter.test.ts
rename to test/mystery-encounter/mystery-encounter.test.ts
index 7958fc1cd46..c9d31f28717 100644
--- a/src/test/mystery-encounter/mystery-encounter.test.ts
+++ b/test/mystery-encounter/mystery-encounter.test.ts
@@ -1,5 +1,5 @@
 import { afterEach, beforeAll, beforeEach, expect, describe, it } from "vitest";
-import GameManager from "#app/test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { Species } from "#enums/species";
 import { MysteryEncounterPhase } from "#app/phases/mystery-encounter-phases";
@@ -29,7 +29,10 @@ describe("Mystery Encounters", () => {
   });
 
   it("Spawns a mystery encounter", async () => {
-    await game.runToMysteryEncounter(MysteryEncounterType.MYSTERIOUS_CHALLENGERS, [ Species.CHARIZARD, Species.VOLCARONA ]);
+    await game.runToMysteryEncounter(MysteryEncounterType.MYSTERIOUS_CHALLENGERS, [
+      Species.CHARIZARD,
+      Species.VOLCARONA,
+    ]);
 
     await game.phaseInterceptor.to(MysteryEncounterPhase, false);
     expect(game.scene.getCurrentPhase()!.constructor.name).toBe(MysteryEncounterPhase.name);
@@ -51,4 +54,3 @@ describe("Mystery Encounters", () => {
     expect(scene.currentBattle.mysteryEncounter).toBeUndefined();
   });
 });
-
diff --git a/src/test/phases/form-change-phase.test.ts b/test/phases/form-change-phase.test.ts
similarity index 71%
rename from src/test/phases/form-change-phase.test.ts
rename to test/phases/form-change-phase.test.ts
index 07e59cafe1c..974c64d9e5a 100644
--- a/src/test/phases/form-change-phase.test.ts
+++ b/test/phases/form-change-phase.test.ts
@@ -1,10 +1,10 @@
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
-import { Type } from "#enums/type";
+import { PokemonType } from "#enums/pokemon-type";
 import { generateModifierType } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
 import { modifierTypes } from "#app/modifier/modifier-type";
 
@@ -25,9 +25,9 @@ describe("Form Change Phase", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     game.override
-      .moveset([ Moves.SPLASH ])
+      .moveset([Moves.SPLASH])
       .ability(Abilities.BALL_FETCH)
-      .battleType("single")
+      .battleStyle("single")
       .disableCrits()
       .enemySpecies(Species.MAGIKARP)
       .enemyAbility(Abilities.BALL_FETCH)
@@ -35,16 +35,16 @@ describe("Form Change Phase", () => {
   });
 
   it("Zacian should successfully change into Crowned form", async () => {
-    await game.classicMode.startBattle([ Species.ZACIAN ]);
+    await game.classicMode.startBattle([Species.ZACIAN]);
 
     // Before the form change: Should be Hero form
     const zacian = game.scene.getPlayerParty()[0];
     expect(zacian.getFormKey()).toBe("hero-of-many-battles");
-    expect(zacian.getTypes()).toStrictEqual([ Type.FAIRY ]);
-    expect(zacian.calculateBaseStats()).toStrictEqual([ 92, 120, 115, 80, 115, 138 ]);
+    expect(zacian.getTypes()).toStrictEqual([PokemonType.FAIRY]);
+    expect(zacian.calculateBaseStats()).toStrictEqual([92, 120, 115, 80, 115, 138]);
 
     // Give Zacian a Rusted Sword
-    const rustedSwordType = generateModifierType( modifierTypes.RARE_FORM_CHANGE_ITEM)!;
+    const rustedSwordType = generateModifierType(modifierTypes.RARE_FORM_CHANGE_ITEM)!;
     const rustedSword = rustedSwordType.newModifier(zacian);
     await game.scene.addModifier(rustedSword);
 
@@ -54,7 +54,7 @@ describe("Form Change Phase", () => {
     // After the form change: Should be Crowned form
     expect(game.phaseInterceptor.log.includes("FormChangePhase")).toBe(true);
     expect(zacian.getFormKey()).toBe("crowned");
-    expect(zacian.getTypes()).toStrictEqual([ Type.FAIRY, Type.STEEL ]);
-    expect(zacian.calculateBaseStats()).toStrictEqual([ 92, 150, 115, 80, 115, 148 ]);
+    expect(zacian.getTypes()).toStrictEqual([PokemonType.FAIRY, PokemonType.STEEL]);
+    expect(zacian.calculateBaseStats()).toStrictEqual([92, 150, 115, 80, 115, 148]);
   });
 });
diff --git a/src/test/phases/frenzy-move-reset.test.ts b/test/phases/frenzy-move-reset.test.ts
similarity index 67%
rename from src/test/phases/frenzy-move-reset.test.ts
rename to test/phases/frenzy-move-reset.test.ts
index db9ec2bfe66..6d3ec767722 100644
--- a/src/test/phases/frenzy-move-reset.test.ts
+++ b/test/phases/frenzy-move-reset.test.ts
@@ -4,7 +4,7 @@ import { BattlerTagType } from "#enums/battler-tag-type";
 import { StatusEffect } from "#enums/status-effect";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, it, expect } from "vitest";
 
@@ -25,7 +25,7 @@ describe("Frenzy Move Reset", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     game.override
-      .battleType("single")
+      .battleStyle("single")
       .disableCrits()
       .starterSpecies(Species.MAGIKARP)
       .moveset(Moves.THRASH)
@@ -37,32 +37,32 @@ describe("Frenzy Move Reset", () => {
   });
 
   /*
-    * Thrash (or frenzy moves in general) should not continue to run if attack fails due to paralysis
-    *
-    * This is a 3-turn Thrash test:
-    * 1. Thrash is selected and succeeds to hit the enemy -> Enemy Faints
-    *
-    * 2. Thrash is automatically selected but misses due to paralysis
-    * Note: After missing the Pokemon should stop automatically attacking
-    *
-    * 3. At the start of the 3rd turn the Player should be able to select a move/switch Pokemon/etc.
-    * Note: This means that BattlerTag.FRENZY is not anymore in pokemon.summonData.tags and pokemon.summonData.moveQueue is empty
-    *
-    */
+   * Thrash (or frenzy moves in general) should not continue to run if attack fails due to paralysis
+   *
+   * This is a 3-turn Thrash test:
+   * 1. Thrash is selected and succeeds to hit the enemy -> Enemy Faints
+   *
+   * 2. Thrash is automatically selected but misses due to paralysis
+   * Note: After missing the Pokemon should stop automatically attacking
+   *
+   * 3. At the start of the 3rd turn the Player should be able to select a move/switch Pokemon/etc.
+   * Note: This means that BattlerTag.FRENZY is not anymore in pokemon.summonData.tags and pokemon.summonData.moveQueue is empty
+   *
+   */
   it("should cancel frenzy move if move fails turn 2", async () => {
     await game.classicMode.startBattle();
 
     const playerPokemon = game.scene.getPlayerPokemon()!;
 
     game.move.select(Moves.THRASH);
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
     await game.move.forceStatusActivation(false);
     await game.toNextTurn();
 
     expect(playerPokemon.summonData.moveQueue.length).toBe(2);
     expect(playerPokemon.summonData.tags.some(tag => tag.tagType === BattlerTagType.FRENZY)).toBe(true);
 
-    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
     await game.move.forceStatusActivation(true);
     await game.toNextTurn();
 
diff --git a/src/test/phases/game-over-phase.test.ts b/test/phases/game-over-phase.test.ts
similarity index 91%
rename from src/test/phases/game-over-phase.test.ts
rename to test/phases/game-over-phase.test.ts
index 2e19d5fe954..40473a022cb 100644
--- a/src/test/phases/game-over-phase.test.ts
+++ b/test/phases/game-over-phase.test.ts
@@ -2,7 +2,7 @@ import { Biome } from "#enums/biome";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 import { achvs } from "#app/system/achv";
@@ -25,9 +25,9 @@ describe("Game Over Phase", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     game.override
-      .moveset([ Moves.MEMENTO, Moves.ICE_BEAM, Moves.SPLASH ])
+      .moveset([Moves.MEMENTO, Moves.ICE_BEAM, Moves.SPLASH])
       .ability(Abilities.BALL_FETCH)
-      .battleType("single")
+      .battleStyle("single")
       .disableCrits()
       .enemyAbility(Abilities.BALL_FETCH)
       .enemyMoveset(Moves.SPLASH)
@@ -37,7 +37,7 @@ describe("Game Over Phase", () => {
   });
 
   it("winning a run should give rewards", async () => {
-    await game.classicMode.startBattle([ Species.BULBASAUR ]);
+    await game.classicMode.startBattle([Species.BULBASAUR]);
     vi.spyOn(game.scene, "validateAchv");
 
     // Note: `game.doKillOpponents()` does not properly handle final boss
@@ -60,7 +60,7 @@ describe("Game Over Phase", () => {
   });
 
   it("losing a run should not give rewards", async () => {
-    await game.classicMode.startBattle([ Species.BULBASAUR ]);
+    await game.classicMode.startBattle([Species.BULBASAUR]);
     vi.spyOn(game.scene, "validateAchv");
 
     game.move.select(Moves.MEMENTO);
diff --git a/src/test/phases/learn-move-phase.test.ts b/test/phases/learn-move-phase.test.ts
similarity index 66%
rename from src/test/phases/learn-move-phase.test.ts
rename to test/phases/learn-move-phase.test.ts
index 3a3d111f551..019b833d386 100644
--- a/src/test/phases/learn-move-phase.test.ts
+++ b/test/phases/learn-move-phase.test.ts
@@ -1,10 +1,10 @@
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 import Phaser from "phaser";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import { Species } from "#enums/species";
 import { Moves } from "#enums/moves";
 import { LearnMovePhase } from "#app/phases/learn-move-phase";
-import { Mode } from "#app/ui/ui";
+import { UiMode } from "#enums/ui-mode";
 import { Button } from "#app/enums/buttons";
 
 describe("Learn Move Phase", () => {
@@ -27,8 +27,8 @@ describe("Learn Move Phase", () => {
   });
 
   it("If Pokemon has less than 4 moves, its newest move will be added to the lowest empty index", async () => {
-    game.override.moveset([ Moves.SPLASH ]);
-    await game.classicMode.startBattle([ Species.BULBASAUR ]);
+    game.override.moveset([Moves.SPLASH]);
+    await game.classicMode.startBattle([Species.BULBASAUR]);
     const pokemon = game.scene.getPlayerPokemon()!;
     const newMovePos = pokemon?.getMoveset().length;
     game.move.select(Moves.SPLASH);
@@ -42,9 +42,9 @@ describe("Learn Move Phase", () => {
   });
 
   it("If a pokemon has 4 move slots filled, the chosen move will be deleted and replaced", async () => {
-    await game.classicMode.startBattle([ Species.BULBASAUR ]);
+    await game.classicMode.startBattle([Species.BULBASAUR]);
     const bulbasaur = game.scene.getPlayerPokemon()!;
-    const prevMoveset = [ Moves.SPLASH, Moves.ABSORB, Moves.ACID, Moves.VINE_WHIP ];
+    const prevMoveset = [Moves.SPLASH, Moves.ABSORB, Moves.ACID, Moves.VINE_WHIP];
     const moveSlotNum = 3;
 
     game.move.changeMoveset(bulbasaur, prevMoveset);
@@ -52,10 +52,10 @@ describe("Learn Move Phase", () => {
     await game.doKillOpponents();
 
     // queue up inputs to confirm dialog boxes
-    game.onNextPrompt("LearnMovePhase", Mode.CONFIRM, () => {
+    game.onNextPrompt("LearnMovePhase", UiMode.CONFIRM, () => {
       game.scene.ui.processInput(Button.ACTION);
     });
-    game.onNextPrompt("LearnMovePhase", Mode.SUMMARY, () => {
+    game.onNextPrompt("LearnMovePhase", UiMode.SUMMARY, () => {
       for (let x = 0; x < moveSlotNum; x++) {
         game.scene.ui.processInput(Button.DOWN);
       }
@@ -69,31 +69,31 @@ describe("Learn Move Phase", () => {
     expect(bulbasaur.level).toBeGreaterThanOrEqual(levelReq);
     // Check each of mr mime's moveslots to make sure the changed move (and ONLY the changed move) is different
     bulbasaur.getMoveset().forEach((move, index) => {
-      const expectedMove: Moves = (index === moveSlotNum ? levelMoveId : prevMoveset[index]);
+      const expectedMove: Moves = index === moveSlotNum ? levelMoveId : prevMoveset[index];
       expect(move?.moveId).toBe(expectedMove);
     });
   });
 
   it("selecting the newly deleted move will reject it and keep old moveset", async () => {
-    await game.classicMode.startBattle([ Species.BULBASAUR ]);
+    await game.classicMode.startBattle([Species.BULBASAUR]);
     const bulbasaur = game.scene.getPlayerPokemon()!;
-    const prevMoveset = [ Moves.SPLASH, Moves.ABSORB, Moves.ACID, Moves.VINE_WHIP ];
+    const prevMoveset = [Moves.SPLASH, Moves.ABSORB, Moves.ACID, Moves.VINE_WHIP];
 
-    game.move.changeMoveset(bulbasaur, [ Moves.SPLASH, Moves.ABSORB, Moves.ACID, Moves.VINE_WHIP ]);
+    game.move.changeMoveset(bulbasaur, [Moves.SPLASH, Moves.ABSORB, Moves.ACID, Moves.VINE_WHIP]);
     game.move.select(Moves.SPLASH);
     await game.doKillOpponents();
 
     // queue up inputs to confirm dialog boxes
-    game.onNextPrompt("LearnMovePhase", Mode.CONFIRM, () => {
+    game.onNextPrompt("LearnMovePhase", UiMode.CONFIRM, () => {
       game.scene.ui.processInput(Button.ACTION);
     });
-    game.onNextPrompt("LearnMovePhase", Mode.SUMMARY, () => {
+    game.onNextPrompt("LearnMovePhase", UiMode.SUMMARY, () => {
       for (let x = 0; x < 4; x++) {
         game.scene.ui.processInput(Button.DOWN); // moves down 4 times to the 5th move slot
       }
       game.scene.ui.processInput(Button.ACTION);
     });
-    game.onNextPrompt("LearnMovePhase", Mode.CONFIRM, () => {
+    game.onNextPrompt("LearnMovePhase", UiMode.CONFIRM, () => {
       game.scene.ui.processInput(Button.ACTION);
     });
     await game.phaseInterceptor.to(LearnMovePhase);
@@ -104,47 +104,62 @@ describe("Learn Move Phase", () => {
   });
 
   it("macro should add moves in free slots normally", async () => {
-    await game.classicMode.startBattle([ Species.BULBASAUR ]);
+    await game.classicMode.startBattle([Species.BULBASAUR]);
     const bulbasaur = game.scene.getPlayerPokemon()!;
 
-    game.move.changeMoveset(bulbasaur, [ Moves.SPLASH, Moves.ABSORB, Moves.ACID ]);
+    game.move.changeMoveset(bulbasaur, [Moves.SPLASH, Moves.ABSORB, Moves.ACID]);
     game.move.select(Moves.SPLASH);
     await game.move.learnMove(Moves.SACRED_FIRE, 0, 1);
-    expect(bulbasaur.getMoveset().map(m => m?.moveId)).toEqual([ Moves.SPLASH, Moves.ABSORB, Moves.ACID, Moves.SACRED_FIRE ]);
-
+    expect(bulbasaur.getMoveset().map(m => m?.moveId)).toEqual([
+      Moves.SPLASH,
+      Moves.ABSORB,
+      Moves.ACID,
+      Moves.SACRED_FIRE,
+    ]);
   });
 
   it("macro should replace moves", async () => {
-    await game.classicMode.startBattle([ Species.BULBASAUR ]);
+    await game.classicMode.startBattle([Species.BULBASAUR]);
     const bulbasaur = game.scene.getPlayerPokemon()!;
 
-    game.move.changeMoveset(bulbasaur, [ Moves.SPLASH, Moves.ABSORB, Moves.ACID, Moves.VINE_WHIP ]);
+    game.move.changeMoveset(bulbasaur, [Moves.SPLASH, Moves.ABSORB, Moves.ACID, Moves.VINE_WHIP]);
     game.move.select(Moves.SPLASH);
     await game.move.learnMove(Moves.SACRED_FIRE, 0, 1);
-    expect(bulbasaur.getMoveset().map(m => m?.moveId)).toEqual([ Moves.SPLASH, Moves.SACRED_FIRE, Moves.ACID, Moves.VINE_WHIP ]);
-
+    expect(bulbasaur.getMoveset().map(m => m?.moveId)).toEqual([
+      Moves.SPLASH,
+      Moves.SACRED_FIRE,
+      Moves.ACID,
+      Moves.VINE_WHIP,
+    ]);
   });
 
   it("macro should allow for cancelling move learning", async () => {
-    await game.classicMode.startBattle([ Species.BULBASAUR ]);
+    await game.classicMode.startBattle([Species.BULBASAUR]);
     const bulbasaur = game.scene.getPlayerPokemon()!;
 
-    game.move.changeMoveset(bulbasaur, [ Moves.SPLASH, Moves.ABSORB, Moves.ACID, Moves.VINE_WHIP ]);
+    game.move.changeMoveset(bulbasaur, [Moves.SPLASH, Moves.ABSORB, Moves.ACID, Moves.VINE_WHIP]);
     game.move.select(Moves.SPLASH);
     await game.move.learnMove(Moves.SACRED_FIRE, 0, 4);
-    expect(bulbasaur.getMoveset().map(m => m?.moveId)).toEqual([ Moves.SPLASH, Moves.ABSORB, Moves.ACID, Moves.VINE_WHIP ]);
-
+    expect(bulbasaur.getMoveset().map(m => m?.moveId)).toEqual([
+      Moves.SPLASH,
+      Moves.ABSORB,
+      Moves.ACID,
+      Moves.VINE_WHIP,
+    ]);
   });
 
   it("macro works on off-field party members", async () => {
-    await game.classicMode.startBattle([ Species.BULBASAUR, Species.SQUIRTLE ]);
+    await game.classicMode.startBattle([Species.BULBASAUR, Species.SQUIRTLE]);
     const squirtle = game.scene.getPlayerParty()[1]!;
 
-    game.move.changeMoveset(squirtle, [ Moves.SPLASH, Moves.WATER_GUN, Moves.FREEZE_DRY, Moves.GROWL ]);
+    game.move.changeMoveset(squirtle, [Moves.SPLASH, Moves.WATER_GUN, Moves.FREEZE_DRY, Moves.GROWL]);
     game.move.select(Moves.TACKLE);
     await game.move.learnMove(Moves.SHELL_SMASH, 1, 0);
-    expect(squirtle.getMoveset().map(m => m?.moveId)).toEqual([ Moves.SHELL_SMASH, Moves.WATER_GUN, Moves.FREEZE_DRY, Moves.GROWL ]);
-
+    expect(squirtle.getMoveset().map(m => m?.moveId)).toEqual([
+      Moves.SHELL_SMASH,
+      Moves.WATER_GUN,
+      Moves.FREEZE_DRY,
+      Moves.GROWL,
+    ]);
   });
-
 });
diff --git a/src/test/phases/mystery-encounter-phase.test.ts b/test/phases/mystery-encounter-phase.test.ts
similarity index 57%
rename from src/test/phases/mystery-encounter-phase.test.ts
rename to test/phases/mystery-encounter-phase.test.ts
index 507862534af..34078b65039 100644
--- a/src/test/phases/mystery-encounter-phase.test.ts
+++ b/test/phases/mystery-encounter-phase.test.ts
@@ -1,9 +1,9 @@
 import { afterEach, beforeAll, beforeEach, expect, describe, it, vi } from "vitest";
-import GameManager from "#app/test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { Species } from "#enums/species";
 import { MysteryEncounterOptionSelectedPhase, MysteryEncounterPhase } from "#app/phases/mystery-encounter-phases";
-import { Mode } from "#app/ui/ui";
+import { UiMode } from "#enums/ui-mode";
 import { Button } from "#enums/buttons";
 import type MysteryEncounterUiHandler from "#app/ui/mystery-encounter-ui-handler";
 import { MysteryEncounterType } from "#enums/mystery-encounter-type";
@@ -34,35 +34,46 @@ describe("Mystery Encounter Phases", () => {
   });
 
   describe("MysteryEncounterPhase", () => {
-    it("Runs to MysteryEncounterPhase", async() => {
-      await game.runToMysteryEncounter(MysteryEncounterType.MYSTERIOUS_CHALLENGERS, [ Species.CHARIZARD, Species.VOLCARONA ]);
+    it("Runs to MysteryEncounterPhase", async () => {
+      await game.runToMysteryEncounter(MysteryEncounterType.MYSTERIOUS_CHALLENGERS, [
+        Species.CHARIZARD,
+        Species.VOLCARONA,
+      ]);
 
       await game.phaseInterceptor.to(MysteryEncounterPhase, false);
       expect(game.scene.getCurrentPhase()?.constructor.name).toBe(MysteryEncounterPhase.name);
     });
 
-    it("Runs MysteryEncounterPhase", async() => {
-      await game.runToMysteryEncounter(MysteryEncounterType.MYSTERIOUS_CHALLENGERS, [ Species.CHARIZARD, Species.VOLCARONA ]);
+    it("Runs MysteryEncounterPhase", async () => {
+      await game.runToMysteryEncounter(MysteryEncounterType.MYSTERIOUS_CHALLENGERS, [
+        Species.CHARIZARD,
+        Species.VOLCARONA,
+      ]);
 
-      game.onNextPrompt("MysteryEncounterPhase", Mode.MYSTERY_ENCOUNTER, () => {
+      game.onNextPrompt("MysteryEncounterPhase", UiMode.MYSTERY_ENCOUNTER, () => {
         // End phase early for test
         game.phaseInterceptor.superEndPhase();
       });
       await game.phaseInterceptor.run(MysteryEncounterPhase);
 
       expect(game.scene.mysteryEncounterSaveData.encounteredEvents.length).toBeGreaterThan(0);
-      expect(game.scene.mysteryEncounterSaveData.encounteredEvents[0].type).toEqual(MysteryEncounterType.MYSTERIOUS_CHALLENGERS);
+      expect(game.scene.mysteryEncounterSaveData.encounteredEvents[0].type).toEqual(
+        MysteryEncounterType.MYSTERIOUS_CHALLENGERS,
+      );
       expect(game.scene.mysteryEncounterSaveData.encounteredEvents[0].tier).toEqual(MysteryEncounterTier.GREAT);
-      expect(game.scene.ui.getMode()).toBe(Mode.MYSTERY_ENCOUNTER);
+      expect(game.scene.ui.getMode()).toBe(UiMode.MYSTERY_ENCOUNTER);
     });
 
-    it("Selects an option for MysteryEncounterPhase", async() => {
+    it("Selects an option for MysteryEncounterPhase", async () => {
       const { ui } = game.scene;
       vi.spyOn(ui, "showDialogue");
       vi.spyOn(ui, "showText");
-      await game.runToMysteryEncounter(MysteryEncounterType.MYSTERIOUS_CHALLENGERS, [ Species.CHARIZARD, Species.VOLCARONA ]);
+      await game.runToMysteryEncounter(MysteryEncounterType.MYSTERIOUS_CHALLENGERS, [
+        Species.CHARIZARD,
+        Species.VOLCARONA,
+      ]);
 
-      game.onNextPrompt("MysteryEncounterPhase", Mode.MESSAGE, () => {
+      game.onNextPrompt("MysteryEncounterPhase", UiMode.MESSAGE, () => {
         const handler = game.scene.ui.getHandler() as MessageUiHandler;
         handler.processInput(Button.ACTION);
       });
@@ -75,82 +86,70 @@ describe("Mystery Encounter Phases", () => {
       handler.processInput(Button.ACTION);
 
       // Waitfor required so that option select messages and preOptionPhase logic are handled
-      await vi.waitFor(() => expect(game.scene.getCurrentPhase()?.constructor.name).toBe(MysteryEncounterOptionSelectedPhase.name));
-      expect(ui.getMode()).toBe(Mode.MESSAGE);
+      await vi.waitFor(() =>
+        expect(game.scene.getCurrentPhase()?.constructor.name).toBe(MysteryEncounterOptionSelectedPhase.name),
+      );
+      expect(ui.getMode()).toBe(UiMode.MESSAGE);
       expect(ui.showDialogue).toHaveBeenCalledTimes(1);
       expect(ui.showText).toHaveBeenCalledTimes(2);
-      expect(ui.showDialogue).toHaveBeenCalledWith(i18next.t("battle:mysteryEncounterAppeared"),  "???", null, expect.any(Function));
-      expect(ui.showText).toHaveBeenCalledWith(i18next.t("mysteryEncounters/mysteriousChallengers:intro"), null, expect.any(Function), 750, true);
-      expect(ui.showText).toHaveBeenCalledWith(i18next.t("mysteryEncounters/mysteriousChallengers:option.selected"), null, expect.any(Function), 300, true);
+      expect(ui.showDialogue).toHaveBeenCalledWith(
+        i18next.t("battle:mysteryEncounterAppeared"),
+        "???",
+        null,
+        expect.any(Function),
+      );
+      expect(ui.showText).toHaveBeenCalledWith(
+        i18next.t("mysteryEncounters/mysteriousChallengers:intro"),
+        null,
+        expect.any(Function),
+        750,
+        true,
+      );
+      expect(ui.showText).toHaveBeenCalledWith(
+        i18next.t("mysteryEncounters/mysteriousChallengers:option.selected"),
+        null,
+        expect.any(Function),
+        300,
+        true,
+      );
     });
   });
 
   describe("MysteryEncounterOptionSelectedPhase", () => {
-    it("runs phase", () => {
+    it("runs phase", () => {});
 
-    });
+    it("handles onOptionSelect execution", () => {});
 
-    it("handles onOptionSelect execution", () => {
+    it("hides intro visuals", () => {});
 
-    });
-
-    it("hides intro visuals", () => {
-
-    });
-
-    it("does not hide intro visuals if option disabled", () => {
-
-    });
+    it("does not hide intro visuals if option disabled", () => {});
   });
 
   describe("MysteryEncounterBattlePhase", () => {
-    it("runs phase", () => {
+    it("runs phase", () => {});
 
-    });
+    it("handles TRAINER_BATTLE variant", () => {});
 
-    it("handles TRAINER_BATTLE variant", () => {
+    it("handles BOSS_BATTLE variant", () => {});
 
-    });
+    it("handles WILD_BATTLE variant", () => {});
 
-    it("handles BOSS_BATTLE variant", () => {
-
-    });
-
-    it("handles WILD_BATTLE variant", () => {
-
-    });
-
-    it("handles double battle", () => {
-
-    });
+    it("handles double battle", () => {});
   });
 
   describe("MysteryEncounterRewardsPhase", () => {
-    it("runs phase", () => {
+    it("runs phase", () => {});
 
-    });
+    it("handles doEncounterRewards", () => {});
 
-    it("handles doEncounterRewards", () => {
-
-    });
-
-    it("handles heal phase if enabled", () => {
-
-    });
+    it("handles heal phase if enabled", () => {});
   });
 
   describe("PostMysteryEncounterPhase", () => {
-    it("runs phase", () => {
+    it("runs phase", () => {});
 
-    });
+    it("handles onPostOptionSelect execution", () => {});
 
-    it("handles onPostOptionSelect execution", () => {
-
-    });
-
-    it("runs to next EncounterPhase", () => {
-
-    });
+    it("runs to next EncounterPhase", () => {});
   });
 });
-
diff --git a/src/test/phases/phases.test.ts b/test/phases/phases.test.ts
similarity index 74%
rename from src/test/phases/phases.test.ts
rename to test/phases/phases.test.ts
index 36a405b8d15..2483cfb317f 100644
--- a/src/test/phases/phases.test.ts
+++ b/test/phases/phases.test.ts
@@ -2,8 +2,8 @@ import type BattleScene from "#app/battle-scene";
 import { LoginPhase } from "#app/phases/login-phase";
 import { TitlePhase } from "#app/phases/title-phase";
 import { UnavailablePhase } from "#app/phases/unavailable-phase";
-import { Mode } from "#app/ui/ui";
-import GameManager from "#test/utils/gameManager";
+import { UiMode } from "#enums/ui-mode";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
@@ -31,8 +31,8 @@ describe("Phases", () => {
     it("should start the login phase", async () => {
       const loginPhase = new LoginPhase();
       scene.unshiftPhase(loginPhase);
-      await game.phaseInterceptor.run(LoginPhase);
-      expect(scene.ui.getMode()).to.equal(Mode.MESSAGE);
+      await game.phaseInterceptor.to(LoginPhase);
+      expect(scene.ui.getMode()).to.equal(UiMode.MESSAGE);
     });
   });
 
@@ -40,8 +40,8 @@ describe("Phases", () => {
     it("should start the title phase", async () => {
       const titlePhase = new TitlePhase();
       scene.unshiftPhase(titlePhase);
-      await game.phaseInterceptor.run(TitlePhase);
-      expect(scene.ui.getMode()).to.equal(Mode.TITLE);
+      await game.phaseInterceptor.to(TitlePhase);
+      expect(scene.ui.getMode()).to.equal(UiMode.TITLE);
     });
   });
 
@@ -49,8 +49,8 @@ describe("Phases", () => {
     it("should start the unavailable phase", async () => {
       const unavailablePhase = new UnavailablePhase();
       scene.unshiftPhase(unavailablePhase);
-      await game.phaseInterceptor.run(UnavailablePhase);
-      expect(scene.ui.getMode()).to.equal(Mode.UNAVAILABLE);
+      await game.phaseInterceptor.to(UnavailablePhase);
+      expect(scene.ui.getMode()).to.equal(UiMode.UNAVAILABLE);
     }, 20000);
   });
 });
diff --git a/src/test/phases/select-modifier-phase.test.ts b/test/phases/select-modifier-phase.test.ts
similarity index 57%
rename from src/test/phases/select-modifier-phase.test.ts
rename to test/phases/select-modifier-phase.test.ts
index 23fab729838..85f8b472c4a 100644
--- a/src/test/phases/select-modifier-phase.test.ts
+++ b/test/phases/select-modifier-phase.test.ts
@@ -6,14 +6,14 @@ import type { CustomModifierSettings } from "#app/modifier/modifier-type";
 import { ModifierTypeOption, modifierTypes } from "#app/modifier/modifier-type";
 import { SelectModifierPhase } from "#app/phases/select-modifier-phase";
 import ModifierSelectUiHandler from "#app/ui/modifier-select-ui-handler";
-import { Mode } from "#app/ui/ui";
-import { shiftCharCodes } from "#app/utils";
+import { UiMode } from "#enums/ui-mode";
+import { shiftCharCodes } from "#app/utils/common";
 import { Abilities } from "#enums/abilities";
 import { Button } from "#enums/buttons";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
-import { initSceneWithoutEncounterPhase } from "#test/utils/gameManagerUtils";
+import GameManager from "#test/testUtils/gameManager";
+import { initSceneWithoutEncounterPhase } from "#test/testUtils/gameManagerUtils";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
@@ -33,7 +33,7 @@ describe("SelectModifierPhase", () => {
     scene = game.scene;
 
     game.override
-      .moveset([ Moves.FISSURE, Moves.SPLASH ])
+      .moveset([Moves.FISSURE, Moves.SPLASH])
       .ability(Abilities.NO_GUARD)
       .startingLevel(200)
       .enemySpecies(Species.MAGIKARP);
@@ -46,34 +46,41 @@ describe("SelectModifierPhase", () => {
   });
 
   it("should start a select modifier phase", async () => {
-    initSceneWithoutEncounterPhase(scene, [ Species.ABRA, Species.VOLCARONA ]);
+    initSceneWithoutEncounterPhase(scene, [Species.ABRA, Species.VOLCARONA]);
     const selectModifierPhase = new SelectModifierPhase();
-    scene.pushPhase(selectModifierPhase);
-    await game.phaseInterceptor.run(SelectModifierPhase);
+    scene.unshiftPhase(selectModifierPhase);
+    await game.phaseInterceptor.to(SelectModifierPhase);
 
-    expect(scene.ui.getMode()).to.equal(Mode.MODIFIER_SELECT);
+    expect(scene.ui.getMode()).to.equal(UiMode.MODIFIER_SELECT);
   });
 
   it("should generate random modifiers", async () => {
-    await game.classicMode.startBattle([ Species.ABRA, Species.VOLCARONA ]);
+    await game.classicMode.startBattle([Species.ABRA, Species.VOLCARONA]);
     game.move.select(Moves.FISSURE);
     await game.phaseInterceptor.to("SelectModifierPhase");
 
-    expect(scene.ui.getMode()).to.equal(Mode.MODIFIER_SELECT);
-    const modifierSelectHandler = scene.ui.handlers.find(h => h instanceof ModifierSelectUiHandler) as ModifierSelectUiHandler;
+    expect(scene.ui.getMode()).to.equal(UiMode.MODIFIER_SELECT);
+    const modifierSelectHandler = scene.ui.handlers.find(
+      h => h instanceof ModifierSelectUiHandler,
+    ) as ModifierSelectUiHandler;
     expect(modifierSelectHandler.options.length).toEqual(3);
   });
 
   it("should modify reroll cost", async () => {
-    initSceneWithoutEncounterPhase(scene, [ Species.ABRA, Species.VOLCARONA ]);
+    initSceneWithoutEncounterPhase(scene, [Species.ABRA, Species.VOLCARONA]);
     const options = [
       new ModifierTypeOption(modifierTypes.POTION(), 0, 100),
       new ModifierTypeOption(modifierTypes.ETHER(), 0, 400),
-      new ModifierTypeOption(modifierTypes.REVIVE(), 0, 1000)
+      new ModifierTypeOption(modifierTypes.REVIVE(), 0, 1000),
     ];
 
-    const selectModifierPhase1 = new SelectModifierPhase(0, undefined, { guaranteedModifierTypeOptions: options });
-    const selectModifierPhase2 = new SelectModifierPhase(0, undefined, { guaranteedModifierTypeOptions: options, rerollMultiplier: 2 });
+    const selectModifierPhase1 = new SelectModifierPhase(0, undefined, {
+      guaranteedModifierTypeOptions: options,
+    });
+    const selectModifierPhase2 = new SelectModifierPhase(0, undefined, {
+      guaranteedModifierTypeOptions: options,
+      rerollMultiplier: 2,
+    });
 
     const cost1 = selectModifierPhase1.getRerollCost(false);
     const cost2 = selectModifierPhase2.getRerollCost(false);
@@ -81,7 +88,7 @@ describe("SelectModifierPhase", () => {
   });
 
   it.todo("should generate random modifiers from reroll", async () => {
-    await game.classicMode.startBattle([ Species.ABRA, Species.VOLCARONA ]);
+    await game.classicMode.startBattle([Species.ABRA, Species.VOLCARONA]);
     scene.money = 1000000;
     scene.shopCursorTarget = 0;
 
@@ -90,25 +97,27 @@ describe("SelectModifierPhase", () => {
 
     // TODO: nagivate the ui to reroll somehow
     //const smphase = scene.getCurrentPhase() as SelectModifierPhase;
-    expect(scene.ui.getMode()).to.equal(Mode.MODIFIER_SELECT);
-    const modifierSelectHandler = scene.ui.handlers.find(h => h instanceof ModifierSelectUiHandler) as ModifierSelectUiHandler;
+    expect(scene.ui.getMode()).to.equal(UiMode.MODIFIER_SELECT);
+    const modifierSelectHandler = scene.ui.handlers.find(
+      h => h instanceof ModifierSelectUiHandler,
+    ) as ModifierSelectUiHandler;
     expect(modifierSelectHandler.options.length).toEqual(3);
 
     modifierSelectHandler.processInput(Button.ACTION);
 
     expect(scene.money).toBe(1000000 - 250);
-    expect(scene.ui.getMode()).to.equal(Mode.MODIFIER_SELECT);
+    expect(scene.ui.getMode()).to.equal(UiMode.MODIFIER_SELECT);
     expect(modifierSelectHandler.options.length).toEqual(3);
   });
 
   it.todo("should generate random modifiers of same tier for reroll with reroll lock", async () => {
     game.override.startingModifier([{ name: "LOCK_CAPSULE" }]);
-    await game.classicMode.startBattle([ Species.ABRA, Species.VOLCARONA ]);
+    await game.classicMode.startBattle([Species.ABRA, Species.VOLCARONA]);
     scene.money = 1000000;
     // Just use fully random seed for this test
     vi.spyOn(scene, "resetSeed").mockImplementation(() => {
       scene.waveSeed = shiftCharCodes(scene.seed, 5);
-      Phaser.Math.RND.sow([ scene.waveSeed ]);
+      Phaser.Math.RND.sow([scene.waveSeed]);
       console.log("Wave Seed:", scene.waveSeed, 5);
       scene.rngCounter = 0;
     });
@@ -116,34 +125,53 @@ describe("SelectModifierPhase", () => {
     game.move.select(Moves.FISSURE);
     await game.phaseInterceptor.to("SelectModifierPhase");
 
-    expect(scene.ui.getMode()).to.equal(Mode.MODIFIER_SELECT);
-    const modifierSelectHandler = scene.ui.handlers.find(h => h instanceof ModifierSelectUiHandler) as ModifierSelectUiHandler;
+    expect(scene.ui.getMode()).to.equal(UiMode.MODIFIER_SELECT);
+    const modifierSelectHandler = scene.ui.handlers.find(
+      h => h instanceof ModifierSelectUiHandler,
+    ) as ModifierSelectUiHandler;
     expect(modifierSelectHandler.options.length).toEqual(3);
     const firstRollTiers: ModifierTier[] = modifierSelectHandler.options.map(o => o.modifierTypeOption.type.tier);
 
     // TODO: nagivate ui to reroll with lock capsule enabled
 
-    expect(scene.ui.getMode()).to.equal(Mode.MODIFIER_SELECT);
+    expect(scene.ui.getMode()).to.equal(UiMode.MODIFIER_SELECT);
     expect(modifierSelectHandler.options.length).toEqual(3);
     // Reroll with lock can still upgrade
-    expect(modifierSelectHandler.options[0].modifierTypeOption.type.tier - modifierSelectHandler.options[0].modifierTypeOption.upgradeCount).toEqual(firstRollTiers[0]);
-    expect(modifierSelectHandler.options[1].modifierTypeOption.type.tier - modifierSelectHandler.options[1].modifierTypeOption.upgradeCount).toEqual(firstRollTiers[1]);
-    expect(modifierSelectHandler.options[2].modifierTypeOption.type.tier - modifierSelectHandler.options[2].modifierTypeOption.upgradeCount).toEqual(firstRollTiers[2]);
+    expect(
+      modifierSelectHandler.options[0].modifierTypeOption.type.tier -
+        modifierSelectHandler.options[0].modifierTypeOption.upgradeCount,
+    ).toEqual(firstRollTiers[0]);
+    expect(
+      modifierSelectHandler.options[1].modifierTypeOption.type.tier -
+        modifierSelectHandler.options[1].modifierTypeOption.upgradeCount,
+    ).toEqual(firstRollTiers[1]);
+    expect(
+      modifierSelectHandler.options[2].modifierTypeOption.type.tier -
+        modifierSelectHandler.options[2].modifierTypeOption.upgradeCount,
+    ).toEqual(firstRollTiers[2]);
   });
 
   it("should generate custom modifiers", async () => {
-    await game.classicMode.startBattle([ Species.ABRA, Species.VOLCARONA ]);
+    await game.classicMode.startBattle([Species.ABRA, Species.VOLCARONA]);
     scene.money = 1000000;
     const customModifiers: CustomModifierSettings = {
-      guaranteedModifierTypeFuncs: [ modifierTypes.MEMORY_MUSHROOM, modifierTypes.TM_ULTRA, modifierTypes.LEFTOVERS, modifierTypes.AMULET_COIN, modifierTypes.GOLDEN_PUNCH ]
+      guaranteedModifierTypeFuncs: [
+        modifierTypes.MEMORY_MUSHROOM,
+        modifierTypes.TM_ULTRA,
+        modifierTypes.LEFTOVERS,
+        modifierTypes.AMULET_COIN,
+        modifierTypes.GOLDEN_PUNCH,
+      ],
     };
     const selectModifierPhase = new SelectModifierPhase(0, undefined, customModifiers);
     scene.unshiftPhase(selectModifierPhase);
     game.move.select(Moves.SPLASH);
     await game.phaseInterceptor.to("SelectModifierPhase");
 
-    expect(scene.ui.getMode()).to.equal(Mode.MODIFIER_SELECT);
-    const modifierSelectHandler = scene.ui.handlers.find(h => h instanceof ModifierSelectUiHandler) as ModifierSelectUiHandler;
+    expect(scene.ui.getMode()).to.equal(UiMode.MODIFIER_SELECT);
+    const modifierSelectHandler = scene.ui.handlers.find(
+      h => h instanceof ModifierSelectUiHandler,
+    ) as ModifierSelectUiHandler;
     expect(modifierSelectHandler.options.length).toEqual(5);
     expect(modifierSelectHandler.options[0].modifierTypeOption.type.id).toEqual("MEMORY_MUSHROOM");
     expect(modifierSelectHandler.options[1].modifierTypeOption.type.id).toEqual("TM_ULTRA");
@@ -153,10 +181,16 @@ describe("SelectModifierPhase", () => {
   });
 
   it("should generate custom modifier tiers that can upgrade from luck", async () => {
-    await game.classicMode.startBattle([ Species.ABRA, Species.VOLCARONA ]);
+    await game.classicMode.startBattle([Species.ABRA, Species.VOLCARONA]);
     scene.money = 1000000;
     const customModifiers: CustomModifierSettings = {
-      guaranteedModifierTiers: [ ModifierTier.COMMON, ModifierTier.GREAT, ModifierTier.ULTRA, ModifierTier.ROGUE, ModifierTier.MASTER ]
+      guaranteedModifierTiers: [
+        ModifierTier.COMMON,
+        ModifierTier.GREAT,
+        ModifierTier.ULTRA,
+        ModifierTier.ROGUE,
+        ModifierTier.MASTER,
+      ],
     };
     const pokemon = new PlayerPokemon(getPokemonSpecies(Species.BULBASAUR), 10, undefined, 0, undefined, true, 2);
 
@@ -171,31 +205,49 @@ describe("SelectModifierPhase", () => {
     game.move.select(Moves.SPLASH);
     await game.phaseInterceptor.to("SelectModifierPhase");
 
-    expect(scene.ui.getMode()).to.equal(Mode.MODIFIER_SELECT);
-    const modifierSelectHandler = scene.ui.handlers.find(h => h instanceof ModifierSelectUiHandler) as ModifierSelectUiHandler;
+    expect(scene.ui.getMode()).to.equal(UiMode.MODIFIER_SELECT);
+    const modifierSelectHandler = scene.ui.handlers.find(
+      h => h instanceof ModifierSelectUiHandler,
+    ) as ModifierSelectUiHandler;
     expect(modifierSelectHandler.options.length).toEqual(5);
-    expect(modifierSelectHandler.options[0].modifierTypeOption.type.tier - modifierSelectHandler.options[0].modifierTypeOption.upgradeCount).toEqual(ModifierTier.COMMON);
-    expect(modifierSelectHandler.options[1].modifierTypeOption.type.tier - modifierSelectHandler.options[1].modifierTypeOption.upgradeCount).toEqual(ModifierTier.GREAT);
-    expect(modifierSelectHandler.options[2].modifierTypeOption.type.tier - modifierSelectHandler.options[2].modifierTypeOption.upgradeCount).toEqual(ModifierTier.ULTRA);
-    expect(modifierSelectHandler.options[3].modifierTypeOption.type.tier - modifierSelectHandler.options[3].modifierTypeOption.upgradeCount).toEqual(ModifierTier.ROGUE);
-    expect(modifierSelectHandler.options[4].modifierTypeOption.type.tier - modifierSelectHandler.options[4].modifierTypeOption.upgradeCount).toEqual(ModifierTier.MASTER);
+    expect(
+      modifierSelectHandler.options[0].modifierTypeOption.type.tier -
+        modifierSelectHandler.options[0].modifierTypeOption.upgradeCount,
+    ).toEqual(ModifierTier.COMMON);
+    expect(
+      modifierSelectHandler.options[1].modifierTypeOption.type.tier -
+        modifierSelectHandler.options[1].modifierTypeOption.upgradeCount,
+    ).toEqual(ModifierTier.GREAT);
+    expect(
+      modifierSelectHandler.options[2].modifierTypeOption.type.tier -
+        modifierSelectHandler.options[2].modifierTypeOption.upgradeCount,
+    ).toEqual(ModifierTier.ULTRA);
+    expect(
+      modifierSelectHandler.options[3].modifierTypeOption.type.tier -
+        modifierSelectHandler.options[3].modifierTypeOption.upgradeCount,
+    ).toEqual(ModifierTier.ROGUE);
+    expect(
+      modifierSelectHandler.options[4].modifierTypeOption.type.tier -
+        modifierSelectHandler.options[4].modifierTypeOption.upgradeCount,
+    ).toEqual(ModifierTier.MASTER);
   });
 
   it("should generate custom modifiers and modifier tiers together", async () => {
-    await game.classicMode.startBattle([ Species.ABRA, Species.VOLCARONA ]);
+    await game.classicMode.startBattle([Species.ABRA, Species.VOLCARONA]);
     scene.money = 1000000;
     const customModifiers: CustomModifierSettings = {
-      guaranteedModifierTypeFuncs: [ modifierTypes.MEMORY_MUSHROOM, modifierTypes.TM_COMMON ],
-      guaranteedModifierTiers: [ ModifierTier.MASTER, ModifierTier.MASTER ]
+      guaranteedModifierTypeFuncs: [modifierTypes.MEMORY_MUSHROOM, modifierTypes.TM_COMMON],
+      guaranteedModifierTiers: [ModifierTier.MASTER, ModifierTier.MASTER],
     };
     const selectModifierPhase = new SelectModifierPhase(0, undefined, customModifiers);
     scene.unshiftPhase(selectModifierPhase);
     game.move.select(Moves.SPLASH);
     await game.phaseInterceptor.run(SelectModifierPhase);
 
-
-    expect(scene.ui.getMode()).to.equal(Mode.MODIFIER_SELECT);
-    const modifierSelectHandler = scene.ui.handlers.find(h => h instanceof ModifierSelectUiHandler) as ModifierSelectUiHandler;
+    expect(scene.ui.getMode()).to.equal(UiMode.MODIFIER_SELECT);
+    const modifierSelectHandler = scene.ui.handlers.find(
+      h => h instanceof ModifierSelectUiHandler,
+    ) as ModifierSelectUiHandler;
     expect(modifierSelectHandler.options.length).toEqual(4);
     expect(modifierSelectHandler.options[0].modifierTypeOption.type.id).toEqual("MEMORY_MUSHROOM");
     expect(modifierSelectHandler.options[1].modifierTypeOption.type.id).toEqual("TM_COMMON");
@@ -204,21 +256,22 @@ describe("SelectModifierPhase", () => {
   });
 
   it("should fill remaining modifiers if fillRemaining is true with custom modifiers", async () => {
-    await game.classicMode.startBattle([ Species.ABRA, Species.VOLCARONA ]);
+    await game.classicMode.startBattle([Species.ABRA, Species.VOLCARONA]);
     scene.money = 1000000;
     const customModifiers: CustomModifierSettings = {
-      guaranteedModifierTypeFuncs: [ modifierTypes.MEMORY_MUSHROOM ],
-      guaranteedModifierTiers: [ ModifierTier.MASTER ],
-      fillRemaining: true
+      guaranteedModifierTypeFuncs: [modifierTypes.MEMORY_MUSHROOM],
+      guaranteedModifierTiers: [ModifierTier.MASTER],
+      fillRemaining: true,
     };
     const selectModifierPhase = new SelectModifierPhase(0, undefined, customModifiers);
     scene.unshiftPhase(selectModifierPhase);
     game.move.select(Moves.SPLASH);
     await game.phaseInterceptor.run(SelectModifierPhase);
 
-
-    expect(scene.ui.getMode()).to.equal(Mode.MODIFIER_SELECT);
-    const modifierSelectHandler = scene.ui.handlers.find(h => h instanceof ModifierSelectUiHandler) as ModifierSelectUiHandler;
+    expect(scene.ui.getMode()).to.equal(UiMode.MODIFIER_SELECT);
+    const modifierSelectHandler = scene.ui.handlers.find(
+      h => h instanceof ModifierSelectUiHandler,
+    ) as ModifierSelectUiHandler;
     expect(modifierSelectHandler.options.length).toEqual(3);
     expect(modifierSelectHandler.options[0].modifierTypeOption.type.id).toEqual("MEMORY_MUSHROOM");
     expect(modifierSelectHandler.options[1].modifierTypeOption.type.tier).toEqual(ModifierTier.MASTER);
diff --git a/src/test/plugins/api/pokerogue-account-api.test.ts b/test/plugins/api/pokerogue-account-api.test.ts
similarity index 76%
rename from src/test/plugins/api/pokerogue-account-api.test.ts
rename to test/plugins/api/pokerogue-account-api.test.ts
index 90a7d3639ad..3c37451960a 100644
--- a/src/test/plugins/api/pokerogue-account-api.test.ts
+++ b/test/plugins/api/pokerogue-account-api.test.ts
@@ -1,14 +1,21 @@
 import type { AccountInfoResponse } from "#app/@types/PokerogueAccountApi";
 import { SESSION_ID_COOKIE_NAME } from "#app/constants";
 import { PokerogueAccountApi } from "#app/plugins/api/pokerogue-account-api";
-import { getApiBaseUrl } from "#app/test/utils/testUtils";
-import * as Utils from "#app/utils";
+import { getApiBaseUrl } from "#test/testUtils/testUtils";
+import * as CookieUtils from "#app/utils/cookies";
+import * as cookies from "#app/utils/cookies";
 import { http, HttpResponse } from "msw";
-import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { beforeAll, afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { initServerForApiTests } from "#test/testUtils/testFileInitialization";
+import type { SetupServerApi } from "msw/node";
 
 const apiBase = getApiBaseUrl();
 const accountApi = new PokerogueAccountApi(apiBase);
-const { server } = global;
+let server: SetupServerApi;
+
+beforeAll(async () => {
+  server = await initServerForApiTests();
+});
 
 afterEach(() => {
   server.resetHandlers();
@@ -30,7 +37,7 @@ describe("Pokerogue Account API", () => {
       };
       server.use(http.get(`${apiBase}/account/info`, () => HttpResponse.json(expectedAccountInfo)));
 
-      const [ accountInfo, status ] = await accountApi.getInfo();
+      const [accountInfo, status] = await accountApi.getInfo();
 
       expect(accountInfo).toEqual(expectedAccountInfo);
       expect(status).toBe(200);
@@ -39,7 +46,7 @@ describe("Pokerogue Account API", () => {
     it("should return null + status-code anad report a warning on FAILURE", async () => {
       server.use(http.get(`${apiBase}/account/info`, () => new HttpResponse("", { status: 401 })));
 
-      const [ accountInfo, status ] = await accountApi.getInfo();
+      const [accountInfo, status] = await accountApi.getInfo();
 
       expect(accountInfo).toBeNull();
       expect(status).toBe(401);
@@ -49,7 +56,7 @@ describe("Pokerogue Account API", () => {
     it("should return null + 500 anad report a warning on ERROR", async () => {
       server.use(http.get(`${apiBase}/account/info`, () => HttpResponse.error()));
 
-      const [ accountInfo, status ] = await accountApi.getInfo();
+      const [accountInfo, status] = await accountApi.getInfo();
 
       expect(accountInfo).toBeNull();
       expect(status).toBe(500);
@@ -70,7 +77,7 @@ describe("Pokerogue Account API", () => {
 
     it("should return error message on FAILURE", async () => {
       server.use(
-        http.post(`${apiBase}/account/register`, () => new HttpResponse("Username is already taken", { status: 400 }))
+        http.post(`${apiBase}/account/register`, () => new HttpResponse("Username is already taken", { status: 400 })),
       );
 
       const error = await accountApi.register(registerParams);
@@ -78,7 +85,7 @@ describe("Pokerogue Account API", () => {
       expect(error).toBe("Username is already taken");
     });
 
-    it("should return \"Unknown error\" and report a warning on ERROR", async () => {
+    it('should return "Unknown error" and report a warning on ERROR', async () => {
       server.use(http.post(`${apiBase}/account/register`, () => HttpResponse.error()));
 
       const error = await accountApi.register(registerParams);
@@ -92,18 +99,18 @@ describe("Pokerogue Account API", () => {
     const loginParams = { username: "test", password: "test" };
 
     it("should return null and set the cookie on SUCCESS", async () => {
-      vi.spyOn(Utils, "setCookie");
+      vi.spyOn(CookieUtils, "setCookie");
       server.use(http.post(`${apiBase}/account/login`, () => HttpResponse.json({ token: "abctest" })));
 
       const error = await accountApi.login(loginParams);
 
       expect(error).toBeNull();
-      expect(Utils.setCookie).toHaveBeenCalledWith(SESSION_ID_COOKIE_NAME, "abctest");
+      expect(cookies.setCookie).toHaveBeenCalledWith(SESSION_ID_COOKIE_NAME, "abctest");
     });
 
     it("should return error message and report a warning on FAILURE", async () => {
       server.use(
-        http.post(`${apiBase}/account/login`, () => new HttpResponse("Password is incorrect", { status: 401 }))
+        http.post(`${apiBase}/account/login`, () => new HttpResponse("Password is incorrect", { status: 401 })),
       );
 
       const error = await accountApi.login(loginParams);
@@ -112,7 +119,7 @@ describe("Pokerogue Account API", () => {
       expect(console.warn).toHaveBeenCalledWith("Login failed!", 401, "Unauthorized");
     });
 
-    it("should return \"Unknown error\" and report a warning on ERROR", async () => {
+    it('should return "Unknown error" and report a warning on ERROR', async () => {
       server.use(http.post(`${apiBase}/account/login`, () => HttpResponse.error()));
 
       const error = await accountApi.login(loginParams);
@@ -124,16 +131,16 @@ describe("Pokerogue Account API", () => {
 
   describe("Logout", () => {
     beforeEach(() => {
-      vi.spyOn(Utils, "removeCookie");
+      vi.spyOn(CookieUtils, "removeCookie");
     });
 
     it("should remove cookie on success", async () => {
-      vi.spyOn(Utils, "setCookie");
+      vi.spyOn(CookieUtils, "setCookie");
       server.use(http.get(`${apiBase}/account/logout`, () => new HttpResponse("", { status: 200 })));
 
       await accountApi.logout();
 
-      expect(Utils.removeCookie).toHaveBeenCalledWith(SESSION_ID_COOKIE_NAME);
+      expect(cookies.removeCookie).toHaveBeenCalledWith(SESSION_ID_COOKIE_NAME);
     });
 
     it("should report a warning on and remove cookie on FAILURE", async () => {
@@ -141,7 +148,7 @@ describe("Pokerogue Account API", () => {
 
       await accountApi.logout();
 
-      expect(Utils.removeCookie).toHaveBeenCalledWith(SESSION_ID_COOKIE_NAME);
+      expect(cookies.removeCookie).toHaveBeenCalledWith(SESSION_ID_COOKIE_NAME);
       expect(console.warn).toHaveBeenCalledWith("Log out failed!", expect.any(Error));
     });
 
@@ -150,7 +157,7 @@ describe("Pokerogue Account API", () => {
 
       await accountApi.logout();
 
-      expect(Utils.removeCookie).toHaveBeenCalledWith(SESSION_ID_COOKIE_NAME);
+      expect(cookies.removeCookie).toHaveBeenCalledWith(SESSION_ID_COOKIE_NAME);
       expect(console.warn).toHaveBeenCalledWith("Log out failed!", expect.any(Error));
     });
   });
diff --git a/src/test/plugins/api/pokerogue-admin-api.test.ts b/test/plugins/api/pokerogue-admin-api.test.ts
similarity index 89%
rename from src/test/plugins/api/pokerogue-admin-api.test.ts
rename to test/plugins/api/pokerogue-admin-api.test.ts
index 5ae46abfcc8..08c4cf0dc45 100644
--- a/src/test/plugins/api/pokerogue-admin-api.test.ts
+++ b/test/plugins/api/pokerogue-admin-api.test.ts
@@ -7,13 +7,19 @@ import type {
   UnlinkAccountFromGoogledIdRequest,
 } from "#app/@types/PokerogueAdminApi";
 import { PokerogueAdminApi } from "#app/plugins/api/pokerogue-admin-api";
-import { getApiBaseUrl } from "#app/test/utils/testUtils";
+import { getApiBaseUrl } from "#test/testUtils/testUtils";
 import { http, HttpResponse } from "msw";
-import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { beforeAll, afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { initServerForApiTests } from "#test/testUtils/testFileInitialization";
+import type { SetupServerApi } from "msw/node";
 
 const apiBase = getApiBaseUrl();
 const adminApi = new PokerogueAdminApi(apiBase);
-const { server } = global;
+let server: SetupServerApi;
+
+beforeAll(async () => {
+  server = await initServerForApiTests();
+});
 
 afterEach(() => {
   server.resetHandlers();
@@ -25,7 +31,10 @@ describe("Pokerogue Admin API", () => {
   });
 
   describe("Link Account to Discord", () => {
-    const params: LinkAccountToDiscordIdRequest = { username: "test", discordId: "test-12575756" };
+    const params: LinkAccountToDiscordIdRequest = {
+      username: "test",
+      discordId: "test-12575756",
+    };
 
     it("should return null on SUCCESS", async () => {
       server.use(http.post(`${apiBase}/admin/account/discordLink`, () => HttpResponse.json(true)));
@@ -64,7 +73,10 @@ describe("Pokerogue Admin API", () => {
   });
 
   describe("Unlink Account from Discord", () => {
-    const params: UnlinkAccountFromDiscordIdRequest = { username: "test", discordId: "test-12575756" };
+    const params: UnlinkAccountFromDiscordIdRequest = {
+      username: "test",
+      discordId: "test-12575756",
+    };
 
     it("should return null on SUCCESS", async () => {
       server.use(http.post(`${apiBase}/admin/account/discordUnlink`, () => HttpResponse.json(true)));
@@ -103,7 +115,10 @@ describe("Pokerogue Admin API", () => {
   });
 
   describe("Link Account to Google", () => {
-    const params: LinkAccountToGoogledIdRequest = { username: "test", googleId: "test-12575756" };
+    const params: LinkAccountToGoogledIdRequest = {
+      username: "test",
+      googleId: "test-12575756",
+    };
 
     it("should return null on SUCCESS", async () => {
       server.use(http.post(`${apiBase}/admin/account/googleLink`, () => HttpResponse.json(true)));
@@ -142,7 +157,10 @@ describe("Pokerogue Admin API", () => {
   });
 
   describe("Unlink Account from Google", () => {
-    const params: UnlinkAccountFromGoogledIdRequest = { username: "test", googleId: "test-12575756" };
+    const params: UnlinkAccountFromGoogledIdRequest = {
+      username: "test",
+      googleId: "test-12575756",
+    };
 
     it("should return null on SUCCESS", async () => {
       server.use(http.post(`${apiBase}/admin/account/googleUnlink`, () => HttpResponse.json(true)));
@@ -193,7 +211,7 @@ describe("Pokerogue Admin API", () => {
       };
       server.use(http.get(`${apiBase}/admin/account/adminSearch`, () => HttpResponse.json(responseData)));
 
-      const [ data, err ] = await adminApi.searchAccount(params);
+      const [data, err] = await adminApi.searchAccount(params);
 
       expect(data).toStrictEqual(responseData);
       expect(err).toBeUndefined();
@@ -202,7 +220,7 @@ describe("Pokerogue Admin API", () => {
     it("should return [undefined, ERR_GENERIC] and report a warning on on FAILURE", async () => {
       server.use(http.get(`${apiBase}/admin/account/adminSearch`, () => new HttpResponse("", { status: 400 })));
 
-      const [ data, err ] = await adminApi.searchAccount(params);
+      const [data, err] = await adminApi.searchAccount(params);
 
       expect(data).toBeUndefined();
       expect(err).toBe(adminApi.ERR_GENERIC);
@@ -212,7 +230,7 @@ describe("Pokerogue Admin API", () => {
     it("should return [undefined, ERR_USERNAME_NOT_FOUND] and report a warning on on 404", async () => {
       server.use(http.get(`${apiBase}/admin/account/adminSearch`, () => new HttpResponse("", { status: 404 })));
 
-      const [ data, err ] = await adminApi.searchAccount(params);
+      const [data, err] = await adminApi.searchAccount(params);
 
       expect(data).toBeUndefined();
       expect(err).toBe(adminApi.ERR_USERNAME_NOT_FOUND);
@@ -222,7 +240,7 @@ describe("Pokerogue Admin API", () => {
     it("should return [undefined, ERR_GENERIC] and report a warning on on ERROR", async () => {
       server.use(http.get(`${apiBase}/admin/account/adminSearch`, () => HttpResponse.error()));
 
-      const [ data, err ] = await adminApi.searchAccount(params);
+      const [data, err] = await adminApi.searchAccount(params);
 
       expect(data).toBeUndefined();
       expect(err).toBe(adminApi.ERR_GENERIC);
diff --git a/src/test/plugins/api/pokerogue-api.test.ts b/test/plugins/api/pokerogue-api.test.ts
similarity index 89%
rename from src/test/plugins/api/pokerogue-api.test.ts
rename to test/plugins/api/pokerogue-api.test.ts
index a62174c226d..c53a38e23ab 100644
--- a/src/test/plugins/api/pokerogue-api.test.ts
+++ b/test/plugins/api/pokerogue-api.test.ts
@@ -1,11 +1,17 @@
 import type { TitleStatsResponse } from "#app/@types/PokerogueApi";
 import { pokerogueApi } from "#app/plugins/api/pokerogue-api";
-import { getApiBaseUrl } from "#app/test/utils/testUtils";
+import { getApiBaseUrl } from "#test/testUtils/testUtils";
 import { http, HttpResponse } from "msw";
-import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { beforeAll, afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { initServerForApiTests } from "#test/testUtils/testFileInitialization";
+import type { SetupServerApi } from "msw/node";
 
 const apiBase = getApiBaseUrl();
-const { server } = global;
+let server: SetupServerApi;
+
+beforeAll(async () => {
+  server = await initServerForApiTests();
+});
 
 afterEach(() => {
   server.resetHandlers();
diff --git a/src/test/plugins/api/pokerogue-daily-api.test.ts b/test/plugins/api/pokerogue-daily-api.test.ts
similarity index 88%
rename from src/test/plugins/api/pokerogue-daily-api.test.ts
rename to test/plugins/api/pokerogue-daily-api.test.ts
index 569e7cbb15d..563e6d09009 100644
--- a/src/test/plugins/api/pokerogue-daily-api.test.ts
+++ b/test/plugins/api/pokerogue-daily-api.test.ts
@@ -1,13 +1,19 @@
 import type { GetDailyRankingsPageCountRequest, GetDailyRankingsRequest } from "#app/@types/PokerogueDailyApi";
 import { PokerogueDailyApi } from "#app/plugins/api/pokerogue-daily-api";
-import { getApiBaseUrl } from "#app/test/utils/testUtils";
+import { getApiBaseUrl } from "#test/testUtils/testUtils";
 import { ScoreboardCategory, type RankingEntry } from "#app/ui/daily-run-scoreboard";
 import { http, HttpResponse } from "msw";
-import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { beforeAll, afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { initServerForApiTests } from "#test/testUtils/testFileInitialization";
+import type { SetupServerApi } from "msw/node";
 
 const apiBase = getApiBaseUrl();
 const dailyApi = new PokerogueDailyApi(apiBase);
-const { server } = global;
+let server: SetupServerApi;
+
+beforeAll(async () => {
+  server = await initServerForApiTests();
+});
 
 afterEach(() => {
   server.resetHandlers();
diff --git a/src/test/plugins/api/pokerogue-savedata-api.test.ts b/test/plugins/api/pokerogue-savedata-api.test.ts
similarity index 80%
rename from src/test/plugins/api/pokerogue-savedata-api.test.ts
rename to test/plugins/api/pokerogue-savedata-api.test.ts
index 6dd402206e5..481ba62c19d 100644
--- a/src/test/plugins/api/pokerogue-savedata-api.test.ts
+++ b/test/plugins/api/pokerogue-savedata-api.test.ts
@@ -1,12 +1,18 @@
 import type { UpdateAllSavedataRequest } from "#app/@types/PokerogueSavedataApi";
 import { PokerogueSavedataApi } from "#app/plugins/api/pokerogue-savedata-api";
-import { getApiBaseUrl } from "#app/test/utils/testUtils";
+import { getApiBaseUrl } from "#test/testUtils/testUtils";
 import { http, HttpResponse } from "msw";
-import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { beforeAll, afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { initServerForApiTests } from "#test/testUtils/testFileInitialization";
+import type { SetupServerApi } from "msw/node";
 
 const apiBase = getApiBaseUrl();
 const savedataApi = new PokerogueSavedataApi(apiBase);
-const { server } = global;
+let server: SetupServerApi;
+
+beforeAll(async () => {
+  server = await initServerForApiTests();
+});
 
 afterEach(() => {
   server.resetHandlers();
diff --git a/src/test/plugins/api/pokerogue-session-savedata-api.test.ts b/test/plugins/api/pokerogue-session-savedata-api.test.ts
similarity index 91%
rename from src/test/plugins/api/pokerogue-session-savedata-api.test.ts
rename to test/plugins/api/pokerogue-session-savedata-api.test.ts
index f453c5edd88..4d4774f2283 100644
--- a/src/test/plugins/api/pokerogue-session-savedata-api.test.ts
+++ b/test/plugins/api/pokerogue-session-savedata-api.test.ts
@@ -8,13 +8,19 @@ import type {
 } from "#app/@types/PokerogueSessionSavedataApi";
 import { PokerogueSessionSavedataApi } from "#app/plugins/api/pokerogue-session-savedata-api";
 import type { SessionSaveData } from "#app/system/game-data";
-import { getApiBaseUrl } from "#app/test/utils/testUtils";
+import { getApiBaseUrl } from "#test/testUtils/testUtils";
 import { http, HttpResponse } from "msw";
-import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { beforeAll, afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { initServerForApiTests } from "#test/testUtils/testFileInitialization";
+import type { SetupServerApi } from "msw/node";
 
 const apiBase = getApiBaseUrl();
 const sessionSavedataApi = new PokerogueSessionSavedataApi(apiBase);
-const { server } = global;
+
+let server: SetupServerApi;
+beforeAll(async () => {
+  server = await initServerForApiTests();
+});
 
 afterEach(() => {
   server.resetHandlers();
@@ -29,7 +35,7 @@ describe("Pokerogue Session Savedata API", () => {
     const params: NewClearSessionSavedataRequest = {
       clientSessionId: "test-session-id",
       isVictory: true,
-      slot: 3
+      slot: 3,
     };
 
     it("should return true on SUCCESS", async () => {
@@ -51,9 +57,7 @@ describe("Pokerogue Session Savedata API", () => {
     it("should return false and report a warning on ERROR", async () => {
       server.use(http.get(`${apiBase}/savedata/session/newclear`, () => HttpResponse.error()));
 
-      const success = await sessionSavedataApi.newclear(params);
-
-      expect(success).toBe(false);
+      await expect(sessionSavedataApi.newclear(params)).rejects.toThrow("Could not newclear session!");
       expect(console.warn).toHaveBeenCalledWith("Could not newclear session!", expect.any(Error));
     });
   });
@@ -132,7 +136,7 @@ describe("Pokerogue Session Savedata API", () => {
 
     it("should return an error string on FAILURE", async () => {
       server.use(
-        http.get(`${apiBase}/savedata/session/delete`, () => new HttpResponse("Failed to delete!", { status: 400 }))
+        http.get(`${apiBase}/savedata/session/delete`, () => new HttpResponse("Failed to delete!", { status: 400 })),
       );
 
       const error = await sessionSavedataApi.delete(params);
@@ -162,8 +166,8 @@ describe("Pokerogue Session Savedata API", () => {
         http.post(`${apiBase}/savedata/session/clear`, () =>
           HttpResponse.json<ClearSessionSavedataResponse>({
             success: true,
-          })
-        )
+          }),
+        ),
       );
 
       const { success, error } = await sessionSavedataApi.clear(params, {} as SessionSaveData);
@@ -178,8 +182,8 @@ describe("Pokerogue Session Savedata API", () => {
           HttpResponse.json<ClearSessionSavedataResponse>({
             success: false,
             error: "Failed to clear!",
-          })
-        )
+          }),
+        ),
       );
 
       const { success, error } = await sessionSavedataApi.clear(params, {} as SessionSaveData);
diff --git a/src/test/plugins/api/pokerogue-system-savedata-api.test.ts b/test/plugins/api/pokerogue-system-savedata-api.test.ts
similarity index 90%
rename from src/test/plugins/api/pokerogue-system-savedata-api.test.ts
rename to test/plugins/api/pokerogue-system-savedata-api.test.ts
index af377762b77..0c69ab8f922 100644
--- a/src/test/plugins/api/pokerogue-system-savedata-api.test.ts
+++ b/test/plugins/api/pokerogue-system-savedata-api.test.ts
@@ -6,13 +6,20 @@ import type {
 } from "#app/@types/PokerogueSystemSavedataApi";
 import { PokerogueSystemSavedataApi } from "#app/plugins/api/pokerogue-system-savedata-api";
 import type { SystemSaveData } from "#app/system/game-data";
-import { getApiBaseUrl } from "#app/test/utils/testUtils";
+import { initServerForApiTests } from "#test/testUtils/testFileInitialization";
+import { getApiBaseUrl } from "#test/testUtils/testUtils";
 import { http, HttpResponse } from "msw";
-import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
+import type { SetupServerApi } from "msw/node";
 
 const apiBase = getApiBaseUrl();
 const systemSavedataApi = new PokerogueSystemSavedataApi(getApiBaseUrl());
-const { server } = global;
+
+let server: SetupServerApi;
+
+beforeAll(async () => {
+  server = await initServerForApiTests();
+});
 
 afterEach(() => {
   server.resetHandlers();
@@ -59,8 +66,8 @@ describe("Pokerogue System Savedata API", () => {
               trainerId: 123456789,
             } as SystemSaveData,
             valid: true,
-          })
-        )
+          }),
+        ),
       );
 
       const savedata = await systemSavedataApi.verify(params);
@@ -76,8 +83,8 @@ describe("Pokerogue System Savedata API", () => {
               trainerId: 123456789,
             } as SystemSaveData,
             valid: false,
-          })
-        )
+          }),
+        ),
       );
 
       const savedata = await systemSavedataApi.verify(params);
diff --git a/src/test/reload.test.ts b/test/reload.test.ts
similarity index 87%
rename from src/test/reload.test.ts
rename to test/reload.test.ts
index b5f66630606..93823e06cce 100644
--- a/src/test/reload.test.ts
+++ b/test/reload.test.ts
@@ -1,13 +1,13 @@
 import { GameModes } from "#app/game-mode";
 import { pokerogueApi } from "#app/plugins/api/pokerogue-api";
 import type OptionSelectUiHandler from "#app/ui/settings/option-select-ui-handler";
-import { Mode } from "#app/ui/ui";
+import { UiMode } from "#enums/ui-mode";
 import { Biome } from "#enums/biome";
 import { Button } from "#enums/buttons";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
-import type { MockClock } from "#test/utils/mocks/mockClock";
+import GameManager from "#test/testUtils/gameManager";
+import type { MockClock } from "#test/testUtils/mocks/mockClock";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
 describe("Reload", () => {
@@ -26,7 +26,10 @@ describe("Reload", () => {
 
   beforeEach(() => {
     game = new GameManager(phaserGame);
-    vi.spyOn(pokerogueApi, "getGameTitleStats").mockResolvedValue({ battleCount: -1, playerCount: -1 });
+    vi.spyOn(pokerogueApi, "getGameTitleStats").mockResolvedValue({
+      battleCount: -1,
+      playerCount: -1,
+    });
     vi.spyOn(pokerogueApi.daily, "getSeed").mockResolvedValue("test-seed");
   });
 
@@ -45,17 +48,17 @@ describe("Reload", () => {
   it("should not have RNG inconsistencies after a biome switch", async () => {
     game.override
       .startingWave(10)
-      .battleType("single")
+      .battleStyle("single")
       .startingLevel(100) // Avoid levelling up
       .disableTrainerWaves()
-      .moveset([ Moves.SPLASH ])
+      .moveset([Moves.SPLASH])
       .enemyMoveset(Moves.SPLASH);
     await game.dailyMode.startBattle();
 
     // Transition from Wave 10 to Wave 11 in order to trigger biome switch
     game.move.select(Moves.SPLASH);
     await game.doKillOpponents();
-    game.onNextPrompt("SelectBiomePhase", Mode.OPTION_SELECT, () => {
+    game.onNextPrompt("SelectBiomePhase", UiMode.OPTION_SELECT, () => {
       (game.scene.time as MockClock).overrideDelay = null;
       const optionSelectUiHandler = game.scene.ui.getHandler() as OptionSelectUiHandler;
       game.scene.time.delayedCall(1010, () => optionSelectUiHandler.processInput(Button.ACTION));
@@ -78,10 +81,10 @@ describe("Reload", () => {
     game.override
       .startingWave(10)
       .startingBiome(Biome.ICE_CAVE) // Will lead to Snowy Forest with randomly generated weather
-      .battleType("single")
+      .battleStyle("single")
       .startingLevel(100) // Avoid levelling up
       .disableTrainerWaves()
-      .moveset([ Moves.SPLASH ])
+      .moveset([Moves.SPLASH])
       .enemyMoveset(Moves.SPLASH);
     await game.classicMode.startBattle(); // Apparently daily mode would override the biome
 
@@ -113,7 +116,7 @@ describe("Reload", () => {
   }, 20000);
 
   it("should not have RNG inconsistencies at a Daily run double battle", async () => {
-    game.override.battleType("double");
+    game.override.battleStyle("double");
     await game.dailyMode.startBattle();
 
     const preReloadRngState = Phaser.Math.RND.state();
@@ -126,7 +129,7 @@ describe("Reload", () => {
   }, 20000);
 
   it("should not have RNG inconsistencies at a Daily run Gym Leader fight", async () => {
-    game.override.battleType("single").startingWave(40);
+    game.override.battleStyle("single").startingWave(40);
     await game.dailyMode.startBattle();
 
     const preReloadRngState = Phaser.Math.RND.state();
@@ -139,7 +142,7 @@ describe("Reload", () => {
   }, 20000);
 
   it("should not have RNG inconsistencies at a Daily run regular trainer fight", async () => {
-    game.override.battleType("single").startingWave(45);
+    game.override.battleStyle("single").startingWave(45);
     await game.dailyMode.startBattle();
 
     const preReloadRngState = Phaser.Math.RND.state();
@@ -152,8 +155,8 @@ describe("Reload", () => {
   }, 20000);
 
   it("should not have RNG inconsistencies at a Daily run wave 50 Boss fight", async () => {
-    game.override.battleType("single").startingWave(50);
-    await game.runToFinalBossEncounter([ Species.BULBASAUR ], GameModes.DAILY);
+    game.override.battleStyle("single").startingWave(50);
+    await game.runToFinalBossEncounter([Species.BULBASAUR], GameModes.DAILY);
 
     const preReloadRngState = Phaser.Math.RND.state();
 
diff --git a/src/test/settingMenu/helpers/inGameManip.ts b/test/settingMenu/helpers/inGameManip.ts
similarity index 96%
rename from src/test/settingMenu/helpers/inGameManip.ts
rename to test/settingMenu/helpers/inGameManip.ts
index b81e577f5b9..ca1fac3bc65 100644
--- a/src/test/settingMenu/helpers/inGameManip.ts
+++ b/test/settingMenu/helpers/inGameManip.ts
@@ -45,7 +45,9 @@ export class InGameManip {
       icon = "KEY_" + icon;
     }
     this.icon = this.config.icons[icon];
-    expect(getIconForLatestInput(this.configs, this.latestSource, this.selectedDevice, this.settingName)).toEqual(this.icon);
+    expect(getIconForLatestInput(this.configs, this.latestSource, this.selectedDevice, this.settingName)).toEqual(
+      this.icon,
+    );
     return this;
   }
 
diff --git a/src/test/settingMenu/helpers/menuManip.ts b/test/settingMenu/helpers/menuManip.ts
similarity index 88%
rename from src/test/settingMenu/helpers/menuManip.ts
rename to test/settingMenu/helpers/menuManip.ts
index 0b1f48525f1..1ddd842c864 100644
--- a/src/test/settingMenu/helpers/menuManip.ts
+++ b/test/settingMenu/helpers/menuManip.ts
@@ -1,4 +1,15 @@
-import { assign, canIAssignThisKey, canIDeleteThisKey, canIOverrideThisSetting, deleteBind, getIconWithKeycode, getIconWithSettingName, getKeyWithKeycode, getKeyWithSettingName, getSettingNameWithKeycode } from "#app/configs/inputs/configHandler";
+import {
+  assign,
+  canIAssignThisKey,
+  canIDeleteThisKey,
+  canIOverrideThisSetting,
+  deleteBind,
+  getIconWithKeycode,
+  getIconWithSettingName,
+  getKeyWithKeycode,
+  getKeyWithSettingName,
+  getSettingNameWithKeycode,
+} from "#app/configs/inputs/configHandler";
 import { SettingKeyboard } from "#app/system/settings/settings-keyboard";
 import { expect } from "vitest";
 
@@ -29,7 +40,10 @@ export class MenuManip {
     const parts = input.split("_");
 
     // Skip the first part and join the rest with an underscore
-    const result = parts.slice(1).map(part => part.toUpperCase()).join("_");
+    const result = parts
+      .slice(1)
+      .map(part => part.toUpperCase())
+      .join("_");
 
     return result;
   }
@@ -43,7 +57,7 @@ export class MenuManip {
   }
 
   iconDisplayedIs(icon) {
-    if (!(icon.toUpperCase().includes("KEY_"))) {
+    if (!icon.toUpperCase().includes("KEY_")) {
       icon = "KEY_" + icon.toUpperCase();
     }
     this.iconDisplayed = this.config.icons[icon];
@@ -99,7 +113,6 @@ export class MenuManip {
     this.confirm();
   }
 
-
   confirm() {
     assign(this.config, this.settingName, this.keycode);
   }
diff --git a/src/test/settingMenu/rebinding_setting.test.ts b/test/settingMenu/rebinding_setting.test.ts
similarity index 72%
rename from src/test/settingMenu/rebinding_setting.test.ts
rename to test/settingMenu/rebinding_setting.test.ts
index cae2df363d8..20a1fe51484 100644
--- a/src/test/settingMenu/rebinding_setting.test.ts
+++ b/test/settingMenu/rebinding_setting.test.ts
@@ -2,17 +2,19 @@ import cfg_keyboard_qwerty from "#app/configs/inputs/cfg_keyboard_qwerty";
 import { getKeyWithKeycode, getKeyWithSettingName } from "#app/configs/inputs/configHandler";
 import type { InterfaceConfig } from "#app/inputs-controller";
 import { SettingKeyboard } from "#app/system/settings/settings-keyboard";
-import { deepCopy } from "#app/utils";
+import { deepCopy } from "#app/utils/data";
 import { Button } from "#enums/buttons";
 import { Device } from "#enums/devices";
 import { InGameManip } from "#test/settingMenu/helpers/inGameManip";
 import { MenuManip } from "#test/settingMenu/helpers/menuManip";
 import { beforeEach, describe, expect, it } from "vitest";
 
-
 describe("Test Rebinding", () => {
+  // biome-ignore lint/suspicious/noImplicitAnyLet: TODO
   let config;
+  // biome-ignore lint/suspicious/noImplicitAnyLet: TODO
   let inGame;
+  // biome-ignore lint/suspicious/noImplicitAnyLet: TODO
   let inTheSettingMenu;
   const configs: Map<string, InterfaceConfig> = new Map();
   const selectedDevice = {
@@ -100,7 +102,12 @@ describe("Test Rebinding", () => {
   it("Check prevent rebind indirectly the d-pad buttons", () => {
     inTheSettingMenu.whenCursorIsOnSetting("Alt_Button_Left").iconDisplayedIs("A");
     inTheSettingMenu.whenCursorIsOnSetting("Alt_Button_Right").iconDisplayedIs("D");
-    inTheSettingMenu.whenCursorIsOnSetting("Alt_Button_Left").iconDisplayedIs("A").weWantThisBindInstead("LEFT").weCantAssignThisKey().butLetsForceIt();
+    inTheSettingMenu
+      .whenCursorIsOnSetting("Alt_Button_Left")
+      .iconDisplayedIs("A")
+      .weWantThisBindInstead("LEFT")
+      .weCantAssignThisKey()
+      .butLetsForceIt();
     inGame.whenWePressOnKeyboard("LEFT").weShouldTriggerTheButton("Left");
     inGame.whenWePressOnKeyboard("A").weShouldTriggerTheButton("Alt_Button_Left");
     inGame.whenWePressOnKeyboard("D").weShouldTriggerTheButton("Alt_Button_Right");
@@ -109,7 +116,12 @@ describe("Test Rebinding", () => {
   it("Swap alt with a d-pad main", () => {
     inGame.whenWePressOnKeyboard("UP").weShouldTriggerTheButton("Button_Up");
     inGame.whenWePressOnKeyboard("W").weShouldTriggerTheButton("Alt_Button_Up");
-    inTheSettingMenu.whenCursorIsOnSetting("Button_Up").iconDisplayedIs("KEY_ARROW_UP").weWantThisBindInstead("W").weCantOverrideThisBind().butLetsForceIt();
+    inTheSettingMenu
+      .whenCursorIsOnSetting("Button_Up")
+      .iconDisplayedIs("KEY_ARROW_UP")
+      .weWantThisBindInstead("W")
+      .weCantOverrideThisBind()
+      .butLetsForceIt();
     inGame.whenWePressOnKeyboard("UP").weShouldTriggerTheButton("Button_Up");
     inGame.whenWePressOnKeyboard("W").weShouldTriggerTheButton("Alt_Button_Up");
   });
@@ -118,19 +130,37 @@ describe("Test Rebinding", () => {
     inGame.whenWePressOnKeyboard("RIGHT").weShouldTriggerTheButton("Button_Right");
     inGame.whenWePressOnKeyboard("UP").weShouldTriggerTheButton("Button_Up");
 
-    inTheSettingMenu.whenCursorIsOnSetting("Button_Left").iconDisplayedIs("KEY_ARROW_LEFT").weWantThisBindInstead("RIGHT").weCantOverrideThisBind().weCantAssignThisKey().butLetsForceIt();
+    inTheSettingMenu
+      .whenCursorIsOnSetting("Button_Left")
+      .iconDisplayedIs("KEY_ARROW_LEFT")
+      .weWantThisBindInstead("RIGHT")
+      .weCantOverrideThisBind()
+      .weCantAssignThisKey()
+      .butLetsForceIt();
 
     inGame.whenWePressOnKeyboard("LEFT").weShouldTriggerTheButton("Button_Left");
     inGame.whenWePressOnKeyboard("RIGHT").weShouldTriggerTheButton("Button_Right");
     inGame.whenWePressOnKeyboard("UP").weShouldTriggerTheButton("Button_Up");
 
-    inTheSettingMenu.whenCursorIsOnSetting("Button_Left").iconDisplayedIs("KEY_ARROW_LEFT").weWantThisBindInstead("UP").weCantOverrideThisBind().weCantAssignThisKey().butLetsForceIt();
+    inTheSettingMenu
+      .whenCursorIsOnSetting("Button_Left")
+      .iconDisplayedIs("KEY_ARROW_LEFT")
+      .weWantThisBindInstead("UP")
+      .weCantOverrideThisBind()
+      .weCantAssignThisKey()
+      .butLetsForceIt();
 
     inGame.whenWePressOnKeyboard("LEFT").weShouldTriggerTheButton("Button_Left");
     inGame.whenWePressOnKeyboard("RIGHT").weShouldTriggerTheButton("Button_Right");
     inGame.whenWePressOnKeyboard("UP").weShouldTriggerTheButton("Button_Up");
 
-    inTheSettingMenu.whenCursorIsOnSetting("Button_Left").iconDisplayedIs("KEY_ARROW_LEFT").weWantThisBindInstead("RIGHT").weCantOverrideThisBind().weCantAssignThisKey().butLetsForceIt();
+    inTheSettingMenu
+      .whenCursorIsOnSetting("Button_Left")
+      .iconDisplayedIs("KEY_ARROW_LEFT")
+      .weWantThisBindInstead("RIGHT")
+      .weCantOverrideThisBind()
+      .weCantAssignThisKey()
+      .butLetsForceIt();
 
     inGame.whenWePressOnKeyboard("LEFT").weShouldTriggerTheButton("Button_Left");
     inGame.whenWePressOnKeyboard("RIGHT").weShouldTriggerTheButton("Button_Right");
@@ -142,19 +172,31 @@ describe("Test Rebinding", () => {
     inGame.whenWePressOnKeyboard("D").weShouldTriggerTheButton("Alt_Button_Right");
     inGame.whenWePressOnKeyboard("W").weShouldTriggerTheButton("Alt_Button_Up");
 
-    inTheSettingMenu.whenCursorIsOnSetting("Alt_Button_Left").iconDisplayedIs("KEY_A").weWantThisBindInstead("D").confirm();
+    inTheSettingMenu
+      .whenCursorIsOnSetting("Alt_Button_Left")
+      .iconDisplayedIs("KEY_A")
+      .weWantThisBindInstead("D")
+      .confirm();
 
     inGame.whenWePressOnKeyboard("A").nothingShouldHappen();
     inGame.whenWePressOnKeyboard("D").weShouldTriggerTheButton("Alt_Button_Left");
     inGame.whenWePressOnKeyboard("W").weShouldTriggerTheButton("Alt_Button_Up");
 
-    inTheSettingMenu.whenCursorIsOnSetting("Alt_Button_Left").iconDisplayedIs("KEY_D").weWantThisBindInstead("W").confirm();
+    inTheSettingMenu
+      .whenCursorIsOnSetting("Alt_Button_Left")
+      .iconDisplayedIs("KEY_D")
+      .weWantThisBindInstead("W")
+      .confirm();
 
     inGame.whenWePressOnKeyboard("A").nothingShouldHappen();
     inGame.whenWePressOnKeyboard("D").nothingShouldHappen();
     inGame.whenWePressOnKeyboard("W").weShouldTriggerTheButton("Alt_Button_Left");
 
-    inTheSettingMenu.whenCursorIsOnSetting("Alt_Button_Left").iconDisplayedIs("KEY_W").weWantThisBindInstead("D").confirm();
+    inTheSettingMenu
+      .whenCursorIsOnSetting("Alt_Button_Left")
+      .iconDisplayedIs("KEY_W")
+      .weWantThisBindInstead("D")
+      .confirm();
 
     inGame.whenWePressOnKeyboard("A").nothingShouldHappen();
     inGame.whenWePressOnKeyboard("D").weShouldTriggerTheButton("Alt_Button_Left");
@@ -162,18 +204,36 @@ describe("Test Rebinding", () => {
   });
 
   it("Check if triple swap d-pad is prevented", () => {
-    inTheSettingMenu.whenCursorIsOnSetting("Button_Left").iconDisplayedIs("KEY_ARROW_LEFT").weWantThisBindInstead("RIGHT").weCantOverrideThisBind().weCantAssignThisKey().butLetsForceIt();
+    inTheSettingMenu
+      .whenCursorIsOnSetting("Button_Left")
+      .iconDisplayedIs("KEY_ARROW_LEFT")
+      .weWantThisBindInstead("RIGHT")
+      .weCantOverrideThisBind()
+      .weCantAssignThisKey()
+      .butLetsForceIt();
 
     inGame.whenWePressOnKeyboard("LEFT").weShouldTriggerTheButton("Button_Left");
     inGame.whenWePressOnKeyboard("RIGHT").weShouldTriggerTheButton("Button_Right");
     inGame.whenWePressOnKeyboard("UP").weShouldTriggerTheButton("Button_Up");
 
-    inTheSettingMenu.whenCursorIsOnSetting("Button_Right").iconDisplayedIs("KEY_ARROW_RIGHT").weWantThisBindInstead("UP").weCantOverrideThisBind().weCantAssignThisKey().butLetsForceIt();
+    inTheSettingMenu
+      .whenCursorIsOnSetting("Button_Right")
+      .iconDisplayedIs("KEY_ARROW_RIGHT")
+      .weWantThisBindInstead("UP")
+      .weCantOverrideThisBind()
+      .weCantAssignThisKey()
+      .butLetsForceIt();
     inGame.whenWePressOnKeyboard("LEFT").weShouldTriggerTheButton("Button_Left");
     inGame.whenWePressOnKeyboard("RIGHT").weShouldTriggerTheButton("Button_Right");
     inGame.whenWePressOnKeyboard("UP").weShouldTriggerTheButton("Button_Up");
 
-    inTheSettingMenu.whenCursorIsOnSetting("Button_Left").iconDisplayedIs("KEY_ARROW_LEFT").weWantThisBindInstead("LEFT").weCantOverrideThisBind().weCantAssignThisKey().butLetsForceIt();
+    inTheSettingMenu
+      .whenCursorIsOnSetting("Button_Left")
+      .iconDisplayedIs("KEY_ARROW_LEFT")
+      .weWantThisBindInstead("LEFT")
+      .weCantOverrideThisBind()
+      .weCantAssignThisKey()
+      .butLetsForceIt();
     inGame.whenWePressOnKeyboard("LEFT").weShouldTriggerTheButton("Button_Left");
     inGame.whenWePressOnKeyboard("RIGHT").weShouldTriggerTheButton("Button_Right");
     inGame.whenWePressOnKeyboard("UP").weShouldTriggerTheButton("Button_Up");
@@ -184,19 +244,31 @@ describe("Test Rebinding", () => {
     inGame.whenWePressOnKeyboard("D").weShouldTriggerTheButton("Alt_Button_Right");
     inGame.whenWePressOnKeyboard("W").weShouldTriggerTheButton("Alt_Button_Up");
 
-    inTheSettingMenu.whenCursorIsOnSetting("Alt_Button_Left").iconDisplayedIs("KEY_A").weWantThisBindInstead("D").confirm();
+    inTheSettingMenu
+      .whenCursorIsOnSetting("Alt_Button_Left")
+      .iconDisplayedIs("KEY_A")
+      .weWantThisBindInstead("D")
+      .confirm();
 
     inGame.whenWePressOnKeyboard("A").nothingShouldHappen();
     inGame.whenWePressOnKeyboard("D").weShouldTriggerTheButton("Alt_Button_Left");
     inGame.whenWePressOnKeyboard("W").weShouldTriggerTheButton("Alt_Button_Up");
 
-    inTheSettingMenu.whenCursorIsOnSetting("Alt_Button_Right").thereShouldBeNoIcon().weWantThisBindInstead("W").confirm();
+    inTheSettingMenu
+      .whenCursorIsOnSetting("Alt_Button_Right")
+      .thereShouldBeNoIcon()
+      .weWantThisBindInstead("W")
+      .confirm();
 
     inGame.whenWePressOnKeyboard("A").nothingShouldHappen();
     inGame.whenWePressOnKeyboard("D").weShouldTriggerTheButton("Alt_Button_Left");
     inGame.whenWePressOnKeyboard("W").weShouldTriggerTheButton("Alt_Button_Right");
 
-    inTheSettingMenu.whenCursorIsOnSetting("Alt_Button_Left").iconDisplayedIs("KEY_D").weWantThisBindInstead("A").confirm();
+    inTheSettingMenu
+      .whenCursorIsOnSetting("Alt_Button_Left")
+      .iconDisplayedIs("KEY_D")
+      .weWantThisBindInstead("A")
+      .confirm();
 
     inGame.whenWePressOnKeyboard("A").weShouldTriggerTheButton("Alt_Button_Left");
     inGame.whenWePressOnKeyboard("D").nothingShouldHappen();
@@ -216,12 +288,20 @@ describe("Test Rebinding", () => {
     inGame.whenWePressOnKeyboard("R").weShouldTriggerTheButton("Button_Cycle_Shiny");
     inGame.whenWePressOnKeyboard("A").weShouldTriggerTheButton("Alt_Button_Left");
     inGame.whenWePressOnKeyboard("F").weShouldTriggerTheButton("Button_Cycle_Form");
-    inTheSettingMenu.whenCursorIsOnSetting("Button_Cycle_Shiny").iconDisplayedIs("KEY_R").weWantThisBindInstead("D").confirm();
+    inTheSettingMenu
+      .whenCursorIsOnSetting("Button_Cycle_Shiny")
+      .iconDisplayedIs("KEY_R")
+      .weWantThisBindInstead("D")
+      .confirm();
     inGame.whenWePressOnKeyboard("D").weShouldTriggerTheButton("Button_Cycle_Shiny");
     inGame.whenWePressOnKeyboard("R").nothingShouldHappen();
     inGame.whenWePressOnKeyboard("A").weShouldTriggerTheButton("Alt_Button_Left");
     inGame.whenWePressOnKeyboard("F").weShouldTriggerTheButton("Button_Cycle_Form");
-    inTheSettingMenu.whenCursorIsOnSetting("Button_Cycle_Form").iconDisplayedIs("KEY_F").weWantThisBindInstead("R").confirm();
+    inTheSettingMenu
+      .whenCursorIsOnSetting("Button_Cycle_Form")
+      .iconDisplayedIs("KEY_F")
+      .weWantThisBindInstead("R")
+      .confirm();
     inGame.whenWePressOnKeyboard("D").weShouldTriggerTheButton("Button_Cycle_Shiny");
     inGame.whenWePressOnKeyboard("R").weShouldTriggerTheButton("Button_Cycle_Form");
     inGame.whenWePressOnKeyboard("A").weShouldTriggerTheButton("Alt_Button_Left");
@@ -231,7 +311,11 @@ describe("Test Rebinding", () => {
   it("Swap alt with a key not binded yet", () => {
     inGame.whenWePressOnKeyboard("W").weShouldTriggerTheButton("Alt_Button_Up");
     inGame.whenWePressOnKeyboard("B").nothingShouldHappen();
-    inTheSettingMenu.whenCursorIsOnSetting("Alt_Button_Up").iconDisplayedIs("KEY_W").weWantThisBindInstead("B").confirm();
+    inTheSettingMenu
+      .whenCursorIsOnSetting("Alt_Button_Up")
+      .iconDisplayedIs("KEY_W")
+      .weWantThisBindInstead("B")
+      .confirm();
     inGame.whenWePressOnKeyboard("W").nothingShouldHappen();
     inGame.whenWePressOnKeyboard("B").weShouldTriggerTheButton("Alt_Button_Up");
   });
@@ -252,7 +336,11 @@ describe("Test Rebinding", () => {
     inTheSettingMenu.whenWeDelete("Alt_Button_Left").thereShouldBeNoIconAnymore();
     inGame.whenWePressOnKeyboard("A").nothingShouldHappen();
     inGame.whenWePressOnKeyboard("B").nothingShouldHappen();
-    inTheSettingMenu.whenCursorIsOnSetting("Alt_Button_Left").thereShouldBeNoIcon().weWantThisBindInstead("B").confirm();
+    inTheSettingMenu
+      .whenCursorIsOnSetting("Alt_Button_Left")
+      .thereShouldBeNoIcon()
+      .weWantThisBindInstead("B")
+      .confirm();
     inGame.whenWePressOnKeyboard("A").nothingShouldHappen();
     inGame.whenWePressOnKeyboard("B").weShouldTriggerTheButton("Alt_Button_Left");
   });
@@ -261,13 +349,21 @@ describe("Test Rebinding", () => {
     inGame.whenWePressOnKeyboard("F").weShouldTriggerTheButton("Button_Cycle_Form");
     inGame.whenWePressOnKeyboard("W").weShouldTriggerTheButton("Alt_Button_Up");
     inGame.whenWePressOnKeyboard("D").weShouldTriggerTheButton("Alt_Button_Right");
-    inTheSettingMenu.whenCursorIsOnSetting("Button_Cycle_Shiny").iconDisplayedIs("KEY_R").weWantThisBindInstead("D").confirm();
+    inTheSettingMenu
+      .whenCursorIsOnSetting("Button_Cycle_Shiny")
+      .iconDisplayedIs("KEY_R")
+      .weWantThisBindInstead("D")
+      .confirm();
     inGame.whenWePressOnKeyboard("R").nothingShouldHappen();
     inGame.whenWePressOnKeyboard("F").weShouldTriggerTheButton("Button_Cycle_Form");
     inGame.whenWePressOnKeyboard("W").weShouldTriggerTheButton("Alt_Button_Up");
     inGame.whenWePressOnKeyboard("D").weShouldTriggerTheButton("Button_Cycle_Shiny");
 
-    inTheSettingMenu.whenCursorIsOnSetting("Button_Cycle_Form").iconDisplayedIs("KEY_F").weWantThisBindInstead("W").confirm();
+    inTheSettingMenu
+      .whenCursorIsOnSetting("Button_Cycle_Form")
+      .iconDisplayedIs("KEY_F")
+      .weWantThisBindInstead("W")
+      .confirm();
     inGame.whenWePressOnKeyboard("R").nothingShouldHappen();
     inGame.whenWePressOnKeyboard("F").nothingShouldHappen();
     inGame.whenWePressOnKeyboard("W").weShouldTriggerTheButton("Button_Cycle_Form");
@@ -283,7 +379,11 @@ describe("Test Rebinding", () => {
     inGame.whenWePressOnKeyboard("A").nothingShouldHappen();
     inGame.whenWePressOnKeyboard("B").nothingShouldHappen();
 
-    inTheSettingMenu.whenCursorIsOnSetting("Alt_Button_Down").iconDisplayedIs("KEY_S").weWantThisBindInstead("B").confirm();
+    inTheSettingMenu
+      .whenCursorIsOnSetting("Alt_Button_Down")
+      .iconDisplayedIs("KEY_S")
+      .weWantThisBindInstead("B")
+      .confirm();
     inGame.whenWePressOnKeyboard("R").nothingShouldHappen();
     inGame.whenWePressOnKeyboard("F").nothingShouldHappen();
     inGame.whenWePressOnKeyboard("W").weShouldTriggerTheButton("Button_Cycle_Form");
@@ -293,9 +393,7 @@ describe("Test Rebinding", () => {
     inGame.whenWePressOnKeyboard("B").weShouldTriggerTheButton("Alt_Button_Down");
   });
 
-
   it("Delete bind then assign not already existing button", () => {
-
     inGame.whenWePressOnKeyboard("A").weShouldTriggerTheButton("Alt_Button_Left");
     inGame.whenWePressOnKeyboard("B").nothingShouldHappen();
 
@@ -303,23 +401,34 @@ describe("Test Rebinding", () => {
     inGame.whenWePressOnKeyboard("A").nothingShouldHappen();
     inGame.whenWePressOnKeyboard("B").nothingShouldHappen();
 
-    inTheSettingMenu.whenCursorIsOnSetting("Alt_Button_Left").thereShouldBeNoIcon().weWantThisBindInstead("B").confirm();
+    inTheSettingMenu
+      .whenCursorIsOnSetting("Alt_Button_Left")
+      .thereShouldBeNoIcon()
+      .weWantThisBindInstead("B")
+      .confirm();
     inGame.whenWePressOnKeyboard("A").nothingShouldHappen();
     inGame.whenWePressOnKeyboard("B").weShouldTriggerTheButton("Alt_Button_Left");
   });
 
-
   it("change alt bind to not already existing button, than another one alt bind with another not already existing button", () => {
     inGame.whenWePressOnKeyboard("A").weShouldTriggerTheButton("Alt_Button_Left");
     inGame.whenWePressOnKeyboard("D").weShouldTriggerTheButton("Alt_Button_Right");
     inGame.whenWePressOnKeyboard("B").nothingShouldHappen();
     inGame.whenWePressOnKeyboard("U").nothingShouldHappen();
-    inTheSettingMenu.whenCursorIsOnSetting("Alt_Button_Left").iconDisplayedIs("KEY_A").weWantThisBindInstead("B").confirm();
+    inTheSettingMenu
+      .whenCursorIsOnSetting("Alt_Button_Left")
+      .iconDisplayedIs("KEY_A")
+      .weWantThisBindInstead("B")
+      .confirm();
     inGame.whenWePressOnKeyboard("A").nothingShouldHappen();
     inGame.whenWePressOnKeyboard("D").weShouldTriggerTheButton("Alt_Button_Right");
     inGame.whenWePressOnKeyboard("B").weShouldTriggerTheButton("Alt_Button_Left");
     inGame.whenWePressOnKeyboard("U").nothingShouldHappen();
-    inTheSettingMenu.whenCursorIsOnSetting("Alt_Button_Right").iconDisplayedIs("KEY_D").weWantThisBindInstead("U").confirm();
+    inTheSettingMenu
+      .whenCursorIsOnSetting("Alt_Button_Right")
+      .iconDisplayedIs("KEY_D")
+      .weWantThisBindInstead("U")
+      .confirm();
     inGame.whenWePressOnKeyboard("A").nothingShouldHappen();
     inGame.whenWePressOnKeyboard("D").nothingShouldHappen();
     inGame.whenWePressOnKeyboard("B").weShouldTriggerTheButton("Alt_Button_Left");
@@ -331,26 +440,38 @@ describe("Test Rebinding", () => {
     inGame.whenWePressOnKeyboard("RIGHT").weShouldTriggerTheButton("Button_Right");
     inGame.whenWePressOnKeyboard("W").weShouldTriggerTheButton("Alt_Button_Up");
     inGame.whenWePressOnKeyboard("D").weShouldTriggerTheButton("Alt_Button_Right");
-    inTheSettingMenu.whenCursorIsOnSetting("Button_Up").iconDisplayedIs("KEY_ARROW_UP").weWantThisBindInstead("RIGHT").weCantOverrideThisBind().weCantAssignThisKey().butLetsForceIt();
+    inTheSettingMenu
+      .whenCursorIsOnSetting("Button_Up")
+      .iconDisplayedIs("KEY_ARROW_UP")
+      .weWantThisBindInstead("RIGHT")
+      .weCantOverrideThisBind()
+      .weCantAssignThisKey()
+      .butLetsForceIt();
     inGame.whenWePressOnKeyboard("UP").weShouldTriggerTheButton("Button_Up");
     inGame.whenWePressOnKeyboard("RIGHT").weShouldTriggerTheButton("Button_Right");
     inGame.whenWePressOnKeyboard("W").weShouldTriggerTheButton("Alt_Button_Up");
     inGame.whenWePressOnKeyboard("D").weShouldTriggerTheButton("Alt_Button_Right");
-    inTheSettingMenu.whenCursorIsOnSetting("Alt_Button_Up").iconDisplayedIs("KEY_W").weWantThisBindInstead("D").confirm();
+    inTheSettingMenu
+      .whenCursorIsOnSetting("Alt_Button_Up")
+      .iconDisplayedIs("KEY_W")
+      .weWantThisBindInstead("D")
+      .confirm();
     inGame.whenWePressOnKeyboard("UP").weShouldTriggerTheButton("Button_Up");
     inGame.whenWePressOnKeyboard("RIGHT").weShouldTriggerTheButton("Button_Right");
     inGame.whenWePressOnKeyboard("W").nothingShouldHappen();
     inGame.whenWePressOnKeyboard("D").weShouldTriggerTheButton("Alt_Button_Up");
-    inTheSettingMenu.whenCursorIsOnSetting("Alt_Button_Up").iconDisplayedIs("KEY_D").weWantThisBindInstead("W").confirm();
+    inTheSettingMenu
+      .whenCursorIsOnSetting("Alt_Button_Up")
+      .iconDisplayedIs("KEY_D")
+      .weWantThisBindInstead("W")
+      .confirm();
     inGame.whenWePressOnKeyboard("UP").weShouldTriggerTheButton("Button_Up");
     inGame.whenWePressOnKeyboard("RIGHT").weShouldTriggerTheButton("Button_Right");
     inGame.whenWePressOnKeyboard("W").weShouldTriggerTheButton("Alt_Button_Up");
     inGame.whenWePressOnKeyboard("D").nothingShouldHappen();
   });
 
-
   it("Delete 2 bind then reassign one of them", () => {
-
     inGame.whenWePressOnKeyboard("A").weShouldTriggerTheButton("Alt_Button_Left");
     inGame.whenWePressOnKeyboard("D").weShouldTriggerTheButton("Alt_Button_Right");
 
@@ -362,7 +483,11 @@ describe("Test Rebinding", () => {
     inGame.whenWePressOnKeyboard("A").nothingShouldHappen();
     inGame.whenWePressOnKeyboard("D").nothingShouldHappen();
 
-    inTheSettingMenu.whenCursorIsOnSetting("Alt_Button_Left").thereShouldBeNoIcon().weWantThisBindInstead("A").confirm();
+    inTheSettingMenu
+      .whenCursorIsOnSetting("Alt_Button_Left")
+      .thereShouldBeNoIcon()
+      .weWantThisBindInstead("A")
+      .confirm();
     inGame.whenWePressOnKeyboard("A").weShouldTriggerTheButton("Alt_Button_Left");
     inGame.whenWePressOnKeyboard("D").nothingShouldHappen();
   });
@@ -391,24 +516,74 @@ describe("Test Rebinding", () => {
     inGame.whenWePressOnKeyboard("ESC").weShouldTriggerTheButton("Button_Menu");
     inGame.whenWePressOnKeyboard("HOME").nothingShouldHappen();
     inGame.whenWePressOnKeyboard("DELETE").nothingShouldHappen();
-    inTheSettingMenu.whenCursorIsOnSetting("Button_Submit").iconDisplayedIs("KEY_ENTER").whenWeDelete().iconDisplayedIs("KEY_ENTER");
-    inTheSettingMenu.whenCursorIsOnSetting("Button_Up").iconDisplayedIs("KEY_ARROW_UP").whenWeDelete().iconDisplayedIs("KEY_ARROW_UP");
-    inTheSettingMenu.whenCursorIsOnSetting("Button_Down").iconDisplayedIs("KEY_ARROW_DOWN").whenWeDelete().iconDisplayedIs("KEY_ARROW_DOWN");
-    inTheSettingMenu.whenCursorIsOnSetting("Button_Left").iconDisplayedIs("KEY_ARROW_LEFT").whenWeDelete().iconDisplayedIs("KEY_ARROW_LEFT");
-    inTheSettingMenu.whenCursorIsOnSetting("Button_Right").iconDisplayedIs("KEY_ARROW_RIGHT").whenWeDelete().iconDisplayedIs("KEY_ARROW_RIGHT");
-    inTheSettingMenu.whenCursorIsOnSetting("Button_Menu").iconDisplayedIs("KEY_ESC").whenWeDelete().iconDisplayedIs("KEY_ESC");
-    inTheSettingMenu.whenCursorIsOnSetting("Alt_Button_Up").iconDisplayedIs("KEY_W").whenWeDelete().thereShouldBeNoIconAnymore();
-    inTheSettingMenu.whenCursorIsOnSetting("Alt_Button_Up").thereShouldBeNoIcon().weWantThisBindInstead("DELETE").weCantAssignThisKey().butLetsForceIt();
-    inTheSettingMenu.whenCursorIsOnSetting("Alt_Button_Up").thereShouldBeNoIcon().weWantThisBindInstead("HOME").weCantAssignThisKey().butLetsForceIt();
+    inTheSettingMenu
+      .whenCursorIsOnSetting("Button_Submit")
+      .iconDisplayedIs("KEY_ENTER")
+      .whenWeDelete()
+      .iconDisplayedIs("KEY_ENTER");
+    inTheSettingMenu
+      .whenCursorIsOnSetting("Button_Up")
+      .iconDisplayedIs("KEY_ARROW_UP")
+      .whenWeDelete()
+      .iconDisplayedIs("KEY_ARROW_UP");
+    inTheSettingMenu
+      .whenCursorIsOnSetting("Button_Down")
+      .iconDisplayedIs("KEY_ARROW_DOWN")
+      .whenWeDelete()
+      .iconDisplayedIs("KEY_ARROW_DOWN");
+    inTheSettingMenu
+      .whenCursorIsOnSetting("Button_Left")
+      .iconDisplayedIs("KEY_ARROW_LEFT")
+      .whenWeDelete()
+      .iconDisplayedIs("KEY_ARROW_LEFT");
+    inTheSettingMenu
+      .whenCursorIsOnSetting("Button_Right")
+      .iconDisplayedIs("KEY_ARROW_RIGHT")
+      .whenWeDelete()
+      .iconDisplayedIs("KEY_ARROW_RIGHT");
+    inTheSettingMenu
+      .whenCursorIsOnSetting("Button_Menu")
+      .iconDisplayedIs("KEY_ESC")
+      .whenWeDelete()
+      .iconDisplayedIs("KEY_ESC");
+    inTheSettingMenu
+      .whenCursorIsOnSetting("Alt_Button_Up")
+      .iconDisplayedIs("KEY_W")
+      .whenWeDelete()
+      .thereShouldBeNoIconAnymore();
+    inTheSettingMenu
+      .whenCursorIsOnSetting("Alt_Button_Up")
+      .thereShouldBeNoIcon()
+      .weWantThisBindInstead("DELETE")
+      .weCantAssignThisKey()
+      .butLetsForceIt();
+    inTheSettingMenu
+      .whenCursorIsOnSetting("Alt_Button_Up")
+      .thereShouldBeNoIcon()
+      .weWantThisBindInstead("HOME")
+      .weCantAssignThisKey()
+      .butLetsForceIt();
     inGame.whenWePressOnKeyboard("DELETE").nothingShouldHappen();
     inGame.whenWePressOnKeyboard("HOME").nothingShouldHappen();
     inGame.whenWePressOnKeyboard("W").nothingShouldHappen();
   });
 
   it("check to delete all the binds of an action", () => {
-    inGame.whenWePressOnKeyboard("V").weShouldTriggerTheButton("Button_Cycle_Variant");
-    inTheSettingMenu.whenCursorIsOnSetting("Alt_Button_Cycle_Variant").thereShouldBeNoIcon().weWantThisBindInstead("K").confirm();
-    inTheSettingMenu.whenCursorIsOnSetting("Alt_Button_Cycle_Variant").iconDisplayedIs("KEY_K").whenWeDelete().thereShouldBeNoIconAnymore();
-    inTheSettingMenu.whenCursorIsOnSetting("Button_Cycle_Variant").iconDisplayedIs("KEY_V").whenWeDelete().thereShouldBeNoIconAnymore();
+    inGame.whenWePressOnKeyboard("V").weShouldTriggerTheButton("Button_Cycle_Tera");
+    inTheSettingMenu
+      .whenCursorIsOnSetting("Alt_Button_Cycle_Tera")
+      .thereShouldBeNoIcon()
+      .weWantThisBindInstead("K")
+      .confirm();
+    inTheSettingMenu
+      .whenCursorIsOnSetting("Alt_Button_Cycle_Tera")
+      .iconDisplayedIs("KEY_K")
+      .whenWeDelete()
+      .thereShouldBeNoIconAnymore();
+    inTheSettingMenu
+      .whenCursorIsOnSetting("Button_Cycle_Tera")
+      .iconDisplayedIs("KEY_V")
+      .whenWeDelete()
+      .thereShouldBeNoIconAnymore();
   });
 });
diff --git a/src/test/sprites/pokemonSprite.test.ts b/test/sprites/pokemonSprite.test.ts
similarity index 79%
rename from src/test/sprites/pokemonSprite.test.ts
rename to test/sprites/pokemonSprite.test.ts
index 00877bc25c2..a008b75b42e 100644
--- a/src/test/sprites/pokemonSprite.test.ts
+++ b/test/sprites/pokemonSprite.test.ts
@@ -2,9 +2,11 @@ import { getAppRootDir } from "#test/sprites/spritesUtils";
 import fs from "fs";
 import path from "path";
 import { beforeAll, describe, expect, it } from "vitest";
-import _masterlist from "../../../public/images/pokemon/variant/_masterlist.json";
+import _masterlist from "../../public/images/pokemon/variant/_masterlist.json";
+import _exp_masterlist from "../../public/images/pokemon/variant/_exp_masterlist.json";
 
 type PokemonVariantMasterlist = typeof _masterlist;
+type PokemonExpVariantMasterlist = typeof _exp_masterlist;
 
 const deepCopy = (data: any) => {
   return JSON.parse(JSON.stringify(data));
@@ -12,7 +14,7 @@ const deepCopy = (data: any) => {
 
 describe("check if every variant's sprite are correctly set", () => {
   let masterlist: PokemonVariantMasterlist;
-  let expVariant: PokemonVariantMasterlist["exp"];
+  let expVariant: PokemonExpVariantMasterlist;
   let femaleVariant: PokemonVariantMasterlist["female"];
   let backVariant: PokemonVariantMasterlist["back"];
   let rootDir: string;
@@ -20,13 +22,12 @@ describe("check if every variant's sprite are correctly set", () => {
   beforeAll(() => {
     rootDir = `${getAppRootDir()}${path.sep}public${path.sep}images${path.sep}pokemon${path.sep}variant${path.sep}`;
     masterlist = deepCopy(_masterlist);
-    expVariant = masterlist.exp;
+    expVariant = deepCopy(_exp_masterlist);
     femaleVariant = masterlist.female;
     backVariant = masterlist.back;
-    //@ts-ignore
-    delete masterlist.exp; //TODO: resolve ts-ignore
-    //@ts-ignore
-    delete masterlist.female; //TODO: resolve ts-ignore
+
+    // @ts-ignore
+    delete masterlist.female; // TODO: resolve ts-ignore
     //@ts-ignore
     delete masterlist.back; //TODO: resolve ts-ignore
   });
@@ -42,7 +43,7 @@ describe("check if every variant's sprite are correctly set", () => {
     const errors: string[] = [];
     const trimmedDirpath = `variant${path.sep}${dirpath.split(rootDir)[1]}`;
     if (fs.existsSync(dirpath)) {
-      const files = fs.readdirSync(dirpath).filter((filename) => !/^\..*/.test(filename));
+      const files = fs.readdirSync(dirpath).filter(filename => !/^\..*/.test(filename));
       for (const filename of files) {
         const filePath = `${dirpath}${filename}`;
         const trimmedFilePath = `${trimmedDirpath}${filename}`;
@@ -54,7 +55,7 @@ describe("check if every variant's sprite are correctly set", () => {
         if (name.includes("_")) {
           const id = name.split("_")[0];
           const variant = name.split("_")[1];
-          const index = parseInt(variant, 10) - 1;
+          const index = Number.parseInt(variant, 10) - 1;
           if (ext !== "json") {
             const urlJsonFile = `${dirpath}${id}.json`;
             if (mlist.hasOwnProperty(id)) {
@@ -78,7 +79,9 @@ describe("check if every variant's sprite are correctly set", () => {
                   const trimmedUrlSpriteFilepath = `${trimmedDirpath}${id}_${variant}.json`;
                   const spriteFileExists = fs.existsSync(urlSpriteJsonFile);
                   if (spriteFileExists) {
-                    errors.push(`[${id}] [${mlist[id]}] - the value should be 2 for the index ${index} - ${trimmedUrlSpriteFilepath}`);
+                    errors.push(
+                      `[${id}] [${mlist[id]}] - the value should be 2 for the index ${index} - ${trimmedUrlSpriteFilepath}`,
+                    );
                   }
                 }
               }
@@ -92,10 +95,12 @@ describe("check if every variant's sprite are correctly set", () => {
           for (const key of Object.keys(data)) {
             if (mlist[name][key] !== 1) {
               // if 2, check if json there
-              const urlSpriteJsonFile = `${dirpath}${name}_${parseInt(key, 10) + 1}.json`;
+              const urlSpriteJsonFile = `${dirpath}${name}_${Number.parseInt(key, 10) + 1}.json`;
               const spriteFileExists = fs.existsSync(urlSpriteJsonFile);
               if (!spriteFileExists) {
-                errors.push(`[${name}] [${mlist[name]}] - the value should be 1 for the index ${key} - ${trimmedFilePath}`);
+                errors.push(
+                  `[${name}] [${mlist[name]}] - the value should be 1 for the index ${key} - ${trimmedFilePath}`,
+                );
               }
             }
           }
@@ -109,10 +114,9 @@ describe("check if every variant's sprite are correctly set", () => {
     const errors: string[] = [];
     for (const key of Object.keys(keys)) {
       const row = keys[key];
-      for (const [ index, elm ] of row.entries()) {
+      for (const [index, elm] of row.entries()) {
         let url: string;
         if (elm === 0) {
-          continue;
         } else if (elm === 1) {
           url = `${key}.json`;
           const filePath = `${dirPath}${url}`;
@@ -122,13 +126,13 @@ describe("check if every variant's sprite are correctly set", () => {
             errors.push(`index: ${index} - ${filePath}`);
           }
         } else if (elm === 2) {
-          url = `${key}_${parseInt(index, 10) + 1}.png`;
+          url = `${key}_${Number.parseInt(index, 10) + 1}.png`;
           let filePath = `${dirPath}${url}`;
           if (!fs.existsSync(filePath)) {
             errors.push(filePath);
           }
 
-          url = `${key}_${parseInt(index, 10) + 1}.json`;
+          url = `${key}_${Number.parseInt(index, 10) + 1}.json`;
           filePath = `${dirPath}${url}`;
           if (!fs.existsSync(filePath)) {
             errors.push(filePath);
@@ -179,9 +183,20 @@ describe("check if every variant's sprite are correctly set", () => {
     expect(errors).toEqual([]);
   });
 
-  it("check exp back variant files", () => {
+  it("check exp back female variant files", () => {
+    const dirPath = `${rootDir}exp${path.sep}back${path.sep}female${path.sep}`;
+    const errors = getMissingFiles(expVariant.back.female, dirPath);
+    if (errors.length) {
+      console.log("errors", errors);
+    }
+    expect(errors.length).toBe(0);
+  });
+
+  it("check exp back male variant files", () => {
     const dirPath = `${rootDir}exp${path.sep}back${path.sep}`;
-    const errors = getMissingFiles(expVariant.back, dirPath);
+    const backMaleVariant = deepCopy(expVariant.back);
+    delete backMaleVariant.female;
+    const errors = getMissingFiles(backMaleVariant, dirPath);
     if (errors.length) {
       console.log("errors", errors);
     }
@@ -232,15 +247,15 @@ describe("check if every variant's sprite are correctly set", () => {
   it("look over every file in variant back male and check if present in masterlist", () => {
     const dirPath = `${rootDir}back${path.sep}`;
     const backMaleVariant = deepCopy(backVariant);
-    const errors = getMissingMasterlist(backMaleVariant, dirPath, [ "female" ]);
+    const errors = getMissingMasterlist(backMaleVariant, dirPath, ["female"]);
     if (errors.length) {
       console.log("errors for ", dirPath, errors);
     }
     expect(errors).toEqual([]);
   });
 
-  it("look over every file in variant exp back and check if present in masterlist", () => {
-    const dirPath = `${rootDir}exp${path.sep}back${path.sep}`;
+  it("look over every file in variant exp back female and check if present in masterlist", () => {
+    const dirPath = `${rootDir}exp${path.sep}back${path.sep}female${path.sep}`;
     const errors = getMissingMasterlist(expVariant.back, dirPath);
     if (errors.length) {
       console.log("errors for ", dirPath, errors);
@@ -248,6 +263,15 @@ describe("check if every variant's sprite are correctly set", () => {
     expect(errors).toEqual([]);
   });
 
+  it("look over every file in variant exp back male and check if present in masterlist", () => {
+    const dirPath = `${rootDir}exp${path.sep}back${path.sep}`;
+    const errors = getMissingMasterlist(expVariant.back, dirPath, ["female"]);
+    if (errors.length) {
+      console.log("errors for ", dirPath, errors);
+    }
+    expect(errors.length).toBe(0);
+  });
+
   it("look over every file in variant exp female and check if present in masterlist", () => {
     const dirPath = `${rootDir}exp${path.sep}female${path.sep}`;
     const errors = getMissingMasterlist(expVariant.female, dirPath);
@@ -259,7 +283,7 @@ describe("check if every variant's sprite are correctly set", () => {
 
   it("look over every file in variant exp male and check if present in masterlist", () => {
     const dirPath = `${rootDir}exp${path.sep}`;
-    const errors = getMissingMasterlist(expVariant, dirPath, [ "back", "female" ]);
+    const errors = getMissingMasterlist(expVariant, dirPath, ["back", "female"]);
     if (errors.length) {
       console.log("errors for ", dirPath, errors);
     }
@@ -268,7 +292,7 @@ describe("check if every variant's sprite are correctly set", () => {
 
   it("look over every file in variant root and check if present in masterlist", () => {
     const dirPath = `${rootDir}`;
-    const errors = getMissingMasterlist(masterlist, dirPath, [ "back", "female", "exp", "icons" ]);
+    const errors = getMissingMasterlist(masterlist, dirPath, ["back", "female", "exp", "icons"]);
     if (errors.length) {
       console.log("errors for ", dirPath, errors);
     }
diff --git a/src/test/sprites/spritesUtils.ts b/test/sprites/spritesUtils.ts
similarity index 62%
rename from src/test/sprites/spritesUtils.ts
rename to test/sprites/spritesUtils.ts
index f3ee634cd76..0c4bcd875fb 100644
--- a/src/test/sprites/spritesUtils.ts
+++ b/test/sprites/spritesUtils.ts
@@ -1,7 +1,7 @@
-const fs = require("fs");
-const path = require("path");
+const fs = require("node:fs");
+const path = require("node:path");
 
-export function getAppRootDir () {
+export function getAppRootDir() {
   let currentDir = __dirname;
   while (!fs.existsSync(path.join(currentDir, "package.json"))) {
     currentDir = path.join(currentDir, "..");
diff --git a/src/test/system/game_data.test.ts b/test/system/game_data.test.ts
similarity index 72%
rename from src/test/system/game_data.test.ts
rename to test/system/game_data.test.ts
index ad24c40f445..900fb672320 100644
--- a/src/test/system/game_data.test.ts
+++ b/test/system/game_data.test.ts
@@ -1,12 +1,12 @@
-import * as BattleScene from "#app/battle-scene";
+import * as bypassLoginModule from "#app/global-vars/bypass-login";
 import { pokerogueApi } from "#app/plugins/api/pokerogue-api";
 import type { SessionSaveData } from "#app/system/game-data";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
-import * as account from "../../account";
+import * as account from "#app/account";
 
 describe("System - Game Data", () => {
   let phaserGame: Phaser.Game;
@@ -21,8 +21,8 @@ describe("System - Game Data", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     game.override
-      .moveset([ Moves.SPLASH ])
-      .battleType("single")
+      .moveset([Moves.SPLASH])
+      .battleStyle("single")
       .enemyAbility(Abilities.BALL_FETCH)
       .enemyMoveset(Moves.SPLASH);
   });
@@ -33,43 +33,49 @@ describe("System - Game Data", () => {
 
   describe("tryClearSession", () => {
     beforeEach(() => {
-      vi.spyOn(BattleScene, "bypassLogin", "get").mockReturnValue(false);
+      vi.spyOn(bypassLoginModule, "bypassLogin", "get").mockReturnValue(false);
       vi.spyOn(game.scene.gameData, "getSessionSaveData").mockReturnValue({} as SessionSaveData);
-      vi.spyOn(account, "updateUserInfo").mockImplementation(async () => [ true, 1 ]);
+      vi.spyOn(account, "updateUserInfo").mockImplementation(async () => [true, 1]);
     });
 
     it("should return [true, true] if bypassLogin is true", async () => {
-      vi.spyOn(BattleScene, "bypassLogin", "get").mockReturnValue(true);
+      vi.spyOn(bypassLoginModule, "bypassLogin", "get").mockReturnValue(true);
 
       const result = await game.scene.gameData.tryClearSession(0);
 
-      expect(result).toEqual([ true, true ]);
+      expect(result).toEqual([true, true]);
     });
 
     it("should return [true, true] if successful", async () => {
-      vi.spyOn(pokerogueApi.savedata.session, "clear").mockResolvedValue({ success: true });
+      vi.spyOn(pokerogueApi.savedata.session, "clear").mockResolvedValue({
+        success: true,
+      });
 
       const result = await game.scene.gameData.tryClearSession(0);
 
-      expect(result).toEqual([ true, true ]);
+      expect(result).toEqual([true, true]);
       expect(account.updateUserInfo).toHaveBeenCalled();
     });
 
     it("should return [true, false] if not successful", async () => {
-      vi.spyOn(pokerogueApi.savedata.session, "clear").mockResolvedValue({ success: false });
+      vi.spyOn(pokerogueApi.savedata.session, "clear").mockResolvedValue({
+        success: false,
+      });
 
       const result = await game.scene.gameData.tryClearSession(0);
 
-      expect(result).toEqual([ true, false ]);
+      expect(result).toEqual([true, false]);
       expect(account.updateUserInfo).toHaveBeenCalled();
     });
 
     it("should return [false, false] session is out of date", async () => {
-      vi.spyOn(pokerogueApi.savedata.session, "clear").mockResolvedValue({ error: "session out of date" });
+      vi.spyOn(pokerogueApi.savedata.session, "clear").mockResolvedValue({
+        error: "session out of date",
+      });
 
       const result = await game.scene.gameData.tryClearSession(0);
 
-      expect(result).toEqual([ false, false ]);
+      expect(result).toEqual([false, false]);
       expect(account.updateUserInfo).toHaveBeenCalled();
     });
   });
diff --git a/src/test/utils/TextInterceptor.ts b/test/testUtils/TextInterceptor.ts
similarity index 57%
rename from src/test/utils/TextInterceptor.ts
rename to test/testUtils/TextInterceptor.ts
index 089d8967c61..4aaed458e44 100644
--- a/src/test/utils/TextInterceptor.ts
+++ b/test/testUtils/TextInterceptor.ts
@@ -9,12 +9,26 @@ export default class TextInterceptor {
     scene.messageWrapper = this;
   }
 
-  showText(text: string, delay?: number, callback?: Function, callbackDelay?: number, prompt?: boolean, promptDelay?: number): void {
+  showText(
+    text: string,
+    _delay?: number,
+    _callback?: Function,
+    _callbackDelay?: number,
+    _prompt?: boolean,
+    _promptDelay?: number,
+  ): void {
     console.log(text);
     this.logs.push(text);
   }
 
-  showDialogue(text: string, name: string, delay?: number, callback?: Function, callbackDelay?: number, promptDelay?: number): void {
+  showDialogue(
+    text: string,
+    name: string,
+    _delay?: number,
+    _callback?: Function,
+    _callbackDelay?: number,
+    _promptDelay?: number,
+  ): void {
     console.log(name, text);
     this.logs.push(name, text);
   }
diff --git a/src/test/utils/errorInterceptor.ts b/test/testUtils/errorInterceptor.ts
similarity index 90%
rename from src/test/utils/errorInterceptor.ts
rename to test/testUtils/errorInterceptor.ts
index 7f06c47fd39..a8fb3284b78 100644
--- a/src/test/utils/errorInterceptor.ts
+++ b/test/testUtils/errorInterceptor.ts
@@ -29,8 +29,7 @@ export default class ErrorInterceptor {
   }
 }
 
-
-process.on("uncaughtException", (error) => {
+process.on("uncaughtException", error => {
   console.log(error);
   const toStop = ErrorInterceptor.getInstance().running;
   for (const elm of toStop) {
@@ -40,7 +39,7 @@ process.on("uncaughtException", (error) => {
 });
 
 // Global error handler for unhandled promise rejections
-process.on("unhandledRejection", (reason, promise) => {
+process.on("unhandledRejection", (reason, _promise) => {
   console.log(reason);
   const toStop = ErrorInterceptor.getInstance().running;
   for (const elm of toStop) {
diff --git a/src/test/utils/fakeMobile.html b/test/testUtils/fakeMobile.html
similarity index 95%
rename from src/test/utils/fakeMobile.html
rename to test/testUtils/fakeMobile.html
index 4b566d592d9..263b03969d4 100644
--- a/src/test/utils/fakeMobile.html
+++ b/test/testUtils/fakeMobile.html
@@ -35,7 +35,7 @@
 				<div id="apadCycleShiny" class="apad-button apad-square apad-small" data-key="CYCLE_SHINY">
 					<span class="apad-label">R</span>
 				</div>
-				<div id="apadCycleVariant" class="apad-button apad-square apad-small" data-key="V">
+				<div id="apadCycleTera" class="apad-button apad-square apad-small" data-key="CYCLE_TERA">
 					<span class="apad-label">V</span>
 				</div>
 				<div id="apadStats" class="apad-button apad-rectangle apad-small" data-key="STATS">
@@ -59,7 +59,7 @@
 				<div id="apadCycleNature" class="apad-button apad-square apad-small" data-key="CYCLE_NATURE">
 					<span class="apad-label">N</span>
 				</div>
-				<div id="apadInfo" class="apad-button apad-rectangle apad-small" data-key="V">
+				<div id="apadInfo" class="apad-button apad-rectangle apad-small" data-key="CYCLE_TERA">
 					<span class="apad-label">V</span>
 				</div>
 			</div>
diff --git a/src/test/utils/gameManager.ts b/test/testUtils/gameManager.ts
similarity index 62%
rename from src/test/utils/gameManager.ts
rename to test/testUtils/gameManager.ts
index b2015700c9b..8dd90decf1a 100644
--- a/src/test/utils/gameManager.ts
+++ b/test/testUtils/gameManager.ts
@@ -1,7 +1,7 @@
 import { updateUserInfo } from "#app/account";
 import { BattlerIndex } from "#app/battle";
 import BattleScene from "#app/battle-scene";
-import { getMoveTargets } from "#app/data/move";
+import { getMoveTargets } from "#app/data/moves/move";
 import type { EnemyPokemon, PlayerPokemon } from "#app/field/pokemon";
 import Trainer from "#app/field/trainer";
 import { GameModes, getGameMode } from "#app/game-mode";
@@ -22,16 +22,16 @@ import { TitlePhase } from "#app/phases/title-phase";
 import { TurnEndPhase } from "#app/phases/turn-end-phase";
 import { TurnInitPhase } from "#app/phases/turn-init-phase";
 import { TurnStartPhase } from "#app/phases/turn-start-phase";
-import ErrorInterceptor from "#app/test/utils/errorInterceptor";
-import type InputsHandler from "#app/test/utils/inputsHandler";
+import ErrorInterceptor from "#test/testUtils/errorInterceptor";
+import type InputsHandler from "#test/testUtils/inputsHandler";
 import type BallUiHandler from "#app/ui/ball-ui-handler";
 import type BattleMessageUiHandler from "#app/ui/battle-message-ui-handler";
 import type CommandUiHandler from "#app/ui/command-ui-handler";
 import type ModifierSelectUiHandler from "#app/ui/modifier-select-ui-handler";
 import type PartyUiHandler from "#app/ui/party-ui-handler";
 import type TargetSelectUiHandler from "#app/ui/target-select-ui-handler";
-import { Mode } from "#app/ui/ui";
-import { isNullOrUndefined } from "#app/utils";
+import { UiMode } from "#enums/ui-mode";
+import { isNullOrUndefined } from "#app/utils/common";
 import { BattleStyle } from "#enums/battle-style";
 import { Button } from "#enums/buttons";
 import { ExpGainsSpeed } from "#enums/exp-gains-speed";
@@ -40,21 +40,24 @@ import type { Moves } from "#enums/moves";
 import type { MysteryEncounterType } from "#enums/mystery-encounter-type";
 import { PlayerGender } from "#enums/player-gender";
 import type { Species } from "#enums/species";
-import { generateStarter, waitUntil } from "#test/utils/gameManagerUtils";
-import GameWrapper from "#test/utils/gameWrapper";
-import { ChallengeModeHelper } from "#test/utils/helpers/challengeModeHelper";
-import { ClassicModeHelper } from "#test/utils/helpers/classicModeHelper";
-import { DailyModeHelper } from "#test/utils/helpers/dailyModeHelper";
-import { ModifierHelper } from "#test/utils/helpers/modifiersHelper";
-import { MoveHelper } from "#test/utils/helpers/moveHelper";
-import { OverridesHelper } from "#test/utils/helpers/overridesHelper";
-import { ReloadHelper } from "#test/utils/helpers/reloadHelper";
-import { SettingsHelper } from "#test/utils/helpers/settingsHelper";
-import PhaseInterceptor from "#test/utils/phaseInterceptor";
-import TextInterceptor from "#test/utils/TextInterceptor";
+import { generateStarter, waitUntil } from "#test/testUtils/gameManagerUtils";
+import GameWrapper from "#test/testUtils/gameWrapper";
+import { ChallengeModeHelper } from "#test/testUtils/helpers/challengeModeHelper";
+import { ClassicModeHelper } from "#test/testUtils/helpers/classicModeHelper";
+import { DailyModeHelper } from "#test/testUtils/helpers/dailyModeHelper";
+import { ModifierHelper } from "#test/testUtils/helpers/modifiersHelper";
+import { MoveHelper } from "#test/testUtils/helpers/moveHelper";
+import { OverridesHelper } from "#test/testUtils/helpers/overridesHelper";
+import { ReloadHelper } from "#test/testUtils/helpers/reloadHelper";
+import { SettingsHelper } from "#test/testUtils/helpers/settingsHelper";
+import PhaseInterceptor from "#test/testUtils/phaseInterceptor";
+import TextInterceptor from "#test/testUtils/TextInterceptor";
 import { AES, enc } from "crypto-js";
-import fs from "fs";
+import fs from "node:fs";
 import { expect, vi } from "vitest";
+import { globalScene } from "#app/global-scene";
+import type StarterSelectUiHandler from "#app/ui/starter-select-ui-handler";
+import { MockFetch } from "#test/testUtils/mocks/mockFetch";
 
 /**
  * Class to manage the game state and transitions between phases.
@@ -79,15 +82,39 @@ export default class GameManager {
    * @param phaserGame - The Phaser game instance.
    * @param bypassLogin - Whether to bypass the login phase.
    */
-  constructor(phaserGame: Phaser.Game, bypassLogin: boolean = true) {
+  constructor(phaserGame: Phaser.Game, bypassLogin = true) {
     localStorage.clear();
     ErrorInterceptor.getInstance().clear();
-    BattleScene.prototype.randBattleSeedInt = (range, min: number = 0) => min + range - 1; // This simulates a max roll
+    BattleScene.prototype.randBattleSeedInt = (range, min = 0) => min + range - 1; // This simulates a max roll
     this.gameWrapper = new GameWrapper(phaserGame, bypassLogin);
-    this.scene = new BattleScene();
+
+    let firstTimeScene = false;
+
+    if (globalScene) {
+      this.scene = globalScene;
+    } else {
+      this.scene = new BattleScene();
+      this.gameWrapper.setScene(this.scene);
+      firstTimeScene = true;
+    }
+
     this.phaseInterceptor = new PhaseInterceptor(this.scene);
+
+    if (!firstTimeScene) {
+      this.scene.reset(false, true);
+      (this.scene.ui.handlers[UiMode.STARTER_SELECT] as StarterSelectUiHandler).clearStarterPreferences();
+      this.scene.clearAllPhases();
+
+      // Must be run after phase interceptor has been initialized.
+
+      this.scene.pushPhase(new LoginPhase());
+      this.scene.pushPhase(new TitlePhase());
+      this.scene.shiftPhase();
+
+      this.gameWrapper.scene = this.scene;
+    }
+
     this.textInterceptor = new TextInterceptor(this.scene);
-    this.gameWrapper.setScene(this.scene);
     this.override = new OverridesHelper(this);
     this.move = new MoveHelper(this);
     this.classicMode = new ClassicModeHelper(this);
@@ -96,16 +123,19 @@ export default class GameManager {
     this.settings = new SettingsHelper(this);
     this.reload = new ReloadHelper(this);
     this.modifiers = new ModifierHelper(this);
+    this.override.sanitizeOverrides();
 
     // Disables Mystery Encounters on all tests (can be overridden at test level)
     this.override.mysteryEncounterChance(0);
+
+    global.fetch = vi.fn(MockFetch) as any;
   }
 
   /**
    * Sets the game mode.
    * @param mode - The mode to set.
    */
-  setMode(mode: Mode) {
+  setMode(mode: UiMode) {
     this.scene.ui?.setMode(mode);
   }
 
@@ -114,8 +144,8 @@ export default class GameManager {
    * @param mode - The mode to wait for.
    * @returns A promise that resolves when the mode is set.
    */
-  waitMode(mode: Mode): Promise<void> {
-    return new Promise(async (resolve) => {
+  waitMode(mode: UiMode): Promise<void> {
+    return new Promise(async resolve => {
       await waitUntil(() => this.scene.ui?.getMode() === mode);
       return resolve();
     });
@@ -136,7 +166,13 @@ export default class GameManager {
    * @param callback - The callback function to execute on next prompt.
    * @param expireFn - Optional function to determine if the prompt has expired.
    */
-  onNextPrompt(phaseTarget: string, mode: Mode, callback: () => void, expireFn?: () => void, awaitingActionInput: boolean = false) {
+  onNextPrompt(
+    phaseTarget: string,
+    mode: UiMode,
+    callback: () => void,
+    expireFn?: () => void,
+    awaitingActionInput = false,
+  ) {
     this.phaseInterceptor.addToNextPrompt(phaseTarget, mode, callback, expireFn, awaitingActionInput);
   }
 
@@ -172,7 +208,7 @@ export default class GameManager {
     console.log("===to final boss encounter===");
     await this.runToTitle();
 
-    this.onNextPrompt("TitlePhase", Mode.TITLE, () => {
+    this.onNextPrompt("TitlePhase", UiMode.TITLE, () => {
       this.scene.gameMode = getGameMode(mode);
       const starters = generateStarter(this.scene, species);
       const selectStarterPhase = new SelectStarterPhase();
@@ -205,18 +241,29 @@ export default class GameManager {
 
     await this.runToTitle();
 
-    this.onNextPrompt("TitlePhase", Mode.TITLE, () => {
-      this.scene.gameMode = getGameMode(GameModes.CLASSIC);
-      const starters = generateStarter(this.scene, species);
-      const selectStarterPhase = new SelectStarterPhase();
-      this.scene.pushPhase(new EncounterPhase(false));
-      selectStarterPhase.initBattle(starters);
-    }, () => this.isCurrentPhase(EncounterPhase));
+    this.onNextPrompt(
+      "TitlePhase",
+      UiMode.TITLE,
+      () => {
+        this.scene.gameMode = getGameMode(GameModes.CLASSIC);
+        const starters = generateStarter(this.scene, species);
+        const selectStarterPhase = new SelectStarterPhase();
+        this.scene.pushPhase(new EncounterPhase(false));
+        selectStarterPhase.initBattle(starters);
+      },
+      () => this.isCurrentPhase(EncounterPhase),
+    );
 
-    this.onNextPrompt("EncounterPhase", Mode.MESSAGE, () => {
-      const handler = this.scene.ui.getHandler() as BattleMessageUiHandler;
-      handler.processInput(Button.ACTION);
-    }, () => this.isCurrentPhase(MysteryEncounterPhase), true);
+    this.onNextPrompt(
+      "EncounterPhase",
+      UiMode.MESSAGE,
+      () => {
+        const handler = this.scene.ui.getHandler() as BattleMessageUiHandler;
+        handler.processInput(Button.ACTION);
+      },
+      () => this.isCurrentPhase(MysteryEncounterPhase),
+      true,
+    );
 
     await this.phaseInterceptor.run(EncounterPhase);
     if (!isNullOrUndefined(encounterType)) {
@@ -235,15 +282,25 @@ export default class GameManager {
     await this.classicMode.runToSummon(species);
 
     if (this.scene.battleStyle === BattleStyle.SWITCH) {
-      this.onNextPrompt("CheckSwitchPhase", Mode.CONFIRM, () => {
-        this.setMode(Mode.MESSAGE);
-        this.endPhase();
-      }, () => this.isCurrentPhase(CommandPhase) || this.isCurrentPhase(TurnInitPhase));
+      this.onNextPrompt(
+        "CheckSwitchPhase",
+        UiMode.CONFIRM,
+        () => {
+          this.setMode(UiMode.MESSAGE);
+          this.endPhase();
+        },
+        () => this.isCurrentPhase(CommandPhase) || this.isCurrentPhase(TurnInitPhase),
+      );
 
-      this.onNextPrompt("CheckSwitchPhase", Mode.CONFIRM, () => {
-        this.setMode(Mode.MESSAGE);
-        this.endPhase();
-      }, () => this.isCurrentPhase(CommandPhase) || this.isCurrentPhase(TurnInitPhase));
+      this.onNextPrompt(
+        "CheckSwitchPhase",
+        UiMode.CONFIRM,
+        () => {
+          this.setMode(UiMode.MESSAGE);
+          this.endPhase();
+        },
+        () => this.isCurrentPhase(CommandPhase) || this.isCurrentPhase(TurnInitPhase),
+      );
     }
 
     await this.phaseInterceptor.to(CommandPhase);
@@ -253,21 +310,33 @@ export default class GameManager {
   /**
    * Emulate a player's target selection after a move is chosen, usually called automatically by {@linkcode MoveHelper.select}.
    * Will trigger during the next {@linkcode SelectTargetPhase}
-   * @param {BattlerIndex} targetIndex The index of the attack target, or `undefined` for multi-target attacks
-   * @param movePosition The index of the move in the pokemon's moveset array
+   * @param targetIndex - The {@linkcode BattlerIndex} of the attack target, or `undefined` for multi-target attacks
+   * @param movePosition - The 0-indexed position of the move in the pokemon's moveset array
    */
   selectTarget(movePosition: number, targetIndex?: BattlerIndex) {
-    this.onNextPrompt("SelectTargetPhase", Mode.TARGET_SELECT, () => {
-      const handler = this.scene.ui.getHandler() as TargetSelectUiHandler;
-      const move = (this.scene.getCurrentPhase() as SelectTargetPhase).getPokemon().getMoveset()[movePosition]!.getMove(); // TODO: is the bang correct?
-      if (!move.isMultiTarget()) {
-        handler.setCursor(targetIndex !== undefined ? targetIndex : BattlerIndex.ENEMY);
-      }
-      if (move.isMultiTarget() && targetIndex !== undefined) {
-        throw new Error(`targetIndex was passed to selectMove() but move ("${move.name}") is not targetted`);
-      }
-      handler.processInput(Button.ACTION);
-    }, () => this.isCurrentPhase(CommandPhase) || this.isCurrentPhase(MovePhase) || this.isCurrentPhase(TurnStartPhase) || this.isCurrentPhase(TurnEndPhase));
+    this.onNextPrompt(
+      "SelectTargetPhase",
+      UiMode.TARGET_SELECT,
+      () => {
+        const handler = this.scene.ui.getHandler() as TargetSelectUiHandler;
+        const move = (this.scene.getCurrentPhase() as SelectTargetPhase)
+          .getPokemon()
+          .getMoveset()
+          [movePosition].getMove();
+        if (!move.isMultiTarget()) {
+          handler.setCursor(targetIndex !== undefined ? targetIndex : BattlerIndex.ENEMY);
+        }
+        if (move.isMultiTarget() && targetIndex !== undefined) {
+          throw new Error(`targetIndex was passed to selectMove() but move ("${move.name}") is not targetted`);
+        }
+        handler.processInput(Button.ACTION);
+      },
+      () =>
+        this.isCurrentPhase(CommandPhase) ||
+        this.isCurrentPhase(MovePhase) ||
+        this.isCurrentPhase(TurnStartPhase) ||
+        this.isCurrentPhase(TurnEndPhase),
+    );
   }
 
   /** Faint all opponents currently on the field */
@@ -278,24 +347,42 @@ export default class GameManager {
     }
   }
 
-  /** Emulate selecting a modifier (item) */
+  /** Queue up button presses to skip taking an item on the next {@linkcode SelectModifierPhase} */
   doSelectModifier() {
-    this.onNextPrompt("SelectModifierPhase", Mode.MODIFIER_SELECT, () => {
-      const handler = this.scene.ui.getHandler() as ModifierSelectUiHandler;
-      handler.processInput(Button.CANCEL);
-    }, () => this.isCurrentPhase(CommandPhase) || this.isCurrentPhase(NewBattlePhase) || this.isCurrentPhase(CheckSwitchPhase), true);
+    this.onNextPrompt(
+      "SelectModifierPhase",
+      UiMode.MODIFIER_SELECT,
+      () => {
+        const handler = this.scene.ui.getHandler() as ModifierSelectUiHandler;
+        handler.processInput(Button.CANCEL);
+      },
+      () =>
+        this.isCurrentPhase(CommandPhase) ||
+        this.isCurrentPhase(NewBattlePhase) ||
+        this.isCurrentPhase(CheckSwitchPhase),
+      true,
+    );
 
-    this.onNextPrompt("SelectModifierPhase", Mode.CONFIRM, () => {
-      const handler = this.scene.ui.getHandler() as ModifierSelectUiHandler;
-      handler.processInput(Button.ACTION);
-    }, () => this.isCurrentPhase(CommandPhase) || this.isCurrentPhase(NewBattlePhase) || this.isCurrentPhase(CheckSwitchPhase));
+    this.onNextPrompt(
+      "SelectModifierPhase",
+      UiMode.CONFIRM,
+      () => {
+        const handler = this.scene.ui.getHandler() as ModifierSelectUiHandler;
+        handler.processInput(Button.ACTION);
+      },
+      () =>
+        this.isCurrentPhase(CommandPhase) ||
+        this.isCurrentPhase(NewBattlePhase) ||
+        this.isCurrentPhase(CheckSwitchPhase),
+    );
   }
 
   /**
    * Forces the next enemy selecting a move to use the given move in its moveset against the
    * given target (if applicable).
-   * @param moveId {@linkcode Moves} the move the enemy will use
-   * @param target {@linkcode BattlerIndex} the target on which the enemy will use the given move
+   * @param moveId - The {@linkcode Moves | move} the enemy will use
+   * @param target - The {@linkcode BattlerIndex} of the target against which the enemy will use the given move;
+   * will use normal target selection priorities if omitted.
    */
   async forceEnemyMove(moveId: Moves, target?: BattlerIndex) {
     // Wait for the next EnemyCommandPhase to start
@@ -305,9 +392,10 @@ export default class GameManager {
 
     vi.spyOn(enemy, "getNextMove").mockReturnValueOnce({
       move: moveId,
-      targets: (target !== undefined && !legalTargets.multiple && legalTargets.targets.includes(target))
-        ? [ target ]
-        : enemy.getNextTargets(moveId)
+      targets:
+        target !== undefined && !legalTargets.multiple && legalTargets.targets.includes(target)
+          ? [target]
+          : enemy.getNextTargets(moveId),
     });
 
     /**
@@ -322,7 +410,10 @@ export default class GameManager {
     const originalMatchupScore = Trainer.prototype.getPartyMemberMatchupScores;
     Trainer.prototype.getPartyMemberMatchupScores = () => {
       Trainer.prototype.getPartyMemberMatchupScores = originalMatchupScore;
-      return [[ 1, 100 ], [ 1, 100 ]];
+      return [
+        [1, 100],
+        [1, 100],
+      ];
     };
   }
 
@@ -331,21 +422,29 @@ export default class GameManager {
     await this.phaseInterceptor.to(CommandPhase);
   }
 
-  /** Emulate selecting a modifier (item) and transition to the next upcoming {@linkcode CommandPhase} */
+  /**
+   * Queue up button presses to skip taking an item on the next {@linkcode SelectModifierPhase},
+   * and then transition to the next {@linkcode CommandPhase}.
+   */
   async toNextWave() {
     this.doSelectModifier();
 
-    this.onNextPrompt("CheckSwitchPhase", Mode.CONFIRM, () => {
-      this.setMode(Mode.MESSAGE);
-      this.endPhase();
-    }, () => this.isCurrentPhase(TurnInitPhase));
+    this.onNextPrompt(
+      "CheckSwitchPhase",
+      UiMode.CONFIRM,
+      () => {
+        this.setMode(UiMode.MESSAGE);
+        this.endPhase();
+      },
+      () => this.isCurrentPhase(TurnInitPhase),
+    );
 
     await this.toNextTurn();
   }
 
   /**
-   * Checks if the player has won the battle.
-   * @returns True if the player has won, otherwise false.
+   * Check if the player has won the battle.
+   * @returns whether the player has won the battle (all opposing Pokemon have been fainted)
    */
   isVictory() {
     return this.scene.currentBattle.enemyParty.every(pokemon => pokemon.isFainted());
@@ -354,7 +453,7 @@ export default class GameManager {
   /**
    * Checks if the current phase matches the target phase.
    * @param phaseTarget - The target phase.
-   * @returns True if the current phase matches the target phase, otherwise false.
+   * @returns Whether the current phase matches the target phase
    */
   isCurrentPhase(phaseTarget) {
     const targetName = typeof phaseTarget === "string" ? phaseTarget : phaseTarget.name;
@@ -363,10 +462,10 @@ export default class GameManager {
 
   /**
    * Checks if the current mode matches the target mode.
-   * @param mode - The target mode.
-   * @returns True if the current mode matches the target mode, otherwise false.
+   * @param mode - The target {@linkcode UiMode} to check.
+   * @returns Whether the current mode matches the target mode.
    */
-  isCurrentMode(mode: Mode) {
+  isCurrentMode(mode: UiMode) {
     return this.scene.ui?.getMode() === mode;
   }
 
@@ -376,7 +475,7 @@ export default class GameManager {
    */
   exportSaveToTest(): Promise<string> {
     const saveKey = "x0i2O7WRiANTqPmZ";
-    return new Promise(async (resolve) => {
+    return new Promise(async resolve => {
       const sessionSaveData = this.scene.gameData.getSessionSaveData();
       const encryptedSaveData = AES.encrypt(JSON.stringify(sessionSaveData), saveKey).toString();
       resolve(encryptedSaveData);
@@ -404,24 +503,25 @@ export default class GameManager {
 
   /**
    * Faints a player or enemy pokemon instantly by setting their HP to 0.
-   * @param pokemon The player/enemy pokemon being fainted
+   * @param pokemon - The player/enemy pokemon being fainted
    * @returns A promise that resolves once the fainted pokemon's FaintPhase finishes running.
    */
   async killPokemon(pokemon: PlayerPokemon | EnemyPokemon) {
     return new Promise<void>(async (resolve, reject) => {
       pokemon.hp = 0;
       this.scene.pushPhase(new FaintPhase(pokemon.getBattlerIndex(), true));
-      await this.phaseInterceptor.to(FaintPhase).catch((e) => reject(e));
+      await this.phaseInterceptor.to(FaintPhase).catch(e => reject(e));
       resolve();
     });
   }
 
   /**
-   * Command an in-battle switch to another Pokemon via the main battle menu.
-   * @param pokemonIndex the index of the pokemon in your party to switch to
+   * Command an in-battle switch to another {@linkcode Pokemon} via the main battle menu.
+   * @param pokemonIndex - The 0-indexed position of the party pokemon to switch to.
+   * Should never be called with 0 as that will select the currently active pokemon and freeze.
    */
   doSwitchPokemon(pokemonIndex: number) {
-    this.onNextPrompt("CommandPhase", Mode.COMMAND, () => {
+    this.onNextPrompt("CommandPhase", UiMode.COMMAND, () => {
       (this.scene.ui.getHandler() as CommandUiHandler).setCursor(2);
       (this.scene.ui.getHandler() as CommandUiHandler).processInput(Button.ACTION);
     });
@@ -431,7 +531,7 @@ export default class GameManager {
 
   /**
    * Revive pokemon, currently players only.
-   * @param pokemonIndex the index of the pokemon in your party to revive
+   * @param pokemonIndex - The 0-indexed position of the pokemon in your party to revive
    */
   doRevivePokemon(pokemonIndex: number) {
     const party = this.scene.getPlayerParty();
@@ -441,16 +541,15 @@ export default class GameManager {
   }
 
   /**
-   * Select a pokemon from the party menu. Only really handles the basic cases
-   * of the party UI, where you just need to navigate to a party slot and press
-   * Action twice - navigating any menus that come up after you select a party member
-   * is not supported.
-   * @param slot the index of the pokemon in your party to switch to
-   * @param inPhase Which phase to expect the selection to occur in. Typically
-   * non-command switch actions happen in SwitchPhase.
+   * Select a pokemon from the party menu during the given phase. 
+   * Only really handles the basic case of "navigate to party slot and press Action twice" - 
+   * any menus that come up afterwards are ignored and must be handled separately by the caller.
+   * @param slot - The 0-indexed position of the pokemon in your party to switch to
+   * @param inPhase - Which phase to expect the selection to occur in. Defaults to `SwitchPhase`
+   * (which is where the majority of non-command switch operations occur).
    */
   doSelectPartyPokemon(slot: number, inPhase = "SwitchPhase") {
-    this.onNextPrompt(inPhase, Mode.PARTY, () => {
+    this.onNextPrompt(inPhase, UiMode.PARTY, () => {
       const partyHandler = this.scene.ui.getHandler() as PartyUiHandler;
 
       partyHandler.setCursor(slot);
@@ -462,15 +561,15 @@ export default class GameManager {
   /**
    * Select the BALL option from the command menu, then press Action; in the BALL
    * menu, select a pokéball type and press Action again to throw it.
-   * @param ballIndex the index of the pokeball to throw
+   * @param ballIndex - The index of the pokeball to throw
    */
   public doThrowPokeball(ballIndex: number) {
-    this.onNextPrompt("CommandPhase", Mode.COMMAND, () => {
+    this.onNextPrompt("CommandPhase", UiMode.COMMAND, () => {
       (this.scene.ui.getHandler() as CommandUiHandler).setCursor(1);
       (this.scene.ui.getHandler() as CommandUiHandler).processInput(Button.ACTION);
     });
 
-    this.onNextPrompt("CommandPhase", Mode.BALL, () => {
+    this.onNextPrompt("CommandPhase", UiMode.BALL, () => {
       const ballHandler = this.scene.ui.getHandler() as BallUiHandler;
       ballHandler.setCursor(ballIndex);
       ballHandler.processInput(Button.ACTION); // select ball and throw
@@ -480,8 +579,8 @@ export default class GameManager {
   /**
    * Intercepts `TurnStartPhase` and mocks {@linkcode TurnStartPhase.getSpeedOrder}'s return value.
    * Used to manually modify Pokemon turn order.
-   * Note: This *DOES NOT* account for priority, only speed.
-   * @param {BattlerIndex[]} order The turn order to set
+   * Note: This *DOES NOT* account for priority.
+   * @param order - The turn order to set as an array of {@linkcode BattlerIndex}es.
    * @example
    * ```ts
    * await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2, BattlerIndex.PLAYER_2]);
diff --git a/src/test/utils/gameManagerUtils.ts b/test/testUtils/gameManagerUtils.ts
similarity index 79%
rename from src/test/utils/gameManagerUtils.ts
rename to test/testUtils/gameManagerUtils.ts
index 757874f0c17..9e9c8f15f96 100644
--- a/src/test/utils/gameManagerUtils.ts
+++ b/test/testUtils/gameManagerUtils.ts
@@ -1,4 +1,5 @@
-import Battle, { BattleType } from "#app/battle";
+import Battle from "#app/battle";
+import { BattleType } from "#enums/battle-type";
 import type BattleScene from "#app/battle-scene";
 import { getDailyRunStarters } from "#app/data/daily-run";
 import { Gender } from "#app/data/gender";
@@ -27,7 +28,6 @@ export function blobToString(blob) {
   });
 }
 
-
 export function holdOn(ms: number) {
   return new Promise(resolve => setTimeout(resolve, ms));
 }
@@ -39,12 +39,21 @@ export function generateStarter(scene: BattleScene, species?: Species[]): Starte
   for (const starter of starters) {
     const starterProps = scene.gameData.getSpeciesDexAttrProps(starter.species, starter.dexAttr);
     const starterFormIndex = Math.min(starterProps.formIndex, Math.max(starter.species.forms.length - 1, 0));
-    const starterGender = starter.species.malePercent !== null
-      ? !starterProps.female ? Gender.MALE : Gender.FEMALE
-      : Gender.GENDERLESS;
-    const starterPokemon = scene.addPlayerPokemon(starter.species, startingLevel, starter.abilityIndex, starterFormIndex, starterGender, starterProps.shiny, starterProps.variant, undefined, starter.nature);
+    const starterGender =
+      starter.species.malePercent !== null ? (!starterProps.female ? Gender.MALE : Gender.FEMALE) : Gender.GENDERLESS;
+    const starterPokemon = scene.addPlayerPokemon(
+      starter.species,
+      startingLevel,
+      starter.abilityIndex,
+      starterFormIndex,
+      starterGender,
+      starterProps.shiny,
+      starterProps.variant,
+      undefined,
+      starter.nature,
+    );
     const moveset: Moves[] = [];
-    starterPokemon.moveset.forEach((move) => {
+    starterPokemon.moveset.forEach(move => {
       moveset.push(move!.getMove().id);
     });
     starter.moveset = moveset as StarterMoveset;
@@ -69,7 +78,7 @@ function getTestRunStarters(seed: string, species?: Species[]): Starter[] {
       abilityIndex: pokemon.abilityIndex,
       passive: false,
       nature: pokemon.getNature(),
-      pokerus: pokemon.pokerus
+      pokerus: pokemon.pokerus,
     };
     starters.push(starter);
   }
@@ -91,7 +100,7 @@ export function waitUntil(truth): Promise<unknown> {
 export function getMovePosition(scene: BattleScene, pokemonIndex: 0 | 1, move: Moves): number {
   const playerPokemon = scene.getPlayerField()[pokemonIndex];
   const moveSet = playerPokemon.getMoveset();
-  const index = moveSet.findIndex((m) => m?.moveId === move && m?.ppUsed < m?.getMovePp());
+  const index = moveSet.findIndex(m => m.moveId === move && m.ppUsed < m.getMovePp());
   console.log(`Move position for ${Moves[move]} (=${move}):`, index);
   return index;
 }
@@ -101,12 +110,22 @@ export function getMovePosition(scene: BattleScene, pokemonIndex: 0 | 1, move: M
  */
 export function initSceneWithoutEncounterPhase(scene: BattleScene, species?: Species[]): void {
   const starters = generateStarter(scene, species);
-  starters.forEach((starter) => {
+  starters.forEach(starter => {
     const starterProps = scene.gameData.getSpeciesDexAttrProps(starter.species, starter.dexAttr);
     const starterFormIndex = Math.min(starterProps.formIndex, Math.max(starter.species.forms.length - 1, 0));
     const starterGender = Gender.MALE;
     const starterIvs = scene.gameData.dexData[starter.species.speciesId].ivs.slice(0);
-    const starterPokemon = scene.addPlayerPokemon(starter.species, scene.gameMode.getStartingLevel(), starter.abilityIndex, starterFormIndex, starterGender, starterProps.shiny, starterProps.variant, starterIvs, starter.nature);
+    const starterPokemon = scene.addPlayerPokemon(
+      starter.species,
+      scene.gameMode.getStartingLevel(),
+      starter.abilityIndex,
+      starterFormIndex,
+      starterGender,
+      starterProps.shiny,
+      starterProps.variant,
+      starterIvs,
+      starter.nature,
+    );
     starter.moveset && starterPokemon.tryPopulateMoveset(starter.moveset);
     scene.getPlayerParty().push(starterPokemon);
   });
diff --git a/src/test/utils/gameWrapper.ts b/test/testUtils/gameWrapper.ts
similarity index 64%
rename from src/test/utils/gameWrapper.ts
rename to test/testUtils/gameWrapper.ts
index ca5a67f901a..9264b68d421 100644
--- a/src/test/utils/gameWrapper.ts
+++ b/test/testUtils/gameWrapper.ts
@@ -1,42 +1,31 @@
-/* eslint-disable */
-// @ts-nocheck
-import BattleScene, * as battleScene from "#app/battle-scene";
+// @ts-nocheck - TODO: remove this
+import BattleScene from "#app/battle-scene";
 import { MoveAnim } from "#app/data/battle-anims";
 import Pokemon from "#app/field/pokemon";
-import * as Utils from "#app/utils";
-import { blobToString } from "#test/utils/gameManagerUtils";
-import { MockClock } from "#test/utils/mocks/mockClock";
-import mockConsoleLog from "#test/utils/mocks/mockConsoleLog";
-import { MockFetch } from "#test/utils/mocks/mockFetch";
-import MockLoader from "#test/utils/mocks/mockLoader";
-import mockLocalStorage from "#test/utils/mocks/mockLocalStorage";
-import MockImage from "#test/utils/mocks/mocksContainer/mockImage";
-import MockTextureManager from "#test/utils/mocks/mockTextureManager";
-import fs from "fs";
+import { sessionIdKey } from "#app/utils/common";
+import { setCookie } from "#app/utils/cookies";
+import { blobToString } from "#test/testUtils/gameManagerUtils";
+import { MockClock } from "#test/testUtils/mocks/mockClock";
+import { MockFetch } from "#test/testUtils/mocks/mockFetch";
+import MockLoader from "#test/testUtils/mocks/mockLoader";
+import MockTextureManager from "#test/testUtils/mocks/mockTextureManager";
+import fs from "node:fs";
 import Phaser from "phaser";
-import InputText from "phaser3-rex-plugins/plugins/inputtext";
 import { vi } from "vitest";
+import { version } from "../../package.json";
 import { MockGameObjectCreator } from "./mocks/mockGameObjectCreator";
+import { MockTimedEventManager } from "./mocks/mockTimedEventManager";
 import InputManager = Phaser.Input.InputManager;
 import KeyboardManager = Phaser.Input.Keyboard.KeyboardManager;
 import KeyboardPlugin = Phaser.Input.Keyboard.KeyboardPlugin;
 import GamepadPlugin = Phaser.Input.Gamepad.GamepadPlugin;
 import EventEmitter = Phaser.Events.EventEmitter;
 import UpdateList = Phaser.GameObjects.UpdateList;
-import { version } from "../../../package.json";
-import { MockTimedEventManager } from "./mocks/mockTimedEventManager";
+import { PokedexMonContainer } from "#app/ui/pokedex-mon-container";
+import MockContainer from "./mocks/mocksContainer/mockContainer";
+// biome-ignore lint/style/noNamespaceImport: Necessary in order to mock the var
+import * as bypassLoginModule from "#app/global-vars/bypass-login";
 
-Object.defineProperty(window, "localStorage", {
-  value: mockLocalStorage(),
-});
-Object.defineProperty(window, "console", {
-  value: mockConsoleLog(false),
-});
-
-
-InputText.prototype.setElement = () => null;
-InputText.prototype.resize = () => null;
-Phaser.GameObjects.Image = MockImage;
 window.URL.createObjectURL = (blob: Blob) => {
   blobToString(blob).then((data: string) => {
     localStorage.setItem("toExport", data);
@@ -45,43 +34,21 @@ window.URL.createObjectURL = (blob: Blob) => {
 };
 navigator.getGamepads = () => [];
 global.fetch = vi.fn(MockFetch);
-Utils.setCookie(Utils.sessionIdKey, 'fake_token');
-
+setCookie(sessionIdKey, "fake_token");
 
 window.matchMedia = () => ({
   matches: false,
 });
 
-
-/**
- * Sets this object's position relative to another object with a given offset
- * @param guideObject {@linkcode Phaser.GameObjects.GameObject} to base the position off of
- * @param x The relative x position
- * @param y The relative y position
- */
-const setPositionRelative = function (guideObject: any, x: number, y: number) {
-  const offsetX = guideObject.width * (-0.5 + (0.5 - guideObject.originX));
-  const offsetY = guideObject.height * (-0.5 + (0.5 - guideObject.originY));
-  this.setPosition(guideObject.x + offsetX + x, guideObject.y + offsetY + y);
-};
-
-Phaser.GameObjects.Container.prototype.setPositionRelative = setPositionRelative;
-Phaser.GameObjects.Sprite.prototype.setPositionRelative = setPositionRelative;
-Phaser.GameObjects.Image.prototype.setPositionRelative = setPositionRelative;
-Phaser.GameObjects.NineSlice.prototype.setPositionRelative = setPositionRelative;
-Phaser.GameObjects.Text.prototype.setPositionRelative = setPositionRelative;
-Phaser.GameObjects.Rectangle.prototype.setPositionRelative = setPositionRelative;
-
-
 export default class GameWrapper {
   public game: Phaser.Game;
   public scene: BattleScene;
 
   constructor(phaserGame: Phaser.Game, bypassLogin: boolean) {
-    Phaser.Math.RND.sow([ 'test' ]);
+    Phaser.Math.RND.sow(["test"]);
     // vi.spyOn(Utils, "apiFetch", "get").mockReturnValue(fetch);
     if (bypassLogin) {
-      vi.spyOn(battleScene, "bypassLogin", "get").mockReturnValue(true);
+      vi.spyOn(bypassLoginModule, "bypassLogin", "get").mockReturnValue(true);
     }
     this.game = phaserGame;
     MoveAnim.prototype.getAnim = () => ({
@@ -90,20 +57,29 @@ export default class GameWrapper {
     Pokemon.prototype.enableMask = () => null;
     Pokemon.prototype.updateFusionPalette = () => null;
     Pokemon.prototype.cry = () => null;
-    Pokemon.prototype.faintCry = (cb) => { if (cb) cb(); };
+    Pokemon.prototype.faintCry = cb => {
+      if (cb) {
+        cb();
+      }
+    };
+    BattleScene.prototype.addPokemonIcon = () => new Phaser.GameObjects.Container(this.scene);
+
+    // Pokedex container is not actually mocking container, but the sprites they contain are mocked.
+    // We need to mock the remove function to not throw an error when removing a sprite.
+    PokedexMonContainer.prototype.remove = MockContainer.prototype.remove;
   }
 
   setScene(scene: BattleScene) {
     this.scene = scene;
     this.injectMandatory();
-    this.scene.preload && this.scene.preload();
+    this.scene.preload?.();
     this.scene.create();
   }
 
   injectMandatory() {
     this.game.config = {
       seed: ["test"],
-      gameVersion: version
+      gameVersion: version,
     };
     this.scene.game = this.game;
     this.game.renderer = {
@@ -126,7 +102,7 @@ export default class GameWrapper {
       pause: () => null,
       setRate: () => null,
       add: () => this.scene.sound,
-      get: () => ({...this.scene.sound, totalDuration: 0}),
+      get: () => ({ ...this.scene.sound, totalDuration: 0 }),
       getAllPlaying: () => [],
       manager: {
         game: this.game,
@@ -135,7 +111,7 @@ export default class GameWrapper {
       setVolume: () => null,
       stop: () => null,
       stopByKey: () => null,
-      on: (evt, callback) => callback(),
+      on: (_evt, callback) => callback(),
       key: "",
     };
 
@@ -147,15 +123,15 @@ export default class GameWrapper {
     };
 
     this.scene.tweens = {
-      add: (data) => {
+      add: data => {
         if (data.onComplete) {
           data.onComplete();
         }
       },
-      getTweensOf: () => ([]),
-      killTweensOf: () => ([]),
+      getTweensOf: () => [],
+      killTweensOf: () => [],
       chain: () => null,
-      addCounter: (data) => {
+      addCounter: data => {
         if (data.onComplete) {
           data.onComplete();
         }
@@ -182,14 +158,15 @@ export default class GameWrapper {
       game: this.game,
       textures: {
         addCanvas: () => ({
-          get: () => ({ // this.frame in Text.js
+          get: () => ({
+            // this.frame in Text.js
             source: {},
             setSize: () => null,
             glTexture: () => ({
               spectorMetadata: {},
             }),
           }),
-        })
+        }),
       },
       cache: this.scene.load.cacheManager,
       scale: this.game.scale,
@@ -200,29 +177,30 @@ export default class GameWrapper {
       events: new EventEmitter(),
       settings: {
         loader: {
-          key: 'battle',
-        }
+          key: "battle",
+        },
       },
       input: this.game.input,
     };
     const mockTextureManager = new MockTextureManager(this.scene);
     this.scene.add = mockTextureManager.add;
     this.scene.textures = mockTextureManager;
-    this.scene.sys.displayList =  this.scene.add.displayList;
+    this.scene.sys.displayList = this.scene.add.displayList;
     this.scene.sys.updateList = new UpdateList(this.scene);
     this.scene.systems = this.scene.sys;
     this.scene.input = this.game.input;
     this.scene.scene = this.scene;
     this.scene.input.keyboard = new KeyboardPlugin(this.scene);
     this.scene.input.gamepad = new GamepadPlugin(this.scene);
-    this.scene.cachedFetch = (url, init) => {
-      return new Promise((resolve) => {
+    this.scene.cachedFetch = (url, _init) => {
+      return new Promise(resolve => {
         // need to remove that if later we want to test battle-anims
-        const newUrl = url.includes('./battle-anims/') ? prependPath('./battle-anims/tackle.json') : prependPath(url);
+        const newUrl = url.includes("./battle-anims/") ? prependPath("./battle-anims/tackle.json") : prependPath(url);
+        // biome-ignore lint/suspicious/noImplicitAnyLet: TODO
         let raw;
         try {
-          raw = fs.readFileSync(newUrl, {encoding: "utf8", flag: "r"});
-        } catch(e) {
+          raw = fs.readFileSync(newUrl, { encoding: "utf8", flag: "r" });
+        } catch (_e) {
           return resolve(createFetchBadResponse({}));
         }
         const data = JSON.parse(raw);
diff --git a/src/test/utils/helpers/challengeModeHelper.ts b/test/testUtils/helpers/challengeModeHelper.ts
similarity index 78%
rename from src/test/utils/helpers/challengeModeHelper.ts
rename to test/testUtils/helpers/challengeModeHelper.ts
index 4b5a38e72dc..3a4f2adcd09 100644
--- a/src/test/utils/helpers/challengeModeHelper.ts
+++ b/test/testUtils/helpers/challengeModeHelper.ts
@@ -3,7 +3,7 @@ import type { Species } from "#app/enums/species";
 import overrides from "#app/overrides";
 import { EncounterPhase } from "#app/phases/encounter-phase";
 import { SelectStarterPhase } from "#app/phases/select-starter-phase";
-import { Mode } from "#app/ui/ui";
+import { UiMode } from "#enums/ui-mode";
 import { generateStarter } from "../gameManagerUtils";
 import { GameManagerHelper } from "./gameManagerHelper";
 import type { Challenge } from "#app/data/challenge";
@@ -16,7 +16,6 @@ import { copyChallenge } from "data/challenge";
  * Helper to handle Challenge mode specifics
  */
 export class ChallengeModeHelper extends GameManagerHelper {
-
   challenges: Challenge[] = [];
 
   /**
@@ -42,7 +41,7 @@ export class ChallengeModeHelper extends GameManagerHelper {
       this.game.override.shiny(false).enemyShiny(false);
     }
 
-    this.game.onNextPrompt("TitlePhase", Mode.TITLE, () => {
+    this.game.onNextPrompt("TitlePhase", UiMode.TITLE, () => {
       this.game.scene.gameMode.challenges = this.challenges;
       const starters = generateStarter(this.game.scene, species);
       const selectStarterPhase = new SelectStarterPhase();
@@ -65,15 +64,25 @@ export class ChallengeModeHelper extends GameManagerHelper {
     await this.runToSummon(species);
 
     if (this.game.scene.battleStyle === BattleStyle.SWITCH) {
-      this.game.onNextPrompt("CheckSwitchPhase", Mode.CONFIRM, () => {
-        this.game.setMode(Mode.MESSAGE);
-        this.game.endPhase();
-      }, () => this.game.isCurrentPhase(CommandPhase) || this.game.isCurrentPhase(TurnInitPhase));
+      this.game.onNextPrompt(
+        "CheckSwitchPhase",
+        UiMode.CONFIRM,
+        () => {
+          this.game.setMode(UiMode.MESSAGE);
+          this.game.endPhase();
+        },
+        () => this.game.isCurrentPhase(CommandPhase) || this.game.isCurrentPhase(TurnInitPhase),
+      );
 
-      this.game.onNextPrompt("CheckSwitchPhase", Mode.CONFIRM, () => {
-        this.game.setMode(Mode.MESSAGE);
-        this.game.endPhase();
-      }, () => this.game.isCurrentPhase(CommandPhase) || this.game.isCurrentPhase(TurnInitPhase));
+      this.game.onNextPrompt(
+        "CheckSwitchPhase",
+        UiMode.CONFIRM,
+        () => {
+          this.game.setMode(UiMode.MESSAGE);
+          this.game.endPhase();
+        },
+        () => this.game.isCurrentPhase(CommandPhase) || this.game.isCurrentPhase(TurnInitPhase),
+      );
     }
 
     await this.game.phaseInterceptor.to(CommandPhase);
diff --git a/src/test/utils/helpers/classicModeHelper.ts b/test/testUtils/helpers/classicModeHelper.ts
similarity index 75%
rename from src/test/utils/helpers/classicModeHelper.ts
rename to test/testUtils/helpers/classicModeHelper.ts
index 40c3d518f1c..8e1ac95c733 100644
--- a/src/test/utils/helpers/classicModeHelper.ts
+++ b/test/testUtils/helpers/classicModeHelper.ts
@@ -6,7 +6,7 @@ import { CommandPhase } from "#app/phases/command-phase";
 import { EncounterPhase } from "#app/phases/encounter-phase";
 import { SelectStarterPhase } from "#app/phases/select-starter-phase";
 import { TurnInitPhase } from "#app/phases/turn-init-phase";
-import { Mode } from "#app/ui/ui";
+import { UiMode } from "#enums/ui-mode";
 import { generateStarter } from "../gameManagerUtils";
 import { GameManagerHelper } from "./gameManagerHelper";
 
@@ -14,7 +14,6 @@ import { GameManagerHelper } from "./gameManagerHelper";
  * Helper to handle classic mode specifics
  */
 export class ClassicModeHelper extends GameManagerHelper {
-
   /**
    * Runs the classic game to the summon phase.
    * @param species - Optional array of species to summon.
@@ -27,7 +26,7 @@ export class ClassicModeHelper extends GameManagerHelper {
       this.game.override.shiny(false).enemyShiny(false);
     }
 
-    this.game.onNextPrompt("TitlePhase", Mode.TITLE, () => {
+    this.game.onNextPrompt("TitlePhase", UiMode.TITLE, () => {
       this.game.scene.gameMode = getGameMode(GameModes.CLASSIC);
       const starters = generateStarter(this.game.scene, species);
       const selectStarterPhase = new SelectStarterPhase();
@@ -50,15 +49,25 @@ export class ClassicModeHelper extends GameManagerHelper {
     await this.runToSummon(species);
 
     if (this.game.scene.battleStyle === BattleStyle.SWITCH) {
-      this.game.onNextPrompt("CheckSwitchPhase", Mode.CONFIRM, () => {
-        this.game.setMode(Mode.MESSAGE);
-        this.game.endPhase();
-      }, () => this.game.isCurrentPhase(CommandPhase) || this.game.isCurrentPhase(TurnInitPhase));
+      this.game.onNextPrompt(
+        "CheckSwitchPhase",
+        UiMode.CONFIRM,
+        () => {
+          this.game.setMode(UiMode.MESSAGE);
+          this.game.endPhase();
+        },
+        () => this.game.isCurrentPhase(CommandPhase) || this.game.isCurrentPhase(TurnInitPhase),
+      );
 
-      this.game.onNextPrompt("CheckSwitchPhase", Mode.CONFIRM, () => {
-        this.game.setMode(Mode.MESSAGE);
-        this.game.endPhase();
-      }, () => this.game.isCurrentPhase(CommandPhase) || this.game.isCurrentPhase(TurnInitPhase));
+      this.game.onNextPrompt(
+        "CheckSwitchPhase",
+        UiMode.CONFIRM,
+        () => {
+          this.game.setMode(UiMode.MESSAGE);
+          this.game.endPhase();
+        },
+        () => this.game.isCurrentPhase(CommandPhase) || this.game.isCurrentPhase(TurnInitPhase),
+      );
     }
 
     await this.game.phaseInterceptor.to(CommandPhase);
diff --git a/src/test/utils/helpers/dailyModeHelper.ts b/test/testUtils/helpers/dailyModeHelper.ts
similarity index 69%
rename from src/test/utils/helpers/dailyModeHelper.ts
rename to test/testUtils/helpers/dailyModeHelper.ts
index bd8c6ebb920..8ee03ce5f89 100644
--- a/src/test/utils/helpers/dailyModeHelper.ts
+++ b/test/testUtils/helpers/dailyModeHelper.ts
@@ -6,14 +6,13 @@ import { EncounterPhase } from "#app/phases/encounter-phase";
 import { TitlePhase } from "#app/phases/title-phase";
 import { TurnInitPhase } from "#app/phases/turn-init-phase";
 import type SaveSlotSelectUiHandler from "#app/ui/save-slot-select-ui-handler";
-import { Mode } from "#app/ui/ui";
+import { UiMode } from "#enums/ui-mode";
 import { GameManagerHelper } from "./gameManagerHelper";
 
 /**
  * Helper to handle daily mode specifics
  */
 export class DailyModeHelper extends GameManagerHelper {
-
   /**
    * Runs the daily game to the summon phase.
    * @returns A promise that resolves when the summon phase is reached.
@@ -25,12 +24,12 @@ export class DailyModeHelper extends GameManagerHelper {
       this.game.override.shiny(false).enemyShiny(false);
     }
 
-    this.game.onNextPrompt("TitlePhase", Mode.TITLE, () => {
+    this.game.onNextPrompt("TitlePhase", UiMode.TITLE, () => {
       const titlePhase = new TitlePhase();
       titlePhase.initDailyRun();
     });
 
-    this.game.onNextPrompt("TitlePhase", Mode.SAVE_SLOT, () => {
+    this.game.onNextPrompt("TitlePhase", UiMode.SAVE_SLOT, () => {
       const uihandler = this.game.scene.ui.getHandler<SaveSlotSelectUiHandler>();
       uihandler.processInput(Button.ACTION); // select first slot. that's fine
     });
@@ -50,15 +49,25 @@ export class DailyModeHelper extends GameManagerHelper {
     await this.runToSummon();
 
     if (this.game.scene.battleStyle === BattleStyle.SWITCH) {
-      this.game.onNextPrompt("CheckSwitchPhase", Mode.CONFIRM, () => {
-        this.game.setMode(Mode.MESSAGE);
-        this.game.endPhase();
-      }, () => this.game.isCurrentPhase(CommandPhase) || this.game.isCurrentPhase(TurnInitPhase));
+      this.game.onNextPrompt(
+        "CheckSwitchPhase",
+        UiMode.CONFIRM,
+        () => {
+          this.game.setMode(UiMode.MESSAGE);
+          this.game.endPhase();
+        },
+        () => this.game.isCurrentPhase(CommandPhase) || this.game.isCurrentPhase(TurnInitPhase),
+      );
 
-      this.game.onNextPrompt("CheckSwitchPhase", Mode.CONFIRM, () => {
-        this.game.setMode(Mode.MESSAGE);
-        this.game.endPhase();
-      }, () => this.game.isCurrentPhase(CommandPhase) || this.game.isCurrentPhase(TurnInitPhase));
+      this.game.onNextPrompt(
+        "CheckSwitchPhase",
+        UiMode.CONFIRM,
+        () => {
+          this.game.setMode(UiMode.MESSAGE);
+          this.game.endPhase();
+        },
+        () => this.game.isCurrentPhase(CommandPhase) || this.game.isCurrentPhase(TurnInitPhase),
+      );
     }
 
     await this.game.phaseInterceptor.to(CommandPhase);
diff --git a/src/test/utils/helpers/gameManagerHelper.ts b/test/testUtils/helpers/gameManagerHelper.ts
similarity index 100%
rename from src/test/utils/helpers/gameManagerHelper.ts
rename to test/testUtils/helpers/gameManagerHelper.ts
diff --git a/src/test/utils/helpers/modifiersHelper.ts b/test/testUtils/helpers/modifiersHelper.ts
similarity index 100%
rename from src/test/utils/helpers/modifiersHelper.ts
rename to test/testUtils/helpers/modifiersHelper.ts
diff --git a/src/test/utils/helpers/moveHelper.ts b/test/testUtils/helpers/moveHelper.ts
similarity index 51%
rename from src/test/utils/helpers/moveHelper.ts
rename to test/testUtils/helpers/moveHelper.ts
index ee026c06a8d..269cf65ea56 100644
--- a/src/test/utils/helpers/moveHelper.ts
+++ b/test/testUtils/helpers/moveHelper.ts
@@ -7,10 +7,10 @@ import type { CommandPhase } from "#app/phases/command-phase";
 import { LearnMovePhase } from "#app/phases/learn-move-phase";
 import { MoveEffectPhase } from "#app/phases/move-effect-phase";
 import { Command } from "#app/ui/command-ui-handler";
-import { Mode } from "#app/ui/ui";
+import { UiMode } from "#enums/ui-mode";
 import { Moves } from "#enums/moves";
-import { getMovePosition } from "#test/utils/gameManagerUtils";
-import { GameManagerHelper } from "#test/utils/helpers/gameManagerHelper";
+import { getMovePosition } from "#test/testUtils/gameManagerUtils";
+import { GameManagerHelper } from "#test/testUtils/helpers/gameManagerHelper";
 import { vi } from "vitest";
 
 /**
@@ -18,29 +18,29 @@ import { vi } from "vitest";
  */
 export class MoveHelper extends GameManagerHelper {
   /**
-   * Intercepts {@linkcode MoveEffectPhase} and mocks the
-   * {@linkcode MoveEffectPhase.hitCheck | hitCheck}'s return value to `true`.
-   * Used to force a move to hit.
+   * Intercepts {@linkcode MoveEffectPhase} and mocks the phase's move's
+   * accuracy to -1, guaranteeing a hit.
    */
   public async forceHit(): Promise<void> {
     await this.game.phaseInterceptor.to(MoveEffectPhase, false);
-    vi.spyOn(this.game.scene.getCurrentPhase() as MoveEffectPhase, "hitCheck").mockReturnValue(true);
+    const moveEffectPhase = this.game.scene.getCurrentPhase() as MoveEffectPhase;
+    vi.spyOn(moveEffectPhase.move, "calculateBattleAccuracy").mockReturnValue(-1);
   }
 
   /**
-   * Intercepts {@linkcode MoveEffectPhase} and mocks the
-   * {@linkcode MoveEffectPhase.hitCheck | hitCheck}'s return value to `false`.
-   * Used to force a move to miss.
+   * Intercepts {@linkcode MoveEffectPhase} and mocks the phase's move's accuracy
+   * to 0, guaranteeing a miss.
    * @param firstTargetOnly - Whether the move should force miss on the first target only, in the case of multi-target moves.
    */
-  public async forceMiss(firstTargetOnly: boolean = false): Promise<void> {
+  public async forceMiss(firstTargetOnly = false): Promise<void> {
     await this.game.phaseInterceptor.to(MoveEffectPhase, false);
-    const hitCheck = vi.spyOn(this.game.scene.getCurrentPhase() as MoveEffectPhase, "hitCheck");
+    const moveEffectPhase = this.game.scene.getCurrentPhase() as MoveEffectPhase;
+    const accuracy = vi.spyOn(moveEffectPhase.move, "calculateBattleAccuracy");
 
     if (firstTargetOnly) {
-      hitCheck.mockReturnValueOnce(false);
+      accuracy.mockReturnValueOnce(0);
     } else {
-      hitCheck.mockReturnValue(false);
+      accuracy.mockReturnValue(0);
     }
   }
 
@@ -53,10 +53,10 @@ export class MoveHelper extends GameManagerHelper {
   public select(move: Moves, pkmIndex: 0 | 1 = 0, targetIndex?: BattlerIndex | null) {
     const movePosition = getMovePosition(this.game.scene, pkmIndex, move);
 
-    this.game.onNextPrompt("CommandPhase", Mode.COMMAND, () => {
-      this.game.scene.ui.setMode(Mode.FIGHT, (this.game.scene.getCurrentPhase() as CommandPhase).getFieldIndex());
+    this.game.onNextPrompt("CommandPhase", UiMode.COMMAND, () => {
+      this.game.scene.ui.setMode(UiMode.FIGHT, (this.game.scene.getCurrentPhase() as CommandPhase).getFieldIndex());
     });
-    this.game.onNextPrompt("CommandPhase", Mode.FIGHT, () => {
+    this.game.onNextPrompt("CommandPhase", UiMode.FIGHT, () => {
       (this.game.scene.getCurrentPhase() as CommandPhase).handleCommand(Command.FIGHT, movePosition, false);
     });
 
@@ -65,6 +65,33 @@ export class MoveHelper extends GameManagerHelper {
     }
   }
 
+  /**
+   * Select the move to be used by the given Pokemon(-index), **which will also terastallize on this turn**.
+   * Triggers during the next {@linkcode CommandPhase}
+   * @param move - the move to use
+   * @param pkmIndex - the pokemon index. Relevant for double-battles only (defaults to 0)
+   * @param targetIndex - The {@linkcode BattlerIndex} of the Pokemon to target for single-target moves, or `null` if a manual call to `selectTarget()` is required
+   */
+  public selectWithTera(move: Moves, pkmIndex: 0 | 1 = 0, targetIndex?: BattlerIndex | null) {
+    const movePosition = getMovePosition(this.game.scene, pkmIndex, move);
+    this.game.scene.getPlayerParty()[pkmIndex].isTerastallized = false;
+
+    this.game.onNextPrompt("CommandPhase", UiMode.COMMAND, () => {
+      this.game.scene.ui.setMode(
+        UiMode.FIGHT,
+        (this.game.scene.getCurrentPhase() as CommandPhase).getFieldIndex(),
+        Command.TERA,
+      );
+    });
+    this.game.onNextPrompt("CommandPhase", UiMode.FIGHT, () => {
+      (this.game.scene.getCurrentPhase() as CommandPhase).handleCommand(Command.TERA, movePosition, false);
+    });
+
+    if (targetIndex !== null) {
+      this.game.selectTarget(movePosition, targetIndex);
+    }
+  }
+
   /**
    * Forces the Paralysis or Freeze status to activate on the next move by temporarily mocking {@linkcode Overrides.STATUS_ACTIVATION_OVERRIDE},
    * advancing to the next `MovePhase`, and then resetting the override to `null`
@@ -76,6 +103,17 @@ export class MoveHelper extends GameManagerHelper {
     vi.spyOn(Overrides, "STATUS_ACTIVATION_OVERRIDE", "get").mockReturnValue(null);
   }
 
+  /**
+   * Forces the Confusion status to activate on the next move by temporarily mocking {@linkcode Overrides.CONFUSION_ACTIVATION_OVERRIDE},
+   * advancing to the next `MovePhase`, and then resetting the override to `null`
+   * @param activated - `true` to force the Pokemon to hit themself, `false` to forcibly disable it
+   */
+  public async forceConfusionActivation(activated: boolean): Promise<void> {
+    vi.spyOn(Overrides, "CONFUSION_ACTIVATION_OVERRIDE", "get").mockReturnValue(activated);
+    await this.game.phaseInterceptor.to("MovePhase");
+    vi.spyOn(Overrides, "CONFUSION_ACTIVATION_OVERRIDE", "get").mockReturnValue(null);
+  }
+
   /**
    * Changes a pokemon's moveset to the given move(s).
    * Used when the normal moveset override can't be used (such as when it's necessary to check or update properties of the moveset).
@@ -84,40 +122,40 @@ export class MoveHelper extends GameManagerHelper {
    */
   public changeMoveset(pokemon: Pokemon, moveset: Moves | Moves[]): void {
     if (!Array.isArray(moveset)) {
-      moveset = [ moveset ];
+      moveset = [moveset];
     }
     pokemon.moveset = [];
-    moveset.forEach((move) => {
+    moveset.forEach(move => {
       pokemon.moveset.push(new PokemonMove(move));
     });
-    const movesetStr = moveset.map((moveId) => Moves[moveId]).join(", ");
+    const movesetStr = moveset.map(moveId => Moves[moveId]).join(", ");
     console.log(`Pokemon ${pokemon.species.name}'s moveset manually set to ${movesetStr} (=[${moveset.join(", ")}])!`);
   }
 
   /**
-  * Simulates learning a move for a player pokemon.
-  * @param move The {@linkcode Moves} being learnt
-  * @param partyIndex The party position of the {@linkcode PlayerPokemon} learning the move (defaults to 0)
-  * @param moveSlotIndex The INDEX (0-4) of the move slot to replace if existent move slots are full;
-  * defaults to 0 (first slot) and 4 aborts the procedure
-  * @returns a promise that resolves once the move has been successfully learnt
- */
-  public async learnMove(move: Moves | number, partyIndex: number = 0, moveSlotIndex: number = 0) {
+   * Simulates learning a move for a player pokemon.
+   * @param move The {@linkcode Moves} being learnt
+   * @param partyIndex The party position of the {@linkcode PlayerPokemon} learning the move (defaults to 0)
+   * @param moveSlotIndex The INDEX (0-4) of the move slot to replace if existent move slots are full;
+   * defaults to 0 (first slot) and 4 aborts the procedure
+   * @returns a promise that resolves once the move has been successfully learnt
+   */
+  public async learnMove(move: Moves | number, partyIndex = 0, moveSlotIndex = 0) {
     return new Promise<void>(async (resolve, reject) => {
       this.game.scene.pushPhase(new LearnMovePhase(partyIndex, move));
 
       // if slots are full, queue up inputs to replace existing moves
       if (this.game.scene.getPlayerParty()[partyIndex].moveset.filter(m => m).length === 4) {
-        this.game.onNextPrompt("LearnMovePhase", Mode.CONFIRM, () => {
+        this.game.onNextPrompt("LearnMovePhase", UiMode.CONFIRM, () => {
           this.game.scene.ui.processInput(Button.ACTION); // "Should a move be forgotten and replaced with XXX?"
         });
-        this.game.onNextPrompt("LearnMovePhase", Mode.SUMMARY, () => {
+        this.game.onNextPrompt("LearnMovePhase", UiMode.SUMMARY, () => {
           for (let x = 0; x < (moveSlotIndex ?? 0); x++) {
             this.game.scene.ui.processInput(Button.DOWN); // Scrolling in summary pane to move position
           }
           this.game.scene.ui.processInput(Button.ACTION);
           if (moveSlotIndex === 4) {
-            this.game.onNextPrompt("LearnMovePhase", Mode.CONFIRM, () => {
+            this.game.onNextPrompt("LearnMovePhase", UiMode.CONFIRM, () => {
               this.game.scene.ui.processInput(Button.ACTION); // "Give up on learning XXX?"
             });
           }
@@ -128,5 +166,4 @@ export class MoveHelper extends GameManagerHelper {
       resolve();
     });
   }
-
 }
diff --git a/src/test/utils/helpers/overridesHelper.ts b/test/testUtils/helpers/overridesHelper.ts
similarity index 70%
rename from src/test/utils/helpers/overridesHelper.ts
rename to test/testUtils/helpers/overridesHelper.ts
index 47358738048..acc2e4d5cd0 100644
--- a/src/test/utils/helpers/overridesHelper.ts
+++ b/test/testUtils/helpers/overridesHelper.ts
@@ -1,12 +1,9 @@
-import type { Variant } from "#app/data/variant";
+import type { Variant } from "#app/sprites/variant";
 import { Weather } from "#app/data/weather";
 import { Abilities } from "#app/enums/abilities";
-import * as GameMode from "#app/game-mode";
-import type { GameModes } from "#app/game-mode";
-import { getGameMode } from "#app/game-mode";
 import type { ModifierOverride } from "#app/modifier/modifier-type";
 import type { BattleStyle } from "#app/overrides";
-import Overrides from "#app/overrides";
+import Overrides, { defaultOverrides } from "#app/overrides";
 import type { Unlockables } from "#app/system/unlockables";
 import { Biome } from "#enums/biome";
 import { Moves } from "#enums/moves";
@@ -15,22 +12,25 @@ import type { MysteryEncounterType } from "#enums/mystery-encounter-type";
 import { Species } from "#enums/species";
 import { StatusEffect } from "#enums/status-effect";
 import type { WeatherType } from "#enums/weather-type";
-import { vi } from "vitest";
+import { expect, vi } from "vitest";
 import { GameManagerHelper } from "./gameManagerHelper";
+import { shiftCharCodes } from "#app/utils/common";
+import type { RandomTrainerOverride } from "#app/overrides";
+import type { BattleType } from "#enums/battle-type";
 
 /**
  * Helper to handle overrides in tests
  */
 export class OverridesHelper extends GameManagerHelper {
   /** If `true`, removes the starting items from enemies at the start of each test; default `true` */
-  public removeEnemyStartingItems: boolean = true;
+  public removeEnemyStartingItems = true;
   /** If `true`, sets the shiny overrides to disable shinies at the start of each test; default `true` */
-  public disableShinies: boolean = true;
+  public disableShinies = true;
 
   /**
    * Override the starting biome
    * @warning Any event listeners that are attached to [NewArenaEvent](events\battle-scene.ts) may need to be handled down the line
-   * @param biome the biome to set
+   * @param biome - The biome to set
    */
   public startingBiome(biome: Biome): this {
     this.game.scene.newArena(biome);
@@ -39,8 +39,8 @@ export class OverridesHelper extends GameManagerHelper {
   }
 
   /**
-   * Override the starting wave (index)
-   * @param wave the wave (index) to set. Classic: `1`-`200`
+   * Override the starting wave index
+   * @param wave - The wave to set. Classic: `1`-`200`
    * @returns `this`
    */
   public startingWave(wave: number): this {
@@ -50,8 +50,8 @@ export class OverridesHelper extends GameManagerHelper {
   }
 
   /**
-   * Override the player (pokemon) starting level
-   * @param level the (pokemon) level to set
+   * Override the player pokemon's starting level
+   * @param level - The level to set
    * @returns `this`
    */
   public startingLevel(level: Species | number): this {
@@ -62,7 +62,7 @@ export class OverridesHelper extends GameManagerHelper {
 
   /**
    * Override the XP Multiplier
-   * @param value the XP multiplier to set
+   * @param value - The XP multiplier to set
    * @returns `this`
    */
   public xpMultiplier(value: number): this {
@@ -73,7 +73,7 @@ export class OverridesHelper extends GameManagerHelper {
 
   /**
    * Override the wave level cap
-   * @param cap the level cap value to set; 0 uses normal level caps and negative values
+   * @param cap - The level cap value to set; 0 uses normal level caps and negative values
    * disable it completely
    * @returns `this`
    */
@@ -92,8 +92,8 @@ export class OverridesHelper extends GameManagerHelper {
   }
 
   /**
-   * Override the player (pokemon) starting held items
-   * @param items the items to hold
+   * Override the player pokemon's starting held items
+   * @param items - The items to hold
    * @returns `this`
    */
   public startingHeldItems(items: ModifierOverride[]): this {
@@ -103,8 +103,8 @@ export class OverridesHelper extends GameManagerHelper {
   }
 
   /**
-   * Override the player (pokemon) {@linkcode Species | species}
-   * @param species the (pokemon) {@linkcode Species | species} to set
+   * Override the player pokemon's {@linkcode Species | species}
+   * @param species - The {@linkcode Species | species} to set
    * @returns `this`
    */
   public starterSpecies(species: Species | number): this {
@@ -114,7 +114,7 @@ export class OverridesHelper extends GameManagerHelper {
   }
 
   /**
-   * Override the player (pokemon) to be a random fusion
+   * Override the player pokemon to be a random fusion
    * @returns `this`
    */
   public enableStarterFusion(): this {
@@ -124,8 +124,8 @@ export class OverridesHelper extends GameManagerHelper {
   }
 
   /**
-   * Override the player (pokemon) fusion species
-   * @param species the fusion species to set
+   * Override the player pokemon's fusion species
+   * @param species - The fusion species to set
    * @returns `this`
    */
   public starterFusionSpecies(species: Species | number): this {
@@ -135,14 +135,14 @@ export class OverridesHelper extends GameManagerHelper {
   }
 
   /**
-   * Override the player (pokemons) forms
-   * @param forms the (pokemon) forms to set
+   * Override the player pokemon's forms
+   * @param forms - The forms to set
    * @returns `this`
    */
   public starterForms(forms: Partial<Record<Species, number>>): this {
     vi.spyOn(Overrides, "STARTER_FORM_OVERRIDES", "get").mockReturnValue(forms);
     const formsStr = Object.entries(forms)
-      .map(([ speciesId, formIndex ]) => `${Species[speciesId]}=${formIndex}`)
+      .map(([speciesId, formIndex]) => `${Species[speciesId]}=${formIndex}`)
       .join(", ");
     this.log(`Player Pokemon form set to: ${formsStr}!`);
     return this;
@@ -150,7 +150,7 @@ export class OverridesHelper extends GameManagerHelper {
 
   /**
    * Override the player's starting modifiers
-   * @param modifiers the modifiers to set
+   * @param modifiers - The modifiers to set
    * @returns `this`
    */
   public startingModifier(modifiers: ModifierOverride[]): this {
@@ -160,8 +160,8 @@ export class OverridesHelper extends GameManagerHelper {
   }
 
   /**
-   * Override the player (pokemon) {@linkcode Abilities | ability}.
-   * @param ability the (pokemon) {@linkcode Abilities | ability} to set
+   * Override the player pokemon's {@linkcode Abilities | ability}.
+   * @param ability - The {@linkcode Abilities | ability} to set
    * @returns `this`
    */
   public ability(ability: Abilities): this {
@@ -171,8 +171,8 @@ export class OverridesHelper extends GameManagerHelper {
   }
 
   /**
-   * Override the player (pokemon) **passive** {@linkcode Abilities | ability}
-   * @param passiveAbility the (pokemon) **passive** {@linkcode Abilities | ability} to set
+   * Override the player pokemon's **passive** {@linkcode Abilities | ability}
+   * @param passiveAbility - The **passive** {@linkcode Abilities | ability} to set
    * @returns `this`
    */
   public passiveAbility(passiveAbility: Abilities): this {
@@ -182,8 +182,8 @@ export class OverridesHelper extends GameManagerHelper {
   }
 
   /**
-   * Forces the status of the player (pokemon) **passive** {@linkcode Abilities | ability}
-   * @param hasPassiveAbility forces the passive to be active if `true`, inactive if `false`
+   * Forces the status of the player pokemon **passive** {@linkcode Abilities | ability}
+   * @param hasPassiveAbility - Forces the passive to be active if `true`, inactive if `false`
    * @returns `this`
    */
   public hasPassiveAbility(hasPassiveAbility: boolean | null): this {
@@ -196,23 +196,23 @@ export class OverridesHelper extends GameManagerHelper {
     return this;
   }
   /**
-   * Override the player (pokemon) {@linkcode Moves | moves}set
-   * @param moveset the {@linkcode Moves | moves}set to set
+   * Override the player pokemon's {@linkcode Moves | moves}set
+   * @param moveset - The {@linkcode Moves | moves}set to set
    * @returns `this`
    */
   public moveset(moveset: Moves | Moves[]): this {
     vi.spyOn(Overrides, "MOVESET_OVERRIDE", "get").mockReturnValue(moveset);
     if (!Array.isArray(moveset)) {
-      moveset = [ moveset ];
+      moveset = [moveset];
     }
-    const movesetStr = moveset.map((moveId) => Moves[moveId]).join(", ");
+    const movesetStr = moveset.map(moveId => Moves[moveId]).join(", ");
     this.log(`Player Pokemon moveset set to ${movesetStr} (=[${moveset.join(", ")}])!`);
     return this;
   }
 
   /**
-   * Override the player (pokemon) {@linkcode StatusEffect | status-effect}
-   * @param statusEffect the {@linkcode StatusEffect | status-effect} to set
+   * Override the player pokemon's {@linkcode StatusEffect | status-effect}
+   * @param statusEffect - The {@linkcode StatusEffect | status-effect} to set
    * @returns
    */
   public statusEffect(statusEffect: StatusEffect): this {
@@ -226,16 +226,24 @@ export class OverridesHelper extends GameManagerHelper {
    * @returns `this`
    */
   public disableTrainerWaves(): this {
-    const realFn = getGameMode;
-    vi.spyOn(GameMode, "getGameMode").mockImplementation((gameMode: GameModes) => {
-      const mode = realFn(gameMode);
-      mode.hasTrainers = false;
-      return mode;
-    });
+    vi.spyOn(Overrides, "DISABLE_STANDARD_TRAINERS_OVERRIDE", "get").mockReturnValue(true);
     this.log("Standard trainer waves are disabled!");
     return this;
   }
 
+  /**
+   * Override the trainer chosen when a random trainer is selected.
+   *
+   * Does not force the battle to be a trainer battle.
+   * @see {@linkcode setBattleType}
+   * @returns `this`
+   */
+  public randomTrainer(trainer: RandomTrainerOverride | null): this {
+    vi.spyOn(Overrides, "RANDOM_TRAINER_OVERRIDE", "get").mockReturnValue(trainer);
+    this.log("Partner battle is forced!");
+    return this;
+  }
+
   /**
    * Override each wave to not have critical hits
    * @returns `this`
@@ -247,8 +255,8 @@ export class OverridesHelper extends GameManagerHelper {
   }
 
   /**
-   * Override the {@linkcode WeatherType | weather (type)}
-   * @param type {@linkcode WeatherType | weather type} to set
+   * Override the {@linkcode WeatherType | weather type}
+   * @param type - The {@linkcode WeatherType | weather type} to set
    * @returns `this`
    */
   public weather(type: WeatherType): this {
@@ -259,35 +267,48 @@ export class OverridesHelper extends GameManagerHelper {
 
   /**
    * Override the seed
-   * @param seed the seed to set
+   * @param seed - The seed to set
    * @returns `this`
    */
   public seed(seed: string): this {
-    vi.spyOn(this.game.scene, "resetSeed").mockImplementation(() => {
-      this.game.scene.waveSeed = seed;
-      Phaser.Math.RND.sow([ seed ]);
-      this.game.scene.rngCounter = 0;
-    });
+    // Shift the seed here with a negative wave number, to compensate for `resetSeed()` shifting the seed itself.
+    this.game.scene.setSeed(shiftCharCodes(seed, (this.game.scene.currentBattle?.waveIndex ?? 0) * -1));
     this.game.scene.resetSeed();
     this.log(`Seed set to "${seed}"!`);
     return this;
   }
 
   /**
-   * Override the battle type (e.g., single or double).
-   * @see {@linkcode Overrides.BATTLE_TYPE_OVERRIDE}
-   * @param battleType battle type to set
+   * Override the battle style (e.g., single or double).
+   * @see {@linkcode Overrides.BATTLE_STYLE_OVERRIDE}
+   * @param battleStyle - The battle style to set
    * @returns `this`
    */
-  public battleType(battleType: BattleStyle | null): this {
-    vi.spyOn(Overrides, "BATTLE_TYPE_OVERRIDE", "get").mockReturnValue(battleType);
-    this.log(battleType === null ? "Battle type override disabled!" : `Battle type set to ${battleType}!`);
+  public battleStyle(battleStyle: BattleStyle | null): this {
+    vi.spyOn(Overrides, "BATTLE_STYLE_OVERRIDE", "get").mockReturnValue(battleStyle);
+    this.log(battleStyle === null ? "Battle type override disabled!" : `Battle type set to ${battleStyle}!`);
     return this;
   }
 
   /**
-   * Override the enemy (pokemon) {@linkcode Species | species}
-   * @param species the (pokemon) {@linkcode Species | species} to set
+   * Override the battle type (e.g., WILD, or Trainer) for non-scripted battles.
+   * @see {@linkcode Overrides.BATTLE_TYPE_OVERRIDE}
+   * @param battleType - The battle type to set
+   * @returns `this`
+   */
+  public battleType(battleType: Exclude<BattleType, BattleType.CLEAR>): this {
+    vi.spyOn(Overrides, "BATTLE_TYPE_OVERRIDE", "get").mockReturnValue(battleType);
+    this.log(
+      battleType === null
+        ? "Battle type override disabled!"
+        : `Battle type set to ${battleType[battleType]} (=${battleType})!`,
+    );
+    return this;
+  }
+
+  /**
+   * Override the {@linkcode Species | species} of enemy pokemon
+   * @param species - The {@linkcode Species | species} to set
    * @returns `this`
    */
   public enemySpecies(species: Species | number): this {
@@ -297,7 +318,7 @@ export class OverridesHelper extends GameManagerHelper {
   }
 
   /**
-   * Override the enemy (pokemon) to be a random fusion
+   * Override the enemy pokemon to be a random fusion
    * @returns `this`
    */
   public enableEnemyFusion(): this {
@@ -307,8 +328,8 @@ export class OverridesHelper extends GameManagerHelper {
   }
 
   /**
-   * Override the enemy (pokemon) fusion species
-   * @param species the fusion species to set
+   * Override the enemy pokemon fusion species
+   * @param species - The fusion species to set
    * @returns `this`
    */
   public enemyFusionSpecies(species: Species | number): this {
@@ -318,8 +339,8 @@ export class OverridesHelper extends GameManagerHelper {
   }
 
   /**
-   * Override the enemy (pokemon) {@linkcode Abilities | ability}
-   * @param ability the (pokemon) {@linkcode Abilities | ability} to set
+   * Override the {@linkcode Abilities | ability} of enemy pokemon
+   * @param ability - The {@linkcode Abilities | ability} to set
    * @returns `this`
    */
   public enemyAbility(ability: Abilities): this {
@@ -329,8 +350,8 @@ export class OverridesHelper extends GameManagerHelper {
   }
 
   /**
-   * Override the enemy (pokemon) **passive** {@linkcode Abilities | ability}
-   * @param passiveAbility the (pokemon) **passive** {@linkcode Abilities | ability} to set
+   * Override the **passive** {@linkcode Abilities | ability} of enemy pokemon
+   * @param passiveAbility - The **passive** {@linkcode Abilities | ability} to set
    * @returns `this`
    */
   public enemyPassiveAbility(passiveAbility: Abilities): this {
@@ -340,8 +361,8 @@ export class OverridesHelper extends GameManagerHelper {
   }
 
   /**
-   * Forces the status of the enemy (pokemon) **passive** {@linkcode Abilities | ability}
-   * @param hasPassiveAbility forces the passive to be active if `true`, inactive if `false`
+   * Forces the status of the enemy pokemon **passive** {@linkcode Abilities | ability}
+   * @param hasPassiveAbility - Forces the passive to be active if `true`, inactive if `false`
    * @returns `this`
    */
   public enemyHasPassiveAbility(hasPassiveAbility: boolean | null): this {
@@ -355,23 +376,23 @@ export class OverridesHelper extends GameManagerHelper {
   }
 
   /**
-   * Override the enemy (pokemon) {@linkcode Moves | moves}set
-   * @param moveset the {@linkcode Moves | moves}set to set
+   * Override the {@linkcode Moves | move}set of enemy pokemon
+   * @param moveset - The {@linkcode Moves | move}set to set
    * @returns `this`
    */
   public enemyMoveset(moveset: Moves | Moves[]): this {
     vi.spyOn(Overrides, "OPP_MOVESET_OVERRIDE", "get").mockReturnValue(moveset);
     if (!Array.isArray(moveset)) {
-      moveset = [ moveset ];
+      moveset = [moveset];
     }
-    const movesetStr = moveset.map((moveId) => Moves[moveId]).join(", ");
+    const movesetStr = moveset.map(moveId => Moves[moveId]).join(", ");
     this.log(`Enemy Pokemon moveset set to ${movesetStr} (=[${moveset.join(", ")}])!`);
     return this;
   }
 
   /**
-   * Override the enemy (pokemon) level
-   * @param level the level to set
+   * Override the level of enemy pokemon
+   * @param level - The level to set
    * @returns `this`
    */
   public enemyLevel(level: number): this {
@@ -381,8 +402,8 @@ export class OverridesHelper extends GameManagerHelper {
   }
 
   /**
-   * Override the enemy (pokemon) {@linkcode StatusEffect | status-effect}
-   * @param statusEffect the {@linkcode StatusEffect | status-effect} to set
+   * Override the enemy {@linkcode StatusEffect | status-effect} for enemy pokemon
+   * @param statusEffect - The {@linkcode StatusEffect | status-effect} to set
    * @returns
    */
   public enemyStatusEffect(statusEffect: StatusEffect): this {
@@ -404,7 +425,7 @@ export class OverridesHelper extends GameManagerHelper {
 
   /**
    * Gives the player access to an Unlockable.
-   * @param unlockable The Unlockable(s) to enable.
+   * @param unlockable - The Unlockable(s) to enable.
    * @returns `this`
    */
   public enableUnlockable(unlockable: Unlockables[]): this {
@@ -415,7 +436,7 @@ export class OverridesHelper extends GameManagerHelper {
 
   /**
    * Override the items rolled at the end of a battle
-   * @param items the items to be rolled
+   * @param items - The items to be rolled
    * @returns `this`
    */
   public itemRewards(items: ModifierOverride[]): this {
@@ -473,8 +494,8 @@ export class OverridesHelper extends GameManagerHelper {
   }
 
   /**
-   * Override the enemy (Pokemon) to have the given amount of health segments
-   * @param healthSegments the number of segments to give
+   * Override the enemy Pokemon to have the given amount of health segments
+   * @param healthSegments - The number of segments to give
    * - `0` (default): the health segments will be handled like in the game based on wave, level and species
    * - `1`: the Pokemon will not be a boss
    * - `2`+: the Pokemon will be a boss with the given number of health segments
@@ -501,9 +522,24 @@ export class OverridesHelper extends GameManagerHelper {
     return this;
   }
 
+  /**
+   * Override confusion to always or never activate
+   * @param activate - `true` to force activation, `false` to force no activation, `null` to disable the override
+   * @returns `this`
+   */
+  public confusionActivation(activate: boolean | null): this {
+    vi.spyOn(Overrides, "CONFUSION_ACTIVATION_OVERRIDE", "get").mockReturnValue(activate);
+    if (activate !== null) {
+      this.log(`Confusion forced to ${activate ? "always" : "never"} activate!`);
+    } else {
+      this.log("Confusion activation override disabled!");
+    }
+    return this;
+  }
+
   /**
    * Override the encounter chance for a mystery encounter.
-   * @param percentage the encounter chance in %
+   * @param percentage - The encounter chance in %
    * @returns `this`
    */
   public mysteryEncounterChance(percentage: number): this {
@@ -539,4 +575,14 @@ export class OverridesHelper extends GameManagerHelper {
   private log(...params: any[]) {
     console.log("Overrides:", ...params);
   }
+
+  public sanitizeOverrides(): void {
+    for (const key of Object.keys(defaultOverrides)) {
+      if (Overrides[key] !== defaultOverrides[key]) {
+        vi.spyOn(Overrides, key as any, "get").mockReturnValue(defaultOverrides[key]);
+      }
+    }
+    expect(Overrides).toEqual(defaultOverrides);
+    this.log("Sanitizing all overrides!");
+  }
 }
diff --git a/src/test/utils/helpers/reloadHelper.ts b/test/testUtils/helpers/reloadHelper.ts
similarity index 60%
rename from src/test/utils/helpers/reloadHelper.ts
rename to test/testUtils/helpers/reloadHelper.ts
index 5f516584873..4a9e5356968 100644
--- a/src/test/utils/helpers/reloadHelper.ts
+++ b/test/testUtils/helpers/reloadHelper.ts
@@ -1,6 +1,6 @@
 import { GameManagerHelper } from "./gameManagerHelper";
 import { TitlePhase } from "#app/phases/title-phase";
-import { Mode } from "#app/ui/ui";
+import { UiMode } from "#enums/ui-mode";
 import { vi } from "vitest";
 import { BattleStyle } from "#app/enums/battle-style";
 import { CommandPhase } from "#app/phases/command-phase";
@@ -19,7 +19,7 @@ export class ReloadHelper extends GameManagerHelper {
 
     // Whenever the game saves the session, save it to the reloadHelper instead
     vi.spyOn(game.scene.gameData, "saveAll").mockImplementation(() => {
-      return new Promise<boolean>((resolve, reject) => {
+      return new Promise<boolean>((resolve, _reject) => {
         this.sessionData = game.scene.gameData.getSessionSaveData();
         resolve(true);
       });
@@ -31,7 +31,7 @@ export class ReloadHelper extends GameManagerHelper {
    * beginning of the first turn (equivalent to running `startBattle()`) for
    * the reloaded session.
    */
-  async reloadSession() : Promise<void> {
+  async reloadSession(): Promise<void> {
     const scene = this.game.scene;
     const titlePhase = new TitlePhase();
 
@@ -39,30 +39,50 @@ export class ReloadHelper extends GameManagerHelper {
 
     // Set the last saved session to the desired session data
     vi.spyOn(scene.gameData, "getSession").mockReturnValue(
-      new Promise((resolve, reject) => {
+      new Promise((resolve, _reject) => {
         resolve(this.sessionData);
-      })
+      }),
     );
     scene.unshiftPhase(titlePhase);
     this.game.endPhase(); // End the currently ongoing battle
 
+    // remove all persistent mods before loading
+    // TODO: Look into why these aren't removed before load
+    if (this.game.scene.modifiers.length) {
+      console.log(
+        "Removing %d modifiers from scene on load...",
+        this.game.scene.modifiers.length,
+        this.game.scene.modifiers,
+      );
+      this.game.scene.modifiers = [];
+    }
     titlePhase.loadSaveSlot(-1); // Load the desired session data
     this.game.phaseInterceptor.shift(); // Loading the save slot also ended TitlePhase, clean it up
 
     // Run through prompts for switching Pokemon, copied from classicModeHelper.ts
     if (this.game.scene.battleStyle === BattleStyle.SWITCH) {
-      this.game.onNextPrompt("CheckSwitchPhase", Mode.CONFIRM, () => {
-        this.game.setMode(Mode.MESSAGE);
-        this.game.endPhase();
-      }, () => this.game.isCurrentPhase(CommandPhase) || this.game.isCurrentPhase(TurnInitPhase));
+      this.game.onNextPrompt(
+        "CheckSwitchPhase",
+        UiMode.CONFIRM,
+        () => {
+          this.game.setMode(UiMode.MESSAGE);
+          this.game.endPhase();
+        },
+        () => this.game.isCurrentPhase(CommandPhase) || this.game.isCurrentPhase(TurnInitPhase),
+      );
 
-      this.game.onNextPrompt("CheckSwitchPhase", Mode.CONFIRM, () => {
-        this.game.setMode(Mode.MESSAGE);
-        this.game.endPhase();
-      }, () => this.game.isCurrentPhase(CommandPhase) || this.game.isCurrentPhase(TurnInitPhase));
+      this.game.onNextPrompt(
+        "CheckSwitchPhase",
+        UiMode.CONFIRM,
+        () => {
+          this.game.setMode(UiMode.MESSAGE);
+          this.game.endPhase();
+        },
+        () => this.game.isCurrentPhase(CommandPhase) || this.game.isCurrentPhase(TurnInitPhase),
+      );
     }
 
     await this.game.phaseInterceptor.to(CommandPhase);
-    console.log("==================[New Turn]==================");
+    console.log("==================[New Turn (Reloaded)]==================");
   }
 }
diff --git a/src/test/utils/helpers/settingsHelper.ts b/test/testUtils/helpers/settingsHelper.ts
similarity index 94%
rename from src/test/utils/helpers/settingsHelper.ts
rename to test/testUtils/helpers/settingsHelper.ts
index 83baa329cec..d5a60e6496a 100644
--- a/src/test/utils/helpers/settingsHelper.ts
+++ b/test/testUtils/helpers/settingsHelper.ts
@@ -27,7 +27,7 @@ export class SettingsHelper extends GameManagerHelper {
    */
   typeHints(enable: boolean): void {
     this.game.scene.typeHints = enable;
-    this.log(`Type Hints ${enable ? "enabled" : "disabled"}` );
+    this.log(`Type Hints ${enable ? "enabled" : "disabled"}`);
   }
 
   /**
@@ -36,7 +36,7 @@ export class SettingsHelper extends GameManagerHelper {
    */
   playerGender(gender: PlayerGender) {
     this.game.scene.gameData.gender = gender;
-    this.log(`Gender set to: ${PlayerGender[gender]} (=${gender})` );
+    this.log(`Gender set to: ${PlayerGender[gender]} (=${gender})`);
   }
 
   /**
@@ -45,7 +45,7 @@ export class SettingsHelper extends GameManagerHelper {
    */
   expGainsSpeed(speed: ExpGainsSpeed) {
     this.game.scene.expGainsSpeed = speed;
-    this.log(`Exp Gains Speed set to: ${ExpGainsSpeed[speed]} (=${speed})` );
+    this.log(`Exp Gains Speed set to: ${ExpGainsSpeed[speed]} (=${speed})`);
   }
 
   private log(...params: any[]) {
diff --git a/src/test/utils/inputsHandler.ts b/test/testUtils/inputsHandler.ts
similarity index 81%
rename from src/test/utils/inputsHandler.ts
rename to test/testUtils/inputsHandler.ts
index e2591def447..6e9dd453541 100644
--- a/src/test/utils/inputsHandler.ts
+++ b/test/testUtils/inputsHandler.ts
@@ -2,8 +2,8 @@ import type BattleScene from "#app/battle-scene";
 import pad_xbox360 from "#app/configs/inputs/pad_xbox360";
 import type { InputsController } from "#app/inputs-controller";
 import TouchControl from "#app/touch-controls";
-import { holdOn } from "#test/utils/gameManagerUtils";
-import fs from "fs";
+import { holdOn } from "#test/testUtils/gameManagerUtils";
+import fs from "node:fs";
 import { JSDOM } from "jsdom";
 import Phaser from "phaser";
 
@@ -31,7 +31,7 @@ export default class InputsHandler {
   }
 
   pressTouch(button: string, duration: number): Promise<void> {
-    return new Promise(async (resolve) => {
+    return new Promise(async resolve => {
       this.fakeMobile.touchDown(button);
       await holdOn(duration);
       this.fakeMobile.touchUp(button);
@@ -40,7 +40,7 @@ export default class InputsHandler {
   }
 
   pressGamepadButton(button: number, duration: number): Promise<void> {
-    return new Promise(async (resolve) => {
+    return new Promise(async resolve => {
       this.scene.input.gamepad?.emit("down", this.fakePad, { index: button });
       await holdOn(duration);
       this.scene.input.gamepad?.emit("up", this.fakePad, { index: button });
@@ -49,7 +49,7 @@ export default class InputsHandler {
   }
 
   pressKeyboardKey(key: number, duration: number): Promise<void> {
-    return new Promise(async (resolve) => {
+    return new Promise(async resolve => {
       this.scene.input.keyboard?.emit("keydown", { keyCode: key });
       await holdOn(duration);
       this.scene.input.keyboard?.emit("keyup", { keyCode: key });
@@ -66,13 +66,21 @@ export default class InputsHandler {
   }
 
   listenInputs(): void {
-    this.events.on("input_down", (event) => {
-      this.log.push({ type: "input_down", button: event.button });
-    }, this);
+    this.events.on(
+      "input_down",
+      event => {
+        this.log.push({ type: "input_down", button: event.button });
+      },
+      this,
+    );
 
-    this.events.on("input_up", (event) => {
-      this.logUp.push({ type: "input_up", button: event.button });
-    }, this);
+    this.events.on(
+      "input_up",
+      event => {
+        this.logUp.push({ type: "input_up", button: event.button });
+      },
+      this,
+    );
   }
 }
 
@@ -82,7 +90,7 @@ class Fakepad extends Phaser.Input.Gamepad.Gamepad {
 
   constructor(pad) {
     //@ts-ignore
-    super(undefined, { ...pad, buttons: pad.deviceMapping, axes: []}); //TODO: resolve ts-ignore
+    super(undefined, { ...pad, buttons: pad.deviceMapping, axes: [] }); //TODO: resolve ts-ignore
     this.id = "xbox_360_fakepad";
     this.index = 0;
   }
@@ -90,7 +98,7 @@ class Fakepad extends Phaser.Input.Gamepad.Gamepad {
 
 class FakeMobile {
   constructor() {
-    const fakeMobilePage = fs.readFileSync("./src/test/utils/fakeMobile.html", { encoding: "utf8", flag: "r" });
+    const fakeMobilePage = fs.readFileSync("././test/testUtils/fakeMobile.html", { encoding: "utf8", flag: "r" });
     const dom = new JSDOM(fakeMobilePage);
     Object.defineProperty(window, "document", {
       value: dom.window.document,
diff --git a/test/testUtils/listenersManager.ts b/test/testUtils/listenersManager.ts
new file mode 100644
index 00000000000..da624aa8a56
--- /dev/null
+++ b/test/testUtils/listenersManager.ts
@@ -0,0 +1,41 @@
+import { expect } from "vitest";
+
+/**
+ * Whether or not it is currently the first time running this manager.
+ */
+let firstTime = true;
+
+/**
+ * The list of listeners that were present during the first time this manager is run.
+ * These initial listeners are needed throughout the entire test suite, so we never remove them.
+ */
+const initialListeners: NodeJS.MessageListener[] = [];
+
+/**
+ * The current listener that is only needed for the current test file.
+ * We plan to delete it during the next test file, when it is no longer needed.
+ */
+let currentListener: NodeJS.MessageListener | null;
+
+export function manageListeners() {
+  if (firstTime) {
+    initialListeners.push(...process.listeners("message"));
+  } else {
+    expect(process.listeners("message").length).toBeLessThan(7);
+
+    // Remove the listener that was used during the previous test file
+    if (currentListener) {
+      process.removeListener("message", currentListener);
+      currentListener = null;
+    }
+
+    // Find the new listener that is being used for the current test file
+    process.listeners("message").forEach(fn => {
+      if (!initialListeners.includes(fn)) {
+        currentListener = fn;
+      }
+    });
+  }
+
+  firstTime = false;
+}
diff --git a/src/test/utils/mocks/mockClock.ts b/test/testUtils/mocks/mockClock.ts
similarity index 99%
rename from src/test/utils/mocks/mockClock.ts
rename to test/testUtils/mocks/mockClock.ts
index 7fad3651010..67f399ae41d 100644
--- a/src/test/utils/mocks/mockClock.ts
+++ b/test/testUtils/mocks/mockClock.ts
@@ -1,6 +1,5 @@
 import Clock = Phaser.Time.Clock;
 
-
 export class MockClock extends Clock {
   public overrideDelay: number | null = 1;
   constructor(scene) {
diff --git a/test/testUtils/mocks/mockConsoleLog.ts b/test/testUtils/mocks/mockConsoleLog.ts
new file mode 100644
index 00000000000..f54d41fea3e
--- /dev/null
+++ b/test/testUtils/mocks/mockConsoleLog.ts
@@ -0,0 +1,80 @@
+const originalLog = console.log;
+const originalError = console.error;
+const originalDebug = console.debug;
+const originalWarn = console.warn;
+
+const blacklist = ["Phaser", "variant icon does not exist", 'Texture "%s" not found'];
+const whitelist = ["Phase"];
+
+export class MockConsoleLog {
+  constructor(
+    private logDisabled = false,
+    private phaseText = false,
+  ) {}
+  private logs: any[] = [];
+  private notified: any[] = [];
+
+  public log(...args) {
+    const argsStr = this.getStr(args);
+    this.logs.push(argsStr);
+    if (this.logDisabled && !this.phaseText) {
+      return;
+    }
+    if ((this.phaseText && !whitelist.some(b => argsStr.includes(b))) || blacklist.some(b => argsStr.includes(b))) {
+      return;
+    }
+    originalLog(args);
+  }
+  public error(...args) {
+    const argsStr = this.getStr(args);
+    this.logs.push(argsStr);
+    originalError(args); // Appelle le console.error originel
+  }
+  public debug(...args) {
+    const argsStr = this.getStr(args);
+    this.logs.push(argsStr);
+    if (this.logDisabled && !this.phaseText) {
+      return;
+    }
+    if (!whitelist.some(b => argsStr.includes(b)) || blacklist.some(b => argsStr.includes(b))) {
+      return;
+    }
+    originalDebug(args);
+  }
+  warn(...args) {
+    const argsStr = this.getStr(args);
+    this.logs.push(args);
+    if (this.logDisabled && !this.phaseText) {
+      return;
+    }
+    if (!whitelist.some(b => argsStr.includes(b)) || blacklist.some(b => argsStr.includes(b))) {
+      return;
+    }
+    originalWarn(args);
+  }
+  notify(msg) {
+    originalLog(msg);
+    this.notified.push(msg);
+  }
+  getLogs() {
+    return this.logs;
+  }
+  clearLogs() {
+    this.logs = [];
+  }
+  getStr(...args) {
+    return args
+      .map(arg => {
+        if (typeof arg === "object" && arg !== null) {
+          // Handle objects including arrays
+          return JSON.stringify(arg, (_key, value) => (typeof value === "bigint" ? value.toString() : value));
+        }
+        if (typeof arg === "bigint") {
+          // Handle BigInt values
+          return arg.toString();
+        }
+        return arg.toString();
+      })
+      .join(";");
+  }
+}
diff --git a/test/testUtils/mocks/mockContextCanvas.ts b/test/testUtils/mocks/mockContextCanvas.ts
new file mode 100644
index 00000000000..a69f039c5e9
--- /dev/null
+++ b/test/testUtils/mocks/mockContextCanvas.ts
@@ -0,0 +1,26 @@
+/**
+ * A minimal stub object to mock HTMLCanvasElement
+ */
+export const mockCanvas: any = {
+  width: 0,
+  getContext() {
+    return mockContext;
+  },
+};
+/**
+ * A minimal stub object to mock CanvasRenderingContext2D
+ */
+export const mockContext: any = {
+  font: "",
+  measureText: () => {
+    return {};
+  },
+  save: () => {},
+  scale: () => {},
+  clearRect: () => {},
+  fillRect: () => {},
+  fillText: () => {},
+  getImageData: () => {},
+  canvas: mockCanvas,
+  restore: () => {},
+};
diff --git a/src/test/utils/mocks/mockFetch.ts b/test/testUtils/mocks/mockFetch.ts
similarity index 57%
rename from src/test/utils/mocks/mockFetch.ts
rename to test/testUtils/mocks/mockFetch.ts
index 2fa7cd198ce..195d4f65752 100644
--- a/src/test/utils/mocks/mockFetch.ts
+++ b/test/testUtils/mocks/mockFetch.ts
@@ -1,24 +1,25 @@
-export const MockFetch = (input, init) => {
+export const MockFetch = (input, _init) => {
   const url = typeof input === "string" ? input : input.url;
 
+  // biome-ignore lint/suspicious/noImplicitAnyLet: TODO
   let responseHandler;
+  // biome-ignore lint/suspicious/noImplicitAnyLet: TODO
   let responseText;
 
   const handlers = {
-    "account/info": { "username":"greenlamp", "lastSessionSlot":0 },
+    "account/info": { username: "greenlamp", lastSessionSlot: 0 },
     "savedata/session": {},
     "savedata/system": {},
     "savedata/updateall": "",
     "daily/rankingpagecount": { data: 0 },
-    "game/titlestats": { "playerCount":0, "battleCount":5 },
+    "game/titlestats": { playerCount: 0, battleCount: 5 },
     "daily/rankings": [],
   };
 
-
   for (const key of Object.keys(handlers)) {
     if (url.includes(key)) {
-      responseHandler = async() => handlers[key];
-      responseText = async() => handlers[key] ? JSON.stringify(handlers[key]) : handlers[key];
+      responseHandler = async () => handlers[key];
+      responseText = async () => (handlers[key] ? JSON.stringify(handlers[key]) : handlers[key]);
       break;
     }
   }
diff --git a/src/test/utils/mocks/mockGameObject.ts b/test/testUtils/mocks/mockGameObject.ts
similarity index 100%
rename from src/test/utils/mocks/mockGameObject.ts
rename to test/testUtils/mocks/mockGameObject.ts
diff --git a/src/test/utils/mocks/mockGameObjectCreator.ts b/test/testUtils/mocks/mockGameObjectCreator.ts
similarity index 100%
rename from src/test/utils/mocks/mockGameObjectCreator.ts
rename to test/testUtils/mocks/mockGameObjectCreator.ts
diff --git a/src/test/utils/mocks/mockLoader.ts b/test/testUtils/mocks/mockLoader.ts
similarity index 61%
rename from src/test/utils/mocks/mockLoader.ts
rename to test/testUtils/mocks/mockLoader.ts
index 661eb72f2c2..7452f85a317 100644
--- a/src/test/utils/mocks/mockLoader.ts
+++ b/test/testUtils/mocks/mockLoader.ts
@@ -1,17 +1,16 @@
 import CacheManager = Phaser.Cache.CacheManager;
 
-
 export default class MockLoader {
   public cacheManager;
   constructor(scene) {
     this.cacheManager = new CacheManager(scene);
   }
 
-  once(event, callback) {
+  once(_event, callback) {
     callback();
   }
 
-  setBaseURL(url) {
+  setBaseURL(_url) {
     return null;
   }
 
@@ -19,24 +18,17 @@ export default class MockLoader {
     return null;
   }
 
-  spritesheet(key, url, frameConfig) {
-  }
+  spritesheet(_key, _url, _frameConfig) {}
 
-  audio(key, url) {
-
-  }
+  audio(_key, _url) {}
 
   isLoading() {
     return false;
   }
 
-  start() {
-  }
+  start() {}
 
-  image() {
+  image() {}
 
-  }
-
-  atlas(key, textureUrl, atlasUrl) {
-  }
+  atlas(_key, _textureUrl, _atlasUrl) {}
 }
diff --git a/src/test/utils/mocks/mockLocalStorage.ts b/test/testUtils/mocks/mockLocalStorage.ts
similarity index 83%
rename from src/test/utils/mocks/mockLocalStorage.ts
rename to test/testUtils/mocks/mockLocalStorage.ts
index bb4ea4e890d..6b336841ad6 100644
--- a/src/test/utils/mocks/mockLocalStorage.ts
+++ b/test/testUtils/mocks/mockLocalStorage.ts
@@ -1,4 +1,4 @@
-const mockLocalStorage = (() => {
+export const mockLocalStorage = () => {
   let store = {} as Storage;
 
   return {
@@ -22,6 +22,4 @@ const mockLocalStorage = (() => {
       store = {} as Storage;
     },
   };
-});
-
-export default mockLocalStorage;
+};
diff --git a/src/test/utils/mocks/mockTextureManager.ts b/test/testUtils/mocks/mockTextureManager.ts
similarity index 74%
rename from src/test/utils/mocks/mockTextureManager.ts
rename to test/testUtils/mocks/mockTextureManager.ts
index 39066561f25..585ee0a674a 100644
--- a/src/test/utils/mocks/mockTextureManager.ts
+++ b/test/testUtils/mocks/mockTextureManager.ts
@@ -1,11 +1,11 @@
-import MockContainer from "#test/utils/mocks/mocksContainer/mockContainer";
-import MockImage from "#test/utils/mocks/mocksContainer/mockImage";
-import MockNineslice from "#test/utils/mocks/mocksContainer/mockNineslice";
-import MockPolygon from "#test/utils/mocks/mocksContainer/mockPolygon";
-import MockRectangle from "#test/utils/mocks/mocksContainer/mockRectangle";
-import MockSprite from "#test/utils/mocks/mocksContainer/mockSprite";
-import MockText from "#test/utils/mocks/mocksContainer/mockText";
-import MockTexture from "#test/utils/mocks/mocksContainer/mockTexture";
+import MockContainer from "#test/testUtils/mocks/mocksContainer/mockContainer";
+import { MockImage } from "#test/testUtils/mocks/mocksContainer/mockImage";
+import MockNineslice from "#test/testUtils/mocks/mocksContainer/mockNineslice";
+import MockPolygon from "#test/testUtils/mocks/mocksContainer/mockPolygon";
+import MockRectangle from "#test/testUtils/mocks/mocksContainer/mockRectangle";
+import MockSprite from "#test/testUtils/mocks/mocksContainer/mockSprite";
+import MockText from "#test/testUtils/mocks/mocksContainer/mockText";
+import MockTexture from "#test/testUtils/mocks/mocksContainer/mockTexture";
 import type { MockGameObject } from "./mockGameObject";
 import { MockVideoGameObject } from "./mockVideoGameObject";
 
@@ -51,7 +51,7 @@ export default class MockTextureManager {
     return sprite;
   }
 
-  existing(obj) {
+  existing(_obj) {
     // const whitelist = ["ArenaBase", "PlayerPokemon", "EnemyPokemon"];
     // const key = obj.constructor.name;
     // if (whitelist.includes(key) || obj.texture?.key?.includes("trainer_")) {
@@ -74,7 +74,19 @@ export default class MockTextureManager {
   }
 
   nineslice(x, y, texture, frame, width, height, leftWidth, rightWidth, topHeight, bottomHeight) {
-    const nineSlice = new MockNineslice(this, x, y, texture, frame, width, height, leftWidth, rightWidth, topHeight, bottomHeight);
+    const nineSlice = new MockNineslice(
+      this,
+      x,
+      y,
+      texture,
+      frame,
+      width,
+      height,
+      leftWidth,
+      rightWidth,
+      topHeight,
+      bottomHeight,
+    );
     this.list.push(nineSlice);
     return nineSlice;
   }
diff --git a/src/test/utils/mocks/mockTimedEventManager.ts b/test/testUtils/mocks/mockTimedEventManager.ts
similarity index 100%
rename from src/test/utils/mocks/mockTimedEventManager.ts
rename to test/testUtils/mocks/mockTimedEventManager.ts
diff --git a/src/test/utils/mocks/mockVideoGameObject.ts b/test/testUtils/mocks/mockVideoGameObject.ts
similarity index 94%
rename from src/test/utils/mocks/mockVideoGameObject.ts
rename to test/testUtils/mocks/mockVideoGameObject.ts
index 74b05626616..65a5c37b244 100644
--- a/src/test/utils/mocks/mockVideoGameObject.ts
+++ b/test/testUtils/mocks/mockVideoGameObject.ts
@@ -4,8 +4,6 @@ import type { MockGameObject } from "./mockGameObject";
 export class MockVideoGameObject implements MockGameObject {
   public name: string;
 
-  constructor() {}
-
   public play = () => null;
   public stop = () => this;
   public setOrigin = () => null;
diff --git a/src/test/utils/mocks/mocksContainer/mockContainer.ts b/test/testUtils/mocks/mocksContainer/mockContainer.ts
similarity index 79%
rename from src/test/utils/mocks/mocksContainer/mockContainer.ts
rename to test/testUtils/mocks/mocksContainer/mockContainer.ts
index f0198535e7b..5e739fbe3cc 100644
--- a/src/test/utils/mocks/mocksContainer/mockContainer.ts
+++ b/test/testUtils/mocks/mocksContainer/mockContainer.ts
@@ -1,4 +1,4 @@
-import type MockTextureManager from "#test/utils/mocks/mockTextureManager";
+import type MockTextureManager from "#test/testUtils/mocks/mockTextureManager";
 import type { MockGameObject } from "../mockGameObject";
 
 export default class MockContainer implements MockGameObject {
@@ -25,17 +25,15 @@ export default class MockContainer implements MockGameObject {
     this.visible = visible;
   }
 
-  once(event, callback, source) {
-  }
+  once(_event, _callback, _source) {}
 
-  off(event, callback, source) {
-  }
+  off(_event, _callback, _source) {}
 
   removeFromDisplayList() {
     // same as remove or destroy
   }
 
-  removeBetween(startIndex, endIndex, destroyChild) {
+  removeBetween(_startIndex, _endIndex, _destroyChild) {
     // Removes multiple children across an index range
   }
 
@@ -43,7 +41,7 @@ export default class MockContainer implements MockGameObject {
     // This callback is invoked when this Game Object is added to a Scene.
   }
 
-  setSize(width, height) {
+  setSize(_width, _height) {
     // Sets the size of this Game Object.
   }
 
@@ -51,7 +49,7 @@ export default class MockContainer implements MockGameObject {
     /// Sets the mask that this Game Object will use to render with.
   }
 
-  setPositionRelative(source, x, y) {
+  setPositionRelative(_source, _x, _y) {
     /// Sets the position of this Game Object to be a relative position from the source Game Object.
   }
 
@@ -66,11 +64,11 @@ export default class MockContainer implements MockGameObject {
     this.alpha = alpha;
   }
 
-  setFrame(frame, updateSize?: boolean, updateOrigin?: boolean) {
+  setFrame(_frame, _updateSize?: boolean, _updateOrigin?: boolean) {
     // Sets the frame this Game Object will use to render with.
   }
 
-  setScale(scale) {
+  setScale(_scale) {
     // Sets the scale of this Game Object.
   }
 
@@ -91,59 +89,59 @@ export default class MockContainer implements MockGameObject {
     this.list = [];
   }
 
-  setShadow(shadowXpos, shadowYpos, shadowColor) {
+  setShadow(_shadowXpos, _shadowYpos, _shadowColor) {
     // Sets the shadow settings for this Game Object.
   }
 
-  setLineSpacing(lineSpacing) {
+  setLineSpacing(_lineSpacing) {
     // Sets the line spacing value of this Game Object.
   }
 
-  setText(text) {
+  setText(_text) {
     // Sets the text this Game Object will display.
   }
 
-  setAngle(angle) {
+  setAngle(_angle) {
     // Sets the angle of this Game Object.
   }
 
-  setShadowOffset(offsetX, offsetY) {
+  setShadowOffset(_offsetX, _offsetY) {
     // Sets the shadow offset values.
   }
 
-  setWordWrapWidth(width) {
+  setWordWrapWidth(_width) {
     // Sets the width (in pixels) to use for wrapping lines.
   }
 
-  setFontSize(fontSize) {
+  setFontSize(_fontSize) {
     // Sets the font size of this Game Object.
   }
   getBounds() {
     return { width: this.width, height: this.height };
   }
 
-  setColor(color) {
+  setColor(_color) {
     // Sets the tint of this Game Object.
   }
 
-  setShadowColor(color) {
+  setShadowColor(_color) {
     // Sets the shadow color.
   }
 
-  setTint(color) {
+  setTint(_color) {
     // Sets the tint of this Game Object.
   }
 
-  setStrokeStyle(thickness, color) {
+  setStrokeStyle(_thickness, _color) {
     // Sets the stroke style for the graphics.
     return this;
   }
 
-  setDepth(depth) {
+  setDepth(_depth) {
     // Sets the depth of this Game Object.
   }
 
-  setTexture(texture) {
+  setTexture(_texture) {
     // Sets the texture this Game Object will use to render with.
   }
 
@@ -155,15 +153,15 @@ export default class MockContainer implements MockGameObject {
     // Sends this Game Object to the back of its parent's display list.
   }
 
-  moveTo(obj) {
+  moveTo(_obj) {
     // Moves this Game Object to the given index in the list.
   }
 
-  moveAbove(obj) {
+  moveAbove(_obj) {
     // Moves this Game Object to be above the given Game Object in the display list.
   }
 
-  moveBelow(obj) {
+  moveBelow(_obj) {
     // Moves this Game Object to be below the given Game Object in the display list.
   }
 
@@ -171,12 +169,11 @@ export default class MockContainer implements MockGameObject {
     this.name = name;
   }
 
-  bringToTop(obj) {
+  bringToTop(_obj) {
     // Brings this Game Object to the top of its parents display list.
   }
 
-  on(event, callback, source) {
-  }
+  on(_event, _callback, _source) {}
 
   add(obj) {
     // Adds a child to this Game Object.
@@ -218,4 +215,10 @@ export default class MockContainer implements MockGameObject {
   }
 
   disableInteractive = () => null;
+
+  each(method) {
+    for (const item of this.list) {
+      method(item);
+    }
+  }
 }
diff --git a/src/test/utils/mocks/mocksContainer/mockGraphics.ts b/test/testUtils/mocks/mocksContainer/mockGraphics.ts
similarity index 82%
rename from src/test/utils/mocks/mocksContainer/mockGraphics.ts
rename to test/testUtils/mocks/mocksContainer/mockGraphics.ts
index 2b4a33b5e4c..ebf84e935e3 100644
--- a/src/test/utils/mocks/mocksContainer/mockGraphics.ts
+++ b/test/testUtils/mocks/mocksContainer/mockGraphics.ts
@@ -4,11 +4,11 @@ export default class MockGraphics implements MockGameObject {
   private scene;
   public list: MockGameObject[] = [];
   public name: string;
-  constructor(textureManager, config) {
+  constructor(textureManager, _config) {
     this.scene = textureManager.scene;
   }
 
-  fillStyle(color) {
+  fillStyle(_color) {
     // Sets the fill style to be used by the fill methods.
   }
 
@@ -16,7 +16,7 @@ export default class MockGraphics implements MockGameObject {
     // Starts a new path by emptying the list of sub-paths. Call this method when you want to create a new path.
   }
 
-  fillRect(x, y, width, height) {
+  fillRect(_x, _y, _width, _height) {
     // Adds a rectangle shape to the path which is filled when you call fill().
   }
 
@@ -24,20 +24,15 @@ export default class MockGraphics implements MockGameObject {
     // Creates a geometry mask.
   }
 
-  setOrigin(x, y) {
-  }
+  setOrigin(_x, _y) {}
 
-  setAlpha(alpha) {
-  }
+  setAlpha(_alpha) {}
 
-  setVisible(visible) {
-  }
+  setVisible(_visible) {}
 
-  setName(name) {
-  }
+  setName(_name) {}
 
-  once(event, callback, source) {
-  }
+  once(_event, _callback, _source) {}
 
   removeFromDisplayList() {
     // same as remove or destroy
@@ -47,7 +42,7 @@ export default class MockGraphics implements MockGameObject {
     // This callback is invoked when this Game Object is added to a Scene.
   }
 
-  setPositionRelative(source, x, y) {
+  setPositionRelative(_source, _x, _y) {
     /// Sets the position of this Game Object to be a relative position from the source Game Object.
   }
 
@@ -55,12 +50,11 @@ export default class MockGraphics implements MockGameObject {
     this.list = [];
   }
 
-  setScale(scale) {
+  setScale(_scale) {
     // Sets the scale of this Game Object.
   }
 
-  off(event, callback, source) {
-  }
+  off(_event, _callback, _source) {}
 
   add(obj) {
     // Adds a child to this Game Object.
diff --git a/src/test/utils/mocks/mocksContainer/mockImage.ts b/test/testUtils/mocks/mocksContainer/mockImage.ts
similarity index 50%
rename from src/test/utils/mocks/mocksContainer/mockImage.ts
rename to test/testUtils/mocks/mocksContainer/mockImage.ts
index be183a0dd89..d20b4663771 100644
--- a/src/test/utils/mocks/mocksContainer/mockImage.ts
+++ b/test/testUtils/mocks/mocksContainer/mockImage.ts
@@ -1,7 +1,6 @@
-import MockContainer from "#test/utils/mocks/mocksContainer/mockContainer";
+import MockContainer from "#test/testUtils/mocks/mocksContainer/mockContainer";
 
-
-export default class MockImage extends MockContainer {
+export class MockImage extends MockContainer {
   private texture;
 
   constructor(textureManager, x, y, texture) {
diff --git a/src/test/utils/mocks/mocksContainer/mockNineslice.ts b/test/testUtils/mocks/mocksContainer/mockNineslice.ts
similarity index 66%
rename from src/test/utils/mocks/mocksContainer/mockNineslice.ts
rename to test/testUtils/mocks/mocksContainer/mockNineslice.ts
index a8e10036a72..90c0e13e725 100644
--- a/src/test/utils/mocks/mocksContainer/mockNineslice.ts
+++ b/test/testUtils/mocks/mocksContainer/mockNineslice.ts
@@ -1,5 +1,4 @@
-import MockContainer from "#test/utils/mocks/mocksContainer/mockContainer";
-
+import MockContainer from "#test/testUtils/mocks/mocksContainer/mockContainer";
 
 export default class MockNineslice extends MockContainer {
   private texture;
@@ -8,7 +7,7 @@ export default class MockNineslice extends MockContainer {
   private topHeight;
   private bottomHeight;
 
-  constructor(textureManager, x, y, texture, frame, width, height, leftWidth, rightWidth, topHeight, bottomHeight) {
+  constructor(textureManager, x, y, texture, frame, _width, _height, leftWidth, rightWidth, topHeight, bottomHeight) {
     super(textureManager, x, y);
     this.texture = texture;
     this.frame = frame;
diff --git a/test/testUtils/mocks/mocksContainer/mockPolygon.ts b/test/testUtils/mocks/mocksContainer/mockPolygon.ts
new file mode 100644
index 00000000000..4a7f3baec78
--- /dev/null
+++ b/test/testUtils/mocks/mocksContainer/mockPolygon.ts
@@ -0,0 +1,7 @@
+import MockContainer from "#test/testUtils/mocks/mocksContainer/mockContainer";
+
+export default class MockPolygon extends MockContainer {
+  constructor(textureManager, x, y, _content, _fillColor, _fillAlpha) {
+    super(textureManager, x, y);
+  }
+}
diff --git a/src/test/utils/mocks/mocksContainer/mockRectangle.ts b/test/testUtils/mocks/mocksContainer/mockRectangle.ts
similarity index 82%
rename from src/test/utils/mocks/mocksContainer/mockRectangle.ts
rename to test/testUtils/mocks/mocksContainer/mockRectangle.ts
index e4bca76b8fc..7bdf343759d 100644
--- a/src/test/utils/mocks/mocksContainer/mockRectangle.ts
+++ b/test/testUtils/mocks/mocksContainer/mockRectangle.ts
@@ -6,23 +6,18 @@ export default class MockRectangle implements MockGameObject {
   public list: MockGameObject[] = [];
   public name: string;
 
-  constructor(textureManager, x, y, width, height, fillColor) {
+  constructor(textureManager, _x, _y, _width, _height, fillColor) {
     this.fillColor = fillColor;
     this.scene = textureManager.scene;
   }
-  setOrigin(x, y) {
-  }
+  setOrigin(_x, _y) {}
 
-  setAlpha(alpha) {
-  }
-  setVisible(visible) {
-  }
+  setAlpha(_alpha) {}
+  setVisible(_visible) {}
 
-  setName(name) {
-  }
+  setName(_name) {}
 
-  once(event, callback, source) {
-  }
+  once(_event, _callback, _source) {}
 
   removeFromDisplayList() {
     // same as remove or destroy
@@ -32,7 +27,7 @@ export default class MockRectangle implements MockGameObject {
     // This callback is invoked when this Game Object is added to a Scene.
   }
 
-  setPositionRelative(source, x, y) {
+  setPositionRelative(_source, _x, _y) {
     /// Sets the position of this Game Object to be a relative position from the source Game Object.
   }
 
@@ -74,7 +69,9 @@ export default class MockRectangle implements MockGameObject {
   getAll() {
     return this.list;
   }
-  setScale(scale) {
+  setScale(_scale) {
     // return this.phaserText.setScale(scale);
   }
+
+  off() {}
 }
diff --git a/src/test/utils/mocks/mocksContainer/mockSprite.ts b/test/testUtils/mocks/mocksContainer/mockSprite.ts
similarity index 95%
rename from src/test/utils/mocks/mocksContainer/mockSprite.ts
rename to test/testUtils/mocks/mocksContainer/mockSprite.ts
index 6d851330a5e..dcc3588f127 100644
--- a/src/test/utils/mocks/mocksContainer/mockSprite.ts
+++ b/test/testUtils/mocks/mocksContainer/mockSprite.ts
@@ -3,7 +3,6 @@ import type { MockGameObject } from "../mockGameObject";
 import Sprite = Phaser.GameObjects.Sprite;
 import Frame = Phaser.Textures.Frame;
 
-
 export default class MockSprite implements MockGameObject {
   private phaserSprite;
   public pipelineData;
@@ -38,11 +37,11 @@ export default class MockSprite implements MockGameObject {
     };
   }
 
-  setTexture(key: string, frame?: string | number) {
+  setTexture(_key: string, _frame?: string | number) {
     return this;
   }
 
-  setSizeToFrame(frame?: boolean | Frame): Sprite {
+  setSizeToFrame(_frame?: boolean | Frame): Sprite {
     return {} as Sprite;
   }
 
@@ -51,8 +50,7 @@ export default class MockSprite implements MockGameObject {
     return this.phaserSprite.setPipeline(obj);
   }
 
-  off(event, callback, source) {
-  }
+  off(_event, _callback, _source) {}
 
   setTintFill(color) {
     // Sets the tint fill color.
@@ -117,7 +115,7 @@ export default class MockSprite implements MockGameObject {
     return this.phaserSprite.setTint(color);
   }
 
-  setFrame(frame, updateSize?: boolean, updateOrigin?: boolean) {
+  setFrame(frame, _updateSize?: boolean, _updateOrigin?: boolean) {
     // Sets the frame this Game Object will use to render with.
     this.frame = frame;
     return frame;
@@ -172,9 +170,7 @@ export default class MockSprite implements MockGameObject {
     return this.phaserSprite.setAngle(angle);
   }
 
-  setMask() {
-
-  }
+  setMask() {}
 
   add(obj) {
     // Adds a child to this Game Object.
@@ -210,6 +206,4 @@ export default class MockSprite implements MockGameObject {
   getAll() {
     return this.list;
   }
-
-
 }
diff --git a/src/test/utils/mocks/mocksContainer/mockText.ts b/test/testUtils/mocks/mocksContainer/mockText.ts
similarity index 85%
rename from src/test/utils/mocks/mocksContainer/mockText.ts
rename to test/testUtils/mocks/mocksContainer/mockText.ts
index 5550e801386..1f3f0ad792f 100644
--- a/src/test/utils/mocks/mocksContainer/mockText.ts
+++ b/test/testUtils/mocks/mocksContainer/mockText.ts
@@ -13,7 +13,7 @@ export default class MockText implements MockGameObject {
   public name: string;
   public color?: string;
 
-  constructor(textureManager, x, y, content, styleOptions) {
+  constructor(textureManager, _x, _y, _content, _styleOptions) {
     this.scene = textureManager.scene;
     this.textureManager = textureManager;
     this.style = {};
@@ -85,7 +85,7 @@ export default class MockText implements MockGameObject {
     callback?: Function | null,
     callbackDelay?: number | null,
     prompt?: boolean | null,
-    promptDelay?: number | null
+    promptDelay?: number | null,
   ) {
     this.scene.messageWrapper.showText(text, delay, callback, callbackDelay, prompt, promptDelay);
     if (callback) {
@@ -93,42 +93,49 @@ export default class MockText implements MockGameObject {
     }
   }
 
-  showDialogue(keyOrText: string, name: string | undefined, delay: number | null = 0, callback: Function, callbackDelay?: number, promptDelay?: number) {
+  showDialogue(
+    keyOrText: string,
+    name: string | undefined,
+    delay: number | null = 0,
+    callback: Function,
+    callbackDelay?: number,
+    promptDelay?: number,
+  ) {
     this.scene.messageWrapper.showDialogue(keyOrText, name, delay, callback, callbackDelay, promptDelay);
     if (callback) {
       callback();
     }
   }
 
-  setScale(scale) {
+  setScale(_scale) {
     // return this.phaserText.setScale(scale);
   }
 
-  setShadow(shadowXpos, shadowYpos, shadowColor) {
+  setShadow(_shadowXpos, _shadowYpos, _shadowColor) {
     // Sets the shadow settings for this Game Object.
     // return this.phaserText.setShadow(shadowXpos, shadowYpos, shadowColor);
   }
 
-  setLineSpacing(lineSpacing) {
+  setLineSpacing(_lineSpacing) {
     // Sets the line spacing value of this Game Object.
     // return this.phaserText.setLineSpacing(lineSpacing);
   }
 
-  setOrigin(x, y) {
+  setOrigin(_x, _y) {
     // return this.phaserText.setOrigin(x, y);
   }
 
-  once(event, callback, source) {
+  once(_event, _callback, _source) {
     // return this.phaserText.once(event, callback, source);
   }
 
-  off(event, callback, obj) {}
+  off(_event, _callback, _obj) {}
 
   removedFromScene() {}
 
   addToDisplayList() {}
 
-  setStroke(color, thickness) {
+  setStroke(_color, _thickness) {
     // Sets the stroke color and thickness.
     // return this.phaserText.setStroke(color, thickness);
   }
@@ -143,15 +150,15 @@ export default class MockText implements MockGameObject {
     // return this.phaserText.addedToScene();
   }
 
-  setVisible(visible) {
+  setVisible(_visible) {
     // return this.phaserText.setVisible(visible);
   }
 
-  setY(y) {
+  setY(_y) {
     // return this.phaserText.setY(y);
   }
 
-  setX(x) {
+  setX(_x) {
     // return this.phaserText.setX(x);
   }
 
@@ -162,7 +169,7 @@ export default class MockText implements MockGameObject {
    * @param z The z position of this Game Object. Default 0.
    * @param w The w position of this Game Object. Default 0.
    */
-  setPosition(x?: number, y?: number, z?: number, w?: number) {}
+  setPosition(_x?: number, _y?: number, _z?: number, _w?: number) {}
 
   setText(text) {
     // Sets the text this Game Object will display.
@@ -170,17 +177,17 @@ export default class MockText implements MockGameObject {
     this.text = text;
   }
 
-  setAngle(angle) {
+  setAngle(_angle) {
     // Sets the angle of this Game Object.
     // return this.phaserText.setAngle(angle);
   }
 
-  setPositionRelative(source, x, y) {
+  setPositionRelative(_source, _x, _y) {
     /// Sets the position of this Game Object to be a relative position from the source Game Object.
     // return this.phaserText.setPositionRelative(source, x, y);
   }
 
-  setShadowOffset(offsetX, offsetY) {
+  setShadowOffset(_offsetX, _offsetY) {
     // Sets the shadow offset values.
     // return this.phaserText.setShadowOffset(offsetX, offsetY);
   }
@@ -190,7 +197,7 @@ export default class MockText implements MockGameObject {
     this.wordWrapWidth = width;
   }
 
-  setFontSize(fontSize) {
+  setFontSize(_fontSize) {
     // Sets the font size of this Game Object.
     // return this.phaserText.setFontSize(fontSize);
   }
@@ -208,17 +215,17 @@ export default class MockText implements MockGameObject {
 
   setInteractive = () => null;
 
-  setShadowColor(color) {
+  setShadowColor(_color) {
     // Sets the shadow color.
     // return this.phaserText.setShadowColor(color);
   }
 
-  setTint(color) {
+  setTint(_color) {
     // Sets the tint of this Game Object.
     // return this.phaserText.setTint(color);
   }
 
-  setStrokeStyle(thickness, color) {
+  setStrokeStyle(_thickness, _color) {
     // Sets the stroke style for the graphics.
     // return this.phaserText.setStrokeStyle(thickness, color);
   }
@@ -228,7 +235,7 @@ export default class MockText implements MockGameObject {
     this.list = [];
   }
 
-  setAlpha(alpha) {
+  setAlpha(_alpha) {
     // return this.phaserText.setAlpha(alpha);
   }
 
@@ -236,7 +243,7 @@ export default class MockText implements MockGameObject {
     this.name = name;
   }
 
-  setAlign(align) {
+  setAlign(_align) {
     // return this.phaserText.setAlign(align);
   }
 
@@ -301,5 +308,14 @@ export default class MockText implements MockGameObject {
     return this.list;
   }
 
+  /**
+   * Runs the word wrap algorithm on the text, then returns an array of the lines
+   */
+  getWrappedText() {
+    // Returns the wrapped text.
+    // return this.phaserText.getWrappedText();
+    return this.runWordWrap(this.text).split("\n");
+  }
+
   on(_event: string | symbol, _fn: Function, _context?: any) {}
 }
diff --git a/src/test/utils/mocks/mocksContainer/mockTexture.ts b/test/testUtils/mocks/mocksContainer/mockTexture.ts
similarity index 88%
rename from src/test/utils/mocks/mocksContainer/mockTexture.ts
rename to test/testUtils/mocks/mocksContainer/mockTexture.ts
index 57c87df23be..eb8b70902fa 100644
--- a/src/test/utils/mocks/mocksContainer/mockTexture.ts
+++ b/test/testUtils/mocks/mocksContainer/mockTexture.ts
@@ -1,7 +1,6 @@
-import type MockTextureManager from "#test/utils/mocks/mockTextureManager";
+import type MockTextureManager from "#test/testUtils/mocks/mockTextureManager";
 import type { MockGameObject } from "../mockGameObject";
 
-
 /**
  * Stub for Phaser.Textures.Texture object
  * Just mocks the function calls and data required for use in tests
@@ -23,7 +22,7 @@ export default class MockTexture implements MockGameObject {
       width: 100,
       height: 100,
       cutX: 0,
-      cutY: 0
+      cutY: 0,
     };
     this.frames = {
       firstFrame: mockFrame,
@@ -31,7 +30,7 @@ export default class MockTexture implements MockGameObject {
       1: mockFrame,
       2: mockFrame,
       3: mockFrame,
-      4: mockFrame
+      4: mockFrame,
     };
     this.firstFrame = "firstFrame";
   }
diff --git a/src/test/utils/phaseInterceptor.ts b/test/testUtils/phaseInterceptor.ts
similarity index 74%
rename from src/test/utils/phaseInterceptor.ts
rename to test/testUtils/phaseInterceptor.ts
index d60e0e78373..b1d76ecd4a6 100644
--- a/src/test/utils/phaseInterceptor.ts
+++ b/test/testUtils/phaseInterceptor.ts
@@ -1,5 +1,5 @@
 import { Phase } from "#app/phase";
-import ErrorInterceptor from "#app/test/utils/errorInterceptor";
+import ErrorInterceptor from "#test/testUtils/errorInterceptor";
 import { AttemptRunPhase } from "#app/phases/attempt-run-phase";
 import { BattleEndPhase } from "#app/phases/battle-end-phase";
 import { BerryPhase } from "#app/phases/berry-phase";
@@ -43,14 +43,15 @@ import { TurnStartPhase } from "#app/phases/turn-start-phase";
 import { UnavailablePhase } from "#app/phases/unavailable-phase";
 import { VictoryPhase } from "#app/phases/victory-phase";
 import { PartyHealPhase } from "#app/phases/party-heal-phase";
-import UI, { Mode } from "#app/ui/ui";
+import UI from "#app/ui/ui";
+import { UiMode } from "#enums/ui-mode";
 import { SelectBiomePhase } from "#app/phases/select-biome-phase";
 import {
   MysteryEncounterBattlePhase,
   MysteryEncounterOptionSelectedPhase,
   MysteryEncounterPhase,
   MysteryEncounterRewardsPhase,
-  PostMysteryEncounterPhase
+  PostMysteryEncounterPhase,
 } from "#app/phases/mystery-encounter-phases";
 import { ModifierRewardPhase } from "#app/phases/modifier-reward-phase";
 import { PartyExpPhase } from "#app/phases/party-exp-phase";
@@ -60,10 +61,11 @@ import { RibbonModifierRewardPhase } from "#app/phases/ribbon-modifier-reward-ph
 import { GameOverModifierRewardPhase } from "#app/phases/game-over-modifier-reward-phase";
 import { UnlockPhase } from "#app/phases/unlock-phase";
 import { PostGameOverPhase } from "#app/phases/post-game-over-phase";
+import { RevivalBlessingPhase } from "#app/phases/revival-blessing-phase";
 
 export interface PromptHandler {
   phaseTarget?: string;
-  mode?: Mode;
+  mode?: UiMode;
   callback?: () => void;
   expireFn?: () => void;
   awaitingActionInput?: boolean;
@@ -126,7 +128,8 @@ type PhaseClass =
   | typeof EncounterPhase
   | typeof GameOverPhase
   | typeof UnlockPhase
-  | typeof PostGameOverPhase;
+  | typeof PostGameOverPhase
+  | typeof RevivalBlessingPhase;
 
 type PhaseString =
   | "LoginPhase"
@@ -185,7 +188,8 @@ type PhaseString =
   | "EncounterPhase"
   | "GameOverPhase"
   | "UnlockPhase"
-  | "PostGameOverPhase";
+  | "PostGameOverPhase"
+  | "RevivalBlessingPhase";
 
 type PhaseInterceptorPhase = PhaseClass | PhaseString;
 
@@ -201,6 +205,7 @@ export default class PhaseInterceptor {
   private phaseFrom;
   private inProgress;
   private originalSetMode;
+  private originalSetOverlayMode;
   private originalSuperEnd;
 
   /**
@@ -212,67 +217,73 @@ export default class PhaseInterceptor {
    * `initPhases()` so that its subclasses can use `super.start()` properly.
    */
   private PHASES = [
-    [ LoginPhase, this.startPhase ],
-    [ TitlePhase, this.startPhase ],
-    [ SelectGenderPhase, this.startPhase ],
-    [ NewBiomeEncounterPhase, this.startPhase ],
-    [ SelectStarterPhase, this.startPhase ],
-    [ PostSummonPhase, this.startPhase ],
-    [ SummonPhase, this.startPhase ],
-    [ ToggleDoublePositionPhase, this.startPhase ],
-    [ CheckSwitchPhase, this.startPhase ],
-    [ ShowAbilityPhase, this.startPhase ],
-    [ MessagePhase, this.startPhase ],
-    [ TurnInitPhase, this.startPhase ],
-    [ CommandPhase, this.startPhase ],
-    [ EnemyCommandPhase, this.startPhase ],
-    [ TurnStartPhase, this.startPhase ],
-    [ MovePhase, this.startPhase ],
-    [ MoveEffectPhase, this.startPhase ],
-    [ DamageAnimPhase, this.startPhase ],
-    [ FaintPhase, this.startPhase ],
-    [ BerryPhase, this.startPhase ],
-    [ TurnEndPhase, this.startPhase ],
-    [ BattleEndPhase, this.startPhase ],
-    [ EggLapsePhase, this.startPhase ],
-    [ SelectModifierPhase, this.startPhase ],
-    [ NextEncounterPhase, this.startPhase ],
-    [ NewBattlePhase, this.startPhase ],
-    [ VictoryPhase, this.startPhase ],
-    [ LearnMovePhase, this.startPhase ],
-    [ MoveEndPhase, this.startPhase ],
-    [ StatStageChangePhase, this.startPhase ],
-    [ ShinySparklePhase, this.startPhase ],
-    [ SelectTargetPhase, this.startPhase ],
-    [ UnavailablePhase, this.startPhase ],
-    [ QuietFormChangePhase, this.startPhase ],
-    [ SwitchPhase, this.startPhase ],
-    [ SwitchSummonPhase, this.startPhase ],
-    [ PartyHealPhase, this.startPhase ],
-    [ FormChangePhase, this.startPhase ],
-    [ EvolutionPhase, this.startPhase ],
-    [ EndEvolutionPhase, this.startPhase ],
-    [ LevelCapPhase, this.startPhase ],
-    [ AttemptRunPhase, this.startPhase ],
-    [ SelectBiomePhase, this.startPhase ],
-    [ MysteryEncounterPhase, this.startPhase ],
-    [ MysteryEncounterOptionSelectedPhase, this.startPhase ],
-    [ MysteryEncounterBattlePhase, this.startPhase ],
-    [ MysteryEncounterRewardsPhase, this.startPhase ],
-    [ PostMysteryEncounterPhase, this.startPhase ],
-    [ RibbonModifierRewardPhase, this.startPhase ],
-    [ GameOverModifierRewardPhase, this.startPhase ],
-    [ ModifierRewardPhase, this.startPhase ],
-    [ PartyExpPhase, this.startPhase ],
-    [ ExpPhase, this.startPhase ],
-    [ EncounterPhase, this.startPhase ],
-    [ GameOverPhase, this.startPhase ],
-    [ UnlockPhase, this.startPhase ],
-    [ PostGameOverPhase, this.startPhase ],
+    [LoginPhase, this.startPhase],
+    [TitlePhase, this.startPhase],
+    [SelectGenderPhase, this.startPhase],
+    [NewBiomeEncounterPhase, this.startPhase],
+    [SelectStarterPhase, this.startPhase],
+    [PostSummonPhase, this.startPhase],
+    [SummonPhase, this.startPhase],
+    [ToggleDoublePositionPhase, this.startPhase],
+    [CheckSwitchPhase, this.startPhase],
+    [ShowAbilityPhase, this.startPhase],
+    [MessagePhase, this.startPhase],
+    [TurnInitPhase, this.startPhase],
+    [CommandPhase, this.startPhase],
+    [EnemyCommandPhase, this.startPhase],
+    [TurnStartPhase, this.startPhase],
+    [MovePhase, this.startPhase],
+    [MoveEffectPhase, this.startPhase],
+    [DamageAnimPhase, this.startPhase],
+    [FaintPhase, this.startPhase],
+    [BerryPhase, this.startPhase],
+    [TurnEndPhase, this.startPhase],
+    [BattleEndPhase, this.startPhase],
+    [EggLapsePhase, this.startPhase],
+    [SelectModifierPhase, this.startPhase],
+    [NextEncounterPhase, this.startPhase],
+    [NewBattlePhase, this.startPhase],
+    [VictoryPhase, this.startPhase],
+    [LearnMovePhase, this.startPhase],
+    [MoveEndPhase, this.startPhase],
+    [StatStageChangePhase, this.startPhase],
+    [ShinySparklePhase, this.startPhase],
+    [SelectTargetPhase, this.startPhase],
+    [UnavailablePhase, this.startPhase],
+    [QuietFormChangePhase, this.startPhase],
+    [SwitchPhase, this.startPhase],
+    [SwitchSummonPhase, this.startPhase],
+    [PartyHealPhase, this.startPhase],
+    [FormChangePhase, this.startPhase],
+    [EvolutionPhase, this.startPhase],
+    [EndEvolutionPhase, this.startPhase],
+    [LevelCapPhase, this.startPhase],
+    [AttemptRunPhase, this.startPhase],
+    [SelectBiomePhase, this.startPhase],
+    [MysteryEncounterPhase, this.startPhase],
+    [MysteryEncounterOptionSelectedPhase, this.startPhase],
+    [MysteryEncounterBattlePhase, this.startPhase],
+    [MysteryEncounterRewardsPhase, this.startPhase],
+    [PostMysteryEncounterPhase, this.startPhase],
+    [RibbonModifierRewardPhase, this.startPhase],
+    [GameOverModifierRewardPhase, this.startPhase],
+    [ModifierRewardPhase, this.startPhase],
+    [PartyExpPhase, this.startPhase],
+    [ExpPhase, this.startPhase],
+    [EncounterPhase, this.startPhase],
+    [GameOverPhase, this.startPhase],
+    [UnlockPhase, this.startPhase],
+    [PostGameOverPhase, this.startPhase],
+    [RevivalBlessingPhase, this.startPhase],
   ];
 
   private endBySetMode = [
-    TitlePhase, SelectGenderPhase, CommandPhase, SelectModifierPhase, MysteryEncounterPhase, PostMysteryEncounterPhase
+    TitlePhase,
+    SelectGenderPhase,
+    CommandPhase,
+    SelectModifierPhase,
+    MysteryEncounterPhase,
+    PostMysteryEncounterPhase,
   ];
 
   /**
@@ -320,29 +331,29 @@ export default class PhaseInterceptor {
    * @param runTarget - Whether or not to run the target phase.
    * @returns A promise that resolves when the transition is complete.
    */
-  async to(phaseTo: PhaseInterceptorPhase, runTarget: boolean = true): Promise<void> {
+  async to(phaseTo: PhaseInterceptorPhase, runTarget = true): Promise<void> {
     return new Promise(async (resolve, reject) => {
       ErrorInterceptor.getInstance().add(this);
       if (this.phaseFrom) {
-        await this.run(this.phaseFrom).catch((e) => reject(e));
+        await this.run(this.phaseFrom).catch(e => reject(e));
         this.phaseFrom = null;
       }
       const targetName = typeof phaseTo === "string" ? phaseTo : phaseTo.name;
-      this.intervalRun = setInterval(async() => {
+      this.intervalRun = setInterval(async () => {
         const currentPhase = this.onHold?.length && this.onHold[0];
         if (currentPhase && currentPhase.name === targetName) {
           clearInterval(this.intervalRun);
           if (!runTarget) {
             return resolve();
           }
-          await this.run(currentPhase).catch((e) => {
+          await this.run(currentPhase).catch(e => {
             clearInterval(this.intervalRun);
             return reject(e);
           });
           return resolve();
         }
         if (currentPhase && currentPhase.name !== targetName) {
-          await this.run(currentPhase).catch((e) => {
+          await this.run(currentPhase).catch(e => {
             clearInterval(this.intervalRun);
             return reject(e);
           });
@@ -367,7 +378,7 @@ export default class PhaseInterceptor {
         if (currentPhase) {
           if (currentPhase.name !== targetName) {
             clearInterval(interval);
-            const skip = skipFn && skipFn(currentPhase.name);
+            const skip = skipFn?.(currentPhase.name);
             if (skip) {
               this.onHold.unshift(currentPhase);
               ErrorInterceptor.getInstance().remove(this);
@@ -383,7 +394,7 @@ export default class PhaseInterceptor {
               ErrorInterceptor.getInstance().remove(this);
               resolve();
             },
-            onError: (error) => reject(error),
+            onError: error => reject(error),
           };
           currentPhase.call();
         }
@@ -391,10 +402,10 @@ export default class PhaseInterceptor {
     });
   }
 
-  whenAboutToRun(phaseTarget: PhaseInterceptorPhase, skipFn?: (className: PhaseClass) => boolean): Promise<void> {
+  whenAboutToRun(phaseTarget: PhaseInterceptorPhase, _skipFn?: (className: PhaseClass) => boolean): Promise<void> {
     const targetName = typeof phaseTarget === "string" ? phaseTarget : phaseTarget.name;
     this.scene.moveAnimations = null; // Mandatory to avoid crash
-    return new Promise(async (resolve, reject) => {
+    return new Promise(async (resolve, _reject) => {
       ErrorInterceptor.getInstance().add(this);
       const interval = setInterval(async () => {
         const currentPhase = this.onHold[0];
@@ -420,7 +431,7 @@ export default class PhaseInterceptor {
    *
    * @param shouldRun Whether or not the current scene should also be run.
    */
-  shift(shouldRun: boolean = false) : void {
+  shift(shouldRun = false): void {
     this.onHold.shift();
     if (shouldRun) {
       this.scene.shiftPhase();
@@ -432,14 +443,15 @@ export default class PhaseInterceptor {
    */
   initPhases() {
     this.originalSetMode = UI.prototype.setMode;
+    this.originalSetOverlayMode = UI.prototype.setOverlayMode;
     this.originalSuperEnd = Phase.prototype.end;
     UI.prototype.setMode = (mode, ...args) => this.setMode.call(this, mode, ...args);
     Phase.prototype.end = () => this.superEndPhase.call(this);
-    for (const [ phase, methodStart ] of this.PHASES) {
+    for (const [phase, methodStart] of this.PHASES) {
       const originalStart = phase.prototype.start;
       this.phases[phase.name] = {
         start: originalStart,
-        endBySetMode: this.endBySetMode.some((elm) => elm.name === phase.name),
+        endBySetMode: this.endBySetMode.some(elm => elm.name === phase.name),
       };
       phase.prototype.start = () => methodStart.call(this, phase);
     }
@@ -456,7 +468,7 @@ export default class PhaseInterceptor {
       name: phase.name,
       call: () => {
         this.phases[phase.name].start.apply(instance);
-      }
+      },
     });
   }
 
@@ -478,17 +490,18 @@ export default class PhaseInterceptor {
 
   /**
    * m2m to set mode.
-   * @param mode - The {@linkcode Mode} to set.
+   * @param mode - The {@linkcode UiMode} to set.
    * @param args - Additional arguments to pass to the original method.
    */
-  setMode(mode: Mode, ...args: unknown[]): Promise<void> {
+  setMode(mode: UiMode, ...args: unknown[]): Promise<void> {
     const currentPhase = this.scene.getCurrentPhase();
     const instance = this.scene.ui;
-    console.log("setMode", `${Mode[mode]} (=${mode})`, args);
-    const ret = this.originalSetMode.apply(instance, [ mode, ...args ]);
+    console.log("setMode", `${UiMode[mode]} (=${mode})`, args);
+    const ret = this.originalSetMode.apply(instance, [mode, ...args]);
     if (!this.phases[currentPhase.constructor.name]) {
-      throw new Error(`missing ${currentPhase.constructor.name} in phaseInterceptor PHASES list  ---  Add it to PHASES inside of /test/utils/phaseInterceptor.ts`);
-
+      throw new Error(
+        `missing ${currentPhase.constructor.name} in phaseInterceptor PHASES list  ---  Add it to PHASES inside of /test/utils/phaseInterceptor.ts`,
+      );
     }
     if (this.phases[currentPhase.constructor.name].endBySetMode) {
       this.inProgress?.callback();
@@ -497,6 +510,18 @@ export default class PhaseInterceptor {
     return ret;
   }
 
+  /**
+   * mock to set overlay mode
+   * @param mode - The {@linkcode Mode} to set.
+   * @param args - Additional arguments to pass to the original method.
+   */
+  setOverlayMode(mode: UiMode, ...args: unknown[]): Promise<void> {
+    const instance = this.scene.ui;
+    console.log("setOverlayMode", `${UiMode[mode]} (=${mode})`, args);
+    const ret = this.originalSetOverlayMode.apply(instance, [mode, ...args]);
+    return ret;
+  }
+
   /**
    * Method to start the prompt handler.
    */
@@ -504,18 +529,18 @@ export default class PhaseInterceptor {
     this.promptInterval = setInterval(() => {
       if (this.prompts.length) {
         const actionForNextPrompt = this.prompts[0];
-        const expireFn = actionForNextPrompt.expireFn && actionForNextPrompt.expireFn();
+        const expireFn = actionForNextPrompt.expireFn?.();
         const currentMode = this.scene.ui.getMode();
         const currentPhase = this.scene.getCurrentPhase()?.constructor.name;
         const currentHandler = this.scene.ui.getHandler();
         if (expireFn) {
           this.prompts.shift();
         } else if (
-          currentMode === actionForNextPrompt.mode
-          && currentPhase === actionForNextPrompt.phaseTarget
-          && currentHandler.active
-          && (!actionForNextPrompt.awaitingActionInput
-            || (actionForNextPrompt.awaitingActionInput && currentHandler.awaitingActionInput))
+          currentMode === actionForNextPrompt.mode &&
+          currentPhase === actionForNextPrompt.phaseTarget &&
+          currentHandler.active &&
+          (!actionForNextPrompt.awaitingActionInput ||
+            (actionForNextPrompt.awaitingActionInput && currentHandler.awaitingActionInput))
         ) {
           const prompt = this.prompts.shift();
           if (prompt?.callback) {
@@ -534,13 +559,19 @@ export default class PhaseInterceptor {
    * @param expireFn - The function to determine if the prompt has expired.
    * @param awaitingActionInput
    */
-  addToNextPrompt(phaseTarget: string, mode: Mode, callback: () => void, expireFn?: () => void, awaitingActionInput: boolean = false) {
+  addToNextPrompt(
+    phaseTarget: string,
+    mode: UiMode,
+    callback: () => void,
+    expireFn?: () => void,
+    awaitingActionInput = false,
+  ) {
     this.prompts.push({
       phaseTarget,
       mode,
       callback,
       expireFn,
-      awaitingActionInput
+      awaitingActionInput,
     });
   }
 
@@ -551,10 +582,11 @@ export default class PhaseInterceptor {
    * function stored in `this.phases`. Additionally, it clears the `promptInterval` and `interval`.
    */
   restoreOg() {
-    for (const [ phase ] of this.PHASES) {
+    for (const [phase] of this.PHASES) {
       phase.prototype.start = this.phases[phase.name].start;
     }
     UI.prototype.setMode = this.originalSetMode;
+    UI.prototype.setOverlayMode = this.originalSetOverlayMode;
     Phase.prototype.end = this.originalSuperEnd;
     clearInterval(this.promptInterval);
     clearInterval(this.interval);
diff --git a/src/test/utils/saves/data_new.prsv b/test/testUtils/saves/data_new.prsv
similarity index 100%
rename from src/test/utils/saves/data_new.prsv
rename to test/testUtils/saves/data_new.prsv
diff --git a/test/testUtils/saves/data_pokedex_tests.prsv b/test/testUtils/saves/data_pokedex_tests.prsv
new file mode 100644
index 00000000000..c55241760c4
--- /dev/null
+++ b/test/testUtils/saves/data_pokedex_tests.prsv
@@ -0,0 +1 @@
+U2FsdGVkX1+tmyjFGwFdw0yhVS6aYi9fPzTndGVg8BjSnXb25Ue+bod1A1ebeQpuR4+oYbfRoQ3KLG43LknUwey0RNw0/L22fjWMkH3DCu3dvno61Pg/dtlnXJDDo779twxe2y60k8sz4DjpI1d2WXGEXdjicY4V29dQaP53JwshI8rp90Qa80D+CRz8sSBq8I7RQ6//U9okwxVft62OkziI5TIm4PMg0nEqmVXqGUsYXuLSKX2u6cSrNsQBYps/5tWL+hO1ONgGOPrsE2xO39KAp9lnE5Y5EjysrR/nUF8bLmowtXkp6mIS3Wj2E6wQ6Jky8KyAZMfWyEGkXrL7+YgGj0MbH2yXv7Mng69/hvVuEK4nJMUmkYA8tGST4dlY0k2pmLi1aDVF0gTqu88jDPeV6VEKhmWHmpcDydPQNKKi/rBpEu9LUH9f1csCf+am2rUHjPaKdoAnfNASA2QNEYs0+jQ3dTKXl1hwFcl/x62Pdlua5tYPW+Bwu3zglNSPxa91jrkuZ+TqzZUWBsJgudDWWSVuEY38Tm2yBE45szxTWlP0SRjQG6+LNv0RlfSCfWykxMLI+EnIKHDCwGDrV7QAz+lSSMUK96cJgIag4s5CL7ZTiq+InNuDUjBvpQkYT5ywsinuzRIs3ucGAAXGkT9SPaXH6/WH450KWmZhWGN4Llfvp8BwJjl3ieY6bvubn8FdHOkVOR8ylUkEMbS5Dx+QreNrVAEvG8VMR08Duac8XZNPS2FfrNIcnhZTX70LS2alOqBkm/Ieqi6euQabA79hElMAwdNgcODD4Wst/CwrvfZKTCDKfkjnJRxd9u8k8EZr+8a44QKHZa5ag6JyziGPXi8wJkF2RJGjHyz5Ax6p0unAr8S21o3D4pdDC70POFULaCG4K72E9M1u5j3hscPTlL5M3hJZhrgohjG5+5MqZSTfbgdnT+F/qDt96RE/SSkmYPEgPdX1iQlu5TwsFD84b6TK+U2bs0JzEOYrmCXzmhvFEBoaX3czDEFgxvn07NLKsiGdLhXzq+isf/+35QRVgXOBHi+uwzeSwwxDL7/rRGRvDVFkbw+CoqYe9e/er8FVtOyYlG+XgNCNHf9pbPZvFTmJLC1buYQRUz+PDDbIWtoGg1V/CpEyVFtrMcfa+pkMC610v2yXCxgYk4r0Ih0GosX8e5JZaicbZrqytpb5aCm7o2QNWGoO1BjjZzxU27gXwuAaaW1D9c/g7dHqU4ERbk9fKC4bS2arun8vmIAZMKyfGhE2Qt6gKsHui30Si8Im4EV7V+HAtfYXw9oot5nVgN3nYmNM1lvFesmpv/PBoRHI32iqbMfVZg1EkmtQC9wnX3J0tamCN40PDn+bYCV+oIVON9nFWCTIaqZD3FvckF2W8T7gRVB/q5otZv+iS2mfi7+hBmuXH6HM3y8rYU8hB3L7h6GQ2HzOHhw436bc/3oIgl7zRRqdKUSSQnuuvrVU2+/2EEzDAehsm0INb1J32D1UWcXfjcjWrCXZj3h7hY47pgQ46zvZzT9j5pkjTocioaXPEnTIJHZqb/hyymNz1SL7F+ijQsT2lvHqWFGlW4wkvkWpXaeOmi4DCBxCaFwI0M2CEmW5rWXk0moKUMqz5qQMRk4Z1Yd+Y/bfANU9G25y8Hp5eNEtJfw+RRZQf9B4ph4qtaBd1njIsgHJfy3KryDVQtxUNxL2wufozWMTvhY94BUPdx69lbf3KI5Vtafj8v+d3Cl1MpOHF5nJf1ijCAiABO6DkTF/BLO3SyYiiOQy66RLhgbiIZ5ILoaGa9t524rk2Ox7H8bObDoED4tf22hpPeppb2V9yE7oigIQa8/7xsN8uzEf9niQKWnYsDFpyGNlTbn4YfadGbUGkaS6hcM2jGJgFkdJ3ZGT4kKN9tA82qHa19GeH0TJGxLpSRJ3bISKxw+770s9Y//2ThX00WL+QVMFhYyaUCAzPKwKJu4ENvI7rQkC+d3W77blCAYQBZvciPknsc0Fpq/n+PDl9ue3lJnom3v8qOXekQAFCYiTU+L97Eu0VaOymb2FiaoiJrh2/UNfgyVP0g0Fjj+gT35v1Ch8vpaBwEDGL4+vmeq8MpfHljAmA7+5B/dw7d6a3IsI/aXUbYEJ/Qw09gzF38cnVpRpR+8vqh6bcIoW2Fiwg0dpND1lw4JJaUYlzd77I1Sx8R9DgfU3vCgGMAZNVMxd781A9+YwXu8JaGt8xPwrSLZIK1Kg/QpSU19S1ePIhsePcJDyk/+eeFMsMNLnQ5X8Vs6pB66CvFFe9f8+cqlqR3ChZ1tZj1yLHf04PaHWhv8L6v+t7O9gm4WxatPpDCC73wVyMNwERiZ5N39Bh1VqtuklhSHf96rK7qED5vQT/H9HIlyPmLMaOIoDMHqo9Jc/DNjbfHEBZKQVQ291XRnVq8zjRLV27DXX+s86j1Bn3AiNatMbAW5uwxaEh2QRoQvGe9fvdg0FTk6PcKodKTWKXtErQIe1rQTO1rf3okR83c7fjLqWFUkqycYv74B1N3o9nNpzSpqsxaDtm1ExP9pSledYsttu6Tu0KMHJ6ffUoDl8bO9hdC79joKZBqtvTd4uiFQBNggM2IWy/7WKkKZD30d/R4Aou9I2pqg6/4c0iAKogE/wVgPTjiu/ob6aqVdcMQphy1WggT1ULkD4yuzl6BKwDnKaDdED0H9YVvA6TZFBH5KKhA4CsXeLDA1AEhodAij8VliTUa7ejela0QKhNujkdEOpaodI6SZ66VUVDV6mjiNNRgOpeDvADidNdXRydCjosu8FMoyceN3v2/Tbp0iFSKMmsaYaEbAZKoMw6FN5PCnytH5K1nKlr3I0woK6db0ZZiaIUUaGmu+uV7qcfmkZsPeFlGnlVhUR1DAazEHgSW5dfwe+NkWbHhYrNdDFB63k3SFIHS5KO7Rawte8dKvU+9Wj+6eBATgFVPkd9RMEAAy/bN2BCXOZ07tkpEdYjvLjT1AcH+/OHXfNZF00B5reIIFvh0jKMjfL4wkyvZm7MyKGvhvl+BVfNcuH/Oho9LVb55O/O2VopU4JElmKgjEVNxW9cq+H9o+2Uoco2Lw6vfKkzOQXZFMZMfIGz63wnEOQtziC22nVGuU6G5POtdd4buSzMD7B7XgfrV8zbKySQrYZlo2dqzsg1oNCath+rbV/rYQW2gz46H0GHLu5cLanwynx7rQcuYGxhvgGVNT6VHCFfvWKKSSwCvWbpblFtzgvV1moGlzeB7Z2PW2vImxldHxknNuK+IEnOA0XKhXMYoibZYce0zpBlRTCt/iUrx6G+wko5mAW3IUvpNYWTO40Qpd4XfZnRj/ReCX5XA9jlhH2PK90y4MNnMrajRA31FGQDweBUM9MRt8NeTKbWDjsOVhQHKZalV9WDqEyFP6xmK80uijqLMvHT6aP3bjSO0A4duhoeXZWzu/5MsBftIo/osiwn07Pk8DwUI50p2WN0tG+9JWTST3lWYKL6OJwrEw4qTUEK+TECA7x5YmAOejkTYI/jASniT92ul6V539hIkgj7FY/shgW0ki21K8gRz9EKdAK7hEvhr/WnPwpjhTdL+4Y2d28H3NWElybCo9N2n9jNA3jfzerZFg4xniaQoe1dabJsew9b+lc05UdL4d22GXFN3aPfG5OblXmTcdguv/zuMUfeUHSDts5BVcKx2xelD7NplamYzqhVUwgiE/umZ8ZKvN+JtFpiiagHDncJtf/6Aapw6kqE7K3xeljWhfVi9JfTAbqUa+Nb4s/PO5FSbIjp7rmXR9hLHgnSxskW+9zH/QJKsIqvmpP9mnw1NneUCieoW51gpoK8dVW+ZnNkizuiE+tI9JW6CvNO+jerN33aRQ+3t6A35F0oZe35DQptv2LShlZmQ0kN6WEZgMFLWxo+DfW25g3nE7H+Pe8qgsUoc2aKiGrOQ11GuuWyKcMEaFb2SaaUwx34WG8l0vtKcUSAVEphZvyVxFFQDXO9/OULx7kSwFcFdoIOXi9XRM0BPuFj8JPwwxHhqeA2lupse6U4n8e1dNJxse+yqzByq2jsEDmOWOAVmPmpNZv3dLz2vEVftAu2k1YEQe1OjRr5U+5y9lHpwGYjwSvm61wSLt7t4q9I1bx8RNyl+GpTkkAamCwPD1SuhDF1Gma8eXyOmYpiGH8NtsDtv5KOVxOVsCFDHilk6nXBtJLFV3bQmiKAH8zQ9HRS8TyozM+qLsSbYR7JBLJSw2E7yTAvs84m6EVhD8l507RBVN/VL/Sbm6G1Wi011fGxR2VGYncIFmjrS123uSvElF+cJu4rX3or4+a2BwJr7Q3fF9R+5qmc86K3SMnVH5tRhe+RoQfqLe6mVx3iPTtibSRNwPs0mksxBXn4BZZNE4M3PidhANNIji+++C9tguW5eFPEgkYunNwB9vAD22wFarPxOHDnCg28UyYBOzsJRHdJx3Y+1CZNIbsa06KPqQhdQNTAGfBaDCC//CQl53i7Xj1ilRf2FyE51a+2QWCD8fGvc9ZAA2aCI7GOBBQJetW/q6tjguc/J3v8AUyaSepiyfRFkAUC3nTFqre9D8dmH1Q80E0vVMUmLFXPKYycPIJtE6XpylC0QbXQLGRHruID3mM/H+CNCOEdLO17wsFeMmND2E/QtJ3UZVkbnX9JOU4XxoDG+CctU+u5gm9SfkzVMp7reEhJiCCuilxdXBvOAV4S1BDgZAgcNX9uyPfmWoCkc24Weui/WG0LvcqLp8zDJck97y8IPvAGrbtGa8Ysy3TaapcUuLJ7sAswJp61zkt1jAw+4BRB1uVcrbLShCmV7CvhAyGIh59xPTEQXLIXL5zHtsrMP4662wxcxTAxwe2uybSVBEOAGRMSMCFzrAT5XrI94/KHO3dOiYKIoYYttQtU8ZvtAjK3dXPDrHK/fv5jDOPRmpEmM2GrioNrwRuC65nYdqoiQb3EtYTEtZ4S+FvQR7jUX50xxvgE60yq+jnKKnD4YpiXxBNX8BpyjTZsRO/1AtwqQ6fnQqfgKzF7JlJgW03yjHz8uAMiM2sj448bq/Mb6ooE8CVNqwBSZP8ZexB5XvUGDzMlOA9emhFAIxWOpnbsKI3Kle8s/eizSa5onSmzDdCGMvEnDmJUku4TNhv9Jdv2Hkc9+Z0LluNmEfDu9nM6+jDxijmVYdyl4hFlaPiAhIRlCu9KSBIeyI29Hrf1s63BCy64klCAI4LMEgKW1ZxgoiAsWoFWFqewJfzo2jxgRjjMnOWMgHKmyx5KmliKYHjAud5lYTA6qMaIrkOArmoSMD7QvdKUszGDT5ROAJ2NKFD37SU/ozfLmn8WpPlkeuEssroiIz2n8Eg5uWQpIVKRgka496vT6zGiGipujpz7lAkmus6T1U7YfPDHGVn3GGNH8eO8j/Xi4/5fcLxdk3x2hBWxUwVtMbVDaXK8prLv47WM7HwFVKZmRh5VB8xNA7DEdP61pwE8bMKLaHuaxoXnZu9j6JilMe0I7gC6drVEDZ3FECf/aBl9H0EI9wkh3dpS/YQIq2mjzxLhKKoGa3jr2d5sXAF2UgHlp4zS9U1+Z4HP91iBu2p7h62sJyetNnIpxNVZcJOEcDzbuMjpygXVMLbaxM8sW14mVJKdjFYEL1zplSiG25Pau0QPtZVExXWPgbBlkVynR1Sz+DRZRRRC5LdzsG8T4E9jUtZ10ESPhMY4wwZVUXgf4ZYJQFD/4h0ze2VgyZra0mseHKdeQ+uTmyK9xCKn2JvTw4kxCYnnR6epyNKYqt6hVA+D3rzTFJrGUL7Wx7sD/1ZwWlM/SHaSLV7h1Vre3qSLoIklNECzCM54ht/4b++r3KXVDwxvJvkY8ri6g3bEv8upILHVOvcOecHbSESC4vUKDmaetvJuC5PENFJ2BLchn+UPm3FR+2yBskStmne1RMIOYwOpGKqT+X+/jWmdtjuPOWKCoTtXHSNj7cqYRXVAk6G/f/7NyKHXKLRWow5Kq8KnqrAUfK//+c6t0K5cRzixIB6bMgJn1jJFi37nRN9c7pFxd55Kvaa+1wkqnhWbhjW+4zFAR70vxGDuTLQPwI7UtlRCjQQ7hY9GJhV/aVe4gc7L101CimlTPhZYJFCYjKjXGGHZRird7Z7hGbN40FPHgR2Tgqy7EZ0UZSY+7lVQnOrBFkS9B88mMrERQixnWDA8jZCDg5mXLLTBJ02htvW3SAAMHAzOMTMKsbHGo1D2zZ0RVEzFo6ngK9+7ZjuJjDyMU3g5FUhaiACqcHctlOy4opu0sPE6o/difc3qtd+W80jirut2rdZx3zWgwghj2eykpJ9jMLpsHSvH89pI5XU2ej+emDEc1byk6zzXvYhxd37MkU2i4enxtEk7J+WQ6QhD1xNBGIeqGkSZ/rE6+XaKPKE/17xr5en/7KsbNjnBN+btz9CsbQY3QVN7q2z49Sj9FSSg8NKRImZ7ZDBZzuqYVCa4wk6KVCyNxI+CTerYTDk0EbVVObP1JU0i9dfvpAr6haCwe8jYhkL8YxagRBbsYG15CYjM21Xvu2AT9AqxVKLbuGVGHOg39uVekSDSizpIHx9uZik1V3UQz2e4xyxiLT8OIuJpcbPbEUBxNblhoWYRTAT9JjCJ0XJhtB+5CgjeU3W9SaMLaGTVOt56AaCO0iXK2AehRhbDSPRIpeDswuBSrUKahO5OeerVY9+Bwh7H/Yxt84mdzJHbVvCqZwKZCGGPx/+XMeQEQqGMVVoD7L6Siq95TNPlmEFdXOl+Q5pM7uAxkEQco+YVGCOWOvPWvOAF3cxZjJ8bEVu5YCSBaxZL+G6/lgSfZyzn37SPlbzdFyfp2ICgvUPpPCEGvv59lH9XyQ59cdTpRLblxYidXWkXoRcCfldvz+XBGccr+HY3BTwyPKP+tnuye6gjg2PsIxvHUJj6wvtnQwApY890CeUs7YOhSk7NSEBqR1vRtkS0ZMFbb/WNflOptopbfjKNupG11RQK2C3QWwJeLtyjpmKmnhlTpq/fpd5aCp+SAVVijt+xY4wCZ6RwuzYuRDUX5sJF+B+/pY2izZ0YFaU/e17l+ubw6H3BB3shEzgQebdtlNUW3AKLU1QglUJR5D8MtbZ973ehlrGnj9asnRM34itweIIgUXXWIMNbdHlPorAbHAfnmqJ0A3MLA1mF94yxz6S6JvRttHcLYMLd/KIgLK2OHVuzMQfqkQVHq4p+mabOA6j59LLxZwb7SmSlu0LqSY03sCLISW695oOI1U2B4Xp7TH5cXL08GJuhQqpvf5TyEpGJNZYVmVx7Qct1nYxPsDR96oZMaUpphwrdo7frOjXvyiuR/blR1ehMNzLTl1MidxQzg92bg1jHAEby18lCDAORTfq32kG+lZl3iUv0RhUfCncJiYwO3YOuTTyd5eihWlUjsH3AFSa0qv29jSQacj9j7Ysd4UhyEkWuvgZldITPPyh3ZfSPQ/1BHesWhHSSm5LY+fjmiDvcZWE/Ir7chHT6Nre+ff9yFtWAW0JpEnEd5JvSrtTFodHnqj7ic0dxeTPzg7F/y24Sq/D+WyKL97cq8y7J+vqj/4AXVUcYDKNa7S/daodKYh6e6v3l+L5Wy9LNJ6ehoBZzmSjUTA8tBlFR8laE2t8nPEEoej3RimnWkxeZpdkmQGNg+T0KQdL8VaJliTofWbVrdI879IMjKhnXuoFoaz8Bcv5/Eb0bkttmQX0UhOeNxbkmz9eVohytGZdV4LTYVsLsQGQcIj/VJpO4T6inhIM32yzX+DsLfyRUdiqK78rZjuFKHmTwJRbVHjlNr7eoD3adbqBXgsQAGezHH4OX+YAR+52EOf1YRE4uGzHHMzWLEPF4OJddRCDX2xRlR+QYBH2PJjXEVgp9b7A50rxRGqx2XCQuX25UevdGLyUfvi509TaR55A1JI4W44eYmzUZG9L4LcPIoHR8/am/O0uduKmoszVUZSs27JzzdFQycBUb5mkna7gJkvwo2YY1j3SeS6XEQjLuHLwaZxLmMzHPfcd7pXXWVPFcuwB0ExkUEYrzaRO1A5w7+x8giM7m3NfVTexhQkEHQai1+Ujv2Qsqf/N59xwAHRs2tSx+i+vGzwkUxtkuxgvLCzYXY5rIiFdzi3/FHGiUbAttz6tOsEoFJEJ1Ro73LTKQJS8ljhedC7dMZ7h2Xfi93aUO4FiQnwPNk1yEPrSfffwFnZbVRmBO3h+MtL9N7Q8rUNg3/TITgbUCjF6Lz7Q0Qk8vbYR1cnnrW03q7t330It414tTy+OGiHu5mbklugWP2kmSP0WH1yHBxF9brnCPXvvWZhq8xyekhUnC/3PBVIYfuHhZdABG3hpOtH1awVFJfB/WK1LmhN7lzqFMv30W98fLNLo2Atx7r16ghj44OUylKJqAuSUZZQv6rBaVij6OSzyUhqhB4nec1hPIunGnKPJo6EEZ3OdeRGKKT9JouMhkvaWbhNKqq76Bk2icQUhDlzPALJMDJavRjF3awArHaLK5qxgEBOuVNHFATZKM0yTbj9SN2h41flCrDG0RgAFmHacxaqzLldmWvVWTX9pGvtmC9qO46XyzevYOS5aH+7EsDtsbs76cj5nbGTIMRC73BqzYsnNaRP8X7rTkN99y2OhIhdrbKS5JuELVINj/aXkyMXk4M1u3n6JlHHOQFRctr2Ki9UkjrhszCsAZbDdyKhPzZZUyTPmPpBcwRVljwZatQva3CgQRdyS64q0yZuWonXi+dbOIh+crPWU517Wcfur2Ddpc+tgA8Ro/4MpUMt1qY23SEPOVqKu/3J6blFH8Ib8q66458keFe2DZMP0YqFNXRcm1tJjabXfNww9tDqcqlXDrub/yJCoCmXLn2mFIQt7yQCtIA8RYCbFtsQHcRCy4evHM250eVHcF/NyOSAyATYS6jePHAsMR82ZF0/0FReoshVYINNpGRcbW2N20gJ82g7ja8Fn/uImPFOmp0BJIspFQe/wFiEvfbHRWqn7E3cH7OYa9l2m6mPK9Hjl1+SJfhJOnLocD8D2nbwiPa7nQ2x4wqGyDbYIXQw3+9knqIVRGogXq6j2T6nIOrrTnes3InWo9OBqceO9CUUt9ziJVS+88uqoXhIytGNUPk3PXTIuXq5OMK3IEzuRGW8PWCSEqXXsxboGiGmKKDJwkAxoIJg2M7Gy6HR3ArmBxP4Jb4/AF+eMBOyhSDWqXQnw7Cf9KA+2R1zXelmFKSs64zaTSZJdqZqKEZ7OAHDnZ6JH6vbqZaEezakybWPvWXvZuQeiP77gMZuwgGgAQyzI/6bh2tfsd5/xyy3qBG2KMH8O6u5Bvkw7H2yQgZIlE8omw6Dwf3bAaPqiZUaedRUfkeZLtS1WQZDG7TOpWcnzlT3zfFX9i2ri6KouPQ9dZBWlmKgpWqiDAVwoq/v6pQx3JbzK5pXBCU4YDJl1MTH6158hnfqF3JQ6i0ZWOIUf+0v4lSxDdqmrHwX7Rdd9P1aSFJEftlxB4HeZgJ79/ZQ2RUAueFiE6UTkLpAFjYMkSxQhkzgODa31kGc8Xy5ntZDwIxYSC0PQ78PAeTRNNqxm8ODlA92thmfgc8utVggzUwiMobiIBaLrquC+9t8/8RW3uX2+Cu6xoHcdoMtoCCfh6GxRggGUyRt4ibrNj4mdeCqILuuAzG+mt0Kzl7u7bnhrI+oixLNRK8QJG8+g+ImDZ6bYblJ9YAf95q0eV32JbyhcTaHNQR1VdNH8Jvc76oaxfiK7AkUM0Lyei8d1iWkflKB3ml7sGAMtNSU2qSbLCpSqJAbDtSMOTKqMgbh/lxnb6jQh9xqDogiMfo0rUvi2dfrUSobihSKTitobpSK4R88kcvB1QVn5sKhSyCMUuoq9rheaw26nYD4PCfv0UuIWiUKZzcbpWgXn6Ye9rKInCe+M24pyrBs8nHRoKguoj4CgqBP4ulmK1ZiFVUoDu29Fj5UULje5DkFyqf+O8bsgiBTSFSgWlawbi/v1z80usYFuqL8B6TknwP5M8kd++bgv/X6wNDbuf1+ChGy9Y2+wxflT+0eh6ZOA3+vYJiwv7ztrOkkPKhPSYMvvk8zhqn8+JbUo4g65bU+zo8ESSczHVqEXnFSmVyvNle13D15tEzC0nOadTq/phEa/Qa8SpLAMXQh5RGY/ITMCZggQ+4KYM7QvCJZALygaUJYqWF1+2HZoskn8YZvTQAHl0dhw029XRmRmf/j309zryhxUQOAxa9vLeDjWb9n2kFlWLjNT+IwajlafaQktuc1KEg03L4TJjXgBQ21Q4FRhvZPvyCIpMtjlCmAqf+hNlyetxPqC0HbV49hLW3IPQR6E31udcz+ChTylo6st8WKAVnrwEQDCROOxpOKDPBhR/Cj0PBSrGWBy3vWkXU4nRWPsKaWG+uTnjpJnS/56pPeGNfTLgbjyju5be2CEabbv8DlOt/iPXF5viuRgQtL3MsxGbKo7qSoWHFJrwIC+hV9iCFqJgcOzwRgxQD3y9LoTUrBjKHVKsqKre8IiSm9fzTPaknUv5Hi7+4g57ntKBWTil2KwBNnxVipS+8S70f6qsXSBwDVfmemuIfJe3SGti3YZ5o3V6rZ4FQDzRow2s1ZXfJ2nBxvW9MkpSIcDt3UoLtLgLU/btXlVzvZHnnpNlh2EjVM0oBhZNP+5vFAG90DuNyCs4qgC16Jy7qWTbG2VGq8fqM9o+z9mZyGIy+zVLsdLM+7W/0LaVgdDgdOzDYh+nE79SSO0TiaBIGu4vuyMSvAOP6URb3ZjBcgLXGYj7VnqvM/ePFdNXjUl8ut+rTYp32ep5E7peN0BESJT89/5CCqV5LmyGh5uczSgoJHdlLNE+2YvSFQgi6P7SHvEabzb0FodxHd9Fbi4xAGsNyNvs/TgafrWouktWe9MCZ7C4WnMLZrAQgDg0Iy9VR8s9b2BXrZ5DrCOkCwkOrOwH9RhfJKLtFY+XcMA0YBCO3mDxoeRGEga70uWDUqJstv68H6g/LZWo5xXV27peZ3OLlWZ65YGmY0bCmDdNE/n+mNmWfwJF65yzrPMyymnqo9faZz1yKfvP+uwX+7MRTg3vnX4RO4C+s0KPkd4VMPyP2vkSPXYEauyl0c9JZ4vHFfzpipsPcHIxtJwqVxbYbs33YRqToq9z3Q77hdNKjxxrdPDI6H0wHi/dbGvZoZvEnzl2GVUDdkEo3BlJr+J0lmXhMI8SA+bJwcYBs5HXxei0SYvcrABtJriy3rD3xaLkNe0+HRQNDczwlcYho6LhzeNuahCc13r+YeMba2p1kMM6X+zJPDkFAGHuJM4oOlQrEKpm18jfvEsHmO0mKJuSe7MNcfu+1GemBjtzAbDVWYpykn2Cq+kBjTe8aEqdl4+6cGudtYZhkAYVvc3WBvjuTn3g0BcyoYicEduxt9NqJmTtdjtroKZkdtOhO/JHlfOzoctvBIEp/YvP1m6qUw/T/KrZB+tHYGvyUWnc+Z8n6gh5GKDDZqQIV0ZCOupzHVDGfAyeKjdAg0ydr1JEjg7mTAWrJhgOTK/T/OQxUfD8DZ4xrtzsd4QL3OLmecgEHwS/23WRCKN0CPx0/ZKQDnzY5SdDL8GARqnV2h8LzCe2W0WX/PR66SWuyqREr2dv5eUMBrfsFCODyXjAI2f5RmsJuAEnTMYhM8C7N0GKX7fqZWKAcpuvL8TeKojcImnu80GzJkHWrDmArPDu9dN+Y0kDBlyfZmKfgivZo9f2qrK8C34kEtLM+1kxfLAcgESKUpVBc1NEPpJjqYzbveOloDEuYxTP/e6VDfCG9jMdjIqu3DsCnNf0AWQqMbyQDJvdOMGiKZaUltkgh/m2BocXjFAsUoTxi4/aMRVOFAcWMx0Tl4oUHYopVAb7O4Xdkpn54Fj8dMCecp6kWkjqytyuZP8RCLocCebYK7GdY/FL1oHMzkjcptfJhKDDvPTHeI1cx8pepjy8+ODhCug91QS6GxknJ1v+P+FSbtBUNlemWRE+grSkIFYNJibbjMJ39CQ0fWHYvBp0/QPAqHlkEhoGdlNw+ql5+RFKYDQz4EVU+30qWCQdDyVTCFPt01Z7R2ViSC6yxHTxN107xpcEo/cnmLYmXrYyJYtxK0eIwWMnLCkvMu3i3qpxijM3b58mvmh3BxxbYKAh4S1MpluTurl6JGC17AxvM3UXfjwpkQCe1YrMDL39oRQQeZ7rRnWiYS4l8TyYmt6ozer0I4sWcMlkZnCq7JMVItcffRFPD8WJ6gA9guL6qqyVOxRVumIfNOgZP/iqJePbI+GrkbQwC6j3Ja1lqW57kRsbLkXRncprlT25ASvO/3V3Zj+P2osNBC5pwX26OHXd89yxfN19IIQaAljnbl0c02X7V4xtE0/4pfIK7aonW0ALnyiizmZpYjMuThzUwpgZEb+nGDmJ34GV3X5/CYMtQ/vndodAgT6dhejEa0cwY7tKg8wVldoWIMxytH90pJFp0eMK/Wo9Xfn5nT/Xq4+jK/T8sh4nxp7mXX3SP71Ln6fI6ECmrWD4DG/x1P6K8UPwV3B5xETRTNzSuaNVB5Uuy3gfUvfLZWOOQ6BvypM8Ce0LVahtCiOCJ7jedIierYq3PGoGBYLJTpWvwROe2B8B1+2PFeTbOQKGEKCdJPmnloVlNkqM2dCWH5ZWG+wk3Bk4M9C5PiWxo04+k3EoKadCXU4IkqaH+QpJvJWmHEDrZn8FsfOi9lhsq9TZExImz6+c8peoLn7ro3eDhIHiJ3WDRxIXGsyR53rtIH7qCiUKSQ5zbBvTPiklspgMjww9+EoLFMPwx9hwGZKCU46SMcc1ksPnEaZsqdeUVw3fEdR4qgOUx3IirSM7UIoYBBV2mQasrplGKbj3bybpHwE+DiC+suf9SlL58qU3zlJarRBL+H/N/G5BPohJit15vmiEjZXIMpVRRHuXyJdMEYly2FyoeX9IKuzV4YnJdvofmxpUe0qx2F8PLeac0eAFMlbjwJXUKx8wdoxBnvfpEzPbEAh3IAjMLBqBesWzH6crdyZyi9Jlr/QLYiWKWrXIi0yg3AX7x2GUeaqjgDf6rYujaUifrMQLmEZvSjolUY9/TsrU0qrAw30DCD0ldmIira/uwMldKyeM8kFLfSnR4M/7XeXjguJky/ajGjjwU083YVjicbAIuy/ef2RBT91yR23F84lI57fZ5XZwGWpjyEZz2kLwLr7ZdQpmyuYdt8ThhdW11tPye6IjqiKvhokXib17Pwg0TC0hzHhZNfR7gqU4X6qjZyNcRzhezFetlKqgUlSyaWtLSNkDIusTxZj9hb+CfptCTdwrSgbjiXqjf9y/ypzfSzvBuisXSZCXgqZk1MrQxC3ztRFp4TcdqOC5Kf3tWGX673WF970UWpiIHu49TJibLjxpes3orMtosSSbyKpwBJAEGgguiJhaPxRK2+PCml2/2r9y+Pe9sf5z74yKRNha5vbgxp40lWqPcH+iX/J7/P1om4YbiBUSfLf3GyKD0emrP/3My3pmq+8soDX0zYJGM5LpOqxTGXvA9XfagKPHyoskYCgULO2Q/sHzfnjzKyOaBWE+TxXGOjQURyolxFTKGwp3keP2rCqi/w+Wm9dwL8TYA+X6LztxcVBUVyqkS35uN6l4h5xl/j7YuuTa4zO7qU1gc/BywfgKFIEeqnHPwf+eUwRIP+EC9QIcc+Ce2lAbNh7onUbc4CLmt5CKrAJ2B7srAGsABBSOc5kjZg77fpxHZT68Na2yBw6YIKto5gjdU3Tx7ag1MSUsMlLO2qXhv3VuW79kxkLXK43lR2InjpIncCPSsfnVyrd3wn6ar8eW0k5xFDqoU0aT/04xI0/7xkUkWwjUeCH6ckV/7l0KANS3YCcPe+1fZENK2WDj5t7rJtfVuFnMF4HKX/lxdsKfpTGIHj/dzncuWpjdNJBWb6ZNmLzjNQErS2W0oBbjTkUc2m7JtIQ+JYhW70YbMlGRCrG6FLLoFTOL7R7fy4KPkIKbabGQrAX13Fh4mODOfMf9U6GIW3tdB9PMk7HYUlbh/vdYCQ53eqcLalYmdgbw8xycJC1pCtYA1rvOaxnhQDvsJAWeBkRLbuyVR0jR79uhRGNjG7uC76L9YE4Ip4PdOOL1UrWALS91FvdeUuG1vHD/aUOyygAmxc0Tl0WDE1lmWj+GgMP5C+S5O4U52DjAM6ntZormGCHmksFTIdqe5XYDfoW86cx4+wPKwIrzE1v/ZsZYjMgTkATjVDtJ+WGGqv0KN8eUp3Iv2+2rM2As3Ajn67iGMEZEOJUkB5gS4i1UAmvxMLGNQwMunK+uWFo3BP2li0yKdrg3AME9eeVSFFQZMRyK2p7jXfObo2zst4xARwwjbalar+9iTjNeU/jz7GbZYcmRshx6vdU60SajEJ613tGkPOVqCSdGEC+rz4e6GBOwykDsrIz7cKm/CWvsyjpsOuoABcHkkb7oqSMHz7ap8RQaf9iNV5eRIalIvWDZuUUByrqNVVMusa+f3KiHTNmeWKMN1XxSHSZ3vcqoJri58y1TtB/u/xhLjwTog6bhZFJzfa/OJNMn9uzQfhJ7281C90nNxKxshwhrfUK1Dj87q6bwsTrlwuRAzd1veX5h0u3Ij4h3PBL/g5iUgRizPg9VNpNDzT5hk84M5eQRu8UGwvREDj+/ADlBRaQGuW0E0RI06P3bu9S+Ty4PA4fVGgDfE5v2pCDKJIW8/EgmZsYhGrusEhF8PgEhbOwLiCOvh3XMLcPjgIICRdjQE4TlGVHFPHMDkgKs+xutdHojiZSXNtzjRa+xNdQvPP7bd8BREdKXqY1/nxeRlVkcJ2e+CwcQOTpdgk27c44kgwiwNSfIWJ6twvUdIjx52EhElGqes6xvCSHW/h3s9F3FX/r+HV7W5kTr3rBgze/FK0vxmDT5qJ+5FvOhEV0hT45RsvvGp6JL7d//B+84T4WlXrfvZo1anrpAncPc2CEQEijzzrWy/H3zZKE2Xee1FfFTqCPjE2T85c5UxE/2hHh48snQVjZu2X1Sf6UfKXZH4ugFvCpT+o3AA9MaeaCMfIvV1B7HUAEO8itZ6bh86GBH5oiMsDVfVhsv/fc8JzYTAKqIxMdeSHsKafeIjjc8ynMRDJxBsZJWbJzBpbnidsi9CQiRo2+Mq3e8NOrj9X9nawxzuJqtaaQWEUtd+D8tu5EFKzW8UJhtCeICDN0eui4Fkz8HkxCqujoAKfRL7GGlWwRRTqAsBa5+pZaz/pK7DPuWFbddFak3SKCYT9kLuh467+YLGllmMDEBY2I9q/vy/N8szgzPMd//s3KsVql3SGNcQymKeaNZCIPUA3LMuBZfwtKLiuR9CzLt35qJv59kcV5kTUvMGdYayUEdza2UxfEvWFkXUZ3KZ+S9o7KO8gzyY6OGs1WGVAKO/386GyWyxSqBOeOZOlCTogDN03ei+BB8gM/0Uq1qXk3arSODhuEP9VIWzrNmUU5kEz/kH9Xc0mIpkzRJt57jYbXifYigCBXTyzTJF1h/rrfdOWJpl1T8fBmgC5xkt5uz8VDdH86C5YrqQi/GProvOJBv54q4kftwSzy1OLtPNpC0Gk4n3fQLjIdj3P3xkU0qStge5IlMJWDCA+0ebTVaQtVCkODcZscYkBPIXTuo+LW5REBLzR5WUUvhs72yhQ0mNJX8BCPqdtixZqfn+HNE9wcbQaxY5w0gwkky3/WRyyLG6IGSZ7fCuiPJ3JqZxh0JqFKzvkScvBs01kWPhKJ5caA6PTvnFvfJUhhGE8SJfrRMWCyP1b6aesYRHn+wiYgEDbp2f2oQ+1jjWHEOgHjQT8KLUIwwia0Ym4ba2chzm4qM2OONs2PozBKKuEYxvNCqAFjCW/VCAzHUYJB+UO6noT9iS2TljSTb8yNZCMDkNmib7G+vaGqFz5all5TpKV+uV1Lv7YdzqEuhoXH5U3qdRTLqYi6O4bwLK9qiazAth1FQJ39L8wvlCkYN/NeOSV4kwH/MCjUJnlPdmYpjOcqaQnqpFA4xJ3yoxmatOvN20aGyFqm1lgFF5zNmAeN63asadcD8V306bputj+oNr3OPAi/zffmMFBPOAxy5KOc3pjIenFxQD8ef7hlQ3yj2N09ydn7ByU60i5P2oJSajcENCMYNfONdajf9Znhc4rKffK0NnxvPx5rKE3Bh/6U5aqAZU7izMpQHeArb8WHk5aUyjQxvILAG3/z60LW7tlXt8A5ByOUWbnoUhScQ2tcmHyqlAy4rUIO38WmaPwYF53YcZXzsyGc7s3YAswoefMgGyayn7CO3jOnD75jEF4kPAIICuT08vWXK+pQJFuLsU8WsHLlpwjaar+nPQ48dyTmPPOG1T060HK7D4K2aiRynamNfiYwzKLyA0A7pquLL++ZfF072+5TlmDdD8jxNRuSviWSvgDP4IxLrMa3J83j6IKYBvk/5ljx9Zl0Me11nc8PLy/N9XOZSc2q2H1JD/EwnNTxXFDYTOMXJEckwtPWyvs+hX2How11npFz1Ri31KnyRu8b+JxUSyHMLeUQGm8pev7TVzAgxstFgkBt/8eVDKRqN1VRYGzg9b+io5XzvL7RiAxxZS3cPkRsdxYXhK4HRkInpkIGNqeJMC8++oPPaPhzQ/f0Vfcy505O5pKwwJUMF8GyT9Ix1Ge5QK6z0LMaMBrY1ynAi0HIEizPGrFhz3RABfFmYbbDlcV3Cut1rKu3y+h6+1MrNZsplcMS8zgecRWBq53n5c19nRICpg3669ysDhVzbV4537ybifB6V52SmOwLWE1fwXa+hiqCqHKpeIrRZT+VR4lmAQeYzmWFz4rjtadwgqLN4aWjjb6IX+Izjg6Z0AnsKdlsj/+488wCPBv/wtKwxN3hEOno1rcfuDIe+oRczvxpIHNrLr83v8ZFnXvNPFpi1wv/OMB2dQcnRX6FL1idljEXbZtEOJelL4Dn4k0Lj1eH+P/aukvtVtMaGbvx3QHzF0Xscy265nzVQUENo4z7lUhvEBCTcLCwxU77tHG6KT5gYByuVPAck090cnNlZ7jSS58t8tWL2nyIlaaA+8WaIQA4UDyQ4tp8epSiJYlLisKnQrrvqNUB8VuDwvOC2kRkrE2fuME6ZNJC1qsd7NGgQg+jZJnwlHsVtZ9Y8jEPYitNg5ZrbjKkrFzV+1v0zMXgRCf4Q456ariWRM7JPwgR+kjQMPwOlX0BJzBXNbCtjgZZLDjZ6FBWa6xWQDtF4kNVlnl5VATMJgEkgGJB0LktZnyZkvP+JxUwnIlzea1pNc6Mtygwm1rYbwoVoqnIubRdztPxneReF5cuRhKDD8orCfCjyYuK5jv4Hn+9RCRlzrHL6gwiXfCPScve1eRqb04Zby5vPPjfYcghnJlbgjfLgNkuMnhptgv1t0B8SqYmuENUDddwDW7574nFPCSZdM1COqUt72aHmn5KK05qsveS5GAqKIaJn+eCWDk1YtgLrOuL59imI/jZKkmRHBgD+4lAWctxUtQ2NNBvwRH+iBI/RVLmmOtlYQaMKUXcqqNvK27tMUNq4bF+KqDb+oMO0+MX3H7f8xPzRpHTnZAUPPqlQpZPuouyVasnJEwd8JQrhGyh50DohvmO748/9aR3OAgq+hHkcrcUVD5GpF4qvQWb3g/D0YveOalrbut3nOA6hp7dUEI7UyhQ7QqsQYIGReT+38joYGwmqz2GigYPUxbMSD0X1XTWfIGyxyp7344rHPi/Lu6jVOuj/4pC+aRUvvJKgwc4ZvoOE0e6KtN1bZ1Vn7k0ySys7WZ6RBLroT2VFrEQmIzSLr6Mt39OHoo0fVP4Qv8g1biltvUhafEY7Rh1iYt1J3TP6wX1nEUi9+GbWGn78OhHgQilgxpk4RsX1/Huvw8a49W3Mc/5x9hFaVdTJMF4iL9SwPjglrTzqLah+lAeoThKZWbojETPXct8pTXbkdOMtKLXxSRQJvIOypYsQ8QTYTK9cltxgnaxgbXaZDUNEfp13qrQ0L9BuvlcviW25tE2poI5cSWH8CkgONLtPtHpQNF67pGje98h5res6AFxhrZYpxFa/BtbxmDcSHYM/YgiUbIUZidDoi2bN2IayJ+FlUSnwlPSdYfS0fU08mHZNFFTH58t+6GiUBIkkFggOnC6LoM9Bgu8M6MFN61ZwgHpLEZnyqPjSEBf1F2LA4oXB5t225LtMPLm+/Mv4/U6fD3XWF4mXybn9cKvY9GIwT0ShhNG988/9O7PoPesJdbGA9gWtkVQD2iI+Ic3mzT41Jbs3OfrDccbs45bt/kzINz+5WWL3M95RzGDZR9NPVFQk22CLSWs3HTnsE0hJRQVM/QLEx/Worm2xBQg4g0dMjt4UQLfrNmhHDWVEKkWYy947Ez7cb5OeC/4SGFXDtsMsLtxsqNNsGnNy3ZLcjjIIqP6PDkeQvHp95KelG3UnxaxcXuN8IOn6qMfbUIUHk40ENmzPp0CTdo5rEuK2WfDgtND9J1E/ePpqoyT2QTcdgiNzEf8koFbKiQnUjMGAIJWawSBNLGkFg1vnRiNXS7W7zYfN+B5I9TPaDEofcTQxtffgsHl9zouXRwSthIDedUH2W3ns3U4KzcveZiqVJKvYVpBFOR707EjfbdSQF5tPzgygy/KZ815YPCfCbR6pEcn5+j/YuMJtxdjbwECOZh8KxK9Jx2YP7kDPf+NTSS8bpM9S1g6bdKtjVl6r2KpM1V2ubXLlPKSi0+em2nbiFR6tyaffgdAGoMH+KEVyqU3ydJrM4xpkDzQ4FxOJlpoi3vCr8SMpmrXYJYplFGU7DtbhS46NVjcneBfPrmXlWx5vtXwf9CkJDKBMvo8r9vpsFshnN0aV1eyQDYXw2Wzk+DrHoYaxijgtJbL3EkbjNNUWO/HmkozAbT+YSExBjmNZBGOL5lq40wqsOs2e7QiH2KPWG0d0DaFGnzSEqKq93Ueg6F+SFkp7Sip6nTgk6FO9p5hltAv7d5giRYuPDD0TfpOLFJlw0Ct1mgpQtxzqUUL7Lpbfi2i3aknjq04IC9Z76C+orP9c3H4kReBwMvHOHsRLRRqHp4dL16s/+dVzB/DPUTESt9lY1SOhs6qdghdwSOVSMT/OTZfp0G5T6s9ZOd9tuoPBxD6e+0CshiMwLxDbWAhpxqyngGL8ogLU6sH22qj8hGFyHQe6JXWIT5MVR7kI0FPqmZx03qhqHP9v/HBSay39vF+uWnlsFgYO4RgxKWZSCOajeM1EQBmaoPd4SMZ3P2udiezoncdJoNh6Ym7+aXNjFL7jvIlu/2+DwgeBzY/I1TBpP3/fMdZz5L9BMr17AaRsY4aDaze52dCY+5OG/FaSM5dEj6Zl+yRa53C4Z5waFoYycE+3//lq9BA/GGAGci02ZENWA89UxvPbqYIdG7lu+96xLfPRbJ8DnyaKqwgcl3G+0U5K3c0R2ZIL7ZKwdXrdJr2mGBEd31D+UUJwt/MMj8p/tfXE0MBO4rWAs4Iw5Qe2y23AjVFUFWxAVVMvE1eXeIN4P89j4faL9NmTfCGycrnmlRUh5RmJ9n7R5c7pRXPnpTYdYnGaafmvDejKcQH0xUJaNmxfj4RQPm12IebvNf2aoZX/mnmufLudnKQSJVdRIK/ZByYhjc1+ZqmF2Q9lBX+BQB2gZjDyBcFJaUT0hgvBJxxJMVGwanidB4HBVRvtMI4CXVZmxN4ou7BVyOchD3dxTPyJaYU2gCZQ3xEjkPPo6Pk7nqURQmnkX4WJCO/9v4HX82uXJ4iz2lMFXgwy+YL5/J2df9xI5vBj1HWzXSem+7hwlNmQ/XJj8tLlzh7pPsQP0w632vpHZ5h7eNA2CAfkM0rctGWsL1lxWxAOYGkNrdZvIDjtq/SEFY+sbsNYIWA43bea0BLOT3u4ppVtmUzVzhGqfpTNLAnGejIeOeYbw3riOPv/8H3SVcE8yajvGhqiiVFpABLc51qieHJRaOuhAk2TJNHz2Lyaq/eegeHui6rZYCE81P2l6qUuhEqBOI9/YwnH+RUPS+XYnJWD612cV1QltqIz9xlqT+gb8+xgKa/i8XrF5U1fFlW2GxE5kIaH0vu2TJs+sVp8YY6XadjCQ4lA+2qCt7a94gJjIX2nZMTao7JW2JuWJvxNbS5V68v4owtycHYwjUdRRI+3FOckre8pWMJFkGI6yz+ju40gAbW0xOvSXyZTraGggBdu23QTF8C1OUHsojl3k2Yz/XM8GIji4FelObLYVOpx+QLTuhSD2JBovrx3bekMxBm8wPJoiE6upAM3Y5LCKVeK0krUkDWV3oNfYS/SAWbyW9QZb78K9bsbMB9GCcLm1BT6Ywi2Q8eqZJ5mu6LQNh5WSyErbHdCiaL6SgkBmA3EoLCpoMRLgDGFw6WYptlfXZFR55wXdPEMsH0peAgGSR8B6Ys+4ikweSmt0DWGaI3ATBAYy+mk4n04t0tLT6aswHa9Syfq3fqySw/Xs6NtcLp+Kr/A3JZdoenv0UnvBZHTSC8R7lTKXDC9Ieu7mL8P2MkGrpGufDetNE5TlUvfbwUQKgCH58SHpBwdEOxvXfOdkrbWlm1yCEiWRluRySMdcCSS35kzaveMSqFz1OWR3amT6TBb2GTUGaaRk6AGf9TEJfYFTfEG/0YuS0MHEBGwUUmV21VPWahU6A99Ap49XxH6xPrlM4A5QFNdkeMLumkrON83fVajJ6pUXmJ+AApN+FWcCc6VDlxaDsJmYdgB0iaTgfKpjQSAE5Q1E6uXFgLEIi1SG0oMHm7xcXdTaxhWAKVN29jpogGg3mxEZfGW9TjYz56SG+SxLcvh0EykRRrsLPVkDTzJSruX5FEqARLE/5zl+NxPgiXrMTL/hB+RGC8s6XxCrdgHRnDQeErhbsIjCTKrXDfXJnpf/kWF/eVeUAXwF3MXlyaXf2YcgFFcPFVjjI37w3saIKKLWZ/YEp9/eZj3C+yYpwojpwxZ6UMOgABWpaiQFK3HR1GK7hjFAF0DOicxY6rOlY3eDdfXCkJxI7fQr0jZ4XDqJyIzX2Ga9eCADgPS8k+nI4qYQNS53D05eNAsYWXKQ+b/ATSZri19VcXUiVbcsr8zH/EQ4hr2gu5qlpn7n4ViVHYNOfu+hSz+ls8DpHTkqZAfaaSx1SZ5n0MQc0m9rmIpXfVZegCVcTrqvSD/Lns54PAMT22Tjt+Yd1MvvWSxr7aRFPPrgYgVa0QVgStRWp9wKJJzejn+YqnApQUItWfW2YwQ2AG7H0peUb0Jnx9+ivebPb2zErDoOgdw/C20+TqjOc+aaFpaZLQESvawJXclUIBKMYOMRLXoslKXjeqjHeGA6z+UMWJ596C8GwR+HvMdCfb/fV6wCiLO+nM4dAR4d/w4e53/Bx47AJZz8WjO76Vq7ROUXix1sv9cGncVo013mNQzbIVeJxNs5i1k14xx6yzQqzqGH1d9FGcd4Dm7ppo6p5eT6CVe7hzsj3xZyZtJrIL5uC8jV/g+kesTVYogBgMP8dtYPtS2GtvKo/CINi+HCIRNOUJS2u16IV65FRM1c2x62/qkpj0A/6UE2pAjnZ6qQPiWEVzfpRDG9pm1v0l7M6VnSzMJy9bnXx1Duny3xJeRugnqFUmkMx+wmxuZcpRlV+dzpXeHdS4KIEiuUZpUS+XmviAtpjbhvWs8C7sjTHRcbF6eDHGNxDTiQmBmWQ06OMcpF4txaOB8X/o3yWH1orFcSXxgyjwrzzKS1HrA+IgIFOW3w8YyeFuGPBaNPGVzun+Z2b1l9KkY3wu1NttVGCaQOe/eP7JoTAtIjMm1eiyue4B6svCesb3JQ74Fl5ArJ+O7bTrD19WAyBVGAm6G6wAEBWt6+Y6vAmuien5xFBd/IcyjXJc4eWF42l7wUCU939nQ4sU1IrI98WCpGupcdcTdIF+mZHfYgIRmrzMdH+jbKilnq11BLq9shiqxr3lNQnhJjtL/jMlp+6E8hznvn1V/ixgZ1Frzee2ZD8ynglapILG4RAdMiy3oB3Cka33HxpaQ63PNAVfzwWPxFeHFzg9K9EhrY9RotyjZas9gCl3ZSCCZnORybL1lutgwrfNqq4Ai5sqN5lssL9qflzemqB7k3etY594Q9K30jPryVcbUbGseACWfGXZtaYkmjP/V2zGdVbatRAtCkPKlbOZo3J9C8+DFn/IqjlSb98bHGgcqSrtV6k7TzfCgpDmSuJihQNDH8eewh/wBIM84GBzOYYpDlf9Kfvr5bciwzdIVyZXeOtTYyhPIKZgG6eQZYuCK1zpPeRF98OH2kKSXEaapqf33VxJFb6ojtGXIEafEEGmZJ7dKjGNwiQU6Vdb2hPwwVwxBQCJjVrwt1mxx6kZwIS+LrVtZ94jA+RjKKmhEDa/dHGPQ1/phHZcTaqdybO8yAxZYqAFP0Jp69r0a75Zwdn1naArL2KNGaodXLU8OrVC6bVVSCqHZYjQJM8ij93WsLejM7wtdBUR7t+zBOQRvG27KwE4eeSBAw7NH9DvacGPFlkkkKb8mLwBnuXNYTUHpNIOpVwZADv2KtEdRtv1WpIgAF5c1A+RCwLTP1C7hGEqTjsXE18eqfGAkARIK8kENcYnoF1gF+AsBhh5bJqNr/Gdsq2ODCOn8Dn6YdHJ1wnlLA41r4/WQ1IrJgFDg9hIAFLUlQsiRlRUl/oQ3yb4VHYWROLpl+h0+rU8j+PzhmNAShEuunKFMpBResxGj1PCKoj3GAkqFi31VRdwcauVmfEfMxE5BjTCU+OnWG0bteZrmlbGajeRjlN5DVipKGAvs6dPOXNbhJ4T2nZzogsc7Zh8vwlS2pH0Gqv9VXc2ObTUt7AEGo8WdLLWvr1umprBWAv6y2pMdla8BMjVG7CPxPNfOs2uD0D1G9qF0KM9dncocPr428I6Ug9XH4M2Ak+SMcgwiGwkKoghg6LRovODGI/7KB/reMEDCa1tm8gjAIkWYb7oyvdyA1gA5S4YnA01LJzA8SslAhqz/o/L9a5/yjWAysfitvMFe6NPnmRWFScpn8ScLvKT11xxnK2P57bQHAB4EHcCmKUY9vaiIXZh7v/DejDv6EN75OxOVQjxOW/O4g6rrHBBNapZj6RGQvyapn9J4SC/+6rK2FjCybbiMP3FHoQ9idz9ErgIG6HzxmFWdJHMKg+OFBimGqefhyOy2XqcTLuxNXWManONsgmTeGndQrwFnFlSZw9LhZ0Jptve3BL+vF/Vu3+F+ngYYecr3qJOBlUtMNf3Hx8/3pKvRNkI7e81Nut6Npm5yAJEQiPv480hdgxBKvbi+SrQyS+5lxd2GMH/PSiOjjUBlFinHWzLG3WhXYmjEmWiI8EEAFNqneGoHjdQX1aZfHwHhaCbyCOhOcCRgpJsF38KkgeoDLdoMvyMVoElvURLzV+QUkNj1ZFjfAWrygaJ4zIJuC/cwJ1Kp1l+pDkQ0WtPziGmekRAm+7cUZj2RsrQ97gH7PQLyv2o+IAhxEaKxCHpjVLBey6ieZgapbLy/wingYwPl0BoLcGoIC93BvXRu8Nmm/3P4OyWlJWnpuAeJzeNiQaQdsy7Z2cfz75WV//ivVff//0/31CFLEj6AWH8cCOVPQhOm2CIaXgg6Rj+D8Yw28aL/ZROJItV4Uhadhrlyjb876VPEE4YyBU7BdinD06DX8YQVIi+bXVKa9rlN9HC7Os6cZ3cI2rFiuRMqU+eYFz9m3pQR5NFJvLQa4nUfQ4OEiaSieU8OGJ9zQ/FrkbHKeGBhcXpIO5waOAT4U/3cZUZjrMAhzrUseH8AAcUUunE0GRw48JS5fRuUvGFCDqBd0/Ct7Sm7Flj7gOQTMXbRVvvAKvXCsGAm6T0ewz2Murje02rUGsCdO5p7GHqs0rlq45geoPP0Hp8pYkotEA2TuWCcmVm4lmJLWzFtMEt/Q9kSb2VNA/yIc+LiDZc5HldPtSHR1TPkyftfEdxH24Y0xhWtLFtB/eh5Zx95F+eayQAgoyJkyWuvZ3z7QFR0KaU738+x2pwClPbyCHYlwHYp9yTOJnG+U526/kPVqlH0Nu1mpmwStUAjjAYuTNCsv3LmpLlVVkGvyZt4sBiWtCR55BzrcRlqm2DTQmJQsWzSrSmjDA8NsW9QqIp13QMsUy6T7pcqvnjQqnelcHuYH0i4mJ8z8lwLwI4l2ulr3t6Z+K/0G3/Ls5reMM2V2mzKRp4GAyeef/20efUZ/hOE6vHwcOyziPcXp3pb/DTvLt8jzrnmgEs0EDw/hI5svdC4FY7g4jO4Fqlq9Hq61qjbw8KkLZz3I8BBES7VO4c494W8a/GlSrlEm9YQ7Lrjim6h9C+RIvzFuRoxUO9nGZezGyozCUqe0Qqp2pEpprOhgQ+aIoKrA/H1Vxyq4XrekhaalxpDMDiBPfOU8Nlk7u+zI56q6/TiR3z35gBxi6f/c4ndXVci8kg4V0xzasSKS/VZfYyRhOivN0g+JsZ79jBLkl9Ki37NBIbgL4PzhwaSHsQBirAprwLuVpencjOtEvl4h4d7Pqrnysu/Tp0nRPerhULG7dAHbkN0RoWlHNXXCX9c/VisiUdlltKo68BI/i4hPvqhYFf9r6X5a9g9bOA1/oAaIJxzNFr1WvdALOVtXECS5TMx84AyWIUppGBkRkLEw7ftmcdsbxs+dOZCow9lp2v6Agt3JOB7saPfLyT5qWvdFMblixJi1OdygzhCl1kf4BsMNOZRR7BVjcXns+B5CsIYgxEVvig7M33scvJ+XjVEr8HmmRZIIasRGq8OMGSqpRNyswUp9fBW+EeTNz1bJqh3MN6jQAIQ6+H6JqxRs2QZmMOAZo8/VTgXx3QDTQeaS23j/PD2P1M6rCzdTHItRwVp0hnqn0ATP2kxXSc4uCQMgS0gPjt+d0mgje1VQuAWLBi4qB9i2iL0fOemt5ulAqbDmB99PG27Q2qcPTgyAYZ1dERmaVXR+6m4v2zwMrmoJQW6L4ULH/xVB1gGX64NzuQmMLdIxsGtZL9S3vdan1LPxEs4OqjaLRZhuGx798HnTG5NA0+PfpZ6Vp0B08Elpz/gDvNY+h3PjUILFVhacTmGQ8G82ddNNJVVfJSjkmaRd6+Ig7uY0Lr8Znsot5PYvEqE3F1GNyfeZ22W64Kjl41irbvvUH9ajG5TyiAEuUz9jfZuAsoDQ0WdlCydCfr0f/ZwxbZ/g9Szko0TqhIXcHRGaFPYQHQbXDnDDSR7q9B0oPMYIeGEMraZSmtFq1SFDR6gIxdgV87xdx/XtEnEl0dCt7FZaVWGyEuwg/Fje0Q6aBD204iuvmd1oVU/XyZl+7Z9Mc7ooazjJjrPYA4alPXMqapAA0Hk7+pLD1bNU4FzJcNsyOKdWhWHrrnme2SICrPpXVPHfG/0CY6AXEpU4fpnnI/lHTn7m4AEowVeSsIhGTofDKZn0PmxOiabPJKiKeBLj63sLWri+qYW/jABGQVt+F6Mn6TnJdwIwARL7arbLg6oV8zQ0maVTMScmwWGg9u87zBf9me0f3gvsVEYMKlf3yXSyJA59wq7jn225cjS8BB6bPfKhrXTL3BHSQcT8vMTERuuda9RKtyypQXTjBYJsRGtXXsGXZ44HuuSzFn1hwLjzhdTMspo84kqEl0RZ8O0ugkYCZdyCj3lNbdY/fwH33JpBvhffZdOjSCsfH3/lmYeIwNwxTvIuD3FVGUwN0MPog0PpAJl34eiQy5mRqUIObHKytoe/N8H/ROVQOX0+0CvRBirh6PKmRnWa+ycrTar5C/JULS5ybFFvnmjfTz5xZD5azxL30OvfCpEMaMwI/PijQ/wCWZ6EzKiiv9UEZvKcDjwXGZW01UITE5jLUKpeaBmNGnKfqHgGcM7wkECPfrkkCvkKA/yxB3xC2OU0Ss0x06Z9y8MTEuRX7chWdZ/QcY3P8Twki49krtI+EuuSPOVLExWtsMAxitRl9tsQ+pCFHxGVCw5GVNIl5IMpI+uDwjwgc/OKzAww8+KonnN4EDHOFg3yMmaV9H8jzkN4IlDCGBiVDbclxkWFMR5vd873lh1FTwwMdZ874y7b/Lu59e1ErILf+iGrbc1edJI/r5gjYeEI9PaKQ1yWufNbCmSTvksLHttZCa2sj2Q6twGRHflhyM0VOIzVayAW1wtb/E5/1YCDYgIrUDK1SdHRir2xzOa2WKhcVrVc58+A5TuNHHzMOG6/jLic/cBSyRo6hBGXBTWBMcBaArUNCt9THcnNWnvVqUoA93YFp469sIhLn6iC+k2NuB2Od2IfhgvHyNcjgMIDBTjr7lJA+iBrAIqxsEN2N3APB6pNiiFJA3W1jzepFPZJnf9BJK3hf1EF4OcXr8L6jT8yw7NNKoRHuy5ngOLHFeknwWn3tOauhK/TT/ClFLyLdczI0ucuUDQX33vBvzg+EBh3za7f2jji92Lud+vQbVx4wUj1VN4/Rv2MkdAzJWJkxdhNondQILn1amQlGXBWYbr2cIbIXHllHnK3GJfl00xIfgoCcZPJ0ayJtVaFSfc3YKSjOViHesIRYnYDovOKlnarK8LB+llqZQtvtPaxiY517dw/7Sd55BPNvqnjo47uNOEaPpIsG1NmIvqI1OujO3m/jHJyOshZffDEDW9eV0KAJVtKoXci+vg/25t/ZWW3k+cQrajZq5klZXfUPZqWSll3fhHAmvsKopZW/udYG8FVvLH5WY+YVUsIJOAcQGmkqpqXtP+9gaMAPJQCyzSwIhEIQno8r71hicUS0IzFOvv6qnjlg56/H+HJh/y3DUXz7YkoteRc9fzF2fwIjLH5CwNTxFfH10YItefZu7xOdT8N/6QPO6YB5z7Y0g6ybT0l4KAjUBmWV9PnoAVLKxty6jqClIRiVbQFT2Nfb8IdfeaCvKIEwmukUTSBcsRKoWbQePaTw3rB2KrOXDbbZvlkaGcquRcoZI/vG4Yin90u8fzPjmlBhwwum00x9iU/MMbjcyL0cMXsuLe0JuWdAJ+IcjAP3j2kz5Iq1fRaI10jzOCk8UVXzMYKYTWLZ/ny6FFa6PvDfahGR9OPfIefjyVukBCakF5Ebeb2KlntLrlfQS/oH+Kr3040986hNXb8PuN95QWDzAXM4DyGILjJVrUiDZCeQvKX0lLVJRz+4QFhnwokur6MKS8xlBQ3AQXyQBlDrsJnY4CLOvkweEoELMQpLqxhcmZdA7Obq8dejs9+Qd57hQDfZvVcrHG22dEzCh79akaxVZ6ttDsOo4St2BFgHSdOroIgTFPqsGvs/XDxzdnvOImXKYEPN6EJ2yZKntZVJWbLt2miw1zdjaWXf1c1K3RCvvs7WkliPvqlA884lbmqw+PiLjE6C4sUGG2A6rXnYIBLqFbQINtEETTdAj/BZw8h+hnKe5t93aCN3xbR87vW/ddOqJ95aNuXCyzrx77INSBDkzIvpmlvfkuZzuNoNkStDVcbQCZmlsv/NFHtKJutyhiwumgGetqE7QvzuUKrffqCOwx8u9D+NG4hJIrbk65dziG4hLTPEGYlW9so9+lZqcZZLKMGKmIyO+JW0SJyYH4uSBhFdeKPqCg1bcxqDGE1h13eBwl2k/DHFNEcqcm2q/JXj72nSTR1hlRYOcO64cI8RkKC1avcvo8v/FHFkLwK1cKwtU1qHQRSLHZNdkVW4AY2rJvM7v6jUkqd3xfvyGd45NsLiI6EeQ7nqzLPn5UO4eiQYJ7nI7m2tT8LRNjG6roZiaFX9SGkNY6mOKfONR2Mmf/irUT9FoRu+s4ZqDBl3NSIfFBsB1ZcsHyTGyzfQKONEL4Ri08HwPIqox8iKi7rB0UCvb3mcDDEwhT6qlIlmRAjwyM0uA1YY/P0d1IhWYvLRzdJ7utHJGHopfGQiWXR5PNyjPuBBgcJlRGCwXMxo9dTjeI4+Fhn0+zu/YfFym7KaYn+jlgVXu2VkFC4Lc9HMaveQnnjvw4gXNnAf0bA4AURP99t+BanH+Ga3zAgQR4tzy0ux9q3Af5Ur9XNKeIczAUB+3Pfi/Zm0GSfWQ7SO1JP7Ykxe77Bul936GUa5h7fwbLgaic8aPPdDe4hFc4pbMmzhw+T183a3VaXtpPxwZZQNWgW698EZUVd3iQXNMxCKSnT9+haaMPQBTiyNXr8dSk9DqioUPxBqi2EiSchHzs1oGK5A8PjI2svnPZMIlXFXS9p7z/OncOHeR9APiZkFT/QPvgTpllbLwpwnLpRkKWQVDDUnHplM2v+bla0GcSt+2t8vdZBcVu/Qjz/he5xSAkvGLDcm/2fqIDXV3mvtVfUJQ89A4Ub7AVQ9JLoGTlGsr/oMntTSOsrx627JvZKOlnCGv9V1CGg0lWlblzm+eOfaSMs92WdRcuBe86lqBZn2xE7Rc2+l9ThJhKXzO6d+FcG4TgjtPUKkazWMscZLIdLFNaOensNXoHBpnAlMHQ21C7fR3hSuFA+CvEV1hgyI+YIb/+woulihz28680wVFWkwYDfwgHateQabqcHDZb4J6MxJP92y9E1qzMRpuPQeInYzUcSp4/gIps8kffoLH8c4hz6V3CEQSEm7xr6GVI4WCdkr+tibT2yWlY+0e8BUuIRURWVexNfYkPVTHy0hJyDp8bcMcMkXQ9iCtMRXmhXWbBG914RL9qLft6R8I3VYxG9fTDwt84TmXx+hQxNvo7My7l0bzG1ecfPe9LA5KnKOl9RKBi2iYNLrkoqkKNLeRFMi3mT2g+IzDWmE/LFpExKVRQA0vKXzSd2CvyoN6UHa/gBEBeer1ie1gblz+z6hVDqwnPTQfkKCiMgRCUP+qCBRZtm0xx26DUtLGRHQrH0olcKTaX9Vh0CyZYRpiZZudbUd9ZmrFm1kHEOgHj42BmHkvvQr84yz4eMmHRFL1BKmq8s7m3xxCpkMEURZvkajtYxCunl9YLirmJbpwX5OwI6+ub1vkLnqsYsalHXceEXLHSlShtT4QkhU38dzZ3QMLjoyudIZ5SHaLx6UevDBz3cdsdmt+15j7ePcv+lrz8PS7jeWoJuLRcKzwv14b2Cghmd70m/crCaFnPSh4K+6P+FDbEPny8J9/e+YhQwIo4VvIsVxHlBZPbqp5fQVn2wErQOSQ16pdorv8e14Z1Vmh3seA6xwOmH31qOIBbub2whqFC/xMdOV3gyOtz3thDLbK4wXb+Vmj86dJ7+gCVIhBEWjhAOLa1OzpcF3q7xxUhKiHIN6XznDD7gciFlFpv3QAh/SkoNnJpVaoJ3gUgowmwHe33uH3Vrmj8EHLEdR4kx43G8k6l9PxfbCWodnzFFrSW89wIr+ycGRs1p6z/BiMkGJiLR8/qvUkWXkUjknBYCIDp4Yg20SOfaWvpOJnqEZ/Kc9I5LXIaCVLzYaJnTLgfpz7+ZJtSlN2IDkjXh/MHTxhbkPfvR9b8SkTcjxbkGai/CeneP4M6VADr6MrcSdwHxojkZoESDxhem+T4BqfgHzrgyWsrNPc9CJDftexcE4k/4FifHhshYSIJC7ZaggVENG4zlpZz2iomJ0Do5VHH+qFpO85u35CfrVrk5qtns3ffHlIoQZ/gGkZ+XbNXHWnS1VIADkb7vESP8tKPsLRPDd1zsmVUZ9wsw4pNaFSH8rjRSfIQcb2YQ+KR0I2NyivdLTuecNc5q1jpS4+NU7jreF7fQmBh2gxz4X263QQcyEnRgCNtkZYQaV9I2iMveHJr2pmBGbUC2vsX6WwH85Bi0RyMHYdtxz8/oALFneHqJLB8pAdqWxnMvXQp5Zal6Xb+E/NqJeXK5Sl2a5fbqC4k0s7jV3BCerxka9C3+zmLJOVVW8OqhgQtf4jSUowyAj+hGl8gXrPoeOJ0bXo6lVkgYCGPoeUAYYNV47AQDYGpYvCVntqPckBa8wiDTm+GXiHPHiQnjsunYomQlxCQPbTEE9zqQFriWcggeoVYkVuz2qVV/mlUSdJ5oFMUPnSjfM9Nd8TMn4WfW33Dlv765v6UIqAW6EQ8UX5h7DxoNwCdRuzdOM/KOMzAjcjBjZy9VcgHcgIosyU8Th/SqxbJ8TSj4qMZvY81MB/BSxT8aR/zQS2wmim3NxVE+qSDWuXsDtCz4o7zFS/a0ibbqqLy6ISdW2frkj+FT7Xdy/ufYkcKhPYPPJZABdX1HwPl7oYWeCo/ZHajHZYuP0vFeR4bmOkpXa5lojOWLlDojATR0bl42QXNuC48XPELwLgzKZF0rLVcrH8CqE9stcR0Dgznyyu72uUKYvU1ELR04kw9qXo3HVmXX1fnZUScTkfky3lQNiYMdfo/SkUYUg5lpRyM2c9/vDBvX8bmbLRNLOU0KhSa1GwTquKA9S8gFek01tSVTFcsETMFD+u4EhTOaUaat8vbJ9H+oXMOB/v8Ch2Uojs0XdPn3WSIRjSdtaGsKX5JDkGnflOIbhYNuAuotC81CqyfeVzBNBlmZOWIZJJBNstriykZq57TRxPZTRHsSH4hluh2CCF1oUe0PLH4RiSRO9cwM1NTOWNq6OZdl8bYhhbjmGA6aCT5QSaPW4S+CrymTAaVOUFcpoabZtlTQICBYuTlmPuDQJC5hnWoIiVCQX2RhQUYsEox68aSS9ZUHkGfZyma/BQA5+FkTTZ8eRo00Sbhoq3kciyd0Bu6/uIehAB1IOB29y0qSQ0+I5Ps/qOcCe3+1MzdamyKDEUSFd1YoFPZPcADjEG24PiOZ7VBNbrVs8Zj3WpA2z9vrweR1IaeQeyV9ndc9h4nGHMevdiIX1rGle7EHfNed7oeyftW5dgcY5D0jjCDsulVdXqUnfRSOBKtCtLDkcpqOXetTrGLTC1VSf7iUbRRzDKu+cmHr75vkXctZzkN39Bix1NVdUcip8npnfbPfrDbpcKBPBNReSA81lc5nN34EEBvvHF6eJIniryRtf3gkKTdmykBsDqZ6pdd55cJc5CyX8Tpi+jfM4k0kmre67KA2z2rGNhAMXebCVd5mtZSLAKwAIYsv0OLJZDTGPeETn9rApv1ov1ZZnbotoKBXpRjclQnA9qX9r8bi4akr3PQ55dwhe7j8SXXefsw8HjkBDr3056qHuCq4N2Jwf8J2PJQ70JAmo3fIawCd61SFCNUasMhpwtOEbYMdpOtxMseGmkRvQubgMwapOf1Y6swJnWYlDMPpJYHBwuiQW6IR1ryiLtw5g9bFXzaR6yO6/LE8CetpLvmTQw+BM2Ul5grOJS8MyaYu/1hMQensj5SW/hPcj9K4SNyWe1IoNajrBRHfgiYRIRfoHJcgaPBmQyeJyZeWLnBqmSG2BTLyD5QzDVkvd37GnofBcn1jtVtWgEVCFkF2Xgo/xqkCR6AHrO3hufPSP/iFs84mVzcrWF9ooOYvvcv2U4ga/r/zUKpINmw7YjoyGQlhn+GtA73aQCCY7w1XarLx15FTXOW2hIiIqyy53ZA9ZMmSaQc0OUcdGlR0a8fKYdkMMAc6ecVThg7l5YOPTSdETtf5c9Ft1nuOTkbQAUypgPgUKNqA3riiRJqaRW2gzEj7/QhOwvwPphNRSnlQOLlRgHSeY5nTFkTTtyE2aW8gszNM4HyOzpNZLmaz96pd9Lc2DI4PGXNLFYfj5wsxUI5lZURWbo1rX4V8ntGJbWosrjLy6NDjodjI33n7s40MdXszBEA9k0krBoJqqDESISHViYbPkXGBPST6b/Lzl3YrBnoUis0B6QfZRwjpRPE7gTDdUZA8RBcOGP7jgPiwTYT82lLg1f3NO58O7627gaRSv4Vc8xfHj14WGU2pOE+9K4whVYGA+qj1CINUWFxsZsOa7W3oFjUBXcu6AbkZnpu9iVK2nQKDNJ+jURv9ACRy9TePV4LfiWMPOIIdpimWcT/h3X2jYO+fBqxxJ7tF/pqmXcWrsaORFrwU7+/4Xj2TfuDm2c9Y/Jpm6FcW4FXYogUnbCvSc7vhJbBYGI4fhLebwTDxklCs+ZyJZ9aVoJGWX8TT2YlGy8qdnUJCSQavh2KzhTjsNiBf+EpAL1NjMkgkvUw2Nke7zKdQJKg1xdBoTaXduVYAAr/itWt/JUeeFjAvoYjOYc4Lyc8hHgEGdwHOHNPebMZE64X2Rz54SZ/VesUNXGVlKguurW9QtnykoHflMYV6qmTJEbeTpMKSjLa8Wn+gKiZNufhbtHBapVQ02e5Cv5dC4fSPunCwLXAmaHEeNRIYylJ5FBzctEHgmy6//a9oZwq+z9djU7/2goDRCMUVuam/GOowwvewSo3/06hI02svMLATY5TfBlC4ghis5dydLgHz1QljgUWN4difJRxUm1fHr18ZM8xguQ+oonGsPWWFm4/Bm16/zqjWfEP3DQJwMMA+6TbzHhGJYoovKHp9EyHMZfvoevFy6Ees5H3aFoZwOh/XKHHe82dBc8cooA9Xr/hDxBQItUOe67xSiQRAxafqA867Of3L+4CP2SwQrVV68SSJys/pyEooiuevnNClBWjL3aghCDCkqOEbdPIFCSy3DInJAsyFLtLavLY2KwK1IIosW4yq4vPPBw2kM4SifzbxQZ5IfUgoOdWtE/FaPeJ6xZEXbaBH2/SNEDQSyVDLE1URkhQgRNy84DgqPi0HlhJU+14JmUHySHBUNjUXg9T+dHvGogm0FnzDjOPv7XgicSOr1lTTfX51P10bAjZPGbxz96pX2CGOmZBT6g+eQ4BApcmtxNqzTg2XO1VUW/gVvnqbCO/sGdXuclfA4cBN2In3u2El7oeifMDl3w3/9kOXYSC+zbMY8hMmN+32gYAbS/BHIxGoFeRBZEnvVXeJ8Bk2KU22iTF+YVKWr+vwpdI2fRpZ7AosPRBQXiSs2A9iKt4reddn4Vwtdy28uVOWL9oKBxKt6M+k8MBP9BH4HwqdiD6PnGSclhflL7jMz3pXiea5HJ9KHxqnBLACPdmIEQ2pMNNCVRxQ8YTMMQ0zdh8pvpgjTwNRaAPfECkcrf+l0UqKYdRSzKWcu3Sg2JgnXX9NRID7vv0iGnoEl60Bi88vyPgFu9AsBIzyYiJKUcycK/PgpMKYo/sszfsnOnjzo8kIJpOp/o7Puk1atQnjbDYGcj7fEBX1j6QpF1gwaH1zSyQEiPLtPzJUn8YH+yL31GPwp219J3Z9bZlAiVWtCB1BEe4cZ9+aPHiy0VL+GIVizKqjpr5xBq7OwIKa5E2UlaL6VWIzUW0+aUtNX/FIYoCfXzD8DOZezhoXo+PD+2a4toKum2cByHm6RDTA04rCBjP+bwhc4VV9e4sZvI8wFi8C1tDn/wLuusDohNjUMLfunD5eBufBvbBiIhInLK9wlkr/J9/ObAEKgeFAKSX2bNLD4vm7YLsRk1CC6JHwX4P0e/xubsxqjqc7hLyQAF2Q0f17SuO9bK5e9SbPytioF/8hkCuL6vQ5ilHZ6T4UpmBEN44lJy/QDUyXmDoPypoBQThujseEgAEEt5ENxA74EYxbnlg5rBx7i7aCyReNP35IRnJE4Xt0/pjvpTA44Hlh6hREh7NtmnOJhBVHRcsN9VnineSH8poCh5WWYeASTluSkDI+7h5eO+rzpLTq9xdTxn2ZP8ZrktyvKl6zxYvOH3eaZPf2l4xk2XkztQytTKqviSOEmsMV4S6qKnPCw3JUFb9vdCb2y3E28phAS4D780B+umqQIJ3eyeMpF8JZ5/vvHc6QaAy0rJwg7eu977tH+78wrondtC3s6u3ZR4rSQBnW9r79XBH1ipqbN1YE9BLMBbb+gZalxld3zueR9jko4z+dfaOuJX5owT+BMvc643UTUElLTnzKdMkHXcr0heS8pbXj24BjyfpUqy1ON7i45K5MkqkSqi/ydcbpJwzYrvnjijvMQou3eOuHCwOh1X+WaHWLAK44dmITX0WPqZrEwLez6003ikvBDvX0vK1NCaqtZK5/9OfGIZ8x9e2ZpLdax2c3mGBrVGmRHhHCK7Tf0HqMfy9R+Kl8wiVX7LKLfae7CbXV/7Jrbcnk6117t1vThwRULoU4gef6NdGecXBeSDfJmML0h3Fv+ns41qbgpwgVs2e+1Isu3xK3j9mmnHvqLUloQ3NOzo3YFKqHDg+p+6SKwKmdHOiFfNYCbEGrXJFij4yASR5vlWJih/JILgkwgkrZ36PIeNAOMiyWNsNKP4nnjyDCgc85z3qqBF/g+e8YTY9KDOSOYYfgf5oJ/r3iRVsOz14I5XiG3S3ZOjhfz6aWXIdNwfcg0w7donvXnZcsph1iYDwhVVy3xapECPBKLMFjVg/KTg595OMwZ/drQio5kx7mvWDp6EETETTgveXO0EWTC8XVKAP9chH2vHgEhFeEueSZkVXr6xl2KHNs6It3cwPPv1V3HqJy+GU+3tdDdhG7zZa0WOhgUjDGD4FI1zGhxDTHqzHEGmMfG5fyF+wjqGlpfP35eByr4GSbsWQ8lHh0k2YxuFC9rVGCUG8f5H5u9/9F0woF249EagtGTqo8LpQofNNDI11ZUezwgasgiGoyaMJit4Yu0PpneMOXKKluM1+itbIFLOA4UhJvTCKxiqAb2zxz5IHgm6w1r79Gi+jmnFlCly/SarrbHmMv0cdie9BNNeo/iRdloz0kunni4f7wQFSk3tXJpr1toJglm04yetA6kcB7j+eBGf8fVQpaoOeRxUIZPylWopXp/8v0lALsK8+ij0VoVy72FEBjt+/fLvI3WMWM/PQ7Zx0WEzNI6xQjTt8+cCkbdbMOv6/3yg4/KMiizgwkBBSFAJe/BQnSmOQ0kq0nTBOMg+yNTHkuM/m9ooVjY+i5ZRXXtHHLJOgInDUTN9ATDM6ibjzF6uXdgoOJmiy+2SZcPmSxXmIaj7q08SvssWEFzWY7j8yZR+UAP77NHjsNwrKDTeXzicM8FZWpQ2IevRytdgKYGRyD3e/RFOKyoOaUYQWHwZsn4SKxCR4GRTKahZTMVa/aFiP0NinIkO/LlvitLmtxBy0MC+U7tMP8kDPsqycatKN4leSa6iwmd2GelU1FWMu+qBttxs434Uv/YTbI/Mp/OGb8Nd/K7gIb9xEvYSUZlzy8q805Gyo7T6h3dpOgKWusmBiKnCzUlmJDl0jNKkuX0njA7Wvo4vah6Kj2EwaOqsMULr5FhHN+zH13lpOzQw7q1vmiC72A62axiBEmGQyvCSzEYkZGPMf/m8oY0QixwsoE3FqNRvc3AOqGZejVLJPLY+/zrIeJPBuAvzztTVLkkQKk3aOZDeEaQISfbWXWLsIW1OtVN06vUXICpVR1w1LczRpVujUXGn7x7TOlM+ZOsl4gxSGQCBQmDwgcEkHrFci2sDXasfOz2gRA2xDH5x1PmCzYUYjrRM9mvPqtVrGmKOztCHGzzQMy2SoGfcJ8cznz2BsjzufCtWhsRQbyGAEAxjVPHws16Ncne+PKWNDfFRJZDwprbd2RFC3nCSi6uSj887DvMW6RoNxBZ8kWHhq9hYEUTml19cuc1QBmIaFSzNFdD7dRfd9QXNcW1HJZOICKhjGe1od5AcX0kr6LnNv/a/Wobc/sm9u1GxGxw1F/d9BOLvnxZcEU37uPOJFYFVh0AwEEJjrbfuW138aTRaz1tcwn8tZATmHVsC4RkLaYYoEenhKc5sldzwapEuIMAaabuwwvXwzQ0lcAh+6AnBCJERnlLTESinJ1430rQWMjFuc3rg08SVTLIHdB6Uy+dB4mgWgVszORwJgo0ItWjxmPLgRs0ezQuztBrvANHsUvC4XMubBWSLaL6wriRT4go53NF51tqTHKnLqwTgKgQ6/YJjYHtpRxLko6IYUje+tzC5nDoCKfknskhctvz316pNvSeZSHIpkMTXVS7skbsr1BuT+SnNjw9FjyGMk9w1uqZ5jkWdbZIqsPOco3X7mPSw1rRCSYofOgHeD0R8DSbzlt66ID1bDOE/R5bNKnXpmiJQkR09lz3Jf/6Ac01TsJp1MtU+u29L+ZY350YgPjebyGcw2k7zJaFt1UkHHn/09chO5WCLOhZZHjybsal58Fsj1DVwgq88ZFfcEM5kjTabFtMlAK9Ih8Bt3/aAwxevogtxNGgKQy5tEqduDVcw9mK4Xy0HeCnMN5CmmlO9qvxfKYndQOhbaqgZWwGDUinN4EWSr3K4WKGb1fewUB6JBNjm9elMZt/ZkbmTtCJawT1HZSSAxI2zD81Ng93c/sZU12w+GfDg6AoPiT57di8pd100UEnslNQ/hrY4LWI23wWQ3KWvrmzJPhXetv9gZgI7M1kcaWYwXHmrpHCUJzBOjIL3DlmLtidyFvRRsVnz2rGjV0qto8LrKcS9RbIgzcd7Oz8tpkq9X4JmDRAiMHErqXhJOV0iWuMZrKy8F2OPlhH+G/S03TfZ2mY0t31lt7JthY64d7QphwMWTq1ygD9wyCaAm6aeA+uvXrxrSfg9/6mu5Ur6gxO/T0JUGpMM+uYBmp7JFqRUcbi5MYcLYKC7qwqLBlx2rSLb/9riqP5fTc5iik0Ja82a1jTeR6CmcM5dmWCFLW7ppz1ZAMhRzy3HHDlC3iIZOX4uJ1YaCi2wvpcUVgQlJflcCfpJ4JXAB9aC9J6HpK8kILCcdJIeXhxnvM4BGxJK+bUhmabZWRXk+AuR0Z10VLeBZ7wd7DMSycQ4T9GIFjpCpMqB1w3UBXRBN2Oc29UoNIl478XoRkSYjDd0GurTroG8rq0FBu2qgF9tp3qLh4XpDUkqkZADrqyrnhbzTAqTIVSwuxw6Y/pyfD3HxIcKR5JO3cBbKv1+5lIicRU4OxshTuxEePPkCHP1YOELWXdCc2lmq6axQAB3M+eYTAtt6cnHzSJuv0rJqpL1WlTvtipHrTCPxNnpQTtQSXqV0lZARYALHOGi8Y7XDZCpWtjwRzAIvh6CN0mu+ZXPGrujsyD8lX6HpndIvPwcuYNy6zhfvSGBqSUlC8PM2TRENgDZSpkkACPtELBcPjBS9epbb22g+Uhu5iccAJ56VSnp0reTBKLKrQ7roAuPX5W6ftK/bD1xvst0nUp0Bdxl1PMbU2V+b5APwJd4HNq6Dkkkx8kWVXdNJPdtlg563CJFEZDwEtwgn9jD9v16hs8DdUxMLJQQGWRq/heI3w+G6P06aI10kjeZC9HatOgJWcRZOI53muS5i/jCl2dfV3V2Ar/9MSyCPbAtzHPnAGW5h9u5DvKduUbkh7XcSTkLcvQgQeYtyp/37VkUQoqhhsaZSJqMg12b3x8BWArMCWZkY2ZMNTdcxMZgd2BDJ/uyfRU95DGKvvSWL8pXFoAsqpJXr/2RhPnzjhkxu4kQx1H0Oxf5rjsCOasWc94/19OpxO8Nm56pArQYC8WNwNHM5XehsNYYM0pNvQMkfIwV/KSyYp14oQnw1uNx6sRl1JMEm7AQIszDdKoaf+vKcc/aeX5otbsMN5D+9I5+ICjMD8Ljv2nAAVHhhruQfKEoCFHQZ/VovlBtTOddmNzjjSUR3E7/cPGfaeQ0OIXnosdegGkFczHnO2tCY8higgQ3phrsbLi9EtxPJhS6PRmMkgyaIZCsBAVD1Ceq2u/WUFyfaDU9jT/KscaGt6WcxgFXBGjuaPGsCGdzqQmDIF5vJDvottwOvpJ4wBUwokFzwr5hGI0a7zNaH9VuifoNxuxjE2VT/quj5FH1tjjhHtjSpzIf+/GcFZh57y4fJsaNYZ97Y0M0mf90Dk/qm+R2e6UrH+YMC8/S0VR886fSbNenotLhiaTbxNnPNNJUosAXq4JbIlAIs1NGwkdsOS4FV+aqeMBbzPpgmN8PWM9wb2vFKMRAyjkKLv/6juZLvSKh6Aw3aLFif8sLsD5iuxIBhXWnsmqmDw59ho/4+wi2pcZVXhhzC1z52ZQ4co8u7Xq4cnJ1D5UlVgQIYmBDnXBMCunzgqsW6HQaXUUOXIEyy4B2i1PmAis+r6C9HKDgWpmutXJKCPezOW6/IoZkEkbVwwOxrMcHC7AoVJc7S0YrdgydHEiKBKpeGJDfzirIQ/Zs9BMeHlm7JHQoU9h3Y+CiZKC701b/7DQKm9wkVOS5x2gujFcDATuD9LEqIzvc2ZiB1z+HNNdWYZNxfv8It4/VFaVeeSfVpnoOGItNjLa6MoalSXJfsRMcqdxPe4U7kxzbIgqR4QJn0WXACqOTO3x71AzEQVO5M/MQpmPnbQlN/rqZ8CQwnC+tnuWONmczk8WiQd00IImrnSxakQCoGssB21VFexSdZzepXOAywbxTXnkrPKn1zGB3kV9LOF6z6LFgbhsRvWJmByTW4otYxF3d8+0tY9wBEhekc0VrNm+s+XpsAxo41j0HPzI/MHnRg9yVOgngMgHvcVEfeqzkohQHyJYm0TTCniqBX5GNplS72BCHWTKuZFX+BGbJUHO+dGnpCdHgXRWnZgIx85OEFWBXvHk7LGQ7nblxpIMi1hin1W5cTZhXrqaPb0luEmO4iz1NoTaPTJAq8Hf1Vh8oRMmqQCtst+T2U4r0/v3QzGTx0cp6k9S4ejCau2VRItkTNpngg8/aj6IvTvPlhQAlmvurA2j8Wy+w3xBuCpUyHWNaHxmnYst6HMGJI9W9PJzo1m0xinSdEoO13GCxS+cYHtsOB8eo0CQtrg6Rs9mDaQywGlZGrtapZ1JRST52S3Dcbq2cIH23jBcnoCjP53u4QzZIfEpdWch6RxHtezsUvA1wyesw1jx/w32qo0j0j2s3yVChvpcLYV7ILLY+mIUHkaJCJYMpCYdhkPiSW9CZTu6X+EJ8w+UDEFshXoM7ppLSKFGzfy0SW/viH1AQ2XA8eKBG/E+MgjDiIz7VLYf1OCcmDZ4bKFzlTKplpLFmQ6Zmsjg6TTo+Aqh7Lq/sPt410PxbQa3MyWcf5e0YdB1ln69N61Cnf8b/L7W71A+M4sH4z0SFX7XHEV7TAIYkS1z1/yiC7GttJ5uqZQ7GRgV5/qHZrFQZ1JgrgQVzwhR6Cq9FRqiP2qMv6C27hHTUrsVRkF8UD0ST8Dh0Jqksi1RnbFX1h3/Lwvz+MWFAuYyHcOGJTpJYLXjWNASQUGSWBnKF4bCINwiHTqwPPDgbAkb4xdLrqlXoqtz0Sb+pvcyz1PlZ2iM+GRAri50ze16e52RYs3n7YxiHEqd3/5BdIRv5mTvVPmr5KA7gY98tDDUH9qoQvT/yw1sCyL4PIVFVL1ggxk141US25f78NArPWTxTNmz+/NlstBuflJlKYlNeWdxzAr4RhASoV6A1Ys/JxJTVQIAWNpFAxxxe61qGiEYLrZgFQhEvmku7rV7+WjweLRu7J47z1Y2Lx9TxodaGs6RwuP3Bt8BU+st+sGOrzm0rxqWIhxzMxXA9RUzbWS9ryZAP3pGFoQ/UJMr5IgRP2lrioJwk9VoayAKrXZ0ei5WJ6zsxsM+zhmpvQSBpRGKErm8I1t3mxqyzQUuSs0WglBT629r1jlF/lNFrYhe8qlHixPObmhErM7xDgF2aX58RHjPHJom7kYVLzLMQc1THsbIoAiS1w33XefzJ7f4Et7b0+CLyeZj8TicsO6tN56X/gU6C46y494uYuOfRDL/CAZsx4u2su2R7l7mYvJlTeh2qCsRzyp5dtEzAu5+YMyTLM9a5GhBB0Up6sen9sZs2H2HyzD1x0/W28MaFtfp3mnURynbCtklHWYxgKcZGesx9pL4OyS/0Gf7pHZ6may1009urEZI8oAFODb0XnsMkxB+OhDeuQAYdxIkZGQ/J3WqW48Fn69B3hazrOKC/oUq8BzHkC6cfWUkag4BvMtMu3CM6iofDmn1RU94Xo/ZTgJkCx5RCIa4a5lCLXOO57VP603hoXGxevhz5CnmFqOHnwi0CoGiVwOH5PbRiCs9MVpX6+nJGNX+35iknafkUnvPbbkR6yJPZqmq4f7hych3gtISk3frcFBOhUmpqAKNQSi9r9WoVRuQCu9CQW292w/J+Cj/0FJFXM/EFuPCs8/FfAVaEARKMqXcG/xI3lQldF05/sOPoo20tyVOLFw6Xnvn/feCucvwCjAMVtcBDL7cp8NAP1zjbEt740tWaKPSiBeXFgq0AgX7T2agipdcTpmSA/VVJy1E7x5Bg2dflczPAbf0Pt1Y2dSApDMIPU2Rx7BHe1VoGuEuaocpKC2WMYe/zfnbEK78ln5r2NWNk3mTA/ukntz//OCC3afiEDqkFEN5aMQNe1Pa17E73vuMRDUOLSiuY4u1CFL3fUrS3kjdT1iAqHpat/MigOBVRVA/5a+St9pC/uTnEwQpGdozN0jJMZauZUrD+FBqHFiII16DqiTzUj6oD2T5M3FYTA6HkRCHOJ47gUbX7uNoaxX+R/mn7bNNNMhvKOTL+xdDX+lJFxYUrYLmSt6M7IY/pPASf/TAxTrKr+GiVpo6oEHgwdkP6DgIaymQigg9LPG6Hxt/SyxW+h3HW/C75PoIf5vKRdV8YajT+6a+exSZKTRvS+IAqr3j7npF5FgIy7y3hzk/NW8cq5GkXUA9v4r0DgDNQhCN/Eh+lvdNesAFyBxs9MZ3BD+6MEF+D98r1epIOaJhulyr9qQXX+tYEKabLvu52I2wdGYZlDx7BymXmwN603i6glTtZ0bZ9N7ZLL6VOBWJ5V+BB+386yPJ71yjqfiYjqDvJsML5E4Gfz6f2hR/zUGt/Ywib8taIrooJy8xfGa47Wov3XV1wtVw93prRIJkDe3qx/w34tcud5xR0lXJULqxPj/Tgx0Ru0FdAkpl3pNf806CCbBcyZdX5N9r+JtYfBPayYwObiFQUoGU+/4QOwzAjnrQdqkoJ35T4VNH8CS7Idz+qhB+IMREmJOJhu9BS2evBY1LAPWvGk7ldgMPId12y61b0JG/5A5v/LUUF9LKVFFOvANpAWswgMkteyqPvSngB4GsV3+j2G++wKAYXmcppuykwSVo3GuTXf2/HNhbXCTqGIbbLQ7k5NBxEQcg28JjwQWXNoBM/lLB/uWhRN/nb0DWCVG1cX6Ykjs4DtdE7dJgF9z80c1hZ7HNZ1yn4DHWi/ag8T7SkaBxErfJKq80HnhW5HVSQ8ZKtvK+IDfbKB3q0QpmeB72GiGNFVXu24ryMAMF963+vJvIuktYJzt3tOs4Gcd3WN9aUNSEwVxragsHUiv2HzZ0neJVQPrbyb3zoBwqFIyBB2dmycm6b4COvAQIutiIWSsGgiJAV69gmBJG43bVjoi/F4yD7fYGmVYeRrF5ycl+6iqhtBHNL7r48X5kgZ/BiCmgWv3l6aeggIOf3zeRhyH6QMAdEclrvS9y5jgfwtoWdz1kUlAx2MbWflnpRN24MTlPN7R85ttCFRbUblgIk6VtYzhM5mIIuia/R9ZjrI8caphXYaqtF6/s4ZPYCK15xi5Mnr0nWcSOuSF6CuE/jc1tbewbxFMRGJo6fiMgD6y3LTEg9dipe2ogBN9bMvId3cF+oAf0/5QoI6PK1ZY+PCHaWDGzie8Zoas/mDZVBgyHIGoQnziTI872gMP29UU5IZwOUIl9r3dZsFjQND0r5ZTF1eRBeLaPp5OxJeop2MzyqNnghybFThI/pX6YyWPz2IHAPiRpaBIPF/82EOa0Drp7gPwwNp/1FNVafVDeQjNAJLQsge6x4hHvG5ugar6JpGoBYYzjDysFs5AcDKLBt/ySinRqM26dyGGs8qLQ+SEM/9JoGInFK3yuPB853XbTGWoPVC9L16oIldYZsKWbxh4m5uIOqFRpGOvRPGV8/4bD+olIkcPzfFUHwYCuVACvvrTCTKIDfk8xAD4odA5JiWLfzARvDzaPeBU7hxoEmHJYjdRRYN6SGJ9QaC3aeJzdaM4IGSzpi2xAGiMP6R/9qzSIgHoGdZ8Coyx0IeHMN0R7MQStMf8zi2AKceCVIvBxiLmbjSuO2TX8jx28REPcM6SHQ4Fk5BRiEvHvvus+Y5r/UfV+BC3jNoZKAgqC/P/V1QRi3CBj6s6hPcAnUZqsvcdVJ0QYxgLVnfon4zxAeWV/Mkprq5RoHyXfpcvP3AN0oM8m8xd+UbUR76404gpHrMj40FUvDDvr+RuRcqU1RR9LHSxbF6+7H/tRYCRpmHoNtTzrw3/S0J3VTGVPsNOU5aNZTj7fpgg8KMeSO//rdtSL/Qr6duoZNP2KpvO5RHlnw3iv7FHBjBCwGS8F0Mo2z+5Us2IbIriYVzbGv52DLyvl54ePdqjoL1RfiJL4eHWZ99gejwKifzJrLLuMIdVm4T6rVlyYkKLDL0r7+zNMA5OGK5+t5uifYB/E3Po4iaYYRJk/A+MppWp3TQ2mKbtsFLwVNfqe5l3FjkbAoSt43iBEB+f4IsK4BoMEDUuUMtUaP80NwcfXIhVGJEer9AkXhJhc1s/G5lGVGtYDaJHQJYmuTt9e1jyZScIqjOsV8G19nm0eCZ+8FQnNiA6OVXtiSwNyuwK8/VEFJyTlKkt2FayU5wQs0e3XEh1ixZM/6rk5+E5El52m+SslJwLfzfu+alTKd324C90DG6awohzN6nJwDHG0kQRlqGAFmjHG7ApMv0iq/S+BadTkfX0XEWZkP1eZnCjn7EfnyD/mLXFz/cBC4AWr83O58xU2fYtSRpbLfHFO+fvnjCH5YepB+u3/6Z7Zm92R+1XR1H4Hp+EI6kkQaBqb/jTdxrm0UJ315QyDpVzW5k6Zd0Z9+hlckweQ6wn/8ZcoLFKLRtsj1cE1znXdbMJZ0uZu3ZScdV5fm5avyTFYh8NTorZ9DHqKjxw+TzenexBkSRYgO778RPCOM71gjydTisvYjDQUwuglx2FlFsQglWLsAqnJ8Wke4/Xln03zC4hI1gRyFW+z7eQajuQ1dHkiGBClsIt2KnbOkCxEYtRT3UXT4vlD0oTJWWAywDU8UkxMeiXgFnViELCd0nafaLI3yrSegDtx+Jebm9LP8LXPcequmCP6p62+QmgmaPMRA0Px6IES9HYJuWMNeDLr5I0FAJ94ilzp2IeVqIjluYAfPbrHbiep7WT8gzmaHXVvIRo9DgfaxY517BVMXrNRB3XciUaByPyQ66VapB1ddvyWJzsLoLCOduRPMY2MbjOvVtXKZf5POZswoNctxPR7xaBA++bAbwUU5APSolJfU1XDqfHtJvMaHDK+B2wtzXgn4wghF+8JfnJ7WvzTpqrp8Pm+pBSy7qUIf55p1yWuuKWs4gT1IublMmtpMDoWT1gELH5CBCJV/WYHqO4VYc/2PaHOgTlcpsum3SNRqe3zsi9euXQ3t+ZbLu3hWSlHoCBlWSLrddmtCzwPpE/jLsiflFn8Vg+plqhBNXP9oDxPEsW9Qip+dbPErmbV4OE355esxoDPiXC9OZ9MpaAaM9wdS58DSVkudquVvgk8uh7W/CSWBekPzWK+d46oBO/O9PaMHAvehbg0AlTmOgwaoxoIt8vrEDFgWFFoyPWl5o4FTtXPS4OUBSgaAgo658VU0b5ajuteY21vYY9D7xb39FJkumcZVRlWcDrxRPUsgK+ZacTNf88cfkdsmMieh3GhT83rurm9p4aaIe2Fl2fpuyJwIXR8s98qfb0vS9H5veJHgF4KllWxoXxCFI+nxVqfOBiX1QEpFlcJfxfgcmN+yRjVhqhY14LVwfatrCw+KsdXZsxdlaKx/QRjde1caCVNUyPpz2ZIrRkOTxJtj1ICpdyK/IlRwipDzP9CRfjIVjhdw2qsYHq9SJTNS2EPE6YO8ikivj/qJ5ck2/Q+uKYPybm2WuCf4NkVyzcPMHenGAnfZNsjJ6xJQCHvSm78eloSwkxQwpaUBVNhmpny/kZ8d7dO16U/7lmMP4zWsq65itYWYT2miuBPQIsnHJT+k4Ht4nTQ2XEXfStWyRqMBu+YV1yvlCIZ5za4ImHsradWUx+w99HMGJBiKAexDQdflLHjjolF/+fp0E0iLjShoK5NYZVWNh5fB3NyahIXZO3cfA2nGFHqRh3YiLsZGsNx41Wm7p16hO22ZAQnSSV71nkNa07aitu6Dm0+GI9x/I5jdSIgMDE+WvadPolln/Txa9IiKnC0ma2fKAV5LQLMI4ZmfOrFBDGTP+tm/SyajeglRjeJevCFXfr/2SDcqdUh40pbzBQrLjzZFgDlWPoLEm9Q6jLFSZJzEDwJ8K3PVfVq7+VCFUI8xcAzixfdS0zlyjcKyU3/rOjk1ob3WmsALCIf8dMs2DyaJDt0DohV68L3FN7EBlx/gjKWG5e+9iwKJ0IUmYxjbMfe/v7gnlgKbAFvP7SV/kQa5Bi8yFAUNlqCXGn43gFs29RC2knIcGhhTvehqNW/uAb9XSCj8L1XPCy9PEia5Zr57CUL9VYG9xD4lgtgjWQbZUi8aIG73HWkzHpfU9rsl1ObNGmPcREbnx31xVpS4mdzlcwIhQP7PpuiA59pub+KqVUIZimDacbLF3T11eLVPYXrKtASO1Cz31idRjO5Z5cz0ZzxKHbLcMPw43XHCRAQyign3H6W/4QD2fquBZ7WkrWMzRDzPvOkxxWykQFjLt5ZJY5h+ddi+G8C81QiUDx6RyrlOtAfy2j/rL0a/pfvF29kNtAmD1FCmCoSZn1uc8vQ044ctstLLVGfh5/WcE8IQLxj9FO3FcnbWCXt4k7kKAKMk8x31Tc3jEPGLdWx4pZXX7wRKLKvIBfeHntuNVDBhgQYCHaQAWW7WNvF5RsbczIGG0Zk5hEzFN6LKLOIPfYILH1U0KYm/5mRs5mIqbE1fHGS6Ye3zU+MSxf6ygmtDX2yT2nj+pw98Qv2dWDtuh1VjmS3P/wu7n3JdB+cOHx+cV2LB8xa37DyXYSBhIgblZjN7LJVQnIoSjy+csprs/sE4wvaAm5xSsjgi5FOeXMtdPjpDMMw5EYFwQXQTJD57NDdC/8M9JJsDkZHPr1+oTsSmy3W6YGUmqd9moRJZiX5ifIqXvw4glLfVGquJ/qe7DkCD1V9vEowfCN3IDlbM/eJp7GZKIb1+OkWoaJckiRUCdem+sS8o09s1cQ0mrByJ3otQARssgp1NPauT2MPRqaN3NNUs2MFgdJ71Qm+/rJ1Em/oezmZxJjOYo6c23gwBCiUPXLYYAxh095FPniplJ2rd01LHGYKAsURtMSs0XgjW+agggCD2FM8aH/IYK89F8dWiYmqdOCZk9hgmONxG5s4Aw4x/b38xpnXg7gci1bOUKvahSXrxhlT3wJVR2E9SRZxOR9RLNPTXTCUKQfvFL6fUDiTdwUBbgW64VrNNf0ZM/8Rb6UpXHwPPJ/PfxLxp2cjxvv7Je8KuHpAn0P2iXHAqm5csExSwUWYHOeg58B3PD21jmM+VbVfT1ca+XtzRRVCnJ/z0dNfyWRmJ6CNjl1M/p7P7S9A7yN7Ff3eVY+/Gr/8v5WjssrKw5kZjLc2TJP6BqxQ1SOYIbyzxs7/Pa7tfJgoF1tZF94tsEKb+NF6SXnEM9JHLf4Y58kEWP7pTKyForEOTGcxKvLuC55/yPZUWl8g15RsFxkqu5RCk+b5HotssFkUk0AEySgmX0fmgjwfu+bV0uP1f4hYsxHovczN5H+n37CEtLrD+AhoG8r5zTUDBoSL5QVk4gqQ6Nv24vA/h4N8Bf4UK3guHWj6rs/vYGNvE+qFn0PqBpzaPYI8yTTN2WBtM7QygcqM6ilcYH5apuxk3ICj4wpiQPL4L64mAt4HFj3DdFFpkTqixHKuMufjRMiRHREjzkV2rnNxJZciMe/3Pr3tEyM0r2zrxzaMleRMv7lXICXpPPQ2AWohoMbtm4c6+VOekajZKb4p6BSeTmfplZD8zG61S93lSiIkiYQyFoXf3JfJ/OFKzocLEBTUchkXb5ceEVLFikO7mOrU4DuwtISG0PP/ZtfFLlzwNSx2uIKThhAmOYgv/D/gdT/l2E31ByB0vcYxQnyCg4JHf3OQYPASlAhtlKo7Lxzewi5yRJtOCufpgjMRMS1kKrgz2E04JXUQo0seTQpRYLwvLIsTejLgN5yFgdOn3VWxsyVJvnaeW56smnMXbC6HU3YP8Bmmj5Z7yPALP3gZJ7iG7dpOGaErL3ux6Fu7Ng8GprPTDnIXQ5OYcR4zOetvecWEf5zBI2BtcEegHah+TQd7Ui5A3yopVBwESS0mkLKfOebnky7ihKacEnM6aF6QrxZBwSSdw8pG4SNDJemDMtjWwQvEY2veBK6fPJBva9VFTDSRlHUA2x3s6MdrRPBN6TXZX835ykZcqlEcbAV2YHYvtfi88ChzvFZyVNDgST6PRtVVwno0rajE83IFaxNKrfm3EbMke5rCM+xv5N+TaynxfwHhw2Qw2Pw3C2drdL09ZGpdk5/+gcyGiZe16dMNyE+HKCqgTdemmqlgU7LXVyAxZ3BtoV6q2Ytyts5hj1r6UoR3Lcig/ll4Or5Rn8fUpVCIhj4nLu0AwDJkaDVhl7A/bvRUFJ36ysbolVjPJ5fiJChQDI5oMYZtnEJXkdi712Yr1b0O6TaIhCsk+YRpQzchBY6jecf1oSWKZpHfxr7zxMBDjdSEMYASZFkI9ucPWq40MOKafJ1nnR4bJld/YvU4Y5yHNvQyhbIHxMTu0bxWK2tHsublLSZbdpEleAIY/9QwQsumS34ikmgbgxIakYfKORtAP8zYVJlB7HR3N4aZgxrt0h5QtntIBbh2KUcKUXkgcI2MBtNvS1wApoBHMESNU+ydBbJfVFCOdIiIl6j4r9I4okR0JCv6/qDS4ObasYGdoQ7RIb8YhKzW+SyxEeuhvGMuhUrVgXkxlys65DA4p/s8VNmdMSTKYIxLSC6jtSU4pcS/6o6x/iKGk3dTLdOM+WcRnyoBxQXSrcwKcHhGD22tWTqVXxj6GEgaF0lacpGFiPSjQHs3LdSPJ9+PSNfF89zrp3fUEjSGcVH4Fe71nwo6Mif1ffbNNYEnvBgzGOUEWPDn4N6czbMB38m5JTnNCnnWKjrDpBJz7wKUscJVzEEodSw0tWv0g205EiU/XtrUv41On/c2xBJlU1RQXrFZ7MntueuBKM/gf6w4cKqWOlNo4NkTi9ottMkeyICPsjTbiUNtgGpHDg/nGI207hITYicZoM3i9k7Vr5IY6joEXLdR8UKPzc9W1ngwHOBLuGUtRmx1jT4Tsk8GcigXi0C3C2Uy8SpOLGbjUyhOHxnGZLzLMyAk4bfpNQblJ2IgmOGOVQrXuHqk5LKgJEfSI0hTfv3VIc+wZycYyLDU8pji8f1ENCQUkalqevkxcGBLuANyvu636VHcz5QieYD7kx/N8ig6ufAuQj8xdMWBCUHip2uQceU/fUr0k/BWa8ctlWDstGl/9sjo04eonogkL18yuO+v5b9CDL1ruacyM1pStD5lfJKE4Na/QA0c76NmP/9Kkn1x4R5a/36c3NwDLajzMaw630Di5ZTFWHAMoYF6dxPx8n95MPmCllh0b9DhFjTdzaeo0n7FKWS9lVJcNgPHjjBg+pv/yQX0U9+ZW8IDGBByVg2pJkmTyPT/sMjeD8OxgLSzwiB/9432BFSyp1lzvz1QbZbWFjaKFXr4yUDrJKVYJumTxBw7bXl/UOpsIZWO+1NiZ7nemndsOYnf8lRJy0FCgSK7PtOUhYkB+oI4bN3hPTqOPw+wdzhItbCp4sIAwOfH/4V3QC3V8Ua07M1Hv05V3wrigv5NraNTcLvE+Sqd11GDDYXKGEszY0DP9ubraIGbtLgOOs8QezBJkprArr/Fc9zqQVIofvxmbJH6JOt6s3K5jquSJ3jCGw4spuOeco2GenDtt7/1O3zHXKWda3OPksLpTosz9kI6EXs/qE6R9xCsKS4H/3MbiZbX6dRhw10D15ocqtYrRFQg2BG2gOm24ucj6HKLry1xY/xrtv6GAS3nbOR4db0PBGm17Ywc01/rHyz4PhI6SVYj6O8+Tk2IwCy8m4xjGgC3zbKhRMGXwXlMctTQkuPwLKZvXngbGLbaryW8CsyLLnRbWP2pE7Lvuj8RsMLAiKBLjuHAg3hzcK6yXPAoZFdOdGVnPmuPnL7wbm9Tvc+xkv/gYEdCET+3zQ5xR4YBQlEJcuHXTElEvQ1laaHrmoJ2wZECFf4rEc5v1VO2Fmcjy9gw3zhiiiJ6KyZnSqRMzT5JGXKGVWrde0tlj0yROkLkjUf+AkRK5sWTk4Q4s8CZo+ZuHX65f3aDHOCQWCBDKbUX77vFI/18tNyS3qxqm8i2N7RXgYX9MOCNyACq7gCvjBuO1vIqSmn6+l9BoQB5T5t0QQawgMMBfUCa4KugwTNoiXg3h+GfdEzCwfgUGxc2gb29XpveltRIgZ5UE1SxJ8SjZWv+MgefZ7HS6EtrvcwppTMPdkFC7xpXNrmJYs4roYCNrUfkLvyimRyYjEf4OWAlG0DZpmNaOOfSYd+pRPuMVhZ1QQXqZ526Z1sfJdNIGYcShA9yPEgIdQ0f6rIesAdGssB9f3KvTXxqrSy7vYnPWbenbTHrO1X2jWvsDFfVrpTAwmhAHTsis8wUpphJs+W92fOBDJMRjjVct0uLWfXo2Uel5oUKndLu+Xdpo3dXUX8bDfIiWiGif2KGG/dji8SmH3eDRYXTdwdBvqrJoZIuxH9Fa2enHe5tACqw2d+z5YlssbT2BgPydh1gBYW5Tk2zC4YE1jvd88lBwYixp+M0yn2VzzoFxp2u2JxZzGbmuVLyiKqreosSM6WcTTrw7i7Kn8sXThAfNUp2vaovB9BwZXGAHY1nM6t08Xz7YuGs7MUA/MMHv2B0MXBFw/LgYSFxLKKq2dt1jo+C5ZLlQ9Dpm6lrp2ZjSxTQizu1dYumm4IGBrBNuszujYfrOsGTa0ezJ1V82jsIgx3N4FphLS1BsJQPHc545NTXw8cJKJKGN2jTHu5dUIM6kMBpOdiMlQ+IbB2PfzD+pOUU8QNgPzWOigtg0xKnxzWNTRT9SOfuf5QzoFIxG5h4udzDZMTjXyq7ca+WyAztI1WpOAN08CXfOuF6ytiKCk2ChQXQoOEKsarIG5+gwnmBJW3qaKsuF0+6URVdeBIfblgFaj2+aeQy2Vy2TxazIztJM70UCVTLLGt7xrsJQP2EXJTqHPYKIwwA4FEEPr68pN78WkOFSu+RjqA5lPtYgP2bM4+9DIz5lIg3ik4XuEfy6hiXNHZTFNNbwxb7ARcFOSlyQqKzNiR5R7q3pv0i79hSnJh7RIgm20PjRRrYPgKOuKBgy+ikeNw7K54Xg1m4kHu/rqx870oqk3ZfPAUZLLRyxC2Oyn7YFzwY7UECJF3bhiDPc8CP2hhC2VUhTn729UF0c/c8puyyQTRWI0ZXywJY0PDahGxM4zST4ABhXMposZqh82NZJjysjjGoanE+CUNW9nBO9kbKBVeFivD60Jew/ENyDf5qXKUPuBn4kBiLxGZFZFnLEGeV5IcfE74j2Y34d835MjWHHzVDT3j/LeqdoSuRQppn4gr1ZGH+JlVXULr2LrNTULgFp9MLuKXF2poVcVdU+iAT+1dMxf4/03Hnfv51BrHvJkpWTeV0Hdr4fB68QPVlLsRk5Sss3NsbhumNXMyQMD+36NOupjLmz25TRaB84UnQAUsVDMfm4t2XTUo/+Gmc3Vv6zFAvPzQm36s5418gAa3hQobjUgWiUdNzHo8DI6VLpUBxTZwsEZrY3r33ydf8jMGAh8KYiU57DTjiQfwGFntL3TDWXcJCzOG3K+N8yLJH/flxHdpKUJIXW0sXvfN7Zjm4Fg7e8/kx22rlU+o5OLaXo4UHPrXbGskvwkcjJJsyew8D0Exby1dOB6R3UgL+zxWU9WHtW9Qy907OcKBFTjcYysNl7rhnSotloFWQ9e4jmMl6wNeBprgRtH25OexPjmf8wz7b8vJI4xRuRs2nSln6r/5iR1o8JDCZNdqYn/fm6ASdRIwGUcDdRkhFL0MAIgC8xsmfvCYnRNxBfb17ZoQGVNDGnh2lWBmXawVGuFId90vXKRh268rjN6e2OSlNsMX51FGE39PPEQM9EggScp24FKK8SDGMB4cSfXMhAI+9mLGX/qfefhBVKf0+5odawgqB8TNzX/lgFSY2KdcnzPocX14Uvgc+TYacLT39WcSWyEei4FWHkq5ylOKgs0EvO6LSkU0zEMzBjHaplqkjh4qIiaczZV373Jx+LLaMKcWZxpYTbwC9QjcoKi+byRvQNwwhT27cp88QoGkywKu1s0fifkCdmVgArXYkuAdctMo7M6uInQCDNTg0r0Rkz18remAqcjpoxLTS7a5uWMzQ6DbQSh0+L2RG1+TFmpQcGw/DIsnNo5SfgDsKBPpyWvAMpV9XQQy8EQ8pBPImHfTmsjtbOFPpiL2DCU/Gz3W+xd8nr+54C5hLjxhTUqBxKtCnh/xM16c3XdpeDo3wKZPo+6CECvZehW+7TyNrTEQNEpbWvY/w8/DvRAOgVNtuuBPss1ZSWyEfdYmI7L4mSIwtyPjG+wSvFVUsTfn+pYXrp32EcuOvFqPZzolSgi15+isFaFOid8UyWABlyHqwv9fG/GISQBxAND36dD1pmV6NTNCbBGHYZWjSsbkI23T74CdkJDdEp3QVfJmYlHv2QdKpyr5NP3toXNcb4gQ45LiSqw+dn8EoQAlY4KOWgcRl7/tltnnrJwScMUdZlu/DYLjMYABxKoLsZql0KdV4423qmxt+lv7keyjUYtkHpqYYPZK4MPEcgWu6xAehU4VHGhtDVEKViApBseL33qUkvB8ryb/+/2AXA7K36WYssMA2Hwgc8NS2Sz7Ot6+JkbUagFxGZriM8QwyMv7jwPGmls2IBKSXH5BMhWaEcX7AjQ7H0p9IoubUiaE1KOuIv09eGSUC0j+0553jLUaCLzR9pH4R79IOEbJ9Ithi5Bg3N1mm2pdK6TwO42VQt1MvKVhB7mb88hLSjAjROcpzi0LlF+R0rsSxt7FSQEHdWGSdNLn39rSOKdYsevqRQLP3zulZ0VDkThb4BmBn3J1m5LV9/CuR3v7AkedcSsUfnUhQS4nn36ztoyQCxhaf0Q/gIwOgx0eJEAF+X+SQlJEGOGE8JvKLgs6wwGWMCznyS9/uczr/e/Sv5C3PUk9YpREOsv6x2fvnJr73l15w2Vvm3uy3j0+QS9ygL7pRi4PUzatR9EsJsb5ixj8B9HrqFxks5Q6G17ZlQhNS7R1c4Ti2AWiufWeMIXezqSaF80D+PY5s6aakH5PYfLwCtsohIA5g3kgzFpYnSL8rgSN53FLLP5reaRcb90dYEJAvNQLUDSSibQsoXkTactW9TNzE7735ue3B0rCoSQdheRyrJlBpBSgJ8rBLqEV9bcl4xfcfKbjEdsWDcVDxoHvc80AsDA5EmzWYE9LgV2e9JlaanRiisJenRB3diznSYs/nDyl6AjG7UqPScKkoCGd5iLgH3GOUeJqGjJzyLDHBnc04VmB5HjmFrOhfAiH7SU+ez3byiItMnozMGjzG9HPOnrXlhVmo8ABQ2XmWqG0f4tlI9kY1Fwk0HSkgf6F/63Zvhgo4xAsjOCAUuUvCNx3Yj8itmlq42ifNcAKbyDif7gDQ+5kH8imrIqAdFQHZytKlbPaflUmFDW19dLdwp2HSMfJYL1pSHiPQZd/MAPEkkVFe0ibLYnlK6XkRI+DzDo27RUkJDi2CIEQ/Ash2Q0V5eesuJRkG3RuL4yaaJoUrwLe0Lwzx4Cf8AaVE1DOeCqKEYwOCu1BkRbkhArDSipXAZrO8eLLOsu4KD+jzz1ku/tqRznuAqDDPWYetYIos/YJ16PSl6GnMQXaE2D29CqASi9GZfkjrYTbMBV+WfxQ/zU0TJs3n4uWfedGycb7s3uOW2r5p6kjtyEQ1rooTwvRXxKltfWTjyI7Cq9DLyRFpVgsjJXyImTp0hOOsarZ8pWPx8t/j09ijhfTQ9tjGIhE505SOPcEuHAcSW7pkpvYhGYVVzca56HOz/A3UzfT4ufaXvxERP6QWCaWMhuBx1cr1tXO+Cs/hX7b10rqvsrvaozg4z3HYH5806ghP2D7JGjSqMDLuKLjcWGBZRunWpGfFt0IbMWvX5Rl/GFROh1awbFgg8vfBCK+z8DSPzOkhC+bqd+WDMyRSJCicZXHyIaIRSgJNAK7FGqKFLNyRX66r/8oStGdDvqHcdzG/YqSo5am3wLrDMcalkHH0G4Y3evc6ImrDncMN6Ljaf5ZEDHc/uxpGEpJUxd6/vsqSZdbMQDR4rC3ObFAeFugO0XIuoAaKq4o0fW/l60E+giaP6LoD7dS+CsR8NARO37bvcvJKVaACMVk7q6pwAfStXJ57rmt1hMDtbAFlZacIxKImUVcu36ES87fAwmKfwAQK8WQD4W626iK5XII2mgSOdqPJNve/zQpqNH0E2Fj1lsBtJ9pkKAo92UDBD+XSVQ1WVKuj/4Heywh7Gfs5Oa6zc+igICGS2ek33L0uYtNsvcZy8TRiVbQkZ8ZRcoOc/CUvySLpF0It1SweqdSod3ZheWaTU3Ft9yEQq0LEzlmj0VzdIoxI5ggYOk5HI3xgmN1e0fwKItFhJ5ZaUcFtpQjasFvaq6mXGgHKXxpNw/qoX7hEhlCZct6gbqnP4Xh6gixFrw0lrG//Q2JbZwnVxjQ/nn1BrC7V3FubkuRlwubYQPDDwr3ebltvzcbW/uTgmu/T/HrFu88NCKbFMaJy7QL7X8MYqGwv7LpD8YmY1qDS5iYMij0g1yqTS18joqve0sqkdjR0Pt/eGDG80Gfp3XCfP7C/RQHiSvXONIXlM2tcLbiCQrIzL7Jnm0qhAfwj70HVq0zAgO8GWC0IY5Qb4XaaaQUQz3e7JG6Uugq9iY9Dg9m1aVUQaBnBVXgW16zvS9O3/qDcq8y3zIHNuewo4iWJWs3/odQ2/y1iy8w2CGAd39ZAsalWUtp3XT1HtZifnyc1NCSiiqkglqanbHpR0ISEeSajGY3hJTvYvK+IH+tb3Q5G8Vi3KC0NIw2dq7KPi4hk9ydipivG+VRm1EHBp8DfOTbvjE2FNDRsT+rgaEQiKshw57JF8Fq0gMJ35Sv8gbS7UsE7IXrQUC8Zaxer9yA3PTff9/XHrj0Luu5RZRq9mX5Ro01ZYbgjHsUuebItf5URDftSsN5RWwsd0YCksJy3ACOpeDHaSlemAHCgSb7t/sxn9oTcgMi0u/vX4nL+l3LpGdvnkm1vN18doDuCHdgOTTcOMHVBxKPZF+qCNawjF+GyGP5pEMx54sVqvXLDjx/AwuCDKuBZ3XoOOk5At+x4Mf14KLkXCH4M57lmgsxbQXZ0v9Qx4U2W2U8Glv4Cc95AJ7fpt2G/UJvb21kZQdGWrAd+MU/WkJ7VkM9H6Y5jUzyEgYiYE8oxH+ol2eKK692BXrq3PbmO/kitbvtsZrWX86czFOlIJHv9HKFavuOe89YWGEsTErTUUOvDRpZhCJuMgbqgiULt8WBXbX5J+Qk9OVHyp9Hx3eILqkxU/aXfAEf8B1sJRS1A9QkE7Jojh+OiHfm4rgSeblicOXuGLogPHrCu0PHDf9bcEiaCEDfWZCYlU9eJyUHrD4rHa/x3dph6m7APv1N3gdVlJ8f9CX6MXGqs4ss5h3NQSdhCItuDvtfp/InAlyOrxZ2A0Bp2DOdpCCzVP0hw06O4nC34gc0vl3u68RDbJeaP43NZuULPRvGP8GK7C/QuHW03ZJbHUPurbjp03HVgdjKAAy7PIbdlibE+EfpmdArpMKHEGrIJr4Y2MdJ9QRu4SarblfJ4PCA064YYrAl4l+68uzVcWyPq6A1ISLxW50vr78+oq4Qd9wteME8s71LXm+Wd4KhYcaxwwvBJH9rdv1sW4hYVxUhDnv37SnCX6+crHy0EPJQ4DnhdpiXhNTc7C3hHPxhagmWjj02uW69QZABAiNIfKzCDKQBvr65S3byc7k+EWOrjbAQ4n4cRrKC37xjpyEFCjYK+sOPozc1jAMppVcwfmsY4zJqccjiYj74pimtFMBWmG6UxI4SrEUwomZ2W51ich/XWMrMHchcgXc9gDJgrzpFQod5t7pcIkqtZ6lqoPOJcMB+g9ITpAaTb/ZAEEZcLdq8exyriJpwKnJxub4QYHf5hqGKrmmG+cQPUjorod6DO8Nrm15lvj1zHHmVKaqji0512l5H/iXg89dT3t8/jfcIIn5/ZDRgukRUnFS6vqROnLZtJ50VwO7qepa4t/OV+bkmfv79jTHTQO+d2kYY/8Cpxgtripp+fodiZsN+YFqso8LivFxOb2x4t/tMJPobq67X+6NZKyC/bfGSXeqcUuYngl4gkTH55sDq5UUs/A4XB0mnNIGYs7qPath/Rz89laGkT77OkJPGIeXYybNstVsN3Tl+0/rEGMA1GZ6TTpwrQDKVKOsyLOQiQ1xHxlPKFTuktyFCbxHug10UGSGF7eBf17UnCU5MCrin1tuc+S9zOiA6SFiZ2lkCJefWNp7tYCptGQAKJi7q+UtJNOd5K6O7OQA/dIrJ3fzdNuSXFnHDBDPfRSzT5SE6qrh88+79wTMpaejELxTfroKyQC2MvnHvxp2XKERainuf5wtLKg8fpF8EFZ24MJeAPdF7IzEwPNv7H2+UKycAdekq0TY4OPrSQuiSBLwA8jdCsepTkQCw7klgfTcLpTDzRnewo91Ecz0WI/C62BeXhorpYq0itqlJdBR0oDDbXbECad0NJ74PpAWc4hJ80lul+gB+KLvjFbbTrCU1O5sd285fb5IRBwYuKqk4Eh6SyhNHF3vrju6jIp7SpbI8hyqDMfpKQ2/IefWNxGcOvqFf7f5b+mHSOIbNRpVNJVBCgKRNlQc4fvKl8jAtuJCHsirhxagtVLASU74utxzZQQphk6ondlYRWBPvDE1XlCkC8YlHRMqugnWx81uzHwrq5PEW4mWKz71MIyviAWcNKbcOOnjhS/gXiOvS+CYGFfapHk9ACk1w1ULxErzXuHBYSZewfSNwxA7OEIvpVybBw++wWs+HsjXBWKlZjqFALkhruOeNUkhb/7rNIJI+ouuVu2yMkIsTcudub6CfU1TS4Y6lHNK6vJxvSrtYd7VhpCNkfL3+lGc2K7vKrYs0CgFEW7PH+DN3ZAKX4+vfd3UOQSENGawTOhu2IecuxcIe7jjjZ3RAss1PQAXo0XCJ6HLMKnMy9sAWrHmaRyYnirIUa4gIwh2abc7EwXH1VMI8UGv+ymYoZC/P/vH1X8gRJW4j2QBDGVP7mR5Z5e8uC5Fpm4psCuwsbsXE6Gg01gYm2khbN29Te3vEMIPxYBADoyFfJOjLCzh57/Ab9VsaWcO7wrPVMULqjFYkbgpZaK0LctsG3Sb100/JRIvn2e+FRGk4gCk/yo5hI6WqvSt4y2aAqQjPkxEk3+u6ST7I/VeEVm2XJ7pNB8eAGsaXNMaCuS8WRzqa6egEE2LBhgf+D8oKMMASEm/2r7dVErb93KIGs07LSOmD3JmcIBzJFAZbLAPKpC1cJmmiKtG3QH03t6Qlq7m48f70drHk2YMRiEoU1UxRsnLVY3Ed2wMA/1nmvuyELS176ntQNFTlYaeDsNrc46aG3yumMecIDUcJNuqnZQ733+t6q0XkkO3BnkOkIT2jnIRzFyCurj30NSqK3k3Fzm6SwModz/CwczzDyjzuIZlyONY3iAc7qPVSW2mgbR0eCeaBeHgESNYDBsLRkvRWLaeuKNx7aa/CfI4FHoBynlpyXbjpvsxXYJpX2/I3xiqMWX/wos6CQ/3FD24lq8Lx4plwtsDTejWNp4I7pxhjKIWPlZ5FUoPQc9OPcOFyu/ixxqL1n/6Z/zcpMs3SRoEHg8PCEdh6yYo+/xv2oIY0W9SifH9jZZ+Hzg9D56ga73L6pcM9TQHFQsSEH77a+Z2tkQTs9P+z/yoODDwkBdd9vIKcS3cQwXUg1kUYrjGohSH8OVW6EpoJoZ6DSbB+jCSjDteMTTyiZjV3kMy4kv3fN2hc25KDaN4uz9l75s3OyCzSDnXY4tmmj4crH0krhzsbDpL66MEvBMqL5OOr1RepBXTtOiBoTi7HPf/Y28k4j07+YltXQDNMhsrCoqYXqOZW/vvXb+pGxkaBJqONCagSDIZdKCfkR8Ua+0Wyzndfs+3ge/RhssLqMS2lX3gSaME85WNHXxROFzjzO520BnCmVa59rkZZJ7iy8XDL3sEbyBNx//D4pbVvgHUC74sBxpeuhwIeilgbYjuxTTB433FqIdYMW41YEMiPVgwiXKdonXj2BC7lGxNkzXtqYmtc5hCWnx5ahD7gao7kFH3tJNaQSM+vNvvu0XdO1vAQDAZngPBLht1wQKqG8ueNe7OBj5W2NCRNpbPLF0VRzbpN31Whi/iUmn6QUdEGXC/jvSMXZDyXzJGpWeRdEsibipvzkkSu3tOvkiB3uVfD48JfNE+O1E/Ps5QRBRlQ/8jQAjEsdxBAEjzOrOShmmcNvSSjjUyDUY0rFYd0BYOmhqE8PNYaJ8VD/4Y5EcL8jn+HTtzy9JTW8KA4rt2eL+IV/jyKkutwQdYlMzXjJllFKnQblSf0/UCGOMpZfdqVMKTVLhvBnNs/p1mxGgQTJ1R/pKAH7BdtV6QBvlAsBZ54z6dgDX8zmeAVo1g4OWhFJ/WJDZlverrKX3k3xcjMGlfHI+60/1CHQk/o/BoFbmfgID6Bfgk87dnslBoSk0oNb6wu3F0+NCNYCs+BlU/8+c5Rn8gQxxRwghKU+nI+s0FnLA4jQEJxTk83Sf8I1g0E6bJoJ6Kzro95P/0x3Frg5zkfPgSCK+sJuAWEe5dsQ8jJWryc8nyGQSXzPaZaYk9O3+XCN8GamI3AwrG5wQJpLIXRo+12UsCU8Y8zNtdk/o8iCSdL1STKoLMpfc91NhrU0HBr/AQDpZdkDgA/jNojxJKfv30vvLIUkBo7FUoUkiAvkI8lxOJjgFfjC18qy5prU2RY+QJAiZTOHGJcwawE3m0uDaQykL4dEiG0qWfamIpDBgXwCnrKKtgMtwuWqwFvi3rkpJkTCVKz3TkI6Tw+qrEglruVtXxEKgljtLI1YUVCENx3YC8ef8Lxvfox6EnQ3TELLdWnnc81q8otIYsWxjPIKfU8Npt8auBNAzwd1r8jfMLNC5KF8p85z/bkTyTnL+G5QLbypoYXlT46epbjdFFzZGz43OcFKDvxq3SANiTUcrtBc1XHrUXvB4Cctcg3IdIQnekES1/pXkBTv9eGYNB34Jr88iG4S6cbmccOvVZIEis7DClYivR0UeP4ZQ7JWGmiRhfr98gsOBKbJjlXXzvrxmV2ZgK2unDtMuZlPNWzjG+fz4kJORqEK5aiG/SWqu1I8fW4c6AxjDzyftOKlZvK9bYR9y05+b9RLxTP74EGT8GOxsBiE1FeLCOXQz96GwS7aRZAfFKwFxv/OvbUu4z+PCKmb+klRpBRfZbSdVLP0wJpqz3d4yEfiH9V9W4pB5qq1GDNKohKQvJ2EqHYz3fULDIwmyuECAq10DjM+lBUD79JRQsxZgZ7pTnz6RFeO8XbvcnYKdV/31joPlxcj1lXdc/tOfadLY2Q8lxkoI3Lseug6VN6NwhyZ/D6m3AniQVnEBoy9N3sgHKlQghXK/mSWOG+esG/AJA3C0Yjk6ZwqXWXkqpW8/6phYCGmiOxf8q6ePw5C08OT6TW0hPrgY5jnxhHKSMdUvetb0xOIVtNjW3GcmhwG8cOC7YHjNzISlGsLG5FYRXj6+N1c7Uuvua1Yrpy5bKowcaoCZUhAswiqjf19t/0H5DsnWA72GWfbgRpcMKMwqNgNGJJeK/JUX2cPOm0fpQxj8ONhkhn1Yy6gUovVhq8XCFyooxnN+81R1FYJItBHjhCN4Feg7Lu4TZOVx6KGPewAfYbP/DQyea3m7hl5jJcDhko4Ove/d898ZfjN35o/ejKCNk+VWn3iC5g5QjXDi5s4FE1o54HSBGUSg7O4Mj2w0pS/bIYNzeVM2zsIeozrpRAc3tPDPqrIEIMc8RsFEsOuQgw5SNUyD57SCuBXWIAA4fy0JTYijEWtJ0m2kcMJJ5BQSfsm5Kd7dvjozHWaYM45OPLlocJ+7aBplJ1U+rgoVW4VMDFQLLDma99u8nYAbAccPvL6Y4K0aeHFhyVgZb+W/y5BNb3+gglc2hjAjY04aOFgjMvFIRXjogjm6OE2gpl6ZvsUFqELZBl8Hv+foTXINKE8q+UMgh7ff3SuywtIbSR77UuIsmVBr0GYIOS13S/bldlgh5zL86d9lgQONOftdApebalXl1s1agNoc4M3mz/coV9Jmybt3C3yzb9bYqta0eVPiMtzq2uJb5U+OQzG9pjcYbAVB44WttMzUHcGeFUb4lDWUhzn1oh4vswmo07QMwH2uFUmb3sdcd+PqFq81RWjLwPKEwrFA5btpOohoOcOV2VJvsdU0WGHzwZsbBvNXJSYjGOGeWCH1P0Z4aDG7uTsdHBP5/7IXN9llQw3sJ16UHrQOsJbKhbbgtPXw/m92vFDQQhNZLdF8ZItMYTlWgmO4WoFSUiVUGrELhf6TMkuzM0qbahdiZQkyN6HKcjWqr+4tKxZM6vAuYCsMO3tbu80n4x/plaL6jAH7RZxWigkRaY/26NvPqWRHZzHP67lQTFC0luw3pLdPqOpBCs7GchA1Xg2StLsVsamYEh8udGTFgntBugVMypBEutkwxwnBUA7IbXP2Viif6OCkPUwX04ViykXz18S807D3S/nIiZpofjMdfIcneNmIlCwDtjeTW7QFCAHS90jN3nLR8way0ABi2UNIF87P3ZizXGobYGbTVuKaZ2tvvY9hVBVnIzatx8P2yDqNO1+3l7uFOsnzKh4CKhpbd/Uk38tPMy3rGODo9KaNzMwg6ThwmxzbMl0y4V1tLxqnMoL/Yf3qVPnKeTNvnA3rUPSYCV/UiJc5b7vJQKUuSVLQhhCMsuA5ais4Bq0hPSKIQR+1iCxAJjvhYp6rpwpWutE9eGxUHcki3L6lS9PX+L6AN7F54SdEK7xmhnDreV6ZtN9lV3EP5F8IzTP1b2EPhEM1ix4XNP8m8QNlqORP5JFeA5SeV5oanSVac2ilEOlhI04PJR1WnUUPt45dX7AhxXv8ZuvQPHW5U4s+lVPNLb9PfqvYEDftK8efZJffIPBQS2iOhNsCIjbfZ6W4APdA5DJbCACk5+9DFcRBUxuJWa4h7JQDT9dkAdb7jsQ//EXI6Hjd1a95dp7bTdGdhnvg98paBM3lCYHpfTVkitoeJuhI6KbGrfsf82kZRktooY1SMgomz8OlK/KjapwX4x3qJ/KD9SpLMwRrZjPFFQPT8aGVjA0yLyA4EzHV73yrIqogHcj30x/BeU2ylWAlwB+a/PJa/+AFS7QnuhQZn0c2KC0npuCGfrL6TcCm+3llRukRKSgwZwT0J/9aKmz/yMGdY5w7+rrCRuf8fH/H9jPie6yX1osb9HWrJcw8iGnCyTMs2HA7Dl88xJiCJOreXrk/JsBUvD/PWcgLAP3LXCqCEWOajpzKX5trdgy7m6/SjfdQ3hsCNjELbz+g+2dQZUH+FQow1oo4o2/rTe6Xn/vnDuGhDL8gVu7vHjLC9J9DEzr1f7dnEQErInFOnjCUop8m620p9yeUAIRGR486jT7PaKoisXBrLfTxdWOVvYJOsxBaM1wbsOvhdPZ6mTFDJLyBx0cvMwO+ZdmcleT0loR+0fZw+9UwVOgMBueBqxNgXdJj71fg6wf/cpfULDfdgpctewX0e5WCohBQqe1+0+TIRo9cBWOlhTzsM76S606tc0zt+CkfA4F3BkRHsTwFiGpznhUDrQDiHc63jKIaGdrgdifeEOBPA6XKacrWLyLj82+vNSa6HrjmON+aBPrMvamkEb10NSBcQuNDR3ofLZaoFuyFwPXMvQQVXqODYi+uErtzRG2ul5VhR7OvakhClAEo2lsaBOsAA82XWO08OLgT8XYf5GaN2s4qUiM3tipWdqsb29egiQ2XI+HxoSEkgygEHYHFIE1D6aVQ7lOwlr5PaFOWdx0jnEYT9E1RuMV2uA1B+gSKWe3/9DOHJY/LevIcqk/DR2seCN8Q1+4Aj8IV24qV/iRhH9pG8+jykt8dqv9CWGNGi/RxtUT2r+YthiQbjkRymuDP9x09bkZEBGHYRAnjs6oZfm6TqVY4Dcf4IaAdraH6Vdijqv+bgBS7VidK7N2khwh25RYBoftQuQIYxtF7odyW9ZQhoMWQfiGuUeEDyIZez8f/QvT9STemNW5g63Hs9OXAAQyn7fNYqpoN0juWDBIoGhFQJaxRMEhiEH2giGj/Vdau1/1OQfe88gHKpG1xpLahK90zyNe2fQuJSWiBk37l35MbdfnuW8linA3b1DfSFoIlkzJQ46KOnvpL/N/w0fik3dhQD7LsVlMrzx7JZlJQprRq7kvVCtuu31jDtNMypiPFb4EWVuzp5PGpkAwCJGSH8vmvTrBFQEbMYQFZ9eHyUSHl9Wzwz2IQgPM3men+zRtX0ndA3ahBjJYsiA6OKbG47kShURodGMSHJDhhpjoKV3l+FWQJ9UpKMVLbnxFmI0djkaBjQ7nEaBxYTA0WZM4MXC0vTE0D7Zs5/jvx3IM+SCUF2z0o7vUaf8shtZNhSBpIh98Q7cQ+dsTbehypg5LjRLQmhDY9c3qxTtS+Bfgy6T9RII9mpskHpnWdijpazuF3tjope7h6ZvFLnDcQ0iQ0/XgdLo2kmgySmETXFz1VaMAaGrC6IeHV3AOtF958Z+Q9KeUD4pg/iNiD8NvITDLX3sUvIctaT/UfFfjW3U1/crkr/qDG6QurOt+4Kah8q79avRrx9IWwWrbMyquvOHP93oIButvPoDDkV36aX8pNUbzfh59Zhw7f+TRFCRDkAQ1n+rO8J43iiPO+O8xtF+1bo3YnNHETRC5NdWj+IJfuRVX1l5YKwXHiFUpEh0uGK5SIhJjV38Q1IxmKJaEorl/MzMfmAk2HeUyQvs1U2SCkq4/ldFTnSnSYu0e7JOgbiJvFI8rDNez1GYp/Q3UNyhWkuBSWtGQc6pOzMmLZ9PKNpujwITt5mqAgTHvjHnLxLS4oCj8/4Ddn5tdGy6JSKYfKDj36yXm4dOZyMx9mwxIcnfPP1zlb8c7hgkDUmhFgk8rAT3qHfJnQUY1yjznBFB4NMtxDNa9F2KpS6tTHP4PoM4O4W99ctZCkYqPtdOvGOfBRM+bzYt+kVrRa40/mEzqEhMoeIT1vvDCZ7H/XGqoGFn3aPbaDPdpF9NtyKDICi1BjF1bYSOR4VEsLHkM5mFFvBjTkCB12ekGEXACTBKs6rsqwkvzu2DKT+B3PxP0FyloVAtbou/eRElg8HK8T1PCTNofTcLhRBzVc+qe9xyVGRXofFeU/VOjzFIOUX+vElfHHuMr8KR79bgYrbQUxmu2MMRgg+l7Fjz+dHNKdTEqg/p6pfSz6lu8YL0N79789eZ18z+lJbO6x/AcwTU1ZF1TN3W1aGXmYbV5OTXRmOGKHvn2ASAcwekxrmfLzmnD7TXTv3eU5uEGwNn8Y8Qzc4BuEHdHpq0IDFuhjmVUbRRTjgXWaGnKvEN0DTC7kngUNlRoPtlLIDecfN8JMLBq8AX0A7DPH0VrIO3k4p5AREttae7b5VO/tTcZl+gn8jlR5DNWfFy3mztlbKG3PzRnSALKv227bWoKlbDnQsOqFWqwASc+oXPUS42/B9xku3KX67KdvdIbo39WO6SbN5DiGCJ3pv4XDjD7clbuAr5B9zvh1ejog7r/ZZgk2v0Ro7GbbsssHo2MBu4rg7WNTwzxxqrBYE0B6HM5qWuRl2bq9y9yMuxOIgpYGLk3/EKppfLxNkSfMcQ9g/oCdrksHX/4hiHAk1KHryywB7Eu/fiar6b2F8W5aCWMmKeLovYddL0Gy0L+qgmV2OpjKt/T0nPR8mfTQACiccVNHX3XzFuLa4HWA+aMy5lgSuJTCU/TDj3S/TstTSqvSeCD0V3wB96CYtplOr+ruDodCGsZUD/VJ+VRPzBmZ/RB/Zsz2Ysn/bgEWurWe0GWDCBSh0Lcqc/lgYF7PE37V9B/7H18V9IxkZsvAJpH7jnkFTJoeaEWGLMqkig4wo9sXL6hDgK/yQZCbt4mD8FQrfhyWs4c6EAFondqAmf7yW8d7BzVCzufmMwIWxM8PmcG/seLn5dWPwaKrCaZIWRjePkU1xLCp+W5zxZX1jgUQGJFRvxQwVjV2TjyMGP7RRwtYBWxtxbl0Yxz+gSPon1L3hCT6tzh/OFZl6oEm1ZfqjhA67MBNscEM+7w9ou475LwtqNcjCgCEkKZFeCpz2GVjiuh85MnWbIJRaVNNVqZssthiQyQjBS1k93AdCDi7ty/vbNPAJHYa1Thk7nop7C+RQ4h6o9ukIYk5YhgcbRvMdFX2vn8zl48pE6n2cJmOr/30avZ/rnW2WDANK6gpHHnjMc5+F22hnCfQ4Gu2Qkcm03osYYVfk3SFq+Jrmwa1JcEYJnbn1gsitb82hz1R7yigVRkHuzEfaLvx6jxU/RbjdyruETu/25zsenMqBqAMPY3JIWTTXix+sLLES+fEKe18/ZBUis91rezTlQlCPXcOxba3v1G9bAlWio6iZy1JvY8yky17UVt64hMQCGL9ho4pdmzc8dTHcRqiYY08BhPoOQRIXO31gpAVbjFOSrCCOcZRjbp1IImZtdJNOW0/4DKXoV19oo90lhF/uTOGVRCFJeUXwyZPDmYzxY6AaaYATVAKYOkVq9uJlBx6s81Q97J1X35jqNUk6n0stQHFjbQv/FeMBNQPQSc2j11yk4atHN+IlhVdFWA4MDeMgdOG+dMamXHKoWdyg08ZspoNFM4QgK2JrC+r+iOyV7HH/SM6r0WN9FksSCt72Z7hfCc5wDA5SEVnO3nAlk9Uz81eAn00YwDIUQPT+n+1MfU/tmQwjZcgC7ONABV3o7aUR8mohYnSrp5LmRRU4WOeKF69Uik7VSR6cbHzP+lCMGsyuccW0oQz4pnznYgKpOUA8nbTwkjoCBfPQjgSYTWmZwbTXd66YrvJSs/LO6r58oHPwfw7T3LtFqFrz/ctQjWlpiuBjAR3k3Jpvkx6t5LgYcIsqShRH7uR14+a0crh017VJfoqRpjRUArJf1efPm9PjcQWwpIMbPrSRW4sD4fd2ZbY4f4WXVoyRUp/7GdJYx5F2vC+hY74hrhZvAXdZAqv6YkQYIyo0txj0QeWEnJpIu7iq/LzyBdnTYicCXWjRW5RjtZBBTO3O/AH1aHxZAe/rN1WAUeOkkbQGQoN8vGs87+3uUR1BbSyCdDjoTZfhNGyHoRc5AK8cSXvZUtjyHqF4S57kDVpniTG9u71vIT8KJQ5bWI+pOzhBhaDY3D+sMeaXzVdhiM3I5+6rq3jG2ISU5QhDLUCpZlmCgZBMpB2LuNQCbEfXJJ6hKD/Z1h3B2FS8ZQ0qz5UTuN9+jwg/5XcfwUK6vqXW0tr6bRWyONSqvESfCZ00rfIUy3Fg0NuBiISWe6ZGKuemaQ1dVOvwv9dmnF+UuHnz3xIDmDUgq9Ns/DL58vEGLier4TjQ7tVeBiVlZD9KXiQxdipg/fqR17ipoo8/+CGh0G4IOo+rXJpKVoqZFDYpMt8mHHj2A0TsYk/7kM3yUX96Tek0HrlCUTEZ+8vuOh67VJ5urfaZTrmfGGa2XWdbj4jX53DKvrrkEEKDcXLWpgNnyCKYcI/xlY6gRxEDNTCpHJfFwKw/bMgXkhq3JCZx2SRGuvXZFPbmoyHCNzmMU4jzn1O8W/MQXZWUZPabk+OAbu+XWEVR1NsEo8B4KdUuqv+g67WTUkmKfXugYzMjCyCEAwqkG+KsO3f0QNdSC/z+F28H9PSmY/bKQHr3atatiung714SElxKwyvGo8cFFggsdyQio2vhoa1LEhArtTfunUalrcycBciMYBJuNJedQCzTRDmxJJkOhlvqhSBCeBFRZfzEQU+7Z4aJTbz4PMFyVFz0DRRSVJPaTaa14frgRLBsYv38gErtlfCFZlFx3xIaybE+uKTc2RdO7GFy73kX30eevWVuB0zCNy3f68C8Zs/heXmPyMf+Ud9WHkOtmBdmERehT8JX8XkLCMhRrxiihBztFmD3lydBtGhc/544XJrIo6o2FnIhJVQ80kKD59t8GlIxN0coZLaZytViE+rehXFdsJK4rUYgMbGGDdFuWYA6mSg7WxAeQbmqag+vp5MP5o+dJTcIbaoiMyiMpq3pXO0POHYw0Ub+S8QmfzcN+0x8Q5TA6njf2D52yE4upN8POoBdaLJRfKXeEzTxVEGmWdDbc0O9YGG09Z8y448HbA5gP/zBDVBc24Pa51qTZwhrj7JpuluMKghwEmlCoeGnsVxrj2deDmjl0NVuueN5ld67NPbtO2YhNpTl020CbzvDRCgZTLJLdDqH/BM9rEdrST2GzmWs7uGl/OayLDg0iqM25mWqKl8LL9f3l54hWQFdlE2dsrPfszl7YyYrI8E+IfFORkd/Cqshgi1fKTDSdhk2L5tAZRC0WRaQO29yd1sxMIOvBckZis11jVEClsVH/+uk0B2grQDmqB70h3i4ayfwEYZXOjrh8x/kL6ccwKKfMFj3Mb9kOcNlZFDAbhkQnv0frNnPmXoR+iSZ4eLUXLGss8D9fXLoETrxUTFmIUpmN+iSvBlWkgIhorK7m6ymM7UeexVudsN4rXRqigABKavblWl+IKz1DdZF4Z9yg6CbAAuZWlxcEuxxo6zWYFQZ+4IEiuAIPvGzu51WF30uUxzHmAl5SKTX8zCjae1/j6GvOcSgS4a0nXn8Fqh+8NG5ZQ/KuuLk91nxXH9/1ACcWD+saqejEa5RRPhxBADwK7YM5tCu9MKwjfPXZxgoIffr8eTpNiVhDJl2rVopfe4bwBlbRj0Qpnmu/mjnjw4SPQHMjLJUgAxKxJFR1EQzPpfkjqFHeRfCy7E8Pqu4jX8E5ezs/JRBj+z1uMNzueBsJo4H9fBVckMet7yrD2P2Gqr3gUlFe9UcS/PjwL+AcDfbyliwSW9C0CiGEgEqi9w8DVJv1V5fDgQscmWNHjPHUTIiwIaC86bw8zz7jc8iY5I/pCas1yOQV8vUKYSpwJZOxs2HPPwRsmeaj/qgF7sFMRunW4o2hfzACIc23rHDB+h4/NQrg9iqjlyIx0R8uSK5jOmO8+OQDCdX0SrtPn2VWeZRLunDxVNo0hjWn09C+01NRuA6ecL6HvGKfV4Xvs369VLVywOefzCrmWGtpNn9JPU8t62kUt9h5WWglIU9T+imp62Ol7Dw2qvXIYZMFCs6bEQXa8/mEFuPDT2kaQnJxrnYmV5opIEMmR31xb2h+R43FGReEryJwV97Mocar205yoZ2CBmatnYyEMVDcNBaJkuGyJJ7temU5XP0tXGD1GBYm0n1D4MHgBIpiWAqkvFzKSDFJMVA95pXcyIQJIP/6UKGceMhEEXMdgj9gu8uDSO9EewqzbzmGwPVMVbj5WpyWwHQQLUsFlwRDm+DyktqTOkaGJ6kpEvib22rHG0MZlHtj7CRBAsyCwDF6mT4oTd8kvW95i31/FlWHbZSm1SIOE3W6Oox3Ro9aBEsXmL7uFJ/9HobSQezaGUZhH0A9Fk8WtFgojOV/DqQcweDY5ll/HPt1CpN+LRbAEWArTS5RhPfSc+G0Hw26ENPBUnQajfFRWKR7tGPrdZjMPwleY8Q6dvtem3Df2p4AkIbY1uAGMyu/bWYQPLsz8Gg1bOFM615QfxBpG8bhYWu1XHRpxduExXwdFifUMVltjW4/CdC74XXB7c/OqYvEDpAUUzo6c4N+BAmuozlDABz9qHHvwhjZoO7hpImOpZo9AyJl1qC6IeNSlc+rmIGju/yW4ljBoRKxCl877NqdisM+t1XJ2vtnQPFcYm1QRDSWzWzC9sa7OUnnZ/q6dPklhAz4ITlK0rMef8wLkHDQE7C2jNX5aJBG1exxd+NmMfr+3Qg/DU6N/L9e9Z6ifHAXpW9FQvdW4RaN2sbPJlkfO+XNjKkGRB5/lzd6/YWURKuGl9FPWbIplyNSc1yzJKgVpIlB6nrBSxVgWMhdhXmEzPLYLY1eq7MqfqRp6W5TtRoAL9/CKPvy/Om7g60gWCtyx1RRNptJm14st+ZLpsBYqPflNvk7qSd/INDF92+aioGQx5+tVX93fdIPL5uvLqRZgsgh60YpwpjvlOD9trA0pTeBkMY8/W2E21A4cz11D2238/wt4tIFAmaVJEGP25cVu14yLWipAEdaLKtlQBZbGlPUvnGArv9AXQ614qA2WU5FAaIxZA5iaQLVSTrCCc6VwaJ1gukDcqXz1idLzDMCaUR8Z01qdywBR4dZIcfBlM6j/3DHGId0D7IlbifN0Fk52/hpRaUmj/EAdBQ07m5JQha4KRo/rkNFTuucqYdHz/h0WyXX195n4W7/6SZgBD3KGeTqsc8u92Iz+dNjsjjwb2QXxaDy0Nade8unqYYq+5SH/ezts2K9QZLZkbVgrmqJ8CgMMcxEFtiGJTWUG5vQLCWsGrCOBiZBvX+otxftrfJV/sqJSurSb6G3YIHvi3Y5vUOvtN6PTS8JUadOc71etwgwHzuFGClN8frTmMZ2EUSv0GlaTog8pQAMB59K2pT22+NbYuJDGpxvh5azK+T08S4+6DhaBcwzvPs499dXuQnePG40sRP/4v1xN+QpEda7eMxWOQOwP4Fx5E+wdZZ4L0UZa/zQkt5vtU168+1o8r+arzlhrWS3FF90kZm2GhX3xLE1bI0rispEveKN9bqDNXMBH72yuLup/ckqH7Snhr6lstmJuhAEFtgjj7IJT63kJeUSy26EISI4odlPPskWn5F2op1NmwOMbE3+jjGHaiscPMH0n/i4qUM3iHDTtvwUjLVJCErbJm8lbYqFOPzQnk7FKspouz/fsX8pDePh0VUES2+9UE3VOvBXUs6eiB7a+rdTn/Yt6EUlH4ptRoptHx6xQYuUmUKm1iiyS/GfwMX98HciX/zXMgJUL2hYygYWecVWgF25CVJQ4Cs9qLzZTMZaFHq6C9RkMNXkKqQrxj4M/657OaE0cD2akMNiQNv00aVC7ypxw+uwaXBKMOfrkUnUROwkGbBu60eX2ZKpYazArAQJX2j5e7FPG4rdTBpr5n+hjY9OC9vWqmvn5lVq86Az9+G9bLvqMkQCIYRyFGn0bjBw8XEwOCZ82xJ5xqdWhRUWb6Tt16cy56qfs9GsSSMQyaLo54Y6dBQ/wc+nQgWUDMeC6Gk+HDBldhqVGQ2FytgkjfGuV3CXtrDhUTQePD91Uc4/xE/mBTNqNTryr83QsOKvlE/yN+8L9bl9X7a/VRt3HPDvJkUy8L6oC/zCE1WRCtKbSd+5vnJkJ9M4XZFFRwYgUy8Ii16kjq+owA2nUE+Y78o983Gysp/JW+QegeOHKnG5nGILbAp4Qt4weQ4mFVzox/OOThfkyq+W1icOMY1C8xq0KFj2UtuKrD+rR/R4KhbpeX0BotRo1xi7M3cRlJhfQuPlnkXd9hgTK/0srpKVI6GIxsMpouunK88ZknbycoQTTeutHZ/r4xc7FdAPaz5LIE1MAGS06hHWH3HU8wFqXhnwqAOhdj2iP5S7q2+k9wtwhqf5Ser/wG8P8QpehUtx3t/yHOmHlCSnkO3fTFlkTAaPoM68rr/rBIXYpXbrVpGpBEZMWloQEFBC8FvgrJVJEwOO1vYZXac9oQ9Hi+Y9aUo2jk3VdAAU30IxFij/xbBPDczBT4CW8BPz134qJA1MeL2WdA/FViXmrt+qVKVb5HH5955EHratGLQiEogjoVf9dm2kiaXcuJWp8DDq02jO8q+xd71KnNbkydBj1ou4fvD7yZ6Ys8Kg789EAorc1c83W76Ajx0Hcn23RQXlKfUmim6WtIr/9d4hpsKtr6jlXX3/9vvRY14AZ0is88sJ8uNuAD/uQtZ7PjD+cCDSmNMAsbC45vRCvyvsPsRwOFJx1XHrLvHaz4P+gTuMBurUyTkS/Xx/zZLkgZ4AZK3Y9MTOQjpC7pP+oboDk1rHls8rjxrVlUdnE21OpTWldbjuudVUcvmWE42Yra28CV5MgiKLqxVk4Gn1skEnFSnV3uYa92V9K4fI+ogjkWR6tmDGXCURHOtD2fqxsrv4plrHrjdtj7eEs9cvxLuEkWItbIjkYuXvX/PRrSvMjPOR1Wu0PPNqyn3H8gQsoYRxiWlwTgFqvcCyc+9vUvfyZXZBjVaDQmAtBZ92tYtKs1CLeG15ADcCqBKHEQgFwD+cs5ioDO2eieJWWiSFtsLAN42tcEb0cv69y0PDIOVVzrKbJJnVYtOT/LN+P9JC96u9NGewKIZUmRIs8UZ0oDe4CxVfWKDEJm1THHXJydxHDdmXIloWokz+VnTC81Jn90j9073MMw9tqZpZl8z8dn9HZg3OujHxJ3l8mmkmmaKHeQd7smonznVqWxEchoWB0C9XU/E5yM+LI0RdxPbU8B8zs/kbX5epocPympwVNjyUt4KbvLjO2NIRXJQP46vA+rtMwWGtVvMRQHc1X2hEODHnI3AJJ/y31F5DxbrcyOhbxL2/dnFZ2xXM/ZVo0Ca5x1T24/iLHAPwzwXQ5V2plexPgA3LQk/y4eS3xFJn3TGB3SvDnPYcSHsNNp+7RbbRc6Z3fmvvSZ8Lqn1Ak12xhVP5bJ4PHXvreLPgfXXERERXeIgPXDaryzZsodkL1MboIjYVspxIGlhYZXyE9HvaYqnSOLmElHgaPKUKEPwB1qkObFtxGPXVWDcF5QyXcbB+35OgYXYjombs8GdMRzPYA5j7xew+9tOJjsOXT3UMg/Ehhz+fJZRI4NWPjepKPEMhBTD4CaVJ3E4HHXwQS6B//ienRcm80Z7WXCDJ+lCGKhDV6uX+Ip6AWqrzE/FrxaIEIViHMZWwUdJKkNeWs11z0lB9jKHwZRAbfwyID+7qAYF2U1V5Q4sO7jrO8+ON9mZmO7Xl9RBDaz0jZTFiUTvkJ/9xc5OgCKh7hp50JthfJ7e2fuH8x60tzLMOjIVqJLUhq6zipw54nHbjgbXNn3mBdeb1uDk7j7mn+A0a8JG0ba65qUVUc0EDPGDZujNkcRy5siClmQBkoPKWenEa7FJYcbHxTrWMC06+/thPuFc0dUrnYjGq6+gRYb/yEBlaRnIlyxDVo+HfemHS8RpoE7w+RVOF272ncjKvGG7FO4acrZZCP+G5HilIWB0hUrPp1z3HsfYcbGP0g0cJqkmQ2cB/dxUhCBP71g8mQ+8L2sDDelcUfxUMMLRnOI3T+oBL4kfx2wRPqEf1UhEuakg/rrwFTxbsGi4XdUsvN5rXHTlfRT+AY1LtvKlgOkZcIZkmSZ1w+i6mXj5Td79aF95O2YdEeWvkDejAV7kKioBMqqJmjQ3zlBHoxiB1/sve6ZeNtk96yz1Xe8QEzNxY0KMaarb3SOYa2t2+aaqaSm6qbupO6zcS9TWWuCpAjChtjeuw88NDRGs5mJGVks22YQxKLJB8YRir+YGEuTjVUTlbsvmMp85CHhbFbjUeOPNSHcJKrbn/F3F/uk94CS2rLgMzPx38mCNPmEtJdcz/hmURAsiR8RMMZCiOGJD0bNVjpcLOQk0H0yOW+5Lk5yevPN+itxeBTCKtkmUqRIZmFN1OT4BJK9hUYogctxEmVxuyh62OV7Ujx9WVdTZFguPfRPLsgZJjRn9hE0cRHhto7R5uAIOYqfxPYBjn13/aLOVNLJVs1HMIDxAnszDeSKBMNf9dj1UfF5QpRS8G8v8k2/OeUUJrrA5cIuuOEDkIri7mtn1JVeZs78f/QMMKXKldPmaJ8s2ggQ8lWPYu9b/9ivpGvZZ5S1Y2puJc+1mLptkOl98VxU9sj9itHr/YPl2j0gPWvjUfifdsYtV6ObN2FV3fN5aTWawGsl/rKlQNyslTpYVspt73WrSGQEHhEJ6IJE/iFr5f9/RayzIGT0zju9Q/fIR4232V8pDgc1s+G/BHv9HbZuVuTsPF9hQhCPm0ebhzAimyHw0qS0rfcXrI1i/7QKMeK6l2Qe81Ir5ZtEcT9l+B0i2KocBOe7TlyiNvHVdo328ZTYxewM93/UoLmkRWAEKUoRMWzdgTk9ZHcsBJ610+KqdpWjmNpKx5QLzpFM9OW/YJSx4UtPose6mtRz5CgwStDy9KXf+zURsTxfkcfGh+1UbPAjp87VRdQhAgbxpG/pHAsT7L5h5nMPQpbJ632leUiJZIT93alN0EOIPaNPrim/QzyIZtlvdTzGmrCO/SxPdKTu83f2IFNKm/b7yPOlGGvL9LFgnuSNyOGZD4hVQqKWg9RQZouwZfhViQPu45h4tHkkjGVfYAib0aeP4JWnJHtcGN4RkrTDmTJjx+u279TwmtIfWBRsbfbIn3DFFObnH8aU/iVm+6HsmDAeZBBYapCyraXx6WQjMIDNocXh1Zz8NuudjWOzBDHWTK38cBG6ja82kfwx2TM8VbGbh44t6cqL/9Wkz/YpT6mC4+2r3lXkCdHIlW6srgot6bTrYAN5md2fdNXTRLO75nNkQp88qLhMtcqVz4cLgfWYT8LloA2M7RQrl8RLwDomrV9Ohc7igV4teiRq2NwDJCoEjN06nS0yCPkaFSa80LRbkjJ7IWElD0britncRVOuTJAjl4fherE1wisuhb1YCtQoZw0wiNepslVtkt2ajKWyN8o5oXTfK+BuMASBtUgtls/k48OyRm+VtXafeq3tXCe8DP29s95/kxWtW4vm9bwVtsWg/RMSd54mrNEHRAjzyNA05S7qPHMXqPRMTQQY5fDLbgdy060utp1MrhBagq8pQocSFJI7yNHORwVRRYVd2sQKkVBR+/gEByejlREJiSqcLw1mgdT5eC1a/4fLtCZQ9sQgu+8ApwBAteGFOOyCkQ9/rRuR81jYSLonFyqlcePqq5yaIVwISvUvvufJ2Ywz6+LPp9ebV+WT2piPHAZUMJAIZv055Z46Lb/w/d/Msuend4Bd3P//ffhi/aVSN2qOGXtRgj8682QqWS2IwDlDU6nfIWSuwGrd7up+zRw1Ek7f8ER0phGrpqfcmsMETDpPFeNzoqK8k+ca1WN9zM0HqC1Hyz27I3j7Uke4j1Y/2V3uR/aEJ8YeRPjJdKXQCUjUug8T4GcOGXCahkEjW7Z4Yr39So5CQNhdrcFUazLdu1rwoYTuREckdMv8xrLjijRUvCfvzXYxZ1tfH3wabIfJnXVU62anZBXORBPUmziHwvFwivx0d0vVICYWn09XOzeKxcY7Pd7Lk/rZt1DPZ9iZj8xRMfZR7xNIAMr18YSQX+keqv/ohViYT7dqPGHeLByYScJuQ3x09Dcwp20Hiw2UhS84ysbSokkENsuudaV4/unJ+IZMv4YHwGZSxzx1u9543mEQRnVXn2wk60mw4qAKaVtG1plD3Ey5EWHLbb00L/ILE7Ecw9KmojvYt6O0/5zN7rH/UFNgWI8w2nIgczxhL5ebE7P1ipkkXz86VIeyvIxgpe9TqOJf01+vaa7faUU8HXlcJS/9e/GSS/P6FtZOaYOY2cgvmp4OcxYw0kmRDhoXPvRS9mCzGKO3eNMJlkyz1/L6ellKe7sGye6g35zkZVxEshYx4amNJC7hdGj/TKCFuVyCG68dfMXx391epx2ZXrW/2AQGHRUaE/GsN0rQb2+iMMl22qSBinLIU1dMlVpV/LwxJ48wbssHDoCFZdV66q1+ab8UzhE4X9u8rIcK1F6DbhFDz+MggISGZ7mKuMPIfv7fyqyCjovbcIrH1VrE5Kts5G/eJtU6Y8UwaxOQus4vKBtaMfA24UCYBNs55dk4VYFRskeYLYK3Z/NNw+KzscY6llf6hXh8hpZR77u94IBUhXIewmwzDRy2wmJgCHaH2ulKGX6l8bhoiuQOJxVHRTJplEEHodLIoGMFqpUzYwbUVfFekPK4vn4slNjqBWVPXLU/VI6tfNfNfSWBsvXZyayA6y2xDQF9yiXWev2LroDkM5TWlXYSmWBj72v2nUPkJ6WI/aUmEWWszHKDwZ9ZYMtCGUKJw2wvC9YQsd/WBeHfUjKtCMoYqZJHfa1nJDmxlVB4TJxUFd6Id8g2jlmCJiqSOYpQIW8IeVUcj6jD5KX3sNnOM/al0XmPbxqiUbwyW7ruK3poE5Dnq/RB/2NpTSsSEq5mGtPuJhhYkD5iXd1Nu64vusdpCidkFhLwZjgyxnAxqg5kKmfz6o+ljmjUuQ2JgFe7Uc03JD/x6DuomqLz0XOHvlHjg6inM7Do0Md1JgsNIRm6BpgMOoaLKv+jp1pt47GymSankxcNwzHxmFw6fpIeGZnMC8e+sOyDgGXWL49Z1eLZVUtzi7AF1CqHid2nU+OVbUtTD+s73hZptS9agdMxbWOgPboeKPB4zQ1/m5tlbEiTvIQtTeQANcK7lzbjkvi3aYyKiJBO5GJHWGbH7ukFZT3v0VR61U97JGqvVzSqg9sv/ELylypjHJEyczsfmc9C+tTCZbC/sMQ17z7ElwrMiIGqDja1FBxevG87e5BeeiLQicTktWlpqJN1qmdMujn2G0cVIBnwbTNRilkqz8vv4tD6QrF5x9wyf6YmfbHl85MP6UbB5a/WP4AMCWd9KxPA6JVcxSyuGmnSu49LE1VfORmp9eDoYiJ0/tuolJ72Bvq/zXSaSSCQOe1MokWwSo7FxAHv19G/ftT337dTUJk329mJjz/bPW/fNyMrq71zUxbp+/eZfmSAwkIMRAvM0s/FFaM/+l+R3l2rCxgjmIGw1s5z5MVRtqON/1U7ykDHHDNKFAs/3y7ydbIuRT0bMBdRRkvPZNFR1+wx6rmbIELR5ftrfuAYO/g7soPIkoNbxhL8sfCeHvtHyhZAqfSXVyeYz7oiaIcV0vhGi6rlvZkG0oN2ylOB1L02zKOA9s4CpOXNtZsB1WKbiFaH+9kuj/CeDyOyQ8wixkDC0fxEgsVOj7xTJv5GzQe6to8e9kLDv8SaimEMMV3AyLBDuxP5iO7qkV0c/Tj9VXq8bOvVgRVw+x2lc0nx1VRhNy1WofNGv//DNmP/9DNo6wxJJTdiVd3eoMKQSt48gV/TpcdoiDTOvJj+rHFtdsjvoxi7N1FhRRuGADu8njkvbnyyKRET7GmbWcOhKu/KZZPoqm4xdPKxfz+IvhzfTpKKNzMs4suBHraxVkSMi6Ag3CK8H8XAuVsCrJ5TeDpklkursEHq+OlQQwMKyRfR0VEGqEeD9sGU+TFMVchcBLxt4wZpTMFSRpB+e/RLA5eNfR9fj2TJDLR8eHij6AH/5HYxCryihz/MBXrVZrLeGJmMjpp62OXnhiokTWYi18Oj1+NdTN/c7Ny1gosxnp8A6zTkSXC9Gb55pgjJ4Ck1caskJNNfyC4dnpalAhw6Y4mNIiiuX5ManPVTsQYPD1Zt30fNmbvnf93c39MLdOGTJdgDuY0A4bMDNmPcCRl17KV/nULqJctF/nBLANnUQkTRNvBgKzr8Ip0sRHcfX6Ersn3ziSd2yFaTbk9zd5hG4xt1TijwUcWlbPLT4Np6zTQjBopaQeuQMdzWVTDS+19eIMnkasZIbgdlpzn+HUcj6D/VpMZ8UasQJ3WWu2FYnQsjC80jFIXlK4XhBOR/f7sThB1Z7d3TW7if//nwUV2y5ogN5v4uhJau1wpUOraJcOZtUWrc2Lgir5kSjeoPwHgah/8AbJs4tthlv2PuC02BFUKyDkr1Pyk51z9NTNK40h9xfjQ8mf94+DWwxxa7PUVgZeyQrP5p4GMOZuTKIzYG4yeps74RwBCDYro+HjI4iusRD8oJhZ90yyTNcJKPGpPOVKZfpDSB3fmc0yJvauMPQ4oSkITT57amQ4mAUUaAk6oXfh/iVU5OusgBdpb9KpqJIo3hOPEM46GECdtv0Cv3tHxFyr5XctQuGZGNtuTCHDjG1oQpCsymtI3zO22fWAHZGxa/NYpl9z9UxKHKK8HrS3bWZEho3zzLqU6I3p9VZGYubkMoKqkYIVneUqFJoHCZOHAk6TjCBYseQuCy9K6404ss5aoxh3NrrgwvOlWwekN9PA6/e8GjVEYWTov3qFNtVSqNalrhHsHW1nq1XsmFvuLRWxsIlXHQJySozUzwVoVMKMO5rUxdePvJ28cXFVxlRbID3RKUz6TlJXNzmsIIb+RslD0d9+KXKtHmIFC1HnPVE5kbiahmnRM4spYLh0CYyj+fczmEHMgNqaND+vPpZ5OMftQ8UHYseGAwkU2myXX1dUPtjJuUt//GAUse8y+4i5Qf/VBKmfH/Qe+YoNh1jzrp8M2FqeRqiuyEp6U2BVHMpPJNxs0vOmaK3nJZOIPdLnCvdDk5p5WqzZHwNaAhuPtvHZOgNf3wyuF+hGaJOv3nORf5nXZdcC2TC9u6C1ZnZ0SAvMW2mjnZgucje5HVNlIUAN0CVLngPxjtoY3DHaQWSeFip7u1kPjGshQyZVjR46MIjNjAXawaVW4MUFmEDu+7AL32zWD3wz/UWg5Wu6Bi4BQXATQzbsKBsieunJU9P1cczUfk2WyJ4B2Yd+Lfx+qb9LTbe6XKCSdEbMUIINK4tzbEx/0g18UWNIzXUh9s2FZ/foYXjZ1waU1CJyAiIFji6chAVp/Sy7X0c/7VVtexcpYPvdDlEfvYngRB6rzeyRlz1hAEfU0blImEZyxi/mIciQr6bXjUWuANtR6/vR+aeUqcO5tnxNIujDaiGa2lhvHaVZBu1CjMo2iK2TbncpqF+/4cmfY8E6GL8vFQglmX0Xf761khSMwqiDGDrs2pFQHikeRO8T3r4OqDqh3Dgm92meIEI6m1cTk28k+zn3bJkjKh2KmiEEgB7ERzbtSpEbZyo2tG3NQEuWugB38024V5zdJEyIziNw9Mm+QlcjzVBZKuZR/kdgcX+xt4nCd8tELzCwlrfZhiIkPCxEIAPZBnKqj4H9dV+884iIC0anHlS6CtOVBsWCNinDQYlnxWILLnyJ15POzjW2AdDNDuFxb6pumFwF6glY7ak8yfEZOU6XKnvkAVuwW/ZhtO8YqbLm4qCF0n5woRWa5aTWeQpq07o4AXE97bfKVu3JzJ7zq7+yrFOfAbIgLaWJH4gviTwvQUCQPY+neq7wE0VYRdTC1wKIOq6hfv3cJqmV9hF3v7L/DSMAlXQcQKKRvf6wMRDmVvCm3F26EDLBEv2m4tKWX406EBQEum4hhHsgXquJO2yHXSIfQDub/5josRv5LogbUX8USZzgDxypVA2/QHFxa8MQ8tAZsDvdRwFePziszayeUNrQuPy0Lb7fi9hyAEUvhjOVm4tfR4CW+sTWovRMiDoDPoO6/YFQhw7SBnTdXA0bD/VBCRbCDi+ny46UzdliQTAoKRqVsosoGXqqDS15FiWtygdQ8JzYa8CTBgVtnV1jKWPHNcMvgqc3ubBxORAxKfcPteoLbg2jOB1zW5X3nxcbmeEyVrCnkCOJQlP/KfThhvevpxEuJpK6xnahCdUryFl4Rv8PhgQp4lt12Cwk+16HHxYzdv0nLXHALelAgGqjrLkxrujiYXT0xjBlxCQT+rIDoLAPReRJWyJ3jNhfBHszsykz+Oqjf9PxuGEUZvZH96UrtmTIXwQrVsLIxb17IhORnvUD1scbHEglRJCWz0Do9Rr5sN0bGLj7Ei1OfRL5H7wO4uwd0IFglfRizbidx/q/XQeVAJq31BG3YwAbxhOmapj+i7u5L7IypRYwwNs/Vsk8HIKwSxSzZDVZZfPyK6EWi2mCXbfRz55yQd/1fhSEbOPdDtlCyXy6NGJP7Oxt9+lmhskoI88BimIsBGOrOzvDGUkfy75VoD+kU1i5698LnJfBcyF3Sh/4ftDkqQdJ92dKZ4htkSeJtiYrDAzLh2842uQiFpQtJlbNc9IUviC/kA3OqbZqdGhYESkYgX3tUMSyNOu+zSR7Byvzjb02PmR437k3Sb0LOEjtfd9rvGiVGXxKyW1mu4I1FPN2iEwwjs9EMO0oyTnn1NJl0V1n0yBrOMLqIFDtXFkoYL/K/wlwPei884TCtxKrLjIO9oJ7dL3Y5LnAuVTER+z0ELP5IlNd6Ii2G3z5Uvnk5uWIHAGogEyChL56OFd7qA/eOAlRTlj9LlaMXacigl/ltPTdXEs+kWl6Ckgirqw7Ipg1oIm7pP5IzCzwg8FV/b8jSpA/cvXELw2p6mN6X2QUmvlI8BT5T0g8y7w7uBUmecO6vA1yye0Rbq4FozLd8vZE+1Rbf2a1Pv+4rjZcl+M0wdV1jn+JIckSJQ5ZrIwm22BAdjjIelxwunnQdjG5R4qj1bWIi4aFwu3FVDxChnMlq3nY0D+VpQOZYnDvIQAoaB7IPRzaesjPNjIHw9WeCKd4OjZ7ytZDOYDlehXqRstxnO5yP9aPXvA253jUA3TEJR1tL7jmYv7Mu+kno2IMmIR02mvJF4Mb2nhJhwGv5L9yeampS4uYoBZJD3p/7d5RBlT16lqF393Hheudbf34AEK6cG1WEfK5RfnAMguIORC3scWUnqVJNlIwIFIf/JkgIzrtxbxsSTQ46I3+O8kGsKLAsdoz+wsEZ+hy6gzm7Zpx8d7IvXQT2O8tF9OVVbMTW03KKDchtl/4nIOWuWl3U6fmywiwxUh9uaSA+ByqSjoUd1usWKFJ9blK3gB7mDliJPM57Qejv0dj8tdEebZefLPL5BuSdgqa3twAlyOsod5YClVZ3YBAxBjSmqLX+gqyQpQJZon9zUH/cl/FRjg3pFEM7dkqrwIcoklJM1o/pcElVQBoZypmUbLC5lHAv0WBjtP4i0zi2h2iR5c0U5VhczBgBdcYDEpwq1v2Zg170XHsxVwdg/l+3JYLZX9GVcYY40AFeAJxEQ1iSJCknj8iZ77Iu8CmWjhlnQNJcpmW1s2pqY4dakkvd7C8h0xrKG3K9Wtib9gQCvoKIxj0Zdk9utxcNEElMmtE3KSl9yP5O6pH7mJqrN4FOmYJ/dtqwoZtoJeth9hdX55m4ZZMRG/YouUxn5U+vGKYnwMCfLiNFdcgxmRnS31bgCl5RQqX8qQ81xXuwjaC/7WjuRNGbnVPpFvsdZucKHHrORZnEfaGf1oFUnptp8XQ7n2fuAG3ZNOoQqvB8pgRm3F67hbyZgyaKrAjv8pIk4VbQOakMVPuF6IQCxSdXeSPZNG04M5X/R2bq7eRb5I5td5a5mfvNEMtg1wF/m7I57vBKFItWGtzai53fpRbnrWZ5roIdchqtkgrXwRG/onZqX/VU153uud4hLL44ZrxY4+EVtvcIIZjOEcHQsFHLe8cAFmeOkLeufBESms2Jkq7eyt0/JV/1x7+ogIQld9wbi1Zx8OIMwS2hzqCAR13hb1fNHvHhwUURog+Pn8hTImBpOGp8KtS2v5IH1hsGhBvy2Vos0yWf/IfNne/4Oau3J2uXAAHbOm5NRMw+ZeydhQQBl+4XQkAiJL9zf7+2szyUm5xugrpz/sKyCUDkPAGZrb86cLHJg0kDAfWQQ3dwYSb/+IqPAPmaqjgZS5I5TlfQJE7XGOt5hKCf9QcKiT9Sr8/eI+XKzmpKlQGFuynEzdtfaEekLzEX0WOZzVBWgwzVViqyKCkioRBDuIzySsTc1NWj7AUA/4yPESQvyko67XF+F2v0K6XhiqkgnbbsAfGGDsUjKJLvPvcAdb4hS1PvfMaq8BNvyYlcZbfGRbFkulpCCUTpZgrM+PMlxSr6CKkA8bO8upPv/WbYrYemzh8tvOvBPqylVin+/zhbjmg5FeIWaM2wCJfz1fQzhYUhbvBO6+T149ljg8VaY+yqSBCQQmwj1+5XxhurT7hUQhSonl1IjkVPYAt1wrnVaZlvoT8zdWYo914CsinIomj7xp2xO3+KfifjiHgpV3p2n9A/A2qZ+a71r6jqoweObJUbenjaC1patRr8YmMp0OFFInL3U5E1yqdZTI0NugQvTCaLeFSwfjA0Mx6+CX17+q8ED+hPukLezSAHoJy128NLo/aJAvF6Mo4qBnkDMojqontJEd0Q6L+RuvJBvEbHigWWpIDOzqNtl+o65ycdEp1afJxRVhc/c36tDqNcapKI8N2BBMSBbVwOx2j3emDOd/UmQS1zSKgBgVvW0ibvpp49RTolb1RxHwk9m0WK3TPvb64W4IxapA4a9rQYjdWw8sIELd2RIwjL945xFhHOy6Lvv+j5cdsumuc3HOedON+EtC42zQ2H+D6ZO89+g+GElobiehopz7Mn/fPgqCyNKPBqTjuqTjE/kVIJ+M4T7bb6XY0YgnOIJK1cEqdivskKe+dI2lZ+mZ+UcQG/Np7JZgE0x7MqPsxNOkezBIRGrK18fkbSvzt0MWgObUcgSiwuxsexKm3hpgyld22RxnRPmo+X3/ZLD4dKZPc8xEFCZ0mWVgaiKYEjcQazyY704oIaQiNqLKyfyIoaOHShMvACFtfnfngU7KIXyg7IhVrhIteSkZczNV2V0OC4k/GvC18+E0v9YuSgwVN1oYq3Z8L8egCU1lFpc/jHi6w7MY6aLICCkZGobqhlW6oq4UL9ahP6Ix3FJWz6N0YcgPO1cKX30fmpt3zis0D1w3glMsbYyxMcPnjsuAQ5U7ttppzyL15U96DibBMstSTRT+4yF9IWp6o72Z61qOxumexiTQbQp2gktoHPGze3QsglCg3so4FFEvDRm+W1A6RptFf0HrvF1V7am3im1ghk75by+HBo7IM1PT+elQbE3GGM8jW2C4YvBFLzA2iMsCP5Bz/Upnoz4elESV4vyAB4Wjtfb9LgijoYFZ5cQPLDlAIlRgcuuDkVfa8MojJIr3Iumoc9Svw3/iRItcDNQRi82XHQFP+X9XpIGcnweCUdn9Gas20HwvI6z52lO5TF5gJsn/GQKJOJDiu0HHExY8t5tdGzzw6YempVmHIcc69B8+hc1T+x9v/m9jk1k8MuPp0wcHR9TY9sjtCUy+/DvvzT6mKcNeWkN/+vBZvCRp172K9CDIOkXNPsH4M3mJb+8E/4ADK87SUy19dRRc99uei9833sYPuz8ZN3rRrvBcD519cz0SHoydutgVfOdcO2QARHWwXlou5+WY2R5xCS69uP5B097ZwGPdRFYjX6iHZO/A+/BdV8ZQnT+LsGp6z46jo7uTwTdLY/4p93vboByMskLXeEVKjvHM7MkUo1FmpZTIeBQb4pgfuLA6wqNFtySVUu8hm0NBDAL5xEx+O25ZtAlmCDFkeKrfaD6KP9KbiwUB6imu55lw7Or3ek+PcF3EPeXSf/4vAMwhvctfdTV8Mc5syZrBCGENgLrx/9YgWxKggURypvX0+mj2OO8J02aIlmnHAPnCfvlvArgR6VecBDO85LMA64+8HrcnVnZsNkcDckeYoEv5SQM496gKpuCmA1QD2lngq+45qpWLpck2Ko78iaN9jk3zvzJRpLfl3cbvTtjNjFZ67dOY+GqbgMcYgtuxYkLvuao39cslcOPBpBDCefWNCSSety08eIBSc9XchNhDeDAX4p7objMkLn6vwkxTzhXHbuX7iHjTvPdXiHvaybNOSh+OTKn2ygLeQZtnbxKqKk+UJbt6QaW9Hae+zPp4hDFiaV+pHjftM60jjf7u9ouLpY0xqFLmWGPjXgK47NNX7R+jA+39HgrkAZvRnu7Wd+R/8iw+CjzR/JCJwI3Mhi01BZxJApdGCSlxc095Qqi2iejCxPhzzCa7GG5TXz7RbFo14XtGHmWWgjQ4Dk/KuK/WrBn8VSfSG2T+r3ELVNRcYo67rB4SK0UJmEQ/ASBjUhF5bHa18Vmk4ABjCXRtRFEKK3TRNRgTUq6z3q7Bl0cH5gOtpkmuG98Ddm/B92zbN/QzjNCfQ1IOv59HpQ0IGI7i9bvsczIn/IXOpcU31R/p13Z7By/neynBFvigwAXuSq+CEW0PFs3RCoW7VIrWvztCJkADPzkv6WBpeKJmJchGxFcD4cvT7M9UMNtmBZwQWgAH9/cYAvqUlrju0KWRQCjQ2pKo2u/28s/M+FLRA8HchKXUdTgdiozVYzwgIAprYvcgGQCUVP96e/xRskAZzHe3eMQxbWh4rTVF3L4OYWtK9iumDh/TRD8PwqshW3s4UqS6OY3vCOkAdRJ8VjJ45qCf9wg1TfHcEvPxMQhb03IpUpKT/dug/D/QKRDnIFvsbnwr1CBGBEU88FnjECt90V77MRb0avOk8T22PGqCTDowNIMdf1547P5ROREMUKNBVdLFppMuIP37oL6uFcFCAGIg7eGjcnFHEt2yEVdzHjlee2sRVMIo+qiESYIf6zcWoQQMEp9VUDR/LqnJchPI9a8zCFAJ6UcmX5O4tHY+kZEb7+Frke3HhWGOvS7y4aNmQXXXDCteBMty9jKHowRBh+qfPdeAZryPI7KUQimZTJGyx4zLvny0i0V07gxsPWCczL/a+fXs3WjMjZyqCZGloVt1GSYbDvRG3P/TyudT3W9u+DUfsiVrLR6P8he6VI8KzHS3zk93gpO+airiw2Gz4L2Um4wgi2QSeJOOV1TH1AHBNL/ndu36HhPx1axFDIJuw7W0QxNHFSV6jjtBn5bNKob7SJE769VbZLFP2/xtus8mmogwRV5j4TFfvd9BAUNnOOrPwKYCjY4b3bc+QtcbyVzKVTEavqN9/8ZDBa3jaiqAkhSUgPOqKJ8O5sZMiT/s2ggwXMuqb0Kafxz4I3m3QP5xNz0HgJbOTndZW/9bV9i77WPHZRPKpc5k1vKzt57X5BRcKq+Wwc809fO2kjvpDjMV7RknAuVYuLYaZG9/zFn2qZlaNf/9lKzXcmsetlW01sYYPKeVlg1m9v3obBB/9mHRAz1gcmkYhDVNaYJH7WXmIGj4amKcatb1jsDC94zwyUTayIpUNFjKYxUt4FXWO7KsOs9SI9ySeoSFuhvvuCe0wTt++D/xn4rjyHhvXqQ+TaQjg1BnXuIRIat6qgEjvWJNWTdlWf3sq1FVYg+GIeuZzdvJzGi4N1MLqpRrtffSmMC673HutC2ZGST8eB9yeP+XtGq420/bYl/gxnmMOGGHNcCPZwROktPnuVqUe3cOKJDu6n/v2aU5jpjBI1DcXGZFSNA6wtZ7bLEB4tbwKpqUNfM+t0MBhNMZ/6NKVXJO0/c4nSWjGDsnvoVM7e+VfyLFuRUALbzHCmk+a05Zh9HYiPo7L2SqOC7+L9WrTqK5S8+pK5Qa5Lozj0h8h+3XuMh/Jr4N5FRpcrVhZpevsgfFIr0C79PXKTtjEWW4RGmB+gen9sIuvnbRqCtwrILy95RCOKkSu5GhjnVilBLoi2+OQM1A0G+J+Kn6KMsGfA8B55PQ6w/YSxMIiqdHIv7Bk422tPYbSvovu3sKEidLjqhpMngCjE8coxRiv0SUByoXOV3eijwTpd439pUazLpV62mPM1oBPMoCRnV310zprqL35EhGitPERwdGn6vlz/VsK/bjHfjvpNK2oxYpbFatLuQQka9caYLfh5gONRzQ23iGJ6n+V5KECzumXhhkMPsSbHMg857G8FN0FTFbV/RPyM7viKdaG2bxJcCkvvfsHInnooqdLkjZenpTGJozsmAW/ra0EeI8DwZh2BLT2Z1VWlBW6239a6X70OpDiV2VU5fehpGnKxHAHVjZOP9GKyKTSf9fvzNhRSyHwNXWWUBSABNmzzY9G27qkME23c+hiUYJImYNEJ+VkiNuoCU2YpqXeBeiaBWEP0zliQ4//8tqFI81WA9XjPvFyFC+b3wRp3FotFhH/fBeYFOKeAda6Y2h3dbsIKyxrrG1TN870MyHE37BYDqIeJV/Ol6afk5GTQwfoRVBaYLu8YOU0VNXyV166G8nX1brjYNr4PtAEd/4Jf8/8TQ9Y3xGZgyCzxPzAFQyZA49aQFFYjFmMYcx/VCixMRqGNnt01FyJL39L8kt/iBud3BgmXn3NJyX3Yrd/Lw+39i5VynG7/unWiRAkXGzSf1lz7wqBZJN5FJ9BIJEZmOw3EQ+CvSmjkUHiAiW61EY4oZNj7cF/ZD6b+WLc+BuMm5vLd+QSmVVAkMyTqHRh2bygniSzHIp3ex3eOdY32mvaTEBSCvrd5EBD15SttIj2feaD/EjRgORmyoRRS/anxwmAY0xaSjYR3oJ+D81xvTxwGPkdF/aTGM1QA3H7dQT6+Oham3BMag7DQRg+zWmRKq7GIj6n5hUVEKowMadKQoO4Y+AoNpMrCig6PZjfOZq+Yy61usjuLoqVUW4YsD4T706iDDPxhBZErLWx5N9KLSCqpyyRq9u9gvZqj/mJUZAoYCfQDaGM4aUaHtdiDMBcuLDcuW6fZw8D91L8VoTYG/+T9IQZTDmtxSRq0/aXpHp8X5xdAan4oEA/ir4/mjSJwCpaDus8IrTthK0cN1d4vKYCG2Pr/maN6EL/OwEcRONniDDsB9DNC/tEAgATCDDvxB+sstaG5sQgE2jv6zOVhra3p7UK+uKlYuudTaaI1qbo00otFn6GsJ/wFbt3R64XRvktwR2av+12GCgn+S0a0AG6LClaxyLk+/uHjUnO4BEXYFhoSFG8XtKpb3gjxYrzMWlvBNAsPQbTwZAsD1bMS/8ZwBI4R7OJeYnXw1BGxk9bQHJ+GUMCJIClxiGG/dHArhBVgZb6d9glvK6j/q3txS3TtFQjhL4COQV6jTmt3l6TqYOMoYr7l59XFeDbkLdJ9uXITaM2c7bG6AB35OxTrgbHPt0mRr4ZeQ8x1m3aUVSPwackvBUAWH1ZvotUIPsj/OoPVqNLMcNMkA/EdA1mnofLsQ853NTtXOOwSbtQvRXF4vFccOWNKI+/Gwb2hEW4DydhxU1nRSxwmcT61BEH3AuvZh86YRo7xe+3uUG/NDHhwluDMC2uVuc03kukMPNPvbIL5vCxmmDTopEClYYyt4irwgku1JGiciOTW9TEq0PnEg/QCtSfjgG9WXfTGNSYZ2EVMzhip6xv22Ujh+4wwc2H02gZknZHKujCZS4JYYV7pjZjU9exhazo3ReIdgrVR4IyVxWHgB0R8G9FlmAEVsxv6zKW4+MkT2xDKfvLeQ02mE25slmyh9UkL6FyEsWZ2NMFdX08BNj78JDaQbmQIzD52w61Lqj39U+aNBIcn2JP4GTWv8TkvKe85G5ICByMnsPi2y4EaYN3APVS4cftUmO5NP5ehw9hhAzg41QBtuR0Uyugq4KlmLXY4V+N1hB1SV9Mzv0M7BesOTXW2W+ukIxpT9sUNGHzUWLtZEnBKFRt4B5Q+1mL/N+/CKso3ydpAe4tALacjutZl831R3kXFCAElJks8bg6bJS8BE+2ctyxdW3gYD/lDC0HFb53GzwE+LIQsmXYSqQRSMse9BJsvlsnK9l6PIf2drVsucofyCafXPEeZ+PrT3sx1UfQ6XlAP4G07fvCBg/ZClek1mfO0ujg8aWwHKPl7Dxq5TY8qdeBf4+UKKbK0/xl+V4Ec3AUWjEoway4Cu/HZyhI07QmC1KpCAs6JSxUnLlWnWy5/OFkHG7t8Ww7Qmy5MC+qreBWn5J1blHIdvMGIEZWnbTHtbqydcYo2mtJthZa/jAOnJz+12i8cG5+0OMNzCkZ5pLyqNoSGko317hMjrX1sgITgqRokGKzw8rNGSiY+V2oJRX5VIpE6THqjfqWsekWfsdP3dvzMTiSc9X+/KxG78VgwAlZp6EuCK2yw8AHu0ogoDzzr21sqgCLzt04v1RpEq4qftO81jvy8BJ0KJhCPRO2j1dlJPPbpzECsc06d+Sq4YulFEklr+0qce/F4qtzDwWNb2oRv6myazfwJhIsJR9c2ssA+m84nCg1OqzpJG4+eI9UOTAZdkFhasc63WyUytYKlbMvym/HdpQdbkPXKFdC/3Mdgn6+unlNrb2MW6IJ2VpJ61pI09KjScEJm92/rvb1zxu6CwpuYCMmubjs2kHgdXthv+6TKqaaD7SzR7ycl0E4Qu96x1l4f90F69G+so7F0nT90YcS+363bdG70f/Ez/HrKpIqr6B0O626wqXitlt1vtqb5LHMd9zKyJQzZiqFZsJhp7Ks+kRH3er3SfsayMbMrHowLaXW+XQXreZU3RtmzbxZTtSnxqLcHoImpuJbi4+sh2N2KhZXQ54oTYarXmVm6jBRFWMcfji1VnMTe50pESSbP7PhEOJOZKMiemb16AV09D5YgOHw4SHhrsGlDnnl0NAY2ptK3IRCPdxhQdl5A1zqRj8iwqnLGmr3xBlTWRpT8Tozk7eGpbZsKO2uM0FHBBvu172afAjuTpmoZa/rbC3D9kF6wsg32Xay5ginJFbH99yYZl+oPbpn/LG2dj+KGAa168aDvD5kBCUxpclI1an+oMskjXelgHyHuQp3EigJDsuJFh8DcyYTPn0lS7+QW0FfjpHplPYz8vmH1xwcmPDWZKVhSmK0u8uheGbdosVtdDlOoEKYfoIBIuf1n33yv31laKV+U5fz0oO/DlNbQer3BcnVoe9SKHh2qV/5IdJ2xLiAZBAUKaOnfVjC2wRMK086CerL36npdU4wfWNO+I9IBWiJR0noYcky5ZHoBFYQo0TehRxIYAa+N5rmDL+6xkbxR3/gkoDUKIZkreeg2xRzSMvznEVspUyFQfgQ9aWPymdRo0FGdQVMZGNRUsn5OaON4coVBvB7NseU1F8pqJgCAcWEG/B5jpdlnFvU8ntqu2Ws2aFJUGhMUIro+W+bM9Pv58gdPgtxX/t8sOGbw6F/Il2QEuFh+5FhdFuizoosOvbZ3+iE+Ed3Rir9t0WPufw/iJCW2xeEga0q9R0EXLgthHiDlH9XizBY80awESWoAJafL6JzSMONE7aQQw26UzFJzl5CvJtTEU2MeHSgyquH7NzAoJYe1HXQ9yO1HupR8C24lsMrUM+cQYjs71AwZSoVPdXvbMYvBKfg/MCyBZyD3SATroCiPazQ4vajn8x5wLRdfiELNTQubetone2OjwxmI9kMPviUewcQHnEc2UF+1PpE4ANEl5uDvj1Dm/7UYm/u7b6pNGQjRXNzyFEgFiLDN7A5TBdgzgZ0hpjCxPPPUUKpHG8lo64HV8pM8iE9bNAVKZ/dI8LVvyBfxq6j1p5S9xXQUxYyyk3zpmyGnAIe3VXmYyjJ00kDcBdGIeEIJGmH69h8lpdxq5lAgPXokSzaRrobTIjjzaH5v6uCB02UEL5K3ebGzyhfe7FNFdAqpVu+ZxQZEHPIN1zQMoNyeAWBCLcUwbhAduJMLN+e8rBAcSR2bhe0H33cBNulQJf1MJ1+nnJX4aU+uaJCQ/qDSLbgc2XORnsYkt1eKTN5Lj4Pvrc12GEgCXtQ2ynUvaK1mzoc5wRwotpx1eluWnuL2jqYh9brOS2jSO2NJr83KjhMZpPRbXU/nGCHmWopnn8+RM7BltmL2N8bwt5FZoJgos2H8sgBLMyoVTHqOLYosbboJaAv/a57LvxV6mWyxDwJsh1VR1cNZMsllCXPV0vmdj+kQ3k5j6Ttc2RrZD2fsScPxE9ELId/v3cvEB7AnQ3T6GPivafU80TB3kcOWqKk5e9wLib+rYUN2DnZ614FOxRDLcLfpN9lP76gPJQ1HpYBXUjZDP+vn7Ej1Am0c3rJELNHitP7EtjjcHU8g8qUVrqCyZlrI77AbyoaVcF/OIbGwsdWTEoI3rNPfVC2MaAvUB3CskPa6mMKzoHZAlhWzLuoMR9wY91HFj5mZ8h9xs2YDXvY22logzMG+diQrWUrxSSeZt3bsQf1fWaUJDTTwp+yuFpEazCY61oxrhBgt/povj4+FB+KUX4NV4++ajZwc1oZnirdWjUfwAf2aJlF0YJSc2YgIhPRWUqRJVVFTiSi0657FEAVHNCYRLvlzC/oDJp/BO9dT4r53kqp1OlsMfjaz6EerMktYuaKE3Q/40nfofKxdFM662Q3vqnMJtLSqaZGN7fM8g/MlT+Hi5utLRIhbIQVULGeQEjJeMxYY9ZPP22wPSd7L/wjghPE9QgfMK+7/QuA5HS0jcEJpJFadb+EWhjNG9Mq8ykB8OrdoCZVki+HZo8BaNfB8daVupiQHq+5x9NiYA1m8B5YhU9oM7c9UFGVJpnu8dG8iyVp5Bv6n+auOnX3T8RcKZfQ+0smAoLExdQPf3Xk9Vuw++AjdHByPbPL94/yrbWDvfkcQ5GRMlbt9B+Jt2UF1zE/RHHQRdeA1nHzYTZFCrOyy8yvKl8YhOBwXBlbXlY4yo2/DIicuPTp5zyVVcOEEMk/s2RNp8K76NdO8dnaV78XkhSbaw12iH9ra8EuLB7tZ3dSHaz3BIPtKa960Hz43dxY+7sKlhK3c0l/WKmvRQjgkeabLSSDZEh7lXPPGdGXapctPoaS7/PzJhQ/U0u8JrJTJKpXhK1o7HoO95nxM/bHn1JWy2hZx6qblfu6OSsoBmGxpazgAo6sLh3okFepNOSJFv7jHSj/WZ3Aucsk1DG/XesbFSZw+MgumdbJxKowrC/JMHZVhFc05ZlQemvksr522wSgPpQddLHxPtw1YuvKvm637zeFKb+XCcVdHyGMFP7LlzG9nc+pEuKzcBoWu9HEqJz2ZpmWK0ZycfUNTBtX1vkusrcgZoJbFXGCi498Sez4agtpVRjvVF21r9w4pb3hmXXuCJlWhwoU4huVgfJibSEDolO8PH5hBNhrDneA2p03qCghmGDk0JcQo5QbiIozFuJxyNWXA5PRUOrLkBa5Z/ICQ+eC0/PzPlfziB2ubQh4ta/aPj7D2FtDyecZy5RLyNoRR3erSuTz1tA2XAPCA7zh1PEQ/PtKgkgb8s4VuCrcbJWDk1TScWv9q3prVD5r5e7DId7w7459mRkZXgSilCLYP+PrtEiMBSZWOFjGF5zNyi3fN3R02J8c3pE1Q2X+wXimdd9xoXyrNQ3/iXazJkkIzB9UVRcY//+udeDKZePVCLw7iRp0ez1/aVNITH4c3i6GHP3MaYY4hvBZC+FIKwenfKOtJKuSKkcpKbnoSR51IM7LFYaklnW2v+H20ur3a8Zi8ycpBcSLjSvyQyGE/79onnHSHQiIexXWRBGh2u6oHivg4t2bSLm0x2zNw7MPxJNrUSlrHYx1lPCuA6hEujxACQp/A5l/IMUfOXCCboNNoCjC4mnAM4n0GiWT+uNQwNxR+PTivR1ZzSBT4+pxsgoIgTCkPw3KwnifGvONVLCVNQRjZdUEQBUQjVZGdoxN21U4jIHeW7MZ6+5sheJwaPYNBzm8X3JhaClCtOR7t4lyFcvr9eyESu5DL2oI578kLKRkvKQR+NtPfCR2lnpjeP10fLLOGtG/PpDnpmpmGP7MP8QWNnrA7FJYPTzhE03lHlJ7rNCpAfL7/JwzBBrbXIPxHAxWXqVSSLdeubAwN08nPWfuVq759dx1CjeaaQDKpO1Fy3w/ixa06QVEVib/UfXQlY+wu1LFCku0pwT5bVU+D9mg0w13zo7LuupPCpWXriNbJyhxyLKnKUt6vWHfHlan6AXFO5PLCXGeHda/chY6GNkOdURjPx5HwbeC33mx1qoHz4DqTxBssaEzJ8SpMuJ8UNZZ+TRscGYYYoxTk/B7IUICGGeDoGTqHy52yYNgjKGjEWy2zR+ix+/Z7aE2dZK4rLOCmBzpvBDMpF75YJDnS0vPlybPZcVFKkdz65gnYULbIlCQE6w4ktAQ5xbRa17O10+e+iYg2DgjsDnguVEdAee8EzU23/zczuWroOmov22aPAZI4bR6kf5Siyl9Sz69bk3w5spTjTmah8WN/Go4Jv3pxtjADF7EM0mFmQRYSnaXo9eWu70xmjy6ZoxJ2ejDv6hEmRccf6sDV8Vy/Ek5/FEWsYQuAhfH1mgbnIAJywq3rbJX6i3s93fzukH1/Lqby6OQXIVmv1+kBbBiNz+P1MaXSGRzuaMEmD8g2a2Pc8OhW5sotNsIq+82pvPumSCuIGUH/F8K8VuTJKb4IOsrpV+cX1sEbWzA5DRQIfLTxD0mrBmaR5lr10pfdUQ12xDvQXIdnR8Lvb0hn1FdOviDrFWjgXHS0Y8fvVCKXfos2/YomQhOJhouV0Cn0f4idZEBaW713A3z2DHXAKMVza9nYa6bQxM4zPL2b84Vnn3Uvzn2OuH/5d7ZlbNTjhzf/+710BBxtroRVTZmhDCday4Ci+pLDKmsmn0OLqsEQTBcNWX0Fsk5cOEQZ3MCsgfJKyt8tXxWpkc0jsbD5ABa6NtESZCHJdPnCqEvxIo6xaT0WzPFDfsYFEuNSxD7qmHxboEnHS67l+FmcTo6VvLtJss9mkyJGX+BoKyWErb+h/YqxTt55t3aeYykjTTUYrIEQT1rOxp5fGdLcynt11pFo2skce7EsrZF6ggEhwxE8YxR0Dym/PMFfX8fWbCm6RfmrToSogedKFlKnr/6RgAcSjbVNf50QEdcCXY+kFvMxECuz7tYWB0OdPwBI9ZzmtaWi5Axsv1Py3ginRGQryuZ+R+Ve2z5HITEOcrGVqAcnReHooWLTOgCfbNMSoGiaBUqGDkhzGC4Cv2S9zPw6bJ5rO76REh1Kpv2ausBmmju+LNb2TglRHG9lOMyw6S7WrRNcKJjKmBCKJpuQUvXHOjfM9eqvbRdL18DR1CLLDSdRE7Ct/eUep34ij0T0YB+Tf9Xr2q9u0mKPfMmrtLeWsxw+e6Nu+oeNfGE1nWFSXMj6upD+WnAV0VWIrPkU1TsR7fg6qXaHrTi3R3V4pC91KiR6UrvQl7RuHtuHI56apqJaOYbS9vi7zZpBvIcYz6ewwOMDcrhdtpQytEoGRsEFIwEURNyy53cK/yXPjJSOJHbw5RcsA3i7TittBDGK1MyWD1uH54WsLYW9Lu8KmDcNin85PjSqTslX+YJ+mGpefxmrcDXQ//HzqvSwWdkDB2USBm3iGjOO/0Ur1CfQNHkPPjxLSHGmHpa0wfnciYzP0K7am23K0udI0pIZkGQad92vkim5IFF+bSoNR0z4GwTlI8cbXt6FHbsiVli80EfbCbI3jpTaKnuwy2/YPE2+nD3M3HRvPMZ6E5adV/GAYEx10jizOLKQZ4YxZqY6xD3awkmY8nJLruDza+3MgvtEYKDVmdENNkmS90VUx5U5sMc0O3IWpeZu4VRlOvQHUWeqo2vAXGp1ltHdLJUMZKaRT9waH6oWzoBX3LsuLTxQjtqzXu/jjON1rU+oOaXMjTDsznVs2TcUDiKuCfq0BMCxp/1fdaT7KPKkft8QXYIAVsP5NIl+yiYZx6K+bCvyLhkk+o9LW9+OJyBCyN6rDELq7OnrJwoFN1Bop0ZF6Ain7urq4rwMPghdGNa9uxFwAt+AyWofYhDHeqMm3mwO70ULjeXQE1LvMcGsvePniXzTJ/098k3xou8uVhX1FMa0xwNgkl90sdXYfS7NuDXnCe+Wbg9cfS1NKbfTgGeoNBNauH+5XtGiqaSB7VJJziP0L7KNLfH9v+qJoE8gKXMQ6xGQRsqYU93AL8bfi6MNVdv9Cc5Pl1xE0cAL1SeUa78NIxlvc8NObvTGGmCC79gM+/hgHdrLuCtDOBBm43q2BgfT+4pdv4hdEHQM7tDY+8HHhmwygTpK+8glHRovPnUMiwXyQZgVJaE5PIoDo4qp+PoZivsU9AMO5cKeXcrdC/t/SJ00y7yWXOiZUeoJTZWZ7PUbt4OQLSSvZD7qnVAd6QRvMZsAvHvs4MOdTrYyEa4AdiC/qwzD+VN42k2q3Q6biKF9/eLfubs+mMppY8vVe0qRRk99609zapAYRrWadvgsiWdxCdvWGr/aIlMZ0RVOayjQQLr7/D4sKe23yqg6Ei2EIov2Fl3Bb+Hd+AjWjoqMGlex0VMCzbXmV05E+8ISCHHyF21C8D722FQU+BcSzmzyneNRZyfwdB6JXo60x38yyqw61laGXIqhmRnvq1V5l3N+N9SbqxyQ8UTcwG+JGnBFdBpmNIJOI5u7wkECdI09qYJRunm2mNIIVXAcoq3uFG0W3Qu31k4TF0z058G5l15w9zyt8pKiEq5ccf0RPIplS/AoX+oV/7F9+q3Nn1Uo3brQlXopsJ7jzIgJrFnM/r1Jj096BisVYTszBNfzRTJixSY8x5M3TsOuHbNQDmaMrOYCAaxac1MivQmJr8fMp+hflwWpXtWYoBaUV+cm+LXi7B1p74la4bXpjETK+VCZdHstqlnqHXk443topLVPPF41yZWPhpBlzMKWgQo7pgVuv+nW3hTpBeZ4DDk2mlGitR4Pkopn2MZOZvigZaZRJO95FELHUsdiFxrs6RkMn8wUXdXVaZYcwg0gY8P21Iix2LlGogsz5MTqCuPf7eeFBCp0IrHjeEPO8uDb3vm6ZbvO9FvsLDuwp1FFgjiAdvULk3ljsFl/9E0x2fgPMxwyOC5kgzXdZeMS5cRqWikADZ8RqfhOq319+gBWxa+npjZJen1sTorYdOSf4bTMal46ZlMwxJxjIUQ0VWhxlyxTBawW9DauXeCcCS3TocYOcG6LJ82oUGV74oqA7HinQMDMQ+0DP0NoG+1L+6r4DtD2F8GGtkwr0UDmvSUtwW7EdoRAb7Fd/HXkjHObt2Gg7fQXlUthDc5QAmmwKvfDVte2dEieE1cKopMf2WYDRWupccs9anbC6RUu+g1c7i1IqUWgGq/j5cKK5jB8BxRAgwUL4bSxrDIcYXnv8bJ+OUpcW0OS5sRfVv4wyMwbmzKp5/R/wRjwNnBTNaE6p20uQIjcSdd7gIyP391HblH4L4zOY1YwEHYHJOn+6jIl0mnrwp8dCrrizgddiNQ/hugXgbfrq+E3Gw/6xbLmEfHIDSYM4jic4bTgFNw7JqR8lprJs2LhKKiHiZR0RG1OT14NaQCdgybs/VN2ghkdW5bQdgn9S6UNRvn0GKbIVNraYT+f9u0lyra5pbdlVFlUAHJm3y3IiSkhJeXxPt3qrPDRH+Pyp7859ucfad/Sm5C+vUGr07tiRTqzdPkfHktZV49z57HKTtg2CbuhXzlfWlNvinoIuwS47eYOxjRIzHVC0plHiGafM0KbfZ7drkAq3CCyBz2SsZigvu7YQNuY0qKZ/wvFICXSnXrGJycWM8LmdNcEt8TXEe3aPKAd7hWd0DNjT+xANMygLhN7i2Y1FrwI6oou/neZP5Ov2bMLyQnpMbI8YFYfTrUN/Q/oxDJtI4SqcqIdKFO1aIITXpulcPAI3tdb303HtVogBf0mQTUuB213oPQMWcWx843qyapNcgPbwRtfoRXtbQ74EQ2vAxrvicFD8SMl5QfYEt5Qb5UsVq2YFWj7qtShCfnN3Dhi7BRn2C5KnILYhe9YDVnHw7vkeQ9n3K4lPj7zlWcbobvtiCO7J4Mxulc5uGRoOEnYgwdqsMOf1ZWERlAXUoJU1an2XJYXJcX6LXJ4mBQ+XNlqruU5Pp8/w6jiGI9hWk/gC5vyzxHUm8XYf823uQOQe58Bn6q5S1gl4aWwYd8G5l7adZrmpyiNSoKm/1/5VZaSTuzqxEgvZI4ZZZZa5BpBcXfaGwYqRRL6E3dJa8xxz2uaKxLZlJXiJDYSmbK2DnT7YkErHW7OWS7j9h4D49uFGXFQlXZouzofxdebE5Y+3cEIBFq78stTH9PasDv7IKy9g4BYgtuhMWZpCFokfx9D5kJ9uGk5pWSNiN1oH27nnQI//OIWH2a97KmDv1NZe3TiDslcPab+UWO4qbf9PE51bUweihz0J7DjAnSxHepfgVq7R9EE/OzjbR4TSso3t5Is8t+ACbtad2vbRZu6TPxoXmZqesPbClRJr+N6QiEUkIUcPMrHQTFWFxXym9gcPtMMTYh8KLMjja0lTiQcmFU/T0MQO8Q1aUKNOCg4yMgRzHhPzPQtyjKLg6Cy4cvAFZGJnfsTXVid6o3kQrWgjy0+SskNhWPXfOxMxvQAS1EzDWfnLLhxR0bySSWsadFz27H8fjH+1JZYeCSOLABQi+qHEksC+XlGTsvZysQNCAj/Xyh3u0FECidYtXi4+3nnl7V/jtqUy3aB96y3+GIlePd6z1nyQyIGc04TLsSRoM0a/SGyLwN6phzpKASvgvhhcb6imYn8b7QlAQbYlEW0xczH28lV3HTCb1vpBPIn4159lttRW5UUeOZWt+MuR9psgJAx5DqubYkWzoGRdo4vLBTh4keDMV+m+kPF85owmYI0OTQ2jNlw2qcvlcFWVZyzbMYaKNcJ4Xyps7vUMJJm0d5dTgqYlEgbP7AYDgYXOOXWqY2JIW1BGkdhdm+E05wswAGJmvCdizUXUUTnb9Sm6B1V1574aaATw2gTApVeexEPYERKlLkinv4Bf5ScaD88dLyo/TFKwCx8atmSRuheToXc7ptAzLIlzN4NUfzFclvVMI8KnG31toaPjfy8VDydANBNdyZm0M7lWIPpEwlsppNg+zjW1r90RDC/9K2Z13egJe5ZvEKikR20A9duzTm/pSrl2nSfmDGV52hrDsxapI9qhQu1aSzK/wn9m7cGmhl/MMyA0fo2DdvpiHBH4fOffV68jMe01KZFJ/Wew6d7FSyMkz7raraJOa9n1mqFUbHNTfW2/wlBzl5YF+W3+XZzEqwYy/SR25QXK/rRgHAe7sw1fs4VELyQU1CZORZ13f2daf3sJWIiysYMY4yvltSBYjiXp4rvKTWJ7RQQkfF6De+17rCwMe1nkfZoFKA8TLVSVauRPPLsm0bmAlZFB4c+dBNqRcYlQQLOm+rF0D+PAYhPNd3xTeHbFXsoVtftGYsXYcN0KI0JoRgM7er6S9zUQliaWnNP8M0Xqn7U0fjeLpXnlst70NTIsFRkG4UBjwptju48RjyrMnm5kIrYJMuuqmWjqO0JlNX4vcnBPMWHmrj004u2r6hz7y492VQrUDrN5JqYRPkzwjSeBQFPMVeTiawaSBnzb2ajVA2YTKIauULqjCtvvPSJuQyJO53NHVBz4ryywZJGCYtTclaMI0VspMRGZvRPdB9uWTb0sMsRBDBCBv6honvIZkuFUPC+NJTkIQVcdM0OfyvCh4ZtzrtQhCEHj+9zTmIbw5LdSk9SsdGUIyh67JT1Li272lF8M3kz+g1ZWMYayvrB8YxZqnAQwLHZ4ZdWWqbDCa2AUyMTPsIDC8fhAuZ7qgFBrZQPTrttNyvg/gOsgX+fWcYnQ87/8zO+JgbQYueEOQTebec86Dn8A/jesLGDh08tfxRadyWNnQRlm+7D5RL3l6HRn7tXgfAbxQYviBSBeYoAgvB0oAezSbYMjyXo5DijZwPsjHXN/TLHnY9mPGForwyo0dEW2l3es431Ia0SXb+GhZIhNlNWMg5xls1NsKL7nXkUXUwjhIPtCD8SU6xXT3UyXPKCWMsu3deah57s6cmhaLqiRfIQ0X9yjDNfwvYTY3rwErf9kv2LmHMn9UuplmZZQZTs3GnMLFXf9VK9rWPwg/3/eIl19wJXVwQQ90P888sWmQCic9XMQUEWS2UEbJBBouoyxtuB4jbEGbOjsmlxs0VgWmL7HdH4x6lQDPg44mBexMNlV4B75O4kHmft34thVb6TIZYnSLyDoC6ERCfH7ymBY3Pu3iQ+XFQHPvdO8X2azqHsBk+SYRNXE/Din06Elk8oitsTlLrKpo/iCx1jOiFysns+1OvDtv+wxCqKyOiw2/9rKI0vTpx1w9o+cQnTQUfzq2CNa2iV3b+oOOsLauuz3FGXboboNTPQFi8lcflxdvadRO9DCFl1uHeY997A7bLoktbU2d4IB72zLDQhdUBWBcAs8bO21l+0jIlTmHpNu7ewDyQa2xu66Jmklbzz4d3c4bKAGia2eCzp3/rPeE71jNEzggVctm8dT+8oIojk+YQm7YUMDQYDv+bci39jROO0LfGv6lwYHWVT2+WoicfLLUI+YgqDIIvTkrvp22iKGhylMhPlanibBTknF15Z7c1CdDmvd6yAxPyEecA9BCOgrztgLxq+aM7WF4oIgtFHvPrzIjLnd6z9OosLxoR+T3Qn5s3EKpuCu2e9vormENxK/25NBP6RCMj4xo5DRWqGe3PLyoiH6pHkkZCezZKXDG7Avd/wSiURnMiRXnZ850UJe1Jtyej2CQ5ozza3n2nE+cuEglXw7DRPP+A8Hi5jiTy3pHiTNrKRqTr6jbX/0urqHM5FKMjamO2/9UTmyF38wgE09TKbuin0VT/F9NkNnJbawASFrwAyjBl7jqjEXl3MLczYSXR9oxDohe1NjwvxAO9dnrcsh/LOB9o470e4gbZhT5EeTXAVklDr4SBy9sT2xPfUxGB/WnSyT4OdiMzSqAogyfaqpq4ENfoRyyueJM85vM9S3mx9ziPqblSGqEhzOPkHJ4O3QX9/519Lv5mygOrot64ymLvDDDVwUWaBFcHnLnHiVuKGSVoiA8Tsoc0qwASce6rE3hd77DEd+ou8mype+URrOfAWOxpA6BH9FUcfq5RxQQJfzQ7QscfPrkybfK/FIwk+LS9kQvYqPZgjDM2Ri33DIrrCNxB8zB73kFWgnV92K2uocYZ+m/KyG3QNgnhtDIMRKombMMVqV97b2ayfC+2sd5l+QDABD7qh6wO9nE6r1xwlPYZqkSR/vA09RBSwjL9Pri+xwdCfG9/SthyrRB0G8P4apYDQGqPy6dEYclpeA46DU5zM+sN7AcUkk8nOb2mHIoenUjYqmd3OtCRMeALxbgNKM62rujsQuQBlvPx1MnyGLYyl8swSt6bXo89WB0BEgxaZ33SeuStGsggE6P1GUUh4WC2DKR88Z19oxHKaw68AN9VK7UPA26YgGzpZYwkZU6Fubkc0VYCgYttOHXRSVYEy2jWUXZqdIVvGza0CeJ5og2HSgC9qu2j3xpaZ3v116Q1n6SqqWkICR9oeL4XcOInwl9o7H64m0dHhfAMsLK1JiU3YvyXdle0h9H9nHX3lQWhRTkqvzy07J54i8HtrKUfOdlQzTDGw8fpZ+UheBjRE71+MaIFe7H1qR4a9QetEOyh96Mrj6lKU8QqAA155APCCtHyW2Dy8PrWEptwaMv9WTvvVjETOC3FY8XIwf4Objsi/AI5JHaUNSjEwGI7TN0s0Dr82RaZtKwVEP6wOOwdNpzDIwEhjSS8Ix6Q0KeMFxcIPDrXp5eQRxrEFhfOhmyBaUP1jvhDM8jiKD9Dgp3LZwhC5cAa73yzFa9wet8wwkT+TRvSDmIwenbGtxFSoJnmZGJ5ZpNmNNf9+FD2MvtQfEJYYvfcDI6OJqKbBX7s3KdXebArNygsZR/kjI+4dHVfNqCljS4Ph/T2TfHtccKC4WK3jzgIvsEff7EV9sqyHjKqt3ea8j50dIWXzjMJUlKaJaV/C7+dZ1ExvNIH6lS0N2AiZwtyk4WWDCzscnHVQ3CnN2VheMI8kutnZtvAYeT1n7FlQ+6NkY1HWjtzmAb3b99/o7kIqC/vtVcZH955DdZ8X1KuxCK8OnpdnCJt5D6x6WNJZuO//EOJ9WxcnR4m2h5iYiMLE9de1mAO1Ae8fAN3stD19gSbwvNf4iRbMKc/U1W7uSZVWoOka8LP03ykNWaBh7rKIiZVh2r2M+T7WYge174tyh0XWdX4ZsXsex8MqN9XIn4MW/GtFhz4cNnvFuWD3Y/eKwi82mrXkdm8cqqO9KTkVc1NMMrshOwdq8vnqq1cuvT6j/atXo55hpVN5s4qDI0YSfnLV4rWzi9KRplYxv2sunsmpjLik1rHLuxH/P9SuHOj23w0vvcUwfrumku0U7D13Exw6HdljauQn8in2t5/2SVRjQ5L2GdzLbeAXrHW8wf4T20VpDf0+MPmJIDo1/ZsSWgVmWxYKwAEyvmbg8ygmC0anSzMmG8s+zAwsRCf5QiD0UMcCsEMYdAfYJjDjg2x2ss5ikYhhmAtLj75LhmdZH5amN1ZqqVVBqLQ34+G/Ut4pBIb2uo1R4UufGXM51AsMLwvRuuAMsJ/bh9O23OveXGcZ3joVdwQex/rXToK/7CYWKYk6M5V+AUWdzMlvjiNud+O8XAvb2dnOc12FYyOj6xj+4aYTReaE7dbO2YlHNsP0M8H2waRxnXPD679qjZZrWiowuVmTbHFnLerMRjjdPk0Dw8yWHXK4LcV6e+VxEJsbm9AXbfOum/jMRNyCbhAhUHFgEhs2o3ge/5nP5HhS1Kanz9Z02/0cEY+gbGr7OmkZIwgzJU/vIqSHNZo4yIG+7E8w7o7x9Maajxxu//yg/E2PF7fPHbSvCfGwqsV/PkNqMbvfX8TLRODXqJfACLTrw+7AE2as3rMbSCOr9zJ35eG1WVnXpJmz5kI0n9vAKikzVKP+jOewqx2xcDcuH+wXgJQdYdbNkUN5oZGn+z4SX6+JuBTX6GSKIheFOZ66+ce0pVwbD0nqJMITzMY/HRYyDiS0iz0ylmI/li3DUDUQJs248OCxP027nwYzFUPbjIdDsZHGBBqmObFPHJ6WbC3Tz96TsBR9MGoANBeShlC0uWWhWQr1zIJH5M9lpKJ9m7jkFttvLFkD6peWPQvfBrrrIDNJIuUGxa9USiGD9ievOLcIMJYY1bDSvQb5Pc7HC4IPZHsMd+ZiM9yzpV4Mg3XPi9wnt1Y+NpGw0roJiec6uPUHE9LrPb+KeyyK6oSekV+O8LnSyjBlwURkLMLYGEkTFCeJ1Vr6q217Z74yjkAttD7/fq8el6a9xO3FBsACtWf6ZKJ5F9bWqB3jHtXhAKsEQCEHLecbanswaeW5sE0pUOKeNY9Yg5EC/XDgwZudK5i8qWX+TSsEXClbPsi7eYOd/oy0N9pjYKq8fgaLiZcEhiR3I1Hrd1ekPTmH8uQPMH/d9CwEU2G9kVy8sUzQsNdAieZFwicjpAwjQiYUXa4SdhqHc4imGw85Ctn2Z00+NJ+hr34mnm7XMpNJ7+5RnHcRHxJAj68oNe9nsV0ZzFkS8x9vl6m4qJOvnnIHGe/7OkLaT1/bq/ecECuHXUYgsgfmRK1Dxz9qIv01+ICfw4YYujJwYtAdvWJFXYJC6W+RGV7eKTMCzsbu42N3jDYy5aYuwoQHmyynB0RDU3yPqLp5jlpn+G5ZYoB/3N+m9siHFwGT/xQ7i4q14YEHc+tYbjhp6NLSEk7iWcMHAEGZ+lxP7LPOOzHAz7huSPk5tUS/PBARFe/byhSrphkKeqW7K/IzTem7Ij0awcydOkz2WzzkK5tKsMTI1o3gfaqBYq+7eHFw3iUukXOBaUcZuLyr4bq0xN62WH2Nb8bCGKXeoG+V/l9P3OM1yLNhJj41107gKCCO5+a4RbirwPrlCT2MgBEnD23v6bzbUMOjK1a8JMDVmTh5K6CrWVWDvKttyuHXupSrjnZgqOCKGElcXvYPXG11pZsJiBCmw92Ptf8ZmxD8kYVsQdml2KZfQkYbkxaWnqIO9QVZKfNtSnjqAuJD+uqI3ruSY5W1BdFYIhzBVRbzTpYgNgA6uXVKHQ47M5B57+2Yde+siuY7L+ARXnDxgCuNr4fYSXplPLOIszGiWkqxABT4p3gxWHI00oqKMGRbKWDg+abITU5TAgvOxkb4tygGCx3pvdoL/11LotfzfF1QSAnHE7cdwcul6Q2L3aJH2l+rKbYOcrC1m8QzxsFYevr5B/HxoGvG7TCmucTS8mhbrTnWa27+9Fg9EHLhyxYbiSIwOdD3cGQYVEDhuLI3Zedy0uRoH02o8JEZoH/8ifyihDFmMh7qo8tzrPa2ZrMoPnzIm/sZ1PCRzwXp59eDyTDNcppQeFlAHVfEtX3E4xXPWagejF2otHijoseFYgqKYUCUmc5jpObt8LSBaHXMJB0OVBz11TjueBJ5HvDPIu1vmL7ZQ70eoijkAlCqDFuyQ9cY+kKRxnJQE6lFtNsP4SDYt+6hKor558/xbWKnxr+Agt4gtnKnmjcZuu0YDpBofjt/nSDrgjYrOXs1QWHSIc4+xGh4FRT12ktxt9lZHRalWm0hPigK21LJJeQuW3fPBGHxGghSgMRF4PhvxGYU7nQawwiuwsm+EcyfXCS5YxuWGGHUq/afomUmOBEMlVq2407J051+yVLiY8PmWD62PExQQU0V/O0xd42Pe7Mr2mp3zrX6q/Ebyy4pTelrkIIzNQFJVA4qBMqRkyZ/n+AgTpOXEZYaYaWXyjddUKI6WpXDx6ScrtG5BpESBpq5rNaHodf/jCp7OYTXF+LCUiVf402ThyS3ojwresHSk3LCquDL7NaFNG91YzVDu7pis6IdJOx3Kjm07PyPn+E79cgg4LAOmlYrYgST2fNFZUMKRAOPOqXWinWgnphYQ+JbrigSiI09HYQsi+Nnje3fcfra0s9r8gzTCYJOn923szRAkUaE3ONVSL8o8r2D2xELXwQ7BrGpl+UwpjuUv14z79abSm5ExwUX5W1+eINaO+6ZvKkz+7SjJ45Wo7EDQjzxdx6P62RcxtunWTI69N3tU7eVHqPPoWujHPAaMCaiVBjdwG99tJu1vCDGsCdEgfjiC9djXCQqI10Pc5iazh0+t1oxQtWDnfa66szXRJ7o1UiCCS7B7XT9lBZ2R04HUwx09LMb4TQ9Jc7X6MfVJBbQ6yNTxVXAtXXMuOfpZrgUM7wTGzKUp4qQqsIgH+micnW/Qf24gpijyePzPAR5tBGuL7bn1r4xmug/2oZFVJcbnYyprQMUSiifeqywDC1h2EnftcCt6K5KdQJV/Ms7f47n3MOjhLaQErhJf7WKi1h7GqUN3XJH5NOxhH8iGLzxGfYtqHmv31DRHwqDSTOEJ3Iz9VSCwfMMoXsDkYMAzBKbaQ6kbm+Y4WGEgGl/sJg5Gd+OD50cGh5PADx0b0K6FJNBALQCPpEVmDrCUxQDp4nLy+FHmbaUqLa8Nzxxnpe/8kkq8wsEMTW0FAs2BxUXj/K/LAaH1/HEeFzW9+psTFp/PqCOkFpReGMBlnpBp5vKz2szWetOz6YyyLGHbesCx+6Il8CRXTwHMzCm/4IZU0AG70xVZ6mtCMNNYyKChg6KjlD+4iyFjDZdXjHCvJ/npe/bIwwblwtf/jxAFDmQpb9IZHE2R/UQoVbqZ/yV40YYGfeXd3gDPQHVgMhwE+At/AaSxEubnZBtXM8w9aChf9IXz9Hz1NNBW1tL83utzqa6VCNTPvvvPQFP+PhBacKPdOWC8wcKHrRkUbhFtAJwuxaPJtFxAtMxWNTLbzdMVPMiipYeQvGXOsW3F2xjIfyXZSFKUMx9VZzj57sBXems9r0pb3pEgfYYUsJPqaI1nSMxkzv6XHh1dpOp26mlc0NSHOjV2rTtGQMfD0fRAgqg1ZrvW7pXvcQ+t84VRU6SA0TfVKG9oaaasUB2PROo9ECFbhBYRs+NVvBkprlG1mkpk5XuA0QPCtxgwhO0co8C3MmddR/a5LKVgQvub8IgH7PV5vD4qIhXxhcQDS7VzoSLDZ6ulUNQive3zg3dXrVHt6SZaSh0Ep/HF4/MIo07pG1EmzCyC4so5F8jTPYhhZu6LUgvnRcL4r4WA/SEf/5OEd6UHE6OfURAlpS6rUGLnGC47MeDUvAzL2kNLIDZh0Jm1K5NYiqqcg4Tjkdn8xCtlXu2Uye1Pr2wg8i94lZCp73/x8+aE2g1UZYVfjCGkjH5SvomsUeU3/78EBIDtEINrtQVc2NDpIwvkMOd1xaEgVL+YIKCndoCQqO1MaF8hLkopKQLGU4pDL0Y/VJfy5qx968sgsdPfGYQ7qzwqlwXUAYbTf+iAzbemQ+fy0V1WgXlTK3UAnRN+80aKeiFf29DLY4qooBPkXEGnlb1zez1QZV+Dts6jRorX377cSUQ6eB8w2BMJ0s+4wDtg8FaNFSfTikSXt/+7UzPvQi8sPIMbJRG6GMHayujjl3KfwmhkpMdxGNdZUJC3loTS04IA9hk50NCuULevHL9fNHwQSH+sRGjdvmAVCbYlqI1FApCg+tJH1dBveB9KCvC1pMl8b0LcARVDzKcQPjPILuCmD5wZRxgK26ZMbOdOyX52gvt0uPyGvwTr3q8pczBziBNRaTH2DWUFaXkJhnwWrxMuht2uUzY5vsfWILNq8hVsFmx/SNf1HgChrZOWS858EsY0GAH39ILSDYuOEXXHDbEgAxFqpWjDykHqbua15m+y6jXoOUrcym7U9cEdlE09dmZ1x9B4YnG1sImzu4/jN7d/jpFiUsVwQH+27gKOBOqpCP+aAqJ+YAi1aPqp+S9hx2FsYgPGz6uoHlY4B2f/PeTX00Uyt+sVIGJ5WsHfhScv6BBDLI/Wg8ZvdxmtSqnFHuwskPChZfvzBab5W0TL9TvC7vsBDXTEYV12H+/SOf7Zt+0rR30KGBr6dd1x8XV88oBmggE/GtJTQXd+O9UxafsefUymEoFm73u41gBoThnMkocpB8kOKLrQ9aGpgPjtTYgoGEYOdn28vZt/usitiUrpAPqOv3n5h5jOU3UJXDGthHKLM3rYCTX2f1CJWPGLIhUy0hemSHG+ZepZH86erlp6Hs+/muVH5bMhCBOju+Jzacv92A80b7Jj9jKDIQl5JBMqzhONELso6ECwzTS0VnLpR5HphKOWns4HiOfORR3v2ifN5HdIenL6wAsEkZAPCSb3fVEm/VhspxJfW9vtFmyDh9MnPZT6nLDqh8JIKetPQwX7iyxb0o5XeeW4uyZI37z/uHx1tLNCITUn9y+VCAUJ9LNmCs46cXKG57aVgnII1QkXzp72zqYN16ugP3250ixIt6nGmRrnXH32aGHhuWuk4bmZEATHKfDRJCf8Q5hFSLOx9JBxjfzE4iqU0KNxKIOP3vaw/5mOJHmIlLU0/EOzJeUQkgHpnZQhOUDK3n1pH2mXeO2LCJ92z/19x2NPKnIExpwdtaFo9lRFjx7SzROjwEo/RmlJwltoPXiq6Fe5PHyqBGoyvwCRWluN0hckGXgQCf7j27sfA0M3iHxS1cMFYFyE8WihSi+KtutzN5/a8RvaIufz05iOlmdxI2I71ozfz1ohy71HwxbjiGO+uMe5sR7cG0gtYAEGrK2SuUx56S+gwwSfu3OxEdWWzLEfcRa3xy/WdN2kwTlGawV8Zf3kakmr/D+iIXKxoA8KzSP0n4HPn9XPe668xPzV5Z5FTUWvucTZeJk1+JunlnF/s1txqSDiPMCr4K+WhhJkV3FSIIJehT3YQo16VUGF4Vo/ZLmVMyTGbhfKNp7N2Yd+MMH4GPCOZjmnXp7J4NtmMPn/T2YWUu1mwTAWgBcYSMbZTTl6/6rXE+4PDURLCesn9nm4QU8AAF3d41zp6U2+pJmM+XkWdthq2wcPkjk1sYBM7D9aPqyzpYxC5NwDtF5+X/mLHauB68bFiGEsAHI2WSsC/fm5LdfAMMFN3hWUeqW6SqPIRc1g7YP3r8g0YsbLuz4mydSDLLyKgTsif8EA+LOZHVPKQpVVWkpxBcxtdoJbw8fkud5zsXh4d29YSNs2VRvFZWLzVJ7KVPWiIb8lXhLkuDIO0Ks0NEj+xm/U1F79dZVAu49yjqyUXmp8OkM2Ma6BS6esuLrAc52OPg2mfxCfOB0j49x2R9VB0RpfWKNv8u+iu097dh0Kw05g8cECCtBTOAZ4xTF7rGiZPP1ahcdY2lec2PLgNtOeUoSgAw+c+28Qq1xIMV1vbywF8oyYecN/NOaK4ULhRfYJnERTpUAw/0mG66sLtFLRAHjApLQtsYlQXPNMkquH4ZAQHwybNsyPJOQvLszddKGdS+60lwcg5aoPWGHYm8NmYcbZxEKmqDyRlNg0SVZDSTNDaYtjP9ilfqjYVYK1YcyfnLn1YGypnZia+xvAugMorqcYlVEdChz4L0mO8tOurSsEm2tgR+aTmM2c0NajodaSCQOm8NQnOtW2Fxs7tlMLBYwpbc/8kKn+Oil4LUoxpVF1df7+6IcEzvwBsHSvqkRAS/sIK/o9mhhWuIEiq9Qg9CftwW84ST8IKZdCzt5wFsSJsf/mMBFRt+8HmaiTQ7cXuxmkI4fp670BdSFFmNg7O9yv97SerlV5vrUfenKwxifT6PJXdawPK3/Vsl8eNpsZAlRUTNGu/y9JbE8mKBm5nnary2gC2ToVKABgJyW8HCCwh6EdbMeVUIKzVP+RXTuiP6BA53SA7a2NAAYLziF9MxUpT1epWOxUfbZknl6PYl8f41/KGbPQ+0NpTRpn6NkLE9+Iiwb1W6xM002u6VgQU3qI87YHIT1qjzNxBrFe9y1FSozXfyvMmjjvRXvQQMLb76OxcluEiGf5q0VITmFn63FPBNaF2Tu1HOG59hWcDu6fyT9gzOblb3lI9g18jEfvmvNOkKP7GMX8Y6Xlzaebb78kuten2yFFhIVfyNvKgr/boO5tM/YcrjJxJxSyLnQrvRJTDpnnm3imGFzYXbJqbt6W8z+4tINV1Nd+bI4PzI/Xxgc68xgHH08L2vbJjdIgFO4Z4yXi8HhkPE08VGJcVUdSNngn6aUsHdUGXWPSwkFZCIbOJSKrdgsewE1AtvQsnTWrAPn3AX6EYumpNE8m5diIzqKZT4T44gnCdA3z9nM4TcsHC1kXGQgKKEnHW4BCD2NtqAPm3SBDU7vSDqgkkz15odfnUodEFlzkaMq5Yfgboita7ssFAl1hZf/2pe6PpyQhTD7riLDp5zbK5OhEuB+8SuwJ3go0Ogft01qV43s/8/xropkLzJLmJO7EXsXADG80sjN65Edp2NRUv+cepoNu64amW+0X3r8x3Sr+6BvZMpOkzNxcNEAo9WTqcyZhyr1YUh/IN6l+njGTvClYP4yt5muIDOl41ykzw1m7SJ7zqba0d6qhB3Tjv9QjQQ4HXMRnQmW1JkX4+6QtbtzK5B3lrdNpwgBpuun+ZJV4jGdjX7Xv76fXqMT3HsmT+sMynEaoaHd2VoCf/KiaF3IzVXvCxQ1MjxyNb+377QpUqUYjjvHK9vAFkcYWQXvkPq2d1QmBkt2GqXfkJZ8Sstrb92L1k3yJQNl2um3oTKnZi6Fy5aaqRe5hAdRYT7vimgE90EX6ndtWQ5vIZp/3cckjlvVJQfLwAf2hXE6FjFuZ4MofA3S7pBhaM0A+Ermbxluv5F3qzutNpmTjYHadyGVqPjB+K0SjHbKTMQetuClGT1Ez/e0rIo0DUddbDOVpYFXu2zn6U5svBl7M0G3TOe/9sc64ojcuvqmrdFayebacT7cHvatzasmU1WnLXfz5O/0zRN0XcnSjTma/WYE6G93ZNb7pxaTjPlNg7b1FdoDN6U0Gc3pXEDSCNeb0XJSFIMfRaSU/IrspG8NS77vbp34kwM0Z/LOEgu+s5B5XglHU5jSFljEeG7B+ft0vNJdyf7usqORQrz0WbKgJ7hNTiV6xDXTu+I7pVDLTj3JR9Tcj+R3oiTS91LQhrVIX43YkTP/DDluvVtCt2/AF6Ai2e2kLi4ZG7po0ere4xeHLil4YwauTqj5cWbSBJe2UoVkSOTyE/W5W8W00h5VYyQOwLTDRb9lanq9sdPHfeuo+4DjXTVbnA0mraJKBtUHvt23eGRET8Ps1VLo8dPbwpkPMJ/OSRuf0NU6UjfQX2xn3eyjjs4MdHi0NRpsXwwFQKlzm7Gzpg0fr+eqeAeNKCpDqvvt1NE7hMfotEk4F1EQHaNmMhocj2TAVYiO5MtcHhOntQqBI5r5GPW2KJeCAW0ZyNL+Yu3mKIn+w+nyJaFNc5oMDkqYhdWTBtjByghj+MNtJKoEdMDgan4neAgplSHtEG5k+HEn5m56CQqJXKzJGtvnMunTWKgwpnwdEDmEVN9wRYnar5l2tTEJ3dXlJw5KQVTT+9dTAfo0jtzrNaj9bZ0hYcm67bDkMOH6fNRwBHrE2R128dPUpMD3vytvJ8Uzro2bjJJw42XTttFPKx1dcVVPJ0cZLM6BsD4G+nLwLgXu1i6iDUS3EC6HkeuAZGjsRt4cm9aHZUKFnO4BzvfrEK61Xbl6OyE2iw4LzMaDR6PVnkP8j7C677h1laHM1Vjdphg0zCO3WhPQNxu5JP3E0BGE1WWBXoXQG8VI1AKzZpS9b9UjKA69MiuPvDzUXJ1W71KFSE9SKq8qFPX541mOWVPqBG9B38NR1kMHfPlKUMoXNo+iCCn94TeVCu0piac5zpLMTmvToVjQjSVfxbhzDhI/aOmUIpQq5cQ2+xMhubwn28v7wdO/FUOUCoBq3/CZ80SNz6zZWPy7rifS9OVpOAeRk6hGy5fXMrxMtdbwVYveSxrl63cYDVJW38sXixYcckl+2FGARze019vHf5xgx1Lekgth7r6TR7UthWqkWoOcNgU7PMZJcLw+O4JOKeFBSTFmyGrej+3FuhV5tXj6Cu0ezBRKHwmSyp4/u6gLfMYh7pQveucYxFRa+F46XGt3DBAg/PwvuChUjSBH9DnP7nq+1F1hYVkoyo3FKicldoJUG4Qab6smTt7Zab9rKsJ/tnWjSotbpnJFSd2QchOL0zJrHIs/8UHgbanndGibeglwaIQm5N7c3UXNiFCLbH2Bn1LfYE/d/XV8ANc49xaxh1yhE/+uUTPOHRz4eZmIeR8nDIdBIHFK8fZTlWnOoC57oCFcN4uhZrynf1fTlTdr2ByaC/u4ARRu67llKOQNXGu47rbsRhx9840+BBsLZu7oKSo8TlvE0ZLN1ikGrvFd2jGJsnAIi+Ha1eN8AYSzU65o4wz825EifQPbo3rj2Og37pGxXrYFad0n8TWinaCN1trLP/wXZ85/kXQneJ1Oh8FLYuQImemY/tvpyWsrst+IeBO39pfdjtV6OG/EZVPR/cmVGhZxMum7k7bXDRG8J66HkPxHtjG14vcnUrAmEpmQ/Tv5LzHc9RDAt5+3HPdKFq+UB6QIA4HUbqP0sELCSnRPQvEQ7Suv2Ek59EOO+vs/MuHMEkZRFIIU39zoGfEBH4bVaDcLInVzaR4QXsUiEZ7T6fySf837ECoTugU6VwfbyGrxTZUlD80B982bW1FIQpcTLn5QXlPRo2FgOhYWbFppkHBxkqsKtIpU2yVsFpkQ5M5QXF6p1CMRhmkfq4Ffp1bBr4xP/ueAX4j0ZHoBjZqVrtd5ZGqn79CkZFGM5b4U0PuM07Nf3M070vlZiyoUUPWk1Lyml+fvU4hFV0e+GNCdHG3BX0AWq8w2vbsGS+nvi3Q6PYJjq21efDwxia4h2i/KuZOCTwiIWJOs2NWls1mHq1tNPdIPgGohqQRgCNWg6uUfUolQ3iPL7q6QSTWUyCBGMT/MfZ2e3nAWhf+sEj5GfDkIqeK+4Gu+NokGYyJf8W1AUxpSqHTPaoxreyscluwrbSZfiKOZn7dhuXaXkd2ETRgVBZPRFgKTS1U54m0+wQ7oewdUEtmi9jAHyKmMIkKsVcOaz8RStO1Z8c8C/752bi7e8lHe6ItQgfzriu4uKkoCZJwYvIj9NSUUKpSX5FztKIux9BVlBCHu4u1uyobWdi4csx2/pox8NVGBKR5Sy32zTl3OvU0b73+tDnLSqllfljfk2D33ThHOeQs37dgmTrE9WMm2r22QUAf4R3YoV+5W/2EoN0oV5Ftov03IUJLUlVgbaGwNKKK/XmtK/2duLMNL2kRkHaHSnZFX3Nqr0mKL16naWmxz0JDVhQnisZaLYDaM+EzchUF8pB7BvsCTPlnmnFfGDvEkFt4yrWbSdH8HlftUUtZG4IiK/pXK9u63GnoYnuBZH7NLrveOlXqySa35WbkzCdICR2Qb7d7vDtUUhky/zvVChLgOZyzv1IUCAbYIXlTHInMKLHTEe57s3xu/deAqXlKs/aP5JPZKoDBtM8ZbaZsqfeyAtJnYxIdLXxqx8QkHxhs4X1TQ3H0XWU4NHywu7T3xTUAEPBjtKkOrrEK4xTADOeJmWCgzJsxZG79ruiezj2rIl+vVACbweSZVgHqftfYWkWN7x+z/jpUbs5J0Quc4dGFv/iPUa8IX240HxfD+DOVBTrbVrE1VvOYS3Y/56hNm1awFUis3Myjx9LinVmgUucBxlSkR4qwTmj57BwNjGCUiNL4qXQJ7NztrPDm4ee4KtJml0RB3BUlHM0imINfMy8ljCOLheCqYsDNY9r/yNdbpaD44FHOQgFpDHrZkAED2EAAHUn/9yWbEismp7YzQY6PcXk2ATbRtIvuXd+Vd0wl3vwaTWno1Pew0RZP+mSr6213DJmW3RQx1qDnR257h/TAtm2mlxTi/A4iF5ubr1BhCbn9NEzT0w6heCKm4aZ3uHwna66x9yBbU1MhxttKUXeMc/Kek8ZrX20K8VqBMXWrXK7dVxKm0cAEP9u/mgVKSWpLcNk9zmUTxbrw4hiZ3sSNmyLh+7URzI3tyaE5lerrkrnt4gCpYy9A10Rp91JVXN4r881ZMk6DTqQXR42SdCORaPGcJ5rgPSLDsnsluIShJZz3HdjmlZjlrGqoesy3/ev+Af7FNPHMiNmZEbw0gYKxUn9GR51VK3URsfrhpHJC7haqgKq6zTtMys4FBKMaBgHFxwyHXAF4wzJrtaN6wxXka7sFz63cC0tuLcjYkH+Iu8DKW3y2B/o2fMEAoYWvXhISwTkZg65EuQq1QUadubbqLo05sSa4H0vMMcaDev0WmmYIfBWc08T0jI72MIE8/N4k86p3KtlO5bLwpRIcmFAThbtFdKmu5Tj434mQX+O80JWEnTX3SMLRr52hrGEg5+1xUIKKzyOT/LVCLf9WLIuvPka1s5FuGxZeisJ4YngdXRarmTNJ0Lapr1giYZBTvHxHPgIoqUlgF9lS31ZzSxEkeuVjJTUQPZHDRz0vw9yyEY+HgaYuDmhyJn0n64i92B7d5VFQjuljPadxmSU4fHDzcfdgCfzdJfQoEUMtK7V3MDjqCevLLZHEQ36iemiPvzttP6LO85IHIXRL2LpPRM6ZZwDfs0kpCjezv/nRAdrnXZM9G/zvVUz6XabifsThCWhnkxfTpAihWnX/Hlr3qv/qi8C+AYsaiisY29HZcWeYMP8iw+rKl1uOsDADMhBplXg6GrYMceBjTiKj/NiDQa/DjFmVX6d+9uzi7lGtygS1h1hTPM0EgJuzAXbhmE/STi7Et+uv9VsI9CbzlWdUdtQxthbkW/PMYBZftRnCsyBKEZ6+1BDtKP3lS+LPlSCqa+PguFsDcLy9tqrZTyhIS0lpQeTc9s+jZJ2zrf1hluw4PSzs1H+in0iJ57QEowznvNILLXrs1f5nlRxkCexmzR5Q+PUdN4tUrxe4kxLd/I3aPW/+Qhv2v0PF++bV9/kWGjaodFl2BF/jsu6Ffq+tKuHvnutbAc2D5NJ5H9xiP3pMZk/ZGAsctsJwJ/g2ptfa0HDFYx7uxW1DI99tdaN3RoyPkYgwG3lI/gTq9+azYMhGBHzh5O1qlgdhMmAoEg1CN7/CqHvdUXWvtFZu+3Q3V2oc6+Hau81+mTfWyBJxrE1fHkdl5oT7/FASmA0aEdWv8skwg83rPSRuqcUbjzI4ouKx2I/sc0PFD7KsseKwfBffg+JdhCN5rwgXTjJnLkCnIsOd0ajqw3o2632UYig6R4rsX8yjclAk5Q8YGiS94bKfbej2TWx8g6UgBWTOy3JiB3R7gfzM5K/IoG2L/lJLYizAkjgqQQk+gBjN3FeS/h0m0h8688K0AAKrHEsgFSGvJo1YeP5vaf3ZpL0A9/SO0K+wzJVYY4gL+0L4BZUe0+cWAlaZcvq1DlKvlAU0HsIeUlBZc5iR4RPfMc85ZRzJtvG73+JHORyTwqoFocChLyVP70F3s+pBHNfVriEKb5s3Tu/VUluGTxV7CUQHXF0zs071dOgxIjrfeEqoPiBJPzWOF4A6vtiDuzw0cBmgOZPPGN2fhipgwXTbzSfXtaAs5DRlgjDK2xEcJ0BJfi61LzEpvKrKy1vLKad19/wJXQtYnB3/ZIx+1SWEqYqDpu8PB/P0YjVRPPBKPlq1/wV7VGL1IqWHfkOOByD3skSkVja+P8rEX868a0wPk9LY8x68jHAEsIyFneK2eEFoRKPAuwOoxN1eyLppHNjljSV27w3+f2CMfLMHgOKAy3gdL5ha7AiCOx9g56E1ySp7i166mUlU9Pr41LHe7eEv/7crXJdcDyItieWmRP1BZMCesrBlRk5HoTIrH3cg6WJfsVH2kfMhP5/KmsCsY/lCGJUw+uGI+YYzSBZlnjscSHeR5SDSay2PoNNcUxUPXwkpS6uCv6iIa2tlSnw+VK66QvogTtAiGBIBB8aDpLO0ySCfrcBKzJB4gJx07cI3FTLY20d3aKxPeho1jKuBUCFwluJXHmi6722MDVheghoB07MxOvJhg4e6uFdsfx+4TsUx4OMT/wcb6H0qFcup/noxguA9+TByrseubsBIsL/JFPEfjG0lkwp9VEERy961xC8/Irb/LcUcp6deByTe+R3JJ08XfW1KczebMLtWXBkjXBzhfwgSbUMdQ6zp1JYisGzSYLeSmCKpJBafimY13hHVXDYqbF9NcfUEhO8O9OqgEoHtN4pVbfsThXi01fXCqthZujvQP2vraRsZV20aiLxd9HZeRLamB15jaYATzcawsC30cisEiC+QfbtqSK8RX806DVPwD+wV5J06Z6JGSqryyXbvOtAAyX1b73TUx+Yt5LI7L8hIUdF8IoKwvHGhQrSRsTNtQvr8Znn9tBElW6sKzqEKPxyjgSsR9q0E9AOKphh0PyIR0Z2GEhGchrK+Xlgc15bZexORC0Ax/O6PDn/v53giKj2bdntBoybcgiNaJRdUaE2Ee07K6sLeQjT/wtefyvemZfHrazB+isw/i9INi8/bSxKcXlUWDl2iUEc/3dVqdrv2FtbBJM52T31hIBRnf01/WsRsXtDbAHTyMtPt+MM7uQ8ZuwwAs/u6+BhqCI+QEW4aTuMRTi6xGlzous2qEGNk6TEuY9RU33XrTSYFelon3UCht5otSntZAQmYusUD0RfJod2Bg2B4bEeV+jEutPQM+wX8kuJcKwCjlW4sYTPuQA8hk6PmxVdznTlojx3U5SKxDxp7HScN4uAprs3mMaeHIHZGyRvu6fkdw7rMbBZUeTL+5gpl09CjEa0sjqIG57wwOoPrKumtE7abdPtsL5ZR0t1kC3I4UY9g28oC9wEX2q+pYEzdqKNKhPRRh3KkgaGCRMLNsoVGukoaRIKzlqT5w2d53wy0nRwcsxk18xeNkmkrcS2luoZogN4JD8J4szbiFaaGTjt5g6r+Uw7e/hlkw7+OQMPUsVTE3GbqZhmxHK0HAVKYRekKFKCdvcvUpxIXn7ffKKiT7Re6luliYiLZ9q7s7VKuGyV8nvqO6eOW9Zb17LGdI+PVXsbNymQvYIo7rmxIOi0hUn7JUJcsUD5a+l6W2b2l8S24mG2hSx6eXrrP0aKqi6z+s+CNWYxLV4rDra5Fk9rvWJRfT/ciPzfpuQHcDUjFd9iZ6boUtYOfRk5cLqt0dIWYCl7Yc7cSM2Sj7GXlD0wi4+IRtAnDXx58RSeqw091KCKjwIww8QEKaSXjQz4jV+bek+E0IJ4eIYLuCcItoMaYb2gwDEwIOZn5iSnSOqyWcMpfVGpF8L5FNscpw0DXNoeCKV+ix04zLKG+Me0r0sH+WRT4v0QYfAo97uoXUjQRzIGZ2IWKa2BgtrwTDPjecnrrunnAZxQ7dZPFbbE5+xgJSsQY619xyGx0elGtTdPZtwZo8ohXuILktddavGOs18EnnwnC+uyvITDV0hHRJ7t4FJh8iDA7BZKcpIXYbk7l9V9Rg7smZ8xfV7vpeDt1UTgdBhnRhDUHn7o0A3DaCgxnWfy6GEabfzQwSDG4CaoRKr7h4c8VeY0GYhXKNQGSZ6gOp7IcgMH8ojcJ/NduhKDb/6LkkCxqUZUo+CS2GyZFqi3yGQobso1pe37Cx0uRZVtKTFosAuaHf4Ka22OQwzr1w6AlrrndSCvWroMzM6SeMvtE5dVNK3Hh67b8QkTPNCrjBCcYubRTUlmyrvq5c2S1Vw0D1hxjdnhM3Pi2l5fKj6j7J7XG8Aa+q6QOWKHZslmN5zovXabwSevVZzN/On5NfsVkgqWPBmIebsliqEwVoVUhImWc9aeQjPnEEchpbKgywP5HotApnR2D6mdxyzITU5ilOwtpPF9zSrNijJtbQRaiv9qZdIen0ORKJ6mZq+fY04+tOCd+PHSzRfvPyVU/mGAh0ZHS9Axi9veL/5nYhqlGvuxXsw4EpDojBOCIJHj7bF3UWcKzOug0JFY8JxGoV6N5ImKixt6IXDvijQHSN1VY2tRgT3sW4yzB68MypSfjsQzGIzg6LadbObMk/9T7CLsAntvfejWxVmDDWglUxvRDx7gg7AByEQrW39OxJ3DG+z/ul2o5NXlPy60LzE3saQcUcIBOHFr1Nd4h4MfS+NtL8kwSKaJRlZeSGaE3N2X8G1/IYCrn5DuDmonTOIl4cF2bENMyXzMfF7gSQt3Xk7FHQyAC2y5hRjyY+AnEedAVrLcVIhE8bOqcSKXWlgsoQK210pzEX3v46nQ3toeD2E4CuKy/uVKew3d6F23baWow9u6SHYM/jBQRQAm6ah4wCCfIP9cZbf6bQCiLC59Gm/gnUTCnuPXzheFGZkFK9+oh8ukJ5WtbKLG+UdlnwH+z99QCTQw83dJoPc0eFZ9NNwNIg5CnW674kGyKK1ZKVPX5pSoAZJxBX2e8azeGAmghI666Dy740zj7pRoQ0Oa/0QTMqi6yUFmIDySKfLJTXh0PW0GJUDzO5ufRUakqnEANSvnWMM/71DYAx7K2xayEZxKlpsBv232vJNktqOYkkEts2F7uN8/idK/Y/KtJxcrl0qQEs+LGiEW3mlFl5K780Z/cMu40jUJqfUVN/axVYEvGUrWnoVGQOnyh/gyM8rAKNN16vHq168zRW3SmdwHk4xI/YmaXMas/q/ofKYcRsn7XpvlrNlfIk0UnR4hMDulM9Xkvq9RNvRu7v9LBFYYn7nzraJXqvFB/SuY6aLpLjr4CxN4FXVjSILj4X+orhtp7U7yB/p924UqwT6UY5E0lwCIBLc4vutps8aSm4cZWAIHukj0dtnyJmo0Jy8qsyzn3q5jL+3owIsXUWFyCfmJgyxZaFekvJ+fooGTDUhv0QXU0rVCW3KPz+XK9NhUYxQZn128SPnnpq35//0kUSHNRf4xtPB+AEi0ZYYXT8ackB9CL+oi6C1Bj66Cd+JzTTYKtyuadNFI5VfcL6IloRplB5Lb322oNttF77p54g+T2J19/GuHYaB8AaZKoWsML8nL7/OmaFnMf85Lp0Q/+9iCH5rvKsOLr+pgoElzieULx6aiwWYu2VsvsGDoK+zO1ry7Y5WZbzfe4DrVD1InEPg5H58F7n/AFjf2OCOtGWiuEKtkreQ16uTIflLGvdzjAU5SaUdd0w653g/T8eJrqSeZ/HRcP0FBS5eaVr8cGdiphK9xCin+HF6ZvvJ4ldBMRZ78MhHGeQY1OnUQbOKtEaGVGEHmwAAVExOqcZfhRAQ7wzqBydJzKeUxrqwQUO9hmEOHB3z24lH3gHCO1N5rZb1GDHHXoYbcLBHsT1aAr6q7HsQJ3xO4u1oyEfSn8JpW511/9xG0/CTslwwGq6PCF++WwX2aGrBGiaC+BoQWhUi5UDTPvRoHZgCakgR2/3ZVVw2hg+BXVSd5100LMhyieGRUR0v+ad0pzX6oMcLiO89x8fRa3gET9Ri4vq0nNxI3r5aPcSxf58G0IGDNFu18lR55PX3blSNBpZs1nve+DzZTQQ5dY+4rNcHc6Fwsvt9K69UQIQEbUQvEwXBZuuuvBiQxMINS5pDnuUtdw8KqQcHqiHAalZfPq2/1loHVus0MkZJ6794wQ64hLPO315O23NVvMq5Zllv4qAQRLvzD+ow+2I0D82FZBZtk89ffai8gedBrt0ZwVgEEUkmjxMy776B5SsnLsui948/PfTPE26PkRVy8n7R66+z0kEVUYrLRzorBRmtlxZ3dnHc25+59INy0cFMVeZASMCextJrk788OU/vNaFB0Qd5pc2C/oFFPzx4TwQ6TZWMsjHQu5kwFb5DZx1W2I22kpsGBgpI3C/nNIBmaztwiXjMGT/hmqIx8CLLEJ0ZEy0KbcW+9a0Y9csfkF0WKMxvCUxV1pyXCtkxn0t3cOb3rQGA/1TEgBj11qHLZiV/jeSsIi9KbOynfqFPeN2JoHLwDj59Qva8RXn+1LlHHBMFNcxIVRB5yQOZVsDtPCVFEbI4Z3sgUKeiEhxo5BUgr/kBSJN9aFEEKbV4o9ly3Wz5HC9yJAQTBCdbN4Zc9F28cTP+O4sTk5/8dnjUL20dDd4ktlKYdYL3JR1hF7aiyUWTq589dkykNBfsTU5MoFKT+Vji5f5Xzn1i1NSpFzm/SMoZ8ZKJsoKJ4xpm5u1zQGCoEzMqShuwrjQvaDz73rGgU50rRnXrvevcMP5Vks5kB5MLykmIW6sl1L7IUHDMQcHk8PMQc9ee44g6805eg3Xtsw5zw1T2Ln7IzFLgtjopPnCAaP/FwBx7kL8qCjb1ul1OjW9GQS8q5gpWTrMjDfU3Qi3yX+57EeaITTtbXWvMC4liFh/3kgG5riCrJhz4+2KWtnfGEwHg3bghNUwUkKfNcTEJzHcWbJk9gsh5SN7++DmpSado1bhD12VAmn3WtmZ1bgSaXLAMWX0IqrziP9TrrqwT2TyYL7KCeDwM5h1RAh2e4AxOMZzHC87PKfzmpOt5cauvvEN691y/KnelDk1n+7NLC1MJaikev6Db12mTYf0cPvVDwHVsGw9/qkqqqq+W8pKR8yV30mx/jW0skNo0ujfkgRx/Zmyz7QAfKdJN3Aa6/FfavjR863MxcQ8GbEtKboznKE8968TyOOP+DNF+qZhErW8xikPm2PMFYchoS786qwzoTiaLllFOJkSty+HM5ZtqKbngScmAk7xMjRGBMpD4+hjo/AAbB0+hC+SjK48vut6dOI5gkmadshnbcJrLBf3nYPkQJD99u3eMs6kv0gtAqKC/oaESVI5AQKhrWUij2FXOQ2+wgSrkgnoSxtyVFt4TGSd8LwgZVWGskuB/orUyED3XZTHFCD9fBocSiZo4OfB6S3ONFcNkFMJ6pz5VvvNtlXqR1t8/ZRDWHLCb7xpt9OgT1ExblsJM3aqpW2KelvIcsEekmE/8K/4zjhd8T/D3jv4x96oHyZUdB7iGxFkTHqrSfLXRnTPVshFtTrltoqWVi5D7MYgDnzNaeWykLvhBLkKMokpMe4rGt5fDu3Dh4f34PnqScSqE4WDdVUaYRlmmYwjDYnEqVoAACfKM9XlJQ8nBDQOGBmLn4e9tcJ+OPcWfL2bhFG6Lg+5cpAt6WanZnW0sYq3PLbP3+BDfs+r2BrbOZg5WlsM0xFW64EczU2gISC6VzEtmxU98t+J1KnMbtvWLvnCzcMcG6pFmO3JCev8TIeYUwjTlomMAPhVhuCqOgK0C6nsrh26MDmnRfFKnHr+fuGel3CXviZqNXGmdlMT1+D/FUGQ1/+ixsak6WVw0QBuSDTuyWXaQm/+l2JHmpAb7cnUz1SaESFLn9sMCxdR+2bRQG2Nj7VMSp09Z7woFugfdU1KcQhQqDps+8E7uTbcwD6mjyWjuE7Nlxia49KpGmZd0iJz53ci6bO+lKc5eC1AGmVC0xQrICrTmSVEqTEgxmaz/pxyA1/XMGrZ246/sJzjMOVffbQtyr/iwcnQnsmJpN0II/cDw/4MfSG6YnsWXbg5zR+DGLHbiKy2UP2Bl6zLf4lrne7JYxrZTygRWpOJi+q/CbFEa82h+DUpI5KeANiAtEVI7mAOUXyMEMozwdZ/mwn/hexmlxZ/ykbXAtGHvD5qjDCslykD0BNfe/tz68fVurVR6E+ngOd2zGG3joyQG+Dwi0bMPLV9NcQYUY69o4/zOOFt+Aw6LGgic3NJk8mCz2+HD6w9hZJCOgvaCK5ofJCxb5odexvTOPB2L17uccmo4GpGrbXPfkuR4JHkmTNtKXOg2LBi7ecFWuox2yL9Qz6fuyjay1RN8YP/aHJ+a6dSrJF+oBameQ2j0xB05CoWzsZMwsfl/nmQ5OYF6IfO8J6E2yug/DrO3I/LHn9SklHit4tVFVvWevF0v71Wz+e+5IwWeA3v5SPRtxGP4VBFpwUy1Y7q+OCCBisraB3FPQdNZl63tj32jiZs7UCTE5BBEyAwGEnJ34XX24CMxKLO9XfCsHG61AFtJSZFqzxSeaPHahzkaKuNy+Zg7zkkC43y8ltPKregcNS/JWVm8Wq9CbwKDA3QbkU35JEYUwCzUd3ck2UGlvR0NLrjtFhXJnJ3LQt1aKbqVi5K4DH7Asw9fTAydcqQslSyi8MkP92UK9w/68OEQV6LjlkitYicjWD4IwNYgdWX/p3L6Di5BS/WW1JsXNEWmhm6CUvv1OeKblP10Zjru6p1oVU4Uj0ZRdVQIaPIohhOPksZyTmNwYUbqaNnpHjIEKgU1pV4R1dWVLr3mJD1GcB0Mk+CQGeQEZPDnsaZpe+VULnCpmbdrNJ5JDHVDp7YymbKDSziKFE8ERhQtXAz9RbePKTbUt3z9wN3zQflIC/JM/c1TSObN839RjrdIIFl7t5XBFhSuXa1Bi3chmS2y3Nq2PFYDftCt4taxbmgnh1Bskt0xTAomydBmAunqsUhrSooN9rUZPPMZFQ7Ks1eYDkWOpHSmkJGi44CBMsEynA7v4lAYGFIklcDtMdPL06huGjFNPHk8PtJb3Ky2KiGzv5QvHv/laVAKe9+arNqyW6ZdjSRnwXXwb94e0I78ydA0347GABZKjv1xc7oGcKRV+K+aK3WrHndBwnH/N/NcZpxl1u6weLUaUINLXmvOrecf6mXv0xKbvervhNtSfc4Wz1JzgI5/w/u5+gwSA0qIh6W7btK0GVtILGPc4se7cZAz+1s7kCPL4Plzvt6p1Yu35mYolCEiVsVNF8E3ojrWf8rAbrytx/Qv9mHOcjUPg6cEmBLcHXI3EB+al1DAWeQpXrrVJSXEmaqX6mB1tV36w+4P4WNP3yE+kv2LXQ8gJ/v/NDmQ0VWO9IdWtlkKtKwIXgHx0raivgPKCCsdyLzVNV8w0MAlNCy+VvjdV6sRPnn8JaHkRGwCXzzsKKjzK35oiDApkUUKq1aPImlsteMVd4pB4kg6TSV+eJcvo53lEAyjjrQy7GIzNmw6Ohp8mUSlp8gubPPRvXdMPGXxFlLkX4qKZvtcRDXtV444fJlCtZv+ciJOAzncmLHv+ZBdz4BxoAzBfL3fMWsvDlz2qBK9sMG9jm++1fSVF5+YTCVcfFYJMIZdBYoKF5JB7empoPo382VoM/6rUEhVJKBrfHLHrlO/mbLy1SR6etLQBDivFLDtgVA7Ji5B3BBlS8AkP5ptuA6HcuiL2BhhOCcpjnuTDE7QcvOTMA/Het0kCrDpMBEsJLKmkb821dJmT1tdiJef3M5XmW0q3sd2aOjV2TVEAfQj6znffSlZlmuyK9kxOjgGZtiARDHvVLEoCnWCFK6PCN6UquYEE8aE71n0eniK01AXdaGbcbfXElwXQ0MV094F6GHvaCKxRKPEFWopGqzEjQHLMjWNRwqGYbAsoLO6wiv7i7T2c3Rqy+jZR6/CTrphDYkkZOMMPWuK7e76F7MQ9jlwiXCiSGM+vT9znoh80QDEXC6c4GtFJbDeM7leQmkuAQ4H+1rgE1/xMHunZKnylH/8nIkhBAZnoUqHu8RAt8EZAw7xwjSs6apEv+WKGXsLjfKKC9S5mzaF76Qq4VooUUHLBdyfq087zrlG1WKor5vDa2hVTA6DWD9c83OKtr6RiRI3V9dpp22xR9eCmsnQyKpNswsRJe7gC74JUrxyV/cZ10hWOADOXsx5H7LOJ+Oqggm1TNSbK2oFY2VY4VJ0EpcFxGjGcOet7KJreX9MsEPO5Cja1bMhXtwk/pxpClt8yudRKFaFDNE3ifdiSpIvOraoq82nnu3ZLQ3YgEg72KQU+MV6cJOsC5cBaGSOkN7vAwKVNIJ7S7AMzdj9Jgpe+mBgtfBOic3e8y6LG3WRsQeWHVX6uk8UDPnmWy1igKjLcyLN250m3AvduYUuHCyuYb7ylvQ0PsU+AYoXuB71AbalWurYrWl/i+LIsQddwI6H27m4nGz8MF2qA0EjaUAR+7ZPuAoqJHFy5jjR+m1dKlAiT2q7IRk6OdAMRsFTmVKmLAK5kgA97fzamksd1+spBNocvVMhyWqBNmfkzOWvJbiby4baT038xLpeu85b3t0CDkWjgF+atd3cVTgrDwYytL6nHnbcpFXL8eDNHnY1o+4LvTE4gTVnb/xlTKTCMYywK/uROs+nrWmEa5GvrZ0+V304mXnaXlg0XfRCwztUvTDoouvNd3tvwGfQY9r397LPT1iyIMwDvTgbIiZOkIbSgXE74r7sTaj4JZ3HOI1le5CXZE3aKF5fxPB3bhH6WKEWJBkMJ/oX3QuwE3wwz3J4rs5yO2LtG1HfKmx2GFXkDG70ngDho/I41Gavqk8nYYjSE9fgVkvOIqkP58f3kGW5dZo9uwMiomPa02ipazEA1VuqIbqrTHnvxdl+60EW3NCTvBwX2dPxTxIS7EGxbLZUilvND3j4k8nmzRDc7EzsMDNHP5B0ej25j9DbSQn9q313suli/3RB0Tn3hmuAx+LqtIfHcfzW2NCiuMcw60+T+f2yrmTQdks543rzaPbEjiQ0z40JK4ODxc6Jg160k3NyfgwXP0zvsF7pdQeK5Z1tlVfxVFfw2KK7MaJImP+3hTO/B7mWYuiGTmNTwz53bBjUTpKgOaaZFDWUlHNBdEGwv7sBCatHjd0FE/ZmTtweZvJlwB76uV12+8WIwCJ1HM4aMG+767xv9RW4fZr/9gFtni1ND2o4zLytIeLmtEakzKommKdUiNrI1YsEij+fcg1rQFfIEQ481tCcbDCWZlFvwkTLIznYuVJHf20MdlTNFrLBlMVOKiGQpofVzLRMjkM5T3Hs07SUFungB1fHgEgA5JQd3Of4YJ26z4+ER860zuctArGwNSL5TZIMKcAxX5fjVybkEq/XT0haE1QABDRh3x0pecYs/qL3TT5hJpE6MXUe7ugc+QYmF8+YKjI08R8S8WiaUUXAcpfr3CCfTUf0IGXIXeNBAg06KN9ybRO1WRgULjenekZJaGs6gG6lMBGB1cDh6k3ZOWr6E3D0bC+DptSUzXnPSp4BpyFYDW2sQOww6Ac3YyfE0tgjhd3Nw4moik2bIS+DNRjOyiyzjn2Su4EE3rl4BwkUBYvOkxMEkg398c9k76gEBIr4/Ks38PQLVAoKt6IDhBd4fsJlwRmByUY7qJxK90t4U6cV4yUz2I7ExQV6wptsLtvZCnr0GsvJD/TENbLL7H/tul2x+1jc5fiWRFiN0DguKYjgmsYcqUHHxd0E1ooZjoT4gEpDugtOvpeBcfJ2386/44W2pBcFEP14Uw7/XvFipwfBEJrBrk1c3RG47Ep3sLmqWKHCdpfQhC06KqvFjD8+jHR/hPw2e74ACXnKXYTS1OJVfyVLcJUmqIRdHdYqFyfI4ixkRWI69y0i45hdmGhvWGGNBWLjHRMOhw/6fyqKjyJfhPLKXLA7Q+Ek6m4R1GNeAWexnav0AW9bnVraLDTQ3MYPANjgPi+nLJ5JiMsVR4v9qVr4UC0AOz68AFYlBw7WEKGInWxY3ywm7Eb/qh8U7GQyQXwNzFSVJgsduXd/oNK2Y/2SFvACWFOPgWVPkCpHUCZsi59prnC04e9BDu0yCIah50pXiLzWnliURAtkQkeEhyOTr45wPYcJ7gCxhV1d9AfKhDuRYsEFwIP21K4imAvHiG+AJdcGk8gKTHEzqdx0/613iwNJMOu5mmBiEm/BQObaeMdULYxnJTldM2r7HVqu7AakvmgFJopxM1RsOhVTaIOc7KQxrvV2uqMl0E9ePx8dYVz2F6GgrWBcUfdP6LDJ7YUNKnDI+1Cbp6g0K3YwKDck8vPSJKvWDKXKn4gI1dYGnWphtoEP5SHp8OInKmgaZmM7pll3zGKeJi7PK+km3SfXDjXmPHpQ05TvlXp4hYKeHe6ysMyp6kQ+r3m5ba2v0F+BvaZ2wfsmOEBk4nCZcO/BwuQBk6BuPWXgbl565B5iE1agU+3iKUOngr0n4iDZtfLvInM43jp0uv/Kp2WXyeMpRGLFR9TfahG4Vz5BSuHaiQc4bhoaWhrzLOa2CfzlEIgaEk/kFJopRibfX3lQ01ZHfqgiATob8FILJFje7qiyeSIpgumQM6pO6njeJDfhEgRvCyjKNv4o2mWJ8IM3zOGYGkf2lONhw3h9plJnl06i+yWXW/NIIAeJIroFqaNPwoLW7YZHTVTnkLrTqsy9yX2IvfN0CSqwfLXI4Ib50x5Wwhn5/3zab2TjcDRXNbLsNhiFgzs3PgUA5Qp0SPxt02SXRW2kQJZOTNIarzZ1oJRcgVnI1sgpctCX7HP42VRKT6hjzZIHZwzMoXTap2aRsBjYPR4O/K0BRw9Q/CElBOEqCPqiqDt7Z9LN3n1eJaLOhGf+dQ0l5IL8Ult3jORiFj0henaFQ3RjTsn682E7GhoGzxLRzxhuq3q79MZaiTqTk9GrSfq4OlG8+Y2jPIoqySzxWjjKhxM2b6nH47Ut86cd4z9kNhbH0/SOWN2Im0BZriAzYxIxdP5dP+FqzY2cM8fBXJfLClhO19N2USOzjxYUg+tE3AdnBBWR0fT6OM2VU4UYaG5JP5Mq1Oo5+6J2Ye6+Gt+d0Ie2Q5lTltWeDCHO7FvTP7olgmMNo/JAB8C3geSyft+2j58nR2CvlIk3EFeLZaGb68i7lWtshhY7CYU+iScZCDrJxH+Kz2p/1Ol2RAg49fWoONSk+R3SCgppH4+mF9HBT2Jp/SNdEeohtKh58aCaALShSY1RslUXrNxPajRI90Nkkqs4JAgk21LFI08NzFHRsBQC4B3SCzaNErhr0BRfcrVt9M9p+XUDUUl4gGkglbnp9Cef9FMQMICIT1wI0YPa8cMc0Ujobykzq0MbnOH4pbXBsRycd6KjAXYiQSJEhG+A7YrrLAYulwsXT3WGr5/jX2o+z4aW3CPTN2ZoAxSEKWTECo9gm+/4HqHKxkcpXNCHlNgBtwGOigTi9CRS35VA4nYtKQ9fH+M6QxdcQu+u5X882G1CT9YVJZW5XGjU+PX4dOz8dmZUG77kHenDMd/3d/A0PLOUXgjXoqJYfLEgZ0hBtoE6L+BxNoaZ2vzja0fEjtkHbneNBl0TXD6n/HN8+qxjYhqtFxp8+dnB1j20mimL4fgjwFdwo3BmIZTJHaTltlAeMgNKxr8fWwo1LhaoKzbwEIef41mlY/2GOODnLA1u0u8ewZcjtX0Q2IEYNhv/OLyKPkQ5rEgmHVPmq5R6+PZ8SJYih45hiE9KcyhmFwz1Cw6c7masB8qTWouIv8TuEE22Tqdm01ZhINtDuv5MaOzICxaWofp6Es5iANBpTxUFr8T1wml7VTiUbvzIuGTzPKf0kwgLrbybv1rUEFIpSoTXHBiXOOUXFsqHDBbMUowqnBjL2Fpzaaq7hZfflpfw/N22rdA/Qa6SyZmBztfYAuoJ49e8HaY5dPktTvD5aVawmVPN92eFuu+jFtieD8LIFHQktIiZ8UjcL1MVDiTxcKNYkIgvyfaB1/EwSV8Tb0JLIwGRmq8Op6Qf8wCTkmOeovloy9ZOQTSstOxC+W4TJTStGSTzoHmIEaa5CReIMaDxlcZ+XdLcv0IiCyx9V37NAjMhmns6JkwRzRl91joJvm7383OKiZ1fMZ8B3B0F8E1vrnKoFrZ0Gqi8vS/HjEQto90ZA8F6AGW8am4eVmZURyqTs7NI0+WF5Ljut9UFtvWX0KQQESNYpmyYb24mChIfc0+dYpuSGPVvw/hKv/NLOdszGPK04spdpbjx8Bpzz/3jxYSjBk/GSPtA7jpuf7J2GT58j02ZfbJTNB9sFiin0mwdUmu5P7co7YSumMpm/xUyRKeeTkAi6jWBOCLcbCiyHk+5hXn+goKhKATJUiv4xeE0khJp28QXZiTpP1DDUeBUzzscfFRecGxufqtkmm9hoXdHZYGftx5spwuSfePv+AQDEyYo5DS2mDQekPB5lmOdteXCTuRak9lPnAUNkwKeZcjAQ8DL9PFlg/IgY7Dh3CjkAss4zSEEXoleKb2Htak09nG9U1FetkX/K9LI87HLPTvGgdglvSVdoUInOkIyj+jk086hsbZsXf2q5sqO5h3PLEAn1pbU0nelnd2fXkW6LEA8JhHfSjiFWCWVM61R+DP/mrt4Le14k3JiQmA9i/rzs+3I4ZgiMct2DrGDK+bvrLkoyDwJucjrgLJY+sU+kaeK5rVMd3kbeiwwr+zrwKjSslgbcWJop27EeVC2IUwHnCm2YcYTKyCsyXtXnL1AVavZWIqzIfrv+laf/E79uAFInkQ9EfOYccIcTlZEQYF7YGOMi9wYNMFAG50Jccwm8cu4yKzaqBGSVlclsCsfEfI8hj52Tp8LmCxNtTCmMKxB4M2s3dCq4Yknp0TtAjG4Y3H7D6Ob30sLEjKqawvMEpCEppUoz6H3yA0btCvceuDkmQpw2jtYEpt3JUSzI7taUHGuaaUXUPlwtRiBcLvcHzOjWy1S8dHe+dDJNtVjwJFbov+NcqaRmr9yjW6qaOswABooOAfHOlNOyXQbR7QK36gqhX1pW0T4gaqZ0tzh0+UUUzJvRdndKgGGhhktl4bzrSF3gSk/hTj9BCFN5xGNn0sI1EtzH8i28Ktku4Ndmtyu3ptfB97fyklwNdljGU7LCwL30gMQWdcuBtQxWutw8Yggpsw/9gOd2vFaFOI9auND7Rb96NkCXHXANNK7BxxU0sgEBH7tFLqdY63qGwEuN7WC46jDle+Rf2H1EqHgqZnYJkQ0V8LX/cF5NMAfvZOLU+iNgHL8d3f5Ibw8ukb6j3N7ODgLzOi9UjrZcmWVX2oN4NS0jx3qqnmP2jOWaKbCzX1htCp9kMJyKOzEcoLZlK1BnkOOyxS7dYCCM3ns0H5CCYDWfqnWFPftFRFaqlXaxbd+/SfzDmKsaO/BJpQUu7aSW4/BqvDwpzexg7ZOJuKW7+wAjVmtAmY1DgtdM00sIA3/BY/ZSlnq1gs+fFuI8v3swRAUJt9ZbwigtMgz6Tp31gX6TweRW9knzSsN+EVBgvKAEuSa5Q3/b972NGUSek+cy8kO7/mqQehHwcBzJIkF3wzWWdGllnVTY/laZzLzlzcn34oHHKp78sXlxOps3srYP5v/bL/ObTygydaLqOOZ2Zp6/nd+t6EHtEFuUrUKnYCOe3amlf3gZ4Ww+VKysgl7CNDJjf46ZNZesIY1g6NSArEGMvBLnAzVbOyt7wPSmJ2eASDrglknmG5Lq4svHUxHDmBRlokOGnUjTJAf7eJTpxLTicCgSlyrYmvMN57A3mu3xqT9EI8LAxi8VQ8Omu99U+uTzmWMEiiXyzjjQIA3rN8khTpswCH+v5VEiwvT6Nz+GvZrzHuKyfWcas12Gi8t6YIyR/fD3dmTdCkeXujloxWkbI7Jtb9q2UP+0HHQKFhkJAb+lsv0gd7U4HDnFvzsvNxHQdyVDaUtdv+mBTrKbCsSSR0o3UvkhD0N5ozsTmytbE+pZ++TqcMV2gePBunn11Aci7f8Q/XOSN/yhzf1VdQfoJNAoXavr5qe6UudiGJnhYv0FTk7bzMe76RgqqSyqq6u9NKOx6l4fI42ZCcxT+8xIoZaaOft6JIKJVSO/fD8JZqZmWLhiAKhMyLrU0yG9+2q6/cmtAXKHkjOLDbg/2JPx3yl2296egmlZmx6X37RQ2O2nDEKbkhKq4w8uSXW0x3Jw50hRqVhy41NIrQ5l9hkl5smJ56hZvFIj0YHXsYJlRlKsU81UaWB6vQS8LictPkTxD5/lz99Cr5RC7lPj3Xh7XnRC7XYnvA8utgOjHyqPofWrFLsZPyyLwZIUVV8atIV4KI5C1TDQ9+vAnHtnc+DB7pcl6RKDxzcxW/cdDmz0a/ra+h4bhb9iDj8pVR6sEtBgnRprwBsk+bkeX/RSGOOnOoS3jEdaqIr5rHTRJ78WtWcwjQGLD66gXjweVo1UU4879neviTUVZ1PZkF5woBRClPDNtt8DAOa7w53nFtKGAw1IdeR5zTMEKOi/G16dYgOxZQvslRixFOzOQo7Gnd0D6jswD6fsUYnETZCg/hII8LehGVNRhV7fQXk9GK5OohmvPRsxBh29IPR1nBwX0ZWhX+bnUra8r4GninNk/7Yo5Hnkxh+27+Mf9z/2BvG2EsO4mRO2JgCPOaU6BKkfA4cSbRwWKAnX8Yo8+ckiNL85ThFwoiwZtBcg7QCm9GFhXfXR38Ak+kbJVTvjJPIo/2NMrcvo7a7UsrI8FLBcuhesWildmNj11r9C4K58b8CNswMVtgaK5KroE/3JU3Qu/Rhz0l61a1JR/T8ArdhB381Xy8p8aXYV6OIzMWXdOPuGlUhIhEHFwjvI2n8STT5VTQUywsBrm8N2KnCgCiWvQzM9YJ6dgrNvf3EWCLFiFthZYpbHd/c5GUZafZV4fw7kya0L72vBZnLqDslx4YVJ/j8ei6WZrzogSQfKZ8hkjwWe52K/iY7hz4VS5Y1/BwFStAbhxK/TnICGt63zaOlrGftx4Ec8QelLoJZWBRTCax7LLhbLMk8RwCXev29UIVKL/nxeU4dXbtpG2WlMpsL6M/X3uD4OViIN+IlF8GmOWK/A1yUwUFK52OUeACchjAHIYAvxTtrt/IbAyLwb1+ee5fvH3N+6OZ2RR35S4w02tQCUZSof5rLXTRwCAPIlHwCud280dbVRKFCVP+PASBii8ipErbpO/YzD/h+rQoPgJQ+A2il3YfFbJbbAC2o+LOaLVf/MUAYSe0Eb9Eg/bdTcx3BpyyG+3yFkvuosVgVpMwgwRHh1CxjTX5h+jc30sTG7AjZEQhKZNAiVOJ6yIUVny9qS1v8Fiy3g6lopz9ctol73FMKZz5jSqBSNxm2aVDNmdHCORWKuRfYIZOzLp5Qe0k5+muowOejOY6k6pGMrLSJBgXcLdjNAQ1i+dN9crn4KgG5iEDROYYeYfRIcXjYWoW+EN3c/cEp9ihFszMSXreEJG2SbyQ1kqh7OynijOLj6wktVe07DescTj/yeTuXF6qvNH+R7FIOuINNwNesrpxbkrkBFcYSMufZbU4YHe1JZeaglNJr3KRs/BSLnLWe++eb0mLuWuquR+K58mNgSd09k8C8lVrRfYIk62f2gzucCvlTSUlKJ44vRsZWHNJBsbJJYVvZtwgNVNB39L0vt2L0pFWI8bxpphBjwOzpWnbJMldsuey71GsY2YJEVV1J8rzLPu6I109LYUmfDIFCFw6Sw2sshuektIJK5ySX8sjjw/dABeo4fReC0SZD+6BHF8Jhl9LSz00zOUHyOUCPcL3pCeBIR0QjmfaQAIqYXG3G89bLdd/uIEdRy6f++4DyuBk0mqUpxr9D3L6dE+SWBH6p4eG4xu1WPSH7RcyFpYnzKbK3o+HcYjDyyKTliRNYWloqfBwuNYf4IbBhx6lXQjJzK30C0LZWdH16UxaT9ycXsMAPmxjYh2Q8C/Wh174Kv9SL1dpv/duenBspf+XHhhjhnlbS62dzeLGJn/xUI5d4uohrAn8x1mH4/yjcgZ3EHBDiGw0hE/S+UTUn+i5EAZSe6Uy5osWz2hP6fxdIycb1N3Y+SL/Gqhr5gsGN1zKCq7elv6E6lrHUHf/lJJABPPX7F+Txffy+nTfilkBStuJpKys8KxF7G6LSf7lfedO3o8ZEb0j8YgKJiqjQ6Pq2DmXhkoqEOrYihEmimzaTVKLUN19twPYiWEpdNP0U+70t3n3Uefruxeo7sHssDDjA4V/3DrUKu0j7cTlqQyXZcMiviMBkaZFAkXbanQ5bEXI3VgXGjDxwbNkeb7bwQQ+MDKSUeRUWrU/gqEkyqsqnCNBRFMsRKytYKjan199YLicNJM4KSlYTFas5mR3nYwNmdvOQtf5eoVu7HtYeyYB2gpwQe6BTMeFa0iSYXC/mesMXBBQrnsXyidh/zHQ15ro+aC6txG0fyE+EG2zFQ1a7Rszz0McjdsPNvQgVbrtWNst0vJyH+SgJlHKKEsyC46vJ8iTinSwrmT2rWtiKOZer5+bavl+dXEgSi/N4w4MwexYddJnP50Gm6RaanBoQwDXqhuPcBuoQDktk1IXOdNhlTTGoBi7rzSgz/6SvA5067fBWtJv9nQHNkBJBN3FoNS2Zp2pUek1KOywBj/2DWIEKsgeFQzFM6azOcDEvXWI1VoLWFcgtlcNB2nDQ4wfx5IL3KnKiv9rMr2zKne83E5TI+x4lIAPv3FR4SORmdqeH2EJ6vIf5/7ChQPMghYxmTfudkrQK5IgT0lgVO+6ilgO+o7G6FqPrhOt8Hz2RyGfMP1Ai+RjaINoNMhomlAuT9ugYHpXVxfKR3QADT/vBI0U9gU8vzUxr7dYF9bmvLvssZhH12n5A1BeZN3rUg6qJMfzbVgTiue7pPlLbA1w3WYaF7vmZGDXLIILODH4c6bB13Z5gftwsedW2kbjo2lyIOMBUkaMPFZxTDn5O2AH6kA2Inl4tpxU3C80PRXQ/t+uGUM7sgU2dP/CHHB1NZ58AwR6eWK2k5MDnS/7sxJUZv1gaV2GmUWYckFgSNTQEpjzbKcIhFnr2ZxoFKyo1FWw4BBLOJlV8JcT5L9zpZNYR8xmaQgNldwO5cxxdoMgaLMGR3fz+6InYpRluGbmNCzOyme1t+T9h0SGYrCvEmBntLZy5MwZboxn9i1ZBVm9z0M29IXXvIgnlq6XFL9KAwxVsjWDtiXjJMHFOcVLpybtE0rL/A8BC7ZHb4sh9LLz4Btix+FlZWt4hcZ+Q09CcFUerWsR2FzhFSxXB55lYAI0grsKBR0nTlxczbG55kSBXdUcbsvR0AyIjU8WEJDap+Y4EmbC2MRf3P+7/k4xanR77OMD9+IVEdvGnXfvHsOOZUF6JkXKMQI8O0HXSNqU2sw0EIM7IV2aRIrC1pInx9pVVilSft7plUkLo7mr0IAnZxanXzeEsJWfsse8iAl9rtNkP2+1vO/qzSqadImSBZNncwRCscXRHJ5NGQb9Kq7N5aiT4M9Zvi+KQmdXvUZ8o8wUow7pcpUhBcaJdCtAkKKdxS2ZRATJ90TCeyJ0iyPPADaavsXUFBlthMYcojFYPhDbjytK9+5uzYc9vVqjGYm0PQlqC3HrUoGb1fa3AdetgyCUlaBLdb53Zc2X7+wj8U9iipEOPtusdChV8wHfjua5azi8h4ylitNtP35OIh4Ic/5IpmvQR/58CufQ7cOlvtAhf1KwPHD9PYPn3mEDx7yxVQl0kzeIPWCVbmnmSjM/pkuBcmqwIcXqeqVgo/TICsHhCXfwEQm0cYZmUBBMBFRSbGVTu96iwmwp5UgFcApyVuzG/nm2bwzo39soULX1sBrd+Qnj+R7yzV951VwqC4nQlYnRg+RHpsTbPAs75EHfEvK0xK8eEohyRMmZigKxq2KEygFVK6OS7S7KZ7DGnZVmr3Cza0LiPVHrkLDt7YfbobbzBD41qoWVriBwl+nMDjW8bKL+ihP5k81/nTmcOB9k+lpj2ZaNJBY45uRM3sPQiV4BfkqOZZdfRwTdK4MC5W4TNBaURsYGz5WS0zsVK5WeRZYXcUQGrLLVqFtP//pYJAAqz9f1h3yh7dQSuAbt/VF2v8kwvqY1Rk8Ulyi9+ARm6z24VjCRIThIVZcf+bIMVHqZPaafSHo45F2CcJw/m2Yq2YOXU/qsk9bc3SuO0+KE101tneTHF3UFSfs9DtB9IHkRGWMEoXv0sb1lEpne4A/N3RjppWnNcl6mt38DCxg+i7fSgJOuytLjKbKMtthksK+4T8n7Rn1jUbp3uQ5YpjSGrKHOaFDgenbPrZUCnCdR3dgRGylv4RASZHjaoY0dUlGnOecUFYBPxZ5YbH8kn6L7IZraJDu7WxhYLNJvOHkmukDGUIQxjjd67xlDqWAB0+AQaAI6lsbJrwrtZE9RQtajZO99zLPSJNkSnQjPbO3BI3Dh2uJn+qVmf/VLW5OchmNgRsq6tImYk0tYFSOoB8k1d2Gp52gTDP78LvNn8GQoKKk+N5itbnotqXbbm09vGlSH9j166dE+9ke4nsxuL0wapK8jMhblQpzCMBs2sFuOgp6/aW6BeDphHJsiWa+2z6ZZr9jGhupF2Pv0C50zX7oOg2hgnIFh3h7ZrV+ORkblH4RXxWdE37bz/vnpXFrd3WEsZsZm6B+eP/TY2k4PIM0wQvSBaND1JC0FrUGegscUT0TEkIe4ri5v2Fo8+bYsrGILGh2Uu3ZHYaSoB82Z2wJHW6VrHUP62EhWIkqNT/4qdT69lxn/HvS/q6Euu7RHc7+jrNXw7eCRludOQHgwnCUGK4CgHH141NVUzY1gyoXbMnfPB4PrDYQDAaEwsTeslH516zSUFPQhOzE5RFpwfulSh6FiCuHPMeiKSZ2I3RSJN53GFPmr3snSj/0pmd59wgt4pgspx2gbji9ab2Fh/TqAPHuUfy6cyINNAx7Z+1oyKgIf3dsR7fyq0bF1UOAyAkxd7muVaOup5uus3p5MFIC2im42Fai4FOPNt0ylXfCUBKbKVJj2V0mYKPZJNyaqfsJ2svfGvIuAS1ydWafx+ZTUSPaxWTLNTeRfxhQrKUmodqWSk0/mHjZXAV8ajDD3uHeJvbH71dL/FJsJrANCDlC2tQBx5a+xTPlo63i6rVawnr38Wo2hv5z0y7rsSJtbvGxNAtroV1EhKq9HFdJ6rCs0aE7IelsbDz2V+fw0DbRsNHwnyKVB9f0Rtuw6sb0lfuzXGTXQZIgvWppMphewI1NaEiPI7XPQ4rsO99QTMgsIqf4N3pO/YqdabfmbtRJgnPUrDdHivY4g1SqeC9Lft8WFdmXADkOCJrelDYIplp9ToYhw/GBMh4U/KTr90uTM1MX4kQARieCjKXqE1jqSF6ApFORWkrszFkr1+S73IB3Idp/vM5C7URizQ7cA4PoWOCgY+RAHkpp5olQQK42on+wEfT/ZpKyz94wUqBQa2cDq4wTN2zPKW/Rt52NsKVtR36ItkfNcxUerIZydIAh9zvS7+OecYO/pNSih0q9kK38mmNcPFy/N5JnXcUaIf6ATPHBfEkkZ8nGAgyU67Eq050hBqaGmU3T8LdaLSwBNpqRGepX4de01dQJk9sJqrdaXy4Rz4YyCERcqwA1LjBAiHkiNB3nEU9aT0o1OPPaQ5qdLnSaGcRNzlcWKslq+EDUMWwJkMtIrxQBelgiKIK4NTJ5Lrff33r3awO/5zHo5Y56rAZGD67EJlTvaH7crxULjQ1wkjd9tUy1oP8b0IdDGBmthgqKtgmQgIctY/4MVmR3/ZJLO0TBeaKFicD0tCqddk6YooVonujJXSg+tNVy2YaCZos9SwM+q4BR0yz08Z2qI0jpLOKwtFnun2h+zhta4EqximQBevyemHriU0fTR07SjV8kdZ3T7yHGVNfB6mLLxBW80ts8mGwOtGPtkz2LJhJ21ogvAEIxYNRtDdll1L7G0oW5CoKk83gmtsPhgR0CqNP5tmlSPWIgBysSZdNC5y4TxSTk5C5eGEI+EXRTfWnxbZ+7w/MIrjXjKcEK2ANmNB23cqf6vlHGybCkSfenuf5ePD4YEceHZNPZjjusC7GdRLd7XhsO24Jy4W6P4IKIBplm6kPJ1R9qg2YB2uxxHcrCvDwzbGw1gku0ylrMIIj9lVSOQV6Au+h0tR5KGGu/a3ZOAPWRCWHkX83R2y9TJ571e6UhxU1zOsZsgt1e+jjgAPRN0yFQvVsulSap3udHpOZStrDU0cjDrPh6c99xKNOo5Dc/k26YqKweU6VwIWCdWOQpdWe67RPeWOfbn9e6wKlC+ZaipNCd+eO7iUNX4a6t+Obl8I5dDn/wQP/+V5xgYuWA4QGSXbrKEzJUa0AaWdQyz3OL1ZQpUOwaFcY/SmRDgX7YvZA32MbFaRY7HJSeamT9do7yFH7dTouskWCl3UN2sXQX4ncD51K+ZK+QSz/NRCohVxRk39ay2QTYABbE6BOYYop1Jy10IcCtpeiADGjQ1u6/CBostD2WlZICPbNUjsH/Lkhmcl9igTGsEOpT36RFPRE4cuvkXSYbBiRQgmxcrLVIXQvO/TP/ZEblsyWUZW1sBXiV2EDYGt9cbDkFeCC41i8DUSrglm7CzJC4UVYaOVlGriuQHkixX+QHPxL5JDXNWh37VRBocvOO8wez1G/L3BNsz2vRFpG2pkQKol899eL3ICHtpJAHQFflDg5SQiEmA5+L5MvayAvqy6y1j60Mhz+cTul/q06a06cTdj0D2ClOqfysdA6JimWRTZQqhVUq7ZbRTE1saBY4ayrGjum++eucbY/9g2P2DjbPeGTSzOIpkAvIBSO3Hxxo6TInU/r/9ax4x7VMxti5R3hWPCCmd9T1NelH3CyOkTxD39ELv9RYRBbGlixUwbtrCe8i9EGNlFbSvnkmSqJlx/zfBF36w1HJX2pPm5huAX8O/WY7yTTfKkEoU43iF6Xw9ImylLEd1VzWUNA/Smn0iclR9KgbWlUMDCtD+UWC1VDgOvySRQqqApjoZzakuDOnVQ4pLX+UUf8sgUkrfaAeFJ08UziEctwy+aqv8SOH7do/g76XipVpNsWPxdEG3wOIkfx9PCUqOiMP7i4StXuKaO+xizUUGA24FzPatLQnXBsm5e2ez0U09z3UO6e5xSjiHfyDf+X4weLI8hp0NmzDxKBAPJYbK/HYppwMwNLAlTJUng4E0WXHziFF7d6oAw5teLrWk9aTfRFw1MsiaS6KieW8mElxQM957JsbXCRYR9w4JdeaApOh4t8qkaq9ROG0O60+HfV01qm0P/Q5FIRgPQuVAeDDKv5tzMmgiNxQQQQznXAHNJrP24xOP/nojwC0DTjgihOnGKWeOEzODUouT+yFmKR3rD3XtNv7lIl7D0amL/5o12x8CMa+M1CQfCA6M98PXuVO+TUZH77VgAUx4yq9XL6kZnJDuQWnk7JgleN3f8V1/ZtUIYVNqJeTM0vijetPEWyKmY37DdnwpcAhD7/8ZKMgbXfoAwFaTCCCL+tTjs4J1RXGyyjECxhimWeG0rsff1QpGAihcmhiBIv2CzfC+bdZfr4oyiYhFp5TpmrtD7+uWu9K1QvENtD3SXs2zXrFGFsrFTVFM/sxZ6QnCpopX1ThQX9XQEPeSmGd4RIek0DgiQWd++rLnNeWWpBfsiy/rE39I2lq/PJAt6sNIc0w8PxE/crGsx3kxZceNs3qaCu6rKeVqbCmJ/aLTsKPnrA+435yTlToGzJe0tlJpP36RUzyhqHhS0mnOTtqTWqbXzsr5idXMqlA3DREOHP7xfWstlR/5nwz2qLYq7c33K8RK/ZPvS9Ln38HqXxhqYsdPVhfWgWK5iwV61OJGA/9BWu7k9K8rmYCdBtcje2jtiamCXaZPBo+/5SA9ZzHV6iWTy+YocEFUmtkSUZAmYPsgYFe13PO0ToPQmKeg+CiVJRMhu+Wp4DIMy/8gxTOif4/6TRp1EystN8t1griPzsQWHigBzjcK+m8pxxBdoi0+3Rn0QOLC4cca78kh0GBS4unCSwAFVhBNODEMvkyHqUKsl6JIOZVcKTK1noY2F/Egmq5fZJIhn2GYbq1ZtSPmYk8vs5VeCBr20bKD7AsN7hk+oDYTQyUZFgteIuAFkjIo9q3rwQhERc2xFjq+pttH8UT6ZorYBohjNl8GuU95KhktWz0rvGg7iE6UjEbjlAosg9OhG6DbmZpNujSkaXkrvraga17fGgea3xbM0O3c8DtGyQkUuLyZh9GjRDcc3kIQcE0U9Nms4QuVM/LGnCsmuj7xcyG3jfa03+WZ1vUBSxd//FOT569ztOGwEriWJ1Dy3OcPKCn+ixeltzNaEVxQJgyF6QO7UW83wMXK70gwXhxrc7wCg9jmmPj/FRe1S+D/U7gewNj7jUn4aeQ/RFCn9FOPznX6XGprnTz0PQVzoMqAid3f9g2GAqbySv7rLkd4Zydt7Gx+ies8/Qirv4K96sRC8H+GEUagrPt1JOsVFcgvshlX6r6+o4Qcgl6nwTaOIvcI6H+XAf9x4Qqh3EgR6eAJwEUsfVsrO397E+uAKCHPYHa2rixDzm4xQNAla+WWS4ZhqUOAv+sUA8sASdoxMO+L6RS6RYRzZdOmetDti5MnH42Sd/HAHnvnmWikeWrTxnvjZ8Sv7EeBzUISYJNBaX9QntkonQ2ytJdNcRBXIJgwLD9jErypFmCmOJ6UxD3ctvtT5FqHZSZ1S+dmwFYCxTMek3FZk6KlFvkhYsEYJ/38rqv+PR8b55e7jCRCT6+/rZ5X9pSdKoBJXFfnaLT4pCvQutx0Rtuvh9YIKnXpmYTpC6mkPnIrTyQQcvCGoYuZRj8Vh0BY/Qd6lc6Ml0+N6DLWEMWIeKU5vpjlO5ZAoQ5erxR2yu17bRWZSoP5qCs108Uu5bBTuf4xiXR4mUF1LfvlsoxHUT/GtjmskvwDVUo6eaCwIlXEHSYHPnSSCFcuVsaHY0yVVxSco6Lml5dNQ7EUy6+kljmZ116LdMoqQwvj9yCADDdm4KAfCV0II+e5ZnFUtpeE8XOcjQZg6Fi2rSbvXithrGFw3b0rA/GQ4QsvxLopTiwE19IvC8hTaazT8rB1+THidV6e8X47HIC2PVxnhACPffLP+iPc1Fu6lgg+u3Kz0lwWceoyQO/a8vqCXfzCbiArO4EVHlch2g997b7AGGTsYFtJ6HChyMavKKtggHhFBO3CbvTV3KxOwrWVoyVyhGgqPHY4Kt0uViCzk+4vBPJ9A2NYdjZtbvu3vKw+5nsG3CuMSm2nup9+zJqef4OQ2H+VDM+ajzUkBD/M0/etoE8Hxe/eO9TGuIE01b6n+neQxAbR1AO/CuU5d9JrmMygY4shjdgbQY6HAqn0ICGT/cIXFBuAuvt0FfMbXthZbDv33joZy/4O3fWnaOtDKZvi7o/ImCDtN3UnoW91iuGpdjPr6zwsGqQQo6veEs9En1rLGTgCIcr07yTjb3EEBVhhBM8blrhp2JpLF6dYtlJaJC5WFmtAgqhpNHEiolygW/TNkuURAZ2XNqiZY87rLkIM6B/NJ8CPlcKPV5AZnr52ofmZ77eu5QqSKfqtLsWyZ79yMb3nUj4iAvBQryoN94sUXSbCWTD7M1iUP7AtcoBvtnm4yZ8j+ngiSB/LFYf2I3T73U939Q6s1nXH8FuXKG8g81O66jeDc0x5YfQccuG2KoKrbW4kVehESiA7SOD+A5OBDmisJFElu2n5C37W1gIpDToFzcdzs1vmZE+yMblUUVtvt/iyMAunz8NCeWkc4sfLJO9OZJMWATSimSH3Df3N+On7ex2zE9raH7j9IH2Yh9KWgd/m1bdb16QhA073dTXJKvpduDdlLFvPie51IXeFvsTk3htWiL2Ipcc9fvTRqOe67qWVCCDVVY+sz8hCmWt2k2ObWEhFlKawLXPiIOca83jdml2TyHh2WyNwlmKyE/s3FDxQzZn8V4w092ZwkEsNbBUg7BRcbKLghY2pJbonGAKqF/QcR0zOdedbjRCBqM2It+1IpYfWpnCPskrOGUiXaUZdgR3ryh3fcMBzjOOxScfdKAyQqk+1lJco6LMpO7JV7zLh6c7FD+xTojkHtePWSzp6USZgQf+c3nO14LJOCOb7PrjCfrCYcTsMfxO84cw9wmZDVlmC6v5D95xrI/zRbsTSA3xL1FX6JynG2voXrixxGBQipLhbY25R/Cd28zAVPuR/XPgBTVUioW6djNoSvntlRc9O08gWXdaIroi54rqYQGLYo4mylTMF2X34lMt1SgJO6KlJnVuhDsYQ5bZMYAuQDMcC9C7e6jlyyYna+2HU016mUErFeJyUDgqynrq978cjZhQwi0/TFpuuLJKvugemjBCVy0dU82bCcTlIrE1LbVjg3aWtDSSCkepXAZ7hwscLUCa52WlyZKUz3L1Wa5HVk80R4oxyPPepwLmrPuzfjAgGw72MBJzMQOSo25EoIJqTVTvvorlBsrO6qjrn051va7MmjiypuJqbqPKnq5dLZUh1a2raiBrw22kJ3kXkfHz1gtb4+YZkS/edItnEjJFaf4v1+rPIz5h5N0qCLmUGHhl4VV2i4UjFexGb8Y7vIc4sqU0o1J2Zr/SwpYAzWFrFnhoQR+5uo7gH6FKjPJ0ugTLS2t1lLwjyGlOiXwns8UPJ+6KCDKszsCznzxripgsK+ezXgi6shA04iP2cpzT4wvB2M4hecCKka014l212yBrufjKA03kOSllshkMXbF7GA/4vdxdi1YkZdj0MVT2ypB3ClHrzB/H0FneTpL0KxehVgFYI109/nmNeDqUvCBPrw8tiOWShdEgcjl733QbLpwk9qCGywo/LcPhqR18mBo8HiuhRTWHZc4r37mbkqf/VgjRXMr6GsuLmqKmqnTuBOI3cxOvLGJA/HS62r/Sn9l/WCCuwnFx357HRMtj+LIo7+KrwBdATojvwLUTVlFWH4YWGSxi8eTH8fmBJfJwGHVuqxbZYNf5q99i+pm+05MAhquAx6UY28HON062cz1dex4dFyBMxqHO6WXu45BX+2+KXsiuPSK9+b1z46MeYcTSUkOAQyl/4LSPm/p8YcdsO3WDDoD3blouCbvUk2uUfMduTjoyiRg2FWyDnuH2LImRWi9yut84Vi9KmGk87Turw3VBSkSj0HcxT7lJb5MPLIH94iJ8FrGyH33owO8+EVj/2lqTYUSH9jhtgVAZIkZGnvXyK30uataZukXswA0IkxI9FMsDKvxS4UgIraV1h6Z7o6dQGyQjqXDXec1pyded7dnEEN7uenQlASRYiYc0MCEElMCcQ5xcd7yKBwHAe++785S0MPCgfd0NAsVH5nMH7Y91xGnL6W6kZR3y/f7ZnZaKDnfimzZqC9n/4jP+U5mi70dPynYIy8m1LFx7d1UbXBqRs1XzDScJ0m9UG2BGljyyJA9IJOxgwZHphQPy2XbADP2hnyUycFvYlU+yoL12GiYojd4T2PxkrcsCFXH2cQsE4QTmWA2zVNIwzeHy1g9BI1fEutcdndeLEB4HPHLhPInTf+UJo2c4boa9N5skT8ZIuM56SEPwiscfsYOZ+yEXYND4Mxh1eukjAIPJ4zQjHXfMmaNduclCXVLF5GGdSaSVhJsFBpH+ydOefootXnTIv+9ywjpUIXljXQHJMe444o7kIS859P8CanS0sapCEuEAdiQkcR/0nzMVFbZEafHANe6Jd71i8nkF0uvr+AolvUL8swC1cZX/RDcynNqbUjCBgNDX+0W6U+LCCLdxjqHVaTrjZnzGaUARz75HfhDDNZ0fHnef7YmfNOfp1YgxWY/Mm9T5r1kEs1GdlWTdmkJ5u99CTNAhmQI+tVNMGWj9OOAjJ0m+V5v0ykEyRlZQoVFO+C5odAng10vnJoNjHgo4htc//sSwYF64Cl7XyRjHxT83a+oKSv8/BRZC3ApaBozV61wFhnWXHphxdrt9gmrK4fP/NPMqfSzaw1iVU2x0lZXjnygAFejizKLlqc7qJIZtlWTSFTIlZvm8vGrsd+4eAUALbGbTG4QeHm14+GXf6X2Bajf3el/tofQkLEoRkdaPQCJJXuTNysgVNYxtoQn7V+Pix9V7Q2YNDF9dYTMCYmpWf1ivkqZjlewEu1Qj1jyblI4hlAwIVyQGL7GAA0fyt7fpyM74Kl3dis5UzWmZLjQI+ZCXBQwrX0vVbJGmOWz69X7iZylBRdRD/BGXX+NFEMt5y9IaQRD20D75ZMIyMxpUHsXyeBP8pljIwOC47Nuz+xaldbUl2yX4LUO6YNsFk0ucAaku16jhaZjmOJCicsP7wQsShyyCWdEGGK083B1BFORDivD1D2LX8YCP3T6wEOQ6+2VvNeg865PXn5cZOVnEIhlhxjPzDk3GgdZNyv/Iqizfm/5+7a2MPC2r8A+pS//mKsFiMydaf5YYZ9s//rOwFhIAnpeu2kJmIVTuxyA9QntI5E/+82PGep7Cx6Fl8OaPuzqSndXZpEECrqHczzniHa1N0H5iV/Eg4bROLkZv2NFrxOGwW6Bq2I2nJk44CRQqh+uLPtAzXhhMXHwHWowSNaVgym0XO8pqHk9XSSkzUoxtOZnbPp+JVmMLpAhCTTQoN7BhLQJoP4Y+JWM7tpgUz4dbByDNLr+zHpb3ZBUvRscqviufJPB3OEabCXO/3cSiAnjUxXoK0tglEPXzleAJE82c0cYv2UniEnNi14H+YDK0qkUk3Y+isdYI4kpoU3xNJqrGTZGQ31d/uDj12pQiI16q0+ZjpcR7HZLgD5Wwo78qyn2GjLNQfD4QHLAEVXa+3xWmvlsl1lg1uqQcQ5HjgZWVMEStqNTMVQECK7TwSfE/EMn8JrLOUWjrbstTkevjqFIheNeFYiQZsmfCDnAtSZoVcn0gh4gawXZ+WKwI3vkIHTUYGswSQ9AxkEPhvDVy4QzGf8L411en954nJeSJbiOfDwTy0Cp07LLABV3MDyL2VIV17xqzvt5IWFuG4X/grnjLhdNg6LN0ZSqW0mcjEqyyC4YTDnDw9ZxXpp8pwNGWjss88UlL69yPuBnSuYsmoB34eqq37xj/+huelWrNMAU3GHbCP+/BZt19WIHPwftbaRVKr3RCbbbvdpm1cPP9BopsEpEuMZps+YJasHkAH27S/NXQRcmnqLXPHweDZNxiSqyTal075xWd0Qruc1+0cyf/1plcwo5M7BMYgDCzo0FoMAn6hmnLVAy17f2UAdXmvca+mJ5W8qROPpWwgUgfh0gtMi9nV7PVYFC2HyPsoWwK7O2E5awiH4os+6QHHYzDMOtrwXPwHnbYj7nPiYdp0Wkc5HfnvFC51jNxC9iDgZTd8xDjA3gSMFbZx6178IESNli/ID4Z4j/MrcKcS1EEbe4vgOt4BlR5JfQHZcFfBNQtMq73BBhAy7VtzjaRtS64XXqa8/BBlqupJpVoVNfiSjc9lmgNk429zqzxAvoPPftTXj/mJrI6PLdA5B2lG+pNHUonOaua3iX19qIhmeyuOoWCJyjLDYRu4HwYZUGPzTQHOXjS/ZhgUIJxcNq5+h+nmNlQeYFtVP3X3W3B8zwr+SmbQL6+IWdyOpXaWL/AgE1iLIM3mFY4SeJSR4kdUatN4/jZMaFNkOtSIIKFDKowm0mQs4hwUWgT0Q+QBp3tvMoEpGRWzhvdmoDIy5EaCvL+DPjpNZWMtjOmqhsnmLuMOSCKoOOl2paEFqP16l5GVfR7OJnQZtj0SRiAb/4too4nl0hzMfgNdBKZGhsNy4xhViSyS36bv6Weny9fdOoeU7BPjUlv8ouPz7bq+Z1UQ2m8YwEAstmNaEZa1ax9mSE37NMHiEVPEpsT6+jkP6GrbRmzPWL6OLuixFXCNhyFIqTxlNUxtrJQx5UrdFpFFUEpPv6sf2EzomBuTuqipskYn9cvaTp6XZRe2Wn2CnEEsLDMsvp+gzaLMaJoWzZRKKl6SirGaUg2vDVIslLup/uykM7bjCZUCC2rHSzdhYJAC7kWgu3/vTeWf2ezmMzD9k5QYC2hDuebo+ubaFcg1q2BwoASzq6dsmyc/ah3ha6c+Le8YMP4FmQmaHZu+1WiRwE6fxJr5nqwHuuM2EaqgkrOAhop1mJcdo7YFChRBb90051POK1WNO+SgMdDtvjQAAj8l0Wm6QNg0OiuJW65AkskTVWXyJhAb0uIUuloPVl+sAH5a68Goqz0SzUIk6BZjBCJ1J3BUi8+Igqw0zHgprhw8AX2Pa1SY50/j3lqAA9eyeX42+Tx5yrx2J5L4TsDCruzadEZM7fGc19xsykdoNNJXk2uk0FF0/DJE3wG1y+qkTRFoJbCTVAq9qCozqjM/DCmS8YroXJmZQFdLQDonxBLzSdLl8iCRO1qbAX22t8fWvq0+RAOzurrumOxXpFUTiuvz2DZaC9NbkPMHl3He8kkyELdiWZHvHj2FHnTV6/NJdCn32bOHCfLqWcaRvWVHeAp/8+g1543sWE4LWWmhzX5up8haXWoqn3ir8ppxbB/0PyXqX6Z9GJR9UI6v61gUyESsMWQqm1YvVWG8cNhhTzN/BOmWCXe1I2V0Na14mGDgetDmrzlYLSnSCaR0nNO8qlTl6dEo+v+o0Vxrm4BCZlLEP32Jt6L0vimYdZY23aw+X1x36ix5YcwCdels6hqAxu4QHpjNU1y7djU08exZPN2d97w9IPApBPcoth8DDdbMVEEgqYo7pdpSuM36dYP93VoNDxU0mqOCwbX/YIv3vsTNBErt3GyVCbY6BUPvh9GmQ16nsCPFwLBUBrSnd9rvxlSZDfqWjcQcfsoHp9tOAdfOcvmk7i7ujiKeakWqGAJQP0mYbJIyvD7e5ZkYjd4qY/iDrLV8AIFGz4I1CidqzUwPhIpurmzeNjcb235lbCAhvdL086297s5AaZesJqPmGdmuMgFg9scBSOo2Ty8LpSJaAJpPCIInbY4LqtjcirRw2eZexi7Uxm0qVC5zVhXhbxg7ccdbbBgOAbguRv0SFXlRkUmXRXBk4u8DNoyIvwuVcB/0ta0QagpJQZfAHh2w17ZDhRLSHaz2H3Q0SS835rsuFFwxsD1CZ9OnzITa44NeEjpAVxb6isheCfU7habuq+qiG23NXEJDY+o9Xvgd/t7ObWsCvO0nTDXZY33+b525QMlfi+N3gll2BX8qq5L/fkA995V8RpKhNLYycVkkBbC97S3dsgARlD/dDqruLcybVBY5HuUbmjW129WAOqKQAXAVpYrwluLuhxVyqYe7U/QqU61MnC23uTHqJuaO6qphAru0ibRjtJuJpyfD5P0ihy0yrJnfq+KkhFvWXN3SmGfLSbHG8UDeog03hIqiwANkSTVmCBZsCw1uGOWge8sFr3Fc54zy0cJFRV9erfE6URAJsioIHNWD4TbZp55Vpa3VqvcIW59npmzSZCRamN/Yj0ojqXrXUIKKLSLIeEvPTWzD8d3p4nMmTrlW2PdSyFmPin0KNCqJ2syMExwDZN+L3i3mUcrqLtWwKYkf+D1w2pqp50bdODcNMtsMfkmMn3HiYZ6Tbv21rqbWC8Ybcn6/Rj9LiMN5lx4/MOZ5DE8m44wdvfFs8ZW+hIcuKdi6TSEThKIXJ1O8R+d67NIqddot2VhDYo3Q+5TlkRMXqaygzvQHERSaMI1VX6WE9jcftJmxzKGKwffifZi3QZI7Ry+qP8/2RYcIm+5/lTi9SQ4NetHNvrZHwJPtzNPEkhcp+O1nPSExBe9i+CKqTIV6y76Y+a0FnBtKJhAJXyUMd2v3H7uHaXxQ27E7TPOf3MTudmOseqCHIEG3JwjH9GuAmEDY8/newwFOSpUyMQ5K4hQ38OoxvX1oBv3E7PW60lvZxuTFxHaKIc880pfhJIO4jzVZO80gNz13/yFyS0660gH+dLSRBsUU6XatCaUKpvo4CT8nbZqcGJhqk7HRj8pl8t/HLlrcbsNIMJOAy/gkBOgtGleLwuIDMMT7wS6cgGhJ6avgtPo2CPx2LJZu8IN9nLgArp4eynBxk8QuLhXq3XpKsjegMy72kyBpKe98Gx1QUhVaPx0tioEi3u0YSPKI2yvCxLB6PFJXjlqLl5RwpwPaCGtbvnzGKRfeBizHveVWokuLVOPNGnd3gXlfjsKapyPE5su1bntJHYgeuV+USYnu7pr+fkmYTzDZgwJeYNIiclx3GHmw5Zb8FEhdgaaT2NMlAMh/jy+6QX32Yy/xP/OKHbz6fwVLcKGiTHK9JLCGvQg2FDJCCIPkHx6UhcOwIlJE4M80J015u3PWhfxmTcAR1g41w8f4RSFyrCuUlyQIRSQ4WB9rO7A98LdEDCk6hSQl6z4ANuh/g1fWOYSr57vDwdes9ooNuCyvJYK7yu3KL7J3+RVZ/qSCLjXQ0Ht1+HZlUHSHs3NlSPB6KLQBqWmnU2J3e3aYXMGoTS5/tp11ZOku3WYlp6HIuQsmzLCRO79Dd6Pgbj9+ayOzO+lALVYLJf8sjvLldams4/U95NWjbknvfRB71X4eyFjJVPzTZIx/PxJu6rklKAHiN0bAeHPt4bWoSXv7CdD2XY0ejSrWBkkgTzhi/+RF5Y0fPZeEALqlu1RND++xKSNR+YPC5I0vCS9/hNWNXOeAxOG52pl/Wy7Pr3TAe1QEZqNga+5zvUnabMwA1GEiizSzB5RV5h/SFnkjmsw/etj11LKnDf49QYEoUwTValobOGadDhfn5veZwve4BfarZc0xn2PKACu/vwvD5cS9XJnKYmY0JV940xNei0vQ2N68bWrJX+rExt1tSswyZxytia0m8AaCTJnsgT871nWSBkBpTyPIn40bNL/ocw+5mT1r3AwBF5tVUkuG3dqFDNbAcGXL+yh5FDOoJni6DrQvrUlJ+MFfmPF0fhDLBSm4ItYhNxovos5cwrkRVt6CjLprsG7UvxvlciunYhelsg/6OaEG8UtayxflrblnSJPcI/eyO4tya+uDfjRb0sJhNxaWYXElMelNrU8JcMzj6LgPEyzI+Q7QPSNvsWHbuLLS7n8BM5ZyPifgyD0IWGgeQWBIxQrTGkH2gS7rlH1pH8TKAShpGjfA+xV14pkWoHnqnYr1QtPEX/uOdM3PL9QJ62NCwbihjUSRaQowv1OLzBONsSAnqpuhYQ9nSrG9GXP7LeBmh7PdI7kE4W4dCCuUexTtjDnrqPAiBwvTO1lLofDQZiaETsEdE/8Gssw/Hw9y1SfthtbQHAqy6gbamU7GLMvl7DAhlPKR4YWJ4F9SgsWQ7JZMYiybB7+3NX28Hd1CN1AZrC4HJT681X0oLGyVsu/aexa6XPe9C+x8ZmYYI24t90sp/1pPn7hO3di8vT2TgsxHjJLesYZi2TCbCOEbDr8NO95Jb8NdcALo3CYy0MqSUYVbCvsJmr9NDANPN7Re1GDzUtU1cKgWM/QCcCUT7pxQCgCM2/XdwNxM1M81AOwH04gA8GZ0svtLH0O6yFo74V7o8Yp2ZceVIIo+YM1jwgPrmYlRmlSQEuFjAc6rLcIiy16Uywv6lTKk9atRfvSjdPPfC34cdm+HtdU0/qV39x/FyZSAkFOXx+chAEpjPjq7DT9Qlo9FjX3nFVmfn4KxISZan6xd1UDAg9op1vVYqiA/5Q9Au7vnD7PXAFziptx2eL7GHmQPgtImsUKYkU6wRM16RrVAMeu0SYmTI2F+Q7J1G1W2i1EmvH2T2CKfye8Tidb+GnjS+gR0KUokKL7yPDvkMpAnNHei1yskIOUZDWkB3mA58TH/eFJAIByybkOOEGYg5ZqyuPe/tL9CC3WGzalNx2wY6dYopyH1Oz61JRCu4zGaIXUcdxso62RwxBS/wo75RlbxqAVxdsvVCJh25NgWT2YG0FBM4/Ri9TcsVB0SdB90o9NWAUeHsOKt3UDX/sgzB2LTUTHZE1s7CeMKaBDJIkPPpOj5Tru0PIiBSFgFiKKNFkV+MtLhoREF4ri6uf1EfVLXKFMwiAuIVdXAqTYYj82T9NDtCtaA82gDhBmeiU8ySzxMhoIlxnBK6QSkzCga7+8nfMpnIZ1rdV+iMRm42TV16Izne9+Srnd2wKkKPGWBuZqIjquTxdUm17GoJ5f1XvHZw/n5a95T6gXmsZaDxkqqyLN4iAQCW5HQ8nLmDoFGa3NLBQTokgescMZB+GNdhxzcKAm2hoeVe1+YjwGIJyUWIaNGAZHTsceDz/kM7OjmrNc2Hqr2bZHJQZP+5K5yiiGQyoJqFJCQRA5QK/NjNHFZ4KLvQVqWCYJkaPkmDzW4cPp91rKewNM4tHqS0nmL3O4+hqmDIEK8pxKEvXRvFa0DWbc+IbAE2OMhITJj2NzsSaUq9enrCE9IFZmsr4WTISDDLz74E4EOuP8sC99qXrOrcgnFgEFkceVuuP0E+WXN8GqICgp/aA9W1cBzukBbEtECbOVJxcLiN1SmLhsrJYfcDFt9zmjLqIt1ClTWPMJxXr3NNg27871qx8esLIWpwagppddNEe1ux39g/TSDvVl3kcF73Nzxn6HSPYpxLcAEniFW/Qr77agAZe52HmSWsrCt75XTfHJggmD7hd4hhlJkhYSpjAYv8WMrf3KvuhRTqZ0tokahmpEQ4LqmPCpBpQK/SgP6leXWsyNmOBn0DX9+CN2vuVMuhYvGbQ6oO6mse9+gmnu/9+DsYEp5fvixJHbYtawuJ6DE3jGASTryTLA4jxB4JV5j2umbXr3gb3beUQvEQBiizDtWbFJaaYr3+Q/MM+VPUfsfqjXTkR9B3neZsu6D8Jm6ZtmIKlJG2uSD70xIa/Uy9Jj/fZYWYOP6YP73laZxx60FRSpAV3ZkYuHqpePkXzpnpEHWSXP4V1X5kXmcE3ZKyX0zfAxB1Qxjk61a5e6Zr+h/9dnAHqPU5D6ldyZWIdhB5bYZVcTU67FgFlfmwa492eSj5shj3eQ4ln410kUnSpaEY6r9y8EQnuqVzld//o9jewrdqnUvPQsD+LyNppQZBCg6RfiAerf/YaVv4gPV0k/BMQ5hI2CqlSNjYt0jz7wepGWdwlsJhpNsBfb4n5lCtoyu7Sq6ySp6ztBG2Q5w6Y1er9iXJ+Yz+IWOihKkoYHn22MaD2q1xhD16fh/2UwUwLbq2q1A6ajvNXPiV+DCxIo4OLtiSNnP58IFB6+JYVhtCMWb8yVAAApWCgfFZZsPUHH8d7SXjZky7AQrMIlXJjQH3BXvAaEjCBiagZQMIcz/dgINxE15TXNQqPcoFhEbmNkp1Ihn4A8ibZGqZYCOkunHLUjcoiMdl76tlXbwuuVGIsTUfRBe2wYFFarOnAZNAFXKskVS6XfouckzxPWMr2hI84nilFunBrGlfNDYdGstLdJ0VvG7nxz8b9Vrp4N40q/BWMQvfhbctRMg54MPNBMPaqHySZA8cNqRszJVZC92DugOP3kXShR+YXIg3wMjvnwUrGhNVHvTalL0PlJJr3T6k0MCyJTEZRbCTeMJxXvwmoJQCczU8A6pgMsNCkiBw1QTMKQdPUMYe8znnX1PoA+mLqDNsDXM8T2QUuWk6ZEXBS07DYjUGYpzeafNeiTqFGH6X3GzWjnw/P4zc3F5kfuzX8Bpoz9C0FeG/AvEL1uS6SpTvr6EYLOuN9jEmC0GGcWPV7GMsDy6oXRB2S0njXs/oGA+RQ2CGtWTMZ6SK/d8bXXBkF44VB5IZExz0QuKtYboa+RVoIPa3twkUdtZiUXECeawTNaId3MerwdMF2ca9SBq8npFEpKwjIgrLzwk0A10YeK8jjjWsFiUoM3DD3/cso1gVwZcetp9OEALgwpLXr0o0rGt+tAQxRS4y7wsJfFOlDcIqRJNNnJuawEucMUUKXQeqv7TWKakjgPWueYeTspJGUYMkyjYbi6x+qW81qBt9SNSQD+ccWKe8aHrfqpDm7HGQyQs9DHyI5xUW+xfFDf2KpmKuIjUzPCxSNS4zNBxkdPs1V4O8uRL+kJszEPeQx8UBfyUt4cf0tSvAI15y4NJPZ2bxPeu/LyIPv23y06O2SH0QnEd5pOBsomAnd4DMpREkCrJ+vGWlOA4pil3ebm8nXnC71fsHd11T3hMIoXyESlDvfTaTUmdetpodpS4PubI3SlvxUEOYOVxQi0l5C0yw41MDgj8ytOMPKpQ+qt2ADfJiOhMedQ0W+Aa/CZf4fnhsTg8owsy1wZ3o0ms1Wgi7KWVZsovzXTsWF6fmN89MyoDgPw3XZfhPf3P6iv7k63XfbiPGd+7j7Y+wht0pGMr9ZiDQ/73o9WRufN7x7yLOCEL8bkaqn3CGIcU09dE9NzERGy6nU5xHMr5t+8iocYs1Q5arE4vzHXr4CkAsJL+ZrvMxr51sXlEQaw34S9nvRvLiVxK5m6H8LdnraBLUzhgLOG1en0fvP2Kqwqj+N+dW8fBkcCsW8lbsrMnuhj+HL3CU7eJIFcEaLPOYMrqhF/IdysIcml39EbxRATYEQvA3UlqysaTF62TZ7BRicFjLnQzWI7Ld7jIIkf8OjkEzyZ+T9yJ32fr6bFXBxfotZXMLFDA46WK+V3piRFhmrOZJKIEF9/1mH6wh2kEQcXlWrDjjeOa9hfn7GYvIL2an42dvntjX9yn9ja+HqojGnpQLngIrTvXFQj+O9KVp8R22vRbz+cxj3SoJcsVLjxUo+Zw36yxwEPtyBrDAwI5UtCU4Hhc80spvlKtEdN+h2qdQqvVd45D6HjG/1fQMvJcEfDMh5M+SILFouKT4wy0d16UlXISxNEqLdEXBXnuI9Iq/gJgNdGtTD5yplKPxvH1v97aNvOf8spoU1Pcg1oImgt7hIHkb9wN2wAKatvhsyRt9gUSIfCx5aoUq61L/ByFZwn7pyc9fmKoiwzdJ2Z9BX7j1gv+agDj4/q+Ur+u4ZuryMXFylHWV2elfNOKKlum/s1Rqm12VhinVvrEMbXbuYkyojCv/YhQgz6dzSYdQK5c5GfWYX9SwPhh2eXAEV9WJzteAxYCjD1mBZZiCli8qfFSo5fUcu+e2ykSObZpcL6+ocQJE7JYDei1TTxD06XeffbZXFVbImvvSuTfW/6WBJwAWwBpnqEl2ACSVCcohSPei9jn7MuBV/4CXF1iLWyv+yisQDeTb9p1NmHyvrOVsUgVRSG2a2mMsguj7cy7ZZgLJsfJ+4JtnyZ0QeWakehUweuA2WqdICROUtA/PauRlpKN3DOSLpHSqi9cUr/vTNAoIla+j5kLSxT8h1FrYoG5rnYNyiuA/KAjWpwPKlKkYPZ6YMe/QxJFxnFqErVwXKwKBBjMR/ZiGoH2gP6tVHq+5hsiFxGWvLZ7ErL21Gh3jx6oGUr1P51zm1UCNay8sogayMJ6Rq5OaXP1q19xfjwvE/teGUnOh50eouA2GwRJf48FvX5A5vCYVYXtkDMGvr3e6ZDfCy/5y+FQzYdZxO9rQJOuepTgraTjEnh9M7SRQFnZB9q0H1vFE47tYLPgvQgZqDl3NfyJwwK9lVOlLXsBMW4MVHH1c0Pm8Hh1yfxqh7osyS2mpKzqgH+Ova946khGtwxxw7OgZeZ8b2kVFIJG0q17qnMTL6dIF1610re1Ni4QSGC4NYYcGlO8E+tzct3+79rzs3AYlnpYnXb3xjV7gEYLywUMOOayWY0tGQ+Xe0QBdpECr5oiwDO3Z1j53DXVwmUJC9r7L9xXD+/ji4AogzswDgBfeSfjRl9Xdf/FD2lQsH0IBcZfse9b1OueDcjwMsxALnRzU2Ny7uxEFFTDLWt+DKrBOpT/8cuXoHbTSgtYZ48+PZZAtEVbrUvMNk3+onO1c3S0fmIuezGuNRS2ZxJQci1URx1yGwFrofI6tCBQqoaWHgX3ZvRDE+GsLJHzmc+vh7zWK3SZ0EZp7P2jMWWfXJrlcPHkmdkLqaS9vAMUhQ24iWOOkFtCkW4ydR6Wn87u/9yv5HqdzuegIL5vrn++pdryr/NfYW5riytzgnbjTOyMT9esqE5KbhxD851rJsfYRMEoBagBpVcOxD+SpNPmPuH3R4At3sm+jsiP32l1t2DK4MlAj9s0gXadTBwgCCEd0sB4gPkEwF0J382zZja54aIEFa8N4tw0y+WjY/+LP46vazbBKvdF111YMGJ6Ai0XxTZZ97620hhyf9ES3Vd6NcvC5u5KDmnQvL/MCCvh3YW6NOGtAA3o5GWoz982YsZA/xLsOaOeQkpPPryFzOQIhpsJ6G82FUqyFiwvmfm6VBy+NQINGD7+uhGHsRMfU90RzaoTx87FEZmQ1bBlU2cj489R+LyeYWUsNW21NXB2p6mnvR8bjFgv04vpVIoj1V/mcIzgVNHI6qDStlTle7AMxBcdDLqS+1zgzC2DLHifZQKE+XkvG18FmrdXlTSxUKwCKxQPlGfb9uKDTOXrk1zyG+H4Nyn8OUfODTj7v9ieamOpE3lDClNIHAOhPJosgeYOtqvEIMWwH6J1UCvLU3ZW7bZZcR03FPNtGkOnZ3qYZKopsG+/5slOauBxNWP5VdaSz5/fCEXL8jPb9rzG7CyKhnpkVhArbC6RVJs7SaCIvBAV3MgbbXFKoq0eHCg80mP1ltISUQsuFhKzhBlvaY1ZVhl4Mg2brN8mp7ZTF920xcw6ivkKONCZLCFpi8C6+wt/n3bVzSnIDb5l+qHzvJ6LoBI36KBDQcC5mUsN6V9Dlx0J8ej5V5PPCoJeXgtm7Q5ncGdgOe7hgPxUNEAU8ggRYIuekFdim3uIebwalLGwGBZ5IwBnArYEidOoBgfjQ4/16XnyUocXJFFcayltQA3Wk/HeljcxmNDmgB4POY0WbYAPut9SohWoh77d4Vp9dIgypkKwEWAHWVNmZE1sPq7+XtBMaFisxmhJqrPhM5LfRPsacfGZiSQm1dr9VoFZLW3g7j7J0aptPrNWRB30aiVlUbemD0z8AMXCKU/WpaxA83cPmmAIMQUJo+h1vsD38BHHUlSRS9N7KZPirqwbdWAGFXiT6l5l01dRXxsJKWCWw/ibJzJRtoPz3k44fyWF19JArjeFXRskzSJTpB4Ge9V5c60PXrAEaz1U8R/7uiCiIGOk8lpmR/480dI4eZ8XcLyYxeFnRNdgGdFFZaseNCzj8cJOPKgJqJSMLH/IodKIks4LTWigjsfsf/H3xunXQ6lcCkarhET0DkPOLoEE9CH/r5Jszf8lRqQZxbXe5Y4UqyuTb2GopuQyjQghb/lqvNBnji+0eHFxmuTG6ithWt/vN6KQZtr/iJbwM0AfvQInTp1PW6gAtcs7q2zMsPQDVTsU11VhO8oIbA9jhhPZF+lNK6wVdxCBEGeT3vBQhIPAJWYPBzW2kJZ2Tdyu4EmZ7HFhXfF2n8+Qx5IHm6sZMf7TJbH9dhbve4wKY5JesBnr7kUqnbmTwrvM5aNkZyhfXBFs5pywWH9AbL+pIGZHoxx1BWB3KP/Zr9uWSqruC/QFxSV+fL5gDKVuT6yWevZyeXz3MnFj62F5ZU+B1irrkZ2c/faA+IDUTxdyaeNPI1yUIQmiA4ST1wdw3dt9qugR7D024xbQ+/dWa7PKypmCUQoPoWpUIETCRzmLTycCjZGDftRzQLbPXH9bWUh84rqeaGuaFNZ91L4CHMtCA7LvBnpRMXeOViuNrfcsFSGS+bfG1PheFIJ0Y8LztzeHl3PtacH8h/bW9BwzwjcIGacpCKzqcACVqDzkU221gsAp1WG9Sm7BpT6Dbx8hbS1HhLq0kJethP9gnMcawXTYj68AvxjQt3piZVifxr/li8xay2USiReB1ljOfw2BT/qV7jpsYTJ1TqmdEbW393wE45UDu+ess4RQw0FUrkmXw92Rx4jLegqzkx6xBw8/0c2B0FZnw/QCfSW1LiUB3SBsjb+D841G1jXnJReEJddEfWjLU/O4bM8u/w6p97IK0BaWo6e2tg9TZTXAPMc6e61UwxykLjrXfkrHkQb2MJ4GNH9cnlzLjRL3XIvJUd4+AOrtTR7GN1aOjOIICZgWlrKXWc2tUIBh+EQ21GndfgpW4NFWV3Zk6fQRrFQzhVrW09ankOv7rW2e3n7EySew3Mj9+QgxCbn8HCIdLxy1Q1wjAVmmN8P3gu7rj09mVdzEMHTClgCavnZdgUzUIJX9FKWp+RAfV9sMdjqCR0AV1qdhFyfb57SthVHGJq4QE0WMj74YQMVqk9ogRKpkoYt4rJAa4y8tZpcITqTcWaeg/nPdfW0wbymXnJPGZA+BF6J4HAxUgpgjRKr87dSvI54+eI8J0mr2Yb0Bk/bGLsXP7bPxP1DzXI1zin0Mp/ES0mfX9SoWgZKdOaYNH99vJmR4k30Q/HcZ06l/93DLSks/15InxRT83zZl/KJumR5ia4jbhmoac0EShml0457HOUDiR7Hy17anVQHp2ifGoUWTuXiYUxMpeAVEvUTLAs/nQlsAHytDYu296LXTp8M7vFjKkoJ3grTrUqJDpsJ1Pm55V/8mVQpq99wUeoKlarlhjNjTjwHQdCiV2OH3esYcAx31DsPRm40vkgyKUuFzTzT2T5O2I0QMpTI+F2OfQwizo5ycsXoWwPbeBr+3nPAT0H81Mm8Hvirc4xZLQPVYCPRowUQfz2TzWG/NPBi0PPQJbapnjeXvmkJXTcwkZLaxnQlTOicyfUpEOtjn4ehOmKIUXhKvi+PJf0Wzh7oVu/XjHgBKQN5AjlRgESiuFO41OTxYPCtfvVfuDHkPSlHGbPGGw7GRsORWoTdAaTWcVr3taDBtB/m1CtYrTYsJWe0h/+yMZNwbypE7iPrb8CrMTRQjD2nMLYNeMi12FGQVhUVTTy0w8w0rJeW4t+rMsIRjbafOZ826I1ECRQW6Xqnw8wc2IQ+bR7NE8RKg9OwmXWLntXoyYgGpZSQUPcquSOptGp5MzOqwEidDrzts8GtqeGCsUiF9TV1kHX9cm01TOZ7Jt4bJsXVKwC7Id2780cajJOLMNUcv0yOllY3qNgb+XWuPz7WmM5cm3mG7Q7s3u8QIlbgiveJxEWJ8u8jFPhVHcangtQV5F3pJeqIN78oIdVv8wRItEJlO6T53bxNahQi+XVcNa6O5RZZsBycRTcxe+BhIZs9HQDFVBwh9dXKzvD0/xVxqpWXeJEfYKIUJOLTutwnZDN7rQSRhYaPCTeC7adHnofBSbpRc2+gSnfddffwJpJgR49XUQm3FCPk/jjF01rvgdPoOVf+44ptkZQfNqX2dHvnScMUQIju3dV8sokBLLQ4OyGLyWD3XZ8uE7NaTdgycxNe/RhsMlm4cA+6nd3tLPp4UH2dukOvbNl56zYDqngjPJY4UOimy5sPG0aIa0aymeL/gLMCbV6X2+NVYUBtGFj6BzMepfqBfVjZTe1sOv3mDCRcOmqlid07dAvO0iM7KVf/y3MLRvdPV4y2hpBNAQQKk1pgqPKrJ8i0jF3OVEvSaFoB0P7dDSbJxlPffLgShwnl5OrR/ogqaX/7ZuYFnq6M6SJHR62ODa/lwcSrdytD4tyUi3LWS88pie1IG+Lani29cNjZlCA6qOiq5VRSgCMomsbWqTEltL4cEDFNog8z9hVbrjj4WZk4oW+yWcpg+JW30VzJHjlPq1P2PVZNdX6zDmSGUtLbzlG6SogpcsUnoAUBhb733SMi0e9wCqc4/mvgbTAmFJjrzvykquy71o1rQUSnZjOsx03zi7pc6KfsqX5F09Yxr/mRYho8oO9XM0MiDEHGnQTlTnLrD7CBcicAh4BT5RaZEwg0ruG85d5Ncps4arrPgVPW+jnOKhtODI58n7tpQ7Y8h4yhuadrLr3F8wVDvegYmi83FUh8kF27QxHG7/alC7uTZmJy9OXl7wvS4cKPk8uixLUzKfzT79qWJ+rn7eZ+10U1xG/qwl81NHGzb47OluSZbnoJHKKdrlJCTKaVmqKxz9hgQw+a/zjkw4oadRtP9g5afwt/dTL3VvhwBL8j+HdbaAJnGyExSGZ2BimGsulx4wiRIXvnJAXjv5rEqH58XWNySkJJGhUWcoBsvNqRpq3+AzjBaqdQCcC0w9yqfGOJwZIurGDle/E7RtNGeTO+/0ACd8QeMadWL00GZW3AKpOOrppAWl03eLL1iHuMrJCPd2Gm8IJQvASi+Hhk8lH/zX7n3p+67MutD/NoDZTTqikRpXqhs9s+fr37iYmskMXRc4EJyxDg45ELOTCXCijjeADjPk3HsFC5AysHhaQqlPeRTVpkPk2siMzhhiFF4+8/KaSUyh+46dZ2ywSdm7Arj1ji78nZpVQs/ncrvPd9cfojvKz37Rr3KBt/b5emqUM7+4MToAhNBaJPWStdKPqLhLbhLTfo24nlgpcWIsWeG3P3lbK6CydJRbtN0wRpOinKSU3E9t3HWR/ZMrj+rBwg3wLA816O/BAhlRXgNPWP996Z3c5Uy6puDQURcjoWL1CKPtfYT0LE3ASnboKMLCej9t7gfFFpIfipztl8F/oKXJGfWUqLcjBCUiHnea9S05ITQubvixeJdUpRyeZuJoliX858GJ4f4DZ4UKdfdNPiZ4KA37hTndx80gg6XzBYRY6E0S7c3CZ5+OTVuP+mE1yobImOsnvF5Pq/+4e7o4hY2ImFX5cVYC3AAGvxmWgAX+WbmjY3Glq2Qh9tF5e+mZ0ubNj4KgX6qhQrgRrfQzeOWPDbRb7kCORwKKFOxHpFkPGVaFxL0nhuynPxd5Y9HAmYtPIFclLXkybR01/392AieOdxG6PMc2jd6qpKoujVB6OOIsZjBSIslAJAUQAuTXkSyZ1/uD1MiE+fKC9z5++fciJQUXsJUs27nJP3ztrUMSAVI5f9zQDW3hQfb5RJMNm/PhfFpmRxs8htKXEfd66ho0+pMC5N7CCCtE879PFzF8BFiF/rAiGpZFHBcLiVeRQppHsmyhDEMkFx9CRD5NKMVslK13mtnY5fsEIzk3/UNYgat4ryFLWmoAPy6HpmXQkGts3j3tF7S7hw9yWT8fqWFA9BfdUXlkAdim2wRel3YgiUhUxsfhKmBE/LG4vfLo8E867y4sm7fAONxXby7RLRfwwauqT4GM2AVKtsiqo4OAcSrNuD1OA98eIcctEIQ3zZnpNdEW+eclydDUJflyvw3741V61/p/k806JIh+8I0Kc75QiTmsrmRFbkGwFVwgZtRECaCZ1DzfZlD5ngK701M7jZCuGepzABMLDGLTA5kdPdv5YsbVZLwaLwX4be2cSNmB8/TS0WwndAjEaVtc1wLex27dBpvCbou14tUA6MJuXxMeHVU5LDsC2YOgh2o9clYJBHR31SJ6fBfSxwMF/umUtQUrK5e7QkF84yWePwx3NkaGWZo/UCqtxB+3EJOykcuLCtUQEMX/X39NeyWLs5vJXsPwoctsJLddcxFMtx+Lnr9guynxkYDixdBpPxUnWGBXFwPapCmr7JswsCwhcS31IAiQexxVacYWFAU//g8uNQD2Tihov658/3LnAwwJXrJE/ntEM9a4fFM9j8ZhKJAWZkZtvWWceL6jJ8IweY80hSXl5RUmtr0gLk4RUgO0OACsy3vgo6NWRyVqYtDZV9hOCcksoE4DNxWi4LQfrU4RNygiXDfeMnnHS4YJY3rSjdwd3W73ogUUDeed8PnMUus22U+tWmkjtfKFcIQawUzcFH0SmhT7EndSRg0mINx/PcL+m2O2d1LB4lLHy26Bjqfxg2lDQ+FSL49o9msO05tkA1u3+uBswKKwdrrDJznMAmK5RDIujvXrQnLRcqocbmaLHpNXtko3C61k+4zeAyboSwmP6DmLdztTiaXF8wbS34Nnp39qnMVKkRa2NCEEJn5wjl4mztpxPSkAr9UkzopTRpjYN8RjNMl+TH56AJAxLfdGn5TajeNJPBPKZRetBbrOOWC7lTAzqtTJ76713hP+eWfvcsAflrTPjy/IiYpY0/3SBHhhcpQC2I30qm9L6OIDuOeGHBj6i6taLe3fBkr/ycY8eNAz2hcab9FEYiQxs4ZMSsM8qfW5raQdDNu1WMfy0QOT3uRV5vMPAJcvOG2V+yIHAyGQdBwgG//a1lZzy2TQj24yci3NpRao//ArCbs9cXdUn/Ym/Sz46NdLIqq6qCn+k64qKC8VpqhrqVNXtF8eoF4vRvDTUPnWOgZfY396TERRjwzNzsDzkdcX/oMSvDZ7HDxJP2ISv+FrkTv4IWpQQLVf50qBgXqw2gydhOCBCCTPWFe3vGA/MiKa3Q8Kx7y1JDjrHflq3BqS8/YUAS2marWvxfEOd8fIYlP1bmjkGwwsc+38/sj+Nb38uM0R40gA+n4eeVey7Y61kPNYHozh54QAJBmrH+1rNMWZu7d3V5zrl9NLJmTY5+GOPYnMsy3J764ETYEiYBvO0GM5fO3H9O/g1v7s92zJhqW2HFdXxCKFytHvPPmKyPMFFrxxbGDHnwfSt/3daSl05OM4rhiM0yW5nSoELXqOuC6y5Vz0Cg4CMRGE87INod7abLq4IJBtceJ3TEnfsZh29b4hQD86cnGu5TWTPhZ800DsVDN5YXOE8hiQ0pEMiVP39XYItamWwzp1Ae2/MzDkSNHfIRqE6j3UdH8842tgEI+XyzHtoEEypYaYbHQ+aIcMZqUlv1LzHJ5IMx61i0UTB1YhZb3O85FRlRQ7mrT409n1qVnbgYeNkDC3DZeA7ME6BO2x2yJuOTeeMHgIlHZSVMTVAUo/HPscXl+u6/ca5b0/6ub7OqNDgEeHfoCDTBVjGmu33I6HCsQadUGBf8XyX8YzLVDMzznNtpApAMnFP3n5YCju6GtqGAKkRAXAe4a8K5fDT2cNaTcaET1kePMW6NEDOnK2yu0Ewvw6QDGXXvSUdd1LxFv+BCRUCxwk2RWlDVnnFSsAOWCGvA3Q1AN+EMp8a0nt05PPSbzz/eiYtBjpRQTzIeQkxBUnEKypq7szqkm5eLzGsGttRucinqtW+Pa4GFgWm8w8vklkVLxbvDXQEjCuXjt6IoMlh8Oqyk7n5A1dGgrx13K7kZGtqjRo1Wj0DXRDpSBLTw76/wdy5BOSWNaSwwEPOwaXPX5fRZtQ/FHhIDXCgbLqhgsETOebQrv5LOQBDq9o4GArVFH+BTHJdpcO6m3P0weeXWlul7Z3fj7uy2xIeel0wqoBi3VcTBBdbBl1/+4fxbcVTgV0n5fYeBhZTbFdGFWgzV52FDOb3OBIBoyLGw1EeZG9w+aIW9Kjeku9Wixl1p319SeuVZHesIQrdJwiGdrUpdKfea7/0KKb2bl5RRQ/rYYobzsiiOCIbpKaj4SvT6PszG1gxykYCGq5u/6rZZD9EguqUUbywS6bo322XpJLVwmzh2sfQqw2WgC3BznYcxBAZLZhcnthjYh/ZBg5FpHyVMBBRIWEc/bvsww9B67FQhhnFjI9SLuA1pT7ZBuGnD5qPn/djj3e70qsoTQloX3so6hWGAtbV5B7hMNJJ3m0CW2s0BE0rNfKruoUcMqSb0QspBR7+dGFHccRSUKVxEj8QIss4vallwEEok2/InK0g34JckGG+Kv6BQqTMsukhER3GxC346mojUgEarwJRquop7Lz/ocDSxzvu5POxKBj/LmwRyUZFbgNYNUrcyihkEbmtbujWp5VGACiihJO8oP9Y49ipIE3j7QK/IQMHydFfs64dwzJreiG2qNzzl7+150QyxXrr6UHdP5+IemNw2NrOG3hoNA/FSJOLL0rOH+gjLMVQ3+SUODhWaODxAZ6pa8X9CsbRbeUf20bnDIcE/yfJx1RgIXFmvZuHXdzZ08Z/G1AcbZbUVT96mXSYHymptrvOPcm3KVT1DwNOHSAPo5X7y8J+63OY7D6g2YxqH0wq3vsc8Z75ig56zTGsjnmKOWQvLzDGia3LQU7UINHyaMwgsbQFqdxSbUT+Y97/Vi9YhEB/dMSGKS4gcV6XoCMkeYpGnOJDzNe5h3IW1rNWh2l8AJSxo/Eo1h59smeu0TzjrAxodWrn4GTxlYt6MtvIeExBZQKu84fYeRQuFlb4GyolEceR9zgkr25YJVqqk7s9jq6R7TfhC4ZldJoybwGkvQrgEAxNp70zVeN9d8/s0puq601sUa/oC+aL5fGCVWkxpCqHH4pdtyY7xRsGSfs08QownD9+xs1FUCzn2bGsjH6vHZA6+3raqoHxtZQ2HUMvvM8xREZV0vvbJEb7+Ez4r4GTHP0ePSw/MDqO5xBp1X53CqiElBzgyS6LYlNwZCOa5rmGj5HLE6Z2i/AMz1OiURBmroF5GBu/aSQE8Bl/oublJMSXHKCMPfZ0moi2s484tLFn3sVQOTv4XbCIcDAlIGJopZhUrOgkE+qMo8g/oD13EX8G5C+5UnrJ3o3NO1x9FyPi10TgmKvZjamFeS/vRbVsmS8wgNFJ39lmZEhs/gXloxHF4Jc4kk7cmLmiP4FiR3p7gUw6O7z12r2gYDB9+ihkYwUmoIkpMhe+yrSPNE4aRqg+74saw9sMA7j7v4hR3jv8A9jkC7GY4pVjAP/HE2iFFBF+G0sGnDuN/bPSjR5rwpR/Yr0PouC6HRvCzO0GSNXET0SmoZ3lBuv2IClaXfS5kYdqViCTBQap0Fxe128td68Y64OjXiEojwHePbC+R22sTZst7HFrM90HVoieg5pQqawaoi/io6DUYJpY+697/UlH1Axpl6fO2IERdbYjIf193VJwv4tJ4/EV8IwOFNnvKZxuZlzvHAdF/Ejf9Rnrpr1jhw1eKvsJeepnPTnJRFnbD9SlKwTzRu3hPt6EE9t428ynmnqY2BXJDCHiCDAeM7MG0XqbyPDjdfZIpQ0Sr9OSbCF4pB+AH5A+iq7F+Gc3gyO5s9YXGTiLEBbB+LLh/KIqjOIyqaBDhOSaCIN81omz0L5+bSdQSg/hG9I/EznG2DKFzjytqyFTNdAzIDK4MVzzX29jQrB71WToPvUp8FZZkkd5U4de8ECl/P/m7EDwuFOkgrQT5ZGD/1aw+wE23tCPTBJUrDHpYF1mTmltUJFcoRczXp3nPB7R9+EmazJdGNugFGrpfOJ67xsQ6T0/xxzcm6AzLwBsBApeBzmy9BTOU8i2Uycecev6ux58v+AvWWt/0xrYMsT4a75M7RsRdK43COYozDpaNxDj0T8jXNgWQJ4KE1URRXfnoF0fCR0oqA1606350WiJkp+8VWTc5x/y8KvPVQHKyGHo1xsvz2AqjTcC3B8ig5nhowcwi2oKreuJZ7fqHpyAoh9gdf5tHVdZqFeEVM1GhJW6wMpXtA4hyOL+wNpw333bqVP8rlOCNHKmKIX+7n9XJWiarwtxYWmQJPv425MtnLq1uGDRsgECNeRYYYc0XcmZJGOF/OKTTNO84ddFMkovCna7Nh6uQOrCi9P5TPZXmzRbgT7Wv8iakNdWX37xr7mKltIxFzgR43Dtc2MEPb6eFKgKyRfBkqRRnfECGsE+n+yP9jq/Va7+qS7a8v7RltIy4NBEUrLVsXXSqYsG/xaSem79dAAS54CGz/xhNPVYki9wlwczCPDO8pu5MFAMqkNIB9bAKhWMEil+/59JcHx/x0Aj+hHofQ+mI9ax3R3cKi/0QK04jJVSJMh1fKvWtTBiJiNkozsNhILlj8tl1XfUkbFxQyozDh3NE5BHNY5oYPrya37PRhElouyvlDTsmegEDZaBi4idxE5eRdsWDu9inAA7FmbLHz0v2WgaGgBsvYD8cW8p7ua1K/vsryCtZtDud7G6zkQQlDNQisxxpd/rR10BVa/agiX1LhUqxhcO4vJyCiwOuD7xf3UoiN93lHkfnkefcQO/jQW2d4YdC0MFG01WFQ2hTd3iDrJtlLnUnpgOGkmjNrPimDJU25Raq5cegszyoUqbw8LR9SigTWhvM6eqZqmkRQlf4ZoRJ1YjpfMeuqa/zMldFOw58DEARcdBqdetAAarnFqYznvEnAiw4R4DltqDOHxbLHZk+VN57mzDlReso1BpW1lVw2B9vt1ZYZ6GgxwX9Uy1oo6WXExHLG18xiLYdnwxSkGUEcM67TW9lvLxYUYYLu48J8CnAUY0luJYKbm011vm6gSmupnoHj8bkksvLNl7j+XeFvE1DoyF+DFykgbFzXABwP/gLXUksasi9fBOfLi1VjChW1MwuGG5fzgOM7g5sKZC61mmX5lGTGSIfn9c129BojOP4e0n4UYgkUhmWAzzNVan6pGnuRkCADixmtNZz1hKjdFZxgiRAFKtyTLM8DBlQEs3XmA6IrzTxsxK71FWLWvqMM9QHshnP0tt0RBu/ZYnYuJmPXQ/mFMeiBPIrOUK0jojOHHMYU/oBK4Nef++bGhMQwkdlS/ayy0UyRFmQ/vOhWWxgnU9RaxfF+/apCMOb34IkObWI4Y7w+jRlWNa+RhObGQUa5T5VT0FR33UzZXZs7csWPleVjrkRWbY3bihRgBh0wyC236MbNlVW6EcvT7P1mKZkFP0GE+d2kG7uwkq3mFcVwkRAOLNacAOI8gWQSdOEanKhP/LQ5AWlI4w/j5Gvj9y+UoKj5z9Q71esQIZhN1os9j6DJf3J6OLRLOsVv3ig9wdiGJCTK64Y+45NsUUcyb844BYKLA5C0jgjcRcNg5P6vXcOoTpnSec6CTC1/3SzxhSBXS+HoJeM3QLlppYinkK0JngL1WcS19waRgvNdOQrjYGhGbbHxQdJR/eUZovoAYeKFpZn0zzcowuFS91jK1vEw4gQfZEKVJnnOfA82LoEO86MNT0+IBnMydFs4H+Y/4dUkVCCr2HiIGrhawrZ2IU5iaGe8Pm7awTzXn8Y4AELnFyeGneGp3Fp2V6NjZygUP+ZvDfq+qJi2dV8DVjL8MsfzYT5mvZojtJZbU7K26LBO1hZA+s1j7yQOuDce0kWb291Jcx8DE9uheHuY5+VKhgZs2azjh9pHeP/roRtN4SIEdymDyx40k3OJzkFKocqOAOGUYJYdjXWYR0fKmc6VPZF1R+7T0MP/FjXgq+Se2wtOxgmQumvLqHbpRIvRdXOivBL4bm/I6tMQb74ulYnQkhn0sPemjefpJtJPzdiKOjRM0TjL1S+bUtB9pm5qOJT/bn+/nbEaIG7OwLtP1rYg6lB4d657ru9zBaRgWH8yYxnoqVP6oC9Fwk9EypYnvNqbT0Mhvc1742Snv/FTMhfld5Dg3eb2UGJEEUnNjNanQP2yRK9b7bkNBc/Hq+YxU54vjOU2EckRdW3cQmVMK3QvemJHXABJ8eIyolVd2BGpAcXSp8JQr/YFdQ7B8DD+StOpIxhC0N7MiH2tlRsVoLRZWxLk5lYxhwBpu2S6ykHTSe5kNaMQg+8rKals93R/KopDAVjOGDzRppxfcHFvx+a2NdpzA+lLHMRzhg/F5IhwRatwIWtE0+AlDEgXguUaf6I+sQl9l8Y0Q04sFqHiHPCWQxqm5kLvkA3W7BO7YyBI5a6g+Ebhb76ZhCJSfITBrKwLa/DqkkyWK8nzFeQr/md48AaxYcgK13X6mlaL/xOJoATk7DZ2yt4HSYb8yRkuTxHefNso3tUbIIgJISkIZ9iC62u+3iwuFCnIIR2xtlmFWFS+rMjOgQKiHBrRQyWAdwTpcDfb5pyz3GdfQd0b/U16k0QP2A26iTE7NqSpid8UtdQvaMa5d+7sYYm8fsPa77FwGKUdNOuQ8k3dBtzimUnq7dgyseHtOuIoJHbKGgBfgbY9oJh/L1cN5ic97tI31XmHSRGyy2XBShotEA32vWXoSkq7A3ZUyLApfP6clZ8EiEVnHvEpSNCeiEtUK8gH3UHC3RGI+XCLBdj3TTa3AvDXo/1LWxLSbQBGtDWLlhHo+uyGYt4uU8ymzDSweoF/MzQF+jFDEleLucIj+ooemaYYnSgjweTkxT05Itxx5sW1b0kqUrwwicLzgMKS2utmdGPwozSVZhDMAPUEPZOM/ALpYNsBgcuEGdB7YALMR1axZtiv1ZdIRXfBRRWK42/b86+x0P/weNGye5/t9SE1E2veuopiUoOFDjXnx1Jh9wjKlsEhNyVoDqT24+Gc8k0Tk4gJ9aEUb839fn/ahlBaq9GoMmwGqnmp9LDlpe0TaszX4OEP4XDUgTgDXfsUVkgsalzVx/smJB/+X9aXhZmqMPVeBSBABtquhz0a3odDARBnf/baHaYysYVGvaqCajkFc0lVE882326+8zyNOGQRUlhQr78X8wSU5QQqaOeq4fCQ3bBMEbtIW5NXmHNohs6uvi/aIQtvIpRwribMJcLJQNwJwHZ3cuXYfgFQXO9j/pVG3bghbHDrFdhJLgRzwbhbJj4/A0a7dOeNRZdXfJJcom9L4alqHR9YtMyh2BxdtVDp5VQv59lt6xnh4hKXlu2P05Q1eaCNsrDfhcIH5TXb2qtwJmaxF/snsWIb2/w26UlWqdMw61+y3ASKVQGELdxBdZveIYgxbOvysr8APXCOJ9AUmir7DZF0qSM/SnJ6SAmBEFYNqx8hrVpHzBqGvHpjgS3+a0rM/4EYLkZVL8ILMThO+nSc+1HhV97OtjtveG1tv9v7Hcol6SixfaZ5tLHbXmlumo0S3TRtVZ5DI48lEsvpD6UEEkICRY7EN7cdjL0ybnyqQo4IOe0hAi0B+3VEIjLEZdBgi7XFKcFhgschvO49bINP+yotuIuFjBdAnF0hpzEEUatwoRFTlhCzoFCq2O1e4D1rAJA3C85kUXoOu1ew0kbW8PQZe3+3QqRyP4BzcJFdEZvUT+FqVOKv4etd5P6p6o+C9rhc/ADezmZbDqdYOtLPyzdIAHdkwWw0Y9TlEwHGreAfKqD3SLt6S5BdOmptM+1ZaslT1m6v01oy7eoDRoLRQ5s0lZQvD0AW1wvVomCi4dANke9bnmCh2+Z6yKPFI4hYf/leDqkAlkKOEpYqgLik+f1pF6KY0q0Pc30vxHpaot8PwHzgst/ohQEdA1oh6g3EkSM0TtmuWNW50jkeRVMomtfMsNpJ5hyNUaKa1Fn7HrjXLaEpFYpM1X3itI1odpKNHeoqWg/VtnS9SForIN8xqsRRYwIMp0W8qIt3+PjFrXJHCjAki4gDYg85lbo+fMk5Exeuhye9674RrBh6NJdM7WfzWd2xzrjgQ4ZUXAtnY8LKHx81WKEnM9jTIMiaulQplNBjeTlFKSkxjt9b5iaUmUdcXW26B2R4BI1d0K+XjrzDHyPqiO+EsR3vX6Jsl+fPnUJ2Y+Ol6zFEXER8c89h2ObpvHpDe/O/+1LTXW1PjxuJnQUdH0YuWBC9P1RGZ6+8VxaaEEb0DgHiPJo4DwcclEIhXpcze43aK5UkZNrKdOH3nyf0T+4Y6COtzmeA5Y3GJ5HV8cgShm3BYyq+45f9Nqh9Q3wj4N3wpa34I0bcMx77E8mGDJktTL6grSedyeFORdwu9U4FxJ5i/5lrXLWLkIfb3SfMnXXOu+gqkAPr8BF3fBbteAu1i7wF3+1MPU1rZPLnlIS7FdbRygmdCxQBkRgJatv5+JN9YQmHUnRr/5ORfNd7ZBZaTzIzkrv0PpXmf4ilFRSwWas8KrS1tooHBvk0/VxP6CKYHMiEfzUYQil21X7hTcWhgke7tt1jIo2P4beZj8U6xqlggPTRZ/FDeHkMI/m/91TTf7y0Wm7kRX3IZGlh8F2OWB476kowsElrnDdAfyNSZH6KHp9fSjLTUkOrPe739ycpO7IpGgAVyORRE7p4pPmAy4SablMhhIE0qgMWmtc5SbX4EkZbtjR8wnXNLuJAmWktqUIBOg/4AyVVBqDjPwwTNu0LZSmQA08E+gKU3ay04h/HkkH053bOibiHJJg5nNwUr3mVhgKBweoIQJ/xOwP4OxORQzUGYdtbO0UndYdZW8EVLsXlV5i0OgVNMd5REr9Y9+iVaQPmQvsuztUa7/Cj0hWLJ59/BmVpii0WsgDyzn6ReclfZqJFe7i8iomZezGIZQeFzNeUd/iuv1N36zpldb+FTwFnCtLf0Vm4SRilzaArpIPNGldqL/lNcWI7FDKBN6e/Z3B1OF7GAyAjZaum61wdkIN6uRvuyPY/a1ZlO4+WC4I7OWDjj8Ij1ZEMUeJ2LLO+/7H49XGjzrP5R2EAprixwWolJC4gDvtCO3vaKo/8/Vt/v7Ub30UKcQw8rFW77SicEz+8JdgcNaTjMctmQQ+nYsrtuDFO2Pf92sSXT0cmiSXUBA6xZvFOrNdcPvDvAM4CJn+s8MPXsaNr5mDsHw8/9UgPQ/+CX6m2v8CjPtCGIKDv9NpaLrOcr82Dzj10EHe0AUhHgmFa9pY/d+2jHmxv1SLIRDN2sBu5yWmUrtRm96ECP7VHbRnR25VREChSGyR1InFqQ6m060NPGe8FLMk70yxaQhvnE5Dry0KSh1SWOuIJUTWRj9gCv5EdF7Md/Tjj/0rSmWOpG3PoRqTSWZK38Ufk/JOQx/dyePfoMCH0OEW7RlwsIrl3Q9l11PhhwSc3iRnumQUdamMvOdHvDyR5EGZYP6mFfkt7cIPHneI3kHBj90j/KVZkQgXlT9R4bMuJQgjl6o/e4nq4rPoH+5cSLL6g2p8X0oUbP6PznlpXJ3W6JxUdF+7A4sLgW7MSv3sUU+W5A4KMCR2fv1uj+ZBvU/TenT8cFnivHZ3eNjqDzxYzQ1wzU2FFxJ/uBkOWOivGpwKeiem/bdqzBTgSFes//ZZMnr2snJ0usy62K107yl+opE33QMWjjjuDT3HXHw7rrQk69FAIBO9m6PdlOhlhO6klgvW3du1Sils8OwblfWoVfQ/FE2mhGU0VbvtuDKvt2Ws2TfPOP2BZrLuuYhjScuvPbNoptSwy5IR5Op+PkAkd2HZf84fWnlDCf7rSR+JjABBbZ4EYjIODsd46KBnpCFGIOq+ICQpwJEVDTwLin/D1/BJ2uc8ksfw9lUDzECkG2hBNXE/VRkmp8q4quMy0x8+3k0bn8rxIpX1anCev7YJfJajHv+agOt2+YMCW7YjR0dtjpi8hRkqhgW82mbc8iiFQpn4xE4id2s6L7T41F3x1wIJKkwDEPMreU0Hnyg4EQ1WzAORPt/LuOEClp76q9REFLK9dloi1sJobCk1c0/ij/4GkrYug2L35sTj13FYUJ8llKnWopbzDYKsyOkClo030vsGvfP7yDlaFHIrO45uIK3M5E3pAoj0JSSExqI4fVlbosNnJT6Wn/imJP2QehREUAeyhsSjqY5etk+emb7cHD7jpYGjQ4ysg/VkPOidvhNaLR8UPfKZ49F0PjG4VH3ntN68rwY26UNFPedUYxLtIbb1KYVUsscIvTyIIXCCXj+76LAD30hbCY11Xz27csl7w9OfIrr6l8AKa0zd/uzCgx/m0PC0PlCCfOn1oTMVWat8HG5nhqEDtDpJTtOcSLckBnNcZZ4CXOTqRBJ08gjY51JKcpsIidadedmI92CyKDh72W9zoFyXYdQHacSnqV9ITJ5rpF+TSHHpxsky5CdnA5JN2cxQ84SOYPyK3taC31r5/Os0ceUm4uzJxoALraFSyDEkzxHFHT4me57C/hl0v8IQDU2OSpK/hQWJZfctrYuqUiPooDARpkAY8m2/I+Nq4qe71adkDCHaKvJPi13hxTk2QcY118lQpBLvlk+5c26CqVMYdbfapxsGKJ1LgwNCB/fl6T8oz/1tjaFNslnN2GUc7im6zFI1VKRY+h8o3yQ9WwNgaaAjnSOIKtllxUl8vCg23prxUyolsMH8XQBVzUXCcW9ggi9lQ+EBNMIjDN1uwPwldksbcDvqLDX5l6PuK86tHdC57Utd7oLvjstn+bZHUI/20DnCHuuNGP6BLfSfsJqQMS7Xoo8F5Q/vt2GnimbYl102cQSh/DPI544K1moZye25AeHJHfWdMM7OUF0bSbNcb4i5ZxbhUHCIaOa04TlIBPqdLFjalpLED6ZvESzA5ApdfzdPJvJGeDBReN+ye3PgAo7IUPjXS0xqVej1gmy9LvRkdrhGEP5VyZFffHB/RYWw2qgwBWVmC+n+naGP1RlBXpt8Ve+S3m7uKirtnSQ8CqmDk/ON6gXyNTD323nq0y2zTHYSQ6Y2DeBVMICrCJXQdyVM58sYRvDf4TpuJeoYf3yCxq84mSX+Kdtv/iVviuK5TSl14wjItQPC1NaRmRM2SW1lb53Lm688vpSSY1uichg4ZcRw6oBIvx12Utqu2yE1cY6ygA2AJ/mLFXtdBboS/pTgRUP+32sEwLl0traIumkFnXEwSERRgl/Wq0rfXeisue1xtzS3C8hDFcWLZf9KhiSiTolcgaok8P6jUXyMlnIquG5/dra1dhZqy0h9lqv2jOqkmpx6TYYB42bwPVw5WCcSpt4JYlYhQyJqQNcnT3u1XophiUqQhzn1aGxk4ouTZpQKTGraM7FiLuuTNQlL2YZdNMqBjFzs4tkMltMTcqhdG3RNTK2C3RwhAqf/T51bTzrfCuqYrukls5w4LEHHv0zg3xmu7QeQ40e8465BivB56+dW01Y+qT5yoZ/weRcA+r5sN/7n0AJp+9dARDYJujTL3NPTxG7yHna8vYsQfwo5E1QeQu9YrQHB0ijek2uAGf16efpjYVlTuz8SaYjDQ8ZRBuJc2KF3Lx/m/dK0JVI24zzjp6EL4zWsj72chgF/Xp45IgLu3VLytB3NjjYhZtv1Nlngya3XvZzXh/wluovbftl89m0fUkZmPFoMkfbbdrXuYFs2/Oaf2e8upUf0deuDBWCVlGaFfwbgMNxcNLlKQIVio6DPS5gEsSfL9tg44nVaQtF7cg0USZvJsx8WoNeZSwfKnI/lVvygHNupyiKYcderi9aZLh+clf7rdjN9Qh5m9ld04xPy32DiH8YRqRGjo6grqD3xRrijVnQMcr2iyBYEHKeDYBBh2ScelQtwTBi+FS3NgxGSR/zdCWDEvB4ou2qqoYn6uAjaSBBswcH9KFmHGBioE87tLc+W8P9qahkyYzhMAiSH/0s1vNotRSpq6bax6oB117HVtAYnWL5loCh0JA0Sva6g0HWGQpxr069/rt9cUPgRIazfMJZfyUJpyJAlclVX9BN1aVpWfZopWavXMwmkvZp8EMEJAM4GYUrMxdwKdZGT8XT7h2G4snBa7OarMzpLGobQKlHrOyN9+Q8kQ2k855xrIMBetbFljuymVE1EEE+M1lGTR/+eKRetg91vO0xAUDaZLmfVU1gPYvP0qaZ7zj23uDoNuP0SGqDdLmaMboaBF7fdRa5jUKrMu5ppMJ7F9J+8IyIaL1H/yKzgUsQjwWJU76CnjcuGjo2QlnMf2nzuHbV/sfw7QQQnb5tHZV6Uhe5J6Vutg5HWffetWWv1bHXwhTmcFWwlCr4NemCIvoZitapMtutZobXmrEbSZQkbVrHoMQAQu6X3l7ch8amv7fqsfTTjWIVZJDOHc4ZuksHJhYBGwMsnHpvX+LEQMGAQM2cZz4GkhKLAJMapdjvZ3/rL7JLBgZRtxEQuT4cP7bDvCN0F4AU103AnnjyxHoorMILIPNZ7t7XWbGrfJjXIPzkYmPbtXnsxe6t0Ge+6y+ZCXfzNMAkA8at9JRcEsZZv8dm/OD978yhou3A+88lK58kRrCZI8VPLL/M/kUCIMvpg2F74Lmtjllv6692FoPjUNqR++4EsVyqnUX/FXtvSkLL0CctLb2HA0tFM5chd7sYDZG2uM0w0JxnHb5xg27NgDOqmZB8NnSdDyAI8FotXpay8LzFYnkIZ+hUt6Sify8bCP7NmgPaLRzzp08Yil2YzhwDBzEK/kerbulIZQQViqFwgrXS42DJfAHPNT2eOV78Myly1JKg2Hy36akDKMNKxDTNESbYiXjmaFV1LHX20iNenNkN/z8sL5LH7K0l0fhKIkuMIxUlStWj3ud/iPe5uhiLOQcoPwwqXewWEwma/njr1yz+AIRNtZSF9166Ro6iMor1F4rnrAvBUoshWbFAxuaNTiQ+aFZEvG7LGoxNP4rUYuOWAln2EFHmjGXnAnKYGFoE9p98m+EoelA+4vvvgTnVr4xVgtbHBmVEN5Ps0n1qbhq5FvGBhm6/DFf1Acn5wxN1m3mnWc0g1TfQryZq2jdf2e5bkkx8SLSizrmGrv15g9fiDsALfg0gZCOGJlnLCzfWTiEa98eW2DVgPKKs89wQ/pv+Os0l64PeB5R0KGlYp+WZqruXPSUaRWUrt33f/+3N8zR2OBQRQ4lYiZHVJSmoyEvk8LW5XRJ5HkCyBbVsqp+xedfBd7MwXrqMZwtGXqKmI71W1WeQOMDWZ3SNnImQVBcVmcz3yIZc6l09kMjOAjNSBCM6/OLNKeyTzBbsI8AIZbuufWcdyY621VRtDNLz+aO+EqDL9P55C41HGUGReh5AhEOXKYwUvEd2sZvo2YVadspgCMkx36eoDHzWucVlZQnYfEp7rJo4wmK9LJ/K9B9JwpHv5NQEgZ+g8p66qRJDbWrHjDHmkyRaXtpeiotvyQTf22dh5KUoICdLtdgB4vBfxQL0X1kaHGSRpOYC70CJMu6CgtFLVOkdNsUgaCbpEKUCwCoNQXk9aWsQMApkZ74TvOFzA/S+xlVeqjk/eR9pVXOGVgmiK/KSNpahZzzK22CrbrcAmkw0kAUDP9o+0FapDbwy0k5ZtGmcrEwzQKmoy61Ftw8NAKP1QZy+yzR+RG2oitgwRHOj2BR2s4QoWJoC1MHRP4tXfAt5QrPX5gGzusWQAjFNNLvz1e/mOE0hrZDvYI52PaHSfFHN1RaEBQ27vsCwmvnraAhxRSfCog44k+OjCLWNIQKqoQeYAmg5Y9r8onG2+DMQGUgXtbTwoPn1BMRTFX+0eTI+Ueu6KAo9F/hRV8m4bGlfoTNy+lJS3/qWp49Zpqg68hkWX8POHxfUA4HOeYTYXk4erm1O35pyFjjrbU/J+ymL4c6FCrbg46+aw1koqHqJwNybpJQYFTddVHCgmHDC3lCEnD30Qrsa00jMk8PCXQKp6Ey2aPOTi5nfswlRzbht7NTENOdEw0nQySCQjPfv8FeuZxEcjfSwHXh7//d3U2xV5BdMwjcsHKh/y0wmcG+UxuwLUpTM3AivuaJEXOn96H9VpUPa1DCvYc5Nz3+PWV482Upukd1nWwJESy5Hla6e+/IMCIChWbVYi0HbV3ema9D6ocsibw2R5SpSF66d6uKcVyDpYw1WWdTz13UbVH34kS1dyOH5yMi5M4hnZ3k1IFfamC/K4DFwyeRD3fNpaKJJksfukSMjaD6dbkw4bThtS2/OC0fH2FmPlTNt5hhVZrmzEUksZxOpEsEDTogJQIpDh/DU7kSAmiopKsU1bU/feg4yTd0ErNplpTYjNf9BBNv9paY1wbfns1WRm/5rIlhPy986PelvvuDaCguUUZuYXYhR1KtHN0QTdSvat3jWqMEEZJpo5vva2T12QRKLAsuWxEfadpwhlbzrktmVj3FpPx/p4PEj5MmI7I7GeWwSu6k6NaSu6uZ3MUdH1rkXDpaAnFZpvO6fXLHrL7Ov/tartCykq1Rla4tYr0jpT6yk/Eb1d504qI8NLh3JT/Uqi3ndviGPLEn/5GiCWvkfat/HrbN1uvKndbuL6m7bMqzlirXHaqhDXVVSsLi73eghIpU8MUYBQ7o4Wzf7puYPBI2QGWvhvf916NzqTFFQw8gds5zx8b8R+RaZE2m1ImVDFyI5bGwJrHRxZ1ihKH8wmmdRdi3b3srMjbjJtP1i1DdafJr0IKjx0ET0G+M8gkp8Q+KobCyHxq9ozi60z634HGUMeANA5Jxf4W/R1GfQV8ypvx7TupvONxShyKmeXE+5CbjVeW7q4cUh3KGW0whcgmWAT4UiyCcmS8MAb/nBmWgOULUijYxx8JXFM+5Suznh3m8fVd9MapBAZyFCobls9DL3f2i/r+6wN5e5g2cvE0tHfTtFx2ap3lN
\ No newline at end of file
diff --git a/test/testUtils/saves/data_pokedex_tests_v2.prsv b/test/testUtils/saves/data_pokedex_tests_v2.prsv
new file mode 100644
index 00000000000..fff658d94d5
--- /dev/null
+++ b/test/testUtils/saves/data_pokedex_tests_v2.prsv
@@ -0,0 +1 @@
+U2FsdGVkX180j9Ts3bYWq5D5XOToUENdHAzyrfCX8bl05ZgiJfUzjEgmGQm7peYifEe4gPrYmx0NcjanSzKYJdmoIq9s60zG1j0vXvDDW5Kp5zdkXNDo+4EpHpRIbwvIzySL8b3HaBZj+aVBsbWkN6Jqn5ScMoLShaE1d7D8Tc9pv9TIW/9Gp/Fnl7fS9hmr4ZTnDKPBwf5pxd29VtCXc/EsWUNP/0Tp70Y9GMl/luCMwCBGoSvdvBzvMkm2Lix1YCVX8ZRM+o03GZj17qta/XXAb2dMHtMIE0/9btnGbYhE52SpjTqusCjEpaRqSuG9i+615mACeqMZeM7Xc2uStny0fw07Qv1mq60ncWhKiQBkvqvRmrsMubkW8ceurvv3PlLtvjkS1Oky3qsXvvOc09zBX6I1jYzL9/GOP+kP3asvjIaZkhv2nAiUTn9p3KLDXGQ+EEeJwcoaRBMYIuRD0izj0jonwiFiXCxgXJKt/r6qqPMaokzjfztwTLhfXdYDx5/wTREEQpHD5dia0uN4R41JPIsTqecIU4T8hxdsZIWMqiavDsut5iCOPPzzAkwI/vzyae9b5A83+exbkMdZEMDnIxhKDK9WRPNwIxGfUox5myORWKj0NKCH43QD2NovlsmfXQIF4+z0t9BgFtDSk20QTYdunUj/q4PrHhQMUBO/lAobG+cqTcovyotUnRja/J72sNZ0uQ7M0LYiNkLYRDOaW84sDu0BUTzGkmFbTMxMAA3u7/vqZUHcK9CyvVf1WlFHr+YQA7ZnrFGZF7fIB4ZgE7TV+4dIlW7FOsk7ALTNtXtY+3dusEM7xN+9JJsNvKd+4RsRy+Yp8UkOaKPfsn5DA9lhtBj6wFSsuWGJvoyJyOyiD/+bqSFUDWODsK+1Gg1M1oOpqZGzj97rD/gyVsc14w7c4nHvbz7UZfS89UbfdSsEn1G78JZv6n9jlM5Dyu/7oxn/JF1bzw3nI2f+6ZhbHD7HHqTmLY5k5iIJNq/Kt093vYdh7nCveyA/bI7vUzd4Oz1ZVGUXR+EQ4Uk9ZVEg6GSkLLHut1tOcBv0XJDytLft+d9C7LN9NMQTOV5Rp2d5yqnSHV1LlDwkNewUcTehnZrsYlzVWzGASoqQjfl2eCdC+0qtOYFYxKCZh19Gg5wMepzjm+c4Ua3fO3UNtfGZi54mE8JxTvCQPHHfadMttECmQYM8jvv6FJ4RmqWJ+waM6aiVBC+i/ZrVdhiZrbn1zVU8waNunigz4U7Txk+U/JJ6uWkhYPrnbpD+OiHzbK8KtjEebblttwKJ1x+HkrbVlPcIb782WlE++FCyUeDlcvHzntXHuzQ8C3OslrfbL/VcWB/YUrLhkeQfi0o2KR5+sW5wzN7rbxLs1f2W9H9rzbQS85Q2+8YNvai4nJQ7AwYdXSwZ/tUSu5JOFp6swYuF0ybyqlm/IrrgrIafev/9bdbc2jZWhR/Wzybfl4cj+0owZXCcBkmc6p9BBLrorg8fS0vRVPcRo1h07Wsi1ywDh2+IZoNVhHf5B9+wnG4xZouKPznu2gptYbhJ8u7etkLHZ02f95YAMGuaSKm3v4WJzwxB69jHdSV85id3DEsGNNgLboL5AjXcI6gPiW46BdA2Kwlr9Nh4JPclW+/HmktT4+J03fOYb+MDIiisfOdl043XwUBG7nvM+uGl4QRtAcWWleqPLP7+vmUwvrLKwA6SuLShOQYoHsjQXYoowOHT6mnN74MVi1W2+yaa43xwynKbk9mljzc9HWmY6wNMwrIELsaTW0xKcA01FOpcVvcEK4PJdIz+AwCZMbPRrg+xDUnkQP2x+xfM+4/W8XlbsrlJYP2OMgnDkkx5xWceg9lC2Y3+JHblnCOipfWXshux4fe4RZCty0LcDbMQcTkmXbTLVC+c15ngAlSxSWoSVYmNJVKG6R53DdmVuVCQ0hH3PUlEgCjshyV7yCcTaPsgN+hp019pqT/VliHWVErX60gxxNBd8H14IT4dlUSxvMnoJK5AuN7FKqjdqHtNum00OfBv5vjuAF1Guo8PwnGkO2JjSPNnkDLLOQ1ND3oz2qlPASlclWYvmODud8kHSvX5iA3pO1KFxEfd9ks1aokz9sENOvyc0vKsoKflbyqc719UIKJxah+KQiptpkpupCjHPlJlSz7KjR6YjluOM2SE6ioEhbr8iBjqg9hfzTxpSc2+7oi5WTqOWetuz/39HBvUcTlDocxcvD4crHw7yUigCx1LS5v8zz+De4E4CCt1NOIE8Est2yaFaiQQeRfOwDOyhoa+ZsX+mOhuCGBOyykRhdlFY8AQfq3HwWnQw72UAUhAsPf1fQbzI38iUzG+TJlzMuBpIjxj7b1fGQnpGa74CDpo5eZVTGKv971pN1ZQ07cWLY+woa1K6JrNzhhvHzuKSxZTumWvN19VjD8b2bltQ3wVwe9JrtEyUcvf4bGW7OfluJ8K7TLcGy/XB8C3G2PiPAwS/vgMvm8QFcBCocXfj7vuSbo0lpCu/W8doD310l/pJfKc7b+zkhpFWDK8oBmqs499Y5XHs0EA2kfoGM1kGVZOMyPfQJFkibNumQCE0Phfe/Ph5bqFf4dwhO24i8rGkw0DwAHyuXzM2dO3w5uVUtSQkldwBgLmr2fS166o908EgblMWBqm+OTGN6z9XTrWPxqJOURrGjBRtRz5f0UbjlyeytOe/I3WMzYu3mvziKUMBX/aFL0mNqgfuyEVpoK7nNcVAjhmywKaz8nEAkCkP7XSdVcjlSpemRehNeuvMzGnZubjc38jrtr2zKi7SPGTlWHYJmmCMi4NqEq/7P1JJmHM6ExNjxMvA+8W1/Ybe9X2nJKB6wmn9eckv2RgHFbwHMlBYwmpMIDo8/sCvDCSxpPjDNgdNZdn+AIWVm0+W/Cx/72aqubthBY9FyZxq8WHSYkW9yJo6vxj1QnoTR9TIYk36oO1RqiNmElP2z80UdTyJlV0Gr5AZKdPs7KT4Vg5EVQ4YwgMehQWuGUO8vBtfquGzZZ2Wqha+lOYoBsxsXZjItyzbF44sYssoFGpj+GwqXTMgKkdWNEzK1xkzc1X1AsKBJGwBJfN5Z0tWpb19LWh+Wmvro0Ix2m/ydBeYA2Yoqa1vsQ1GfYcQoWiteBOfBHEfqgPEAQyJRhemeurOmaXrZxNy6weRtb20LLHeLMXQ2LgAQ1rWtIB83F3ciXeDfyBMVZsiAyWnZX5u5VkPOWSazSbyku4ODcGQZTND5U5Q0X8Lz9ak9vKx6JAQqmHN1uskt2QYx3Qft3zIVlaOre1LXloQ5j6b4XCtrJDNVmhPq4iwwia5yAWHQy4P5FE3Taa/rsUMBdJFtO1XhtfojcKcWNCdX98E1QvMogkFnBmpkHorpbK+XnRf2a7vWcrX509lMgqskXsfMveg1PXzUV4XP1MxVd2rF+cEgS7PcTYjzY8W1uDKrsiBOunsmguJK6/K66T7kHYqIK7JrY2Aftw5Yfi23nU4Cu4XvNveTLaKdVnN8akA+P3hj3qLo/Qs9BiuNlgBtig7YaVWeJnnmpG0yvdlTEpDFIzuw7dH0zuZ2lmifwh58r3yyp0oS49PY+CHVeP50Pe4FgFRQZUzTlLkETjPmTA5qPMKKCoKRsR0DCiehQdQ8vS0nWinNsaGckZA4uF+KHL+DyJg/DSREIGVXHaqDPo/I14jATovo9kEn9hdpppusZGImljoy4Uq+o3E16PjKDl8mlBWXflQajFPCUBb04U1+7vmHlEishl1hAMSWXdcwEK1Kon2CfG++GD3Tn1+AbgLqjlhZbb17cx+1M76+WsA/H2mxvSIdoP+utjujkuBuMiWmDDdqGM6RYG5GYtc/WVcT6Cyi7Ru9CBct9BhYFIVZtuAytvhFhxVQN97rmYaXuhZDclVWQL0a4EOiDk9m44skzBZtXk+rBsGP0d1LwOs7ADHThLDMP/Z3KEUKKhaqxGZIg3Dw+JjuBXE0kv+USy2mPfjmoPYEmbwr57gWgjIikyVYY+4NxrcJqhUmLuIA6HkjsoWKjcAY6cAPxOLLTrsD0OAxrWu9vNYoZcGyOuNrioRbj3241+7MKErXlrusjcBKi8naqDfGCOiWJLz2nJDTdRpqPu9Nb6Yb3wINpmITC08eCpNfMlhXwpw8T8K2/Sgq/uxrYOyHEUHuZ3JzE6hKDWbUsZa5xftA7Ek3UNHgltveArDQq/m5O+E6j4MJDWWsbQqcqQqJEStRNQD+8sVVK7szDP3FTHjIkcmDN6mZQ/vjdB3m1cp+vQcc20SqWbgFuAws5IZgqLzkI8n+gbYpBJn91SMg/19JxTqxfbrhlEAoRRI4pL17kiy1bJYyvQkvFlM0X0YMzBsbiswxxyCY5Gk9zb8T8qJ/LiUtS80YAkyam5/YhxLEOoTK27I9wLxTxE/67Eca82PDpZrQ9+wsYZQ5mD4HVRDGWLYIEPTppspx+Pkb5IAClfc1vsqx8MFwS1u4AvFwuy2JR9AlITI5UUC0P/6TB0qAKbWwf35c5VI1/UJiqNd69TYsOCnYVkmTsKjkUbTrzTqFKhwdL95uWhOUkFLfDFMjid7CFlGWk/AicuEaI3C8llZDjARXXLIq6ZuK51ZH3YPIFyotiVXaKYl7xKdt4wNvRTLGZSObM+g1Ls2WtcXA4LwniJ/QOpgTTG9remeOuVkl571UHjjZpEAIdT5U825+hIK8JPElZSb2Z3YScb1UZOHgZQT4OA1iGFFJoCFMTZZVYoxK70gHDpv2IEc4xhUHb9oW4n3LS4ISmWVsKOSWdciuwWL4cZqHEIvQc23DAW1cZCKIabXCexulx+RlZLio6F/72DO60mpIGKThjt8SJ0L3g4lLrFNaNjg+0M4hFfg8aLrBShGkVC30yk2B/IHZHg9LgrVEeh9b1VZ7/PcZSzKvoUD1WayQVgfTmj/lio4ilYOExYRpDzRB4hNCZGf22Mid0Tb7uBTgDyNoWOkKZa2sVuTtUHKYd1nnmKFwMUmmYRRh0OC9LpaZsRPtPCZw3pe2Ur5R3j/pU1KVOQnCsz7ygjFr14GjMQo5soliuT7V0bw1nyxtev+WYDp+kQPwkSPXynoS+OAt6OaRw+OHByRdZ8uwLg0Lshy7raUovO45+i4CBEwqGoVNG4KVaZ/LZEYpfsBB3udDNOM2aTRfTFDFoouuVHfxRAuSTlukeAR8kwF5ZFxpT0rPI0ZMJC8+KAziKJlwyhcrsFJkNh+N1npoBMvK1fbyL8kNS8hKJGbXBW9W3dY9EO+wm74RjzGYN+ecflcCHhLklQCVNwHH77nkkV5BNLbBhZt6uOXtNLpJ57FAwY0Rd2RH1mnDh/yEHJG10GM3WAwKRH88pJbghdULTqfAoxDk68XRPjoywQ4+ZzImjuLtroOih3CAzhQE62LPmUOd5zeNZtKZbjJ5igqYr497MDL27PzqZOyCYJ5OXezaaBHFziGq/CLOlf57GIoayFvtVVBCPXQKhOzdlnsCiU9rWhGiKuY2dSZ0EDVTVTB8woyof6wRh65GpL+bQCsrsTLJtKUWIBGYjr2Ag8tv+Y1mo+VyqSORfxWtlsHugqb8r/mXYVpupzbTfPRBVE2tGUxqLQYPnhUKdlp4G2Y4E4eSroXM+XOtacAruSx1Fd9S39/F2u4oEBdzlsZPqIM/EQnMGeH+bjjGyQvNRcksPC2XO7LOIvTk0gFNkRSIO7p8MN3PsONdXnDe6e8l+WKeEuntjhNvDPq4fw6rH/Hj2U7LZiCLVtxdyh1hPoCLWCYgp/S+2xQQmVKxBVW43NLksTo5CqOM4T47n0UQY108TWb1BzixU3vQ/4JJgwA5wf5uHw1dgUQYd+EJ1uwK2UpGn4O4XVYZ+3aSdZBQ0sXYy0ETVnpWCz9CKPTQ+nFmZi9SpzZ1nhRAJlfUJ9yevCSXtkIiYzW9ekBmj4FgH/sh+bvFPdsbMl2ZyOekC5YCcU4kTl0/SltQmsuSVGyrYOwG03gBnXO9E4acB94NbhfE69vUqrzkgW8+ASUW1cKEIXg8EnTvQOXAEOmTFN3YZyBtyWZb7LuJmkBFhLa51uZgvnU2+jmRxocY+F3uoZYcss2MCISKyLI2mF1guVOFCrp691dQ0lGpMYv44Cu/nrTCewmXnT6zp3deXIQCv/9ec+NpxcoD6F+51sIP6IMv3bQ3YlNJCbmYR1AOKfdj4pEZXleLm8ap0M8K3YERKrEJQq8yZpNw13lppviStis7pSU/XnJsNJERg/9aH8kVI9AYEDJckR51erEu7iOpEdyUBMZKZ2RrgeoPkSP5hG8TIz/LtH5soCOrqhsO6cDgE5HPT82P2fiQOTFOYJqfQ5cT1bq2oEOdMfWJ3UqTyreR408C4qRileIO1eMlUihquuktRjJR6B1WudKwspBswg3K7/5HNH3ObxcX+XIz62/fTe9zqDBgzhV6FDHxHBQ3sZUwaOQLIhDdxBB1uuuhM+c/S9p9op1vTQbnlIXIuGjZOcH4qcpR4/obGVfkEUL6UhO29NcLf/E5n1H7kJ61SkFbdpDBiUTFZxPJwZRegwjp3UBUpCd++jzq+IV01C6iyR9Cv9v1zIfuleONuH+wCUJLVpQjxiIFDddIkeu3cRByNEJIaa8QsRqgMPtxed01q9eT9TX6E7LuRue9PsgJAqHfGKvz4VbP0ezXQy6PMm6HkpnmR3za+sREkjOWKuH1IAjJhUHlAWluUwGpNGAGVcoUFCOtOkTL775RglLKMp7pXiwIMxITg7aQGeSqTRPXICAF29lCzt6G9dfFYPhroWvKB0jD19Y2CV09KvezK+4fdaYLplITP70tOEEM/IseCTdfktS62FrRXZqBnrNu4/3ahNl/kIquCBFt5Zot0joSshtSc4NftrtS//1s0d49OkOv1fAzqyobM0dpLFiFh9dLnkrG2+1JwUI+iFEZwHWixBgWkofcZkOinCoychiqzgu4s+Oha6NqBZ/GpyjWrR4Oz3HGuP+aQ0brz8vyhRHhR4GH1OqYmvoDUr3oS1Qgo2M+RMsagZwbFcwpyD0GbceOV1eD9l1IOD2dDdRdJFwYk6OIQkvP3qKUgWVmtBSMu7kjjJNHyNkflnjMKqJ35Lw/b/YGFCDfG9k6EkK8n/k2peIjfTEwKxK7p2DTWrM5Hz9S1CcNRFZkFCSOQaLc2Zf/jOEDWHKLpUXgBvBS7PH0EaFDzrqwhzXfruFm3oyi/ARTm3+tA6Fg+sOg/8f4cTWGgwKHdfHc5HBA9MCujNjx74UbXSqWf6Qmy32KMijvWy513zqjUVzxMjMl4BjU5SI1XwT4gYVHqZBdnaO9EW0rZ5ErvpBf3QO8itsQieHVK2sfv4GL6oJ1JKH4dyhmhGiY6jBPwGIHDbq4aIWfWnAskJlr7pjZYBjcFwDJM8b4KHOsRCTxJsKCXUfrPctaJeavWrx3Eadpy1/y8M8EQcEFv30PMFhss/jTrvKIf54QhtdQF11/gQHF8PY0xBK+S8j76JDWuH+1hFBKQ/gKCI6Z1QEBf4vzJbTYqd2JC5XEaEQyTcq/5Z06F7QDbkygiHCcEF4Brfomtt7B5guvuhx4ERyeK13gxMKY2bP8vJSrHYQ3D7vCVIpfjrneVvKQ2lYXNr32R/vgbaXuo86XKDPTgRBODKHo7OKjTxAWUwKqdXpdJ6LAyA41IG/WPKS13X7HDxDwb6M/ETQZEfLw6FmFcGR9M282B9yzYlR2Ux1l2Icuvy1cqqHhynR6qbhjZPgsHnh1VSiJJzc0DbUEh2W/T+rolSX02Ik5MaDcyK0OFRRAksMByCtbYT4hDr0EbOAQgPmtV4qLukT75vSI3z3gO4yfjeWC574orKGTlgUEAIUWw9Xzj5uMS1GP7T/pSwCz8SgcjL/ExZH/uOFbZgTjsxK7Yd8cJg+tbkJMMnfZ2HtA5UEs+UqYC9Uznp8sSlsXQVQh9YvUfh6rf/FHZlfpdyxSuIMG/P+PYKJ/RJhLY0ycR7ymotvUzzg2p41Xgpf+yWYcizOp97jUxc4/AjbiT2KRjsZ+1uxEAKI5hpMUMItsp+eQKccsQZpjWt68xUNrshh+Kt4bA8w4hTVijXYDrNYONIwAZ4EpjW3pZZHSdpuU5oxf6qP0ucoLQ9QcbVLtB3PffjSeU3xDmKTpeZdntfgQR00pv1TFLZqWVdRHUgLldp/EKeXrqlYUs+PuzSPp28jnmjb1iQGg6EB23oLcVPsrPpQc35o8//hOiqhArnj+uxSJquceRR/xTpvLv40A78b1yXaOZ/bdk4qg/nuQZ9xab+Xuv4H4urj4K3/2SXzFgNFxskHaxVUtAidmO8Mv0xueOzKKc9oFAqspUJbaMQPQhDm81a5y4HxUZM0+ek781MRNyaTXNTWiX9sVhxyG8wiilHUaW0QSE/iEYnMlWkHQhSG53aIqGgN0ud0rM5oBfqzeqh4WBAR/aZcdictAgo9hSpWdHDgn7SUCXOGHtUb2Jie4YB623VVId3ZhLEwOQ/hb7uJTczK4xF3zD4RW7DHUW7Dt4HClWQgQ5Agoz5uXZ6gden8LiiXOCl1K632NgDbN+VtE1JKxnWcrPMDNuLDsHzU2ChBy9HtDsPgQHXDxUZ/l3WJav/40v+E6QxREdi7zV/yUa/a7uCI5fhD+/a80vNqu36YZCG46Q0XhHFAPA++6a+VO8IMlZtmUm5VOLoQHht15SgpCs8226QjtnX/MViCCMD/ocd5PrnOf1UNfLXgRycrEARpIBrOZinVGsoir5IOyNmmcHDOKblfrtxF2EC5OZBGvYJi7xAkVzhTKk7PtlFCOVlxiTPfR9V02s8rU3sQiPENuh+VmppGBrCEjbjvsggSuElcWz1LUSWf/Bwq2q34QnBL2dXjac8ZMe1ixpP8heNcup8RkR8DKXfE/MSl3SD5FFRPpO+wUfJAgGqY1JsBVUaYxvQdXpb7QOb4EJq1ZH0O5+18h2p3YT2JTsMhjrqWK/RmZoLrif8oELA/uZx/z/3xphXy5rfCGc+j2Zi1greKNRzsQ7BuwzxDaxTgo/O+dhrjA+0qCXWN0/viYgjYf5fRosRV32jtmy1SNcMHH9hUdSA9sSFwl9bQSWEMOzO1wAqltybeSmxU9o8UofOfoEIPmXUba/ltSRiOvR00hPXprybu4SZib5hPL+lIqLW0TAb1V2A4XZhUm8i1tOF/qVe9OCnfPAYKtursnTNVHOmyzU/OP8YUS7GlXz/VvGAETjtimnUu92C1zTuxGD3MjGeaZL0maLZeY6+eLiI90A9IOp5GGoVkJYRBdCrpia4P8BQxWyQpzqC6u+IrL122wWzrPNlSYDTE5w6f42zrvjChAnnMKU9tf/QARvgPRqA3Yz7/YS897qeub5eW4wR5UH7vHQZghZmeoXDfg28MboL+Ea9/OAIF2C0MmJIliBMUafidEqefbvFtNikV+uAddjkhs0zZ85sRkDaP2YZaXyf224nddsIOTqlfsXQEfP2ld2BA1VWtSciTGO+LheyGXPtS0yRyUX1CdViDxSp6M/O+JR9IQbBr1FeDTkffBK9+X1xxpcywbiDBzEBsgboWW7ATveEmQEQc4Pvb17omaC0FQ4iCHa+KraFTOvOqIgJ8AmiQQ17I0rkpf4yy4X/6hnqhtGq2o4KTjK57U39Ck3O3rK5Df6qehFfcobKj9HdzPU1nPB6mVuAJc+4YGhK7s3E1zwZeNzPG8wU++EwOZPrd6RhNBTZLQRtfd13CGl2DTKU6E4oG8lqyxiG88kJhaZDx/LcwxHLcWvI5lDMM5edKwbPjh9XerEsOlXhaITDNrNralyprrniccp1f++OR/evahhWktLQQ2aj/YHJcsrOTXW9NKVj91Pgv9bbmgp8Oq0fM85pXzQl6OnkhRga6OXytD4CTntDjTQNP+1YMjg3z0NhXs0/yJl8nZRoJQlzJBTlbNnk+Zq/vxRmxKnMEGgwE57tfj73R09YBsFxZjm7W6uLesgONmOyeVSdQndjuemT5yJjQ2bOqKMLrTLVggYKJz00yG9G+6ViGya9sFRE18Hzys+kakzh1+CRK59vqwEp8GAWKIxULWK7v02/JufN9J8VOh51MI0FeOndUMSmwrucKGWyqwk+YIkq/K5LfV0tB99yHz1Rykaix2jwVDAe2X4+3F0xdIoqYGW7NmJgK60N1kbyaN/P+gTH0q5cbKxK25uQ5CiU5y+s6TQXvI1nveikPdZAlLixZg+6U8CCnfo8T7lPW5Jfh4B15Df+M1bC/YNDf9CjF2WWMc6A/h/RH0LWO/sNOyIl4U/D4IAr6IsNWASVenDyfoLfQktRUHazX7ndQtjTlYa1SSfJqoBdiEGhwNye01k7XQ/J1ODhJylz9QUmbdhDJBaTARimoYQnkeJpRcgTnnS3JSIebOF7ynR+nrqG5uMDDv3eHM4LqjQFePry9DDELShBm6bzaeG3jNqIEvEgeDFGRZ8JZGHh1gYWtsyxqNkjeBB4FvWAhfnxs63iI6a+dfoMY2SZEMKzrvZJUFW3zyqx0zMI2ttrDtLjvzOryULnxA4pBWO17DqPY2CatxAwBJtXUpV1cGT6iXML+xmHmi9GAL8kU2g3sdOIpMnkbEo08VF56uP0oJdM4YTMH+kvzvDd3St4FbsEmOuGz9IC0/9dNUF1BfU0MT9H3wMgY/28U9sEFpzkQX8WiSeLXzMrNxN2J+ZW/fythmaFoXcFYeP+uM+8CDtd49MN42jbrz+SdLChZbV4QeK4M1xv7FsKxBh3iROutbRzINQYNHxSd7xUur+qBYObel7Ks2ehJr0UYvomI5RdiRdCApQ7Jr1NXD8K31f1nyBMMSGYJeBCx6oPVPuPsPkzkTyCn491NA0Dl6pdw0WUPiEfaJidAAlc0Pyy4Wa8BZF42P9DWPsPmtBfscatSo1v2O1fhlKDPeIp7ee7y6om5Lee09bQM9qGpB01HKlMVPDRT7RkRRY44Y8ymmnWhgzzwp/woh8OqxJpwoCyg5gQwZT1Dzs8ryXFHk1XfpYAcsOj8EPZ096Nq4v1lPK6/oTAwYGBoMsKcEAPiJbPIKT58Z0sKEt2+n9rN6vEurVPC0wyiZpli4CbxdVQOZmIkoA8ta1QYDaML0JVIvwesuLPHpYK5KC96aoOwFTUKDUHfpguw3ZnxxxoVrUHg8RGZbabhC2CxbM1lVQgI6OoDjG2ORvbfoksVpecry4UVwhcikAMdSZsPxKozObPYEkbCxaI94P2F8UMJLHLt7/5jhgjBnMiQ780YwWclR//DCb57k4J/Aak3LrBEiVaxFCfkZD/Mz2fzfcF1vJ4MRU+/jhMhuYZAdn3vArr/oFIA/yeToPmui4ZHauQi6vXeN89iN5vmEmeixyBEE1M2BCO++HRmELXkLyHVqZTh9OBfH4q0J7H3bIHY0t/ytfneTQHHKsyqXZpGXFEpYdSHtz+KgyKt5rbLenaBwWqhR9IWGSv++l0QFBl3MlnLr8a51yEVo/CWvZufEe9RzckmsQoi97wuGilNEvl4W92hnSpNZuDPb9yG3bxwSpDjk7R+RRkii0KnzDspbVLhqZt3V+2AqsXu/ZMZcdVvboGTD6fwj8hcpMWDOl84e/UFBbbr7KKT4WC3fbIXVV+9ZaOiYGDnL5nDDGe1SFxoRKh7V53Gdh/Uho+eWD6EoL9xzH45k/vpGqtMNOxunrSSn75pkO9T8JtnpUESQ+EUmzsqcWg85Dcjo+6BoPJU1faFtXcVMbt4aPH97aOr7pdHzqQ1uGpdW9/eWjKNsJRK9Oe9IUWmS66eZNlddB4Bj2gQdjXi4zI1ZtwtMbO0y9QIpsoCQDKu523y1HoznbURfoSMXQWcmsQFijcLiAvYS0ahNO54Q3BQr32J7R/slbDv7WxkK4QJeQvrsuBVO7yNPY1odo2khdoCkot5iwxASUHn4zGDSxFjbS64noKO3v4FnBjHcAhkKOTvdfav3kp5miRbYFj3cBlyqygE3AAfd5OZ4UkM5fa1cKRrVc5j19V5b+T+Zw5sEX3FTO+sOq4rnYkuMcZZupuQ7rmfl653I3rkx52XnrDQGzFuNtuQXq9Kf3NRkv2nHma8TEEnuktT8Tsk/YmmqKvcmWuoOMx0smQ+9zccWydGTj3hZhIt344zBFh5PB9tdrlxwIkhcb+Drha/1ScYn2Y6ZIqc2iRNMPqWfU6DS0IHqKcxLVjrZmzPZQ3+/PWRlPQLTneWTMvT/Nd7nlbgZfGXrRsqaIiy3204yOhSGfKn72U46SIX6EcnoOcRtLGKcSo/mKNQBsx948Hd4uqoR6dyqCy1eqDcqu1DY6+gU+Ye4ewbHUSAncsBRtb4Aci7pv5Pawzj3bo5FtF+ZIiyq9yCkZSRnEzqk/KoIlA+nfjSpnpGQc6Khe8NQCkDiaPmdelctOnwP38maELan34X9Y87Pwjldh/B0HGoLLE1aw4SSV6ABONec7pHyslRjZTn3OCrO6tAatqKPLwtCIhEKO0Sn4lEUpIjWqURjUOwWpYblTydPilJNov6BqD6MaR95dM6bnUo9coy3DlEK/WjoCudHHw8AZv8PleR7Tb2WiUm61f+c5aLbpH6EHKctx68aFxe6YEXpiiI3iFuU92rCQybAco0Q8gl8XZYzKHoMykEa5pmCPh2JvuUYj1XLEhAW95GOGXM5SCVEooeoVwp78MXRCvSbLjo0ssOjZ8pTdaavMwYRjdi2NGy9ZC0ksGzYQ8KlMM8a5i/C7aiZhpEDCUk1SSAkEAxruEL8uinDmw4OUoRhwK2F+7toSeqT+bErZTYngpCkCvtlAXLsNFV6IGp2+PQrANkSOXSNaPwdTwaaGL8P5URKE4fOJiUVc3j0B/LcxykSiefLhhWhblcW8gyU946RCzshyBmvbwWzvKGFB9d8ZLtlJwwGwgCJsrvUdWh6jzhdx4UYOU5GyZ93Syc9JHrtICaEzPxo8TStMYTM0XC/8DcyyrieliIv0cs+77emAHqrglJ+O4u9mnYlKIov0AjLCrNEaEo3PrGzc1VVxzXJMXvLvWW4MXm2Fwy3MwGrL0PA5CmJSr49KsDsA+HzlQEJeSpf7QO/wn6b8pWAVi06wSo6y4IGfNSpKag4UX65Pa1mJMEPGG7saumv6gZ2ZwpHo6vfYFeJPL6mcO5t99Z0/n0SDUHsjMl5jIXvq8QZlIbmDKDG2WC5P3cIa8ExZkU89Hxkxq2DBNsu8SnK2QSxrXUu9+P7A1vsYAUR92gvmE/ZpJGqZD01rhy/gUNNCjx7j2Md73ichQ7f3uulCbevA1uhbVfJOgkZn6/LYFREqv1BuyL61k/hhJGxAO4gruevLVVAM2SeXri+y59S/op2LXIbM5xoJKa/CKUHGU5umuOe3whlixh9P0Je+9uLdqLpnjQTXaQ85mwhnfFkDH5rKMLyUQpLjcbudVfru5bgKsuJsreMTBpN3/1n6fFu7pgwT7dr0TCahyCBxZQs/m7AeU7Lsd/1lNpt+fw9azx6KapK4BFBr1fPgeP7ccfRJw1rhn1AZcpDv0wLbYi+1zvoevzyVw0gdwozA/VdauD7GGmPWV2D+1yeMWvZuglNC2wys9wjgllQmKvWCLf3vQf/OUAzg3RNtsa+4KdxOmqlzEY7etXdEmPwl2k2BNxPokDTVBvFHxZywCLDV+cER1DvzLud/LVmiNV5b+ZNMKmJn6c8Cv12fDWBLoREVrIFHhHRTSvSSGsQvCKrlHW0xdqNSrgScjt+56OwAGXrpP/q9rgmXitvenp1C9ZQBWdBXbepNRSyuzEUKyLZ2kewn9dcQAs9RzHTROBB7u8saj82e+VXPoRJyk6aDf8iNe0CGO7nT9bNisW/Jq+B6NwVg48p2FNWhfXDQsGjUustmxN9P+qQwcLN6sZ5x8xcl1YvJugFIicqjAthar2YLuhnPgSnWxkzvOlUzKEFNN7Xpgt9UUx1M0NENM0K4n6hX3s0VF1D8teyHvJ5lxhjh0vig8KicZhqKOhHr7bBTJXRR6Pf/EBtnkobzU2Z4jnHH6LPlEx+EwUDXtTww98WDtNd99pXrsIuzwOOSyzo4suKSD+S8dSOfUhU12UREOYTAN3HcOliAoM6pdvQVjeI7PrWw7uMEHqo/hUHrPcfhTCz91C+ktyWGa2WTte6npAvHaps1IakrfROAWDvkHf7+LJzvjDz8uTq1SVj0f68Eoczzx/bxlCpj5a++vM1f0C4ey6yUsvr003aYNGbnySj7aecXyJ3Dp5CC6p8A/tqhoQ2yDgSdw6jufb2TrZP0U7EeALpoBj6sC62JNH9K77gdYnO0uL+8BbnpeCZnWyQptd7ip09BBuJZpfZoS1QiGMz5LjS0cKKeFHAgW86xfiUuDTiwtvj5KJj9Su5XPcZLELPDzczbBsMLOJ2uzCoXg/XgYwFYZmkX6zLBv0yyORVJxy4EnxLkHw5UeOpokseLeDt3TIMkj1Wo+H3mQ6So643ThPd4Q8Fv8wqKiCxYjoT7MWaZUPg3OTvSiF+q9FS5hxe64q2QpGRB9LCG4prXACbO+wfrSZBnZeFaw5Dc5GLmUz9WDUn7LBBL9ATl7KnN1H1xMsUrMc8Rf/hsjieVpvgC5oqnPKDgiMuvtPDoWRRwQ455AYLXosekJmtlIzCJTTxV048MGzHfeWn9Yode0DVFp6mtDyk1V0wEoY2OQ3UVrCfv5bRTB1V9xOFciSeVKB/efDccftH4O2YEYucGYSF2TfUpQXYOA9f0ZgHw50y3gKhGOszEuJL1BhCq2S3xApIElJ/fgvigD/7euasiYu+wPtm+Hox9i53Y0mgjnQRo883X3a7hchbpOF6tQ6jWMem8tDPq4AET589oWketjLCZHTiDTO1NCS3NRQZipi6jzAx2zRf3Dr5x5zhY/x8T1GGinwdjHHOLdjdIQv8H87sfCR/Z6Apb1Y3Ea0oI9SHbxV7CSPyb5r2SXgVLJgYNmW6v4fVKxZf16qAZZQY3xMje7rXs0AytbTQr+HEbdU+DffZ+FO/KV24fBE1jNGzfBGCH9Xlk0Qc8yWdikwHeyA/NsI6aL7Q4sIOqgeM7D6G41PSq6XuPtoE5MC6B6XS6LFKhgNHbTdGN4ElAbZRLLjB8c5t9zsnCvHv+3BVuh4cZoaXqwaAum1WW/qWpkZIO0UEn+9TbWyc+ZhNbJF2yDLb/b3GczjgAc8d7TWuqNXC/tc4En6i2wDHmK4oF3TfHNFZcjDR7JvZFmnyjLbIrJ7GcwOKUQyr/Mzvb6gh2QdOXu/ci1R7/hkj/I+ZE5nn62nmRTlFAkjdLG4gIQ6GEWhJls9oTXzcTvTyVJWQHeuM925WiKKdCqkjoGdJkTmo2Bo51dS6AklwIJRcr7qhxDP+64Tu2H6tRaLjhZ5vEs/Ei9XwgHdU/rDLRGqHYNICXNpJM/oUesg1AFVocC7GvRj8zSGiUkC/7YOVnwVXKRZxSqzY/E5+7DdtiSqE+aq1mc7/SkyY2RC1GM4+/JKsGofv48UkQyNW2Zy4FH1IIE16F9LlTcapaiiyenzb3+nvuwWupx4Vk4e/Oa9L0tmpIIDxnU+W0wW1fbH2PjUUiH93IeneWn256LiWpgTXsoa+8rtj+xwJFSmjENyghHtwRnE2odoYsIgbQ4Mq8n6voh0N1nfT+WZa0pfwHMGYwwlW0Ohh3lbV7Qwi5RtWn62DfzSn3FZxrmJFW/e34e1k7AzuS+iXO0uwiv/UVZrAMOyJF8hUpqLFPilCPjSWJAQMlFWN8lHe1kOW7pOaHxsyivwkhQTNaNfvhrVJzOZGC4gNItSj5yI4z3YZGFHtbc14YMLVT0bwy5VFVboWw0G4YAaJLlvHGgAiTrOETdHX+31mOrhSgjK2PhgwXhLUxHSF13mYieVJmdoaqYdW1w1cMI5m4Cx+UqkHnOtPUgXTKSvGgKjgZiprz860d25eQbMEX3WdMRwUlXxltCzUIekyCb+yjzi3LqbHLyrjq0XnklKqvU8B30zSCcix5YoVblsslndK1C6JIGTMDMcsP1nfb4P5HulTYaGcxiSyMsylsKQzuCLO3QPgL36aJcghd+8FpX8Mz3Z+NLU3MkgvE0WOWnLnSG5AofBxwXYqs2cJFGRepOBKESiXGxB20yn1JYh4DgrznH5D/xu6rj7Qd/wGWhQqF5ewcPdeF8XrZtJOkICEn8y9QzON6W2lUo+PJpTUUe7CUEXwbQ0iWLtpMmWmMNzvfkKEJUeEBC6uEEwKimompjGnCQM2qRQdARqdEsCQRJt3/7vXwW06WNRGvdRWj5uiwWm2dO7fthBr2/k12ZclbajHK5JyOd2RjUFp1URhi1GBVAl5hPqGzyzRL+3SPI8BCcTFeiAUdTkUmf8Hkf0j1G0N37E+YCsLCvxoxehYi+AV6w2P1IhGaDw9yXS8F7AlDZPWLbXROIz8iFeaixCRu8+g7Dya+smNzl4jiWT6PeNlC+F0xeBx2KYKUOz2WWErOHdY3RYgZ5hulU0uuzeocMhAXcfQ6mOBvKkXHh1qDDBNgQmtCOUMJ7ISna9U0Vg6pFdUY0MGzlcNmhSk7XwPnjhcNqkSmvUeG0xxCtowhEwKJQfsf5UmTXV32nUabsy7oIovp5ZJL0VSgvEiUWlNDl8zrAwzap6ZeR21vnOf2f2JyLr5RY3rcImaMFAF+JdU+Ztor7R5J917xiy4J+xEbi0Y/Fa6ojMUyB8qK9OUwDWA1fI4prbutOugqgkGOt2JfdI778foOr88cimxbTylfRPY1wrXqirGNIGQYSucx+Q9Y+pkKZDcI4CXvIeDfMW9+f30l3V9tfI5Mq9OYjUQxNGMTt9lEHVGv4PScBI1K8cXo4E1teyK5bsZQ3RrKAcXIOSZ95upiIOdZaaMqpIvz/xOX/4J+LMwcz+IZsSCXEMr3HTTt0y1VqWVSzZyhk4XvIrUXr38iBLM145u2YAgIqD838ec1PakWiR+CeD9P144tsolJpzkI0atgf7htyr0hSaU/P8X5x8aGeIDTp8YKuuoxyP53b1gPZu+YAStkAiUoXkjzFJqyjF1Ci7XsdAtUs6ZaFpIuobdoPl6T4tfnvkuoQ9WZgeDM48uTB7SDIGEXbNmQKrOgrokrvqtK0XaSxJp+wu5vYXYZ/u7uLkhLbnL1VzuAVKO5QJa5TNuICEg9tWE5Mp7mU1Of9h3Kv4O35AaVQpczCrBBVCLUtpV6N8eJkDt3NVDINeg4TWtVzQUNsgtHZs3oWNCbxlVblGMcs8aM+SC71KoS9LdRvIorgMwXLbKYAUoIcUhMQ+s3/KNlrszdbLa99h7AVpMADwcHMYg93Rqv8X8W6uqJbgGxg7qoEJ4uEOSpepwYXM/PWqpApOVr3t7rIVj7AhOWRRglkjeEhTwvNuJi/Vqr2qCoZMmFJiHFz6BSZPg1J6+LabZJBGYrCHApUUNiQNO0aGBgMlmhx8pN8etECJSvgK38DbESjtXgsMzJZw3shfD8zmUyFMvkgbVEphS+aFczwSYluISSExTKZQ1fgUipx9ZTQtBsfNdAqMNlnijNeTFU3WpYWn3ZLwWceQU4FAgbESI3BTeQd+ayXQA0gqdQEZ/xnA9N0lr9pIkJrOUvQ2RBhZMYi8fXF1pW6yacpN1Py/iXWcntGSQVUaQKZme8oRcRt+ncpudIqj/n9RAmeGUbUnyu8ZMUC+oyNeRO7peD+tsN/2MTvN5eqA47XATlPSnyXgK0t2Y7t0ofax8F1/y0TpzCk71G9KLgBfMMXrDGPlsh0rz0ZBsipfUnCGbvZJ01L1KuECMB4eIMfxORAqDLXLGcnQgZVnunpXdU9n/h3E8Nc02xWuMXcF+QDy1o1NIn/wyMyC9EkDNVwUVxtUa99RyKCX98QyF7QlqCzjS0eBFWpzqm0x7XLcM/MrkFBoohWNgorLLvtWLAT8e8fJ7ojaOp/IKYIC/8pvRSLRcKoD4OCJr1gi3Wvutblqlu9n3qGzomRkIlrBHoQan6nCDSIG/A8hdbKGrVOJg3XAZYX4/WubDgqi1y0lvQvCx7xz65nn2+yJQDE3lXiORFsSPBZGFclf6wbxGgMWYq5C1qj2ImLms3Tfajy2/4QEp5WOdwhDNhDx69DBrRGjwDPN7f8VLPnD5lr5LAs+zZd0/ecNa4SCiAl1+i0JUSQSiPVJXP1SBv29/b7uRYMBErwT5GqTiKWcYtH9cTB0gDl5T5fqd2D7/vDL6MTgw9HeISfjcv/hnV9EWrhVqt+aGYhLDpRucBfqZc88OI/NiZi6I2663GL8tZw5m8BDr76jwvw3o1cLhW9S+D0zx0QGmfqqAMJW+9+gEsXakIMTBhhCiJYtUTeJyAhp0kfQNpzMKXPa/1Jbl2rYbltl1BbPVXvuEJ5niSuiwq31G1A6+HILZ0AF8BbYMVy6uuaz1wZ2ckVc4SVUbPbMe4B5D+jHA+zgEldm+5zZzOVZjO41t4wTH4JPDLFsVDnuJDN8r9EwZt4m1AqkDhvIVGXl3lL9bGCxzhUWYMrozpEcOCRkq16AmB1h0pbrlqbD73aedBt6GapO+7DafX06/vcYMU66c8H7wyXaspKZ5DB4zZ8kTCQPoqxsvzDLpUw2taH/M96FY6k9NWnK6OFrlaqin9v9LGt1oZhvJAnLMBjtDpZ06nrJ9YNn/EHYcGa97lTzR52/9y6iAJwCAUdLINKLz0IJoV96yTWQR/v9Fdy0RrkZluKTXSo47cSWXL1zpTAXo3pPaWCDr+ZhNiYERc8FieQm2zv3WOfRq+l1I4KJUb7WoQ8xeEQLgRJn1pBf7G0zuCOSsz3g2aJUVVsHktk65+mzoLiTCRaW5Rfv7xkRORpqOjNQEamEq7eiFq5tu58Xnwl94ZAkFC5PRw/QIpraeExstEX4npZz/nYWusZHq+z9f5GFriJBMPKaV9JXEuXK/PEo3XfXhFqD9JD430A4C5rMHBi2ibzOHpUu+DV85EWeaMQhCOJT2lNdtBztagNGWVNQUDo7gRXOzN5ZBjPDMqo8totlnP39c83wIVpmzOYv0lTLUm8kgZpXt69mqt14nTqqoOpryPccbizq9C6FQ1RelNy7CN3k8HAVfS6/kVIGu1jgBbLy907icxS8czLP1YwPhZsh4W9qs+gBfIfP9okHtmtCrN8q3MYQrmCon8M47VpJzlVQjzfzBNvGedbFat3P9SAbA13PCHwl4ln+czWh/n2p3Gzs+M3H27RdK5setE24MCUWvIgfpNZXp6sGdrmXt4Eme6zKOMxOON3TQTtQ/pjGQoOAMt+N45leJcQy+4aZOyk7kkP/95PpMvCzyUhTDiicTBbpCA5VnEfAiXxtGpYk9/7a+D+pglUbaETqMJ/BWW4pNeLduBagDYKbxIhBGNyplmxOj4JHGxjTooffmobov0LTLQCxLKVH7aWzrTQLZ1FO3C+lyxiPD02PaiDMw8fcEEXPdP4TLilVVidsxpr4ctPkD9Vjf/xxFBNKQUPBu9+Kq+49rp0BSoQUxD3CxyH+N8P7emWHDR9U8BDHjler3bo+xUyNI/hb/1GHNJn72bmnSAc0v7HA8uMAlzKgiOYQVaJo4aiKGCQ9gxRiZbiZ/qAzicEABGi/HIlplxTBWggBA84PLpuK6NvPwHshVCnwiqhjQZCch0JhmD2byRTn4NlsdGW0BvTygVda7LkuOaeqos7pu394enpyBqL46wNBjSSby7+22M0Uk2X+xb7ToKRihZycgW0iW/MsRspBUZ8NQ/LpEcVs2Vs/MOf8nz4Xnjj6HZmuORwoJVsZEL3UzPmVoKlvVJpfAtbY4gA5Gwqn6PmekHnFj96FdpuqiSZ9zKOjRiTExdlkwpvt7gF9iThSpxX/ghy8F4AQ9kBCA6HemjsF4fDb/3JC0mImsVHUIUv2R5cnIcL7N9XoO4ay/OXcvWMaUrUGlLk+kvCT/aIR8g3uG2WIg1iVw6PIGLDZPz31WzcGTU6eMWJyGt78O9Pyg1NHkAHDEvGLC1wlhh8IDdOG+BEYuBnbw7c4dBBGLm8X4F5wQIGXYfIgdAhEZZd5QIcVIs4iRdtA+BhTws1eeD8aDVAoQWlD0YNj6MFzSURWVW9GJyueE9PIZHYlxllYa2rbTOeZnAbG4Z0M5xl/2h+23kKwNlNBsMDrMYA5P0Obb/xQmRZU/Y+N6xS933ZwQ2Z2PQZeXBcmSiVGaOFHCif7j8qjIiK6gD7Zumkgth08CSSmV+2QZ5gIOxG3fIZ2IbpCgkLKX+i5/vfr7jM/8OQB3VyaS61WDrfbFwhtq0VhsxnSD95od+yGK1SCq6v9rWoCQupN4Ok3MneRCOAAkm98BKIM32IZKgNrLKN/IoclFM4PiQi/F7xQqmVA0AQ1MxOQWf89UpC9BJ9g6FzCernR/r4aPiGzIX0lhaYFKWReLO0CTt/DpN/2UcZpPdpyJvFgTmKKYTAw60BR/V1jxbDfWWRj4FqRYmZHBnqvlA7o6vvgkyVkOAIx6FEMhYvNHcsVoCa/f040LBv6+og/xJL0FLIoyKQ/JoI/dp0n9QwgRRc8oTpjiQsQWmtnxYpgWjXA/1FPE9D/ruyL/5E0gGSD0TKumPy+h5q9PBv55tJbD4UlhTEsUk4oLfMeVHpnQ3yN5dtmcVlI5l7jfvCh7NqCOHfwSV0iyVchuVgPbnTtRaCE6tyICngmrpmKKzMNOSYtdDwTZG86oal1u/wozmfDZGXMhflhNQhWwd9E8Jtl2rTPjbswpbxY+1wErIhCgkkgz2g4m0inlnoi8IrZJnkdnaB30OPX+s8c5zwlFOWnANE92aQyj6IdeBarMJspEUzJSwLPhfVvlwsRq2MUADmMGSgWbxKUMYRsB+ffuSnZsVbns2q9nBWQCeYbvYJ65vX2RzHw2BJWsG2TGS5AfjcGg6EZzfM+36vJGuxPS63Ry9ipCkNAWOKt5nTlU3M7hV8siFnIIeS1z+MsI99sN/oQLHdFpxfVxY01e0qWzB0sTUamCbDV8XWOG6iEB8MGfIhakpVE0IOlCdy318KM4PDMXI+Yni1C4JL28AYyE8/CZSg+vCoDJ7O2B1RjIHaLf3IhAwNxvrnKxcP2/5WAHFIV6fJGUMDzNaqnpFIh/N9Dq3deSURzhhEk/+tw492DAzQ5yjBCIZvOXF4ncaq4OYky5dSh7WI13HGs9SEugdjQ/JKsKtM4oNWmHism259yivxC8ZFcUVltT1qw9aUnd+Ft+FauQ4asRgnVymcn+vGnEHlGgTZ9Xe7tQfi3sOi2M4JGSJczTT25kq7905/FoyAVDM8lrz67tb5yWWJFATqz6Lpa3U1yLjPTGJw4lmDVVo6tNKA8cnVjmb59yvQl9XIkD1zfkM9QamrS0h2D3uAhN3IJrxcY+MbNkCbxLCqwkEEG5nBC3EzUvoruqaUsKs6HCX9P3V2nkLJdQ5rex4ETRhE6OgnP28sluID5a45qyV1HpkTJLGIr4pmRSctyAoxXhkCbsv/8Ue8Ewd0wqkbPiPqdbF/D9/Cp1zUUY8kXZ4nHLmormIxWOANsDiu9TapVxWYuUOSB9FM8imgy9liH9asSRHABEd0OyVwNDN3bB3shWeMkJKKgT1ePDZ9tDgf5j8dJ8xTD2lXlwGr+AlEWDKeMxhx+5uzAroBECK6Qm1ZJW5ByO7JkaK8a0Cb3Ei9AxUEHysjUAhj/8Isw39iFKnVaV+Ra+Z7NizHOwtMUa4Jef2JYcdO7HGFEJXC3awhwg9qodI1sK2Kds4LVT4GaaKjdIu2xoQpq9r/kveI1qdMPEBWlZdlnC/hhSYQhJT8LiCYTRsT4aVVWtGa0wwSR9IrXkYVeG+/3ZM4sFHrPgqsi/0G459tqExk9cf7oDy762c4xkdKYWFgyx9DdW5a7lNbgk3BFjH7ihRw+Rwmww4qPSAJoy4U5whoRmDuktlipbx/MqB+OXakzXVTFR3JECLFSp/4E4G2OwcJ1GWxv2461nngDjaRY16abvFZbVENR1cJbgD6N5NXcYDlKTLwwynVRNH6Wo5ZNRErGOHl81LC88eeSYoDRU19GoZUUGkPDkQdLmGCAedO8Vp6ozIgWPZCMT2YckFqWmHqoD1nUDvC/ls8qMGNQCw/4fUkqkp6tNKSmuN+Depu8K6iYjpD/RIcAcQkLYzmuCvACBqg0SQsxkh602ORtQcE29RCc1sJEPtr7Dq1Uasz6o0zgWJ52FECX2BROVjknh/D111wjlEpz1JDd0GA6nOutrIx6zkwRNNu0XQhUBxifQFUQBK/ks/sODlsG7EFpJbAyogkT9vk+ZY9jakX7+ItsGjjl9M2Gkk6pOGMYBT1US5KYCwHHaQjt54ocoMWjLHdV2alInxNgyTTna4/t0itdcRrRnO/xpZWBVU0IZcg09n3GKOlJLXVpu1Z3nOTSb7bpzL22ePf1jIb53TK8aFvGwpI/CND232BA6td5dDGs3+rJXdqV7ssJAloGfOO3dSwkeN+RyX1OKfSkaV2rWg4Tgw69hJcwZD43G78obYjQPnOrZLJdMSy2y1esTp2Eh4pcODkH5J299y5RNNePRJpl+exnyCqRyIkChlVBDyB12lNaEAFayWDo+GHjAoug4LO+wjjNS3H3eE/UboWrdGIjurU7ZEkbjLsI4W3jc/Z6DhW0uVEdskMWc5SM22yY820zbaEww41N6POPrp2lvxCsVBw+ZIAvj3nKuvL5Kwi32BFVmu+PzoZMmosdE1piTIgxrpOsVdOU1O9VIYjuLAc4oJ1wH+GzWH/ie8Ci9aMUulP6rzUcpRBWblhofd/f0/wBOaIxbBlGlMVDGXPKEVintkto4NO62IAmuEHCuWkBYk8tI2nfs78VdgprvdXI3JtL9Attxv9ayrPhv57RFw7x08NNsOMvPcgMj2GeHHeH5QHPcfFSiD+Z1AWlglWTUaTZbkiRJOaIMUCntkQUJyKma91xtKEcctFSmZzqSPQjgT+naqrox7Ij+S/ibi24ioN5+k+H1g7eTbqzwicPSdSKnwG7VIRSChbeBbZFYCWYZptf+PVLRMhBLLtPymcbr5gWlU8hV5rMWp91uwIzGnFRDeEcv4sf/3z6RfXCy4fjbBpDIp8MnTsY2EMEe3XUZGRP0YqF4mQEaL9MJDsNCCWjbXz2J78pJTaRnwtlTTSFz4qL6kQUubA8rbkyj3XVEFkojoJOg41s7ckxBj4tJMxQizyY+Nm9OACqpPkOHfHQL/cooUKPzS90WOszzxgXCj+LCn9V0nuZBAV9/+3FbouwPswITh5wyQ330TWiHNNI6rPECbcA0+/rJX/6JZOwPy5BNvMaVPw6SFbJ0IH5szTxth4GxwQjiPYDEdRh+/xYzcaocVnePNTbRlPWyfAotz0KIoFMrBfk+zBwt8oDpXISSfJmqFAopUIUpeKHSRQK36k75sRBKH8sQdCcWdaBn5BSR8v6T+XbK3EVWWx35bBnmvrd9SgVTxpAcoNF/Ko0tt5nSDKsKg338h/JdGaP5KPNIs9FUOM8Oj1OSO5e5dSuQloWp/ArKiD/8IVav433J4alDCaxb8i4jzaWaY4U/D7DJY2JtzvRtR95S07rSSPaD9GHTZf3ytH9XHCgqErVD6LCzsrZSu8WUORsl1YOATi+iouukwYmYQQ7iw8Gl3jo3wjbidNKFiZoYD99PnXsrXDPQMmIIX0q2Lj0v5txzPPLz1UXkoHVX/rA5qObZfpZ+F7mSIDUj80R7jTEeQPwPBX+fZfcZzxj7eiiL27agQgoxtz4wJqgj3m7ZvsOVgCWSYxSzw5q2ayVc40S2s51mV6bXNO4YVvwEb2oLDr7q8fBBpKTdkajAE9HyTI5q1WPsCEZKB/J4jOFxOjdaoOkzbCKbYDNAsiCbZOma8EFl/Wk7lhznKcE6WTGADyiTvdtvq8x4syiSS12YjFHx8/NZyarnAB5KwMZrgVJJ3Eo/tqeXEUXaZDgetgUzWIDNHeKn5ujYNXXW9vlpqDDzvZ6Bq+HvjHqzJQzJ3fOV6z7Nhq6AavWkxZHOAXe0Ai6/ne/8aRlxX7U/MXtjshLlMY6xjrjS0IPqNQsxHaM8XiWyfgF6m7iNKBl/6yQ29UzZPz5h2TV7jlYLGYh5ZSisR5utTCrqrHytW1zCfqAECEGF0+Nf68SREMhsGppAePqVb2mV0upIAY+JE1Aaokk34Bar5FWEDDtde4scxIgV16JcbxZ1n2iuU6uAdg9IGxgbQmUrQ99twqTz1pFpVaXcFFsGYxKgtYAX8vdwrmjLjJzn1aEPrYSuxoHgG1eGYGv7j4W1YA8hDhPe0JwLgpfY+Yqs6wRaocFcM2s8V3oyz4n3bBxsvDT+MjKWtAxmifr9PgA3bLOirPA/N0BtO4E6RBQ2MwYiCNS/jThdMJQqRzkfCsfzEbp3///6EY6B3o+LnWwWUFBWbUU1hQIQKeO11BXP8cw4oatMXkAzfiXfApibBv4QYkreE2fwG80LEtA7F/MWU1kIRwSpwCeUQ8JAsdIQQI9dFPNonuu83X1iz0CNuqfTd2KRvn4cxODcdNmIIEb43b//Jdf9lhQvCZMpFYTpyEMLSLPpWjzYwrpr9jkSVxAV3wdv1h3PvLKYAMsWszEvYfKIFxcFkNpzH12366O7Xuxn7hiMOpibQwdm8v/znLH7PL12vaW83LbQiSwLWg6iQYA8GVxmoKDg4nJ9SanX0pyGJnYHhuxp9R8y7iMOMjR7mTuoBs1aW3rrz/bgoMt+uE7hg+JlYg0cZ7JohUGrpZz3t17VsdsyqEFm/0G7mw/wnhPCSO4Gmn4fQB4xZv0uCnD89tg3YIleWrVnANFWGbQITMuzARP6djTSPCPP6SlZnRQuUx9L80OBagx8bxHE+PYcEg3JAq3yXiEiDiI4ayfrCVARgNWm7AnJIJHuiKIv6O5G2chkRPPvBtWNtC1c0yKh1RVBtIPqH9BS00n+HLiqycscksp+JGVN4wuxa4SoXuEs8Lac6S9Jjlr1VKee4UcSWTwz/dYsAY7Dpnh242aSCPp34Cbp1snXADLYBaB2Oq7IDtg2Nj6VKPgH3Ze2VLhPa40+zES7jqEuI6blAm1k3suWrChBib/4qGW81+QB0dnU26J7cKxKPLkOJ7X6q3jAV9LEVesdndAkGlkbh3hr6lie4Y9K5BZHIi1QfG0snPx9H1w6hueoGEvQt7P7oKveN7BuuB53ERwYyfUwpaa1nhPayU/JQ/Yj6HDGy4TZGecjSF6x+DR4/eYtf19FvSHeXclJ5oJlIxviQy1Yt0lzQ1JfU2WMm2loWg1ri6U1OTU2pMGHFSNtjqIseU1Q/fzvLwLBbXe7eLuqbIchquHHM4cw9co/z+mttfy0T19K4QISmVRh0ZKWjK+cmCb6Su18kEvNtvodT6z8iF+x7NqWJVxUwkL4wslPXk0Sv0Iz1YZv+3a6lNPpcrsONCmjmOMPGXTZR4QNmVPtjlAIIHDj9tWjCQ9gv0ec492QEullFdxR1ZXpUkaRM4D16JviztFKsWSZOjZfkrzWPDC9X30Nr38SeUp87TZNc7qbpjmZKVjTsEm5AFCKdj7WjfDKa0DZn5oGqY1n3xd30zkB+ZoMQPd1JpQJAhCE/bZcj+CY0ood+Hfdmc6Y+apUwtWZ2RyNlD5AAt1aEONPUbjx8/H+OrLsdvkONjAelZ0OfOcwd9lxZ56kR4YZ51f0wa184gLtpPg4wFcmgxwHh2wvFiVh7L7KRMiVBEneWUKsnfp9d2Tp8/QlMAaKId3aE/vBlrbqamvoXxyLpRjmqRHG78PfqpNCnOvEee9gBBXngjDA9ljCXMjOrtIuefhgHGuhqJ/wZ/itlTNUdn7tBgiL0XZMHFldQjB11xU+cJBIHuvvntCheeHaqUIECPYcwRRlSb2LV+Ap1NAmUpyl6R1AOP3KNoVc6kC3NsPgo7Z9FKL7jaPxciEb+oIWfp33RNuKAaiu9ZvfJHfkJMTQb3N2jv/THBNWF3y+6rlGZWrD16uQVBD4Dua7ps2cwlYXLRX2gWM3n4taPRWV6qI5k4i0fRd72jDj1t4W+Qqu+5YIGgTWwN6WfSc23UaXqaVJF/5gWNQlLCumj48myN7td980UHr8c5CqDdWPo0tnN83Lzq6Ah7rblPQUaJjVAX30xVfL6gJBUkaR0ch6GFy71x0bQLEdOL6BTXGtJ8Rufe5YIr/Ra0viO6k/Rticvhsb2eMb+ysZqQ3JlWTw9jmH4aZl9Bv9T031gDyon0Hp2kGXRktX7lZ/PHLEnMuV176lNg9dVovp1Eslth6DnIvaSV1haaRdmBO+XBAYCTQRCQEscfilZPi/uAVRPokE5cbVa0p9p0XILiR7cTLVm2rlu8yI7irmZlfzwjMijmjnayNUTyzS7cO5CzLeRhM9fxUJd2ccS8r8etXLwB60P9yjjICI1HblT6Axthaa6V2CBkwpOpUOu0c5MwVnBniODeFQYZOHUZKIK84DPwyWmSDaK/1L0647lbbcle3tsBCISrYycYO4A9CFHdqtTZmGRDAfxOYVVZ346QDP4+S08br79huTxKbrVEEzdvvVjcCamdq/SXvytpjJTSh7JBD7lHFIFOUBNKUoWzz+Fud8G53ztdCRXjGYc8OB3/aOHF62gS/EoT127AoG+XS+hcSIDGXlil9v7a8cktiPQ+xh6HSsG5kiP/m9STroBZPpYuSnKxYxQcbXJfwEraMg1tnyJVSXIz6M6/PVh1QE0QN+HUOjr72Cx+k3UzQFz7tsKh9W+PMxkQJRZ+RyuAtihCCJJbrsXsRpx01/BzyV7xBq7rjYiZzOmnsEf/lD5QpoW2MmLxIdNIiis4Pb/B7vdt7cho2f+f97NBCearbxV5TFPXNMSk8tZcDHejvXbIr2Bi0wuXJAyGXVXKVxoVx8OxiTQlf5sZVOknFRf6rhaZavPfMlOtd+8Jo610lQk/QkpiXfnbsVsKzbTjFN0FcBArVpEzCvXv7MA4NjnTq2QYFq5ookaSiuGRAjql7AW9vS+epzMI1rHlwBld+fnYdERFIq9zMLTxNZdJXBFW/b+t6dGCU/NxX8fDLJJLiy2ac/fAJiRGB+A8C0FUeIpZG4y+pMzUHrtApsFRa1dwfGoqs6YNSfqlyqSsMeXxpnPrRiLoZH9DTBG4+9mOWej3MnmA3OZ8wILGr+YeVA5ftjpQdnrFEOPZltBz9qYYel6f475zIoe4o7MnSnMtGsuKXzYpMgnyrLWr5sOqBT6Zb07fR1LZMLHahEIu1Cb7r0S3MlXa2XeNlwTPFm+TQWDYjzUJZJERVJ5Fm22L21crfGwaf0PdWKr/YK1h8jvkGiHJshi6TkdO0WYSFzNRTmi7+YNx77hNcEblZWo5iuLNFCQQpzJmDvB1W1EF1hw0deWW2dtAAkXNYmB61e7yOHXPyoy8SLQMHUKB0Z8Tpx8hXfZw6Qqo6uM28xvzsSKSVyHVh8jge6U6paLJC+atdVQ1qriZLVNWJhv+UqtMWNhWV3ErGWaaSe+ndlJEOU1RNgC1yRfNcoLvABD5WcrJGqSmtCbQIdYHknBkiGa/2q9sPiqAasU3XlBZFCD07H2QMZ5GU4/d/pN9+cLJd6MMW8ivby8SpwmI8etvMO2Oiamiu5lM2hzdkWoDEkxccgGY0F6vapNbtPLehge2sCk5XjF2dZlbZXlIeI27PfVO0EHUgOmejPEiNYKXAk+dWpU/MWDTqBxzuwfam443mHVJCEepvrCBjUq4oOmLi7XNe0Gs4FJGt8JlyYBAEohYh4VDiI1fNA7WmZFlu+CsAbIwvFhw+AJVeoUm+WFGzZzDHKkFa65Maj79eGegeEqL4bZ4BYwDORoTnBpPtlwkktHQbjFZV8/1qjCBRVaNA1tammTNrWqDg4FR4LoXqKVzZEFz1qoD+BJuJRX0uvxBBAh/NdUYEMy16M02arwBehwYEVzL0ThDcDVP7iWL1KP6CB/mKo/9jVId/7z19+R5W21D9cScbtRbAofqZ3DHkecIcle+faT/+INmEnQjOUwMyh5FG3Bi57XdBwTJpSuiIWita+6TNRnskXWvAsNcqAUewxCF19CCCCZcuDstxtXHB2ayC22frE6jeqVJIsJhK9E+KE05VLnvArhfLB4eKfiZ+RfYTnISoMAtlPX9nfRw3DBQyFEaAPeyxUOMMCOoGAXjPuy94Zd4ziwuTRdxouqh8w18K/RlxaPjkIzmAxYyTZbYssFwHGavjuP+uy6C/bKSNDNV5S7qcJCbxeE62DRDZt5O+DPFPYGZ1NQVR0smXwKNwH8i1glFpYsQdL2ZJMr5wrgFGsVRkBa4gU/Oc3lcYxE41cncqzDFOPjIRgRV6h2NyPStD5TmzeW7IC4pGSJ4NnkUFRr1jaNWfdYHe7YLZ5cOLwnQK58MsK1gkwHv8cA8spR020uysq2Vc70MLPVyEBh4NkKLChOesp8WjMFQDFvorXSMaTg0m9b/Bv29gc0Z2JCg+q155nLiQdbwDeihE79IINYwtG77Vbye/jfDdjN7n5+v4hszOpuGAE5QdKIIAR+ICRP8kSm7InBgh3hfOAxlp1oVxO+CibKCb7q80ZfRLu852c+2NC+EreniEGecIMU1N+1xIWGrfkOrGmeJ7O+fcYXhpTw3xnrh/GsICkTWcvwMedzamAExr0wMiBejNVEgw0aLfzvRedzYrkKTrAu0rVFKApA7rcZOaK1FVJOu+hu4/xnW2EWJq8ho7ZZ77L1AhNJJWBkiSHmQ9wsfnEDmh/NmNZjngeob5faUW4BDFOZtKXMvg0uUA2QLiAjrqQWBiurbGyVuNy+i73SRgeH2qOrZiZYVQDds1znjLeKyNosjqcq4N9dpyBBxrCLzTgjPciP9852FFBUvCuTCeGhHpI3Pnnr6r7QEdxLf9r2MVAcheJ97PVZrQ8xSKuWd5dz7A4Roy07xjc/QOctxcZa8bsuAwy0bk6H445gdLRcTr14BVuLpUYQ6XwMHRxV1lV5ajc+v6T9eksXMSABglPoV45CkbhSHHH5UQAEz0iF9GndY/F6WcNDuJgpiRSAJI2Erl//cg/ztFHw+bBqzoD2ghfwuzCJjJGPzbnH/kzTZs52n7xqb8uENyDGR2PPz2TJ39Lju1h4wzFSBiOONGi+BQnW1M2RpspW1YMFcoboUJo49bCzgFl+DRA86Im9k2LxAcwkGKHS54Ao1fEd28ApwpasyvQN768t0WcOvpt9qyBmm7YCAE3TAGfmFljV6XvlckldB9xG0ID+jDha9ofrF7Zp/xK4CPbdaRAjpgUJE4CYA3Qw/ShjtisFrb/GP/RmAHDmAum9R8bg5fwAKI1hLo+/UK68g5Ti+Ii3/uIEoTQiGtOSn8B3fOr3jYkxD0sRHnqR0PZYNtycUNhcZXUyNHsp9Jc4MP6trU+8F8/KesgXHwy+9m65eo5dIExSyu9Sow2JQx/Ty+Xs9SzSZA2AOL5C9GGfvz8YnzvDRBRkl2/9Ws29nfEVAQJDOBUlKTqL6S6Q8dV32PTTO7+PzB2ta2xl/rGQEhY+CuCpcex3pF59wDjAzsknVPdtm0dN3OUBT45ctZ9IFjUZPZFuGfnBYlEmF14EiCNQ6haDHPrm+vfGogbpvGALGSN+5+87XSrEEI7XgVyzZFru8Sm5p0zQnG9vDHGTvon9yNW8JcWfi/tOAD1tbgFG8WTxtIiZW3jV+VPSJD3K5WDNMCQ0R+hoPHxz6+8m7FhHaQp4/nDzfPA4GSEKd0ApQj4I3PeydaWPOF0oClAY+pw2xfgue4Fz3C30ECuvAi+D27+/StuYmp8h1Ye0yv7ArFBsTZ5laXC7JWknkE0ogjp9dxslQ5xdOg5fg6nRJ3NthW6LX82TQZEvQhSdUslzZ9+AB8ISoeKHKBV/DTCTj9FcACeJwV+Go4o33qgHKuzVq3kfpKaWh2m0N/Wz0B5RAxk2RBbEi9eG6ZVFbKOiwltJxrxFuaG9BihD3/Smoa6yy1RdJc77n1AWJwUitmk+G58LfPmkg4IDl4So7R4+B5VzgzMMAbwyBuB2H01v10JSix7eFMth1OCxLg45Fqpwwn9a3xCPCVj6Ma77LKRVSwLm7x94U1eMzfWYYFjrBrbBQLcd+DWdmIbCEfe3xTwXWm9Ihdm5IChVg3NXgKHD4PyZlurXJPIlTmd72L2vxyH2aWr/+3pZXug9PBwvHMpIk6a5jg8yr6uwsGWqVsRvwPmuvPI6dNeY31vz3bDSPMH+xQoF2xVlI/hZmUbRjavi+VyVIKPlsL/2QFmIOf54SFsR1X9rn3sKrYPUHZTwJaoD1A1rhqwUf8j7jYmhWWRWk9ef1/EQ2ByUHYw7YePgTlNT+L9rof+I38giqY2MiMdDkLp3lRxHjJVUUhptm/WkQ7nGel5/U/ZupGR9GmxNC02PHOdEhiy4LcamDYSApz0jdW9+0siMFWYdNGbcjguMOlZTIbZ+XIbyTIAB0eIACHEtW3LmdUWefVGWYIyAUeBRatigWz/Q5Pi041vmTmlmXi/3RJZ49cd+AF1HnfSALF+syXLqMviUBFIGnJxvUokRy3/vdb9Zhk5w22EVcIDFL1UI8FPje6OHNVNuSlT3CZPax2R/v66uD8AetVaERrhj2XHH3AbsH939m3sy+NXyYwzHnzDB4JK6D0FsWb2SvQW1ZmABGTObn3Eq5vuHZsPEL3Ix7mOe7xc6unz8+DqcudJ1ucHMzxmD6Ptw8D+uMr4067F9vO359JIcMGR7Aifm2Nc2JppIh7N4uTWt5P/17FfaAGgC/S/ZDi40Tlbk08ZcGJRYQnBYvOjX+znggocFBe+zswRNFRsAGkLR0i/zk5e9Gg3ZAZvkHafuSFBA4Oy8RHEYLLUwjnZcEvM7lbZQWgu6NxbC9UQbGCDLYH1BnUb8mhseexvYA4XGnjfb5XxmeNlIuDERIHQFx9OOMRCbG8tbrdDRC1VYSTmk5lmOtXBZo9JEx4jJNdMkvOcX/3VPTeOkoSiS2kKz6TQ0BZm0rtZTjKSWFOMVqugzyA+xMqA7oRgIfkHQw69Bn6+0pJHG3p97O+IZXCUICnoe0aJoXaKaWm/hhaGO/cJ0eOijq4wazLgzVZDL4HqQR2BIq2mXpIW9m2QOlDoD8rqMbdeonRfvscswthrGqnXvgLcRBznDWJbROBkbV5/TOHVeyLN37wryZL+jZTo8FaDMevcObtigQtr9pg4ozdI9BdUkbhF7yK3mm8WkKBYHeeSUlAek0j3xxOMj8gLFBE0+XoLl/KrH6fYbBQLwSj64SIy/ym6UN8Iz3oQcaqgeN4M5i83WkWz9vF0CHqiZv9g0Sz7ehS8j3m69bLpbDOQVgUrAQTJjra9LpytKfKU1JlOnuQzePHn98BCCj2PMfWpk+ckVnH1nHTN6gdqQsan3YM3CLeePDUUJYgPIXDSxbokk53UheUFIYK2iB/Zq3+SAqAqanVfO1VahIzALCdDjd8gddlqpRRq+iDAFkJV/dwsxxnzA5kpR6EI99NzSNiTVRqL23i22dd3hyE8leezMh1qju6DDV7xTI8w/pxqIzC/1JNjp5ezmCmcv1pKfNnrfL5jG6phP5KE04meUDQjFXW35ogYenTdH4mKEGRQpSTdpIQUXR+4t2+5vyUzLj7C8IizBwK0c2t//J78Nv1UhEtZ5ceulvQp8et1o3Kr0uP1WJHC5dU/Bl5ukCFLbMKJ9cKT4TfSoRYtZqxQFRpoUZDZPzq1SyJWbBsfDeuHe0l2GxhHXFsM1mpB+lWYknsTX0k73cqXbA/Af4fLd0nlLawtAu6d1y1tuMv6RTI9X/yMqlLS7Y1j6MrwiO5HJ1/l+weDfc8vK40ZcUri8GY58QMgk70OB+Za3oWV5/xUTCTCupRrbnREJAbObvx+lyE5To6S3wPBopQ09R9ujuc8qDRWVg0pteYKKrFeBWsSiRpksrx6LeqIpkwLQwDAjuvthtoQgsIIlL9LLS1hNsz00oQcBUiE7PSP0An0cYz5ph+bz37cVlwRPckBkijPq7d6n5+phb6wKdx3qp1FtWm33FXn9F1vIFKUrtJfbvuDmPAFo3gar8ROJvC/LiKXzHuv9syEQxFRQD6RjMIHciOKM9Jra9W/vnGdOubxb658dn/Rkc0lpeCRSLlhgSzND+voqjFrcXaGO92MyRsUZ9yovxacmKMo9/kaJqz8wgSG4HYvQOO4XH58gojgzKJ4hJgodOaQWfKbqbwUWP4Afs15PGUxhmuioP31DnSva1g7vzMbAiePTNu6mhhCKcAVPZJw3Fr5eXytUIgGHr7qr73w7jyds4iqP6ft0Am1w+pd1qLcnesE9ZGupZFp4/tsPZirO+FXjJMYWFYtCnE5s+afA9U0VpbIFNqAksgJfZtmTSM8uSTjiI3Z85awVyx6jjFgYk+6JI0gyjdfqKE1u5/84Q3ht6Ma2LT4yhcXIlZ0NaSUFv/9EPDXUzfO1eAz6iswQIe69O2SvOH8xaKTPMUkAJYKueGpZ2AulrP74/535U2P48lKLiE//VGxj+JyYQz2ADVy3A3JLyFrRiNtGwG2tavSs8BXHcgbyrhdH5F4bDQDD1rRPhi45le9vu9HlcUgfITcdyxeegmjAi86XoGeFvbK/mQ3QeuUt4OUmH7f+uwUCDJ4xL+6btechKWZ2rCeA+zUYxONy/yxHrOoQuOftS2QhJg+GCi9rZREJqdcX6HRLkuVcX38CeIUQmGsGobJ/5LLdG4mGWzIiXcwCmml5FM74fRIeE0JjX25M4nEWJ5mbul0Npn8u75GPDNw1Fe4/kEj9EIqhiK0Ty6oPK9RwEOCMOr1KZ46dsi1LgBkse2NXynQ1F+iU+Bg0ud8CigVl/9xQOU8XdGcl8qkGRyBiQTGJ90ubgVrun+i0hlKoaYd4vCsvQkHIkTSsH7vpvMaHME/1Urd6Wm7cbMgCKDkng25eCvO2gOBIS69f8guDepU7WC31lKLw1XMiwSG3iuTTIrzpcruurMRES/y17IxZoIkfcf29DcHReNr6M+J4W55z7UIEao7wXHg3FAvQRaX81h/nMilpVtPorNrS4gP83C4LsCVfocczQzv8dM/49VooWmsLf4G4rebcRiav9b6LOi9Wwx/Qwl6ePYqLq7vQ6YgDeJnqecqmGK5nNtsRoyQ2l0GU6Z+6x4fS8f4GqgZx/uOb3IepO6D8SOrtiWjrdW6+QPQrDSD1XHRxF92B1HH1KEbyH4+XVCsXxOBnkptmzjqXG4iC42fFfv0eFDQ1xbKE9wCaPchqQ7AxXmbHPEuFNkzrmAKIacCe3i2McTEidxqral5tcnp7mF82JKaDuN+PupxG4AyImNq0nDhfYbqWoRTbUrhiSKFKrlwP4D0y9gUeLY6Pjf276Bu825Z1NrBx3eHVkzCZDe+GMOdf7vLNs7Zet70NfWzy+9IEdYBR/xQtJFPZOFZp2mRngT7UI41+ydm9Yozd1QxfoPEQ4dA9ap8e+0whEdgly9hct6hROnTia5qT0hEfd/4HZ9l7k5aezGSWqZGKXFsz5yIzFwT3m07a3cgkHXS/PXGBGvhftBLejIfn5eyjoQs1JyWepJ5zEbNS6U9axJKoeWkkrR9C+20zBn4kTpHkRpCwAtw/HOOmAPznhV+BocOWJFHR6DUW7l/L/Npn/Ws0Nf8/0UtvrRXzw3g+lkklBFP7MPcCvzAD8I6rFqvL6KrFCAMWjZkJALri1NnrIAdd5c5baLcQQnXuLinRN8c/IBYfS1QIm1+Oh0OacVlMPmFssVrmM8Crf/CP4+NkpnHRPD+3B+myPXEwQ0j1VguFJYPje2CtRxhTAg9uf1X10h6B2j2woO+R6P8Vu+1Fi2L3ecor5qMJtU57zXYeFnoUunDt/6FMoy35ubhOyNSTdOI+cc+h/RYsfAAwLIHX8tiX0JVQHXFg2A/K8s59jtC/hG4UsqWeuK7VyfOc56KkrOWwxK8fiGg/1f7xAq7BzyyvTNcAbeNbCoqGMetJux07yuEA2evOiSr5vPRkVKHNQ/c6heE81whDMx78WnKQHn2FMmL+IBDLUKXQoIi70dbM94EFM7WZh6ZL13Km1AG2hpx/eBK8e3A/xZqBXzwtxNiPZlDRsPDUuC3dZsx8fcbpiAb57ZVG3NtmXatFCkzuXrOXXRWH2wo6HM6KRNFWilOrHdUa6dUq8/b7Q1rP6QqxfrYSGZjqnm1dEow8mE1b+6ljko6/8Wj6kkqp7Pn/m6HOZ5w77YT8M7dlbJbP+hUCd1CojaZJY6dmPVWnAtbX50ij5aI+hzKH3rIwWGUAodEBGxNzWrOF4WOVdxp1MZYF97h28sjqsn6qbFg1Nd9l8SOoBxTJiqPIIxDY6QIXmrr+sYFMC8nxgAn4y8n/t8C8KIx8/Hp2DqZ8FYlnbdXJFga8QSfTH7DIoq0zua9w3pMGia3kTFc62SIHX1cxucoC8y8MJSCgEIQtJ2+l/UEitUM7xW1adHolawI6e6OFCDHclFXgJ+lA6To5JcZwjIpV2Ss/dF94XzTn3IooLSny76/VBj61tDz9zgXiFtnuwyYBy+IRTFDBFBPMLrP4B9Ke24qJKacVwLCPhtnYAGHSOCvM6J45UfLwTe5r+dpqxrrxUBjdmzDd8colLbjlANtQHMvLLdv7cQ2mIxc3L3MOZHWT6sYnr2Vftf+GVuxHC3Lk6IbY+3vf+FmFVe2Py0lkUoxoeCQAbgdyS40Gvl47+cpaeg8R8vNC5ACoGtaJHeBoAbVwG/9/VqT6tUYIryaiyh/CDNQMt3Dv2aVdkhjzZSQ3jb4a+n451zA7wpP+rwKzt7CfE5D5WnOOCQFOC39bV8SfGFa+BNDX+f1sr8NEEc2F1YUiJgStIk7aAoN4EFiNF+KJSHyOQmfoKWP5A8x5KwtVY5NCFII1fHQG7vmqixDH1b1+6BlOx4kwL8wxQDQky5gmAJo03skeoiH0aDYF028t8jYk/Oni2I6Js4wLQ8fnzyBftv9yUi+D4e9b7v0vyB+tL9PEKHR8t49fhctNC4MFdVHaCTvA21XF+KWfdBWzAQBvMZZ8dq6Ax7X+RTwWFV1N5O6Pr17Q0T0ZqWx/wN4tihqw/UfHk/IB/VISdhKkUS3/4STYQIkmu1iOgyWgpZTRoRLcfC61sNB3lz+ttG3QtMv55W8fAkM5ZSWeqyWFshJXrIwzu/XhHVb6r8B/RLjJGUVRIxLwM1NdSj8oPaotnVys4oi6aZqHpSGgPt1Ab+Gys7MdSgvVi6urWiLOq603r9FSpAQZH8Ai5W9VEfqv0HtiNRzpWWk/sFK52IwHYE4dZrtfQuESxd1ZaQ9NtvqKV6Szh/IXLOmTX+Td1h9pyrevSdKVCX3kTDrtg1Wuw8Hm+IcM8kBoLJbowbNasIeb2kuOv60ykz57PAZnTC/3pa5mYhFiQwbCQ/mv5IFlyws0JUct9pVn4MRHxhxOeVNWaKLG8N8Z8nai5Y61LrATkpDFJ3Q4U5Jsrzw6apn5ebHFrV0UvQRnKwRThsQSJUWraMmt35onpc01qUhm/btraQyz+ok3I2oB3Wry/CIh7S/sfrTx0BK7GyAp4LZkSmfulvgslQfUWdDc4B3qhetbDt+tfco0oHWLfPwCkmTaArgoJWKzOUfXK4pCRWjRmjuCNI4uWFclC+/e+g9o19Mhl8fp7q7I0czDbjgL2HsquBeFeVKxMtdARktsvgZsd1dBUOA6BQmOOOmue6i/E/w4K82K40tcJfPn4g78sPPXX2wyrlqQ+PXPcCuTInvxoibzVO2nFo0RVRf0gZbjZmZZBR0KGeBxAQTUok0CMwd7L3ck/gFDIwv4WHz8Ini+P8zY2kQJYk6DhR3Rd4nh0z7QsqXNpm3kst6gUKWoCeEi8inCnTQAoZsXctDlaC4cG3UoEHsyKQJIc71bDBTW6iqR4yd4ANTCGyhp8rMemqTm2s/n958bSherDv7u6ZEVY+DZ1kUA17ari125I8tid6CoC8aBJh/Ho80xCoHDGSMZCtvYq/4lWTyzlzLBllRzJdZKY4NQeiRvpTK2RuPeBGOqbURRoLTw8Cp8Y6AeqwqrSyxYHJ2YFCWLVrjHJ62DNxB99pGsp5Py6ktGt/8IEf7hQW+puNvbYl3iSy0oaJsJ41qHXCe84BkCMOWB/nNIuNpd5BYozpKJmIlfyUIEaJJZ26cc1smbNbKNW5cJpnwO9yCW4BSxtclXMYfhFmwnZ+7ZVgc22GdBzjhvIe6+DfgBuL/qG/DEW3cyY2e0KMqE1jItBT0pOtKmy/S3XDbpOdQzu99tNqQCAQ+b7+w2ShPrHhPxmuwFZLFTjoBGnaqbhEG0QWJClnNdz3W9zvhedIVSWQnDX6xmELO578hDoFeVUBa9cG7FgSPjApd1Itp93UtsLumoCFTN7ZomtZoOOlnL0yjcFZ4+u/M5BD4fCoq0uqSumuZNC9R3h4wp55sofWFI39ZUT1wQ+KrDJSUwnbLavg7yF3C4xCkp3hQ9AbGfZ/SxwVIBj/iRhPwUoknNz6WDMPrrbPaH+qqe658ksB4expg/yJOlZDAccrap6ll2ZSEUKBaS5U1/UJkFMAGS52SW5BT6PnSoxZkGoEfH0niRyOdYy6dqconFBZU9nFl9gLcPnMfITEiupPvrrO710Ro7Lg1WeM//+9UYuz+PD4J2RYyjBQKwjYx/tERdNaXW35c65bLyhvwXfG5Wz/6EFb/IDmxOYlVZWQzIkbHvYz/GdhntSSxFBN4/N0+ngx4eJx2fXKzDPgWvZDoc3rz7IMdIPfhCk8CwF+HqHR9L5dEfUs7nZPerNE2lyyG6h5/3zaD8Eh+w5fMit86ikcM83xYYcr01HNiTUD4ieM+xuDwQGjVppCtOS2kjCiQmZng0DjSaZb6YnT6Oe/eRDASsYudbrJFru5KR+NiwXWfx3NnbNogoEJwOtAa4ZM1yzw39cWFc6pSIUoIweLf5800Y3AZWAqR/0RME6JhYVNyST41JiNj2hesbJTz8eQt5j51KgBrwEgWM9kJbMA6Qwnfc92/1txzYa8+GxGPRmjczSgeezi0fvLJhc7V+YrqCrZdVuFj5uU0XkOvHNIw9sR0P/SQsg62zij7urE673jzaDe7uoxTF/QyCBdIyZMM/58rjStUF+WNzh1xCVElXT+7QeMquF2JQoR6I2/rqmBzi8pb0XnD/ZguG8eQkbFXsWSBr8dFf4ruRtzT+/9qAxWwA1YnmoxxBtj1RqU/x5NiX1XNdt2NGAkvRUnB4bhGxLQrJu9tHAwhS6W+vwYnFsJuxnFvhsCovpbVPQkeZOTogwWpBTxe2J6iazvxeKqv1hJhcmSa8ykmQ7UOkbdMv4yCywsSyISkgx9p5j5OK2NpNu6xmlqQvyGtXPsaEfRi5fzk1Mp4S23uokmreVHm8AGN3xZ8K5coMm75pC/xxjjm0aa+D1QMW1ln28ZkIYHh2I5V7cDbtGOKUSBb2wm4vuwNDA0A7THWxmkabIABqH9yq+Dvf1y/ToCiLpotzBsAB+4b6kIeVT1o095ArwbGElZT85wUrRtJ8iXh+pfVryoAFOHz3qtkziaDb0GTPRwmrxMRAWTP4xA+xNCiWpWYkdDcYCEZI+OzcSxZlrFgXrO69CU9K/mET1/kPkO02gyLexG6mo36o+FNtZ+mMWFXKkZJRGCUFYVb4NL/hjgqDbqA5chjPf3/wkEhcsuo/HVnfIifaCuqBAHHEit30XEjbYYlR6Hgauv0baZDXBcLaZcGjO3QBrUUn0ng1f2YSafZTlOnS6/wVBesCAROJySRmKNfHEy77wtsHaibh23aYGi8UzH4M6ApM3IH36A4Eg04788zbpoCQH2mTfJjGayJoS2LHyxMu7OORphSnWemrPzCcsbOh9V7zBSNkVvfBA0nu0xa4YbzeiNdRwV+dLZ/RZQJsjLipWDFww7iXPIYGGQDe5cNnJuwSSvg59o5mm5GjEgawpbavEWPFxvrP4B41XRoELjgxxvbP2peg6OulDNHTNAoFjFUrS1tJ2HOjRMCpv1Q4hLPgs5mk2PGLIreEySFSd2QVAfeac/LMG2zh9JMWO1PxsWSm8BMOpSQO3r9C1GjkzL/94blGBVSEfO0E+iOH95QgSnYogjPXdzsTWErIrfOOut72RG8ODZ/wzZ18wmyXAIZ7MD0DqfMLKTijcnH8hLCQf3anB2CoHQZDbAeaUDB6Cmalh2OIzEB7/jCl2bOM1HyszMj0/nrpaOmO7BdPciT01pNVaKgJZdVBg+I0xjcY+juTXaI8s3FtqyJqGGoj8h6MTGiLWdqo+FRyogKHC7HrbkL8vQNvhzOs/ogGO470kQJ6hnugiZM2B6qvrP0wRH9OiRqLyXcNdhohemNiUx/jAYPeVKkrJ3KHiSK025fXZtcyHLyIvqPomZ5B36AXaq5Gbpb33N17GwbKCtjgbwOf4CnSX+wyVweeS5aPkq+A7eoRMp8+Fr0QdDiEc8guITLAQjvY1HJGPWB68OzNCRekJwEFM7p6XnhXAiN1aeT3P6IXu2T9Rga03EZFbT2cX71ZR2BwB5lopi0ONpzqKamkKamGipMag2+97Le53B4uVDsd3bSdnX7BAjYEA357uUGdS2Pkc0h5W4c3ZRSyZgvCxSff2moqaI2hen3SqPsCbow+Cln8I5MLOdcTAg7uJHxPwvsF4z8lNNVWsyoMoNI9lEMnanqgCDNPeI56ewEmBp9UocNFl2AeQOgG45Lq6S7DhoYhkBoskKBGT15iksAVcdxsN8/ZbucPOewjR50HfuHYvveR7bUvqIZcRwOenRPob1q3dI5ggS53JQP0691DuG9U0bb0LH/4mU89Bbc/Kscw9UJu7MuR2M3nRC0y8LEYls66HdyJ/LQu5Gsltf66UUpZdIhx9IDYJ9gQwS0vzy16HwF9zWuPtuLTRmvNq63xYxXsmJScf1vQEbuU4r0fpDxwc+US5ujTuWIbou/xKGrjWlRpOYe+waCd4llFS4OcBdf1OUad5McuO8dqw1GCBzzgj1DL0u23ElO2SrDYbIpaQBMJuEjA6+HF8Q1uxi5rEhgR855dGMIWeQivtK1I7TDpaqtlOPPd4b2oQvZeqoM8JLNMaT9sqDDjGsXbtDaV/+ux2eSLe1p9ZGRTyQv9CyMvmJ8n1BbZgdtFpAz/2+3L9/fMWgOWr5wTT7VzNC4zrGeuLDkGp5q6TtHN7pkPHJiJrnGn7VA9Bc1kKVfpx8Bl2I7UurYisNnMr075KxwiypXYMO8FL7m6Vhy5oELnGwjfXCENr72WgY6ad7Ls5P98SBStKiTfq0R/VTY7gJEqwqyciISEAqqLjmDgT9NrqYrHC8jb5YY6e8tf1vUGcGN7cZhlwQh/GUGNcucoTRdLqqiVwCutxwVEjwkNn8x2x3Z5eRWWoBmQoULQgdZrytx2QzKO9lgnIdwluzE0hmHuG3X2X43k6qc8llra7OEpOli8G8mQAqXtXOBfAyZ5IcBrpYYlQKC4QuWDomHq+9mjhNP8i8txX6sh+aTqP74cZkFAeEw7wSKPUl7hqvnSSMjVSBA5RMkAtE1aowk8uk48I8HeoDa28wRVEPj6vGBnN1kpLTM2MJGQTFOBTyZrEQHs2eYImrLbYSU7K1+xtTlXGY3+SXmgC0/zY2tle79QR+Pa4CP9zAPJrlm9bLchoUereZWBtROXG0sw1EHTix3c8eEeJeik8x5sORQFymdeGSDidxt4rhjzfppq172VsH9VtI/ed5rmOayJ3KgolJlkJrrvuK75L6Zkc1AqkTXvYj+gXosYamBhC4rjl8diBt2wX4Kmkb/5CecK2RnX2Fgcw8oZ5fVsCCwKkYrHqy3iRxYOiD6EERrh5o+Dc3rd6B/brDVFT/8/7NgygR3fXQWfWYucLiIG3MHQRriLyfnLdzYJoHREPQvw2Zomb2MRWJ+NGQ34QrZTIT6eYmJh/ajFcRkoSEtWXrI62KEpQlm5My5TwSJ6OYpBKp7Hs9La9RIyseH03UnUKop8B5sNeBu2yBbc0lnytoZXi0qGlPFR3lYST62NeW3C3ivA2EZyvJrUIkhDYtqEQIWgXOuJatq2WmGg2M9RqfQi177LyaNgunvYvC9SCq4fbRTYXdFiVwBvUzD4gsWMnFWHNJQvUf+TAWGWlf1TPtVbFBOwkcNfeCYT+0zHQnHnSMIZy8LS4WGCfoQ4IlU/ZZ9Ewp1dY1oPUNx50xWrO2l6faPA3qHdbGX5wVRaa6EpqMIlb9vN10RX37fPWSKLlPis67B9baNBB5yGb2uRP6vOFfheTjv5iH6vZbgqUv/Na++bG06BR5DTNsf7e4oNAGwteIaeH0zUH++3uzIoSUz5dT66x/gf2FAi974wOWSQfDgKdwhsTL609OAzL2+NRSyUP6pFDBy/QV9NpZ5WXZgJ07g2qJmqdIaTaIBWN3+RTjFjVHodBvZ6TV5SN3QWIMG09hrpKygEa01eucPK7JT6BFEU3mFuw48+GNTAXyK3XpCl0eYWUl0Rjq24YB4XtbIlMtbEZvgJIyPlxW7ekQUNXxLNWXKjvj8dIOOQ/v17q/OMxVtkMVk7WxAfSaLogfbSK/di55tVMiq1foem6PIwAMKbO/O27rv0FES6UF+Sh5oSGJsxmlNvKqlEgOqKM0nPF+H0Wvw8g7Hn6Tg4fh4khNpvuQscicruWK10ULUEbI8Le0O/v1J3IuXQd9nXF0e6PjQU6+YHkY2MPLCUONO4h5sEJHjwOaYbNZIqwbJGN1CT5hw5e16ccp8iJ1KTMm9v4du1zgmFcCUWBiwJnfWd/wevsgg8CkQTv8KUuRr9nPIkWZlUmYgrq/X2JpfhKEvG5eBg0r+IHjXebg3YC7B5YYZmp8uFCaOBMLqYSug4SewksT5zaW//CFFpwAUCpdRJH57N0q61tb8WMs+80eECt8GwOfV9n2lHDyabydt3LCafpQJMmmyGznkuA63XLXNwXFnzcr7M8CSI6gyCnSY39jyItETQ4WuIw4EJKSr38ktkZC7zefzI7mu8G+8cRj1uQuy7Ec7gxNqZT+kycIXP07V3wHoZrMkF60Mv86/xPvEdF46JUEnieFQdjK3zzTCOuQVkakZ5SsQsFmg39t1VhtjHHeXOTmeD7WhSHEjig9BLxkTZmLFjbuVv4Wj0E7bI3Q6oKXbHcU/sPKgKnyB0Gj541il2NNrlgRTsxj36ZtbcaYpceFUxFY4QYsXfJh9mRvQrU2fGLK9UBGKMucszqQCo6BdDM1RdJ72rWVHUO0n1jDI4XQahvNfWbL/PKwsiHVxfAKMYdy4xWrPnTEiZOWZXe4Dha5xi4gvR+h7fuMGvMZJLxRgJBq0w1C4la5zCKret/dz9HVLvYcj/4r/7jyRBd7pBCMhr5EpvYHpvOtNEbjZDUd71X+ImwxBk+DY1jw31DBjd3g5Z4XeyE7hsuY00eSn1xTv0LFQ9NKcK8hU4j+Nd0Rkc8aFcnpDfGUMLme/Na5GRrVe61dRW3yzOms1Y+r1pOkHGEVpDQJpoasGir0AeNvjfhrzIIxojDPbc8zJY75FzJkeyetvLxkV2va5l32ECeXkuaa/tyLASOrSL8o4CwTkqBIkujRhDMN3NO+S3TOMrR2TmsLfV4QcaSfNgYg9a1ukeURaeoaEvK881eSVpSIXYQsPVOZHcm57oyW4Y0fXy4PDmtY5gld7Mdh91zcNyXGn+kPuuCVu0c0lFlnpTv3GORorcgccB7DYXpKg6/b4Et5h6XjzWImKA5mMBSEWDVfiZZA2XSRA8/L3mjVzzvXOHno5TTsj1dub3gWdkfO/GoRfE7i8XpOlkzF7a263Zl5GuSQ6wG2rOJJ9GIrVdTSMeyzrlG+cuztEoEc4CK5hGErZAeIWEPHwlc/F/cHr+hlT720O9WN/Tch4GdivMJZmp7pK+K9LrL67AhhRMyUrowGuiY5xMika8QWnOjxVD2XrAw9w8g3NorebX+yuH1azGI214DtLKv/NJ+2mjFPoB1JRLK6rfQq6wKmJu6LTDVxXWzGVyYWD6hKlbeQbzFAqF8ofIhBmZl4l7hS7NHLjzsXTvpNir1VjD3QKPZwN3qdH/VELJpcaTahn4eXyZT6UJleyV49LZV9DV75uowInw+S99pZ+wGo+0a4GddwxYCUakrXHbJpHCaDbeX0uZaQr1vj+dv3swVfuv0UT9+6A6CTGnFJbW1Z2fNQSv1cfVqJKrs2VOKVJGmuQFaCeQF/1WDy/sID9GAHCMDM3ZCCZ6zoSSyAC/qUqWxH1RTjS6VV2lnxCveWnXAhuDegKIALuqIwdRCyQrpLdagOTLI9+O6ohHBXTM5d+ldj1xyAotfS+bvNq1yzo30tHa2TyLWIEdFev34gu7u6ocdERJYq/2UBXkE+jvuoUFM5nV2TPkA7hdN1295SUSrM4NaLEEedc7kUvFHJfxggf3BDtefzL55iyJo0AThhQxU1MapYARrOWgrLb9jXpVWM7HnCUhvt9XX+BOSdmE6Axahz6jrePjPXxmGknDoq2dboZY9VfEKpiDbXcTI96jhzOr6GwAUThvXTzOLmKjdwa+HqP/Tpk/1h4yT7r8WbIBxxCTE+2LCbSNdNQoIrtyRzO40Z1OvzUYcL6XJOlirqRF+wtGVdga2EdHWQyTUqL68RcaTHXm9Tw0RHuuJ97Adpka24Evcrbv4vIUVcmj5qvGNWsEXNzMawCHYU2bNbQ003TRc+6uxBvxXyaymaRtFmuJSoFLHmfTN96Kjs5JbAikTzNkzuXAQksqgVGi05bxTjPc4b+xZYSIvu1KNW77vmp3A83Cq5Z8Ww8rIjzZJty6kQ9/Sq5D28iYPpLe509V9FOoDp5k+7f2iavWr2wLhZ4luvN5WmsWjqTnd7hCqJSVEjRTHy4Ob4l6BRCrVp8mQ6IrqUc7Zw5BXWt6gypQadQKdyLsI/4I7f2fYh9RbpkhHZ+YyTqe6tN6y1f30doGAWMxf+5r0BnVgPW7EMavTc1Ir91QJh/6CEnvicM2bjJ0HESutVMmTxywZMEve/MBirwti+Cn+qb+4BsbbzLBWK0raQUTVQ2T5vjmfw5EFaPB54hs/tZUk7X9uXBnk/bJfxdwJ6G0vKrdouvqtwcT5tHmpcg++7tAlon/VMeuf1n2+iY15FYDnF93FEjyhO8ftRNJrSGHefsX0bm4nNuVtPIB24wpCpriPG1fkvG1oTqAG1jeDTp8aqEwuPEX5E0o+VF1dPsSL8mZwdLmj/dBj97rInGb8nriFGfko89tK2jB1NrJzjkxUo+OQACMU2OHUn4AYDeXyEzIK98UWxA4BjAZN0ykluy0u9XJJgaWoESTY5UsN3umvSlp0xzBovE7jiFaF7KhbccRDN2Wl7EtZ2Qn26IU7VUA84GAgu5Klg4PoGQ/X7ytuu3Ud9QZsF4uCtC2KOeGHXSRyrpPc37UrNsO1aqnYmUVV000fw0OoCabshhCm4TfxJp9ZRrQ4/UyMu43BRIfKk58cFtFM0VfRb9ru4WJ6BrlijLhFg587guCHBaeUfNhkpVTGZKDB7EPYOn/lIsXF8baBp9VEDGJh/zUqRUs7d1xUiqw270PfcZF74fntZ2SEDS1sG6fmBUDLP7ulB9i4ppq4Vd+8jxUgnxEQPYJDEzbWF3B7rGkRXXJdF2FSzCuSSB0PQdjKK3vvAohXdCOfSoMY+PhL516n/EPgpZIy0FjNEY8nrj4gmUi0m8HTSPbWqqn6pbCAyFK2Weu+rbGwbwDZVV49P7Kv6il6CY3MbPt/FN4X1dbJtspGq0jL4HQefVQTn+jwuQtZa5fA+CgSyGai40QRsnuf22C0Km6cLiTi2Fb47v1rYOvP3HBtajieQA1iNuoTJSOCXikWRYYCdmsSEyrwSMq2JdmTNxYSAOpd08Mg13HGI0s0VTV37c1WYY6JpKR5viBlEnK5XEUM9gpGL6vIA54foTf9I/sLnH15P56s8XW7jOJIgL24Hte1ZczfLwHMorgmbv/zR0LVU4tNLLuiH7wHWajN4nVdW7DQkiHrFHrAunzkf+CE+/dLV4sEtraZqBL2kZYWjl5zRPr5jGQpEQikGA22RLzCiLzRKGz6LeDU1hfqAiDStkbJwN+6jHRUgdu+/S13CkE+fjV4pE5RWVvsV5E6NBylG+0Zwtmarl7K5eRhDlzVO2Tn1sMJtCzXZVJlQkyhfp4F3928kYWHXul0ICJjnzE/3fxNi6YJWz+D1l469HzliQcMxxGRVRd9lr/cBl/t5mk57v7sPOOjDnEtMbU3FQgRb+cV1tbYdes0Tr0J28JU+QzWCbMtaTHwfz4uVMGdnN5Hi0fuG5Tc00qzzVyt1iZKQjs511CsZBI82jzh/+gzXHAfQfNbjeTy0XBPuXu+G57hlenKfjxM2/QdXIuV3x3ZCgr3WR3ohaUdLe7Iqky84u/UtqvEEoKEihcOG62W9txkTiyo0RVnU/HFGgSMqgD7gqNeOb1mdq3DYr1Or+Tsqa1AIZ0PALwmJ7DO4Zsv3rJghSuuC1/ST0cvsPhd5WOW8mFx8w6k9s2B6inAcdsavVy8HwrdocUYtd3jbxgL8XqPw5N1sP2VyoO14q7n+EFLlmWNZwxMTsmm6983G2eMrUbY8JZ/wTCLAZ5ocjo7orjDCIWWRYL3meBbJlblaEkNQgqK38BQQl4soSvUx0XLp1AxnVa5xhgSoC492+vxAZiRuryEx+VTUgBOmEe8hXC6IwcXN8GhWXu0smEP9V2NCbP5nelmTNNOYCIgZcEE4OCTaaSbERbOqIHu6qhH/u6gCzZUiOFFjrWSeo++B+R25B2x6OZW3fYWTbIpzHnVaGJmmd5W4vw9c8rqyVybpWH/uwX8a1RjoWB/+Sjazk2GqmiAJIxaH2VKAq7VB4ohDXbHqnsQjg0wEVeAGpjNcPDcXrHc2imdchrfiHf9h+2UMX65p7tPbb7FUABXGnELMOB7SdFtBugE4MWN1E8MoylMACBylMhe+MxTyCsx8atYRxkG+lfJjWxAq7tr2w4hPH7W4/phLZXMGNA8s9qaUkfPf7GUACau2f3HnCSO8+BFcb/kdutN4ICXfFiWGtra2DVfawQHoBGGF8KmN/THppaxWRUWasfzyr5pFN6mrOyBVqrV8lXOKkwlMV/XGIb/2DvNORPsoHMSsIHEEVia27v4TSOXlO/1r4xmTGudgyyuw3dJXyVi+wRvowuQcZ1SweaAKZELv5R4kL9DmnT335Z099/iwfnV9KnLq9F/j34LQEH+iZn1t0k9yausjvI6x0X/pVKBDFxFpXyxR+srpkT7SnDNg8KkEPrbkaaLnm49l53fuMnnqNkXywnTzdmTxC/XP1mt8Aqn2Y3hBKc1L/7qgCh3ozkHel1n3PTMFgUWQayLIG1hRWSdlcYRTkIUOCzO8UKRNoH4SuvB+XBF9lihlk9H7CLO1KCilWuA5R6qZmvrtVDFUATiIfb3DjREWrT2MSfDcoMwovai+uX0ipnV0PZfKIa9im6ZyzpQ85mPy9U5+J+NeybHrNJdZqPnN0yM+ciubOQt88dMjfk9cz5h6wLVrLhFEMs5cx4i0jVwHDP5Ua1+bcL+CE+EZkmkDIW6mUXUSI9Auu3zRYvv6rVdt2VRSR1Qi5wzSvgDl2bSI6DRGFGflmYI4sEGTSQtONmwehqG6fOxqDTBZdDMePnwSFdJ1gAGeG6DaNc25NcsENI+15E4E3isf0PBufFQGzCTiCXnCtzPI1aeAm+/E40lSgAPifUBvzWaEVo/X54fyuZx0DVhwVSufDl5/bz+czzMEUOsBTmlAftz42D9n4Vctku6SVjc2oYj9XbsIBumKIlbxDYOqXay7XEdsIdA/1q7pNHL6FaX5vgNWMiVNECsfIZub/aHm+ersKEOPwGlMqc5AvrMv2J27X9GSjbbUQNsE8XhyriAYobR7EWYrybmReyN8s/wb+Zwnw5Blo3xgMHWfpRLvrwDU4U2RK5IGqQFxTtTp9SxsZSbuhELifgAh6H5d7ta2zyaTQ+DYDDoMh8vXaOIb4cjvUiYX/T76zyHMayGAY4Ws5BB89NpX62TkjrlAXJGz36WByuNxLVICw1+rt1y1ALxLGyLawNzwKE2ngwNNKun72yciyEtgBWi2Lbn20U4d4LUuS1TSGzw4mZSrBymnOKwPIR677178fcMZMxlPj2I1cwS7OGktC0/Fe7iXtqvMSV0lhWYmqVnm45FF8+BpXdDDoSfiAJg+JWaFHHmaQyOgyt8PhbKQ+r1zi9K61OxOg8FoDzWXBIu7uZu1LrYwroC7f3CoPL6Yb0ktjInl8VRfKAlHx6XqNtYpo6MEpgWZ5y/jW0lxqy4ZiG47VdLf4KTfp+KumxoA4q7zJVCSiRcjheaRAftmK27yiUJWCcrgDtlZeOulTzkYiNdFNexNj9bnOGqF0pQ6fleiIekVOS0n8N2OoEUTTd5MemXnCrfhVtO1xTbWX9Dp3ecE8i/ZNq8lhBb92rTmQU/m05EBWTLSTJFCxj4o3VkR9VDyVSvUDbU9AdjE54oyywf7R0UrQXVUbNipOud9IQEapZNTGA7iToKob29G6NriiFawkRPceq2H0XzMvMuuuK/Sy0OFVSbvIcvGg/aJ6mUH4G911uVvAwU8AGsxy9/fztNwg2a+FgTGPb2arKyPNEaiq7IguRL7PTTowwD6XsWrPqUnE3Pek//pbEoNI/lw65LTC8FMq74D+TL5oT4HKALLpVKn2wSQBIN0YdGMUfnS29p8Q0hiLFb2SevH0yuaRxmYKg757xNXX2CJG0uyLqX8SawSoJ3BckR8lnPcGOQgVBYEkfYNbpWzqitbPfcaHrojxAG8I+toP0B+fK+s2art/759IXZPckYc6RRzFyzbu+pTacDfcSDcX42ch7ASJtj49icGQM37pv66PkWrAswpWNFW6jmUPY2Nbl0XzAF6t6U4VJlLwwGZM93n5lZRslTILHKB6yattiQJluRIzu2sa3bua0GZnfO+GGK01rKK/Dhga+7f9a1EK0NEXlXIBVFtG+/zV/PoCrPp9Z89KAiNu0NNk4+BC+MlIjxLGWfiF+09++fRM7odLy4AYgOsviYuv1gQb0dkzpro7qM9otHVe3LeWJ4La+wIlBUeS8nQKIVWGaM6BWVANUdR418wpNtGn79zD+0dYyppaiTiQwob4YGAAL6k82824XaAPNA/ig+5tIJPzqVK3ayN8MAzyJMvGbc2QL4fFT7uUJyI4KwE6o3y10DNZXVpyvVio5P52p8Hvz2zCaRyzipv5tmsLxwcKT8rRUEtjp4y7RdYn2nkhg1sVq6wAK1WeauOtuQt/9N1SFs8n3HbntqECtICeLxNibH1M7tmGuRDH83cUsuUqe2yMunH+zgSs9DTkCsETgOVBFClpqb9kZsxqYdCB6ocjlq7POeljj2UfE5JEnj6PyyBzzCHkzn/IIVPTYW7NS7pFbPeqxiQNvqfSX36S2A+uzUlWjahMVZv8ZW0JjSdE4JiuaM06SGo+D+SQpsgceZ2PiQN91Fza5fcBSMDMUS4TT7bfKxF33Z4GkilMYA0638UORNFxMis5BuhsQWdtdcSNkEsp1/7RnEYGwjPmQ4atvznFSlmFaByjEbnIrEe7MKhke5C0p4xwHRSrR7e4xa/YHJHsIwadvPAj6XIBgBWrRDfLm1I1tVzdmxRKCGEHUlZ1qj6+c5cil07cUY3/+MrxUCqgCuTaiS2uZuVKKW/QwPw4DEi8DZvpkZTdzCBOLrJPkDW86IfUB7HiEHeOdyMKCrhL7Jt/TL2/bC9UPBv/BKVNVAv7rG3xSfeuCMU0l0B4m4NurLOsD19BVzmx4CLkn8FUeYpe0Pc41aCSE62dpHbVwIlsLrTri1kbu4VLmZZLMroBY5Axbv8xj1EAkmEKgZe+uD1Y6e7hKrGJVVb7J6S8zeAJ7s1P2/9GW4p+wF922h13sxfK9/fiZClSo4Z3NCZ/dZZn+bjcAJomNfmg5Mm7yLGYA6w1ewiqm91ahS/7MCCqEbBjjv1Q92fEL5qJ4Bc2DDNc2wTXciT2rpD8IxlQW6umMq9ujuK6X0i76XoVMfmbvMe822DPFlY/FnuYbxX0Cdo/LfLPy2IpyhT9zKvHgz11c/Q5y6mEO2R4DEVzXgXjLVT3nf5MIcNb7WhKL66ib9d11Pozdzf5JFdxC5fm7Sf0PC7RVgXMZK3vTaOF5TI/MUHp7jTqQkZT5WfKwG0iAYGE9uk21G+ZjARAa+mHabej18r3nYoHVPN4g3B89/7tjUAV9B/Y4bgTXWnlCwqyvV0N4oArYoQ6jfeNRNaJqFjiNTcv6sbMzEk3yAL5/1Hyj+8jMTB6uBtXsaKGHQzFhCZb01erDSHNaZc2dtCuSOxLf6BWuk2gSxMrT4L5EzAZ2swZJRadgyuwdk1F3+jfuuEPHuA9WffA8lMmPlGv8cnbakQW3hdsNn12GKYc9aF7V3h9brmHggEhr4RhANggFvgpL5AHjKhoZ6FyrQNSFuCO5w5HJcBAIp2HvRu1OHeARyZfpl7KfESsu91bxvGZ15pbLVRYbu3xRoCITnftQknw6g73aGwIAg6VShAs/F5Cd+PerO7DQ4pOnujiKnRIuixOPlsjmJbIDidsiVVAGIZG4hJDklptMj4SfdvwbFl4EhVowPXBTNthlkXhtwPUMG5Ft+KBDjhWtUUeo/V+k7dthJAgM3SNDovTbJiXYqvNhl8zA/ZkXuYP2TaAshuBxeOJmaodu6S325muKZw2sbjr95T1OywNhOvv3xK1zyzd7f1t7BlUsPaD10Qjvy5UYCZSEDGMMAV/6OUhOPrjbkwb6xU6hGIwMGOz8xK5wMRSxARnN47UdDykes0LmPcb83iQDfWYpvnjVQgmB7R4NfedTGwL2YbtoysIuzYkPXyn+48CpSLDq5qLW76VYSGZNAVdzs3iEP/GQgzKj3ywp+q+TzRi1mR4mR/vh/BpKZGFbro0TeBRbim/C/5tupI94WSeOP6FdeTxJQGJ7HuGUxlCoyVqUCzmyIFyC5NIMcGEpmtpSNWsJZJIMguI7RQbHQBSQfhqZXJ31nafnff4c+lJEENDAWwX4Sw1ttoB48mD84zREsFPwYp9VKgHCNaO+tKnUeETrGUllYW6W1j0C/wF1TV46B4hlpafE6h+/O1MCIK0mCZOPCwmlxtRwgeGTwhQP5LcbFJaZmFI5gusLtJVdocb53fWci2uQQ4aS/qqGZMXtFsvsxIFLost2q8d+eMAFkrNqt+L8548/SLNmHA0JepuYGCldO4KbA5pZOyDSD6Kph1/i9Gxb6LE5Y07KPLvDiRczwIOh4VhpRIlJr3FOJHabcx9gVD5NQHATuaJwsW4mxllTfKZTNB5zrSZwTF1jkv2FDN+42l9LkPFNu1HjxWt+BnxLMZD7Whf3/510dIvmubxlLdaXbdN03q93cw+Pg1wQuzZTUNqM8F75N2wVf+F0jXbFFvOvUPy3K1JlJ7kUTOvpLZj/uSNbpIAgVP4tOR9SYwIiEXwXdAFGkgs32pw9khcT69tns3XHiu30nHX+JVHjMTBPP+TQilj2wYP4ivy2/gafPs6nMKKdOL5gknO63fZtQTmlikB1uhaBnmec5NwjylEekxpJ4RI/nVZbjc+qrErb2SvkHycFJzM4YApSN0XUHrLolLR9+I2RkRzHO9gZ7bHuJ1mgNnz4B8nDx6saar96t82O9qUBhib39foEhIJAUKLWqjCqwnceYj4F46y/EWqrd8tYyCTXQdVSAWfjKI1hl/hwe0U0xQ6sYJMFDC+xCDC7oLin3JgJbDity24G1pIqnPfdL5mbJob2S7al6QUUh6GNIqJCnfDW1HGUyEbbvbcZA3UHzwQpVcBHsL8Y0mDT7Y8JdH2dG/lRvoHIzl6b1dJjCNnzpiSLOOJS5zQEZalf5NkESBInz5jChCOE1lUABWTzPKfa0FUkHCiDwjy0wN2G+ITOh2iwuk7/0q6M+O99fx2uJW5v7oLbfciqHzf5+y4WYLJJAVJUwg26bUOlRccSFj2lH9ejhzfqPcRwjrdDCd+goSgchoYNJMR+1XXPO4CYxsM5ky5WjJdfegi1AM+ENspIgcOIXwaVwFfpLvJj8D6NcK/ZYO8HZG3nY16hZCOFBlqjV3EHdXDDHDeY2jTd2RpGh7gRUfmuQlxaiCU7W11W372o5d2ESgIbrnzJ/ThV4jvLUQHDMUKpkayq1rQ3DO1isdyMBU1JVESNArzCgRveWU1omPJ/3kVtKj0jaQfC3x2l4vihcWAdMQLprI5fzRBCqIejT/ul6cSIGzPfbnQCDPR8IrK6XYzJ6C1Wtiwtw5KXstKXGvQc4wCwx8o4KCsnPq1kJuYQA2sW+xSfl16ziFs1XaC/kJYj10Echiz+4IQPtJ58WQW9NAbncByIYkYj/QwdcvfvD3KIfKdEoje0cNMrAn5xgUkAb7340uQkzglo6zjuiZPY95bEXn3wJJFc7VfxkBs12939/CyGfrpQSSFsQGHbc9LLUTfA22WzmY7RZ7N68NnzWxtK/A5WMq6z158JgL8uklFdKZRYPh0Mslh6Tr+2fawIz0xAqUUf7kmv3xeorO7XQXdH5WItv2XYboRtM/eyqzrWj+3PZocN4B85k+bzJrc6ikPs3wiB3CaQA9FlX0rRZYO/Tra77jWF2Q0pQHqjrhdHnAbzfSY2hpUo20yG0oI0ZKNWnGa5Eys8q0+0WXN4Kb8+SebxEtqHHOko+UxMBoTCuJGKTrZHaFSPBCTSfeRT9wH2WvT1AbeSGMp50Qd/dL57AargxP8boVHnYttQMjxRpAQ/QSeILbbA3rrGUT1eLumA6UtMuoeHs3HKsG0Yl8HpBXSxW+itJgSpJXsGiLGE/a5snV4zrroDJFs75HXslJoLfXZVQpbhLU79X48MJjHaSN8TSEKliobcdL6584yX4I+Pwp1kMQDhBbaKiNSvaCGRStkTN1159G4qyd2v4fwBhV17ZN48xjkg1N1MsRtvxFIVfBK6UWbt5htmkCPM5/ZNrR2lLrj/md6gtT0kncCGtYv5tNEjstp461DQQa9lDKRg3BoDA+QgkHkBtMygVcCqUbfiVMMM0bpmmIHdmthvkwXwdYu5bGqfbWW1jIaNHzX8TbGfwqJw+k/KauaYBu0UQHFX2VNFnjUrR2cuZ5uvTg4meIb9dWWwXZB100QpJ4Fx3Ai2buGyANARMMLbYLdTTpGQvrWrre9/T+ANZFPuKuSDuWRBMH5j7p3rqGPWzJAczeL8MdKo+i0vQPAKFnNs2gktuRYQWW+3VX/L92TiADeoLVaHS0g1McXeWj6nO+DZbxdiM9I1CaBa7tgO7ag8gSdFx5ExsDIIbTw7dGvAJgEiYq4X4U78oTmqehSVEIzotQFF0EfAFckL79WwkdaMR6gGpgHocrYH5h33ZlAYjKKwc7tPJZSNxhNmsBdLLCOy2clpovb5DaAin/AUFXoQV/JVpjurxjZ/I8tnioJRDciXku587MynGW26bsSfl4C7EgBdehOHDqxGNVdCHGsrkSRgkEDTJJ0Q4UKazoi5MWLXEF3RHmamiuiH7rb4DGiqBYY1h5yhoNRJDpcXhip1Oq4Mncw4hGMK21/f53EN3k7gC7CK9ZqxyLuT0jl11gaXltwgUv3RYWqaAuUZC1Yhue5SPohKa+2EnGVxecxDnBPvvlHhL4RRN03zgjMEn1+dtdN41BQXzqd7tfZWQWkhQZnV/ESx3CxIEvSuqBXtorWNofIKpdtfuVbcUjmN/tY6ul0e6hFImxTb+zpQHBG8XBwvDXDYzfPvL4y8AQbtdwvermkwvcFDnjAsHQFEWYYghttttjlWOWradm2OZIasnu4/xplV3vF2L5fC2FK9GqSpkahAhNgeX3Z+izPIeAyIP1X/uxJyWyXEVYe+cHOlkpGFh257Pa9w6dviBVER14D220ec0N7v9geqzFgLriHrgmq+8AF8V42tEqQpgBmxOqR0Ll5Ec4miphIgOIeZ/uic7UgANWvtsWYgREgrq5Lkd4K2rwP4AakQzXGn4luMzcZwyFkiR/7kx5jNQ29fFE9Q6N62K4D3VzMz/T9rkWaOBnBluWkZHIzjHQ6h9DcsqzYE2KnI2O2HF721JZhvsCJ2YVTLRIB2zPq/fv4rLDSraLwSCv1breNrerEZB34Gi0u2XglcR07PJS1RV0qBo+qQmDdRUJ8fiNraoTeBxDvWYZ6Q1TyM0ciDkBVZ9zzQDOyW1t15oRZoEgwcZuZXqIZJAZ4bwij+U9U2dlMRD6QwvKL4ArNNsCylXAhoo6Vva/G+ox49ZfnPJ4Nie8gi1qq1TDwwTnTKSZyNQWA2VhTivXfoXC+VvP57g/JAuZxrhQauiGUwc4wdtqUY3ySM+tMDa6r/bInIvYzRI+i8xPHQm7/47waFxsh2F0htQagEGiZ+YuXQzJI/jtFhEB1ztuLS4E10odIgyLYRDsjAw+AmpGPLKE6ZhZBDCOLDatN4J5+seeMt8rzYv4rrZpnwpb/lMDfP9ExqybUTLpVmOLqCfh4nf4Kmi83eprG8HS78j7/HUet7cRPHe88XTmEbz4zH4S4Z7ke/61J9mh9aO9yOJPC9farg8Djg3zqTS/jqc8A7LIy5jILA2x5wJWKx/4FtICW00jwX4mELPaZhxBrK3ulKVa+eIawFUFFH2R6JW3sm29zQ8OzsyLsGVpffDnKU72ShHDI6cdKaOeHnjdj8Ye/6DJaNnCFWoIfaq4MDjPcXGsbdQ/R770E+ot/ZmrTAIX/t8eolZXVKqpjT7UIpWHRvDjJ1Kkr+AY/zhw1DQuCbMngIWbOv03Z4eJmXXma2zkwfj1qP5Xh0aLwFKoIrBQ8KRKvfiVEGTp7NoDQZD9bKesb2gqGhS3Q5mktf5S5Fi3RYrxr/p7d/jC51Ig7gKYG5EYC98NejuV4rYEytAJANhgMEauiq7n2tFbUCvXKdEi7mLLhUWS6uUQKlcF6c6mFrTZrXexGeJodyG2v9E/p1TNWQVWbbqxKtcfe5M6zfrkcDfMfJ5XU0f5n6JcuvjvLAZrhe0sKPqPCtycenwx8s/0X1MFLvpVgnrILcWWAYcrDx8U7yJ29LDYvwlDfzCsZN4384XJGG/qKd19R3mkn96wqG8KZAUy1vBgDTTSWNY/3kEnRaPw6Cx7947a3CCE7n8mWdVdVkelJL6RHSNvrcL4nwkXQKvE7HgZnYOVCiFl6mYvu+8rfxM4BCvyMvJdEEDwitgl8afhaymah9vZk4ZQcvbGexMTH8l1iOecW2LXhRGiw9JQfdQP/ls7w/8kJujk3HbmNdu8mobYcsUQgCtwkaoxP+dYervVjcgrDMEhzIS7Av31Akiy7prvBu0VDeI6gsdxcCmiBO8H6BFeMmCx7k4Y6Eqz/WkJzXKXIoBsAPiAI3+hQ/8Zpc/eVUKAytXuB95GhFv9CmBUCqHnAj66V5Hkvhr3Ya2ctokWXZHexEeTbfFG9w/4FxfT1HkChpJvupw79yDT8pLQx413w7fXWgknkaLlLvDpKh+mLUHGKGnnruIrNJ+JvGLQ7LRXUMSktD4bX1gQwWvvmZs9NhKUnnK6bXG68GEE6gMXFbcSSaa3Hzqx7Uo01Xk/X5Vspjs8aArXZr30mYkArJni5NGRfr0iUkPOiRkXZgWrQiv1gQ43DUfUyYaMPo14NqpMs8yi7oFlt2geAxmWS114gx/tpnA15WRoFkpdkeHPzOof61KfAPrG9BOnCOzhKATFTzp1CtLUaZirFeG044IuYWa66bx8+lFTVJ/FnZKNXN6NPBh2SmehuKyoc3iZePfXnikeeM2eDANFkxlsEHZawzfSNxPr5avQHN9CG3G6kv0BPXFm6EiCTTLAQ2hUZmalw2CWAfYCBgFBOCldUlytCQW3CIFAc1r6UPoyAleBKBcXRn0SMouSehoiGUvtNYBdeLiHKcVDsXKAAMIOz1yI54QBvu47/t5EdSU/EuCOnQUUtH9J5kNV83w15LlenpfYGhDwowA1g/Kg9/xCNrHhbh0QapNN9ln8eAWqZz1cuZYOFb95GOM7sbF0t4Ao28hEixLVcpN7pH2GjwyeWI4A3/+F8gJm1uJ3GM48Yjz5TDp5NFVNk9m1WALySXnXcw/E6xk1YgfyCvwADmo2F2ImdiwPH6B3s123eVvGPfnxN5rJSoLRQa3bPrI1H/QT7NXI4ypkAcnn/xFsC9Tb8ChO88q3DybC+yvACC5pBBckjpL5zGW8vp4h4z2VHmva3NB4MwoF5BOaDHjCa53Ut3N8MRkiut1SlNDfzKS8qKzzGkTyd5+zwn0IJ2YVzbUtYoGxUIHUrxwfCSNk50k+IzOPi3dhocAQ7b9xipGRJYTAXJ+AT9qKp1szhwgCZQW7eCxIrRFKyTBJ+bOcwtC9uRD+dgtGSuFQnB5YWawzFwLGJuKNZXC6REzGwFNP3EEQ9Ip7I+vN+uFR62FdxedotFmHn1Bnku2bSVbsL39j32Zulu2Su/F+w9XgU2dMT9W6QK0ABnLXMfr63syOTQ7A1qEW0KHtwx7yll1nSxQULLGo/S4axGlo2IOVMAKjZWtSCPVHOi9MXAO7Z9vZiAMsMPYkOkntKvk0IPSh2Qnq8AA+54lJFzDolnr042NhYGMcMiIyJXc7liuZzgxZF/QzLECAwtRutbnp0n9PmjKmxF/kVQ1wx5iI6lD9SzNnGBi4W3aUBkmP7Inc6pu4d7zhHKTHwuS55BfWak1dKQJ56f3wn8rt3T2qyjfLahZdZG0xIWzUPZlk5HJn2R4Zq4jGxP8Cc51KA4PxH4JGKplcmEgfQxqMgZJO0vKQz7aAz+h4EOUfr6VadIhUNxgLa8cpSQ91E7Qv5Qf/itQUP0Bo611X9RHE8l/al/H0LyUzckXK+iNPKifIKzf4FNk1W7JBWPddno8K2SluVjtpx87hLV7kbWrbOd0hPH0O9YTNohogmSEeIr2bBBRi235BB83gINJnV38dpSwVbmaJJd0Z3GEtBa1sfnF8AnuaRSQccs9VUq9xZhjxDKtbcdycqYYuYAo8AQdGM0vAyws7tlvOD/AB6FHlid1Y/t3KDOa95O3QVYcAgxMRdbvE/1AkSRVDw6TlsM5O5JYzxOWwaNUYgdldZLcSniB5KefErRn0AvTXKlpRtfykWZh45C9lLMgc6DYPXlKibIsOPKTZQjHwcOXH3MgJiVe48RStE9cDr3pKpopeVmFHLDif0g8GF5wB9MTBoJkNnwcpjpJdjhOSKW4rHveb/Mn6mzH2urEBriGdY3vZ12Fm1gdNPIIE0oPQ/4CebbHp72/XkcC2Wxq0iTRYhhIu9XXWTZwdNeJn9UodzKGO/J5eG6VcyD3ta4O3wR8FcBuIUGXJR5mpMI0FYi0K5tQL1Ttvj2HTZOkr7QAMvBdgXNnhEC6wBpgr6qCQrLxhBapsRVNPCh27JT1j7pyZwYBd5D0VV59nvSEerSBImGhlZAURWC0c5LejZrUpVau9Sro9zkd05nEL3+u8kP2XMiC9vymhpQNcfYVfr/jMT4I4xqwsexur4wayW8h05EbLv9z5xOMl1y20Yp1gh1QhopzKO05TVMyjA+EXt+kfzBxcFagoTwI6gt27uqa72T2ejTxjSBkKPO5bzBaUJ6vNbayKSiqd+IKUOlJEXVSnIlu3ZOs6805KCb/WZsOEHEKLEV/HwXtunSvtMFRyVuz0DNrmn2sQo3k8rYPIKsND0PTCEI18iqtyeaG9lD9cTNAxc4cuMa5Tx1wI7eULVPT8JQ+w5BquVm40xZOAsBbLAM1ZLIRJyNlyfN7xg/TQBN3Noa30gokWszg0c6Fmn2S/bRZid2fr8CsgmO5mCUJWrpYU3rBIAnPwB5H7BIfkSDr8s21A/f0ZIpPhgkzAVTNU+QtTWxV0K/gDmla0FQ5Ujt5SSLoWsEiJnNhxYiWFZXL4rwt3d1wCoS2oaCT2NBGfqlSIgTrd6huVfz7VXZWHpQYtxlR8Ey7QBTH77vhlhYCuVd8VTdwKPi2aEhEsM6lYqpV6SEzZD4dN3mSUJTxAOUgtCaENKUoMOpGdl/mgkhPLQvkIXZIYQwviIW5mdO+lB4QJ/4Z+8vYKYA/Qz4Mkjmp+s6E4UgCcKQwbyfDn0kUAAhR40uyaKQEN9oNBrKwxNvEOle9zntMIWwgTNedvrdicREYNdQgcaSZMrQTxszERnm9iqEMUPXr9hk8A953hx45Pv2ec7DgwJxQi7P+ngzkuUbOxspnpBcaeD40VOpTFSSDhIARYQqmPFnlhCH8dmeXJmVuuSdSdelxHwVhsCbIwEX9aC++0Bv6dfUL1KTkt0mqkEzggPA3F1CD1N0TzuaXOJEZQUBH8a6W8S/eVU2WD/K/qzpE2obZ1s0Vf1Mi4b6/RZo8gUY/0DC2zJyYBtRMEQFiBYK7jR8yiyg+2ApwVdsmSVVB8FskGiAsrA3MaOLuF08p1KPB3vgjMGd/P30NEgwOmCkEb3AhTs4dw3hlrU8tIG6ilejxMGvK2AI39FwkDNRGnciqpxDJ9FK14+NZZtqVcRBGiczJRqIs2BwG1IghQbUsPuja8Bu+PYX8y6SuB3rhTm+qPeVYp/gEV/6biFhXbbj0kLpDDx4JuKMGrzV+yRLopkln2zu9d+aV+uIB9VqQuv4c/QAX2LcLe1S7YZ7G+EP7USbsK0vJpMcMoW39fU+EAIaQYpjB2PDfs5rMxQt0uZO4p5VcicccAUmBHNAha0GrYhbzrRyHNW40fHyfECPpKP6Q58EaKfFF+U24slEHrXm3VQk5PKlByxHFiSzgY2JU2NUxi88YNbD1UJrabPcnZxlX0lu7QSoqbsT4A4LzXXZRr+O+MX8wskk549ijvuaakeXKP1J80fYUhVwbYQrJtBVnusekWzhmH2VGynlGanUSdffx7fgjkIzJtu3yHjrHR3NlQqzXhAzQmtTkUTqFpropD7wH860eeS9iLrzYssKB2PTnSZ5JRZnH79Dtp49UJQn9gyXJoIKAV6wXwYlI263bk4t+9X3pbzYDYehUDZ9TeaELqfb4M8iYqhy6Vgy/Ra4yZ63tUNn/cGNYVG9nFD29zwqHdeXpvqhyyOG41+IQnx/oZKp5SOOoXKxqyEawXNsa/+NvkMR2undD9OL0XGebJoWyYMdp/wrAgLtMY66QD1f79Vbp/oDtRaKHEt6VS/uOhfr8+POklmFs6kvVFaEMxQQ43OLTFfUxoZwn2UqcSzAMVzYPloROkMLdvpH7Ci9xhXFM4pAunqnF+nRVOiObQcweSAevqkWGBrDDnNhf8RBBUcAXnzdzrtkjp71Q2WQdpUYMuGLbJk8polzbEZ9AvMYbbVXrxasqncyj+Hdy7FLYyp/1OewsvOKq9ViRlMeUwRvv3oHia/pNTH0JVQUAwoJkTSGFfmUP772/H5MJM3wiq6TtNB0nYtA0hQN5A8bOCowXAcWEnZ7TojuxJ8IePQTmwb7TvHgi5fzn6SuTd1CQorzUhQ1Zufd53MJ8bdes0xMyIDGgZ/d0B45tAfLjpx2ng73Fc8twiwsgcLY5YsdcDz6Gt5novqwWgHjuZCRCN1Jh643nGL4x/DyE5jWBocJ0hXNtPRw7peGeraIIH007BS0vFC7zU5o3e9VMnw+573VLZ/sng8R2IqgxrLTdnFzDykBjUVdVRAl/Zi58VRRfOpyUW35E9BwOvOkn35w3n8GVLhtTQL1ug5Jk6fOPcDUH1dKgvJKYpn6JMuS4oK9JeRK0a5bE02d8183mxOAdRak/6Rsmhf5CzAEIxvdss5MlKUHeceBOUGdUu2zTaqYVjIa2qCVnlP621hS4uL7ccbVWTSI2nObsPjcrvRsWml7tcFScSznEUQkgPm29FrBna29fmMYwwEV8k5puB3vnk0jHLR3BmxLhXy23YbhFZN1eEnliMu616TUol43qV4VH3aOwFTNymLF2waPsgx9xIQqB/gGWm5B4/vwhOw2ZfSn6HNazxjY0gPjuRd7ND9BzMRb5HcQHcSW35p5olAzUtxrIyfZAJ65d+ZpRxH6N3QIF8C8/WDyTZhGgnK/s+CtSf6OCQiTd045AujrtRMerQl+XXAKN27bWxy4MDODjBD4D7B5Irg3KKeIrnvm1rCLDIK0OOiBkZiITD/ZPCDwk+RpeZeWdPGL91s7B12s5FzagNCypwaSQuMaPr9VbZMlAhCSFxJ753+ppF8eSwfXazj2jWGVKjMYcPyBOutMq6QET3RE0h0MCwuj770+vrTFNY339RszVJT1ChYwU8e4gaFWADqb0s3a+MI7U4loKBmdIMOXoGL6w2+YRiACHWIOGsLfVlRnYMqnJ2/J6qWCh4/E0q+AhP2NC99auOmHkeEhvWqNyRJNXPvvBDwn3AVBdBgHk1zT/TMIOHGNJpQirWMjzMkyYN9IJGIq7V8TIWVkqonQ6ZlZu3F2Qx+8HTOJYj4V8rIWYGF/GdwJI/Fa/eIEXIURaDRpcogmBCIM9Tgsy7kOCRaMhJVvC03vOmNPZ3w3oUbIE77ZjBKT9fU0cvCewogqhdYhv3Fpid403nr5zpIO3qvjeTojyKjPxVUYMnDGV4NYNCkXCZihpEmG15on7OXy3tgJ8t8efH0c40/K0L+0exn3ItibWRQRyB9+YBpCm2yzQSYDOMhCXT2PgUJJIDSKEhcg5A2nsjp5KHnodlMuSw/XAHufBiUNRCljq01uw6HduSsngmZSunfdtuLA9N2nLgjOInxJ9AsddupgtpWH6npbU1Vr8jyzxLOuU3/bGEQzDDWtptVJjzjGOSlQx0RfOnFZrMcOB4EcI2adXRJ36KA2mUQ55KixMCRtWehpOQQ6njM7mLTWNJd2pSpkteOzqzM0FU97Htz4W4+DdwMZcxVevL8x1skSRyZqG16UZdI2f2/I9fOEKaAxnKufFz9ClOP04xT1N6/GQ9lxzaoHHHF7+Kn1RkkLB9jJxdyITL60LcEV944VAY5sgsVQ3yt7Y66zeghN1B2HqtaftyBHaLvScb+TjapMtQ9BFoajlF4AoKSnizHDqOsWDSeoC83mLpOSKRp8+OKGXIbhBFz178YDAn/kSZZmRs58IlVRGCaRnEa6GQpEnotG6GDeejVHIM4h1nH+wJYtUk5Cv9uoSkODs7MCo1xoy7GrVD1sNPtOvlgi2Es409n7mU/w/aoBQykyW0v+OTej/5KRdPkFa669LklrEzRgo3UWo3c6OSEt2uJdZzdi44e4T2tYOnGkQ/FdE/83uzN4hOJRNkeJ4aq6ueUKa0a9YPVsDPGmnHMBtNYQV6+UyvEDW5+p3IffEwbxMeq6JMA76TS728tVnRPgf+ZD/nrz2CkD3Y2D/1x3fz2LRl/VR3lefmE0N2s8zkJdoi1dZBNVJChzmtNJ42Au2dHdaffB0Kd1ZmcDca+QLRfzdcXnijTw9JoNfR9wj9lDkCJ1sH9UO8+WOkL9cCCe4mh1wCILgKSneIRCAQ7i0Lu5PmQtdzly4s6bpivkZ4paMABtSLLw0O53Ii77EzqLPd63B0jYgJGj0f70x2LJVav51ilpe937lfig9FBoIK5A9ZcfOEZF6MDbdJvE/aAVvKlXPOaFFTKItDh6LzRdVqDS8gwKGatNVH5IGkF8VTfUaW8F094MVnYYNeqnG54ALagnavGf6MBTvgdJsj/lMBlLU4Zam/2QTEuegGF4gVTshhjLSCbeMh5Hz/LEWWLsVQzIORk1Kr94VTS0dznGtZuFfyt6BV6lWWqg+ZJXVRUlK3cvJsAzZt/DhNsgnsatemb4hLb+PgFcPGNeIBi1Fs0k+8R46YeugOvPBz3ccz7NDVe2ULQky5tmxmbGzW0JjMeJqsPaFl8EGMsI9rUEpROyrC7jOOI+3/qOJiBInZtXMjCqPw6fDVnzB1pM7bNlGqIHxy0FkaX5LGIH6UQo8N4GIAKOCFJ8W8PtjE5mnjeSaxED6P596jJXhQV/edY2Gz5dH28+7IMN3x8Dk9PhR79/rADQD4twpPylLxqvIA8SbHaDkOu5FhK1qpa8NHxj1JmIYnGO3d4eKWFH08sXpA+hhdnlWlEYcynJiiquXhcbM4qj/DF1ACzih3/82ohgPlvsPOYgkl5aLTLnqntHTUmUGgtEsy6OQW6f6UMm7uZkuUZisqdIQM75vErOKTm7gzn4BZItP/07CMmaCX2coRXM8ZpQucRmDPtO4MPRdK6yHEuu+dendlZIBSGQBguBOz3GTEdb6QkANr5urGBI6k9+cRrtGOtg8ODxQ9tr5CsEt9LPvrn1V2qKNmDeZSwpF+BI4zFyGJxWabdrpWkznM/zpTKGQ2i5zf+gEqYUCAxQA+ayCwS6oQXSX0Y1khsiqXzBw0OEuM+fIkcOWbGF6ycnXgl3DQTkTmj/NY2CJYzGAmg2Eg+ATyc1xiQnITAOKyD/aYfaJX+beT05098AwHlpiFPYDRmf5oTgdXE8J3/BRl/tgz3hlX32e4U7LRAX/nRHTkoPogxdeLKTAMs0PuA4yznbMVbCwj7LkER7DIzoAV8xHbCwUUEoqIymA+REwVAalKvcQk+gHDKxt4iZIy3SV5P6iYuoEOJw1GhVP0FTGiNjU8mCagykt7IZPIjsmDsPrmyzyhWQ0IXiWLm3AuMyHcEjtgB5WlxAHYgREZHncsfHiRCQonqL8amV5DfgUh98fqpF3CadlHWhu78HwzvU2RsYBr6El141oC5Pu94eq3jqnoHAkBUzMly5FhJU3ci/N/siB2QU9sEtcKfgS9C4PXXXEbOY9jfBlv5rEY7CIf0YQjnr2lN6GNFzz8mBxp0evztrPCr1i1ULFxURYWFi0jLXQgdsXOTsoNG+Loho/9XJW6gHPEeJA2n19AjOQAhhwmlS9U1OS0IX34epq2D56ZYElvL3OCFZR4meRkov9/DEr+Skju3La3Kqhs42GbSauaeeUw8mPEKqiooil9N9STd/cK0ln0W7CxOoIO/IqFDKX0tam3Tz+k32m8Xsj/AgtRC49bSIohPpLqwIIhFHx7qTd+zExygNFGrJGUUbL5KeELanS+j+F0OtSn4HPxP5UQI6F0aDFkCBrM7z9Cx0ZKUA+uMQLkarFaZj7oKpiAXhYy4wVx1SNBmRVrw0eKqY4SjD42q5OCyNuZjfnMh1r8wlS2pXJ1HYoPMyJ1EH4gmlDcMVSm/QDI8kS48eVjVU4K7dEFM5W71y8gvFr9Jw9FX+Kx9yC2bCCoQ9k1zwtMHzPX1rL1RxRYnwIs024K3ABLxKOMh951HwSnB5BmptgXXbWU11KZKt0moOjBUNNeHS03Q5g47H5uVQf3AK+N5hBS9JwA7ho6U8g28hR6VdEYc7yK07IXW4onBsYNsjUZPE3ZlqFagVb2SyCMJ9DOKkmTkEM8ru1XR/CnPg27JoSi/a5eXbCUx8LVjA6vMs7yqLr8xFkfWn/eOBpMjETm9DkP38Cif0YJstWHo9/n3xiCrxWuDQdDVJvJPIjgvFAZCEgEA5cSPo1ndJRM+wHj8vR1awjNVUl1AjncZigJp7KbajYciZV18coC4kHdIx3NN94wqliCQk4oCjV43JKbhNWEFy3L4RIc4/xt7QopELH571MURrb/lUefAWwuVv+fIEIEHCUdkREQCIouCp5YGgP0wMeQ48dBRR46YE9mMER2EeUyTJDU5pw+kaQ43B5G7D9UlLSdbPisGynOruk/W2A0hiJgipA/64hEzccKxV9VWpjxlb9MZpBNUo4gPczp8bgjlsKI+hUc02g5fzTgTM8/gDRONHtshCwq5ZKqfCUzL5Rz311C/Ee5adFtfL8nw/vgQaVUugEBzD0p42Iho54xeZ5iuKkez8O5v0BefCBBwBXLXFFdhFSGqkMtpiRMwDeYqNTtjjVO9uFfDHLyfZTiOUVU3TWXztcgwU3sPubUWg+4R09QgnNNTSNiKR5es11uhjfYzS3mgKYN3Rx7V/GBJMobsrEwRdKeHrXfjpi/ANZWviswJXJFdWwShrwlwUgwjgUhTkT9PUAQoVgBQ6i1U6tOueQ2wE42W81+6IGdKku2n4QAGvaxrYa88GO89dBxypdsUMLTxR7Uin8YM4kS9vrLwGZZvh0NzGr1KoXESUOn/S5xUgI9K/CdFKGj2icNuBgVqPPbuL0I2l/4kKNGT6/Ti9Pumeho1fp+c2V53dClAHralTb8CSP/ui19wDjLmfRmHPUk7smn2uZ4XgawQa1nuw0Qe89g0uLn0vHnTF5wcVNPYwxWeacGuHVc19JcFDQGUIA7qhhZM1cwXw0E7mfcgQQt1FzRN+9B/hV/sUzJmlNBEuJbKcerJE2/zfMYSkQZ2Jlv+x1hQY9Iqc9iIW2QGiGSLlR2EMDUlxWJnntZEW/MJV1+1U5j7vDuqsDWR3ijCXBebmnlzHSPTZIaGe6KuLguejzceKtL64ru/04xvhFzsjp8juVRAhv3aEIdxsEBhWD1RJk8kBCAw6zhAqj1kybOwAjZzzn+vpB6E8PEL5iX4hIHvA1b8E0xbWtBpzWIjQQlIURxWJTNjCkQK2HzTeju0rSFu2favNVFLf/jxd8R6VSMWz5LggB0QftjNNcyU8Vvnd+/0E/kEld3iApnwG5Cvs+02RcYRCeT+HuLYCSH6jsJjOwlrJbuzBAhpgf94H6NqkpcL6qZV3rVOnOd/aUFatfh+PVWZRJWAZh5rvdRdPbUGXHmVABruDVYsAyt6rQ0BWAiTnv5PmFceywGVhFFEaDLKjH5wJfnZuYxXMN5694vmgNWmsSQFmDSW1YdTqJCBPU30mabG32EeAWI58Ivw6LGU574RObsbrmdv8tjRbJ10+zzaIzHfGrEBJtNgUcb6WtoqGlvwb37qvXC1EXF5PGBzZO75POywedIc91V1mcJb9cpBpElDo3wut19EKbZiGrGlzIJEkC7fuLXlmRtlhnpq7wCNeb93p7xqw/WMRjyw8NAZLAt7owM9x4dmvojfJcQJ3r8DhSlZjzqnDDvLbDdZg4j7ZIiH0mP+06PONQFWR22yddYG/Seu2CgrO3lO7Ckdno1p1nvADZ/eiKI55JFXE+aLvfkn9CiUVNTInly3fBvzNLLb9RKxQIVZJmxMjJGhh+JZfi/BdEDdbyqC4Kejlt/hDbfBXaRFlVWsPXImbK0oqFD62i1lqTdAtY6W6eMnhXwG+iFXOUtJjwDvjYyqVXCkk7F82L5XsmBKtfQvNrvBJ55J3t0vxVyD1mk3R6kb9TuINNgy/++0QT4R6kqddrpxFK8RiKlyad/3KFOXxVny8vuAH4idb828hJI5pKhQq2yUUnKGwg6h0s470nVEAkDkf6UmkCI0xV2DTR/dpTnYfR/cd0FXUbeYV1e0FNy4eEqOEEqgF5DlMKHwV5sFCL/Wrp/5opVn9v/PLOFHxSJID13frrgN02cmAHnIuEQ6TP7FeopZFAU+2hgMKAVbxExp2ZbgO+JBJiF5muYjCMmln2nBgMp30Dnhd+wxfFyP6BoULG5zhfmc8QiJ/E8rLC4FtLN6dr5/2TcFcz1qi8TWM2x6ePgL/OTNJXY59qwuueqqu3n8BIO0de0TH6nLjnsOsO566s6Va+42hXKvpaZzR3kPiU30pTwR7BJZYLGV9X8xRNL2oIKzZWdP5hwOjIU/4Pl7LT7KhoVUge7C6S7vbFFuCz+hH35dfTwkNI4zrOm7dY+yh4GNlD3zt1WhRmHRD1WJigzMzNuojvOrCDs4QFjGumd/TUo47CaUCOnSo3bX64CUdDmFacO0Q51RHW2EDfQAc/ix6pD+3NXzo/zdwYt+15KNxDI9viNkOycAxmCxIClh5+wRc/TrvFwyGQ1qAw5W3VRWHBp5mdkQ4frKSaT/jfpqJnO8YvRQwprWdnfUPkSX7j13C5YB1/bHPtHNSMIjgBc2s3cWZVMM84yG+0JkzO30oHKotOCcTJ2F8wQAyzhKpEnGryKehKApQ47qiMMvSJgo+ZGtIVMfA3jchOZy4XOhfb0JbT4CMqRSAn/MiPq1a4uWMxaAMKRo9IgYf+4rxgVDPawKuBPq+XuQtbMZAkd1/ujwQCCPUhC3WjaX8Oq1KSN/QsetaHpdvntgwUZncIBzTuH87rakCuazIS2ItHskCWQjQaJYsh0QNUOhXiK7vG10nWwyGxtLP048F4L4pKOP0qGi4uRbJakukydK5zYNOABi136hF3m07SyecaV+bJ8CvyL3BOI2zyOPZxDQF+EtAKm0OEaGq0oNHsyLPdeoVpRudK680bTWIbehpBeBCnPutN+p8PPKpV8C2/5ZgW3kSP4Ev2/HnQafbpykUt5MoyCUwNfj9IAyQTS4Jt7KPrPAyohBfmOLVIx3Bwq/CIwYspC0/uzDXJl4ZLzl7kzKGFtL8sP93rRm+OyDlraX2KYKydSPw1JBaNaDgYxqt4oGiY5peLh/cNDDRHstqAjBvq2B4eNZxcI3FLX0U+cjonzm+2OVd1LQwmEq8rkSYCYdT5N46zaJi2g5k6YB3j7Q8Nt/8VebMF2nvC4AUWdOumluY2faQL3S5VFcjzyEroD2q5vOyzfz4p1bFPlalRP6Yxzki5WhCK0WiLHHlUgdvL26bKksLBKThecwqVmAOfycsiNNPEt3Bbdt4bm0lSn/ciF+L6QpjByQQlEnvMeCrgqf9MNY3Y46+klD7bbk/VRvQeZ1cE8Zv0qzjyqnHbgbeoEPA8akxtjfGrOxJ/6MUjj3DArk/jozPYoS74f2zJuqAm4CuSrM0nCxFJRVaJnCJ7BEfXGZJLZRRC2HFfZ3KhXZW835WyD/q1XhZPvF/DkDYw2RPB3JFprI/m1v1YhEMnh8p7TFhShgyHZ3jofpCQ9d1Jb3FW9HbEyk0+IMy2ifrStO1pfEJc/QKS8lBjZ0UOjumLTUOHI6G03Zkl3hYqq14Vzx/ccQFLUfkq8MMw7ScqiJuHpIRxOOkoEQUXSCPoNuhUIQhu9z+FsR9SfzOxNWlACfInA389nChWxl7Fmd4muSZfCQ11aU5Vab3rU4YHuN0lgWf82LDX8+VZOrWvxS+Q8yoCeB9RbeEC67HX1Xrt2UfSu5yUCMqEjyNDUOs5v5/3j5mm3KqpXx0jIsbY+Lj9wfU1+KyyuBOYc+HD8LbCnBvFeEPI8fvnoInmnFfpVm15agjtTazchXSJrzSq3KotebWFaRvPOz52wVMkUxBVbCa5NbRnioewtYaz3Dm4ei5ypjKattjbD/O3aSjP3wg0GJoJxr0q62Hp7OZlFSWObn92zj74MkpvGxYsT/V8HG3d4O41qSM+eXkP6Yw29J06PYKePjAMrVXYer/P3qCtW8s24CiaQyQ3mFfdbn0zkHng9AkcjgIPhQv8Crua+iBwWlwgXZqPrvbYzOoZpFR63CfQb5UJGqDw3ni+CCFGq7Qrpqli3xfyP1riL4QOUBThw5SVMAu83oGaAu++rYc+mj/4GecZy9QV1sBcwrm1jSzc9Zd8ItpQIqrkCYKFXe2VmwUKCqfHzGPaFaNg7qTBWgyICKdBjzteLW3VcTPdI4brb0Mqz/ipQKc66jhULhsyhRN4LooNlgRFkYWlHRxGcAfiAJPoUZrM4jF2DX6j/nH56frIRe542EacTtmjaHKg6ZpC+TwHPK+hqVXiN7Y8/fEKvBuKg95vau4RHW6teO/f3fHDxjy3Cpy/ey0pRjJ4edW75YsjFWL8A1sUKsWk+dWQ7y6j4rxQTPzY9OOemppYL2HsDsLl5a7ZfdVKVBoRJ6ZjzDWPGRGSI4WNiVEMZuR3FgZCf2VVroRRRvMJCsQwx8UXC9daWnA+E/bM8bEtn0EP9g/KkzYs3knZ+RUl0dZ5+/dAdm8z2gvZjIzLoA0NrnZJaSjJknNBrkxQ8PLrm78om+hqcP41nJaanm8sT2yDqGLHo8cRhrN4FpiwKhLd+C5RMzeXdp3EZ5cBbA531sL9K2k8LuAnSrRitTFRhkdOvOXEuCTc9wgXSp11VaHjS7zfbHtFy0sJH3zZj4qpZ+vP8fu6lUdIT0O4u2EGzXOwIaaMd9lW0pGYjr58Zz04McaOi4aegh9Ro9sZKoJZ6egPg2ImcbRXqafLxX7XJ/QSLcG5zARbZaOSTxGr4WEMHhhTLy9YVZctygCyOw9yAKx9DBCMTdPmcYxA/tbp5GrCbvTzQiPfON10yfBBrD7pcgybgEjbokMyJZbfE8I/Rmbn6796mUfElFLNBXf7ovoaYckdVLiUfexXf40Yvlie76tTI+WuGQ6QD91jSQlIYnDuFDVIyVizKmi2D8qYpa81dSfltBqSssH417Lx5jIkq9M+xiVTaifksrXFL0l+j6zW5b97yj+ddbS7IQGFwqTMv/lhH7sSh7O3QNTgwrEpw1WLp170U97WvVX99EZXeqwaql6nvcijB9FBJidshdH4Ig+5hR6HEAw76eMD5VbaQCNgyXdTnzI+lA/VkGKdffEAYNI5IIOM3dzZd00t/giL42kEB//aPvpzCgfWgxVf2mHb/Dga50W6MKz0WajfHtRtvaTmZjmoiRwMyZwjq3Sm6Fgg6BuyLDmDz6JjFh0dYFqbS8N5QOc7+UfAu3Qi5Z9sCwsfrQUTNaeYcpKoeKlS96AKpNgbt42FZn4tGOcVZksfqqvXqAYfgOdxvExpiyhY9lLs8TmKBfUumqXjBa58Xkj24JTrnjG03m3ioyOI+REz5U+FHr6z1k32vo9QUzu08W9Z9X68TFyHwO0J4X7YVNJRqEd9s3BgVE1BH+9XpcwdfXrcQ+GxefYlvpXxZ+fZPrXIrY0y3xlWzNe39raxiAUQgURh83wl0zvMa9PwLDlwE2ZZx857J+SbOLrU5Gz1P3bSdWnX9LaDCxoH8f0bT2oXAcKAPPfc3yn6e9rS5+iBDNmGChfcNt3tIbs9XJPM4G0G/gHLo6HHIn6x43VEIMroCxwyKX7C5DJ0BGbKw0BdCLuiwfXt2uyMwnwxhaFolI2s+038wFphe4Q4Qjv+jlRypWnmQsGV8UdEZw+2knNzGXxcRND3GpXwPOiE757TE0HJxuPwcE2vaChBdsjODjtjUQYXE19lBr5iPqlkC+8k7ck6TqkzGlAo+igYwN3wY26cTYN/oqoLVxLd30elVGZJJkQGcR2hzdzAK/EzlJfSmiP+Ka67rxfm93nLtuiVfLfrWKwMZpdfm65RVgPZgAIdadTWhtPGVIWU2/Umlp3dEdA392q0CzvF4V72leW966yFsgebeb4h5jGd1cXxpkI+9w7nC1LxTYklBbl/SL+BWuajTNvuXhQm00KPOXA7F21qtjrnc4lBJUzUkbyW4As5Fh1cepNhs0K4T7i43Fz8Urm05wTSAIU86UBmP4fJAe4mEAVORznTKs1u5uHQRZemefk9aYT3SplLB0XWZwHcesjeOjlb7msrktnSDob+Ti28hJgdbZ3t+znwKRcX/E3nm2VMvdsDx6AvnZZymrEhbkiniw9GPzuwIpp2q0braSQEdtEduvsTHv5kjkS7N4p9rXhatz+V1J7PtvUX7bXLvFeAi2zT94O7EDOteSgmjxTRF85x93rMWvATdnF817ziGBIS9if3PrWqEsolImp+GkkCaX3ys7MXaUkkCWljURL4BVWmh3T2lopLbmbA8wyEZA5/8tr76yD5nRLxTzn1MWH37dkBCw/77rVooO1gN91pjW0G4y66geKkQnFma5Ea8zweADegip+ka44Oc97XNFWSjnJwWCcWmbS3OKdASylod+CNYtkbtlpyL5F1lfMVjJ9mKJ0j7v3XfeFApsOA6liMZc4UICLIbQr7MMrerg0QfR1PJLtW/wH0v2v8GDjYqF+dwFysWOmjdqflXbRw56jdgaqA9oFO/wyMhy/4PM86OckMC5YLHthjZQWMThZqgJFdfwYZvOQzmsAXL2g3fWN3tNCp4ZeOkQ7EQJhT3CXxhWxXYWLDgchP3L/Kl56FK8bohZ7Sp2XqQdPXR59FJPBbEdxm57utUpUDrx3XwRgP3ohkTC0IpmiffcZoAvLwla3yc8PkPAUKA4cgYFgFWcBSfcBbHUBfzSfzmfbwii43lar/NeooNzEbgvAhPnjY0lo6H7iGVu5no9Q9Aw6aVYHSzrojcqnh43UCe3Yh7kx1jzwvjrNnx09qHCQSVpjOlxHi+zszX/UjXsNqvO2XVUpms7F3vnwtca7O1KLPMJdUjfV/CVM2USubWXealf9UTm9ZANOBVIEgIzXND8fBNk0X4n02ypS1AQXpv5XyVJqgIDp2/j2FLotV7ceC+0ZgRwioXa2Bm08QBz/kubLHFdyoR5plqjFo1BjHmBEB/umfxJY172VeiIUx18HSFytq1COIXFDV9fK1ZKuhth+VqFnEuCzbyf/D0q3JsJFOdqMx954V9y2BtmYBO/sP/XRidlcnSCr9CAHsYNEIVCImhKzQKqyZ2MmabLTsBZREfew9qCRQgv1WQ8lkpF8bCV1C6FXKaYVKGOtLrhh4/qd8iunCVfRg3Ukak9ztNSTiIMKffAq0Yxyjuk29uaJq3qQtrYO9bc4wTAOgLM01yOR/E+mD3ZQ+2KIHvq+pJIAI8Xrn56LxnIE5eyyyT4vrBiuKeZCZxSnlrRB5Py9OgutmsbHAam/xnq7HXvOP14uJ+sWV0NwHoWVKjdz9Rx9wNIT8lDp6UXI8AMPExR8BvVn41L32q8LCiaKQWZUjKakZKkGBzGuK7ePvDZEJGvy/5q3UfADtiWw4bSJ/mLVv7uWp8hM0I506Ei9o4KrDbFs7AbhB4Xl5YkE8ukFoWJPOwM7VMhvx5PS1tE4qi3P3zQxMVPeMeRLFFo30kfMJ73HLFpnZZ4zgXMIH8hd/21yYqfNgee+u0ofcq+0jkaep/zv4G7q/zdk7b2VWEAI1uLrfibcZ2UNJc+/ApyQ2snuRMeXz2uKmmNCA07wIVAwpErV1OQ3tExrfM2hbB8Tn0efVPHC1AvsgWzIYkCk5K+6XVoxoWjEiskmgiV8wBD96hZuHZB4bIAn8aPvM+PytdONrwAZGYw+FpZgKLmPkCAer5I2YbyAjLlegu2z57ZXPCyq0ugCITczpjuOfX4cV68V4nNS+KRZgl/CD8uQP32ORT2oJOJQH8Vhz6Z85931evwshSv3MkfnQ7ECcJGqipkXR8BDzm6ZxkWuPmJodotc/5HUgBlArwU1v/Gj5QIPC73Tss2siIIZfqheuOKef4ey2ixx8/1rr20pYz/AJ7lwNNZzKMzz1BTPHgiRPJuWoFf2UcGJYP+JPJK3dGYEYB7PTSDDs7nG3s58ww2yP9n32Gd3XUo4KIIlfv1IAYlqowySID+MnWS+ZIdoie5By0EcMhho3gpsuOMy0ZjReYaM12uv5Ym+hkvNVwMVCzND1VK7wfs+MVacE6mdB3UzyGtaJKzhdeKfzsZyJDWrvT63EQFkEJQmu0QbnTCvkHcRUakiTMHgYxKW7h6mfqdSbSw0Tix3coqcgMmUZPmZ8ZuruCuqbEm8Pur9Slq4/FRj7t+Eqv1iyolhyfIw30/Of2E6cbiCLrLEM5/S9GwZdhJxPS//OIKJm8hOYxtAP0qe3fZhJKG+vKnho4OVqBFN2E615YNrbu57SI4x+JUuCgBpRB6ozpPTlB0zFgMRC74HNmj9wZcBz3NPjPz/m2erGthVbMdzSIAEgIjyqfEse839wJxBelKiXH8PSYt4e3oX8SU0VbGGvJTpYf6h6ZOHLgOGcRzLh0xm3ngeQ2NHIcL+spjT/tOgzfa/pEXG3sq/xku4zaYFFdcHWVgAF5Ivk9b26VYhUqf9wacrif6/jL5VcbnNwXnNAblRdd9usmT1ufTpv2dfPJNJSL4edNeezNuTlM0Fftf0Y1FoSsmFJEHvbG3u0OY6drD4Ilq5RA29u0ue56h1V8dDCvZB9tvcDtlz9iLt7KPMg96DqXhWvSJ0eNvASv+RCsG94EG9WitXT0MkH+VXCvA0MDJHAxdZO8FBLrMZxnXDRpcHQzhR9nraP9ymxlMoeXpAjOxqNzIt30Rld+IajscPKlf0aS+woT1jke/pWy9B4NCyc88pTignixjw3BeAHywgpTJ0qgh80kr//c0gzlMRszBau3Owt5zzpmlxOiZmg7yuTjt6KXi3TWLbQPGfZkoPwPj2O18222o//XcyjMgOVnsBCa3sRAcFjWjOb0pORmG98SO3lsDPpctesiz23BPSq/HUhjnfwdM7rU3hlv8Em58ZqpYAVBuZtkc6BPbEOZDTPhxBtvwqv4wiJg3bj2bmMtu47BXwvyCri2MFQuPQ5lZw7gQGrhRkmSaXJQSLVpmbdW8JlecbGQHYwC62KtBNREj3xygGRw26IVExJTkb3LRhVU7ixR9P1SovSSjQAEAmWpzadilYsgFQfoM9+yktfzZD/bKk3Xge+ABjYtbQ42ULoI2qJSLhoZkbgDpwCWVthr1BmgABuEnW7n+3NqVN5Lv+nUSPOl4V+EqsXkUDKyb5KWmHHluHvFDvHpYav3S2gsDOPaTzWzA1RaZYejBjoIs8MC7DdKgHIGvXJtvXQbcnLLqM1BvnV4HHXxKz27pmtQLfCVKPO3W62i6dB9oV+uDCNZokk2UnCskkRe0ur52gf0tST5mFKdbp7hmW4BBnrWgqdWHMFgCrjDles2677mnpSaIJruvNfnKETxV5CfklEvWNeFoBCq8Za19Z6uVoncVcgK2ixH/GOJdjT36gEF2cWTSxp5ttiFha/mC0m69fCTCnJiUuzj/ZIM7EHLxZthC6ymGX+5J3B75NBktTbsLgD6TC/bcu/JFPI1dT5WNyquN/h07VtsPKnA2EwQYq4rvyxkEvOfiZVfQ9HfWT4i9ExwNGwtFPdRhWxWqB67Gr0K5jvq0OwfMorevifG662A4PGG1mtsPqPkMCSbVrmruWGtROICqkPN0CGatrrL6w7XnZgiQXwp6QiHxXEcxbc9liuAHP56PYkRC+CsFCIpQarcNwWzonc3tVIixDSgqrbDwe+e0clEXf7m05Gz0obbyNrsygYRvxet0iuxAvq3fym8n9iF17xA01uDg/5XdkhHylns6OlMuxyp9Jia1G2pE0qQ0drZQlm2S6a6VF6Qct/vjH5ApADw96UBolDSOnfimzvI/noaJ+MJFUVdXHL28UF82qQeIAcG9uE1YoXxSdIQmokl49K6n9hvmUMc05CekISD9azztmtHmkwtPrN0i49U4fUoCdsGcoj3skY03cL2PdoYvBVGf+L8ib1u0TvZjOcEkgPSRQkV9fBURe3SdayKss78OrOSMvK7INkVLhfE1WOcsa+RHab0dWT6lZhdrcdep7zpTolq66k12U9k2y6H1RtZqt3AHjPM29KSofjF8KRsFzEDC5gzas6mRxZ9ljkyQdZ3UHTs9N0DVICUeT9smv4R5HuhXI42/uBKk/KxpGkbkwDnELUmKFb+rrtFoq0M4Gurh5tMwVfmZ3LDfeMiZr0CU0bWI87u0tZ1TTclXItApwOKxDdWsBgE8NCvWgCyRozRahkwPNUvuXI2jswqGyoEh5B3XvOC2uU8U5BaRQNNXa3HYlwIAfFHDiuvAvxd+BHRTEAUa9q+OZpx9lJ8YBWA7eYC5OL/PKrpow1Y0U1vMh3bbShWEdWfiGJRPbRpo3XrJyn/aPQ1jPVj4Fj1AmS8Vgj5oevjXZ1gzelqPj0J6tgHIgKDCWOvJt25975ZYeUNoYqetEyCN6KcLaUabpUjAW80+DM6d+eX/gqGj6xmoxlYm+z/aCREUWWCHQHh/XXiBdTsnOnDjaeXAXEev1BhTibN30ReOyR23pOdY8CVab2LvRbm3RSaFOYbA+UsLfJYu6Yyf1Gns4XyxJvqHVXX+NGZFdjRajw0rnxnbtOSIjKa/+Uj35D1KIqhsOeJGvIWszeJ5yET48Myg0qlXDN4wtsbyvz3lL8WP9XolS0TxGY5JvPSLTlMNBzaBING+ss/6t8dlqHOfmkTnq/akbdHXY9n1rEo64pHmtTXn3jo95xMK3WOfp4eh8f0f/aKNz4ffFItbuccqNabBSiKMdfGD4XbgPi0Et3rm4EAJNzcMe35r1rTgQNbPLQ5Oiq3Qp3n5uyk5xy0CLJCBCGEOOh/DnZ14sM3uzX8Gza4oX157abasQh3poSKZcJ2ei5ae/gRSJCkrFezF/Mktg3bLakIOmjeaJDa2UjTRljkB3C13k9a9E4DG5snY8q5ne9Za1ZnAn1/ECr4tSmRonq2RR9muFfyCByK8W38A39zslBO+ATDB7crm4BHNIOLD31H6V0H7L7xmO74AEBZ3pN4+OIlEVbWZeDnQSVxP0hLDlxPmFpOEORYMaGdRru9Hw/nbVXVzzWSX/cvbM5e8aTaucvyiCb+Xuueq1fUNTCg8bxI+eQwvYps+s1ZziPRe6Is6E9O3vQrgBvWSXzprwo+mKEnmI7pBERymRKhKmUb1fESxSCjGTsyKoQs8hjXMQs83brz7hYlISruR/GQybJgbpyB5m4BDzJQV1uFfo349m7M4sYpVxTiHJ76FSsZtttRvHt4jNrMvksDqo/KIZPagnNcHz0qh0ZGOjOad5mAVoNMdD1NsS03fE9gZa16TWusp/6pKtr2GEIFI2YWywnunGhL2vo2dAIKh4O9IE+pnlvjQhbAmOwhztCiYkX7/xGocp0FITTFATMW3uFnnuj2LfXCzsxyDHH2PHL5Usr6rUtENqZqHyRIP7TPfdbuigvFfPl9DArAxtCtQuGC8QzQmij7e8SG4k6A8aA1Ah4hGQIXh4LS2DtxBVBNO/bcrtRJiTOZ8IyqQAr8WFYoG6aAPW+eILIHnVV9Ogmf5w/PI1Hs146QsyuFhl9N7kszi8oS/DsBFPRQDU6rSDtTpgQd5G9ObJNhiYqo3HjmqjnKB8AgYYP+7zKUXhdWQdLdMv2mvV8MgV6PdgnnRp/CfXXIQAYibm17KjJP+A0tSHM40IwqMEmOv61ywKLycvoSMVOUSvUMUAmO0kRPZ71eDLmz3m46bIX0zfhaE5+Bw/GejswGEWt6xwwxXy7frtG2RwX645qi8PqnZnvGOSDOwCZ834MD/sOJjoVh+G+jaZSvrjBucwr3uqTDFDKzJNivSe8vR2k7OTiSPdmCwBx+s+wRtC35ckK3g3MpCD+UMs3TqAFnndzR0tSOtZhT+qdVT5cs/JdNKuLkmLEaJBOvZ6yx6KEf8vrB8+eL9XtNZgN1u/Etz0tYSvteYMSu/BbMZpojCh4lPJf1L0G8uCiJDmSJMH0jzl/+MQoZXiCjFXJnJ98RrNs5MVHKerN9LYdcAN0CZEveB2xjZkDPE5ELAkqf/UP/7cp96/Vhu70g8iBRCTl4bxS6Gee0iKt+E8HnegyaN9gxMqsA9mBjUWzE3cekzAd1PMVHdpZDtDABFrM+7ewOeQ3Y5KQnuJYjLKziwKhvEa9UL49wMKUwKQ94go7VujlCxswgfRyZLzBMROLuSHCA+b1T8L3oqzQO2TAJc1mULCteBQ75acS7A4NEkeAuIPVu8KE16+QpM0Xxaxr0jcFw8trAlEG8VZulGF9KB396tAuMoN2ZyPI0c9KKT4/ElZe+rKaPBCxb+MKX6YfjjBDLD/4IdgCXFH9XqzdcCDXrKE0PPOny01KICV/A++Eic8TGvKvXWOBCg/JmTS7k8ocu5AR0xw8goOtE8SeDTcisKhXrSD64B2s1zh/OITCRMkigrIepAbl6xaedprAw7ZZcjnu/S/nNWkSLqjUhZE3EOiq8RxbNwyOVzOuNXK8GEoOucRwqg0gQNjjk8Qwymj6W3I5+Nc3YKo9cAmQHZgEDZw9keXJskzZ1Hl3zx55LJoBUoAvJTDJ4tltTcyivndz+42Ii829qbrEyyvLyCDHdCR27WZON7dMw7nheDNNC7if1c3Q4cDAoufQHLk0RPEwzaD6GPAgnsGtUhvVLto0yB8FDtGzHrZtiPNQDPgudpqDJnGzA4ANuwKgoqZJFdgLUHdnmW45E4EMm4g6UksAy//nZ5/2kxjrh3U7JaXDFnyKbt36xAE8TeWaClzQTbW/GBIEULE3Gf5xioTQEXYpTqGJ6Bfz5xUaGN2Mx4FMIz6AAKRcNhx1FjtcdC+C8tfgQSTGWe9c3853kQBv6lk5kYoDULi6tjuu6N77FumzIIFAGd/ryYojvUdkLN/99VaBqOPoG+cjKuB4r/MrxiOk8w94BnPy9A8HJQFDRdsX5SUyGJd2zFPIp824d6F2zrRrZdy2ORW1/hJzeb6YpEuFvxun7i4ez07F+s6x1wxlLdt+iWft7/OCm/0GQ6tAW34VZ86GBYlucw0Iah+fuXcN4FA2KL7hGXipbEHNl3RmKGQ7sRFIlaiCPvOYIbZWjhv772w6NYIMdkLS7YkFn9BLUU6naJQdSMUTO6Zmr7kApJf4mlV2+cI8EngHxo5DQbKwuSweoJdiB5q7JKDyht+wJkQjShekCi/Q34Mg8zeuy5Lmw24qVah53vr4apR6P5y0QxJjYZvKYg6zJwl6av4fBvUzEYd7PDzHlkT3vR0F9FKYk0j57gstl55dhE5NF78uNbgS50YbBeFp/vYuh5VbwPMctQ+xjJx3dp9BfFoYxunfkkgQxmWF++U38ZsagqcwlbD8Es3L7xtHUAymOHwULbMS5U1ET+DUx3NqPP3bS1A5eUxB65XQEqDWoZi3qj1kXv898ftTwRs580HQyWZ88yqrplLDPQfQFLjgSX/ChBeiyenh7C5e7uVuAmuuxvE1T6nDavLJSnHbShCDBlhw4T3g9UkQA1UpLfum0gpLAC2cFReUoPO4IxDIOv0O9+pTpvOGco46elFUdTivDrJ2yLFFm3ZpNl35JIOtmKfFDSQvXJFo1Chj6wxaP+KWTDXPtYV8zX0KQAcAyD12PcxIzSVrd2JYtp/DIRwSA+Iuym26yYi0IVLNGWHDV8rhWLTAOB6VTAIEpDk02oaEcANLS+CzlUhI5zIZGqW0GDlfblOh5InF+Rm4cxefLlEG1lKhPR6DQLedHVWahlo11SVY/4IqlaIWsDwGcMZYWZ3hNgeXeLj8mxHJ5RXalrFsrOPcupK88nH2S8EUIP4viY3qic6j4Rg+3lcVLnbVQ03BWZu27sKnO9s1DGSFzCN7z3Yhw1iRyfB05+banYJ+OE9JQF724w8PIC8zZsjOPiTxeWoQ1Mn8chYKOWYuSBzkjUBqAfrSIoQIOLS6E0kQybjhQetAUeagVg8EmMol4Qn36HiD05jtNFeadvaDFcIw6BlpbScAxXEV5a+GMxQPnmRN0ui2p/rGX/+HhdfU+LyryxiCZkhtEKiaAN/9pFKB5b9GnoLzeO8vlY6lhDuyhX2ccdR9Q672goqk53kH/OVNTRE0WxtRtM1tBbMgOQ0VWYi+EfNi3GDlpPfOPejtsajdJGZiQZYQ8f23z8v1DlEFMGKK2zpFrx5+yjSawbl7B7dCe8Gsrfbn9G8UhvIz59VR5vKegndb1ch2pbkBS3n73xrqu28Ny8AFvAHipiTdt5RFw+8r0uCTkNyHmDKt3yK384//1beGPEy7h9+sATQ+GPjHf2KD/5Ucek2h8dLjA+GZZL1Wph7hWyGG78EgGdgCr2nS84XtBq1G9z+TWO4UaYH63SMUWSEICmVo2D+SXe6OKL9LtOj9Ax4W5dLSSEgsxyci7FCfYh4wqALkp7umikLJqssmDNmMBQ3YWUA54QIvx6FEsKwR2ArTkF1lZBRvkoplmlWjcXh2YysKRtWDImH7ECXwqUPPh35yTbg4aU6C8jDqcD5pBRrAQKmMlWNrTXOmU6tJ0rquB7jvH64fablq062kvw4VgFX9hmvqQUizkRBxHYvVId3s39bSYAu3+LDJz2V3LreWmtFKk0FezIiEPJrcZZdAuEe2ONicdHfZqfeJ+xi+jshjIYOwIoU83lcFa9CeCKGyd43q8Y07KNsPkGmHPNSgoy+BI0ZY4xhZ1IMm7D8w4f9f5DdY7h1cp4hd/oifq9Ag/XrIFdWgve7oM7Z/JENYx4Dok3S/49vPJQ7VHQue+tqh7yYI5JuUVtzZxQaYeHdlrNmk2jDKbkXGyUTbfXmXNl0GPuthgjHTx9d2jFBamv6zzpexyd7t1uHsIURtAwM7X+PqdSqK2+h6+Ez7H0eeP1HJYs/9pueq66U6AGQ77QdkvsqD6z2z0KzkuDrFZoFhOl92yQpMndrn1/CQSfq/f30vzVKfhOgK4bugrfGR+ifVBLn+Qk53mWTbVx8vepG9DUwenFB1kZNjxWf9xSA6ffRBeYXv03lFLRLirvGP7xQ6gj/wJZvi/KmD9twIqEe/NgptQgSXX1VMeB9AcAb/UloOjrvfaZ3/g1odH1vSsijZsheiHTETIfhjZwVbtaa736Kofj4ykjcZE4v6ZlMgVeICmFjGId21R0DidN8N3FVYj5sRkh5Ncv8e5V5E1l9hnWe8OrlMIbUFIbgXw0mvVGMYDSJoCpjSgTmkgVMqK0H+kww+cjx5sqgU6Bmeg86YQsuKdWAen/sJDW1K5uKoxd0WiSM1lIvgQUBfy2GNCKgmti0yCkUpG8w7FO9i0kT81zDqNUAfnGZQX259okUhi5ku+8TelP0EHWwpgdFAbzBoRGw5qlV6yM/j81+5gP9s6q2QmbiyVMOWZTk9NxdgQeM9DgPn/JM9zprXU1rs5ocf8EiXWsE4B/ZI70fTOqr1Nbk2PFJIwhGq7gYfbl9XrV1Ekm/op5f3ssut9SktIU31A9/WP5zTqf/jx73Lv2/ThZf4Pfdzgd12tFwGGhTFmGh7CUiHdZt0y/dzAlQmp9GsgH9ZUF/prMDdpj0Ymhj5Os/hXmBx0DxPdVhSu/SXKBT98gAYHNCY8QH8rBIZp+eSOO5lVzGUGke5Rbmh37WMUp1298LgTACHsNzOrfEOBQq9h4Takl0OR+8bcGcnkc83igKwKmc5p4u6yQaKqLtC8mRNdE5b9Ylsi1YKj9+iPdPOxhGpCxJs3EPlW5SKRu3VY/QIhDz1r9Hibw2G1iIFrAAWZ2MphmRhIBqfVAQfWcbAgjgNkCkerI7K6o4xTkapangaoqgOWeSpZDLLkO8lX9Etj1tD0+tfISOjB+JHANyhVGfzMc8hkhp40qJmX1x3fKeCfc/+bgStW7c2h88OIrgcBNMW2iWYPKplmGlM7RlJDuJhmtV3PgQBHaUgeBZ8dlcFD8QcY+ygySN38Voal/OThX29q8L44a3VvcHirlzvtRWx6GEnP6Iywh+jpk1rhv+h+uROfkwVqWx5HUwpFVaNJxLa0FIP/laLGWA0GCTmhTFOCfR7rYUwaYaOUFzztyuT6edhDX6sdy5gcNpkZtKXfp3s6CosXcYu63wS+Id8WQhMRowr9d4eI8JYQ8a6ALmhM//KUaabDDeUKJTx9FV4XtLun6qbDUS+jmO8lSEPAnZwqYAQsiePzuwWs5YFUbe6yM93yVmkybTURt581/VzPNfMpG13cXY6kKoPsrwQOY/eXMELLeAI7p3X/9mL8C0u6BBoYNbRPQxKVBSQpWeVT6vr2Qs+kEyrRp+IL7cQBDKFAvKNzNtpNLwY2gExxfDuapr1S2sXVrs4W4vqxV4L7vcvCouF61pM9J+65yeRfO6KQszDlk7kp1cbo8X5bXDHsv9yy88wwf66jXY6vfMUiPAlb5v/PEJv5257h6acSW/xjnKJep1V5VcnJsCMLJMLKSnZimPG6lgEeKks9yyEl6d40Iro9XzEcLjlWkDdmLlsezG2BubqAJohIaLhQEUYRDtlh6IQOBbS3H5hYb+YBi5dTwYd2ChrsnIGd1pOGu83ctc8G8KlkipoSLNJOxf7JMXuFtL8Y7BG40ZsHmKTlpAnw6/KhypyJwAE9XsH6ijoFDl4msNec6I3DmsQQlHxJZP7nvGU6cX2ktCHQ9xxrQ8l6pZiOPYFGmEA1vZIHo6lOl8RgE97+NsH6aQ6jsOviESVUaMbb7beiMGvleRNDQtigOHa3GI0taBJVoTvlnXWkIExsg/QYT5vUq7AZUb+VtWCwmCY9UFbpYd3ttp88GKgr5aHuDL8g9SS1GN/doj7c1kSQt90VrluuHQBIHdyC72TXe1dQsmedpLEsocT3+N0pJBSp1QE8vg0fMUVjIny0odKN4okirnEPQ6jl7jqb97MYYIdOnSOGdO2Hce0/0MqxBxJXhClQYCbXrEqs+4JUOq6M7AYoJFLXp7ecKUDlXr5C33b7YoJhfgrHgRGx5/oVldTx5kE7BpIjWRGnsX+CXRc3yO/bMoqkY5f5D1mJyQhPH3+bS68ub7ZrjJ0IwSXonZ32/F9ugBEsoUcD3IhVgb8vD5Ea5btqmQzoTI/U0ezIHXOPDzZvb81b/t03Jzf3kWDIiRDUDfR/ZIAWXqjSb7LCE3aKiY9DxV3o+ImsGLgjSjjk501rb6VcC00rwjYgvTCLP0DrW/yNQkH6htKVa75oY4wUySb7RlgqwdG4cM0HLKs0yVRbK+GPy0PvYYIJjCt3aNNI3jnzpLJniZiTo4I5VUZ3OTXzP00PHdqmQb8KL7iCdOdWzeFtT2ysM3DrxNobLwJVKSDnVPx2qAmcjkZqsfFDHeCiQGJlPfW+cQGo/ibzd7RxlIjtEo32IroYSHUmkfvKr7SJpgpHgJ9E50ObOcJzJsgzUqrMQzM1uCoisJ751jzpFDWgVQz5CnTjzHEvrkReLEJQUKlyUJ0hl2p63pVBz9/iYcObN671e7c7dY/CHi95kDpsZwBCxD76QK6AkTLViHyAzr8XfZwFRWdjjDWrve5H3+yZWXoIB/l71KqaBim4DOQu8TdVcVdAQj5SqreGfD5UJ2qo+j0lvSVfG1l6clb/N9jyD+oNtsioMH8Dv0q74atQmcGkr9+BuunuBwmSerZWAoJut9eLDfZIu+bg2u8ZKmRYhQ7E4g+iBImJmPxlZ5xF45Noeq/yXYQx9NeHbruaB1D6htnxEr4aheFmmRwI8fPFcPIKmEYEORGkO3wwEM6J8jfG7dDopg4OOX+2dyq+AAJ38KEG7csXL1LQMWAUw5hHBVhhHZJfWw7+yMYN/wVVNrhXL5lZlInrp841/Tdpm2lWf4YjmHIRUN7+44u3YCmKW/grReZAvlBzRCG/z44+RqdxJer0wZWAxrOB/zQs+z1aKMuGwiw9/jbz9V16oL8BPHIUY1VSYCVLoDGUxcWZuBEaAHtgJ+uNTbcWVIELrIQ6FDqTfeXMdB3CYciSHNjAi9dLpdcUZxXmrhfnJJ+cbifHBENJcr4jNbHqAb0wIwBSfZ/6svDcmek1qpUJL9QUYO9pMJ3H8XSxL/9Mt38nbf25ZvTbr3dBa4ngPXjax4gzKgPCRJlPt0tWX6+DtNHEIkskIPxO27itfyHpluOh3q51e735lBjn8HGoP9BKYV6m50hPKvbR3IyiO88HTx3u479fyL7wTHlhoGPvNMk9RDm1GpkJjcm4rUJy/Mi3lA8Pb4rP44ax/++7Nrqly6B+6R6GIj/+2b/r+qstyUPBKDDbGi2CDdbIr5Jw/LexmeUZ/e/WOoyd7DwyoY02G3lz+V3/70tCI4MwoDb0kHHzAwoVMkG0whC2qTB6vsM3kwPSm1856vhdmCigZhtEJXDx05UgDB6cHJRPXu4avCzy0ksNBacOQ6Sj3hK82ot/CgJ6/TBC4CYHsaev1MYpKF0syoY3oO1pK2O2GFrrwfhAsHbkZ/7ggIbfD5FrAhNY5R3MwYxxZTbBqTXztMXvaSg+5oHxVxTUDYK4bO/Dq/Mc9oPikx9wpy+dY5SbLZiNRMbwkIWDULqAivxngoPf8CnBcEBtD2syqCRZtkt35oMJxl/Y0GFLugEJPjLSyZ9KJHotacpWrpH0CWSC24eCIVFzuSDmw10cbBv04amSarJ5PDrME3+5Od+7SDdkib6wps6Nu8o/Zyc57lVjhuHow33DD/OGbP+qgPRYZHQIyQci5tKWSKmOsrFDZH9kznLnmc5Gb5CC/DVy6DOIOPVrAg/QK+/RWAPUFoU8waq59d/m9J8H+XjsovLt1bmv0kMH5E0jzajHCeYJdPFm2XM5jUzdmMJWmBJFpdvycZn9L+ciXWyF7daoIjeGFQ+a+8j89obmkvcbSn0o9r8ifQTixHRzyVLBOBWzUYIZt/8FqQzGq9cMav6j38QO0xKGDrdt9kj2h+QJ4Sa1cuNX/Iu72O0rKMXahLdHGVKyK+jpF1bEbQ/MT9SfWjXgZ3o0Qaah3PTE/esPUcGAU6VpPCrmajnjzA06uiDhk/g8lipAxhDqw+UUdp2jn27QfCzaqDba1bi3dW+Ff41ydoTC8kyu3SOnQsrFumQGOqmijClsuqxcEkFckahHGcZm/0uoNdkhcVDZF6Dj1Hqe5PKK/GIfxRpwBXic97A7000PsnTewp4Kzj0QhqutYYquwI3drDxfAdRRXTHW7T/t7gxQHAC8IDo6FjYH0VWFD5WWhgxsyCJJoa6+q6u0khhQFt4zgS54dbdyGzj7ibo5F+WOE6tvZRBoi+XcLdV+2FGXIBHLA+ECNAvF5CHizz8jUQ0zYhBGKAJ5NhCm3AxMtutqwg7GjDXPLLzJ027nRbQkcJtONdXqs2AzVEmQsw4CNw7GZqfVAB8p3ACEeTprAJzHZItWS1D4mF+Wo1agC7lCXdX/bzV3LpL4mNPIneXvfF8MrUuMi25Pphg0mJ5XabFskAU5NEGDpPamnxT9DCN/o4y1gQfKAtTDsTHnvVaQjvKRfhW/d89FVEhfTDGJ9oyo4AQOtg6URRMWKANxQ2ZNGdQM0v1ZviLEx53Qop2pHS8rIqMQYNlpFzHVmN12VmkUJ0xTl8ZOExuk7ysYy/r8dTpfAoDDg4laZM5xwxDlzEuM7/kMjHnQoz71vP0yRxOWtvxSqQFryRaoD+46rRaRP6px79qgWwKn7MD++WOhQpipB8FPTdB/P/02T4ZT0fQWaaOvCbIXmChXTq+l0N9KqlYUGpIsFywxzPv+WLcobRTaWCLgg3Zn9vyxmUIxo6+CKw1hzULjbocy79VRFXo4qf/Nx5zTVkq2JWIWty4a/Qb3nF3AAbUff6vKks+3Doi+XYwkB92YoR8afjZfpFqmtYXIA1B/bEan8wxi+wECIhD1rH4IU/RJDvdTFs3GXKsxSboJ+Jhnpg07Ahv4VATcTYb50enCgrUab5oUJWS8UlB2bcXpeTiB9nfxMgizre0PX/73fLlb/QselwsYaLaaDustrb1W6nuqYE/brBjbj9Zea1GXQR7OGgoJEKT66RV3gtVa6KtLXpO6Yqluk4ECZ24oPr3pyE1VDP40sUL98w6FQyxEmJeAyIUtp4u1Scz6ARiIitdkG6UmkbOEbi778J/UXFRds1p7suJy288eNxjUpLOd/Y5CDJQ6oUe7OOH5WlKwiKJcNUVC/Iv/xh0Hl1dIxvGKqPKOuyZ8dPkLhNVA8rGCAloCDNDx+930BBCTUUiiCjGVOMrSLyz2/nsvoIt5RIX6fzlEE/zuVM+RpDSP7U3iRzCUgAB/oiRoiUMpiWCHHCsZSKQOsWi1xsmQCmoZDWOmmgGVSsvSVXiG1JZEHHKkasPaiOR2iAI9jYpz58ty72Z2X1m3wFNnyqPhmzAH6GVQZTQ5sR899o1GZQYuUW1a5TWhbrywTTFagnBVziAbpljmefMVi35hUedGk//zaca4eJcwKt1uKBvU6phB/hUA+ZiZJ3HOR01qbJ606OUuo470OHYP8iwdG2RT5laDRt8hnobmwF42YuH+AXrbXjNHIhn3PV94ysf9YpiiSLgca43uvWmIiJDsB2Jgl5x7oJpfZ2bBPboQXI+j1NHWuJ/eStnszgheJuvLK87n7NU2M7E3FOfqRN2kCXIALvTvzZltn65aYquRB7kEqCtvqxE/XT4qKgazna+l6/Q9IiIfie+9uCPMzh+AxmUnRNUcaYy0ILLJ8LzqReifLLsa0qTjS6Ca6pkPYrL9Klbar9Hg0/KybvMH1QUIbxu+m6iT7miLz1fGSoEz30J0ZRz3cEAGltfwIljw9mm2LM3qN2zaYWbub5ScOSeh/8L958B4IELN0kl8hpa+TpgqaW9pmnGJsZ980wduLfFBMsTu+Cuc7ZgAUgS5kVKNI/MHYEl3BMFav9xZQgBtsC8LjUqhwalQIAoGYrsWT1yFdzm08MfreV5CeMMY7NLdibY+yy/KhXAWsh/LstCdDzNcpl/VwV5ze1RUhzzMAPx38gl0WVjFslW8JY7yNNbuBVL+uU11PjGdyBgaoagw8TVRK+o/Z8eDRYNVAQooTmWjvbFE5GDDrtG3wUl0ssRBJ7tTyR4Do4sKjYFT1Ra5kXolT4dfRwwdeTEsweAnOiJHWQFzr9jPRzEBrhMpdg6lAo/8TtLyByGh46R05/v2C1kH6O8/u+mBAbG/9HFT3VV0ArWcWKvag/i4NvQZh9fImyPmZv3RwdNHaiC2QbQDcFL22o+Kvvf0HFn+u7YFho4oe9jL4WbDLlNkfnTjjqLbp3gHMdr4hdGH1hUFr7jBe6jNAFUdD5AhP09xvPpBqNACz1C5GkVVk2EdB4WazzR7Bz366X15n1jaCbeJCk5qVqcNp97+Oru8bIehq7XTov9prTFFn9lY5i0KeLHmtnUCzyvIFGptE44iZUyeGCcXNsHPQty4AV+Jc58CiFsJW69v89qwCDT/OBHdjg0tmqiknfPuvSbEntEeplmh8YlMkQ0DWvJVXuerZUsgS6Q0GRty1ixINeN3miZ1l3pDTBHUC/7TgMcO2iU1zaDYQL2Iy/bdpxWonqQY6w4M00ZzENq3DxKOXemJXmAnsDdPrf+svpst8YcR02YjBpIZE32Odu5EuUwJV1qjJ6K1reBO+cXnaEmpVpFCn6dEE8rf6VjnRwFo3TVledhB8UVqMoFllD39shB/2n9t+bCVTANAraMV4WXS1e7LKnUeVlrbonc3YWvpFkPFYv4LqkQOavP3PsLC+IV/Q1pz7NDuav3fqT8N1JYQLL7iq3E1HwPPCvHcoKO4Do7M3ETniYph0laXlJYgZB/gdePPzdVuaW4StjK2Zo8jDM2HadTSHsBiyDtBtz6dboKVNC1vusqBwQ6G7r4MRUfnH4lIInygIRWkgBOWWM9q5wjF9AHNtn1+jBX9NFaqjf/+gv4uYHOQ3MU5A3pHekcUVKrFE2L9Pf4cLA+dSs8MWQUwkAECEZsGyy7esKjpz3/PMbMD0YiOOlQKCO/KR+jTlcbNPt6QPbicUPyDjl3ztalUVgyFGU9lOqLwGsA4H/JWHTZJrHMuaIn4phiWVa4agwXsdAacLOYlYDhwjRo0sHPyIAH6dG0r+gnGNxvFUgC+nGliYJb/ScfJs1siOJK8NrsKkFHecTXryruhxZnOhjkwUqQKZ/6VS1K8fjP9Y0YdB2MEXl30gYFqylvJSGZvaFlWaRuCRydSztxIHVFy+gqJf3VRGiW2uBBBnwzwhGpK7nzB1s3njKJ2Fng086Sg8gVesgQA4Wf7qakGF5bZ4vBUJ9HCOZC5x74jTlsKtkH0dyiWOmy3hYlVjxIO2VhGQzibksXFLY6ngzinQgZ5zSWPIcSPw0D5maX7jLvbl4v0iHWbfUbooS2p7cXSK2hPDESynGa7RUIKfNbg2XmDXwNj3SNV/2eNEYG4E3L0h9Ytmg8gVOlM+YqqfbmhYxMWanu/r4oe6jk3AUIURsYmGEMahhU6uxGTVpz+ACzE8aXobmWMG2myRBDOhwx4aNJKio/Q2SbI/Tu/lw2PmbF3TdGsNII6gtBWghQNASC85C5cRkEZueFUyAZ4uZGGSpsp0Y6p/5PT9Y7jYvwFJdgeEfXyPnfZhEFIYmw13yq4RL2zaPug8MT6Ciamtw3t2n5gAAdGwPpC1JyBlIvndWkmVF8tUMk68KUPCrp/K8uTMpTrDOudd7kBJ6ftPUT/HS3bcvUxyXza1OsFMSYhFULP4EvJpi3/dIvqBLnuaF8iVqe3uErr8xsmnDM2L31UhxqQ4eADnn8lenTIM4KZ3vaqODPZP+lKEK1YnzedZFE1Sf71b5pwV73bh/v9zTuws+q1vi1K54ULxn9lvCG+eb39NpasJB3N4F0qSGwGzHu4/vlC5iKZG6ywBhKy9eyQX9CyfTwkspX+1/RmiJHF6jw2WznsJ3Rv6tp4WMuSkOFSJaTAzDFz2s87/69U6Ddxv1PU+LDH3BiVHVHsYrw5zw4HGzrPG8IH7t+KW3/tkOKE+4M7MfCHFXykGi5zmv3pSsoqGKVReaaHIOVAH8ip7LPIruJkbu7UU1GZEqltEISlxqsZM7hyliUPBzhyFzoobSHWK9bJEJgeMqdmubEC0rkgR+qPqDGhjphWoko3hOC1y+XvBWCi/ACS1IeltWEWmk5EfBiihv3W8dK2AVrCnqtV9VfaVyW83eSh885sFu+EAfJ2W98tHTqVrS/+3HP0pNDfEyZVWN7XH5i/IrvRHzqt09Q+8q/j6DGs/sLC3S5TV5chRQZAmD0BPuP9xpPFtwXcU0VIcfo+9Ivx4c1TOABNe775Pz2xRfd70ow+nzTGgQsiJ0QndtQfT3yG4kwaAm7s2IvFTjH92nQVg3YL33/As8mEdlmPwjfDBySavL0d7hrtKymPNnA3WXNHPdhFMrmEfuLWeQwAuNQWA92nP6xBNyfE6dG335YTplUd7vh9QqjcfMndvBqAwEi2iLzZv1pLtCdnT92jyAPp5tBxDqtS5giZARFkkOwN+DHmiyyJzng9dTbB7gQwgpCYQU4x6+aDxDzkHwm4Mg4UlhDMBjDZxLJFMA5DLHqzzM2VBQ+RmknTeKztDf/x7PxPXVOuSNr2J2gJKlQCIcfFEhHQ7jc2tCbdm9ExZZdc94J82VlnyXb4IKyFIgI6Eh+m1TtFLMx6yNvKGkacJllIaZWQXqLnixCc5boTqjcPAeOlWq870W6iTR1jHmDH63kX7snO8YPJkV5JkOHOGWVfsLN5j6uKRrmI7K0CB9GmRMTHfO0LT+mRdU1oVJ+ph095rl5Vg5BVSSzNLWvvXesuk9ki4VjClStsnvG6xezN6NF1IvJZap+8Iuih7N5ijEhrA4pVgOkWt8Rtb0LUWePrsg/YNieA5wle6a9+s1eW2NuNdwQYalX4NNiYEp49ATb+XFTnJL8nkbH8RckbnpXKXZ+z+dZDEZdBWF4oWEME20hncQE5ujx6xgyLhnYx/EEuXpScXR2C49DoXEKDLKtnD5R5f7D4027khkFj4rmE4rufXMO7eqrnJXqvNWQpbusNHMwqwQUt/pnl4URcOFQ6etmnY/0/bx0YsbMCnP+eY96xx6UmKWv+4bGjOjTllOZz3ybN6+y+8LUJXwUn1Wh9ThQm27vjB6dviwGEJ7Cspg1TxksZRE8RlbFdwZNBq4f+b9dsNs7hpSBCckXzyaGET2/h1a7OaAKg0QXaymddCmHu+ClfkYY3qCHzMagdB2grfTQ0KE7afK0WEpYO/sgBiG8oBqdjyY58LjZGS1AWLJxzOv6SWoO1tkHjdeKStbrEIAMuFz5G/oP6rJO4aHSH0tFGpIKryG+ZCkdXPY2XboTQ6mZi7G0gEcVJ/1rda99hEAPP+ZU/79kyhM68Lxc9oOHszMriNgXQK64OePYPovQkq4sCyBINwM3cd8IERJ8KXluetEJ+m2nBx9Rik3te8y9HBvWracnROaJ/pVx2p4loZtXvk45/zlBZSn3KXhWzw+6X8P/vURPfcU3wEZr/IF91P9v6814G5trXCJYb+OdTNgubYVOG/WslTqzteqkE2AlQJr+6ssxqU6t8mcdpDr+ITZVVi3oC5oqJ3wI5ZVZukItTmRjAALixBo2J/j3l2PDzJEZ/pYNQVLTl0Q10/5M5/afih6p3Go3NfdjjstzaWxL6xQBz6L4Tgob/NADmD93KUUXV7tDnnA13xcAJ3hI++XlOp4DXSgV2pW6tPN37MLehMlV1JvctXE2VZPGT7P8q4N5Jx8NpHCp+o3jzqgWphtKNh/7Hxc8tT2wTqYHkpLeP5N/nT3r0pJexJ8cPRbjcErHK2X9DUDLSWRrZx0wTtR8ko9QM7vQS1W4iAJoiKrOgESmmUAOfiaeQzzaaF9Ahb8bjjWT2kU+Ka8jNKr95gOg1ETJ6qSm8RUZDM3lbP6Uh2vUj3CsZzqP8DwMw7xv1KyUGb7y3hEIZ7Kx2UR5maP8uRLO45rQ8oAbvmhbt6OfXh5c5h7DDSnrKCaGBwe2AQcPTRx6kVM2OlDJWBAmsnIj9vumEFZUxFMC68ZQYmfeFrcqjP5kziUoxxCeVszVg99t8enoRbzSnNXqGZobkViOAj4SP7zeplOJamuEMc/f1p80E0k1KvGce+3f7knv5wfbObHf1F9aWBGgjION4gQOgKHhj8RzRXATObcPt99g+Pe4TZ0iocNX90eSASKU9UJ3g3WoUyjGVJ0zLQNLskQUjByfbLSGIMiLKMxpgfl9vu5saAphic4MmyFotXQu8D6FnnRAAWyhDwx5R89YZcZ0nwQJZqbsKOCbAoW73TnuXyDBGxPQFzNYuaNLmJSNZ6jpUEtotTqsjT4VRieqJ8dIC7idKFNkH0sozrC1DmR93RdFot+DzgJWnLLd4kiU/zVST6feAQwkadP1LxZGt6mD6tTdI9yI8FgF2tFLA/SoHFeJ+Yr8Kw4x34Fzj/eGoXuc4w6f73b8cVCRROMLBSwlr9jLhirL7kiZY3DEFqzkXx5Peo8uMPzeZRETi1MwVL6vBRC2OxaIUkxgDwWu0oiESX5S2tcN6J0Zq1celGVOHcNfeUmsDy5fNCsXFqb+f7cazIpXnNov8m3qW9yS8ygFwc0ft64NVqf6QL5f2TjUC94FVQJsMFTGRFVUew+5OXowTRvsR4WiyfyxiBVGla4L6Ip851OFA3jjoPK2SE+AF8CldyZUX7anxxULvdnc5qqwi6bkypjCnoWsRRzNgd237Rs7nLm6oxU/IFq9cug96+1RABdw2hh7T0mOTv4OTgKk/EJPql1CUkrndxtkpJZ9X+KtKmw5lyzUPJ2NEJfvVK40QVAua2V82O3tqvlXzZcAPl4s9x3DON1facR+DVJThN+88b7V2AWGjB6ltI/7QileyuN59nGoqkSKqVJQhOHhq6Qhj2bMJaZZMoPYgM9hKtZrnnfO7Q3VrHib8bO04OaW7ZfvRtX/IH8Mevcr0D1B11Oss/lcZOjjkQnf4GzgkrGHGZO3NwQ+tXhfYRqv5E0eluk76QJFBovKuaGuHT3dEHsAjPtLN3l4b+CIcmeSwTByEBVYV6UZgciHeRu3l9MgCiTlmfF8C5DHPFBEHw1PqX9sKiI8KWYqbylgtiiBof53zX5JKf96pD7K9a25Z2CHugcMzfKk6C57tLpSnLdZtv5XPzWQUtZv33QWa/52FxO5VsyVjku0ZD0o6PXj/vsgW1IecVppD5OlZoFIKlUP6iklwVDKaXQov5oT9Ti323rpudBabnuv/KJZ1EqKojOQRkR/rSe4kr6N7JwAFomBOtRMz2ORHvm12XOjYPIuLhqFk+3ik2UTlMuXByRwtS4Wfki5jz0Qki9KbtBV+bXhkeLQRkKrBWEnIfL+kDQ3ycQolhbpDlsP1THfZc2Xv2KH90qszeRJ49EZcpQjpuTyP+IT5Kj8fP+yi/AP34O08gwVhKDP4avzPCVVnJ2bG9doR7zQ/XJbW2Ac04fRADHWnAtnPSbRfjkQWVHjAt+Ruz9jk8QWkc9wJf03fXM1RSbt3uKXUbpR+5pnscXf64k8eWHtZnPZz8zHGgc/1j4Q9IvCGXUKwwHbSL2POIMYsRAWAPnOKlIvyyXl36AyjNwI9ilK88YY2Moy/Jz+K+pUx4hC5uev/JQdxuhzJrs3zeDOJMJw90T8Os+OJVfqCsnFcvJetBmTi2wyV8OSu5tNICHd1bZaEUfFqqxSMAsAh9prB5+uxKtLpmn3ItQo/F9b4A2V7fcFzuJ/Wbzm2UzoGtK1fs5Xj8SyKGRRH5urGE+GUK90YzzRP3QPr9KE7i4nup1tqgsbfYG6TTKPv6aPXofa7BMng7mEuZChwc5zwoVfdKMhkNfvVm/nW89Y5xis8tKJPDG+x7UaNq/UniACTVgbjMXHPOjOwSz98Ivl7CShFBlW2XfVl9SKSVbLzfETD8JFkXrJeENk3DIJhJkFUFu7bSuGUPZstmBS1Fltle4QivPDgRLOIrKfPFimsIIEE6Vjz7RR1ZdIhX1almovBZOVlGs5r2h2WyX5cOISk+5suF71gyqpYL34+joW1udYJ/iDyfdXLuJCuFWWoEzYKQe3KbQqLOqmyl1jDEFaoAzvI4I1NvDMTF10gIZnwYdplIKIexqM11w1oqF/FL5radtwJVuRXiilSNhZ7vjfW9NE8ENWS/+GGIIj8gesfcsxLNd99VIQCq+I89GieeOjMpm7+QMnL0E/H4Ry4fAqJSTgjwUrbwamVsP4iKqbyZ8dN/fgX3sa7p+EwOPctWj2BCkvgYVmJkO3GDu4O7HdPN5N1f5QdnScU1iV3jYU2plZ6vdnK2Tu/JKC8mehpdP9Ec9iFm/pVfCrU5HZK3CtU4gBziid6WGGfWkBoT8YMhpILJiVutxJbUMrRWHpzoI8kVUSVBdMRqmibDrQ12ejUpB21FDQLMpkt3y47Li+MggPT3/Gud9SVF6FnW/vv+4BetaKWNzddJpWmMh1fST1/ln2huWMCM+5q1eMSjKueEIFTpodvK6SezKYio/NITmkLBlAFenMptNE2MveBiewc3Gvr+P6+piU3RV3PUwjyiqnuvb6Vqix/90UFNqCZDECLdtIdzkoeA21t2g0ng51wYmv984HAz6uplPm7SqQeH8gE5WRYo0FNhS/XPv/3/MqRCepZapb2ZpBkzuxKtGSFfCHLuBtjZmo6J0R9XbyCWhf1Lh9wZwR9oI3+npLZghKzGXxuffpTTU7ysl0wItimZcB4DKpdJ/+Pmlq4/Pfd3A6RE4yA5xvxYnr3z5noP8fC6go44bGR4kHlypKFp01M27OsO4OYqnqhuBfma9yUC/btH2NP0mitKzZjHxDp7OZVXSKEDCGKuWMbEHk5Wqla/wohC3MKEJwW43tPp+DqtGj+cA9ps7TJ363oy+CmDzRd2Y8CQLuQ9gEMDZ609G5duE32mt647zc19KKeLQ9lzKQKLDLuUUGG9s8GElE58pQMWJacVaO8WnMSSzwNYyw31hJRaXANiwsHzWRYONOavVmJmQFd+pxAfe/MfDuWLE5/l+Y5xg0f16ONgeQx5fZBYqpHK9VIcNMmAauRZ7avrZxCJM7Ckh2LZY8pWf/7ZLKTari7eOvqQmTVJx25vgkLDQB6f5oCb2gK1sBBbzrUnjoecVAxjoEBOt+yc+05nMQfQoqOsAxeYvVwngmtc3o3nPq1wY0r7lQh3ST07uxkI8eWKvUm08lf82Yqve4xRB6AFFYXy2QOoXaPYy0ESBCepcIRuY/TYR3GysdrdM93WgrMZpRc8JqLnp0b2gufLopj+vS30JjsRAuexTGhMevwEDLAxrEnJO+qykgsFCT/MJcmzDX2JTMutXUpwRm7WaEogEEkkpu2uRP8x1xflQ7bBKnQY9+UvxWz2h5gGCAkHVMOWnC8jS0raShDW4YT/SmG38pv7U6APHuF+hblj0S92r5+jx+zi30bGLB+8nX8P06kO8xC6jS/yNuOgjAV3067oQqm/nEc41ZqqpUMRy5A3zBvGvdmbDbTqQCtF5pNtf5prstBhZsgqpSlDdGbPJm49HWYu7qmPMafk486y3iAE4HAPRT4ANpDCyQfpm7kT3Gjhsz7W2gEFOeQaZHboCqiNTZvUTOxMZV523npfks38WySUlvGyq7UL9COwifsAKQuCSsuAdX82jXfC+dOpvLTNQza8sZVJ6hR2XAsYw4B/YFS1Z00gyp482PTd8tCfN7hSsGD3lKFbjhL+909ri2oaXcO+S5NXm2EUd+Em6SFL8swFYqJY/D08spI+zKay49oTIO50+pV6lbGUUCqT7NzcB1gUaVXKcv9+wUalh6T0Mk+DETlijOeP5Nel3C6Ehtp7Ox9F9cSOgeDtuP5Cn9TAhTwggzEqbnR7R+6NzjQRfzkYOoeb+I33NnPxcP73B4u4wf0RjlqK3NklH3l27S6HHAlZ/4qHrcViGIdy2XY+z7G94TziYMN2ElZuIMkyRDRbOa7qT3FZMa3Qd/ypXqhOSVfduvER4VygBcn54v5YKhpoWndDm1Nxjk+ostBlCj83lG4hcbHZP+ozBZUEufFi1i1HyiDziKVqqSW23S5+TvyOUAHriUf6aVX7/u9cmcdnrLohNtGu0UNKWDhhD0Pf+K8VqjfEletdq2Vn0IXzwkHynPsL1QXhW3jwUydn5oMrN/ru04ySYy5gVdpPYHyW6mG0PWPPx0jphfbChUJGyqEiLMIBTYC6Nu+IKF5xoKUGDhbliEa4fSsOhVNlE/Difaffahsn/1GJjGvqkIuOWEuk1Zm2UvnakMSk32b1HnqNycKRqABS0wOxsl2KuMAmPOCCfuSU7l+V2xeATagJ1Rv3nXaCeN7s4IhDA88ohRxjyn33XfAZWbE2/yTi1sFXdRBY26XePe013qlrTxkMX0scC7FsYtA65HF10t542b6MhfFAcSgoYpMDpD/S584XhHYjsvIh8ow9EMUB3+nwmXCjUS98HlaCwGGLSZgSbkpSZY6V42q2ub95PsAQNQoPh8l/OGIUViTXsJuj+79qUO14M3/RO8UWYseIpRBnovOHrQnsK4BKSNfbBCqHF+JIMNDjBiPxtn3P693VcbMUBNxOTXj4aas27MSQxEp8OepYK0zxnKzou+9oFj9PBg7gJWjdCGuSkhDISF7F5Y/cuCVNjidgLi/5YG3y8GGOsB3Ay/3IQJzhRhk/sbmssmImd0r0n1zelpqZevvYjzLmdtM3ewxEKOeHUS4VT5OmBN/7wZqprAzAhtapDmOMhA0dZl0x3mpwPvzmQ4P0b4f3DcHpoE2HSkW+DvUmnNlSBuAkY5rFrP9TC6mEg1stwAtKte7qaBEifxLk+BOK9Hn2H/MSViNt1MPrXOtPjwrKfrGZtEkkX9ktjuOf+1Lbbd12jDLKg9YhCttROjIfEojKuB+hhD+rQAValYd9kSad/ggKhobbruAW+kjXgGapAyhMWBiDyDZ7jbGsWwslx+PIs7jcPD/pedM4cGAnrkkzoNbQtGFslkteo2nq2hrkBBMISoOpZIsjlVzvlToTef2PCRhPHJYzjvd1kcwiME6+z1wnjlWqgr44XqOznGgWqVaf8zxBxU1MCVgx/eANMz132C52vim0sMgCJrvoDfbj4spYKrri9A+wkdRadtB11DhxO5zQkhoEVE+jdWkZe5rvNyAcyDPJmZu7zioj8ZZWN9sq80kCdu5fyTMmyEoWLA/6wPpOZDVAxH7vDaG7Hk288jxD+pMQu90XNtdj2tEwmH5oGxQic/aZJxlNIrFlGmKTC4xsXMpIwUmVJGNaS3XZV9LI3KGFXAj3PDXAz/nKuEDRTj+9TCFd0r3LfKZXEdgkvd9ULjVfJS6DFFpgO4lbzYc0apU48bYqdv7Mxa67xDdV7TdFFgnApXIDH5O2dB6Thq838GkBU2yeIpAPBeTUlXqmPk6TJseHoxfqNrwKE3wI81FZJfFOaT46LgtxUdTD+uBxOOpXBVCw3FnGm+3PHXIZbLPjNwsmINqFi04iDcfPU+uDe6Gz9OTdgrfFmAys7vH6sOMGIe1o8d53hWTTDIfP9c5rvCjsrG35jYj+fP9riS5R0y0E/UXVgHzp2jyjaIxo0mLE/DLFDWKgMjWZCU8JYgh3R+jEyveAQNZNEMzrrIriKNjQkCpnAJX/Nx3eTfUUPRcpkIhgS5GNfDDRP1vNM4ZOXzmrfxjDeS9K6Q7wiLELVkf3yJFh6DwmdqaFPSrDRlqVEeB1nN6d/cyBEra6UA3EIT/XsGy1sM6hOoRIKu+fXySv6zs/jxrTMkTws0d31YZKkFpakh7Cref8hJ1OgjK86J/3+yBCrbiBUl0E58+jJwizF8G/La6OKEpDsQ9ScUKF3pOgIz7VyHhxJCKoQ0bNGXFh1LmJKOmgeI3gmE/pbWJCcuzgSHFMhlnnwfh41O6AIqToOsO+B2YN8VhVjq1J3IOZCgNVbApQt9tQRUyEBULymGF9jX1E0GFnMKxuPfF8AIVgXTibSZ0p0rPzLATI9t02jvs5CLsI8k9tlOnxm3gKi3uGzx1j69lG5ex3gnEd8z2yR2DVGb3Vpq3jHX2RXXojH8zLEHWTooPINSMtNrlKRRqw0F3D454toUw/tsR9NvEPclETI/ZJ9kxMNC0AJnhFpUjTe7GEIcJr/agDbCOjqJvaGPwEr1KJ58k5ySxRIU+znclbnrWb7AGLOb3Rb8Ng3RDgwV38hbHHYrCeKweNRT6ajJ2/KQrhA7YFVIN50SzqqDWVwk8A5hOP9eskeAa8GsnDIaWbIZ5RVT3PLo1HTeEvCZlgcLo/xxHmcvmEmSVPg9SKPVjmIpKb9hZvDRi7jEtLxC3guoTtDGQsDjHgjLEDgLmWfwPS/qEdCkFon31Jy+idwVM6OlpDtVAQhSLXI7zzk3Ved91JrE+KlSmRUlGiCO1Jn8gE6678PWfEDKhyZHfkVWuuOqv8OluzQXUQLSRiKinT79no5eEKtBn0QLkFWrYVgYlHDOdGwwAbX4c6ZXYUuF72NEG8FA4rUX2SAY+EI1o1dWxXCHvXgN9rKJsRjwu/e1MbYoY80YpNd9s5mjz6HtE0KqorjTdSj8BF9eUKqJE/QlI+xTyJ40z6j/07ZZGgWrOcFmMumIse9K7WL641Zy/suByuCWE3dNL8M20mKH7sCTZAWRj3Vdj3GOZFE/Uvh6oSm6saFadi2ofShyr6dWEHpRC+HSN95KWCOZhbF3PDLXCggUkudfVKJ/4fiD/O3iN59LQM3Xr1m56kclYvhZzQ8j2GwZAwxOJNWuTa2PSrNodpjGPM1qx3LEpHFULmyfNGwMkcQ8ON+GRJqcvE88xyzE9U2CrUNfevF71U47B5h5xIZ4krb/H0yXg3YuQxdCHAnPk9cffs0e5W4SIpibGaG5xmJ/nqmKii8aKlwaUqg07WNEZrwn43pKWhHkJLIULKDRSxfOO2Qoxqketcm8td+r5KfkMcyT9mNDP77cjLFwIYmtBRzpRVa4XKHHHV+KhWVu6MViCWKP2h5Huj77Gw2x9isgUvnrXTpUs+TAgUR2LTegPkYHL7ee02VJfEV2Xr07YuKxyQ6QLzF1TSjRjtoOj985RqN/1wJNqyumGg+TT6YiIQoEMuI3sQm7nbsuKBRHSN0vvm/VcMg5t4T4Ry6564NwclAQjq2woTa2chXljKHxm824M8fHeEXVgE/U2fbDDjUUVU/14PJk0qCMOwkyv7FLOALKSvLr2qkHpd5l8wk4t2ASPJQo8V8Z/xh9LK1yrDkoZopUWeRnqse8AttTR8tfR5UP/vUDjtRVKiKoJX6HypdKcizBlGvQBhRzIRABQr2ZSS/YbSFg7bt8lhYbinZlw9vZ3Al4jjVUC2E6ZaUlCiQnlM9L/JgNJc73uIsZPL5WaqgMXZ+nEpR0bZGfCAYuQ6xDfBzSBylKVlacC1IBdO/aIrFCKafhWtsOIVybjqlXbGXicosEgDeh3FvTjdOyE/fjXeIGAop/MEBJfQFOUkEovu8qnJ0I6QBo8cTzhAxhSsrXHAM0ODTmamUlTzFNFWDYI7fViXcjq6g2y3S2GFyMLGA7anwo7+gmW6xeFUwLtSZ+a3cwfNvQd3mnzI50u6YhqaVpjh8C+ACAn5cis9C/5E6A178hMeiSHhdMrZQOoMIpHvKV9TXdp3r0fOZlOHz/AOG58Nabv9ZmuXxxFKDH2gKJocIruNlAv4FrgGVFQcfWYYBXE3YEYP/ItG7/CP0IWldBLNv37Y6sT55dYB6zU8uCF4HqOM3J2cz0Hgmz0QT4N/ylCy9z6YVRNBQbFsQihWTi6VtIzFo2JM5hhK29VWghWrOGThZ1uoDfcfJJVtaHBA/vCkUAlVzJ0Ko9PwNG5jQGkQF3MAmZ5MP5+JrP0RozP9ug+PpM9GCNDVdf6M2zB1dpBCVna0QW5fMcFg1hW23KKpmVvfRCPtWv4DPqyMpNbtuT4EIg6CJfDvm0RdNIFclznKUtogWf+qINE3OaioUaWJOfxdXi18r8Z50znn15pVyrYojEtPIYYPjMdFPlhVc35T8pF48544JQmvfk9w5Z/skUn2M1dB7GSV08bANry36yp3VH6MhOPEsIkYIR78M+lo2bgBbNl5tPb9cSDR032Y7h2EsED99ojq5J1f2OC6eG/B7/itqK8UdSh+fMt6Lq0omifJFrcN+zJ2G7ewDGAD/paW4gzu5qLsS1OXEmXUi2RYxtRueTNqHTC6n3qs+SLvrrVeOTpNhaL7w/uakdU0cWRlu1S2Gsyl0bZmsSZ5dIJfu81mZ0dXdK2Wiiqoadnj1ok2nh+f/vbeEluq2XoA2EsmyiQoP0LYO+qR13HM9Br7TAAF8y7+I6p1CpEL5pTwbf3BPHRGfE3woYzt85HvCkFE5GBPSjIU26/vDmqXGyGsmT62ITUGaeFqhbMAIK6OQuTHAzqF2r2NOS2M5ghM5omuUSMzl4HhCSpuu3wrG2KztlNQiNIy8tBxXkVeyiS+We3OO2xWFi/FFM0rmo666xlYB52blI5er4O3k9tsHbSHQ8MxKJbx2PL3jsPosm+48pcIcCqsOuftKPqGdXMNhLcdbbcG2H4AwR//c38HJGKwFop8QdhMQOJ+WbunmHKiLaHQARhbJVdz2UnLR0QZr5RUHoc0XoHBMhi46qu2EYzu/6dklqD3LWNXqDY5+LOMRGFxjJ/wFwsZapbqN+1R+HIwEf/mze9M6jw6xuYVp+1qAVoEEbYJPPQ1pNn8DkZcwN/LXk23zdVMp3p/cFkkRCzx6VEbAeLNTks2PCDI4JmJnTBWGGPypqAE6T0VBvWv8/We0+m7KWr/4QjESIAThk6h0r+rAk4z9AGcbT5i197sXOsMJ6MW/rQM3hs3ApHGvZDtjbr1WJdSVCjGEO5w8Qq6G5x+yE6I3GHuU72xrzWd1fsnbPj4ioeNkkbYV/kVqSpX64aI6Fd5PyHGgGI2nybj2tuoEZaZbA9EaU5q7h0CH1RoA3GNpK7/l+33DFbu2PjDW7DjVeZY1D6WvTdWn1MYpK4aXNRm8e/xYmbcdedWWmFF8L0hMeG8Va2PF93wqVIUgmJfW4CjL/RMBVcWzZ1fulDLuHc4ty6TL7uCR3Zt+q+EaGWSJuwOarKEkTXqrmidQKK41Oh+enzNYKSol17NGyA0fU9okV5L2UYvso4hnvSwPP5Tj5gCfCTypTB4KCL7d1QEnVoNoQNmy1y9q2qgHtiMdUVKlDSHigub+74n5p34yKejeej7fepylyfM2csadMT/K+p9pPaah8GClm5enXleAdpL0R1NrhHG+XT8RXg7jtTNSslWfPHUm6m3ZBkW2iJQmN/VqKle1FqUW/NF4mlHKYaTCZ/OkgkXcNEJSZQAXUnE1xDL/6e5sALhzyMLYaq0ysOcp+Ir/yiDhkxVpitG1tFqtkecLp5dFfZMDutfeo9+oEYTx7yGelDmNZp1BKEOLjjoH/9Y9G+PriD9+U//EnYjvR1UNcCDpUKGECM/J/wcHmIQ8ertA/Qpi5Ns6P2HNNeex6Z9he+n3KoY8vhjZZmhFSIogdLwzi4berV/R3c39zd7yn8eVLlXzmwrtpX566CpunuV0HHVbu8b3ppquSi73iJFDXsX60orBkrSQI+iP8hVzR5c607qwCYHisUzdmCUkmQKrjillt98FECkcoRzL2SogS/+ZLF74iElWOL2nwPYnGnmhORU3sqqj9B7bvSS33ZtjS0RrH6wGW8ug/xZ3/yeDnBXbBiAQoDCMKHADZAXsxSX2D+vB66+RcOOvqwiGdLAfJpUAzyIIlTgqvVBiu8Lxl3g31yWXhF1aVGaej9CQ1mGrynfRBBBJP9z/fBQpdHcNx8UwbqEFBvyDpG7kfMXlBkrN/V4Ve/og0x4EvdMvM8PWkhsUC4JILumBgBTBRYRwnpCBx373F3MFo9Ub9HkAIB9ZCrwp3jnLqmF+GwBDT4Da/Oidd+45Hjk0+ShuK1qRp+dDiiZjSYRra7uJVtyg6caSw5pdWeio420V+RevE1fZyY3hiOhw7xthe+bQc5YROIMf81zv8/doEQfa7xcSQPgw/BLLx1/ntS97QbcruTDahxM/WGDZxCjVL+IE1meeRjKN1xD0WHu+O2lWmo4bCN41zRJ2HJZK2ivjmw0e+jBAkKnfFUwjZwhbeICB66qLwMXFGCH8z4L76p7N0Fd+KtvIh/fmKiJWCZK+v2gjnAJxtGuYGIlSMdsYc4fBH2JKnFYK3/fXaspRYselyQ7tIuPR5eo41AUWHkiVVhPSYhP3mUwR+sPV7CRGDaw3v2RkKhRgLjzJhJtrOth++GqDVvwdiE7HB/ijp/yzDwh6ssm5XAvOumf+ATbnSn80Z+X+wKE2/qhuBx2AgYjMFG8LBy9JDnrarS9ocQGTtZVwblY8IMfJNMjrSBMs/0TJTxg5gsjbKRw5pAp4g64PRqtqFe8XKHAeLrUIsReRe8SwnfZ0NisZ/a4X/QPvQ2Q71HrQEJEG7O9szXyC0KHewvGMfGTZ1Lj6kiRB7bysO/ZoZ37xbNxVC8ifgn05/yEqt27yuSaKCvlyPU8w9rfUK7EB59E8VlOkW/Bf3z4zkwyYCM1Au6aIYh/zkaLdtclKy4m8KZfWzlTj+ZsagXHJs6AaKaYexU1GQtA56fi4E2mY7AQf82AZveYpSCXkc1KDOxUEapcXkX/P/DIhC11kZx27Y8Um/IlMQpsU2m5f6wnS9lrae7iw2Bhd0P/6i7crJdvWKQPVpAQ8g50LASk6Xp5TSABE+fbFiWd3m8BsubBCW+fXKhSM638G9BZ3Adw+2fMcucTNv2GtNzTW96sRPCYinfDEfn2gQKTTuTQK7gB/PnVKAWJCyC0GbMiA33Lynh4qnN/VSuN+vaqgl4wTxepR1RgFYncCQw378mXCrLKY7fTj0h+8SMurbmTC/88igNnqtD9NJF6guz6BLhBkZj7SX7Rhw3HYBMgxMmcN1ZYBIgM9zBNZvMIpdbK9rrlDIpNLR2Zlcgf7nNWA0vsOizdzffHpbOgtvYi5fHZ17ogzklZUaAsdYNHHt31S4S4QhXL+8EdqxTO7fp5Yt2CP4rLkwqlRlI2BhcGHM5vHFx2FviPaFX8su4I5sJebLxa7B0QY6D1VfA7DtTyWg0YNoLShj0fCnWup80LuPVzYE5eBOGwrYXCDZjw8ndf8NyJ1nbcyqhhtG99/pdvjtCZ9vMSYRQoVwVtRSUYKs302hPk4L5Da2NHjgu1iJyJ9r82nREfkKBvq6JaJ6qdCVolzr49qjfsOxfb1GmYjv6BsG37AkuY8efbBc1gAuZsFyG0d4gvtn9uiD5+eiLxTl0clhR1XlhfJ6Zl+XuRFYy+/E+CS05hxnZG/Lj/ZxZVvCbBJ7DRrCokUerQoQdqzSjm5LY654TE4bkdvyfECOG95WuQEfaa95rKPFuv/cZqJdVM2r3iwdhvftb8Qjvk+mbCyMgNyo8VnKGVYgCi/Wxn2nrqB+YP8OBxgb/eB7D0jcYTk2RyhCKrahs5bWFGSBlZdnAPTFAcKGSG2F8Uf3Fgsrjtr6Ds88zESixu4TMZojwqNpgEfuDGD1LZPaA/r9hrfR63GZTxY+k11VdUselgLVS0zEb9Wlk8vcjaZ+xDCx5/O0IlOwkWtFyWz/6cAsXFYve0OT+JioopRfxXO0OFd9uh7G71/4NPhVV3QaZto5+v33KmWBzlBVfkW4itXwnn8oQKkYhw+57/3SyMwq1eI5fJiJ//E0XpzfgzDD5BMvQ3iHdKw3U7RrC7Iii+Q29YCRhkJrM9owAxMCiDuyibd/3pYmURIpwgk2YTUIu6yPSYeYF1c80caMmS3ehR9XP9qQdJPdVUgOjWp9yeiWdMChbThxXfQvfzDzeGOQZcic0Kgg6ELyEKrXzzE6ByhpnW9RnMEVEA/pkQeiLrVvKNzR6q5iUMWdw8XnuDoJoCpCvWijc9WjJBCT+7lwgDJ70kLHs3Cpbp5+z/C7pNo1mVDGj437BH0cHbzUQRC/Q32Y8p3dIzOPs0FoVuDvAgatqC0UDPYgfCvtFgil0iXxCL/ctB7b+a+EmtxlrGPwyLbGzczt4KQbvJkomxGPQ6Jyi3yDSKieuv61ethKSIUj7LPrytRlkzs0kATmge5Fhoa8YqJ3vSwBU5+DeqfsO6NChsG9ZMyJIuI8si4DNgCa3J58DdCI198A8txohjchckuA4zdk5kaF04anmOXybhoy8OjHNek9qJwrB1Wr4hgKiRAZTvWPlSDmrr3w1w1g2S1gqebhuB3836pPb+8owC7DNfI74Qh7R+tGI23cc1+E3S9QrRxrf2cioU5MOj+qEXBTFEmkhuzz+H1HHsXKmqXQWM5YDuOLInifVdEUt8whG8VVIbzb9eEipW6O6dq87IQze86rtZBEX3etomhvabrrBbvzxqV6gYBzg7bzLLqmAGq1QmopgGjggfWMxIdWDAqmDqtJHg9iZte5bGWegGTGuIMhOgAZA0LgtVBIGTa9CH9OJWfG6+I158pFJOhZwEAgKBA4YZOmyH7ssMZA1mJqWbZcTjMkTD1wXcGSuwt/umVaU2D9WOTebF9m6lW+ASeORj88M7oft/sdFBtPHkTedPLZfC2N+Ep5UUy/YsOtBmqFMA5uBXQRP3ODjsRy+cJTONoae3GO8h68aGSp1ygsZY2h+ZaCzj589DZZUKjApJMJ931nDv6a6GIQDaAQghBA32Dh1dpeaIYGfoUUOa0QvYll9MA+rX3aHewsbEWJqGXO5EvZu0O0i3u8dhUBxrI4AwCVubq4BklSIZgtwpA0Mm5C4xYb0ITwAcC+ks51qTrpX40Tlm+2Sb6vfGjd5swxVre2NN6MTxGG0L11kWjgYhwrRh/wuzg0MGOUWwPWqPuNtrTNNY7BZyqmAzNPNsPse7kyG08/iGufXaF9c+dyqZLLi4tMQ2oNzdRYNooXAWg1doFptDjpsyLKrIUTA85VfcDvJB4H9ff79mfEAF8tl2LIRju+mExn07QP7pBeXZNFEjLqrXCm8UECHVpVDxnWtS6LoOrsWpgpVTEqBsD0v8bSq4DA2iHyN7KYd4O9h9deMHxGPwpUhpTpIUdlKQEVc6He1qRMh7662hfDo4geU29R/ksptF/yEDflHeywLGy67fcmIVPkquUsMFFtoLCeKum8VX0JRIFdZHtXlssIYie3BtQWTuxVNYwprZLrBLIC+5vAuED6jopZ2bMuM+C1pd4pOFtSfLjekozpO0mG3fMnSkWRrMm50syKcXMiP1MrC5a+MGAE04m1fIcnWJjEUsywXfTLa8tOwK5572IT0k5P22rJkUQIoiFXQPIyN0UijY1ahg4U8sXznRKJeShL5bLq03aJ6lUIBpUP9IM5RlVfuZ9/DV4LJkO6XU6Yf/4bV6YutlWXUdSxOSlDvGepzReu0o8w9aBgYkAHyjr4LjzLuiz+nIeKi+SCCkeNVKjl1fmL0G+OxR191AhVYRvBJLwrozOSIAY1rh8ABglKAjUoqnU4d79Hdn0CcJM9AaTtUuBqnAK0uYTyJdeSEHupuZZOVlXWZRmf7f/jtvDailGHlF589ilgqBBNfRuzh1M56KxwIOqRJD3270xQ4bmkIYyL93RkSn/4SYAxdYckmHeh3AeWEDb/sgbohgdU48yHA6sMGLIwE6dsZuPwsRccl/skM0wuupH93egoTpwiquywLnSFwKSezVAtj+gaUkZeUtXyt9HP8w7KTHEkoXBtJ6sW2KPXzq9bFEg4UMNYV4I810jgKQyQsmnUhS6LwHkmdCjvt9Xn6NZ114ZRCUcGpa9q8b3vdFPkU0obTcR6n846+dJl8X/CkM9UrOdQDYbR8kEpFMKtmrbEFeFADZU6Pj8KT8XD/BhbZ8MHKEeGwAdkbd1cW+uPqj7hqSkg3rU4JAd4vusouDb8bUU6FSz3T+Wlv6qZidkIoc3bkfeFMapTPLuBZIbHAQCmzXMsr4PdLNENjVKWqmZNm+/x7ZVOksYak7noM95iRw6fxDebRoi7EBsLwQsnCaEUDbKxQtJlVm9yPY+AomFcdkeqOeaQM98JF/H0vQb9OudD0yqXh/LnxlWrfJMv+joSKFx90Wmg7t8KyHyFvXliL+W/CQEPLvkgmz5+reO16Fb5pMMVB1A1dg3UqQ9TfQBpO6VVAnyoW/eavcZSuLw9aW6Ku2MYz28EErMLFk3OUG2YyNSeQlmKv3r3ub04uh2II04bmrsGqEFZuKCvttsui0A0H2VC4H43mxbTq4Og6wfUvddOy9MxYrP9q6TDzg4aNfKwLor1PhiX8a65zb8ujMx0Jz8RpJz4hi1hV9NooB3StReLFdP/ahLYOaTy60fX3C110vjDRPjSdz8/p5UgHBOKzQCfsbVVbRCLR57vCIdqoyRwGlW2yb3TKc2BQDA51dlbyyNrryVRv6GT2kwKZ2MMB9d/rMQGjvBwm7QzviPWIEVIVtfpmuc6E/tFCOdyc3LTHV3kFEFoDT2Kn18FZPAV+SEW0HgTFEOaGBDJ9IKzmdOfGsqFLgmcnXb8SK78X5dX2j1dxx8bDxErmL7VSYDRprJ3Ow4I0XAYW4rUhUT/CVF8qZ9RwpoFChmM7lCD9DCcU4sj/d0xFKIxqHUNuIXL+8lkjxWvMd0qz/GLghMl/ZhqeavDNv2IRBmpVm2oEeHdnEZ9s37q2YH4Zsivodvqq+feWSvC0vKeGOoCTfnBw976W3T/ckGORiU14v1APRurAQFK0mVfg+HBxgkDoarSzpKc1Aybf7E8VMONG7Xcu/IiY4pm5PSpo8bGubPO4nLtMESLWxxa2Xv4ocNMqIdDlWfqLpuB9B5GDotL0LXt9G8iqKdm2SY3NZva9tZka6CVibHr45aMvBdVmYjqWbuFvLmmgNWQITP00GFYzAOZguzUi/4PoKK1ek8ISVRxJBj4sdM0/Ya3SyHRq/lU+tKqIfgt6w6cx186FMVDav3HS37TZuZPnIv4kwEc1Gq0su43TJTLdRvSC3ViskL0u3QOu5qzTcy7BeZ9qrq+2yWRIkiOlg1lw8ULDzjx0IV9bS8y6maCGa/drJ+jYwSkH3SyUJwCqh840zM0BXoXlKde2ipbGuD3bm6hl/oe1siMz22XUji579MfqiS8JaJfkBhYaOZKXFMncoaTgyNL/tW4xmxELTM/MxLnhmWMPvsIHsU8WGq+2Kjwj0PEcia1PShQjGa/bgZZHO4BDtXaODxGCIn0nDfGSZzoG1GakxgPJ+Is/dHxJ0z/HyD8kv8VrByBMA+fE7dYkUH1Yo1K8M7uBPdHu+IfrpikO3lnAYhqaCJowRJEjyevwtnT35txcmmS2eZpteY/GNxwf8kODuvJj5XCPLud9rHif8p1a4SgYdEYw53Cy45i34XbZdelbiFxa24nnrQIV7qMyh1vbNzRqp/AmOz9i7Kfvrak50C0voV7Rp0mCgHSTx4Vx7fFrzaJX4a86nvo/5V6zXaL0/kdwaf+RZa9ETVu1Xv8DmMfT1R9ecGwKG8Ou0poYcnwdsZI9RTaYZpXOqBcrkBe/K9QtKwOtywKz+HKNyv+ArLjMQyrqGVp0wzLLM6tyQRMemCM2TV/xDG3uNuZaBKJVDHgAglGXuU8TjXB0TQ5gf5Mblooh/5zWw916VtdY0z0Ilx/4RRcwu2on7s8mc+VjpfwO+aLtCDaDNGVPYiqNgvf30eticEwf9lUlMSGMvf0+n63x0ouoIGwgmwp4T4JabIQLqHFD75E1DggumLuu/sSNGXeha2rchCf6sd3xLCWpc8rwA8nCZsj5oDYrh3qg94Gy34cJ0uFKXH0EsrFc1hEByXWP9xSZLds/6TTzbFnYQGXNgEa6krjxFQV0fx+eX/eceNp457Awa0Q97wYQefFNDP+1Ntmaoehod1XlZ1Me9ftuM6fgpepnND1ukD6t566NQPNYOjLVEzvf5QWoRsEh5hI861w0eDEkLc1UHvxN2APIuWQ8x0ZniVq17pEcFbgnJtLPP5tOXienJ0iJu9jipor2FuR7SfSlfg/FL9XiXE+6sChMtrdK3Gvqnv4wE2JV9E+stz+h3BKcSU4oFaUmQlPuolcE7Svbz3YxA7xdWg731i/8voRLjqwQnZ5zqZBb07jbHBqKl8sQ42G8xuVLvyg/volQd3dBwplrg/t+IGki9Qa1Ffxjus57QiRqMiSTpHmLqvD9E7WySvsswzEWJf5nMAwZ570YHpHe0tKVfFU4FgdRoSeaBDyJCekF7uVbJl4OTW6OC5mqcpm/c6+rk+c5yBnlFLU7g9Y2G+zvjobYX1tkrQJAQHAmHzjSLcy8qXf9+1APu2jA0yUguc6kZRCc6Mq8yp/VsMxl43fgPpHJrd4IkFWrwmHDjWVjMvrcrLvVc4ltcLBWRgLP5N79yx0qDxB4GQFpoK24qJeIR36zypLpaVwPukEl3F1lpScju4kxpIWzvqqI3VqyCSjHFqwBpxLF5npanM5X3Z8Ek8TSNY8yJCWdOc3FmLaIWykOP6KKBf+lQ1FWRIscYdWur4CnhQoww6ps3MGPs/faah+Aqf3/kMJVapIw0juGLTZv4tgLVC4tKVW+rErpN8PEXrMYDgaVZidGtlYbeIrWN8Lz5w1gdNQhZ8CbzOSMGIhEbTk8bxPGRq1tWf069ZPeIcdOUyd2Ebs94muM2DiOU1aNiHsgKLiYrJNxeOASw+RWC5/W99NuCv2ofMDz53ZAm26V78U7cpd/WGxUEexZdpMxsMOAlEm1Jd2jBUqlbCEkWE3aKqVM3T3+IULis8BGopLSE2NQr3+mwZPJIqlMl3O1zjTc8yrfXP8+b5qoQbu6LgIoDJhjEbWpOU7jHk8xV6y6eEQ/2rEBoLmon+A8NNuBLWKJnEZu3yUHdyAcs+bqkUIQc8opCRIwAPWtYurr0f+gYHnmtWWqb5WVB5o5dZvKD4MvO2738do/RqUpqe6TTKftQsfj8TGxdWKL6aO8sm4Whz9s4ITBJ6SNauIh+uxU9Z2PVcL4czT4DrDx8JcrYj0K+nTjEAMLY/q1eksQDNPKlNQ1ebBfypo6GkKl0Q1W1wiJtrOE6m+JzAKRmMcMmVEMGvYMQm1Pdk5x8/6ofmcq0vhDkwNzokFdsU0PXQ4t9Cz88KEOFetJh1YBh/KPHvwvfPASPgy/yj5Zqx+ZpbHCb9x+GY6ZGkjkSw0AZ2YmY2ClnfUJTzEiphIqcp7ohVpQN0TTybJEf4iyVs1494Z1GRu3zAbvMR8DuPJ822ZRavMMtYjaF40od79pA2NJM0OrnBn+cetVs14jFjqsJlCZp+D5Qw4drWN/Li+K+1JWJg1YegnjQVaIJjoQcXmR7NLhvauQWfJhGT0kOQQ76C1q3cHu3w87Woo6JglXnceXH5LKjbBOh2bG0NHEoBTqplLxWlzHwya/m1C67CAXhPCPxnaz3YXqAM9F54m1Lh3AWTYrnaFWG9TxdmLbbX0UPymk1sEs15EqUEja+5E/gN6oiORN1YXYyi6m1mTWmhF/YdPgi1A4sKL9tbUzCCEVTbsUe+GFmlrbmDiJrOYhIjncvdQcoq6b7Whh8m23spGcwsVM5ZM4w0d+v/cEkoQMIDbxjZnzbSNgOns2KRftJZ6xDi9ZAGsz43BYgx5opWSPt2E3lri5nU/DuGL5zUQ7fqHQ8u2AOp1Hd7k2Rf31KMYj0HvguPURoqJyzN4MuiUdWW61QvjeEsPWlk9jyQ2ARSr4e4lauAJqkry5vifvmIfSfYjduTzhSk/wD9/24e9bq3C8Sw30B63JMzIV/FalT5XVanq8A2hakAAbx+kyNo9MojqkINGN/UfNbwzYI4lmNoceKAJlEoTAsTFMH3QVHrmUBgY6PwqaUtxnBEKj9vIOxzka6+PDZpxDAVqWAUqNUBxb0I0ZIh2HIhX1R5cYkrvEQMsTWuZEC3npbBiGAGZCnlJElFuuM2MffnRV695LOtC/TVgdaI09S6lG9qCdj9XXihxpnb88b/3jooRgqIE8XDuXlfgPMVu0E6PY81wMZ7S7mXqIFpDDhJ22t2stodOmVyVQlgluIRvtMGH8PPfY6F3jMxeeNIC/DDmvMDFh0dDKW6TiPmMzRLmTFicyzsIWkfJLRAnprYLLAx6jznAUoazntze/2AF/7qUlQna1FJC0ibwO+700Nbd5ooeY5ZN/oJ/8r5qRjIwc0DEdGve209e3WpnhXMCk4i5Fg9SV+pe8woYWqCcjZ/3zh8V4bWGPzg4yEoUqKsJxegAqYEM4Sdwdjv+NGjZQpcLDnIFg8bOa3Fvm9MlQKViJRsldHi4oocBVG4cCD8CbU8t3HyF6bOKilQWaQf6PbjQVk72ePp98V3taS97o9r1d+eIvGJqfK3I3Cdt/UJ5rZDhYk3pf01drBuiA0hGmXxvxPrm/JxJxn9CSZJygGw+f7IBeY16yjhQeIphfJ3mwTdvr3Ta4evcK0WKfSnQD8EM0hftq8z+0L6enekcAHDf7IedBzK38yH3NK+/M8R+nfuGNCiwEEzw7CuvdG9BXjj359n/WHyqnMrqZayKZRwlFPEhST792ByfFIncyviA3VLoE3ecXUwHdZ7geQ66FJX3wHuDeDsu0gXdbqQIqWA3JGomfzb9/297DdkwCkHfvRj2GY8mCbwp7+Dpl+ZXSCu8ldvYNVIZ9DdBPN+PZQmgdVr5X0OhdHgvvG39SvK/fmhty4vs1fgBJrAMSWcIsNx32WetalJIULuPhdkX1VM9k4/ZjBtiQNtQaarFFvkbiqCuDxPgla9+hTG4xgX2C2xv4r0M/n/lIxJsmYBShtFr3BffXxL7npzSjjKuX/HbsbjEHt4yS90hvDjgC5EFIA5cwnmlKWHz/DLQUzCN92rUfJq8oSvyVC1l/7YXx/rY0qKrqebDfkBwFc4VitSudd+Rv/hMpnqt4EvrsAs7sJHpWHwSa3XVNEEI6nEKRfZuakaYQjReT2OMdQLJzpMwCmSA2psQkedGgj0ftfxvxwlkFiwrbPhkCcekcYqFIMOyFFMNzCYBj9qm5nwQrKev8aseeveE/rYyFH/LGqUsQ+meG1LwRiStS03aEcK+WvsBi1K2zNUoHapN37rEQmO8rpxdxbdQX1BbuNQMWMdvRK3haLB+yyKmxMTRHmqBrmSM0/snqYQ/dltXBYj5Nq5geFJJY7yMNqB5yGumIapiHbhaJGK/vYrZteqjetd26iZA2DsH6TBvkCc2Cm9JmbLKhGquzY3MEOIWqZoZoHSDRrJoG51kwxa81dNoGOND2ZQxsSoodsk21OgVEGujqjoEujMgWlZOGqZ12QzIRvUPU7D+gMVZ3ktNVxKmAxnU1mHq+PRfHN1n+shfbcZj6lZn+Qlf5MrR+JRj2BvMZNFbPQ5ZRt4MM3COZXgi5hfHqN4cXe3wttl7+jo4wh30FfscvUXWW8P1ZuhkYwrWgJyj913+SMcy+lFJYUZcgHOOijMOXURA89vEGR2UC97PBAk4jZnE3NmoynhfQJZSfvkFKNwWPawUGIQ1yBzVw3HQUpFMGmQ20RMb/CKrRA4ZyJmjMJdBjyPxQh251sgHRyWpbgA4chEBVBN6LXPJX9KjKx2dvsw6GAOSM/U+s75dTsU+KCRiDF+8xf3oBeTW+NheAAgrbmiF05ksdQWTVZLL7YHg53DA41wAv6eI7HFf0QcIn+R7VViDkJQREwrsGIlz+OkUi9RkFnRJGWocxkCsPwaBTxFfBrovPiKd4DsUXakypXCre190+aNv1sPYqfAqrHZWR9kS1N/0QW/m5i63YM7xqeh5DVFu+lZHHXPUWFPYwNyxjEjBjsL3xEnWL6QrwnXV90UYDHV0s1Qqopo1jeiw57qB1FtcpWBy0UGGux8KM9WiuIzppPbuAm/Aw3NIKyUTCKRhBoC/l9cw7LQB2q5YctmSsu0DzmjW8QNAuGYepXbkYlwaGz2co/bMtZU2MDtYZjJQlW5tRkz5uOOHsP/GIhSVJFDVm3iGCt3ZzVEBGt4ygiFnQKituePhsHHWaLKBY4Hf4CZZcr8LXkSD0shSo7sfRZiatB6FNQdt8uieca+Z0o2DyyKE4EbtVuZExkb2cskQb4E0SfG2DG3rQx0360urElw9UZ8ceU8CZg9r0KR8tT3Wi3hEAA037vFcHb3NV8R8acI930EIJHefLsKCVuGJbFx668g0Vfkg1Ro0OGgU1HUTG6e6JQviUNq+/A8Z/3v54ub7ebFikFrrJGhlB3Ktc3ZcSxTlIlPQkBsYorMUzJsfW5VuEjGeKPloGY+i2nAVZtd8WWlDZsmuMIxF0F4dZI/Wki+rjIVQEy+e+vXK35m0dCM4SWddTQ9o/PHqB9YbgSH03juGI/xi/Dl7+fG54jyeYuFo3BX7GHoD26nstWc3e5o6T1XiqDz3MVarmzTTl6emssF+sN7hTEB3afK8JIknUUcBK9z1a3fNIVEpX/IXmQ5eggUTuXjhwNEBW+ZYh/sV0/p8KWsQloDMoox/bXXu1dNMckXxuFYKJXMMPeH6snjahJGQDxm0o230t7oXdSYw+bWt9YlnCflehcA5bZDvTRIt2KTFf2fOAQDxk7fXHAHT0w9WsTGzoctRBuNPtVahVqAaeFeLfYstYeoiGFGCu8HxAIaEy3HlJ7l4Zm5F7OioOMsMe/DAlxXxS9SzNjS1RsuVZXcapTAgX4cPYC/jJgk5teSfW2y/F84eTNO9wb91TIWjlxLccFVDdjprM8Z/Ia8UViMEyMh2O+ih8nnTsIkaLGWSAMLRHGvlptfgYD3NwlW+Mcg4QUkhZzEKl+guV+0WFFTLb+NQfucTKBA99mcmydKATnYKMQ19/Zg7ncaoNHOv0wmYDkSC0lGSUMLr+hZU6vwWKhyX2mDqswBsclwaa5V17BISJifbu5T0DMYPkV9uzVuXIYIbXu1ZQfQj68BbbMJM8j6TSTZ2cKnQVi2zEhjJiMG2Uhb8NztPhtyi5C3BhwXSQb3Ut52C6gdaaVZ1a/hbklFrTuu4saiLZl2r5C7NBrW6v4DKCrvmOSBMWZmE9WOvb6QsFfoxIQMTl6lnJLJFcrnUJeK6ISLvcxxvGSJkoEA8EaNR73F02PdRsM/3nV1j2ZlDEpYLso4poSQvaQZZgBRWbYXhR4VW2+RJFoGAjcV70cbQjXNMWzztVFM9PT4WRqDe8uWN5sTuNWY6DLxJmn7pgNsGVikLXITP2jh0dXesp2yRJ/0tthoT7Pw7qlm+JLIS1lcscCp1b8CqaFWRM67IzUmu1zJub5w7To2kntkghS2e/1dJiqfVf7Hz4e67mGpQWHAUVrX04mlRPio+mobOyDjrAMWnO2uzhnGfXapgzop5l/+Dt2E7IHhTFTKigTnq8NqUuqROBUHWY6jJV3jdx9PXhpA9cTZJ/vt0w86wdwyG9zb84TdaS/gcH6kV9p5GIBr5I8qsxbJe3uXunyQHasgKo+KxcUUTdD0VOi7s/rts5UfohWOrw8usOaDqUtT677BJ3lZflsL8qwfvO0lEepXSfbJOIyQxiGQshW7/42UkCnCpug8CftzkUyWOhBbMms26eHoLfGdyLODSLOssbUUvxC3d+GirMX22au+bvcA0u3/GjiQIT5HSOctXdKMEcEwRLtBnEXxlJuq/CzvGYtZqyL3uMxA9AsrhXe3HnOxnx1kcOwR8GsanIHfTvsQfQ8n1jbqm4spcZr/bswbVsWeLtZKElZ04S4tPW0IhXirSyul735Wh6aemvoEHKt+IQTZ1IJS9OqSEqSbkikR9IfdiXZ0FnE5fxeYBBH0IKV31N/daiLlrfZd/PBmTDrQsigfH8GJDlabNbsEvDRyrysB0bKAgsBPoEwLiMvp8KnLpr+/a7aeWPrcj2OICUoFaM5zIDPyJg5XwV8kOjUyTb4qrAKLnUq2RkIVS/vVtCEz5lTUDrXqLppy19PgIH/OuEYut9O+toV1u1arTxKLqcB14KLF21yyloOx53gkp8YZHsDRO6YajU6k5V4CU+JhFVeLoC8iz9LYtsl1nH4jnl2G1SyUS0PHBMrM6bntFeJODGdbbqfH7DjxWbUR5XGEFMCEkjuq+b6dDDhB6R0pQo5Js9W5hK+NtFTufWuTVSBdwe58pxcEXiZsFLjQepIwv5HBq0riyVs20rV12aKCGujls7EzzyHrz9FHKVqTSLacC5yYg0Zzge9kNUYb6OPGxqhLvBUv1re/DpdAgj3AqiRvH8b2CC/KFmR1LfHPHKwC4WAQ4hoDMQ7EGczue4/bv+Nf8vWwTtdzAECUZ49yKycZeH3VW2gUbIXrPyMU59+13NMhhevJe0bpCo5mUD5FxosLMXjF2q7kxPEe9xa5kP8KpU8t+dBTI8Mxop4zAsIu0IWtt8tmp/+IiVZuTRshKJvGnewcMVf9/gVCYkiVidFBGct8G2fSICJkOXtRPQrxvGYXkBHLIoc80lCd2mML612XGFOptUeUsoZrGy8Uw3+MT5QQfB/aNlmHxnJ1OsuBDrYvrpA8BaV8fo4Bvyv3E+PLEwANsic64E8lsccCl2DeplZ/0/PJa3DGOvfWthaZ53wm+CUFsZrOTORrce+lNkHeSq3wzYdJLDsKyrYMHxeU/R8hhEzdwaR6+RuNmTtavf1ZMM2ioIu4uHyKrR+JNP1tnyka9jaBYGgz41s68+e/muJ7DszeO7xeTidLZKrCFx/ADn6mcNwO8vCOBrl7s83dYXo/NDUzkbxmOfbaEXiuaBw5Rxjdlz1mDGG3iVUluAoepmDQeEyg1GafdYGT2QjNKZPKRa58lw9WDf96osOnEsoKOSsMNuNvfzrIUnTRFJ7aCKNItcZklpXzaQSDRZHJ6bKknlIMePBacXfRBOXqjE8IpW13gtJtMQvWznYjR4xb7x2zVJFoDjtVELFpkjXUAU5WK/CPpK4aJrbZYbKKAOv9+PVYtuyEf97c+Dg99ZKefb5AhfihPatFMFqBTwJzfTP5bHZZX665bTltUCyBIGZT927G7Ff2hdh4qOqaSOeg1QidtulGdC327D3XKobghgWZnIOHBN+EleVMRpAMKtoXOo98kAxUgiCFnDp/0aTc++Xd5StB05+7KFyvELjQMi3qdu3Q45X3jNIy25UvsbpU0eDPXyRnHVBx0vr024QiR7thNV/bTWawM4fisb+TAbKzc3KT+4K6X4lPI7SxnNdT4bBO2fgJAXyez+bH/nfhCBouDixAcBnktmc/wPNCM+nS+AidvRYVAV49w1K2nOTPaQC/yoi6sEe4LF2uZ+kFx/0cyFU12eHLM1zD5uM0bVenMCgnJl2HLo7g9BniIzr2W45RLJEliayV++XXq4Y0hWayALzceC+rmShqPBGHihG59hf5NAqQ30iFzhEB6p235bQumAo2h1/DDlI2Q/uiJ6bkBR/fL7DBNpuy15FpJh0OL4kCWeDQOogmpdKws8yAH0ZXhk7wndgZUnW167NLWKFYSg2ZpuNDuh+o1OQhZXcYfAsXErsveyBqE4jHPbqCwdNbmpWmK5KiYN5LHysWgj/cjUSORhSwGjUjfhwkblIsLy+CVnWlBloP1S64QZRrNY4ynJxl3I0gEhOHKcXbankw/GDEZ1cUndufsvvfsQCxd03GqGGe/k+nVmlhgOBrsS9L2y1KV5JSgMVR6SVvCaSkNku8YDYKG62fne1J2vsZNTlAj2xSmIxbNGm1kRtrenvrkZSvpfBndJUfk/5hr7x/COkiP7eOEf9JZ686dWSLn8KASkIuKMcfmfy18G5N9/fhYdv7/cB7ROc/zC7s7GPosdrX6eElcmd9LGjQkKbdennfjCqkJLsQ/yKLb1Lj0ak3D3BLY13hyOmJ3Q1vgES+2zzFA3Chzxq1KkUHIgPgA4hImndH+OMb8NJg/UTEFy2cQM21Ongp7ZW5wDock2WKRTzTYBqfqSV6PBDN8Bo5AyDA4/AWGIfPbOHHx42LhmCvdl1sS2DaRd2FnN7G31mVYtdURU8LhefCJmSQN3ze/q9AcAujW5ZCUzYGZARMlgU0KxeZSwOgEg6nljcr2CSwJTNQyOky0jGWfxp4oS7w2SRKNvN+naSd+Z2SsoYgrCIQrD5HorZAqJYMzsJRSFpavAd4c9SPh+aSMQiA2JjetbcI0mPzPHMhpPFsFgUeF0/i60/oErs5lYbLVh5FKUPSV994DVjlbXrGC7mM98N+NJLVDfX1VcZZHNkewi3yxF5vtN2Ii0pSMNnv2QI3f8eEMqcC1WbC7m2yK+Vy2uO8v7K7sGAm0jV9l/Yf9NDy62tF8UtybORokKxjPIlJl0HBCrJfFYOwAJjGkKJgeW4aiEbrH6dXCSSCBnSJukRlLB2Wx3oGaLYqkgyTq1tVQIzyXyGF8iC7XKKgCjGJmGTthGCmjBVskrUB+31fQO2aA8jfbsHDNAX8L+nWZR36dv90eIQdRg30bsvHxXfgKWDUjr5CHMWvU/ECVnL1dFPu58o5mO/FlvDRjTBzqqhkgmlheD11lz25n1j2TSYm6Srfj/1d04kh3jmMBUXuBK05acgyvBPaiqbQqxlfegaCAbGamA4hxq3qMnhgh9eaG1BJ//5F0lLaZt5WbXZqMm/+v6SOwsYr4zrRKyQqXt3GcBi8nvh/z41qvVnAcluLoZ5t+8FYE7QHuSAel026P+ZoZQXwrhByLbOtyF3qy0Pp/lLC0nhm0gEPM3pSRlkdwuFTcfA4diXS3ESCBfjzBbjcCLtlaMGw2BtdRv5gjnfEROALQbhn7L8P5bbWHbwgqxjCduy1YCIfJBR4u95J0VgeIv+WPQa7hIFT8/TIYqc5YgaBPlFIFZCCTC6T8AZEWqxoUBrCXBwTbp0+i9d6O53nmVkGvzdJDvu93f2viSWf62axjpCH3uUtAM8TBrfAJy+kecVAt5RQdgOho7v/sSwkWixUNsxQ+Scxy/hQmFcurNw49F185HP7vWr9v8R0rVw0TNWmNEqtrtn+gsP4AHtIpe2i0eKkgBUcsvIvKNDBXERvPlBSKtPjNURAGu5TCP6moOkbVdimxe3u+Xxg2v/FDOvj+8EOt84Kz6u9ps6pikJSqqBQy2rqTurerkShU5Vq+BndJ8wBvldyIVLIGXguyTNQ3t/oPBIaWoOvAXuFBRASQq74WJAC5HhFnSqfliej9MLCUh99AZqXxq0rG6Q20nE83ljzuJNjv8cqCnpt5YVtSBbQSFHonWMCxy9yMM6ngrk8W14jYu/0L2LARPXzTBiUIo02/i3iqMX0e3Elbo0kheyKY8bjuJxpaSt4lnO8ZVbq6QDMfqgsMdq1Vr4w1ZhqZBe89JGGzxYL5ZkeXw5w69GCG9qiVE2S6M7nKdiy4XzB0w5u0v1Nf6lB1JCIK/OhLL+L9WF/DVeVeoQ33bTy2zwDVjYTWYqfGLGUqWlum7bEDCyTUcH4PEriP2YFqpzsyWdRKo7yMqLNhyoJbUl4cbqUuSsx94DW5YPhv3MwDCtFHwuTf2Ol/rAdx8xU83M5GoSjAfMrTWJQnCsxF2Bt/+kqCWd1RCOWgp46hPewHdS11DxKYUHR5OcWoVyWtxCVEcJEG17WNl6YsKVzXm4vQrBw2v7NOC3fhM01p++jjRm/3H1jEqT4oqdNZyBQF3to0uZzFkaZjVmK7yC/f7MlpzG0mo2oIQiMSKnVIuRqtIdjR7deffP9ezmsxE0CqX/kcqtpgM/lnopNAsVu11epgQQOJvBBeLEVO1kUw87f9anzq8c9htIrwK3cJvU6jNMHNST1oGoQMrIpY2yoc/IpFi7c3JmPujs6ERpZSPcbvoJ82J/w83Fev5kMHBbWIhkruPEs8EPhgmdFq9RzROLn82lbTtElFxvuuHsoUpnhDAR15OT1CZXS/1sYOXI42cWk3vX1Ak84JTPucKwf9/Vd2Hte0KMKw2sG/+VkET92BGJRRsJK83VdoA8ATj3fPcl9Ocbhlz7bkW4+P9KcE2wn1w3ZieS1qKbeRekJOfDPTqvfBN8EcSujR3GvpfAWFOwv6JU5YmB0qDd+ISZR6ckP2c8l2XPGD9YF+jbMq08Uc6X25RyaqNqXlxwOMO7bNnzxJEwkpV5xygu1+7gMb9QtCnj2MdcIlBtzbepGOnkdShMntLDYXCOSPXjKd8OJyThYNWlSxpBYCCfEaVZr0iFieQDDNIso8Q4INwyCHGR3ZSLEvwOEekyaxK2oY/QWyjN1JWoa0hsd92jBrLdapAq3X8w4mKB4dNyuy7lqSL53rudyiqU4174KT3TgtjriPH4fiuxjidgA2lNYfi0BHRcXAL/PmcWDzQACO7bFWrLom49B9xgSWywVZClEubgwPTcH+ZPNjZmn+HHd3QT4CiDarXBJkQr32Q4wm0vHm2XCCQ3DNs3T+I0jVPfzuvXZS45GGyFpaHbZRB29o5JJUFkD+Vz2+rPGozbAGMUX0dx+YKQLSzYg4fq3b23+V6AARMSYw8KdP6WubEc7XiopkhZyOu1ghghDNRJ3kW82ENco7V/cqNrDXvHQKMMr1qk8eBVSF7lMawKRhIGmLKlHc36vVRGbRf0IwCPafp1b2tk6VTURhOUCk5McsUKJEOhr3axDXlS72+PmiaYGfT5a87T+rZQCt8vHMkt9qaBbi6J8vAIkKL+et2rhW8vOf/1AuGqq7Vg8+/+SYOMVV68Fohamn5nThdJhbvNjP94I+DFu9j+gdPPbBMb/j4tmafWeQQ8qk8bX4NytTKDvL6gQgM680ZJ4mWcvVIycd/6hCtz7r/j1xyRqjm42TnNAT+OUD4wktTwwYRQk6Tqs4ySMepZTfIGWUDcb/0fpR+TKrIYsR48fU8w98OQO6L8LJ1D80wO8bSTPXGwSlOaYAKzi/RoZIi2iBGd6RPDEkpROOeedxdiY/nP0u2HJVcEXImzWTIIzUP3Ds3c6yjbBK0pJBOKjZtTUs/DjHzO7i7konmxbkPGoEEqK2vn3Ar/Sv9+4l4RdWlhb9GsUMm30IIoSQSgeFPfsSsaNZzDv42QzRHZC8DlLTW5hnUO7Yu6tmc/vB/xpp2IU7HGHbQJS7lxKxxVhJ6YlmhXk3o20v6yPZUt7b6d57VR4D/vwbJT6UyUm4G9h+Vu7TfC6iW4+8kjsdhrNSVFw31eC6LS/Az1qUf6uk0dkGjoj1nx2sbR288VjWDZ3E7PQ3hy/DncuOo8ExCdCKL5pjNqkz+bW9AFrO7MLVpdQuwbbcBgpoanM7dsJPcBAxZ49kK3+WGrDecnXzBOb7+h9628XVWPsvJpUIegQNuDyQwVLBUeVaQjJ4qYHwHVUWJBVvjelKHHYVekEsnK29D9oq/39RJTJwrDlJcEJ4FCkudpZOp6wMLcAkrVcjTDUEOpi7R+pC1mjC6nRhr7izwgBevFuOLfaZiiiatXiCxoe5B4C8IHnZhXHHGYAw4+leelcVdnVZCLKNDp3vw+c21dw47FZdfFZoH0x9ZQ4fOYSEP+wC0Yl0GexkAB0568ELQs7XHWOC90n189ymIwvJREMUDXVEFQ+0aazyWtzDnEebh9kdoRKvbCaLea8IxE1hN9ejh19O+mpnRe95qi1uBg5oh7J8BtPBHlT4NosFqgnZUapnEBupIGAynXY8+/g874Cc7IQtBcsQjD6JvCZ8loMVKTTyDkU42VcVCljsDAqofjUTdqc84KvSkJbpdqoG2RVVr9SMrP+jKfaaOajlEZ+d89SlhwfEq3Hy7Mmu91vqsWLKj8UGIFJR4BaL5Ag3lMI+47/LHOrZlGIhFIf1Zgm5FMe2QSWoT3xHIOBEFTulyUjahx4wgId3bJPNF9THI2GcVPJTfwH3V7bUfhgJtEa8JsM92I+kGCkJ8OtLTCcV6+ddqxJele1nULTxHwn20KOTJtM3YD2DmJeJi8pu2D20KbWergp7b+6PL4KfaPJ3lRSoHqCDVpcyJXkFWn67U5yCQxcvLX+KKBer789ug5JqwkMBEQ0t+3pa30oDqAUiOnvY9bioYlG33laHhilaTtIhyAOXOVgI/uffvRAbnbwZNh+wxUwvPg2Uql5womoc0top8eaCfcWS4RtjABOgO7+UdUHqdeRU6Pknfs180PmHxJxP9jIGBCPWixfG03NW4S6LWXeqRd0DA4mfedE1qrVmoBiaof5OtlMC9zYT223hJCgjU0f1wlRhVPMEO0pEVrN0b/NnJkwcLcHweqZr+5sxdloshEpqEQ4yG7Y6uWcyBsxux5c0Fbu2hsAXY8OYcwhOc9aiGmKqg09zuCz+eik/gcg7zBR649TevDuv7KiKJl2nDPaPhR61EItTHFSy+A8PTLVbfSQ0EZZzMfhyD1K5Niayh60qqWPauuWhGq6uMIfybCoU2COHY6aL5csE3aHkqN3u7vJ1UkYYkoomqUUrnhYZisVigbv5B/GMt9tvOJ93WwqfrFHVtDfWPIkDoXOfJn2qqK5lkmgLWPgDDLc7Qz3RIZimyS+KtOzdaUHzsZ3qNZtADB27tdQNhVCMXyG6DEjogJiZGxLbCG70HjPFf13Q4Zo6Z0IUlPeHm1qFxBb7sxWydhpjeb1yYVmVLRO0/EOHLZx0cMOcOKq49VxUhMU4oy3WWXz9vm70q3fKTPDFaTjIxKucrBrFky1PvKPddSB6siPaZoicMxjl02YWh1AvkzOrK8S6lE9GqeunepV5Yb3Xv7ZasoVPUgwe1S1Zfn4I7d4BUJeMqwijbfrBl8Egh06njsGIFk6Ex3mfv6gDr+xXOG6kyd3x4gIBn5bam66KYAXeGTOpeDiRSe3BsD9iPVLaoEn4kwR+zjWoQ61OgLPCLpRFGWQ4xv8LuoKp0Ccn9jHzyX18klOIeIMdFIbUWJ4LjusfHqitzJC1FegQf+P/qHmzqQO4YOZG7unKdRnzNLyV3LxOym6tvzaVHjJgN84VxkZ+jNB0tq7xN8ktvwLvPjJsi3/kG1NDg3eicIxkTw+bHrZTmktGAyKPW6vDShZrT9lO2mmMEtpyzxJNL7zRhMcaIZGH9zKDamE/pjZV2VzvM9eXMG0gKUYV3JyRYwbCXN+lSQj08fxOc/sVi/KGY8o1ovbYDUUwHQSZEFoZZHLhoYaw6EaD2uMlLrWTH5dx+OtITuYpeUfgMJnGF2PwKw+fSsOq4VcXMhMiVZlXrl68sJDOA/WknFzYwrDOnv3MtKb+tiM9829/tpTSGDQsg/x7UCoPN1q4ASi/7pHEKDpkx1PkUpTNx/JypxUt0sXSSEWKT9dPnd9o6tsdUwX3rAyXGx/lBf0OgvpP52PS7xQPhpB0r1guzrwm2dF9oZ3xhISR0j1lFW9zMAzG+wzipL9Pvkv0pdPfjPYI8GqSej3K5qn6vGMVF/vHtqF+vxzu4+k2qjurwHy3D9Bmkf5i4iwYJ7KRF8BppSOwAUWFIJGMDHbKfYu3fFJalzRSxTYLQJeptTd6qs5paeRqompNjKXPmx7YnieUjphnUnuxS0fAEy0ZNua+hB9bEH9Bc6TYdC6TUL5KqNHsIgUdfe5ZJYrOrjBIe6NHiuyOS00HWow3C2kEJAw+vqc2qJITfavHxYV/PL4Yxh6KDxG+C4AW6WvkzJf2gTWOjcBNNB4cnxKPeDjU24V9eCIjqWo3btfUBRNwgcuONr1dVpnAcP15/+wyJBIvk9ih04LHGm9uF1YqmmwEWr4BfzBdHHgeTsGrhFjJwPFuWRIJOeX7pHdlfIdzJWm37QKVCFvjWGHleEd0FnnPWHKzOzMP948kEmmlcE+tGVh/tMMogYnu/P8cgYLmaWEGW0y/Cd83GrT58cQ0gZB5Ya0GMajnQm3PSi4IwZD4EsfnZEWchqax0fIzDtfbdohGakVG/mIczKBzGbSYvQqeTFvhoxq2Hi1Yqmynrweo3k2lWc32I93KwkmK1Ub2peeBxgslZ2gQBIPWuWkgPRF1CJp8XNPvVXa/4FJBuWM9PrdvueVJhVeAIqmOVj6JGNqGksHzHcelmQSekNWF9s+X2rn4ilywxZk/sTdZOJvN2BAxWOrLPnHyAs/lCD5YZiZV07FLmbFryUCRcPRpLsTFfGNif054QdBAlcxja3Vs9gGQJ118UlJEVhwEVDkhmQMROR5wfd3z33CjgNnsuhfrMP7f4pDQMsQxcpfbVFD6vVs7q7d1LvFtCuw5FIYMIcivAdyVI8I1v4LFY52ag9OP4VnsT8/zgoqOxPnkcs82T8mDkFR/BFhb+R1SbgfXKfxeReOsUsuBjGHAZGIqxwMXbPFnYaqkee32ywPBXKVVGXXKhgccOinkpAYkBxoMCaBCtzdxr7XCXpMN6G6yoKqQi8bc/+p5ClUhMJo7MVwAIE6/yxVG13XtJkzndSfnB1lhzI67vlVqEaNtL5zBCyh/NQB4dzb31iCnsGDXgzwuAouLM0yQy/brBfLgCLEZ9sQGnTQOHWqMyUpZWNYO2vzBLTe5q2jOUEGwNbqKrQFtrHzwGIEE5h1BCrLVKi1ZFc5YXbrnq0Z28bOythrdwSjC3aF2lVSjQckwcU/9TzEl4eRgLDsCvigOUYLHxsojYDTMhfJym2m3fzAXb3tEXZVt/k2xtKXaqfJCzQyOeM53dkaaKEKrhe4+Q2jsn3IVT6jGFgvyS3kSYrTmKOGVkUcmz6vKvNaDWp20D/1toThXb6rT9Z1Y0yr6+HSxT50ESo/z/bosz6ojMnGPZs/lHxU4WKt1Gsh9XEvE3l8mnI8LVxUN2t68wz0n3HaVgXslBj3TyysSJKNCBwPhrRHlF3nx11Qb8bWDeaJUOXVuH0p9om6dNkNYsjfU+fDLKwlGuu5ncarIxmjuzpF7enHFBrps2gyDzLif1T1gHabp29195WUsZ47YA+VJYU0FF0AQ52xt3YicBqWAw9Pptj8f1QesJw/xeKf9AOvEHWd1rGcvAAHC4jnvvq9KHkvrN5xgINbB9vVPFK4PxKyzIJ/zbVzVfOMz8LD/VWYc8DGdhhibuicMVusFeTkjVwaOTZlK4DjmVNT8r6Y9ULLKpYZ5yYcVcSU1Krm4TZr0c8pGhuFBnLDg5o3es3yvC6+3KaSB+m0pJVADHFJkWGCN8gF+J7nDa6JreVHixNC/bGY2eu44M9Uve4L5b43+lIpUwuh5QxpFqRahIHAk6UPhkGNUWqtEKeQqwGmNuE3HH9lJtTjVc3ZM5h4Y9PlCMd0QTj5UKEWH224GPBt5d6zkIGk1NzxOAZaK2jhi/nlCQIJcyt+EfaG4Bwg1sC7KMCr2u7my6AjB2r/s9TWOUA/0aCmnyKBk8Jx9V4+YFv30R7IiRVk4KT/VfZhbFakz2SCQDO6bWu+tt5RkhOLbt2F/UkVHvXwfXWperAMAu06vzdb1fL7tKqggEyXZebT9KTyE7TFnzU771q43NKJlQLE0jXZF1u3e5FOPrgzDORPMet4TtXjtgpCP/6V92nkk1eGxwz5rPWqKLnjghVjuU9j46tB61RCTHkvJlHBmT+g/0+AqKHVVMtpy5VbSZxJe6OGkODT8O+k6ZRuOVXjlj7pmQ0mr/rhx8APghNkomMkYp/mFyds8Lj7/+lFAJrCAoe+DjVTezWB8iazQFzSy6IW5QqvF9Z6BF0kJ+Qij/zCpckTwI+V58or58UTR2IK1mRykuOcn4I5bbppFbYU9o9Pa+ZqgUOIcawd96hbGcC8Yx4vDBXmnxEpOxdTrdTsulKVRRweD34QJq4qcmdq5dg4vuUtoZUkIa6XOtKgDoVefad51polq734qUez1EgnzX6BYtpqS3Ij70RFMdMtn3tFCaAQAm7YDdeTMURJ2uB3j1syQlxYVbPKMSOV9PrdAaDv4GrRGP13AGEN6KbH5KPq8eCwxn1SxLO1+OMYR7At+Xhj3RHYMpCM857WtGoVrjGojjTxOVfH0pCoNzgqyAvOFnGscsG4Woo5UKKiWgXTrYTFnnBCE3u6bJBSFpAds2UWzI3e7Bsoef1RDzN2Rphes8tsLdgU1Ktk57CZuut+4gSyuAW2g4PlXQQSI0VeTJyVFhLD7G4qDfeOlS2ubC3sTnkCekC0Xzh1wocx8x+ygTdnk+HmSynFt3DT9xFp93Ks/XrQi8wZiZMQrKBuQevpGVcGAC+s9xqpQlbjjFdMfHVuxodmgij7R9hJOPZUByKfBRJH0ITOdEj9+AsHK46QFz3mljNtIAkRpDJdVLDFyXVReKNJgtzRtkS3RgYK9MfI+zKtufXbOw6kz4uGKnIaV41CiHzt2lenmqlWJ7i63KwWMBJCegVAhv/aiGmkdv2aq86YUAE/p2C+lfASK0fFcx07ShFIQe6cWiY/dAT005So8xKMPL3vCEIFFn0h2qSLkOMi7Qs5pZjsE6dAQ73P/aLwWgtsmQTe8SqsWWan6Z5H5TgxQqKxKY7t6ghWNK3OSo7a0+3NO0b1xHNaM7xSiH5BV+E4xXCLMqM1wIlv2vkP9Im1MEfOiRynDxxUyP3aa4aQJNq02VnYAARemhnxK+nc/fGZrXRGRTh5jey/Zwu5Vj7uwzyVRJddkhNiSyNWJ7OPQ2Jd89wK9bxsIf5DJvzJonurAeu+9F+sMWblLZIL0be019bUHWq9rYalLjMdaU6uLXdrKDU2d6q3AF6cbKg3CwT2bHFm9pke1DlBdSQBwzvnWxyZ0QDOTLbhxjwO0lF4jhlIGIKr3it22mpnweAwKZHPdur2wGs5wd3Rb+cRsoauAzO/uXwyC8S1fh5169BsyL0/QtP1W9LWAd1z2vaCUgoRQnrNwS4UKHuHMJVziu/Sk9PT7mSl3nrNycSJZAt8s4eE6XCdmexuxcQBrwmQ0kSJd9b6/aTA/JshjHM58heQ99t5QE8gLJCpxUot8qSLYSk9veTgyNxrKbJthGRB49I/uvTJcRIK+lcagkcCTYxB7DDnYEzPorej6sIeyREy5r1AyG/YmDngyWlfu/FNIH/JmPOyDWRm8VSeSIl/vLZ+2TeMurwEld9lFrSSLegtfkGveW0TTDtCEP7PsB4MQLSV4dmTkLT8DkrosyjEYVxBawTO80pAvKqSJhM2Ikobook9dhQDBNbXLIaQUM16wmXXcxhnok4RsirOed+c5W6WaF752KWXmNBQQqLEsV0zrue1EytXVQADvpHOtP6/cFwdV0OB5AL8T9DHW3TR5fSiwigo6A11IVQ0yfV1Ck1HkKxUgh2RtJguNVF0hpBjCERdmc71zBetSvE+YMPP0JKQjZiFa45ohgfNIm+7YaXavAORU4UljTLQYfpXRXIOoG0ud1DpZEUN6nKlyW8/l69kz0JJbEqr/w9UwIa2mJRRORZQYCpD7vGyNLLaxy8+yRiJ6an4eoN0+ZazzoQUrH73MrW7JxGnG7F+6abQ0oFw6KJ8RclucZy3pSA2pbf9IwwbfmJQ+5y/IZ2/C0LrUSE74MvGKetgh8Skz19e0HWecoy4jPIGHH2dKYJqtT/IxW4zEcHHGXbjY3MmYUrYMpdXWC3NYdtkMEKqg8244l+jjRHPXLiBBCI+fOP3RpYLko76dFxsXjaYdDJWeHlqz3tHOdNyITIUovpkhQN8mOzLRcRWyZG3gTTb89XBORI61UbSv0S6SuEwWEzs8Oli2VBTG1idgfeuxeV1m4h7RRchf7sFwl745J/aBTxSfmwZ5qeSE2T0L+yHAj/BmmerXyyKnmZRT0Qwf+/M8A8lZHvj//WJIRg8KjuRvJ2vvk/q1gu64K5ybfeovEmmnci2nPQwrdk7LcUcxZ+h3RUBeyF1x2NjqrfzGLSRpFJXHFBg365K1IrsnJ/C0qDzSQG7+Hxjp7KC8qFMQQlrX5LNIrf/eaRf6pMYVm544xLLGOlw6DVInq/0pvex7hzhBxz1m6LyfrovCmhZTjYL3w0j1HpofT7+9iy5kmykDZuNT8L2q02co7GMJfDylohWQ5cWFYRFXNk6sE9+yKJyCmQwOP9Rk7sYE6Mtx7diTq4EpDUzTNP3XIref/OGaEDDy1jVSeIrIsSSJ3bfffhFhP5CtXSeRvf/P9el381jGcfQmPSpB5cFwG/edjSBcKQY4rwkg3nXLbjNNhLFzEaIrI0TIKhlq2k1Q5MCXHU8JkDF6lURQuId1k/Dn7InkdKOhOZVq4AsrzfHv5Sde5UnNz0O6/eAKl1xdEnib5zCVYgjC4fENAHndzi6crkaQ5Kk7Qlc3dsBhO9N1rYwtG2twltrY8oZfH8mlHcLs7nbjzjkEGfgZEG9QAWPGVMLl2bBuO+dZw6lmh3HRA3w9rkXnn3K1Bo0hA4HbvXBr8/NuoTGZWO1YzBXbccmCeCpbGNk/CKsyH0gA9TQUUperLQn9aynIWrhEs8aSTM3gFCrA3YW/ES469p71O/gHFzoJJx4D2BttSYEAjUt4BikOA/Cr2BlUKvCQ11e0ApG5j2FetZf7q7sPE3FGaLrIYZnWoa+sYTat5c2zhHDXPtDTHr39bNxlp4GfKxaq+wpk8HOLOLaQNucLatBIzGoh6AlzZk8Xql7yaVjKmX4xG5d7YknJIBcgEtKGOlyzVnubmzEI+k9hlhjYELJfBu1BiDKA6T5RF/b+y5GLeZ5jcEJq44s44C8vsVKWClthh7yvablSMTveDk5x7o6LP/cG8N2Q33dYcrxRKWI4dcZB6PRPXNHu75HANHc81Yv5iw4kg6OwxVM/LXks347V+m8DtTPlC/kZGodfLPFZKDyQhsqdHVhFz1tI8ENPC94mUqFcBHKRRgpjOKtAvdRafCky/IPm2q1pJ/jCeYhSyjXncBI0/VSl6p2CpZkuY5HF2aJjQafEzGG7JYjeCVw14XfDBAOHckTYaF7+O5QseCfqfUWOF1ynlpPe41h5n4vLcrAs5srkVhllfakNFl4hqX9fRxIpC4Uv/ghDtphRU5WdthKm4XygfhfJAGgsY9nhil6DBl1DB52lLhyEvRVJC7aAnaRcIGK61CmTOUnfwCRQozHSfwFxWh4WofNRNhHjhFHT6KdKKEryQCVbgT4z5TlOH2RdgK6VxitQ7rcCbNREK9R40/4x0idUymFkrn4o44Z0eplSdzbcTPYODr/DMPZcIx00HyURZxE5sm/MvdejYRZ9e6NRobk57gqxhLjZPQ3vmcBELsYmTEN2LJWKNDgz3aNjiJ7+SD/kpYTye3PjqNSQNza0lYIl1SoL0rrRmDj2Ys5JByIQMCD4xus80JtkupwUsJsXrEOvX/1TLvfT2+MLegh911cJCYfQATADIoyP5FP9rI2PK5ISpnVINPWa5cOMxumdGuEwhSLTi2bkqOn6874mw3O3S52owGcxyUevcmFMHuuM27eQjKTEyBCPiRERqIVapi2TgOgg3u1PJ2X7AgxYiwI2NcyFouvqOz36X3OYEQKR5gJ/byrGoWMUXNfm2f3k+l4EowRqYruafcQbliYLstBsgqwYa4D86pfyLFdYB/QHcGzQ2chXh3UP5wBh5vD/X9imdWLeGRje8SwpFuZCP3NzEm7omdf4XoGD3tmqi5aobOrEfzXx1eJWM+oRPJ7Tcvoh9Ea0o5yaCSNcPgHZQAaMzGlVeXFDdfRl4nWyu9gSVhlsWjZjG0craUVminsR+GYL9t+8sZ3LSqwQ+kWsW61iHuIgtw1glZcBqjICnd2k1zZKDu+OgCAOM0DS8t8WahAN302r3+DCa3AVYSxpyqhgheTxssgGd0y3WIfjlkjzwdojrzXVUfSNTLKLELb+7n/gYlGCZZgSZkkhayuIbaieoCjYB5A5YtcLvVZDDc8XM2PGna9Lo0ZG9R6aEFWeJMymT1IA55wSRdZupgTZf4qKtUi5po01mEF8uHb5KVm7pVCxWRX2qbWKR62IJLApiHAOopvNHse+tTjZEGpluZ3by1mnsuhpSf2xECdA/JF1HEt7VnxUOUNx264TEii3aVVJULfeRlas1cY3jNR56veKQBtwqii9LQjxyyRdtvsZvx1jXuZxE8BZc5zUHXPP50kb3tmq/29WUBMfyVdtwLUeSn61tftxroY1pIn88S7M7r2xU23A0FCX245Ei9Vgb6f98b75rxi0Oc6Vd5JUDsoowtATLUBJG8BFvQ4RQ1gwALxglUTx0ieG5fwCJ5ecVGYQTK0pIaSl5PEACaSfXUEeSTbs8A34r18nxr0GYu+KVgk84pqfWFCwBSxgRW6dXwk53v0pUZJb0PoQ6LkYjIx6iTLfQE6MTfEY3Az/GuHfPXec/Yl0UV7RvdJrtNDgfAppfnRhJ4Jz2nRPwcXv/KjA1ASOrR2NyKht9rf2HkalJigx4XX/2AtGnNZqDmplojxE67vbJHczy1+drKDyOJDJFp7fATvwxZbeGSBltMSnTpR9yTS6zPVGO9fZXUujalQMp6Av9Z4BWTN3L+vlB1o8csgQte5NgtK0fqlMXIX8GyUhmYHioaTZAA0GaSe4pgxwOtaIXz1h5Fr8lbRgYYtF7oiRWCrz39tR4R1p+YUYNdQQ702zgXUNh23QwLYA/o5YUab/nnYYRU0Uv49PsLJ/2MV2/kbE+1qpp0sNUpHjYEbmmIbiJT+eQnGaQLmoDFIv08y7QQKQhLUBYPIse/0cMU4fvhCayBuOr0CKJAane4wB/wcYq5LE5ybWLfyQlZdldgsgzbYI+SZMv4fcIsm5MZ6JnpI+AnqoCsxmAr66zTP8zHVRYtEbuIXgdGUUa0SY5Hx3NqC7Ukk3Dq2aGJ47Lu6HtSTI4tC5PcxiMPYV9RXNn60KfLhcuW0p99OxXTmGt+hBZPSl0t5coE45NZKjydYdV7+DzAo7pus+w807BwycK+4A8kP02bkixb7ZdYWiPjWrw36FmUUpwwOWdmez6g/qcyRMqqIsltnOfqrGcu5I2hTn+w4KXuDGtTtwQY0diPAsgov4YFJT7wB/qUEdjFo4R9h1yEp3GaDVAfCd2to8/inTiwgq+Bb/Zs+iPbIni/QYv9kCH5WUoEOIOFPotP9FbvAZfAFM4QcNOa+702lhoYh51kRCc2NBTs8shLFf4ygeNbxzILKEmAu2YOAGqcz6FlhtT8XTpN56tismCScrq39YRwwSB6banEoLfBAnbvp1nIBOiweYIECi0/1MiFZHldtFyI5i2+N9JzIRUyJ0BPrGk77Ryts59IDfteJFNuBNUjxUNoH0aF/Lyke8IgRoTfZd2n4os25quHMNUSJ8NMllkkBEuKB2FuDlapiS2TpPepft5ZFhd8s+49HaVehYHxvxWXeyaQ/niKKZXZC9XSsG6X8vK0tAoxpgcyoo1ffJxXRclT+KW9XDWaVgXIjKUjOdMHOczRzKxt6ByatsXrukATwaeTd1wZwSznXz6IhDdFVhissj1z5IBNkVipPW96cNFQzcOJI5SYuh94RPg9BcTAVdeGWLjQGx9WUgmMvPqxDjMOJMZrovxppOzVdsWPeTkc9BL/d9zUtnQXAGlDlJHwYWGe1Qsz0eTO3Z1N6qYolnH90S74unA7Pja2UbWNg8A4HP8v9m4Hh2GZMfqSx+qS7F2pmORtUe7nY/PqY7LJNG39GhV+i0o+9UtfOMGRqBJ2idz2gTRJ1HZA8fqZkvgp+bJFP0MdpV0xXaLOerQFBUK1Pik8U0BUUpffNpH29M7WvwgNY+ri5Peafxc0CId3d3zeVCKtUpMpvaB/d14zWtCb3lf7uY7XeqN0f83kuKs2TVofK3TaQiyJ8Xp0uAosoF0ikSxXuYIyoJmvAxF3MB2OC/lmF4SpXo+9IrruSnL7uJk7XYBBMU/1Js/nGq7PTsWzBWsh4tibjdbKbY6BG80LRKFbHAfsazqhfC/QmLrm63PftrHcNwOy6u1C+4DB1jgbpwodRC2DqEfzvHJ7ELHLFb6jXdA01ekI9IGM91LChIJk/d+N/zLPicdW85ZflYgWZ5eO/y2x4DQRdL11e46lvH/Rc7i85G98p1JdhxYAnLS3QwcBVrznGJQQwASaaU9jY9Y9MLumCHMYZxA1EtftXTjM6O2WhxgJLBPxk2b8SgTy+8/mQLDKe2bN4B82NoWE6l7pS1EK5B9p2kIV0wd6Ofwf9yehrUSIS0BTgXVYt7o8GxcblA9AdowMYbwpqcdz89Xqweler9WjLKIeVP2392aEf+Zec/Mn35pL7kFusKRuhfTzvqT/hhhmTIq/Hm95vudNkQ+t+AzJ04hxnDkE9UqzrEFr+1dz7BUZA7nwagohlfbL5XH97t3IeleTZ8ZB06qcli91w7hHjOPsZVJcqFZlT9wYfOn+iFwow+NrW9ORK+WKK0MIvgLo2S0AHAZNguX4X9C/KZwmUZcUa4kRe5ZkWTVSTY7nqgJKvDv4w4zMUHA5JrcpyPvtWE7h+IGVpD449DsiNfIh1o8xFb4IDjFYrWOr3V+iLY+Tv0xc1Iuhj6UDlW8wJ0f+ZldfxVH2toc9qgYtgCGJHWr1l3xo+0DE8eNXjnDCZCO0dAslOf3jRE2UKDT2ykNStvbmxuGSlhBHXx5CIF69I+moGDlnq/KihhM2Qffp+6Xm1+UGYZZ/rS/nO1dDGxThux1bpQKPErXbU4hC6DSlWBBQYlGzXwqhEk2DfaIOSUSDOdFZvphnud8SEbtbnwo1Mi1AUvwQHSDEfaE5+uEpCoJgwHFgdpsomDVjI65iA40rAaq3tyPiUbUu50ZvAGghWWVU2sUcgHVbZcRhcOLwyFD7i+FeCKAujWiWM6cgOTouNpraFKAX5EWYoQvY9+TpYB5GASmG3rWradddmKsFPxcTx86hA/suDwQybhKgVrmlhcs/cFJP5cABauKLoi/9ZE5Rf+POa4RK8v9aSx4WviPqa++/LeTyghGiCQolCVfGu6Rny8qrxZNHsfmvxAO70M1vgYdiSG1siskw4UJFY+jdr3NW1S8vDw/33TTHllnxo+jN9NBN9LFLwEldvh5VrjxzD9c288LK6wGx6fefS/7DJF89XT/Gdcd4bIAPL245t4bBx1VBo1ptQton2sFSUm8aJJMqNywZG0pL3PmHAROppJysYrBul2I4u1vG4UxNsgIcR2u8IE0BEU2dkRhbp7yaebS9405i4Vja55R8Nq3xMs6d/YeSR/5lo3Pe12EGxst8C01/2vqZaHkpGklvmi3CcKfjn80TaZ/alFRhFFDf5nJhroPIlEzuOWhQzqd5FDU0kyxvb8Lh/b3bhiXEWLoUN9uZ+rjHq9jN28gLkkCO1a1YsMvAXiSBzL9Cn4Oyi2pjfr/JOjuaEQ5ZovAA8ZSC6Lc6xPugvgWvutAg1lUaw+NKRC3WJeDR4bwl3VZHDOJ5SVqH78N4ZVWGs39srzL2hmanrlcK+163wP2gdhl5NQQlXcq70zBWYupjyTc2WoAazIzrvzJNsAe/Ioblb9JdyG3caJwr0P2f53zJFOe5vaGcUrjkrdRWu8paW+P+e7+SixetkF9Cs74Rj6VirUcqtmdAArDvKtYcwj/f2go8vNqEvqMDQ/DHpZbK8uXtbEqeC6wM69oqItiKiitvx1X9TpWwqvWN2rsk9naISphYQaH90jQlJjVCNFoePGinBU8y+CX6WpCnZLxfkAbGN9QoStQBcvZuRBqvoZAruyswm4t+9DbfRwXEQcDKh2SKAMY7w4IGeW4fww+cYezlpHinfOd7Jk5aeBfMU4RT05Y0V19bfzmMiZPTgluDtT/luN23LCcojV8dlOmDmLzUoUN+8wF4QhWS7WMJ29aVWT02lHCF6ZdtXEskHjAh/nD14dnsn5NjJPnXYaOD1EkL+26xZvcB+R8RdWEK5/lgyGpO9qHq7VE8cw5zlcupU8m7z6dheOUt5oWVxIlT/E+R5mzjeKmxhHbni6/PBdNv/zmyf+77gFyvcFKUN84u4znSXnyS4YLyUTDwOFW5RYAwO79DYn2JJO9P9DVidKTpvPSa+FsWThIi/hlgaWqwvbFDWzX76W+0qGHIn4dGrFqbjpFLoHTB56q2/LVzM2IX6b2NAUybTXO5Gbo9YbyopyXC923iVga/4l/nZPWixZw7Or2KAM72Hz30cCvU0/HExIzWo+nSue+y0XbdCktzU4bmLG+uyFfGGdKCLoTKLWvajT8t/XdoXmBiP3x+roe1IDa6MlCpKyX+k6hjz255HY2GXtJDCn/Unu4uMKAw3un7+kaQRoclXpToZJ+Qiv+YKgGDR9XCcJn5rWZQncQz4G0s5IL77UJhmgSf16t0f1y7Zct37zJZnFxONO4wfXvQLsZpJccCkY3ISk/WxU9PsDJXMifdVwzCggv7Q74zuqnxHb2Hkao8D6qjHBVKhh1HahebXaS+LLwra7lTec4vGQH3ULfhLD0Kvjr24FlCAFsZdZZc4qu+nyPOwzFI2SXbt7q8EziLmuwjMN3z16ncTzdNb7VuctEakTx+hnKxm4STWuEiiWKcmI9EETDITttINhtabeUt6mMdANuLLwfAqEJqRN4dOBcmGxU5JEkOmNvWLoywxfaS0VDWyUFE4FZdYmbkpjN5u54ELGRMjMf1BWMiuw6QfyFG/uc2N3KuQxqTD5nuVr7b0txV+G4NMfZgXm66wubP5HOXrqfK3B1MGk4/QYO8hSctptg3ICqxlOTyq1ccy6qZ4mwrrYTSDgAjhM76KsIlYvyPB5ZEtHNFf/qzg8udy1FJdoOuvk+D8CfmBAZQrAOi20F2DPgboFviTFI428qTD3/0AradsKHj47dwBWgzvkqyap8D9Hw6HtNTVfplX3qISJMkhL+sxwsodDl0jyy/NmteUjdey7Y8ewmPXOylI3kk6+L0iHyRaKW4jurJFB7PNf4VVzXfQGO1b4JWDbpqq4+bjwWiKhCi2O1xiRuX9Vm0WHQfgM59T6T6GpnPU2ywaDkD3Qp3494bv3VxIG53p96kGeIGHT9mru++7BeiSPqsZdvFP1PMuZXSwDCcruTUhUy6COJiZPrkAJFgy8KjfYaE1HPty/4FCNfmVqFyEQDhjjWfHfzX/cmTijLau8T3G2G+AmL2vNg5VRttDyE7SrzpoJCMwlp1MDD2BVlRauR1j38CEEhf/8LREX4b3eb4eU+mkZ/+Mf/Wijrd2ZbOPolohQlgXKoIKiWAovj+NVqJSaJSRVg6FHX99sjCrmCjbPAU1Jkdd35zkHgqnKaPqEr/02EH9TLNGv4kx541sr35chQIM+sxCDnd2FPRBYi6cjfRtw9J70+ClPB5sk479Q6ZN/YYsXMaBY6WWKmeN62aRh04kvylEDxXzmQTY5U99NX4odKs4jFuu+1GwYSzER5uOiNbkmDVb52UPDT3WLwG0QvUOACy505SQlFTf/3au2ixldST4zKUeXaFYBZFsc9nWleagnmpedZu53Iv2WXCbVAu5Q5Fys2IG+OjnbKWuZvUdgLs+qoTj0CmEVgMTVASSRmXEUMqzqBpy4MqsKwosM+7mxYwUelHGb6K+dvjvtsqmFHxm3ekvQu6nhtHjVz9vkU68oAn479JPosqBq/wCha/5coAnObhJvTcsz9qUx1IdbgRQke+FgwCX4iu4F76utfM6lewV9oavWS8qaxmKmncTVOeItepnWf2TEAj88ZmMcasJv1jwzyCHbKdatyBZiBwXIK5bUHpCtvTYD4YnC9JW54yEj+OvWd6Tzc+QnFLUjNl8hy04JMOJqsgnVZlirOrWPlzgvkGp1rQtDyQd/6Z2jZ2PeG0qoib7sHHmtYypIiVPH/xWHxW9c4P376PjL5Bj3nAMyxcQslo1bZvTSLFObge6mp/0NcMxFeG5kB2oo6kpick9hl03SBTS5JXV02OKFtazAIZ70kMwoJhDFijwIfLJI//DQrvY9tbT125qOCqb7ZEBC14gisEDWnJPH5rhmGVuMmkOt7AC76GdB+/VMLtAmHpnLB94nYAVqF0Tofmcd6znzIzyC4Ge5QrGqQB1f0kpRswA1zngVaTKw1Fevh7FwoB7QncZ54Nt/aYqelunQ9UoYTb/NAXGpEvtB9rhzuQ3WY/Fv8T+yVPRjKWS3ONMhkAeItTecib7NXfMjShs/6aIUBgtYfQoK4RE+IYWHl2aoKKrfasVnnH/4Dw/ZlN9SERqnr9av20filE1L7Je2Awv4vgxl7jLM/8AAnum43oxRtIpft8HwAGZwcObhb2hF36qJfUpHQJ7EScVlXk2PsR0RFhishkXEfO2UPlue8cqG2bI0ft+dtsuxIHXor0nTjxRWXHC5FMp3ZIMsXzy9QEK/jDd142IuPTFdd7X/KqJQZE//SPu9ORMRj6w2lmHD5jAcnzN2tRB8OjVrHBzB3dfo2JJfmDypMtqNHKTvaBrQixHO5Nk/pQeIrfvDMFTShbxmBuVCBSw0iq3YA4RZVF9qJkZeOjn5pJx9t9IwLUFcmvgjvycAOqbTsFHQch2n5D8cnVkPKctZO6rQ01rMaPXHP7w7hRu2OvJUPc1WURdYwIatInj8gd7eghJXmjshLSMwmSKqTFnrNOIOK1k4vPt6Vr2HxgtqiU3bUaONFsqesEDXBPUnL35+4pEYQ4O+sDEhcKnWji3yZstnEMYP3QACHPD/jJ8xnwNNEdRlXziZUi6Bj1roqIY9aOdUQUJzJOi8uBNRba6XWQha//dK9tzLeI0PIYEiufu2NtIzKpIOKN84xrQnNjwA6Bf0QY0lgzFCznvwX6O9bc0RJYxPhhKERxNHBqjB0Ktf6jz+CnAaRSO/+JLWIfker8wkn7aTGhMfP2nps70pidk66ZCVjjM3TyMTzzK5incbPXgbVO+4/0sUO61ZQVbVmATxrCS4/1ruDpc/DSPrZfjPVK+UXBAveuFvxDKgW6UgNloUetn6lAOz8unAJxL0dSk8Fznx3eBp9Ty6xoGO7mFpzHL2szuEea0icomqHnmP3tmpMzSbrvLW3taiFVLhXutI2EWUX6ig6aid1kg4aNlCRFNd/t97xz/ce/eqXpHn7M+m3c51JHxaf4Dh1GRdvQfvkk8RkT/QdxBFxDZH1UEXitVb1nGEEFiDhYJJNJSm3axcNlViEPlnHAJ1dUrlbtZAKEpCmgHEoK8OK1Zh9C5bfva0SWdcQyiXAzTIRktzVRr5YqNIFV76z1XRt05tW6WZG7cFQcUt2nnz+/lpDpHCQ+oRqsXR27q/Lp+bHaAm7hYhzqpVwRWPkdeRZsxY9YiH3DzSutCs/jGHApBea5igd91J2n88jm4DN1LXH+vACStJNZeGnAZNsL7JLmQyHTTuHstbkBk6mgREQC2VZU5VCX/kM94MBCnZiRJydHEYnM4msJ/7UlwZw2uXysPRUNB5kX4CxSPP00jx1ghrDe2BevP7QJZUR3TUyXIU804dQ6/ukrPx/L0vTG4H56vQ0bYXZj6Zc/FvCuU/5jqoCjeWG6QFqd/12Z8Vd2/GmXmNVNJgxgCt1BOtexZjM57P4O0J3+JjpIMCQ6kBEUesYz7D6DzpLR3RVEAgJlMuHEtzmckfMtrpdUw5O56pQWj609gE4vSkK+o6GTTAPhuLJxPheVy1oXiCwsoGkK4zMzVASyfBKoZp3N7eRUA3BsCZZquYgtvVIGoJsMb+opQb8iVCFW66r9/Axjr2qSaMPp25h291F7Q0H9sNS0KOEU9z1iqI9kACqVTTgbOyw0im2RuKrcMDhOQwbEoaGvPB76MlcHWCvrnjKNaeuKauBu/G5NpEOPNeQOCosM29Doxji1dmxuoyjYDzZntW3Hauksj3JBGgAtqzfham2FqBV0evd94ZmGecs+VqDk1EtanciD7BoCTyoYuZzdogMENyxmK5tGVQGOSGWZgquPKjUnt8x4jmBnqbbHYFYgfAhW7tfCACsHIovAWvCHQAkZkyjoS4Z5fagXANXLcdti9BL6VtVIXiis8rcz0tatWw4FOgVp678OzHxj3HhQParPmYylCYbTBvreq8mMMFOg5tOKT8iR7ZJ78+DgM3j5GxoZtd034g08r9Hy/q+qAu4hxC/RyhorFeg5L0huOuXOf95qI9Wjg/jeb9zeLsrTSGKXZuUi88A6vXgKGrRnznV786lzUG4JPmdn8cDDTYMBLiXOrZQAK/WXs9wQp2+I5O1alEvrhKDhb6cyxXW5KggFedOu5JIvkV6yjUI6sAbCrtFu9f0BslU7h24an6Pvc+2RPD/TnBye6LIfGRtz/aZnixdVwLA2XUv7kKpous0Vpll/6dOrGqcRRZmKsr2V86VqafLeFOhTCbe9Th6w/hYFcHAs83/vGEa3H0/Nv8UGdlz5M/2ElOY6TeMYJXO3iRoofmBWdqRQEYFRvKlNYWuKVU0k+mH41luCk6e3BwMHP1nTQkwA8F3ExvfGVHqkC+HlFDf+jnCM+N88XjEX9VNN+v2z7fkXqSUpjU3C0LUfwk4iCdWuCzIiM0QRe6dBP7t8iFDhj11KlQUdcp5xmgNv7OvFtRvzN8Osxm5N1rVKrLjvuE4IGD0z+XUw1FlIbwyD7TR0kT1YC1FmEvljgwt6wo1mcE6UjHw0+oIDkrl9ZjknmmGpPW+96XJhhH/JMS5w1zW3DeLJok0MPeiROdObEXrRwRPJ2VJIUp4NQN8C0VVwOM7TGhAtp2Rm5zYmIvbaZrBkT7XJ3HJb4AqQgp5J4nevte2yoNxuWAwdDrf6EknRj+r0gJ02yQghNoFROarG7QcZzeieHpA3LbDYa7Bh1UR/1Vym5yAEWpP64zpQTA8Yl00z8YtZLUtY9i4KEaGilQinwligUYtj0HgebArHVmyAQZWXpjz+htGO6VFG3FAoEzkrbFlo36eJZ95iqNaCyZgJvBS3s8Fny+3y8p3IdmCiINlbVkyhruyc0WHiCFGwqAZ7bAi9YVY4QNe8QK3VwPgkBqAMazG6kOPy0mwCydK44LOOOVnVELdHzoLdkMtOZ0V50BjBMASNrhD7aAgDSrLWg2kBaMvSmpSo7il3Ug82aXMg31ZPtkxUlvSwMB5vwLKhGkP0GleR3yJ+EdDN7lLXasdyy7L1f79tgy+RMljK/Z65AWTYWayMmk/a87moVse94w1XKWxQZ3z9mGealoBN2zEbc8vTY9bGw9pwJSdUTQzHVpLNsbPWDke8bfVQbb45bTUnRVGjFQ35cpiOY7iK9K7vpW6deSbx3VYWngbf1VkrtoxP2G3whMm8VHXLWFQR7p8oOMJ4p15E7gC6iiTM0lg7OgM43kp1VqmILiUsMj9FV7cQNjF7eWvzqH4e9FqCyTE6/iczPHl9cBEwpSfnm0+5VZbyfVcDshan9zJFH/dmOnqKlCc8FkNIHeXZO+M07B78NJkm1UJ0Y+J1Mng2rtAkQM3D73GS1LuURMTKcA+aV5p/uy+SdTQ+sg/mfSjOrp32B0H4iUaV6U338A8fvWGdMbMXGuWGb+Qia0K3g6ONMhfmla41YqDsyQWdrmju/rbNTQVGhqP47K/juQBAWqoF1EuNpV/pBX3z9S4f9/X+kK7X0QVl9WixulZBC/OtOxEr+Af2ef3hX5NwHpqS3k6DKOlc/omCBGHUTwqlclGfesPEB13LghjNUxwHJDATrZf0c7PagzLBwt+BGCIL+ccn61MaVGl2Plpj3S/zNJoP7bt0BWDLrx+hQZMu5VzY39D9Yb1mSmSXSGqmlnkfJZgrFIeDWmXAC5XWssuJm5+HoNPhnBhmRN/lKGNBxhU0xPLHmjvQ1CYPYWojXV+vX0DtpbF0m17tXbPz1R7t8vetIPzTwRp+CO3GihVlsFqW34nhJcfDo6bLdCWtlhwKf+TUYv1SltUHRxrxpwfTDJ/ggGwHyLQu1CXGaT1YnI08uU9zlNXqrEebo+znDi408s+m8epRXlU/FL4x1fUl83NenfejiPeEoGGUqgPPk+Eizke/lyGb1/mJtMDklPuYAsKOwYgjEwYiH7Mlu+6jEfB5/RT0sTTepZZLspgfXgsOn0CVAyq7pkUyGkv8XQhNLW1xYMkVPSMtAEXEposYEMefPPxBikKt/ivJ6P4BSQcjWrNpee5LuA1b6hLUyzVcfiBUXUNpUsESEz+5JWs6ibTiFCkoBnAZKQvKE/dBI8jqDXQTPKYgbe4lnT+KuDeJSoVwsmGVfUzLtegxbuPkVZp2lAogM9OY5jNkIJk8HYyvN+dwNA1345jrO5R4npzlgplM7d1Akf0+DCt57/s3yznmEX5RBjpsZPpmzrfenBk716C4eDP4MaM81tdlwiaXrj08Lsp8ZSfqNK2vEe1Okhe4e9oKvp+G2IjDjBz6zBSAMyiIWDLCpi65GZVccfhJMWLrcbvnphZOmN73ysipfJHJJ72npzDaORs/UWk184XeSmxT60UFN5zz5BXW1siu7M2jZmRyrF5fXVpYhZ7tGdgOPYw+kCdyXdi3+d0IRHlJZNeJ+YtaInKJ+xska6Xe5lpwNOsyK7rH6duFMCfy+4UCI1QQt5Wgx5+uNZASEo2vlbhWt7AD7obAdW6EVfUsRB99c8DLskJzp0OITHTUQ6Xwp2MFTWA4JppfriPXdYjiQXPEJv9G5FiksG/3SI3/WGeh7HiHp8n74N9D51vQPF9VKOLGz8NMzyS8Wxb8115KoV27ALsjUuh1AmOH0kQk7AW/O1Ig2quzbkT8kgC1uKPQk4dRrky/oFwpl/0HbY9u7qiakdK3M1vbl0KQvGaQVz9WOuIlQ9lIeiKyyfpTwxvCWjorG8XEW5nCW0j77pRL/IVhCGAthJJRuXVvokOZ6QCrZc5JqpYOmu3B8wU8l5TW2romvYPfVAdWRHfNwIHgOuLcs6rAbbWk6lc3Jv/KOE1Jg686ke+ZngeOgBnmIPkQX6ZVAw2KVsuLqiIeuKICHJ1QD12RIirehwlvuwbY6oAFhzz5E78VHNh82IHavB0hZ9VbS9WeYpBOczIm20kMWaQiRrnT1fQ+P4XKtFm7d34OjtzywQLISo8bGSz7CQoUJ9gCh+dvaJJNMsQcYqQIpnwcPFNHUnbD3kGtBVFCGlY3l7LUOJQ7+iApoZuphVnEizf7ugiZqis55MgDgOnwxpNAXqZkh6VMYNQP6KTroTqVcNcWgd2Jrv+P9lt9VxsQK6OwMMXAInTnznHhtJ9ZvREB8l3rxvEx/OP17nLbkrWF+icz4IqvzbmwulGq7ZHKVUgxFf0uK8mDQH+2C8yijk+faYdyuHkpSbsEy7R+42csOWKr//qYq6VevfX7i6jBOOHF/g7kZitC/6SPEhMlYFUFd0p6KB9Rz4YW6vZGZsYl7eTsY/TvPaE3Dc+lZTEuEGjHp2X/djHO1Ybw15OCuX/axcwMA0ZdDeIuC5Q7YhsfBAYS7+jgesRY6PWMioazgK7Ef8cC+4dUM5dB71FDT9PAo67aTHEwaQiC5ijtk3BkPvliSWHXgBtj1xWqLSgFoRKFlxd2qezhqulUQrQopLdVhxAZGWmPtqqenMWZhsNlD/YhyIokoY0LgJb6y4pEIKxemICqXgrhWADN/O9eeDkQ2n2akfgMTO67lbXRbXcJkAljDqBuNkAVNIRMlxQf7x1RcaC3ezMLDJ1wrz/LLeBYQYIzBWjeuEUrqsIziILxDSlAsNeovKzhr/CMTY6Ioe/KhJog5OrU2gtmuF2TcSBrxZgVaM2qDvLM5nGSo07o5OC7BjtSiRYfmd3xCfeDIK386vnypaSi1Ds9Nzp49uQHsKmdq6ALTMQEv50Nw8/JcVxUZdXcCxBKoD9jHh3RAtuvT0N/y0R4PjZEhk6T3BSWP2fcJB5ETjKTXaFwaVvicSolUCygBjk9OinD3bWeNQr9ZZzrd010Yr34SlNpVd6iuRO4DEKcNgL28Vd18m2xtAY4A+USh1to9sX06D/w8H113um7FTtNGlaJftwi9DcV1tZPOSkrQKpiZ1NX8opYC4mdnajZkPO/CbHikBpun4x99q+g41ngTfnClOiogIafEAY0UMk3KsoCCwfbX1CAk3fyOJEt+T+6XVJuB8N7fiprtTMmFINmfEZeQTaHfez7Q5uIZoEReUMsv+O0H+r8SpifVPoGzuyWiOd8FSh3kkcQB8NxjLCr6I06rDobeOVVJ2nqjD1ESW6L8AK5ECTt2rtiN23u/JOjJjbZiaXrFJNdlTOIU/OIaOAYwAcpnESQI68eF7n1sq/3eUpjFmXmu3EXTToq0XzBD7i1wnXi/4TaIl4kqskEHbEfkhewUSZAj0HtPkut3HvPs38LpgIsnxDQmnHy/4qwtoiLb1VGV3zfE+6gtTUZ3/0KDFerd31i2m9qzrjAkac/FtSiI8bBvwAtLt1q1vwax75ThmJ8LhqjXspd/c52KPfvckL81mSbVnma38SZ9rg1qjjlHvK8/EJWWtO4SiSbPhKm2nyVKndNQ3huYg4S8ic0U0KXXAu9TE9w2rth5STIuBRl4AThOrSVUumqWrwiWVIxPlHC5L4eY1CQS75nqV4aUbnkMHzv43osmgWSHXIC99xPxhrxTw6W4E7R3JQoqKF2BhgIVOvvZDV6EWIUi6VrS2IXn9OlAJYDOS3SOADiomVA2TGGv+FoL+T2fqdlVsDHx8lbKE2ejKy4JkFJYVWz+l9S8gxdLO8GLj0KUSWdTpC0TpPIrdtg48Q5HnvtS8L/mlKaAOBzJmk32oWcZjrR/Byynu7rRc/ufY5lCjB8LvhN+iJbKu8fAvdQ0/NkWIqRn+ggCmul7kqsaB9A0zBygEYMV9Wt8Y8QW08DmGJpBgBKxwIqqUBEIgvxy1IWPvLhzDwNDyHlOpUXDi40eVOztQiET9XknNAzXp6P/xtHmfGesQ2cXNTt/ZGoi1cnvGW3ezSievWDtICJSA2toZphb/jd0pI7fmTzMhPso0JWEJtpsonZlqDAd2d4AyqBRr3Rcva1G0YB2uCJfWOB51jGcEI1isuQ8e6wk+xM+Jt1iJThhHxoWefd984aFy+LfWiY870WMBURUcr5Da11CPzT6NqTFgeMWQ8d6H9s4cMZXovdGwd3nTRwrSo5TEtIA8wxcKASpqJlpoz1pF8Qsemo+pEN2ylZEDYs4z9VbEQcnOeaD9zhtIEZim3x82kcc9AM8SyzYVFOOEgi61DmvDn16eQRRx3vHWQRVsLTKaW9r4XZ1qsw2ZlI3l15fCqzK5jQD1QDls07f8LSQR+Foat40ArNS3BIaUOsrmCw7B5/amW4ybfRl4jUhDMBNoO/Y6Rr7iRAweJdClP2W0Px7Ddalr+GXXiQ8ktqGTcICNYN8Sl2GUw1qt/0wFjg+3j0EIsQ948GBFzQNf8u5K342R5DYagAB9LGstixeziAWH/HfLW/dcYR2BgaJu6zTmg9sG1HqGS6oqmYQHF5NP7tRFx/A8j1uOGtmhJz5bzKJT33/3gBsYW/AJvUKRs3Gh5CTxSDaPlg2n8LoK3seU2FxGBz7Y31+uQ/orpKCN0p4rHm5Wevd7h/+6feE3p/pGZRawdAeZS5+hQEUlgmP6Wp4pfKEAqECp2G9MgzGl4OMVMIzRmMgifee1FekFUtx1OqpeCQtu7yFZiLJKN/4e3kR4n5eUet6hkDW29VwCxy82cXUED8Aq5b3vkZvdr6a/9NYOBpFrSU9nX6j4zBnPMvgPY+8jVR4gQRF8a6egHiy1oHtZ8Jv4xGnspA5+9QjhyF8TFrYX9yAtiCu9GGM6lEMn+umjyxEIBQiEVhn7CEkFa2Dp5eIPJXff0hQEXMJsg+eKtkXuvYs/UQ8JEXvjIuOR90j0Itt1d2vliWwLBO173L/xsuNkr67Vz/a2krzQP0Eyv4Ey9K4lhnSll4MSVLzWQYyXdqQcMahaVW1s4G6dIAyA1ywesSS+Lzl19bBfdE1uhNoYfbpr2S2dpLMCmtALoHPOgrKTIki3Gj4u2EJp9I6uGMPaAWipJgbLrnoseHemdSZpWC5InO+/btQdHArEIE/WFLJ94tj41CB7+F/mhdR2zZGWOkJHrGBReERoEjn+CwM29K6sxnNInbnEJux6ap9qPfJdjfVcp1nPsxEnPNHvZknOgJX8H68mZ4GowYQRlS/KxrM/8HxF1k70BthVnchjYf1DpJ8UGFTYZoaMGsaQnJ25woP29e7npwnegIWn+tabXKD1j86j2LmwLyiwdMSLdsxn8tFhouI30q5ysz+m8KFML0sCtAkL4BsW9c6aJ01CqaXBsEX/lYVP6pzPbHWOskwE0l9mGdGng1JAASBsBCONavfchQPOqw1CC1zK+49FVqcp/pn+1o6/CB57ynj14LqmwIL/FtgNmSO+g8flFwNs+Vu2FxKd6ygCzhowvz+f3hg/VxZAIT718Tl0KaXa4DPolexk6JJDIu3E+YJGurto482bLr0HFddt0g8UeLy3i9iqRPno+QJOa8BchOQ+LwcxGSXhMDsnWh0XsPZCZcT/QIHDxcXbnb/+sSYqVy4/5HFlOliNC2oUFLv5NsE4Mzz2wFB5277XZuBbwoWMA1Qg7p84Dox0H8OhzfzBfxOJReR6DXlb8gVuoRG+KZ+lhRfDQAmj9Fbfw1jJn5RYNkpfbwTuFnJ9gme9CAekiBr+LYLsgQ0IbqxPG2EwB6Ast2bgIEjPiqsw3XKEqvfLKfaeANgpeb3Vm0rAulG+P6sCMhSN9fdJb+CW7gLbkCE+tdHGRTUAtJ1xoA1m+fBix4dph5m5gNel976MSEwb1bgiGS7ij/IXGNIgHdR/xpzzsgywuAQFUGnyQ9oQEN9LTZGjVMJvzWGojaDfUfAbpvSk8s45M7ZrAUm9AMNi/IAs9l3qWhaB9oFh6bF7MgGLBfkhx1KETprKKF4tRccCLF2iSg2yGtinRG0SvGjzlKCdsdCd4FPysshM6/nZZITsmjvA7/H9XseHlmbqimWziE9hJ+FZTQdLKEpcWFE2jR3V7lWsgyFy+lEs8ItOlKplK8sCZQD9ZfmmEi4LFHQ2VsNqRA7lV+9QT1CegEqsSWhcJroA98aNgI4mg9dmjIM+iGTgRTC03r0QdokAc+8RGnElENEjIZNpzwiHa/YZOIDltOdSQFdVb40itmEKpSkSVgvdksJDUqklh71vY/LXQ+C9JFwpFLrb3MjVCZ7Zv/Y8YSJHMZkAxq+AErBabJ5xbMMDzsUV8KLrKaA+0M1W6SSa83gLm5bM5dp6/xGzpOL3Vf6CufpTf4T+r6kR313iMoM87psMm+iZAbBltXVKnSAhyJjk0VVFLjOb2v8N8ioXLm+dRoBLXs7QwS3IvBn3k3eyESI6WBkZaw4eDWMSELY28PVAkbJL9UHg4axgQqtViuj4nOykkCYk35cjAZxKpkMP7jPoNN6WzmNfUP56Fshiq2kWl8FJa5GeQCfrryQFOh7gkg737jIyGBHSOLM8XwRs9QVEAV4Q93ahf5y91DVX4i88ChsMWg7Vp4ZddTLzVA6hIwNh14fCR7i4c92ui8m1RqAK0dYNKPxHUyyMWlJpUJstChQS/N23POEpc1C/6qW9SMIjg/F0tHh33LJPmxdEx9j3f1bdbnFG6gfE/LpbpNjv6eJz4mRRjpgrRUK8inQL0CdJiEZBdXDVbgnzqqohoQ3Nj8mH3VAoIdlBymFqTOwKj1a/f2WiMT5CwW+ePP0X40Sun+BOYY+a535WTGWHoXJtdPR2gHw9W3rBD5XEDQv7FQotAN8+n4X6J2NQKFu0sZT50gF7Uq8JJa+cTCcPuPv5KVtLKobsG2KFtiIHoZCNJ9mMP7kBWF8/YU4UKaFmeJC2QD9G8uR1vpT+R3HauFGqrDX38UnkIoa94/IPoUlyy5xuqx3BLbO1ANPSZlAE0VehhNrYFae7jgD1zrTsLa5oSFOKcyOI3qRAZIhDQpCOtAX4yIEwzLEUS0NLE/2Wny3nsuhwYwplPlhUIX3JfU9t+8aYNU3MESPh7v3E1NQFxQLprAZOL1aph8Rp0CejiGodLOjRMdwGd4pDv+4W6B1OOwWHPjvUEjTUXOt5n62N9Wp1YA+ePdUclxIX8rRtKoWqH2NdWhk6S4BzUxSx3wNGZeC+v5gn8TH8IgM+TyhrBRsZe9LW9TaSB9rcdz0cSfM94cMoK+kenq9CoTa60Wcg329pWy7h47tfEBmDClWtAVERxh9U6uHsvXp4xyTQrGx2wBYb6QFigTO5cra8dlWiSTLy+If2gy8+g9ODpBHLMUMAkJcoNatv81vDzKxm5uqP3sKkWQMGqiX2dYFRL5Qje31KO7DS4OQTbs5j8TN0LJ5L1aYDBFEurjgH5+e0G/zG6fJjj+daGJ2hMaxxo4FDEH3SqeXISOPcfdCLFav2XUr3t05HVPatwwgMvzahEpaVYWENVzk5gDi1CxO6vALcXp3sTfRSTALSKRIVwJ3FyJehR7dzJqgYxgZslwebl/E2c8Cb5hCIR9sIwt+uURKo3zA5s47d/63dQulCH+6lgfjNmaiYmLIftzfBUEquRsQ0AklppkGG2O7okT2iC0i3btYoafEODNmm03bc0qOZqViJL4wQ5vQjg4lF52DXbOp/v287C10X6pxRxAwfPnyNXSiq1G4RnQqumlvzu+bFA8lLZtH6EwcboVF8aG9WdGMRdMqCVZUQDbRy6fA5wUqlo9CYaNX5jdzvAGj7whtI12WJ/+qppfVj0rZ1QqsIZBDyWJopzMvztN5mUSZz8vyo24D28axRPbJIaiU3GCbFTttar0/3L0+n/i4Po9SyyS+9QhJcLWc1vwqS8N8Ivm2jwefY/E9rxU30mQra7/C+vsJVRdif+IBtxi0+15Aluzria3BRahos1g5PyHil4veyHirB3epZe9Td31dwQj6Oft2OUP/H6YPX7IYNDq3YFWTVBI9rkN2j4twHv1PlfNTDW6IRZmyvK4Ud1FmicdcOHjuJGfwC5BEDHuVLz59eUKdzjxgVKMiQoST94nboNuaN4NGCESSEzGJ/cw7HlNGiDwuRDF/NA2ECK195J8lVOtvqypDgwyFyra8C7qycwPcGNbGV5bpTS0LOWshJiAj+VQBU7729z7g3biQ8mHqbng7lbSlS/2SkGuRUkUq23F8H1z4xuBODVrbbLlliXiiaAKIkxG+poN6vLeo4fxZ/WWX7RO5RZe9qgZrhQuCrwojqx8RqFAaCVQVCGKADODU62rdy8qBd5D4W6Eu6+C5CcJJks6HQHhUS6nsxS7IVaUwadAWrp/7ISt0HqEJaCgmgTDD7hK6hJhcWxD8CN2f3ao3gIcziy3sWIZcVtV8FAmUkDEnP0itQ5PWBw1HNXs2CWsJxp/lJhcGwRZp6lpTBK9fcNsypg1zQSevQ2bjqy8tOGD5JIHmRF/l24sSNuxbYgHgu0klzZE8Y4Ut/iYn4ycVqUfvDcvmfDaG4YmlGYDclUlEVzXjmNRdbcbuhqjdbkG/EDON6+egSVII46EV6rPmTHW57Fhr1ZapRbqPSmyB8cdFW9Zd5vOIegpHjqRxfL0r/oU6PDW9MX6bXJfYpY6WWoHXi3B552vGw1FIe4WVvmgh4tbh7C/iGncNgLnA54FVGePs6fATD4992gqNhtIoD8hyDvgq6IzLRYxjUPkzdJlCMhMq418mKkCHDSCJzOlj/OZMngXUJg87ok+uFJYxyPYTddU5f0MAsppSiCY9D+wLjMATOE/v+cWF/wt8k/oO7cKew382PxYCwOpR7zMsXQz8NwX5la8MVLHywA6rIhdu1+gr8eUzs910meyYWM9TOjJuk1O40P5nkRX4WMw27eaM5qPxVvFcXU8JDWv78DzpgZ+bJXKbknmP8cfuNtnGZdRLRJrp144k94KRTTLpjos3fC2mkww4zf44x9zLWDqwPJsQ3Z47l7bo/RhpjYXF3/91g4Nf1xRgPmm4mzfMtbpldrvYgT07TaAPYKKphmVdWQJBDF7ZsGfJhPVRg2GS7BkF7U5SbO9Y3478IW92vNMlwv/3ojVSGjNvUt/7wD0JNaP2JjFHLEzR+HRjx5C0jLiN1QqG5AnQ2Zq4NWwlulEqkoSmacAn93mXrL77QKWNeFgDn1SyOXLxkxassKhzDyoUW1vWrIBhuSVMXmzZyMMhVrxJCe65Kmk6V0vYdrdxmQ/KbeLcQFuFOnES+s8n1e4HM9rg3WQUc2NZZ94qFoQb89+KObzm6VjH2yaRPcrLW8Hzpz4litNVVQNDxTY41m0gYVliyoJjwEw3vHtdGtn6Vsua6n7lRC62BitwnmL/bAj5U1AckG5iXUmegiYqtw8DYuqk46sb0gByPftWkrzAY15K6HpsTMIeEtbxSmn1yYL41XFe2xfRLCWJDsSqfmA2HEzEsRKW+ZOZEQh91nPMoigP6ipLD8ukCILpMFHvnXtZZztVEaeNtlwKfLlxv6nRlVOCMLbDzVKFZPPXaffr7kP8hiOKtUKSHsb5S/V5lWn3jQ2CeXYNTxuRkWJyJacoDKeApNgqy9L3jp99PVtOBIFS3b98B069kFDrIkvnpvtMYkn/VqXlpTpVy0GwTGxZ5fQJdC/cwkNZqoTViX44CgbsqpawP//vrxiAqcjtxcQKH2+rfhOfOojB7xyX3Dz8Gju7TllCB9yyj5OCpnVZiYqlR6CrH6SEO5C1H4rKL3u50BrH51XcUAAsNc3bOzG4+Gknp8hcJPfoMCsrTzqKcAs8EUT47HUdKLEWb6a90Df6l4yoGc75OiGPd2+Ar7nCaSjGR8jdTU6tfqflfj8rEzx/4B359JmHufK+865GzM2a2fOPLf/ICvvSc4dU4D99SXok4SA6ClGkDBzgJdzlJFUAXWS9JZ5axmGJtZnMo7BT1cqtLkZc8Fk7K9SMxMuv8mvkIw+RFJawoaMrGPoNheGWlez0ZB4bSecseNG92LQYE4tebRfHMkStNzUH7SC2Oq09bZdiyNY22hilN1dXFqOfIoesRX8Uh9VyKdOkmPYBJ2C6/tWrQ2Mve7nYz90Z8MtpxZvzLAXpO+INcO/IANEd5+nnfOTOKlWqRWIoxDVrqsjDgKH409iO7PDyne670ZlJ+9m/uEONXEdz5ma5+IbiPpAMs3zUw1GlNQQ/lDP359gmue0NiFbHsm6Bz2cEcoZemIcnbyNeTsHwKZL7ewH3YdO8L3L/EAWJshdhynLHCJB6oFcZf4VJPZ1Ch126R67i61DWW/c3JIKZczx0/64IwPV7A6iwgMzUspIK2tLuvo+g4RYuhWexih1pA5lcY3/qv0q+wFH53dEc953l8FRbFhItxoIKaCKXLfn0VfzNju04T6IDu8gA68SU9wXdxNO/bKDdLJVax+AmRp6cce3T9AU/NYAgUk0n/rpA0aoX6KJjvei1ubMpD7licjDRBpQz5BsiGIzgj4b/4FFCiyYRUg1Cu3WyO6NgEv7qPeXU4Lr7gK5bvmnI/ASLfct/eVF9EQF6KvNKMP/RH3vgqYb9xHH3gojqczfRnIGUB3iadt9wydhjyZy3zynZlrgPGZ8fgqdiKpFZXsDRLv3LZz/gKGPeb43qQharPnM1Njy6BeqQUOTSGomRenY7K/9VCkyKf5/kyR2Ni+GMjE3dGyZ1BXWazWvbNeQ2c5pddDatgAPFn/ZCxmDOrcUaM/r42hdrJEWla0JVSMz/CV9JzqZMSYj52JbILC5qJqjlorTSRsZAX7RMgSAvKP0XNASC8nDr8l7R+SF7/+3M7GFJUr24kb93qaeVJ3RNFeifXsJPheMyKv6PC7yODFl4qplWgO4lI2UaJrTN57SvbATegFP1+vTBmw7GD7mPPvI1n18whH2eN2bv5dv+2qnK/90bkiwzQ+wK3puUovwYNxdnG8nwZ45yXKM2rNlFMPF3bGJLad1vtFK2KCh4HZcu+Vlczm9r/2m4ZgWPdPhVtsiwGu/AP2GFfG5nSUvGB3EmUgUZPLODsVJohzgC7+uOwifSWDw3Jeqk8Nl5O02LjAlZLW8w7YfiKlwFa6Vw+NzIWxwQhsjqqJKcK0qHrBKLCawWAl9lvwsJSFFTQMz9++KpXi9TwQBkZmwTtqy3j3TTiL9kalkIhJwlglAZ0OzxLKyWpe00YRWMAD9FIoJqIbnzst2w0/UQ+lqTEW5J7BFpiH50/sURUybt7+20zgy68ZTMqc0sjyRSpIA0VRxRKoJJdHm8d8aJ0PT3HvOkXeen7/CADMAB4GgwH0dE5zeGMSfU7gG+nG7pnHoBAViKVHXFoaZQaPnKgiFjcTwKjkuet0iOGBOeUDAESgIyib3+HCm3yEyVppdfeWV6Q7kmLjU6qGCXmCh/8eONneXISB3mYHV+kYh70UPGPEl/Qgs7L7dvROGmW7BnFBjjEw+E9cmPYiU9MkxkgHEODYUqTQIAiOEo8n7427M24qvE2A0dJ9Nc4+M99/2ZuNQB+WEN8fg4hoeP+1cvsFHkNYsX0qWZH7MJbE1zEzUAGAaqE4XcIjTiScza5XzbXw61prEvMJP6DgMbYteTR5CFeLqfb4Eo0BV6EOGR3b+HeqNY5qiERBHVPEpOv4ZQB6EcNdAP5Kzbq5nbzPUTYw2Tqy+ZH5hlckXZArRV4QeoBO+OwE1iztmA62lGxlsI8uIsWeEv+NLYo69oD6qJ8i7Cb3HHD9DHeDzYtBmIn3++NorQP3RLFp4swRT5LfLX0emitqMdaDkSYcPDieUqjK4mbDOm4FLjoxNHN0ZDkUylDGPMC2rsUKRXdWvG5pTloQhexxaQmaAAjPPxcKwkuG8cx4JUqh9zGLsc1RStJdGmBUoxAkVGccHRyAjo1k7h+GvW6BUdVPP1E6Qk6ZKY0nkVqH0X6lST5vE50qUNCGIbKfblNdfripawclrbSoGuNs00uWXxcJNtAmry4BT4UmA8StWeuGenKzNCdI7C40yWTvlR+UCuuabOklhQBJFxq1WZlue2Fvkah/NNfgPLzi8oPD3ZgXUvepSiPAEEP7x9w41ry1+LBy2/sIkxT7tZuDcY6dhNxBs+p0+fPguNa1v4QuI7KL1qUh1kANqYOc6G+AWBVKOhodfJbsuDsS3dPQpCi1ZDQYzQ4FFQYmj3erVPYJj3e+OSsckqxTLWMgyXTrBHO92cAvy71c+cJwW4N7u3q2jx6VisKWE57Wcv1ld14mJ/rJHiuPBGFfoGHSrMG/dYp8jkmRH/0oKBUKEtppZ7LpGUtZIwa3/rFb8hUEtf/BHPgjTMomNmWr0ib8VPiJBXCwfT03b97isSTyLmDCKGbAEcqlm4+0kGS5noz8mJgwqxD6ZW6sW4yaNBfgY3sHePjhElZyqLhu9M80zIwFZC/8aeGjUFsWTTfvTbG+6uSHThOJVEqxO3ddAP60Gu+6BhpQAY0l3Je48WSZ6HdIJU4eDpNuBFv2NG0jVTo34xrk1cmof1YX5msIwrf5DhhU7KJvSY0ZZ0cCdAFwoAWe7UZZgGvOsxlxIJb2Y9AZicORkagCAgBzsgjr6T5INcoOoz8jPc7WKkYkI6mkUDmxfvPXESjj+xDlVrGK7lOc9jY+p76Z2qeP9KK8Vkyn3dWP63w9uC9/1a55L3mkiKqqDwnF5Z0fysvB0nsqFEAaHDFgPZCV6KHggEwd4NoeQC3Q4fD23DboLvfqIFipNC6p9j6TcTsXEZlphYYGi7ozLttAWvOWrZnVLTzeZ21fOtCFJDUegW2+jZf5kCKWL1/WnqR/UK8LQUrXK5c431haJuHOeflYUIRt5GUeprAGB0+7/03R+jOz5n8Oz98J5H2sb8k6LArXBi+0eKJ4wKIXJBWV8oH6aDRMn3klO+KzgnZtIdWTgkoDwNy4PqHPecty9rPdEsDvVHGtOKkLVPcPjS3X8kgTfWjJe69cMbrU3qdWWskoFrP6nJkni7zS4LKIwKl8ZlONjC/MkbIvfFLIV61dTI76T9vtBTGbD47tgdB/qQEfHT3fw671ieGcxpP9gXUrFCwdybcZpwtEnGk7zswSCGGV0pb/mqVoI1nfo2GuyaqwRx9ihXy5nEtzwEoLVme7DI2Hv8ww+/86D+KSnfzqedEpSj7WI5+DR56rno6yvD7vJ/q/GfJgeHCFVcbq1Mt5BKm0yHtAvFT+LbepKeZmHR795M/hECpjeUsIBA2Io5IJvsqjBoe5yC2atZWYITpEQ1NhF/YoRpPF9vsxpz0TXwPv/1GgjnRJ2eCCxMWofeac5+icDbWpcH6W5BX+IkSLPogNXOpos9KzfxioWvgov5334Ot6yxws5qxo+R17vFDzQ+QVryuzj6Y+m3x0LiIHoNPwLlosv9/qqUDCDygGxCfjLb1aIgYL2wmILAueW/BzqieJn1FschYD0nYfNEn0lsp2TYRt6dR8d06C46EWHmwP5k9QrMj9qajCNbG3y6SHxnKCecLZhTgPQ2zNOeS1VSPBZ+yLRn+Rd0ftERbpqQIS0BSG/c439jU5NOhKAyKoSp3P1tBo1OEx890PLjJnWglByXH3pQhfOS33Jcea2IgHKMWKtkI3EE4Cobd8YJvN5c9RuWHx93eBhlKrbBcxYRcLm1p6DJxL/8OdRt+QHgDPAjGyrnZNfpBN3Vcx1AaKtBlcNHJ3eUGQ2r/021sb7PMdmBfTWcrQH/mkdTpw5VpbtqNfVtBZ5wNb96QzKjBFqOCZ4Hdzq0RS8rj00QlQpmeV+xwC5kqSqkhvD+IJYZrk66L3MbEv8cqzZijCHh/+VrJnSYnMr0MIFa/6kcdccx631bnbEs+5xhck6pBIWAOfPMUVm0l9wqWhz50vDBLjcGE8iX9P9o4ZSO+JJL3lO//u8752XZJm4/7N1hK69+ITaKkg/gn2/rRD/jQd082aoAnSNh8RU0bRpkb9iuNGiAY/SXONrxoI80rT/pOPwOy1Omic/IYa4za4xfc0+LzN9oE3GrFHECjEbF49NkTU6QVtGBVEnyjNTvffsNQNi0BuUDDp5iTeiBCPonhXiKHzFOwWmEiQhmwRBotyF23qevoIapP8cx57Opo+IEpl+sHZczHJqxJE/NLptS+HOnZkRtkQxTXhhR2879DuTQKCKENxz3kE8GB+V+ZZsriLhNlkHTLUPKuTokaU8Mq86lFeZtcc8ul/tk3tci7vUjjCHydihnDIE50i9BFsG95YE6dSOGGk39/jhGg2douv3VqDAFoKx77c6Eq8R+5WE0wHimnCxywj9xl8aiVOqmFOrxTcpiqQ8yMjv9i/sRYUSQV4a7QR1hS7vk/IJStuXAiSblyC0hmHwuUuKms6oga4OYpki6aN/6lgeL3Jqx23HRxBg/Ch8LymWZZGFYnPUKWlEDBxqQFq+UsPDy4Ok7OABNIQA6acydwoCAXJ0b/ECfAucryUfgR3GrkpeBYsxHuUqwoIxyzpxoHrlFQ7HTltHNdxNALBvbW12aOHt05kYpYST2wkWHjvZ1vLAHuGA8g8gg4ggEEzqDZpo88mIwYd1waTuuNVZLoo8GXYoUOwFmnXcdwsUPpVM8BPN9eTsIdLZiLShQamshSlS1DFlZJOO1aVQtmghgKdLskdmE40AZNzwjAl4YiDIm7SI9ZLJkmSZMvTHQBC6PEWGScL2PirRrT9XsPMtXuIPD9eUwa42J0IC6Hx0d6QPMsmQJaxWqY5p8MEeIZJm6UZ0nQx6v9SQGBQYl9aebsdjd3x59eMCNizRy2xcVQdsiPkWSsS8R41lhsWhL6qpeVKebkZXyJZIRa3s4sbuGq7kcQUwW3nCQ7/E/6wKrrrB7pydVCZ/u+f9JUT8yT0uB8MJ4pwYd9uZr0dCoYukOfIn/z8FFydePTJu2GpTGYsQ6e2lLz3QMRJT4UOdTRzMw2g2NLMHwCzAItNlVSmQKb0I3DpwehFgHrz7Yk83IAewynypBROHXDuuHc+nc4Y2HLyGWDEhk23laxvU1YcBGzvqzQ7Hhhy6neIAyWfke2QNHepXFT+XVainkqq9WNrZGNaLAMzvuQyJZXprPlGM/buMuWSVCOMWK8SSqu6irLgJh97YFgLZquecF2sXM9l6lIahV2e/a/THEKNmp/h+B9J6Ww/0qzJtnUKDLqzCK3MTSmLxdmqeRtkUYlhaUSZw7dhVIb2UobtSMvvSyzLnvvx0LGz2sKBV6nlnjbrR+0jmb8TbuOxvKpvlCm1dsaPf7Bm4xW1HsOr/6KxY7UjZuFCgtFSozTaYMz0VSgPkcO72D5S8boeImrFcEx1kbiZVfNCMqP5H5XBy1FCuAWPWBFuqHY8Fm0wy8DH2YlyMIv2sIp38KTSi0qWpwToPhP9sMbA8ow58ces0X4uop00D4J0pf7NQ3raHbB3tv9roNn4E8ORACp/Ob0H5PlmF+DZsqoCMdNE4u+ElpCg4veEwE3fa3oZYXSplyv+TqgtXW0IAzmkVOJQt1WT54Es0J6P5dJUGwPInmdhaynBrtc+5cMDEmbkjGoVZ5tGeDqGQ6XYu+UqcScONlLE1QI6rS5MQ0yRJEdwC/Wc9c37aMjWFvDeKhnUW/3gKYZdbQyy9errGQxJIH3f6wM65WFznZ9mRqwa7kn5OLztFtWZtFWbUDnVuHj4xYWGDzJnxDXCqbyl77zbG732V6zZ1nkymYqBmbE27plpkN+IYhtB0TQrwrq/rjNUKeIKyi+JIo5G2YZJBv65vQ58qcwT/m0RaAbDq29dLYFvFh15ihh7RyiH4bPsHtm5FScGDah9HnHzHG93rew8+H9U1ORHeDZDzftlyb0JlWEpQzhzbAUSXe5PFUJCqx4nHe2N4K3MDoSoZrEshMWjJ191uuMSDMahi6yocExT8pa1fDWcEwxzqJkvTCyA/5T6HV8+hXLV9u9d8g6eNNeNQMz/46zNN47se7yxqL6hZk/McXv3tvtnpdyOk2Yfdy9/1ZPrDcRqEoA+TyJjU6tOnSXe/xHeUn+HxBXRjt2N+OI80s0aOhyiu33leFuAF8lEXJSMK/j+whRvD8LEGV3tuJvvrWlq9863CX5IGfskK+7FvLBy9DqKG3Pr3t6fStzDSr3dGfe7lWZo4+f9mqSdtDwbHrqs/RoH+bClpbpnIWuTYkD/n9Uy8mdzEhGiqZUuz3jJcDbbgyGc5CAcG8A7sSrecPVdzgz0ZXXUA3qCdv4OsqEdOs+uMcZsUmtDC1K2ExchNJfisnRcRqeej604MvapV6UVAyKUX6w2NmV+n51Us4chKVRo2FHnNsESbwTaEDRjrDKJkL6s5yJQ6xKLira/DXJrDXsMdaqoAWdVoc/ArmSN3FIUJfjuxzYfQaQ86b+EgxfNxNA1bnIX7YnM2up5sFdDa8HQ2Ei5ehLGy0rdWOYgN8sQ6MLmx7pTC5kP6q9Xng4CBtwNXrm9ZLrIteKkBRfrCxBF7XgIQfkdR7rTNzVXfjrh2XYLM0Pfh3Q3tVszQQjUll2FNA+Oxwqy/WfT4sfLe1XyNHCRNWHYN6snbaNNLiY52jpC4oxoGFlgQhmb8rctrXo0nmfuGWbKWXARVQ6VEc+sLq1DhsUFUMejzlKMPi5IBImSxUICJTuTQ0Q8lF0NaGtH4vbAFiIp/AoLrd+BBiCuBXdpE5CNcO6hqZyht17ZcRYrnQHcBXzEPYiX21furvIXtdCicALarJ45gkjD4Y1ZtTuOqqRX99lT0CfQB0cfDT8Hxm32123ETt6/cAjCxr1E6B0tJWJ3LahBfqrmojRFHZUQrRbJJGug0MT0aTr1bfzhb29zKOJug4iRx4ikg4ftW2ww6yz/82rc78Qmr8f9otelooUbNn30I9Y9uiUs5z7cq82e75BbLhsj0h1/KfKTIIuyDZbekyXMnuJ8CF4jMRLG9FvN6hJxrH4j833bdbg8lMxRKfnBH15kk/dqpiKttTT6fLXmqy+QjHPdqUvAcTbs6Ik84eK961kWoJeY1EvrBIKaVTUt/EtLDLGPXSRQ/qtEXBnUtrYREPKTvQ6u5GUewWGBGpaTn0Oz9AwxmOIi50XyBjVvGvE4K3dbuSXCfhzcX/Lv0k0a9Rxd71S+kb1iFlsNRHKlEdXXsxHHrwlC/UEiOZ64HbXhA0fpQGqNsg/rECcifF6EJGtNeit2IfJgYB0ZxKnV39Io1e3OVT4xKkkl4gciMTDC5YH1RSxl5zruTVrSO+KZZrIQGBliJgpf7EFOUYU6RXkIBl2PcCIgMv5UcNGNYftkj4coJAF70eCNxbbVpv5ps5nZQb11kn7yuwmaa/4NdgToIj9QklX/7JnwO0snt/BJpSn4TB0iez7AFYF+vMsQFFxYe75yw6QM2zBzl+kmOeePCRJ6iwOKjwFGcNOFObVG8sr+HQkn9Fvza6Yqe+mtT6wCZve8ax0OLOej7CNuN1TekBJuptB6M1SGK7y387D5xL8mB1pYjwDkyAnNoUgHlGCmvu5Lzmn4aQe6NtqZxHCZX+XkFD1n1cuJJ5JeDw4bMyojZDlKl8VfMjWy/avLvyGyhvGtRGwtf4wBx2JJYOacGrIKRBM/sloiJuMHbaAZMdWKt8Q51mUX9y8Fht1RglLSEb4CxcS/QC0WRgSNO6RkOrIba99f80dwTfenrdImLY9yDHXkooCn/AQOinAwhotm/50K7zOSc6WpraXQ5nRZDXbjr/HHGTpENTKN0R44lnV4fQa9pYWeXWq6TPoaSgOq23Aq8BCGVjEB6j0mLGCEhu0ku6wbyICdq1a/WGkN/tkm+7Y+wivx+ggZ2FyHG+8KE4ddvtZfAT+zgGMG/pMdRz0CE7US8TifY605KkRxncEWqxFOgPf09hJA4Oacp6CdecWtyNWBzmfGwQU4E3L7Bzr2EjIw8LxBITkOkoHzvHBivWD/AvdjWvlQxly4zrWtE9wWv8MWRIEtQCSz1Nk/qJ2NI2HQGpIruyzfwfwK6L1OlqwMpzcd2JAPR3+LdFRbBSErFXq8eT5OX5uqDsNjzDk6NGoqfd1YyhvQgHgdmzPRsBc09tKjaCDkkeYAE1PJ0SuAsTaX2GDFWZsLAPWMgdthlzoFiK4+mO9/4D42ZAOIJT4nUZovSvu5zr4rJdQrMqNKRjrIx8IWHihBHdJMCe+tFNwKLxIrArW+Gg+1OmdtsmJGVu93/I6gvpb+uP4C9bZyNnS/dLWmKalJDMao6hOsxUhFlYzWYSVNzChAQnrj6oaxS1PwHa5T+ELrL0VahoTfyTXSTtQ2zNROs3mtj8lOENIhTorLcFISSBkUzvJdQo5wbcXIms/xK+x7L34hAOdN0SeSLklCqeq59mX8vkcCqju+Ie6dlu2c67Htymy0kYCXdOV6q1vCYJrnHWpyuWFY6dbBBySnHReBcFtzB1mjuO0fnfuFeMdaEItow30zA9fcusuc/KayJpAJsAIVvEyOhJwcwbXbVoweW8nUSr9g8jVhVJJ2nbrsWlUMH/rpo6c8nmUOwVcut8BtxoOqbH1YY+KGWYM38PoV/dnsx14iEiWmu98KbW93Z4ex6+0hgfT0ZsoG5noTReolEWQIWxMVb+aocgGPgMGZ5nhv5wjLYs8WFTpgKPh4dQfwdjHo5VpgrN9iGq9cHh75UnmFetmu0LgwZXj/wykuY+XWk/uOYoRHhx71G1hOwvs505vRReJ0VDZpIQNdQyOKQ+3piy4R4R5IPKofZ3s1pVxsv7btvFAO8Gy7Q4EMtTJ7+FrEWl9jit8/wLV5zUp37bG0/MGjT0YqvxtmVqrWBTvl5vjTZ4XsE9YXBNU/pAjbcf6CUzTiy+pQaiLrRMunNqFhvgxIgqfPPQuKp/oj1dbAs6QllE5EdmU2EEN0GiOT8N6th564KJDn67BvIHW8RNNyOMkDuMVyx3tHG3LneiNrHRXWaz+j5eV2oGwxCVc4K2daEY/9FMnlot7giRd+YswVIViQT7/xio4gDgwlWNIejqbkYEQo8RVGrbh4XltB29Pwfj8XRdhm9EcG5S/LLz7blDBz6dj1nwb5hhZfcR7hdT6PZ6vs/5nRQYVjITcEvhNd7WQi28r2A/iAXS/LqFYjyqZO6vS3KQW3fuzJ5FsMIiv+MISzTtaCJ67zVgNr71IoQnV5T1yYw1RWsmfUZ8rppPxe5LdKquY6Vqh6g0cnGGWBwfd4rjH2ua4qk+1/e9rVSy4AXw/TTIOUssfGXIIBveoA0isC1FHqq/NTw+glkiTH2Pl0cxijpV+Ozuy/mzOKol+boR7CK88oEjTy4lPgw19NDsGzSUtJH+0mi8inIDsLCKGR/h4M8TvS+w+T1/q1hA0d/MNj69shDdbr3te86ckK6680eUr2Y9bOykHUduvycJ3pEg3qJy1OiRbe4UKmQBOn8SRb5BahT4OdFxgZLfBS98gShKG/sThfoOdzrGDO85jDrJ3nrfMdMuxru9fHalX5eKdRz0Qto3pqoHYIr2r1/LRsIwnBcItrxp+Ud7oWKdNZjkGLahDKU2XF9bfRxAR9LJanijaHSTWvjPjMK814O4ub9vq9uex9fDAfUEX/xib6DWsRqdORDXwmfc6szKGUfx2i8MfgqvdzRZkbN6wI43k7reVdjvO9phidI1BtVWbnpPuGxmzGPzSMBXqZYXmTWXjook2pdW/RjX6kKoZR/B+xEYHHlV++3FDJCPqFh1zH/ww0jMeqIBgZUQff+udPVZvlP4GQJbBlRQ8vW4AH6R5pdjvq/nhVcPw0cQzUOgOUtWW/+3FIdkyLulAhlGuPk27y4pg4boSI1LrkKoP5J1sEIWEEAclveaZQrZIKUZ6RZLVSeNa+KJEq34Zhj/+ozFZTS+ksoUK8AjqjzTY4HgDEi5J6OFwnly8SJUuPvBinOHuuOIO7ygJj3Fq/nRd3GdQwvKF5DpYkZS45xQkncWgM7FVp7TAaJhSccvSUvyd8jdxxz+79fO/y8zVzanXR94xM020Eb4FBSae+OPM5LAYyLd915o4iWARPOehsLjfnLJ/JURnaloPWHIIzXXuwNdo0jZiREXvbI3kLAlVVXTtrHfSDHYTx94c1F9JQ7FNPlcGtLp7lVVYju/FDQRW7wuBtABOzGZF7b7cVHJvKUmaNwTJ1Ck/YbXHjsHSdwc0rYnt8UBTxJgXTEzKiXEuLp9UYpssMJD+66t0+eXPfv2UBI6XRFG1kjQoOwHljx37m3tra82/rPRNLq1VFjT2+u9FSHGgBLrrLhgHD49jw3ejvsFPxynDcfzo2v8Tiq/cbl0g29efD1+gGGo22lXY6+U0SuITOSkk12JRy6YDGC7Hl/d9XzTIE8SW00SVnq/gb8efviJY42eZcPOFQ624rXFWUqXreLLgx7CzQ2BXh94XH5yTnNvpQ5NcsQFZx714g3tg3TlPqVJ9slyY4VZuajYilriCiNvDm5qXGQILnp8aiRx7pfw1E7bGmMOuX4kdOx/B7LveGj6X4krzeyS2HXG1JlWl9DNgOkz2YjpzfYPsOffUUws53e26o/pu68jCuqkLkOuz4ScSNJnjElS7CNFAWwIIdTovY1SaDSQF21b2bJOUM20NJfY0IYkF02MHEnDwhkQdix+7Da9lK81ZW/Vz6NH1HtyNc4we2JU+eMv6dUKgakHyb+XN8n3y96Q/uX20fkWtRp/wRr10SXPJylgP95XQDhTnBXsN0pvgReXQAE2oUPduluwcjIx5eRjJki8rf1ybXq9mp++ocfbclTYzROGVZA95qss0Jlm65zOamMslSWHtR+UsFkoPAlU5ugDLgn84kktpM5K8WZ42dGPlXDpkquHF+md6SSiEjreDoPyoIWkvtKEZYObODvL22zCe/KbIletlveyag0m9ek1tDEA98ZfvK8xVFXW056WoD4hxQoruZz5hjRyfwXpzf4etCPE9uruESx2v+R34uKLSqk8ydwqa7DEe+kGkwV3h5B4EMBbzDop1jOwoAkif+awszrEHMTCJR27qd/tmlURCGxdCb7LSzebtiz328YQnFJehFh4CYqY08PoiNMvqz31uYqpJjY7g+nTZGC3xaOjljWJDyqhGkhLIBLJc8TK3fwFAdbe8iPaXmgXMD1lY/n08RXKLnQo6pOeIBzxY8XKdGZ+301HvnO8adM8Ba+wRxM23QoPbl7Dl8r9URRBoWFc2H8YldK5YhEpPZ3GsHgzUVeEXrGMse8cRa28RD5OEWjKIQbFlBVdYY4Ya1w5/DVM88mIQcxMEPTo6w8XyMYwV1SkPFixGNpax9jWj/ScpD0OL930FMz3NYInbiK892NFbqlos2XslJnZ+Ojfi5+bd7Et6yve1FHDkykWJl5wOV4lZGgsYnB7BRMHJmmV2TCQGCDi/Q26B22hHqv853sCKjWwb9nC8zlTH8HrPOEb2Mi0tT4zc7Opi8Vd7GS8DLG6IDMOjsIk6xuZqGG8Ru0+Z+Bu2MdNfHbYmBjp75gnmOVKckefbLkOb+ZcvyF5193wkq8qXxw8jjHPRAdhyQep3iTyCAkiB0qZLOarElGEwcGB/Kri3TwgJHP5uBPgqLo6Efx4bRkX6DxivzJ3kgB8IyoC4www9Hl5hn7UzxUvjlss5fR56sfQKabkE5P4VUxYH6Tky5MDM53R1CrDprzc6qdmI6uz37q0zdoHz5MupzsFTNeeqfKKktDK7Seg+eX6Dds+wUIRi1lZa2JE4QlFGzOv/W5M7Ce0Git/IJsPEdHmXoHJtVU06zuDlTtiHRZdxMNcgXX4PJui2fOsVvIuJhzVPzKNvMasSaZOohXk1lP5t9z6/ftyWwbiexfsNxn6s9UJW4ZqndCczC4BDKWFY0gpTPOnYtWPfufrSdu4HnHGr9ol10aKA3HlB1ay56OTgl7Rl+Nulg/xEHugZ+nMaePC10ikmel3shZGSDpMv0V8m3m23M6hJI4/o7wKMNv5E9gJo0dIQ/kHW3fymZMY+RuJGNYdoyxtLOQyq5uqE6fjZ1XA6IQKQ5zaqRuUVHHHkY+lI31ZiUgBBuZzEHtS+M1HzGWqiOs+NTuqkZexc+2wca4wDwl9aREBAghEUItjUtu1OrediXGtVUw33tt5ghuoeMCkrSUR4F+6aDOIQpcv6lCxplVfFqumEfiAfdWLrf2My1At4fNkFk2ujLQFN61RDMpUTEaYhzlCXSqE9/h80fzzaBwA18DAXfXoiiXaxbc6RAYAj0vYc1Y608qqvrAgQ2OxKEJ4zopzp1tCn5IbZ5Np8zAX/kPgbRIrdV8Pv3YNaJP7xoBZznTv4zoQSSwk730MPXC2ZR2V8N+CvIT5vAO5e6aeGM3x18CEkBOHuPrrDogGcJDNJAmifERqI3T4//LcNXsEpd5zSedZjnAOu4b1q1ewPSPSyWJiq8oLT2psctHkG32GK/G21U6frFv8nIPT4XbF/p0laMds/68gWQuKBb2A2opR54c5tYw0vtQKk1Wnuutd/ciRu91T1Zq4ScnsTnBmqFiTK/p76ApY5YCtblPaac7zjuAnjEpznMMjs/HQoHVfPEdZ5Tx9TAjmsFteHSvW4Ip49W+zXmVKadpd5KRAIf6oCfJ3ksWPORe50cWih5d+W0Z2LLKUkw24puZJ+bM0q7GKjOAhiaEVFD1YWL7ReR1z/Doyp1DmTP81VdeMIbV88b7PHoXpFt6/MiP5TrotJVafH/z99xLoD6POph8A4VaJHNlI1VSKFD9qVkEeaaEgPXY7eATpOxHJDLNBIU/TY6HDYse288DcXbHzz/6kHzqcIoCxY+v6SVoM0qt+szRXbrJEBAX1zf5vhFsBzTzy1+4kmW7lMWqJI+kYUWP7/GhExUk1FBOFhXqewcMlv1uOOy0wBEmCQG4rWtODFW0ayeLD4cNSLk4qDdJRT14H+uC4IqV6aHyQPt9jYfxCmSg/wVSovWSaGk1D5zqerOg5GkiNPbbJo35ec0Idhq4yoYrUiukMazQiJaPfQWiWHlQ4ygjJ64K14hB31Ajhf9gXgSKEZsYWjjS6INTIWgTH8hEawC04gpWYG/CG6HbyXG2DzYgAOC9jDtol/4LLAt/gO1n6M12BwRmmREj5KOB+U9C9gIIvu45Ju8NMRX/xj9c6FEJCU6jEDHujVg39HrZXSCovMd6I8ANyUN7aO8RNXRG/uZ2AOSBQMPV5T3N8w9jXApYEf5It9mlGMXArrWAG82LUXA93qbSYhLvrjwCi64Pu7+U8ZDCq6PDmQ128PHRtPOgSyejPB/jBx6Mu/+r3ZqgzWyxjRhgoRXgM17EmmjcDHl+TiKVUzl/OACbJIvaLIXq1bsP17ejcQr6T8Ly9wScMACzpMz003M+UbuUv73TGxOfOIMc8aHLS/KfMioPf02mw5G66Tldc3sy7PRn95RrOcAh/t85k/wxhEYb4q4MOGqFOdEUqU6sUQc9d8z3ajNj3HxXLiDkTxT+4dNOhzO1udjeq8QMpa9QdTkeOc0+D784dK+NNVKLkH8uPpGB7XX1k0C+NTqCYnHkHpAqfU1FTqPGd6OQjGF98HCECI/7iQnjDtUi4Eobs5SQ7fKIvtAhKPfjZ+r0R575+PFvnOs97Ux3S1cimQ655UYUeI7M1/LVO9wxGVQneuXXgnr5u4XA0wBUDHIin5c3EwQAyjQmf8d3SxmSbfy1VexQPOQKCAimZUi7h7fxthIz1CqWR6BTB75KRVSGSUFY40r4CJP0ggQqueb5YKZoZOdPzt+A7c03T23Z2W3nKhFApQOhwinks2gAhRWATewHw7ZnJTnx8IptbIiOIpCHF3BGw9wTGcbQQM+9ReCJg2jaOJPN3zgtCqVotXEEwORmPA76QJZC45B1QRSaAM10+3S56QDfrGQDL0lJ27bqVL6ZmZEsio+cEZcQyT2xewhYSeDR1j3qQ2IPYB/pYVWj+x5DtfCtX5OC/ijnMT+iQET+ByiqhUeFMAoRCFIO8qzbrGAfEdUlVVHTDAGf+aBxSUKHiSVBYRKRE4v9oixvYc8GoQenw6UFcTFtlX5aeNeQyqL5vaf/MKan043HrhMs+Z2Atd4CNwatmnw9ph1TALuJRrY3wWQWXC0uzxkJiXifNDKLfPVVokCxKqpfS0KSN1qGKvqe4Q39E7hJTlnia1FMl7KXChT0Kh4EXxPqvGFkV9pN3Hx1HjQtHw24s46QaHomXhgyZeH5y95HmvwIYmBh9PAO6q7Hzo/RLCnTdbBLV94CjP/3oOjFKDeYAwzWN4w3rD9bNP/BBfEvk8iY3upJ4Ze5nzm4i6/1U+0QOn6+I7fuk9ndhMUSKBOXF2ITg0PDQrblIG5HSzOlR4ko3aexvLTnsU7gox7LGlF/AE9OStY4YOc0sLTSekF3bdQk8kEkyYx2GYmD1MZh5ggIqxY3pgz/0ZGYKNC9UkRrlMWSM+K5gd2hYkAuAnlPZvSD71zNmCQvQO4aIETq70t0tLpwk/vE8HzavqS4Xbzs6HeImqSv97g6C4uk7mfBZUkix6sZ6WZoUiJpOv11uSDE8/kiE8IeAw/IbkqvX/uiV19s+UlLEbazjm24TsNCEh6P1/R4wvJ9ih3Ua9LZ/Ccbuz2dFbvlowFOzgW/E1mxZd4PACStqlckHu6sf6UFulyYBwgL8T28YvoBk92cFGsOkq8Wfjhe34aLUPmV5eGvl3BqhrkMNl3+LCsEs2kUbnVaNJHm2x1u445fv8iHwf4GDk47B4/PmLAKfVHg0PO4eplIaYVNp7mJGMVqGADlCnsodIcbfBITZyMVWgZJ8YrTAUWCy+6jhZFBYDCIa/aYT0sNwyrJpb7PEA1p4IYjy6ite7LvjUZTF5B2kEINMJSpQcexd+4oNxn45agqMfHgTGsvnit/qFiZYUOxYqTKMYmpPxsw65zU/gxRy4bc5sW+0Gll3TPm/cMgvcjEvt0A4FsxzhidA1rKkHhFWPxJnrePX+Im/zVqDXbL9ZSk4fxDh7kCXRCXyc3QkLCcdo1Rq/L2+ojjMOC7fvtk2fI1pfelojRnNJlMYdsBbbTfP59E3Y2kgvMhdXY2Pnn470MrUlZj15kRkgjGtBBsdSvAjYYm35kOAaEEVlaXx0EzJGEUGTDq73+LCzEzp/lvArkzhwXaeaILnNfrzDrnIAg8q+UUaBO9vx5uUOSymY9UZWpUiEFP2OPHHU3AXfKcLImHf+77UcrM5mWkUnqmRYbZWt+EfoPkjMxegNxXB6kF+wTDvrYKrUV/OXp6mOdx/43V/PSKp5eTDUuNHTTg4x8X+2uq7MnlrLCc5r9hAgKwKZgjIya3sm5f3MQhbTanQLviQUJ+zuZBy5CRBRvSgsP/AmxJRpVqCAz0fyrrTBa2IEYIAYZG0h5LPzu/koHFJ0ppZciYpKIj0lwc57KvpU6BdDyKuE8vaHk1O/dmVRoi0zgIDG3F6EdTKKsuZPJXaImHuecvAdbM6fjATKQWOYXSODASZZkt+kcF82VRscv/yl7axN9gqKNopU2TjriJMW34ip3NoQRJh1MvCpVw/k/2ZhC5w611wZxiAFVlEKSSIE3UDZEXkW3GByDhpnvOM4WMJoJtI9cQMZF9LGRssKEJQVkpgnoCkn7kaaEwhYXFGrP2TRpPekOrXTe7gHa4eTTdBizExOgGzC0KIlOE9SZ9SRorHRnjPDclsvOiznq+bOOd0EbEZQSUj6yfRWnZjXBYrevansFs4EaufX2dmDETk73PI/H/uIQ74/coPiSixeJTKDX6ZlyKDGph+76BzzdRJEHz+RqjPz7nH//LV7L+5Vp/1xn4J1DxA97PsVtj8OLrWwKIZnrPiVX9ctYXodF0eKJ7Jq5P0E1Z5OFd5tvqsbZVlGB1hrA8neKO5R2RwEZjz29z5PHYVkGKsdD6ML7/FFnhlW1gFTWHcb0lllEzLG7t7HWK4o2/LdYaMj82WtcdYownUjTIf8FXQg/QaUVIRNMnZ2rEIALzco/2T1G8NbTcqRbxS1/fhpPyCk3+SsZ3ANHwRka/UYi87wR6yZILg0q1Ol9rcFVPCyU0PWKSlzZSbmWPmpWeD/lgbiACnnwjIsjFn3KsHSdMs2GdNqIlxYL+q4gkDN38zTgJI+GyCKx0Z/kDmrWKMzfysJSGhVcuE2egpBrcbg1MSx9EQ/Yb9fp/pyLdcS2K142a1knt3Y/wijsYgI/Orh+Qy8WLTICLrDAJcwoEinhDbwR3ZtlgLXer+yuEzw95LZcvM1BhwTHvbogbhJx2NBHcUxgoLk8CCq3M1i9uspA1dndbQpNjm6+BcX3Xd+2D8YqdPNxIRpsB1nvINewgC6he2Yj+Lm6UTyiWotF9mxd/V62rSMNQEPmEEpzUOgZsOQtuLmKW0oArLf2b1T4AntQIx7DVbzghiMZTobsKpMqfQhhIxK8M1wA99tL/G+3csY2DMiFoFcdOp/qwbbbqHvrv1BZ+WDZyk8+BoudsDanPs6uN62ysH/7RC4128USfy/FnCN4x33uf6GPJh2rTrDAcJ8gwsb8bHUbfICGptfVcBwQ4f4VyxOY18RPdHfB0qmlG1LoiZW55pc81lg4ahD+4PoW6faCo/dCCK/4zYRArvSrQP9S2kNU24UFsdWR88KumcEWO3iO1u897MLE8vvX9EJilWU6nleTV769rnR8tfPRw875swDWQpGCaH10Mxvl8dRtdyLWb97a+a4trOP7eQdU8BW311fckvzw3j/+b+QwoDe6+QZGqiDy+ehOpGrfzFi7OjkFJVAeXaJa4yffSaG4D/EENc6yf6Ah5Nju9qNJu1XeE+m9EONhQdrak06P5bqKRfY1iG6FHzcP9ITg0aDJq92il2O8odONPTBzumPmGlK9OoeP/NYrX1+aCZiT3E7AyDq4T3YRa5WRp2hhBRos2fzdCeJ8xu4YexzcZ1JOwqgeL2qWX1NFeQzDc4AnQdyNoDsK0izodq6fP6PETBCHFF71Rqh8hcR5enhlPJ1Ws4BNMYY3fqzrTdoboe2ee9poVIYUJsiNP1opCr7a+8FaEwIL1Q809puEV/LGZuLUWMTiyNa9+1CBwtU2JAsg8hvjIjyxowzMeljDW/mMkp9ZOnlFXuNViEVWPVlmL+b9ef4QEZsnxv1KsRAaOVNCBloDH/s0qM6EtbgdY9GWNDOpYAFhqlolx099vLNKPDuq9xNbZ19syvUznXBOM8vRNHB+ATZNrcuVGYn+eXv/XmV2yNPlXVesuK0VIsPcjqVONaG6uvy114o3cCr/RVTlv/HLHPEg9P4mzaq8brWGLhlhm7I3/6dJvxOxkUOYvhXxfvDsZgEZumO0NuAk0HwpeFr4djdKw8x5aTEc981pUHAiWRhD7F5fhw/UvBpR6GoSJxcKxZ0rJxz/4wLn9h19yy+/fAyZn/bY6UWWNgoyMEo99K773GCQTM7t1JFAro7vsq2lrpIpHE/8xw1ZxRt6iAkB7C7slqcD/z+WnXIK4sPhIxU+FYWbbmn+W44Wai4KyT3IgpQfoCUIC07xsg7svafHy7AtjsqxaBSFZNWcSibkQQiHcajwL9AQZhLiSNHjz+AyaW4M+xc4R0Q9tgi/wlKlyscUW7eBTMo0kWpm8VrPQLBmdK9nogJbeUSKALyeDUMD2FJtxAVYsSzmgvGmVlmPAdrIvDkZ5yFTbkYkryxyMQJs37WOXlsvCF7Qd/eEDmYAomPEcw6IIWEQzRsOCjWPMk3QjVmIBSC4Gp/GtaArsWg8jepLzzgW7cm2I1wz7M9zwpI22X0ySHJKE3oMtUYEHPl6WZUcR2ML+jzWvzYksIW/ac9lvmMODroyKO9IgNKu0oORuQ7cBvIeqQGnkep3F/knKGY80VfwdYEFDZjtYucoFr357tadCB5TBBHaisUM1M2uBr2UDGpu7geQY5e7fhBgMEFQQkiYnYKJLIZZzu8F4/vRrVld9FYG0JkAaOlundVlTbFQjJX5Dt3dz6sKgRqMarP3VzgtpDBWhTIP/+f2G8Cu4cm+6lZzI23VWMtsHkP9tJ156XKLb60mI0J8BR/3Db4QcQQ54RKNhQOOg3pVayhmpA9iegcrw3fEaurXHzWq9ZA/D2FK6jCTcSGv0qmt2EGU8KoE5VRt/vOSHvAx4gB6s/u9JZiiRgZgQ0HgkFmXlQzTikDgodp4h0uLO2XOF3hxlA92e/rXmzu4jmOzUTbJbO+9e+arDMTbHoEsgPVwSnBq9Rz/gkRjWo2j1U6lAaEXs9bsoOpHa6l/Gvh/u8sM78b0d/uO5U3NAYnxsLhDZBJ8DPu8Pa/voGdPBZOaCfnXCbiXxhOGnIwEyL0e5u4w5/qKEiw2/r5dPLHeFI6bBtRnzotMdMoXQJzahcs8BOArsD5vpsNijvkpCivXM3jENDzzs52BBMSNDYjnslkmX4rNGTJ6Wbg2Sq0jup1ZBj3yeHnNb4YY460yVyjHP8KwaiaKcKfgjeL/r1lDCnve2Vvq22twdZnXHRDLOg838t6nfzS+D08Ki6craEfwc6b3NDTxladpsla0Jh2FTFs6F48sjEhu8FRjqYobEnVGxhMw+HxcJhiB9nda3Ea+s+bspEmLBKC9Si4c1K06NKA7K8ydC0UIHHwUgk+5uYqotFJzCd3sFePoTNKw2i2rK5eUSQYNxObIhKgxyX5bNd5yEgKG7ZVXAawMK36dkCEnQEn+LK8ZTkWgwXi8aK8vVxtEQiBjTjfmsF+qiysjtlGTJiq7uCvxJvpk+qfY2ez5KQf+vz1LrcJEbK13iDQGn+/bCYGIz2QR/FG04Ao9gNqNnLPzfop7GW4S9GHU2K8Q6PoDnqx8YjmWRmFk62LI997sA7ZHu0dJ1zyKPhB1xDcP2r8Z/iTlA3KHYS6CAI9OKYsBZttKtKe9h1BOXyKZ+Niw2/erPlhkKxB9GlmQI9Y7eNEClQ2VSEmITuf484+4AKDQ2rQBpiXAOM8CLwmsfYcPab0Hzc4P8rEm6uBOt/ImrTK4PNFR/F6gXvb+E6mXgHQIAuiQlvVwX155H/ar0Xnzk0ZMpmfvAQ8DRZEAvTpb8jH8jap5U4IhpYwyGVuY3GUcBRRPQ6hAUtjC3tJrvLyfxCeGS0NjdX0a94byGkvqOiT8rbOb4rqNI+XASFxhe0guCM2SaZ1EkrmbU/cL1E0Rtgi8IgZuGHfpjQvzqCg70fv9GWoqWmNFWmVkskC2XAyJpaJFH0saNWDSTz9+wBdkqkRXPtEZy1tYedNGvdL9U0VQRQF766l49aImsoFjDlzj5hKEQZq9noCVaxufCWKyYibR1HxV4qLuGIaxrwE2yGFUD1p5XB0J8SE0L3QJI8iwR1KfQUqoQC0zhQBm44ajLt8lV69s3tnTbIKGkpLyGgBeu+lh5CK6Ye/3y6qkCnJ4H2pBJks1Q1sqjzN3AWJKI2VTOrBLcJulb8LWVyhirOa+85sNMsOoroggzeacWFj51bgQ9s3PyvwNC5XBdG2pUHNJHsplYDlKLszKt39GggVs5sWNlY3ye/V8Lr7wLv1ZqeS5hdUTjZ+k2xspU/Z7+eR5btLSciGIzoJ5yrpRO6ESPqlqEo52KtiS8Alh0zMK4sCEF16ApwFz20kUG9oTUFS95954Zc1yunilx87Px4de5hcCxz0o+JDUTradoNDk5Uy5l7rJMJBkEWC/4iZmoJe5uo1OWPqKwyqfolE01jWb6yyIdKEFSwwFzjhWM2liuibxSaLD96fcP2nTR64YxnWWnrdwfMY9GA83hqOTv4EiPnmRsSb1ySLBEvWLnQdtbkmLnwWkPmeDBJIGN1aRGnfOTCY81X1KN7XHa6HTcIea7ncBEY6z/pTYUKGE7iU16a6KPp08AFKKm23DPEet4mbwMJa/8Z9m7jrkKNed2ojnT4K3XJIBKCFR822baNWVAHnZZkaqyFgffPGb/Hbz8pGUB1AUPG/4fTxKQOIBI4foUoywDi++zOADG5mpR71yepog/4M21OZX7R3kyFrFMAYF8q5OQ0v70nc8sYiyl4GYXk1on+hcNkMU1cLTsKCp9pWwLeruDkvDDkBJ+q6wmGAwGYAmJr8rSO5z53VBo8lpgmJLT5uTEQBB0DxK2oTMAcDA7faOMh5ZaYZD6ZJdS7RcA3EVo8VSak2qWESHNZ4O3qgP9XtcwBnar26wW5reyDUeeJ509uIxyciqbDDCaNZXRCjRd72K0HaBs6MrKS9wzQrNAG/V7W5thX5DjvApp9rzcFPAZN6XzA2I54xGTKO+7jVUKNy1G6xxG1CwSXnijTz9ZhjTB3/iQstsr0vIlAkZ+0e3F+ARQoLpa3QDCMYHGVEV9H+AVyzcc7Nng4TxR2++KOUbO4UbULf0Bbrd9Sxs9q4OnH5s0b3smzmKb3dAGXxhiJhKG6ET/EsQjTlZ5Ly2jy3HVdooP9Nq5aHs0bFz0Eff+HP3KVq218aATJYdZ+DHsghi5o0NiOimtt2EnE5I/YmB4LHM9M1Snjz9svYS87RNrAX1/xMPI79gyNCVkGiNArMAQhnz+2u6l3qcrqecg9nX4jZVO5qSdjd8JSGPU9kdpl1azKNq2ShoyenlOqr8yldxCxXdBdy0PHOeddTPQUEQj6U1d5zOSEAeYkyI2uR+6cmQje2siW4HvAMtOcGLMPUmESzqPupC34Z6UTA556vWGz8UwoxdIuKcXplI0HvY1vcfxL9LZBQuMUwAkXV0k2r0dp8nVxphCZ4cA3gg+qjngcyWj9OKL2abFmAIHNkv7npp/9CqxN1vx/OocRhQ7PlloODaQ48wt/F+2jw3dNF+gRtWO3vfzWw9Ed/3djizeCqfc2eDDmQrWL0hdomKMY8sTUiMG8EA8PX6JpjTE655gSjWxYZ3oJLSkVk519DiQYvLJm/p+DEhB+O4X9O0ArBcNdwzqhJ7PxRK06CI/mP45ifqJ66/rHfILuU4LhGxcyX63/u71Dk/7DPinXbQChcxRlPW6sNnG6kX98YqaXqnP2iGtZIUiYs59NKVOHaE0X66klNdvdrDmNTFNc8Wao7W+PUieWJzQH5bw+w3g+8nl8gdM9wFOuC+MYIEsr3Ba8CgDQBJBZ9Gh+MyTvi3yvkY43GdquMRBNf34NFGZXONMlPikyh78k6lzgvPeX0QOXbWhJmmmwM1ZiMjMvEp54ehPJfJNI1noxtjsq9YMXS/A/M2ri/PhXHbxFRoo0GQroUVDb+L9+wJ5dYn2NB7+uX3+fXYuHWiBx1M+xFSeZl544jCdtixUZdZqzfsWq/fPTaKme8Sa+AvhO7ddbCN8LFF0eKLyxh6whKABJnyhvZuZ/CNq4FYeWPTQbnygfnuYzxHJdg/Bxk5hfAsKF7P396IldH76+Dr2DS/Sra3R2tRvEWCxio6m5WlOtY4Mq1EUEPQGmpK31zVy0Gp+QKE/CCx0PBO22UHWz/gYPmB4guxCNK9Txv9vAj6u+3OLkH+3MYdIqKjoIvOPee/CNOA31J6xZImPgdWxe2xEyiKX/iBSzPuSRM+PZiSrJP8IIvX8puD073R+Tj7qmZ9WZc1XcVx5l4UGap9xlDi2Fquv0/DVxaU5L9xefaX2KualO9co4yWeLeX/jad1vk+y/OuVzuXedmIYvXhHFbv3uxaxRdme+4wzTDVHdlROt3bFQRlbj2SO9JlRXghyKxWEll/f9RW0mSAGD3vmynDfK2Tio/ytUzOI1yksQxEO/25j6y9o1v3C7m/ph/c1GZugpQyfXppUljC3hPAcLoIAslJwmAmoreVc06Uh3jjHOGjhqH82xZQw8/U0OWKhXn4qSlvxhLwYBoVpqIqEem2MXFxb2vT0YT40ZYBkauEgInxsWEwIbn56Vb87piNZVqH5Th5iluf/UZFzPDX/IxFF2Mb2L0T3+JeHtcQtVqDNGa8hJR1zkuQAYM39houO1IjHPMdCMFtgSECsKqZ/J+D6Z+Rhj+TZ/SX+9U33KmrduRTQyeO5vIsjpYpFu6Tp+oYIXW+rg5xqrIDIOK067bEkaCkOCvahTcpLj8XCCMgd9lSPDvHUMxYEoJr73KAEpjAyv6eC2BlaFb881bs3Wb3rXVT/v5MGOJdOA6kVYWVQpWBTJl
\ No newline at end of file
diff --git a/src/test/utils/saves/everything.prsv b/test/testUtils/saves/everything.prsv
similarity index 100%
rename from src/test/utils/saves/everything.prsv
rename to test/testUtils/saves/everything.prsv
diff --git a/test/testUtils/testFileInitialization.ts b/test/testUtils/testFileInitialization.ts
new file mode 100644
index 00000000000..15635289e6f
--- /dev/null
+++ b/test/testUtils/testFileInitialization.ts
@@ -0,0 +1,120 @@
+import { SESSION_ID_COOKIE_NAME } from "#app/constants";
+import { initLoggedInUser } from "#app/account";
+import { initAbilities } from "#app/data/abilities/ability";
+import { initBiomes } from "#app/data/balance/biomes";
+import { initEggMoves } from "#app/data/balance/egg-moves";
+import { initPokemonPrevolutions, initPokemonStarters } from "#app/data/balance/pokemon-evolutions";
+import { initMoves } from "#app/data/moves/move";
+import { initMysteryEncounters } from "#app/data/mystery-encounters/mystery-encounters";
+import { initPokemonForms } from "#app/data/pokemon-forms";
+import { initSpecies } from "#app/data/pokemon-species";
+import { initAchievements } from "#app/system/achv";
+import { initVouchers } from "#app/system/voucher";
+import { initStatsKeys } from "#app/ui/game-stats-ui-handler";
+import { setCookie } from "#app/utils/cookies";
+import { blobToString } from "#test/testUtils/gameManagerUtils";
+import { MockConsoleLog } from "#test/testUtils/mocks/mockConsoleLog";
+import { mockContext } from "#test/testUtils/mocks/mockContextCanvas";
+import { mockLocalStorage } from "#test/testUtils/mocks/mockLocalStorage";
+import { MockImage } from "#test/testUtils/mocks/mocksContainer/mockImage";
+import Phaser from "phaser";
+import InputText from "phaser3-rex-plugins/plugins/inputtext";
+import BBCodeText from "phaser3-rex-plugins/plugins/bbcodetext";
+import { manageListeners } from "./listenersManager";
+import { initI18n } from "#app/plugins/i18n";
+
+let wasInitialized = false;
+/**
+ * An initialization function that is run at the beginning of every test file (via `beforeAll()`).
+ */
+export function initTestFile() {
+  // Set the timezone to UTC for tests.
+  process.env.TZ = "UTC";
+
+  Object.defineProperty(window, "localStorage", {
+    value: mockLocalStorage(),
+  });
+  Object.defineProperty(window, "console", {
+    value: new MockConsoleLog(false),
+  });
+  Object.defineProperty(document, "fonts", {
+    writable: true,
+    value: {
+      add: () => {},
+    },
+  });
+
+  BBCodeText.prototype.destroy = () => null;
+  // @ts-ignore
+  BBCodeText.prototype.resize = () => null;
+  InputText.prototype.setElement = () => null as any;
+  InputText.prototype.resize = () => null as any;
+  Phaser.GameObjects.Image = MockImage as any;
+  window.URL.createObjectURL = (blob: Blob) => {
+    blobToString(blob).then((data: string) => {
+      localStorage.setItem("toExport", data);
+    });
+    return null as any;
+  };
+  navigator.getGamepads = () => [];
+  setCookie(SESSION_ID_COOKIE_NAME, "fake_token");
+
+  window.matchMedia = () =>
+    ({
+      matches: false,
+    }) as any;
+
+  /**
+   * Sets this object's position relative to another object with a given offset
+   * @param guideObject {@linkcode Phaser.GameObjects.GameObject} to base the position off of
+   * @param x The relative x position
+   * @param y The relative y position
+   */
+  const setPositionRelative = function (guideObject: any, x: number, y: number) {
+    const offsetX = guideObject.width * (-0.5 + (0.5 - guideObject.originX));
+    const offsetY = guideObject.height * (-0.5 + (0.5 - guideObject.originY));
+    this.setPosition(guideObject.x + offsetX + x, guideObject.y + offsetY + y);
+  };
+
+  Phaser.GameObjects.Container.prototype.setPositionRelative = setPositionRelative;
+  Phaser.GameObjects.Sprite.prototype.setPositionRelative = setPositionRelative;
+  Phaser.GameObjects.Image.prototype.setPositionRelative = setPositionRelative;
+  Phaser.GameObjects.NineSlice.prototype.setPositionRelative = setPositionRelative;
+  Phaser.GameObjects.Text.prototype.setPositionRelative = setPositionRelative;
+  Phaser.GameObjects.Rectangle.prototype.setPositionRelative = setPositionRelative;
+  HTMLCanvasElement.prototype.getContext = () => mockContext;
+
+  // Initialize all of these things if and only if they have not been initialized yet
+  if (!wasInitialized) {
+    wasInitialized = true;
+    initI18n();
+    initVouchers();
+    initAchievements();
+    initStatsKeys();
+    initPokemonPrevolutions();
+    initBiomes();
+    initEggMoves();
+    initPokemonForms();
+    initSpecies();
+    initMoves();
+    initAbilities();
+    initLoggedInUser();
+    initMysteryEncounters();
+    // init the pokemon starters for the pokedex
+    initPokemonStarters();
+  }
+
+  manageListeners();
+}
+
+/**
+ * Closes the current mock server and initializes a new mock server.
+ * This is run at the beginning of every API test file.
+ */
+export async function initServerForApiTests() {
+  global.server?.close();
+  const { setupServer } = await import("msw/node");
+  global.server = setupServer();
+  global.server.listen({ onUnhandledRequest: "error" });
+  return global.server;
+}
diff --git a/src/test/utils/testUtils.ts b/test/testUtils/testUtils.ts
similarity index 100%
rename from src/test/utils/testUtils.ts
rename to test/testUtils/testUtils.ts
diff --git a/src/test/ui/battle_info.test.ts b/test/ui/battle_info.test.ts
similarity index 76%
rename from src/test/ui/battle_info.test.ts
rename to test/ui/battle_info.test.ts
index 3100372f091..c4548adc49c 100644
--- a/src/test/ui/battle_info.test.ts
+++ b/test/ui/battle_info.test.ts
@@ -3,10 +3,11 @@ import { Species } from "#app/enums/species";
 import { ExpPhase } from "#app/phases/exp-phase";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
+// biome-ignore lint/correctness/noEmptyPattern: TODO: Examine why this is here
 vi.mock("../data/exp", ({}) => {
   return {
     getLevelRelExp: vi.fn(() => 1), //consistent levelRelExp
@@ -30,26 +31,26 @@ describe("UI - Battle Info", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     game.override
-      .moveset([ Moves.GUILLOTINE, Moves.SPLASH ])
-      .battleType("single")
+      .moveset([Moves.GUILLOTINE, Moves.SPLASH])
+      .battleStyle("single")
       .enemyAbility(Abilities.BALL_FETCH)
       .enemyMoveset(Moves.SPLASH)
       .enemySpecies(Species.CATERPIE);
   });
 
-  it.each([ ExpGainsSpeed.FAST, ExpGainsSpeed.FASTER, ExpGainsSpeed.SKIP ])(
+  it.each([ExpGainsSpeed.FAST, ExpGainsSpeed.FASTER, ExpGainsSpeed.SKIP])(
     "should increase exp gains animation by 2^%i",
-    async (expGainsSpeed) => {
+    async expGainsSpeed => {
       game.settings.expGainsSpeed(expGainsSpeed);
       vi.spyOn(Math, "pow");
 
-      await game.classicMode.startBattle([ Species.CHARIZARD ]);
+      await game.classicMode.startBattle([Species.CHARIZARD]);
 
       game.move.select(Moves.SPLASH);
       await game.doKillOpponents();
       await game.phaseInterceptor.to(ExpPhase, true);
 
       expect(Math.pow).not.toHaveBeenCalledWith(2, expGainsSpeed);
-    }
+    },
   );
 });
diff --git a/test/ui/pokedex.test.ts b/test/ui/pokedex.test.ts
new file mode 100644
index 00000000000..ff5ca116ba8
--- /dev/null
+++ b/test/ui/pokedex.test.ts
@@ -0,0 +1,547 @@
+import GameManager from "#test/testUtils/gameManager";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, it, type MockInstance, vi } from "vitest";
+import PokedexUiHandler from "#app/ui/pokedex-ui-handler";
+import { FilterTextRow } from "#app/ui/filter-text";
+import { allAbilities } from "#app/data/data-lists";
+import { Abilities } from "#enums/abilities";
+import { Species } from "#enums/species";
+import { allSpecies, getPokemonSpecies, type PokemonForm } from "#app/data/pokemon-species";
+import { Button } from "#enums/buttons";
+import { DropDownColumn } from "#app/ui/filter-bar";
+import type PokemonSpecies from "#app/data/pokemon-species";
+import { PokemonType } from "#enums/pokemon-type";
+import { UiMode } from "#enums/ui-mode";
+import PokedexPageUiHandler from "#app/ui/pokedex-page-ui-handler";
+import type { StarterAttributes } from "#app/system/game-data";
+
+/*
+Information for the `data_pokedex_tests.psrv`:
+
+Caterpie - Shiny 0
+Rattata - Shiny 1
+Ekans - Shiny 2
+
+Chikorita has enough candies to unlock passive
+Cyndaquil has first cost reduction unlocked, enough candies to buy the second
+Totodile has first cost reduction unlocked, not enough candies to buy the second
+Treecko has both cost reduction unlocked
+Torchic has enough candies to do anything
+Mudkip has passive unlocked
+Turtwig has enough candies to purchase an egg
+*/
+
+/**
+ * Return all permutations of elements from an array
+ */
+function permutations<T>(array: T[], length: number): T[][] {
+  if (length === 0) {
+    return [[]];
+  }
+  return array.flatMap((item, index) =>
+    permutations([...array.slice(0, index), ...array.slice(index + 1)], length - 1).map(perm => [item, ...perm]),
+  );
+}
+
+describe("UI - Pokedex", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+  const mocks: MockInstance[] = [];
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    while (mocks.length > 0) {
+      mocks.pop()?.mockRestore();
+    }
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+  });
+
+  /**
+   * Run the game to open the pokedex UI.
+   * @returns The handler for the pokedex UI.
+   */
+  async function runToOpenPokedex(): Promise<PokedexUiHandler> {
+    // Open the pokedex UI.
+    await game.runToTitle();
+
+    await game.phaseInterceptor.setOverlayMode(UiMode.POKEDEX);
+
+    // Get the handler for the current UI.
+    const handler = game.scene.ui.getHandler();
+    expect(handler).toBeInstanceOf(PokedexUiHandler);
+
+    return handler as PokedexUiHandler;
+  }
+
+  /**
+   * Run the game to open the pokedex UI.
+   * @returns The handler for the pokedex UI.
+   */
+  async function runToPokedexPage(
+    species: PokemonSpecies,
+    starterAttributes: StarterAttributes = {},
+  ): Promise<PokedexPageUiHandler> {
+    // Open the pokedex UI.
+    await game.runToTitle();
+
+    await game.phaseInterceptor.setOverlayMode(UiMode.POKEDEX_PAGE, species, starterAttributes);
+
+    // Get the handler for the current UI.
+    const handler = game.scene.ui.getHandler();
+    expect(handler).toBeInstanceOf(PokedexPageUiHandler);
+
+    return handler as PokedexPageUiHandler;
+  }
+
+  /**
+   * Compute a set of pokemon that have a specific ability in allAbilities
+   * @param ability - The ability to filter for
+   */
+  function getSpeciesWithAbility(ability: Abilities): Set<Species> {
+    const speciesSet = new Set<Species>();
+    for (const pkmn of allSpecies) {
+      if (
+        [pkmn.ability1, pkmn.ability2, pkmn.getPassiveAbility(), pkmn.abilityHidden].includes(ability) ||
+        pkmn.forms.some(form =>
+          [form.ability1, form.ability2, form.abilityHidden, form.getPassiveAbility()].includes(ability),
+        )
+      ) {
+        speciesSet.add(pkmn.speciesId);
+      }
+    }
+    return speciesSet;
+  }
+
+  /**
+   * Compute a set of pokemon that have one of the specified type(s)
+   *
+   * Includes all forms of the pokemon
+   * @param types - The types to filter for
+   */
+  function getSpeciesWithType(...types: PokemonType[]): Set<Species> {
+    const speciesSet = new Set<Species>();
+    const tySet = new Set<PokemonType>(types);
+
+    // get the pokemon and its forms
+    outer: for (const pkmn of allSpecies) {
+      // @ts-expect-error We know that type2 might be null.
+      if (tySet.has(pkmn.type1) || tySet.has(pkmn.type2)) {
+        speciesSet.add(pkmn.speciesId);
+        continue;
+      }
+      for (const form of pkmn.forms) {
+        // @ts-expect-error We know that type2 might be null.
+        if (tySet.has(form.type1) || tySet.has(form.type2)) {
+          speciesSet.add(pkmn.speciesId);
+          continue outer;
+        }
+      }
+    }
+    return speciesSet;
+  }
+
+  /**
+   * Create mocks for the abilities of a species.
+   * This is used to set the abilities of a species to a specific value.
+   * All abilities are optional. Not providing one will set it to NONE.
+   *
+   * This will override the ability of the pokemon species only, unless set forms is true
+   *
+   * @param species - The species to set the abilities for
+   * @param ability - The ability to set for the first ability
+   * @param ability2 - The ability to set for the second ability
+   * @param hidden - The ability to set for the hidden ability
+   * @param passive - The ability to set for the passive ability
+   * @param setForms - Whether to also overwrite the abilities for each of the species' forms (defaults to `true`)
+   */
+  function createAbilityMocks(
+    species: Species,
+    {
+      ability = Abilities.NONE,
+      ability2 = Abilities.NONE,
+      hidden = Abilities.NONE,
+      passive = Abilities.NONE,
+      setForms = true,
+    }: {
+      ability?: Abilities;
+      ability2?: Abilities;
+      hidden?: Abilities;
+      passive?: Abilities;
+      setForms?: boolean;
+    },
+  ) {
+    const pokemon = getPokemonSpecies(species);
+    const checks: [PokemonSpecies | PokemonForm] = [pokemon];
+    if (setForms) {
+      checks.push(...pokemon.forms);
+    }
+    for (const p of checks) {
+      mocks.push(vi.spyOn(p, "ability1", "get").mockReturnValue(ability));
+      mocks.push(vi.spyOn(p, "ability2", "get").mockReturnValue(ability2));
+      mocks.push(vi.spyOn(p, "abilityHidden", "get").mockReturnValue(hidden));
+      mocks.push(vi.spyOn(p, "getPassiveAbility").mockReturnValue(passive));
+    }
+  }
+
+  /***************************
+   *    Tests for Filters    *
+   ***************************/
+
+  it("should filter to show only the pokemon with an ability when filtering by ability", async () => {
+    // await game.importData("test/testUtils/saves/everything.prsv");
+    const pokedexHandler = await runToOpenPokedex();
+
+    // Get name of overgrow
+    const overgrow = allAbilities[Abilities.OVERGROW].name;
+
+    // @ts-expect-error `filterText` is private
+    pokedexHandler.filterText.setValue(FilterTextRow.ABILITY_1, overgrow);
+
+    // filter all species to be the pokemon that have overgrow
+    const overgrowSpecies = getSpeciesWithAbility(Abilities.OVERGROW);
+    // @ts-expect-error - `filteredPokemonData` is private
+    const filteredSpecies = new Set(pokedexHandler.filteredPokemonData.map(pokemon => pokemon.species.speciesId));
+
+    expect(filteredSpecies).toEqual(overgrowSpecies);
+  });
+
+  it("should filter to show only pokemon with ability and passive when filtering by 2 abilities", async () => {
+    // Setup mocks for the ability and passive combinations
+    const whitelist: Species[] = [];
+    const blacklist: Species[] = [];
+
+    const filter_ab1 = Abilities.OVERGROW;
+    const filter_ab2 = Abilities.ADAPTABILITY;
+    const ab1_instance = allAbilities[filter_ab1];
+    const ab2_instance = allAbilities[filter_ab2];
+
+    // Create a species with passive set and each "ability" field
+    const baseObj = {
+      ability: Abilities.BALL_FETCH,
+      ability2: Abilities.NONE,
+      hidden: Abilities.BLAZE,
+      passive: Abilities.TORRENT,
+    };
+
+    // Mock pokemon to have the exhaustive combination of the two selected abilities
+    const attrs: (keyof typeof baseObj)[] = ["ability", "ability2", "hidden", "passive"];
+    for (const [idx, value] of permutations(attrs, 2).entries()) {
+      createAbilityMocks(Species.BULBASAUR + idx, {
+        ...baseObj,
+        [value[0]]: filter_ab1,
+        [value[1]]: filter_ab2,
+      });
+      if (value.includes("passive")) {
+        whitelist.push(Species.BULBASAUR + idx);
+      } else {
+        blacklist.push(Species.BULBASAUR + idx);
+      }
+    }
+
+    const pokedexHandler = await runToOpenPokedex();
+
+    // @ts-expect-error `filterText` is private
+    pokedexHandler.filterText.setValue(FilterTextRow.ABILITY_1, ab1_instance.name);
+    // @ts-expect-error `filterText` is private
+    pokedexHandler.filterText.setValue(FilterTextRow.ABILITY_2, ab2_instance.name);
+
+    let whiteListCount = 0;
+    // @ts-expect-error `filteredPokemonData` is private
+    for (const species of pokedexHandler.filteredPokemonData) {
+      expect(blacklist, "entry must have one of the abilities as a passive").not.toContain(species.species.speciesId);
+
+      const rawAbility = [species.species.ability1, species.species.ability2, species.species.abilityHidden];
+      const rawPassive = species.species.getPassiveAbility();
+
+      const c1 = rawPassive === ab1_instance.id && rawAbility.includes(ab2_instance.id);
+      const c2 = c1 || (rawPassive === ab2_instance.id && rawAbility.includes(ab1_instance.id));
+
+      expect(c2, "each filtered entry should have the ability and passive combination").toBe(true);
+      if (whitelist.includes(species.species.speciesId)) {
+        whiteListCount++;
+      }
+    }
+
+    expect(whiteListCount).toBe(whitelist.length);
+  });
+
+  it("should filter to show only the pokemon with a type when filtering by a single type", async () => {
+    const pokedexHandler = await runToOpenPokedex();
+
+    // @ts-expect-error - `filterBar` is private
+    pokedexHandler.filterBar.getFilter(DropDownColumn.TYPES).toggleOptionState(PokemonType.NORMAL + 1);
+
+    const expectedPokemon = getSpeciesWithType(PokemonType.NORMAL);
+    // @ts-expect-error - `filteredPokemonData` is private
+    const filteredPokemon = new Set(pokedexHandler.filteredPokemonData.map(pokemon => pokemon.species.speciesId));
+
+    expect(filteredPokemon).toEqual(expectedPokemon);
+  });
+
+  // Todo: Pokemon with a mega that adds a type do not show up in the filter, e.g. pinsir.
+  it.todo("should show only the pokemon with one of the types when filtering by multiple types", async () => {
+    const pokedexHandler = await runToOpenPokedex();
+
+    // @ts-expect-error - `filterBar` is private
+    pokedexHandler.filterBar.getFilter(DropDownColumn.TYPES).toggleOptionState(PokemonType.NORMAL + 1);
+    // @ts-expect-error - `filterBar` is private
+    pokedexHandler.filterBar.getFilter(DropDownColumn.TYPES).toggleOptionState(PokemonType.FLYING + 1);
+
+    const expectedPokemon = getSpeciesWithType(PokemonType.NORMAL, PokemonType.FLYING);
+    // @ts-expect-error - `filteredPokemonData` is private
+    const filteredPokemon = new Set(pokedexHandler.filteredPokemonData.map(pokemon => pokemon.species.speciesId));
+
+    expect(filteredPokemon).toEqual(expectedPokemon);
+  });
+
+  it("filtering for unlockable cost reduction only shows species with sufficient candies", async () => {
+    // load the save file
+    await game.importData("./test/testUtils/saves/data_pokedex_tests.prsv");
+    const pokedexHandler = await runToOpenPokedex();
+
+    // @ts-expect-error - `filterBar` is private
+    const filter = pokedexHandler.filterBar.getFilter(DropDownColumn.UNLOCKS);
+
+    // Cycling 4 times to get to the "can unlock" for cost reduction
+    for (let i = 0; i < 4; i++) {
+      // index 1 is the cost reduction
+      filter.toggleOptionState(1);
+    }
+
+    const expectedPokemon = new Set([
+      Species.CHIKORITA,
+      Species.CYNDAQUIL,
+      Species.TORCHIC,
+      Species.TURTWIG,
+      Species.EKANS,
+      Species.MUDKIP,
+    ]);
+    expect(
+      // @ts-expect-error - `filteredPokemonData` is private
+      pokedexHandler.filteredPokemonData.every(pokemon =>
+        expectedPokemon.has(pokedexHandler.getStarterSpeciesId(pokemon.species.speciesId)),
+      ),
+    ).toBe(true);
+  });
+
+  it("filtering by passive unlocked only shows species that have their passive", async () => {
+    await game.importData("./test/testUtils/saves/data_pokedex_tests.prsv");
+    const pokedexHandler = await runToOpenPokedex();
+
+    // @ts-expect-error - `filterBar` is private
+    const filter = pokedexHandler.filterBar.getFilter(DropDownColumn.UNLOCKS);
+
+    filter.toggleOptionState(0); // cycle to Passive: Yes
+
+    expect(
+      // @ts-expect-error - `filteredPokemonData` is private
+      pokedexHandler.filteredPokemonData.every(
+        pokemon => pokedexHandler.getStarterSpeciesId(pokemon.species.speciesId) === Species.MUDKIP,
+      ),
+    ).toBe(true);
+  });
+
+  it("filtering for pokemon that can unlock passive shows only species with sufficient candies", async () => {
+    await game.importData("./test/testUtils/saves/data_pokedex_tests.prsv");
+    const pokedexHandler = await runToOpenPokedex();
+
+    // @ts-expect-error - `filterBar` is private
+    const filter = pokedexHandler.filterBar.getFilter(DropDownColumn.UNLOCKS);
+
+    // Cycling 4 times to get to the "can unlock" for passive
+    const expectedPokemon = new Set([
+      Species.EKANS,
+      Species.CHIKORITA,
+      Species.CYNDAQUIL,
+      Species.TORCHIC,
+      Species.TURTWIG,
+    ]);
+
+    // cycling twice to get to the "can unlock" for passive
+    filter.toggleOptionState(0);
+    filter.toggleOptionState(0);
+
+    expect(
+      // @ts-expect-error - `filteredPokemonData` is private
+      pokedexHandler.filteredPokemonData.every(pokemon =>
+        expectedPokemon.has(pokedexHandler.getStarterSpeciesId(pokemon.species.speciesId)),
+      ),
+    ).toBe(true);
+  });
+
+  it("filtering for pokemon that have any cost reduction shows only the species that have unlocked a cost reduction", async () => {
+    await game.importData("./test/testUtils/saves/data_pokedex_tests.prsv");
+    const pokedexHandler = await runToOpenPokedex();
+
+    const expectedPokemon = new Set([Species.TREECKO, Species.CYNDAQUIL, Species.TOTODILE]);
+
+    // @ts-expect-error - `filterBar` is private
+    const filter = pokedexHandler.filterBar.getFilter(DropDownColumn.UNLOCKS);
+    // Cycle 1 time for cost reduction
+    filter.toggleOptionState(1);
+
+    expect(
+      // @ts-expect-error - `filteredPokemonData` is private
+      pokedexHandler.filteredPokemonData.every(pokemon =>
+        expectedPokemon.has(pokedexHandler.getStarterSpeciesId(pokemon.species.speciesId)),
+      ),
+    ).toBe(true);
+  });
+
+  it("filtering for pokemon that have a single cost reduction shows only the species that have unlocked a single cost reduction", async () => {
+    await game.importData("./test/testUtils/saves/data_pokedex_tests.prsv");
+    const pokedexHandler = await runToOpenPokedex();
+
+    const expectedPokemon = new Set([Species.CYNDAQUIL, Species.TOTODILE]);
+
+    // @ts-expect-error - `filterBar` is private
+    const filter = pokedexHandler.filterBar.getFilter(DropDownColumn.UNLOCKS);
+    // Cycle 2 times for one cost reduction
+    filter.toggleOptionState(1);
+    filter.toggleOptionState(1);
+
+    expect(
+      // @ts-expect-error - `filteredPokemonData` is private
+      pokedexHandler.filteredPokemonData.every(pokemon =>
+        expectedPokemon.has(pokedexHandler.getStarterSpeciesId(pokemon.species.speciesId)),
+      ),
+    ).toBe(true);
+  });
+
+  it("filtering for pokemon that have two cost reductions sorts only shows the species that have unlocked both cost reductions", async () => {
+    await game.importData("./test/testUtils/saves/data_pokedex_tests.prsv");
+    const pokedexHandler = await runToOpenPokedex();
+
+    // @ts-expect-error - `filterBar` is private
+    const filter = pokedexHandler.filterBar.getFilter(DropDownColumn.UNLOCKS);
+    // Cycle 3 time for two cost reductions
+    filter.toggleOptionState(1);
+    filter.toggleOptionState(1);
+    filter.toggleOptionState(1);
+
+    expect(
+      // @ts-expect-error - `filteredPokemonData` is private
+      pokedexHandler.filteredPokemonData.every(
+        pokemon => pokedexHandler.getStarterSpeciesId(pokemon.species.speciesId) === Species.TREECKO,
+      ),
+    ).toBe(true);
+  });
+
+  it("filtering by shiny status shows the caught pokemon with the selected shiny tier", async () => {
+    await game.importData("./test/testUtils/saves/data_pokedex_tests.prsv");
+    const pokedexHandler = await runToOpenPokedex();
+    // @ts-expect-error - `filterBar` is private
+    const filter = pokedexHandler.filterBar.getFilter(DropDownColumn.CAUGHT);
+    filter.toggleOptionState(3);
+
+    // @ts-expect-error - `filteredPokemonData` is private
+    let filteredPokemon = pokedexHandler.filteredPokemonData.map(pokemon => pokemon.species.speciesId);
+
+    // Red shiny
+    expect(filteredPokemon.length).toBe(1);
+    expect(filteredPokemon[0], "tier 1 shiny").toBe(Species.CATERPIE);
+
+    // tier 2 shiny
+    filter.toggleOptionState(3);
+    filter.toggleOptionState(2);
+
+    // @ts-expect-error - `filteredPokemonData` is private
+    filteredPokemon = pokedexHandler.filteredPokemonData.map(pokemon => pokemon.species.speciesId);
+    expect(filteredPokemon.length).toBe(1);
+    expect(filteredPokemon[0], "tier 2 shiny").toBe(Species.RATTATA);
+
+    filter.toggleOptionState(2);
+    filter.toggleOptionState(1);
+    // @ts-expect-error - `filteredPokemonData` is private
+    filteredPokemon = pokedexHandler.filteredPokemonData.map(pokemon => pokemon.species.speciesId);
+    expect(filteredPokemon.length).toBe(1);
+    expect(filteredPokemon[0], "tier 3 shiny").toBe(Species.EKANS);
+
+    // filter by no shiny
+    filter.toggleOptionState(1);
+    filter.toggleOptionState(4);
+
+    // @ts-expect-error - `filteredPokemonData` is private
+    filteredPokemon = pokedexHandler.filteredPokemonData.map(pokemon => pokemon.species.speciesId);
+    expect(filteredPokemon.length).toBe(27);
+    expect(filteredPokemon, "not shiny").not.toContain(Species.CATERPIE);
+    expect(filteredPokemon, "not shiny").not.toContain(Species.RATTATA);
+    expect(filteredPokemon, "not shiny").not.toContain(Species.EKANS);
+  });
+
+  /****************************
+   *    Tests for UI Input    *
+   ****************************/
+
+  // TODO: fix cursor wrapping
+  it.todo(
+    "should wrap the cursor to the top when moving to an empty entry when there are more than 81 pokemon",
+    async () => {
+      const pokedexHandler = await runToOpenPokedex();
+
+      // Filter by gen 2 so we can pan a specific amount.
+      // @ts-expect-error `filterBar` is private
+      pokedexHandler.filterBar.getFilter(DropDownColumn.GEN).options[2].toggleOptionState();
+      pokedexHandler.updateStarters();
+      // @ts-expect-error - `filteredPokemonData` is private
+      expect(pokedexHandler.filteredPokemonData.length, "pokemon in gen2").toBe(100);
+
+      // Let's try to pan to the right to see what the pokemon it points to is.
+
+      // pan to the right once and down 11 times
+      pokedexHandler.processInput(Button.RIGHT);
+      // Nab the pokemon that is selected for comparison later.
+
+      // @ts-expect-error - `lastSpecies` is private
+      const selectedPokemon = pokedexHandler.lastSpecies.speciesId;
+      for (let i = 0; i < 11; i++) {
+        pokedexHandler.processInput(Button.DOWN);
+      }
+
+      // @ts-expect-error `lastSpecies` is private
+      expect(selectedPokemon).toEqual(pokedexHandler.lastSpecies.speciesId);
+    },
+  );
+
+  /****************************
+   *    Tests for Pokédex Pages    *
+   ****************************/
+
+  it("should show caught battle form as caught", async () => {
+    await game.importData("./test/testUtils/saves/data_pokedex_tests_v2.prsv");
+    const pageHandler = await runToPokedexPage(getPokemonSpecies(Species.VENUSAUR), { form: 1 });
+
+    // @ts-expect-error - `species` is private
+    expect(pageHandler.species.speciesId).toEqual(Species.VENUSAUR);
+
+    // @ts-expect-error - `formIndex` is private
+    expect(pageHandler.formIndex).toEqual(1);
+
+    expect(pageHandler.isFormCaught()).toEqual(true);
+    expect(pageHandler.isSeen()).toEqual(true);
+  });
+
+  //TODO: check tint of the sprite
+  it("should show uncaught battle form as seen", async () => {
+    await game.importData("./test/testUtils/saves/data_pokedex_tests_v2.prsv");
+    const pageHandler = await runToPokedexPage(getPokemonSpecies(Species.VENUSAUR), { form: 2 });
+
+    // @ts-expect-error - `species` is private
+    expect(pageHandler.species.speciesId).toEqual(Species.VENUSAUR);
+
+    // @ts-expect-error - `formIndex` is private
+    expect(pageHandler.formIndex).toEqual(2);
+
+    expect(pageHandler.isFormCaught()).toEqual(false);
+    expect(pageHandler.isSeen()).toEqual(true);
+  });
+});
diff --git a/src/test/ui/starter-select.test.ts b/test/ui/starter-select.test.ts
similarity index 81%
rename from src/test/ui/starter-select.test.ts
rename to test/ui/starter-select.test.ts
index 15b5f643539..b402e02e2d7 100644
--- a/src/test/ui/starter-select.test.ts
+++ b/test/ui/starter-select.test.ts
@@ -9,16 +9,15 @@ import type { OptionSelectItem } from "#app/ui/abstact-option-select-ui-handler"
 import type SaveSlotSelectUiHandler from "#app/ui/save-slot-select-ui-handler";
 import type OptionSelectUiHandler from "#app/ui/settings/option-select-ui-handler";
 import type StarterSelectUiHandler from "#app/ui/starter-select-ui-handler";
-import { Mode } from "#app/ui/ui";
+import { UiMode } from "#enums/ui-mode";
 import { Abilities } from "#enums/abilities";
 import { Button } from "#enums/buttons";
 import { Species } from "#enums/species";
-import GameManager from "#test/utils/gameManager";
+import GameManager from "#test/testUtils/gameManager";
 import i18next from "i18next";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
-
 describe("UI - Starter select", () => {
   let phaserGame: Phaser.Game;
   let game: GameManager;
@@ -37,20 +36,20 @@ describe("UI - Starter select", () => {
     game = new GameManager(phaserGame);
   });
 
-  it("Bulbasaur - shiny - variant 2 male", async() => {
-    await game.importData("src/test/utils/saves/everything.prsv");
-    const caughtCount = Object.keys(game.scene.gameData.dexData).filter((key) => {
+  it("Bulbasaur - shiny - variant 2 male", async () => {
+    await game.importData("./test/testUtils/saves/everything.prsv");
+    const caughtCount = Object.keys(game.scene.gameData.dexData).filter(key => {
       const species = game.scene.gameData.dexData[key];
       return species.caughtAttr !== 0n;
     }).length;
     expect(caughtCount).toBe(Object.keys(allSpecies).length);
     await game.runToTitle();
-    game.onNextPrompt("TitlePhase", Mode.TITLE, () => {
+    game.onNextPrompt("TitlePhase", UiMode.TITLE, () => {
       const currentPhase = game.scene.getCurrentPhase() as TitlePhase;
       currentPhase.gameMode = GameModes.CLASSIC;
       currentPhase.end();
     });
-    game.onNextPrompt("SelectStarterPhase", Mode.STARTER_SELECT, () => {
+    game.onNextPrompt("SelectStarterPhase", UiMode.STARTER_SELECT, () => {
       const handler = game.scene.ui.getHandler() as StarterSelectUiHandler;
       handler.processInput(Button.RIGHT);
       handler.processInput(Button.LEFT);
@@ -60,8 +59,8 @@ describe("UI - Starter select", () => {
     await game.phaseInterceptor.run(SelectStarterPhase);
     let options: OptionSelectItem[] = [];
     let optionSelectUiHandler: OptionSelectUiHandler | undefined;
-    await new Promise<void>((resolve) => {
-      game.onNextPrompt("SelectStarterPhase", Mode.OPTION_SELECT, () => {
+    await new Promise<void>(resolve => {
+      game.onNextPrompt("SelectStarterPhase", UiMode.OPTION_SELECT, () => {
         optionSelectUiHandler = game.scene.ui.getHandler() as OptionSelectUiHandler;
         options = optionSelectUiHandler.getOptionsWithScroll();
         resolve();
@@ -74,16 +73,16 @@ describe("UI - Starter select", () => {
     expect(options.some(option => option.label === i18next.t("menu:cancel"))).toBe(true);
     optionSelectUiHandler?.processInput(Button.ACTION);
 
-    await new Promise<void>((resolve) => {
-      game.onNextPrompt("SelectStarterPhase", Mode.STARTER_SELECT, () => {
+    await new Promise<void>(resolve => {
+      game.onNextPrompt("SelectStarterPhase", UiMode.STARTER_SELECT, () => {
         const handler = game.scene.ui.getHandler() as StarterSelectUiHandler;
         handler.processInput(Button.SUBMIT);
       });
-      game.onNextPrompt("SelectStarterPhase", Mode.CONFIRM, () => {
+      game.onNextPrompt("SelectStarterPhase", UiMode.CONFIRM, () => {
         const handler = game.scene.ui.getHandler() as StarterSelectUiHandler;
         handler.processInput(Button.ACTION);
       });
-      game.onNextPrompt("SelectStarterPhase", Mode.SAVE_SLOT, () => {
+      game.onNextPrompt("SelectStarterPhase", UiMode.SAVE_SLOT, () => {
         const saveSlotSelectUiHandler = game.scene.ui.getHandler() as SaveSlotSelectUiHandler;
         saveSlotSelectUiHandler.processInput(Button.ACTION);
         resolve();
@@ -97,20 +96,20 @@ describe("UI - Starter select", () => {
     expect(game.scene.getPlayerParty()[0].gender).toBe(Gender.MALE);
   }, 20000);
 
-  it("Bulbasaur - shiny - variant 2 female hardy overgrow", async() => {
-    await game.importData("src/test/utils/saves/everything.prsv");
-    const caughtCount = Object.keys(game.scene.gameData.dexData).filter((key) => {
+  it("Bulbasaur - shiny - variant 2 female hardy overgrow", async () => {
+    await game.importData("./test/testUtils/saves/everything.prsv");
+    const caughtCount = Object.keys(game.scene.gameData.dexData).filter(key => {
       const species = game.scene.gameData.dexData[key];
       return species.caughtAttr !== 0n;
     }).length;
     expect(caughtCount).toBe(Object.keys(allSpecies).length);
     await game.runToTitle();
-    game.onNextPrompt("TitlePhase", Mode.TITLE, () => {
+    game.onNextPrompt("TitlePhase", UiMode.TITLE, () => {
       const currentPhase = game.scene.getCurrentPhase() as TitlePhase;
       currentPhase.gameMode = GameModes.CLASSIC;
       currentPhase.end();
     });
-    game.onNextPrompt("SelectStarterPhase", Mode.STARTER_SELECT, () => {
+    game.onNextPrompt("SelectStarterPhase", UiMode.STARTER_SELECT, () => {
       const handler = game.scene.ui.getHandler() as StarterSelectUiHandler;
       handler.processInput(Button.RIGHT);
       handler.processInput(Button.LEFT);
@@ -121,8 +120,8 @@ describe("UI - Starter select", () => {
     await game.phaseInterceptor.run(SelectStarterPhase);
     let options: OptionSelectItem[] = [];
     let optionSelectUiHandler: OptionSelectUiHandler | undefined;
-    await new Promise<void>((resolve) => {
-      game.onNextPrompt("SelectStarterPhase", Mode.OPTION_SELECT, () => {
+    await new Promise<void>(resolve => {
+      game.onNextPrompt("SelectStarterPhase", UiMode.OPTION_SELECT, () => {
         optionSelectUiHandler = game.scene.ui.getHandler() as OptionSelectUiHandler;
         options = optionSelectUiHandler.getOptionsWithScroll();
         resolve();
@@ -135,16 +134,16 @@ describe("UI - Starter select", () => {
     expect(options.some(option => option.label === i18next.t("menu:cancel"))).toBe(true);
     optionSelectUiHandler?.processInput(Button.ACTION);
 
-    await new Promise<void>((resolve) => {
-      game.onNextPrompt("SelectStarterPhase", Mode.STARTER_SELECT, () => {
+    await new Promise<void>(resolve => {
+      game.onNextPrompt("SelectStarterPhase", UiMode.STARTER_SELECT, () => {
         const handler = game.scene.ui.getHandler() as StarterSelectUiHandler;
         handler.processInput(Button.SUBMIT);
       });
-      game.onNextPrompt("SelectStarterPhase", Mode.CONFIRM, () => {
+      game.onNextPrompt("SelectStarterPhase", UiMode.CONFIRM, () => {
         const handler = game.scene.ui.getHandler() as StarterSelectUiHandler;
         handler.processInput(Button.ACTION);
       });
-      game.onNextPrompt("SelectStarterPhase", Mode.SAVE_SLOT, () => {
+      game.onNextPrompt("SelectStarterPhase", UiMode.SAVE_SLOT, () => {
         const saveSlotSelectUiHandler = game.scene.ui.getHandler() as SaveSlotSelectUiHandler;
         saveSlotSelectUiHandler.processInput(Button.ACTION);
         resolve();
@@ -159,20 +158,20 @@ describe("UI - Starter select", () => {
     expect(game.scene.getPlayerParty()[0].getAbility().id).toBe(Abilities.OVERGROW);
   }, 20000);
 
-  it("Bulbasaur - shiny - variant 2 female lonely chlorophyl", async() => {
-    await game.importData("src/test/utils/saves/everything.prsv");
-    const caughtCount = Object.keys(game.scene.gameData.dexData).filter((key) => {
+  it("Bulbasaur - shiny - variant 2 female lonely chlorophyl", async () => {
+    await game.importData("./test/testUtils/saves/everything.prsv");
+    const caughtCount = Object.keys(game.scene.gameData.dexData).filter(key => {
       const species = game.scene.gameData.dexData[key];
       return species.caughtAttr !== 0n;
     }).length;
     expect(caughtCount).toBe(Object.keys(allSpecies).length);
     await game.runToTitle();
-    game.onNextPrompt("TitlePhase", Mode.TITLE, () => {
+    game.onNextPrompt("TitlePhase", UiMode.TITLE, () => {
       const currentPhase = game.scene.getCurrentPhase() as TitlePhase;
       currentPhase.gameMode = GameModes.CLASSIC;
       currentPhase.end();
     });
-    game.onNextPrompt("SelectStarterPhase", Mode.STARTER_SELECT, () => {
+    game.onNextPrompt("SelectStarterPhase", UiMode.STARTER_SELECT, () => {
       const handler = game.scene.ui.getHandler() as StarterSelectUiHandler;
       handler.processInput(Button.RIGHT);
       handler.processInput(Button.LEFT);
@@ -185,8 +184,8 @@ describe("UI - Starter select", () => {
     await game.phaseInterceptor.run(SelectStarterPhase);
     let options: OptionSelectItem[] = [];
     let optionSelectUiHandler: OptionSelectUiHandler | undefined;
-    await new Promise<void>((resolve) => {
-      game.onNextPrompt("SelectStarterPhase", Mode.OPTION_SELECT, () => {
+    await new Promise<void>(resolve => {
+      game.onNextPrompt("SelectStarterPhase", UiMode.OPTION_SELECT, () => {
         optionSelectUiHandler = game.scene.ui.getHandler() as OptionSelectUiHandler;
         options = optionSelectUiHandler.getOptionsWithScroll();
         resolve();
@@ -199,16 +198,16 @@ describe("UI - Starter select", () => {
     expect(options.some(option => option.label === i18next.t("menu:cancel"))).toBe(true);
     optionSelectUiHandler?.processInput(Button.ACTION);
 
-    await new Promise<void>((resolve) => {
-      game.onNextPrompt("SelectStarterPhase", Mode.STARTER_SELECT, () => {
+    await new Promise<void>(resolve => {
+      game.onNextPrompt("SelectStarterPhase", UiMode.STARTER_SELECT, () => {
         const handler = game.scene.ui.getHandler() as StarterSelectUiHandler;
         handler.processInput(Button.SUBMIT);
       });
-      game.onNextPrompt("SelectStarterPhase", Mode.CONFIRM, () => {
+      game.onNextPrompt("SelectStarterPhase", UiMode.CONFIRM, () => {
         const handler = game.scene.ui.getHandler() as StarterSelectUiHandler;
         handler.processInput(Button.ACTION);
       });
-      game.onNextPrompt("SelectStarterPhase", Mode.SAVE_SLOT, () => {
+      game.onNextPrompt("SelectStarterPhase", UiMode.SAVE_SLOT, () => {
         const saveSlotSelectUiHandler = game.scene.ui.getHandler() as SaveSlotSelectUiHandler;
         saveSlotSelectUiHandler.processInput(Button.ACTION);
         resolve();
@@ -224,20 +223,20 @@ describe("UI - Starter select", () => {
     expect(game.scene.getPlayerParty()[0].getAbility().id).toBe(Abilities.CHLOROPHYLL);
   }, 20000);
 
-  it("Bulbasaur - shiny - variant 2 female", async() => {
-    await game.importData("src/test/utils/saves/everything.prsv");
-    const caughtCount = Object.keys(game.scene.gameData.dexData).filter((key) => {
+  it("Bulbasaur - shiny - variant 2 female", async () => {
+    await game.importData("./test/testUtils/saves/everything.prsv");
+    const caughtCount = Object.keys(game.scene.gameData.dexData).filter(key => {
       const species = game.scene.gameData.dexData[key];
       return species.caughtAttr !== 0n;
     }).length;
     expect(caughtCount).toBe(Object.keys(allSpecies).length);
     await game.runToTitle();
-    game.onNextPrompt("TitlePhase", Mode.TITLE, () => {
+    game.onNextPrompt("TitlePhase", UiMode.TITLE, () => {
       const currentPhase = game.scene.getCurrentPhase() as TitlePhase;
       currentPhase.gameMode = GameModes.CLASSIC;
       currentPhase.end();
     });
-    game.onNextPrompt("SelectStarterPhase", Mode.STARTER_SELECT, () => {
+    game.onNextPrompt("SelectStarterPhase", UiMode.STARTER_SELECT, () => {
       const handler = game.scene.ui.getHandler() as StarterSelectUiHandler;
       handler.processInput(Button.RIGHT);
       handler.processInput(Button.LEFT);
@@ -248,8 +247,8 @@ describe("UI - Starter select", () => {
     await game.phaseInterceptor.run(SelectStarterPhase);
     let options: OptionSelectItem[] = [];
     let optionSelectUiHandler: OptionSelectUiHandler | undefined;
-    await new Promise<void>((resolve) => {
-      game.onNextPrompt("SelectStarterPhase", Mode.OPTION_SELECT, () => {
+    await new Promise<void>(resolve => {
+      game.onNextPrompt("SelectStarterPhase", UiMode.OPTION_SELECT, () => {
         optionSelectUiHandler = game.scene.ui.getHandler() as OptionSelectUiHandler;
         options = optionSelectUiHandler.getOptionsWithScroll();
         resolve();
@@ -262,16 +261,16 @@ describe("UI - Starter select", () => {
     expect(options.some(option => option.label === i18next.t("menu:cancel"))).toBe(true);
     optionSelectUiHandler?.processInput(Button.ACTION);
 
-    await new Promise<void>((resolve) => {
-      game.onNextPrompt("SelectStarterPhase", Mode.STARTER_SELECT, () => {
+    await new Promise<void>(resolve => {
+      game.onNextPrompt("SelectStarterPhase", UiMode.STARTER_SELECT, () => {
         const handler = game.scene.ui.getHandler() as StarterSelectUiHandler;
         handler.processInput(Button.SUBMIT);
       });
-      game.onNextPrompt("SelectStarterPhase", Mode.CONFIRM, () => {
+      game.onNextPrompt("SelectStarterPhase", UiMode.CONFIRM, () => {
         const handler = game.scene.ui.getHandler() as StarterSelectUiHandler;
         handler.processInput(Button.ACTION);
       });
-      game.onNextPrompt("SelectStarterPhase", Mode.SAVE_SLOT, () => {
+      game.onNextPrompt("SelectStarterPhase", UiMode.SAVE_SLOT, () => {
         const saveSlotSelectUiHandler = game.scene.ui.getHandler() as SaveSlotSelectUiHandler;
         saveSlotSelectUiHandler.processInput(Button.ACTION);
         resolve();
@@ -285,20 +284,20 @@ describe("UI - Starter select", () => {
     expect(game.scene.getPlayerParty()[0].gender).toBe(Gender.FEMALE);
   }, 20000);
 
-  it("Bulbasaur - not shiny", async() => {
-    await game.importData("src/test/utils/saves/everything.prsv");
-    const caughtCount = Object.keys(game.scene.gameData.dexData).filter((key) => {
+  it("Bulbasaur - not shiny", async () => {
+    await game.importData("./test/testUtils/saves/everything.prsv");
+    const caughtCount = Object.keys(game.scene.gameData.dexData).filter(key => {
       const species = game.scene.gameData.dexData[key];
       return species.caughtAttr !== 0n;
     }).length;
     expect(caughtCount).toBe(Object.keys(allSpecies).length);
     await game.runToTitle();
-    game.onNextPrompt("TitlePhase", Mode.TITLE, () => {
+    game.onNextPrompt("TitlePhase", UiMode.TITLE, () => {
       const currentPhase = game.scene.getCurrentPhase() as TitlePhase;
       currentPhase.gameMode = GameModes.CLASSIC;
       currentPhase.end();
     });
-    game.onNextPrompt("SelectStarterPhase", Mode.STARTER_SELECT, () => {
+    game.onNextPrompt("SelectStarterPhase", UiMode.STARTER_SELECT, () => {
       const handler = game.scene.ui.getHandler() as StarterSelectUiHandler;
       handler.processInput(Button.RIGHT);
       handler.processInput(Button.LEFT);
@@ -309,8 +308,8 @@ describe("UI - Starter select", () => {
     await game.phaseInterceptor.run(SelectStarterPhase);
     let options: OptionSelectItem[] = [];
     let optionSelectUiHandler: OptionSelectUiHandler | undefined;
-    await new Promise<void>((resolve) => {
-      game.onNextPrompt("SelectStarterPhase", Mode.OPTION_SELECT, () => {
+    await new Promise<void>(resolve => {
+      game.onNextPrompt("SelectStarterPhase", UiMode.OPTION_SELECT, () => {
         optionSelectUiHandler = game.scene.ui.getHandler() as OptionSelectUiHandler;
         options = optionSelectUiHandler.getOptionsWithScroll();
         resolve();
@@ -323,16 +322,16 @@ describe("UI - Starter select", () => {
     expect(options.some(option => option.label === i18next.t("menu:cancel"))).toBe(true);
     optionSelectUiHandler?.processInput(Button.ACTION);
 
-    await new Promise<void>((resolve) => {
-      game.onNextPrompt("SelectStarterPhase", Mode.STARTER_SELECT, () => {
+    await new Promise<void>(resolve => {
+      game.onNextPrompt("SelectStarterPhase", UiMode.STARTER_SELECT, () => {
         const handler = game.scene.ui.getHandler() as StarterSelectUiHandler;
         handler.processInput(Button.SUBMIT);
       });
-      game.onNextPrompt("SelectStarterPhase", Mode.CONFIRM, () => {
+      game.onNextPrompt("SelectStarterPhase", UiMode.CONFIRM, () => {
         const handler = game.scene.ui.getHandler() as StarterSelectUiHandler;
         handler.processInput(Button.ACTION);
       });
-      game.onNextPrompt("SelectStarterPhase", Mode.SAVE_SLOT, () => {
+      game.onNextPrompt("SelectStarterPhase", UiMode.SAVE_SLOT, () => {
         const saveSlotSelectUiHandler = game.scene.ui.getHandler() as SaveSlotSelectUiHandler;
         saveSlotSelectUiHandler.processInput(Button.ACTION);
         resolve();
@@ -345,20 +344,20 @@ describe("UI - Starter select", () => {
     expect(game.scene.getPlayerParty()[0].variant).toBe(0);
   }, 20000);
 
-  it("Bulbasaur - shiny - variant 1", async() => {
-    await game.importData("src/test/utils/saves/everything.prsv");
-    const caughtCount = Object.keys(game.scene.gameData.dexData).filter((key) => {
+  it("Bulbasaur - shiny - variant 1", async () => {
+    await game.importData("./test/testUtils/saves/everything.prsv");
+    const caughtCount = Object.keys(game.scene.gameData.dexData).filter(key => {
       const species = game.scene.gameData.dexData[key];
       return species.caughtAttr !== 0n;
     }).length;
     expect(caughtCount).toBe(Object.keys(allSpecies).length);
     await game.runToTitle();
-    game.onNextPrompt("TitlePhase", Mode.TITLE, () => {
+    game.onNextPrompt("TitlePhase", UiMode.TITLE, () => {
       const currentPhase = game.scene.getCurrentPhase() as TitlePhase;
       currentPhase.gameMode = GameModes.CLASSIC;
       currentPhase.end();
     });
-    game.onNextPrompt("SelectStarterPhase", Mode.STARTER_SELECT, () => {
+    game.onNextPrompt("SelectStarterPhase", UiMode.STARTER_SELECT, () => {
       const handler = game.scene.ui.getHandler() as StarterSelectUiHandler;
       handler.processInput(Button.RIGHT);
       handler.processInput(Button.LEFT);
@@ -371,8 +370,8 @@ describe("UI - Starter select", () => {
     await game.phaseInterceptor.run(SelectStarterPhase);
     let options: OptionSelectItem[] = [];
     let optionSelectUiHandler: OptionSelectUiHandler | undefined;
-    await new Promise<void>((resolve) => {
-      game.onNextPrompt("SelectStarterPhase", Mode.OPTION_SELECT, () => {
+    await new Promise<void>(resolve => {
+      game.onNextPrompt("SelectStarterPhase", UiMode.OPTION_SELECT, () => {
         optionSelectUiHandler = game.scene.ui.getHandler() as OptionSelectUiHandler;
         options = optionSelectUiHandler.getOptionsWithScroll();
         resolve();
@@ -385,16 +384,16 @@ describe("UI - Starter select", () => {
     expect(options.some(option => option.label === i18next.t("menu:cancel"))).toBe(true);
     optionSelectUiHandler?.processInput(Button.ACTION);
 
-    await new Promise<void>((resolve) => {
-      game.onNextPrompt("SelectStarterPhase", Mode.STARTER_SELECT, () => {
+    await new Promise<void>(resolve => {
+      game.onNextPrompt("SelectStarterPhase", UiMode.STARTER_SELECT, () => {
         const handler = game.scene.ui.getHandler() as StarterSelectUiHandler;
         handler.processInput(Button.SUBMIT);
       });
-      game.onNextPrompt("SelectStarterPhase", Mode.CONFIRM, () => {
+      game.onNextPrompt("SelectStarterPhase", UiMode.CONFIRM, () => {
         const handler = game.scene.ui.getHandler() as StarterSelectUiHandler;
         handler.processInput(Button.ACTION);
       });
-      game.onNextPrompt("SelectStarterPhase", Mode.SAVE_SLOT, () => {
+      game.onNextPrompt("SelectStarterPhase", UiMode.SAVE_SLOT, () => {
         const saveSlotSelectUiHandler = game.scene.ui.getHandler() as SaveSlotSelectUiHandler;
         saveSlotSelectUiHandler.processInput(Button.ACTION);
         resolve();
@@ -407,20 +406,20 @@ describe("UI - Starter select", () => {
     expect(game.scene.getPlayerParty()[0].variant).toBe(1);
   }, 20000);
 
-  it("Bulbasaur - shiny - variant 0", async() => {
-    await game.importData("src/test/utils/saves/everything.prsv");
-    const caughtCount = Object.keys(game.scene.gameData.dexData).filter((key) => {
+  it("Bulbasaur - shiny - variant 0", async () => {
+    await game.importData("./test/testUtils/saves/everything.prsv");
+    const caughtCount = Object.keys(game.scene.gameData.dexData).filter(key => {
       const species = game.scene.gameData.dexData[key];
       return species.caughtAttr !== 0n;
     }).length;
     expect(caughtCount).toBe(Object.keys(allSpecies).length);
     await game.runToTitle();
-    game.onNextPrompt("TitlePhase", Mode.TITLE, () => {
+    game.onNextPrompt("TitlePhase", UiMode.TITLE, () => {
       const currentPhase = game.scene.getCurrentPhase() as TitlePhase;
       currentPhase.gameMode = GameModes.CLASSIC;
       currentPhase.end();
     });
-    game.onNextPrompt("SelectStarterPhase", Mode.STARTER_SELECT, () => {
+    game.onNextPrompt("SelectStarterPhase", UiMode.STARTER_SELECT, () => {
       const handler = game.scene.ui.getHandler() as StarterSelectUiHandler;
       handler.processInput(Button.RIGHT);
       handler.processInput(Button.LEFT);
@@ -432,8 +431,8 @@ describe("UI - Starter select", () => {
     await game.phaseInterceptor.run(SelectStarterPhase);
     let options: OptionSelectItem[] = [];
     let optionSelectUiHandler: OptionSelectUiHandler | undefined;
-    await new Promise<void>((resolve) => {
-      game.onNextPrompt("SelectStarterPhase", Mode.OPTION_SELECT, () => {
+    await new Promise<void>(resolve => {
+      game.onNextPrompt("SelectStarterPhase", UiMode.OPTION_SELECT, () => {
         optionSelectUiHandler = game.scene.ui.getHandler() as OptionSelectUiHandler;
         options = optionSelectUiHandler.getOptionsWithScroll();
         resolve();
@@ -446,16 +445,16 @@ describe("UI - Starter select", () => {
     expect(options.some(option => option.label === i18next.t("menu:cancel"))).toBe(true);
     optionSelectUiHandler?.processInput(Button.ACTION);
 
-    await new Promise<void>((resolve) => {
-      game.onNextPrompt("SelectStarterPhase", Mode.STARTER_SELECT, () => {
+    await new Promise<void>(resolve => {
+      game.onNextPrompt("SelectStarterPhase", UiMode.STARTER_SELECT, () => {
         const handler = game.scene.ui.getHandler() as StarterSelectUiHandler;
         handler.processInput(Button.SUBMIT);
       });
-      game.onNextPrompt("SelectStarterPhase", Mode.CONFIRM, () => {
+      game.onNextPrompt("SelectStarterPhase", UiMode.CONFIRM, () => {
         const handler = game.scene.ui.getHandler() as StarterSelectUiHandler;
         handler.processInput(Button.ACTION);
       });
-      game.onNextPrompt("SelectStarterPhase", Mode.SAVE_SLOT, () => {
+      game.onNextPrompt("SelectStarterPhase", UiMode.SAVE_SLOT, () => {
         const saveSlotSelectUiHandler = game.scene.ui.getHandler() as SaveSlotSelectUiHandler;
         saveSlotSelectUiHandler.processInput(Button.ACTION);
         resolve();
@@ -468,20 +467,20 @@ describe("UI - Starter select", () => {
     expect(game.scene.getPlayerParty()[0].variant).toBe(0);
   }, 20000);
 
-  it("Check if first pokemon in party is caterpie from gen 1 and 1rd row, 3rd column", async() => {
-    await game.importData("src/test/utils/saves/everything.prsv");
-    const caughtCount = Object.keys(game.scene.gameData.dexData).filter((key) => {
+  it("Check if first pokemon in party is caterpie from gen 1 and 1rd row, 3rd column", async () => {
+    await game.importData("./test/testUtils/saves/everything.prsv");
+    const caughtCount = Object.keys(game.scene.gameData.dexData).filter(key => {
       const species = game.scene.gameData.dexData[key];
       return species.caughtAttr !== 0n;
     }).length;
     expect(caughtCount).toBe(Object.keys(allSpecies).length);
     await game.runToTitle();
-    game.onNextPrompt("TitlePhase", Mode.TITLE, () => {
+    game.onNextPrompt("TitlePhase", UiMode.TITLE, () => {
       const currentPhase = game.scene.getCurrentPhase() as TitlePhase;
       currentPhase.gameMode = GameModes.CLASSIC;
       currentPhase.end();
     });
-    game.onNextPrompt("SelectStarterPhase", Mode.STARTER_SELECT, () => {
+    game.onNextPrompt("SelectStarterPhase", UiMode.STARTER_SELECT, () => {
       const handler = game.scene.ui.getHandler() as StarterSelectUiHandler;
       handler.processInput(Button.RIGHT);
       handler.processInput(Button.RIGHT);
@@ -492,8 +491,8 @@ describe("UI - Starter select", () => {
     await game.phaseInterceptor.run(SelectStarterPhase);
     let options: OptionSelectItem[] = [];
     let optionSelectUiHandler: OptionSelectUiHandler | undefined;
-    await new Promise<void>((resolve) => {
-      game.onNextPrompt("SelectStarterPhase", Mode.OPTION_SELECT, () => {
+    await new Promise<void>(resolve => {
+      game.onNextPrompt("SelectStarterPhase", UiMode.OPTION_SELECT, () => {
         optionSelectUiHandler = game.scene.ui.getHandler() as OptionSelectUiHandler;
         options = optionSelectUiHandler.getOptionsWithScroll();
         resolve();
@@ -507,8 +506,8 @@ describe("UI - Starter select", () => {
     optionSelectUiHandler?.processInput(Button.ACTION);
 
     let starterSelectUiHandler: StarterSelectUiHandler;
-    await new Promise<void>((resolve) => {
-      game.onNextPrompt("SelectStarterPhase", Mode.STARTER_SELECT, () => {
+    await new Promise<void>(resolve => {
+      game.onNextPrompt("SelectStarterPhase", UiMode.STARTER_SELECT, () => {
         starterSelectUiHandler = game.scene.ui.getHandler() as StarterSelectUiHandler;
         starterSelectUiHandler.processInput(Button.SUBMIT);
         resolve();
@@ -520,11 +519,11 @@ describe("UI - Starter select", () => {
     // expect(starterSelectUiHandler.cursorObj.x).toBe(132 + 4 * 18);
     // expect(starterSelectUiHandler.cursorObj.y).toBe(10);
 
-    game.onNextPrompt("SelectStarterPhase", Mode.CONFIRM, () => {
+    game.onNextPrompt("SelectStarterPhase", UiMode.CONFIRM, () => {
       const handler = game.scene.ui.getHandler() as StarterSelectUiHandler;
       handler.processInput(Button.ACTION);
     });
-    game.onNextPrompt("SelectStarterPhase", Mode.SAVE_SLOT, () => {
+    game.onNextPrompt("SelectStarterPhase", UiMode.SAVE_SLOT, () => {
       const saveSlotSelectUiHandler = game.scene.ui.getHandler() as SaveSlotSelectUiHandler;
       saveSlotSelectUiHandler.processInput(Button.ACTION);
     });
@@ -532,20 +531,20 @@ describe("UI - Starter select", () => {
     expect(game.scene.getPlayerParty()[0].species.speciesId).toBe(Species.CATERPIE);
   }, 20000);
 
-  it("Check if first pokemon in party is nidoran_m from gen 1 and 2nd row, 4th column (cursor (9+4)-1)", async() => {
-    await game.importData("src/test/utils/saves/everything.prsv");
-    const caughtCount = Object.keys(game.scene.gameData.dexData).filter((key) => {
+  it("Check if first pokemon in party is nidoran_m from gen 1 and 2nd row, 4th column (cursor (9+4)-1)", async () => {
+    await game.importData("./test/testUtils/saves/everything.prsv");
+    const caughtCount = Object.keys(game.scene.gameData.dexData).filter(key => {
       const species = game.scene.gameData.dexData[key];
       return species.caughtAttr !== 0n;
     }).length;
     expect(caughtCount).toBe(Object.keys(allSpecies).length);
     await game.runToTitle();
-    game.onNextPrompt("TitlePhase", Mode.TITLE, () => {
+    game.onNextPrompt("TitlePhase", UiMode.TITLE, () => {
       const currentPhase = game.scene.getCurrentPhase() as TitlePhase;
       currentPhase.gameMode = GameModes.CLASSIC;
       currentPhase.end();
     });
-    game.onNextPrompt("SelectStarterPhase", Mode.STARTER_SELECT, () => {
+    game.onNextPrompt("SelectStarterPhase", UiMode.STARTER_SELECT, () => {
       const handler = game.scene.ui.getHandler() as StarterSelectUiHandler;
       handler.processInput(Button.RIGHT);
       handler.processInput(Button.RIGHT);
@@ -557,8 +556,8 @@ describe("UI - Starter select", () => {
     await game.phaseInterceptor.run(SelectStarterPhase);
     let options: OptionSelectItem[] = [];
     let optionSelectUiHandler: OptionSelectUiHandler | undefined;
-    await new Promise<void>((resolve) => {
-      game.onNextPrompt("SelectStarterPhase", Mode.OPTION_SELECT, () => {
+    await new Promise<void>(resolve => {
+      game.onNextPrompt("SelectStarterPhase", UiMode.OPTION_SELECT, () => {
         optionSelectUiHandler = game.scene.ui.getHandler() as OptionSelectUiHandler;
         options = optionSelectUiHandler.getOptionsWithScroll();
         resolve();
@@ -572,8 +571,8 @@ describe("UI - Starter select", () => {
     optionSelectUiHandler?.processInput(Button.ACTION);
 
     let starterSelectUiHandler: StarterSelectUiHandler | undefined;
-    await new Promise<void>((resolve) => {
-      game.onNextPrompt("SelectStarterPhase", Mode.STARTER_SELECT, () => {
+    await new Promise<void>(resolve => {
+      game.onNextPrompt("SelectStarterPhase", UiMode.STARTER_SELECT, () => {
         starterSelectUiHandler = game.scene.ui.getHandler() as StarterSelectUiHandler;
         starterSelectUiHandler.processInput(Button.SUBMIT);
         resolve();
@@ -586,11 +585,11 @@ describe("UI - Starter select", () => {
     expect(starterSelectUiHandler?.cursorObj.x).toBe(53);
     expect(starterSelectUiHandler?.cursorObj.y).toBe(31);
 
-    game.onNextPrompt("SelectStarterPhase", Mode.CONFIRM, () => {
+    game.onNextPrompt("SelectStarterPhase", UiMode.CONFIRM, () => {
       const handler = game.scene.ui.getHandler() as StarterSelectUiHandler;
       handler.processInput(Button.ACTION);
     });
-    game.onNextPrompt("SelectStarterPhase", Mode.SAVE_SLOT, () => {
+    game.onNextPrompt("SelectStarterPhase", UiMode.SAVE_SLOT, () => {
       const saveSlotSelectUiHandler = game.scene.ui.getHandler() as SaveSlotSelectUiHandler;
       saveSlotSelectUiHandler.processInput(Button.ACTION);
     });
diff --git a/src/test/ui/transfer-item.test.ts b/test/ui/transfer-item.test.ts
similarity index 62%
rename from src/test/ui/transfer-item.test.ts
rename to test/ui/transfer-item.test.ts
index 762db7fc7ce..f0ea8f84005 100644
--- a/src/test/ui/transfer-item.test.ts
+++ b/test/ui/transfer-item.test.ts
@@ -2,17 +2,14 @@ import { BerryType } from "#app/enums/berry-type";
 import { Button } from "#app/enums/buttons";
 import { Moves } from "#app/enums/moves";
 import { Species } from "#app/enums/species";
-import { BattleEndPhase } from "#app/phases/battle-end-phase";
-import { SelectModifierPhase } from "#app/phases/select-modifier-phase";
 import ModifierSelectUiHandler from "#app/ui/modifier-select-ui-handler";
 import PartyUiHandler, { PartyUiMode } from "#app/ui/party-ui-handler";
-import { Mode } from "#app/ui/ui";
-import GameManager from "#test/utils/gameManager";
+import { UiMode } from "#enums/ui-mode";
+import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import type BBCodeText from "phaser3-rex-plugins/plugins/bbcodetext";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
-
 describe("UI - Transfer Items", () => {
   let phaserGame: Phaser.Game;
   let game: GameManager;
@@ -29,7 +26,7 @@ describe("UI - Transfer Items", () => {
 
   beforeEach(async () => {
     game = new GameManager(phaserGame);
-    game.override.battleType("single");
+    game.override.battleStyle("single");
     game.override.startingLevel(100);
     game.override.startingWave(1);
     game.override.startingHeldItems([
@@ -37,46 +34,52 @@ describe("UI - Transfer Items", () => {
       { name: "BERRY", count: 2, type: BerryType.APICOT },
       { name: "BERRY", count: 2, type: BerryType.LUM },
     ]);
-    game.override.moveset([ Moves.DRAGON_CLAW ]);
+    game.override.moveset([Moves.DRAGON_CLAW]);
     game.override.enemySpecies(Species.MAGIKARP);
-    game.override.enemyMoveset([ Moves.SPLASH ]);
+    game.override.enemyMoveset([Moves.SPLASH]);
 
-    await game.startBattle([ Species.RAYQUAZA, Species.RAYQUAZA, Species.RAYQUAZA ]);
+    await game.classicMode.startBattle([Species.RAYQUAZA, Species.RAYQUAZA, Species.RAYQUAZA]);
 
     game.move.select(Moves.DRAGON_CLAW);
 
-    game.onNextPrompt("SelectModifierPhase", Mode.MODIFIER_SELECT, () => {
+    game.onNextPrompt("SelectModifierPhase", UiMode.MODIFIER_SELECT, () => {
       expect(game.scene.ui.getHandler()).toBeInstanceOf(ModifierSelectUiHandler);
 
       const handler = game.scene.ui.getHandler() as ModifierSelectUiHandler;
       handler.setCursor(1);
       handler.processInput(Button.ACTION);
 
-      game.scene.ui.setModeWithoutClear(Mode.PARTY, PartyUiMode.MODIFIER_TRANSFER);
+      void game.scene.ui.setModeWithoutClear(UiMode.PARTY, PartyUiMode.MODIFIER_TRANSFER);
     });
 
-    await game.phaseInterceptor.to(BattleEndPhase);
+    await game.phaseInterceptor.to("BattleEndPhase");
   });
 
   it("check red tint for held item limit in transfer menu", async () => {
-    game.onNextPrompt("SelectModifierPhase", Mode.PARTY, () => {
+    game.onNextPrompt("SelectModifierPhase", UiMode.PARTY, () => {
       expect(game.scene.ui.getHandler()).toBeInstanceOf(PartyUiHandler);
 
       const handler = game.scene.ui.getHandler() as PartyUiHandler;
       handler.processInput(Button.ACTION);
 
-      expect(handler.optionsContainer.list.some((option) => (option as BBCodeText).text?.includes("Sitrus Berry"))).toBe(true);
-      expect(handler.optionsContainer.list.some((option) => (option as BBCodeText).text?.includes("Apicot Berry (2)"))).toBe(true);
-      expect(handler.optionsContainer.list.some((option) => RegExp(/Lum Berry\[color.*(2)/).exec((option as BBCodeText).text))).toBe(true);
+      expect(handler.optionsContainer.list.some(option => (option as BBCodeText).text?.includes("Sitrus Berry"))).toBe(
+        true,
+      );
+      expect(
+        handler.optionsContainer.list.some(option => (option as BBCodeText).text?.includes("Apicot Berry (2)")),
+      ).toBe(true);
+      expect(
+        handler.optionsContainer.list.some(option => RegExp(/Lum Berry\[color.*(2)/).exec((option as BBCodeText).text)),
+      ).toBe(true);
 
       game.phaseInterceptor.unlock();
     });
 
-    await game.phaseInterceptor.to(SelectModifierPhase);
+    await game.phaseInterceptor.to("SelectModifierPhase");
   }, 20000);
 
   it("check transfer option for pokemon to transfer to", async () => {
-    game.onNextPrompt("SelectModifierPhase", Mode.PARTY, () => {
+    game.onNextPrompt("SelectModifierPhase", UiMode.PARTY, () => {
       expect(game.scene.ui.getHandler()).toBeInstanceOf(PartyUiHandler);
 
       const handler = game.scene.ui.getHandler() as PartyUiHandler;
@@ -86,11 +89,13 @@ describe("UI - Transfer Items", () => {
       handler.setCursor(1); // move to other Pokemon
       handler.processInput(Button.ACTION); // select Pokemon
 
-      expect(handler.optionsContainer.list.some((option) => (option as BBCodeText).text?.includes("Transfer"))).toBe(true);
+      expect(handler.optionsContainer.list.some(option => (option as BBCodeText).text?.includes("Transfer"))).toBe(
+        true,
+      );
 
       game.phaseInterceptor.unlock();
     });
 
-    await game.phaseInterceptor.to(SelectModifierPhase);
+    await game.phaseInterceptor.to("SelectModifierPhase");
   }, 20000);
 });
diff --git a/test/ui/type-hints.test.ts b/test/ui/type-hints.test.ts
new file mode 100644
index 00000000000..2051af76754
--- /dev/null
+++ b/test/ui/type-hints.test.ts
@@ -0,0 +1,126 @@
+import { Button } from "#app/enums/buttons";
+import { Moves } from "#app/enums/moves";
+import { Species } from "#app/enums/species";
+import { CommandPhase } from "#app/phases/command-phase";
+import FightUiHandler from "#app/ui/fight-ui-handler";
+import { UiMode } from "#enums/ui-mode";
+import GameManager from "#test/testUtils/gameManager";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
+import type MockText from "#test/testUtils/mocks/mocksContainer/mockText";
+import i18next from "i18next";
+
+describe("UI - Type Hints", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(async () => {
+    game = new GameManager(phaserGame);
+    game.settings.typeHints(true); //activate type hints
+    game.override.battleStyle("single").startingLevel(100).startingWave(1).enemyMoveset(Moves.SPLASH);
+  });
+
+  it("check immunity color", async () => {
+    game.override
+      .battleStyle("single")
+      .startingLevel(100)
+      .startingWave(1)
+      .enemySpecies(Species.FLORGES)
+      .enemyMoveset(Moves.SPLASH)
+      .moveset([Moves.DRAGON_CLAW]);
+    game.settings.typeHints(true); //activate type hints
+
+    await game.classicMode.startBattle([Species.RAYQUAZA]);
+
+    game.onNextPrompt("CommandPhase", UiMode.COMMAND, () => {
+      const { ui } = game.scene;
+      const handler = ui.getHandler<FightUiHandler>();
+      handler.processInput(Button.ACTION); // select "Fight"
+      game.phaseInterceptor.unlock();
+    });
+
+    game.onNextPrompt("CommandPhase", UiMode.FIGHT, () => {
+      const { ui } = game.scene;
+      const movesContainer = ui.getByName<Phaser.GameObjects.Container>(FightUiHandler.MOVES_CONTAINER_NAME);
+      const dragonClawText = movesContainer
+        .getAll<Phaser.GameObjects.Text>()
+        .find(text => text.text === i18next.t("move:dragonClaw.name"))! as unknown as MockText;
+
+      expect.soft(dragonClawText.color).toBe("#929292");
+      ui.getHandler().processInput(Button.ACTION);
+    });
+    await game.phaseInterceptor.to(CommandPhase);
+  });
+
+  it("check status move color", async () => {
+    game.override.enemySpecies(Species.FLORGES).moveset([Moves.GROWL]);
+
+    await game.classicMode.startBattle([Species.RAYQUAZA]);
+
+    game.onNextPrompt("CommandPhase", UiMode.COMMAND, () => {
+      const { ui } = game.scene;
+      const handler = ui.getHandler<FightUiHandler>();
+      handler.processInput(Button.ACTION); // select "Fight"
+      game.phaseInterceptor.unlock();
+    });
+
+    game.onNextPrompt("CommandPhase", UiMode.FIGHT, () => {
+      const { ui } = game.scene;
+      const movesContainer = ui.getByName<Phaser.GameObjects.Container>(FightUiHandler.MOVES_CONTAINER_NAME);
+      const growlText = movesContainer
+        .getAll<Phaser.GameObjects.Text>()
+        .find(text => text.text === i18next.t("move:growl.name"))! as unknown as MockText;
+
+      expect.soft(growlText.color).toBe(undefined);
+      ui.getHandler().processInput(Button.ACTION);
+    });
+    await game.phaseInterceptor.to(CommandPhase);
+  });
+
+  it("should show the proper hint for a move in doubles after one of the enemy pokemon flees", async () => {
+    game.override
+      .enemySpecies(Species.ABRA)
+      .moveset([Moves.SPLASH, Moves.SHADOW_BALL, Moves.SOAK])
+      .enemyMoveset([Moves.SPLASH, Moves.TELEPORT])
+      .battleStyle("double");
+
+    await game.classicMode.startBattle([Species.MAGIKARP, Species.MAGIKARP]);
+    game.move.select(Moves.SPLASH);
+    // Use soak to change type of remaining abra to water
+    game.move.select(Moves.SOAK, 1);
+
+    await game.forceEnemyMove(Moves.SPLASH);
+    await game.forceEnemyMove(Moves.TELEPORT);
+    await game.toNextTurn();
+
+    game.onNextPrompt("CommandPhase", UiMode.COMMAND, () => {
+      const { ui } = game.scene;
+      const handler = ui.getHandler<FightUiHandler>();
+      handler.processInput(Button.ACTION); // select "Fight"
+      game.phaseInterceptor.unlock();
+    });
+
+    game.onNextPrompt("CommandPhase", UiMode.FIGHT, () => {
+      const { ui } = game.scene;
+      const movesContainer = ui.getByName<Phaser.GameObjects.Container>(FightUiHandler.MOVES_CONTAINER_NAME);
+      const shadowBallText = movesContainer
+        .getAll<Phaser.GameObjects.Text>()
+        .find(text => text.text === i18next.t("move:shadowBall.name"))! as unknown as MockText;
+      expect.soft(shadowBallText).toBeDefined();
+
+      expect.soft(shadowBallText.color).toBe(undefined);
+      ui.getHandler().processInput(Button.ACTION);
+    });
+    await game.phaseInterceptor.to(CommandPhase);
+  });
+});
diff --git a/src/utils.test.ts b/test/utils.test.ts
similarity index 50%
rename from src/utils.test.ts
rename to test/utils.test.ts
index 3f5b835b03b..fe93bdd6970 100644
--- a/src/utils.test.ts
+++ b/test/utils.test.ts
@@ -1,15 +1,16 @@
 import { expect, describe, it, beforeAll } from "vitest";
-import { randomString, padInt } from "./utils";
+import { randomString, padInt } from "#app/utils/common";
+import { deepMergeSpriteData } from "#app/utils/data";
 
 import Phaser from "phaser";
 
 describe("utils", () => {
-
   beforeAll(() => {
     new Phaser.Game({
       type: Phaser.HEADLESS,
     });
   });
+
   describe("randomString", () => {
     it("should return a string of the specified length", () => {
       const str = randomString(10);
@@ -47,4 +48,33 @@ describe("utils", () => {
       expect(result).toBe("1");
     });
   });
+  describe("deepMergeSpriteData", () => {
+    it("should merge two objects' common properties", () => {
+      const dest = { a: 1, b: 2 };
+      const source = { a: 3, b: 3, e: 4 };
+      deepMergeSpriteData(dest, source);
+      expect(dest).toEqual({ a: 3, b: 3 });
+    });
+
+    it("does nothing for identical objects", () => {
+      const dest = { a: 1, b: 2 };
+      const source = { a: 1, b: 2 };
+      deepMergeSpriteData(dest, source);
+      expect(dest).toEqual({ a: 1, b: 2 });
+    });
+
+    it("should preserve missing and mistyped properties", () => {
+      const dest = { a: 1, c: 56, d: "test" };
+      const source = { a: "apple", b: 3, d: "no hablo español" };
+      deepMergeSpriteData(dest, source);
+      expect(dest).toEqual({ a: 1, c: 56, d: "no hablo español" });
+    });
+
+    it("should copy arrays verbatim even with mismatches", () => {
+      const dest = { a: 1, b: [{ d: 1 }, { d: 2 }, { d: 3 }] };
+      const source = { a: 3, b: [{ c: [4, 5] }, { p: [7, 8] }], e: 4 };
+      deepMergeSpriteData(dest, source);
+      expect(dest).toEqual({ a: 3, b: [{ c: [4, 5] }, { p: [7, 8] }] });
+    });
+  });
 });
diff --git a/src/test/vitest.setup.ts b/test/vitest.setup.ts
similarity index 52%
rename from src/test/vitest.setup.ts
rename to test/vitest.setup.ts
index eb2c1e4b9cf..93b439e540f 100644
--- a/src/test/vitest.setup.ts
+++ b/test/vitest.setup.ts
@@ -1,31 +1,17 @@
 import "vitest-canvas-mock";
-
-import { initLoggedInUser } from "#app/account";
-import { initAbilities } from "#app/data/ability";
-import { initBiomes } from "#app/data/balance/biomes";
-import { initEggMoves } from "#app/data/balance/egg-moves";
-import { initPokemonPrevolutions } from "#app/data/balance/pokemon-evolutions";
-import { initMoves } from "#app/data/move";
-import { initMysteryEncounters } from "#app/data/mystery-encounters/mystery-encounters";
-import { initPokemonForms } from "#app/data/pokemon-forms";
-import { initSpecies } from "#app/data/pokemon-species";
-import { initAchievements } from "#app/system/achv";
-import { initVouchers } from "#app/system/voucher";
-import { initStatsKeys } from "#app/ui/game-stats-ui-handler";
 import { afterAll, beforeAll, vi } from "vitest";
 
+import { initTestFile } from "./testUtils/testFileInitialization";
+
 /** Set the timezone to UTC for tests. */
-process.env.TZ = "UTC";
 
 /** Mock the override import to always return default values, ignoring any custom overrides. */
-vi.mock("#app/overrides", async (importOriginal) => {
-  // eslint-disable-next-line @typescript-eslint/consistent-type-imports
+vi.mock("#app/overrides", async importOriginal => {
   const { defaultOverrides } = await importOriginal<typeof import("#app/overrides")>();
 
   return {
     default: defaultOverrides,
     defaultOverrides,
-  // eslint-disable-next-line @typescript-eslint/consistent-type-imports
   } satisfies typeof import("#app/overrides");
 });
 
@@ -35,17 +21,17 @@ vi.mock("#app/overrides", async (importOriginal) => {
  * This is necessary because how our code is structured.
  * Do NOT try to put any of this code into external functions, it won't work as it's elevated during runtime.
  */
-vi.mock("i18next", async (importOriginal) => {
+vi.mock("i18next", async importOriginal => {
   console.log("Mocking i18next");
   const { setupServer } = await import("msw/node");
   const { http, HttpResponse } = await import("msw");
 
   global.server = setupServer(
-    http.get("/locales/en/*", async (req) => {
+    http.get("/locales/en/*", async req => {
       const filename = req.params[0];
 
       try {
-        const json = await import(`../../public/locales/en/${req.params[0]}`);
+        const json = await import(`../public/locales/en/${req.params[0]}`);
         console.log("Loaded locale", filename);
         return HttpResponse.json(json);
       } catch (err) {
@@ -63,28 +49,10 @@ vi.mock("i18next", async (importOriginal) => {
   return await importOriginal();
 });
 
-initVouchers();
-initAchievements();
-initStatsKeys();
-initPokemonPrevolutions();
-initBiomes();
-initEggMoves();
-initPokemonForms();
-initSpecies();
-initMoves();
-initAbilities();
-initLoggedInUser();
-initMysteryEncounters();
-
 global.testFailed = false;
 
 beforeAll(() => {
-  Object.defineProperty(document, "fonts", {
-    writable: true,
-    value: {
-      add: () => {},
-    },
-  });
+  initTestFile();
 });
 
 afterAll(() => {
diff --git a/tsconfig.json b/tsconfig.json
index 0ec945df4ee..6af3e9ce650 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,34 +1,28 @@
 {
-	"compilerOptions": {
-		"target": "ES2020",
-		"module": "ES2020",
-		"moduleResolution": "bundler",
-		"resolveJsonModule": true,
-		"esModuleInterop": true,
-		"strictNullChecks": true,
-		"sourceMap": false,
-		"strict": false,
-		"rootDir": "./src",
-		"baseUrl": "./src",
-		"paths": {
-			"#enums/*": ["./enums/*.ts"],
-			"#app/*": ["*.ts"],
-			"#test/*": ["./test/*.ts"]
-		},
-		"outDir": "./build",
-		"noEmit": true
-	},
-	"typedocOptions": {
-		"entryPoints": ["./src"],
-		"entryPointStrategy": "expand",
-		"exclude": "**/*+.test.ts",
-		"out": "typedoc"
-	},
-	"exclude": [
-		"node_modules",
-		"dist",
-		"vite.config.ts",
-		"vitest.config.ts",
-		"vitest.workspace.ts",
-	]
-}
\ No newline at end of file
+  "compilerOptions": {
+    "target": "ES2020",
+    "module": "ES2020",
+    "moduleResolution": "bundler",
+    "resolveJsonModule": true,
+    "esModuleInterop": true,
+    "strictNullChecks": true,
+    "sourceMap": false,
+    "strict": false, // TODO: Enable this eventually
+    "rootDir": ".",
+    "baseUrl": "./src",
+    "paths": {
+      "#enums/*": ["./enums/*.ts"],
+      "#app/*": ["*.ts"],
+      "#test/*": ["../test/*.ts"]
+    },
+    "outDir": "./build",
+    "noEmit": true
+  },
+  "typedocOptions": {
+    "entryPoints": ["./src"],
+    "entryPointStrategy": "expand",
+    "exclude": "**/*+.test.ts",
+    "out": "typedoc"
+  },
+  "exclude": ["node_modules", "dist", "vite.config.ts", "vitest.config.ts", "vitest.workspace.ts"]
+}
diff --git a/vite.config.ts b/vite.config.ts
index 946315c4b7b..4b6ad687a0a 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -1,43 +1,39 @@
-import { defineConfig, loadEnv, Rollup, UserConfig } from 'vite';
-import tsconfigPaths from 'vite-tsconfig-paths';
+import { defineConfig, loadEnv, type Rollup, type UserConfig } from "vite";
+import tsconfigPaths from "vite-tsconfig-paths";
 import { minifyJsonPlugin } from "./src/plugins/vite/vite-minify-json-plugin";
 
-export const defaultConfig: UserConfig  = {
-	plugins: [
-		tsconfigPaths(), 
-		minifyJsonPlugin(["images", "battle-anims"], true)
-	],
-	clearScreen: false,
-	appType: "mpa",
-	build: {
-		chunkSizeWarningLimit: 10000,
-		minify: 'esbuild',
-		sourcemap: false,
-		rollupOptions: {
-			onwarn(warning: Rollup.RollupLog, defaultHandler: (warning: string | Rollup.RollupLog) => void) {
-				// Suppress "Module level directives cause errors when bundled" warnings
-				if (warning.code === "MODULE_LEVEL_DIRECTIVE") {
-					return;
-				}
-				defaultHandler(warning);
-			},
-		},
-	},
+export const defaultConfig: UserConfig = {
+  plugins: [tsconfigPaths(), minifyJsonPlugin(["images", "battle-anims"], true)],
+  clearScreen: false,
+  appType: "mpa",
+  build: {
+    chunkSizeWarningLimit: 10000,
+    minify: "esbuild",
+    sourcemap: false,
+    rollupOptions: {
+      onwarn(warning: Rollup.RollupLog, defaultHandler: (warning: string | Rollup.RollupLog) => void) {
+        // Suppress "Module level directives cause errors when bundled" warnings
+        if (warning.code === "MODULE_LEVEL_DIRECTIVE") {
+          return;
+        }
+        defaultHandler(warning);
+      },
+    },
+  },
 };
 
+export default defineConfig(({ mode }) => {
+  const envPort = Number(loadEnv(mode, process.cwd()).VITE_PORT);
 
-export default defineConfig(({mode}) => {
-	const envPort = Number(loadEnv(mode, process.cwd()).VITE_PORT);
-
-	return ({
-		...defaultConfig,
-		base: '',
-		esbuild: {
-			pure: mode === 'production' ? ['console.log'] : [],
-			keepNames: true,
-		},
-		server: {
-			port: !isNaN(envPort) ? envPort : 8000,
-		}
-	});
+  return {
+    ...defaultConfig,
+    base: "",
+    esbuild: {
+      pure: mode === "production" ? ["console.log"] : [],
+      keepNames: true,
+    },
+    server: {
+      port: !Number.isNaN(envPort) ? envPort : 8000,
+    },
+  };
 });
diff --git a/vitest.config.ts b/vitest.config.ts
index 9f9245687a1..c781bde97ed 100644
--- a/vitest.config.ts
+++ b/vitest.config.ts
@@ -1,20 +1,31 @@
 import { defineProject } from "vitest/config";
 import { defaultConfig } from "./vite.config";
+import { BaseSequencer, type TestSpecification } from "vitest/node";
+
+function getTestOrder(testName: string): number {
+  if (testName.includes("battle-scene.test.ts")) {
+    return 1;
+  }
+  if (testName.includes("inputs.test.ts")) {
+    return 2;
+  }
+  return 3;
+}
 
 export default defineProject(({ mode }) => ({
   ...defaultConfig,
   test: {
     testTimeout: 20000,
-    setupFiles: ["./src/test/fontFace.setup.ts", "./src/test/vitest.setup.ts"],
-    server: {
-      deps: {
-        inline: ["vitest-canvas-mock"],
-        //@ts-ignore
-        optimizer: {
-          web: {
-            include: ["vitest-canvas-mock"],
-          },
-        },
+    setupFiles: ["./test/fontFace.setup.ts", "./test/vitest.setup.ts"],
+    sequence: {
+      sequencer: class CustomSequencer extends BaseSequencer {
+        async sort(files: TestSpecification[]) {
+          // use default sorting at first.
+          files = await super.sort(files);
+          // Except, forcibly reorder
+
+          return files.sort((a, b) => getTestOrder(a.moduleId) - getTestOrder(b.moduleId));
+        }
       },
     },
     environment: "jsdom" as const,
@@ -33,8 +44,7 @@ export default defineProject(({ mode }) => ({
       reporters: ["text-summary", "html"],
     },
     name: "main",
-    include: ["./src/test/**/*.{test,spec}.ts"],
-    exclude: ["./src/test/pre.test.ts"],
+    include: ["./test/**/*.{test,spec}.ts"],
   },
   esbuild: {
     pure: mode === "production" ? ["console.log"] : [],
diff --git a/vitest.workspace.ts b/vitest.workspace.ts
index 38121942004..2f5d1f1e2c8 100644
--- a/vitest.workspace.ts
+++ b/vitest.workspace.ts
@@ -6,7 +6,7 @@ export default defineWorkspace([
     ...defaultConfig,
     test: {
       name: "pre",
-      include: ["src/test/pre.test.ts"],
+      include: ["./test/pre.test.ts"],
       environment: "jsdom",
     },
   },